diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..4fd6ab254
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+.dockerignore
+.gitignore
+README.md
+apps/server/node_modules
+apps/client/node_modules
+node_modules
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 000000000..ebff48c76
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,3 @@
+dist/
+build/
+client/_localeFileMap.ts
diff --git a/.gitignore b/.gitignore
index d03abb4fe..be5587ee9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,8 @@
-settings.php
-cache/*
 .DS_Store
-.project
-.buildpath
-.settings/*
-.idea*
-resources/themes/classic/.sass-cache/*
-resources/themes/default/.sass-cache/*
-resources/themes/.sass-cache/*
-node_modules*
\ No newline at end of file
+node_modules/*
+.config
+.env
+data/db
+!data/db/nodelete.txt
+.turbo
+.npm
\ No newline at end of file
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..70f6554c7
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+v20.19.4
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000000000..4a1506530
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,6 @@
+{
+  "semi": true,
+  "trailingComma": "none",
+  "singleQuote": true,
+  "printWidth": 140
+}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 1dd1c508c..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: php
-php:
-  - "5.5"
-  - "5.4"
-  - "5.3"
-services: mysql
-before_script:
-  - mysql -e 'create database generatedata_test;'
-script: phpunit --configuration tests/phpunit_config.xml --coverage-text
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..ea26052d2
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,10 @@
+{
+  "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
+  "editor.formatOnType": false,
+  "editor.formatOnPaste": false,
+  "editor.formatOnSave": true,
+  "editor.formatOnSaveMode": "file",
+  "files.autoSave": "onFocusChange",
+  "vs-code-prettier-eslint.prettierLast": false,
+  "editor.tabSize": 2
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..8e4227e95
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,254 @@
+## Changelog
+
+- `4.1.9` - Feb 16, 2025
+  - Bug fixes
+  - https://github.com/benkeen/generatedata/milestone/53?closed=1
+- `4.1.8` - Dec 16, 2024
+  - Bug fix
+  - https://github.com/benkeen/generatedata/milestone/52?closed=1
+- `4.1.7` - Dec 14, 2024
+  - Mostly bug fixes and package updates
+  - https://github.com/benkeen/generatedata/milestone/51?closed=1
+- `4.1.6` - Dec 10, 2023
+  - Mexican first and last names added
+  - https://github.com/benkeen/generatedata/milestone/50?closed=1
+- `4.1.5` - Aug 7, 2023
+  - Misc bug fixes, including fix for generating valid PAN numbers (thanks @benjamindonnachie!)
+  - https://github.com/benkeen/generatedata/milestone/49?closed=1
+- `4.1.4` - Jun 20, 2023
+  - Misc bug fixes.
+  - https://github.com/benkeen/generatedata/milestone/48?closed=1
+- `4.1.3` - Mar 2, 2023
+  - Misc bug fixes.
+  - https://github.com/benkeen/generatedata/milestone/47?closed=1
+- `4.1.2` - Mar 1, 2023
+  - Misc bug fixes.
+  - https://github.com/benkeen/generatedata/milestone/46?closed=1
+- `4.1.1` - Feb 25, 2023
+  - Misc bug fixes.
+  - https://github.com/benkeen/generatedata/milestone/45?closed=1
+- `4.1.0` - Feb 14, 2023
+  - Refactored code to accommodate upcoming npm package version (command-line generation).
+  - Moved to Google Identity Services for sign-in process.
+  - Misc bug fixes.
+  - https://github.com/benkeen/generatedata/milestone/43?closed=1
+- `4.0.15` - Nov 26, 2022
+  - Weighted List Data Type added
+  - Misc bug fixes.
+  - https://github.com/benkeen/generatedata/milestone/41?closed=1
+- `4.0.14` - Mar 5, 2022
+  - URLs Data Type added
+  - Ukrainian, Singapore and South Africa country data added
+  - https://github.com/benkeen/generatedata/milestone/40?closed=1
+- `4.0.13` - Mar 3, 2022
+  - Philippines country data added
+  - https://github.com/benkeen/generatedata/milestone/39?closed=1
+- `4.0.12` - Dec 28, 2021
+  - List Data Type now offers a "between" option
+  - Norwegian country data added. Thanks @maddingo!
+  - https://github.com/benkeen/generatedata/milestone/38?closed=1
+- `4.0.11` - Dec 8, 2021
+  - Dutch name data - thanks @rvanraamsdonk!
+  - Misc bug fixes
+  - https://github.com/benkeen/generatedata/milestone/37?closed=1
+- `4.0.10` - Dec 6, 2021
+  - Language selection overhauled
+  - Bug fixes
+  - Turkey name data - thanks @alicanipek!
+  - https://github.com/benkeen/generatedata/milestone/36?closed=1
+- `4.0.9` - Nov 20, 2021
+  - Node updated to 14
+  - German name data - thanks @ntauch!
+  - https://github.com/benkeen/generatedata/milestone/35?closed=1
+- `4.0.8` - Nov 13, 2021
+  - additional bug fix for regions, cities and postal code Data Types throwing errors
+  - Chilean country names added
+  - Admin: status filter and total count added to accounts page
+  - https://github.com/benkeen/generatedata/milestone/34?closed=1
+- `4.0.7` - Nov 11, 2021
+  - bug fix for regions, cities and postal code Data Types throwing errors (didn't fully work)
+  - Fix for error thrown when closing Export Type overlay
+  - https://github.com/benkeen/generatedata/milestone/33?closed=1
+- `4.0.6` - Nov 6, 2021
+  - Regional names added
+  - Email Data Type now lets you target other fields for more realistic data
+  - China country data added
+  - C# now handles auto-increment numeric values better
+  - https://github.com/benkeen/generatedata/milestone/32?closed=1
+- `4.0.5` - Oct 5, 2021
+  - Portuguese translation added
+  - Misc code improvements
+  - https://github.com/benkeen/generatedata/milestone/31?closed=1
+- `4.0.4` - Sept 27, 2021
+  - Hindi locale added
+  - Improvements for small screens
+  - Misc bug fixes
+  - https://github.com/benkeen/generatedata/milestone/30?closed=1
+- `4.0.3` - Sept 22, 2021
+  - Bug fix for CSV Export Type.
+  - https://github.com/benkeen/generatedata/milestone/29?closed=1
+- `4.0.2` - Sept 21, 2021
+  - misc bug fixes, UX improvements
+  - minor dependency updates
+  - https://github.com/benkeen/generatedata/milestone/28?closed=1
+- `4.0.1` - Sept 19, 2021:
+  - localization files now cache-busted
+  - check for is-safari updated.
+- `4.0.0` - Sept 17, 2021:
+  - initial release!
+  - bug fixes
+- `4.0.0-beta-20210911`:
+  - Color Data Type added
+  - Localized date picker components
+  - bug fixes
+- `4.0.0-beta-20210906`:
+  - Date format standardization in code
+  - Better error handling for expired accounts
+  - misc bug fixes
+- `4.0.0-beta-20210903`:
+  - Time Data Type added
+  - misc bug fixes
+- `4.0.0-beta-20210826`:
+  - account searching
+  - misc bug fixes
+- `4.0.0-beta-20210809`:
+  - back in the game! Returning to work on generatedata - misc updates.
+  - Last logged in col on accounts page
+  - Expiry date added to accounts page
+  - Fix for TextFixed Data Type
+- `4.0.0-alpha-20210608`:
+  - minor authentication + password reset bug fixes.
+- `4.0.0-alpha-20210607`:
+  - tons of updates & fixes - too many to note! UI updates, database changes, performances fixes and more.
+- `4.0.0-alpha-20210429`:
+  - preview panel scrolling fix.
+  - List Data Type now allows customizable delimiter.
+- `4.0.0-alpha-20210424`:
+  - Safari error page.
+- `4.0.0-alpha-20210418`:
+  - Email support added.
+  - Forget password email; expiry emails.
+- `4.0.0-alpha-20210305`:
+  - Track1 Data Type added.
+- `4.0.0-alpha-20210301`:
+  - Credit Card PAN Data Type added.
+- `4.0.0-alpha-20210224`:
+  - Assorted lib updates.
+- `4.0.0-alpha-20210223`:
+  - Improved generation settings panel.
+  - i18n fixes.
+- `4.0.0-alpha-20201111`:
+  - Chilean RUT number, PIN and CVV Data Types added.
+  - Fixed/Random Number of Words Data Types expanded to allow providing your own text as word source.
+- `4.0.0-alpha-20201108`:
+  - CSV, LDIF Export Types added.
+  - All Data Types and Export Types translated.
+- `4.0.0-alpha-20201104`:
+  - Computed and Composite Data Types combined.
+  - Names Data Type options structure change.
+  - Fix for help dialog not resetting search text
+  - version now links to changelog
+- `4.0.0-alpha-20201102`:
+  - all 9 languages now available to toggle between.
+  - "Clear Page" modal now lets you either just clear the grid, or reset everything (all plugins) to their default
+    settings
+- `4.0.0-alpha-20201101`:
+  - initial functional alpha. Data now generates!
+- `3.4.1` - Nov 24, 2019
+  - Excel Export Type updated for new PHP lib, thanks [@adibaby](https://github.com/adibaby)!
+  - Bug fix for SocialSecurityNumber, courtesy of [@guzzisti](https://github.com/guzzisti).
+  - https://github.com/benkeen/generatedata/milestone/26?closed=1
+- `3.4.0` - Nov 16, 2019
+  - Misc updates,
+  - new inject SQL feature added. Great work, [@harish81](https://github.com/harish81)!
+  - https://github.com/benkeen/generatedata/milestone/25?closed=1
+- `3.3.1` - July 18, 2019
+  - https://github.com/benkeen/generatedata/milestone/23?closed=1
+- `3.3.0` - July 1, 2019
+  - misc bug fixes
+- `3.2.8` - Sep 12, 2017
+  - misc bug fixes
+- `3.2.7` - Jul 29, 2017
+  - "Computed" Data Type added.
+  - misc bug fixes
+- `3.2.6` - Apr 17, 2017
+  - misc bug fixes: https://github.com/benkeen/generatedata/milestone/20?closed=1
+- `3.2.5` - Apr 16, 2016
+  - bug fixes: https://github.com/benkeen/generatedata/issues?utf8=%E2%9C%93&q=milestone%3A3.2.3+ - thanks for your
+    help, [Conrad Hagemans](https://github.com/conradhagemans)!
+  - "Precision" option added to Normal Distribution Data Type - thanks [@aevans84](https://github.com/aevans84).
+  - generation of complex JSON structures added by [Tony OHagan](https://github.com/tohagan).
+    See: https://github.com/benkeen/generatedata/tree/master/plugins/exportTypes/JSON#generating-complex-objects
+- `3.2.4` - Dec 6, 2015
+  - patch release for per-user settings.
+- `3.2.3` - Nov 15, 2015
+  - SIRET/SIREN Data Type added (French business numbers) added.
+    Merci, [Fabrice Marquès](https://github.com/fmarques56)!
+  - Bug fixes: https://github.com/benkeen/generatedata/issues?utf8=%E2%9C%93&q=milestone%3A3.2.3+
+- `3.2.2` - Nov 12, 2015
+  - The plugins (Data Types, Export Types, Countries) seen in the interface may not be configured on a per-user level.
+  - Installation script updated to allow customization of plugin selection.
+- `3.2.1` - May 25, 2015
+  - Configuration history option added to store the last 200 (this is configurable) versions of a data set. In case of
+    data loss, you can now revert to an older version very simply.
+  - Assorted bug fixes, including some improvements to the installation script.
+- `3.2.0` - Jan 29, 2015
+  - Adds a new REST API as an alternative way to generate data. See
+    the [API Documentation](http://benkeen.github.io/generatedata/api.html) for more information.
+- `3.1.4` - Sept 6, 2014
+  - Chinese language file added, thanks to [Zhao Yang](https://github.com/jptiancai)
+  - PAN, Track 1 and Track 2 data type updates, courtesy of Zeeshan Shaikh
+  - Turkey Country plugin added
+  - Bug fixes: https://github.com/benkeen/generatedata/issues?q=milestone%3A3.1.4+is%3Aclosed
+- `3.1.3` - July 20, 2014
+  - Misc data generation efficiency improvements
+  - Batch Size SQL export option added by [Anton Nizhegorodov](https://github.com/an1zhegorodov)
+  - Poland, Nigeria Country plugins added
+  - Bug fixes: https://github.com/benkeen/generatedata/issues?milestone=13&page=1&state=closed
+- `3.1.2` - July 12, 2014
+  - Bug fixes: https://github.com/benkeen/generatedata/issues?milestone=12&page=1&state=closed
+- `3.1.1` - Jan 31, 2014
+  - New credit card data types: PAN, PIN, CVV, Track 1 and Track 2 courtesy of Zeeshan Shaikh
+  - INSERT IGNORE option added to the SQL Export Type, thanks to [Ap.Mathu](https://github.com/apmuthu)
+  - Bug fixes: https://github.com/benkeen/generatedata/issues?milestone=11&page=1&state=closed
+- `3.1.0` - Dec 19, 2013
+  - Bug fix for accidental short-tags that were introduced in earlier code
+- `3.0.9` - Dec 11, 2013
+  - Compression option added to reduce download sizes, courtesy of [Manu Ullas](https://github.com/unullmass) -
+    thanks!
+  - New credit card Data Type, thanks to [rsicher1](https://github.com/rsicher1)
+  - You can now make copies of Data Sets, via the main dialog window. Just check a single row and click "Copy Data
+    Set" button.
+  - CodeMirror updated to v3.2.0
+  - Bug fixes: https://github.com/benkeen/generatedata/issues?milestone=9&page=1&state=closed
+- `3.0.8` - Oct 28, 2013
+  - International Bank Numbers - thanks, Joeri Noort!
+  - PostgreSQL database support added to SQL Export Type
+  - Bug fixes: https://github.com/benkeen/generatedata/issues?milestone=8&page=1&state=closed
+- `3.0.7` - Sept 7, 2013
+  - LDIF Export Type support - thanks, [Marco Corona](https://github.com/coronam)!
+  - Proper (genuine!) French translation courtesy of [Michel Roca](https://github.com/mRoca)
+  - Optional JS, CSS minimization and bundling via Grunt. See help documentation for more information:
+    [http://benkeen.github.io/generatedata/developer.html#bundling](http://benkeen.github.io/generatedata/developer.html#bundling)
+  - PHP 5.5 compatibility fixes: database connection now with mysqli; Generator class renamed to DataGenerator due to
+    naming conflict
+  - Bug fixes: https://github.com/benkeen/generatedata/issues?milestone=7&page=1&state=closed
+- `3.0.6` - Aug 1, 2013
+  - Costa Rica Country plugin, Phone-Regional Data Type added, courtesy of [Andre Fortin](https://github.com/twindual)
+  - bug fixes, see: https://github.com/benkeen/generatedata/issues?milestone=6&page=1&state=closed
+- `3.0.5` - July 13, 2013
+  - Currency Data Type added
+  - Assorted bug fixes, see: https://github.com/benkeen/generatedata/issues?milestone=5&page=1&state=closed
+- `3.0.4` - July 2nd, 2013
+  - Italy Export Type, courtesy of [Marcello Verona](https://github.com/marciuz)
+  - Regional Names Data Type added, data for Italy and France from [Marcello Verona](https://github.com/marciuz)
+- `3.0.3` - June 23, 2013
+  - Bug fixes. See: https://github.com/benkeen/generatedata/issues?milestone=3
+- `3.0.2` - June 12, 2013
+  - Spanish translation and Country plugin added (thanks, [@robarago](https://github.com/robarago)!)
+  - bug fixes, other updates: https://github.com/benkeen/generatedata/issues?milestone=2&state=closed
+- `3.0.1` - June 1st, 2013
+  - MSSQL support added (thanks, [Kent](https://github.com/kchenery)!)
+  - Assorted bug fixes / updates. See: https://github.com/benkeen/generatedata/issues?milestone=1&state=closed
+- `3.0.0` - May 21st, 2013
+  - Initial release
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
new file mode 100644
index 000000000..70a65e7f4
--- /dev/null
+++ b/DEVELOPMENT.md
@@ -0,0 +1,93 @@
+# Development
+
+Version 4 of generatedata uses Docker to simplify packaging up the app for development and distribution. Docker
+wasn't quite the wonder that I hoped it would be, but the benefits overall are undeniable.
+
+I experimented with getting the dev environment running _entirely_ within Docker containers so you wouldn't require
+to install anything locally, but I found it was simply too slow to be of practical use as a dev env. So instead, the
+local dev env just uses docker containers for the _server and database_; the FE code is still ran locally. I know that's
+a pain for non-frontend developers especially who aren't so familiar with setting up NVM, Grunt etc., but it's a
+trade-off I had to make.
+
+#### Pre-requisites:
+
+- [Docker](https://docs.docker.com/get-docker/)
+- [NVM](https://github.com/nvm-sh/nvm#installing-and-updating) - namely node 12.
+- Grunt CLI (`npm install grunt-cli -g`)
+
+### Running dev environment
+
+- `git clone https://github.com/benkeen/generatedata.git` - this clones the repo to your local computer. On Mac, I'd
+  suggest putting it in your `~` folder; I tried it in other locations but Docker ran into permissions issues.
+
+- `nvm install`
+
+  - assuming your have NVM installed (see above), this'll choose the right node version. If not, just choose the
+    right node version specified in the `.nvmrc` file. If you're not running the correct version of node it will
+    throw an error during startup.
+
+- `pnpm install`
+- After starting Docker, in one tab run: `npm run startAndBuildDevServer` - this boots up the server + database containers.
+  For subsequent runs you can just use `npm run startDevServer` and it'll be faster.
+- In a second tab, `npm run start` - this boots up the client-side code. Be warned: this does a _LOT_ of stuff and the
+  first time you run it it'll take a very long time to run.
+
+After running the second command it should open up `http://localhost:9000` in your browser.
+
+#### Shutting down dev env
+
+`npm run stopDevServer` - shuts down docker.
+
+I've found that sometimes that command chokes and you have to wait a few minutes before it runs properly. Presumably
+it's because the docker container was still in the process of booting up. If there are still problems, you might want to just run
+`npm run dockerCleanup`. I do this on the live server every time I update it. It completely clears everything out so you
+can start from scratch. It WON'T, however, delete your
+
+### Troubleshooting
+
+> ERROR: for db Cannot start service db: error while creating mount source path '/host_mnt/xxx/data/db': mkdir /host_mnt/Users/xxx/data/db: no such file or directory
+> ERROR: Encountered errors while bringing up the project.
+
+Restarting Docker seemed to fix this. I did that via the UI tool.
+
+## Locale file helpers
+
+There are a several grunt helper functions for validation and managing the locale files. It's important to keep the files
+up to date so every i18n file contains the same keys and won't cause bugs when the user selects the language.
+
+#### Core localization files
+
+These are found in `src/i18n`. They contain all the core i18n files.
+
+- `grunt validateI18n` - general validation function to examine all the localization files and check everything in sync.
+- `grunt validateI18n --key=fr` - same as above, except it only looks at a particular locale file.
+- `grunt removeI18nKey --key=xxx` - where xxx is the property name.
+- `grunt sortI18nFiles` - sorts the keys of all i18n files alphabetically.
+
+### Text rules:
+
+- titles, headings: capitalize every letter
+- tooltips: sentence case, no ending period
+
+### Building
+
+Local dev, general steps:
+
+- `npm run start` - builds and rubs the client-side code
+- `npm run startDevServer` - starts the dev server
+
+### Common problems
+
+#### Logging in with Google works but logs out when page is refreshed
+
+If you find that after logging in with Google it gets lost after refreshing the page, check your system clock. The
+OAuth2Client lib we're using uses the system clock when re-validating the google auth info. My own computer locally
+(an 2017 Mac) when I leave it on for too long the time gets very out of whack, causing this problem. Restarting the
+computer (which restarts the clock) fixes it.
+
+#### M1 mac
+
+After upgrading to Ventura, I found I had problems running Docker.
+
+To fix it I enabled "Use Rosetta for x86/amd64 emulation on Apple Silicon" in Docker Desktop and added a
+`export DOCKER_DEFAULT_PLATFORM=linux/amd64` env variable, then wiped out all existing docker containers and started afresh.
diff --git a/README.md b/README.md
index f10cbb88d..55767f38a 100644
--- a/README.md
+++ b/README.md
@@ -1,105 +1,43 @@
 # generatedata.com
 
-[![Build Status](https://travis-ci.org/benkeen/generatedata.png?branch=master)](https://travis-ci.org/benkeen/generatedata)
-
-This is the repo for the standalone, downloadable version of [generatedata.com](http://www.generatedata.com).
-
-Generally the trunk is pretty stable, but it's never guaranteed. If you're downloading the code, I'd suggest getting the most recent tag: https://github.com/benkeen/generatedata/releases
+This is the repo for the downloadable version of [generatedata.com](https://generatedata.com). The script is essentially
+an _engine_ to generate any sort of random data in any format. It currently comes with 30 or
+so _Data Types_ (types of data it generates), 12 _Export Types_ (formats for the data, like CSV, SQL, JSON), plus
+around 32 data sets for specific countries (city names, regions etc). But more importantly it can be extended in any
+way you want. Check out the [developer documentation](https://benkeen.github.io/generatedata/developerdoc/intro/) for more
+information on that.
+
+### Programmatic generation
+
+The current major version of the script is 4.x, which was a big change over earlier releases. Earlier versions were written
+in PHP and MYSQL and 3.x offered a REST API to let you generate the data programmatically rather than via an API. While this is
+still planned for 4.x it's not currently offered, and the plan it to tackle that _after_ making the script available
+as an npm package - which we feel will be a more convenient way to programmatically generate data over the more agnostic
+REST approach.
+`
 
 ## Requirements
-- PHP 5.3 or later
-- MySQL 4.1.3 or later
 
-## How to Install / Documentation
+- Docker
+- node
+- nvm
 
-For the installation instructions, user documentation and developer documentation, check out:
-http://benkeen.github.io/generatedata/
+See the [Installation instructions](https://benkeen.github.io/generatedata/userdoc/installation/intro) for full details.
 
-Installation is really, really simple. I deliberately wrote the script to be as self-contained as possible and not require
-additional PHP/Server configuration when setting it up. That said, it *does* require PHP 5.3.0 or later. See the documentation
-for more info.
-
-## Test Coverage
+## How to Install / Documentation
 
-Test coverage is pretty weak right now! I'm in the midst of adding phpunit tests and integrating it with Travis, but it's going to be a little hairy for a while just yet.
+For installation instructions, user and developer documentation, check out:
+https://benkeen.github.io/generatedata/
 
 ## License
 
-This script is freely available under the GPL 3 license. See license.txt in the root folder. Please note that all contributors agree that all code is released under this license.
+This script is freely available under the GPL 3 license. See license.txt in the root folder. Please note that all
+contributors agree that all code is released under this license.
 
 ## Contributors
 
-In addition to the many folks who submit bug reports, a big thanks to the following for their help extending the script:
-
-- Zeeshan Shaikh - PAN, PIN, CVV, Track 1 and 2 Data Types (3.1.1)
-- [Ap.Mathu](https://github.com/apmuthu) - SQL Export Type updates (INSERT IGNORE)
-- [Manu Ullas](https://github.com/unullmass) - compression option for downloads (3.0.9)
-- [rsicher1](https://github.com/rsicher1) - credit card Data Type (3.0.9)
-- Joeri Noort - IBAN numbers (3.0.8)
-- [Michel Roca](https://github.com/mRoca) - Full and correct French translation (3.0.7)
-- Marco Corona - LDIF Export Type added (3.0.7)
-- [Andre Fortin](https://github.com/twindual) - original Costa Rica Country plugin & Phone-Regional Data Type (3.0.6)
-- [Marcello Verona](https://github.com/marciuz) - Italy Country plugin (3.0.4)
-- [Roberto Aragón](https://github.com/robarago), Charo Baena - Spanish translation & Country plugin (3.0.2)
-- [Kent Chenery](https://github.com/kchenery) - MS SQL plugin (3.0.1)
-
-## Changelog
-
-3.1.1 - Jan 31, 2014
-- New credit card data types: PAN, PIN, CVV, Track 1 and Track 2 courtesy of Zeeshan Shaikh.
-- INSERT IGNORE option added to the SQL Export Type, thanks to [Ap.Mathu](https://github.com/apmuthu)
-- Bug fixes: https://github.com/benkeen/generatedata/issues?milestone=11&page=1&state=closed
-
-3.1.0 - Dec 19, 2013
-- Bug fix for accidental short-tags that were introduced in earlier code
-
-3.0.9 - Dec 11, 2013
-- Compression option added to reduce download sizes, courtesy of [Manu Ullas](https://github.com/unullmass) - thanks!
-- New credit card Data Type, thanks to [rsicher1](https://github.com/rsicher1)
-- You can now make copies of Data Sets, via the main dialog window. Just check a single row and click "Copy Data Set" button.
-- CodeMirror updated to v3.2.0
-- Bug fixes: https://github.com/benkeen/generatedata/issues?milestone=9&page=1&state=closed
-
-3.0.8 - Oct 28, 2013
-- International Bank Numbers - thanks, Joeri Noort!
-- PostgreSQL database support added to SQL Export Type
-- Bug fixes: https://github.com/benkeen/generatedata/issues?milestone=8&page=1&state=closed
-
-3.0.7 - Sept 7, 2013
-- LDIF Export Type support - thanks, [Marco Corona](https://github.com/coronam)!
-- Proper (genuine!) French translation courtesy of [Michel Roca](https://github.com/mRoca)
-- Optional JS, CSS minimization and bundling via Grunt. See help documentation for more information:
-[http://benkeen.github.io/generatedata/developer.html#bundling](http://benkeen.github.io/generatedata/developer.html#bundling)
-- PHP 5.5 compatibility fixes: database connection now with mysqli; Generator class renamed to DataGenerator due
-to naming conflict.
-- Bug fixes: https://github.com/benkeen/generatedata/issues?milestone=7&page=1&state=closed
-
-3.0.6 - Aug 1, 2013
-- Costa Rica Country plugin, Phone-Regional Data Type added, courtesy of [Andre Fortin](https://github.com/twindual)
-- bug fixes, see: https://github.com/benkeen/generatedata/issues?milestone=6&page=1&state=closed
-
-3.0.5 - July 13, 2013
-- Currency Data Type added.
-- Assorted bug fixes, see: https://github.com/benkeen/generatedata/issues?milestone=5&page=1&state=closed
-
-3.0.4 - July 2nd, 2013
-- Italy Export Type, courtesy of [Marcello Verona](https://github.com/marciuz)
-- Regional Names Data Type added, data for Italy and France from [Marcello Verona](https://github.com/marciuz)
-
-3.0.3 - June 23, 2013
-- Bug fixes. See: https://github.com/benkeen/generatedata/issues?milestone=3
-
-3.0.2 - June 12, 2013
-- Spanish translation and Country plugin added (thanks, [@robarago](https://github.com/robarago)!)
-- bug fixes, other updates: https://github.com/benkeen/generatedata/issues?milestone=2&state=closed
-
-3.0.1 - June 1st, 2013
-- MSSQL support added (thanks, [Kent](https://github.com/kchenery)!)
-- Assorted bug fixes / updates. See: https://github.com/benkeen/generatedata/issues?milestone=1&state=closed
-
-3.0.0 - May 21st, 2013
-- Initial release.
-
+In addition to the many fine folk who submit bug reports, a big thanks to the following for their help extending the script:
+https://github.com/benkeen/generatedata/graphs/contributors
 
 Ben Keen
-[@vancouverben](https://twitter.com/#!/vancouverben)
+https://github.com/benkeen
diff --git a/V5_CHANGES.md b/V5_CHANGES.md
new file mode 100644
index 000000000..5183ca892
--- /dev/null
+++ b/V5_CHANGES.md
@@ -0,0 +1,39 @@
+# 5.x Changes
+
+This file tracks the changes in 5.x. I'll keep this updated as I progress.
+
+## High-level changes
+
+The repo was a bit of a mess architecturally. Code was being referenced all over the place - env vars were read by FE and BE code, shared code was sometimes duplicated and there was a ton of complex logic around building the app and dynamically generating files out of plugins and so on and so forth. Basically it had grown into a bit of a ball of mud. The 4.x version did tons of great stuff, but didn't really choose a sane architecture.
+
+Version 5.x is devoted to a _re-architecture only_ - I'm not changing any UI or functionality. I know - _booooring_. The biggest change is that **I'm converted to a standard monorepo using [Turborepo](https://turborepo.com/)**. I haven't used it much before but it seems like a usable and sensible tool. There won't be any fundamental changes to any of the technologies beyond various version updates. It'll still use Docker (sigh, I hate Docker), React, Redux, TS etc. but the structure of the code will be quite different.
+
+The chief motivation for this major version bump that whenever I return to work on this project to complete the unfinished CLI, I find myself stymied by the lack of a formal architecture and run into problem and problem trying to create the CLI in a clean standalone format. Also, since I the simplicity of PHP / MySQL / MAMP/WAMP etc. it became far harder for devs to actually set up and use. That's a real pity. I don't think I can get around the fact that Docker is far more complex but I can at least make the on-ramp easier.
+
+## Packages
+
+Logical units of the code are now going to be split into standard _npm packages_, found under `apps` and `packages`.
+
+**Apps**
+
+- `apps/client` - the main client-side app.
+- `apps/server` - the server-side app. I'd LOVE to actually convert this to TS and not continue to use plain wild-west JS, but I don't want to bloat the work, so will probably punt on it until a later version. We'll see.
+
+**Packages**
+
+- `packages/cli` - this was the never-completed CLI package. Still **definitely** something I want to complete!
+- `packages/cli-test` - testing for the CLI package. This might be temporary. Not sure it needs to be separate from `cli` itself.
+- `packages/config` - this'll house the main configuration settings and replace the old `.env` file. For simplicity and backward compatibility, I've left the same uppercase names from the old .env variables.
+- `packages/plugins` - the countries, Data Types and Export Types. Perhaps I'll split them into separate packages for each, but for now they're lumped in the same package.
+- `packages/types` - global types.
+
+## Other changes
+
+- moved to pnpm
+
+## Bootstrap process for new clones
+
+(Need instructions):
+
+- install turborepo CLI, nvm, pnpm globals
+- `pnpm install` - this bootstraps the whole repo
diff --git a/ajax.php b/ajax.php
deleted file mode 100755
index 0a2e6cf8d..000000000
--- a/ajax.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * This handles all Ajax requests for the Data Generator Core. Note that we only include the library.php
- * here, we don't Core::init(). Depending on the context (e.g. installation), that may not be desired.
- */
-require_once(__DIR__ . "/library.php");
-
-// sessions needed here AFTER installation, to get access to $user [or should it be passed &
-// validated with all requests?]
-header("Cache-Control: private, no-cache, must-revalidate");
-header("Content-Type: application/json; charset=utf-8");
-
-$ajaxRequest = new AjaxRequest(@$_POST["action"], $_POST);
-$encoded = json_encode($ajaxRequest->getResponse());
-$errorCode = json_last_error();
-if ($errorCode) {
-	switch ($errorCode) {
-        case JSON_ERROR_NONE:
-            echo ' - No errors';
-        	break;
-        case JSON_ERROR_DEPTH:
-            echo ' - Maximum stack depth exceeded';
-        	break;
-        case JSON_ERROR_STATE_MISMATCH:
-            echo ' - Underflow or the modes mismatch';
-        	break;
-        case JSON_ERROR_CTRL_CHAR:
-            echo ' - Unexpected control character found';
-        	break;
-        case JSON_ERROR_SYNTAX:
-            echo ' - Syntax error, malformed JSON';
-        	break;
-        case JSON_ERROR_UTF8:
-            echo ' - Malformed UTF-8 characters, possibly incorrectly encoded';
-        	break;
-        default:
-            echo ' - Unknown error';
-        	break;
-    }
-} else {
-	echo $encoded;
-}
diff --git a/apps/client/.babelrc b/apps/client/.babelrc
new file mode 100644
index 000000000..801c900bf
--- /dev/null
+++ b/apps/client/.babelrc
@@ -0,0 +1,29 @@
+{
+	"presets": [
+		[
+			"@babel/preset-env",
+			{
+				"targets": {
+					"esmodules": true
+				}
+			}
+		],
+		[
+			"@babel/preset-react", {}
+		]
+	],
+	"plugins": [
+		"@babel/plugin-syntax-dynamic-import"
+	],
+	"env": {
+		"BUILD": {
+			"comments": true
+		},
+		"DEV": {
+			"comments": true
+		},
+		"DIST": {
+			"comments": true
+		}
+	}
+}
diff --git a/apps/client/.eslintrc.js b/apps/client/.eslintrc.js
new file mode 100644
index 000000000..d1c6a3b5f
--- /dev/null
+++ b/apps/client/.eslintrc.js
@@ -0,0 +1,64 @@
+module.exports = {
+	parser: '@typescript-eslint/parser',
+	parserOptions: {
+		ecmaVersion: 6,
+		sourceType: 'module',
+		ecmaFeatures: {
+			jsx: true,
+			experimentalObjectRestSpread: true
+		}
+	},
+	env: {
+		browser: true,
+		es6: true,
+		node: true
+	},
+	plugins: ['react'],
+	extends: ['plugin:react/recommended', 'plugin:@typescript-eslint/recommended'],
+	rules: {
+		semi: [2, 'always'],
+		indent: [
+			'error',
+			'tab',
+			{
+				SwitchCase: 1
+			}
+		],
+		'max-len': [1, { code: 140 }],
+		// '@stylistic/js/indent/max-len': ['warning', 140],
+		'object-curly-spacing': ['error', 'always'],
+		allowIndentationTabs: 0,
+		'no-extra-parens': ['off'],
+		'no-multi-spaces': 'error',
+		'react/prop-types': ['off'],
+		'comma-dangle': 'off',
+		'no-tabs': 'off',
+		'no-multiple-empty-lines': 'off',
+		'no-plusplus': 'off',
+		'import/no-unresolved': 'off',
+		'arrow-body-style': 'off',
+		'import/extensions': 'off',
+		'import/prefer-default-export': 'off',
+		'lines-between-class-members': 'off',
+		'object-curly-newline': 'off',
+		quotes: ['error', 'single'],
+		'import/no-mutable-exports': 'off',
+		'react/no-unused-prop-types': 'off',
+		'react/no-unescaped-entities': 'off',
+		'react/jsx-indent': [2, 'tab'],
+		'react/jsx-indent-props': [2, 'tab'],
+		'@typescript-eslint/no-empty-function': 'off',
+		'@typescript-eslint/ban-ts-ignore': 'off',
+		'@typescript-eslint/interface-name-prefix': 'off',
+		'@typescript-eslint/no-use-before-define': 'off',
+		'@typescript-eslint/no-explicit-any': 'off',
+		'@typescript-eslint/no-var-requires': 'off',
+		'@typescript-eslint/no-non-null-assertion': 'off',
+		'@typescript-eslint/ban-ts-comment': 'off'
+	},
+	settings: {
+		react: {
+			version: '16.13.1'
+		}
+	}
+};
diff --git a/apps/client/.gitignore b/apps/client/.gitignore
new file mode 100644
index 000000000..032880991
--- /dev/null
+++ b/apps/client/.gitignore
@@ -0,0 +1,4 @@
+_env.ts
+dist/*
+node_modules/*
+.turbo
\ No newline at end of file
diff --git a/apps/client/_localeFileMap.ts b/apps/client/_localeFileMap.ts
new file mode 100644
index 000000000..b0413105d
--- /dev/null
+++ b/apps/client/_localeFileMap.ts
@@ -0,0 +1,17 @@
+/* eslint quotes:0 */
+import { GDLocaleMap } from '@generatedata/types';
+
+export const localeFileMap: GDLocaleMap = {
+	"ar": "ar-082d52b0.js",
+	"de": "de-9c5c6e88.js",
+	"en": "en-ec98c99d.js",
+	"es": "es-d2dc0ab7.js",
+	"fr": "fr-76831d50.js",
+	"hi": "hi-dd5691a1.js",
+	"ja": "ja-79d51d8b.js",
+	"nl": "nl-1499548d.js",
+	"pt": "pt-c7796933.js",
+	"ru": "ru-32bc90c7.js",
+	"ta": "ta-9e10d34d.js",
+	"zh": "zh-20134d2b.js"
+};
\ No newline at end of file
diff --git a/apps/client/_pluginWebWorkers.ts b/apps/client/_pluginWebWorkers.ts
new file mode 100644
index 000000000..549f6840d
--- /dev/null
+++ b/apps/client/_pluginWebWorkers.ts
@@ -0,0 +1,7 @@
+/* eslint quotes:0 */
+export default {
+	"generationWorker": "generation.worker-1dc7caad6d37493ad34aaebb76baa983.js",
+	"workerUtils": "workerUtils-d87db21604e56391c5d7def129452a61.js",
+	"dataTypes": {},
+	"exportTypes": {}
+};
\ No newline at end of file
diff --git a/apps/client/build/build.js b/apps/client/build/build.js
new file mode 100644
index 000000000..9f3407344
--- /dev/null
+++ b/apps/client/build/build.js
@@ -0,0 +1,100 @@
+// TODO remove this file once everything is finalized
+const fs = require('fs');
+const path = require('path');
+const helpers = require('./helpers');
+
+if (result.error) {
+	console.error("\nMissing .env file. Please see the documentation about setting up your environment.\n");
+	return;
+}
+
+const banner = `/**
+ * This file is autogenerated. Do not edit!
+ * ----------------------------------------
+ **/`;
+
+// TODO move to CLI package
+// const createCliTypesFile = () => {
+// 	let content = banner + '\n\nimport { DataType, ExportType } from \'../../../client/_plugins\';\n';
+
+// 	const blacklistedDataTypes = process.env.GD_DATA_TYPE_BLACKLIST.split(',');
+// 	const dataTypes = helpers.getPlugins('dataTypes', []);
+// 	const dtList = dataTypes.filter((dt) => blacklistedDataTypes.indexOf(dt) === -1); // TODO can this be in the prev lines, second param?
+
+// 	dtList.forEach((dt) => {
+// 		content += `import { generate as ${dt}G } from '../../../client/src/plugins/dataTypes/${dt}/${dt}.generate';\n`
+// 		content += `import { defaultGenerationOptions as ${dt}DGO } from '../../../client/src/plugins/dataTypes/${dt}/${dt}.state';\n`
+// 	});
+
+// 	content += `\n\nexport const dataTypeNodeData = {\n`;
+// 	const rows = dtList.map((dt) => `\t[DataType.${dt}]: { generate: ${dt}G, defaultGenerationOptions: ${dt}DGO }`);
+// 	content += `${rows.join(',\n')}\n};\n\n`
+
+// 	const blacklistedExportTypes = process.env.GD_EXPORT_TYPE_BLACKLIST.split(',');
+// 	const etList = helpers.getPlugins('exportTypes', blacklistedExportTypes);
+
+// 	etList.forEach((et) => {
+// 		content += `import { generate as ${et}G } from '../../../client/src/plugins/exportTypes/${et}/${et}.generate';\n`
+// 		content += `import { defaultGenerationOptions as ${et}DGO } from '../../../client/src/plugins/exportTypes/${et}/${et}.state';\n`
+// 	});
+
+// 	content += `\n\nexport const exportTypeNodeData = {\n`;
+// 	const etRows = etList.map((et) => `\t[ExportType.${et}]: { generate: ${et}G, defaultGenerationOptions: ${et}DGO }`);
+// 	content += `${etRows.join(',\n')}\n};\n\n`
+
+// 	const file = path.join(__dirname, '../../../packages/cli/src', '_cliTypes.ts'); // TODO
+// 	if (fs.existsSync(file)) {
+// 		fs.unlinkSync(file);
+// 	}
+// 	fs.writeFileSync(file, content);
+// };
+
+
+// TODO move this to the website code. Until it's needed for the core script; dump it.
+// const createImportFile = () => {
+// 	const importLines = [];
+// 	const files = process.env.GD_IMPORT_FILES;
+
+// 	if (files) {
+// 		files.split(',').forEach((filePathFromRoot) => {
+// 			importLines.push(`import '../${filePathFromRoot}';`);
+// 		});
+// 	}
+
+// 	const file = path.join(__dirname, '..', '_imports.ts');
+// 	if (fs.existsSync(file)) {
+// 		fs.unlinkSync(file);
+// 	}
+
+// 	// rollup gets confused with an empty file, so we add a default exports just in case
+// 	if (!importLines.length) {
+// 		importLines.push(`// DO NOT EDIT: This is autogenerated by a node script \nexport default {};`);
+// 	}
+// 	fs.writeFileSync(file, importLines.join('\n'));
+// };
+
+
+// const generateNamesFile = () => {
+// 	const namePlugins = helpers.getNamePlugins();
+
+// 	let content = banner + '\n\n';
+// 	namePlugins.forEach((folder) => {
+// 		content += `import ${folder} from './src/plugins/countries/${folder}/names';\n`;
+// 	});
+
+// 	content += `\nconst nameFiles = {\n\t${namePlugins.join(',\n\t')}\n};`;
+// 	content += `\nexport default nameFiles;\n`;
+// 	content += '\nexport type CountryNameFiles = keyof typeof nameFiles;\n';
+
+// 	const file = path.join(__dirname, '..', '_namePlugins.ts');
+// 	if (fs.existsSync(file)) {
+// 		fs.unlinkSync(file);
+// 	}
+// 	fs.writeFileSync(file, content);
+// };
+
+// generateEnvFile('_env.ts', JSON.stringify(envFile, null, '\t'));
+// generateNamesFile();
+
+// createCliTypesFile();
+// createImportFile();
diff --git a/apps/client/build/helpers.js b/apps/client/build/helpers.js
new file mode 100644
index 000000000..8a0a6b14c
--- /dev/null
+++ b/apps/client/build/helpers.js
@@ -0,0 +1,97 @@
+const fs = require('fs');
+const md5File = require('md5-file');
+const path = require('path');
+
+const getPlugins = (pluginType, blacklist, checkConfigFileExistence = true) => {
+	console.log(require.resolve(`@generatedata/plugins/dist/plugins/${pluginType}`));
+
+	// const baseFolder = path.join(__dirname, '..', `/src/plugins/${pluginType}`);
+	// const folders = fs.readdirSync(baseFolder);
+
+	// return folders.filter((folder) => {
+	// 	if (blacklist.indexOf(folder) !== -1) {
+	// 		return false;
+	// 	}
+	// 	const bundle = `${baseFolder}/${folder}/bundle.ts`;
+	// 	const config = `${baseFolder}/${folder}/config.ts`;
+	// 	if (checkConfigFileExistence) {
+	// 		return fs.existsSync(bundle) && fs.existsSync(config);
+	// 	} else {
+	// 		return fs.existsSync(bundle);
+	// 	}
+	// });
+};
+
+// const getNamePlugins = () => {
+// 	const baseFolder = path.join(__dirname, '..', `/src/plugins/countries`);
+
+// 	const folders = fs.readdirSync(baseFolder);
+
+// 	return folders.filter((folder) => {
+// 		const nameFile = `${baseFolder}/${folder}/names.ts`;
+// 		return fs.existsSync(nameFile);
+// 	});
+// };
+
+const getHashFilename = (target) => `__hash-${path.basename(target, path.extname(target))}`;
+
+const generateWorkerHashfile = (src, folder) => {
+	const hashFilename = getHashFilename(src);
+	const fileHash = md5File.sync(`${folder}/${src}`);
+	const fileWithPath = `${folder}/${hashFilename}`;
+
+	if (fs.existsSync(fileWithPath)) {
+		fs.unlinkSync(fileWithPath);
+	}
+	fs.writeFileSync(fileWithPath, fileHash);
+};
+
+/**
+ * Get a new scoped filename for a web worker plugin file (Export Type, Data Type, Country).
+ * @param file - the full path including filename or just the filename
+ * @param workerType - "country", "dataType" or "exportType
+ */
+const getScopedWorkerFilename = (file, workerType) => {
+	let fileWithoutExt = path.basename(file, path.extname(file));
+
+	let prefix = '';
+	if (workerType === 'dataType') {
+		prefix = 'DT-';
+	} else if (workerType === 'exportType') {
+		prefix = 'ET-';
+	} else if (workerType === 'country') {
+		prefix = 'C-';
+		const folder = path.dirname(file).split(path.sep);
+		fileWithoutExt = folder[folder.length-1];
+	}
+
+	return `${prefix}${fileWithoutExt}.js`;
+};
+
+const hasWorkerFileChanged = (filename, hashFile) => {
+	let hasChanged = true;
+
+	if (fs.existsSync(hashFile) && fs.existsSync(filename)) {
+		const hash = fs.readFileSync(hashFile, 'utf8');
+
+		if (md5File.sync(filename) === hash) {
+			hasChanged = false;
+		}
+	}
+
+	return hasChanged;
+};
+
+// returns all the items in arr1 that are not in arr2
+const arrayDiff = (arr1, arr2) => arr1.filter((a) => arr2.indexOf(a) === -1);
+
+
+module.exports = {
+	getPlugins,
+	// getNamePlugins,
+	getHashFilename,
+	generateWorkerHashfile,
+	getScopedWorkerFilename,
+	hasWorkerFileChanged,
+	arrayDiff
+};
diff --git a/apps/client/build/i18n.js b/apps/client/build/i18n.js
new file mode 100644
index 000000000..f1b9a889d
--- /dev/null
+++ b/apps/client/build/i18n.js
@@ -0,0 +1,237 @@
+const fs = require('fs');
+const path = require('path');
+const helpers = require('./helpers');
+
+const result = require('dotenv').config({ path: path.resolve(__dirname, '../../.env') });
+if (result.error) {
+	return;
+}
+
+const locales = process.env.GD_LOCALES.split(',');
+
+const getCoreLocaleFileStrings = (locale) => {
+	return require(getCoreLocaleFilePath(locale));
+};
+
+const findMissingStrings = (stringsByLocale, targetLocale = null, baseLocale = 'en') => {
+	const locales = Object.keys(stringsByLocale);
+	const results = [];
+
+	const baseLocaleKeys = Object.keys(stringsByLocale[baseLocale]);
+	locales.forEach((locale) => {
+		if (targetLocale && targetLocale !== locale) {
+			return;
+		}
+
+		const targetLocaleKeys = Object.keys(stringsByLocale[locale]);
+
+		// missing from source file
+		const missing = helpers.arrayDiff(baseLocaleKeys, targetLocaleKeys);
+		missing.forEach((key) => {
+			results.push({ key, locale });
+		});
+
+		// extra ones in locale file
+		const extra = helpers.arrayDiff(targetLocaleKeys, baseLocaleKeys);
+		extra.forEach((key) => {
+			results.push({ key, locale, isExtra: true });
+		});
+	});
+
+	return results;
+};
+
+const findStringsInDataTypeEnFileMissingFromOtherLangFiles = (results, dataType, stringsByLocale) => {
+	const langs = Object.keys(stringsByLocale);
+
+	let count = 0;
+	results.lines.push(`\nEnglish strings missing from other lang files:\n-------------------------------------------`);
+	Object.keys(stringsByLocale['en']).forEach((key) => {
+		const missing = [];
+		langs.forEach((locale) => {
+			if (targetLocale && targetLocale !== locale) {
+				return;
+			}
+
+			if (!stringsByLocale[locale][key]) {
+				missing.push(locale);
+			}
+		});
+		if (missing.length > 0) {
+			count++;
+			results.lines.push(`${key}\n   -missing from: ${missing.join(', ')}`);
+		}
+	});
+
+	if (count > 0) {
+		results.error = true;
+		results.lines.push(`-- MISSING ${count}`);
+	} else {
+		results.lines.push('All good!\n');
+	}
+
+	return results;
+};
+
+
+
+const getCoreLocaleFilePath = (locale) => path.join(__dirname, '..', `src/i18n/${locale}.json`);
+const getDataTypeLocaleFilePath = (dataType, locale) => path.join(__dirname, '..', `src/plugins/dataTypes/${dataType}/i18n/${locale}.json`);
+
+const getPluginLocaleFilePath = (plugin, pluginType, locale) => {
+	const pluginFolder = pluginType === 'dataType' ? 'dataTypes' : 'exportTypes';
+	return path.join(__dirname, '..', `src/plugins/${pluginFolder}/${plugin}/i18n/${locale}.json`);
+};
+
+const removeKeyFromI18nFiles = (key) => {
+	locales.forEach((locale) => {
+		const localeFile = getCoreLocaleFileStrings(locale);
+		delete localeFile[key];
+		const file = getCoreLocaleFilePath(locale);
+		fs.writeFileSync(file, JSON.stringify(localeFile, null, '\t'));
+	});
+};
+
+const parseCoreToFindUnusedStrings = (results, en) => {
+	// let missingKeys = Object.keys(en);
+	//
+	// const ignoreFolders = [
+	// 	'src/global/lang/',
+	// 	'src/global/vendor/',
+	// 	'src/global/codemirror/',
+	// 	'src/global/fancybox/',
+	// 	'src/global/images/',
+	// 	'dist/',
+	// 	'node_modules/',
+	// 	'src/modules/'
+	// ];
+	//
+	// const files = walk('./src');
+	// files.forEach((file) => {
+	// 	for (let i=0; i<ignoreFolders.length; i++) {
+	// 		const re = new RegExp(ignoreFolders[i]);
+	// 		if (re.test(file)) {
+	// 			return;
+	// 		}
+	// 	}
+	//
+	// 	if (!(/[php|txt|tpl|html|js]$/.test(file))) {
+	// 		return;
+	// 	}
+	//
+	// 	const lines = new lineByLine(file);
+	// 	let line;
+	// 	while (line = lines.next()) {
+	// 		line.toString('ascii');
+	//
+	// 		// loop through all keys that still haven't been found yet and remove any that are found on the row
+	// 		let updatedKeys = [];
+	// 		missingKeys.forEach((key) => {
+	// 			const regex = new RegExp(key);
+	//
+	// 			// very kludgy, but the only place Form Tools uses dynamic keys is for dates: ignore all those keys.
+	// 			// We also ignore any i18n keys flagged for global use across FT modules
+	// 			if (!(/^date_/.test(key)) && !regex.test(line) && globalI18nStrings.indexOf(key) === -1) {
+	// 				updatedKeys.push(key);
+	// 			}
+	// 		});
+	//
+	// 		missingKeys = updatedKeys;
+	// 	}
+	// });
+	//
+	// if (missingKeys.length > 0) {
+	// 	results.error = true;
+	// 	results.lines.push(`\nUNUSED KEYS:\n${missingKeys.join('\n  --')}`);
+	// }
+};
+
+const getPluginLocaleStrings = (plugin, pluginType) => {
+	const result = {};
+	locales.forEach((locale) => {
+		result[locale] = require(getPluginLocaleFilePath(plugin, pluginType, locale));
+	});
+	return result;
+};
+
+const validateCoreI18n = (baseLocale, targetLocale) => {
+	const stringsByLocale = {};
+	locales.forEach((locale) => {
+		stringsByLocale[locale] = getCoreLocaleFileStrings(locale);
+	});
+
+	const missing = findMissingStrings(stringsByLocale, targetLocale, baseLocale);
+	return getMissingStrMessage(missing, baseLocale);
+};
+
+const validateDataTypeI18n = (baseLocale, targetDataType) => {
+	const dataTypes = helpers.getPlugins('dataTypes', [], false);
+
+	let str = '';
+	dataTypes.forEach((dataType) => {
+		if (targetDataType && targetDataType !== dataType) {
+			return;
+		}
+
+		const stringsByLocale = getPluginLocaleStrings(dataType, 'dataType');
+		const missing = findMissingStrings(stringsByLocale);
+
+		str += getMissingStrMessage(missing, baseLocale, `${dataType} -- `);
+	});
+
+	return str;
+};
+
+const validateExportTypeI18n = (baseLocale, targetExportType) => {
+	const exportTypes = helpers.getPlugins('exportTypes', [], false);
+
+	let str = '';
+	exportTypes.forEach((dataType) => {
+		if (targetExportType && targetExportType !== dataType) {
+			return;
+		}
+
+		const stringsByLocale = getPluginLocaleStrings(dataType, 'exportType');
+		const missing = findMissingStrings(stringsByLocale);
+
+		str += getMissingStrMessage(missing, baseLocale, `${dataType} -- `);
+	});
+
+	return str;
+};
+
+const getMissingStrMessage = (missing, baseLocale, prefix) => {
+	let str = '';
+	if (missing.length) {
+		let missingStr = [];
+		let extraStr = [];
+		missing.forEach(({ key, locale, isExtra }) => {
+			if (isExtra) {
+				extraStr.push(`- ${key}: ${locale}`);
+			} else {
+				missingStr.push(`- ${key}: ${locale}`);
+			}
+		});
+
+		if (missingStr.length) {
+			str += `\n\n${prefix}"${baseLocale}" strings missing from other lang files:\n-------------------------------------------\n`;
+			str += missingStr.join('\n');
+		}
+		if (extraStr.length) {
+			str += `\n\n${prefix}Extra strings in locale files that are NOT in "${baseLocale}" file:\n-------------------------------------------\n`;
+			str += extraStr.join('\n');
+		}
+	}
+	return str;
+};
+
+module.exports = {
+	locales,
+	getCoreLocaleFileStrings,
+	parseCoreToFindUnusedStrings,
+	removeKeyFromI18nFiles,
+	getPluginLocaleStrings,
+	validateCoreI18n,
+	validateDataTypeI18n,
+	validateExportTypeI18n
+};
diff --git a/apps/client/build/rollup-plugin-remove-imports.js b/apps/client/build/rollup-plugin-remove-imports.js
new file mode 100644
index 000000000..d83ee3a98
--- /dev/null
+++ b/apps/client/build/rollup-plugin-remove-imports.js
@@ -0,0 +1,12 @@
+const RemoveImports = () => ({
+	name: 'remove-imports', // TODO rename to remove-gd-utils-import if this is all it ends up doing
+
+	transform (code) {
+		// replace the import utils line with a declaration. This is because utils is included once for all Data Types
+		// and we don't want to be re-bundling it with each Data Type
+		const cleanCode = code.replace(/\bimport\sutils[^;]+;/, 'declare var utils: any;');
+		return cleanCode;
+	}
+});
+
+export default RemoveImports;
diff --git a/apps/client/build/rollup-plugin-worker-hash.js b/apps/client/build/rollup-plugin-worker-hash.js
new file mode 100644
index 000000000..8e04f14d5
--- /dev/null
+++ b/apps/client/build/rollup-plugin-worker-hash.js
@@ -0,0 +1,15 @@
+const helpers = require('./build/helpers.js'); // ... yup.
+
+// runs after each build. It generates a file in the dist folder containing the hash of the file just generated. This
+// lets the grunt tasks only every regenerate the files that are necessary - because it's really slow
+const WorkerHash = () => {
+	return {
+		name: 'WorkerHash',
+		writeBundle (outputOptions, bundle) {
+			const file = Object.keys(bundle)[0];
+			helpers.generateWorkerHashfile(file, `dist/workers`);
+		}
+	};
+};
+
+export default WorkerHash;
diff --git a/apps/client/gruntfile.js b/apps/client/gruntfile.js
new file mode 100644
index 000000000..b52684197
--- /dev/null
+++ b/apps/client/gruntfile.js
@@ -0,0 +1,524 @@
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
+const helpers = require('./build/helpers');
+const i18n = require('./build/i18n');
+const clientConfig = require('@generatedata/config/clientConfig');
+
+const locales = clientConfig.default.appSettings.GD_LOCALES;
+
+const distFolder = path.join(__dirname, '/dist');
+if (!fs.existsSync(distFolder)) {
+	fs.mkdirSync(distFolder);
+}
+
+const workersFolder = path.join(__dirname, '/dist/workers');
+if (!fs.existsSync(workersFolder)) {
+	fs.mkdirSync(workersFolder);
+}
+
+// returns an 8 char version of the filename hash, used for cache-busting
+const getFilenameHash = (filename) => {
+	const fileBuffer = fs.readFileSync(filename);
+	const hashSum = crypto.createHash('sha256');
+	hashSum.update(fileBuffer);
+
+	return hashSum.digest('hex').substring(0, 8);
+};
+
+// stored in memory here. For the dev environment, changes to web worker files are watched and built separately,
+// then this object is updated with the change & the final map file is regenerated. For prod it's just done in
+// one go
+const webWorkerMap = {
+	generationWorker: '',
+	workerUtils: '',
+	dataTypes: {},
+	exportTypes: {}
+};
+
+module.exports = function (grunt) {
+	const dataTypesFolder = 'dataTypes';
+	const exportTypesFolder = 'exportTypes';
+	const countriesFolder = 'countries';
+	const mainTranslationsFolder = 'src/i18n/';
+
+	const checkPlugin = (pluginType) => {
+		const folderMap = {
+			dataType: dataTypesFolder,
+			exportType: exportTypesFolder,
+			countries: countriesFolder
+		};
+
+		const en = getPluginLocaleFiles(grunt, 'en', folderMap[pluginType]);
+
+		const propsWithI18n = {};
+		Object.keys(en).forEach((plugin) => {
+			Object.keys(en[plugin]).forEach((prop) => {
+				const matches = en[plugin][prop].match(/%\d/g);
+				if (!matches) {
+					return;
+				}
+
+				if (!propsWithI18n[plugin]) {
+					propsWithI18n[plugin] = [];
+				}
+				propsWithI18n[plugin].push({ prop, count: matches.length });
+			});
+		});
+
+		const invalidPlugins = [];
+		locales.forEach((locale) => {
+			if (locale === 'en') {
+				return;
+			}
+			const currLangStrings = getPluginLocaleFiles(grunt, locale, folderMap[pluginType]);
+
+			Object.keys(propsWithI18n).forEach((plugin) => {
+				propsWithI18n[plugin].forEach(({ prop, count }) => {
+					// now loop through each of the placeholders and confirm that the
+					let isValid = true;
+					for (let i = 1; i <= count; i++) {
+						const re = new RegExp(`%${i}`);
+						if (!re.test(currLangStrings[plugin][prop])) {
+							isValid = false;
+						}
+					}
+
+					if (!isValid) {
+						invalidPlugins.push(`Invalid: "${prop}", lang "${locale}", DT: "${plugin}": ${currLangStrings[plugin][prop]}`);
+					}
+				});
+			});
+		});
+
+		return invalidPlugins;
+	};
+
+	const validateStringsWithPlaceholders = () => {
+		let errors = '';
+		const dtErrors = checkPlugin('dataType');
+		if (dtErrors.length) {
+			errors += '\n\nData Type placeholder errors:\n\n' + dtErrors.join('\n');
+		}
+
+		const etErrors = checkPlugin('exportType');
+		if (etErrors.length) {
+			errors += 'Export Type placeholder errors:\n\n' + etErrors.join('\n');
+		}
+
+		const countriesErrors = checkPlugin('countries');
+		if (countriesErrors.length) {
+			errors += 'Export Type placeholder errors:\n\n' + countriesErrors.join('\n');
+		}
+
+		return errors;
+	};
+
+	const generateI18nBundles = () => {
+		const fileHashMap = locales.reduce((acc, locale) => {
+			const coreLocaleStrings = JSON.parse(fs.readFileSync(`src/i18n/${locale}.json`, 'utf8'));
+			const dtImports = getPluginLocaleFiles(grunt, locale, dataTypesFolder);
+			const etImports = getPluginLocaleFiles(grunt, locale, exportTypesFolder);
+			const countryImports = getPluginLocaleFiles(grunt, locale, countriesFolder);
+
+			acc = {
+				...acc,
+				...generateLocaleFileTemplate(locale, coreLocaleStrings, dtImports, etImports, countryImports)
+			};
+			return acc;
+		}, {});
+
+		// generate the i18n hashmap file. This is imported by the source code to know what files to load
+		generateI18nHashMap(fileHashMap);
+	};
+
+	const generateI18nHashMap = (content) => {
+		const filename = './_localeFileMap.ts';
+		const tsContent = `/* eslint quotes:0 */
+import { GDLocaleMap } from '@generatedata/types';
+
+export const localeFileMap: GDLocaleMap = ${JSON.stringify(content, null, '\t')};`;
+		fs.writeFileSync(filename, tsContent);
+	};
+
+	const getPluginLocaleFiles = (grunt, locale, pluginTypeFolder) => {
+		const fullPluginFolder = path.resolve(__dirname, `./node_modules/@generatedata/plugins/dist/${pluginTypeFolder}`);
+		const plugins = fs.readdirSync(fullPluginFolder);
+		const imports = {};
+		plugins.forEach((folder) => {
+			const localeFile = `${fullPluginFolder}/${folder}/i18n/${locale}.json`;
+			if (fs.existsSync(localeFile)) {
+				try {
+					imports[folder] = JSON.parse(fs.readFileSync(localeFile, 'utf8'));
+				} catch (e) {
+					grunt.fail.fatal('problem parsing i18n file: ' + localeFile);
+				}
+			}
+		});
+		return imports;
+	};
+
+	const generateLocaleFileTemplate = (locale, coreLocaleStrings, dtImports, etImports, countryImports) => {
+		const template = `// DO NOT EDIT. This file is generated by a Grunt task.
+// ----------------------------------------------------
+
+(function() { 
+const i18n = {
+	core: ${JSON.stringify(coreLocaleStrings)},
+	dataTypes: ${JSON.stringify(dtImports)},
+	exportTypes: ${JSON.stringify(etImports)},
+	countries: ${JSON.stringify(countryImports)}
+};
+
+// load the locale info via an exposed global
+window.gd.localeLoaded(i18n);
+})();`;
+
+		const filename = `./dist/${locale}.js`;
+		fs.writeFileSync(filename, template);
+
+		const hash = getFilenameHash(filename);
+		const hashedFilename = `${locale}-${hash}.js`;
+		fs.renameSync(filename, `./dist/${hashedFilename}`);
+
+		return {
+			[locale]: hashedFilename
+		};
+	};
+
+	// looks through the plugins and finds the plugins that have a generator web worker file
+	const dataTypeWebWorkerMap = (() => {
+		const baseFolder = path.join(__dirname, 'node_modules/@generatedata/plugins/dist/dataTypes');
+		const folders = fs.readdirSync(baseFolder);
+
+		const map = {};
+		folders.forEach((folder) => {
+			const webworkerFile = path.join(`${baseFolder}/${folder}/${folder}.worker.ts`);
+			if (!fs.existsSync(webworkerFile)) {
+				return;
+			}
+			// map[`dist/workers/DT-${folder}.worker.js`] = [`src/plugins/dataTypes/${folder}/${folder}.worker.ts`];
+			map[`dist/workers/DT-${folder}.worker.js`] = [`${baseFolder}/${folder}/${folder}.worker.ts`];
+		});
+
+		return map;
+	})();
+
+	console.log(dataTypeWebWorkerMap);
+
+	// const exportTypeWebWorkerMap = (() => {
+	// 	const baseFolder = path.join(__dirname, '/src/plugins/exportTypes');
+	// 	const folders = fs.readdirSync(baseFolder);
+
+	// 	const map = {};
+	// 	folders.forEach((folder) => {
+	// 		const webworkerFile = path.join(__dirname, `/src/plugins/exportTypes/${folder}/${folder}.worker.ts`);
+	// 		if (!fs.existsSync(webworkerFile)) {
+	// 			return;
+	// 		}
+	// 		map[`dist/workers/ET-${folder}.worker.js`] = [`src/plugins/exportTypes/${folder}/${folder}.worker.ts`];
+	// 	});
+
+	// 	return map;
+	// })();
+
+	const webWorkerFileListWithType = [
+		{ file: 'src/core/generator/generation.worker.ts', type: 'core' },
+		{ file: 'src/utils/workerUtils.ts', type: 'core' }
+	];
+	// Object.values(dataTypeWebWorkerMap).forEach((dt) => {
+	// 	webWorkerFileListWithType.push({ file: dt[0], type: 'dataType' });
+	// });
+	// Object.values(exportTypeWebWorkerMap).forEach((et) => {
+	// 	webWorkerFileListWithType.push({ file: et[0], type: 'exportType' });
+	// });
+
+	// const webWorkerFileList = webWorkerFileListWithType.map((i) => i.file);
+
+	const generateWorkerMapFile = () => {
+		fs.writeFileSync('./_pluginWebWorkers.ts', `/* eslint quotes:0 */\nexport default ${JSON.stringify(webWorkerMap, null, '\t')};`);
+	};
+
+	const getWebWorkerShellCommands = (omitFiles = {}) => {
+		const commands = {};
+
+		webWorkerFileListWithType.forEach(({ file, type }, index) => {
+			if (omitFiles[file]) {
+				return;
+			}
+
+			const filename = path.basename(file, path.extname(file));
+			let target = `dist/workers/${filename}.js`;
+
+			if (['dataType', 'exportType'].indexOf(type) !== -1) {
+				// 'country'
+				const filename = helpers.getScopedWorkerFilename(file, type);
+				target = `dist/workers/${filename}`;
+			}
+
+			// TODO detect when the command is run and look for the generated __hash-[filename] content, then update
+			commands[`buildWebWorker${index}`] = {
+				command: `npx rollup -c --config-src=${file} --config-target=${target}`
+			};
+		});
+
+		return commands;
+	};
+
+	// generating every web worker bundle takes time. To get around that, rollup generates a file in the dist/workers
+	// file for each bundle, with the filename of form:
+	//      Plugins (e.g.):
+	//          __hash-DT-Alphanumeric.generator
+	//          __hash-ET-JSON.generator
+	//
+	//      Core workers:
+	//          __hash-core.worker
+	//          __hash-generation.worker
+	//          __hash-workerUtils
+	// we then use that information here to check to see if we need to regenerate or not
+	const getWebWorkerBuildCommandNames = () => {
+		const omitFiles = {};
+		webWorkerFileListWithType.forEach(({ file, type }) => {
+			const filename = helpers.getScopedWorkerFilename(file, type);
+			const filenameHash = helpers.getHashFilename(filename);
+
+			if (!helpers.hasWorkerFileChanged(`${workersFolder}/${filename}`, `${workersFolder}/${filenameHash}`)) {
+				omitFiles[file] = true;
+			}
+		});
+
+		return Object.keys(getWebWorkerShellCommands(omitFiles)).map((cmdName) => `shell:${cmdName}`);
+	};
+
+	// const webWorkerWatchers = (() => {
+	// 	const tasks = {};
+
+	// 	// this contains *ALL* web worker tasks. It ensures that everything is watched.
+	// 	webWorkerFileList.forEach((workerPath, index) => {
+	// 		tasks[`webWorkerWatcher${index}`] = {
+	// 			files: [workerPath],
+	// 			options: { spawn: false },
+	// 			tasks: [`shell:buildWebWorker${index}`, `md5:webWorkerMd5Task${index}`, 'generateWorkerMapFile']
+	// 		};
+	// 	});
+
+	// 	return tasks;
+	// })();
+
+	const processMd5Change = (fileChanges) => {
+		const oldPath = fileChanges[0].oldPath;
+		const oldFile = path.basename(oldPath);
+		const newFilename = path.basename(fileChanges[0].newPath);
+
+		if (oldPath === 'dist/workers/generation.worker.js') {
+			webWorkerMap.generationWorker = newFilename;
+		} else if (oldPath === 'dist/workers/workerUtils.js') {
+			webWorkerMap.workerUtils = newFilename;
+		} else {
+			const [pluginFolder] = oldFile.split('.');
+			const cleanPluginFolder = pluginFolder.replace(/^(DT-|ET-)/, '');
+
+			if (/^DT-/.test(oldFile)) {
+				webWorkerMap.dataTypes[cleanPluginFolder] = newFilename;
+			} else if (/^ET-/.test(oldFile)) {
+				webWorkerMap.exportTypes[cleanPluginFolder] = newFilename;
+			}
+		}
+	};
+
+	// these tasks execute individually AFTER the worker has already been generated in the dist/workers folder
+	const webWorkerMd5Tasks = (() => {
+		const tasks = {};
+		webWorkerFileListWithType.forEach(({ file, type }, index) => {
+			const fileName = helpers.getScopedWorkerFilename(file, type);
+			const newFileLocation = `dist/workers/${fileName}`; // N.B. here it's now a JS file, not TS
+
+			tasks[`webWorkerMd5Task${index}`] = {
+				files: {
+					[newFileLocation]: newFileLocation
+				},
+				options: {
+					after: (fileChanges) => processMd5Change(fileChanges, webWorkerMap)
+				}
+			};
+		});
+
+		return tasks;
+	})();
+
+	const getWebWorkerMd5TaskNames = () => {
+		return Object.keys(webWorkerMd5Tasks).map((cmdName) => `md5:${cmdName}`);
+	};
+
+	grunt.initConfig({
+		cssmin: {
+			options: {
+				mergeIntoShorthands: false,
+				roundingPrecision: -1
+			},
+			target: {
+				files: {
+					'dist/styles.css': [
+						'src/resources/codemirror.css',
+						'src/resources/ambience.css',
+						'src/resources/bespin.css',
+						'src/resources/cobalt.css',
+						'src/resources/darcula.css',
+						'src/resources/lucario.css'
+					]
+				}
+			}
+		},
+
+		copy: {
+			main: {
+				files: [
+					{
+						expand: true,
+						cwd: 'src/images',
+						src: ['*'],
+						dest: 'dist/images/'
+					}
+				]
+			},
+
+			// TODO should minify these too
+			codeMirrorModes: {
+				files: [
+					{
+						expand: true,
+						cwd: './node_modules/codemirror/mode',
+						src: ['**/*'],
+						dest: 'dist/codeMirrorModes/'
+					}
+				]
+			}
+		},
+
+		clean: {
+			dist: ['dist']
+		},
+
+		shell: {
+			webpackProd: {
+				command: 'npm run prod'
+			},
+
+			// note these aren't executed right away, so they contain ALL web workers, even those don't need regeneration
+			...getWebWorkerShellCommands()
+		},
+
+		watch: {
+			// ...webWorkerWatchers
+		},
+
+		md5: {
+			...webWorkerMd5Tasks
+		}
+	});
+
+	// const validateI18n = () => {
+	// 	const baseLocale = grunt.option('baseLocale') || 'en';
+	// 	const targetLocale = grunt.option('locale') || null;
+	// 	const targetDataType = grunt.option('dataType') || null;
+	// 	const targetExportType = grunt.option('exportType') || null;
+
+	// 	let errors = '';
+	// 	if (targetDataType) {
+	// 		errors += i18n.validateDataTypeI18n(baseLocale, targetDataType);
+	// 	} else if (targetExportType) {
+	// 		errors += i18n.validateExportTypeI18n(baseLocale, targetDataType);
+	// 	} else {
+	// 		errors += i18n.validateCoreI18n(baseLocale, targetLocale);
+	// 		errors += i18n.validateDataTypeI18n(baseLocale);
+	// 		errors += i18n.validateExportTypeI18n(baseLocale);
+	// 	}
+
+	// 	errors += validateStringsWithPlaceholders();
+
+	// 	if (errors) {
+	// 		grunt.fail.fatal(errors);
+	// 	}
+	// };
+
+	// const sortI18nFiles = () => {
+	// 	i18n.locales.forEach((locale) => {
+	// 		const data = i18n.getCoreLocaleFileStrings(locale);
+	// 		const file = `./src/i18n/${locale}.json`;
+	// 		const sortedKeys = Object.keys(data).sort();
+
+	// 		let sortedObj = {};
+	// 		sortedKeys.forEach((key) => {
+	// 			sortedObj[key] = data[key];
+	// 		});
+
+	// 		fs.writeFileSync(file, JSON.stringify(sortedObj, null, '\t'));
+	// 	});
+	// };
+
+	// helper methods to operate on all lang files at once
+	// grunt.registerTask('removeI18nKey', () => {
+	// 	const key = grunt.option('key') || null;
+	// 	if (!key) {
+	// 		grunt.fail.fatal('Please enter a key to remove. Format: `grunt removeI18nKey --key=word_goodbye');
+	// 	}
+	// 	i18n.removeKeyFromI18nFiles(grunt.option('key'));
+	// });
+
+	// grunt.registerTask('addLocale', () => {
+	// 	const locale = grunt.option('locale') || null;
+	// 	if (!locale) {
+	// 		grunt.fail.fatal('Please enter a locale to add. Locales should be the ISO-3166 2-char code: `grunt addLocale --locale=xy');
+	// 	}
+
+	// 	const dataTypes = fs.readdirSync(dataTypesFolder);
+	// 	dataTypes.forEach((folder) => {
+	// 		const en = `${dataTypesFolder}/${folder}/i18n/en.json`;
+	// 		const newLocaleFile = `${dataTypesFolder}/${folder}/i18n/${locale}.json`;
+	// 		if (fs.existsSync(en)) {
+	// 			fs.copyFileSync(en, newLocaleFile);
+	// 		}
+	// 	});
+
+	// 	const exportTypes = fs.readdirSync(exportTypesFolder);
+	// 	exportTypes.forEach((folder) => {
+	// 		const en = `${exportTypesFolder}/${folder}/i18n/en.json`;
+	// 		const newLocaleFile = `${exportTypesFolder}/${folder}/i18n/${locale}.json`;
+	// 		if (fs.existsSync(en)) {
+	// 			fs.copyFileSync(en, newLocaleFile);
+	// 		}
+	// 	});
+
+	// 	const countries = fs.readdirSync(countriesFolder);
+	// 	countries.forEach((folder) => {
+	// 		const en = `${countriesFolder}/${folder}/i18n/en.json`;
+	// 		const newLocaleFile = `${countriesFolder}/${folder}/i18n/${locale}.json`;
+	// 		if (fs.existsSync(en)) {
+	// 			fs.copyFileSync(en, newLocaleFile);
+	// 		}
+	// 	});
+
+	// 	// main translation file
+	// 	const mainEn = `${mainTranslationsFolder}/en.json`;
+	// 	if (fs.existsSync(mainEn)) {
+	// 		fs.copyFileSync(mainEn, `${mainTranslationsFolder}/${locale}.json`);
+	// 	}
+	// });
+
+	grunt.loadNpmTasks('grunt-contrib-cssmin');
+	grunt.loadNpmTasks('grunt-contrib-copy');
+	grunt.loadNpmTasks('grunt-contrib-clean');
+	grunt.loadNpmTasks('grunt-shell');
+	grunt.loadNpmTasks('grunt-contrib-uglify');
+	grunt.loadNpmTasks('grunt-contrib-watch');
+	grunt.loadNpmTasks('grunt-md5');
+
+	// grunt.registerTask('sortI18nFiles', sortI18nFiles);
+	grunt.registerTask('default', ['cssmin', 'copy', 'generateI18nBundles', 'webWorkers']);
+	// grunt.registerTask('dev', ['cssmin', 'copy', 'generateI18nBundles', 'webWorkers', 'watch']);
+	grunt.registerTask('generateWorkerMapFile', generateWorkerMapFile);
+	grunt.registerTask('generateI18nBundles', generateI18nBundles);
+	// grunt.registerTask('validateI18n', validateI18n);
+
+	grunt.registerTask('webWorkers', [...getWebWorkerBuildCommandNames(), ...getWebWorkerMd5TaskNames(), 'generateWorkerMapFile']);
+};
diff --git a/apps/client/package.json b/apps/client/package.json
new file mode 100644
index 000000000..143fab46a
--- /dev/null
+++ b/apps/client/package.json
@@ -0,0 +1,205 @@
+{
+	"name": "@generatedata/client",
+	"description": "Client-side code for generatedata app",
+	"private": true,
+	"scripts": {
+		"build": "grunt && npm run webpackProd",
+		"clean": "npx rimraf client/dist",
+		"coverage": "npx jest --coverage",
+		"i18n": "grunt && grunt i18n",
+		"start": "grunt dev & npm run build & npm run webpackDev",
+		"test": "env NODE_ENV=test jest",
+		"webWorkers": "grunt && grunt webWorkers",
+		"webpackDev": "webpack serve --config ./webpack.config.js --mode=development",
+		"webpackProd": "webpack --config ./webpack.config.js --mode=production"
+	},
+	"jest": {
+		"moduleFileExtensions": [
+			"ts",
+			"tsx",
+			"js"
+		],
+		"testEnvironment": "jsdom",
+		"transform": {
+			"node_modules/nanoid/index.js$": "ts-jest",
+			"node_modules/@react-hook/throttle/dist/module/index.js$": "ts-jest",
+			"\\.(ts|tsx)$": "ts-jest"
+		},
+		"transformIgnorePatterns": [
+			"node_modules/(?!nanoid)/.*",
+			"node_modules/@react-hook/throttle/dist/module/.*"
+		],
+		"setupFilesAfterEnv": [
+			"<rootDir>/client/tests/jestSetup.ts"
+		],
+		"testRegex": "/__tests__/.*\\.(ts|tsx)$",
+		"moduleNameMapper": {
+			"\\.(css|less|scss|sss|styl)$": "<rootDir>/node_modules/jest-css-modules",
+			"^~components(.*)$": "<rootDir>/client/src/components$1",
+			"^~types(.*)$": "<rootDir>/client/types$1",
+			"^~utils(.*)$": "<rootDir>/client/src/utils$1",
+			"^~store(.*)$": "<rootDir>/client/src/core/store$1",
+			"^~core(.*)$": "<rootDir>/client/src/core$1"
+		},
+		"collectCoverageFrom": [
+			"<rootDir>/client/src/**/*.(ts|tsx)"
+		],
+		"coveragePathIgnorePatterns": [
+			"bundle.ts",
+			".*.scss.d.ts",
+			".*.types.d.ts"
+		],
+		"modulePathIgnorePatterns": [
+			"<rootDir>/cli/dist"
+		]
+	},
+	"globals": {
+		"ts-jest": {
+			"tsconfig": {
+				"allowJs": true
+			}
+		}
+	},
+	"dependencies": {
+		"@apollo/client": "^4.0.0",
+		"@date-io/date-fns": "^1.3.13",
+		"@mui/material": "^7.3.1",
+		"@mui/icons-material": "^7.3.1",
+		"@mui/x-date-pickers": "^8.10.2",
+		"@react-hook/throttle": "^2.2.0",
+		"@reduxjs/toolkit": "^2.8.2",
+		"@types/randomcolor": "^0.5.9",
+		"@uidotdev/usehooks": "^2.4.1",
+		"codemirror": "^5.58.2",
+		"date-fns": "^2.17.0",
+		"dotenv": "^8.2.0",
+		"googleapis": "^65.0.0",
+		"graphql": "^16.11.0",
+		"immer": "^10.1.1",
+		"js-cookie": "^3.0.5",
+		"nanoid": "^5.1.5",
+		"pretty-bytes": "^7.0.1",
+		"randomcolor": "^0.6.2",
+		"react": "^19.1.1",
+		"react-beautiful-dnd": "^13.1.1",
+		"react-codemirror2": "^8.0.1",
+		"react-copy-to-clipboard": "^5.1.0",
+		"react-countup": "^6.5.3",
+		"react-dom": "^19.1.1",
+		"react-hooks-window-size": "^0.3.0",
+		"react-input-autosize": "^3.0.0",
+		"react-number-format": "5.4.4",
+		"react-redux": "^9.2.0",
+		"react-router": "^7.8.2",
+		"react-router-dom": "^7.8.2",
+		"react-select": "^5.10.2",
+		"react-sortable-hoc": "^1.11.0",
+		"react-split-pane": "^0.1.89",
+		"reactour": "^1.18.0",
+		"recharts": "^3.1.2",
+		"redux": "^5.0.1",
+		"redux-persist": "^6.0.0",
+		"rollup": "^2.31.0",
+		"rxjs": "^7.3.0",
+		"sass": "^1.49.9",
+		"styled-components": "^4.0.0",
+		"terser-webpack-plugin": "^3.0.3",
+		"underscore": "^1.13.7"
+	},
+	"devDependencies": {
+		"@babel/core": "^7.7.4",
+		"@babel/plugin-proposal-class-properties": "^7.10.4",
+		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
+		"@babel/preset-env": "^7.7.4",
+		"@babel/preset-react": "^7.7.4",
+		"@esbuild-plugins/tsconfig-paths": "^0.0.4",
+		"@generatedata/config": "workspace:*",
+		"@generatedata/plugins": "workspace:*",
+		"@generatedata/utils": "workspace:*",
+		"@generatedata/types": "workspace:*",
+		"@rollup/plugin-commonjs": "^15.1.0",
+		"@rollup/plugin-node-resolve": "^8.4.0",
+		"@stylistic/eslint-plugin-js": "^3.1.0",
+		"@teamsupercell/typings-for-css-modules-loader": "^2.5.2",
+		"@testing-library/react": "^16.3.0",
+		"@types/codemirror": "^0.0.99",
+		"@types/jest": "^26.0.15",
+		"@types/js-cookie": "^3.0.5",
+		"@types/loadable__component": "^5.13.8",
+		"@types/node": "^20.19.4",
+		"@types/react": "^19.1.11",
+		"@types/react-beautiful-dnd": "^13.1.1",
+		"@types/react-copy-to-clipboard": "^5.0.7",
+		"@types/react-input-autosize": "^2.2.4",
+		"@types/reactour": "^1.18.5",
+		"@types/redux-testkit": "^1.0.8",
+		"@types/sinon": "^7.5.1",
+		"@typescript-eslint/eslint-plugin": "^5.54.0",
+		"@typescript-eslint/parser": "^5.54.0",
+		"autoprefixer": "6.7.2",
+		"babel-eslint": "^10.0.3",
+		"babel-loader": "^8.0.6",
+		"babel-preset-airbnb": "^4.4.0",
+		"browser-env": "3.3.0",
+		"case-sensitive-paths-webpack-plugin": "^2.3.0",
+		"concurrently": "^5.2.0",
+		"coveralls": "^3.0.9",
+		"cross-fetch": "^3.1.5",
+		"css-loader": "^3.4.0",
+		"cypress": "^6.0.1",
+		"dotenv-webpack": "^6.0.0",
+		"eslint": "^8.52.0",
+		"eslint-config-airbnb": "^19.0.4",
+		"eslint-config-airbnb-base": "^15.0.0",
+		"eslint-plugin-import": "^2.27.5",
+		"eslint-plugin-jsx-a11y": "^6.7.1",
+		"eslint-plugin-react": "^7.32.0",
+		"eslint-webpack-plugin": "^4.0.1",
+		"extract-text-webpack-plugin": "1.0.1",
+		"grunt": "^1.6.1",
+		"grunt-cli": "^1.3.2",
+		"grunt-contrib-clean": "^2.0.0",
+		"grunt-contrib-copy": "^1.0.0",
+		"grunt-contrib-cssmin": "^5.0.0",
+		"grunt-contrib-uglify": "^5.2.2",
+		"grunt-contrib-watch": "^1.1.0",
+		"grunt-md5": "^0.1.12",
+		"grunt-shell": "^4.0.0",
+		"history": "^5.3.0",
+		"html-webpack-plugin": "^5.5.0",
+		"jest": "^29.4.3",
+		"jest-cli": "^29.4.3",
+		"jest-css-modules": "^2.1.0",
+		"jest-environment-jsdom": "^29.4.3",
+		"json-loader": "0.5.4",
+		"md5-file": "^5.0.0",
+		"mini-css-extract-plugin": "^0.8.0",
+		"postcss-loader": "1.2.2",
+		"prettier": "^3.4.2",
+		"prettier-eslint": "^16.3.0",
+		"promise": "7.1.1",
+		"redux-testkit": "^1.0.6",
+		"reselect": "^4.0.0",
+		"rimraf": "^6.0.1",
+		"rollup-plugin-multi-entry": "^2.1.0",
+		"rollup-plugin-strip-exports": "^2.0.6",
+		"rollup-plugin-terser": "^6.1.0",
+		"rollup-plugin-typescript2": "^0.27.1",
+		"sass-loader": "^16.0.5",
+		"sinon": "^8.0.4",
+		"style-loader": "^1.0.0",
+		"ts-jest": "^29.2.5",
+		"ts-loader": "^9.4.2",
+		"ts-node": "^10.9.2",
+		"tsconfig-paths": "4.1.1",
+		"typescript": "^4.9.3",
+		"use-onclickoutside": "^0.3.1",
+		"webpack": "^5.94.0",
+		"webpack-bundle-analyzer": "^4.8.0",
+		"webpack-cli": "^5.0.1",
+		"webpack-dev-middleware": "^6.1.2",
+		"webpack-dev-server": "^4.11.0",
+		"webpack-hot-middleware": "^2.25.3",
+		"webpack-manifest-plugin": "5.0.0"
+	}
+}
diff --git a/apps/client/rollup.config.js b/apps/client/rollup.config.js
new file mode 100644
index 000000000..16a9faa74
--- /dev/null
+++ b/apps/client/rollup.config.js
@@ -0,0 +1,72 @@
+/**
+ * This generates es5 files for single entry-point TS files. It's used for the webworker files: core, core utils, plugins.
+ *
+ * TODO at the moment we're actually loading the utils code twice: once for the web workers, one in the code bundle.
+ * The core script COULD load this generated file & use the methods from the window object; as long as the typings were
+ * provided that'd cut down on build size. But honestly it's <20KB and there are bigger fish to fry.
+ */
+import path from 'path';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import typescript from 'rollup-plugin-typescript2';
+import removeExports from 'rollup-plugin-strip-exports';
+import { terser } from 'rollup-plugin-terser';
+import removeImports from './build/rollup-plugin-remove-imports';
+import workerHash from './build/rollup-plugin-worker-hash';
+
+// example usage:
+//    npx rollup -c --config-src=src/utils/coreUtils.ts --config-target=dist/workers/coreUtils.js
+//    npx rollup -c --config-src=src/utils/workerUtils.ts --config-target=dist/debug.js
+//    npx rollup -c --config-src=src/plugins/countries/Australia/bundle.ts --config-target=dist/australia.js
+//    npx rollup -c --config-src=src/plugins/dataTypes/AutoIncrement/AutoIncrement.generator.ts --config-target=dist/workers/DT-AutoIncrement.generator.js
+export default (cmdLineArgs) => {
+	const { 'config-src': src, 'config-target': target } = cmdLineArgs;
+
+	if (!src || !target) {
+		console.error('\n*** Missing command line args. See file for usage. ***\n');
+		return;
+	}
+
+	const terserCompressProps = {};
+
+	// the whole point of the workerUtils file is to expose all utility methods in a single `utils` object
+	// for use by plugin web workers. This is available on the global scope within a web worker
+	if (src === 'src/utils/workerUtils.ts') {
+		terserCompressProps.top_retain = ['utils', 'onmessage'];
+	} else if (/src\/plugins\/countries/.test(src)) {
+		const folder = path.dirname(src).split(path.sep);
+		terserCompressProps.top_retain = [folder[folder.length - 1]];
+	} else {
+		terserCompressProps.unused = true;
+		terserCompressProps.top_retain = ['utils', 'onmessage'];
+	}
+
+	return {
+		input: src,
+		output: {
+			file: target,
+			format: 'es'
+		},
+		treeshake: false,
+		plugins: [
+			removeImports(),
+			commonjs(),
+			nodeResolve(),
+			typescript({
+				tsconfigOverride: {
+					compilerOptions: {
+						target: 'es5'
+					}
+				}
+			}),
+			terser({
+				mangle: false,
+				compress: {
+					...terserCompressProps
+				}
+			}),
+			removeExports(),
+			workerHash()
+		]
+	};
+};
diff --git a/apps/client/src/app.tsx b/apps/client/src/app.tsx
new file mode 100644
index 000000000..4106df99f
--- /dev/null
+++ b/apps/client/src/app.tsx
@@ -0,0 +1,109 @@
+/* istanbul ignore file */
+import React, { useEffect } from 'react';
+import { Provider } from 'react-redux';
+import { BrowserRouter as Router, Routes, Route, useNavigation } from 'react-router-dom';
+import { ApolloProvider } from '@apollo/client/react';
+import * as codemirror from 'codemirror';
+import { PersistGate } from 'redux-persist/integration/react';
+import { ThemeProvider } from '@mui/material/styles';
+import { apolloClient } from '~core/apolloClient';
+import store, { persistor } from '~core/store';
+import Page from '~core/page/Page.container';
+import * as core from '~core/index';
+import ErrorBoundary from '~core/ErrorBoundary.component';
+import theme from '~core/theme';
+import SaveDataSetDialog from '~core/dialogs/saveDataSet/SaveDataSet.container';
+import Toast from '~components/toast/Toast.component';
+import C from '@generatedata/config/constants';
+import { getAppStateVersion } from '~store/main/main.selectors';
+import { resetStore, initRouteListener } from '~store/main/main.actions';
+import { getRoutes } from '~utils/routeUtils';
+import { getLocaleMap } from '@generatedata/utils/lang';
+import '~store/generator/generator.reducer';
+import './styles/global.scss';
+
+window.CodeMirror = codemirror;
+
+const checkState = async (state: any): Promise<any> => {
+	const lastAppStateVersion = getAppStateVersion(state.getState());
+	if (lastAppStateVersion !== C.APP_STATE_VERSION) {
+		await state.dispatch(resetStore());
+	}
+};
+
+const routes = getRoutes();
+
+// there's probably a cleaner way to do this, but this seems performant and not too complicated
+const LocalizationWrapper = (args: any) => {
+	const availableLocalesMap = getLocaleMap();
+	const lang = args.match?.params?.lang;
+	let localizedRoutes = routes;
+
+	// this rewrites any routes that include a valid (known) lang path root folder so the routing
+	// works as expected. Note: the actual loading of the locale file will have taken place prior to here. It either
+	// occurs on first boot and <Page> handles waiting to show the whole application until it's ready, or when
+	// the user changes is via the lang selector dialog - that alters the URL to include the locale only after it's been
+	// successfully loaded
+	if (lang && lang !== 'en' && availableLocalesMap[lang]) {
+		localizedRoutes = routes.map((route) => ({
+			...route,
+			path: `/${lang}${route.path}`
+		}));
+	}
+
+	return (
+		<Routes>
+			{localizedRoutes.map(({ path, component: Component }, index) => (
+				<Route key={index} path={path}>
+					<Component />
+				</Route>
+			))}
+		</Routes>
+	);
+};
+
+const App = () => {
+	const navigation = useNavigation();
+	
+	useEffect(() => {
+		initRouteListener(navigation);
+	}, []);
+
+	return (
+		<ErrorBoundary>
+			<Page>
+				<Route path="/:lang?">
+					<LocalizationWrapper />
+				</Route>
+				<Toast />
+				<SaveDataSetDialog />
+			</Page>
+		</ErrorBoundary>
+	);
+});
+
+const AppWrapper = () => (
+	<Provider store={store}>
+		<ApolloProvider client={apolloClient}>
+			<ThemeProvider theme={theme}>
+				<PersistGate loading={null} persistor={persistor} onBeforeLift={(): Promise<any> => checkState(store)}>
+					{(bootstrapped) => {
+						// PersistGate handles repopulating the redux store; core.init() re-initializes everything else we
+						// need, including checking auth and loading the appropriate locale file
+						if (bootstrapped) {
+							core.init();
+						}
+
+						return (
+							<Router>
+								<App />
+							</Router>
+						);
+					}}
+				</PersistGate>
+			</ThemeProvider>
+		</ApolloProvider>
+	</Provider>
+);
+
+export default AppWrapper;
diff --git a/apps/client/src/components/Buttons.component.tsx b/apps/client/src/components/Buttons.component.tsx
new file mode 100644
index 000000000..700736d0e
--- /dev/null
+++ b/apps/client/src/components/Buttons.component.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import { styled } from '@mui/material/styles';
+import Button, { ButtonProps } from '@mui/material/Button';
+
+export const PrimaryButton = ({ children, ...props }: ButtonProps) => (
+	<Button color="primary" variant="outlined" disableElevation {...props}>
+		{children}
+	</Button>
+);
+
+export const NullButton = ({ children, ...props }: ButtonProps) => (
+	<Button variant="outlined" disableElevation {...props}>
+		{children}
+	</Button>
+);
+
+const SecondaryStyledButton = styled(Button)(() => ({
+	root: {
+		border: '1px solid #047a12',
+		color: '#047a12',
+		backgroundColor: '#fafffb',
+		'&:hover': {
+			border: '1px solid #0e961e',
+			backgroundColor: '#f6fff7'
+		}
+	}
+}));
+
+export const SecondaryButton = ({ children, ...props }: ButtonProps) => (
+	<SecondaryStyledButton color="secondary" variant="outlined" {...props}>
+		{children}
+	</SecondaryStyledButton>
+);
+
+export const StyledPreviewPanelButton = styled(Button)(() => ({
+	root: {
+		borderColor: '#ffffff',
+		color: '#ffffff',
+		marginRight: 6,
+		'&:hover': {
+			backgroundColor: '#0069d9',
+			borderColor: '#0062cc',
+			boxShadow: 'none'
+		}
+	}
+}));
+
+export const PreviewPanelButton = ({ children, ...props }: ButtonProps) => (
+	<StyledPreviewPanelButton color="primary" variant="outlined" size="medium" {...props}>
+		{children}
+	</StyledPreviewPanelButton>
+);
diff --git a/apps/client/src/components/Link.component.tsx b/apps/client/src/components/Link.component.tsx
new file mode 100644
index 000000000..a55711da7
--- /dev/null
+++ b/apps/client/src/components/Link.component.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+export type LinkParams = {
+	url: string;
+	children?: any;
+	offSite?: boolean;
+};
+
+const Link = ({ url, children = null, offSite = false }: LinkParams) => {
+	const props: any = {
+		href: url
+	};
+	if (offSite) {
+		props.target = '_blank';
+		props.rel = 'noopener noreferrer';
+	}
+
+	return <a {...props}>{children ? children : url}</a>;
+};
+
+export default Link;
diff --git a/apps/client/src/components/Pagination.tsx b/apps/client/src/components/Pagination.tsx
new file mode 100644
index 000000000..9666aef65
--- /dev/null
+++ b/apps/client/src/components/Pagination.tsx
@@ -0,0 +1,6 @@
+import React from 'react';
+import MuiPagination from '@mui/material/Pagination';
+
+const Pagination = ({ numPages, currentPage, onChange }: any) => <MuiPagination count={numPages} page={currentPage} onChange={onChange} />;
+
+export default Pagination;
diff --git a/apps/client/src/components/Portal.tsx b/apps/client/src/components/Portal.tsx
new file mode 100644
index 000000000..82eff71f3
--- /dev/null
+++ b/apps/client/src/components/Portal.tsx
@@ -0,0 +1,11 @@
+import { ReactNode, ReactPortal } from 'react';
+import { createPortal } from 'react-dom';
+import usePortal from '../hooks/usePortal';
+
+const Portal = ({ id, children }: { id: string; children: ReactNode }): ReactPortal => {
+	const target = usePortal(id);
+
+	return createPortal(children, target, null);
+};
+
+export default Portal;
diff --git a/apps/client/src/components/TextField.tsx b/apps/client/src/components/TextField.tsx
new file mode 100644
index 000000000..7069e7092
--- /dev/null
+++ b/apps/client/src/components/TextField.tsx
@@ -0,0 +1,79 @@
+import React, { useState } from 'react';
+import { ErrorTooltip } from '~components/tooltips';
+import sharedStyles from '../styles/shared.scss';
+import { useThrottle } from '../hooks/useThrottle';
+
+type TextFieldProps = {
+	value: string;
+	onChange: (e: any) => void;
+	throttle?: boolean;
+	error?: string;
+	ref?: React.MutableRefObject<HTMLInputElement | undefined>;
+	placeholder?: string;
+	autoFocus?: boolean;
+	className?: string;
+	tooltipPlacement?: string;
+	name?: string;
+	style?: React.CSSProperties;
+	disabled?: boolean;
+	type?: string;
+	onPaste?: (e: any) => void;
+	onKeyDown?: (e: any) => void;
+};
+
+const TextField = ({ throttle, error, value, onChange, tooltipPlacement, className, ref, ...props }: TextFieldProps) => {
+	let classes = className ? className : '';
+	if (error) {
+		classes += ' ' + sharedStyles.errorField;
+	}
+
+	const [innerValue, setInnerValue] = useState(value || '');
+	const [lastEvent, setChangeEvent] = useThrottle(null, 2); // second param is frames per second...
+
+	const cleanProps = { ...props };
+	if (props.type === 'intOnly') {
+		cleanProps.type = 'number';
+		cleanProps.onKeyDown = (e: any): void => {
+			if (e.key === '.') {
+				e.preventDefault();
+			}
+		};
+	}
+
+	React.useEffect(() => {
+		if (lastEvent === null || !throttle) {
+			return;
+		}
+		onChange(lastEvent);
+	}, [lastEvent]);
+
+	React.useEffect(() => {
+		setInnerValue(value);
+	}, [value]);
+
+	const controlledOnChange = (e: any): void => {
+		if (throttle) {
+			e.persist();
+			setChangeEvent(e);
+			setInnerValue(e.target.value);
+		} else {
+			onChange(e);
+		}
+	};
+
+	return (
+		<ErrorTooltip title={error} arrow disableHoverListener={!error} disableFocusListener={!error} placement={tooltipPlacement}>
+			<input {...cleanProps} value={throttle ? innerValue : value} onChange={controlledOnChange} className={classes} ref={ref} />
+		</ErrorTooltip>
+	);
+};
+TextField.displayName = 'TextField';
+
+TextField.defaultProps = {
+	throttle: true,
+	type: 'text',
+	error: '',
+	tooltipPlacement: 'bottom'
+};
+
+export default TextField;
diff --git a/apps/client/src/components/__tests__/Link.component.tsx b/apps/client/src/components/__tests__/Link.component.tsx
new file mode 100644
index 000000000..bb00fc88c
--- /dev/null
+++ b/apps/client/src/components/__tests__/Link.component.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import Link from '../Link.component';
+
+describe('Link', () => {
+	it('renders link as label if not supplied', () => {
+		const { container } = render(<Link url="http://google.com" />);
+
+		expect(container.innerHTML).toEqual('<a href="http://google.com">http://google.com</a>');
+	});
+
+	it('renders link as label if not supplied', () => {
+		const { container } = render(<Link url="http://google.com">Link here</Link>);
+
+		expect(container.innerHTML).toEqual('<a href="http://google.com">Link here</a>');
+	});
+
+	it('renders offsite links', () => {
+		const { container } = render(
+			<Link url="http://google.com" offSite={true}>
+				Link here
+			</Link>
+		);
+
+		expect(container.innerHTML).toEqual('<a href="http://google.com" target="_blank" rel="noopener noreferrer">Link here</a>');
+	});
+});
diff --git a/apps/client/src/components/accounts/accountStatusPill/AccountStatusPill.component.tsx b/apps/client/src/components/accounts/accountStatusPill/AccountStatusPill.component.tsx
new file mode 100644
index 000000000..892c3e0ee
--- /dev/null
+++ b/apps/client/src/components/accounts/accountStatusPill/AccountStatusPill.component.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { AccountStatus } from '~types/account';
+import styles from './AccountStatusPill.scss';
+
+type AccountStatusPillProps = {
+	status: AccountStatus;
+	i18n: any;
+};
+
+const AccountStatusPill = ({ status, i18n }: AccountStatusPillProps) => {
+	let label;
+	if (status === 'live') {
+		label = i18n.live;
+	} else if (status === 'expired') {
+		label = i18n.expired;
+	} else if (status === 'disabled') {
+		label = i18n.disabled;
+	}
+
+	return <span className={`${styles.pill} ${styles[status]}`}>{label}</span>;
+};
+
+export default AccountStatusPill;
diff --git a/apps/client/src/components/accounts/accountStatusPill/AccountStatusPill.scss b/apps/client/src/components/accounts/accountStatusPill/AccountStatusPill.scss
new file mode 100644
index 000000000..0bb39445f
--- /dev/null
+++ b/apps/client/src/components/accounts/accountStatusPill/AccountStatusPill.scss
@@ -0,0 +1,20 @@
+.pill {
+	border-radius: 3px;
+	padding: 1px 6px 2px;
+	font-size: 11px;
+}
+
+.live {
+	background-color: green;
+	color: white;
+}
+
+.disabled {
+	background-color: #999999;
+	color: white;
+}
+
+.expired {
+	background-color: #990000;
+	color: white;
+}
diff --git a/apps/client/src/components/accounts/accountStatusPill/AccountStatusPill.scss.d.ts b/apps/client/src/components/accounts/accountStatusPill/AccountStatusPill.scss.d.ts
new file mode 100644
index 000000000..42c0d5c15
--- /dev/null
+++ b/apps/client/src/components/accounts/accountStatusPill/AccountStatusPill.scss.d.ts
@@ -0,0 +1,15 @@
+declare namespace AccountStatusPillScssNamespace {
+	export interface IAccountStatusPillScss {
+		disabled: string;
+		expired: string;
+		live: string;
+		pill: string;
+	}
+}
+
+declare const AccountStatusPillScssModule: AccountStatusPillScssNamespace.IAccountStatusPillScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: AccountStatusPillScssNamespace.IAccountStatusPillScss;
+};
+
+export = AccountStatusPillScssModule;
diff --git a/apps/client/src/components/accounts/accountStatusPill/__tests__/AccountStatusPill.test.tsx b/apps/client/src/components/accounts/accountStatusPill/__tests__/AccountStatusPill.test.tsx
new file mode 100644
index 000000000..a7875d305
--- /dev/null
+++ b/apps/client/src/components/accounts/accountStatusPill/__tests__/AccountStatusPill.test.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import AccountStatusPill from '../AccountStatusPill.component';
+import { render } from '@testing-library/react';
+import { AccountStatus } from '~types/account';
+
+const i18n = require('../../../../i18n/en.json');
+
+describe('AccountStatusPill', () => {
+	it('renders live pill', () => {
+		const { baseElement } = render(<AccountStatusPill status={AccountStatus.live} i18n={i18n} />);
+		expect((baseElement.querySelector('span') as HTMLSpanElement).innerHTML).toEqual(i18n.live);
+	});
+
+	it('renders expired pill', () => {
+		const { baseElement } = render(<AccountStatusPill status={AccountStatus.expired} i18n={i18n} />);
+		expect((baseElement.querySelector('span') as HTMLSpanElement).innerHTML).toEqual(i18n.expired);
+	});
+
+	it('renders disabled pill', () => {
+		const { baseElement } = render(<AccountStatusPill status={AccountStatus.disabled} i18n={i18n} />);
+		expect((baseElement.querySelector('span') as HTMLSpanElement).innerHTML).toEqual(i18n.disabled);
+	});
+});
diff --git a/apps/client/src/components/accounts/mainFields/MainFields.component.tsx b/apps/client/src/components/accounts/mainFields/MainFields.component.tsx
new file mode 100644
index 000000000..45a37565f
--- /dev/null
+++ b/apps/client/src/components/accounts/mainFields/MainFields.component.tsx
@@ -0,0 +1,224 @@
+import React, { useRef, useEffect, useState } from 'react';
+import Button from '@mui/material/Button';
+import TextField from '~components/TextField';
+import IconButton from '@mui/material/IconButton';
+import Dropdown from '~components/dropdown/Dropdown';
+import FormGroup from '@mui/material/FormGroup';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import Checkbox from '@mui/material/Checkbox';
+import { canadianProvinceOptions, countryDropdownOptions } from '@generatedata/plugins';
+import Refresh from '@mui/icons-material/Refresh';
+import { AccountEditingData } from '~store/account/account.reducer';
+import { isValidEmail } from '@generatedata/utils/general';
+import { generateRandomAlphanumericStr } from '@generatedata/utils/random';
+import sharedStyles from '../../../styles/shared.scss';
+
+export type MainFieldsProps = {
+	data: AccountEditingData;
+	accountHasChanges: boolean;
+	updateAccount: (data: AccountEditingData) => void;
+	submitButtonLabel: string;
+	i18n: any;
+	onSave: (setOneTimePassword: boolean) => void;
+	onCancel: () => void;
+	showRequiredFieldError: boolean;
+	isAddingUser: boolean;
+	className?: string;
+};
+
+const MainFields = ({
+	data,
+	accountHasChanges,
+	updateAccount,
+	onSave,
+	onCancel,
+	submitButtonLabel,
+	i18n,
+	showRequiredFieldError,
+	isAddingUser,
+	className = ''
+}: MainFieldsProps) => {
+	const emailFieldRef = useRef(null);
+	const [oneTimePasswordFieldVisible, setOneTimePasswordFieldVisible] = useState(false);
+
+	// very fussy indeed!
+	const [emailFieldHasFocus, setEmailFieldHasFocus] = useState(false);
+	const [emailFieldHasHadFocus, setEmailFieldHasHadFocus] = useState(false);
+
+	const onBlurEmail = (): void => {
+		setEmailFieldHasFocus(false);
+		setEmailFieldHasHadFocus(true);
+	};
+
+	const update = (fieldName: string, value: string): void => {
+		updateAccount({
+			...data,
+			[fieldName]: value
+		});
+	};
+
+	let fieldsValid = true;
+	if (!data.firstName.trim() || !data.lastName.trim() || !data.email.trim()) {
+		if (showRequiredFieldError) {
+			fieldsValid = false;
+		}
+	}
+	let emailError;
+	if (data.email.trim() === '') {
+		if (showRequiredFieldError) {
+			emailError = i18n.requiredField;
+		}
+	} else if (!isValidEmail(data.email)) {
+		// subtle. We only want to show the email field is in an invalid state when
+		// (a) adding an email and the user's moved off the field & left it in an invalid state
+		// (b) is editing the email
+		if (!isAddingUser || (emailFieldHasHadFocus && !emailFieldHasFocus)) {
+			emailError = i18n.validationInvalidEmail;
+			fieldsValid = false;
+		}
+	}
+	let oneTimePasswordError;
+	if (isAddingUser && data.oneTimePassword?.trim() === '') {
+		oneTimePasswordError = i18n.requiredField;
+	}
+
+	const saveButtonEnabled = accountHasChanges && fieldsValid;
+
+	const getCanadianRegions = () => {
+		if (data.country !== 'CA') {
+			return null;
+		}
+
+		return (
+			<>
+				<label>{i18n.province}</label>
+				<div style={{ marginBottom: 15 }}>
+					<Dropdown value={data.region} onChange={(item: any): any => update('region', item.value)} options={canadianProvinceOptions} />
+				</div>
+			</>
+		);
+	};
+
+	const handleSave = (e: any): void => {
+		e.preventDefault();
+
+		if (!fieldsValid) {
+			return;
+		}
+
+		onSave(isAddingUser && oneTimePasswordFieldVisible);
+	};
+
+	const generatePassword = () => {
+		const pwd = generateRandomAlphanumericStr('CcEVvFLlDXxH');
+		update('oneTimePassword', pwd);
+	};
+
+	const firstNameError = showRequiredFieldError && data.firstName.trim() === '' ? i18n.requiredField : '';
+	const lastNameError = showRequiredFieldError && data.lastName.trim() === '' ? i18n.requiredField : '';
+
+	let cancelLinkClasses = sharedStyles.cancelLink;
+	if (!saveButtonEnabled) {
+		cancelLinkClasses += ` ${sharedStyles.hidden}`;
+	}
+
+	return (
+		<form onSubmit={handleSave} autoComplete="off" className={className}>
+			<div>
+				<label>{i18n.firstName}</label>
+				<div style={{ marginBottom: 15 }}>
+					<TextField
+						error={firstNameError}
+						value={data.firstName}
+						name="firstName"
+						onChange={(e: any): void => update('firstName', e.target.value)}
+						style={{ width: '100%' }}
+						autoFocus
+					/>
+				</div>
+
+				<label>{i18n.lastName}</label>
+				<div style={{ marginBottom: 15 }}>
+					<TextField
+						error={lastNameError}
+						value={data.lastName}
+						name="lastName"
+						onChange={(e: any): void => update('lastName', e.target.value)}
+						style={{ width: '100%' }}
+					/>
+				</div>
+
+				<label>{i18n.email}</label>
+				<div style={{ marginBottom: 15 }}>
+					<TextField
+						error={emailError}
+						value={data.email}
+						name="email"
+						onChange={(e: any): void => update('email', e.target.value)}
+						onFocus={(): void => setEmailFieldHasFocus(true)}
+						onBlur={onBlurEmail}
+						style={{ width: '100%' }}
+						ref={emailFieldRef}
+					/>
+				</div>
+
+				<label>{i18n.country}</label>
+				<div style={{ marginBottom: 15 }}>
+					<Dropdown value={data.country} onChange={(item: any): any => update('country', item.value)} options={countryDropdownOptions} />
+				</div>
+
+				{getCanadianRegions()}
+
+				{isAddingUser && (
+					<div style={{ marginTop: -10, marginBottom: 15 }}>
+						<FormGroup>
+							<FormControlLabel
+								control={
+									<Checkbox
+										checked={oneTimePasswordFieldVisible}
+										color="primary"
+										onClick={() => setOneTimePasswordFieldVisible(!oneTimePasswordFieldVisible)}
+									/>
+								}
+								label="Set one-time password"
+							/>
+						</FormGroup>
+						{oneTimePasswordFieldVisible && (
+							<>
+								<div
+									style={{
+										display: 'flex',
+										flexDirection: 'row'
+									}}
+								>
+									<TextField
+										error={oneTimePasswordError}
+										value={data.oneTimePassword}
+										name="oneTimePassword"
+										onChange={(e: any): void => update('oneTimePassword', e.target.value)}
+										style={{ width: '100%', marginRight: 8 }}
+									/>
+									<IconButton size="small" onClick={generatePassword}>
+										<Refresh />
+									</IconButton>
+								</div>
+							</>
+						)}
+					</div>
+				)}
+			</div>
+
+			<div>
+				<Button type="submit" color="primary" variant="contained" disableElevation disabled={!saveButtonEnabled}>
+					{submitButtonLabel}
+				</Button>
+
+				<span onClick={onCancel} className={cancelLinkClasses}>
+					{i18n.cancel}
+				</span>
+			</div>
+		</form>
+	);
+};
+
+export default MainFields;
diff --git a/apps/client/src/components/accounts/manageAccount/ManageAccount.component.tsx b/apps/client/src/components/accounts/manageAccount/ManageAccount.component.tsx
new file mode 100644
index 000000000..ca99dae26
--- /dev/null
+++ b/apps/client/src/components/accounts/manageAccount/ManageAccount.component.tsx
@@ -0,0 +1,178 @@
+import React, { useState } from 'react';
+import { format, fromUnixTime, add } from 'date-fns';
+import MainFields from '~components/accounts/mainFields/MainFields.component';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import { LocalizedDatePicker, LocalizedDatePickerProvider } from '~components/datePicker/LocalizedDatePicker.component';
+import { getFormattedNum } from '@generatedata/utils/number';
+import * as dateStyles from '@generatedata/plugins/dist/dataTypes/Date/Date.scss';
+import C from '@generatedata/config/constants';
+import styles from './ManageAccount.scss';
+
+export type ManageAccountProps = {
+	i18n: any;
+	onSave: (state: ManageAccountState) => void;
+	initialState: ManageAccountState;
+	submitButtonLabel: string;
+	onCancel?: () => void;
+};
+
+export enum ExpiryOption {
+	none = 'none',
+	date = 'date'
+}
+
+export type ManageAccountState = {
+	firstName: string;
+	lastName: string;
+	email: string;
+	country: string;
+	region: string;
+	oneTimePassword?: string;
+	disabled: boolean;
+	expiry: ExpiryOption;
+	expiryDate: null | number;
+	numRowsGenerated: number;
+	isAddingUser: boolean;
+};
+
+const yearFromNow = Number(format(add(new Date(), { years: 1 }), 't'));
+
+const ManageAccount = ({ i18n, onCancel, onSave, initialState, submitButtonLabel }: ManageAccountProps) => {
+	const [data, setData] = useState(initialState);
+	const [showDatepicker, setShowDatepicker] = useState(false);
+	const [showErrors] = useState(false);
+
+	let accountHasChanges = data.firstName !== '' && data.lastName !== '' && data.email !== '' && data.country !== '';
+	if (data.country === 'CA' && data.region === '') {
+		accountHasChanges = false;
+	}
+
+	const onClickCancel = (): void => {
+		setData(initialState);
+		if (onCancel) {
+			onCancel();
+		}
+	};
+
+	const updateAccountData = (newData: any): void => {
+		setData({
+			...data,
+			...newData
+		});
+	};
+
+	const toggleAccountDisabled = (disabled: boolean): void => {
+		setData({
+			...data,
+			disabled
+		});
+	};
+
+	const toggleExpiry = (expiry: ExpiryOption): void => {
+		setData({
+			...data,
+			expiry
+		});
+
+		if (expiry === ExpiryOption.date) {
+			setShowDatepicker(true);
+		}
+	};
+
+	const onSelectDate = (expiryDate: any): void => {
+		setData({
+			...data,
+			expiryDate
+		});
+	};
+
+	const accountData = {
+		firstName: data.firstName,
+		lastName: data.lastName,
+		email: data.email,
+		country: data.country,
+		region: data.region,
+		oneTimePassword: data.oneTimePassword,
+		numRowsGenerated: data.numRowsGenerated
+	};
+
+	let expiryLabel = i18n.selectExpiryDate;
+
+	if (data.expiryDate) {
+		expiryLabel = format(fromUnixTime(Math.round(data.expiryDate / 1000)), C.DATE_FORMAT);
+	}
+
+	return (
+		<div className={styles.root}>
+			<div style={{ flex: 1 }}>
+				<MainFields
+					i18n={i18n}
+					data={accountData}
+					updateAccount={updateAccountData}
+					accountHasChanges={accountHasChanges}
+					submitButtonLabel={submitButtonLabel}
+					showRequiredFieldError={showErrors}
+					onCancel={onClickCancel}
+					onSave={(setOneTimePassword: boolean): void => {
+						if (!setOneTimePassword) {
+							data.oneTimePassword = undefined;
+						}
+						onSave(data);
+					}}
+					isAddingUser={data.isAddingUser}
+				/>
+			</div>
+			<div className={styles.rightCol}>
+				<div>
+					<div className={styles.disabledFieldRow}>
+						<input
+							type="checkbox"
+							checked={data.disabled}
+							id="accountDisabled"
+							onChange={(e): void => toggleAccountDisabled(e.target.checked)}
+						/>
+						<label htmlFor="accountDisabled">{i18n.accountDisabled}</label>
+					</div>
+				</div>
+				<div>
+					<div style={{ marginBottom: 15, marginTop: 2 }}>
+						<RadioPillRow>
+							<RadioPill
+								label={i18n.noExpiry}
+								onClick={(): void => toggleExpiry(ExpiryOption.none)}
+								name="expiry"
+								checked={data.expiry === 'none'}
+								style={{ marginRight: 6 }}
+							/>
+							<RadioPill
+								label={expiryLabel}
+								onClick={(): void => toggleExpiry(ExpiryOption.date)}
+								name="expiry"
+								checked={data.expiry === 'date'}
+							/>
+						</RadioPillRow>
+					</div>
+				</div>
+				<div className={styles.rightBlock}>
+					<label>{i18n.totalNumGeneratedRows}</label>
+					<div>{getFormattedNum(initialState.numRowsGenerated)}</div>
+				</div>
+			</div>
+
+			<div style={{ display: 'none' }}>
+				<LocalizedDatePickerProvider>
+					<LocalizedDatePicker
+						autoOk
+						open={showDatepicker}
+						className={dateStyles.dateField}
+						value={data.expiryDate === null ? fromUnixTime(yearFromNow) : fromUnixTime(data.expiryDate / 1000)}
+						onChange={(val: any): void => onSelectDate(format(val, 'T'))}
+						onClose={(): void => setShowDatepicker(false)}
+					/>
+				</LocalizedDatePickerProvider>
+			</div>
+		</div>
+	);
+};
+
+export default ManageAccount;
diff --git a/apps/client/src/components/accounts/manageAccount/ManageAccount.scss b/apps/client/src/components/accounts/manageAccount/ManageAccount.scss
new file mode 100644
index 000000000..0c536e507
--- /dev/null
+++ b/apps/client/src/components/accounts/manageAccount/ManageAccount.scss
@@ -0,0 +1,38 @@
+.root {
+	display: flex;
+	flex: 1;
+	margin-bottom: 15px;
+}
+
+.rightCol {
+	flex: 1;
+	margin-left: 20px;
+	border-left: 1px solid #f2f2f2;
+	padding-left: 20px;
+}
+
+.disabledFieldRow {
+	display: flex;
+	margin-bottom: 15px;
+	margin-top: 2px;
+}
+
+.rightBlock {
+	& > div {
+		margin-bottom: 15px;
+		font-size: 32px;
+	}
+}
+
+@media (max-width: 720px) {
+	.root {
+		flex-direction: column;
+	}
+
+	.rightCol {
+		margin-top: 20px;
+		margin-left: 0;
+		border-left: 0;
+		padding-left: 0;
+	}
+}
diff --git a/apps/client/src/components/accounts/manageAccount/ManageAccount.scss.d.ts b/apps/client/src/components/accounts/manageAccount/ManageAccount.scss.d.ts
new file mode 100644
index 000000000..b548ad859
--- /dev/null
+++ b/apps/client/src/components/accounts/manageAccount/ManageAccount.scss.d.ts
@@ -0,0 +1,15 @@
+declare namespace ManageAccountScssNamespace {
+	export interface IManageAccountScss {
+		disabledFieldRow: string;
+		rightBlock: string;
+		rightCol: string;
+		root: string;
+	}
+}
+
+declare const ManageAccountScssModule: ManageAccountScssNamespace.IManageAccountScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: ManageAccountScssNamespace.IManageAccountScss;
+};
+
+export = ManageAccountScssModule;
diff --git a/apps/client/src/components/copyToClipboard/CopyToClipboard.scss b/apps/client/src/components/copyToClipboard/CopyToClipboard.scss
new file mode 100644
index 000000000..f755a16df
--- /dev/null
+++ b/apps/client/src/components/copyToClipboard/CopyToClipboard.scss
@@ -0,0 +1,9 @@
+.copyIcon {
+	color: #bbbbbb;
+	cursor: pointer;
+	font-size: 12px;
+}
+
+:global(.MuiAlert-message) {
+	font-size: 13px;
+}
diff --git a/apps/client/src/components/copyToClipboard/CopyToClipboard.scss.d.ts b/apps/client/src/components/copyToClipboard/CopyToClipboard.scss.d.ts
new file mode 100644
index 000000000..49cfc1c6a
--- /dev/null
+++ b/apps/client/src/components/copyToClipboard/CopyToClipboard.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace CopyToClipboardScssNamespace {
+	export interface ICopyToClipboardScss {
+		copyIcon: string;
+	}
+}
+
+declare const CopyToClipboardScssModule: CopyToClipboardScssNamespace.ICopyToClipboardScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: CopyToClipboardScssNamespace.ICopyToClipboardScss;
+};
+
+export = CopyToClipboardScssModule;
diff --git a/apps/client/src/components/copyToClipboard/CopyToClipboard.tsx b/apps/client/src/components/copyToClipboard/CopyToClipboard.tsx
new file mode 100644
index 000000000..b875c2bb5
--- /dev/null
+++ b/apps/client/src/components/copyToClipboard/CopyToClipboard.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { CopyToClipboard } from 'react-copy-to-clipboard';
+import FileCopyIcon from '@mui/icons-material/FileCopy';
+import { addToast } from '@generatedata/utils/general';
+import styles from './CopyToClipboard.scss';
+
+const Copy = ({ message, tooltip, content }: any) => {
+	const onCopy = (): void => {
+		addToast({
+			type: 'success',
+			message,
+			verticalPosition: 'top'
+		});
+	};
+
+	return (
+		<CopyToClipboard text={content} onCopy={onCopy}>
+			<FileCopyIcon fontSize="small" className={styles.copyIcon} titleAccess={tooltip} />
+		</CopyToClipboard>
+	);
+};
+
+export default Copy;
diff --git a/apps/client/src/components/copyToClipboard/__tests__/CopyToClipboard.test.tsx b/apps/client/src/components/copyToClipboard/__tests__/CopyToClipboard.test.tsx
new file mode 100644
index 000000000..d87ed6ac4
--- /dev/null
+++ b/apps/client/src/components/copyToClipboard/__tests__/CopyToClipboard.test.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import CopyToClipboard from '../CopyToClipboard';
+
+jest.mock('copy-to-clipboard', () => {
+	return jest.fn();
+});
+
+const defaultProps = {
+	message: 'Message here',
+	tooltip: 'Tooltip here',
+	content: 'Content here',
+	autoHideDuration: 0
+};
+
+describe('CopyToClipboard', () => {
+	it('renders copy icon with tooltip', () => {
+		const { baseElement } = render(<CopyToClipboard {...defaultProps} />);
+
+		expect(baseElement.querySelector('.copyIcon')).toBeTruthy();
+		expect(baseElement.innerHTML).toContain(defaultProps.tooltip);
+	});
+});
diff --git a/apps/client/src/components/creatablePillField/CreatablePillField.scss b/apps/client/src/components/creatablePillField/CreatablePillField.scss
new file mode 100644
index 000000000..0e84a8742
--- /dev/null
+++ b/apps/client/src/components/creatablePillField/CreatablePillField.scss
@@ -0,0 +1,6 @@
+@use '../../styles/variables' as c;
+
+.errorField > div,
+.errorField:hover > div {
+	border: 1px solid c.$error;
+}
diff --git a/apps/client/src/components/creatablePillField/CreatablePillField.scss.d.ts b/apps/client/src/components/creatablePillField/CreatablePillField.scss.d.ts
new file mode 100644
index 000000000..98d9da3ae
--- /dev/null
+++ b/apps/client/src/components/creatablePillField/CreatablePillField.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace CreatablePillFieldScssNamespace {
+	export interface ICreatablePillFieldScss {
+		errorField: string;
+	}
+}
+
+declare const CreatablePillFieldScssModule: CreatablePillFieldScssNamespace.ICreatablePillFieldScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: CreatablePillFieldScssNamespace.ICreatablePillFieldScss;
+};
+
+export = CreatablePillFieldScssModule;
diff --git a/apps/client/src/components/creatablePillField/CreatablePillField.tsx b/apps/client/src/components/creatablePillField/CreatablePillField.tsx
new file mode 100644
index 000000000..70029da7d
--- /dev/null
+++ b/apps/client/src/components/creatablePillField/CreatablePillField.tsx
@@ -0,0 +1,158 @@
+import * as React from 'react';
+import { components } from 'react-select';
+import CreatableSelect from 'react-select/creatable';
+import { SortableContainer, SortableElement } from 'react-sortable-hoc';
+import { DropdownOption } from '../dropdown/Dropdown';
+import { ErrorTooltip } from '~components/tooltips';
+import { arrayMove } from '@generatedata/utils/array';
+import styles from './CreatablePillField.scss';
+
+export const SortableMultiValue = SortableElement((props: any) => {
+	const onMouseDown = (e: any): void => {
+		e.preventDefault();
+		e.stopPropagation();
+	};
+	const innerProps = { onMouseDown };
+	return <components.MultiValue {...props} innerProps={innerProps} />;
+});
+
+const customComponents = {
+	DropdownIndicator: null,
+	MultiValue: SortableMultiValue
+};
+
+const selectStyles = {
+	control: (base: React.CSSProperties): React.CSSProperties => ({
+		...base,
+		boxShadow: 'none',
+		minHeight: 30,
+		maxHeight: 100,
+		overflow: 'scroll'
+	}),
+	dropdownIndicator: (base: React.CSSProperties): React.CSSProperties => ({
+		...base,
+		padding: 4
+	}),
+	clearIndicator: (base: React.CSSProperties): React.CSSProperties => ({
+		...base,
+		padding: 4
+	}),
+	multiValue: (base: React.CSSProperties): React.CSSProperties => ({
+		...base,
+		backgroundColor: '#e0ebfd'
+	}),
+	valueContainer: (base: React.CSSProperties): React.CSSProperties => ({
+		...base,
+		padding: '0px 2px'
+	}),
+	container: (base: React.CSSProperties): React.CSSProperties => ({
+		...base
+	}),
+	input: (base: React.CSSProperties): React.CSSProperties => ({
+		...base,
+		margin: 0,
+		padding: 0
+	}),
+	indicatorsContainer: (base: React.CSSProperties): React.CSSProperties => ({
+		...base,
+		alignItems: 'flex-start'
+	})
+};
+
+export const createOption = (label: string): DropdownOption => ({
+	label,
+	value: label
+});
+
+const SortableCreatableSelect: any = SortableContainer(CreatableSelect);
+
+export type CreatablePillFieldProps = {
+	onChange: (newValues: string[]) => void;
+	value: string[];
+	error: string;
+	placeholder: string;
+	onValidateNewItem?: (value: string) => boolean;
+	className?: string;
+	isClearable?: boolean;
+};
+
+const CreatablePillField = ({
+	onChange,
+	onValidateNewItem,
+	value,
+	error,
+	placeholder,
+	className,
+	isClearable = true
+}: CreatablePillFieldProps) => {
+	const [tempValue, setTempValue] = React.useState('');
+	const options = value.map(createOption);
+
+	const handleInputChange = (newTempValue: string): void => setTempValue(newTempValue);
+	const handleKeyDown = (e: any): void => {
+		if (!tempValue) {
+			return;
+		}
+		switch (e.key) {
+			case 'Enter':
+			case 'Tab':
+				if (onValidateNewItem) {
+					const isValid = onValidateNewItem(tempValue);
+					if (!isValid) {
+						return;
+					}
+				}
+				setTempValue('');
+				onChange([...value, tempValue]);
+				e.preventDefault();
+		}
+	};
+
+	const onSortEnd = ({ oldIndex, newIndex }: { oldIndex: number; newIndex: number }): void => {
+		const sortedOptions = arrayMove(options, oldIndex, newIndex);
+		onChange(sortedOptions.map((i: DropdownOption) => i.value));
+	};
+
+	const classes: string[] = [];
+	if (className) {
+		classes.push(className);
+	}
+	if (error) {
+		classes.push(styles.errorField);
+	}
+
+	// onCreateOption={(a: any) => console.log(a)}
+	return (
+		<ErrorTooltip title={error} arrow disableHoverListener={!error} disableFocusListener={!error}>
+			<SortableCreatableSelect
+				className={classes.join(' ')}
+				styles={selectStyles}
+				components={customComponents}
+				inputValue={tempValue}
+				axis="xy"
+				distance={4}
+				getHelperDimensions={({ node }: any): any => node.getBoundingClientRect()}
+				isClearable={isClearable}
+				isMulti
+				onSortEnd={onSortEnd}
+				menuIsOpen={false}
+				onChange={(options: any): void => {
+					const newValues = options ? options.map(({ value }: DropdownOption) => value) : [];
+					onChange(newValues);
+				}}
+				onInputChange={handleInputChange}
+				onKeyDown={handleKeyDown}
+				placeholder={placeholder}
+				value={options}
+				menuPlacement="auto"
+				menuPortalTarget={document.body}
+			/>
+		</ErrorTooltip>
+	);
+};
+CreatablePillField.defaultProps = {
+	placeholder: 'Press enter to create item',
+	error: ''
+};
+
+export default CreatablePillField;
diff --git a/apps/client/src/components/creatablePillField/__tests__/CreatablePillField.test.tsx b/apps/client/src/components/creatablePillField/__tests__/CreatablePillField.test.tsx
new file mode 100644
index 000000000..aef4f7a00
--- /dev/null
+++ b/apps/client/src/components/creatablePillField/__tests__/CreatablePillField.test.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import CreatablePillField from '../CreatablePillField';
+
+const defaultProps = {
+	onChange: () => {},
+	value: ['one', 'two', 'three']
+};
+
+describe('CreatablePillField', () => {
+	it('renders', () => {
+		const { baseElement } = render(<CreatablePillField {...defaultProps} />);
+	});
+});
diff --git a/apps/client/src/components/datePicker/LocalizedDatePicker.component.tsx b/apps/client/src/components/datePicker/LocalizedDatePicker.component.tsx
new file mode 100644
index 000000000..a35379bfa
--- /dev/null
+++ b/apps/client/src/components/datePicker/LocalizedDatePicker.component.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import DateFnsUtils from '@date-io/date-fns';
+// import { DatePicker, MuiPickersUtilsProvider } from '@mui/lab';
+import { DatePicker } from '@mui/x-date-pickers/DatePicker';
+import { getLocale, getStrings } from '@generatedata/utils/lang';
+import { arDZ, de, enUS, es, fr, ja, hi, nl, pt, ru, ta, zhCN } from 'date-fns/locale';
+
+// localized wrapper for the date picker provider
+export const LocalizedDatePicker = (props: any) => {
+	const { core: i18n } = getStrings();
+
+	return <DatePicker {...props} cancelLabel={i18n.cancel} />;
+};
+
+// localized wrapper for the date picker provider
+export const LocalizedDatePickerProvider = ({ children }: any) => {
+	const locale = getLocale();
+
+	const localeMap = {
+		ar: arDZ,
+		en: enUS,
+		fr,
+		de,
+		es,
+		ja,
+		hi,
+		nl,
+		pt,
+		ru,
+		ta,
+		zh: zhCN
+	};
+
+	return (
+		<MuiPickersUtilsProvider utils={DateFnsUtils} locale={localeMap[locale]}>
+			{children}
+		</MuiPickersUtilsProvider>
+	);
+};
diff --git a/apps/client/src/components/dialogs/index.tsx b/apps/client/src/components/dialogs/index.tsx
new file mode 100644
index 000000000..2a148985a
--- /dev/null
+++ b/apps/client/src/components/dialogs/index.tsx
@@ -0,0 +1,69 @@
+import * as React from 'react';
+import MuiDialog from '@mui/material/Dialog';
+import MuiDialogTitle from '@mui/material/DialogTitle';
+import MuiDialogContent from '@mui/material/DialogContent';
+import MuiDialogActions from '@mui/material/DialogActions';
+import { styled, withStyles, makeStyles } from '@mui/material';
+import IconButton from '@mui/material/IconButton';
+import CloseIcon from '@mui/icons-material/Close';
+import Typography from '@mui/material/Typography';
+
+const dialogStyles = (theme: any): any => ({
+	root: {
+		margin: 0,
+		padding: theme.spacing(2)
+	},
+	closeButton: {
+		position: 'absolute',
+		right: theme.spacing(1),
+		top: 6,
+		color: theme.palette.grey[500]
+	}
+});
+
+export const DialogTitle = withStyles(dialogStyles)((props: any): any => {
+	const { children, classes, onClose, customCloseIcon, ...other } = props;
+	const Close = customCloseIcon ? customCloseIcon : CloseIcon;
+
+	return (
+		<MuiDialogTitle disableTypography className={classes.root} {...other}>
+			<Typography variant="h5">{children}</Typography>
+			{onClose ? (
+				<IconButton aria-label="close" className={classes.closeButton} onClick={onClose}>
+					<Close fontSize="large" />
+				</IconButton>
+			) : null}
+		</MuiDialogTitle>
+	);
+});
+
+export const DialogContent = styled(MuiDialogContent)((theme) => ({
+	root: {
+		padding: theme.spacing(2)
+	}
+}));
+
+export const DialogActions = styled(MuiDialogActions)((theme) => ({
+	root: {
+		margin: 0,
+		padding: theme.spacing(1)
+	}
+}));
+
+const useDialogStyles = makeStyles({
+	root: {
+		// @ts-ignore-line
+		zIndex: '5005 !important',
+		width: '100%'
+	},
+	paper: {
+		borderRadius: 6,
+		maxWidth: 'inherit'
+	}
+});
+
+export const Dialog = (props: any) => {
+	const { root, paper } = useDialogStyles(props);
+
+	return <MuiDialog className={root} classes={{ paper }} scroll="paper" {...props} />;
+};
diff --git a/apps/client/src/components/dropdown/Dropdown.scss b/apps/client/src/components/dropdown/Dropdown.scss
new file mode 100644
index 000000000..9deb9690c
--- /dev/null
+++ b/apps/client/src/components/dropdown/Dropdown.scss
@@ -0,0 +1,5 @@
+@use '../../styles/variables' as c;
+
+.error > div {
+	border: 1px solid c.$error !important;
+}
diff --git a/apps/client/src/components/dropdown/Dropdown.scss.d.ts b/apps/client/src/components/dropdown/Dropdown.scss.d.ts
new file mode 100644
index 000000000..946c30fdf
--- /dev/null
+++ b/apps/client/src/components/dropdown/Dropdown.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace DropdownScssNamespace {
+	export interface IDropdownScss {
+		error: string;
+	}
+}
+
+declare const DropdownScssModule: DropdownScssNamespace.IDropdownScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: DropdownScssNamespace.IDropdownScss;
+};
+
+export = DropdownScssModule;
diff --git a/apps/client/src/components/dropdown/Dropdown.tsx b/apps/client/src/components/dropdown/Dropdown.tsx
new file mode 100644
index 000000000..6fcf3ef8b
--- /dev/null
+++ b/apps/client/src/components/dropdown/Dropdown.tsx
@@ -0,0 +1,88 @@
+import * as React from 'react';
+import Select from 'react-select';
+import { getStrings } from '@generatedata/utils/lang';
+import C from '@generatedata/config/constants';
+import * as styles from './Dropdown.scss';
+
+export type DropdownOption = {
+	value: string;
+	label: string;
+};
+
+const selectStyles = {
+	control: (provided: any): any => ({
+		...provided,
+		minHeight: 20,
+		boxShadow: 'none'
+	}),
+	indicatorsContainer: (provided: any): any => ({
+		...provided,
+		height: 28
+	}),
+	indicatorContainer: (provided: any): any => ({
+		...provided,
+		padding: 5
+	}),
+	menuPortal: (base: any): any => ({ ...base, zIndex: C.ZINDEXES.DIALOG })
+};
+
+const Dropdown = ({ value, isGrouped, options, hasError, placeholder, ...props }: any) => {
+	const i18n = getStrings();
+
+	// react-select has a terrible API. You need to pass the entire selected object as the `value` prop to prefill it.
+	// That's not something you'd normally save - you just want to save a single value, because, well, duh. This makes
+	// thing like localization a total pain. So to make it behave like a sane component, our component here just accepts
+	// a single `value` prop - which is either the single value for the field, or an array if it's isMulti. This code
+	// converts it to an object/array of objects for react-select
+	let selectedValue: any = '';
+	if (isGrouped) {
+		if (props.isMulti) {
+			selectedValue = [];
+			options.filter(() => {
+				// group: any
+				// TODO
+				return true;
+			});
+		} else {
+			options.find((group: any) => {
+				const found = group.options.find((row: any) => row.value === value);
+				if (found && found !== -1) {
+					selectedValue = found;
+					return true;
+				}
+				return false;
+			});
+		}
+	} else {
+		if (props.isMulti) {
+			selectedValue = options.filter((row: any): any => value.indexOf(row.value) !== -1);
+		} else {
+			selectedValue = options.find((row: any): any => row.value === value);
+		}
+	}
+
+	const placeholderStr = placeholder ? placeholder : i18n.core.selectEllipsis;
+
+	// for debugging: menuIsOpen={true}
+
+	let className = props.className || '';
+	if (hasError) {
+		className += ` ${styles.error}`;
+	}
+
+	return (
+		<Select
+			{...props}
+			className={className}
+			options={options}
+			classNamePrefix="react-select"
+			value={selectedValue}
+			styles={selectStyles}
+			placeholder={placeholderStr}
+			menuPlacement="auto"
+			menuPortalTarget={document.body}
+		/>
+	);
+};
+
+export default Dropdown;
diff --git a/apps/client/src/components/email/Email.component.tsx b/apps/client/src/components/email/Email.component.tsx
new file mode 100644
index 000000000..54457fb0d
--- /dev/null
+++ b/apps/client/src/components/email/Email.component.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import CopyToClipboard from '../copyToClipboard/CopyToClipboard';
+import styles from './Email.scss';
+
+export type EmailProps = {
+	email: string;
+	i18n: any;
+	text?: string;
+};
+
+const Email = ({ email, text = '', i18n }: EmailProps) => {
+	const textString = text || email;
+
+	return (
+		<>
+			<a href={`mailto:${email}`} target="_blank" rel="noreferrer">
+				{textString}
+			</a>
+			<CopyToClipboard className={styles.copy} content={email} message={i18n.emailCopiedToClipboard} tooltip={i18n.copiedToClipboard} />
+		</>
+	);
+};
+
+export default Email;
diff --git a/apps/client/src/components/email/Email.container.tsx b/apps/client/src/components/email/Email.container.tsx
new file mode 100644
index 000000000..fad85ec25
--- /dev/null
+++ b/apps/client/src/components/email/Email.container.tsx
@@ -0,0 +1,12 @@
+import { connect } from 'react-redux';
+import * as selectors from '~store/generator/generator.selectors';
+import Email, { EmailProps } from './Email.component';
+import { Store } from '~types/general';
+
+const mapStateToProps = (state: Store): Partial<EmailProps> => ({
+	i18n: selectors.getCoreI18n(state)
+});
+
+const container: any = connect(mapStateToProps)(Email);
+
+export default container;
diff --git a/apps/client/src/components/email/Email.scss b/apps/client/src/components/email/Email.scss
new file mode 100644
index 000000000..5635e3cef
--- /dev/null
+++ b/apps/client/src/components/email/Email.scss
@@ -0,0 +1,3 @@
+.copy {
+	margin-left: 4px;
+}
diff --git a/apps/client/src/components/email/Email.scss.d.ts b/apps/client/src/components/email/Email.scss.d.ts
new file mode 100644
index 000000000..bfe0bd497
--- /dev/null
+++ b/apps/client/src/components/email/Email.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace Email2ScssNamespace {
+	export interface IEmail2Scss {
+		copy: string;
+	}
+}
+
+declare const Email2ScssModule: Email2ScssNamespace.IEmail2Scss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: Email2ScssNamespace.IEmail2Scss;
+};
+
+export = Email2ScssModule;
diff --git a/apps/client/src/components/icons.tsx b/apps/client/src/components/icons.tsx
new file mode 100644
index 000000000..1920a4c7f
--- /dev/null
+++ b/apps/client/src/components/icons.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+
+export const Github = () => (
+	<svg height="24" viewBox="0 0 16 16" version="1.1" width="24" aria-hidden="true">
+		<path
+			fillRule="evenodd"
+			d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"
+		/>
+	</svg>
+);
+
+// Cockroach by Michael Thompson from the Noun Project
+export const Cockroach = ({ size = 100 }) => (
+	<svg width={size} height={size} viewBox="0 0 100 100">
+		<g transform="translate(50 50) scale(0.69 0.69) rotate(30) translate(-50 -50)" style={{ fill: '#000000' }}>
+			<svg fill="#000000" version="1.1" x="0px" y="0px" viewBox="0 0 100 100" enableBackground="new 0 0 100 100">
+				<path d="M44.6,33.589c-0.007-1.036-0.224-1.73-0.451-1.957c-0.752-0.75-1.821-1.15-3.089-1.15c-0.983,0-2.021,0.246-3.051,0.68  c-0.102-0.242-0.233-0.469-0.423-0.656c-0.646-0.646-2.137-0.841-3.541-0.978C27.914,26.529,23.633,15,23.633,5h-0.924  c0,10,3.872,20.841,9.576,24.614c-0.733,0.153-1.357,0.282-1.824,0.746c-0.603,0.605-0.861,1.394-0.937,2.428  C25.805,26.893,15,22.797,4,22.797v0.931c14,0,22.637,4.381,25.52,10.655c0,0,0.753,2.385,1.297,2.93  c0.235,0.237,0.521,0.384,0.853,0.483c-0.16,0.442-0.3,0.888-0.383,1.331c-0.337,1.804,0.024,3.347,1.024,4.348  c0.101,0.1,0.54,0.284,1.507,0.284c0.253,0,0.528-0.018,0.808-0.043c2.248-0.204,5.212-1.209,6.987-2.918  c2.181-2.097,2.976-5.134,2.995-7.096C44.606,33.662,44.6,33.627,44.6,33.589z"></path>
+				<path d="M69.408,94.271l-5.449-7.195l0.453-0.219l5.215,7.139c0,0,0.129,0.443,0,0.486C69.551,94.51,69.408,94.271,69.408,94.271z"></path>
+				<g>
+					<path d="M35.442,71.332l-0.049,0.07C35.454,71.385,35.5,71.361,35.442,71.332z"></path>
+					<path d="M83.092,81.541c0.229-0.23-40.726-39.226-40.726-39.226c-1.699,1.417-8.172,2.952-7.995,3.547   c0.304,1.032,0.755,2.136,1.266,3.263l-16.512,1.958l0.803,0.496l-0.604,0.486l16.729-2.051c1.17,2.393,2.761,4.95,4.646,7.549   l-9.047,2.975l2.718,10.301c0,0,0.638,0.082,0.775,0.182L32,76.264v0.744l3.604-5.605c-0.101,0.031-0.363,0.049-0.307,0.033   c0.297-0.08,0.607-1.043,0.607-1.043l-2.158-8.631l8.117-2.646c2.166,2.83,4.659,5.684,7.393,8.418   c0.525,0.525,1.053,1.037,1.585,1.541l-2.474,8.707l2.497,1.541l-0.658,0.816l0.717,0.135l0.5-0.605l1.029,0.633l-0.545,0.688   l0.199,0.156l0.148,0.504l0.744-1.008l1.115,0.688l-0.549,0.754l0.211,0.164l0.242,0.369l0.668-0.936l1.309,0.809l-0.648,0.834   l0.166,0.127l0.197,0.158l0.672-0.881l1.773,1.092l-0.961,1.252l0.371-0.158l0.197,0.158l0.795-1.002l1.863,1.148l-0.721,0.912   l0.197,0.158l-0.197,0.428l1.072-1.281l3.293,2.033c0,0,0.811,0.191,0.953,0c0.113-0.156-0.223-0.736-0.223-0.736l-3.125-2.375   l0.623-0.748l-0.18-0.143l-0.041-0.33l-0.754,0.953l-1.736-1.32l0.635-0.807L60,81.789l-0.18-0.141l-0.631,0.82l-1.656-1.258   l0.814-1.072l-0.355,0.129l-0.166-0.129l-0.633,0.812l-1.291-0.98l0.561-0.785L56.25,79.02l-0.125-0.447l-0.736,1.008l-1.031-0.783   l0.656-0.889l-0.389-0.102l0.055-0.33l-0.771,0.979l-0.912-0.695l0.877-1.064l-0.787-0.143l-0.639,0.793l-0.986-0.752l2.221-4.941   c6.229,5.408,12.623,9.314,18.014,11.057l0.32,1.641l1.215,2.381l0.209-2.797l-0.15-0.764c1.436,0.361,2.789,0.557,4.027,0.557   C79.641,83.727,81.793,82.84,83.092,81.541z"></path>
+				</g>
+				<path d="M95.609,68.072l-6.764-5.123c-0.021-0.123-0.043-0.221-0.043-0.221l-2.031-3.295l1.281-1.072l-0.428,0.197l-0.158-0.197  l-0.912,0.723l-1.148-1.865l1.002-0.791l-0.158-0.199l0.158-0.371l-1.25,0.959l-1.094-1.771l0.881-0.672l-0.156-0.199L84.66,54.01  l-0.834,0.65l-0.807-1.312l0.934-0.668l-0.369-0.24l-0.164-0.211l-0.754,0.551l-0.688-1.117l1.008-0.743l-0.504-0.149l-0.154-0.198  l-0.689,0.543l-0.633-1.03l0.607-0.5l-0.137-0.718l-0.816,0.657l-1.541-2.497l-8.936,2.747c-0.486-0.511-0.963-1.024-1.471-1.53  c-2.393-2.396-4.676-4.521-6.887-6.385l2.699-8.282l8.635,2.143c0,0,0.961-0.355,1.041-0.651c0.025-0.097-0.029,0.173-0.104,0.019  L79.773,31h-0.744l-5.244,3.582c-0.1-0.134-0.182-0.449-0.182-0.449l-10.301-2.659l-3.01,9.179  c-2.934-2.339-5.754-4.227-8.545-5.572l-2.062-17.516l-0.496,0.8l-0.486-0.613l2.054,16.858c-1.164-0.51-2.329-0.965-3.493-1.29  c-1.098-0.307-1.223,0.614-1.178,1.285c-0.326,2.183-1.019,4.618-2.587,6.551l39.903,39.957c1.102-1.865,1.314-4.479,0.756-7.549  l0.877,0.119l2.32-0.43l-2.146-0.898l-1.34-0.162c-1.406-5.717-5.285-12.791-11.221-19.695l5.285-2.373l0.75,0.988l-0.793,0.637  l0.143,0.785L79.1,51.66l0.693,0.912l-0.98,0.771l0.332-0.055l0.102,0.387l0.889-0.654l0.783,1.031l-1.008,0.736l0.447,0.125  l0.166,0.211l0.785-0.559l0.98,1.291l-0.812,0.633l0.129,0.166l-0.129,0.355l1.072-0.814l1.258,1.656l-0.82,0.631l0.141,0.18  l0.172,0.217l0.807-0.637l1.318,1.736l-0.951,0.756l0.33,0.041l0.145,0.18l0.746-0.623l2.373,3.123c0,0,0.582,0.338,0.736,0.227  c0.031-0.023,0.037-0.082,0.049-0.127l6.484,4.734c0,0,0.441,0.129,0.484,0C95.848,68.215,95.609,68.072,95.609,68.072z"></path>
+			</svg>
+		</g>
+	</svg>
+);
diff --git a/apps/client/src/components/loaders/loaders.scss b/apps/client/src/components/loaders/loaders.scss
new file mode 100644
index 000000000..57c8e7474
--- /dev/null
+++ b/apps/client/src/components/loaders/loaders.scss
@@ -0,0 +1,11 @@
+.dialogLoadingSpinner {
+	display: flex;
+	align-items: center;
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	background-color: #ffffff;
+	opacity: 0.5;
+	justify-content: center;
+	transition: all 0.5s ease-in;
+}
diff --git a/apps/client/src/components/loaders/loaders.scss.d.ts b/apps/client/src/components/loaders/loaders.scss.d.ts
new file mode 100644
index 000000000..eb2672857
--- /dev/null
+++ b/apps/client/src/components/loaders/loaders.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace LoadersScssNamespace {
+	export interface ILoadersScss {
+		dialogLoadingSpinner: string;
+	}
+}
+
+declare const LoadersScssModule: LoadersScssNamespace.ILoadersScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: LoadersScssNamespace.ILoadersScss;
+};
+
+export = LoadersScssModule;
diff --git a/apps/client/src/components/loaders/loaders.tsx b/apps/client/src/components/loaders/loaders.tsx
new file mode 100644
index 000000000..e9960756a
--- /dev/null
+++ b/apps/client/src/components/loaders/loaders.tsx
@@ -0,0 +1,101 @@
+import React from 'react';
+import CircularProgress from '@mui/material/CircularProgress';
+import * as styles from './loaders.scss';
+
+export const SmallSpinner = (props: any): any => (
+	<CircularProgress disableShrink size={20} style={{ color: '#999999', margin: 5 }} {...props} />
+);
+
+export const MediumSpinner = (props: any): any => (
+	<CircularProgress disableShrink size={40} style={{ color: '#999999', margin: 5 }} {...props} />
+);
+
+export const DefaultSpinner = () => <CircularProgress />;
+
+export type DialogLoadingSpinnerProps = {
+	visible: boolean;
+};
+
+export const DialogLoadingSpinner = ({ visible }: DialogLoadingSpinnerProps) => {
+	if (!visible) {
+		return null;
+	}
+
+	return (
+		<div className={styles.dialogLoadingSpinner}>
+			<MediumSpinner style={{ color: '#444444' }} />
+		</div>
+	);
+};
+
+export const Centered = ({ children }: any) => (
+	<div
+		style={{
+			display: 'flex',
+			height: '100%',
+			alignItems: 'center',
+			justifyContent: 'center',
+			margin: 'auto'
+		}}
+	>
+		{children}
+	</div>
+);
+
+export const FullPageLoadingSpinner = () => (
+	<>
+		<div
+			style={{
+				position: 'absolute',
+				top: 0,
+				zIndex: 6002,
+				height: '100%',
+				width: '100%'
+			}}
+		>
+			<div
+				style={{
+					display: 'flex',
+					width: '100%',
+					height: '100%',
+					alignItems: 'center',
+					justifyContent: 'center'
+				}}
+			>
+				<DefaultSpinner />
+			</div>
+		</div>
+
+		<div
+			style={{
+				position: 'absolute',
+				zIndex: 6000,
+				top: 0,
+				left: 0,
+				bottom: 0,
+				right: 0,
+				backgroundColor: '#000000',
+				opacity: 0.5
+			}}
+		/>
+
+		<div
+			style={{
+				padding: 20,
+				width: 80,
+				height: 80,
+				backgroundColor: '#ffffff',
+				borderRadius: 5,
+				display: 'inline-block',
+				opacity: 0.5,
+				zIndex: 6001,
+				position: 'absolute',
+				margin: 'auto',
+				left: 0,
+				right: 0,
+				top: 0,
+				bottom: 0
+			}}
+		/>
+	</>
+);
diff --git a/apps/client/src/components/pills/BasePill.scss b/apps/client/src/components/pills/BasePill.scss
new file mode 100644
index 000000000..cffc07470
--- /dev/null
+++ b/apps/client/src/components/pills/BasePill.scss
@@ -0,0 +1,14 @@
+.row {
+	margin-bottom: 10px;
+
+	input {
+		margin: 0 6px 0 0;
+	}
+
+	& > * {
+		margin-right: 10px;
+	}
+	&:last-child {
+		margin-right: 0;
+	}
+}
diff --git a/apps/client/src/components/pills/BasePill.scss.d.ts b/apps/client/src/components/pills/BasePill.scss.d.ts
new file mode 100644
index 000000000..9358d5cca
--- /dev/null
+++ b/apps/client/src/components/pills/BasePill.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace BasePillScssNamespace {
+	export interface IBasePillScss {
+		row: string;
+	}
+}
+
+declare const BasePillScssModule: BasePillScssNamespace.IBasePillScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: BasePillScssNamespace.IBasePillScss;
+};
+
+export = BasePillScssModule;
diff --git a/apps/client/src/components/pills/BasePill.tsx b/apps/client/src/components/pills/BasePill.tsx
new file mode 100644
index 000000000..527532382
--- /dev/null
+++ b/apps/client/src/components/pills/BasePill.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import Button from '@mui/material/Button';
+import { Tooltip } from '../tooltips';
+import styles from './BasePill.scss';
+
+export const PillRow = ({ className, children }: any) => {
+	let classes = styles.row;
+	if (className) {
+		classes += ` ${className}`;
+	}
+	return <div className={classes}>{children}</div>;
+};
+
+export const enum PillType {
+	radio = 'radio',
+	checkbox = 'checkbox'
+}
+
+type PillProps = {
+	type: PillType;
+	label: string;
+	onClick: () => void;
+	name: string;
+	checked: boolean;
+	disabled?: boolean;
+	tooltip?: string;
+	style?: any;
+};
+
+const BasePill = ({ type, label, onClick, name, checked, disabled, tooltip, style }: PillProps) => {
+	const button = (
+		<Button onClick={onClick} size="small" color="primary" variant="outlined" style={style} disabled={disabled}>
+			<input type={type} name={name} checked={checked} disabled={disabled} onChange={(): void => {}} />
+			<span>{label}</span>
+		</Button>
+	);
+
+	if (tooltip) {
+		return (
+			<Tooltip
+				title={<span dangerouslySetInnerHTML={{ __html: tooltip }} />}
+				arrow
+				disableHoverListener={disabled}
+				disableFocusListener={disabled}
+			>
+				<span>{button}</span>
+			</Tooltip>
+		);
+	}
+
+	return button;
+};
+
+BasePill.defaultProps = {
+	disabled: false,
+	style: {}
+};
+
+export default BasePill;
diff --git a/apps/client/src/components/pills/CheckboxPill.tsx b/apps/client/src/components/pills/CheckboxPill.tsx
new file mode 100644
index 000000000..366762088
--- /dev/null
+++ b/apps/client/src/components/pills/CheckboxPill.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import BasePill, { PillType } from './BasePill';
+
+type CheckboxPillProps = {
+	label: string;
+	onClick: () => void;
+	name: string;
+	checked: boolean;
+	disabled?: boolean;
+	tooltip?: string;
+	style?: any;
+};
+
+const CheckboxPill = ({ label, onClick, name, checked, disabled, tooltip, style }: CheckboxPillProps) => (
+	<BasePill
+		type={PillType.checkbox}
+		label={label}
+		onClick={onClick}
+		name={name}
+		checked={checked}
+		disabled={disabled}
+		tooltip={tooltip}
+		style={style}
+	/>
+);
+
+export default CheckboxPill;
diff --git a/apps/client/src/components/pills/RadioPill.tsx b/apps/client/src/components/pills/RadioPill.tsx
new file mode 100644
index 000000000..a9e19a4d4
--- /dev/null
+++ b/apps/client/src/components/pills/RadioPill.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import BasePill, { PillType } from './BasePill';
+
+export { PillRow as RadioPillRow } from './BasePill';
+
+type RadioPillProps = {
+	label: string;
+	onClick: () => void;
+	name: string;
+	checked: boolean;
+	disabled?: boolean;
+	tooltip?: string;
+	style?: any;
+};
+
+const RadioPill = ({ label, onClick, name, checked, disabled, tooltip, style }: RadioPillProps) => (
+	<BasePill
+		type={PillType.radio}
+		label={label}
+		onClick={onClick}
+		name={name}
+		checked={checked}
+		disabled={disabled}
+		tooltip={tooltip}
+		style={style}
+	/>
+);
+
+export default RadioPill;
diff --git a/apps/client/src/components/pills/__tests__/RadioPill.test.tsx b/apps/client/src/components/pills/__tests__/RadioPill.test.tsx
new file mode 100644
index 000000000..ee012e137
--- /dev/null
+++ b/apps/client/src/components/pills/__tests__/RadioPill.test.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import RadioPill, { RadioPillRow } from '../RadioPill';
+import { render } from '@testing-library/react';
+
+describe('RadioPillRow', () => {
+	it('renders children', () => {
+		const { baseElement } = render(
+			<RadioPillRow>
+				<div>Children!</div>
+			</RadioPillRow>
+		);
+
+		expect(baseElement.innerHTML).toContain('Children!');
+	});
+
+	it('includes the classname passed', () => {
+		const { baseElement } = render(
+			<RadioPillRow className="this-is-a-test">
+				<div>Children!</div>
+			</RadioPillRow>
+		);
+
+		expect(baseElement.querySelector('.this-is-a-test')).toBeTruthy();
+	});
+});
+
+describe('RadioPill', () => {
+	it('renders label', () => {
+		const { container } = render(
+			<RadioPill label="Label!" onClick={() => {}} name="name123" checked={false} disabled={false} tooltip="Yo yo yo" />
+		);
+
+		expect(container.innerHTML).toContain('Label!');
+	});
+
+	it('includes name field', () => {
+		const { container } = render(
+			<RadioPill label="Label!" onClick={() => {}} name="name123" checked={false} disabled={false} />
+		);
+
+		expect(container.querySelector('[name=name123]')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/components/tables/TableHeader.component.tsx b/apps/client/src/components/tables/TableHeader.component.tsx
new file mode 100644
index 000000000..9340df805
--- /dev/null
+++ b/apps/client/src/components/tables/TableHeader.component.tsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import ArrowDropUp from '@mui/icons-material/ArrowDropUp';
+import ArrowDropDown from '@mui/icons-material/ArrowDropDown';
+import * as styles from './TableHeader.scss';
+
+export type TableCol = {
+	label?: string;
+	field?: string;
+	className?: string;
+	sortable?: boolean;
+};
+
+export const enum ColSortDir {
+	asc = 'ASC',
+	desc = 'DESC'
+}
+
+export type TableHeaderProps = {
+	cols: TableCol[];
+	sortCol?: string;
+	sortDir?: ColSortDir;
+	onSort?: (col: string, dir: ColSortDir) => void;
+};
+
+const TableHeader = ({ cols, sortCol, sortDir, onSort }: TableHeaderProps) => {
+	const columns = cols.map((col: TableCol, index: number) => {
+		let colClasses = styles.colHeader;
+		if (col.className) {
+			colClasses += ` ${col.className}`;
+		}
+		if (col.sortable) {
+			colClasses += ` ${styles.sortable}`;
+		}
+
+		const colProps: any = {
+			className: colClasses
+		};
+
+		let sorter: any = null;
+		let colSortDir = sortDir === ColSortDir.asc ? ColSortDir.desc : ColSortDir.asc;
+
+		if (col.field === sortCol) {
+			if (sortDir === ColSortDir.asc) {
+				sorter = <ArrowDropUp />;
+				colSortDir = ColSortDir.desc;
+			} else {
+				sorter = <ArrowDropDown />;
+				colSortDir = ColSortDir.asc;
+			}
+		}
+
+		if (col.sortable) {
+			colProps.onClick = (): void => onSort!(col.field!, colSortDir);
+		}
+
+		return (
+			<div {...colProps} key={index}>
+				<span>{col.label || ''}</span>
+				{sorter}
+			</div>
+		);
+	});
+
+	return <div className={`${styles.row} ${styles.header}`}>{columns}</div>;
+};
+
+export default TableHeader;
diff --git a/apps/client/src/components/tables/TableHeader.scss b/apps/client/src/components/tables/TableHeader.scss
new file mode 100644
index 000000000..8ccbf5f97
--- /dev/null
+++ b/apps/client/src/components/tables/TableHeader.scss
@@ -0,0 +1,39 @@
+.header {
+	font-weight: bold;
+	font-size: 13px;
+	color: #666666;
+	padding-top: 2px;
+	border-bottom: 1px solid #333333;
+}
+
+.row {
+	display: flex;
+	width: 100%;
+	padding: 6px;
+	align-items: center;
+	font-size: 13px;
+}
+
+.colHeader {
+	display: flex;
+	align-items: center;
+
+	&.sortable {
+		cursor: pointer;
+
+		svg {
+			font-size: 20px;
+			margin-right: 6px;
+		}
+
+		&:hover {
+			svg {
+				fill: #111111;
+			}
+		}
+	}
+
+	span {
+		flex: 1;
+	}
+}
diff --git a/apps/client/src/components/tables/TableHeader.scss.d.ts b/apps/client/src/components/tables/TableHeader.scss.d.ts
new file mode 100644
index 000000000..4df8af32c
--- /dev/null
+++ b/apps/client/src/components/tables/TableHeader.scss.d.ts
@@ -0,0 +1,15 @@
+declare namespace TableHeaderScssNamespace {
+	export interface ITableHeaderScss {
+		colHeader: string;
+		header: string;
+		row: string;
+		sortable: string;
+	}
+}
+
+declare const TableHeaderScssModule: TableHeaderScssNamespace.ITableHeaderScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: TableHeaderScssNamespace.ITableHeaderScss;
+};
+
+export = TableHeaderScssModule;
diff --git a/apps/client/src/components/toast/Toast.component.tsx b/apps/client/src/components/toast/Toast.component.tsx
new file mode 100644
index 000000000..0217393e6
--- /dev/null
+++ b/apps/client/src/components/toast/Toast.component.tsx
@@ -0,0 +1,78 @@
+import React, { useEffect, useImperativeHandle, useRef } from 'react';
+import MuiAlert, { AlertProps, Color } from '@mui/material/Alert';
+import Snackbar, { SnackbarOrigin } from '@mui/material/Snackbar';
+import Portal from '~components/Portal';
+import { initToast, ToastType } from '@generatedata/utils/general';
+import './Toast.scss';
+
+const defaultMessage: ToastType = {
+	type: 'success' as Color,
+	message: '',
+	verticalPosition: 'top' as SnackbarOrigin['vertical'],
+	horizontalPosition: 'center' as SnackbarOrigin['horizontal'],
+	autoHideDuration: 5000
+};
+
+const Alert = (props: AlertProps) => <MuiAlert elevation={6} variant="filled" {...props} />;
+
+let timeout: any;
+const Toast = () => {
+	const snackbarRef = useRef();
+	const [open, setOpen] = React.useState(false);
+	const [payload, setPayload] = React.useState<ToastType>(defaultMessage);
+
+	useEffect(() => {
+		initToast(snackbarRef.current);
+	}, []);
+
+	// @ts-ignore-line
+	useImperativeHandle(snackbarRef, () => ({
+		add: (message: ToastType): void => {
+			if (timeout) {
+				clearTimeout(timeout);
+			}
+
+			const payload = {
+				...defaultMessage,
+				...message
+			} as ToastType;
+			setOpen(true);
+			setPayload(payload);
+
+			timeout = setTimeout(() => {
+				setOpen(false);
+				clearTimeout(timeout);
+			}, payload.autoHideDuration);
+		}
+	}));
+
+	const handleClose = (): void => {
+		setOpen(false);
+	};
+
+	return (
+		<Portal id="gd-toast">
+			<Snackbar
+				ref={snackbarRef}
+				anchorOrigin={{
+					vertical: payload.verticalPosition as SnackbarOrigin['vertical'],
+					horizontal: payload.horizontalPosition as SnackbarOrigin['horizontal']
+				}}
+				open={open}
+				autoHideDuration={payload.autoHideDuration}
+				onClose={handleClose}
+			>
+				<Alert onClose={handleClose} severity={payload.type}>
+					{payload.message}
+				</Alert>
+			</Snackbar>
+		</Portal>
+	);
+};
+
+Toast.defaultProps = {
+	type: 'success',
+	autoHideDuration: 5000
+};
+
+export default Toast;
diff --git a/apps/client/src/components/toast/Toast.scss b/apps/client/src/components/toast/Toast.scss
new file mode 100644
index 000000000..63e0da394
--- /dev/null
+++ b/apps/client/src/components/toast/Toast.scss
@@ -0,0 +1,3 @@
+:global(#gd-toast) :global(.MuiSnackbar-root) {
+	z-index: 5010;
+}
diff --git a/apps/client/src/components/toast/Toast.scss.d.ts b/apps/client/src/components/toast/Toast.scss.d.ts
new file mode 100644
index 000000000..e39605711
--- /dev/null
+++ b/apps/client/src/components/toast/Toast.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace ToastScssNamespace {
+	export interface IToastScss {
+		toast: string;
+	}
+}
+
+declare const ToastScssModule: ToastScssNamespace.IToastScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: ToastScssNamespace.IToastScss;
+};
+
+export = ToastScssModule;
diff --git a/apps/client/src/components/toast/__tests__/Toast.test.tsx b/apps/client/src/components/toast/__tests__/Toast.test.tsx
new file mode 100644
index 000000000..dd3d210ab
--- /dev/null
+++ b/apps/client/src/components/toast/__tests__/Toast.test.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import Toast from '../Toast.component';
+import { render, act } from '@testing-library/react';
+import { addToast } from '@generatedata/utils/general';
+
+describe('Toast', () => {
+	it('renders', () => {
+		const { baseElement } = render(<Toast />);
+		expect(baseElement.querySelector('#gd-toast')).toBeTruthy();
+	});
+
+	it('shows a toast', () => {
+		const { baseElement } = render(<Toast />);
+
+		act(() => {
+			addToast({
+				message: 'Hello world!',
+				type: 'success'
+			});
+		});
+
+		expect(baseElement.innerHTML).toContain('Hello world!');
+	});
+});
diff --git a/apps/client/src/components/tooltips.tsx b/apps/client/src/components/tooltips.tsx
new file mode 100644
index 000000000..ba411dc75
--- /dev/null
+++ b/apps/client/src/components/tooltips.tsx
@@ -0,0 +1,43 @@
+import MuiTooltip from '@mui/material/Tooltip';
+import { styled } from '@mui/material/styles';
+
+export const HtmlTooltip = styled(MuiTooltip)(() => ({
+	tooltip: {
+		backgroundColor: '#ffffff',
+		color: 'rgba(0, 0, 0, 0.87)',
+		fontSize: 12,
+		padding: 0,
+		boxShadow: '3px 3px 6px #999999'
+	},
+	arrow: {
+		color: '#ffffff'
+	}
+}));
+
+export const Tooltip = styled(MuiTooltip)(() => ({
+	tooltip: {
+		backgroundColor: '#333333',
+		maxWidth: 220,
+		color: '#dddddd',
+		lineHeight: '16px',
+		fontSize: 11,
+		padding: 10
+	},
+	arrow: {
+		color: '#333333'
+	}
+}));
+
+export const ErrorTooltip = styled(MuiTooltip)(() => ({
+	tooltip: {
+		backgroundColor: '#D80000',
+		maxWidth: 220,
+		color: '#ffffff',
+		lineHeight: '16px',
+		fontSize: 11,
+		padding: 10
+	},
+	arrow: {
+		color: '#D80000'
+	}
+}));
diff --git a/apps/client/src/core/ErrorBoundary.component.tsx b/apps/client/src/core/ErrorBoundary.component.tsx
new file mode 100644
index 000000000..028217bc1
--- /dev/null
+++ b/apps/client/src/core/ErrorBoundary.component.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import { persistor } from './store';
+import Button from '@mui/material/Button';
+import { Cockroach } from '~components/icons';
+import Header from './header/Header.container';
+import Footer from './footer/Footer.container';
+
+class ErrorBoundary extends React.Component<any, any> {
+	constructor(props: any) {
+		super(props);
+		this.state = {
+			hasError: false,
+			error: ''
+		};
+		this.onClear = this.onClear.bind(this);
+	}
+
+	static getDerivedStateFromError(error: string): any {
+		return {
+			hasError: true,
+			error
+		};
+	}
+
+	// componentDidCatch(error: any, errorInfo: any): any {
+	// 	// logErrorToMyService(error, errorInfo);
+	// }
+
+	onClear(): void {
+		persistor.purge().then(() => {
+			this.setState({
+				hasError: false,
+				error: ''
+			});
+		});
+	}
+
+	render(): any {
+		if (this.state.hasError) {
+			return (
+				<>
+					<Header />
+					<div style={{ maxWidth: 600, padding: 20, margin: 'auto' }}>
+						<h2>Something went terribly, terribly wrong.</h2>
+
+						<div style={{ display: 'flex', alignItems: 'center', marginTop: -20 }}>
+							<div style={{ width: 200 }}>
+								<Cockroach size={200} />
+							</div>
+							<div>
+								<p style={{ fontSize: 13, color: '#999999', marginBottom: 20 }}>
+									Sorry! Some sort of error occurred. This project is still in alpha so you may see this page a little more than you'd like.
+									Feel free to complain about it via a{' '}
+									<a href="https://github.com/benkeen/generatedata/issues" target="_blank" rel="noopener noreferrer">
+										github issue
+									</a>{' '}
+									&#8212; but we will get to it!
+								</p>
+
+								<Button color="primary" variant="outlined" onClick={this.onClear}>
+									Curse the developer and start anew
+								</Button>
+
+								<div>{this.state.error}</div>
+							</div>
+						</div>
+					</div>
+					<Footer />
+				</>
+			);
+		}
+		return this.props.children;
+	}
+}
+
+export default ErrorBoundary;
diff --git a/apps/client/src/core/__tests__/ErrorBoundary.component.test.tsx b/apps/client/src/core/__tests__/ErrorBoundary.component.test.tsx
new file mode 100644
index 000000000..61a9426a1
--- /dev/null
+++ b/apps/client/src/core/__tests__/ErrorBoundary.component.test.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import ErrorBoundary from '../ErrorBoundary.component';
+
+describe('ErrorBoundary', () => {
+	it('renders', () => {
+		const { baseElement } = render(
+			<ErrorBoundary>
+				<span className="hello">Test</span>
+			</ErrorBoundary>
+		);
+
+		expect(baseElement.querySelector('.hello')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/account/Account.component.tsx b/apps/client/src/core/account/Account.component.tsx
new file mode 100644
index 000000000..aee599e67
--- /dev/null
+++ b/apps/client/src/core/account/Account.component.tsx
@@ -0,0 +1,78 @@
+import React, { useEffect, useState } from 'react';
+import { SelectedAccountTab } from '~types/account';
+import DataSets from './dataSets/DataSets.container';
+import YourAccount from './yourAccount/YourAccount.container';
+import ChangePassword from './changePassword/ChangePassword.container';
+import sharedStyles from '../../styles/shared.scss';
+import styles from './Account.scss';
+
+export type AccountPageProps = {
+	selectedTab: SelectedAccountTab;
+	onChangeTab: (tab: SelectedAccountTab) => void;
+	i18n: any;
+};
+
+const AccountPage = ({ selectedTab, onChangeTab, i18n }: AccountPageProps) => {
+	const [dataSetsClasses, setDataSetsClasses] = useState(styles.hidden);
+	const [yourAccountClasses, setYourAccountClasses] = useState(styles.hidden);
+	const [changePasswordClasses, setChangePasswordClasses] = useState(styles.hidden);
+
+	useEffect(() => {
+		let dsClasses = styles.hidden;
+		let cpClasses = styles.hidden;
+		let yaClasses = styles.hidden;
+
+		if (selectedTab === SelectedAccountTab.yourAccount) {
+			yaClasses = styles.shown;
+		} else if (selectedTab === SelectedAccountTab.dataSets) {
+			dsClasses = styles.shown;
+		} else {
+			cpClasses = styles.shown;
+		}
+
+		setDataSetsClasses(dsClasses);
+		setChangePasswordClasses(cpClasses);
+		setYourAccountClasses(yaClasses);
+	}, [selectedTab]);
+
+	const getTab = () => {
+		if (selectedTab === SelectedAccountTab.dataSets) {
+			return <DataSets className={dataSetsClasses} />;
+		}
+		if (selectedTab === SelectedAccountTab.yourAccount) {
+			return <YourAccount className={yourAccountClasses} />;
+		}
+
+		return <ChangePassword className={changePasswordClasses} />;
+	};
+
+	return (
+		<section className={sharedStyles.twoColPage} data-automation="account-page">
+			<nav>
+				<ul>
+					<li
+						className={selectedTab === SelectedAccountTab.dataSets ? sharedStyles.selected : ''}
+						onClick={(): void => onChangeTab(SelectedAccountTab.dataSets)}
+					>
+						{i18n.dataSets}
+					</li>
+					<li
+						className={selectedTab === SelectedAccountTab.yourAccount ? sharedStyles.selected : ''}
+						onClick={(): void => onChangeTab(SelectedAccountTab.yourAccount)}
+					>
+						{i18n.yourAccount}
+					</li>
+					<li
+						className={selectedTab === SelectedAccountTab.changePassword ? sharedStyles.selected : ''}
+						onClick={(): void => onChangeTab(SelectedAccountTab.changePassword)}
+					>
+						{i18n.changePassword}
+					</li>
+				</ul>
+			</nav>
+			<div className={sharedStyles.tab}>{getTab()}</div>
+		</section>
+	);
+};
+
+export default AccountPage;
diff --git a/apps/client/src/core/account/Account.container.ts b/apps/client/src/core/account/Account.container.ts
new file mode 100644
index 000000000..bb296ec75
--- /dev/null
+++ b/apps/client/src/core/account/Account.container.ts
@@ -0,0 +1,22 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import * as selectors from '~store/generator/generator.selectors';
+import * as accountActions from '~store/account/account.actions';
+import * as accountSelectors from '~store/account/account.selectors';
+import AccountPage, { AccountPageProps } from './Account.component';
+import { withAuth } from '../auth/withAuth';
+import { Store } from '~types/general';
+import { SelectedAccountTab } from '~types/account';
+
+const mapStateToProps = (state: Store): Pick<AccountPageProps, 'i18n' | 'selectedTab'> => ({
+	i18n: selectors.getCoreI18n(state),
+	selectedTab: accountSelectors.getSelectedTab(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Pick<AccountPageProps, 'onChangeTab'> => ({
+	onChangeTab: (tab: SelectedAccountTab): any => dispatch(accountActions.onChangeTab(tab))
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(AccountPage);
+
+export default withAuth(container);
diff --git a/apps/client/src/core/account/Account.scss b/apps/client/src/core/account/Account.scss
new file mode 100644
index 000000000..417778e02
--- /dev/null
+++ b/apps/client/src/core/account/Account.scss
@@ -0,0 +1,43 @@
+@use '../../styles/variables.scss';
+
+.hidden {
+	opacity: 0;
+}
+
+.shown {
+	opacity: 1;
+	transition: opacity 200ms ease-in-out;
+}
+
+.yourAccountPage {
+	display: flex;
+	flex-direction: row;
+	margin-bottom: 10px;
+	& > * {
+		flex: 1;
+	}
+}
+
+.rightCol {
+	border-left: 1px solid #f2f2f2;
+	padding-left: 20px;
+	height: 83%;
+}
+
+.rightBlock {
+	& > div {
+		margin-bottom: 15px;
+		font-size: 32px;
+	}
+}
+
+.yourAccountRightCol {
+	flex: 1;
+	margin-left: 20px;
+}
+
+@media (max-width: 720px) {
+	.yourAccountRightCol {
+		display: none;
+	}
+}
diff --git a/apps/client/src/core/account/Account.scss.d.ts b/apps/client/src/core/account/Account.scss.d.ts
new file mode 100644
index 000000000..bdb907d7b
--- /dev/null
+++ b/apps/client/src/core/account/Account.scss.d.ts
@@ -0,0 +1,17 @@
+declare namespace AccountScssNamespace {
+	export interface IAccountScss {
+		hidden: string;
+		rightBlock: string;
+		rightCol: string;
+		shown: string;
+		yourAccountPage: string;
+		yourAccountRightCol: string;
+	}
+}
+
+declare const AccountScssModule: AccountScssNamespace.IAccountScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: AccountScssNamespace.IAccountScss;
+};
+
+export = AccountScssModule;
diff --git a/apps/client/src/core/account/__tests__/Account.component.test.tsx b/apps/client/src/core/account/__tests__/Account.component.test.tsx
new file mode 100644
index 000000000..7c6f93ee4
--- /dev/null
+++ b/apps/client/src/core/account/__tests__/Account.component.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { renderWithStoreAndRouter } from '../../../../tests/testHelpers';
+import Account from '../Account.component';
+import { SelectedAccountTab } from '~types/account';
+
+const i18n = require('../../../i18n/en.json');
+
+describe('Account component', () => {
+	it('render', () => {
+		const { container } = renderWithStoreAndRouter(
+			<Account selectedTab={SelectedAccountTab.dataSets} onChangeTab={() => {}} i18n={i18n} />
+		);
+
+		const page = container.querySelector('[data-automation=account-page]');
+		expect(page).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/account/__tests__/Account.container.test.tsx b/apps/client/src/core/account/__tests__/Account.container.test.tsx
new file mode 100644
index 000000000..28abae483
--- /dev/null
+++ b/apps/client/src/core/account/__tests__/Account.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import AccountContainer from '../Account.container';
+import { renderWithStoreAndRouter } from '../../../../tests/testHelpers';
+
+describe('Account Container', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<AccountContainer />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/account/changePassword/ChangePassword.component.tsx b/apps/client/src/core/account/changePassword/ChangePassword.component.tsx
new file mode 100644
index 000000000..1cda69b3d
--- /dev/null
+++ b/apps/client/src/core/account/changePassword/ChangePassword.component.tsx
@@ -0,0 +1,162 @@
+import React, { useRef, useState } from 'react';
+import Alert from '@mui/material/Alert';
+import Button from '@mui/material/Button';
+import TextField from '~components/TextField';
+
+export type ChangePasswordProps = {
+	oneTimePassword: string;
+	onSave: (currentPassword: string, newPassword: string, onSuccess: () => void, onError: () => void) => void;
+	className: string;
+	i18n: any;
+	throttle?: boolean;
+};
+
+const ChangePassword = ({ oneTimePassword, onSave, className, throttle, i18n }: ChangePasswordProps) => {
+	const currentPasswordField = useRef<HTMLInputElement>();
+	const [currentPassword, setCurrentPassword] = useState('');
+	const [currentPasswordError, setCurrentPasswordError] = useState('');
+
+	const passwordField = useRef<HTMLInputElement>();
+	const [password, setPassword] = useState('');
+
+	const password2Field = useRef<HTMLInputElement>();
+	const [password2, setPassword2] = useState('');
+	const [password2Error, setPassword2Error] = useState('');
+
+	const onSuccess = (): void => {
+		setCurrentPassword('');
+		setPassword('');
+		setPassword2('');
+	};
+	const onError = (): void => {
+		setCurrentPasswordError(i18n.passwordUpdateInvalidPassword);
+		currentPasswordField.current!.focus();
+	};
+
+	const handleSave = (e: any): void => {
+		e.preventDefault();
+
+		if (isValid(true)) {
+			// for one-time password logins, just send back the one-time password for confirmation on the server
+			const currPassword = oneTimePassword ? oneTimePassword : currentPassword;
+			onSave(currPassword, password, onSuccess, onError);
+		}
+	};
+
+	// TODO move validation errors to RIGHT of field, and making them show up immediately would be nice
+	const isValid = (showErrors = false): boolean => {
+		let hasError = false;
+		if (!oneTimePassword && currentPassword.trim() === '') {
+			hasError = true;
+		}
+
+		if (password.trim() === '') {
+			hasError = true;
+		} else if (password2.trim() === '') {
+			hasError = true;
+		} else if (password !== password2) {
+			if (showErrors) {
+				setPassword2Error(i18n.validationDifferentNewPasswords);
+				password2Field.current!.focus();
+				hasError = true;
+			}
+		}
+
+		return !hasError;
+	};
+
+	const submitButtonEnabled = isValid();
+
+	const getCurrentPasswordBlock = () => {
+		if (oneTimePassword) {
+			return (
+				<Alert severity="warning" style={{ marginBottom: 15 }}>
+					{i18n.oneTimePasswordLogin}
+				</Alert>
+			);
+		}
+
+		return (
+			<>
+				<label>{i18n.currentPassword}</label>
+				<div
+					style={{
+						marginBottom: 15,
+						paddingBottom: 20,
+						borderBottom: '1px solid #dddddd'
+					}}
+				>
+					<TextField
+						type="password"
+						error={currentPasswordError}
+						ref={currentPasswordField}
+						value={currentPassword}
+						name="currentPassword"
+						onChange={(e: any): void => {
+							setCurrentPasswordError('');
+							setCurrentPassword(e.target.value);
+						}}
+						style={{ width: 220 }}
+						tooltipPlacement="right"
+						throttle={throttle}
+						autoFocus
+					/>
+				</div>
+			</>
+		);
+	};
+
+	return (
+		<form onSubmit={handleSave} autoComplete="off" className={className}>
+			<div style={{ marginBottom: 10 }}>
+				{getCurrentPasswordBlock()}
+
+				<label>{i18n.password}</label>
+				<div style={{ marginBottom: 15 }}>
+					<TextField
+						type="password"
+						ref={passwordField}
+						value={password}
+						name="password"
+						onChange={(e: any): void => setPassword(e.target.value)}
+						style={{ width: 220 }}
+						tooltipPlacement="right"
+						autoFocus={oneTimePassword !== ''}
+						throttle={throttle}
+					/>
+				</div>
+
+				<label>{i18n.reenterPassword}</label>
+				<div style={{ marginBottom: 15 }}>
+					<TextField
+						type="password"
+						ref={password2Field}
+						value={password2}
+						error={password2Error}
+						name="password2"
+						onChange={(e: any): void => {
+							setPassword2Error('');
+							setPassword2(e.target.value);
+						}}
+						autoComplete="off"
+						style={{ width: 220 }}
+						tooltipPlacement="right"
+						throttle={throttle}
+					/>
+				</div>
+			</div>
+
+			<div>
+				<Button type="submit" color="primary" variant="contained" disabled={!submitButtonEnabled} disableElevation>
+					{i18n.update}
+				</Button>
+			</div>
+		</form>
+	);
+};
+
+ChangePassword.defaultProps = {
+	throttle: false
+};
+
+export default ChangePassword;
diff --git a/apps/client/src/core/account/changePassword/ChangePassword.container.ts b/apps/client/src/core/account/changePassword/ChangePassword.container.ts
new file mode 100644
index 000000000..3013c4bcc
--- /dev/null
+++ b/apps/client/src/core/account/changePassword/ChangePassword.container.ts
@@ -0,0 +1,21 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import * as selectors from '~store/generator/generator.selectors';
+import * as accountSelectors from '~store/account/account.selectors';
+import * as accountActions from '~store/account/account.actions';
+import ChangePassword, { ChangePasswordProps } from './ChangePassword.component';
+import { Store } from '~types/general';
+
+const mapStateToProps = (state: Store): Pick<ChangePasswordProps, 'oneTimePassword' | 'i18n'> => ({
+	oneTimePassword: accountSelectors.getOneTimePassword(state),
+	i18n: selectors.getCoreI18n(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Pick<ChangePasswordProps, 'onSave'> => ({
+	onSave: (currentPassword: string, newPassword: string, onSuccess: () => void, onError: () => void): any =>
+		dispatch(accountActions.savePassword(currentPassword, newPassword, onSuccess, onError))
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(ChangePassword);
+
+export default container;
diff --git a/apps/client/src/core/account/changePassword/__tests__/ChangePassword.component.tsx b/apps/client/src/core/account/changePassword/__tests__/ChangePassword.component.tsx
new file mode 100644
index 000000000..f9d17291f
--- /dev/null
+++ b/apps/client/src/core/account/changePassword/__tests__/ChangePassword.component.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react';
+import ChangePassword from '../ChangePassword.component';
+
+const i18n = require('../../../../i18n/en.json');
+
+describe('ChangePassword container', () => {
+	it('submitting form does not work when fields empty', () => {
+		const onSave = jest.fn();
+		const { container } = render(
+			<ChangePassword className="the-class" onSave={onSave} i18n={i18n} oneTimePassword="" throttle={false} />
+		);
+
+		const submitButton = container.querySelector('button[type=submit]') as HTMLButtonElement;
+		fireEvent.click(submitButton);
+
+		expect(onSave).not.toHaveBeenCalled();
+	});
+
+	it('submitting form still does not works when fields non-empty but new passwords are not identical', () => {
+		const onSave = jest.fn();
+		const { container } = render(
+			<ChangePassword className="the-class" onSave={onSave} i18n={i18n} oneTimePassword="" throttle={false} />
+		);
+
+		const currentPasswordField = container.querySelector('input[name=currentPassword]') as HTMLInputElement;
+		fireEvent.change(currentPasswordField, {
+			target: {
+				value: 'current-password'
+			}
+		});
+
+		const newPasswordField1 = container.querySelector('input[name=password]') as HTMLInputElement;
+		fireEvent.change(newPasswordField1, {
+			target: {
+				value: 'password'
+			}
+		});
+
+		const newPasswordField2 = container.querySelector('input[name=password2]') as HTMLInputElement;
+		fireEvent.change(newPasswordField2, {
+			target: {
+				value: 'passwordX'
+			}
+		});
+
+		const submitButton = container.querySelector('button[type=submit]') as HTMLButtonElement;
+		fireEvent.click(submitButton);
+
+		expect(onSave).not.toHaveBeenCalled();
+	});
+
+	it('submitting form works when fields non-empty and new passwords are identical', () => {
+		const onSave = jest.fn();
+		const { container } = render(
+			<ChangePassword className="the-class" onSave={onSave} i18n={i18n} oneTimePassword="" throttle={false} />
+		);
+
+		const currentPasswordField = container.querySelector('input[name=currentPassword]') as HTMLInputElement;
+		fireEvent.change(currentPasswordField, {
+			target: {
+				value: 'current-password'
+			}
+		});
+
+		const newPasswordField1 = container.querySelector('input[name=password]') as HTMLInputElement;
+		fireEvent.change(newPasswordField1, {
+			target: {
+				value: 'password'
+			}
+		});
+
+		const newPasswordField2 = container.querySelector('input[name=password2]') as HTMLInputElement;
+		fireEvent.change(newPasswordField2, {
+			target: {
+				value: 'password'
+			}
+		});
+
+		const submitButton = container.querySelector('button[type=submit]') as HTMLButtonElement;
+		fireEvent.click(submitButton);
+
+		expect(onSave).toHaveBeenCalled();
+	});
+});
diff --git a/apps/client/src/core/account/changePassword/__tests__/ChangePassword.container.test.tsx b/apps/client/src/core/account/changePassword/__tests__/ChangePassword.container.test.tsx
new file mode 100644
index 000000000..d9fadf0b7
--- /dev/null
+++ b/apps/client/src/core/account/changePassword/__tests__/ChangePassword.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import ChangePassword from '../ChangePassword.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('ChangePassword container', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<ChangePassword />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/account/dataSets/DataSets.component.tsx b/apps/client/src/core/account/dataSets/DataSets.component.tsx
new file mode 100644
index 000000000..521133907
--- /dev/null
+++ b/apps/client/src/core/account/dataSets/DataSets.component.tsx
@@ -0,0 +1,199 @@
+import React, { useState } from 'react';
+import { useMutation, useQuery } from '@apollo/client/react';
+import Button from '@mui/material/Button';
+import HighlightOffIcon from '@mui/icons-material/HighlightOff';
+import Pagination from '~components/Pagination';
+import TableHeader, { ColSortDir } from '~components/tables/TableHeader.component';
+import * as queries from '~core/queries';
+import DeleteDataSetDialog from '~core/dialogs/deleteDataSet/DeleteDataSetDialog.component';
+import styles from './DataSets.scss';
+import * as sharedStyles from '../../../styles/shared.scss';
+import { DataSetListItem } from '@generatedata/types';
+import { formatUnixTime } from '@generatedata/utils/date';
+import { getGeneratorPageRoute } from '~utils/routeUtils';
+import { useNavigate } from 'react-router';
+import { getFormattedNum } from '@generatedata/utils/number';
+import { GDLocale } from '~types/general';
+
+const Row = ({ onDelete, onLoad, dataSet, i18n }: any) => (
+	<div className={styles.row}>
+		<div className={styles.dataSetName}>{dataSet.dataSetName}</div>
+		<div className={styles.dateCreated}>{formatUnixTime(dataSet.historyDateCreatedUnix)}</div>
+		<div className={styles.numRowsGenerated}>{getFormattedNum(dataSet.numRowsGenerated)}</div>
+		<div className={styles.open}>
+			<Button size="small" type="submit" color="primary" variant="outlined" onClick={onLoad}>
+				{i18n.open}
+			</Button>
+		</div>
+		<div className={styles.del} onClick={onDelete}>
+			<HighlightOffIcon />
+		</div>
+	</div>
+);
+
+export type DataSetsProps = {
+	locale: GDLocale;
+	onLoadDataSet: (dataSet: DataSetListItem) => void;
+	onClearCurrentDataSet: () => void;
+	currentDataSetId: number | null;
+	className: string;
+	i18n: any;
+};
+
+// to be moved to a user setting at some point
+const NUM_PER_PAGE = 10;
+
+const DataSets = ({ onLoadDataSet, locale, i18n, currentDataSetId, className = '', onClearCurrentDataSet }: DataSetsProps) => {
+	const navigate = useNavigate();
+	const [selectedDataSet, selectDataSet] = useState<DataSetListItem>();
+	const [currentPage, setCurrentPage] = useState(1);
+	const [dialogVisible, setDeleteDialogVisibility] = useState(false);
+	const [sortCol, setSortCol] = useState('dataSetName');
+	const [sortDir, setSortDir] = useState<ColSortDir>(ColSortDir.asc);
+
+	const { data } = useQuery(queries.GET_DATA_SETS, {
+		fetchPolicy: 'cache-and-network',
+		variables: {
+			offset: (currentPage - 1) * NUM_PER_PAGE,
+			limit: NUM_PER_PAGE,
+			sortDir,
+			sortCol
+		}
+	});
+
+	const loadDataSet = (dataSet: DataSetListItem): void => {
+		onLoadDataSet(dataSet);
+		navigate(getGeneratorPageRoute(locale));
+	};
+
+	const numItemsOnPage = data?.dataSets?.results?.length || 0;
+	const afterDeletePage = numItemsOnPage === 1 ? currentPage - 1 : currentPage;
+	let offset = (afterDeletePage - 1) * NUM_PER_PAGE;
+	offset = offset < 0 ? 0 : offset;
+
+	const [deleteDataSet] = useMutation(queries.DELETE_DATA_SET, {
+		refetchQueries: [
+			{
+				query: queries.GET_DATA_SETS,
+				variables: {
+					offset,
+					limit: NUM_PER_PAGE,
+					sortDir,
+					sortCol
+				}
+			}
+		],
+		onCompleted: () => {
+			setDeleteDialogVisibility(false);
+
+			if (currentDataSetId) {
+				const { dataSetId: deletedDataSetId } = selectedDataSet as DataSetListItem;
+
+				// double == intentional. Maybe a string
+				if (currentDataSetId == deletedDataSetId) {
+					onClearCurrentDataSet();
+				}
+			}
+		}
+	});
+
+	// show spinner here
+	if (!data || !data.dataSets) {
+		return null;
+	}
+
+	const onShowDeleteDialog = (dataSet: DataSetListItem): void => {
+		selectDataSet(dataSet);
+		setDeleteDialogVisibility(true);
+	};
+
+	const { results, totalCount } = data.dataSets;
+
+	if (totalCount === 0) {
+		return (
+			<section className={`${className} ${styles.page}`}>
+				<div className={sharedStyles.emptyText}>{i18n.noDataSetsSaved}</div>
+			</section>
+		);
+	}
+
+	const paginationRow =
+		totalCount > NUM_PER_PAGE ? (
+			<div className={styles.paginationRow}>
+				<Pagination
+					numPages={Math.ceil(totalCount / NUM_PER_PAGE)}
+					currentPage={currentPage}
+					onChange={(e: any, pageNum: number): void => setCurrentPage(pageNum)}
+				/>
+			</div>
+		) : null;
+
+	const cols = [
+		{
+			label: i18n.dataSetName,
+			className: styles.dataSetName,
+			field: 'dataSetName',
+			sortable: true
+		},
+		{
+			label: i18n.lastModified,
+			className: styles.lastModified,
+			field: 'lastUpdated',
+			sortable: true
+		},
+		{
+			label: i18n.rowsGenerated,
+			className: styles.numRowsGenerated,
+			field: 'numRowsGenerated',
+			sortable: true
+		},
+		{ label: i18n.open, className: styles.open },
+		{ label: '', className: styles.del }
+	];
+
+	return (
+		<>
+			<section className={`${className} ${styles.page}`}>
+				<div className={styles.table}>
+					<TableHeader
+						cols={cols}
+						sortDir={sortDir}
+						sortCol={sortCol}
+						onSort={(col: string, dir: ColSortDir): void => {
+							setSortCol(col);
+							setSortDir(dir);
+						}}
+					/>
+					<div className={styles.body}>
+						{results.map((dataSet: DataSetListItem) => (
+							<Row
+								key={dataSet.dataSetId}
+								dataSet={dataSet}
+								onDelete={(): void => onShowDeleteDialog(dataSet)}
+								onLoad={(): void => loadDataSet(dataSet)}
+								i18n={i18n}
+							/>
+						))}
+					</div>
+				</div>
+				{paginationRow}
+			</section>
+
+			<DeleteDataSetDialog
+				visible={dialogVisible}
+				dataSetName={selectedDataSet ? selectedDataSet.dataSetName : null}
+				onClose={(): void => setDeleteDialogVisibility(false)}
+				onDelete={(): any =>
+					deleteDataSet({
+						variables: {
+							dataSetId: selectedDataSet!.dataSetId
+						}
+					})
+				}
+				i18n={i18n}
+			/>
+		</>
+	);
+};
+
+export default DataSets;
diff --git a/apps/client/src/core/account/dataSets/DataSets.container.ts b/apps/client/src/core/account/dataSets/DataSets.container.ts
new file mode 100644
index 000000000..b63e344b5
--- /dev/null
+++ b/apps/client/src/core/account/dataSets/DataSets.container.ts
@@ -0,0 +1,25 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+import * as mainSelectors from '~store/main/main.selectors';
+import * as generatorActions from '~store/generator/generator.actions';
+import DataSets, { DataSetsProps } from './DataSets.component';
+import { Store } from '~types/general';
+import { withAuth } from '~core/auth/withAuth';
+import { DataSetListItem } from '@generatedata/types';
+
+const mapStateToProps = (state: Store): Partial<DataSetsProps> => ({
+	locale: mainSelectors.getLocale(state),
+	i18n: selectors.getCoreI18n(state),
+	currentDataSetId: selectors.getCurrentDataSetId(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Partial<DataSetsProps> => ({
+	onLoadDataSet: (dataSet: DataSetListItem): any => dispatch(actions.loadDataSet(dataSet)),
+	onClearCurrentDataSet: (): any => dispatch(generatorActions.clearPage())
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(DataSets);
+
+export default withAuth(container);
diff --git a/apps/client/src/core/account/dataSets/DataSets.scss b/apps/client/src/core/account/dataSets/DataSets.scss
new file mode 100644
index 000000000..bafc54d04
--- /dev/null
+++ b/apps/client/src/core/account/dataSets/DataSets.scss
@@ -0,0 +1,97 @@
+.page {
+	font-size: 13px;
+	max-width: 1024px;
+	margin: 0 auto 0;
+	width: 100%;
+
+	h2 {
+		margin-top: 0;
+	}
+}
+
+.table {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	width: 100%;
+}
+
+.paginationRow {
+	margin: 15px 0;
+}
+
+.row {
+	display: flex;
+	width: 100%;
+	padding: 6px;
+	align-items: center;
+}
+
+.header {
+	font-weight: bold;
+	font-size: 13px;
+	color: #666666;
+	padding-top: 2px;
+	border-bottom: 1px solid #333333;
+}
+
+.body {
+	overflow: scroll;
+
+	.row {
+		&:hover {
+			background-color: #f9f9f9;
+		}
+	}
+}
+
+.dataSetName {
+	flex: 1;
+}
+
+.dateCreated {
+	flex: 1;
+}
+
+.lastModified {
+	flex: 1;
+}
+
+.numRowsGenerated {
+	flex: 1;
+	color: #666666;
+}
+
+.status {
+	flex: 0 0 80px;
+}
+
+.open {
+	flex: 0 0 80px;
+	text-align: center;
+}
+
+.history {
+	flex: 0 0 80px;
+	text-align: center;
+}
+
+.del {
+	flex: 0 0 30px;
+	align-items: center;
+	cursor: pointer;
+
+	&:hover {
+		svg {
+			fill: #990000;
+		}
+	}
+}
+
+@media (max-width: 720px) {
+	.status,
+	.lastModified,
+	.numRowsGenerated {
+		display: none;
+	}
+}
diff --git a/apps/client/src/core/account/dataSets/DataSets.scss.d.ts b/apps/client/src/core/account/dataSets/DataSets.scss.d.ts
new file mode 100644
index 000000000..914676659
--- /dev/null
+++ b/apps/client/src/core/account/dataSets/DataSets.scss.d.ts
@@ -0,0 +1,25 @@
+declare namespace DataSetsScssNamespace {
+	export interface IDataSetsScss {
+		body: string;
+		dataSetName: string;
+		dateCreated: string;
+		del: string;
+		header: string;
+		history: string;
+		lastModified: string;
+		numRowsGenerated: string;
+		open: string;
+		page: string;
+		paginationRow: string;
+		row: string;
+		status: string;
+		table: string;
+	}
+}
+
+declare const DataSetsScssModule: DataSetsScssNamespace.IDataSetsScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: DataSetsScssNamespace.IDataSetsScss;
+};
+
+export = DataSetsScssModule;
diff --git a/apps/client/src/core/account/dataSets/__tests__/DataSets.container.test.tsx b/apps/client/src/core/account/dataSets/__tests__/DataSets.container.test.tsx
new file mode 100644
index 000000000..9b14587fd
--- /dev/null
+++ b/apps/client/src/core/account/dataSets/__tests__/DataSets.container.test.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import DataSets from '../DataSets.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('DataSets', () => {
+	// need to finish deciding exactly what the header will contain before adding these tests
+
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<DataSets />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/account/yourAccount/YourAccount.component.tsx b/apps/client/src/core/account/yourAccount/YourAccount.component.tsx
new file mode 100644
index 000000000..f11088df4
--- /dev/null
+++ b/apps/client/src/core/account/yourAccount/YourAccount.component.tsx
@@ -0,0 +1,77 @@
+import React, { useEffect } from 'react';
+import MainFields from '~components/accounts/mainFields/MainFields.component';
+import { AccountEditingData } from '~store/account/account.reducer';
+import { getFormattedNum } from '@generatedata/utils/number';
+import { formatUnixTime } from '@generatedata/utils/date';
+import styles from '../Account.scss';
+import C from '@generatedata/config/constants';
+
+export type YourAccountProps = {
+	data: AccountEditingData;
+	numGeneratedRows: number;
+	accountHasChanges: boolean;
+	updateAccount: (data: AccountEditingData) => void;
+	expiryDate: string;
+	onInit: () => void;
+	onSave: () => void;
+	onCancel: () => void;
+	className: string;
+	i18n: any;
+};
+
+const YourAccount = ({
+	data,
+	numGeneratedRows,
+	accountHasChanges,
+	updateAccount,
+	onSave,
+	onCancel,
+	className,
+	i18n,
+	onInit,
+	expiryDate
+}: YourAccountProps) => {
+	useEffect(() => {
+		onInit();
+	}, []);
+
+	const getExpiryDate = () => {
+		if (!expiryDate) {
+			return null;
+		}
+
+		return (
+			<div className={styles.rightBlock}>
+				<label>{i18n.accountExpiryDate}</label>
+				<div>{formatUnixTime(parseInt(expiryDate) / 1000, C.DATE_FORMAT)}</div>
+			</div>
+		);
+	};
+
+	return (
+		<div className={`${className} ${styles.yourAccountPage}`}>
+			<MainFields
+				accountHasChanges={accountHasChanges}
+				data={data}
+				onSave={onSave}
+				onCancel={onCancel}
+				updateAccount={updateAccount}
+				i18n={i18n}
+				submitButtonLabel={i18n.save}
+				showRequiredFieldError={true}
+				isAddingUser={false}
+			/>
+			<div className={styles.yourAccountRightCol}>
+				<div className={styles.rightCol}>
+					<div className={styles.rightBlock}>
+						<label>{i18n.totalNumGeneratedRows}</label>
+						<div>{getFormattedNum(numGeneratedRows)}</div>
+					</div>
+					{getExpiryDate()}
+				</div>
+			</div>
+		</div>
+	);
+};
+
+export default YourAccount;
diff --git a/apps/client/src/core/account/yourAccount/YourAccount.container.ts b/apps/client/src/core/account/yourAccount/YourAccount.container.ts
new file mode 100644
index 000000000..832167ae5
--- /dev/null
+++ b/apps/client/src/core/account/yourAccount/YourAccount.container.ts
@@ -0,0 +1,27 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import * as selectors from '~store/generator/generator.selectors';
+import * as accountSelectors from '~store/account/account.selectors';
+import * as accountActions from '~store/account/account.actions';
+import YourAccount, { YourAccountProps } from './YourAccount.component';
+import { Store } from '~types/general';
+import { AccountEditingData } from '~store/account/account.reducer';
+
+const mapStateToProps = (state: Store): Partial<YourAccountProps> => ({
+	data: accountSelectors.getEditingData(state),
+	numGeneratedRows: accountSelectors.getNumGeneratedRows(state),
+	accountHasChanges: accountSelectors.accountHasChanges(state),
+	expiryDate: accountSelectors.getExpiryDate(state),
+	i18n: selectors.getCoreI18n(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Partial<YourAccountProps> => ({
+	updateAccount: (data: AccountEditingData): any => dispatch(accountActions.updateAccount(data)),
+	onInit: (): any => dispatch(accountActions.onEditYourAccount()),
+	onCancel: (): any => dispatch(accountActions.cancelChanges()),
+	onSave: (): any => dispatch(accountActions.saveYourAccount())
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(YourAccount);
+
+export default container;
diff --git a/apps/client/src/core/accounts/Accounts.component.tsx b/apps/client/src/core/accounts/Accounts.component.tsx
new file mode 100644
index 000000000..520f97754
--- /dev/null
+++ b/apps/client/src/core/accounts/Accounts.component.tsx
@@ -0,0 +1,54 @@
+import React, { useEffect } from 'react';
+import * as sharedStyles from '../../styles/shared.scss';
+import AccountsList from './accountsList/AccountsList.container';
+import CreateAccount from './createAccount/CreateAccount.container';
+import EditAccount from './editAccount/EditAccount.container';
+import { SelectedAccountsTab } from '~types/account';
+
+export type AccountsPageProps = {
+	i18n: any;
+	selectedTab: SelectedAccountsTab;
+	onChangeTab: (tab: any) => void;
+	onDestroy: () => void;
+};
+
+const Accounts = ({ selectedTab, onChangeTab, onDestroy, i18n }: AccountsPageProps) => {
+	useEffect((): any => {
+		return (): void => {
+			onDestroy();
+		};
+	}, []);
+
+	const getTab = () => {
+		if (selectedTab === SelectedAccountsTab.accounts) {
+			return <AccountsList />;
+		} else if (selectedTab === SelectedAccountsTab.editAccount) {
+			return <EditAccount />;
+		}
+		return <CreateAccount />;
+	};
+
+	return (
+		<section className={sharedStyles.twoColPage}>
+			<nav>
+				<ul>
+					<li
+						className={selectedTab === SelectedAccountsTab.accounts ? sharedStyles.selected : ''}
+						onClick={(): void => onChangeTab(SelectedAccountsTab.accounts)}
+					>
+						{i18n.accounts}
+					</li>
+					<li
+						className={selectedTab === SelectedAccountsTab.createAccount ? sharedStyles.selected : ''}
+						onClick={(): void => onChangeTab(SelectedAccountsTab.createAccount)}
+					>
+						{i18n.createAccount}
+					</li>
+				</ul>
+			</nav>
+			<div className={sharedStyles.tab}>{getTab()}</div>
+		</section>
+	);
+};
+
+export default Accounts;
diff --git a/apps/client/src/core/accounts/Accounts.container.tsx b/apps/client/src/core/accounts/Accounts.container.tsx
new file mode 100644
index 000000000..57f23393a
--- /dev/null
+++ b/apps/client/src/core/accounts/Accounts.container.tsx
@@ -0,0 +1,23 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import * as selectors from '~store/generator/generator.selectors';
+import * as accountSelectors from '~store/account/account.selectors';
+import * as accountActions from '~store/account/account.actions';
+import AccountsPage, { AccountsPageProps } from './Accounts.component';
+import { SelectedAccountsTab } from '~types/account';
+import { Store } from '~types/general';
+import { withAuth } from '~core/auth/withAuth';
+
+const mapStateToProps = (state: Store): Partial<AccountsPageProps> => ({
+	i18n: selectors.getCoreI18n(state),
+	selectedTab: accountSelectors.getSelectedAccountsPageTab(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Partial<AccountsPageProps> => ({
+	onChangeTab: (tab: SelectedAccountsTab): any => dispatch(accountActions.onChangeAccountsTab(tab)),
+	onDestroy: (): any => dispatch(accountActions.onCleanupAccountsPage())
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(AccountsPage);
+
+export default withAuth(container);
diff --git a/apps/client/src/core/accounts/accountsList/AccountsList.component.tsx b/apps/client/src/core/accounts/accountsList/AccountsList.component.tsx
new file mode 100644
index 000000000..ec43f3eef
--- /dev/null
+++ b/apps/client/src/core/accounts/accountsList/AccountsList.component.tsx
@@ -0,0 +1,264 @@
+import React, { useEffect, useState } from 'react';
+import Button from '@mui/material/Button';
+import HighlightOffIcon from '@mui/icons-material/HighlightOff';
+import { format, fromUnixTime } from 'date-fns';
+import { useMutation, useQuery } from '@apollo/client/react';
+import { addToast } from '@generatedata/utils/general';
+import Pagination from '~components/Pagination';
+import TableHeader, { ColSortDir } from '~components/tables/TableHeader.component';
+import { SmallSpinner } from '~components/loaders/loaders';
+import AccountStatusPill from '~components/accounts/accountStatusPill/AccountStatusPill.component';
+import DeleteAccountDialog from '~core/dialogs/deleteAccount/DeleteAccount.component';
+import SearchFilter from './SearchFilter.component';
+import C from '@generatedata/config/constants';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import { AccountStatusFilter } from '~types/general';
+import * as queries from '~core/queries';
+import * as styles from './AccountsList.scss';
+import * as sharedStyles from '../../../styles/shared.scss';
+
+export type AccountsListProps = {
+	accountsCurrentPage: number;
+	accountsSortCol: string;
+	accountsSortDir: ColSortDir;
+	accountsFilterStr: string;
+	accountStatusFilter: AccountStatusFilter;
+	onEditAccount: (accountId: number) => void;
+	setAccountsSortDir: (sortDir: ColSortDir) => void;
+	setAccountsSortCol: (sortCol: string) => void;
+	setAccountsCurrentPage: (page: number) => void;
+	setAccountsFilterString: (filter: string) => void;
+	setAccountStatusFilter: (status: AccountStatusFilter) => void;
+	i18n: any;
+};
+
+const Row = ({ i18n, firstName, lastName, onEdit, onDelete, accountStatus, lastLoggedIn, expiryDate }: any) => {
+	let expiryDateVal: any = <span className={sharedStyles.blank}>&#8212;</span>;
+	try {
+		if (expiryDate) {
+			expiryDateVal = format(fromUnixTime(expiryDate / 1000), C.DATE_FORMAT);
+		}
+	} catch (e) {}
+
+	let lastLoggedInVal: any = <span className={sharedStyles.blank}>&#8212;</span>;
+	try {
+		lastLoggedInVal = format(fromUnixTime(lastLoggedIn), C.DATE_FORMAT);
+	} catch (lastLoggedInVal) {}
+
+	return (
+		<div className={styles.row}>
+			<div className={styles.firstName}>{firstName}</div>
+			<div className={styles.lastName}>{lastName}</div>
+			<div className={styles.status}>
+				<AccountStatusPill status={accountStatus} i18n={i18n} />
+			</div>
+			<div className={styles.lastLoggedIn}>{lastLoggedInVal}</div>
+			<div className={styles.expiryDate}>{expiryDateVal}</div>
+			<div className={styles.edit}>
+				<Button size="small" type="submit" color="primary" variant="outlined" onClick={onEdit}>
+					{i18n.edit}
+				</Button>
+			</div>
+			<div className={styles.del} onClick={onDelete}>
+				<HighlightOffIcon />
+			</div>
+		</div>
+	);
+};
+
+const NUM_PER_PAGE = 10;
+const AccountsList = ({
+	accountsCurrentPage,
+	accountsSortCol,
+	accountsSortDir,
+	accountsFilterStr,
+	accountStatusFilter,
+	onEditAccount,
+	setAccountsSortDir,
+	setAccountsSortCol,
+	setAccountsCurrentPage,
+	setAccountsFilterString,
+	setAccountStatusFilter,
+	i18n
+}: AccountsListProps) => {
+	const [dialogVisible, setDialogVisible] = useState(false);
+	const [deleteAccountInfo, setDeleteAccountInfo] = useState<any>(null);
+	const [lastData, setLastData] = useState<any>(null);
+
+	const { data, loading, refetch } = useQuery(queries.GET_ACCOUNTS, {
+		fetchPolicy: 'cache-and-network',
+		variables: {
+			offset: (accountsCurrentPage - 1) * NUM_PER_PAGE,
+			limit: NUM_PER_PAGE,
+			sortCol: accountsSortCol,
+			sortDir: accountsSortDir,
+			filterStr: accountsFilterStr,
+			status: accountStatusFilter
+		}
+	});
+
+	useEffect(() => {
+		refetch();
+	}, [accountsFilterStr]);
+
+	useEffect(() => {
+		if (data) {
+			setLastData(data);
+		}
+	}, [data]);
+
+	const numItemsOnPage = lastData?.accounts?.results?.length || 0;
+	const afterDeletePage = numItemsOnPage === 1 && accountsCurrentPage > 1 ? accountsCurrentPage - 1 : accountsCurrentPage;
+
+	const [deleteAccount] = useMutation(queries.DELETE_ACCOUNT, {
+		refetchQueries: [
+			{
+				query: queries.GET_ACCOUNTS,
+				variables: {
+					offset: (afterDeletePage - 1) * NUM_PER_PAGE,
+					limit: NUM_PER_PAGE,
+					sortCol: accountsSortCol,
+					sortDir: accountsSortDir,
+					filterStr: accountsFilterStr,
+					status: accountStatusFilter
+				}
+			}
+		],
+		onCompleted: () => {
+			setDialogVisible(false);
+			setDeleteAccountInfo(null);
+
+			addToast({
+				message: i18n.accountDeleted,
+				type: 'success'
+			});
+		}
+	});
+
+	if (!lastData) {
+		return null;
+	}
+
+	const { results, totalCount } = lastData.accounts;
+	const cols = [
+		{
+			label: i18n.firstName,
+			className: styles.firstName,
+			field: 'firstName',
+			sortable: true
+		},
+		{
+			label: i18n.lastName,
+			className: styles.lastName,
+			field: 'lastName',
+			sortable: true
+		},
+		{
+			label: i18n.status,
+			className: styles.status,
+			field: 'accountStatus',
+			sortable: true
+		},
+		{
+			label: i18n.lastLoggedIn,
+			className: styles.lastLoggedIn,
+			field: 'lastLoggedIn',
+			sortable: true
+		},
+		{
+			label: i18n.expiryDate,
+			className: styles.expiryDate,
+			field: 'expiryDate',
+			sortable: true
+		},
+		{ label: i18n.edit, className: styles.edit },
+		{ label: '', className: styles.del }
+	];
+
+	let content;
+	if (totalCount === 0) {
+		content = <div className={`${styles.page} ${sharedStyles.emptyText}`}>{i18n.noAccountsCreated}</div>;
+	} else {
+		const paginationRow =
+			totalCount > NUM_PER_PAGE ? (
+				<div className={styles.paginationRow}>
+					<Pagination
+						numPages={Math.ceil(totalCount / NUM_PER_PAGE)}
+						currentPage={accountsCurrentPage}
+						onChange={(e: any, pageNum: number): void => setAccountsCurrentPage(pageNum)}
+					/>
+				</div>
+			) : null;
+
+		content = (
+			<>
+				<div className={styles.accountsListTable}>
+					<TableHeader
+						cols={cols}
+						sortDir={accountsSortDir}
+						sortCol={accountsSortCol}
+						onSort={(col: string, dir: ColSortDir): void => {
+							setAccountsSortCol(col);
+							setAccountsSortDir(dir);
+						}}
+					/>
+					<div className={styles.body}>
+						{results.map((row: any) => (
+							<Row
+								key={row.accountId}
+								{...row}
+								i18n={i18n}
+								onEdit={(): void => onEditAccount(row)}
+								onDelete={(): void => {
+									setDialogVisible(true);
+									setDeleteAccountInfo(row);
+								}}
+							/>
+						))}
+					</div>
+				</div>
+				{paginationRow}
+			</>
+		);
+	}
+
+	return (
+		<>
+			<div className={styles.filtersRow}>
+				<SearchFilter value={accountsFilterStr} onChange={setAccountsFilterString} />
+				<Dropdown
+					className={styles.accountsFilter}
+					value={accountStatusFilter}
+					onChange={(selected: DropdownOption): void => setAccountStatusFilter(selected.value as AccountStatusFilter)}
+					options={[
+						{ value: AccountStatusFilter.all, label: 'Any status' },
+						{ value: AccountStatusFilter.live, label: i18n.live },
+						{ value: AccountStatusFilter.expired, label: i18n.expired },
+						{ value: AccountStatusFilter.disabled, label: i18n.disabled }
+					]}
+				/>
+				{loading && <SmallSpinner />}
+				<h4>{totalCount} result(s)</h4>
+			</div>
+			{content}
+
+			<DeleteAccountDialog
+				visible={dialogVisible}
+				onClose={(): void => setDialogVisible(false)}
+				onExited={(): void => setDeleteAccountInfo(null)}
+				onDelete={(): any => {
+					deleteAccount({
+						variables: {
+							accountId: deleteAccountInfo?.accountId
+						}
+					});
+					setAccountsCurrentPage(afterDeletePage);
+				}}
+				name={`${deleteAccountInfo?.firstName} ${deleteAccountInfo?.lastName}`}
+				i18n={i18n}
+			/>
+		</>
+	);
+};
+
+export default AccountsList;
diff --git a/apps/client/src/core/accounts/accountsList/AccountsList.container.ts b/apps/client/src/core/accounts/accountsList/AccountsList.container.ts
new file mode 100644
index 000000000..8dd2491cb
--- /dev/null
+++ b/apps/client/src/core/accounts/accountsList/AccountsList.container.ts
@@ -0,0 +1,31 @@
+import { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import * as mainSelectors from '~store/main/main.selectors';
+import * as selectors from '~store/generator/generator.selectors';
+import * as accountActions from '~store/account/account.actions';
+import * as mainActions from '~store/main/main.actions';
+import AccountsList, { AccountsListProps } from './AccountsList.component';
+import { AccountStatusFilter, Store } from '~types/general';
+import { ColSortDir } from '~components/tables/TableHeader.component';
+
+const mapStateToProps = (state: Store): Partial<AccountsListProps> => ({
+	accountsCurrentPage: mainSelectors.getAccountsCurrentPage(state),
+	accountsSortCol: mainSelectors.getAccountsSortCol(state),
+	accountsSortDir: mainSelectors.getAccountsSortDir(state),
+	accountsFilterStr: mainSelectors.getAccountsFilterStr(state),
+	accountStatusFilter: mainSelectors.getAccountStatusFilter(state),
+	i18n: selectors.getCoreI18n(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Partial<AccountsListProps> => ({
+	onEditAccount: (accountInfo: any): any => dispatch(accountActions.editAccount(accountInfo)),
+	setAccountsSortDir: (sortDir: ColSortDir): void => dispatch(mainActions.setAccountsSortDir(sortDir)),
+	setAccountsSortCol: (sortCol: string): void => dispatch(mainActions.setAccountsSortCol(sortCol)),
+	setAccountsCurrentPage: (page: number): void => dispatch(mainActions.setAccountsCurrentPage(page)),
+	setAccountsFilterString: (filter: string): void => dispatch(mainActions.setAccountsFilterString(filter)),
+	setAccountStatusFilter: (status: AccountStatusFilter): void => dispatch(mainActions.setAccountStatusFilter(status))
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(AccountsList);
+
+export default container;
diff --git a/apps/client/src/core/accounts/accountsList/AccountsList.scss b/apps/client/src/core/accounts/accountsList/AccountsList.scss
new file mode 100644
index 000000000..cfc7168c3
--- /dev/null
+++ b/apps/client/src/core/accounts/accountsList/AccountsList.scss
@@ -0,0 +1,111 @@
+// TODO move common code to a shared.scss file, like tables.scss or whatever
+.page {
+	font-size: 13px;
+}
+
+.body {
+	overflow: scroll;
+
+	.row {
+		&:hover {
+			background-color: #f9f9f9;
+		}
+	}
+}
+
+.paginationRow {
+	margin: 15px 0;
+}
+
+.accountsListTable {
+	width: 100%;
+	margin-bottom: 20px;
+
+	.row {
+		display: flex;
+		width: 100%;
+		padding: 6px;
+		align-items: center;
+		font-size: 13px;
+	}
+
+	.firstName {
+		flex: 1 0 110px;
+	}
+
+	.lastName {
+		flex: 1 0 110px;
+	}
+
+	.expiryDate {
+		flex: 1 0 90px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.lastLoggedIn {
+		flex: 1 0 90px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.status {
+		flex: 1 0 70px;
+	}
+
+	.edit {
+		flex: 0 0 90px;
+		text-align: center;
+	}
+
+	.del {
+		flex: 0 0 30px;
+		align-items: center;
+		cursor: pointer;
+
+		&:hover {
+			svg {
+				fill: #990000;
+			}
+		}
+	}
+}
+
+.filtersRow {
+	display: flex;
+	margin-bottom: 15px;
+	align-items: center;
+
+	h4 {
+		margin-left: auto;
+	}
+}
+
+.searchFilter {
+	display: flex;
+	margin-right: 8px;
+}
+
+.accountsFilter {
+	width: 130px;
+}
+
+@media (max-width: 720px) {
+	.status,
+	.lastLoggedIn,
+	.expiryDate {
+		display: none;
+	}
+
+	.paginationRow nav {
+		border-bottom: 0;
+	}
+}
+
+@media (max-width: 900px) {
+	.lastLoggedIn {
+		display: none;
+	}
+}
diff --git a/apps/client/src/core/accounts/accountsList/AccountsList.scss.d.ts b/apps/client/src/core/accounts/accountsList/AccountsList.scss.d.ts
new file mode 100644
index 000000000..8acaf596c
--- /dev/null
+++ b/apps/client/src/core/accounts/accountsList/AccountsList.scss.d.ts
@@ -0,0 +1,26 @@
+declare namespace AccountsListScssNamespace {
+	export interface IAccountsListScss {
+		accountsFilter: string;
+		accountsListTable: string;
+		body: string;
+		del: string;
+		edit: string;
+		expiryDate: string;
+		filtersRow: string;
+		firstName: string;
+		lastLoggedIn: string;
+		lastName: string;
+		page: string;
+		paginationRow: string;
+		row: string;
+		searchFilter: string;
+		status: string;
+	}
+}
+
+declare const AccountsListScssModule: AccountsListScssNamespace.IAccountsListScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: AccountsListScssNamespace.IAccountsListScss;
+};
+
+export = AccountsListScssModule;
diff --git a/apps/client/src/core/accounts/accountsList/SearchFilter.component.tsx b/apps/client/src/core/accounts/accountsList/SearchFilter.component.tsx
new file mode 100644
index 000000000..73648c8e3
--- /dev/null
+++ b/apps/client/src/core/accounts/accountsList/SearchFilter.component.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import TextField from '~components/TextField';
+import styles from './AccountsList.scss';
+
+export type SearchFilterProps = {
+	value: string;
+	onChange: (val: string) => void;
+};
+
+const SearchFilter = ({ value, onChange }: SearchFilterProps) => (
+	<div className={styles.searchFilter}>
+		<TextField placeholder="Filter accounts" value={value} onChange={(e: any): void => onChange(e.target.value)} />
+	</div>
+);
+
+export default SearchFilter;
diff --git a/apps/client/src/core/accounts/createAccount/CreateAccount.container.ts b/apps/client/src/core/accounts/createAccount/CreateAccount.container.ts
new file mode 100644
index 000000000..6268dfed9
--- /dev/null
+++ b/apps/client/src/core/accounts/createAccount/CreateAccount.container.ts
@@ -0,0 +1,43 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import { generateRandomAlphanumericStr } from '@generatedata/utils/random';
+import * as selectors from '~store/generator/generator.selectors';
+import * as accountActions from '~store/account/account.actions';
+import ManageAccount, {
+	ManageAccountState,
+	ManageAccountProps,
+	ExpiryOption
+} from '../../../components/accounts/manageAccount/ManageAccount.component';
+import { Store } from '~types/general';
+
+const initialState: ManageAccountState = {
+	firstName: '',
+	lastName: '',
+	email: '',
+	country: '',
+	region: '',
+	oneTimePassword: generateRandomAlphanumericStr('CcEVvFLlDXxH'),
+	disabled: false,
+	expiry: ExpiryOption.none,
+	expiryDate: null,
+	numRowsGenerated: 0,
+	isAddingUser: true
+};
+
+const mapStateToProps = (state: Store): Partial<ManageAccountProps> => {
+	const i18n = selectors.getCoreI18n(state);
+	return {
+		initialState,
+		i18n,
+		submitButtonLabel: i18n.createAccount
+	};
+};
+
+const mapDispatchToProps = (dispatch: Dispatch): Partial<ManageAccountProps> => ({
+	// @ts-ignore-line
+	onSave: (data: any): any => dispatch(accountActions.createAccount(data))
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(ManageAccount);
+
+export default container;
diff --git a/apps/client/src/core/accounts/createAccount/__tests__/CreateAccount.container.test.tsx b/apps/client/src/core/accounts/createAccount/__tests__/CreateAccount.container.test.tsx
new file mode 100644
index 000000000..a616dc639
--- /dev/null
+++ b/apps/client/src/core/accounts/createAccount/__tests__/CreateAccount.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import CreateAccount from '../CreateAccount.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('YourAccount container', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<CreateAccount />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/accounts/editAccount/EditAccount.container.ts b/apps/client/src/core/accounts/editAccount/EditAccount.container.ts
new file mode 100644
index 000000000..e4ca9404e
--- /dev/null
+++ b/apps/client/src/core/accounts/editAccount/EditAccount.container.ts
@@ -0,0 +1,37 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import * as selectors from '~store/generator/generator.selectors';
+import * as accountActions from '~store/account/account.actions';
+import * as actionSelectors from '~store/account/account.selectors';
+import ManageAccount, {
+	ExpiryOption,
+	ManageAccountProps,
+	ManageAccountState
+} from '~components/accounts/manageAccount/ManageAccount.component';
+import { Store } from '~types/general';
+import { SelectedAccountsTab } from '~types/account';
+
+const mapStateToProps = (state: Store): Partial<ManageAccountProps> => {
+	const i18n = selectors.getCoreI18n(state);
+	const initialState = actionSelectors.getEditingData(state);
+
+	return {
+		initialState: {
+			...initialState,
+			expiry: initialState.expiryDate ? ExpiryOption.date : ExpiryOption.none,
+			isAddingUser: false
+		} as ManageAccountState,
+		i18n,
+		submitButtonLabel: i18n.updateAccount
+	};
+};
+
+const mapDispatchToProps = (dispatch: Dispatch): Partial<ManageAccountProps> => ({
+	// @ts-ignore-line
+	onSave: (data: any): any => dispatch(accountActions.saveAccount(data)),
+	onCancel: (): any => dispatch(accountActions.onChangeAccountsTab(SelectedAccountsTab.accounts))
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(ManageAccount);
+
+export default container;
diff --git a/apps/client/src/core/actionInterceptor.ts b/apps/client/src/core/actionInterceptor.ts
new file mode 100644
index 000000000..0a5a1ab8a
--- /dev/null
+++ b/apps/client/src/core/actionInterceptor.ts
@@ -0,0 +1,57 @@
+import { Store } from 'redux';
+import { getRows } from '~store/generator/generator.selectors';
+import { DataRow } from '~store/generator/generator.reducer';
+import { onConfigureDataType } from '~store/generator/generator.actions';
+import { DataTypeFolder } from '@generatedata/plugins';
+import { DTActionInterceptors, DTInterceptorSingleAction } from '~types/dataTypes';
+
+// TODO what if onload, a user interacts with a pre-saved config prior to the data type loading and the interceptor
+// isn't registered yet? Other than defensively coding the Data Type generation I'm not sure how to handle that... I
+// guess we could also lock down the UI...
+const actionInterceptors: any = {};
+export const registerInterceptors = (dataType: DataTypeFolder, interceptors: DTActionInterceptors): void => {
+	Object.keys(interceptors).forEach((action) => {
+		if (!actionInterceptors[action]) {
+			actionInterceptors[action] = [];
+		}
+		actionInterceptors[action].push({
+			dataType,
+			// singular, note. A single DataType only every supplies a single interceptor for a single action
+			interceptor: interceptors[action]
+		});
+	});
+};
+
+export const getActionInterceptors = (action: string): DTInterceptorSingleAction[] => {
+	return actionInterceptors[action] ? actionInterceptors[action] : [];
+};
+
+const actionInterceptor =
+	(store: Store) =>
+		(next: any): any =>
+			(action: any): any => {
+				// returns all interceptors for the current action
+				const interceptors = action && action.type ? getActionInterceptors(action.type) : [];
+
+				if (interceptors.length) {
+					const rows = getRows(store.getState());
+					interceptors.forEach(({ dataType, interceptor }) => {
+						Object.keys(rows).forEach((rowId: string) => {
+							const row: DataRow = rows[rowId];
+							if (row.dataType === dataType) {
+								const result = interceptor(rowId, row.data, action.payload);
+								if (result) {
+									// TODO note: interceptors don't currently support options metadata. e.g. the Names DataType
+									// onUpdate() returns both the new row state, but also some metadata that tells the core
+									// script to load the country names. Hence the `undefined` 3rd param here.
+									store.dispatch(onConfigureDataType(rowId, result, undefined, true));
+								}
+							}
+						});
+					});
+				}
+
+				return next(action);
+			};
+
+export default actionInterceptor;
diff --git a/apps/client/src/core/apolloClient.ts b/apps/client/src/core/apolloClient.ts
new file mode 100644
index 000000000..20f23877b
--- /dev/null
+++ b/apps/client/src/core/apolloClient.ts
@@ -0,0 +1,48 @@
+import { ApolloClient, InMemoryCache, NormalizedCacheObject, ApolloLink, HttpLink, concat } from '@apollo/client';
+import fetch from 'cross-fetch';
+import store from './store';
+import * as mainSelectors from './store/main/main.selectors';
+
+// TODO: generalized error handling when logged out
+// import { onError } from 'apollo-link-error';
+//
+// const logoutLink = onError(({ networkError }) => {
+// 	if (networkError.statusCode === 401) logout();
+// })
+
+const protocol = process.env.GD_WEB_USE_HTTPS === 'true' ? 'https' : 'http';
+
+// this could be improved For prod environments we use the same port and use nginx to route the requests
+// to the graphql server
+let uri = `${protocol}://${process.env.GD_WEB_DOMAIN}/graphql`;
+if (process.env.NODE_ENV === 'development') {
+	uri = `${protocol}://${process.env.GD_WEB_DOMAIN}:${process.env.GD_API_SERVER_PORT}/graphql`;
+}
+
+const httpLink = new HttpLink({
+	uri,
+	fetch,
+	credentials: 'include'
+});
+
+const authMiddleware = new ApolloLink((operation, forward) => {
+	const token = mainSelectors.getAuthToken(store.getState());
+
+	// console.log('adding token header?', mainSelectors.getAuthToken(store.getState()));
+
+	// this adds the current active jwt token to all requests so the server can authenticate the user
+	if (token) {
+		operation.setContext({
+			headers: {
+				Authorization: `Bearer ${token}`
+			}
+		});
+	}
+
+	return forward(operation);
+});
+
+export const apolloClient = new ApolloClient({
+	link: concat(authMiddleware, httpLink),
+	cache: new InMemoryCache()
+});
diff --git a/apps/client/src/core/auth/google/google.tsx b/apps/client/src/core/auth/google/google.tsx
new file mode 100644
index 000000000..246fbeb41
--- /dev/null
+++ b/apps/client/src/core/auth/google/google.tsx
@@ -0,0 +1,126 @@
+import React, { useRef } from 'react';
+import { gql } from '@apollo/client';
+import Cookies from 'js-cookie';
+import { apolloClient } from '../../apolloClient';
+import store from '../../store';
+import { onLoginSuccess, setAuthenticated, setAuthenticationData, setOnloadAuthDetermined } from '~store/main/main.actions';
+import { AuthMethod } from '~types/general';
+import * as mainSelectors from '~store/main/main.selectors';
+import { addToast } from '@generatedata/utils/general';
+import langUtils from '@generatedata/utils/lang';
+import clientConfig from '@generatedata/config/clientConfig';
+
+const googleBtnId = 'google-signin-button';
+
+export const initGoogleAuth = (): void => {
+	const script = document.createElement('script');
+	script.src = 'https://accounts.google.com/gsi/client';
+	script.async = true;
+	script.defer = true;
+	document.body.appendChild(script);
+};
+
+export type AuthenticatedOptions = {
+	onPageRender?: boolean;
+};
+
+const onAuthenticated = async (googleUser: any, opts: AuthenticatedOptions = {}): Promise<any> => {
+	const i18n = langUtils.getStrings();
+
+	const options = {
+		onPageRender: false,
+		...opts
+	};
+
+	const isLoggedIn = mainSelectors.isLoggedIn(store.getState());
+
+	if (isLoggedIn) {
+		store.dispatch(setAuthenticated(true));
+
+		// needed to complete the page load
+		store.dispatch(setOnloadAuthDetermined());
+	} else {
+		const googleToken = googleUser.credential;
+		const response = await apolloClient.mutate({
+			mutation: gql`
+				mutation LoginWithGoogle($googleToken: String!) {
+					loginWithGoogle(googleToken: $googleToken) {
+						token
+						refreshToken
+						tokenExpiry
+						success
+						error
+						firstName
+						lastName
+						expiryDate
+						accountType
+						dateCreated
+						email
+						numRowsGenerated
+						profileImage
+						country
+						region
+					}
+				}
+			`,
+			variables: { googleToken }
+		});
+
+		if (response.data.loginWithGoogle.success) {
+			const { tokenExpiry, refreshToken } = response.data.loginWithGoogle;
+
+			store.dispatch(
+				setAuthenticationData({
+					...response.data.loginWithGoogle,
+					authMethod: AuthMethod.google
+				})
+			);
+
+			Cookies.set('refreshToken', refreshToken, {
+				expires: new Date(tokenExpiry)
+			});
+			onLoginSuccess(tokenExpiry, options.onPageRender, store.dispatch);
+		} else {
+			if (response.data.loginWithGoogle.error === 'accountExpired') {
+				addToast({
+					type: 'error',
+					message: i18n.core.accountExpiredMsg
+				});
+			} else if (response.data.loginWithGoogle.error === 'noUserAccount') {
+				addToast({
+					type: 'error',
+					message: i18n.core.userAccountNotFound
+				});
+			}
+		}
+	}
+};
+
+export const SignInWithGoogleButton = () => {
+	const divRef = useRef(null);
+	const [loaded, setLoaded] = React.useState(false);
+
+	React.useEffect(() => {
+		if (divRef.current && !loaded) {
+			// TODO still need to execute something here for scenarios where script takes too long to load.
+			setLoaded(true);
+
+			// timeout seems to be needed for the fade-in, perhaps? The DOM element clearly exists at this point but
+			// it won't show. Possibly a conflict with whatever google is doing.
+			setTimeout(() => {
+				if (document.contains(document.getElementById(googleBtnId)) && window.google) {
+					window.google.accounts.id.initialize({
+						/* eslint-disable @typescript-eslint/camelcase */
+						client_id: clientConfig.auth.GD_GOOGLE_AUTH_CLIENT_ID,
+						callback: onAuthenticated
+					});
+					window.google.accounts.id.renderButton(document.getElementById(googleBtnId), { type: 'standard' });
+				}
+			}, 500);
+		}
+	}, [divRef.current]);
+
+	return <div ref={divRef} id={googleBtnId} />;
+};
+
+SignInWithGoogleButton.displayName = 'SignInWithGoogleButton';
diff --git a/apps/client/src/core/auth/loginPage/LoginPage.component.tsx b/apps/client/src/core/auth/loginPage/LoginPage.component.tsx
new file mode 100644
index 000000000..b4c669767
--- /dev/null
+++ b/apps/client/src/core/auth/loginPage/LoginPage.component.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+export type LoginPageProps = {
+	i18n: any;
+};
+
+const LoginPage = ({ i18n }: LoginPageProps) => {
+	return <div>{i18n.login}</div>;
+};
+
+export default LoginPage;
diff --git a/apps/client/src/core/auth/loginPage/LoginPage.container.tsx b/apps/client/src/core/auth/loginPage/LoginPage.container.tsx
new file mode 100644
index 000000000..b66259cb4
--- /dev/null
+++ b/apps/client/src/core/auth/loginPage/LoginPage.container.tsx
@@ -0,0 +1,15 @@
+import { connect } from 'react-redux';
+// import { Dispatch } from 'redux';
+import * as selectors from '~store/generator/generator.selectors';
+import LoginPage, { LoginPageProps } from './LoginPage.component';
+
+const mapStateToProps = (state: any): Partial<LoginPageProps> => ({
+	i18n: selectors.getCoreI18n(state)
+});
+
+// dispatch: Dispatch
+const mapDispatchToProps = (): Partial<LoginPageProps> => ({});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(LoginPage);
+
+export default container;
diff --git a/apps/client/src/core/auth/withAuth.tsx b/apps/client/src/core/auth/withAuth.tsx
new file mode 100644
index 000000000..180d02918
--- /dev/null
+++ b/apps/client/src/core/auth/withAuth.tsx
@@ -0,0 +1,44 @@
+import React, { useEffect } from 'react';
+import { useSelector } from 'react-redux';
+import { useNavigate } from 'react-router-dom';
+import { isOnloadAuthDetermined, isLoggedIn, getLocale } from '~store/main/main.selectors';
+import { DefaultSpinner, Centered } from '~components/loaders/loaders';
+
+// simple HOC to require authentication before rendering a component. If the onload auth isn't determined yet it shows a
+// loading spinner; if the auth is determined and they're not logged in it redirects to the homepage
+export const withAuth = (Component: any): any => {
+	const ComponentWithAuth = ({ props }: any) => {
+		const authDetermined = useSelector(isOnloadAuthDetermined);
+		const loggedIn = useSelector(isLoggedIn);
+		const locale = useSelector(getLocale);
+		const navigate = useNavigate();
+
+		useEffect(() => {
+			if (authDetermined && !loggedIn) {
+				let path = '/';
+				if (locale !== 'en') {
+					path += locale;
+				}
+				navigate(path);
+			}
+		}, [loggedIn, authDetermined]);
+
+		if (!authDetermined) {
+			return (
+				<Centered>
+					<DefaultSpinner />
+				</Centered>
+			);
+		}
+
+		if (!loggedIn) {
+			return null;
+		}
+
+		return <Component {...props} />;
+	};
+
+	ComponentWithAuth.displayName = 'ComponentWithAuth';
+
+	return ComponentWithAuth;
+};
diff --git a/apps/client/src/core/constants.ts b/apps/client/src/core/constants.ts
new file mode 100644
index 000000000..9bb9a234a
--- /dev/null
+++ b/apps/client/src/core/constants.ts
@@ -0,0 +1,61 @@
+// export default {
+// 	// any time we roll out backward incompatible redux structure changes, this number should be bumped. It causes
+// 	// anyone's setup to automatically reset & forget any previous saved redux store structure so there aren't
+// 	// incompatibility problems with the latest code
+// 	APP_STATE_VERSION: 8,
+
+// 	NUM_DEFAULT_ROWS: 4,
+// 	GITHUB_URL: 'https://github.com/benkeen/generatedata',
+// 	CHANGELOG_URL: 'https://github.com/benkeen/generatedata/blob/master/CHANGELOG.md',
+
+// 	// these map to the GD_APP_TYPE env var. They're the different available configurations for this GD installation
+// 	APP_TYPES: {
+// 		LOGIN: 'login',
+// 		SINGLE: 'single',
+// 		OPEN: 'open',
+// 		CLOSED: 'closed'
+// 	},
+
+// 	THEMES: [
+// 		{ value: 'ambiance', label: 'Ambiance' },
+// 		{ value: 'bespin', label: 'Bespin' },
+// 		{ value: 'cobalt', label: 'Cobalt' },
+// 		{ value: 'darcula', label: 'Darcula' },
+// 		{ value: 'lucario', label: 'Lucario' }
+// 	],
+
+// 	MIN_PREVIEW_ROWS: 5,
+// 	MAX_PREVIEW_ROWS: 20,
+// 	HEADER_HEIGHT: 66,
+// 	FOOTER_HEIGHT: 66,
+// 	SMALL_SCREEN_WIDTH: 720,
+// 	GENERATION_BATCH_SIZE: 50,
+// 	SMALL_GENERATION_COUNT: 1000,
+// 	SMALL_GENERATION_COUNT_WITH_GRAPH: 5000,
+
+// 	GRAPH_RANGES: {
+// 		RANGE1: 5000,
+// 		RANGE2: 10000,
+// 		RANGE3: 100000
+// 	},
+
+// 	GRID: {
+// 		SMALL_BREAKPOINT: 650,
+// 		MEDIUM_BREAKPOINT: 780
+// 	},
+
+// 	ZINDEXES: {
+// 		DRAWER: 1300,
+// 		DIALOG: 5005
+// 	},
+
+// 	DATA_TYPE_GROUPS: ['humanData', 'geo', 'text', 'numeric', 'other', 'financial', 'countrySpecific'],
+
+// 	EXPORT_TYPE_GROUPS: ['core', 'programmingLanguage'],
+
+// 	CONTINENTS: ['africa', 'asia', 'centralAmerica', 'europe', 'northAmerica', 'oceania', 'southAmerica'],
+
+// 	DATE_FORMAT: 'MMM d, y',
+// 	DATETIME_FORMAT: 'MMM d, y h:mm a',
+// 	TIME_FORMAT: 'h:mm a'
+// };
diff --git a/apps/client/src/core/dialogs/about/About.component.tsx b/apps/client/src/core/dialogs/about/About.component.tsx
new file mode 100644
index 000000000..cbaf00b6a
--- /dev/null
+++ b/apps/client/src/core/dialogs/about/About.component.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import { PrimaryButton } from '~components/Buttons.component';
+import { Dialog, DialogTitle, DialogContent, DialogActions } from '~components/dialogs';
+import { Github } from '~components/icons';
+import Link from '~components/Link.component';
+import { Tooltip } from '~components/tooltips';
+import styles from './About.scss';
+
+export type AboutProps = {
+	visible: boolean;
+	onClose: any;
+	scriptVersion: string;
+	i18n: any;
+};
+
+const AboutDialog = ({ visible, onClose, scriptVersion, i18n }: AboutProps) => (
+	<Dialog onClose={onClose} open={visible} className={styles.aboutDialog}>
+		<div style={{ width: 460 }}>
+			<DialogTitle onClose={onClose}>{i18n.about}</DialogTitle>
+			<DialogContent dividers>
+				<div>
+					<h4>
+						generatedata.com &#8212;
+						<Tooltip title={i18n.viewChangelog}>
+							<span>
+								<Link url="https://github.com/benkeen/generatedata/blob/master/CHANGELOG.md" offSite={true}>
+									v{scriptVersion}
+								</Link>
+							</span>
+						</Tooltip>
+					</h4>
+				</div>
+				<p>{i18n.aboutInfoPara1}</p>
+				<p>{i18n.aboutInfoPara2}</p>
+			</DialogContent>
+			<DialogActions className={styles.actions}>
+				<PrimaryButton onClick={onClose} color="default">
+					{i18n.close}
+				</PrimaryButton>
+				<PrimaryButton
+					onClick={(): void => {
+						window.open('https://github.com/benkeen/generatedata', '_blank');
+					}}
+				>
+					<Github />
+					{i18n.viewOnGithub}
+				</PrimaryButton>
+			</DialogActions>
+		</div>
+	</Dialog>
+);
+
+export default AboutDialog;
diff --git a/apps/client/src/core/dialogs/about/About.scss b/apps/client/src/core/dialogs/about/About.scss
new file mode 100644
index 000000000..b0b60b1c5
--- /dev/null
+++ b/apps/client/src/core/dialogs/about/About.scss
@@ -0,0 +1,24 @@
+@use '../../../styles/variables' as c;
+
+.aboutDialog {
+	.actions {
+		button {
+			svg {
+				fill: c.$primary-color;
+				height: 18px;
+				width: 18px;
+				margin-right: 6px;
+				margin-left: -4px;
+			}
+		}
+	}
+
+	h4 {
+		margin-top: 0;
+	}
+
+	:global(.MuiDialogContent-root) {
+		font-size: 13px;
+		line-height: 20px;
+	}
+}
diff --git a/apps/client/src/core/dialogs/about/About.scss.d.ts b/apps/client/src/core/dialogs/about/About.scss.d.ts
new file mode 100644
index 000000000..2dbad7302
--- /dev/null
+++ b/apps/client/src/core/dialogs/about/About.scss.d.ts
@@ -0,0 +1,13 @@
+declare namespace AboutScssNamespace {
+	export interface IAboutScss {
+		aboutDialog: string;
+		actions: string;
+	}
+}
+
+declare const AboutScssModule: AboutScssNamespace.IAboutScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: AboutScssNamespace.IAboutScss;
+};
+
+export = AboutScssModule;
diff --git a/apps/client/src/core/dialogs/clearPage/ClearPage.component.tsx b/apps/client/src/core/dialogs/clearPage/ClearPage.component.tsx
new file mode 100644
index 000000000..d05dbaa11
--- /dev/null
+++ b/apps/client/src/core/dialogs/clearPage/ClearPage.component.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import Button from '@mui/material/Button';
+import WarningIcon from '@mui/icons-material/Warning';
+import { PrimaryButton } from '~components/Buttons.component';
+import { Dialog, DialogTitle, DialogContent, DialogActions } from '~components/dialogs';
+import styles from './ClearPage.scss';
+
+export type ClearPageDialogProps = {
+	visible: boolean;
+	onClose: any;
+	onClear: () => void;
+	i18n: any;
+};
+
+const ClearPageDialog = ({ visible, onClose, onClear, i18n }: ClearPageDialogProps) => (
+	<Dialog onClose={onClose} open={visible}>
+		<div style={{ width: 420 }}>
+			<DialogTitle onClose={onClose}>{i18n.clearPage}</DialogTitle>
+			<DialogContent dividers className={styles.contentPanel}>
+				<WarningIcon />
+				<div>
+					<div style={{ marginBottom: 8 }}>{i18n.clearPageConfirmation}</div>
+				</div>
+			</DialogContent>
+			<DialogActions>
+				<Button onClick={onClear} color="secondary" variant="outlined" className="clearPage">
+					{i18n.yes}
+				</Button>
+				<PrimaryButton onClick={onClose} className="cancelClearPage">
+					{i18n.no}
+				</PrimaryButton>
+			</DialogActions>
+		</div>
+	</Dialog>
+);
+
+export default ClearPageDialog;
diff --git a/apps/client/src/core/dialogs/clearPage/ClearPage.container.tsx b/apps/client/src/core/dialogs/clearPage/ClearPage.container.tsx
new file mode 100644
index 000000000..11b97f4e4
--- /dev/null
+++ b/apps/client/src/core/dialogs/clearPage/ClearPage.container.tsx
@@ -0,0 +1,19 @@
+import { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+import ClearPageDialog, { ClearPageDialogProps } from './ClearPage.component';
+
+const mapStateToProps = (state: any): Pick<ClearPageDialogProps, 'i18n' | 'visible'> => ({
+	i18n: selectors.getCoreI18n(state),
+	visible: selectors.isClearPageDialogVisible(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Pick<ClearPageDialogProps, 'onClose' | 'onClear'> => ({
+	onClose: (): any => dispatch(actions.hideClearPageDialog()),
+	onClear: (): any => dispatch(actions.clearPage())
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(ClearPageDialog);
+
+export default container;
diff --git a/apps/client/src/core/dialogs/clearPage/ClearPage.scss b/apps/client/src/core/dialogs/clearPage/ClearPage.scss
new file mode 100644
index 000000000..e33145789
--- /dev/null
+++ b/apps/client/src/core/dialogs/clearPage/ClearPage.scss
@@ -0,0 +1,37 @@
+@use '../../../styles/variables' as c;
+
+div.contentPanel {
+	display: flex;
+	align-items: center;
+	overflow: hidden !important;
+	padding: 10px 16px;
+
+	svg {
+		color: orange;
+		font-size: 50px;
+		margin-right: 10px;
+	}
+
+	ul {
+		margin: 0;
+		padding: 0;
+		list-style-type: none;
+
+		li {
+			display: flex;
+			margin-bottom: 4px;
+		}
+
+		input {
+			margin-right: 5px;
+		}
+	}
+
+	.clearPageSelection {
+		svg {
+			font-size: 18px;
+			color: c.$primary-color;
+			margin-left: 6px;
+		}
+	}
+}
diff --git a/apps/client/src/core/dialogs/clearPage/ClearPage.scss.d.ts b/apps/client/src/core/dialogs/clearPage/ClearPage.scss.d.ts
new file mode 100644
index 000000000..519a6b093
--- /dev/null
+++ b/apps/client/src/core/dialogs/clearPage/ClearPage.scss.d.ts
@@ -0,0 +1,13 @@
+declare namespace ClearPageScssNamespace {
+	export interface IClearPageScss {
+		clearPageSelection: string;
+		contentPanel: string;
+	}
+}
+
+declare const ClearPageScssModule: ClearPageScssNamespace.IClearPageScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: ClearPageScssNamespace.IClearPageScss;
+};
+
+export = ClearPageScssModule;
diff --git a/apps/client/src/core/dialogs/clearPage/__tests__/ClearPage.component.test.tsx b/apps/client/src/core/dialogs/clearPage/__tests__/ClearPage.component.test.tsx
new file mode 100644
index 000000000..a96da61f0
--- /dev/null
+++ b/apps/client/src/core/dialogs/clearPage/__tests__/ClearPage.component.test.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react';
+import ClearPageDialog from '../ClearPage.component';
+const i18n = require('../../../../i18n/en.json');
+
+jest.mock('copy-to-clipboard', () => {
+	return jest.fn();
+});
+
+const defaultProps = {
+	visible: true,
+	onClose: () => {},
+	onClear: () => {},
+	i18n
+};
+
+describe('ClearPageDialog', () => {
+	it('clicking "No" calls onClose', () => {
+		const onClose = jest.fn();
+		const { baseElement } = render(<ClearPageDialog {...defaultProps} onClose={onClose} />);
+
+		const closeButton = baseElement.querySelector('.cancelClearPage') as HTMLButtonElement;
+		fireEvent.click(closeButton);
+		expect(onClose).toHaveBeenCalled();
+	});
+});
diff --git a/apps/client/src/core/dialogs/deleteAccount/DeleteAccount.component.tsx b/apps/client/src/core/dialogs/deleteAccount/DeleteAccount.component.tsx
new file mode 100644
index 000000000..6cb08c67d
--- /dev/null
+++ b/apps/client/src/core/dialogs/deleteAccount/DeleteAccount.component.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import { Dialog, DialogTitle, DialogContent, DialogActions } from '~components/dialogs';
+import { PrimaryButton, NullButton } from '~components/Buttons.component';
+import styles from './DeleteAccount.scss';
+
+export type DeleteAccountDialogProps = {
+	visible: boolean;
+	name: string;
+	onClose: () => void;
+	onDelete: () => void;
+	onExited: () => void;
+	i18n: any;
+};
+
+const DeleteAccountDialog = ({ visible, name, onClose, onDelete, onExited, i18n }: DeleteAccountDialogProps) => (
+	<Dialog
+		onClose={onClose}
+		open={visible}
+		TransitionProps={{
+			onExited
+		}}
+	>
+		<div style={{ width: 420 }}>
+			<DialogTitle onClose={onClose}>{i18n.deleteAccount}</DialogTitle>
+			<DialogContent dividers className={styles.contentPanel}>
+				<p>{i18n.confirmDeleteAccount}</p>
+
+				<p className={styles.accountName}>
+					<b>{name}</b>
+				</p>
+			</DialogContent>
+			<DialogActions>
+				<NullButton onClick={onClose}>{i18n.cancel}</NullButton>
+				<PrimaryButton onClick={onDelete}>{i18n.delete}</PrimaryButton>
+			</DialogActions>
+		</div>
+	</Dialog>
+);
+
+export default DeleteAccountDialog;
diff --git a/apps/client/src/core/dialogs/deleteAccount/DeleteAccount.scss b/apps/client/src/core/dialogs/deleteAccount/DeleteAccount.scss
new file mode 100644
index 000000000..91c3d249b
--- /dev/null
+++ b/apps/client/src/core/dialogs/deleteAccount/DeleteAccount.scss
@@ -0,0 +1,11 @@
+@use '../../../styles/variables';
+
+div.contentPanel {
+	padding: 10px 16px;
+}
+
+.accountName {
+	font-size: 18px;
+	margin-top: 5px;
+	color: #888888;
+}
diff --git a/apps/client/src/core/dialogs/deleteAccount/DeleteAccount.scss.d.ts b/apps/client/src/core/dialogs/deleteAccount/DeleteAccount.scss.d.ts
new file mode 100644
index 000000000..e3d04dd5e
--- /dev/null
+++ b/apps/client/src/core/dialogs/deleteAccount/DeleteAccount.scss.d.ts
@@ -0,0 +1,13 @@
+declare namespace DeleteAccountScssNamespace {
+	export interface IDeleteAccountScss {
+		accountName: string;
+		contentPanel: string;
+	}
+}
+
+declare const DeleteAccountScssModule: DeleteAccountScssNamespace.IDeleteAccountScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: DeleteAccountScssNamespace.IDeleteAccountScss;
+};
+
+export = DeleteAccountScssModule;
diff --git a/apps/client/src/core/dialogs/deleteDataSet/DeleteDataSetDialog.component.tsx b/apps/client/src/core/dialogs/deleteDataSet/DeleteDataSetDialog.component.tsx
new file mode 100644
index 000000000..f3bdcfe55
--- /dev/null
+++ b/apps/client/src/core/dialogs/deleteDataSet/DeleteDataSetDialog.component.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { PrimaryButton, NullButton } from '~components/Buttons.component';
+import WarningIcon from '@mui/icons-material/Warning';
+import { Dialog, DialogTitle, DialogContent, DialogActions } from '~components/dialogs';
+import styles from './DeleteDataSetDialog.scss';
+
+export type DeleteDataSetDialogProps = {
+	visible: boolean;
+	onClose: () => void;
+	onDelete: () => void;
+	i18n: any;
+	dataSetName?: string | null;
+};
+
+const DeleteDataSetDialog = ({ visible, dataSetName, onClose, onDelete, i18n }: DeleteDataSetDialogProps) => (
+	<Dialog onClose={onClose} open={visible}>
+		<div style={{ width: 420 }}>
+			<DialogTitle onClose={onClose}>{i18n.deleteDataSet}</DialogTitle>
+			<DialogContent dividers className={styles.contentPanel}>
+				<WarningIcon />
+				<div style={{ flex: 1 }}>
+					{i18n.deleteDataSetConfirm}
+					{dataSetName ? <div className={styles.dataSetName}>{dataSetName}</div> : null}
+				</div>
+			</DialogContent>
+			<DialogActions>
+				<NullButton onClick={onClose}>{i18n.cancel}</NullButton>
+				<PrimaryButton onClick={onDelete}>{i18n.delete}</PrimaryButton>
+			</DialogActions>
+		</div>
+	</Dialog>
+);
+
+export default DeleteDataSetDialog;
diff --git a/apps/client/src/core/dialogs/deleteDataSet/DeleteDataSetDialog.scss b/apps/client/src/core/dialogs/deleteDataSet/DeleteDataSetDialog.scss
new file mode 100644
index 000000000..a9a73e3e8
--- /dev/null
+++ b/apps/client/src/core/dialogs/deleteDataSet/DeleteDataSetDialog.scss
@@ -0,0 +1,35 @@
+@use '../../../styles/variables';
+
+div.contentPanel {
+	display: flex;
+	align-items: center;
+	overflow: hidden !important;
+	padding: 10px 16px;
+
+	svg {
+		color: orange;
+		font-size: 50px;
+		margin-right: 10px;
+	}
+
+	ul {
+		margin: 0;
+		padding: 0;
+		list-style-type: none;
+
+		li {
+			display: flex;
+			margin-bottom: 4px;
+		}
+
+		input {
+			margin-right: 5px;
+		}
+	}
+}
+
+.dataSetName {
+	font-size: 18px;
+	margin-top: 5px;
+	color: #888888;
+}
diff --git a/apps/client/src/core/dialogs/deleteDataSet/DeleteDataSetDialog.scss.d.ts b/apps/client/src/core/dialogs/deleteDataSet/DeleteDataSetDialog.scss.d.ts
new file mode 100644
index 000000000..81f4b8bb9
--- /dev/null
+++ b/apps/client/src/core/dialogs/deleteDataSet/DeleteDataSetDialog.scss.d.ts
@@ -0,0 +1,13 @@
+declare namespace DeleteDataSetDialogScssNamespace {
+	export interface IDeleteDataSetDialogScss {
+		contentPanel: string;
+		dataSetName: string;
+	}
+}
+
+declare const DeleteDataSetDialogScssModule: DeleteDataSetDialogScssNamespace.IDeleteDataSetDialogScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: DeleteDataSetDialogScssNamespace.IDeleteDataSetDialogScss;
+};
+
+export = DeleteDataSetDialogScssModule;
diff --git a/apps/client/src/core/dialogs/deleteDataSet/__tests__/DeleteDataSetDialog.component.test.tsx b/apps/client/src/core/dialogs/deleteDataSet/__tests__/DeleteDataSetDialog.component.test.tsx
new file mode 100644
index 000000000..2b396ee8b
--- /dev/null
+++ b/apps/client/src/core/dialogs/deleteDataSet/__tests__/DeleteDataSetDialog.component.test.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react';
+import DeleteDataSetDialog from '../DeleteDataSetDialog.component';
+const i18n = require('../../../../i18n/en.json');
+
+const defaultProps = {
+	visible: true,
+	onClose: () => {},
+	onDelete: () => {},
+	i18n,
+	dataSetName: 'Data Set Name'
+};
+
+describe('DeleteDataSetDialog', () => {
+	it('clicking close calls the onClose callback', () => {
+		const onClose = jest.fn();
+		const { baseElement } = render(<DeleteDataSetDialog {...defaultProps} onClose={onClose} />);
+
+		const closeButton = baseElement.querySelector('.MuiDialogTitle-root button') as HTMLButtonElement;
+		fireEvent.click(closeButton);
+		expect(onClose).toBeCalled();
+	});
+});
diff --git a/apps/client/src/core/dialogs/help/HelpDialog.component.tsx b/apps/client/src/core/dialogs/help/HelpDialog.component.tsx
new file mode 100644
index 000000000..cf3cfde27
--- /dev/null
+++ b/apps/client/src/core/dialogs/help/HelpDialog.component.tsx
@@ -0,0 +1,112 @@
+import React, { useState } from 'react';
+import Button from '@mui/material/Button';
+import { Dialog, DialogTitle, DialogContent, DialogActions } from '~components/dialogs';
+import { DropdownOption } from '~components/dropdown/Dropdown';
+import { MediumSpinner } from '~components/loaders/loaders';
+import { getSortedGroupedDataTypes, getDataType } from '~utils/dataTypes';
+import styles from './HelpDialog.scss';
+import { DataTypeFolder } from '@generatedata/plugins';
+
+export type HelpDialogProps = {
+	visible: boolean;
+	initialDataType: DataTypeFolder | null;
+	loadedDataTypes: any; // done on purpose. This ensures it repaints after a new DT is loaded
+	onClose: any;
+	coreI18n: any;
+	dataTypeI18n: any;
+	onSelectDataType: (dataType: DataTypeFolder) => void;
+};
+
+const DataTypeList = ({ onSelect, filterString }: any): any => {
+	const dataTypes = getSortedGroupedDataTypes();
+	const regex = new RegExp(filterString, 'i');
+	const content: any = [];
+
+	dataTypes.forEach(({ label, options }: { label: string; options: any }) => {
+		let list: any = options;
+		if (filterString.trim() !== '') {
+			list = list.filter(({ value, label }: DropdownOption) => regex.test(value) || regex.test(label));
+		}
+		list = list.map(({ value, label }: DropdownOption) => (
+			<li key={value} onClick={(): void => onSelect(value)}>
+				{label}
+			</li>
+		));
+
+		if (list.length) {
+			content.push(
+				<div key={label}>
+					<h3>{label}</h3>
+					<ul>{list}</ul>
+				</div>
+			);
+		}
+	});
+
+	return content;
+};
+
+const HelpDialog = ({ visible, initialDataType, onClose, coreI18n, dataTypeI18n, onSelectDataType }: HelpDialogProps) => {
+	const [dataType, setDataType] = useState<DataTypeFolder | null>(null);
+	const [filterString, setFilterString] = useState('');
+
+	const selectDataType = (dataType: DataTypeFolder): void => {
+		onSelectDataType(dataType);
+		setDataType(dataType);
+	};
+
+	React.useEffect(() => {
+		setDataType(initialDataType);
+	}, [initialDataType]);
+
+	const i18n = dataType ? dataTypeI18n[dataType] : {};
+	const { Help } = getDataType(dataType);
+
+	let spinnerStyles = styles.spinner;
+	if (Help) {
+		spinnerStyles += ` ${styles.fadeOut}`;
+	}
+
+	return (
+		<Dialog
+			onClose={onClose}
+			aria-labelledby="customized-dialog-title"
+			open={visible}
+			className={styles.helpDialog}
+			TransitionProps={{
+				onExited: (): void => {
+					setFilterString('');
+				}
+			}}
+		>
+			<div className={`${styles.dialog} tour-helpDialog`}>
+				<DialogTitle onClose={onClose}>{i18n.NAME}</DialogTitle>
+				<DialogContent dividers className={styles.contentPanel}>
+					<div className={styles.dataTypeList}>
+						<input
+							type="text"
+							placeholder={coreI18n.filterDataTypes}
+							autoFocus
+							value={filterString}
+							onChange={(e): void => setFilterString(e.target.value)}
+						/>
+						<div className={styles.list}>
+							<DataTypeList filterString={filterString} onSelect={selectDataType} />
+						</div>
+					</div>
+					<div className={styles.helpContent}>
+						{Help ? <Help coreI18n={coreI18n} i18n={i18n} /> : null}
+						<MediumSpinner className={spinnerStyles} />
+					</div>
+				</DialogContent>
+				<DialogActions>
+					<Button onClick={onClose} color="primary" variant="outlined">
+						{coreI18n.close}
+					</Button>
+				</DialogActions>
+			</div>
+		</Dialog>
+	);
+};
+
+export default HelpDialog;
diff --git a/apps/client/src/core/dialogs/help/HelpDialog.container.tsx b/apps/client/src/core/dialogs/help/HelpDialog.container.tsx
new file mode 100644
index 000000000..1a387cce1
--- /dev/null
+++ b/apps/client/src/core/dialogs/help/HelpDialog.container.tsx
@@ -0,0 +1,25 @@
+import { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+import HelpDialog, { HelpDialogProps } from './HelpDialog.component';
+import { DataTypeFolder } from '@generatedata/plugins';
+
+const mapStateToProps = (
+	state: any
+): Pick<HelpDialogProps, 'visible' | 'coreI18n' | 'dataTypeI18n' | 'initialDataType' | 'loadedDataTypes'> => ({
+	visible: selectors.isHelpDialogVisible(state),
+	coreI18n: selectors.getCoreI18n(state),
+	dataTypeI18n: selectors.getDataTypeI18n(state),
+	initialDataType: selectors.getHelpDialogSection(state),
+	loadedDataTypes: selectors.getLoadedDataTypes(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Pick<HelpDialogProps, 'onClose' | 'onSelectDataType'> => ({
+	onClose: (): any => dispatch(actions.hideHelpDialog()),
+	onSelectDataType: (dataType: DataTypeFolder): any => dispatch(actions.onSelectDataType(dataType))
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(HelpDialog);
+
+export default container;
diff --git a/apps/client/src/core/dialogs/help/HelpDialog.scss b/apps/client/src/core/dialogs/help/HelpDialog.scss
new file mode 100644
index 000000000..d1cb7a8a2
--- /dev/null
+++ b/apps/client/src/core/dialogs/help/HelpDialog.scss
@@ -0,0 +1,78 @@
+@use '../../../styles/variables' as c;
+
+.helpDialog {
+	height: 100%;
+
+	:global(.MuiDialog-paper) {
+		height: 100%;
+	}
+}
+
+.contentPanel {
+	display: flex;
+	overflow: hidden !important;
+}
+
+.dataTypeList {
+	flex: 0 0 200px;
+	margin-right: 15px;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+	font-size: 13px;
+
+	input {
+		width: 100%;
+		flex: 0 0 auto;
+	}
+
+	ul {
+		margin: 0;
+		list-style: none;
+		padding: 0 0 0 10px;
+		font-size: 12px;
+		line-height: 20px;
+	}
+	li {
+		color: c.$primary-color;
+		cursor: pointer;
+		&:hover {
+			text-decoration: underline;
+		}
+	}
+}
+.helpContent {
+	position: relative;
+	flex: 1;
+	padding-bottom: 15px;
+	overflow: scroll;
+	font-size: 13px;
+	line-height: 21px;
+	p:first-child {
+		margin-top: 0;
+	}
+}
+
+.list {
+	flex: 1;
+	overflow: scroll;
+}
+
+.spinner {
+	position: absolute;
+	top: calc(50% - 40px);
+	left: calc(50% - 40px);
+
+	&.fadeOut {
+		opacity: 0;
+		transition: opacity 0.25s ease-in-out;
+	}
+}
+
+.dialog {
+	width: 800px;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+}
diff --git a/apps/client/src/core/dialogs/help/HelpDialog.scss.d.ts b/apps/client/src/core/dialogs/help/HelpDialog.scss.d.ts
new file mode 100644
index 000000000..93516beb1
--- /dev/null
+++ b/apps/client/src/core/dialogs/help/HelpDialog.scss.d.ts
@@ -0,0 +1,19 @@
+declare namespace HelpDialogScssNamespace {
+	export interface IHelpDialogScss {
+		contentPanel: string;
+		dataTypeList: string;
+		dialog: string;
+		fadeOut: string;
+		helpContent: string;
+		helpDialog: string;
+		list: string;
+		spinner: string;
+	}
+}
+
+declare const HelpDialogScssModule: HelpDialogScssNamespace.IHelpDialogScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: HelpDialogScssNamespace.IHelpDialogScss;
+};
+
+export = HelpDialogScssModule;
diff --git a/apps/client/src/core/dialogs/help/__tests__/HelpDialog.component.test.tsx b/apps/client/src/core/dialogs/help/__tests__/HelpDialog.component.test.tsx
new file mode 100644
index 000000000..bf393a0a0
--- /dev/null
+++ b/apps/client/src/core/dialogs/help/__tests__/HelpDialog.component.test.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import sinon from 'sinon';
+import { render, fireEvent } from '@testing-library/react';
+import HelpDialog from '../HelpDialog.component';
+import { DataTypeFolder } from '@generatedata/plugins';
+import * as langUtils from '@generatedata/utils/lang';
+import * as dataTypeUtils from '~utils/dataTypes';
+const i18n = require('../../../../i18n/en.json');
+const NamesI18n = require('../../../../plugins/dataTypes/Names/i18n/en.json');
+
+const defaultProps = {
+	initialDataType: 'Names' as DataTypeFolder,
+	visible: true,
+	onClose: () => {},
+	coreI18n: i18n,
+	dataTypeI18n: {
+		Names: NamesI18n
+	},
+	onSelectDataType: () => {},
+	loadedDataTypes: {}
+};
+
+describe('HelpDialog', () => {
+	it('clicking close calls the onClose callback', () => {
+		sinon.stub(langUtils, 'getStrings').returns({
+			core: i18n,
+			dataTypes: {
+				Names: NamesI18n
+			}
+		});
+		sinon.stub(dataTypeUtils, 'getSortedGroupedDataTypes').returns([
+			{
+				label: 'Blah',
+				options: [{ value: 'Names', label: 'Names' }]
+			}
+		]);
+
+		const onClose = jest.fn();
+		const { baseElement } = render(<HelpDialog {...defaultProps} onClose={onClose} />);
+
+		const closeButton = baseElement.querySelector('.MuiDialogTitle-root button') as HTMLButtonElement;
+		fireEvent.click(closeButton);
+		expect(onClose).toBeCalled();
+	});
+});
diff --git a/apps/client/src/core/dialogs/login/Login.component.tsx b/apps/client/src/core/dialogs/login/Login.component.tsx
new file mode 100644
index 000000000..9bb470dbc
--- /dev/null
+++ b/apps/client/src/core/dialogs/login/Login.component.tsx
@@ -0,0 +1,220 @@
+import React, { useEffect, useRef, useState } from 'react';
+import Button from '@mui/material/Button';
+import TextField from '~components/TextField';
+import { Dialog, DialogTitle, DialogContent, DialogActions } from '~components/dialogs';
+import { isValidEmail, addToast } from '@generatedata/utils/general';
+import { DialogLoadingSpinner } from '~components/loaders/loaders';
+import { hasVendorLogin, getVendorLoginButtons } from '@generatedata/utils/auth';
+import styles from './Login.scss';
+import { useNavigate } from 'react-router';
+
+const showVendorLoginColumn = hasVendorLogin();
+const vendorLoginButtons = getVendorLoginButtons();
+
+export type LoginDialogProps = {
+	visible: boolean;
+	defaultEmail: string;
+	dialogProcessing: boolean;
+	onClose: () => void;
+	onExited: () => void;
+	onSubmit: (email: string, password: string, navigate: any, onError: Function) => void;
+	showPasswordResetDialog: (email: string) => void;
+	i18n: any;
+};
+
+/**
+ * The login dialog has baked-in support for standard logging into our database, but also optionally supports
+ * logging in via external vendors: Google, Facebook and Github.
+ */
+const LoginDialog = ({
+	visible,
+	defaultEmail,
+	onClose,
+	dialogProcessing,
+	onSubmit,
+	onExited,
+	showPasswordResetDialog,
+	i18n
+}: LoginDialogProps) => {
+	const navigate = useNavigate();
+
+	const textFieldRef = useRef<any>();
+	const [email, setEmail] = useState('');
+	const [emailError, setEmailError] = useState('');
+	const [password, setPassword] = useState('');
+	const [passwordError, setPasswordError] = useState('');
+	const [autoFocusPasswordField, shouldAutoFocusPasswordField] = useState(false);
+	const passwordFieldRef = useRef<HTMLInputElement>();
+
+	useEffect(() => {
+		if (!visible) {
+			setEmail('');
+			setPassword('');
+			return;
+		}
+	}, [visible]);
+
+	useEffect(() => {
+		if (email === '' && defaultEmail) {
+			setEmail(defaultEmail);
+			shouldAutoFocusPasswordField(true);
+		}
+	}, [defaultEmail]);
+
+	const onLogin = (e: any): void => {
+		e.preventDefault();
+
+		let eError = '';
+		if (!email.trim()) {
+			eError = i18n.validationNoEmail;
+		} else if (!isValidEmail(email)) {
+			eError = i18n.validationInvalidEmail;
+		}
+		setEmailError(eError);
+
+		const pError = password ? '' : i18n.validationNoPassword;
+		setPasswordError(pError);
+
+		if (!eError && !pError) {
+			onSubmit(email, password, navigate, (error: string) => {
+				let errorMessage = i18n.userNotFound;
+				if (error === 'accountExpired') {
+					errorMessage = i18n.accountExpiredMsg;
+				}
+
+				addToast({
+					type: 'error',
+					message: errorMessage
+				});
+
+				if (passwordFieldRef && passwordFieldRef.current) {
+					passwordFieldRef.current.select();
+					passwordFieldRef.current.focus();
+				}
+			});
+		}
+	};
+
+	const updateEmail = (email: string): void => {
+		if (emailError) {
+			setEmailError('');
+		}
+		setEmail(email);
+	};
+
+	const updatePassword = (password: string): void => {
+		if (passwordError) {
+			setPasswordError('');
+		}
+		setPassword(password);
+	};
+
+	let width = 380;
+	let layoutClass = '';
+
+	if (showVendorLoginColumn) {
+		width = 500;
+		layoutClass = styles.withSecondCol;
+	}
+
+	const getSecondColumn = () => {
+		if (!showVendorLoginColumn) {
+			return null;
+		}
+
+		// @ts-ignore-line
+		const buttons = vendorLoginButtons.map((VendorButton, index) => <VendorButton key={index} />);
+
+		return (
+			<>
+				<div className={styles.separator}>
+					<div>{i18n.or}</div>
+				</div>
+				<div className={styles.col}>{buttons}</div>
+			</>
+		);
+	};
+
+	const onEntered = (): void => {
+		if (autoFocusPasswordField) {
+			passwordFieldRef?.current?.focus();
+			shouldAutoFocusPasswordField(false);
+		}
+	};
+
+	const onPastePassword = (e: any): void => {
+		const pwd = (e.clipboardData || window.clipboardData).getData('text');
+		if (!password && pwd) {
+			setPassword(pwd.trim());
+		}
+	};
+
+	return (
+		<>
+			<Dialog
+				onClose={onClose}
+				open={visible}
+				className={styles.loginDialog}
+				TransitionProps={{
+					onEntered,
+					onExited
+				}}
+			>
+				<form onSubmit={onLogin}>
+					<div style={{ width }}>
+						<DialogTitle onClose={onClose}>{i18n.login}</DialogTitle>
+						<DialogContent dividers>
+							<div className={layoutClass}>
+								<div className={styles.col}>
+									<label>{i18n.email}</label>
+									<div style={{ marginBottom: 15 }}>
+										<TextField
+											ref={textFieldRef}
+											value={email}
+											error={emailError}
+											name="email"
+											onChange={(e: any): void => updateEmail(e.target.value)}
+											style={{ width: '100%' }}
+											disabled={dialogProcessing}
+											throttle={false}
+											autoFocus
+										/>
+									</div>
+
+									<label>{i18n.password}</label>
+									<div style={{ marginBottom: 15 }}>
+										<TextField
+											type="password"
+											error={passwordError}
+											ref={passwordFieldRef}
+											name="password"
+											value={password}
+											onChange={(e: any): void => updatePassword(e.target.value)}
+											style={{ width: '100%' }}
+											disabled={dialogProcessing}
+											throttle={false}
+											onPaste={onPastePassword}
+											autoComplete="false"
+										/>
+									</div>
+								</div>
+								{getSecondColumn()}
+							</div>
+						</DialogContent>
+						<DialogActions className={styles.actionsRow}>
+							<div className={styles.forgotPasswordLink} onClick={(): void => showPasswordResetDialog(email)}>
+								{i18n.forgottenYourPasswordQ}
+							</div>
+							<Button type="submit" color="primary" variant="outlined" disabled={dialogProcessing}>
+								{i18n.login}
+							</Button>
+						</DialogActions>
+					</div>
+				</form>
+				<DialogLoadingSpinner visible={dialogProcessing} />
+			</Dialog>
+		</>
+	);
+};
+
+export default LoginDialog;
diff --git a/apps/client/src/core/dialogs/login/Login.container.ts b/apps/client/src/core/dialogs/login/Login.container.ts
new file mode 100644
index 000000000..746c099d3
--- /dev/null
+++ b/apps/client/src/core/dialogs/login/Login.container.ts
@@ -0,0 +1,31 @@
+import { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import * as selectors from '~store/generator/generator.selectors';
+import * as mainSelectors from '~store/main/main.selectors';
+import LoginDialog, { LoginDialogProps } from './Login.component';
+import * as mainActions from '~store/main/main.actions';
+
+const mapStateToProps = (state: any): Pick<LoginDialogProps, 'i18n' | 'visible' | 'dialogProcessing' | 'defaultEmail'> => ({
+	i18n: selectors.getCoreI18n(state),
+	visible: mainSelectors.shouldShowLoginDialog(state),
+	dialogProcessing: mainSelectors.isDialogProcessing(state),
+	defaultEmail: mainSelectors.getLoginDefaultEmail(state)
+});
+
+const mapDispatchToProps = (
+	dispatch: Dispatch
+): Pick<LoginDialogProps, 'onClose' | 'onExited' | 'onSubmit' | 'showPasswordResetDialog'> => ({
+	onClose: (): any => dispatch(mainActions.setLoginDialogVisibility(false)),
+	onExited: (): any => dispatch(mainActions.clearLoginFlow()),
+	onSubmit: (email: string, password: string, navigate: any, onLoginError: any): any => {
+		dispatch(mainActions.login(email, password, navigate, onLoginError));
+	},
+	showPasswordResetDialog: (email: string): void => {
+		dispatch(mainActions.setLoginDialogVisibility(false));
+		dispatch(mainActions.setPasswordResetDialogVisibility(true, email));
+	}
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(LoginDialog);
+
+export default container;
diff --git a/apps/client/src/core/dialogs/login/Login.scss b/apps/client/src/core/dialogs/login/Login.scss
new file mode 100644
index 000000000..a4fddab38
--- /dev/null
+++ b/apps/client/src/core/dialogs/login/Login.scss
@@ -0,0 +1,50 @@
+@use '../../../styles/variables' as c;
+
+.loginDialog {
+	label {
+		color: #999999;
+	}
+	input {
+		font-size: 14px;
+	}
+}
+
+.withSecondCol {
+	display: flex;
+	flex-direction: row;
+}
+
+.col {
+	flex: 1;
+}
+
+.separator {
+	margin: 0 25px;
+	position: relative;
+	display: flex;
+	align-items: center;
+	border-left: 1px solid #efefef;
+
+	& > div {
+		position: absolute;
+		left: -8px;
+		background-color: white;
+		padding: 2px;
+		color: #555555;
+	}
+}
+
+div.actionsRow {
+	justify-content: space-between;
+}
+
+.forgotPasswordLink {
+	margin-left: 10px;
+	color: #666666;
+	cursor: pointer;
+
+	&:hover {
+		color: c.$primary-color;
+		text-decoration: underline;
+	}
+}
diff --git a/apps/client/src/core/dialogs/login/Login.scss.d.ts b/apps/client/src/core/dialogs/login/Login.scss.d.ts
new file mode 100644
index 000000000..2e2d34d52
--- /dev/null
+++ b/apps/client/src/core/dialogs/login/Login.scss.d.ts
@@ -0,0 +1,17 @@
+declare namespace LoginScssNamespace {
+	export interface ILoginScss {
+		actionsRow: string;
+		col: string;
+		forgotPasswordLink: string;
+		loginDialog: string;
+		separator: string;
+		withSecondCol: string;
+	}
+}
+
+declare const LoginScssModule: LoginScssNamespace.ILoginScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: LoginScssNamespace.ILoginScss;
+};
+
+export = LoginScssModule;
diff --git a/apps/client/src/core/dialogs/login/__tests__/Login.component.test.tsx b/apps/client/src/core/dialogs/login/__tests__/Login.component.test.tsx
new file mode 100644
index 000000000..70f9335c1
--- /dev/null
+++ b/apps/client/src/core/dialogs/login/__tests__/Login.component.test.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react';
+import LoginDialog from '../Login.component';
+import sharedStyles from '../../../../styles/shared.scss';
+const i18n = require('../../../../i18n/en.json');
+
+const defaultProps = {
+	visible: false,
+	onClose: () => {},
+	onSubmit: () => {},
+	onExited: () => {},
+	showPasswordResetDialog: () => {},
+	dialogProcessing: false,
+	defaultEmail: '',
+	i18n
+};
+
+describe('LoginDialog', () => {
+	it('clicking close calls the onClose callback', () => {
+		const onClose = jest.fn();
+		const { baseElement } = render(<LoginDialog {...defaultProps} visible={true} onClose={onClose} />);
+
+		const closeButton = baseElement.querySelector('.MuiDialogTitle-root button') as HTMLButtonElement;
+		fireEvent.click(closeButton);
+		expect(onClose).toBeCalled();
+	});
+
+	it('clicking enter in the fields submits the form and shows errors on the fields', () => {
+		const onSubmit = jest.fn();
+		const { baseElement } = render(<LoginDialog {...defaultProps} visible={true} onSubmit={onSubmit} />);
+
+		const inputFields = baseElement.querySelectorAll('input') as NodeListOf<HTMLInputElement>;
+
+		// weird, but it seems you can't simulate the <enter> click in another way
+		fireEvent.submit(inputFields[0]);
+
+		expect(inputFields[0].classList.contains(sharedStyles.errorField)).toBeTruthy();
+		expect(inputFields[1].classList.contains(sharedStyles.errorField)).toBeTruthy();
+		expect(onSubmit).not.toHaveBeenCalled();
+	});
+
+	it('when email is invalid but password correct only shows erorr on password field', () => {
+		const onSubmit = jest.fn();
+		const { baseElement } = render(<LoginDialog {...defaultProps} visible={true} onSubmit={onSubmit} />);
+
+		const inputFields = baseElement.querySelectorAll('input') as NodeListOf<HTMLInputElement>;
+
+		// weird, but it seems you can't simulate the <enter> click in another way
+		fireEvent.change(inputFields[0], { target: { value: 'tom@something' } });
+		fireEvent.change(inputFields[1], { target: { value: 'password123' } });
+
+		fireEvent.submit(inputFields[0]);
+
+		expect(inputFields[0].classList.contains(sharedStyles.errorField)).toBeTruthy();
+		expect(inputFields[1].classList.contains(sharedStyles.errorField)).toBeFalsy();
+	});
+
+	it('when fields are valid it submits the form', () => {
+		const onSubmit = jest.fn();
+		const { baseElement } = render(<LoginDialog {...defaultProps} visible={true} onSubmit={onSubmit} />);
+
+		const inputFields = baseElement.querySelectorAll('input') as NodeListOf<HTMLInputElement>;
+
+		// weird, but it seems you can't simulate the <enter> click in another way
+		fireEvent.change(inputFields[0], {
+			target: { value: 'tom@something.com' }
+		});
+		fireEvent.change(inputFields[1], { target: { value: 'password123' } });
+
+		fireEvent.submit(inputFields[0]);
+
+		expect(onSubmit).toHaveBeenCalledWith('tom@something.com', 'password123', undefined, expect.anything());
+	});
+});
diff --git a/apps/client/src/core/dialogs/login/__tests__/Login.container.test.tsx b/apps/client/src/core/dialogs/login/__tests__/Login.container.test.tsx
new file mode 100644
index 000000000..3a14ea6d0
--- /dev/null
+++ b/apps/client/src/core/dialogs/login/__tests__/Login.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import LoginDialog from '../Login.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('LoginDialog container', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<LoginDialog />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/dialogs/passwordReset/PasswordReset.component.tsx b/apps/client/src/core/dialogs/passwordReset/PasswordReset.component.tsx
new file mode 100644
index 000000000..14984e665
--- /dev/null
+++ b/apps/client/src/core/dialogs/passwordReset/PasswordReset.component.tsx
@@ -0,0 +1,115 @@
+import React, { useEffect, useRef, useState } from 'react';
+import Button from '@mui/material/Button';
+import ArrowLeftIcon from '@mui/icons-material/ArrowLeft';
+import TextField from '~components/TextField';
+import { Dialog, DialogTitle, DialogContent, DialogActions } from '~components/dialogs';
+import { isValidEmail } from '@generatedata/utils/general';
+import { DialogLoadingSpinner } from '~components/loaders/loaders';
+import styles from './PasswordReset.scss';
+
+export type PasswordResetDialogProps = {
+	visible: boolean;
+	dialogProcessing: boolean;
+	defaultEmail: string;
+	onClose: () => void;
+	onSubmit: (email: string, onError: Function) => void;
+	showLoginDialog: (email: string) => void;
+	i18n: any;
+};
+
+const PasswordResetDialog = ({
+	visible,
+	onClose,
+	dialogProcessing,
+	onSubmit,
+	showLoginDialog,
+	defaultEmail,
+	i18n
+}: PasswordResetDialogProps) => {
+	const textFieldRef = useRef<any>();
+	const [email, setEmail] = useState('');
+	const [emailError, setEmailError] = useState('');
+
+	useEffect(() => {
+		if (!visible) {
+			setEmail('');
+			return;
+		}
+	}, [visible]);
+
+	useEffect(() => {
+		setEmail(defaultEmail);
+	}, [defaultEmail]);
+
+	const onLogin = (e: any): void => {
+		e.preventDefault();
+
+		let eError = '';
+		if (!email.trim()) {
+			eError = i18n.validationNoEmail;
+		} else if (!isValidEmail(email)) {
+			eError = i18n.validationInvalidEmail;
+		}
+		setEmailError(eError);
+
+		if (!eError) {
+			onSubmit(email, () => {
+				// addToast({
+				// 	type: 'error',
+				// 	message: i18n.userNotFound
+				// });
+				//
+				// if (textFieldRef && textFieldRef.current) {
+				// 	textFieldRef.current.select();
+				// 	textFieldRef.current.focus();
+				// }
+			});
+		}
+	};
+
+	const updateEmail = (email: string): void => {
+		if (emailError) {
+			setEmailError('');
+		}
+		setEmail(email);
+	};
+
+	return (
+		<Dialog onClose={onClose} open={visible} className={styles.loginDialog}>
+			<form onSubmit={onLogin}>
+				<div style={{ width: 380 }}>
+					<DialogTitle onClose={onClose}>{i18n.passwordReset}</DialogTitle>
+					<DialogContent dividers>
+						<label>{i18n.email}</label>
+						<div style={{ marginBottom: 15 }}>
+							<TextField
+								ref={textFieldRef}
+								value={email}
+								error={emailError}
+								name="email"
+								onChange={(e: any): void => updateEmail(e.target.value)}
+								style={{ width: '100%' }}
+								disabled={dialogProcessing}
+								autoFocus
+							/>
+						</div>
+					</DialogContent>
+					<DialogActions className={styles.actionsRow}>
+						<div className={styles.loginLink} onClick={(): void => showLoginDialog(email)}>
+							<div>
+								<ArrowLeftIcon />
+								{i18n.backToLogin}
+							</div>
+						</div>
+						<Button type="submit" color="primary" variant="outlined" disabled={dialogProcessing}>
+							{i18n.sendEmail}
+						</Button>
+					</DialogActions>
+				</div>
+			</form>
+			<DialogLoadingSpinner visible={dialogProcessing} />
+		</Dialog>
+	);
+};
+
+export default PasswordResetDialog;
diff --git a/apps/client/src/core/dialogs/passwordReset/PasswordReset.container.ts b/apps/client/src/core/dialogs/passwordReset/PasswordReset.container.ts
new file mode 100644
index 000000000..aa3af24e6
--- /dev/null
+++ b/apps/client/src/core/dialogs/passwordReset/PasswordReset.container.ts
@@ -0,0 +1,28 @@
+import { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import * as selectors from '~store/generator/generator.selectors';
+import * as mainSelectors from '~store/main/main.selectors';
+import PasswordReset, { PasswordResetDialogProps } from './PasswordReset.component';
+import * as mainActions from '~store/main/main.actions';
+
+const mapStateToProps = (state: any): Partial<PasswordResetDialogProps> => ({
+	i18n: selectors.getCoreI18n(state),
+	visible: mainSelectors.shouldShowPasswordResetDialog(state),
+	dialogProcessing: mainSelectors.isDialogProcessing(state),
+	defaultEmail: mainSelectors.getPasswordResetDialogDefaultEmail(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Partial<PasswordResetDialogProps> => ({
+	onClose: (): any => dispatch(mainActions.setPasswordResetDialogVisibility(false)),
+	onSubmit: (email: string, onLoginError: any): any => {
+		dispatch(mainActions.sendPasswordResetEmail(email, onLoginError));
+	},
+	showLoginDialog: (email: string): void => {
+		dispatch(mainActions.setLoginDialogVisibility(true, email));
+		dispatch(mainActions.setPasswordResetDialogVisibility(false));
+	}
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(PasswordReset);
+
+export default container;
diff --git a/apps/client/src/core/dialogs/passwordReset/PasswordReset.scss b/apps/client/src/core/dialogs/passwordReset/PasswordReset.scss
new file mode 100644
index 000000000..70977689a
--- /dev/null
+++ b/apps/client/src/core/dialogs/passwordReset/PasswordReset.scss
@@ -0,0 +1,54 @@
+@use '../../../styles/variables' as c;
+
+.loginDialog {
+	label {
+		color: #999999;
+	}
+	input {
+		font-size: 14px;
+	}
+}
+
+.withSecondCol {
+	display: flex;
+	flex-direction: row;
+}
+
+.col {
+	flex: 1;
+}
+
+.separator {
+	margin: 0 25px;
+	position: relative;
+	display: flex;
+	align-items: center;
+	border-left: 1px solid #efefef;
+
+	& > div {
+		position: absolute;
+		left: -8px;
+		background-color: white;
+		padding: 2px;
+		color: #555555;
+	}
+}
+
+div.actionsRow {
+	justify-content: space-between;
+}
+
+.loginLink {
+	margin-left: 2px;
+	color: #666666;
+	cursor: pointer;
+
+	& > div {
+		display: flex;
+	}
+
+	&:hover {
+		color: c.$primary-color;
+		text-decoration: underline;
+	}
+}
diff --git a/apps/client/src/core/dialogs/passwordReset/PasswordReset.scss.d.ts b/apps/client/src/core/dialogs/passwordReset/PasswordReset.scss.d.ts
new file mode 100644
index 000000000..5fbd7e088
--- /dev/null
+++ b/apps/client/src/core/dialogs/passwordReset/PasswordReset.scss.d.ts
@@ -0,0 +1,17 @@
+declare namespace PasswordResetScssNamespace {
+	export interface IPasswordResetScss {
+		actionsRow: string;
+		col: string;
+		loginDialog: string;
+		loginLink: string;
+		separator: string;
+		withSecondCol: string;
+	}
+}
+
+declare const PasswordResetScssModule: PasswordResetScssNamespace.IPasswordResetScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: PasswordResetScssNamespace.IPasswordResetScss;
+};
+
+export = PasswordResetScssModule;
diff --git a/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.component.tsx b/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.component.tsx
new file mode 100644
index 000000000..059b476b5
--- /dev/null
+++ b/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.component.tsx
@@ -0,0 +1,110 @@
+import React, { useCallback, useRef, useState } from 'react';
+import { useHistory } from 'react-router';
+import PersonAddIcon from '@mui/icons-material/PersonAdd';
+import TextField from '~components/TextField';
+import { PrimaryButton } from '~components/Buttons.component';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import styles from './SaveDataSet.scss';
+import { SaveDataDialogType } from '~store/account/account.reducer';
+
+export type SaveDataSetDialogProps = {
+	visible: boolean;
+	isLoggedIn: boolean;
+	dialogType: SaveDataDialogType;
+	showRegistration: boolean;
+	onRedirectToLogin: () => void;
+	onClose: any;
+	onSave: (dataSetName: string) => void;
+	i18n: any;
+};
+
+const SaveDataSetDialog = ({
+	visible,
+	isLoggedIn,
+	dialogType,
+	onClose,
+	onSave,
+	showRegistration,
+	onRedirectToLogin,
+	i18n
+}: SaveDataSetDialogProps) => {
+	const history = useHistory();
+
+	const newDataSetNameField = useRef<HTMLInputElement>();
+	const [newDataSetName, setNewDataSetName] = useState('');
+	const [newDataSetNameError, setNewDataSetErrorName] = useState('');
+
+	const onExited = (): void => {
+		setNewDataSetName('');
+		setNewDataSetErrorName('');
+	};
+
+	let title = dialogType === SaveDataDialogType.save ? i18n.save : i18n.saveAs;
+	let content = (
+		<div className={styles.newDataSet}>
+			<TextField
+				ref={newDataSetNameField}
+				error={newDataSetNameError}
+				placeholder={i18n.dataSetName}
+				autoFocus
+				value={newDataSetName}
+				onChange={(e: any): void => {
+					setNewDataSetName(e.target.value);
+					setNewDataSetErrorName('');
+				}}
+			/>
+		</div>
+	);
+
+	const saveDataSet = (e: any): void => {
+		e.preventDefault();
+
+		if (!newDataSetName.trim()) {
+			setNewDataSetErrorName(i18n.missingDataSetName);
+			newDataSetNameField.current!.focus();
+		} else {
+			onSave(newDataSetName);
+			// TODO loading spinner
+		}
+	};
+
+	const gotoRegistration = useCallback(() => {
+		onClose();
+		history.push('/register');
+	}, []);
+
+	let buttons = <PrimaryButton type="submit">{i18n.save}</PrimaryButton>;
+
+	if (!isLoggedIn) {
+		title = i18n.pleaseLogin;
+		const msg = showRegistration ? i18n.loginOrRegisterToSave : i18n.loginToSave;
+		content = (
+			<div className={styles.notLoggedIn}>
+				<PersonAddIcon />
+				{msg}
+			</div>
+		);
+		buttons = (
+			<>
+				<PrimaryButton onClick={onRedirectToLogin}>{i18n.login}</PrimaryButton>
+				{showRegistration && <PrimaryButton onClick={gotoRegistration}>{i18n.register}</PrimaryButton>}
+			</>
+		);
+	}
+
+	return (
+		<Dialog onClose={onClose} open={visible} TransitionProps={{ onExited }}>
+			<form onSubmit={saveDataSet}>
+				<div style={{ width: 420 }}>
+					<DialogTitle onClose={onClose}>{title}</DialogTitle>
+					<DialogContent dividers className={styles.contentPanel}>
+						{content}
+					</DialogContent>
+					<DialogActions>{buttons}</DialogActions>
+				</div>
+			</form>
+		</Dialog>
+	);
+};
+
+export default SaveDataSetDialog;
diff --git a/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.container.tsx b/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.container.tsx
new file mode 100644
index 000000000..bfb12fb13
--- /dev/null
+++ b/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.container.tsx
@@ -0,0 +1,37 @@
+import { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import SaveDataSetDialog, { SaveDataSetDialogProps } from './SaveDataSet.component';
+import * as selectors from '~store/generator/generator.selectors';
+import * as accountSelectors from '~store/account/account.selectors';
+import * as actions from '~store/account/account.actions';
+import * as mainActions from '~store/main/main.actions';
+import * as mainSelectors from '~store/main/main.selectors';
+import clientConfig from '@generatedata/config/clientConfig';
+
+const mapStateToProps = (
+	state: any
+): Pick<SaveDataSetDialogProps, 'i18n' | 'visible' | 'isLoggedIn' | 'dialogType' | 'showRegistration'> => ({
+	i18n: selectors.getCoreI18n(state),
+	visible: accountSelectors.shouldShowSaveDataSetDialog(state),
+	isLoggedIn: mainSelectors.isLoggedIn(state),
+	dialogType: accountSelectors.getSaveDataDialogType(state),
+
+	// TODO. We should offer an option for users to register themselves and not rely on the admin to do it for them
+	showRegistration: clientConfig.appSettings.GD_APP_TYPE === 'prod'
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Pick<SaveDataSetDialogProps, 'onClose' | 'onRedirectToLogin' | 'onSave'> => ({
+	onClose: (): any => dispatch(actions.hideSaveDataSetDialog()),
+	onRedirectToLogin: (): any => {
+		dispatch(actions.hideSaveDataSetDialog());
+		dispatch(mainActions.setLoginDialogVisibility(true));
+
+		// this returns them to the save dialog after logging in
+		mainActions.setReturnToSaveDataSet();
+	},
+	onSave: (dataSetName: string): any => dispatch(actions.saveNewDataSet(dataSetName))
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(SaveDataSetDialog);
+
+export default container;
diff --git a/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.scss b/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.scss
new file mode 100644
index 000000000..e99af03e2
--- /dev/null
+++ b/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.scss
@@ -0,0 +1,51 @@
+@use '../../../styles/variables';
+
+div.contentPanel {
+	display: flex;
+	align-items: center;
+	overflow: hidden !important;
+	padding: 10px 16px;
+
+	.notLoggedIn {
+		margin: 8px 0;
+		line-height: 20px;
+		font-size: 13px;
+		display: flex;
+		align-items: center;
+
+		svg {
+			color: #275eb5;
+			opacity: 0.8;
+			font-size: 50px;
+			margin-right: 18px;
+		}
+	}
+
+	ul {
+		margin: 0;
+		padding: 0;
+		list-style-type: none;
+
+		li {
+			display: flex;
+			margin-bottom: 4px;
+		}
+
+		input {
+			margin-right: 5px;
+		}
+	}
+}
+
+.newDataSet {
+	flex: 1;
+
+	input {
+		font-size: 14px;
+		width: 100%;
+	}
+}
+
+.existingDataSet {
+	font-size: 14px;
+}
diff --git a/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.scss.d.ts b/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.scss.d.ts
new file mode 100644
index 000000000..88c453cd2
--- /dev/null
+++ b/apps/client/src/core/dialogs/saveDataSet/SaveDataSet.scss.d.ts
@@ -0,0 +1,15 @@
+declare namespace SaveDataSetScssNamespace {
+	export interface ISaveDataSetScss {
+		contentPanel: string;
+		existingDataSet: string;
+		newDataSet: string;
+		notLoggedIn: string;
+	}
+}
+
+declare const SaveDataSetScssModule: SaveDataSetScssNamespace.ISaveDataSetScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: SaveDataSetScssNamespace.ISaveDataSetScss;
+};
+
+export = SaveDataSetScssModule;
diff --git a/apps/client/src/core/dialogs/saveDataSet/__tests__/SaveDataSet.container.test.tsx b/apps/client/src/core/dialogs/saveDataSet/__tests__/SaveDataSet.container.test.tsx
new file mode 100644
index 000000000..7c08309ad
--- /dev/null
+++ b/apps/client/src/core/dialogs/saveDataSet/__tests__/SaveDataSet.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import SaveDataSet from '../SaveDataSet.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('SaveDataSet Container', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<SaveDataSet />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/dialogs/schema/Schema.component.tsx b/apps/client/src/core/dialogs/schema/Schema.component.tsx
new file mode 100644
index 000000000..29a169bfe
--- /dev/null
+++ b/apps/client/src/core/dialogs/schema/Schema.component.tsx
@@ -0,0 +1,121 @@
+import React from 'react';
+import { Theme, styled } from '@mui/material/styles';
+import { Controlled as CodeMirror } from 'react-codemirror2';
+import Tabs from '@mui/material/Tabs';
+import Tab from '@mui/material/Tab';
+import { PrimaryButton } from '~components/Buttons.component';
+import { Dialog, DialogTitle, DialogContent, DialogActions } from '~components/dialogs';
+import FeatureToggles from '../../featureToggles';
+import styles from './Schema.scss';
+
+export type SchemaDialogProps = {
+	visible: boolean;
+	onClose: any;
+	schema: string;
+	theme: string;
+	i18n: any;
+};
+
+function a11yProps(index: number) {
+	return {
+		id: `vertical-tab-${index}`,
+		'aria-controls': `vertical-tabpanel-${index}`
+	};
+}
+
+interface TabPanelProps {
+	children?: React.ReactNode;
+	index: any;
+	value: any;
+}
+
+function TabPanel(props: TabPanelProps) {
+	const { children, value, index, ...other } = props;
+
+	return (
+		<div role="tabpanel" hidden={value !== index} id={`vertical-tabpanel-${index}`} aria-labelledby={`vertical-tab-${index}`} {...other}>
+			{value === index && children}
+		</div>
+	);
+}
+
+const Root = styled('div')(({ theme }) => ({
+	flexGrow: 1,
+	backgroundColor: theme.palette.background.paper,
+	display: 'flex',
+	height: 224
+}));
+
+const TabPanelContent = styled('div')(() => ({
+	padding: '5px 15px 0'
+}));
+
+const SchemaDialog = ({ visible, onClose, schema, theme, i18n }: SchemaDialogProps) => {
+	// const classes = useStyles();
+	const [code, setCode] = React.useState(schema);
+	const [value, setValue] = React.useState(0);
+
+	if (!FeatureToggles.DATA_TEMPLATE_GENERATION_UI) {
+		return null;
+	}
+
+	const handleChange = (event: React.ChangeEvent<{}>, newValue: number) => {
+		setValue(newValue);
+	};
+
+	return (
+		<Dialog onClose={onClose} open={visible} className={styles.dataTemplateDialog}>
+			<div className={styles.dataTemplateDialogInner}>
+				<DialogTitle onClose={onClose}>Data Template</DialogTitle>
+				<DialogContent dividers>
+					<Root>
+						<Tabs
+							orientation="vertical"
+							variant="scrollable"
+							value={value}
+							onChange={handleChange}
+							aria-label="Vertical tabs example"
+							className={classes.tabs}
+						>
+							<Tab label="About" {...a11yProps(0)} />
+							<Tab label="Import" {...a11yProps(1)} />
+							<Tab label="Export" {...a11yProps(2)} />
+						</Tabs>
+						<TabPanel value={value} index={0}>
+							<TabPanelContent>
+								The data you create here in the UI can be downloaded as a template for use with the generatedata CLI, letting you generate
+								data
+							</TabPanelContent>
+						</TabPanel>
+						<TabPanel value={value} index={1}>
+							<TabPanelContent>
+								<div className={`${styles.content} themeLucario`}>
+									Javascript Typescript JSON template only
+									<CodeMirror
+										value={code}
+										onBeforeChange={(editor, data, value): void => setCode(value)}
+										options={{
+											mode: 'application/ld+json',
+											theme,
+											lineNumbers: false,
+											lineWrapping: false,
+											readOnly: true
+										}}
+									/>
+								</div>
+							</TabPanelContent>
+						</TabPanel>
+						<TabPanel value={value} index={2}>
+							<div className={classes.tabPanel}>Import.</div>
+						</TabPanel>
+					</Root>
+				</DialogContent>
+				<DialogActions className={styles.actions}>
+					<PrimaryButton onClick={onClose}>{i18n.close}</PrimaryButton>
+				</DialogActions>
+			</div>
+		</Dialog>
+	);
+};
+
+export default SchemaDialog;
diff --git a/apps/client/src/core/dialogs/schema/Schema.container.tsx b/apps/client/src/core/dialogs/schema/Schema.container.tsx
new file mode 100644
index 000000000..e39270674
--- /dev/null
+++ b/apps/client/src/core/dialogs/schema/Schema.container.tsx
@@ -0,0 +1,20 @@
+import { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import SchemaDialog, { SchemaDialogProps } from './Schema.component';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+
+const mapStateToProps = (state: any): Partial<SchemaDialogProps> => ({
+	visible: selectors.isSchemaDialogVisible(state),
+	i18n: selectors.getCoreI18n(state),
+	schema: selectors.getGenerationSchema(state),
+	theme: selectors.getTheme(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): SchemaDialogProps['onClose'] => ({
+	onClose: (): any => dispatch(actions.hideSchemaDialog())
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(SchemaDialog);
+
+export default container;
diff --git a/apps/client/src/core/dialogs/schema/Schema.scss b/apps/client/src/core/dialogs/schema/Schema.scss
new file mode 100644
index 000000000..70d97af3f
--- /dev/null
+++ b/apps/client/src/core/dialogs/schema/Schema.scss
@@ -0,0 +1,48 @@
+@use '../../../styles/variables' as c;
+
+.dataTemplateDialog {
+	height: 100%;
+
+	:global(.MuiDialog-paper) {
+		height: 100%;
+	}
+
+	.actions {
+		button {
+			svg {
+				fill: c.$primary-color;
+				height: 18px;
+				width: 18px;
+				margin-right: 6px;
+				margin-left: -4px;
+			}
+		}
+	}
+
+	h4 {
+		margin-top: 0;
+	}
+
+	:global(.MuiDialogContent-root) {
+		font-size: 13px;
+		line-height: 20px;
+	}
+
+	.content {
+		height: 450px;
+		& > * {
+			height: 100%;
+			& > * {
+				height: 100%;
+			}
+		}
+	}
+}
+
+.dataTemplateDialogInner {
+	width: 800px;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+}
diff --git a/apps/client/src/core/dialogs/schema/Schema.scss.d.ts b/apps/client/src/core/dialogs/schema/Schema.scss.d.ts
new file mode 100644
index 000000000..cd790e48e
--- /dev/null
+++ b/apps/client/src/core/dialogs/schema/Schema.scss.d.ts
@@ -0,0 +1,15 @@
+declare namespace SchemaScssNamespace {
+	export interface ISchemaScss {
+		actions: string;
+		content: string;
+		dataTemplateDialog: string;
+		dataTemplateDialogInner: string;
+	}
+}
+
+declare const SchemaScssModule: SchemaScssNamespace.ISchemaScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: SchemaScssNamespace.ISchemaScss;
+};
+
+export = SchemaScssModule;
diff --git a/apps/client/src/core/dialogs/tourIntro/TourIntro.component.tsx b/apps/client/src/core/dialogs/tourIntro/TourIntro.component.tsx
new file mode 100644
index 000000000..c9d91a85f
--- /dev/null
+++ b/apps/client/src/core/dialogs/tourIntro/TourIntro.component.tsx
@@ -0,0 +1,162 @@
+import React, { useEffect, useState } from 'react';
+import { PrimaryButton } from '~components/Buttons.component';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import { DialogLoadingSpinner } from '~components/loaders/loaders';
+import { getTourComponents } from '@generatedata/utils/general';
+import styles from './TourIntro.scss';
+import { useWindowSize } from 'react-hooks-window-size';
+
+// TODO enum
+type Tour = 'intro' | 'gridPanel' | 'previewPanel' | 'yourAccount';
+
+export type TourDialogProps = {
+	tourIntroDialogVisible: boolean;
+	showTourIntroDialog: () => void;
+	onClose: () => void;
+	tourBundleLoaded: boolean;
+	loadTourBundle: () => void;
+	saveGeneratorState: () => void;
+	restoreGeneratorState: () => void;
+	i18n: any;
+};
+
+const TourDialog = ({
+	tourIntroDialogVisible,
+	showTourIntroDialog,
+	onClose,
+	tourBundleLoaded,
+	loadTourBundle,
+	restoreGeneratorState,
+	saveGeneratorState,
+	i18n
+}: TourDialogProps) => {
+	const windowSize = useWindowSize();
+
+	const [loadingBundle, setLoadingBundle] = useState(false);
+	const [currentTour, setCurrentTour] = useState<Tour | null>(null);
+
+	useEffect(() => {
+		if (tourBundleLoaded && currentTour !== null) {
+			onClose();
+		}
+	}, [tourBundleLoaded, currentTour]);
+
+	useEffect(() => {
+		if (tourIntroDialogVisible) {
+			setLoadingBundle(false);
+
+			// unreadable logic, but this fires when the tour dialog was just hidden and there's a tour slated to be shown.
+			// It saves the current generator state before the tour messes around with it
+		} else if (currentTour !== null) {
+			saveGeneratorState();
+		}
+	}, [tourIntroDialogVisible]);
+
+	// hide the tour if the screen gets too small
+	useEffect(() => {
+		if (windowSize.width < 900) {
+			if (tourIntroDialogVisible || currentTour !== null) {
+				closeIntroDialog();
+			}
+		}
+	}, [windowSize.width]);
+
+	const closeIntroDialog = (): void => {
+		setCurrentTour(null);
+		onClose();
+	};
+
+	const selectTour = (tour: Tour): void => {
+		// load the tour bundle and show a loading spinner until it's ready. At that point, we backup the current
+		// generator settings, close this intro dialog and open the selected tour
+		setLoadingBundle(true);
+		setCurrentTour(tour);
+
+		if (!tourBundleLoaded) {
+			loadTourBundle();
+		} else {
+			onClose();
+		}
+	};
+
+	// when a user exits a tour they're taken back to the intro panel again
+	const onExit = (completelyExit: boolean): void => {
+		restoreGeneratorState();
+		setCurrentTour(null);
+
+		if (completelyExit !== true) {
+			showTourIntroDialog();
+		}
+	};
+
+	const getCurrentTour = () => {
+		if (tourIntroDialogVisible || !currentTour || !tourBundleLoaded) {
+			return null;
+		}
+
+		const tours = getTourComponents();
+		const Tour = tours[currentTour].component;
+
+		return (
+			<Tour
+				isOpen={true}
+				onClose={onExit}
+				i18n={i18n}
+				maskClassName={styles.tourMask}
+				closeWithMask={false}
+				disableInteraction={true}
+				className={styles.tourPage}
+				accentColor="#275eb5"
+			/>
+		);
+	};
+
+	return (
+		<>
+			<Dialog onClose={closeIntroDialog} open={tourIntroDialogVisible}>
+				<div style={{ width: 600 }}>
+					<DialogTitle onClose={onClose}>{i18n.help}</DialogTitle>
+					<DialogContent dividers className={styles.introDialog}>
+						<div className={styles.cols}>
+							<div className={styles.col}>
+								<h3>{i18n.welcomeToTheGenerator}</h3>
+
+								<p>{i18n.tourIntroPara1}</p>
+
+								<p>{i18n.tourIntroPara2}</p>
+							</div>
+
+							<div className={styles.separator} />
+
+							<div className={`${styles.col} ${styles.buttonCol}`}>
+								<div>
+									<PrimaryButton onClick={(): void => selectTour('intro')}>1. {i18n.introToGenerator}</PrimaryButton>
+								</div>
+								<div>
+									<PrimaryButton onClick={(): void => selectTour('gridPanel')}>2. {i18n.theGridPanel}</PrimaryButton>
+								</div>
+								<div>
+									<PrimaryButton onClick={(): void => selectTour('previewPanel')}>3. {i18n.thePreviewPanel}</PrimaryButton>
+								</div>
+								<div>
+									<PrimaryButton disabled={true} onClick={(): void => selectTour('yourAccount')}>
+										4. {i18n.yourUserAccount}
+									</PrimaryButton>
+								</div>
+							</div>
+						</div>
+					</DialogContent>
+					<DialogActions>
+						<PrimaryButton onClick={closeIntroDialog} color="default">
+							{i18n.close}
+						</PrimaryButton>
+					</DialogActions>
+				</div>
+				<DialogLoadingSpinner visible={loadingBundle} />
+			</Dialog>
+			{getCurrentTour()}
+		</>
+	);
+};
+
+export default TourDialog;
diff --git a/apps/client/src/core/dialogs/tourIntro/TourIntro.container.ts b/apps/client/src/core/dialogs/tourIntro/TourIntro.container.ts
new file mode 100644
index 000000000..227af2681
--- /dev/null
+++ b/apps/client/src/core/dialogs/tourIntro/TourIntro.container.ts
@@ -0,0 +1,29 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import TourIntroDialog, { TourDialogProps } from './TourIntro.component';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+import * as mainSelectors from '~store/main/main.selectors';
+import * as mainActions from '~store/main/main.actions';
+
+const mapStateToProps = (state: any): Pick<TourDialogProps, 'i18n' | 'tourIntroDialogVisible' | 'tourBundleLoaded'> => ({
+	i18n: selectors.getCoreI18n(state),
+	tourIntroDialogVisible: mainSelectors.tourIntroDialogVisible(state),
+	tourBundleLoaded: mainSelectors.isTourBundleLoaded(state)
+});
+
+const mapDispatchToProps = (
+	dispatch: Dispatch
+): Pick<TourDialogProps, 'loadTourBundle' | 'onClose' | 'showTourIntroDialog' | 'saveGeneratorState' | 'restoreGeneratorState'> => ({
+	loadTourBundle: (): any => dispatch(mainActions.loadTourBundle()),
+
+	// @ts-ignore-line
+	onClose: (): any => dispatch(mainActions.hideTourIntroDialog()),
+
+	// @ts-ignore-line
+	showTourIntroDialog: (): any => dispatch(mainActions.showTourIntroDialog()),
+	saveGeneratorState: (): any => dispatch(actions.stashGeneratorState()),
+	restoreGeneratorState: (): any => dispatch(actions.popStashedState())
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(TourIntroDialog);
diff --git a/apps/client/src/core/dialogs/tourIntro/TourIntro.scss b/apps/client/src/core/dialogs/tourIntro/TourIntro.scss
new file mode 100644
index 000000000..58d34b675
--- /dev/null
+++ b/apps/client/src/core/dialogs/tourIntro/TourIntro.scss
@@ -0,0 +1,62 @@
+@use '../../../styles/variables.scss' as c;
+
+.cols {
+	display: flex;
+	flex-direction: row;
+}
+
+.col {
+	flex: 1;
+
+	h3 {
+		margin-top: 0;
+	}
+
+	:global(.MuiButtonBase-root) {
+		margin-bottom: 10px;
+
+		svg {
+			margin-left: -4px;
+			margin-right: 6px;
+		}
+	}
+}
+
+.separator {
+	margin: 0 25px;
+	position: relative;
+	display: flex;
+	align-items: center;
+	border-left: 1px solid #efefef;
+}
+
+svg.tourMask {
+	opacity: 0.7;
+	color: #b2bed3;
+}
+
+.introDialog,
+.tourPage {
+	font-size: 13px;
+
+	p {
+		line-height: 20px;
+	}
+
+	button {
+		font-size: 12px;
+	}
+}
+
+.buttonCol {
+	font-size: 12px;
+
+	b {
+		color: c.$primary-color;
+	}
+}
+
+div[data-tour-elem='controls'] {
+	display: flex;
+	justify-content: center;
+}
diff --git a/apps/client/src/core/dialogs/tourIntro/TourIntro.scss.d.ts b/apps/client/src/core/dialogs/tourIntro/TourIntro.scss.d.ts
new file mode 100644
index 000000000..3aaf3dbb9
--- /dev/null
+++ b/apps/client/src/core/dialogs/tourIntro/TourIntro.scss.d.ts
@@ -0,0 +1,18 @@
+declare namespace TourIntroScssNamespace {
+	export interface ITourIntroScss {
+		buttonCol: string;
+		col: string;
+		cols: string;
+		introDialog: string;
+		separator: string;
+		tourMask: string;
+		tourPage: string;
+	}
+}
+
+declare const TourIntroScssModule: TourIntroScssNamespace.ITourIntroScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: TourIntroScssNamespace.ITourIntroScss;
+};
+
+export = TourIntroScssModule;
diff --git a/apps/client/src/core/featureToggles.ts b/apps/client/src/core/featureToggles.ts
new file mode 100644
index 000000000..9f8db8002
--- /dev/null
+++ b/apps/client/src/core/featureToggles.ts
@@ -0,0 +1,10 @@
+const FeatureToggles = {
+	/**
+	 * Ultimately we're going to be showing an option (somewhere...) to let the user download a JSON representation
+	 * of what they're currently building: Data Set rows, Export Type choice abd settings. This will be used for the
+	 * command-line npm package version of the script being worked on for 4.1.
+	 */
+	DATA_TEMPLATE_GENERATION_UI: true
+};
+
+export default FeatureToggles;
diff --git a/apps/client/src/core/footer/Footer.component.tsx b/apps/client/src/core/footer/Footer.component.tsx
new file mode 100644
index 000000000..353d0e5c4
--- /dev/null
+++ b/apps/client/src/core/footer/Footer.component.tsx
@@ -0,0 +1,196 @@
+import React, { useState } from 'react';
+import Button from '@mui/material/Button';
+import ButtonGroup from '@mui/material/ButtonGroup';
+import Grow from '@mui/material/Grow';
+import Popper from '@mui/material/Popper';
+import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
+import SaveIcon from '@mui/icons-material/Save';
+import GearIcon from '@mui/icons-material/Settings';
+import Person from '@mui/icons-material/EmojiPeople';
+import { Tooltip } from '~components/tooltips';
+import { Github } from '~components/icons';
+import ActivePacketsList from '../generationPanel/ActivePacketsList.container';
+import PanelControls from '../generator/panelControls/PanelControls.container';
+import AboutDialog from '~core/dialogs/about/About.component';
+import useOnClickOutside from 'use-onclickoutside';
+import styles from './Footer.scss';
+import { useWindowSize } from 'react-hooks-window-size';
+import C from '@generatedata/config/constants';
+import { isGeneratorPage } from '~utils/routeUtils';
+import { GDLocale } from '~types/general';
+import { useNavigate } from 'react-router';
+
+export type FooterProps = {
+	i18n: any;
+	locale: GDLocale;
+	scriptVersion: string;
+	onGenerate: () => void;
+	onSave: () => void;
+	onSaveNewDataSet: () => void;
+	onSaveAs: () => void;
+	actionButtonsEnabled: boolean;
+	currentPage: string; // isGeneratorPage?
+	currentDataSetId: number | null;
+	showTourDialog: (navigate: any) => void;
+	customFooterLinks: JSX.Element[];
+};
+
+const Footer = ({
+	i18n,
+	locale,
+	actionButtonsEnabled,
+	scriptVersion,
+	onSave,
+	onGenerate,
+	currentPage,
+	currentDataSetId,
+	onSaveNewDataSet,
+	onSaveAs,
+	showTourDialog,
+	customFooterLinks
+}: FooterProps) => {
+	const navigate = useNavigate();
+	const saveAsButtonRef = React.useRef(null);
+	const anchorRef = React.useRef<HTMLDivElement>(null);
+	const [saveAsMenuOpen, setSaveAsMenuOpen] = useState(false);
+	const [showAboutDialog, setAboutDialogVisibility] = useState(false);
+
+	const windowSize = useWindowSize();
+
+	useOnClickOutside(saveAsButtonRef, () => {
+		setSaveAsMenuOpen(false);
+	});
+
+	// we always show the login button. It'll show a "you must login in" dialog if they're not logged in/registered
+	const getSaveButton = () => {
+		// if the data set has already been saved, we give them a split button: the main button immediately saves,
+		// the arrow gives them the option to create a new data set via the "Save as" option
+		if (currentDataSetId) {
+			return (
+				<div ref={saveAsButtonRef} style={{ position: 'relative' }}>
+					<ButtonGroup
+						variant="contained"
+						color="primary"
+						className={`${styles.saveButtonAs} tour-saveButton`}
+						ref={anchorRef}
+						disableElevation
+						aria-label="split button"
+						disabled={!actionButtonsEnabled}
+					>
+						<Button onClick={onSave} className={styles.saveButtonAsMainBtn}>
+							<SaveIcon />
+							{i18n.save}
+						</Button>
+						<Button
+							color="primary"
+							size="small"
+							aria-controls={saveAsMenuOpen ? 'split-button-menu' : undefined}
+							aria-expanded={saveAsMenuOpen ? 'true' : undefined}
+							aria-label={i18n.saveDataSetNewName}
+							aria-haspopup="menu"
+							className={styles.saveBtnArrow}
+							onClick={(): void => setSaveAsMenuOpen(!saveAsMenuOpen)}
+						>
+							<ArrowDropDownIcon />
+						</Button>
+					</ButtonGroup>
+
+					<Popper
+						open={saveAsMenuOpen}
+						anchorEl={anchorRef.current}
+						transition
+						placement="top-end"
+						className={styles.saveAsRow}
+						onClick={(e): void => {
+							e.preventDefault();
+							e.stopPropagation();
+							onSaveAs();
+						}}
+					>
+						{({ TransitionProps }): any => (
+							<Grow {...TransitionProps}>
+								<div>{i18n.saveAs}</div>
+							</Grow>
+						)}
+					</Popper>
+				</div>
+			);
+		}
+
+		return (
+			<Button
+				onClick={onSaveNewDataSet}
+				className={`${styles.saveButton} tour-saveButton`}
+				variant="contained"
+				disableElevation
+				disabled={!actionButtonsEnabled}
+			>
+				<SaveIcon />
+				{i18n.save}
+			</Button>
+		);
+	};
+
+	let footerControlsClasses = styles.footerControls;
+	if (isGeneratorPage(currentPage, locale)) {
+		footerControlsClasses += ` ${styles.visible}`;
+	}
+
+	let panelControls;
+	if (windowSize.width > C.SMALL_SCREEN_WIDTH) {
+		panelControls = <PanelControls className={`${styles.controls} tour-panelControls`} />;
+	}
+
+	return (
+		<>
+			<footer className={styles.footer}>
+				<div>
+					<ul>
+						<li className={styles.aboutIconEl}>
+							<Tooltip title={i18n.aboutThisScript} arrow>
+								<span onClick={(): void => setAboutDialogVisibility(true)}>
+									<Github />
+								</span>
+							</Tooltip>
+						</li>
+						<li className={styles.showTourLink}>
+							<Button className={styles.tourBtn} onClick={() => showTourDialog(navigate)}>
+								<Person />
+								<span>{i18n.help}</span>
+							</Button>
+						</li>
+						{customFooterLinks}
+					</ul>
+
+					<div className={styles.activePacketsList}>
+						<ActivePacketsList />
+					</div>
+
+					<div className={footerControlsClasses}>
+						{panelControls}
+						{getSaveButton()}
+						<Button
+							onClick={onGenerate}
+							className={`${styles.generateButton} tour-generateButton`}
+							variant="contained"
+							color="primary"
+							disableElevation
+							disabled={!actionButtonsEnabled}
+						>
+							<GearIcon />
+							{i18n.generate}
+						</Button>
+					</div>
+				</div>
+			</footer>
+			<AboutDialog
+				visible={showAboutDialog}
+				onClose={(): void => setAboutDialogVisibility(false)}
+				scriptVersion={scriptVersion}
+				i18n={i18n}
+			/>
+		</>
+	);
+};
+
+export default Footer;
diff --git a/apps/client/src/core/footer/Footer.container.tsx b/apps/client/src/core/footer/Footer.container.tsx
new file mode 100644
index 000000000..d30be8d8a
--- /dev/null
+++ b/apps/client/src/core/footer/Footer.container.tsx
@@ -0,0 +1,49 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import Footer, { FooterProps } from './Footer.component';
+import { GDLocale } from '~types/general';
+import * as selectors from '../store/generator/generator.selectors';
+import * as actions from '../store/generator/generator.actions';
+import * as mainSelectors from '../store/main/main.selectors';
+import * as mainActions from '../store/main/main.actions';
+import * as accountActions from '../store/account/account.actions';
+import * as coreUtils from '../../utils/coreUtils';
+import { isExportTypeValid } from '~utils/exportTypes';
+import { getCustomFooterLinks } from '@generatedata/utils/extension';
+import { SaveDataDialogType } from '~store/account/account.reducer';
+
+const mapStateToProps = (
+	state: any
+): Pick<
+	FooterProps,
+	'i18n' | 'locale' | 'scriptVersion' | 'actionButtonsEnabled' | 'currentPage' | 'currentDataSetId' | 'customFooterLinks'
+> => {
+	const exportType = selectors.getExportType(state);
+	const exportTypeSettings = selectors.getCurrentExportTypeSettings(state);
+
+	return {
+		i18n: selectors.getCoreI18n(state),
+		locale: mainSelectors.getLocale(state),
+		scriptVersion: coreUtils.getScriptVersion(),
+		actionButtonsEnabled: selectors.hasData(state) && isExportTypeValid(exportType, exportTypeSettings),
+		currentPage: mainSelectors.getCurrentPage(state),
+		currentDataSetId: selectors.getCurrentDataSetId(state),
+		customFooterLinks: getCustomFooterLinks()
+	};
+};
+
+const mapDispatchToProps = (
+	dispatch: Dispatch
+): Pick<FooterProps, 'onSave' | 'onSaveNewDataSet' | 'onSaveAs' | 'onGenerate' | 'showTourDialog'> => ({
+	// @ts-ignore-line
+	onChangeLocale: (locale: GDLocale): any => dispatch(mainActions.selectLocale(locale)),
+	onSave: (): any => dispatch(accountActions.saveCurrentDataSet()),
+	onSaveNewDataSet: (): any => dispatch(accountActions.showSaveDataSetDialog(SaveDataDialogType.save)),
+	onSaveAs: (): any => dispatch(accountActions.showSaveDataSetDialog(SaveDataDialogType.saveAs)),
+	onGenerate: (): any => dispatch(actions.showGenerationSettingsPanel()),
+
+	// @ts-ignore-line
+	showTourDialog: (navigate: any): any => dispatch(mainActions.showTourIntroDialog(navigate))
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(Footer);
diff --git a/apps/client/src/core/footer/Footer.scss b/apps/client/src/core/footer/Footer.scss
new file mode 100644
index 000000000..a8e39fa1d
--- /dev/null
+++ b/apps/client/src/core/footer/Footer.scss
@@ -0,0 +1,183 @@
+@use '../../styles/variables' as c;
+
+.footer {
+	flex: 0 0 60px;
+	background-image: url('./images/bg.png');
+	padding: 16px 20px;
+
+	& > div {
+		display: flex;
+		flex: 0 0 auto;
+		margin: 0 auto;
+		align-content: space-between;
+		max-width: 1400px;
+		height: 32px;
+
+		& > ul {
+			flex: 0 0 auto;
+			display: flex;
+			flex-direction: row;
+			list-style: none;
+			margin: 0;
+			padding: 0;
+			align-items: center;
+
+			li {
+				display: flex;
+				margin-right: 10px;
+
+				&:hover {
+					svg {
+						fill: c.$primary-color;
+					}
+				}
+			}
+
+			svg {
+				cursor: pointer;
+				transition: fill 0.15s ease-in-out;
+			}
+		}
+	}
+
+	a:hover {
+		border-bottom: 0;
+	}
+
+	svg {
+		-webkit-mask-image: -webkit-gradient(linear, left top, left bottom, from(black), to(rgba(0, 0, 0, 0.6)));
+	}
+
+	button.generateButton,
+	button.saveButton,
+	button.saveButtonAsMainBtn {
+		font-size: 13px;
+
+		svg {
+			font-size: 15px;
+			margin: 0 5px 0 -5px;
+		}
+
+		&:global(.Mui-disabled) {
+			border-color: #bbbbbb;
+		}
+	}
+
+	.aboutIconEl {
+		height: 24px;
+	}
+}
+
+.saveButtonAs {
+	button.saveButtonAsMainBtn {
+		border-color: #bde9fb;
+	}
+}
+
+.scriptVersion a {
+	margin-right: 30px;
+	color: #333333;
+
+	&:hover {
+		text-decoration: none;
+	}
+}
+
+div.controls {
+	margin-right: 15px;
+}
+
+button.saveButton {
+	background-color: c.$primary-submit;
+	color: white;
+	margin-right: 15px;
+
+	&:hover {
+		background-color: c.$primary-submit-hover;
+	}
+}
+
+div.saveButtonAs {
+	height: 32px;
+	margin-right: 15px;
+	button {
+		background-color: c.$primary-submit;
+		color: white;
+
+		&:hover {
+			background-color: c.$primary-submit-hover;
+		}
+	}
+}
+
+button.saveBtnArrow {
+	min-width: inherit;
+	padding: 0 6px;
+
+	svg {
+		margin: 0;
+	}
+}
+
+.saveAsRow {
+	cursor: pointer;
+	background-color: c.$primary-submit;
+	margin-bottom: 2px;
+	border-radius: 2px;
+	color: white;
+	text-transform: uppercase;
+	font-size: 11px;
+	padding: 6px 12px;
+	z-index: 2;
+
+	&:hover {
+		background-color: c.$primary-submit-hover;
+	}
+}
+
+.tourBtn:global(.MuiButtonBase-root) {
+	text-transform: none;
+	transition: color 0.15s ease-in-out;
+	margin-left: -6px;
+
+	svg {
+		margin-right: 4px;
+	}
+	&:hover {
+		color: c.$primary-color;
+	}
+}
+
+@media (max-width: 900px) {
+	button.tourBtn {
+		display: none;
+	}
+}
+
+.showTourLink {
+	flex: 0 0 auto;
+}
+
+.activePacketsList {
+	flex: 1 1 auto;
+	overflow: scroll;
+}
+
+.footerControls {
+	display: flex;
+	align-items: stretch;
+	flex: 0 0 auto;
+	padding-right: 18px;
+	opacity: 0;
+	transition: opacity 200ms ease-in-out;
+
+	&.visible {
+		opacity: 1;
+	}
+}
+
+@media (max-width: 600px) {
+	.footerControls {
+		padding-right: 0;
+	}
+}
diff --git a/apps/client/src/core/footer/Footer.scss.d.ts b/apps/client/src/core/footer/Footer.scss.d.ts
new file mode 100644
index 000000000..76e799273
--- /dev/null
+++ b/apps/client/src/core/footer/Footer.scss.d.ts
@@ -0,0 +1,26 @@
+declare namespace FooterScssNamespace {
+	export interface IFooterScss {
+		aboutIconEl: string;
+		activePacketsList: string;
+		controls: string;
+		footer: string;
+		footerControls: string;
+		generateButton: string;
+		saveAsRow: string;
+		saveBtnArrow: string;
+		saveButton: string;
+		saveButtonAs: string;
+		saveButtonAsMainBtn: string;
+		scriptVersion: string;
+		showTourLink: string;
+		tourBtn: string;
+		visible: string;
+	}
+}
+
+declare const FooterScssModule: FooterScssNamespace.IFooterScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: FooterScssNamespace.IFooterScss;
+};
+
+export = FooterScssModule;
diff --git a/apps/client/src/core/footer/__tests__/Footer.container.test.tsx b/apps/client/src/core/footer/__tests__/Footer.container.test.tsx
new file mode 100644
index 000000000..ff30a8bf3
--- /dev/null
+++ b/apps/client/src/core/footer/__tests__/Footer.container.test.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import Footer from '../Footer.container';
+import { renderWithStoreAndRouter } from '../../../../tests/testHelpers';
+
+describe('Footer', () => {
+	// also need to finish deciding exactly what the footer will contain before adding these tests
+
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<Footer />);
+
+		expect(baseElement.querySelector('footer')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/generationPanel/ActivePacketsList.component.tsx b/apps/client/src/core/generationPanel/ActivePacketsList.component.tsx
new file mode 100644
index 000000000..b6e331397
--- /dev/null
+++ b/apps/client/src/core/generationPanel/ActivePacketsList.component.tsx
@@ -0,0 +1,82 @@
+import * as React from 'react';
+import { useNavigate } from 'react-router';
+import CheckCircle from '@mui/icons-material/CheckCircle';
+import Chip from '@mui/material/Chip';
+import styles from './ActivityPacketsList.scss';
+import { Cell, Pie, PieChart } from 'recharts';
+import { Tooltip } from '~components/tooltips';
+import { getPercentageLabel } from './generation.helpers';
+
+export type ActivePacketList = {
+	packetId: string;
+	label: string;
+	percentage: number;
+	isPaused: boolean;
+	numRowsToGenerate: number;
+};
+
+export type ActivePacketsListProps = {
+	packetList: ActivePacketList[];
+	openPacket: (packetId: string, navigate: any) => void;
+};
+
+const ActivePacketsList = ({ packetList, openPacket }: ActivePacketsListProps) => {
+	const navigate = useNavigate();
+
+	const chips = packetList.map(({ packetId, label, percentage, numRowsToGenerate, isPaused }, index) => {
+		const color = isPaused ? 'default' : 'primary';
+		const pieChartData = [
+			{ value: percentage, color: '#003300' },
+			{ value: 100 - percentage, color: '#dddddd' }
+		];
+
+		// expand with expected time
+		const tooltipContent = `${getPercentageLabel(percentage, numRowsToGenerate)}% complete`;
+
+		let icon = <CheckCircle />;
+		if (percentage < 100) {
+			icon = (
+				<PieChart width={28} height={28}>
+					<Pie
+						dataKey="value"
+						stroke=""
+						isAnimationActive={true}
+						data={pieChartData}
+						outerRadius="100%"
+						startAngle={90}
+						endAngle={-270}
+						paddingAngle={0}
+					>
+						{pieChartData.map((entry, index) => (
+							<Cell key={index} fill={pieChartData[index].color} />
+						))}
+					</Pie>
+				</PieChart>
+			);
+		}
+
+		return (
+			<Tooltip key={index} title={<span dangerouslySetInnerHTML={{ __html: tooltipContent }} />} arrow>
+				<Chip
+					size="medium"
+					label={
+						<span className={styles.chipLabel}>
+							<span>{label}</span>
+							{icon}
+						</span>
+					}
+					className={styles.chip}
+					clickable
+					color={color}
+					onClick={(): void => openPacket(packetId, navigate)}
+					variant="outlined"
+					style={{ marginLeft: 10 }}
+				/>
+			</Tooltip>
+		);
+	});
+
+	return <div className={styles.root}>{chips}</div>;
+};
+
+export default ActivePacketsList;
diff --git a/apps/client/src/core/generationPanel/ActivePacketsList.container.tsx b/apps/client/src/core/generationPanel/ActivePacketsList.container.tsx
new file mode 100644
index 000000000..01c24062a
--- /dev/null
+++ b/apps/client/src/core/generationPanel/ActivePacketsList.container.tsx
@@ -0,0 +1,16 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import * as actions from '../store/packets/packets.actions';
+import * as selectors from '../store/packets/packets.selectors';
+import ActivePacketsList, { ActivePacketsListProps } from './ActivePacketsList.component';
+
+const mapStateToProps = (state: any): Pick<ActivePacketsListProps, 'packetList'> => ({
+	packetList: selectors.getActivePacketList(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Pick<ActivePacketsListProps, 'openPacket'> => ({
+	// @ts-ignore
+	openPacket: (packetId: string, navigate: any): any => dispatch(actions.showActivityPanel(packetId, navigate))
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(ActivePacketsList);
diff --git a/apps/client/src/core/generationPanel/ActivityPacketsList.scss b/apps/client/src/core/generationPanel/ActivityPacketsList.scss
new file mode 100644
index 000000000..885038a5e
--- /dev/null
+++ b/apps/client/src/core/generationPanel/ActivityPacketsList.scss
@@ -0,0 +1,17 @@
+.chipLabel {
+	display: flex;
+	align-items: center;
+	font-size: 12px;
+
+	& > span {
+		margin-right: 5px;
+	}
+}
+
+.chip {
+	padding-right: 0;
+}
+
+.root {
+	white-space: nowrap;
+}
diff --git a/apps/client/src/core/generationPanel/ActivityPacketsList.scss.d.ts b/apps/client/src/core/generationPanel/ActivityPacketsList.scss.d.ts
new file mode 100644
index 000000000..30747a327
--- /dev/null
+++ b/apps/client/src/core/generationPanel/ActivityPacketsList.scss.d.ts
@@ -0,0 +1,14 @@
+declare namespace ActivityPacketsListScssNamespace {
+	export interface IActivityPacketsListScss {
+		chip: string;
+		chipLabel: string;
+		root: string;
+	}
+}
+
+declare const ActivityPacketsListScssModule: ActivityPacketsListScssNamespace.IActivityPacketsListScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: ActivityPacketsListScssNamespace.IActivityPacketsListScss;
+};
+
+export = ActivityPacketsListScssModule;
diff --git a/apps/client/src/core/generationPanel/ActivityPanel.component.tsx b/apps/client/src/core/generationPanel/ActivityPanel.component.tsx
new file mode 100644
index 000000000..eb7b5c609
--- /dev/null
+++ b/apps/client/src/core/generationPanel/ActivityPanel.component.tsx
@@ -0,0 +1,258 @@
+import React from 'react';
+import { PieChart, Pie, Cell, BarChart, CartesianGrid, XAxis, YAxis, Bar, Label } from 'recharts';
+import CountUp from 'react-countup';
+import IconButton from '@mui/material/IconButton';
+import Slider from '@mui/material/Slider';
+import Button from '@mui/material/Button';
+import Pause from '@mui/icons-material/Pause';
+import PlayArrow from '@mui/icons-material/PlayArrow';
+import ExpandMore from '@mui/icons-material/ExpandMore';
+import { Dialog, DialogContent, DialogTitle, DialogActions } from '~components/dialogs';
+import usePrevious from '../../hooks/usePrevious';
+import styles from './ActivityPanel.scss';
+import { DataPacket } from '~store/packets/packets.reducer';
+import * as coreUtils from '../../utils/coreUtils';
+import { Tooltip } from '~components/tooltips';
+import { getPercentageLabel } from './generation.helpers';
+import Engine from './Engine.container';
+import { LoadTimeGraphDuration } from '~types/general';
+import { GenerationWorkerActionType } from '~core/generator/generation.types';
+import { useMeasure } from '@uidotdev/usehooks';
+
+export type ActivityPanelProps = {
+	visible: boolean;
+	fullI18n: any;
+	packet: DataPacket | null;
+	onClose: () => void;
+	onPause: () => void;
+	onContinue: () => void;
+	onAbort: () => void;
+	onDownload: () => void;
+	onChangeSpeed: (speed: number) => void;
+	batchLoadTimes: object[];
+	dataSize: string;
+	estimatedSize: string;
+	estimatedTime: string;
+	estimatedTimeRemaining: string;
+	loadTimeGraphDuration: LoadTimeGraphDuration;
+	countUpSpeed: number;
+};
+
+const valueLabelFormat = (value: number): string => `${value}%`;
+
+const ActivityPanel = ({
+	visible,
+	onClose,
+	packet,
+	onContinue,
+	onPause,
+	batchLoadTimes,
+	onAbort,
+	onDownload,
+	onChangeSpeed,
+	dataSize,
+	estimatedSize,
+	estimatedTime,
+	countUpSpeed,
+	estimatedTimeRemaining,
+	fullI18n
+}: ActivityPanelProps): any => {
+	const [measureRef, { width = 0, height = 0 }] = useMeasure(); // TODO check defaults are ok
+
+	if (packet === null || fullI18n === null) {
+		return null;
+	}
+
+	const coreI18n = fullI18n.core;
+	const { isPaused, config, generationWorkerId, numGeneratedRows, speed } = packet;
+	const { numRowsToGenerate } = config;
+
+	const prevGeneratedRows = usePrevious(numGeneratedRows);
+	const generationWorker = coreUtils.getGenerationWorker(generationWorkerId);
+
+	const abortPacket = (): void => {
+		onAbort();
+		generationWorker.postMessage({ action: GenerationWorkerActionType.Abort });
+		coreUtils.destroyGenerationWorker(generationWorkerId);
+	};
+
+	const percentage = (numGeneratedRows / numRowsToGenerate) * 100;
+	const isComplete = percentage === 100;
+
+	const pieChartData = [
+		{ name: coreI18n.complete, value: percentage, color: '#275eb5' },
+		{ name: coreI18n.incomplete, value: 100 - percentage, color: '#efefef' }
+	];
+
+	let pauseContinueIcon: any;
+	let pauseContinueIconAction: any;
+	if (isPaused) {
+		pauseContinueIcon = <PlayArrow fontSize="large" />;
+		pauseContinueIconAction = onContinue;
+	} else {
+		pauseContinueIcon = <Pause fontSize="large" />;
+		pauseContinueIconAction = onPause;
+	}
+
+	const marks = [
+		{ value: 0, label: coreI18n.seriouslySlow },
+		{ value: 100, label: coreI18n.cpuMeltinglyFast }
+	];
+
+	const getActionButtons = () => {
+		if (isComplete) {
+			return (
+				<div>
+					<Button onClick={onAbort} variant="outlined" style={{ marginRight: 10 }}>
+						{coreI18n.clear}
+					</Button>
+					<Button onClick={onDownload} color="primary" variant="outlined" style={{ marginRight: 10 }}>
+						{coreI18n.download}
+					</Button>
+				</div>
+			);
+		}
+
+		return (
+			<div>
+				<Button onClick={onClose} variant="outlined" style={{ marginRight: 10 }}>
+					{coreI18n.hide}
+				</Button>
+				<Button onClick={abortPacket} color="secondary" variant="outlined" style={{ marginRight: 10 }}>
+					{coreI18n.abort}
+				</Button>
+			</div>
+		);
+	};
+
+	const getGenerationControls = (): React.ReactNode => {
+		// TODO apply class to fade out instead
+		if (isComplete) {
+			return null;
+		}
+
+		const tooltip = isPaused ? coreI18n.continue : coreI18n.pause;
+
+		return (
+			<div style={{ flex: 1, display: 'flex', marginRight: 80 }}>
+				<Tooltip title={tooltip} placement="top" arrow style={{ marginRight: 50 }}>
+					<span>
+						<IconButton size="medium" aria-label={tooltip} onClick={pauseContinueIconAction}>
+							{pauseContinueIcon}
+						</IconButton>
+					</span>
+				</Tooltip>
+				<Slider
+					value={speed}
+					aria-labelledby="discrete-slider-always"
+					step={1}
+					min={1}
+					max={100}
+					valueLabelDisplay="auto"
+					valueLabelFormat={valueLabelFormat}
+					marks={marks}
+					onChange={(e, value): void => onChangeSpeed(value as number)}
+				/>
+			</div>
+		);
+	};
+
+	const panel1Width = ((width || 0) / 100) * 20;
+	const pieSize = Math.floor(panel1Width * 0.9);
+	const countUpDuration = countUpSpeed;
+
+	return (
+		<>
+			<Dialog className={styles.activityPanel} onClose={onClose} open={visible}>
+				<div style={{ width: '100%', height: '100%' }} ref={measureRef}>
+					<DialogTitle onClose={onClose} customCloseIcon={ExpandMore}>
+						{coreI18n.generatedC}
+						<CountUp
+							start={prevGeneratedRows}
+							end={numGeneratedRows}
+							separator=","
+							easingFn={coreUtils.easeInOutSine}
+							className={styles.counter}
+							duration={countUpDuration}
+						/>
+						{coreI18n.rows}
+					</DialogTitle>
+					<DialogContent dividers style={{ padding: 0 }}>
+						<div className={styles.overlayWrapper}>
+							<div style={{ display: 'flex' }}>
+								<div className={styles.panel1} style={{ width: panel1Width }}>
+									<div className={styles.pie}>
+										<h3>{getPercentageLabel(percentage, numRowsToGenerate)}%</h3>
+										<PieChart width={pieSize} height={pieSize}>
+											<Pie
+												dataKey="value"
+												isAnimationActive={false}
+												data={pieChartData}
+												cx={pieSize / 2}
+												cy={pieSize / 2}
+												innerRadius={pieSize / 4}
+												outerRadius={pieSize / 2 - 5}
+												startAngle={90}
+												endAngle={-270}
+											>
+												{pieChartData.map((entry, index) => (
+													<Cell key={index} fill={pieChartData[index].color} />
+												))}
+											</Pie>
+										</PieChart>
+									</div>
+
+									<div className={styles.dataPanel}>
+										<div className={styles.dataRow}>
+											<div className={styles.dataRowLabel}>{coreI18n.estimatedTime}</div>
+											<div className={styles.dataRowValue}>{estimatedTime}</div>
+										</div>
+										<div className={styles.dataRow}>
+											<div className={styles.dataRowLabel}>{coreI18n.remainingTime}</div>
+											<div className={styles.dataRowValue}>{estimatedTimeRemaining}</div>
+										</div>
+										<div className={styles.dataRow}>
+											<div className={styles.dataRowLabel}>{coreI18n.estimatedSize}</div>
+											<div className={styles.dataRowValue}>{estimatedSize}</div>
+										</div>
+										<div className={styles.dataRow}>
+											<div className={styles.dataRowLabel}>{coreI18n.size}</div>
+											<div className={styles.dataRowValue}>{dataSize}</div>
+										</div>
+									</div>
+								</div>
+
+								<div className={styles.panel2}>
+									<h4>{coreI18n.rowsGeneratedPerSecond}</h4>
+
+									{width && height && (
+										<BarChart
+											width={width - pieSize}
+											height={height - 185}
+											data={batchLoadTimes}
+											margin={{ top: 10, right: 30, left: 0, bottom: 10 }}
+										>
+											<CartesianGrid strokeDasharray="3 3" />
+											<XAxis dataKey="label" interval={0} tick={{ fontSize: 8 }}>
+												<Label value={coreI18n.seconds} offset={0} position="insideBottom" />
+											</XAxis>
+											<YAxis dataKey="rowsPerSecond" />
+											<Bar dataKey="rowsPerSecond" stroke="#275eb5" fill="#275eb5" isAnimationActive={false} />
+										</BarChart>
+									)}
+								</div>
+							</div>
+						</div>
+					</DialogContent>
+					<DialogActions className={styles.actionsRow}>
+						{getGenerationControls()}
+						{getActionButtons()}
+					</DialogActions>
+				</div>
+			</Dialog>
+			{visible && <Engine />}
+		</>
+	);
+};
+
+export default ActivityPanel;
diff --git a/apps/client/src/core/generationPanel/ActivityPanel.container.tsx b/apps/client/src/core/generationPanel/ActivityPanel.container.tsx
new file mode 100644
index 000000000..821ff8574
--- /dev/null
+++ b/apps/client/src/core/generationPanel/ActivityPanel.container.tsx
@@ -0,0 +1,53 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import * as packetActions from '../store/packets/packets.actions';
+import * as selectors from '../store/generator/generator.selectors';
+import * as packetSelectors from '../store/packets/packets.selectors';
+import ActivityPanel, { ActivityPanelProps } from './ActivityPanel.component';
+import { GDAction, GenerationActivityPanel } from '~types/general';
+import { getGenerationActivityPanel } from '~core/generationPanel/generation.helpers';
+
+const mapStateToProps = (state: any): Partial<ActivityPanelProps> & { packetId: string | null } => {
+	const packet = packetSelectors.getCurrentPacket(state);
+	const largePacketSize =
+		!!packet && getGenerationActivityPanel(packet.config.numRowsToGenerate) === GenerationActivityPanel.large;
+
+	const props: Partial<ActivityPanelProps> & { packetId: string | null } = {
+		visible: largePacketSize && packetSelectors.isGenerating(state),
+		fullI18n: selectors.getI18n(state),
+		packet,
+		packetId: packetSelectors.getCurrentPacketId(state),
+		batchLoadTimes: packetSelectors.getBatchLoadTimes(state),
+		dataSize: packetSelectors.getGeneratedDataSizeLabel(state),
+		estimatedSize: packetSelectors.getEstimatedDataSize(state),
+		estimatedTime: packetSelectors.getEstimatedTimeDisplay(state),
+		estimatedTimeRemaining: packetSelectors.getEstimatedTimeRemaining(state),
+		countUpSpeed: packetSelectors.getLastBatchGenerationDuration(state)
+	};
+
+	if (packet !== null) {
+		props.loadTimeGraphDuration = packetSelectors.getLoadTimeDuration(state);
+	}
+
+	return props;
+};
+
+const mapDispatchToProps = (dispatch: Dispatch): any => ({ dispatch });
+
+const mergeProps = ({ packetId, ...stateProps }: any, { dispatch }: any): ActivityPanelProps => {
+	if (stateProps.packet === null) {
+		return stateProps;
+	}
+
+	return {
+		...stateProps,
+		onClose: (): void => dispatch(packetActions.hideActivityPanel()),
+		onPause: (): GDAction => dispatch(packetActions.pauseGeneration(packetId)),
+		onContinue: (): GDAction => dispatch(packetActions.continueGeneration(packetId)),
+		onAbort: (): GDAction => dispatch(packetActions.abortGeneration(packetId)),
+		onDownload: (): any => dispatch(packetActions.promptToDownload()),
+		onChangeSpeed: (speed: number): any => dispatch(packetActions.changeSpeed(speed))
+	};
+};
+
+export default connect(mapStateToProps, mapDispatchToProps, mergeProps)(ActivityPanel);
diff --git a/apps/client/src/core/generationPanel/ActivityPanel.scss b/apps/client/src/core/generationPanel/ActivityPanel.scss
new file mode 100644
index 000000000..8e3596f01
--- /dev/null
+++ b/apps/client/src/core/generationPanel/ActivityPanel.scss
@@ -0,0 +1,158 @@
+.row {
+	display: flex;
+	align-items: center;
+}
+
+.generationRow {
+	font-size: 14px;
+	margin-bottom: 10px;
+
+	input {
+		width: 100px;
+		margin: 0 6px;
+		font-size: 16px;
+		color: #666666;
+	}
+}
+
+.panel1 {
+	flex: 1;
+	position: relative;
+	padding: 10px;
+}
+
+.panel2 {
+	flex: 1;
+}
+
+.generateOverlay {
+	position: absolute;
+	z-index: 1;
+	padding: 30px;
+	background-color: white;
+	border-radius: 10px;
+	top: 50%;
+	margin-right: -50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+
+.overlayWrapper {
+	position: relative;
+	height: 100%;
+}
+
+.background {
+	position: absolute;
+	background-color: #efefef;
+	opacity: 0.7;
+	top: 0;
+	left: 0;
+	bottom: 0;
+	right: 0;
+}
+
+.fadeOut {
+	opacity: 0;
+	transition: opacity 0.25s ease-in-out;
+}
+
+.counter {
+	color: #275eb5;
+	margin: 0 4px;
+}
+
+.actionsRow {
+	height: 72px;
+}
+
+.activityPanel :global(.MuiDialog-paper) {
+	width: 100%;
+	max-width: 1000px;
+	height: 100%;
+	max-height: 600px;
+}
+
+.pie {
+	margin-bottom: 20px;
+	position: relative;
+
+	h3 {
+		position: absolute;
+		color: #666660;
+		top: 50%;
+		left: 50%;
+		font-size: 18px;
+		margin-right: -50%;
+		transform: translate(-50%, -50%);
+		z-index: 1;
+	}
+}
+
+.dataPanel {
+	padding: 0 5%;
+}
+
+.dataRow {
+	display: flex;
+	flex-direction: row;
+	line-height: 42px;
+	width: 100%;
+}
+
+.dataRowLabel {
+	flex: 1 0 60%;
+}
+
+.dataRowValue {
+	flex: 1 0 40%;
+	font-size: 16px;
+}
+
+.generationOverlayBg {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	background-color: white;
+	opacity: 0.9;
+	width: 100%;
+	margin: 0 -20px;
+}
+
+.generationOverlay {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	width: 100%;
+	margin: 0 -20px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: column;
+}
+
+.generationSettingsContent {
+	position: relative;
+}
+
+.generationLabel {
+	font-size: 14px;
+}
+
+.generationComplete {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	width: 100%;
+	margin: 0 -20px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: column;
+	font-size: 18px;
+
+	svg {
+		font-size: 42px;
+		fill: #11811b;
+	}
+}
diff --git a/apps/client/src/core/generationPanel/ActivityPanel.scss.d.ts b/apps/client/src/core/generationPanel/ActivityPanel.scss.d.ts
new file mode 100644
index 000000000..c99101d2e
--- /dev/null
+++ b/apps/client/src/core/generationPanel/ActivityPanel.scss.d.ts
@@ -0,0 +1,32 @@
+declare namespace ActivityPanelScssNamespace {
+	export interface IActivityPanelScss {
+		actionsRow: string;
+		activityPanel: string;
+		background: string;
+		counter: string;
+		dataPanel: string;
+		dataRow: string;
+		dataRowLabel: string;
+		dataRowValue: string;
+		fadeOut: string;
+		generateOverlay: string;
+		generationComplete: string;
+		generationLabel: string;
+		generationOverlay: string;
+		generationOverlayBg: string;
+		generationRow: string;
+		generationSettingsContent: string;
+		overlayWrapper: string;
+		panel1: string;
+		panel2: string;
+		pie: string;
+		row: string;
+	}
+}
+
+declare const ActivityPanelScssModule: ActivityPanelScssNamespace.IActivityPanelScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: ActivityPanelScssNamespace.IActivityPanelScss;
+};
+
+export = ActivityPanelScssModule;
diff --git a/apps/client/src/core/generationPanel/Engine.component.tsx b/apps/client/src/core/generationPanel/Engine.component.tsx
new file mode 100644
index 000000000..52c72af44
--- /dev/null
+++ b/apps/client/src/core/generationPanel/Engine.component.tsx
@@ -0,0 +1,85 @@
+import { useEffect } from 'react';
+import * as coreUtils from '../../utils/coreUtils';
+import C from '@generatedata/config/constants';
+import useDidUpdate from '../../hooks/useDidUpdate';
+import { DataPacket } from '~store/packets/packets.reducer';
+import { CountryNamesMap } from '@generatedata/plugins';
+import { GenerationWorkerActionType } from '~core/generator/generation.types';
+import { DataTypeMap, ExportTypeMap } from '@generatedata/plugins';
+import { CountryDataType } from '@generatedata/types';
+
+export type EngineProps = {
+	fullI18n: any;
+	packet: DataPacket | null;
+	logDataBatch: (numGeneratedRows: number, data: any) => void;
+	workerUtilsUrl: string;
+	dataTypeWorkerMap: DataTypeMap;
+	exportTypeWorkerMap: ExportTypeMap;
+	dataTypes: DataTypeMap;
+	countryNames: CountryNamesMap | null;
+	countryData: CountryDataType;
+};
+
+// this component does the actual work of generating the data and populating the store. It doesn't have a DOM presence,
+// it's just done this way to utilize the lifecycle methods
+const Engine = ({
+	packet,
+	fullI18n,
+	logDataBatch,
+	countryNames,
+	countryData,
+	dataTypeWorkerMap,
+	exportTypeWorkerMap,
+	workerUtilsUrl
+}: EngineProps): any => {
+	if (packet === null || fullI18n === null) {
+		return null;
+	}
+	const { isPaused, config, generationWorkerId, numGeneratedRows, speed } = packet;
+	const { numRowsToGenerate, columns, template, exportType, exportTypeSettings, stripWhitespace } = config;
+	const generationWorker = coreUtils.getGenerationWorker(generationWorkerId);
+
+	useEffect(() => {
+		if (numGeneratedRows !== 0) {
+			return;
+		}
+
+		generationWorker.postMessage({
+			action: GenerationWorkerActionType.Generate,
+			numResults: numRowsToGenerate,
+			batchSize: C.GENERATION_BATCH_SIZE,
+			speed,
+			columns,
+			i18n: fullI18n,
+			template,
+			countryNames,
+			countryData,
+			workerUtilsUrl,
+			dataTypeWorkerMap,
+			exportTypeWorkerUrl: exportTypeWorkerMap[exportType],
+			exportTypeSettings,
+			stripWhitespace
+		});
+
+		generationWorker.onmessage = ({ data }): void => {
+			logDataBatch(data.numGeneratedRows, data.data);
+		};
+	}, [numGeneratedRows]);
+
+	useDidUpdate(() => {
+		generationWorker.postMessage({
+			action: isPaused ? GenerationWorkerActionType.Pause : GenerationWorkerActionType.Continue
+		});
+	}, [isPaused]);
+
+	useDidUpdate(() => {
+		generationWorker.postMessage({
+			action: GenerationWorkerActionType.SetSpeed,
+			speed
+		});
+	}, [speed]);
+
+	return null;
+};
+
+export default Engine;
diff --git a/apps/client/src/core/generationPanel/Engine.container.tsx b/apps/client/src/core/generationPanel/Engine.container.tsx
new file mode 100644
index 000000000..98c14f810
--- /dev/null
+++ b/apps/client/src/core/generationPanel/Engine.container.tsx
@@ -0,0 +1,45 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import * as packetActions from '../store/packets/packets.actions';
+import * as selectors from '../store/generator/generator.selectors';
+import * as packetSelectors from '../store/packets/packets.selectors';
+import Engine, { EngineProps } from './Engine.component';
+import * as coreUtils from '../../utils/coreUtils';
+import { GDAction } from '~types/general';
+import { getCountryData } from '@generatedata/plugins';
+
+const mapStateToProps = (state: any): Partial<EngineProps> & { packetId: any } => {
+	const packet = packetSelectors.getCurrentPacket(state);
+	const packetId = packetSelectors.getCurrentPacketId(state);
+
+	const props: Partial<EngineProps> & { packetId: any } = {
+		packetId,
+		fullI18n: selectors.getI18n(state),
+		packet,
+		countryNames: coreUtils.getCountryNames()
+	};
+
+	if (packet !== null) {
+		props.workerUtilsUrl = coreUtils.getWorkerUtilsUrl();
+		props.exportTypeWorkerMap = coreUtils.getExportTypeWorkerMap(selectors.getLoadedExportTypes(state));
+		props.dataTypeWorkerMap = coreUtils.getDataTypeWorkerMap(packet.config.dataTypes);
+		props.countryData = getCountryData();
+	}
+
+	return props;
+};
+
+const mapDispatchToProps = (dispatch: Dispatch): any => ({ dispatch });
+
+const mergeProps = ({ packetId, ...stateProps }: any, { dispatch }: any): EngineProps => {
+	if (stateProps.packet === null) {
+		return stateProps;
+	}
+
+	return {
+		...stateProps,
+		logDataBatch: (numGenRows: number, dataStr: string): GDAction => dispatch(packetActions.logDataBatch(packetId, numGenRows, dataStr))
+	};
+};
+
+export default connect(mapStateToProps, mapDispatchToProps, mergeProps)(Engine);
diff --git a/apps/client/src/core/generationPanel/GenerationSettings.component.tsx b/apps/client/src/core/generationPanel/GenerationSettings.component.tsx
new file mode 100644
index 000000000..e24482566
--- /dev/null
+++ b/apps/client/src/core/generationPanel/GenerationSettings.component.tsx
@@ -0,0 +1,186 @@
+import * as React from 'react';
+import { NumericFormat } from 'react-number-format';
+import Button from '@mui/material/Button';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import { getI18nString } from '@generatedata/utils/lang';
+import { getFormattedNum } from '@generatedata/utils/number';
+import styles from './ActivityPanel.scss';
+import sharedStyles from '../../styles/shared.scss';
+import { ErrorTooltip } from '~components/tooltips';
+import { MediumSpinner } from '~components/loaders/loaders';
+import Engine from './Engine.container';
+import { DataPacket } from '~store/packets/packets.reducer';
+import * as coreUtils from '../../utils/coreUtils';
+import CheckIcon from '@mui/icons-material/Check';
+import { GenerationWorkerActionType } from '~core/generator/generation.types';
+import clientConfig from '@generatedata/config/clientConfig';
+
+export type GenerationSettingsProps = {
+	visible: boolean;
+	packet: DataPacket | null;
+	isLoggedIn: boolean;
+	isGenerating: boolean;
+	onChangeNumRowsToGenerate: (numRows: number) => void;
+	onClose: () => void;
+	onGenerate: () => void;
+	onAbort: () => void;
+	onDownload: () => void;
+	numRowsToGenerate: number;
+	i18n: any;
+	stripWhitespace: boolean;
+	onToggleStripWhitespace: () => void;
+	workerResources: any;
+};
+
+const GenerationSettingsPanel = ({
+	visible,
+	isLoggedIn,
+	onClose,
+	i18n,
+	stripWhitespace,
+	numRowsToGenerate,
+	onChangeNumRowsToGenerate,
+	onToggleStripWhitespace,
+	onGenerate,
+	isGenerating,
+	packet,
+	onAbort,
+	onDownload
+}: GenerationSettingsProps) => {
+	let error = '';
+
+	if (!numRowsToGenerate) {
+		error = i18n.requiredField;
+	} else if (!isLoggedIn && numRowsToGenerate > clientConfig.appSettings.GD_MAX_DEMO_MODE_ROWS) {
+		error = getI18nString(i18n.overMaxAnonRows, [getFormattedNum(clientConfig.appSettings.GD_MAX_DEMO_MODE_ROWS)]);
+	}
+
+	const getEngine = () => {
+		if (!visible || !isGenerating) {
+			return null;
+		}
+
+		return <Engine />;
+	};
+
+	const getGenerationOverlay = () => {
+		if (!isGenerating || !packet) {
+			return null;
+		}
+
+		const { numGeneratedRows } = packet;
+
+		if (packet.numGeneratedRows === numRowsToGenerate) {
+			return (
+				<>
+					<div className={styles.generationOverlayBg} />
+					<div className={styles.generationComplete}>
+						<CheckIcon fontSize="large" />
+						{i18n.dataGenerated}
+					</div>
+				</>
+			);
+		}
+
+		return (
+			<>
+				<div className={styles.generationOverlayBg} />
+				<div className={styles.generationOverlay}>
+					<MediumSpinner style={{ margin: 15 }} />
+					<div className={styles.generationLabel}>
+						{i18n.generated} <b>{numGeneratedRows}</b> / <b>{numRowsToGenerate}</b>
+					</div>
+				</div>
+			</>
+		);
+	};
+
+	let buttonLabel = i18n.generate;
+	let actionButtonClick = onGenerate;
+	let actionButtonDisabled = !!error;
+
+	if (packet) {
+		if (packet.numGeneratedRows === numRowsToGenerate) {
+			buttonLabel = i18n.download;
+			actionButtonClick = onDownload;
+			actionButtonDisabled = false;
+		}
+	}
+
+	const closeModal = (): void => {
+		if (packet) {
+			const { generationWorkerId } = packet;
+			const generationWorker = coreUtils.getGenerationWorker(generationWorkerId);
+
+			onAbort();
+			onClose();
+			generationWorker.postMessage({
+				action: GenerationWorkerActionType.Abort
+			});
+			coreUtils.destroyGenerationWorker(generationWorkerId);
+		} else {
+			onClose();
+		}
+	};
+
+	let cancelButton: any = (
+		<Button onClick={closeModal} variant="text">
+			{i18n.cancel}
+		</Button>
+	);
+	if (packet && packet.numGeneratedRows === numRowsToGenerate) {
+		cancelButton = null;
+	}
+
+	return (
+		<>
+			<Dialog onClose={onClose} open={visible}>
+				<div style={{ width: 400 }}>
+					<DialogTitle onClose={closeModal}>{i18n.generate}</DialogTitle>
+					<DialogContent dividers className={styles.generationSettingsContent}>
+						{getGenerationOverlay()}
+						<div className={`${styles.row} ${styles.generationRow}`}>
+							{i18n.generate}
+							<ErrorTooltip title={error} arrow disableHoverListener={!error} disableFocusListener={!error}>
+								<NumericFormat
+									className={error ? sharedStyles.errorField : ''}
+									value={numRowsToGenerate}
+									displayType="input"
+									autoFocus
+									thousandSeparator={true}
+									onValueChange={({ value }): void => onChangeNumRowsToGenerate(parseInt(value, 10))}
+								/>
+							</ErrorTooltip>
+							{i18n.rows}
+						</div>
+						<div className={styles.row} style={{ marginBottom: 16 }}>
+							<input type="checkbox" id="stripWhitespace" checked={stripWhitespace} onChange={onToggleStripWhitespace} />
+							<label htmlFor="stripWhitespace">{i18n.stripWhitespace}</label>
+						</div>
+					</DialogContent>
+					<DialogActions>
+						<div style={{ display: 'flex', width: '100%' }}>
+							<div style={{ flex: 1 }} />
+							<div>
+								{cancelButton}
+								<Button
+									type="submit"
+									onClick={actionButtonClick}
+									color="primary"
+									disabled={actionButtonDisabled}
+									disableElevation
+									variant="contained"
+								>
+									{buttonLabel}
+								</Button>
+							</div>
+						</div>
+					</DialogActions>
+				</div>
+			</Dialog>
+			{getEngine()}
+		</>
+	);
+};
+
+export default GenerationSettingsPanel;
diff --git a/apps/client/src/core/generationPanel/GenerationSettings.container.tsx b/apps/client/src/core/generationPanel/GenerationSettings.container.tsx
new file mode 100644
index 000000000..c3b657cc0
--- /dev/null
+++ b/apps/client/src/core/generationPanel/GenerationSettings.container.tsx
@@ -0,0 +1,52 @@
+import { Action, Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import * as actions from '../store/generator/generator.actions';
+import * as packetActions from '../store/packets/packets.actions';
+import * as selectors from '../store/generator/generator.selectors';
+import GenerationSettings, { GenerationSettingsProps } from './GenerationSettings.component';
+import C from '@generatedata/config/constants';
+import * as packetSelectors from '~store/packets/packets.selectors';
+import { GDAction } from '~types/general';
+import { isLoggedIn } from '~store/main/main.selectors';
+
+const mapStateToProps = (state: any, ownProps: Partial<GenerationSettingsProps>): Partial<GenerationSettingsProps> => {
+	const packet = packetSelectors.getCurrentPacket(state);
+	const largePacketSize = !!packet && packet.config.numRowsToGenerate > C.SMALL_GENERATION_COUNT;
+
+	return {
+		packet,
+		visible: selectors.isGenerationSettingsPanelVisible(state),
+		isLoggedIn: isLoggedIn(state),
+		isGenerating: !largePacketSize && packetSelectors.isGenerating(state),
+		i18n: selectors.getCoreI18n(state),
+		numRowsToGenerate: selectors.getNumRowsToGenerate(state),
+		stripWhitespace: selectors.shouldStripWhitespace(state),
+		...ownProps
+	};
+};
+
+const mapDispatchToProps = (dispatch: Dispatch): { dispatch: any } => ({
+	dispatch
+});
+
+const mergeProps = ({ packetId, ...stateProps }: any, { dispatch }: any): GenerationSettingsProps => {
+	const props = {
+		...stateProps,
+		onClose: (): Action => dispatch(actions.hideStartGenerationPanel()),
+		onChangeNumRowsToGenerate: (numRows: number): Action => dispatch(actions.updateNumRowsToGenerate(numRows)),
+		onToggleStripWhitespace: (): Action => dispatch(actions.toggleStripWhitespace()),
+		onGenerate: (): Action => dispatch(packetActions.startGeneration())
+	};
+
+	if (stateProps.packet === null) {
+		return props;
+	}
+
+	return {
+		...props,
+		onAbort: (): GDAction => dispatch(packetActions.abortGeneration(packetId)),
+		onDownload: (): any => dispatch(packetActions.promptToDownload())
+	};
+};
+
+export default connect(mapStateToProps, mapDispatchToProps, mergeProps)(GenerationSettings);
diff --git a/apps/client/src/core/generationPanel/__tests__/ActivePacketsList.container.test.tsx b/apps/client/src/core/generationPanel/__tests__/ActivePacketsList.container.test.tsx
new file mode 100644
index 000000000..d4d0f69e5
--- /dev/null
+++ b/apps/client/src/core/generationPanel/__tests__/ActivePacketsList.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import ActivePacketsList from '../ActivePacketsList.container';
+import { renderWithStoreAndRouter } from '../../../../tests/testHelpers';
+
+describe('ActivePacketsList', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<ActivePacketsList />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/generationPanel/__tests__/ActivityPanel.container.test.tsx b/apps/client/src/core/generationPanel/__tests__/ActivityPanel.container.test.tsx
new file mode 100644
index 000000000..7af8e5ed6
--- /dev/null
+++ b/apps/client/src/core/generationPanel/__tests__/ActivityPanel.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import ActivityPanel from '../ActivityPanel.container';
+import { renderWithStoreAndRouter } from '../../../../tests/testHelpers';
+
+describe('ActivityPanel', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<ActivityPanel />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/generationPanel/__tests__/GenerationSettings.container.test.tsx b/apps/client/src/core/generationPanel/__tests__/GenerationSettings.container.test.tsx
new file mode 100644
index 000000000..060f996f2
--- /dev/null
+++ b/apps/client/src/core/generationPanel/__tests__/GenerationSettings.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import GenerationSettings from '../GenerationSettings.container';
+import { renderWithStoreAndRouter } from '../../../../tests/testHelpers';
+
+describe('GenerationSettings', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<GenerationSettings />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/generationPanel/__tests__/generation.helpers.test.ts b/apps/client/src/core/generationPanel/__tests__/generation.helpers.test.ts
new file mode 100644
index 000000000..f27e818a7
--- /dev/null
+++ b/apps/client/src/core/generationPanel/__tests__/generation.helpers.test.ts
@@ -0,0 +1,60 @@
+import { getRowGenerationRatePerSecond, getPercentageLabel } from '../generation.helpers';
+
+describe('getRowGenerationRatePerSecond', () => {
+	it('if exactly 1 second has gone by, the generation rate should be the exact generation count', () => {
+		expect(getRowGenerationRatePerSecond(0, 0, 1000, 123)).toEqual({ 1: 123 });
+		expect(getRowGenerationRatePerSecond(0, 1000, 2000, 55)).toEqual({ 2: 55 });
+	});
+
+	it('base time should be factored in and still return data in seconds', () => {
+		expect(getRowGenerationRatePerSecond(5000, 5000, 6000, 123)).toEqual({
+			1: 123
+		});
+		expect(getRowGenerationRatePerSecond(5000, 6000, 7000, 55)).toEqual({
+			2: 55
+		});
+	});
+
+	it('base time should be factored in', () => {
+		expect(getRowGenerationRatePerSecond(0, 5000, 6000, 10)).toEqual({ 6: 10 });
+		expect(getRowGenerationRatePerSecond(0, 6000, 7000, 19)).toEqual({ 7: 19 });
+	});
+
+	it('if exactly 2 seconds have passed, the generation rate is half the numRows passed', () => {
+		expect(getRowGenerationRatePerSecond(0, 0, 2000, 100)).toEqual({
+			1: 50,
+			2: 50
+		});
+		expect(getRowGenerationRatePerSecond(0, 0, 2000, 150)).toEqual({
+			1: 75,
+			2: 75
+		});
+		expect(getRowGenerationRatePerSecond(0, 0, 2000, 60)).toEqual({
+			1: 30,
+			2: 30
+		});
+	});
+
+	it('end fractions of a second are factored in', () => {
+		expect(getRowGenerationRatePerSecond(0, 0, 1500, 60)).toEqual({
+			1: 40,
+			2: 20
+		});
+	});
+
+	it('start fractions of a second are factored in', () => {
+		expect(getRowGenerationRatePerSecond(0, 500, 2000, 60)).toEqual({
+			1: 20,
+			2: 40
+		});
+	});
+});
+
+describe('getPercentageLabel', () => {
+	it('returns appropriate decimal places based on num generated', () => {
+		expect(getPercentageLabel(90, 1000)).toEqual('90');
+		expect(getPercentageLabel(90, 10000)).toEqual('90.0');
+		expect(getPercentageLabel(90, 100000)).toEqual('90.0');
+		expect(getPercentageLabel(90, 1000000)).toEqual('90.00');
+	});
+});
diff --git a/apps/client/src/core/generationPanel/generation.helpers.ts b/apps/client/src/core/generationPanel/generation.helpers.ts
new file mode 100644
index 000000000..62de134b9
--- /dev/null
+++ b/apps/client/src/core/generationPanel/generation.helpers.ts
@@ -0,0 +1,182 @@
+import { GenerationActivityPanel, LoadTimeGraphDuration } from '~types/general';
+import { ColumnData } from '@generatedata/plugins';
+import { affectedDataTypes } from '~utils/dataTypes';
+import C from '@generatedata/config/constants';
+import { UnchangedGenerationData } from '~types/generator';
+
+export const getPercentageLabel = (percentage: number, numRowsToGenerate: number): string => {
+	let decimalPlaces = 0;
+	if (numRowsToGenerate >= 1000000) {
+		decimalPlaces = 2;
+	} else if (numRowsToGenerate >= 10000) {
+		decimalPlaces = 1;
+	}
+	return percentage.toFixed(decimalPlaces);
+};
+
+export const getByteSize = (str: string): number => encodeURI(str).split(/%(?:u[0-9A-F]{2})?[0-9A-F]{2}|./).length - 1;
+
+export const downloadFile = (filename: string, data: any, type: string): void => {
+	const file = new Blob([data], { type: type });
+	const a = document.createElement('a');
+	const url = URL.createObjectURL(file);
+	a.href = url;
+	a.download = filename;
+	document.body.appendChild(a);
+	a.click();
+
+	setTimeout(() => {
+		document.body.removeChild(a);
+		window.URL.revokeObjectURL(url);
+	}, 0);
+};
+
+type secondCount = {
+	[second: number]: number;
+};
+
+// used in the stats generation. This does the job of figuring out the row generation rate per second. It returns
+// an object of the following form:
+//   {
+//         4: 30
+//         5: 50
+//         6: 14
+//   }
+// where the keys are a particular second, and the values are the number of rows generated for that second. It's up to the
+// consuming script to append that data to existing generated data. Note that since the start/end times for the generation
+// block almost certainly don't lie directly on the start second, second #4 would already have some number from the
+// previous batch
+export const getRowGenerationRatePerSecond = (
+	// this is the time the entire generation started. It'll remain fixed for an entire packet
+	baseTime: number,
+
+	// the time the batch was started
+	batchStartTime: number,
+
+	// the time this batch stopped generating
+	batchEndTime: number,
+
+	// how many rows were generated during the interval (will always be C.GENERATION_BATCH_SIZE)
+	numRows: number
+): secondCount => {
+	// the math below relies on this being correct otherwise we'll get stuck in an infinite loop
+	if (batchEndTime <= batchStartTime) {
+		throw Error('invalid data passed to getRowGenerationRatePerSecond()');
+	}
+
+	// calculate the time duration of a single row over the time duration
+	const singleRowTime = (batchEndTime - batchStartTime) / numRows;
+
+	// now split the duration into discrete seconds, and loop over them, figuring out how many would
+	let currTimeBlock = batchStartTime;
+	let currentSecond;
+	const result: secondCount = {};
+
+	while (true) {
+		const endOfCurrentSecondMs = Math.floor(Math.floor(currTimeBlock / 1000) * 1000) + 1000;
+
+		let secondDuration;
+		let shouldBreak = false;
+		if (endOfCurrentSecondMs >= batchEndTime) {
+			secondDuration = batchEndTime - currTimeBlock;
+			shouldBreak = true;
+		} else {
+			secondDuration = endOfCurrentSecondMs - currTimeBlock;
+		}
+
+		// now see how many of the rows could fit into this duration
+		const numRowsInCurrentDuration = secondDuration / singleRowTime;
+
+		const currentSecondMs = Math.floor(currTimeBlock - baseTime);
+		currentSecond = (currentSecondMs === 0 ? 0 : Math.floor(currentSecondMs / 1000)) + 1;
+		result[currentSecond] = parseFloat(numRowsInCurrentDuration.toFixed(2));
+
+		if (shouldBreak) {
+			break;
+		}
+
+		currTimeBlock += secondDuration;
+	}
+
+	return result;
+};
+
+/*
+ * Used for the preview panel only. When a user changes a row we need to figure out what rows to invalidate in the preview
+ * panel. Examples:
+ *  - A row change only affects itself. Just that row should be updated, all other rows can be marked as unchanged.
+ *  - A region row changes, and a city row depends on it. Here, both the region + city rows need to refresh.
+ *  - A county row changes, and 10 other rows are based on it. All 11 rows need to update.
+ *
+ * Note that this isn't as good as it could be. If a Region field changes, ALL City field get repainted - even if they're
+ * not mapped to the region that just changed. This is because we're not yet formally defining the relationships
+ * between the Data Types in a well-defined way. If we did that we could make this logic smarter. But right now, each
+ * data type maps to other data types in whatever way they find useful (e.g. a Composite field just referencing it
+ * via its Options field and entering a {{ROWX}} placeholder string).
+ */
+export const getUnchangedData = (
+	idsToRefresh: string[],
+	columns: (ColumnData & { id: string })[],
+	dataTypePreviewData: any
+): UnchangedGenerationData => {
+	if (!idsToRefresh.length) {
+		return {};
+	}
+
+	const columnsWithIndex = columns.map((col, colIndex) => ({
+		...col,
+		colIndex
+	}));
+
+	// first pass is to look at the list of IDs about to be refreshed, and get a list of data types in the
+	// grid that aren't affected by this change
+	const unchangedDataTypes: any = {};
+	columnsWithIndex
+		.filter((col) => idsToRefresh.indexOf(col.id) === -1)
+		.forEach((col) => {
+			unchangedDataTypes[col.dataType] = true;
+		});
+
+	// now loop through the changed row IDs and whittle down the list by examining any data types affected by those
+	// row changes
+	columnsWithIndex.forEach((col) => {
+		if (idsToRefresh.indexOf(col.id) !== -1) {
+			affectedDataTypes[col.dataType].forEach((dt: any) => {
+				if (unchangedDataTypes[dt]) {
+					delete unchangedDataTypes[dt];
+				}
+			});
+		}
+	});
+
+	const result: any = {};
+	columnsWithIndex
+		.filter((col) => {
+			// just for clarity, because this is kinda dense
+			const colIsNotAffectedDataType = unchangedDataTypes[col.dataType];
+			const isNotDirectlyChangedCol = idsToRefresh.indexOf(col.id) === -1;
+
+			return colIsNotAffectedDataType && isNotDirectlyChangedCol;
+		})
+		.map((col) => {
+			result[col.colIndex] = dataTypePreviewData[col.id];
+		});
+
+	return result;
+};
+
+export const getGenerationActivityPanel = (numRowsToGenerate: number): GenerationActivityPanel => {
+	return numRowsToGenerate > C.SMALL_GENERATION_COUNT ? GenerationActivityPanel.large : GenerationActivityPanel.small;
+};
+
+export const getGraphDuration = (numRowsToGenerate: number): LoadTimeGraphDuration => {
+	if (numRowsToGenerate < C.GRAPH_RANGES.RANGE1) {
+		return LoadTimeGraphDuration.all;
+	} else if (numRowsToGenerate < C.GRAPH_RANGES.RANGE2) {
+		return LoadTimeGraphDuration.s15;
+	} else if (numRowsToGenerate < C.GRAPH_RANGES.RANGE3) {
+		return LoadTimeGraphDuration.s30;
+	}
+
+	return LoadTimeGraphDuration.m1;
+};
diff --git a/apps/client/src/core/generator/Generator.component.tsx b/apps/client/src/core/generator/Generator.component.tsx
new file mode 100644
index 000000000..43af76a07
--- /dev/null
+++ b/apps/client/src/core/generator/Generator.component.tsx
@@ -0,0 +1,111 @@
+import React from 'react';
+import { useWindowSize } from 'react-hooks-window-size';
+import SplitPane from 'react-split-pane';
+import Grid from './grid/Grid.container';
+import Preview from './previewPanel/PreviewPanel.container';
+import { GeneratorPanel } from '~types/general';
+import ExportSettings from './exportSettings/ExportSettings.container';
+import ActivityPanel from '../generationPanel/ActivityPanel.container';
+import GenerationSettings from '../generationPanel/GenerationSettings.container';
+import TourDialog from '~core/dialogs/tourIntro/TourIntro.container';
+import DataSetHistory from './dataSetHistory/DataSetHistory.container';
+import HelpDialog from '../dialogs/help/HelpDialog.container';
+import ClearPageDialog from '../dialogs/clearPage/ClearPage.container';
+import SchemaDialog from '../dialogs/schema/Schema.container';
+import { GeneratorLayout } from '@generatedata/types';
+import C from '@generatedata/config/constants';
+import './Generator.scss';
+
+export type GeneratorProps = {
+	i18n: any;
+	isGridVisible: boolean;
+	isPreviewVisible: boolean;
+	generatorLayout: GeneratorLayout;
+	onResizePanels: (size: number) => void;
+	lastLayoutWidth: number | null;
+	lastLayoutHeight: number | null;
+	smallScreenVisiblePanel: GeneratorPanel;
+	showDataSetHistory: boolean;
+};
+
+const Builder = ({
+	isGridVisible,
+	isPreviewVisible,
+	generatorLayout,
+	onResizePanels,
+	lastLayoutWidth,
+	lastLayoutHeight,
+	smallScreenVisiblePanel,
+	showDataSetHistory,
+	i18n
+}: GeneratorProps) => {
+	const windowSize = useWindowSize();
+	const onResize = (size: number): void => onResizePanels(size);
+
+	let minSize: number;
+	let maxSize: number;
+	let defaultSize: number | string = '50%';
+	if (generatorLayout === GeneratorLayout.vertical) {
+		minSize = 350;
+		maxSize = windowSize.width - 350;
+		if (lastLayoutWidth) {
+			defaultSize = lastLayoutWidth < maxSize ? lastLayoutWidth : maxSize;
+		}
+	} else {
+		minSize = 100;
+		maxSize = windowSize.height - (C.HEADER_HEIGHT + C.FOOTER_HEIGHT) - 100;
+		if (lastLayoutHeight) {
+			defaultSize = lastLayoutHeight < maxSize ? lastLayoutHeight : maxSize;
+		}
+	}
+
+	const getContent = () => {
+		if (windowSize.width < C.SMALL_SCREEN_WIDTH) {
+			return smallScreenVisiblePanel === 'grid' ? <Grid /> : <Preview />;
+		}
+
+		// data set history only available on desktop
+		if (showDataSetHistory) {
+			return <Preview />;
+		}
+
+		if (isGridVisible && isPreviewVisible) {
+			return (
+				/* @ts-ignore-line */
+				<SplitPane
+					className="gdGridPanel"
+					split={generatorLayout}
+					minSize={minSize}
+					maxSize={maxSize}
+					defaultSize={defaultSize}
+					size={defaultSize}
+					onChange={onResize}
+				>
+					<Grid />
+					<Preview />
+				</SplitPane>
+			);
+		}
+		if (isGridVisible) {
+			return <Grid />;
+		}
+		return <Preview />;
+	};
+
+	return (
+		<>
+			<div style={{ height: '100%' }}>
+				<div style={{ height: '100%', position: 'relative' }}>{getContent()}</div>
+				<ExportSettings />
+				<DataSetHistory />
+				<GenerationSettings />
+				<ActivityPanel />
+				<TourDialog />
+				<ClearPageDialog />
+				<HelpDialog />
+				<SchemaDialog />
+			</div>
+		</>
+	);
+};
+export default Builder;
diff --git a/apps/client/src/core/generator/Generator.container.ts b/apps/client/src/core/generator/Generator.container.ts
new file mode 100644
index 000000000..a941d474b
--- /dev/null
+++ b/apps/client/src/core/generator/Generator.container.ts
@@ -0,0 +1,23 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import Generator, { GeneratorProps } from './Generator.component';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+import { GDAction } from '~types/general';
+
+const mapStateToProps = (state: any): Omit<GeneratorProps, 'onResizePanels'> => ({
+	i18n: selectors.getCoreI18n(state),
+	isGridVisible: selectors.isGridVisible(state),
+	isPreviewVisible: selectors.isPreviewVisible(state),
+	generatorLayout: selectors.getGeneratorLayout(state),
+	lastLayoutWidth: selectors.getLastLayoutWidth(state),
+	lastLayoutHeight: selectors.getLastLayoutHeight(state),
+	smallScreenVisiblePanel: selectors.getSmallScreenVisiblePanel(state),
+	showDataSetHistory: selectors.shouldShowDataSetHistory(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Pick<GeneratorProps, 'onResizePanels'> => ({
+	onResizePanels: (size: number): GDAction => dispatch(actions.setPanelSize(size))
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(Generator);
diff --git a/apps/client/src/core/generator/Generator.scss b/apps/client/src/core/generator/Generator.scss
new file mode 100644
index 000000000..927917b5a
--- /dev/null
+++ b/apps/client/src/core/generator/Generator.scss
@@ -0,0 +1,46 @@
+:global(.Pane2) {
+	max-width: 100%;
+	overflow: hidden;
+}
+
+:global(.Resizer) {
+	background-image: url('./images/bg.png');
+	z-index: 1;
+	box-sizing: border-box;
+	background-clip: padding-box;
+
+	&:global(.horizontal) {
+		flex: 0 0 auto;
+		height: 5px;
+		margin: 0;
+		cursor: row-resize;
+		width: 100%;
+
+		&:hover {
+			background-image: none;
+			background-color: #dddddd;
+		}
+	}
+
+	&:global(.vertical) {
+		width: 5px;
+		margin: 0;
+		cursor: col-resize;
+
+		&:hover {
+			background-image: none;
+			background-color: #dddddd;
+		}
+	}
+
+	&:hover(.disabled) {
+		cursor: not-allowed;
+	}
+}
+
+.controlRow {
+	display: flex;
+	flex-direction: row;
+	padding: 6px 10px;
+	justify-content: flex-end;
+}
diff --git a/apps/client/src/core/generator/Generator.scss.d.ts b/apps/client/src/core/generator/Generator.scss.d.ts
new file mode 100644
index 000000000..e5ea37047
--- /dev/null
+++ b/apps/client/src/core/generator/Generator.scss.d.ts
@@ -0,0 +1,13 @@
+declare namespace GeneratorScssNamespace {
+	export interface IGeneratorScss {
+		controlRow: string;
+		disabled: string;
+	}
+}
+
+declare const GeneratorScssModule: GeneratorScssNamespace.IGeneratorScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: GeneratorScssNamespace.IGeneratorScss;
+};
+
+export = GeneratorScssModule;
diff --git a/apps/client/src/core/generator/NOTES.md b/apps/client/src/core/generator/NOTES.md
new file mode 100644
index 000000000..33d34393d
--- /dev/null
+++ b/apps/client/src/core/generator/NOTES.md
@@ -0,0 +1,47 @@
+## Generator notes
+
+A few notes on how the current generator code works with the web workers so I can keep it straight in my head.
+
+**DataTypeWorker**
+
+1. core/generationPanel/Engine.component.tsx
+   - uses both dataTypeWorker and exportTypeWorker to generate the actual data. No in-between, just churns through them
+     passing off work from response of dataTypeWorker to exportTypeWorker.
+   - also providing pause, continue and set speed options. All done through dataTypeWorker. Weird.
+2. core/generationPanel/ActivityPanel.component.tsx
+   - allows aborting the process.
+   - uses dataTypeWorker to abort it. Again, weird.
+3. core/generationPanel/GenerationSettings.component.tsx
+   - aborts process on close.
+4. store/generator/generator.actions.ts
+   - Refresh panel action. This _separately_ calls dataTypeWorker to generate the data and persist in the store.
+   - it does some clever/dense stuff to figure out what's changed, then pass that into the dataTypeWorker so it
+     keeps the existing unchanged data.
+
+**ExportTypeWorker**
+
+1. CodeMirrorWrapper.component.tsx
+   - used in the previous panel for actually generating the preview string based on the stored preview data.
+
+**Backend code**
+
+- The backend code won't need 2 separate pieces for the data type + export type parts. It'll always be treating the
+  generation as a single action.
+- It also won't need the additional complexities of the preview panel stuff, but that can just be ignored.
+
+### Notes
+
+Having a separate dataTypeWorker and exportTypeWorker makes sense for the preview panel, which is what I initially
+wrote it for. But for the actual code generation it feels super clunky. Singling out the dataTypeWorker to cancel/pause/continue/set
+speed on the whole generation process is totally weird and hard to make sense of. Wouldn't be hard to just wrap an
+interface over this part... but keep the two separate for use elsewhere...
+
+Now that we're moving the bulk of the web workers into separate, runtime-free modules (web workers + node), the actual
+workers are super small. Combine into the single `generator.worker.ts` as originally planned and offer a more complex
+`action` interface to allow either interacting with the individual actions (data types, export types) or the general
+generation interface. I kinda like this...
+
+Note that this still means nested web workers. Whoah! https://bugs.webkit.org/show_bug.cgi?id=22723 - maybe
+Safari now supports it.
+
+\*\*\* Need to reconcile "template" with what we want to pass as the BE code interface.
diff --git a/apps/client/src/core/generator/__tests__/Generator.container.test.tsx b/apps/client/src/core/generator/__tests__/Generator.container.test.tsx
new file mode 100644
index 000000000..ba8b518cc
--- /dev/null
+++ b/apps/client/src/core/generator/__tests__/Generator.container.test.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import Generator from '../Generator.container';
+import { renderWithStoreAndRouter } from '../../../../tests/testHelpers';
+
+describe('Generator', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<Generator />);
+
+		// TODO bug here. The CSS modules classes are rendering as undefined... it's not the lib we're using: identify-obj-proxy
+		// also has the same issue.
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/generator/dataSetHistory/DataSetHistory.component.tsx b/apps/client/src/core/generator/dataSetHistory/DataSetHistory.component.tsx
new file mode 100644
index 000000000..fb82a9aeb
--- /dev/null
+++ b/apps/client/src/core/generator/dataSetHistory/DataSetHistory.component.tsx
@@ -0,0 +1,171 @@
+import React, { useEffect, useState } from 'react';
+import { format, fromUnixTime } from 'date-fns';
+import { TypedDocumentNode } from '@apollo/client';
+import { useQuery } from '@apollo/client/react';
+import Drawer from '@mui/material/Drawer';
+import InfoIcon from '@mui/icons-material/InfoOutlined';
+import HighlightOffIcon from '@mui/icons-material/HighlightOff';
+import { DefaultSpinner, Centered } from '~components/loaders/loaders';
+import { PrimaryButton, SecondaryButton } from '~components/Buttons.component';
+import { Tooltip } from '~components/tooltips';
+import * as queries from '~core/queries';
+import * as styles from './DataSetHistory.scss';
+import C from '@generatedata/config/constants';
+import { CurrentDataSet } from '~store/generator/generator.reducer';
+
+export type DataSetHistoryProps = {
+	showPanel: boolean;
+	dataSet: CurrentDataSet;
+	selectedDataSetHistoryItem: {
+		historyId: number | null;
+		isLatest: boolean;
+	};
+	setSelectedDataHistoryItem: (historyId: number, isLatest: boolean) => void;
+	closePanel: () => void;
+	loadHistoryVersion: (content: any) => void;
+	loadStashedVersion: () => void;
+	i18n: any;
+};
+
+const NUM_PER_PAGE = 200;
+const currentPage = 1;
+
+const Row = ({ rowLabel, dateCreated, content, loadHistoryVersion, isSelected, i18n, Btn }: any) => {
+	let classes = styles.row;
+	if (isSelected) {
+		classes += ` ${styles.selectedRow}`;
+	}
+
+	return (
+		<div className={classes}>
+			{rowLabel && <label>{rowLabel}</label>}
+			<div className={styles.rowWrapper}>
+				<div className={styles.dateCreated}>{format(fromUnixTime(dateCreated / 1000), C.DATETIME_FORMAT)}</div>
+				<div className={styles.edit}>
+					<Btn size="small" disabled={isSelected} onClick={(): void => loadHistoryVersion(content)}>
+						{i18n.view}
+					</Btn>
+				</div>
+			</div>
+		</div>
+	);
+};
+
+export const DataSetHistory = ({
+	showPanel,
+	dataSet,
+	closePanel,
+	loadHistoryVersion,
+	loadStashedVersion,
+	selectedDataSetHistoryItem,
+	setSelectedDataHistoryItem,
+	i18n
+}: DataSetHistoryProps): React.ReactElement | null => {
+	const { dataSetId, dataSetName, lastSaved } = dataSet;
+	const { historyId } = selectedDataSetHistoryItem;
+	const [called, setCalled] = useState(false);
+
+	const { data, loading, error, refetch } = useQuery(queries.GET_DATA_SET_HISTORY, {
+		fetchPolicy: 'cache-and-network',
+		variables: {
+			dataSetId,
+			offset: (currentPage - 1) * NUM_PER_PAGE,
+			limit: NUM_PER_PAGE
+		},
+		skip: !dataSetId || !showPanel
+	});
+
+	useEffect(() => {
+		if (!loading && !error) {
+			setCalled(true);
+		}
+	}, [loading, error]);
+
+	// need to clear the cache whenever the lastSaved changes
+	useEffect(() => {
+		if (called && showPanel && dataSetId) {
+			refetch();
+		}
+	}, [dataSetId, called, lastSaved, showPanel]);
+
+	if (!dataSetId) {
+		return null;
+	}
+
+	const loadVersion = (version: any, isLatest: boolean): void => {
+		const { historyId, content } = version;
+		setSelectedDataHistoryItem(historyId, isLatest);
+		loadHistoryVersion(content);
+	};
+
+	let content = null;
+
+	if (data?.dataSetHistory) {
+		if (data.dataSetHistory.totalCount === 0) {
+			content = <p>{i18n.noHistory}</p>;
+		} else {
+			const latestRow = data.dataSetHistory.results[0];
+
+			content = (
+				<>
+					<div className={styles.currentVersionRow}>
+						<Row
+							{...latestRow}
+							rowLabel={i18n.currentVersion}
+							key={latestRow.historyId}
+							loadHistoryVersion={loadStashedVersion}
+							isSelected={historyId === null}
+							i18n={i18n}
+							Btn={SecondaryButton}
+						/>
+					</div>
+					<div className={styles.rows}>
+						{data.dataSetHistory.results.map((row: any) => (
+							<Row
+								{...row}
+								className={styles.row}
+								key={row.historyId}
+								loadHistoryVersion={(): void => loadVersion(row, false)}
+								isSelected={row.historyId === historyId}
+								i18n={i18n}
+								Btn={PrimaryButton}
+							/>
+						))}
+					</div>
+				</>
+			);
+		}
+	}
+
+	let loader = null;
+	if (loading) {
+		loader = (
+			<Centered>
+				<DefaultSpinner />
+			</Centered>
+		);
+	}
+
+	return (
+		<Drawer open={showPanel} anchor="left" onClose={closePanel}>
+			<div className={`${styles.panel} tour-dataSetHistoryPanel`}>
+				<h2>
+					<span>{dataSetName}</span>
+					<Tooltip title={i18n.historyPanelDesc} arrow>
+						<InfoIcon />
+					</Tooltip>
+				</h2>
+				<section>
+					{loader}
+					{content}
+				</section>
+				<footer>
+					<PrimaryButton onClick={closePanel}>
+						<HighlightOffIcon />
+						{i18n.closePanel}
+					</PrimaryButton>
+				</footer>
+			</div>
+		</Drawer>
+	);
+};
diff --git a/apps/client/src/core/generator/dataSetHistory/DataSetHistory.container.ts b/apps/client/src/core/generator/dataSetHistory/DataSetHistory.container.ts
new file mode 100644
index 000000000..edb24e02c
--- /dev/null
+++ b/apps/client/src/core/generator/dataSetHistory/DataSetHistory.container.ts
@@ -0,0 +1,27 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import { DataSetHistory, DataSetHistoryProps } from './DataSetHistory.component';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+
+const mapStateToProps = (state: any): Pick<DataSetHistoryProps, 'i18n' | 'dataSet' | 'selectedDataSetHistoryItem' | 'showPanel'> => ({
+	i18n: selectors.getCoreI18n(state),
+	dataSet: selectors.getCurrentDataSet(state),
+	selectedDataSetHistoryItem: selectors.getSelectedDataSetHistoryItem(state),
+	showPanel: selectors.shouldShowDataSetHistory(state)
+});
+
+const mapDispatchToProps = (
+	dispatch: Dispatch
+): Pick<DataSetHistoryProps, 'closePanel' | 'setSelectedDataHistoryItem' | 'loadHistoryVersion' | 'loadStashedVersion'> => ({
+	closePanel: (): any => {
+		dispatch(actions.popStashedState());
+		dispatch(actions.hideDataSetHistory());
+	},
+	setSelectedDataHistoryItem: (historyId: number, isLatest: boolean): any =>
+		dispatch(actions.selectDataSetHistoryItem(historyId, isLatest)),
+	loadHistoryVersion: (content: any): any => dispatch(actions.loadDataSetHistoryItem(content)),
+	loadStashedVersion: (): any => dispatch(actions.loadStashedState())
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(DataSetHistory);
diff --git a/apps/client/src/core/generator/dataSetHistory/DataSetHistory.scss b/apps/client/src/core/generator/dataSetHistory/DataSetHistory.scss
new file mode 100644
index 000000000..5ba0cf01d
--- /dev/null
+++ b/apps/client/src/core/generator/dataSetHistory/DataSetHistory.scss
@@ -0,0 +1,136 @@
+@use '../../../styles/variables' as c;
+
+.panel {
+	display: flex;
+	flex-direction: column;
+	width: 400px;
+	height: 100%;
+
+	h2 {
+		display: flex;
+		align-items: center;
+		flex: 0 0 auto;
+		margin: 15px 20px;
+
+		span {
+			flex: 1;
+		}
+
+		svg {
+			margin-right: 5px;
+			font-size: 19px;
+			fill: #888888;
+		}
+	}
+
+	section {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: hidden;
+		padding: 0 20px;
+	}
+
+	footer {
+		flex: 0 0 auto;
+		padding: 15px;
+		button {
+			width: 100%;
+
+			svg {
+				margin-right: 5px;
+			}
+		}
+	}
+}
+
+.rows {
+	flex: 1;
+	overflow: auto;
+}
+
+.rowWrapper {
+	display: flex;
+	font-size: 13px;
+	align-items: center;
+}
+
+div.selectedRow {
+	border: 1px solid c.$primary-color;
+	background-color: c.$primary-pale-color;
+	border-radius: 4px;
+}
+
+.row {
+	padding: 6px;
+	border: 1px solid transparent;
+	transition: all 0.2s ease-in-out;
+
+	label {
+		color: #999999;
+		font-size: 11px;
+	}
+
+	.id {
+		margin-left: 10px;
+		flex: 0 1 50px;
+		color: #999999;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.dateCreated {
+		flex: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.edit {
+		margin-right: 10px;
+	}
+
+	.del {
+		flex: 0 0 30px;
+		align-items: center;
+		cursor: pointer;
+
+		&.disabled {
+			cursor: inherit;
+
+			svg {
+				opacity: 0.2;
+			}
+		}
+
+		&:hover {
+			svg {
+				fill: #990000;
+			}
+		}
+	}
+}
+
+button.dataSetHistoryBtnClass {
+	color: white;
+	border-color: white;
+
+	&:disabled {
+		color: white;
+		border-color: white;
+		opacity: 0.2;
+	}
+}
+
+.currentVersionRow {
+	flex: 0 0 auto;
+
+	.row {
+		border: 1px solid c.$secondary-color;
+		background-color: c.$secondary-pale-color;
+		color: c.$secondary-dark-color;
+		margin-bottom: 10px;
+		border-radius: 4px;
+	}
+}
diff --git a/apps/client/src/core/generator/dataSetHistory/DataSetHistory.scss.d.ts b/apps/client/src/core/generator/dataSetHistory/DataSetHistory.scss.d.ts
new file mode 100644
index 000000000..798d06da2
--- /dev/null
+++ b/apps/client/src/core/generator/dataSetHistory/DataSetHistory.scss.d.ts
@@ -0,0 +1,23 @@
+declare namespace DataSetHistoryScssNamespace {
+	export interface IDataSetHistoryScss {
+		currentVersionRow: string;
+		dataSetHistoryBtnClass: string;
+		dateCreated: string;
+		del: string;
+		disabled: string;
+		edit: string;
+		id: string;
+		panel: string;
+		row: string;
+		rowWrapper: string;
+		rows: string;
+		selectedRow: string;
+	}
+}
+
+declare const DataSetHistoryScssModule: DataSetHistoryScssNamespace.IDataSetHistoryScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: DataSetHistoryScssNamespace.IDataSetHistoryScss;
+};
+
+export = DataSetHistoryScssModule;
diff --git a/apps/client/src/core/generator/dataSetHistory/PanelButtons.component.tsx b/apps/client/src/core/generator/dataSetHistory/PanelButtons.component.tsx
new file mode 100644
index 000000000..7b8db6894
--- /dev/null
+++ b/apps/client/src/core/generator/dataSetHistory/PanelButtons.component.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { PreviewPanelButton } from '~components/Buttons.component';
+import * as styles from './DataSetHistory.scss';
+
+export type PanelButtonsProps = {
+	selectVersion: () => void;
+	selectedDataSetHistoryItem: {
+		historyId: number | null;
+		isLatest: boolean;
+	};
+	i18n: any;
+};
+
+export const PanelButtons = ({ selectVersion, selectedDataSetHistoryItem, i18n }: PanelButtonsProps) => {
+	const { isLatest } = selectedDataSetHistoryItem;
+
+	return (
+		<div>
+			<PreviewPanelButton onClick={selectVersion} className={styles.dataSetHistoryBtnClass} disabled={isLatest}>
+				{i18n.revertToVersion}
+			</PreviewPanelButton>
+		</div>
+	);
+};
diff --git a/apps/client/src/core/generator/dataSetHistory/PanelButtons.container.ts b/apps/client/src/core/generator/dataSetHistory/PanelButtons.container.ts
new file mode 100644
index 000000000..0233b1853
--- /dev/null
+++ b/apps/client/src/core/generator/dataSetHistory/PanelButtons.container.ts
@@ -0,0 +1,16 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import { PanelButtons, PanelButtonsProps } from './PanelButtons.component';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+
+const mapStateToProps = (state: any): Pick<PanelButtonsProps, 'i18n' | 'selectedDataSetHistoryItem'> => ({
+	i18n: selectors.getCoreI18n(state),
+	selectedDataSetHistoryItem: selectors.getSelectedDataSetHistoryItem(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Pick<PanelButtonsProps, 'selectVersion'> => ({
+	selectVersion: (): any => dispatch(actions.revertToHistoryVersion())
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(PanelButtons);
diff --git a/apps/client/src/core/generator/exportSettings/ExportSettings.component.tsx b/apps/client/src/core/generator/exportSettings/ExportSettings.component.tsx
new file mode 100644
index 000000000..ca0ade93e
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/ExportSettings.component.tsx
@@ -0,0 +1,51 @@
+import * as React from 'react';
+import HighlightOffIcon from '@mui/icons-material/HighlightOff';
+import Button from '@mui/material/Button';
+import Drawer from '@mui/material/Drawer';
+import Tabs from '@mui/material/Tabs';
+import Tab from '@mui/material/Tab';
+import PreviewSettingsTab from './PreviewSettingsTab.container';
+import ExportTypeTab from './ExportTypeTab.container';
+import * as styles from './ExportSettings.scss';
+
+export type ExportSettingsProps = {
+	i18n: any;
+	showExportSettings: boolean;
+	toggleExportSettings: any;
+};
+
+export const ExportSettings = ({ i18n, showExportSettings, toggleExportSettings }: ExportSettingsProps): React.ReactElement => {
+	const [selectedTabIndex, setSelectedTabIndex] = React.useState(0);
+	const handleChange = (e: React.ChangeEvent<{}>, newValue: number): void => setSelectedTabIndex(newValue);
+	const getTab = () => {
+		if (selectedTabIndex === 0) {
+			return <ExportTypeTab />;
+		} else {
+			return <PreviewSettingsTab />;
+		}
+	};
+
+	return (
+		<Drawer open={showExportSettings} anchor="left" onClose={toggleExportSettings}>
+			<div className={`${styles.panel} tour-exportTypePanel`}>
+				<Tabs
+					value={selectedTabIndex}
+					indicatorColor="primary"
+					textColor="primary"
+					onChange={handleChange}
+					className="tour-exportTypePanelTabs"
+				>
+					<Tab label={i18n.settings} />
+					<Tab label={i18n.preview} />
+				</Tabs>
+				<section>{getTab()}</section>
+				<footer>
+					<Button onClick={toggleExportSettings} variant="outlined" color="primary" disableElevation>
+						<HighlightOffIcon />
+						{i18n.closePanel}
+					</Button>
+				</footer>
+			</div>
+		</Drawer>
+	);
+};
diff --git a/apps/client/src/core/generator/exportSettings/ExportSettings.container.ts b/apps/client/src/core/generator/exportSettings/ExportSettings.container.ts
new file mode 100644
index 000000000..fb826b7d2
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/ExportSettings.container.ts
@@ -0,0 +1,16 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import { ExportSettings, ExportSettingsProps } from './ExportSettings.component';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+
+const mapStateToProps = (state: any): Pick<ExportSettingsProps, 'i18n' | 'showExportSettings'> => ({
+	i18n: selectors.getCoreI18n(state),
+	showExportSettings: selectors.shouldShowExportSettings(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Pick<ExportSettingsProps, 'toggleExportSettings'> => ({
+	toggleExportSettings: (): any => dispatch(actions.toggleExportSettings())
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(ExportSettings);
diff --git a/apps/client/src/core/generator/exportSettings/ExportSettings.scss b/apps/client/src/core/generator/exportSettings/ExportSettings.scss
new file mode 100644
index 000000000..4abc4a779
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/ExportSettings.scss
@@ -0,0 +1,71 @@
+@use '../../../styles/variables';
+
+.tabContent {
+	padding: 20px;
+}
+
+.row {
+	display: flex;
+	flex-direction: row;
+	height: 40px;
+	align-items: center;
+}
+
+.label {
+	flex: 0 0 180px;
+}
+
+.field {
+	flex: 1;
+}
+
+.panelHorizontal {
+	width: 100%;
+}
+
+.panel {
+	display: flex;
+	flex-direction: column;
+	width: 400px;
+	height: 100%;
+
+	button {
+		width: 50%;
+	}
+	section {
+		flex: 1;
+	}
+	footer {
+		padding: 15px;
+		button {
+			width: 100%;
+
+			svg {
+				margin-right: 5px;
+			}
+		}
+	}
+}
+
+.exportFormatRow {
+	background-image: url('./images/bg.png');
+	padding: 10px;
+	margin-bottom: 10px;
+	border-radius: 5px;
+	height: inherit;
+	.label {
+		font-size: 14px;
+		flex: 0 0 140px;
+	}
+}
+
+.spinner {
+	position: absolute;
+	top: calc(50% - 40px);
+	left: calc(50% - 40px);
+
+	&.fadeOut {
+		opacity: 0;
+		transition: opacity 0.25s ease-in-out;
+	}
+}
diff --git a/apps/client/src/core/generator/exportSettings/ExportSettings.scss.d.ts b/apps/client/src/core/generator/exportSettings/ExportSettings.scss.d.ts
new file mode 100644
index 000000000..262460737
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/ExportSettings.scss.d.ts
@@ -0,0 +1,20 @@
+declare namespace ExportSettingsScssNamespace {
+	export interface IExportSettingsScss {
+		exportFormatRow: string;
+		fadeOut: string;
+		field: string;
+		label: string;
+		panel: string;
+		panelHorizontal: string;
+		row: string;
+		spinner: string;
+		tabContent: string;
+	}
+}
+
+declare const ExportSettingsScssModule: ExportSettingsScssNamespace.IExportSettingsScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: ExportSettingsScssNamespace.IExportSettingsScss;
+};
+
+export = ExportSettingsScssModule;
diff --git a/apps/client/src/core/generator/exportSettings/ExportSettings.types.ts b/apps/client/src/core/generator/exportSettings/ExportSettings.types.ts
new file mode 100644
index 000000000..3995cb1e7
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/ExportSettings.types.ts
@@ -0,0 +1 @@
+export type ExportSettingsTab = 'exportType' | 'previewPanel';
diff --git a/apps/client/src/core/generator/exportSettings/ExportTypeTab.component.tsx b/apps/client/src/core/generator/exportSettings/ExportTypeTab.component.tsx
new file mode 100644
index 000000000..75386dce5
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/ExportTypeTab.component.tsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import { getGroupedExportTypes } from '~utils/exportTypes';
+import * as styles from './ExportSettings.scss';
+import { ExportSettingsTab } from './ExportSettings.types';
+import { MediumSpinner } from '~components/loaders/loaders';
+
+export type ExportTypeTabProps = {
+	exportType: string;
+	i18n: any;
+	exportTypeI18n: any;
+	onChangeExportType: (exportType: string) => void;
+	onUpdate: any;
+	exportSettingsTab: ExportSettingsTab;
+	SettingsComponent: any;
+	exportTypeSettings: any;
+};
+
+export const ExportTypeTab = ({
+	exportType,
+	i18n,
+	exportTypeI18n,
+	onChangeExportType,
+	SettingsComponent,
+	onUpdate,
+	exportTypeSettings
+}: ExportTypeTabProps) => {
+	let spinnerStyles = styles.spinner;
+	if (SettingsComponent) {
+		spinnerStyles += ` ${styles.fadeOut}`;
+	}
+
+	return (
+		<div className={`${styles.tabContent} tour-exportTypeTabContent`}>
+			<div className={`${styles.row} ${styles.exportFormatRow}`}>
+				<div className={styles.label}>{i18n.format}</div>
+				<div className={`${styles.field} tour-exportTypeDropdown`}>
+					<div style={{ width: 180 }}>
+						<Dropdown
+							isGrouped={true}
+							value={exportType}
+							options={getGroupedExportTypes()}
+							onChange={({ value }: DropdownOption): any => onChangeExportType(value)}
+						/>
+					</div>
+				</div>
+			</div>
+
+			<div className="tour-exportTypeSettings">
+				{SettingsComponent ? (
+					<SettingsComponent
+						id={`exportTypeSettings-${exportType}`}
+						coreI18n={i18n}
+						i18n={exportTypeI18n}
+						onUpdate={onUpdate}
+						data={exportTypeSettings}
+					/>
+				) : null}
+			</div>
+			<MediumSpinner className={spinnerStyles} />
+		</div>
+	);
+};
diff --git a/apps/client/src/core/generator/exportSettings/ExportTypeTab.container.ts b/apps/client/src/core/generator/exportSettings/ExportTypeTab.container.ts
new file mode 100644
index 000000000..2da863d5d
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/ExportTypeTab.container.ts
@@ -0,0 +1,39 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import { ExportTypeTab, ExportTypeTabProps } from './ExportTypeTab.component';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+import { getExportTypeSettingsComponent } from '~utils/exportTypes';
+import { ExportTypeFolder } from '@generatedata/plugins';
+
+const mapStateToProps = (
+	state: any
+): Pick<
+	ExportTypeTabProps,
+	'exportType' | 'exportSettingsTab' | 'i18n' | 'exportTypeI18n' | 'exportTypeSettings' | 'SettingsComponent'
+> => {
+	const exportType = selectors.getExportType(state);
+	let exportTypeI18n = selectors.getExportTypeI18n(state);
+
+	if (exportTypeI18n !== null && exportTypeI18n[exportType]) {
+		exportTypeI18n = exportTypeI18n[exportType];
+	}
+	const exportTypeSettings = selectors.getExportTypeSettings(state);
+	const settings = exportTypeSettings[exportType] ? exportTypeSettings[exportType] : {};
+
+	return {
+		exportType,
+		exportSettingsTab: selectors.getExportSettingsTab(state),
+		i18n: selectors.getCoreI18n(state),
+		exportTypeI18n,
+		exportTypeSettings: settings,
+		SettingsComponent: getExportTypeSettingsComponent(exportType)
+	};
+};
+
+const mapDispatchToProps = (dispatch: Dispatch): Pick<ExportTypeTabProps, 'onChangeExportType' | 'onUpdate'> => ({
+	onChangeExportType: (exportType: string) => dispatch(actions.onSelectExportType(exportType as ExportTypeFolder)),
+	onUpdate: (data: any): any => dispatch(actions.configureExportType(data))
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(ExportTypeTab);
diff --git a/apps/client/src/core/generator/exportSettings/PreviewSettingsTab.component.tsx b/apps/client/src/core/generator/exportSettings/PreviewSettingsTab.component.tsx
new file mode 100644
index 000000000..a1b70dfea
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/PreviewSettingsTab.component.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import Dropdown from '~components/dropdown/Dropdown';
+import Switch from '@mui/material/Switch';
+import { getArrayOfSize } from '@generatedata/utils/array';
+import * as styles from './ExportSettings.scss';
+import C from '@generatedata/config/constants';
+
+export type PreviewSettingsTabProps = {
+	theme: string;
+	numPreviewRows: number;
+	showLineNumbers: boolean;
+	enableLineWrapping: boolean;
+	previewTextSize: number;
+	onChangeTheme: Function;
+	toggleLineNumbers: Function;
+	toggleLineWrapping: Function;
+	onChangePreviewTextSize: Function;
+	updateNumPreviewRows: Function;
+	i18n: any;
+};
+
+const previewRowOptions = getArrayOfSize(C.MAX_PREVIEW_ROWS - C.MIN_PREVIEW_ROWS + 1).map((_i: any, index: number) => {
+	const rowNum = index + C.MIN_PREVIEW_ROWS;
+	return {
+		value: rowNum,
+		label: rowNum
+	};
+});
+
+export const PreviewSettingsTab = ({
+	theme,
+	numPreviewRows,
+	showLineNumbers,
+	enableLineWrapping,
+	previewTextSize,
+	onChangeTheme,
+	toggleLineNumbers,
+	toggleLineWrapping,
+	onChangePreviewTextSize,
+	updateNumPreviewRows,
+	i18n
+}: PreviewSettingsTabProps) => {
+	return (
+		<div className={styles.tabContent}>
+			<div className={styles.row}>
+				<div className={styles.label}>{i18n.theme}</div>
+				<div className={styles.field}>
+					<Dropdown value={theme} options={C.THEMES} onChange={({ value }: any): void => onChangeTheme(value)} />
+				</div>
+			</div>
+			<div className={styles.row}>
+				<div className={styles.label}>{i18n.showLineNumbers}</div>
+				<div className={styles.field}>
+					<Switch checked={showLineNumbers} value="checked" color="primary" onChange={(): void => toggleLineNumbers()} />
+				</div>
+			</div>
+			<div className={styles.row}>
+				<div className={styles.label}>{i18n.lineWrapping}</div>
+				<div className={styles.field}>
+					<Switch checked={enableLineWrapping} value="checked" color="primary" onChange={(): void => toggleLineWrapping()} />
+				</div>
+			</div>
+			<div className={styles.row}>
+				<div className={styles.label}>{i18n.textSize}</div>
+				<div className={styles.field}>
+					<input
+						type="number"
+						value={previewTextSize}
+						style={{ width: 60 }}
+						onChange={(e: any): void => onChangePreviewTextSize(parseInt(e.target.value, 10))}
+					/>
+				</div>
+			</div>
+			<div className={styles.row}>
+				<div className={styles.label}>{i18n.previewRows}</div>
+				<div className={styles.field}>
+					<div style={{ width: 120 }}>
+						<Dropdown value={numPreviewRows} onChange={(item: any): any => updateNumPreviewRows(item.value)} options={previewRowOptions} />
+					</div>
+				</div>
+			</div>
+		</div>
+	);
+};
diff --git a/apps/client/src/core/generator/exportSettings/PreviewSettingsTab.container.ts b/apps/client/src/core/generator/exportSettings/PreviewSettingsTab.container.ts
new file mode 100644
index 000000000..0dbb8f433
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/PreviewSettingsTab.container.ts
@@ -0,0 +1,29 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import { PreviewSettingsTab, PreviewSettingsTabProps } from './PreviewSettingsTab.component';
+import * as generatorSelectors from '~store/generator/generator.selectors';
+import * as generatorActions from '~store/generator/generator.actions';
+
+const mapStateToProps = (state: any): Partial<PreviewSettingsTabProps> => ({
+	i18n: generatorSelectors.getCoreI18n(state),
+	numPreviewRows: generatorSelectors.getNumPreviewRows(state),
+	showLineNumbers: generatorSelectors.shouldShowLineNumbers(state),
+	enableLineWrapping: generatorSelectors.shouldEnableLineWrapping(state),
+	theme: generatorSelectors.getTheme(state),
+	previewTextSize: generatorSelectors.getPreviewTextSize(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Partial<PreviewSettingsTabProps> => ({
+	onChangeTheme: (theme: string): any => dispatch(generatorActions.changeTheme(theme)),
+	toggleLineNumbers: (): any => dispatch(generatorActions.toggleShowLineNumbers()),
+	toggleLineWrapping: (): any => dispatch(generatorActions.toggleLineWrapping()),
+	onChangePreviewTextSize: (size: number): any => dispatch(generatorActions.setPreviewTextSize(size)),
+	updateNumPreviewRows: (numRows: number): any => dispatch(generatorActions.updateNumPreviewRows(numRows))
+});
+
+export default connect(
+	mapStateToProps,
+	mapDispatchToProps
+
+	// @ts-ignore
+)(PreviewSettingsTab);
diff --git a/apps/client/src/core/generator/exportSettings/__tests__/ExportSettings.container.test.tsx b/apps/client/src/core/generator/exportSettings/__tests__/ExportSettings.container.test.tsx
new file mode 100644
index 000000000..bcc34bb26
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/__tests__/ExportSettings.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import ExportSettings from '../ExportSettings.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('ExportSettings', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<ExportSettings />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/generator/exportSettings/__tests__/ExportTypeTab.container.test.tsx b/apps/client/src/core/generator/exportSettings/__tests__/ExportTypeTab.container.test.tsx
new file mode 100644
index 000000000..e73902f63
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/__tests__/ExportTypeTab.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import ExportTypeTab from '../ExportTypeTab.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('ExportTypeTab', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<ExportTypeTab />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/generator/exportSettings/__tests__/PreviewSettingsTab.container.test.tsx b/apps/client/src/core/generator/exportSettings/__tests__/PreviewSettingsTab.container.test.tsx
new file mode 100644
index 000000000..5caa6b3ba
--- /dev/null
+++ b/apps/client/src/core/generator/exportSettings/__tests__/PreviewSettingsTab.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import PreviewSettingsTab from '../PreviewSettingsTab.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('ExportTypeTab', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<PreviewSettingsTab />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/generator/generation.types.ts b/apps/client/src/core/generator/generation.types.ts
new file mode 100644
index 000000000..42b52af16
--- /dev/null
+++ b/apps/client/src/core/generator/generation.types.ts
@@ -0,0 +1,103 @@
+import { GenerationTemplate } from '~types/general';
+import { UnchangedGenerationData } from '~types/generator';
+import { CountryDataType } from '@generatedata/types';
+import { CountryNamesMap, DataTypeMap } from '@generatedata/plugins';
+
+export enum GenerationWorkerActionType {
+	Generate = 'GENERATE',
+	ProcessDataTypesOnly = 'PROCESS_DATA_TYPES_ONLY',
+	ProcessExportTypeOnly = 'PROCESS_EXPORT_TYPES_ONLY',
+	Pause = 'PAUSE',
+	Abort = 'ABORT',
+	Continue = 'CONTINUE',
+	SetSpeed = 'SET_SPEED',
+	DataTypesProcessed = 'DATA_TYPES_PROCESSED',
+	ExportTypeProcessed = 'EXPORT_TYPE_PROCESSED'
+}
+
+export type ProcessDataTypesOnlyAction = {
+	data: {
+		action: GenerationWorkerActionType.ProcessDataTypesOnly;
+		numResults: number;
+		batchSize: number;
+		unchanged: UnchangedGenerationData;
+		columns: any; // TODO
+		i18n: any;
+		template: GenerationTemplate;
+		countryNames: CountryNamesMap;
+		workerUtilsUrl: string;
+		dataTypeWorkerMap: DataTypeMap;
+		countryData: CountryDataType;
+	};
+};
+
+export type ProcessExportTypeOnlyAction = {
+	data: {
+		action: GenerationWorkerActionType.ProcessExportTypeOnly;
+		rows: any; // TODO
+		columns: any; // TODO
+		isFirstBatch: boolean;
+		isLastBatch: boolean;
+		currentBatch: number;
+		batchSize: number;
+		numResults: number;
+		exportTypeSettings: any;
+		stripWhitespace: boolean;
+		workerUtilsUrl: string;
+		exportTypeWorkerUrl: string;
+	};
+};
+
+export type GenerateAction = {
+	data: {
+		action: GenerationWorkerActionType.Generate;
+		numResults: number;
+		batchSize: number;
+		speed: number;
+		columns: any; // TODO
+		i18n: any;
+		template: GenerationTemplate;
+		countryData: CountryDataType;
+		countryNames: CountryNamesMap;
+		workerUtilsUrl: string;
+		exportTypeWorkerUrl: string;
+		dataTypeWorkerMap: DataTypeMap;
+		exportTypeSettings: any;
+		stripWhitespace: boolean;
+		logDataBatch: () => void; // TODO
+	};
+};
+
+export type PauseAction = {
+	data: {
+		action: GenerationWorkerActionType.Pause;
+	};
+};
+
+export type AbortAction = {
+	data: {
+		action: GenerationWorkerActionType.Abort;
+	};
+};
+
+export type ContinueAction = {
+	data: {
+		action: GenerationWorkerActionType.Continue;
+	};
+};
+
+export type SetSpeedAction = {
+	data: {
+		action: GenerationWorkerActionType.SetSpeed;
+		speed: number;
+	};
+};
+
+export type GenerationActions =
+	| ProcessDataTypesOnlyAction
+	| ProcessExportTypeOnlyAction
+	| GenerateAction
+	| AbortAction
+	| PauseAction
+	| ContinueAction
+	| SetSpeedAction;
diff --git a/apps/client/src/core/generator/generation.worker.ts b/apps/client/src/core/generator/generation.worker.ts
new file mode 100644
index 000000000..f94675999
--- /dev/null
+++ b/apps/client/src/core/generator/generation.worker.ts
@@ -0,0 +1,159 @@
+import generatorUtils from '../../utils/generatorUtils';
+import { GenerationActions, GenerationWorkerActionType } from '~core/generator/generation.types';
+import { DataTypeBatchGeneratedPayload, DataTypeWorkerInterface, WorkerInterface } from '~types/generator';
+import { DataTypeMap } from '@generatedata/plugins';
+
+const context: Worker = self as any;
+const workerCache: any = {};
+
+context.onmessage = (e: GenerationActions) => {
+	if (e.data.action === GenerationWorkerActionType.Pause) {
+		generatorUtils.pause();
+	} else if (e.data.action === GenerationWorkerActionType.Abort) {
+		generatorUtils.pause();
+	} else if (e.data.action === GenerationWorkerActionType.Continue) {
+		generatorUtils.continue();
+	} else if (e.data.action === GenerationWorkerActionType.SetSpeed) {
+		generatorUtils.setSpeed(e.data.speed);
+	} else if (e.data.action === GenerationWorkerActionType.ProcessDataTypesOnly) {
+		generatorUtils.generateDataTypes({
+			...e.data,
+			onBatchComplete: (data: DataTypeBatchGeneratedPayload) => {
+				context.postMessage({
+					event: GenerationWorkerActionType.DataTypesProcessed,
+					data
+				});
+			},
+			dataTypeInterface: getDataTypeWorkerInterface(e.data.dataTypeWorkerMap)
+		});
+	} else if (e.data.action === GenerationWorkerActionType.ProcessExportTypeOnly) {
+		generatorUtils.generateExportTypes({
+			...e.data,
+			settings: e.data.exportTypeSettings,
+			onComplete: (data: string) => {
+				context.postMessage({
+					event: GenerationWorkerActionType.ExportTypeProcessed,
+					data
+				});
+			},
+			exportTypeInterface: getWorkerInterface(e.data.exportTypeWorkerUrl)
+		});
+
+		// this worker action combines the two above for easier usage. Used in the generator where it doesn't need such
+		// granular control as with the preview panel
+	} else if (e.data.action === GenerationWorkerActionType.Generate) {
+		// TODO move whole chunk to generatorUtils ...
+		const {
+			columns,
+			numResults,
+			batchSize,
+			i18n,
+			template,
+			countryNames,
+			workerUtilsUrl,
+			countryData,
+			stripWhitespace,
+			exportTypeSettings,
+			exportTypeWorkerUrl,
+			dataTypeWorkerMap
+		} = e.data;
+
+		const onBatchComplete = ({ completedBatchNum, numGeneratedRows, generatedData }: any): void => {
+			const isLastBatch = numGeneratedRows >= numResults;
+			const displayData = generatedData.map((row: any) => row.map((i: any) => i.display));
+
+			generatorUtils.generateExportTypes({
+				numResults,
+				isFirstBatch: completedBatchNum === 1,
+				isLastBatch,
+				currentBatch: completedBatchNum,
+				batchSize,
+				rows: displayData,
+				columns,
+				stripWhitespace,
+				settings: exportTypeSettings,
+				workerUtilsUrl,
+				onComplete: (data: string) => {
+					context.postMessage({
+						event: GenerationWorkerActionType.ExportTypeProcessed,
+						numGeneratedRows,
+						data
+					});
+				},
+				exportTypeInterface: getWorkerInterface(exportTypeWorkerUrl)
+			});
+		};
+
+		generatorUtils.generateDataTypes({
+			numResults,
+			batchSize,
+			i18n,
+			template,
+			countryNames,
+			workerUtilsUrl,
+			countryData,
+			onBatchComplete,
+			dataTypeInterface: getDataTypeWorkerInterface(dataTypeWorkerMap)
+		});
+	}
+};
+
+// this standardizes the interface for communication between the workers, allowing generatorUtils to work for both
+// workers + backend code
+interface GetWorkerInterface {
+	(workerMap: DataTypeMap): DataTypeWorkerInterface;
+}
+
+// this standardizes the interface for communication between the workers, allowing generatorUtils to work for both
+// workers + backend code
+const getDataTypeWorkerInterface: GetWorkerInterface = (workerMap) => {
+	const workerInterface: DataTypeWorkerInterface = {};
+	Object.keys(workerMap).forEach((plugin) => {
+		// @ts-ignore
+		workerInterface[plugin] = getWorkerInterface(workerMap[plugin]);
+	});
+	return workerInterface;
+};
+
+const getWorkerInterface = (workerPath: string): WorkerInterface => {
+	let workerInterface: WorkerInterface;
+
+	if (workerCache[workerPath]) {
+		workerInterface = workerCache[workerPath];
+	} else {
+		const worker = new Worker(workerPath);
+
+		let onSuccess: any;
+		const onRegisterSuccess = (f: any) => (onSuccess = f);
+		worker.onmessage = (resp: any) => {
+			// TODO typings
+			if (onSuccess) {
+				onSuccess(resp);
+			}
+		};
+
+		let onError: any;
+		const onRegisterError = (f: any) => (onError = f);
+		worker.onerror = (resp: any) => {
+			if (onError) {
+				onError(resp);
+			}
+		};
+
+		workerInterface = {
+			context: 'worker',
+			send: worker.postMessage,
+			onSuccess: onRegisterSuccess,
+			onError: onRegisterError
+		};
+
+		// bind the method to this new worker, not the main generation worker (i.e. this file)
+		workerInterface.send = workerInterface.send.bind(worker);
+
+		workerCache[workerPath] = workerInterface;
+	}
+
+	return workerInterface;
+};
+
+export {};
diff --git a/apps/client/src/core/generator/grid/Grid.component.tsx b/apps/client/src/core/generator/grid/Grid.component.tsx
new file mode 100644
index 000000000..6b72b5590
--- /dev/null
+++ b/apps/client/src/core/generator/grid/Grid.component.tsx
@@ -0,0 +1,119 @@
+import React, { useMemo } from 'react';
+import { DragDropContext, Droppable } from 'react-beautiful-dnd';
+import { useWindowSize } from 'react-hooks-window-size';
+import CloseIcon from '@mui/icons-material/Close';
+import IconButton from '@mui/material/IconButton';
+import * as styles from './Grid.scss';
+import { Tooltip } from '~components/tooltips';
+import { PrimaryButton } from '~components/Buttons.component';
+import { DataRow } from '~store/generator/generator.reducer';
+import { DataTypeFolder } from '@generatedata/plugins';
+import GridRow from './GridRow.container';
+import C from '@generatedata/config/constants';
+import { useMeasure } from '@uidotdev/usehooks';
+
+export type GridProps = {
+	rows: DataRow[];
+	onAddRows: (numRows: number) => void;
+	onSort: (id: string, newIndex: number) => void;
+	toggleGrid: () => void;
+	i18n: any;
+	columnTitle: string;
+	changeSmallScreenVisiblePanel: () => void;
+	showHelpDialog: (section: DataTypeFolder) => void;
+};
+
+const Grid = ({ rows, onAddRows, onSort, i18n, columnTitle, toggleGrid, changeSmallScreenVisiblePanel, showHelpDialog }: GridProps) => {
+	const [numRows, setNumRows] = React.useState(1);
+	const windowSize = useWindowSize();
+	const [measureRef, { width = 0, height = 0 }] = useMeasure();
+
+	let gridSizeClass = '';
+	if (width && width < C.GRID.SMALL_BREAKPOINT) {
+		gridSizeClass = styles.gridSmall;
+	} else if (width && width < C.GRID.MEDIUM_BREAKPOINT) {
+		gridSizeClass = styles.gridMedium;
+	}
+
+	const addRowsBtnLabel = numRows === 1 ? i18n.row : i18n.rows;
+
+	const onClose = (): void => {
+		if (windowSize.width <= C.SMALL_SCREEN_WIDTH) {
+			changeSmallScreenVisiblePanel();
+		} else {
+			toggleGrid();
+		}
+	};
+
+	// to prevent repaints
+	const memoizedDimensions = useMemo(() => ({ width, height }), [width, height]) as { width: number; height: number };
+
+	return (
+		<>
+			<div style={{ position: 'fixed', right: 0, padding: 10 }}>
+				<span onClick={onClose}>
+					<Tooltip title={<span dangerouslySetInnerHTML={{ __html: i18n.closePanel }} />} placement="bottom" arrow>
+						<IconButton size="small" aria-label={i18n.closePanel}>
+							<CloseIcon fontSize="large" />
+						</IconButton>
+					</Tooltip>
+				</span>
+			</div>
+
+			<div className={`${styles.gridWrapper} ${gridSizeClass}`} ref={measureRef}>
+				<div>
+					<div className={styles.gridHeaderWrapper}>
+						<div className={`${styles.gridRow} ${styles.gridHeader} tour-gridHeader`} style={{ flex: '0 0 auto' }}>
+							<div className={styles.orderCol}>{rows.length}</div>
+							<div className={styles.dataTypeCol}>{i18n.dataType}</div>
+							<div className={styles.titleCol}>{columnTitle}</div>
+							<div className={styles.examplesCol}>{i18n.examples}</div>
+							<div className={styles.optionsCol}>{i18n.options}</div>
+							<div className={styles.settingsIconCol} />
+							<div className={styles.deleteCol} />
+						</div>
+					</div>
+				</div>
+				<div className={`${styles.scrollableGridRows} tour-scrollableGridRows`}>
+					<div className={`${styles.gridRowsWrapper} tour-gridRows`}>
+						<DragDropContext onDragEnd={({ draggableId, destination }: any): any => onSort(draggableId, destination.index)}>
+							<Droppable droppableId="droppable">
+								{(provided: any): any => (
+									<div className={styles.grid} {...provided.droppableProps} ref={provided.innerRef}>
+										{rows.map((row, index) => (
+											<GridRow
+												row={row}
+												key={row.id}
+												index={index}
+												gridPanelDimensions={memoizedDimensions}
+												showHelpDialog={showHelpDialog}
+											/>
+										))}
+										{provided.placeholder}
+									</div>
+								)}
+							</Droppable>
+						</DragDropContext>
+
+						<form onSubmit={(e): any => e.preventDefault()} className={`${styles.addRows} tour-addRows`}>
+							<span>{i18n.add}</span>
+							<input
+								type="number"
+								value={numRows}
+								onChange={(e): void => setNumRows(parseInt(e.target.value, 10))}
+								min={1}
+								max={1000}
+								step={1}
+							/>
+							<PrimaryButton size="small" onClick={(): void => onAddRows(numRows)}>
+								{addRowsBtnLabel}
+							</PrimaryButton>
+						</form>
+					</div>
+				</div>
+			</div>
+		</>
+	);
+};
+
+export default Grid;
diff --git a/apps/client/src/core/generator/grid/Grid.container.ts b/apps/client/src/core/generator/grid/Grid.container.ts
new file mode 100644
index 000000000..51386852a
--- /dev/null
+++ b/apps/client/src/core/generator/grid/Grid.container.ts
@@ -0,0 +1,26 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import * as actions from '~store/generator/generator.actions';
+import * as selectors from '~store/generator/generator.selectors';
+import Grid, { GridProps } from './Grid.component';
+import { DataTypeFolder } from '@generatedata/plugins';
+
+const mapStateToProps = (state: any): Pick<GridProps, 'i18n' | 'columnTitle' | 'rows'> => ({
+	i18n: selectors.getCoreI18n(state),
+	columnTitle: selectors.getExportTypeColumnTitle(state),
+	rows: selectors.getSortedRowsArray(state)
+});
+
+const mapDispatchToProps = (
+	dispatch: Dispatch
+): Pick<GridProps, 'onAddRows' | 'onSort' | 'toggleGrid' | 'changeSmallScreenVisiblePanel' | 'showHelpDialog'> => ({
+	onAddRows: (numRows: number): any => dispatch(actions.addRows(numRows)),
+	onSort: (id: string, newIndex: number): any => dispatch(actions.repositionRow(id, newIndex)),
+	toggleGrid: (): any => dispatch(actions.toggleGrid()),
+	changeSmallScreenVisiblePanel: (): any => dispatch(actions.changeSmallScreenVisiblePanel()),
+	showHelpDialog: (dataType: DataTypeFolder): any => dispatch(actions.showHelpDialog(dataType))
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(Grid);
+
+export default container;
diff --git a/apps/client/src/core/generator/grid/Grid.scss b/apps/client/src/core/generator/grid/Grid.scss
new file mode 100644
index 000000000..c11bd5d21
--- /dev/null
+++ b/apps/client/src/core/generator/grid/Grid.scss
@@ -0,0 +1,224 @@
+@use '../../../styles/variables' as c;
+
+.gridWrapper {
+	width: 100%;
+	padding: 0 10px;
+	height: 100%;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	margin: 0 auto;
+}
+
+.gridHeaderWrapper {
+	max-width: 1024px;
+	margin: 15px auto 0;
+}
+
+div.gridHeader {
+	width: 100%;
+	font-weight: bold;
+	color: #666666;
+	min-height: 26px;
+	font-size: 13px;
+	border-bottom: 1px solid black;
+	border-radius: 0;
+
+	.orderCol {
+		font-style: italic;
+		color: #cccccc;
+		padding: 0 0 0 17px;
+		margin-top: 4px;
+		font-size: 10px;
+	}
+}
+
+.smallScreenMode {
+	display: none;
+	position: absolute;
+	right: 10px;
+	margin: 2px 0 0;
+	font-size: 10px;
+	cursor: pointer;
+}
+
+.scrollableGridRows {
+	width: 100%;
+	flex: 1;
+	overflow: scroll;
+	position: relative;
+	padding-top: 4px;
+}
+
+.gridRowsWrapper {
+	max-width: 1024px;
+	margin: 0 auto;
+}
+
+.grid {
+	margin-bottom: 12px;
+}
+
+.gridRow {
+	display: flex;
+	flex-direction: row;
+	min-height: 35px;
+	align-items: flex-start;
+	border-radius: 4px;
+
+	& > div {
+		margin-right: 4px;
+		padding-top: 2px;
+	}
+}
+
+div.orderCol {
+	flex: 0 0 40px;
+	display: flex;
+	margin-top: 6px;
+	padding: 4px 0 2px 2px;
+	color: #999999;
+	svg {
+		color: #cccccc;
+	}
+}
+
+.titleCol {
+	flex: 2;
+	input {
+		width: 100%;
+	}
+}
+
+.dataTypeCol {
+	flex: 2;
+	display: flex;
+	align-items: center;
+}
+
+.dataTypeColDropdown {
+	flex: 1;
+	margin-right: 3px;
+}
+
+.dataTypeHelp {
+	flex: 0 0 15px;
+	font-size: 16px;
+	svg {
+		color: c.$primary-color;
+		cursor: pointer;
+		margin-top: 5px;
+	}
+}
+
+.examplesCol {
+	flex: 2;
+}
+
+.optionsCol {
+	flex: 3;
+}
+
+div.deleteCol,
+div.settingsIconCol {
+	flex: 0 0 30px;
+	cursor: pointer;
+	display: flex;
+	justify-content: center;
+	padding-top: 8px;
+
+	svg {
+		fill: #333333;
+		transition: fill 0.5s ease-in-out;
+	}
+}
+
+div.settingsIconCol svg.disabledBtn {
+	fill: #eeeeee;
+	cursor: default;
+}
+
+div.deleteCol {
+	margin-right: 0;
+	&:hover {
+		svg {
+			fill: #990000;
+		}
+	}
+}
+
+.addRows {
+	display: inline-flex;
+	align-items: center;
+	margin-bottom: 12px;
+	font-size: 12px;
+
+	span,
+	input {
+		margin-right: 6px;
+	}
+
+	input {
+		height: 28px;
+	}
+
+	input {
+		width: 42px;
+	}
+
+	button {
+		font-size: 11px;
+		min-width: 60px;
+	}
+}
+
+div.settingsIconCol {
+	display: none;
+}
+
+.gridSmall {
+	.examplesCol,
+	.optionsCol {
+		display: none;
+	}
+	.smallScreenMode,
+	.settingsIconCol {
+		display: inherit;
+	}
+}
+
+.gridMedium {
+	.examplesCol {
+		display: none;
+	}
+	.smallScreenMode {
+		display: block;
+	}
+}
+
+.disabledBtn {
+	fill: #eeeeee;
+}
+
+.smallScreenSpinner {
+	margin-top: -2px !important;
+}
+
+.smallScreenSettingsTooltip {
+	padding: 10px;
+	width: 280px;
+
+	h4 {
+		margin: 0 0 5px;
+
+		&:nth-child(2) {
+			margin-top: 10px;
+		}
+	}
+}
+
+.gridOverlay {
+	flex: 1;
+	height: 100%;
+	background-color: #f2f2f2;
+}
diff --git a/apps/client/src/core/generator/grid/Grid.scss.d.ts b/apps/client/src/core/generator/grid/Grid.scss.d.ts
new file mode 100644
index 000000000..1670433ea
--- /dev/null
+++ b/apps/client/src/core/generator/grid/Grid.scss.d.ts
@@ -0,0 +1,35 @@
+declare namespace GridScssNamespace {
+	export interface IGridScss {
+		addRows: string;
+		dataTypeCol: string;
+		dataTypeColDropdown: string;
+		dataTypeHelp: string;
+		deleteCol: string;
+		disabledBtn: string;
+		examplesCol: string;
+		grid: string;
+		gridHeader: string;
+		gridHeaderWrapper: string;
+		gridMedium: string;
+		gridOverlay: string;
+		gridRow: string;
+		gridRowsWrapper: string;
+		gridSmall: string;
+		gridWrapper: string;
+		optionsCol: string;
+		orderCol: string;
+		scrollableGridRows: string;
+		settingsIconCol: string;
+		smallScreenMode: string;
+		smallScreenSettingsTooltip: string;
+		smallScreenSpinner: string;
+		titleCol: string;
+	}
+}
+
+declare const GridScssModule: GridScssNamespace.IGridScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: GridScssNamespace.IGridScss;
+};
+
+export = GridScssModule;
diff --git a/apps/client/src/core/generator/grid/GridRow.component.tsx b/apps/client/src/core/generator/grid/GridRow.component.tsx
new file mode 100644
index 000000000..a6d90a0e9
--- /dev/null
+++ b/apps/client/src/core/generator/grid/GridRow.component.tsx
@@ -0,0 +1,204 @@
+import * as React from 'react';
+import { Draggable } from 'react-beautiful-dnd';
+import HighlightOffIcon from '@mui/icons-material/HighlightOff';
+import DragIndicator from '@mui/icons-material/DragIndicator';
+import InfoIcon from '@mui/icons-material/InfoOutlined';
+import Dropdown from '~components/dropdown/Dropdown';
+import { DataRow } from '~store/generator/generator.reducer';
+import { LoadDataTypeBundleOptions } from '~store/generator/generator.actions';
+import { DataTypeFolder } from '@generatedata/plugins';
+import * as styles from './Grid.scss';
+import * as sharedStyles from '../../../styles/shared.scss';
+import TextField from '~components/TextField';
+import { SmallSpinner } from '~components/loaders/loaders';
+import { SmallScreenSettingsIcon } from './SmallScreenSettingsIcon';
+import { DTOptionsMetadata } from '~types/dataTypes';
+import { CountryNamesMap } from '@generatedata/plugins';
+
+const getItemStyle = (isDragging: boolean, draggableStyle: any): React.CSSProperties => {
+	const styles: React.CSSProperties = {
+		...draggableStyle,
+		userSelect: 'none',
+		margin: '0 0 0 0'
+	};
+	if (isDragging) {
+		styles.background = '#e0ebfd';
+	}
+	return styles;
+};
+
+export type GridRowProps = {
+	row: DataRow;
+	index: number;
+	Example: any;
+	Options: any;
+	i18n: any;
+	countryI18n: any;
+	selectedDataTypeI18n: any;
+	isDataTypeLoaded: boolean;
+	onChangeTitle: (id: string, value: string) => void;
+	onConfigureDataType: (id: string, data: any, metadata?: DTOptionsMetadata) => void;
+	onSelectDataType: (dataType: DataTypeFolder, opts: LoadDataTypeBundleOptions) => void;
+	onRemove: (id: string) => void;
+	dtCustomProps: { [propName: string]: any };
+	dtDropdownOptions: any;
+	gridPanelDimensions: {
+		width: number;
+		height: number;
+	};
+	showHelpDialog: (dataType: DataTypeFolder) => void;
+	isCountryNamesLoading: boolean;
+	isCountryNamesLoaded: boolean;
+	countryNamesMap: CountryNamesMap | null;
+};
+
+const NoExample = ({ coreI18n, emptyColClass }: any) => <div className={emptyColClass}>{coreI18n.noExamplesAvailable}</div>;
+const NoOptions = ({ coreI18n, emptyColClass }: any) => <div className={emptyColClass}>{coreI18n.noOptionsAvailable}</div>;
+
+export const GridRow = ({
+	row,
+	index,
+	Example,
+	Options,
+	onRemove,
+	onChangeTitle,
+	onConfigureDataType,
+	onSelectDataType,
+	dtDropdownOptions,
+	i18n,
+	countryI18n,
+	selectedDataTypeI18n,
+	dtCustomProps,
+	gridPanelDimensions,
+	showHelpDialog,
+	isDataTypeLoaded,
+	isCountryNamesLoading,
+	isCountryNamesLoaded,
+	countryNamesMap
+}: GridRowProps) => {
+	let example: any = null;
+	let options: any = null;
+
+	if (isDataTypeLoaded) {
+		if (Example) {
+			example = (
+				<Example
+					coreI18n={i18n}
+					countryI18n={countryI18n}
+					i18n={selectedDataTypeI18n}
+					id={row.id}
+					data={row.data}
+					onUpdate={(data: any): void => onConfigureDataType(row.id, data)}
+					emptyColClass={sharedStyles.emptyCol}
+					gridPanelDimensions={gridPanelDimensions}
+				/>
+			);
+		} else {
+			example = <NoExample coreI18n={i18n} emptyColClass={sharedStyles.emptyCol} />;
+		}
+
+		if (Options) {
+			options = (
+				<Options
+					coreI18n={i18n}
+					countryI18n={countryI18n}
+					i18n={selectedDataTypeI18n}
+					id={row.id}
+					data={row.data}
+					onUpdate={(data: any, metadata?: DTOptionsMetadata): void => onConfigureDataType(row.id, data, metadata)}
+					gridPanelDimensions={gridPanelDimensions}
+					emptyColClass={sharedStyles.emptyCol}
+					isCountryNamesLoading={isCountryNamesLoading}
+					isCountryNamesLoaded={isCountryNamesLoaded}
+					countryNamesMap={countryNamesMap}
+					{...dtCustomProps}
+				/>
+			);
+		} else {
+			options = <NoOptions coreI18n={i18n} emptyColClass={sharedStyles.emptyCol} />;
+		}
+	} else if (!isDataTypeLoaded && row.dataType) {
+		example = <SmallSpinner />;
+	}
+
+	const onClickShowHelp = React.useCallback(() => {
+		showHelpDialog(row.dataType as DataTypeFolder);
+	}, [row.dataType]);
+
+	return (
+		<Draggable key={row.id} draggableId={row.id} index={index}>
+			{(provided: any, snapshot: any): any => {
+				// the title field is always required, regardless of Export Type
+				let titleColError = '';
+				if (row.dataType) {
+					if (row.title.trim() === '') {
+						titleColError = i18n.requiredField;
+					} else if (row.titleError) {
+						titleColError = row.titleError;
+					}
+				}
+
+				return (
+					<div
+						className={`${styles.gridRow} tour-gridRow`}
+						key={row.id}
+						ref={provided.innerRef}
+						{...provided.draggableProps}
+						style={getItemStyle(snapshot.isDragging, provided.draggableProps.style)}
+					>
+						<div className={styles.orderCol} {...provided.dragHandleProps}>
+							<DragIndicator fontSize="small" />
+							{index + 1}
+						</div>
+						<div className={styles.dataTypeCol}>
+							<Dropdown
+								className={styles.dataTypeColDropdown}
+								isGrouped={true}
+								value={row.dataType}
+								onChange={(i: any): void => onSelectDataType(i.value, { gridRowId: row.id })}
+								options={dtDropdownOptions}
+							/>
+							<div className={styles.dataTypeHelp}>{row.dataType ? <InfoIcon fontSize="inherit" onClick={onClickShowHelp} /> : null}</div>
+						</div>
+						<div className={styles.titleCol}>
+							<TextField
+								error={titleColError}
+								value={row.title}
+								onChange={(e: any): void => onChangeTitle(row.id, e.target.value)}
+								throttle={false}
+							/>
+						</div>
+						<div className={styles.examplesCol}>{example}</div>
+						<div className={styles.optionsCol}>{options}</div>
+						<div
+							className={styles.settingsIconCol}
+							onClick={(): void => {
+								if (row.dataType === null) {
+									return;
+								}
+							}}
+						>
+							<SmallScreenSettingsIcon
+								id={row.id}
+								data={row.data}
+								dataType={row.dataType}
+								Example={Example}
+								Options={Options}
+								isDataTypeLoaded={isDataTypeLoaded}
+								i18n={i18n}
+								countryI18n={countryI18n}
+								gridPanelDimensions={gridPanelDimensions}
+								selectedDataTypeI18n={selectedDataTypeI18n}
+								onConfigureDataType={onConfigureDataType}
+								dtCustomProps={dtCustomProps}
+							/>
+						</div>
+						<div className={styles.deleteCol} onClick={(): void => onRemove(row.id)}>
+							<HighlightOffIcon />
+						</div>
+					</div>
+				);
+			}}
+		</Draggable>
+	);
+};
diff --git a/apps/client/src/core/generator/grid/GridRow.container.tsx b/apps/client/src/core/generator/grid/GridRow.container.tsx
new file mode 100644
index 000000000..b0aef96cd
--- /dev/null
+++ b/apps/client/src/core/generator/grid/GridRow.container.tsx
@@ -0,0 +1,73 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import { GridRow, GridRowProps } from './GridRow.component';
+import { getCustomProps, getDataType, getSortedGroupedDataTypes } from '~utils/dataTypes';
+import * as coreUtils from '../../../utils/coreUtils';
+import { Store } from '~types/general';
+import { DataRow } from '~store/generator/generator.reducer';
+import * as actions from '~store/generator/generator.actions';
+import { LoadDataTypeBundleOptions } from '~store/generator/generator.actions';
+import * as selectors from '~store/generator/generator.selectors';
+import { DataTypeFolder } from '@generatedata/plugins';
+import { DTOptionsMetadata } from '~types/dataTypes';
+
+type OwnProps = {
+	row: DataRow;
+	index: number;
+	gridPanelDimensions: {
+		width: number;
+		height: number;
+	};
+	showHelpDialog: (dataType: DataTypeFolder) => void;
+};
+
+const mapStateToProps = (
+	state: Store,
+	ownProps: OwnProps
+): Pick<
+	GridRowProps,
+	| 'dtDropdownOptions'
+	| 'i18n'
+	| 'countryI18n'
+	| 'selectedDataTypeI18n'
+	| 'Example'
+	| 'Options'
+	| 'isDataTypeLoaded'
+	| 'isCountryNamesLoading'
+	| 'isCountryNamesLoaded'
+	| 'countryNamesMap'
+	| 'dtCustomProps'
+> => {
+	const { dataType } = ownProps.row;
+
+	const { Example, Options, customProps, isLoaded } = getDataType(dataType);
+	const dataTypeI18n = selectors.getDataTypeI18n(state);
+	const dtCustomProps = getCustomProps(customProps, state);
+
+	return {
+		dtDropdownOptions: getSortedGroupedDataTypes(),
+		i18n: selectors.getCoreI18n(state),
+		countryI18n: selectors.getCountryI18n(state),
+		selectedDataTypeI18n: dataTypeI18n && dataType ? dataTypeI18n[dataType] : null,
+		Example,
+		Options,
+		isDataTypeLoaded: isLoaded,
+		isCountryNamesLoading: selectors.isCountryNamesLoading(state),
+		isCountryNamesLoaded: selectors.isCountryNamesLoaded(state),
+		countryNamesMap: coreUtils.getCountryNames(),
+		dtCustomProps,
+		...ownProps
+	};
+};
+
+const mapDispatchToProps = (
+	dispatch: Dispatch
+): Pick<GridRowProps, 'onRemove' | 'onChangeTitle' | 'onConfigureDataType' | 'onSelectDataType'> => ({
+	onRemove: (id: string): any => dispatch(actions.removeRow(id)),
+	onChangeTitle: (id: string, value: string): any => dispatch(actions.onChangeTitle(id, value)),
+	onConfigureDataType: (id: string, data: any, metadata?: DTOptionsMetadata): any =>
+		dispatch(actions.onConfigureDataType(id, data, metadata)),
+	onSelectDataType: (dataType: DataTypeFolder, opts: LoadDataTypeBundleOptions): any => dispatch(actions.onSelectDataType(dataType, opts))
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(GridRow);
diff --git a/apps/client/src/core/generator/grid/SmallScreenSettingsIcon.tsx b/apps/client/src/core/generator/grid/SmallScreenSettingsIcon.tsx
new file mode 100644
index 000000000..ccecc8a42
--- /dev/null
+++ b/apps/client/src/core/generator/grid/SmallScreenSettingsIcon.tsx
@@ -0,0 +1,119 @@
+import React from 'react';
+import * as sharedStyles from '../../../styles/shared.scss';
+import { SmallSpinner } from '~components/loaders/loaders';
+import * as styles from './Grid.scss';
+import SettingsIcon from '@mui/icons-material/SettingsOutlined';
+import { HtmlTooltip } from '~components/tooltips';
+import useOnClickOutside from 'use-onclickoutside';
+import C from '@generatedata/config/constants';
+
+export const SmallScreenSettingsIcon = ({
+	id,
+	data,
+	dataType,
+	isDataTypeLoaded,
+	Example,
+	Options,
+	i18n,
+	countryI18n,
+	gridPanelDimensions,
+	selectedDataTypeI18n,
+	onConfigureDataType,
+	dtCustomProps
+}: any): any => {
+	const popoverRef = React.useRef(null);
+	const [open, setOpen] = React.useState(false);
+
+	useOnClickOutside(popoverRef, (e) => {
+		// the `gd-is-portal` part is added in case Data Types use other portal-based content besides react select. If
+		// that's the case, clicking it will always close the tooltip here. So to get around it, give the portal a class
+		// of gd-is-portal. That'll suppress the close event here,
+
+		// @ts-ignore-line
+		if (e.target && e.target.closest && (e.target.closest('.react-select__menu') || e.target.closest('gd-is-portal'))) {
+			return;
+		}
+		setOpen(false);
+	});
+
+	const handleTooltipOpen = (): void => setOpen(true);
+
+	if (!dataType || gridPanelDimensions.width >= C.GRID.MEDIUM_BREAKPOINT) {
+		return null;
+	}
+
+	if (!isDataTypeLoaded) {
+		return <SmallSpinner className={styles.smallScreenSpinner} />;
+	}
+
+	let example = null;
+	let options = null;
+
+	if (Example !== null) {
+		example = (
+			<>
+				<h4>{i18n.example}</h4>
+				<div>
+					<Example
+						coreI18n={i18n}
+						countryI18n={countryI18n}
+						i18n={selectedDataTypeI18n}
+						id={id}
+						data={data}
+						onUpdate={(data: any): void => onConfigureDataType(id, data)}
+						emptyColClass={sharedStyles.emptyCol}
+						gridPanelDimensions={gridPanelDimensions}
+					/>
+				</div>
+			</>
+		);
+	}
+
+	if (Options !== null) {
+		const titleStyle = Example === null ? {} : { marginTop: 10 };
+		options = (
+			<>
+				<h4 style={titleStyle}>{i18n.options}</h4>
+				<Options
+					coreI18n={i18n}
+					countryI18n={countryI18n}
+					i18n={selectedDataTypeI18n}
+					id={id}
+					data={data}
+					onUpdate={(data: any): void => onConfigureDataType(id, data)}
+					gridPanelDimensions={gridPanelDimensions}
+					emptyColClass={sharedStyles.emptyCol}
+					{...dtCustomProps}
+				/>
+			</>
+		);
+	}
+
+	if (example === null && options === null) {
+		return <SettingsIcon className={styles.disabledBtn} />;
+	}
+
+	if (!open) {
+		return <SettingsIcon onClick={handleTooltipOpen} />;
+	}
+
+	return (
+		<HtmlTooltip
+			placement="left"
+			open={open}
+			disableFocusListener
+			disableHoverListener
+			disableTouchListener
+			interactive
+			title={
+				<div ref={popoverRef} className={styles.smallScreenSettingsTooltip}>
+					{example}
+					{options}
+				</div>
+			}
+			arrow
+		>
+			<SettingsIcon onClick={handleTooltipOpen} />
+		</HtmlTooltip>
+	);
+};
diff --git a/apps/client/src/core/generator/grid/__tests__/Grid.container.test.tsx b/apps/client/src/core/generator/grid/__tests__/Grid.container.test.tsx
new file mode 100644
index 000000000..f2159c2e9
--- /dev/null
+++ b/apps/client/src/core/generator/grid/__tests__/Grid.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import Grid from '../Grid.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('Grid', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<Grid />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/generator/grid/__tests__/GridRow.container.test.tsx b/apps/client/src/core/generator/grid/__tests__/GridRow.container.test.tsx
new file mode 100644
index 000000000..5c79b15b0
--- /dev/null
+++ b/apps/client/src/core/generator/grid/__tests__/GridRow.container.test.tsx
@@ -0,0 +1,15 @@
+test.skip('skip', () => {});
+
+// import React from 'react';
+// import GridRow from '../GridRow.container';
+// import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+//
+// describe('GridRow', () => {
+// 	it('renders', () => {
+// 		const { baseElement } = renderWithStoreAndRouter(
+// 			<GridRow />
+// 		);
+//
+// 		expect(baseElement.querySelector('div')).toBeTruthy();
+// 	});
+// });
diff --git a/apps/client/src/core/generator/panelControls/PanelControls.component.tsx b/apps/client/src/core/generator/panelControls/PanelControls.component.tsx
new file mode 100644
index 000000000..f670a10f9
--- /dev/null
+++ b/apps/client/src/core/generator/panelControls/PanelControls.component.tsx
@@ -0,0 +1,134 @@
+import React from 'react';
+import Button from '@mui/material/Button';
+import ButtonGroup from '@mui/material/ButtonGroup';
+import Delete from '@mui/icons-material/Delete';
+import CheckBox from '@mui/icons-material/CheckBox';
+import CheckBoxOutlineBlank from '@mui/icons-material/CheckBoxOutlineBlank';
+import SwapHoriz from '@mui/icons-material/SwapHoriz';
+import SwapVert from '@mui/icons-material/SwapVert';
+import CodeIcon from '@mui/icons-material/Code';
+import { toSentenceCase } from '@generatedata/utils/string';
+import { Tooltip } from '~components/tooltips';
+import { GeneratorLayout } from '@generatedata/types';
+import FeatureToggles from '~core/featureToggles';
+import * as styles from './PanelControls.scss';
+
+export type PanelControlsProps = {
+	className: string;
+	toggleGrid: () => void;
+	togglePreview: () => void;
+	toggleLayout: () => void;
+	showClearPageDialog: () => void;
+	isGridVisible: boolean;
+	isPreviewVisible: boolean;
+	generatorLayout: GeneratorLayout;
+	showDataTemplateDialog: () => void;
+	i18n: any;
+};
+
+export const PanelControls = ({
+	className,
+	toggleGrid,
+	togglePreview,
+	toggleLayout,
+	showClearPageDialog,
+	isGridVisible,
+	isPreviewVisible,
+	generatorLayout,
+	showDataTemplateDialog,
+	i18n
+}: PanelControlsProps) => {
+	const toggleLayoutEnabled = isGridVisible && isPreviewVisible;
+	const GridIcon = isGridVisible ? CheckBox : CheckBoxOutlineBlank;
+	const PreviewIcon = isPreviewVisible ? CheckBox : CheckBoxOutlineBlank;
+	const ToggleDirectionIcon = generatorLayout === 'horizontal' ? SwapHoriz : SwapVert;
+
+	let gridBtnClasses = '';
+	if (isGridVisible) {
+		gridBtnClasses += ` ${styles.btnSelected}`;
+	}
+
+	let previewBtnClasses = '';
+	if (isPreviewVisible) {
+		previewBtnClasses += ` ${styles.btnSelected}`;
+	}
+
+	// Material UI throws an error when it comes to having a tooltip on a disabled button, and within a ButtonGroup
+	// context it messes up the styles wrapping <Button> in a <span> like we do elsewhere. So this just constructs
+	// the JSX differently for the enabled/disabled state
+	const getToggleLayoutBtn = () => {
+		if (toggleLayoutEnabled) {
+			return (
+				<Tooltip
+					title={<span dangerouslySetInnerHTML={{ __html: i18n.togglePanelLayout }} />}
+					arrow
+					disableHoverListener={!toggleLayoutEnabled}
+					disableFocusListener={!toggleLayoutEnabled}
+				>
+					<Button onClick={toggleLayout} disabled={!toggleLayoutEnabled} className={styles.toggleLayoutBtn}>
+						<ToggleDirectionIcon />
+					</Button>
+				</Tooltip>
+			);
+		}
+
+		return (
+			<Button
+				onClick={toggleLayout}
+				disabled={!toggleLayoutEnabled}
+				className={`${styles.toggleLayoutBtn} ${styles.toggleLayoutBtnDisabled}`}
+			>
+				<ToggleDirectionIcon />
+			</Button>
+		);
+	};
+
+	const getDataTemplateButton = () => {
+		if (!FeatureToggles.DATA_TEMPLATE_GENERATION_UI) {
+			return null;
+		}
+
+		return (
+			<ButtonGroup aria-label="" size="small" className={`${className} ${styles.dataTemplateControls}`}>
+				<Tooltip title={<span dangerouslySetInnerHTML={{ __html: 'Export / import template' }} />} placement="bottom" arrow>
+					<Button onClick={showDataTemplateDialog} startIcon={<CodeIcon />} />
+				</Tooltip>
+			</ButtonGroup>
+		);
+	};
+
+	return (
+		<>
+			<ButtonGroup aria-label="" size="small" className={`${className} ${styles.builderControls}`}>
+				<Tooltip title={<span dangerouslySetInnerHTML={{ __html: i18n.hideShowGrid }} />} arrow>
+					<Button className={gridBtnClasses} onClick={toggleGrid} startIcon={<GridIcon fontSize="small" />}>
+						{i18n.grid}
+					</Button>
+				</Tooltip>
+				<Tooltip title={<span dangerouslySetInnerHTML={{ __html: i18n.hideShowPreviewPanel }} />} arrow>
+					<Button className={previewBtnClasses} onClick={togglePreview} startIcon={<PreviewIcon />}>
+						{i18n.preview}
+					</Button>
+				</Tooltip>
+				{getToggleLayoutBtn()}
+				<Tooltip
+					title={
+						<span
+							dangerouslySetInnerHTML={{
+								__html: toSentenceCase(i18n.clearPage)
+							}}
+						/>
+					}
+					arrow
+				>
+					<Button onClick={showClearPageDialog}>
+						<Delete />
+					</Button>
+				</Tooltip>
+			</ButtonGroup>
+			{getDataTemplateButton()}
+		</>
+	);
+};
+
+export default PanelControls;
diff --git a/apps/client/src/core/generator/panelControls/PanelControls.container.tsx b/apps/client/src/core/generator/panelControls/PanelControls.container.tsx
new file mode 100644
index 000000000..babd55089
--- /dev/null
+++ b/apps/client/src/core/generator/panelControls/PanelControls.container.tsx
@@ -0,0 +1,26 @@
+import { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import PanelControls, { PanelControlsProps } from './PanelControls.component';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+
+const mapStateToProps = (state: any): Pick<PanelControlsProps, 'i18n' | 'isGridVisible' | 'isPreviewVisible' | 'generatorLayout'> => ({
+	i18n: selectors.getCoreI18n(state),
+	isGridVisible: selectors.isGridVisible(state),
+	isPreviewVisible: selectors.isPreviewVisible(state),
+	generatorLayout: selectors.getGeneratorLayout(state)
+});
+
+const mapDispatchToProps = (
+	dispatch: Dispatch
+): Pick<PanelControlsProps, 'toggleGrid' | 'togglePreview' | 'toggleLayout' | 'showClearPageDialog' | 'showDataTemplateDialog'> => ({
+	toggleGrid: (): any => dispatch(actions.toggleGrid()),
+	togglePreview: (): any => dispatch(actions.togglePreview()),
+	toggleLayout: (): any => dispatch(actions.toggleLayout()),
+	showClearPageDialog: (): any => dispatch(actions.showClearPageDialog()),
+	showDataTemplateDialog: (): any => dispatch(actions.showDataTemplateDialog())
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(PanelControls);
+
+export default container;
diff --git a/apps/client/src/core/generator/panelControls/PanelControls.scss b/apps/client/src/core/generator/panelControls/PanelControls.scss
new file mode 100644
index 000000000..34fe9ebc8
--- /dev/null
+++ b/apps/client/src/core/generator/panelControls/PanelControls.scss
@@ -0,0 +1,62 @@
+.builderControls {
+	margin: 0 6px 0 12px;
+	background-color: #ffffff;
+	box-shadow: 0 1px 1px #cccccc;
+
+	& > button {
+		border: 0;
+	}
+
+	svg {
+		fill: #aaaaaa;
+	}
+
+	:global(.MuiButton-root) {
+		font-size: 11px;
+		color: #444444;
+	}
+}
+
+.dataTemplateControls {
+	margin: 0 6px 0 0;
+	background-color: #ffffff;
+	box-shadow: 0 1px 1px #cccccc;
+
+	& > button {
+		border: 0;
+	}
+
+	svg {
+		fill: #aaaaaa;
+	}
+
+	:global(.MuiButton-startIcon) {
+		margin-right: 0;
+	}
+}
+
+.btnSelected {
+	svg {
+		fill: #aaaaaa;
+	}
+}
+
+.toggleLayoutBtn {
+	border: 1px solid rgba(0, 0, 0, 0.23);
+	border-right: 0;
+	width: 40px;
+
+	button {
+		height: 30px;
+		width: 40px;
+		min-width: inherit;
+	}
+}
+
+:global(.MuiButton-root.Mui-disabled).toggleLayoutBtnDisabled {
+	border: 0;
+
+	svg {
+		fill: #dddddd;
+	}
+}
diff --git a/apps/client/src/core/generator/panelControls/PanelControls.scss.d.ts b/apps/client/src/core/generator/panelControls/PanelControls.scss.d.ts
new file mode 100644
index 000000000..637f1ac36
--- /dev/null
+++ b/apps/client/src/core/generator/panelControls/PanelControls.scss.d.ts
@@ -0,0 +1,16 @@
+declare namespace PanelControlsScssNamespace {
+	export interface IPanelControlsScss {
+		btnSelected: string;
+		builderControls: string;
+		dataTemplateControls: string;
+		toggleLayoutBtn: string;
+		toggleLayoutBtnDisabled: string;
+	}
+}
+
+declare const PanelControlsScssModule: PanelControlsScssNamespace.IPanelControlsScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: PanelControlsScssNamespace.IPanelControlsScss;
+};
+
+export = PanelControlsScssModule;
diff --git a/apps/client/src/core/generator/panelControls/__tests__/PanelControls.container.test.tsx b/apps/client/src/core/generator/panelControls/__tests__/PanelControls.container.test.tsx
new file mode 100644
index 000000000..c04222a97
--- /dev/null
+++ b/apps/client/src/core/generator/panelControls/__tests__/PanelControls.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import PanelControls from '../PanelControls.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('PanelControls', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<PanelControls />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/generator/previewPanel/CodeMirrorWrapper.component.tsx b/apps/client/src/core/generator/previewPanel/CodeMirrorWrapper.component.tsx
new file mode 100644
index 000000000..ea372cf2c
--- /dev/null
+++ b/apps/client/src/core/generator/previewPanel/CodeMirrorWrapper.component.tsx
@@ -0,0 +1,98 @@
+import React, { useEffect } from 'react';
+import { Controlled as CodeMirror } from 'react-codemirror2';
+import * as coreUtils from '../../../utils/coreUtils';
+import { getCountryData } from '@generatedata/plugins';
+import { GeneratorLayout } from '@generatedata/types';
+import { GenerationWorkerActionType } from '~core/generator/generation.types';
+import C from '@generatedata/config/constants';
+
+export type CodeMirrorWrapperProps = {
+	previewRows: any;
+	columns: any;
+	exportTypeWorkerUrl: string;
+	exportTypeSettings: any;
+	theme: string;
+	codeMirrorMode: string;
+	showLineNumbers: boolean;
+	enableLineWrapping: boolean;
+	generatorLayout: GeneratorLayout;
+};
+
+const CodeMirrorWrapper = (props: CodeMirrorWrapperProps) => {
+	const {
+		previewRows,
+		columns,
+		exportTypeSettings,
+		codeMirrorMode,
+		theme,
+		showLineNumbers,
+		generatorLayout,
+		enableLineWrapping,
+		exportTypeWorkerUrl
+	} = props;
+	const [code, setCode] = React.useState('');
+	const [codeMirrorInstance, setCodeMirrorInstance] = React.useState<any>(null);
+
+	useEffect(() => {
+		if (!columns.length || !previewRows.length) {
+			return;
+		}
+		generatePreviewString(props).then((str: string) => {
+			setCode(str);
+		});
+	}, [previewRows, columns, exportTypeWorkerUrl, exportTypeSettings]);
+
+	useEffect(() => {
+		if (codeMirrorInstance) {
+			codeMirrorInstance.refresh();
+		}
+	}, [generatorLayout]);
+
+	return (
+		<CodeMirror
+			value={code}
+			onBeforeChange={(editor, data, value): void => setCode(value)}
+			editorDidMount={(editor): void => setCodeMirrorInstance(editor)}
+			options={{
+				mode: codeMirrorMode,
+				theme,
+				lineNumbers: showLineNumbers,
+				lineWrapping: enableLineWrapping,
+				readOnly: true
+			}}
+		/>
+	);
+};
+
+export default CodeMirrorWrapper;
+
+export const generatePreviewString = (props: any): Promise<any> => {
+	const { previewRows, columns, exportTypeSettings, exportTypeWorkerUrl } = props;
+	const generationWorker = coreUtils.getGenerationWorker('preview');
+
+	return new Promise((resolve) => {
+		coreUtils.performTask(
+			'exportTypeWorker',
+			generationWorker,
+			{
+				action: GenerationWorkerActionType.ProcessExportTypeOnly,
+				isFirstBatch: true,
+				isLastBatch: true,
+				batchSize: C.GENERATION_BATCH_SIZE,
+				currentBatch: 1,
+				rows: previewRows,
+				columns,
+				exportTypeSettings,
+				stripWhitespace: false,
+				workerUtilsUrl: coreUtils.getWorkerUtilsUrl(),
+				exportTypeWorkerUrl,
+				countryData: getCountryData()
+			},
+			({ data }: MessageEvent): void => {
+				if (data.event === GenerationWorkerActionType.ExportTypeProcessed) {
+					resolve(data.data);
+				}
+			}
+		);
+	});
+};
diff --git a/apps/client/src/core/generator/previewPanel/CodeMirrorWrapper.container.ts b/apps/client/src/core/generator/previewPanel/CodeMirrorWrapper.container.ts
new file mode 100644
index 000000000..9b0c5ed60
--- /dev/null
+++ b/apps/client/src/core/generator/previewPanel/CodeMirrorWrapper.container.ts
@@ -0,0 +1,18 @@
+import { connect } from 'react-redux';
+import * as selectors from '~store/generator/generator.selectors';
+import { Store } from '~types/general';
+import CodeMirrorWrapper, { CodeMirrorWrapperProps } from './CodeMirrorWrapper.component';
+
+const mapStateToProps = (state: Store): CodeMirrorWrapperProps => ({
+	previewRows: selectors.getPreviewRows(state),
+	columns: selectors.getColumns(state),
+	showLineNumbers: selectors.shouldShowLineNumbers(state),
+	enableLineWrapping: selectors.shouldEnableLineWrapping(state),
+	theme: selectors.getTheme(state),
+	codeMirrorMode: selectors.getCodeMirrorMode(state),
+	exportTypeWorkerUrl: selectors.getCurrentExportTypeWorkerUrl(state),
+	exportTypeSettings: selectors.getCurrentExportTypeSettings(state),
+	generatorLayout: selectors.getGeneratorLayout(state)
+});
+
+export default connect(mapStateToProps)(CodeMirrorWrapper);
diff --git a/apps/client/src/core/generator/previewPanel/PreviewPanel.component.tsx b/apps/client/src/core/generator/previewPanel/PreviewPanel.component.tsx
new file mode 100644
index 000000000..b70ef76ed
--- /dev/null
+++ b/apps/client/src/core/generator/previewPanel/PreviewPanel.component.tsx
@@ -0,0 +1,242 @@
+import React, { useEffect, CSSProperties } from 'react';
+import { useWindowSize } from 'react-hooks-window-size';
+import CloseIcon from '@mui/icons-material/Close';
+import ErrorIcon from '@mui/icons-material/ErrorOutline';
+import ErrorSolidIcon from '@mui/icons-material/Error';
+import Refresh from '@mui/icons-material/Refresh';
+import AddCircle from '@mui/icons-material/AddCircle';
+import IconButton from '@mui/material/IconButton';
+import CodeMirrorWrapper from './CodeMirrorWrapper.container';
+import { Tooltip } from '~components/tooltips';
+import { PreviewPanelButton } from '~components/Buttons.component';
+import Portal from '~components/Portal';
+import { PreviewPanelLoader } from './PreviewPanelLoader.component';
+import PanelButtons from '~core/generator/dataSetHistory/PanelButtons.container';
+import C from '@generatedata/config/constants';
+import * as styles from './PreviewPanel.scss';
+
+export type PreviewPanelProps = {
+	togglePreview: () => void;
+	refreshPreview: () => void;
+	changeSmallScreenVisiblePanel: () => void;
+	exportTypeLoaded: boolean;
+	toggleExportSettings: () => void;
+	closeOverlayPanels: () => void;
+	exportSettingsVisible: boolean;
+	dataSetHistoryVisible: boolean;
+	hasData: boolean;
+	theme: string;
+	previewTextSize: number;
+	exportTypeLabel: string;
+	i18n: any;
+	hasValidExportTypeSettings: boolean;
+	hasBulkActionPending: boolean;
+	initialDependenciesLoaded: boolean; // set once on load
+	previewPanelDependenciesLoaded: boolean; // set every time a user selects
+	initRefresh: any;
+};
+
+const getThemeName = (theme: string): string => `theme${theme.charAt(0).toUpperCase() + theme.slice(1)}`;
+
+const NoResultsBlock = ({ i18n, type }: any) => {
+	const map: any = {
+		invalidSettings: {
+			icon: ErrorSolidIcon,
+			title: i18n.invalidSettings,
+			label: i18n.editExportTypeSettings
+		},
+		noData: {
+			icon: AddCircle,
+			title: i18n.previewPanelNoData,
+			label: i18n.addSomeDataDesc
+		}
+	};
+
+	const Icon = map[type].icon;
+
+	return (
+		<div className={styles.noResults}>
+			<div style={{ marginTop: -50 }}>
+				<Icon
+					style={{
+						fontSize: 100,
+						position: 'absolute',
+						opacity: 0.1,
+						top: 'calc(50% - 76px)',
+						left: 'calc(50% - 50px)'
+					}}
+				/>
+				<div style={{ height: '100%', margin: 'auto' }}>
+					<h1>{map[type].title}</h1>
+					<p>{map[type].label}</p>
+				</div>
+			</div>
+		</div>
+	);
+};
+
+const PreviewPanel = ({
+	i18n,
+	theme,
+	togglePreview,
+	hasData,
+	previewTextSize,
+	refreshPreview,
+	toggleExportSettings,
+	exportSettingsVisible,
+	dataSetHistoryVisible,
+	exportTypeLabel,
+	changeSmallScreenVisiblePanel,
+	exportTypeLoaded,
+	initialDependenciesLoaded,
+	hasValidExportTypeSettings,
+	hasBulkActionPending,
+	previewPanelDependenciesLoaded,
+	initRefresh,
+	closeOverlayPanels
+}: PreviewPanelProps): React.ReactNode => {
+	const windowSize = useWindowSize();
+
+	// on load, and after a user loads a data set, rather than retrigger a refresh of the preview panel after every little
+	// change, we do it ONCE when all data types, the export type and locale file have been loaded
+	useEffect(() => {
+		if (!hasBulkActionPending) {
+			return;
+		}
+
+		if (previewPanelDependenciesLoaded) {
+			initRefresh();
+		}
+	}, [hasBulkActionPending, previewPanelDependenciesLoaded]);
+
+	const getNoResults = () => {
+		if (!hasValidExportTypeSettings) {
+			return <NoResultsBlock i18n={i18n} type="invalidSettings" />;
+		}
+
+		if (hasData) {
+			return null;
+		}
+
+		return <NoResultsBlock i18n={i18n} type="noData" />;
+	};
+
+	let closeIconAction: any;
+	let exportTypeLabelBtnAction: any;
+	if (exportSettingsVisible || dataSetHistoryVisible) {
+		closeIconAction = closeOverlayPanels;
+		exportTypeLabelBtnAction = (): void => {};
+	} else {
+		if (windowSize.width < C.SMALL_SCREEN_WIDTH) {
+			closeIconAction = changeSmallScreenVisiblePanel;
+		} else {
+			closeIconAction = togglePreview;
+		}
+		exportTypeLabelBtnAction = toggleExportSettings;
+	}
+
+	const themeName = getThemeName(theme);
+	const previewPanelStyles: CSSProperties = {
+		fontSize: `${previewTextSize}px`,
+		lineHeight: `${previewTextSize + 7}px`
+	};
+
+	let refreshTooltipProps = {};
+	let refreshIconProps = {};
+	if (!hasData || !hasValidExportTypeSettings) {
+		previewPanelStyles.flex = 0;
+		refreshTooltipProps = { disableHoverListener: true };
+		refreshIconProps = { disabled: true };
+	}
+
+	let exportTypeButtonClasses = 'tour-exportTypeBtn';
+	if (!hasValidExportTypeSettings) {
+		exportTypeButtonClasses += ` ${styles.error}`;
+	}
+
+	const getExportSettingsBtn = () => {
+		if (exportSettingsVisible) {
+			return <div />;
+		}
+
+		if (dataSetHistoryVisible) {
+			return <PanelButtons />;
+		}
+
+		return (
+			<PreviewPanelButton onClick={exportTypeLabelBtnAction} className={exportTypeButtonClasses}>
+				{exportTypeLabel}
+				{!hasValidExportTypeSettings ? <ErrorIcon /> : null}
+			</PreviewPanelButton>
+		);
+	};
+
+	const getCodeMirrorPanel = (): React.ReactNode => {
+		if (!hasValidExportTypeSettings || !hasData) {
+			return null;
+		}
+
+		if (!exportTypeLoaded) {
+			return <PreviewPanelLoader />;
+		}
+
+		return <CodeMirrorWrapper />;
+	};
+
+	if (!initialDependenciesLoaded) {
+		return (
+			<div className={`${styles.previewPanel} ${themeName}`}>
+				<div className={styles.previewLoading}>
+					<PreviewPanelLoader />
+				</div>
+			</div>
+		);
+	}
+
+	const content = (
+		<div className={styles.panelContent}>
+			<div className={styles.topRow}>
+				{getExportSettingsBtn()}
+
+				<div className={`${styles.controls} tour-previewPanelControls`}>
+					<span onClick={refreshPreview}>
+						<Tooltip title={i18n.refreshPanel} placement="bottom" {...refreshTooltipProps} arrow>
+							<span>
+								<IconButton size="small" aria-label={i18n.refreshPanel} {...refreshIconProps}>
+									<Refresh fontSize="large" />
+								</IconButton>
+							</span>
+						</Tooltip>
+					</span>
+					<span onClick={closeIconAction}>
+						<Tooltip title={i18n.closePanel} placement="bottom" arrow>
+							<span>
+								<IconButton size="small" aria-label={i18n.closePanel}>
+									<CloseIcon fontSize="large" />
+								</IconButton>
+							</span>
+						</Tooltip>
+					</span>
+				</div>
+			</div>
+
+			{getNoResults()}
+
+			<div className={styles.preview} style={previewPanelStyles}>
+				{getCodeMirrorPanel()}
+			</div>
+		</div>
+	);
+
+	if (exportSettingsVisible || dataSetHistoryVisible) {
+		return (
+			<Portal id="overlayPanelFullScreen">
+				<div className={`${styles.previewPanel} ${themeName}`}>{content}</div>
+			</Portal>
+		);
+	}
+
+	return <div className={`${styles.previewPanel} ${themeName}`}>{content}</div>;
+};
+
+export default PreviewPanel;
diff --git a/apps/client/src/core/generator/previewPanel/PreviewPanel.container.ts b/apps/client/src/core/generator/previewPanel/PreviewPanel.container.ts
new file mode 100644
index 000000000..6a8b254ed
--- /dev/null
+++ b/apps/client/src/core/generator/previewPanel/PreviewPanel.container.ts
@@ -0,0 +1,48 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import PreviewPanel, { PreviewPanelProps } from './PreviewPanel.component';
+import { isExportTypeValid } from '~utils/exportTypes';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+
+const mapStateToProps = (state: any): Partial<PreviewPanelProps> => {
+	const exportType = selectors.getExportType(state);
+	const exportTypeSettings = selectors.getExportTypeSettings(state);
+
+	return {
+		i18n: selectors.getCoreI18n(state),
+		theme: selectors.getTheme(state),
+		exportSettingsVisible: selectors.shouldShowExportSettings(state),
+		dataSetHistoryVisible: selectors.shouldShowDataSetHistory(state),
+		previewTextSize: selectors.getPreviewTextSize(state),
+		exportTypeLoaded: selectors.selectedExportTypeLoaded(state),
+		exportTypeLabel: selectors.getExportTypeLabel(state),
+		hasData: selectors.hasData(state),
+		initialDependenciesLoaded: selectors.isInitialDependenciesLoaded(state),
+		hasValidExportTypeSettings: isExportTypeValid(exportType, exportTypeSettings[exportType]),
+		hasBulkActionPending: selectors.hasBulkActionPending(state),
+		previewPanelDependenciesLoaded: selectors.previewPanelDependenciesLoaded(state)
+	};
+};
+
+const mapDispatchToProps = (dispatch: Dispatch): Partial<PreviewPanelProps> => ({
+	togglePreview: (): any => dispatch(actions.togglePreview()),
+	refreshPreview: (): any => dispatch(actions.refreshPreview()),
+	initRefresh: (): any => dispatch(actions.refreshPreview([], actions.setInitialDependenciesLoaded)),
+	toggleExportSettings: (): any => dispatch(actions.toggleExportSettings('previewPanel')),
+	changeSmallScreenVisiblePanel: (): any => dispatch(actions.changeSmallScreenVisiblePanel()),
+	closeOverlayPanels: (): any => {
+		dispatch(actions.hideExportSettings());
+		dispatch(actions.popStashedState());
+		dispatch(actions.hideDataSetHistory());
+	}
+});
+
+const container: any = connect(
+	mapStateToProps,
+	mapDispatchToProps
+
+	// @ts-ignore
+)(PreviewPanel);
+
+export default container;
diff --git a/apps/client/src/core/generator/previewPanel/PreviewPanel.scss b/apps/client/src/core/generator/previewPanel/PreviewPanel.scss
new file mode 100644
index 000000000..99a1775dc
--- /dev/null
+++ b/apps/client/src/core/generator/previewPanel/PreviewPanel.scss
@@ -0,0 +1,104 @@
+.previewPanel {
+	z-index: 1400;
+	height: 100%;
+
+	h1 {
+		margin: 0;
+	}
+}
+
+:global(#overlayPanelFullScreen) {
+	position: absolute;
+	right: 0;
+	top: 0;
+	left: 400px;
+	bottom: 0;
+	z-index: 1400;
+	& > div {
+		height: 100%;
+	}
+}
+
+.topRow {
+	display: flex;
+	flex-direction: row;
+	width: 100%;
+	justify-content: space-between;
+	padding: 10px;
+}
+
+.controls {
+	z-index: 1300;
+	justify-content: flex-end;
+
+	button {
+		cursor: pointer;
+		&:hover svg {
+			fill: #999999;
+		}
+	}
+}
+
+.previewPanelContent {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.panelContent {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.preview {
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	overflow: hidden;
+
+	& > div,
+	& > div > div {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: hidden;
+	}
+
+	.loading {
+		align-items: center;
+		justify-content: center;
+	}
+}
+
+.noResults {
+	color: white;
+	margin: auto;
+	position: relative;
+	text-align: center;
+}
+
+.previewLoading {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	justify-items: center;
+	height: 100%;
+}
+
+button.error {
+	border-color: #dc4040;
+	color: #dc4040;
+
+	svg {
+		fill: #dc4040;
+		margin-left: 4px;
+		margin-top: -1px;
+	}
+
+	&:hover {
+		background-color: #503636;
+		border-color: #dc4040;
+	}
+}
diff --git a/apps/client/src/core/generator/previewPanel/PreviewPanel.scss.d.ts b/apps/client/src/core/generator/previewPanel/PreviewPanel.scss.d.ts
new file mode 100644
index 000000000..59a24bb9b
--- /dev/null
+++ b/apps/client/src/core/generator/previewPanel/PreviewPanel.scss.d.ts
@@ -0,0 +1,21 @@
+declare namespace PreviewPanelScssNamespace {
+	export interface IPreviewPanelScss {
+		controls: string;
+		error: string;
+		loading: string;
+		noResults: string;
+		panelContent: string;
+		preview: string;
+		previewLoading: string;
+		previewPanel: string;
+		previewPanelContent: string;
+		topRow: string;
+	}
+}
+
+declare const PreviewPanelScssModule: PreviewPanelScssNamespace.IPreviewPanelScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: PreviewPanelScssNamespace.IPreviewPanelScss;
+};
+
+export = PreviewPanelScssModule;
diff --git a/apps/client/src/core/generator/previewPanel/PreviewPanelLoader.component.tsx b/apps/client/src/core/generator/previewPanel/PreviewPanelLoader.component.tsx
new file mode 100644
index 000000000..15a14bf68
--- /dev/null
+++ b/apps/client/src/core/generator/previewPanel/PreviewPanelLoader.component.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import CircularProgress from '@mui/material/CircularProgress';
+import styles from './PreviewPanel.scss';
+
+export const PreviewPanelLoader = (): any => (
+	<div className={styles.loading}>
+		<div style={{ flex: 'none' }}>
+			<CircularProgress
+				size={50}
+				style={{
+					color: '#ffffff',
+					margin: 5,
+					opacity: 0.4
+				}}
+			/>
+		</div>
+	</div>
+);
+PreviewPanelLoader.displayName = 'PreviewPanelLoader';
diff --git a/apps/client/src/core/generator/previewPanel/__tests__/CodeMirrorWrapper.container.test.tsx b/apps/client/src/core/generator/previewPanel/__tests__/CodeMirrorWrapper.container.test.tsx
new file mode 100644
index 000000000..2cd2bdf8a
--- /dev/null
+++ b/apps/client/src/core/generator/previewPanel/__tests__/CodeMirrorWrapper.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import CodeMirrorWrapper from '../CodeMirrorWrapper.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('CodeMirrorWrapper', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<CodeMirrorWrapper />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/generator/previewPanel/__tests__/PreviewPanel.container.test.tsx b/apps/client/src/core/generator/previewPanel/__tests__/PreviewPanel.container.test.tsx
new file mode 100644
index 000000000..aba639fec
--- /dev/null
+++ b/apps/client/src/core/generator/previewPanel/__tests__/PreviewPanel.container.test.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import PreviewPanel from '../PreviewPanel.container';
+import { renderWithStoreAndRouter } from '../../../../../tests/testHelpers';
+
+describe('PreviewPanel', () => {
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<PreviewPanel />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/header/GeneratorControls.component.tsx b/apps/client/src/core/header/GeneratorControls.component.tsx
new file mode 100644
index 000000000..dd03f7c9d
--- /dev/null
+++ b/apps/client/src/core/header/GeneratorControls.component.tsx
@@ -0,0 +1,224 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { useMutation } from '@apollo/client/react';
+import AutoSizer from 'react-input-autosize';
+import { Divider, IconButton, List, ListItemButton, ListItemText } from '@mui/material';
+import { HtmlTooltip } from '~components/tooltips';
+import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
+import useOnClickOutside from 'use-onclickoutside';
+import { addToast } from '@generatedata/utils/general';
+import DeleteDataSetDialog from '~core/dialogs/deleteDataSet/DeleteDataSetDialog.component';
+import * as queries from '~core/queries';
+import { CurrentDataSet } from '~store/generator/generator.reducer';
+import { useMeasure } from '@uidotdev/usehooks';
+
+export type GeneratorControlsProps = {
+	i18n: any;
+	dataSet: CurrentDataSet;
+	isLoggedIn: boolean;
+	onUpdate: (newDataSetName: string) => void;
+	onSaveDataSet: () => void;
+	onSaveAs: () => void;
+	onShowHistory: () => void;
+	onClearGrid: () => void;
+	showClearPageDialog: () => void;
+	disabled: boolean;
+};
+
+const GeneratorControls = ({
+	i18n,
+	isLoggedIn,
+	dataSet,
+	onUpdate,
+	onSaveDataSet,
+	onSaveAs,
+	onClearGrid,
+	onShowHistory,
+	disabled,
+	showClearPageDialog
+}: GeneratorControlsProps) => {
+	const popoverRef = useRef(null);
+	const inputFieldRef = useRef(null);
+	const [measureRef, { width = 0 }] = useMeasure();
+
+	const { dataSetId, dataSetName } = dataSet;
+	const [dialogVisible, setDeleteDialogVisibility] = useState(false);
+	const [newDataSetName, setNewDataSetName] = useState(dataSetName);
+	const [dataSetMenuVisible, setMenuVisibility] = useState(false);
+
+	useOnClickOutside(popoverRef, () => {
+		setMenuVisibility(false);
+	});
+
+	useEffect(() => {
+		setNewDataSetName(dataSetName);
+	}, [dataSetName]);
+
+	const [deleteDataSet] = useMutation(queries.DELETE_DATA_SET, {
+		refetchQueries: [{ query: queries.GET_DATA_SETS }],
+		onCompleted: () => {
+			setDeleteDialogVisibility(false);
+			onClearGrid();
+		}
+	});
+
+	const onChange = (e: any): void => {
+		setNewDataSetName(e.target.value);
+	};
+
+	const onBlur = (): void => {
+		// we save the new name if they click outside - since there's no save button, we want to make it really simple
+		if (newDataSetName !== dataSetName) {
+			saveNewDataSet();
+		}
+	};
+
+	const saveNewDataSet = (): void => {
+		onUpdate(newDataSetName);
+
+		// @ts-ignore-line
+		inputFieldRef.current?.blur();
+
+		addToast({
+			message: i18n.dataSetNameUpdated,
+			type: 'success'
+		});
+	};
+
+	const onKeyUp = (e: any): void => {
+		if (e.key === 'Escape') {
+			setNewDataSetName(dataSetName);
+			// @ts-ignore-line
+			inputFieldRef.current?.blur();
+		} else if (e.key === 'Enter') {
+			saveNewDataSet();
+		}
+	};
+
+	const getMenu = () => {
+		if (!isLoggedIn || dataSetId === null) {
+			return null;
+		}
+
+		return (
+			<span style={{ display: 'flex', alignItems: 'center' }}>
+				<HtmlTooltip
+					arrow
+					open={dataSetMenuVisible}
+					placement="top"
+					disableFocusListener
+					disableHoverListener
+					disableTouchListener
+					interactive
+					PopperProps={{
+						popperOptions: {
+							modifiers: {
+								offset: {
+									offset: '0px, -6px'
+								}
+							}
+						}
+					}}
+					title={
+						<div ref={popoverRef}>
+							<List disablePadding>
+								<ListItemButton
+									key="saveAs"
+									onClick={(): any => {
+										setMenuVisibility(false);
+										onSaveAs();
+									}}
+								>
+									<ListItemText primary={i18n.saveAs} />
+								</ListItemButton>
+								<ListItemButton
+									key="delete"
+									onClick={(): any => {
+										setMenuVisibility(false);
+										setDeleteDialogVisibility(true);
+									}}
+								>
+									<ListItemText primary={i18n.delete} />
+								</ListItemButton>
+								<ListItemButton
+									key="history"
+									onClick={(): void => {
+										setMenuVisibility(false);
+										onShowHistory();
+									}}
+								>
+									<ListItemText primary={i18n.history} />
+								</ListItemButton>
+							</List>
+							<Divider />
+							<List disablePadding>
+								<ListItemButton
+									key="newDataSet"
+									onClick={(): any => {
+										setMenuVisibility(false);
+										showClearPageDialog();
+									}}
+								>
+									<ListItemText primary={i18n.newDataSet} />
+								</ListItemButton>
+							</List>
+						</div>
+					}
+				>
+					<span>
+						<IconButton size="small" aria-label={i18n.dataSetOptions} disabled={disabled} onClick={(): void => setMenuVisibility(true)}>
+							<ArrowDropDownIcon fontSize="large" />
+						</IconButton>
+					</span>
+				</HtmlTooltip>
+			</span>
+		);
+	};
+
+	const onFocus = (e: any): void => {
+		e.preventDefault();
+
+		// this prompts the Save Data Set dialog, which contains a note about having to login/register
+		if (!isLoggedIn || dataSetId === null) {
+			onSaveDataSet();
+			// @ts-ignore-line
+			inputFieldRef.current!.blur();
+		}
+	};
+
+	const maxInputFieldWidth = (width || 0) - 30;
+
+	return (
+		<>
+			<div ref={measureRef} style={{ display: 'flex' }}>
+				<AutoSizer
+					className="tour-dataSetName"
+					ref={inputFieldRef}
+					inputStyle={{ fontSize: 18, maxWidth: maxInputFieldWidth }}
+					placeholder={i18n.newDataSet}
+					onFocus={onFocus}
+					onChange={onChange}
+					onKeyUp={onKeyUp}
+					onBlur={onBlur}
+					value={newDataSetName}
+					disabled={disabled}
+				/>
+				{getMenu()}
+			</div>
+
+			<DeleteDataSetDialog
+				visible={dialogVisible}
+				onClose={(): void => setDeleteDialogVisibility(false)}
+				onDelete={(): any =>
+					deleteDataSet({
+						variables: {
+							dataSetId
+						}
+					})
+				}
+				i18n={i18n}
+			/>
+		</>
+	);
+};
+
+export default GeneratorControls;
diff --git a/apps/client/src/core/header/GeneratorControls.container.ts b/apps/client/src/core/header/GeneratorControls.container.ts
new file mode 100644
index 000000000..be00fed93
--- /dev/null
+++ b/apps/client/src/core/header/GeneratorControls.container.ts
@@ -0,0 +1,32 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import GeneratorControls, { GeneratorControlsProps } from './GeneratorControls.component';
+import * as selectors from '../store/generator/generator.selectors';
+import * as generatorActions from '~store/generator/generator.actions';
+import * as actions from '~store/account/account.actions';
+import * as mainSelectors from '~store/main/main.selectors';
+import { SaveDataDialogType } from '~store/account/account.reducer';
+
+const mapStateToProps = (state: any): Pick<GeneratorControlsProps, 'i18n' | 'isLoggedIn' | 'dataSet'> => ({
+	i18n: selectors.getCoreI18n(state),
+	isLoggedIn: mainSelectors.isLoggedIn(state),
+	dataSet: selectors.getCurrentDataSet(state)
+});
+
+const mapDispatchToProps = (
+	dispatch: Dispatch
+): Pick<GeneratorControlsProps, 'onUpdate' | 'onSaveDataSet' | 'onSaveAs' | 'onClearGrid' | 'showClearPageDialog' | 'onShowHistory'> => ({
+	onUpdate: (dataSetName: string): any => dispatch(actions.renameDataSet(dataSetName)),
+	onSaveDataSet: (): any => dispatch(actions.showSaveDataSetDialog(SaveDataDialogType.save)),
+	onSaveAs: (): any => dispatch(actions.showSaveDataSetDialog(SaveDataDialogType.saveAs)),
+	onClearGrid: (): any => dispatch(generatorActions.clearPage()),
+	showClearPageDialog: (): any => dispatch(generatorActions.showClearPageDialog()),
+	onShowHistory: (): any => {
+		dispatch(generatorActions.stashGeneratorState());
+		dispatch(generatorActions.showDataSetHistory());
+	}
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(GeneratorControls);
+
+export default container;
diff --git a/apps/client/src/core/header/Header.component.tsx b/apps/client/src/core/header/Header.component.tsx
new file mode 100644
index 000000000..b508a43c8
--- /dev/null
+++ b/apps/client/src/core/header/Header.component.tsx
@@ -0,0 +1,128 @@
+import React from 'react';
+import { useWindowSize } from 'react-hooks-window-size';
+import Button from '@mui/material/Button';
+import Menu from '@mui/material/Menu';
+import MenuIcon from '@mui/icons-material/Menu';
+import LoginDialog from '../dialogs/login/Login.container';
+import PasswordResetDialog from '../dialogs/passwordReset/PasswordReset.container';
+import GeneratorControls from './GeneratorControls.container';
+import C from '@generatedata/config/constants';
+import HeaderLinks, { MobileLinks } from './HeaderLinks.component';
+import { getHeaderLinks, getGeneratorPageRoute, isGeneratorPage } from '~utils/routeUtils';
+import { AccountType } from '~types/account';
+import sharedStyles from '../../styles/shared.scss';
+import styles from './Header.scss';
+import { GDLocale } from '~types/general';
+
+export type HeaderProps = {
+	locale: GDLocale;
+	currentPage: string;
+	isLoggedIn: boolean;
+	accountType: AccountType;
+	showLoginDialog: () => void;
+	i18n: any;
+	onLogout: () => void;
+	isAuth: boolean;
+	profileImage: string | null;
+	isOnloadAuthDetermined: boolean;
+};
+
+const Header = ({
+	i18n,
+	locale,
+	showLoginDialog,
+	profileImage,
+	isLoggedIn,
+	onLogout,
+	accountType,
+	isOnloadAuthDetermined,
+	currentPage
+}: HeaderProps) => {
+	const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
+	const windowSize = useWindowSize();
+
+	const handleClick = (event: React.MouseEvent<HTMLButtonElement>): void => {
+		setAnchorEl(event.currentTarget);
+	};
+
+	const handleClose = (): void => {
+		setAnchorEl(null);
+	};
+
+	const getNav = (): React.ReactNode => {
+		const headerLinks = getHeaderLinks(isLoggedIn, accountType);
+
+		if (windowSize.width <= C.SMALL_SCREEN_WIDTH) {
+			return (
+				<>
+					<Button aria-controls="nav-menu" aria-haspopup="true" onClick={handleClick}>
+						<MenuIcon fontSize="large" />
+					</Button>
+					{isOnloadAuthDetermined && (
+						<Menu id="nav-menu" anchorEl={anchorEl} keepMounted open={Boolean(anchorEl)} onClose={handleClose}>
+							<MobileLinks
+								locale={locale}
+								profileImage={profileImage}
+								currentPage={currentPage}
+								headerLinks={headerLinks}
+								showLoginDialog={showLoginDialog}
+								onLogout={onLogout}
+								i18n={i18n}
+							/>
+						</Menu>
+					)}
+				</>
+			);
+		}
+
+		return (
+			<ul className={styles.headerLinks}>
+				{isOnloadAuthDetermined ? (
+					<HeaderLinks
+						locale={locale}
+						profileImage={profileImage}
+						currentPage={currentPage}
+						headerLinks={headerLinks}
+						showLoginDialog={showLoginDialog}
+						onLogout={onLogout}
+						i18n={i18n}
+					/>
+				) : null}
+			</ul>
+		);
+	};
+
+	let generatorControlsClasses = `${sharedStyles.generatorControls} ${styles.controls}`;
+	let generatorControlsDisabled = true;
+	let logoClasses = sharedStyles.mainLogo;
+
+	if (isGeneratorPage(currentPage, locale)) {
+		generatorControlsClasses += ` ${sharedStyles.visible}`;
+		generatorControlsDisabled = false;
+	} else {
+		logoClasses += ` ${sharedStyles.visible}`;
+	}
+
+	return (
+		<>
+			<header className={styles.header}>
+				<div style={{ position: 'relative' }}>
+					<h1>
+						<img src="./images/dice80.png" width={40} height={40} alt={i18n.siteLogo} />
+					</h1>
+					<div className={logoClasses}>
+						<img src="./images/logo.png" alt="generatedata.com" />
+					</div>
+					<div className={generatorControlsClasses}>
+						<GeneratorControls disabled={generatorControlsDisabled} />
+					</div>
+					<nav>{getNav()}</nav>
+				</div>
+			</header>
+			<LoginDialog />
+			<PasswordResetDialog />
+		</>
+	);
+};
+
+export default Header;
diff --git a/apps/client/src/core/header/Header.container.ts b/apps/client/src/core/header/Header.container.ts
new file mode 100644
index 000000000..4364b13d2
--- /dev/null
+++ b/apps/client/src/core/header/Header.container.ts
@@ -0,0 +1,29 @@
+import { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import Header, { HeaderProps } from './Header.component';
+import { GDLocale } from '~types/general';
+import * as selectors from '../store/generator/generator.selectors';
+import * as accountSelectors from '../store/account/account.selectors';
+import * as mainSelectors from '../store/main/main.selectors';
+import * as mainActions from '../store/main/main.actions';
+
+const mapStateToProps = (state: any): Partial<HeaderProps> => ({
+	locale: mainSelectors.getLocale(state),
+	i18n: selectors.getCoreI18n(state),
+	currentPage: mainSelectors.getCurrentPage(state),
+	isLoggedIn: mainSelectors.isLoggedIn(state),
+	accountType: accountSelectors.getAccountType(state),
+	isOnloadAuthDetermined: mainSelectors.isOnloadAuthDetermined(state),
+	profileImage: accountSelectors.getProfileImage(state)
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): Partial<HeaderProps> => ({
+	// @ts-ignore - this looks invalid
+	onChangeLocale: (locale: GDLocale) => dispatch(mainActions.selectLocale(locale)),
+	showLoginDialog: (): any => dispatch(mainActions.setLoginDialogVisibility(true)),
+	onLogout: (): any => dispatch(mainActions.logout())
+});
+
+const container: any = connect(mapStateToProps, mapDispatchToProps)(Header);
+
+export default container;
diff --git a/apps/client/src/core/header/Header.scss b/apps/client/src/core/header/Header.scss
new file mode 100644
index 000000000..f694d599b
--- /dev/null
+++ b/apps/client/src/core/header/Header.scss
@@ -0,0 +1,183 @@
+@use '../../styles/variables' as c;
+
+.header {
+	background-image: url('./images/bg.png');
+	padding: 0 10px;
+	height: 60px;
+	display: flex;
+
+	img {
+		user-select: none;
+	}
+
+	& > div {
+		width: 100%;
+		max-width: 1400px;
+		margin: 0 auto;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	h1 {
+		flex: 0;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin: 4px 0 4px;
+		padding-right: 10px;
+	}
+
+	section {
+		float: right;
+	}
+
+	nav {
+		flex: 0 0 auto;
+		display: flex;
+		align-items: center;
+
+		ul {
+			display: flex;
+			align-items: center;
+			list-style: none;
+			font-size: 14px;
+
+			li {
+				display: inline-block;
+				margin: 0 10px;
+
+				&.current a {
+					color: #000000;
+				}
+			}
+		}
+	}
+
+	a {
+		text-decoration: none;
+	}
+
+	.controls {
+		flex: 1;
+		z-index: 1;
+
+		input {
+			color: #222222;
+			background-color: transparent;
+			border: 1px solid transparent;
+			transition: border 150ms ease-in-out;
+			text-overflow: ellipsis;
+
+			&:hover,
+			&:focus {
+				border: 1px solid c.$primary-color;
+				text-overflow: inherit;
+			}
+			&:focus {
+				color: #000000;
+			}
+		}
+	}
+
+	li.divider {
+		color: #c0c0c3;
+		user-select: none;
+		cursor: inherit;
+
+		&:hover {
+			color: #c0c0c3;
+		}
+	}
+}
+
+.headerLinks {
+	margin-right: 20px;
+	animation: fadein 1s;
+
+	li,
+	a {
+		color: #2e3d4e;
+		cursor: pointer;
+		font-size: 13px;
+		transition: color 0.1s ease-in-out;
+		text-decoration: none;
+
+		a:hover,
+		&:hover {
+			color: c.$primary-color;
+			text-decoration: none;
+		}
+	}
+
+	.userAccount {
+		display: flex;
+		align-items: center;
+
+		img {
+			width: 24px;
+			height: 24px;
+			border-radius: 12px;
+			margin-right: 6px;
+		}
+	}
+}
+
+.selected a {
+	color: c.$primary-color;
+}
+
+div ul {
+	li.logoutLink {
+		margin-right: 0;
+
+		button {
+			font-size: 22px;
+		}
+	}
+	li.localeSelector {
+		margin-right: 0;
+		button {
+			font-size: 22px;
+		}
+	}
+}
+
+.title {
+	h5 {
+		display: flex;
+		align-items: center;
+		max-width: calc(100% - 40px);
+	}
+
+	.flags {
+		background-image: url('./images/flags.png');
+		background-repeat: no-repeat;
+		background-size: 120px;
+		flex: 1;
+		width: 122px;
+		height: 22px;
+		display: inline-block;
+		margin-left: 15px;
+		margin-top: 2px;
+	}
+}
+
+div.selectedLocale {
+	background-color: c.$primary-pale-bg;
+	&:hover {
+		background-color: c.$primary-pale-bg;
+	}
+	span {
+		font-weight: bold;
+	}
+}
+
+@keyframes fadein {
+	from {
+		opacity: 0;
+	}
+	to {
+		opacity: 1;
+	}
+}
diff --git a/apps/client/src/core/header/Header.scss.d.ts b/apps/client/src/core/header/Header.scss.d.ts
new file mode 100644
index 000000000..979e4bec4
--- /dev/null
+++ b/apps/client/src/core/header/Header.scss.d.ts
@@ -0,0 +1,24 @@
+declare namespace HeaderScssNamespace {
+	export interface IHeaderScss {
+		controls: string;
+		current: string;
+		divider: string;
+		fadein: string;
+		flags: string;
+		header: string;
+		headerLinks: string;
+		localeSelector: string;
+		logoutLink: string;
+		selected: string;
+		selectedLocale: string;
+		title: string;
+		userAccount: string;
+	}
+}
+
+declare const HeaderScssModule: HeaderScssNamespace.IHeaderScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: HeaderScssNamespace.IHeaderScss;
+};
+
+export = HeaderScssModule;
diff --git a/apps/client/src/core/header/HeaderLinks.component.tsx b/apps/client/src/core/header/HeaderLinks.component.tsx
new file mode 100644
index 000000000..d94bbc290
--- /dev/null
+++ b/apps/client/src/core/header/HeaderLinks.component.tsx
@@ -0,0 +1,187 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import MenuItem from '@mui/material/MenuItem';
+import IconButton from '@mui/material/IconButton';
+import LogoutIcon from '@mui/icons-material/PowerSettingsNew';
+import { GDCustomHeaderLink, GDHeaderLink, GDLocale } from '~types/general';
+import { getUnlocalizedGeneratorRoute, removeLocale } from '~utils/routeUtils';
+import { Tooltip } from '~components/tooltips';
+import LanguageSelector from './LanguageSelector.container';
+import * as styles from './Header.scss';
+
+export type HeaderLinksProps = {
+	locale: GDLocale;
+	currentPage: string;
+	headerLinks: GDHeaderLink[];
+	showLoginDialog: () => void;
+	onLogout: () => void;
+	profileImage: string | null;
+	i18n: any;
+};
+
+const getClassName = (path: string, currentPage: string): string => {
+	const currentPageWithoutLocale = removeLocale(currentPage);
+	const pathWithSlash = path.charAt(0) === '/' ? path : `/${path}`;
+
+	if (pathWithSlash === '/' && currentPage === '/') {
+		return styles.selected;
+	}
+
+	return currentPageWithoutLocale === pathWithSlash ? styles.selected : '';
+};
+
+const getLink = (link: string, locale: GDLocale): string => (locale === 'en' ? link : `/${locale}${link}`);
+
+export const MobileLinks = ({ locale, currentPage, headerLinks, showLoginDialog, onLogout, i18n }: HeaderLinksProps) => {
+	const links: any = [];
+	const generatorPath = getUnlocalizedGeneratorRoute();
+
+	headerLinks.forEach((headerLink) => {
+		if (typeof headerLink === 'object' && headerLink.path) {
+			const link = headerLink as GDCustomHeaderLink;
+			links.push(
+				<MenuItem key={link.path} component={Link} className={getClassName(link.path, currentPage)} to={getLink(link.path, locale)}>
+					{i18n[link.labelI18nKey]}
+				</MenuItem>
+			);
+		} else if (headerLink === 'generator') {
+			links.push(
+				<MenuItem key="generator" component={Link} className={getClassName(generatorPath, currentPage)} to={getLink(generatorPath, locale)}>
+					{i18n.generator}
+				</MenuItem>
+			);
+		} else if (headerLink === 'dataSets') {
+			links.push(
+				<MenuItem key="dataSets" component={Link} className={getClassName('datasets', currentPage)} to={getLink('/datasets', locale)}>
+					{i18n.dataSets}
+				</MenuItem>
+			);
+		} else if (headerLink === 'userAccount') {
+			const classes = `${styles.userAccount} ${getClassName('account', currentPage)}`;
+			links.push(
+				<MenuItem key="account" component={Link} className={classes} to={getLink('/account', locale)}>
+					{i18n.yourAccount}
+				</MenuItem>
+			);
+		} else if (headerLink === 'accounts') {
+			links.push(
+				<MenuItem key="accounts" component={Link} className={getClassName('accounts', currentPage)} to={getLink('/accounts', locale)}>
+					{i18n.accounts}
+				</MenuItem>
+			);
+		} else if (headerLink === 'logout') {
+			links.push(
+				<MenuItem key="logout" className={styles.logoutLink} onClick={onLogout}>
+					{i18n.logout}
+				</MenuItem>
+			);
+		} else if (headerLink === 'register') {
+			links.push(
+				<MenuItem key="register" component={Link} className={getClassName('register', currentPage)} to={getLink('/register', locale)}>
+					{i18n.register}
+				</MenuItem>
+			);
+		} else if (headerLink === 'loginDialog') {
+			links.push(
+				<MenuItem key="loginDialog" onClick={showLoginDialog}>
+					{i18n.login}
+				</MenuItem>
+			);
+		}
+	});
+
+	return (
+		<>
+			{links}
+			<LanguageSelector isMobile={true} />
+		</>
+	);
+};
+
+export const HeaderLinks = ({ locale, currentPage, headerLinks, showLoginDialog, profileImage, onLogout, i18n }: HeaderLinksProps) => {
+	const links: any = [];
+	const generatorPath = getUnlocalizedGeneratorRoute();
+
+	headerLinks.forEach((headerLink, index) => {
+		if (typeof headerLink === 'object' && headerLink.path) {
+			const link = headerLink as GDCustomHeaderLink;
+			links.push(
+				<li key={link.path} className={getClassName(link.path, currentPage)}>
+					<Link to={getLink(link.path, locale)}>{i18n[link.labelI18nKey]}</Link>
+				</li>
+			);
+		} else if (headerLink === 'generator') {
+			links.push(
+				<li key="generator" className={getClassName(generatorPath, currentPage)}>
+					<Link to={getLink(generatorPath, locale)}>{i18n.generator}</Link>
+				</li>
+			);
+		} else if (headerLink === 'separator') {
+			links.push(
+				<li key={`separator-${index}`} className={styles.divider}>
+					|
+				</li>
+			);
+		} else if (headerLink === 'dataSets') {
+			links.push(
+				<li key="dataSets" className={getClassName('datasets', currentPage)}>
+					<Link to={getLink('/datasets', locale)}>{i18n.dataSets}</Link>
+				</li>
+			);
+		} else if (headerLink === 'userAccount') {
+			const userImage = profileImage ? <img src={profileImage} /> : null;
+			const classes = `${styles.userAccount} ${getClassName('account', currentPage)}`;
+
+			links.push(
+				<li key="account" className={classes}>
+					{userImage} <Link to={getLink('/account', locale)}>{i18n.yourAccount}</Link>
+				</li>
+			);
+		} else if (headerLink === 'accounts') {
+			links.push(
+				<li key="accounts" className={getClassName('accounts', currentPage)}>
+					<Link to={getLink('/accounts', locale)}>{i18n.accounts}</Link>
+				</li>
+			);
+		} else if (headerLink === 'logout') {
+			links.push(
+				<li className={styles.logoutLink} key="logout">
+					<Tooltip title={i18n.logout} placement="bottom" arrow>
+						<span>
+							<IconButton size="small" aria-label={i18n.closePanel} onClick={onLogout}>
+								<LogoutIcon fontSize="inherit" />
+							</IconButton>
+						</span>
+					</Tooltip>
+				</li>
+			);
+		} else if (headerLink === 'register') {
+			links.push(
+				<li key="register" className={getClassName('register', currentPage)}>
+					<Link to={getLink('/register', locale)}>{i18n.register}</Link>
+				</li>
+			);
+		} else if (headerLink === 'loginDialog') {
+			links.push(
+				<li key="loginDialog" onClick={showLoginDialog}>
+					{i18n.login}
+				</li>
+			);
+		} else if (headerLink === 'loginPage') {
+			links.push(
+				<li key="loginPage" className={getClassName('loginPage', currentPage)}>
+					<Link to={getLink('/login', locale)}>{i18n.login}</Link>
+				</li>
+			);
+		}
+	});
+
+	return (
+		<>
+			{links}
+			<LanguageSelector />
+		</>
+	);
+};
+
+export default HeaderLinks;
diff --git a/apps/client/src/core/header/LanguageSelector.component.tsx b/apps/client/src/core/header/LanguageSelector.component.tsx
new file mode 100644
index 000000000..a5bd6ba75
--- /dev/null
+++ b/apps/client/src/core/header/LanguageSelector.component.tsx
@@ -0,0 +1,121 @@
+import React, { useCallback } from 'react';
+import { IconButton, List, ListItemButton, ListItemText, MenuItem } from '@mui/material';
+import LanguageIcon from '@mui/icons-material/Language';
+import { Dialog, DialogContent, DialogTitle } from '~components/dialogs';
+import { Tooltip } from '~components/tooltips';
+import { DialogLoadingSpinner } from '~components/loaders/loaders';
+import { GDLocale } from '~types/general';
+import * as styles from '~core/header/Header.scss';
+import { useNavigate } from 'react-router';
+import clientConfig from '@generatedata/config/clientConfig';
+
+const allLocaleOptions = Object.keys(clientConfig.appSettings.GD_LOCALES).map((shortCode) => ({
+	value: shortCode,
+	label: clientConfig.appSettings.GD_LOCALES[shortCode as GDLocale]
+}));
+
+export type SelectorDialogProps = {
+	visible: boolean;
+	currentLocale: GDLocale;
+	onSelect: (locale: GDLocale, navigate: any) => void;
+	onClose: () => void;
+	loading: boolean;
+	onExited: () => void;
+	i18n: any;
+};
+
+const SelectorDialog = ({ visible, currentLocale, onSelect, onClose, onExited, loading, i18n }: SelectorDialogProps) => {
+	const navigate = useNavigate();
+
+	return (
+		<Dialog onClose={onClose} open={visible} TransitionProps={{ onExited }}>
+			<div style={{ width: 400 }}>
+				<DialogTitle onClose={onClose} className={styles.title}>
+					{i18n.selectLanguage}
+					<span className={styles.flags} />
+				</DialogTitle>
+				<DialogContent dividers>
+					<List disablePadding>
+						{allLocaleOptions.map((currLocale: any) => (
+							<ListItemButton
+								key={currLocale.value}
+								className={currentLocale === currLocale.value ? styles.selectedLocale : ''}
+								onClick={(): void => onSelect(currLocale.value, navigate)}
+							>
+								<ListItemText primary={currLocale.label} />
+							</ListItemButton>
+						))}
+					</List>
+				</DialogContent>
+			</div>
+			<DialogLoadingSpinner visible={loading} />
+		</Dialog>
+	);
+};
+
+export type LanguageSelectorProps = {
+	i18n: any;
+	locale: GDLocale;
+	isMobile: boolean;
+	availableLocales: GDLocale[];
+	onChangeLocale: (locale: GDLocale, history: any) => void;
+	isLocaleFileLoading: boolean;
+};
+
+const LanguageSelector = ({
+	locale,
+	isMobile = false,
+	availableLocales,
+	onChangeLocale,
+	isLocaleFileLoading,
+	i18n
+}: LanguageSelectorProps) => {
+	const [dialogVisible, setSelectorDialogVisible] = React.useState(false);
+	const [lastI18n, setLastI18n] = React.useState(i18n);
+
+	const onShowSelector = useCallback(() => setSelectorDialogVisible(true), []);
+	const onHideSelector = useCallback(() => setSelectorDialogVisible(false), []);
+	const updateLastI18n = (): void => setLastI18n(i18n);
+
+	if (availableLocales.length < 1) {
+		return null;
+	}
+
+	// note: this actually runs on render as well, but it makes no difference
+	React.useEffect(() => {
+		if (!isLocaleFileLoading) {
+			onHideSelector();
+		}
+	}, [isLocaleFileLoading]);
+
+	const trigger = isMobile ? (
+		<MenuItem onClick={onShowSelector}>{lastI18n.selectLanguage}</MenuItem>
+	) : (
+		<li className={styles.localeSelector} key="languageSelector">
+			<Tooltip title={lastI18n.selectLanguage} placement="bottom" arrow>
+				<span>
+					<IconButton aria-label="close" size="small" onClick={onShowSelector}>
+						<LanguageIcon fontSize="inherit" />
+					</IconButton>
+				</span>
+			</Tooltip>
+		</li>
+	);
+
+	return (
+		<>
+			{trigger}
+			<SelectorDialog
+				visible={dialogVisible}
+				currentLocale={locale}
+				onSelect={onChangeLocale}
+				onClose={onHideSelector}
+				i18n={lastI18n}
+				loading={isLocaleFileLoading}
+				onExited={updateLastI18n}
+			/>
+		</>
+	);
+};
+
+export default LanguageSelector;
diff --git a/apps/client/src/core/header/LanguageSelector.container.tsx b/apps/client/src/core/header/LanguageSelector.container.tsx
new file mode 100644
index 000000000..acee33925
--- /dev/null
+++ b/apps/client/src/core/header/LanguageSelector.container.tsx
@@ -0,0 +1,25 @@
+import { Dispatch } from 'redux';
+import { connect } from 'react-redux';
+import LanguageSelector, { LanguageSelectorProps } from './LanguageSelector.component';
+import { GDLocale } from '~types/general';
+import * as selectors from '../store/generator/generator.selectors';
+import * as mainSelectors from '../store/main/main.selectors';
+import * as mainActions from '../store/main/main.actions';
+import clientConfig from '@generatedata/config/clientConfig';
+
+const mapStateToProps = (state: any): Partial<LanguageSelectorProps> => ({
+	i18n: selectors.getCoreI18n(state),
+	locale: mainSelectors.getLocale(state),
+	availableLocales: clientConfig.appSettings.GD_LOCALES,
+	isLocaleFileLoading: mainSelectors.isLocaleFileLoading(state)
+});
+
+interface DispatchProps {
+	(dispatch: Dispatch, ownProps: any): Partial<LanguageSelectorProps>;
+}
+
+const mapDispatchToProps: DispatchProps = (dispatch) => ({
+	onChangeLocale: (locale: GDLocale, navigate: any): any => dispatch(mainActions.selectLocale(locale, navigate))
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(LanguageSelector);
diff --git a/apps/client/src/core/header/__tests__/GeneratorControls.container.test.tsx b/apps/client/src/core/header/__tests__/GeneratorControls.container.test.tsx
new file mode 100644
index 000000000..1e2b69413
--- /dev/null
+++ b/apps/client/src/core/header/__tests__/GeneratorControls.container.test.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import GeneratorControls from '../GeneratorControls.container';
+import { renderWithStoreAndRouter } from '../../../../tests/testHelpers';
+
+describe('Header', () => {
+	// need to finish deciding exactly what the header will contain before adding these tests
+
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<GeneratorControls />);
+
+		expect(baseElement.querySelector('div')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/header/__tests__/Header.container.test.tsx b/apps/client/src/core/header/__tests__/Header.container.test.tsx
new file mode 100644
index 000000000..c0c7bd91b
--- /dev/null
+++ b/apps/client/src/core/header/__tests__/Header.container.test.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import Header from '../Header.container';
+import { renderWithStoreAndRouter } from '../../../../tests/testHelpers';
+
+describe('Header', () => {
+	// need to finish deciding exactly what the header will contain before adding these tests
+
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<Header />);
+
+		expect(baseElement.querySelector('header')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/index.ts b/apps/client/src/core/index.ts
new file mode 100644
index 000000000..6cc31117f
--- /dev/null
+++ b/apps/client/src/core/index.ts
@@ -0,0 +1,55 @@
+/* istanbul ignore file */
+import store from './store';
+import C from '@generatedata/config/constants';
+import * as actions from './store/generator/generator.actions';
+import * as mainActions from './store/main/main.actions';
+import * as selectors from './store/generator/generator.selectors';
+import * as mainSelectors from './store/main/main.selectors';
+import { requestCountryNames } from '~store/generator/generator.actions';
+import { DataTypeFolder } from '@generatedata/plugins';
+import * as coreUtils from '../utils/coreUtils';
+import { initAuthVendors } from '@generatedata/utils/auth';
+import { getCurrentPageLocale } from '@generatedata/utils/lang';
+import '../../_imports';
+
+export const init = (): void => {
+	coreUtils.createGenerationWorker('preview');
+
+	const state = store.getState();
+	const pageLocale = getCurrentPageLocale();
+
+	// initialize any external vendors (Google, Github, Facebook) that are set up for login
+	initAuthVendors();
+
+	const isLoggedIn = mainSelectors.isLoggedIn(state);
+	const exportType = selectors.getExportType(state);
+	const numRows = selectors.getNumRows(state);
+
+	store.dispatch(mainActions.selectLocale(pageLocale));
+	store.dispatch(actions.onSelectExportType(exportType, { shouldRefreshPreviewPanel: false }));
+
+	const loadCountryNames = selectors.currentDataSetNeedsCountryNames(state);
+	if (loadCountryNames) {
+		store.dispatch(requestCountryNames());
+	}
+
+	// if there's a live session, verify the JWT is still valid
+	if (isLoggedIn) {
+		store.dispatch(mainActions.updateRefreshToken());
+	} else {
+		store.dispatch(mainActions.setOnloadAuthDetermined());
+	}
+
+	// if there are no rows, load some!
+	if (numRows === 0) {
+		store.dispatch(actions.addRows(C.NUM_DEFAULT_ROWS));
+	}
+
+	const preloadDataTypes = selectors.getRowDataTypes(state);
+
+	preloadDataTypes.forEach((dataType) =>
+		actions.loadDataTypeBundle(store.dispatch, store.getState, dataType as DataTypeFolder, {
+			shouldRefreshPreviewPanel: false
+		})
+	);
+};
diff --git a/apps/client/src/core/page/Page.component.tsx b/apps/client/src/core/page/Page.component.tsx
new file mode 100644
index 000000000..b767dbc50
--- /dev/null
+++ b/apps/client/src/core/page/Page.component.tsx
@@ -0,0 +1,28 @@
+import React, { PropsWithChildren } from 'react';
+import { Centered, DefaultSpinner } from '~components/loaders/loaders';
+import Header from '../header/Header.container';
+import Footer from '../footer/Footer.container';
+import * as styles from './Page.scss';
+
+export type PageProps = {
+	localeFileLoaded: boolean;
+	children: any;
+};
+
+const Page = ({ localeFileLoaded, children }: PropsWithChildren<PageProps>) => {
+	const content = localeFileLoaded ? (
+		<>
+			<Header />
+			<div className={styles.content}>{children}</div>
+			<Footer />
+		</>
+	) : (
+		<Centered>
+			<DefaultSpinner />
+		</Centered>
+	);
+
+	return <div className={styles.page}>{content}</div>;
+};
+
+export default Page;
diff --git a/apps/client/src/core/page/Page.container.ts b/apps/client/src/core/page/Page.container.ts
new file mode 100644
index 000000000..bd45788e9
--- /dev/null
+++ b/apps/client/src/core/page/Page.container.ts
@@ -0,0 +1,11 @@
+import { connect } from 'react-redux';
+import Page, { PageProps } from './Page.component';
+import * as mainSelectors from '../store/main/main.selectors';
+
+const mapStateToProps = (state: any): Pick<PageProps, 'localeFileLoaded'> => ({
+	localeFileLoaded: mainSelectors.localeFileLoaded(state)
+});
+
+const mapDispatchToProps = () => ({});
+
+export default connect(mapStateToProps, mapDispatchToProps)(Page);
diff --git a/apps/client/src/core/page/Page.scss b/apps/client/src/core/page/Page.scss
new file mode 100644
index 000000000..99ebac856
--- /dev/null
+++ b/apps/client/src/core/page/Page.scss
@@ -0,0 +1,72 @@
+@use '../../styles/variables' as c;
+@use 'sass:color';
+
+* {
+	box-sizing: border-box;
+}
+
+html,
+body {
+	height: 100%;
+	padding: 0;
+	margin: 0;
+	font-family: 'Open Sans', serif;
+	font-size: 12px;
+}
+
+input,
+select,
+textarea {
+	font-family: 'Open Sans', serif;
+	font-size: 12px;
+}
+
+:global(#root) {
+	height: 100%;
+}
+
+.page {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+:global(.page-home) .page {
+	display: inherit;
+
+	header {
+		position: fixed;
+		width: 100%;
+		z-index: 2;
+	}
+
+	.content {
+		padding-top: 60px;
+	}
+}
+
+.content {
+	flex: 1;
+	overflow: hidden;
+}
+
+input,
+textarea,
+select {
+	border-radius: 4px;
+	border: 1px solid #cccccc;
+	padding: 6px;
+	outline: none;
+
+	&:focus {
+		border: 1px solid c.$field-focus-color;
+	}
+}
+
+a {
+	color: c.$primary-color;
+
+	&:hover {
+		color: 1px solid color.adjust(c.$primary-color, $lightness: -30%);
+	}
+}
diff --git a/apps/client/src/core/page/Page.scss.d.ts b/apps/client/src/core/page/Page.scss.d.ts
new file mode 100644
index 000000000..effa7bcce
--- /dev/null
+++ b/apps/client/src/core/page/Page.scss.d.ts
@@ -0,0 +1,13 @@
+declare namespace PageScssNamespace {
+	export interface IPageScss {
+		content: string;
+		page: string;
+	}
+}
+
+declare const PageScssModule: PageScssNamespace.IPageScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: PageScssNamespace.IPageScss;
+};
+
+export = PageScssModule;
diff --git a/apps/client/src/core/page/__tests__/Page.container.test.tsx b/apps/client/src/core/page/__tests__/Page.container.test.tsx
new file mode 100644
index 000000000..993acc711
--- /dev/null
+++ b/apps/client/src/core/page/__tests__/Page.container.test.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import Page from '../Page.container';
+import { renderWithStoreAndRouter } from '../../../../tests/testHelpers';
+
+describe('Page', () => {
+	// need to finish deciding exactly what the header will contain before adding these tests
+
+	it('renders', () => {
+		const { baseElement } = renderWithStoreAndRouter(<Page />);
+
+		expect(baseElement.querySelector('header')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/core/queries.ts b/apps/client/src/core/queries.ts
new file mode 100644
index 000000000..258186549
--- /dev/null
+++ b/apps/client/src/core/queries.ts
@@ -0,0 +1,213 @@
+import { gql, TypedDocumentNode } from '@apollo/client';
+
+export type GetAccounts = {
+	accounts: {
+		totalCount: number;
+		results: {
+			accountId: number;
+			accountType: string;
+			accountStatus: string;
+			firstName: string;
+			lastName: string;
+			email: string;
+			country: string;
+			region: string;
+			dateCreated: string;
+			expiryDate: string;
+			lastLoggedIn: string;
+			numRowsGenerated: number;
+		}[];
+	};
+};
+
+export const GET_ACCOUNTS: TypedDocumentNode<GetAccounts> = gql`
+	query GetAccounts($limit: Int, $offset: Int, $sortCol: String, $sortDir: SortDir, $filterStr: String, $status: String) {
+		accounts(limit: $limit, offset: $offset, sortCol: $sortCol, sortDir: $sortDir, filterStr: $filterStr, status: $status) {
+			totalCount
+			results {
+				accountId
+				accountType
+				accountStatus
+				firstName
+				lastName
+				email
+				country
+				region
+				dateCreated
+				expiryDate
+				lastLoggedIn
+				numRowsGenerated
+			}
+		}
+	}
+`;
+
+export type DeleteAccount = {
+	deleteAccount: {
+		success: boolean;
+		error: string;
+	};
+};
+export const DELETE_ACCOUNT: TypedDocumentNode<DeleteAccount> = gql`
+	mutation DeleteAccount($accountId: ID!) {
+		deleteAccount(accountId: $accountId) {
+			success
+			error
+		}
+	}
+`;
+
+export const GET_DATA_SETS = gql`
+	query GetDataSets($limit: Int, $offset: Int, $sortCol: String, $sortDir: SortDir) {
+		dataSets(limit: $limit, offset: $offset, sortCol: $sortCol, sortDir: $sortDir) {
+			totalCount
+			results {
+				dataSetId
+				dataSetName
+				status
+				dateCreated
+				content
+				numRowsGenerated
+				historyDateCreatedUnix
+			}
+		}
+	}
+`;
+
+type GetDataSetHistory = {
+	dataSetHistory: {
+		totalCount: number;
+		results: {
+			historyId: number;
+			dateCreated: string;
+			content: any;
+		}[];
+	};
+};
+export const GET_DATA_SET_HISTORY: TypedDocumentNode<GetDataSetHistory> = gql`
+	query GetDataSetHistory($dataSetId: ID!, $limit: Int, $offset: Int) {
+		dataSetHistory(dataSetId: $dataSetId, limit: $limit, offset: $offset) {
+			totalCount
+			results {
+				historyId
+				dateCreated
+				content
+			}
+		}
+	}
+`;
+
+export const DELETE_DATA_SET = gql`
+	mutation DeleteDataSet($dataSetId: ID!) {
+		deleteDataSet(dataSetId: $dataSetId) {
+			success
+			error
+		}
+	}
+`;
+
+export const SAVE_NEW_DATA_SET = gql`
+	mutation SaveNewDataSet($dataSetName: String!, $content: String!) {
+		saveNewDataSet(dataSetName: $dataSetName, content: $content) {
+			success
+			error
+			dataSetId
+			savedDate
+		}
+	}
+`;
+
+type RenameDataSet = {
+	renameDataSet: {
+		success: boolean;
+		error: string;
+	};
+};
+export const RENAME_DATA_SET: TypedDocumentNode<RenameDataSet> = gql`
+	mutation RenameDataSet($dataSetId: ID!, $dataSetName: String!) {
+		renameDataSet(dataSetId: $dataSetId, dataSetName: $dataSetName) {
+			success
+			error
+		}
+	}
+`;
+
+export const SAVE_CURRENT_DATA_SET = gql`
+	mutation SaveDataSet($dataSetId: ID!, $content: String!) {
+		saveDataSet(dataSetId: $dataSetId, content: $content) {
+			success
+			error
+			dataSetId
+			savedDate
+		}
+	}
+`;
+
+export const SAVE_CURRENT_ACCOUNT = gql`
+	mutation UpdateCurrentAccount($firstName: String!, $lastName: String!, $email: String!, $country: String!, $region: String) {
+		updateCurrentAccount(firstName: $firstName, lastName: $lastName, email: $email, country: $country, region: $region) {
+			success
+		}
+	}
+`;
+
+export const SAVE_ACCOUNT = gql`
+	mutation UpdateAccount(
+		$accountId: ID!
+		$accountStatus: AccountStatus
+		$firstName: String!
+		$lastName: String!
+		$email: String!
+		$country: String!
+		$region: String
+		$expiryDate: String
+	) {
+		updateAccount(
+			accountId: $accountId
+			accountStatus: $accountStatus
+			firstName: $firstName
+			lastName: $lastName
+			email: $email
+			country: $country
+			region: $region
+			expiryDate: $expiryDate
+		) {
+			success
+		}
+	}
+`;
+
+export const UPDATE_PASSWORD = gql`
+	mutation UpdatePassword($currentPassword: String!, $newPassword: String!) {
+		updatePassword(currentPassword: $currentPassword, newPassword: $newPassword) {
+			success
+			error
+		}
+	}
+`;
+
+export const CREATE_USER_ACCOUNT = gql`
+	mutation CreateUserAccount(
+		$firstName: String!
+		$lastName: String!
+		$email: String!
+		$country: String
+		$region: String
+		$accountStatus: AccountStatus
+		$expiryDate: String
+		$oneTimePassword: String
+	) {
+		createUserAccount(
+			firstName: $firstName
+			lastName: $lastName
+			email: $email
+			country: $country
+			region: $region
+			accountStatus: $accountStatus
+			expiryDate: $expiryDate
+			oneTimePassword: $oneTimePassword
+		) {
+			success
+		}
+	}
+`;
diff --git a/apps/client/src/core/store/account/__tests__/account.selectors.test.ts b/apps/client/src/core/store/account/__tests__/account.selectors.test.ts
new file mode 100644
index 000000000..c1f96f0ab
--- /dev/null
+++ b/apps/client/src/core/store/account/__tests__/account.selectors.test.ts
@@ -0,0 +1,60 @@
+import { accountHasChanges } from '~store/account/account.selectors';
+import { cloneObj } from '@generatedata/utils/general';
+
+const defaultState: any = {
+	account: {
+		firstName: 'Pim',
+		lastName: 'Buttercup',
+		email: 'pim@whatever.net',
+		country: 'Mali',
+		region: 'Timbuktu',
+		editingData: {
+			firstName: 'Pim',
+			lastName: 'Buttercup',
+			email: 'pim@whatever.net',
+			country: 'Mali',
+			region: 'Timbuktu'
+		}
+	}
+};
+
+describe('accountHasChanges', () => {
+	it('returns false when there are no changes', () => {
+		expect(accountHasChanges(defaultState)).toEqual(false);
+	});
+
+	it('returns true when there are changes #1', () => {
+		const state: any = cloneObj(defaultState);
+		state.account.editingData.firstName = 'Pimmy';
+
+		expect(accountHasChanges(state)).toEqual(true);
+	});
+
+	it('returns true when there are changes #2', () => {
+		const state: any = cloneObj(defaultState);
+		state.account.editingData.lastName = 'Butter';
+
+		expect(accountHasChanges(state)).toEqual(true);
+	});
+
+	it('returns true when there are changes #3', () => {
+		const state: any = cloneObj(defaultState);
+		state.account.editingData.email = 'different@something.com';
+
+		expect(accountHasChanges(state)).toEqual(true);
+	});
+
+	it('returns true when there are changes #4', () => {
+		const state: any = cloneObj(defaultState);
+		state.account.editingData.country = 'United States';
+
+		expect(accountHasChanges(state)).toEqual(true);
+	});
+
+	it('returns true when there are changes #5', () => {
+		const state: any = cloneObj(defaultState);
+		state.account.editingData.region = 'Another region';
+
+		expect(accountHasChanges(state)).toEqual(true);
+	});
+});
diff --git a/apps/client/src/core/store/account/__tests__/account.store.test.ts b/apps/client/src/core/store/account/__tests__/account.store.test.ts
new file mode 100644
index 000000000..3c7374ea8
--- /dev/null
+++ b/apps/client/src/core/store/account/__tests__/account.store.test.ts
@@ -0,0 +1,185 @@
+import { FlushThunks } from 'redux-testkit';
+import { configureStore, Store } from '@reduxjs/toolkit';
+import { rootReducer } from '../../../../../tests/testHelpers';
+import * as actions from '../account.actions';
+import * as selectors from '../account.selectors';
+import { LOGOUT, setAuthenticationData } from '~store/main/main.actions';
+import { SaveDataDialogType } from '~store/account/account.reducer';
+import { AccountStatus, SelectedAccountTab } from '~types/account';
+import { AuthMethod } from '~types/general';
+
+describe('accounts section', () => {
+	let flushThunks;
+	let store: Store;
+
+	beforeEach(() => {
+		flushThunks = FlushThunks.createMiddleware();
+		store = configureStore({
+			reducer: rootReducer
+		});
+	});
+
+	it('updates an account', () => {
+		// check default account info state
+		expect(selectors.getFirstName(store.getState())).toEqual('');
+		expect(selectors.getLastName(store.getState())).toEqual('');
+		expect(selectors.getEmail(store.getState())).toEqual('');
+		expect(selectors.getCountry(store.getState())).toEqual('');
+		expect(selectors.getRegion(store.getState())).toEqual('');
+
+		store.dispatch(
+			actions.updateAccount({
+				firstName: 'Tom',
+				lastName: 'Jones',
+				email: 'tom@jones.net',
+				country: 'Canada',
+				region: 'British Columbia',
+				numRowsGenerated: 100
+			})
+		);
+
+		// check nothing has been changed in the main state for the user
+		expect(selectors.getFirstName(store.getState())).toEqual('');
+		expect(selectors.getLastName(store.getState())).toEqual('');
+		expect(selectors.getEmail(store.getState())).toEqual('');
+		expect(selectors.getCountry(store.getState())).toEqual('');
+		expect(selectors.getRegion(store.getState())).toEqual('');
+
+		// now confirm the editing data has been updated
+		const editingData = selectors.getEditingData(store.getState());
+		expect(editingData.firstName).toEqual('Tom');
+		expect(editingData.lastName).toEqual('Jones');
+		expect(editingData.email).toEqual('tom@jones.net');
+		expect(editingData.country).toEqual('Canada');
+		expect(editingData.region).toEqual('British Columbia');
+	});
+
+	it('cancelling changes resets back to default values', () => {
+		store.dispatch(
+			actions.updateAccount({
+				firstName: 'Tom',
+				lastName: 'Jones',
+				email: 'tom@jones.net',
+				country: 'Canada',
+				region: 'British Columbia',
+				numRowsGenerated: 100
+			})
+		);
+
+		const editingData = selectors.getEditingData(store.getState());
+		expect(editingData.firstName).toEqual('Tom');
+		expect(editingData.lastName).toEqual('Jones');
+		expect(editingData.email).toEqual('tom@jones.net');
+		expect(editingData.country).toEqual('Canada');
+		expect(editingData.region).toEqual('British Columbia');
+
+		store.dispatch(actions.cancelChanges());
+
+		const newEditingData = selectors.getEditingData(store.getState());
+		expect(newEditingData.firstName).toEqual('');
+		expect(newEditingData.lastName).toEqual('');
+		expect(newEditingData.email).toEqual('');
+		expect(newEditingData.country).toEqual('');
+		expect(newEditingData.region).toEqual('');
+	});
+
+	it('updating the account moves the editing data to the final values', () => {
+		store.dispatch(
+			actions.updateAccount({
+				firstName: 'Tom',
+				lastName: 'Jones',
+				email: 'tom@jones.net',
+				country: 'Canada',
+				region: 'British Columbia',
+				numRowsGenerated: 100
+			})
+		);
+
+		expect(selectors.getFirstName(store.getState())).toEqual('');
+		expect(selectors.getLastName(store.getState())).toEqual('');
+		expect(selectors.getEmail(store.getState())).toEqual('');
+		expect(selectors.getCountry(store.getState())).toEqual('');
+		expect(selectors.getRegion(store.getState())).toEqual('');
+
+		store.dispatch(actions.yourAccountUpdated());
+
+		expect(selectors.getFirstName(store.getState())).toEqual('Tom');
+		expect(selectors.getLastName(store.getState())).toEqual('Jones');
+		expect(selectors.getEmail(store.getState())).toEqual('tom@jones.net');
+		expect(selectors.getCountry(store.getState())).toEqual('Canada');
+		expect(selectors.getRegion(store.getState())).toEqual('British Columbia');
+	});
+
+	it('onChangeTab', () => {
+		// default selected tab
+		expect(selectors.getSelectedTab(store.getState())).toEqual('dataSets');
+
+		// change tabs
+		store.dispatch(actions.onChangeTab(SelectedAccountTab.yourAccount));
+		expect(selectors.getSelectedTab(store.getState())).toEqual(SelectedAccountTab.yourAccount);
+
+		store.dispatch(actions.onChangeTab(SelectedAccountTab.changePassword));
+		expect(selectors.getSelectedTab(store.getState())).toEqual(SelectedAccountTab.changePassword);
+	});
+
+	it('save dialog visibility', () => {
+		expect(selectors.shouldShowSaveDataSetDialog(store.getState())).toEqual(false);
+
+		store.dispatch(actions.showSaveDataSetDialog(SaveDataDialogType.save));
+		expect(selectors.shouldShowSaveDataSetDialog(store.getState())).toEqual(true);
+
+		store.dispatch(actions.hideSaveDataSetDialog());
+		expect(selectors.shouldShowSaveDataSetDialog(store.getState())).toEqual(false);
+	});
+
+	it('auth data gets set', () => {
+		store.dispatch(
+			setAuthenticationData({
+				authMethod: AuthMethod.google,
+				token: '123456',
+				accountId: 5,
+				firstName: 'Jim',
+				lastName: 'Beam',
+				email: 'jim@beam.net',
+				country: 'United States',
+				region: 'Montana',
+				profileImage: 'image-here.jpg',
+				expiryDate: '1000010101001',
+				dateCreated: '1000010101001',
+				accountType: 'admin',
+				accountStatus: AccountStatus.live,
+				numRowsGenerated: 50000
+			})
+		);
+
+		expect(selectors.getFirstName(store.getState())).toEqual('Jim');
+		expect(selectors.getLastName(store.getState())).toEqual('Beam');
+		expect(selectors.getEmail(store.getState())).toEqual('jim@beam.net');
+		expect(selectors.getCountry(store.getState())).toEqual('United States');
+		expect(selectors.getRegion(store.getState())).toEqual('Montana');
+		expect(selectors.getProfileImage(store.getState())).toEqual('image-here.jpg');
+		expect(selectors.getAccountType(store.getState())).toEqual('admin');
+		expect(selectors.getNumGeneratedRows(store.getState())).toEqual(50000);
+	});
+
+	it('logging out clears the pertinent account info', () => {
+		store.dispatch(
+			actions.updateAccount({
+				firstName: 'Tom',
+				lastName: 'Jones',
+				email: 'tom@jones.net',
+				country: 'Canada',
+				region: 'British Columbia',
+				numRowsGenerated: 100
+			})
+		);
+
+		store.dispatch({ type: LOGOUT });
+
+		expect(selectors.getFirstName(store.getState())).toEqual('');
+		expect(selectors.getLastName(store.getState())).toEqual('');
+		expect(selectors.getEmail(store.getState())).toEqual('');
+		expect(selectors.getCountry(store.getState())).toEqual('');
+		expect(selectors.getRegion(store.getState())).toEqual('');
+	});
+});
diff --git a/apps/client/src/core/store/account/account.actions.ts b/apps/client/src/core/store/account/account.actions.ts
new file mode 100644
index 000000000..a18cc4fe1
--- /dev/null
+++ b/apps/client/src/core/store/account/account.actions.ts
@@ -0,0 +1,323 @@
+import { Dispatch } from 'redux';
+import { format } from 'date-fns';
+import { apolloClient } from '../../apolloClient';
+import { AccountEditingData, SaveDataDialogType } from '~store/account/account.reducer';
+import { getEditingData, getSelectedAccountsPageTab } from '~store/account/account.selectors';
+import { getCurrentDataSetId, getDataSetSavePackage } from '~store/generator/generator.selectors';
+import { AccountStatus, SelectedAccountsTab, SelectedAccountTab } from '~types/account';
+import { GDAction } from '~types/general';
+import { addToast } from '@generatedata/utils/general';
+import { getStrings } from '@generatedata/utils/lang';
+import * as queries from '~core/queries';
+import type { RenameDataSet } from '~core/queries';
+import { SET_ONE_TIME_PASSWORD } from '~store/main/main.actions';
+
+export const UPDATE_ACCOUNT = 'UPDATE_ACCOUNT';
+export const updateAccount = (data: AccountEditingData): GDAction => ({
+	type: UPDATE_ACCOUNT,
+	payload: {
+		...data
+	}
+});
+
+export const CHANGE_ACCOUNT_TAB = 'CHANGE_ACCOUNT_TAB';
+export const onChangeTab = (tab: SelectedAccountTab): GDAction => ({
+	type: CHANGE_ACCOUNT_TAB,
+	payload: {
+		tab
+	}
+});
+
+export const CHANGE_ACCOUNTS_TAB = 'CHANGE_ACCOUNTS_TAB';
+export const onChangeAccountsTab = (tab: SelectedAccountsTab): GDAction => ({
+	type: CHANGE_ACCOUNTS_TAB,
+	payload: {
+		tab
+	}
+});
+
+export const ON_EDIT_ACCOUNT = 'ON_EDIT_ACCOUNT';
+export const editAccount = (accountInfo: any): GDAction => ({
+	type: ON_EDIT_ACCOUNT,
+	payload: {
+		accountInfo
+	}
+});
+
+export const ON_EDIT_YOUR_ACCOUNT = 'ON_EDIT_YOUR_ACCOUNT';
+export const onEditYourAccount = (): GDAction => ({
+	type: ON_EDIT_YOUR_ACCOUNT
+});
+
+export const CANCEL_ACCOUNT_CHANGES = 'CANCEL_ACCOUNT_CHANGES';
+export const cancelChanges = (): GDAction => ({ type: CANCEL_ACCOUNT_CHANGES });
+
+export const YOUR_ACCOUNT_UPDATED = 'YOUR_ACCOUNT_UPDATED';
+export const yourAccountUpdated = (): GDAction => ({
+	type: YOUR_ACCOUNT_UPDATED
+});
+
+// simple garbage collection. If the user happened to be on Edit Account page when navigating away, reset it back
+// to the main Accounts page. Otherwise the data may not still be available when navigating back
+export const onCleanupAccountsPage =
+	(): any =>
+		async (dispatch: Dispatch, getState: any): Promise<any> => {
+			const tab = getSelectedAccountsPageTab(getState());
+
+			if (tab === SelectedAccountsTab.editAccount) {
+				dispatch(onChangeAccountsTab(SelectedAccountsTab.accounts));
+			}
+		};
+
+export const saveYourAccount =
+	(): any =>
+		async (dispatch: Dispatch, getState: any): Promise<any> => {
+			const i18n = getStrings();
+
+			const { firstName, lastName, email, country, region } = getEditingData(getState());
+
+			await apolloClient.mutate({
+				mutation: queries.SAVE_CURRENT_ACCOUNT,
+				variables: { firstName, lastName, email, country, region }
+			});
+
+			addToast({
+				type: 'success',
+				message: i18n.core.yourAccountUpdated
+			});
+
+			dispatch(yourAccountUpdated());
+		};
+
+// for an admin updating an account
+export const saveAccount =
+	(data: any): any =>
+		async (dispatch: Dispatch): Promise<any> => {
+			const i18n = getStrings();
+			const { accountId, firstName, lastName, email, country, region, disabled, expiryDate } = data;
+
+			const accountStatus = getAccountStatus(disabled, expiryDate);
+
+			let cleanExpiryDate = null;
+			if (expiryDate) {
+				cleanExpiryDate = expiryDate;
+			}
+
+			await apolloClient.mutate({
+				mutation: queries.SAVE_ACCOUNT,
+				variables: {
+					accountId,
+					accountStatus,
+					firstName,
+					lastName,
+					email,
+					country,
+					region,
+					expiryDate: cleanExpiryDate
+				}
+			});
+
+			addToast({
+				type: 'success',
+				message: i18n.core.userAccountUpdated
+			});
+
+			dispatch(onChangeAccountsTab(SelectedAccountsTab.accounts));
+		};
+
+export const clearOneTimePassword = (): GDAction => ({
+	type: SET_ONE_TIME_PASSWORD,
+	payload: {
+		password: ''
+	}
+});
+
+export const savePassword =
+	(currentPassword: string, newPassword: string, onSuccess: () => void, onError: () => void): any =>
+		async (dispatch: Dispatch): Promise<any> => {
+			const i18n = getStrings();
+
+			const response = await apolloClient.mutate({
+				mutation: queries.UPDATE_PASSWORD,
+				variables: { currentPassword, newPassword }
+			});
+
+			if (!response.data.updatePassword.success) {
+				onError();
+				return;
+			}
+
+			dispatch(clearOneTimePassword());
+
+			addToast({
+				type: 'success',
+				message: i18n.core.passwordUpdated
+			});
+
+			onSuccess();
+		};
+
+export const SHOW_SAVE_DATA_SET_DIALOG = 'SHOW_SAVE_DATA_SET_DIALOG';
+export const showSaveDataSetDialog = (dialogType: SaveDataDialogType): GDAction => ({
+	type: SHOW_SAVE_DATA_SET_DIALOG,
+	payload: {
+		dialogType
+	}
+});
+
+export const HIDE_SAVE_DATA_SET_DIALOG = 'HIDE_SAVE_DATA_SET_DIALOG';
+export const hideSaveDataSetDialog = (): GDAction => ({
+	type: HIDE_SAVE_DATA_SET_DIALOG
+});
+
+export const LOAD_DATA_SETS = 'LOAD_DATA_SETS';
+export const SET_CURRENT_DATA_SET = 'SET_CURRENT_DATA_SET';
+
+export const saveNewDataSet =
+	(dataSetName: string): any =>
+		async (dispatch: Dispatch, getState: any): Promise<any> => {
+			const i18n = getStrings();
+			const data: any = getDataSetSavePackage(getState());
+
+			const response = await apolloClient.mutate({
+				mutation: queries.SAVE_NEW_DATA_SET,
+				variables: {
+					dataSetName,
+					content: JSON.stringify(data)
+				}
+			});
+
+			if (response.data.saveNewDataSet.success) {
+				dispatch({
+					type: SET_CURRENT_DATA_SET,
+					payload: {
+						dataSetName,
+						dataSetId: parseInt(response.data.saveNewDataSet.dataSetId, 10)
+					}
+				});
+
+				dispatch(hideSaveDataSetDialog());
+
+				addToast({
+					type: 'success',
+					message: i18n.core.dataSetSaved
+				});
+			}
+
+		// TODO error handling
+		};
+
+export const UPDATE_CURRENT_DATA_SET_LAST_SAVED = 'UPDATE_CURRENT_DATA_SET_LAST_SAVED';
+export const updateCurrentDataSetLastSaved = (lastSaved: any): GDAction => ({
+	type: UPDATE_CURRENT_DATA_SET_LAST_SAVED,
+	payload: {
+		lastSaved
+	}
+});
+
+export const saveCurrentDataSet =
+	(successMsg?: string): any =>
+		async (dispatch: Dispatch, getState: any): Promise<any> => {
+			const i18n = getStrings();
+
+			const successMessage = successMsg || i18n.core.dataSetSaved;
+			const state = getState();
+			const data: any = getDataSetSavePackage(state);
+			const dataSetId = getCurrentDataSetId(state);
+
+			const response = await apolloClient.mutate({
+				mutation: queries.SAVE_CURRENT_DATA_SET,
+				variables: {
+					dataSetId,
+					content: JSON.stringify(data)
+				}
+			});
+
+			if (response.data.saveDataSet.success) {
+				dispatch(updateCurrentDataSetLastSaved(response.data.saveDataSet.savedDate));
+
+				addToast({
+					type: 'success',
+					message: successMessage
+				});
+			}
+		};
+
+export const UPDATE_CURRENT_DATA_SET_NAME = 'UPDATE_CURRENT_DATA_SET_NAME';
+export const renameDataSet =
+	(dataSetName: string): any =>
+		async (dispatch: Dispatch, getState: any): Promise<any> => {
+			const dataSetId = getCurrentDataSetId(getState());
+
+			const { data } = await apolloClient.mutate({
+				mutation: queries.RENAME_DATA_SET,
+				variables: {
+					dataSetId,
+					dataSetName
+				}
+			});
+
+			if ((data as RenameDataSet).renameDataSet.success) {
+				dispatch({
+					type: UPDATE_CURRENT_DATA_SET_NAME,
+					payload: {
+						dataSetName
+					}
+				});
+			}
+		};
+
+export const createAccount =
+	(data: any) =>
+		async (dispatch: Dispatch): Promise<any> => {
+			const i18n = getStrings();
+			const { firstName, lastName, email, country, region, disabled, expiry, expiryDate, oneTimePassword } = data;
+			const accountStatus = getAccountStatus(disabled, expiryDate);
+
+			const expiryDateValue = expiry && expiry !== 'none' ? expiryDate.toString() : null;
+			const response = await apolloClient.mutate({
+				mutation: queries.CREATE_USER_ACCOUNT,
+				variables: {
+					firstName,
+					lastName,
+					email,
+					country,
+					region,
+					accountStatus,
+					oneTimePassword,
+					expiryDate: expiryDateValue
+				}
+			});
+
+			if (response.data.createUserAccount.success) {
+				dispatch(onChangeAccountsTab(SelectedAccountsTab.accounts));
+
+				addToast({
+					type: 'success',
+					message: i18n.core.accountCreatedDesc
+				});
+			} else {
+				addToast({
+					type: 'error',
+					message: i18n.core.errorCreatingAccount
+				});
+			}
+		};
+
+export const getAccountStatus = (disabled: boolean, expiryDate: number): AccountStatus => {
+	let accountStatus = AccountStatus.live;
+	if (disabled) {
+		accountStatus = AccountStatus.disabled;
+	} else {
+		// check the expiry date hasn't already passed
+		if (expiryDate) {
+			const now = Number(format(new Date(), 'T'));
+			const expiryDateNum = parseInt(expiryDate.toString()); // ensure it's a number
+
+			if (expiryDateNum < now) {
+				accountStatus = AccountStatus.expired;
+			}
+		}
+	}
+	return accountStatus;
+};
diff --git a/apps/client/src/core/store/account/account.reducer.ts b/apps/client/src/core/store/account/account.reducer.ts
new file mode 100644
index 000000000..12814e0c1
--- /dev/null
+++ b/apps/client/src/core/store/account/account.reducer.ts
@@ -0,0 +1,189 @@
+import { AnyAction } from 'redux';
+import { produce } from 'immer';
+import * as mainActions from '../main/main.actions';
+import * as actions from '../account/account.actions';
+import * as packetActions from '../packets/packets.actions';
+import { AccountStatus, AccountType, SelectedAccountsTab, SelectedAccountTab } from '~types/account';
+
+// use for both Edit Account, Your Account. Your Account only uses a subset of the fields.
+export type AccountEditingData = {
+	firstName: string;
+	lastName: string;
+	email: string;
+	country: string;
+	region: string;
+	oneTimePassword?: string;
+	numRowsGenerated: number;
+	expiryDate?: number;
+	disabled?: boolean;
+	accountId?: number;
+	status?: AccountStatus;
+};
+
+export enum SaveDataDialogType {
+	save = 'save',
+	saveAs = 'saveAs'
+}
+
+export type AccountState = {
+	showSaveDataSetDialog: boolean;
+	saveDataDialogType: SaveDataDialogType;
+	oneTimePassword: string;
+	firstName: string;
+	lastName: string;
+	email: string;
+	country: string;
+	region: string;
+	expiryDate: string;
+	accountType: AccountType;
+	profileImage: string | null;
+	numRowsGenerated: number;
+	dataSets: any[];
+	selectedTab: SelectedAccountTab;
+	selectedAccountsTab: SelectedAccountsTab;
+	editingData: AccountEditingData;
+};
+
+export const initialState: AccountState = {
+	showSaveDataSetDialog: false,
+	saveDataDialogType: SaveDataDialogType.save,
+	oneTimePassword: '',
+	firstName: '',
+	lastName: '',
+	email: '',
+	country: '',
+	region: '',
+	expiryDate: '',
+	accountType: 'user',
+	profileImage: null,
+	numRowsGenerated: 0,
+	dataSets: [],
+	selectedTab: SelectedAccountTab.dataSets,
+	selectedAccountsTab: SelectedAccountsTab.accounts,
+	editingData: {
+		firstName: '',
+		lastName: '',
+		email: '',
+		country: '',
+		region: '',
+		numRowsGenerated: 0,
+		expiryDate: undefined,
+		disabled: undefined,
+		accountId: undefined,
+		status: undefined
+	}
+};
+
+export const reducer = produce((draft: AccountState, action: AnyAction) => {
+	switch (action.type) {
+		case mainActions.LOGOUT:
+		case mainActions.RESET_STORE:
+			Object.keys(initialState).forEach((key) => {
+				// @ts-ignore-line
+				draft[key] = initialState[key];
+			});
+			break;
+
+		case mainActions.SET_AUTHENTICATION_DATA: {
+			const { firstName, lastName, expiryDate, accountType, email, country, region, profileImage, numRowsGenerated } = action.payload;
+			draft.firstName = firstName;
+			draft.lastName = lastName;
+			draft.email = email;
+			draft.country = country;
+			draft.region = region;
+			draft.expiryDate = expiryDate;
+			draft.accountType = accountType;
+			draft.profileImage = profileImage;
+			draft.numRowsGenerated = numRowsGenerated;
+			break;
+		}
+
+		case mainActions.SET_ONE_TIME_PASSWORD:
+			draft.oneTimePassword = action.payload.password;
+			break;
+
+		case actions.CHANGE_ACCOUNT_TAB:
+			draft.selectedTab = action.payload.tab;
+			break;
+
+		case actions.ON_EDIT_YOUR_ACCOUNT:
+			draft.editingData = {
+				firstName: draft.firstName,
+				lastName: draft.lastName,
+				email: draft.email,
+				country: draft.country,
+				region: draft.region,
+				numRowsGenerated: 0,
+				expiryDate: undefined,
+				disabled: undefined,
+				accountId: undefined,
+				status: undefined
+			};
+			break;
+
+		case actions.CHANGE_ACCOUNTS_TAB:
+			draft.selectedAccountsTab = action.payload.tab;
+			break;
+
+		case actions.UPDATE_ACCOUNT:
+			draft.editingData = action.payload;
+			break;
+
+		case actions.CANCEL_ACCOUNT_CHANGES:
+			draft.editingData = {
+				...draft.editingData,
+				firstName: draft.firstName,
+				lastName: draft.lastName,
+				email: draft.email,
+				country: draft.country,
+				region: draft.region
+			};
+			break;
+
+		case actions.YOUR_ACCOUNT_UPDATED:
+			draft.firstName = draft.editingData.firstName;
+			draft.lastName = draft.editingData.lastName;
+			draft.email = draft.editingData.email;
+			draft.country = draft.editingData.country;
+			draft.region = draft.editingData.region;
+			break;
+
+		case actions.SHOW_SAVE_DATA_SET_DIALOG:
+			draft.showSaveDataSetDialog = true;
+			draft.saveDataDialogType = action.payload.dialogType;
+			break;
+
+		case actions.HIDE_SAVE_DATA_SET_DIALOG:
+			draft.showSaveDataSetDialog = false;
+			break;
+
+		case actions.LOAD_DATA_SETS:
+			draft.dataSets = action.payload.dataSets;
+			break;
+
+		case actions.ON_EDIT_ACCOUNT:
+			const { accountId, accountStatus, firstName, lastName, email, country, region, expiryDate, numRowsGenerated } =
+				action.payload.accountInfo;
+
+			draft.selectedAccountsTab = SelectedAccountsTab.editAccount;
+			draft.editingData = {
+				accountId,
+				disabled: accountStatus === AccountStatus.disabled,
+				status: accountStatus,
+				firstName,
+				lastName,
+				email,
+				country,
+				region,
+				expiryDate,
+				numRowsGenerated
+			};
+			break;
+
+		case packetActions.UPDATE_TOTAL_GENERATION_COUNT:
+			draft.numRowsGenerated += action.payload.count;
+			break;
+	}
+}, initialState);
+
+export default reducer;
diff --git a/apps/client/src/core/store/account/account.selectors.ts b/apps/client/src/core/store/account/account.selectors.ts
new file mode 100644
index 000000000..240fa6530
--- /dev/null
+++ b/apps/client/src/core/store/account/account.selectors.ts
@@ -0,0 +1,36 @@
+import { Store } from '~types/general';
+import { AccountType, SelectedAccountTab, SelectedAccountsTab } from '~types/account';
+import { AccountEditingData, SaveDataDialogType } from '~store/account/account.reducer';
+import { createSelector } from 'reselect';
+
+export const getFirstName = (state: Store): string => state.account.firstName;
+export const getLastName = (state: Store): string => state.account.lastName;
+export const getEmail = (state: Store): string => state.account.email;
+export const getCountry = (state: Store): string => state.account.country;
+export const getRegion = (state: Store): string => state.account.region;
+export const getAccountType = (state: Store): AccountType => state.account.accountType;
+export const getNumGeneratedRows = (state: Store): number => state.account.numRowsGenerated;
+export const getProfileImage = (state: Store): string | null => state.account.profileImage;
+export const getSelectedTab = (state: Store): SelectedAccountTab => state.account.selectedTab;
+export const getEditingData = (state: Store): AccountEditingData => state.account.editingData;
+export const shouldShowSaveDataSetDialog = (state: Store): boolean => state.account.showSaveDataSetDialog;
+export const getSaveDataDialogType = (state: Store): SaveDataDialogType => state.account.saveDataDialogType;
+export const getDataSets = (state: Store): any[] => state.account.dataSets;
+export const getSelectedAccountsPageTab = (state: Store): SelectedAccountsTab => state.account.selectedAccountsTab;
+export const getOneTimePassword = (state: Store): string => state.account.oneTimePassword;
+export const getExpiryDate = (state: Store): string => state.account.expiryDate;
+
+export const accountHasChanges = createSelector(
+	getFirstName,
+	getLastName,
+	getEmail,
+	getCountry,
+	getRegion,
+	getEditingData,
+	(firstName, lastName, email, country, region, editingData): boolean =>
+		firstName !== editingData.firstName ||
+		lastName !== editingData.lastName ||
+		email !== editingData.email ||
+		country !== editingData.country ||
+		region !== editingData.region
+);
diff --git a/apps/client/src/core/store/generator/__tests__/generator.selectors.test.ts b/apps/client/src/core/store/generator/__tests__/generator.selectors.test.ts
new file mode 100644
index 000000000..a1ec29e71
--- /dev/null
+++ b/apps/client/src/core/store/generator/__tests__/generator.selectors.test.ts
@@ -0,0 +1,121 @@
+import { shouldGeneratePreviewRows } from '../generator.selectors';
+import { getTestState } from '../../../../../tests/testHelpers';
+import { Store } from '~types/general';
+
+describe('shouldGeneratePreviewRows', () => {
+	let state: Store;
+	beforeEach(() => {
+		state = getTestState();
+	});
+
+	it('return false when there\'s no data type rows', () => {
+		state.generator.loadedExportTypes.JSON = true;
+		state.main.localeFileLoaded = true;
+		expect(shouldGeneratePreviewRows(state)).toEqual(false);
+	});
+
+	it('return false when there is a data type but it\'s not loaded yet', () => {
+		state.generator.loadedExportTypes.JSON = true;
+		state.main.localeFileLoaded = true;
+		state.generator.rows = {
+			abc: {
+				id: 'abc',
+				dataType: 'Names',
+				title: 'Test',
+				titleError: null,
+				data: {}
+			}
+		};
+		state.generator.loadedDataTypes.Names = false;
+		expect(shouldGeneratePreviewRows(state)).toEqual(false);
+	});
+
+	it('return true when there is a single data type that\'s been loaded', () => {
+		state.generator.loadedExportTypes.JSON = true;
+		state.main.localeFileLoaded = true;
+		state.generator.rows = {
+			abc: {
+				id: 'abc',
+				dataType: 'Names',
+				title: 'Test',
+				titleError: null,
+				data: {}
+			}
+		};
+		state.generator.loadedDataTypes.Names = true;
+		expect(shouldGeneratePreviewRows(state)).toEqual(true);
+	});
+
+	it('with multiple data types only returns true when they\'re all loaded', () => {
+		state.generator.loadedExportTypes.JSON = true;
+		state.main.localeFileLoaded = true;
+		state.generator.rows = {
+			abc: {
+				id: 'abc',
+				dataType: 'Names',
+				title: 'Test 1',
+				titleError: null,
+				data: {}
+			},
+			def: {
+				id: 'def',
+				dataType: 'Phone',
+				title: 'Test 2',
+				titleError: null,
+				data: {}
+			},
+			ghi: {
+				id: 'ghi',
+				dataType: 'City',
+				title: 'Test 3',
+				titleError: null,
+				data: {}
+			}
+		};
+		state.generator.loadedDataTypes.Names = true;
+		expect(shouldGeneratePreviewRows(state)).toEqual(false);
+
+		state.generator.loadedDataTypes.City = true;
+		const newState1 = JSON.parse(JSON.stringify(state));
+		expect(shouldGeneratePreviewRows(newState1)).toEqual(false);
+
+		newState1.generator.loadedDataTypes.Phone = true;
+		const newState2 = JSON.parse(JSON.stringify(newState1));
+		expect(shouldGeneratePreviewRows(newState2)).toEqual(true);
+	});
+
+	it('should return false when the current export type isn\'t loaded yet', () => {
+		state.generator.loadedExportTypes.JSON = false; // just to be explicit
+		state.main.localeFileLoaded = true;
+		state.generator.rows = {
+			abc: {
+				id: 'abc',
+				dataType: 'Names',
+				title: 'Test',
+				titleError: null,
+				data: {}
+			}
+		};
+		state.generator.loadedDataTypes.Names = true;
+		expect(shouldGeneratePreviewRows(state)).toEqual(false);
+	});
+
+	it('should return false when all row data has already been generated', () => {
+		state.generator.loadedExportTypes.JSON = true;
+		state.main.localeFileLoaded = true;
+		state.generator.rows = {
+			abc: {
+				id: 'abc',
+				dataType: 'Names',
+				title: 'Test',
+				titleError: null,
+				data: {}
+			}
+		};
+		state.generator.dataTypePreviewData = {
+			abc: 'random data here'
+		};
+		state.generator.loadedDataTypes.Names = true;
+		expect(shouldGeneratePreviewRows(state)).toEqual(false);
+	});
+});
diff --git a/apps/client/src/core/store/generator/__tests__/generator.test.ts b/apps/client/src/core/store/generator/__tests__/generator.test.ts
new file mode 100644
index 000000000..baa17a5e9
--- /dev/null
+++ b/apps/client/src/core/store/generator/__tests__/generator.test.ts
@@ -0,0 +1,237 @@
+import { createStore, combineReducers } from 'redux';
+import * as actions from '../generator.actions';
+import * as selectors from '../generator.selectors';
+import generatorReducer from '../generator.reducer';
+import mainReducer from '../../main/main.reducer';
+import { GeneratorLayout } from '@generatedata/types';
+
+describe('generator section', () => {
+	let store: any;
+	beforeEach(() => {
+		store = createStore(
+			combineReducers({
+				generator: generatorReducer,
+				main: mainReducer
+			})
+		);
+	});
+
+	it('the grid panel is visible by default', () => {
+		expect(selectors.isGridVisible(store.getState())).toEqual(true);
+	});
+
+	it('toggling GRID updates the store', () => {
+		store.dispatch(actions.toggleGrid());
+		expect(selectors.isGridVisible(store.getState())).toEqual(false);
+
+		store.dispatch(actions.toggleGrid());
+		expect(selectors.isGridVisible(store.getState())).toEqual(true);
+	});
+
+	it('the preview panel is visible by default', () => {
+		expect(selectors.isPreviewVisible(store.getState())).toEqual(true);
+	});
+
+	it('toggling PREVIEW updates the store', () => {
+		store.dispatch(actions.togglePreview());
+		expect(selectors.isPreviewVisible(store.getState())).toEqual(false);
+
+		store.dispatch(actions.togglePreview());
+		expect(selectors.isPreviewVisible(store.getState())).toEqual(true);
+	});
+
+	it('hiding the grid when preview is closed reopens preview', () => {
+		// close the preview panel first
+		store.dispatch(actions.togglePreview());
+		expect(selectors.isPreviewVisible(store.getState())).toEqual(false);
+
+		// now close the grid
+		store.dispatch(actions.toggleGrid());
+		expect(selectors.isGridVisible(store.getState())).toEqual(false);
+
+		// now check preview is back open again
+		expect(selectors.isPreviewVisible(store.getState())).toEqual(true);
+	});
+
+	it('hiding the preview panel when grid is closed reopens grid', () => {
+		// close the grid panel first
+		store.dispatch(actions.toggleGrid());
+		expect(selectors.isGridVisible(store.getState())).toEqual(false);
+
+		// now close the preview panel
+		store.dispatch(actions.togglePreview());
+		expect(selectors.isPreviewVisible(store.getState())).toEqual(false);
+
+		// now check grid is back open again
+		expect(selectors.isGridVisible(store.getState())).toEqual(true);
+	});
+
+	it('layout is horizontal by default', () => {
+		expect(selectors.getGeneratorLayout(store.getState())).toEqual(GeneratorLayout.horizontal);
+	});
+
+	it('toggling the layout', () => {
+		store.dispatch(actions.toggleLayout());
+		expect(selectors.getGeneratorLayout(store.getState())).toEqual(GeneratorLayout.vertical);
+
+		store.dispatch(actions.toggleLayout());
+		expect(selectors.getGeneratorLayout(store.getState())).toEqual(GeneratorLayout.horizontal);
+	});
+
+	it('sets the default number of rows to 5', () => {
+		expect(selectors.getNumPreviewRows(store.getState())).toEqual(5);
+	});
+
+	it('updates the number of preview rows', () => {
+		store.dispatch(actions.updateNumPreviewRows(10));
+		expect(selectors.getNumPreviewRows(store.getState())).toEqual(10);
+	});
+});
+
+describe('grid rows', () => {
+	let store: any;
+	beforeEach(() => {
+		store = createStore(
+			combineReducers({
+				generator: generatorReducer,
+				main: mainReducer
+			})
+		);
+	});
+
+	it('adds rows, well, adds rows', () => {
+		expect(selectors.getNumRows(store.getState())).toEqual(0);
+		store.dispatch(actions.addRows(10));
+		expect(selectors.getNumRows(store.getState())).toEqual(10);
+	});
+
+	it('added rows get listed as sortable', () => {
+		store.dispatch(actions.addRows(5));
+		const rows = selectors.getRows(store.getState());
+		const rowKeys = Object.keys(rows);
+		expect(rowKeys.length).toEqual(5);
+		expect(selectors.getSortedRows(store.getState()).length).toEqual(5);
+	});
+
+	it('added second batch of rows appends to end', () => {
+		store.dispatch(actions.addRows(5));
+		store.dispatch(actions.addRows(5));
+
+		const rows = selectors.getRows(store.getState());
+		const rowKeys = Object.keys(rows);
+		expect(rowKeys.length).toEqual(10);
+		expect(selectors.getSortedRows(store.getState()).length).toEqual(10);
+	});
+
+	it('removing a row removes it from both rows and sorted rows', () => {
+		store.dispatch(actions.addRows(5));
+		const rows = selectors.getRows(store.getState());
+		const rowKeys = Object.keys(rows);
+		store.dispatch(actions.removeRow(rowKeys[0]));
+
+		// check the `rows` property is updated
+		const updatedRows = selectors.getRows(store.getState());
+		const updateRowKeys = Object.keys(updatedRows);
+		expect(updateRowKeys.length).toEqual(4);
+
+		// check the `sortedRows` property is also updated
+		const sortedRows = selectors.getSortedRows(store.getState());
+		expect(sortedRows.length).toEqual(4);
+	});
+
+	// fit('changes the row title', () => {
+	// 	store.dispatch(actions.addRows(3));
+	//
+	// 	// should be blank by default
+	// 	const rows = selectors.getSortedRowsArray(store.getState());
+	// 	expect(rows[0].title).toEqual('');
+	// 	expect(rows[1].title).toEqual('');
+	// 	expect(rows[2].title).toEqual('');
+	//
+	// 	store.dispatch(actions.onChangeTitle(rows[1].id, 'new value!'));
+	// 	const updatedRows = selectors.getSortedRowsArray(store.getState());
+	// 	expect(updatedRows[0].title).toEqual('');
+	// 	expect(updatedRows[1].title).toEqual('new value!');
+	// 	expect(updatedRows[2].title).toEqual('');
+	// });
+
+	// fit('changes the data type', () => {
+	// 	store.dispatch(actions.addRows(3));
+	//
+	// 	const rows = selectors.getSortedRowsArray(store.getState());
+	// 	expect(rows[0].dataType).toEqual(null);
+	// 	expect(rows[1].dataType).toEqual(null);
+	// 	expect(rows[2].dataType).toEqual(null);
+	//
+	// 	sinon.stub(dataTypeUtils, 'requestDataTypeBundle').returns(Promise.resolve({}));
+	// 	actions.onSelectDataType('Names', rows[1].id);
+	//
+	// 	// const dispatches = Thunk(actions.onSelectDataType(rows[1].id, 'JSON')).execute();
+	// 	// console.log(dispatches);
+	//
+	// 	const updatedRows = selectors.getSortedRowsArray(store.getState());
+	// 	expect(updatedRows[0].dataType).toEqual(null);
+	// 	expect(updatedRows[1].dataType).toEqual('Names');
+	// 	expect(updatedRows[2].dataType).toEqual(null);
+	// });
+
+	// it('initializes the default data type state when selecting data type', () => {
+	// 	const defaultState = {
+	// 		arbitrary: 1,
+	// 		content: true
+	// 	};
+
+	// 	sinon.stub(dateTypeUtils, 'getDataTypeDefaultState')
+	// 		.onCall(0).returns(defaultState);
+
+	// 	store.dispatch(actions.addRows(1));
+	// 	const rows = selectors.getSortedRowsArray(store.getState());
+	// 	store.dispatch(actions.onSelectDataType(rows[0].id, 'JSON'));
+
+	// 	const updatedRows = selectors.getSortedRowsArray(store.getState());
+	// 	expect(updatedRows[0].data).toEqual(defaultState);
+
+	// 	sinon.restore();
+	// });
+});
+
+describe('preview panel settings', () => {
+	let store: any;
+	beforeEach(() => {
+		store = createStore(
+			combineReducers({
+				generator: generatorReducer,
+				main: mainReducer
+			})
+		);
+	});
+
+	it('adds rows, well, adds rows', () => {
+		expect(selectors.getNumRows(store.getState())).toEqual(0);
+		store.dispatch(actions.addRows(10));
+		expect(selectors.getNumRows(store.getState())).toEqual(10);
+	});
+});
+
+describe('misc selectors', () => {
+	let store: any;
+	beforeEach(() => {
+		store = createStore(
+			combineReducers({
+				generator: generatorReducer,
+				main: mainReducer
+			})
+		);
+	});
+
+	describe('getRowDataTypes', () => {
+		it('returns nothing when there are no rows', () => {
+			expect(selectors.getRowDataTypes(store.getState())).toEqual([]);
+		});
+
+		// it("returns a single row's data type", () => {
+		// 	store.dispatch(actions.addRows(1));
+		// 	expect(selectors.getRowDataTypes(store.getState())).toEqual([]);
+		// });
+	});
+});
diff --git a/apps/client/src/core/store/generator/generator.actions.ts b/apps/client/src/core/store/generator/generator.actions.ts
new file mode 100644
index 000000000..385ea1b56
--- /dev/null
+++ b/apps/client/src/core/store/generator/generator.actions.ts
@@ -0,0 +1,549 @@
+import { Dispatch } from 'redux';
+import * as selectors from './generator.selectors';
+import { getCurrentDataSet, isCountryNamesLoaded, isCountryNamesLoading } from './generator.selectors';
+import { ExportSettingsTab } from '../../generator/exportSettings/ExportSettings.types';
+import { DataTypeFolder, ExportTypeFolder } from '@generatedata/plugins';
+import { registerInterceptors } from '../../actionInterceptor';
+import { requestDataTypeBundle } from '~utils/dataTypes';
+import * as coreUtils from '../../../utils/coreUtils';
+import { getStrings } from '@generatedata/utils/lang';
+import { getUniqueString } from '@generatedata/utils/string';
+import { getExportTypeInitialState, loadExportTypeBundle } from '~utils/exportTypes';
+import { addToast } from '@generatedata/utils/general';
+import { DTBundle, DTOptionsMetadata } from '~types/dataTypes';
+import { GDAction } from '~types/general';
+import C from '@generatedata/config/constants';
+import { getUnchangedData } from '../../generationPanel/generation.helpers';
+import * as accountActions from '~store/account/account.actions';
+import { DataSetListItem } from '@generatedata/types';
+import { getUnique } from '@generatedata/utils/array';
+import { getCountryNamesBundle } from '../../../utils/coreUtils';
+import { getCountryData } from '@generatedata/plugins';
+import { GenerationWorkerActionType } from '~core/generator/generation.types';
+
+export const ADD_ROWS = 'ADD_ROWS';
+export const addRows = (numRows: number): GDAction => ({
+	type: ADD_ROWS,
+	payload: {
+		numRows
+	}
+});
+
+export const REMOVE_ROW = 'REMOVE_ROW';
+export const removeRow = (id: string): GDAction => ({
+	type: REMOVE_ROW,
+	payload: { id }
+});
+
+export const CHANGE_TITLE = 'CHANGE_TITLE';
+export const onChangeTitle =
+	(id: string, value: string): any =>
+		async (dispatch: Dispatch, getState: any): Promise<any> => {
+			const state = getState();
+			const validateTitle = selectors.getExportTypeTitleValidationFunction(state);
+
+			let titleError = null;
+			if (validateTitle) {
+				const i18n = selectors.getExportTypeI18n(state);
+				const settings = selectors.getCurrentExportTypeSettings(state);
+				titleError = validateTitle(value, i18n, settings);
+			}
+
+			dispatch({
+				type: CHANGE_TITLE,
+				payload: {
+					id,
+					value,
+					titleError
+				}
+			});
+		};
+
+export type LoadDataTypeBundleOptions = {
+	gridRowId?: string;
+	shouldRefreshPreviewPanel?: boolean;
+	onLoadComplete?: (dataType: DataTypeFolder) => void;
+};
+
+export const SELECT_DATA_TYPE = 'SELECT_DATA_TYPE';
+export const onSelectDataType =
+	(dataType: DataTypeFolder, opts: LoadDataTypeBundleOptions = {}): any =>
+		(dispatch: any, getState: any): any =>
+			loadDataTypeBundle(dispatch, getState, dataType, opts);
+
+export const loadDataTypeBundle = (
+	dispatch: Dispatch,
+	getState: any,
+	dataType: DataTypeFolder,
+	opts: LoadDataTypeBundleOptions = {}
+): void => {
+	const options = {
+		gridRowId: null,
+		shouldRefreshPreviewPanel: true,
+		...opts
+	};
+
+	const dataTypeI18n = selectors.getDataTypeI18n(getState());
+
+	let defaultTitle: string | null = null;
+	if (dataTypeI18n && dataTypeI18n[dataType]) {
+		defaultTitle = dataTypeI18n[dataType].DEFAULT_TITLE ? dataTypeI18n[dataType].DEFAULT_TITLE : dataType.toLowerCase();
+		const titles = selectors.getTitles(getState());
+		defaultTitle = getUniqueString(defaultTitle as string, titles);
+	}
+
+	requestDataTypeBundle(dataType).then((bundle: DTBundle) => {
+		dispatch(dataTypeLoaded(dataType));
+		if (bundle.actionInterceptors) {
+			registerInterceptors(dataType, bundle.actionInterceptors);
+		}
+
+		// if it's been selected within the grid, select the row and update the preview panel
+		const ids = [];
+		if (options.gridRowId) {
+			ids.push(options.gridRowId);
+			dispatch({
+				type: SELECT_DATA_TYPE,
+				payload: {
+					id: options.gridRowId,
+					value: dataType,
+					data: bundle.initialState,
+					defaultTitle
+				}
+			});
+		}
+
+		if (options.shouldRefreshPreviewPanel) {
+			dispatch(refreshPreview(ids));
+		}
+
+		// workaround to allow batch loading a bunch of different Data Types onload, and have the callee track what's
+		// been loaded to know when to do the refreshPreview() call
+		if (options.onLoadComplete) {
+			options.onLoadComplete(dataType);
+		}
+	});
+};
+
+export const REQUEST_COUNTRY_NAMES = 'REQUEST_COUNTRY_NAMES';
+export const COUNTRY_NAMES_LOADED = 'COUNTRY_NAMES_LOADED';
+export const requestCountryNames =
+	(): any =>
+		(dispatch: any): any => {
+			dispatch({ type: REQUEST_COUNTRY_NAMES });
+
+			getCountryNamesBundle().then(() => {
+				dispatch({ type: COUNTRY_NAMES_LOADED });
+			});
+		};
+
+export const CONFIGURE_DATA_TYPE = 'CONFIGURE_DATA_TYPE';
+export const onConfigureDataType = (id: string, data: any, metadata?: DTOptionsMetadata, triggeredByInterceptor = false): any => {
+	return (dispatch: any, getState: any): any => {
+		if (metadata && metadata.useCountryNames) {
+			const state = getState();
+			if (!isCountryNamesLoaded(state) && !isCountryNamesLoading(state)) {
+				dispatch(requestCountryNames());
+			}
+		}
+
+		const configureDataType = (disp: any): any =>
+			new Promise((resolve: any) => {
+				disp({
+					type: CONFIGURE_DATA_TYPE,
+					triggeredByInterceptor,
+					payload: {
+						id,
+						data,
+						metadata
+					}
+				});
+				resolve();
+			});
+		configureDataType(dispatch).then(() => dispatch(refreshPreview([id])));
+	};
+};
+
+export const CONFIGURE_EXPORT_TYPE = 'CONFIGURE_EXPORT_TYPE';
+export const configureExportType = (data: any): GDAction => ({
+	type: CONFIGURE_EXPORT_TYPE,
+	payload: {
+		data
+	}
+});
+
+export const REPOSITION_ROW = 'REPOSITION_ROW';
+export const repositionRow = (id: string, newIndex: number): GDAction => ({
+	type: REPOSITION_ROW,
+	payload: {
+		id,
+		newIndex
+	}
+});
+
+export const TOGGLE_GRID = 'TOGGLE_GRID';
+export const toggleGrid = (): GDAction => ({ type: TOGGLE_GRID });
+
+export const TOGGLE_PREVIEW = 'TOGGLE_PREVIEW';
+export const togglePreview = (): GDAction => ({ type: TOGGLE_PREVIEW });
+
+export const REFRESH_PREVIEW_DATA = 'REFRESH_PREVIEW_DATA';
+
+// this re-generates the preview panel data. This doesn't have to be called on boot-up because the preview data is
+// generated on the fly, saved in the store and rehydrated when the app loads
+export const refreshPreview = (idsToRefresh: string[] = [], onComplete: any = null): any => {
+	const generationWorker = coreUtils.getGenerationWorker('preview');
+
+	return (dispatch: any, getState: any): any => {
+		const state = getState();
+		const i18n = getStrings();
+
+		const template = selectors.getGenerationTemplate(state);
+		const dataTypePreviewData = { ...selectors.getDataTypePreviewData(state) };
+		const columns = selectors.getColumns(state);
+		const unchanged = getUnchangedData(idsToRefresh, columns, dataTypePreviewData);
+
+		// for initial bootup the page may be empty. This ensures the onComplete action fires (the `onmessage` doesn't fire
+		// when no columns)
+		if (!columns.length && onComplete) {
+			dispatch(onComplete());
+		}
+
+		// here we DO need to generate the data independently of the final string in the appropriate export type format.
+		// That allows us to tease out what changes on each keystroke in the UI and only refresh specific fields - it's
+		// far clearer to the end user that way
+		generationWorker.postMessage({
+			action: GenerationWorkerActionType.ProcessDataTypesOnly,
+			numResults: C.MAX_PREVIEW_ROWS,
+			batchSize: C.MAX_PREVIEW_ROWS,
+			unchanged,
+			columns,
+			i18n,
+			template,
+			countryNames: coreUtils.getCountryNames(),
+			workerUtilsUrl: coreUtils.getWorkerUtilsUrl(),
+			dataTypeWorkerMap: coreUtils.getDataTypeWorkerMap(selectors.getRowDataTypes(state) as DataTypeFolder[]),
+			countryData: getCountryData()
+		});
+
+		generationWorker.onmessage = (e: MessageEvent): void => {
+			if (e.data.event !== GenerationWorkerActionType.DataTypesProcessed) {
+				return;
+			}
+			const { generatedData } = e.data.data;
+
+			columns.forEach(({ id }, index: number) => {
+				if (idsToRefresh.length && idsToRefresh.indexOf(id) === -1) {
+					return;
+				}
+				dataTypePreviewData[id] = generatedData.map((row: any): any => row[index]);
+			});
+
+			// great! So we've generated the data we need and manually only changed those lines that have just changed
+			// by the user via the UI. The CodeMirrorWrapper component handles passing off that info to the export type
+			// web worker to generate the final string
+			dispatch({
+				type: REFRESH_PREVIEW_DATA,
+				payload: {
+					dataTypePreviewData
+				}
+			});
+
+			if (onComplete) {
+				dispatch(onComplete());
+			}
+		};
+	};
+};
+
+export const TOGGLE_LAYOUT = 'TOGGLE_LAYOUT';
+export const toggleLayout = (): GDAction => ({ type: TOGGLE_LAYOUT });
+
+export const UPDATE_NUM_PREVIEW_ROWS = 'UPDATE_NUM_PREVIEW_ROWS';
+export const updateNumPreviewRows = (numRows: number): GDAction => ({
+	type: UPDATE_NUM_PREVIEW_ROWS,
+	payload: { numRows }
+});
+
+export const CHANGE_THEME = 'CHANGE_THEME';
+export const changeTheme = (theme: string): GDAction => ({
+	type: CHANGE_THEME,
+	payload: { theme }
+});
+
+export const TOGGLE_SHOW_LINE_NUMBERS = 'TOGGLE_SHOW_LINE_NUMBERS';
+export const toggleShowLineNumbers = (): GDAction => ({
+	type: TOGGLE_SHOW_LINE_NUMBERS
+});
+
+export const TOGGLE_LINE_WRAPPING = 'TOGGLE_LINE_WRAPPING';
+export const toggleLineWrapping = (): GDAction => ({
+	type: TOGGLE_LINE_WRAPPING
+});
+
+export const SET_PREVIEW_TEXT_SIZE = 'SET_PREVIEW_TEXT_SIZE';
+export const setPreviewTextSize = (previewTextSize: number): GDAction => ({
+	type: SET_PREVIEW_TEXT_SIZE,
+	payload: {
+		previewTextSize
+	}
+});
+
+export const TOGGLE_EXPORT_SETTINGS = 'TOGGLE_EXPORT_SETTINGS';
+export const toggleExportSettings = (tab?: ExportSettingsTab): GDAction => ({
+	type: TOGGLE_EXPORT_SETTINGS,
+	payload: {
+		tab
+	}
+});
+
+export const HIDE_EXPORT_SETTINGS = 'HIDE_EXPORT_SETTINGS';
+export const hideExportSettings = (): GDAction => ({
+	type: HIDE_EXPORT_SETTINGS
+});
+
+export type LoadExportTypeBundleOptions = {
+	shouldRefreshPreviewPanel?: boolean;
+	onLoadComplete?: (exportType: ExportTypeFolder) => void;
+};
+
+export const SELECT_EXPORT_TYPE = 'SELECT_EXPORT_TYPE';
+export const onSelectExportType = (exportType: ExportTypeFolder, opts: LoadExportTypeBundleOptions = {}): any => {
+	return (dispatch: any): any => {
+		dispatch({
+			type: SELECT_EXPORT_TYPE,
+			payload: {
+				exportType
+			}
+		});
+
+		loadExportTypeBundle(exportType).then((bundle: DTBundle) => {
+			dispatch(exportTypeLoaded(exportType, bundle.initialState));
+
+			if (opts.shouldRefreshPreviewPanel) {
+				dispatch(refreshPreview());
+			}
+			if (opts.onLoadComplete) {
+				opts.onLoadComplete(exportType);
+			}
+		});
+	};
+};
+
+export const EXPORT_TYPE_LOADED = 'EXPORT_TYPE_LOADED';
+export const exportTypeLoaded = (exportType: ExportTypeFolder, initialState: any): GDAction => ({
+	type: EXPORT_TYPE_LOADED,
+	payload: {
+		exportType,
+		initialState
+	}
+});
+
+export const DATA_TYPE_LOADED = 'DATA_TYPE_LOADED';
+export const dataTypeLoaded = (dataType: DataTypeFolder): GDAction => ({
+	type: DATA_TYPE_LOADED,
+	payload: {
+		dataType
+	}
+});
+
+export const SHOW_GENERATION_SETTINGS_PANEL = 'SHOW_GENERATION_SETTINGS_PANEL';
+export const showGenerationSettingsPanel = (): GDAction => ({
+	type: SHOW_GENERATION_SETTINGS_PANEL
+});
+
+export const HIDE_START_GENERATION_PANEL = 'HIDE_START_GENERATION_PANEL';
+export const hideStartGenerationPanel = (): GDAction => ({
+	type: HIDE_START_GENERATION_PANEL
+});
+
+export const SHOW_HELP_DIALOG = 'SHOW_HELP_DIALOG';
+export const showHelpDialog = (dataType: DataTypeFolder): GDAction => ({
+	type: SHOW_HELP_DIALOG,
+	payload: {
+		dataType
+	}
+});
+
+export const SHOW_SCHEMA_DIALOG = 'SHOW_SCHEMA_DIALOG';
+export const showDataTemplateDialog = (): GDAction => ({
+	type: SHOW_SCHEMA_DIALOG
+});
+
+export const HIDE_SCHEMA_DIALOG = 'HIDE_SCHEMA_DIALOG';
+export const hideSchemaDialog = (): GDAction => ({ type: HIDE_SCHEMA_DIALOG });
+
+export const HIDE_HELP_DIALOG = 'HIDE_HELP_DIALOG';
+export const hideHelpDialog = (): GDAction => ({ type: HIDE_HELP_DIALOG });
+
+export const UPDATE_NUM_ROWS_TO_GENERATE = 'UPDATE_NUM_ROWS_TO_GENERATE';
+export const updateNumRowsToGenerate = (numRowsToGenerate: number): GDAction => ({
+	type: UPDATE_NUM_ROWS_TO_GENERATE,
+	payload: {
+		numRowsToGenerate
+	}
+});
+
+export const TOGGLE_STRIP_WHITESPACE = 'TOGGLE_STRIP_WHITESPACE';
+export const toggleStripWhitespace = (): GDAction => ({
+	type: TOGGLE_STRIP_WHITESPACE
+});
+
+export const CLEAR_GRID = 'CLEAR_GRID';
+export const RESET_GENERATOR = 'RESET_GENERATOR';
+export const clearPage =
+	(addDefaultRows = true): any =>
+		(dispatch: Dispatch, getState: any): void => {
+			const loadedExportTypes = selectors.getLoadedExportTypesArray(getState());
+
+			const exportTypeInitialStates: any = {};
+			loadedExportTypes.forEach((et) => {
+				exportTypeInitialStates[et] = getExportTypeInitialState(et as ExportTypeFolder);
+			});
+
+			dispatch({
+				type: RESET_GENERATOR,
+				payload: {
+					exportTypeInitialStates
+				}
+			});
+
+			if (addDefaultRows) {
+				dispatch(addRows(5));
+			}
+		};
+
+export const SET_PANEL_SIZE = 'SET_PANEL_SIZE';
+export const setPanelSize = (size: number): GDAction => ({
+	type: SET_PANEL_SIZE,
+	payload: {
+		size
+	}
+});
+
+export const CHANGE_SMALL_SCREEN_VISIBLE_PANEL = 'CHANGE_SMALL_SCREEN_VISIBLE_PANEL';
+export const changeSmallScreenVisiblePanel = (): GDAction => ({
+	type: CHANGE_SMALL_SCREEN_VISIBLE_PANEL
+});
+
+export const SET_INITIAL_DEPENDENCIES_LOADED = 'SET_INITIAL_DEPENDENCIES_LOADED';
+export const setInitialDependenciesLoaded = (): GDAction => ({
+	type: SET_INITIAL_DEPENDENCIES_LOADED
+});
+
+export const SET_BULK_ACTION = 'SET_BULK_ACTION';
+export const LOAD_DATA_SET = 'LOAD_DATA_SET';
+
+export const loadDataSet =
+	(dataSet: DataSetListItem, showToast = true): any =>
+		async (dispatch: Dispatch, getState: any): Promise<any> => {
+			const i18n = getStrings();
+			const { exportType, exportTypeSettings, rows, sortedRows } = JSON.parse(dataSet.content);
+
+			const dataTypes = sortedRows.map((hash: string) => rows[hash].dataType).filter((dataType: DataTypeFolder | null) => dataType !== null);
+			const uniqueDataTypes = getUnique(dataTypes);
+
+			dispatch({
+				type: SET_BULK_ACTION,
+				payload: {
+					isComplete: false
+				}
+			});
+
+			// load all the datasets and export type
+			dispatch(onSelectExportType(exportType, { shouldRefreshPreviewPanel: false }));
+			uniqueDataTypes.forEach((dataType) =>
+				loadDataTypeBundle(dispatch, getState, dataType as DataTypeFolder, {
+					shouldRefreshPreviewPanel: false
+				})
+			);
+
+			dispatch({
+				type: LOAD_DATA_SET,
+				payload: {
+					exportType,
+					exportTypeSettings,
+					rows,
+					sortedRows,
+					dataSetId: dataSet.dataSetId,
+					dataSetName: dataSet.dataSetName
+				}
+			});
+
+			if (showToast) {
+				addToast({
+					type: 'success',
+					message: i18n.core.dataSetLoaded
+				});
+			}
+		};
+
+export const STASH_GENERATOR_STATE = 'STASH_GENERATOR_STATE';
+export const stashGeneratorState = (): GDAction => ({
+	type: STASH_GENERATOR_STATE
+});
+
+export const POP_STASHED_STATE = 'POP_STASHED_STATE';
+export const popStashedState = (): GDAction => ({ type: POP_STASHED_STATE });
+
+export const LOAD_STASHED_STATE = 'LOAD_STASHED_STATE';
+export const loadStashedState = (): GDAction => ({ type: LOAD_STASHED_STATE });
+
+export const SHOW_DATA_SET_HISTORY = 'SHOW_DATA_SET_HISTORY';
+export const showDataSetHistory = (): GDAction => ({
+	type: SHOW_DATA_SET_HISTORY
+});
+
+export const HIDE_DATA_SET_HISTORY = 'HIDE_DATA_SET_HISTORY';
+export const hideDataSetHistory = (): GDAction => ({
+	type: HIDE_DATA_SET_HISTORY
+});
+
+export const loadDataSetHistoryItem =
+	(content: any): any =>
+		(dispatch: Dispatch, getState: any): any => {
+			const state = getState();
+			const { dataSetId, dataSetName } = getCurrentDataSet(state);
+
+			dispatch(
+				loadDataSet(
+				{
+					dataSetId,
+					dataSetName,
+					content
+				} as DataSetListItem,
+				false
+				)
+			);
+		};
+
+export const SHOW_CLEAR_PAGE_DIALOG = 'SHOW_CLEAR_PAGE_DIALOG';
+export const showClearPageDialog = (): GDAction => ({
+	type: SHOW_CLEAR_PAGE_DIALOG
+});
+
+export const HIDE_CLEAR_GRID_DIALOG = 'HIDE_CLEAR_GRID_DIALOG';
+export const hideClearPageDialog = (): GDAction => ({
+	type: HIDE_CLEAR_GRID_DIALOG
+});
+
+export const SELECT_DATA_SET_HISTORY_ITEM = 'SELECT_DATA_SET_HISTORY_ITEM';
+export const selectDataSetHistoryItem = (historyId: number, isLatest: boolean): GDAction => ({
+	type: SELECT_DATA_SET_HISTORY_ITEM,
+	payload: {
+		historyId,
+		isLatest
+	}
+});
+
+// N.B. the version was actually selected when they clicked "View". This just closes the overlay and saves the
+// current state of the generator
+export const revertToHistoryVersion =
+	(): any =>
+		(dispatch: Dispatch, getState: any): any => {
+			const state = getState();
+			const i18n = selectors.getCoreI18n(state);
+
+			dispatch(hideDataSetHistory());
+			dispatch(accountActions.saveCurrentDataSet(i18n.dataSetReverted));
+		};
diff --git a/apps/client/src/core/store/generator/generator.reducer.ts b/apps/client/src/core/store/generator/generator.reducer.ts
new file mode 100644
index 000000000..5c33fa5cd
--- /dev/null
+++ b/apps/client/src/core/store/generator/generator.reducer.ts
@@ -0,0 +1,579 @@
+import { AnyAction } from 'redux';
+// @ts-ignore
+import { nanoid } from 'nanoid';
+import { produce } from 'immer';
+import * as actions from './generator.actions';
+import * as mainActions from '../main/main.actions';
+import * as accountActions from '../account/account.actions';
+import * as packetActions from '../packets/packets.actions';
+import { ExportSettingsTab } from '../../generator/exportSettings/ExportSettings.types';
+import { DataTypeFolder, dataTypes, ExportTypeFolder, exportTypes } from '@generatedata/plugins';
+import { GeneratorLayout } from '@generatedata/types';
+import C from '@generatedata/config/constants';
+import { GeneratorPanel } from '~types/general';
+import { DTOptionsMetadata } from '~types/dataTypes';
+import clientConfig from '@generatedata/config/clientConfig';
+
+export type DataRow = {
+	id: string;
+	title: string;
+
+	// a title field can only contain a single error at a time. If it's empty, the UI will automatically show the error.
+	// otherwise it's up to the current Export Type to provide a validateTitleField() method that returns the appropriate
+	// (single) error
+	titleError: string | null;
+	dataType: DataTypeFolder | null;
+	data: any;
+	metadata?: DTOptionsMetadata;
+};
+
+export type DataRows = {
+	[id: string]: DataRow;
+};
+
+export type PreviewData = {
+	[id: string]: any;
+};
+
+// we store all settings separately so in case a user switches from one to another, the previous settings aren't
+// wiped out
+export type ExportTypeSettings = {
+	[exportType in ExportTypeFolder]: any;
+};
+
+// TODO remove the duplications for the types here
+export type StashedGeneratorState = {
+	exportType: ExportTypeFolder;
+	rows: DataRows;
+	sortedRows: string[];
+	showGrid: boolean;
+	showPreview: boolean;
+	smallScreenVisiblePanel: GeneratorPanel;
+	generatorLayout: GeneratorLayout;
+	showExportSettings: boolean;
+	exportTypeSettings: Partial<ExportTypeSettings>;
+	showGenerationSettingsPanel: boolean;
+	showDataSetHistory: boolean;
+	bulkActionPending: boolean;
+	showHelpDialog: boolean;
+	showSchemaDialog: boolean;
+	showClearPageDialog: boolean;
+	helpDialogSection: DataTypeFolder | null;
+	showLineNumbers: boolean;
+	enableLineWrapping: boolean;
+	theme: string;
+	previewTextSize: number;
+	dataTypePreviewData: PreviewData;
+	exportSettingsTab: ExportSettingsTab;
+	numPreviewRows: number;
+	stripWhitespace: boolean;
+	numRowsToGenerate: number;
+	currentDataSetId: number | null;
+	currentDataSetName: string;
+	selectedDataSetHistory: {
+		historyId: number | null;
+		isLatest: boolean;
+	};
+	isCountryNamesLoading: boolean;
+	isCountryNamesLoaded: boolean;
+};
+
+const stashProps = [
+	'exportType',
+	'rows',
+	'sortedRows',
+	'showGrid',
+	'showPreview',
+	'smallScreenVisiblePanel',
+	'generatorLayout',
+	'showExportSettings',
+	'exportTypeSettings',
+	'showGenerationSettingsPanel',
+	'showHelpDialog',
+	'helpDialogSection',
+	'showLineNumbers',
+	'enableLineWrapping',
+	'theme',
+	'previewTextSize',
+	'dataTypePreviewData',
+	'exportSettingsTab',
+	'numPreviewRows',
+	'stripWhitespace',
+	'numPreviewRows',
+	'stripWhitespace',
+	'currentDataSetId',
+	'currentDataSetName'
+];
+
+export type CurrentDataSet = {
+	dataSetId: number | null;
+	dataSetName: string;
+	lastSaved: any;
+};
+
+export type SelectedDataSetHistoryItem = {
+	historyId: number | null;
+	isLatest: boolean;
+};
+
+export type GeneratorState = {
+	loadedDataTypes: {
+		[str in DataTypeFolder]: boolean;
+	};
+	loadedExportTypes: {
+		[str in ExportTypeFolder]: boolean;
+	};
+
+	// this is set to true on load after all necessary export types, data types for whatever last config they
+	// has have loaded, as well as re-generate a new batch of preview data. It's used to show a spinner in the
+	// Preview panel until it's ready to show data
+	initialDependenciesLoaded: boolean;
+	exportType: ExportTypeFolder;
+	rows: DataRows;
+	sortedRows: string[];
+	showGrid: boolean;
+	showPreview: boolean;
+	smallScreenVisiblePanel: GeneratorPanel;
+	generatorLayout: GeneratorLayout;
+	showExportSettings: boolean;
+	exportTypeSettings: Partial<ExportTypeSettings>;
+	showGenerationSettingsPanel: boolean;
+	showDataSetHistory: boolean;
+	bulkActionPending: boolean;
+	showHelpDialog: boolean;
+	showSchemaDialog: boolean;
+	showClearPageDialog: boolean;
+	helpDialogSection: DataTypeFolder | null;
+	showLineNumbers: boolean;
+	enableLineWrapping: boolean;
+	theme: string;
+	previewTextSize: number;
+	dataTypePreviewData: PreviewData;
+	exportSettingsTab: ExportSettingsTab;
+	numPreviewRows: number;
+	stripWhitespace: boolean;
+	lastLayoutWidth: number | null;
+	lastLayoutHeight: number | null;
+	numRowsToGenerate: number;
+	currentDataSet: CurrentDataSet;
+	selectedDataSetHistory: SelectedDataSetHistoryItem;
+	isCountryNamesLoading: boolean;
+	isCountryNamesLoaded: boolean;
+	stashedState: StashedGeneratorState | null;
+};
+
+export const getInitialState = (): GeneratorState => ({
+	// the extra check for existence on these vars is just to placate the tests (not sure why needed)
+	loadedDataTypes: Object.keys(dataTypes).reduce((acc: any, name) => ({ ...acc, [name]: false }), {}),
+	loadedExportTypes: Object.keys(exportTypes).reduce((acc: any, name) => ({ ...acc, [name]: false }), {}),
+	initialDependenciesLoaded: false,
+	exportType: clientConfig.appSettings.GD_DEFAULT_EXPORT_TYPE as ExportTypeFolder,
+	rows: {},
+	sortedRows: [],
+	showGrid: true,
+	showPreview: true,
+	smallScreenVisiblePanel: GeneratorPanel.grid,
+	generatorLayout: GeneratorLayout.horizontal,
+	showExportSettings: false,
+	exportTypeSettings: {},
+	numPreviewRows: 5,
+	showLineNumbers: true,
+	enableLineWrapping: true,
+	theme: 'lucario',
+	previewTextSize: 12,
+	dataTypePreviewData: {},
+	exportSettingsTab: 'exportType', // TODO enum
+	showGenerationSettingsPanel: false,
+	showDataSetHistory: false,
+	bulkActionPending: true, // for brand new page loads we assume there's a bulk action to re-load
+	showHelpDialog: false,
+	showSchemaDialog: false,
+	showClearPageDialog: false,
+	helpDialogSection: null,
+	numRowsToGenerate: clientConfig.appSettings.GD_DEFAULT_NUM_ROWS,
+	stripWhitespace: false,
+	lastLayoutWidth: null,
+	lastLayoutHeight: null,
+	currentDataSet: {
+		dataSetId: null,
+		dataSetName: '',
+		lastSaved: null
+	},
+	selectedDataSetHistory: {
+		historyId: null,
+		isLatest: false
+	},
+	isCountryNamesLoading: false,
+	isCountryNamesLoaded: false,
+	stashedState: null
+});
+
+export const reducer = produce((draft: GeneratorState, action: AnyAction) => {
+	switch (action.type) {
+		case mainActions.RESET_STORE:
+			const initialState = getInitialState();
+			Object.keys(initialState).forEach((key) => {
+				// @ts-ignore-line
+				draft[key] = initialState[key];
+			});
+			break;
+
+		// TODO needs to be cleaned up. Combine with LOGOUT action?
+		case mainActions.AUTHENTICATED:
+			if (!action.payload.authenticated) {
+				draft.currentDataSet = {
+					dataSetId: null,
+					dataSetName: '',
+					lastSaved: null
+				};
+			}
+			break;
+
+		case mainActions.LOGOUT:
+			draft.currentDataSet = {
+				dataSetId: null,
+				dataSetName: '',
+				lastSaved: null
+			};
+			break;
+
+		case actions.CLEAR_GRID:
+			draft.rows = {};
+			draft.sortedRows = [];
+			draft.dataTypePreviewData = {};
+			draft.showClearPageDialog = false;
+			draft.currentDataSet = {
+				dataSetId: null,
+				dataSetName: '',
+				lastSaved: null
+			};
+			break;
+
+		case actions.RESET_GENERATOR: {
+			draft.rows = {};
+			draft.sortedRows = [];
+			draft.showClearPageDialog = false;
+
+			const initialState = getInitialState();
+			const settingsToReset = [
+				'exportType',
+				'showGrid',
+				'showPreview',
+				'showExportSettings',
+				'numPreviewRows',
+				'showLineNumbers',
+				'enableLineWrapping',
+				'theme',
+				'previewTextSize',
+				'exportSettingsTab',
+				'numRowsToGenerate',
+				'stripWhitespace',
+				'currentDataSet'
+			];
+			settingsToReset.forEach((setting: any) => {
+				// @ts-ignore-line
+				draft[setting] = initialState[setting];
+			});
+
+			Object.keys(action.payload.exportTypeInitialStates).forEach((et) => {
+				draft.exportTypeSettings[et as ExportTypeFolder] = action.payload.exportTypeInitialStates[et];
+			});
+			break;
+		}
+
+		case actions.DATA_TYPE_LOADED:
+			draft.loadedDataTypes[action.payload.dataType as DataTypeFolder] = true;
+			break;
+
+		case actions.EXPORT_TYPE_LOADED:
+			draft.loadedExportTypes[action.payload.exportType as ExportTypeFolder] = true;
+
+			// we only ever initialize the export settings to the initial state when the export type hasn't been
+			// loaded yet. Note: this'll be an interesting upgrade problem
+			if (!draft.exportTypeSettings[action.payload.exportType as ExportTypeFolder]) {
+				draft.exportTypeSettings[action.payload.exportType as ExportTypeFolder] = action.payload.initialState;
+			}
+			break;
+
+		case actions.ADD_ROWS: {
+			const newRowIDs: string[] = [];
+			for (let i = 0; i < action.payload.numRows; i++) {
+				const rowId = nanoid();
+				draft.rows[rowId] = {
+					id: rowId,
+					title: '',
+					titleError: null,
+					dataType: null,
+					data: null
+				};
+				newRowIDs.push(rowId);
+			}
+			draft.sortedRows = [...draft.sortedRows, ...newRowIDs];
+			break;
+		}
+
+		case actions.REMOVE_ROW: {
+			const trimmedRowIds = draft.sortedRows.filter((i) => i !== action.payload.id);
+			const updatedRows: DataRows = {};
+			trimmedRowIds.forEach((id) => {
+				updatedRows[id] = draft.rows[id];
+			});
+			draft.rows = updatedRows;
+			draft.sortedRows = trimmedRowIds;
+			break;
+		}
+
+		case actions.CHANGE_TITLE:
+			draft.rows[action.payload.id].title = action.payload.value;
+			draft.rows[action.payload.id].titleError = action.payload.titleError;
+			break;
+
+		case actions.SELECT_DATA_TYPE: {
+			const { id, value, data, defaultTitle } = action.payload;
+			const title = draft.rows[id].title ? draft.rows[id].title : defaultTitle;
+
+			draft.rows[id] = {
+				...draft.rows[id],
+				dataType: value,
+				data,
+				title
+			};
+			break;
+		}
+
+		case actions.SELECT_EXPORT_TYPE:
+			draft.exportType = action.payload.exportType;
+			break;
+
+		case actions.REFRESH_PREVIEW_DATA:
+			draft.dataTypePreviewData = {
+				...action.payload.dataTypePreviewData
+			};
+			break;
+
+		case actions.CONFIGURE_DATA_TYPE:
+			draft.rows[action.payload.id].data = action.payload.data;
+			if (action.payload.metadata) {
+				draft.rows[action.payload.id].metadata = action.payload.metadata;
+			}
+			break;
+
+		case actions.CONFIGURE_EXPORT_TYPE:
+			draft.exportTypeSettings[draft.exportType] = action.payload.data;
+			break;
+
+		case actions.REPOSITION_ROW:
+			const newArray = draft.sortedRows.filter((i) => i !== action.payload.id);
+			newArray.splice(action.payload.newIndex, 0, action.payload.id);
+			draft.sortedRows = newArray;
+			break;
+
+		case actions.TOGGLE_GRID:
+			draft.showGrid = !draft.showGrid;
+			if (!draft.showPreview) {
+				draft.showPreview = true;
+			}
+			break;
+
+		case actions.TOGGLE_PREVIEW:
+			draft.showPreview = !draft.showPreview;
+			if (!draft.showGrid) {
+				draft.showGrid = true;
+			}
+			break;
+
+		case actions.TOGGLE_LAYOUT:
+			draft.generatorLayout = draft.generatorLayout === GeneratorLayout.horizontal ? GeneratorLayout.vertical : GeneratorLayout.horizontal;
+			break;
+
+		case actions.TOGGLE_LINE_WRAPPING:
+			draft.enableLineWrapping = !draft.enableLineWrapping;
+			break;
+
+		case actions.UPDATE_NUM_PREVIEW_ROWS:
+			draft.numPreviewRows = action.payload.numRows;
+			break;
+
+		case actions.CHANGE_THEME:
+			draft.theme = action.payload.theme;
+			break;
+
+		case actions.TOGGLE_SHOW_LINE_NUMBERS:
+			draft.showLineNumbers = !draft.showLineNumbers;
+			break;
+
+		case actions.SET_PREVIEW_TEXT_SIZE:
+			draft.previewTextSize = action.payload.previewTextSize;
+			break;
+
+		case actions.TOGGLE_EXPORT_SETTINGS:
+			draft.showExportSettings = !draft.showExportSettings;
+			if (action.payload?.tab) {
+				draft.exportSettingsTab = action.payload.tab;
+			}
+			break;
+
+		case actions.HIDE_EXPORT_SETTINGS:
+			draft.showExportSettings = false;
+			break;
+
+		case actions.SHOW_GENERATION_SETTINGS_PANEL:
+			draft.showGenerationSettingsPanel = true;
+			break;
+
+		case actions.HIDE_START_GENERATION_PANEL:
+			draft.showGenerationSettingsPanel = false;
+			break;
+
+		case actions.UPDATE_NUM_ROWS_TO_GENERATE:
+			draft.numRowsToGenerate = parseInt(action.payload.numRowsToGenerate, 10);
+			break;
+
+		case actions.TOGGLE_STRIP_WHITESPACE:
+			draft.stripWhitespace = !draft.stripWhitespace;
+			break;
+
+		case actions.SET_PANEL_SIZE:
+			const setting = draft.generatorLayout === 'horizontal' ? 'lastLayoutHeight' : 'lastLayoutWidth';
+			draft[setting] = action.payload.size;
+			break;
+
+		case actions.CHANGE_SMALL_SCREEN_VISIBLE_PANEL:
+			draft.smallScreenVisiblePanel = draft.smallScreenVisiblePanel === GeneratorPanel.grid ? GeneratorPanel.preview : GeneratorPanel.grid;
+			break;
+
+		case actions.SET_BULK_ACTION:
+			draft.bulkActionPending = !action.payload.isComplete;
+			break;
+
+		case actions.SET_INITIAL_DEPENDENCIES_LOADED:
+			draft.initialDependenciesLoaded = true;
+			break;
+
+		// only hide the generation settings panel for larger packet sizes. For smaller sizes, just show the spinner
+		// overlay
+		case packetActions.START_GENERATION:
+			if (action.payload.numRowsToGenerate > C.SMALL_GENERATION_COUNT) {
+				draft.showGenerationSettingsPanel = false;
+			}
+			break;
+
+		case accountActions.SET_CURRENT_DATA_SET:
+			draft.currentDataSet = {
+				dataSetId: action.payload.dataSetId,
+				dataSetName: action.payload.dataSetName,
+				lastSaved: null
+			};
+			break;
+
+		case accountActions.UPDATE_CURRENT_DATA_SET_LAST_SAVED:
+			draft.currentDataSet.lastSaved = action.payload.lastSaved;
+			break;
+
+		case actions.LOAD_DATA_SET: {
+			const { exportType, exportTypeSettings, rows, sortedRows, dataSetId, dataSetName } = action.payload;
+			draft.exportType = exportType;
+			draft.exportTypeSettings[exportType as ExportTypeFolder] = exportTypeSettings;
+			draft.rows = rows;
+			draft.sortedRows = sortedRows;
+			draft.currentDataSet = {
+				dataSetId,
+				dataSetName,
+				lastSaved: null
+			};
+			break;
+		}
+
+		case accountActions.UPDATE_CURRENT_DATA_SET_NAME:
+			draft.currentDataSet.dataSetName = action.payload.dataSetName;
+			break;
+
+		case actions.STASH_GENERATOR_STATE: {
+			const lastStashedState: any = {};
+			stashProps.map((prop: string) => {
+				// @ts-ignore-line
+				lastStashedState[prop] = draft[prop];
+			});
+			draft.stashedState = lastStashedState;
+			break;
+		}
+
+		case actions.POP_STASHED_STATE: {
+			if (draft.stashedState) {
+				stashProps.map((prop: string) => {
+					// @ts-ignore-line
+					draft[prop] = draft.stashedState[prop];
+				});
+			}
+			draft.stashedState = null;
+			break;
+		}
+
+		// loads the last stashed state, but doesn't pop it
+		case actions.LOAD_STASHED_STATE:
+			stashProps.map((prop: string) => {
+				// @ts-ignore-line
+				draft[prop] = draft.stashedState[prop];
+			});
+			draft.selectedDataSetHistory = {
+				historyId: null,
+				isLatest: true
+			};
+			break;
+
+		case actions.SHOW_HELP_DIALOG:
+			draft.showHelpDialog = true;
+			draft.helpDialogSection = action.payload.dataType;
+			break;
+
+		case actions.HIDE_HELP_DIALOG:
+			draft.showHelpDialog = false;
+			break;
+
+		case actions.SHOW_DATA_SET_HISTORY:
+			draft.showDataSetHistory = true;
+			break;
+
+		case actions.HIDE_DATA_SET_HISTORY:
+			draft.showDataSetHistory = false;
+			draft.selectedDataSetHistory = {
+				historyId: null,
+				isLatest: false
+			};
+			break;
+
+		case actions.SHOW_CLEAR_PAGE_DIALOG:
+			draft.showClearPageDialog = true;
+			break;
+
+		case actions.HIDE_CLEAR_GRID_DIALOG:
+			draft.showClearPageDialog = false;
+			break;
+
+		case actions.SELECT_DATA_SET_HISTORY_ITEM:
+			draft.selectedDataSetHistory = {
+				historyId: action.payload.historyId,
+				isLatest: action.payload.isLatest
+			};
+			break;
+
+		case actions.REQUEST_COUNTRY_NAMES:
+			draft.isCountryNamesLoading = true;
+			break;
+
+		case actions.COUNTRY_NAMES_LOADED:
+			draft.isCountryNamesLoading = false;
+			draft.isCountryNamesLoaded = true;
+			break;
+
+		case actions.SHOW_SCHEMA_DIALOG:
+			draft.showSchemaDialog = true;
+			break;
+
+		case actions.HIDE_SCHEMA_DIALOG:
+			draft.showSchemaDialog = false;
+			break;
+	}
+}, getInitialState());
+
+export default reducer;
diff --git a/apps/client/src/core/store/generator/generator.selectors.ts b/apps/client/src/core/store/generator/generator.selectors.ts
new file mode 100644
index 000000000..82cde570a
--- /dev/null
+++ b/apps/client/src/core/store/generator/generator.selectors.ts
@@ -0,0 +1,352 @@
+import { createSelector } from 'reselect';
+import { GeneratorLayout } from '@generatedata/types';
+import { CurrentDataSet, DataRow, DataRows } from './generator.reducer';
+import { GeneratorPanel } from '~types/general';
+import { DataTypeFolder, ExportTypeFolder } from '@generatedata/plugins';
+import * as mainSelectors from '../main/main.selectors';
+import * as coreUtils from '../../../utils/coreUtils';
+import * as langUtils from '@generatedata/utils/lang';
+import { processBatches, getDataType } from '~utils/dataTypes';
+import {
+	getExportTypeLabel as exportTypeUtilsGetExportTypeLabel,
+	getCodeMirrorMode as exportTypeUtilsGetCodeMirrorMode,
+	getExportTypeTitleValidationFunction as exportTypeGetExportTypeTitleValidation
+} from '~utils/exportTypes';
+import { GDLocale, GenerationTemplate, Store } from '~types/general';
+import { ColumnData } from '@generatedata/plugins';
+
+export const getLoadedDataTypes = (state: Store): any => state.generator.loadedDataTypes;
+export const getLoadedExportTypes = (state: Store): any => state.generator.loadedExportTypes;
+export const getExportType = (state: Store): ExportTypeFolder => state.generator.exportType;
+export const getRows = (state: Store): DataRows => state.generator.rows;
+export const getSortedRows = (state: Store): string[] => state.generator.sortedRows;
+export const isGridVisible = (state: Store): boolean => state.generator.showGrid;
+export const isPreviewVisible = (state: Store): boolean => state.generator.showPreview;
+export const getSmallScreenVisiblePanel = (state: Store): GeneratorPanel => state.generator.smallScreenVisiblePanel;
+export const getGeneratorLayout = (state: Store): GeneratorLayout => state.generator.generatorLayout;
+export const getNumPreviewRows = (state: Store): number => state.generator.numPreviewRows;
+export const shouldShowLineNumbers = (state: Store): boolean => state.generator.showLineNumbers;
+export const shouldEnableLineWrapping = (state: Store): boolean => state.generator.enableLineWrapping;
+export const getTheme = (state: Store): string => state.generator.theme;
+export const getPreviewTextSize = (state: Store): number => state.generator.previewTextSize;
+export const getDataTypePreviewData = (state: Store): any => state.generator.dataTypePreviewData;
+export const shouldShowExportSettings = (state: Store): boolean => state.generator.showExportSettings;
+export const shouldShowDataSetHistory = (state: Store): boolean => state.generator.showDataSetHistory;
+export const getSelectedDataSetHistoryItem = (state: Store): any => state.generator.selectedDataSetHistory;
+export const getExportTypeSettings = (state: Store): any => state.generator.exportTypeSettings;
+export const getExportSettingsTab = (state: Store): any => state.generator.exportSettingsTab;
+export const isGenerationSettingsPanelVisible = (state: Store): boolean => state.generator.showGenerationSettingsPanel;
+export const isHelpDialogVisible = (state: Store): boolean => state.generator.showHelpDialog;
+export const isSchemaDialogVisible = (state: Store): boolean => state.generator.showSchemaDialog;
+export const isClearPageDialogVisible = (state: Store): boolean => state.generator.showClearPageDialog;
+export const getHelpDialogSection = (state: Store): DataTypeFolder | null => state.generator.helpDialogSection;
+export const getNumRowsToGenerate = (state: Store): number => state.generator.numRowsToGenerate;
+export const getLastLayoutWidth = (state: Store): number | null => state.generator.lastLayoutWidth;
+export const getLastLayoutHeight = (state: Store): number | null => state.generator.lastLayoutHeight;
+export const isInitialDependenciesLoaded = (state: Store): boolean => state.generator.initialDependenciesLoaded;
+export const shouldStripWhitespace = (state: Store): boolean => state.generator.stripWhitespace;
+export const getCurrentDataSetId = (state: Store): number | null => state.generator.currentDataSet.dataSetId;
+export const getCurrentDataSet = (state: Store): CurrentDataSet => state.generator.currentDataSet;
+export const hasBulkActionPending = (state: Store): boolean => state.generator.bulkActionPending;
+export const isCountryNamesLoading = (state: Store): boolean => state.generator.isCountryNamesLoading;
+export const isCountryNamesLoaded = (state: Store): boolean => state.generator.isCountryNamesLoaded;
+
+export const getCurrentExportTypeWorkerUrl = createSelector(getExportType, getLoadedExportTypes, (exportType, loadedExportTypes) => {
+	const exportTypeWorkerMap = coreUtils.getExportTypeWorkerMap(loadedExportTypes);
+	return exportTypeWorkerMap[exportType] || '';
+});
+
+export const getNumRows = createSelector(getSortedRows, (rows) => rows.length);
+
+export const getSortedRowsArray = createSelector(getRows, getSortedRows, (rows, sorted) => sorted.map((id: string) => rows[id]));
+
+export const getSortedRowsArrayWithIds = createSelector(getRows, getSortedRows, (rows, sorted) =>
+	sorted.map((id: string) => ({ ...rows[id], id }))
+);
+
+export const getTitles = createSelector(getSortedRowsArray, (rows) => rows.map(({ title }) => title));
+
+export const getNonEmptySortedRows = createSelector(getSortedRowsArray, (rows) =>
+	rows.filter((row: DataRow) => row.title.trim() !== '' && row.dataType !== null && row.dataType.trim() !== '')
+);
+
+export const getSortedRowsWithDataTypeSelected = createSelector(getSortedRowsArrayWithIds, (rows) =>
+	rows.filter((row: DataRow) => row.dataType !== null && row.dataType.trim() !== '')
+);
+
+// returns everything in the grid where a Data Type has been selected
+export const getColumns = createSelector(getSortedRowsWithDataTypeSelected, (rows): (ColumnData & { id: string })[] => {
+	return rows
+		.filter((row: DataRow) => row.dataType !== null && row.dataType.trim() !== '')
+		.map(({ dataType, title, data, id }: any) => {
+			const { getMetadata } = getDataType(dataType);
+			const metadata = getMetadata ? getMetadata(data) : null;
+
+			return {
+				title,
+				dataType,
+				metadata,
+				id
+			};
+		});
+});
+
+export const getRowDataTypes = createSelector(getRows, (rows) =>
+	Object.keys(rows)
+		.filter((id: string) => rows[id].dataType !== null)
+		.map((id: string) => rows[id].dataType)
+);
+
+export const getPreviewRows = createSelector(
+	getNumPreviewRows,
+	getNonEmptySortedRows,
+	getDataTypePreviewData,
+	(numPreviewRows, rows, data) => {
+		const numRows = rows.length;
+		const formattedData: any[] = [];
+
+		for (let j = 0; j < numPreviewRows; j++) {
+			const rowData = [];
+			for (let i = 0; i < numRows; i++) {
+				const id = rows[i].id;
+				// this occurs when a new row is first added. The data is generated AFTERWARDS (see logic in onSelectDataType() action)
+				if (!data[id]) {
+					continue;
+				}
+				rowData.push(data[id][j]?.display);
+			}
+
+			if (rowData.length) {
+				formattedData.push(rowData);
+			}
+		}
+		return formattedData;
+	}
+);
+
+// TODO types for rows!
+export const convertRowsToGenerationTemplate = (rows: any): GenerationTemplate => {
+	const templateByProcessOrder: GenerationTemplate = {};
+	rows.map(({ id, title, dataType, data }: any, colIndex: number) => {
+		const processOrder = processBatches[dataType as DataTypeFolder] as number;
+		const { rowStateReducer } = getDataType(dataType);
+
+		if (!templateByProcessOrder[processOrder]) {
+			templateByProcessOrder[processOrder] = [];
+		}
+
+		templateByProcessOrder[processOrder].push({
+			id,
+			title,
+			dataType,
+			colIndex,
+
+			// settings for the DT cell. The rowStateReducer is optional: it lets developers convert the Data Type row
+			// state into something friendlier for the generation step
+			rowState: rowStateReducer ? rowStateReducer(data) : data
+		});
+	});
+
+	return templateByProcessOrder;
+};
+
+export const getGenerationTemplate = createSelector(
+	getSortedRowsWithDataTypeSelected,
+	getLoadedDataTypes, // yup, intentional! This ensures the selector will be re-ran after the data types are async loaded
+	convertRowsToGenerationTemplate
+);
+
+export const hasData = createSelector(getPreviewRows, (rows) => rows.length > 0);
+
+export const selectedExportTypeLoaded = createSelector(
+	getExportType,
+	getLoadedExportTypes,
+	(exportType, loadedExportTypes) => loadedExportTypes[exportType]
+);
+
+export const getLoadedExportTypesArray = createSelector(getLoadedExportTypes, (exportTypes) =>
+	Object.keys(exportTypes).filter((et) => exportTypes[et])
+);
+
+// returns the entire i18n content
+export const getI18n = createSelector(
+	mainSelectors.localeFileLoaded,
+	mainSelectors.getLocale,
+	(localeFileLoaded, locale: GDLocale): any | null => {
+		if (!localeFileLoaded) {
+			return null;
+		}
+		return langUtils.getStrings(locale);
+	}
+);
+
+// TODO hmm.. this kinda belongs in `main` not `generator`
+export const getCoreI18n = createSelector(mainSelectors.getLocale, (locale): any | null => {
+	const strings = langUtils.getStrings(locale);
+	return strings ? strings.core : null;
+});
+
+export const getCountryI18n = createSelector(mainSelectors.getLocale, (locale): any | null => {
+	const strings = langUtils.getStrings(locale);
+	return strings ? strings.countries : null;
+});
+
+export const getDataTypeI18n = createSelector(
+	mainSelectors.localeFileLoaded,
+	mainSelectors.getLocale,
+	(localeFileLoaded, locale): any | null => {
+		if (!localeFileLoaded) {
+			return null;
+		}
+		const strings = langUtils.getStrings(locale);
+		return strings ? strings.dataTypes : null;
+	}
+);
+
+export const getExportTypeI18n = createSelector(mainSelectors.getLocale, getExportType, (locale, exportType): any | null => {
+	const strings = langUtils.getStrings(locale);
+	return strings ? strings.exportTypes[exportType] : null;
+});
+
+export const getExportTypeColumnTitle = createSelector(getExportTypeI18n, (i18n) => i18n.COL_TITLE);
+
+// Export Types can optionally override the label that appears in the Preview panel. For example, instead of
+// just showing "Programming Language", they can show "PHP" or "Programming Language: Perl" or whatever they
+// want. By default it'll just show the localized Export Type name
+// TODO: need validation on the export type to confirm `EXPORT_TYPE_NAME` exists. Perhaps a separate grunt `validate` task
+// that's integrated into the build process to prevent incomplete/invalid bundles from being included
+export const getExportTypeLabel = createSelector(
+	getExportType,
+	getExportTypeSettings,
+	getExportTypeI18n,
+	getLoadedExportTypes,
+	(exportType, exportTypeSettings, i18n, loadedExportTypes): string => {
+		if (loadedExportTypes[exportType]) {
+			const etSettings = exportTypeSettings[exportType];
+			const label = exportTypeUtilsGetExportTypeLabel(exportType, etSettings);
+			if (label) {
+				return label;
+			}
+		}
+		return i18n.EXPORT_TYPE_NAME;
+	}
+);
+
+export const getCurrentExportTypeSettings = createSelector(getExportType, getExportTypeSettings, (exportType, settings) =>
+	exportType ? settings[exportType] : {}
+);
+
+// wrapper function for the Export Type's getCodeMirrorMode function. This ensures it's loaded and does the work
+// of figuring out what export type is currently loaded
+export const getCodeMirrorMode = createSelector(
+	getExportType,
+	getLoadedExportTypes,
+	getExportTypeSettings,
+	(exportType, loadedExportTypes, exportTypeSettings) => {
+		if (!loadedExportTypes[exportType]) {
+			return '';
+		}
+		return exportTypeUtilsGetCodeMirrorMode(exportType, exportTypeSettings[exportType]);
+	}
+);
+
+export const getExportTypeTitleValidationFunction = createSelector(getExportType, getLoadedExportTypes, (exportType, loadedExportTypes) => {
+	if (!loadedExportTypes[exportType]) {
+		return '';
+	}
+	return exportTypeGetExportTypeTitleValidation(exportType);
+});
+
+export const getDataSetSavePackage = createSelector(
+	getExportType,
+	getCurrentExportTypeSettings,
+	getRows,
+	getSortedRows,
+	(exportType, exportTypeSettings, rows, sortedRows) => ({
+		exportType,
+		exportTypeSettings,
+		rows,
+		sortedRows
+	})
+);
+
+export const currentDataSetNeedsCountryNames = createSelector(getSortedRowsArray, (rows) =>
+	rows.reduce((needsCountryNames, { metadata }) => {
+		return needsCountryNames ? true : !!metadata?.useCountryNames;
+	}, false)
+);
+
+export const previewPanelDependenciesLoaded = createSelector(
+	getRowDataTypes,
+	getExportType,
+	getLoadedDataTypes,
+	getLoadedExportTypes,
+	mainSelectors.localeFileLoaded,
+	isCountryNamesLoaded,
+	currentDataSetNeedsCountryNames,
+	(dataTypes, exportType, loadedDataTypes, loadedExportTypes, localeFileLoaded, countryNamesLoaded, needsCountryNames) => {
+		if (!localeFileLoaded || !loadedExportTypes[exportType]) {
+			return false;
+		}
+
+		const allDataTypesLoaded = dataTypes.every((i) => loadedDataTypes[i as DataTypeFolder]);
+		if (!allDataTypesLoaded) {
+			return false;
+		}
+
+		// if the data set has Names set, check the regional names have been loaded
+		if (needsCountryNames && !countryNamesLoaded) {
+			return false;
+		}
+
+		return true;
+	}
+);
+
+export const shouldGeneratePreviewRows = createSelector(
+	getRowDataTypes,
+	previewPanelDependenciesLoaded,
+	getRows,
+	getDataTypePreviewData,
+	(dataTypes, dependenciesLoaded, rowsObj, previewData) => {
+		if (!dataTypes.length) {
+			return false;
+		}
+		if (!dependenciesLoaded) {
+			return false;
+		}
+
+		const alreadyGenerated = Object.keys(rowsObj).every((key: string) => !!previewData[key]);
+		if (alreadyGenerated) {
+			return false;
+		}
+
+		return true;
+	}
+);
+
+// generates a schema of all the data needed to recreate the current data set
+export const getGenerationSchema = createSelector(
+	getRows,
+	getSortedRows,
+	getExportType,
+	getCurrentExportTypeSettings,
+	(rows, sortedRows, exportType, exportTypeSettings): any => {
+		const nonEmptyRows = sortedRows.filter((id) => !!rows[id].dataType);
+		return JSON.stringify(
+			{
+				rows: nonEmptyRows.map((rowId) => {
+					const { title, dataType, data } = rows[rowId];
+					return { title, dataType, data };
+				}),
+				exportType,
+				exportTypeSettings
+				// nope. These are settings specific to the particular generation, not the data itself. Separate them
+				// stripWhitespace,
+				// numRows: 1
+			},
+			null,
+			'   '
+		);
+	}
+);
diff --git a/apps/client/src/core/store/index.ts b/apps/client/src/core/store/index.ts
new file mode 100644
index 000000000..217b143bb
--- /dev/null
+++ b/apps/client/src/core/store/index.ts
@@ -0,0 +1,93 @@
+/* istanbul ignore file */
+import { persistStore, persistReducer } from 'redux-persist';
+import { Persistor } from 'redux-persist/es/types';
+import { combineReducers } from 'redux';
+import { configureStore } from '@reduxjs/toolkit';
+// import actionsInterceptor from '../actionInterceptor'; // TODO
+import storage from 'redux-persist/lib/storage';
+import mainReducer from './main/main.reducer';
+import generatorReducer from './generator/generator.reducer';
+import packetsReducer from './packets/packets.reducer';
+import accountReducer from './account/account.reducer';
+
+let persistor: Persistor;
+function initStore(state: any): any {
+	const rootPersistConfig = {
+		key: 'root',
+		storage,
+		blacklist: ['generator', 'main', 'packets']
+	};
+
+	const generatorPersistConfig = {
+		key: 'generator',
+		storage,
+		blacklist: [
+			'initialDependenciesLoaded',
+			'loadedDataTypes',
+			'loadedExportTypes',
+			'isGenerating',
+			'numGeneratedRows',
+			'dataTypePreviewData',
+			'bulkActionPending',
+			'isCountryNamesLoading',
+			'isCountryNamesLoaded'
+		]
+	};
+
+	const mainPersistConfig = {
+		key: 'main',
+		storage,
+		blacklist: [
+			'localeFileLoaded',
+			'isOnloadAuthDetermined',
+			'tourBundleLoaded',
+			'dialogProcessing',
+			'accountsCurrentPage',
+			'accountsSortCol',
+			'accountsSortDir',
+			'accountsFilterStr'
+		]
+	};
+
+	// TODO should be able to just blacklist the entire section and not have to pinpoint them here... doc really not clear
+	const packetsPersistConfig = {
+		key: 'packets',
+		storage,
+		blacklist: ['currentPacketId', 'packetIds', 'packets']
+	};
+
+	const accountPersistConfig = {
+		key: 'account',
+		storage,
+		blacklist: ['yourAccount', 'editAccount']
+	};
+
+	const rootReducer = combineReducers({
+		generator: persistReducer(generatorPersistConfig, generatorReducer),
+		main: persistReducer(mainPersistConfig, mainReducer),
+		packets: persistReducer(packetsPersistConfig, packetsReducer),
+		account: persistReducer(accountPersistConfig, accountReducer)
+	});
+
+	const persistedRootReducer = persistReducer(rootPersistConfig, rootReducer);
+
+	const store = configureStore({
+		reducer: persistedRootReducer,
+		preloadedState: state
+		// composeEnhancers(applyMiddleware(thunk, actionsInterceptor), ...enhancers)
+	});
+
+	persistor = persistStore(store);
+
+	return store;
+}
+
+// for testing we set up our own mock stores with the subset of whatever we want to examine
+let store: any;
+if (process.env.NODE_ENV !== 'test') {
+	store = initStore({});
+}
+
+export default store;
+
+export { persistor };
diff --git a/apps/client/src/core/store/main/__tests__/main.actions.test.ts b/apps/client/src/core/store/main/__tests__/main.actions.test.ts
new file mode 100644
index 000000000..86ea49bad
--- /dev/null
+++ b/apps/client/src/core/store/main/__tests__/main.actions.test.ts
@@ -0,0 +1,58 @@
+import { combineReducers, createStore } from 'redux';
+import reducer from '../main.reducer';
+import * as selectors from '../main.selectors';
+import * as actions from '../main.actions';
+import { setAuthenticationData } from '../main.actions';
+import C from '@generatedata/config/constants';
+import { AccountStatus } from '~types/account';
+import { AuthMethod } from '~types/general';
+
+describe('main actions', () => {
+	let store: any;
+	beforeEach(() => {
+		store = createStore(
+			combineReducers({
+				main: reducer
+			})
+		);
+	});
+
+	it('the locale file is not loaded by default', () => {
+		expect(selectors.localeFileLoaded(store.getState())).toEqual(false);
+	});
+
+	it('sets the locale as loaded', () => {
+		store.dispatch(actions.setLocaleFileLoaded('en'));
+		expect(selectors.localeFileLoaded(store.getState())).toEqual(true);
+	});
+
+	it('authorization sets appropriate values', () => {
+		expect(selectors.getAppStateVersion(store.getState())).toEqual(C.APP_STATE_VERSION);
+		expect(selectors.getAuthMethod(store.getState())).toEqual('default');
+		expect(selectors.isLoggedIn(store.getState())).toEqual(false);
+		expect(selectors.getAuthToken(store.getState())).toEqual('');
+
+		store.dispatch(
+			setAuthenticationData({
+				authMethod: AuthMethod.google,
+				token: '123456',
+				accountId: 5,
+				firstName: 'Jim',
+				lastName: 'Beam',
+				email: 'jim@beam.net',
+				country: 'United States',
+				region: 'Montana',
+				profileImage: 'image-here.jpg',
+				expiryDate: '1000010101001',
+				dateCreated: '1000010101001',
+				accountType: 'admin',
+				accountStatus: AccountStatus.live,
+				numRowsGenerated: 50000
+			})
+		);
+
+		expect(selectors.getAuthMethod(store.getState())).toEqual('google');
+		expect(selectors.isLoggedIn(store.getState())).toEqual(true);
+		expect(selectors.getAuthToken(store.getState())).toEqual('123456');
+	});
+});
diff --git a/apps/client/src/core/store/main/__tests__/main.store.test.ts b/apps/client/src/core/store/main/__tests__/main.store.test.ts
new file mode 100644
index 000000000..3506ccd2e
--- /dev/null
+++ b/apps/client/src/core/store/main/__tests__/main.store.test.ts
@@ -0,0 +1,45 @@
+import { createStore, applyMiddleware, Store } from 'redux';
+// import { FlushThunks } from 'redux-testkit';
+import { configureStore } from '@reduxjs/toolkit';
+import { rootReducer } from '../../../../../tests/testHelpers';
+import * as actions from '../main.actions';
+import * as selectors from '../main.selectors';
+
+describe('accounts section', () => {
+	// let flushThunks;
+	let store: Store;
+
+	beforeEach(() => {
+		// flushThunks = FlushThunks.createMiddleware();
+		store = configureStore({
+			reducer: rootReducer
+		});
+	});
+
+	it('resetting store returns data to default state', () => {
+		expect(selectors.localeFileLoaded(store.getState())).toEqual(false);
+
+		store.dispatch(actions.setLocaleFileLoaded('en'));
+		expect(selectors.localeFileLoaded(store.getState())).toEqual(true);
+
+		store.dispatch(actions.resetStore());
+		expect(selectors.localeFileLoaded(store.getState())).toEqual(false);
+	});
+
+	it('login dialog visibility', () => {
+		expect(selectors.shouldShowLoginDialog(store.getState())).toEqual(false);
+
+		store.dispatch(actions.setLoginDialogVisibility(true));
+		expect(selectors.shouldShowLoginDialog(store.getState())).toEqual(true);
+
+		store.dispatch(actions.setLoginDialogVisibility(false));
+		expect(selectors.shouldShowLoginDialog(store.getState())).toEqual(false);
+	});
+
+	it('sets auth', () => {
+		expect(selectors.isLoggedIn(store.getState())).toEqual(false);
+
+		store.dispatch(actions.setAuthenticated(true));
+		expect(selectors.isLoggedIn(store.getState())).toEqual(true);
+	});
+});
diff --git a/apps/client/src/core/store/main/main.actions.ts b/apps/client/src/core/store/main/main.actions.ts
new file mode 100644
index 000000000..229a8d574
--- /dev/null
+++ b/apps/client/src/core/store/main/main.actions.ts
@@ -0,0 +1,449 @@
+import { Dispatch } from 'redux';
+import { gql } from '@apollo/client';
+import Cookies from 'js-cookie';
+import { AccountStatusFilter, AuthMethod, GDAction, GDLocale } from '~types/general';
+import * as langUtils from '@generatedata/utils/lang';
+import { getStrings, getCurrentLocalizedPath } from '@generatedata/utils/lang';
+import { apolloClient } from '../../apolloClient';
+import { getCurrentPage, getLocale } from '~store/main/main.selectors';
+import { setAuthTokenRefresh } from '@generatedata/utils/auth';
+import { AccountStatus, AccountType, SelectedAccountTab } from '~types/account';
+import store from '~core/store';
+import { onChangeTab, showSaveDataSetDialog } from '~store/account/account.actions';
+import { addToast, setTourComponents } from '@generatedata/utils/general';
+import { getGeneratorPageRoute, isGeneratorPage, updateBodyClass } from '~utils/routeUtils';
+import * as actions from '~store/generator/generator.actions';
+import { CLEAR_GRID } from '~store/generator/generator.actions';
+import C from '@generatedata/config/constants';
+import { SaveDataDialogType } from '~store/account/account.reducer';
+import { localeFileMap } from '../../../../_localeFileMap';
+import { ColSortDir } from '~components/tables/TableHeader.component';
+
+export const LOCALE_FILE_LOADED = 'LOCALE_FILE_LOADED';
+export const setLocaleFileLoaded = (locale: GDLocale): GDAction => ({
+	type: LOCALE_FILE_LOADED,
+	payload: {
+		locale
+	}
+});
+
+export const LOCALE_FILE_LOADING = 'LOCALE_FILE_LOADING';
+export const setLocaleFileLoading = (): GDAction => ({
+	type: LOCALE_FILE_LOADING
+});
+
+export const selectLocale =
+	(locale: GDLocale, navigate?: any): any =>
+		(dispatch: Dispatch): any => {
+			dispatch(setLocaleFileLoading());
+
+			window.gd = {};
+			window.gd.localeLoaded = (strings: any): void => {
+				langUtils.setLocale(locale, strings);
+				dispatch(setLocaleFileLoaded(locale));
+				Cookies.set('lang', locale);
+
+				const htmlTag = document.querySelector('html');
+				if (htmlTag) {
+					htmlTag.setAttribute('lang', locale);
+				}
+
+				if (navigate) {
+					navigate(getCurrentLocalizedPath(locale));
+				}
+			};
+			const s = document.createElement('script');
+			const filename = localeFileMap[locale];
+			s.src = `./${filename}`;
+			document.body.appendChild(s);
+		};
+
+export const RESET_STORE = 'RESET_STORE';
+export const resetStore = (): GDAction => ({ type: RESET_STORE });
+
+export const PAGE_CHANGE = 'PAGE_CHANGE';
+export const initRouteListener = (history: any): void => {
+	updateBodyClass(store, history.location.pathname);
+
+	history.listen((location: any) => {
+		updateBodyClass(store, location.pathname);
+	});
+};
+
+export const SET_LOGIN_DIALOG_VISIBILITY = 'SET_LOGIN_DIALOG_VISIBILITY';
+export const setLoginDialogVisibility = (visible: boolean, email = ''): GDAction => ({
+	type: SET_LOGIN_DIALOG_VISIBILITY,
+	payload: {
+		visible,
+		email
+	}
+});
+
+export const SET_PASSWORD_RESET_DIALOG_VISIBILITY = 'SET_PASSWORD_RESET_DIALOG_VISIBILITY';
+export const setPasswordResetDialogVisibility = (visible: boolean, email = ''): GDAction => ({
+	type: SET_PASSWORD_RESET_DIALOG_VISIBILITY,
+	payload: {
+		visible,
+		email
+	}
+});
+
+export const SET_AUTHENTICATION_DATA = 'SET_AUTHENTICATION_DATA';
+
+export type AuthData = {
+	token: string;
+	accountId: number;
+	firstName: string;
+	lastName: string;
+	email: string;
+	country: string;
+	region: string;
+	profileImage: string;
+	expiryDate: string;
+	dateCreated: string;
+	accountType: AccountType;
+	accountStatus: AccountStatus;
+	numRowsGenerated: number;
+	authMethod?: AuthMethod;
+};
+
+export const setAuthenticationData = (authData: AuthData): GDAction => ({
+	type: SET_AUTHENTICATION_DATA,
+	payload: authData
+});
+
+export const AUTHENTICATED = 'AUTHENTICATED';
+export const setAuthenticated = (authenticated = true): GDAction => ({
+	type: AUTHENTICATED,
+	payload: {
+		authenticated
+	}
+});
+
+export const START_DIALOG_PROCESSING = 'START_DIALOG_PROCESSING';
+export const startDialogProcessing = (): GDAction => ({
+	type: START_DIALOG_PROCESSING
+});
+
+export const STOP_DIALOG_PROCESSING = 'STOP_DIALOG_PROCESSING';
+export const stopDialogProcessing = (): GDAction => ({
+	type: STOP_DIALOG_PROCESSING
+});
+
+// hacky, but if we need something like this elsewhere I can revisit. This is used by the Login button in Save dialog.
+// When the user clicks that, we want to return them to the Save dialog after authentication. The register process is more
+// complicated so I think returning them to the save dialog after all that might be a bit much. They can always just
+// re-click the Save button at that step (nothing would have been lost, unlike with v3)
+let loginFlow = '';
+export const setReturnToSaveDataSet = (): void => {
+	loginFlow = 'fromSaveDataSet';
+};
+
+export const CLEAR_DEFAULT_EMAIL = 'CLEAR_DEFAULT_EMAIL';
+export const clearLoginFlow = (): GDAction => {
+	loginFlow = '';
+
+	return { type: CLEAR_DEFAULT_EMAIL };
+};
+
+export const LOGIN_ERROR = 'LOGIN_ERROR';
+export const setLoginError = (): GDAction => ({ type: LOGIN_ERROR });
+
+// default authentication
+export const login = (email: string, password: string, navigate: any, onLoginError: any): any => {
+	return async (dispatch: Dispatch): Promise<any> => {
+		dispatch(startDialogProcessing());
+
+		const response = await apolloClient.mutate({
+			mutation: gql`
+				mutation LoginMutation($email: String!, $password: String!) {
+					login(email: $email, password: $password) {
+						token
+						tokenExpiry
+						error
+						refreshToken
+						success
+						accountId
+						firstName
+						lastName
+						email
+						country
+						region
+						expiryDate
+						accountType
+						accountStatus
+						dateCreated
+						numRowsGenerated
+						profileImage
+						wasOneTimeLogin
+					}
+				}
+			`,
+			variables: { email, password }
+		});
+
+		if (response.data.login.success) {
+			const { tokenExpiry, refreshToken } = response.data.login;
+			dispatch(
+				setAuthenticationData({
+					...response.data.login,
+					authMethod: 'default'
+				})
+			);
+
+			Cookies.set('refreshToken', refreshToken, {
+				expires: new Date(tokenExpiry)
+			});
+
+			if (response.data.login.wasOneTimeLogin) {
+				onOneTimeLoginSuccess(tokenExpiry, password, navigate, dispatch);
+			} else {
+				onLoginSuccess(tokenExpiry, false, dispatch);
+			}
+		} else {
+			dispatch(setLoginError());
+			onLoginError(response.data.login.error);
+		}
+	};
+};
+
+export const onLoginSuccess = (tokenExpiry: number | null, onPageRender: boolean, dispatch: Dispatch): void => {
+	const i18n = getStrings();
+
+	if (tokenExpiry) {
+		setAuthTokenRefresh(tokenExpiry, (): any => updateRefreshToken()(dispatch));
+	}
+
+	dispatch(setLoginDialogVisibility(false));
+
+	if (!onPageRender) {
+		addToast({
+			type: 'success',
+			message: i18n.core.nowLoggedIn
+		});
+
+		if (loginFlow === 'fromSaveDataSet') {
+			dispatch(showSaveDataSetDialog(SaveDataDialogType.save));
+			loginFlow = '';
+		}
+	}
+};
+
+export const SET_ONE_TIME_PASSWORD = 'SET_ONE_TIME_PASSWORD';
+export const setOneTimePassword = (password: string): GDAction => ({
+	type: SET_ONE_TIME_PASSWORD,
+	payload: { password }
+});
+
+export const onOneTimeLoginSuccess = (tokenExpiry: number, password: string, navigate: any, dispatch: Dispatch): void => {
+	const i18n = getStrings();
+	setAuthTokenRefresh(tokenExpiry, (): any => updateRefreshToken()(dispatch));
+	dispatch(setLoginDialogVisibility(false));
+	dispatch(setOneTimePassword(password));
+
+	navigate('/account');
+	dispatch(onChangeTab(SelectedAccountTab.changePassword));
+
+	addToast({
+		type: 'success',
+		message: i18n.core.nowLoggedIn
+	});
+};
+
+export const LOGOUT = 'LOGOUT';
+export const logout =
+	(): any =>
+		async (dispatch: Dispatch): Promise<any> => {
+			const i18n = getStrings();
+
+			Cookies.remove('refreshToken');
+
+			dispatch({ type: LOGOUT });
+			dispatch({ type: CLEAR_GRID });
+			dispatch(actions.addRows(C.NUM_DEFAULT_ROWS));
+
+			addToast({
+				type: 'success',
+				message: i18n.core.nowLoggedOut
+			});
+
+			// doesn't awfully matter if this fails. It's just for cleanup
+			await apolloClient.mutate({
+				mutation: gql`
+				mutation Logout {
+					logout {
+						success
+					}
+				}
+			`
+			});
+		};
+
+export const SET_AUTH_TOKEN = 'SET_AUTH_TOKEN';
+export const setAuthToken = (token: string): GDAction => ({
+	type: SET_AUTH_TOKEN,
+	payload: { token }
+});
+
+export const REFRESHING_TOKEN = 'REFRESHING_TOKEN';
+export const updateRefreshToken =
+	() =>
+		async (dispatch: Dispatch): Promise<any> => {
+			dispatch({ type: REFRESHING_TOKEN });
+
+			const response = await apolloClient.mutate({
+				mutation: gql`
+				mutation RefreshToken {
+					refreshToken {
+						token
+						tokenExpiry
+						refreshToken
+						success
+						firstName
+						lastName
+						email
+						country
+						region
+						expiryDate
+						accountType
+						dateCreated
+						numRowsGenerated
+						profileImage
+					}
+				}
+			`
+			});
+
+			const success = response.data.refreshToken.success;
+			if (success) {
+				const { token, tokenExpiry, refreshToken } = response.data.refreshToken;
+
+				Cookies.set('refreshToken', refreshToken, {
+					expires: new Date(tokenExpiry)
+				});
+
+				setAuthTokenRefresh(tokenExpiry, (): any => updateRefreshToken()(dispatch));
+				dispatch(setAuthenticationData(response.data.refreshToken));
+				dispatch(setAuthToken(token));
+			} else {
+			// console.log('token NOT refreshed -- user logged out');
+			}
+
+			dispatch(setAuthenticated(success));
+			dispatch(setOnloadAuthDetermined());
+		};
+
+export const ONLOAD_AUTH_DETERMINED = 'ONLOAD_AUTH_DETERMINED';
+export const setOnloadAuthDetermined = (): GDAction => ({
+	type: ONLOAD_AUTH_DETERMINED
+});
+
+export const SHOW_TOUR_INTRO_DIALOG = 'SHOW_TOUR_INTRO_DIALOG';
+export const showTourIntroDialog =
+	(navigate?: any) =>
+		(dispatch: Dispatch, getState: any): any => {
+			const state = getState();
+			const currentPage = getCurrentPage(state);
+			const locale = getLocale(state);
+			const generatorRoute = getGeneratorPageRoute(locale);
+
+			// the tour is specific to the generator page, so always redirect there when showing/hiding it
+			if (navigate && !isGeneratorPage(currentPage, locale)) {
+				navigate(generatorRoute);
+			}
+
+			dispatch({ type: SHOW_TOUR_INTRO_DIALOG });
+		};
+
+export const HIDE_TOUR_INTRO_DIALOG = 'HIDE_TOUR_INTRO_DIALOG';
+export const hideTourIntroDialog = (): GDAction => ({
+	type: HIDE_TOUR_INTRO_DIALOG
+});
+
+export const TOUR_BUNDLE_LOADED = 'TOUR_BUNDLE_LOADED';
+export const loadTourBundle =
+	(): any =>
+		(dispatch: Dispatch): void => {
+			const i18n = getStrings();
+
+			// TODO check hashing of bundle here
+			import(
+			/* webpackChunkName: "tour" */
+			/* webpackMode: "lazy" */
+				'../../../tours'
+			)
+				.then((resp) => {
+					setTourComponents(resp.default);
+					dispatch({ type: TOUR_BUNDLE_LOADED });
+				})
+				.catch(() => {
+					dispatch(hideTourIntroDialog());
+
+					addToast({
+						type: 'success',
+						message: i18n.core.problemLoadingTour
+					});
+				});
+		};
+
+export const sendPasswordResetEmail =
+	(email: string, onLoginError: any): any =>
+		async (dispatch: Dispatch): Promise<any> => {
+			const i18n = getStrings();
+
+			dispatch(startDialogProcessing());
+
+			const response = await apolloClient.mutate({
+				mutation: gql`
+				mutation SendPasswordResetEmailMutation($email: String!) {
+					sendPasswordResetEmail(email: $email) {
+						success
+					}
+				}
+			`,
+				variables: { email }
+			});
+
+			if (response.data.sendPasswordResetEmail.success) {
+				addToast({
+					type: 'success',
+					message: i18n.core.passwordResetMsg
+				});
+				dispatch(setPasswordResetDialogVisibility(false));
+				dispatch(setLoginDialogVisibility(true, email));
+				dispatch(stopDialogProcessing());
+			} else {
+				dispatch(setLoginError());
+				onLoginError();
+			}
+		};
+
+export const SET_ACCOUNTS_SORT_DIR = 'SET_ACCOUNTS_SORT_DIR';
+export const setAccountsSortDir = (sortDir: ColSortDir): any => ({
+	type: SET_ACCOUNTS_SORT_DIR,
+	payload: { sortDir }
+});
+
+export const SET_ACCOUNTS_SORT_COL = 'SET_ACCOUNTS_SORT_COL';
+export const setAccountsSortCol = (sortCol: string): any => ({
+	type: SET_ACCOUNTS_SORT_COL,
+	payload: { sortCol }
+});
+
+export const SET_ACCOUNTS_CURRENT_PAGE = 'SET_ACCOUNTS_CURRENT_PAGE';
+export const setAccountsCurrentPage = (page: number): any => ({
+	type: SET_ACCOUNTS_CURRENT_PAGE,
+	payload: { page }
+});
+
+export const SET_ACCOUNTS_FILTER_STRING = 'SET_ACCOUNTS_FILTER_STRING';
+export const setAccountsFilterString = (filter: string): any => ({
+	type: SET_ACCOUNTS_FILTER_STRING,
+	payload: { filter }
+});
+
+export const SET_ACCOUNT_STATUS_FILTER = 'SET_ACCOUNT_STATUS_FILTER';
+export const setAccountStatusFilter = (status: AccountStatusFilter): any => ({
+	type: SET_ACCOUNT_STATUS_FILTER,
+	payload: { status }
+});
diff --git a/apps/client/src/core/store/main/main.reducer.ts b/apps/client/src/core/store/main/main.reducer.ts
new file mode 100644
index 000000000..e19d2ce75
--- /dev/null
+++ b/apps/client/src/core/store/main/main.reducer.ts
@@ -0,0 +1,184 @@
+import { AnyAction } from 'redux';
+import { produce } from 'immer';
+import * as actions from './main.actions';
+import C from '@generatedata/config/constants';
+import { AccountStatusFilter, AuthMethod, GDLocale } from '~types/general';
+import { ColSortDir } from '~components/tables/TableHeader.component';
+import clientConfig from '@generatedata/config/clientConfig';
+
+export type MainState = {
+	appStateVersion: number;
+	authMethod: AuthMethod;
+	localeFileLoading: boolean;
+	localeFileLoaded: boolean;
+	locale: GDLocale;
+	showLoginDialog: boolean;
+	loginDialogDefaultEmail: string;
+	showPasswordResetDialog: boolean;
+	passwordResetDialogDefaultEmail: string;
+	isLoggedIn: boolean;
+	authToken: string;
+	isOnloadAuthDetermined: boolean;
+	isRefreshingToken: boolean;
+	dialogProcessing: boolean;
+
+	// not 100% sure why this is stored in state - but possibly just to allow components to re-render when it changes
+	currentPage: string;
+	tourIntroDialogVisible: boolean;
+	tourBundleLoaded: boolean;
+	accountsCurrentPage: number;
+	accountsSortCol: string;
+	accountsSortDir: ColSortDir;
+	accountsFilterStr: string;
+	accountStatusFilter: AccountStatusFilter;
+};
+
+export const initialState: MainState = {
+	appStateVersion: C.APP_STATE_VERSION,
+	authMethod: AuthMethod.default,
+	localeFileLoading: false,
+	localeFileLoaded: false,
+	locale: clientConfig.appSettings.GD_DEFAULT_LOCALE,
+	showLoginDialog: false,
+	loginDialogDefaultEmail: '',
+	showPasswordResetDialog: false,
+	passwordResetDialogDefaultEmail: '',
+	isLoggedIn: false,
+	authToken: '',
+	isOnloadAuthDetermined: false,
+	isRefreshingToken: false,
+	dialogProcessing: false,
+	currentPage: '',
+	tourIntroDialogVisible: false,
+	tourBundleLoaded: false,
+	accountsCurrentPage: 1,
+	accountsSortCol: 'lastName',
+	accountsSortDir: ColSortDir.asc,
+	accountsFilterStr: '',
+	accountStatusFilter: AccountStatusFilter.all
+};
+
+export const reducer = produce((draft: MainState, action: AnyAction) => {
+	switch (action.type) {
+		case actions.RESET_STORE:
+			Object.keys(initialState).forEach((key) => {
+				// @ts-ignore-line
+				draft[key] = initialState[key];
+			});
+			break;
+
+		case actions.LOCALE_FILE_LOADING:
+			draft.localeFileLoading = true;
+			break;
+
+		case actions.LOCALE_FILE_LOADED:
+			draft.locale = action.payload.locale;
+			draft.localeFileLoaded = true;
+			draft.localeFileLoading = false;
+			break;
+
+		case actions.SET_LOGIN_DIALOG_VISIBILITY:
+			draft.showLoginDialog = action.payload.visible;
+
+			if (action.payload.email) {
+				draft.loginDialogDefaultEmail = action.payload.email;
+			}
+			break;
+
+		case actions.SET_PASSWORD_RESET_DIALOG_VISIBILITY:
+			draft.showPasswordResetDialog = action.payload.visible;
+			if (action.payload.email) {
+				draft.passwordResetDialogDefaultEmail = action.payload.email;
+			}
+			break;
+
+		case actions.AUTHENTICATED:
+			draft.isLoggedIn = action.payload.authenticated;
+			draft.isRefreshingToken = true; // yup, even if they're not authenticated. Difficult var name - only applies for logged in users
+			break;
+
+		case actions.SET_AUTHENTICATION_DATA:
+			draft.isLoggedIn = true;
+			draft.dialogProcessing = false;
+			draft.authToken = action.payload.token;
+			draft.authMethod = action.payload.authMethod;
+			break;
+
+		case actions.LOGOUT:
+			draft.isLoggedIn = false;
+			draft.authToken = '';
+			draft.accountsCurrentPage = 1;
+			draft.accountsSortCol = 'lastName';
+			draft.accountsSortDir = ColSortDir.asc;
+			draft.accountsFilterStr = '';
+			break;
+
+		case actions.REFRESHING_TOKEN:
+			draft.isRefreshingToken = false;
+			break;
+
+		case actions.SET_AUTH_TOKEN:
+			draft.authToken = action.payload.token;
+			break;
+
+		case actions.START_DIALOG_PROCESSING:
+			draft.dialogProcessing = true;
+			break;
+
+		case actions.STOP_DIALOG_PROCESSING:
+			draft.dialogProcessing = false;
+			break;
+
+		case actions.LOGIN_ERROR:
+			draft.dialogProcessing = false;
+			break;
+
+		case actions.ONLOAD_AUTH_DETERMINED:
+			draft.isOnloadAuthDetermined = true;
+			break;
+
+		case actions.PAGE_CHANGE:
+			draft.currentPage = action.payload.page;
+			break;
+
+		case actions.SHOW_TOUR_INTRO_DIALOG:
+			draft.tourIntroDialogVisible = true;
+			break;
+
+		case actions.HIDE_TOUR_INTRO_DIALOG:
+			draft.tourIntroDialogVisible = false;
+			break;
+
+		case actions.TOUR_BUNDLE_LOADED:
+			draft.tourBundleLoaded = true;
+			break;
+
+		case actions.CLEAR_DEFAULT_EMAIL:
+			draft.loginDialogDefaultEmail = '';
+			break;
+
+		case actions.SET_ACCOUNTS_SORT_DIR:
+			draft.accountsSortDir = action.payload.sortDir;
+			break;
+
+		case actions.SET_ACCOUNTS_SORT_COL:
+			draft.accountsSortCol = action.payload.sortCol;
+			break;
+
+		case actions.SET_ACCOUNTS_CURRENT_PAGE:
+			draft.accountsCurrentPage = action.payload.page;
+			break;
+
+		case actions.SET_ACCOUNTS_FILTER_STRING:
+			draft.accountsCurrentPage = 1;
+			draft.accountsFilterStr = action.payload.filter;
+			break;
+
+		case actions.SET_ACCOUNT_STATUS_FILTER:
+			draft.accountsCurrentPage = 1;
+			draft.accountStatusFilter = action.payload.status;
+			break;
+	}
+}, initialState);
+
+export default reducer;
diff --git a/apps/client/src/core/store/main/main.selectors.ts b/apps/client/src/core/store/main/main.selectors.ts
new file mode 100644
index 000000000..8a49b5f9b
--- /dev/null
+++ b/apps/client/src/core/store/main/main.selectors.ts
@@ -0,0 +1,24 @@
+import { AccountStatusFilter, AuthMethod, GDLocale, Store } from '~types/general';
+import { ColSortDir } from '~components/tables/TableHeader.component';
+
+export const getAppStateVersion = (state: Store): number => state.main.appStateVersion;
+export const getAuthMethod = (state: Store): AuthMethod => state.main.authMethod;
+export const getLocale = (state: Store): GDLocale => state.main.locale;
+export const isLocaleFileLoading = (state: Store): boolean => state.main.localeFileLoading;
+export const localeFileLoaded = (state: Store): boolean => state.main.localeFileLoaded;
+export const shouldShowLoginDialog = (state: Store): boolean => state.main.showLoginDialog;
+export const shouldShowPasswordResetDialog = (state: Store): boolean => state.main.showPasswordResetDialog;
+export const isLoggedIn = (state: Store): boolean => state.main.isLoggedIn;
+export const isOnloadAuthDetermined = (state: Store): boolean => state.main.isOnloadAuthDetermined;
+export const isDialogProcessing = (state: Store): boolean => state.main.dialogProcessing;
+export const getAuthToken = (state: Store): string => state.main.authToken;
+export const getCurrentPage = (state: Store): string => state.main.currentPage;
+export const tourIntroDialogVisible = (state: Store): boolean => state.main.tourIntroDialogVisible;
+export const isTourBundleLoaded = (state: Store): boolean => state.main.tourBundleLoaded;
+export const getLoginDefaultEmail = (state: Store): string => state.main.loginDialogDefaultEmail;
+export const getPasswordResetDialogDefaultEmail = (state: Store): string => state.main.passwordResetDialogDefaultEmail;
+export const getAccountsCurrentPage = (state: Store): number => state.main.accountsCurrentPage;
+export const getAccountsSortCol = (state: Store): string => state.main.accountsSortCol;
+export const getAccountsSortDir = (state: Store): ColSortDir => state.main.accountsSortDir;
+export const getAccountsFilterStr = (state: Store): string => state.main.accountsFilterStr;
+export const getAccountStatusFilter = (state: Store): AccountStatusFilter => state.main.accountStatusFilter;
diff --git a/apps/client/src/core/store/packets/__tests__/packets.selectors.test.ts b/apps/client/src/core/store/packets/__tests__/packets.selectors.test.ts
new file mode 100644
index 000000000..2025df112
--- /dev/null
+++ b/apps/client/src/core/store/packets/__tests__/packets.selectors.test.ts
@@ -0,0 +1,72 @@
+import { getNewPacket, initialState as initialPacketState, PacketsState } from '../packets.reducer';
+import * as selectors from '../packets.selectors';
+import { getInitialState } from '../../generator/generator.reducer';
+import { initialState as initialMainState } from '../../main/main.reducer';
+import { initialState as initialAccountState } from '../../account/account.reducer';
+import * as generalUtils from '@generatedata/utils/general';
+import { Store } from '~types/general';
+
+describe('getCurrentPacket', () => {
+	it('should return false by default', () => {
+		const state: Store = {
+			generator: getInitialState(),
+			main: initialMainState,
+			packets: initialPacketState,
+			account: initialAccountState
+		};
+		expect(selectors.getCurrentPacket(state)).toEqual(null);
+	});
+
+	it('should return the selected packet', () => {
+		const packets: PacketsState = generalUtils.cloneObj(initialPacketState);
+		packets.currentPacketId = '456';
+		packets.packetIds = ['123', '456'];
+		packets.packets['123'] = getNewPacket({ generationWorkerId: 1 });
+		packets.packets['456'] = getNewPacket({ generationWorkerId: 2 });
+
+		const state: Store = {
+			generator: getInitialState(),
+			main: initialMainState,
+			packets,
+			account: initialAccountState
+		};
+		expect(selectors.getCurrentPacket(state)!.generationWorkerId).toEqual(2);
+	});
+
+	it('getActivePacketList', () => {
+		const packets: PacketsState = generalUtils.cloneObj(initialPacketState);
+		packets.currentPacketId = '456';
+		packets.packetIds = ['123', '456'];
+		packets.packets['123'] = getNewPacket({
+			generationWorkerId: 1,
+			numRowsToGenerate: 5
+		});
+		packets.packets['456'] = getNewPacket({
+			generationWorkerId: 2,
+			numRowsToGenerate: 10
+		});
+
+		const state: Store = {
+			generator: getInitialState(),
+			main: initialMainState,
+			packets,
+			account: initialAccountState
+		};
+		expect(selectors.getActivePacketList(state)).toEqual([
+			{
+				isPaused: false,
+				label: '5 rows',
+				numRowsToGenerate: 5,
+				packetId: '123',
+				percentage: 0
+			},
+			{
+				isPaused: false,
+				label: '10 rows',
+				numRowsToGenerate: 10,
+				packetId: '456',
+				percentage: 0
+			}
+		]);
+	});
+});
diff --git a/apps/client/src/core/store/packets/packets.actions.ts b/apps/client/src/core/store/packets/packets.actions.ts
new file mode 100644
index 000000000..29e456e27
--- /dev/null
+++ b/apps/client/src/core/store/packets/packets.actions.ts
@@ -0,0 +1,131 @@
+import { Dispatch } from 'redux';
+import * as coreUtils from '../../../utils/coreUtils';
+import * as selectors from '../generator/generator.selectors';
+import * as packetSelectors from './packets.selectors';
+import { getDownloadFileInfo } from '~utils/exportTypes';
+import { getGeneratorPageRoute } from '~utils/routeUtils';
+import { GDAction } from '~types/general';
+import { downloadFile } from '../../generationPanel/generation.helpers';
+import * as mainSelectors from '~store/main/main.selectors';
+import { apolloClient } from '~core/apolloClient';
+import { gql } from '@apollo/client';
+
+export const START_GENERATION = 'START_GENERATION';
+export const startGeneration =
+	(): any =>
+		(dispatch: Dispatch, getState: any): void => {
+			const state = getState();
+
+			// whenever we start generating some data, we stash all the current settings into the data packet instance. That way,
+			// we can happily generate multiple independent packets simultaneously while the user starts work on a new
+			// data set in the UI
+			dispatch({
+				type: START_GENERATION,
+				payload: {
+					generationWorkerId: coreUtils.createGenerationWorker(),
+					numRowsToGenerate: selectors.getNumRowsToGenerate(state),
+					stripWhitespace: selectors.shouldStripWhitespace(state),
+					template: selectors.getGenerationTemplate(state),
+					dataTypes: selectors.getRowDataTypes(state),
+					columns: selectors.getColumns(state),
+					exportType: selectors.getExportType(state),
+					exportTypeSettings: selectors.getCurrentExportTypeSettings(state)
+				}
+			});
+		};
+
+export const UPDATE_TOTAL_GENERATION_COUNT = 'UPDATE_TOTAL_GENERATION_COUNT';
+export const updateTotalGenerationCount = (count: number): GDAction => ({
+	type: UPDATE_TOTAL_GENERATION_COUNT,
+	payload: { count }
+});
+
+export const LOG_DATA_BATCH = 'LOG_DATA_BATCH';
+export const logDataBatch =
+	(packetId: string, numGeneratedRows: number, dataStr: string): any =>
+		async (dispatch: Dispatch, getState: any): Promise<any> => {
+			const state = getState();
+			const numRowsToGenerate = selectors.getNumRowsToGenerate(state);
+			const isLoggedIn = mainSelectors.isLoggedIn(state);
+			const currentDataSetId = selectors.getCurrentDataSetId(state);
+
+			// if the packet has been fully generated track the generated row count
+			if (isLoggedIn && currentDataSetId !== null && numRowsToGenerate === numGeneratedRows) {
+				const { data } = await apolloClient.mutate({
+					mutation: gql`
+					mutation UpdateDataSetGenerationCount($dataSetId: ID!, $generatedRows: Int!) {
+						updateDataSetGenerationCount(dataSetId: $dataSetId, generatedRows: $generatedRows) {
+							success
+							error
+						}
+					}
+				`,
+					variables: {
+						dataSetId: currentDataSetId,
+						generatedRows: numGeneratedRows
+					}
+				});
+
+				if (data?.updateDataSetGenerationCount?.success) {
+					dispatch(updateTotalGenerationCount(numGeneratedRows));
+				}
+			}
+
+			dispatch({
+				type: LOG_DATA_BATCH,
+				payload: {
+					packetId,
+					numGeneratedRows,
+					dataStr
+				}
+			});
+		};
+
+export const PAUSE_GENERATION = 'PAUSE_GENERATION';
+export const pauseGeneration = (packetId: string): GDAction => ({ type: PAUSE_GENERATION, payload: { packetId } });
+
+export const CONTINUE_GENERATION = 'CONTINUE_GENERATION';
+export const continueGeneration = (packetId: string): GDAction => ({
+	type: CONTINUE_GENERATION,
+	payload: { packetId }
+});
+
+export const ABORT_GENERATION = 'ABORT_GENERATION';
+export const abortGeneration = (packetId: string): GDAction => ({ type: ABORT_GENERATION, payload: { packetId } });
+
+export const HIDE_ACTIVITY_PANEL = 'HIDE_ACTIVITY_PANEL';
+export const hideActivityPanel = (): GDAction => ({ type: HIDE_ACTIVITY_PANEL });
+
+export const SHOW_ACTIVITY_PANEL = 'SHOW_ACTIVITY_PANEL';
+export const showActivityPanel =
+	(packetId: string, history: any) =>
+		(dispatch: Dispatch, getState: any): void => {
+			const state = getState();
+			const locale = mainSelectors.getLocale(state);
+
+			history.push(getGeneratorPageRoute(locale));
+			dispatch({
+				type: SHOW_ACTIVITY_PANEL,
+				payload: { packetId }
+			});
+		};
+
+export const CHANGE_SPEED = 'CHANGE_SPEED';
+export const changeSpeed = (speed: number): GDAction => ({
+	type: CHANGE_SPEED,
+	payload: { speed }
+});
+
+export const promptToDownload =
+	() =>
+		(dispatch: Dispatch, getState: any): void => {
+			const state = getState();
+			const packetId = packetSelectors.getCurrentPacketId(state);
+			const dataString = packetSelectors.getCompletedDataString(state);
+			const packet = packetSelectors.getCurrentPacket(state);
+			const { exportType, exportTypeSettings } = packet!.config;
+
+			const { filename, fileType } = getDownloadFileInfo(packetId!, exportType, exportTypeSettings);
+
+			downloadFile(filename, dataString, fileType);
+		};
diff --git a/apps/client/src/core/store/packets/packets.reducer.ts b/apps/client/src/core/store/packets/packets.reducer.ts
new file mode 100644
index 000000000..47644c160
--- /dev/null
+++ b/apps/client/src/core/store/packets/packets.reducer.ts
@@ -0,0 +1,238 @@
+import { AnyAction } from 'redux';
+// @ts-ignore
+import { nanoid } from 'nanoid';
+import { produce } from 'immer';
+import * as actions from './packets.actions';
+import { ExportTypeFolder } from '@generatedata/plugins';
+import { getByteSize, getGraphDuration, getRowGenerationRatePerSecond } from '../../generationPanel/generation.helpers';
+import C from '@generatedata/config/constants';
+import * as mainActions from '../main/main.actions';
+import { LoadTimeGraphDuration } from '~types/general';
+
+type GeneratedDataBatch = {
+	byteSize: number;
+	dataStr: string;
+	endTime: number;
+};
+
+export type DataPacket = {
+	generationWorkerId: string;
+	startTime: number | null;
+	endTime: number | null;
+	totalPauseDuration: number;
+	lastPauseTime: number | null;
+	resumeTime: number;
+	isPaused: boolean;
+	numGeneratedRows: number;
+	numBatches: number;
+	speed: number;
+	loadTimeGraphDuration: LoadTimeGraphDuration;
+
+	// this block contains the actual configuration data - data types and export type data - used in this generation packet
+	config: {
+		stripWhitespace: boolean;
+		numRowsToGenerate: number;
+		template: any;
+		dataTypes: any;
+		columns: any;
+		exportType: ExportTypeFolder;
+		exportTypeSettings: any;
+	};
+
+	// the actual generated data
+	data: GeneratedDataBatch[];
+
+	stats: {
+		totalSize: number;
+		averageSpeed: number;
+		rowGenerationRatePerSecond: { [second: number]: number };
+		lastBatchGenerationDuration: number;
+		lastCompleteLoggedSecond: number;
+	};
+};
+
+export type DataPackets = {
+	[packetId: string]: DataPacket;
+};
+
+export type PacketsState = {
+	currentPacketId: string | null;
+	packetIds: string[];
+	packets: DataPackets;
+};
+
+export const initialState: PacketsState = {
+	currentPacketId: null,
+	packetIds: [],
+	packets: {}
+};
+
+export const getNewPacket = ({
+	generationWorkerId,
+	stripWhitespace,
+	numRowsToGenerate,
+	template,
+	dataTypes,
+	columns,
+	exportType,
+	exportTypeSettings
+}: any): DataPacket => {
+	const now = new Date().getTime();
+	const loadTimeGraphDuration = getGraphDuration(numRowsToGenerate);
+
+	return {
+		generationWorkerId,
+		startTime: now,
+		endTime: null,
+		totalPauseDuration: 0,
+		resumeTime: now,
+		isPaused: false,
+		lastPauseTime: null,
+		numGeneratedRows: 0,
+		numBatches: 0,
+		speed: 100,
+		loadTimeGraphDuration,
+		config: {
+			stripWhitespace,
+			numRowsToGenerate,
+			template,
+			dataTypes,
+			columns,
+			exportType,
+			exportTypeSettings
+		},
+		data: [],
+		stats: {
+			totalSize: 0,
+			averageSpeed: 0,
+			rowGenerationRatePerSecond: {},
+			lastCompleteLoggedSecond: 0,
+			lastBatchGenerationDuration: 0
+		}
+	};
+};
+
+export const reducer = produce((draft: PacketsState, action: AnyAction) => {
+	switch (action.type) {
+		case mainActions.RESET_STORE:
+			Object.keys(initialState).forEach((key) => {
+				// @ts-ignore-line
+				draft[key] = initialState[key];
+			});
+			break;
+
+		case actions.START_GENERATION: {
+			const { generationWorkerId, numRowsToGenerate, template, dataTypes, columns, exportType, exportTypeSettings, stripWhitespace } =
+				action.payload;
+
+			const packetId = nanoid();
+			draft.packetIds.push(packetId);
+			draft.packets[packetId] = getNewPacket({
+				generationWorkerId,
+				numRowsToGenerate,
+				template,
+				dataTypes,
+				columns,
+				exportType,
+				exportTypeSettings,
+				stripWhitespace
+			});
+			draft.currentPacketId = packetId;
+			break;
+		}
+
+		case actions.PAUSE_GENERATION:
+			draft.packets[action.payload.packetId].lastPauseTime = new Date().getTime();
+			draft.packets[action.payload.packetId].isPaused = true;
+			break;
+
+		case actions.CONTINUE_GENERATION:
+			const lastPauseTimeMs = draft.packets[action.payload.packetId].lastPauseTime;
+			const pauseDuration = new Date().getTime() - lastPauseTimeMs!;
+			draft.packets[action.payload.packetId].isPaused = false;
+			draft.packets[action.payload.packetId].lastPauseTime = null;
+			draft.packets[action.payload.packetId].totalPauseDuration += pauseDuration;
+			break;
+
+		case actions.ABORT_GENERATION: {
+			const packetId = draft.currentPacketId as string;
+			draft.currentPacketId = null;
+			draft.packetIds.splice(draft.packetIds.indexOf(packetId), 1);
+			delete draft.packets[packetId];
+			break;
+		}
+
+		case actions.HIDE_ACTIVITY_PANEL:
+			draft.currentPacketId = null;
+			break;
+
+		case actions.SHOW_ACTIVITY_PANEL:
+			draft.currentPacketId = action.payload.packetId;
+			break;
+
+		case actions.CHANGE_SPEED: {
+			if (draft.currentPacketId) {
+				draft.packets[draft.currentPacketId].speed = action.payload.speed;
+			}
+			break;
+		}
+
+		// TODO yikes. TOTAAAAAALLLLY needs improving and testing. And maybe taking out behind the shed and shooting.
+		case actions.LOG_DATA_BATCH: {
+			const now = new Date().getTime();
+			const { packetId, numGeneratedRows, dataStr } = action.payload;
+			const byteSize = getByteSize(dataStr);
+
+			// check for existence in case the user just cancelled and an orphaned response comes back
+			if (!draft.packets[packetId]) {
+				break;
+			}
+
+			const numExistingPackets = draft.packets[packetId].data.length;
+
+			// the start time for this batch was either the previous completed batch, or for the very first one - the start
+			// of the generation
+			const startTime =
+				numExistingPackets > 0
+					? draft.packets[packetId].data[draft.packets[packetId].data.length - 1].endTime
+					: draft.packets[packetId].resumeTime;
+
+			const duration = now - startTime;
+
+			let newAverageSpeed = duration;
+			if (numExistingPackets > 0) {
+				newAverageSpeed = (draft.packets[packetId].stats.averageSpeed * numExistingPackets + duration) / (numExistingPackets + 1);
+			}
+
+			draft.packets[packetId].stats.averageSpeed = newAverageSpeed;
+			draft.packets[packetId].stats.totalSize += byteSize;
+			draft.packets[packetId].stats.lastBatchGenerationDuration = duration;
+
+			draft.packets[packetId].numGeneratedRows = numGeneratedRows;
+			draft.packets[packetId].data.push({
+				dataStr,
+				byteSize,
+				endTime: now
+			});
+
+			const result = getRowGenerationRatePerSecond(draft.packets[packetId].resumeTime, startTime, now, C.GENERATION_BATCH_SIZE);
+
+			const seconds = Object.keys(result);
+			seconds.forEach((second) => {
+				const secondNum = parseInt(second, 10);
+				let currVal = draft.packets[packetId].stats.rowGenerationRatePerSecond[secondNum];
+				if (currVal) {
+					currVal += result[secondNum];
+				} else {
+					currVal = result[secondNum];
+				}
+				draft.packets[packetId].stats.rowGenerationRatePerSecond[secondNum] = currVal;
+			});
+
+			draft.packets[packetId].stats.lastCompleteLoggedSecond = parseInt(seconds[seconds.length - 1], 10) - 1;
+			break;
+		}
+	}
+}, initialState);
+
+export default reducer;
diff --git a/apps/client/src/core/store/packets/packets.selectors.ts b/apps/client/src/core/store/packets/packets.selectors.ts
new file mode 100644
index 000000000..03faef043
--- /dev/null
+++ b/apps/client/src/core/store/packets/packets.selectors.ts
@@ -0,0 +1,131 @@
+/* eslint max-len:0 */
+import { LoadTimeGraphDuration, Store } from '~types/general';
+import { createSelector } from 'reselect';
+import { DataPackets } from './packets.reducer';
+import prettyBytes from 'pretty-bytes';
+import { getFormattedNum } from '@generatedata/utils/number';
+import { formatDuration } from '@generatedata/utils/date';
+import { getLocale } from '../main/main.selectors';
+import C from '@generatedata/config/constants';
+
+export const getCurrentPacketId = (state: Store): string | null => state.packets.currentPacketId;
+export const getPacketIds = (state: Store): string[] => state.packets.packetIds;
+export const getPackets = (state: Store): DataPackets => state.packets.packets;
+
+export const getCurrentPacket = createSelector(getCurrentPacketId, getPackets, (packetId, packets) =>
+	packetId ? packets[packetId] : null
+);
+
+// returns true/false if there's anything currently in the process of being generated
+export const isGenerating = createSelector(getPackets, (packets) => Object.keys(packets).some((i: string) => packets[i].endTime === null));
+
+// returns an ordered list of packet info for displaying some pills in the footer
+export const getActivePacketList = createSelector(getPacketIds, getPackets, getLocale, (packetIds, packets, locale) => {
+	return packetIds.map((packetId: string) => {
+		const packet = packets[packetId];
+
+		return {
+			packetId,
+			label: getFormattedNum(packet.config.numRowsToGenerate, locale) + ' rows', // when we get into saving data sets, this'll be the name
+			percentage: (packet.numGeneratedRows / packet.config.numRowsToGenerate) * 100,
+			isPaused: packet.isPaused,
+			numRowsToGenerate: packet.config.numRowsToGenerate
+		};
+	});
+});
+
+export const getLoadTimeDuration = createSelector(getCurrentPacket, (packet) => packet!.loadTimeGraphDuration);
+
+export const getBatchLoadTimes = createSelector(getCurrentPacket, (packet) => {
+	if (!packet) {
+		return [];
+	}
+
+	const map = {
+		[LoadTimeGraphDuration.s15]: 15,
+		[LoadTimeGraphDuration.s30]: 30,
+		[LoadTimeGraphDuration.all]: 30,
+		[LoadTimeGraphDuration.m1]: 60
+	};
+	const numSecondsToShow = map[packet.loadTimeGraphDuration];
+
+	let seconds = Object.keys(packet.stats.rowGenerationRatePerSecond);
+	const numLoadedSeconds = seconds.length;
+
+	if (numLoadedSeconds <= numSecondsToShow) {
+		for (let i = numLoadedSeconds; i < numSecondsToShow; i++) {
+			seconds.push((i + 1).toString());
+		}
+	} else {
+		const sliceVal = numLoadedSeconds - numSecondsToShow;
+		seconds = seconds.slice(sliceVal + 1);
+	}
+
+	return seconds.map((secondStr) => {
+		const secondNum = parseInt(secondStr, 10);
+		const isComplete = secondNum <= packet.stats.lastCompleteLoggedSecond;
+		const rowsPerSecond = (isComplete && packet.stats.rowGenerationRatePerSecond[secondNum]) || 0;
+
+		return {
+			label: secondStr,
+			rowsPerSecond
+		};
+	});
+});
+
+export const getPacketTotalSize = createSelector(getCurrentPacket, (packet) => {
+	return packet ? packet.stats.totalSize : 0;
+});
+
+// may as well format it in this method too
+export const getGeneratedDataSizeLabel = createSelector(getPacketTotalSize, (totalSize) => prettyBytes(totalSize));
+
+export const getEstimatedDataSize = createSelector(getCurrentPacket, getPacketTotalSize, (packet, packetTotalSize) => {
+	if (!packet || packet.numGeneratedRows === 0) {
+		return '-';
+	}
+	return prettyBytes((packet.config.numRowsToGenerate / packet.numGeneratedRows) * packetTotalSize);
+});
+
+export const getEstimatedTime = createSelector(getCurrentPacket, (packet): number | null => {
+	if (!packet) {
+		return null;
+	}
+	return packet.stats.averageSpeed * (packet.config.numRowsToGenerate / C.GENERATION_BATCH_SIZE);
+});
+
+export const getEstimatedTimeDisplay = createSelector(getEstimatedTime, (time) => {
+	return time ? formatDuration(time / 1000) : '-';
+});
+
+export const getEstimatedTimeRemaining = createSelector(getCurrentPacket, getEstimatedTime, (packet, estimatedTime) => {
+	if (!estimatedTime || !packet) {
+		return '-';
+	}
+	const now = new Date().getTime();
+	let timeTaken = estimatedTime + packet.startTime! - now;
+
+	if (timeTaken < 0) {
+		timeTaken = 0;
+	}
+
+	return formatDuration(timeTaken / 1000);
+});
+
+export const getCompletedDataString = createSelector(getCurrentPacket, (packet) => {
+	if (!packet) {
+		return '';
+	}
+
+	let str = '';
+	packet.data.forEach(({ dataStr }) => (str += dataStr));
+
+	return str;
+});
+
+export const getLastBatchGenerationDuration = createSelector(getCurrentPacket, (packet) => {
+	if (!packet) {
+		return 0;
+	}
+	return packet.stats.lastBatchGenerationDuration / 1000;
+});
diff --git a/apps/client/src/core/theme.ts b/apps/client/src/core/theme.ts
new file mode 100644
index 000000000..c20e0c85f
--- /dev/null
+++ b/apps/client/src/core/theme.ts
@@ -0,0 +1,35 @@
+/* istanbul ignore file */
+import { createTheme } from '@mui/material/styles';
+
+const theme = createTheme({
+	typography: {
+		fontFamily: '"Open Sans", serif',
+		button: {
+			fontSize: 'inherit'
+		}
+	},
+	palette: {
+		primary: {
+			main: '#275eb5'
+		}
+	},
+	overrides: {
+		MuiDialog: {
+			root: {
+				// @ts-ignore-line
+				zIndex: '5000 !important'
+			}
+		}
+	},
+	props: {
+		MuiButtonBase: {
+			disableRipple: true
+		}
+	},
+	zIndex: {
+		// @ts-ignore-line
+		tooltip: '5001 !important'
+	}
+});
+
+export default theme;
diff --git a/apps/client/src/hooks/useDidUpdate.ts b/apps/client/src/hooks/useDidUpdate.ts
new file mode 100644
index 000000000..b40bf54c1
--- /dev/null
+++ b/apps/client/src/hooks/useDidUpdate.ts
@@ -0,0 +1,15 @@
+import { useEffect, useRef } from 'react';
+
+const useDidUpdate = (callback: any, deps: any[]): void => {
+	const hasMount = useRef(false);
+
+	useEffect(() => {
+		if (hasMount.current) {
+			callback();
+		} else {
+			hasMount.current = true;
+		}
+	}, deps);
+};
+
+export default useDidUpdate;
diff --git a/apps/client/src/hooks/usePortal.tsx b/apps/client/src/hooks/usePortal.tsx
new file mode 100644
index 000000000..ea4b73ca8
--- /dev/null
+++ b/apps/client/src/hooks/usePortal.tsx
@@ -0,0 +1,44 @@
+import { useRef, useEffect } from 'react';
+
+const createRootElement = (id: string): HTMLDivElement => {
+	const rootContainer = document.createElement('div');
+	rootContainer.setAttribute('id', id);
+	return rootContainer;
+};
+
+const addRootElement = (rootEl: any): void => {
+	document.body.insertBefore(
+		rootEl,
+		// @ts-ignore-line
+		document.body.lastElementChild.nextElementSibling
+	);
+};
+
+const usePortal = (id: string): HTMLDivElement => {
+	const rootElRef = useRef<any>(null);
+
+	useEffect((): any => {
+		const existingParent = document.querySelector(`#${id}`);
+		const parentEl = existingParent || createRootElement(id);
+		if (!existingParent) {
+			addRootElement(parentEl);
+		}
+		parentEl.appendChild(rootElRef.current);
+
+		return (): void => {
+			rootElRef.current.remove();
+			parentEl.remove();
+		};
+	}, []);
+
+	const getRootElem = (): any => {
+		if (!rootElRef.current) {
+			rootElRef.current = document.createElement('div');
+		}
+		return rootElRef.current;
+	};
+
+	return getRootElem();
+};
+
+export default usePortal;
diff --git a/apps/client/src/hooks/usePrevious.tsx b/apps/client/src/hooks/usePrevious.tsx
new file mode 100644
index 000000000..2e219d758
--- /dev/null
+++ b/apps/client/src/hooks/usePrevious.tsx
@@ -0,0 +1,13 @@
+import { useRef, useEffect } from 'react';
+
+const usePrevious = (value: any): any => {
+	const ref = useRef();
+
+	useEffect(() => {
+		ref.current = value;
+	}, [value]);
+
+	return ref.current;
+};
+
+export default usePrevious;
diff --git a/apps/client/src/hooks/useThrottle.ts b/apps/client/src/hooks/useThrottle.ts
new file mode 100644
index 000000000..ffef70af4
--- /dev/null
+++ b/apps/client/src/hooks/useThrottle.ts
@@ -0,0 +1,7 @@
+import { useState } from 'react';
+import { useThrottleCallback } from '@react-hook/throttle';
+
+export const useThrottle = <StateType>(initialState: StateType, wait: number, leading = false): [StateType, any] => {
+	const [state, setState] = useState(initialState);
+	return [state, useThrottleCallback(setState, wait, leading)];
+};
diff --git a/apps/client/src/i18n/ar.json b/apps/client/src/i18n/ar.json
new file mode 100644
index 000000000..63e3de097
--- /dev/null
+++ b/apps/client/src/i18n/ar.json
@@ -0,0 +1,329 @@
+{
+	"abort": "إحباط",
+	"about": "حول",
+	"aboutInfoPara1": "generatedata.com هو مشروع مفتوح المصدر قمت بإنشائه في أواخر العصر الحجري القديم (حوالي عام 2004) وكان له العديد والعديد من المساهمين طوال فترة حياته. كل بضع سنوات أعيد كتابته باستخدام أحدث وأكبر التقنيات المتاحة: تم الانتهاء من هذا الإصدار في عام 2021 ، وتم صنعه باستخدام React و Redux و Typescript و GraphQL و Docker وعمال الويب والأشرطة المطاطية وشريط مجاري الهواء والكثير من الشتائم.",
+	"aboutInfoPara2": "يمكنك العثور على المشروع على جيثب. قم بتنزيله أو شوكة أو لا تتردد في المساهمة استمتع!",
+	"aboutThisScript": "حول هذا البرنامج النصي",
+	"accountCreated": "تم إنشاء الحساب",
+	"accountCreatedDesc": "تم إنشاء الحساب.",
+	"accountCreatedMsg": "تم إنشاء حساب لك.",
+	"accountDeleted": "تم حذف الحساب.",
+	"accountDisabled": "الحساب معطل",
+	"accountExpiredMsg": "عذرا ، لقد انتهت صلاحية حسابك.",
+	"accountExpiryDate": "تاريخ انتهاء الحساب",
+	"accountInfo": "معلومات الحساب",
+	"accountSettings": "إعدادات الحساب",
+	"accountType": "نوع الحساب",
+	"accounts": "الحسابات",
+	"add": "Add",
+	"addRowsDesc": "لإضافة المزيد من الصفوف إلى شبكة البيانات ، ما عليك سوى استخدام النموذج الموجود أسفل الصفحة. عندما يكون لديك الكثير من الحقول ، قد يكون هذا القسم مخفيًا خارج الصفحة ، لذا سيتعين عليك تمرير اللوحة إلى الأسفل لرؤية النموذج.",
+	"addSomeDataDesc": "أضف بعض الصفوف في الشبكة.",
+	"admin": "Admin",
+	"adminAccount": "حساب المسؤول",
+	"administrator": "مدير",
+	"africa": "أفريقيا",
+	"allCountries": "كل البلدان",
+	"allDataTypePlugins": "كافة المكونات الإضافية لنوع البيانات",
+	"allExportTypePlugins": "كافة المكونات الإضافية لنوع التصدير",
+	"anonymousAccess": "وصول مجهول",
+	"asia": "آسيا",
+	"back": "رجوع",
+	"backToLogin": "العودة إلى تسجيل الدخول",
+	"blog": "مدونة",
+	"cancel": "إلغاء",
+	"centralAmerica": "أمريكا الوسطى",
+	"changePassword": "غير كلمة السر",
+	"clear": "واضح",
+	"clearPage": "مسح الصفحة",
+	"clearPageConfirmation": "هل تريد بالتأكيد مسح الصفحة؟ أي تغييرات قمت بها سيتم فقدانها.",
+	"clearThePage": "مسح الصفحة",
+	"clickExportTypeBtn": "توضح الخطوة التالية ما يحدث عند النقر فوق الزر.",
+	"close": "إغلاق",
+	"closePanel": "إغلاق لوحة",
+	"columns": "الأعمدة",
+	"columnsDesc": "ستعرض الشبكة أكبر عدد ممكن من هذه الأعمدة ، اعتمادًا على حجم الشاشة المتاح لديك. عندما تكون صغيرة جدًا ، ستخفي بعض الأعمدة وتظهر أيقونة ترس تفتح تلميحًا بالمحتوى المفقود. تشرح الخطوات القليلة التالية كل عمود من الأعمدة ، باستخدام صف الأسماء الأول كتوضيح.",
+	"complete": "كاملة",
+	"confirmDeleteAccount": "هل أنت متأكد أنك تريد حذف هذا الحساب؟",
+	"confirmDeleteUserAccount": "هل أنت متأكد من أنك تريد حذف حساب المستخدم هذا؟",
+	"confirmEmptyForm": "هل أنت متأكد من أنك تريد مسح الصفحة؟",
+	"continue": "يكمل",
+	"copiedToClipboard": "نسخ إلى الحافظة",
+	"copyToClipboard": "نسخ إلى الحافظة",
+	"coreExportType": "التنسيقات الأساسية",
+	"countries": "البلدان",
+	"country": "البلد",
+	"countrySpecific": "خاص بكل بلد",
+	"cpuMeltinglyFast": "وحدة المعالجة المركزية ذوبان سريع",
+	"createAccount": "إنشاء حساب",
+	"currentPassword": "كلمة المرور الحالية",
+	"currentVersion": "الإصدار الحالي قيد التحرير",
+	"dataGenerated": "تم إنشاء البيانات.",
+	"dataSet": "مجموعة البيانات",
+	"dataSetHelp": "هذا هو المكان الذي تقوم بتعريف بالضبط أي نوع من البيانات التي تريد إنشاء. حاول ملء صف أو اثنين وانقر فوق الزر إنشاء. ستحصل على تعليق منه بسرعة كبيرة.",
+	"dataSetLoaded": "تم تحميل مجموعة البيانات.",
+	"dataSetName": "اسم مجموعة البيانات",
+	"dataSetNameDesc": "انقر فوق النص هنا لتسمية مجموعة البيانات الخاصة بك. يرجى ملاحظة أنك ستحتاج إلى حساب على الموقع وتسجيل الدخول من أجل تسمية مجموعات البيانات الخاصة بك. عند حفظ مجموعات البيانات الخاصة بك ، يمنحك هذا الاسم تسمية مناسبة لتتبعها.",
+	"dataSetNameUpdated": "تم تحديث اسم مجموعة البيانات.",
+	"dataSetOptions": "خيارات مجموعة البيانات",
+	"dataSetReverted": "تمت إعادة مجموعة البيانات الخاصة بك إلى الإصدار القديم المحدد.",
+	"dataSetSaved": "تم حفظ مجموعة البيانات الخاصة بك.",
+	"dataSets": "مجموعات البيانات",
+	"dataType": "نوع البيانات",
+	"dataTypeDesc": "هذه قائمة منسدلة تحتوي على جميع أنواع البيانات المتاحة. عند تحديد قيمة ، سيتم تحديث الأعمدة المتبقية لهذا الصف. لكل نوع بيانات إعداداته الفريدة للسماح بالتخصيص.",
+	"dataTypes": "أنواع البيانات",
+	"dateAccountCreated": "تاريخ إنشاء حساب",
+	"dateCreated": "تاريخ الإنشاء",
+	"defaultLanguage": "اللغة الافتراضية",
+	"delete": "حذف",
+	"delete1DataSet": "حذف مجموعة البيانات 1",
+	"deleteAccount": "حذف الحساب",
+	"deleteDataSet": "حذف مجموعة البيانات",
+	"deleteDataSetConfirm": "هل أنت متأكد أنك تريد حذف مجموعة البيانات هذه؟",
+	"deleteRow": "احذف صف",
+	"deleteRowDesc": "يحتوي العمود الأخير على أيقونة حذف. سيؤدي النقر فوقه إلى حذف الصف.",
+	"developer": "المطور",
+	"developerDoc": "المطور وثيقة",
+	"disabled": "معاق",
+	"documentation": "الوثائق",
+	"download": "تحميل",
+	"edit": "تحرير",
+	"editAccount": "تحرير الحساب",
+	"editExportTypePage": "عند النقر فوق الزر \"نوع التصدير\" ، يظهر عرض صفحة كاملة يحتوي على خيارات التكوين على الجانب الأيسر ولوحة المعاينة على اليمين.",
+	"editExportTypePageConfig": "لنلق نظرة على خيارات التكوين.",
+	"editExportTypeSettings": "يرجى تعديل إعدادات نوع التصدير الخاصة بك.",
+	"editingExportTypes": "تحرير أنواع التصدير",
+	"email": "البريد الإلكتروني",
+	"emailFooterDisclaimer": "إذا كنت قد تلقيت هذا البريد الإلكتروني عن طريق الخطأ ، يرجى التواصل مع مسؤول الموقع.",
+	"emailIntroLineWithName": "مرحبًا1%1,",
+	"emailLabel": "بريد إلكتروني:",
+	"emailNotSent": "لم نتمكن من إرسال إشعار البريد الإلكتروني.",
+	"emailUserLoginInfo": "البريد الإلكتروني للمستخدم معلومات تسجيل الدخول الخاصة بهم",
+	"enterEmailAddressToResetPassword": "أدخل عنوان بريدك الإلكتروني أدناه لإعادة تعيين كلمة المرور الخاصة بك.",
+	"enterUserAccountDetails": "الرجاء إدخال تفاصيل حساب المستخدم الخاص بك أدناه.",
+	"errorCreatingAccount": "حدث خطأ في إنشاء هذا الحساب.",
+	"estimatedSize": "الحجم المقدر:",
+	"estimatedTime": "الوقت المقدر:",
+	"europe": "أوروبا",
+	"example": "مثال",
+	"exampleColumn": "عمود المثال",
+	"exampleColumnDesc": "قد يحتوي هذا العمود على محتوى أو لا يحتوي على محتوى بناءً على نوع البيانات الذي حددته للصف. إنها مجرد طريقة ملائمة لبعض أنواع البيانات لتقديم أمثلة محددة مسبقًا لكيفية استخدامها. على سبيل المثال ، يوفر عمود الأسماء قائمة منسدلة بتنسيقات أسماء مختلفة. بالنسبة لجميع أنواع البيانات ، لا يزال بإمكانك تكوينها يدويًا من خلال عمود \"الخيارات\": إنه حقًا جهاز موفر للوقت لمساعدتك في السرعة بأسرع ما يمكن.",
+	"examples": "أمثلة",
+	"exit": "خروج",
+	"expired": "منتهي الصلاحية",
+	"expiryDate": "تاريخ الانتهاء",
+	"exportType": "نوع التصدير",
+	"exportTypeBtnDesc": "الزر الموجود في الجزء العلوي الأيسر من اللوحة هو المكان الذي تذهب إليه لتحديد تنسيق البيانات التي تريد إنشاؤها وتكوينها. هنا تم ضبطه على تنضيد.",
+	"exportTypeOptionsSql": "خيارات نوع التصدير: SQL",
+	"exportTypeOptionsSqlDesc": "كما ترى ، لدى SQL الكثير من الحقول الأخرى الخاصة بنوع التصدير هذا. أنواع التصدير الأخرى لها إعدادات مختلفة.",
+	"exportTypeOptionsTs": "خيارات نوع التصدير: الأنواع",
+	"exportTypeOptionsTsDesc": "بناءً على نوع التصدير المحدد ، قد يحتوي نص اللوحة على خيارات إضافية. يوجد هنا حقلين ، مما يتيح لك تخصيص اسم النوع واسم المتغير الذي تم تصديره.",
+	"exportTypeOptionsTsDesc2": "الآن دعونا نلقي نظرة على SQL.",
+	"exportTypeSelection": "تحديد نوع التصدير",
+	"exportTypeSelectionDesc": "تتيح لك القائمة المنسدلة \"تنسيق\" اختيار تنسيق المحتوى الذي تم إنشاؤه. هناك العديد من الخيارات ، بعضها من الأنواع الأساسية: SQL ، CSV ، SQL ، JSON وغيرها ، وبعضها لتوليد البيانات للغات برمجة معينة.",
+	"exportTypes": "أنواع التصدير",
+	"filterDataTypes": "أنواع بيانات التصفية",
+	"financial": "الأمور المالية",
+	"firstName": "الاسم الأول",
+	"forgottenYourPasswordQ": "نسيت كلمة المرور؟",
+	"format": "تنسيق",
+	"generate": "توليد",
+	"generateBtnDesc": "بمجرد الانتهاء من تكوين مجموعة البيانات الخاصة بك والتأكد من أنها تبدو كما تريد ، فقد حان الوقت لإنشاء بعض البيانات في الحجم! انقر فوق هذا الزر لتوليد البيانات الخاصة بك. اعتمادًا على عدد الصفوف في شبكة البيانات وعدد الصفوف التي تريد إنشاءها ، قد يستغرق ذلك بعض الوقت.",
+	"generated": "ولدت",
+	"generatedC": "ولدت:",
+	"generator": "مولد",
+	"geo": "الجغرافية",
+	"grid": "الشبكة",
+	"gridPanelTourDesc1": "لوحة الشبكة هي المكان الذي تنشئ فيه البيانات التي تريد توليدها. يمكنك هنا الاختيار بين أنواع البيانات المختلفة وكيفية تكوينها والترتيب الذي تظهر به. في المثال هنا ، لدينا خمسة حقول: الاسم والهاتف والبريد الإلكتروني وعنوان الشارع والمدينة.",
+	"gridPanelTourDesc2": "راجع الجولة على لوحة الشبكة للحصول على معلومات أكثر تفصيلاً حول هذا القسم.",
+	"gridPanelTourIntroDesc1": "لوحة الشبكة هي المكان الذي تحدد فيه البيانات التي تريد توليدها. بالنسبة لهذه الجولة ، قمنا بإخفاء لوحة المعاينة (راجع زر \"معاينة\" غير المحدد أسفل يمين الصفحة) لمنحنا مساحة أكبر قليلاً. لقد أضفنا أيضًا 10 صفوف من أنواع بيانات مختلفة ، لأغراض التوضيح فقط.",
+	"gridPanelTourIntroDesc2": "لنبدأ بأعمدة الشبكة.",
+	"help": "مساعدة",
+	"helpIcon": "رمز المساعدة",
+	"helpIconDesc": "عند تحديد نوع البيانات في العمود السابق ، ستظهر أيقونة هنا. يؤدي النقر فوقه إلى فتح مربع حوار تعليمات يحتوي على معلومات الاستخدام.",
+	"hide": "يخفي",
+	"hideShowGrid": "إخفاء / إظهار الشبكة",
+	"hideShowPreviewPanel": "إخفاء / إظهار لوحة المعاينة",
+	"history": "التاريخ",
+	"historyPanelDesc": "تعرض هذه اللوحة محفوظات التغييرات التي تم إجراؤها على مجموعة البيانات. انقر فوق الأزرار \"عرض\" لفحص الإصدارات السابقة. للعودة إلى إصدار سابق ، قم فقط بعرضه ، ثم انقر فوق الزر \"الرجوع إلى هذا الإصدار\".",
+	"hostName": "اسم المضيف",
+	"humanData": "البيانات البشرية",
+	"ifWantToReregister": "إذا كنت ترغب في إعادة التسجيل يرجى زيارة:",
+	"incomplete": "غير مكتمل",
+	"install": "تثبيت",
+	"introToGenerator": "مقدمة عن المولد",
+	"introToGeneratorDesc": "تمنحك هذه الجولة مقدمة عالية المستوى للميزات الرئيسية لمولد البيانات. هيا بنا نبدأ!",
+	"invalidSettings": "إعدادات غير صحيحة!",
+	"language": "العربية",
+	"lastEdited": "آخر تعديل",
+	"lastLoggedIn": "آخر تسجيل دخول",
+	"lastModified": "اخر تعديل",
+	"lastName": "اسم العائلة",
+	"lastSaved": "آخر حفظ",
+	"lineWrapping": "التفاف الخط",
+	"linkToDataSet": "الارتباط بمجموعة البيانات",
+	"linkToThisDataSet": "الارتباط بمجموعة البيانات هذه",
+	"live": "حي",
+	"load": "تحميل",
+	"loading": "تحميل...",
+	"login": "تسجيل الدخول",
+	"loginToSave": "من أجل حفظ مجموعات البيانات الخاصة بك ، تحتاج أولاً إلى حساب. الرجاء تسجيل الدخول أدناه.",
+	"loginOrRegisterToSave": "من أجل حفظ مجموعات البيانات الخاصة بك ، تحتاج أولاً إلى حساب. الرجاء تسجيل الدخول أو التسجيل أدناه.",
+	"loginUrlLabel": "URL تسجيل الدخول:",
+	"logout": "خروج",
+	"makeDataSetPublicAgreement": "أنا أفهم أنه لمشاركة مجموعة البيانات هذه , أحتاج إلى جعلها عامة.",
+	"metaDescription": "generatedata.com: مجاني, ومرخصة من غنو, ومولد بيانات مخصص عشوائي لاختبار البرمجيات",
+	"metaKeywords": "بيانات عشوائية, بيانات الاختبار, بيانات العينة, مولد البيانات, توليد البيانات",
+	"missingDataSetName": "الرجاء إدخال اسم مجموعة البيانات الخاصة بك",
+	"nameColumn": "عمود الاسم",
+	"nameColumnDesc": "يحصل هذا العمود على عنوان مختلف بناءً على نوع التصدير الذي حددته في لوحة المعاينة (XML ، CSV ، إلخ). الغرض من هذا العمود هو توفير معرف للصف يمكن استخدامه بعد ذلك في البيانات التي تم إنشاؤها. على سبيل المثال ، يستخدم XML هذه القيمة كاسم عقدة XML ؛ يستخدمه JSON كاسم خاصية JSON ؛ يستخدمه SQL لاسم عمود قاعدة البيانات. سيقوم التطبيق تلقائيًا بالتحقق من صحة القيمة التي أدخلتها هنا للتأكد من أنها صالحة لنوع التصدير المحدد.",
+	"newDataSet": "مجموعة بيانات جديدة",
+	"no": "لا",
+	"noAccountsCreated": "لم يتم إنشاء حسابات.",
+	"noAdditionalSettings": "لا توجد إعدادات إضافية",
+	"noDataSetsSaved": "ليس لديك أي مجموعات بيانات محفوظة.",
+	"noExamplesAvailable": "لا توجد أمثلة متاحة.",
+	"noExpiry": "لا انتهاء الصلاحية",
+	"noHistory": "لا يوجد سجل حتى الان.",
+	"noOptionsAvailable": "لا توجد خيارات متاحة.",
+	"noSafari": "آسف ، لا سفاري!",
+	"northAmerica": "أمريكا الشمالية",
+	"nowLoggedIn": "لقد قمت بتسجيل الدخول.",
+	"nowLoggedOut": "لقد تم تسجيل الخروج.",
+	"numResults": "نتائج Num",
+	"numeric": "رقمية",
+	"oceania": "أوقيانوسيا",
+	"oneTimePasswordLogin": "لقد قمت بتسجيل الدخول باستخدام كلمة مرور لمرة واحدة. الرجاء تعيين كلمة مرور جديدة الآن.",
+	"open": "افتح",
+	"options": "خيارات",
+	"optionsColumn": "عمود الخيارات",
+	"optionsColumnDesc1": "يحتوي هذا العمود على كافة خيارات التكوين لنوع البيانات لهذا الصف. تحتوي بعض أنواع البيانات على عدد كبير جدًا من إعدادات التكوين لعرضها في مثل هذه المساحة الصغيرة (على سبيل المثال ، البلد ، المنطقة) ، لذلك قد تعرض فقط زرًا في الشبكة يفتح مربع حوار يحتوي على جميع الخيارات.",
+	"optionsColumnDesc2": "بالنسبة لنوع بيانات الأسماء الموضح هنا ، يحتوي العمود على حقل واحد قابل للإنشاء. هذا نوع حقل شائع في منشئ البيانات. يتيح لك إضافة عناصر بمجرد الكتابة فيها والنقر فوق <إدخال>. ثم يقوم بتحويل هذه العناصر إلى أقراص مميزة يمكن إزالتها عبر أيقونة \"x\".",
+	"or": "أو",
+	"order": "أمر",
+	"other": "غير ذلك",
+	"overMaxAnonRows": "عذرًا ، يمكنك إنشاء 1% صف فقط. لإنشاء كميات أكبر من البيانات ، ستحتاج إلى حساب مستخدم على هذا الموقع.",
+	"panelContents": "محتويات اللوحة",
+	"panelContentsDesc": "يحتوي الجزء الأكبر من لوحة المعاينة على عينة من البيانات التي تم إنشاؤها ، وفقًا للبيانات التي حددتها في لوحة الشبكة وإعدادات نوع التصدير المحددة. هنا يتم إنشاء 5 أنواع مختلفة من البيانات (البلد ، والمنطقة ، والمدينة ، وعنوان الشارع ، والبريد / الرمز البريدي) بتنسيق الكتابة المطبوعة.",
+	"panelControls": "ضوابط لوحة",
+	"panelControlsClearIconDesc": "يتيح لك الرمز الأخير في لوحة التحكم مسح الصفحة حتى تتمكن من البدء من جديد.",
+	"panelControlsDesc": "تتيح لك أزرار التحكم في اللوحة إخفاء / إظهار لوحات الشبكة والمعاينة والتي يمكن أن تكون مفيدة إذا كنت تعمل مع عقارات محدودة الشاشة. يمكنك أيضًا تبديل موضع اللوحتين بالنسبة إلى بعضهما البعض (يسار - يمين ، أعلى - أسفل) باستخدام الرمز الثالث.",
+	"panelTabs": "علامات تبويب اللوحة",
+	"panelTabsDesc": "أخيرًا ، ربما لاحظت أن اللوحة منظمة في علامتي تبويب. بشكل افتراضي ، يعرض علامة التبويب \"الإعدادات\" ، نظرًا لأن هذا هو المكان الذي من المرجح أن تذهب إليه. ولكن هناك أيضًا علامة تبويب \"معاينة\" ثانية تحتوي على إعدادات لتغيير مظهر لوحة المعاينة: السمة وإخفاء / إظهار أرقام الأسطر وتبديل التفاف السطر وتغيير حجم النص والتحكم في عدد الصفوف التي تم إنشاؤها.",
+	"password": "كلمة السر",
+	"passwordLabel": "كلمة المرور:",
+	"passwordReset": "إعادة تعيين كلمة المرور",
+	"passwordResetAccountExpired": "إعادة تعيين كلمة المرور - انتهت صلاحية الحساب",
+	"passwordResetAccountExpiredDesc": "لقد تلقينا للتو طلبًا لإعادة تعيين كلمة المرور الخاصة بك ، ولكن حسابك قد انتهت صلاحيته بالفعل.",
+	"passwordResetComplete": "تمت إعادة تعيين كلمة المرور الخاصة بك وكنت قد عبر البريد الإلكتروني كلمة المرور الجديدة.",
+	"passwordResetEmailContent1": "تم إعادة تعيين كلمة المرور الخاصة بك. يمكنك استخدام كلمة المرور التالية لتسجيل الدخول: %1",
+	"passwordResetEmailContent2": "الرجاء تغييره بمجرد تسجيل الدخول.",
+	"passwordResetEmailDesc": "لقد تلقينا طلبًا لإعادة تعيين كلمة المرور الخاصة بك. يحتوي هذا البريد الإلكتروني على كلمة مرور مؤقتة لمرة واحدة يمكنك استخدامها لتسجيل الدخول. بعد تسجيل الدخول ، ستحتاج إلى تعيين كلمة مرور جديدة.",
+	"passwordResetMsg": "إذا كان البريد الإلكتروني موجودًا في الملف ، فقد تمت إعادة تعيين كلمة المرور الخاصة بك وتم إرسال معلومات تسجيل الدخول المؤقتة عبر البريد الإلكتروني.",
+	"passwordUpdateInvalidPassword": "كلمة المرور الحالية غير صحيحة. الرجاء إعادة الدخول.",
+	"passwordUpdated": "لقد تم تحديث كلمة السر الخاصة بك.",
+	"pause": "وقفة",
+	"pleaseConfirm": "يرجى تأكيد",
+	"pleaseEnterAll": "الرجاء إدخال جميع",
+	"pleaseEnterDataSetName": "الرجاء إدخال اسم مجموعة البيانات الجديدة.",
+	"pleaseFixErrors": "الرجاء إصلاح الأخطاء التالية وإعادة إرسال:",
+	"pleaseLogin": "الرجاء تسجيل الدخول",
+	"pleaseSelect": "الرجاء اختيار",
+	"plugins": "الإضافات",
+	"pressEnterAddItem": "اضغط على Enter لإضافة عنصر",
+	"preview": "معاينة",
+	"previewPanel": "لوحة المعاينة",
+	"previewPanelControlsDesc": "في أعلى يمين اللوحة هناك رمزان. يقوم الرمز الأول بتحديث اللوحة ، مما يؤدي إلى إنشاء بيانات عشوائية مختلفة في كل مرة - وهذا يساعد في إعطائك فكرة عن نوع البيانات التي يتم إنشاؤها. الأيقونة الثانية تغلق اللوحة تمامًا. يمكنك دائمًا إظهار اللوحة مرة أخرى باستخدام القسم الموجود أسفل يسار الصفحة (ما عليك سوى إعادة تحديد مربع الاختيار \"معاينة\").",
+	"previewPanelDesc": "تمنحك هذه اللوحة معاينة مباشرة للبيانات التي تقوم بإنشائها ، أثناء إنشائها من خلال لوحة الشبكة. يعرض الزر الموجود أعلى اليسار التنسيق المحدد للبيانات التي يتم إنشاؤها (مثل SQL و XML و CSV وما إلى ذلك). لتغيير التنسيق ، ما عليك سوى النقر فوق الزر.",
+	"previewPanelMoreInfo": "لمزيد من المعلومات حول هذه اللوحة ، تحقق من جولة لوحة المعاينة.",
+	"previewPanelNoData": "لا بيانات!",
+	"previewPanelTourDesc": "تمنحك لوحة المعاينة تمثيلاً مرئيًا حيًا للبيانات التي تقوم بإنشائها أثناء إنشائها. تقدم هذه الجولة مقدمة سريعة عن كيفية عمل اللوحة.",
+	"previewRows": "معاينة الصفوف",
+	"private": "نشر",
+	"problemLoadingTour": "آسف ، كانت هناك مشكلة في تحميل الجولة.",
+	"programmingLanguages": "لغات البرمجة",
+	"province": "مقاطعة",
+	"public": "عامة",
+	"publicQ": "الجمهور؟",
+	"reenterPassword": "إعادة إدخال كلمة المرور",
+	"refreshPage": "تحديث الصفحة",
+	"refreshPanel": "لوحة تحديث",
+	"register": "تسجيل",
+	"remainingTime": "الوقت المتبقي:",
+	"requiredField": "يتطلب حقلا",
+	"revertToVersion": "العودة إلى هذا الإصدار",
+	"row": "صف",
+	"rowLabel": "عنوان العمود",
+	"rowLabelPlural": "عناوين العمود",
+	"rowNumDesc1": "يُظهر العمود الأول في الشبكة رقم الصف. لإعادة ترتيب الصف ، ما عليك سوى النقر على هذا العنصر واسحبه لأعلى أو لأسفل.",
+	"rowNumDesc2": "تعرض قيمة الرأس لهذا العمود العدد الإجمالي للصفوف في شبكتك. يمكن أن يكون هذا مفيدًا عندما يكون لديك مجموعات بيانات كبيرة بالفعل ويكون حجمها أكبر من أن يتسع للشاشة.",
+	"rowNumber": "رقم الصف",
+	"rowSp": "صف (ق)",
+	"rows": "الصفوف",
+	"rowsGenerated": "الصفوف التي تم إنشاؤها",
+	"rowsGeneratedPerSecond": "يتم إنشاء الصفوف في الثانية",
+	"safariExplanation": "يتطلب هذا الموقع مستعرض ويب حديثًا يطبق معايير الويب الحديثة. لسوء الحظ ، تأخر Safari عن المتصفحات الأخرى ولن يقوم بتشغيل هذا البرنامج النصي. حتى نكتشف كيفية ملاءمتها ، يرجى استخدام أحد المتصفحات التالية. كل ذلك مجاني للتنزيل.",
+	"save": "حفظ",
+	"saveAs": "حفظ باسم",
+	"saveButtonDesc": "إذا كان لديك حساب مستخدم على الموقع ، فسيحفظ هذا الزر مجموعة البيانات الخاصة بك. إذا لم تقم بتسجيل الدخول ، فسيطالبك النقر فوقه بتسجيل الدخول أولاً. يحتفظ النظام بمحفوظات التغييرات %1 الأخيرة على مجموعة البيانات ، بحيث يمكنك دائمًا الرجوع وعرض الإصدارات الأقدم.",
+	"saveDataSetNewName": "حفظ مجموعة البيانات كاسم جديد",
+	"seconds": "ثواني",
+	"seeHelpDialog": "انظر مربع حوار التعليمات.",
+	"selectCountry": "اختر البلد",
+	"selectDataType": "تحديد نوع البيانات",
+	"selectEllipsis": "تحديد...",
+	"selectExpiryDate": "حدد تاريخ انتهاء الصلاحية",
+	"selectLanguage": "اختر اللغة",
+	"sendEmail": "ارسل بريد الكتروني",
+	"seriouslySlow": "بطيئة على محمل الجد",
+	"settings": "إعدادات",
+	"showGrid": "عرض الشبكة",
+	"showLineNumbers": "إظهار أرقام الأسطر",
+	"showPreview": "عرض معاينة",
+	"siteLogo": "شعار الموقع",
+	"size": "بحجم:",
+	"southAmerica": "أمريكا الجنوبية",
+	"status": "الحالة",
+	"stripWhitespace": "نزع المسافة البيضاء من المحتوى الذي تم إنشاؤه",
+	"success": "النجاح",
+	"text": "نص",
+	"textSize": "حجم الخط",
+	"theDataSetName": "اسم مجموعة البيانات",
+	"theExportTypeBtn": "زر نوع التصدير",
+	"theGenerateButton": "زر توليد",
+	"theGridPanel": "لوحة الشبكة",
+	"thePreviewPanel": "لوحة المعاينة",
+	"theSaveButton": "زر الحفظ",
+	"theme": "موضوع",
+	"togglePanelLayout": "تبديل تخطيط لوحة",
+	"totalNumGeneratedRows": "إجمالي عدد الصفوف التي تم إنشاؤها",
+	"tourComplete": "اكتملت الجولة",
+	"tourCompleteDesc": "كله تمام! اختر أحد الأزرار أدناه للمتابعة.",
+	"tourIntroPara1": "توفر هذه الأداة الكثير من الوظائف وقد تكون مربكة قليلاً في البداية. انقر فوق أحد الأزرار الموجودة على اليمين للقيام بجولة حول هذه الميزة بالذات.",
+	"tourIntroPara2": "لاحظ أنه عند بدء الجولة ، فإنها تقوم مؤقتًا بالكتابة فوق محتوى صفحة المنشئ لتوضيح أشياء معينة حول الواجهة. لكن لا تقلق! بمجرد انتهاء الجولة ، تقوم بإرجاع بياناتك إلى حالتها الأصلية.",
+	"tryDifferentTour": "جرب جولة مختلفة",
+	"update": "تحديث",
+	"updateAccount": "تحديث الحساب",
+	"user": "المستخدم",
+	"userAccount": "حساب المستخدم",
+	"userAccountNotFound": "عذرا ، لم نتمكن من العثور على حسابك.",
+	"userAccountUpdated": "تم تحديث حساب المستخدم.",
+	"userAccounts": "حسابات المستخدمين",
+	"userNotFound": "عذرا ، لم نتمكن من التعرف عليك. يرجى التحقق من بيانات الاعتماد الخاصة بك.",
+	"validationAccountAlreadyExists": "آسف, حساب مع عنوان البريد الإلكتروني هذا موجود بالفعل.",
+	"validationDifferentNewPasswords": "يرجى التأكد من تطابق كلمات المرور الجديدة",
+	"validationInvalidEmail": "الرجاء إدخال عنوان بريد إلكتروني صالح.",
+	"validationNoCurrentPassword": "الرجاء إدخال كلمة المرور الحالية الخاصة بك",
+	"validationNoEmail": "الرجاء إدخال عنوان البريد الإلكتروني الخاص بك.",
+	"validationNoFirstName": "الرجاء إدخال اسمك الأول.",
+	"validationNoLastName": "الرجاء إدخال اسم العائلة.",
+	"validationNoPassword": "الرجاء إدخال كلمة المرور الخاصة بك.",
+	"version": "الإصدار",
+	"view": "منظر",
+	"viewChangelog": "عرض سجل التغيير",
+	"viewOnGithub": "عرض على Github",
+	"welcomeToTheGenerator": "مرحبًا بك في المولد!",
+	"yes": "نعم",
+	"yourAccount": "حسابك",
+	"yourAccountUpdated": "تم تحديث حسابك",
+	"yourUserAccount": "حساب المستخدم الخاص بك"
+}
diff --git a/apps/client/src/i18n/de.json b/apps/client/src/i18n/de.json
new file mode 100644
index 000000000..513723bbf
--- /dev/null
+++ b/apps/client/src/i18n/de.json
@@ -0,0 +1,329 @@
+{
+	"abort": "Abbrechen",
+	"about": "Über",
+	"aboutInfoPara1": "generatedata.com ist ein Open-Source-Projekt, das ich in der späten Altsteinzeit (ca. 2004) erstellt habe und während seiner Lebensdauer viele, viele Mitwirkende hatte. Alle paar Jahre schreibe ich es mit den neuesten und besten verfügbaren Technologien neu: Diese Version wurde 2021 fertiggestellt, erstellt mit React, Redux, Typescript, GraphQL, Docker, Webworkern, Gummibändern, Klebeband und einer ganzen Menge Fluchen.",
+	"aboutInfoPara2": "Sie finden das Projekt auf github. Laden Sie es herunter, geben Sie es ab oder tragen Sie dazu bei. Genießen!",
+	"aboutThisScript": "Über dieses Skript",
+	"accountCreated": "Benutzerkonto erstellt",
+	"accountCreatedDesc": "Das Konto wurde erstellt.",
+	"accountCreatedMsg": "Ein Benutzerkonto wurde für Sie erstellt.",
+	"accountDeleted": "Das Konto wurde gelöscht.",
+	"accountDisabled": "Account deaktiviert",
+	"accountExpiredMsg": "Ihr Konto ist leider abgelaufen.",
+	"accountExpiryDate": "Ablaufdatum des Kontos",
+	"accountInfo": "Benutzerkonten-Daten",
+	"accountSettings": "Benutzerkonto-Einstellungen",
+	"accountType": "Kontotyp",
+	"accounts": "Konten",
+	"add": "Hinzufügen",
+	"addRowsDesc": "Um dem Datenraster weitere Zeilen hinzuzufügen, verwenden Sie einfach das Formular unten auf der Seite. Wenn Sie viele Felder haben, wird dieser Abschnitt möglicherweise außerhalb der Seite ausgeblendet, sodass Sie das Bedienfeld nach unten scrollen müssen, um das Formular anzuzeigen.",
+	"addSomeDataDesc": "Fügen Sie dem Raster einige Zeilen hinzu.",
+	"admin": "Admin",
+	"adminAccount": "Admin-Konto",
+	"administrator": "Administrator",
+	"africa": "Afrika",
+	"allCountries": "Alle Länder",
+	"allDataTypePlugins": "Alle Datentyp-Plugins",
+	"allExportTypePlugins": "Alle Exporttyp-Plugins",
+	"anonymousAccess": "Anonymer Zugriff",
+	"asia": "Asien",
+	"back": "Zurück",
+	"backToLogin": "Zurück zur Anmeldung",
+	"blog": "Blog",
+	"cancel": "abbrechen",
+	"centralAmerica": "Zentralamerika",
+	"changePassword": "Passwort ändern",
+	"clear": "klar",
+	"clearPage": "Seite löschen",
+	"clearPageConfirmation": "Möchten Sie die Seite wirklich löschen? Alle Änderungen, die Sie vorgenommen haben, gehen verloren.",
+	"clearThePage": "Seite leeren",
+	"clickExportTypeBtn": "Der nächste Schritt zeigt, was passiert, wenn Sie auf die Schaltfläche klicken.",
+	"close": "Schließen",
+	"closePanel": "Panel schließen",
+	"columns": "Säulen",
+	"columnsDesc": "Das Raster zeigt je nach verfügbarer Bildschirmgröße so viele dieser Spalten wie möglich an. Wenn es zu klein ist, werden einige Spalten ausgeblendet und ein Zahnradsymbol angezeigt, das einen Infotip mit dem fehlenden Inhalt öffnet. In den nächsten Schritten werden die einzelnen Spalten anhand der ersten Namenszeile erläutert.",
+	"complete": "Komplett",
+	"confirmDeleteAccount": "Möchten Sie dieses Konto wirklich löschen?",
+	"confirmDeleteUserAccount": "Sind Sie sicher, dass Sie dieses Benutzerkonto löschen möchten?",
+	"confirmEmptyForm": "Sind Sie sicher, dass Sie die Seite löschen möchten?",
+	"continue": "Fortsetzen",
+	"copiedToClipboard": "In die Zwischenablage kopiert",
+	"copyToClipboard": "In die Zwischenablage kopieren",
+	"coreExportType": "Kernformate",
+	"countries": "Länder",
+	"country": "Land",
+	"countrySpecific": "Länderspezifisch",
+	"cpuMeltinglyFast": "CPU-schmelzend schnell",
+	"createAccount": "Konto erstellen",
+	"currentPassword": "Derzeitiges Passwort",
+	"currentVersion": "Aktuelle Version wird bearbeitet",
+	"dataGenerated": "Daten generiert.",
+	"dataSet": "Datensatz",
+	"dataSetHelp": "Hier definieren Sie, welche Daten Sie erstellen wollen. Geben Sie einfach 2-3 Zeilen und drücken Sie auf den Button \"Erzeugen\". Sie werden den Dreh ziemlich schnell raus bekommen.",
+	"dataSetLoaded": "Der Datensatz wurde geladen.",
+	"dataSetName": "Datensatz-Name",
+	"dataSetNameDesc": "Klicken Sie hier auf den Text, um Ihren Datensatz zu benennen. Bitte beachten Sie, dass Sie ein Konto auf der Website benötigen und angemeldet sein müssen, um Ihre Datensätze zu benennen. Wenn Sie Ihre Datensätze speichern, erhalten Sie mit diesem Namen eine praktische Bezeichnung, mit der Sie sie verfolgen können.",
+	"dataSetNameUpdated": "Der Datensatzname wurde aktualisiert.",
+	"dataSetOptions": "Datensatzoptionen",
+	"dataSetReverted": "Ihr Datensatz wurde auf die ausgewählte ältere Version zurückgesetzt.",
+	"dataSetSaved": "Ihr Datensatz wurde gespeichert.",
+	"dataSets": "Datensätze",
+	"dataType": "Datentyp",
+	"dataTypeDesc": "Dies ist eine Dropdown-Liste mit allen verfügbaren Datentypen. Wenn Sie einen Wert auswählen, werden die verbleibenden Spalten für diese Zeile aktualisiert. Jeder Datentyp verfügt über eigene Einstellungen, um die Anpassung zu ermöglichen.",
+	"dataTypes": "Datentypen",
+	"dateAccountCreated": "Konto erstellt am",
+	"dateCreated": "Erstellungsdatum",
+	"defaultLanguage": "Standard Sprache",
+	"delete": "Löschen",
+	"delete1DataSet": "Datensatz löschen",
+	"deleteAccount": "Account löschen",
+	"deleteDataSet": "Datensatz löschen",
+	"deleteDataSetConfirm": "Möchten Sie diesen Datensatz wirklich löschen?",
+	"deleteRow": "Zeile löschen",
+	"deleteRowDesc": "Die letzte Spalte enthält ein Löschsymbol. Durch Klicken darauf wird die Zeile gelöscht.",
+	"developer": "Entwickler",
+	"developerDoc": "Entwickler-Dokumentation",
+	"disabled": "Behindert",
+	"documentation": "Dokumentation",
+	"download": "Herunterladen",
+	"edit": "Bearbeiten",
+	"editAccount": "Konto bearbeiten",
+	"editExportTypePage": "Wenn Sie auf die Schaltfläche Exporttyp klicken, wird eine ganzseitige Ansicht mit den Konfigurationsoptionen auf der linken Seite und dem Vorschaufenster auf der rechten Seite angezeigt.",
+	"editExportTypePageConfig": "Schauen wir uns die Konfigurationsoptionen an.",
+	"editExportTypeSettings": "Bitte bearbeiten Sie Ihre Exporttypeinstellungen.",
+	"editingExportTypes": "Exporttypen bearbeiten",
+	"email": "E-Mail",
+	"emailFooterDisclaimer": "Wenn Sie diese E-Mail irrtümlich erhalten haben, wenden Sie sich bitte an den Site-Administrator.",
+	"emailIntroLineWithName": "Hallo %1,",
+	"emailLabel": "Email:",
+	"emailNotSent": "Wir waren nicht in der Lage, die E-Mail-Benachrichtigung zu versenden.",
+	"emailUserLoginInfo": "E-Mail dem Nutzer ihre Login-Daten",
+	"enterEmailAddressToResetPassword": "Geben Sie einfach Ihre E-Mailadresse ein, um Ihr Passwort zurückzusetzen.",
+	"enterUserAccountDetails": "Bitte geben Sie Ihr Benutzerkonten-Details ein.",
+	"errorCreatingAccount": "Beim Erstellen dieses Kontos ist ein Fehler aufgetreten.",
+	"estimatedSize": "Geschätzte Größe:",
+	"estimatedTime": "Geschätzte Zeit:",
+	"europe": "Europa",
+	"example": "Beispiel",
+	"exampleColumn": "Beispielspalte",
+	"exampleColumnDesc": "Diese Spalte kann je nach dem für die Zeile ausgewählten Datentyp Inhalt enthalten oder nicht. Für einige Datentypen ist es nur eine bequeme Möglichkeit, voreingestellte Beispiele für ihre Verwendung bereitzustellen. In der Spalte \"Namen\" finden Sie beispielsweise eine Dropdown-Liste mit verschiedenen Namensformaten. Für alle Datentypen können Sie sie weiterhin manuell über die Spalte Optionen konfigurieren: Es ist wirklich ein zeitsparendes Gerät, um Sie so schnell wie möglich auf den neuesten Stand zu bringen.",
+	"examples": "Beispiele",
+	"exit": "Ausgang",
+	"expired": "Abgelaufen",
+	"expiryDate": "Verfallsdatum",
+	"exportType": "Exporttyp",
+	"exportTypeBtnDesc": "Über die Schaltfläche oben links im Bedienfeld können Sie das Format für die Daten auswählen und konfigurieren, die Sie generieren möchten. Hier ist es auf Typescript eingestellt.",
+	"exportTypeOptionsSql": "Exporttypoptionen: SQL",
+	"exportTypeOptionsSqlDesc": "Wie Sie sehen können, verfügt SQL über viele andere Felder, die für diesen Exporttyp spezifisch sind. Andere Exporttypen haben andere Einstellungen.",
+	"exportTypeOptionsTs": "Exporttypoptionen: Typoskript",
+	"exportTypeOptionsTsDesc": "Abhängig vom ausgewählten Exporttyp kann der Bedienfeldkörper zusätzliche Optionen enthalten. Hier mit Typescript gibt es zwei Felder, in denen Sie den Typnamen und den Namen der exportierten Variablen anpassen können.",
+	"exportTypeOptionsTsDesc2": "Schauen wir uns nun SQL an.",
+	"exportTypeSelection": "Typauswahl exportieren",
+	"exportTypeSelectionDesc": "In der Dropdown-Liste Format können Sie das Format für den generierten Inhalt auswählen. Es gibt viele Optionen, von denen einige die Kerntypen sind: SQL, CSV, SQL, JSON und andere, und einige dienen zum Generieren von Daten für bestimmte Programmiersprachen.",
+	"exportTypes": "Export-Typen",
+	"filterDataTypes": "Datentypen filtern",
+	"financial": "Financiera",
+	"firstName": "Vorname",
+	"forgottenYourPasswordQ": "Passwort vergessen?",
+	"format": "Format",
+	"generate": "Erzeugen",
+	"generateBtnDesc": "Sobald Sie die Konfiguration Ihres Datensatzes abgeschlossen und bestätigt haben, dass er Ihren Wünschen entspricht, ist es Zeit, einige Daten in großem Umfang zu generieren! Klicken Sie auf diese Schaltfläche, um Ihre Daten zu generieren. Abhängig von der Anzahl der Zeilen im Datenraster und der Anzahl der Zeilen, die Sie generieren möchten, kann dies einige Zeit dauern.",
+	"generated": "Generiert",
+	"generatedC": "Generiert:",
+	"generator": "Generator",
+	"geo": "Geo",
+	"grid": "Gitter",
+	"gridPanelTourDesc1": "Im Rasterfeld erstellen Sie die Daten, die Sie generieren möchten. Hier können Sie zwischen den verschiedenen Datentypen, ihrer Konfiguration und der Reihenfolge ihrer Anzeige wählen. Im Beispiel hier haben wir fünf Felder: Name, Telefon, E-Mail, Straße und Stadt.",
+	"gridPanelTourDesc2": "Weitere Informationen zu diesem Abschnitt finden Sie in der Tour im Grid Panel.",
+	"gridPanelTourIntroDesc1": "Im Rasterfeld definieren Sie, welche Daten Sie generieren möchten. Für diese Tour haben wir das Vorschaufenster ausgeblendet (siehe die deaktivierte Schaltfläche \"Vorschau\" unten rechts auf der Seite), um uns etwas mehr Platz zu geben. Wir haben auch 10 Zeilen mit verschiedenen Datentypen hinzugefügt, nur zur Veranschaulichung.",
+	"gridPanelTourIntroDesc2": "Beginnen wir mit den Rasterspalten.",
+	"help": "Hilfe",
+	"helpIcon": "Hilfesymbol",
+	"helpIconDesc": "Wenn Sie in der vorherigen Spalte einen Datentyp auswählen, wird hier ein Symbol angezeigt. Wenn Sie darauf klicken, wird ein Hilfedialogfeld mit Nutzungsinformationen geöffnet.",
+	"hide": "Ausblenden",
+	"hideShowGrid": "Raster ausblenden / anzeigen",
+	"hideShowPreviewPanel": "Vorschaufenster ausblenden / einblenden",
+	"history": "Geschichte",
+	"historyPanelDesc": "In diesem Bereich wird der Verlauf der am Datensatz vorgenommenen Änderungen angezeigt. Klicken Sie auf die Schaltflächen Anzeigen, um frühere Versionen zu untersuchen. Um zu einer früheren Version zurückzukehren, zeigen Sie sie einfach an und klicken Sie auf die Schaltfläche \"Auf diese Version zurücksetzen\".",
+	"hostName": "Host-Name",
+	"humanData": "Human-Daten",
+	"ifWantToReregister": "Wenn Sie sich erneut registrieren möchten, besuchen Sie bitte:",
+	"incomplete": "Unvollständig",
+	"install": "Installieren",
+	"introToGenerator": "Einführung in den Generator",
+	"introToGeneratorDesc": "Diese Tour bietet Ihnen eine allgemeine Einführung in die Hauptfunktionen des Datengenerators. Lass uns anfangen!",
+	"invalidSettings": "Ungültige Einstellungen!",
+	"language": "Deutsch",
+	"lastEdited": "zuletzt geändert",
+	"lastLoggedIn": "Letzter Login",
+	"lastModified": "Letzte Änderung",
+	"lastName": "Nachname",
+	"lastSaved": "zuletzt gespeichert",
+	"lineWrapping": "Zeilenumbruch",
+	"linkToDataSet": "Link zum Datensatz",
+	"linkToThisDataSet": "Link zu diesem Datensatz",
+	"live": "Wohnen",
+	"load": "Laden",
+	"loading": "Lädt...",
+	"login": "Login",
+	"loginToSave": "Um Ihre Datensätze speichern zu können, benötigen Sie zunächst ein Konto. Bitte melden Sie sich unten an.",
+	"loginOrRegisterToSave": "Um Ihre Datensätze speichern zu können, benötigen Sie zunächst ein Konto. Bitte loggen Sie sich ein oder registrieren Sie sich unten.",
+	"loginUrlLabel": "Anmelde-URL:",
+	"logout": "Abmelden",
+	"makeDataSetPublicAgreement": "Ich verstehe, dass ich diesen Datensatz öffentlich machen muss.",
+	"metaDescription": "GenerateData.com: kostenlos, GNU-lizenzierte, zufälliger benutzerdefinierter Daten-Generator zum Testen von Software",
+	"metaKeywords": "Random Data, Test Data, Sample-Daten, Daten-Generator, Daten generieren",
+	"missingDataSetName": "Bitte geben Sie den Namen Ihres Datensatzes ein",
+	"nameColumn": "Namensspalte",
+	"nameColumnDesc": "Diese Spalte erhält eine andere Überschrift, abhängig vom Exporttyp, den Sie im Vorschaufenster ausgewählt haben (XML, CSV usw.). Der Zweck dieser Spalte besteht darin, eine Kennung für die Zeile bereitzustellen, die dann in den generierten Daten verwendet werden kann. Beispielsweise verwendet XML diesen Wert als XML-Knotennamen. JSON verwendet es als JSON-Eigenschaftsnamen. SQL verwendet es für den Namen der Datenbankspalte. Die Anwendung überprüft automatisch den hier eingegebenen Wert, um sicherzustellen, dass er für den ausgewählten Exporttyp gültig ist.",
+	"newDataSet": "Neuer Datensatz",
+	"no": "Nein",
+	"noAccountsCreated": "Es wurden keine Konten erstellt.",
+	"noAdditionalSettings": "Keine zusätzlichen Einstellungen",
+	"noDataSetsSaved": "Sie haben keine Datensätze gespeichert.",
+	"noExamplesAvailable": "Keine Beispiele zur Verfügung.",
+	"noExpiry": "Kein Ablauf",
+	"noHistory": "Noch keine Geschichte.",
+	"noOptionsAvailable": "Keine Optionen verfügbar.",
+	"noSafari": "Sorry, keine Safari!",
+	"northAmerica": "Nordamerika",
+	"nowLoggedIn": "Sie wurden angemeldet.",
+	"nowLoggedOut": "Sie wurden ausgeloggt.",
+	"numResults": "Anz. Ergebnisse",
+	"numeric": "Numerisch",
+	"oceania": "Ozeanien",
+	"oneTimePasswordLogin": "Sie wurden mit einem Einmalkennwort angemeldet. Bitte legen Sie jetzt ein neues Passwort fest.",
+	"open": "öffnen",
+	"options": "Optionen",
+	"optionsColumn": "Optionsspalte",
+	"optionsColumnDesc1": "Diese Spalte enthält alle Konfigurationsoptionen für den Datentyp dieser Zeile. Einige Datentypen verfügen über zu viele Konfigurationseinstellungen, um auf so kleinem Raum angezeigt zu werden (z. B. Land, Region). Daher wird möglicherweise nur eine Schaltfläche im Raster angezeigt, die ein Dialogfeld mit allen Optionen öffnet.",
+	"optionsColumnDesc2": "Für den hier dargestellten Namensdatentyp enthält die Spalte ein einzelnes Feld \"Erstellbare Pille\". Dies ist ein allgemeiner Feldtyp im Datengenerator. Sie können Elemente hinzufügen, indem Sie sie einfach eingeben und auf <Eingabe> klicken. Anschließend werden diese Elemente in verschiedene Pillen umgewandelt, die über das Symbol \"x\" entfernt werden können.",
+	"or": "oder",
+	"order": "Bestellen",
+	"other": "Andere",
+	"overMaxAnonRows": "Leider können Sie nur %1 Zeilen generieren. Um größere Datenmengen zu generieren, benötigen Sie ein Benutzerkonto auf dieser Site.",
+	"panelContents": "Panel-Inhalt",
+	"panelContentsDesc": "Der Großteil des Vorschaufensters enthält ein Beispiel der generierten Daten gemäß den im Rasterfenster angegebenen Daten und den ausgewählten Einstellungen für den Exporttyp. Hier werden 5 verschiedene Datentypen (Land, Region, Stadt, Straße und Postleitzahl) im Typoskriptformat generiert.",
+	"panelControls": "Bedienelemente",
+	"panelControlsClearIconDesc": "Mit dem letzten Symbol in den Bedienfeldern können Sie die Seite löschen und neu beginnen.",
+	"panelControlsDesc": "Mit den Bedienfeldschaltflächen können Sie die Raster- und Vorschaufenster ein- / ausblenden. Dies kann hilfreich sein, wenn Sie mit begrenzten Bildschirmflächen arbeiten. Sie können die Position der beiden Bedienfelder auch relativ zueinander (links-rechts, oben-unten) mithilfe des dritten Symbols umschalten.",
+	"panelTabs": "Bedienfeld-Registerkarten",
+	"panelTabsDesc": "Zuletzt haben Sie vielleicht bemerkt, dass das Bedienfeld in zwei Registerkarten unterteilt ist. Standardmäßig wird die Registerkarte Einstellungen angezeigt, da Sie dort am wahrscheinlichsten hin möchten. Es gibt aber auch eine zweite Registerkarte \"Vorschau\", die Einstellungen zum Ändern des Erscheinungsbilds des Vorschaufensters enthält: das Thema, Ausblenden / Anzeigen von Zeilennummern, Umschalten des Zeilenumbruchs, Ändern der Textgröße und Steuern der Anzahl der generierten Zeilen.",
+	"password": "Kennwort",
+	"passwordLabel": "Passwort:",
+	"passwordReset": "Passwort zurücksetzen",
+	"passwordResetAccountExpired": "Passwort zurücksetzen - Konto abgelaufen",
+	"passwordResetAccountExpiredDesc": "Wir haben gerade eine Anfrage zum Zurücksetzen Ihres Passworts erhalten, Ihr Konto ist jedoch bereits abgelaufen.",
+	"passwordResetComplete": "Ihr Passwort wurde zurückgesetzt und Ihnen wurde ein neues Passwort per E-Mail zugesendet.",
+	"passwordResetEmailContent1": "Ihr Passwort wurde zurückgesetzt. Sie können das folgenden Passwort nutzen, um sich anzumelden: %1",
+	"passwordResetEmailContent2": "Bitte ändern Sie dies, sobald Sie sich angemeldet haben.",
+	"passwordResetEmailDesc": "Wir haben eine Anfrage zum Zurücksetzen Ihres Passworts erhalten. Diese E-Mail enthält ein temporäres Einmalkennwort, mit dem Sie sich anmelden können. Nach dem Anmelden müssen Sie ein neues Kennwort festlegen.",
+	"passwordResetMsg": "Wenn die E-Mail gespeichert war, wurde Ihr Passwort zurückgesetzt und Ihnen wurden temporäre Anmeldeinformationen per E-Mail gesendet.",
+	"passwordUpdateInvalidPassword": "Ihr aktuelles Passwort ist falsch. Bitte erneut eingeben.",
+	"passwordUpdated": "Dein Passwort wurde aktualisiert.",
+	"pause": "Pause",
+	"pleaseConfirm": "Bitte bestätigen",
+	"pleaseEnterAll": "Bitte füllen Sie alle Felder aus",
+	"pleaseEnterDataSetName": "Bitte geben Sie den Namen des neuen Datensatzes ein.",
+	"pleaseFixErrors": "Bitte beheben Sie die folgenden Fehler und versuchen Sie es erneut:",
+	"pleaseLogin": "Bitte loggen Sie sich ein",
+	"pleaseSelect": "Bitte auswählen",
+	"plugins": "Plugins",
+	"pressEnterAddItem": "Drücken Sie die Eingabetaste, um ein Element hinzuzufügen",
+	"preview": "Vorschau",
+	"previewPanel": "Vorschaufenster",
+	"previewPanelControlsDesc": "Oben rechts im Bedienfeld befinden sich zwei Symbole. Das erste Symbol aktualisiert das Bedienfeld und generiert jedes Mal andere zufällige Daten. Auf diese Weise erhalten Sie eine Vorstellung davon, welche Art von Daten generiert werden. Das zweite Symbol schließt das Bedienfeld vollständig. Sie können das Bedienfeld jederzeit über den Abschnitt unten rechts auf der Seite erneut anzeigen (aktivieren Sie einfach das Kontrollkästchen \"Vorschau\" erneut).",
+	"previewPanelDesc": "Dieses Bedienfeld bietet Ihnen eine Live-Vorschau der Daten, die Sie generieren, während Sie sie über das Rasterbedienfeld erstellen. Die Schaltfläche oben links zeigt das ausgewählte Format der generierten Daten (z. B. SQL, XML, CSV usw.). Um das Format zu ändern, klicken Sie einfach auf die Schaltfläche.",
+	"previewPanelMoreInfo": "Weitere Informationen zu diesem Bereich finden Sie in der Tour zum Vorschaubereich.",
+	"previewPanelNoData": "Keine Daten!",
+	"previewPanelTourDesc": "Das Vorschaufenster bietet Ihnen eine visuelle Live-Darstellung der Daten, die Sie während der Erstellung generieren. Diese Tour bietet eine kurze Einführung in die Funktionsweise des Panels.",
+	"previewRows": "Vorschau von Zeilen",
+	"private": "Privat",
+	"problemLoadingTour": "Entschuldigung, beim Laden der Tour ist ein Problem aufgetreten.",
+	"programmingLanguages": "Programmiersprachen",
+	"province": "Provinz",
+	"public": "Öffentlichkeit",
+	"publicQ": "Öffentlich?",
+	"reenterPassword": "Passwort erneut eingeben",
+	"refreshPage": "Seite aktualisieren",
+	"refreshPanel": "Bedienfeld aktualisieren",
+	"register": "Registrieren",
+	"remainingTime": "Verbleibende Zeit:",
+	"requiredField": "Pflichtfeld",
+	"revertToVersion": "Zurück zu dieser Version",
+	"row": "reihe",
+	"rowLabel": "Spaltentitel",
+	"rowLabelPlural": "Spaltentitel",
+	"rowNumDesc1": "Die erste Spalte im Raster zeigt die Zeilennummer. Um die Zeile neu anzuordnen, klicken Sie einfach auf dieses Element und ziehen Sie es nach oben oder unten.",
+	"rowNumDesc2": "Der Kopfwert für diese Spalte zeigt die Gesamtzahl der Zeilen in Ihrem Raster. Dies kann nützlich sein, wenn Sie wirklich große Datenmengen haben und diese zu groß sind, um auf den Bildschirm zu passen.",
+	"rowNumber": "Zeilennummer",
+	"rowSp": "Zeile(n)",
+	"rows": "Zeilen",
+	"rowsGenerated": "Zeilen generiert",
+	"rowsGeneratedPerSecond": "Zeilen werden pro Sekunde generiert",
+	"safariExplanation": "Diese Website erfordert einen aktuellen Webbrowser, der moderne Webstandards implementiert. Leider ist Safari hinter den anderen Browsern zurückgefallen und führt dieses Skript nicht aus. Verwenden Sie einen der folgenden Browser, bis wir herausgefunden haben, wie wir es unterbringen können. Alles kostenlos zum Download.",
+	"save": "Speichern",
+	"saveAs": "Speichern als",
+	"saveButtonDesc": "Wenn Sie ein Benutzerkonto auf der Site haben, speichert diese Schaltfläche Ihren Datensatz. Wenn Sie nicht angemeldet sind, werden Sie durch Klicken darauf aufgefordert, sich zuerst anzumelden. Das System speichert den Verlauf der letzten %1-Änderungen an einem Datensatz, sodass Sie jederzeit zurückgehen und ältere Versionen anzeigen können.",
+	"saveDataSetNewName": "Datensatz als neuen Namen speichern",
+	"seconds": "Sekunden",
+	"seeHelpDialog": "Siehe Hilfe-Dialog.",
+	"selectCountry": "Land auswählen",
+	"selectDataType": "Daten-Typen auswählen",
+	"selectEllipsis": "Wählen...",
+	"selectExpiryDate": "Ablaufdatum auswählen",
+	"selectLanguage": "Sprache auswählen",
+	"sendEmail": "E-Mail senden",
+	"seriouslySlow": "ernsthaft langsam",
+	"settings": "Einstellungen",
+	"showGrid": "Raster anzeigen",
+	"showLineNumbers": "Vorschau von Zeilen",
+	"showPreview": "Vorschau zeigen",
+	"siteLogo": "Site-Logo",
+	"size": "Größe:",
+	"southAmerica": "Südamerika",
+	"status": "Status",
+	"stripWhitespace": "Entfernen Sie Leerzeichen von generierten Inhalten",
+	"success": "Erfolgreich",
+	"text": "Text",
+	"textSize": "Textgröße",
+	"theDataSetName": "Der Datensatzname",
+	"theExportTypeBtn": "Die Schaltfläche Typ exportieren",
+	"theGenerateButton": "Die Schaltfläche Generieren",
+	"theGridPanel": "Das Grid Panel",
+	"thePreviewPanel": "Das Vorschaufenster",
+	"theSaveButton": "Die Schaltfläche Speichern",
+	"theme": "Thema",
+	"togglePanelLayout": "Panel-Layout umschalten",
+	"totalNumGeneratedRows": "Gesamtzahl der generierten Zeilen",
+	"tourComplete": "Tour abgeschlossen",
+	"tourCompleteDesc": "Alles erledigt! Wählen Sie eine der Schaltflächen unten, um fortzufahren.",
+	"tourIntroPara1": "Dieses Tool bietet viele Funktionen und kann zunächst etwas überwältigend sein. Klicken Sie auf eine der Schaltflächen rechts, um eine Tour zu dieser bestimmten Funktion zu machen.",
+	"tourIntroPara2": "Beachten Sie, dass zu Beginn der Tour der Inhalt der Generatorseite vorübergehend überschrieben wird, um bestimmte Aspekte der Benutzeroberfläche zu veranschaulichen. Aber mach dir keine Sorgen! Sobald die Tour beendet ist, werden Ihre Daten in den ursprünglichen Zustand zurückversetzt.",
+	"tryDifferentTour": "Versuchen Sie eine andere Tour",
+	"update": "Aktualisieren",
+	"updateAccount": "Benutzerkonto aktualisieren",
+	"user": "Benutzer",
+	"userAccount": "Benutzerkonto",
+	"userAccountNotFound": "Ihr Konto konnte leider nicht gefunden werden.",
+	"userAccountUpdated": "Das Benutzerkonto wurde aktualisiert.",
+	"userAccounts": "Benutzerkonten",
+	"userNotFound": "Entschuldigung, wir konnten Sie nicht identifizieren. Bitte überprüfen Sie Ihre Anmeldeinformationen.",
+	"validationAccountAlreadyExists": "Sorry, ein Konto mit dieser E-Mailadresse ist bereits vorhanden.",
+	"validationDifferentNewPasswords": "Bitte stellen Sie sicher, dass Ihre neuen Passwörter übereinstimmen",
+	"validationInvalidEmail": "Bitte geben Sie eine gültige E-Mailadresse ein.",
+	"validationNoCurrentPassword": "Bitte geben Sie Ihr aktuelles Passwort ein",
+	"validationNoEmail": "Bitte geben Sie Ihre E-Mailadresse ein.",
+	"validationNoFirstName": "Bitte geben Sie Ihren Vornamen ein.",
+	"validationNoLastName": "Bitte geben Sie Ihren Nachnamen an.",
+	"validationNoPassword": "Bitte geben Sie Ihr Passwort ein.",
+	"version": "Version",
+	"view": "Aussicht",
+	"viewChangelog": "Änderungsprotokoll anzeigen",
+	"viewOnGithub": "Blick auf Github",
+	"welcomeToTheGenerator": "Willkommen im Generator!",
+	"yes": "Ja",
+	"yourAccount": "Ihr Konto",
+	"yourAccountUpdated": "Ihr Benutzerkonto wurde aktualisiert.",
+	"yourUserAccount": "Ihr Benutzerkonto"
+}
\ No newline at end of file
diff --git a/apps/client/src/i18n/en.json b/apps/client/src/i18n/en.json
new file mode 100644
index 000000000..29063dd9f
--- /dev/null
+++ b/apps/client/src/i18n/en.json
@@ -0,0 +1,329 @@
+{
+	"abort": "Abort",
+	"about": "About",
+	"aboutInfoPara1": "generatedata.com is an open source project I created back in the late paleolithic era (circa 2004) and has had many, many contributors over its lifespan. Every few years I rewrite it using the latest and greatest available technologies: this version was completed in 2021, made with React, Redux, Typescript, GraphQL, Docker, web workers, rubber bands, duct tape and a whole lot of cursing.",
+	"aboutInfoPara2": "You can find the project on github. Download it, fork it, or feel free to contribute. Enjoy!",
+	"aboutThisScript": "About this script",
+	"accountCreated": "Account Created",
+	"accountCreatedDesc": "The account has been created.",
+	"accountCreatedMsg": "An account has been created for you.",
+	"accountDeleted": "The account has been deleted.",
+	"accountDisabled": "Account disabled",
+	"accountExpiredMsg": "Sorry, your account has expired.",
+	"accountExpiryDate": "Account expiry date",
+	"accountInfo": "Account Info",
+	"accountSettings": "Account Settings",
+	"accountType": "Account type",
+	"accounts": "Accounts",
+	"add": "Add",
+	"addRowsDesc": "To add more rows to the data grid just use the form at the bottom of the page. When you have a lot of fields, this section may be hidden off page so you'll have to scroll the panel to the bottom to see the form.",
+	"addSomeDataDesc": "Add some rows in the grid.",
+	"admin": "Admin",
+	"adminAccount": "Admin account",
+	"administrator": "Administrator",
+	"africa": "Africa",
+	"allCountries": "All countries",
+	"allDataTypePlugins": "All Data Type plugins",
+	"allExportTypePlugins": "All Export Type plugins",
+	"anonymousAccess": "Anonymous access",
+	"asia": "Asia",
+	"back": "back",
+	"backToLogin": "Back to login",
+	"blog": "Blog",
+	"cancel": "cancel",
+	"centralAmerica": "Central America",
+	"changePassword": "Change Password",
+	"clear": "Clear",
+	"clearPage": "Clear Page",
+	"clearPageConfirmation": "Are you sure you want to clear the page? Any changes you've made will be lost.",
+	"clearThePage": "Clear the Page",
+	"clickExportTypeBtn": "The next step shows what happens when you click the button.",
+	"close": "Close",
+	"closePanel": "Close panel",
+	"columns": "Columns",
+	"columnsDesc": "The grid will show as many of these columns as it can, depending on your available screen size. When it's too small, it'll hide some columns and show a cog icon that opens up an infotip with the missing content. The next few steps explain each of the columns, using the first Names row as a demonstration.",
+	"complete": "Complete",
+	"confirmDeleteAccount": "Are you sure you want to delete this account?",
+	"confirmDeleteUserAccount": "Are you sure you want to delete this user account?",
+	"confirmEmptyForm": "Are you sure you want to clear the page?",
+	"continue": "Continue",
+	"copiedToClipboard": "Copied to clipboard",
+	"copyToClipboard": "Copy to clipboard",
+	"coreExportType": "Core formats",
+	"countries": "Countries",
+	"country": "Country",
+	"countrySpecific": "Country-specific",
+	"cpuMeltinglyFast": "CPU-meltingly fast",
+	"createAccount": "Create Account",
+	"currentPassword": "Current password",
+	"currentVersion": "Current version being edited",
+	"dataGenerated": "Data generated.",
+	"dataSet": "Data Set",
+	"dataSetHelp": "This is where you define exactly what kind of data you want to generate. Try filling in a row or two and click the generate button. You'll get the hang of it pretty fast.",
+	"dataSetLoaded": "The data set has been loaded.",
+	"dataSetName": "Data Set Name",
+	"dataSetNameDesc": "Click on the text here to name your data set. Please note that you'll need an account on the site and to be logged in in order to name your data sets. When you save your data sets, this name gives you a convenient label to keep track of them.",
+	"dataSetNameUpdated": "The data set name has been updated.",
+	"dataSetOptions": "Data Set Options",
+	"dataSetReverted": "Your data set has been reverted to the selected older version.",
+	"dataSetSaved": "Your data set has been saved.",
+	"dataSets": "Data Sets",
+	"dataType": "Data Type",
+	"dataTypeDesc": "This is a dropdown containing all available Data Types. When you select a value, it'll update the remaining of the columns for that row. Each Data Type has its own unique settings to allow customization.",
+	"dataTypes": "Data Types",
+	"dateAccountCreated": "Date account created",
+	"dateCreated": "Date Created",
+	"defaultLanguage": "Default Language",
+	"delete": "Delete",
+	"delete1DataSet": "Delete 1 Data Set",
+	"deleteAccount": "Delete Account",
+	"deleteDataSet": "Delete Data Set",
+	"deleteDataSetConfirm": "Are you sure you want to delete this Data Set?",
+	"deleteRow": "Delete row",
+	"deleteRowDesc": "The last column contains a delete icon. Clicking it will delete the row.",
+	"developer": "Developer",
+	"developerDoc": "Developer doc",
+	"disabled": "Disabled",
+	"documentation": "Documentation",
+	"download": "Download",
+	"edit": "Edit",
+	"editAccount": "Edit Account",
+	"editExportTypePage": "When you click the Export Type button, a full-page view appears containing the configuration options on the left side and the preview panel on the right.",
+	"editExportTypePageConfig": "Let's look at the configuration options.",
+	"editExportTypeSettings": "Please edit your export type settings.",
+	"editingExportTypes": "Editing Export Types",
+	"email": "Email",
+	"emailFooterDisclaimer": "If you've received this email in error please reach out to the site administrator.",
+	"emailIntroLineWithName": "Hi %1,",
+	"emailLabel": "Email:",
+	"emailNotSent": "We were unable to send the email notification.",
+	"emailUserLoginInfo": "Email the user their login information",
+	"enterEmailAddressToResetPassword": "Enter your email address below to reset your password.",
+	"enterUserAccountDetails": "Please enter your user account details below.",
+	"errorCreatingAccount": "There was an error creating this account.",
+	"estimatedSize": "Estimated size:",
+	"estimatedTime": "Estimated time:",
+	"europe": "Europe",
+	"example": "Example",
+	"exampleColumn": "Example column",
+	"exampleColumnDesc": "This column may or may not have content depending on the Data Type you selected for the row. It's just a convenient way for some Data Types to provide preset examples for how they can be used. For example, the Names column provides a dropdown of different name formats. For all Data Types, you can still manually configure it through the Options column: it's really a time-saving device to get you up to speed as quickly as possible.",
+	"examples": "Examples",
+	"exit": "Exit",
+	"expired": "Expired",
+	"expiryDate": "Expiry Date",
+	"exportType": "Export Type",
+	"exportTypeBtnDesc": "The button at the top-left of the panel is where you go to select and configure the format for the data you want to generate. Here it's set to Typescript.",
+	"exportTypeOptionsSql": "Export Type Options: SQL",
+	"exportTypeOptionsSqlDesc": "As you can see, SQL has a lot of other fields that are specific to this Export Type. Other Export Types have different settings.",
+	"exportTypeOptionsTs": "Export Type Options: Typescript",
+	"exportTypeOptionsTsDesc": "Depending on the selected Export Type, the panel body may contain additional options. Here with Typescript there are two fields, letting you customize the type name and the exported variable name.",
+	"exportTypeOptionsTsDesc2": "Now let's look at SQL.",
+	"exportTypeSelection": "Export Type Selection",
+	"exportTypeSelectionDesc": "The Format dropdown lets you choose the format for the generated content. There are many options, some of them the core types: SQL, CSV, SQL, JSON and others, and some of them are for generating data for specific programming languages.",
+	"exportTypes": "Export Types",
+	"filterDataTypes": "Filter Data Types",
+	"financial": "Financial",
+	"firstName": "First Name",
+	"forgottenYourPasswordQ": "Forget password?",
+	"format": "Format",
+	"generate": "Generate",
+	"generateBtnDesc": "Once you've finished configuring your data set and confirmed that it looks how you want, it's time to generate some data in volume! Click this button to generate your data. Depending on the number of rows in the data grid and the number of rows you want to generate, this may take some time.",
+	"generated": "Generated",
+	"generatedC": "Generated:",
+	"generator": "Generator",
+	"geo": "Geo",
+	"grid": "Grid",
+	"gridPanelTourDesc1": "The grid panel is where you construct the data you want to generate. Here you can choose between the different Data Types, how they're configured and the order in which they appear. In the example here, we have five fields: Name, Phone, Email, Street address and City.",
+	"gridPanelTourDesc2": "See the tour on the Grid Panel for more detailed information on this section.",
+	"gridPanelTourIntroDesc1": "The grid panel is where you define what data you want to generate. For this tour, we've hidden the preview panel (see the unchecked \"Preview\" button at the bottom right of the page) to give us a little more space. We've also added 10 rows of different data types, just for illustration purposes.",
+	"gridPanelTourIntroDesc2": "Let's start with the grid columns.",
+	"help": "Help",
+	"helpIcon": "Help Icon",
+	"helpIconDesc": "When you select a Data Type in the previous column, an icon will appear here. Clicking it opens a help dialog containing usage information.",
+	"hide": "Hide",
+	"hideShowGrid": "Hide/show grid",
+	"hideShowPreviewPanel": "Hide/show preview panel",
+	"history": "History",
+	"historyPanelDesc": "This panel shows the history of changes made to the data set. Click the View buttons to examine earlier versions. To revert to an earlier version, just view it, then click the \"Revert to this Version\" button.",
+	"hostName": "Host Name",
+	"humanData": "Human Data",
+	"ifWantToReregister": "If you'd like to re-register please visit:",
+	"incomplete": "Incomplete",
+	"install": "Install",
+	"introToGenerator": "Intro to the Generator",
+	"introToGeneratorDesc": "This tour gives you a high-level introduction to the main features of the Data Generator. Let's get started!",
+	"invalidSettings": "Invalid settings!",
+	"language": "English",
+	"lastEdited": "last edited",
+	"lastLoggedIn": "Last Logged In",
+	"lastModified": "Last Modified",
+	"lastName": "Last Name",
+	"lastSaved": "last saved",
+	"lineWrapping": "Line wrapping",
+	"linkToDataSet": "Link to Data Set",
+	"linkToThisDataSet": "Link to this Data Set",
+	"live": "Live",
+	"load": "Load",
+	"loading": "Loading...",
+	"login": "Login",
+	"loginToSave": "In order to save your data sets you first need an account. Please login below.",
+	"loginOrRegisterToSave": "In order to save your data sets you first need an account. Please login or register below.",
+	"loginUrlLabel": "Login URL:",
+	"logout": "Logout",
+	"makeDataSetPublicAgreement": "I understand that to share this Data Set, I need to make it public.",
+	"metaDescription": "generatedata.com: free, GNU-licensed, random custom data generator for testing software",
+	"metaKeywords": "Random Data, Test Data, Sample Data, data generator, generate data",
+	"missingDataSetName": "Please enter the name of your data set",
+	"nameColumn": "Name column",
+	"nameColumnDesc": "This column gets a different heading depending on the Export Type you've selected in the preview panel (XML, CSV etc). The purpose of this column is to provide an identifier for the row which can then be used in the generated data. For example, XML uses this value as the XML node name; JSON uses it as the JSON property name; SQL uses it for the database column name. The application will automatically validate the value you'd entered here to make sure it's valid for the selected Export Type.",
+	"newDataSet": "New Data Set",
+	"no": "No",
+	"noAccountsCreated": "No accounts have been created.",
+	"noAdditionalSettings": "No additional settings.",
+	"noDataSetsSaved": "You have no data sets saved.",
+	"noExamplesAvailable": "No examples available.",
+	"noExpiry": "No expiry",
+	"noHistory": "No history yet.",
+	"noOptionsAvailable": "No options available.",
+	"noSafari": "Sorry, no Safari!",
+	"northAmerica": "North America",
+	"nowLoggedIn": "You have been logged in.",
+	"nowLoggedOut": "You have been logged out.",
+	"numResults": "Num Results",
+	"numeric": "Numeric",
+	"oceania": "Oceania",
+	"oneTimePasswordLogin": "You've logged in using a one-time password. Please set a new one now or you won't be able to log in again.",
+	"open": "Open",
+	"options": "Options",
+	"optionsColumn": "Options column",
+	"optionsColumnDesc1": "This column contains all configuration options for this row's Data Type. Some Data Types have too many configuration settings to show in such a small space (e.g. Country, Region), so they may just show a button in the grid that opens a dialog containing all the options.",
+	"optionsColumnDesc2": "For the Names Data Type illustrated here, the column contains a single Creatable Pill field. This is a common field type in the Data Generator. It lets you add items by just typing into it and clicking <enter>. It then converts those items into distinct pills which can be removed via the \"x\" icon.",
+	"or": "or",
+	"order": "Order",
+	"other": "Other",
+	"overMaxAnonRows": "Sorry, you can only generate %1 rows. To generate larger volumes of data you'll need a user account on this site.",
+	"panelContents": "Panel contents",
+	"panelContentsDesc": "The bulk of the preview panel contains a sample of the generated data, as per the data you've specified in the grid panel and the selected Export Type settings. Here it's generating 5 different data types (Country, Region, City, Street Address and Postal/Zip) in Typescript format.",
+	"panelControls": "Panel controls",
+	"panelControlsClearIconDesc": "The last icon in the panel controls lets you clear the page so you can start afresh.",
+	"panelControlsDesc": "The panel control buttons let you hide/show the Grid and Preview panels which can be helpful if you're working with limited screen real estate. You can also toggle the placement of the two panels relative to one another (left-right, top-bottom) using the third icon.",
+	"panelTabs": "Panel tabs",
+	"panelTabsDesc": "Lastly, you may have noticed that the panel is organized into two tabs. By default it shows the Settings tab, since that's where you're most likely to want to go. But there's also a second \"Preview\" tab that contains settings for changing the appearance of the preview panel: the theme, hiding/showing line numbers, toggling line wrapping, changing the text size and controlling the number of generated rows.",
+	"password": "Password",
+	"passwordLabel": "Password:",
+	"passwordReset": "Password Reset",
+	"passwordResetAccountExpired": "Password Reset - Account Expired",
+	"passwordResetAccountExpiredDesc": "We just received a request to reset your password, however your account has already expired.",
+	"passwordResetComplete": "Your password has been reset and you have been emailed the new password.",
+	"passwordResetEmailContent1": "Your password has been reset. You may use the following password to log in: %1",
+	"passwordResetEmailContent2": "Please change it once you've logged in.",
+	"passwordResetEmailDesc": "We've received a request to reset your password. This email contains a temporary one-time password you can use to log in. After logging in, you'll need to set a new password.",
+	"passwordResetMsg": "If the email was on file, your password has been reset and your have been emailed temporary login information.",
+	"passwordUpdateInvalidPassword": "Your current password is incorrect. Please re-enter.",
+	"passwordUpdated": "Your password has been updated.",
+	"pause": "Pause",
+	"pleaseConfirm": "Please confirm",
+	"pleaseEnterAll": "Please enter all",
+	"pleaseEnterDataSetName": "Please enter the name of the new Data Set.",
+	"pleaseFixErrors": "Please fix the following errors and resubmit:",
+	"pleaseLogin": "Please login",
+	"pleaseSelect": "Please Select",
+	"plugins": "Plugins",
+	"pressEnterAddItem": "Press enter to add item",
+	"preview": "Preview",
+	"previewPanel": "Preview Panel",
+	"previewPanelControlsDesc": "At the top right of the panel there are two icons. The first icon refreshes the panel, generating different random data each time - this helps to give you an idea of the sort of data that it generates. The second icon closes the panel altogether. You can always show the panel again using the section at the bottom right of the page (just re-select the \"Preview\" checkbox).",
+	"previewPanelDesc": "This panel gives you a live preview of the data you're generating, while you're constructing it through the grid panel. The button at the top-left shows the selected format of the data being generated (e.g. SQL, XML, CSV etc.). To change the format, just click on the button.",
+	"previewPanelMoreInfo": "For more info on this panel, check out the Preview Panel tour.",
+	"previewPanelNoData": "No data!",
+	"previewPanelTourDesc": "The preview panel gives you a live, visual representation of the data you're generating as you're constructing it. This tour gives a quick introduction to how the panel works.",
+	"previewRows": "Preview rows",
+	"private": "Private",
+	"problemLoadingTour": "Sorry, there was a problem loading the tour.",
+	"programmingLanguages": "Programming Languages",
+	"province": "Province",
+	"public": "Public",
+	"publicQ": "Public?",
+	"reenterPassword": "Re-enter password",
+	"refreshPage": "Refresh Page",
+	"refreshPanel": "Refresh panel",
+	"register": "Register",
+	"remainingTime": "Remaining time:",
+	"requiredField": "Required field",
+	"revertToVersion": "Revert to this version",
+	"row": "Row",
+	"rowLabel": "Column Title",
+	"rowLabelPlural": "Column Titles",
+	"rowNumDesc1": "The first column in the grid shows the row number. To reorder the row, just click and drag this element up or down.",
+	"rowNumDesc2": "The header value for this column shows the total number of rows in your grid. This can be handy when you have really large data sets and it's too large to fit on the screen.",
+	"rowNumber": "Row Number",
+	"rowSp": "Row(s)",
+	"rows": "rows",
+	"rowsGenerated": "Rows Generated",
+	"rowsGeneratedPerSecond": "Rows generated per second",
+	"safariExplanation": "This site requires an up-to-date web browser that implements modern web standards. Unfortunately Safari has fallen behind the other browsers and won't run this script. Until we figure out how to accommodate it, please use one of the following browsers. All free for download.",
+	"save": "Save",
+	"saveAs": "Save as",
+	"saveButtonDesc": "If you have a user account on the site this button will save your data set. If you're not logged in, clicking it will prompt you to login first. The system keeps a history of the last %1 changes to a Data Set, so you can always go back and view older versions.",
+	"saveDataSetNewName": "Save data set as new name",
+	"seconds": "Seconds",
+	"seeHelpDialog": "See help dialog.",
+	"selectCountry": "Select Country",
+	"selectDataType": "Select Data Type",
+	"selectEllipsis": "Select...",
+	"selectExpiryDate": "Select expiry date",
+	"selectLanguage": "Select Language",
+	"sendEmail": "Send email",
+	"seriouslySlow": "Seriously slow",
+	"settings": "Settings",
+	"showGrid": "Show Grid",
+	"showLineNumbers": "Show line numbers",
+	"showPreview": "Show Preview",
+	"siteLogo": "site logo",
+	"size": "Size:",
+	"southAmerica": "South America",
+	"status": "Status",
+	"stripWhitespace": "strip whitespace from generated content",
+	"success": "success",
+	"text": "Text",
+	"textSize": "Text size",
+	"theDataSetName": "The Data Set Name",
+	"theExportTypeBtn": "The Export Type button",
+	"theGenerateButton": "The Generate Button",
+	"theGridPanel": "The Grid Panel",
+	"thePreviewPanel": "The Preview Panel",
+	"theSaveButton": "The Save Button",
+	"theme": "Theme",
+	"togglePanelLayout": "Toggle panel layout",
+	"totalNumGeneratedRows": "Total num generated rows",
+	"tourComplete": "Tour Complete",
+	"tourCompleteDesc": "All done! Choose one of the buttons below to continue.",
+	"tourIntroPara1": "This tool provides a lot of functionality and it can be a little overwhelming at first. Click on one of the buttons to the right to take a tour about that particular feature.",
+	"tourIntroPara2": "Note that when the tour starts, it temporarily overwrites the content of the generator page to illustrate certain things about the interface. But don't worry! As soon as the tour is ended, it returns your data to its original state.",
+	"tryDifferentTour": "Try a different tour",
+	"update": "Update",
+	"updateAccount": "Update Account",
+	"user": "User",
+	"userAccount": "User Account",
+	"userAccountNotFound": "Sorry, we couldn't find your account.",
+	"userAccountUpdated": "The user account has been updated.",
+	"userAccounts": "User Accounts",
+	"userNotFound": "Sorry, we were unable to identify you. Please check your credentials.",
+	"validationAccountAlreadyExists": "Sorry, an account with that email address already exists",
+	"validationDifferentNewPasswords": "Please make sure your passwords match",
+	"validationInvalidEmail": "Please enter a valid email address",
+	"validationNoCurrentPassword": "Please enter your current password",
+	"validationNoEmail": "Please enter your email address",
+	"validationNoFirstName": "Please enter your first name",
+	"validationNoLastName": "Please enter your last name",
+	"validationNoPassword": "Please enter your password",
+	"version": "Version",
+	"view": "View",
+	"viewChangelog": "View changelog",
+	"viewOnGithub": "View on Github",
+	"welcomeToTheGenerator": "Welcome to the generator!",
+	"yes": "Yes",
+	"yourAccount": "Your Account",
+	"yourAccountUpdated": "Your account has been updated.",
+	"yourUserAccount": "Your User Account"
+}
diff --git a/apps/client/src/i18n/es.json b/apps/client/src/i18n/es.json
new file mode 100644
index 000000000..e2d516313
--- /dev/null
+++ b/apps/client/src/i18n/es.json
@@ -0,0 +1,329 @@
+{
+	"abort": "Abortar",
+	"about": "Acerca de",
+	"aboutInfoPara1": "generatedata.com es un proyecto de código abierto que creé en la era paleolítica tardía (alrededor de 2004) y ha tenido muchos, muchos contribuyentes a lo largo de su vida útil. Cada pocos años lo reescribo usando las últimas y mejores tecnologías disponibles: esta versión se completó en 2021, hecha con React, Redux, Typescript, GraphQL, Docker, web Workers, gomas, cinta adhesiva y un montón de maldiciones.",
+	"aboutInfoPara2": "Puedes encontrar el proyecto en github. Descárgalo, bifurcalo o siéntete libre de contribuir. ¡Disfrutar!",
+	"aboutThisScript": "Acerca de este guión",
+	"accountCreated": "Cuenta creada",
+	"accountCreatedDesc": "Se ha creado la cuenta.",
+	"accountCreatedMsg": "Se ha creado una cuenta para ti.",
+	"accountDeleted": "La cuenta ha sido eliminada.",
+	"accountDisabled": "Cuenta deshabilitada",
+	"accountExpiredMsg": "Lo sentimos, su cuenta ha caducado.",
+	"accountExpiryDate": "Fecha de vencimiento de la cuenta",
+	"accountInfo": "Información de cuenta",
+	"accountSettings": "Ajustes de cuenta",
+	"accountType": "Tipo de cuenta",
+	"accounts": "Cuentas",
+	"add": "Añadir",
+	"addRowsDesc": "Para agregar más filas a la cuadrícula de datos, simplemente use el formulario en la parte inferior de la página. Cuando tiene muchos campos, esta sección puede estar oculta fuera de la página, por lo que tendrá que desplazar el panel hacia la parte inferior para ver el formulario.",
+	"addSomeDataDesc": "Agrega algunas filas en la cuadrícula.",
+	"admin": "Administrador",
+	"adminAccount": "Cuenta de administración",
+	"administrator": "Administrador",
+	"africa": "África",
+	"allCountries": "Todos los países",
+	"allDataTypePlugins": "Todos los complementos de tipos de dato",
+	"allExportTypePlugins": "Todos los complementos de tipos de exportación",
+	"anonymousAccess": "Acceso anónimo",
+	"asia": "Ásia",
+	"back": "Atrás",
+	"backToLogin": "Atrás para iniciar sesión",
+	"blog": "Blog",
+	"cancel": "cancelar",
+	"centralAmerica": "América Central",
+	"changePassword": "Cambia la contraseña",
+	"clear": "Clara",
+	"clearPage": "Limpiar página",
+	"clearPageConfirmation": "¿Estás seguro de que deseas borrar la página? Se perderán todos los cambios que haya realizado.",
+	"clearThePage": "Limpiar la página",
+	"clickExportTypeBtn": "El siguiente paso muestra lo que sucede cuando hace clic en el botón.",
+	"close": "Cerrar",
+	"closePanel": "Cerrar panel",
+	"columns": "Columnas",
+	"columnsDesc": "La cuadrícula mostrará tantas de estas columnas como sea posible, según el tamaño de pantalla disponible. Cuando sea demasiado pequeño, ocultará algunas columnas y mostrará un ícono de engranaje que abre un infotip con el contenido que falta. Los siguientes pasos explican cada una de las columnas, utilizando la primera fila de Nombres como demostración.",
+	"complete": "Completa",
+	"confirmDeleteAccount": "¿Estás segura de que quieres eliminar esta cuenta?",
+	"confirmDeleteUserAccount": "¿Estás seguro de querer eliminar esta cuenta de usuario?",
+	"confirmEmptyForm": "¿Está seguro de querer borrar la página?",
+	"continue": "Continuar",
+	"copiedToClipboard": "Copiada al portapapeles",
+	"copyToClipboard": "Copiar al portapapeles",
+	"coreExportType": "Formatos principales",
+	"countries": "Países",
+	"country": "País",
+	"countrySpecific": "Específico del país",
+	"cpuMeltinglyFast": "CPU increíblemente rápido",
+	"createAccount": "Crear cuenta",
+	"currentPassword": "Contraseña actual",
+	"currentVersion": "Se está editando la versión actual",
+	"dataGenerated": "Datos generados.",
+	"dataSet": "Conjunto de datos",
+	"dataSetHelp": "Aquí es donde defines exactamente qué tipo de datos quieres generar. Prueba a rellenar una fila o dos y haz clic en el botón Generar. Te harás una idea bastante buena.",
+	"dataSetLoaded": "Se ha cargado el conjunto de datos.",
+	"dataSetName": "Nombre del conjunto de datos",
+	"dataSetNameDesc": "Haga clic en el texto aquí para nombrar su conjunto de datos. Tenga en cuenta que necesitará una cuenta en el sitio y estar conectado para nombrar sus conjuntos de datos. Cuando guarda sus conjuntos de datos, este nombre le proporciona una etiqueta conveniente para realizar un seguimiento de ellos.",
+	"dataSetNameUpdated": "Se actualizó el nombre del conjunto de datos.",
+	"dataSetOptions": "Opciones de conjunto de datos",
+	"dataSetReverted": "Su conjunto de datos se ha revertido a la versión anterior seleccionada.",
+	"dataSetSaved": "Su conjunto de datos se ha guardado.",
+	"dataSets": "Conjuntos de datos",
+	"dataType": "Tipo de dato",
+	"dataTypeDesc": "Este es un menú desplegable que contiene todos los tipos de datos disponibles. Cuando seleccione un valor, actualizará el resto de las columnas de esa fila. Cada tipo de datos tiene su propia configuración única para permitir la personalización.",
+	"dataTypes": "Tipos de datos",
+	"dateAccountCreated": "Fecha de creación de la cuenta",
+	"dateCreated": "Fecha de creación",
+	"defaultLanguage": "Idioma por defecto",
+	"delete": "Eliminar",
+	"delete1DataSet": "Eliminar 1 Conjunto de Datos",
+	"deleteAccount": "Eliminar cuenta",
+	"deleteDataSet": "Eliminar conjunto de datos",
+	"deleteDataSetConfirm": "¿Está seguro de que desea eliminar este conjunto de datos?",
+	"deleteRow": "Borrar fila",
+	"deleteRowDesc": "La última columna contiene un icono de eliminación. Al hacer clic en él, se eliminará la fila.",
+	"developer": "Desarrollador",
+	"developerDoc": "Documentación de desarrollo",
+	"disabled": "Discapacitada",
+	"documentation": "Documentación",
+	"download": "Descargar",
+	"edit": "Editar",
+	"editAccount": "Editar cuenta",
+	"editExportTypePage": "Al hacer clic en el botón Tipo de exportación, aparece una vista de página completa que contiene las opciones de configuración en el lado izquierdo y el panel de vista previa a la derecha.",
+	"editExportTypePageConfig": "Veamos las opciones de configuración.",
+	"editExportTypeSettings": "Edite la configuración del tipo de exportación.",
+	"editingExportTypes": "Editar tipos de exportación",
+	"email": "Correo electrónico",
+	"emailFooterDisclaimer": "Si recibió este correo electrónico por error, comuníquese con el administrador del sitio.",
+	"emailIntroLineWithName": "Hola %1:",
+	"emailLabel": "Correo electrónico:",
+	"emailNotSent": "No se ha podido enviar el correo de notificación.",
+	"emailUserLoginInfo": "Enviar un correo con su información de entrada",
+	"enterEmailAddressToResetPassword": "Introduce tu dirección de correo más abajo para restablecer tu contraseña.",
+	"enterUserAccountDetails": "Por favor, introduce los detalles de tu cuenta de usuario más abajo.",
+	"errorCreatingAccount": "Hubo un error al crear esta cuenta.",
+	"estimatedSize": "Tamaño estimado:",
+	"estimatedTime": "Hora prevista:",
+	"europe": "Europa",
+	"example": "Ejemplo",
+	"exampleColumn": "Columna de ejemplo",
+	"exampleColumnDesc": "Esta columna puede tener o no contenido según el tipo de datos que seleccionó para la fila. Es solo una forma conveniente para que algunos tipos de datos proporcionen ejemplos preestablecidos de cómo pueden usarse. Por ejemplo, la columna Nombres proporciona un menú desplegable de diferentes formatos de nombre. Para todos los tipos de datos, aún puede configurarlo manualmente a través de la columna Opciones: realmente es un dispositivo que ahorra tiempo y lo pone al día lo más rápido posible.",
+	"examples": "Ejemplos",
+	"exit": "Salida",
+	"expired": "Caducada",
+	"expiryDate": "Fecha de caducidad",
+	"exportType": "Tipo de exportación",
+	"exportTypeBtnDesc": "El botón en la parte superior izquierda del panel es donde va a seleccionar y configurar el formato de los datos que desea generar. Aquí está configurado en TypeScript.",
+	"exportTypeOptionsSql": "Opciones de tipo de exportación: SQL",
+	"exportTypeOptionsSqlDesc": "Como puede ver, SQL tiene muchos otros campos que son específicos de este tipo de exportación. Otros tipos de exportación tienen configuraciones diferentes.",
+	"exportTypeOptionsTs": "Opciones de tipo de exportación: mecanografiado",
+	"exportTypeOptionsTsDesc": "Dependiendo del tipo de exportación seleccionado, el cuerpo del panel puede contener opciones adicionales. Aquí con TypeScript hay dos campos, lo que le permite personalizar el nombre del tipo y el nombre de la variable exportada.",
+	"exportTypeOptionsTsDesc2": "Ahora veamos SQL.",
+	"exportTypeSelection": "Selección de tipo de exportación",
+	"exportTypeSelectionDesc": "El menú desplegable Formato le permite elegir el formato del contenido generado. Hay muchas opciones, algunas de ellas los tipos principales: SQL, CSV, SQL, JSON y otras, y algunas de ellas son para generar datos para lenguajes de programación específicos.",
+	"exportTypes": "Tipos de exportación",
+	"filterDataTypes": "Filtrar tipos de datos",
+	"financial": "Financiera",
+	"firstName": "Nombre",
+	"forgottenYourPasswordQ": "¿Contraseña olvidada?",
+	"format": "Formato",
+	"generate": "Generar",
+	"generateBtnDesc": "Una vez que haya terminado de configurar su conjunto de datos y haya confirmado que se ve como desea, ¡es hora de generar algunos datos en volumen! Haga clic en este botón para generar sus datos. Dependiendo de la cantidad de filas en la cuadrícula de datos y la cantidad de filas que desee generar, esto puede llevar algún tiempo.",
+	"generated": "Generada",
+	"generatedC": "Generada:",
+	"generator": "Generador",
+	"geo": "Geográficos",
+	"grid": "Cuadrícula",
+	"gridPanelTourDesc1": "El panel de cuadrícula es donde construye los datos que desea generar. Aquí puede elegir entre los diferentes tipos de datos, cómo están configurados y el orden en que aparecen. En el ejemplo aquí, tenemos cinco campos: Nombre, Teléfono, Correo electrónico, Dirección y Ciudad.",
+	"gridPanelTourDesc2": "Consulte el recorrido en el Panel de cuadrícula para obtener información más detallada sobre esta sección.",
+	"gridPanelTourIntroDesc1": "El panel de cuadrícula es donde usted define qué datos desea generar. Para este recorrido, hemos ocultado el panel de vista previa (vea el botón \"Vista previa\" sin marcar en la parte inferior derecha de la página) para darnos un poco más de espacio. También hemos agregado 10 filas de diferentes tipos de datos, solo con fines ilustrativos.",
+	"gridPanelTourIntroDesc2": "Comencemos con las columnas de la cuadrícula.",
+	"help": "Ayuda",
+	"helpIcon": "Icono de ayuda",
+	"helpIconDesc": "Cuando seleccione un tipo de datos en la columna anterior, aparecerá un icono aquí. Al hacer clic en él, se abre un cuadro de diálogo de ayuda que contiene información de uso.",
+	"hide": "Esconder",
+	"hideShowGrid": "Ocultar / mostrar cuadrícula",
+	"hideShowPreviewPanel": "Ocultar / mostrar panel de vista previa",
+	"history": "Historia",
+	"historyPanelDesc": "Este panel muestra el historial de cambios realizados en el conjunto de datos. Haga clic en los botones Ver para examinar versiones anteriores. Para volver a una versión anterior, simplemente visualícela y, a continuación, haga clic en el botón \"Volver a esta versión\".",
+	"hostName": "Anfitrión",
+	"humanData": "Datos humanos",
+	"ifWantToReregister": "Si desea volver a registrarse, visite:",
+	"incomplete": "Incompleta",
+	"install": "Instalar",
+	"introToGenerator": "Introducción al generador",
+	"introToGeneratorDesc": "Este recorrido le brinda una introducción de alto nivel a las características principales del Generador de datos. ¡Empecemos!",
+	"invalidSettings": "¡Configuración no válida!",
+	"language": "Español",
+	"lastEdited": "editado por último",
+	"lastLoggedIn": "Última entrada",
+	"lastModified": "Última modificación",
+	"lastName": "Apellidos",
+	"lastSaved": "salvado por último",
+	"lineWrapping": "Envoltura de línea",
+	"linkToDataSet": "Enlazar a conjunto de datos",
+	"linkToThisDataSet": "Enlazar a este conjunto de datos",
+	"live": "Vivir",
+	"load": "Cargar",
+	"loading": "Cargando...",
+	"login": "Conexión",
+	"loginToSave": "Para guardar sus conjuntos de datos, primero necesita una cuenta. Inicie sesión a continuación.",
+	"loginOrRegisterToSave": "Para guardar sus conjuntos de datos, primero necesita una cuenta. Inicie sesión o regístrese a continuación.",
+	"loginUrlLabel": "URL de inicio de sesión:",
+	"logout": "Salir",
+	"makeDataSetPublicAgreement": "Entiendo que para compartir este conjunto de datos necesit hacerlo público.",
+	"metaDescription": "GenerateData.com: generador de datos aleatorios personalizable para pruebas de software libre y licenciado como GNU",
+	"metaKeywords": "Datos aleatorios, Datos de prueba, Datos de ejemplo, generador de datos, generar datos",
+	"missingDataSetName": "Ingrese el nombre de su conjunto de datos",
+	"nameColumn": "Columna de nombre",
+	"nameColumnDesc": "Esta columna tiene un encabezado diferente según el tipo de exportación que haya seleccionado en el panel de vista previa (XML, CSV, etc.). El propósito de esta columna es proporcionar un identificador para la fila que luego se puede utilizar en los datos generados. Por ejemplo, XML utiliza este valor como nombre de nodo XML; JSON lo usa como nombre de propiedad JSON; SQL lo usa para el nombre de la columna de la base de datos. La aplicación validará automáticamente el valor que ingresó aquí para asegurarse de que sea válido para el tipo de exportación seleccionado.",
+	"newDataSet": "Nuevo conjunto de datos",
+	"no": "No",
+	"noAccountsCreated": "No se han creado cuentas.",
+	"noAdditionalSettings": "Sin configuraciones adicionales",
+	"noDataSetsSaved": "No tiene conjuntos de datos guardados.",
+	"noExamplesAvailable": "No hay ejemplos disponibles.",
+	"noExpiry": "Sin Caducidad",
+	"noHistory": "Aún no hay historial.",
+	"noOptionsAvailable": "No hay opciones disponibles.",
+	"noSafari": "¡Lo siento, no Safari!",
+	"northAmerica": "Norteamérica",
+	"nowLoggedIn": "Ha iniciado sesión.",
+	"nowLoggedOut": "Has sido desconectado.",
+	"numResults": "Núm. resultados",
+	"numeric": "Numéricos",
+	"oceania": "Oceanía",
+	"oneTimePasswordLogin": "Ha iniciado sesión con una contraseña de un solo uso. Establezca una nueva contraseña ahora.",
+	"open": "abierto",
+	"options": "Opciones",
+	"optionsColumn": "Columna de opciones",
+	"optionsColumnDesc1": "Esta columna contiene todas las opciones de configuración para el tipo de datos de esta fila. Algunos tipos de datos tienen demasiados ajustes de configuración para mostrarlos en un espacio tan pequeño (por ejemplo, país, región), por lo que es posible que solo muestren un botón en la cuadrícula que abre un cuadro de diálogo que contiene todas las opciones.",
+	"optionsColumnDesc2": "Para el tipo de datos de nombres que se ilustra aquí, la columna contiene un solo campo Píldora creable. Este es un tipo de campo común en el generador de datos. Le permite agregar elementos simplemente escribiéndolos y haciendo clic en <enter>. Luego convierte esos elementos en distintas píldoras que se pueden eliminar mediante el icono \"x\".",
+	"or": "o",
+	"order": "Orden",
+	"other": "Otros",
+	"overMaxAnonRows": "Lo sentimos, solo puede generar %1 filas. Para generar mayores volúmenes de datos, necesitará una cuenta de usuario en este sitio.",
+	"panelContents": "Contenido del panel",
+	"panelContentsDesc": "La mayor parte del panel de vista previa contiene una muestra de los datos generados, según los datos que ha especificado en el panel de cuadrícula y la configuración de Tipo de exportación seleccionada. Aquí está generando 5 tipos de datos diferentes (país, región, ciudad, dirección postal y postal) en formato mecanografiado.",
+	"panelControls": "Controles del panel",
+	"panelControlsClearIconDesc": "El último icono de los controles del panel le permite borrar la página para que pueda empezar de nuevo.",
+	"panelControlsDesc": "Los botones de control del panel le permiten ocultar / mostrar los paneles de cuadrícula y vista previa, lo que puede ser útil si trabaja con un espacio de pantalla limitado. También puede alternar la ubicación de los dos paneles entre sí (de izquierda a derecha, de arriba a abajo) utilizando el tercer icono.",
+	"panelTabs": "Pestañas del panel",
+	"panelTabsDesc": "Por último, es posible que haya notado que el panel está organizado en dos pestañas. De forma predeterminada, muestra la pestaña Configuración, ya que es allí donde es más probable que desee ir. Pero también hay una segunda pestaña \"Vista previa\" que contiene configuraciones para cambiar la apariencia del panel de vista previa: el tema, ocultar / mostrar números de línea, alternar el ajuste de línea, cambiar el tamaño del texto y controlar el número de filas generadas.",
+	"password": "Contraseña",
+	"passwordLabel": "Contraseña:",
+	"passwordReset": "Restablecimiento de contraseña",
+	"passwordResetAccountExpired": "Restablecimiento de contraseña: cuenta caducada",
+	"passwordResetAccountExpiredDesc": "Acabamos de recibir una solicitud para restablecer su contraseña, sin embargo, su cuenta ya ha caducado.",
+	"passwordResetComplete": "Tu contraseña ha sido restablecida y hemos enviado un correo electrónico con la nueva contraseña.",
+	"passwordResetEmailContent1": "Tu contraseña ha sido restablecida. Ya puedes usar la siguiente contraseña para entrar: %1",
+	"passwordResetEmailContent2": "Por favor, cámbiala una vez hayas entrado de nuevo.",
+	"passwordResetEmailDesc": "Recibimos una solicitud para restablecer su contraseña. Este correo electrónico contiene una contraseña temporal de un solo uso que puede usar para iniciar sesión. Después de iniciar sesión, deberá establecer una nueva contraseña.",
+	"passwordResetMsg": "Si el correo electrónico estaba en el archivo, su contraseña se ha restablecido y se le ha enviado por correo electrónico información de inicio de sesión temporal.",
+	"passwordUpdateInvalidPassword": "Tu contraseña actual es incorrecta. Vuelva a ingresar.",
+	"passwordUpdated": "Tu contraseña ha sido actualizada.",
+	"pause": "Pausa",
+	"pleaseConfirm": "Por favor, confirma",
+	"pleaseEnterAll": "Por favor, introduce todo",
+	"pleaseEnterDataSetName": "Por favor, introduzca el nombre del nuevo conjunto de datos.",
+	"pleaseFixErrors": "Por favor, arregle los errores y envíe de nuevo el formulario:",
+	"pleaseLogin": "Por favor Iniciar sesión",
+	"pleaseSelect": "Por favor, seleccione",
+	"plugins": "Complementos",
+	"pressEnterAddItem": "Presione enter para agregar un elemento",
+	"preview": "Avance",
+	"previewPanel": "Panel de vista previa",
+	"previewPanelControlsDesc": "En la parte superior derecha del panel hay dos iconos. El primer icono actualiza el panel, generando diferentes datos aleatorios cada vez; esto ayuda a darte una idea del tipo de datos que genera. El segundo icono cierra el panel por completo. Siempre puede volver a mostrar el panel usando la sección en la parte inferior derecha de la página (simplemente vuelva a seleccionar la casilla de verificación \"Vista previa\").",
+	"previewPanelDesc": "Este panel le brinda una vista previa en vivo de los datos que está generando, mientras los construye a través del panel de cuadrícula. El botón en la parte superior izquierda muestra el formato seleccionado de los datos que se generan (por ejemplo, SQL, XML, CSV, etc.). Para cambiar el formato, simplemente haga clic en el botón.",
+	"previewPanelMoreInfo": "Para obtener más información sobre este panel, consulte el recorrido del Panel de vista previa.",
+	"previewPanelNoData": "¡Sin datos!",
+	"previewPanelTourDesc": "El panel de vista previa le brinda una representación visual en vivo de los datos que está generando a medida que los construye. Este recorrido ofrece una introducción rápida a cómo funciona el panel.",
+	"previewRows": "Vista previa de filas",
+	"private": "Privada",
+	"problemLoadingTour": "Lo sentimos, hubo un problema al cargar el recorrido.",
+	"programmingLanguages": "Lenguajes de programación",
+	"province": "Provincia",
+	"public": "Pública",
+	"publicQ": "¿Es público?",
+	"reenterPassword": "Repita contraseña",
+	"refreshPage": "Refrescar página",
+	"refreshPanel": "Actualizar panel",
+	"register": "Registrarse",
+	"remainingTime": "Tiempo restante:",
+	"requiredField": "Campo requerido",
+	"revertToVersion": "Volver a esta versión",
+	"row": "Fila",
+	"rowLabel": "Título de columna",
+	"rowLabelPlural": "Títulos de columna",
+	"rowNumDesc1": "La primera columna de la cuadrícula muestra el número de fila. Para reordenar la fila, simplemente haga clic y arrastre este elemento hacia arriba o hacia abajo.",
+	"rowNumDesc2": "El valor del encabezado de esta columna muestra el número total de filas en su cuadrícula. Esto puede ser útil cuando tiene conjuntos de datos realmente grandes y es demasiado grande para caber en la pantalla.",
+	"rowNumber": "Numero de fila",
+	"rowSp": "Fila(s)",
+	"rows": "filas",
+	"rowsGenerated": "Filas generadas",
+	"rowsGeneratedPerSecond": "Filas generadas por segundo",
+	"safariExplanation": "Este sitio requiere un navegador web actualizado que implemente estándares web modernos. Desafortunadamente, Safari se ha quedado atrás de otros navegadores y no ejecutará este script. Hasta que averigüemos cómo adaptarlo, utilice uno de los siguientes navegadores. Todo gratis para descargar.",
+	"save": "Salvar",
+	"saveAs": "Guardar como",
+	"saveButtonDesc": "Si tiene una cuenta de usuario en el sitio, este botón guardará su conjunto de datos. Si no ha iniciado sesión, al hacer clic en él, se le pedirá que inicie sesión primero. El sistema mantiene un historial de los últimos %1 cambios en un conjunto de datos, por lo que siempre puede volver atrás y ver versiones anteriores.",
+	"saveDataSetNewName": "Guardar el conjunto de datos con un nombre nuevo",
+	"seconds": "Segundos",
+	"seeHelpDialog": "&nbsp;Ver el diálogo de ayuda.",
+	"selectCountry": "Seleccionar país",
+	"selectDataType": "Seleccione tipo de dato",
+	"selectEllipsis": "Seleccione...",
+	"selectExpiryDate": "Seleccione la fecha de caducidad",
+	"selectLanguage": "Elije idioma",
+	"sendEmail": "Enviar correo electrónico",
+	"seriouslySlow": "Seriamente lenta",
+	"settings": "Ajustes",
+	"showGrid": "Mostrar cuadrícula",
+	"showLineNumbers": "Mostrar números de línea",
+	"showPreview": "Mostrar vista previa",
+	"siteLogo": "logotipo del sitio",
+	"size": "Tamaño:",
+	"southAmerica": "Sudamérica",
+	"status": "Estado",
+	"stripWhitespace": "quitar los espacios en blanco del contenido generado",
+	"success": "éxito",
+	"text": "Texto",
+	"textSize": "Tamano del texto",
+	"theDataSetName": "El nombre del conjunto de datos",
+	"theExportTypeBtn": "El botón Tipo de exportación",
+	"theGenerateButton": "El botón Generar",
+	"theGridPanel": "El panel de cuadrícula",
+	"thePreviewPanel": "El panel de vista previa",
+	"theSaveButton": "El botón Guardar",
+	"theme": "Tema",
+	"togglePanelLayout": "Alternar diseño de panel",
+	"totalNumGeneratedRows": "Número total de filas generadas",
+	"tourComplete": "Tour completo",
+	"tourCompleteDesc": "¡Todo listo! Elija uno de los botones siguientes para continuar.",
+	"tourIntroPara1": "Esta herramienta proporciona mucha funcionalidad y puede resultar un poco abrumadora al principio. Haga clic en uno de los botones a la derecha para realizar un recorrido sobre esa característica en particular.",
+	"tourIntroPara2": "Tenga en cuenta que cuando comienza el recorrido, sobrescribe temporalmente el contenido de la página del generador para ilustrar ciertas cosas sobre la interfaz. ¡Pero no se preocupe! Tan pronto como finaliza el recorrido, sus datos vuelven a su estado original.",
+	"tryDifferentTour": "Prueba un recorrido diferente",
+	"update": "Actualizar",
+	"updateAccount": "Actualizar cuenta",
+	"user": "Ususario",
+	"userAccount": "Cuenta de usuario",
+	"userAccountNotFound": "Lo sentimos, no pudimos encontrar su cuenta.",
+	"userAccountUpdated": "La cuenta de usuario se ha actualizado.",
+	"userAccounts": "Cuentas de usuario",
+	"userNotFound": "Lo sentimos, no pudimos identificarte. Verifique sus credenciales.",
+	"validationAccountAlreadyExists": "Lo siento, ya existe una cuenta con esa dirección de correo electrónico.",
+	"validationDifferentNewPasswords": "Asegúrese de que sus nuevas contraseñas coincidan",
+	"validationInvalidEmail": "Por favor, introduce una dirección de correo válida.",
+	"validationNoCurrentPassword": "Ingrese su contraseña actual",
+	"validationNoEmail": "Por favor, introduce tu dirección de correo.",
+	"validationNoFirstName": "Por favor, introduce tu nombre.",
+	"validationNoLastName": "Por favor, introduce tus apellidos.",
+	"validationNoPassword": "Por favor, introduce tu contraseña.",
+	"version": "Versión",
+	"view": "Vista",
+	"viewChangelog": "Ver registro de cambios",
+	"viewOnGithub": "Ver en Github",
+	"welcomeToTheGenerator": "Bienvenido al generador!",
+	"yes": "Sí",
+	"yourAccount": "Tu cuenta",
+	"yourAccountUpdated": "Tu cuenta ha sido actualizada.",
+	"yourUserAccount": "Su cuenta de usuario"
+}
\ No newline at end of file
diff --git a/apps/client/src/i18n/fr.json b/apps/client/src/i18n/fr.json
new file mode 100644
index 000000000..777b0aff4
--- /dev/null
+++ b/apps/client/src/i18n/fr.json
@@ -0,0 +1,329 @@
+{
+	"abort": "Avorter",
+	"about": "A propos",
+	"aboutInfoPara1": "generateata.com est un projet open source que j'ai créé à la fin de l'ère paléolithique (vers 2004) et a eu de très nombreux contributeurs au cours de sa vie. Toutes les quelques années, je le réécris en utilisant les dernières et les meilleures technologies disponibles : cette version a été achevée en 2021, réalisée avec React, Redux, Typescript, GraphQL, Docker, des travailleurs Web, des élastiques, du ruban adhésif et beaucoup de jurons.",
+	"aboutInfoPara2": "Vous pouvez trouver le projet sur github. Téléchargez-le, ajoutez-le ou n'hésitez pas à contribuer. Prendre plaisir!",
+	"aboutThisScript": "À propos de ce script",
+	"accountCreated": "Compte utilisateur créé",
+	"accountCreatedDesc": "Le compte a été créé.",
+	"accountCreatedMsg": "Un compte a été créé avec succès.",
+	"accountDeleted": "Le compte a été supprimé.",
+	"accountDisabled": "Compte désactivé",
+	"accountExpiredMsg": "Désolé, votre compte a expiré.",
+	"accountExpiryDate": "Date d'expiration du compte",
+	"accountInfo": "Informations sur le compte",
+	"accountSettings": "Paramètres du compte",
+	"accountType": "Type de compte",
+	"accounts": "Comptes",
+	"add": "Ajouter",
+	"addRowsDesc": "Pour ajouter plus de lignes à la grille de données, utilisez simplement le formulaire en bas de la page. Lorsque vous avez beaucoup de champs, cette section peut être masquée hors de la page, vous devrez donc faire défiler le panneau vers le bas pour voir le formulaire.",
+	"addSomeDataDesc": "Ajoutez quelques lignes dans la grille.",
+	"admin": "Administrateur",
+	"adminAccount": "Compte Administrateur",
+	"administrator": "Administrateur",
+	"africa": "Afrique",
+	"allCountries": "Tous les pays",
+	"allDataTypePlugins": "Tous les plugins de types de données",
+	"allExportTypePlugins": "Tous les plugins dexport",
+	"anonymousAccess": "Accès anonyme",
+	"asia": "Asie",
+	"back": "Retour",
+	"backToLogin": "Retour connexion",
+	"blog": "Blog",
+	"cancel": "Annuler",
+	"centralAmerica": "Amérique Centrale",
+	"changePassword": "Changer le mot de passe",
+	"clear": "Claire",
+	"clearPage": "Effacer la page",
+	"clearPageConfirmation": "Voulez-vous vraiment effacer la page? Toutes les modifications que vous avez apportées seront perdues.",
+	"clearThePage": "Vider la page",
+	"clickExportTypeBtn": "L'étape suivante montre ce qui se passe lorsque vous cliquez sur le bouton.",
+	"close": "Fermer",
+	"closePanel": "Fermer le panneau",
+	"columns": "Colonnes",
+	"columnsDesc": "La grille affichera autant de ces colonnes que possible, en fonction de la taille de votre écran disponible. Lorsqu'il est trop petit, il masquera certaines colonnes et affichera une icône de rouage qui ouvre une info-bulle avec le contenu manquant. Les étapes suivantes expliquent chacune des colonnes, en utilisant la première ligne Noms comme démonstration.",
+	"complete": "Achevé",
+	"confirmDeleteAccount": "Voulez-vous vraiment supprimer ce compte?",
+	"confirmDeleteUserAccount": "Êtes-vous sûr de vouloir supprimer ce compte utilisateur?",
+	"confirmEmptyForm": "Êtes-vous sûr de vouloir vider le formulaire?",
+	"continue": "Continuer",
+	"copiedToClipboard": "Copié dans le presse-papier",
+	"copyToClipboard": "Copier dans le presse-papier",
+	"coreExportType": "Formats de base",
+	"countries": "Pays",
+	"country": "Pays",
+	"countrySpecific": "Spécifique au pays",
+	"cpuMeltinglyFast": "Processeur ultra-rapide",
+	"createAccount": "Créer un compte",
+	"currentPassword": "Mot de passe actuel",
+	"currentVersion": "Version actuelle en cours de modification",
+	"dataGenerated": "Données générées.",
+	"dataSet": "Jeu de données",
+	"dataSetHelp": "Cest ici que vous définissez précisément le genre de données que vous souhaitez générer. Essayez de remplir une ligne ou deux et cliquez sur le bouton Générer. Vous comprendrez le fonctionnement très rapidement !",
+	"dataSetLoaded": "L'ensemble de données a été chargé.",
+	"dataSetName": "Nom du jeu de données",
+	"dataSetNameDesc": "Cliquez sur le texte ici pour nommer votre ensemble de données. Veuillez noter que vous aurez besoin d'un compte sur le site et d'être connecté pour nommer vos ensembles de données. Lorsque vous enregistrez vos ensembles de données, ce nom vous donne une étiquette pratique pour en garder une trace.",
+	"dataSetNameUpdated": "Le nom de l'ensemble de données a été mis à jour.",
+	"dataSetOptions": "Options d'ensemble de données",
+	"dataSetReverted": "Votre ensemble de données a été rétabli dans l'ancienne version sélectionnée.",
+	"dataSetSaved": "Votre ensemble de données a été enregistré.",
+	"dataSets": "Ensembles de données",
+	"dataType": "Type de données",
+	"dataTypeDesc": "Il s'agit d'une liste déroulante contenant tous les types de données disponibles. Lorsque vous sélectionnez une valeur, il met à jour le reste des colonnes pour cette ligne. Chaque type de données a ses propres paramètres uniques pour permettre la personnalisation.",
+	"dataTypes": "Types de données",
+	"dateAccountCreated": "Date de création du compte",
+	"dateCreated": "Date de création",
+	"defaultLanguage": "Langue par défaut",
+	"delete": "Supprimer",
+	"delete1DataSet": "Supprimer une Data Set",
+	"deleteAccount": "Supprimer le compte",
+	"deleteDataSet": "Supprimer l'ensemble de données",
+	"deleteDataSetConfirm": "Voulez-vous vraiment supprimer cet ensemble de données?",
+	"deleteRow": "Supprimer la ligne",
+	"deleteRowDesc": "La dernière colonne contient une icône de suppression. Cliquez dessus pour supprimer la ligne.",
+	"developer": "Développeur",
+	"developerDoc": "Doc développeur",
+	"disabled": "Désactivée",
+	"documentation": "Documentation",
+	"download": "Télécharger",
+	"edit": "Éditer",
+	"editAccount": "Modifier le compte",
+	"editExportTypePage": "Lorsque vous cliquez sur le bouton Type d'exportation, une vue pleine page apparaît, contenant les options de configuration sur le côté gauche et le panneau d'aperçu sur la droite.",
+	"editExportTypePageConfig": "Regardons les options de configuration.",
+	"editExportTypeSettings": "Veuillez modifier vos paramètres de type d'exportation.",
+	"editingExportTypes": "Modification des types d'exportation",
+	"email": "Email",
+	"emailFooterDisclaimer": "Si vous avez reçu cet e-mail par erreur, veuillez contacter l'administrateur du site.",
+	"emailIntroLineWithName": "Bonjour %1,",
+	"emailLabel": "E-mail:",
+	"emailNotSent": "Nous navons pas pu envoyer la notification email.",
+	"emailUserLoginInfo": "Envoyer à lutilisateur ses informations de connexion",
+	"enterEmailAddressToResetPassword": "Entrez votre adresse e-mail ci-dessous pour réinitialiser votre mot de passe.",
+	"enterUserAccountDetails": "Entrez vos informations de compte dutilisateur ci-dessous.",
+	"errorCreatingAccount": "Une erreur s'est produite lors de la création de ce compte.",
+	"estimatedSize": "Taille estimée :",
+	"estimatedTime": "Temps estimé:",
+	"europe": "Europe",
+	"example": "Exemple",
+	"exampleColumn": "Exemple de colonne",
+	"exampleColumnDesc": "Cette colonne peut ou non avoir du contenu en fonction du type de données que vous avez sélectionné pour la ligne. C'est juste un moyen pratique pour certains types de données de fournir des exemples prédéfinis sur la façon dont ils peuvent être utilisés. Par exemple, la colonne Noms propose une liste déroulante de différents formats de nom. Pour tous les types de données, vous pouvez toujours le configurer manuellement via la colonne Options: c'est vraiment un appareil qui vous fait gagner du temps pour vous mettre à niveau le plus rapidement possible.",
+	"examples": "Exemples",
+	"exit": "Sortie",
+	"expired": "Expiré",
+	"expiryDate": "Date d'expiration",
+	"exportType": "Export Type",
+	"exportTypeBtnDesc": "Le bouton en haut à gauche du panneau vous permet de sélectionner et de configurer le format des données que vous souhaitez générer. Ici, il est défini sur Typescript.",
+	"exportTypeOptionsSql": "Options de type d'exportation: SQL",
+	"exportTypeOptionsSqlDesc": "Comme vous pouvez le voir, SQL contient de nombreux autres champs spécifiques à ce type d'exportation. Les autres types d'exportation ont des paramètres différents.",
+	"exportTypeOptionsTs": "Options de type d'exportation: Typographie",
+	"exportTypeOptionsTsDesc": "Selon le type d'exportation sélectionné, le corps du panneau peut contenir des options supplémentaires. Ici, avec Typescript, il y a deux champs, vous permettant de personnaliser le nom du type et le nom de la variable exportée.",
+	"exportTypeOptionsTsDesc2": "Regardons maintenant SQL.",
+	"exportTypeSelection": "Sélection du type d'exportation",
+	"exportTypeSelectionDesc": "La liste déroulante Format vous permet de choisir le format du contenu généré. Il existe de nombreuses options, dont certaines sont des types de base: SQL, CSV, SQL, JSON et d'autres, et certaines d'entre elles sont destinées à générer des données pour des langages de programmation spécifiques.",
+	"exportTypes": "Types dExports",
+	"filterDataTypes": "Filtrer les types de données",
+	"financial": "Financière",
+	"firstName": "Prénom",
+	"forgottenYourPasswordQ": "Mot de passe oublié?",
+	"format": "Format",
+	"generate": "Générer",
+	"generateBtnDesc": "Une fois que vous avez terminé de configurer votre ensemble de données et confirmé qu'il vous convient, il est temps de générer des données en volume! Cliquez sur ce bouton pour générer vos données. Selon le nombre de lignes dans la grille de données et le nombre de lignes que vous souhaitez générer, cela peut prendre un certain temps.",
+	"generated": "Généré",
+	"generatedC": "Généré :",
+	"generator": "Générateur",
+	"geo": "Géo.",
+	"grid": "La grille",
+	"gridPanelTourDesc1": "Le panneau de grille est l'endroit où vous construisez les données que vous souhaitez générer. Ici, vous pouvez choisir entre les différents types de données, comment ils sont configurés et l'ordre dans lequel ils apparaissent. Dans l'exemple ici, nous avons cinq champs: Nom, Téléphone, Email, Adresse et Ville.",
+	"gridPanelTourDesc2": "Consultez la visite guidée du panneau de grille pour plus d'informations sur cette section.",
+	"gridPanelTourIntroDesc1": "Le panneau de la grille est l'endroit où vous définissez les données que vous souhaitez générer. Pour cette visite, nous avons caché le panneau de prévisualisation (voir le bouton \"Aperçu\" décoché en bas à droite de la page) pour nous donner un peu plus d'espace. Nous avons également ajouté 10 lignes de types de données différents, juste à des fins d'illustration.",
+	"gridPanelTourIntroDesc2": "Commençons par les colonnes de la grille.",
+	"help": "Aide",
+	"helpIcon": "Icône d'aide",
+	"helpIconDesc": "Lorsque vous sélectionnez un type de données dans la colonne précédente, une icône apparaît ici. Cliquez dessus pour ouvrir une boîte de dialogue d'aide contenant des informations d'utilisation.",
+	"hide": "Cacher",
+	"hideShowGrid": "Masquer / afficher la grille",
+	"hideShowPreviewPanel": "Masquer / afficher le panneau d'aperçu",
+	"history": "Histoire",
+	"historyPanelDesc": "Ce panneau affiche l'historique des modifications apportées à l'ensemble de données. Cliquez sur les boutons Afficher pour examiner les versions antérieures. Pour revenir à une version antérieure, affichez-la, puis cliquez sur le bouton \"Revenir à cette version\".",
+	"hostName": "Nom de lhôte",
+	"humanData": "Données humaines",
+	"ifWantToReregister": "Si vous souhaitez vous réinscrire, veuillez visiter:",
+	"incomplete": "Incomplet",
+	"install": "Installer",
+	"introToGenerator": "Introduction au générateur",
+	"introToGeneratorDesc": "Cette visite vous donne une introduction de haut niveau aux principales fonctionnalités du générateur de données. Commençons!",
+	"invalidSettings": "Paramètres invalides!",
+	"language": "Français",
+	"lastEdited": "Dernière modification le",
+	"lastLoggedIn": "Dernière session",
+	"lastModified": "Dernière mise à jour",
+	"lastName": "Nom de famille",
+	"lastSaved": "Dernier enregistrement",
+	"lineWrapping": "Emballage de ligne",
+	"linkToDataSet": "Lien vers le jeu de données",
+	"linkToThisDataSet": "Partager ce jeu de données",
+	"live": "Habitent",
+	"load": "Charger",
+	"loading": "Chargement...",
+	"login": "Login",
+	"loginToSave": "Afin de sauvegarder vos ensembles de données, vous avez d'abord besoin d'un compte. Veuillez vous connecter ci-dessous.",
+	"loginOrRegisterToSave": "Afin de sauvegarder vos ensembles de données, vous avez d'abord besoin d'un compte. Veuillez vous connecter ou vous inscrire ci-dessous.",
+	"loginUrlLabel": "URL de connexion:",
+	"logout": "Déconnexion",
+	"makeDataSetPublicAgreement": "Je comprends que pour partager ce jeu de données jai besoin de le rendre public.",
+	"metaDescription": "GenerateData.com: logiciel libre sous licence GNU GPL, générateur aléatoire de données personnalisé pour tester des applications.",
+	"metaKeywords": "Données aléatoires, données dessais, exemples, générateur de données, générer des données",
+	"missingDataSetName": "Veuillez saisir le nom de votre ensemble de données",
+	"nameColumn": "Colonne de nom",
+	"nameColumnDesc": "Cette colonne obtient un en-tête différent en fonction du type d'exportation que vous avez sélectionné dans le panneau d'aperçu (XML, CSV, etc.). Le but de cette colonne est de fournir un identifiant pour la ligne qui peut ensuite être utilisé dans les données générées. Par exemple, XML utilise cette valeur comme nom de noeud XML; JSON l'utilise comme nom de propriété JSON; SQL l'utilise pour le nom de la colonne de base de données. L'application validera automatiquement la valeur que vous avez saisie ici pour s'assurer qu'elle est valide pour le type d'exportation sélectionné.",
+	"newDataSet": "Nouvel ensemble de données",
+	"no": "Aucun",
+	"noAccountsCreated": "Aucun compte n'a été créé.",
+	"noAdditionalSettings": "Aucun paramètre supplémentaire",
+	"noDataSetsSaved": "Vous n'avez enregistré aucun ensemble de données.",
+	"noExamplesAvailable": "Aucun exemple disponible.",
+	"noExpiry": "Pas d'expiration",
+	"noHistory": "Pas encore d'histoire.",
+	"noOptionsAvailable": "Aucune option disponible.",
+	"noSafari": "Désolé, pas de Safari!",
+	"northAmerica": "Amérique du Nord",
+	"nowLoggedIn": "Vous êtes connecté.",
+	"nowLoggedOut": "Vous avez été déconnecté.",
+	"numResults": "Résultats",
+	"numeric": "Numérique",
+	"oceania": "Océanie",
+	"oneTimePasswordLogin": "Vous avez été connecté avec un mot de passe à usage unique. Veuillez définir un nouveau mot de passe maintenant.",
+	"open": "ouvert",
+	"options": "Options",
+	"optionsColumn": "Colonne d'options",
+	"optionsColumnDesc1": "Cette colonne contient toutes les options de configuration pour le type de données de cette ligne. Certains types de données ont trop de paramètres de configuration à afficher dans un si petit espace (par exemple, pays, région), ils peuvent donc simplement afficher un bouton dans la grille qui ouvre une boîte de dialogue contenant toutes les options.",
+	"optionsColumnDesc2": "Pour le type de données Noms illustré ici, la colonne contient un seul champ Pilule à créer. Il s'agit d'un type de champ courant dans le générateur de données. Il vous permet d'ajouter des éléments en y tapant simplement et en cliquant sur <Entrée>. Il convertit ensuite ces éléments en pilules distinctes qui peuvent être supprimées via l'icône «x».",
+	"or": "ou",
+	"order": "Ordre",
+	"other": "Autre",
+	"overMaxAnonRows": "Désolé, vous ne pouvez générer que %1 lignes. Pour générer de plus gros volumes de données, vous aurez besoin d'un compte utilisateur sur ce site.",
+	"panelContents": "Contenu du panneau",
+	"panelContentsDesc": "La majeure partie du panneau d'aperçu contient un échantillon des données générées, selon les données que vous avez spécifiées dans le panneau de grille et les paramètres de type d'exportation sélectionnés. Ici, il génère 5 types de données différents (Pays, Région, Ville, Adresse et Postal / Zip) au format Typescript.",
+	"panelControls": "Commandes du panneau",
+	"panelControlsClearIconDesc": "La dernière icône des commandes du panneau vous permet d'effacer la page afin de pouvoir recommencer.",
+	"panelControlsDesc": "Les boutons de contrôle du panneau vous permettent de masquer / afficher les panneaux Grille et Aperçu, ce qui peut être utile si vous travaillez avec un espace d'écran limité. Vous pouvez également basculer le placement des deux panneaux l'un par rapport à l'autre (gauche-droite, haut-bas) à l'aide de la troisième icône.",
+	"panelTabs": "Onglets du panneau",
+	"panelTabsDesc": "Enfin, vous avez peut-être remarqué que le panneau est organisé en deux onglets. Par défaut, il affiche l'onglet Paramètres, car c'est là que vous voudrez probablement aller. Mais il y a aussi un deuxième onglet «Aperçu» qui contient les paramètres pour changer l'apparence du panneau d'aperçu: le thème, masquer / afficher les numéros de ligne, basculer le retour à la ligne, changer la taille du texte et contrôler le nombre de lignes générées.",
+	"password": "Mot de passe",
+	"passwordLabel": "Mot de passe:",
+	"passwordReset": "Réinitialisation du mot de passe",
+	"passwordResetAccountExpired": "Réinitialisation du mot de passe - Compte expiré",
+	"passwordResetAccountExpiredDesc": "Nous venons de recevoir une demande de réinitialisation de votre mot de passe, mais votre compte a déjà expiré.",
+	"passwordResetComplete": "Votre mot de passe a été réinitialisé et vous a été envoyé.",
+	"passwordResetEmailContent1": "Votre mot de passe a été réinitialisé. Vous pouvez utiliser le mot de passe ci-dessous pour vous connecter: %1",
+	"passwordResetEmailContent2": "Veuillez le changer une fois connecté.",
+	"passwordResetEmailDesc": "Nous avons reçu une demande de réinitialisation de votre mot de passe. Cet e-mail contient un mot de passe temporaire à usage unique que vous pouvez utiliser pour vous connecter. Une fois connecté, vous devrez définir un nouveau mot de passe.",
+	"passwordResetMsg": "Si l'e-mail était enregistré, votre mot de passe a été réinitialisé et des informations de connexion temporaires vous ont été envoyées par e-mail.",
+	"passwordUpdateInvalidPassword": "Votre mot de passe actuel est incorrect. Veuillez entrer à nouveau.",
+	"passwordUpdated": "Votre mot de passe a été mis à jour.",
+	"pause": "Pause",
+	"pleaseConfirm": "Confirmer",
+	"pleaseEnterAll": "Veuillez renseigner tous les champs obligatoires.",
+	"pleaseEnterDataSetName": "Sil vous plaît entrez le nom du nouveau jeu de données.",
+	"pleaseFixErrors": "Corriger les erreurs suivantes et réessayez: ",
+	"pleaseLogin": "Veuillez vous connecter",
+	"pleaseSelect": "Sélection  obligatoire",
+	"plugins": "Plugins",
+	"pressEnterAddItem": "Appuyez sur Entrée pour ajouter un élément",
+	"preview": "Aperçu",
+	"previewPanel": "Panneau de prévisualisation",
+	"previewPanelControlsDesc": "En haut à droite du panneau, il y a deux icônes. La première icône actualise le panneau, générant à chaque fois des données aléatoires différentes - cela vous donne une idée du type de données qu'il génère. La deuxième icône ferme complètement le panneau. Vous pouvez toujours afficher à nouveau le panneau en utilisant la section en bas à droite de la page (il suffit de re-sélectionner la case \"Aperçu\").",
+	"previewPanelDesc": "Ce panneau vous donne un aperçu en direct des données que vous générez, pendant que vous les construisez via le panneau de grille. Le bouton en haut à gauche montre le format sélectionné des données générées (par exemple SQL, XML, CSV, etc.). Pour changer le format, cliquez simplement sur le bouton.",
+	"previewPanelMoreInfo": "Pour plus d'informations sur ce panneau, consultez la visite guidée du panneau de prévisualisation.",
+	"previewPanelNoData": "Pas de données!",
+	"previewPanelTourDesc": "Le panneau d'aperçu vous donne une représentation visuelle en direct des données que vous générez au fur et à mesure que vous les construisez. Cette visite donne une introduction rapide au fonctionnement du panneau.",
+	"previewRows": "Aperçu des lignes",
+	"private": "Privé",
+	"problemLoadingTour": "Désolé, un problème est survenu lors du chargement de la visite.",
+	"programmingLanguages": "Langages de programmation",
+	"province": "Province",
+	"public": "Public",
+	"publicQ": "Publique ?",
+	"reenterPassword": "Nouveau mot de passe",
+	"refreshPage": "Actualiser la page",
+	"refreshPanel": "Refresh Panel",
+	"register": "S'inscrire",
+	"remainingTime": "Temps restant:",
+	"requiredField": "champs requis",
+	"revertToVersion": "Revenir à cette version",
+	"row": "rangée",
+	"rowLabel": "Titre de colonne",
+	"rowLabelPlural": "Titres des colonnes",
+	"rowNumDesc1": "La première colonne de la grille affiche le numéro de ligne. Pour réorganiser la ligne, cliquez et faites glisser cet élément vers le haut ou vers le bas.",
+	"rowNumDesc2": "La valeur d'en-tête de cette colonne indique le nombre total de lignes dans votre grille. Cela peut être pratique lorsque vous avez de très grands ensembles de données et qu'ils sont trop volumineux pour tenir à l'écran.",
+	"rowNumber": "Numéro de ligne",
+	"rowSp": "Ligne(s)",
+	"rows": "lignes",
+	"rowsGenerated": "Lignes générées",
+	"rowsGeneratedPerSecond": "Lignes générées par seconde",
+	"safariExplanation": "Ce site nécessite un navigateur Web à jour qui met en œuvre des normes Web modernes. Malheureusement, Safari a pris du retard sur les autres navigateurs et n'exécutera pas ce script. Jusqu'à ce que nous comprenions comment l'adapter, veuillez utiliser l'un des navigateurs suivants. Tout est gratuit à télécharger.",
+	"save": "Sauver",
+	"saveAs": "Enregistrer sous",
+	"saveButtonDesc": "Si vous avez un compte utilisateur sur le site, ce bouton enregistrera votre jeu de données. Si vous n'êtes pas connecté, cliquer dessus vous invitera à vous connecter en premier. Le système conserve un historique des %1 dernières modifications apportées à un ensemble de données, afin que vous puissiez toujours revenir en arrière et afficher les anciennes versions.",
+	"saveDataSetNewName": "Enregistrer l'ensemble de données sous un nouveau nom",
+	"seconds": "Secondes",
+	"seeHelpDialog": "Consulter laide.",
+	"selectCountry": "Choisissez le pays",
+	"selectDataType": "Choix du type de données",
+	"selectEllipsis": "Sélectionner...",
+	"selectExpiryDate": "Sélectionnez la date d'expiration",
+	"selectLanguage": "Choix de la langue",
+	"sendEmail": "Envoyer un e-mail",
+	"seriouslySlow": "sérieusement lent",
+	"settings": "Réglages",
+	"showGrid": "Afficher la grille",
+	"showLineNumbers": "Afficher les numéros de ligne",
+	"showPreview": "Afficher l'aperçu",
+	"siteLogo": "logo du site",
+	"size": "Taille:",
+	"southAmerica": "Amérique du Sud",
+	"status": "Statut",
+	"stripWhitespace": "supprimer les espaces blancs du contenu généré",
+	"success": "Succès",
+	"text": "Texte",
+	"textSize": "Taille du texte",
+	"theDataSetName": "Le nom de l'ensemble de données",
+	"theExportTypeBtn": "Le bouton Type d'exportation",
+	"theGenerateButton": "Le bouton Générer",
+	"theGridPanel": "Le panneau de grille",
+	"thePreviewPanel": "Le panneau de prévisualisation",
+	"theSaveButton": "Le bouton Enregistrer",
+	"theme": "Thème",
+	"togglePanelLayout": "Basculer la disposition du panneau",
+	"totalNumGeneratedRows": "Nombre total de lignes générées",
+	"tourComplete": "Tour terminé",
+	"tourCompleteDesc": "Terminé! Choisissez l'un des boutons ci-dessous pour continuer.",
+	"tourIntroPara1": "Esta herramienta proporciona mucha funcionalidad y puede resultar un poco abrumadora al principio. Haga clic en uno de los botones a la derecha para realizar un recorrido sobre esa característica en particular.",
+	"tourIntroPara2": "Tenga en cuenta que cuando comienza el recorrido, sobrescribe temporalmente el contenido de la página del generador para ilustrar ciertas cosas sobre la interfaz. ¡Pero no se preocupe! Tan pronto como finaliza el recorrido, sus datos vuelven a su estado original.",
+	"tryDifferentTour": "Essayez une autre visite",
+	"update": "Mettre à jour",
+	"updateAccount": "Mise à jour du compte",
+	"user": "Utilisateur",
+	"userAccount": "Compte utilisateur",
+	"userAccountNotFound": "Désolé, nous n'avons pas pu trouver votre compte.",
+	"userAccountUpdated": "Le compte utilisateur a été mis à jour.",
+	"userAccounts": "Comptes utilisateurs",
+	"userNotFound": "Désolé, nous n'avons pas pu vous identifier. Veuillez vérifier vos identifiants.",
+	"validationAccountAlreadyExists": "Désolé, un compte avec cette adresse e-mail existe déjà.",
+	"validationDifferentNewPasswords": "Veuillez vous assurer que vos nouveaux mots de passe correspondent",
+	"validationInvalidEmail": "Entrez une adresse email valide.",
+	"validationNoCurrentPassword": "Veuillez saisir votre mot de passe actuel",
+	"validationNoEmail": "Entrez votre adresse e-mail.",
+	"validationNoFirstName": "Entrez votre prénom.",
+	"validationNoLastName": "Entrez votre nom de famille.",
+	"validationNoPassword": "ntrez votre mot de passe.",
+	"version": "Version",
+	"view": "Vue",
+	"viewChangelog": "Voir la log des modifications",
+	"viewOnGithub": "Voir sur Github",
+	"welcomeToTheGenerator": "Bienvenido al generador!",
+	"yes": "Oui",
+	"yourAccount": "Votre compte",
+	"yourAccountUpdated": "Votre compte a été mis à jour.",
+	"yourUserAccount": "Su cuenta de usuario"
+}
\ No newline at end of file
diff --git a/apps/client/src/i18n/hi.json b/apps/client/src/i18n/hi.json
new file mode 100644
index 000000000..b76997beb
--- /dev/null
+++ b/apps/client/src/i18n/hi.json
@@ -0,0 +1,329 @@
+{
+	"abort": "बीच में बंद करें",
+	"about": "के बारे में",
+	"aboutInfoPara1": "generatedata.com एक ओपन सोर्स प्रोजेक्ट है जिसे मैंने पुरापाषाण युग (लगभग 2004) में बनाया था और इसके जीवनकाल में कई, कई योगदानकर्ता रहे हैं। हर कुछ वर्षों में मैं इसे नवीनतम और सबसे बड़ी उपलब्ध तकनीकों का उपयोग करके फिर से लिखता हूं: यह संस्करण 2021 में पूरा हुआ, जिसे रिएक्ट, रेडक्स, टाइपस्क्रिप्ट, ग्राफक्यूएल, डॉकर, वेब वर्कर्स, रबर बैंड, डक्ट टेप और बहुत सारे कोस के साथ बनाया गया था।",
+	"aboutInfoPara2": "आप परियोजना को जीथब पर पा सकते हैं। इसे डाउनलोड करें, इसे फोर्क करें, या योगदान करने के लिए स्वतंत्र महसूस करें। आनंद लेना!",
+	"aboutThisScript": "इस स्क्रिप्ट के बारे में",
+	"accountCreated": "खाता बन गया",
+	"accountCreatedDesc": "खाता बनाया गया है।",
+	"accountCreatedMsg": "आपके लिए एक खाता बनाया गया है।",
+	"accountDeleted": "खाता हटा दिया गया है।",
+	"accountDisabled": "खाता अक्षम",
+	"accountExpiredMsg": "क्षमा करें, आपका खाता समाप्त हो गया है।",
+	"accountExpiryDate": "खाते की समाप्ति तिथि",
+	"accountInfo": "खाते की जानकारी",
+	"accountSettings": "अकाउंट सेटिंग",
+	"accountType": "खाते का प्रकार",
+	"accounts": "हिसाब किताब",
+	"add": "जोड़ें",
+	"addRowsDesc": "डेटा ग्रिड में और पंक्तियाँ जोड़ने के लिए पृष्ठ के निचले भाग में दिए गए फॉर्म का उपयोग करें। जब आपके पास बहुत सारे फ़ील्ड हों, तो यह अनुभाग पृष्ठ से छिपा हो सकता है, इसलिए आपको फ़ॉर्म देखने के लिए पैनल को नीचे तक स्क्रॉल करना होगा।",
+	"addSomeDataDesc": "ग्रिड में कुछ पंक्तियाँ जोड़ें।",
+	"admin": "व्यवस्थापक",
+	"adminAccount": "व्यवस्थापक खाता",
+	"administrator": "व्यवस्थापक खाता",
+	"africa": "अफ्रीका",
+	"allCountries": "सभी देश",
+	"allDataTypePlugins": "सभी डेटा प्रकार प्लगइन्स",
+	"allExportTypePlugins": "सभी निर्यात प्रकार प्लगइन्स",
+	"anonymousAccess": "अनाम पहुंच",
+	"asia": "एशिया",
+	"back": "वापस",
+	"backToLogin": "लॉगिन पर वापस जाएं",
+	"blog": "ब्लॉग",
+	"cancel": "रद्द करना",
+	"centralAmerica": "मध्य अमरीका",
+	"changePassword": "पासवर्ड बदलें",
+	"clear": "स्पष्ट",
+	"clearPage": "पृष्ठ साफ़ करें",
+	"clearPageConfirmation": "क्या आप वाकई पृष्ठ को साफ़ करना चाहते हैं? आपके द्वारा किया गया कोई भी परिवर्तन खो जाएगा।",
+	"clearThePage": "पेज साफ़ करें",
+	"clickExportTypeBtn": "अगला चरण दिखाता है कि जब आप बटन पर क्लिक करते हैं तो क्या होता है।",
+	"close": "बंद करे",
+	"closePanel": "पैनल बंद करें",
+	"columns": "कॉलम",
+	"columnsDesc": "आपके उपलब्ध स्क्रीन आकार के आधार पर ग्रिड इनमें से अधिक से अधिक कॉलम दिखाएगा। जब यह बहुत छोटा होता है, तो यह कुछ कॉलम छुपाएगा और एक कॉग आइकन दिखाएगा जो अनुपलब्ध सामग्री के साथ एक इंफोटिप खोलता है। अगले कुछ चरण प्रदर्शन के रूप में पहली नाम पंक्ति का उपयोग करते हुए प्रत्येक कॉलम की व्याख्या करते हैं।",
+	"complete": "पूर्ण",
+	"confirmDeleteAccount": "क्या आप वाकई इस खाते को हटाना चाहते हैं?",
+	"confirmDeleteUserAccount": "क्या आप वाकई इस उपयोगकर्ता खाते को हटाना चाहते हैं?",
+	"confirmEmptyForm": "क्या आप वाकई पृष्ठ को साफ़ करना चाहते हैं?",
+	"continue": "जारी रखना",
+	"copiedToClipboard": "क्लिपबोर्ड पर नकल",
+	"copyToClipboard": "क्लिपबोर्ड पर कॉपी करें",
+	"coreExportType": "मुख्य प्रारूप",
+	"countries": "देशों",
+	"country": "देश",
+	"countrySpecific": "देश-विशेष",
+	"cpuMeltinglyFast": "सीपीयू-पिघलने वाला तेज़",
+	"createAccount": "खाता बनाएं",
+	"currentPassword": "वर्तमान पासवर्ड",
+	"currentVersion": "वर्तमान संस्करण संपादित किया जा रहा है",
+	"dataGenerated": "डेटा जनरेट किया गया।",
+	"dataSet": "डेटा सेट",
+	"dataSetHelp": "यह वह जगह है जहां आप परिभाषित करते हैं कि आप किस प्रकार का डेटा उत्पन्न करना चाहते हैं। एक या दो पंक्ति भरने का प्रयास करें और जनरेट बटन पर क्लिक करें। आप इसे बहुत जल्दी पकड़ लेंगे।",
+	"dataSetLoaded": "डेटा सेट लोड किया गया है।",
+	"dataSetName": "डेटा सेट का नाम",
+	"dataSetNameDesc": "अपने डेटा सेट को नाम देने के लिए यहां टेक्स्ट पर क्लिक करें। कृपया ध्यान दें कि अपने डेटा सेट को नाम देने के लिए आपको साइट पर एक खाते और लॉग इन होने की आवश्यकता होगी। जब आप अपने डेटा सेट सहेजते हैं, तो यह नाम आपको उन पर नज़र रखने के लिए एक सुविधाजनक लेबल देता है।",
+	"dataSetNameUpdated": "डेटा सेट का नाम अपडेट कर दिया गया है।",
+	"dataSetOptions": "डेटा सेट विकल्प",
+	"dataSetReverted": "आपका डेटा सेट चयनित पुराने संस्करण में वापस कर दिया गया है।",
+	"dataSetSaved": "आपका डेटा सेट सहेज लिया गया है।",
+	"dataSets": "डेटा सेट",
+	"dataType": "डाटा प्रकार",
+	"dataTypeDesc": "यह एक ड्रॉपडाउन है जिसमें सभी उपलब्ध डेटा प्रकार हैं। जब आप कोई मान चुनते हैं, तो वह उस पंक्ति के शेष स्तंभों को अपडेट कर देगा। अनुकूलन की अनुमति देने के लिए प्रत्येक डेटा प्रकार की अपनी अनूठी सेटिंग्स होती हैं।",
+	"dataTypes": "जानकारी का प्रकार",
+	"dateAccountCreated": "दिनांक खाता बनाया गया",
+	"dateCreated": "निर्माण की तिथि",
+	"defaultLanguage": "डिफ़ॉल्ट भाषा",
+	"delete": "हटाएं",
+	"delete1DataSet": "1 डेटा सेट हटाएं",
+	"deleteAccount": "खाता हटा दो",
+	"deleteDataSet": "डेटा सेट हटाएं",
+	"deleteDataSetConfirm": "क्या आप वाकई इस डेटा सेट को हटाना चाहते हैं?",
+	"deleteRow": "पंक्ति को हटाएं",
+	"deleteRowDesc": "अंतिम कॉलम में एक डिलीट आइकन होता है। इसे क्लिक करने से पंक्ति हट जाएगी।",
+	"developer": "डेवलपर",
+	"developerDoc": "डेवलपर दस्तावेज़",
+	"disabled": "विकलांग",
+	"documentation": "प्रलेखन",
+	"download": "डाउनलोड",
+	"edit": "संपादित करें",
+	"editAccount": "खाता संपादित करें",
+	"editExportTypePage": "जब आप निर्यात प्रकार बटन पर क्लिक करते हैं, तो एक पूर्ण-पृष्ठ दृश्य दिखाई देता है जिसमें बाईं ओर कॉन्फ़िगरेशन विकल्प और दाईं ओर पूर्वावलोकन पैनल होता है।",
+	"editExportTypePageConfig": "आइए कॉन्फ़िगरेशन विकल्पों को देखें।",
+	"editExportTypeSettings": "कृपया अपनी निर्यात प्रकार सेटिंग संपादित करें.",
+	"editingExportTypes": "निर्यात प्रकार संपादित करना",
+	"email": "ईमेल",
+	"emailFooterDisclaimer": "यदि आपको यह ईमेल गलती से प्राप्त हुआ है तो कृपया साइट व्यवस्थापक से संपर्क करें।",
+	"emailIntroLineWithName": "नमस्ते %1,",
+	"emailLabel": "ईमेल:",
+	"emailNotSent": "हम ईमेल सूचना भेजने में असमर्थ थे।",
+	"emailUserLoginInfo": "उपयोगकर्ता को उनकी लॉगिन जानकारी ईमेल करें",
+	"enterEmailAddressToResetPassword": "अपने पासवर्ड को रीसेट करने के लिए अपना ईमेल पता नीचे दर्ज करें।",
+	"enterUserAccountDetails": "कृपया नीचे अपना उपयोगकर्ता खाता विवरण दर्ज करें।",
+	"errorCreatingAccount": "यह खाता बनाते समय एक त्रुटि हुई थी।",
+	"estimatedSize": "अनुमानित आकार:",
+	"estimatedTime": "अनुमानित समय:",
+	"europe": "यूरोप",
+	"example": "उदाहरण",
+	"exampleColumn": "उदाहरण कॉलम",
+	"exampleColumnDesc": "पंक्ति के लिए आपके द्वारा चुने गए डेटा प्रकार के आधार पर इस कॉलम में सामग्री हो भी सकती है और नहीं भी। यह कुछ डेटा प्रकारों के लिए पूर्व निर्धारित उदाहरण प्रदान करने का एक सुविधाजनक तरीका है कि उनका उपयोग कैसे किया जा सकता है। उदाहरण के लिए, नाम कॉलम विभिन्न नाम प्रारूपों का ड्रॉपडाउन प्रदान करता है। सभी डेटा प्रकारों के लिए, आप अभी भी इसे विकल्प कॉलम के माध्यम से मैन्युअल रूप से कॉन्फ़िगर कर सकते हैं: यह वास्तव में आपको जितनी जल्दी हो सके गति प्रदान करने के लिए एक समय बचाने वाला उपकरण है।",
+	"examples": "उदाहरण",
+	"exit": "बाहर जाएं",
+	"expired": "समय सीमा समाप्त",
+	"expiryDate": "समाप्ति तिथि",
+	"exportType": "निर्यात प्रकार",
+	"exportTypeBtnDesc": "पैनल के ऊपरी-बाएँ बटन वह जगह है जहाँ आप उस डेटा के प्रारूप को चुनने और कॉन्फ़िगर करने के लिए जाते हैं जिसे आप जनरेट करना चाहते हैं। यहाँ इसे टाइपस्क्रिप्ट पर सेट किया गया है।",
+	"exportTypeOptionsSql": "निर्यात प्रकार विकल्प: SQL",
+	"exportTypeOptionsSqlDesc": "जैसा कि आप देख सकते हैं, SQL में कई अन्य फ़ील्ड हैं जो इस निर्यात प्रकार के लिए विशिष्ट हैं। अन्य निर्यात प्रकारों की अलग-अलग सेटिंग्स होती हैं।",
+	"exportTypeOptionsTs": "निर्यात प्रकार विकल्प: टाइपप्रति",
+	"exportTypeOptionsTsDesc": "चयनित निर्यात प्रकार के आधार पर, पैनल के मुख्य भाग में अतिरिक्त विकल्प हो सकते हैं। यहां टाइपस्क्रिप्ट के साथ दो फ़ील्ड हैं, जिससे आप प्रकार के नाम और निर्यात किए गए चर नाम को अनुकूलित कर सकते हैं।",
+	"exportTypeOptionsTsDesc2": "अब SQL को देखते हैं।",
+	"exportTypeSelection": "निर्यात प्रकार चयन",
+	"exportTypeSelectionDesc": "प्रारूप ड्रॉपडाउन आपको जेनरेट की गई सामग्री के लिए प्रारूप चुनने देता है। कई विकल्प हैं, उनमें से कुछ मुख्य प्रकार हैं: SQL, CSV, SQL, JSON और अन्य, और उनमें से कुछ विशिष्ट प्रोग्रामिंग भाषाओं के लिए डेटा उत्पन्न करने के लिए हैं।",
+	"exportTypes": "निर्यात प्रकार",
+	"filterDataTypes": "फ़िल्टर डेटा प्रकार",
+	"financial": "वित्तीय",
+	"firstName": "पहला नाम",
+	"forgottenYourPasswordQ": "पासवर्ड भूल गया?",
+	"format": "प्रारूप",
+	"generate": "उत्पन्न",
+	"generateBtnDesc": "एक बार जब आप अपने डेटा सेट को कॉन्फ़िगर करना समाप्त कर लेते हैं और पुष्टि कर लेते हैं कि यह आपकी इच्छानुसार दिखता है, तो यह मात्रा में कुछ डेटा उत्पन्न करने का समय है! अपना डेटा जेनरेट करने के लिए इस बटन पर क्लिक करें। डेटा ग्रिड में पंक्तियों की संख्या और आपके द्वारा जेनरेट की जाने वाली पंक्तियों की संख्या के आधार पर, इसमें कुछ समय लग सकता है।",
+	"generated": "जनरेट किया गया",
+	"generatedC": "उत्पन्न:",
+	"generator": "जनक",
+	"geo": "भू",
+	"grid": "ग्रिड",
+	"gridPanelTourDesc1": "ग्रिड पैनल वह जगह है जहां आप उस डेटा का निर्माण करते हैं जिसे आप जनरेट करना चाहते हैं। यहां आप विभिन्न डेटा प्रकारों के बीच चयन कर सकते हैं कि वे कैसे कॉन्फ़िगर किए गए हैं और जिस क्रम में वे दिखाई देते हैं। यहाँ उदाहरण में, हमारे पास पाँच फ़ील्ड हैं: नाम, फ़ोन, ईमेल, सड़क का पता और शहर।",
+	"gridPanelTourDesc2": "इस खंड के बारे में अधिक विस्तृत जानकारी के लिए ग्रिड पैनल पर भ्रमण देखें।",
+	"gridPanelTourIntroDesc1": "ग्रिड पैनल वह जगह है जहां आप परिभाषित करते हैं कि आप कौन सा डेटा जेनरेट करना चाहते हैं। इस दौरे के लिए, हमने थोड़ा और स्थान देने के लिए पूर्वावलोकन पैनल (पृष्ठ के नीचे दाईं ओर स्थित अनियंत्रित \"पूर्वावलोकन\" बटन देखें) छिपा दिया है। हमने अलग-अलग डेटा प्रकारों की 10 पंक्तियाँ भी जोड़ी हैं, केवल उदाहरण के लिए।",
+	"gridPanelTourIntroDesc2": "आइए ग्रिड कॉलम से शुरू करें।",
+	"help": "मदद",
+	"helpIcon": "सहायता चिह्न",
+	"helpIconDesc": "जब आप पिछले कॉलम में डेटा प्रकार चुनते हैं, तो यहां एक आइकन दिखाई देगा। इसे क्लिक करने से उपयोग की जानकारी वाला एक सहायता संवाद खुल जाता है।",
+	"hide": "छिपाना",
+	"hideShowGrid": "ग्रिड छुपाएं/दिखाएं",
+	"hideShowPreviewPanel": "पूर्वावलोकन पैनल छुपाएं/दिखाएं",
+	"history": "इतिहास",
+	"historyPanelDesc": "यह पैनल डेटा सेट में किए गए परिवर्तनों का इतिहास दिखाता है। पुराने संस्करणों की जांच करने के लिए व्यू बटन पर क्लिक करें। किसी पुराने संस्करण पर वापस जाने के लिए, बस इसे देखें, फिर \"इस संस्करण पर वापस लौटें\" बटन पर क्लिक करें।",
+	"hostName": "होस्ट का नाम",
+	"humanData": "मानव डेटा",
+	"ifWantToReregister": "यदि आप फिर से पंजीकरण करना चाहते हैं तो कृपया यहां जाएं:",
+	"incomplete": "अधूरा",
+	"install": "इंस्टॉल",
+	"introToGenerator": "जेनरेटर का परिचय",
+	"introToGeneratorDesc": "यह टूर आपको डेटा जेनरेटर की मुख्य विशेषताओं का उच्च-स्तरीय परिचय देता है। आएँ शुरू करें!",
+	"invalidSettings": "अमान्य सेटिंग!",
+	"language": "अंग्रेज़ी",
+	"lastEdited": "अंतिम संपादित",
+	"lastLoggedIn": "पिछला लॉग इन",
+	"lastModified": "अंतिम बार संशोधित",
+	"lastName": "उपनाम",
+	"lastSaved": "पिछली बार सहेजा गया",
+	"lineWrapping": "लाइन रैपिंग",
+	"linkToDataSet": "डेटा सेट से लिंक करें",
+	"linkToThisDataSet": "इस डेटा सेट से लिंक करें",
+	"live": "रहना",
+	"load": "भार",
+	"loading": "लोड हो रहा है...",
+	"login": "लॉग इन करें",
+	"loginToSave": "अपने डेटा सेट को सहेजने के लिए आपको पहले एक खाते की आवश्यकता होगी। कृपया नीचे लॉगिन करें।",
+	"loginOrRegisterToSave": "अपने डेटा सेट को सहेजने के लिए आपको पहले एक खाते की आवश्यकता होगी। कृपया नीचे लॉग इन या रजिस्टर करें।",
+	"loginUrlLabel": "लॉगिन यूआरएल:",
+	"logout": "लॉग आउट",
+	"makeDataSetPublicAgreement": "मैं समझता हूं कि इस डेटा सेट को साझा करने के लिए, मुझे इसे सार्वजनिक करने की आवश्यकता है।",
+	"metaDescription": "Generateata.com: परीक्षण सॉफ्टवेयर के लिए मुफ़्त, GNU-लाइसेंस प्राप्त, यादृच्छिक कस्टम डेटा जनरेटर",
+	"metaKeywords": "रैंडम डेटा, टेस्ट डेटा, नमूना डेटा, डेटा जनरेटर, डेटा उत्पन्न करें",
+	"missingDataSetName": "कृपया अपने डेटा सेट का नाम दर्ज करें",
+	"nameColumn": "नाम कॉलम",
+	"nameColumnDesc": "पूर्वावलोकन पैनल (एक्सएमएल, सीएसवी इत्यादि) में आपके द्वारा चुने गए निर्यात प्रकार के आधार पर इस कॉलम को एक अलग शीर्षक मिलता है। इस कॉलम का उद्देश्य पंक्ति के लिए एक पहचानकर्ता प्रदान करना है जिसका उपयोग तब उत्पन्न डेटा में किया जा सकता है। उदाहरण के लिए, XML इस मान का उपयोग XML नोड नाम के रूप में करता है; JSON इसे JSON गुण नाम के रूप में उपयोग करता है; SQL डेटाबेस कॉलम नाम के लिए इसका उपयोग करता है। यह सुनिश्चित करने के लिए कि यह चयनित निर्यात प्रकार के लिए मान्य है, एप्लिकेशन आपके द्वारा यहां दर्ज किए गए मान को स्वचालित रूप से मान्य करेगा।",
+	"newDataSet": "नया डेटा सेट",
+	"no": "नहीं",
+	"noAccountsCreated": "कोई खाता नहीं बनाया गया है।",
+	"noAdditionalSettings": "कोई अतिरिक्त सेटिंग नहीं।",
+	"noDataSetsSaved": "आपके पास कोई डेटा सेट सहेजा नहीं गया है।",
+	"noExamplesAvailable": "कोई उदाहरण उपलब्ध नहीं है।",
+	"noExpiry": "कोई समाप्ति नहीं",
+	"noHistory": "अभी तक कोई इतिहास नहीं।",
+	"noOptionsAvailable": "कोई विकल्प उपलब्ध नहीं है।",
+	"noSafari": "क्षमा करें, सफारी नहीं!",
+	"northAmerica": "उत्तरी अमेरिका",
+	"nowLoggedIn": "आप लॉग इन हो गए हैं।",
+	"nowLoggedOut": "आप लॉग आउट हो चुके हैं।",
+	"numResults": "संख्या परिणाम",
+	"numeric": "संख्यात्मक",
+	"oceania": "ओशिनिया",
+	"oneTimePasswordLogin": "आपने वन-टाइम पासवर्ड का उपयोग करके लॉग इन किया है। कृपया अभी एक नया सेट करें अन्यथा आप फिर से लॉग इन नहीं कर पाएंगे।",
+	"open": "खोलना",
+	"options": "विकल्प",
+	"optionsColumn": "विकल्प कॉलम",
+	"optionsColumnDesc1": "इस कॉलम में इस पंक्ति के डेटा प्रकार के लिए सभी कॉन्फ़िगरेशन विकल्प हैं। कुछ डेटा प्रकारों में इतनी कम जगह (जैसे देश, क्षेत्र) में दिखाने के लिए बहुत अधिक कॉन्फ़िगरेशन सेटिंग्स होती हैं, इसलिए वे ग्रिड में केवल एक बटन दिखा सकते हैं जो सभी विकल्पों वाला एक डायलॉग खोलता है।",
+	"optionsColumnDesc2": "यहां दिखाए गए नाम डेटा प्रकार के लिए, कॉलम में एक एकल निर्माण योग्य गोली फ़ील्ड है। यह डेटा जेनरेटर में एक सामान्य फ़ील्ड प्रकार है। यह आपको केवल इसमें टाइप करके और <enter> क्लिक करके आइटम जोड़ने देता है। यह तब उन वस्तुओं को अलग-अलग गोलियों में परिवर्तित करता है जिन्हें \"x\" आइकन के माध्यम से हटाया जा सकता है।",
+	"or": "या",
+	"order": "आदेश",
+	"other": "अन्य",
+	"overMaxAnonRows": "क्षमा करें, आप केवल %1 पंक्तियाँ उत्पन्न कर सकते हैं। बड़ी मात्रा में डेटा उत्पन्न करने के लिए आपको इस साइट पर एक उपयोगकर्ता खाते की आवश्यकता होगी।",
+	"panelContents": "पैनल सामग्री",
+	"panelContentsDesc": "पूर्वावलोकन पैनल के बड़े हिस्से में आपके द्वारा ग्रिड पैनल में निर्दिष्ट डेटा और चयनित निर्यात प्रकार सेटिंग के अनुसार जनरेट किए गए डेटा का एक नमूना होता है। यहां यह टाइपस्क्रिप्ट प्रारूप में 5 अलग-अलग डेटा प्रकार (देश, क्षेत्र, शहर, सड़क का पता और डाक/ज़िप) उत्पन्न कर रहा है।",
+	"panelControls": "पैनल नियंत्रण",
+	"panelControlsClearIconDesc": "पैनल नियंत्रणों में अंतिम आइकन आपको पृष्ठ को साफ़ करने देता है ताकि आप नए सिरे से शुरुआत कर सकें।",
+	"panelControlsDesc": "पैनल नियंत्रण बटन आपको ग्रिड और पूर्वावलोकन पैनल को छिपाने/दिखाने की सुविधा देते हैं जो कि यदि आप सीमित स्क्रीन रियल एस्टेट के साथ काम कर रहे हैं तो सहायक हो सकते हैं। आप तीसरे आइकन का उपयोग करके एक दूसरे के सापेक्ष (बाएं-दाएं, ऊपर-नीचे) दो पैनलों के प्लेसमेंट को भी टॉगल कर सकते हैं।",
+	"panelTabs": "पैनल टैब",
+	"panelTabsDesc": "अंत में, आपने देखा होगा कि पैनल दो टैब में व्यवस्थित है। डिफ़ॉल्ट रूप से यह सेटिंग टैब दिखाता है, क्योंकि यही वह जगह है जहां आप जाना चाहते हैं। लेकिन एक दूसरा \"पूर्वावलोकन\" टैब भी है जिसमें पूर्वावलोकन पैनल की उपस्थिति बदलने के लिए सेटिंग्स शामिल हैं: थीम, लाइन नंबर छुपाना/दिखाना, लाइन रैपिंग टॉगल करना, टेक्स्ट आकार बदलना और जेनरेट की गई पंक्तियों की संख्या को नियंत्रित करना।",
+	"password": "पासवर्ड",
+	"passwordLabel": "पासवर्ड:",
+	"passwordReset": "पासवर्ड रीसेट",
+	"passwordResetAccountExpired": "पासवर्ड रीसेट - खाता समाप्त हो गया",
+	"passwordResetAccountExpiredDesc": "हमें अभी आपका पासवर्ड रीसेट करने का अनुरोध प्राप्त हुआ है, हालांकि आपका खाता पहले ही समाप्त हो चुका है।",
+	"passwordResetComplete": "आपका पासवर्ड रीसेट कर दिया गया है और आपको नया पासवर्ड ईमेल कर दिया गया है।",
+	"passwordResetEmailContent1": "आपका पासवर्ड रिसेट कर दिया गया है। लॉग इन करने के लिए आप निम्न पासवर्ड का उपयोग कर सकते हैं: %1",
+	"passwordResetEmailContent2": "लॉग इन करने के बाद कृपया इसे बदल दें।",
+	"passwordResetEmailDesc": "हमें आपका पासवर्ड रीसेट करने का अनुरोध प्राप्त हुआ है। इस ईमेल में एक अस्थायी वन-टाइम पासवर्ड है जिसका उपयोग आप लॉग इन करने के लिए कर सकते हैं। लॉग इन करने के बाद, आपको एक नया पासवर्ड सेट करना होगा।",
+	"passwordResetMsg": "यदि ईमेल फ़ाइल में था, तो आपका पासवर्ड रीसेट कर दिया गया है और आपको अस्थायी लॉगिन जानकारी ईमेल कर दी गई है।",
+	"passwordUpdateInvalidPassword": "आपका वर्तमान पासवर्ड गलत है। कृपया पुनः दर्ज करें।",
+	"passwordUpdated": "आपका पासवर्ड बदला जा चुका है।",
+	"pause": "ठहराव",
+	"pleaseConfirm": "कृपया पुष्टि करें",
+	"pleaseEnterAll": "कृपया सभी दर्ज करें",
+	"pleaseEnterDataSetName": "कृपया नए डेटा सेट का नाम दर्ज करें।",
+	"pleaseFixErrors": "कृपया निम्न त्रुटियों को ठीक करें और पुनः सबमिट करें:",
+	"pleaseLogin": "कृपया लॉगिन करें",
+	"pleaseSelect": "कृपया चयन कीजिए",
+	"plugins": "प्लग-इन",
+	"pressEnterAddItem": "आइटम जोड़ने के लिए एंटर दबाएं",
+	"preview": "पूर्वावलोकन",
+	"previewPanel": "पूर्वावलोकन पैनल",
+	"previewPanelControlsDesc": "पैनल के ऊपर दाईं ओर दो आइकन हैं। पहला आइकन पैनल को रीफ्रेश करता है, हर बार अलग-अलग यादृच्छिक डेटा उत्पन्न करता है - इससे आपको यह पता लगाने में मदद मिलती है कि यह किस प्रकार का डेटा उत्पन्न करता है। दूसरा आइकन पैनल को पूरी तरह से बंद कर देता है। आप पृष्ठ के नीचे दाईं ओर अनुभाग का उपयोग करके कभी भी पैनल को फिर से दिखा सकते हैं (बस \"पूर्वावलोकन\" चेकबॉक्स को फिर से चुनें)।",
+	"previewPanelDesc": "जब आप इसे ग्रिड पैनल के माध्यम से बना रहे हों, तब यह पैनल आपको आपके द्वारा जेनरेट किए जा रहे डेटा का लाइव पूर्वावलोकन देता है। ऊपर-बाईं ओर बटन जनरेट किए जा रहे डेटा के चयनित प्रारूप (जैसे SQL, XML, CSV आदि) को दिखाता है। प्रारूप बदलने के लिए, बस बटन पर क्लिक करें।",
+	"previewPanelMoreInfo": "इस पैनल के बारे में अधिक जानकारी के लिए, प्रीव्यू पैनल टूर देखें।",
+	"previewPanelNoData": "कोई आकड़ा उपलब्ध नहीं है!",
+	"previewPanelTourDesc": "पूर्वावलोकन पैनल आपको उस डेटा का एक जीवंत, दृश्य प्रतिनिधित्व देता है जिसे आप बनाते समय उत्पन्न कर रहे हैं। यह दौरा पैनल के काम करने के तरीके का एक त्वरित परिचय देता है।",
+	"previewRows": "पूर्वावलोकन पंक्तियों",
+	"private": "निजी",
+	"problemLoadingTour": "क्षमा करें, भ्रमण लोड करने में एक समस्या हुई.",
+	"programmingLanguages": "प्रोग्रामिंग की भाषाएँ",
+	"province": "प्रांत",
+	"public": "सह लोक",
+	"publicQ": "सह लोक?",
+	"reenterPassword": "पासवर्ड फिर से दर्ज करें",
+	"refreshPage": "पृष्ठ ताज़ा करें",
+	"refreshPanel": "पैनल ताज़ा करें",
+	"register": "रजिस्टर करें",
+	"remainingTime": "शेष समय:",
+	"requiredField": "आवश्यक क्षेत्र",
+	"revertToVersion": "इस संस्करण पर वापस जाएं",
+	"row": "पंक्ति",
+	"rowLabel": "कॉलम शीर्षक",
+	"rowLabelPlural": "कॉलम शीर्षक",
+	"rowNumDesc1": "ग्रिड में पहला कॉलम पंक्ति संख्या दिखाता है। पंक्ति को फिर से व्यवस्थित करने के लिए, बस इस तत्व को ऊपर या नीचे क्लिक करें और खींचें।",
+	"rowNumDesc2": "इस कॉलम का हेडर मान आपके ग्रिड में पंक्तियों की कुल संख्या दिखाता है। यह तब आसान हो सकता है जब आपके पास वास्तव में बड़े डेटा सेट हों और यह स्क्रीन पर फ़िट होने के लिए बहुत बड़ा हो।",
+	"rowNumber": "पंक्ति नंबर",
+	"rowSp": "पंक्ति",
+	"rows": "पंक्तियों",
+	"rowsGenerated": "पंक्तियाँ उत्पन्न",
+	"rowsGeneratedPerSecond": "प्रति सेकंड उत्पन्न पंक्तियाँ",
+	"safariExplanation": "इस साइट को आधुनिक वेब मानकों को लागू करने वाले अप-टू-डेट वेब ब्राउज़र की आवश्यकता है। दुर्भाग्य से सफारी अन्य ब्राउज़रों से पीछे रह गई है और इस स्क्रिप्ट को नहीं चलाएगी। जब तक हम यह नहीं समझ लेते कि इसे कैसे समायोजित किया जाए, कृपया निम्न में से किसी एक ब्राउज़र का उपयोग करें। डाउनलोड के लिए सभी मुफ्त।",
+	"save": "सहेजें",
+	"saveAs": "के रूप रक्षित करें",
+	"saveButtonDesc": "यदि आपके पास साइट पर एक उपयोगकर्ता खाता है तो यह बटन आपके डेटा सेट को सहेज लेगा। यदि आप लॉग इन नहीं हैं, तो इसे क्लिक करने से आपको पहले लॉग इन करने के लिए संकेत मिलेगा। सिस्टम डेटा सेट में पिछले %1 परिवर्तनों का इतिहास रखता है, ताकि आप हमेशा वापस जा सकें और पुराने संस्करण देख सकें।",
+	"saveDataSetNewName": "डेटा सेट को नए नाम के रूप में सहेजें",
+	"seconds": "सेकंड",
+	"seeHelpDialog": "सहायता संवाद देखें।",
+	"selectCountry": "देश चुनें",
+	"selectDataType": "डेटा प्रकार चुनें",
+	"selectEllipsis": "चुनते हैं...",
+	"selectExpiryDate": "समाप्ति तिथि चुनें",
+	"selectLanguage": "भाषा चुने",
+	"sendEmail": "ईमेल भेजें",
+	"seriouslySlow": "गंभीर रूप से धीमा",
+	"settings": "समायोजन",
+	"showGrid": "ग्रिड दिखाएं",
+	"showLineNumbers": "लाइन नंबर दिखाएं",
+	"showPreview": "पूर्वावलोकन दिखाएँ",
+	"siteLogo": "साइट लोगो",
+	"size": "आकार:",
+	"southAmerica": "दक्षिण अमेरिका",
+	"status": "स्थिति",
+	"stripWhitespace": "जेनरेट की गई सामग्री से व्हाइटस्पेस स्ट्रिप करें",
+	"success": "सफलता",
+	"text": "मूलपाठ",
+	"textSize": "शब्दों का आकर",
+	"theDataSetName": "डेटा सेट का नाम",
+	"theExportTypeBtn": "निर्यात प्रकार बटन",
+	"theGenerateButton": "जनरेट बटन",
+	"theGridPanel": "ग्रिड पैनल",
+	"thePreviewPanel": "पूर्वावलोकन पैनल",
+	"theSaveButton": "सहेजें बटन",
+	"theme": "विषय",
+	"togglePanelLayout": "पैनल लेआउट टॉगल करें",
+	"totalNumGeneratedRows": "कुल संख्या उत्पन्न पंक्तियाँ",
+	"tourComplete": "यात्रा पूर्ण",
+	"tourCompleteDesc": "सब कुछ कर दिया! जारी रखने के लिए नीचे दिए गए बटनों में से एक चुनें।",
+	"tourIntroPara1": "यह उपकरण बहुत अधिक कार्यक्षमता प्रदान करता है और यह पहली बार में थोड़ा भारी हो सकता है। उस विशेष सुविधा के बारे में भ्रमण करने के लिए दाईं ओर किसी एक बटन पर क्लिक करें।",
+	"tourIntroPara2": "ध्यान दें कि जब टूर शुरू होता है, तो यह इंटरफ़ेस के बारे में कुछ चीजों को स्पष्ट करने के लिए जनरेटर पेज की सामग्री को अस्थायी रूप से अधिलेखित कर देता है। लेकिन चिंता मत करो! जैसे ही टूर समाप्त होता है, यह आपके डेटा को उसकी मूल स्थिति में लौटा देता है।",
+	"tryDifferentTour": "कोई भिन्न भ्रमण आज़माएं",
+	"update": "अद्यतन",
+	"updateAccount": "खाता अद्यतन करें",
+	"user": "उपयोगकर्ता",
+	"userAccount": "उपभोक्ता खाता",
+	"userAccountNotFound": "क्षमा करें, हम आपका खाता नहीं ढूंढ सके।",
+	"userAccountUpdated": "उपयोगकर्ता खाता अपडेट कर दिया गया है।",
+	"userAccounts": "उपयोगकर्ता खाते",
+	"userNotFound": "क्षमा करें, हम आपको पहचानने में असमर्थ रहे। कृपया अपनी साख जांचें।",
+	"validationAccountAlreadyExists": "क्षमा करें, उस ईमेल पते वाला एक खाता पहले से मौजूद है",
+	"validationDifferentNewPasswords": "अपने पासवर्ड का मिलान सुनिश्चित करें",
+	"validationInvalidEmail": "कृपया एक वैध ई - मेल एड्रेस डालें",
+	"validationNoCurrentPassword": "कृपया अपना वर्तमान पासवर्ड दर्ज करें",
+	"validationNoEmail": "कृपया अपना पूरा ईमेल दर्ज करें",
+	"validationNoFirstName": "कृपया अपना प्रथम नाम प्रविष्ट करें",
+	"validationNoLastName": "कृपया अपना अंतिम नाम दर्ज करें",
+	"validationNoPassword": "अपना पासवर्ड दर्ज करें",
+	"version": "संस्करण",
+	"view": "राय",
+	"viewChangelog": "परिवर्तन लॉग देखें",
+	"viewOnGithub": "गीथूब पर देखें",
+	"welcomeToTheGenerator": "जनरेटर में आपका स्वागत है!",
+	"yes": "हां",
+	"yourAccount": "आपका खाता",
+	"yourAccountUpdated": "आपका खाता नवीनीकृत हो चुका है।",
+	"yourUserAccount": "आपका उपयोगकर्ता खाता"
+}
\ No newline at end of file
diff --git a/apps/client/src/i18n/ja.json b/apps/client/src/i18n/ja.json
new file mode 100644
index 000000000..48a2e33af
--- /dev/null
+++ b/apps/client/src/i18n/ja.json
@@ -0,0 +1,329 @@
+{
+	"abort": "アボート",
+	"about": "約",
+	"aboutInfoPara1": "generateata.comは、旧石器時代後期（2004年頃）に私が作成したオープンソースプロジェクトであり、その存続期間にわたって多くの貢献者がいます。 数年ごとに、最新かつ最高の利用可能なテクノロジーを使用して書き直しています。このバージョンは2021年に完成し、React、Redux、Typescript、GraphQL、Docker、Webワーカー、輪ゴム、ダクトテープ、そしてたくさんの呪いで作られました。",
+	"aboutInfoPara2": "プロジェクトはgithubにあります。 ダウンロードするか、フォークするか、気軽に投稿してください。 楽しい！",
+	"aboutThisScript": "このスクリプトについて",
+	"accountCreated": "アカウントが作成されました",
+	"accountCreatedDesc": "アカウントが作成されました。",
+	"accountCreatedMsg": "アカウントが作成されました。",
+	"accountDeleted": "アカウントが削除されました。",
+	"accountDisabled": "アカウントが無効になっています",
+	"accountExpiredMsg": "申し訳ありませんが、アカウントの有効期限が切れています。",
+	"accountExpiryDate": "アカウントの有効期限",
+	"accountInfo": "アカウント情報",
+	"accountSettings": "アカウント設定",
+	"accountType": "口座の種類",
+	"accounts": "アカウント",
+	"add": "追加",
+	"addRowsDesc": "データグリッドに行を追加するには、ページの下部にあるフォームを使用するだけです。 フィールドがたくさんある場合、このセクションはページの外に隠れている可能性があるため、フォームを表示するにはパネルを一番下までスクロールする必要があります。",
+	"addSomeDataDesc": "グリッドにいくつかの行を追加します。",
+	"admin": "管理者",
+	"adminAccount": "管理者アカウント",
+	"administrator": "管理者",
+	"africa": "アフリカ",
+	"allCountries": "全ての国々",
+	"allDataTypePlugins": "すべてのデータ型プラグイン",
+	"allExportTypePlugins": "すべてのエクスポートタイププラグイン",
+	"anonymousAccess": "匿名アクセス",
+	"asia": "アジア",
+	"back": "バック",
+	"backToLogin": "ログインに戻る",
+	"blog": "ブログ",
+	"cancel": "キャンセル",
+	"centralAmerica": "中米",
+	"changePassword": "パスワードを変更する",
+	"clear": "晴れ",
+	"clearPage": "ページをクリア",
+	"clearPageConfirmation": "ページをクリアしてもよろしいですか？ 行った変更はすべて失われます。",
+	"clearThePage": "ページをクリアする",
+	"clickExportTypeBtn": "次のステップは、ボタンをクリックするとどうなるかを示しています。",
+	"close": "閉じる",
+	"closePanel": "パネルを閉じる",
+	"columns": "列",
+	"columnsDesc": "グリッドには、使用可能な画面サイズに応じて、これらの列をできるだけ多く表示します。 小さすぎると、一部の列が非表示になり、コンテンツが不足している情報ヒントを開く歯車アイコンが表示されます。 次のいくつかの手順では、最初のNames行をデモンストレーションとして使用して、各列について説明します。",
+	"complete": "コンプリート",
+	"confirmDeleteAccount": "このアカウントを削除してもよろしいですか？",
+	"confirmDeleteUserAccount": "このユーザーアカウントを削除してもよろしいですか？",
+	"confirmEmptyForm": "ページをクリアしてもよろしいですか？",
+	"continue": "継続する",
+	"copiedToClipboard": "クリップボードにコピー",
+	"copyToClipboard": "クリップボードにコピー",
+	"coreExportType": "コアフォーマット",
+	"countries": "国",
+	"country": "国",
+	"countrySpecific": "国別",
+	"cpuMeltinglyFast": "CPU-とてつもなく速い",
+	"createAccount": "アカウントを作成する",
+	"currentPassword": "現在のパスワード",
+	"currentVersion": "編集中の現在のバージョン",
+	"dataGenerated": "生成されたデータ。",
+	"dataSet": "データセット",
+	"dataSetHelp": "ここで、生成するデータの種類を正確に定義します。 1行か2行入力して、[生成]ボタンをクリックしてみてください。 あなたはそれのこつをかなり速く得るでしょう。",
+	"dataSetLoaded": "データセットがロードされました。",
+	"dataSetName": "データセット名",
+	"dataSetNameDesc": "ここのテキストをクリックして、データセットに名前を付けます。 データセットに名前を付けるには、サイトにアカウントが必要であり、ログインする必要があることに注意してください。 データセットを保存するとき、この名前はそれらを追跡するための便利なラベルを提供します。",
+	"dataSetNameUpdated": "データセット名が更新されました。",
+	"dataSetOptions": "データセットオプション",
+	"dataSetReverted": "データセットは、選択した古いバージョンに戻されました。",
+	"dataSetSaved": "データセットが保存されました。",
+	"dataSets": "データセット",
+	"dataType": "データ・タイプ",
+	"dataTypeDesc": "これは、使用可能なすべてのデータ型を含むドロップダウンです。 値を選択すると、その行の残りの列が更新されます。 各データ型には、カスタマイズを可能にする独自の設定があります。",
+	"dataTypes": "データ型",
+	"dateAccountCreated": "アカウントが作成された日付",
+	"dateCreated": "作成日",
+	"defaultLanguage": "既定の言語",
+	"delete": "削除",
+	"delete1DataSet": "1つのデータセットを削除します",
+	"deleteAccount": "アカウントを削除する",
+	"deleteDataSet": "データセットの削除",
+	"deleteDataSetConfirm": "このデータセットを削除してもよろしいですか？",
+	"deleteRow": "行を削除する",
+	"deleteRowDesc": "最後の列には削除アイコンが含まれています。 クリックすると行が削除されます。",
+	"developer": "開発者",
+	"developerDoc": "開発者ドキュメント",
+	"disabled": "無効",
+	"documentation": "ドキュメンテーション",
+	"download": "ダウンロード",
+	"edit": "編集",
+	"editAccount": "アカウントの編集",
+	"editExportTypePage": "[エクスポートタイプ]ボタンをクリックすると、左側に構成オプション、右側にプレビューパネルを含む全ページビューが表示されます。",
+	"editExportTypePageConfig": "構成オプションを見てみましょう。",
+	"editExportTypeSettings": "エクスポートタイプの設定を編集してください。",
+	"editingExportTypes": "エクスポートタイプの編集",
+	"email": "Eメール",
+	"emailFooterDisclaimer": "このメールを誤って受け取った場合は、サイト管理者に連絡してください。",
+	"emailIntroLineWithName": "こんにちは%1、",
+	"emailLabel": "Eメール：",
+	"emailNotSent": "メール通知を送信できませんでした。",
+	"emailUserLoginInfo": "ログイン情報をユーザーにメールで送信する",
+	"enterEmailAddressToResetPassword": "パスワードをリセットするには、以下にメールアドレスを入力してください。",
+	"enterUserAccountDetails": "以下にユーザーアカウントの詳細を入力してください。",
+	"errorCreatingAccount": "このアカウントの作成中にエラーが発生しました。",
+	"estimatedSize": "推定サイズ:",
+	"estimatedTime": "予定時刻：",
+	"europe": "ヨーロッパ",
+	"example": "例",
+	"exampleColumn": "列の例",
+	"exampleColumnDesc": "この列には、行に選択したデータ型に応じてコンテンツが含まれる場合と含まれない場合があります。 これは、一部のデータ型がそれらの使用方法のプリセット例を提供するための便利な方法です。 たとえば、[名前]列には、さまざまな名前形式のドロップダウンがあります。 すべてのデータタイプについて、[オプション]列から手動で構成できます。これは、できるだけ早くスピードを上げるための本当に時間の節約になるデバイスです。",
+	"examples": "例",
+	"exit": "出口",
+	"expired": "期限切れ",
+	"expiryDate": "有効期限",
+	"exportType": "エクスポートタイプ",
+	"exportTypeBtnDesc": "パネルの左上にあるボタンは、生成するデータの形式を選択して構成するために移動する場所です。 ここではTypescriptに設定されています。",
+	"exportTypeOptionsSql": "エクスポートタイプオプション：SQL",
+	"exportTypeOptionsSqlDesc": "ご覧のとおり、SQLには、このエクスポートタイプに固有のフィールドが他にもたくさんあります。 他のエクスポートタイプには異なる設定があります。",
+	"exportTypeOptionsTs": "タイプオプションのエクスポート：Typescript",
+	"exportTypeOptionsTsDesc": "選択したエクスポートタイプによっては、パネル本体に追加のオプションが含まれる場合があります。 Typescriptには2つのフィールドがあり、タイプ名とエクスポートされた変数名をカスタマイズできます。",
+	"exportTypeOptionsTsDesc2": "それでは、SQLを見てみましょう。",
+	"exportTypeSelection": "エクスポートタイプの選択",
+	"exportTypeSelectionDesc": "[形式]ドロップダウンでは、生成されるコンテンツの形式を選択できます。 多くのオプションがあり、そのうちのいくつかはコアタイプです：SQL、CSV、SQL、JSONなど、そしてそれらのいくつかは特定のプログラミング言語のデータを生成するためのものです。",
+	"exportTypes": "エクスポートタイプ",
+	"filterDataTypes": "データ型をフィルタリングする",
+	"financial": "財務",
+	"firstName": "ファーストネーム",
+	"forgottenYourPasswordQ": "パスワードを忘れましたか？",
+	"format": "フォーマット",
+	"generate": "生む",
+	"generateBtnDesc": "データセットの構成が完了し、希望どおりに表示されることを確認したら、データを大量に生成します。 このボタンをクリックして、データを生成します。 データグリッドの行数と生成する行数によっては、時間がかかる場合があります。",
+	"generated": "生成された",
+	"generatedC": "生成された:",
+	"generator": "発生器",
+	"geo": "ジオ",
+	"grid": "グリッド",
+	"gridPanelTourDesc1": "グリッドパネルは、生成するデータを作成する場所です。 ここでは、さまざまなデータタイプ、それらの構成方法、およびそれらが表示される順序から選択できます。 この例では、名前、電話番号、電子メール、住所、市区町村の5つのフィールドがあります。",
+	"gridPanelTourDesc2": "このセクションの詳細については、グリッドパネルのツアーを参照してください。",
+	"gridPanelTourIntroDesc1": "グリッドパネルは、生成するデータを定義する場所です。 このツアーでは、プレビューパネルを非表示にして（ページの右下にあるチェックされていない[プレビュー]ボタンを参照）、もう少しスペースを確保しました。 また、説明のために、10行の異なるデータ型を追加しました。",
+	"gridPanelTourIntroDesc2": "グリッド列から始めましょう。",
+	"help": "助けて",
+	"helpIcon": "ヘルプアイコン",
+	"helpIconDesc": "前の列でデータ型を選択すると、ここにアイコンが表示されます。 それをクリックすると、使用法情報を含むヘルプダイアログが開きます。",
+	"hide": "隠す",
+	"hideShowGrid": "グリッドの表示/非表示",
+	"hideShowPreviewPanel": "プレビューパネルの表示/非表示",
+	"history": "歴史",
+	"historyPanelDesc": "このパネルには、データセットに加えられた変更の履歴が表示されます。 以前のバージョンを調べるには、[表示]ボタンをクリックします。 以前のバージョンに戻すには、それを表示してから、[このバージョンに戻す]ボタンをクリックします。",
+	"hostName": "ホスト名",
+	"humanData": "人間のデータ",
+	"ifWantToReregister": "再登録をご希望の場合は、以下をご覧ください。",
+	"incomplete": "不完全な",
+	"install": "インストール",
+	"introToGenerator": "ジェネレーターの紹介",
+	"introToGeneratorDesc": "このツアーでは、データジェネレーターの主な機能の概要を説明します。 始めましょう！",
+	"invalidSettings": "設定が無効です！",
+	"language": "日本語",
+	"lastEdited": "最終編集",
+	"lastLoggedIn": "最後にログインした",
+	"lastModified": "最終更新日",
+	"lastName": "苗字",
+	"lastSaved": "最後に保存された",
+	"lineWrapping": "行の折り返し",
+	"linkToDataSet": "データセットへのリンク",
+	"linkToThisDataSet": "このデータセットへのリンク",
+	"live": "住む",
+	"load": "負荷",
+	"loading": "読み込んでいます...",
+	"login": "ログインする",
+	"loginToSave": "データセットを保存するには、まずアカウントが必要です。 以下からログインしてください。",
+	"loginOrRegisterToSave": "データセットを保存するには、まずアカウントが必要です。 以下からログインまたは登録してください。",
+	"loginUrlLabel": "ログインURL：",
+	"logout": "ログアウト",
+	"makeDataSetPublicAgreement": "このデータセットを共有するには、公開する必要があることを理解しています。",
+	"metaDescription": "generatedata.com：ソフトウェアをテストするための無料のMITライセンスのランダムカスタムデータジェネレーター",
+	"metaKeywords": "ランダムデータ、テストデータ、サンプルデータ、データジェネレーター、データの生成",
+	"missingDataSetName": "データセットの名前を入力してください",
+	"nameColumn": "名前列",
+	"nameColumnDesc": "この列には、プレビューパネルで選択したエクスポートタイプ（XML、CSVなど）に応じて異なる見出しが表示されます。 この列の目的は、生成されたデータで使用できる行の識別子を提供することです。 たとえば、XMLはこの値をXMLノード名として使用します。 JSONはそれをJSONプロパティ名として使用します。 SQLはそれをデータベースの列名に使用します。 アプリケーションは、ここに入力した値を自動的に検証して、選択したエクスポートタイプに対して有効であることを確認します。",
+	"newDataSet": "新しいデータセット",
+	"no": "No",
+	"noAccountsCreated": "アカウントは作成されていません。",
+	"noAdditionalSettings": "追加設定なし",
+	"noDataSetsSaved": "データセットは保存されていません。",
+	"noExamplesAvailable": "利用可能な例はありません。",
+	"noExpiry": "有効期限なし",
+	"noHistory": "まだ歴史はありません。",
+	"noOptionsAvailable": "利用可能なオプションはありません。",
+	"noSafari": "申し訳ありませんが、Safariはありません！",
+	"northAmerica": "北米",
+	"nowLoggedIn": "ログインしました。",
+	"nowLoggedOut": "ログアウトしました。",
+	"numResults": "結果の数",
+	"numeric": "数値",
+	"oceania": "オセアニア",
+	"oneTimePasswordLogin": "ワンタイムパスワードを使用してログインしました。 今すぐ新しいパスワードを設定してください。",
+	"open": "開いた",
+	"options": "オプション",
+	"optionsColumn": "オプション列",
+	"optionsColumnDesc1": "この列には、この行のデータ型のすべての構成オプションが含まれています。 一部のデータ型では、構成設定が多すぎてこのような小さなスペース（国、地域など）に表示できないため、すべてのオプションを含むダイアログを開くボタンがグリッドに表示される場合があります。",
+	"optionsColumnDesc2": "ここに示されているNamesData Typeの場合、列には単一のCreatablePillフィールドが含まれています。 これは、データジェネレータの一般的なフィールドタイプです。 入力して<Enter>をクリックするだけでアイテムを追加できます。 次に、それらのアイテムを「x」アイコンで削除できる個別のピルに変換します。",
+	"or": "または",
+	"order": "注文",
+	"other": "その他",
+	"overMaxAnonRows": "生成されたコンテンツから空白を取り除く",
+	"panelContents": "パネルの内容",
+	"panelContentsDesc": "プレビューパネルの大部分には、グリッドパネルで指定したデータと選択したエクスポートタイプの設定に従って、生成されたデータのサンプルが含まれています。 ここでは、Typescript形式で5つの異なるデータタイプ（国、地域、市、番地、郵便番号）を生成しています。",
+	"panelControls": "パネルコントロール",
+	"panelControlsClearIconDesc": "パネルコントロールの最後のアイコンを使用すると、ページをクリアして、最初からやり直すことができます。",
+	"panelControlsDesc": "パネルコントロールボタンを使用すると、グリッドパネルとプレビューパネルを表示/非表示にできます。これは、限られた画面領域で作業している場合に役立ちます。 3番目のアイコンを使用して、2つのパネルの相対的な配置（左右、上下）を切り替えることもできます。",
+	"panelTabs": "パネルタブ",
+	"panelTabsDesc": "最後に、パネルが2つのタブに編成されていることに気付いたかもしれません。 デフォルトでは、[設定]タブが表示されます。これは、このタブに移動する可能性が最も高いためです。 ただし、プレビューパネルの外観を変更するための設定を含む2番目の[プレビュー]タブもあります。テーマ、行番号の非表示/表示、行の折り返しの切り替え、テキストサイズの変更、生成される行数の制御です。",
+	"password": "パスワード",
+	"passwordLabel": "パスワード：",
+	"passwordReset": "パスワードのリセット",
+	"passwordResetAccountExpired": "パスワードのリセット-アカウントの有効期限が切れました",
+	"passwordResetAccountExpiredDesc": "パスワードのリセットリクエストを受け取りましたが、アカウントの有効期限はすでに切れています。",
+	"passwordResetComplete": "パスワードがリセットされ、新しいパスワードがメールで送信されました。",
+	"passwordResetEmailContent1": "あなたのパスワードはリセットされました。 次のパスワードを使用してログインできます：%1",
+	"passwordResetEmailContent2": "ログインしたら変更してください。",
+	"passwordResetEmailDesc": "パスワードのリセットリクエストを受け取りました。 このメールには、ログインに使用できる一時的なワンタイムパスワードが含まれています。ログイン後、新しいパスワードを設定する必要があります。",
+	"passwordResetMsg": "電子メールがファイルにある場合は、パスワードがリセットされ、一時的なログイン情報が電子メールで送信されています。",
+	"passwordUpdateInvalidPassword": "現在のパスワードが正しくありません。 再入力してください。",
+	"passwordUpdated": "パスワードが更新されました。",
+	"pause": "一時停止",
+	"pleaseConfirm": "確認してください",
+	"pleaseEnterAll": "すべて入力してください",
+	"pleaseEnterDataSetName": "新しいデータセットの名前を入力してください。",
+	"pleaseFixErrors": "次のエラーを修正して、再送信してください。",
+	"pleaseLogin": "ログインしてください",
+	"pleaseSelect": "選んでください",
+	"plugins": "プラグイン",
+	"pressEnterAddItem": "Enterキーを押してアイテムを追加します",
+	"preview": "プレビュー",
+	"previewPanel": "プレビューパネル",
+	"previewPanelControlsDesc": "パネルの右上には2つのアイコンがあります。 最初のアイコンはパネルを更新し、毎回異なるランダムデータを生成します。これは、パネルが生成するデータの種類を把握するのに役立ちます。 2番目のアイコンは、パネルを完全に閉じます。 ページの右下にあるセクションを使用して、いつでもパネルを再度表示できます（[プレビュー]チェックボックスを再度選択するだけです）。",
+	"previewPanelDesc": "このパネルは、グリッドパネルを介してデータを構築しているときに、生成しているデータのライブプレビューを提供します。 左上のボタンには、生成されるデータの選択された形式（SQL、XML、CSVなど）が表示されます。 フォーマットを変更するには、ボタンをクリックするだけです。",
+	"previewPanelMoreInfo": "このパネルの詳細については、プレビューパネルツアーをご覧ください。",
+	"previewPanelNoData": "データなし！",
+	"previewPanelTourDesc": "プレビューパネルには、作成中に生成しているデータのライブの視覚的表現が表示されます。 このツアーでは、パネルの仕組みを簡単に紹介します。",
+	"previewRows": "行のプレビュー",
+	"private": "民間",
+	"problemLoadingTour": "申し訳ありませんが、ツアーの読み込みに問題がありました。",
+	"programmingLanguages": "プログラミング言語",
+	"province": "州",
+	"public": "公衆",
+	"publicQ": "公衆？",
+	"reenterPassword": "パスワード再入力",
+	"refreshPage": "ページの更新",
+	"refreshPanel": "パネルの更新",
+	"register": "登録",
+	"remainingTime": "残り時間：",
+	"requiredField": "必須フィールド",
+	"revertToVersion": "このバージョンに戻す",
+	"row": "行",
+	"rowLabel": "列のタイトル",
+	"rowLabelPlural": "列のタイトル",
+	"rowNumDesc1": "グリッドの最初の列は行番号を示しています。 行を並べ替えるには、この要素をクリックして上下にドラッグします。",
+	"rowNumDesc2": "この列のヘッダー値は、グリッド内の行の総数を示します。 これは、データセットが非常に大きく、大きすぎて画面に収まらない場合に便利です。",
+	"rowNumber": "行番号",
+	"rowSp": "行",
+	"rows": "行",
+	"rowsGenerated": "生成された行",
+	"rowsGeneratedPerSecond": "1秒あたりに生成される行",
+	"safariExplanation": "このサイトには、最新のWeb標準を実装する最新のWebブラウザが必要です。 残念ながら、Safariは他のブラウザに遅れをとっており、このスクリプトを実行しません。 どのように対応するかがわかるまで、次のいずれかのブラウザを使用してください。 すべて無料でダウンロードできます。",
+	"save": "セーブ",
+	"saveAs": "名前を付けて保存",
+	"saveButtonDesc": "サイトにユーザーアカウントがある場合、このボタンはデータセットを保存します。 ログインしていない場合は、クリックすると最初にログインするように求められます。 システムはデータセットへの最後の%1変更の履歴を保持するため、いつでも戻って古いバージョンを表示できます。",
+	"saveDataSetNewName": "データセットを新しい名前で保存する",
+	"seconds": "秒",
+	"seeHelpDialog": "ヘルプダイアログを参照してください。",
+	"selectCountry": "国を選択",
+	"selectDataType": "データ型を選択",
+	"selectEllipsis": "選択する...",
+	"selectExpiryDate": "有効期限を選択してください",
+	"selectLanguage": "言語を選択する",
+	"sendEmail": "メールを送る",
+	"seriouslySlow": "ひどく遅い",
+	"settings": "設定",
+	"showGrid": "グリッドを表示",
+	"showLineNumbers": "行のプレビュー",
+	"showPreview": "ショープレビュー",
+	"siteLogo": "サイトのロゴ",
+	"size": "サイズ：",
+	"southAmerica": "南アメリカ",
+	"status": "状態",
+	"stripWhitespace": "生成されたコンテンツから空白を取り除く",
+	"success": "成功",
+	"text": "テキスト",
+	"textSize": "文字サイズ",
+	"theDataSetName": "データセット名",
+	"theExportTypeBtn": "[タイプのエクスポート]ボタン",
+	"theGenerateButton": "生成ボタン",
+	"theGridPanel": "グリッドパネル",
+	"thePreviewPanel": "プレビューパネル",
+	"theSaveButton": "保存ボタン",
+	"theme": "テーマ",
+	"togglePanelLayout": "パネルレイアウトの切り替え",
+	"totalNumGeneratedRows": "生成された行の総数",
+	"tourComplete": "ツアー完了",
+	"tourCompleteDesc": "すべて完了！ 以下のボタンのいずれかを選択して続行します。",
+	"tourIntroPara1": "このツールは多くの機能を提供し、最初は少し圧倒される可能性があります。 右側のボタンの1つをクリックして、その特定の機能に関するツアーに参加してください。",
+	"tourIntroPara2": "ツアーが開始されると、ジェネレーターページのコンテンツが一時的に上書きされ、インターフェイスに関する特定のことが説明されることに注意してください。 しかし、心配しないでください！ ツアーが終了するとすぐに、データが元の状態に戻ります。",
+	"tryDifferentTour": "別のツアーをお試しください",
+	"update": "更新",
+	"updateAccount": "アカウントを更新する",
+	"user": "ユーザー",
+	"userAccount": "ユーザーアカウント",
+	"userAccountNotFound": "申し訳ありませんが、アカウントが見つかりませんでした。",
+	"userAccountUpdated": "ユーザーアカウントが更新されました。",
+	"userAccounts": "ユーザーアカウント",
+	"userNotFound": "申し訳ありませんが、お客様を特定できませんでした。 資格情報を確認してください。",
+	"validationAccountAlreadyExists": "申し訳ありませんが、そのメールアドレスのアカウントは既に存在します。",
+	"validationDifferentNewPasswords": "新しいパスワードが一致していることを確認してください",
+	"validationInvalidEmail": "有効なメールアドレスを入力してください",
+	"validationNoCurrentPassword": "現在のパスワードを入力してください",
+	"validationNoEmail": "メールアドレスを入力してください",
+	"validationNoFirstName": "名を入力してください",
+	"validationNoLastName": "あなたの姓を入力",
+	"validationNoPassword": "パスワードを入力してください",
+	"version": "バージョン",
+	"view": "見る",
+	"viewChangelog": "変更ログを表示",
+	"viewOnGithub": "Githubで表示",
+	"welcomeToTheGenerator": "ジェネレーターへようこそ！",
+	"yes": "Yes",
+	"yourAccount": "あなたのアカウント",
+	"yourAccountUpdated": "アカウントが更新されました。",
+	"yourUserAccount": "あなたのユーザーアカウント"
+}
\ No newline at end of file
diff --git a/apps/client/src/i18n/nl.json b/apps/client/src/i18n/nl.json
new file mode 100644
index 000000000..25d858332
--- /dev/null
+++ b/apps/client/src/i18n/nl.json
@@ -0,0 +1,329 @@
+{
+	"abort": "Afbreken",
+	"about": "Over",
+	"aboutInfoPara1": "generatedata.com is een open source-project dat ik heb gemaakt in het late paleolithische tijdperk (circa 2004) en gedurende zijn levensduur heeft het vele, vele bijdragers gehad. Om de paar jaar herschrijf ik het met de nieuwste en beste beschikbare technologieën: deze versie werd in 2021 voltooid, gemaakt met React, Redux, Typescript, GraphQL, Docker, webworkers, elastiekjes, ducttape en een heleboel vloeken.",
+	"aboutInfoPara2": "Je kunt het project vinden op github. Download het, vork het of voel je vrij om bij te dragen. Genieten!",
+	"aboutThisScript": "Over dit script",
+	"accountCreated": "Gebruikersaccount aangemaakt",
+	"accountCreatedDesc": "Het account is aangemaakt.",
+	"accountCreatedMsg": "Er is een gebruikersaccount voor u aangemaakt.",
+	"accountDeleted": "Het account is verwijderd.",
+	"accountDisabled": "Account ongebruikelijk gemaakt",
+	"accountExpiredMsg": "Sorry, uw account is verlopen.",
+	"accountExpiryDate": "Vervaldatum account",
+	"accountInfo": "Gebruikersgegevens",
+	"accountSettings": "Gebruikersinstellingen",
+	"accountType": "Gebruikerstype",
+	"accounts": "Gebruikers",
+	"add": "Toevoegen",
+	"addRowsDesc": "Gebruik het formulier onder aan de pagina om meer rijen aan het gegevensraster toe te voegen. Als je veel velden hebt, is deze sectie mogelijk verborgen buiten de pagina, dus je moet het paneel naar beneden scrollen om het formulier te zien.",
+	"addSomeDataDesc": "Voeg enkele rijen toe aan het raster.",
+	"admin": "Admin",
+	"adminAccount": "Admin",
+	"administrator": "Beheerder",
+	"africa": "Afrika",
+	"allCountries": "Alle landen",
+	"allDataTypePlugins": "Alle datatype plugins",
+	"allExportTypePlugins": "Alle exporttype plugins",
+	"anonymousAccess": "Anonieme toegang",
+	"asia": "Azie",
+	"back": "Terug",
+	"backToLogin": "Terug naar Inloggen",
+	"blog": "Blog",
+	"cancel": "afbreken",
+	"centralAmerica": "Midden Amerika",
+	"changePassword": "Verander wachtwoord",
+	"clear": "Doorzichtig",
+	"clearPage": "Duidelijke pagina",
+	"clearPageConfirmation": "Weet u zeker dat u de pagina wilt wissen? Alle aangebrachte wijzigingen gaan verloren.",
+	"clearThePage": "Pagina wissen",
+	"clickExportTypeBtn": "De volgende stap laat zien wat er gebeurt als u op de knop klikt.",
+	"close": "Sluiten",
+	"closePanel": "Sluit het paneel",
+	"columns": "Kolommen",
+	"columnsDesc": "Het raster toont zoveel mogelijk van deze kolommen, afhankelijk van uw beschikbare schermgrootte. Als het te klein is, verbergt het enkele kolommen en wordt er een tandwielpictogram weergegeven dat een infotip opent met de ontbrekende inhoud. In de volgende stappen wordt elk van de kolommen uitgelegd, waarbij de eerste rij met namen als demonstratie wordt gebruikt.",
+	"complete": "Compleet",
+	"confirmDeleteAccount": "Weet u zeker dat u dit account wilt verwijderen?",
+	"confirmDeleteUserAccount": "Weet u zeker dat u deze gebruiker wilt verwijderen?",
+	"confirmEmptyForm": "Weet u zeker dat u deze pagina leeg wilt maken?",
+	"continue": "Doorgaan met",
+	"copiedToClipboard": "Gekopieerd naar het klembord",
+	"copyToClipboard": "Kopieer naar klembord",
+	"coreExportType": "Core formaten",
+	"countries": "Landen",
+	"country": "Land",
+	"countrySpecific": "Land specifiek",
+	"cpuMeltinglyFast": "CPU-smeltend snel",
+	"createAccount": "Maak nieuwe gebruiker aan",
+	"currentPassword": "Huidig wachtwoord",
+	"currentVersion": "Huidige versie wordt bewerkt",
+	"dataGenerated": "Gegevens gegenereerd.",
+	"dataSet": "Dataset",
+	"dataSetHelp": "Hier definieerd u precies welke data gegenereerd moet worden. Probeer een rij of 2 in te vullen en click op de genereer knop. Dan zult u snel doorhebben hoe het werkt.",
+	"dataSetLoaded": "De dataset is geladen.",
+	"dataSetName": "Datasetnaam",
+	"dataSetNameDesc": "Klik hier op de tekst om uw dataset een naam te geven. Houd er rekening mee dat u een account op de site nodig heeft en moet zijn ingelogd om uw datasets een naam te geven. Wanneer u uw datasets opslaat, geeft deze naam u een handig label om ze bij te houden.",
+	"dataSetNameUpdated": "De naam van de dataset is bijgewerkt.",
+	"dataSetOptions": "Opties voor datasets",
+	"dataSetReverted": "Uw dataset is teruggezet naar de geselecteerde oudere versie.",
+	"dataSetSaved": "Uw dataset is opgeslagen.",
+	"dataSets": "Gegevenssets",
+	"dataType": "Datatype",
+	"dataTypeDesc": "Dit is een vervolgkeuzelijst met alle beschikbare gegevenstypen. Wanneer u een waarde selecteert, wordt de resterende kolommen voor die rij bijgewerkt. Elk gegevenstype heeft zijn eigen unieke instellingen om aanpassingen mogelijk te maken.",
+	"dataTypes": "Datatypes",
+	"dateAccountCreated": "Aanmaak datum gebruiker",
+	"dateCreated": "Datum gecreeërd",
+	"defaultLanguage": "Standaardtaal",
+	"delete": "Verwijder",
+	"delete1DataSet": "Verwijder 1 dataset",
+	"deleteAccount": "Verwijder gebruiker",
+	"deleteDataSet": "Gegevensset verwijderen",
+	"deleteDataSetConfirm": "Weet u zeker dat u deze dataset wilt verwijderen?",
+	"deleteRow": "Verwijder rij",
+	"deleteRowDesc": "De laatste kolom bevat een verwijderpictogram. Als u erop klikt, wordt de rij verwijderd.",
+	"developer": "Ontwikkelaar",
+	"developerDoc": "Ontwikkeldocumentatie",
+	"disabled": "Gehandicapt",
+	"documentation": "Documentatie",
+	"download": "Download",
+	"edit": "Wijzig",
+	"editAccount": "Bewerk account",
+	"editExportTypePage": "Wanneer u op de knop Exporttype klikt, verschijnt een paginagrote weergave met de configuratie-opties aan de linkerkant en het voorbeeldvenster aan de rechterkant.",
+	"editExportTypePageConfig": "Laten we eens kijken naar de configuratie-opties.",
+	"editExportTypeSettings": "Bewerk uw exporttype-instellingen.",
+	"editingExportTypes": "Exporttypen bewerken",
+	"email": "Email",
+	"emailFooterDisclaimer": "Als u deze e-mail ten onrechte heeft ontvangen, neem dan contact op met de sitebeheerder.",
+	"emailIntroLineWithName": "Hallo %1,",
+	"emailLabel": "E-mailadres:",
+	"emailNotSent": "We zijn helaas niet instaat email te versturen.",
+	"emailUserLoginInfo": "Stuur de gebruiker een email met zijn logininformatie",
+	"enterEmailAddressToResetPassword": "Vul uw emailadres in om uw wachtwoord te herstellen.",
+	"enterUserAccountDetails": "Vul alstublieft uw gebruikersgegevens hieronder in.",
+	"errorCreatingAccount": "Er is een fout opgetreden bij het maken van dit account.",
+	"estimatedSize": "Geschatte grootte:",
+	"estimatedTime": "Geschatte tijd:",
+	"europe": "Europa",
+	"example": "Voorbeeld",
+	"exampleColumn": "Voorbeeld kolom",
+	"exampleColumnDesc": "Deze kolom kan inhoud bevatten, afhankelijk van het gegevenstype dat u voor de rij hebt geselecteerd. Voor sommige gegevenstypen is het gewoon een handige manier om vooraf ingestelde voorbeelden te geven van hoe ze kunnen worden gebruikt. De kolom Namen biedt bijvoorbeeld een vervolgkeuzelijst met verschillende naamformaten. Voor alle gegevenstypen kunt u het nog steeds handmatig configureren via de kolom Opties: het is echt een tijdbesparend apparaat om u zo snel mogelijk op de hoogte te houden.",
+	"examples": "Voorbeelden",
+	"exit": "Uitgang",
+	"expired": "Verlopen",
+	"expiryDate": "Vervaldatum",
+	"exportType": "Exporttype",
+	"exportTypeBtnDesc": "De knop linksboven in het paneel is waar u naartoe gaat om het formaat te selecteren en configureren voor de gegevens die u wilt genereren. Hier is het ingesteld op Typescript.",
+	"exportTypeOptionsSql": "Opties voor exporttype: SQL",
+	"exportTypeOptionsSqlDesc": "Zoals u kunt zien, heeft SQL veel andere velden die specifiek zijn voor dit exporttype. Andere exporttypen hebben verschillende instellingen.",
+	"exportTypeOptionsTs": "Opties voor exporttype: typoscript",
+	"exportTypeOptionsTsDesc": "Afhankelijk van het geselecteerde exporttype, kan het paneelgedeelte aanvullende opties bevatten. Hier met Typescript zijn er twee velden, waarmee u de typenaam en de geëxporteerde variabelenaam kunt aanpassen.",
+	"exportTypeOptionsTsDesc2": "Laten we nu eens kijken naar SQL.",
+	"exportTypeSelection": "Selectie van exporttype",
+	"exportTypeSelectionDesc": "Met de vervolgkeuzelijst Formaat kunt u het formaat voor de gegenereerde inhoud kiezen. Er zijn veel opties, sommige zijn de kerntypen: SQL, CSV, SQL, JSON en andere, en sommige zijn bedoeld voor het genereren van gegevens voor specifieke programmeertalen.",
+	"exportTypes": "Exporttypes",
+	"filterDataTypes": "Filter gegevenstypen",
+	"financial": "Financieel",
+	"firstName": "Voornaam",
+	"forgottenYourPasswordQ": "Wachtwoord vergeten?",
+	"format": "Formaat",
+	"generate": "Genereer",
+	"generateBtnDesc": "Als je klaar bent met het configureren van je dataset en hebt bevestigd dat het eruitziet zoals je wilt, is het tijd om wat data in volume te genereren! Klik op deze knop om uw gegevens te genereren. Afhankelijk van het aantal rijen in het gegevensraster en het aantal rijen dat u wilt genereren, kan dit even duren.",
+	"generated": "Gegenereerd",
+	"generatedC": "Gegenereerd::",
+	"generator": "Generator",
+	"geo": "Geo",
+	"grid": "rooster",
+	"gridPanelTourDesc1": "Het rasterpaneel is waar u de gegevens construeert die u wilt genereren. Hier kunt u kiezen tussen de verschillende gegevenstypen, hoe ze zijn geconfigureerd en de volgorde waarin ze verschijnen. In het voorbeeld hier hebben we vijf velden: naam, telefoonnummer, e-mail, adres en stad. ",
+	"gridPanelTourDesc2": "Zie de rondleiding op het rasterpaneel voor meer gedetailleerde informatie over deze sectie.",
+	"gridPanelTourIntroDesc1": "Het rasterpaneel is waar u definieert welke gegevens u wilt genereren. Voor deze tour hebben we het voorbeeldvenster verborgen (zie de niet-aangevinkte \"Voorbeeld\" -knop rechtsonder op de pagina) om ons wat meer ruimte te geven. We hebben ook 10 rijen met verschillende gegevenstypen toegevoegd, alleen ter illustratie.",
+	"gridPanelTourIntroDesc2": "Laten we beginnen met de rasterkolommen.",
+	"help": "Help",
+	"helpIcon": "Help-pictogram",
+	"helpIconDesc": "Als u in de vorige kolom een gegevenstype selecteert, verschijnt hier een pictogram. Als u erop klikt, wordt een helpvenster geopend met gebruiksinformatie.",
+	"hide": "Zich verstoppen",
+	"hideShowGrid": "Raster verbergen / weergeven",
+	"hideShowPreviewPanel": "Verberg / toon voorbeeldpaneel",
+	"history": "Geschiedenis",
+	"historyPanelDesc": "Dit paneel toont de geschiedenis van wijzigingen die in de dataset zijn aangebracht. Klik op de Weergaveknoppen om eerdere versies te bekijken. Om terug te keren naar een eerdere versie, hoeft u deze alleen maar te bekijken en vervolgens op de knop \"Terugkeren naar deze versie\" te klikken.",
+	"hostName": "Hostnaam",
+	"humanData": "Menselijke data",
+	"ifWantToReregister": "Als u zich opnieuw wilt registreren, gaat u naar:",
+	"incomplete": "Incompleet",
+	"install": "Installeren",
+	"introToGenerator": "Inleiding tot de generator",
+	"introToGeneratorDesc": "Deze rondleiding geeft u een introductie op hoog niveau over de belangrijkste functies van de gegevensgenerator. Laten we beginnen!",
+	"invalidSettings": "Ongeldige instellingen!",
+	"language": "Nederlands",
+	"lastEdited": "laatst gewijzigd op",
+	"lastLoggedIn": "Laatst ingelogd Op",
+	"lastModified": "Datum laatste wijziging",
+	"lastName": "Achternaam",
+	"lastSaved": "laatst opgeslagen op",
+	"lineWrapping": "Lijnomwikkeling",
+	"linkToDataSet": "Link naar dataset",
+	"linkToThisDataSet": "Link naar deze dataset",
+	"live": "Leven",
+	"load": "Laden",
+	"loading": "Laden...",
+	"login": "Inloggen",
+	"loginToSave": "Om uw datasets op te slaan heeft u eerst een account nodig. Gelieve hieronder in te loggen.",
+	"loginOrRegisterToSave": "Om uw datasets op te slaan heeft u eerst een account nodig. Gelieve hieronder in te loggen of te registreren.",
+	"loginUrlLabel": "Aanmeldings-URL:",
+	"logout": "Uitloggen",
+	"makeDataSetPublicAgreement": "Ik ben ervan op de hoogte dat als ik deze dataset wil delen met anderen ik hem openbaar moet maken.",
+	"metaDescription": "GenerateData.com: free, GNU-licensed, willekeurige klant data generator voor het testen van software",
+	"metaKeywords": "Random Data, Test Data, Sample Data, data generator, generate data",
+	"missingDataSetName": "Voer de naam van uw dataset in",
+	"nameColumn": "Naam kolom",
+	"nameColumnDesc": "Deze kolom krijgt een andere kop, afhankelijk van het exporttype dat u in het voorbeeldvenster hebt geselecteerd (XML, CSV enz.). Het doel van deze kolom is om een identificatie voor de rij te geven die vervolgens kan worden gebruikt in de gegenereerde gegevens. XML gebruikt deze waarde bijvoorbeeld als de XML-knooppuntnaam; JSON gebruikt het als de JSON-eigenschapsnaam; SQL gebruikt het voor de naam van de databasekolom. De toepassing valideert automatisch de waarde die u hier hebt ingevoerd om er zeker van te zijn dat deze geldig is voor het geselecteerde exporttype.",
+	"newDataSet": "Nieuwe dataset",
+	"no": "Nee",
+	"noAccountsCreated": "Er zijn geen accounts aangemaakt.",
+	"noAdditionalSettings": "Geen aanvullende instellingen",
+	"noDataSetsSaved": "U heeft geen gegevenssets opgeslagen.",
+	"noExamplesAvailable": "Geen voorbeelden beschikbaar.",
+	"noExpiry": "Geen vervaldatum",
+	"noHistory": "Nog geen geschiedenis.",
+	"noOptionsAvailable": "Geen opties beschikbaar.",
+	"noSafari": "Sorry, geen Safari!",
+	"northAmerica": "Noord Amerika",
+	"nowLoggedIn": "Je bent ingelogd.",
+	"nowLoggedOut": "Je bent uitgelogd.",
+	"numResults": "Aantal resultaten",
+	"numeric": "Numeriek",
+	"oceania": "Oceanie",
+	"oneTimePasswordLogin": "U bent ingelogd met een eenmalig wachtwoord. Stel nu een nieuw wachtwoord in.",
+	"open": "Open",
+	"options": "Opties",
+	"optionsColumn": "Opties kolom",
+	"optionsColumnDesc1": "Deze kolom bevat alle configuratie-opties voor het gegevenstype van deze rij. Sommige gegevenstypen hebben te veel configuratie-instellingen om in zo'n kleine ruimte weer te geven (bijvoorbeeld land, regio), dus het kan zijn dat ze gewoon een knop in het raster laten zien die een dialoogvenster opent met alle opties.",
+	"optionsColumnDesc2": "Voor het hier geïllustreerde gegevenstype Namen bevat de kolom één veld Creëerbare pil. Dit is een veelgebruikt veldtype in de gegevensgenerator. U kunt items toevoegen door er gewoon in te typen en op <enter> te klikken. Het zet die items vervolgens om in verschillende pillen die kunnen worden verwijderd via het \"x\" -pictogram.",
+	"or": "of",
+	"order": "Sorteren",
+	"other": "Anders",
+	"overMaxAnonRows": "Sorry, u kunt slechts %1 rijen genereren. Om grotere hoeveelheden gegevens te genereren, heeft u een gebruikersaccount op deze site nodig.",
+	"panelContents": "Paneel inhoud",
+	"panelContentsDesc": "Het grootste deel van het voorbeeldpaneel bevat een voorbeeld van de gegenereerde gegevens, volgens de gegevens die u hebt gespecificeerd in het rasterpaneel en de geselecteerde instellingen voor Exporttype. Hier worden 5 verschillende gegevenstypen gegenereerd (land, regio, stad, straatadres en post / postcode) in typoscript-indeling.",
+	"panelControls": "Paneelbediening",
+	"panelControlsClearIconDesc": "Met het laatste pictogram in de paneelregelaars kunt u de pagina leegmaken, zodat u opnieuw kunt beginnen.",
+	"panelControlsDesc": "Met de paneelbedieningsknoppen kunt u de raster- en voorbeeldpanelen verbergen / weergeven, wat handig kan zijn als u met beperkte schermruimte werkt. U kunt ook de plaatsing van de twee panelen ten opzichte van elkaar wijzigen (links-rechts, boven-onder) met behulp van het derde pictogram.",
+	"panelTabs": "Paneel tabbladen",
+	"panelTabsDesc": "Ten slotte is het je misschien opgevallen dat het paneel is onderverdeeld in twee tabbladen. Standaard wordt het tabblad Instellingen weergegeven, aangezien u daar waarschijnlijk naartoe wilt. Maar er is ook een tweede tabblad \"Voorbeeld\" dat instellingen bevat voor het wijzigen van het uiterlijk van het voorbeeldpaneel: het thema, regelnummers verbergen / tonen, regelterugloop wijzigen, de tekstgrootte wijzigen en het aantal gegenereerde rijen beheren.",
+	"password": "Wachtwoord",
+	"passwordLabel": "Wachtwoord:",
+	"passwordReset": "Wachtwoord reset",
+	"passwordResetAccountExpired": "Wachtwoord opnieuw instellen - Account verlopen",
+	"passwordResetAccountExpiredDesc": "We hebben zojuist een verzoek ontvangen om uw wachtwoord opnieuw in te stellen, maar uw account is al verlopen.",
+	"passwordResetComplete": "Uw wachtwoord is hersteld. Er is een email naar u verstuurd met uw nieuwe wachtwoord.",
+	"passwordResetEmailContent1": "Uw wachtwoord is hersteld. U kunt het volgende wachtwoord gebruiken om in te loggen: %1",
+	"passwordResetEmailContent2": "Wijzig uw wachtwoord nadat u ingelogd bent.",
+	"passwordResetEmailDesc": "We hebben een verzoek ontvangen om uw wachtwoord opnieuw in te stellen. Deze e-mail bevat een tijdelijk eenmalig wachtwoord dat u kunt gebruiken om in te loggen. Na het inloggen moet u een nieuw wachtwoord instellen.",
+	"passwordResetMsg": "Als de e-mail geregistreerd was, is uw wachtwoord opnieuw ingesteld en heeft u tijdelijke inloggegevens per e-mail ontvangen.",
+	"passwordUpdateInvalidPassword": "Uw huidige wachtwoord is onjuist. Voer opnieuw in.",
+	"passwordUpdated": "Uw wachtwoord is geüpdatet.",
+	"pause": "Pauze",
+	"pleaseConfirm": "Alstublieft bevestigen",
+	"pleaseEnterAll": "Graag alles invullen",
+	"pleaseEnterDataSetName": "Geef een naam voor uw nieuwe dataset.",
+	"pleaseFixErrors": "Los de volgende problemen op en probeer het opnieuw:",
+	"pleaseLogin": "Log alsjeblieft in",
+	"pleaseSelect": "Selecteer alstublieft",
+	"plugins": "Plugins",
+	"pressEnterAddItem": "Druk op enter om een item toe te voegen",
+	"preview": "voorbeeld",
+	"previewPanel": "Voorbeeldpaneel",
+	"previewPanelControlsDesc": "Rechtsboven in het paneel staan twee pictogrammen. Het eerste pictogram ververst het paneel en genereert elke keer verschillende willekeurige gegevens - dit helpt om u een idee te geven van het soort gegevens dat het genereert. Het tweede pictogram sluit het paneel helemaal. U kunt het paneel altijd opnieuw weergeven met behulp van de sectie rechtsonder op de pagina (vink gewoon het selectievakje \"Voorbeeld\" opnieuw aan).",
+	"previewPanelDesc": "Dit paneel geeft u een live voorbeeld van de gegevens die u genereert, terwijl u deze opbouwt via het rasterpaneel. De knop linksboven toont het geselecteerde formaat van de gegevens die worden gegenereerd (bijvoorbeeld SQL, XML, CSV enz.). Om het formaat te wijzigen, klikt u op de knop.",
+	"previewPanelMoreInfo": "Bekijk voor meer informatie over dit paneel de rondleiding door het voorbeeldpaneel.",
+	"previewPanelNoData": "Geen informatie!",
+	"previewPanelTourDesc": "Het voorbeeldvenster geeft u een live, visuele weergave van de gegevens die u genereert terwijl u deze aan het samenstellen bent. Deze rondleiding geeft een korte introductie over hoe het paneel werkt.",
+	"previewRows": "Voorbeeld van rijen",
+	"private": "Privaat",
+	"problemLoadingTour": "Sorry, er is een probleem opgetreden bij het laden van de tour.",
+	"programmingLanguages": "Programmeertalen",
+	"province": "Provincie",
+	"public": "Openbaar",
+	"publicQ": "Openbaar?",
+	"reenterPassword": "Wachtwoord opnieuw invoeren",
+	"refreshPage": "Pagina verversen",
+	"refreshPanel": "Vernieuw paneel",
+	"register": "Registreren",
+	"remainingTime": "Overgebleven tijd:",
+	"requiredField": "verplicht veld",
+	"revertToVersion": "Keer terug naar deze versie",
+	"row": "rij",
+	"rowLabel": "Kolomtitel",
+	"rowLabelPlural": "Kolomtitels",
+	"rowNumDesc1": "De eerste kolom in het raster toont het rijnummer. Om de rij opnieuw te ordenen, klikt en sleept u dit element omhoog of omlaag.",
+	"rowNumDesc2": "De koptekstwaarde voor deze kolom toont het totale aantal rijen in uw raster. Dit kan handig zijn als u erg grote gegevenssets heeft en deze te groot is om op het scherm te passen.",
+	"rowNumber": "Rij nummer",
+	"rowSp": "Rij(en)",
+	"rows": "rijen",
+	"rowsGenerated": "Genereerde rijen",
+	"rowsGeneratedPerSecond": "Rijen gegenereerd per seconde",
+	"safariExplanation": "Deze site vereist een up-to-date webbrowser die moderne webstandaarden implementeert. Safari is helaas achterop geraakt bij de andere browsers en zal dit script niet uitvoeren. Gebruik een van de volgende browsers totdat we erachter zijn gekomen hoe we dit kunnen aanpassen. Allemaal gratis te downloaden.",
+	"save": "Opslaan",
+	"saveAs": "Opslaan als",
+	"saveButtonDesc": "Als u een gebruikersaccount op de site heeft, slaat deze knop uw dataset op. Als u niet bent aangemeld, klikt u erop om eerst in te loggen. Het systeem houdt een geschiedenis bij van de laatste %1 wijzigingen in een dataset, zodat u altijd terug kunt gaan en oudere versies kunt bekijken.",
+	"saveDataSetNewName": "Sla dataset op als nieuwe naam",
+	"seconds": "Seconden",
+	"seeHelpDialog": "&nbsp;Zie help venster.",
+	"selectCountry": "Selecteer land",
+	"selectDataType": "Selecteer datatype",
+	"selectEllipsis": "Selecteer ...",
+	"selectExpiryDate": "Selecteer vervaldatum",
+	"selectLanguage": "Selecteer taal",
+	"sendEmail": "E-mail verzenden",
+	"seriouslySlow": "serieus traag",
+	"settings": "Instellingen",
+	"showGrid": "Raster tonen",
+	"showLineNumbers": "Toon regelnummers",
+	"showPreview": "Voorbeeld weergeven",
+	"siteLogo": "logo van de site",
+	"size": "Grootte:",
+	"southAmerica": "Zuid Amerika",
+	"status": "Toestand",
+	"stripWhitespace": "strip witruimte van gegenereerde inhoud",
+	"success": "success",
+	"text": "Tekst",
+	"textSize": "Lettergrootte",
+	"theDataSetName": "De naam van de dataset",
+	"theExportTypeBtn": "De Export Type knop",
+	"theGenerateButton": "De knop Genereren",
+	"theGridPanel": "Het rasterpaneel",
+	"thePreviewPanel": "Het voorbeeldvenster",
+	"theSaveButton": "De knop Opslaan",
+	"theme": "Thema",
+	"togglePanelLayout": "Schakelen tussen paneelindeling",
+	"totalNumGeneratedRows": "Totaal aantal gegenereerde rijen",
+	"tourComplete": "Tour voltooid",
+	"tourCompleteDesc": "Helemaal klaar! Kies een van de onderstaande knoppen om door te gaan.",
+	"tourIntroPara1": "Deze tool biedt veel functionaliteit en kan in het begin een beetje overweldigend zijn. Klik op een van de knoppen aan de rechterkant om een rondleiding over dat specifieke kenmerk te volgen.",
+	"tourIntroPara2": "Merk op dat wanneer de tour begint, deze tijdelijk de inhoud van de generatorpagina overschrijft om bepaalde dingen over de interface te illustreren. Maar maak je geen zorgen! Zodra de tour is beëindigd, worden uw gegevens teruggezet naar de oorspronkelijke staat.",
+	"tryDifferentTour": "Probeer een andere tour",
+	"update": "Bijwerken",
+	"updateAccount": "Update gebruiker",
+	"user": "Gebruiker",
+	"userAccount": "Gebruikersaccount",
+	"userAccountNotFound": "Sorry, we konden je account niet vinden.",
+	"userAccountUpdated": "Het gebruikersaccount is bijgewerkt.",
+	"userAccounts": "Gebruikersaccounts",
+	"userNotFound": "Sorry, we kunnen u niet identificeren.",
+	"validationAccountAlreadyExists": "Sorry, een account met dit emailadres bestaat al.",
+	"validationDifferentNewPasswords": "Zorg ervoor dat uw nieuwe wachtwoorden overeenkomen",
+	"validationInvalidEmail": "Voer alstublieft een geldig emailadres in.",
+	"validationNoCurrentPassword": "Voer uw huidige wachtwoord in",
+	"validationNoEmail": "Voer alsublieft uw emailadres in.",
+	"validationNoFirstName": "Wat is uw voornaam?",
+	"validationNoLastName": "Wat is uw achternaam?",
+	"validationNoPassword": "Wat is uw wachtwoord?",
+	"version": "Versie",
+	"view": "Visie",
+	"viewChangelog": "Bekijk changelog",
+	"viewOnGithub": "Bekijk op Github",
+	"welcomeToTheGenerator": "Welkom bij de generator!",
+	"yes": "Ja",
+	"yourAccount": "Uw gebruikersnaam",
+	"yourAccountUpdated": "Uw gebruikersaccount is bijgewerkt.",
+	"yourUserAccount": "Uw gebruikersaccount"
+}
\ No newline at end of file
diff --git a/apps/client/src/i18n/pt.json b/apps/client/src/i18n/pt.json
new file mode 100644
index 000000000..791960db4
--- /dev/null
+++ b/apps/client/src/i18n/pt.json
@@ -0,0 +1,329 @@
+{
+	"abort": "Abortar",
+	"about": "Sobre",
+	"aboutInfoPara1": "generatedata.com é um projeto de código aberto que criei no final da era paleolítica (por volta de 2004) e teve muitos, muitos contribuidores ao longo de sua vida. A cada poucos anos eu o reescrevo usando as melhores e mais recentes tecnologias disponíveis: esta versão foi concluída em 2021, feita com React, Redux, Typescript, GraphQL, Docker, web workers, elásticos, fita adesiva e um monte de xingamentos.",
+	"aboutInfoPara2": "Você pode encontrar o projeto no github. Faça o download, faça um fork ou sinta-se à vontade para contribuir. Aproveitar!",
+	"aboutThisScript": "Sobre este script",
+	"accountCreated": "Conta criada",
+	"accountCreatedDesc": "A conta foi criada.",
+	"accountCreatedMsg": "Uma conta foi criada para você.",
+	"accountDeleted": "A conta foi excluída.",
+	"accountDisabled": "Conta desativada",
+	"accountExpiredMsg": "Desculpe, sua conta expirou.",
+	"accountExpiryDate": "Data de expiração da conta",
+	"accountInfo": "Informações da Conta",
+	"accountSettings": "Configurações da conta",
+	"accountType": "Tipo de conta",
+	"accounts": "Contas",
+	"add": "Adicionar",
+	"addRowsDesc": "Para adicionar mais linhas à grade de dados, basta usar o formulário na parte inferior da página. Quando você tem muitos campos, esta seção pode ficar oculta fora da página, então você terá que rolar o painel até a parte inferior para ver o formulário.",
+	"addSomeDataDesc": "Adicione algumas linhas na grade.",
+	"admin": "Admin",
+	"adminAccount": "Conta de administrador",
+	"administrator": "Administradora",
+	"africa": "África",
+	"allCountries": "Todos os países",
+	"allDataTypePlugins": "Todos os plug-ins de tipo de dados",
+	"allExportTypePlugins": "Todos os plug-ins de tipo de exportação",
+	"anonymousAccess": "Acesso anônimo",
+	"asia": "Ásia",
+	"back": "de volta",
+	"backToLogin": "Volte ao login",
+	"blog": "Blog",
+	"cancel": "cancelar",
+	"centralAmerica": "América Central",
+	"changePassword": "Mudar senha",
+	"clear": "Clara",
+	"clearPage": "Limpar página",
+	"clearPageConfirmation": "Tem certeza de que deseja limpar a página? Todas as alterações feitas serão perdidas.",
+	"clearThePage": "Limpe a página",
+	"clickExportTypeBtn": "A próxima etapa mostra o que acontece quando você clica no botão.",
+	"close": "Fechar",
+	"closePanel": "Fechar painel",
+	"columns": "Colunas",
+	"columnsDesc": "A grade mostrará quantas dessas colunas puder, dependendo do tamanho de tela disponível. Quando é muito pequeno, ele esconde algumas colunas e mostra um ícone de engrenagem que abre um infotip com o conteúdo ausente. As próximas etapas explicam cada uma das colunas, usando a primeira linha Nomes como demonstração.",
+	"complete": "Completa",
+	"confirmDeleteAccount": "Tem certeza de que deseja excluir esta conta?",
+	"confirmDeleteUserAccount": "Tem certeza de que deseja excluir esta conta de usuário?",
+	"confirmEmptyForm": "Tem certeza de que deseja limpar a página?",
+	"continue": "Prosseguir",
+	"copiedToClipboard": "Copiado para a área de transferência",
+	"copyToClipboard": "Copiar para área de transferência",
+	"coreExportType": "Formatos principais",
+	"countries": "Países",
+	"country": "País",
+	"countrySpecific": "País específico",
+	"cpuMeltinglyFast": "CPU derretedoramente rápido",
+	"createAccount": "Criar Conta",
+	"currentPassword": "Senha atual",
+	"currentVersion": "Versão atual sendo editada",
+	"dataGenerated": "Dados gerados.",
+	"dataSet": "Conjunto de Dados",
+	"dataSetHelp": "É aqui que você define exatamente que tipo de dados deseja gerar. Tente preencher uma ou duas linhas e clique no botão gerar. Você vai pegar o jeito bem rápido.",
+	"dataSetLoaded": "O conjunto de dados foi carregado.",
+	"dataSetName": "Nome do conjunto de dados",
+	"dataSetNameDesc": "Clique no texto aqui para nomear seu conjunto de dados. Observe que você precisará de uma conta no site e de estar logado para nomear seus conjuntos de dados. Quando você salva seus conjuntos de dados, este nome fornece um rótulo conveniente para controlá-los.",
+	"dataSetNameUpdated": "O nome do conjunto de dados foi atualizado.",
+	"dataSetOptions": "Opções de conjunto de dados",
+	"dataSetReverted": "Seu conjunto de dados foi revertido para a versão mais antiga selecionada.",
+	"dataSetSaved": "Seu conjunto de dados foi salvo.",
+	"dataSets": "Conjuntos de dados",
+	"dataType": "Tipo de dados",
+	"dataTypeDesc": "Este é um menu suspenso que contém todos os tipos de dados disponíveis. Quando você seleciona um valor, ele atualiza o restante das colunas dessa linha. Cada tipo de dados tem suas próprias configurações exclusivas para permitir a personalização.",
+	"dataTypes": "Tipos de dados",
+	"dateAccountCreated": "Data de criação da conta",
+	"dateCreated": "Data Criada",
+	"defaultLanguage": "Idioma padrão",
+	"delete": "Excluir",
+	"delete1DataSet": "Excluir 1 conjunto de dados",
+	"deleteAccount": "Deletar conta",
+	"deleteDataSet": "Excluir conjunto de dados",
+	"deleteDataSetConfirm": "Tem certeza de que deseja excluir este conjunto de dados?",
+	"deleteRow": "Apagar linha",
+	"deleteRowDesc": "A última coluna contém um ícone de exclusão. Clicar nele excluirá a linha.",
+	"developer": "Desenvolvedora",
+	"developerDoc": "Doc de desenvolvedor",
+	"disabled": "Desabilitada",
+	"documentation": "Documentação",
+	"download": "Download",
+	"edit": "Editar",
+	"editAccount": "Editar conta",
+	"editExportTypePage": "Quando você clica no botão Tipo de exportação, uma exibição de página inteira aparece contendo as opções de configuração à esquerda e o painel de visualização à direita.",
+	"editExportTypePageConfig": "Vejamos as opções de configuração.",
+	"editExportTypeSettings": "Edite suas configurações de tipo de exportação.",
+	"editingExportTypes": "Editando Tipos de Exportação",
+	"email": "O email",
+	"emailFooterDisclaimer": "Se você recebeu este e-mail por engano, entre em contato com o administrador do site.",
+	"emailIntroLineWithName": "Olá %1,",
+	"emailLabel": "O email:",
+	"emailNotSent": "Não foi possível enviar a notificação por e-mail.",
+	"emailUserLoginInfo": "Enviar e-mail ao usuário com suas informações de login",
+	"enterEmailAddressToResetPassword": "Digite seu email abaixo para redefinir sua senha.",
+	"enterUserAccountDetails": "Por favor, insira os detalhes da sua conta de usuário abaixo.",
+	"errorCreatingAccount": "Ocorreu um erro ao criar esta conta.",
+	"estimatedSize": "Tamanho estimado:",
+	"estimatedTime": "Tempo estimado:",
+	"europe": "Europa",
+	"example": "Exemplo",
+	"exampleColumn": "Coluna de exemplo",
+	"exampleColumnDesc": "Esta coluna pode ou não ter conteúdo, dependendo do tipo de dados que você selecionou para a linha. É apenas uma maneira conveniente para alguns tipos de dados fornecerem exemplos predefinidos de como eles podem ser usados. Por exemplo, a coluna Nomes fornece uma lista suspensa de diferentes formatos de nome. Para todos os tipos de dados, você ainda pode configurá-lo manualmente na coluna Opções: é realmente um dispositivo que economiza tempo para que você se atualize o mais rápido possível.",
+	"examples": "Exemplos",
+	"exit": "Saída",
+	"expired": "Expirada",
+	"expiryDate": "Data de validade",
+	"exportType": "Tipo de Exportação",
+	"exportTypeBtnDesc": "O botão no canto superior esquerdo do painel é onde você seleciona e configura o formato dos dados que deseja gerar. Aqui está definido como Typescript.",
+	"exportTypeOptionsSql": "Opções de tipo de exportação: SQL",
+	"exportTypeOptionsSqlDesc": "Como você pode ver, o SQL tem muitos outros campos que são específicos para este tipo de exportação. Outros tipos de exportação têm configurações diferentes.",
+	"exportTypeOptionsTs": "Opções de tipo de exportação: texto datilografado",
+	"exportTypeOptionsTsDesc": "Dependendo do tipo de exportação selecionado, o corpo do painel pode conter opções adicionais. Aqui, com Typescript, existem dois campos, permitindo que você personalize o nome do tipo e o nome da variável exportada.",
+	"exportTypeOptionsTsDesc2": "Agora vamos dar uma olhada no SQL.",
+	"exportTypeSelection": "Seleção de tipo de exportação",
+	"exportTypeSelectionDesc": "A lista suspensa Formato permite que você escolha o formato do conteúdo gerado. Existem muitas opções, algumas delas os tipos principais: SQL, CSV, SQL, JSON e outras, e algumas delas são para gerar dados para linguagens de programação específicas.",
+	"exportTypes": "Tipos de exportação",
+	"filterDataTypes": "Filtrar Tipos de Dados",
+	"financial": "Financeira",
+	"firstName": "Primeiro nome",
+	"forgottenYourPasswordQ": "Esqueceu a senha?",
+	"format": "Formato",
+	"generate": "Gerar",
+	"generateBtnDesc": "Depois de terminar de configurar seu conjunto de dados e confirmar que está com a aparência desejada, é hora de gerar alguns dados em volume! Clique neste botão para gerar seus dados. Dependendo do número de linhas na grade de dados e do número de linhas que você deseja gerar, isso pode levar algum tempo.",
+	"generated": "Gerada",
+	"generatedC": "Gerada:",
+	"generator": "Gerador",
+	"geo": "Geo",
+	"grid": "Rede",
+	"gridPanelTourDesc1": "O painel de grade é onde você constrói os dados que deseja gerar. Aqui você pode escolher entre os diferentes tipos de dados, como eles são configurados e a ordem em que aparecem. No exemplo aqui, temos cinco campos: Nome, Telefone, Email, Endereço e Cidade.",
+	"gridPanelTourDesc2": "Consulte o tour no Painel de grade para obter informações mais detalhadas sobre esta seção.",
+	"gridPanelTourIntroDesc1": "O painel de grade é onde você define quais dados deseja gerar. Para este tour, ocultamos o painel de visualização (consulte o botão \"Visualizar\" desmarcado no canto inferior direito da página) para nos dar um pouco mais de espaço. Também adicionamos 10 linhas de diferentes tipos de dados, apenas para fins de ilustração.",
+	"gridPanelTourIntroDesc2": "Vamos começar com as colunas da grade.",
+	"help": "Ajuda",
+	"helpIcon": "Ícone de ajuda",
+	"helpIconDesc": "Ao selecionar um Tipo de dados na coluna anterior, um ícone aparecerá aqui. Clicar nele abre uma caixa de diálogo de ajuda contendo informações de uso.",
+	"hide": "Esconder",
+	"hideShowGrid": "Ocultar / mostrar grade",
+	"hideShowPreviewPanel": "Ocultar / mostrar painel de visualização",
+	"history": "História",
+	"historyPanelDesc": "Este painel mostra o histórico de mudanças feitas no conjunto de dados. Clique nos botões Exibir para examinar as versões anteriores. Para reverter para uma versão anterior, basta visualizá-la e clicar no botão \"Reverter para esta versão\".",
+	"hostName": "Nome de anfitrião",
+	"humanData": "Dados Humanos",
+	"ifWantToReregister": "Se você deseja se registrar novamente, visite:",
+	"incomplete": "Incompleta",
+	"install": "Install",
+	"introToGenerator": "Introdução ao gerador",
+	"introToGeneratorDesc": "Este tour oferece uma introdução de alto nível aos principais recursos do Data Generator. Vamos começar!",
+	"invalidSettings": "Configurações inválidas!",
+	"language": "inglês",
+	"lastEdited": "última edição",
+	"lastLoggedIn": "Último login",
+	"lastModified": "Última modificação",
+	"lastName": "Último nome",
+	"lastSaved": "salvo pela última vez",
+	"lineWrapping": "Quebra de linha",
+	"linkToDataSet": "Link para o conjunto de dados",
+	"linkToThisDataSet": "Link para este conjunto de dados",
+	"live": "Ao vivo",
+	"load": "Carga",
+	"loading": "Carregando...",
+	"login": "Conecte-se",
+	"loginToSave": "Para salvar seus conjuntos de dados, primeiro você precisa de uma conta. Faça o login abaixo.",
+	"loginOrRegisterToSave": "Para salvar seus conjuntos de dados, primeiro você precisa de uma conta. Por favor, faça login ou cadastre-se abaixo.",
+	"loginUrlLabel": "URL de login:",
+	"logout": "Sair",
+	"makeDataSetPublicAgreement": "Eu entendo que, para compartilhar este conjunto de dados, preciso torná-lo público.",
+	"metaDescription": "Eu entendo que, para compartilhar este conjunto de dados, preciso torná-lo público.",
+	"metaKeywords": "Eu entendo que, para compartilhar este conjunto de dados, preciso torná-lo público.",
+	"missingDataSetName": "Por favor, insira o nome do seu conjunto de dados",
+	"nameColumn": "Coluna de nome",
+	"nameColumnDesc": "Esta coluna obtém um título diferente dependendo do Tipo de exportação selecionado no painel de visualização (XML, CSV etc.). O objetivo desta coluna é fornecer um identificador para a linha que pode então ser usado nos dados gerados. Por exemplo, XML usa esse valor como o nome do nó XML; JSON o usa como o nome da propriedade JSON; O SQL o usa para o nome da coluna do banco de dados. O aplicativo validará automaticamente o valor inserido aqui para garantir que seja válido para o tipo de exportação selecionado.",
+	"newDataSet": "Novo Conjunto de Dados",
+	"no": "Não",
+	"noAccountsCreated": "Nenhuma conta foi criada.",
+	"noAdditionalSettings": "Sem configurações adicionais.",
+	"noDataSetsSaved": "Você não tem conjuntos de dados salvos.",
+	"noExamplesAvailable": "Nenhum exemplo disponível.",
+	"noExpiry": "Sem validade",
+	"noHistory": "Sem história ainda.",
+	"noOptionsAvailable": "Sem opções disponíveis.",
+	"noSafari": "Desculpe, não há Safari!",
+	"northAmerica": "América do Norte",
+	"nowLoggedIn": "Você está logado.",
+	"nowLoggedOut": "Você foi desconectado.",
+	"numResults": "Resultados numéricos",
+	"numeric": "Numérica",
+	"oceania": "Oceânia",
+	"oneTimePasswordLogin": "Você fez login com uma senha de uso único. Defina um novo agora ou você não poderá fazer o login novamente.",
+	"open": "Abrir",
+	"options": "Opções",
+	"optionsColumn": "Coluna de opções",
+	"optionsColumnDesc1": "Esta coluna contém todas as opções de configuração para o tipo de dados desta linha. Alguns tipos de dados têm muitas definições de configuração para mostrar em um espaço tão pequeno (por exemplo, país, região), então eles podem mostrar apenas um botão na grade que abre uma caixa de diálogo contendo todas as opções.",
+	"optionsColumnDesc2": "Para o tipo de dados de nomes ilustrado aqui, a coluna contém um único campo Creatable Pill. Este é um tipo de campo comum no Data Generator. Ele permite que você adicione itens apenas digitando e clicando em <enter>. Em seguida, ele converte esses itens em pílulas distintas que podem ser removidas por meio do ícone \"x\".",
+	"or": "ou",
+	"order": "Pedida",
+	"other": "De outros",
+	"overMaxAnonRows": "Desculpe, você só pode gerar %1 linhas. Para gerar grandes volumes de dados, você precisará de uma conta de usuário neste site.",
+	"panelContents": "Conteúdo do painel",
+	"panelContentsDesc": "A maior parte do painel de visualização contém uma amostra dos dados gerados, de acordo com os dados que você especificou no painel de grade e as configurações de Tipo de exportação selecionadas. Aqui está gerando 5 tipos de dados diferentes (País, Região, Cidade, Endereço e Postal / CEP) em formato de texto digitado.",
+	"panelControls": "Controles do painel",
+	"panelControlsClearIconDesc": "O último ícone nos controles do painel permite limpar a página para que você possa começar do zero.",
+	"panelControlsDesc": "Os botões de controle do painel permitem ocultar / mostrar os painéis Grade e Visualização, o que pode ser útil se você estiver trabalhando com espaço limitado na tela. Você também pode alternar o posicionamento dos dois painéis em relação um ao outro (esquerda-direita, topo-base) usando o terceiro ícone.",
+	"panelTabs": "Abas do painel",
+	"panelTabsDesc": "Por último, você deve ter notado que o painel está organizado em duas guias. Por padrão, ele mostra a guia Configurações, já que é onde você provavelmente deseja ir. Mas também há uma segunda guia \"Visualização\" que contém configurações para alterar a aparência do painel de visualização: o tema, ocultar / mostrar os números das linhas, alternar a quebra de linha, alterar o tamanho do texto e controlar o número de linhas geradas.",
+	"password": "Senha",
+	"passwordLabel": "Senha:",
+	"passwordReset": "Redefinição de senha",
+	"passwordResetAccountExpired": "Redefinição de senha - conta expirada",
+	"passwordResetAccountExpiredDesc": "Acabamos de receber uma solicitação para redefinir sua senha, mas sua conta já expirou.",
+	"passwordResetComplete": "Sua senha foi redefinida e você recebeu um e-mail com a nova senha.",
+	"passwordResetEmailContent1": "Sua senha foi alterada. Você pode usar a seguinte senha para fazer o login: %1",
+	"passwordResetEmailContent2": "Por favor, altere-o depois de fazer login.",
+	"passwordResetEmailDesc": "Recebemos uma solicitação para redefinir sua senha. Este e-mail contém uma senha única temporária que você pode usar para fazer login. Depois de fazer login, você precisará definir uma nova senha.",
+	"passwordResetMsg": "Se o e-mail estava em arquivo, sua senha foi redefinida e você recebeu um e-mail com informações de login temporárias.",
+	"passwordUpdateInvalidPassword": "Sua senha atual está incorreta. Por favor, entre novamente.",
+	"passwordUpdated": "Sua senha foi atualizada.",
+	"pause": "Pausa",
+	"pleaseConfirm": "Por favor confirme",
+	"pleaseEnterAll": "Por favor, insira tudo",
+	"pleaseEnterDataSetName": "Insira o nome do novo conjunto de dados.",
+	"pleaseFixErrors": "Corrija os seguintes erros e reenvie:",
+	"pleaseLogin": "Por favor entre",
+	"pleaseSelect": "Por favor selecione",
+	"plugins": "Plugins",
+	"pressEnterAddItem": "Pressione Enter para adicionar o item",
+	"preview": "Antevisão",
+	"previewPanel": "Painel de visualização",
+	"previewPanelControlsDesc": "No canto superior direito do painel, existem dois ícones. O primeiro ícone atualiza o painel, gerando diferentes dados aleatórios a cada vez - isso ajuda a dar uma ideia do tipo de dados que ele gera. O segundo ícone fecha o painel completamente. Você sempre pode mostrar o painel novamente usando a seção no canto inferior direito da página (basta selecionar novamente a caixa de seleção \"Visualizar\").",
+	"previewPanelDesc": "Este painel fornece uma visualização ao vivo dos dados que você está gerando, enquanto você os constrói por meio do painel de grade. O botão no canto superior esquerdo mostra o formato selecionado dos dados sendo gerados (por exemplo, SQL, XML, CSV etc.). Para alterar o formato, basta clicar no botão.",
+	"previewPanelMoreInfo": "Para obter mais informações sobre este painel, confira o tour do Painel de visualização.",
+	"previewPanelNoData": "Sem dados!",
+	"previewPanelTourDesc": "O painel de visualização oferece uma representação visual ao vivo dos dados que você está gerando enquanto os constrói. Este tour fornece uma introdução rápida de como o painel funciona.",
+	"previewRows": "Linhas de visualização",
+	"private": "Privada",
+	"problemLoadingTour": "Ocorreu um problema ao carregar o tour.",
+	"programmingLanguages": "Linguagens de programação",
+	"province": "Província",
+	"public": "Pública",
+	"publicQ": "Pública?",
+	"reenterPassword": "Digite novamente a senha",
+	"refreshPage": "Atualizar a página",
+	"refreshPanel": "Painel de atualização",
+	"register": "Registro",
+	"remainingTime": "Tempo restante:",
+	"requiredField": "Campo obrigatório",
+	"revertToVersion": "Reverter para esta versão",
+	"row": "Linha",
+	"rowLabel": "Título da Coluna",
+	"rowLabelPlural": "Títulos de Coluna",
+	"rowNumDesc1": "A primeira coluna da grade mostra o número da linha. Para reordenar a linha, basta clicar e arrastar este elemento para cima ou para baixo.",
+	"rowNumDesc2": "O valor do cabeçalho para esta coluna mostra o número total de linhas em sua grade. Isso pode ser útil quando você tem conjuntos de dados muito grandes e eles são grandes demais para caber na tela.",
+	"rowNumber": "Número da linha",
+	"rowSp": "Linha (s)",
+	"rows": "filas",
+	"rowsGenerated": "Linhas Geradas",
+	"rowsGeneratedPerSecond": "Linhas geradas por segundo",
+	"safariExplanation": "Este site requer um navegador da web atualizado que implemente padrões da web modernos. Infelizmente, o Safari ficou para trás em relação aos outros navegadores e não executa este script. Até descobrirmos como acomodá-lo, use um dos seguintes navegadores. Tudo grátis para download.",
+	"save": "Salvar",
+	"saveAs": "Salvar como",
+	"saveButtonDesc": "Se você tiver uma conta de usuário no site, este botão salvará seu conjunto de dados. Se você não estiver conectado, clicar nele solicitará que você faça o login primeiro. O sistema mantém um histórico das últimas alterações %1 em um conjunto de dados, para que você possa sempre voltar e ver as versões anteriores.",
+	"saveDataSetNewName": "Salvar conjunto de dados com um novo nome",
+	"seconds": "Segundas",
+	"seeHelpDialog": "Veja a caixa de diálogo de ajuda.",
+	"selectCountry": "Selecione o pais",
+	"selectDataType": "Selecione o tipo de dados",
+	"selectEllipsis": "Selecione ...",
+	"selectExpiryDate": "Selecione a data de validade",
+	"selectLanguage": "Selecione o idioma",
+	"sendEmail": "Enviar email",
+	"seriouslySlow": "Muito lento",
+	"settings": "Definições",
+	"showGrid": "Mostre as grades",
+	"showLineNumbers": "Mostrar números de linha",
+	"showPreview": "Mostrar Antevisão",
+	"siteLogo": "logotipo do site",
+	"size": "Tamanho:",
+	"southAmerica": "América do Sul",
+	"status": "Status",
+	"stripWhitespace": "retire os espaços em branco do conteúdo gerado",
+	"success": "sucesso",
+	"text": "Texto",
+	"textSize": "Tamanho do texto",
+	"theDataSetName": "O nome do conjunto de dados",
+	"theExportTypeBtn": "O botão Tipo de Exportação",
+	"theGenerateButton": "O Botão Gerar",
+	"theGridPanel": "O Painel de Grade",
+	"thePreviewPanel": "O painel de visualização",
+	"theSaveButton": "O botão Salvar",
+	"theme": "Tema",
+	"togglePanelLayout": "Alternar layout do painel",
+	"totalNumGeneratedRows": "Número total de linhas geradas",
+	"tourComplete": "Tour Completo",
+	"tourCompleteDesc": "Tudo feito! Escolha um dos botões abaixo para continuar.",
+	"tourIntroPara1": "Esta ferramenta oferece muitas funcionalidades e pode ser um pouco opressora no início. Clique em um dos botões à direita para fazer um tour sobre esse recurso específico.",
+	"tourIntroPara2": "Observe que, quando o tour começa, ele substitui temporariamente o conteúdo da página do gerador para ilustrar certas coisas sobre a interface. Mas não se preocupe! Assim que o passeio termina, ele retorna seus dados ao seu estado original.",
+	"tryDifferentTour": "Experimente um passeio diferente",
+	"update": "Atualizar",
+	"updateAccount": "Atualizar conta",
+	"user": "Do utilizador",
+	"userAccount": "Conta de usuário",
+	"userAccountNotFound": "Não foi possível encontrar sua conta.",
+	"userAccountUpdated": "A conta do usuário foi atualizada.",
+	"userAccounts": "Contas de usuário",
+	"userNotFound": "Desculpe, não foi possível identificar você. Por favor, verifique suas credenciais.",
+	"validationAccountAlreadyExists": "Desculpe, já existe uma conta com esse endereço de e-mail",
+	"validationDifferentNewPasswords": "Certifique-se de que suas senhas sejam iguais",
+	"validationInvalidEmail": "Por favor insira um endereço de e-mail válido",
+	"validationNoCurrentPassword": "Por favor insira sua senha atual",
+	"validationNoEmail": "Por favor, indique o seu endereço de e-mail",
+	"validationNoFirstName": "por favor entre com seu primeiro nome",
+	"validationNoLastName": "Por favor insira seu sobrenome",
+	"validationNoPassword": "Por favor, insira sua senha",
+	"version": "Versão",
+	"view": "Visualizar",
+	"viewChangelog": "Visualizar registro de alteração",
+	"viewOnGithub": "Ver no Github",
+	"welcomeToTheGenerator": "Bem-vindo ao gerador!",
+	"yes": "sim",
+	"yourAccount": "Sua conta",
+	"yourAccountUpdated": "Sua conta foi atualizada.",
+	"yourUserAccount": "Sua conta de usuário"
+}
\ No newline at end of file
diff --git a/apps/client/src/i18n/ru.json b/apps/client/src/i18n/ru.json
new file mode 100644
index 000000000..e6ae6f481
--- /dev/null
+++ b/apps/client/src/i18n/ru.json
@@ -0,0 +1,330 @@
+{
+	"abort": "Прервать",
+	"about": "О",
+	"aboutInfoPara1": "generateata.com — это проект с открытым исходным кодом, который я создал еще в эпоху позднего палеолита (около 2004 г.), и за время своего существования у него было много участников. Каждые несколько лет я переписываю его с использованием новейших и лучших доступных технологий: эта версия была завершена в 2021 году, сделана с помощью React, Redux, Typescript, GraphQL, Docker, веб-воркеров, резинок, изоленты и множества ругательств.",
+	"aboutInfoPara2": "Вы можете найти проект на github. Загрузите его, разветвите его или не стесняйтесь вносить свой вклад. Наслаждаться!",
+	"aboutThisScript": "Об этом скрипте",
+	"accountCreated": "Аккаунт создан",
+	"accountCreatedDesc": "Аккаунт создан.",
+	"accountCreatedMsg": "Для вас создана учетная запись.",
+	"accountDeleted": "Аккаунт удален.",
+	"accountDisabled": "Учетная запись отключена",
+	"accountExpiredMsg": "Извините, срок действия вашей учетной записи истек.",
+	"accountExpiryDate": "Дата истечения срока действия учетной записи",
+	"accountInfo": "Информация об аккаунте",
+	"accountSettings": "Настройки учетной записи",
+	"accountType": "Тип аккаунта",
+	"accounts": "учетные записи",
+	"add": "Добавлять",
+	"addRowsDesc": "Чтобы добавить больше строк в сетку данных, просто используйте форму внизу страницы. Если у вас много полей, этот раздел может быть скрыт за пределами страницы, поэтому вам придется прокрутить панель вниз, чтобы увидеть форму.",
+	"addSomeDataDesc": "Добавьте несколько строк в сетку.",
+	"admin": "Администратор",
+	"adminAccount": "Учетная запись администратора",
+	"administrator": "Администратор",
+	"africa": "Африка",
+	"allCountries": "Все страны",
+	"allDataTypePlugins": "Все плагины типов данных",
+	"allExportTypePlugins": "Все плагины типа экспорта",
+	"anonymousAccess": "Анонимный доступ",
+	"asia": "Азия",
+	"back": "назад",
+	"backToLogin": "Вернуться на страницу авторизации",
+	"blog": "Блог",
+	"cancel": "отменить",
+	"centralAmerica": "Центральная Америка",
+	"changePassword": "Изменить пароль",
+	"clear": "чистый",
+	"clearPage": "Очистить страницу",
+	"clearPageConfirmation": "Вы уверены, что хотите очистить страницу? Любые внесенные вами изменения будут потеряны.",
+	"clearThePage": "Очистить страницу",
+	"clickExportTypeBtn": "Следующий шаг показывает, что происходит, когда вы нажимаете кнопку.",
+	"close": "Закрывать",
+	"closePanel": "Закрыть панель",
+	"columns": "Столбцы",
+	"columnsDesc": "В сетке будет отображаться столько столбцов, сколько возможно, в зависимости от доступного размера экрана. Когда он слишком мал, он скроет некоторые столбцы и покажет значок шестеренки, который открывает информационную подсказку с отсутствующим содержимым. Следующие несколько шагов объясняют каждый из столбцов, используя первую строку Names в качестве демонстрации.",
+	"complete": "Полный",
+	"confirmDeleteAccount": "Вы уверены, что хотите удалить этот аккаунт?",
+	"confirmDeleteUserAccount": "Вы уверены, что хотите удалить эту учетную запись пользователя?",
+	"confirmEmptyForm": "Вы уверены, что хотите очистить страницу?",
+	"continue": "Продолжать",
+	"copiedToClipboard": "Скопировано в буфер обмена",
+	"copyToClipboard": "Скопировать в буфер обмена",
+	"coreExportType": "Основные форматы",
+	"countries": "Страны",
+	"country": "Страна",
+	"countrySpecific": "Для конкретной страны",
+	"cpuMeltinglyFast": "Очень быстро",
+	"createAccount": "Зарегистрироваться",
+	"currentPassword": "Текущий пароль",
+	"currentVersion": "Текущая версия редактируется",
+	"dataGenerated": "Сгенерированные данные.",
+	"dataSet": "Набор данных",
+	"dataSetHelp": "Здесь вы точно определяете, какие данные вы хотите генерировать. Попробуйте заполнить строку или две и нажмите кнопку «Создать». Вы довольно быстро освоитесь.",
+	"dataSetLoaded": "Набор данных загружен.",
+	"dataSetName": "Имя набора данных",
+	"dataSetNameDesc": "Нажмите на текст здесь, чтобы назвать свой набор данных. Обратите внимание, что вам потребуется учетная запись на сайте и вход в систему, чтобы назвать ваши наборы данных. Когда вы сохраняете свои наборы данных, это имя дает вам удобную метку для их отслеживания.",
+	"dataSetNameUpdated": "Имя набора данных обновлено.",
+	"dataSetOptions": "Параметры набора данных",
+	"dataSetReverted": "Ваш набор данных был возвращен к выбранной старой версии.",
+	"dataSetSaved": "Ваш набор данных сохранен.",
+	"dataSets": "Наборы данных",
+	"dataType": "Тип данных",
+	"dataTypeDesc": "Это раскрывающийся список, содержащий все доступные типы данных. Когда вы выберете значение, оно обновит оставшиеся столбцы для этой строки. Каждый тип данных имеет свои уникальные настройки, которые можно настроить.",
+	"dataTypes": "Типы данных",
+	"dateAccountCreated": "Дата создания учетной записи",
+	"dateCreated": "Дата создания",
+	"defaultLanguage": "Язык по умолчанию",
+	"delete": "Удалить",
+	"delete1DataSet": "Удалить 1 набор данных",
+	"deleteAccount": "Удалить аккаунт",
+	"deleteDataSet": "Удалить набор данных",
+	"deleteDataSetConfirm": "Вы уверены, что хотите удалить этот набор данных?",
+	"deleteRow": "Удалить строку",
+	"deleteRowDesc": "Последний столбец содержит значок удаления. При нажатии на нее строка будет удалена.",
+	"developer": "Разработчик",
+	"developerDoc": "Документ разработчика",
+	"disabled": "Неполноценный",
+	"documentation": "Документация",
+	"download": "Скачать",
+	"edit": "Редактировать",
+	"editAccount": "Редактировать аккаунт",
+	"editExportTypePage": "Когда вы нажимаете кнопку «Тип экспорта», появляется полностраничное представление, содержащее параметры конфигурации слева и панель предварительного просмотра справа.",
+	"editExportTypePageConfig": "Давайте посмотрим на параметры конфигурации.",
+	"editExportTypeSettings": "Измените настройки типа экспорта.",
+	"editingExportTypes": "Редактирование типов экспорта",
+	"email": "Эл. адрес",
+	"emailFooterDisclaimer": "Если вы получили это письмо по ошибке, обратитесь к администратору сайта.",
+	"emailIntroLineWithName": "Привет %1,",
+	"emailLabel": "Эл. адрес:",
+	"emailNotSent": "Нам не удалось отправить уведомление по электронной почте.",
+	"emailUserLoginInfo": "Отправьте пользователю электронное письмо с данными для входа",
+	"enterEmailAddressToResetPassword": "Введите свой адрес электронной почты ниже, чтобы сбросить пароль.",
+	"enterUserAccountDetails": "Введите данные своей учетной записи ниже.",
+	"errorCreatingAccount": "При создании этой учетной записи произошла ошибка.",
+	"estimatedSize": "Предполагаемый размер:",
+	"estimatedTime": "Расчетное время:",
+	"europe": "Европа",
+	"example": "Пример",
+	"exampleColumn": "Пример столбца",
+	"exampleColumnDesc": "Этот столбец может иметь или не иметь содержимого в зависимости от типа данных, выбранного для строки. Это просто удобный способ для некоторых типов данных предоставить предустановленные примеры того, как их можно использовать. Например, столбец «Имена» содержит раскрывающийся список различных форматов имен. Для всех типов данных вы по-прежнему можете настроить его вручную в столбце «Параметры»: это действительно способ сэкономить время, чтобы вы как можно быстрее освоились.",
+	"examples": "Примеры",
+	"exit": "Выход",
+	"expired": "Истекший",
+	"expiryDate": "Дата истечения срока",
+	"exportType": "Тип экспорта",
+	"exportTypeBtnDesc": "Кнопка в верхнем левом углу панели позволяет выбрать и настроить формат данных, которые вы хотите сгенерировать. Здесь он установлен на Typescript.",
+	"exportTypeOptionsSql": "Параметры типа экспорта: SQL",
+	"exportTypeOptionsSqlDesc": "Как видите, в SQL есть много других полей, специфичных для этого типа экспорта. Другие типы экспорта имеют другие настройки.",
+	"exportTypeOptionsTs": "Параметры типа экспорта: машинопись",
+	"exportTypeOptionsTsDesc": "В зависимости от выбранного типа экспорта тело панели может содержать дополнительные параметры. Здесь с Typescript есть два поля, позволяющие настроить имя типа и имя экспортируемой переменной.",
+	"exportTypeOptionsTsDesc2": "Теперь давайте посмотрим на SQL.",
+	"exportTypeSelection": "Выбор типа экспорта",
+	"exportTypeSelectionDesc": "Раскрывающийся список «Формат» позволяет выбрать формат для сгенерированного контента. Есть много опций, некоторые из них основные типы: SQL, CSV, SQL, JSON и другие, а некоторые из них предназначены для генерации данных для конкретных языков программирования.",
+	"exportTypes": "Типы экспорта",
+	"filterDataTypes": "Типы данных фильтра",
+	"financial": "финансовый",
+	"firstName": "Имя",
+	"forgottenYourPasswordQ": "Забыть пароль?",
+	"format": "Формат",
+	"generate": "Создать",
+	"generateBtnDesc": "После того, как вы закончили настройку набора данных и убедились, что он выглядит так, как вы хотите, пришло время создать объем данных! Нажмите эту кнопку, чтобы сгенерировать данные. В зависимости от количества строк в сетке данных и количества строк, которые вы хотите сгенерировать, это может занять некоторое время.",
+	"generated": "Сгенерировано",
+	"generatedC": "Сгенерировано:",
+	"generator": "Генератор",
+	"geo": "гео",
+	"grid": "Сетка",
+	"gridPanelTourDesc1": "Панель сетки — это место, где вы создаете данные, которые хотите сгенерировать. Здесь вы можете выбирать между различными типами данных, их настройкой и порядком отображения. В данном примере у нас есть пять полей: Имя, Телефон, Электронная почта, Адрес и Город.",
+	"gridPanelTourDesc2": "См. обзор панели сетки для получения более подробной информации по этому разделу.",
+	"gridPanelTourIntroDesc1": "Панель сетки — это место, где вы определяете, какие данные вы хотите сгенерировать. Для этого тура мы скрыли панель предварительного просмотра (см. неотмеченную кнопку «Предварительный просмотр» в правом нижнем углу страницы), чтобы дать нам немного больше места. Мы также добавили 10 строк различных типов данных только для иллюстрации.",
+	"gridPanelTourIntroDesc2": "Начнем со столбцов сетки.",
+	"help": "Помощь",
+	"helpIcon": "Значок справки",
+	"helpIconDesc": "Когда вы выбираете тип данных в предыдущем столбце, здесь появляется значок. При нажатии на нее открывается диалоговое окно справки, содержащее информацию об использовании.",
+	"hide": "Скрывать",
+	"hideShowGrid": "Скрыть/показать сетку",
+	"hideShowPreviewPanel": "Скрыть/показать панель предварительного просмотра",
+	"history": "История",
+	"historyPanelDesc": "На этой панели отображается история изменений, внесенных в набор данных. Нажмите кнопку «Просмотр», чтобы просмотреть более ранние версии. Чтобы вернуться к более ранней версии, просто просмотрите ее, затем нажмите кнопку «Вернуться к этой версии».",
+	"hostName": "Имя хоста",
+	"humanData": "Человеческие данные",
+	"ifWantToReregister": "Если вы хотите перерегистрироваться, пожалуйста, посетите:",
+	"incomplete": "Неполный",
+	"install": "Установить",
+	"introToGenerator": "Знакомство с генератором",
+	"introToGeneratorDesc": "В этом туре вы познакомитесь с основными функциями Генератора данных. Давайте начнем!",
+	"invalidSettings": "Неверные настройки!",
+	"language": "Английский",
+	"lastEdited": "последний отредактированный",
+	"lastLoggedIn": "Последний вход",
+	"lastModified": "Последнее изменение",
+	"lastName": "Фамилия",
+	"lastSaved": "последнее сохраненное",
+	"lineWrapping": "Перенос строки",
+	"linkToDataSet": "Ссылка на набор данных",
+	"linkToThisDataSet": "Ссылка на этот набор данных",
+	"live": "Жить",
+	"load": "Нагрузка",
+	"loading": "Загрузка...",
+	"login": "Авторизоваться",
+	"loginToSave": "Для того, чтобы сохранить ваши наборы данных, вам сначала нужна учетная запись. Пожалуйста, войдите ниже.",
+	"loginOrRegisterToSave": "Для того, чтобы сохранить ваши наборы данных, вам сначала нужна учетная запись. Пожалуйста, войдите или зарегистрируйтесь ниже.",
+	"loginUrlLabel": "URL-адрес входа:",
+	"logout": "Выйти",
+	"makeDataSetPublicAgreement": "Я понимаю, что для того, чтобы поделиться этим набором данных, мне нужно сделать его общедоступным.",
+	"metaDescription": "generateata.com: бесплатный генератор случайных пользовательских данных под лицензией GNU для тестирования программного обеспечения.",
+	"metaKeywords": "Случайные данные, тестовые данные, образцы данных, генератор данных, генерация данных",
+	"missingDataSetName": "Пожалуйста, введите название вашего набора данных",
+	"nameColumn": "Столбец имени",
+	"nameColumnDesc": "Этот столбец получает другой заголовок в зависимости от типа экспорта, который вы выбрали на панели предварительного просмотра (XML, CSV и т. д.). Цель этого столбца — предоставить идентификатор строки, который затем можно использовать в сгенерированных данных. Например, XML использует это значение в качестве имени узла XML; JSON использует его как имя свойства JSON; SQL использует его для имени столбца базы данных. Приложение автоматически проверит введенное здесь значение, чтобы убедиться, что оно допустимо для выбранного типа экспорта.",
+	"newDataSet": "Новый набор данных",
+	"no": "Нет",
+	"noAccountsCreated": "Аккаунты не созданы.",
+	"noAdditionalSettings": "Никаких дополнительных настроек.",
+	"noDataSetsSaved": "У вас нет сохраненных наборов данных.",
+	"noExamplesAvailable": "Нет доступных примеров.",
+	"noExpiry": "Нет срока действия",
+	"noHistory": "Еще нет истории.",
+	"noOptionsAvailable": "Нет доступных вариантов.",
+	"noSafari": "Жаль, нет сафари!",
+	"northAmerica": "Северная Америка",
+	"nowLoggedIn": "Вы вошли в систему.",
+	"nowLoggedOut": "Вы вышли из системы.",
+	"numResults": "Количество результатов",
+	"numeric": "Числовой",
+	"oceania": "Океания",
+	"oneTimePasswordLogin": "Вы вошли в систему, используя одноразовый пароль. Установите новый сейчас, иначе вы не сможете снова войти в систему.",
+	"open": "Открытым",
+	"options": "Опции",
+	"optionsColumn": "Столбец параметров",
+	"optionsColumnDesc1": "Этот столбец содержит все параметры конфигурации для типа данных этой строки. Некоторые типы данных имеют слишком много параметров конфигурации для отображения в таком маленьком пространстве (например, страна, регион), поэтому они могут просто отображать кнопку в сетке, которая открывает диалоговое окно, содержащее все параметры.",
+	"optionsColumnDesc2": "Для показанного здесь типа данных Names столбец содержит одно поле Creatable Pill. Это распространенный тип поля в генераторе данных. Он позволяет добавлять элементы, просто введя его и нажав <enter>. Затем он преобразует эти предметы в отдельные таблетки, которые можно удалить с помощью значка «x».",
+	"or": "или же",
+	"order": "Заказ",
+	"other": "Другой",
+	"overMaxAnonRows": "К сожалению, вы можете создать только %1 строк. Для создания больших объемов данных вам понадобится учетная запись пользователя на этом сайте.",
+	"panelContents": "Содержимое панели",
+	"panelContentsDesc": "Основная часть панели предварительного просмотра содержит образец сгенерированных данных в соответствии с данными, указанными на панели сетки, и выбранными настройками типа экспорта. Здесь он генерирует 5 различных типов данных (страна, регион, город, почтовый адрес и почтовый индекс) в формате машинописного текста.",
+	"panelControls": "Панель управления",
+	"panelControlsClearIconDesc": "Последний значок на панели управления позволяет очистить страницу, чтобы вы могли начать заново.",
+	"panelControlsDesc": "Кнопки управления панелью позволяют скрывать/показывать панели «Сетка» и «Предварительный просмотр», что может быть полезно, если вы работаете с ограниченным пространством экрана. Вы также можете переключать размещение двух панелей относительно друг друга (слева направо, сверху вниз) с помощью третьего значка.",
+	"panelTabs": "Вкладки панели",
+	"panelTabsDesc": "Наконец, вы могли заметить, что панель состоит из двух вкладок. По умолчанию отображается вкладка «Настройки», так как именно туда вы, скорее всего, захотите перейти. Но есть и вторая вкладка «Предварительный просмотр», которая содержит настройки для изменения внешнего вида панели предварительного просмотра: тема, скрытие/отображение номеров строк, переключение переноса строк, изменение размера текста и управление количеством сгенерированных строк.",
+	"password": "Пароль",
+	"passwordLabel": "Пароль:",
+	"passwordReset": "Восстановление пароля",
+	"passwordResetAccountExpired": "Сброс пароля - срок действия учетной записи истек",
+	"passwordResetAccountExpiredDesc": "Мы только что получили запрос на сброс вашего пароля, однако срок действия вашей учетной записи уже истек.",
+	"passwordResetComplete": "Ваш пароль был сброшен, и новый пароль был отправлен вам по электронной почте.",
+	"passwordResetEmailContent1": "Ваш пароль был сброшен. Вы можете использовать следующий пароль для входа в систему: %1",
+	"passwordResetEmailContent2": "Пожалуйста, измените его после входа в систему.",
+	"passwordResetEmailDesc": "Мы получили запрос на сброс вашего пароля. Это электронное письмо содержит временный одноразовый пароль, который вы можете использовать для входа в систему. После входа вам потребуется установить новый пароль.",
+	"passwordResetMsg": "Если электронное письмо было в файле, ваш пароль был сброшен, и вам была отправлена временная информация для входа в систему.",
+	"passwordUpdateInvalidPassword": "Ваш текущий пароль неверен. Пожалуйста, введите еще раз.",
+	"passwordUpdated": "Ваш пароль был обновлен.",
+	"pause": "Пауза",
+	"pleaseConfirm": "Пожалуйста подтвердите",
+	"pleaseEnterAll": "Пожалуйста, введите все",
+	"pleaseEnterDataSetName": "Пожалуйста, введите название нового набора данных.",
+	"pleaseFixErrors": "Пожалуйста, исправьте следующие ошибки и повторите отправку:",
+	"pleaseLogin": "Пожалуйста, войдите",
+	"pleaseSelect": "Пожалуйста выберите",
+	"plugins": "Плагины",
+	"pressEnterAddItem": "Нажмите Enter, чтобы добавить элемент",
+	"preview": "Предварительный просмотр",
+	"previewPanel": "Панель предварительного просмотра",
+	"previewPanelControlsDesc": "В правом верхнем углу панели есть две иконки. Первый значок обновляет панель, каждый раз генерируя разные случайные данные — это помогает вам понять, какие данные он генерирует. Второй значок полностью закрывает панель. Вы всегда можете отобразить панель снова, используя раздел в правом нижнем углу страницы (просто повторно установите флажок «Предварительный просмотр»).",
+	"previewPanelDesc": "Эта панель дает вам предварительный просмотр данных, которые вы генерируете, в то время как вы строите их с помощью панели сетки. Кнопка в левом верхнем углу показывает выбранный формат генерируемых данных (например, SQL, XML, CSV и т. д.). Чтобы изменить формат, просто нажмите на кнопку.",
+	"previewPanelMoreInfo": "Для получения дополнительной информации об этой панели ознакомьтесь с обзором панели предварительного просмотра.",
+	"previewPanelNoData": "Нет данных!",
+	"previewPanelTourDesc": "Панель предварительного просмотра дает вам живое визуальное представление данных, которые вы создаете по мере их построения. Этот тур дает краткое представление о том, как работает панель.",
+	"previewRows": "Предварительный просмотр строк",
+	"private": "Частный",
+	"problemLoadingTour": "Извините, возникла проблема с загрузкой тура.",
+	"programmingLanguages": "Языки программирования",
+	"province": "Провинция",
+	"public": "Общественный",
+	"publicQ": "Общественный?",
+	"reenterPassword": "Повторно введите пароль",
+	"refreshPage": "Обновить страницу",
+	"refreshPanel": "Обновить панель",
+	"register": "регистр",
+	"remainingTime": "Оставшееся время:",
+	"requiredField": "Обязательное поле",
+	"revertToVersion": "Вернуться к этой версии",
+	"row": "Строка",
+	"rowLabel": "Название столбца",
+	"rowLabelPlural": "Заголовки столбцов",
+	"rowNumDesc1": "Первый столбец в сетке показывает номер строки. Чтобы изменить порядок строк, просто нажмите и перетащите этот элемент вверх или вниз.",
+	"rowNumDesc2": "Значение заголовка для этого столбца показывает общее количество строк в сетке. Это может быть удобно, когда у вас очень большие наборы данных, и они слишком велики, чтобы поместиться на экране.",
+	"rowNumber": "Номер строки",
+	"rowSp": "Ряд (ы)",
+	"rows": "ряды",
+	"rowsGenerated": "Созданные строки",
+	"rowsGeneratedPerSecond": "Количество строк в секунду",
+	"safariExplanation": "Для этого сайта требуется современный веб-браузер, реализующий современные веб-стандарты. К сожалению, Safari отстает от других браузеров и не запускает этот скрипт. Пока мы не выясним, как это сделать, используйте один из следующих браузеров. Все бесплатно для скачивания.",
+	"save": "Сохранять",
+	"saveAs": "Сохранить как",
+	"saveButtonDesc": "Если у вас есть учетная запись пользователя на сайте, эта кнопка сохранит ваш набор данных. Если вы не вошли в систему, нажмите на нее, чтобы сначала войти в систему. Система хранит историю последних %1 изменений в наборе данных, поэтому вы всегда можете вернуться и просмотреть более ранние версии.",
+	"saveDataSetNewName": "Сохранить набор данных под новым именем",
+	"seconds": "Секунды",
+	"seeHelpDialog": "См. диалоговое окно справки.",
+	"selectCountry": "Выберите страну",
+	"selectDataType": "Выберите тип данных",
+	"selectEllipsis": "Выбирать...",
+	"selectExpiryDate": "Выберите срок действия",
+	"selectLanguage": "Выберите язык",
+	"sendEmail": "Отправить письмо",
+	"seriouslySlow": "Серьезно медленный",
+	"settings": "Настройки",
+	"showGrid": "Показать сетку",
+	"showLineNumbers": "Показать номера строк",
+	"showPreview": "Показать предварительный просмотр",
+	"siteLogo": "логотип сайта",
+	"size": "Размер:",
+	"southAmerica": "Южная Америка",
+	"status": "Статус",
+	"stripWhitespace": "удалить пробелы из сгенерированного контента",
+	"success": "успех",
+	"takeTour": "Совершите экскурсию",
+	"text": "Текст",
+	"textSize": "Размер текста",
+	"theDataSetName": "Имя набора данных",
+	"theExportTypeBtn": "Кнопка «Тип экспорта»",
+	"theGenerateButton": "Кнопка «Создать»",
+	"theGridPanel": "Панель сетки",
+	"thePreviewPanel": "Панель предварительного просмотра",
+	"theSaveButton": "Кнопка Сохранить",
+	"theme": "Тема",
+	"togglePanelLayout": "Переключить макет панели",
+	"totalNumGeneratedRows": "Общее количество сгенерированных строк",
+	"tourComplete": "Тур завершен",
+	"tourCompleteDesc": "Все сделано! Выберите одну из кнопок ниже, чтобы продолжить.",
+	"tourIntroPara1": "Этот инструмент предоставляет множество функций, и поначалу он может быть немного ошеломляющим. Нажмите на одну из кнопок справа, чтобы ознакомиться с этой конкретной функцией.",
+	"tourIntroPara2": "Обратите внимание, что при запуске тура содержимое страницы генератора временно перезаписывается, чтобы проиллюстрировать некоторые особенности интерфейса. Но не волнуйтесь! Как только тур завершен, он возвращает ваши данные в исходное состояние.",
+	"tryDifferentTour": "Попробуйте другой тур",
+	"update": "Обновлять",
+	"updateAccount": "Обновить учетную запись",
+	"user": "Пользователь",
+	"userAccount": "Учетная запись пользователя",
+	"userAccountNotFound": "Извините, мы не смогли найти ваш аккаунт.",
+	"userAccountUpdated": "Учетная запись пользователя обновлена.",
+	"userAccounts": "Учетные записи пользователей",
+	"userNotFound": "К сожалению, нам не удалось вас идентифицировать. Пожалуйста, проверьте свои учетные данные.",
+	"validationAccountAlreadyExists": "К сожалению, учетная запись с таким адресом электронной почты уже существует",
+	"validationDifferentNewPasswords": "Убедитесь, что ваши пароли совпадают",
+	"validationInvalidEmail": "Пожалуйста, введите действительный адрес электронной почты",
+	"validationNoCurrentPassword": "Пожалуйста, введите текущий пароль",
+	"validationNoEmail": "Пожалуйста, введите свой адрес электронной почты",
+	"validationNoFirstName": "Пожалуйста, введите ваше имя",
+	"validationNoLastName": "Пожалуйста, введите свою фамилию",
+	"validationNoPassword": "Пожалуйста введите ваш пароль",
+	"version": "Версия",
+	"view": "Вид",
+	"viewChangelog": "Посмотреть список изменений",
+	"viewOnGithub": "Посмотреть на Гитхабе",
+	"welcomeToTheGenerator": "Добро пожаловать в генератор!",
+	"yes": "Да",
+	"yourAccount": "Ваш счет",
+	"yourAccountUpdated": "Ваш аккаунт был обновлен.",
+	"yourUserAccount": "Ваша учетная запись пользователя"
+}
diff --git a/apps/client/src/i18n/ta.json b/apps/client/src/i18n/ta.json
new file mode 100644
index 000000000..6a21b057a
--- /dev/null
+++ b/apps/client/src/i18n/ta.json
@@ -0,0 +1,329 @@
+{
+	"abort": "நிறுத்து",
+	"about": "பற்றி",
+	"aboutInfoPara1": "generatedata.com என்பது ஒரு ஓப்பன் சோர்ஸ் ப்ராஜெக்ட் ஆகும், இது பிற்கால பேலியோலிதிக் சகாப்தத்தில் (சுமார் 2004) உருவாக்கப்பட்டது மற்றும் அதன் வாழ்நாளில் பல பங்களிப்பாளர்களைக் கொண்டுள்ளது. ஒவ்வொரு சில வருடங்களுக்கும் சமீபத்திய மற்றும் மிகப் பெரிய தொழில்நுட்பங்களைப் பயன்படுத்தி நான் அதை மீண்டும் எழுதுகிறேன்: இந்த பதிப்பு 2021 இல் நிறைவடைந்தது, இது ரியாக்ட், ரெடக்ஸ், டைப்ஸ்கிரிப்ட், கிராஃப்குஎல், டோக்கர், வலைத் தொழிலாளர்கள், ரப்பர் பேண்டுகள், டக்ட் டேப் மற்றும் நிறைய சாபங்களால் செய்யப்பட்டது.",
+	"aboutInfoPara2": "நீங்கள் திட்டத்தை கிதுப்பில் காணலாம். அதைப் பதிவிறக்குங்கள், முட்கரண்டி அல்லது பங்களிக்க தயங்க. மகிழுங்கள்!",
+	"aboutThisScript": "இந்த ஸ்கிரிப்ட் பற்றி",
+	"accountCreated": "கணக்கு உருவாக்கப்பட்டது",
+	"accountCreatedDesc": "கணக்கு உருவாக்கப்பட்டது.",
+	"accountCreatedMsg": "உங்களுக்காக ஒரு கணக்கு உருவாக்கப்பட்டது.",
+	"accountDeleted": "கணக்கு நீக்கப்பட்டது.",
+	"accountDisabled": "கணக்கு முடக்கப்பட்டது",
+	"accountExpiredMsg": "மன்னிக்கவும், உங்கள் கணக்கு காலாவதியாகிவிட்டது.",
+	"accountExpiryDate": "கணக்கு காலாவதி தேதி",
+	"accountInfo": "கணக்கு தகவல்",
+	"accountSettings": "கணக்கு அமைப்புகள்",
+	"accountType": "கணக்கு வகை",
+	"accounts": "கணக்குகள்",
+	"add": "கூட்டு",
+	"addRowsDesc": "தரவு கட்டத்தில் கூடுதல் வரிசைகளைச் சேர்க்க, பக்கத்தின் கீழே உள்ள படிவத்தைப் பயன்படுத்தவும். உங்களிடம் நிறைய புலங்கள் இருக்கும்போது, இந்த பகுதி பக்கத்திலிருந்து மறைக்கப்படலாம், எனவே படிவத்தைக் காண நீங்கள் பேனலை கீழே உருட்ட வேண்டும்.",
+	"addSomeDataDesc": "கட்டத்தில் சில வரிசைகளைச் சேர்க்கவும்.",
+	"admin": "நிர்வாகம்",
+	"adminAccount": "நிர்வாகி கணக்கு",
+	"administrator": "நிர்வாகி",
+	"africa": "ஆப்பிரிக்கா",
+	"allCountries": "அனைத்து நாடுகளும்",
+	"allDataTypePlugins": "அனைத்து தரவு வகை செருகுநிரல்களும்",
+	"allExportTypePlugins": "அனைத்து ஏற்றுமதி வகை செருகுநிரல்களும்",
+	"anonymousAccess": "அநாமதேய அணுகல்",
+	"asia": "ஆசியா",
+	"back": "மீண்டும்",
+	"backToLogin": "உள்நுழைய திரும்பவும்",
+	"blog": "வலைப்பதிவு",
+	"cancel": "ரத்துசெய்",
+	"centralAmerica": "மத்திய அமெரிக்கா",
+	"changePassword": "கடவுச்சொல்லை மாற்று",
+	"clear": "அழி",
+	"clearPage": "பக்கத்தை அழி",
+	"clearPageConfirmation": "பக்கத்தை அழிக்க விரும்புகிறீர்களா? நீங்கள் செய்த எந்த மாற்றங்களும் இழக்கப்படும்.",
+	"clearThePage": "பக்கத்தை அழிக்கவும்",
+	"clickExportTypeBtn": "அடுத்த கட்டம் நீங்கள் பொத்தானைக் கிளிக் செய்தால் என்ன நடக்கும் என்பதைக் காட்டுகிறது.",
+	"close": "நெருக்கமான",
+	"closePanel": "பேனலை மூடு",
+	"columns": "நெடுவரிசைகள்",
+	"columnsDesc": "உங்களுடைய கிடைக்கக்கூடிய திரை அளவைப் பொறுத்து, இந்த நெடுவரிசைகளில் பலவற்றைக் கட்டம் காண்பிக்கும். இது மிகச் சிறியதாக இருக்கும்போது, அது சில நெடுவரிசைகளை மறைத்து, காணாமல் போன உள்ளடக்கத்துடன் ஒரு இன்போடிப்பைத் திறக்கும் ஒரு கோக் ஐகானைக் காண்பிக்கும். அடுத்த சில படிகள் ஒவ்வொரு நெடுவரிசைகளையும் விளக்குகின்றன, முதல் பெயர்கள் வரிசையை ஒரு ஆர்ப்பாட்டமாகப் பயன்படுத்துகின்றன.",
+	"complete": "முழுமை",
+	"confirmDeleteAccount": "இந்த கணக்கை நீக்க விரும்புகிறீர்களா?",
+	"confirmDeleteUserAccount": "இந்த பயனர் கணக்கை நீக்க விரும்புகிறீர்களா?",
+	"confirmEmptyForm": "பக்கத்தை அழிக்க விரும்புகிறீர்களா?",
+	"continue": "தொடரவும்",
+	"copiedToClipboard": "கிளிப்போர்டுக்கு நகலெடுக்கப்பட்டது",
+	"copyToClipboard": "கிளிப்போர்டுக்கு நகலெடுக்கவும்",
+	"coreExportType": "கோர் வடிவங்கள்",
+	"countries": "நாடுகள்",
+	"country": "நாடு",
+	"countrySpecific": "நாடு சார்ந்த",
+	"cpuMeltinglyFast": "CPU- உருகும் வேகமாக",
+	"createAccount": "உங்கள் கணக்கை துவங்குங்கள்",
+	"currentPassword": "தற்போதைய கடவுச்சொல்",
+	"currentVersion": "தற்போதைய பதிப்பு திருத்தப்பட்டது",
+	"dataGenerated": "தரவு உருவாக்கப்பட்டது.",
+	"dataSet": "தரவு தொகுப்பு",
+	"dataSetHelp": "நீங்கள் எந்த வகையான தரவை உருவாக்க விரும்புகிறீர்கள் என்பதை நீங்கள் வரையறுக்கிறீர்கள். ஒரு வரிசையில் அல்லது இரண்டில் நிரப்ப முயற்சிக்கவும், உருவாக்கு பொத்தானைக் கிளிக் செய்யவும். நீங்கள் அதை மிக வேகமாகப் பெறுவீர்கள்.",
+	"dataSetLoaded": "தரவு தொகுப்பு ஏற்றப்பட்டது.",
+	"dataSetName": "தரவு தொகுப்பு பெயர்",
+	"dataSetNameDesc": "உங்கள் தரவு தொகுப்பிற்கு பெயரிட இங்கே உரையில் கிளிக் செய்க. தளத்தில் உங்களுக்கு ஒரு கணக்கு தேவை என்பதையும், உங்கள் தரவுத் தொகுப்புகளுக்கு பெயரிட உள்நுழைவதையும் நினைவில் கொள்க. உங்கள் தரவுத் தொகுப்புகளைச் சேமிக்கும்போது, அவற்றைக் கண்காணிக்க இந்த பெயர் உங்களுக்கு வசதியான லேபிளை வழங்குகிறது.",
+	"dataSetNameUpdated": "தரவு தொகுப்பு பெயர் புதுப்பிக்கப்பட்டது.",
+	"dataSetOptions": "தரவு தொகுப்பு விருப்பங்கள்",
+	"dataSetReverted": "உங்கள் தரவு தொகுப்பு தேர்ந்தெடுக்கப்பட்ட பழைய பதிப்பிற்கு மாற்றப்பட்டது.",
+	"dataSetSaved": "உங்கள் தரவு தொகுப்பு சேமிக்கப்பட்டது.",
+	"dataSets": "தரவு அமைக்கிறது",
+	"dataType": "தரவு வகை",
+	"dataTypeDesc": "இது கிடைக்கக்கூடிய அனைத்து தரவு வகைகளையும் கொண்ட ஒரு கீழ்தோன்றல் ஆகும். நீங்கள் ஒரு மதிப்பைத் தேர்ந்தெடுக்கும்போது, அந்த வரிசையின் மீதமுள்ள நெடுவரிசைகளை இது புதுப்பிக்கும். தனிப்பயனாக்கத்தை அனுமதிக்க ஒவ்வொரு தரவு வகைக்கும் அதன் தனித்துவமான அமைப்புகள் உள்ளன.",
+	"dataTypes": "தரவு வகைகள்",
+	"dateAccountCreated": "தேதி கணக்கு உருவாக்கப்பட்டது",
+	"dateCreated": "உருவாக்கிய தேதி",
+	"defaultLanguage": "இயல்புநிலை மொழி",
+	"delete": "அழி",
+	"delete1DataSet": "1 தரவு தொகுப்பை நீக்கு",
+	"deleteAccount": "கணக்கை நீக்குக",
+	"deleteDataSet": "தரவு தொகுப்பை நீக்கு",
+	"deleteDataSetConfirm": "இந்த தரவு தொகுப்பை நீக்க விரும்புகிறீர்களா?",
+	"deleteRow": "வரிசையை நீக்கு",
+	"deleteRowDesc": "கடைசி நெடுவரிசையில் நீக்கு ஐகான் உள்ளது. அதைக் கிளிக் செய்தால் வரிசையை நீக்கும்.",
+	"developer": "டெவலப்பர்",
+	"developerDoc": "டெவலப்பர் ஆவணம்",
+	"disabled": "முடக்கப்பட்டது",
+	"documentation": "ஆவணம்",
+	"download": "பதிவிறக்க Tamil",
+	"edit": "தொகு",
+	"editAccount": "கணக்கைத் திருத்து",
+	"editExportTypePage": "ஏற்றுமதி வகை பொத்தானைக் கிளிக் செய்யும்போது, இடது பக்கத்தில் உள்ள உள்ளமைவு விருப்பங்கள் மற்றும் வலதுபுறத்தில் மாதிரிக்காட்சி குழு ஆகியவற்றைக் கொண்ட முழு பக்கக் காட்சி தோன்றும்.",
+	"editExportTypePageConfig": "உள்ளமைவு விருப்பங்களைப் பார்ப்போம்.",
+	"editExportTypeSettings": "உங்கள் ஏற்றுமதி வகை அமைப்புகளைத் திருத்தவும்.",
+	"editingExportTypes": "ஏற்றுமதி வகைகளைத் திருத்துதல்",
+	"email": "மின்னஞ்சல்",
+	"emailFooterDisclaimer": "இந்த மின்னஞ்சலை நீங்கள் பிழையாகப் பெற்றிருந்தால், தள நிர்வாகியை அணுகவும்.",
+	"emailIntroLineWithName": "ஹாய் %1,",
+	"emailLabel": "மின்னஞ்சல்:",
+	"emailNotSent": "மின்னஞ்சல் அறிவிப்பை எங்களால் அனுப்ப முடியவில்லை.",
+	"emailUserLoginInfo": "பயனரின் உள்நுழைவு தகவலுக்கு மின்னஞ்சல் அனுப்புங்கள்",
+	"enterEmailAddressToResetPassword": "உங்கள் கடவுச்சொல்லை மீட்டமைக்க கீழே உங்கள் மின்னஞ்சல் முகவரியை உள்ளிடவும்.",
+	"enterUserAccountDetails": "உங்கள் பயனர் கணக்கு விவரங்களை கீழே உள்ளிடவும்.",
+	"errorCreatingAccount": "இந்த கணக்கை உருவாக்குவதில் பிழை ஏற்பட்டது.",
+	"estimatedSize": "மதிப்பிடப்பட்ட அளவு:",
+	"estimatedTime": "கணிக்கப்பட்ட நேரம்:",
+	"europe": "ஐரோப்பா",
+	"example": "உதாரணமாக",
+	"exampleColumn": "எடுத்துக்காட்டு நெடுவரிசை",
+	"exampleColumnDesc": "இந்த நெடுவரிசையில் நீங்கள் வரிசைக்குத் தேர்ந்தெடுத்த தரவு வகையைப் பொறுத்து உள்ளடக்கம் இருக்கலாம் அல்லது இல்லாமல் இருக்கலாம். சில தரவு வகைகள் எவ்வாறு பயன்படுத்தப்படலாம் என்பதற்கான முன்னமைக்கப்பட்ட எடுத்துக்காட்டுகளை வழங்க இது ஒரு வசதியான வழியாகும். எடுத்துக்காட்டாக, பெயர்கள் நெடுவரிசை வெவ்வேறு பெயர் வடிவங்களின் கீழ்தோன்றலை வழங்குகிறது. எல்லா தரவு வகைகளுக்கும், விருப்பத்தேர்வுகள் நெடுவரிசை மூலம் நீங்கள் அதை கைமுறையாக உள்ளமைக்க முடியும்: இது உங்களை விரைவாக விரைவாகச் சேர்ப்பதற்கான நேரத்தைச் சேமிக்கும் சாதனமாகும்.",
+	"examples": "எடுத்துக்காட்டுகள்",
+	"exit": "வெளியேறு",
+	"expired": "காலாவதியான",
+	"expiryDate": "காலாவதி தேதி",
+	"exportType": "ஏற்றுமதி வகை",
+	"exportTypeBtnDesc": "பேனலின் மேல் இடதுபுறத்தில் உள்ள பொத்தானை நீங்கள் உருவாக்க விரும்பும் தரவிற்கான வடிவமைப்பைத் தேர்ந்தெடுத்து உள்ளமைக்க நீங்கள் செல்கிறீர்கள். இங்கே இது டைப்ஸ்கிரிப்டாக அமைக்கப்பட்டுள்ளது.",
+	"exportTypeOptionsSql": "ஏற்றுமதி வகை விருப்பங்கள்: SQL",
+	"exportTypeOptionsSqlDesc": "நீங்கள் பார்க்கிறபடி, இந்த ஏற்றுமதி வகைக்கு குறிப்பிட்ட பல துறைகள் SQL இல் உள்ளன. பிற ஏற்றுமதி வகைகள் வெவ்வேறு அமைப்புகளைக் கொண்டுள்ளன.",
+	"exportTypeOptionsTs": "ஏற்றுமதி வகை விருப்பங்கள்: தட்டச்சு",
+	"exportTypeOptionsTsDesc": "தேர்ந்தெடுக்கப்பட்ட ஏற்றுமதி வகையைப் பொறுத்து, பேனல் உடலில் கூடுதல் விருப்பங்கள் இருக்கலாம். இங்கே டைப்ஸ்கிரிப்டுடன் இரண்டு புலங்கள் உள்ளன, இது வகை பெயர் மற்றும் ஏற்றுமதி செய்யப்பட்ட மாறி பெயரைத் தனிப்பயனாக்க அனுமதிக்கிறது.",
+	"exportTypeOptionsTsDesc2": "இப்போது SQL ஐப் பார்ப்போம்.",
+	"exportTypeSelection": "ஏற்றுமதி வகை தேர்வு",
+	"exportTypeSelectionDesc": "உருவாக்கப்பட்ட உள்ளடக்கத்திற்கான வடிவமைப்பைத் தேர்வுசெய்ய வடிவமைப்பு கீழ்தோன்றல் உங்களை அனுமதிக்கிறது. பல விருப்பங்கள் உள்ளன, அவற்றில் சில முக்கிய வகைகள்: SQL, CSV, SQL, JSON மற்றும் பிற, மற்றும் அவற்றில் சில குறிப்பிட்ட நிரலாக்க மொழிகளுக்கான தரவை உருவாக்குவதற்கானவை.",
+	"exportTypes": "ஏற்றுமதி வகைகள்",
+	"filterDataTypes": "தரவு வகைகளை வடிகட்டவும்",
+	"financial": "நிதி",
+	"firstName": "முதல் பெயர்",
+	"forgottenYourPasswordQ": "கடவுச்சொல்லை மறந்து?",
+	"format": "வடிவம்",
+	"generate": "உருவாக்கு",
+	"generateBtnDesc": "உங்கள் தரவு தொகுப்பை உள்ளமைத்து முடித்ததும், நீங்கள் எப்படி விரும்புகிறீர்கள் என்று உறுதிசெய்ததும், சில தரவை அளவிலேயே உருவாக்க வேண்டிய நேரம் இது! உங்கள் தரவை உருவாக்க இந்த பொத்தானைக் கிளிக் செய்க. தரவு கட்டத்தில் உள்ள வரிசைகளின் எண்ணிக்கை மற்றும் நீங்கள் உருவாக்க விரும்பும் வரிசைகளின் எண்ணிக்கையைப் பொறுத்து, இதற்கு சிறிது நேரம் ஆகலாம்.",
+	"generated": "உருவாக்கப்பட்டது",
+	"generatedC": "உருவாக்கப்பட்டது:",
+	"generator": "ஜெனரேட்டர்",
+	"geo": "புவி",
+	"grid": "கட்டம்",
+	"gridPanelTourDesc1": "நீங்கள் உருவாக்க விரும்பும் தரவை நீங்கள் கட்டமைக்கும் இடம் கட்டம் குழு. வெவ்வேறு தரவு வகைகள், அவை எவ்வாறு கட்டமைக்கப்படுகின்றன மற்றும் அவை தோன்றும் வரிசைக்கு இடையில் இங்கே நீங்கள் தேர்வு செய்யலாம். இங்கே எடுத்துக்காட்டில், எங்களிடம் ஐந்து துறைகள் உள்ளன: பெயர், தொலைபேசி, மின்னஞ்சல், தெரு முகவரி மற்றும் நகரம்.",
+	"gridPanelTourDesc2": "இந்த பகுதியைப் பற்றிய கூடுதல் தகவலுக்கு கட்டம் பேனலில் சுற்றுப்பயணத்தைப் பார்க்கவும்.",
+	"gridPanelTourIntroDesc1": "நீங்கள் உருவாக்க விரும்பும் தரவை நீங்கள் வரையறுக்கும் இடமே கட்டம் குழு. இந்த சுற்றுப்பயணத்திற்காக, எங்களுக்கு இன்னும் கொஞ்சம் இடத்தை வழங்க, முன்னோட்ட பேனலை மறைத்துள்ளோம் (பக்கத்தின் கீழ் வலதுபுறத்தில் தேர்வு செய்யப்படாத \"முன்னோட்டம்\" பொத்தானைக் காண்க). எடுத்துக்காட்டு நோக்கங்களுக்காக, வெவ்வேறு தரவு வகைகளின் 10 வரிசைகளையும் சேர்த்துள்ளோம்.",
+	"gridPanelTourIntroDesc2": "கட்டம் நெடுவரிசைகளுடன் தொடங்குவோம்.",
+	"help": "உதவி",
+	"helpIcon": "ஐகானுக்கு உதவுங்கள்",
+	"helpIconDesc": "முந்தைய நெடுவரிசையில் தரவு வகையைத் தேர்ந்தெடுக்கும்போது, ஒரு ஐகான் இங்கே தோன்றும். அதைக் கிளிக் செய்தால் பயன்பாட்டுத் தகவல் அடங்கிய உதவி உரையாடலைத் திறக்கும்.",
+	"hide": "மறை",
+	"hideShowGrid": "கட்டத்தை மறை / காட்டு",
+	"hideShowPreviewPanel": "முன்னோட்ட பேனலை மறைக்க / காண்பி",
+	"history": "வரலாறு",
+	"historyPanelDesc": "தரவுத் தொகுப்பில் செய்யப்பட்ட மாற்றங்களின் வரலாற்றை இந்த குழு காட்டுகிறது. முந்தைய பதிப்புகளை ஆராய காட்சி பொத்தான்களைக் கிளிக் செய்க. முந்தைய பதிப்பிற்கு மாற்ற, அதைப் பார்க்கவும், பின்னர் \"இந்த பதிப்பிற்குத் திரும்பு\" பொத்தானைக் கிளிக் செய்யவும்.",
+	"hostName": "புரவலன் பெயர்",
+	"humanData": "மனித தரவு",
+	"ifWantToReregister": "நீங்கள் மீண்டும் பதிவு செய்ய விரும்பினால் தயவுசெய்து பார்வையிடவும்:",
+	"incomplete": "முழுமையற்றது",
+	"install": "நிறுவு",
+	"introToGenerator": "ஜெனரேட்டருக்கு அறிமுகம்",
+	"introToGeneratorDesc": "இந்த சுற்றுப்பயணம் தரவு ஜெனரேட்டரின் முக்கிய அம்சங்களுக்கு உயர் மட்ட அறிமுகத்தை உங்களுக்கு வழங்குகிறது. தொடங்குவோம்!",
+	"invalidSettings": "தவறான அமைப்புகள்!",
+	"language": "ஆங்கிலம்",
+	"lastEdited": "கடைசியாக திருத்தப்பட்டது",
+	"lastLoggedIn": "கடைசியாக உள்நுழைந்தது",
+	"lastModified": "கடைசியாக மாற்றியமைக்கப்பட்டது",
+	"lastName": "கடைசி பெயர்",
+	"lastSaved": "கடைசியாக சேமிக்கப்பட்டது",
+	"lineWrapping": "வரி மடக்குதல்",
+	"linkToDataSet": "தரவு தொகுப்புக்கான இணைப்பு",
+	"linkToThisDataSet": "இந்த தரவு தொகுப்பிற்கான இணைப்பு",
+	"live": "வாழ்க",
+	"load": "ஏற்றவும்",
+	"loading": "ஏற்றுகிறது ...",
+	"login": "உள்நுழைய",
+	"loginToSave": "உங்கள் தரவுத் தொகுப்புகளைச் சேமிக்க முதலில் உங்களுக்கு ஒரு கணக்கு தேவை. கீழே உள்நுழையவும்.",
+	"loginOrRegisterToSave": "உங்கள் தரவுத் தொகுப்புகளைச் சேமிக்க முதலில் உங்களுக்கு ஒரு கணக்கு தேவை. உள்நுழையவும் அல்லது கீழே பதிவு செய்யவும்.",
+	"loginUrlLabel": "ஆன்மெல்டிங்ஸ்-யுஆர்எல்:",
+	"logout": "வெளியேறு",
+	"makeDataSetPublicAgreement": "இந்த தரவு தொகுப்பைப் பகிர, நான் அதைப் பகிரங்கப்படுத்த வேண்டும் என்பதை புரிந்துகொள்கிறேன்.",
+	"metaDescription": "generatedata.com: மென்பொருளைச் சோதிப்பதற்கான இலவச, குனு-உரிமம் பெற்ற, சீரற்ற தனிப்பயன் தரவு ஜெனரேட்டர்",
+	"metaKeywords": "சீரற்ற தரவு, சோதனை தரவு, மாதிரி தரவு, தரவு ஜெனரேட்டர், தரவை உருவாக்குதல்",
+	"missingDataSetName": "உங்கள் தரவு தொகுப்பின் பெயரை உள்ளிடவும்",
+	"nameColumn": "பெயர் நெடுவரிசை",
+	"nameColumnDesc": "மாதிரிக்காட்சி குழுவில் (எக்ஸ்எம்எல், சிஎஸ்வி போன்றவை) நீங்கள் தேர்ந்தெடுத்த ஏற்றுமதி வகையைப் பொறுத்து இந்த நெடுவரிசை வேறு தலைப்பைப் பெறுகிறது. இந்த நெடுவரிசையின் நோக்கம் வரிசைக்கு ஒரு அடையாளங்காட்டியை வழங்குவதாகும், பின்னர் அவை உருவாக்கப்பட்ட தரவுகளில் பயன்படுத்தப்படலாம். எடுத்துக்காட்டாக, எக்ஸ்எம்எல் இந்த மதிப்பை எக்ஸ்எம்எல் முனை பெயராகப் பயன்படுத்துகிறது; JSON இதை JSON சொத்து பெயராக பயன்படுத்துகிறது; SQL தரவுத்தள நெடுவரிசை பெயருக்கு இதைப் பயன்படுத்துகிறது. தேர்ந்தெடுக்கப்பட்ட ஏற்றுமதி வகைக்கு இது செல்லுபடியாகும் என்பதை உறுதிப்படுத்த நீங்கள் இங்கு உள்ளிட்ட மதிப்பை பயன்பாடு தானாகவே சரிபார்க்கும்.",
+	"newDataSet": "புதிய தரவு தொகுப்பு",
+	"no": "இல்லை",
+	"noAccountsCreated": "கணக்குகள் எதுவும் உருவாக்கப்படவில்லை.",
+	"noAdditionalSettings": "கூடுதல் அமைப்புகள் இல்லை",
+	"noDataSetsSaved": "உங்களிடம் தரவுத் தொகுப்புகள் எதுவும் சேமிக்கப்படவில்லை.",
+	"noExamplesAvailable": "எடுத்துக்காட்டுகள் இல்லை.",
+	"noExpiry": "காலாவதி இல்லை",
+	"noHistory": "இதுவரை வரலாறு இல்லை.",
+	"noOptionsAvailable": "விருப்பங்கள் எதுவும் கிடைக்கவில்லை.",
+	"noSafari": "மன்னிக்கவும், சஃபாரி இல்லை!",
+	"northAmerica": "வட அமெரிக்கா",
+	"nowLoggedIn": "நீங்கள் உள்நுழைந்துள்ளீர்கள்.",
+	"nowLoggedOut": "நீங்கள் வெளியேறிவிட்டீர்கள்.",
+	"numResults": "எண் முடிவுகள்",
+	"numeric": "எண்",
+	"oceania": "ஓசியானியா",
+	"oneTimePasswordLogin": "ஒரு முறை கடவுச்சொல்லைப் பயன்படுத்தி உள்நுழைந்துள்ளீர்கள். புதிய கடவுச்சொல்லை இப்போது அமைக்கவும்.",
+	"open": "திறந்திருக்கும்",
+	"options": "விருப்பங்கள்",
+	"optionsColumn": "விருப்பங்கள் நெடுவரிசை",
+	"optionsColumnDesc1": "இந்த நெடுவரிசையில் இந்த வரிசையின் தரவு வகைக்கான அனைத்து உள்ளமைவு விருப்பங்களும் உள்ளன. சில தரவு வகைகள் இவ்வளவு சிறிய இடத்தில் (எ.கா. நாடு, பிராந்தியம்) காண்பிக்க பல உள்ளமைவு அமைப்புகளைக் கொண்டுள்ளன, எனவே அவை அனைத்து விருப்பங்களையும் கொண்ட உரையாடலைத் திறக்கும் கட்டத்தில் ஒரு பொத்தானைக் காட்டக்கூடும்.",
+	"optionsColumnDesc2": "இங்கே விளக்கப்பட்டுள்ள பெயர்கள் தரவு வகைக்கு, நெடுவரிசையில் ஒரு உருவாக்கக்கூடிய மாத்திரை புலம் உள்ளது. தரவு ஜெனரேட்டரில் இது பொதுவான புலம் வகை. தட்டச்சு செய்து <enter> ஐக் கிளிக் செய்வதன் மூலம் உருப்படிகளைச் சேர்க்க இது உங்களை அனுமதிக்கிறது. அது பின்னர் அந்த பொருட்களை \"x\" ஐகான் வழியாக அகற்றக்கூடிய தனித்துவமான மாத்திரைகளாக மாற்றுகிறது.",
+	"or": "அல்லது",
+	"order": "ஆர்டர்",
+	"other": "மற்றவை",
+	"overMaxAnonRows": "மன்னிக்கவும், நீங்கள் %1 வரிசைகளை மட்டுமே உருவாக்க முடியும். பெரிய அளவிலான தரவை உருவாக்க இந்த தளத்தில் உங்களுக்கு ஒரு பயனர் கணக்கு தேவை.",
+	"panelContents": "குழு உள்ளடக்கங்கள்",
+	"panelContentsDesc": "கட்டம் பேனலில் நீங்கள் குறிப்பிட்ட தரவு மற்றும் தேர்ந்தெடுக்கப்பட்ட ஏற்றுமதி வகை அமைப்புகளின் படி, மாதிரிக்காட்சி பேனலின் பெரும்பகுதி உருவாக்கப்பட்ட தரவின் மாதிரியைக் கொண்டுள்ளது. இங்கே இது 5 வெவ்வேறு தரவு வகைகளை (நாடு, பிராந்தியம், நகரம், தெரு முகவரி மற்றும் அஞ்சல் / ஜிப்) தட்டச்சு வடிவத்தில் உருவாக்குகிறது.",
+	"panelControls": "குழு கட்டுப்பாடுகள்",
+	"panelControlsClearIconDesc": "பேனல் கட்டுப்பாடுகளின் கடைசி ஐகான் பக்கத்தை அழிக்க உங்களை அனுமதிக்கிறது, எனவே நீங்கள் புதிதாக தொடங்கலாம்.",
+	"panelControlsDesc": "குழு கட்டுப்பாட்டு பொத்தான்கள் கட்டம் மற்றும் முன்னோட்ட பேனல்களை மறைக்க / காண்பிக்க உங்களை அனுமதிக்கின்றன, அவை நீங்கள் வரையறுக்கப்பட்ட திரை ரியல் எஸ்டேட்டுடன் பணிபுரிகிறீர்கள் என்றால் உதவியாக இருக்கும். மூன்றாவது ஐகானைப் பயன்படுத்தி இரண்டு பேனல்களின் இடத்தை ஒன்றோடு ஒன்று (இடது-வலது, மேல்-கீழ்) மாற்றவும்.",
+	"panelTabs": "பேனல் தாவல்கள்",
+	"panelTabsDesc": "கடைசியாக, குழு இரண்டு தாவல்களாக ஒழுங்கமைக்கப்பட்டிருப்பதை நீங்கள் கவனித்திருக்கலாம். இயல்பாகவே இது அமைப்புகள் தாவலைக் காட்டுகிறது, ஏனென்றால் நீங்கள் செல்ல விரும்பும் இடம் இதுதான். ஆனால் முன்னோட்டக் குழுவின் தோற்றத்தை மாற்றுவதற்கான அமைப்புகளைக் கொண்ட இரண்டாவது \"முன்னோட்டம்\" தாவலும் உள்ளது: தீம், வரி எண்களை மறைத்தல் / காண்பித்தல், வரி மடக்குதலை மாற்றுதல், உரை அளவை மாற்றுவது மற்றும் உருவாக்கப்பட்ட வரிசைகளின் எண்ணிக்கையைக் கட்டுப்படுத்துதல்.",
+	"password": "கடவுச்சொல்",
+	"passwordLabel": "கடவுச்சொல்:",
+	"passwordReset": "கடவுச்சொல் மீட்டமைப்பு",
+	"passwordResetAccountExpired": "கடவுச்சொல் மீட்டமை - கணக்கு காலாவதியானது",
+	"passwordResetAccountExpiredDesc": "உங்கள் கடவுச்சொல்லை மீட்டமைக்க ஒரு கோரிக்கையை நாங்கள் பெற்றுள்ளோம், இருப்பினும் உங்கள் கணக்கு ஏற்கனவே காலாவதியானது.",
+	"passwordResetComplete": "உங்கள் கடவுச்சொல் மீட்டமைக்கப்பட்டு, புதிய கடவுச்சொல்லை உங்களுக்கு மின்னஞ்சல் செய்துள்ளீர்கள்.",
+	"passwordResetEmailContent1": "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டது. உள்நுழைய பின்வரும் கடவுச்சொல்லைப் பயன்படுத்தலாம்: %1",
+	"passwordResetEmailContent2": "நீங்கள் உள்நுழைந்ததும் அதை மாற்றவும்.",
+	"passwordResetEmailDesc": "உங்கள் கடவுச்சொல்லை மீட்டமைக்க கோரிக்கை எங்களுக்கு வந்துள்ளது. இந்த மின்னஞ்சலில் நீங்கள் உள்நுழைய பயன்படுத்தக்கூடிய தற்காலிக ஒரு முறை கடவுச்சொல் உள்ளது. உள்நுழைந்த பிறகு, நீங்கள் புதிய கடவுச்சொல்லை அமைக்க வேண்டும்.",
+	"passwordResetMsg": "மின்னஞ்சல் கோப்பில் இருந்தால், உங்கள் கடவுச்சொல் மீட்டமைக்கப்பட்டு, தற்காலிக உள்நுழைவு தகவலுக்கு மின்னஞ்சல் அனுப்பப்பட்டுள்ளது.",
+	"passwordUpdateInvalidPassword": "Your current password is incorrect. Please re-enter.",
+	"passwordUpdated": "Your password has been updated.",
+	"pause": "இடைநிறுத்தம்",
+	"pleaseConfirm": "தயவுசெய்து உறுதிப்படுத்துங்கள்",
+	"pleaseEnterAll": "அனைத்தையும் உள்ளிடவும்",
+	"pleaseEnterDataSetName": "புதிய தரவு தொகுப்பின் பெயரை உள்ளிடவும்.",
+	"pleaseFixErrors": "பின்வரும் பிழைகளை சரிசெய்து மீண்டும் சமர்ப்பிக்கவும்:",
+	"pleaseLogin": "உள்நுழைக",
+	"pleaseSelect": "தயவு செய்து தேர்வு செய்யவும்",
+	"plugins": "செருகுநிரல்கள்",
+	"pressEnterAddItem": "உருப்படியைச் சேர்க்க Enter ஐ அழுத்தவும்",
+	"preview": "முன்னோட்ட",
+	"previewPanel": "முன்னோட்டம் குழு",
+	"previewPanelControlsDesc": "பேனலின் மேல் வலதுபுறத்தில் இரண்டு சின்னங்கள் உள்ளன. முதல் ஐகான் பேனலைப் புதுப்பித்து, ஒவ்வொரு முறையும் வெவ்வேறு சீரற்ற தரவை உருவாக்குகிறது - இது உருவாக்கும் தரவைப் பற்றிய ஒரு கருத்தை உங்களுக்கு வழங்க உதவுகிறது. இரண்டாவது ஐகான் பேனலை முழுவதுமாக மூடுகிறது. பக்கத்தின் கீழ் வலதுபுறத்தில் உள்ள பகுதியைப் பயன்படுத்தி நீங்கள் எப்போதும் பேனலைக் காண்பிக்கலாம் (\"முன்னோட்டம்\" தேர்வுப்பெட்டியை மீண்டும் தேர்ந்தெடுக்கவும்).",
+	"previewPanelDesc": "கட்டம் பேனல் மூலம் நீங்கள் உருவாக்கும்போது, நீங்கள் உருவாக்கும் தரவின் நேரடி முன்னோட்டத்தை இந்த குழு உங்களுக்கு வழங்குகிறது. மேல் இடதுபுறத்தில் உள்ள பொத்தான் உருவாக்கப்படும் தரவின் தேர்ந்தெடுக்கப்பட்ட வடிவமைப்பைக் காட்டுகிறது (எ.கா. SQL, XML, CSV போன்றவை). வடிவமைப்பை மாற்ற, பொத்தானைக் கிளிக் செய்க.",
+	"previewPanelMoreInfo": "இந்த பேனலில் கூடுதல் தகவலுக்கு, முன்னோட்ட பேனல் சுற்றுப்பயணத்தைப் பாருங்கள்.",
+	"previewPanelNoData": "No data!",
+	"previewPanelTourDesc": "மாதிரிக்காட்சி குழு நீங்கள் உருவாக்கும் தரவின் நேரடி, காட்சி பிரதிநிதித்துவத்தை வழங்குகிறது. இந்த சுற்றுப்பயணம் குழு எவ்வாறு செயல்படுகிறது என்பதற்கான விரைவான அறிமுகத்தை அளிக்கிறது.",
+	"previewRows": "வரிசைகளை முன்னோட்டமிடுங்கள்",
+	"private": "தனியார்",
+	"problemLoadingTour": "மன்னிக்கவும், சுற்றுப்பயணத்தை ஏற்றுவதில் சிக்கல் ஏற்பட்டது.",
+	"programmingLanguages": "கணிப்பொறி செயல்பாடு மொழி",
+	"province": "மாகாணம்",
+	"public": "பொது",
+	"publicQ": "பொது?",
+	"reenterPassword": "கடவு சொல்லை திருப்பி உள்ளிடு",
+	"refreshPage": "பக்கத்தைப் புதுப்பிக்கவும்",
+	"refreshPanel": "பேனலைப் புதுப்பிக்கவும்",
+	"register": "பதிவு",
+	"remainingTime": "மீதமுள்ள நேரம்:",
+	"requiredField": "தேவையான புலம்",
+	"revertToVersion": "இந்த பதிப்பிற்கு திரும்புக",
+	"row": "வரிசை",
+	"rowLabel": "நெடுவரிசை தலைப்பு",
+	"rowLabelPlural": "நெடுவரிசை தலைப்புகள்",
+	"rowNumDesc1": "கட்டத்தில் முதல் நெடுவரிசை வரிசை எண்ணைக் காட்டுகிறது. வரிசையை மறுவரிசைப்படுத்த, இந்த உறுப்பைக் கிளிக் செய்து மேலே அல்லது கீழ் நோக்கி இழுக்கவும்.",
+	"rowNumDesc2": "இந்த நெடுவரிசைக்கான தலைப்பு மதிப்பு உங்கள் கட்டத்தில் உள்ள மொத்த வரிசைகளின் எண்ணிக்கையைக் காட்டுகிறது. உங்களிடம் பெரிய தரவுத் தொகுப்புகள் இருக்கும்போது இது எளிது, மேலும் இது திரையில் பொருந்தும் அளவுக்கு பெரியது.",
+	"rowNumber": "வரிசை எண்",
+	"rowSp": "வரிசை (கள்)",
+	"rows": "வரிசைகள்",
+	"rowsGenerated": "வரிசைகள் உருவாக்கப்பட்டன",
+	"rowsGeneratedPerSecond": "வினாடிக்கு வரிசைகள் உருவாக்கப்படுகின்றன",
+	"safariExplanation": "இந்த தளத்திற்கு நவீன வலை தரங்களை செயல்படுத்தும் புதுப்பித்த வலை உலாவி தேவைப்படுகிறது. துரதிர்ஷ்டவசமாக சஃபாரி மற்ற உலாவிகளுக்கு பின்னால் விழுந்துவிட்டது, இந்த ஸ்கிரிப்டை இயக்காது. அதை எவ்வாறு இடமளிப்பது என்பதைக் கண்டுபிடிக்கும் வரை, பின்வரும் உலாவிகளில் ஒன்றைப் பயன்படுத்தவும். அனைத்தும் பதிவிறக்கம் செய்ய இலவசம்.",
+	"save": "சேமி",
+	"saveAs": "என சேமிக்கவும்",
+	"saveButtonDesc": "தளத்தில் உங்களிடம் பயனர் கணக்கு இருந்தால், இந்த பொத்தான் உங்கள் தரவு தொகுப்பை சேமிக்கும். நீங்கள் உள்நுழைந்திருக்கவில்லை என்றால், அதைக் கிளிக் செய்தால் முதலில் உள்நுழைய உங்களைத் தூண்டும். தரவுத் தொகுப்பிற்கான கடைசி %1 மாற்றங்களின் வரலாற்றை கணினி வைத்திருக்கிறது, எனவே நீங்கள் எப்போதும் திரும்பிச் சென்று பழைய பதிப்புகளைக் காணலாம்.",
+	"saveDataSetNewName": "தரவு புதிய பெயராக சேமிக்கவும்",
+	"seconds": "விநாடிகள்",
+	"seeHelpDialog": "உதவி உரையாடலைக் காண்க.",
+	"selectCountry": "நாட்டினை தேர்வுசெய்",
+	"selectDataType": "தரவு வகையைத் தேர்ந்தெடுக்கவும்",
+	"selectEllipsis": "தேர்ந்தெடு ...",
+	"selectExpiryDate": "காலாவதி தேதியைத் தேர்ந்தெடுக்கவும்",
+	"selectLanguage": "மொழியை தேர்ந்தெடுங்கள்",
+	"sendEmail": "மின்னஞ்சல் அனுப்பு",
+	"seriouslySlow": "தீவிரமாக மெதுவாக",
+	"settings": "அமைப்புகள்",
+	"showGrid": "கட்டத்தைக் காட்டு",
+	"showLineNumbers": "வரி எண்களைக் காட்டு",
+	"showPreview": "முன்னோட்டத்தைக் காட்டு",
+	"siteLogo": "தள லோகோ",
+	"size": "அளவு:",
+	"southAmerica": "தென் அமெரிக்கா",
+	"status": "நிலை",
+	"stripWhitespace": "உருவாக்கப்பட்ட உள்ளடக்கத்திலிருந்து இடைவெளியை அகற்றவும்",
+	"success": "வெற்றி",
+	"text": "உரை",
+	"textSize": "உரை அளவு",
+	"theDataSetName": "தரவு தொகுப்பு பெயர்",
+	"theExportTypeBtn": "ஏற்றுமதி வகை பொத்தான்",
+	"theGenerateButton": "உருவாக்கு பொத்தான்",
+	"theGridPanel": "கட்டம் குழு",
+	"thePreviewPanel": "முன்னோட்டம் குழு",
+	"theSaveButton": "சேமி பொத்தான்",
+	"theme": "தீம்",
+	"togglePanelLayout": "பேனல் தளவமைப்பை மாற்று",
+	"totalNumGeneratedRows": "மொத்த எண் உருவாக்கப்பட்ட வரிசைகள்",
+	"tourComplete": "டூர் முடிந்தது",
+	"tourCompleteDesc": "அனைத்தும் முடிந்தது! தொடர கீழே உள்ள பொத்தான்களில் ஒன்றைத் தேர்வுசெய்க.",
+	"tourIntroPara1": "இந்த கருவி நிறைய செயல்பாடுகளை வழங்குகிறது, மேலும் இது முதலில் கொஞ்சம் அதிகமாக இருக்கும். அந்த குறிப்பிட்ட அம்சத்தைப் பற்றி சுற்றுப்பயணம் செய்ய வலதுபுறத்தில் உள்ள பொத்தான்களில் ஒன்றைக் கிளிக் செய்க.",
+	"tourIntroPara2": "சுற்றுப்பயணம் தொடங்கும் போது, இடைமுகத்தைப் பற்றிய சில விஷயங்களை விளக்குவதற்கு ஜெனரேட்டர் பக்கத்தின் உள்ளடக்கத்தை தற்காலிகமாக மேலெழுதும் என்பதை நினைவில் கொள்க. ஆனால் கவலைப்பட வேண்டாம்! சுற்றுப்பயணம் முடிந்தவுடன், அது உங்கள் தரவை அதன் அசல் நிலைக்குத் தருகிறது.",
+	"tryDifferentTour": "வேறு சுற்றுப்பயணத்தை முயற்சிக்கவும்",
+	"update": "புதுப்பிப்பு",
+	"updateAccount": "கணக்கைப் புதுப்பிக்கவும்",
+	"user": "பயனர்",
+	"userAccount": "பயனர் கணக்கு",
+	"userAccountNotFound": "மன்னிக்கவும், உங்கள் கணக்கை எங்களால் கண்டுபிடிக்க முடியவில்லை.",
+	"userAccountUpdated": "பயனர் கணக்கு புதுப்பிக்கப்பட்டது.",
+	"userAccounts": "பயனர் கணக்குகள்",
+	"userNotFound": "மன்னிக்கவும், உங்களை அடையாளம் காண முடியவில்லை. உங்கள் சான்றுகளை சரிபார்க்கவும்.",
+	"validationAccountAlreadyExists": "மன்னிக்கவும், அந்த மின்னஞ்சல் முகவரியுடன் ஒரு கணக்கு ஏற்கனவே உள்ளது.",
+	"validationDifferentNewPasswords": "தயவுசெய்து உங்கள் புதிய கடவுச்சொற்கள் பொருந்துகின்றனவா என்பதை உறுதிப்படுத்தவும்",
+	"validationInvalidEmail": "செல்லுபடியாகும் மின்னஞ்சல் முகவரியை உள்ளிடவும்.",
+	"validationNoCurrentPassword": "தயவுசெய்து உங்கள் தற்போதைய கடவுச்சொல்லை உள்ளிடவும்",
+	"validationNoEmail": "உங்கள் தரவுத்தள பெயரை உள்ளிடவும்.",
+	"validationNoFirstName": "உங்கள் முதல் பெயரை உள்ளிடவும்.",
+	"validationNoLastName": "உங்கள் கடைசி பெயரை உள்ளிடவும்.",
+	"validationNoPassword": "தங்கள் கடவு சொல்லை பதிவு செய்யவும்.",
+	"version": "பதிப்பு",
+	"view": "காண்க",
+	"viewChangelog": "சேஞ்ச்லாக் காண்க",
+	"viewOnGithub": "கிதுபில் காண்க",
+	"welcomeToTheGenerator": "ஜெனரேட்டருக்கு வருக!",
+	"yes": "ஆம்",
+	"yourAccount": "உங்கள் கணக்கு",
+	"yourAccountUpdated": "உங்கள் கணக்கு புதுப்பிக்கப்பட்டுள்ளன.",
+	"yourUserAccount": "உங்கள் பயனர் கணக்கு"
+}
\ No newline at end of file
diff --git a/apps/client/src/i18n/zh.json b/apps/client/src/i18n/zh.json
new file mode 100644
index 000000000..55514480e
--- /dev/null
+++ b/apps/client/src/i18n/zh.json
@@ -0,0 +1,329 @@
+{
+	"abort": "中止",
+	"about": "关于",
+	"aboutInfoPara1": "generatedata.com 是我在旧石器时代晚期（大约 2004 年）创建的一个开源项目，并且在其生命周期内有很多很多贡献者。 每隔几年，我就会使用最新最好的可用技术重写它：这个版本于 2021 年完成，使用 React、Redux、Typescript、GraphQL、Docker、网络工作者、橡皮筋、胶带和一大堆诅咒制成。",
+	"aboutInfoPara2": "您可以在github上找到该项目。 下载，分叉或随意贡献。 请享用！",
+	"aboutThisScript": "关于此脚本",
+	"accountCreated": "账户创建",
+	"accountCreatedDesc": "该帐户已创建。",
+	"accountCreatedMsg": "该账户已创建.",
+	"accountDeleted": "该帐户已被删除。",
+	"accountDisabled": "帐户已禁用",
+	"accountExpiredMsg": "抱歉，您的帐户已过期。",
+	"accountExpiryDate": "账户到期日",
+	"accountInfo": "账户信息",
+	"accountSettings": "账户设置",
+	"accountType": "账户类型",
+	"accounts": "账号",
+	"add": "增加",
+	"addRowsDesc": "要将更多行添加到数据网格，只需使用页面底部的表单即可。 当您有很多字段时，此部分可能会隐藏在页面外，因此您必须将面板滚动到底部才能看到表单。",
+	"addSomeDataDesc": "在网格中添加一些行。",
+	"admin": "管理员",
+	"adminAccount": "管理员账户",
+	"administrator": "行政人员",
+	"africa": "非洲",
+	"allCountries": "所有城市",
+	"allDataTypePlugins": "所有的数据类型插件",
+	"allExportTypePlugins": "所有的导出类型插件",
+	"anonymousAccess": "匿名访问",
+	"asia": "亚洲",
+	"back": "回退",
+	"backToLogin": "回到登入",
+	"blog": "博客",
+	"cancel": "取消",
+	"centralAmerica": "中美洲",
+	"changePassword": "更改密码",
+	"clear": "明确",
+	"clearPage": "清除页面",
+	"clearPageConfirmation": "您确定要清除页面吗？ 您所做的任何更改都将丢失。",
+	"clearThePage": "清空该页面",
+	"clickExportTypeBtn": "下一步显示单击按钮时发生的情况。",
+	"close": "关闭",
+	"closePanel": "关闭面板",
+	"columns": "列",
+	"columnsDesc": "网格将显示尽可能多的这些列，具体取决于您可用的屏幕尺寸。 当它太小时，它将隐藏一些列并显示一个齿轮图标，该图标会打开一个缺少内容的信息提示。 接下来的几个步骤以“名称”行为例，说明每个列。",
+	"complete": "完成",
+	"confirmDeleteAccount": "您确定要删除此帐户吗？",
+	"confirmDeleteUserAccount": "确定删除此账号?",
+	"confirmEmptyForm": "确定清空页面吗?",
+	"continue": "继续",
+	"copiedToClipboard": "复制到剪贴板",
+	"copyToClipboard": "复制到剪贴板",
+	"coreExportType": "核心格式",
+	"countries": "国家",
+	"country": "国家",
+	"countrySpecific": "特定国家",
+	"cpuMeltinglyFast": "CPU融化快",
+	"createAccount": "创建账号",
+	"currentPassword": "当前密码",
+	"currentVersion": "当前版本正在编辑",
+	"dataGenerated": "生成的数据。",
+	"dataSet": "数据集",
+	"dataSetHelp": "在这里你可以生成你想要的数据.尝试填充一行并且点击生成按钮.你会很快的掌握它",
+	"dataSetLoaded": "数据集已加载。",
+	"dataSetName": "数据集名称",
+	"dataSetNameDesc": "单击此处的文本以命名您的数据集。 请注意，您需要在该网站上拥有一个帐户并进行登录才能命名您的数据集。 保存数据集时，此名称为您提供了方便的标签来跟踪它们。",
+	"dataSetNameUpdated": "数据集名称已更新。",
+	"dataSetOptions": "数据集选项",
+	"dataSetReverted": "您的数据集已还原为所选的较旧版本。",
+	"dataSetSaved": "您的数据集已保存。",
+	"dataSets": "数据集",
+	"dataType": "数据类型",
+	"dataTypeDesc": "这是一个包含所有可用数据类型的下拉列表。 选择一个值时，它将更新该行的其余列。 每个数据类型都有其自己的唯一设置以允许自定义。",
+	"dataTypes": "数据类型",
+	"dateAccountCreated": "创建账户日期",
+	"dateCreated": "数据创建",
+	"defaultLanguage": "默认语言",
+	"delete": "删除",
+	"delete1DataSet": "删除1个数据集",
+	"deleteAccount": "删除账号",
+	"deleteDataSet": "删除数据集",
+	"deleteDataSetConfirm": "您确定要删除此数据集吗？",
+	"deleteRow": "删除行",
+	"deleteRowDesc": "最后一列包含一个删除图标。 单击它将删除该行。",
+	"developer": "开发者",
+	"developerDoc": "开发人员文档",
+	"disabled": "残障人士",
+	"documentation": "文档",
+	"download": "下载",
+	"edit": "编辑",
+	"editAccount": "编辑账户",
+	"editExportTypePage": "单击“导出类型”按钮时，将显示一个整页视图，其中左侧包含配置选项，而右侧则包含预览面板。",
+	"editExportTypePageConfig": "让我们看一下配置选项。",
+	"editExportTypeSettings": "请修改您的导出类型设置。",
+	"editingExportTypes": "编辑导出类型",
+	"email": "邮件地址",
+	"emailFooterDisclaimer": "如果您收到此电子邮件错误，请与站点管理员联系。",
+	"emailIntroLineWithName": "嗨，%1",
+	"emailLabel": "电子邮件：",
+	"emailNotSent": "我们不能发出邮件通知.",
+	"emailUserLoginInfo": "发送邮件包含用户登录信息",
+	"enterEmailAddressToResetPassword": "输入你的邮箱地址来重置你的密码.",
+	"enterUserAccountDetails": "请输入你的用户详细信息.",
+	"errorCreatingAccount": "创建此帐户时出错。",
+	"estimatedSize": "估计尺寸：",
+	"estimatedTime": "预计的时间：",
+	"europe": "欧洲",
+	"example": "例",
+	"exampleColumn": "示例列",
+	"exampleColumnDesc": "根据您为该行选择的数据类型，此列可能包含内容，也可能不包含内容。 这是某些数据类型提供如何使用它们的预设示例的便捷方法。 例如，“名称”列提供了不同名称格式的下拉列表。 对于所有数据类型，您仍然可以通过“选项”列手动进行配置：它确实是一种节省时间的设备，可让您尽快上手。",
+	"examples": "示例",
+	"exit": "出口",
+	"expired": "已到期",
+	"expiryDate": "到期日",
+	"exportType": "出口类型",
+	"exportTypeBtnDesc": "面板左上方的按钮是您要选择和配置要生成的数据格式的位置。 在这里将其设置为Typescript。",
+	"exportTypeOptionsSql": "导出类型选项：SQL",
+	"exportTypeOptionsSqlDesc": "如您所见，SQL还有许多其他特定于此导出类型的字段。 其他导出类型具有不同的设置。",
+	"exportTypeOptionsTs": "导出类型选项：打字稿",
+	"exportTypeOptionsTsDesc": "根据所选的“导出类型”，面板主体可能包含其他选项。 这里的Typescript有两个字段，可让您自定义类型名称和导出的变量名称。",
+	"exportTypeOptionsTsDesc2": "现在让我们看一下SQL。",
+	"exportTypeSelection": "导出类型选择",
+	"exportTypeSelectionDesc": "格式下拉菜单可让您选择所生成内容的格式。 有很多选项，其中一些是核心类型：SQL，CSV，SQL，JSON等，其中一些用于为特定编程语言生成数据。",
+	"exportTypes": "导出类型",
+	"filterDataTypes": "筛选数据类型",
+	"financial": "金融",
+	"firstName": "名字",
+	"forgottenYourPasswordQ": "忘记密码？",
+	"format": "格式",
+	"generate": "生成",
+	"generateBtnDesc": "完成数据集的配置并确认其外观后，现在该生成大量数据了！ 单击此按钮生成您的数据。 根据数据网格中的行数和要生成的行数，这可能需要一些时间。",
+	"generated": "生成",
+	"generatedC": "生成：",
+	"generator": "生成器",
+	"geo": "Geo",
+	"grid": "格",
+	"gridPanelTourDesc1": "网格面板是您构造要生成的数据的地方。 在这里，您可以选择不同的数据类型，配置方式以及显示顺序。 在此处的示例中，我们有五个字段：姓名，电话，电子邮件，街道地址和城市。",
+	"gridPanelTourDesc2": "有关此部分的更多详细信息，请参见“网格面板”上的导览。",
+	"gridPanelTourIntroDesc1": "在网格面板中，您可以定义要生成的数据。 对于此游览，我们隐藏了预览面板（请参阅页面右下方的未选中的“预览”按钮），以便为我们提供更多的空间。 我们还添加了10行不同的数据类型，仅用于说明目的。",
+	"gridPanelTourIntroDesc2": "让我们从网格列开始。",
+	"help": "帮助",
+	"helpIcon": "帮助图标",
+	"helpIconDesc": "当您在上一列中选择数据类型时，此处将显示一个图标。 单击它会打开一个包含使用情况信息的帮助对话框。",
+	"hide": "隐藏",
+	"hideShowGrid": "隐藏/显示网格",
+	"hideShowPreviewPanel": "隐藏/显示预览面板",
+	"history": "历史",
+	"historyPanelDesc": "此面板显示对数据集进行更改的历史记录。 单击查看按钮以检查早期版本。 要还原为早期版本，只需查看它，然后单击“还原为该版本”按钮即可。",
+	"hostName": "主机名称",
+	"humanData": "人类数据",
+	"ifWantToReregister": "如果您想重新注册，请访问：",
+	"incomplete": "不完整",
+	"install": "安装",
+	"introToGenerator": "发电机简介",
+	"introToGeneratorDesc": "此导览向您简要介绍了数据生成器的主要功能。 让我们开始吧！",
+	"invalidSettings": "设置无效！",
+	"language": "中文",
+	"lastEdited": "最新编辑",
+	"lastLoggedIn": "上次登入",
+	"lastModified": "最新修正",
+	"lastName": "姓氏",
+	"lastSaved": "最新保存",
+	"lineWrapping": "换行",
+	"linkToDataSet": "连接数据集",
+	"linkToThisDataSet": "链接到该数据",
+	"live": "居住",
+	"load": "加载",
+	"loading": "加载...",
+	"login": "登录",
+	"loginToSave": "为了保存您的数据集，您首先需要一个帐户。 请在下方登录。",
+	"loginOrRegisterToSave": "为了保存您的数据集，您首先需要一个帐户。 请在下方登录或注册。",
+	"loginUrlLabel": "登入网址：",
+	"logout": "登出",
+	"makeDataSetPublicAgreement": "我要分享该数据集,并且需要公开它.",
+	"metaDescription": "GenerateData.com: 用于生成测试软件中自定义随机数据,采用免费GNU协议",
+	"metaKeywords": "随机数据, 测试数据, 示例数据, 数据生成器, 生成数据",
+	"missingDataSetName": "请输入您的数据集名称",
+	"nameColumn": "名称栏",
+	"nameColumnDesc": "根据您在预览面板中选择的导出类型（XML，CSV等），此列的标题会有所不同。 该列的目的是为该行提供一个标识符，然后可以在生成的数据中使用该标识符。 例如，XML使用此值作为XML节点名称。 JSON使用它作为JSON属性名称； SQL将其用作数据库列名称。 该应用程序将自动验证您在此处输入的值，以确保该值对所选的“导出类型”有效。",
+	"newDataSet": "新数据集",
+	"no": "取消",
+	"noAccountsCreated": "尚未创建任何帐户。",
+	"noAdditionalSettings": "没有其他设置",
+	"noDataSetsSaved": "您没有保存任何数据集。",
+	"noExamplesAvailable": "没有可用的示例.",
+	"noExpiry": "没有有效期",
+	"noHistory": "尚无历史。",
+	"noOptionsAvailable": "没有可用选项.",
+	"noSafari": "抱歉，没有Safari！",
+	"northAmerica": "北美州",
+	"nowLoggedIn": "您已经登录。",
+	"nowLoggedOut": "您已注销。",
+	"numResults": "结果数",
+	"numeric": "数值型",
+	"oceania": "大洋洲",
+	"oneTimePasswordLogin": "您已经使用一次性密码登录。 请立即设置一个新密码。",
+	"open": "打开",
+	"options": "选项",
+	"optionsColumn": "选项栏",
+	"optionsColumnDesc1": "此列包含此行的数据类型的所有配置选项。 某些数据类型的配置设置太多，无法在如此小的空间（例如，国家/地区）中显示，因此它们可能仅在网格中显示一个按钮即可打开包含所有选项的对话框。",
+	"optionsColumnDesc2": "对于此处说明的Names数据类型，该列包含一个Creatable Pill字段。 这是数据生成器中的常见字段类型。 它使您可以通过键入内容并单击<enter>来添加项目。 然后，将这些物品转换为不同的药丸，可以通过“ x”图标将其删除。",
+	"or": "要么",
+	"order": "顺序",
+	"other": "其他",
+	"overMaxAnonRows": "抱歉，您只能生成%1行。 要生成大量数据，您需要在此站点上有一个用户帐户。",
+	"panelContents": "面板内容",
+	"panelContentsDesc": "预览面板的大部分包含根据您在网格面板和选定的“导出类型”设置中指定的数据生成的数据的样本。 它以Typescript格式生成5种不同的数据类型（国家，地区，城市，街道地址和邮政/邮政编码）。",
+	"panelControls": "面板控制",
+	"panelControlsClearIconDesc": "面板控件中的最后一个图标使您可以清除页面，以便重新开始。",
+	"panelControlsDesc": "面板控制按钮使您可以隐藏/显示“网格”和“预览”面板，如果您使用的屏幕空间有限，这将很有帮助。 您也可以使用第三个图标，将两个面板的位置相对于彼此切换（左右，上下）。",
+	"panelTabs": "面板标签",
+	"panelTabsDesc": "最后，您可能已经注意到该面板分为两个选项卡。 默认情况下，它显示“设置”选项卡，因为这是您最想去的地方。 但是还有第二个“预览”选项卡，其中包含用于更改预览面板外观的设置：主题，隐藏/显示行号，切换换行，更改文本大小以及控制生成的行数。",
+	"password": "密码",
+	"passwordLabel": "密码：",
+	"passwordReset": "重设密码",
+	"passwordResetAccountExpired": "密码重置-帐户已过期",
+	"passwordResetAccountExpiredDesc": "我们刚收到重置密码的请求，但是您的帐户已经过期。",
+	"passwordResetComplete": "你的密码已重置,已经发出新密码邮件.",
+	"passwordResetEmailContent1": "你的密码已重置.你可以使用当前密码登录: %1",
+	"passwordResetEmailContent2": "一旦你已经登录,请修改它.",
+	"passwordResetEmailDesc": "我们已收到重设密码的请求。 该电子邮件包含一个临时的一次性密码，您可以使用该密码登录。登录后，您需要设置一个新密码。",
+	"passwordResetMsg": "如果电子邮件已归档，则您的密码已重置，并且已通过电子邮件发送给您临时登录信息。",
+	"passwordUpdateInvalidPassword": "您当前的密码错误。 请重新输入。",
+	"passwordUpdated": "您的密码已更新。",
+	"pause": "暂停",
+	"pleaseConfirm": "请确认",
+	"pleaseEnterAll": "请输入全部内容",
+	"pleaseEnterDataSetName": "请输入新数据集的名称.",
+	"pleaseFixErrors": "请修正下述错误然后重新提交:",
+	"pleaseLogin": "请登录",
+	"pleaseSelect": "请选择",
+	"plugins": "插件",
+	"pressEnterAddItem": "按Enter键添加项目",
+	"preview": "预习",
+	"previewPanel": "预览面板",
+	"previewPanelControlsDesc": "在面板的右上角有两个图标。 第一个图标刷新面板，每次生成不同的随机数据-这有助于您了解其生成的数据种类。 第二个图标完全关闭面板。 您始终可以使用页面右下角的部分再次显示面板（只需重新选择“预览”复选框）。",
+	"previewPanelDesc": "通过网格面板构造数据时，该面板为您提供了所生成数据的实时预览。 左上角的按钮显示了所生成数据的选定格式（例如SQL，XML，CSV等）。 要更改格式，只需单击按钮。",
+	"previewPanelMoreInfo": "有关此面板的更多信息，请查看“预览面板”导览。",
+	"previewPanelNoData": "没有数据！",
+	"previewPanelTourDesc": "预览面板为您在构建数据时提供了实时，可视化的表示形式。 此导览简要介绍了面板的工作原理。",
+	"previewRows": "预览行",
+	"private": "私人的",
+	"problemLoadingTour": "抱歉，加载游览时出现问题。",
+	"programmingLanguages": "编程语言",
+	"province": "省",
+	"public": "上市",
+	"publicQ": "公开?",
+	"reenterPassword": "重新输入密码",
+	"refreshPage": "刷新页面",
+	"refreshPanel": "刷新面板",
+	"register": "寄存器",
+	"remainingTime": "剩余时间：",
+	"requiredField": "必填项目",
+	"revertToVersion": "还原到此版本",
+	"row": "行",
+	"rowLabel": "列标题",
+	"rowLabelPlural": "列标题",
+	"rowNumDesc1": "网格中的第一列显示行号。 要重新排列该行，只需单击并上下拖动此元素。",
+	"rowNumDesc2": "此列的标题值显示网格中的总行数。 当您有非常大的数据集并且太大而无法容纳在屏幕上时，这可能会很方便。",
+	"rowNumber": "行号",
+	"rowSp": "行数",
+	"rows": "行",
+	"rowsGenerated": "列生成",
+	"rowsGeneratedPerSecond": "每秒产生的行",
+	"safariExplanation": "该站点需要实现现代Web标准的最新Web浏览器。 不幸的是，Safari落后于其他浏览器，并且无法运行此脚本。 在弄清楚如何容纳它之前，请使用以下浏览器之一。 全部免费下载。",
+	"save": "保存",
+	"saveAs": "另存为",
+	"saveButtonDesc": "如果您在网站上拥有一个用户帐户，则此按钮将保存您的数据集。 如果您尚未登录，则单击它会提示您先登录。 系统保留对数据集的最近%1更改的历史记录，因此您可以随时返回查看旧版本。",
+	"saveDataSetNewName": "将数据集另存为新名称",
+	"seconds": "秒",
+	"seeHelpDialog": "查看帮助对话框.",
+	"selectCountry": "选择国家",
+	"selectDataType": "选择数据类型",
+	"selectEllipsis": "选择...",
+	"selectExpiryDate": "选择有效期",
+	"selectLanguage": "选择语言",
+	"sendEmail": "发送电子邮件",
+	"seriouslySlow": "严重慢",
+	"settings": "设置",
+	"showGrid": "显示网格",
+	"showLineNumbers": "显示行号",
+	"showPreview": "显示预览",
+	"siteLogo": "网站徽标",
+	"size": "尺寸：",
+	"southAmerica": "南美洲",
+	"status": "状态",
+	"stripWhitespace": "从生成的内容中删除空格",
+	"success": "成功",
+	"text": "文本",
+	"textSize": "字体大小",
+	"theDataSetName": "数据集名称",
+	"theExportTypeBtn": "导出类型按钮",
+	"theGenerateButton": "生成按钮",
+	"theGridPanel": "网格面板",
+	"thePreviewPanel": "预览面板",
+	"theSaveButton": "保存按钮",
+	"theme": "主题",
+	"togglePanelLayout": "切换面板布局",
+	"totalNumGeneratedRows": "总生成行数",
+	"tourComplete": "游览完成",
+	"tourCompleteDesc": "全做完了！ 选择下面的按钮之一继续。",
+	"tourIntroPara1": "该工具提供了很多功能，一开始可能有点让人不知所措。 单击右侧的按钮之一，以浏览该特定功能。",
+	"tourIntroPara2": "请注意，当浏览开始时，它会临时覆盖生成器页面的内容，以说明有关界面的某些内容。 但是不用担心！ 游览结束后，它将使您的数据恢复为原始状态。",
+	"tryDifferentTour": "尝试不同的游览",
+	"update": "更新",
+	"updateAccount": "更新账号",
+	"user": "用户",
+	"userAccount": "用户账户",
+	"userAccountNotFound": "抱歉，我们找不到您的帐户。",
+	"userAccountUpdated": "用户帐户已更新。",
+	"userAccounts": "用户账户",
+	"userNotFound": "抱歉，我们无法识别您。 请检查您的凭据。",
+	"validationAccountAlreadyExists": "对不起,一个账户的邮件地址已存在.",
+	"validationDifferentNewPasswords": "请确保您的新密码匹配",
+	"validationInvalidEmail": "请输入一个有效的邮件地址.",
+	"validationNoCurrentPassword": "请输入您的当前密码",
+	"validationNoEmail": "请输入邮件地址.",
+	"validationNoFirstName": "请输入你的名字.",
+	"validationNoLastName": "请输入你的姓氏.",
+	"validationNoPassword": "请输入密码.",
+	"version": "版本",
+	"view": "看法",
+	"viewChangelog": "查看变更日志",
+	"viewOnGithub": "在Github上查看",
+	"welcomeToTheGenerator": "欢迎使用发电机！",
+	"yes": "确认",
+	"yourAccount": "你的账号",
+	"yourAccountUpdated": "你的账户已更新.",
+	"yourUserAccount": "您的用户帐号"
+}
\ No newline at end of file
diff --git a/apps/client/src/images/bg-pale.png b/apps/client/src/images/bg-pale.png
new file mode 100644
index 000000000..ec0f804e5
Binary files /dev/null and b/apps/client/src/images/bg-pale.png differ
diff --git a/apps/client/src/images/bg.png b/apps/client/src/images/bg.png
new file mode 100644
index 000000000..d3a0057d4
Binary files /dev/null and b/apps/client/src/images/bg.png differ
diff --git a/apps/client/src/images/btn_google_signin_dark_normal_web@2x.png b/apps/client/src/images/btn_google_signin_dark_normal_web@2x.png
new file mode 100644
index 000000000..f27bb2433
Binary files /dev/null and b/apps/client/src/images/btn_google_signin_dark_normal_web@2x.png differ
diff --git a/apps/client/src/images/chrome_256x256.png b/apps/client/src/images/chrome_256x256.png
new file mode 100644
index 000000000..a8ae85e59
Binary files /dev/null and b/apps/client/src/images/chrome_256x256.png differ
diff --git a/apps/client/src/images/dice180x180.png b/apps/client/src/images/dice180x180.png
new file mode 100644
index 000000000..e1df05f12
Binary files /dev/null and b/apps/client/src/images/dice180x180.png differ
diff --git a/apps/client/src/images/dice512x512.png b/apps/client/src/images/dice512x512.png
new file mode 100644
index 000000000..8143425fa
Binary files /dev/null and b/apps/client/src/images/dice512x512.png differ
diff --git a/apps/client/src/images/dice80.png b/apps/client/src/images/dice80.png
new file mode 100644
index 000000000..10fc03e9d
Binary files /dev/null and b/apps/client/src/images/dice80.png differ
diff --git a/apps/client/src/images/edge_256x256.png b/apps/client/src/images/edge_256x256.png
new file mode 100644
index 000000000..f80a90488
Binary files /dev/null and b/apps/client/src/images/edge_256x256.png differ
diff --git a/apps/client/src/images/favicon.ico b/apps/client/src/images/favicon.ico
new file mode 100644
index 000000000..3635c424d
Binary files /dev/null and b/apps/client/src/images/favicon.ico differ
diff --git a/apps/client/src/images/firefox_256x256.png b/apps/client/src/images/firefox_256x256.png
new file mode 100644
index 000000000..dc974fbff
Binary files /dev/null and b/apps/client/src/images/firefox_256x256.png differ
diff --git a/apps/client/src/images/flags.png b/apps/client/src/images/flags.png
new file mode 100644
index 000000000..47a559c87
Binary files /dev/null and b/apps/client/src/images/flags.png differ
diff --git a/apps/client/src/images/logo.png b/apps/client/src/images/logo.png
new file mode 100644
index 000000000..0df5386f0
Binary files /dev/null and b/apps/client/src/images/logo.png differ
diff --git a/apps/client/src/index.html b/apps/client/src/index.html
new file mode 100644
index 000000000..07b7ba63b
--- /dev/null
+++ b/apps/client/src/index.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>generatedata.com</title>
+    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon">
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+    <link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;400&display=swap" rel="stylesheet">
+	<link href="/styles.css" rel="stylesheet">
+    <base href="/">
+</head>
+<body>
+<div id="root"></div>
+</body>
+</html>
diff --git a/apps/client/src/index.tsx b/apps/client/src/index.tsx
new file mode 100644
index 000000000..dc4a85ef5
--- /dev/null
+++ b/apps/client/src/index.tsx
@@ -0,0 +1,6 @@
+/* istanbul ignore file */
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import App from './app';
+
+ReactDOM.render(<App />, document.getElementById('root'));
diff --git a/apps/client/src/resources/ambience.css b/apps/client/src/resources/ambience.css
new file mode 100644
index 000000000..907dd6aea
--- /dev/null
+++ b/apps/client/src/resources/ambience.css
@@ -0,0 +1,196 @@
+.themeAmbiance .cm-s-ambiance .cm-header {
+    color: blue;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-quote {
+    color: #24C2C7;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-keyword {
+    color: #cda869;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-atom {
+    color: #CF7EA9;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-number {
+    color: #78CF8A;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-def {
+    color: #aac6e3;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-variable {
+    color: #ffb795;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-variable-2 {
+    color: #eed1b3;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-variable-3, .themeAmbiance .cm-s-ambiance .cm-type {
+    color: #faded3;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-property {
+    color: #eed1b3;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-operator {
+    color: #fa8d6a;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-comment {
+    color: #555;
+    font-style: italic;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-string {
+    color: #8f9d6a;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-string-2 {
+    color: #9d937c;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-meta {
+    color: #D2A8A1;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-qualifier {
+    color: yellow;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-builtin {
+    color: #9999cc;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-bracket {
+    color: #24C2C7;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-tag {
+    color: #fee4ff;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-attribute {
+    color: #9B859D;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-hr {
+    color: pink;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-link {
+    color: #F4C20B;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-special {
+    color: #FF9D00;
+}
+
+.themeAmbiance .cm-s-ambiance .cm-error {
+    color: #AF2018;
+}
+
+.themeAmbiance .cm-s-ambiance .CodeMirror-matchingbracket {
+    color: #0f0;
+}
+
+.themeAmbiance .cm-s-ambiance .CodeMirror-nonmatchingbracket {
+    color: #f22;
+}
+
+.themeAmbiance .cm-s-ambiance div.CodeMirror-selected {
+    background: rgba(255, 255, 255, 0.15);
+}
+
+.themeAmbiance .cm-s-ambiance.CodeMirror-focused div.CodeMirror-selected {
+    background: rgba(255, 255, 255, 0.1);
+}
+
+.themeAmbiance .cm-s-ambiance .CodeMirror-line::selection, .themeAmbiance .cm-s-ambiance .CodeMirror-line > span::selection, .themeAmbiance .cm-s-ambiance .CodeMirror-line > span > span::selection {
+    background: rgba(255, 255, 255, 0.1);
+}
+
+.themeAmbiance .cm-s-ambiance .CodeMirror-line::-moz-selection, .themeAmbiance .cm-s-ambiance .CodeMirror-line > span::-moz-selection, .themeAmbiance .cm-s-ambiance .CodeMirror-line > span > span::-moz-selection {
+    background: rgba(255, 255, 255, 0.1);
+}
+
+.themeAmbiance .cm-s-ambiance.CodeMirror {
+    line-height: 1.4em;
+    color: #E6E1DC;
+    background-color: #202020;
+    -webkit-box-shadow: inset 0 0 10px black;
+    -moz-box-shadow: inset 0 0 10px black;
+    box-shadow: inset 0 0 10px black;
+}
+
+.themeAmbiance .cm-s-ambiance .CodeMirror-gutters {
+    background: #3D3D3D;
+    border-right: 1px solid #4D4D4D;
+    box-shadow: 0 10px 20px black;
+}
+
+.themeAmbiance .cm-s-ambiance .CodeMirror-linenumber {
+    text-shadow: 0px 1px 1px #4d4d4d;
+    color: #111;
+    padding: 0 5px;
+}
+
+.themeAmbiance .cm-s-ambiance .CodeMirror-guttermarker {
+    color: #aaa;
+}
+
+.themeAmbiance .cm-s-ambiance .CodeMirror-guttermarker-subtle {
+    color: #111;
+}
+
+.themeAmbiance .cm-s-ambiance .CodeMirror-cursor {
+    border-left: 1px solid #7991E8;
+}
+
+.themeAmbiance .cm-s-ambiance .CodeMirror-activeline-background {
+    background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
+}
+
+.themeAmbiance .cm-s-ambiance.CodeMirror,
+.themeAmbiance .cm-s-ambiance .CodeMirror-gutters {
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
+}
+
+/* ---------------- */
+
+body .themeAmbiance {
+    background-color: #202020;
+    color: #cccccc;
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
+}
+
+.themeAmbiance button[disabled] svg {
+    opacity: 0.3;
+}
+
+.themeAmbiance svg {
+    fill: #cccccc;
+}
+
+body .themeAmbiance .cm-s-ambiance.CodeMirror {
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+}
+
+body .themeAmbiance .cm-s-ambiance .CodeMirror-gutters {
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    background-color: #202020;
+    border-right: 1px solid #202020;
+}
+
+body .themeAmbiance .cm-s-ambiance .CodeMirror-linenumber {
+    color: #717159;
+}
diff --git a/apps/client/src/resources/bespin.css b/apps/client/src/resources/bespin.css
new file mode 100644
index 000000000..8d3df7a8d
--- /dev/null
+++ b/apps/client/src/resources/bespin.css
@@ -0,0 +1,96 @@
+.themeBespin .cm-s-bespin {
+    font-size: 1em;
+    line-height: 1.5em;
+    font-family: inconsolata, monospace;
+    letter-spacing: 0.3px;
+    word-spacing: 1px;
+    background: #28211C;
+    color: #BAAE9E;
+}
+
+.themeBespin .cm-s-bespin .CodeMirror-lines {
+    padding: 8px 0;
+}
+
+.themeBespin .cm-s-bespin .CodeMirror-gutters {
+    box-shadow: 1px 0 2px 0 rgba(0, 0, 0, 0.5);
+    -webkit-box-shadow: 1px 0 2px 0 rgba(0, 0, 0, 0.5);
+    background-color: #28211C;
+    padding-right: 10px;
+    z-index: 3;
+    border: none;
+}
+
+.themeBespin .cm-s-bespin div.CodeMirror-cursor {
+    border-left: 3px solid #BAAE9E;
+}
+
+.themeBespin .cm-s-bespin .CodeMirror-activeline-background {
+    background: #FFFFFF08;
+}
+
+.themeBespin .cm-s-bespin .CodeMirror-selected {
+    background: #DDF0FF33;
+}
+
+.themeBespin .cm-s-bespin .cm-comment {
+    font-style: italic;
+    color: #666666;
+}
+
+.themeBespin .cm-s-bespin .cm-keyword {
+    color: #5EA6EA;
+}
+
+.themeBespin .cm-s-bespin .cm-string {
+    color: #54BE0D;
+}
+
+.themeBespin .cm-s-bespin .cm-property {
+    color: #DAD085;
+}
+
+.themeBespin .cm-s-bespin .cm-variable-2 {
+    color: #5EA6EA;
+}
+
+.themeBespin .cm-s-bespin .cm-atom {
+    color: #DAD085;
+}
+
+.themeBespin .cm-s-bespin .cm-number {
+    color: #DAD085;
+}
+
+.themeBespin .cm-s-bespin .cm-operator {
+    color: #5EA6EA;
+}
+
+.themeBespin {
+    background-color: #28211c;
+    color: #cccccc;
+}
+
+.themeBespin button[disabled] svg {
+    opacity: 0.3;
+}
+
+.themeBespin svg {
+    fill: #cccccc;
+}
+
+/* ----------------------------------------------- */
+
+body .themeBespin .cm-s-bespin .cm-tag {
+   color: #ca762d;
+}
+
+body .themeBespin .cm-s-bespin .CodeMirror-gutters {
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+}
+
+body .themeBespin .cm-s-bespin .CodeMirror-linenumber {
+    color: #a27666;
+}
diff --git a/apps/client/src/resources/cobalt.css b/apps/client/src/resources/cobalt.css
new file mode 100644
index 000000000..48a3b21e0
--- /dev/null
+++ b/apps/client/src/resources/cobalt.css
@@ -0,0 +1,122 @@
+.themeCobalt .cm-s-cobalt.CodeMirror {
+    background: #002240;
+    color: white;
+}
+
+.themeCobalt .cm-s-cobalt div.CodeMirror-selected {
+    background: #b36539;
+}
+
+.themeCobalt .cm-s-cobalt .CodeMirror-line::selection, .themeCobalt .cm-s-cobalt .CodeMirror-line > span::selection,
+.themeCobalt .cm-s-cobalt .CodeMirror-line > span > span::selection {
+    background: rgba(179, 101, 57, 0.99);
+}
+
+.themeCobalt .cm-s-cobalt .CodeMirror-line::-moz-selection, .themeCobalt .cm-s-cobalt .CodeMirror-line > span::-moz-selection,
+.themeCobalt .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection {
+    background: rgba(179, 101, 57, 0.99);
+}
+
+.themeCobalt .cm-s-cobalt .CodeMirror-gutters {
+    background: #002240;
+    border-right: 1px solid #aaa;
+}
+
+.themeCobalt .cm-s-cobalt .CodeMirror-guttermarker {
+    color: #ffee80;
+}
+
+.themeCobalt .cm-s-cobalt .CodeMirror-guttermarker-subtle {
+    color: #d0d0d0;
+}
+
+.themeCobalt .cm-s-cobalt .CodeMirror-linenumber {
+    color: #d0d0d0;
+}
+
+.themeCobalt .cm-s-cobalt .CodeMirror-cursor {
+    border-left: 1px solid white;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-comment {
+    color: #08f;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-atom {
+    color: #845dc4;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-number, .themeCobalt .cm-s-cobalt span.cm-attribute {
+    color: #ff80e1;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-keyword {
+    color: #ffee80;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-string {
+    color: #3ad900;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-meta {
+    color: #ff9d00;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-variable-2, .themeCobalt .cm-s-cobalt span.cm-tag {
+    color: #9effff;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-variable-3, .themeCobalt .cm-s-cobalt span.cm-def, .themeCobalt .cm-s-cobalt .cm-type {
+    color: white;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-bracket {
+    color: #d8d8d8;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-builtin, .themeCobalt .cm-s-cobalt span.cm-special {
+    color: #ff9e59;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-link {
+    color: #845dc4;
+}
+
+.themeCobalt .cm-s-cobalt span.cm-error {
+    color: #9d1e15;
+}
+
+.themeCobalt .cm-s-cobalt .CodeMirror-activeline-background {
+    background: #002D57;
+}
+
+.themeCobalt .cm-s-cobalt .CodeMirror-matchingbracket {
+    outline: 1px solid grey;
+    color: white !important;
+}
+
+/* ---------------- */
+
+.themeCobalt {
+    background-color: #002240;
+}
+
+.themeCobalt {
+    color: #cccccc;
+}
+
+.themeCobalt button[disabled] svg {
+    opacity: 0.3;
+}
+
+.themeCobalt svg {
+    fill: #cccccc;
+}
+
+.themeCobalt .cm-s-cobalt .CodeMirror-linenumber {
+    color: #54718b;
+}
+
+.themeCobalt .cm-s-cobalt .CodeMirror-gutters {
+    border-right: #264c6b;
+}
diff --git a/apps/client/src/resources/codemirror.css b/apps/client/src/resources/codemirror.css
new file mode 100644
index 000000000..8cccc732c
--- /dev/null
+++ b/apps/client/src/resources/codemirror.css
@@ -0,0 +1,533 @@
+.CodeMirror {
+    font-family: monospace;
+    height: 10px;
+    color: black;
+    direction: ltr;
+}
+
+/* PADDING */
+
+.CodeMirror-lines {
+    padding: 4px 0; /* Vertical padding around content */
+}
+
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
+    padding: 0 6px 0 50px; /* Horizontal padding of content */
+}
+
+.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+    background-color: white; /* The little square between H and V scrollbars */
+}
+
+/* GUTTER */
+
+.CodeMirror-gutters {
+    border-right: 1px solid #ddd;
+    background-color: #f7f7f7;
+    white-space: nowrap;
+}
+
+.CodeMirror-linenumbers {
+}
+
+.CodeMirror-linenumber {
+    padding: 0 3px 0 5px;
+    min-width: 20px;
+    text-align: right;
+    color: #999;
+    white-space: nowrap;
+}
+
+.CodeMirror-guttermarker {
+    color: black;
+}
+
+.CodeMirror-guttermarker-subtle {
+    color: #999;
+}
+
+/* CURSOR */
+
+.CodeMirror-cursor {
+    border-left: 1px solid black;
+    border-right: none;
+    width: 0;
+}
+
+/* Shown when moving in bi-directional text */
+.CodeMirror div.CodeMirror-secondarycursor {
+    border-left: 1px solid silver;
+}
+
+.cm-fat-cursor .CodeMirror-cursor {
+    width: auto;
+    border: 0 !important;
+    background: #7e7;
+}
+
+.cm-fat-cursor div.CodeMirror-cursors {
+    z-index: 1;
+}
+
+.cm-fat-cursor-mark {
+    background-color: rgba(20, 255, 20, 0.5);
+    -webkit-animation: blink 1.06s steps(1) infinite;
+    -moz-animation: blink 1.06s steps(1) infinite;
+    animation: blink 1.06s steps(1) infinite;
+}
+
+.cm-animate-fat-cursor {
+    width: auto;
+    border: 0;
+    -webkit-animation: blink 1.06s steps(1) infinite;
+    -moz-animation: blink 1.06s steps(1) infinite;
+    animation: blink 1.06s steps(1) infinite;
+    background-color: #7e7;
+}
+
+@-moz-keyframes blink {
+    0% {
+    }
+    50% {
+        background-color: transparent;
+    }
+    100% {
+    }
+}
+
+@-webkit-keyframes blink {
+    0% {
+    }
+    50% {
+        background-color: transparent;
+    }
+    100% {
+    }
+}
+
+@keyframes blink {
+    0% {
+    }
+    50% {
+        background-color: transparent;
+    }
+    100% {
+    }
+}
+
+/* Can style cursor different in overwrite (non-insert) mode */
+.CodeMirror-overwrite .CodeMirror-cursor {
+}
+
+.cm-tab {
+    display: inline-block;
+    text-decoration: inherit;
+}
+
+.CodeMirror-rulers {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: -50px;
+    bottom: 0;
+    overflow: hidden;
+}
+
+.CodeMirror-ruler {
+    border-left: 1px solid #ccc;
+    top: 0;
+    bottom: 0;
+    position: absolute;
+}
+
+/* DEFAULT THEME */
+
+.cm-s-default .cm-header {
+    color: blue;
+}
+
+.cm-s-default .cm-quote {
+    color: #090;
+}
+
+.cm-negative {
+    color: #d44;
+}
+
+.cm-positive {
+    color: #292;
+}
+
+.cm-header, .cm-strong {
+    font-weight: bold;
+}
+
+.cm-em {
+    font-style: italic;
+}
+
+.cm-link {
+    text-decoration: underline;
+}
+
+.cm-strikethrough {
+    text-decoration: line-through;
+}
+
+.cm-s-default .cm-keyword {
+    color: #708;
+}
+
+.cm-s-default .cm-atom {
+    color: #219;
+}
+
+.cm-s-default .cm-number {
+    color: #164;
+}
+
+.cm-s-default .cm-def {
+    color: #00f;
+}
+
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {
+}
+
+.cm-s-default .cm-variable-2 {
+    color: #05a;
+}
+
+.cm-s-default .cm-variable-3, .cm-s-default .cm-type {
+    color: #085;
+}
+
+.cm-s-default .cm-comment {
+    color: #a50;
+}
+
+.cm-s-default .cm-string {
+    color: #a11;
+}
+
+.cm-s-default .cm-string-2 {
+    color: #f50;
+}
+
+.cm-s-default .cm-meta {
+    color: #555;
+}
+
+.cm-s-default .cm-qualifier {
+    color: #555;
+}
+
+.cm-s-default .cm-builtin {
+    color: #30a;
+}
+
+.cm-s-default .cm-bracket {
+    color: #997;
+}
+
+.cm-s-default .cm-tag {
+    color: #170;
+}
+
+.cm-s-default .cm-attribute {
+    color: #00c;
+}
+
+.cm-s-default .cm-hr {
+    color: #999;
+}
+
+.cm-s-default .cm-link {
+    color: #00c;
+}
+
+.cm-s-default .cm-error {
+    color: #f00;
+}
+
+.cm-invalidchar {
+    color: #f00;
+}
+
+.CodeMirror-composing {
+    border-bottom: 2px solid;
+}
+
+/* Default styles for common addons */
+
+div.CodeMirror span.CodeMirror-matchingbracket {
+    color: #0b0;
+}
+
+div.CodeMirror span.CodeMirror-nonmatchingbracket {
+    color: #a22;
+}
+
+.CodeMirror-matchingtag {
+    background: rgba(255, 150, 0, .3);
+}
+
+.CodeMirror-activeline-background {
+    background: #e8f2ff;
+}
+
+/* STOP */
+
+/* The rest of this file contains styles related to the mechanics of
+   the editor. You probably shouldn't touch them. */
+
+.CodeMirror {
+    position: relative;
+    overflow: hidden;
+}
+
+.CodeMirror-scroll {
+    overflow: scroll !important; /* Things will break if this is overridden */
+    /* 30px is the magic margin used to hide the element's real scrollbars */
+    /* See overflow: hidden in .CodeMirror */
+    margin-bottom: -30px;
+    margin-right: -30px;
+    padding-bottom: 30px;
+    height: 100%;
+    outline: none; /* Prevent dragging from highlighting the element */
+    position: relative;
+}
+
+.CodeMirror-sizer {
+    position: relative;
+    border-right: 30px solid transparent;
+}
+
+/* The fake, visible scrollbars. Used to force redraw during scrolling
+   before actual scrolling happens, thus preventing shaking and
+   flickering artifacts. */
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+    position: absolute;
+    z-index: 6;
+    display: none;
+}
+
+.CodeMirror-vscrollbar {
+    right: 0;
+    top: 0;
+    overflow-x: hidden;
+    overflow-y: scroll;
+}
+
+.CodeMirror-hscrollbar {
+    bottom: 0;
+    left: 0;
+    overflow-y: hidden;
+    overflow-x: scroll;
+}
+
+.CodeMirror-scrollbar-filler {
+    right: 0;
+    bottom: 0;
+}
+
+.CodeMirror-gutter-filler {
+    left: 0;
+    bottom: 0;
+}
+
+.CodeMirror-gutters {
+    position: absolute;
+    left: 0;
+    top: 0;
+    min-height: 100%;
+    z-index: 3;
+}
+
+.CodeMirror-gutter {
+    white-space: normal;
+    height: 100%;
+    display: inline-block;
+    vertical-align: top;
+    margin-bottom: -30px;
+}
+
+.CodeMirror-gutter-wrapper {
+    position: absolute;
+    z-index: 4;
+    background: none !important;
+    border: none !important;
+}
+
+.CodeMirror-gutter-background {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    z-index: 4;
+}
+
+.CodeMirror-gutter-elt {
+    position: absolute;
+    cursor: default;
+    z-index: 4;
+}
+
+.CodeMirror-gutter-wrapper ::selection {
+    background-color: transparent
+}
+
+.CodeMirror-gutter-wrapper ::-moz-selection {
+    background-color: transparent
+}
+
+.CodeMirror-lines {
+    cursor: text;
+    min-height: 1px; /* prevents collapsing before first draw */
+}
+
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-line-like {
+    /* Reset some styles that the rest of the page might have set */
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+    border-radius: 0;
+    border-width: 0;
+    background: transparent;
+    font-family: inherit;
+    font-size: inherit;
+    margin: 0;
+    white-space: pre;
+    word-wrap: normal;
+    line-height: inherit;
+    color: inherit;
+    z-index: 2;
+    position: relative;
+    overflow: visible;
+    -webkit-tap-highlight-color: transparent;
+    -webkit-font-variant-ligatures: contextual;
+    font-variant-ligatures: contextual;
+}
+
+.CodeMirror-wrap pre.CodeMirror-line,
+.CodeMirror-wrap pre.CodeMirror-line-like {
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: normal;
+}
+
+.CodeMirror-linebackground {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 0;
+}
+
+.CodeMirror-linewidget {
+    position: relative;
+    z-index: 2;
+    padding: 0.1px; /* Force widget margins to stay inside of the container */
+}
+
+.CodeMirror-widget {
+}
+
+.CodeMirror-rtl pre {
+    direction: rtl;
+}
+
+.CodeMirror-code {
+    outline: none;
+}
+
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+}
+
+.CodeMirror-measure {
+    position: absolute;
+    width: 100%;
+    height: 0;
+    overflow: hidden;
+    visibility: hidden;
+}
+
+.CodeMirror-cursor {
+    position: absolute;
+    pointer-events: none;
+}
+
+.CodeMirror-measure pre {
+    position: static;
+}
+
+div.CodeMirror-cursors {
+    visibility: hidden;
+    position: relative;
+    z-index: 3;
+}
+
+div.CodeMirror-dragcursors {
+    visibility: visible;
+}
+
+.CodeMirror-focused div.CodeMirror-cursors {
+    visibility: visible;
+}
+
+.CodeMirror-selected {
+    background: #d9d9d9;
+}
+
+.CodeMirror-focused .CodeMirror-selected {
+    background: #d7d4f0;
+}
+
+.CodeMirror-crosshair {
+    cursor: crosshair;
+}
+
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection {
+    background: #d7d4f0;
+}
+
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection {
+    background: #d7d4f0;
+}
+
+.cm-searching {
+    background-color: #ffa;
+    background-color: rgba(255, 255, 0, .4);
+}
+
+/* Used to force a border model for a node */
+.cm-force-border {
+    padding-right: .1px;
+}
+
+@media print {
+    /* Hide the cursor when printing */
+    .CodeMirror div.CodeMirror-cursors {
+        visibility: hidden;
+    }
+}
+
+/* See issue #2901 */
+.cm-tab-wrap-hack:after {
+    content: '';
+}
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext {
+    background: none;
+}
diff --git a/apps/client/src/resources/darcula.css b/apps/client/src/resources/darcula.css
new file mode 100644
index 000000000..a03b1ee4c
--- /dev/null
+++ b/apps/client/src/resources/darcula.css
@@ -0,0 +1,188 @@
+.themeDarcula .cm-s-darcula {
+    font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace, serif;
+}
+
+.themeDarcula .cm-s-darcula.CodeMirror {
+    background: #2B2B2B;
+    color: #A9B7C6;
+}
+
+.themeDarcula .cm-s-darcula span.cm-meta {
+    color: #BBB529;
+}
+
+.themeDarcula .cm-s-darcula span.cm-number {
+    color: #6897BB;
+}
+
+.themeDarcula .cm-s-darcula span.cm-keyword {
+    color: #CC7832;
+    line-height: 1em;
+    font-weight: bold;
+}
+
+.themeDarcula .cm-s-darcula span.cm-def {
+    color: #A9B7C6;
+    font-style: italic;
+}
+
+.themeDarcula .cm-s-darcula span.cm-variable {
+    color: #A9B7C6;
+}
+
+.themeDarcula .cm-s-darcula span.cm-variable-2 {
+    color: #A9B7C6;
+}
+
+.themeDarcula .cm-s-darcula span.cm-variable-3 {
+    color: #9876AA;
+}
+
+.themeDarcula .cm-s-darcula span.cm-type {
+    color: #AABBCC;
+    font-weight: bold;
+}
+
+.themeDarcula .cm-s-darcula span.cm-property {
+    color: #FFC66D;
+}
+
+.themeDarcula .cm-s-darcula span.cm-operator {
+    color: #A9B7C6;
+}
+
+.themeDarcula .cm-s-darcula span.cm-string {
+    color: #6A8759;
+}
+
+.themeDarcula .cm-s-darcula span.cm-string-2 {
+    color: #6A8759;
+}
+
+.themeDarcula .cm-s-darcula span.cm-comment {
+    color: #61A151;
+    font-style: italic;
+}
+
+.themeDarcula .cm-s-darcula span.cm-link {
+    color: #CC7832;
+}
+
+.themeDarcula .cm-s-darcula span.cm-atom {
+    color: #CC7832;
+}
+
+.themeDarcula .cm-s-darcula span.cm-error {
+    color: #BC3F3C;
+}
+
+.themeDarcula .cm-s-darcula span.cm-tag {
+    color: #629755;
+    font-weight: bold;
+    font-style: italic;
+}
+
+.themeDarcula .cm-s-darcula span.cm-attribute {
+    color: #6897bb;
+}
+
+.themeDarcula .cm-s-darcula span.cm-qualifier {
+    color: #6A8759;
+}
+
+.themeDarcula .cm-s-darcula span.cm-bracket {
+    color: #A9B7C6;
+}
+
+.themeDarcula .cm-s-darcula span.cm-builtin {
+    color: #FF9E59;
+}
+
+.themeDarcula .cm-s-darcula span.cm-special {
+    color: #FF9E59;
+}
+
+.themeDarcula .cm-s-darcula span.cm-matchhighlight {
+    color: #FFFFFF;
+    background-color: rgba(50, 89, 48, 0.7);
+    font-weight: normal;
+}
+
+.themeDarcula .cm-s-darcula span.cm-searching {
+    color: #FFFFFF;
+    background-color: rgba(61, 115, 59, 0.7);
+    font-weight: normal;
+}
+
+.themeDarcula .cm-s-darcula .CodeMirror-cursor {
+    border-left: 1px solid #A9B7C6;
+}
+
+.themeDarcula .cm-s-darcula .CodeMirror-activeline-background {
+    background: #323232;
+}
+
+.themeDarcula .cm-s-darcula .CodeMirror-gutters {
+    background: #313335;
+    border-right: 1px solid #313335;
+}
+
+.themeDarcula .cm-s-darcula .CodeMirror-guttermarker {
+    color: #FFEE80;
+}
+
+.themeDarcula .cm-s-darcula .CodeMirror-guttermarker-subtle {
+    color: #D0D0D0;
+}
+
+.themeDarcula .cm-s-darcula .CodeMirrir-linenumber {
+    color: #606366;
+}
+
+.themeDarcula .cm-s-darcula .CodeMirror-matchingbracket {
+    background-color: #3B514D;
+    color: #FFEF28 !important;
+    font-weight: bold;
+}
+
+.themeDarcula .cm-s-darcula div.CodeMirror-selected {
+    background: #214283;
+}
+
+.themeDarcula .CodeMirror-hints.darcula {
+    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+    color: #9C9E9E;
+    background-color: #3B3E3F !important;
+}
+
+.themeDarcula .CodeMirror-hints.darcula .CodeMirror-hint-active {
+    background-color: #494D4E !important;
+    color: #9C9E9E !important;
+}
+
+/* ---------------- */
+
+.themeDarcula {
+    background-color: #2b2b2b;
+}
+
+.themeDarcula {
+    color: #cccccc;
+}
+
+.themeDarcula svg {
+    fill: #cccccc;
+}
+
+.themeDarcula button[disabled] svg {
+    opacity: 0.3;
+}
+
+.themeDarcula .cm-s-darcula .CodeMirror-gutters {
+    background-color: #2b2b2b;
+    border-right: 1px solid #484848;
+}
+
+body .themeDarcula .cm-s-darcula .CodeMirror-gutters {
+    border-right: 0;
+}
diff --git a/apps/client/src/resources/lucario.css b/apps/client/src/resources/lucario.css
new file mode 100644
index 000000000..3ee39a452
--- /dev/null
+++ b/apps/client/src/resources/lucario.css
@@ -0,0 +1,124 @@
+.themeLucario .cm-s-lucario.CodeMirror, .themeLucario .cm-s-lucario .CodeMirror-gutters {
+    background-color: #2b3e50 !important;
+    color: #f8f8f2 !important;
+    border: none;
+}
+
+.themeLucario .cm-s-lucario .CodeMirror-gutters {
+    color: #2b3e50;
+}
+
+.themeLucario .cm-s-lucario .CodeMirror-cursor {
+    border-left: solid thin #E6C845;
+}
+
+.themeLucario .cm-s-lucario .CodeMirror-linenumber {
+    color: #f8f8f2;
+}
+
+.themeLucario .cm-s-lucario .CodeMirror-selected {
+    background: #243443;
+}
+
+.themeLucario .cm-s-lucario .CodeMirror-line::selection, .themeLucario .cm-s-lucario .CodeMirror-line > span::selection, .themeLucario .cm-s-lucario .CodeMirror-line > span > span::selection {
+    background: #243443;
+}
+
+.themeLucario .cm-s-lucario .CodeMirror-line::-moz-selection, .themeLucario .cm-s-lucario .CodeMirror-line > span::-moz-selection, .themeLucario .cm-s-lucario .CodeMirror-line > span > span::-moz-selection {
+    background: #243443;
+}
+
+.themeLucario .cm-s-lucario span.cm-comment {
+    color: #5c98cd;
+}
+
+.themeLucario .cm-s-lucario span.cm-string, .themeLucario .cm-s-lucario span.cm-string-2 {
+    color: #E6DB74;
+}
+
+.themeLucario .cm-s-lucario span.cm-number {
+    color: #ca94ff;
+}
+
+.themeLucario .cm-s-lucario span.cm-variable {
+    color: #f8f8f2;
+}
+
+.themeLucario .cm-s-lucario span.cm-variable-2 {
+    color: #f8f8f2;
+}
+
+.themeLucario .cm-s-lucario span.cm-def {
+    color: #72C05D;
+}
+
+.themeLucario .cm-s-lucario span.cm-operator {
+    color: #66D9EF;
+}
+
+.themeLucario .cm-s-lucario span.cm-keyword {
+    color: #ff6541;
+}
+
+.themeLucario .cm-s-lucario span.cm-atom {
+    color: #bd93f9;
+}
+
+.themeLucario .cm-s-lucario span.cm-meta {
+    color: #f8f8f2;
+}
+
+.themeLucario .cm-s-lucario span.cm-tag {
+    color: #ff6541;
+}
+
+.themeLucario .cm-s-lucario span.cm-attribute {
+    color: #66D9EF;
+}
+
+.themeLucario .cm-s-lucario span.cm-qualifier {
+    color: #72C05D;
+}
+
+.themeLucario .cm-s-lucario span.cm-property {
+    color: #f8f8f2;
+}
+
+.themeLucario .cm-s-lucario span.cm-builtin {
+    color: #72C05D;
+}
+
+.themeLucario .cm-s-lucario span.cm-variable-3, .themeLucario .cm-s-lucario span.cm-type {
+    color: #ffb86c;
+}
+
+.themeLucario .cm-s-lucario .CodeMirror-activeline-background {
+    background: #243443;
+}
+
+.themeLucario .cm-s-lucario .CodeMirror-matchingbracket {
+    text-decoration: underline;
+    color: white !important;
+}
+
+/* ---------------- */
+
+.themeLucario {
+    background-color: #2b3e50;
+}
+
+.themeLucario {
+    color: #cccccc;
+}
+
+.themeLucario button[disabled] svg {
+    opacity: 0.3;
+}
+
+.themeLucario svg {
+    fill: #cccccc;
+}
+
+.themeLucario .cm-s-lucario .CodeMirror-linenumber {
+    color: #697988;
+}
diff --git a/apps/client/src/styles/etShared.scss b/apps/client/src/styles/etShared.scss
new file mode 100644
index 000000000..2443869ba
--- /dev/null
+++ b/apps/client/src/styles/etShared.scss
@@ -0,0 +1,14 @@
+.settingRow {
+	margin-top: 10px;
+
+	label {
+		display: block;
+		margin-bottom: 4px;
+		color: #666666;
+	}
+
+	button {
+		margin-right: 6px;
+		width: inherit;
+	}
+}
diff --git a/apps/client/src/styles/etShared.scss.d.ts b/apps/client/src/styles/etShared.scss.d.ts
new file mode 100644
index 000000000..fe8eb156b
--- /dev/null
+++ b/apps/client/src/styles/etShared.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace EtSharedScssNamespace {
+  export interface IEtSharedScss {
+    settingRow: string;
+  }
+}
+
+declare const EtSharedScssModule: EtSharedScssNamespace.IEtSharedScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: EtSharedScssNamespace.IEtSharedScss;
+};
+
+export = EtSharedScssModule;
diff --git a/apps/client/src/styles/global.scss b/apps/client/src/styles/global.scss
new file mode 100644
index 000000000..0235e369d
--- /dev/null
+++ b/apps/client/src/styles/global.scss
@@ -0,0 +1,34 @@
+@use './variables.scss' as c;
+
+h3 {
+	margin: 10px 0 8px;
+}
+
+a {
+	text-decoration: none;
+	color: c.$primary-color;
+
+	&:hover {
+		text-decoration: underline;
+	}
+}
+
+:global(.Select-menu-outer) {
+	z-index: 10000 !important;
+}
+
+body :global(div.MuiTooltip-popper) {
+	z-index: 5005 !important; // was 5010
+}
+
+.recharts-wrapper .recharts-area {
+	transition: none;
+}
+
+body :global(.MuiAlert-filledError) {
+	background-color: #c52820;
+}
+
+ul:global(.MuiPagination-ul) li {
+	padding: 0 !important;
+}
diff --git a/apps/client/src/styles/global.scss.d.ts b/apps/client/src/styles/global.scss.d.ts
new file mode 100644
index 000000000..0c8db63f7
--- /dev/null
+++ b/apps/client/src/styles/global.scss.d.ts
@@ -0,0 +1,13 @@
+declare namespace GlobalScssNamespace {
+  export interface IGlobalScss {
+    'recharts-area': string;
+    'recharts-wrapper': string;
+  }
+}
+
+declare const GlobalScssModule: GlobalScssNamespace.IGlobalScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: GlobalScssNamespace.IGlobalScss;
+};
+
+export = GlobalScssModule;
diff --git a/apps/client/src/styles/shared.scss b/apps/client/src/styles/shared.scss
new file mode 100644
index 000000000..ac6f356df
--- /dev/null
+++ b/apps/client/src/styles/shared.scss
@@ -0,0 +1,160 @@
+@use './variables.scss' as c;
+
+.tip {
+	color: #999999;
+}
+
+.emptyCol {
+	padding: 7px 2px;
+	color: #999999;
+}
+
+.blank {
+	color: #cccccc;
+}
+
+.emptyText {
+	color: #666666;
+	font-style: italic;
+}
+
+input.errorField,
+textarea.errorField,
+select.errorField,
+button.errorField {
+	border: 1px solid c.$error;
+
+	&:focus {
+		border: 1px solid c.$error;
+	}
+}
+
+.pill {
+	background-color: #dfecfc;
+	border-radius: 3px;
+	padding: 1px 6px;
+}
+
+.copyCol {
+	flex: 0 0 26px;
+}
+
+:global(div.MuiAlert-root) {
+	font-size: 13px;
+}
+
+.twoColPage {
+	max-width: 1024px;
+	margin: 15px auto 0;
+	width: 100%;
+	padding: 0 10px;
+	height: 100%;
+	flex: 1;
+	display: flex;
+	flex-direction: row;
+	font-size: 12px;
+
+	input {
+		font-size: 14px;
+	}
+
+	nav {
+		flex: 0 0 240px;
+
+		ul {
+			list-style: none;
+			padding-left: 0;
+
+			li {
+				padding: 10px 10px;
+				font-size: 14px;
+				cursor: pointer;
+				transition: color 0.2s ease-in-out;
+
+				&:hover {
+					color: c.$primary-color;
+				}
+
+				&.selected {
+					color: c.$primary-color;
+				}
+			}
+		}
+	}
+
+	.tab {
+		flex: 1;
+		padding: 20px 0;
+		overflow: scroll;
+	}
+
+	label {
+		color: #999999;
+	}
+
+	:global(.react-select__placeholder),
+	:global(.react-select__single-value) {
+		font-size: 14px;
+	}
+}
+
+.cancelLink {
+	margin-left: 15px;
+	font-size: 13px;
+	color: #999999;
+	cursor: pointer;
+	transition: visibility 200ms ease-in-out;
+
+	&:hover {
+		color: c.$primary-color;
+	}
+
+	&.hidden {
+		visibility: hidden;
+	}
+}
+
+.generatorControls {
+	flex: 1;
+	overflow: hidden;
+	padding-right: 18px;
+	opacity: 0;
+	transition: opacity 200ms ease-in-out;
+
+	&.visible {
+		opacity: 1;
+	}
+}
+
+.fadeIn {
+	opacity: 0;
+	transition: opacity 200ms ease-in-out;
+}
+
+.mainLogo {
+	opacity: 0;
+	position: absolute;
+	left: 55px;
+	top: 17px;
+	transition: opacity 200ms ease-in-out;
+	user-select: none;
+
+	img {
+		width: 200px;
+	}
+
+	&.visible {
+		opacity: 1;
+	}
+}
+
+@media (max-width: 600px) {
+	.twoColPage {
+		flex-direction: column;
+
+		nav {
+			flex: 0 0 auto;
+			border-bottom: 1px solid #efefef;
+		}
+	}
+}
diff --git a/apps/client/src/styles/shared.scss.d.ts b/apps/client/src/styles/shared.scss.d.ts
new file mode 100644
index 000000000..9b6aaa031
--- /dev/null
+++ b/apps/client/src/styles/shared.scss.d.ts
@@ -0,0 +1,27 @@
+declare namespace SharedScssNamespace {
+  export interface ISharedScss {
+    blank: string;
+    cancelLink: string;
+    copyCol: string;
+    emptyCol: string;
+    emptyText: string;
+    errorField: string;
+    fadeIn: string;
+    generatorControls: string;
+    hidden: string;
+    mainLogo: string;
+    pill: string;
+    selected: string;
+    tab: string;
+    tip: string;
+    twoColPage: string;
+    visible: string;
+  }
+}
+
+declare const SharedScssModule: SharedScssNamespace.ISharedScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: SharedScssNamespace.ISharedScss;
+};
+
+export = SharedScssModule;
diff --git a/apps/client/src/styles/variables.scss b/apps/client/src/styles/variables.scss
new file mode 100644
index 000000000..91c287570
--- /dev/null
+++ b/apps/client/src/styles/variables.scss
@@ -0,0 +1,14 @@
+$primary-color: #275eb5;
+$primary-pale-color: #e0ebfd;
+$primary-submit: #30aadc;
+$primary-submit-hover: #148ec0;
+$primary-pale-bg: #d4e6f7;
+
+$secondary-color: #006f0d;
+$secondary-pale-color: #e8fceb;
+$secondary-dark-color: #002a05;
+
+$field-focus-color: #2684FF;
+$bg-color: #f2f2f2;
+
+$error: #db0000;
diff --git a/apps/client/src/tours/Components.tour.tsx b/apps/client/src/tours/Components.tour.tsx
new file mode 100644
index 000000000..20d19f08f
--- /dev/null
+++ b/apps/client/src/tours/Components.tour.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { PrimaryButton, NullButton } from '~components/Buttons.component';
+import { getStrings } from '@generatedata/utils/lang';
+
+export const TourCompleteStep = ({ close }: any) => {
+	const { core: i18n } = getStrings();
+
+	const onExit = (): void => {
+		close(true);
+	};
+
+	return (
+		<>
+			<h2>{i18n.tourComplete}</h2>
+
+			<p>{i18n.tourCompleteDesc}</p>
+
+			<p>
+				<PrimaryButton size="medium" style={{ marginRight: 6 }} onClick={close}>
+					{i18n.tryDifferentTour}
+				</PrimaryButton>
+				<NullButton size="medium" onClick={onExit}>
+					Exit
+				</NullButton>
+			</p>
+		</>
+	);
+};
diff --git a/apps/client/src/tours/GridPanel.tour.tsx b/apps/client/src/tours/GridPanel.tour.tsx
new file mode 100644
index 000000000..be1f4d72b
--- /dev/null
+++ b/apps/client/src/tours/GridPanel.tour.tsx
@@ -0,0 +1,354 @@
+import React from 'react';
+import Reactour, { ReactourStepPosition } from 'reactour';
+import { getStrings } from '@generatedata/utils/lang';
+import store from '~core/store';
+import * as actions from '~store/generator/generator.actions';
+import * as selectors from '~store/generator/generator.selectors';
+import { TourCompleteStep } from './Components.tour';
+import { TourProps } from '~types/general';
+import { GeneratorLayout } from '@generatedata/types';
+import { DataTypeFolder, ExportTypeFolder } from '@generatedata/plugins';
+
+const Step1 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.theGridPanel}</h2>
+			<p>{i18n.gridPanelTourIntroDesc1}</p>
+			<p>{i18n.gridPanelTourIntroDesc2}</p>
+		</>
+	);
+};
+
+const Step2 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.columns}</h2>
+
+			<p>{i18n.columnsDesc}</p>
+		</>
+	);
+};
+
+const Step3 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.rowNumber}</h2>
+			<p>{i18n.rowNumDesc1}</p>
+			<p>{i18n.rowNumDesc2}</p>
+		</>
+	);
+};
+
+const Step4 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.dataType}</h2>
+			<p>{i18n.dataTypeDesc}</p>
+		</>
+	);
+};
+
+const Step5 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.helpIcon}</h2>
+			<p>{i18n.helpIconDesc}</p>
+		</>
+	);
+};
+
+const Step6 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.nameColumn}</h2>
+			<p>{i18n.nameColumnDesc}</p>
+		</>
+	);
+};
+
+const Step7 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.exampleColumn}</h2>
+			<p>{i18n.exampleColumnDesc}</p>
+		</>
+	);
+};
+
+const Step8 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.optionsColumn}</h2>
+			<p>{i18n.optionsColumnDesc1}</p>
+			<p>{i18n.optionsColumnDesc2}</p>
+		</>
+	);
+};
+
+const Step9 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.deleteRow}</h2>
+			<p>{i18n.deleteRowDesc}</p>
+		</>
+	);
+};
+
+const Step10 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.addRows}</h2>
+			<p>{i18n.addRowsDesc}</p>
+		</>
+	);
+};
+
+const commonStyles = {
+	borderRadius: 6,
+	margin: 12
+};
+
+const steps = [
+	{
+		content: Step1,
+		style: {
+			...commonStyles
+		},
+		position: 'center' as ReactourStepPosition,
+		action: (): void => {
+			setTimeout(() => {
+				store.dispatch(actions.clearPage(false));
+				store.dispatch(actions.addRows(10));
+
+				const state = store.getState();
+				const rows = selectors.getSortedRowsArray(state);
+
+				if (!selectors.isGridVisible(state)) {
+					store.dispatch(actions.toggleGrid());
+				}
+				if (selectors.isPreviewVisible(state)) {
+					store.dispatch(actions.togglePreview());
+				}
+
+				const layout = selectors.getGeneratorLayout(state);
+				if (layout === GeneratorLayout.vertical) {
+					store.dispatch(actions.toggleLayout());
+				}
+
+				const ids = rows.map(({ id }) => id);
+
+				const pluginsToLoad: any = {
+					Names: false,
+					Phone: false,
+					Email: false,
+					StreetAddress: false,
+					City: false,
+					Region: false,
+					Country: false,
+					LatLng: false,
+					Alphanumeric: false,
+					Boolean: false
+				};
+
+				const onLoadComplete = (plugin: DataTypeFolder | ExportTypeFolder): void => {
+					pluginsToLoad[plugin] = true;
+
+					const allLoaded = Object.keys(pluginsToLoad).reduce((allLoaded, key) => allLoaded && pluginsToLoad[key], true);
+					if (allLoaded) {
+						store.dispatch(actions.refreshPreview(ids));
+					}
+				};
+
+				const shouldRefreshPreviewPanel = false;
+				store.dispatch(
+					actions.onSelectDataType('Names', {
+						gridRowId: ids[0],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('Phone', {
+						gridRowId: ids[1],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('Email', {
+						gridRowId: ids[2],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('StreetAddress', {
+						gridRowId: ids[3],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('City', {
+						gridRowId: ids[4],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('Region', {
+						gridRowId: ids[5],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('Country', {
+						gridRowId: ids[6],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('LatLng', {
+						gridRowId: ids[7],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('Alphanumeric', {
+						gridRowId: ids[8],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('Boolean', {
+						gridRowId: ids[8],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+
+				document.querySelector('.tour-scrollableGridRows')!.scrollTop = 0;
+			}, 10);
+		}
+	},
+	{
+		content: Step2,
+		selector: '.tour-gridHeader',
+		style: {
+			...commonStyles
+		},
+		position: 'bottom' as ReactourStepPosition
+	},
+	{
+		content: Step3,
+		selector: '.tour-gridRow div:nth-child(1)',
+		style: {
+			...commonStyles
+		},
+		position: 'bottom' as ReactourStepPosition
+	},
+	{
+		content: Step4,
+		selector: '.tour-gridRow>div:nth-child(2)>div:nth-child(1) div',
+		style: {
+			...commonStyles
+		},
+		position: 'bottom' as ReactourStepPosition
+	},
+	{
+		content: Step5,
+		selector: '.tour-gridRow>div:nth-child(2)>div:nth-child(2) svg',
+		style: {
+			...commonStyles
+		},
+		position: 'bottom' as ReactourStepPosition
+	},
+	{
+		content: Step6,
+		selector: '.tour-gridRow div:nth-child(3) input',
+		style: {
+			...commonStyles
+		},
+		position: 'bottom' as ReactourStepPosition
+	},
+	{
+		content: Step7,
+		selector: '.tour-gridRow div:nth-child(4)>*',
+		style: {
+			...commonStyles
+		},
+		position: 'bottom' as ReactourStepPosition
+	},
+	{
+		content: Step8,
+		selector: '.tour-gridRow div:nth-child(5)>*',
+		style: {
+			...commonStyles
+		},
+		position: 'bottom' as ReactourStepPosition
+	},
+	{
+		content: Step9,
+		selector: '.tour-gridRow div:nth-child(7) svg',
+		style: {
+			...commonStyles
+		},
+		position: 'bottom' as ReactourStepPosition
+	},
+	{
+		content: Step10,
+		selector: '.tour-addRows',
+		style: {
+			...commonStyles,
+			marginTop: -20
+		},
+		position: 'top' as ReactourStepPosition
+	},
+	{
+		content: TourCompleteStep,
+		style: {
+			...commonStyles
+		}
+	}
+];
+
+const Tour = ({ isOpen, onClose, maskClassName, closeWithMask, disableInteraction, accentColor, className }: TourProps) => (
+	<Reactour
+		steps={steps}
+		isOpen={isOpen}
+		onRequestClose={onClose}
+		maskClassName={maskClassName}
+		maskSpace={0}
+		closeWithMask={closeWithMask}
+		disableInteraction={disableInteraction}
+		accentColor={accentColor}
+		className={className}
+		disableFocusLock={true}
+	/>
+);
+
+export default Tour;
diff --git a/apps/client/src/tours/IntroToGenerator.tour.tsx b/apps/client/src/tours/IntroToGenerator.tour.tsx
new file mode 100644
index 000000000..312acbae1
--- /dev/null
+++ b/apps/client/src/tours/IntroToGenerator.tour.tsx
@@ -0,0 +1,265 @@
+import React from 'react';
+import Reactour, { ReactourStepPosition } from 'reactour';
+import store from '~core/store';
+import { getI18nString, getStrings } from '@generatedata/utils/lang';
+import * as selectors from '~store/generator/generator.selectors';
+import * as actions from '~store/generator/generator.actions';
+import { TourCompleteStep } from './Components.tour';
+import { TourProps } from '~types/general';
+import { DataTypeFolder, ExportTypeFolder } from '@generatedata/plugins';
+import clientConfig from '@generatedata/config/clientConfig';
+
+const Step1 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.introToGenerator}</h2>
+
+			<p>{i18n.introToGeneratorDesc}</p>
+		</>
+	);
+};
+
+const Step2 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.theGridPanel}</h2>
+
+			<p>{i18n.gridPanelTourDesc1}</p>
+			<p>{i18n.gridPanelTourDesc2}</p>
+		</>
+	);
+};
+
+const Step3 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.thePreviewPanel}</h2>
+			<p>{i18n.previewPanelDesc}</p>
+			<p>{i18n.previewPanelMoreInfo}</p>
+		</>
+	);
+};
+
+const Step4 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.theDataSetName}</h2>
+
+			<p>{i18n.dataSetNameDesc}</p>
+		</>
+	);
+};
+
+const Step5 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.panelControls}</h2>
+
+			<p>{i18n.panelControlsDesc}</p>
+
+			<p>{i18n.panelControlsClearIconDesc}</p>
+		</>
+	);
+};
+
+const Step6 = () => {
+	const { core: i18n } = getStrings();
+	const saveBtnDesc = getI18nString(i18n.saveButtonDesc, [clientConfig.appSettings.GD_MAX_DATASET_HISTORY_SIZE]);
+
+	return (
+		<>
+			<h2>{i18n.theSaveButton}</h2>
+
+			<p>{saveBtnDesc}</p>
+		</>
+	);
+};
+
+const Step7 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.theGenerateButton}</h2>
+
+			<p>{i18n.generateBtnDesc}</p>
+		</>
+	);
+};
+
+const commonStyles = {
+	borderRadius: 6,
+	margin: 12
+};
+
+const steps = [
+	{
+		content: Step1,
+		style: {
+			...commonStyles
+		},
+		position: 'center' as ReactourStepPosition,
+		action: (): void => {
+			const pluginsToLoad: any = {
+				JSON: false,
+				Names: false,
+				Phone: false,
+				Email: false,
+				StreetAddress: false,
+				City: false
+			};
+
+			store.dispatch(actions.clearPage(false));
+			store.dispatch(actions.addRows(5));
+
+			const state = store.getState();
+			const rows = selectors.getSortedRowsArray(state);
+			const ids = rows.map(({ id }) => id);
+
+			const onLoadComplete = (plugin: DataTypeFolder | ExportTypeFolder): void => {
+				pluginsToLoad[plugin] = true;
+
+				const allLoaded = Object.keys(pluginsToLoad).reduce((allLoaded, key) => allLoaded && pluginsToLoad[key], true);
+				if (allLoaded) {
+					store.dispatch(actions.refreshPreview(ids));
+				}
+			};
+
+			const shouldRefreshPreviewPanel = false;
+			store.dispatch(
+				actions.onSelectDataType('Names', {
+					gridRowId: ids[0],
+					shouldRefreshPreviewPanel,
+					onLoadComplete
+				})
+			);
+			store.dispatch(
+				actions.onSelectDataType('Phone', {
+					gridRowId: ids[1],
+					shouldRefreshPreviewPanel,
+					onLoadComplete
+				})
+			);
+			store.dispatch(
+				actions.onSelectDataType('Email', {
+					gridRowId: ids[2],
+					shouldRefreshPreviewPanel,
+					onLoadComplete
+				})
+			);
+			store.dispatch(
+				actions.onSelectDataType('StreetAddress', {
+					gridRowId: ids[3],
+					shouldRefreshPreviewPanel,
+					onLoadComplete
+				})
+			);
+			store.dispatch(
+				actions.onSelectDataType('City', {
+					gridRowId: ids[4],
+					shouldRefreshPreviewPanel,
+					onLoadComplete
+				})
+			);
+			store.dispatch(
+				actions.onSelectExportType('JSON', {
+					shouldRefreshPreviewPanel,
+					onLoadComplete
+				})
+			);
+
+			const layout = selectors.getGeneratorLayout(state);
+			if (layout === 'horizontal') {
+				store.dispatch(actions.toggleLayout());
+			}
+			if (!selectors.isGridVisible(state)) {
+				store.dispatch(actions.toggleGrid());
+			}
+			if (!selectors.isPreviewVisible(state)) {
+				store.dispatch(actions.togglePreview());
+			}
+		}
+	},
+	{
+		content: Step2,
+		selector: '.gdGridPanel>div:first-child',
+		style: {
+			...commonStyles
+		}
+	},
+	{
+		content: Step3,
+		selector: '.gdGridPanel>div:nth-child(3)',
+		style: {
+			...commonStyles,
+			marginLeft: -20
+		}
+	},
+	{
+		content: Step4,
+		selector: '.tour-dataSetName',
+		style: {
+			...commonStyles,
+			marginLeft: 10
+		}
+	},
+	{
+		content: Step5,
+		selector: '.tour-panelControls',
+		style: {
+			...commonStyles,
+			marginTop: -20
+		},
+		position: 'top' as ReactourStepPosition
+	},
+	{
+		content: Step6,
+		selector: '.tour-saveButton',
+		style: {
+			...commonStyles,
+			marginTop: -20
+		},
+		position: 'top' as ReactourStepPosition
+	},
+	{
+		content: Step7,
+		selector: '.tour-generateButton',
+		style: {
+			...commonStyles,
+			marginTop: -20
+		},
+		position: 'top' as ReactourStepPosition
+	},
+	{
+		content: TourCompleteStep,
+		style: {
+			...commonStyles
+		}
+	}
+];
+
+const Tour = ({ isOpen, onClose, maskClassName, closeWithMask, disableInteraction, accentColor, className }: TourProps) => (
+	<Reactour
+		steps={steps}
+		isOpen={isOpen}
+		onRequestClose={onClose}
+		maskClassName={maskClassName}
+		maskSpace={0}
+		closeWithMask={closeWithMask}
+		disableInteraction={disableInteraction}
+		accentColor={accentColor}
+		className={className}
+	/>
+);
+
+export default Tour;
diff --git a/apps/client/src/tours/PreviewPanel.tour.tsx b/apps/client/src/tours/PreviewPanel.tour.tsx
new file mode 100644
index 000000000..7b711ad29
--- /dev/null
+++ b/apps/client/src/tours/PreviewPanel.tour.tsx
@@ -0,0 +1,300 @@
+import React from 'react';
+import Reactour, { ReactourStepPosition } from 'reactour';
+import { getStrings } from '@generatedata/utils/lang';
+import store from '~core/store';
+import * as actions from '~store/generator/generator.actions';
+import * as selectors from '~store/generator/generator.selectors';
+import { TourCompleteStep } from './Components.tour';
+import { TourProps } from '~types/general';
+import { DataTypeFolder, ExportTypeFolder } from '@generatedata/plugins';
+
+const Step1 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.thePreviewPanel}</h2>
+			<p>{i18n.previewPanelTourDesc}</p>
+		</>
+	);
+};
+
+const Step2 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.panelContents}</h2>
+			<p>{i18n.panelContentsDesc}</p>
+		</>
+	);
+};
+
+const Step3 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.panelControls}</h2>
+			<p>{i18n.previewPanelControlsDesc}</p>
+		</>
+	);
+};
+
+const Step4 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.theExportTypeBtn}</h2>
+			<p>{i18n.exportTypeBtnDesc}</p>
+			<p>{i18n.clickExportTypeBtn}</p>
+		</>
+	);
+};
+
+const Step5 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.editingExportTypes}</h2>
+			<p>{i18n.editExportTypePage}</p>
+			<p>{i18n.editExportTypePageConfig}</p>
+		</>
+	);
+};
+
+const Step6 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.exportTypeSelection}</h2>
+			<p>{i18n.exportTypeSelectionDesc}</p>
+		</>
+	);
+};
+
+const Step7 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.exportTypeOptionsTs}</h2>
+			<p>{i18n.exportTypeOptionsTsDesc}</p>
+			<p>{i18n.exportTypeOptionsTsDesc2}</p>
+		</>
+	);
+};
+
+const Step8 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.exportTypeOptionsSql}</h2>
+			<p>{i18n.exportTypeOptionsSqlDesc}</p>
+		</>
+	);
+};
+
+const Step9 = () => {
+	const { core: i18n } = getStrings();
+
+	return (
+		<>
+			<h2>{i18n.panelTabs}</h2>
+			<p>{i18n.panelTabsDesc}</p>
+		</>
+	);
+};
+
+const commonStyles = {
+	borderRadius: 6,
+	margin: 12
+};
+
+const steps = [
+	{
+		content: Step1,
+		style: {
+			...commonStyles
+		},
+		position: 'center' as ReactourStepPosition,
+		action: (): void => {
+			setTimeout(() => {
+				store.dispatch(actions.clearPage(false));
+				store.dispatch(actions.addRows(5));
+
+				const state = store.getState();
+				const rows = selectors.getSortedRowsArray(state);
+
+				const layout = selectors.getGeneratorLayout(state);
+				if (layout === 'horizontal') {
+					store.dispatch(actions.toggleLayout());
+				}
+				if (!selectors.isGridVisible(state)) {
+					store.dispatch(actions.toggleGrid());
+				}
+				if (!selectors.isPreviewVisible(state)) {
+					store.dispatch(actions.togglePreview());
+				}
+
+				const ids = rows.map(({ id }) => id);
+
+				const pluginsToLoad: any = {
+					Typescript: false,
+					Country: false,
+					Region: false,
+					City: false,
+					StreetAddress: false,
+					PostalZip: false
+				};
+
+				const onLoadComplete = (plugin: DataTypeFolder | ExportTypeFolder): void => {
+					pluginsToLoad[plugin] = true;
+
+					const allLoaded = Object.keys(pluginsToLoad).reduce((allLoaded, key) => allLoaded && pluginsToLoad[key], true);
+					if (allLoaded) {
+						store.dispatch(actions.refreshPreview(ids));
+					}
+				};
+
+				const shouldRefreshPreviewPanel = false;
+				store.dispatch(
+					actions.onSelectDataType('Country', {
+						gridRowId: ids[0],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('Region', {
+						gridRowId: ids[1],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('City', {
+						gridRowId: ids[2],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('StreetAddress', {
+						gridRowId: ids[3],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(
+					actions.onSelectDataType('PostalZip', {
+						gridRowId: ids[4],
+						shouldRefreshPreviewPanel,
+						onLoadComplete
+					})
+				);
+				store.dispatch(actions.onSelectExportType('Typescript', { shouldRefreshPreviewPanel, onLoadComplete }));
+			}, 10);
+		}
+	},
+	{
+		content: Step2,
+		selector: '.gdGridPanel>div:nth-child(3)',
+		style: {
+			...commonStyles,
+			marginLeft: -20
+		}
+	},
+
+	{
+		content: Step3,
+		selector: '.tour-previewPanelControls',
+		style: {
+			...commonStyles
+		},
+		position: 'bottom' as ReactourStepPosition
+	},
+	{
+		content: Step4,
+		selector: '.tour-exportTypeBtn',
+		style: {
+			...commonStyles
+		},
+		position: 'bottom' as ReactourStepPosition
+	},
+	{
+		content: Step5,
+		style: {
+			...commonStyles
+		},
+		action: (): void => {
+			store.dispatch(actions.toggleExportSettings('previewPanel'));
+		}
+	},
+	{
+		content: Step6,
+		selector: '.tour-exportTypeDropdown>div',
+		style: {
+			...commonStyles,
+			marginLeft: 20
+		},
+		position: 'right' as ReactourStepPosition
+	},
+	{
+		content: Step7,
+		selector: '.tour-exportTypePanel',
+		style: {
+			...commonStyles,
+			marginLeft: 20
+		},
+		position: 'right' as ReactourStepPosition
+	},
+	{
+		content: Step8,
+		selector: '.tour-exportTypePanel',
+		style: {
+			...commonStyles,
+			marginLeft: 20
+		},
+		action: (): void => {
+			store.dispatch(actions.onSelectExportType('SQL'));
+		},
+		position: 'right' as ReactourStepPosition
+	},
+	{
+		content: Step9,
+		selector: '.tour-exportTypePanelTabs',
+		style: {
+			...commonStyles,
+			marginLeft: 20
+		},
+		position: 'left' as ReactourStepPosition
+	},
+	{
+		content: TourCompleteStep,
+		style: {
+			...commonStyles
+		}
+	}
+];
+
+const Tour = ({ isOpen, onClose, maskClassName, closeWithMask, disableInteraction, accentColor, className }: TourProps) => (
+	<Reactour
+		steps={steps}
+		isOpen={isOpen}
+		onRequestClose={onClose}
+		maskClassName={maskClassName}
+		maskSpace={0}
+		closeWithMask={closeWithMask}
+		disableInteraction={disableInteraction}
+		accentColor={accentColor}
+		className={className}
+		disableFocusLock={true}
+	/>
+);
+
+export default Tour;
diff --git a/apps/client/src/tours/Tours.scss b/apps/client/src/tours/Tours.scss
new file mode 100644
index 000000000..72bf70cd9
--- /dev/null
+++ b/apps/client/src/tours/Tours.scss
@@ -0,0 +1,3 @@
+.mask {
+	opacity: 0.5;
+}
diff --git a/apps/client/src/tours/Tours.scss.d.ts b/apps/client/src/tours/Tours.scss.d.ts
new file mode 100644
index 000000000..9d98151c4
--- /dev/null
+++ b/apps/client/src/tours/Tours.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace ToursScssNamespace {
+  export interface IToursScss {
+    mask: string;
+  }
+}
+
+declare const ToursScssModule: ToursScssNamespace.IToursScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: ToursScssNamespace.IToursScss;
+};
+
+export = ToursScssModule;
diff --git a/apps/client/src/tours/__tests__/Tours.test.tsx b/apps/client/src/tours/__tests__/Tours.test.tsx
new file mode 100644
index 000000000..ef9cf16cf
--- /dev/null
+++ b/apps/client/src/tours/__tests__/Tours.test.tsx
@@ -0,0 +1,89 @@
+import React from 'react';
+import sinon from 'sinon';
+import { render } from '@testing-library/react';
+import { TourCompleteStep } from '../Components.tour';
+import GridPanelTour from '../GridPanel.tour';
+import IntroToGenerator from '../IntroToGenerator.tour';
+import PreviewPanel from '../PreviewPanel.tour';
+import langUtils from '@generatedata/utils/lang';
+
+const i18n = require('../../i18n/en.json');
+
+describe('TourCompleteStep', () => {
+	afterEach(function () {
+		sinon.restore();
+	});
+
+	it('renders', () => {
+		sinon.stub(langUtils, 'getStrings').returns({
+			core: i18n,
+			dataTypes: {}
+		});
+
+		const { container } = render(<TourCompleteStep close={() => {}} />);
+
+		// there should be two buttons
+		expect(container.querySelectorAll('button').length).toEqual(2);
+	});
+});
+
+const tourProps = {
+	isOpen: true,
+	onClose: () => {},
+	maskClassName: 'test',
+	closeWithMask: true,
+	disableInteraction: true,
+	accentColor: '#444400',
+	className: 'classname'
+};
+
+describe('GriaPanel tour', () => {
+	afterEach(function () {
+		sinon.restore();
+	});
+
+	it('renders', () => {
+		sinon.stub(langUtils, 'getStrings').returns({
+			core: i18n,
+			dataTypes: {}
+		});
+
+		const { baseElement } = render(<GridPanelTour {...tourProps} />);
+
+		expect(baseElement.querySelector('svg')).toBeTruthy();
+	});
+});
+
+describe('IntroToGenerator tour', () => {
+	afterEach(function () {
+		sinon.restore();
+	});
+
+	it('renders', () => {
+		sinon.stub(langUtils, 'getStrings').returns({
+			core: i18n,
+			dataTypes: {}
+		});
+
+		const { baseElement } = render(<IntroToGenerator {...tourProps} />);
+
+		expect(baseElement.querySelector('svg')).toBeTruthy();
+	});
+});
+
+describe('PreviewPanel tour', () => {
+	afterEach(function () {
+		sinon.restore();
+	});
+
+	it('renders', () => {
+		sinon.stub(langUtils, 'getStrings').returns({
+			core: i18n,
+			dataTypes: {}
+		});
+
+		const { baseElement } = render(<PreviewPanel {...tourProps} />);
+
+		expect(baseElement.querySelector('svg')).toBeTruthy();
+	});
+});
diff --git a/apps/client/src/tours/index.tsx b/apps/client/src/tours/index.tsx
new file mode 100644
index 000000000..e77f9c912
--- /dev/null
+++ b/apps/client/src/tours/index.tsx
@@ -0,0 +1,17 @@
+import GridPanel from './GridPanel.tour';
+import IntroToGenerator from './IntroToGenerator.tour';
+import PreviewPanel from './PreviewPanel.tour';
+
+const tours = {
+	intro: {
+		component: IntroToGenerator
+	},
+	gridPanel: {
+		component: GridPanel
+	},
+	previewPanel: {
+		component: PreviewPanel
+	}
+};
+
+export default tours;
diff --git a/apps/client/src/utils/__tests__/routeUtils.test.ts b/apps/client/src/utils/__tests__/routeUtils.test.ts
new file mode 100644
index 000000000..f7a87cc41
--- /dev/null
+++ b/apps/client/src/utils/__tests__/routeUtils.test.ts
@@ -0,0 +1,41 @@
+import { getRoutes, removeLocale } from '../routeUtils';
+
+describe('getRoutes', () => {
+	it('returns all available routes by default with the generator page the last one with the root path', () => {
+		const defaultPaths = [
+			'/account',
+			'/accounts',
+			'/login',
+			'/datasets',
+			'/register',
+			'/'
+		];
+
+		const foundPaths = getRoutes().map(({ path }) => path);
+		expect(foundPaths).toEqual(defaultPaths);
+	});
+});
+
+describe('removeLocale', () => {
+	it('removes nothing for root', () => {
+		expect(removeLocale('/')).toEqual('/');
+		expect(removeLocale('')).toEqual('');
+	});
+
+	it('removes nothing for non-locale path', () => {
+		expect(removeLocale('/accounts')).toEqual('/accounts');
+		expect(removeLocale('/blah/de/blah')).toEqual('/blah/de/blah');
+	});
+
+	it('removes valid locales from root', () => {
+		expect(removeLocale('/de')).toEqual('');
+		expect(removeLocale('/en')).toEqual('');
+		expect(removeLocale('/zz')).toEqual('/zz');
+	});
+
+	it('removes valid locales from full path', () => {
+		expect(removeLocale('/de/accounts')).toEqual('/accounts');
+		expect(removeLocale('/ta/accounts/')).toEqual('/accounts/');
+		expect(removeLocale('/zz/accounts')).toEqual('/zz/accounts');
+	});
+});
diff --git a/apps/client/src/utils/coreUtils.ts b/apps/client/src/utils/coreUtils.ts
new file mode 100644
index 000000000..f947cfe41
--- /dev/null
+++ b/apps/client/src/utils/coreUtils.ts
@@ -0,0 +1,95 @@
+// @ts-ignore
+import { nanoid } from 'nanoid';
+import webWorkers from '../../_pluginWebWorkers';
+
+import { DataTypeFolder, ExportTypeFolder } from '@generatedata/plugins';
+// import env from '../../_env';
+
+import { version as rootPackageVersion } from '../../../../package.json'; // TODO see if the bundle includes the full package.json content
+
+import { DataTypeMap, ExportTypeMap, CountryNamesMap } from '@generatedata/plugins';
+
+export const getScriptVersion = (): string => rootPackageVersion;
+
+type WorkerMap = {
+	[workerId: string]: Worker;
+};
+
+const generationWorkers: WorkerMap = {};
+
+export const createGenerationWorker = (customId: string | null = null): string => {
+	const workerId = customId ? customId : nanoid();
+	generationWorkers[workerId] = new Worker(`./workers/${webWorkers.generationWorker}`);
+	return workerId;
+};
+
+export const getGenerationWorker = (id: string): Worker => generationWorkers[id];
+export const destroyGenerationWorker = (id: string): void => {
+	delete generationWorkers[id];
+};
+
+export const getDataTypeWorkerMap = (dataTypes: DataTypeFolder[]): DataTypeMap => {
+	const map: DataTypeMap = {};
+	const dataTypeMap: any = webWorkers.dataTypes;
+	dataTypes.forEach((dataType: DataTypeFolder) => {
+		map[dataType] = dataTypeMap[dataType];
+	});
+	return map;
+};
+
+export const getExportTypeWorkerMap = (exportTypes: ExportTypeMap): ExportTypeMap => {
+	const map: ExportTypeMap = {};
+	const dataTypeMap: any = webWorkers.exportTypes;
+	Object.keys(exportTypes).forEach((exportType) => {
+		map[exportType as ExportTypeFolder] = dataTypeMap[exportType];
+	});
+	return map;
+};
+
+export const getWorkerUtilsUrl = (): string => webWorkers.workerUtils;
+
+const messageIds: any = {};
+
+// wrapper method for the worker calls. This just adds a layer to abort any previous unfinished messages that are
+// sent to the worker. It's up to the worker to handle aborting it however it sees fit, but the important part is
+// that it doesn't post back any data from stale requests
+export const performTask = (workerName: string, worker: any, postMessagePayload: any, onMessage: any): void => {
+	if (!messageIds[workerName]) {
+		messageIds[workerName] = 1;
+	} else {
+		messageIds[workerName]++;
+	}
+
+	worker.postMessage({
+		...postMessagePayload,
+		_messageId: 1 // TODO
+	});
+
+	worker.onmessage = (data: any): void => {
+		onMessage(data);
+	};
+};
+
+export const easeInOutSine = (t: any, b: any, c: any, d: any): number => {
+	return (-c / 2) * (Math.cos((Math.PI * t) / d) - 1) + b;
+};
+
+let namesPlugins: any = null;
+export const getCountryNamesBundle = (): any => {
+	return new Promise((resolve, reject) => {
+		import(
+			/* webpackChunkName: "countryNames" */
+			/* webpackMode: "lazy" */
+			'@generatedata/plugins/dist/names'
+		)
+			.then((resp: any) => {
+				namesPlugins = resp.default;
+				resolve(resp.default);
+			})
+			.catch((e) => {
+				reject(e);
+			});
+	});
+};
+
+export const getCountryNames = (): CountryNamesMap | null => namesPlugins;
diff --git a/apps/client/src/utils/dataTypes.tsx b/apps/client/src/utils/dataTypes.tsx
new file mode 100644
index 000000000..6e126351c
--- /dev/null
+++ b/apps/client/src/utils/dataTypes.tsx
@@ -0,0 +1,231 @@
+import React from 'react';
+import { getLocale, getStrings } from '@generatedata/utils/lang';
+import { dataTypes, DataTypeFolder, blacklistedDataTypeFolders } from '@generatedata/plugins';
+import { DTBundle, DTCustomProps, DTHelpProps } from '~types/dataTypes';
+import { Store } from '~types/general';
+import C from '@generatedata/config/constants';
+
+type LoadedDataTypes = {
+	[name in DataTypeFolder]: DTBundle;
+};
+
+// this houses all Export Type code loaded async after the application starts
+const loadedDataTypes: Partial<LoadedDataTypes> = {};
+
+export const dataTypeNames = Object.keys(dataTypes);
+
+// used for the Data Type selection dropdown
+let lastLocale: any;
+let cachedSortedGroupedDataTypes: any;
+export const getSortedGroupedDataTypes = (): any => {
+	const locale = getLocale();
+	const i18n = getStrings();
+
+	if (cachedSortedGroupedDataTypes && lastLocale == locale) {
+		return cachedSortedGroupedDataTypes;
+	}
+
+	lastLocale = locale;
+	cachedSortedGroupedDataTypes = C.DATA_TYPE_GROUPS.map((group: string) => {
+		const options = Object.keys(dataTypes)
+			.filter((dataType) => dataTypes[dataType as DataTypeFolder].fieldGroup === group)
+			.filter((dataType) => blacklistedDataTypeFolders.indexOf(dataType) === -1)
+			.map((dataType) => ({
+				dataType,
+				sortOrder: dataTypes[dataType as DataTypeFolder].fieldGroupOrder
+			}));
+
+		options.sort((a: any, b: any) => {
+			if (a.sortOrder < b.sortOrder) {
+				return -1;
+			} else if (a.sortOrder > b.sortOrder) {
+				return 1;
+			}
+			return 0;
+		});
+
+		const sortedOptions = options.map(({ dataType }: { dataType: string }) => ({
+			value: dataType,
+			label: i18n.dataTypes[dataType].NAME
+		}));
+
+		return {
+			label: i18n.core[group],
+			options: sortedOptions
+		};
+	});
+
+	return cachedSortedGroupedDataTypes;
+};
+
+export const DefaultHelpComponent = ({ i18n }: DTHelpProps) => <p dangerouslySetInnerHTML={{ __html: i18n.DESC }} />;
+
+const showNothing = (): null => null;
+
+export const getDataType = (dataType: DataTypeFolder | null): any => {
+	// TODO return type is important here. Dense method!
+	if (!dataType || !loadedDataTypes[dataType]) {
+		return {
+			Example: !dataType ? showNothing : null,
+			Options: showNothing,
+			Help: null,
+			isLoaded: false
+		};
+	}
+
+	let Example = null;
+	let Options = null;
+	let Help;
+
+	if (loadedDataTypes[dataType]!.Example) {
+		Example = loadedDataTypes[dataType]!.Example;
+	}
+
+	if (loadedDataTypes[dataType]!.Options) {
+		Options = loadedDataTypes[dataType]!.Options;
+	}
+
+	if (dataType && loadedDataTypes[dataType]!.Help) {
+		Help = loadedDataTypes[dataType]!.Help;
+	} else {
+		Help = DefaultHelpComponent;
+	}
+
+	const customProps = dataType && loadedDataTypes[dataType]!.customProps ? loadedDataTypes[dataType]!.customProps : {};
+	const actionInterceptors = dataType && loadedDataTypes[dataType]!.actionInterceptors ? loadedDataTypes[dataType]!.actionInterceptors : {};
+
+	const { getMetadata, rowStateReducer } = loadedDataTypes[dataType] as DTBundle;
+	return {
+		isLoaded: true,
+		Options,
+		Help,
+		Example,
+		getMetadata,
+		rowStateReducer,
+		customProps,
+		actionInterceptors
+	};
+};
+
+export type ProcessBatches = {
+	[dt in DataTypeFolder]?: number;
+};
+
+export function RecursiveErrorException(remaining: string[]): void {
+	// @ts-ignore-line
+	this.possibleProblematicDataTypes = remaining;
+	// @ts-ignore-line
+	this.name = 'Recursive dependency';
+}
+
+/**
+ * Data Types can register dependencies on other Data Types (the `dependencies` property of their config.ts file) so
+ * that when the row data is generated, the script ensures the dependencies are generated first and available for use.
+ * For example:
+ *
+ * Country <- Region <- City
+ *
+ * Here, the City DT expects the Region DT to be generated first, so it can generate a random city within whatever
+ * random region was generated. Then the same goes for Region with Country.
+ *
+ * This method examines all the dependencies and creates a flat object of dataType => process batch. Any recursive
+ * dependencies throw an error.
+ */
+export const getProcessBatches = (dataTypes: any): ProcessBatches => {
+	let dataTypesToProcess = Object.keys(dataTypes);
+
+	const processBatches: ProcessBatches = {};
+	let previousLength = dataTypesToProcess.length;
+	let currentBatch = 1;
+
+	while (dataTypesToProcess.length > 0) {
+		const resolvedDataTypes: any = [];
+		dataTypesToProcess.forEach((dataType) => {
+			// here, we're dealing with Data Types that have dependencies. Loop through them all and figure out if all
+			// of them have already been assigned to a process batch
+			const allDependenciesPositioned =
+				!dataTypes[dataType].dependencies ||
+				dataTypes[dataType].dependencies.every((dependency: string) => !!processBatches[dependency as DataTypeFolder]);
+			if (allDependenciesPositioned) {
+				resolvedDataTypes.push(dataType);
+			}
+		});
+
+		if (resolvedDataTypes.length) {
+			resolvedDataTypes.forEach((dataType: string) => {
+				processBatches[dataType as DataTypeFolder] = currentBatch;
+			});
+			dataTypesToProcess = dataTypesToProcess.filter((dataType) => resolvedDataTypes.indexOf(dataType) === -1);
+			currentBatch++;
+		}
+
+		// simple check: every single pass of the DataTypes should be able to resolve at least one of them to a
+		// new batch number. If none got resolved we have a problem.
+		if (dataTypesToProcess.length === previousLength) {
+			// @ts-ignore-line
+			throw new RecursiveErrorException(dataTypesToProcess);
+		}
+
+		previousLength = dataTypesToProcess.length;
+	}
+
+	return processBatches;
+};
+
+export const processBatches = getProcessBatches(dataTypes);
+
+// returns a hash of { [data type] => [array of affected data types] }. This means that when the property Data Type
+// is changed, the Data Types in the key array could be affected
+export const getAffectedDataTypes = (dataTypes: any): any => {
+	const affectedDataTypes: any = {};
+
+	Object.keys(dataTypes).forEach((dataType) => {
+		if (!affectedDataTypes[dataType]) {
+			affectedDataTypes[dataType] = [];
+		}
+
+		if (dataTypes[dataType].dependencies) {
+			dataTypes[dataType].dependencies.forEach((dep: DataTypeFolder) => {
+				if (!affectedDataTypes[dep]) {
+					affectedDataTypes[dep] = [];
+				}
+				affectedDataTypes[dep].push(dataType);
+			});
+		}
+	});
+
+	return affectedDataTypes;
+};
+
+export const affectedDataTypes = getAffectedDataTypes(dataTypes);
+
+export const requestDataTypeBundle = (dataType: DataTypeFolder): any => {
+	return new Promise((resolve, reject) => {
+		import(
+			/* webpackChunkName: "DT-[request]" */
+			/* webpackMode: "lazy" */
+			`../plugins/dataTypes/${dataType}/bundle`
+		)
+			.then((definition: any) => {
+				loadedDataTypes[dataType] = definition.default;
+				resolve(definition.default);
+			})
+			.catch((e) => {
+				reject(e);
+			});
+	});
+};
+
+// TODO - this is causing a repaint on every method call, which is causing the most slowness in the UI. But using
+// noValue below doesn't help: when the DT selectors called here return different values, it doesn't get reflected in the UI
+// const noValue: any = {};
+export const getCustomProps = (customProps: DTCustomProps, state: Store): object => {
+	const values: any = {};
+	if (customProps) {
+		Object.keys(customProps).map((propName: string) => {
+			values[propName] = customProps[propName](state);
+		});
+	}
+
+	return values;
+};
diff --git a/apps/client/src/utils/exportTypes.tsx b/apps/client/src/utils/exportTypes.tsx
new file mode 100644
index 000000000..c19807359
--- /dev/null
+++ b/apps/client/src/utils/exportTypes.tsx
@@ -0,0 +1,155 @@
+import { exportTypes, ExportTypeFolder } from '@generatedata/plugins';
+import { ETBrowserBundle, ETDownloadPacketResponse, ETSettings } from '~types/exportTypes';
+import C from '@generatedata/config/constants';
+import { getLocale, getStrings } from '@generatedata/utils/lang';
+import * as React from 'react';
+
+export type LoadedExportTypes = {
+	[name in ExportTypeFolder]?: ETBrowserBundle;
+};
+
+// this houses all Export Type code loaded async after the application starts
+const loadedExportTypes: LoadedExportTypes = {};
+
+let cachedGroupedExportTypes: any;
+let lastLocale: any;
+
+export const getGroupedExportTypes = (): any => {
+	const locale = getLocale();
+	const i18n = getStrings();
+
+	if (cachedGroupedExportTypes && lastLocale == locale) {
+		return cachedGroupedExportTypes;
+	}
+
+	const groupI18nMap: any = {
+		core: 'coreExportType',
+		programmingLanguage: 'programmingLanguages'
+	};
+
+	lastLocale = locale;
+	cachedGroupedExportTypes = C.EXPORT_TYPE_GROUPS.map((group: string) => {
+		const options = Object.keys(exportTypes)
+			.filter((exportType) => exportTypes[exportType as ExportTypeFolder].fieldGroup === group)
+			.map((exportType) => ({
+				value: exportType,
+				label: i18n.exportTypes[exportType] ? i18n.exportTypes[exportType].EXPORT_TYPE_NAME : ''
+			}));
+
+		return {
+			label: i18n.core[groupI18nMap[group]],
+			options: options
+		};
+	});
+
+	return cachedGroupedExportTypes;
+};
+
+export const DefaultSettings = ({ coreI18n }: ETSettings) => <div>{coreI18n.noAdditionalSettings}</div>;
+
+// TODO error scenarios
+export const loadExportTypeBundle = (exportType: ExportTypeFolder): any => {
+	return new Promise((mainResolve) => {
+		const etBundle = new Promise((resolve, reject) => {
+			import(
+				/* webpackChunkName: "ET-[request]" */
+				/* webpackMode: "lazy" */
+				`../plugins/exportTypes/${exportType}/bundle`
+			)
+				.then((resp: any) => {
+					const def = resp.default;
+					loadedExportTypes[exportType] = {
+						Settings: def.Settings || DefaultSettings,
+						initialState: def.initialState,
+						getExportTypeLabel: def.getExportTypeLabel,
+						getDownloadFileInfo: def.getDownloadFileInfo,
+						getCodeMirrorMode: def.getCodeMirrorMode,
+						validateTitleField: def.validateTitleField,
+						isValid: def.isValid
+					};
+					resolve(def);
+				})
+				.catch((e) => {
+					reject(e);
+				});
+		});
+
+		const codeMirrorModes = exportTypes[exportType].codeMirrorModes.map((mode: string) => {
+			return new Promise((resolve) => {
+				const normalizedMode = mode.replace('/', '_');
+				const id = `mode-${normalizedMode}`;
+
+				// if the codemirror mode was already inserted, don't bother doing it again
+				if (document.getElementById(id)) {
+					// @ts-ignore-line
+					resolve();
+					return;
+				}
+
+				const modeFile = document.createElement('script');
+				modeFile.src = `./codeMirrorModes/${mode}.js`;
+				modeFile.id = id;
+				modeFile.onload = (): void => {
+					// @ts-ignore-line
+					resolve();
+				};
+				document.body.appendChild(modeFile);
+			});
+		});
+
+		Promise.all([...codeMirrorModes, etBundle]).then(() => {
+			mainResolve(etBundle);
+		});
+	});
+};
+
+// *** assumes the callee knows what they're doing & that they've checked the component has been loaded
+export const getExportTypeInitialState = (exportType: ExportTypeFolder): any => loadedExportTypes[exportType]!.initialState;
+
+// *** assumes the callee knows what they're doing & that they've checked the component has been loaded
+export const getExportTypeLabel = (exportType: ExportTypeFolder, settings: any): string | null => {
+	const et = loadedExportTypes[exportType] as ETBrowserBundle;
+	return et.getExportTypeLabel ? et.getExportTypeLabel(settings) : null;
+};
+
+export const getExportTypeSettingsComponent = (exportType: ExportTypeFolder): any => {
+	if (loadedExportTypes[exportType]) {
+		const et = loadedExportTypes[exportType] as ETBrowserBundle;
+		return et.Settings;
+	}
+	return null;
+};
+
+export const getExportTypeTitleValidationFunction = (exportType: ExportTypeFolder): any => {
+	if (loadedExportTypes[exportType]?.validateTitleField) {
+		const et = loadedExportTypes[exportType] as ETBrowserBundle;
+		return et.validateTitleField;
+	}
+	return null;
+};
+
+export const getCodeMirrorMode = (exportType: ExportTypeFolder, exportTypeSettings: any): string => {
+	// @ts-ignore-line
+	return loadedExportTypes[exportType].getCodeMirrorMode(exportTypeSettings);
+};
+
+export const getDownloadFileInfo = (packetId: string, exportType: ExportTypeFolder, exportTypeSettings: any): ETDownloadPacketResponse => {
+	// @ts-ignore-line
+	return loadedExportTypes[exportType].getDownloadFileInfo({
+		packetId,
+		settings: exportTypeSettings
+	});
+};
+
+export const isExportTypeValid = (exportType: ExportTypeFolder, exportTypeSettings: any): boolean => {
+	if (!loadedExportTypes || !loadedExportTypes[exportType]) {
+		return true;
+	}
+
+	const et = loadedExportTypes![exportType]!;
+	if (et.isValid) {
+		return et.isValid(exportTypeSettings);
+	}
+
+	return true;
+};
diff --git a/apps/client/src/utils/generatorUtils.ts b/apps/client/src/utils/generatorUtils.ts
new file mode 100644
index 000000000..05223a1cf
--- /dev/null
+++ b/apps/client/src/utils/generatorUtils.ts
@@ -0,0 +1,472 @@
+import { DataTypeBatchGeneratedPayload, DataTypeWorkerInterface, UnchangedGenerationData, WorkerInterface } from '~types/generator';
+import { DataTypeFolder, CountryNamesMap } from '@generatedata/plugins';
+import { CountryDataType } from '@generatedata/types';
+import { GenerationTemplate } from '../../types/general';
+import { WorkerUtils } from './workerUtils';
+/**
+ * This utility file contains the guts of the data generation code. It farms out work to the various plugins
+ * and orchestrates the many independent tasks to gather together and return the data. It's used by both:
+ *    1. the UI, called via web workers to run performantly in browsers in separate threads off the main UI thread
+ *    2. the node script for server-side data generation
+ */
+
+let isPaused = false;
+let lastMainProcessOptions: MainProcessOptionsBrowser | MainProcessOptionsNode | null = null;
+let currentSpeed: number; // TODO possible range?
+const workerQueue: any = {};
+
+export const generate = ({
+	i18n,
+	workerUtils,
+	countryNames,
+	countryData,
+	dataTypeInterface,
+	columns,
+	template,
+	exportTypeSettings,
+	onComplete,
+	exportTypeInterface,
+	generationSettings
+}: any) => {
+	const { numResults, packetSize, stripWhitespace } = generationSettings;
+
+	const onBatchComplete = ({ completedBatchNum, numGeneratedRows, generatedData }: any): void => {
+		const isLastBatch = numGeneratedRows >= numResults;
+		const displayData = generatedData.map((row: any) => row.map((i: any) => i.display));
+
+		generateExportTypes({
+			numResults,
+			isFirstBatch: completedBatchNum === 1,
+			isLastBatch,
+			currentBatch: completedBatchNum,
+			batchSize: packetSize as number,
+			rows: displayData,
+			columns,
+			stripWhitespace: stripWhitespace as boolean, // TODO we knows it's defined here
+			settings: exportTypeSettings,
+			workerUtils,
+			onComplete: (data: string) => onComplete(data, { isLastBatch, numGeneratedRows }),
+			exportTypeInterface
+		});
+	};
+
+	generateDataTypes({
+		numResults,
+		batchSize: packetSize as number,
+		i18n,
+		template,
+		countryNames,
+		countryData,
+		onBatchComplete,
+		workerUtils,
+		dataTypeInterface
+	});
+};
+
+interface OnBatchComplete {
+	(payload: DataTypeBatchGeneratedPayload): void;
+}
+
+type BaseGenerateDataTypesProps = {
+	numResults: number;
+	batchSize: number;
+	i18n: any;
+	countryNames: CountryNamesMap;
+	dataTypeInterface: DataTypeWorkerInterface;
+	template: GenerationTemplate; // bear in mind this has been grouped by process order. Check type.
+	onBatchComplete: OnBatchComplete;
+	countryData: CountryDataType;
+
+	// used by the UI only. This allows regeneration of a subset of the data and leaves unchanged rows intact
+	unchanged?: UnchangedGenerationData;
+};
+
+type GenerateDataTypesNodeProps = BaseGenerateDataTypesProps & {
+	workerUtils: WorkerUtils;
+};
+
+type GenerateDataTypesBrowserProps = BaseGenerateDataTypesProps & {
+	workerUtilsUrl: string;
+};
+
+export interface GenerateDataTypes {
+	(options: GenerateDataTypesNodeProps | GenerateDataTypesBrowserProps): void;
+}
+
+type MainProcessBaseOptions = {
+	numResults: number;
+	numBatches: number;
+	batchSize: number;
+	batchNum: number;
+	template: GenerationTemplate; // bear in mind this has been grouped by process order. Check type.
+	i18n: any;
+	countryNames: CountryNamesMap;
+	dataTypeInterface: DataTypeWorkerInterface;
+	onBatchComplete: OnBatchComplete;
+	countryData: CountryDataType;
+	unchanged: UnchangedGenerationData;
+};
+
+type MainProcessOptionsNode = MainProcessBaseOptions & {
+	workerUtilsUrl: string;
+};
+
+type MainProcessOptionsBrowser = MainProcessBaseOptions & {
+	workerUtils: WorkerUtils;
+};
+
+type GenerateExportTypesBaseProps = {
+	numResults: number;
+	exportTypeInterface: any; // TODO
+	onComplete: any; // TODO
+	isFirstBatch: boolean;
+	isLastBatch: boolean;
+	currentBatch: number;
+	batchSize: number;
+	rows: any; // TODO
+	columns: any; // TODO
+	settings: any; // TODO
+	stripWhitespace: boolean;
+};
+
+type GenerateExportTypesNodeProps = GenerateExportTypesBaseProps & {
+	workerUtils: WorkerUtils;
+};
+
+type GenerateExportTypesBrowserProps = GenerateExportTypesBaseProps & {
+	workerUtilsUrl: string;
+};
+
+export interface GenerateExportTypes {
+	(settings: GenerateExportTypesNodeProps | GenerateExportTypesBrowserProps): void;
+}
+
+export const generateDataTypes: GenerateDataTypes = (options): void => {
+	const { numResults, batchSize, ...otherOptions } = options;
+	const numBatches = Math.ceil(numResults / batchSize);
+
+	mainProcess({
+		numResults,
+		numBatches,
+		batchSize,
+		batchNum: 1,
+		unchanged: options.unchanged || {},
+		...otherOptions
+	});
+};
+
+export const generateExportTypes: GenerateExportTypes = (options): void => {
+	const { exportTypeInterface, onComplete, ...other } = options;
+
+	if (exportTypeInterface.context === 'node') {
+		onComplete(exportTypeInterface.send(other));
+	} else {
+		// pass off work to the Export Type worker
+		exportTypeInterface.send(other);
+
+		// listen for the response and post
+		exportTypeInterface.onSuccess((resp: MessageEvent): void => {
+			onComplete(resp.data);
+		});
+	}
+};
+
+const pauseGeneration = (): void => {
+	isPaused = true;
+};
+
+const continueGeneration = (): void => {
+	isPaused = false;
+	mainProcess(lastMainProcessOptions as MainProcessOptionsBrowser | MainProcessOptionsNode);
+};
+
+const setSpeed = (speed: number): void => {
+	currentSpeed = speed;
+};
+
+// our high-level API that this utility file offers
+export default {
+	generate,
+	generateDataTypes,
+	generateExportTypes,
+	pause: pauseGeneration,
+	continue: continueGeneration,
+	setSpeed
+};
+
+// -------------------------------------------------------------------------------------------------------------------
+// Internal methods
+
+const mainProcess = (mainProcessOptions: MainProcessOptionsBrowser | MainProcessOptionsNode): void => {
+	const { numResults, numBatches, batchSize, batchNum, ...other } = mainProcessOptions;
+	const { firstRow, lastRow } = getBatchInfo({ numResults, numBatches, batchSize, batchNum });
+	const lagTime = (100 - currentSpeed) * 50;
+
+	// if the generation has been paused, halt now and keep track of where we were at
+	if (isPaused) {
+		lastMainProcessOptions = mainProcessOptions;
+		return;
+	}
+
+	setTimeout(() => {
+		generateDataTypeBatch({ firstRow, lastRow, numResults, batchNum, ...other }).then(() => {
+			if (batchNum === numBatches) {
+				return;
+			}
+			mainProcess({
+				...mainProcessOptions,
+				batchNum: mainProcessOptions.batchNum + 1
+			});
+		});
+	}, lagTime);
+};
+
+type GetBatchInfoProps = {
+	numResults: number;
+	numBatches: number;
+	batchSize: number;
+	batchNum: number;
+};
+
+interface GetBatchInfo {
+	(options: GetBatchInfoProps): {
+		firstRow: number;
+		lastRow: number;
+	};
+}
+
+const getBatchInfo: GetBatchInfo = ({ numResults, numBatches, batchSize, batchNum }) => {
+	const firstRow = (batchNum - 1) * batchSize + 1;
+	let lastRow = batchNum * batchSize;
+
+	if (batchNum === numBatches) {
+		lastRow = numResults;
+	}
+
+	return {
+		firstRow,
+		lastRow
+	};
+};
+
+type GenerateDataTypeBaseBatchProps = {
+	numResults: number;
+	firstRow: number;
+	lastRow: number;
+	batchNum: number;
+	i18n: any;
+	template: GenerationTemplate;
+	unchanged: UnchangedGenerationData;
+	countryData: CountryDataType;
+	countryNames: CountryNamesMap;
+	dataTypeInterface: DataTypeWorkerInterface;
+	onBatchComplete: OnBatchComplete;
+};
+
+type GenerateDataTypeNodeBatchProps = GenerateDataTypeBaseBatchProps & {
+	workerUtils: WorkerUtils;
+};
+
+type GenerateDataTypeBrowserBatchProps = GenerateDataTypeBaseBatchProps & {
+	workerUtilsUrl: string;
+};
+
+// this resolve the promise for every batch of data generated
+const generateDataTypeBatch = (options: GenerateDataTypeBrowserBatchProps | GenerateDataTypeNodeBatchProps): Promise<any> =>
+	new Promise((resolve) => {
+		const { batchNum, numResults, firstRow, lastRow, onBatchComplete, ...other } = options;
+		const rowPromises: any = [];
+
+		// rows are independent! The only necessarily synchronous bit is between process batches. So here we just run
+		// them all in a loop
+		for (let rowNum = firstRow; rowNum <= lastRow; rowNum++) {
+			const currRowData: any[] = [];
+			rowPromises.push(
+				processDataTypeBatchGroup({
+					rowNum,
+					currRowData,
+					...other
+				})
+			);
+		}
+
+		Promise.all(rowPromises).then((generatedData: any) => {
+			onBatchComplete({
+				completedBatchNum: batchNum,
+				numGeneratedRows: lastRow,
+				numResults,
+				generatedData
+			});
+
+			// @ts-ignore-line
+			resolve();
+		});
+	});
+
+type ProcessDataTypeBatchGroupBaseProps = {
+	currRowData: any[]; // TODO
+	template: GenerationTemplate;
+	rowNum: number;
+	i18n: any;
+	unchanged: UnchangedGenerationData;
+	countryData: CountryDataType;
+	countryNames: CountryNamesMap;
+	dataTypeInterface: DataTypeWorkerInterface;
+};
+
+type ProcessDataTypeBatchGroupNode = ProcessDataTypeBatchGroupBaseProps & {
+	workerUtils: WorkerUtils;
+};
+
+type ProcessDataTypeBatchGroupBrowser = ProcessDataTypeBatchGroupBaseProps & {
+	workerUtilsUrl: string;
+};
+
+const processDataTypeBatchGroup = (options: ProcessDataTypeBatchGroupNode | ProcessDataTypeBatchGroupBrowser): any => {
+	const { template, currRowData } = options;
+
+	const processGroups = Object.keys(template);
+
+	return new Promise((resolveAll): any => {
+		let group = Promise.resolve();
+
+		// process each batch sequentially. This ensures the data generated from one processing batch is available to any
+		// dependent children. For example, the Region data type needs the Country data being generated first so it
+		// knows what country regions to generate if a mapping had been selected in the UI
+		processGroups.forEach((processBatchNumberStr, batchIndex) => {
+			const processBatchNum = parseInt(processBatchNumberStr, 10);
+			const currBatch = template[processBatchNum];
+
+			// yup. We're mutating the currRowData param on each loop. We don't care hhahaha!!! Up yours, linter!
+			group = group
+				.then(() => processDataTypeBatch({ cells: currBatch, ...options }))
+				.then((promises) => {
+					// this bit's sneaky. It ensures that the CURRENT batch within the row being generated is fully processed
+					// before starting the next. That way, the generated data from earlier batches is available to later
+					// Data Types for generating their own data
+					return new Promise((resolveBatch) => {
+						Promise.all(promises).then((singleBatchResponses: any) => {
+							for (let i = 0; i < singleBatchResponses.length; i++) {
+								currRowData.push({
+									id: currBatch[i].id,
+									colIndex: currBatch[i].colIndex,
+									dataType: currBatch[i].dataType,
+									data: singleBatchResponses[i]
+								});
+							}
+							resolveBatch();
+
+							if (batchIndex === processGroups.length - 1) {
+								currRowData.sort((a, b) => (a.colIndex < b.colIndex ? -1 : 1));
+								resolveAll(currRowData.map((row) => row.data));
+							}
+						});
+					});
+				});
+		});
+	});
+};
+
+type ProcessDataTypeBatchBaseProps = {
+	cells: any[]; // TODO
+	rowNum: number;
+	i18n: any;
+	currRowData: any;
+	unchanged: UnchangedGenerationData;
+	countryNames: CountryNamesMap;
+	dataTypeInterface: DataTypeWorkerInterface;
+	countryData: CountryDataType;
+};
+
+type ProcessDataTypeBatchNodeProps = ProcessDataTypeBatchBaseProps & {
+	workerUtils: WorkerUtils;
+};
+
+type ProcessDataTypeBatchBrowserProps = ProcessDataTypeBatchBaseProps & {
+	workerUtilsUrl: string;
+};
+
+const processDataTypeBatch = (options: ProcessDataTypeBatchNodeProps | ProcessDataTypeBatchBrowserProps): Promise<any>[] => {
+	const { cells, unchanged, rowNum, i18n, dataTypeInterface, currRowData, ...otherOptions } = options;
+
+	return cells.map((currCell: any) => {
+		const dataType = currCell.dataType;
+
+		return new Promise((resolve, reject) => {
+			if (unchanged[currCell.colIndex]) {
+				resolve(unchanged[currCell.colIndex][rowNum - 1]);
+			} else {
+				queueJob(
+					dataType,
+					dataTypeInterface[dataType],
+					{
+						rowNum: rowNum,
+						i18n: i18n.dataTypes[dataType],
+						countryI18n: i18n.countries,
+						rowState: currCell.rowState,
+						existingRowData: currRowData,
+						...otherOptions
+					},
+					resolve,
+					reject
+				);
+			}
+		});
+	});
+};
+
+const queueJob = (dataType: DataTypeFolder, workerInterface: WorkerInterface, payload: any, resolve: any, reject: any): void => {
+	if (!workerQueue[dataType]) {
+		workerQueue[dataType] = {
+			processing: false,
+			queue: []
+		};
+	}
+	workerQueue[dataType].queue.push({
+		payload,
+		resolve,
+		reject
+	});
+
+	processQueue(dataType, workerInterface);
+};
+
+const processQueue = (dataType: DataTypeFolder, workerInterface: WorkerInterface): void => {
+	if (workerQueue[dataType].processing) {
+		return;
+	}
+	const queue = workerQueue[dataType].queue;
+
+	if (!queue.length) {
+		return;
+	}
+
+	workerQueue[dataType].processing = true;
+	const { payload, resolve, reject } = queue[0];
+
+	if (workerInterface.context === 'node') {
+		const resp = workerInterface.send(payload);
+		resolve(resp);
+		processNextItem(dataType, workerInterface);
+	} else {
+		workerInterface.send(payload);
+
+		// @ts-ignore
+		workerInterface.onSuccess((resp: any): void => {
+			resolve(resp.data);
+			processNextItem(dataType, workerInterface);
+		});
+
+		// @ts-ignore
+		workerInterface.onError((resp: any): void => {
+			reject(resp);
+			processNextItem(dataType, workerInterface);
+		});
+	}
+};
+
+const processNextItem = (dataType: DataTypeFolder, workerInterface: WorkerInterface): void => {
+	workerQueue[dataType].queue.shift();
+	workerQueue[dataType].processing = false;
+	processQueue(dataType, workerInterface);
+};
diff --git a/apps/client/src/utils/routeUtils.ts b/apps/client/src/utils/routeUtils.ts
new file mode 100644
index 000000000..e2e2685a0
--- /dev/null
+++ b/apps/client/src/utils/routeUtils.ts
@@ -0,0 +1,166 @@
+import Generator from '~core/generator/Generator.container';
+import AccountPage from '~core/account/Account.container';
+import DataSetsPage from '~core/account/dataSets/DataSets.container';
+import LoginPage from '~core/auth/loginPage/LoginPage.container';
+import AccountsPage from '~core/accounts/Accounts.container';
+import { GDHeaderLink, GDLocale, GDRoute } from '~types/general';
+import { AccountType } from '~types/account';
+import { PAGE_CHANGE } from '~store/main/main.actions';
+import { trimChars } from '@generatedata/utils/string';
+import clientConfig from '@generatedata/config/clientConfig';
+import C from '@generatedata/config/constants';
+
+// TODO move this under `extensionUtils`
+let customRoutes: GDRoute[] = [];
+export const registerCustomRoutes = (routes: GDRoute[]): void => {
+	customRoutes = routes;
+};
+
+// called on boot-up. Returns the list of available react-router routes plus the components they should link to. This
+// allows external customization via the `registerCustomRoutes` method above
+export const getRoutes = (): GDRoute[] => {
+	let routes: GDRoute[] = [
+		{ path: '/account', component: AccountPage },
+		{ path: '/accounts', component: AccountsPage },
+		{ path: '/login', component: LoginPage },
+		{ path: '/datasets', component: DataSetsPage },
+		{ path: '/register', component: DataSetsPage }
+	];
+
+	// react-router is a bit fussy about the order of routes; the root one has to come last. Since that is configurable
+	// (prod root = a splash intro page; local is the generator) we have to do a little work here to get them in the
+	// right order
+	const nonRootRoutes = customRoutes.filter((route) => route.path !== '/');
+	if (nonRootRoutes.length) {
+		routes.concat(nonRootRoutes);
+	}
+
+	routes.push({ path: process.env.GD_GENERATOR_PATH || '/', component: Generator });
+	const rootRoutes = customRoutes.filter((route) => route.path === '/');
+
+	// lastly, add or overwrite any existing routes (e.g. register) with the custom routes
+	customRoutes.forEach(({ path, component }: GDRoute) => {
+		let found = false;
+		for (let i = 0; i < routes.length; i++) {
+			if (routes[i].path === path) {
+				routes[i].component = component;
+				found = true;
+			}
+		}
+		if (!found) {
+			routes.push({ path, component });
+		}
+	});
+
+	if (rootRoutes.length) {
+		routes = routes.concat(rootRoutes);
+	}
+
+	return routes;
+};
+
+export const getUnlocalizedGeneratorRoute = (): string => clientConfig.appSettings.GD_GENERATOR_PATH || '';
+
+export const getGeneratorPageRoute = (locale: GDLocale): string => {
+	let path = getUnlocalizedGeneratorRoute();
+	if (locale !== 'en') {
+		path = `/${locale}${path}`;
+	}
+
+	return path;
+};
+
+// helper method to return a boolean if the user is on the generator page, regardless of locale
+export const isGeneratorPage = (currentPage: string, locale: GDLocale) => {
+	const generatorRoute = getGeneratorPageRoute(locale);
+
+	// do a comparison that ignores trailing slashes. Issue #795
+	return trimChars(currentPage, '/') === trimChars(generatorRoute, '/');
+};
+
+export interface CustomHeaderLinkGetter {
+	(isLoggedIn: boolean, accountType: AccountType): GDHeaderLink[];
+}
+
+let customHeaderLinkGetter: CustomHeaderLinkGetter;
+
+// allows external code to override the header links
+export const registerCustomHeaderLinksGetter = (getter: CustomHeaderLinkGetter): void => {
+	customHeaderLinkGetter = getter;
+};
+
+export const getHeaderLinks = (isLoggedIn: boolean, accountType: AccountType): GDHeaderLink[] => {
+	const appType = clientConfig.appSettings.GD_APP_TYPE;
+
+	if (customHeaderLinkGetter) {
+		return customHeaderLinkGetter(isLoggedIn, accountType);
+	}
+
+	let links: GDHeaderLink[] = [];
+	switch (appType) {
+		// login - allows anonymous access but without logging in they can't save their data sets or generate more than
+		// GD_MAX_DEMO_MODE_ROWS at a time. Only the admin account can create new accounts
+		case C.APP_TYPES.LOGIN:
+			if (isLoggedIn) {
+				links = ['generator'];
+				if (accountType === 'admin' || accountType === 'superuser') {
+					links.push('accounts');
+				}
+				links = links.concat(['separator', 'userAccount', 'logout']);
+			} else {
+				links = ['generator', 'separator', 'loginDialog'];
+			}
+			break;
+
+		// single - there's only ever a single account and that user is logged in by default
+		case C.APP_TYPES.SINGLE:
+			links = ['generator', 'separator', 'userAccount'];
+			break;
+
+		// open - anyone that has access to the URL can use the application anonymously or create an account
+		case C.APP_TYPES.OPEN:
+			if (isLoggedIn) {
+				links = ['generator', 'separator', 'userAccount', 'logout'];
+			} else {
+				links = ['generator', 'register', 'separator', 'loginDialog', 'logout'];
+			}
+			break;
+
+		// closed - no-one can access the script without logging in first
+		case C.APP_TYPES.CLOSED:
+			if (isLoggedIn) {
+				links = ['generator', 'separator', 'userAccount', 'logout'];
+			} else {
+				links = ['loginPage'];
+			}
+			break;
+	}
+
+	return links;
+};
+
+export const updateBodyClass = (store: any, pathname: string): void => {
+	let pageId = pathname.replace(/\//g, '');
+
+	const rootLocale = clientConfig.appSettings.GD_LOCALES.indexOf(pageId as GDLocale);
+	if (pageId === '' || rootLocale !== -1) {
+		pageId = process.env.GD_GENERATOR_PATH === '/generator' ? 'home' : 'generator';
+	}
+
+	// bit aggressive, but we're not appending any other body classes right now so this is fine. Also, this'll now
+	// include sub-pages since we're removing all the slashes
+	document.body.className = `page-${pageId}`;
+
+	store.dispatch({
+		type: PAGE_CHANGE,
+		payload: {
+			page: location.pathname
+		}
+	});
+};
+
+export const removeLocale = (path: string): string => {
+	const regexStr = `^/?(${clientConfig.appSettings.GD_LOCALES.join('|')})`;
+	const regex = new RegExp(regexStr);
+	return path.replace(regex, '');
+};
diff --git a/apps/client/src/utils/workerUtils.ts b/apps/client/src/utils/workerUtils.ts
new file mode 100644
index 000000000..041d23f9f
--- /dev/null
+++ b/apps/client/src/utils/workerUtils.ts
@@ -0,0 +1,32 @@
+/**
+ * This file contains the subset of utility methods made available to the data generation code. It defines a WorkerUtils
+ * type which is used by both the node + web worker code.
+ *
+ * Web Workers are fussy. To share these utility methods, the core script generates a worker file which is loaded
+ * via importScripts() within any plugin worker and the methods are loaded as a global in the worker scope.
+ */
+import arrayUtils from '@generatedata/utils/array';
+import countryUtils from '@generatedata/utils/country';
+import generalUtils from '@generatedata/utils/general';
+import randomUtils from '@generatedata/utils/random';
+import stringUtils from '@generatedata/utils/string';
+import numberUtils from '@generatedata/utils/number';
+
+export type WorkerUtils = {
+	arrayUtils: typeof arrayUtils;
+	countryUtils: typeof countryUtils;
+	generalUtils: typeof generalUtils;
+	randomUtils: typeof randomUtils;
+	stringUtils: typeof stringUtils;
+	numberUtils: typeof numberUtils;
+};
+
+// all utility methods are exposed to web worker generation files on the global scope under `utils`
+const utils = {
+	arrayUtils: { ...arrayUtils },
+	countryUtils: { ...countryUtils },
+	generalUtils: { ...generalUtils },
+	randomUtils: { ...randomUtils },
+	stringUtils: { ...stringUtils },
+	numberUtils: { ...numberUtils }
+};
diff --git a/apps/client/tests/jestSetup.ts b/apps/client/tests/jestSetup.ts
new file mode 100644
index 000000000..77d3e343d
--- /dev/null
+++ b/apps/client/tests/jestSetup.ts
@@ -0,0 +1,14 @@
+// @ts-ignore-line
+global.MutationObserver = class {
+	constructor() {}
+	disconnect() {}
+	observe() {}
+};
+
+let count = 1;
+jest.mock('nanoid', () => ({
+	nanoid: () => `p${count++}`
+}));
+jest.mock('@react-hook/throttle', () => ({
+	useThrottleCallback: jest.fn()
+}));
diff --git a/apps/client/tests/testHelpers.tsx b/apps/client/tests/testHelpers.tsx
new file mode 100644
index 000000000..f2b5ae9cf
--- /dev/null
+++ b/apps/client/tests/testHelpers.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { combineReducers } from 'redux';
+import { configureStore } from '@reduxjs/toolkit';
+import { Router } from 'react-router-dom';
+import { ApolloProvider } from '@apollo/client/react';
+import { apolloClient } from '~core/apolloClient';
+import { render } from '@testing-library/react';
+import { createMemoryHistory } from 'history';
+import { getInitialState } from '~store/generator/generator.reducer';
+import { initialState as initialMainState } from '~store/main/main.reducer';
+import { initialState as initialPacketState } from '~store/packets/packets.reducer';
+import { initialState as initialAccountState } from '~store/account/account.reducer';
+import langUtils from '@generatedata/utils/lang';
+import { setLocaleFileLoaded } from '~store/main/main.actions';
+import generatorReducer from '~store/generator/generator.reducer';
+import mainReducer from '~store/main/main.reducer';
+import packetsReducer from '~store/packets/packets.reducer';
+import accountReducer from '~store/account/account.reducer';
+import actionsInterceptor from '~core/actionInterceptor';
+import { GeneratorLayout } from '@generatedata/types';
+import { ETSettings } from '~types/exportTypes';
+
+import i18n from '../src/i18n/en.json';
+import jsonI18n from '@generatedata/plugins/dist/exportTypes/JSON/i18n/en.json';
+
+export const rootReducer = combineReducers({
+	generator: generatorReducer,
+	main: mainReducer,
+	packets: packetsReducer,
+	account: accountReducer
+});
+
+export const renderWithStoreAndRouter = (component: any) => {
+	const initialState = getTestState();
+	const store = configureStore({
+		reducer: rootReducer,
+		preloadedState: initialState
+		// compose(applyMiddleware(thunk, actionsInterceptor
+	});
+	const route = '/';
+	const history = createMemoryHistory({ initialEntries: [route] });
+
+	langUtils.setLocale('en', {
+		core: i18n,
+		dataTypes: {},
+		exportTypes: {
+			JSON: jsonI18n
+		},
+		countries: {}
+	});
+	store.dispatch(setLocaleFileLoaded('en'));
+
+	return {
+		...render(
+			<ApolloProvider client={apolloClient}>
+				<Provider store={store}>
+					<Router history={history}>{component}</Router>
+				</Provider>
+			</ApolloProvider>
+		),
+		history
+	};
+};
+
+export const getTestState = () => ({
+	generator: getInitialState(),
+	main: { ...initialMainState },
+	packets: { ...initialPacketState },
+	account: { ...initialAccountState }
+});
+
+// requires the DT test to supply i18n and rowState (if pertinent)
+export const getBlankDTGeneratorPayload = () => ({
+	rowNum: 1,
+	rowState: null,
+	countryI18n: {},
+	existingRowData: [],
+	countryData: {},
+	workerUtilsUrl: ''
+});
+
+export const defaultETSettings: ETSettings = {
+	onUpdate: () => {},
+	data: null,
+	coreI18n: {},
+	i18n: {},
+	id: 'id',
+	layout: 'horizontal' as GeneratorLayout
+};
diff --git a/apps/client/tsconfig.json b/apps/client/tsconfig.json
new file mode 100644
index 000000000..de86e669b
--- /dev/null
+++ b/apps/client/tsconfig.json
@@ -0,0 +1,29 @@
+{
+	"compilerOptions": {
+		"lib": ["es6", "dom", "esnext", "webworker"],
+		"outDir": "./dist/",
+		"sourceMap": true,
+		"esModuleInterop": true,
+		"noImplicitAny": true,
+		"noImplicitThis": true,
+		"strict": true,
+		"strictNullChecks": true,
+		"moduleResolution": "nodenext",
+		"resolveJsonModule": true,
+		"skipLibCheck": true,
+		"module": "nodenext",
+		"target": "es6",
+		"jsx": "react-jsx",
+		"allowSyntheticDefaultImports": true,
+		"removeComments": false,
+		"baseUrl": "./",
+		"paths": {
+			"~components/*": ["src/components/*"],
+			"~utils/*": ["src/utils/*"],
+			"~store/*": ["src/core/store/*"],
+			"~core/*": ["src/core/*"],
+			"~types/*": ["types/*"]
+		}
+	},
+	"exclude": ["node_modules"]
+}
diff --git a/apps/client/types/account.d.ts b/apps/client/types/account.d.ts
new file mode 100644
index 000000000..5c887a018
--- /dev/null
+++ b/apps/client/types/account.d.ts
@@ -0,0 +1,20 @@
+export type AccountType = 'superuser' | 'admin' | 'user';
+export const enum SelectedAccountTab {
+	dataSets = 'dataSets',
+	dataSetHistory = 'dataSetHistory',
+	yourAccount = 'yourAccount',
+	changePassword = 'changePassword',
+	other = 'other' // mysterious!
+}
+
+export const enum SelectedAccountsTab {
+	accounts = 'accounts',
+	createAccount = 'createAccount',
+	editAccount = 'editAccount'
+}
+
+export const enum AccountStatus {
+	live = 'live',
+	disabled = 'disabled',
+	expired = 'expired'
+}
diff --git a/apps/client/types/dataTypes.d.ts b/apps/client/types/dataTypes.d.ts
new file mode 100644
index 000000000..eb8d19638
--- /dev/null
+++ b/apps/client/types/dataTypes.d.ts
@@ -0,0 +1,127 @@
+// TODO rename to dataTypePlugins.ts
+import { DatabaseTypes } from '@generatedata/types';
+import { AnyObject, GenerationTemplate } from './general.d';
+import { CountryNamesMap, CountryType, DataTypeFolder } from '@generatedata/plugins';
+
+export type DTBundle = {
+	initialState?: any;
+
+	// optional <Example /> React component to show something in the UI for the "Example" column
+	Example?: any;
+
+	// optional <Options /> React component. This shows up in the Options column in the UI
+	Options?: any;
+
+	// optional <Help /> React component
+	Help?: any;
+
+	rowStateReducer?: (state: any) => any;
+	getMetadata?: (data: any) => DTMetadata;
+	customProps?: DTCustomProps;
+	actionInterceptors?: DTActionInterceptors;
+};
+
+export type DTActionInterceptors = {
+	[action: string]: DTActionInterceptor;
+};
+
+export interface DTActionInterceptor {
+	// TODO. generics? rowState and the `any` response here is the state type of the Data Type
+	(rowId: string, rowState: any, actionPayload: any): any | null;
+}
+
+export type DTInterceptorSingleAction = {
+	dataType: DataTypeFolder;
+	interceptor: DTActionInterceptor;
+};
+
+export type Dimensions = {
+	width: number;
+	height: number;
+};
+
+export type DTOptionsMetadata = {
+	useCountryNames?: boolean;
+};
+
+// Data Type <Options /> props
+export type DTOptionsProps = {
+	data: any;
+	id: string;
+	gridPanelDimensions: Dimensions;
+	onUpdate: (data: AnyObject, metadata?: DTOptionsMetadata) => void;
+	isCountryNamesLoading: boolean;
+	isCountryNamesLoaded: boolean;
+	countryNamesMap: CountryNamesMap | null;
+	coreI18n: any;
+	countryI18n: any;
+	i18n: any;
+	throttle?: boolean; // added for testing so we can disable the default throttle behaviour
+
+	// for custom props. See DTCustomProps
+	[propName: string]: any;
+};
+
+// Data Type <Example /> props
+export type DTExampleProps = {
+	data: any;
+	id: string;
+	gridPanelDimensions: Dimensions;
+	onUpdate: (data: AnyObject) => void;
+	coreI18n: any;
+	countryI18n: any;
+	i18n: any;
+};
+
+// Data Type <Help /> props
+export type DTHelpProps = {
+	coreI18n: any;
+	countryI18n: any;
+	i18n: any;
+};
+
+export type DTGenerationData = {
+	rowNum: number;
+	rowState: any;
+	i18n: any;
+	countryI18n: any;
+	existingRowData: DTGenerationExistingRowData[];
+	countryData: {
+		[key in CountryType]?: any;
+	};
+	template: GenerationTemplate;
+};
+
+export type DTWorkerGenerationData = DTGenerationData & {
+	workerUtilsUrl: string; // this is the URL of the workerUtils worker file
+};
+
+interface DTWorkerOnMessage extends MessageEvent {
+	data: DTWorkerGenerationData;
+}
+
+export type DTGenerationExistingRowData = {
+	id: string;
+	colIndex: number; // bit confusing, but this is the index of the ROW in the UI.
+	dataType: DataTypeFolder;
+
+	// this contains the actual generated data from the data type
+	data: DTGenerateResult;
+};
+
+export type DTGenerateResult = {
+	display: string | number | boolean;
+	[key: string]: any;
+};
+
+export type DTCustomProps = {
+	// weird, but setting these to undefined prevents the Data Type from overriding the core prop names accidentally
+	coreI18n?: undefined;
+	countryI18n?: undefined;
+	i18n?: undefined;
+	data?: undefined;
+	id?: undefined;
+	gridPanelDimensions?: undefined;
+	onUpdate?: undefined;
+	[propName: string]: any;
+};
diff --git a/apps/client/types/exportTypes.d.ts b/apps/client/types/exportTypes.d.ts
new file mode 100644
index 000000000..c835e51d3
--- /dev/null
+++ b/apps/client/types/exportTypes.d.ts
@@ -0,0 +1,50 @@
+import { GeneratorLayout } from '@generatedata/types/generator';
+
+export interface ETValidateTitleField {
+	(title: string, i18n: any, settings?: any): string | null;
+}
+
+export type ETBundle = {
+	getCodeMirrorMode: (settings: any) => string; // TODO generics - data is same type as initialState
+	getDownloadFileInfo: (downloadPacket: ETDownloadPacket) => ETDownloadPacketResponse;
+	initialState?: any; // TODO generics
+	Settings?: any;
+	getExportTypeLabel?: (data: any) => string; // TODO generics - data is same type as initialState
+	validateTitleField?: ETValidateTitleField;
+	isValid?: (data: any) => boolean;
+};
+
+export type ETBrowserBundle = Omit<ETBundle, 'generate'>;
+
+// oddity, but this is used to let the main application know when the Export Type is in an invalid state. This prevents
+// it from attempting to generate anything until it's resolved
+// TODO rename. Maybe ETRequiredState / ETCoreState?
+export interface ETState {
+	isValid: boolean;
+}
+
+export type ETFieldGroup = 'core' | 'programmingLanguage';
+
+export type ETDefinition = {
+	fieldGroup: ETFieldGroup;
+	codeMirrorModes: string[];
+};
+
+export type ETSettings = {
+	onUpdate: Function; // from container
+	data: any; // from store
+	id: string;
+	layout: GeneratorLayout;
+	i18n: any;
+	coreI18n: any;
+};
+
+export type ETDownloadPacket = {
+	packetId: string;
+	settings: any;
+};
+
+export type ETDownloadPacketResponse = {
+	filename: string;
+	fileType: string;
+};
diff --git a/apps/client/types/general.d.ts b/apps/client/types/general.d.ts
new file mode 100644
index 000000000..da87e9b9d
--- /dev/null
+++ b/apps/client/types/general.d.ts
@@ -0,0 +1,117 @@
+import { GeneratorState } from '~store/generator/generator.reducer';
+import { MainState } from '~store/main/main.reducer';
+import { PacketsState } from '~store/packets/packets.reducer';
+import { AccountState } from '~store/account/account.reducer';
+import { DataTypeFolder } from '@generatedata/plugins';
+import { availableLocales } from '../_env';
+import { DTMetadata } from '~types/dataTypes';
+
+declare global {
+	interface Window {
+		gd: any;
+		CodeMirror: any;
+		__REDUX_DEVTOOLS_EXTENSION_COMPOSE__: any;
+		clipboardData: any;
+		google: any;
+	}
+}
+
+export type Store = {
+	generator: GeneratorState;
+	main: MainState;
+	packets: PacketsState;
+	account: AccountState;
+};
+
+export const enum AuthMethod {
+	default = 'default',
+	google = 'google'
+}
+
+export type GDLocale = (typeof availableLocales)[number];
+
+export type GDLocaleMap = {
+	[locale in GDLocale]: string;
+};
+
+// these have special semantic meaning within the script. When the navigation includes them, things like the label
+// and action are preset within the core script
+export type GDPresetHeaderLinks =
+	| 'generator'
+	| 'register'
+	| 'separator'
+	| 'dataSets'
+	| 'userAccount'
+	| 'loginDialog'
+	| 'accounts'
+	| 'loginPage'
+	| 'logout';
+
+// this is for custom header links
+export type GDCustomHeaderLink = {
+	path: string;
+	labelI18nKey: string; // yup. This currently has to be baked into the applications main i18n files.
+};
+
+export type GDHeaderLink = GDPresetHeaderLinks | GDCustomHeaderLink;
+
+export type GDRoute = {
+	path: string;
+	component: any;
+};
+
+export type GDAction = {
+	type: string;
+	payload?: any;
+	triggeredByInterceptor?: boolean;
+};
+
+export type TourProps = {
+	isOpen: boolean;
+	onClose: () => void;
+	maskClassName: string;
+	closeWithMask: boolean;
+	disableInteraction: boolean;
+	accentColor: string;
+	className: string;
+};
+
+export const enum GenerationActivityPanel {
+	small = 'small',
+	large = 'large'
+}
+
+export const enum GeneratorPanel {
+	grid = 'grid',
+	preview = 'preview'
+}
+
+export const enum LoadTimeGraphDuration {
+	all = 'all',
+	s15 = '15seconds',
+	s30 = '30seconds',
+	m1 = '1minute'
+}
+
+export const enum AccountStatusFilter {
+	all = 'all',
+	live = 'live',
+	expired = 'expired',
+	disabled = 'disabled'
+}
+
+export type AnyObject = {
+	[key: string]: any;
+};
+
+export type GenerationTemplateRow = {
+	id: string;
+	title: string;
+	dataType: DataTypeFolder;
+	rowState: any;
+	colIndex: number;
+};
+
+export type GenerationTemplate = {
+	[processOrder: number]: GenerationTemplateRow[];
+};
diff --git a/apps/client/types/generator.d.ts b/apps/client/types/generator.d.ts
new file mode 100644
index 000000000..2ec7655d7
--- /dev/null
+++ b/apps/client/types/generator.d.ts
@@ -0,0 +1,60 @@
+import { DataType, DataTemplateRow, ExportType, ExportTypeConfig } from '@generatedata/plugins';
+import { GDLocale } from '~types/general';
+import { DTGenerateResult, DTGenerationData } from './dataTypes';
+
+export { CountryNameFiles } from '../_namePlugins';
+export { DataType, DataTemplateRow, ExportType, ExportTypeConfig };
+
+/**
+ * Also the main public interface.
+ *
+ * Settings custom to the particular generation action. This is used in combination with DataSetConfig.
+ */
+export type GenerationSettings = {
+	numResults: number;
+	locale?: GDLocale;
+	stripWhitespace?: boolean;
+	target?: 'file' | 'return';
+
+	// the default behaviour for the ppm package is for the generate method to return the generated data. This option
+	// lets users generate a file instead. It's far better for larger data sets
+	filename?: string; // the filename to generate including relative path
+	packetSize?: number; // TODO needed?
+};
+
+/**
+ * This is the public type for what users supply to the generation method.
+ *
+ * It types the structure of an entire data set for being generated: the rows of Data Types with their unique
+ * options and whatever Export Type and settings have been chosen. This is the data structure generated by the
+ * UI after constructing whatever the user wants.
+ */
+export type GDTemplate = {
+	generationSettings: GenerationSettings;
+	dataTemplate: DataTemplateRow[];
+	exportSettings: ExportTypeConfig;
+};
+
+// Bad name but can't think of a better one. This is the interface required for the Data Type and Export Type
+// code for performing a unit of generation. It's a consistent interface used by both web workers and node code
+export type WorkerInterface = {
+	context: 'worker' | 'node';
+	send: (data: DTGenerationData) => void | DTGenerateResult;
+	onSuccess?: (data: any) => void;
+	onError?: (data: any) => void;
+};
+
+export type UnchangedGenerationData = {
+	[colIndex: number]: string; // colIndex => row ID (unique GUID)
+};
+
+export type DataTypeWorkerInterface = {
+	[dataType: string]: WorkerInterface;
+};
+
+export type DataTypeBatchGeneratedPayload = {
+	completedBatchNum: number;
+	numGeneratedRows: number;
+	numResults: number;
+	generatedData: any;
+};
diff --git a/apps/client/webpack.config.js b/apps/client/webpack.config.js
new file mode 100644
index 000000000..b4d84e28b
--- /dev/null
+++ b/apps/client/webpack.config.js
@@ -0,0 +1,128 @@
+const webpack = require('webpack');
+const path = require('path');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
+const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
+const Dotenv = require('dotenv-webpack');
+const ESLintPlugin = require('eslint-webpack-plugin');
+// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+
+// const envPath = path.resolve(__dirname, '../../.env');
+// require('dotenv').config({ path: envPath });
+
+module.exports = (env, argv) => {
+	const mode = argv.mode === 'production' ? 'production' : 'development'; // TODO not working with package.json commands
+
+	var config = {
+		mode,
+
+		entry: {
+			app: path.resolve(__dirname, 'src/index.tsx')
+		},
+
+		output: {
+			path: path.join(__dirname, 'dist'),
+			publicPath: '/',
+			chunkFilename: mode === 'development' ? '[name].js' : '[name]-[hash].js',
+			filename: mode === 'development' ? '[name].js' : '[name]-[hash].js'
+		},
+
+		module: {
+			rules: [
+				{
+					test: /\.tsx?$/,
+					use: [{ loader: 'ts-loader' }]
+					// exclude: [
+					// 	path.resolve(__dirname, '../cli')
+					// ]
+				},
+				{
+					test: /\.js$/,
+					use: [
+						{
+							loader: 'babel-loader'
+						}
+					],
+					exclude: '/node_modules'
+				},
+				{
+					test: /\.scss$/,
+					use: [
+						'style-loader',
+						{
+							loader: '@teamsupercell/typings-for-css-modules-loader'
+						},
+						{
+							loader: 'css-loader',
+							options: {
+								modules: {
+									localIdentName: '[name]__[local]--[hash:base64:3]'
+								},
+								url: false
+							}
+						},
+						{
+							loader: 'sass-loader',
+							options: {}
+						}
+					]
+				},
+				{
+					test: /\.css$/,
+					use: ['style-loader', 'css-loader']
+				}
+			]
+		},
+
+		plugins: [
+			new ESLintPlugin({
+				extensions: ['js', 'ts']
+			}),
+			new CaseSensitivePathsPlugin(),
+			new HtmlWebpackPlugin({
+				template: path.join(__dirname, 'src/index.html')
+			})
+			// new Dotenv({ path: envPath })
+		],
+
+		resolve: {
+			extensions: ['.ts', '.tsx', '.js'],
+			alias: {
+				'~components': path.join(__dirname, 'src/components'),
+				'~utils': path.join(__dirname, 'src/utils'),
+				'~store': path.join(__dirname, 'src/core/store'),
+				'~core': path.join(__dirname, 'src/core'),
+				'~types': path.join(__dirname, 'types')
+			}
+		},
+
+		optimization: {
+			splitChunks: {
+				chunks: 'all'
+			}
+		},
+
+		devtool: mode === 'development' ? 'source-map' : false
+	};
+
+	if (mode === 'development') {
+		config.devServer = {
+			historyApiFallback: true,
+			static: path.join(__dirname, 'dist'),
+			// publicPath: 'http://localhost:9000',
+			port: process.env.GD_WEB_SERVER_PORT,
+			open: true
+		};
+
+		// just uncomment this & the include above to auto-generate the bundle analyzer treemap. It'll show up when
+		// running `npm run start`
+		// config.plugins.push(new BundleAnalyzerPlugin());
+	}
+
+	if (mode === 'production') {
+		config.optimization.minimizer = [new TerserPlugin()];
+		config.optimization.minimize = true;
+	}
+
+	return config;
+};
diff --git a/apps/server/.gitignore b/apps/server/.gitignore
new file mode 100644
index 000000000..5208a41c9
--- /dev/null
+++ b/apps/server/.gitignore
@@ -0,0 +1,3 @@
+database/_dbStructure.sql
+.turbo
+node_modules/*
\ No newline at end of file
diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile
new file mode 100644
index 000000000..0e1d4562d
--- /dev/null
+++ b/apps/server/Dockerfile
@@ -0,0 +1,18 @@
+FROM --platform=linux/amd64 node:20 AS alpine
+
+ENV HOME=/home/app/generatedata
+
+WORKDIR $HOME
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml $HOME/
+COPY ./apps/server $HOME/apps/server/
+COPY ./apps/server/package.json $HOME/apps/server
+RUN npm install -g pnpm@9
+RUN npm install -g grunt-cli
+RUN cd $HOME && pnpm install --fetch-timeout 1000000 
+RUN cd $HOME/apps/server && ls -al
+# COPY ./apps/server/node_modules $HOME/apps/server/node_modules
+
+RUN npm uninstall bcrypt
+RUN npm install bcrypt
+
+CMD ["npm", "run", "startNodeDevServer"]
diff --git a/apps/server/app.js b/apps/server/app.js
new file mode 100644
index 000000000..3ed74b80c
--- /dev/null
+++ b/apps/server/app.js
@@ -0,0 +1,52 @@
+const { ApolloServer } = require('apollo-server-express');
+const express = require('express');
+const typeDefs = require('./graphql/schema');
+const resolvers = require('./graphql/resolvers');
+const cookieParser = require('cookie-parser');
+const authUtils = require('./utils/authUtils');
+const path = require('path');
+
+require('dotenv').config({ path: path.resolve(__dirname, '../../.env') });
+
+const app = express();
+
+const protocol = process.env.GD_WEB_USE_HTTPS === 'true' ? 'https' : 'http';
+
+// see: https://github.com/expressjs/cors#configuration-options
+const corsOptions = {
+  origin: `${protocol}://${process.env.GD_WEB_DOMAIN}:${process.env.GD_WEB_SERVER_PORT}`,
+  credentials: true
+};
+
+app.use(cookieParser());
+
+const server = new ApolloServer({
+  typeDefs,
+  resolvers,
+  context: ({ req, res }) => {
+    // the token is the "live" token with a short expiry time, passed along with every request in a header while
+    // the user is logged in
+    const token = (req.headers.authorization || '').replace('Bearer ', '');
+
+    // try to retrieve a user with the token
+    const user = authUtils.getUser(token);
+
+    // provides the auth token to all resolvers, plus access to the original request + response objects for
+    // more fine-tune stuff
+    return {
+      res,
+      req,
+      token,
+      user
+    };
+  }
+});
+
+server.applyMiddleware({
+  app,
+  cors: corsOptions
+});
+
+app.listen(process.env.GD_API_SERVER_PORT, () => {
+  console.log('Server started on port ' + process.env.GD_API_SERVER_PORT);
+});
diff --git a/apps/server/database/dbStructure.template.sql b/apps/server/database/dbStructure.template.sql
new file mode 100644
index 000000000..afedc9d9f
--- /dev/null
+++ b/apps/server/database/dbStructure.template.sql
@@ -0,0 +1,73 @@
+# noinspection SqlNoDataSourceInspectionForFile
+
+CREATE DATABASE IF NOT EXISTS generatedata;
+
+CREATE USER 'gduser'@'%' IDENTIFIED BY 'gdpassword';
+GRANT CREATE, ALTER, INDEX, LOCK TABLES, REFERENCES, UPDATE, DELETE, DROP, SELECT, INSERT ON `generatedata`.* TO 'gduser'@'%';
+
+FLUSH PRIVILEGES;
+
+DROP TABLE IF EXISTS `datasets`;
+CREATE TABLE `datasets` (
+  `dataset_id` mediumint(9) NOT NULL,
+  `dataset_name` varchar(255) NOT NULL DEFAULT '',
+  `status` enum('public','private') NOT NULL,
+  `date_created` datetime NOT NULL,
+  `account_id` mediumint(9) NOT NULL,
+  `num_rows_generated` mediumint(9) DEFAULT '0'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `datasets` ADD PRIMARY KEY (`dataset_id`);
+ALTER TABLE `datasets` MODIFY `dataset_id` mediumint(9) NOT NULL AUTO_INCREMENT;
+
+
+DROP TABLE IF EXISTS `dataset_history`;
+CREATE TABLE `dataset_history` (
+  `history_id` mediumint(9) NOT NULL,
+  `dataset_id` mediumint(9) NOT NULL,
+  `date_created` datetime NOT NULL,
+  `content` text NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `dataset_history` ADD PRIMARY KEY (`history_id`);
+ALTER TABLE `dataset_history` MODIFY `history_id` mediumint(9) NOT NULL AUTO_INCREMENT;
+
+
+DROP TABLE IF EXISTS `settings`;
+CREATE TABLE `settings` (
+  `setting_name` varchar(100) NOT NULL,
+  `setting_value` text NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `settings` ADD UNIQUE KEY `setting_name` (`setting_name`);
+
+
+DROP TABLE IF EXISTS `accounts`;
+CREATE TABLE `accounts` (
+  `account_id` mediumint(8) UNSIGNED NOT NULL,
+  `created_by` mediumint(8) UNSIGNED NULL,
+  `date_created` datetime NOT NULL,
+  `last_updated` datetime NOT NULL,
+  `last_logged_in` datetime DEFAULT NULL,
+  `date_expires` datetime DEFAULT NULL,
+  `refresh_token` varchar(200) DEFAULT NULL,
+  `account_type` enum('superuser', 'admin', 'user') NOT NULL,
+  `account_status` enum('live','disabled', 'expired') NOT NULL,
+  `first_name` varchar(255) DEFAULT NULL,
+  `last_name` varchar(255) DEFAULT NULL,
+  `email` varchar(255) NOT NULL,
+  `password` varchar(100) NOT NULL,
+  `one_time_password` varchar(100) NULL,
+  `country` varchar(255) NOT NULL,
+  `region` varchar(255) NOT NULL,
+  `max_records` mediumint(9) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `accounts` ADD PRIMARY KEY (`account_id`);
+ALTER TABLE `accounts` MODIFY `account_id` mediumint(8) UNSIGNED NOT NULL AUTO_INCREMENT;
+
+/* the admin account info is populated from the values in your .env file the first time it boots up */
+INSERT INTO `accounts` (account_id, date_created, last_updated, account_type, account_status, first_name, last_name,
+  email, password, country, region)
+VALUES (1, '%DATE_CREATED%', '%LAST_UPDATED%', 'superuser', 'live', '%FIRST_NAME%', '%LAST_NAME%',
+  '%EMAIL%', '%PASSWORD%', '', '')
diff --git a/apps/server/database/index.js b/apps/server/database/index.js
new file mode 100644
index 000000000..b69cbfea9
--- /dev/null
+++ b/apps/server/database/index.js
@@ -0,0 +1,39 @@
+const Sequelize = require('sequelize');
+const accounts = require('./tables/accounts');
+const dataSets = require('./tables/dataSets');
+const dataSetHistory = require('./tables/dataSetHistory');
+const settings = require('./tables/settings');
+const path = require('path');
+
+require('dotenv').config({ path: path.resolve(__dirname, '../../../.env') });
+
+const sequelize = new Sequelize(process.env.GD_DB_NAME, process.env.GD_MYSQL_ROOT_USER, process.env.GD_MYSQL_ROOT_PASSWORD, {
+  host: 'db',
+  port: process.env.GD_DB_PORT,
+  dialect: 'mysql',
+  define: {
+    freezeTableName: true
+  },
+  pool: {
+    max: 5,
+    min: 0,
+    acquire: 30000,
+    idle: 10000
+  }
+});
+
+const db = {};
+[accounts, dataSets, dataSetHistory, settings].forEach((model) => {
+  const seqModel = model(sequelize, Sequelize);
+  db[seqModel.name] = seqModel;
+});
+
+// define our associations
+db.dataSets.hasMany(db.dataSetHistory, { foreignKey: 'dataSetId' });
+db.dataSetHistory.belongsTo(db.dataSets);
+
+// TODO urgh...
+db.sequelize = sequelize;
+db.Sequelize = Sequelize;
+
+module.exports = db;
diff --git a/apps/server/database/tables/accounts.js b/apps/server/database/tables/accounts.js
new file mode 100644
index 000000000..133dd3365
--- /dev/null
+++ b/apps/server/database/tables/accounts.js
@@ -0,0 +1,84 @@
+module.exports = (sequelize, DataTypes) => {
+	return sequelize.define(
+		'accounts',
+		{
+			accountId: {
+				type: DataTypes.INTEGER(8).UNSIGNED,
+				allowNull: false,
+				primaryKey: true,
+				autoIncrement: true,
+				field: 'account_id'
+			},
+			createdBy: {
+				type: DataTypes.INTEGER(8).UNSIGNED,
+				field: 'created_by'
+			},
+			dateCreated: {
+				type: DataTypes.DATE,
+				allowNull: false,
+				field: 'date_created'
+			},
+			lastUpdated: {
+				type: DataTypes.DATE,
+				allowNull: false,
+				field: 'last_updated'
+			},
+			lastLoggedIn: {
+				type: DataTypes.DATE,
+				field: 'last_logged_in'
+			},
+			expiryDate: {
+				type: DataTypes.DATE,
+				field: 'date_expires'
+			},
+			refreshToken: {
+				type: DataTypes.STRING(200),
+				field: 'refresh_token'
+			},
+			accountType: {
+				type: DataTypes.ENUM('admin', 'user'),
+				allowNull: false,
+				field: 'account_type'
+			},
+			accountStatus: {
+				type: DataTypes.ENUM('live', 'disabled', 'expired'),
+				allowNull: false,
+				field: 'account_status'
+			},
+			firstName: {
+				type: DataTypes.STRING(255),
+				field: 'first_name'
+			},
+			lastName: {
+				type: DataTypes.STRING(255),
+				field: 'last_name'
+			},
+			email: {
+				type: DataTypes.STRING(255),
+				allowNull: false
+			},
+			password: {
+				type: DataTypes.STRING(255),
+				allowNull: false
+			},
+			oneTimePassword: {
+				type: DataTypes.STRING(255),
+				field: 'one_time_password'
+			},
+			country: {
+				type: DataTypes.STRING(255)
+			},
+			region: {
+				type: DataTypes.STRING(255)
+			},
+			maxRecords: {
+				type: DataTypes.INTEGER(9).UNSIGNED,
+				field: 'max_records'
+			}
+		},
+		{
+			tableName: 'accounts',
+			timestamps: false
+		}
+	);
+};
diff --git a/apps/server/database/tables/dataSetHistory.js b/apps/server/database/tables/dataSetHistory.js
new file mode 100644
index 000000000..c394cd29b
--- /dev/null
+++ b/apps/server/database/tables/dataSetHistory.js
@@ -0,0 +1,28 @@
+module.exports = (sequelize, DataTypes) => {
+	return sequelize.define('dataSetHistory', {
+		historyId: {
+			type: DataTypes.INTEGER(9),
+			allowNull: false,
+			primaryKey: true,
+			autoIncrement: true,
+			field: 'history_id'
+		},
+		dataSetId: {
+			type: DataTypes.INTEGER(9),
+			allowNull: false,
+			field: 'dataset_id'
+		},
+		dateCreated: {
+			type: DataTypes.DATE,
+			allowNull: false,
+			field: 'date_created'
+		},
+		content: {
+			type: DataTypes.TEXT,
+			allowNull: false
+		}
+	}, {
+		tableName: 'dataset_history',
+		timestamps: false
+	});
+};
diff --git a/apps/server/database/tables/dataSets.js b/apps/server/database/tables/dataSets.js
new file mode 100644
index 000000000..ba9ea2f2b
--- /dev/null
+++ b/apps/server/database/tables/dataSets.js
@@ -0,0 +1,38 @@
+module.exports = (sequelize, DataTypes) => {
+	return sequelize.define('dataSets', {
+		dataSetId: {
+			type: DataTypes.INTEGER(9),
+			allowNull: false,
+			primaryKey: true,
+			autoIncrement: true,
+			field: 'dataset_id'
+		},
+		dataSetName: {
+			type: DataTypes.STRING(255),
+			field: 'dataset_name',
+			allowNull: false
+		},
+		status: {
+			type: DataTypes.ENUM('public', 'private'),
+			allowNull: false
+		},
+		dateCreated: {
+			type: DataTypes.DATE,
+			allowNull: false,
+			field: 'date_created'
+		},
+		accountId: {
+			type: DataTypes.INTEGER(9),
+			allowNull: false,
+			field: 'account_id'
+		},
+		numRowsGenerated: {
+			type: DataTypes.INTEGER(9),
+			field: 'num_rows_generated',
+			allowNull: false
+		}
+	}, {
+		tableName: 'datasets',
+		timestamps: false
+	});
+};
diff --git a/apps/server/database/tables/settings.js b/apps/server/database/tables/settings.js
new file mode 100644
index 000000000..2bd1d3ecc
--- /dev/null
+++ b/apps/server/database/tables/settings.js
@@ -0,0 +1,15 @@
+module.exports = (sequelize, DataTypes) => {
+	return sequelize.define('settings', {
+		settingName: {
+			type: DataTypes.STRING,
+			field: 'setting_name'
+		},
+		settingValue: {
+			type: DataTypes.STRING,
+			field: 'setting_value'
+		}
+	}, {
+		tableName: 'settings',
+		timestamps: false
+	});
+};
diff --git a/apps/server/emails/accountExpired.js b/apps/server/emails/accountExpired.js
new file mode 100644
index 000000000..d5efb4168
--- /dev/null
+++ b/apps/server/emails/accountExpired.js
@@ -0,0 +1,58 @@
+const emailUtils = require('../utils/emailUtils');
+const generalUtils = require('../utils/generalUtils');
+const langUtils = require('../utils/langUtils');
+
+/**
+ * Used when a user tries to reset their password but their account has already expired.
+ */
+const passwordResetAccountExpired = ({ firstName, i18n }) => {
+	const emailIntroLineWithName = langUtils.getI18nString(i18n.emailIntroLineWithName, [firstName]);
+	const adminEmail = emailUtils.getAdminEmail();
+	const siteUrl = generalUtils.getSiteUrl();
+
+	const text = `${emailIntroLineWithName}
+
+${i18n.passwordResetAccountExpiredDesc}
+
+${i18n.ifWantToReregister} 
+${siteUrl}
+
+${i18n.emailFooterDisclaimer}
+
+- ${i18n.administrator}
+${adminEmail}
+	`;
+
+	const html = `<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8">
+</head>
+<body>
+<p>${emailIntroLineWithName}</p>
+<p>${i18n.passwordResetAccountExpiredDesc}</p>
+<p>
+	${i18n.ifWantToReregister}<br />
+	<a href="${siteUrl}">${siteUrl}</a>
+</p>
+
+<p>${i18n.emailFooterDisclaimer}</p>
+
+<p>
+	<i>- ${i18n.administrator}</i><br />
+	<a href="mailto:${adminEmail}">${adminEmail}</a>
+</p>
+</body>
+</html>`;
+
+	return {
+		subject: i18n.passwordResetAccountExpired,
+		text,
+		html
+	};
+};
+
+
+module.exports = {
+	passwordResetAccountExpired
+};
diff --git a/apps/server/emails/index.js b/apps/server/emails/index.js
new file mode 100644
index 000000000..e828af674
--- /dev/null
+++ b/apps/server/emails/index.js
@@ -0,0 +1,7 @@
+const { passwordReset } = require('./passwordReset');
+const { passwordResetAccountExpired } = require('./accountExpired');
+
+module.exports = {
+	passwordReset,
+	passwordResetAccountExpired
+};
diff --git a/apps/server/emails/passwordReset.js b/apps/server/emails/passwordReset.js
new file mode 100644
index 000000000..b7a58e47c
--- /dev/null
+++ b/apps/server/emails/passwordReset.js
@@ -0,0 +1,68 @@
+const emailUtils = require('../utils/emailUtils');
+const generalUtils = require('../utils/generalUtils');
+const langUtils = require('../utils/langUtils');
+
+
+const passwordReset = ({ firstName, email, tempPassword, i18n }) => {
+	const emailIntroLineWithName = langUtils.getI18nString(i18n.emailIntroLineWithName, [firstName]);
+	const adminEmail = emailUtils.getAdminEmail();
+	const siteUrl = generalUtils.getSiteUrl();
+
+	const text = `${emailIntroLineWithName}
+
+${i18n.passwordResetEmailDesc} 
+
+${i18n.emailLabel} ${email}
+${i18n.passwordLabel} ${tempPassword}
+${i18n.loginUrlLabel} ${siteUrl}
+
+${i18n.emailFooterDisclaimer}
+
+- ${i18n.administrator}
+${adminEmail}
+	`;
+
+	const html = `<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8">
+</head>
+<body>
+<p>${emailIntroLineWithName}</p>
+<p>${i18n.passwordResetEmailDesc}</p>
+
+<table>
+<tr>
+	<td width="140"><b>${i18n.emailLabel}</b></td>
+	<td>${email}</td>
+</tr>
+<tr>
+	<td><b>${i18n.passwordLabel}</b></td>
+	<td>${tempPassword}</td>
+</tr>
+<tr>
+	<td><b>${i18n.loginUrlLabel}</b></td>
+	<td><a href="${siteUrl}">${siteUrl}</a></td>
+</tr>
+</table>
+</p>
+
+<p>${i18n.emailFooterDisclaimer}</p>
+
+<p>
+	<i>- ${i18n.administrator}</i><br />
+	<a href="mailto:${adminEmail}">${adminEmail}</a>
+</p>
+</body>
+</html>`;
+
+	return {
+		subject: i18n.passwordReset,
+		text,
+		html
+	};
+};
+
+module.exports = {
+	passwordReset
+};
diff --git a/apps/server/graphql/resolvers.js b/apps/server/graphql/resolvers.js
new file mode 100644
index 000000000..15526da77
--- /dev/null
+++ b/apps/server/graphql/resolvers.js
@@ -0,0 +1,269 @@
+const db = require('../database');
+const authUtils = require('../utils/authUtils');
+const authResolvers = require('./resolvers/auth');
+const accountResolvers = require('./resolvers/account');
+const dataSetResolvers = require('./resolvers/dataSets');
+
+const resolvers = {
+	Query: {
+		accounts: async (root, args, { token, user }) => {
+			authUtils.authenticate(token);
+
+			const userRecord = await db.accounts.findByPk(user.accountId);
+			if (userRecord.dataValues.accountType !== 'superuser') {
+				return {
+					success: false,
+					errorStatus: 'PermissionDenied'
+				};
+			}
+
+			const { limit, offset, sortCol, sortDir, filterStr, status } = args;
+			const { accountId } = user;
+
+			const sortColMap = {
+				lastName: 'last_name',
+				firstName: 'first_name',
+				accountStatus: 'account_status',
+				expiryDate: 'date_expires',
+				lastLoggedIn: 'last_logged_in'
+			};
+
+			let filterClause = '';
+			if (filterStr) {
+				const fields = ['first_name', 'last_name', 'email'];
+				const cleanFilter = filterStr
+					.replace(/[^a-zA-Z'\s\.@]/g, '')
+					.replace(/'/, '\\\'');
+				const clauses = fields.map(
+					(field) => `${field} LIKE '%${cleanFilter}%'`
+				);
+				filterClause = `AND (${clauses.join(' OR ')})`;
+			}
+
+			let statusClause = '';
+			if (status !== 'all') {
+				const cleanStatus = status.replace(/[^a-zA-Z'\s]/g, '');
+				statusClause = `AND account_status = '${cleanStatus}'`;
+			}
+
+			const [results] = await db.sequelize.query(`
+				SELECT *
+				FROM accounts
+				WHERE created_by = ${accountId} ${filterClause} ${statusClause}
+				ORDER BY ${sortColMap[sortCol]} ${sortDir}
+				LIMIT ${limit}
+				OFFSET ${offset} 
+			`);
+
+			const [totalCountQuery] = await db.sequelize.query(
+				`
+				SELECT count(*) as c
+				FROM accounts
+				WHERE created_by = ${accountId} ${filterClause} ${statusClause}
+			`,
+				{ raw: true, type: db.sequelize.QueryTypes.SELECT }
+			);
+
+			const updatedResults = results.map(async (row) => {
+				const accountId = row.account_id;
+
+				// not great, but info is needed. May be a better idea to denormalize the DB and store this on the
+				// account row
+				const numRowsGenerated =
+					await authResolvers.getAccountNumRowsGenerated(accountId);
+				let accountStatus = row.account_status;
+
+				// update any accounts that have an expiry date set and are now expired
+				if (
+					row.date_expires &&
+					row.account_status !== 'expired' &&
+					row.account_status !== 'disabled'
+				) {
+					const accountExpired = authUtils.accountExpired(
+						new Date(row.date_expires)
+					);
+					if (accountExpired) {
+						await db.sequelize.query(
+							`
+							UPDATE accounts
+							SET account_status = 'expired'
+							WHERE account_id = ${accountId}
+						`,
+							{ raw: true, type: db.sequelize.QueryTypes.UPDATE }
+						);
+
+						accountStatus = 'expired';
+					}
+				}
+
+				return {
+					accountId,
+					dateCreated: row.date_created,
+					lastUpdated: row.last_updated,
+					lastLoggedIn: row.last_logged_in,
+					expiryDate: row.date_expires,
+					accountType: row.account_type,
+					accountStatus,
+					firstName: row.first_name,
+					lastName: row.last_name,
+					email: row.email,
+					country: row.country,
+					region: row.region,
+					numRowsGenerated
+				};
+			});
+
+			return {
+				totalCount: totalCountQuery.c,
+				results: updatedResults
+			};
+		},
+
+		// retrieves any account info
+		account: async (root, args, { user, token }) => {
+			authUtils.authenticate(token);
+
+			const userRecord = await db.accounts.findByPk(user.accountId);
+			if (userRecord.dataValues.accountType !== 'superuser') {
+				return {
+					success: false,
+					errorStatus: 'PermissionDenied'
+				};
+			}
+
+			return db.accounts.findByPk(user.accountId);
+		},
+
+		// returns current user's data sets
+		dataSets: async (root, args, { token, user }) => {
+			const { limit, offset, sortDir, sortCol } = args;
+
+			authUtils.authenticate(token);
+
+			const sortColMap = {
+				dataSetName: 'd.dataset_name',
+				lastUpdated: 'dsh.date_created',
+				numRowsGenerated: 'numRowsGenerated'
+			};
+
+			const { accountId } = user;
+			const [results] = await db.sequelize.query(`
+				SELECT d.dataset_name,
+				    d.dataset_id AS dataSetId,
+				    d.num_rows_generated as numRowsGenerated,
+				    dsh.*,
+					unix_timestamp(d.date_created) AS dateCreatedUnix,
+					unix_timestamp(dsh.date_created) AS historyDateCreatedUnix
+				FROM datasets d
+				LEFT JOIN dataset_history dsh ON dsh.dataset_id = d.dataset_id
+					AND dsh.history_id =
+						(SELECT history_id
+						 FROM dataset_history dsh2
+						 WHERE dsh2.dataset_id = d.dataset_id
+						 ORDER BY history_id DESC
+						 LIMIT 1)
+				WHERE account_id = ${accountId}
+				ORDER BY ${sortColMap[sortCol]} ${sortDir}
+				LIMIT ${limit}
+				OFFSET ${offset}
+			`);
+
+			const [totalCountQuery] = await db.sequelize.query(
+				`
+				SELECT count(*) as c
+				FROM datasets
+				WHERE account_id = ${accountId} 
+			`,
+				{ raw: true, type: db.sequelize.QueryTypes.SELECT }
+			);
+
+			return {
+				totalCount: totalCountQuery.c,
+				results: results.map((row) => ({
+					dataSetId: row.dataSetId,
+					status: row.status,
+					numRowsGenerated: row.numRowsGenerated,
+					historyId: row.history_id,
+					dataSetName: row.dataset_name,
+					content: row.content,
+					dataCreatedUnix: row.dateCreatedUnix,
+					historyDateCreatedUnix: row.historyDateCreatedUnix
+				}))
+			};
+		},
+
+		dataSetHistory: async (root, args, { token, user }) => {
+			const { dataSetId, limit, offset } = args;
+
+			authUtils.authenticate(token);
+
+			// confirm dataSetId belongs to current user
+			const exists = await db.dataSets.findOne({
+				where: {
+					accountId: user.accountId,
+					dataSetId
+				}
+			});
+
+			if (exists === null) {
+				return {
+					success: false,
+					errorStatus: 'PermissionDenied'
+				};
+			}
+
+			const [results] = await db.sequelize.query(`
+				SELECT *
+				FROM dataset_history dh
+				WHERE dataset_id = ${dataSetId}
+				ORDER BY history_id DESC
+				LIMIT ${limit}
+				OFFSET ${offset}
+			`);
+
+			const [totalCountQuery] = await db.sequelize.query(
+				`
+				SELECT count(*) as c
+				FROM dataset_history
+				WHERE dataset_id = ${dataSetId} 
+			`,
+				{ raw: true, type: db.sequelize.QueryTypes.SELECT }
+			);
+
+			return {
+				totalCount: totalCountQuery.c,
+				results: results.map((row) => ({
+					dataSetId: row.dataset_id,
+					historyId: row.history_id,
+					content: row.content,
+					dateCreated: row.date_created
+				}))
+			};
+		}
+	},
+
+	Mutation: {
+		// authentication resolvers
+		login: authResolvers.login,
+		loginWithGoogle: authResolvers.loginWithGoogle,
+		sendPasswordResetEmail: authResolvers.sendPasswordResetEmail,
+		refreshToken: authResolvers.checkAndUpdateRefreshToken,
+		logout: authResolvers.logout,
+
+		// account-related resolvers
+		updateAccount: accountResolvers.updateAccount,
+		updateCurrentAccount: accountResolvers.updateCurrentAccount,
+		updatePassword: accountResolvers.updatePassword,
+		createUserAccount: accountResolvers.createUserAccount,
+		deleteAccount: accountResolvers.deleteAccount,
+
+		// data-sets
+		saveNewDataSet: dataSetResolvers.saveNewDataSet,
+		renameDataSet: dataSetResolvers.renameDataSet,
+		saveDataSet: dataSetResolvers.saveDataSet,
+		deleteDataSet: dataSetResolvers.deleteDataSet,
+		updateDataSetGenerationCount: dataSetResolvers.updateDataSetGenerationCount
+	}
+};
+
+module.exports = resolvers;
diff --git a/apps/server/graphql/resolvers/account.js b/apps/server/graphql/resolvers/account.js
new file mode 100644
index 000000000..d1600d1b6
--- /dev/null
+++ b/apps/server/graphql/resolvers/account.js
@@ -0,0 +1,182 @@
+const dateFns = require('date-fns');
+const db = require('../../database');
+const authUtils = require('../../utils/authUtils');
+
+const updateCurrentAccount = async (_root, args, { token, user }) => {
+  if (!authUtils.authenticate(token)) {
+    return { success: false };
+  }
+
+  const { accountId } = user;
+  const userRecord = await db.accounts.findByPk(accountId);
+
+  const { firstName, lastName, email, country, region } = args;
+  userRecord.update({
+    firstName,
+    lastName,
+    email,
+    country,
+    region
+  });
+
+  return {
+    success: true
+  };
+};
+
+const updateAccount = async (_root, args, { token, user }) => {
+  if (!authUtils.authenticate(token)) {
+    return { success: false };
+  }
+
+  const { accountId, accountStatus, firstName, lastName, email, country, region, expiryDate } = args;
+  const userRecord = await db.accounts.findByPk(accountId);
+
+  const { accountId: currentAccountId } = user;
+  const currentUser = await db.accounts.findByPk(currentAccountId);
+
+  if (currentUser.dataValues.accountType !== 'superuser') {
+    return {
+      success: false,
+      errorStatus: 'PermissionDenied'
+    };
+  }
+
+  let validatedAccountStatus = accountStatus;
+
+  // "disabled" trumps "expired", otherwise the UI looks weird (you disable something but it never appears that way)
+  if (expiryDate && validatedAccountStatus !== 'disabled') {
+    const now = Number(dateFns.format(new Date(), 't'));
+
+    if (expiryDate < now) {
+      validatedAccountStatus = 'expired';
+    }
+  }
+
+  let expiryDateMs = null;
+  if (expiryDate) {
+    expiryDateMs = parseInt(expiryDate, 10);
+  }
+
+  userRecord.update({
+    accountStatus: validatedAccountStatus,
+    firstName,
+    lastName,
+    email,
+    country,
+    region,
+    expiryDate: expiryDateMs
+  });
+
+  return {
+    success: true
+  };
+};
+
+const updatePassword = async (root, args, { token, user }) => {
+  if (!authUtils.authenticate(token)) {
+    return { success: false };
+  }
+
+  const { accountId } = user;
+  const userRecord = await db.accounts.findByPk(accountId);
+  const { currentPassword, newPassword } = args;
+
+  const isCorrect = await authUtils.isValidPassword(currentPassword, userRecord.dataValues.password);
+
+  if (!isCorrect) {
+    const oneTimePasswordCorrect = await authUtils.isValidPassword(currentPassword, userRecord.dataValues.oneTimePassword);
+
+    if (!oneTimePasswordCorrect) {
+      return {
+        success: false,
+        error: 'PASSWORD_INCORRECT'
+      };
+    }
+  }
+
+  const newPasswordHash = await authUtils.getPasswordHash(newPassword);
+
+  userRecord.update({
+    password: newPasswordHash,
+    oneTimePassword: ''
+  });
+
+  return {
+    success: true
+  };
+};
+
+const createUserAccount = async (root, args, { token, user }) => {
+  if (!authUtils.authenticate(token)) {
+    return { success: false };
+  }
+
+  const userRecord = await db.accounts.findByPk(user.accountId);
+  if (userRecord.dataValues.accountType !== 'superuser') {
+    return {
+      success: false,
+      errorStatus: 'PermissionDenied'
+    };
+  }
+
+  const { accountId } = user;
+  const dateCreated = new Date().getTime();
+  const { firstName, lastName, email, country, region, accountStatus, expiryDate, oneTimePassword } = args;
+
+  let expiryDateMs = null;
+  if (expiryDate) {
+    expiryDateMs = parseInt(expiryDate, 10);
+  }
+
+  const tempPasswordHash = oneTimePassword ? await authUtils.getPasswordHash(oneTimePassword) : undefined;
+
+  await db.accounts.create({
+    createdBy: accountId,
+    accountType: 'user',
+    accountStatus,
+    dateCreated,
+    lastUpdated: dateCreated,
+    expiryDate: expiryDateMs,
+    password: '', // blank password
+    oneTimePassword: tempPasswordHash,
+    firstName,
+    lastName,
+    email,
+    country,
+    region,
+    numRowsGenerated: 0
+  });
+
+  return {
+    success: true
+  };
+};
+
+const deleteAccount = async (_root, { accountId }, { token, user }) => {
+  if (!authUtils.authenticate(token)) {
+    return { success: false };
+  }
+
+  const userRecord = await db.accounts.findByPk(user.accountId);
+  if (userRecord.dataValues.accountType !== 'superuser') {
+    return {
+      success: false,
+      errorStatus: 'PermissionDenied'
+    };
+  }
+
+  db.accounts.destroy({ where: { accountId } });
+
+  return {
+    success: true
+  };
+};
+
+module.exports = {
+  updateCurrentAccount,
+  updateAccount,
+  updatePassword,
+  createUserAccount,
+  deleteAccount
+};
diff --git a/apps/server/graphql/resolvers/auth.js b/apps/server/graphql/resolvers/auth.js
new file mode 100644
index 000000000..fb967b4f3
--- /dev/null
+++ b/apps/server/graphql/resolvers/auth.js
@@ -0,0 +1,346 @@
+const { OAuth2Client } = require('google-auth-library');
+const { nanoid } = require('nanoid');
+const db = require('../../database');
+const authUtils = require('../../utils/authUtils');
+const emailUtils = require('../../utils/emailUtils');
+const langUtils = require('../../utils/langUtils');
+const { passwordReset, passwordResetAccountExpired } = require('../../emails');
+
+const getAccountNumRowsGenerated = async (accountId) => {
+	const results = await db.dataSets.findAll({
+		where: {
+			accountId: accountId
+		},
+		attributes: [
+			[
+				db.sequelize.fn('sum', db.sequelize.col('num_rows_generated')),
+				'totalRowsGenerated'
+			]
+		]
+	});
+
+	return results[0].dataValues.totalRowsGenerated || 0;
+};
+
+const login = async (_root, { email, password }, { res }) => {
+	const user = await db.accounts.findOne({
+		attributes: [
+			'accountId',
+			'accountType',
+			'password',
+			'oneTimePassword',
+			'firstName',
+			'lastName',
+			'country',
+			'region',
+			'dateCreated',
+			'expiryDate'
+		],
+		where: {
+			email
+		}
+	});
+
+	if (!user) {
+		return { success: false };
+	}
+
+	const {
+		accountId,
+		password: encodedPassword,
+		oneTimePassword,
+		expiryDate
+	} = user.dataValues;
+
+	const accountExpired = authUtils.accountExpired(expiryDate);
+	if (accountExpired) {
+		await user.update({
+			accountStatus: 'expired'
+		});
+
+		return {
+			success: false,
+			error: 'accountExpired'
+		};
+	}
+
+	const isCorrect = await authUtils.isValidPassword(password, encodedPassword);
+
+	let oneTimePasswordIsCorrect = false;
+	if (oneTimePassword) {
+		oneTimePasswordIsCorrect = await authUtils.isValidPassword(
+			password,
+			oneTimePassword
+		);
+
+		// note we don't reset the password here. It's needed on the request to update the password - there we DON'T
+		// check the previous one (since it's not available). We only ever want to do that if there's a one-time password
+		// still in the DB.
+	}
+
+	if (!isCorrect && !oneTimePasswordIsCorrect) {
+		return { success: false };
+	}
+
+	const { token, tokenExpiry, refreshToken } = await getNewTokens(
+		accountId,
+		email,
+		user,
+		res
+	);
+	const numRowsGenerated = await getAccountNumRowsGenerated(accountId);
+
+	// we ignore async-ness here. No point slowing down the login just to track the last logged in date
+	user.update({
+		lastLoggedIn: new Date().getTime() / 1000
+	});
+
+	return {
+		success: true,
+		token,
+		tokenExpiry,
+		refreshToken,
+		email,
+		wasOneTimeLogin: oneTimePasswordIsCorrect,
+		numRowsGenerated,
+		...user.dataValues
+	};
+};
+
+const sendPasswordResetEmail = async (root, { email }, { req }) => {
+	const i18n = langUtils.getStrings(req.cookies.lang || 'en');
+
+	const user = await db.accounts.findOne({
+		attributes: ['accountId', 'firstName', 'expiryDate'],
+		where: {
+			email
+		}
+	});
+
+	if (user) {
+		// if the user's account has expired, let 'em know. Sodding ORM adds a degree of confusion but expiryDate is
+		// actually a JS object
+		const { firstName, expiryDate } = user.dataValues;
+
+		const accountExpired = authUtils.accountExpired(expiryDate);
+		if (accountExpired) {
+			const { subject, text, html } = passwordResetAccountExpired({
+				firstName,
+				i18n
+			});
+			await emailUtils.sendEmail(email, subject, text, html);
+		} else {
+			const tempPassword = nanoid(14);
+			const tempPasswordHash = await authUtils.getPasswordHash(tempPassword);
+
+			// set this temporary password in the DB
+			await user.update({
+				oneTimePassword: tempPasswordHash
+			});
+
+			const { subject, text, html } = passwordReset({
+				firstName,
+				email,
+				tempPassword,
+				i18n
+			});
+			await emailUtils.sendEmail(email, subject, text, html);
+		}
+	}
+
+	// regardless of whether it was found or not, just return true. This prevents people being sneaky and finding out
+	// if people have an account or not
+	return { success: true };
+};
+
+const loginWithGoogle = async (_root, { googleToken }, { res }) => {
+	const client = new OAuth2Client(process.env.GD_GOOGLE_AUTH_CLIENT_ID);
+	let email = '';
+	let profileImage = '';
+
+	async function verify() {
+		const ticket = await client.verifyIdToken({
+			idToken: googleToken,
+			audience: process.env.GD_GOOGLE_AUTH_CLIENT_ID
+		});
+		const payload = ticket.getPayload();
+
+		email = payload.email;
+		profileImage = payload.picture;
+	}
+
+	try {
+		await verify();
+	} catch (e) {
+		return {
+			success: false
+		};
+	}
+
+	// here the authentication has passed. Now verify the account exists
+	const user = await db.accounts.findOne({
+		attributes: [
+			'accountId',
+			'accountType',
+			'password',
+			'firstName',
+			'lastName',
+			'country',
+			'region',
+			'dateCreated',
+			'expiryDate',
+			'country',
+			'region'
+		],
+		where: {
+			email
+		}
+	});
+
+	if (!user) {
+		return {
+			success: false,
+			error: 'noUserAccount'
+		};
+	}
+
+	const {
+		accountId,
+		accountType,
+		firstName,
+		lastName,
+		country,
+		region,
+		expiryDate,
+		dateCreated
+	} = user.dataValues;
+	const accountExpired = authUtils.accountExpired(expiryDate);
+
+	if (accountExpired) {
+		return {
+			success: false,
+			error: 'accountExpired'
+		};
+	}
+
+	const { token, tokenExpiry, refreshToken } = await getNewTokens(
+		accountId,
+		email,
+		user,
+		res
+	);
+	const numRowsGenerated = await getAccountNumRowsGenerated(accountId);
+
+	return {
+		success: true,
+		token,
+		tokenExpiry,
+		refreshToken,
+		firstName,
+		lastName,
+		email,
+		country,
+		region,
+		accountType,
+		expiryDate,
+		dateCreated,
+		numRowsGenerated,
+		profileImage
+	};
+};
+
+const checkAndUpdateRefreshToken = async (_root, _args, { req, res }) => {
+	if (!req.cookies.refreshToken) {
+		return { success: false };
+	}
+
+	const oldRefreshToken = req.cookies.refreshToken;
+	const user = await db.accounts.findOne({
+		attributes: [
+			'accountId',
+			'accountType',
+			'firstName',
+			'email',
+			'lastName',
+			'country',
+			'region',
+			'dateCreated',
+			'expiryDate'
+		],
+		where: {
+			refreshToken: oldRefreshToken
+		}
+	});
+
+	if (!user) {
+		return { success: false };
+	}
+
+	const { accountId, email } = user.dataValues;
+	const {
+		token: newToken,
+		tokenExpiry,
+		refreshToken
+	} = await getNewTokens(accountId, email, user, res);
+
+	const numRowsGenerated = await getAccountNumRowsGenerated(accountId);
+
+	return {
+		success: true,
+		token: newToken,
+		tokenExpiry,
+		refreshToken,
+		numRowsGenerated,
+		...user.dataValues
+	};
+};
+
+const logout = async (root, args, { req }) => {
+	if (!req.cookies.refreshToken) {
+		return { success: true };
+	}
+
+	const refreshToken = req.cookies.refreshToken;
+	const user = await db.accounts.findOne({
+		attributes: ['accountId'],
+		where: {
+			refreshToken
+		}
+	});
+
+	if (user) {
+		user.update({
+			refreshToken: null,
+			oneTimePassword: null
+		});
+	}
+
+	return { success: true };
+};
+
+const getNewTokens = async (accountId, email, user) => {
+	const token = await authUtils.getJwt({ accountId, email });
+
+	// store the refresh token in a cookie and stash in the db
+	const refreshToken = nanoid();
+	await user.update({ refreshToken: refreshToken });
+
+	// ideally we'd set this cookie here on the server by passing back a Set-Cookie header. But due to the different
+	// ports, that's a no go. Instead, this is passed back to the client which sets it in a cookie. That info is then
+	// sent along with any subsequent requests to the server - including the all-important refreshToken request. This
+	// info enables the front-end code to transparently extend the lifespan of the living token (`token`) just by making
+	// requests
+	const expiryMsFromNow = process.env.GD_JWT_LIFESPAN_MINS * 60 * 1000;
+	const tokenExpiry = new Date().getTime() + expiryMsFromNow;
+
+	return { token, tokenExpiry, refreshToken };
+};
+
+module.exports = {
+	login,
+	loginWithGoogle,
+	sendPasswordResetEmail,
+	checkAndUpdateRefreshToken,
+	logout,
+	getAccountNumRowsGenerated
+};
diff --git a/apps/server/graphql/resolvers/dataSets.js b/apps/server/graphql/resolvers/dataSets.js
new file mode 100644
index 000000000..91a4b3c97
--- /dev/null
+++ b/apps/server/graphql/resolvers/dataSets.js
@@ -0,0 +1,137 @@
+const db = require('../../database');
+const authUtils = require('../../utils/authUtils');
+
+const saveNewDataSet = async (
+	_root,
+	{ dataSetName, content },
+	{ token, user }
+) => {
+	authUtils.authenticate(token);
+
+	const { accountId } = user;
+
+	const dateCreated = new Date().getTime();
+	const dataSet = await db.dataSets.create({
+		dataSetName,
+		status: 'private',
+		dateCreated,
+		accountId,
+		numRowsGenerated: 0
+	});
+
+	const { dataSetId } = dataSet.dataValues;
+	await db.dataSetHistory.create({
+		dataSetId,
+		dateCreated,
+		content
+	});
+
+	return {
+		success: true,
+		dataSetId,
+		savedDate: dateCreated
+	};
+};
+
+const renameDataSet = async (
+	_root,
+	{ dataSetId, dataSetName },
+	{ token, user }
+) => {
+	authUtils.authenticate(token);
+
+	const dataSet = await db.dataSets.findByPk(dataSetId);
+	if (dataSet.accountId !== user.accountId) {
+		return {
+			success: false
+		};
+	}
+
+	await dataSet.update({ dataSetName });
+
+	return {
+		success: true
+	};
+};
+
+const saveDataSet = async (_root, { dataSetId, content }, { token, user }) => {
+	authUtils.authenticate(token);
+
+	const dataSet = await db.dataSets.findByPk(dataSetId);
+	if (dataSet.accountId !== user.accountId) {
+		return {
+			success: false
+		};
+	}
+
+	const dateCreated = new Date().getTime();
+	await db.dataSetHistory.create({
+		dataSetId,
+		dateCreated,
+		content
+	});
+
+	return {
+		success: true,
+		dataSetId,
+		savedDate: dateCreated
+	};
+};
+
+const deleteDataSet = async (_root, { dataSetId }, { token, user }) => {
+	if (!authUtils.authenticate(token)) {
+		return { success: false };
+	}
+
+	const dataSet = await db.dataSets.findByPk(dataSetId);
+	if (dataSet.accountId !== user.accountId) {
+		return {
+			success: false
+		};
+	}
+
+	db.dataSets.destroy({ where: { dataSetId } });
+	db.dataSetHistory.destroy({ where: { dataSetId } });
+
+	return {
+		success: true
+	};
+};
+
+const updateDataSetGenerationCount = async (
+	_root,
+	{ dataSetId, generatedRows },
+	{ token, user }
+) => {
+	if (!authUtils.authenticate(token)) {
+		return { success: false };
+	}
+
+	let addRows = generatedRows;
+	if (/\D/.test(generatedRows)) {
+		addRows = 0;
+	}
+
+	const dataSet = await db.dataSets.findByPk(dataSetId);
+	const { accountId, numRowsGenerated } = dataSet.dataValues;
+
+	if (user.accountId !== accountId) {
+		return { success: false };
+	}
+
+	await dataSet.update({
+		numRowsGenerated: numRowsGenerated + addRows
+	});
+
+	return {
+		success: true
+	};
+};
+
+module.exports = {
+	saveNewDataSet,
+	saveDataSet,
+	renameDataSet,
+	deleteDataSet,
+	updateDataSetGenerationCount
+};
diff --git a/apps/server/graphql/schema.js b/apps/server/graphql/schema.js
new file mode 100644
index 000000000..26e542ec9
--- /dev/null
+++ b/apps/server/graphql/schema.js
@@ -0,0 +1,188 @@
+const { gql } = require('apollo-server-express');
+
+const typeDefs = gql`
+	type Query {
+		accounts(
+			limit: Int
+			offset: Int
+			sortCol: String
+			sortDir: SortDir
+			filterStr: String
+			status: String
+		): AccountsResults
+		account: Account
+		settings: [Setting]
+		dataSets(
+			limit: Int
+			offset: Int
+			sortCol: String
+			sortDir: SortDir
+		): DataSetResults
+		dataSet(id: ID!): DataSet
+		dataSetHistory(
+			dataSetId: ID!
+			limit: Int
+			offset: Int
+		): DataSetHistoryResults
+	}
+	type Mutation {
+		login(email: String!, password: String!): AuthResponse
+		loginWithGoogle(googleToken: String!): AuthResponse
+		sendPasswordResetEmail(email: String!): GeneralResponse
+		refreshToken: AuthResponse
+		logout: GeneralResponse
+		updateAccount(
+			accountId: ID!
+			accountStatus: AccountStatus
+			firstName: String!
+			lastName: String!
+			email: String!
+			country: String!
+			region: String
+			expiryDate: String
+		): GeneralResponse
+		updateCurrentAccount(
+			firstName: String!
+			lastName: String!
+			email: String!
+			country: String!
+			region: String
+		): GeneralResponse
+		updatePassword(
+			currentPassword: String!
+			newPassword: String!
+		): GeneralResponse
+		createUserAccount(
+			firstName: String!
+			lastName: String!
+			email: String!
+			country: String
+			region: String
+			accountStatus: AccountStatus
+			expiryDate: String
+			oneTimePassword: String
+		): GeneralResponse
+		deleteAccount(accountId: ID!): GeneralResponse
+		saveNewDataSet(dataSetName: String!, content: String!): SavedDataSetResponse
+		saveDataSet(dataSetId: ID!, content: String!): SavedDataSetResponse
+		renameDataSet(dataSetId: ID!, dataSetName: String): GeneralResponse
+		deleteDataSet(dataSetId: ID!): GeneralResponse
+		updateDataSetGenerationCount(
+			dataSetId: ID
+			generatedRows: Int
+		): GeneralResponse
+	}
+	type Account {
+		accountId: ID!
+		createdBy: ID
+		expiryDate: String
+		accountType: AccountType
+		accountStatus: AccountStatus
+		dateCreated: String
+		lastLoggedIn: String
+		firstName: String
+		lastName: String
+		email: String
+		country: String
+		region: String
+		numRowsGenerated: Int
+		profileImage: String
+		errorStatus: Error
+	}
+	type Setting {
+		settingName: String
+		settingValue: String
+	}
+	type DataSet {
+		dataSetId: ID
+		dataSetName: String
+		status: String
+		dateCreated: String
+		lastUpdated: String
+		accountId: ID
+		numRowsGenerated: Int
+		history: [DataSetHistory]
+	}
+	type DataSetListItem {
+		dataSetId: ID
+		status: String
+		dateCreated: String
+		numRowsGenerated: Int
+		historyId: ID
+		dataSetName: String
+		content: String
+		dataCreatedUnix: Int
+		historyDateCreatedUnix: Int
+	}
+	type DataSetHistoryResults {
+		results: [DataSetHistory]
+		totalCount: Int
+	}
+	type DataSetHistory {
+		historyId: ID!
+		dataSetId: ID!
+		dateCreated: String
+		content: String
+	}
+	type DataSetResults {
+		results: [DataSetListItem]
+		totalCount: Int
+	}
+	type AccountsResults {
+		results: [Account]
+		totalCount: Int
+		errorStatus: Error
+	}
+	type AuthResponse {
+		success: Boolean
+		token: String
+		tokenExpiry: String
+		refreshToken: String
+		error: String
+		accountId: ID
+		expiryDate: String
+		accountType: AccountType
+		accountStatus: AccountStatus
+		dateCreated: String
+		firstName: String
+		lastName: String
+		email: String
+		country: String
+		region: String
+		numRowsGenerated: Int
+		profileImage: String
+		wasOneTimeLogin: Boolean
+	}
+	type GeneralResponse {
+		success: Boolean
+		error: String
+	}
+	type Error {
+		errorStatus: ErrorStatus
+	}
+	type SavedDataSetResponse {
+		success: Boolean
+		error: String
+		dataSetId: ID
+		savedDate: String
+	}
+	enum AccountType {
+		superuser
+		admin
+		user
+	}
+	enum AccountStatus {
+		live
+		disabled
+		expired
+	}
+	enum SortDir {
+		ASC
+		DESC
+	}
+	enum ErrorStatus {
+		permissionDenied
+	}
+`;
+
+module.exports = typeDefs;
diff --git a/apps/server/nginx/nginx.conf b/apps/server/nginx/nginx.conf
new file mode 100644
index 000000000..6086dc45f
--- /dev/null
+++ b/apps/server/nginx/nginx.conf
@@ -0,0 +1,17 @@
+server {
+    listen 9000;
+    root /usr/share/nginx/html;
+    gzip on;
+    gzip_types text/plain text/javascript application/x-javascript text/css application/javascript application/json image/svg+xml;
+    gzip_comp_level 9;
+    etag on;
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+    location /index.html {
+        add_header Cache-Control no-cache;
+    }
+    location /graphql {
+        proxy_pass http://server:3001;
+    }
+}
diff --git a/apps/server/package.json b/apps/server/package.json
new file mode 100644
index 000000000..d791b85d5
--- /dev/null
+++ b/apps/server/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "@generatedata/server",
+  "description": "Server-side code for generatedata app",
+  "private": true,
+  "scripts": {
+    "build": "node scripts/build.js",
+    "start": "nodemon ./app.js"
+  },
+  "dependencies": {
+    "@types/nanoid": "3.0.0",
+    "apollo-server-express": "^2.19.0",
+    "bcrypt": "^5.0.0",
+    "codemirror": "^5.58.2",
+    "cookie-parser": "^1.4.5",
+    "date-fns": "^2.17.0",
+    "express": "^4.20.2",
+    "google-auth-library": "^6.1.3",
+    "jsonwebtoken": "^9.0.2",
+    "mysql2": "^2.2.5",
+    "nanoid": "^3.3.4",
+    "nodemailer": "^6.9.9",
+    "nodemon": "^2.0.6",
+    "sequelize": "^6.29.0"
+  },
+  "devDependencies": {
+    "@generatedata/config": "workspace:*",
+    "@generatedata/utils": "workspace:*",
+    "dotenv": "^8.2.0"
+  }
+}
diff --git a/apps/server/scripts/build.js b/apps/server/scripts/build.js
new file mode 100644
index 000000000..d6eb5278f
--- /dev/null
+++ b/apps/server/scripts/build.js
@@ -0,0 +1,35 @@
+import dateFns from 'date-fns';
+import serverConfig from '@generatedata/config/serverConfig';
+import authUtils from '@generatedata/utils/auth';
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const createDatabaseInitFile = async () => {
+  const now = Math.round(new Date().getTime() / 1000);
+  const newPasswordHash = await authUtils.getPasswordHash(serverConfig.defaultAdminAccount.GD_DEFAULT_ADMIN_PASSWORD);
+
+  const mysqlDateTime = dateFns.format(dateFns.fromUnixTime(now), 'yyyy-LL-dd HH:mm:ss');
+
+  const placeholders = {
+    '%FIRST_NAME%': serverConfig.defaultAdminAccount.GD_DEFAULT_ADMIN_FIRST_NAME,
+    '%LAST_NAME%': serverConfig.defaultAdminAccount.GD_DEFAULT_ADMIN_LAST_NAME,
+    '%EMAIL%': serverConfig.defaultAdminAccount.GD_DEFAULT_ADMIN_EMAIL,
+    '%PASSWORD%': newPasswordHash,
+    '%DATE_CREATED%': mysqlDateTime,
+    '%LAST_UPDATED%': mysqlDateTime
+  };
+
+  const dbStructureTemplate = fs.readFileSync(path.join(__dirname, '../database/dbStructure.template.sql'), 'utf8');
+  let newFile = dbStructureTemplate;
+  Object.keys(placeholders).forEach((placeholder) => {
+    newFile = newFile.replace(placeholder, placeholders[placeholder]);
+  });
+
+  fs.writeFileSync(path.join(__dirname, '../database/_dbStructure.sql'), newFile);
+};
+
+createDatabaseInitFile();
diff --git a/apps/server/utils/authUtils.js b/apps/server/utils/authUtils.js
new file mode 100644
index 000000000..320fbae31
--- /dev/null
+++ b/apps/server/utils/authUtils.js
@@ -0,0 +1,61 @@
+const jwt = require('jsonwebtoken');
+const bcrypt = require('bcrypt');
+
+const isValidPassword = async (plainTextPassword, hash) => await bcrypt.compare(plainTextPassword, hash);
+
+const getJwt = (payload) =>
+  jwt.sign(payload, process.env.GD_JWT_SECRET, {
+    expiresIn: `${process.env.GD_JWT_LIFESPAN_MINS}m`
+  });
+
+const authenticate = async (token) => {
+  if (token) {
+    try {
+      await jwt.verify(token, process.env.GD_JWT_SECRET);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  return false;
+};
+
+const decodeToken = (token) => {
+  const decodedToken = jwt.decode(token, { complete: true });
+
+  if (!decodedToken) {
+    throw new Error();
+  }
+
+  return decodedToken;
+};
+
+const getUser = (token) => {
+  if (!token) {
+    return {};
+  }
+  const decodedToken = decodeToken(token);
+  return decodedToken.payload;
+};
+
+const accountExpired = (expiryDate) => {
+  if (expiryDate === null) {
+    return false;
+  }
+
+  const now = new Date();
+  const nowMs = now.getTime();
+  const expiryDateMs = expiryDate ? expiryDate.getTime() : 0;
+
+  return expiryDateMs < nowMs;
+};
+
+module.exports = {
+  getPasswordHash,
+  isValidPassword,
+  getJwt,
+  authenticate,
+  getUser,
+  accountExpired
+};
diff --git a/apps/server/utils/dateUtils.js b/apps/server/utils/dateUtils.js
new file mode 100644
index 000000000..49eaf0679
--- /dev/null
+++ b/apps/server/utils/dateUtils.js
@@ -0,0 +1,10 @@
+const { format } = require('date-fns');
+
+const getMysqlDateTime = (date = new Date()) =>
+	format(date, 'YYYY-MM-DD HH-mm-ss');
+
+// const getUnixTimeFromMySQLDate
+
+module.exports = {
+	getMysqlDateTime
+};
diff --git a/apps/server/utils/emailUtils.js b/apps/server/utils/emailUtils.js
new file mode 100644
index 000000000..cd4173a41
--- /dev/null
+++ b/apps/server/utils/emailUtils.js
@@ -0,0 +1,41 @@
+const nodemailer = require('nodemailer');
+
+const sendEmail = async (recipientEmail, subject, textContent, htmlContent) => {
+	const transporter = nodemailer.createTransport({
+		host: 'smtp.gmail.com',
+		port: 465,
+		secure: true,
+		auth: {
+			type: 'OAuth2',
+			user: getAdminEmail(),
+			serviceClient: process.env.GD_EMAIL_OAUTH_SERVICE_CLIENT_ID,
+			privateKey: process.env.GD_EMAIL_OAUTH_PRIVATE_KEY.replace(/\\n/g, '\n')
+		}
+	});
+
+	try {
+		await transporter.verify();
+		await transporter.sendMail({
+			from: getEmailSender(),
+			to: recipientEmail,
+			subject,
+			text: textContent,
+			html: htmlContent
+		});
+	} catch (err) {
+		console.error(err);
+	}
+};
+
+const getAdminEmail = () => {
+	return process.env.GD_DEFAULT_ADMIN_EMAIL;
+};
+
+const getEmailSender = () => {
+	return `${process.env.GD_DEFAULT_ADMIN_EMAIL_SENDER_NAME} <${process.env.GD_DEFAULT_ADMIN_EMAIL}>`;
+};
+
+module.exports = {
+	sendEmail,
+	getAdminEmail
+};
diff --git a/apps/server/utils/generalUtils.js b/apps/server/utils/generalUtils.js
new file mode 100644
index 000000000..b55b4e79e
--- /dev/null
+++ b/apps/server/utils/generalUtils.js
@@ -0,0 +1,21 @@
+const getSiteUrl = () => {
+	let protocol = 'http';
+	const domain = process.env.GD_WEB_DOMAIN;
+
+	if (process.env.GD_WEB_USE_HTTPS === 'true') {
+		protocol = 'https';
+	}
+
+	// @ts-ignore-line
+	let cleanPort = '';
+	let port = process.env.GD_WEB_SERVER_PORT.trim();
+	if (port && port !== '80' && port !== 80 && port !== '443' && port !== 443) {
+		cleanPort = `:${port}`;
+	}
+
+	return `${protocol}://${domain}${cleanPort}`;
+};
+
+module.exports = {
+	getSiteUrl
+};
diff --git a/apps/server/utils/langUtils.js b/apps/server/utils/langUtils.js
new file mode 100644
index 000000000..457bfc299
--- /dev/null
+++ b/apps/server/utils/langUtils.js
@@ -0,0 +1,48 @@
+const ar = require('../../client/src/i18n/ar.json');
+const de = require('../../client/src/i18n/de.json');
+const en = require('../../client/src/i18n/en.json');
+const es = require('../../client/src/i18n/es.json');
+const fr = require('../../client/src/i18n/fr.json');
+const hi = require('../../client/src/i18n/hi.json');
+const ja = require('../../client/src/i18n/ja.json');
+const nl = require('../../client/src/i18n/nl.json');
+const pt = require('../../client/src/i18n/pt.json');
+const ta = require('../../client/src/i18n/ta.json');
+const zh = require('../../client/src/i18n/zh.json');
+
+const getStrings = (locale) => {
+	const map = { ar, de, en, es, fr, hi, ja, nl, pt, ta, zh };
+	return map[locale];
+};
+
+// this and the following method are currently duplicated here. Need to convert the BE code to use TS
+const getI18n = (i18nString, placeholders) => {
+	const parts = i18nString.split(/(%\d+)/);
+	const parsed = [];
+
+	parts.forEach((part) => {
+		if (/%\d+/.test(part)) {
+			const index = parseInt(part.replace('%', ''), 10) - 1;
+
+			if (index < placeholders.length) {
+				parsed.push(placeholders[index]);
+
+				// if there's no placeholder for this, just add the original value which looked like a placeholder
+			} else {
+				parsed.push(part);
+			}
+		} else {
+			parsed.push(part);
+		}
+	});
+
+	return parsed;
+};
+
+const getI18nString = (i18nString, placeholders) =>
+	getI18n(i18nString, placeholders).join('');
+
+module.exports = {
+	getStrings,
+	getI18nString
+};
diff --git a/apps/server/utils/stringUtils.js b/apps/server/utils/stringUtils.js
new file mode 100644
index 000000000..add3b240e
--- /dev/null
+++ b/apps/server/utils/stringUtils.js
@@ -0,0 +1,10 @@
+// JS trim() doesn't trim newlines. This does.
+const trim = (str) => str.replace(/^\s+|\s+$/g, '');
+
+const toSentenceCase = (str) =>
+	str.toLowerCase().replace(/\.\s*([a-z])|^[a-z]/gm, (s) => s.toUpperCase());
+
+module.exports = {
+	trim,
+	toSentenceCase
+};
diff --git a/cache/index.html b/cache/index.html
deleted file mode 100644
index 30e84fdd6..000000000
--- a/cache/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head></head><body></body></html>
diff --git a/composer.json b/composer.json
deleted file mode 100644
index ef69d4c2c..000000000
--- a/composer.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"name": "benkeen/generatedata",
-	"type": "library",
-	"description": "Free, GNU-licensed, random custom data generator for testing software",
-	"keywords": ["Random Data", "Test Data", "Sample Data", "data generator", "testing"],
-	"homepage": "http://github.com/benkeen/generatedata",
-	"license": "GPL",
-	"authors": [
-		{
-			"name": "Ben Keen",
-			"email": "ben.keen@gmail.com",
-			"homepage": "https://github.com/benkeen/",
-			"role": "Developer"
-		}
-	],
-	"require": {
-		"php": ">=5.3.0"
-	}
-}
\ No newline at end of file
diff --git a/data/db/nodelete.txt b/data/db/nodelete.txt
new file mode 100644
index 000000000..9e1362993
--- /dev/null
+++ b/data/db/nodelete.txt
@@ -0,0 +1 @@
+This folder will store your database. This file is here to prevent OSs removing the empty folder.
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
new file mode 100644
index 000000000..648ca4376
--- /dev/null
+++ b/docker-compose-prod.yml
@@ -0,0 +1,61 @@
+version: "3"
+
+networks:
+  gd-network:
+    driver: bridge
+
+services:
+  server:
+    container_name: server
+    build:
+      context: ./
+      dockerfile: apps/server/Dockerfile
+    depends_on:
+      - db
+    networks:
+      - gd-network
+    expose:
+      - "${GD_API_SERVER_PORT}"
+    ports:
+      - "${GD_API_SERVER_PORT}:${GD_API_SERVER_PORT}"
+    restart: on-failure
+    volumes:
+      - .:/home/app/generatedata
+      - /home/app/generatedata/apps/client/node_modules
+      - /home/app/generatedata/apps/server/node_modules
+    environment:
+      - NODE_ENV=production
+
+  db:
+    container_name: db
+    image: mariadb:10.5.8
+    command: --default-authentication-plugin=mysql_native_password
+    restart: always
+    expose:
+      - "${GD_DB_PORT}"
+    ports:
+      - "${GD_DB_PORT}:${GD_DB_PORT}"
+    networks:
+      - gd-network
+    environment:
+      MYSQL_ROOT_PASSWORD: ${GD_MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${GD_DB_NAME}
+      MYSQL_ALLOW_EMPTY_PASSWORD: ok
+    volumes:
+      - ./apps/server/database/_dbStructure.sql:/docker-entrypoint-initdb.d/setup.sql
+      - ./data/db:/var/lib/mysql
+
+  # contains the webapp + starts nginx
+  webapp:
+    container_name: webapp
+    image: nginx:latest
+    ports:
+      - "${GD_WEB_SERVER_PORT}:80"
+    volumes:
+      - ./client/dist:/usr/share/nginx/html
+    depends_on:
+      - server
+    links:
+      - server
+    networks:
+      - gd-network
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..e6518492d
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,44 @@
+version: "3"
+
+networks:
+  gd-network:
+    driver: bridge
+
+services:
+  server:
+    container_name: server
+    build:
+      context: ./
+      dockerfile: ./apps/server/Dockerfile
+    depends_on:
+      - db
+    networks:
+      - gd-network
+    expose:
+      - "${GD_API_SERVER_PORT}"
+    ports:
+      - "${GD_API_SERVER_PORT}:${GD_API_SERVER_PORT}"
+    restart: on-failure
+    volumes:
+      - .:/home/app/generatedata
+      # - /home/app/generatedata/apps/client/node_modules
+      # - /home/app/generatedata/apps/server/node_modules
+
+  db:
+    container_name: db
+    image: mariadb:10.5.8
+    command: --default-authentication-plugin=mysql_native_password
+    restart: always
+    expose:
+      - "${GD_DB_PORT}"
+    ports:
+      - "${GD_DB_PORT}:${GD_DB_PORT}"
+    networks:
+      - gd-network
+    environment:
+      MYSQL_ROOT_PASSWORD: ${GD_MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${GD_DB_NAME}
+      MYSQL_ALLOW_EMPTY_PASSWORD: ok
+    volumes:
+      - ./apps/server/database/_dbStructure.sql:/docker-entrypoint-initdb.d/setup.sql
+      - ./data/db:/var/lib/mysql
diff --git a/generate.php b/generate.php
deleted file mode 100644
index 1de117ad7..000000000
--- a/generate.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-require_once(__DIR__ . "/library.php");
-
-Core::init("generation");
-$gen = new DataGenerator($_POST);
-$response = $gen->generate();
-
-if ($gen->getExportTarget() == "promptDownload") {
-	header("Cache-Control: private, no-cache, must-revalidate");
-	
-	// check if user opted to zip the generated data
-	if ($gen->isPromptDownloadZipped()) {
-		$randNum = mt_rand(0, 100000000);
-		$fileName = $randNum . "_" . $response["promptDownloadFilename"];
-		$zipPath  = $filePath . ".zip";
-
-		if (file_put_contents($fileName, $response["content"])) {
-
-			// now that we've written the file, zip it up
-			$zip = new ZipArchive();
-			$zipFile = $zip->open($zipPath, ZipArchive::CREATE);
-			if ($zipFile && $zip->addFile($fileName, $response["promptDownloadFilename"])) {
-
-				// we've got our zip file now we may set the response header
-				$zip->close();
-				header("Content-type: application/zip");
-				header("Content-Disposition: attachment; filename=" . $response["promptDownloadFilename"] . ".zip");
-				readfile($zipPath);
-				unlink($zipPath);
-				unlink($fileName);
-				exit;
-			}
-		}
-
-	// no compression, send the original data back
-	} else {
-		header("Content-Type: {$response["contentTypeHeader"]}");
-
-		if (isset($response["promptDownloadFilename"]) && !empty($response["promptDownloadFilename"])) {
-			header("Content-Disposition: attachment; filename={$response["promptDownloadFilename"]}");
-		}
-		echo $response["content"];
-	}
-} else {
-	echo $response["content"];
-}
diff --git a/gruntfile.js b/gruntfile.js
deleted file mode 100644
index 1aa74be90..000000000
--- a/gruntfile.js
+++ /dev/null
@@ -1,128 +0,0 @@
-module.exports = function(grunt) {
-	"use strict";
-
-
-	var config = {
-		pkg: grunt.file.readJSON('package.json'),
-
-		uglify: {
-			coreJS: {
-				files: {
-					'cache/core.js': [
-						'resources/libs/codemirror/lib/codemirror.js',
-						'resources/scripts/libs/jquery.min.js',
-						'resources/scripts/libs/jquery-ui.min.js',
-						'resources/scripts/libs/jquery.json-2.2.min.js',
-						'resources/scripts/libs/chosen.jquery.min.js',
-						'resources/scripts/libs/spinners.js',
-
-						// pity, but now everyone gets them <!--[if lt IE 9]>
-						'resources/scripts/libs/html5shiv.js',
-						'resources/scripts/libs/excanvas.js'
-					]
-				},
-				options: {
-					report: "min",
-					compress: true
-				}
-			}
-		},
-
-		cssmin: {
-			target: {
-				files: {
-					// it would be VERY nice to bundle all the CSS, but the various image paths make it impossible
-					'cache/core.css': [
-						'resources/css/tablesorter.theme.css',
-						'resources/libs/codemirror/lib/codemirror.css'
-					]
-				}
-			}
-		},
-
-		requirejs: {
-			compile: {
-				options: {
-					name: "appStartGenerated",
-					baseUrl: "./", // necessary!
-					mainConfigFile: "resources/scripts/requireConfig.js",
-					out: "cache/appStartGenerated.bundled.js"
-				}
-			}
-		},
-
-		md5: {
-			prod: {
-				files: {
-					"cache/core.css": "cache/core.css",
-					"cache/core.js": "cache/core.js",
-					"cache/appStartGenerated.bundled.js": "cache/appStartGenerated.bundled.js"
-				},
-				options: {
-					after: function(fileChanges) {
-						if (fileChanges.length !== 3) {
-							return;
-						}
-
-						// now create the cache/minifiedResourcePaths.php that contains the new, unique filenames
-						var php = "<?php\n$MINIFIED = array();\n" +
-								"$MINIFIED['coreCSS']  = \"" + fileChanges[0].newPath + "\";\n" +
-								"$MINIFIED['coreJS']   = \"" + fileChanges[1].newPath + "\";\n" +
-								"$MINIFIED['appStart'] = \"" + fileChanges[2].newPath + "\";\n";
-
-						grunt.file.write("cache/minifiedResourcePaths.php", php);
-					}
-				}
-			}
-		},
-
-		search: {
-			short_tags: {
-				files: {
-					src: [
-						"resources/classes/**/*.php",
-						"plugins/**/*.php",
-						"*.php"
-					]
-				},
-				options: {
-					searchString: /(<\?[^p])|(<\?$)/,
-					logFile: "cache/short_tags.json",
-					logFormat: "json",
-					outputExaminedFiles: true,
-					failOnMatch: true
-				}
-			}
-		}
-	};
-
-	grunt.initConfig(config);
-
-	grunt.loadNpmTasks('grunt-contrib-requirejs');
-	grunt.loadNpmTasks('grunt-contrib-uglify');
-	grunt.loadNpmTasks('grunt-md5');
-	grunt.loadNpmTasks('grunt-template');
-	grunt.loadNpmTasks('grunt-contrib-cssmin');
-	grunt.loadNpmTasks('grunt-search');
-
-	/**
-	 * The default - and only - Grunt task simply recreates all the bundled resources. It doesn't alter the actual
-	 * script at all. To use these bundled resources you need to add a $useMinifiedResources = true; var to your
-	 * settings.php file.
-	 */
-	grunt.registerTask('default', [
-
-		// uglify the core CSS + JS
-		'uglify',
-		'cssmin',
-
-		// generate the requireJS bundle containing all modules + core. This relies on there being a
-		// /cache/appStartStatic file having been auto-generated by the script first. That file is generated every
-		// time you click the "Reset Plugins" link
-		'requirejs',
-
-		// now create md5 versions of the main minified file, which (re)-generates the /cache/minifiedResourcePaths.php file
-		// with the latest file mapping
-		'md5'
-	]);
-};
\ No newline at end of file
diff --git a/index.php b/index.php
deleted file mode 100755
index f339c152c..000000000
--- a/index.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-require_once("library.php");
-Core::init();
-
-// if need be, redirect to the install instructions page
-Utils::maybeShowInstallationPage();
-
-if (!Core::checkIsLoggedIn() && !Core::checkAllowMultiUserAnonymousUse()) {
-	header("location: login.php#t1");
-	exit;
-}
-
-// start piecing together all the various info we need to pass to the page
-$pageParams = array();
-if (isset($_POST["updateSettings"])) {
-	list($success, $message) = Settings::updateSettings($_POST);
-	$pageParams["success"] = $success;
-	$pageParams["message"] = $message;
-}
-
-$settings = Settings::getSettings();
-$exportTypes = Core::$exportTypePlugins;
-$exportTypeAdditionalSettings = ExportTypePluginHelper::getExportTypeAdditionalSettingsHTML($exportTypes);
-$dataTypes = DataTypePluginHelper::getDataTypeList(Core::$dataTypePlugins);
-$exportTypeJSModules = ExportTypePluginHelper::getExportTypeJSResources($exportTypes, "string");
-$exportTypeCssIncludes = ExportTypePluginHelper::getExportTypeCSSIncludes($exportTypes);
-$dataTypeJSModules = DataTypePluginHelper::getDataTypeJSResources($dataTypes, "string");
-$dataTypeCssIncludes = DataTypePluginHelper::getDataTypeCSSIncludes($dataTypes);
-$cssIncludes = $exportTypeCssIncludes . "\n" . $dataTypeCssIncludes;
-
-// used in the settings page
-$pageParams["allCountryPlugins"] = Core::$countryPlugins;
-$pageParams["allExportTypes"] = $exportTypes;
-$pageParams["allDataTypes"] = $dataTypes;
-$pageParams["allTranslations"] = Core::$translations->getList();
-
-$useMinifiedResources = Core::isUsingMinifiedResources();
-$pageParams["useMinifiedResources"] = $useMinifiedResources;
-if ($useMinifiedResources) {
-	$pageParams["minifiedResourcePaths"] = Minification::getMinifiedResourcePaths();
-}
-
-$pageParams["dataTypeJSModules"] = $dataTypeJSModules;
-$pageParams["exportTypeJSModules"] = $exportTypeJSModules;
-$pageParams["exportTypeAdditionalSettings"] = $exportTypeAdditionalSettings;
-$pageParams["settings"] = $settings;
-$pageParams["cssIncludes"] = $cssIncludes;
-$pageParams["codeMirrorIncludes"] = ExportTypePluginHelper::getExportTypeCodeMirrorModes($exportTypes);
-$pageParams["defaultExportType"] = Core::getDefaultExportType();
-$pageParams["defaultNumRows"] = Core::getDefaultNumRows();
-
-if (Core::checkIsLoggedIn()) {
-	$pageParams["isLoggedIn"] = true;
-	$pageParams["accountType"] = Core::$user->getAccountType();
-} else {
-	$pageParams["isLoggedIn"] = false;
-	$pageParams["accountType"] = "";
-}
-
-Templates::displayPage("resources/templates/index.tpl", $pageParams);
diff --git a/install.php b/install.php
deleted file mode 100644
index 4bb8cce21..000000000
--- a/install.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-require_once("library.php");
-Core::init("installation");
-
-// if the script is already installed, redirect them to the index page.
-if (Core::checkIsInstalled()) {
-	header("location: index.php");
-	exit;
-}
-
-$currentPage = 1;
-if (Core::checkSettingsFileExists()) {
-	$currentPage = 3;
-	if (Settings::getSetting("installationStepComplete_Core") == "yes") {
-		$currentPage = 4;
-	}
-}
-
-$params = array();
-$params["theme"] = Core::getDefaultTheme();
-$params["randomPassword"] = Utils::generateRandomAlphanumericStr("CVxxCxV");
-$params["tablePrefix"]    = Core::getDbTablePrefix();
-$params["currentPage"]    = $currentPage;
-
-Templates::displayPage("resources/templates/install.tpl", $params);
\ No newline at end of file
diff --git a/library.php b/library.php
deleted file mode 100755
index ef45233d4..000000000
--- a/library.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * library.php
- * -----------
- *
- * The main settings & code for the script. All your custom environment settings like your database
- * connection info, are stored in a settings.php file in this same folder. That file is created
- * automatically by the installation script.
- */
-
-// the script requires PHP 5.3+ (see resources/classes/Core.class.php), so this should be defined -
-// but just so the user will see a nice error, define it anyway
-(@__DIR__ == '__DIR__') && define('__DIR__', dirname(__FILE__));
-
-require_once(__DIR__ . "/resources/classes/Account.class.php");
-require_once(__DIR__ . "/resources/classes/AjaxRequest.class.php");
-require_once(__DIR__ . "/resources/classes/Core.class.php");
-require_once(__DIR__ . "/resources/classes/CountryPlugin.abstract.class.php");
-require_once(__DIR__ . "/resources/classes/CountryPluginHelper.class.php");
-require_once(__DIR__ . "/resources/classes/Database.class.php");
-require_once(__DIR__ . "/resources/classes/DataGenerator.class.php");
-require_once(__DIR__ . "/resources/classes/DataTypePlugin.abstract.class.php");
-require_once(__DIR__ . "/resources/classes/DataTypePluginHelper.class.php");
-require_once(__DIR__ . "/resources/classes/Emails.class.php");
-require_once(__DIR__ . "/resources/classes/ErrorCodes.class.php");
-require_once(__DIR__ . "/resources/classes/ExportTypePlugin.abstract.class.php");
-require_once(__DIR__ . "/resources/classes/ExportTypePluginHelper.class.php");
-require_once(__DIR__ . "/resources/classes/GeoData.class.php");
-require_once(__DIR__ . "/resources/classes/Installation.class.php");
-require_once(__DIR__ . "/resources/classes/Language.class.php");
-require_once(__DIR__ . "/resources/classes/Minification.class.php");
-require_once(__DIR__ . "/resources/classes/SessionManager.class.php");
-require_once(__DIR__ . "/resources/classes/Settings.class.php");
-require_once(__DIR__ . "/resources/classes/Templates.class.php");
-require_once(__DIR__ . "/resources/classes/Translations.class.php");
-require_once(__DIR__ . "/resources/classes/Utils.class.php");
-
-// Smarty - use SecureSmarty!
-require_once(__DIR__ . "/resources/libs/smarty/Smarty.class.php");
-require_once(__DIR__ . "/resources/classes/SecureSmarty.class.php");
-
-
-// handle magic quotes
-if (get_magic_quotes_gpc()) {
-    $process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
-    while (list($key, $val) = each($process)) {
-        foreach ($val as $k => $v) {
-            unset($process[$key][$k]);
-            if (is_array($v)) {
-                $process[$key][stripslashes($k)] = $v;
-                $process[] = &$process[$key][stripslashes($k)];
-            } else {
-                $process[$key][stripslashes($k)] = stripslashes($v);
-            }
-        }
-    }
-    unset($process);
-}
diff --git a/license.txt b/license.txt
deleted file mode 100644
index 94a9ed024..000000000
--- a/license.txt
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program 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 3 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/login.php b/login.php
deleted file mode 100644
index b41cb28eb..000000000
--- a/login.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-require_once("library.php");
-Core::init();
-
-// if need be, redirect to the install instructions page
-Utils::maybeShowInstallationPage();
-
-$isLoggedIn = Core::checkIsLoggedIn();
-if ($isLoggedIn || (!$isLoggedIn && Core::checkAllowMultiUserAnonymousUse())) {
-	header("location: ./");
-	exit;
-}
-
-$pageParams = array();
-Templates::displayPage("resources/templates/login.tpl", $pageParams);
\ No newline at end of file
diff --git a/package.json b/package.json
index 4e1624c3e..6fde209b4 100644
--- a/package.json
+++ b/package.json
@@ -1,33 +1,35 @@
 {
   "name": "generatedata",
-  "version": "3.0.7",
-  "description": "free, GNU-licensed, random custom data generator for testing software",
-  "main": "gruntfile.js",
-  "directories": {
-    "test": "tests"
+  "description": "Free, MIT-licensed tool for generating random test data. Have at it.",
+  "version": "4.1.9",
+  "author": "Ben Keen <ben.keen@gmail.com>",
+  "packageManager": "pnpm@9.0.0",
+  "license": "GPL-3.0+",
+  "engines": {
+    "node": "20",
+    "pnpm": "9"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "build": "turbo build",
+    "start": "cd apps/client && npm run start",
+    "prodAll": "COMPOSE_HTTP_TIMEOUT=150 docker-compose -f docker-compose-prod.yml up",
+    "startApp": "npm run prod && COMPOSE_HTTP_TIMEOUT=150 docker-compose -f docker-compose-prod.yml up --build",
+    "clearApp": "npm run stopDevServer && npm run dockerCleanup",
+    "startDevServer": "COMPOSE_HTTP_TIMEOUT=150 docker-compose up",
+    "startAndBuildDevServer": "COMPOSE_HTTP_TIMEOUT=150 docker-compose up --build",
+    "startNodeDevServer": "cd apps/server && npm run start",
+    "stopDevServer": "docker-compose down",
+    "dockerCleanup": "docker system prune -a && docker volume rm $(docker volume ls -qf dangling=true)"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/benkeen/generatedata.git"
   },
-  "author": "Ben Keen",
-  "license": "GPL",
   "readmeFilename": "README.md",
-  "gitHead": "0c9c909be95a311f2d25efc0f3ed63a1f7f40574",
   "bugs": {
     "url": "https://github.com/benkeen/generatedata/issues"
   },
-  "devDependencies": {
-    "grunt-cli": "~0.1.9",
-    "grunt": "~0.4.1",
-    "grunt-contrib-requirejs": "~0.4.1",
-    "grunt-contrib-uglify": "~0.2.4",
-    "grunt-md5": "~0.1.11",
-    "grunt-template": "~0.2.0",
-    "grunt-contrib-cssmin": "~0.6.1",
-    "grunt-search": "~0.1.2"
+  "dependencies": {
+    "turbo": "^2.3.3"
   }
 }
diff --git a/packages/cli-test/__tests__/Alphanumeric.test.ts b/packages/cli-test/__tests__/Alphanumeric.test.ts
new file mode 100644
index 000000000..7af67301a
--- /dev/null
+++ b/packages/cli-test/__tests__/Alphanumeric.test.ts
@@ -0,0 +1,32 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Alphanumeric',
+				title: 'Zip',
+				settings: {
+					value: 'Xxxxx'
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm simple export format', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['Zip']);
+	});
+});
diff --git a/packages/cli-test/__tests__/AutoIncrement.test.ts b/packages/cli-test/__tests__/AutoIncrement.test.ts
new file mode 100644
index 000000000..f9b2efaae
--- /dev/null
+++ b/packages/cli-test/__tests__/AutoIncrement.test.ts
@@ -0,0 +1,60 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'AutoIncrement',
+				title: 'Simple increment',
+				settings: {
+					incrementStart: 1,
+					incrementValue: 1
+				}
+			},
+			{
+				plugin: 'AutoIncrement',
+				title: 'Tens with prefix',
+				settings: {
+					incrementStart: 10,
+					incrementValue: 10,
+					incrementPlaceholder: 'A-{{INCR}}'
+				}
+			},
+			{
+				plugin: 'AutoIncrement',
+				title: 'Decrement with suffix',
+				settings: {
+					incrementStart: 100,
+					incrementValue: -5,
+					incrementPlaceholder: '{{INCR}}B'
+				}
+			},
+			{
+				plugin: 'AutoIncrement',
+				title: 'Incrementing range',
+				settings: {
+					incrementStart: 10,
+					incrementValue: 1,
+					incrementPlaceholder: '{{INCR}}-{{INCR*2}}'
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm simple export format', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['Simple increment', 'Tens with prefix', 'Decrement with suffix', 'Incrementing range']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Boolean.test.ts b/packages/cli-test/__tests__/Boolean.test.ts
new file mode 100644
index 000000000..d4aea7f4f
--- /dev/null
+++ b/packages/cli-test/__tests__/Boolean.test.ts
@@ -0,0 +1,53 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Boolean',
+				title: 'boolean1',
+				settings: {
+					values: ['Yes', 'No']
+				}
+			},
+			{
+				plugin: 'Boolean',
+				title: 'boolean2',
+				settings: {
+					values: ['0', '1']
+				}
+			},
+			{
+				plugin: 'Boolean',
+				title: 'boolean3',
+				settings: {
+					values: ['true', 'false']
+				}
+			},
+			{
+				plugin: 'Boolean',
+				title: 'notReallyABoolean',
+				settings: {
+					values: ['Yes', 'No', 'Maybe']
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm generates correctly', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['boolean1', 'boolean2', 'boolean3', 'notReallyABoolean']);
+	});
+});
diff --git a/packages/cli-test/__tests__/CVV.test.ts b/packages/cli-test/__tests__/CVV.test.ts
new file mode 100644
index 000000000..13eb2b8e5
--- /dev/null
+++ b/packages/cli-test/__tests__/CVV.test.ts
@@ -0,0 +1,30 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'CVV',
+				title: 'cvv',
+				settings: {}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm generates correctly', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['cvv']);
+	});
+});
diff --git a/packages/cli-test/__tests__/City.test.ts b/packages/cli-test/__tests__/City.test.ts
new file mode 100644
index 000000000..4c74bb7ea
--- /dev/null
+++ b/packages/cli-test/__tests__/City.test.ts
@@ -0,0 +1,58 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'City',
+				title: 'any-city',
+				settings: {
+					source: 'any'
+				}
+			},
+			{
+				plugin: 'City',
+				title: 'city-within-country',
+				settings: {
+					source: 'countries',
+					selectedCountries: ['Australia', 'Canada']
+				}
+			},
+			{
+				plugin: 'Region',
+				title: 'region-source',
+				settings: {
+					source: 'countries',
+					selectedCountries: ['Germany', 'Australia'],
+					formats: ['full']
+				},
+				id: '1'
+			},
+			{
+				plugin: 'City',
+				title: 'city-within-region',
+				settings: {
+					source: 'regionRow',
+					targetRowId: '1'
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm generates correctly', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['any-city', 'city-within-country', 'region-source', 'city-within-region']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Colour.test.ts b/packages/cli-test/__tests__/Colour.test.ts
new file mode 100644
index 000000000..57d07e2b8
--- /dev/null
+++ b/packages/cli-test/__tests__/Colour.test.ts
@@ -0,0 +1,51 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Colour',
+				title: 'colour',
+				settings: {
+					value: '',
+					format: 'hex'
+				}
+			},
+			{
+				plugin: 'Colour',
+				title: 'bright-red',
+				settings: {
+					value: '#EE4B2B',
+					format: 'hex',
+					luminosity: 'bright'
+				}
+			},
+			{
+				plugin: 'Colour',
+				title: 'green-with-alpha',
+				settings: {
+					value: 'green',
+					format: 'rgba',
+					alpha: 0.5
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm generates correctly', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['colour', 'bright-red', 'green-with-alpha']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Company.test.ts b/packages/cli-test/__tests__/Company.test.ts
new file mode 100644
index 000000000..424a5c727
--- /dev/null
+++ b/packages/cli-test/__tests__/Company.test.ts
@@ -0,0 +1,30 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Company',
+				title: 'company-name',
+				settings: {}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm generates correctly', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['company-name']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Computed.test.ts b/packages/cli-test/__tests__/Computed.test.ts
new file mode 100644
index 000000000..424a5c727
--- /dev/null
+++ b/packages/cli-test/__tests__/Computed.test.ts
@@ -0,0 +1,30 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Company',
+				title: 'company-name',
+				settings: {}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm generates correctly', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['company-name']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Constant.test.ts b/packages/cli-test/__tests__/Constant.test.ts
new file mode 100644
index 000000000..0019f53f1
--- /dev/null
+++ b/packages/cli-test/__tests__/Constant.test.ts
@@ -0,0 +1,41 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Constant',
+				title: 'ones-and-twos',
+				settings: {
+					loopCount: 1,
+					values: ['One', 'Two']
+				}
+			},
+			{
+				plugin: 'Constant',
+				title: 'ABCs',
+				settings: {
+					loopCount: 2,
+					values: ['A', 'B', 'C']
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm generates correctly', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['ones-and-twos', 'ABCs']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Country.test.ts b/packages/cli-test/__tests__/Country.test.ts
new file mode 100644
index 000000000..927c7b7c9
--- /dev/null
+++ b/packages/cli-test/__tests__/Country.test.ts
@@ -0,0 +1,48 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Country',
+				title: 'any-country',
+				settings: {
+					source: 'all'
+				}
+			},
+			{
+				plugin: 'Country',
+				title: 'country-plugin',
+				settings: {
+					source: 'plugins',
+					selectedCountries: []
+				}
+			},
+			{
+				plugin: 'Country',
+				title: 'country-plugins-subset',
+				settings: {
+					source: 'plugins',
+					selectedCountries: ['Canada', 'Nigeria', 'Spain', 'Norway']
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm generates correctly', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['any-country', 'country-plugin', 'country-plugins-subset']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Currency.test.ts b/packages/cli-test/__tests__/Currency.test.ts
new file mode 100644
index 000000000..d434e8145
--- /dev/null
+++ b/packages/cli-test/__tests__/Currency.test.ts
@@ -0,0 +1,64 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Currency',
+				title: 'us-dollars',
+				settings: {
+					from: 1,
+					to: 1000000,
+					currencySymbol: '$',
+					currencySymbolLocation: 'prefix',
+					includeCents: true,
+					thousandsSeparator: ',',
+					centsSeparator: '.'
+				}
+			},
+			{
+				plugin: 'Currency',
+				title: 'french-canadian',
+				settings: {
+					from: 1000,
+					to: 5000,
+					currencySymbol: ' $',
+					currencySymbolLocation: 'suffix',
+					includeCents: true,
+					thousandsSeparator: '.',
+					centsSeparator: ','
+				}
+			},
+			{
+				plugin: 'Currency',
+				title: 'euros-no-cents',
+				settings: {
+					from: 100000,
+					to: 200000,
+					currencySymbol: '€',
+					currencySymbolLocation: 'prefix',
+					includeCents: false,
+					thousandsSeparator: ',',
+					centsSeparator: ''
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm generates correctly', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['us-dollars', 'french-canadian', 'euros-no-cents']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Date.test.ts b/packages/cli-test/__tests__/Date.test.ts
new file mode 100644
index 000000000..f05d1886d
--- /dev/null
+++ b/packages/cli-test/__tests__/Date.test.ts
@@ -0,0 +1,34 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Date',
+				title: 'date1',
+				settings: {
+					fromDate: 1672531200,
+					toDate: 1702511999,
+					format: 'MMM d, y'
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm generates correctly', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['date1']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Email.cli.test.ts b/packages/cli-test/__tests__/Email.cli.test.ts
new file mode 100644
index 000000000..eabf685a6
--- /dev/null
+++ b/packages/cli-test/__tests__/Email.cli.test.ts
@@ -0,0 +1,32 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Email',
+				title: 'email',
+				settings: {
+					source: 'random'
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm simple export format', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['email']);
+	});
+});
diff --git a/packages/cli-test/__tests__/GUID.cli.test.ts b/packages/cli-test/__tests__/GUID.cli.test.ts
new file mode 100644
index 000000000..f3f590cc7
--- /dev/null
+++ b/packages/cli-test/__tests__/GUID.cli.test.ts
@@ -0,0 +1,30 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'GUID',
+				title: 'guid',
+				settings: {}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm simple export format', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['guid']);
+	});
+});
diff --git a/packages/cli-test/__tests__/IBAN.cli.test.ts b/packages/cli-test/__tests__/IBAN.cli.test.ts
new file mode 100644
index 000000000..3c9754c76
--- /dev/null
+++ b/packages/cli-test/__tests__/IBAN.cli.test.ts
@@ -0,0 +1,30 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'IBAN',
+				title: 'iban',
+				settings: {}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm simple export format', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['iban']);
+	});
+});
diff --git a/packages/cli-test/__tests__/LatLng.cli.test.ts b/packages/cli-test/__tests__/LatLng.cli.test.ts
new file mode 100644
index 000000000..998903c49
--- /dev/null
+++ b/packages/cli-test/__tests__/LatLng.cli.test.ts
@@ -0,0 +1,49 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'LatLng',
+				title: 'lat',
+				settings: {
+					lat: true,
+					lng: false
+				}
+			},
+			{
+				plugin: 'LatLng',
+				title: 'lng',
+				settings: {
+					lat: false,
+					lng: true
+				}
+			},
+			{
+				plugin: 'LatLng',
+				title: 'both-lat-and-lng',
+				settings: {
+					lat: true,
+					lng: true
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm simple export format', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['lat', 'lng', 'both-lat-and-lng']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Names.cli.test.ts b/packages/cli-test/__tests__/Names.cli.test.ts
new file mode 100644
index 000000000..8e84778ac
--- /dev/null
+++ b/packages/cli-test/__tests__/Names.cli.test.ts
@@ -0,0 +1,48 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (dataStructureFormat: 'simple' | 'complex'): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Names',
+				title: 'First Name',
+				settings: {
+					options: ['Name']
+				}
+			},
+			{
+				plugin: 'Names',
+				title: 'Last Name',
+				settings: {
+					options: ['Surname']
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat
+			}
+		}
+	});
+
+	it('Confirm simple export format', async () => {
+		const data: any = await generate(getTemplate('simple'));
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['First Name', 'Last Name']);
+	});
+
+	it('Confirm simple export format', async () => {
+		const data: any = await generate(getTemplate('complex'));
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.cols).toEqual(['First Name', 'Last Name']);
+		expect(generatedJSON.data.length).toEqual(10);
+		expect(generatedJSON.data[0].length).toEqual(2);
+	});
+});
diff --git a/packages/cli-test/__tests__/NumberRange.cli.test.ts b/packages/cli-test/__tests__/NumberRange.cli.test.ts
new file mode 100644
index 000000000..eb5409221
--- /dev/null
+++ b/packages/cli-test/__tests__/NumberRange.cli.test.ts
@@ -0,0 +1,41 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'NumberRange',
+				title: 'num1',
+				settings: {
+					min: 1,
+					max: 100
+				}
+			},
+			{
+				plugin: 'NumberRange',
+				title: 'num2',
+				settings: {
+					min: -10000,
+					max: -20000
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm generates correctly', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['num1', 'num2']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Phone.cli.test.ts b/packages/cli-test/__tests__/Phone.cli.test.ts
new file mode 100644
index 000000000..41fe05508
--- /dev/null
+++ b/packages/cli-test/__tests__/Phone.cli.test.ts
@@ -0,0 +1,39 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (dataStructureFormat: 'simple' | 'complex'): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: DataType.Phone,
+				title: 'phoneNum1',
+				settings: {
+					option: ['(Xxx) Xxx-xxxx']
+				}
+			},
+			{
+				plugin: 'Phone',
+				title: 'phoneNum2',
+				settings: {
+					option: ['(Xxx) Xxx-xxxx', '1 (Xxx) Xxx-xxxx', 'Xxx Xxx-xxxx']
+				}
+			}
+		],
+		exportSettings: {
+			plugin: ExportType.JSON,
+			settings: {
+				dataStructureFormat
+			}
+		}
+	});
+
+	it('Confirm simple export format', async () => {
+		const data: any = await generate(getTemplate('simple'));
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['phoneNum1', 'phoneNum2']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Region.cli.test.ts b/packages/cli-test/__tests__/Region.cli.test.ts
new file mode 100644
index 000000000..df73ed7df
--- /dev/null
+++ b/packages/cli-test/__tests__/Region.cli.test.ts
@@ -0,0 +1,104 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+  const getTemplate = (): GDTemplate => ({
+    generationSettings: {
+      numResults: 10
+    },
+    dataTemplate: [
+      {
+        plugin: 'Region',
+        title: 'Full Region',
+        settings: {
+          source: 'anyRegion',
+          formats: ['full']
+        }
+      },
+      {
+        plugin: 'Region',
+        title: 'Short Region Code',
+        settings: {
+          source: 'anyRegion',
+          formats: ['short']
+        }
+      },
+      {
+        plugin: 'Region',
+        title: 'Short/Full Region Code',
+        settings: {
+          source: 'anyRegion',
+          formats: ['short', 'full']
+        }
+      },
+      {
+        plugin: 'Region',
+        title: 'Region from 2 countries',
+        settings: {
+          source: 'countries',
+          selectedCountries: ['Canada', 'Russia'],
+          formats: ['full']
+        }
+      },
+
+      {
+        plugin: 'Country',
+        title: 'country1',
+        settings: {
+          source: 'plugins',
+          selectedCountries: []
+        },
+        id: '1'
+      },
+      {
+        plugin: 'Region',
+        title: 'Full Region mapped to Country Row #1',
+        settings: {
+          source: 'countryRow',
+          targetRowId: '1',
+          formats: ['full']
+        }
+      },
+      {
+        plugin: 'Region',
+        title: 'Short Region mapped to Country Row #1',
+        settings: {
+          source: 'countryRow',
+          targetRowId: '1',
+          formats: ['short']
+        }
+      },
+      {
+        plugin: 'Country',
+        title: 'country2',
+        settings: {
+          source: 'plugins',
+          selectedCountries: ['Canada', 'US']
+        },
+        id: '2'
+      },
+      {
+        plugin: 'Region',
+        title: 'Full Region mapped to Country Subset row',
+        settings: {
+          source: 'countryRow',
+          targetRowId: '2',
+          formats: ['full']
+        }
+      }
+    ],
+    exportSettings: {
+      plugin: 'JSON',
+      settings: {
+        dataStructureFormat: 'simple'
+      }
+    }
+  });
+
+  it('Confirm generates correctly', async () => {
+    const data = await generate(getTemplate());
+    const generatedJSON = JSON.parse(data);
+
+    expect(generatedJSON.length).toEqual(10);
+    expect(Object.keys(generatedJSON[0])).toEqual(['Full Region', 'Short Region Code', 'Short/Full Region Code', 'Region from 2 countries', 'country1', 'Full Region mapped to Country Row #1', 'Short Region mapped to Country Row #1', 'country2', 'Full Region mapped to Country Subset row']);
+  });
+});
diff --git a/packages/cli-test/__tests__/StreetAddress.cli.test.ts b/packages/cli-test/__tests__/StreetAddress.cli.test.ts
new file mode 100644
index 000000000..4f3891f0d
--- /dev/null
+++ b/packages/cli-test/__tests__/StreetAddress.cli.test.ts
@@ -0,0 +1,30 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'StreetAddress',
+				title: 'street_address',
+				settings: {}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm simple export format', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['street_address']);
+	});
+});
diff --git a/packages/cli-test/__tests__/TextFixed.cli.test.ts b/packages/cli-test/__tests__/TextFixed.cli.test.ts
new file mode 100644
index 000000000..ea45753c6
--- /dev/null
+++ b/packages/cli-test/__tests__/TextFixed.cli.test.ts
@@ -0,0 +1,33 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'TextFixed',
+				title: 'text1',
+				settings: {
+					numWordsToGenerate: 2,
+					words: ['One', 'Two', 'Three', 'Four']
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm simple export format', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['text1']);
+	});
+});
diff --git a/packages/cli-test/__tests__/Time.cli.test.ts b/packages/cli-test/__tests__/Time.cli.test.ts
new file mode 100644
index 000000000..aa98e684c
--- /dev/null
+++ b/packages/cli-test/__tests__/Time.cli.test.ts
@@ -0,0 +1,34 @@
+import generate, { GDTemplate } from '@generatedata/cli';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: 'Time',
+				title: 'time',
+				settings: {
+					fromTime: 1678944164,
+					toTime: 1679030564,
+					format: 'h:mm a'
+				}
+			}
+		],
+		exportSettings: {
+			plugin: 'JSON',
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Confirm simple export format', async () => {
+		const data = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual(['time']);
+	});
+});
diff --git a/packages/cli-test/__tests__/WeightedList.cli.test.ts b/packages/cli-test/__tests__/WeightedList.cli.test.ts
new file mode 100644
index 000000000..e7b0eef6e
--- /dev/null
+++ b/packages/cli-test/__tests__/WeightedList.cli.test.ts
@@ -0,0 +1,37 @@
+// import generate, { GDTemplate } from '@generatedata/cli';
+//
+// describe('CLI data generation', () => {
+// 	const getTemplate = (): GDTemplate => ({
+// 		generationSettings: {
+// 			numResults: 10
+// 		},
+// 		dataTemplate: [
+// 			{
+// 				plugin: 'WeightedList',
+// 				title: 'list',
+// 				settings: {
+// 					listType: 'exactly',
+// 					allowDuplicates: true,
+// 					delimiter: ', ',
+// 					values: [
+// 						{ value: 1, }
+// 					]
+// 				}
+// 			},
+// 		],
+// 		exportSettings: {
+// 			plugin: 'JSON',
+// 			settings: {
+// 				dataStructureFormat: 'simple'
+// 			}
+// 		}
+// 	});
+//
+// 	it('Confirm simple export format', async () => {
+// 		const data = await generate(getTemplate());
+// 		const generatedJSON = JSON.parse(data);
+//
+// 		expect(generatedJSON.length).toEqual(10);
+// 		expect(Object.keys(generatedJSON[0])).toEqual(['time']);
+// 	});
+// });
diff --git a/packages/cli-test/package.json b/packages/cli-test/package.json
new file mode 100644
index 000000000..c088acba2
--- /dev/null
+++ b/packages/cli-test/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "@generatedata/cli-test",
+  "description": "Private package to test consumption and execution of the published @generatedata/cli package",
+  "private": true,
+  "dependencies": {}
+}
diff --git a/packages/cli/.gitignore b/packages/cli/.gitignore
new file mode 100644
index 000000000..8c947a17d
--- /dev/null
+++ b/packages/cli/.gitignore
@@ -0,0 +1,4 @@
+node_modules/*
+src/_i18n
+src/_cliTypes.ts
+dist/
\ No newline at end of file
diff --git a/packages/cli/.npmignore b/packages/cli/.npmignore
new file mode 100644
index 000000000..a0392e560
--- /dev/null
+++ b/packages/cli/.npmignore
@@ -0,0 +1,8 @@
+build
+__tests__
+examples
+src
+gruntfile.js
+NOTES.md
+tsconfig.json
+yarn.lock
diff --git a/packages/cli/.nvmrc b/packages/cli/.nvmrc
new file mode 100644
index 000000000..cdb734b38
--- /dev/null
+++ b/packages/cli/.nvmrc
@@ -0,0 +1 @@
+v18.2.0
diff --git a/packages/cli/README.md b/packages/cli/README.md
new file mode 100644
index 000000000..5f14ed0bc
--- /dev/null
+++ b/packages/cli/README.md
@@ -0,0 +1,137 @@
+# @generatedata/cli
+
+> In active development (Feb 2025).
+
+Since 4.2.0, the generatedata.com site is now available as a CLI. You can generate all the same data as you
+can via the website, only via the command line from your own machine. There are two ways to do this:
+
+- A _binary_ that you can run on the node command line, or
+- JS code you can include and run in your own JS/TS applications.
+
+Both are available via the `@generatedata/cli` npm package.
+
+### Installation
+
+`npm install @generatedata/cli`
+
+The npm package contains both a command line tool and methods that can be used within your own JS/TS code.
+
+#### Binary
+
+```
+npx generatedata --config=configFile.json
+```
+
+#### Typescript
+
+```typescript
+import { generate, GDTemplate } from '@generatedata/cli';
+
+(async () => {
+    const template: GDTemplate = { ... };
+    await generate(template);
+})();
+```
+
+## Configuration file
+
+The configuration file defines three main things:
+
+1. the _generation settings_: number or rows, the location and name of the filename and other settings
+2. the _data format settings_: what sort of data you're generation: JSON, CSV, XML etc, plus related settings
+   3: the _data template_: what exact data you want to generate and their order. Names, phone numbers, email addresses etc.
+
+Here's a simple example that generates 1000 rows of first and last names in JSON format.
+
+```json
+{
+  "generationSettings": {
+    "numResults": 1000,
+    "stripWhitespace": true,
+    "locale": "en",
+    "filename": "generated-data.json"
+  },
+  "dataFormatSettings": {
+    "plugin": "JSON",
+    "settings": {
+      "dataStructureFormat": "simple"
+    }
+  },
+  "dataTemplate": [
+    {
+      "plugin": "Names",
+      "title": "First Name",
+      "settings": {
+        "options": ["Name"]
+      }
+    },
+    {
+      "plugin": "Names",
+      "title": "Last Name",
+      "settings": {
+        "options": ["Surname"]
+      }
+    }
+  ]
+}
+```
+
+This file can get very large and hard to manually configure! The simplest way to create the file is to use the
+[website](https://generatedata.com). There, just use the interface to construct the data set and format you want,
+then click on the "Schema" icon at the bottom right. That will generate the configuration file which you can download
+and use locally. **(This will be added in 4.2.0).**
+
+Now let's look at the options a bit closer.
+
+#### 1. generationSettings
+
+This section contains all high-level settings about the data you're generating.
+
+| Setting         | Type       | Required | Default value | Description                                                                                                                                                                                                                                                 |
+| --------------- | ---------- | -------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| numResults      | `number`   | x        | -             | The number of rows of data you want to generate.                                                                                                                                                                                                            |
+| stripWhitespace | `boolean`  |          | `false`       | Whether to remove all whitespace from the generated data. This can significantly reduce file/output size.                                                                                                                                                   |
+| locale          | `GDLocale` |          | `en`          | Some of the plugins that generate the data ("Data Types") and formats ("Export Types") use language strings here and there. This settings controls what language is provided to them.                                                                       |
+| target          | `string`   |          | `file`        | The default behaviour of the npm + binary package is to _generate a file_. However, if you want to just pipe it to STDOUT for the command line utility, or return the value from the `generate` npm package method, set this value to the string `output`'. |
+| filename        | `string`   |          | `file`        | Required if you enter "file" for the `target` option. This is the name of the file you want to generate. You can also include a relative file path. Note that it'll be relative to where-ever you're executing the code (binary/npm package).               |
+
+#### 2. dataFormatSettings
+
+This contains the settings for the _format_ of the data you want, like XML, SQL etc.
+
+...
+
+#### 3. dataTemplate
+
+This property contains an array of whatever type of data you want to generate, like Names, phone numbers etc. The types of
+data are separate plugins, called Data Types. Each of them may have their own settings to control whatever sort of information
+they provide. We'll provide links to all the available Data Types below with an example of how to configure them. But top-level,
+all of these rows contain the same properties:
+
+| Setting  | Type       | Required | Default value | Description                                                                                                                                                                                                                                                                                                                                                                                                       |
+| -------- | ---------- | -------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| plugin   | `DataType` | x        | -             | The Data Type plugin name. This will correspond to the folder name (list below).                                                                                                                                                                                                                                                                                                                                  |
+| title    | `string`   | x        | -             | This is used as an identifier for the row and will differ, depending on the Export Type you're choosing (e.g. HTML, XML, SQL, JSON etc.). For example, for XML it is used as the XML node name; for SQL the database column name; for JSON, the property name. As such, you'll need to enter a value that's valid for that export type or it will fail the validation step when you attempt to generate the data. |
+| id       | `number`   |          | -             | Some Data Types allow you to _reference_ other rows. e.g. the Region Data Type lets you reference a Country row, so it generates a region within the random Country being generated. This ID column is used to provide that mapping. But you don't need to enter it otherwise.                                                                                                                                    |
+| settings | `object`   |          | -             | This section contains whatever settings are needed/offered for this particular Data Type plugin you've chosen.                                                                                                                                                                                                                                                                                                    |
+
+### Local dev
+
+`npm run build`
+
+-
+- This generates the build artifacts.
+
+Note: requires the main client/ application to have been built first. To do that just run `npm run build` in the root of the repo.
+
+- `npm run dev` - runs index.ts for testing purposes
+- `npm run test`
+
+### Other scenarios
+
+- Generating multiple different types in a single field
+- Increasing probability of particular format being used over others
+- Having one field be based on another field
+  - e.g. regions (country, region, city, zip)
+  - email addresses that look like the names of the users
+  - doing math on the numeric result of another field
diff --git a/packages/cli/gruntfile.js b/packages/cli/gruntfile.js
new file mode 100644
index 000000000..8f5af6f2c
--- /dev/null
+++ b/packages/cli/gruntfile.js
@@ -0,0 +1,83 @@
+const fs = require('fs');
+const path = require('path');
+
+const BASE_PATH = path.join(__dirname, '../../apps/client');
+const locales = process.env.GD_LOCALES.split(',');
+
+module.exports = function (grunt) {
+  const dataTypesFolder = `${BASE_PATH}/src/plugins/dataTypes`;
+  const exportTypesFolder = `${BASE_PATH}/src/plugins/exportTypes`;
+  const countriesFolder = `${BASE_PATH}/src/plugins/countries`;
+
+  const createI18nFolder = () => {
+    const i18nFolder = path.join(__dirname, '/src/_i18n');
+    if (!fs.existsSync(i18nFolder)) {
+      fs.mkdirSync(i18nFolder);
+    }
+  };
+
+  const generateI18nBundles = () => {
+    locales.forEach((locale) => {
+      const coreLocaleStrings = JSON.parse(fs.readFileSync(`${BASE_PATH}/src/i18n/${locale}.json`, 'utf8'));
+      const dtImports = getPluginLocaleFiles(grunt, locale, dataTypesFolder);
+      const etImports = getPluginLocaleFiles(grunt, locale, exportTypesFolder);
+      const countryImports = getPluginLocaleFiles(grunt, locale, countriesFolder);
+
+      generateLocaleFileTemplate(locale, coreLocaleStrings, dtImports, etImports, countryImports);
+    });
+  };
+
+  const getPluginLocaleFiles = (grunt, locale, pluginTypeFolder) => {
+    const plugins = fs.readdirSync(pluginTypeFolder);
+    const imports = {};
+    plugins.forEach((folder) => {
+      const localeFile = `${pluginTypeFolder}/${folder}/i18n/${locale}.json`;
+      if (fs.existsSync(localeFile)) {
+        try {
+          imports[folder] = JSON.parse(fs.readFileSync(localeFile, 'utf8'));
+        } catch (e) {
+          grunt.fail.fatal('problem parsing i18n file: ' + localeFile);
+        }
+      }
+    });
+    return imports;
+  };
+
+  const generateLocaleFileTemplate = (locale, coreLocaleStrings, dtImports, etImports, countryImports) => {
+    const template = {
+      core: coreLocaleStrings,
+      dataTypes: dtImports,
+      exportTypes: etImports,
+      countries: countryImports
+    };
+
+    const filename = `./src/_i18n/${locale}.json`;
+    fs.writeFileSync(filename, JSON.stringify(template));
+  };
+
+  grunt.initConfig({
+    clean: {
+      dist: ['dist']
+    },
+    copy: {
+      i18n: {
+        files: [
+          {
+            expand: true,
+            cwd: 'src/_i18n',
+            src: ['*'],
+            dest: 'dist/cli/src/_i18n'
+          }
+        ]
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-copy');
+
+  grunt.registerTask('default', ['clean', 'createEmptyDist', 'copyI18nFiles', 'i18n']);
+  grunt.registerTask('i18n', generateI18nBundles);
+  grunt.registerTask('createEmptyDist', createI18nFolder);
+  grunt.registerTask('copyI18nFiles', ['copy:i18n']);
+};
diff --git a/packages/cli/package.json b/packages/cli/package.json
new file mode 100644
index 000000000..b38df8a56
--- /dev/null
+++ b/packages/cli/package.json
@@ -0,0 +1,56 @@
+{
+  "name": "@generatedata/cli",
+  "version": "0.0.3",
+  "description": "The CLI version of generatedata.com. Currently in development only.",
+  "license": "GPL3",
+  "main": "dist/cli/index.js",
+  "bin": {
+    "generatedata": "./bin/generatedata.js"
+  },
+  "scripts": {
+    "__build": "grunt && tsc",
+    "test": "jest"
+  },
+  "files": [
+    "dist/*",
+    "bin/generatedata.js"
+  ],
+  "jest": {
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js"
+    ],
+    "transform": {
+      "^.+\\.jsx?$": "babel-jest",
+      "\\.(ts|tsx)$": "ts-jest"
+    },
+    "setupFilesAfterEnv": [
+      "<rootDir>/../../client/tests/jestSetup.ts"
+    ],
+    "testRegex": "/__tests__/.*\\.(ts|tsx)$",
+    "moduleNameMapper": {
+      "\\.(css|less|scss|sss|styl)$": "<rootDir>/../../node_modules/jest-css-modules",
+      "^~components(.*)$": "../../client/src/components$1",
+      "^~types(.*)$": "<rootDir>/../../client/types$1",
+      "^~utils(.*)$": "<rootDir>/../../client/src/utils$1",
+      "^~store(.*)$": "<rootDir>/../../client/src/core/store$1",
+      "^~core(.*)$": "<rootDir>/../../client/src/core$1"
+    }
+  },
+  "devDependencies": {
+    "@generatedata/plugins": "workspace:*",
+    "@types/jest": "^26.0.15",
+    "grunt": "^1.6.1",
+    "grunt-cli": "^1.3.2",
+    "jest": "^26.6.3",
+    "jest-cli": "^26.6.3",
+    "jest-css-modules": "^2.1.0",
+    "typescript": "^5.7.3"
+  },
+  "dependencies": {
+    "ansi-colors": "^4.1.3",
+    "cli-progress": "^3.11.2",
+    "yargs": "^17.6.2"
+  }
+}
diff --git a/packages/cli/src/bin.js b/packages/cli/src/bin.js
new file mode 100644
index 000000000..b082a9691
--- /dev/null
+++ b/packages/cli/src/bin.js
@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+
+const path = require('path');
+const yargs = require('yargs/yargs');
+const colors = require('ansi-colors');
+const cliProgress = require('cli-progress');
+const { hideBin } = require('yargs/helpers');
+const { generate } = require('../dist');
+const { getConfigFile, applyAndValidateCommandLineArgs } = require(path.resolve(__dirname, '../src/utils/bin'));
+const args = yargs(hideBin(process.argv)).argv;
+
+let configFileContent = getConfigFile(args, process.exit);
+configFileContent = applyAndValidateCommandLineArgs(args, configFileContent, process.exit);
+
+
+const progressBar = new cliProgress.SingleBar({
+	format: 'Generating |' + colors.grey('{bar}') + '| {percentage}% || {value}/{total} rows',
+	barCompleteChar: '\u2588',
+	barIncompleteChar: '\u2591',
+	hideCursor: true
+});
+
+const numResults = configFileContent.generationSettings.numResults;
+progressBar.start(numResults, 0);
+
+generate(configFileContent, {
+	onBatchComplete: ({ numGeneratedRows, isLastBatch }) => {
+		progressBar.update(numGeneratedRows);
+
+		if (isLastBatch) {
+			progressBar.stop();
+		}
+	}
+});
+
+/*
+const file = fs.createWriteStream('path/to/file');
+  file.write("...");
+}
+file.end();
+*/
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
new file mode 100644
index 000000000..310f00a01
--- /dev/null
+++ b/packages/cli/src/index.ts
@@ -0,0 +1,168 @@
+/**
+ * This file is used to generate dist/index.js and is the "main" entry in the package.json file. Users
+ * can import it and get access to the primary `generate` method to programmatically generate random data.
+ *
+ * The command line script (bin/generatedata.js) is separate. That imports this code but provides a wrapper over the
+ * functionality to show a progress indicator, allow for arguments + error handling etc.
+ */
+
+import path from 'path';
+import fs from 'fs';
+import { DataTemplateRow, DataTypeWorkerInterface, ExportType, GDTemplate } from '~types/generator';
+import { DataType } from '../../../client/_plugins';
+import { dataTypeNodeData, exportTypeNodeData } from './_cliTypes';
+import countryNames from '../../../client/_namePlugins';
+import { generate as generateUtils } from '../../../client/src/utils/generatorUtils';
+import workerUtils from '../../../client/src/utils';
+import { GDLocale, GenerationTemplate } from '~types/general';
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { convertRowsToGenerationTemplate } from '~store/generator/generator.selectors';
+import { getCountryData } from '@generatedata/plugins';
+import { setLocale } from '~utils/langUtils';
+
+export { availableLocales } from '../../../client/_env';
+export { DataType, ExportType, GDTemplate };
+
+const getI18nStrings = (locale: GDLocale): any => {
+  const localeFile = path.join(__dirname, `./_i18n/${locale}.json`);
+  return JSON.parse(fs.readFileSync(localeFile, 'utf8'));
+};
+
+/**
+ * Takes the user's template and fluffs it out with all the necessary values needed by the generation script.
+ */
+const getNormalizedGDTemplate = (template: GDTemplate): GDTemplate => ({
+  generationSettings: {
+    locale: 'en',
+    stripWhitespace: false,
+    packetSize: 100,
+    target: 'return',
+    ...template.generationSettings
+  },
+
+  // TODO need to prefill all
+  dataTemplate: template.dataTemplate,
+  exportSettings: template.exportSettings
+});
+
+const getColumns = (rows: DataTemplateRow[]) => {
+  return rows.map((row) => ({
+    title: row.title,
+    dataType: row.plugin,
+    id: row.id || newRowId++,
+    metadata: {} // TODO...
+  }));
+};
+
+export type GDParams = {
+  onBatchComplete: ({ isLastBatch, numGeneratedRows, batchData }: any) => void;
+};
+
+/**
+ * The primary export
+ * @param template
+ */
+const generate = async (template: GDTemplate, params?: GDParams): Promise<string> => {
+  const normalizedTemplate = getNormalizedGDTemplate(template);
+
+  // initialize the locale. This is used for a few things in the app for the generated date
+  const locale = normalizedTemplate.generationSettings.locale as GDLocale;
+  const i18n = getI18nStrings(normalizedTemplate.generationSettings.locale as GDLocale);
+  setLocale(locale, i18n);
+
+  const dataTypeInterface = getWorkerInterface();
+  const exportTypeInterface = getExportTypeWorkerInterface(normalizedTemplate.exportSettings.plugin as ExportType);
+
+  let inMemoryResult = '';
+  return new Promise((resolve) => {
+    const onComplete = (data: string, settings: any) => {
+      // consumers can optionally pass an onBatchComplete callback that'll be called after each batch is processed.
+      // This is used by the command line binary to provide a progress bar
+      if (params?.onBatchComplete) {
+        params.onBatchComplete({
+          isLastBatch: settings.isLastBatch,
+          numGeneratedRows: settings.numGeneratedRows,
+          batchData: data
+        });
+      }
+
+      inMemoryResult += data;
+      if (settings.isLastBatch) {
+        resolve(inMemoryResult);
+      }
+    };
+
+    generateUtils({
+      i18n,
+      workerUtils,
+      dataTypeInterface,
+      exportTypeInterface,
+      exportTypeSettings: normalizedTemplate.exportSettings.settings,
+      generationSettings: normalizedTemplate.generationSettings,
+      template: convertPublicToInternalTemplate(normalizedTemplate.dataTemplate),
+      countryNames,
+      countryData: getCountryData(),
+      onComplete,
+      columns: getColumns(normalizedTemplate.dataTemplate)
+    });
+  });
+};
+
+export default generate;
+
+let newRowId = 1;
+const convertPublicToInternalTemplate = (rows: DataTemplateRow[]): GenerationTemplate => {
+  const cleanRows = rows.map((row) => ({
+    // for some situations, users can supply their own IDs so they can map data together. This pads the ones that
+    // don't have it
+    id: row.id || newRowId++,
+    title: row.title,
+    dataType: row.plugin,
+    data: row.settings
+  }));
+
+  return convertRowsToGenerationTemplate(cleanRows);
+};
+
+const getWorkerInterface = (): DataTypeWorkerInterface => {
+  const workerInterface: DataTypeWorkerInterface = {};
+
+  Object.keys(dataTypeNodeData).forEach((dataType) => {
+    workerInterface[dataType] = {
+      context: 'node',
+      send: (payload: DTGenerationData): DTGenerateResult => {
+        // this extends whatever settings the user supplied with the default values defined by the Data Type,
+        // so the data passed to the DT's generate method is complete
+        const fullPayload = {
+          ...payload,
+          rowState: {
+            ...dataTypeNodeData[dataType as DataType].defaultGenerationOptions,
+            ...payload.rowState
+          }
+        };
+        return dataTypeNodeData[dataType as DataType].generate(fullPayload, workerUtils);
+      }
+    };
+  });
+
+  return workerInterface;
+};
+
+const getExportTypeWorkerInterface = (exportType: ExportType) => {
+  return {
+    context: 'node',
+    send: (payload: any) => {
+      // this extends whatever settings the user supplied with the default values defined by the Data Type,
+      // so the data passed to the DT's generate method is complete
+      const fullPayload = {
+        ...payload,
+        // TODO note name difference with DTs
+        settings: {
+          ...exportTypeNodeData[exportType].defaultGenerationOptions,
+          ...payload.settings
+        }
+      };
+      return exportTypeNodeData[exportType].generate(fullPayload, workerUtils);
+    }
+  };
+};
diff --git a/packages/cli/src/utils/__tests__/bin.test.ts b/packages/cli/src/utils/__tests__/bin.test.ts
new file mode 100644
index 000000000..f73db8c30
--- /dev/null
+++ b/packages/cli/src/utils/__tests__/bin.test.ts
@@ -0,0 +1,57 @@
+import { getConfigFile, msgs } from '../bin';
+
+const stubExit = () => {};
+
+describe('getConfigFile', () => {
+  describe('--config param error states', () => {
+    const error = console.error;
+
+    beforeEach(() => {
+      console.error = jest.fn();
+    });
+
+    afterAll(() => {
+      console.error = error;
+    });
+
+    it('logs an error when --config param missing', () => {
+      getConfigFile({}, stubExit);
+      expect(console.error).toHaveBeenCalledWith(msgs.missingConfigArg);
+    });
+
+    it('logs an error when --config param value is not a valid JSON file', () => {
+      getConfigFile(
+        {
+          config: 'config.xml'
+        },
+        stubExit
+      );
+      expect(console.error).toHaveBeenCalledWith(msgs.invalidConfigFileFormat);
+    });
+
+    it('logs an error when --config param value is set properly but file does not exist', () => {
+      getConfigFile(
+        {
+          config: '__tests__/invalid-config.json'
+        },
+        stubExit
+      );
+      expect(console.error).toHaveBeenCalledWith(msgs.invalidConfigFileContent);
+    });
+  });
+
+  describe('returns the config file content ', () => {
+    it('logs an error when --config param missing', () => {
+      const configFile = getConfigFile(
+        {
+          config: '__tests__/valid-config.json'
+        },
+        stubExit
+      );
+
+      expect(configFile).toEqual({ valid: true });
+    });
+  });
+});
+
+describe('getConfigFile', () => {});
diff --git a/packages/cli/src/utils/__tests__/invalid-config.json b/packages/cli/src/utils/__tests__/invalid-config.json
new file mode 100644
index 000000000..4011c990b
--- /dev/null
+++ b/packages/cli/src/utils/__tests__/invalid-config.json
@@ -0,0 +1 @@
+Not a JSON file! This will throw an error when passed (used in test).
diff --git a/packages/cli/src/utils/__tests__/valid-config.json b/packages/cli/src/utils/__tests__/valid-config.json
new file mode 100644
index 000000000..39be44763
--- /dev/null
+++ b/packages/cli/src/utils/__tests__/valid-config.json
@@ -0,0 +1,3 @@
+{
+  "valid": true
+}
diff --git a/packages/cli/src/utils/bin.ts b/packages/cli/src/utils/bin.ts
new file mode 100644
index 000000000..c18a68c23
--- /dev/null
+++ b/packages/cli/src/utils/bin.ts
@@ -0,0 +1,100 @@
+/**
+ * Utility methods for the command line binary.
+ */
+import path from 'path';
+import fs from 'fs';
+import { GDTemplate } from '~types/generator';
+import { GDLocale } from '~types/general';
+
+type BinCommandArgs = {
+  config?: string;
+  numResults?: string;
+  locale?: string;
+  stripWhitespace?: string;
+};
+
+export const msgs = {
+  missingConfigArg: 'Missing --config argument.',
+  invalidConfigFileFormat: 'Invalid configuration file. Please supply a path to a .json file',
+  configFileNotFound: 'Unable to find configuration file at this location: ',
+  invalidConfigFileContent: "Unable to read configuration file. Please check it's a valid JSON file.",
+  invalidNumResultsArg: 'Invalid --numResults value. Please pass a numeric value > 0',
+  invalidLocale: 'Invalid locale. Please enter one of the following values: ',
+  invalidStripWhitespace: 'Please only enter a true or false value for the --stripWhitespace argument.'
+};
+
+export const getConfigFile = (args: BinCommandArgs, exit: any): GDTemplate | undefined => {
+  // check for required --config parameter
+  if (!args.config) {
+    console.error(msgs.missingConfigArg);
+    exit(1);
+    return;
+  }
+
+  // check it's a JSON file
+  if (!/.json$/.test(args.config || '')) {
+    console.error(msgs.invalidConfigFileFormat);
+    exit(1);
+    return;
+  }
+
+  // check the file exists
+  const configFile = path.resolve(__dirname, args.config || '');
+  if (!fs.existsSync(configFile)) {
+    console.error(msgs.configFileNotFound, configFile);
+    exit(1);
+    return;
+  }
+
+  let configFileContent: GDTemplate;
+  try {
+    configFileContent = require(configFile);
+  } catch (e) {
+    console.error(msgs.invalidConfigFileContent);
+    exit(1);
+    return;
+  }
+
+  return configFileContent;
+};
+
+export const applyAndValidateCommandLineArgs = (args: BinCommandArgs, configFileContent: GDTemplate, exit: any) => {
+  // users can override any of the options in the generationSettings section of the template by passing them as query params
+  const generationSettings = {
+    target: 'file',
+    ...configFileContent.generationSettings
+  };
+
+  if (args.numResults) {
+    if (!/^\d+$/.test(args.numResults || '')) {
+      console.error(msgs.invalidNumResultsArg);
+      exit(1);
+      return;
+    }
+    generationSettings.numResults = parseInt(args.numResults, 10);
+  }
+
+  if (args.locale) {
+    if (args.locale.indexOf(args.locale) === -1) {
+      console.error(msgs.invalidLocale, args.locale);
+      exit(1);
+      return;
+    }
+    generationSettings.locale = args.locale as GDLocale;
+  }
+
+  if (args.stripWhitespace) {
+    if (args.stripWhitespace !== 'true' && args.stripWhitespace !== 'false') {
+      console.error(msgs.invalidStripWhitespace);
+      exit(1);
+      return;
+    }
+    generationSettings.stripWhitespace = args.stripWhitespace === 'true';
+  }
+
+  // // the default behaviour for the ppm package is for the generate method to return the generated data. This option
+  // // lets users generate a file instead. It's far better for larger data sets
+  // filename?: string; // the filename to generate including relative path
+
+  return generationSettings;
+};
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
new file mode 100644
index 000000000..86ff0ed4a
--- /dev/null
+++ b/packages/cli/tsconfig.json
@@ -0,0 +1,30 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"lib": ["es6"],
+		"types": ["node", "jest"],
+		"outDir": "./dist",
+		"esModuleInterop": true,
+		"noImplicitAny": true,
+		"noImplicitThis": true,
+		"strictNullChecks": true,
+		"moduleResolution": "node",
+		"resolveJsonModule": true,
+		"declaration": true,
+		"target": "es2019",
+		"allowSyntheticDefaultImports": true,
+		"removeComments": true,
+		"baseUrl": "../../",
+		"jsx": "react",
+		"importsNotUsedAsValues": "remove",
+		"skipLibCheck": true,
+		"paths": {
+			"~components/*": ["client/src/components/*"],
+			"~utils/*": ["client/src/utils/*"],
+			"~store/*": ["client/src/core/store/*"],
+			"~core/*": ["client/src/core/*"],
+			"~types/*": ["client/types/*"]
+		}
+	},
+	"exclude": ["node_modules", "typings"]
+}
diff --git a/packages/config/.gitignore b/packages/config/.gitignore
new file mode 100644
index 000000000..1f1d44af4
--- /dev/null
+++ b/packages/config/.gitignore
@@ -0,0 +1,7 @@
+# these 2 files are created by the user and should never be checked in
+src/client.config.ts
+src/server.config.ts
+
+# standard folders to ignore
+node_modules/*
+dist/*
\ No newline at end of file
diff --git a/packages/config/README.md b/packages/config/README.md
new file mode 100644
index 000000000..30b65731a
--- /dev/null
+++ b/packages/config/README.md
@@ -0,0 +1,147 @@
+## @generatedata/config
+
+This is the configuration package for the generatedata script. When initially cloning the repo to use locally, you'll need
+to create a couple of config files containing the settings you want.
+
+## How to configure
+
+Make a copy of these two files in the `src/` folder and rename them to remove the "example" part, so:
+
+- `client.config.example.ts` ---> `client.config.ts`
+- `server.config.example.ts` ---> `server.config.ts`
+
+These contain the server- and the client-side settings for your installation. They are separate because the `client.config.ts` content **will be bundled in the front-end code** so aren't secure. The `server.config.ts` file content is only loaded by the server and won't be visible to your website visitors in any form.
+
+After you create those two files you'll be able to continue building the app. But before you do - please read over the settings to check it's configuring your application as you'd like. _Most settings can be changed later - you'll just need to do a fresh build_.
+
+### Client-side settings
+
+Alright! Let's look at the content of your newly created `client.config.ts` file. We've explained each setting with a comment.
+
+**Note: you don't need to edit any of these values** but you'll probably want to examine them all to see if there's anything you want changed. Also note that the `GD_APP_TYPE` setting is a _one off_. It's used during the initial installation to set up the database, then not afterwards.
+
+```typescript
+import type { GDClientConfig } from '../typings';
+
+const config: GDClientConfig = {
+  appSettings: {
+    // this setting controls the overall type of the installation. It's used on initial installation only. The options are:
+    //    login - allows anonymous access via the browser, but unless the user has logged in they can't save their data sets
+    //            or generate more rows than GD_MAX_DEMO_MODE_ROWS at a time
+    //    single - there's only ever a single account and that user is logged in by default
+    //    open - anyone that has access to the URL can use the application anonymously or create an account
+    //    closed - no-one can access it without logging in first
+    GD_APP_TYPE: 'login',
+
+    // this allows easy extension for the prod site. On the prod site, the homepage is a splash info page to the tool. For
+    // other distributions, that isn't necessary
+    GD_GENERATOR_PATH: '/',
+
+    // the default locale for people visiting the app
+    GD_DEFAULT_LOCALE: 'en',
+
+    // the default Export Type that's show in the preview panel. The accepted values are any of the folder names of the
+    // available Export Types. See the packages/plugins package for that.
+    GD_DEFAULT_EXPORT_TYPE: 'JSON',
+
+    // this controls what locales show up in the UI. If you only enter 1, the icon to switch locales won't appear. If you
+    // want to add other locales, awesome! PRs welcome :)
+    GD_LOCALES: ['ar', 'de', 'en', 'es', 'fr', 'hi', 'ja', 'nl', 'pt', 'ru', 'ta', 'zh'],
+
+    // the default value for the number of rows to generate
+    GD_DEFAULT_NUM_ROWS: 100,
+
+    // for `login` appType, this controls how many rows can be generated by anonymous (non-logged in) users
+    GD_MAX_DEMO_MODE_ROWS: 1000,
+
+    // any time a user saves a dataset, that change is stored in the database to allow the user to backtrack and see
+    // earlier versions of the dataset. This governs the max number of history items
+    GD_MAX_DATASET_HISTORY_SIZE: 200,
+
+    // this omits specific Data Types from the application. It omits them from appearing in the UI.
+    GD_DATA_TYPE_BLACKLIST: ['BitcoinAddress', 'OrganizationNumber', 'PersonalNumber', 'SIRET'],
+
+    // this omits specific Export Types from the application. It omits them from appearing in the UI.
+    GD_EXPORT_TYPE_BLACKLIST: [],
+
+    // omits specific Country plugins from appearing in the application; comma-delimited (no spaces!)
+    GD_COUNTRY_BLACKLIST: [],
+
+    // used for extension purposes only. TODO
+    GD_IMPORT_FILES: []
+  },
+
+  auth: {
+    // controls the lifespan of the JWT. Suggest you leave this setting alone
+    GD_JWT_LIFESPAN_MINS: 15,
+
+    // if you want to enable the "Login with Google" feature, this contains the google auth client ID
+    GD_GOOGLE_AUTH_CLIENT_ID: ''
+  },
+
+  api: {
+    // the server port for the graphql server
+    GD_API_SERVER_PORT: 3001
+  },
+
+  webServer: {
+    // controls the URL you'll load up in the browser to see the app
+    GD_WEB_DOMAIN: 'localhost',
+
+    // the webserver port
+    GD_WEB_SERVER_PORT: 9000,
+
+    // https vs http. Runnign `https` locally is always fussy as heck, so leave as false unless strictly necessary
+    GD_WEB_USE_HTTPS: false
+  }
+};
+
+export default config;
+```
+
+### Server-side settings
+
+```typescript
+import type { GDServerConfig } from '../typings';
+
+const serverConfig: GDServerConfig = {
+  auth: {
+    // PLEASE UPDATE. JWT secret. This is used for the JWT generation code. It should be changed to any random string
+    GD_JWT_SECRET: 'Change this string to anything you like.',
+
+    // PLEASE UPDATE. Any random string is fine
+    GD_JWT_REFRESH_TOKEN_SECRET: 'Also change this string to something else.',
+
+    // (optional) Sign-in with Google settings for - oath2. This requires `GD_GOOGLE_AUTH_CLIENT_ID` to have been set in the
+    // client.config.ts file
+    GD_GOOGLE_AUTH_CLIENT_SECRET: ''
+  },
+
+  // (optional) this gives you the optional of tying in email functionality, to enable features like emailing for lost passwords,
+  // registering and so on
+  email: {
+    GD_EMAIL_OAUTH_SERVICE_CLIENT_ID: '',
+    GD_EMAIL_OAUTH_PRIVATE_KEY: ''
+  },
+
+  // You can either set these values before installing the app, or customize the values via the UI
+  // afterwards. This information is only used during the initial setup of the application
+  defaultAdminAccount: {
+    GD_DEFAULT_ADMIN_FIRST_NAME: 'John',
+    GD_DEFAULT_ADMIN_LAST_NAME: 'Smith',
+    GD_DEFAULT_ADMIN_EMAIL_SENDER_NAME: 'YourSite',
+    GD_DEFAULT_ADMIN_EMAIL: 'admin@youremail.net',
+    GD_DEFAULT_ADMIN_PASSWORD: 'admin123'
+  }
+};
+
+export default serverConfig;
+```
+
+## TODO
+
+Needs more documentation on:
+
+- what JWT is
+- setting up the email configuration,
+- setting up a sign-in with Google
diff --git a/packages/config/package.json b/packages/config/package.json
new file mode 100644
index 000000000..c961cbacb
--- /dev/null
+++ b/packages/config/package.json
@@ -0,0 +1,33 @@
+{
+	"name": "@generatedata/config",
+	"version": "1.0.0",
+	"description": "This package contains the settings for your generatedata installation.",
+	"scripts": {
+		"tsc": "tsc",
+		"build": "run-s confirm-setup tsc",
+		"confirm-setup": "node ./scripts/confirm-setup.js"
+	},
+	"devDependencies": {
+		"@types/node": "^20.19.11",
+		"npm-run-all": "^4.1.5",
+		"typescript": "5.9.2"
+	},
+	"exports": {
+		".": {
+			"default": "./dist/index.js",
+			"types": "./dist/index.d.ts"
+		},
+		"./constants": {
+			"default": "./dist/constants.js",
+			"types": "./dist/constants.d.ts"
+		},
+		"./clientConfig": {
+			"default": "./dist/client.config.js",
+			"types": "./dist/client.config.d.ts"
+		},
+		"./serverConfig": {
+			"default": "./dist/server.config.js",
+			"types": "./dist/server.config.d.ts"
+		}
+	}
+}
diff --git a/packages/config/scripts/confirm-setup.js b/packages/config/scripts/confirm-setup.js
new file mode 100644
index 000000000..446ff41ac
--- /dev/null
+++ b/packages/config/scripts/confirm-setup.js
@@ -0,0 +1,23 @@
+/**
+ * This is the base configuration package used by the rest of the application and must be configured first in order
+ * to build the application. See the instructions in this package's README on how to get set up.
+ *
+ * This script runs during the build command to verify that they've set up the config files. If not, it'll halt the build
+ * process and output a message telling them what do do.
+ */
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+if (
+  !fs.existsSync(path.resolve(__dirname, '../src/client.config.ts')) ||
+  !fs.existsSync(path.resolve(__dirname, '../src/server.config.ts'))
+) {
+  console.error(
+    'Build cancelled! Please create the two configuration files in order to proceed. See here for the documentation:\nhttps://github.com/benkeen/generatedata/tree/master/packages/config\n'
+  );
+  process.exit(1);
+}
diff --git a/packages/config/src/client.config.example.ts b/packages/config/src/client.config.example.ts
new file mode 100644
index 000000000..3b008d156
--- /dev/null
+++ b/packages/config/src/client.config.example.ts
@@ -0,0 +1,76 @@
+import type { GDClientConfig } from '../typings';
+
+const config: GDClientConfig = {
+  appSettings: {
+    // this setting controls the overall type of the installation. It's used on initial installation only. The options are:
+    //    login - allows anonymous access via the browser, but unless the user has logged in they can't save their data sets
+    //            or generate more rows than GD_MAX_DEMO_MODE_ROWS at a time
+    //    single - there's only ever a single account and that user is logged in by default
+    //    open - anyone that has access to the URL can use the application anonymously or create an account
+    //    closed - no-one can access it without logging in first
+    GD_APP_TYPE: 'login',
+
+    // this allows easy extension for the prod site. On the prod site, the homepage is a splash info page to the tool. For
+    // other distributions, that isn't necessary
+    GD_GENERATOR_PATH: '/',
+
+    // the default locale for people visiting the app
+    GD_DEFAULT_LOCALE: 'en',
+
+    // the default Export Type that's show in the preview panel. The accepted values are any of the folder names of the
+    // available Export Types. See the packages/plugins package for that.
+    GD_DEFAULT_EXPORT_TYPE: 'JSON',
+
+    // this controls what locales show up in the UI. If you only enter 1, the icon to switch locales won't appear. If you
+    // want to add other locales, awesome! PRs welcome :)
+    GD_LOCALES: ['ar', 'de', 'en', 'es', 'fr', 'hi', 'ja', 'nl', 'pt', 'ru', 'ta', 'zh'],
+
+    // the default value for the number of rows to generate
+    GD_DEFAULT_NUM_ROWS: 100,
+
+    // for `login` appType, this controls how many rows can be generated by anonymous (non-logged in) users
+    GD_MAX_DEMO_MODE_ROWS: 1000,
+
+    // any time a user saves a dataset, that change is stored in the database to allow the user to backtrack and see
+    // earlier versions of the dataset. This governs the max number of history items
+    GD_MAX_DATASET_HISTORY_SIZE: 200,
+
+    // this omits specific Data Types from the application. It omits them from appearing in the UI.
+    GD_DATA_TYPE_BLACKLIST: ['BitcoinAddress', 'OrganizationNumber', 'PersonalNumber', 'SIRET'],
+
+    // this omits specific Export Types from the application. It omits them from appearing in the UI.
+    GD_EXPORT_TYPE_BLACKLIST: [],
+
+    // omits specific Country plugins from appearing in the application; comma-delimited (no spaces!)
+    GD_COUNTRY_BLACKLIST: [],
+
+    // used for extension purposes only. TODO
+    GD_IMPORT_FILES: []
+  },
+
+  auth: {
+    // controls the lifespan of the JWT. Suggest you leave this setting alone
+    GD_JWT_LIFESPAN_MINS: 15,
+
+    // if you want to enable the "Login with Google" feature, this contains the google auth client ID
+    GD_GOOGLE_AUTH_CLIENT_ID: ''
+  },
+
+  api: {
+    // the server port for the graphql server
+    GD_API_SERVER_PORT: 3001
+  },
+
+  webServer: {
+    // controls the URL you'll load up in the browser to see the app
+    GD_WEB_DOMAIN: 'localhost',
+
+    // the webserver port
+    GD_WEB_SERVER_PORT: 9000,
+
+    // https vs http. Runnign `https` locally is always fussy as heck, so leave as false unless strictly necessary
+    GD_WEB_USE_HTTPS: false
+  }
+};
+
+export default config;
diff --git a/packages/config/src/constants.ts b/packages/config/src/constants.ts
new file mode 100644
index 000000000..38a590292
--- /dev/null
+++ b/packages/config/src/constants.ts
@@ -0,0 +1,80 @@
+const constants = {
+  // any time we roll out backward incompatible redux structure changes, this number should be bumped. It causes
+  // anyone's setup to automatically reset & forget any previous saved redux store structure so there aren't
+  // incompatibility problems with the latest code
+  APP_STATE_VERSION: 8,
+
+  // the number of default empty rows that appear in the generator
+  NUM_DEFAULT_ROWS: 4,
+
+  GITHUB_URL: 'https://github.com/benkeen/generatedata',
+  CHANGELOG_URL: 'https://github.com/benkeen/generatedata/blob/master/CHANGELOG.md',
+
+  // these map to the GD_APP_TYPE type. They're the different available configurations for this GD installation
+  APP_TYPES: {
+    LOGIN: 'login',
+    SINGLE: 'single',
+    OPEN: 'open',
+    CLOSED: 'closed'
+  },
+
+  THEMES: [
+    { value: 'ambiance', label: 'Ambiance' },
+    { value: 'bespin', label: 'Bespin' },
+    { value: 'cobalt', label: 'Cobalt' },
+    { value: 'darcula', label: 'Darcula' },
+    { value: 'lucario', label: 'Lucario' }
+  ],
+
+  GD_ALL_SUPPORTED_LOCALES: {
+    ar: 'عربى',
+    de: 'Deutsch',
+    en: 'English',
+    es: 'Español',
+    fr: 'Français',
+    hi: 'हिंदी',
+    ja: '日本人',
+    nl: 'Nederlands',
+    pt: 'Português',
+    ru: 'Русский',
+    ta: 'தமிழ்',
+    zh: '中文'
+  },
+
+  MIN_PREVIEW_ROWS: 5,
+  MAX_PREVIEW_ROWS: 20,
+  HEADER_HEIGHT: 66,
+  FOOTER_HEIGHT: 66,
+  SMALL_SCREEN_WIDTH: 720,
+  GENERATION_BATCH_SIZE: 50,
+  SMALL_GENERATION_COUNT: 1000,
+  SMALL_GENERATION_COUNT_WITH_GRAPH: 5000,
+
+  GRAPH_RANGES: {
+    RANGE1: 5000,
+    RANGE2: 10000,
+    RANGE3: 100000
+  },
+
+  GRID: {
+    SMALL_BREAKPOINT: 650,
+    MEDIUM_BREAKPOINT: 780
+  },
+
+  ZINDEXES: {
+    DRAWER: 1300,
+    DIALOG: 5005
+  },
+
+  DATA_TYPE_GROUPS: ['humanData', 'geo', 'text', 'numeric', 'other', 'financial', 'countrySpecific'],
+
+  EXPORT_TYPE_GROUPS: ['core', 'programmingLanguage'],
+
+  CONTINENTS: ['africa', 'asia', 'centralAmerica', 'europe', 'northAmerica', 'oceania', 'southAmerica'],
+
+  DATE_FORMAT: 'MMM d, y',
+  DATETIME_FORMAT: 'MMM d, y h:mm a',
+  TIME_FORMAT: 'h:mm a'
+};
+
+export default constants;
diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts
new file mode 100644
index 000000000..5a0b31bf8
--- /dev/null
+++ b/packages/config/src/index.ts
@@ -0,0 +1,4 @@
+// these will be invalid until the files have been created, but the `build` command will check they exist before attempting a tsc build. See the README.
+export { default as clientConfig } from './client.config';
+export { default as serverConfig } from './server.config';
+export { default as constants } from './constants';
diff --git a/packages/config/src/server.config.example.ts b/packages/config/src/server.config.example.ts
new file mode 100644
index 000000000..cb4b73994
--- /dev/null
+++ b/packages/config/src/server.config.example.ts
@@ -0,0 +1,34 @@
+import type { GDServerConfig } from '../typings';
+
+const serverConfig: GDServerConfig = {
+  auth: {
+    // PLEASE UPDATE. JWT secret. This is used for the JWT generation code. It should be changed to any random string
+    GD_JWT_SECRET: 'Change this string to anything you like.',
+
+    // PLEASE UPDATE. Any random string is fine
+    GD_JWT_REFRESH_TOKEN_SECRET: 'Also change this string to something else.',
+
+    // (optional) Sign-in with Google settings for - oath2. This requires `GD_GOOGLE_AUTH_CLIENT_ID` to have been set in the
+    // client.config.ts file
+    GD_GOOGLE_AUTH_CLIENT_SECRET: ''
+  },
+
+  // (optional) this gives you the optional of tying in email functionality, to enable features like emailing for lost passwords,
+  // registering and so on
+  email: {
+    GD_EMAIL_OAUTH_SERVICE_CLIENT_ID: '',
+    GD_EMAIL_OAUTH_PRIVATE_KEY: ''
+  },
+
+  // You can either set these values before installing the app, or customize the values via the UI
+  // afterwards. This information is only used during the initial setup of the application
+  defaultAdminAccount: {
+    GD_DEFAULT_ADMIN_FIRST_NAME: 'John',
+    GD_DEFAULT_ADMIN_LAST_NAME: 'Smith',
+    GD_DEFAULT_ADMIN_EMAIL_SENDER_NAME: 'YourSite',
+    GD_DEFAULT_ADMIN_EMAIL: 'admin@youremail.net',
+    GD_DEFAULT_ADMIN_PASSWORD: 'admin123'
+  }
+};
+
+export default serverConfig;
diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json
new file mode 100644
index 000000000..a7caad4e0
--- /dev/null
+++ b/packages/config/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./dist",
+    "target": "esnext",
+    "module": "es6",
+    "moduleResolution": "node",
+    "declaration": true,
+    "skipLibCheck": true,
+    "jsx": "react-jsx"
+  },
+  "include": ["src/*.ts", "./typings"],
+  "exclude": ["node_modules"]
+}
diff --git a/packages/config/typings/index.d.ts b/packages/config/typings/index.d.ts
new file mode 100644
index 000000000..12992f0bf
--- /dev/null
+++ b/packages/config/typings/index.d.ts
@@ -0,0 +1,55 @@
+export type AppType = 'login' | 'open' | 'closed' | 'prod';
+
+export type GDLocale = 'ar' | 'de' | 'en' | 'es' | 'es' | 'fr' | 'hi' | 'ja' | 'nl' | 'pt' | 'ru' | 'ta' | 'zh';
+
+export type GDLocaleMap = {
+  [locale in GDLocale]: string;
+};
+
+export type GDClientConfig = {
+  api: {
+    GD_API_SERVER_PORT: number;
+  };
+  webServer: {
+    GD_WEB_DOMAIN: string;
+    GD_WEB_SERVER_PORT: number;
+    GD_WEB_USE_HTTPS: boolean;
+  };
+  auth: {
+    GD_JWT_LIFESPAN_MINS: number;
+    GD_GOOGLE_AUTH_CLIENT_ID: string;
+  };
+  appSettings: {
+    GD_APP_TYPE: AppType;
+    GD_GENERATOR_PATH: string;
+    GD_DEFAULT_LOCALE: GDLocale;
+    GD_DEFAULT_EXPORT_TYPE: string;
+    GD_LOCALES: GDLocale[];
+    GD_DEFAULT_NUM_ROWS: number;
+    GD_MAX_DEMO_MODE_ROWS: number;
+    GD_MAX_DATASET_HISTORY_SIZE: number;
+    GD_DATA_TYPE_BLACKLIST: string[];
+    GD_EXPORT_TYPE_BLACKLIST: string[];
+    GD_COUNTRY_BLACKLIST: string[];
+    GD_IMPORT_FILES: string[];
+  };
+};
+
+export type GDServerConfig = {
+  email: {
+    GD_EMAIL_OAUTH_SERVICE_CLIENT_ID: string;
+    GD_EMAIL_OAUTH_PRIVATE_KEY: string;
+  };
+  auth: {
+    GD_JWT_SECRET: string;
+    GD_JWT_REFRESH_TOKEN_SECRET: string;
+    GD_GOOGLE_AUTH_CLIENT_SECRET: string;
+  };
+  defaultAdminAccount: {
+    GD_DEFAULT_ADMIN_FIRST_NAME: string;
+    GD_DEFAULT_ADMIN_LAST_NAME: string;
+    GD_DEFAULT_ADMIN_EMAIL_SENDER_NAME: string;
+    GD_DEFAULT_ADMIN_EMAIL: string;
+    GD_DEFAULT_ADMIN_PASSWORD: string;
+  };
+};
diff --git a/packages/plugins/.gitignore b/packages/plugins/.gitignore
new file mode 100644
index 000000000..276ba9b59
--- /dev/null
+++ b/packages/plugins/.gitignore
@@ -0,0 +1,2 @@
+node_modules/*
+dist/
\ No newline at end of file
diff --git a/packages/plugins/README.md b/packages/plugins/README.md
new file mode 100644
index 000000000..7e22e29fb
--- /dev/null
+++ b/packages/plugins/README.md
@@ -0,0 +1,12 @@
+# [Docs](../../../docs/README.md) &raquo; Plugins
+
+The generatedata script is an _engine_ to let you generate different sorts of data. It can be extended via plugins
+to let you generate precisely whatever data you want, in whatever format you want.
+
+This folder contains the three types of plugins available. A lot of the documentation in this section is to explain how
+to configure the plugins for use by the CLI, and what options are available for each. For normal use, you'd see all this
+information via the generatedata UI.
+
+- [Data Types](./dataTypes/README.md) - types of data that can be generated (e.g. names, phone numbers, email addresses)
+- [Export Types](./exportTypes/README.md) - the format of the generate data (e.g. JSON, CSV, XML, SQL)
+- [Countries](./countries/README.md) - country-specific data to improve how realistic the regional data looks
diff --git a/packages/plugins/node_modules/@generatedata/types b/packages/plugins/node_modules/@generatedata/types
new file mode 120000
index 000000000..97c1f80bc
--- /dev/null
+++ b/packages/plugins/node_modules/@generatedata/types
@@ -0,0 +1 @@
+../../../types
\ No newline at end of file
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
new file mode 100644
index 000000000..757e1e598
--- /dev/null
+++ b/packages/plugins/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "@generatedata/plugins",
+  "version": "1.0.0",
+  "description": "generatedata.com plugins",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "scripts": {
+    "tsc": "tsc",
+    "build": "run-s tsc copy-i18n-files",
+    "copy-i18n-files": "copyfiles -u 1 ./src/*/*/i18n/*.json dist"
+  },
+  "dependencies": {
+    "@mui/material": "^7.3.1",
+    "@mui/icons-material": "^7.3.1",
+    "@mui/lab": "^7.0.0-beta.16",
+    "date-fns": "^2.17.0",
+    "react": "^19.1.1"
+  },
+  "devDependencies": {
+    "@generatedata/types": "workspace:*",
+    "@generatedata/config": "workspace:*",
+    "@generatedata/utils": "workspace:*",
+    "@testing-library/react": "^10.4.7",
+    "copyfiles": "2.4.1",
+    "jest": "^29.4.3",
+    "npm-run-all": "^4.1.5",
+    "typescript": "^5.7.3"
+  }
+}
diff --git a/packages/plugins/src/countries/Australia/bundle.ts b/packages/plugins/src/countries/Australia/bundle.ts
new file mode 100644
index 000000000..a1b659137
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/bundle.ts
@@ -0,0 +1,164 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Australia: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'australia',
+  regionNames: i18n.regionNames,
+  continent: 'oceania',
+  extendedData: {
+    zipFormat: {
+      format: 'Xxxx'
+    },
+    phoneFormat: {
+      displayFormats: ['Xxxx-xxxx', '(0x) xxxx xxxx', '04xx xxx xxx']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Australian Capital Territory',
+      regionShort: 'ACT',
+      regionSlug: 'australian_capital_territories',
+      weight: 3,
+      cities: ['Canberra']
+    },
+    {
+      regionName: 'New South Wales',
+      regionShort: 'NSW',
+      regionSlug: 'new_south_wales',
+      weight: 69,
+      cities: [
+        'Sydney',
+        'Albury',
+        'Armidale',
+        'Bathurst',
+        'Blue Mountains',
+        'Broken Hill',
+        'Campbelltown',
+        'Cessnock',
+        'Dubbo',
+        'Goulburn',
+        'Grafton',
+        'Lithgow',
+        'Liverpool',
+        'Newcastle',
+        'Orange',
+        'Parramatta',
+        'Penrith',
+        'Queanbeyan',
+        'Tamworth',
+        'Wagga Wagga',
+        'Wollongong'
+      ]
+    },
+    {
+      regionName: 'Northern Territory',
+      regionShort: 'NT',
+      regionSlug: 'northern_territory',
+      weight: 2,
+      cities: ['Darwin', 'Palmerston']
+    },
+    {
+      regionName: 'Queensland',
+      regionShort: 'QLD',
+      regionSlug: 'queensland',
+      weight: 42,
+      cities: [
+        'Brisbane',
+        'Bundaberg',
+        'Cairns',
+        'Caloundra',
+        'Charters Towers',
+        'Gladstone',
+        'Gold Coast',
+        'Hervey Bay',
+        'Ipswich',
+        'Logan City',
+        'Mackay',
+        'Maryborough',
+        'Mount Isa',
+        'Redcliffe',
+        'Redlands',
+        'Rockhampton',
+        'Toowoomba',
+        'Townsville'
+      ]
+    },
+    {
+      regionName: 'South Australia',
+      regionShort: 'SA',
+      regionSlug: 'south_australia',
+      weight: 16,
+      cities: ['Adelaide', 'Mount Gambier', 'Murray Bridge', 'Port Augusta', 'Port Pirie', 'Port Lincoln', 'Victor Harbor', 'Whyalla']
+    },
+    {
+      regionName: 'Tasmania',
+      regionShort: 'TAS',
+      regionSlug: 'tasmania',
+      weight: 5,
+      cities: ['Greater Hobart', 'Burnie', 'Devonport', 'Launceston']
+    },
+    {
+      regionName: 'Victoria',
+      regionShort: 'VIC',
+      regionSlug: 'victoria',
+      weight: 52,
+      cities: [
+        'Melbourne',
+        'Ararat',
+        'Bairnsdale',
+        'Benalla',
+        'Ballarat',
+        'Bendigo',
+        'Belgrave',
+        'Dandenong',
+        'Frankston',
+        'Geelong',
+        'Hamilton',
+        'Horsham',
+        'Melton',
+        'Moe',
+        'Morwell',
+        'Mildura',
+        'Sale',
+        'Shepparton',
+        'Swan Hill',
+        'Traralgon',
+        'Wangaratta',
+        'Warrnambool',
+        'Wodonga'
+      ]
+    },
+    {
+      regionName: 'Western Australia',
+      regionShort: 'WA',
+      regionSlug: 'western_australia',
+      weight: 21,
+      cities: [
+        'Perth',
+        'Albany',
+        'Armadale',
+        'Bayswater',
+        'Belmont',
+        'Bunbury',
+        'Canning',
+        'Cockburn',
+        'Fremantle',
+        'Geraldton-Greenough',
+        'Gosnells',
+        'Joondalup',
+        'Kalgoorlie-Boulder',
+        'Mandurah',
+        'Melville',
+        'Nedlands',
+        'Rockingham',
+        'South Perth',
+        'Stirling',
+        'Subiaco',
+        'Swan',
+        'Wanneroo'
+      ]
+    }
+  ]
+});
+
+export default Australia;
diff --git a/packages/plugins/src/countries/Australia/i18n/ar.json b/packages/plugins/src/countries/Australia/i18n/ar.json
new file mode 100644
index 000000000..ed129df9e
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "أستراليا",
+    "regionNames": "أستراليا الولايات / الأقاليم"
+}
diff --git a/packages/plugins/src/countries/Australia/i18n/de.json b/packages/plugins/src/countries/Australia/i18n/de.json
new file mode 100644
index 000000000..467a26bac
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/de.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Australien",
+    "regionNames": "Australische Staaten/Territorien"
+}
diff --git a/packages/plugins/src/countries/Australia/i18n/en.json b/packages/plugins/src/countries/Australia/i18n/en.json
new file mode 100644
index 000000000..1ce08f4a2
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/en.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Australia",
+    "regionNames": "Australian St./Terr."
+}
diff --git a/packages/plugins/src/countries/Australia/i18n/es.json b/packages/plugins/src/countries/Australia/i18n/es.json
new file mode 100644
index 000000000..831f22aa1
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/es.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Australia",
+    "regionNames": "Estados/Territorios de Australia"
+}
diff --git a/packages/plugins/src/countries/Australia/i18n/fr.json b/packages/plugins/src/countries/Australia/i18n/fr.json
new file mode 100644
index 000000000..b4075bf7c
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Australie",
+  "regionNames": "États/Territoires australiens"
+}
diff --git a/packages/plugins/src/countries/Australia/i18n/hi.json b/packages/plugins/src/countries/Australia/i18n/hi.json
new file mode 100644
index 000000000..326b3ad42
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "ऑस्ट्रेलिया",
+    "regionNames": "ऑस्ट्रेलियाई राज्य/क्षेत्र"
+}
diff --git a/packages/plugins/src/countries/Australia/i18n/ja.json b/packages/plugins/src/countries/Australia/i18n/ja.json
new file mode 100644
index 000000000..00c3d4e8a
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "オーストラリア",
+    "regionNames": "オーストラリアの州/準州"
+}
diff --git a/packages/plugins/src/countries/Australia/i18n/nl.json b/packages/plugins/src/countries/Australia/i18n/nl.json
new file mode 100644
index 000000000..e8955774d
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Australië",
+    "regionNames": "Australische staten/gebieden"
+}
diff --git a/packages/plugins/src/countries/Australia/i18n/pt.json b/packages/plugins/src/countries/Australia/i18n/pt.json
new file mode 100644
index 000000000..7379dab19
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Austrália",
+    "regionNames": "Est. / ter. australianos"
+}
diff --git a/packages/plugins/src/countries/Australia/i18n/ru.json b/packages/plugins/src/countries/Australia/i18n/ru.json
new file mode 100644
index 000000000..1c7e0121d
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Австралия",
+    "regionNames": "Австралийская ул./терр."
+}
diff --git a/packages/plugins/src/countries/Australia/i18n/ta.json b/packages/plugins/src/countries/Australia/i18n/ta.json
new file mode 100644
index 000000000..99ced890e
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ஆஸ்திரேலியா",
+  "regionNames": "ஆஸ்திரேலிய மாநிலங்கள்/பிரதேசங்கள்"
+}
diff --git a/packages/plugins/src/countries/Australia/i18n/zh.json b/packages/plugins/src/countries/Australia/i18n/zh.json
new file mode 100644
index 000000000..a593603aa
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "澳大利亚",
+    "regionNames": "澳大利亚各州/地区"
+}
diff --git a/packages/plugins/src/countries/Australia/names.ts b/packages/plugins/src/countries/Australia/names.ts
new file mode 100644
index 000000000..cb283bafc
--- /dev/null
+++ b/packages/plugins/src/countries/Australia/names.ts
@@ -0,0 +1,15 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = ['Aaliyah', 'Abigail', 'Addison', 'Adeline', 'Alice', 'Amelia', 'Anna', 'Annabelle', 'Aria', 'Ariana', 'Audrey', 'Aurora', 'Ava', 'Ayla', 'Bella', 'Billie', 'Bonnie', 'Charlie', 'Charlotte', 'Chloe', 'Claire', 'Clara', 'Daisy', 'Delilah', 'Eden', 'Eleanor', 'Elena', 'Eliza', 'Elizabeth', 'Ella', 'Ellie', 'Eloise', 'Elsie', 'Emilia', 'Emily', 'Emma', 'Eva', 'Evelyn', 'Evie', 'Florence', 'Frankie', 'Freya', 'Georgia', 'Grace', 'Hallie', 'Hannah', 'Harlow', 'Harper', 'Harriet', 'Hazel', 'Imogen', 'Isabel', 'Isabella', 'Isabelle', 'Isla', 'Ivy', 'Jasmine', 'Lara', 'Layla', 'Lily', 'Lola', 'Lucy', 'Luna', 'Mackenzie', 'Maddison', 'Maeve', 'Maggie', 'Matilda', 'Maya', 'Mia', 'Mila', 'Millie', 'Molly', 'Olive', 'Olivia', 'Penelope', 'Peyton', 'Phoebe', 'Piper', 'Pippa', 'Poppy', 'Quinn', 'Remi', 'Rose', 'Rosie', 'Ruby', 'Sadie', 'Sarah', 'Savannah', 'Scarlett', 'Sienna', 'Sofia', 'Sophia', 'Sophie', 'Stella', 'Summer', 'Violet', 'Willow', 'Zara', 'Zoe'];
+
+const maleNames = ['Adam', 'Aiden', 'Alexander', 'Ali', 'Angus', 'Archer', 'Archie', 'Ari', 'Arlo', 'Arthur', 'Asher', 'Ashton', 'Austin', 'Beau', 'Benjamin', 'Billy', 'Bodhi', 'Caleb', 'Carter', 'Charles', 'Charlie', 'Connor', 'Cooper', 'Daniel', 'Darcy', 'Dylan', 'Edward', 'Eli', 'Elijah', 'Ethan', 'Ezra', 'Felix', 'Finn', 'Fletcher', 'Flynn', 'Gabriel', 'George', 'Hamish', 'Harrison', 'Harry', 'Harvey', 'Henry', 'Hudson', 'Hugo', 'Hunter', 'Isaac', 'Jack', 'Jackson', 'Jacob', 'James', 'Jasper', 'Jaxon', 'Jayden', 'Jordan', 'Joseph', 'Joshua', 'Jude', 'Kai', 'Lachlan', 'Lennox', 'Leo', 'Leon', 'Leonardo', 'Levi', 'Lewis', 'Liam', 'Lincoln', 'Logan', 'Louis', 'Luca', 'Lucas', 'Luka', 'Luke', 'Marcus', 'Mason', 'Matthew', 'Max', 'Michael', 'Muhammad', 'Noah', 'Oliver', 'Oscar', 'Owen', 'Parker', 'Patrick', 'Riley', 'River', 'Ryan', 'Ryder', 'Samuel', 'Sebastian', 'Sonny', 'Spencer', 'Theo', 'Theodore', 'Thomas', 'Vincent', 'William', 'Xavier', 'Zachary'];
+
+const lastNames = ['Adams', 'Allen', 'Anderson', 'Bailey', 'Baker', 'Bell', 'Bennett', 'Brown', 'Butler', 'Cameron', 'Campbell', 'Carter', 'Chapman', 'Clark', 'Clarke', 'Colling', 'Cook', 'Cooper', 'Cox', 'Davies', 'Davis', 'Edwards', 'Elliott', 'Ellis', 'Evans', 'Fisher', 'Gibson', 'Graham', 'Gray', 'Green', 'Hall', 'Hamilton', 'Harris', 'Harrison', 'Harvey', 'Hill', 'Hughes', 'Jackson', 'James', 'Johnson', 'Johnston', 'Jones', 'Kelly', 'Kennedy', 'King', 'Knight', 'Lee', 'Lewis', 'Marshall', 'Martin', 'Mason', 'Matthews', 'McDonald', 'Miller', 'Mills', 'Mitchell', 'Moore', 'Morgan', 'Morris', 'Murphy', 'Murray', 'Nguyen', "O'Brien", 'Parker', 'Pearce', 'Phillips', 'Price', 'Reid', 'Richards', 'Richardson', 'Roberts', 'Robertson', 'Robinson', 'Rogers', 'Ross', 'Russell', 'Ryan', 'Scott', 'Shaw', 'Simpson', 'Smith', 'Stevens', 'Stewart', 'Taylor', 'Thomas', 'Thompson', 'Thomson', 'Tran', 'Turner', 'Walker', 'Walsh', 'Ward', 'Watson', 'Webb', 'White', 'Williams', 'Wilson', 'Wood', 'Wright', 'Young'];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/Austria/bundle.ts b/packages/plugins/src/countries/Austria/bundle.ts
new file mode 100644
index 000000000..8490ba8ee
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/bundle.ts
@@ -0,0 +1,180 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Austria: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'austria',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      format: 'Xxxx'
+    }
+  },
+  regions: [
+    {
+      regionName: 'Vienna',
+      regionShort: 'Wien',
+      regionSlug: 'vienna',
+      weight: 4113,
+      cities: ['Vienna']
+    },
+    {
+      regionName: 'Vorarlberg',
+      regionShort: 'Vbg.',
+      regionSlug: 'voralberg',
+      weight: 142,
+      cities: [
+        'Dornbirn',
+        'Feldkirch',
+        'Bregenz',
+        'Lustenau',
+        'Hohenems',
+        'Bludenz',
+        'Hard',
+        'Rankweil',
+        'Götzis',
+        'Lauterach',
+        'Wolfurt',
+        'Höchst',
+        'Altach'
+      ]
+    },
+    {
+      regionName: 'Upper Austria',
+      regionShort: 'OÖ.',
+      regionSlug: 'upper_austria',
+      weight: 117,
+      cities: [
+        'Linz',
+        'Wels',
+        'Steyr',
+        'Leonding',
+        'Traun',
+        'Braunau am Inn',
+        'Ansfelden',
+        'Bad Ischl',
+        'Gmunden',
+        'Marchtrenk',
+        'Vöcklabruck',
+        'Ried im Innkreis',
+        'Enns',
+        'Altmünster',
+        'Laakirchen',
+        'Sierning'
+      ]
+    },
+    {
+      regionName: 'Lower Austria',
+      regionShort: 'NÖ.',
+      regionSlug: 'lower_austria',
+      weight: 84,
+      cities: [
+        'St. Pölten',
+        'Wiener Neustadt',
+        'Klosterneuburg',
+        'Baden',
+        'Krems an der Donau',
+        'Amstetten',
+        'Mödling',
+        'Traiskirchen',
+        'Schwechat',
+        'Stockerau',
+        'Tulln an der Donau',
+        'Ternitz',
+        'Perchtoldsdorf',
+        'Korneuburg',
+        'Neunkirchen',
+        'Hollabrunn',
+        'Waidhofen an der Ybbs',
+        'Bad Vöslau',
+        'Brunn am Gebirge',
+        'Zwettl-Niederösterreich'
+      ]
+    },
+    {
+      regionName: 'Salzburg',
+      regionShort: 'Sbg.',
+      regionSlug: 'salzburg',
+      weight: 74,
+      cities: ['Salzburg', 'Hallein', 'Saalfelden am Steinernen Meer', 'Wals-Siezenheim', 'Sankt Johann im Pongau', 'Bischofshofen']
+    },
+    {
+      regionName: 'Styria',
+      regionShort: 'Stm.',
+      regionSlug: 'styria',
+      weight: 73,
+      cities: ['Graz', 'Leoben', 'Kapfenberg', 'Bruck an der Mur', 'Knittelfeld', 'Köflach', 'Voitsberg', 'Judenburg', 'Weiz']
+    },
+    {
+      regionName: 'Burgenland',
+      regionShort: 'Bgl.',
+      regionSlug: 'burgenland',
+      weight: 72,
+      cities: [
+        'Eisenstadt',
+        'Oberwart',
+        'Neusiedl am See',
+        'Mattersburg',
+        'Pinkafeld',
+        'Neudörfl',
+        'Parndorf',
+        'Jennersdorf',
+        'Güssing',
+        'Gols',
+        'Großpetersdorf',
+        'Neufeld an der Leitha',
+        'Deutschkreutz',
+        'Rechnitz',
+        'Oberpullendorf',
+        'Siegendorf',
+        'Pöttsching',
+        'Bruckneudorf',
+        'Frauenkirchen',
+        'Forchtenstein'
+      ]
+    },
+    {
+      regionName: 'Carinthia',
+      regionShort: 'Ktn.',
+      regionSlug: 'carinthia',
+      weight: 59,
+      cities: [
+        'Klagenfurt',
+        'Villach',
+        'Wolfsberg',
+        'Spittal an der Drau',
+        'Feldkirchen in Kärnten',
+        'St. Veit an der Glan',
+        'Völkermarkt',
+        'St. Andrä',
+        'Velden am Wörther See',
+        'Finkenstein am Faaker See',
+        'Ebenthal in Kärnten',
+        'Ferlach'
+      ]
+    },
+    {
+      regionName: 'Tyrol',
+      regionShort: 'Tirol',
+      regionSlug: 'tyrol',
+      weight: 56,
+      cities: [
+        'Innsbruck',
+        'Kufstein',
+        'Telfs',
+        'Schwaz',
+        'Hall in Tirol',
+        'Wörgl',
+        'Lienz',
+        'Imst',
+        'Rum',
+        'St. Johann in Tirol',
+        'Kitzbühel',
+        'Zirl',
+        'Landeck'
+      ]
+    }
+  ]
+});
+
+export default Austria;
diff --git a/packages/plugins/src/countries/Austria/i18n/ar.json b/packages/plugins/src/countries/Austria/i18n/ar.json
new file mode 100644
index 000000000..65e4bca61
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "النمسا",
+    "regionNames": "الدول النمساوية"
+}
diff --git a/packages/plugins/src/countries/Austria/i18n/de.json b/packages/plugins/src/countries/Austria/i18n/de.json
new file mode 100644
index 000000000..4a051feb1
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Österreich",
+  "regionNames": "Österreichische Bundesländer"
+}
diff --git a/packages/plugins/src/countries/Austria/i18n/en.json b/packages/plugins/src/countries/Austria/i18n/en.json
new file mode 100644
index 000000000..f27072395
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/en.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Austria",
+    "regionNames": "Austrian states"
+}
diff --git a/packages/plugins/src/countries/Austria/i18n/es.json b/packages/plugins/src/countries/Austria/i18n/es.json
new file mode 100644
index 000000000..050340808
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Austria",
+  "regionNames": "estados austriacos"
+}
diff --git a/packages/plugins/src/countries/Austria/i18n/fr.json b/packages/plugins/src/countries/Austria/i18n/fr.json
new file mode 100644
index 000000000..6af11edf4
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "L'Autriche",
+  "regionNames": "États autrichiens"
+}
diff --git a/packages/plugins/src/countries/Austria/i18n/hi.json b/packages/plugins/src/countries/Austria/i18n/hi.json
new file mode 100644
index 000000000..c3988e439
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "ऑस्ट्रिया",
+    "regionNames": "ऑस्ट्रियाई राज्य"
+}
diff --git a/packages/plugins/src/countries/Austria/i18n/ja.json b/packages/plugins/src/countries/Austria/i18n/ja.json
new file mode 100644
index 000000000..a33700633
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "オーストリア",
+    "regionNames": "オーストリアの諸州"
+}
diff --git a/packages/plugins/src/countries/Austria/i18n/nl.json b/packages/plugins/src/countries/Austria/i18n/nl.json
new file mode 100644
index 000000000..5e980de02
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Oostenrijk",
+  "regionNames": "Oostenrijkse staten"
+}
diff --git a/packages/plugins/src/countries/Austria/i18n/pt.json b/packages/plugins/src/countries/Austria/i18n/pt.json
new file mode 100644
index 000000000..05a282847
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Áustria",
+    "regionNames": "Estados austríacos"
+}
diff --git a/packages/plugins/src/countries/Austria/i18n/ru.json b/packages/plugins/src/countries/Austria/i18n/ru.json
new file mode 100644
index 000000000..c797fd490
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Австрия",
+    "regionNames": "Австрийские государства"
+}
diff --git a/packages/plugins/src/countries/Austria/i18n/ta.json b/packages/plugins/src/countries/Austria/i18n/ta.json
new file mode 100644
index 000000000..bcf56985b
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "ஆஸ்திரியா",
+    "regionNames": "ஆஸ்திரிய நாடுகள்"
+}
diff --git a/packages/plugins/src/countries/Austria/i18n/zh.json b/packages/plugins/src/countries/Austria/i18n/zh.json
new file mode 100644
index 000000000..78d585315
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "奥地利",
+    "regionNames": "奥地利各州"
+}
diff --git a/packages/plugins/src/countries/Austria/names.ts b/packages/plugins/src/countries/Austria/names.ts
new file mode 100644
index 000000000..782a61f66
--- /dev/null
+++ b/packages/plugins/src/countries/Austria/names.ts
@@ -0,0 +1,158 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Alina',
+  'Amelie',
+  'Anika',
+  'Anna',
+  'Chiara',
+  'Clara',
+  'Elena',
+  'Elisa',
+  'Ella',
+  'Emilia',
+  'Emily',
+  'Emma',
+  'Eva',
+  'Felicitas',
+  'Hannah',
+  'Helena',
+  'Ida',
+  'Ina',
+  'Isabella',
+  'Johanna',
+  'Josephina',
+  'Josephine',
+  'Kristin',
+  'Laura',
+  'Lea',
+  'Lena',
+  'Leona',
+  'Lilja',
+  'Lilly',
+  'Lina',
+  'Linda',
+  'Lorelei',
+  'Louisa',
+  'Magdalena',
+  'Marie',
+  'Marlene',
+  'Melissa',
+  'Mia',
+  'Mona',
+  'Nina',
+  'Nora',
+  'Paula',
+  'Paulina',
+  'Pia',
+  'Ronja',
+  'Sara',
+  'Sophia',
+  'Sophie',
+  'Valentina',
+  'Valerie'
+];
+
+const maleNames = [
+  'Alexander',
+  'Anton',
+  'Ben',
+  'Benjamin',
+  'Daniel',
+  'David',
+  'Dário',
+  'Elijas',
+  'Felix',
+  'Finn',
+  'Gabriel',
+  'Henri',
+  'Jakob',
+  'Jonas',
+  'Jonathan',
+  'Julian',
+  'Konstantin',
+  'Kylian',
+  'Levi',
+  'Lewin',
+  'Liam',
+  'Luis',
+  'Lukas',
+  'Léo',
+  'Léon',
+  'Mathis',
+  'Matthias',
+  'Max',
+  'Maximilian',
+  'Milo',
+  'Milàn',
+  'Moritz',
+  'Nathan',
+  'Nico, Niko',
+  'Nicolàs',
+  'Niklas',
+  'Noah',
+  'Oliver',
+  'Oskar',
+  'Paul',
+  'Philipp',
+  'Raphael',
+  'Samuel',
+  'Theo',
+  'Thomas',
+  'Valentín',
+  'Vinzent',
+  'Yorik',
+  'Yoshua'
+];
+
+const lastNames = [
+  'Aigner',
+  'Auer',
+  'Bauer',
+  'Baumgartner',
+  'Berger',
+  'Binder',
+  'Brunner',
+  'Ebner',
+  'Eder',
+  'Egger',
+  'Fischer',
+  'Fuchs',
+  'Gruber',
+  'Haas',
+  'Heilig',
+  'Hofer',
+  'Huber',
+  'Koller',
+  'Lang',
+  'Lechner',
+  'Lehner',
+  'Leitner',
+  'Maier',
+  'Mayer',
+  'Mayr',
+  'Moser',
+  'Müller',
+  'Pichler',
+  'Reiter',
+  'Schmid',
+  'Schmidt',
+  'Schneider',
+  'Schuster',
+  'Schwarz',
+  'Steiner',
+  'Wagner',
+  'Wallner',
+  'Weber',
+  'Wimmer',
+  'Winkler',
+  'Wolf'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/Belgium/bundle.ts b/packages/plugins/src/countries/Belgium/bundle.ts
new file mode 100644
index 000000000..f1ee3a67b
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/bundle.ts
@@ -0,0 +1,1092 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Belgium: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'belgium',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      format: 'Xxxx'
+    }
+  },
+  regions: [
+    {
+      regionName: 'Antwerpen',
+      regionShort: 'AN',
+      regionSlug: 'antwerpen',
+      weight: 1,
+      cities: [
+        'Antwerpen',
+        'Burcht',
+        'Zwijndrecht',
+        'Deurne',
+        'Wijnegem',
+        'Borgerhout',
+        'Borsbeek',
+        'Wommelgem',
+        'Merksem',
+        'Ekeren',
+        'Herentals',
+        'Morkhoven',
+        'Noorderwijk',
+        'Hallaar',
+        'Heist-op-den-Berg',
+        'Booischot',
+        'Itegem',
+        'Wiekevorst',
+        'Schriek',
+        'Herselt',
+        'Ramsel',
+        'Houtvenne',
+        'Hulshout',
+        'Westmeerbeek',
+        'Massenhoven',
+        'Viersel',
+        'Zandhoven',
+        'Pulderbos',
+        'Pulle',
+        'Olen',
+        'Oevel',
+        'Tongerlo',
+        'Westerlo',
+        'Zoerle-Parwijs',
+        'Herenthout',
+        'Gierle',
+        'Lille',
+        'Poederlee',
+        'Wechelderzande',
+        'Grobbendonk',
+        'Bouwel',
+        'Vorselaar',
+        'Turnhout',
+        'Rijkevorsel',
+        'Hoogstraten',
+        'Meer',
+        'Minderhout',
+        'Wortel',
+        'Meerle',
+        'Merksplas',
+        'Beerse',
+        'Vlimmeren',
+        'Vosselaar',
+        'Oud-Turnhout',
+        'Arendonk',
+        'Ravels',
+        'Weelde',
+        'Poppel',
+        'Baarle-Hertog',
+        'Malle',
+        'Oostmalle',
+        'Westmalle',
+        'Mol',
+        'Eindhout',
+        'Laakdal',
+        'Vorst',
+        'Varendonk',
+        'Veerle',
+        'Geel',
+        'Meerhout',
+        'Kasterlee',
+        'Lichtaart',
+        'Tielen',
+        'Retie',
+        'Dessel',
+        'Balen',
+        'Olmen',
+        'Koningshooikt',
+        'Lier',
+        'Broechem',
+        'Emblem',
+        'Oelegem',
+        'Ranst',
+        'Boechout',
+        'Vremde',
+        'Hove',
+        'Lint',
+        'Kontich',
+        'Waarloos',
+        'Bevel',
+        'Kessel',
+        'Nijlen',
+        'Duffel',
+        'Beerzel'
+      ]
+    },
+    {
+      regionName: 'Brussels Hoofdstedelijk Gewest',
+      regionShort: 'BU',
+      regionSlug: 'brussels_hoofdstedelijk_gewest',
+      weight: 1,
+      cities: [
+        'Brussel',
+        'Laken',
+        'Schaarbeek',
+        'Etterbeek',
+        'Elsene',
+        'Sint-Gillis',
+        'Anderlecht',
+        'Sint-Jans-Molenbeek',
+        'Koekelberg',
+        'Sint-Agatha-Berchem',
+        'Ganshoren',
+        'Jette',
+        'Neder-Over-Heembeek',
+        'Haren',
+        'Evere',
+        'Sint-Pieters-Woluwe',
+        'Oudergem',
+        'Watermaal-Bosvoorde',
+        'Ukkel',
+        'Vorst',
+        'Sint-Lambrechts-Woluwe',
+        'Sint-Joost-ten-Node'
+      ]
+    },
+    {
+      regionName: 'Waals-Brabant',
+      regionShort: 'WB',
+      regionSlug: 'waals_brabant',
+      weight: 1,
+      cities: [
+        'Limal',
+        'Waver',
+        'Bierges',
+        'La Hulpe',
+        'Glimes',
+        'Incourt',
+        'Opprebais',
+        'PiŽtrebais',
+        'Roux-Miroir',
+        'Beauvechain',
+        'Hamme-Mille',
+        "l'Ecluse",
+        'Nodebais',
+        'Tourinnes-la-Grosse',
+        'Bonlez',
+        'Chaumont-Gistoux',
+        'Corroy-le-Grand',
+        'Dion-Valmont',
+        'Longueville',
+        'Rixensart',
+        'RosiŽres',
+        'Genval',
+        'Ottignies',
+        'Ottignies-Louvain-la-Neuve',
+        'CŽroux-Mousty',
+        'Limelette',
+        'Louvain-la-Neuve',
+        'Enines',
+        'Folx-les-Caves',
+        'Jandrain-Jandrenouille',
+        'Jauche',
+        'Marilles',
+        'Noduwez',
+        'Orp-Jauche',
+        'Orp-le-Grand',
+        'HŽlŽcine',
+        'Linsmeau',
+        'Neerheylissem',
+        'Opheylissem',
+        'MalŽves-Sainte-Marie-Wastines',
+        'Orbais',
+        'Perwez',
+        'Thorembais-les-BŽguines',
+        'Thorembais-Saint-Trond',
+        'Autre-Eglise',
+        'Bomal',
+        'Geest-GŽrompont-Petit-RosiŽre',
+        'GŽrompont',
+        'Grand-RosiŽre-Hottomont',
+        'Huppaye',
+        'Mont-Saint-AndrŽ',
+        'Ramillies',
+        'Dongelberg',
+        'Jauchelette',
+        'Jodoigne',
+        'Jodoigne-Souveraine',
+        'Lathuy',
+        'MŽlin',
+        'PiŽtrain',
+        'Saint-Jean-Geest',
+        'Saint-Remy-Geest',
+        'ZŽtrud-Lumay',
+        'Couture-Saint-Germain',
+        'Lasne',
+        'Lasne-Chapelle-Saint-Lambert',
+        'Maransart',
+        'Ohain',
+        'Plancenoit',
+        'Archennes',
+        'Graven Grez-Doiceau',
+        'Biez',
+        'Bossut-Gottechain',
+        'Nethen',
+        'Monstreux',
+        'Nivelles',
+        'Baulers',
+        'Thines',
+        'Bornival',
+        'Waterloo',
+        'Promo-Control',
+        'Eigenbrakel',
+        'Ophain-Bois-Seigneur-Isaac',
+        'Lillois-WitterzŽe',
+        'Bierk Bierghes',
+        'Roosbeek',
+        'Quenast',
+        'Rebecq',
+        'Corbais',
+        'HŽvillers',
+        'Mont-Saint-Guibert',
+        'Kasteelbrakel',
+        'Woutersbrakel',
+        'Chastre',
+        'Chastre-Villeroux-Blanmont',
+        'Cortil-Noirmont',
+        'Gentinnes',
+        'Saint-GŽry',
+        'Nil-Saint-Vincent-Saint-Martin',
+        'Tourinnes-Saint-Lambert',
+        'Walhain',
+        'Walhain-Saint-Paul',
+        'Itter',
+        'Virginal-Samme',
+        'Haut-Ittre',
+        'Genappe',
+        'Baisy-Thy',
+        'Bousval',
+        'Loupoigne',
+        'Vieux-Genappe',
+        'Glabais',
+        'Ways',
+        'Houtain-le-Val',
+        'Klabbeek',
+        'Oostkerk',
+        'Sint-Renelde Saintes',
+        'Tubeke Tubize',
+        'Court-Saint-Etienne',
+        'Marbais',
+        'Mellery',
+        'Sart-Dames-Avelines',
+        'Tilly',
+        'Villers-la-Ville'
+      ]
+    },
+    {
+      regionName: 'Vlaams-Brabant',
+      regionShort: 'VB',
+      regionSlug: 'vlaams_brabant',
+      weight: 1,
+      cities: [
+        'Halle',
+        'Buizingen',
+        'Lembeek',
+        'Herfelingen',
+        'Herne',
+        'Sint-Pieters-Kapelle',
+        'Bever Bievene',
+        'Hoeilaart',
+        'Galmaarden',
+        'Tollembeek',
+        'Vollezele',
+        'Oudenaken',
+        'Sint-Laureins-Berchem',
+        'Sint-Pieters-Leeuw',
+        'Ruisbroek',
+        'Vlezenbeek',
+        'Drogenbos',
+        'Linkebeek',
+        'Sint-Genesius-Rode',
+        'Beersel',
+        'Lot',
+        'Alsemberg',
+        'Dworp',
+        'Huizingen',
+        'Bogaarden',
+        'Heikruis',
+        'Pepingen',
+        'Elingen',
+        'Beert',
+        'Bellingen',
+        'Dilbeek',
+        'Sint-Martens-Bodegem',
+        'Sint-Ulriks-Kapelle',
+        'Itterbeek',
+        'Groot-Bijgaarden',
+        'Schepdaal',
+        'Asse',
+        'Bekkerzeel',
+        'Kobbegem',
+        'Mollem',
+        'Relegem',
+        'Zellik',
+        'Ternat',
+        'Wambeek',
+        'Sint-Katherina-Lombeek',
+        'Mazenzele',
+        'Opwijk',
+        'Gaasbeek',
+        'Lennik',
+        'Sint-Kwintens-Lennik',
+        'Sint-Martens-Lennik',
+        'Gooik',
+        'Kester',
+        'Leerbeek',
+        'Oetingen',
+        'Onze-Lieve-Vrouw-Lombeek',
+        'Pamel',
+        'Roosdaal',
+        'Strijtem',
+        'Borchtlombeek',
+        'Liedekerke',
+        'Wemmel',
+        'Brussegem',
+        'Hamme',
+        'Merchtem',
+        'Affligem',
+        'Essene',
+        'Hekelgem',
+        'Teralfene',
+        'Peutie',
+        'Vilvoorde',
+        'Cargovil',
+        'VTM',
+        'Melsbroek',
+        'Perk',
+        'Steenokkerzeel',
+        'Machelen',
+        'Diegem',
+        'Londerzeel',
+        'Malderen',
+        'Steenhuffel',
+        'Grimbergen',
+        'Humbeek',
+        'Beigem',
+        'Strombeek-Bever',
+        'Meise',
+        'Wolvertem',
+        'Kapelle-op-den-Bos',
+        'Nieuwenrode',
+        'Ramsdonk',
+        'Berg',
+        'Buken',
+        'Kampenhout',
+        'Nederokkerzeel',
+        'Nossegem',
+        'Zaventem',
+        'Brucargo',
+        'Sint-Stevens-Woluwe',
+        'Sterrebeek',
+        'Brussel X-Luchthaven Remailing'
+      ]
+    },
+    {
+      regionName: 'Luik',
+      regionShort: 'LU',
+      regionSlug: 'luik',
+      weight: 1,
+      cities: [
+        'Glain',
+        'Luik',
+        'Rocourt',
+        'Bressoux',
+        'Jupille-sur-Meuse',
+        'LiŽge',
+        'Wandre',
+        'GrivegnŽe',
+        'LiŽge',
+        'Angleur',
+        'Herstal',
+        'Milmort',
+        'Vottem',
+        'Liers',
+        'Chaudfontaine',
+        'Vaux-sous-ChŽvremont',
+        'Beaufays',
+        'Embourg',
+        'B.S.D.',
+        'Boncelles',
+        'Seraing',
+        'Jemeppe-sur-Meuse',
+        'OugrŽe',
+        'Ehein',
+        'NeuprŽ',
+        'Rotheux-RimiŽre',
+        'Neuville-en-Condroz',
+        'Plainevaux',
+        'Esneux',
+        'Tilff',
+        'Dolembreux',
+        'GomzŽ-Andoumont',
+        'Rouvreux',
+        'Sprimont',
+        'LouveignŽ',
+        'Anthisnes',
+        'Villers-aux-Tours',
+        'Hody',
+        'Tavier',
+        'Comblain-au-Pont',
+        'Poulseur',
+        'Comblain-Fairon',
+        'Comblain-la-Tour',
+        'Hamoir',
+        'Filot',
+        'FerriŽres',
+        'My',
+        'Vieuxville',
+        'Werbomont',
+        'Xhoris',
+        'Burdinne',
+        'Hannche',
+        'LamontzŽe',
+        'Marneffe',
+        'Oteppe',
+        'HŽron',
+        'Lavoir',
+        "Waret-l'Evque",
+        'Couthuin',
+        'Acosse',
+        'Ambresin',
+        'Meeffe',
+        'Wasseiges',
+        'Bo‘lhe',
+        'Geer',
+        'Hollogne-sur-Geer',
+        'Lens-Saint-Servais',
+        'Omal',
+        'Darion',
+        'Ligney',
+        'Berloz',
+        'Corswarem',
+        'Rosoux-Crenwick',
+        'Avennes',
+        'Braives',
+        'Ciplet',
+        'Fallais',
+        'Fumal',
+        'Ville-en-Hesbaye',
+        'Latinne',
+        'Tourinne',
+        'Abolens',
+        'Avernas-le-Bauduin',
+        'Avin',
+        'BertrŽe',
+        'Blehen',
+        'Cras-Avernas',
+        'Crehen',
+        'Grand-Hallet',
+        'Hannut',
+        'Lens-Saint-Remy',
+        'Merdorp',
+        'Moxhe',
+        'Petit-Hallet',
+        'Poucet',
+        'Thisnes',
+        'TrognŽe',
+        'Villers-le-Peuplier',
+        'Wansin'
+      ]
+    },
+    {
+      regionName: 'Namen',
+      regionShort: 'NA',
+      regionSlug: 'namen',
+      weight: 1,
+      cities: [
+        'Beez',
+        'Namen',
+        'Belgrade',
+        'Saint-Servais',
+        'Saint-Marc',
+        'Bouge',
+        'Champion',
+        'Daussoulx',
+        'Flawinne',
+        'Malonne',
+        'Suarlee',
+        'Temploux',
+        'Vedrin',
+        'Boninne',
+        'Cognelee',
+        'Gelbressee',
+        'Marche-les-Dames',
+        'Beuzet',
+        'Ernage',
+        'Gembloux',
+        'Grand-Manil',
+        'Lonzee',
+        'Sauvenire',
+        'Grand-Leez',
+        'Bossire',
+        'Bothey',
+        'Corroy-le-Ch‰teau',
+        'Isnes',
+        'Mazy',
+        'Arsimont',
+        'Auvelais',
+        'Falisolle',
+        'Keumiee',
+        'Moignelee',
+        'Sambreville',
+        'Tamines',
+        'Velaine-sur-Sambre',
+        'Aisemont',
+        'Fosses-la-Ville',
+        'Sart-Eustache',
+        'Vitrival',
+        'Emines',
+        'Rhisnes',
+        'Villers-lez-Heest',
+        'Warisoulx',
+        'Bovesse',
+        'Meux',
+        'Saint-Denis-Bovesse',
+        'Dave',
+        'Jambes',
+        'Naninne',
+        'Wepion',
+        'Wierde',
+        'Erpe',
+        'Lives-sur-Meuse',
+        'Loy',
+        'Boignee',
+        'Ligny',
+        'Sombreffe',
+        'Tongrinne',
+        'Floreffe',
+        'Floriffoux',
+        'Soye',
+        'Arbre',
+        'Bois-de-Villers',
+        'Lesve',
+        'Lustin',
+        'Profondeville',
+        'Rivire',
+        'Bal‰tre',
+        'Ham-sur-Sambre',
+        'Jemeppe-sur-Sambre',
+        'Mornimont',
+        'Moustier-sur-Sambre',
+        'Onoz',
+        'Saint-Martin',
+        'Spy',
+        'Andenne',
+        'Bonneville',
+        'Coutisse',
+        'Landenne',
+        'Maizeret',
+        'Sclayn',
+        'Seilles',
+        'Thon',
+        'Vezin',
+        'Bolinne',
+        'Boneffe',
+        'Branchon',
+        'Dhuy',
+        'Eghezee',
+        'Hanret',
+        'Leuze',
+        'Liernu'
+      ]
+    },
+    {
+      regionName: 'Henegouwen',
+      regionShort: 'HE',
+      regionSlug: 'henegouwen',
+      weight: 1,
+      cities: [
+        'Charleroi',
+        'Marcinelle',
+        'Couillet',
+        'Dampremy',
+        'Goutroux',
+        'Marchienne-au-Pont',
+        'Monceau-sur-Sambre',
+        'Mont-sur-Marchienne',
+        'Jumet',
+        'Gosselies',
+        'Lodelinsart',
+        'Ransart',
+        'Roux',
+        'Gilly',
+        'Montignies-sur-Sambre',
+        'Montigny-le-Tilleul',
+        'Landelies',
+        'Cour-sur-Heure',
+        'Ham-sur-Heure',
+        'Ham-sur-Heure-Nalinnes',
+        'Jamioulx',
+        'Marbaix',
+        'Nalinnes',
+        "Fontaine-l'Evque",
+        'Forchies-la-Marche',
+        'Leernes',
+        'Anderlues',
+        'Courcelles',
+        'Gouy-lez-PiŽton',
+        'Souvret',
+        'Trazegnies',
+        'Bouffioulx',
+        'Ch‰telet',
+        'Ch‰telineau',
+        'Frasnes-lez-Gosselies',
+        'Les Bons Villers',
+        'Rves',
+        'Villers-Perwin',
+        'Wayaux',
+        'Mellet',
+        'Fleurus',
+        'Heppignies',
+        'Lambusart',
+        'Brye',
+        'WagnelŽe',
+        'WanfercŽe-Baulet',
+        'Buzet',
+        'Obaix',
+        'Pont-ˆ-Celles',
+        'ThimŽon',
+        'Viesville',
+        'Liberchies',
+        'Luttre',
+        'Farciennes',
+        'Pironchamps',
+        'Aiseau',
+        'Aiseau-Presles',
+        'Pont-de-Loup',
+        'Presles',
+        'Roselies',
+        'Acoz',
+        'Gerpinnes',
+        'Gougnies',
+        'Joncret',
+        'Loverval',
+        'Villers-Poterie',
+        'Boussu-lez-Walcourt',
+        'Fourbechies',
+        'Froidchapelle',
+        'Vergnies',
+        'Erpion',
+        'Bailivre',
+        'Chimay',
+        'Robechies',
+        'Saint-Remy',
+        'Salles',
+        'Villers-la-Tour',
+        'Virelles',
+        'Vaulx-lez-Chimay',
+        'Lompret',
+        'Baileux',
+        'Bourlers',
+        'Forges',
+        "l'Escaillre",
+        'Rizes',
+        'Grandrieu',
+        'Montbliart',
+        'Rance',
+        'Sautin',
+        'Sivry',
+        'Sivry-Rance',
+        'Beaumont',
+        'Leugnies',
+        'Leval-Chaudeville',
+        'Renlies',
+        'Solre-Saint-GŽry',
+        'Thirimont',
+        'StrŽe',
+        'Leers-et-Fosteau',
+        'Thuin',
+        'Biesme-sous-Thuin',
+        'Ragnies',
+        'BiercŽe',
+        'GozŽe',
+        'Donstiennes',
+        'Thuillies',
+        'Lobbes',
+        'Mont-Sainte-Genevive',
+        'Sars-la-Buissire',
+        'Bienne-lez-Happart',
+        "Bersillies-l'Abbaye",
+        'Erquelinnes',
+        'Grand-Reng',
+        'Hantes-WihŽries',
+        'Montignies-Saint-Christophe',
+        'Solre-sur-Sambre',
+        'Fontaine-Valmont',
+        'Labuissire',
+        'Merbes-le-Ch‰teau',
+        'Merbes-Sainte-Marie',
+        'Momignies',
+        'Macon',
+        'Monceau-Imbrechies',
+        'Macquenoise',
+        'Beauwelz',
+        'Forge-Philippe',
+        'Seloignes',
+        'Bergen Mons',
+        'Ghlin',
+        'FlŽnu',
+        'Jemappes',
+        'Maisires',
+        'Nimy',
+        'HavrŽ'
+      ]
+    },
+    {
+      regionName: 'Luxemburg',
+      regionShort: 'LX',
+      regionSlug: 'luxemburg',
+      weight: 1,
+      cities: [
+        'Bastogne',
+        'Longvilly',
+        'Noville',
+        'Villers-la-Bonne-Eau',
+        'Wardin',
+        'Martelange',
+        'Fauvillers',
+        'Hollange',
+        'Tintange',
+        'HomprŽ',
+        'Morhet',
+        'Nives',
+        'Sibret',
+        'Vaux-lez-Rosieres',
+        'Vaux-sur-Sure',
+        'Juseret',
+        'Houffalize',
+        'Nadrin',
+        'Mont',
+        'Tailles',
+        'Tavigny',
+        'MabomprŽ',
+        'Wibrin',
+        'Gouvy',
+        'LimerlŽ',
+        'Bovigny',
+        'Beho',
+        'Cherain',
+        'Montleban',
+        'Amberloup',
+        'Sainte-Ode',
+        'Tillet',
+        'Lavacherie',
+        'Flamierge',
+        'Bertogne',
+        'Longchamps',
+        'Bihain',
+        'Vielsalm',
+        'Petit-Thier',
+        'Grand-Halleux',
+        'Arlon',
+        'Bonnert',
+        'Heinsch',
+        'Toernich',
+        'Guirsch',
+        'Autelbas',
+        'Attert',
+        'Nobressart',
+        'Nothomb',
+        'Thiaumont',
+        'Tontelange',
+        'Habay',
+        'Habay-la-Neuve',
+        'Hachy',
+        'Anlier',
+        'Habay-la-Vieille',
+        'Houdemont',
+        'Rulles',
+        'Bellefontaine',
+        'Rossignol',
+        'Saint-Vincent',
+        'Tintigny',
+        'Etalle',
+        'Sainte-Marie-sur-Semois',
+        'Villers-sur-Semois',
+        'Vance',
+        'Chantemelle',
+        'Buzenol',
+        'Ch‰tillon',
+        'Meix-le-Tige',
+        'Saint-LŽger',
+        'Musson',
+        'Mussy-la-Ville',
+        'Signeulx',
+        'Bleid',
+        'Ethe',
+        'Ruette',
+        'Virton',
+        'Latour',
+        'Saint-Mard',
+        'Dampicourt',
+        'Harnoncourt',
+        'Lamorteau',
+        'Rouvroy',
+        'Torgny',
+        'GŽrouville',
+        'Meix-Devant-Virton',
+        'Robelmont',
+        'Sommethonne',
+        'Villers-la-Loue',
+        'Hondelange',
+        'Messancy',
+        'Wolkrange',
+        'SŽlange',
+        'Habergy',
+        'Aubange',
+        'Athus',
+        'Halanzy',
+        'Rachecourt',
+        'Bras',
+        'Freux',
+        'Libramont-Chevigny',
+        'Moircy',
+        'Recogne',
+        'Remagne',
+        'Sainte-Marie-Chevigny',
+        'Saint-Pierre',
+        'Chiny',
+        'Izel',
+        'Jamoigne',
+        'Les Bulles',
+        'Suxy',
+        'Termes',
+        'Florenville',
+        'Fontenoille',
+        'Muno'
+      ]
+    },
+    {
+      regionName: 'West-Vlaanderen',
+      regionShort: 'WV',
+      regionSlug: 'west_vlaanderen',
+      weight: 1,
+      cities: [
+        'Brugge Bruges',
+        'Koolkerke',
+        'Hertsberge',
+        'Oostkamp',
+        'Ruddervoorde',
+        'Waardamme',
+        'Sint-Andries',
+        'Sint-Michiels',
+        'Loppem',
+        'Veldegem',
+        'Zedelgem',
+        'Aartrijke',
+        'Knokke',
+        'Knokke-Heist',
+        'Westkapelle',
+        'Heist-aan-Zee',
+        'Ramskapelle',
+        'Assebroek',
+        'Sint-Kruis',
+        'Damme',
+        'Hoeke',
+        'Lapscheure',
+        'Moerkerke',
+        'Oostkerke',
+        'Sijsele',
+        'Blankenberge',
+        'Uitkerke',
+        'Houtave',
+        'Meetkerke',
+        'Nieuwmunster',
+        'Zuienkerke',
+        'Dudzele',
+        'Lissewege',
+        'Zeebrugge',
+        'Oostende',
+        'Stene',
+        'Zandvoorde',
+        'De Haan',
+        'Klemskerke',
+        'Wenduine',
+        'Vlissegem',
+        'Middelkerke',
+        'Wilskerke',
+        'Leffinge',
+        'Mannekensvere',
+        'Schore',
+        'Sint-Pieters-Kapelle',
+        'Slijpe',
+        'Spermalie',
+        'Lombardsijde',
+        'Westende',
+        'Bredene',
+        'Ettelgem',
+        'Oudenburg',
+        'Roksem',
+        'Westkerke',
+        'Gistel',
+        'Moere',
+        'Snaaskerke',
+        'Zevekote',
+        'Bekegem',
+        'Eernegem',
+        'Ichtegem',
+        'Jabbeke',
+        'Snellegem',
+        'Stalhille',
+        'Varsenare',
+        'Zerkegem',
+        'Kortrijk',
+        'Bissegem',
+        'Heule',
+        'Bellegem',
+        'Kooigem',
+        'Marke',
+        'Rollegem',
+        'Aalbeke',
+        'Kuurne',
+        'Harelbeke',
+        'Bavikhove',
+        'Hulste',
+        'Deerlijk',
+        'Zwevegem',
+        'Heestert',
+        'Moen',
+        'Otegem',
+        'Sint-Denijs',
+        'Gullegem',
+        'Moorsele',
+        'Wevelgem',
+        'Anzegem',
+        'Gijzelbrechtegem',
+        'Ingooigem',
+        'Vichte',
+        'Kaster',
+        'Tiegem',
+        'Avelgem',
+        'Kerkhove',
+        'Waarmaarde',
+        'Outrijve',
+        'Bossuit',
+        'Helkijn',
+        'Spiere',
+        'Spiere-Helkijn',
+        'Beerst',
+        'Diksmuide',
+        'Driekapellen',
+        'Esen',
+        'Kaaskerke',
+        'Keiem',
+        'Lampernisse',
+        'Leke',
+        'Nieuwkapelle',
+        'Oostkerke',
+        'Oudekapelle'
+      ]
+    },
+    {
+      regionName: 'Oost-Vlaanderen',
+      regionShort: 'OV',
+      regionSlug: 'oost_vlaanderen',
+      weight: 1,
+      cities: [
+        'Gent',
+        'Mariakerke',
+        'Drongen',
+        'Wondelgem',
+        'Sint-Amandsberg',
+        'Oostakker',
+        'Desteldonk',
+        'Mendonk',
+        'Sint-Kruis-Winkel',
+        'Gentbrugge',
+        'Ledeberg',
+        'Afsnee',
+        'Sint-Denijs-Westrem',
+        'Zwijnaarde',
+        'Zelzate',
+        'Destelbergen',
+        'Heusden',
+        'Beervelde',
+        'Lochristi',
+        'Zaffelare',
+        'Zeveneken',
+        'Gontrode',
+        'Melle',
+        'Nieuwkerken-Waas',
+        'Sint-Niklaas',
+        'Belsele',
+        'Sinaai-Waas',
+        'Beveren',
+        'Haasdonk',
+        'Kallo',
+        'Melsele',
+        'Vrasene',
+        'Doel',
+        'Kallo',
+        'Kieldrecht',
+        'Verrebroek',
+        'Elversele',
+        'Steendorp',
+        'Temse',
+        'Tielrode',
+        'Bazel',
+        'Kruibeke',
+        'Rupelmonde',
+        'Daknam',
+        'Eksaarde',
+        'Lokeren',
+        'De Klinge',
+        'Meerdonk',
+        'Sint-Gillis-Waas',
+        'Sint-Pauwels',
+        'Moerbeke',
+        'Wachtebeke',
+        'Kemzeke',
+        'Stekene',
+        'Appels',
+        'Baasrode',
+        'Dendermonde',
+        'Grembergen',
+        'Mespelare',
+        'Oudegem',
+        'Schoonaarde',
+        'Sint-Gillis-bij-Dendermonde',
+        'Hamme',
+        'Moerzeke',
+        'Massemen',
+        'Westrem',
+        'Wetteren',
+        'Zele',
+        'Waasmunster',
+        'Buggenhout',
+        'Opdorp',
+        'Schellebelle',
+        'Serskamp',
+        'Wichelen',
+        'Kalken',
+        'Laarne',
+        'Denderbelle',
+        'Lebbeke',
+        'Wieze',
+        'Berlare',
+        'Overmere',
+        'Uitbergen',
+        'Aalst',
+        'Gijzegem',
+        'Hofstade',
+        'Baardegem',
+        'Herdersem',
+        'Meldert',
+        'Moorsel',
+        'Erembodegem',
+        'Nieuwerkerken',
+        'Impe',
+        'Lede',
+        'Oordegem',
+        'Smetlede',
+        'Wanzele',
+        'Appelterre-Eichem',
+        'Denderwindeke',
+        'Lieferinge',
+        'Nederhasselt'
+      ]
+    }
+  ]
+});
+
+export default Belgium;
diff --git a/packages/plugins/src/countries/Belgium/i18n/ar.json b/packages/plugins/src/countries/Belgium/i18n/ar.json
new file mode 100644
index 000000000..769b02b63
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "بلجيكا",
+    "regionNames": "المقاطعات البلجيكية"
+}
diff --git a/packages/plugins/src/countries/Belgium/i18n/de.json b/packages/plugins/src/countries/Belgium/i18n/de.json
new file mode 100644
index 000000000..3cf53f061
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Belgien",
+  "regionNames": "Belgische Provinzen"
+}
diff --git a/packages/plugins/src/countries/Belgium/i18n/en.json b/packages/plugins/src/countries/Belgium/i18n/en.json
new file mode 100644
index 000000000..48072a265
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/en.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Belgium",
+    "regionNames": "Belgian Prov."
+}
diff --git a/packages/plugins/src/countries/Belgium/i18n/es.json b/packages/plugins/src/countries/Belgium/i18n/es.json
new file mode 100644
index 000000000..1e8eb0773
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Bélgica",
+  "regionNames": "Provincias belgas"
+}
diff --git a/packages/plugins/src/countries/Belgium/i18n/fr.json b/packages/plugins/src/countries/Belgium/i18n/fr.json
new file mode 100644
index 000000000..08eed1ac1
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Belgique",
+  "regionNames": "Provinces belges"
+}
diff --git a/packages/plugins/src/countries/Belgium/i18n/hi.json b/packages/plugins/src/countries/Belgium/i18n/hi.json
new file mode 100644
index 000000000..0fc2a292f
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "बेल्जियम",
+    "regionNames": "बेल्जियम प्रांत."
+}
diff --git a/packages/plugins/src/countries/Belgium/i18n/ja.json b/packages/plugins/src/countries/Belgium/i18n/ja.json
new file mode 100644
index 000000000..9132ee993
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "ベルギー",
+    "regionNames": "ベルギーの州"
+}
diff --git a/packages/plugins/src/countries/Belgium/i18n/nl.json b/packages/plugins/src/countries/Belgium/i18n/nl.json
new file mode 100644
index 000000000..833461700
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "België",
+  "regionNames": "Belgische provincies"
+}
diff --git a/packages/plugins/src/countries/Belgium/i18n/pt.json b/packages/plugins/src/countries/Belgium/i18n/pt.json
new file mode 100644
index 000000000..9269b1929
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Bélgica",
+    "regionNames": "Províncias belgas"
+}
diff --git a/packages/plugins/src/countries/Belgium/i18n/ru.json b/packages/plugins/src/countries/Belgium/i18n/ru.json
new file mode 100644
index 000000000..14d797073
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Бельгия",
+    "regionNames": "Бельгийская пров."
+}
diff --git a/packages/plugins/src/countries/Belgium/i18n/ta.json b/packages/plugins/src/countries/Belgium/i18n/ta.json
new file mode 100644
index 000000000..dc7f1780d
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "பெல்ஜியம்",
+    "regionNames": "பெல்ஜிய மாகாணங்கள்"
+}
diff --git a/packages/plugins/src/countries/Belgium/i18n/zh.json b/packages/plugins/src/countries/Belgium/i18n/zh.json
new file mode 100644
index 000000000..f70c6b4c9
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "比利时",
+    "regionNames": "比利时省份"
+}
diff --git a/packages/plugins/src/countries/Belgium/names.ts b/packages/plugins/src/countries/Belgium/names.ts
new file mode 100644
index 000000000..43f01fa85
--- /dev/null
+++ b/packages/plugins/src/countries/Belgium/names.ts
@@ -0,0 +1,318 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Alexandra',
+  'Alice',
+  'Alicia',
+  'Aline',
+  'Alison',
+  'Amandine',
+  'Anaïs',
+  'Anissa',
+  'Anna',
+  'Audrey',
+  'Aurore',
+  'Aurélie',
+  'Carla',
+  'Caroline',
+  'Cassandra',
+  'Celia',
+  'Charline',
+  'Charlotte',
+  'Chloé',
+  'Cindy',
+  'Claire',
+  'Clémentine',
+  'Céline',
+  'Déborah',
+  'Elisa',
+  'Elisabeth',
+  'Elise',
+  'Eloïse',
+  'Emeline',
+  'Emilie',
+  'Emma',
+  'Estelle',
+  'Fanny',
+  'Florence',
+  'Florine',
+  'Gaëlle',
+  'Inès',
+  'Jade',
+  'Jeanne',
+  'Jennifer',
+  'Julie',
+  'Juliette',
+  'Justine',
+  'Kelly',
+  'Kim',
+  'Laetitia',
+  'Lara',
+  'Laure',
+  'Laurie',
+  'Leila',
+  'Lisa',
+  'Lola',
+  'Lou',
+  'Louise',
+  'Lucie',
+  'Léa',
+  'Léna',
+  'Marine',
+  'Maelle',
+  'Manon',
+  'Margaux',
+  'Marie',
+  'Marion',
+  'Mathilde',
+  'Maurine',
+  'Morgane',
+  'Mégane',
+  'Mélanie',
+  'Mélissa',
+  'Naomi',
+  'Nina',
+  'Nora',
+  'Noémie ',
+  'Océane',
+  'Ophélie',
+  'Pauline',
+  'Rachel',
+  'Sara',
+  'Sofia',
+  'Sophie',
+  'Stephanie',
+  'Victoria',
+  'Virginie',
+  'Wendy',
+  'Yasmine',
+  'Alix',
+  'Amelie',
+  'Camille',
+  'Clara',
+  'Clémence',
+  'Elodie',
+  'Helene',
+  'Jessica',
+  'Laura',
+  'Salomé',
+  'Sarah',
+  'Valentine',
+  'Valerie',
+  'Vanessa',
+  'Zoe'
+];
+
+const maleNames = [
+  'Adrien',
+  'Alexandre',
+  'Ali',
+  'Andy',
+  'Anthony',
+  'Antonin',
+  'Arnaud',
+  'Arno',
+  'Aurélien',
+  'Axel',
+  'Ben',
+  'Benjamin',
+  'Benoît',
+  'Boris',
+  'Bryan',
+  'Corentin',
+  'Cyril',
+  'Cédric',
+  'Danny',
+  'David',
+  'Dimitri',
+  'Dorian',
+  'Dylan',
+  'Emile',
+  'Florent',
+  'François',
+  'Gauthier',
+  'Gaëtan',
+  'Geoffrey',
+  'Gilles',
+  'Glenn',
+  'Grégoire',
+  'Grégory',
+  'Guillaume',
+  'Jason',
+  'Jean',
+  'John',
+  'Jonas',
+  'Jordan',
+  'Julien',
+  'Justin',
+  'Jérémy',
+  'Karim',
+  'Kevin',
+  'Killian',
+  'Laurent',
+  'Leo',
+  'Loic',
+  'Louis',
+  'Luca',
+  'Lucas',
+  'Mael',
+  'Martin',
+  'Mathieu',
+  'Matteo',
+  'Matthias',
+  'Max',
+  'Maxence',
+  'Maxime',
+  'Michael',
+  'Nicolas',
+  'Olivier',
+  'Pierre',
+  'Péter',
+  'Quentin',
+  'Raphael',
+  'Renaud',
+  'Robin',
+  'Romain',
+  'Rémi',
+  'Samuel',
+  'Sebastien',
+  'Simon',
+  'Stéphane',
+  'Tanguy',
+  'Thibaut',
+  'Thomas',
+  'Tom',
+  'Tony',
+  'Tristan',
+  'Valentin',
+  'William',
+  'Xavier',
+  'Yannick',
+  'Alexis',
+  'Antoine',
+  'Arthur',
+  'Aymeric',
+  'Charles',
+  'Clement',
+  'Florian',
+  'Hugo',
+  'Ilias',
+  'Jerome',
+  'Jonathan',
+  'Marco',
+  'Mohamed',
+  'Nathan',
+  'Noah',
+  'Vincent'
+];
+
+const lastNames = [
+  'Aakster',
+  'Berg',
+  'Vincent',
+  'Bezuindenhout',
+  'Bouwmeester',
+  'Bunschoten',
+  'Cruyssen',
+  'Dam',
+  'De Witte',
+  'Eikenboom',
+  'Elzinga',
+  'Geelen',
+  'Aaldenberg',
+  'Haak',
+  'Haanraads',
+  'Hagen',
+  'Heeren',
+  'Hendrix',
+  'Hoedemaker',
+  'Holt',
+  'Janssens',
+  'Jonker',
+  'Kappel',
+  'Aarden',
+  'Klein',
+  'Kloet',
+  'Koopman',
+  'Kuiper',
+  'Maes',
+  'Mertens',
+  'Offermans',
+  'Peerenboom',
+  'Peeters',
+  'Prinsen',
+  'Aarle',
+  'Rademaker',
+  'Rietveld',
+  'Roggeveen',
+  'Romeijnders',
+  'Smet',
+  'Spijker',
+  'Ter Avest',
+  'Van Aalsburg',
+  'Van Alphen',
+  'Van Assen',
+  'Achterberg',
+  'Van Der Aart',
+  'Archambault',
+  'Beauchene',
+  'Beaulieu',
+  'Bellamy',
+  'Berger',
+  'Blanc',
+  'Boivin',
+  'Borde',
+  'Brisbois',
+  'Achthoven',
+  'Chaput',
+  'Chastain',
+  'Chevalier',
+  'Cloutier',
+  'Cousineau',
+  'Deforest',
+  'Dubois',
+  'Dumont',
+  'Duval',
+  'Fabre',
+  'Adrichem',
+  'Fontaine',
+  'Gagneux',
+  'Garcon',
+  'Janvier',
+  'Lachapelle',
+  'Lamar',
+  'Lane',
+  'Langlais',
+  'Lavigne',
+  'Lemaire',
+  'Baardwijk',
+  'Leroux',
+  'Marchand',
+  'Monet',
+  'Neuville',
+  'Petit',
+  'Plamondon',
+  'Plourde',
+  'Poirier',
+  'Poulin',
+  'Proulx',
+  'Bakhuizen',
+  'Royer',
+  'Savatier',
+  'Segal',
+  'Tailler',
+  'Tasse',
+  'Travers',
+  'Tremblay',
+  'Tremble',
+  'Victor',
+  'Villenueve'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/Brazil/bundle.ts b/packages/plugins/src/countries/Brazil/bundle.ts
new file mode 100644
index 000000000..3de48d31e
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/bundle.ts
@@ -0,0 +1,245 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Brazil: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'brazil',
+  regionNames: i18n.regionNames,
+  continent: 'south_america',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxxx-xxx',
+      replacements: {
+        // 'X': '123456789',
+        // 'x': '0123456789',
+        Y: '012345678',
+        W: '01234567',
+        V: '0123456',
+        U: '012345',
+        T: '01234',
+        S: '0123',
+        R: '678',
+        Q: '89',
+        P: '3456'
+      }
+    }
+  },
+  regions: [
+    {
+      regionName: 'São Paulo',
+      regionShort: 'SP',
+      regionSlug: 'sau_paulo',
+      weight: 41,
+      cities: [
+        'Guarulhos',
+        'Campinas',
+        'Osasco',
+        'Ribeirão Preto',
+        'Mauá',
+        'Mogi das Cruzes',
+        'Diadema',
+        'Jundiaí',
+        'Carapicuíba',
+        'Piracicaba'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '1Xxxx-xxx'
+        }
+      }
+    },
+    {
+      regionName: 'Minas Gerais',
+      regionShort: 'MG',
+      regionSlug: 'minas_gerais',
+      weight: 20,
+      cities: [
+        'Belo Horizonte',
+        'Uberlândia',
+        'Contagem',
+        'Juiz de Fora',
+        'Betim',
+        'Montes Claros',
+        'Ribeirão das Neves',
+        'Uberaba',
+        'Governador Valadares',
+        'Ipatinga',
+        'Sete Lagoas',
+        'Divinópolis',
+        'Santa Luzia'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '3xxxxxxx'
+        }
+      }
+    },
+    {
+      regionName: 'Rio de Janeiro',
+      regionShort: 'RJ',
+      regionSlug: 'rio',
+      weight: 16,
+      cities: [
+        'Rio de Janeiro',
+        'São Gonçalo',
+        'Duque de Caxias',
+        'Nova Iguaçu',
+        'Niterói',
+        'Belford Roxo',
+        'Campos dos Goytacazes',
+        'São João de Meriti',
+        'Petrópolis'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '2Yxxx-xxx'
+        }
+      }
+    },
+    {
+      regionName: 'Bahia',
+      regionShort: 'BA',
+      regionSlug: 'bahia',
+      weight: 14,
+      cities: ['Salvador', 'Feira de Santana', 'Vitória da Conquista', 'Camaçari', 'Itabuna', 'Juazeiro', 'Ilhéus', 'Lauro de Freitas'],
+      extendedData: {
+        zipFormat: {
+          format: '4Yxxx-xxx'
+        }
+      }
+    },
+    {
+      regionName: 'Rio Grande do Sul',
+      regionShort: 'RS',
+      regionSlug: 'rio_grande',
+      weight: 11,
+      cities: ['Porto Alegre', 'Caxias do Sul', 'Pelotas', 'Canoas', 'Santa Maria', 'Gravataí', 'Novo Hamburgo', 'Rio Grande'],
+      extendedData: {
+        zipFormat: {
+          format: '9xxxx-xxx'
+        }
+      }
+    },
+    {
+      regionName: 'Paraná',
+      regionShort: 'PR',
+      regionSlug: 'parana',
+      weight: 11,
+      cities: [
+        'Curitiba',
+        'Londrina',
+        'Maringá',
+        'Ponta Grossa',
+        'Cascavel',
+        'São José dos Pinhais',
+        'Foz do Iguaçu',
+        'Colombo',
+        'Guarapuava',
+        'Paranaguá'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '8Wxxx-xxx'
+        }
+      }
+    },
+    {
+      regionName: 'Pernambuco',
+      regionShort: 'PE',
+      regionSlug: 'pernambuco',
+      weight: 9,
+      cities: ['Recife', 'Jaboatão dos Guararapes', 'Olinda', 'Caruaru', 'Paulista', 'Petrolina', 'Cabo de Santo Agostinho', 'Camaragibe'],
+      extendedData: {
+        zipFormat: {
+          format: '5Vxxx-xxx'
+        }
+      }
+    },
+    {
+      regionName: 'Ceará',
+      regionShort: 'CE',
+      regionSlug: 'ceara',
+      weight: 9,
+      cities: ['Fortaleza', 'Caucaia', 'Juazeiro do Norte', 'Maracanaú', 'Sobral', 'Crato', 'Itapipoca', 'Maranguape'],
+      extendedData: {
+        zipFormat: {
+          format: '6Sxxx-xxx'
+        }
+      }
+    },
+    {
+      regionName: 'Pará',
+      regionShort: 'PA',
+      regionSlug: 'para',
+      weight: 8,
+      cities: ['Belém', 'Ananindeua', 'Santarém', 'Marabá', 'Castanhal', 'Parauapebas', 'Abaetetuba', 'Cametá', 'Bragança'],
+      extendedData: {
+        zipFormat: {
+          format: '6RYxx-xxx'
+        }
+      }
+    },
+    {
+      regionName: 'Maranhão',
+      regionShort: 'MA',
+      regionSlug: 'maranhao',
+      weight: 7,
+      cities: [
+        'São Luís',
+        'Imperatriz',
+        'Timon',
+        'Caxias',
+        'Codó',
+        'Paço do Lumiar',
+        'Açailândia',
+        'Bacabal',
+        'Santa Inês',
+        'Balsas',
+        'Chapadinha',
+        'Barra do Corda'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '65xxx-xxx'
+        }
+      }
+    },
+    {
+      regionName: 'Santa Catarina',
+      regionShort: 'SC',
+      regionSlug: 'santa_catarina',
+      weight: 6,
+      cities: ['Joinville', 'Florianópolis', 'Blumenau', 'São José', 'Criciúma', 'Chapecó', 'Itajaí'],
+      extendedData: {
+        zipFormat: {
+          format: '8Qxxx-xxx'
+        }
+      }
+    },
+    {
+      regionName: 'Goiás',
+      regionShort: 'GO',
+      regionSlug: 'goias',
+      weight: 6,
+      cities: ['Goiânia', 'Aparecida de Goiânia', 'Anápolis', 'Rio Verde', 'Luziânia', 'Águas Lindas de Goiás', 'Valparaíso de Goiás'],
+      extendedData: {
+        zipFormat: {
+          format: '7P7xx-xxx'
+        }
+      }
+    },
+    {
+      regionName: 'Paraíba',
+      regionShort: 'PB',
+      regionSlug: 'paraiba',
+      weight: 4,
+      cities: ['João Pessoa', 'Campina Grande', 'Santa Rita', 'Patos', 'Bayeux', 'Sousa', 'Cajazeiras'],
+      extendedData: {
+        zipFormat: {
+          format: '58xxx-xxx'
+        }
+      }
+    }
+  ]
+});
+
+export default Brazil;
diff --git a/packages/plugins/src/countries/Brazil/i18n/ar.json b/packages/plugins/src/countries/Brazil/i18n/ar.json
new file mode 100644
index 000000000..6b0c2f7da
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "البرازيل",
+    "regionNames": "الولايات البرازيلية"
+}
diff --git a/packages/plugins/src/countries/Brazil/i18n/de.json b/packages/plugins/src/countries/Brazil/i18n/de.json
new file mode 100644
index 000000000..0e85f5076
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Brasilien",
+  "regionNames": "Brasilianische Staaten"
+}
diff --git a/packages/plugins/src/countries/Brazil/i18n/en.json b/packages/plugins/src/countries/Brazil/i18n/en.json
new file mode 100644
index 000000000..580f0072b
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/en.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Brazil",
+    "regionNames": "Brazilian States"
+}
diff --git a/packages/plugins/src/countries/Brazil/i18n/es.json b/packages/plugins/src/countries/Brazil/i18n/es.json
new file mode 100644
index 000000000..d7736fae8
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Brasil",
+  "regionNames": "Estados brasileños"
+}
diff --git a/packages/plugins/src/countries/Brazil/i18n/fr.json b/packages/plugins/src/countries/Brazil/i18n/fr.json
new file mode 100644
index 000000000..05c9582d9
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Brésil",
+  "regionNames": "États brésiliens"
+}
diff --git a/packages/plugins/src/countries/Brazil/i18n/hi.json b/packages/plugins/src/countries/Brazil/i18n/hi.json
new file mode 100644
index 000000000..ce1eba3a7
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "ब्राज़िल",
+    "regionNames": "ब्राजील के राज्य"
+}
diff --git a/packages/plugins/src/countries/Brazil/i18n/ja.json b/packages/plugins/src/countries/Brazil/i18n/ja.json
new file mode 100644
index 000000000..f3fd2e8fa
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "ブラジル",
+    "regionNames": "ブラジルの州"
+}
diff --git a/packages/plugins/src/countries/Brazil/i18n/nl.json b/packages/plugins/src/countries/Brazil/i18n/nl.json
new file mode 100644
index 000000000..0fef47e40
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Brazilië",
+  "regionNames": "Braziliaanse staten"
+}
diff --git a/packages/plugins/src/countries/Brazil/i18n/pt.json b/packages/plugins/src/countries/Brazil/i18n/pt.json
new file mode 100644
index 000000000..903ae5161
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Brasil",
+    "regionNames": "Estados brasileiros"
+}
diff --git a/packages/plugins/src/countries/Brazil/i18n/ru.json b/packages/plugins/src/countries/Brazil/i18n/ru.json
new file mode 100644
index 000000000..37113fc0d
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Бразилия",
+    "regionNames": "бразильские штаты"
+}
diff --git a/packages/plugins/src/countries/Brazil/i18n/ta.json b/packages/plugins/src/countries/Brazil/i18n/ta.json
new file mode 100644
index 000000000..a7c0dc167
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "பிரேசில்",
+    "regionNames": "பிரேசிலிய நாடுகள்"
+}
diff --git a/packages/plugins/src/countries/Brazil/i18n/zh.json b/packages/plugins/src/countries/Brazil/i18n/zh.json
new file mode 100644
index 000000000..cd26a31a5
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "巴西",
+    "regionNames": "巴西各州"
+}
diff --git a/packages/plugins/src/countries/Brazil/names.ts b/packages/plugins/src/countries/Brazil/names.ts
new file mode 100644
index 000000000..b4cacc2dc
--- /dev/null
+++ b/packages/plugins/src/countries/Brazil/names.ts
@@ -0,0 +1,618 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Agatha',
+  'Agatha Sophia',
+  'Agnes',
+  'Alana',
+  'Alexia',
+  'Alice',
+  'Alice Vitória',
+  'Aline',
+  'Alícia',
+  'Amanda',
+  'Ana',
+  'Ana Alice',
+  'Ana Beatriz',
+  'Ana Carolina',
+  'Ana Cecília',
+  'Ana Clara',
+  'Ana Elisa',
+  'Ana Helena',
+  'Ana Júlia',
+  'Ana Lara',
+  'Ana Laura',
+  'Ana Liz',
+  'Ana Luísa',
+  'Ana Lívia',
+  'Ana Maria',
+  'Ana Sophia',
+  'Ana Vitória',
+  'Analice',
+  'Analu',
+  'Angelina',
+  'Anne',
+  'Antonella',
+  'Antônia',
+  'Ariella',
+  'Aurora',
+  'Ayla',
+  'Ayla Sophia',
+  'Beatriz',
+  'Bella',
+  'Betina',
+  'Bianca',
+  'Brenda',
+  'Bruna',
+  'Bárbara',
+  'Camila',
+  'Camilly',
+  'Carolina',
+  'Caroline',
+  'Catarina',
+  'Cecília',
+  'Celina',
+  'Chloe',
+  'Clara',
+  'Clarice',
+  'Diana',
+  'Débora',
+  'Eduarda',
+  'Elis',
+  'Elisa',
+  'Ellen',
+  'Eloá',
+  'Eloá Victoria',
+  'Emanuela',
+  'Emanuelly',
+  'Emanuelly Vitória',
+  'Emilly',
+  'Emilly Vitória',
+  'Esther',
+  'Eva',
+  'Evelyn',
+  'Fernanda',
+  'Flora',
+  'Gabriela',
+  'Gabrielly',
+  'Giovanna',
+  'Giulia',
+  'Hadassa',
+  'Hannah',
+  'Helena',
+  'Helena Vitória',
+  'Heloise',
+  'Heloísa',
+  'Heloísa Vitória',
+  'Iris',
+  'Isa',
+  'Isabel',
+  'Isabella',
+  'Isabelly',
+  'Isadora',
+  'Isis',
+  'Jade',
+  'Joana',
+  'Juliana',
+  'Júlia',
+  'Kiara',
+  'Lara',
+  'Lara Sophia',
+  'Larissa',
+  'Laura',
+  'Laura Beatriz',
+  'Laura Sophia',
+  'Lauren',
+  'Lavínia',
+  'Laís',
+  'Leonor',
+  'Letícia',
+  'Lia',
+  'Liz',
+  'Liz Maria',
+  'Lorena',
+  'Lorena Vitória',
+  'Louise',
+  'Luana',
+  'Luara',
+  'Luiza',
+  'Luna',
+  'Luísa Helena',
+  'Lívia',
+  'Lívia Maria',
+  'Madalena',
+  'Maitê',
+  'Malú',
+  'Manoela',
+  'Manu',
+  'Manuela',
+  'Manuelly',
+  'Marcela',
+  'Maria',
+  'Maria Alice',
+  'Maria Antonella',
+  'Maria Antônia',
+  'Maria Beatriz',
+  'Maria Cecília',
+  'Maria Clara',
+  'Maria Eduarda',
+  'Maria Elisa',
+  'Maria Eloá',
+  'Maria Esther',
+  'Maria Fernanda',
+  'Maria Flor',
+  'Maria Gabriela',
+  'Maria Helena',
+  'Maria Heloísa',
+  'Maria Isabel',
+  'Maria Isabella',
+  'Maria Isadora',
+  'Maria Isis',
+  'Maria Júlia',
+  'Maria Laura',
+  'Maria Liz',
+  'Maria Luiza',
+  'Maria Rita',
+  'Maria Sophia',
+  'Maria Teresa',
+  'Maria Valentina',
+  'Maria Vitória',
+  'Mariah',
+  'Mariana',
+  'Marina',
+  'Martina',
+  'Maya',
+  'Maísa',
+  'Mel',
+  'Melina',
+  'Melinda',
+  'Melissa',
+  'Micaela',
+  'Milena',
+  'Mirella',
+  'Natália',
+  'Nicole',
+  'Nina',
+  'Olívia',
+  'Paola',
+  'Pietra',
+  'Pérola',
+  'Rafaela',
+  'Raquel',
+  'Rayssa',
+  'Rebeca',
+  'Safira',
+  'Sarah',
+  'Serena',
+  'Sophia',
+  'Sophia Emanuelly',
+  'Sophia Vitória',
+  'Sophie',
+  'Stella',
+  'Tainá',
+  'Teresa',
+  'Thalita',
+  'Thayla',
+  'Theodora',
+  'Valentina',
+  'Vitória',
+  'Yara',
+  'Yasmin',
+  'Yasmin Vitória',
+  'Yohanna',
+  'Zoe'
+];
+
+const maleNames = [
+  'Abner',
+  'Adrian',
+  'Afonso',
+  'Alexandre',
+  'André',
+  'Anthony',
+  'Anthony Gabriel',
+  'Anthony Miguel',
+  'Antônio',
+  'Apolo',
+  'Aquiles',
+  'Arthur',
+  'Arthur Felipe',
+  'Arthur Gabriel',
+  'Arthur Henrique',
+  'Arthur Miguel',
+  'Asafe',
+  'Augusto',
+  'Benjamin',
+  'Bento',
+  'Benício',
+  'Bernardo',
+  'Bernardo Henrique',
+  'Breno',
+  'Bruno',
+  'Bryan',
+  'Bryan Henrique',
+  'Caetano',
+  'Caio',
+  'Caleb',
+  'Carlos Eduardo',
+  'Carlos Henrique',
+  'Cauã',
+  'Christian',
+  'Christopher',
+  'Conrado',
+  'Daniel',
+  'Danilo',
+  'Dante',
+  'Davi',
+  'Davi Henrique',
+  'Davi Lucas',
+  'Davi Lucca',
+  'Davi Luiz',
+  'Davi Miguel',
+  'Derick',
+  'Diego',
+  'Diogo',
+  'Dom',
+  'Dominic',
+  'Dylan',
+  'Eduardo',
+  'Elias',
+  'Emanuel',
+  'Enrico',
+  'Enzo',
+  'Enzo Gabriel',
+  'Enzo Miguel',
+  'Erick',
+  'Estêvão',
+  'Ezequiel',
+  'Felipe',
+  'Fernando',
+  'Filipe',
+  'Francisco',
+  'Frederico',
+  'Gabriel',
+  'Gabriel Henrique',
+  'Gael',
+  'Guilherme',
+  'Gustavo',
+  'Gustavo Henrique',
+  'Heitor',
+  'Heitor Gabriel',
+  'Heitor Henrique',
+  'Heitor Miguel',
+  'Henrique',
+  'Henry',
+  'Henry Gabriel',
+  'Hugo',
+  'Igor',
+  'Inácio',
+  'Isaac',
+  'Israel',
+  'Joaquim',
+  'Jorge',
+  'Josué',
+  'José',
+  'José Arthur',
+  'José Augusto',
+  'José Felipe',
+  'José Henrique',
+  'José Lucas',
+  'José Miguel',
+  'José Pedro',
+  'João',
+  'João Antônio',
+  'João Arthur',
+  'João Emanuel',
+  'João Felipe',
+  'João Gabriel',
+  'João Guilherme',
+  'João Henrique',
+  'João Lucas',
+  'João Lucca',
+  'João Miguel',
+  'João Paulo',
+  'João Pedro',
+  'João Vicente',
+  'João Vitor',
+  'Kaique',
+  'Kauê',
+  'Kevin',
+  'Leandro',
+  'Leonardo',
+  'Levi',
+  'Liam',
+  'Lorenzo',
+  'Lorenzo Gabriel',
+  'Lorenzo Henrique',
+  'Lorenzo Miguel',
+  'Luan',
+  'Lucas',
+  'Lucas Gabriel',
+  'Lucca',
+  'Luigi',
+  'Luiz',
+  'Luiz Antônio',
+  'Luiz Eduardo',
+  'Luiz Felipe',
+  'Luiz Fernando',
+  'Luiz Guilherme',
+  'Luiz Gustavo',
+  'Luiz Henrique',
+  'Luiz Miguel',
+  'Luiz Otávio',
+  'Marcelo',
+  'Marcos',
+  'Martin',
+  'Matheus',
+  'Matheus Henrique',
+  'Mathias',
+  'Matteo',
+  'Miguel',
+  'Miguel Henrique',
+  'Moisés',
+  'Murilo',
+  'Nathan',
+  'Nicolas',
+  'Nicolas Gabriel',
+  'Noah',
+  'Oliver',
+  'Otto',
+  'Otávio',
+  'Paulo',
+  'Paulo Henrique',
+  'Pedro',
+  'Pedro Arthur',
+  'Pedro Augusto',
+  'Pedro Gabriel',
+  'Pedro Henrique',
+  'Pedro Lucas',
+  'Pedro Lucca',
+  'Pedro Miguel',
+  'Pietro',
+  'Pietro Henrique',
+  'Rael',
+  'Rafael',
+  'Raul',
+  'Ravi',
+  'Renan',
+  'Ricardo',
+  'Richard',
+  'Rodrigo',
+  'Ruan',
+  'Ryan',
+  'Samuel',
+  'Samuel Henrique',
+  'Santiago',
+  'Saulo',
+  'Thales',
+  'Theodoro',
+  'Thiago',
+  'Thomas',
+  'Théo',
+  'Théo Henrique',
+  'Tomás',
+  'Valentim',
+  'Vicente',
+  'Vinícius',
+  'Vitor',
+  'Vitor Gabriel',
+  'Vitor Hugo',
+  'William',
+  'Yago',
+  'Yan',
+  'Yuri',
+  'Álvaro',
+  'Ícaro',
+  'Ítalo'
+];
+
+const lastNames = [
+  'da Silva',
+  'dos Santos',
+  'Pereira',
+  'Alves',
+  'Ferreira',
+  'Rodrigues',
+  'Silva',
+  'de Oliveira',
+  'de Souza',
+  'Gomes',
+  'Santos',
+  'Oliveira',
+  'Ribeiro',
+  'de Jesus',
+  'Soares',
+  'Martins',
+  'Barbosa',
+  'Vieira',
+  'Souza',
+  'Lopes',
+  'Lima',
+  'Batista',
+  'Fernandes',
+  'Costa',
+  'de Sousa',
+  'Dias',
+  'da Conceiçao',
+  'de Lima',
+  'do Nascimento',
+  'Moreira',
+  'Nunes',
+  'da Costa',
+  'Araujo',
+  'Marques',
+  'Cardoso',
+  'de Almeida',
+  'Mendes',
+  'Nascimento',
+  'Teixeira',
+  'Ramos',
+  'Carvalho',
+  'Rosa',
+  'Almeida',
+  'Sousa',
+  'Machado',
+  'Rocha',
+  'Santana',
+  'de Araujo',
+  'Borges',
+  'Bezerra',
+  'Henrique',
+  'Pinheiro',
+  'de Carvalho',
+  'Monteiro',
+  'Correa',
+  'Aparecido',
+  'Andrade',
+  'Pinto',
+  'da Cruz',
+  'de Paula',
+  'de Freitas',
+  'Nogueira',
+  'Leite',
+  'Tavares',
+  'Miranda',
+  'Pires',
+  'Garcia',
+  'dos Reis',
+  'Xavier',
+  'do Carmo',
+  'Duarte',
+  'de Andrade',
+  'Freitas',
+  'Correia',
+  'de Fatima',
+  'Barros',
+  'Coelho',
+  'Gonçalves',
+  'de Melo',
+  'Reis',
+  'Viana',
+  'Campos',
+  'Moraes',
+  'Felix',
+  'Brito',
+  'Cordeiro',
+  'Neves',
+  'Moura',
+  'Guimaraes',
+  'Farias',
+  'da Rocha',
+  'de Castro',
+  'Carneiro',
+  'Silveira',
+  'Candido',
+  'Melo',
+  'Medeiros',
+  'de Assis',
+  'Bispo',
+  'de Lourdes',
+  'Cruz',
+  'Dantas',
+  'Maciel',
+  'Morais',
+  'Braga',
+  'Cavalcante',
+  'Antunes',
+  'Siqueira',
+  'de Moura',
+  'Domingos',
+  'Macedo',
+  'de Santana',
+  'Fonseca',
+  'Caetano',
+  'Castro',
+  'Menezes',
+  'da Cunha',
+  'de Moraes',
+  'dos Anjos',
+  'Inacio',
+  'Matos',
+  'Sales',
+  'Cunha',
+  'Chaves',
+  'de Brito',
+  'Barreto',
+  'Queiroz',
+  'Magalhaes',
+  'Azevedo',
+  'Mota',
+  'Evangelista',
+  'Bento',
+  'Maia',
+  'Amorim',
+  'Cabral',
+  'Bueno',
+  'Mariano',
+  'Torres',
+  'Franca',
+  'Marinho',
+  'Amaral',
+  'Guedes',
+  'Freire',
+  'Leal',
+  'da Rosa',
+  'Matias',
+  'Paulino',
+  'Sampaio',
+  'Das Gracas',
+  'Mendonca',
+  'Camargo',
+  'Franco',
+  'Pacheco',
+  'Sántos',
+  'Aguiar',
+  'de Barros',
+  'de Morais',
+  'Diniz',
+  'Santiago',
+  'Figueiredo',
+  'Lemos',
+  'Muniz',
+  'Dutra',
+  'Bastos',
+  'da Silveira',
+  'Vasconcelos',
+  'de Azevedo',
+  'da Luz',
+  'Faria',
+  'Trindade',
+  'Gonzaga',
+  'Domingues',
+  'Paiva',
+  'Feitosa',
+  'de Abreu',
+  'Teles',
+  'de Matos',
+  'Braz',
+  'Coutinho',
+  'Nonato',
+  'Messias',
+  'Chagas',
+  'Simoes',
+  'Fagundes',
+  'Brandao',
+  'Das Dores',
+  'Teodoro',
+  'Firmino',
+  'Vaz',
+  'de Campos',
+  'Barboza',
+  'Das Chagas',
+  'Galdino',
+  'Custodio',
+  'Abreu',
+  'Das Neves',
+  'Peixoto',
+  'Ferraz',
+  'Rezende',
+  'Furtado'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/Canada/bundle.ts b/packages/plugins/src/countries/Canada/bundle.ts
new file mode 100644
index 000000000..aaeba1aca
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/bundle.ts
@@ -0,0 +1,706 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Canada: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'canada',
+  regionNames: i18n.regionNames,
+  continent: 'north_america',
+  extendedData: {
+    // the general zip format for the country. This may be optionally overridden for each region if a more
+    // specific format is desired. To prevent duplicate code, the replacements listed here cover ALL zip formats
+    // for each province
+    zipFormat: {
+      format: '%*@ *@*',
+      replacements: {
+        '%': 'ABCEGHJKLMNPRSTVXY',
+        '*': '0123456789',
+        '@': 'ABCEGHJKLMNPRSTVWXYZ',
+
+        // used in individual provinces below
+        '&': 'GHJ', // QC
+        '^': 'KLMNP' // ON
+      }
+    },
+
+    // the general phone format and area codes for the country
+    // http://cnac.ca/area_code_maps/canadian_area_codes.htm
+    phoneFormat: {
+      areaCodes: [
+        403,
+        587,
+        780,
+        825, // AB
+        236,
+        250,
+        604,
+        672,
+        778, // BC
+        204,
+        431, // MB
+        428,
+        506, // NB
+        709,
+        879, // NL
+        867, // NT, NU, YK
+        782,
+        902, // NS
+        416,
+        437,
+        647,
+        289,
+        365,
+        905,
+        343,
+        613,
+        226,
+        519,
+        548,
+        249,
+        705,
+        807, // ON
+        782,
+        902, // PE
+        367,
+        418,
+        581,
+        450,
+        579,
+        438,
+        514,
+        819,
+        873, // QC
+        306,
+        639 // SK
+      ],
+      displayFormats: ['(AAA} Xxx-xxxx', '1 (AAA} Xxx-xxxx', '1-AAA-Xxx-xxxx']
+    }
+  },
+
+  // our country-wide data, with info separated into regions
+  regions: [
+    {
+      regionName: 'Alberta',
+      regionShort: 'AB',
+      regionSlug: 'alberta',
+      weight: 11,
+      cities: [
+        'Airdrie',
+        'Alix',
+        'Banff',
+        'Barrhead',
+        'Bearberry',
+        'Beaumont',
+        'Bon Accord',
+        'Bonnyville',
+        'Bonnyville Municipal District',
+        'Bowden',
+        'Breton',
+        'Bruderheim',
+        'Calgary',
+        'Calmar',
+        'Camrose',
+        'Canmore',
+        'Carstairs',
+        'Castor',
+        'Chestermere',
+        'Clearwater Municipal District',
+        'Coaldale',
+        'Coalhurst',
+        'Cochrane',
+        'Crowsnest Pass',
+        'Crystal Springs',
+        'Devon',
+        'Drayton Valley',
+        'Drumheller',
+        'Eckville',
+        'Edmonton',
+        'Fahler',
+        'Fort Saskatchewan',
+        'Gibbons',
+        'Glendon',
+        'Grande Prairie',
+        'Grande Cache',
+        'High Level',
+        'Hines Creek',
+        'Innisfail',
+        'Irricana',
+        'Jasper',
+        'Kitscoty',
+        'Lac La Biche County',
+        'Lac Ste. Anne',
+        'Lacombe',
+        'Lacombe County',
+        'Lakeland County',
+        'Lamont',
+        'Leduc',
+        'Legal',
+        'Lloydminster',
+        'Lethbridge',
+        'Mayerthorpe',
+        'Medicine Hat',
+        'Millet',
+        'Morinville',
+        'Mundare',
+        'Nanton',
+        'New Sarepta',
+        'Okotoks',
+        'Oyen',
+        'Provost',
+        'Parkland County',
+        'Penhold',
+        'Picture Butte',
+        'Pincher Creek',
+        'Ponoka',
+        'Raymond',
+        'Red Deer',
+        'Redwater',
+        'Rimbey',
+        'Rocky Mountain House',
+        'Rocky View',
+        'Rycroft',
+        'St. Albert',
+        'St. Paul',
+        'Sedgewick',
+        'Smoky Lake',
+        'Spruce Grove',
+        'Stirling',
+        'Strathcona County',
+        'Stony Plain',
+        'Sundrie',
+        'Sunset Point',
+        'Swan Hills',
+        'Sylvan Lake',
+        'Taber',
+        'Tofield',
+        'Trochu',
+        'Valleyview',
+        'Vegreville',
+        'Vilna',
+        'Wabamun',
+        'Warburg',
+        'Warspite',
+        'Westlock',
+        'Wetaskiwin',
+        'Wood Buffalo',
+        'Woodlands County',
+        'Yellowhead County'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: 'T*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [403, 587, 780, 825]
+        }
+      }
+    },
+    {
+      regionName: 'British Columbia',
+      regionShort: 'BC',
+      regionSlug: 'british_columbia',
+      weight: 13,
+      cities: [
+        '100 Mile House',
+        'Abbotsford',
+        'Alert Bay',
+        'Armstrong',
+        'Belcarra',
+        'Burnaby',
+        'Burns Lake',
+        'Cache Creek',
+        'Cariboo Regional District',
+        'Castlegar',
+        'Chetwynd',
+        'Chilliwack',
+        'Coldstream',
+        'Colwood',
+        'Comox',
+        'Coquitlam',
+        'Cranbrook',
+        'Dawson Creek',
+        'Delta',
+        'Fernie',
+        'Duncan',
+        'Fort St. John',
+        'Fraser Lake',
+        'Fraser-Fort George',
+        'Gibsons',
+        'Harrison Hot Springs',
+        'Hope',
+        'Houston',
+        "Hudson's Hope",
+        'Kelowna',
+        'Kent',
+        'Kimberly',
+        'Kitimat',
+        'Lake Cowichan',
+        'Langford',
+        'Langley',
+        'Lions Bay',
+        'Mission',
+        'Maple Ridge',
+        'Merritt',
+        'Midway',
+        'Nanaimo',
+        'Nakusp',
+        'Nelson',
+        'New Westminster',
+        'North Cowichan',
+        'North Saanich',
+        'North Vancouver',
+        'Oliver',
+        'Pemberton',
+        'Penticton',
+        'Pitt Meadows',
+        'Port Alice',
+        'Port Coquitlam',
+        'Port Moody',
+        'Prince George',
+        'Qualicum Beach',
+        'Richmond',
+        'Salt Spring Island',
+        'Silverton',
+        'Smithers',
+        'Sooke',
+        'Sparwood',
+        'Stewart',
+        'Sunshine Coast Regional District',
+        'Surrey',
+        'Terrance',
+        'Tumbler Ridge',
+        'Ucluelet',
+        'Vancouver',
+        'Vanderhoof',
+        'Victoria',
+        'West Vancouver',
+        'White Rock',
+        'Williams Lake'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: 'V*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [236, 250, 604, 672, 778]
+        }
+      }
+    },
+    {
+      regionName: 'Manitoba',
+      regionShort: 'MB',
+      regionSlug: 'manitoba',
+      weight: 4,
+      cities: ['Winnipeg', 'Stonewall', 'Minitonas', 'Lourdes', 'Flin Flon', 'Daly', 'Brandon', 'Beausejour'],
+      extendedData: {
+        zipFormat: {
+          format: 'R*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [204, 431]
+        }
+      }
+    },
+    {
+      regionName: 'New Brunswick',
+      regionShort: 'NB',
+      regionSlug: 'new_brunswick',
+      weight: 2,
+      cities: ['Bathurst', 'Campbellton', 'Dieppe', 'Edmundston', 'Fredericton', 'Miramichi', 'Moncton', 'Saint John'],
+      extendedData: {
+        zipFormat: {
+          format: 'E*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [428, 506]
+        }
+      }
+    },
+    {
+      regionName: 'Newfoundland and Labrador',
+      regionShort: 'NL',
+      regionSlug: 'newfoundland_and_labrador',
+      weight: 2,
+      cities: [
+        "St. John's",
+        'Springdale',
+        "Spaniard's Bay",
+        'Rigolet',
+        'Paradise',
+        'Mount Pearl',
+        'McCallum',
+        'Marystown',
+        'Harbour Grace',
+        'Glovertown',
+        'Gander',
+        'Fogo',
+        'Fortune',
+        'Carbonear',
+        'Burin',
+        'Bonavista',
+        'Bay Roberts'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: 'A*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [709, 879]
+        }
+      }
+    },
+    {
+      regionName: 'Northwest Territories',
+      regionShort: 'NT',
+      regionSlug: 'northwest_territories',
+      weight: 1,
+      cities: [
+        'Yellowknife',
+        'Wrigley',
+        'Wha Ti',
+        'Wekweti',
+        'Tulita',
+        'Tuktoyaktuk',
+        'Tsiigehtchic',
+        'Sachs Harbour',
+        'Rae Lakes',
+        'Rae-Edzo',
+        'Paulatuk',
+        'Norman Wells',
+        "Lutsel K'e",
+        'Kakisa',
+        'Inuvik',
+        'Holman',
+        'Hay River',
+        'Fort Smith',
+        'Fort Simpson',
+        'Fort Resolution',
+        'Fort Providence',
+        'Fort McPherson',
+        'Fort Laird',
+        'Fort Good Hope',
+        'Enterprise',
+        'Deline',
+        'Coleville Lake',
+        'Aklavik'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: 'X*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [867]
+        }
+      }
+    },
+    {
+      regionName: 'Nova Scotia',
+      regionShort: 'NS',
+      regionSlug: 'nova_scotia',
+      weight: 1,
+      cities: [
+        'Municipal District',
+        'Town of Yarmouth',
+        'Wolfville',
+        'Pugwash',
+        'Pictou',
+        'New Glasgow',
+        'Halifax',
+        'Guysborough',
+        'Cumberland County',
+        'Cape Breton Island',
+        'Berwick',
+        'Baddeck',
+        'Argyle',
+        'Annapolis Royal',
+        'Annapolis County'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: 'B*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [782, 902]
+        }
+      }
+    },
+    {
+      regionName: 'Nunavut',
+      regionShort: 'NU',
+      regionSlug: 'nunavut',
+      weight: 1,
+      cities: ['Arviat', 'Cambridge Bay', 'Gjoa Haven', 'Pangnirtung', 'Iqaluit'],
+      extendedData: {
+        zipFormat: {
+          format: 'X*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [867]
+        }
+      }
+    },
+    {
+      regionName: 'Ontario',
+      regionShort: 'ON',
+      regionSlug: 'ontario',
+      weight: 39,
+      cities: [
+        'Ajax',
+        'Aurora',
+        'Ancaster Town',
+        'Barrie',
+        'Bath',
+        'Blind River',
+        'Burlington',
+        'Caledon',
+        'Cobourg',
+        'Cornwall',
+        'Cumberland',
+        'East Gwillimbury',
+        'Essex',
+        'Etobicoke',
+        'Gloucester',
+        'Goderich',
+        'Grey County',
+        'Guelph',
+        'Hamilton',
+        'Hearst',
+        'Kapuskasing',
+        'Kawartha Lakes',
+        'Kearny',
+        'King Township',
+        'Kingston',
+        'Kitchener',
+        'Lakeshore',
+        'Lanark County',
+        'LaSalle',
+        'Leamington',
+        'Malahide',
+        'Markham',
+        'Merrickville-Wolford',
+        'Midlands',
+        'Township of Minden Hills',
+        'Minto',
+        'Newbury',
+        'Newmarket',
+        'Norfolk County',
+        'North Bay',
+        'Northumberland',
+        'Orangeville',
+        'Orilla',
+        'Osgoode',
+        'Ottawa',
+        'Ottawa-Carleton',
+        'Owen Sound',
+        'Oxford County',
+        'Pickering',
+        'Port Hope',
+        'Quinte West',
+        'Ramara',
+        'Renfrew',
+        'Richmond Hill',
+        'Russell',
+        'Scarborough',
+        'St. Catharines',
+        'St. Thomas',
+        'Greater Sudbury',
+        'Tay',
+        'Thorold',
+        'Thunder Bay',
+        'Toronto',
+        'Valley East',
+        'Vanier',
+        'Vaughan',
+        'Warwick',
+        'Welland',
+        'Whitby',
+        'Whitchurch-Stouffville',
+        'Whitewater Region Township',
+        'Wilmont',
+        'Windsor',
+        'Woodstock'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '^*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [416, 647, 437, 519, 226, 613, 343, 705, 249, 807, 905, 289, 365]
+        }
+      }
+    },
+    {
+      regionName: 'Prince Edward Island',
+      regionShort: 'PE',
+      regionSlug: 'prince_edward_island',
+      weight: 1,
+      cities: ['Charlottetown', 'Montague', 'Stratford'],
+      extendedData: {
+        zipFormat: {
+          format: 'C*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [782, 902]
+        }
+      }
+    },
+    {
+      regionName: 'Quebec',
+      regionShort: 'QC',
+      regionSlug: 'quebec',
+      weight: 23,
+      cities: [
+        'Amqui',
+        'Cabano',
+        'Dégelis',
+        'Price',
+        'Rimouski',
+        'Rivière-du-Loup',
+        'Sainte-Flavie',
+        'Alma',
+        'Chambord',
+        'Chicoutimi',
+        'La Baie',
+        'Labrecque',
+        'Saguenay',
+        'Saint-Prime',
+        'Shipshaw',
+        'Baie-Saint-Paul',
+        'Beauport',
+        'Cap-Rouge',
+        'Deschambault',
+        'Isle-aux-Coudres',
+        'Lac-Serent',
+        'Malbaie',
+        'Neuville',
+        'Pointe-au-Pic',
+        'Québec City',
+        'Saint-Hilarion',
+        'Saint-Urbain',
+        'Batiscan',
+        'Cap-de-la-Madeleine',
+        'Champlain',
+        'Pointe-du-Lac',
+        'Saint-Georges',
+        'Shawinigan',
+        'Trois-Rivières',
+        'Asbestos',
+        'Richmond',
+        'Sherbrooke',
+        'Valcourt',
+        'Anjou',
+        "Baie-D'Urfé",
+        'Beaconsfield',
+        'Côte Saint-Luc',
+        'Dollard-des-Ormeaux',
+        'Dorval',
+        'Hampstead',
+        'Kirkland',
+        'Lachine',
+        'LaSalle',
+        'Montreal',
+        'Outremont',
+        'Pierrefonds',
+        'Pointe-aux-Trembles',
+        'Pointe-Claire',
+        'Roxboro',
+        'Saint-Laurent',
+        'Saint-Pierre',
+        'Senneville',
+        'Verdun',
+        'Westmount',
+        'Aylmer',
+        'Buckingham',
+        'Cantley',
+        'Chelsea',
+        "Collines-de-l'Outaouais",
+        'Gatineau',
+        'Hull',
+        'Ville de Maniwaki',
+        'Mansfield-et-Pontefract',
+        'Montebello',
+        'Montpellier',
+        'Namur',
+        'Notre-Dame-de-la-Salette',
+        'Shawville',
+        'Thurso',
+        'Dubuisson',
+        'Malartic',
+        'Notre-Dame-du-Nord',
+        'Rouyn-Noranda',
+        'Baie-Comeau',
+        'Fermont',
+        'Kawawachikamach',
+        'Matagami',
+        'Caplan',
+        'Carleton',
+        'Gaspé',
+        'Gespeg',
+        'Maria',
+        'Murdochville',
+        'Cap-Saint-Ignace',
+        'Charny',
+        'Lévis'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '&*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [418, 581, 450, 579, 514, 438, 819, 873]
+        }
+      }
+    },
+    {
+      regionName: 'Saskatchewan',
+      regionShort: 'SK',
+      regionSlug: 'saskatchewan',
+      weight: 4,
+      cities: [
+        'Assiniboia',
+        'Calder',
+        'Canora',
+        'Estevan',
+        'Gravelbourg',
+        'Hudson Bay',
+        'Lang',
+        'Langenburg',
+        'Lloydminster',
+        'Macklin',
+        'Maple Creek',
+        'Milestone',
+        'Moose Jaw',
+        'North Battleford',
+        'Prince Albert',
+        'Regina',
+        'Saskatoon',
+        'Weyburn',
+        'Yorkton'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: 'S*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [306, 639]
+        }
+      }
+    },
+    {
+      regionName: 'Yukon',
+      regionShort: 'YT',
+      regionSlug: 'yukon',
+      weight: 1,
+      cities: ['Whitehorse', 'Watson Lake'],
+      extendedData: {
+        zipFormat: {
+          format: 'Y*@ *@*'
+        },
+        phoneFormat: {
+          areaCodes: [867]
+        }
+      }
+    }
+  ]
+});
+
+export default Canada;
diff --git a/packages/plugins/src/countries/Canada/i18n/ar.json b/packages/plugins/src/countries/Canada/i18n/ar.json
new file mode 100644
index 000000000..2d7822b0a
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "كندا",
+  "regionNames": "المقاطعات الكندية."
+}
diff --git a/packages/plugins/src/countries/Canada/i18n/de.json b/packages/plugins/src/countries/Canada/i18n/de.json
new file mode 100644
index 000000000..aa2457f83
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Kanada",
+  "regionNames": "Kanadische Provinzen"
+}
diff --git a/packages/plugins/src/countries/Canada/i18n/en.json b/packages/plugins/src/countries/Canada/i18n/en.json
new file mode 100644
index 000000000..435fb973a
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Canada",
+  "regionNames": "Canadian Prov."
+}
diff --git a/packages/plugins/src/countries/Canada/i18n/es.json b/packages/plugins/src/countries/Canada/i18n/es.json
new file mode 100644
index 000000000..22dcde017
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Canadá",
+  "regionNames": "Provincias canadienses"
+}
diff --git a/packages/plugins/src/countries/Canada/i18n/fr.json b/packages/plugins/src/countries/Canada/i18n/fr.json
new file mode 100644
index 000000000..8ece69b32
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Canada",
+  "regionNames": "Provinces canadiennes"
+}
diff --git a/packages/plugins/src/countries/Canada/i18n/hi.json b/packages/plugins/src/countries/Canada/i18n/hi.json
new file mode 100644
index 000000000..aa65159c4
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "कनाडा",
+  "regionNames": "कनाडा प्रो."
+}
diff --git a/packages/plugins/src/countries/Canada/i18n/ja.json b/packages/plugins/src/countries/Canada/i18n/ja.json
new file mode 100644
index 000000000..1a72abfcd
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "カナダ",
+  "regionNames": "カナダの州"
+}
diff --git a/packages/plugins/src/countries/Canada/i18n/nl.json b/packages/plugins/src/countries/Canada/i18n/nl.json
new file mode 100644
index 000000000..a24b40718
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Canada",
+  "regionNames": "Canadese provincies"
+}
diff --git a/packages/plugins/src/countries/Canada/i18n/pt.json b/packages/plugins/src/countries/Canada/i18n/pt.json
new file mode 100644
index 000000000..1e15b4b4e
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Canadá",
+  "regionNames": "Prov. Canadense"
+}
diff --git a/packages/plugins/src/countries/Canada/i18n/ru.json b/packages/plugins/src/countries/Canada/i18n/ru.json
new file mode 100644
index 000000000..dba5a27d0
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Канада",
+  "regionNames": "Канадские провинции"
+}
diff --git a/packages/plugins/src/countries/Canada/i18n/ta.json b/packages/plugins/src/countries/Canada/i18n/ta.json
new file mode 100644
index 000000000..b3bf3e233
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "கனடா",
+  "regionNames": "கனடிய மாகாணங்கள்"
+}
diff --git a/packages/plugins/src/countries/Canada/i18n/zh.json b/packages/plugins/src/countries/Canada/i18n/zh.json
new file mode 100644
index 000000000..56126e37e
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "加拿大",
+  "regionNames": "加拿大各省"
+}
diff --git a/packages/plugins/src/countries/Canada/names.ts b/packages/plugins/src/countries/Canada/names.ts
new file mode 100644
index 000000000..06c0f59d3
--- /dev/null
+++ b/packages/plugins/src/countries/Canada/names.ts
@@ -0,0 +1,468 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Aaliyah',
+  'Abigail',
+  'Addison',
+  'Alexa',
+  'Alice',
+  'Allison',
+  'Alyssa',
+  'Amelia',
+  'Anna',
+  'Annabelle',
+  'Aria',
+  'Arianna',
+  'Arielle',
+  'Aubrey',
+  'Audrey',
+  'Aurora',
+  'Autumn',
+  'Ava',
+  'Avery',
+  'Ayla',
+  'Beatrice',
+  'Brielle',
+  'Brooklyn',
+  'Callie',
+  'Charlie',
+  'Charlotte',
+  'Chloe',
+  'Claire',
+  'Clara',
+  'Eleanor',
+  'Elena',
+  'Elizabeth',
+  'Ella',
+  'Ellie',
+  'Emilia',
+  'Emily',
+  'Emma',
+  'Eva',
+  'Evelyn',
+  'Freya',
+  'Gabriella',
+  'Georgia',
+  'Grace',
+  'Hailey',
+  'Hannah',
+  'Harper',
+  'Hazel',
+  'Isabella',
+  'Isabelle',
+  'Isla',
+  'Ivy',
+  'Jade',
+  'Jordyn',
+  'Julia',
+  'Kaylee',
+  'Keira',
+  'Lauren',
+  'Layla',
+  'Leah',
+  'Liliana',
+  'Lillian',
+  'Lily',
+  'Lucy',
+  'Lyla',
+  'Mackenzie',
+  'Madelyn',
+  'Madison',
+  'Maya',
+  'Mia',
+  'Mila',
+  'Mya',
+  'Natalie',
+  'Nora',
+  'Nova',
+  'Olivia',
+  'Ophelia',
+  'Paisley',
+  'Penelope',
+  'Peyton',
+  'Piper',
+  'Quinn',
+  'Rachel',
+  'Riley',
+  'Rosalie',
+  'Rose',
+  'Ruby',
+  'Sadie',
+  'Savannah',
+  'Scarlett',
+  'Sienna',
+  'Sophia',
+  'Sophie',
+  'Stella',
+  'Taylor',
+  'Victoria',
+  'Violet',
+  'Zoey'
+];
+
+const maleNames = [
+  'Adam',
+  'Aiden',
+  'Alex',
+  'Alexander',
+  'Andrew',
+  'Arabia',
+  'Arthur',
+  'Asher',
+  'Austin',
+  'Australia',
+  'Avery',
+  'Benjamin',
+  'Bennett',
+  'Blake',
+  'Brayden',
+  'Brazil',
+  'Brody',
+  'Caleb',
+  'Callum',
+  'Carson',
+  'Carter',
+  'Charlie',
+  'Christian',
+  'Cole',
+  'Colton',
+  'Connor',
+  'Daniel',
+  'Declan',
+  'Dominic',
+  'Dylan',
+  'Easton',
+  'Edward',
+  'Eli',
+  'Elias',
+  'Elijah',
+  'Elliot',
+  'Emmett',
+  'Ethan',
+  'Evan',
+  'Everett',
+  'Felix',
+  'Gabriel',
+  'Gavin',
+  'Germany',
+  'Grayson',
+  'Harrison',
+  'Hayden',
+  'Henry',
+  'Hudson',
+  'Hunter',
+  'India',
+  'Isaac',
+  'Isaiah',
+  'Jace',
+  'Jack',
+  'Jackson',
+  'Jacob',
+  'James',
+  'Jayden',
+  'John',
+  'Jordan',
+  'Joseph',
+  'Joshua',
+  'Julian',
+  'Kayden',
+  'Landon',
+  'Leo',
+  'Levi',
+  'Liam',
+  'Lincoln',
+  'Logan',
+  'Luca',
+  'Lucas',
+  'Luke',
+  'Marcus',
+  'Mason',
+  'Matteo',
+  'Matthew',
+  'Maverick',
+  'Max',
+  'Michael',
+  'Nathan',
+  'Nicholas',
+  'Noah',
+  'Nolan',
+  'Oliver',
+  'Owen',
+  'Parker',
+  'Riley',
+  'Rowan',
+  'Ryan',
+  'Ryder',
+  'Samuel',
+  'Sebastian',
+  'Theo',
+  'Theodore',
+  'Thomas',
+  'Tristan',
+  'William',
+  'Wyatt',
+  'Xavier',
+  'Zachary',
+  'Zayn'
+];
+
+const lastNames = [
+  'Adams',
+  'Allard',
+  'Allen',
+  'Anderson',
+  'Andrews',
+  'Armstrong',
+  'Arsenault',
+  'Bailey',
+  'Baker',
+  'Beaudoin',
+  'Beaulieu',
+  'Bedard',
+  'Belanger',
+  'Bell',
+  'Bennett',
+  'Benoit',
+  'Bergeron',
+  'Bernard',
+  'Bernier',
+  'Bertrand',
+  'Berube',
+  'Bilodeau',
+  'Black',
+  'Blais',
+  'Boisvert',
+  'Bolduc',
+  'Bouchard',
+  'Boucher',
+  'Boudreau',
+  'Brooks',
+  'Brown',
+  'Burns',
+  'Butler',
+  'Cameron',
+  'Campbell',
+  'Caron',
+  'Carter',
+  'Champagne',
+  'Chan',
+  'Charbonneau',
+  'Chen',
+  'Clark',
+  'Clarke',
+  'Cloutier',
+  'Collins',
+  'Cook',
+  'Cooper',
+  'Cormier',
+  'Cote',
+  'Couture',
+  'Crawford',
+  'Cyr',
+  'Davidson',
+  'Davies',
+  'Davis',
+  'Demers',
+  'Desjardins',
+  'Dion',
+  'Dube',
+  'Dubois',
+  'Dufour',
+  'Dupuis',
+  'Edwards',
+  'Elliott',
+  'Ellis',
+  'Evans',
+  'Ferguson',
+  'Fisher',
+  'Fontaine',
+  'Fortier',
+  'Fortin',
+  'Foster',
+  'Fournier',
+  'Fraser',
+  'Friesen',
+  'Gagne',
+  'Gagnon',
+  'Gallant',
+  'Gauthier',
+  'Gervais',
+  'Gibson',
+  'Gilbert',
+  'Gill',
+  'Girard',
+  'Giroux',
+  'Gordon',
+  'Gosselin',
+  'Graham',
+  'Grant',
+  'Gray',
+  'Green',
+  'Grenier',
+  'Hall',
+  'Hamel',
+  'Hamilton',
+  'Harris',
+  'Harrison',
+  'Harvey',
+  'Hebert',
+  'Henderson',
+  'Henry',
+  'Hill',
+  'Ho',
+  'Houle',
+  'Hughes',
+  'Hunt',
+  'Hunter',
+  'Jackson',
+  'James',
+  'Johnson',
+  'Johnston',
+  'Jones',
+  'Kelly',
+  'Kennedy',
+  'Kerr',
+  'Khan',
+  'Kim',
+  'King',
+  'Klassen',
+  'Labelle',
+  'Lachance',
+  'Lacroix',
+  'Lalonde',
+  'Lam',
+  'Lambert',
+  'Landry',
+  'Langlois',
+  'Lapointe',
+  'Lavoie',
+  'Leblanc',
+  'Leclerc',
+  'Leduc',
+  'Lee',
+  'Lefebvre',
+  'Legault',
+  'Lemay',
+  'Lemieux',
+  'Lessard',
+  'Leung',
+  'Levesque',
+  'Lewis',
+  'Li',
+  'Liu',
+  'Macdonald',
+  'Mackenzie',
+  'Maclean',
+  'Macleod',
+  'Marshall',
+  'Martel',
+  'Martin',
+  'Mason',
+  'Mcdonald',
+  'Mckay',
+  'Mclean',
+  'Mcleod',
+  'Menard',
+  'Mercier',
+  'Michaud',
+  'Miller',
+  'Mills',
+  'Mitchell',
+  'Moore',
+  'Morgan',
+  'Morin',
+  'Morris',
+  'Morrison',
+  'Murphy',
+  'Murray',
+  'Nadeau',
+  'Nelson',
+  'Ng',
+  'Nguyen',
+  'Ouellet',
+  'Ouellette',
+  'Paquette',
+  'Paradis',
+  'Parent',
+  'Park',
+  'Parker',
+  'Parsons',
+  'Patel',
+  'Patterson',
+  'Paul',
+  'Pelletier',
+  'Perreault',
+  'Perron',
+  'Perry',
+  'Peters',
+  'Phillips',
+  'Plante',
+  'Poirier',
+  'Poulin',
+  'Proulx',
+  'Raymond',
+  'Reid',
+  'Renaud',
+  'Richard',
+  'Richardson',
+  'Robert',
+  'Roberts',
+  'Robertson',
+  'Robinson',
+  'Rogers',
+  'Rose',
+  'Ross',
+  'Rousseau',
+  'Roy',
+  'Russell',
+  'Ryan',
+  'Savard',
+  'Schmidt',
+  'Scott',
+  'Seguin',
+  'Shaw',
+  'Simard',
+  'Simpson',
+  'Singh',
+  'Smith',
+  'St-pierre',
+  'Stevens',
+  'Stewart',
+  'Taylor',
+  'Theriault',
+  'Therrien',
+  'Thibault',
+  'Thomas',
+  'Thompson',
+  'Thomson',
+  'Tran',
+  'Tremblay',
+  'Turcotte',
+  'Turner',
+  'Villeneuve',
+  'Walker',
+  'Wallace',
+  'Walsh',
+  'Wang',
+  'Ward',
+  'Watson',
+  'White',
+  'Wiebe',
+  'Williams',
+  'Wilson',
+  'Wong',
+  'Wood',
+  'Wright',
+  'Wu',
+  'Young',
+  'Yu',
+  'Zhang'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/Chile/bundle.ts b/packages/plugins/src/countries/Chile/bundle.ts
new file mode 100644
index 000000000..78c45d36e
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/bundle.ts
@@ -0,0 +1,455 @@
+/**
+ * Ciudades y Regiones de Chile
+ * Weight: Porcentaje de Población de la Región respecto al total nacional * 100, segun Censo 2012
+ * Source: http://datos.gob.cl/datasets/ver/29596
+ * Author: Gonzalo 'NioZero' Hidalgo <ghidalgo@frostdisk.com>
+ */
+import { GetCountryData } from '@generatedata/types';
+
+const Chile: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'chile',
+  regionNames: i18n.regionNames,
+  continent: 'south_america',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxxxx'
+    }
+  },
+  regions: [
+    {
+      regionName: 'Arica y Parinacota',
+      regionShort: 'XV',
+      regionSlug: 'arica_y_parinacota',
+      weight: 132,
+      cities: ['Arica', 'Camarones', 'Putre', 'General Lagos']
+    },
+    {
+      regionName: 'Tarapacá',
+      regionShort: 'I',
+      regionSlug: 'tarapaca',
+      weight: 185,
+      cities: ['Iquique', 'Alto Hospicio', 'Pozo Almonte', 'Camiña', 'Colchane', 'Huara', 'Pica']
+    },
+    {
+      regionName: 'Antofagasta',
+      regionShort: 'II',
+      regionSlug: 'antofagasta',
+      weight: 344,
+      cities: [
+        'Antofagasta',
+        'Mejillones',
+        'Sierra Gorda',
+        'Taltal',
+        'Calama',
+        'Ollagüe',
+        'San Pedro de Atacama',
+        'Tocopilla',
+        'María Elena'
+      ]
+    },
+    {
+      regionName: 'Atacama',
+      regionShort: 'III',
+      regionSlug: 'atacama',
+      weight: 173,
+      cities: ['Copiapó', 'Caldera', 'Tierra Amarilla', 'Chañaral', 'Diego de Almagro', 'Vallenar', 'Alto del Carmen', 'Freirina', 'Huasco']
+    },
+    {
+      regionName: 'Coquimbo',
+      regionShort: 'IV',
+      regionSlug: 'coquimbo',
+      weight: 426,
+      cities: [
+        'La Serena',
+        'Coquimbo',
+        'Andacollo',
+        'La Higuera',
+        'Paiguano',
+        'Vicuña',
+        'Illapel',
+        'Canela',
+        'Los Vilos',
+        'Salamanca',
+        'Ovalle',
+        'Combarbalá',
+        'Monte Patria',
+        'Punitaqui',
+        'Río Hurtado'
+      ]
+    },
+    {
+      regionName: 'Valparaíso',
+      regionShort: 'V',
+      regionSlug: 'valparaiso',
+      weight: 1015,
+      cities: [
+        'Valparaíso',
+        'Casablanca',
+        'Concón',
+        'Juan Fernández',
+        'Puchuncaví',
+        'Quintero',
+        'Viña del Mar',
+        'Isla de Pascua',
+        'Los Andes',
+        'Calle Larga',
+        'Rinconada',
+        'San Esteban',
+        'La Ligua',
+        'Cabildo',
+        'Papudo',
+        'Petorca',
+        'Zapallar',
+        'Quillota',
+        'Calera',
+        'Hijuelas',
+        'La Cruz',
+        'Nogales',
+        'San Antonio',
+        'Algarrobo',
+        'Cartagena',
+        'El Quisco',
+        'El Tabo',
+        'Santo Domingo',
+        'San Felipe',
+        'Catemu',
+        'Llaillay',
+        'Panquehue',
+        'Putaendo',
+        'Santa María',
+        'Quilpué',
+        'Limache',
+        'Olmué',
+        'Villa Alemana'
+      ]
+    },
+    {
+      regionName: "O'Higgins",
+      regionShort: 'VI',
+      regionSlug: 'ohiggins',
+      weight: 511,
+      cities: [
+        'Rancagua',
+        'Codegua',
+        'Coinco',
+        'Coltauco',
+        'Doñihue',
+        'Graneros',
+        'Las Cabras',
+        'Machalí',
+        'Malloa',
+        'Mostazal',
+        'Olivar',
+        'Peumo',
+        'Pichidegua',
+        'Quinta de Tilcoco',
+        'Rengo',
+        'Requínoa',
+        'San Vicente',
+        'Pichilemu',
+        'La Estrella',
+        'Litueche',
+        'Marchihue',
+        'Navidad',
+        'Paredones',
+        'San Fernando',
+        'Chépica',
+        'Chimbarongo',
+        'Lolol',
+        'Nancagua',
+        'Palmilla',
+        'Peralillo',
+        'Placilla',
+        'Pumanque',
+        'Santa Cruz'
+      ]
+    },
+    {
+      regionName: 'Maule',
+      regionShort: 'VII',
+      regionSlug: 'maule',
+      weight: 581,
+      cities: [
+        'Talca',
+        'Constitución',
+        'Curepto',
+        'Empedrado',
+        'Maule',
+        'Pelarco',
+        'Pencahue',
+        'Río Claro',
+        'San Clemente',
+        'San Rafael',
+        'Cauquenes',
+        'Chanco',
+        'Pelluhue',
+        'Curicó',
+        'Hualañé',
+        'Licantén',
+        'Molina',
+        'Rauco',
+        'Romeral',
+        'Sagrada Familia',
+        'Teno',
+        'Vichuquén',
+        'Linares',
+        'Colbún',
+        'Longaví',
+        'Parral',
+        'Retiro',
+        'San Javier',
+        'Villa Alegre',
+        'Yerbas Buenas'
+      ]
+    },
+    {
+      regionName: 'Biobío',
+      regionShort: 'VII',
+      regionSlug: 'biobio',
+      weight: 1179,
+      cities: [
+        'Concepción',
+        'Coronel',
+        'Chiguayante',
+        'Florida',
+        'Hualqui',
+        'Lota',
+        'Penco',
+        'San Pedro de la Paz',
+        'Santa Juana',
+        'Talcahuano',
+        'Tomé',
+        'Hualpén',
+        'Lebu',
+        'Arauco',
+        'Cañete',
+        'Contulmo',
+        'Curanilahue',
+        'Los Álamos',
+        'Tirúa',
+        'Los Ángeles',
+        'Antuco',
+        'Cabrero',
+        'Laja',
+        'Mulchén',
+        'Nacimiento',
+        'Negrete',
+        'Quilaco',
+        'Quilleco',
+        'San Rosendo',
+        'Santa Bárbara',
+        'Tucapel',
+        'Yumbel',
+        'Alto Biobío',
+        'Chillán',
+        'Bulnes',
+        'Cobquecura',
+        'Coelemu',
+        'Coihueco',
+        'Chillán Viejo',
+        'El Carmen',
+        'Ninhue',
+        'Ñiquén',
+        'Pemuco',
+        'Pinto',
+        'Portezuelo',
+        'Quillón',
+        'Quirihue',
+        'Ránquil',
+        'San Carlos',
+        'San Fabián',
+        'San Ignacio',
+        'San Nicolás',
+        'Treguaco',
+        'Yungay'
+      ]
+    },
+    {
+      regionName: 'Araucanía',
+      regionShort: 'IX',
+      regionSlug: 'araucania',
+      weight: 552,
+      cities: [
+        'Temuco',
+        'Carahue',
+        'Cunco',
+        'Curarrehue',
+        'Freire',
+        'Galvarino',
+        'Gorbea',
+        'Lautaro',
+        'Loncoche',
+        'Melipeuco',
+        'Nueva Imperial',
+        'Padre las Casas',
+        'Perquenco',
+        'Pitrufquén',
+        'Pucón',
+        'Saavedra',
+        'Teodoro Schmidt',
+        'Toltén',
+        'Vilcún',
+        'Villarrica',
+        'Cholchol',
+        'Angol',
+        'Collipulli',
+        'Curacautín',
+        'Ercilla',
+        'Lonquimay',
+        'Los Sauces',
+        'Lumaco',
+        'Purén',
+        'Renaico',
+        'Traiguén',
+        'Victoria'
+      ]
+    },
+    {
+      regionName: 'Los Ríos',
+      regionShort: 'XIV',
+      regionSlug: 'los_rios',
+      weight: 225,
+      cities: [
+        'Valdivia',
+        'Corral',
+        'Lanco',
+        'Los Lagos',
+        'Máfil',
+        'Mariquina',
+        'Paillaco',
+        'Panguipulli',
+        'La Unión',
+        'Futrono',
+        'Lago Ranco',
+        'Río Bueno'
+      ]
+    },
+    {
+      regionName: 'Los Lagos',
+      regionShort: 'X',
+      regionSlug: 'los_lagos',
+      weight: 468,
+      cities: [
+        'Puerto Montt',
+        'Calbuco',
+        'Cochamó',
+        'Fresia',
+        'Frutillar',
+        'Los Muermos',
+        'Llanquihue',
+        'Maullín',
+        'Puerto Varas',
+        'Castro',
+        'Ancud',
+        'Chonchi',
+        'Curaco de Vélez',
+        'Dalcahue',
+        'Puqueldón',
+        'Queilén',
+        'Quellón',
+        'Quemchi',
+        'Quinchao',
+        'Osorno',
+        'Puerto Octay',
+        'Purranque',
+        'Puyehue',
+        'Río Negro',
+        'San Juan de la Costa',
+        'San Pablo',
+        'Chaitén',
+        'Futaleufú',
+        'Hualaihué',
+        'Palena'
+      ]
+    },
+    {
+      regionName: 'Aisén',
+      regionShort: 'XIV',
+      regionSlug: 'aisen',
+      weight: 60,
+      cities: ['Coihaique', 'Lago Verde', 'Aisén', 'Cisnes', 'Guaitecas', 'Cochrane', "O'Higgins", 'Tortel', 'Chile Chico', 'Río Ibáñez']
+    },
+    {
+      regionName: 'Magallanes y Antártica Chilena',
+      regionShort: 'XII',
+      regionSlug: 'magallanes_y_antartica_chilena',
+      weight: 92,
+      cities: [
+        'Punta Arenas',
+        'Laguna Blanca',
+        'Río Verde',
+        'San Gregorio',
+        'Cabo de Hornos',
+        'Antártica',
+        'Porvenir',
+        'Primavera',
+        'Timaukel',
+        'Natales',
+        'Torres del Paine'
+      ]
+    },
+    {
+      regionName: 'Metropolitana de Santiago',
+      regionShort: 'RM',
+      regionSlug: 'metropolitana_de_santiago',
+      weight: 4057,
+      cities: [
+        'Santiago',
+        'Cerrillos',
+        'Cerro Navia',
+        'Conchalí',
+        'El Bosque',
+        'Estación Central',
+        'Huechuraba',
+        'Independencia',
+        'La Cisterna',
+        'La Florida',
+        'La Granja',
+        'La Pintana',
+        'La Reina',
+        'Las Condes',
+        'Lo Barnechea',
+        'Lo Espejo',
+        'Lo Prado',
+        'Macul',
+        'Maipú',
+        'Ñuñoa',
+        'Pedro Aguirre Cerda',
+        'Peñalolén',
+        'Providencia',
+        'Pudahuel',
+        'Quilicura',
+        'Quinta Normal',
+        'Recoleta',
+        'Renca',
+        'San Joaquín',
+        'San Miguel',
+        'San Ramón',
+        'Vitacura',
+        'Puente Alto',
+        'Pirque',
+        'San José de Maipo',
+        'Colina',
+        'Lampa',
+        'Tiltil',
+        'San Bernardo',
+        'Buin',
+        'Calera de Tango',
+        'Paine',
+        'Melipilla',
+        'Alhué',
+        'Curacaví',
+        'María Pinto',
+        'San Pedro',
+        'Talagante',
+        'El Monte',
+        'Isla de Maipo',
+        'Padre Hurtado',
+        'Peñaflor'
+      ]
+    }
+  ]
+});
+
+export default Chile;
diff --git a/packages/plugins/src/countries/Chile/i18n/ar.json b/packages/plugins/src/countries/Chile/i18n/ar.json
new file mode 100644
index 000000000..ee5767c5f
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "تشيلي",
+  "regionNames": "المناطق التشيلية"
+}
diff --git a/packages/plugins/src/countries/Chile/i18n/de.json b/packages/plugins/src/countries/Chile/i18n/de.json
new file mode 100644
index 000000000..2ace48bd2
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Chile",
+  "regionNames": "Chilenische Regionen"
+}
diff --git a/packages/plugins/src/countries/Chile/i18n/en.json b/packages/plugins/src/countries/Chile/i18n/en.json
new file mode 100644
index 000000000..85ea71dc5
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Chile",
+  "regionNames": "Chilean Regions"
+}
diff --git a/packages/plugins/src/countries/Chile/i18n/es.json b/packages/plugins/src/countries/Chile/i18n/es.json
new file mode 100644
index 000000000..2c031ca99
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Chile",
+  "regionNames": "regiones chilenas"
+}
diff --git a/packages/plugins/src/countries/Chile/i18n/fr.json b/packages/plugins/src/countries/Chile/i18n/fr.json
new file mode 100644
index 000000000..ffdb0689e
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Chili",
+  "regionNames": "Régions chiliennes"
+}
diff --git a/packages/plugins/src/countries/Chile/i18n/hi.json b/packages/plugins/src/countries/Chile/i18n/hi.json
new file mode 100644
index 000000000..4b0aa6104
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "चिली",
+  "regionNames": "चिली क्षेत्र"
+}
diff --git a/packages/plugins/src/countries/Chile/i18n/ja.json b/packages/plugins/src/countries/Chile/i18n/ja.json
new file mode 100644
index 000000000..93997c1ee
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "チリ",
+  "regionNames": "チリの地域"
+}
diff --git a/packages/plugins/src/countries/Chile/i18n/nl.json b/packages/plugins/src/countries/Chile/i18n/nl.json
new file mode 100644
index 000000000..3da9ebaf2
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Chili",
+  "regionNames": "Chileense regio's"
+}
diff --git a/packages/plugins/src/countries/Chile/i18n/pt.json b/packages/plugins/src/countries/Chile/i18n/pt.json
new file mode 100644
index 000000000..acd1aaaec
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Chile",
+  "regionNames": "Regiões chilenas"
+}
diff --git a/packages/plugins/src/countries/Chile/i18n/ru.json b/packages/plugins/src/countries/Chile/i18n/ru.json
new file mode 100644
index 000000000..b33f7d5ca
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Чили",
+  "regionNames": "Чилийские регионы"
+}
diff --git a/packages/plugins/src/countries/Chile/i18n/ta.json b/packages/plugins/src/countries/Chile/i18n/ta.json
new file mode 100644
index 000000000..fc0fb33f6
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "சிலி",
+  "regionNames": "சிலி பிராந்தியங்கள்"
+}
diff --git a/packages/plugins/src/countries/Chile/i18n/zh.json b/packages/plugins/src/countries/Chile/i18n/zh.json
new file mode 100644
index 000000000..6c3aa1810
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "智利",
+  "regionNames": "智利地区"
+}
diff --git a/packages/plugins/src/countries/Chile/names.ts b/packages/plugins/src/countries/Chile/names.ts
new file mode 100644
index 000000000..512fb2793
--- /dev/null
+++ b/packages/plugins/src/countries/Chile/names.ts
@@ -0,0 +1,319 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Abigail',
+  'Agustina',
+  'Ainhoa',
+  'Alice',
+  'Alison',
+  'Alondra',
+  'Amalia',
+  'Amanda',
+  'Amelia',
+  'Amparo',
+  'Amy',
+  'Anaís',
+  'Angela',
+  'Antonella',
+  'Antonia',
+  'Ashley',
+  'Aurora',
+  'Aylin',
+  'Belén',
+  'Bárbara',
+  'Camila',
+  'Carla',
+  'Carolina',
+  'Catalina',
+  'Celeste',
+  'Colomba',
+  'Constanza',
+  'Consuelo',
+  'Danae',
+  'Daniela',
+  'Dominga',
+  'Dominique',
+  'Elena',
+  'Elisa',
+  'Elizabeth',
+  'Eloísa',
+  'Ema',
+  'Emilia',
+  'Emily',
+  'Emma',
+  'Esperanza',
+  'Fernanda',
+  'Florencia',
+  'Francisca',
+  'Gabriela',
+  'Génesis',
+  'Ignacia',
+  'Isabel',
+  'Isabella',
+  'Isidora',
+  'Javiera',
+  'Josefa',
+  'Josefina',
+  'Julieta',
+  'Laura',
+  'Leonor',
+  'Luciana',
+  'Lucía',
+  'Luna',
+  'Lía',
+  'Magdalena',
+  'Maite',
+  'Mariana',
+  'Martina',
+  'María',
+  'Matilda',
+  'Matilde',
+  'Mayra',
+  'Mayte',
+  'Mia',
+  'Millaray',
+  'Monserrat',
+  'Montserrat',
+  'Noelia',
+  'Noemí',
+  'Olivia',
+  'Paloma',
+  'Pascal',
+  'Pascale',
+  'Paula',
+  'Paz',
+  'Pía',
+  'Rafaela',
+  'Rayén',
+  'Renata',
+  'Rocío',
+  'Samantha',
+  'Sara',
+  'Sofía',
+  'Sophia',
+  'Trinidad',
+  'Valentina',
+  'Victoria',
+  'Violeta',
+  'Ámbar'
+];
+
+const maleNames = [
+  'Aaron',
+  'Agustín',
+  'Alan',
+  'Alejandro',
+  'Alex',
+  'Alexander',
+  'Alexis',
+  'Alfonso',
+  'Alonso',
+  'Amaro',
+  'Andrés',
+  'Angel',
+  'Antonio',
+  'Arturo',
+  'Bastián',
+  'Benjamín',
+  'Bruno',
+  'Camilo',
+  'Carlos',
+  'Claudio',
+  'Clemente',
+  'Cristian',
+  'Cristóbal',
+  'Damián',
+  'Daniel',
+  'Dante',
+  'David',
+  'Diego',
+  'Dylan',
+  'Eduardo',
+  'Elías',
+  'Emiliano',
+  'Emilio',
+  'Esteban',
+  'Fabián',
+  'Facundo',
+  'Felipe',
+  'Fernando',
+  'Francisco',
+  'Franco',
+  'Gabriel',
+  'Gaspar',
+  'Gonzalo',
+  'Guillermo',
+  'Gustavo',
+  'Héctor',
+  'Ian',
+  'Ignacio',
+  'Isaac',
+  'Isaias',
+  'Javier',
+  'Jean',
+  'Jesús',
+  'Joaquín',
+  'Jorge',
+  'Josue',
+  'José',
+  'Juan',
+  'Julián',
+  'Kevin',
+  'Leonardo',
+  'León',
+  'Liam',
+  'Lucas',
+  'Luciano',
+  'Luis',
+  'Lukas',
+  'Manuel',
+  'Marcelo',
+  'Mariano',
+  'Martín',
+  'Mateo',
+  'Mathias',
+  'Matías',
+  'Maximiliano',
+  'Miguel',
+  'Máximo',
+  'Nicolás',
+  'Oscar',
+  'Pablo',
+  'Patricio',
+  'Pedro',
+  'Rafael',
+  'Renato',
+  'Ricardo',
+  'Rodrigo',
+  'Salvador',
+  'Samuel',
+  'Santiago',
+  'Sebastián',
+  'Sergio',
+  'Simón',
+  'Thomas',
+  'Tomás',
+  'Valentín',
+  'Vicente',
+  'Víctor',
+  'Álvaro'
+];
+
+const lastNames = [
+  'Alexandra',
+  'Alonsos',
+  'Alvarez',
+  'Araya',
+  'Atlas',
+  'Augustin',
+  'Azizi',
+  'Barbara',
+  'Bastian',
+  'Benjamin',
+  'Bentlee',
+  'Bravo',
+  'Camila',
+  'Carla',
+  'Carolina',
+  'Carrasco',
+  'Castillo',
+  'Castro',
+  'Catalina',
+  'Chichi',
+  'Contreras',
+  'Cortes',
+  'Cristobal',
+  'Daniel',
+  'Diaz',
+  'Diego',
+  'Diem',
+  'Emilia',
+  'Espinoza',
+  'Felipe',
+  'Fernanda',
+  'Fernandez',
+  'Figueroa',
+  'Florencia',
+  'Flores',
+  'Francisco',
+  'Fuentes',
+  'Gabriel',
+  'Gabriela',
+  'Garcia',
+  'Gomez',
+  'Gonzalez',
+  'Gutierrez',
+  'Hernandez',
+  'Herrera',
+  'Ignacio',
+  'Isabella',
+  'Jara',
+  'Javier',
+  'Joaquin',
+  'Jose',
+  'Juan',
+  'Julieta',
+  'Laura',
+  'Lopez',
+  'Luis',
+  'Magdalena',
+  'Maria',
+  'Martin',
+  'Martina',
+  'Martinez',
+  'Mateo',
+  'Matias',
+  'Matilde',
+  'Maximiliano',
+  'Maximo',
+  'Miranda',
+  'Monserrat',
+  'Morales',
+  'Munoz',
+  'Nicolas',
+  'Nunez',
+  'Pascal',
+  'Paula',
+  'Paz',
+  'Perez',
+  'Pia',
+  'Ramirez',
+  'Renato',
+  'Reyes',
+  'Rivera',
+  'Rocio',
+  'Rodriguez',
+  'Rojas',
+  'Sanchez',
+  'Sebastian',
+  'Sepulveda',
+  'Silva',
+  'Sofia',
+  'Soto',
+  'Soto',
+  'Tapia',
+  'Testudines',
+  'Thiarre',
+  'Tomas',
+  'Torres',
+  'Trinidad',
+  'Valentina',
+  'Valenzuela',
+  'Vargas',
+  'Vasquez',
+  'Vega',
+  'Vera',
+  'Vergara',
+  'Vicente',
+  'Victoria',
+  'Zavala',
+  'Zuniga'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/China/bundle.ts b/packages/plugins/src/countries/China/bundle.ts
new file mode 100644
index 000000000..839de72cd
--- /dev/null
+++ b/packages/plugins/src/countries/China/bundle.ts
@@ -0,0 +1,62 @@
+import { GetCountryData } from '@generatedata/types';
+
+const China: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'china',
+  regionNames: i18n.regionNames,
+  continent: 'asia',
+  extendedData: {
+    zipFormat: {
+      format: 'Xxxxxx'
+    },
+    phoneFormat: {
+      displayFormats: ['0xxx xxxx xxxx']
+    }
+  },
+  regions: [
+    {
+      regionName: i18n.regionNorthChina,
+      regionShort: i18n.regionNorthChina,
+      regionSlug: 'north_china',
+      weight: 164,
+      cities: ['Beijing', 'Tianjin', 'Hebei', 'Shanxi', 'Inner Mongolia']
+    },
+    {
+      regionName: i18n.regionNortheastChina,
+      regionShort: i18n.regionNortheastChina,
+      regionSlug: 'northeast_china',
+      weight: 109,
+      cities: ['Liaoning', 'Jilin', 'Heilongjiang']
+    },
+    {
+      regionName: i18n.regionEastChina,
+      regionShort: i18n.regionEastChina,
+      regionSlug: 'east_china',
+      weight: 384,
+      cities: ['Shanghai', 'Jiangsu', 'Zhejiang', 'Anhui', 'Fujian', 'Jiangxi', 'Shandong']
+    },
+    {
+      regionName: i18n.regionSouthCentralChina,
+      regionShort: i18n.regionSouthCentralChina,
+      regionSlug: 'south_central_china',
+      weight: 384,
+      cities: ['Henan', 'Hubei', 'Hunan', 'Guangdong', 'Guangxi', 'Hainan', 'Hong Kong', 'Macau']
+    },
+    {
+      regionName: i18n.regionSouthwestChina,
+      regionShort: i18n.regionSouthwestChina,
+      regionSlug: 'southwest_china',
+      weight: 192,
+      cities: ['Chongqing', 'Sichuan', 'Guizhou', 'Yunnan', 'Tibet']
+    },
+    {
+      regionName: i18n.regionNorthwestChina,
+      regionShort: i18n.regionNorthwestChina,
+      regionSlug: 'northwest_china',
+      weight: 96,
+      cities: ['Shaanxi', 'Gansu', 'Qinghai', 'Ningxia', 'Xinjiang']
+    }
+  ]
+});
+
+export default China;
diff --git a/packages/plugins/src/countries/China/i18n/ar.json b/packages/plugins/src/countries/China/i18n/ar.json
new file mode 100644
index 000000000..3568d76ff
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/ar.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "الصين",
+  "regionNames": "مناطق الصين",
+  "regionNorthChina": "Huáběi",
+  "regionNortheastChina": "Dōngběi",
+  "regionEastChina": "Huádōng",
+  "regionSouthCentralChina": "Zhōngnán",
+  "regionSouthwestChina": "Xīnán",
+  "regionNorthwestChina": "Xīběi"
+}
diff --git a/packages/plugins/src/countries/China/i18n/de.json b/packages/plugins/src/countries/China/i18n/de.json
new file mode 100644
index 000000000..7028c9201
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/de.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "China",
+  "regionNames": "China-Regionen",
+  "regionNorthChina": "Huáběi",
+  "regionNortheastChina": "Dōngběi",
+  "regionEastChina": "Huádōng",
+  "regionSouthCentralChina": "Zhōngnán",
+  "regionSouthwestChina": "Xīnán",
+  "regionNorthwestChina": "Xīběi"
+}
diff --git a/packages/plugins/src/countries/China/i18n/en.json b/packages/plugins/src/countries/China/i18n/en.json
new file mode 100644
index 000000000..42b44c306
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/en.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "China",
+  "regionNames": "China regions",
+  "regionNorthChina": "Huáběi",
+  "regionNortheastChina": "Dōngběi",
+  "regionEastChina": "Huádōng",
+  "regionSouthCentralChina": "Zhōngnán",
+  "regionSouthwestChina": "Xīnán",
+  "regionNorthwestChina": "Xīběi"
+}
diff --git a/packages/plugins/src/countries/China/i18n/es.json b/packages/plugins/src/countries/China/i18n/es.json
new file mode 100644
index 000000000..0181a8d1c
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/es.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "China",
+  "regionNames": "Regiones de China",
+  "regionNorthChina": "Huáběi",
+  "regionNortheastChina": "Dōngběi",
+  "regionEastChina": "Huádōng",
+  "regionSouthCentralChina": "Zhōngnán",
+  "regionSouthwestChina": "Xīnán",
+  "regionNorthwestChina": "Xīběi"
+}
diff --git a/packages/plugins/src/countries/China/i18n/fr.json b/packages/plugins/src/countries/China/i18n/fr.json
new file mode 100644
index 000000000..079cc0408
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/fr.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "Chine",
+  "regionNames": "Régions de la Chine",
+  "regionNorthChina": "Huáběi",
+  "regionNortheastChina": "Dōngběi",
+  "regionEastChina": "Huádōng",
+  "regionSouthCentralChina": "Zhōngnán",
+  "regionSouthwestChina": "Xīnán",
+  "regionNorthwestChina": "Xīběi"
+}
diff --git a/packages/plugins/src/countries/China/i18n/hi.json b/packages/plugins/src/countries/China/i18n/hi.json
new file mode 100644
index 000000000..74a4545f5
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/hi.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "चीन",
+  "regionNames": "चीन क्षेत्र",
+  "regionNorthChina": "Huáběi",
+  "regionNortheastChina": "Dōngběi",
+  "regionEastChina": "Huádōng",
+  "regionSouthCentralChina": "Zhōngnán",
+  "regionSouthwestChina": "Xīnán",
+  "regionNorthwestChina": "Xīběi"
+}
diff --git a/packages/plugins/src/countries/China/i18n/ja.json b/packages/plugins/src/countries/China/i18n/ja.json
new file mode 100644
index 000000000..ddcfd7f00
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/ja.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "中国",
+  "regionNames": "中国地域",
+  "regionNorthChina": "Huáběi",
+  "regionNortheastChina": "Dōngběi",
+  "regionEastChina": "Huádōng",
+  "regionSouthCentralChina": "Zhōngnán",
+  "regionSouthwestChina": "Xīnán",
+  "regionNorthwestChina": "Xīběi"
+}
diff --git a/packages/plugins/src/countries/China/i18n/nl.json b/packages/plugins/src/countries/China/i18n/nl.json
new file mode 100644
index 000000000..129cedab4
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/nl.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "China",
+  "regionNames": "Chinese regio's:",
+  "regionNorthChina": "Huáběi",
+  "regionNortheastChina": "Dōngběi",
+  "regionEastChina": "Huádōng",
+  "regionSouthCentralChina": "Zhōngnán",
+  "regionSouthwestChina": "Xīnán",
+  "regionNorthwestChina": "Xīběi"
+}
diff --git a/packages/plugins/src/countries/China/i18n/pt.json b/packages/plugins/src/countries/China/i18n/pt.json
new file mode 100644
index 000000000..c449cf122
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/pt.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "China",
+  "regionNames": "Regiões da China",
+  "regionNorthChina": "Huáběi",
+  "regionNortheastChina": "Dōngběi",
+  "regionEastChina": "Huádōng",
+  "regionSouthCentralChina": "Zhōngnán",
+  "regionSouthwestChina": "Xīnán",
+  "regionNorthwestChina": "Xīběi"
+}
diff --git a/packages/plugins/src/countries/China/i18n/ru.json b/packages/plugins/src/countries/China/i18n/ru.json
new file mode 100644
index 000000000..9ddd2faef
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/ru.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "Китай",
+  "regionNames": "Китайские регионы",
+  "regionNorthChina": "Huáběi",
+  "regionNortheastChina": "Dōngběi",
+  "regionEastChina": "Huádōng",
+  "regionSouthCentralChina": "Zhōngnán",
+  "regionSouthwestChina": "Xīnán",
+  "regionNorthwestChina": "Xīběi"
+}
diff --git a/packages/plugins/src/countries/China/i18n/ta.json b/packages/plugins/src/countries/China/i18n/ta.json
new file mode 100644
index 000000000..78dd6e6a4
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/ta.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "சீனா",
+  "regionNames": "சீனா பிராந்தியங்கள்",
+  "regionNorthChina": "Huáběi",
+  "regionNortheastChina": "Dōngběi",
+  "regionEastChina": "Huádōng",
+  "regionSouthCentralChina": "Zhōngnán",
+  "regionSouthwestChina": "Xīnán",
+  "regionNorthwestChina": "Xīběi"
+}
diff --git a/packages/plugins/src/countries/China/i18n/zh.json b/packages/plugins/src/countries/China/i18n/zh.json
new file mode 100644
index 000000000..5bd0a9537
--- /dev/null
+++ b/packages/plugins/src/countries/China/i18n/zh.json
@@ -0,0 +1,10 @@
+{
+  "countryName": "中国",
+  "regionNames": "中国地区",
+  "regionNorthChina": "华北",
+  "regionNortheastChina": "东北",
+  "regionEastChina": "华东",
+  "regionSouthCentralChina": "中南",
+  "regionSouthwestChina": "西南",
+  "regionNorthwestChina": "西北"
+}
diff --git a/packages/plugins/src/countries/China/names.ts b/packages/plugins/src/countries/China/names.ts
new file mode 100644
index 000000000..cc74174b8
--- /dev/null
+++ b/packages/plugins/src/countries/China/names.ts
@@ -0,0 +1,648 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Ai',
+  'An',
+  'Bao',
+  'Chen',
+  'Chun',
+  'Hui',
+  'Jia',
+  'Jun',
+  'Kai',
+  'Li Hua',
+  'Li Mei',
+  'Ling',
+  'Mei',
+  'Ning',
+  'Nuan',
+  'Qing',
+  'Shu',
+  'Xue',
+  'Yan',
+  'Zhen',
+  'Chu',
+  'Cong',
+  'Genji',
+  'Hop',
+  'Hua',
+  'Lai',
+  'Mey',
+  'Qiao',
+  'Qing yuan',
+  'Qinyang',
+  'Ushi',
+  'Wenling',
+  'Xin-jin',
+  'Yanay',
+  'Ching',
+  'Cixi',
+  'Fang',
+  'Fu',
+  'Jiang',
+  'Liang',
+  'Lu',
+  'Qiu',
+  'Su',
+  'Tai',
+  'Wang Shu;',
+  'Wei',
+  'Wu',
+  'Yun',
+  'Zhi Rou',
+  'Diu',
+  'Fen',
+  'Hanna',
+  'Huan',
+  'Huang',
+  'Lian',
+  'Ling',
+  'Ming',
+  'Ming Yue',
+  'Peng',
+  'Ping',
+  'Xiu',
+  'Xiulin',
+  'Yu-yan',
+  'Qiuyue',
+  'Ying Yue',
+  'Yong',
+  'Yue',
+  'Yuèhai',
+  'Yuèqín',
+  'Liena',
+  'Lifen',
+  'Lì húa',
+  'Lihua',
+  'Lijuan',
+  'Liling',
+  'LiMei',
+  'Li mei',
+  'Li ming',
+  'Lin',
+  'Li Na',
+  'Linqin',
+  'Li Qin',
+  'Liqiu',
+  'Li Rong',
+  'Li Wei',
+  'Mayleen',
+  'Méh-è',
+  'Méh-fùnh',
+  'Meifen',
+  'Meifeng',
+  'Meihui',
+  'Mei Lien',
+  'Mei Xiang',
+  'Mei Xing',
+  'Meiyin',
+  'Mei Zhen',
+  'Mingmei',
+  'Rong',
+  'Wan',
+  'Xin',
+  'Qian'
+];
+
+const maleNames = [
+  'Aiguo',
+  'An',
+  'Bai',
+  'Bambang',
+  'Bengt',
+  'Biming',
+  'Bingwen',
+  'Bo',
+  'Bojing',
+  'Boqin',
+  'Chang ',
+  'Changpu',
+  'Chao',
+  'Chaun',
+  'Chen',
+  'Cheng',
+  'Cheung',
+  'Chi',
+  'Chuanli',
+  'Chun',
+  'Chung',
+  'Da',
+  'Deli',
+  'Deming',
+  'Dingbang',
+  'Dong',
+  'Duyi',
+  'Fai',
+  'Feng',
+  'Fu',
+  'Gan',
+  'Gang',
+  'Gen',
+  'Guang',
+  'Gui',
+  'Guotin',
+  'Hai',
+  'Hao',
+  'He',
+  'Heng',
+  'Hong',
+  'Hop',
+  'Hou',
+  'Hua',
+  'Huan',
+  'Hui',
+  'Jia',
+  'Jian',
+  'Jianyu',
+  'Jie',
+  'Jig',
+  'Jin',
+  'Jinhai',
+  'Jun',
+  'Kang',
+  'Kong',
+  'Kun',
+  'Kuo',
+  'Lei',
+  'Li',
+  'Li jun',
+  'Li qiang',
+  'Li wei',
+  'Liang',
+  'Lie jie',
+  'Ling',
+  'Liu',
+  'Lok',
+  'Manchu',
+  'Mingli',
+  'Mingyu',
+  'Minsheng',
+  'Ning',
+  'On',
+  'Park',
+  'Peizhi',
+  'Ping',
+  'Qi',
+  'Qiang',
+  'Qiao',
+  'Qing',
+  'Qiu',
+  'Qu',
+  'Quon',
+  'Ru',
+  'Shan',
+  'Shen',
+  'Shilin',
+  'Shing',
+  'Shoi-ming',
+  'Shui',
+  'Song',
+  'Susu',
+  'Sying',
+  'Tai-hua',
+  'Taio',
+  'Tao',
+  'Tengfei',
+  'Tu',
+  'Tung',
+  'Wang',
+  'Wang lei',
+  'Wang wei',
+  'Wang yong',
+  'Wei',
+  'Weiyuan',
+  'Weizhe',
+  'Wen',
+  'Wenyan',
+  'Xiang',
+  'Xin',
+  'Xing',
+  'Xue',
+  'Yang',
+  'Yanlin',
+  'Ye',
+  'Yi',
+  'Ying',
+  'Yingjie',
+  'Yingpei',
+  'Yong',
+  'Yongrui',
+  'You',
+  'Yuanjun',
+  'Zhixin',
+  'Zhong',
+  'Zhou',
+  'Zian',
+  'Zihao'
+];
+
+const lastNames = [
+  '王',
+  '李',
+  '张',
+  '刘',
+  '陈',
+  '杨',
+  '黄',
+  '吴',
+  '赵',
+  '周',
+  '徐',
+  '孙',
+  '马',
+  '朱',
+  '胡',
+  '林',
+  '郭',
+  '何',
+  '高',
+  '罗',
+  '郑',
+  '梁',
+  '谢',
+  '宋',
+  '唐',
+  '许',
+  '邓',
+  '冯',
+  '韩',
+  '曹',
+  '曾',
+  '彭',
+  '萧',
+  '蔡',
+  '潘',
+  '田',
+  '董',
+  '袁',
+  '于',
+  '余',
+  '叶',
+  '蒋',
+  '杜',
+  '苏',
+  '魏',
+  '程',
+  '吕',
+  '丁',
+  '沈',
+  '任',
+  '姚',
+  '卢',
+  '傅',
+  '钟',
+  '姜',
+  '崔',
+  '谭',
+  '廖',
+  '范',
+  '汪',
+  '陆',
+  '金',
+  '石',
+  '戴',
+  '贾',
+  '韦',
+  '夏',
+  '邱',
+  '方',
+  '侯',
+  '邹',
+  '熊',
+  '孟',
+  '秦',
+  '白',
+  '江',
+  '阎',
+  '薛',
+  '尹',
+  '段',
+  '雷',
+  '黎',
+  '史',
+  '龙',
+  '陶',
+  '贺',
+  '顾',
+  '毛',
+  '郝',
+  '龚',
+  '邵',
+  '万',
+  '钱',
+  '严',
+  '赖',
+  '覃',
+  '洪',
+  '武',
+  '莫',
+  '孔',
+  '汤',
+  '向',
+  '常',
+  '温',
+  '康',
+  '施',
+  '文',
+  '牛',
+  '樊',
+  '葛',
+  '邢',
+  '安',
+  '齐',
+  '易',
+  '乔',
+  '伍',
+  '庞',
+  '颜',
+  '倪',
+  '庄',
+  '聂',
+  '章',
+  '鲁',
+  '岳',
+  '翟',
+  '殷',
+  '詹',
+  '申',
+  '欧',
+  '耿',
+  '关',
+  '兰',
+  '焦',
+  '俞',
+  '左',
+  '柳',
+  '甘',
+  '祝',
+  '包',
+  '宁',
+  '尚',
+  '符',
+  '舒',
+  '阮',
+  '柯',
+  '纪',
+  '梅',
+  '童',
+  '凌',
+  '毕',
+  '单',
+  '季',
+  '裴',
+  '霍',
+  '涂',
+  '成',
+  '苗',
+  '谷',
+  '盛',
+  '曲',
+  '翁',
+  '冉',
+  '骆',
+  '蓝',
+  '路',
+  '游',
+  '辛',
+  '靳',
+  '欧阳',
+  '管',
+  '柴',
+  '蒙',
+  '鲍',
+  '华',
+  '喻',
+  '祁',
+  '蒲',
+  '房',
+  '滕',
+  '屈',
+  '饶',
+  '解',
+  '牟',
+  '艾',
+  '尤',
+  '阳',
+  '时',
+  '穆',
+  '农',
+  '司',
+  '卓',
+  '古',
+  '吉',
+  '缪',
+  '简',
+  '车',
+  '项',
+  '连',
+  '芦',
+  '麦',
+  '褚',
+  '娄',
+  '窦',
+  '戚',
+  '岑',
+  '景',
+  '党',
+  '宫',
+  '费',
+  '卜',
+  '冷',
+  '晏',
+  '席',
+  '卫',
+  '米',
+  '柏',
+  '宗',
+  '瞿',
+  '桂',
+  '全',
+  '佟',
+  '应',
+  '臧',
+  '闵',
+  '苟',
+  '邬',
+  '边',
+  '卞',
+  '姬',
+  '师',
+  '和',
+  '仇',
+  '栾',
+  '隋',
+  '商',
+  '刁',
+  '沙',
+  '荣',
+  '巫',
+  '寇',
+  '桑',
+  '郎',
+  '甄',
+  '丛',
+  '仲',
+  '虞',
+  '敖',
+  '巩',
+  '明',
+  '佘',
+  '池',
+  '查',
+  '麻',
+  '苑',
+  '迟',
+  '邝',
+  '官',
+  '封',
+  '谈',
+  '匡',
+  '鞠',
+  '惠',
+  '荆',
+  '乐',
+  '冀',
+  '郁',
+  '胥',
+  '南',
+  '班',
+  '储',
+  '原',
+  '栗',
+  '燕',
+  '楚',
+  '鄢',
+  '劳',
+  '谌',
+  '奚',
+  '皮',
+  '粟',
+  '冼',
+  '蔺',
+  '楼',
+  '盘',
+  '满',
+  '闻',
+  '位',
+  '厉',
+  '伊',
+  '仝',
+  '区',
+  '郜',
+  '海',
+  '阚',
+  '花',
+  '权',
+  '强',
+  '帅',
+  '屠',
+  '豆',
+  '朴',
+  '盖',
+  '练',
+  '廉',
+  '禹',
+  '井',
+  '祖',
+  '漆',
+  '巴',
+  '丰',
+  '支',
+  '卿',
+  '国',
+  '狄',
+  '平',
+  '计',
+  '索',
+  '宣',
+  '晋',
+  '相',
+  '初',
+  '门',
+  '雲',
+  '容',
+  '敬',
+  '来',
+  '扈',
+  '晁',
+  '芮',
+  '都',
+  '普',
+  '阙',
+  '浦',
+  '戈',
+  '伏',
+  '鹿',
+  '薄',
+  '邸',
+  '雍',
+  '辜',
+  '羊',
+  '阿',
+  '乌',
+  '母',
+  '裘',
+  '亓',
+  '修',
+  '邰',
+  '赫',
+  '杭',
+  '况',
+  '那',
+  '宿',
+  '鲜',
+  '印',
+  '逯',
+  '隆',
+  '茹',
+  '诸',
+  '战',
+  '慕',
+  '危',
+  '玉',
+  '银',
+  '亢',
+  '嵇',
+  '公',
+  '哈',
+  '湛',
+  '宾',
+  '戎',
+  '勾',
+  '茅',
+  '利',
+  '於',
+  '呼',
+  '居',
+  '揭',
+  '干',
+  '但',
+  '尉',
+  '冶',
+  '斯',
+  '元',
+  '束',
+  '檀',
+  '衣',
+  '信',
+  '展',
+  '阴',
+  '昝',
+  '智',
+  '幸',
+  '奉',
+  '植',
+  '衡',
+  '富',
+  '尧',
+  '闭',
+  '由'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/Colombia/bundle.ts b/packages/plugins/src/countries/Colombia/bundle.ts
new file mode 100644
index 000000000..eec58fc7b
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/bundle.ts
@@ -0,0 +1,257 @@
+/**
+ * @package Countries
+ *
+ * Source data:
+ * 		https://en.wikipedia.org/wiki/List_of_Colombian_Departments_by_population
+ */
+import { GetCountryData } from '@generatedata/types';
+
+const Colombia: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'colombia',
+  regionNames: i18n.regionNames,
+  continent: 'south_america',
+  extendedData: {
+    zipFormat: {
+      format: 'XXXXXX'
+    },
+    phoneFormat: {
+      displayFormats: ['0xx-xxx-xxxx']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Amazonas',
+      regionShort: 'AMA',
+      regionSlug: 'amazonas',
+      weight: 5,
+      cities: ['Leticia', 'Puerto Nariño']
+    },
+    {
+      regionName: 'Antioquia',
+      regionShort: 'ANT',
+      regionSlug: 'antioquia',
+      weight: 560,
+      cities: ['Medellín', 'Bello', 'Itagüí', 'Envigado', 'Apartadó', 'Turbo', 'Rionegro']
+    },
+    {
+      regionName: 'Arauca',
+      regionShort: 'ARA',
+      regionSlug: 'arauca',
+      weight: 15,
+      cities: ['Arauca', 'Tame', 'Saravena']
+    },
+    {
+      regionName: 'Atlántico',
+      regionShort: 'ATL',
+      regionSlug: 'atlantico',
+      weight: 211,
+      cities: ['Barranquilla', 'Soledad', 'Malambo', 'Sabanalarga']
+    },
+    {
+      regionName: 'Bolívar',
+      regionShort: 'BOL',
+      regionSlug: 'bolivar',
+      weight: 210,
+      cities: ['Cartagena', 'Magangué', 'Carmen de Bolivar']
+    },
+    {
+      regionName: 'Boyacá',
+      regionShort: 'BOY',
+      regionSlug: 'boyaca',
+      weight: 3,
+      cities: ['Tunja', 'Duitama', 'Sogamoso', 'Chiquinquirá']
+    },
+    {
+      regionName: 'Caldas',
+      regionShort: 'CAL',
+      regionSlug: 'caldas',
+      weight: 3,
+      cities: ['Manizales', 'La Dorada', 'Riosucio']
+    },
+    {
+      regionName: 'Caquetá',
+      regionShort: 'CAQ',
+      regionSlug: 'caqueta',
+      weight: 3,
+      cities: ['Florencia', 'San Vicente del Caguán', 'Cartagena del Chairá']
+    },
+    {
+      regionName: 'Casanare',
+      regionShort: 'CAS',
+      regionSlug: 'casanare',
+      weight: 3,
+      cities: ['Yopal', 'Aguazul', 'Paz de Ariporo']
+    },
+    {
+      regionName: 'Cauca',
+      regionShort: 'CAU',
+      regionSlug: 'cauca',
+      weight: 3,
+      cities: ['Popayán', 'Santander de Quilichao', 'El Tambo']
+    },
+    {
+      regionName: 'Cesar',
+      regionShort: 'CES',
+      regionSlug: 'cesar',
+      weight: 3,
+      cities: ['Valledupar', 'Aguachica', 'Agustín Codazzi']
+    },
+    {
+      regionName: 'Chocó',
+      regionShort: 'CHO',
+      regionSlug: 'choco',
+      weight: 3,
+      cities: ['Quibdó', 'Alto Baudó', 'Medio Atrato', 'Istmina']
+    },
+    {
+      regionName: 'Córdoba',
+      regionShort: 'COR',
+      regionSlug: 'cordoba',
+      weight: 3,
+      cities: ['Montería', 'Santa Cruz de Lorica', 'Tierralta', 'Cereté', 'Sahagún', 'Montelíbano']
+    },
+    {
+      regionName: 'Cundinamarca',
+      regionShort: 'CUN',
+      regionSlug: 'cundinamarca',
+      weight: 3,
+      cities: ['Soacha', 'Fusagasugá', 'Facatativá', 'Chía', 'Zipaquirá', 'Girardot', 'Mosquera']
+    },
+    {
+      regionName: 'Distrito Capital',
+      regionShort: 'DC',
+      regionSlug: 'distrito_capital',
+      weight: 3,
+      cities: ['Bogotá']
+    },
+    {
+      regionName: 'Guainía',
+      regionShort: 'GUA',
+      regionSlug: 'guainia',
+      weight: 3,
+      cities: ['Inírida', 'Puerto Colombia', 'Barranco Minas', 'Mapiripana']
+    },
+    {
+      regionName: 'Guaviare',
+      regionShort: 'GUV',
+      regionSlug: 'guaviare',
+      weight: 3,
+      cities: ['San José del Guaviare', 'El Retorno', 'Miraflores', 'Calamar']
+    },
+    {
+      regionName: 'Huila',
+      regionShort: 'HUI',
+      regionSlug: 'huila',
+      weight: 3,
+      cities: ['Neiva', 'Pitalito', 'Garzón', 'La Plata']
+    },
+    {
+      regionName: 'La Guajira',
+      regionShort: 'LAG',
+      regionSlug: 'la_guajira',
+      weight: 3,
+      cities: ['Riohacha', 'Uribia', 'Maicao', 'Manaure', 'San Juan del Cesar']
+    },
+    {
+      regionName: 'Magdalena',
+      regionShort: 'MAG',
+      regionSlug: 'magdalena',
+      weight: 3,
+      cities: ['Santa Marta', 'Ciénaga', 'Zona Bananera', 'Plato', 'Fundación']
+    },
+    {
+      regionName: 'Meta',
+      regionShort: 'MET',
+      regionSlug: 'meta',
+      weight: 3,
+      cities: ['Villavicencio', 'Acacías', 'Granada', 'Puerto López']
+    },
+    {
+      regionName: 'Nariño',
+      regionShort: 'NAR',
+      regionSlug: 'narino',
+      weight: 3,
+      cities: ['San Juan de Pasto', 'Tumaco', 'Ipiales', 'Samaniego']
+    },
+    {
+      regionName: 'Norte de Santander',
+      regionShort: 'NSA',
+      regionSlug: 'norte_de_santander',
+      weight: 3,
+      cities: ['Cúcuta', 'Ocaña', 'Villa del Rosario', 'Los Patios', 'Pamplona']
+    },
+    {
+      regionName: 'Putumayo',
+      regionShort: 'PUT',
+      regionSlug: 'putumayo',
+      weight: 3,
+      cities: ['Puerto Asís', 'Orito', 'Valle del Guamuez', 'Mocoa', 'Puerto Guzmán']
+    },
+    {
+      regionName: 'Quindío',
+      regionShort: 'QUI',
+      regionSlug: 'quindio',
+      weight: 3,
+      cities: ['Armenia', 'Calarcá', 'La Tebaida', 'Montenegro', 'Quimbaya']
+    },
+    {
+      regionName: 'Risaralda',
+      regionShort: 'RIS',
+      regionSlug: 'risaralda',
+      weight: 3,
+      cities: ['Pereira', 'Dosquebradas', 'Santa Rosa de Cabal']
+    },
+    {
+      regionName: 'San Andrés y Providencia',
+      regionShort: 'SAP',
+      regionSlug: 'san_andres',
+      weight: 3,
+      cities: ['San Andrés']
+    },
+    {
+      regionName: 'Santander',
+      regionShort: 'SAN',
+      regionSlug: 'santander',
+      weight: 3,
+      cities: ['Bucaramanga', 'Floridablanca', 'San Juan de Girón', 'Barrancabermeja', 'Piedecuesta']
+    },
+    {
+      regionName: 'Sucre',
+      regionShort: 'SUC',
+      regionSlug: 'sucre',
+      weight: 3,
+      cities: ['Sincelejo', 'Corozal', 'San Marcos']
+    },
+    {
+      regionName: 'Tolima',
+      regionShort: 'TOL',
+      regionSlug: 'tolima',
+      weight: 3,
+      cities: ['Ibagué']
+    },
+    {
+      regionName: 'Valle del Cauca',
+      regionShort: 'VAC',
+      regionSlug: 'valle_del_cauca',
+      weight: 3,
+      cities: ['Cali', 'Buenaventura', 'Palmira', 'Tuluá']
+    },
+    {
+      regionName: 'Vaupés',
+      regionShort: 'VAU',
+      regionSlug: 'vaupes',
+      weight: 3,
+      cities: ['Mitú', 'Pacoa']
+    },
+    {
+      regionName: 'Vichada',
+      regionShort: 'VID',
+      regionSlug: 'vichada',
+      weight: 3,
+      cities: ['Cumaribo', 'Puerto Carreño']
+    }
+  ]
+});
+
+export default Colombia;
diff --git a/packages/plugins/src/countries/Colombia/i18n/ar.json b/packages/plugins/src/countries/Colombia/i18n/ar.json
new file mode 100644
index 000000000..65083d62e
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "كولومبيا",
+  "regionNames": "المقاطعات الكولومبية"
+}
diff --git a/packages/plugins/src/countries/Colombia/i18n/de.json b/packages/plugins/src/countries/Colombia/i18n/de.json
new file mode 100644
index 000000000..0c08c7bb7
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Kolumbien",
+  "regionNames": "Kolumbianische Abteilungen"
+}
diff --git a/packages/plugins/src/countries/Colombia/i18n/en.json b/packages/plugins/src/countries/Colombia/i18n/en.json
new file mode 100644
index 000000000..f8cd0fc32
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Colombia",
+  "regionNames": "Col. Departments"
+}
diff --git a/packages/plugins/src/countries/Colombia/i18n/es.json b/packages/plugins/src/countries/Colombia/i18n/es.json
new file mode 100644
index 000000000..d1a52f038
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Colombia",
+  "regionNames": "departamentos colombianos"
+}
diff --git a/packages/plugins/src/countries/Colombia/i18n/fr.json b/packages/plugins/src/countries/Colombia/i18n/fr.json
new file mode 100644
index 000000000..3a67c8228
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Colombie",
+  "regionNames": "Départements de Colombie"
+}
diff --git a/packages/plugins/src/countries/Colombia/i18n/hi.json b/packages/plugins/src/countries/Colombia/i18n/hi.json
new file mode 100644
index 000000000..4e1fcd8c2
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "कोलंबिया",
+  "regionNames": "कोलंबिया विभाग"
+}
diff --git a/packages/plugins/src/countries/Colombia/i18n/ja.json b/packages/plugins/src/countries/Colombia/i18n/ja.json
new file mode 100644
index 000000000..567365d43
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "コロンビア",
+  "regionNames": "コロンビアの県"
+}
diff --git a/packages/plugins/src/countries/Colombia/i18n/nl.json b/packages/plugins/src/countries/Colombia/i18n/nl.json
new file mode 100644
index 000000000..9f01bdbeb
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Colombia",
+  "regionNames": "Colombiaanse afdelingen"
+}
diff --git a/packages/plugins/src/countries/Colombia/i18n/pt.json b/packages/plugins/src/countries/Colombia/i18n/pt.json
new file mode 100644
index 000000000..9c5ac3f5d
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Colômbia",
+  "regionNames": "Departamentos colombianos"
+}
diff --git a/packages/plugins/src/countries/Colombia/i18n/ru.json b/packages/plugins/src/countries/Colombia/i18n/ru.json
new file mode 100644
index 000000000..c7a3fb34c
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Колумбия",
+  "regionNames": "Департаменты Колумбии"
+}
diff --git a/packages/plugins/src/countries/Colombia/i18n/ta.json b/packages/plugins/src/countries/Colombia/i18n/ta.json
new file mode 100644
index 000000000..36e56eee6
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "கொலம்பியா",
+  "regionNames": "கொலம்பிய துறைகள்"
+}
diff --git a/packages/plugins/src/countries/Colombia/i18n/zh.json b/packages/plugins/src/countries/Colombia/i18n/zh.json
new file mode 100644
index 000000000..0ea42c264
--- /dev/null
+++ b/packages/plugins/src/countries/Colombia/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "哥伦比亚",
+  "regionNames": "哥伦比亚部门"
+}
diff --git a/packages/plugins/src/countries/CostaRica/bundle.ts b/packages/plugins/src/countries/CostaRica/bundle.ts
new file mode 100644
index 000000000..897e33eee
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/bundle.ts
@@ -0,0 +1,208 @@
+/* eslint max-len:0 */
+/**
+ * @package Countries
+ *
+ * @author Andre Fortin <andre.v.fortin@gmail.com>
+ */
+import { GetCountryData } from '@generatedata/types';
+
+const CostaRica: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'CR',
+  regionNames: i18n.regionNames,
+  continent: 'central_america',
+  extendedData: {
+    zipFormat: {
+      format: 'ZYxYx',
+      replacements: {
+        Z: '1234567',
+        Y: '01',
+        x: '0123456789'
+      }
+    },
+    phoneFormat: {
+      displayFormats: ['xxxxxxxx', 'xxxx-xxxx']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Alajuela',
+      regionShort: 'A',
+      regionSlug: 'alajuela',
+      weight: 20,
+      cities: ['Alajuela', 'Quesada', 'San José de Alajuela', 'San Rafael'],
+      extendedData: {
+        zipFormat: {
+          format: '2zxYx',
+          replacements: {
+            z: '01',
+            Y: '01',
+            x: '0123456789'
+          }
+        },
+        phoneFormat: {
+          displayFormats: ['24xxxxxx']
+        }
+      }
+    },
+    {
+      regionName: 'Cartago',
+      regionShort: 'C',
+      regionSlug: 'cartago',
+      weight: 11,
+      cities: [
+        'Aguacaliente (San Francisco]',
+        'Carmen',
+        'Cartago',
+        'Paraíso',
+        'San Diego',
+        'San Nicolás',
+        'San Rafael',
+        'Tejar',
+        'Turrialba'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '30xYx',
+          replacements: {
+            Y: '01',
+            x: '0123456789'
+          }
+        },
+        phoneFormat: {
+          displayFormats: ['25xxxxxx']
+        }
+      }
+    },
+    {
+      regionName: 'Guanacaste',
+      regionShort: 'G',
+      regionSlug: 'guanacaste',
+      weight: 8,
+      cities: ['Cañas', 'Liberia', 'Nicoya'],
+      extendedData: {
+        zipFormat: {
+          format: '5zxYx',
+          replacements: {
+            z: '01',
+            Y: '01',
+            x: '0123456789'
+          }
+        },
+        phoneFormat: {
+          displayFormats: ['26xxxxxx']
+        }
+      }
+    },
+    {
+      regionName: 'Heredia',
+      regionShort: 'H',
+      regionSlug: 'heredia',
+      weight: 10,
+      cities: ['Heredia', 'Mercedes', 'San Francisco', 'San Pablo', 'Ulloa (Barrial]'],
+      extendedData: {
+        zipFormat: {
+          format: '4zxYx',
+          replacements: {
+            z: '01',
+            Y: '01',
+            x: '0123456789'
+          }
+        },
+        phoneFormat: {
+          displayFormats: ['25xxxxxx']
+        }
+      }
+    },
+    {
+      regionName: 'Limón',
+      regionShort: 'L',
+      regionSlug: 'limón',
+      weight: 2,
+      cities: ['Guápiles', 'Limón (Puerto Limón]', 'Siquirres'],
+      extendedData: {
+        zipFormat: {
+          format: '50yYx',
+          replacements: {
+            y: '12',
+            Y: '01',
+            x: '0123456789'
+          }
+        },
+        phoneFormat: {
+          displayFormats: ['27xxxxxx']
+        }
+      }
+    },
+    {
+      regionName: 'Puntarenas',
+      regionShort: 'P',
+      regionSlug: 'puntarenas',
+      weight: 2,
+      cities: ['Barranca', 'Puntarenas'],
+      extendedData: {
+        zipFormat: {
+          format: 'ZYxYx',
+          replacements: {
+            Z: '1234567',
+            Y: '01',
+            x: '0123456789'
+          }
+        },
+        phoneFormat: {
+          displayFormats: ['27xxxxxx']
+        }
+      }
+    },
+    {
+      regionName: 'San José',
+      regionShort: 'SJ',
+      regionSlug: 'san_josé',
+      weight: 33,
+      cities: [
+        'Alajuelita',
+        'Aserrí',
+        'Calle Blancos',
+        'Cinco Esquinas',
+        'Concepción',
+        'Curridabat',
+        'Desamparados',
+        'Gravilias',
+        'Guadalupe',
+        'Ipís',
+        'Mata de Plátano',
+        'Patalillo',
+        'Patarrá',
+        'Purral',
+        'San Antonio',
+        'San Felipe',
+        'San Isidro',
+        'San Isidro de El General',
+        'San José',
+        'San Juan (San Juan de Tibás]',
+        'San Juan de Dios',
+        'San Miguel',
+        'San Pedro',
+        'San Rafael',
+        'San Rafael Abajo',
+        'San Vicente',
+        'Tirrases'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '1zxYx',
+          replacements: {
+            z: '012',
+            Y: '01',
+            x: '0123456789'
+          }
+        },
+        phoneFormat: {
+          displayFormats: ['25xxxxxx']
+        }
+      }
+    }
+  ]
+});
+
+export default CostaRica;
diff --git a/packages/plugins/src/countries/CostaRica/i18n/ar.json b/packages/plugins/src/countries/CostaRica/i18n/ar.json
new file mode 100644
index 000000000..242b54a6a
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "كوستا ريكا",
+  "regionNames": "مقاطعات كوستاريكا"
+}
diff --git a/packages/plugins/src/countries/CostaRica/i18n/de.json b/packages/plugins/src/countries/CostaRica/i18n/de.json
new file mode 100644
index 000000000..94ca3486b
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Costa Rica",
+  "regionNames": "Provinzen Costa Ricas"
+}
diff --git a/packages/plugins/src/countries/CostaRica/i18n/en.json b/packages/plugins/src/countries/CostaRica/i18n/en.json
new file mode 100644
index 000000000..8a3042cbf
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Costa Rica",
+  "regionNames": "Costa Rican Provinces"
+}
diff --git a/packages/plugins/src/countries/CostaRica/i18n/es.json b/packages/plugins/src/countries/CostaRica/i18n/es.json
new file mode 100644
index 000000000..4f6471b10
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Costa Rica",
+  "regionNames": "Provincias de Costa Rica"
+}
diff --git a/packages/plugins/src/countries/CostaRica/i18n/fr.json b/packages/plugins/src/countries/CostaRica/i18n/fr.json
new file mode 100644
index 000000000..7deddc9d4
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Costa Rica",
+  "regionNames": "Provinces du Costa Rica"
+}
diff --git a/packages/plugins/src/countries/CostaRica/i18n/hi.json b/packages/plugins/src/countries/CostaRica/i18n/hi.json
new file mode 100644
index 000000000..2aa12540b
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "कोस्टा रिका",
+  "regionNames": "कोस्टा रिकान प्रांत"
+}
diff --git a/packages/plugins/src/countries/CostaRica/i18n/ja.json b/packages/plugins/src/countries/CostaRica/i18n/ja.json
new file mode 100644
index 000000000..96b7be51f
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "コスタリカ",
+  "regionNames": "コスタリカの州"
+}
diff --git a/packages/plugins/src/countries/CostaRica/i18n/nl.json b/packages/plugins/src/countries/CostaRica/i18n/nl.json
new file mode 100644
index 000000000..b5c0f8805
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Costa Rica",
+  "regionNames": "Costa Ricaanse provincies"
+}
diff --git a/packages/plugins/src/countries/CostaRica/i18n/pt.json b/packages/plugins/src/countries/CostaRica/i18n/pt.json
new file mode 100644
index 000000000..c9439f61c
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Costa Rica",
+  "regionNames": "Províncias da Costa Rica"
+}
diff --git a/packages/plugins/src/countries/CostaRica/i18n/ru.json b/packages/plugins/src/countries/CostaRica/i18n/ru.json
new file mode 100644
index 000000000..4826e45c2
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Коста-Рика",
+  "regionNames": "Провинции Коста-Рики"
+}
diff --git a/packages/plugins/src/countries/CostaRica/i18n/ta.json b/packages/plugins/src/countries/CostaRica/i18n/ta.json
new file mode 100644
index 000000000..9c1cebc3c
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "கோஸ்ட்டா ரிக்கா",
+  "regionNames": "கோஸ்டா ரிக்கன் மாகாணங்கள்"
+}
diff --git a/packages/plugins/src/countries/CostaRica/i18n/zh.json b/packages/plugins/src/countries/CostaRica/i18n/zh.json
new file mode 100644
index 000000000..e600ae209
--- /dev/null
+++ b/packages/plugins/src/countries/CostaRica/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "哥斯达黎加",
+  "regionNames": "哥斯达黎加省份"
+}
diff --git a/packages/plugins/src/countries/France/bundle.ts b/packages/plugins/src/countries/France/bundle.ts
new file mode 100644
index 000000000..7c5c905b1
--- /dev/null
+++ b/packages/plugins/src/countries/France/bundle.ts
@@ -0,0 +1,278 @@
+import { GetCountryData } from '@generatedata/types';
+
+const France: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'france',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxxx'
+    }
+  },
+  regions: [
+    {
+      regionName: 'Île-de-France',
+      regionShort: 'IL',
+      regionSlug: 'ile_de_france',
+      weight: 18.3,
+      cities: [
+        'Paris',
+        'Boulogne-Billancourt',
+        'Saint-Denis',
+        'Argenteuil',
+        'Montreuil',
+        'Créteil',
+        'Nanterre',
+        'Courbevoie',
+        'Versailles',
+        'Vitry-sur-Seine',
+        'Colombes',
+        'Asnières-sur-Seine',
+        'Aulnay-sous-Bois',
+        'Rueil-Malmaison',
+        'Aubervilliers',
+        'Champigny-sur-Marne',
+        'Saint-Maur-des-Fossés',
+        'Drancy',
+        'Issy-les-Moulineaux',
+        'Levallois-Perret',
+        'Noisy-le-Grand'
+      ]
+    },
+    {
+      regionName: "Provence-Alpes-Côte d'Azur",
+      regionShort: 'PR',
+      regionSlug: 'provence_alpes',
+      weight: 9.6,
+      cities: [
+        'Marseille',
+        'Nice',
+        'Toulon',
+        'Aix-en-Provence',
+        'Avignon',
+        'Antibes',
+        'Cannes',
+        'La Seyne-sur-Mer',
+        'Hyères',
+        'Arles',
+        'Fréjus',
+        'Grasse',
+        'Martigues',
+        'Cagnes-sur-Mer',
+        'Aubagne',
+        'Salon-de-Provence',
+        'Istres',
+        'Le Cannet',
+        'Gap',
+        'Draguignan',
+        'Vitrolles'
+      ]
+    },
+    {
+      regionName: 'Nord-Pas-de-Calais',
+      regionShort: 'NO',
+      regionSlug: 'nord_pas_de_calais',
+      weight: 7.6,
+      cities: [
+        'Lille',
+        'Roubaix',
+        'Dunkerque',
+        'Tourcoing',
+        'Calais',
+        "Villeneuve-d'Ascq",
+        'Valenciennes',
+        'Boulogne-sur-Mer',
+        'Douai',
+        'Arras',
+        'Wattrelos',
+        'Marcq-en-Baroeul',
+        'Lens',
+        'Cambrai',
+        'Liévin',
+        'Maubeuge',
+        'Lambersart',
+        'Hénin-Beaumont',
+        'Béthune'
+      ]
+    },
+    {
+      regionName: 'Pays de la Loire',
+      regionShort: 'PA',
+      regionSlug: 'pays_de_la_loire',
+      weight: 6.3,
+      cities: [
+        'Nantes',
+        'Angers',
+        'Le Mans',
+        'Saint-Nazaire',
+        'Cholet',
+        'La Roche-sur-Yon',
+        'Laval',
+        'Saint-Herblain',
+        'Rezé',
+        'Saumur',
+        'Saint-Sébastien-sur-Loire',
+        'Orvault',
+        'Vertou'
+      ]
+    },
+    {
+      regionName: 'Aquitaine',
+      regionShort: 'AQ',
+      regionSlug: 'aquitaine',
+      weight: 5.5,
+      cities: [
+        'Bordeaux',
+        'Pau',
+        'Mérignac',
+        'Pessac',
+        'Bayonne',
+        'Talence',
+        'Anglet',
+        'Agen',
+        'Mont-de-Marsan',
+        'Périgueux',
+        "Villenave-d'Ornon",
+        'Saint-Médard-en-Jalles',
+        'Bergerac',
+        'Biarritz',
+        'Bègles'
+      ]
+    },
+    {
+      regionName: 'Bretagne',
+      regionShort: 'BR',
+      regionSlug: 'bretagne',
+      weight: 4.9,
+      cities: ['Rennes', 'Brest', 'Quimper', 'Lorient', 'Vannes', 'Saint-Malo', 'Saint-Brieuc', 'Lanester']
+    },
+    {
+      regionName: 'Midi-Pyrénées',
+      regionShort: 'MI',
+      regionSlug: 'midi_pyrenees',
+      weight: 4.4,
+      cities: ['Toulouse', 'Montauban', 'Albi', 'Tarbes', 'Castres', 'Colomiers', 'Tournefeuille', 'Rodez']
+    },
+    {
+      regionName: 'Languedoc-Roussillon',
+      regionShort: 'LA',
+      regionSlug: 'languedoc_rousillon',
+      weight: 4.1,
+      cities: ['Montpellier', 'Nîmes', 'Perpignan', 'Béziers', 'Narbonne', 'Carcassonne', 'Sète', 'Alès', 'Lunel']
+    },
+    {
+      regionName: 'Centre',
+      regionShort: 'CE',
+      regionSlug: 'centre',
+      weight: 4,
+      cities: ['Tours', 'Orléans', 'Bourges', 'Blois', 'Châteauroux', 'Chartres', 'Joué-lès-Tours', 'Dreux', 'Vierzon']
+    },
+    {
+      regionName: 'Lorraine',
+      regionShort: 'LO',
+      regionSlug: 'lorraine',
+      weight: 3.7,
+      cities: [
+        'Metz',
+        'Nancy',
+        'Thionville',
+        'Épinal',
+        'Vandoeuvre-lès-Nancy',
+        'Montigny-lès-Metz',
+        'Sarreguemines',
+        'Forbach',
+        'Saint-Dié-des-Vosges'
+      ]
+    },
+    {
+      regionName: 'Picardie',
+      regionShort: 'PI',
+      regionSlug: 'picardie',
+      weight: 3,
+      cities: ['Amiens', 'Saint-Quentin', 'Beauvais', 'Compiègne', 'Creil', 'Soissons', 'Laon', 'Abbeville']
+    },
+    {
+      regionName: 'Alsace',
+      regionShort: 'AL',
+      regionSlug: 'alsace',
+      weight: 2.9,
+      cities: ['Strasbourg', 'Mulhouse', 'Colmar', 'Haguenau', 'Schiltigheim', 'Illkirch-Graffenstaden', 'Saint-Louis']
+    },
+    {
+      regionName: 'Haute-Normandie',
+      regionShort: 'HA',
+      regionSlug: 'haute_normandie',
+      weight: 2.8,
+      cities: [
+        'Le Havre',
+        'Rouen',
+        'Évreux',
+        'Dieppe',
+        'Sotteville-lès-Rouen',
+        'Saint-Étienne-du-Rouvray',
+        'Vernon',
+        'Le Grand-Quevilly',
+        'Le Petit-Quevilly'
+      ]
+    },
+    {
+      regionName: 'Poitou-Charentes',
+      regionShort: 'PO',
+      regionSlug: 'poitou_charentes',
+      weight: 2.7,
+      cities: ['Poitiers', 'La Rochelle', 'Niort', 'Angoulême', 'Châtellerault', 'Saintes']
+    },
+    {
+      regionName: 'Bourgogne',
+      regionShort: 'BO',
+      regionSlug: 'bourgogne',
+      weight: 2.6,
+      cities: ['Dijon', 'Chalon-sur-Saône', 'Nevers', 'Auxerre', 'Mâcon', 'Sens']
+    },
+    {
+      regionName: 'Basse-Normandie',
+      regionShort: 'BA',
+      regionSlug: 'basse_normandie',
+      weight: 2.3,
+      cities: ['Caen', 'Cherbourg-Octeville', 'Alençon', 'Lisieux', 'Hérouville-Saint-Clair', 'Saint-Lô']
+    },
+    {
+      regionName: 'Auvergne',
+      regionShort: 'AU',
+      regionSlug: 'auvergne',
+      weight: 2.1,
+      cities: ['Clermont-Ferrand', 'Montluçon', 'Aurillac', 'Vichy', 'Moulins', 'Le Puy-en-Velay']
+    },
+    {
+      regionName: 'Champagne-Ardenne',
+      regionShort: 'CH',
+      regionSlug: 'champagne_ardenne',
+      weight: 2.1,
+      cities: ['Reims', 'Troyes', 'Charleville-Mézières', 'Châlons-en-Champagne', 'Saint-Dizier', 'Épernay']
+    },
+    {
+      regionName: 'Franche-Comté',
+      regionShort: 'FC',
+      regionSlug: 'franche_comte',
+      weight: 1.8,
+      cities: ['Besançon', 'Belfort', 'Montbéliard', 'Dole', 'Pontarlier']
+    },
+    {
+      regionName: 'Limousin',
+      regionShort: 'LI',
+      regionSlug: 'limousin',
+      weight: 1.1,
+      cities: ['Limoges', 'Brive-la-Gaillarde']
+    },
+    {
+      regionName: 'Corse',
+      regionShort: 'CO',
+      regionSlug: 'corse',
+      weight: 0.5,
+      cities: ['Ajaccio', 'Bastia']
+    }
+  ]
+});
+
+export default France;
diff --git a/packages/plugins/src/countries/France/i18n/ar.json b/packages/plugins/src/countries/France/i18n/ar.json
new file mode 100644
index 000000000..183fdf725
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "فرنسا",
+  "regionNames": "مناطق فرنسا"
+}
diff --git a/packages/plugins/src/countries/France/i18n/de.json b/packages/plugins/src/countries/France/i18n/de.json
new file mode 100644
index 000000000..487c23582
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Frankreich",
+  "regionNames": "Frankreich-Regionen"
+}
diff --git a/packages/plugins/src/countries/France/i18n/en.json b/packages/plugins/src/countries/France/i18n/en.json
new file mode 100644
index 000000000..6557b1028
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "France",
+  "regionNames": "France regions"
+}
diff --git a/packages/plugins/src/countries/France/i18n/es.json b/packages/plugins/src/countries/France/i18n/es.json
new file mode 100644
index 000000000..360758654
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Francia",
+  "regionNames": "Francia regiones"
+}
diff --git a/packages/plugins/src/countries/France/i18n/fr.json b/packages/plugins/src/countries/France/i18n/fr.json
new file mode 100644
index 000000000..c307f3036
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "France",
+  "regionNames": "Régions Françaises"
+}
diff --git a/packages/plugins/src/countries/France/i18n/hi.json b/packages/plugins/src/countries/France/i18n/hi.json
new file mode 100644
index 000000000..b48361836
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "फ्रांस",
+  "regionNames": "फ्रांस क्षेत्र"
+}
diff --git a/packages/plugins/src/countries/France/i18n/ja.json b/packages/plugins/src/countries/France/i18n/ja.json
new file mode 100644
index 000000000..e4cd3b274
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "フランス",
+  "regionNames": "フランスの地域"
+}
diff --git a/packages/plugins/src/countries/France/i18n/nl.json b/packages/plugins/src/countries/France/i18n/nl.json
new file mode 100644
index 000000000..5b5d78d16
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Frankrijk",
+  "regionNames": "Frankrijk regio's"
+}
diff --git a/packages/plugins/src/countries/France/i18n/pt.json b/packages/plugins/src/countries/France/i18n/pt.json
new file mode 100644
index 000000000..465ef00f4
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "França",
+  "regionNames": "Regiões da França"
+}
diff --git a/packages/plugins/src/countries/France/i18n/ru.json b/packages/plugins/src/countries/France/i18n/ru.json
new file mode 100644
index 000000000..0eec7aeb6
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Франция",
+  "regionNames": "Регионы Франции"
+}
diff --git a/packages/plugins/src/countries/France/i18n/ta.json b/packages/plugins/src/countries/France/i18n/ta.json
new file mode 100644
index 000000000..ba5c18f82
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "பிரான்ஸ்",
+  "regionNames": "பிரான்ஸ் பிராந்தியங்கள்"
+}
diff --git a/packages/plugins/src/countries/France/i18n/zh.json b/packages/plugins/src/countries/France/i18n/zh.json
new file mode 100644
index 000000000..57fdbfbff
--- /dev/null
+++ b/packages/plugins/src/countries/France/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "法国",
+  "regionNames": "法国地区"
+}
diff --git a/packages/plugins/src/countries/Germany/bundle.ts b/packages/plugins/src/countries/Germany/bundle.ts
new file mode 100644
index 000000000..ffec5d75a
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/bundle.ts
@@ -0,0 +1,429 @@
+/* eslint max-len:0 */
+import { GetCountryData } from '@generatedata/types';
+
+const Germany: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'germany',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxxx'
+    }
+  },
+  regions: [
+    {
+      regionName: 'Baden Württemberg',
+      regionShort: 'BW',
+      regionSlug: 'baden_wurttemberg',
+      weight: 301,
+      cities: [
+        'Stuttgart',
+        'Mannheim',
+        'Karlsruhe',
+        'Freiburg',
+        'Heidelberg',
+        'Heilbronn',
+        'Ulm',
+        'Pforzheim',
+        'Reutlingen',
+        'Esslingen',
+        'Tübingen',
+        'Ludwigsburg',
+        'Konstanz',
+        'Villingen-Schwenningen',
+        'Aalen',
+        'Sindelfingen',
+        'Schwäbisch Gmünd',
+        'Friedrichshafen',
+        'Offenburg',
+        'Göppingen',
+        'Baden-Baden',
+        'Waiblingen',
+        'Ravensburg',
+        'Lörrach',
+        'Heidenheim',
+        'Rastatt',
+        'Böblingen'
+      ]
+    },
+    {
+      regionName: 'Bayern',
+      regionShort: 'BY',
+      regionSlug: 'bayern',
+      weight: 178,
+      cities: [
+        'Munich',
+        'Nuremberg',
+        'Augsburg',
+        'Regensburg',
+        'Würzburg',
+        'Ingolstadt',
+        'Fürth',
+        'Erlangen',
+        'Bayreuth',
+        'Bamberg',
+        'Aschaffenburg',
+        'Landshut',
+        'Kempten',
+        'Rosenheim',
+        'Neu-Ulm',
+        'Schweinfurt',
+        'Passau',
+        'Hof',
+        'Freising',
+        'Straubing'
+      ]
+    },
+    {
+      regionName: 'Berlin',
+      regionShort: 'BE',
+      regionSlug: 'berlin',
+      weight: 3890,
+      cities: ['Berlin']
+    },
+    {
+      regionName: 'Brandenburg',
+      regionShort: 'BB',
+      regionSlug: 'brandenburg',
+      weight: 85,
+      cities: [
+        'Potsdam',
+        'Cottbus',
+        'Brandenburg',
+        'Frankfurt',
+        'Oranienburg',
+        'Falkensee',
+        'Eberswalde-Finow',
+        'Bernau',
+        'Königs Wusterhausen',
+        'Schwedt',
+        'Fürstenwalde',
+        'Neuruppin',
+        'Eisenhüttenstadt',
+        'Senftenberg',
+        'Strausberg',
+        'Hennigsdorf',
+        'Blankenfelde-Mahlow',
+        'Rathenow',
+        'Hohen Neuendorf',
+        'Ludwigsfelde',
+        'Spremberg',
+        'Werder',
+        'Teltow',
+        'Wandlitz',
+        'Luckenwalde',
+        'Forst',
+        'Kleinmachnow',
+        'Prenzlau',
+        'Panketal',
+        'Guben'
+      ]
+    },
+    {
+      regionName: 'Bremen',
+      regionShort: 'HB',
+      regionSlug: 'bremen',
+      weight: 1577,
+      cities: ['Bremen', 'Bremerhaven']
+    },
+    {
+      regionName: 'Hamburg',
+      regionShort: 'HH',
+      regionSlug: 'hamburg',
+      weight: 2368,
+      cities: ['Hamburg']
+    },
+    {
+      regionName: 'Hessen',
+      regionShort: 'HE',
+      regionSlug: 'hessen',
+      weight: 287,
+      cities: [
+        'Frankfurt am Main',
+        'Wiesbaden',
+        'Kassel',
+        'Darmstadt',
+        'Offenbach am Main',
+        'Hanau',
+        'Marburg',
+        'Gießen',
+        'Fulda',
+        'Rüsselsheim',
+        'Wetzlar',
+        'Bad Homburg v. d. Höhe',
+        'Rodgau',
+        'Oberursel',
+        'Dreieich',
+        'Maintal',
+        'Bensheim',
+        'Hofheim am Taunus',
+        'Neu-Isenburg',
+        'Langen',
+        'Limburg a.d. Lahn',
+        'Dietzenbach',
+        'Lampertheim',
+        'Mörfelden-Walldorf',
+        'Viernheim',
+        'Bad Hersfeld',
+        'Bad Nauheim',
+        'Taunusstein',
+        'Baunatal',
+        'Kelkheim',
+        'Bad Vilbel',
+        'Friedberg',
+        'Mühlheim am Main',
+        'Rödermark',
+        'Heppenheim',
+        'Dillenburg',
+        'Pfungstadt',
+        'Hattersheim am Main',
+        'Butzbach',
+        'Friedrichsdorf',
+        'Obertshausen',
+        'Korbach',
+        'Griesheim',
+        'Groß-Gerau',
+        'Weiterstadt',
+        'Eschwege'
+      ]
+    },
+    {
+      regionName: 'Niedersachsen',
+      regionShort: 'NI',
+      regionSlug: 'niedersachsen',
+      weight: 166,
+      cities: [
+        'Hannover',
+        'Braunschweig',
+        'Osnabrück',
+        'Oldenburg',
+        'Wolfsburg',
+        'Göttingen',
+        'Hildesheim',
+        'Salzgitter',
+        'Wilhelmshaven',
+        'Delmenhorst',
+        'Lüneburg',
+        'Celle',
+        'Garbsen',
+        'Hameln',
+        'Wolfenbüttel',
+        'Nordhorn',
+        'Langenhagen',
+        'Emden',
+        'Lingen',
+        'Cuxhaven',
+        'Peine',
+        'Stade',
+        'Melle',
+        'Neustadt am Rübenberge',
+        'Lehrte',
+        'Seevetal',
+        'Gifhorn',
+        'Wunstorf',
+        'Goslar'
+      ]
+    },
+    {
+      regionName: 'Mecklenburg-Vorpommern',
+      regionShort: 'MV',
+      regionSlug: 'meckleburg',
+      weight: 71,
+      cities: [
+        'Anklam',
+        'Bergen',
+        'Greifswald',
+        'Güstrow',
+        'Neubrandenburg',
+        'Neustrelitz',
+        'Parchim	City',
+        'Ribnitz-Damgarten',
+        'Rostock',
+        'Schwerin',
+        'Stralsund',
+        'Waren',
+        'Wismar'
+      ]
+    },
+    {
+      regionName: 'Nordrhein-Westphalen',
+      regionShort: 'NW',
+      regionSlug: 'nordrhein_westphalien',
+      weight: 523,
+      cities: [
+        'Köln',
+        'Düsseldorf',
+        'Dortmund',
+        'Essen',
+        'Duisburg',
+        'Bochum',
+        'Wuppertal',
+        'Bonn',
+        'Bielefeld',
+        'Münster',
+        'Aachen',
+        'Mönchengladbach',
+        'Gelsenkirchen',
+        'Krefeld',
+        'Oberhausen',
+        'Hagen',
+        'Hamm',
+        'Mülheim',
+        'Herne',
+        'Leverkusen',
+        'Solingen',
+        'Neuss',
+        'Paderborn',
+        'Recklinghausen',
+        'Bottrop',
+        'Remscheid',
+        'Bergisch Gladbach'
+      ]
+    },
+    {
+      regionName: 'Rheinland-Pfalz',
+      regionShort: 'RP',
+      regionSlug: 'rheinland_pfalz',
+      weight: 202,
+      cities: [
+        'Mainz',
+        'Ludwigshafen',
+        'Koblenz',
+        'Trier',
+        'Kaiserslauter',
+        'Worms',
+        'Neuwied',
+        'Neustadt',
+        'Speyer',
+        'Frankenthal',
+        'Bad Kreuznach',
+        'Landau',
+        'Pirmasens',
+        'Zweibrücken',
+        'Idar-Oberstei',
+        'Andernach',
+        'Bad Neuenahr-Ahrweiler',
+        'Bingen',
+        'Ingelheim',
+        'Germersheim',
+        'Haßloch',
+        'Schifferstadt',
+        'Bad Dürkheim'
+      ]
+    },
+    {
+      regionName: 'Saarland',
+      regionShort: 'SL',
+      regionSlug: 'saarland',
+      weight: 400,
+      cities: [
+        'Saarbrücken',
+        'Neunkirchen',
+        'Homburg',
+        'Völklingen',
+        'Sankt Ingbert',
+        'Saarlouis',
+        'Merzig',
+        'Sankt Wendel',
+        'Blieskastel',
+        'Dillingen',
+        'Lebach',
+        'Püttlingen',
+        'Heusweiler',
+        'Wadgassen',
+        'Bexbach',
+        'Schwalbach',
+        'Sulzbach'
+      ]
+    },
+    {
+      regionName: 'Sachsen',
+      regionShort: 'SN',
+      regionSlug: 'sachsen',
+      weight: 227,
+      cities: [
+        'Leipzig',
+        'Dresden',
+        'Chemnitz',
+        'Zwickau',
+        'Plauen',
+        'Görlitz',
+        'Freiberg',
+        'Bautzen',
+        'Freital',
+        'Pirna',
+        'Hoyerswerda',
+        'Radebeul',
+        'Riesa',
+        'Grimma',
+        'Zittau',
+        'Meißen',
+        'Delitzsch',
+        'Limbach-Oberfrohna',
+        'Markkleeberg',
+        'Glauchau'
+      ]
+    },
+    {
+      regionName: 'Sachsen-Anhalt',
+      regionShort: 'ST',
+      regionSlug: 'sachsen_anhalt',
+      weight: 116,
+      cities: [
+        'Halle',
+        'Magdeburg',
+        'Dessau',
+        'Wittenberg',
+        'Bitterfeld-Wolfen',
+        'Stendal',
+        'Halberstadt',
+        'Weißenfels',
+        'Bernburg',
+        'Merseburg',
+        'Wernigerode',
+        'Naumburg',
+        'Schönebeck',
+        'Zeitz',
+        'Sangerhausen',
+        'Aschersleben',
+        'Quedlinburg',
+        'Staßfurt',
+        'Köthen',
+        'Eisleben',
+        'Salzwedel',
+        'Burg'
+      ]
+    },
+    {
+      regionName: 'Schleswig-Holstein',
+      regionShort: 'SH',
+      regionSlug: 'schleswig_holstein',
+      weight: 179,
+      cities: [
+        'Kiel',
+        'Lübeck',
+        'Flensburg',
+        'Neumünster',
+        'Norderstedt',
+        'Elmshorn',
+        'Pinneberg',
+        'Itzehoe',
+        'Wedel',
+        'Ahrensburg',
+        'Geesthacht',
+        'Rendsburg',
+        'Henstedt-Ulzburg',
+        'Reinbek',
+        'Bad Oldesloe',
+        'Schleswig',
+        'Eckernförde',
+        'Husum',
+        'Heide',
+        'Quickborn'
+      ]
+    }
+  ]
+});
+
+export default Germany;
diff --git a/packages/plugins/src/countries/Germany/i18n/ar.json b/packages/plugins/src/countries/Germany/i18n/ar.json
new file mode 100644
index 000000000..1bed26505
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ألمانيا",
+  "regionNames": "الدول الألمانية"
+}
diff --git a/packages/plugins/src/countries/Germany/i18n/de.json b/packages/plugins/src/countries/Germany/i18n/de.json
new file mode 100644
index 000000000..9bbca29fc
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Deutschland",
+  "regionNames": "Deutsche Staaten"
+}
diff --git a/packages/plugins/src/countries/Germany/i18n/en.json b/packages/plugins/src/countries/Germany/i18n/en.json
new file mode 100644
index 000000000..464015aa7
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Germany",
+  "regionNames": "German States"
+}
diff --git a/packages/plugins/src/countries/Germany/i18n/es.json b/packages/plugins/src/countries/Germany/i18n/es.json
new file mode 100644
index 000000000..4c88a94f5
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Alemania",
+  "regionNames": "Estados alemanes"
+}
diff --git a/packages/plugins/src/countries/Germany/i18n/fr.json b/packages/plugins/src/countries/Germany/i18n/fr.json
new file mode 100644
index 000000000..dd419af3c
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Allemagne",
+  "regionNames": "États allemands"
+}
diff --git a/packages/plugins/src/countries/Germany/i18n/hi.json b/packages/plugins/src/countries/Germany/i18n/hi.json
new file mode 100644
index 000000000..2ee2ded5b
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "जर्मनी",
+  "regionNames": "जर्मन राज्य"
+}
diff --git a/packages/plugins/src/countries/Germany/i18n/ja.json b/packages/plugins/src/countries/Germany/i18n/ja.json
new file mode 100644
index 000000000..621f3e4f4
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ドイツ",
+  "regionNames": "ドイツの諸州"
+}
diff --git a/packages/plugins/src/countries/Germany/i18n/nl.json b/packages/plugins/src/countries/Germany/i18n/nl.json
new file mode 100644
index 000000000..86716caa8
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Duitsland",
+  "regionNames": "Duitse staten"
+}
diff --git a/packages/plugins/src/countries/Germany/i18n/pt.json b/packages/plugins/src/countries/Germany/i18n/pt.json
new file mode 100644
index 000000000..c823c13f6
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Alemanha",
+  "regionNames": "Estados alemães"
+}
diff --git a/packages/plugins/src/countries/Germany/i18n/ru.json b/packages/plugins/src/countries/Germany/i18n/ru.json
new file mode 100644
index 000000000..83738aa9b
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Германия",
+  "regionNames": "Германские государства"
+}
diff --git a/packages/plugins/src/countries/Germany/i18n/ta.json b/packages/plugins/src/countries/Germany/i18n/ta.json
new file mode 100644
index 000000000..7bd5289d5
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ஜெர்மனி",
+  "regionNames": "ஜெர்மன் நாடுகள்"
+}
diff --git a/packages/plugins/src/countries/Germany/i18n/zh.json b/packages/plugins/src/countries/Germany/i18n/zh.json
new file mode 100644
index 000000000..eb379603a
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "德国",
+  "regionNames": "德国各州"
+}
diff --git a/packages/plugins/src/countries/Germany/names.ts b/packages/plugins/src/countries/Germany/names.ts
new file mode 100644
index 000000000..e00e6a36f
--- /dev/null
+++ b/packages/plugins/src/countries/Germany/names.ts
@@ -0,0 +1,454 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Alexa',
+  'Alexandra',
+  'Angela',
+  'Angelika',
+  'Anita',
+  'Anja',
+  'Anke',
+  'Anna',
+  'Anne',
+  'Annette',
+  'Annika',
+  'Astrid',
+  'Barbara',
+  'Beate',
+  'Beatrice',
+  'Bettina',
+  'Bianca',
+  'Birgit',
+  'Brigitte',
+  'Britta',
+  'Bärbel',
+  'Carmen',
+  'Carolin',
+  'Chantal',
+  'Charlotte',
+  'Christiane',
+  'Christina',
+  'Cindy',
+  'Conny',
+  'Cordula',
+  'Cornelia',
+  'Dagmar',
+  'Deborah',
+  'Denise',
+  'Diana',
+  'Dora',
+  'Doris',
+  'Dorothea',
+  'Edeltraud',
+  'Eleonor',
+  'Elfriede',
+  'Elisabeth',
+  'Elsa',
+  'Else',
+  'Elvira',
+  'Emma',
+  'Erika',
+  'Erna',
+  'Esther',
+  'Eva',
+  'Evelyn',
+  'Felicia',
+  'Flora',
+  'Franzi',
+  'Franziska',
+  'Frauke',
+  'Frieda',
+  'Gabi',
+  'Gabriele',
+  'Gerda',
+  'Gerlinde',
+  'Gertrud',
+  'Gisela',
+  'Greta',
+  'Gudrun',
+  'Hanna',
+  'Hannelore',
+  'Hedwig',
+  'Heidi',
+  'Heike',
+  'Helga',
+  'Herta',
+  'Hildegard',
+  'Ida',
+  'Ilse',
+  'Ina',
+  'Inge',
+  'Ingeborg',
+  'Ingrid',
+  'Irene',
+  'Irma',
+  'Isa',
+  'Isabell',
+  'Isolde',
+  'Ivonne',
+  'Jacqueline',
+  'Jana',
+  'Janette',
+  'Jasmin',
+  'Jeanette',
+  'Jennifer',
+  'Jenny',
+  'Jessica',
+  'Judith',
+  'Julia',
+  'Juliane',
+  'Jutta',
+  'Karen',
+  'Karin',
+  'Karla',
+  'Karola',
+  'Karolin',
+  'Kassandra',
+  'Katharina',
+  'Kathi',
+  'Kathrin',
+  'Kati',
+  'Katja',
+  'Kerstin',
+  'Kristin',
+  'Larissa',
+  'Laura',
+  'Lena',
+  'Leonie',
+  'Liane',
+  'Lili',
+  'Lily',
+  'Lina',
+  'Liselotte',
+  'Louise',
+  'Luise',
+  'Magda',
+  'Magdalena',
+  'Maja',
+  'Maria',
+  'Marlene',
+  'Martina',
+  'Mechthild',
+  'Meike',
+  'Melanie',
+  'Miriam',
+  'Mona',
+  'Monika',
+  'Nadine',
+  'Nadja',
+  'Nancy',
+  'Nicole',
+  'Olga',
+  'Olivia',
+  'Patricia',
+  'Paula',
+  'Pauline',
+  'Petra',
+  'Pia',
+  'Ramona',
+  'Rebekka',
+  'Regina',
+  'Regine',
+  'Renate',
+  'Ricarda',
+  'Rita',
+  'Rosa',
+  'Rosemarie',
+  'Sabine',
+  'Sabrina',
+  'Sally',
+  'Sarah',
+  'Sibylle',
+  'Siggi',
+  'Sofia',
+  'Sophie',
+  'Stefanie',
+  'Steffi',
+  'Susanne',
+  'Susi',
+  'Sylvia',
+  'Thea',
+  'Theresa',
+  'Tina',
+  'Trude',
+  'Ursel',
+  'Ursula',
+  'Uschi',
+  'Uta',
+  'Ute',
+  'Valerie',
+  'Vanessa',
+  'Verena',
+  'Vreni',
+  'Vroni',
+  'Waltraud',
+  'Wiebke',
+  'Yvonne',
+  'Zara'
+];
+
+const maleNames = [
+  'Aaron',
+  'Adam',
+  'Albrecht',
+  'Alex',
+  'Alexander',
+  'Andreas',
+  'Anselm',
+  'Ansgar',
+  'Anton',
+  'Armin',
+  'Arnold',
+  'Bastian',
+  'Benedikt',
+  'Bernd',
+  'Bernhard',
+  'Bert',
+  'Berthold',
+  'Bertram',
+  'Björn',
+  'Bodo',
+  'Boris',
+  'Bruno',
+  'Burkhardt',
+  'Christian',
+  'Christoph',
+  'Christopher',
+  'Claudius',
+  'Clemens',
+  'Conrad',
+  'Corbinian',
+  'Damian',
+  'Daniel',
+  'David',
+  'Dennis',
+  'Detlef',
+  'Dieter',
+  'Dietrich',
+  'Dimitri',
+  'Dirk',
+  'Dominik',
+  'Dustin',
+  'Eberhard',
+  'Eckart',
+  'Edgar',
+  'Eike',
+  'Emil',
+  'Ernst',
+  'Erwin',
+  'Eugen',
+  'Fabian',
+  'Ferdinand',
+  'Florian',
+  'Franz',
+  'Friedrich',
+  'Fritz',
+  'Geralt',
+  'Gerd',
+  'Gerhard',
+  'Gernot',
+  'Gisbert',
+  'Gregor',
+  'Guido',
+  'Gunnar',
+  'Gustav',
+  'Günther',
+  'Hannes',
+  'Hans',
+  'Harald',
+  'Heinz',
+  'Helmut',
+  'Hermann',
+  'Horst',
+  'Ingo',
+  'Jan',
+  'Joachim',
+  'Johannes',
+  'Jonas',
+  'Josef',
+  'Julian',
+  'Kai',
+  'Karl',
+  'Klaus',
+  'Konrad',
+  'Kurt',
+  'Lars',
+  'Leo',
+  'Leonard',
+  'Lorenz',
+  'Lothar',
+  'Lukas',
+  'Manfred',
+  'Manuel',
+  'Mark',
+  'Martin',
+  'Matthias',
+  'Max',
+  'Maximilian',
+  'Michael',
+  'Moritz',
+  'Nico',
+  'Nicolas',
+  'Niko',
+  'Nils',
+  'Norbert',
+  'Olaf',
+  'Oliver',
+  'Oswald',
+  'Otto',
+  'Pascal',
+  'Patrick',
+  'Paul',
+  'Peter',
+  'Philipp',
+  'Pierre',
+  'Raimund',
+  'Rainer',
+  'Reiner',
+  'Reinhard',
+  'Richard',
+  'Robert',
+  'Rolf',
+  'Roman',
+  'Rudolf',
+  'Rupert',
+  'Samuel',
+  'Sascha',
+  'Sebastian',
+  'Sepp',
+  'Siegfried',
+  'Simon',
+  'Stefan',
+  'Stephan',
+  'Sven',
+  'Sören',
+  'Thilo',
+  'Thorsten',
+  'Till',
+  'Timo',
+  'Ulf',
+  'Ulrich',
+  'Uwe',
+  'Valentin',
+  'Viktor',
+  'Volker',
+  'Waldemar',
+  'Walther',
+  'Wendelin',
+  'Wilhelm',
+  'Willi',
+  'Xaver',
+  'Zacharias'
+];
+
+const lastNames = [
+  'Arnold',
+  'Bachmann',
+  'Bauer',
+  'Becker',
+  'Beyer',
+  'Boger',
+  'Bogner',
+  'Braun',
+  'Bruckmann',
+  'Brugger',
+  'Bäcker',
+  'Böhm',
+  'Claßen',
+  'Diener',
+  'Dietrich',
+  'Dittrich',
+  'Dreher',
+  'Fiedler',
+  'Fink',
+  'Fischer',
+  'Frank',
+  'Frick',
+  'Friedmann',
+  'Fuchs',
+  'Graf',
+  'Grün',
+  'Hahn',
+  'Hartmann',
+  'Hausmann',
+  'Jacobi',
+  'Jansen',
+  'Jung',
+  'Jäger',
+  'Kaiser',
+  'Karlmann',
+  'Kienzle',
+  'Kirch',
+  'Koch',
+  'Kowalski',
+  'Kraus',
+  'Krämer',
+  'Köhler',
+  'Lehmann',
+  'Maier',
+  'Maler',
+  'Martin',
+  'Meier',
+  'Merkle',
+  'Meyer',
+  'Michaelis',
+  'Möller',
+  'Müller',
+  'Neumann',
+  'Noack',
+  'Nowak',
+  'Obermeyer',
+  'Perlmann',
+  'Peters',
+  'Pfarrer',
+  'Pfeifer',
+  'Pfeiffer',
+  'Pietsch',
+  'Pohl',
+  'Prinz',
+  'Raab',
+  'Richter',
+  'Roßmann',
+  'Ruf',
+  'Sauer',
+  'Schinacher',
+  'Schmid',
+  'Schmidt',
+  'Schmitt',
+  'Schneider',
+  'Scholz',
+  'Schröder',
+  'Schubert',
+  'Schulz',
+  'Schulze',
+  'Schumann',
+  'Schuster',
+  'Schwarz',
+  'Schäfer',
+  'Seidel',
+  'Simon',
+  'Singer',
+  'Specht',
+  'Strauss',
+  'Strauß',
+  'Vogel',
+  'Vogt',
+  'Wagner',
+  'Weber',
+  'Weiß',
+  'Wenzler',
+  'Werner',
+  'Winkler',
+  'Winter',
+  'Wolf',
+  'Wolff',
+  'Zimmermann'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/India/bundle.ts b/packages/plugins/src/countries/India/bundle.ts
new file mode 100644
index 000000000..f1e1d5524
--- /dev/null
+++ b/packages/plugins/src/countries/India/bundle.ts
@@ -0,0 +1,615 @@
+/**
+ * @author Fareez Ahamed <fareez.ahamed@gmail.com>
+ */
+import { GetCountryData } from '@generatedata/types';
+
+const India: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'india',
+  regionNames: i18n.regionNames,
+  continent: 'asia',
+  extendedData: {
+    zipFormat: {
+      format: 'Xxxxxx'
+    },
+    phoneFormat: {
+      displayFormats: ['+91 xxxxxxxxxx', '0xx-xxxxxxxx', '0xxx-xxxxxxx', '0xxxx-xxxxxx']
+    }
+  },
+
+  regions: [
+    {
+      regionName: 'Andhra Pradesh',
+      regionShort: 'AP',
+      regionSlug: 'andhra_pradesh',
+      weight: 1314,
+      cities: [
+        'Adoni',
+        'Anantapur',
+        'Bhimavaram',
+        'Chittoor',
+        'Cuddapah',
+        'Eluru',
+        'Gudivada',
+        'Guntakal',
+        'Guntur',
+        'Hindupur',
+        'Hyderabad',
+        'Kakinada',
+        'Karimnagar',
+        'Khammam',
+        'Kukatpalle',
+        'Kurnool',
+        'Lalbahadur Nagar',
+        'Machilipatnam',
+        'Mahbubnagar',
+        'Malkajgiri',
+        'Nandyal',
+        'Nellore',
+        'Nizamabad',
+        'Ongole',
+        'Proddatur',
+        'Qutubullapur',
+        'Rajahmundry',
+        'Ramagundam',
+        'Secunderabad',
+        'Tenali',
+        'Tirupati',
+        'Vijayawada',
+        'Vishakhapatnam',
+        'Vizianagaram',
+        'Warangal'
+      ]
+    },
+    {
+      regionName: 'Arunachal Pradesh',
+      regionShort: 'AR',
+      regionSlug: 'arunachal_pradesh',
+      weight: 21,
+      cities: ['Itanagar']
+    },
+    {
+      regionName: 'Assam',
+      regionShort: 'AS',
+      regionSlug: 'assam',
+      weight: 484,
+      cities: ['Guwahati', 'Dibrugarh', 'Silchar', 'Nagaon']
+    },
+    {
+      regionName: 'Bihar',
+      regionShort: 'BR',
+      regionSlug: 'bihar',
+      weight: 1611,
+      cities: [
+        'Patna',
+        'Gaya',
+        'Bhagalpur',
+        'Muzaffarpur',
+        'Darbhanga',
+        'Bihar Sharif',
+        'Arrah',
+        'Katihar',
+        'Munger',
+        'Chapra',
+        'Sasaram',
+        'Dehri',
+        'Bettiah'
+      ]
+    },
+    {
+      regionName: 'Chhattisgarh',
+      regionShort: 'CT',
+      regionSlug: 'chhattisgarh',
+      weight: 396,
+      cities: ['Raipur', 'Bhilai', 'Bilaspur', 'Durg', 'Raj Nandgaon', 'Korba', 'Raigarh']
+    },
+    {
+      regionName: 'Goa',
+      regionShort: 'GA',
+      regionSlug: 'goa',
+      weight: 23,
+      cities: ['Panjim']
+    },
+    {
+      regionName: 'Gujarat',
+      regionShort: 'GJ',
+      regionSlug: 'gujarat',
+      weight: 937,
+      cities: [
+        'Ahmedabad',
+        'Surat',
+        'Vadodara',
+        'Rajkot',
+        'Bhavnagar',
+        'Jamnagar',
+        'Nadiad',
+        'Bharuch',
+        'Junagadh',
+        'Navsari',
+        'Gandhinagar',
+        'Veraval',
+        'Porbandar',
+        'Anand',
+        'Surendranagar',
+        'Gandhidham',
+        'Bhuj',
+        'Godhra',
+        'Patan',
+        'Morvi',
+        'Vejalpur'
+      ]
+    },
+    {
+      regionName: 'Haryana',
+      regionShort: 'HR',
+      regionSlug: 'haryana',
+      weight: 394,
+      cities: [
+        'Ambala',
+        'Ambala Sadar',
+        'Bhiwani',
+        'Faridabad',
+        'Gurgaon',
+        'Hisar',
+        'Karnal',
+        'Panipat',
+        'Rohtak',
+        'Sirsa',
+        'Sonipat',
+        'Yamuna Nagar'
+      ]
+    },
+    {
+      regionName: 'Himachal Pradesh',
+      regionShort: 'HP',
+      regionSlug: 'himachal_pradesh',
+      weight: 106,
+      cities: ['Shimla']
+    },
+    {
+      regionName: 'Jammu and Kashmir',
+      regionShort: 'JK',
+      regionSlug: 'jammu_and_kashmir',
+      weight: 195,
+      cities: ['Jammu', 'Srinagar']
+    },
+    {
+      regionName: 'Jharkhand',
+      regionShort: 'JH',
+      regionSlug: 'jharkhand',
+      weight: 512,
+      cities: ['Bokaro Steel City', 'Dhanbad', 'Hazaribag', 'Jamshedpur', 'Mango', 'Purnea', 'Purulia', 'Ranchi']
+    },
+    {
+      regionName: 'Karnataka',
+      regionShort: 'KA',
+      regionSlug: 'karnataka',
+      weight: 949,
+      cities: [
+        'Bangalore',
+        'Belgaum',
+        'Bellary',
+        'Bidar',
+        'Bijapur',
+        'Davangere',
+        'Gadag Betigeri',
+        'Gulbarga',
+        'Hassan',
+        'Hospet',
+        'Hubli',
+        'Mandya',
+        'Mangalore',
+        'Mysore',
+        'Raichur',
+        'Shimoga',
+        'Timkur'
+      ]
+    },
+    {
+      regionName: 'Kerala',
+      regionShort: 'KL',
+      regionSlug: 'kerala',
+      weight: 518,
+      cities: ['Allappuzha', 'Kozhikode', 'Cochin', 'Kollam', 'Palakkad', 'Thalassery', 'Trivandrum']
+    },
+    {
+      regionName: 'Madhya Pradesh',
+      regionShort: 'MP',
+      regionSlug: 'madhya_pradesh',
+      weight: 1127,
+      cities: [
+        'Bhind',
+        'Bhopal',
+        'Burhanpur',
+        'Chhindwara',
+        'Damoh',
+        'Dewas',
+        'Guna',
+        'Gwalior',
+        'Indore',
+        'Jabalpur',
+        'Khandwa',
+        'Mandasor',
+        'Morena',
+        'Murwara',
+        'Ratlam',
+        'Rewa',
+        'Sagar',
+        'Satna',
+        'Shivapuri',
+        'Ujjain',
+        'Vidisha'
+      ]
+    },
+    {
+      regionName: 'Maharastra',
+      regionShort: 'MH',
+      regionSlug: 'maharastra',
+      weight: 1744,
+      cities: [
+        'Achalpur',
+        'Ahmadnagar',
+        'Akola',
+        'Amravati',
+        'Bhir',
+        'Bhiwandi',
+        'Bhusawal',
+        'Chandrapur',
+        'Dhule',
+        'Gondiya',
+        'Ichalkaranji',
+        'Jalgaon',
+        'Jalna',
+        'Kalyan',
+        'Kolhapur',
+        'Latur',
+        'Malegaon',
+        'Mira Bhayandar',
+        'Miraj',
+        'Mumbai',
+        'Nagpur',
+        'Nanded',
+        'Nashik',
+        'New Bombay',
+        'Parbhani',
+        'Pimpri-Chinchwad',
+        'Pune',
+        'Sangli',
+        'Satara',
+        'Aurangabad',
+        'Solapur',
+        'Thane',
+        'Ulhasnagar',
+        'Wardha',
+        'Yeotmal'
+      ]
+    },
+    {
+      regionName: 'Manipur',
+      regionShort: 'MN',
+      regionSlug: 'manipur',
+      weight: 42,
+      cities: ['Imphal']
+    },
+    {
+      regionName: 'Meghalaya',
+      regionShort: 'ML',
+      regionSlug: 'meghalaya',
+      weight: 46,
+      cities: ['Shillong']
+    },
+    {
+      regionName: 'Mizoram',
+      regionShort: 'MZ',
+      regionSlug: 'mizoram',
+      weight: 17,
+      cities: ['Aizwal']
+    },
+    {
+      regionName: 'Nagaland',
+      regionShort: 'NL',
+      regionSlug: 'nagaland',
+      weight: 31,
+      cities: ['Kohima']
+    },
+    {
+      regionName: 'Odisha',
+      regionShort: 'OR',
+      regionSlug: 'odisha',
+      weight: 651,
+      cities: ['Bhubaneswar', 'Brahmapur', 'Cuttack', 'Puri', 'Raurkela', 'Raurkela Civil Township', 'Sambalpur']
+    },
+    {
+      regionName: 'Punjab',
+      regionShort: 'PB',
+      regionSlug: 'punjab',
+      weight: 430,
+      cities: [
+        'Abohar',
+        'Ahmadpur East',
+        'Amritsar',
+        'Bahawalnagar',
+        'Bahawalpur',
+        'Bhatinda',
+        'Chiniot',
+        'Chishtian Mandi',
+        'Daska',
+        'Dera Ghazi Khan',
+        'Faisalabad',
+        'Gojra',
+        'Gujranwala',
+        'Gujrat',
+        'Hafizabad',
+        'Hoshiarpur',
+        'Jalandhar (Jullundur}',
+        'Jaranwala',
+        'Jhang',
+        'Jhelum',
+        'Kamalia',
+        'Kamoke',
+        'Kasur',
+        'Khanewal',
+        'Khanpur',
+        'Lahore',
+        'Ludhiana',
+        'Mandi Bahauddin',
+        'Mandi Burewala',
+        'Moga',
+        'Multan',
+        'Muridke',
+        'Muzaffargarh',
+        'Okara',
+        'Pak Pattan',
+        'Pathankot',
+        'Patiala',
+        'Rahim Yar Khan',
+        'Rawalpindi',
+        'Sadiqabad',
+        'Sahiwal',
+        'Sargodha',
+        'Sheikhupura',
+        'Sialkot',
+        'Vihari',
+        'Wah',
+        'Wazirabad'
+      ]
+    },
+    {
+      regionName: 'Rajasthan',
+      regionShort: 'RJ',
+      regionSlug: 'rajasthan',
+      weight: 1065,
+      cities: [
+        'Ajmer',
+        'Alwar',
+        'Beawar',
+        'Bharatpur',
+        'Bhilwara',
+        'Bikaner',
+        'Ganganagar',
+        'Jaipur',
+        'Jodhpur',
+        'Kota',
+        'Pali',
+        'Sikar',
+        'Tonk',
+        'Udaipur'
+      ]
+    },
+    {
+      regionName: 'Sikkim',
+      regionShort: 'SK',
+      regionSlug: 'sikkim',
+      weight: 9,
+      cities: ['Gangtok']
+    },
+    {
+      regionName: 'Tamil Nadu',
+      regionShort: 'TN',
+      regionSlug: 'Tamil Nadu',
+      weight: 1120,
+      cities: [
+        'Alandur',
+        'Ambattur',
+        'Avadi',
+        'Chennai',
+        'Coimbatore',
+        'Cuddalore',
+        'Dindigul',
+        'Erode',
+        'Kanchipuram',
+        'Kumbakonam',
+        'Madurai',
+        'Nagarcoil',
+        'Neyveli',
+        'Palayankottai',
+        'Pallavaram',
+        'Pudukkottai',
+        'Rajapalaiyam',
+        'Salem',
+        'Tambaram',
+        'Thanjavur',
+        'Tiruchirapalli',
+        'Tirunelveli',
+        'Tiruppur',
+        'Tiruvannamalai',
+        'Tiruvarur',
+        'Tiruvottiyur',
+        'Tuticorin',
+        'Valparai',
+        'Vellore'
+      ]
+    },
+    {
+      regionName: 'Tripura',
+      regionShort: 'TR',
+      regionSlug: 'tripura',
+      weight: 57,
+      cities: ['Agartala']
+    },
+    {
+      regionName: 'Uttar Pradesh',
+      regionShort: 'UP',
+      regionSlug: 'uttar_pradesh',
+      weight: 3098,
+      cities: [
+        'Agra',
+        'Aligarh',
+        'Allahabad',
+        'Amroha',
+        'Bahraich',
+        'Banda',
+        'Bareilly',
+        'Budaun',
+        'Bulandshahr',
+        'Etawah',
+        'Faizabad',
+        'Farrukhabad-cum-Fatehgarh',
+        'Fatehpur',
+        'Firozabad',
+        'Ghaziabad',
+        'Gonda',
+        'Gorakhpur',
+        'Hapur',
+        'Hathras',
+        'Jaunpur',
+        'Jhansi',
+        'Kanpur',
+        'Kanpur Cantonment',
+        'Lucknow',
+        'Mathura',
+        'Maunath Bhanjan',
+        'Meerut',
+        'Meerut Cantonment',
+        'Mirzapur-cum-Vindhyachal',
+        'Modinagar',
+        'Moradabad',
+        'Muzaffarnagar',
+        'Noida',
+        'Orai',
+        'Pilibhit',
+        'Rae Bareli',
+        'Rampur',
+        'Saharanpur',
+        'Sambhal',
+        'Shahjahanpur',
+        'Sitapur',
+        'Unnao',
+        'Varanasi'
+      ]
+    },
+    {
+      regionName: 'Uttarakhand',
+      regionShort: 'UT',
+      regionSlug: 'uttarakhand',
+      weight: 157,
+      cities: ['Dehradun', 'Haridwar']
+    },
+    {
+      regionName: 'West Bengal',
+      regionShort: 'WB',
+      regionSlug: 'west_bengal',
+      weight: 1418,
+      cities: [
+        'Asansol',
+        'Ashoknagar-Kalyangarh',
+        'Baidyabati',
+        'Bally',
+        'Balurghat',
+        'Bankura',
+        'Bansberia',
+        'Barahanagar',
+        'Barasat',
+        'Barddhaman',
+        'Barrackpur',
+        'Basirhat',
+        'Berhampore',
+        'Bhatpara',
+        'Burnpur',
+        'Kolkata',
+        'Champdani',
+        'Chandannagar',
+        'Dabgram',
+        'Durgapur',
+        'Habra',
+        'Haldia',
+        'Halisahar',
+        'Howrah',
+        'Hugli-Chinsurah',
+        'Ingraj Bazar',
+        'Kamarhati',
+        'Kanchrapara',
+        'Kharagpur',
+        'Krishnanagar',
+        'Kulti-Barakar',
+        'Midnapore',
+        'Naihati',
+        'Navadwip',
+        'North Barrackpur',
+        'North Dum Dum',
+        'Panihati',
+        'Raiganj',
+        'Rishra',
+        'Santipur',
+        'Serampore',
+        'Siliguri',
+        'South Dum Dum',
+        'Titagarh',
+        'Uluberia',
+        'Uttarpara-Kotrung'
+      ]
+    },
+    //Union Territories
+    {
+      regionName: 'Andaman and Nicobar Islands',
+      regionShort: 'AN',
+      regionSlug: 'andaman_and_nicobar_islands',
+      weight: 6,
+      cities: ['Port Blair']
+    },
+    {
+      regionName: 'Chandigarh',
+      regionShort: 'CH',
+      regionSlug: 'Chandigarh',
+      weight: 16,
+      cities: ['Chandigarh']
+    },
+    {
+      regionName: 'Dadra and Nagar Haveli',
+      regionShort: 'DN',
+      regionSlug: 'dadra_and_nagar_haveli',
+      weight: 5,
+      cities: ['Silvassa']
+    },
+    {
+      regionName: 'Daman and Diu',
+      regionShort: 'DD',
+      regionSlug: 'Daman and Diu',
+      weight: 4,
+      cities: ['Daman']
+    },
+    {
+      regionName: 'Lakshadweep',
+      regionShort: 'LD',
+      regionSlug: 'lakshadweep',
+      weight: 1,
+      cities: ['Kavaratti']
+    },
+    {
+      regionName: 'Delhi',
+      regionShort: 'DL',
+      regionSlug: 'delhi',
+      weight: 260,
+      cities: ['Delhi']
+    },
+    {
+      regionName: 'Pondicherry',
+      regionShort: 'PY',
+      regionSlug: 'pondicherry',
+      weight: 19,
+      cities: ['Pondicherry']
+    }
+  ]
+});
+
+export default India;
diff --git a/packages/plugins/src/countries/India/i18n/ar.json b/packages/plugins/src/countries/India/i18n/ar.json
new file mode 100644
index 000000000..31e75f78b
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "الهند",
+  "regionNames": "الولايات الهندية وأقاليم الاتحاد"
+}
diff --git a/packages/plugins/src/countries/India/i18n/de.json b/packages/plugins/src/countries/India/i18n/de.json
new file mode 100644
index 000000000..dfffeeaa5
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Indien",
+  "regionNames": "Indische Staaten und Unionsterritorien"
+}
diff --git a/packages/plugins/src/countries/India/i18n/en.json b/packages/plugins/src/countries/India/i18n/en.json
new file mode 100644
index 000000000..166bdfb3a
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "India",
+  "regionNames": "Indian States & Union Territories"
+}
diff --git a/packages/plugins/src/countries/India/i18n/es.json b/packages/plugins/src/countries/India/i18n/es.json
new file mode 100644
index 000000000..8cd2a78c7
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "India",
+  "regionNames": "Estados indios y territorios de la Unión"
+}
diff --git a/packages/plugins/src/countries/India/i18n/fr.json b/packages/plugins/src/countries/India/i18n/fr.json
new file mode 100644
index 000000000..bc7736108
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Inde",
+  "regionNames": "États indiens et territoires de l'Union"
+}
diff --git a/packages/plugins/src/countries/India/i18n/hi.json b/packages/plugins/src/countries/India/i18n/hi.json
new file mode 100644
index 000000000..3938a79c4
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "भारत",
+  "regionNames": "भारतीय राज्य और केंद्र शासित प्रदेश"
+}
diff --git a/packages/plugins/src/countries/India/i18n/ja.json b/packages/plugins/src/countries/India/i18n/ja.json
new file mode 100644
index 000000000..0e71fa87b
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "インド",
+  "regionNames": "インドの州と連邦直轄領"
+}
diff --git a/packages/plugins/src/countries/India/i18n/nl.json b/packages/plugins/src/countries/India/i18n/nl.json
new file mode 100644
index 000000000..81b5a9b2c
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Indië",
+  "regionNames": "Indiase staten en territoria van de Unie"
+}
diff --git a/packages/plugins/src/countries/India/i18n/pt.json b/packages/plugins/src/countries/India/i18n/pt.json
new file mode 100644
index 000000000..4eef63a26
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Índia",
+  "regionNames": "Regiões indianas"
+}
diff --git a/packages/plugins/src/countries/India/i18n/ru.json b/packages/plugins/src/countries/India/i18n/ru.json
new file mode 100644
index 000000000..9ac25c151
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Индия",
+  "regionNames": "Индийские штаты и союзные территории"
+}
diff --git a/packages/plugins/src/countries/India/i18n/ta.json b/packages/plugins/src/countries/India/i18n/ta.json
new file mode 100644
index 000000000..df7650dd7
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "இந்தியா",
+  "regionNames": "இந்திய மாநிலங்கள் & யூனியன் பிரதேசங்கள்"
+}
diff --git a/packages/plugins/src/countries/India/i18n/zh.json b/packages/plugins/src/countries/India/i18n/zh.json
new file mode 100644
index 000000000..337c2b5f3
--- /dev/null
+++ b/packages/plugins/src/countries/India/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "印度",
+  "regionNames": "印度各邦和联邦直辖区"
+}
diff --git a/packages/plugins/src/countries/India/names.ts b/packages/plugins/src/countries/India/names.ts
new file mode 100644
index 000000000..eb723acea
--- /dev/null
+++ b/packages/plugins/src/countries/India/names.ts
@@ -0,0 +1,622 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Abha',
+  'Aditi',
+  'Aisha',
+  'Aishwarya',
+  'Akanksha',
+  'Amala',
+  'Amandeep',
+  'Amardeep',
+  'Amarjeet',
+  'Anima',
+  'Anisha',
+  'Anjali',
+  'Aparajita',
+  'Aparna',
+  'Apurva',
+  'Aradhana',
+  'Archana',
+  'Aruna',
+  'Arushi',
+  'Arya',
+  'Asha',
+  'Avani',
+  'Azra',
+  'Bala',
+  'Balwinder',
+  'Bhavana',
+  'Chanda',
+  'Chandra',
+  'Devi',
+  'Devika',
+  'Diksha',
+  'Dipa',
+  'Dipali',
+  'Dipti',
+  'Disha',
+  'Divya',
+  'Diya',
+  'Drishti',
+  'Durga',
+  'Esha',
+  'Ezhil',
+  'Fariha',
+  'Gauri',
+  'Gita',
+  'Grishma',
+  'Gul',
+  'Gulbadan',
+  'Gulrukh',
+  'Gurdeep',
+  'Gurmeet',
+  'Hema',
+  'Ila',
+  'Inderpal',
+  'Indira',
+  'Indrani',
+  'Indu',
+  'Indumathi',
+  'Isha',
+  'Ishani',
+  'Ishita',
+  'Jaswinder',
+  'Jaya',
+  'Jayashri',
+  'Jyoti',
+  'Jyotsna',
+  'Kajal',
+  'Kala',
+  'Kali',
+  'Kalpana',
+  'Kalyani',
+  'Kamakshi',
+  'Kamala',
+  'Kamani',
+  'Kanchana',
+  'Kanta',
+  'Kanti',
+  'Karishma',
+  'Kashi',
+  'Kaur',
+  'Kavita',
+  'Khurshid',
+  'Khushi',
+  'Kiran',
+  'Kirtida',
+  'Laboni',
+  'Lakshmi',
+  'Lalita',
+  'Lata',
+  'Lavanya',
+  'Lila',
+  'Lilavati',
+  'Lina',
+  'Madhu',
+  'Madhur',
+  'Madhuri',
+  'Mala',
+  'Malati',
+  'Malani',
+  'Mandeep',
+  'Manjeet',
+  'Manju',
+  'Manjula',
+  'Manjusha',
+  'Maya',
+  'Mina',
+  'Minali',
+  'Mira',
+  'Mitra',
+  'Mohini',
+  'Mridula',
+  'Mukta',
+  'Nalini',
+  'Namrata',
+  'Nandita',
+  'Nasim',
+  'Nasrin',
+  'Navdeep',
+  'Navneet',
+  'Neha',
+  'Nida',
+  'Nikita',
+  'Nila',
+  'Nirupama',
+  'Nisha',
+  'Nishat',
+  'Nitika',
+  'Nitya',
+  'Nur',
+  'Padma',
+  'Padmini',
+  'Parvati',
+  'Prachi',
+  'Pratibha',
+  'Pratima',
+  'Pritha',
+  'Priti',
+  'Priya',
+  'Priyanka',
+  'Puja',
+  'Purnima',
+  'Pushpa',
+  'Rachana',
+  'Radha',
+  'Rajani',
+  'Rajkumari',
+  'Rajni',
+  'Rani',
+  'Rashmi',
+  'Rati',
+  'Ratna',
+  'Reshmi',
+  'Reva',
+  'Richa',
+  'Rina',
+  'Ritka',
+  'Ritu',
+  'Riya',
+  'Roshan',
+  'Roshni',
+  'Rupa',
+  'Rupinder',
+  'Sabeen',
+  'Saira',
+  'Sakshi',
+  'Sandhya',
+  'Sanjana',
+  'Saraswati',
+  'Sarita',
+  'Savitri',
+  'Shabnam',
+  'Shahnaz',
+  'Shailaja',
+  'Shakti',
+  'Shakuntala',
+  'Shanta',
+  'Shanti',
+  'Sharmila',
+  'Shashi',
+  'Shikha',
+  'Shila',
+  'Shivali',
+  'Shobha',
+  'Shreya',
+  'Shweta',
+  'Shyama',
+  'Siddhi',
+  'Sima',
+  'Sita',
+  'Sitara',
+  'Sneha',
+  'Sona',
+  'Sonal',
+  'Sonam',
+  'Sukhdeep',
+  'Sulabha',
+  'Sultana',
+  'Suman',
+  'Sumati',
+  'Sunita',
+  'Suniti',
+  'Sushila',
+  'Swapna',
+  'Swarna',
+  'Tanu',
+  'Tanvi',
+  'Tara',
+  'Tejal',
+  'Thamarai',
+  'Trishna',
+  'Uma',
+  'Upasana',
+  'Urvi',
+  'Uttara',
+  'Vaishnavi',
+  'Varsha',
+  'Vasuda',
+  'Vasudha',
+  'Vasundhara',
+  'Veda',
+  'Vidya',
+  'Vijaya'
+];
+
+const maleNames = [
+  'Abbas',
+  'Abdul',
+  'Abhay',
+  'Abhijit',
+  'Abhilash',
+  'Abhinav',
+  'Abhishek',
+  'Adil',
+  'Aditya',
+  'Adnan',
+  'Agni',
+  'Ahmad',
+  'Ajay',
+  'Ajit',
+  'Akash',
+  'Akbar',
+  'Akhil',
+  'Akshay',
+  'Ali',
+  'Amandeep',
+  'Amar',
+  'Amardeep',
+  'Amarjeet',
+  'Amin',
+  'Amir',
+  'Amit',
+  'Amitabh',
+  'Amrit',
+  'Anand',
+  'Anbu',
+  'Anik',
+  'Aniket',
+  'Anil',
+  'Aniruddha',
+  'Anish',
+  'Ankit',
+  'Ankur',
+  'Anuj',
+  'Anup',
+  'Anupam',
+  'Apurva',
+  'Aravind',
+  'Arif',
+  'Arijit',
+  'Aritra',
+  'Aruna',
+  'Arya',
+  'Asad',
+  'Ashwin',
+  'Asim',
+  'Aswathi',
+  'Avinash',
+  'Azad',
+  'Azhar',
+  'Aziz',
+  'Babur',
+  'Bala',
+  'Balakrishna',
+  'Balwinder',
+  'Bilal',
+  'Chanda',
+  'Chandan',
+  'Chandra',
+  'Chandrakant',
+  'Chetan',
+  'Chiranjvi',
+  'Darshan',
+  'Dayaram',
+  'Dev',
+  'Devadas',
+  'Dhananjay',
+  'Dharma',
+  'Dhaval',
+  'Durai',
+  'Durga',
+  'Eshil',
+  'Farhan',
+  'Farid',
+  'Ghulam',
+  'Govinda',
+  'Gul',
+  'Gurdeep',
+  'Gurmeet',
+  'Hardeep',
+  'Hari',
+  'Harsha',
+  'Harshad',
+  'Harshal',
+  'Hasan',
+  'Hassan',
+  'Imtiyaz',
+  'Inderpal',
+  'Indra',
+  'Indrajit',
+  'Isha',
+  'Jagit',
+  'Jahangir',
+  'Jaswinder',
+  'Javed',
+  'Jaya',
+  'Jayanta',
+  'Jayendra',
+  'Jayesh',
+  'Jaywant',
+  'Jitendra',
+  'Jyoti',
+  'Kailash',
+  'Kali',
+  'Kalyan',
+  'Kamala',
+  'Kanta',
+  'Kanti',
+  'Karan',
+  'Kavi',
+  'Khan',
+  'Khurshd',
+  'Kiran',
+  'Kishor',
+  'Krishna',
+  'Kshitij',
+  'Kuldeep',
+  'Lakshmi',
+  'Lal',
+  'Lochan',
+  'Madhu',
+  'Madhukar',
+  'Madhur',
+  'Mahendra',
+  'Mahmud',
+  'Mamun',
+  'Manas',
+  'Mandeep',
+  'Mani',
+  'Maninder',
+  'Manish',
+  'Manjeet',
+  'Manu',
+  'Maqsud',
+  'Maruf',
+  'Mayur',
+  'Mitra',
+  'Mitul',
+  'Mohandas',
+  'Muhammad',
+  'Mukul',
+  'Murad',
+  'Murali',
+  'Murugan',
+  'Nadim',
+  'Nagendra',
+  'Nanda',
+  'Narayana',
+  'Narendra',
+  'Nasim',
+  'Navdeep',
+  'Navin',
+  'Navneet',
+  'Nikhil',
+  'Nilam',
+  'Ninad',
+  'Niraj',
+  'Nirav',
+  'Nirmal',
+  'Nishant',
+  'Nishat',
+  'Nitin',
+  'Nitya',
+  'Nur',
+  'Padma',
+  'Pallav',
+  'Parminder',
+  'Partha',
+  'Prabhat',
+  'Prabhu',
+  'Prabodh',
+  'Pradip',
+  'Prakash',
+  'Pran',
+  'Pranay',
+  'Prasad',
+  'Prasanna',
+  'Prasenjit',
+  'Pratap',
+  'Pratik',
+  'Pravin',
+  'Prem',
+  'Punit',
+  'Qasim',
+  'Radha',
+  'Rafiq',
+  'Raghu',
+  'Rahul',
+  'Raj',
+  'Raja',
+  'Rajani',
+  'Rajendra',
+  'Rajesh',
+  'Rajib',
+  'Rajnish',
+  'Rakesh',
+  'Rama',
+  'Ramachandra',
+  'Rana',
+  'Ranjit',
+  'Rashmi',
+  'Ratna',
+  'Ravi',
+  'Ravindra',
+  'Rishi',
+  'Rohan',
+  'Rohit',
+  'Roshan',
+  'Rupinder',
+  'Sachin',
+  'Samir',
+  'Sandip',
+  'Sanjit',
+  'Sanjiv',
+  'Saral',
+  'Sardar',
+  'Sarvesh',
+  'Shahid',
+  'Shahjahan',
+  'Shahnaz',
+  'Shahzad',
+  'Shakti',
+  'Shandar',
+  'Shantanu',
+  'Sharif',
+  'Sharma',
+  'Shashi',
+  'Shekar',
+  'Sher',
+  'Shiva',
+  'Shresth',
+  'Shrinivas',
+  'Shrivatsa',
+  'Shyama',
+  'Shyamal',
+  'Siddhartha',
+  'Singh',
+  'Sonam',
+  'Subhash',
+  'Subrahmanya',
+  'Sudarshan',
+  'Sudhir',
+  'Suahil',
+  'Sujay',
+  'Sukhbir',
+  'Sukhdeep',
+  'Sultan',
+  'Suman',
+  'Sumantra',
+  'Sumit',
+  'Sunil',
+  'Suraj',
+  'Surendra',
+  'Surya',
+  'Sushila',
+  'Swapan',
+  'Swapnil',
+  'Swarna',
+  'Tamanna',
+  'Tushar',
+  'Uttara',
+  'Vasu',
+  'Vijaya',
+  'Vimal',
+  'Vinay',
+  'Vipin',
+  'Vipul',
+  'Vishal',
+  'Vishnu',
+  'Vivek',
+  'Yash',
+  'Yasir',
+  'Zafar',
+  'Zahid',
+  'Zahir',
+  'Zaman',
+  'Zawar'
+];
+
+const lastNames = [
+  'Aggarwal',
+  'Anand',
+  'Arun',
+  'Bhat',
+  'Bhatt',
+  'Chakrabarti',
+  'Chande',
+  'Chander',
+  'Chandra',
+  'Chandrasekar',
+  'Charan',
+  'Chaudhary',
+  'Chauhan',
+  'Darsha',
+  'Dhawan',
+  'Dutta',
+  'Engineer',
+  'Gandhi',
+  'Ganesh',
+  'Goel',
+  'Jai',
+  'Jana',
+  'Jindal',
+  'Joshi',
+  'Kapoor',
+  'Kishore',
+  'Krishnamurthy',
+  'Kumar',
+  'Lal',
+  'Lalit',
+  'Lata',
+  'Madan',
+  'Mahajan',
+  'Malhotra',
+  'Malik',
+  'Manju',
+  'Manohar',
+  'Mati',
+  'Meena',
+  'Mehra',
+  'Mehta',
+  'Mittal',
+  'Muthu',
+  'Nagpal',
+  'Nara',
+  'Naran',
+  'Narang',
+  'Narayan',
+  'Nath',
+  'Neel',
+  'Neela',
+  'Neelam',
+  'Nigam',
+  'Nirmal',
+  'Nita',
+  'Pal',
+  'Patel',
+  'Pawan',
+  'Persaud',
+  'Prasad',
+  'Punj',
+  'Puri',
+  'Rai',
+  'Rajagopal',
+  'Rajan',
+  'Raje',
+  'Raji',
+  'Raman',
+  'Rana',
+  'Ranga',
+  'Rastogi',
+  'Roy',
+  'Sahni',
+  'Sai',
+  'Saini',
+  'Samuel',
+  'Sandeep',
+  'Sara',
+  'Saxena',
+  'Sehgal',
+  'Sen',
+  'Sethi',
+  'Shan',
+  'Sharma',
+  'Soni',
+  'Srini',
+  'Srivas',
+  'Srivastav',
+  'Srivastava',
+  'Subram',
+  'Subramani',
+  'Subramanian',
+  'Sudha',
+  'Suri',
+  'Swami',
+  'Tyagi',
+  'Uddin',
+  'Veena',
+  'Veer',
+  'Verma',
+  'Vijaya',
+  'Vish'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/Indonesia/bundle.ts b/packages/plugins/src/countries/Indonesia/bundle.ts
new file mode 100644
index 000000000..114fad5cf
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/bundle.ts
@@ -0,0 +1,265 @@
+/**
+ * Sources:
+ * 		https://en.wikipedia.org/wiki/Provinces_of_Indonesia
+ * 		https://en.wikipedia.org/wiki/List_of_Indonesian_cities_by_population
+ *
+ * @package Countries
+ */
+import { GetCountryData } from '@generatedata/types';
+
+const Indonesia: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'indonesia',
+  regionNames: i18n.regionNames,
+  continent: 'asia',
+  extendedData: {
+    zipFormat: {
+      format: 'Xxxxx'
+    },
+    phoneFormat: {
+      displayFormats: ['62 Xx xxx xxxx']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Aceh',
+      regionShort: 'AC',
+      regionSlug: 'aceh',
+      weight: 50,
+      cities: ['Banda Aceh']
+    },
+    {
+      regionName: 'Bali',
+      regionShort: 'BA',
+      regionSlug: 'bali',
+      weight: 41,
+      cities: ['Denpasar']
+    },
+    {
+      regionName: 'Bangka Belitung Islands',
+      regionShort: 'BB',
+      regionSlug: 'babel',
+      weight: 14,
+      cities: ['Pangkalpinang']
+    },
+    {
+      regionName: 'Banten',
+      regionShort: 'BT',
+      regionSlug: 'banten',
+      weight: 119,
+      cities: ['Serang']
+    },
+    {
+      regionName: 'Bengkulu',
+      regionShort: 'BE',
+      regionSlug: 'bengkulu',
+      weight: 19,
+      cities: ['Bengkulu']
+    },
+    {
+      regionName: 'Central Java',
+      regionShort: 'JT',
+      regionSlug: 'central_java',
+      weight: 338,
+      cities: ['Semarang']
+    },
+    {
+      regionName: 'Central Kalimantan',
+      regionShort: 'KT',
+      regionSlug: 'central_kalimantan',
+      weight: 25,
+      cities: ['Palangka Raya']
+    },
+    {
+      regionName: 'Central Sulawesi',
+      regionShort: 'ST',
+      regionSlug: 'central_sulawesi',
+      weight: 29,
+      cities: ['Palu']
+    },
+    {
+      regionName: 'East Java',
+      regionShort: 'JI',
+      regionSlug: 'east_java',
+      weight: 388,
+      cities: ['Surabaya', 'Malang', 'Kediri', 'Probolinggo', 'Pasuruan', 'Madiun', 'Batu', 'Blitar', 'Mojokerto']
+    },
+    {
+      regionName: 'East Kalimantan',
+      regionShort: 'KI',
+      regionSlug: 'east_kalimantan',
+      weight: 34,
+      cities: ['Samarinda', 'Balikpapan', 'Bontang']
+    },
+    {
+      regionName: 'East Nusa Tenggara',
+      regionShort: 'NT',
+      regionSlug: 'east_nusa_tenggara',
+      weight: 51,
+      cities: ['Kupang']
+    },
+    {
+      regionName: 'Gorontalo',
+      regionShort: 'GO',
+      regionSlug: 'gorontalo',
+      weight: 11,
+      cities: ['Gorontalo']
+    },
+    {
+      regionName: 'Special Capital Region of Jakarta',
+      regionShort: 'JK',
+      regionSlug: 'jakarta_region',
+      weight: 102,
+      cities: ['Jakarta', 'East Jakarta', 'West Jakarta', 'South Jakarta', 'North Jakarta', 'Central Jakarta']
+    },
+    {
+      regionName: 'Jambi',
+      regionShort: 'JA',
+      regionSlug: 'jambi',
+      weight: 34,
+      cities: ['Jambi', 'Sungai Penuh']
+    },
+    {
+      regionName: 'Lampung',
+      regionShort: 'LA',
+      regionSlug: 'lampung',
+      weight: 81,
+      cities: ['Bandar Lampung', 'Metro']
+    },
+    {
+      regionName: 'Maluku',
+      regionShort: 'MA',
+      regionSlug: 'maluku',
+      weight: 17,
+      cities: ['Ambon', 'Tual']
+    },
+    {
+      regionName: 'North Kalimantan',
+      regionShort: 'KU',
+      regionSlug: 'north_kalimantan',
+      weight: 6,
+      cities: ['Tarakan']
+    },
+    {
+      regionName: 'North Maluku',
+      regionShort: 'MU',
+      regionSlug: 'north_maluku',
+      weight: 12,
+      cities: ['Ternate', 'Tidore']
+    },
+    {
+      regionName: 'North Sulawesi',
+      regionShort: 'SA',
+      regionSlug: 'north_sulawesi',
+      weight: 24,
+      cities: ['Manado', 'Bitung', 'Kotamobagu', 'Tomohon']
+    },
+    {
+      regionName: 'North Sumatra',
+      regionShort: 'SU',
+      regionSlug: 'north_sumatra',
+      weight: 139,
+      cities: ['Medan', 'Pematangsiantar', 'Binjai', 'Padang Sidempuan', 'Tebing Tinggi', 'Tanjungbalai', 'Gunungsitoli', 'Sibolga']
+    },
+    {
+      regionName: 'Papua',
+      regionShort: 'PA',
+      regionSlug: 'papua',
+      weight: 31,
+      cities: ['Jayapura']
+    },
+    {
+      regionName: 'Riau',
+      regionShort: 'RI',
+      regionSlug: 'riau',
+      weight: 63,
+      cities: ['Pekanbaru', 'Dumai']
+    },
+    {
+      regionName: 'Riau Islands',
+      regionShort: 'KR',
+      regionSlug: 'riau_islands',
+      weight: 20,
+      cities: ['Tanjung Pinang']
+    },
+    {
+      regionName: 'Southeast Sulawesi',
+      regionShort: 'SG',
+      regionSlug: 'southeast_sulawesi',
+      weight: 25,
+      cities: ['Kendari', 'Baubau']
+    },
+    {
+      regionName: 'South Kalimantan',
+      regionShort: 'KS',
+      regionSlug: 'south_kalimantan',
+      weight: 40,
+      cities: ['Banjarmasin', 'Banjarbaru']
+    },
+    {
+      regionName: 'South Sulawesi',
+      regionShort: 'SN',
+      regionSlug: 'south_sulawesi',
+      weight: 85,
+      cities: ['Makassar', 'Palopo', 'Parepare']
+    },
+    {
+      regionName: 'South Sumatra',
+      regionShort: 'SS',
+      regionSlug: 'south_sumatra',
+      weight: 80,
+      cities: ['Palembang']
+    },
+    {
+      regionName: 'West Java',
+      regionShort: 'JB',
+      regionSlug: 'west_java',
+      weight: 467,
+      cities: ['Bandung', 'Bekasi', 'Depok', 'Bogor', 'Tasikmalaya', 'Cimahi', 'Sukabumi', 'Cirebon', 'Banjar']
+    },
+    {
+      regionName: 'West Kalimantan',
+      regionShort: 'KB',
+      regionSlug: 'west_kalimantan',
+      weight: 48,
+      cities: ['Pontianak', 'Singkawang']
+    },
+    {
+      regionName: 'West Nusa Tenggara',
+      regionShort: 'NB',
+      regionSlug: 'west_nusa_tenggara',
+      weight: 48,
+      cities: ['Mataram', 'Bima']
+    },
+    {
+      regionName: 'West Papua',
+      regionShort: 'PB',
+      regionSlug: 'west_papua',
+      weight: 9,
+      cities: ['Manokwari']
+    },
+    {
+      regionName: 'West Sulawesi',
+      regionShort: 'SR',
+      regionSlug: 'west_sulawesi',
+      weight: 13,
+      cities: ['Mamuju']
+    },
+    {
+      regionName: 'West Sumatra',
+      regionShort: 'SB',
+      regionSlug: 'west_sumatra',
+      weight: 52,
+      cities: ['Padang', 'Payakumbuh', 'Bukittinggi', 'Pariaman', 'Solok', 'Sawahlunto', 'Padang Panjang']
+    },
+    {
+      regionName: 'Special Region of Yogyakarta',
+      regionShort: 'YO',
+      regionSlug: 'yogyakarta',
+      weight: 37,
+      cities: ['Yogyakarta']
+    }
+  ]
+});
+
+export default Indonesia;
diff --git a/packages/plugins/src/countries/Indonesia/i18n/ar.json b/packages/plugins/src/countries/Indonesia/i18n/ar.json
new file mode 100644
index 000000000..2b76378fd
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "إندونيسيا",
+  "regionNames": "المقاطعات الاندونيسية"
+}
diff --git a/packages/plugins/src/countries/Indonesia/i18n/de.json b/packages/plugins/src/countries/Indonesia/i18n/de.json
new file mode 100644
index 000000000..4fba2e94c
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Indonesien",
+  "regionNames": "Indonesische Provinzen"
+}
diff --git a/packages/plugins/src/countries/Indonesia/i18n/en.json b/packages/plugins/src/countries/Indonesia/i18n/en.json
new file mode 100644
index 000000000..ba6fa982c
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Indonesia",
+  "regionNames": "Indonesian provinces"
+}
diff --git a/packages/plugins/src/countries/Indonesia/i18n/es.json b/packages/plugins/src/countries/Indonesia/i18n/es.json
new file mode 100644
index 000000000..3d81778b4
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Indonesia",
+  "regionNames": "Provincias de Indonesia"
+}
diff --git a/packages/plugins/src/countries/Indonesia/i18n/fr.json b/packages/plugins/src/countries/Indonesia/i18n/fr.json
new file mode 100644
index 000000000..86b5bc56a
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Indonésie",
+  "regionNames": "Provinces indonésiennes"
+}
diff --git a/packages/plugins/src/countries/Indonesia/i18n/hi.json b/packages/plugins/src/countries/Indonesia/i18n/hi.json
new file mode 100644
index 000000000..84b61de65
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "इंडोनेशिया",
+  "regionNames": "इंडोनेशियाई प्रांत"
+}
diff --git a/packages/plugins/src/countries/Indonesia/i18n/ja.json b/packages/plugins/src/countries/Indonesia/i18n/ja.json
new file mode 100644
index 000000000..ca11fb952
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "インドネシア",
+  "regionNames": "インドネシアの州"
+}
diff --git a/packages/plugins/src/countries/Indonesia/i18n/nl.json b/packages/plugins/src/countries/Indonesia/i18n/nl.json
new file mode 100644
index 000000000..f457c24ef
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Indonesië",
+  "regionNames": "Indonesische provincies"
+}
diff --git a/packages/plugins/src/countries/Indonesia/i18n/pt.json b/packages/plugins/src/countries/Indonesia/i18n/pt.json
new file mode 100644
index 000000000..0f2a7f2ff
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Indonésia",
+  "regionNames": "Províncias indonésias"
+}
diff --git a/packages/plugins/src/countries/Indonesia/i18n/ru.json b/packages/plugins/src/countries/Indonesia/i18n/ru.json
new file mode 100644
index 000000000..34771b6be
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Индонезия",
+  "regionNames": "Индонезийские провинции"
+}
diff --git a/packages/plugins/src/countries/Indonesia/i18n/ta.json b/packages/plugins/src/countries/Indonesia/i18n/ta.json
new file mode 100644
index 000000000..005df200e
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "இந்தோனேசியா",
+  "regionNames": "இந்தோனேசிய மாகாணங்கள்"
+}
diff --git a/packages/plugins/src/countries/Indonesia/i18n/zh.json b/packages/plugins/src/countries/Indonesia/i18n/zh.json
new file mode 100644
index 000000000..cb5bc03f9
--- /dev/null
+++ b/packages/plugins/src/countries/Indonesia/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "印度尼西亚",
+  "regionNames": "印度尼西亚各省份"
+}
diff --git a/packages/plugins/src/countries/Ireland/bundle.ts b/packages/plugins/src/countries/Ireland/bundle.ts
new file mode 100644
index 000000000..93ab5f72d
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/bundle.ts
@@ -0,0 +1,51 @@
+/**
+ * Sources:
+ * 		http://en.wikipedia.org/wiki/Provinces_of_Ireland
+ *
+ * @package Countries
+ */
+import { GetCountryData } from '@generatedata/types';
+
+const Ireland: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'ireland',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      format: 'Xxxx'
+    }
+  },
+  regions: [
+    {
+      regionName: 'Leinster',
+      regionShort: 'L',
+      regionSlug: 'leinster',
+      weight: 25,
+      cities: ['Dublin']
+    },
+    {
+      regionName: 'Ulster',
+      regionShort: 'U',
+      regionSlug: 'ulster',
+      weight: 21,
+      cities: ['Belfast']
+    },
+    {
+      regionName: 'Munster',
+      regionShort: 'M',
+      regionSlug: 'munster',
+      weight: 12,
+      cities: ['Cork']
+    },
+    {
+      regionName: 'Connacht',
+      regionShort: 'C',
+      regionSlug: 'connacht',
+      weight: 25,
+      cities: ['Galway']
+    }
+  ]
+});
+
+export default Ireland;
diff --git a/packages/plugins/src/countries/Ireland/i18n/ar.json b/packages/plugins/src/countries/Ireland/i18n/ar.json
new file mode 100644
index 000000000..f8b191b60
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "أيرلندا",
+  "regionNames": "المقاطعات الأيرلندية."
+}
diff --git a/packages/plugins/src/countries/Ireland/i18n/de.json b/packages/plugins/src/countries/Ireland/i18n/de.json
new file mode 100644
index 000000000..e4b0b80c7
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Irland",
+  "regionNames": "Irische Provinzen"
+}
diff --git a/packages/plugins/src/countries/Ireland/i18n/en.json b/packages/plugins/src/countries/Ireland/i18n/en.json
new file mode 100644
index 000000000..29e536a1f
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Ireland",
+  "regionNames": "Irish provinces."
+}
diff --git a/packages/plugins/src/countries/Ireland/i18n/es.json b/packages/plugins/src/countries/Ireland/i18n/es.json
new file mode 100644
index 000000000..3ca821e7e
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Irlanda",
+  "regionNames": "provincias irlandesas"
+}
diff --git a/packages/plugins/src/countries/Ireland/i18n/fr.json b/packages/plugins/src/countries/Ireland/i18n/fr.json
new file mode 100644
index 000000000..f6cebde15
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Irlande",
+  "regionNames": "Provinces irlandaises"
+}
diff --git a/packages/plugins/src/countries/Ireland/i18n/hi.json b/packages/plugins/src/countries/Ireland/i18n/hi.json
new file mode 100644
index 000000000..b6deb479b
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "आयरलैंड",
+  "regionNames": "आयरिश प्रांत।"
+}
diff --git a/packages/plugins/src/countries/Ireland/i18n/ja.json b/packages/plugins/src/countries/Ireland/i18n/ja.json
new file mode 100644
index 000000000..c235891b7
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "アイルランド",
+  "regionNames": "アイルランドの州"
+}
diff --git a/packages/plugins/src/countries/Ireland/i18n/nl.json b/packages/plugins/src/countries/Ireland/i18n/nl.json
new file mode 100644
index 000000000..94218c2c7
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Ierland",
+  "regionNames": "Ierse provincies"
+}
diff --git a/packages/plugins/src/countries/Ireland/i18n/pt.json b/packages/plugins/src/countries/Ireland/i18n/pt.json
new file mode 100644
index 000000000..26339fab5
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Irlanda",
+  "regionNames": "Províncias irlandesas."
+}
diff --git a/packages/plugins/src/countries/Ireland/i18n/ru.json b/packages/plugins/src/countries/Ireland/i18n/ru.json
new file mode 100644
index 000000000..3b08c94e4
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Ирландия",
+  "regionNames": "Ирландские провинции."
+}
diff --git a/packages/plugins/src/countries/Ireland/i18n/ta.json b/packages/plugins/src/countries/Ireland/i18n/ta.json
new file mode 100644
index 000000000..f6470a162
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "அயர்லாந்து",
+  "regionNames": "ஐரிஷ் மாகாணங்கள்"
+}
diff --git a/packages/plugins/src/countries/Ireland/i18n/zh.json b/packages/plugins/src/countries/Ireland/i18n/zh.json
new file mode 100644
index 000000000..82419c385
--- /dev/null
+++ b/packages/plugins/src/countries/Ireland/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "爱尔兰",
+  "regionNames": "爱尔兰省份"
+}
diff --git a/packages/plugins/src/countries/Italy/bundle.ts b/packages/plugins/src/countries/Italy/bundle.ts
new file mode 100644
index 000000000..74b8cc619
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/bundle.ts
@@ -0,0 +1,1199 @@
+/**
+ * @package Countries
+ */
+import { GetCountryData } from '@generatedata/types';
+
+const Italy: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'italy',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxxx'
+    }
+  },
+  regions: [
+    {
+      regionName: 'Piemonte',
+      regionShort: 'PIE',
+      regionSlug: 'piemonte',
+      weight: 7,
+      cities: [
+        'Alessandria',
+        'Asti',
+        'Barbania',
+        'Bonvicino',
+        'Borghetto di Borbera',
+        'Borgomasino',
+        'Borgone Susa',
+        'Borriana',
+        'Caprauna',
+        'Casanova Elvo',
+        'Cassano Spinola',
+        'Coassolo Torinese',
+        'Colleretto Castelnuovo',
+        'Crescentino',
+        'Cressa',
+        'Cuceglio',
+        'Ferrere',
+        'Ghislarengo',
+        'Marentino',
+        'Massello',
+        'Melazzo',
+        'Meugliano',
+        'Molino dei Torti',
+        'Mombaruzzo',
+        'Moncrivello',
+        'Montacuto',
+        'Montaldo Bormida',
+        'Monteu Roero',
+        'Olcenengo',
+        'Olivola',
+        'Orta San Giulio',
+        'Ponti',
+        'Premeno',
+        'Priero',
+        'Quarona',
+        "Rocca d'Arazzo",
+        'Roccabruna',
+        'Rueglio',
+        'San Maurizio Canavese',
+        "Serralunga d'Alba",
+        'Sommariva Perno',
+        'Strona',
+        'Torino',
+        'Valmacca',
+        'Vauda Canavese',
+        'Vespolate',
+        'Villafalletto',
+        "Villafranca d'Asti",
+        'Villar Pellice',
+        'Villata'
+      ]
+    },
+
+    {
+      regionName: "Valle d'Aosta",
+      regionShort: 'VDA',
+      regionSlug: 'valledaosta',
+      weight: 1,
+      cities: [
+        'Allein',
+        'Antey-Saint-Andrè',
+        'Aosta',
+        'Arvier',
+        'Avise',
+        'Ayas',
+        'Bard',
+        'Bionaz',
+        'Brusson',
+        'Challand-Saint-Victor',
+        'Chambave',
+        'Champorcher',
+        'Chatillon',
+        'Donnas',
+        'Doues',
+        'Emarèse',
+        'Etroubles',
+        'Gignod',
+        'Gressan',
+        'Gressoney-La-Trinitè',
+        'Gressoney-Saint-Jean',
+        'Introd',
+        'Issime',
+        'La Magdeleine',
+        'La Salle',
+        'La Thuile',
+        'Lillianes',
+        'Montjovet',
+        'Morgex',
+        'Nus',
+        'Oyace',
+        'Pollein',
+        'Pont-Saint-Martin',
+        'Pontboset',
+        'Pontey',
+        'Prè-Saint-Didier',
+        'Rhemes-Notre-Dame',
+        'Rhemes-Saint-Georges',
+        'Saint-Denis',
+        'Saint-Marcel',
+        'Saint-Nicolas',
+        'Saint-Oyen',
+        'Saint-Pierre',
+        'Saint-Rhémy-en-Bosses',
+        'Sarre',
+        'Torgnon',
+        'Valpelline',
+        'Valtournenche',
+        'Verrayes',
+        'Verrès'
+      ]
+    },
+
+    {
+      regionName: 'Lombardia',
+      regionShort: 'LOM',
+      regionSlug: 'lombardia',
+      weight: 16,
+      cities: [
+        'Acquafredda',
+        'Annone di Brianza',
+        'Asso',
+        'Barghe',
+        'Blevio',
+        'Borno',
+        'Brescia',
+        'Calco',
+        'Cambiago',
+        'Caprino Bergamasco',
+        'Casnate con Bernate',
+        "Castello dell'Acqua",
+        'Castelmarte',
+        'Castelseprio',
+        'Chiari',
+        'Cisano Bergamasco',
+        'Civo',
+        'Colico',
+        'Corvino San Quirico',
+        "Crotta d'Adda",
+        'Fino Mornasco',
+        'Galbiate',
+        'Gambolò',
+        'Gavirate',
+        'Gianico',
+        'Lasnigo',
+        'Lenna',
+        'Luino',
+        'Mantova',
+        'Malgesso',
+        'Milano',
+        'Motta Visconti',
+        'Ospedaletto Lodigiano',
+        'Pagazzano',
+        'Pavone del Mella',
+        'Pero',
+        'Pogliano Milanese',
+        'Polpenazze del Garda',
+        'Rea',
+        'Ripalta Guerina',
+        'Rudiano',
+        'Salvirola',
+        'San Damiano al Colle',
+        'Sannazzaro de Burgondi',
+        'Somma Lombardo',
+        'Sulzano',
+        'Torno',
+        'Val Rezzo',
+        'Valera Fratta',
+        'Villa Cortese'
+      ]
+    },
+
+    {
+      regionName: 'Trentino-Alto Adige',
+      regionShort: 'TAA',
+      regionSlug: 'trentinoaltoadige',
+      weight: 2,
+      cities: [
+        'Albiano',
+        'Andalo',
+        'Bedollo',
+        'Bolzano/Bozen',
+        'Bondo',
+        'Borgo Valsugana',
+        'Braies/Prags',
+        'Campitello di Fassa',
+        'Castello Tesino',
+        'Centa San Nicolò',
+        'Chiusa/Klausen',
+        'Cles',
+        'Curon Venosta/Graun im Vinschgau',
+        'Daiano',
+        'Dro',
+        'Gargazzone/Gargazon',
+        'Giustino',
+        'La Valle/Wengen',
+        'Laces/Latsch',
+        'Lagundo/Algund',
+        'Laives/Leifers',
+        'Lauregno/Laurein',
+        'Livo',
+        'Martello/Martell',
+        'Mezzana',
+        'Monguelfo-Tesido/Welsberg-Taisten',
+        'Panchià',
+        'Pellizzano',
+        'Pomarolo',
+        'Preore',
+        'Rabbi',
+        'Rodengo/Rodeneck',
+        'Rovereto',
+        'San Martino in Badia/St. Martin in Thurn',
+        'Sanzeno',
+        'Scena/Schenna',
+        'Sfruz',
+        'Spormaggiore',
+        'Terlago',
+        'Termeno sulla strada del vino/Tramin an der Weinstrasse',
+        'Terragnolo',
+        'Tiarno di Sopra',
+        'Tione di Trento',
+        'Trento',
+        'Valda',
+        'Vandoies/Vintl',
+        'Varena',
+        'Varna/Vahrn',
+        'Villa Agnedo',
+        'Ziano di Fiemme'
+      ]
+    },
+
+    {
+      regionName: 'Veneto',
+      regionShort: 'VEN',
+      regionSlug: 'veneto',
+      weight: 8,
+      cities: [
+        'Adria',
+        'Arsiè',
+        'Asigliano Veneto',
+        'Bevilacqua',
+        'Bolzano Vicentino',
+        'Bussolengo',
+        'Camponogara',
+        'Castelbaldo',
+        'Castello di Godego',
+        'Cavaion Veronese',
+        'Cavaso del Tomba',
+        'Codognè',
+        'Feltre',
+        'Ficarolo',
+        'Follina',
+        'Galzignano Terme',
+        'Grezzana',
+        'Limena',
+        'Lozzo Atestino',
+        'Maser',
+        'Monfumo',
+        'Montebelluna',
+        'Oderzo',
+        'Pescantina',
+        'Pieve di Cadore',
+        'Piovene Rocchette',
+        'Polesella',
+        'Ponte San Nicolò',
+        'Ponte nelle Alpi',
+        'Portobuffolè',
+        'Posina',
+        'Pramaggiore',
+        "Romano d'Ezzelino",
+        'San Gregorio nelle Alpi',
+        'San Pietro Mussolino',
+        'San Zenone degli Ezzelini',
+        "Sant'Elena",
+        "Sant'Urbano",
+        'Selva di Cadore',
+        'Solesino',
+        'Sorgà',
+        'Sossano',
+        'Soverzene',
+        'Sovizzo',
+        'Spresiano',
+        'Susegana',
+        'Tarzo',
+        'Tezze sul Brenta',
+        'Venezia',
+        'Verona'
+      ]
+    },
+
+    {
+      regionName: 'Friuli-Venezia Giulia',
+      regionShort: 'FVG',
+      regionSlug: 'friuliveneziagiulia',
+      weight: 2,
+      cities: [
+        'Amaro',
+        'Attimis',
+        'Bertiolo',
+        'Bicinicco',
+        'Castelnovo del Friuli',
+        'Cavasso Nuovo',
+        'Cimolais',
+        'Clauzetto',
+        'Colloredo di Monte Albano',
+        'Comeglians',
+        'Dignano',
+        'Fogliano Redipuglia',
+        'Fontanafredda',
+        'Forgaria nel Friuli',
+        'Gonars',
+        'Grado',
+        'Latisana',
+        'Lauco',
+        'Lestizza',
+        'Ligosullo',
+        'Lusevera',
+        'Marano Lagunare',
+        'Medea',
+        'Meduno',
+        'Paularo',
+        'Polcenigo',
+        'Pordenone',
+        'Porpetto',
+        'Pozzuolo del Friuli',
+        'Pradamano',
+        'Prato Carnico',
+        'Precenicco',
+        'Ragogna',
+        'Reana del Rojale',
+        'Roveredo in Piano',
+        'Ruda',
+        'San Floriano del Collio',
+        'San Vito al Tagliamento',
+        'Sauris',
+        'Sesto al Reghena',
+        'Sgonico',
+        'Socchieve',
+        'Tarcento',
+        'Tarvisio',
+        'Tramonti di Sopra',
+        'Treppo Carnico',
+        'Trieste',
+        'Turriaco',
+        'Verzegnis',
+        "Vito d'Asio"
+      ]
+    },
+
+    {
+      regionName: 'Liguria',
+      regionShort: 'LIG',
+      regionSlug: 'liguria',
+      weight: 3,
+      cities: [
+        'Alassio',
+        'Albisola Superiore',
+        "Aquila d'Arroscia",
+        'Armo',
+        'Bajardo',
+        'Bargagli',
+        'Bergeggi',
+        'Bolano',
+        'Borghetto di Vara',
+        'Borgomaro',
+        'Cairo Montenotte',
+        'Calice al Cornoviglio',
+        'Campomorone',
+        'Castelbianco',
+        'Castelnuovo Magra',
+        'Castelvecchio di Rocca Barbena',
+        'Ceranesi',
+        'Chiavari',
+        'Chiusanico',
+        'Cicagna',
+        'Cisano sul Neva',
+        'Diano Arentino',
+        'Dolceacqua',
+        'Dolcedo',
+        'Erli',
+        'Fontanigorda',
+        'Genova',
+        'La Spezia',
+        'Masone',
+        'Massimino',
+        'Mignanego',
+        'Millesimo',
+        'Montoggio',
+        'Nasino',
+        'Ortonovo',
+        'Perinaldo',
+        'Portofino',
+        'Recco',
+        'Rezzoaglio',
+        'Savona',
+        'Seborga',
+        'Terzorio',
+        'Tribogna',
+        'Urbe',
+        'Valbrevenna',
+        'Vezzi Portio',
+        'Villa Faraldi',
+        "Villanova d'Albenga",
+        'Zignago',
+        'Zuccarello'
+      ]
+    },
+
+    {
+      regionName: 'Emilia-Romagna',
+      regionShort: 'ERM',
+      regionSlug: 'emiliaromagna',
+      weight: 7,
+      cities: [
+        'Baiso',
+        'Baricella',
+        'Bazzano',
+        'Berceto',
+        'Bologna',
+        'Calestano',
+        'Casina',
+        'Castel Guelfo di Bologna',
+        'Castel Maggiore',
+        'Codigoro',
+        'Collecchio',
+        'Colorno',
+        'Compiano',
+        'Conselice',
+        'Corte Brugnatella',
+        'Fontanellato',
+        'Forlì',
+        'Fusignano',
+        'Gaggio Montano',
+        'Gattatico',
+        'Jolanda di Savoia',
+        'Luzzara',
+        'Maranello',
+        'Marzabotto',
+        'Modena',
+        'Monghidoro',
+        'Montese',
+        "Monticelli d'Ongina",
+        'Ostellato',
+        'Palagano',
+        'Palanzano',
+        'Pievepelago',
+        'Poggio Berni',
+        'Porretta Terme',
+        'Portico e San Benedetto',
+        'Poviglio',
+        "Reggio nell'Emilia",
+        'Rio Saliceto',
+        'Sala Baganza',
+        'San Clemente',
+        'San Lazzaro di Savena',
+        "San Polo d'Enza",
+        "Sant'Agata Bolognese",
+        "Sant'Agata sul Santerno",
+        'Santarcangelo di Romagna',
+        'Sissa',
+        'Travo',
+        'Tresigallo',
+        'Viano',
+        'Zerba'
+      ]
+    },
+
+    {
+      regionName: 'Toscana',
+      regionShort: 'TOS',
+      regionSlug: 'toscana',
+      weight: 6,
+      cities: [
+        'Anghiari',
+        'Bientina',
+        'Buti',
+        'Capannori',
+        'Casciana Terme',
+        "Casole d'Elsa",
+        'Castel San Niccolò',
+        'Castellina in Chianti',
+        'Castiglione di Garfagnana',
+        'Certaldo',
+        'Comano',
+        'Coreglia Antelminelli',
+        'Empoli',
+        'Fauglia',
+        'Firenze',
+        'Gavorrano',
+        'Grosseto',
+        'Livorno',
+        'Massa e Cozzile',
+        'Massarosa',
+        'Minucciano',
+        'Monte San Savino',
+        'Montelupo Fiorentino',
+        'Montemignaio',
+        "Monteroni d'Arbia",
+        'Montignoso',
+        'Orciano Pisano',
+        'Pelago',
+        'Piancastagnaio',
+        'Pietrasanta',
+        'Pisa',
+        'Ponsacco',
+        'Pontedera',
+        'Pratovecchio',
+        'Radicofani',
+        'Rio Marina',
+        "Rio nell'Elba",
+        'Riparbella',
+        'Sambuca Pistoiese',
+        'San Marcello Pistoiese',
+        'San Piero a Sieve',
+        "Santa Croce sull'Arno",
+        'Santa Fiora',
+        'Santa Maria a Monte',
+        'Siena',
+        'Subbiano',
+        'Vagli Sotto',
+        'Vergemoli',
+        'Villafranca in Lunigiana',
+        'Vinci'
+      ]
+    },
+
+    {
+      regionName: 'Umbria',
+      regionShort: 'UMB',
+      regionSlug: 'umbria',
+      weight: 1,
+      cities: [
+        'Acquasparta',
+        'Allerona',
+        'Alviano',
+        'Amelia',
+        'Arrone',
+        'Attigliano',
+        'Avigliano Umbro',
+        'Baschi',
+        'Bastia Umbra',
+        'Bevagna',
+        'Castel Giorgio',
+        'Castel Ritaldi',
+        'Castiglione del Lago',
+        'Cerreto di Spoleto',
+        'Fabro',
+        'Ficulle',
+        'Foligno',
+        'Fossato di Vico',
+        'Fratta Todina',
+        'Giove',
+        'Gualdo Cattaneo',
+        'Gualdo Tadino',
+        'Gubbio',
+        'Lisciano Niccone',
+        'Lugnano in Teverina',
+        'Marsciano',
+        'Massa Martana',
+        'Monte Santa Maria Tiberina',
+        'Monteleone di Spoleto',
+        'Montone',
+        'Nocera Umbra',
+        'Norcia',
+        'Orvieto',
+        'Otricoli',
+        'Parrano',
+        'Penna in Teverina',
+        'Perugia',
+        'Piegaro',
+        'Poggiodomo',
+        'Polino',
+        'San Venanzo',
+        'Scheggino',
+        'Sellano',
+        'Sigillo',
+        'Spoleto',
+        'Terni',
+        'Todi',
+        'Torgiano',
+        'Umbertide',
+        'Valfabbrica'
+      ]
+    },
+
+    {
+      regionName: 'Marche',
+      regionShort: 'MAR',
+      regionSlug: 'marche',
+      weight: 3,
+      cities: [
+        'Acquasanta Terme',
+        'Altidona',
+        'Ancona',
+        'Arquata del Tronto',
+        'Barchi',
+        'Belvedere Ostrense',
+        'Cagli',
+        'Caldarola',
+        'Camerino',
+        'Camporotondo di Fiastrone',
+        'Castel Colonna',
+        'Cossignano',
+        'Falerone',
+        'Fiuminata',
+        'Loreto',
+        'Macerata',
+        'Maiolati Spontini',
+        'Maltignano',
+        'Mogliano',
+        'Mondolfo',
+        'Monte Giberto',
+        'Monte San Pietrangeli',
+        'Monte Vidon Corrado',
+        'Montecarotto',
+        "Montefiore dell'Aso",
+        'Montegranaro',
+        "Morro d'Alba",
+        'Morrovalle',
+        'Offida',
+        'Osimo',
+        'Ostra Vetere',
+        'Palmiano',
+        'Penna San Giovanni',
+        'Pergola',
+        'Piagge',
+        'Pietrarubbia',
+        'Poggio San Marcello',
+        'Rapagnano',
+        'Recanati',
+        'Saltara',
+        'San Benedetto del Tronto',
+        'San Marcello',
+        "Sant'Angelo in Pontano",
+        "Sant'Elpidio a Mare",
+        'Santa Vittoria in Matenano',
+        'Sassocorvaro',
+        'Sefro',
+        'Serrungarina',
+        'Tolentino',
+        'Visso'
+      ]
+    },
+
+    {
+      regionName: 'Lazio',
+      regionShort: 'LAZ',
+      regionSlug: 'lazio',
+      weight: 9,
+      cities: [
+        'Acquafondata',
+        'Allumiere',
+        'Alvito',
+        'Anzio',
+        'Arsoli',
+        'Artena',
+        'Bassano in Teverina',
+        'Bassiano',
+        'Canino',
+        'Cantalupo in Sabina',
+        'Canterano',
+        'Capena',
+        'Casalvieri',
+        'Casperia',
+        'Castel di Tora',
+        'Cisterna di Latina',
+        'Filacciano',
+        'Frascati',
+        'Labico',
+        'Labro',
+        'Ladispoli',
+        'Latera',
+        'Mandela',
+        'Mazzano Romano',
+        'Minturno',
+        'Monte San Giovanni in Sabina',
+        'Moricone',
+        'Morolo',
+        'Morro Reatino',
+        'Nemi',
+        'Palestrina',
+        'Pastena',
+        'Picinisco',
+        'Rocca Massima',
+        'Rocca Santo Stefano',
+        "Rocca d'Arce",
+        'Roma',
+        'Ronciglione',
+        'San Lorenzo Nuovo',
+        'Scandriglia',
+        'Segni',
+        'Sonnino',
+        'Torre Cajetani',
+        'Trevignano Romano',
+        'Vallepietra',
+        'Vejano',
+        'Velletri',
+        'Vico nel Lazio',
+        'Villa Latina',
+        'Villa Santo Stefano'
+      ]
+    },
+
+    {
+      regionName: 'Abruzzo',
+      regionShort: 'ABR',
+      regionSlug: 'abruzzo',
+      weight: 2,
+      cities: [
+        'Abbateggio',
+        'Acciano',
+        'Ancarano',
+        'Bellante',
+        'Campli',
+        'Campotosto',
+        'Capestrano',
+        'Cappelle sul Tavo',
+        'Caramanico Terme',
+        'Carunchio',
+        'Casoli',
+        'Castellafiume',
+        'Castelvecchio Calvisio',
+        'Castiglione Messer Raimondo',
+        'Castiglione a Casauria',
+        'Cerchio',
+        'Chieti',
+        'Colledimacine',
+        'Colonnella',
+        'Crecchio',
+        'Fallo',
+        'Fontecchio',
+        'Guilmi',
+        "Isola del Gran Sasso d'Italia",
+        'Manoppello',
+        'Montebello sul Sangro',
+        'Montereale',
+        "Mosciano Sant'Angelo",
+        'Nocciano',
+        'Ofena',
+        'Orsogna',
+        'Paglieta',
+        'Palombaro',
+        'Pereto',
+        'Pizzoferrato',
+        'Pretoro',
+        'Rocca di Cambio',
+        'Roio del Sangro',
+        'Rosciano',
+        'San Giovanni Lipioni',
+        'San Valentino in Abruzzo Citeriore',
+        'San Vito Chietino',
+        "Sant'Egidio alla Vibrata",
+        "Sant'Eufemia a Maiella",
+        "Sant'Eusanio Forconese",
+        "Sant'Omero",
+        'Serramonacesca',
+        'Torrevecchia Teatina',
+        'Treglio',
+        'Vicoli'
+      ]
+    },
+
+    {
+      regionName: 'Molise',
+      regionShort: 'MOL',
+      regionSlug: 'molise',
+      weight: 1,
+      cities: [
+        'Baranello',
+        'Belmonte del Sannio',
+        'Bojano',
+        'Bonefro',
+        'Busso',
+        'Campochiaro',
+        'Campolieto',
+        'Campomarino',
+        'Carovilli',
+        'Casacalenda',
+        'Castel del Giudice',
+        'Campobasso',
+        'Cercemaggiore',
+        'Cercepiccola',
+        'Chiauci',
+        'Civitacampomarano',
+        'Colli a Volturno',
+        'Conca Casale',
+        'Ferrazzano',
+        'Filignano',
+        'Isernia',
+        'Longano',
+        'Macchia Valfortore',
+        'Miranda',
+        'Monacilioni',
+        'Montefalcone nel Sannio',
+        'Montenero Val Cocchiara',
+        'Petacciato',
+        'Pettoranello del Molise',
+        'Pietracatella',
+        'Ripabottoni',
+        'Roccasicura',
+        'Rotello',
+        'Salcito',
+        'San Giacomo degli Schiavoni',
+        'San Giovanni in Galdo',
+        'San Giuliano di Puglia',
+        'San Martino in Pensilis',
+        'San Massimo',
+        'San Pietro Avellana',
+        "Sant'Agapito",
+        "Sant'Angelo Limosano",
+        "Sant'Elia a Pianisi",
+        'Sepino',
+        'Sesto Campano',
+        'Termoli',
+        'Torella del Sannio',
+        'Tufara',
+        'Ururi',
+        'Vastogirardi'
+      ]
+    },
+
+    {
+      regionName: 'Campania',
+      regionShort: 'CAM',
+      regionSlug: 'campania',
+      weight: 10,
+      cities: [
+        'Acerra',
+        'Altavilla Irpina',
+        'Arzano',
+        'Avellino',
+        'Calvi Risorta',
+        'Campagna',
+        'Cannalonga',
+        'Casalbuono',
+        'Castel Baronia',
+        'Castel Volturno',
+        'Castelvetere in Val Fortore',
+        'Ceppaloni',
+        'Cervinara',
+        'Cervino',
+        'Cetara',
+        'Cimitile',
+        'Corbara',
+        'Cuccaro Vetere',
+        'Ercolano',
+        'Falciano del Massico',
+        'Felitto',
+        'Forio',
+        'Frigento',
+        'Frignano',
+        'Giugliano in Campania',
+        'Guardia Sanframondi',
+        'Napoli',
+        "Ospedaletto d'Alpinolo",
+        'Paternopoli',
+        'Paupisi',
+        'Pellezzano',
+        'Pietraroja',
+        'Pollena Trocchia',
+        'Portici',
+        'Rocca San Felice',
+        'Salerno',
+        'San Felice a Cancello',
+        'San Leucio del Sannio',
+        'San Mauro Cilento',
+        'San Pietro al Tanagro',
+        'San Sebastiano al Vesuvio',
+        "Sant'Angelo a Cupolo",
+        "Sant'Angelo a Fasanella",
+        "Sant'Arsenio",
+        "Sant'Egidio del Monte Albino",
+        'Santa Marina',
+        'Santo Stefano del Sole',
+        'Santomenna',
+        'Sorbo Serpico',
+        'Tufo'
+      ]
+    },
+
+    {
+      regionName: 'Puglia',
+      regionShort: 'PUG',
+      regionSlug: 'puglia',
+      weight: 7,
+      cities: [
+        'Accadia',
+        'Altamura',
+        'Arnesano',
+        'Bari',
+        'Brindisi',
+        'Candela',
+        'Cannole',
+        'Carpignano Salentino',
+        'Castelluccio Valmaggiore',
+        'Castri di Lecce',
+        'Cavallino',
+        'Cerignola',
+        'Copertino',
+        'Erchie',
+        'Francavilla Fontana',
+        'Gagliano del Capo',
+        'Giurdignano',
+        'Grumo Appula',
+        'Lecce',
+        'Maglie',
+        'Manfredonia',
+        'Minervino di Lecce',
+        'Molfetta',
+        'Montemesola',
+        'Mottola',
+        'Noicattaro',
+        'Novoli',
+        'Oria',
+        'Orsara di Puglia',
+        'Otranto',
+        'Palagianello',
+        'Palmariggi',
+        'Poggiorsini',
+        'Porto Cesareo',
+        'Putignano',
+        'Rignano Garganico',
+        'Rutigliano',
+        'Salice Salentino',
+        'San Cesario di Lecce',
+        'San Pancrazio Salentino',
+        'Santa Cesarea Terme',
+        'Scorrano',
+        'Sogliano Cavour',
+        'Surbo',
+        'Torchiarolo',
+        'Trani',
+        'Tuglie',
+        'Vernole',
+        'Vico del Gargano',
+        'Vieste'
+      ]
+    },
+
+    {
+      regionName: 'Basilicata',
+      regionShort: 'BAS',
+      regionSlug: 'basilicata',
+      weight: 1,
+      cities: [
+        'Albano di Lucania',
+        'Aliano',
+        'Anzi',
+        'Armento',
+        'Balvano',
+        'Bella',
+        'Calvello',
+        'Calvera',
+        'Castelluccio Inferiore',
+        'Castelluccio Superiore',
+        'Castelmezzano',
+        'Chiaromonte',
+        'Colobraro',
+        'Craco',
+        'Episcopia',
+        'Ferrandina',
+        'Francavilla in Sinni',
+        'Gallicchio',
+        'Garaguso',
+        'Genzano di Lucania',
+        'Guardia Perticara',
+        'Lagonegro',
+        'Latronico',
+        'Matera',
+        'Moliterno',
+        'Montemilone',
+        'Nemoli',
+        'Pescopagano',
+        'Pietragalla',
+        'Pomarico',
+        'Potenza',
+        'Rapone',
+        'Rionero in Vulture',
+        'Ripacandida',
+        'Rivello',
+        'Roccanova',
+        'Ruoti',
+        'Ruvo del Monte',
+        'San Chirico Nuovo',
+        'San Fele',
+        'Satriano di Lucania',
+        'Scanzano Jonico',
+        'Spinoso',
+        'Stigliano',
+        'Tolve',
+        'Tramutola',
+        'Trivigno',
+        'Vietri di Potenza',
+        'Viggianello',
+        'Viggiano'
+      ]
+    },
+
+    {
+      regionName: 'Calabria',
+      regionShort: 'CAL',
+      regionSlug: 'calabria',
+      weight: 3,
+      cities: [
+        'Aiello Calabro',
+        'Aieta',
+        'Benestare',
+        'Bocchigliero',
+        'Candidoni',
+        'Catanzaro',
+        'Cellara',
+        'Cittanova',
+        'Cropalati',
+        'Davoli',
+        'Delianuova',
+        'Dipignano',
+        'Filadelfia',
+        'Fiumara',
+        'Fossato Serralta',
+        'Gagliato',
+        'Girifalco',
+        'Grimaldi',
+        'Isca sullo Ionio',
+        'Isola di Capo Rizzuto',
+        'Laino Castello',
+        'Marcedusa',
+        'Marzi',
+        'Mesoraca',
+        'Montalto Uffugo',
+        'Oppido Mamertina',
+        'Papasidero',
+        'Pedace',
+        'Placanica',
+        'Portigliola',
+        'Rosarno',
+        'San Calogero',
+        'San Costantino Calabro',
+        'San Demetrio Corone',
+        'San Donato di Ninea',
+        'San Giorgio Albanese',
+        'San Lorenzo',
+        'San Luca',
+        'San Mauro Marchesato',
+        'San Sostene',
+        "Sant'Ilario dello Ionio",
+        "Sant'Onofrio",
+        'Scala Coeli',
+        'Sellia Marina',
+        'Serrata',
+        'Squillace',
+        'Stilo',
+        'Strongoli',
+        'Tarsia',
+        'Tropea'
+      ]
+    },
+
+    {
+      regionName: 'Sicilia',
+      regionShort: 'SIC',
+      regionSlug: 'sicilia',
+      weight: 8,
+      cities: [
+        'Acireale',
+        'Acquedolci',
+        'Adrano',
+        'Buccheri',
+        'Caccamo',
+        'Campofelice di Fitalia',
+        'Cassaro',
+        'Castelbuono',
+        'Castellana Sicula',
+        'Castiglione di Sicilia',
+        'Cefalà Diana',
+        'Cerami',
+        'Chiusa Sclafani',
+        'Cinisi',
+        'Enna',
+        'Francofonte',
+        'Gallodoro',
+        'Giardinello',
+        'Giarratana',
+        'Mascalucia',
+        'Milazzo',
+        'Milena',
+        'Moio Alcantara',
+        'Motta Camastra',
+        "Motta Sant'Anastasia",
+        'Naro',
+        'Nicolosi',
+        'Pace del Mela',
+        'Palermo',
+        'Pettineo',
+        'Piana degli Albanesi',
+        'Priolo Gargallo',
+        'Randazzo',
+        'Roccalumera',
+        'Roccamena',
+        'Rodì Milici',
+        'Rosolini',
+        'San Fratello',
+        'San Giovanni la Punta',
+        'San Piero Patti',
+        'Santa Caterina Villarmosa',
+        'Santa Flavia',
+        'Santo Stefano Quisquina',
+        'Sciacca',
+        'Siculiana',
+        'Siracusa',
+        'Sperlinga',
+        'Termini Imerese',
+        'Valverde',
+        'Villafranca Tirrena'
+      ]
+    },
+
+    {
+      regionName: 'Sardegna',
+      regionShort: 'SAR',
+      regionSlug: 'sardegna',
+      weight: 3,
+      cities: [
+        'Albagiara',
+        'Armungia',
+        'Birori',
+        'Bosa',
+        'Bottidda',
+        'Bulzi',
+        'Cabras',
+        'Cagliari',
+        'Cardedu',
+        'Collinas',
+        'Cuglieri',
+        'Dorgali',
+        'Esterzili',
+        'Gonnosfanadiga',
+        'Gonnosnò',
+        'Ilbono',
+        'Jerzu',
+        'Lodine',
+        'Maracalagonis',
+        'Masullas',
+        'Montresta',
+        'Mores',
+        'Narbolia',
+        'Narcao',
+        'Noragugume',
+        'Nuragus',
+        'Nurallao',
+        'Nuraminis',
+        'Ollolai',
+        'Oristano',
+        'Orosei',
+        'Orroli',
+        'Ortacesus',
+        'Piscinas',
+        'San Giovanni Suergiu',
+        'Sanluri',
+        'Santu Lussurgiu',
+        'Sennariolo',
+        'Siddi',
+        'Silius',
+        'Sorradile',
+        'Stintino',
+        'Tramatza',
+        "Trinità d'Agultu e Vignola",
+        'Tula',
+        'Ussassai',
+        'Viddalba',
+        'Villa Verde',
+        'Villamassargia',
+        'Villanovafranca'
+      ]
+    }
+  ]
+});
+
+export default Italy;
diff --git a/packages/plugins/src/countries/Italy/i18n/ar.json b/packages/plugins/src/countries/Italy/i18n/ar.json
new file mode 100644
index 000000000..c271e8047
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "إيطاليا",
+  "regionNames": "المناطق الإيطالية."
+}
diff --git a/packages/plugins/src/countries/Italy/i18n/de.json b/packages/plugins/src/countries/Italy/i18n/de.json
new file mode 100644
index 000000000..ebd17bef3
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Italien",
+  "regionNames": "Italienische Regionen"
+}
diff --git a/packages/plugins/src/countries/Italy/i18n/en.json b/packages/plugins/src/countries/Italy/i18n/en.json
new file mode 100644
index 000000000..4a452007c
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Italy",
+  "regionNames": "Italian regions."
+}
diff --git a/packages/plugins/src/countries/Italy/i18n/es.json b/packages/plugins/src/countries/Italy/i18n/es.json
new file mode 100644
index 000000000..0f6035129
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Italia",
+  "regionNames": "regiones italianas"
+}
diff --git a/packages/plugins/src/countries/Italy/i18n/fr.json b/packages/plugins/src/countries/Italy/i18n/fr.json
new file mode 100644
index 000000000..309350a1b
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Italie",
+  "regionNames": "Régions italiennes"
+}
diff --git a/packages/plugins/src/countries/Italy/i18n/hi.json b/packages/plugins/src/countries/Italy/i18n/hi.json
new file mode 100644
index 000000000..242a3ac7b
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "इटली",
+  "regionNames": "इतालवी क्षेत्र।"
+}
diff --git a/packages/plugins/src/countries/Italy/i18n/ja.json b/packages/plugins/src/countries/Italy/i18n/ja.json
new file mode 100644
index 000000000..da2888cd1
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "イタリア",
+  "regionNames": "イタリアの地域"
+}
diff --git a/packages/plugins/src/countries/Italy/i18n/nl.json b/packages/plugins/src/countries/Italy/i18n/nl.json
new file mode 100644
index 000000000..9e32ba42c
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Italië",
+  "regionNames": "Italiaanse regio's"
+}
diff --git a/packages/plugins/src/countries/Italy/i18n/pt.json b/packages/plugins/src/countries/Italy/i18n/pt.json
new file mode 100644
index 000000000..b6ecf700a
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Itália",
+  "regionNames": "Regiões italianas."
+}
diff --git a/packages/plugins/src/countries/Italy/i18n/ru.json b/packages/plugins/src/countries/Italy/i18n/ru.json
new file mode 100644
index 000000000..4596afb03
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Италия",
+  "regionNames": "итальянские регионы."
+}
diff --git a/packages/plugins/src/countries/Italy/i18n/ta.json b/packages/plugins/src/countries/Italy/i18n/ta.json
new file mode 100644
index 000000000..258e40f79
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "இத்தாலி",
+  "regionNames": "இத்தாலிய பகுதிகள்"
+}
diff --git a/packages/plugins/src/countries/Italy/i18n/zh.json b/packages/plugins/src/countries/Italy/i18n/zh.json
new file mode 100644
index 000000000..c8a023371
--- /dev/null
+++ b/packages/plugins/src/countries/Italy/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "意大利",
+  "regionNames": "意大利地区"
+}
diff --git a/packages/plugins/src/countries/Mexico/bundle.ts b/packages/plugins/src/countries/Mexico/bundle.ts
new file mode 100644
index 000000000..c8f4c2f48
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/bundle.ts
@@ -0,0 +1,190 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Mexico: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'mexico',
+  regionNames: i18n.regionNames,
+  continent: 'north_america',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxxx-xxxxx'
+    },
+    phoneFormat: {
+      displayFormats: [
+        '045 Xx Xxxx xxx',
+        '045 Xx Xxxx xxxx',
+        '045 Xxx Xxxx xxx',
+        '045 Xxx Xxxx xxxx',
+        'Xxx-Xxxx xxx',
+        '55–Xxxx xxxx',
+        '55–Xxxx xxx'
+      ]
+    }
+  },
+  regions: [
+    {
+      regionName: 'Mexico City',
+      regionShort: 'CDMX',
+      regionSlug: 'mexico_city',
+      weight: 89,
+      cities: ['Mexico City']
+    },
+    {
+      regionName: 'Veracruz',
+      regionShort: 'Ver.',
+      regionSlug: 'veracruz',
+      weight: 76,
+      cities: ['Veracruz', 'Xalapa', 'Coatzacoalcos', 'Poza Rica', 'Córdoba', 'Boca del Río', 'Orizaba', 'Minatitlán']
+    },
+    {
+      regionName: 'Jalisco',
+      regionShort: 'Jal.',
+      regionSlug: 'jalisco',
+      weight: 74,
+      cities: ['Guadalajara', 'Zapopan', 'Tlaquepaque', 'Tonalá', 'Puerto Vallarta']
+    },
+    {
+      regionName: 'Puebla',
+      regionShort: 'Pue.',
+      regionSlug: 'puebla',
+      weight: 58,
+      cities: ['Tehuacán']
+    },
+    {
+      regionName: 'Guanajuato',
+      regionShort: 'Gto.',
+      regionSlug: 'guanajuato',
+      weight: 55,
+      cities: ['León', 'Irapuato', 'Celaya', 'Salamanca']
+    },
+    {
+      regionName: 'Chiapas',
+      regionShort: 'Chis.',
+      regionSlug: 'chiapas',
+      weight: 48,
+      cities: ['Tuxtla Gutiérrez', 'Tapachula', 'San Cristóbal de las Casas']
+    },
+    {
+      regionName: 'Nuevo León',
+      regionShort: 'N.L.',
+      regionSlug: 'nuevoleon',
+      weight: 47,
+      cities: [
+        'Monterrey',
+        'Guadalupe',
+        'San Nicolás de los Garza',
+        'Ciudad Apodaca',
+        'General Escobedo',
+        'Ciudad Santa Catarina',
+        'San Pedro Garza García'
+      ]
+    },
+    {
+      regionName: 'Michoacán',
+      regionShort: 'Mich.',
+      regionSlug: 'michoacan',
+      weight: 44,
+      cities: ['Morelia', 'Uruapan', 'Zamora de Hidalgo']
+    },
+    {
+      regionName: 'Oaxaca',
+      regionShort: 'Oax.',
+      regionSlug: 'oaxaca',
+      weight: 38,
+      cities: ['Oaxaca']
+    },
+    {
+      regionName: 'Chihuahua',
+      regionShort: 'Chih.',
+      regionSlug: 'chihuahua',
+      weight: 34,
+      cities: ['Juárez', 'Chihuahua', 'Delicias', 'Hidalgo del Parral']
+    },
+    {
+      regionName: 'Guerrero',
+      regionShort: 'Gro.',
+      regionSlug: 'guerrero',
+      weight: 34,
+      cities: ['Acapulco', 'Chilpancingo', 'Iguala']
+    },
+    {
+      regionName: 'Tamaulipas',
+      regionShort: 'Tamps.',
+      regionSlug: 'Tamaulipas',
+      weight: 33,
+      cities: ['Reynosa', 'Matamoros', 'Nuevo Laredo', 'Tampico', 'Ciudad Victoria', 'Ciudad Madero']
+    },
+    {
+      regionName: 'Baja California',
+      regionShort: 'B.C.',
+      regionSlug: 'baja_california',
+      weight: 32,
+      cities: ['Tijuana', 'Mexicali', 'Ensenada', 'La Paz']
+    },
+    {
+      regionName: 'Sinaloa',
+      regionShort: 'Sin.',
+      regionSlug: 'sinaloa',
+      weight: 28,
+      cities: ['Culiacán', 'Mazatlán', 'Los Mochis']
+    },
+    {
+      regionName: 'Coahuila',
+      regionShort: 'Coah.',
+      regionSlug: 'coahuila',
+      weight: 27,
+      cities: ['Saltillo', 'Torreón', 'Monclova', 'Piedras Negras', 'Acuña']
+    },
+    {
+      regionName: 'Hidalgo',
+      regionShort: 'Hgo.',
+      regionSlug: 'Hidalgo',
+      weight: 27,
+      cities: ['Pachuca']
+    },
+    {
+      regionName: 'Sonora',
+      regionShort: 'Son.',
+      regionSlug: 'Sonora',
+      weight: 27,
+      cities: ['Hermosillo', 'Ciudad Obregón', 'Nogales', 'San Luis Río Colorado', 'Navojoa', 'Guaymas']
+    },
+    {
+      regionName: 'San Luis Potosí',
+      regionShort: 'S.L.P.',
+      regionSlug: 'San Luis Potosí',
+      weight: 26,
+      cities: ['San Luis Potosí', 'Soledad de Graciano Sánchez', 'Ciudad Valles']
+    },
+    {
+      regionName: 'Tabasco',
+      regionShort: 'Tab.',
+      regionSlug: 'Tabasco',
+      weight: 22,
+      cities: ['Villahermosa']
+    },
+    {
+      regionName: 'Yucatán',
+      regionShort: 'Yuc.',
+      regionSlug: 'Yucatán',
+      weight: 20,
+      cities: ['Mérida']
+    },
+    {
+      regionName: 'Querétaro',
+      regionShort: 'Qro.',
+      regionSlug: 'Querétaro',
+      weight: 18,
+      cities: ['Querétaro', 'San Juan del Río']
+    },
+    {
+      regionName: 'Morelos',
+      regionShort: 'Mor.',
+      regionSlug: 'Morelos',
+      weight: 18,
+      cities: ['Cuernavaca', 'Jiutepec', 'Cuautla']
+    }
+  ]
+});
+
+export default Mexico;
diff --git a/packages/plugins/src/countries/Mexico/i18n/ar.json b/packages/plugins/src/countries/Mexico/i18n/ar.json
new file mode 100644
index 000000000..c2312e83a
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "المكسيك",
+  "regionNames": "الولايات المكسيكية"
+}
diff --git a/packages/plugins/src/countries/Mexico/i18n/de.json b/packages/plugins/src/countries/Mexico/i18n/de.json
new file mode 100644
index 000000000..6eb7f04d2
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Mexiko",
+  "regionNames": "Mexikanische Staaten"
+}
diff --git a/packages/plugins/src/countries/Mexico/i18n/en.json b/packages/plugins/src/countries/Mexico/i18n/en.json
new file mode 100644
index 000000000..15c1831db
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Mexico",
+  "regionNames": "Mexican States"
+}
diff --git a/packages/plugins/src/countries/Mexico/i18n/es.json b/packages/plugins/src/countries/Mexico/i18n/es.json
new file mode 100644
index 000000000..156e23a8f
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "México",
+  "regionNames": "Estados Mexicanos"
+}
diff --git a/packages/plugins/src/countries/Mexico/i18n/fr.json b/packages/plugins/src/countries/Mexico/i18n/fr.json
new file mode 100644
index 000000000..6049f805b
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Mexique",
+  "regionNames": "États mexicains"
+}
diff --git a/packages/plugins/src/countries/Mexico/i18n/hi.json b/packages/plugins/src/countries/Mexico/i18n/hi.json
new file mode 100644
index 000000000..e81d0e5f3
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "मेक्सिको",
+  "regionNames": "मैक्सिकन राज्य"
+}
diff --git a/packages/plugins/src/countries/Mexico/i18n/ja.json b/packages/plugins/src/countries/Mexico/i18n/ja.json
new file mode 100644
index 000000000..3bb1b92b3
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "メキシコ",
+  "regionNames": "メキシコ諸州"
+}
diff --git a/packages/plugins/src/countries/Mexico/i18n/nl.json b/packages/plugins/src/countries/Mexico/i18n/nl.json
new file mode 100644
index 000000000..14f14e8b4
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Mexico",
+  "regionNames": "Mexicaanse staten"
+}
diff --git a/packages/plugins/src/countries/Mexico/i18n/pt.json b/packages/plugins/src/countries/Mexico/i18n/pt.json
new file mode 100644
index 000000000..d55ca840b
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "México",
+  "regionNames": "Estados mexicanos"
+}
diff --git a/packages/plugins/src/countries/Mexico/i18n/ru.json b/packages/plugins/src/countries/Mexico/i18n/ru.json
new file mode 100644
index 000000000..e54a3a10a
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Мексика",
+  "regionNames": "Мексиканские штаты"
+}
diff --git a/packages/plugins/src/countries/Mexico/i18n/ta.json b/packages/plugins/src/countries/Mexico/i18n/ta.json
new file mode 100644
index 000000000..159e328f2
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "மெக்சிகோ",
+  "regionNames": "மெக்சிகன் மாநிலங்கள்"
+}
diff --git a/packages/plugins/src/countries/Mexico/i18n/zh.json b/packages/plugins/src/countries/Mexico/i18n/zh.json
new file mode 100644
index 000000000..2d9e7814e
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "墨西哥",
+  "regionNames": "墨西哥各州"
+}
diff --git a/packages/plugins/src/countries/Mexico/name.ts b/packages/plugins/src/countries/Mexico/name.ts
new file mode 100644
index 000000000..ff84519c3
--- /dev/null
+++ b/packages/plugins/src/countries/Mexico/name.ts
@@ -0,0 +1,2225 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Sofia',
+  'Maria Jose',
+  'Valentina',
+  'Regina',
+  'Ximena',
+  'Camila',
+  'Maria Fernanda',
+  'Valeria',
+  'Renata',
+  'Victoria',
+  'Natalia',
+  'Daniela',
+  'Isabella',
+  'Romina',
+  'Maria Guadalupe',
+  'Fernanda',
+  'Alexa',
+  'Ana Sofia',
+  'Andrea',
+  'Samantha',
+  'Guadalupe',
+  'Melissa',
+  'Elizabeth',
+  'Mariana',
+  'Aitana',
+  'Yamileth',
+  'Fatima',
+  'Emily',
+  'Ana Victoria',
+  'Abigail',
+  'Alejandra',
+  'Julieta',
+  'Esmeralda',
+  'Vanessa',
+  'Evelyn',
+  'Estefania',
+  'Jimena',
+  'Ana Paula',
+  'Alondra',
+  'Luciana',
+  'Miranda',
+  'Maria',
+  'Dulce Maria',
+  'Kimberly',
+  'Aranza',
+  'Carolina',
+  'Monserrat',
+  'Danna Sofia',
+  'Ivanna',
+  'Lucia',
+  'Sofia Guadalupe',
+  'Paulina',
+  'Itzayana',
+  'Abril',
+  'Genesis',
+  'Frida Sofia',
+  'Ariana',
+  'Emma',
+  'Dayana',
+  'Sara',
+  'Ana Lucia',
+  'Gabriela',
+  'Melany',
+  'Samara',
+  'Elisa',
+  'Aylin',
+  'Mia',
+  'Allison',
+  'Michelle',
+  'Rebeca',
+  'Angela',
+  'Nicole',
+  'Elena',
+  'Diana',
+  'Zoe',
+  'Lia',
+  'Paola',
+  'Naomi',
+  'Adriana',
+  'Itzel',
+  'Emilia',
+  'Marisol',
+  'Alisson',
+  'Jennifer',
+  'Yaretzi',
+  'Lizbeth',
+  'Karla',
+  'Alexandra',
+  'Estrella',
+  'Jazmin',
+  'Luz Maria',
+  'Isabel',
+  'Mia Isabella',
+  'Alison',
+  'Maria Victoria',
+  'Melanie',
+  'Aurora',
+  'Lucero',
+  'Ximena Guadalupe',
+  'Arleth',
+  'Liliana',
+  'Maria Del Carmen',
+  'Ana Maria',
+  'Alexa Guadalupe',
+  'Katherine',
+  'Frida',
+  'Montserrat',
+  'Juana',
+  'Maria Isabel',
+  'Yoselin',
+  'Mia Valentina',
+  'Kenia',
+  'Paula',
+  'Mayte',
+  'Emma Sofia',
+  'Yareli',
+  'Danna Paola',
+  'Alicia',
+  'Mia Guadalupe',
+  'Catalina',
+  'Sarahi',
+  'Sofia Valentina',
+  'Margarita',
+  'Yamilet',
+  'Angelica',
+  'Victoria Guadalupe',
+  'Monserrath',
+  'Nahomi',
+  'Denisse',
+  'Ariadna',
+  'Rosa',
+  'Jade',
+  'Tania',
+  'Maria De Jesus',
+  'Julia',
+  'Camila Guadalupe',
+  'Emily Sofia',
+  'Evelin',
+  'Grecia',
+  'Ashley',
+  'Maria Alejandra',
+  'Barbara',
+  'Anahi',
+  'Cecilia',
+  'Nataly',
+  'Brenda',
+  'Antonella',
+  'Miriam',
+  'Ana Paola',
+  'Constanza',
+  'Violeta',
+  'Maria Elena',
+  'Mariel',
+  'Geraldine',
+  'Rosa Maria',
+  'Lia Victoria',
+  'Yazmin',
+  'Teresa',
+  'Regina Guadalupe',
+  'Amaya',
+  'Luisa Fernanda',
+  'Giselle',
+  'Ana Karen',
+  'Estefany',
+  'Monica',
+  'Lizeth',
+  'Danna',
+  'Valeria Guadalupe',
+  'Milagros',
+  'Aitana Guadalupe',
+  'Alexa Sofia',
+  'Hanna',
+  'Jessica',
+  'Lia Valentina',
+  'Cristina',
+  'Karina',
+  'Karla Sofia',
+  'Yuliana',
+  'Helena',
+  'Maria Paula',
+  'Veronica',
+  'Karen',
+  'Sarai',
+  'Mia Victoria',
+  'Isabela',
+  'Maria Regina',
+  'Noemi',
+  'Mia Sofia',
+  'Fabiola',
+  'Araceli',
+  'Alexia',
+  'Arely',
+  'Grettel',
+  'Yatziri',
+  'Maria Luisa',
+  'Cristal',
+  'Sofia Victoria',
+  'Andrea Guadalupe',
+  'Emily Guadalupe',
+  'Milagros Guadalupe',
+  'Sandra',
+  'Arantza',
+  'Scarlett',
+  'Melisa',
+  'Raquel',
+  'Daniela Guadalupe',
+  'Ariadne',
+  'Romina Guadalupe',
+  'Sofia Alejandra',
+  'Kailani',
+  'Wendy',
+  'Susana',
+  'Renata Guadalupe',
+  'Jaqueline',
+  'Maribel',
+  'Kimberly Guadalupe',
+  'Vanesa',
+  'Fatima Guadalupe',
+  'Esther',
+  'Berenice',
+  'Amanda',
+  'Esperanza',
+  'Itzel Guadalupe',
+  'Alessandra',
+  'Sophia',
+  'Maria Sofia',
+  'Mia Fernanda',
+  'Aitana Sofia',
+  'Keyla',
+  'Ana Laura',
+  'Patricia',
+  'Lesly',
+  'Vania',
+  'Leslie',
+  'Emma Victoria',
+  'Nayeli',
+  'Danae',
+  'Sofia Elizabeth',
+  'Melani',
+  'Amelia',
+  'Olivia',
+  'Martha',
+  'Erika',
+  'Ana Valeria',
+  'Zoe Valentina',
+  'Aitana Valentina',
+  'Maria Valentina',
+  'Lia Sofia',
+  'Mia Nicole',
+  'Sofia Isabella',
+  'Citlali',
+  'Mariela',
+  'Roxana',
+  'Ana',
+  'Jacqueline',
+  'Amairany',
+  'Maria Belen',
+  'Dariana',
+  'Marlen',
+  'Belen',
+  'Nathalia',
+  'Lia Fernanda',
+  'Sofia Yamileth',
+  'Valentina Guadalupe',
+  'Luz Elena',
+  'Fernanda Guadalupe',
+  'Maritza',
+  'Diana Sofia',
+  'Dania',
+  'Leticia',
+  'Laura',
+  'Paula Sofia',
+  'Francisca',
+  'Maria Del Rosario',
+  'Carmen',
+  'Dafne',
+  'Johana',
+  'Rubi',
+  'Maria Ines',
+  'Antonia',
+  'Yolanda',
+  'Amairani',
+  'Gloria',
+  'Danna Victoria',
+  'Katia',
+  'Luna',
+  'Perla',
+  'Natalia Guadalupe',
+  'Estrella Guadalupe',
+  'Yamileth Guadalupe',
+  'Sarah',
+  'Marina',
+  'Paloma',
+  'Maria De Los Angeles',
+  'Marian',
+  'Josefina',
+  'Leah',
+  'Camila Sofia',
+  'Claudia',
+  'Ivana',
+  'Maria Isabella',
+  'Hannia',
+  'Nancy',
+  'Keily',
+  'Leilani',
+  'Alexa Valentina',
+  'Lorena',
+  'Lia Isabella',
+  'Renata Valentina',
+  'Ines',
+  'Areli',
+  'Yaritza',
+  'Magaly',
+  'Evelyn Guadalupe',
+  'Magali',
+  'Damaris',
+  'Karla Guadalupe',
+  'Rocio',
+  'Galilea',
+  'Paulette',
+  'Karime',
+  'Maria Teresa',
+  'Yesenia',
+  'Melany Guadalupe',
+  'Fernanda Sofia',
+  'Angela Sofia',
+  'Eva',
+  'Joselin',
+  'Rosalinda',
+  'Dayana Guadalupe',
+  'Maite',
+  'Maricruz',
+  'Rosario',
+  'Alina',
+  'Marcela',
+  'Arlette',
+  'Kendra',
+  'Aylin Guadalupe',
+  'Celeste',
+  'Amayrani',
+  'Naomi Guadalupe',
+  'Judith',
+  'Pamela',
+  'Maria Renata',
+  'Alexa Nicole',
+  'Melina',
+  'Ana Fernanda',
+  'Ruth',
+  'Lia Guadalupe',
+  'Emma Valentina',
+  'Hanna Sofia',
+  'Rosa Isela',
+  'Arisbeth',
+  'Camila Yamileth',
+  'Tamara',
+  'Ana Brenda',
+  'Reyna',
+  'Briana',
+  'Edith',
+  'Luna Sofia',
+  'Sofia Fernanda',
+  'Luisa',
+  'Arlet',
+  'Xiomara',
+  'Marlene',
+  'Ana Luisa',
+  'Renata Sofia',
+  'Alexa Fernanda',
+  'Alexa Yamileth',
+  'Juliana',
+  'Beatriz',
+  'Silvia',
+  'Nicole Guadalupe',
+  'Janeth',
+  'Stephanie',
+  'Irene',
+  'Andrea Sofia',
+  'Alice',
+  'Angela Guadalupe',
+  'Zoe Guadalupe',
+  'Sofia Abigail',
+  'Sherlyn',
+  'Ana Cristina',
+  'Gianna',
+  'Manuela',
+  'Adilene',
+  'Samantha Guadalupe',
+  'Ximena Sofia',
+  'Nicol',
+  'Ana Regina',
+  'Mayra',
+  'Alejandra Guadalupe',
+  'Nathaly',
+  'Amaia',
+  'Dalia',
+  'Kenia Guadalupe',
+  'Jocelyn',
+  'Sofia Nicole',
+  'Arianna',
+  'Magdalena',
+  'Virginia',
+  'Lia Aitana',
+  'Joselyn',
+  'Cataleya',
+  'Anayeli',
+  'Lia Renata',
+  'Mia Yamileth',
+  'Maria Elizabeth',
+  'Samanta',
+  'Meredith',
+  'Hannah',
+  'Ana Camila',
+  'Daniela Sofia',
+  'Ingrid',
+  'Viridiana',
+  'Ana Guadalupe',
+  'Ainhoa',
+  'Carla',
+  'Mariana Guadalupe',
+  'Alexa Michelle',
+  'Aranza Guadalupe',
+  'Micaela',
+  'Brittany',
+  'Ivanna Sofia',
+  'Mila',
+  'Genesis Guadalupe',
+  'Griselda',
+  'Ailyn',
+  'Lucia Fernanda',
+  'Maricela',
+  'Mia Alejandra',
+  'Victoria Sofia',
+  'Danna Guadalupe',
+  'Maria Magdalena',
+  'Leilany',
+  'Victoria Elizabeth',
+  'Daleyza',
+  'Danna Valeria',
+  'Sofia Michelle',
+  'Estela',
+  'Diana Laura',
+  'Emily Valentina',
+  'Belinda',
+  'Mia Elizabeth',
+  'Michelle Guadalupe',
+  'Allison Guadalupe',
+  'Camila Zoe',
+  'Eliza',
+  'Alisson Guadalupe',
+  'Lia Romina',
+  'Ariana Guadalupe',
+  'Victoria Valentina',
+  'Roberta',
+  'Ana Gabriela',
+  'Maria Ximena',
+  'Jimena Guadalupe',
+  'Maria Emilia',
+  'Melanie Guadalupe',
+  'Emma Lucia',
+  'Angelina',
+  'Danna Michelle',
+  'Esmeralda Guadalupe',
+  'Julissa',
+  'Yuridia',
+  'Angeles',
+  'Victoria Alejandra',
+  'Amalia',
+  'Evelyn Sofia',
+  'Alison Guadalupe',
+  'Ana Isabel',
+  'Alondra Guadalupe',
+  'Martina',
+  'Maria De La Luz',
+  'Angela Victoria',
+  'Dulce Guadalupe',
+  'Ambar',
+  'Sara Sofia',
+  'Vianey',
+  'Priscila',
+  'Melissa Guadalupe',
+  'America',
+  'Sofia Isabel',
+  'Andrea Valentina',
+  'Georgina',
+  'Yulissa',
+  'Melany Sofia',
+  'Yaretzi Guadalupe',
+  'Estefani',
+  'Yadira',
+  'Mia Renata',
+  'Renata Isabella',
+  'Irma',
+  'Diana Guadalupe',
+  'Arleth Guadalupe',
+  'Brianna',
+  'Victoria Isabella',
+  'Regina Sofia',
+  'Lia Ximena',
+  'Ana Belen',
+  'Karla Daniela',
+  'Sofia Renata'
+];
+
+const maleNames = [
+  'Santiago',
+  'Mateo',
+  'Sebastian',
+  'Leonardo',
+  'Matias',
+  'Emiliano',
+  'Diego',
+  'Miguel Angel',
+  'Daniel',
+  'Alexander',
+  'Alejandro',
+  'Gael',
+  'Jesus',
+  'Angel',
+  'David',
+  'Luis Angel',
+  'Fernando',
+  'Emmanuel',
+  'Maximiliano',
+  'Jose Luis',
+  'Rodrigo',
+  'Eduardo',
+  'Jose Angel',
+  'Juan Pablo',
+  'Gabriel',
+  'Dylan',
+  'Juan Carlos',
+  'Tadeo',
+  'Axel',
+  'Rafael',
+  'Jose Manuel',
+  'Isaac',
+  'Alexis',
+  'Ricardo',
+  'Samuel',
+  'Iker',
+  'Jonathan',
+  'Leonel',
+  'Damian',
+  'Emilio',
+  'Alan',
+  'Francisco',
+  'Elias',
+  'Nicolas',
+  'Mauricio',
+  'Angel Gabriel',
+  'Cristian',
+  'Adrian',
+  'Carlos',
+  'Luis Fernando',
+  'Antonio',
+  'Javier',
+  'Josue',
+  'Jose Antonio',
+  'Jose Miguel',
+  'Miguel',
+  'Uriel',
+  'Aaron',
+  'Juan',
+  'Andres',
+  'Juan Diego',
+  'Julian',
+  'Manuel',
+  'Brayan',
+  'Pedro',
+  'Kevin',
+  'Abraham',
+  'Gerardo',
+  'Ismael',
+  'Ivan',
+  'Roberto',
+  'Jose Maria',
+  'Juan Jose',
+  'Liam',
+  'Erick',
+  'Jose',
+  'Ian',
+  'Jorge',
+  'Marco Antonio',
+  'Juan Manuel',
+  'Carlos Daniel',
+  'Arturo',
+  'Israel',
+  'Pablo',
+  'Alonso',
+  'Oscar',
+  'Oliver',
+  'Saul',
+  'Angel Mateo',
+  'Omar',
+  'Angel Daniel',
+  'Bruno',
+  'Angel Gael',
+  'Jesus Antonio',
+  'Brandon',
+  'Ian Mateo',
+  'Salvador',
+  'Martin',
+  'Hector',
+  'Gustavo',
+  'Francisco Javier',
+  'Julio Cesar',
+  'Alberto',
+  'Esteban',
+  'Raul',
+  'Sergio',
+  'Alfredo',
+  'Enrique',
+  'Cesar',
+  'Angel Tadeo',
+  'Jose Eduardo',
+  'Victor Manuel',
+  'Jesus Alejandro',
+  'Moises',
+  'Luis Antonio',
+  'Angel David',
+  'Ian Alexander',
+  'Ezequiel',
+  'Edwin',
+  'Christopher',
+  'Emanuel',
+  'Elian',
+  'Jesus Tadeo',
+  'Angel Santiago',
+  'Iker Gael',
+  'Thiago',
+  'Luis Alberto',
+  'Angel De Jesus',
+  'Jesus Daniel',
+  'Luis',
+  'Juan Antonio',
+  'Jose Daniel',
+  'Mario',
+  'Joshua',
+  'Jose De Jesus',
+  'Edgar',
+  'Fabian',
+  'Armando',
+  'Benjamin',
+  'Ian Santiago',
+  'Cristopher',
+  'Jose Guadalupe',
+  'Jesus Adrian',
+  'Jesus Eduardo',
+  'Jose Julian',
+  'Luis Enrique',
+  'Ian Gael',
+  'Luis Daniel',
+  'Dante',
+  'Jose Carlos',
+  'Ulises',
+  'Caleb',
+  'Isaias',
+  'Christian',
+  'Guillermo',
+  'Iker Alexander',
+  'Iker Santiago',
+  'Jorge Luis',
+  'Joel',
+  'Dilan',
+  'Dylan Gael',
+  'Jesus Manuel',
+  'Jose Alfredo',
+  'Jesus Alexander',
+  'Jesus Alberto',
+  'Angel Eduardo',
+  'Angel Jesus',
+  'Jose Emiliano',
+  'Patricio',
+  'Jesus Santiago',
+  'Jose Alberto',
+  'Marcos',
+  'Victor',
+  'Daniel Alejandro',
+  'Jesus Emmanuel',
+  'Ernesto',
+  'Axel Gael',
+  'Dylan Alexander',
+  'Dylan Mateo',
+  'Valentin',
+  'Iker Mateo',
+  'Yahir',
+  'Rogelio',
+  'Luis Eduardo',
+  'Ruben',
+  'Jose Alejandro',
+  'Misael',
+  'Zaid',
+  'Cristofer',
+  'Jesus Gael',
+  'Jose David',
+  'Andre',
+  'Abdiel',
+  'Jesus Mateo',
+  'Iker Daniel',
+  'Marcelo',
+  'Said',
+  'Jesus Emiliano',
+  'Yael',
+  'Agustin',
+  'Carlos Eduardo',
+  'Alex',
+  'Jose Mateo',
+  'Diego Alejandro',
+  'Ian Daniel',
+  'Luis David',
+  'Jose Armando',
+  'Jose Santiago',
+  'Hugo',
+  'Angel Uriel',
+  'Jose Francisco',
+  'Liam Mateo',
+  'Joaquin',
+  'Juan Daniel',
+  'Carlos Alberto',
+  'Franco',
+  'Liam Gael',
+  'Liam Santiago',
+  'Mariano',
+  'Adan',
+  'Emir',
+  'Dario',
+  'Alvaro',
+  'Alfonso',
+  'Jose Gael',
+  'Ian Tadeo',
+  'Jesus David',
+  'Ian Alejandro',
+  'Matias Alejandro',
+  'Maximo',
+  'Axel Mateo',
+  'Luis Santiago',
+  'Jacob',
+  'Diego Alexander',
+  'Adriel',
+  'Ian Jesus',
+  'Luis Mateo',
+  'Osvaldo',
+  'Liam Alexander',
+  'Jaime',
+  'Noe',
+  'Mateo Alexander',
+  'Jose Tadeo',
+  'Felipe',
+  'Angel Matias',
+  'Mateo Alejandro',
+  'Anthony',
+  'Jose Fernando',
+  'Luis Alejandro',
+  'Giovanni',
+  'Dylan Jesus',
+  'Abel',
+  'Gilberto',
+  'Axel Daniel',
+  'Efrain',
+  'Eithan',
+  'Luis Manuel',
+  'Juan Jesus',
+  'Aldo',
+  'Cristobal',
+  'Gael Alejandro',
+  'Gonzalo',
+  'Jared',
+  'Octavio',
+  'Dylan Tadeo',
+  'Isai',
+  'Angel Damian',
+  'Vicente',
+  'Leonardo Daniel',
+  'Dylan Santiago',
+  'Gael Alexander',
+  'Carlos Manuel',
+  'Carlos Santiago',
+  'Juan Angel',
+  'Iker Tadeo',
+  'Angel Manuel',
+  'David Alejandro',
+  'Juan David',
+  'Iker Alejandro',
+  'Jose Juan',
+  'Jaziel',
+  'Angel Antonio',
+  'Diego Armando',
+  'Johan',
+  'Lucas',
+  'Carlos Mateo',
+  'Yair',
+  'Orlando',
+  'Ariel',
+  'Mario Alberto',
+  'Carlos Gael',
+  'Erik',
+  'Santiago Gael',
+  'Daniel Alexander',
+  'Eliseo',
+  'Roman',
+  'Juan Luis',
+  'Dylan Alejandro',
+  'Jose Emmanuel',
+  'Luis Gerardo',
+  'Jose Pablo',
+  'Mathias',
+  'Jesus Gabriel',
+  'Alan Mateo',
+  'Iker Jesus',
+  'Erick Daniel',
+  'Jose Leonardo',
+  'Mateo De Jesus',
+  'Rodolfo',
+  'Jorge Alberto',
+  'Juan Francisco',
+  'Jose Alexander',
+  'Carlos Antonio',
+  'Irving',
+  'Julio',
+  'Angel Sebastian',
+  'Luis Gael',
+  'Ramiro',
+  'Ignacio',
+  'Angel Emmanuel',
+  'Jose Gabriel',
+  'Jesus Alexis',
+  'Axel Uriel',
+  'Angel Alexander',
+  'Liam Daniel',
+  'Carlos David',
+  'Jose Adrian',
+  'Santiago De Jesus',
+  'Jose Matias',
+  'William',
+  'Ethan',
+  'Axel Santiago',
+  'Victor Hugo',
+  'Alan Gael',
+  'Angel Adrian',
+  'Ian Eduardo',
+  'Luis Tadeo',
+  'Juan De Dios',
+  'Angel Emiliano',
+  'Humberto',
+  'Diego Gael',
+  'Axel Tadeo',
+  'Angel Leonardo',
+  'Mauro',
+  'Noah',
+  'Ramon',
+  'Angel Ivan',
+  'Erick Santiago',
+  'Bryan',
+  'Bernardo',
+  'Lorenzo',
+  'Manuel Alejandro',
+  'Ian Alexis',
+  'Luis Miguel',
+  'Jesus Guadalupe',
+  'Jose Emilio',
+  'Derek',
+  'Rigoberto',
+  'Tadeo De Jesus',
+  'Luis Carlos',
+  'Jesus Enrique',
+  'Jose Damian',
+  'Braulio',
+  'Eliel',
+  'Liam Alejandro',
+  'Evan',
+  'Tomas',
+  'Kevin Alexander',
+  'Carlos Adrian',
+  'Adolfo',
+  'Diego Alberto',
+  'Jesus Angel',
+  'Mateo Sebastian',
+  'Carlos Tadeo',
+  'German',
+  'Liam Tadeo',
+  'Jesus Ivan',
+  'Jose Enrique',
+  'Luciano',
+  'Dylan Alexis',
+  'Matias Alexander',
+  'Matias Emiliano',
+  'Matteo',
+  'Alan Daniel',
+  'Luis Adrian',
+  'Luis Alexander',
+  'Eleazar',
+  'Angel Yael',
+  'Axel Gabriel',
+  'Angel Alexis',
+  'Ian Emmanuel',
+  'Alan Jesus',
+  'Angel Alejandro',
+  'Ian Yael',
+  'Miguel Alejandro',
+  'Alan Santiago',
+  'Luis Felipe',
+  'Dylan Eduardo',
+  'Mateo Emiliano',
+  'Rene',
+  'Ian Emiliano',
+  'Luis Armando',
+  'Iker Antonio',
+  'Axel Jesus',
+  'Dariel',
+  'Cristian Gael',
+  'Iker Matias',
+  'Jose Roberto',
+  'Santiago Alexander',
+  'Jorge Antonio',
+  'Carlos Ivan',
+  'Jose Andres',
+  'Angel Alberto',
+  'Ian David',
+  'Carlos Damian',
+  'Eder',
+  'Diego Alonso',
+  'Jesus Miguel',
+  'Santiago Alejandro',
+  'Santiago Daniel',
+  'Leon',
+  'Axel Eduardo',
+  'Javier Alejandro',
+  'Iker Eduardo',
+  'Jorge Alejandro',
+  'Jesus Emanuel',
+  'Luca',
+  'Liam Jesus',
+  'Axel David',
+  'Gabriel Alejandro',
+  'Juan Alberto',
+  'Jesus Sebastian',
+  'Leonardo Gael',
+  'Rolando',
+  'David Alexander',
+  'Juan Mateo',
+  'Angel Isaac',
+  'Carlos Alejandro',
+  'Mateo Nicolas',
+  'Luis Mario',
+  'Diego Antonio',
+  'Roberto Carlos',
+  'Heriberto',
+  'Danilo',
+  'Erick Alexander',
+  'Angel Fernando',
+  'Jesus Alfredo',
+  'Ian Gabriel',
+  'Jesus Damian',
+  'Leandro',
+  'Damian Alejandro',
+  'Jesus Armando',
+  'Jesus Fernando',
+  'Juan Miguel',
+  'Angel Zaid',
+  'Carlos Enrique',
+  'Jose Martin',
+  'Jose Ricardo',
+  'Iker Damian',
+  'Camilo',
+  'Santiago Emmanuel',
+  'Jeremy',
+  'Angel Said',
+  'Victor Daniel',
+  'Cristian Daniel',
+  'Oscar Daniel',
+  'Iker Manuel',
+  'Iker Alexis',
+  'Angel Francisco',
+  'Ian Sebastian',
+  'Carlos Alexander',
+  'Dylan Daniel',
+  'Axel Yael',
+  'Jordan',
+  'Dilan Gael',
+  'Alan Eduardo',
+  'Angel Rafael',
+  'Dylan Antonio',
+  'Elian Gael',
+  'Isidro',
+  'Luis Gabriel',
+  'Angel Yahir',
+  'Jeronimo',
+  'Erick Gael',
+  'Alan Tadeo',
+  'Iker David',
+  'Azael',
+  'Gael Emiliano',
+  'Ian Fernando',
+  'Jose Ramon',
+  'Jose Javier',
+  'Liam Zaid',
+  'Pablo Emilio',
+  'Cesar Alejandro',
+  'Felipe De Jesus',
+  'Jonathan Gael',
+  'Leo',
+  'Jesus Abraham',
+  'Jose Ivan',
+  'Fidel',
+  'Oswaldo',
+  'Luis Javier',
+  'Felix',
+  'Tadeo Alejandro',
+  'Ramses',
+  'Reynaldo',
+  'Joan',
+  'Ian Zaid',
+  'Angel Leonel',
+  'Carlos Jesus',
+  'Henry',
+  'Lucio',
+  'Axel Ivan',
+  'Liam Sebastian',
+  'Alexis Gael',
+  'Matias Gael',
+  'Diego Emiliano',
+  'Jesus Matias',
+  'Jose Arturo',
+  'Jose Rafael',
+  'Luis Damian',
+  'Dylan Yael',
+  'Luis Alfredo',
+  'Dominic',
+  'Abimael',
+  'Cristian Alexander',
+  'Liam Eduardo',
+  'Manuel De Jesus',
+  'Diego Alexis',
+  'Jonathan Alexander',
+  'Carlos Gabriel',
+  'Ivan Alejandro',
+  'Victor Gael',
+  'Dilan Alexander',
+  'Guadalupe',
+  'Tadeo Alexander',
+  'Iker Yael',
+  'Kevin Gael',
+  'Luis Arturo',
+  'Marcelino',
+  'Aldair',
+  'Brayan Alexis',
+  'Ian Said',
+  'Javier Alexander',
+  'Angel Josue',
+  'Raymundo',
+  'Hector Manuel',
+  'Santiago Tadeo',
+  'Jose Sebastian',
+  'Alexis Mateo',
+  'Axel Damian',
+  'Iker Emiliano',
+  'Alexis Daniel',
+  'Ander',
+  'Jesus Leonardo',
+  'Ian Josue',
+  'Carlos Emiliano',
+  'Cristian Alexis',
+  'Erick Alejandro',
+  'Luis Emiliano',
+  'Nathan',
+  'Fredy',
+  'Hector Daniel',
+  'Jose Jesus',
+  'Jesus Francisco',
+  'Jose Elias',
+  'Alexis Tadeo',
+  'Gadiel',
+  'Gael Antonio',
+  'Matias Sebastian',
+  'Matias Santiago',
+  'Pedro Damian',
+  'Dilan Mateo',
+  'Hernan',
+  'Elian Mateo',
+  'Erick Mateo',
+  'Ian De Jesus',
+  'Jeremias',
+  'Axel Matias',
+  'Natanael',
+  'Jose Ignacio',
+  'Vladimir',
+  'Dylan Josue',
+  'Ian Alberto',
+  'Joseph',
+  'Angel Javier',
+  'Ian Leonardo',
+  'Ian Antonio',
+  'Alan David',
+  'Jose Rodrigo',
+  'Iker Emmanuel',
+  'Miguel Alexander',
+  'Cristian Alejandro',
+  'Everardo',
+  'David Santiago',
+  'Jonathan Alexis',
+  'Carlos Emilio',
+  'Cesar Gael',
+  'Iker Ivan',
+  'Uziel',
+  'Dylan De Jesus',
+  'Dylan Alberto',
+  'Iker Sebastian',
+  'Leonel Alejandro',
+  'Liam Emiliano',
+  'Diego Ivan',
+  'Axel Antonio',
+  'Ian Uriel',
+  'Karim',
+  'Iker Alberto',
+  'Edwin Gael',
+  'Iker Gabriel',
+  'Liam David',
+  'Mateo Gael',
+  'Eugenio',
+  'Leonardo David',
+  'Luis Francisco',
+  'Axel Emiliano',
+  'Diego Jesus',
+  'Carlos Alexis',
+  'Isaac Alejandro',
+  'Jesus Uriel',
+  'Noel',
+  'Matias Daniel',
+  'Francisco Gael',
+  'Jesus Rafael',
+  'Dylan Emmanuel',
+  'Santiago Nicolas',
+  'Angel Yair',
+  'Jorge Eduardo',
+  'Genaro',
+  'Jose Raul',
+  'Gregorio',
+  'Sebastian Alejandro',
+  'Ivan Alexander',
+  'Carlos Miguel',
+  'Logan',
+  'Omar Alejandro',
+  'Ian Manuel',
+  'Lian',
+  'Aurelio',
+  'Jesus Emilio',
+  'Renato',
+  'Jesus Andres',
+  'Cristian Jesus',
+  'Mateo Daniel',
+  'Brayan Alexander',
+  'Carlos Emmanuel',
+  'Gael Santiago',
+  'Luis Roberto',
+  'Kevin Daniel',
+  'Brian',
+  'Angel Guadalupe',
+  'Carlos Javier',
+  'Miguel Antonio',
+  'Benito',
+  'Iker Zaid',
+  'Jose Abraham',
+  'Jorge Daniel',
+  'Fabricio',
+  'Angel Miguel',
+  'Dilan Jesus',
+  'Esau',
+  'Kevin Alexis',
+  'Carlos Matias',
+  'Dorian',
+  'Luis Jesus',
+  'Matias Eduardo',
+  'Diego Emmanuel',
+  'Liam Gabriel',
+  'Iker Said',
+  'Edwin Alexander',
+  'Jesus Alonso',
+  'Mateo Santiago',
+  'Santiago Rafael',
+  'Ian Jose',
+  'Fernando Gael',
+  'Hector Gael',
+  'Edgar Gael',
+  'Ian Caleb',
+  'Dylan Gabriel',
+  'Ian Leonel',
+  'Luis Matias',
+  'Dylan Uriel',
+  'Cristian Mateo',
+  'Joshua Alexander',
+  'Oscar Gael',
+  'Dilan Tadeo',
+  'Liam Emmanuel',
+  'Osmar',
+  'Jairo',
+  'Juan Tadeo',
+  'Luis Emilio',
+  'Dylan Jose',
+  'Iker Fernando',
+  'Axel Yahir',
+  'Yoel',
+  'Axel Fernando',
+  'Yovani',
+  'Jesus Elias',
+  'Jesus Javier',
+  'Jorge Gael',
+  'Eric',
+  'Alan Gabriel',
+  'Cesar Daniel',
+  'Damian Alexander'
+];
+
+const lastNames = [
+  'Hernandez',
+  'Garcia',
+  'Martinez',
+  'Lopez',
+  'Gonzalez',
+  'Perez',
+  'Rodriguez',
+  'Sanchez',
+  'Ramirez',
+  'Cruz',
+  'Flores',
+  'Gomez',
+  'Morales',
+  'Vazquez',
+  'Jimenez',
+  'Reyes',
+  'Torres',
+  'Diaz',
+  'Gutierrez',
+  'Mendoza',
+  'Ruiz',
+  'Aguilar',
+  'Mendez',
+  'Ortiz',
+  'Moreno',
+  'Juarez',
+  'Castillo',
+  'Romero',
+  'Alvarez',
+  'Ramos',
+  'Rivera',
+  'Chavez',
+  'De La Cruz',
+  'Dominguez',
+  'Guzman',
+  'Velazquez',
+  'Santiago',
+  'Herrera',
+  'Vargas',
+  'Castro',
+  'Medina',
+  'Rojas',
+  'Muñoz',
+  'Luna',
+  'Bautista',
+  'Contreras',
+  'Salazar',
+  'Ortega',
+  'Guerrero',
+  'Estrada',
+  'Cortes',
+  'Alvarado',
+  'Soto',
+  'Espinoza',
+  'Lara',
+  'Avila',
+  'Carrillo',
+  'Cervantes',
+  'Rios',
+  'Santos',
+  'Silva',
+  'Delgado',
+  'Marquez',
+  'Vega',
+  'Mejia',
+  'Sandoval',
+  'Rosas',
+  'Leon',
+  'Solis',
+  'Ibarra',
+  'Nuñez',
+  'Valdez',
+  'Campos',
+  'Fernandez',
+  'Rosales',
+  'Camacho',
+  'Maldonado',
+  'Nava',
+  'Valencia',
+  'Miranda',
+  'Cabrera',
+  'Pacheco',
+  'Navarro',
+  'Acosta',
+  'Peña',
+  'Trejo',
+  'Antonio',
+  'Huerta',
+  'Molina',
+  'Castañeda',
+  'Rangel',
+  'Robles',
+  'De Jesus',
+  'Salas',
+  'Fuentes',
+  'Meza',
+  'Padilla',
+  'Zuñiga',
+  'Orozco',
+  'Ayala',
+  'Valenzuela',
+  'Aguirre',
+  'Cardenas',
+  'Serrano',
+  'Mora',
+  'Salinas',
+  'Tapia',
+  'Duran',
+  'Olvera',
+  'Macias',
+  'Espinosa',
+  'Arellano',
+  'Velasco',
+  'Ochoa',
+  'Zamora',
+  'Suarez',
+  'Marin',
+  'Alonso',
+  'Calderon',
+  'Arias',
+  'Gallegos',
+  'Vasquez',
+  'Barrera',
+  'Esquivel',
+  'Montes',
+  'Zavala',
+  'Villegas',
+  'Galvan',
+  'Villanueva',
+  'Lozano',
+  'Beltran',
+  'Franco',
+  'Andrade',
+  'Trujillo',
+  'Ponce',
+  'Sosa',
+  'Galindo',
+  'Figueroa',
+  'Palacios',
+  'Cortez',
+  'Pineda',
+  'Villa',
+  'Rocha',
+  'Corona',
+  'Osorio',
+  'Cano',
+  'Escobar',
+  'Carmona',
+  'Bernal',
+  'Rubio',
+  'Bravo',
+  'Benitez',
+  'Mata',
+  'Resendiz',
+  'Cordova',
+  'Cuevas',
+  'Enriquez',
+  'Tellez',
+  'De La Rosa',
+  'Montoya',
+  'Santiz',
+  'Rivas',
+  'Parra',
+  'Leyva',
+  'Francisco',
+  'Cisneros',
+  'Quintero',
+  'Quiroz',
+  'Tovar',
+  'Avalos',
+  'Esparza',
+  'Becerra',
+  'Zarate',
+  'Peralta',
+  'Roman',
+  'Salgado',
+  'Del Angel',
+  'Felix',
+  'Garza',
+  'Chan',
+  'Vera',
+  'Barajas',
+  'Arroyo',
+  'De Leon',
+  'Montiel',
+  'Guevara',
+  'Saucedo',
+  'Murillo',
+  'Olivares',
+  'Segura',
+  'Angeles',
+  'Solano',
+  'Ventura',
+  'Reyna',
+  'Gallardo',
+  'Santana',
+  'Lugo',
+  'Castellanos',
+  'Zapata',
+  'Villalobos',
+  'Paredes',
+  'Navarrete',
+  'Arriaga',
+  'Escobedo',
+  'Piña',
+  'Guillen',
+  'Mercado',
+  'Davila',
+  'Mondragon',
+  'Villarreal',
+  'Guerra',
+  'De Los Santos',
+  'Nieto',
+  'Barrios',
+  'Zepeda',
+  'Saldaña',
+  'Yañez',
+  'Leal',
+  'Barron',
+  'Granados',
+  'Magaña',
+  'Monroy',
+  'May',
+  'Palma',
+  'Balderas',
+  'Godinez',
+  'Bonilla',
+  'Acevedo',
+  'Medrano',
+  'Carrera',
+  'Islas',
+  'Caballero',
+  'Rico',
+  'Ojeda',
+  'Salvador',
+  'Gil',
+  'Galicia',
+  'Garduño',
+  'Coronado',
+  'Pech',
+  'Lorenzo',
+  'Alfaro',
+  'Najera',
+  'Uribe',
+  'Duarte',
+  'Gamez',
+  'Arredondo',
+  'Gaytan',
+  'Trinidad',
+  'Carranza',
+  'Carbajal',
+  'Amador',
+  'Escamilla',
+  'Aguilera',
+  'Sierra',
+  'Barragan',
+  'Melendez',
+  'Blanco',
+  'Vidal',
+  'Arenas',
+  'Arcos',
+  'Escalante',
+  'Baltazar',
+  'Correa',
+  'Renteria',
+  'Hurtado',
+  'Baez',
+  'Aparicio',
+  'Miguel',
+  'Ocampo',
+  'Tolentino',
+  'Galvez',
+  'Montalvo',
+  'Romo',
+  'Merino',
+  'Jaramillo',
+  'Alcantara',
+  'Armenta',
+  'Zaragoza',
+  'Gaspar',
+  'Santillan',
+  'Arreola',
+  'Roque',
+  'Colin',
+  'Lazaro',
+  'Carrasco',
+  'Anaya',
+  'Quezada',
+  'Soriano',
+  'Cordero',
+  'Venegas',
+  'Valadez',
+  'Aquino',
+  'Alarcon',
+  'Varela',
+  'Valle',
+  'Valdes',
+  'Roblero',
+  'Lira',
+  'Moran',
+  'Martin',
+  'Aranda',
+  'Rendon',
+  'Nicolas',
+  'Lucas',
+  'Canul',
+  'Luis',
+  'Hidalgo',
+  'Cazares',
+  'Aviles',
+  'Angel',
+  'Cardona',
+  'Altamirano',
+  'Segundo',
+  'Quintana',
+  'Mateo',
+  'Muñiz',
+  'Toledo',
+  'Sotelo',
+  'Ordoñez',
+  'Maya',
+  'Portillo',
+  'Bello',
+  'Saavedra',
+  'Matias',
+  'Arteaga',
+  'Limon',
+  'Barrientos',
+  'Mena',
+  'Pedraza',
+  'Cuellar',
+  'Casillas',
+  'Bustamante',
+  'Madrigal',
+  'Urbina',
+  'Paz',
+  'Ornelas',
+  'Prado',
+  'Ontiveros',
+  'Vicente',
+  'Anguiano',
+  'De La Torre',
+  'Covarrubias',
+  'Nolasco',
+  'Briones',
+  'Arce',
+  'Montejo',
+  'Fonseca',
+  'Bustos',
+  'Montero',
+  'Jaimes',
+  'Melchor',
+  'Delgadillo',
+  'Avendaño',
+  'Guadarrama',
+  'Rincon',
+  'Vallejo',
+  'Cedillo',
+  'Velez',
+  'Canche',
+  'Linares',
+  'Carreon',
+  'Zamudio',
+  'Poot',
+  'Millan',
+  'Frias',
+  'Becerril',
+  'Ceron',
+  'Puente',
+  'Neri',
+  'Jacobo',
+  'Aleman',
+  'Giron',
+  'Pulido',
+  'Mota',
+  'Negrete',
+  'Patiño',
+  'Bolaños',
+  'Robledo',
+  'Olguin',
+  'Reynoso',
+  'Pablo',
+  'Alejandro',
+  'Montaño',
+  'Cantu',
+  'Gamboa',
+  'Esteban',
+  'Jose',
+  'Alejo',
+  'Espino',
+  'Damian',
+  'Jasso',
+  'Garrido',
+  'Munguia',
+  'Araujo',
+  'Mireles',
+  'Felipe',
+  'Valdivia',
+  'Treviño',
+  'Olmos',
+  'Meneses',
+  'Casas',
+  'Pascual',
+  'Ledezma',
+  'Alcala',
+  'Rueda',
+  'Heredia',
+  'Badillo',
+  'Noriega',
+  'Dzul',
+  'Lemus',
+  'Serna',
+  'Angulo',
+  'Barraza',
+  'Vergara',
+  'Chavarria',
+  'Andres',
+  'Cerda',
+  'Juan',
+  'Gaona',
+  'Cadena',
+  'Marcial',
+  'Alcantar',
+  'Caamal',
+  'Aragon',
+  'Barcenas',
+  'Alanis',
+  'Nieves',
+  'Banda',
+  'Mares',
+  'Chi',
+  'Almaraz',
+  'Osuna',
+  'Tenorio',
+  'Chacon',
+  'Chable',
+  'Cornejo',
+  'Prieto',
+  'Ceballos',
+  'Camarillo',
+  'Adame',
+  'Diego',
+  'Tejeda',
+  'Ramon',
+  'Zacarias',
+  'Amaro',
+  'Amaya',
+  'Cota',
+  'Soria',
+  'Jeronimo',
+  'Ordaz',
+  'Bermudez',
+  'Uc',
+  'Roldan',
+  'Loera',
+  'Almanza',
+  'Hinojosa',
+  'Manuel',
+  'Arevalo',
+  'Valerio',
+  'Solorzano',
+  'Jaime',
+  'Alba',
+  'Cauich',
+  'Ceja',
+  'Pedroza',
+  'Elias',
+  'Velasquez',
+  'Landeros',
+  'Agustin',
+  'Olivas',
+  'Vilchis',
+  'Jacinto',
+  'Gabriel',
+  'Rojo',
+  'Mancilla',
+  'Clemente',
+  'Corral',
+  'Bañuelos',
+  'Zambrano',
+  'Manzano',
+  'Pantoja',
+  'Tinoco',
+  'Ku',
+  'Oliva',
+  'Lucio',
+  'Ruvalcaba',
+  'Servin',
+  'Estrella',
+  'Betancourt',
+  'Acuña',
+  'Saenz',
+  'Sarmiento',
+  'Vela',
+  'Razo',
+  'De Luna',
+  'Abarca',
+  'Sarabia',
+  'Sifuentes',
+  'Balam',
+  'Dorantes',
+  'Ledesma',
+  'Hilario',
+  'Ruelas',
+  'Fabian',
+  'Perales',
+  'Tomas',
+  'Marcos',
+  'Verdugo',
+  'Villaseñor',
+  'Landa',
+  'Aldana',
+  'Saldivar',
+  'Quiñones',
+  'Calixto',
+  'Tello',
+  'Alcaraz',
+  'Bustillos',
+  'Lizarraga',
+  'Dzib',
+  'Mosqueda',
+  'Niño',
+  'Tun',
+  'Segovia',
+  'Ascencio',
+  'Palafox',
+  'Gregorio',
+  'Lozada',
+  'Padron',
+  'Viveros',
+  'Camargo',
+  'Narvaez',
+  'Aceves',
+  'Teran',
+  'Oropeza',
+  'Paez',
+  'Cristobal',
+  'Ibañez',
+  'Marroquin',
+  'Peñaloza',
+  'Aguayo',
+  'Gastelum',
+  'Fierro',
+  'Carlos',
+  'Larios',
+  'Santoyo',
+  'Plascencia',
+  'Preciado',
+  'Armendariz',
+  'Barbosa',
+  'Ovando',
+  'Tamayo',
+  'Puc',
+  'Bahena',
+  'Meraz',
+  'Tirado',
+  'Ek',
+  'Naranjo',
+  'Pichardo',
+  'Bojorquez',
+  'Calvillo',
+  'Conde',
+  'Bernabe',
+  'De La Luz',
+  'Elizalde',
+  'Lomeli',
+  'Geronimo',
+  'Chaparro',
+  'Briseño',
+  'Brito',
+  'Pimentel',
+  'Regalado',
+  'Valentin',
+  'Bueno',
+  'Mendiola',
+  'Centeno',
+  'Bartolo',
+  'Perea',
+  'Izquierdo',
+  'Canales',
+  'Isidro',
+  'Colorado',
+  'Gordillo',
+  'Valles',
+  'Sebastian',
+  'Loredo',
+  'Salcedo',
+  'Victoria',
+  'Lima',
+  'Pool',
+  'Olivera',
+  'Olmedo',
+  'Blas',
+  'Coronel',
+  'Patricio',
+  'Feliciano',
+  'Arguello',
+  'Camarena',
+  'Burgos',
+  'Solorio',
+  'Dimas',
+  'Cayetano',
+  'Porras',
+  'Carrizales',
+  'Simon',
+  'Javier',
+  'Galaviz',
+  'Alegria',
+  'Corrales',
+  'Moo',
+  'Basilio',
+  'Alvaro',
+  'De Santiago',
+  'Oviedo',
+  'Garay',
+  'Onofre',
+  'Palomares',
+  'Garibay',
+  'Santamaria',
+  'Mandujano',
+  'Julian',
+  'Sepulveda',
+  'Madrid',
+  'Victoriano',
+  'Dueñas',
+  'Mateos',
+  'Ignacio',
+  'Rafael',
+  'Mayo',
+  'Pedro',
+  'Lucero',
+  'Mauricio',
+  'Rivero',
+  'Mariano',
+  'Farias',
+  'Manriquez',
+  'Cepeda',
+  'Curiel',
+  'Moctezuma',
+  'Almazan',
+  'Medel',
+  'Montes De Oca',
+  'Quiñonez',
+  'Ulloa',
+  'Jauregui',
+  'Alberto',
+  'Mendieta',
+  'Fajardo',
+  'Basurto',
+  'Sauceda',
+  'Quevedo',
+  'Lerma',
+  'Plata',
+  'Falcon',
+  'Loza',
+  'Aburto',
+  'Maciel',
+  'Zavaleta',
+  'Terrazas',
+  'Botello',
+  'Nevarez',
+  'Melo',
+  'Medellin',
+  'Zazueta',
+  'Puga',
+  'Cordoba',
+  'Araiza',
+  'Galeana',
+  'Moya',
+  'Valdovinos',
+  'Fragoso',
+  'Llamas',
+  'Hipolito',
+  'Noh',
+  'Olan',
+  'Baeza',
+  'Bocanegra',
+  'Ovalle',
+  'Orta',
+  'Marcelino',
+  'Lagunas',
+  'Villagomez',
+  'Carvajal',
+  'De Dios',
+  'Montelongo',
+  'Manzo',
+  'Gudiño',
+  'Lechuga',
+  'Benito',
+  'Castañon',
+  'Grimaldo',
+  'Albarran',
+  'Elizondo',
+  'Ferrer',
+  'Ake',
+  'Dolores',
+  'Ambrosio',
+  'Lezama',
+  'Mojica',
+  'Barba',
+  'Toribio',
+  'Arvizu',
+  'Palomo',
+  'Can',
+  'Gasca',
+  'Infante',
+  'Dionicio',
+  'Zurita',
+  'Calzada',
+  'Garnica',
+  'Paniagua',
+  'Sevilla',
+  'Zamarripa',
+  'Palomino',
+  'Alcocer',
+  'Ambriz',
+  'Laguna',
+  'Almeida',
+  'Salmeron',
+  'Partida',
+  'Amezcua',
+  'Cid',
+  'Benavides',
+  'Mariscal',
+  'Apolinar',
+  'Alva',
+  'San Juan',
+  'Lazcano',
+  'Alonzo',
+  'Ocaña',
+  'Luciano',
+  'Arana',
+  'Echeverria',
+  'Rosado',
+  'Velazco',
+  'Calvo',
+  'Celis',
+  'Canseco',
+  'Guadalupe',
+  'Galan',
+  'Castrejon',
+  'Davalos',
+  'Cornelio',
+  'Cardoso',
+  'Escalona',
+  'Ballesteros',
+  'Euan',
+  'O',
+  'Montañez',
+  'Arguelles',
+  'Catalan',
+  'Urias',
+  'Loya',
+  'Arzate',
+  'Villalba',
+  'Reza',
+  'Rizo',
+  'Zamorano',
+  'Laureano',
+  'Uicab',
+  'Blancas',
+  'Jurado',
+  'Pat',
+  'Murrieta',
+  'Gongora',
+  'Licona',
+  'De La O',
+  'Favela',
+  'Lujan',
+  'Higuera',
+  'Ugalde',
+  'Encarnacion',
+  'Gurrola',
+  'Moncada',
+  'Iñiguez',
+  'Cobos',
+  'Castelan',
+  'Tuz',
+  'Haro',
+  'Mayorga',
+  'Otero',
+  'Rascon',
+  'Aviña',
+  'Frausto',
+  'Bucio',
+  'Valladares',
+  'Calihua',
+  'Panzo',
+  'Silverio',
+  'Monsivais',
+  'Pastrana',
+  'Macedo',
+  'Evangelista',
+  'Chavira',
+  'Chuc',
+  'Piñon',
+  'Urbano',
+  'Pardo',
+  'Talavera',
+  'Monreal',
+  'Almaguer',
+  'Chino',
+  'Del Rio',
+  'Arizmendi',
+  'Alfonso',
+  'Buendia',
+  'Espindola',
+  'Carreño',
+  'Godoy',
+  'Colli',
+  'Villalpando',
+  'Vite',
+  'Enciso',
+  'Carballo',
+  'Carpio',
+  'Guajardo',
+  'Marmolejo',
+  'Ahumada',
+  'Serrato',
+  'Holguin',
+  'Cabello',
+  'Magdaleno',
+  'Jara',
+  'Silvestre',
+  'Celestino',
+  'Magallanes',
+  'Vieyra',
+  'Luevano',
+  'Obregon',
+  'Barranco',
+  'Albino',
+  'Temoxtle',
+  'Rosario',
+  'Posadas',
+  'Verduzco',
+  'Olivo',
+  'Caudillo',
+  'Zermeño',
+  'Casimiro',
+  'Domingo',
+  'Cancino',
+  'Hau',
+  'Guardado',
+  'Yam',
+  'Bruno',
+  'De Anda',
+  'Vaca',
+  'Velarde',
+  'Barboza',
+  'Valtierra',
+  'Balcazar',
+  'Govea',
+  'Garfias',
+  'De La Fuente',
+  'Puentes',
+  'Anastacio',
+  'Coria',
+  'Leija',
+  'Baca',
+  'Colunga',
+  'Cen',
+  'Vizcarra',
+  'Raya',
+  'Miramontes',
+  'Chairez',
+  'Candelario',
+  'Peraza',
+  'Pozos',
+  'Bedolla',
+  'Cavazos',
+  'Crisostomo',
+  'Salcido',
+  'Aguila',
+  'Duron',
+  'Marcelo',
+  'Lobato',
+  'Zenteno',
+  'Tinajero',
+  'Bernardino',
+  'Tadeo',
+  'Villeda',
+  'Guillermo',
+  'Bailon',
+  'Santes',
+  'Olea',
+  'Nuño',
+  'Avilez',
+  'Barreto',
+  'Sanabria',
+  'Del Valle',
+  'Bazan',
+  'Zetina',
+  'Arreguin',
+  'Bejarano',
+  'Casanova',
+  'Ambrocio',
+  'Mar',
+  'Merida',
+  'Parada',
+  'Caro',
+  'Manjarrez',
+  'Morelos',
+  'Patishtan',
+  'Grande',
+  'Zeferino',
+  'Hermosillo',
+  'Muro',
+  'Pelayo',
+  'Payan',
+  'Buenrostro',
+  'Gaxiola',
+  'Avelino',
+  'Gerardo',
+  'Lagunes',
+  'Pinto',
+  'Antunez',
+  'Callejas',
+  'Joaquin',
+  'Leos',
+  'Briceño',
+  'Yepez',
+  'Arrieta',
+  'Romano',
+  'Bobadilla',
+  'Couoh',
+  'Virgen',
+  'Alatorre',
+  'Landero',
+  'Valverde',
+  'Campuzano',
+  'Candia',
+  'Samano',
+  'Bastida',
+  'Cuautle',
+  'Venancio',
+  'Daniel',
+  'Rea',
+  'Samaniego',
+  'Alejandre',
+  'Aguillon',
+  'Constantino',
+  'Baños',
+  'Florentino',
+  'Crespo',
+  'Balbuena',
+  'Valente',
+  'Alamilla',
+  'Cocom',
+  'Caldera',
+  'Collazo',
+  'Noyola',
+  'Gatica',
+  'Jarquin',
+  'Justo',
+  'Chimal',
+  'Cabañas',
+  'Grijalva',
+  'Aguero',
+  'Orduña',
+  'Quijano',
+  'Gama',
+  'Quirino',
+  'Calva',
+  'Abad',
+  'Polanco',
+  'Tiburcio',
+  'Galarza',
+  'Paulino',
+  'Osornio',
+  'Huitron',
+  'Astorga',
+  'Toscano',
+  'Armas',
+  'Atilano',
+  'Zarco',
+  'Escudero',
+  'Amado',
+  'Calvario',
+  'Roa',
+  'Rodarte',
+  'Machuca',
+  'Escalera',
+  'Gayosso',
+  'Remigio',
+  'Cosme',
+  'Picazo',
+  'Quintanilla',
+  'Iglesias',
+  'Machado',
+  'Arciniega',
+  'Rebollar',
+  'Villavicencio',
+  'Borja',
+  'Celaya',
+  'Ascencion',
+  'Casarrubias',
+  'Alavez',
+  'Gracia',
+  'Pelaez',
+  'Garces'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/Netherlands/bundle.ts b/packages/plugins/src/countries/Netherlands/bundle.ts
new file mode 100644
index 000000000..f706ad47e
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/bundle.ts
@@ -0,0 +1,285 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Netherlands: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'netherlands',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxx LL'
+    },
+    phoneFormat: {
+      displayFormats: [
+        '0Xxx-xxxxxx',
+        '0Xx-xxxxxxx',
+        '06-Xxxxxxxxx',
+        '0Xxx xxxxxx',
+        '0Xx xxxxxxx',
+        '06 Xxxxxxxxx',
+        '+31 Xx xxxxxxx',
+        '+31 Xxx xxxxxx',
+        '+31 6 Xxxxxxxxx'
+      ]
+    }
+  },
+  regions: [
+    {
+      regionName: 'Drenthe',
+      regionShort: 'Dr',
+      regionSlug: 'drenthe',
+      weight: 5,
+      cities: ['Assen', 'Coevorden', 'Emmen', 'Hoogeveen', 'Meppel']
+    },
+    {
+      regionName: 'Flevoland',
+      regionShort: 'Fl',
+      regionSlug: 'flevoland',
+      weight: 1,
+      cities: ['Almere', 'Lelystad']
+    },
+    {
+      regionName: 'Friesland',
+      regionShort: 'Fr',
+      regionSlug: 'friesland',
+      weight: 6,
+      cities: [
+        'Bolsward',
+        'Dokkum',
+        'Drachten',
+        'Franeker',
+        'Harlingen',
+        'Heerenveen',
+        'Hindeloopen',
+        'IJlst',
+        'Leeuwarden',
+        'Sloten',
+        'Sneek',
+        'Stavoren',
+        'Workum'
+      ]
+    },
+    {
+      regionName: 'Gelderland',
+      regionShort: 'Gl',
+      regionSlug: 'gelderland',
+      weight: 20,
+      cities: [
+        'Apeldoorn',
+        'Arnhem',
+        'Buren',
+        'Culemborg',
+        'Doetinchem',
+        'Ede',
+        'Groenlo',
+        'Harderwijk',
+        'Hattem',
+        'Huissen',
+        'Nijkerk',
+        'Nijmegen',
+        'Tiel',
+        'Wageningen',
+        'Winterswijk',
+        'Zaltbommel',
+        'Zutphen'
+      ]
+    },
+    {
+      regionName: 'Limburg',
+      regionShort: 'L.',
+      regionSlug: 'limburg',
+      weight: 11,
+      cities: [
+        'Geleen',
+        'Heerlen',
+        'Kerkrade',
+        'Maastricht',
+        'Roermond',
+        'Sittard',
+        'Thorn',
+        'Valkenburg aan de Geul',
+        'Venlo',
+        'Weert',
+        'Hasselt',
+        'Sint-Lambrechts-Herk',
+        'Wimmertingen',
+        'Kermt',
+        'Spalbeek',
+        'Kuringen',
+        'Stokrooie',
+        'Stevoort',
+        'Zonhoven',
+        'Helchteren',
+        'Houthalen',
+        'Houthalen-Helchteren',
+        'Berbroek',
+        'Donk',
+        'Herk-de-Stad',
+        'Schulen',
+        'Halen',
+        'Loksbergen',
+        'Zelem',
+        'Heusden',
+        'Heusden-Zolder',
+        'Zolder',
+        'Linkhout',
+        'Lummen',
+        'Meldert',
+        'Alken',
+        'Beringen',
+        'Beverlo',
+        'Koersel',
+        'Paal',
+        'Diepenbeek',
+        'Genk',
+        'Gellik',
+        'Lanaken',
+        'Neerharen',
+        'Veldwezelt',
+        'Rekem',
+        'Eisden',
+        'Leut',
+        'Maasmechelen',
+        'Mechelen-aan-de-Maas',
+        'Meeswijk',
+        'Opgrimbie',
+        'Vucht',
+        'Boorsem',
+        'Uikhoven',
+        'Kessenich',
+        'Kinrooi',
+        'Molenbeersel',
+        'Ophoven',
+        'Dilsen-Stokkem',
+        'Elen',
+        'Lanklaar',
+        'Rotem',
+        'Stokkem',
+        'Opglabbeek',
+        'As',
+        'Niel-bij-As',
+        'Ellikom',
+        'Gruitrode',
+        'Meeuwen',
+        'Meeuwen-Gruitrode',
+        'Neerglabbeek',
+        'Wijshagen',
+        'Maaseik',
+        'Neeroeteren',
+        'Opoeteren',
+        'Zutendaal',
+        'Berg',
+        'Diets-Heur',
+        'Haren',
+        'Henis',
+        'Kolmont',
+        'Koninksem',
+        'Lauw',
+        'Mal',
+        'Neerrepen',
+        'Nerem',
+        'Overrepen',
+        'Piringen',
+        'Riksingen',
+        'Rutten',
+        's Herenelderen',
+        'Sluizen',
+        'Tongeren',
+        'Vreren',
+        'Widooie',
+        'Herstappe',
+        'Kortessem',
+        'Vliermaalroot'
+      ]
+    },
+    {
+      regionName: 'Noord Brabant',
+      regionShort: 'N.',
+      regionSlug: 'noord_brabant',
+      weight: 24,
+      cities: [
+        'Bergen op Zoom',
+        'Breda',
+        'Eindhoven',
+        'Geertruidenberg',
+        'Grave',
+        'Helmond',
+        'Heusden',
+        'Oosterhout',
+        'Oss',
+        'Ravenstein',
+        'Roosendaal',
+        'Tilburg',
+        'Waalwijk'
+      ]
+    },
+    {
+      regionName: 'Noord Holland',
+      regionShort: 'N.',
+      regionSlug: 'noord_holland',
+      weight: 26,
+      cities: [
+        'Alkmaar',
+        'Amstelveen',
+        'Amsterdam',
+        'Den Helder',
+        'Edam',
+        'Enkhuizen',
+        'Haarlem',
+        'Heerhugowaard',
+        'Hilversum',
+        'Hoofddorp',
+        'Hoorn',
+        'Laren',
+        'Purmerend',
+        'Medemblik',
+        'Muiden',
+        'Naarden',
+        'Schagen',
+        'Weesp',
+        'Zaanstad'
+      ]
+    },
+    {
+      regionName: 'Overijssel',
+      regionShort: 'Ov',
+      regionSlug: 'overijssel',
+      weight: 11,
+      cities: ['Almelo', 'Deventer', 'Enschede', 'Hengelo', 'Oldenzaal', 'Zwolle']
+    },
+    {
+      regionName: 'Zuid Holland',
+      regionShort: 'Z.',
+      regionSlug: 'zuid_holland',
+      weight: 12,
+      cities: [
+        'Alphen aan den Rijn',
+        'Delft',
+        'Dordrecht',
+        'Gorinchem',
+        'Gouda',
+        'Leiden',
+        'Rotterdam',
+        'Spijkenisse',
+        'The Hague',
+        'Zoetermeer'
+      ]
+    },
+    {
+      regionName: 'Utrecht',
+      regionShort: 'U.',
+      regionSlug: 'utrecht',
+      weight: 4,
+      cities: ['Amersfoort', 'Leersum', 'Nieuwegein', 'Utrecht', 'Veenendaal', 'Woerden', 'Zeist']
+    },
+    {
+      regionName: 'Zeeland',
+      regionShort: 'Zl',
+      regionSlug: 'zeeland',
+      weight: 35,
+      cities: ['Flushing', 'Goes', 'Hulst', 'Middelburg', 'Sluis', 'Terneuzen', 'Veere', 'Zierikzee']
+    }
+  ]
+});
+
+export default Netherlands;
diff --git a/packages/plugins/src/countries/Netherlands/i18n/ar.json b/packages/plugins/src/countries/Netherlands/i18n/ar.json
new file mode 100644
index 000000000..3fe464b89
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "هولندا",
+  "regionNames": "مقاطعات هولندا"
+}
diff --git a/packages/plugins/src/countries/Netherlands/i18n/de.json b/packages/plugins/src/countries/Netherlands/i18n/de.json
new file mode 100644
index 000000000..9f5e15ee6
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Niederlande",
+  "regionNames": "Niederländische Provinzen"
+}
diff --git a/packages/plugins/src/countries/Netherlands/i18n/en.json b/packages/plugins/src/countries/Netherlands/i18n/en.json
new file mode 100644
index 000000000..9510ffbc3
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Netherlands",
+  "regionNames": "Netherlands Prov."
+}
diff --git a/packages/plugins/src/countries/Netherlands/i18n/es.json b/packages/plugins/src/countries/Netherlands/i18n/es.json
new file mode 100644
index 000000000..bc5c788ad
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Países Bajos",
+  "regionNames": "Provincias holandesas"
+}
diff --git a/packages/plugins/src/countries/Netherlands/i18n/fr.json b/packages/plugins/src/countries/Netherlands/i18n/fr.json
new file mode 100644
index 000000000..80e19186a
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Pays-Bas",
+  "regionNames": "Provinces néerlandaises"
+}
diff --git a/packages/plugins/src/countries/Netherlands/i18n/hi.json b/packages/plugins/src/countries/Netherlands/i18n/hi.json
new file mode 100644
index 000000000..88d55efe4
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "नीदरलैंड",
+  "regionNames": "नीदरलैंड प्रो."
+}
diff --git a/packages/plugins/src/countries/Netherlands/i18n/ja.json b/packages/plugins/src/countries/Netherlands/i18n/ja.json
new file mode 100644
index 000000000..4e0df3101
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "オランダ",
+  "regionNames": "オランダの州"
+}
diff --git a/packages/plugins/src/countries/Netherlands/i18n/nl.json b/packages/plugins/src/countries/Netherlands/i18n/nl.json
new file mode 100644
index 000000000..b7d70a0fe
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Nederland",
+  "regionNames": "Nederlandse provincies"
+}
diff --git a/packages/plugins/src/countries/Netherlands/i18n/pt.json b/packages/plugins/src/countries/Netherlands/i18n/pt.json
new file mode 100644
index 000000000..6ea3549b5
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Holanda",
+  "regionNames": "Províncias da Holanda"
+}
diff --git a/packages/plugins/src/countries/Netherlands/i18n/ru.json b/packages/plugins/src/countries/Netherlands/i18n/ru.json
new file mode 100644
index 000000000..7892759ee
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Нидерланды",
+  "regionNames": "Нидерланды пров."
+}
diff --git a/packages/plugins/src/countries/Netherlands/i18n/ta.json b/packages/plugins/src/countries/Netherlands/i18n/ta.json
new file mode 100644
index 000000000..248d29b00
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "நெதர்லாந்து",
+  "regionNames": "நெதர்லாந்து மாகாணங்கள்"
+}
diff --git a/packages/plugins/src/countries/Netherlands/i18n/zh.json b/packages/plugins/src/countries/Netherlands/i18n/zh.json
new file mode 100644
index 000000000..f1baebf26
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "荷兰",
+  "regionNames": "荷兰省份"
+}
diff --git a/packages/plugins/src/countries/Netherlands/names.ts b/packages/plugins/src/countries/Netherlands/names.ts
new file mode 100644
index 000000000..3a6462c66
--- /dev/null
+++ b/packages/plugins/src/countries/Netherlands/names.ts
@@ -0,0 +1,618 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Lara',
+  'Aaltje',
+  'Saar',
+  'Tess',
+  'Iris',
+  'Anne',
+  'Eline',
+  'Elisabeth',
+  'Nora',
+  'Jill',
+  'Fleur',
+  'Anne',
+  'Jannetje',
+  'Iris',
+  'Laura',
+  'Lily',
+  'Romy',
+  'Noëlle',
+  'Yara',
+  'Tessa',
+  'Lina',
+  'Amira',
+  'Kaylee',
+  'Amy',
+  'Isabella',
+  'Indy',
+  'Isabel',
+  'Elijah',
+  'Anouk',
+  'Dewi',
+  'Roos',
+  'Sophia',
+  'Quinty',
+  'Jamie',
+  'Lotte',
+  'Hailey',
+  'Evi',
+  'Dewi',
+  'Elin',
+  'Loïs',
+  'Olivia',
+  'Elin',
+  'Jasmijn',
+  'Feline',
+  'Sanne',
+  'Lisa',
+  'Eline',
+  'Sem',
+  'Lana',
+  'Amira',
+  'Dani',
+  'Ashley',
+  'Isabella',
+  'Lina',
+  'Samuel',
+  'Luna',
+  'Marretje',
+  'Alyssa',
+  'Emma',
+  'Johanna',
+  'Floor',
+  'Aaltje',
+  'Ashley',
+  'Emily',
+  'Lily',
+  'Elise',
+  'Sofia',
+  'Fleur',
+  'Zoë',
+  'Evi',
+  'Faye',
+  'Jannetje',
+  'Lynn',
+  'Charlotte',
+  'Anna',
+  'Megan',
+  'Jaylinn',
+  'Mason',
+  'Nikki',
+  'Julia',
+  'Johanna',
+  'Floor',
+  'Alyssa',
+  'Isa',
+  'Elise',
+  'Lizzy',
+  'Jaylinn',
+  'Indy',
+  'Fenna',
+  'Femke',
+  'Luna',
+  'Lotte',
+  'Marit',
+  'Demi',
+  'Esmee',
+  'Elena',
+  'Norah',
+  'Isabel',
+  'Vera',
+  'Lana',
+  'Lieke',
+  'Naomi',
+  'Elisa',
+  'Rosalie',
+  'Demi',
+  'Esmee',
+  'Elena',
+  'Amber',
+  'Nina',
+  'Liv',
+  'Elisabeth',
+  'Kaylee',
+  'Jamie',
+  'Charlotte',
+  'Feline',
+  'Senna',
+  'Noa',
+  'Maria',
+  'Laura',
+  'Elisa',
+  'Nienke',
+  'Anouk',
+  'Sofie',
+  'Mila',
+  'Lieke',
+  'Amy',
+  'Eva',
+  'Liv',
+  'Jill',
+  'Faye',
+  'Elize',
+  'Julia',
+  'Loïs',
+  'Lynn',
+  'Sara',
+  'Nova',
+  'Jasmijn',
+  'Fay',
+  'Noor',
+  'Lara',
+  'Sterre',
+  'Eva',
+  'Hailey',
+  'Anna',
+  'Isa',
+  'Evy',
+  'Femke',
+  'Emma',
+  'Emily',
+  'Sophie',
+  'Elize',
+  'Fay',
+  'Lizzy',
+  'Fenna',
+  'Amber',
+  'Maud',
+  'Evy',
+  'Lisa',
+  'Milou',
+  'Sarah'
+];
+
+const maleNames = [
+  'Pieter',
+  'Damian',
+  'Sven',
+  'Floris',
+  'Timo',
+  'Jasper',
+  'Jay',
+  'David',
+  'Tim',
+  'Albert',
+  'Julian',
+  'Daan',
+  'Quinten',
+  'Nathan',
+  'Luuk',
+  'Mika',
+  'Luuk',
+  'Thijmen',
+  'Hugo',
+  'Elijah',
+  'Kyan',
+  'Julian',
+  'Jacob',
+  'Thijs',
+  'Aron',
+  'Jack',
+  'Benjamin',
+  'Liam',
+  'Robin',
+  'Jack',
+  'Niels',
+  'Ruben',
+  'Aiden',
+  'Daan',
+  'Daley',
+  'Dex',
+  'Dion',
+  'Adam',
+  'Quinn',
+  'Jacob',
+  'Rayan',
+  'Amir',
+  'Lucas',
+  'Finn',
+  'Max',
+  'Alexander',
+  'Justin',
+  'Tygo',
+  'Lars',
+  'Jelle',
+  'Johannes',
+  'Justin',
+  'Levi',
+  'Jayden',
+  'Dylan',
+  'Jan',
+  'Jesse',
+  'Jason',
+  'David',
+  'Noah',
+  'Gerrit',
+  'Stijn',
+  'Jason',
+  'Roan',
+  'Hendrik',
+  'Vince',
+  'Owen',
+  'Floris',
+  'Klaas',
+  'Alexander',
+  'Levi',
+  'Boaz',
+  'Dani',
+  'Aiden',
+  'Johannes',
+  'Jesse',
+  'Daniël',
+  'Riley',
+  'Bram',
+  'Damian',
+  'Cornelis',
+  'Jayson',
+  'Kyan',
+  'Jayden',
+  'Joey',
+  'Lucas',
+  'Hugo',
+  'Dean',
+  'Amir',
+  'Joey',
+  'Dex',
+  'Klaas',
+  'Joshua',
+  'Lars',
+  'Jelle',
+  'Daley',
+  'Wesley',
+  'Daniël',
+  'Dylan',
+  'Maarten',
+  'Boaz',
+  'Luca',
+  'Milan',
+  'Dean',
+  'Bram',
+  'Jasper',
+  'Cornelis',
+  'Mohammed',
+  'Luca',
+  'Liam',
+  'Hendrik',
+  'Jan',
+  'Aron',
+  'Gerrit',
+  'Thomas',
+  'Ryan',
+  'Finn',
+  'Sam',
+  'Bas',
+  'Willem',
+  'Jayson',
+  'Kyano',
+  'Joshua',
+  'Casper',
+  'Sander',
+  'Mohamed',
+  'Jens',
+  'Sami',
+  'Bas',
+  'Albert',
+  'Nick',
+  'Casper',
+  'Adam',
+  'Jens',
+  'Kyano',
+  'Shane',
+  'Benjamin',
+  'Jay',
+  'Dion',
+  'Mees'
+];
+
+const lastNames = [
+  'Aarts',
+  'van den Akker',
+  'Albers',
+  'Arends',
+  'Arts',
+  'Baars',
+  'Baas',
+  'Bakker',
+  'Beckers',
+  'van Beek',
+  'Berends',
+  'Berg',
+  'van den Berg',
+  'van der Berg',
+  'Bergsma',
+  'van Berkel',
+  'Bijl',
+  'Blok',
+  'Blom',
+  'de Boer',
+  'Boer',
+  'Boers',
+  'Boersma',
+  'Boom',
+  'Boon',
+  'Boonstra',
+  'Boot',
+  'Bos',
+  'Bosch',
+  'van den Bosch',
+  'van der Bosch',
+  'Bosma',
+  'Bosman',
+  'Bouma',
+  'Bouman',
+  'Bouwman',
+  'Bouwmeester',
+  'Brand',
+  'Brands',
+  'Brink',
+  'van den Brink',
+  'van der Brink',
+  'Brinkman',
+  'van der Broek',
+  'van den Broek',
+  'Brouwer',
+  'Brouwers',
+  'de Bruijn',
+  'de Bruin',
+  'Bruin',
+  'Bruinsma',
+  'Buijs',
+  'van der Burg',
+  'Burger',
+  'Coenen',
+  'Cornelissen',
+  'van Dalen',
+  'van Dam',
+  'Dam',
+  'Damen',
+  'Dekker',
+  'Dekkers',
+  'Derks',
+  'Derksen',
+  'van Dijk',
+  'Dijk',
+  'Dijkstra',
+  'van Dongen',
+  'van Doorn',
+  'van Driel',
+  'Driessen',
+  'Drost',
+  'van Eck',
+  'van Egmond',
+  'van Eijk',
+  'van Essen',
+  'Evers',
+  'Faber',
+  'Feenstra',
+  'Franken',
+  'Fransen',
+  'Franssen',
+  'Geerts',
+  'van Gelder',
+  'Gerrits',
+  'Gerritsen',
+  'Geurts',
+  'van Gils',
+  'Goossens',
+  'de Graaf',
+  'van der Graaf',
+  'de Graaff',
+  'Groen',
+  'Groeneveld',
+  'de Groot',
+  'Groot',
+  'de Haan',
+  'de Haas',
+  'Hartman',
+  'Heemskerk',
+  'van der Heide',
+  'van der Heijden',
+  'Hendriks',
+  'Hermans',
+  'van der Heuvel',
+  'van den Heuvel',
+  'Hoek',
+  'van dn Hoek',
+  'Hoekstra',
+  'van den Hoeven',
+  'Hof',
+  'Hofman',
+  'Hoogendoorn',
+  'Hoogeveen',
+  'van der Horst',
+  'Houben',
+  'Huisman',
+  'Jacobs',
+  'de Jager',
+  'Jager',
+  'Jansen',
+  'Janssen',
+  'de Jong',
+  'Jong',
+  'de Jonge',
+  'de Jongh',
+  'Jonker',
+  'Jonkers',
+  'Joosten',
+  'Kamp',
+  'Kamphuis',
+  'Keijzer',
+  'Keizer',
+  'van Kempen',
+  'Kersten',
+  'Klaassen',
+  'Klaver',
+  'Klein',
+  'Klomp',
+  'Knol',
+  'de Kok',
+  'Kok',
+  'van de Kolk',
+  'de Koning',
+  'Koning',
+  'Konings',
+  'Kooistra',
+  'Kool',
+  'Koopman',
+  'Koopmans',
+  'Koster',
+  'Kramer',
+  'Kroon',
+  'Kuijpers',
+  'Kuiper',
+  'Kuipers',
+  'van der Laan',
+  'Lamers',
+  'Lammers',
+  'de Lange',
+  'Leenders',
+  'de Leeuw',
+  'van Leeuwen',
+  'Lemmens',
+  'van Lieshout',
+  'van den Linde',
+  'van der Linden',
+  'van Loon',
+  'Maas',
+  'Martens',
+  'van der Meer',
+  'Meijer',
+  'Meijers',
+  'van der Meulen',
+  'Meyer',
+  'Mol',
+  'van der Molen',
+  'Molenaar',
+  'Mulder',
+  'Mulders',
+  'Muller',
+  'Nieuwenhuis',
+  'Nijenhuis',
+  'Nijhuis',
+  'Nijland',
+  'Otten',
+  'Peeters',
+  'Peters',
+  'Pieters',
+  'van der Plas',
+  'van der Ploeg',
+  'Pol',
+  'van den Pol',
+  'Post',
+  'Postma',
+  'Prins',
+  'Pronk',
+  'Reinders',
+  'de Ridder',
+  'Rietveld',
+  'van Rijn',
+  'Roelofs',
+  'de Rooij',
+  'van Rooij',
+  'van Rooijen',
+  'Roos',
+  'van Rossum',
+  'de Ruiter',
+  'Ruiter',
+  'Rutten',
+  'Sanders',
+  'Schaap',
+  'van Schaik',
+  'Schepers',
+  'Schipper',
+  'Schippers',
+  'Scholten',
+  'Schouten',
+  'Schreuder',
+  'Schreurs',
+  'Schut',
+  'Schutte',
+  'Schuurman',
+  'Simons',
+  'van de Sluis',
+  'Smeets',
+  'Smit',
+  'Smits',
+  'Smulders',
+  'Snijders',
+  'Stam',
+  'van den Steen',
+  'Steenbergen',
+  'Stevens',
+  'Stolk',
+  'Swart',
+  'Terpstra',
+  'Teunissen',
+  'Theunissen',
+  'Thijssen',
+  'Timmer',
+  'Timmerman',
+  'Timmermans',
+  'Tromp',
+  'Valk',
+  'van Veen',
+  'Veen',
+  'van der Veen',
+  'Veenstra',
+  'van der Veer',
+  'van der Velde',
+  'van der Velden',
+  'Veldhuis',
+  'Veldman',
+  'van Velzen',
+  'van der Ven',
+  'van de Ven',
+  'Venema',
+  'Verbeek',
+  'Verhagen',
+  'Verhoef',
+  'Verhoeven',
+  'Vermeer',
+  'Vermeulen',
+  'Verschoor',
+  'Versteeg',
+  'Verweij',
+  'Vink',
+  'Vis',
+  'Visscher',
+  'de Visser',
+  'Visser',
+  'Vissers',
+  'van Vliet',
+  'Vonk',
+  'de Vos',
+  'Vos',
+  'de Vries',
+  'Vries',
+  'van Vugt',
+  'de Waal',
+  'Wagenaar',
+  'van der Wal',
+  'van den Werf',
+  'Wessels',
+  'Wiersma',
+  'van Wijk',
+  'Wijnen',
+  'de Wilde',
+  'Willems',
+  'Willemse',
+  'Willemsen',
+  'de Winter',
+  'de Wit',
+  'Wolters',
+  'Wouters',
+  'van Zanten',
+  'van der Zee',
+  'Zijlstra',
+  'Zwart'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/NewZealand/bundle.ts b/packages/plugins/src/countries/NewZealand/bundle.ts
new file mode 100644
index 000000000..4d312d2e7
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/bundle.ts
@@ -0,0 +1,95 @@
+/**
+ * @package Countries
+ */
+import { GetCountryData } from '@generatedata/types';
+
+const NewZealand: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'newzealand',
+  regionNames: i18n.regionNames,
+  continent: 'oceania',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxx'
+    }
+  },
+  regions: [
+    {
+      regionName: 'North Island',
+      regionShort: 'NI',
+      regionSlug: 'north_island',
+      weight: 3,
+      cities: [
+        'Auckland',
+        'Manukau',
+        'North Shore',
+        'Waitakere',
+        'Wellington',
+        'Hamilton',
+        'Tauranga',
+        'Lower Hutt',
+        'Palmerston North',
+        'Hastings',
+        'Napier',
+        'Rotorua',
+        'New Plymouth',
+        'Whangarei',
+        'Porirua',
+        'Wanganui',
+        'Kapiti',
+        'Upper Hutt',
+        'Gisborne',
+        'Pukekohe',
+        'Taupo',
+        'Masterton',
+        'Levin',
+        'Whakatane',
+        'Cambridge',
+        'Te Awamutu',
+        'Feilding',
+        'Tokoroa',
+        'Hawera',
+        'Waiuku',
+        'Waiheke Island',
+        'Te Puke',
+        'Kawerau',
+        'Huntly',
+        'Thames',
+        'Morrinsville',
+        'Matamata',
+        'Waitara',
+        'Kerikeri',
+        'Dannevirke'
+      ]
+    },
+    {
+      regionName: 'South Island',
+      regionShort: 'SI',
+      regionSlug: 'south_island',
+      weight: 1,
+      cities: [
+        'Christchurch',
+        'Dunedin',
+        'Nelson',
+        'Invercargill',
+        'Blenheim',
+        'Timaru',
+        'Ashburton',
+        'Oamaru',
+        'Rangiora',
+        'Queenstown',
+        'Greymouth',
+        'Gore',
+        'Motueka',
+        'Wanaka',
+        'Alexandra',
+        'Picton',
+        'Balclutha',
+        'Temuka',
+        'Westport'
+      ]
+    }
+  ]
+});
+
+export default NewZealand;
diff --git a/packages/plugins/src/countries/NewZealand/i18n/ar.json b/packages/plugins/src/countries/NewZealand/i18n/ar.json
new file mode 100644
index 000000000..84bcbc7eb
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "نيوزيلندا",
+  "regionNames": "مناطق نيوزيلندا"
+}
diff --git a/packages/plugins/src/countries/NewZealand/i18n/de.json b/packages/plugins/src/countries/NewZealand/i18n/de.json
new file mode 100644
index 000000000..8f8d09564
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Neuseeland",
+  "regionNames": "Regionen Neuseelands"
+}
diff --git a/packages/plugins/src/countries/NewZealand/i18n/en.json b/packages/plugins/src/countries/NewZealand/i18n/en.json
new file mode 100644
index 000000000..d91e47a0e
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "New Zealand",
+  "regionNames": "NZ Regions"
+}
diff --git a/packages/plugins/src/countries/NewZealand/i18n/es.json b/packages/plugins/src/countries/NewZealand/i18n/es.json
new file mode 100644
index 000000000..9fb18e311
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Nueva Zelanda",
+  "regionNames": "Regiones de Nueva Zelanda"
+}
diff --git a/packages/plugins/src/countries/NewZealand/i18n/fr.json b/packages/plugins/src/countries/NewZealand/i18n/fr.json
new file mode 100644
index 000000000..9a26a932b
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Nouvelle-Zélande",
+  "regionNames": "Régions de Nouvelle-Zélande"
+}
diff --git a/packages/plugins/src/countries/NewZealand/i18n/hi.json b/packages/plugins/src/countries/NewZealand/i18n/hi.json
new file mode 100644
index 000000000..b156c6458
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "न्यूजीलैंड",
+  "regionNames": "न्यूजीलैंड क्षेत्र"
+}
diff --git a/packages/plugins/src/countries/NewZealand/i18n/ja.json b/packages/plugins/src/countries/NewZealand/i18n/ja.json
new file mode 100644
index 000000000..afd514799
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ニュージーランド",
+  "regionNames": "ニュージーランドの地域"
+}
diff --git a/packages/plugins/src/countries/NewZealand/i18n/nl.json b/packages/plugins/src/countries/NewZealand/i18n/nl.json
new file mode 100644
index 000000000..73eb4824f
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Nieuw-Zeeland",
+  "regionNames": "Regio's in Nieuw-Zeeland"
+}
diff --git a/packages/plugins/src/countries/NewZealand/i18n/pt.json b/packages/plugins/src/countries/NewZealand/i18n/pt.json
new file mode 100644
index 000000000..3d5792a81
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Nova Zelândia",
+  "regionNames": "Regiões da NZ"
+}
diff --git a/packages/plugins/src/countries/NewZealand/i18n/ru.json b/packages/plugins/src/countries/NewZealand/i18n/ru.json
new file mode 100644
index 000000000..6e94b8275
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Новая Зеландия",
+  "regionNames": "Регионы Новой Зеландии"
+}
diff --git a/packages/plugins/src/countries/NewZealand/i18n/ta.json b/packages/plugins/src/countries/NewZealand/i18n/ta.json
new file mode 100644
index 000000000..51b919a74
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "நியூசிலாந்து",
+  "regionNames": "நியூசிலாந்து பிராந்தியங்கள்"
+}
diff --git a/packages/plugins/src/countries/NewZealand/i18n/zh.json b/packages/plugins/src/countries/NewZealand/i18n/zh.json
new file mode 100644
index 000000000..c2aead3bc
--- /dev/null
+++ b/packages/plugins/src/countries/NewZealand/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "新西兰",
+  "regionNames": "新西兰地区"
+}
diff --git a/packages/plugins/src/countries/Nigeria/bundle.ts b/packages/plugins/src/countries/Nigeria/bundle.ts
new file mode 100644
index 000000000..f5f5ba057
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/bundle.ts
@@ -0,0 +1,153 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Nigeria: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'nigeria',
+  regionNames: i18n.regionNames,
+  continent: 'africa',
+  extendedData: {
+    zipFormat: {
+      format: 'Xxxxxx'
+    },
+    phoneFormat: {
+      displayFormats: ['xxx xxxx']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Kano',
+      regionShort: 'KN',
+      regionSlug: 'kano',
+      weight: 94,
+      cities: ['Kano']
+    },
+    {
+      regionName: 'Lagos',
+      regionShort: 'LA',
+      regionSlug: 'lagos',
+      weight: 91,
+      cities: ['Lagos']
+    },
+    {
+      regionName: 'Kaduna',
+      regionShort: 'KD',
+      regionSlug: 'kaduna',
+      weight: 61,
+      cities: ['Kaduna', 'Zaria']
+    },
+    {
+      regionName: 'Katsina',
+      regionShort: 'KT',
+      regionSlug: 'katsina',
+      weight: 58,
+      cities: ['Katsina', 'Funtua']
+    },
+    {
+      regionName: 'Oyo',
+      regionShort: 'OY',
+      regionSlug: 'oyo',
+      weight: 56,
+      cities: ['Ibadan', 'Ogbomosho', 'Oyo', 'Iseyin', 'Shaki', 'Kisi', 'Igboho']
+    },
+    {
+      regionName: 'Rivers',
+      regionShort: 'RI',
+      regionSlug: 'rivers',
+      weight: 52,
+      cities: ['Port Harcourt', 'Buguma']
+    },
+    {
+      regionName: 'Bauchi',
+      regionShort: 'BA',
+      regionSlug: 'bauchi',
+      weight: 46,
+      cities: ['Bauchi']
+    },
+    {
+      regionName: 'Jigawa',
+      regionShort: 'JI',
+      regionSlug: 'jigawa',
+      weight: 43,
+      cities: ['Dutse']
+    },
+    {
+      regionName: 'Benue',
+      regionShort: 'BE',
+      regionSlug: 'benue',
+      weight: 42,
+      cities: ['Makurdi', 'Gboko', 'Otukpo']
+    },
+    {
+      regionName: 'Anambra',
+      regionShort: 'AN',
+      regionSlug: 'anambra',
+      weight: 42,
+      cities: ['Onitsha', 'Okpoko', 'Awka']
+    },
+    {
+      regionName: 'Borno',
+      regionShort: 'BO',
+      regionSlug: 'borno',
+      weight: 42,
+      cities: ['Maiduguri', 'Bama']
+    },
+    {
+      regionName: 'Delta',
+      regionShort: 'DE',
+      regionSlug: 'delta',
+      weight: 41,
+      cities: ['Warri', 'Sapele']
+    },
+    {
+      regionName: 'Niger',
+      regionShort: 'NI',
+      regionSlug: 'niger',
+      weight: 40,
+      cities: ['Minna', 'Bida']
+    },
+    {
+      regionName: 'Imo',
+      regionShort: 'IM',
+      regionSlug: 'imo',
+      weight: 39,
+      cities: ['Owerri', 'Okigwe']
+    },
+    {
+      regionName: 'Akwa Ibom',
+      regionShort: 'AK',
+      regionSlug: 'akwaibom',
+      weight: 39,
+      cities: ['Uyo', 'Ikot Ekpene']
+    },
+    {
+      regionName: 'Ogun',
+      regionShort: 'OG',
+      regionSlug: 'ogun',
+      weight: 38,
+      cities: ['Abeokuta', 'Sagamu', 'Ijebu Ode']
+    },
+    {
+      regionName: 'Sokoto',
+      regionShort: 'SO',
+      regionSlug: 'sokoto',
+      weight: 37,
+      cities: ['Sokoto']
+    },
+    {
+      regionName: 'Osun',
+      regionShort: 'OS',
+      regionSlug: 'osun',
+      weight: 34,
+      cities: ['Osogbo', 'Ife', 'Ilesa', 'Ila', 'Gbongan', 'Modakeke']
+    },
+    {
+      regionName: 'Kogi',
+      regionShort: 'KO',
+      regionSlug: 'kogi',
+      weight: 33,
+      cities: ['Okene']
+    }
+  ]
+});
+
+export default Nigeria;
diff --git a/packages/plugins/src/countries/Nigeria/i18n/ar.json b/packages/plugins/src/countries/Nigeria/i18n/ar.json
new file mode 100644
index 000000000..87dc6abb2
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "نيجيريا",
+  "regionNames": "الدول النيجيرية"
+}
diff --git a/packages/plugins/src/countries/Nigeria/i18n/de.json b/packages/plugins/src/countries/Nigeria/i18n/de.json
new file mode 100644
index 000000000..9ebed4ec5
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Nigeria",
+  "regionNames": "Nigerianische Staaten"
+}
diff --git a/packages/plugins/src/countries/Nigeria/i18n/en.json b/packages/plugins/src/countries/Nigeria/i18n/en.json
new file mode 100644
index 000000000..d52abbb5b
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Nigeria",
+  "regionNames": "Nigerian States"
+}
diff --git a/packages/plugins/src/countries/Nigeria/i18n/es.json b/packages/plugins/src/countries/Nigeria/i18n/es.json
new file mode 100644
index 000000000..36526aba0
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Nigeria",
+  "regionNames": "Estados de Nigeria"
+}
diff --git a/packages/plugins/src/countries/Nigeria/i18n/fr.json b/packages/plugins/src/countries/Nigeria/i18n/fr.json
new file mode 100644
index 000000000..e2037cfe6
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Nigeria",
+  "regionNames": "États nigérians"
+}
diff --git a/packages/plugins/src/countries/Nigeria/i18n/hi.json b/packages/plugins/src/countries/Nigeria/i18n/hi.json
new file mode 100644
index 000000000..44db8925c
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "नाइजीरिया",
+  "regionNames": "नाइजीरियाई राज्य"
+}
diff --git a/packages/plugins/src/countries/Nigeria/i18n/ja.json b/packages/plugins/src/countries/Nigeria/i18n/ja.json
new file mode 100644
index 000000000..209f68f80
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ナイジェリア",
+  "regionNames": "ナイジェリア諸国"
+}
diff --git a/packages/plugins/src/countries/Nigeria/i18n/nl.json b/packages/plugins/src/countries/Nigeria/i18n/nl.json
new file mode 100644
index 000000000..9c793d328
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Niger",
+  "regionNames": "Nigeriaanse staten"
+}
diff --git a/packages/plugins/src/countries/Nigeria/i18n/pt.json b/packages/plugins/src/countries/Nigeria/i18n/pt.json
new file mode 100644
index 000000000..7bde1bb9d
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Nigéria",
+  "regionNames": "Estados nigerianos"
+}
diff --git a/packages/plugins/src/countries/Nigeria/i18n/ru.json b/packages/plugins/src/countries/Nigeria/i18n/ru.json
new file mode 100644
index 000000000..2ae8d8f5a
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Нигерия",
+  "regionNames": "нигерийские штаты"
+}
diff --git a/packages/plugins/src/countries/Nigeria/i18n/ta.json b/packages/plugins/src/countries/Nigeria/i18n/ta.json
new file mode 100644
index 000000000..18e49ed09
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "நைஜீரியா",
+  "regionNames": "நைஜீரிய நாடுகள்"
+}
diff --git a/packages/plugins/src/countries/Nigeria/i18n/zh.json b/packages/plugins/src/countries/Nigeria/i18n/zh.json
new file mode 100644
index 000000000..c95c6630e
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "尼日利亚",
+  "regionNames": "尼日利亚各州"
+}
diff --git a/packages/plugins/src/countries/Nigeria/names.ts b/packages/plugins/src/countries/Nigeria/names.ts
new file mode 100644
index 000000000..505586f77
--- /dev/null
+++ b/packages/plugins/src/countries/Nigeria/names.ts
@@ -0,0 +1,192 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Abeni',
+  'Abiola',
+  'Adaeze',
+  'Adama',
+  'Adanna',
+  'Adaora',
+  'Adenike',
+  'Adeola',
+  'Ajah',
+  'Amara',
+  'Amma',
+  'Ashani',
+  'Chiamaka',
+  'Chidera',
+  'Chidinma',
+  'Chika',
+  'Chimamanda',
+  'Chinenye',
+  'Chinyere',
+  'Chioma',
+  'Chisom',
+  'Chizaram',
+  'Deola',
+  'Dera',
+  'Dola',
+  'Favour',
+  'Folasade',
+  'Fumi',
+  'Honour',
+  'Ifeoluwa',
+  'Ifeoma',
+  'Ijeoma',
+  'Ima',
+  'Kemi',
+  'Nene',
+  'Ngozi',
+  'Nneka',
+  'Nneoma',
+  'Ogechi',
+  'Ola',
+  'Olamide',
+  'Oluwadamilola',
+  'Oluwadarasimi',
+  'Oni',
+  'Oreoluwa',
+  'Osa',
+  'Ovie',
+  'Sade',
+  'Shade',
+  'Shakara',
+  'Sola',
+  'Stephenia',
+  'Tari',
+  'Timi',
+  'Toba',
+  'Tobi',
+  'Tomi',
+  'Tonna',
+  'Toye',
+  'Uchenna',
+  'Yetunde',
+  'Zelie'
+];
+
+const maleNames = [
+  'Abayomi',
+  'Adama',
+  'Ade',
+  'Adewale',
+  'Akin',
+  'Amadi',
+  'Atiba',
+  'Ayinde',
+  'Ayodeji',
+  'Ayodele',
+  'Ayomide',
+  'Babatunde',
+  'Chibueze',
+  'Chidi',
+  'Chidubem',
+  'Chigozie',
+  'Chike',
+  'Chima',
+  'Chinedu',
+  'Chukwudi',
+  'Chukwuemeka',
+  'Efe',
+  'Emeka',
+  'Geofrey',
+  'Ike',
+  'Ikechukwu',
+  'Ikenna',
+  'Juwon',
+  'Kayin',
+  'Kayode',
+  'Kelechi',
+  'Kenechukwu',
+  'Nnamdi',
+  'Obie',
+  'Obinna',
+  'Okey',
+  'Olajuwon',
+  'Olamide',
+  'Olufemi',
+  'Olumide',
+  'Oluwafemi',
+  'Oluwaseun',
+  'Oluwaseyi',
+  'Oluwatobi',
+  'Oluwatobiloba',
+  'Oreoluwa',
+  'Oshay',
+  'Ovie',
+  'Praise',
+  'Rapheal',
+  'Saheed',
+  'Shade',
+  'Taiwo',
+  'Taye',
+  'Temitope',
+  'Tobe',
+  'Tobenna',
+  'Tobi',
+  'Uchenna',
+  'Ugo',
+  'Ugochukwu',
+  'Ugonna'
+];
+
+const lastNames = [
+  'Abadaki',
+  'Abagun',
+  'Abaribe',
+  'Adarabioyo',
+  'Adejuyigbe',
+  'Adekugbe',
+  'Adeniran',
+  'Aderemi',
+  'Adewumi',
+  'Adewusi',
+  'Ajudua',
+  'Akinde',
+  'Aladefa',
+  'Ameobi',
+  'Aneke',
+  'Anjorin',
+  'Aremu',
+  'Ayanbadejo',
+  'Bakare',
+  'Balarabe',
+  'Buraimoh',
+  'Coker',
+  'Chibuzor',
+  'Daramola',
+  'Fuwape',
+  'Gwarzo',
+  'Ibekwe',
+  'Idonije',
+  'Igbinoghene',
+  'Ihemeje',
+  'Laouali',
+  'Maikori',
+  'Makinde',
+  'Nwakaeme',
+  'Ofoedu',
+  'Ogedegbe',
+  'Ogunode',
+  'Okojie',
+  'Olaoye',
+  'Oliha',
+  'Olonisakin',
+  'Olunloyo',
+  'Onoja',
+  'Onyeama',
+  'Osakwe',
+  'Oteh',
+  'Sofoluwe',
+  'Udoka',
+  'Ujah',
+  'Umelo'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/Norway/bundle.ts b/packages/plugins/src/countries/Norway/bundle.ts
new file mode 100644
index 000000000..fa529ddce
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/bundle.ts
@@ -0,0 +1,94 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Norway: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'norway',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxx'
+    }
+  },
+  regions: [
+    {
+      regionName: 'Oslo',
+      regionShort: '03',
+      regionSlug: 'oslo',
+      weight: 5,
+      cities: ['Oslo']
+    },
+    {
+      regionName: 'Rogaland',
+      regionShort: '11',
+      regionSlug: 'rogaland',
+      weight: 5,
+      cities: ['Stavanger', 'Sandnes', 'Haugesund', 'Bryne', 'Egersund', 'Koppervik', 'Åkrehamn', 'Jørpeland', 'Sauda', 'Skudeneshavn']
+    },
+    {
+      regionName: 'Møre og Romsdal',
+      regionShort: '15',
+      regionSlug: 'more_og_romsdal',
+      weight: 5,
+      cities: ['Molde', 'Ålesund', 'Kristiansund', 'Ørsta', 'Volda']
+    },
+    {
+      regionName: 'Nordland',
+      regionShort: '18',
+      regionSlug: 'nordland',
+      weight: 5,
+      cities: ['Bodø', 'Mo i Rana', 'Narvik', 'Mosjøen', 'Fauske', 'Sandnessjøen', 'Sortland', 'Brønnøysund']
+    },
+    {
+      regionName: 'Viken',
+      regionShort: '30',
+      regionSlug: 'viken',
+      weight: 5,
+      cities: ['Drammen', 'Frederikstad', 'Sarpsborg', 'Moss']
+    },
+    {
+      regionName: 'Innlandet',
+      regionShort: '34',
+      regionSlug: 'innlandet',
+      weight: 5,
+      cities: ['Hamar', 'Lillehammer', 'Gjøvik', 'Elverum', 'Kongsvinger', 'Brummunddal', 'Raufoss', 'Moelv']
+    },
+    {
+      regionName: 'Vestfold og Telemark',
+      regionShort: '38',
+      regionSlug: 'vestfold_og_telemark',
+      weight: 5,
+      cities: ['Skien', 'Porsgrunn', 'Brevik', 'Langesund', 'Tønsberg', 'Sandefjord', 'Larvik', 'Horten', 'Notodden', 'Holmestrand']
+    },
+    {
+      regionName: 'Agder',
+      regionShort: '42',
+      regionSlug: 'agder',
+      weight: 5,
+      cities: ['Kristiansand', 'Arendal', 'Grimstad', 'Farsund', 'Flekkefjord', 'Lillesand', 'Mandal', 'Risør', 'Tvedestrand']
+    },
+    {
+      regionName: 'Vestland',
+      regionShort: '46',
+      regionSlug: 'vestland',
+      weight: 5,
+      cities: ['Bergen', 'Leirvik', 'Førde', 'Florø', 'Odda']
+    },
+    {
+      regionName: 'Trøndelag',
+      regionShort: '50',
+      regionSlug: 'trondelag',
+      weight: 5,
+      cities: ['Trondheim', 'Stjørdalshalsen', 'Steinkjer', 'Levanger', 'Namsos', 'Verdalsøra', 'Orkanger']
+    },
+    {
+      regionName: 'Troms og Finnmark',
+      regionShort: '54',
+      regionSlug: 'troms_og_finnmark',
+      weight: 5,
+      cities: ['Tromsø', 'Harstad', 'Alta', 'Hammerfest', 'Vadsø']
+    }
+  ]
+});
+
+export default Norway;
diff --git a/packages/plugins/src/countries/Norway/i18n/ar.json b/packages/plugins/src/countries/Norway/i18n/ar.json
new file mode 100644
index 000000000..13b7640fe
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "النرويج",
+  "regionNames": "المقاطعات النرويجية"
+}
diff --git a/packages/plugins/src/countries/Norway/i18n/de.json b/packages/plugins/src/countries/Norway/i18n/de.json
new file mode 100644
index 000000000..f46226048
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Norwegen",
+  "regionNames": "Norwegische Bezirke"
+}
diff --git a/packages/plugins/src/countries/Norway/i18n/en.json b/packages/plugins/src/countries/Norway/i18n/en.json
new file mode 100644
index 000000000..98cec70b7
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Norway",
+  "regionNames": "Norwegian counties"
+}
diff --git a/packages/plugins/src/countries/Norway/i18n/es.json b/packages/plugins/src/countries/Norway/i18n/es.json
new file mode 100644
index 000000000..8fec14074
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Noruega",
+  "regionNames": "condados noruegos"
+}
diff --git a/packages/plugins/src/countries/Norway/i18n/fr.json b/packages/plugins/src/countries/Norway/i18n/fr.json
new file mode 100644
index 000000000..330d88e62
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Norvège",
+  "regionNames": "Comtés norvégiens"
+}
diff --git a/packages/plugins/src/countries/Norway/i18n/hi.json b/packages/plugins/src/countries/Norway/i18n/hi.json
new file mode 100644
index 000000000..c055ee9a7
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "नॉर्वे",
+  "regionNames": "नॉर्वेजियन काउंटी"
+}
diff --git a/packages/plugins/src/countries/Norway/i18n/ja.json b/packages/plugins/src/countries/Norway/i18n/ja.json
new file mode 100644
index 000000000..476d6cf1f
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ノルウェー",
+  "regionNames": "ノルウェーの郡"
+}
diff --git a/packages/plugins/src/countries/Norway/i18n/nl.json b/packages/plugins/src/countries/Norway/i18n/nl.json
new file mode 100644
index 000000000..74e0bc683
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Noorwegen",
+  "regionNames": "Noorse provincies"
+}
diff --git a/packages/plugins/src/countries/Norway/i18n/pt.json b/packages/plugins/src/countries/Norway/i18n/pt.json
new file mode 100644
index 000000000..410c2776f
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Noruega",
+  "regionNames": "condados noruegueses"
+}
diff --git a/packages/plugins/src/countries/Norway/i18n/ru.json b/packages/plugins/src/countries/Norway/i18n/ru.json
new file mode 100644
index 000000000..2c5533270
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Норвегия",
+  "regionNames": "Норвежские округа"
+}
diff --git a/packages/plugins/src/countries/Norway/i18n/ta.json b/packages/plugins/src/countries/Norway/i18n/ta.json
new file mode 100644
index 000000000..8e369f55d
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "நார்வே",
+  "regionNames": "நோர்வே மாவட்டங்கள்"
+}
diff --git a/packages/plugins/src/countries/Norway/i18n/zh.json b/packages/plugins/src/countries/Norway/i18n/zh.json
new file mode 100644
index 000000000..3aabbe5f7
--- /dev/null
+++ b/packages/plugins/src/countries/Norway/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "挪威",
+  "regionNames": "挪威县"
+}
diff --git a/packages/plugins/src/countries/Pakistan/bundle.ts b/packages/plugins/src/countries/Pakistan/bundle.ts
new file mode 100644
index 000000000..b3c4e4f0c
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/bundle.ts
@@ -0,0 +1,190 @@
+/* eslint max-len:0 */
+/**
+ * @author Fareez Ahamed <fareez.ahamed@gmail.com>
+ */
+import { GetCountryData } from '@generatedata/types';
+
+const Pakistan: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'pakistan',
+  regionNames: i18n.regionNames,
+  continent: 'asia',
+  extendedData: {
+    zipFormat: {
+      format: 'Xxxxxx'
+    },
+    phoneFormat: {
+      displayFormats: ['+92 xxxxxxxxx', '0xx-xxxxxxx', '0xxx-xxxxxxx']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Punjab',
+      regionShort: 'PU',
+      regionSlug: 'sindh',
+      weight: 30,
+      cities: [
+        'Attock',
+        'Bahawalnagar',
+        'Bahawalpur',
+        'Bhakkar',
+        'Chakwal',
+        'Chiniot',
+        'Dera Ghazi Khan',
+        'Faisalabad',
+        'Gujranwala',
+        'Hafizabad',
+        'Jhang',
+        'Jhelum',
+        'Kasur',
+        'Khanewal',
+        'Khushab',
+        'Lahore',
+        'Lodhran',
+        'Mandi Bahauddin',
+        'Mianwali',
+        'Multan',
+        'Murree',
+        'Muzaffargarh',
+        'Nankana Sahib',
+        'Narowal',
+        'Okara',
+        'Pakpatan',
+        'Rahimyar Khan',
+        'Rajanpur',
+        'Rawalpindi',
+        'Sahiwal',
+        'Sargodha',
+        'Sheikhupura',
+        'Sialkot',
+        'Toba Tek Singh',
+        'Vehari'
+      ]
+    },
+    {
+      regionName: 'Sindh',
+      regionShort: 'SI',
+      regionSlug: 'sindh',
+      weight: 25,
+      cities: [
+        'Badin',
+        'Dadu',
+        'Ghotki',
+        'Hyderabad',
+        'Jacobabad',
+        'Jamshoro',
+        'Karachi',
+        'Kashmore',
+        'Khairpur',
+        'Larkana',
+        'Matiari',
+        'Naushahro Firoze',
+        'Qambar Shahdadkot',
+        'Sanghar',
+        'Shaheed Benazirabad',
+        'Shikarpur',
+        'Sujawal',
+        'Sukkur',
+        'Tando Allahyar',
+        'Tando Muhammad Khan',
+        'Tharparkar',
+        'Thatta',
+        'Umerkot'
+      ]
+    },
+    {
+      regionName: 'Balochistan',
+      regionShort: 'BL',
+      regionSlug: 'balochistan',
+      weight: 20,
+      cities: [
+        'Awaran',
+        'Barkhan',
+        'Chagai',
+        'Dera Bugti',
+        'Gwadar',
+        'Harnai',
+        'Jafarabad',
+        'Kacchi',
+        'Kalat',
+        'Kech',
+        'Kharan',
+        'Khuzdar',
+        'Killa Abdullah',
+        'Killa Saifullah',
+        'Kohlu',
+        'Lasbela',
+        'Lehri',
+        'Loralai',
+        'Mastung',
+        'Musakhel',
+        'Nasirabad',
+        'Nushki',
+        'Panjgur',
+        'Pishin Valley',
+        'Quetta',
+        'Sherani',
+        'Sibi',
+        'Sohbatpur',
+        'Washuk',
+        'Zhob',
+        'Ziarat'
+      ]
+    },
+    {
+      regionName: 'Khyber Pakhtoonkhwa',
+      regionShort: 'KPK',
+      regionSlug: 'khyber_pakhtoonkhwa',
+      weight: 20,
+      cities: [
+        'Abbottabad',
+        'Bannu',
+        'Battagram',
+        'Buner',
+        'Charsadda',
+        'Chitral',
+        'Dera Ismail Khan',
+        'Dir',
+        'Hangu',
+        'Haripur',
+        'Karak',
+        'Kohat',
+        'Kohistan',
+        'Lakki Marwat',
+        'Malakand',
+        'Mansehra',
+        'Mardan',
+        'Nowshera',
+        'Peshawar',
+        'Shangla',
+        'Swabi',
+        'Swat',
+        'Tank',
+        'Torghar'
+      ]
+    },
+    {
+      regionName: 'Gilgit Baltistan',
+      regionShort: 'GB',
+      regionSlug: 'gilgit_baltistan',
+      weight: 15,
+      cities: ['Astore', 'Diamer', 'Ghanche', 'Ghizer', 'Gilgit', 'Gojal Upper Hunza', 'Kharmang', 'Nagar', 'Shigar', 'Skardu']
+    },
+    {
+      regionName: 'Azad Kashmir',
+      regionShort: 'AK',
+      regionSlug: 'azad_kashmir',
+      weight: 10,
+      cities: ['Bagh', 'Bhimber', 'Hattian Bala', 'Haveli', 'Kotli', 'Mirpur', 'Muzzafarabad', 'Neelum Valley', 'Rawalakot', 'Sudhanoti']
+    },
+    {
+      regionName: 'FATA',
+      regionShort: 'FA',
+      regionSlug: 'fata',
+      weight: 5,
+      cities: ['Bajaur Agency', 'Khyber Agency', 'Kurram Agency', 'Mohmand Agency', 'North Waziristan']
+    }
+  ]
+});
+
+export default Pakistan;
diff --git a/packages/plugins/src/countries/Pakistan/i18n/ar.json b/packages/plugins/src/countries/Pakistan/i18n/ar.json
new file mode 100644
index 000000000..1b1089bb2
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "باكستان",
+  "regionNames": "دولة باكستان"
+}
diff --git a/packages/plugins/src/countries/Pakistan/i18n/de.json b/packages/plugins/src/countries/Pakistan/i18n/de.json
new file mode 100644
index 000000000..8c3572379
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Pakistan",
+  "regionNames": "Pakistanische Staaten"
+}
diff --git a/packages/plugins/src/countries/Pakistan/i18n/en.json b/packages/plugins/src/countries/Pakistan/i18n/en.json
new file mode 100644
index 000000000..0d40519da
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Pakistan",
+  "regionNames": "Pakistan States"
+}
diff --git a/packages/plugins/src/countries/Pakistan/i18n/es.json b/packages/plugins/src/countries/Pakistan/i18n/es.json
new file mode 100644
index 000000000..27d57dd07
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Pakistán",
+  "regionNames": "Estados de Pakistán"
+}
diff --git a/packages/plugins/src/countries/Pakistan/i18n/fr.json b/packages/plugins/src/countries/Pakistan/i18n/fr.json
new file mode 100644
index 000000000..e0a823030
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Pakistan",
+  "regionNames": "États pakistanais"
+}
diff --git a/packages/plugins/src/countries/Pakistan/i18n/hi.json b/packages/plugins/src/countries/Pakistan/i18n/hi.json
new file mode 100644
index 000000000..3aa225f65
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "पाकिस्तान",
+  "regionNames": "पाकिस्तान राज्य"
+}
diff --git a/packages/plugins/src/countries/Pakistan/i18n/ja.json b/packages/plugins/src/countries/Pakistan/i18n/ja.json
new file mode 100644
index 000000000..14e4fc4ef
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "パキスタン",
+  "regionNames": "パキスタン諸国"
+}
diff --git a/packages/plugins/src/countries/Pakistan/i18n/nl.json b/packages/plugins/src/countries/Pakistan/i18n/nl.json
new file mode 100644
index 000000000..53c9d5dc5
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Pakistan",
+  "regionNames": "Pakistaanse staten"
+}
diff --git a/packages/plugins/src/countries/Pakistan/i18n/pt.json b/packages/plugins/src/countries/Pakistan/i18n/pt.json
new file mode 100644
index 000000000..76e334c9f
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Paquistão",
+  "regionNames": "Estados do Paquistão"
+}
diff --git a/packages/plugins/src/countries/Pakistan/i18n/ru.json b/packages/plugins/src/countries/Pakistan/i18n/ru.json
new file mode 100644
index 000000000..c69b4472e
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Пакистан",
+  "regionNames": "Пакистанские штаты"
+}
diff --git a/packages/plugins/src/countries/Pakistan/i18n/ta.json b/packages/plugins/src/countries/Pakistan/i18n/ta.json
new file mode 100644
index 000000000..fe9bd48e7
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "பாகிஸ்தான்",
+  "regionNames": "பாகிஸ்தான் மாநிலம்"
+}
diff --git a/packages/plugins/src/countries/Pakistan/i18n/zh.json b/packages/plugins/src/countries/Pakistan/i18n/zh.json
new file mode 100644
index 000000000..b82cd0013
--- /dev/null
+++ b/packages/plugins/src/countries/Pakistan/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "巴基斯坦",
+  "regionNames": "巴基斯坦国"
+}
diff --git a/packages/plugins/src/countries/Peru/bundle.ts b/packages/plugins/src/countries/Peru/bundle.ts
new file mode 100644
index 000000000..fa9229b04
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/bundle.ts
@@ -0,0 +1,100 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Peru: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'peru',
+  regionNames: i18n.regionNames,
+  continent: 'south_america',
+  extendedData: {
+    zipFormat: {
+      format: 'Axxxx',
+      replacements: {
+        A: '1234'
+      }
+    },
+    phoneFormat: {
+      displayFormats: ['Xxx xxx xxx']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Piura',
+      regionShort: 'PIU',
+      regionSlug: 'piura',
+      weight: 16,
+      cities: ['Piura', 'Sullana', 'Paita', 'Catacaos', 'Talara', 'Chulucanas', 'Sechura']
+    },
+    {
+      regionName: 'La Libertad',
+      regionShort: 'LAL',
+      regionSlug: 'lalibertad',
+      weight: 15,
+      cities: ['Trujillo', 'Chepén', 'Pacasmayo', 'Guadalupe']
+    },
+    {
+      regionName: 'Cajamarca',
+      regionShort: 'CAJ',
+      regionSlug: 'cajamarca',
+      weight: 14,
+      cities: ['Cajamarca', 'Jaén']
+    },
+    {
+      regionName: 'Puno',
+      regionShort: 'PUN',
+      regionSlug: 'puno',
+      weight: 12,
+      cities: ['Juliaca', 'Puno']
+    },
+    {
+      regionName: 'Cusco',
+      regionShort: 'CUS',
+      regionSlug: 'cusco',
+      weight: 12,
+      cities: ['Cusco', 'Sicuani']
+    },
+    {
+      regionName: 'Arequipa',
+      regionShort: 'ARE',
+      regionSlug: 'arequipa',
+      weight: 11,
+      cities: ['Arequipa']
+    },
+    {
+      regionName: 'Junín',
+      regionShort: 'JUN',
+      regionSlug: 'junín',
+      weight: 11,
+      cities: ['Huancayo', 'Tarma']
+    },
+    {
+      regionName: 'Lambayeque',
+      regionShort: 'LAM',
+      regionSlug: 'lambayeque',
+      weight: 11,
+      cities: ['Chiclayo', 'Lambayeque']
+    },
+    {
+      regionName: 'Ancash',
+      regionShort: 'ANC',
+      regionSlug: 'ancash',
+      weight: 10,
+      cities: ['Chimbote', 'Huaraz']
+    },
+    {
+      regionName: 'Loreto',
+      regionShort: 'LOR',
+      regionSlug: 'loreto',
+      weight: 9,
+      cities: ['Iquitos', 'Yurimaguas']
+    },
+    {
+      regionName: 'Lima',
+      regionShort: 'LIM',
+      regionSlug: 'Lima',
+      weight: 9,
+      cities: ['Lima', 'Huacho', 'Huaral', 'San Vicente de Cañete', 'Barranca', 'Chancay', 'Mala']
+    }
+  ]
+});
+
+export default Peru;
diff --git a/packages/plugins/src/countries/Peru/i18n/ar.json b/packages/plugins/src/countries/Peru/i18n/ar.json
new file mode 100644
index 000000000..c3236b0b5
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "بيرو",
+  "regionNames": "مناطق بيرو"
+}
diff --git a/packages/plugins/src/countries/Peru/i18n/de.json b/packages/plugins/src/countries/Peru/i18n/de.json
new file mode 100644
index 000000000..9fb4a8c27
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Peru",
+  "regionNames": "Peruanische Regionen"
+}
diff --git a/packages/plugins/src/countries/Peru/i18n/en.json b/packages/plugins/src/countries/Peru/i18n/en.json
new file mode 100644
index 000000000..f7a9bdfff
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Peru",
+  "regionNames": "Peruvian regions"
+}
diff --git a/packages/plugins/src/countries/Peru/i18n/es.json b/packages/plugins/src/countries/Peru/i18n/es.json
new file mode 100644
index 000000000..4edb10a72
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Perú",
+  "regionNames": "regiones peruanas"
+}
diff --git a/packages/plugins/src/countries/Peru/i18n/fr.json b/packages/plugins/src/countries/Peru/i18n/fr.json
new file mode 100644
index 000000000..193f34d65
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Pérou",
+  "regionNames": "Régions péruviennes"
+}
diff --git a/packages/plugins/src/countries/Peru/i18n/hi.json b/packages/plugins/src/countries/Peru/i18n/hi.json
new file mode 100644
index 000000000..55b3dfd07
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "पेरू",
+  "regionNames": "पेरू क्षेत्र"
+}
diff --git a/packages/plugins/src/countries/Peru/i18n/ja.json b/packages/plugins/src/countries/Peru/i18n/ja.json
new file mode 100644
index 000000000..787547275
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ペルー",
+  "regionNames": "ペルー地域"
+}
diff --git a/packages/plugins/src/countries/Peru/i18n/nl.json b/packages/plugins/src/countries/Peru/i18n/nl.json
new file mode 100644
index 000000000..8e3b7370e
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Peru",
+  "regionNames": "Peruaanse regio's"
+}
diff --git a/packages/plugins/src/countries/Peru/i18n/pt.json b/packages/plugins/src/countries/Peru/i18n/pt.json
new file mode 100644
index 000000000..8874767fb
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Peru",
+  "regionNames": "Regiões peruanas"
+}
diff --git a/packages/plugins/src/countries/Peru/i18n/ru.json b/packages/plugins/src/countries/Peru/i18n/ru.json
new file mode 100644
index 000000000..38558de3e
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Перу",
+  "regionNames": "Перуанские регионы"
+}
diff --git a/packages/plugins/src/countries/Peru/i18n/ta.json b/packages/plugins/src/countries/Peru/i18n/ta.json
new file mode 100644
index 000000000..54dd3d065
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "பெரு",
+  "regionNames": "பெருவியன் பகுதிகள்"
+}
diff --git a/packages/plugins/src/countries/Peru/i18n/zh.json b/packages/plugins/src/countries/Peru/i18n/zh.json
new file mode 100644
index 000000000..9baa69b34
--- /dev/null
+++ b/packages/plugins/src/countries/Peru/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "秘鲁",
+  "regionNames": "秘鲁地区"
+}
diff --git a/packages/plugins/src/countries/Philippines/bundle.ts b/packages/plugins/src/countries/Philippines/bundle.ts
new file mode 100644
index 000000000..bae2aead3
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/bundle.ts
@@ -0,0 +1,213 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Philippines: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'philippines',
+  regionNames: i18n.regionNames,
+  continent: 'asia',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxx'
+    },
+    phoneFormat: {
+      displayFormats: ['63 (xxx) xxx xxxx', '0 (xxx) xxx xxxx', '(xxx) xxx xxxx']
+    }
+  },
+  regions: [
+    {
+      regionName: 'National Capital Region',
+      regionShort: 'NCR',
+      regionSlug: 'national_capital_region',
+      weight: 139,
+      cities: [
+        'Quezon City',
+        'Manila',
+        'Caloocan',
+        'Taguig',
+        'Pasig',
+        'Valenzuela',
+        'Parañaque',
+        'Makati',
+        'Las Piñas',
+        'Muntinlupa',
+        'Marikina'
+      ]
+    },
+    {
+      regionName: 'Cordillera Administrative Region',
+      regionShort: 'CAR',
+      regionSlug: 'cordillera_administrative_region',
+      weight: 18,
+      cities: ['Baguio', 'Tabuk']
+    },
+    {
+      regionName: 'Ilocos Region',
+      regionShort: 'regionI',
+      regionSlug: 'ilocos_region',
+      weight: 52,
+      cities: ['Dagupan City', 'Alaminos', 'Batac', 'Candon', 'Laoag', 'San Carlos', 'San Fernando', 'Urdaneta', 'Vigan']
+    },
+    {
+      regionName: 'Cagayan Valley',
+      regionShort: 'regionII',
+      regionSlug: 'cagayan_valley',
+      weight: 37,
+      cities: ['Cauayan', 'Ilagan', 'Santiago', 'Tuguegarao']
+    },
+    {
+      regionName: 'Central Luzon',
+      regionShort: 'regionIII',
+      regionSlug: 'central_luzon',
+      weight: 123,
+      cities: [
+        'Angeles City',
+        'Balanga',
+        'Cabanatuan',
+        'Gapan',
+        'Mabalacat',
+        'Malolos',
+        'Meycauayan',
+        'Muñoz',
+        'Olongapo',
+        'Palayan',
+        'San Fernando',
+        'San Jose',
+        'San Jose del Monte',
+        'Tarlac City'
+      ]
+    },
+    {
+      regionName: 'Calabarzon',
+      regionShort: 'regionIV-A',
+      regionSlug: 'calabarzon',
+      weight: 161,
+      cities: [
+        'Antipolo',
+        'Dasmariñas',
+        'Bacoor',
+        'Calamba',
+        'Imus',
+        'General Trias',
+        'Santa Rosa',
+        'Biñan',
+        'Lipa',
+        'Cabuyao',
+        'Batangas City',
+        'San Pedro'
+      ]
+    },
+    {
+      regionName: 'Southwestern Tagalog Region',
+      regionShort: 'mimaropa',
+      regionSlug: 'southwestern_tagalog_region',
+      weight: 32,
+      cities: ['Calapan', 'Puerto Princesa']
+    },
+    {
+      regionName: 'Bicol Region',
+      regionShort: 'regionV',
+      regionSlug: 'bicol_region',
+      weight: 61,
+      cities: ['Iriga', 'Legazpi', 'Ligao', 'Masbate City', 'Naga', 'Sorsogon City', 'Tabaco']
+    },
+    {
+      regionName: 'Western Visayas',
+      regionShort: 'regionVI',
+      regionSlug: 'western_visayas',
+      weight: 80,
+      cities: [
+        'Bacolod',
+        'Bago',
+        'Cadiz',
+        'Escalante',
+        'Himamaylan',
+        'Iloilo City',
+        'Kabankalan',
+        'La Carlota',
+        'Passi',
+        'Roxas',
+        'Sagay',
+        'San Carlos',
+        'Silay',
+        'Sipalay',
+        'Talisay',
+        'Victorias'
+      ]
+    },
+    {
+      regionName: 'Central Visayas',
+      regionShort: 'regionVII',
+      regionSlug: 'central_visayas',
+      weight: 74,
+      cities: [
+        'Bais',
+        'Bayawan',
+        'Bogo',
+        'Canlaon',
+        'Carcar',
+        'Cebu City',
+        'Danao',
+        'Dumaguete',
+        'Guihulngan',
+        'Lapu-Lapu City',
+        'Mandaue',
+        'Naga',
+        'Tagbilaran',
+        'Talisay',
+        'Tanjay',
+        'Toledo'
+      ]
+    },
+    {
+      regionName: 'Eastern Visayas',
+      regionShort: 'regionVIII',
+      regionSlug: 'eastern_visayas',
+      weight: 48,
+      cities: ['Baybay', 'Borongan', 'Calbayog', 'Catbalogan', 'Maasin', 'Ormoc', 'Tacloban']
+    },
+    {
+      regionName: 'Zamboanga Peninsula',
+      regionShort: 'regionIX',
+      regionSlug: 'zamboanga_peninsula',
+      weight: 38,
+      cities: ['Dapitan', 'Dipolog', 'Isabela City', 'Pagadian', 'Zamboanga City']
+    },
+    {
+      regionName: 'Northern Mindanao',
+      regionShort: 'regionX',
+      regionSlug: 'northern_mindanao',
+      weight: 50,
+      cities: ['Cagayan de Oro', 'El Salvador', 'Gingoog', 'Iligan', 'Malaybalay', 'Oroquieta', 'Ozamiz', 'Tangub', 'Valencia']
+    },
+    {
+      regionName: 'Davao Region',
+      regionShort: 'regionXI',
+      regionSlug: 'davao_region',
+      weight: 53,
+      cities: ['Davao City', 'Digos', 'Mati', 'Panabo', 'Samal', 'Tagum']
+    },
+    {
+      regionName: 'Soccsksargen',
+      regionShort: 'regionXII',
+      regionSlug: 'national_capital_region',
+      weight: 139,
+      cities: ['General Santos', 'Kidapawan', 'Koronadal', 'Tacurong']
+    },
+    {
+      regionName: 'Caraga',
+      regionShort: 'regionXIII',
+      regionSlug: 'national_capital_region',
+      weight: 27,
+      cities: ['Bayugan', 'Bislig', 'Butuan', 'Cabadbaran', 'Surigao City', 'Tandag']
+    },
+    {
+      regionName: 'Bangsamoro',
+      regionShort: 'BARMM',
+      regionSlug: 'bangsamoro',
+      weight: 42,
+      cities: ['Cotabato City', 'Lamitan', 'Marawi']
+    }
+  ]
+});
+
+export default Philippines;
diff --git a/packages/plugins/src/countries/Philippines/i18n/ar.json b/packages/plugins/src/countries/Philippines/i18n/ar.json
new file mode 100644
index 000000000..d4faba528
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "فيلبيني",
+  "regionNames": "مناطق الفلبين"
+}
diff --git a/packages/plugins/src/countries/Philippines/i18n/de.json b/packages/plugins/src/countries/Philippines/i18n/de.json
new file mode 100644
index 000000000..2d3e9f157
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Philippinen",
+  "regionNames": "Philippinische Regionen"
+}
diff --git a/packages/plugins/src/countries/Philippines/i18n/en.json b/packages/plugins/src/countries/Philippines/i18n/en.json
new file mode 100644
index 000000000..0627478d8
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Philippines",
+  "regionNames": "Philippine Regions"
+}
diff --git a/packages/plugins/src/countries/Philippines/i18n/es.json b/packages/plugins/src/countries/Philippines/i18n/es.json
new file mode 100644
index 000000000..6c92240ad
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Filipinas",
+  "regionNames": "Regiones de Filipinas"
+}
diff --git a/packages/plugins/src/countries/Philippines/i18n/fr.json b/packages/plugins/src/countries/Philippines/i18n/fr.json
new file mode 100644
index 000000000..ad18a6696
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Philippines",
+  "regionNames": "Régions des Philippines"
+}
diff --git a/packages/plugins/src/countries/Philippines/i18n/hi.json b/packages/plugins/src/countries/Philippines/i18n/hi.json
new file mode 100644
index 000000000..81d3ba1f1
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "फिलिपींस",
+  "regionNames": "फिलीपीन क्षेत्र"
+}
diff --git a/packages/plugins/src/countries/Philippines/i18n/ja.json b/packages/plugins/src/countries/Philippines/i18n/ja.json
new file mode 100644
index 000000000..676775288
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "フィリピン",
+  "regionNames": "フィリピンの地域"
+}
diff --git a/packages/plugins/src/countries/Philippines/i18n/nl.json b/packages/plugins/src/countries/Philippines/i18n/nl.json
new file mode 100644
index 000000000..64c6edef5
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Filippijnen",
+  "regionNames": "Filippijnse regio's"
+}
diff --git a/packages/plugins/src/countries/Philippines/i18n/pt.json b/packages/plugins/src/countries/Philippines/i18n/pt.json
new file mode 100644
index 000000000..f115c3fbc
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Filipinas",
+  "regionNames": "Regiões filipinas"
+}
diff --git a/packages/plugins/src/countries/Philippines/i18n/ru.json b/packages/plugins/src/countries/Philippines/i18n/ru.json
new file mode 100644
index 000000000..75b148b9f
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Филиппины",
+  "regionNames": "Филиппинские регионы"
+}
diff --git a/packages/plugins/src/countries/Philippines/i18n/ta.json b/packages/plugins/src/countries/Philippines/i18n/ta.json
new file mode 100644
index 000000000..fc78c17a8
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "பிலிப்பைன்ஸ்",
+  "regionNames": "பிலிப்பைன்ஸ் பகுதிகள்"
+}
diff --git a/packages/plugins/src/countries/Philippines/i18n/zh.json b/packages/plugins/src/countries/Philippines/i18n/zh.json
new file mode 100644
index 000000000..d2d136e0c
--- /dev/null
+++ b/packages/plugins/src/countries/Philippines/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "菲律宾",
+  "regionNames": "菲律宾地区"
+}
diff --git a/packages/plugins/src/countries/Poland/bundle.ts b/packages/plugins/src/countries/Poland/bundle.ts
new file mode 100644
index 000000000..87846f603
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/bundle.ts
@@ -0,0 +1,132 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Poland: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'poland',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      format: 'xx-xxx'
+    },
+    phoneFormat: {
+      displayFormats: ['Xx xxx xx xx']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Dolnośląskie',
+      regionShort: 'DS',
+      regionSlug: 'dolnoslaskie',
+      weight: 291,
+      cities: ['Wrocław', 'Wałbrzych', 'Legnica', 'Jelenia Góra']
+    },
+    {
+      regionName: 'Kujawsko-pomorskie',
+      regionShort: 'KP',
+      regionSlug: 'kujawskopomorskie',
+      weight: 210,
+      cities: ['Bydgoszcz', 'Toruń']
+    },
+    {
+      regionName: 'Lubelskie',
+      regionShort: 'LU',
+      regionSlug: 'lubelskie',
+      weight: 217,
+      cities: ['Lublin', 'Chełm', 'Zamość', 'Biała Podlaska']
+    },
+    {
+      regionName: 'Lubuskie',
+      regionShort: 'LB',
+      regionSlug: 'lubuskie',
+      weight: 102,
+      cities: ['Gorzów Wielkopolski', 'Zielona Góra']
+    },
+    {
+      regionName: 'łódzkie',
+      regionShort: 'LD',
+      regionSlug: 'lodzkie',
+      weight: 252,
+      cities: ['Łódź', 'Piotrków Trybunalski', 'Pabianice', 'Tomaszów Mazowiecki']
+    },
+    {
+      regionName: 'Małopolskie',
+      regionShort: 'MP',
+      regionSlug: 'malopolskie',
+      weight: 335,
+      cities: ['Kraków', 'Tarnów']
+    },
+    {
+      regionName: 'Mazowieckie',
+      regionShort: 'MA',
+      regionSlug: 'mazowieckie',
+      weight: 530,
+      cities: ['Warszawa', 'Radom', 'Płock', 'Siedlce']
+    },
+    {
+      regionName: 'Opolskie',
+      regionShort: 'OP',
+      regionSlug: 'opolskie',
+      weight: 101,
+      cities: ['Opole', 'Kędzierzyn-Koźle']
+    },
+    {
+      regionName: 'Podkarpackie',
+      regionShort: 'PK',
+      regionSlug: 'podkarpackie',
+      weight: 213,
+      cities: ['Rzeszów', 'Przemyśl', 'Stalowa Wola', 'Mielec']
+    },
+    {
+      regionName: 'Podlaskie',
+      regionShort: 'PD',
+      regionSlug: 'podlaskie',
+      weight: 120,
+      cities: ['Białystok', 'Suwałki', 'Łomża']
+    },
+    {
+      regionName: 'Pomorskie',
+      regionShort: 'PM',
+      regionSlug: 'pomorskie',
+      weight: 229,
+      cities: ['Gdańsk', 'Gdynia', 'Słupsk', 'Tczew']
+    },
+    {
+      regionName: 'Sląskie',
+      regionShort: 'SL',
+      regionSlug: 'slaskie',
+      weight: 462,
+      cities: ['Katowice', 'Częstochowa', 'Sosnowiec', 'Gliwice']
+    },
+    {
+      regionName: 'Swiętokrzyskie',
+      regionShort: 'SK',
+      regionSlug: 'swietokrzyskie',
+      weight: 127,
+      cities: ['Kielce', 'Ostrowiec Świętokrzyski', 'Starachowice']
+    },
+    {
+      regionName: 'Warmińsko-mazurskie',
+      regionShort: 'WM',
+      regionSlug: 'warminskomazurskie',
+      weight: 145,
+      cities: ['Olsztyn', 'Elbląg', 'Ełk']
+    },
+    {
+      regionName: 'Wielkopolskie',
+      regionShort: 'WP',
+      regionSlug: 'wielkopolskie',
+      weight: 342,
+      cities: ['Poznań', 'Kalisz', 'Konin', 'Piła']
+    },
+    {
+      regionName: 'Zachodniopomorskie',
+      regionShort: 'ZP',
+      regionSlug: 'zachodniopomorskie',
+      weight: 172,
+      cities: ['Szczecin', 'Koszalin', 'Stargard Szczeciński']
+    }
+  ]
+});
+
+export default Poland;
diff --git a/packages/plugins/src/countries/Poland/i18n/ar.json b/packages/plugins/src/countries/Poland/i18n/ar.json
new file mode 100644
index 000000000..6c43cdac1
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "بولندا",
+  "regionNames": "الدول البولندية"
+}
diff --git a/packages/plugins/src/countries/Poland/i18n/de.json b/packages/plugins/src/countries/Poland/i18n/de.json
new file mode 100644
index 000000000..701878800
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Polen",
+  "regionNames": "Polnische Staaten"
+}
diff --git a/packages/plugins/src/countries/Poland/i18n/en.json b/packages/plugins/src/countries/Poland/i18n/en.json
new file mode 100644
index 000000000..2e43e8ad3
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Poland",
+  "regionNames": "Polish States"
+}
diff --git a/packages/plugins/src/countries/Poland/i18n/es.json b/packages/plugins/src/countries/Poland/i18n/es.json
new file mode 100644
index 000000000..69f9176ce
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Polonia",
+  "regionNames": "Estados polacos"
+}
diff --git a/packages/plugins/src/countries/Poland/i18n/fr.json b/packages/plugins/src/countries/Poland/i18n/fr.json
new file mode 100644
index 000000000..08942ee5a
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Pologne",
+  "regionNames": "États polonais"
+}
diff --git a/packages/plugins/src/countries/Poland/i18n/hi.json b/packages/plugins/src/countries/Poland/i18n/hi.json
new file mode 100644
index 000000000..97747515b
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "पोलैंड",
+  "regionNames": "पोलिश राज्य"
+}
diff --git a/packages/plugins/src/countries/Poland/i18n/ja.json b/packages/plugins/src/countries/Poland/i18n/ja.json
new file mode 100644
index 000000000..d1f59106a
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ポーランド",
+  "regionNames": "ポーランド諸国"
+}
diff --git a/packages/plugins/src/countries/Poland/i18n/nl.json b/packages/plugins/src/countries/Poland/i18n/nl.json
new file mode 100644
index 000000000..ba08d82b8
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Polen",
+  "regionNames": "Poolse staten"
+}
diff --git a/packages/plugins/src/countries/Poland/i18n/pt.json b/packages/plugins/src/countries/Poland/i18n/pt.json
new file mode 100644
index 000000000..d997ace76
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Polônia",
+  "regionNames": "Estados poloneses"
+}
diff --git a/packages/plugins/src/countries/Poland/i18n/ru.json b/packages/plugins/src/countries/Poland/i18n/ru.json
new file mode 100644
index 000000000..ea66a520a
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Польша",
+  "regionNames": "Польские государства"
+}
diff --git a/packages/plugins/src/countries/Poland/i18n/ta.json b/packages/plugins/src/countries/Poland/i18n/ta.json
new file mode 100644
index 000000000..fb68ff925
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "போலந்து",
+  "regionNames": "போலந்து மாநிலங்கள்"
+}
diff --git a/packages/plugins/src/countries/Poland/i18n/zh.json b/packages/plugins/src/countries/Poland/i18n/zh.json
new file mode 100644
index 000000000..7451b4c99
--- /dev/null
+++ b/packages/plugins/src/countries/Poland/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "波兰",
+  "regionNames": "波兰国家"
+}
diff --git a/packages/plugins/src/countries/README.md b/packages/plugins/src/countries/README.md
new file mode 100644
index 000000000..2cd07706b
--- /dev/null
+++ b/packages/plugins/src/countries/README.md
@@ -0,0 +1,234 @@
+# [CLI](../../../../../cli/README.md) &raquo; [Plugins](../PLUGINS.md) &raquo; Countries
+
+The Country plugins are used in a number of different ways in the data generator. They each contain a rich set of
+data for a particular country, namely:
+
+- Country name
+- Region list
+- Cities within each region
+- phone number formats (optional)
+- postal/zip code formats (optional)
+- list of names (first and last) that are common to the country (optional)
+
+This enables different Data Types in the generator to create more realistic looking data sets.
+
+The goal of the country plugins is **not to be exhaustive** in terms of the data they contain. The overriding goal is
+to be able to generate realistic-looking regional data, but that doesn't mean having 100% of all regions and cities
+etc. to be provided. In fact, it's better to keep the data somewhat limited to ensure decent performance.
+
+# Available Countries & Functionality
+
+This lists the available country plugins and what they currently provide. The global phone and zip formats are so that
+the generator can at least provide somewhat realistic looking information for a mapped Data Type (i.e. a phone or zip
+Data Type that's been explicitly mapped to a higher region).
+
+- **Australia**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **Austria**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **Belgium**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **Brazil**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [x] regional zip format
+  - [x] names
+- **Canada**
+  - [x] global phone format
+  - [x] region-specific phone format
+  - [x] global zip format
+  - [x] regional zip format
+  - [x] names
+- **Chile**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **China**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **Colombia**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Costa Rica**
+  - [x] global phone format
+  - [x] region-specific phone format
+  - [x] global zip format
+  - [x] regional zip format
+  - [ ] names
+- **France**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Germany**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **India**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **Indonesia**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Ireland**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Italy**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Mexico**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Netherlands**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **New Zealand**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Nigeria**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **Norway**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Pakistan**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Peru**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Philippines**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Poland**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Russia**
+  - [x] global phone format
+  - [x] region-specific phone format
+  - [x] global zip format
+  - [x] regional zip format
+  - [ ] names
+- **Singapore**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **South Africa**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **South Korea**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Spain**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **Sweden**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Turkey**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
+- **UK**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **Ukraine**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [ ] names
+- **US**
+  - [ ] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [x] regional zip format
+  - [x] names
+- **Vietnam**
+  - [x] global phone format
+  - [ ] region-specific phone format
+  - [x] global zip format
+  - [ ] regional zip format
+  - [x] names
diff --git a/packages/plugins/src/countries/Russia/bundle.ts b/packages/plugins/src/countries/Russia/bundle.ts
new file mode 100644
index 000000000..592e39249
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/bundle.ts
@@ -0,0 +1,1158 @@
+// https://en.wikipedia.org/wiki/Category:Cities_and_towns_in_Russia_by_federal_subject
+import { GetCountryData } from '@generatedata/types';
+
+const Russia: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'RU',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+
+  // Federal Cities (3} = Moscow, Saint Petersburg, Sevastopol
+  // Oblast (46}= Province or Region
+  // Krai = Territory (Same as Oblast, but designation is historic}
+  // Republic = Home to specific Ethinic Minorities
+
+  extendedData: {
+    // the general zip format for the country. This may be optionally overridden for each region if a more
+    // specific format is desired. To prevent duplicate code, the replacements listed here cover ALL zip formats
+    // for each province
+    zipFormat: {
+      format: '%*****',
+      replacements: {
+        '%': '123456789',
+        '*': '0123456789',
+
+        // used in individual federal subjects
+        '-': '01', // (Kurgan, Ryazan, Tula} Oblast
+        '&': '012', // Moscow City, (Pskov, Tver, Vologda, Orenburg, Penza, Vladimir, Yaroslavl} Oblast
+        '+': '0123', // (Kirov, Novosibirsk, Saratov} Oblast
+        U: '01234', // (Kemerovo, Moscow, Sverdlovsk, Volgograd} Oblast
+        X: '012345', // Moscow City
+        P: '123', // Bryansk Oblast
+        Z: '23', // (Oryol, Tambov, Ulyanovsk} Oblast
+        '}': '34', // (Sakhalin, Murmansk} Oblast
+        T: '345', // (Ivanovo, Novgorod} Oblast
+        '^': '3456', // (Arkhangelsk, Samara} Oblast
+        Y: '34567', // Nizhny Novgorod Oblast
+        S: '456', // (Astrakhan, Smolensk, Omsk, Tomsk} Oblast
+        R: '4567', // (Chelyabinsk, Rostov, Voronezh} Oblast
+        '#': '4569', // Irkutsk Oblast
+        '(': '56', // (Amur, Magadan} Oblast
+        Q: '567', // (Kursk, Tyumen} Oblast
+        V: '67', // Kostroma Oblast
+        '?': '678', // Kalingrad Oblast
+        W: '78', // Leningrad Oblast
+        '@': '89' // (Belgorod, Kaluga, Lipetsk} Oblast
+      }
+    },
+
+    // the general phone format and area codes for the country
+    // https://en.wikipedia.org/wiki/Telephone_numbers_in_Russia
+    // https://www.itu.int/oth/T02020000AD/en
+    phoneFormat: {
+      areaCodes: [
+        301, // Republic of Buryatia (Ulan – Ude}
+        302, // Zabaykalsky Krai, Chita region together with the Agin-Buryat autonomous region (Chita}
+        336, // Baikonur
+        341, // Republic of Udmurtia (Izhevsk}
+        342, // Perm Krai (Perm}
+        343, // Sverdlovsk Oblast (Ekaterinburg}
+        345, // Tyumen Oblast (Tyumen}
+        346, // Khanty–Mansi Autonomous Okrug – Yugra (Surgut}
+        347, // Republic of Bashkortostan (Ufa}
+        349, // Yamalo-Nenets Autonomous Okrug (Salekhard}
+        351, // Chelyabinsk Oblast (Chelyabinsk}
+        352, // Kurgan Oblast (Kurgan}
+        353, // Orenburg Oblast (Orenburg}
+        365, // Republic of Crimea* (Simferopol}
+        381, // Omsk Oblast (Omsk}
+        382, // Tomsk Oblast (Tomsk}
+        383, // Novosibirsk Oblast (Novosibirsk}
+        384, // Kemerovo Oblast (Kemerovo}
+        385, // Altai Krai (Barnaul}
+        387, // Altai Krai
+        388, // Altai Krai (Gorno-Altaisk}
+        390, // Republic of Khakassia (Abakan}
+        391, // Krasnoyarsk Krai in conjunction with the Evenk Oblast and Taimyr (Dolgan-Nenets} Oblast (Krasnoyarsk}
+        394, // Republic of Tyva (Kyzyl}
+        395, // Irkutsk Oblast (Irkutsk}
+        401, // Kaliningrad Oblast (Kaliningrad}
+        411, // Sakha Republic (Yakutia} (Yakutsk}
+        413, // Magadan Oblast (Magadan}
+        415, // Kamchatka Krai and Koryak autonomous region (Petropavlovsk-Kamchatsky}
+        416, // Amur Oblast (Blagoveshchensk}
+        421, // Khabarovsk Krai (Khabarovsk}
+        423, // Primorsky Krai (Vladivostok}
+        424, // Sakhalin Oblast (Yuzhno-Sakhalinsk}
+        426, // Jewish Autonomous Oblast (Birobidzhan}
+        427, // Chukotka Autonomous Okrug (Anadyr}
+        471, // Kursk Oblast (Kursk}
+        472, // Belgorod Oblast (Belgorod}
+        473, // Voronezh Oblast (Voronezh}
+        474, // Lipetsk Oblast (Lipetsk}
+        475, // Tambov Oblast (Tambov}
+        481, // Smolensk Oblast (Smolensk}
+        482, // Tver Oblast (Tver}
+        483, // Bryansk Oblast (Bryansk}
+        484, // Kaluga Oblast
+        485, // Yaroslavl Oblast (Yaroslavl}
+        486, // Oryol Oblast (Orel}
+        487, // Tula Oblast (Tula}
+        491, // Ryazan Oblast (Ryazan}
+        492, // Vladimir Oblast (Vladimir}
+        493, // Ivanovo Oblast (Ivanovo}
+        494, // Kostroma Oblast (Kostroma}
+        495,
+        499, // Moscow City
+        496,
+        498, // Moscow Oblast
+        811, // Pskov Oblast (Pskov}
+        812, // Saint Petersburg
+        813,
+        820, // Volgograd Oblast
+        813, // Leningrad Oblast
+        814, // Republic of Karelia (Petrozavodsk}
+        815, // Murmansk Oblast (Murmansk}
+        816, // Novgorod Oblast (Velikiy Novgorod}
+        817, // Vologda Oblast (Vologda}
+        818, // Arkhangelsk Oblast (Arkhangelsk}
+        821, // Komi Republic (Syktyvkar}
+        831, // Nizhny Novgorod Oblast (Nizhny Novgorod}
+        833, // Kirov Oblast (Kirov}
+        834, // Republic of Mordovia (Saransk}
+        835, // Republic of Chuvashia (Cheboksary}
+        836, // Republic of Mari El (Yoshkar-Ola}
+        841, // Penza Oblast (Penza}
+        842, // Ulyanovsk Oblast (Ulyanovsk}
+        843, // Republic of Tatarstan (Kazan}
+        844, // Volgograd Oblast (Volgograd}
+        845, // Saratov Oblast (Saratov}
+        846, // Samara Oblast (Samara}
+        847, // Republic of Kalmykia (Elista}
+        848, // Samara Oblast (Tolyatti}
+        851, // Astrakhan Oblast (Astrakhan}
+        855, // Republic of Tatarstan (Naberezhnye Chelny}
+        861, // Krasnodar Krai (Krasnodar}
+        862, // Krasnodar Krai (Sochi}
+        863, // Rostov Oblast (Rostov-on Don}
+        865, // Stavropol Krai (Stavropol}
+        866, // Republic of Kabardino-Balkaria (Nalchik}
+        867, // Republic of North Ossetia–Alania (Vladikavkaz}
+        869, // Sevastopol City
+        871, // Republic of Chechnya (Grozny}
+        872, // Republic of Dagestan (Makhachkala}
+        873, // Republic of Ingushetia (Nazran}
+        877, // Republic of Adygea (Maikop}
+        878, // Republic of Karachayevo-Cherkessia (Cherkessk}
+        879, // Stavropol Krai (Mineralnye Vody}
+        900,
+        901,
+        902,
+        903,
+        904,
+        905,
+        906,
+        907,
+        908,
+        909, // Mobile networks
+        910,
+        911,
+        912,
+        913,
+        914,
+        915,
+        916,
+        917,
+        918,
+        919, // Mobile networks
+        920,
+        921,
+        922,
+        923,
+        924,
+        925,
+        926,
+        927,
+        928,
+        929, // Mobile networks
+        930,
+        931,
+        932,
+        933,
+        934,
+        935,
+        936,
+        937,
+        938,
+        939, // Mobile networks
+        940,
+        941,
+        942,
+        943,
+        944,
+        945,
+        946,
+        947,
+        948,
+        949, // Mobile networks
+        950,
+        951,
+        952,
+        953,
+        955,
+        956,
+        957,
+        958,
+        959, // Mobile networks
+        960,
+        961,
+        962,
+        963,
+        964,
+        965,
+        966,
+        967,
+        968,
+        969, // Mobile networks
+        972,
+        973,
+        974,
+        975,
+        976,
+        977,
+        978,
+        979, // Mobile networks
+        980,
+        981,
+        982,
+        983,
+        984,
+        985,
+        986,
+        987,
+        988,
+        989, // Mobile networks
+        990,
+        991,
+        992,
+        993,
+        994,
+        995,
+        996,
+        997,
+        998,
+        999 // Mobile networks
+      ],
+      displayFormats: [
+        '(AAA} Xxx-xx-xx',
+        '+7 AAAXxxxxxx',
+        '+7 (AAA} Xxx-xx-xx', // Outside Russia use 7 as Country Calling Code
+        '+7-AAA-Xxx-xx-xx'
+      ]
+    }
+  },
+  regions: [
+    // Federal Cities
+    {
+      regionName: 'Moscow City',
+      regionShort: 'Moscow',
+      regionSlug: 'moscow-city',
+      weight: 11,
+      cities: ['Moscow'],
+      extendedData: {
+        zipFormat: {
+          format: '1+X***'
+        },
+        phoneFormat: {
+          areaCodes: [495, 499]
+        }
+      }
+    },
+    {
+      regionName: 'Saint Petersburg City',
+      regionShort: 'Saint Petersburg', // ISO 3166 code
+      regionSlug: 'saint_petersburg-city',
+      weight: 11,
+      cities: ['Saint Petersburg'],
+      extendedData: {
+        zipFormat: {
+          format: '19****'
+        },
+        phoneFormat: {
+          areaCodes: [812]
+        }
+      }
+    },
+
+    // TODO: Need zipFormat for Sevastopol City
+    {
+      regionName: 'Sevastopol City',
+      regionShort: 'Sevastopol', // ISO 3166 code
+      regionSlug: 'sevastopol-city',
+      weight: 11,
+      cities: ['Sevastopol'],
+      extendedData: {
+        zipFormat: {
+          format: '%*****'
+        },
+        phoneFormat: {
+          areaCodes: [869]
+        }
+      }
+    },
+
+    // Oblasts
+    {
+      regionName: 'Amur Oblast',
+      regionShort: 'AMU', // 'RU-AMU', // ISO 3166 code
+      regionSlug: 'amur-oblast',
+      weight: 50,
+      cities: ['Belogorsk', 'Blagoveshchensk', 'Raychikhinsk', 'Shimanovsk', 'Skovorodino', 'Svobodny', 'Tynda', 'Zavitinsk', 'Zeya'],
+      extendedData: {
+        zipFormat: {
+          format: '67(***'
+        },
+        phoneFormat: {
+          areaCodes: [416]
+        }
+      }
+    },
+    {
+      regionName: 'Arkhangelsk Oblast',
+      regionShort: 'ARK', // 'RU-ARK', // ISO 3166 code
+      regionSlug: 'arkhangelsk-oblast',
+      weight: 50,
+      cities: [
+        'Arkhangelsk',
+        'Brin-Navolok',
+        'Kargopol',
+        'Koryazhma',
+        'Kotlas',
+        'Mezen',
+        'Mirny',
+        'Novodvinsk',
+        'Nyandoma',
+        'Onega',
+        'Severodvinsk',
+        'Shenkursk',
+        'Solvychegodsk',
+        'Velsk'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '16^***'
+        },
+        phoneFormat: {
+          areaCodes: [818]
+        }
+      }
+    },
+    {
+      regionName: 'Astrakhan Oblast',
+      regionShort: 'AST', // 'RU-AST', // ISO 3166 code
+      regionSlug: 'astrakhan-oblast',
+      weight: 50,
+      cities: ['Astrakhan', 'Akhtubinsk', 'Kamyzyak', 'Kharabali', 'Narimanov', 'Znamensk'],
+      extendedData: {
+        zipFormat: {
+          format: '41S***'
+        },
+        phoneFormat: {
+          areaCodes: [851]
+        }
+      }
+    },
+    {
+      regionName: 'Belgorod Oblast',
+      regionShort: 'BEL', // 'RU-BEL', // ISO 3166 code
+      regionSlug: 'belgorod-oblast',
+      weight: 50,
+      cities: [
+        'Alexeyevka',
+        'Belgorod',
+        'Biryuch',
+        'Borisovka',
+        'Grayvoron',
+        'Gubkin',
+        'Korocha',
+        'Krasnaya Yaruga',
+        'Novy Oskol',
+        'Rakitnoye',
+        'Shebekino',
+        'Stary Oskol',
+        'Stroitel',
+        'Valuyki',
+        'Volokonovka'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '30@***'
+        },
+        phoneFormat: {
+          areaCodes: [472]
+        }
+      }
+    },
+    {
+      regionName: 'Bryansk Oblast',
+      regionShort: 'BRY', // 'RU-BRY', // ISO 3166 code
+      regionSlug: 'bryansk-oblast',
+      weight: 50,
+      cities: [
+        'Bryansk',
+        'Dyatkovo',
+        'Fokino',
+        'Karachev',
+        'Klintsy',
+        'Mglin',
+        'Novozybkov',
+        'Pochep',
+        'Seltso',
+        'Sevsk',
+        'Starodub',
+        'Surazh',
+        'Trubchevsk',
+        'Unecha',
+        'Vialky',
+        'Zhukovka',
+        'Zlynka'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '24P***'
+        },
+        phoneFormat: {
+          areaCodes: [483]
+        }
+      }
+    },
+    {
+      regionName: 'Chelyabinsk Oblast',
+      regionShort: 'CHE', // 'RU-CHE', // ISO 3166 code
+      regionSlug: 'chelyabinsk-oblast',
+      weight: 50,
+      cities: [
+        'Asha',
+        'Bakal',
+        'Chelyabinsk',
+        'Karabash',
+        'Kartaly',
+        'Kasli',
+        'Katav-Ivanovsk',
+        'Kopeysk',
+        'Korkino',
+        'Kusa',
+        'Kyshtym',
+        'Magnitogorsk',
+        'Miass',
+        'Minyar',
+        'Nyazepetrovsk',
+        'Ozyorsk',
+        'Plast',
+        'Satka',
+        'Sim',
+        'Snezhinsk',
+        'Troitsk',
+        'Tryokhgorny',
+        'Ust-Katav',
+        'Verkhneuralsk',
+        'Verkhny Ufaley',
+        'Yemanzhelinsk',
+        'Yuryuzan',
+        'Yurzhnouralsk',
+        'Zlatoust'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '45R***'
+        },
+        phoneFormat: {
+          areaCodes: [351]
+        }
+      }
+    },
+    {
+      regionName: 'Irkutsk Oblast',
+      regionShort: 'IRK', // 'RU-IRK', // ISO 3166 code
+      regionSlug: 'irkutsk-oblast',
+      weight: 50,
+      cities: ['Irkutsk'],
+      extendedData: {
+        zipFormat: {
+          format: '66#***'
+        },
+        phoneFormat: {
+          areaCodes: [395]
+        }
+      }
+    },
+    {
+      regionName: 'Ivanovo Oblast',
+      regionShort: 'IVA', // 'RU-IVA', // ISO 3166 code
+      regionSlug: 'ivanovo-oblast',
+      weight: 50,
+      cities: ['Ivanovo'],
+      extendedData: {
+        zipFormat: {
+          format: '15T***'
+        },
+        phoneFormat: {
+          areaCodes: [493]
+        }
+      }
+    },
+    {
+      regionName: 'Kaliningrad Oblast',
+      regionShort: 'KGD', // 'RU-KGD', // ISO 3166 code
+      regionSlug: 'kaliningrad-oblast',
+      weight: 50,
+      cities: ['Kaliningrad'],
+      extendedData: {
+        zipFormat: {
+          format: '23?***'
+        },
+        phoneFormat: {
+          areaCodes: [401]
+        }
+      }
+    },
+    {
+      regionName: 'Kaluga Oblast',
+      regionShort: 'KLU', // 'RU-KLU', // ISO 3166 code
+      regionSlug: 'kaluga-oblast',
+      weight: 50,
+      cities: ['Kaluga'],
+      extendedData: {
+        zipFormat: {
+          format: '24@***'
+        },
+        phoneFormat: {
+          areaCodes: [484]
+        }
+      }
+    },
+    {
+      regionName: 'Kemerovo Oblast',
+      regionShort: 'KEM', // 'RU-KEM', // ISO 3166 code
+      regionSlug: 'kemerovo-oblast',
+      weight: 50,
+      cities: ['Kemerovo'],
+      extendedData: {
+        zipFormat: {
+          format: '65U***'
+        },
+        phoneFormat: {
+          areaCodes: [384]
+        }
+      }
+    },
+    {
+      regionName: 'Kirov Oblast',
+      regionShort: 'KIR', // 'RU-KIR', // ISO 3166 code
+      regionSlug: 'kirov-oblast',
+      weight: 50,
+      cities: ['Kirov'],
+      extendedData: {
+        zipFormat: {
+          format: '61+***'
+        },
+        phoneFormat: {
+          areaCodes: [833]
+        }
+      }
+    },
+    {
+      regionName: 'Kostroma Oblast',
+      regionShort: 'KOS', // 'RU-KOS', // ISO 3166 code
+      regionSlug: 'kostroma-oblast',
+      weight: 50,
+      cities: ['Kostroma'],
+      extendedData: {
+        zipFormat: {
+          format: '15V***'
+        },
+        phoneFormat: {
+          areaCodes: [494]
+        }
+      }
+    },
+    {
+      regionName: 'Kurgan Oblast',
+      regionShort: 'KGN', // 'RU-KGN', // ISO 3166 code
+      regionSlug: 'kurgan-oblast',
+      weight: 50,
+      cities: ['Kurgan'],
+      extendedData: {
+        zipFormat: {
+          format: '64-***'
+        },
+        phoneFormat: {
+          areaCodes: [352]
+        }
+      }
+    },
+    {
+      regionName: 'Kursk Oblast',
+      regionShort: 'KRS', // 'RU-KRS', // ISO 3166 code
+      regionSlug: 'kursk-oblast',
+      weight: 50,
+      cities: ['Kursk'],
+      extendedData: {
+        zipFormat: {
+          format: '30Q***'
+        },
+        phoneFormat: {
+          areaCodes: [471]
+        }
+      }
+    },
+    {
+      regionName: 'Leningrad Oblast',
+      regionShort: 'LEN', // 'RU-LEN', // ISO 3166 code
+      regionSlug: 'leningrad-oblast',
+      weight: 50,
+      cities: ['Gatchina', 'Ivangorod'],
+      extendedData: {
+        zipFormat: {
+          format: '18W***'
+        },
+        phoneFormat: {
+          areaCodes: [813]
+        }
+      }
+    },
+    {
+      regionName: 'Lipetsk Oblast',
+      regionShort: 'LIP', // 'RU-LIP', // ISO 3166 code
+      regionSlug: 'lipetsk-oblast',
+      weight: 50,
+      cities: ['Lipetsk'],
+      extendedData: {
+        zipFormat: {
+          format: '39@***'
+        },
+        phoneFormat: {
+          areaCodes: [474]
+        }
+      }
+    },
+    {
+      regionName: 'Magadan Oblast',
+      regionShort: 'MAG', // 'RU-MAG', // ISO 3166 code
+      regionSlug: 'magadan-oblast',
+      weight: 50,
+      cities: ['Magadan'],
+      extendedData: {
+        zipFormat: {
+          format: '68(***'
+        },
+        phoneFormat: {
+          areaCodes: [413]
+        }
+      }
+    },
+    {
+      regionName: 'Moscow Oblast',
+      regionShort: 'MOS', // 'RU-MOS', // ISO 3166 code
+      regionSlug: 'moscow-oblast',
+      weight: 11,
+
+      // https://en.wikipedia.org/wiki/Category:Cities_and_towns_in_Moscow_Oblast
+      cities: [
+        'Aprelevka',
+        'Balashikha',
+        'Bolshevo',
+        'Bronnitsy',
+        'Chekhov',
+        'Chernogolovka',
+        'Dedovsk',
+        'Dmitrov',
+        'Dolgoprudny',
+        'Domodedovo',
+        'Drezna',
+        'Dubna',
+        'Dzerzhinsky',
+        'Elektrogorsk',
+        'Elektrostal',
+        'Elektrougli',
+        'Fryazino',
+        'Golitsyno',
+        'Istra',
+        'Ivanteyevka',
+        'Kalininets',
+        'Kashira',
+        'Khimki',
+        'Khotkovo',
+        'Klimovsk',
+        'Klin',
+        'Kolomna',
+        'Korolyov',
+        'Kotelniki',
+        'Krasnoarmeysk',
+        'Krasnogorsk',
+        'Krasnozavodsk',
+        'Krasnoznamensk',
+        'Kubinka',
+        'Kurovskoye',
+        'Likino-Dulyovo',
+        'Lobnya',
+        'Losino-Petrovsky',
+        'Lukhovitsy',
+        'Lytkarino',
+        'Lyubertsy',
+        'Mozhaysk',
+        'Mytishchi',
+        'Naro-Fominsk',
+        'Noginsk',
+        'Odintsovo',
+        'Orekhovo-Zuyevo',
+        'Ozherelye',
+        'Ozyory',
+        'Pavlovsky Posad',
+        'Peresvet',
+        'Podolsk',
+        'Protvino',
+        'Pushchino',
+        'Pushkino',
+        'Ramenskoye',
+        'Reutov',
+        'Roshal',
+        'Ruza',
+        'Sergiyev Posad',
+        'Serpukhov',
+        'Shatura',
+        'Shchyolkovo',
+        'Solnechnogorsk',
+        'Staraya Kupavna',
+        'Stupino',
+        'Svitino',
+        'Taldom',
+        'Vereya',
+        'Vidnoye',
+        'Volokolamsk',
+        'Voskresensk',
+        'Vysokovsk',
+        'Yakhroma',
+        'Yegoryevsk',
+        'Zaraysk',
+        'Zhukovsky',
+        'Zvenigorod'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: '14U***'
+        },
+        phoneFormat: {
+          areaCodes: [496, 498]
+        }
+      }
+    },
+    {
+      regionName: 'Murmansk Oblast',
+      regionShort: 'MUR', // 'RU-MUR', // ISO 3166 code
+      regionSlug: 'murmansk-oblast',
+      weight: 50,
+      cities: ['Murmansk'],
+      extendedData: {
+        zipFormat: {
+          format: '18}***'
+        },
+        phoneFormat: {
+          areaCodes: [815]
+        }
+      }
+    },
+    {
+      regionName: 'Nizhny Novgorod Oblast',
+      regionShort: 'NIZ', // 'RU-NIZ', // ISO 3166 code
+      regionSlug: 'nizhny_novgorod-oblast',
+      weight: 50,
+      cities: ['Nizhny'],
+      extendedData: {
+        zipFormat: {
+          format: '60Y***'
+        },
+        phoneFormat: {
+          areaCodes: [831]
+        }
+      }
+    },
+    {
+      regionName: 'Novgorod Oblast',
+      regionShort: 'NGR', // 'RU-NGR', // ISO 3166 code
+      regionSlug: 'novgorod-oblast',
+      weight: 50,
+      cities: ['Novgorod'],
+      extendedData: {
+        zipFormat: {
+          format: '17T***'
+        },
+        phoneFormat: {
+          areaCodes: [816]
+        }
+      }
+    },
+    {
+      regionName: 'Novosibirsk Oblast',
+      regionShort: 'NVS', // 'RU-NVS', // ISO 3166 code
+      regionSlug: 'novosibirsk-oblast',
+      weight: 50,
+      cities: ['Novosibirsk'],
+      extendedData: {
+        zipFormat: {
+          format: '63+***'
+        },
+        phoneFormat: {
+          areaCodes: [383]
+        }
+      }
+    },
+    {
+      regionName: 'Omsk Oblast',
+      regionShort: 'OMS', // 'RU-OMS', // ISO 3166 code
+      regionSlug: 'omsk-oblast',
+      weight: 50,
+      cities: ['Omsk'],
+      extendedData: {
+        zipFormat: {
+          format: '64S***'
+        },
+        phoneFormat: {
+          areaCodes: [381]
+        }
+      }
+    },
+    {
+      regionName: 'Orenburg Oblast',
+      regionShort: 'ORE', // 'RU-ORE', // ISO 3166 code
+      regionSlug: 'orenburg-oblast',
+      weight: 50,
+      cities: ['Orenburg'],
+      extendedData: {
+        zipFormat: {
+          format: '46&***'
+        },
+        phoneFormat: {
+          areaCodes: [353]
+        }
+      }
+    },
+    {
+      regionName: 'Oryol Oblast',
+      regionShort: 'ORL', // 'RU-ORL', // ISO 3166 code
+      regionSlug: 'oryol-oblast',
+      weight: 50,
+      cities: ['Oryol'],
+      extendedData: {
+        zipFormat: {
+          format: '30Z***'
+        },
+        phoneFormat: {
+          areaCodes: [486]
+        }
+      }
+    },
+    {
+      regionName: 'Penza Oblast',
+      regionShort: 'PNZ', // 'RU-PNZ', // ISO 3166 code
+      regionSlug: 'penza-oblast',
+      weight: 50,
+      cities: ['Penza'],
+      extendedData: {
+        zipFormat: {
+          format: '44&***'
+        },
+        phoneFormat: {
+          areaCodes: [841]
+        }
+      }
+    },
+    {
+      regionName: 'Pskov Oblast',
+      regionShort: 'PSK', // 'RU-PSK', // ISO 3166 code
+      regionSlug: 'pskov-oblast',
+      weight: 50,
+      cities: ['Pskov'],
+      extendedData: {
+        zipFormat: {
+          format: '18&***'
+        },
+        phoneFormat: {
+          areaCodes: [811]
+        }
+      }
+    },
+    {
+      regionName: 'Rostov Oblast',
+      regionShort: 'ROS', // 'RU-ROS', // ISO 3166 code
+      regionSlug: 'rostov-oblast',
+      weight: 50,
+      cities: ['Rostov'],
+      extendedData: {
+        zipFormat: {
+          format: '34R***'
+        },
+        phoneFormat: {
+          areaCodes: [863]
+        }
+      }
+    },
+    {
+      regionName: 'Ryazan Oblast',
+      regionShort: 'RYA', // 'RU-RYA', // ISO 3166 code
+      regionSlug: 'ryazan-oblast',
+      weight: 50,
+      cities: ['Ryazan'],
+      extendedData: {
+        zipFormat: {
+          format: '39-***'
+        },
+        phoneFormat: {
+          areaCodes: [491]
+        }
+      }
+    },
+    {
+      regionName: 'Sakhalin Oblast',
+      regionShort: 'SAK', // 'RU-SAK', // ISO 3166 code
+      regionSlug: 'sakhalin-oblast',
+      weight: 50,
+      cities: ['Sakhalin'],
+      extendedData: {
+        zipFormat: {
+          format: '69}***'
+        },
+        phoneFormat: {
+          areaCodes: [424]
+        }
+      }
+    },
+    {
+      regionName: 'Samara Oblast',
+      regionShort: 'SAM', // 'RU-SAM', // ISO 3166 code
+      regionSlug: 'samara-oblast',
+      weight: 50,
+      cities: ['Samara', 'Tolyatti'],
+      extendedData: {
+        zipFormat: {
+          format: '44^***'
+        },
+        phoneFormat: {
+          areaCodes: [846, 848]
+        }
+      }
+    },
+    {
+      regionName: 'Saratov Oblast',
+      regionShort: 'SAR', // 'RU-SAR', // ISO 3166 code
+      regionSlug: 'saratov-oblast',
+      weight: 50,
+      cities: ['Saratov'],
+      extendedData: {
+        zipFormat: {
+          format: '41+***'
+        },
+        phoneFormat: {
+          areaCodes: [845]
+        }
+      }
+    },
+    {
+      regionName: 'Smolensk Oblast',
+      regionShort: 'SMO', // 'RU-SMO', // ISO 3166 code
+      regionSlug: 'smolensk-oblast',
+      weight: 50,
+      cities: ['Smolensk'],
+      extendedData: {
+        zipFormat: {
+          format: '21S***'
+        },
+        phoneFormat: {
+          areaCodes: [481]
+        }
+      }
+    },
+    {
+      regionName: 'Sverdlovsk Oblast',
+      regionShort: 'SVE', // 'RU-SVE', // ISO 3166 code
+      regionSlug: 'sverdlovsk-oblast',
+      weight: 50,
+      cities: ['Yekaterinburg'],
+      extendedData: {
+        zipFormat: {
+          format: '62U***'
+        },
+        phoneFormat: {
+          areaCodes: [343]
+        }
+      }
+    },
+    {
+      regionName: 'Tambov Oblast',
+      regionShort: 'TAM', // 'RU-TAM', // ISO 3166 code
+      regionSlug: 'tambov-oblast',
+      weight: 50,
+      cities: ['Tambov'],
+      extendedData: {
+        zipFormat: {
+          format: '39Z***'
+        },
+        phoneFormat: {
+          areaCodes: [475]
+        }
+      }
+    },
+    {
+      regionName: 'Tomsk Oblast',
+      regionShort: 'TOM', // 'RU-TOM', // ISO 3166 code
+      regionSlug: 'tomsk-oblast',
+      weight: 50,
+      cities: ['Tomsk'],
+      extendedData: {
+        zipFormat: {
+          format: '63S***'
+        },
+        phoneFormat: {
+          areaCodes: [382]
+        }
+      }
+    },
+    {
+      regionName: 'Tver Oblast',
+      regionShort: 'TVE', // 'RU-TVE', // ISO 3166 code
+      regionSlug: 'tver-oblast',
+      weight: 50,
+      cities: ['Tver'],
+      extendedData: {
+        zipFormat: {
+          format: '17&***'
+        },
+        phoneFormat: {
+          areaCodes: [482]
+        }
+      }
+    },
+    {
+      regionName: 'Tula Oblast',
+      regionShort: 'TUL', // 'RU-TUL', // ISO 3166 code
+      regionSlug: 'tula-oblast',
+      weight: 50,
+      cities: ['Tula'],
+      extendedData: {
+        zipFormat: {
+          format: '30-***'
+        },
+        phoneFormat: {
+          areaCodes: [487]
+        }
+      }
+    },
+    {
+      regionName: 'Tyumen Oblast',
+      regionShort: 'TYU', // 'RU-TYU', // ISO 3166 code
+      regionSlug: 'tyumen-oblast',
+      weight: 50,
+      cities: ['Tyumen'],
+      extendedData: {
+        zipFormat: {
+          format: '62Q***'
+        },
+        phoneFormat: {
+          areaCodes: [345]
+        }
+      }
+    },
+    {
+      regionName: 'Ulyanovsk Oblast',
+      regionShort: 'ULY', // 'RU-ULY', // ISO 3166 code
+      regionSlug: 'ulyanovsk-oblast',
+      weight: 50,
+      cities: ['Ulyanovsk'],
+      extendedData: {
+        zipFormat: {
+          format: '43Z***'
+        },
+        phoneFormat: {
+          areaCodes: [842]
+        }
+      }
+    },
+    {
+      regionName: 'Vladimir Oblast',
+      regionShort: 'VLA', // 'RU-VLA', // ISO 3166 code
+      regionSlug: 'vladimir-oblast',
+      weight: 50,
+      cities: ['Vladimir'],
+      extendedData: {
+        zipFormat: {
+          format: '60&***'
+        },
+        phoneFormat: {
+          areaCodes: [492]
+        }
+      }
+    },
+    {
+      regionName: 'Volgograd Oblast',
+      regionShort: 'VGG', // 'RU-VGG', // ISO 3166 code
+      regionSlug: 'volgograd-oblast',
+      weight: 50,
+      cities: ['Volgograd'],
+      extendedData: {
+        zipFormat: {
+          format: '40U***'
+        },
+        phoneFormat: {
+          areaCodes: [844]
+        }
+      }
+    },
+    {
+      regionName: 'Vologda Oblast',
+      regionShort: 'VLG', // 'RU-VLG', // ISO 3166 code
+      regionSlug: 'vologda-oblast',
+      weight: 50,
+      cities: ['Cherepovets', 'Vologda'],
+      extendedData: {
+        zipFormat: {
+          format: '16&***'
+        },
+        phoneFormat: {
+          areaCodes: [817, 820]
+        }
+      }
+    },
+    {
+      regionName: 'Voronezh Oblast',
+      regionShort: 'VOR', // 'RU-VOR', // ISO 3166 code
+      regionSlug: 'voronezh-oblast',
+      weight: 50,
+      cities: ['Voronezh'],
+      extendedData: {
+        zipFormat: {
+          format: '39R****'
+        },
+        phoneFormat: {
+          areaCodes: [473]
+        }
+      }
+    },
+    {
+      regionName: 'Yaroslavl Oblast',
+      regionShort: 'YAR', // 'RU-YAR', // ISO 3166 code
+      regionSlug: 'yaroslavl-oblast',
+      weight: 50,
+      cities: ['Yaroslavl'],
+      extendedData: {
+        zipFormat: {
+          format: '15&***'
+        },
+        phoneFormat: {
+          areaCodes: [485]
+        }
+      }
+    }
+  ]
+});
+
+export default Russia;
diff --git a/packages/plugins/src/countries/Russia/i18n/ar.json b/packages/plugins/src/countries/Russia/i18n/ar.json
new file mode 100644
index 000000000..4246e75bc
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "الاتحاد الروسي",
+  "regionNames": "الموضوعات الفيدرالية"
+}
diff --git a/packages/plugins/src/countries/Russia/i18n/de.json b/packages/plugins/src/countries/Russia/i18n/de.json
new file mode 100644
index 000000000..35e0b9eb2
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Russische Föderation",
+  "regionNames": "Russische Bundessubjekte"
+}
diff --git a/packages/plugins/src/countries/Russia/i18n/en.json b/packages/plugins/src/countries/Russia/i18n/en.json
new file mode 100644
index 000000000..e5ee77dcd
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Russian Federation",
+  "regionNames": "Federal Subjects"
+}
diff --git a/packages/plugins/src/countries/Russia/i18n/es.json b/packages/plugins/src/countries/Russia/i18n/es.json
new file mode 100644
index 000000000..9239d6682
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Federación Rusa",
+  "regionNames": "Sujetos federales rusos"
+}
diff --git a/packages/plugins/src/countries/Russia/i18n/fr.json b/packages/plugins/src/countries/Russia/i18n/fr.json
new file mode 100644
index 000000000..3e3b963a4
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Fédération Russe",
+  "regionNames": "Sujets fédéraux russes"
+}
diff --git a/packages/plugins/src/countries/Russia/i18n/hi.json b/packages/plugins/src/countries/Russia/i18n/hi.json
new file mode 100644
index 000000000..912239b79
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "रूसी संघ",
+  "regionNames": "संघीय विषय"
+}
diff --git a/packages/plugins/src/countries/Russia/i18n/ja.json b/packages/plugins/src/countries/Russia/i18n/ja.json
new file mode 100644
index 000000000..6b61e5955
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ポーランド諸国",
+  "regionNames": "ロシア連邦臣民"
+}
diff --git a/packages/plugins/src/countries/Russia/i18n/nl.json b/packages/plugins/src/countries/Russia/i18n/nl.json
new file mode 100644
index 000000000..547b20651
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Russische Federatie",
+  "regionNames": "Federale onderwerpen"
+}
diff --git a/packages/plugins/src/countries/Russia/i18n/pt.json b/packages/plugins/src/countries/Russia/i18n/pt.json
new file mode 100644
index 000000000..e09247882
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Federação Russa",
+  "regionNames": "Assuntos Federais"
+}
diff --git a/packages/plugins/src/countries/Russia/i18n/ru.json b/packages/plugins/src/countries/Russia/i18n/ru.json
new file mode 100644
index 000000000..c498cdad1
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Российская Федерация",
+  "regionNames": "Субъекты Федерации"
+}
diff --git a/packages/plugins/src/countries/Russia/i18n/ta.json b/packages/plugins/src/countries/Russia/i18n/ta.json
new file mode 100644
index 000000000..7f0c1f5e2
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "இரஷ்ய கூட்டமைப்பு",
+  "regionNames": "ரஷ்ய கூட்டாட்சி பாடங்கள்"
+}
diff --git a/packages/plugins/src/countries/Russia/i18n/zh.json b/packages/plugins/src/countries/Russia/i18n/zh.json
new file mode 100644
index 000000000..6b2ea9dac
--- /dev/null
+++ b/packages/plugins/src/countries/Russia/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "俄罗斯联邦",
+  "regionNames": "俄罗斯联邦主体"
+}
diff --git a/packages/plugins/src/countries/Singapore/bundle.ts b/packages/plugins/src/countries/Singapore/bundle.ts
new file mode 100644
index 000000000..c80e8beb3
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/bundle.ts
@@ -0,0 +1,91 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Singapore: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'singapore',
+  regionNames: i18n.regionNames,
+  continent: 'asia',
+  extendedData: {
+    zipFormat: {
+      format: 'XXXXXX'
+    },
+    phoneFormat: {
+      displayFormats: ['XXXX XXXX']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Central Region',
+      regionShort: 'SG-01',
+      regionSlug: 'centralregion',
+      weight: 92,
+      cities: [
+        'Bishan',
+        'Bukit Merah',
+        'Bukit Timah',
+        'Downtown Core',
+        'Geylang',
+        'Kallang',
+        'Marina East',
+        'Marina South',
+        'Marine Parade',
+        'Museum',
+        'Newton',
+        'Novena',
+        'Orchard',
+        'Outram',
+        'Queenstown',
+        'River Valley',
+        'Rochor',
+        'Singapore River',
+        'Southern Islands',
+        'Straits View',
+        'Tanglin',
+        'Toa Payoh'
+      ]
+    },
+    {
+      regionName: 'East Region',
+      regionShort: 'ER',
+      regionSlug: 'eastregion',
+      weight: 69,
+      cities: ['Bedok', 'Changi', 'Changi Bay', 'Pasir Ris', 'Paya Lebar', 'Tampines']
+    },
+    {
+      regionName: 'North Region',
+      regionShort: 'CR',
+      regionSlug: 'northregion',
+      weight: 58,
+      cities: ['Central Water Catchment', 'Lim Chu Kang', 'Mandai', 'Sembawang', 'Simpang', 'Sungei Kadut', 'Woodlands', 'Yishun']
+    },
+    {
+      regionName: 'North-East Region',
+      regionShort: 'SG-02',
+      regionSlug: 'northeastregion',
+      weight: 93,
+      cities: ['Ang Mo Kio', 'Hougang', 'North-Eastern Islands', 'Punggol', 'Seletar', 'Sengkang', 'Serangoon']
+    },
+    {
+      regionName: 'West Region',
+      regionShort: 'CR',
+      regionSlug: 'westregion',
+      weight: 92,
+      cities: [
+        'Boon Lay',
+        'Bukit Batok',
+        'Bukit Panjang',
+        'Choa Chu Kang',
+        'Clementi',
+        'Jurong East',
+        'Jurong West',
+        'Pioneer',
+        'Tengah',
+        'Tuas',
+        'Western Islands',
+        'Western Water Catchment'
+      ]
+    }
+  ]
+});
+
+export default Singapore;
diff --git a/packages/plugins/src/countries/Singapore/i18n/ar.json b/packages/plugins/src/countries/Singapore/i18n/ar.json
new file mode 100644
index 000000000..cac40504d
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "سنغافورة",
+  "regionNames": "مناطق سنغافورة"
+}
diff --git a/packages/plugins/src/countries/Singapore/i18n/de.json b/packages/plugins/src/countries/Singapore/i18n/de.json
new file mode 100644
index 000000000..e60bd7e86
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Singapur",
+  "regionNames": "Regionen in Singapur"
+}
diff --git a/packages/plugins/src/countries/Singapore/i18n/en.json b/packages/plugins/src/countries/Singapore/i18n/en.json
new file mode 100644
index 000000000..9a1c78f33
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Singapore",
+  "regionNames": "Singapore regions"
+}
diff --git a/packages/plugins/src/countries/Singapore/i18n/es.json b/packages/plugins/src/countries/Singapore/i18n/es.json
new file mode 100644
index 000000000..d3cebbc79
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Singapur",
+  "regionNames": "Regiones de Singapur"
+}
diff --git a/packages/plugins/src/countries/Singapore/i18n/fr.json b/packages/plugins/src/countries/Singapore/i18n/fr.json
new file mode 100644
index 000000000..2966c329c
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Singapour",
+  "regionNames": "Régions de Singapour"
+}
diff --git a/packages/plugins/src/countries/Singapore/i18n/hi.json b/packages/plugins/src/countries/Singapore/i18n/hi.json
new file mode 100644
index 000000000..20d432fc5
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "सिंगापुर",
+  "regionNames": "सिंगापुर क्षेत्र"
+}
diff --git a/packages/plugins/src/countries/Singapore/i18n/ja.json b/packages/plugins/src/countries/Singapore/i18n/ja.json
new file mode 100644
index 000000000..4234ab3c3
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "シンガポール",
+  "regionNames": "シンガポール地域"
+}
diff --git a/packages/plugins/src/countries/Singapore/i18n/nl.json b/packages/plugins/src/countries/Singapore/i18n/nl.json
new file mode 100644
index 000000000..7d72bacf7
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Singapore",
+  "regionNames": "Regio's in Singapore"
+}
diff --git a/packages/plugins/src/countries/Singapore/i18n/pt.json b/packages/plugins/src/countries/Singapore/i18n/pt.json
new file mode 100644
index 000000000..862415e3f
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Cingapura",
+  "regionNames": "Regiões de Cingapura"
+}
diff --git a/packages/plugins/src/countries/Singapore/i18n/ru.json b/packages/plugins/src/countries/Singapore/i18n/ru.json
new file mode 100644
index 000000000..8ba91c0e4
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Сингапур",
+  "regionNames": "Сингапурские регионы"
+}
diff --git a/packages/plugins/src/countries/Singapore/i18n/ta.json b/packages/plugins/src/countries/Singapore/i18n/ta.json
new file mode 100644
index 000000000..dab595804
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "சிங்கப்பூர்",
+  "regionNames": "சிங்கப்பூர் பிராந்தியங்கள்"
+}
diff --git a/packages/plugins/src/countries/Singapore/i18n/zh.json b/packages/plugins/src/countries/Singapore/i18n/zh.json
new file mode 100644
index 000000000..f10ef3b9f
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "新加坡",
+  "regionNames": "新加坡地区"
+}
diff --git a/packages/plugins/src/countries/Singapore/names.ts b/packages/plugins/src/countries/Singapore/names.ts
new file mode 100644
index 000000000..12b4c217f
--- /dev/null
+++ b/packages/plugins/src/countries/Singapore/names.ts
@@ -0,0 +1,518 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Alex',
+  'Alexis',
+  'Alicia',
+  'Alisa',
+  'Amanda',
+  'Amelia ',
+  'Amoleka',
+  'Anastacia',
+  'Angelina',
+  'Ashley',
+  'Belle',
+  'Beth',
+  'Chang',
+  'Charmaine',
+  'Cherie kok',
+  'Cherilyn',
+  'Cheryl',
+  'Chloe',
+  'Claire',
+  'Claris',
+  'Danielle',
+  'Dee',
+  'Dina',
+  'Dionne',
+  'Elizabeth',
+  'Emily',
+  'Eunice',
+  'Felicia',
+  'Gen',
+  'Giselle',
+  'Gladys',
+  'Hannah',
+  'Hanni',
+  'Hazel',
+  'Iris',
+  'Isabel',
+  'Isabelle',
+  'Jaime',
+  'Jaslyn',
+  'Jasmine',
+  'Jazreen',
+  'Jean',
+  'Jiemin',
+  'Jing Yi',
+  'Joanne',
+  'Joyce',
+  'Kelly',
+  'Kim',
+  'Kristine',
+  'Leisrin',
+  'Lucianna',
+  'Lydiah',
+  'Mai',
+  'Marjorie',
+  'Michele',
+  'Michelle',
+  'Min',
+  'Mitchie',
+  'Natasha',
+  'Nicole',
+  'Nina',
+  'Paula',
+  'Peggy',
+  'Qistina',
+  'Rachael',
+  'Rachel',
+  'Radiance',
+  'Regina',
+  'Renee',
+  'Ria',
+  'Sabrina',
+  'Samantha',
+  'Sarah',
+  'Sofia',
+  'Sophie',
+  'Star',
+  'Su',
+  'Tara',
+  'Tarini',
+  'Therese',
+  'Tuti',
+  'Val',
+  'Valerie',
+  'Vanessa',
+  'Vivian ',
+  'Xin',
+  'Xin Jie',
+  'Yi Jia',
+  'Yuna',
+  'Yuri'
+];
+
+const maleNames = [
+  'Ace',
+  'Adam',
+  'Alan',
+  'Alex',
+  'Aloy',
+  'Alv',
+  'Andrew',
+  'Aniq',
+  'Aqmal',
+  'Austin',
+  'Ayden',
+  'Ben',
+  'Benjamin',
+  'Chen',
+  'Cheong',
+  'Christopher',
+  'Chua',
+  'Chun Hwee',
+  'Clemens',
+  'Damien',
+  'Danial',
+  'Daniel',
+  'Darren',
+  'Darryl',
+  'Derrick',
+  'Derrik',
+  'Dominic',
+  'Drew',
+  'Edison',
+  'Elroy',
+  'Ethan',
+  'Eugene',
+  'Fuzz',
+  'Gabriel',
+  'Grantdy',
+  'Haruka',
+  'Hong wei',
+  'Irfan',
+  'Imran',
+  'Isaac',
+  'J',
+  'Jackson',
+  'Jareth',
+  'Jason',
+  'Javier',
+  'Jess',
+  'Jolly',
+  'Jonathan',
+  'Jordan',
+  'Joseph',
+  'Joshua',
+  'Jun Wei',
+  'Justin',
+  'Ke Wei',
+  'Keefe',
+  'Ken',
+  'Kevan',
+  'Khey',
+  'Koh',
+  'Lance',
+  'Lee',
+  'Lim',
+  'Low',
+  'Lyon',
+  'Marcus',
+  'Martin',
+  'Max',
+  'Michael',
+  'Morgan',
+  'Nathaniel',
+  'Nicholas',
+  'Nish',
+  'Norman',
+  'Orion',
+  'Peisen',
+  'Richard',
+  'Roy',
+  'Ryan',
+  'Sean',
+  'Shahir',
+  'Shane',
+  'Sharan',
+  'Siegfried',
+  'Swami',
+  'Thane',
+  'Tony',
+  'Trivikram',
+  'Tyris',
+  'Wayne',
+  'Wei',
+  'Xavier',
+  'YongJae',
+  'Zack',
+  'Zander'
+];
+
+const lastNames = [
+  'Ahmad',
+  'Ali',
+  'Alsagoff',
+  'An',
+  'Ang',
+  'Au',
+  'Aung',
+  'Ban',
+  'Bao',
+  'Bi',
+  'Boon',
+  'Cai',
+  'Cao',
+  'Cha',
+  'Chai',
+  'Chan',
+  'Chang',
+  'Chao',
+  'Che',
+  'Cheah',
+  'Cheang',
+  'Chee',
+  'Chen',
+  'Cheng',
+  'Cheong',
+  'Cheung',
+  'Chew',
+  'Chi',
+  'Chia',
+  'Chin',
+  'Ching',
+  'Chionh',
+  'Chiu',
+  'Chng',
+  'Cho',
+  'Choi',
+  'Chong',
+  'Choo',
+  'Choong',
+  'Chou',
+  'Chow',
+  'Choy',
+  'Chu',
+  'Chua',
+  'Chui',
+  'Chung',
+  'Cui',
+  'Dai',
+  'Deng',
+  'Ding',
+  'Dong',
+  'Duan',
+  'Ee',
+  'Fan',
+  'Fang',
+  'Feng',
+  'Fok',
+  'Fong',
+  'Foo',
+  'Foong',
+  'Fu',
+  'Fung',
+  'Gan',
+  'Gao',
+  'Ge',
+  'Goh',
+  'Gong',
+  'Gu',
+  'Guan',
+  'Guo',
+  'Gupta',
+  'Han',
+  'Hang',
+  'Hao',
+  'He',
+  'Heng',
+  'Ho',
+  'Hong',
+  'Hou',
+  'Hu',
+  'Hua',
+  'Huang',
+  'Hui',
+  'Hwang',
+  'Hwee',
+  'Jain',
+  'Jang',
+  'Jia',
+  'Jiang',
+  'Jie',
+  'Jin',
+  'Jing',
+  'Jong',
+  'Jung',
+  'Kai',
+  'Kan',
+  'Kang',
+  'Kannan',
+  'Kaur',
+  'Ke',
+  'Kee',
+  'Khan',
+  'Khoo',
+  'Kim',
+  'Ko',
+  'Koh',
+  'Kong',
+  'Koo',
+  'Krishnan',
+  'Ku',
+  'Kuang',
+  'Kum',
+  'Kumar',
+  'Kung',
+  'Kwa',
+  'Kwan',
+  'Kwee',
+  'Kwek',
+  'Kwok',
+  'Kwon',
+  'Kwong',
+  'Lai',
+  'Lam',
+  'Lan',
+  'Lang',
+  'Lao',
+  'Lau',
+  'Law',
+  'Lay',
+  'Lee',
+  'Lei',
+  'Leng',
+  'Leong',
+  'Leow',
+  'Leung',
+  'Lew',
+  'Li',
+  'Lian',
+  'Liang',
+  'Liao',
+  'Liew',
+  'Lim',
+  'Lin',
+  'Ling',
+  'Liu',
+  'Loh',
+  'Loke',
+  'Loo',
+  'Lou',
+  'Lu',
+  'Lui',
+  'Luo',
+  'Lwin',
+  'Lye',
+  'Ma',
+  'Mai',
+  'Man',
+  'Mani',
+  'Mao',
+  'Mei',
+  'Meng',
+  'Miao',
+  'Min',
+  'Ming',
+  'Mo',
+  'Mohan',
+  'Mok',
+  'Mu',
+  'Mun',
+  'Myint',
+  'Nai',
+  'Naing',
+  'Nair',
+  'Neo',
+  'Ng',
+  'Ngai',
+  'Nguyen',
+  'Ni',
+  'Ong',
+  'Oo',
+  'Ooi',
+  'Ou',
+  'Ow',
+  'Pak',
+  'Pan',
+  'Pang',
+  'Peh',
+  'Pei',
+  'Peng',
+  'Phang',
+  'Phua',
+  'Ping',
+  'Png',
+  'Poh',
+  'Pok',
+  'Pong',
+  'Poon',
+  'Qi',
+  'Qin',
+  'Qiu',
+  'Qu',
+  'Quan',
+  'Quek',
+  'Rahman',
+  'Raj',
+  'Reddy',
+  'Ren',
+  'Sato',
+  'Seah',
+  'Seet',
+  'Seetoh',
+  'Seng',
+  'Seo',
+  'Seow',
+  'Sha',
+  'Shah',
+  'Shang',
+  'Shao',
+  'Sharma',
+  'Shen',
+  'Sheng',
+  'Shi',
+  'Shin',
+  'Shu',
+  'Shum',
+  'Si',
+  'Sim',
+  'Sin',
+  'Singh',
+  'Siu',
+  'So',
+  'Soe',
+  'Soh',
+  'Son',
+  'Song',
+  'Soo',
+  'Soon',
+  'Su',
+  'Subramanian',
+  'Sui',
+  'Sun',
+  'Sze',
+  'Tai',
+  'Tan',
+  'Tanaka',
+  'Tang',
+  'Tao',
+  'Tay',
+  'Tee',
+  'Teh',
+  'Teng',
+  'Teo',
+  'Teoh',
+  'Tham',
+  'Thia',
+  'Tian',
+  'Ting',
+  'Toh',
+  'Tong',
+  'Tsang',
+  'Tse',
+  'Tsui',
+  'Tu',
+  'Tun',
+  'Wang',
+  'Wee',
+  'Wen',
+  'Win',
+  'Won',
+  'Wong',
+  'Woo',
+  'Woon',
+  'Wu',
+  'Xia',
+  'Xiang',
+  'Xiao',
+  'Xie',
+  'Xin',
+  'Xing',
+  'Xiong',
+  'Xu',
+  'Xue',
+  'Yan',
+  'Yang',
+  'Yao',
+  'Yap',
+  'Ye',
+  'Yee',
+  'Yeoh',
+  'Yeow',
+  'Yeung',
+  'Yew',
+  'Yi',
+  'Yim',
+  'Yin',
+  'Ying',
+  'Yip',
+  'Yong',
+  'You',
+  'Yu',
+  'Yuan',
+  'Yue',
+  'Yuen',
+  'Yun',
+  'Yung',
+  'Zhai',
+  'Zhan',
+  'Zhang',
+  'Zhao',
+  'Zheng',
+  'Zhong',
+  'Zhou',
+  'Zhu',
+  'Zhuang',
+  'Zhuo',
+  'Zou'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/SouthAfrica/bundle.ts b/packages/plugins/src/countries/SouthAfrica/bundle.ts
new file mode 100644
index 000000000..90bec7eae
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/bundle.ts
@@ -0,0 +1,134 @@
+import { GetCountryData } from '@generatedata/types';
+
+const SouthAfrica: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'southafrica',
+  regionNames: i18n.regionNames,
+  continent: 'africa',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxx-xxxx'
+    },
+    phoneFormat: {
+      displayFormats: ['XXX XXX XXXX', '0XX XXX XXXX']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Eastern Cape',
+      regionShort: 'EC',
+      regionSlug: 'easterncape',
+      weight: 6,
+      cities: [
+        'Alice',
+        'Butterworth',
+        'East London',
+        'Graaff-Reinet',
+        'Grahamstown',
+        "King William's Town",
+        'Mthatha',
+        'Port Elizabeth',
+        'Queenstown',
+        'Uitenhage',
+        'Zwelitsha'
+      ]
+    },
+    {
+      regionName: 'Free State',
+      regionShort: 'FS',
+      regionSlug: 'freestate',
+      weight: 3,
+      cities: [
+        'Bethlehem',
+        'Bloemfontein',
+        'Jagersfontein',
+        'Kroonstad',
+        'Odendaalsrus',
+        'Parys',
+        'Phuthaditjhaba',
+        'Sasolburg',
+        'Virginia',
+        'Welkom'
+      ]
+    },
+    {
+      regionName: 'Gauteng',
+      regionShort: 'GP',
+      regionSlug: 'gauteng',
+      weight: 12,
+      cities: [
+        'Benoni',
+        'Boksburg',
+        'Brakpan',
+        'Carletonville',
+        'Germiston',
+        'Johannesburg',
+        'Krugersdorp',
+        'Pretoria',
+        'Randburg',
+        'Randfontein',
+        'Roodepoort',
+        'Soweto',
+        'Springs',
+        'Vanderbijlpark',
+        'Vereeniging'
+      ]
+    },
+    {
+      regionName: 'KwaZulu-Natal',
+      regionShort: 'KZN',
+      regionSlug: 'kwazulunatal',
+      weight: 10,
+      cities: ['Durban', 'Empangeni', 'Ladysmith', 'Newcastle', 'Pietermaritzburg', 'Pinetown', 'Ulundi', 'Umlazi']
+    },
+    {
+      regionName: 'Limpopo',
+      regionShort: 'LP',
+      regionSlug: 'limpopo',
+      weight: 5,
+      cities: ['Giyani', 'Lebowakgomo', 'Musina', 'Phalaborwa', 'Polokwane', 'Seshego', 'Sibasa', 'Thabazimbi']
+    },
+    {
+      regionName: 'Mpumalanga',
+      regionShort: 'MP',
+      regionSlug: 'mpumalanga',
+      weight: 4,
+      cities: ['Emalahleni', 'Nelspruit', 'Secunda']
+    },
+    {
+      regionName: 'Northern Cape',
+      regionShort: 'NC',
+      regionSlug: 'northerncape',
+      weight: 1,
+      cities: ['Kimberley', 'Kuruman', 'Port Nolloth']
+    },
+    {
+      regionName: 'North West',
+      regionShort: 'NW',
+      regionSlug: 'northwest',
+      weight: 3,
+      cities: ['Klerksdorp', 'Mahikeng', 'Mmabatho', 'Potchefstroom', 'Rustenburg']
+    },
+    {
+      regionName: 'Western Cape',
+      regionShort: 'WC',
+      regionSlug: 'westerncape',
+      weight: 6,
+      cities: [
+        'Bellville',
+        'Cape Town',
+        'Constantia',
+        'George',
+        'Hopefield',
+        'Oudtshoorn',
+        'Paarl',
+        "Simon's Town",
+        'Stellenbosch',
+        'Swellendam',
+        'Worcester'
+      ]
+    }
+  ]
+});
+
+export default SouthAfrica;
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/ar.json b/packages/plugins/src/countries/SouthAfrica/i18n/ar.json
new file mode 100644
index 000000000..f69ae4153
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "جنوب أفريقيا",
+  "regionNames": "مقاطعات جنوب افريقيا"
+}
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/de.json b/packages/plugins/src/countries/SouthAfrica/i18n/de.json
new file mode 100644
index 000000000..1941e80ea
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Südafrika",
+  "regionNames": "Provinzen in Südafrika"
+}
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/en.json b/packages/plugins/src/countries/SouthAfrica/i18n/en.json
new file mode 100644
index 000000000..1497ae59d
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "South Africa",
+  "regionNames": "South Africa provinces"
+}
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/es.json b/packages/plugins/src/countries/SouthAfrica/i18n/es.json
new file mode 100644
index 000000000..3aeeae9b9
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Sudáfrica",
+  "regionNames": "Provincias de Sudáfrica"
+}
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/fr.json b/packages/plugins/src/countries/SouthAfrica/i18n/fr.json
new file mode 100644
index 000000000..d9273c4cd
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Afrique du Sud",
+  "regionNames": "Provinces d'Afrique du Sud"
+}
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/hi.json b/packages/plugins/src/countries/SouthAfrica/i18n/hi.json
new file mode 100644
index 000000000..55bed7b44
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "दक्षिण अफ्रीका",
+  "regionNames": "दक्षिण अफ़्रीका प्रांत"
+}
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/ja.json b/packages/plugins/src/countries/SouthAfrica/i18n/ja.json
new file mode 100644
index 000000000..3227b4a48
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "南アフリカ",
+  "regionNames": "南アフリカの州"
+}
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/nl.json b/packages/plugins/src/countries/SouthAfrica/i18n/nl.json
new file mode 100644
index 000000000..68bad0e67
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Zuid-Afrika",
+  "regionNames": "Zuid-Afrikaanse provincies"
+}
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/pt.json b/packages/plugins/src/countries/SouthAfrica/i18n/pt.json
new file mode 100644
index 000000000..f0b529f38
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "África do Sul",
+  "regionNames": "Províncias da África do Sul"
+}
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/ru.json b/packages/plugins/src/countries/SouthAfrica/i18n/ru.json
new file mode 100644
index 000000000..aad8cb0d7
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Южная Африка",
+  "regionNames": "Провинции ЮАР"
+}
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/ta.json b/packages/plugins/src/countries/SouthAfrica/i18n/ta.json
new file mode 100644
index 000000000..0c56cb532
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "தென்னாப்பிரிக்கா",
+  "regionNames": "தென்னாப்பிரிக்கா மாகாணங்கள்"
+}
diff --git a/packages/plugins/src/countries/SouthAfrica/i18n/zh.json b/packages/plugins/src/countries/SouthAfrica/i18n/zh.json
new file mode 100644
index 000000000..f0835ed8f
--- /dev/null
+++ b/packages/plugins/src/countries/SouthAfrica/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "南非",
+  "regionNames": "南非省份"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/bundle.ts b/packages/plugins/src/countries/SouthKorea/bundle.ts
new file mode 100644
index 000000000..5d0ef5f9f
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/bundle.ts
@@ -0,0 +1,132 @@
+import { GetCountryData } from '@generatedata/types';
+
+const SouthKorea: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'southkorea',
+  regionNames: i18n.regionNames,
+  continent: 'asia',
+  extendedData: {
+    zipFormat: {
+      format: 'Xxxxx',
+      replacements: {
+        X: '012'
+      }
+    },
+    phoneFormat: {
+      areaCodes: ['031', '032', '033', '041', '042', '043', '044', '049', '051', '052', '053', '054', '055', '061', '062', '063', '064'],
+      displayFormats: ['AAA-xxx-xxxx']
+    }
+  },
+  regions: [
+    {
+      regionName: 'North Chungcheong',
+      regionShort: 'Chungbuk',
+      regionSlug: 'chungbuk',
+      weight: 16,
+      cities: ['Chungju', 'Jecheon']
+    },
+    {
+      regionName: 'South Chungcheong',
+      regionShort: 'Chungnam',
+      regionSlug: 'chungnam',
+      weight: 20,
+      cities: ['Daejeon', 'Asan', 'Dangjin', 'Nonsan', 'Gongju', 'Boryeong']
+    },
+    {
+      regionName: 'Gangwon',
+      regionShort: 'Gangwon',
+      regionSlug: 'gangwon',
+      weight: 15,
+      cities: ['Wonju', 'Chuncheon', 'Gangneung']
+    },
+    {
+      regionName: 'Gyeonggi',
+      regionShort: 'Gyeonggi',
+      regionSlug: 'gyeonggi',
+      weight: 122,
+      cities: [
+        'Seoul',
+        'Incheon',
+        'Gwangju',
+        'Suwon',
+        'Goyang',
+        'Yongin',
+        'Seongnam',
+        'Bucheon',
+        'Ansan',
+        'Namyangju',
+        'Hwaseong',
+        'Anyang',
+        'Pyeongtaek',
+        'Siheung',
+        'Uijeongbu',
+        'Paju',
+        'Gimpo',
+        'Gwangmyeong',
+        'Gwangju',
+        'Gunpo',
+        'Osan',
+        'Icheon',
+        'Yangju',
+        'Anseong',
+        'Guri',
+        'Pocheon',
+        'Uiwang',
+        'Hanam',
+        'Yeoju',
+        'Dongducheon'
+      ]
+    },
+    {
+      regionName: 'North Gyeongsang',
+      regionShort: 'Gyeongbuk',
+      regionSlug: 'gyeongbuk',
+      weight: 27,
+      cities: ['Cheongju', 'Pohang', 'Gumi', 'Gyeongsan', 'Gyeongju', 'Andong', 'Gimcheon', 'Yeongju', 'Sangju', 'Yeongcheon']
+    },
+    {
+      regionName: 'South Gyeongsang',
+      regionShort: 'Gyeongnam',
+      regionSlug: 'gyeongnam',
+      weight: 34,
+      cities: [
+        'Busan',
+        'Daegu',
+        'Ulsan',
+        'Changwon',
+        'Cheonan',
+        'Gimhae',
+        'Jinju',
+        'Yangsan',
+        'Geoje',
+        'Seosan',
+        'Tongyeong',
+        'Sacheon',
+        'Miryang'
+      ]
+    },
+    {
+      regionName: 'North Jeolla',
+      regionShort: 'Jeonbuk',
+      regionSlug: 'jeonbuk',
+      weight: 34,
+      cities: ['Jeonju', 'Iksan', 'Gunsan', 'Jeongeup']
+    },
+    {
+      regionName: 'South Jeolla',
+      regionShort: 'Jeonnam',
+      regionSlug: 'jeonnam',
+      weight: 19,
+      cities: ['Yeosu', 'Suncheon', 'Mokpo', 'Gwangyang']
+    },
+    {
+      regionName: 'Jeju',
+      regionShort: 'Jeju',
+      regionSlug: 'jeju',
+      weight: 5,
+      cities: ['Jeju', 'Seogwipo']
+    }
+  ]
+});
+
+export default SouthKorea;
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/ar.json b/packages/plugins/src/countries/SouthKorea/i18n/ar.json
new file mode 100644
index 000000000..21f8f58cb
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "كوريا الجنوبية",
+  "regionNames": "مقاطعات كوريا الجنوبية"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/de.json b/packages/plugins/src/countries/SouthKorea/i18n/de.json
new file mode 100644
index 000000000..1b1a80629
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Südkorea",
+  "regionNames": "Provinzen Südkoreas"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/en.json b/packages/plugins/src/countries/SouthKorea/i18n/en.json
new file mode 100644
index 000000000..5a93140e1
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "South Korea",
+  "regionNames": "South Korea provinces"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/es.json b/packages/plugins/src/countries/SouthKorea/i18n/es.json
new file mode 100644
index 000000000..584322100
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Corea del Sur",
+  "regionNames": "provincias de corea del sur"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/fr.json b/packages/plugins/src/countries/SouthKorea/i18n/fr.json
new file mode 100644
index 000000000..ed960df75
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Corée du Sud",
+  "regionNames": "Provinces de Corée du Sud"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/hi.json b/packages/plugins/src/countries/SouthKorea/i18n/hi.json
new file mode 100644
index 000000000..0bac67a85
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "दक्षिण कोरिया",
+  "regionNames": "दक्षिण कोरिया प्रांत"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/ja.json b/packages/plugins/src/countries/SouthKorea/i18n/ja.json
new file mode 100644
index 000000000..7def85e41
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "韓国",
+  "regionNames": "韓国の地方"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/nl.json b/packages/plugins/src/countries/SouthKorea/i18n/nl.json
new file mode 100644
index 000000000..8e45e239a
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Zuid-Korea",
+  "regionNames": "Zuid-Koreaanse provincies"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/pt.json b/packages/plugins/src/countries/SouthKorea/i18n/pt.json
new file mode 100644
index 000000000..36dd52fe4
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Coreia do Sul",
+  "regionNames": "Províncias da Coréia do Sul"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/ru.json b/packages/plugins/src/countries/SouthKorea/i18n/ru.json
new file mode 100644
index 000000000..a57184064
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Южная Корея",
+  "regionNames": "Провинции Южной Кореи"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/ta.json b/packages/plugins/src/countries/SouthKorea/i18n/ta.json
new file mode 100644
index 000000000..c25ff542b
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "தென் கொரியா",
+  "regionNames": "தென் கொரியா மாகாணங்கள்"
+}
diff --git a/packages/plugins/src/countries/SouthKorea/i18n/zh.json b/packages/plugins/src/countries/SouthKorea/i18n/zh.json
new file mode 100644
index 000000000..049b2b064
--- /dev/null
+++ b/packages/plugins/src/countries/SouthKorea/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "韩国",
+  "regionNames": "韩国各省"
+}
diff --git a/packages/plugins/src/countries/Spain/bundle.ts b/packages/plugins/src/countries/Spain/bundle.ts
new file mode 100644
index 000000000..1cc072e7c
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/bundle.ts
@@ -0,0 +1,192 @@
+/**
+ * Spanish autonomies and cities with population >= 100.000 or province heads
+ * Weight: percentage of population of the region to the total of Spain * 100
+ * Source: https://es.wikipedia.org/wiki/Anexo%3AMunicipios_de_Espa%C3%B1a_por_poblaci%C3%B3n
+ * @package Countries
+ */
+import { GetCountryData } from '@generatedata/types';
+
+const Spain: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'spain',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxxx'
+    }
+  },
+  regions: [
+    {
+      regionName: 'Andalucía',
+      regionShort: 'AN',
+      regionSlug: 'andalucia',
+      weight: 1788,
+      cities: [
+        'Almería',
+        'Cádiz',
+        'Córdoba',
+        'Granada',
+        'Sevilla',
+        'Huelva',
+        'Jaén',
+        'Málaga',
+        'Jerez de la Frontera',
+        'Marbella',
+        'Dos Hermanas',
+        'Algeciras'
+      ]
+    },
+    {
+      regionName: 'Aragón',
+      regionShort: 'AR',
+      regionSlug: 'aragon',
+      weight: 286,
+      cities: ['Huesca', 'Teruel', 'Zaragoza']
+    },
+    {
+      regionName: 'Principado de Asturias',
+      regionShort: 'AS',
+      regionSlug: 'asturias',
+      weight: 228,
+      cities: ['Oviedo', 'Gijón']
+    },
+    {
+      regionName: 'Cantabria',
+      regionShort: 'CA',
+      regionSlug: 'cantabria',
+      weight: 126,
+      cities: ['Santander']
+    },
+    {
+      regionName: 'Castilla - La Mancha',
+      regionShort: 'CM',
+      regionSlug: 'clm',
+      weight: 449,
+      cities: ['Ciudad Real', 'Albacete', 'Cuenca', 'Toledo', 'Guadalajara']
+    },
+    {
+      regionName: 'Castilla y León',
+      regionShort: 'CL',
+      regionSlug: 'cle',
+      weight: 539,
+      cities: ['Burgos', 'León', 'Palencia', 'Valladolid', 'Zamora', 'Ávila', 'Salamanca', 'Segovia', 'Soria']
+    },
+    {
+      regionName: 'Catalunya',
+      regionShort: 'CA',
+      regionSlug: 'cataluña',
+      weight: 1602,
+      cities: [
+        'Barcelona',
+        'Tarragona',
+        'Girona',
+        'Lleida',
+        "L'Hospitalet de Llobregat",
+        'Badalona',
+        'Tarrasa',
+        'Sabadell',
+        'Mataró',
+        'Santa Coloma de Gramenet',
+        'Reus'
+      ]
+    },
+    {
+      regionName: 'Ceuta',
+      regionShort: 'CE',
+      regionSlug: 'ceuta',
+      weight: 18,
+      cities: ['Ceuta']
+    },
+    {
+      regionName: 'Comunitat Valenciana',
+      regionShort: 'CV',
+      regionSlug: 'valencia',
+      weight: 1085,
+      cities: ['Castelló', 'Valéncia', 'Alacant', 'Elx', 'Torrevieja']
+    },
+    {
+      regionName: 'Canarias',
+      regionShort: 'CN',
+      regionSlug: 'canarias',
+      weight: 448,
+      cities: ['Santa Cruz de Tenerife', 'Las Palmas', 'San Cristóbal de la Laguna', 'Telde']
+    },
+    {
+      regionName: 'Illes Balears',
+      regionShort: 'BA',
+      regionSlug: 'baleares',
+      weight: 237,
+      cities: ['Palma de Mallorca']
+    },
+    {
+      regionName: 'Extremadura',
+      regionShort: 'EX',
+      regionSlug: 'extremadura',
+      weight: 234,
+      cities: ['Badajoz', 'Cáceres']
+    },
+    {
+      regionName: 'Galicia',
+      regionShort: 'GA',
+      regionSlug: 'galicia',
+      weight: 588,
+      cities: ['A Coruña', 'Ourense', 'Lugo', 'Pontevedra', 'Vigo']
+    },
+    {
+      regionName: 'Madrid',
+      regionShort: 'MA',
+      regionSlug: 'madrid',
+      weight: 1375,
+      cities: [
+        'Madrid',
+        'Móstoles',
+        'Alcalá de Henares',
+        'Fuenlabrada',
+        'Leganés',
+        'Getafe',
+        'Alcorcón',
+        'Torrejón de Ardoz',
+        'Parla',
+        'Alcobendas'
+      ]
+    },
+    {
+      regionName: 'Melilla',
+      regionShort: 'ME',
+      regionSlug: 'melilla',
+      weight: 17,
+      cities: ['Melilla']
+    },
+    {
+      regionName: 'Murcia',
+      regionShort: 'MU',
+      regionSlug: 'murcia',
+      weight: 312,
+      cities: ['Murcia', 'Cartagena']
+    },
+    {
+      regionName: 'Navarra',
+      regionShort: 'NA',
+      regionSlug: 'navarra',
+      weight: 136,
+      cities: ['Pamplona']
+    },
+    {
+      regionName: 'Euskadi',
+      regionShort: 'PV',
+      regionSlug: 'paisvasco',
+      weight: 464,
+      cities: ['Bilbo', 'Donosti', 'Gasteiz', 'Baracaldo']
+    },
+    {
+      regionName: 'La Rioja',
+      regionShort: 'LR',
+      regionSlug: 'larioja',
+      weight: 68,
+      cities: ['Logroño']
+    }
+  ]
+});
+
+export default Spain;
diff --git a/packages/plugins/src/countries/Spain/i18n/ar.json b/packages/plugins/src/countries/Spain/i18n/ar.json
new file mode 100644
index 000000000..a23fe782c
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "إسبانيا",
+  "regionNames": "الحكم الذاتي الاسباني"
+}
diff --git a/packages/plugins/src/countries/Spain/i18n/de.json b/packages/plugins/src/countries/Spain/i18n/de.json
new file mode 100644
index 000000000..cc7891cdd
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Spanien",
+  "regionNames": "Spanische Autonomien"
+}
diff --git a/packages/plugins/src/countries/Spain/i18n/en.json b/packages/plugins/src/countries/Spain/i18n/en.json
new file mode 100644
index 000000000..bca67af8e
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Spain",
+  "regionNames": "Spanish Autonomies"
+}
diff --git a/packages/plugins/src/countries/Spain/i18n/es.json b/packages/plugins/src/countries/Spain/i18n/es.json
new file mode 100644
index 000000000..fc64887e2
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "España",
+  "regionNames": "Autonomías Españolas"
+}
diff --git a/packages/plugins/src/countries/Spain/i18n/fr.json b/packages/plugins/src/countries/Spain/i18n/fr.json
new file mode 100644
index 000000000..7de5cee9b
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Espagne",
+  "regionNames": "Autonomies espagnoles"
+}
diff --git a/packages/plugins/src/countries/Spain/i18n/hi.json b/packages/plugins/src/countries/Spain/i18n/hi.json
new file mode 100644
index 000000000..87804cb5b
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "स्पेन",
+  "regionNames": "स्पेनिश स्वायत्तता"
+}
diff --git a/packages/plugins/src/countries/Spain/i18n/ja.json b/packages/plugins/src/countries/Spain/i18n/ja.json
new file mode 100644
index 000000000..f31212e4f
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "スペイン",
+  "regionNames": "スペインの自治区"
+}
diff --git a/packages/plugins/src/countries/Spain/i18n/nl.json b/packages/plugins/src/countries/Spain/i18n/nl.json
new file mode 100644
index 000000000..4cb373e6d
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Spanje",
+  "regionNames": "Spaanse autonomie"
+}
diff --git a/packages/plugins/src/countries/Spain/i18n/pt.json b/packages/plugins/src/countries/Spain/i18n/pt.json
new file mode 100644
index 000000000..3d5c33c5c
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Espanha",
+  "regionNames": "Autonomias espanholas"
+}
diff --git a/packages/plugins/src/countries/Spain/i18n/ru.json b/packages/plugins/src/countries/Spain/i18n/ru.json
new file mode 100644
index 000000000..7b5d1f5b6
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Испания",
+  "regionNames": "Испанские автономии"
+}
diff --git a/packages/plugins/src/countries/Spain/i18n/ta.json b/packages/plugins/src/countries/Spain/i18n/ta.json
new file mode 100644
index 000000000..056799e54
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ஸ்பெயின்",
+  "regionNames": "ஸ்பானிஷ் தன்னாட்சிகள்"
+}
diff --git a/packages/plugins/src/countries/Spain/i18n/zh.json b/packages/plugins/src/countries/Spain/i18n/zh.json
new file mode 100644
index 000000000..3490719cf
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "西班牙",
+  "regionNames": "西班牙自治"
+}
diff --git a/packages/plugins/src/countries/Spain/names.ts b/packages/plugins/src/countries/Spain/names.ts
new file mode 100644
index 000000000..cfa31e780
--- /dev/null
+++ b/packages/plugins/src/countries/Spain/names.ts
@@ -0,0 +1,530 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Adriana',
+  'Agustina',
+  'Aida',
+  'Aldea',
+  'Alejandra',
+  'Alicia',
+  'Alma',
+  'Almudena',
+  'Amalia',
+  'Amaya',
+  'Amparo',
+  'Ana',
+  'Anabel',
+  'Andrea',
+  'Andreina',
+  'Anita',
+  'Antonella',
+  'Antonia',
+  'Araceli',
+  'Aurora',
+  'Beatriz',
+  'Bettina',
+  'Bianca',
+  'Blanca',
+  'Blanche',
+  'Bonita',
+  'Cari',
+  'Carina',
+  'Carla',
+  'Carlota',
+  'Carlota',
+  'Carlotta',
+  'Carmelita',
+  'Carolina',
+  'Catalina',
+  'Celia',
+  'Chara',
+  'Christina',
+  'Claudia',
+  'Concepción',
+  'Conchita',
+  'Consuelo',
+  'Cristina',
+  'Cynthia',
+  'Delia',
+  'Diana',
+  'Dolores',
+  'Dora',
+  'Elena',
+  'Eliana',
+  'Elisa',
+  'Elvira',
+  'Erika',
+  'Esperanza',
+  'Ester',
+  'Eugenia',
+  'Eva',
+  'Fatima',
+  'Fernanda',
+  'Fiorella',
+  'Flavia',
+  'Flora',
+  'Gabriela',
+  'Garbiñe',
+  'Gisela',
+  'Gloria',
+  'Guiomar',
+  'Helena',
+  'Hilda',
+  'Ignacia',
+  'Ileana',
+  'Ilona',
+  'Imelda',
+  'Ines',
+  'Inez',
+  'Irene',
+  'Iris',
+  'Isa',
+  'Isabel',
+  'Isabella',
+  'Ivette',
+  'Ivonne',
+  'Jacin',
+  'Jacqueline',
+  'Javiera',
+  'Joaquina',
+  'Josefa',
+  'Josefina',
+  'Juana',
+  'Julia',
+  'Justina',
+  'Karina',
+  'Lana',
+  'Lara',
+  'Laura',
+  'Lena',
+  'Lidia',
+  'Liliana',
+  'Lolita',
+  'Lorena',
+  'Luciana',
+  'Luisa',
+  'Lupe',
+  'Lupita',
+  'Luz',
+  'Macarena',
+  'Magdalena',
+  'Manuela',
+  'Marcela',
+  'Margarita',
+  'Maria',
+  'María',
+  'María',
+  'María',
+  'Mariana',
+  'Mariela',
+  'Marina',
+  'Marisa',
+  'Marisela',
+  'Marisol',
+  'Marta',
+  'Martina',
+  'Maru',
+  'Maruja',
+  'Maura',
+  'Maya',
+  'Melania',
+  'Melina',
+  'Mercedes',
+  'Merilyn',
+  'Milagros',
+  'Milena',
+  'Millaray',
+  'Mirta',
+  'Morena',
+  'Nadia',
+  'Natalia',
+  'Nazaret',
+  'Nena',
+  'Noelia',
+  'Núria',
+  'Olga',
+  'Paloma',
+  'Paula',
+  'Paulina',
+  'Pierina',
+  'Pilar',
+  'Purita',
+  'Ramona',
+  'Raquel',
+  'Rita',
+  'Rocío',
+  'Rosa',
+  'Rosalia',
+  'Rosario',
+  'Salma',
+  'Samara',
+  'Sandra',
+  'Silvia',
+  'Silvina',
+  'Simone',
+  'Soledad',
+  'Sonia',
+  'Sophia',
+  'Soraya',
+  'Tamara',
+  'Tara',
+  'Tatiana',
+  'Teresa',
+  'Tina',
+  'Tomasa',
+  'Tona',
+  'Tonia',
+  'Urraca',
+  'Valentina',
+  'Valeria',
+  'Veronica',
+  'Victoria',
+  'Vilma',
+  'Viola',
+  'Violeta',
+  'Virginia',
+  'Viridiana',
+  'Xiomara',
+  'Xóchitl',
+  'Yanet',
+  'Yazmin',
+  'Zulema'
+];
+
+const maleNames = [
+  'Aarón',
+  'Abel',
+  'Abelardo',
+  'Abraham',
+  'Adan',
+  'Ademar',
+  'Adrià',
+  'Adriano',
+  'Agustín',
+  'Alberto',
+  'Alejandro',
+  'Alfredo',
+  'Alonso',
+  'Alphons',
+  'Álvaro',
+  'Amílcar',
+  'Angel',
+  'José',
+  'Aníbal',
+  'Antero',
+  'Antonin',
+  'Antonio',
+  'Armando',
+  'Arnaldo',
+  'Arnulfo',
+  'Arsenio',
+  'Arturo',
+  'Augusto',
+  'Aznar',
+  'Benito',
+  'Bernardo',
+  'Beto',
+  'Bruno',
+  'Carlito',
+  'Carlo',
+  'Carlos',
+  'Carlos',
+  'Carlos',
+  'Carmelo',
+  'Cayetano',
+  'Cesar',
+  'Charli',
+  'Cipriano',
+  'Cristhian',
+  'Cristóbal',
+  'Cuauhtémoc',
+  'Danilo',
+  'List',
+  'Dámaso',
+  'Damián',
+  'Daniel',
+  'Dario',
+  'David',
+  'Diego',
+  'Edgardo',
+  'Eduardo',
+  'Efraín',
+  'Elbio',
+  'Eliseo',
+  'Emilio',
+  'Enrique',
+  'Ernesto',
+  'Esteban',
+  'Eugenio',
+  'Ezequiel',
+  'Fabricio',
+  'Fausto',
+  'Federico',
+  'Feliciano',
+  'Felipe',
+  'Fernando',
+  'Fernando',
+  'Flavio',
+  'Florencio',
+  'Florentin',
+  'Francisco',
+  'Fulgencio',
+  'Gabriel',
+  'Gaspar',
+  'Genovevo',
+  'Geronimo',
+  'Gilberto',
+  'Ginés',
+  'Gonzalo',
+  'Gregorio',
+  'Guido',
+  'Guillermo',
+  'Gustavo',
+  'Gutierre',
+  'Hector',
+  'Heriberto',
+  'Hernán',
+  'Hernándo',
+  'Hugo',
+  'Ignacio',
+  'Inigo',
+  'Jacinto',
+  'Jaime',
+  'Jairo',
+  'Javier',
+  'Jerónimo',
+  'Jhon',
+  'Jimeno',
+  'Joaquín',
+  'Jorge',
+  'José',
+  'José',
+  'José',
+  'José',
+  'José',
+  'Juan',
+  'Juan',
+  'Juanfran',
+  'Juanma',
+  'Julián',
+  'Julio',
+  'Julio',
+  'Jusepe',
+  'Leandro',
+  'Leon',
+  'Leonardo',
+  'Leopoldo',
+  'Liberato',
+  'Liberto',
+  'Lorenzo',
+  'Lotario',
+  'Luca',
+  'Lucero',
+  'Luciano',
+  'Lucio',
+  'Luis',
+  'Maikel',
+  'Manolito',
+  'Manolo',
+  'Manrique',
+  'Manuel',
+  'José',
+  'Marcelino',
+  'Marcelo',
+  'Marco',
+  'Marcos',
+  'Mariano',
+  'Mario',
+  'Mateo',
+  'Matías',
+  'Mauricio',
+  'Maximiliano',
+  'Melquíades',
+  'Miguel',
+  'Miguel',
+  'Milo',
+  'Nacho',
+  'Nahuel',
+  'Napoleon',
+  'Narciso',
+  'Nazario',
+  'Nemesio',
+  'Nestor',
+  'Nicolas',
+  'Niño',
+  'Noe',
+  'Nuño',
+  'Obdulio',
+  'Omar',
+  'Osorio',
+  'Osvaldo',
+  'Oswaldo',
+  'Pablo',
+  'Paco',
+  'Panfilo',
+  'Pascual',
+  'Pasqual',
+  'Patricio',
+  'Pedro',
+  'Pepe',
+  'Perez',
+  'Primitivo',
+  'Quique',
+  'Rafa',
+  'Ramiro',
+  'Ramón',
+  'Raphael',
+  'Raul',
+  'Reinaldo',
+  'Reno',
+  'Ricardo',
+  'Roberto',
+  'Rodolfo',
+  'Rodrigo',
+  'Rogelio',
+  'Rolando',
+  'Roman',
+  'Ronaldo',
+  'Rosendo',
+  'Salvador',
+  'Samuel',
+  'Santiago',
+  'Sebastian',
+  'Servando',
+  'Silvestre',
+  'Sixto',
+  'Suero',
+  'Tato',
+  'Tomás',
+  'Toni',
+  'Tonin',
+  'Tonino',
+  'Tonio',
+  'Tono',
+  'Ulises',
+  'Venancio',
+  'Vicente',
+  'Víctor',
+  'Victorino',
+  'Vladimiro',
+  'Wenceslao',
+  'Wilfredo',
+  'Xavi'
+];
+
+const lastNames = [
+  'Aguilar',
+  'Alonso',
+  'Alvarez',
+  'Andres',
+  'Arias',
+  'Blanco',
+  'Bravo',
+  'Caballero',
+  'Cabrera',
+  'Calvo',
+  'Campos',
+  'Cano',
+  'Carmona',
+  'Carrasco',
+  'Casado',
+  'Castillo',
+  'Castro',
+  'Cortes',
+  'Crespo',
+  'Cruz',
+  'Delgado',
+  'Diaz',
+  'Diez',
+  'Dominguez',
+  'Duran',
+  'Esteban',
+  'Fernandez',
+  'Ferrer',
+  'Flores',
+  'Fuentes',
+  'Gallego',
+  'Garcia',
+  'Garrido',
+  'Gil',
+  'Gimenez',
+  'Gomez',
+  'Gonzalez',
+  'Guerrero',
+  'Gutierrez',
+  'Hernandez',
+  'Herrera',
+  'Herrero',
+  'Hidalgo',
+  'Iba',
+  'Ibañez',
+  'Iglesias',
+  'Izquierdo',
+  'Jimenez',
+  'Leon',
+  'Lopez',
+  'Lorenzo',
+  'Lozano',
+  'Marin',
+  'Marquez',
+  'Marti',
+  'Martin',
+  'Martinez',
+  'Medina',
+  'Mendez',
+  'Merino',
+  'Miguel',
+  'Molina',
+  'Montero',
+  'Mora',
+  'Morales',
+  'Moreno',
+  'Moya',
+  'Muñoz',
+  'Muﾑoz',
+  'Navarro',
+  'Nieto',
+  'Nuñez',
+  'Nuﾑez',
+  'Ortega',
+  'Ortiz',
+  'Pardo',
+  'Pascual',
+  'Pastor',
+  'Perez',
+  'Peña',
+  'Prieto',
+  'Ramirez',
+  'Ramos',
+  'Redondo',
+  'Reyes',
+  'Rodriguez',
+  'Romero',
+  'Rubio',
+  'Ruiz',
+  'Saez',
+  'Sanchez',
+  'Santana',
+  'Santos',
+  'Sanz',
+  'Serrano',
+  'Soler',
+  'Soto',
+  'Suarez',
+  'Torres',
+  'Vazquez',
+  'Vega',
+  'Velasco',
+  'Vicente',
+  'Vidal',
+  'Vila',
+  'ﾑez'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/Sweden/bundle.ts b/packages/plugins/src/countries/Sweden/bundle.ts
new file mode 100644
index 000000000..c3c27d616
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/bundle.ts
@@ -0,0 +1,59 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Sweden: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'sweden',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      format: 'xxxxx'
+    }
+  },
+  regions: [
+    {
+      regionName: 'Gävleborgs län',
+      regionShort: 'X',
+      regionSlug: 'gavleborg',
+      weight: 1,
+      cities: ['Gävle', 'Sandviken', 'Hudiksvall', 'Bollnäs', 'Söderhamn', 'Hofors', 'Ockelbo']
+    },
+    {
+      regionName: 'Dalarnas län',
+      regionShort: 'W',
+      regionSlug: 'dalarna',
+      weight: 1,
+      cities: ['Borlänge', 'Falun', 'Avesta', 'Ludvika', 'Mora']
+    },
+    {
+      regionName: 'Stockholms län',
+      regionShort: 'AB',
+      regionSlug: 'stockholms_lan',
+      weight: 5,
+      cities: ['Stockholm', 'Södertälje', 'Täby', 'Tumba', 'Upplands Väsby', 'Lidingo', 'Vallentuna', 'Åkersberga', 'Märsta', 'Boo']
+    },
+    {
+      regionName: 'Västra Götalands län',
+      regionShort: 'O',
+      regionSlug: 'vastra_gotaland',
+      weight: 4,
+      cities: ['Göteborg', 'Borås', 'Trollhättan', 'Skövde', 'Uddevalla', 'Lidköping', 'Alingsås', 'Kungälv', 'Vänersborg', 'Lerum']
+    },
+    {
+      regionName: 'Östergötlands län',
+      regionShort: 'E',
+      regionSlug: 'ostergotland',
+      weight: 2,
+      cities: ['Linköping', 'Norrköping', 'Motala', 'Finspång', 'Mjölby']
+    },
+    {
+      regionName: 'Jönköpings län',
+      regionShort: 'F',
+      regionSlug: 'jonkoping',
+      weight: 2,
+      cities: ['Jönköping', 'Värnamo', 'Nässjö', 'Tranås', 'Vetlanda']
+    }
+  ]
+});
+
+export default Sweden;
diff --git a/packages/plugins/src/countries/Sweden/i18n/ar.json b/packages/plugins/src/countries/Sweden/i18n/ar.json
new file mode 100644
index 000000000..6bb63b1fa
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "السويد",
+  "regionNames": "المقاطعات السويدية"
+}
diff --git a/packages/plugins/src/countries/Sweden/i18n/de.json b/packages/plugins/src/countries/Sweden/i18n/de.json
new file mode 100644
index 000000000..9d079e462
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Schweden",
+  "regionNames": "Schwedische Landkreise"
+}
diff --git a/packages/plugins/src/countries/Sweden/i18n/en.json b/packages/plugins/src/countries/Sweden/i18n/en.json
new file mode 100644
index 000000000..77be1ca16
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Sweden",
+  "regionNames": "Swedish counties"
+}
diff --git a/packages/plugins/src/countries/Sweden/i18n/es.json b/packages/plugins/src/countries/Sweden/i18n/es.json
new file mode 100644
index 000000000..8d7ebc62b
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Suecia",
+  "regionNames": "condados suecos"
+}
diff --git a/packages/plugins/src/countries/Sweden/i18n/fr.json b/packages/plugins/src/countries/Sweden/i18n/fr.json
new file mode 100644
index 000000000..c562f7698
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Suède",
+  "regionNames": "Comtés suédois"
+}
diff --git a/packages/plugins/src/countries/Sweden/i18n/hi.json b/packages/plugins/src/countries/Sweden/i18n/hi.json
new file mode 100644
index 000000000..551055c40
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "स्वीडन",
+  "regionNames": "स्वीडिश काउंटी"
+}
diff --git a/packages/plugins/src/countries/Sweden/i18n/ja.json b/packages/plugins/src/countries/Sweden/i18n/ja.json
new file mode 100644
index 000000000..4bf2b35c2
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "スウェーデン",
+  "regionNames": "スウェーデンの郡"
+}
diff --git a/packages/plugins/src/countries/Sweden/i18n/nl.json b/packages/plugins/src/countries/Sweden/i18n/nl.json
new file mode 100644
index 000000000..4e924738c
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Zweden",
+  "regionNames": "Zweedse provincies"
+}
diff --git a/packages/plugins/src/countries/Sweden/i18n/pt.json b/packages/plugins/src/countries/Sweden/i18n/pt.json
new file mode 100644
index 000000000..cb56399e6
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Suécia",
+  "regionNames": "Condados suecos"
+}
diff --git a/packages/plugins/src/countries/Sweden/i18n/ru.json b/packages/plugins/src/countries/Sweden/i18n/ru.json
new file mode 100644
index 000000000..78a7d3139
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/ru.json
@@ -0,0 +1,5 @@
+
+{
+  "countryName": "Швеция",
+  "regionNames": "Шведские округа"
+}
diff --git a/packages/plugins/src/countries/Sweden/i18n/ta.json b/packages/plugins/src/countries/Sweden/i18n/ta.json
new file mode 100644
index 000000000..bc6d6d742
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ஸ்வீடன்",
+  "regionNames": "ஸ்வீடிஷ் மாவட்டங்கள்"
+}
diff --git a/packages/plugins/src/countries/Sweden/i18n/zh.json b/packages/plugins/src/countries/Sweden/i18n/zh.json
new file mode 100644
index 000000000..1c93b21de
--- /dev/null
+++ b/packages/plugins/src/countries/Sweden/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "瑞典",
+  "regionNames": "瑞典县"
+}
diff --git a/packages/plugins/src/countries/Turkey/bundle.ts b/packages/plugins/src/countries/Turkey/bundle.ts
new file mode 100644
index 000000000..69a91769c
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/bundle.ts
@@ -0,0 +1,171 @@
+/**
+ * Turkey provinces with population >= 1 million, plus the five largest city in each.
+ * Sources:
+ * 		http://en.wikipedia.org/wiki/Provinces_of_Turkey
+ * 		http://en.wikipedia.org/wiki/List_of_cities_in_Turkey
+ *
+ * Note: Turkey doesn't appear to have short codes for the provinces, so this just sets them all to the full name.
+ */
+import { GetCountryData } from '@generatedata/types';
+
+const Turkey: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'turkey',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+
+  extendedData: {
+    zipFormat: {
+      format: 'xyyyy',
+      replacements: {
+        x: '01234567',
+        y: '0123456789'
+      }
+    }
+  },
+
+  regions: [
+    {
+      regionName: 'Istanbul',
+      regionShort: 'Istanbul',
+      regionSlug: 'istanbul',
+      weight: 14,
+      cities: ['Istanbul']
+    },
+    {
+      regionName: 'Ankara',
+      regionShort: 'Ankara',
+      regionSlug: 'ankara',
+      weight: 5,
+      cities: ['Ankara', 'Polatlı', 'Beypazarı', 'Şereflikoçhisar', 'Kızılcahamam']
+    },
+    {
+      regionName: 'İzmir',
+      regionShort: 'İzmir',
+      regionSlug: 'izmir',
+      weight: 4,
+      cities: ['Izmir', 'Ödemiş', 'Bergama', 'Tire', 'Çeşme']
+    },
+    {
+      regionName: 'Bursa',
+      regionShort: 'Bursa',
+      regionSlug: 'bursa',
+      weight: 3,
+      cities: ['Bursa', 'İnegöl', 'Mustafakemalpaşa', 'Orhangazi', 'Karacabey']
+    },
+    {
+      regionName: 'Antalya',
+      regionShort: 'Antalya',
+      regionSlug: 'antalya',
+      weight: 2,
+      cities: ['Antalya', 'Alanya', 'Manavgat', 'Serik', 'Kumluca']
+    },
+    {
+      regionName: 'Adana',
+      regionShort: 'Adana',
+      regionSlug: 'adana',
+      weight: 2,
+      cities: ['Adana', 'Ceyhan', 'Kozan', 'İmamoğlu', 'Pozantı']
+    },
+    {
+      regionName: 'Konya',
+      regionShort: 'Konya',
+      regionSlug: 'konya',
+      weight: 2,
+      cities: ['Konya', 'Ereğli', 'Akşehir', 'Seydişehir', 'Karapınar']
+    },
+    {
+      regionName: 'Gaziantep',
+      regionShort: 'Gaziantep',
+      regionSlug: 'gaziantep',
+      weight: 2,
+      cities: ['Gaziantep', 'Nizip', 'İslahiye', 'Nurdağı', 'Araban']
+    },
+    {
+      regionName: 'Şanlıurfa',
+      regionShort: 'Şanlıurfa',
+      regionSlug: 'sanliurfa',
+      weight: 2,
+      cities: ['Şanlıurfa', 'Siverek', 'Viranşehir', 'Suruç', 'Birecik']
+    },
+    {
+      regionName: 'Mersin',
+      regionShort: 'Mersin',
+      regionSlug: 'mersin',
+      weight: 2,
+      cities: ['Mersin', 'Tarsus', 'Silifke', 'Erdemli', 'Anamur']
+    },
+    {
+      regionName: 'Kocaeli',
+      regionShort: 'Kocaeli',
+      regionSlug: 'kocaeli',
+      weight: 2,
+      cities: ['İzmit', 'Gebze', 'Darıca', 'Gölcük', 'Körfez']
+    },
+    {
+      regionName: 'Diyarbakır',
+      regionShort: 'Diyarbakır',
+      regionSlug: 'diyarbakir',
+      weight: 2,
+      cities: ['Diyarbakır', 'Ergani', 'Bismil', 'Silvan', 'Çermik']
+    },
+    {
+      regionName: 'Hatay',
+      regionShort: 'Hatay',
+      regionSlug: 'hatay',
+      weight: 2,
+      cities: ['Antakya', 'İskenderun', 'Dörtyol', 'Kırıkhan', 'Reyhanlı']
+    },
+    {
+      regionName: 'Manisa',
+      regionShort: 'Manisa',
+      regionSlug: 'manisa',
+      weight: 1,
+      cities: ['Manisa', 'Turgutlu', 'Akhisar', 'Salihli', 'Soma']
+    },
+    {
+      regionName: 'Kayseri',
+      regionShort: 'Kayseri',
+      regionSlug: 'kayseri',
+      weight: 1,
+      cities: ['Kayseri', 'Develi', 'Yahyalı', 'Bünyan', 'Pınarbaşı']
+    },
+    {
+      regionName: 'Samsun',
+      regionShort: 'Samsun',
+      regionSlug: 'samsun',
+      weight: 1,
+      cities: ['Samsun', 'Bafra', 'Çarşamba', 'Terme', 'Vezirköprü']
+    },
+    {
+      regionName: 'Balıkesir',
+      regionShort: 'Balıkesir',
+      regionSlug: 'balikesir',
+      weight: 1,
+      cities: ['Balıkesir', 'Bandırma', 'Edremit', 'Gönen', 'Burhaniye']
+    },
+    {
+      regionName: 'Kahramanmaraş',
+      regionShort: 'Kahramanmaraş',
+      regionSlug: 'kahramanmaras',
+      weight: 1,
+      cities: ['Kahramanmaraş', 'Elbistan', 'Afşin', 'Pazarcık', 'Göksun']
+    },
+    {
+      regionName: 'Van',
+      regionShort: 'Van',
+      regionSlug: 'van',
+      weight: 1,
+      cities: ['Van', 'Erciş', 'Bostaniçi', 'Muradiye', 'Çaldıran']
+    },
+    {
+      regionName: 'Aydın',
+      regionShort: 'Aydın',
+      regionSlug: 'aydin',
+      weight: 1,
+      cities: ['Aydın', 'Nazilli', 'Söke', 'Kuşadası', 'Didim']
+    }
+  ]
+});
+
+export default Turkey;
diff --git a/packages/plugins/src/countries/Turkey/i18n/ar.json b/packages/plugins/src/countries/Turkey/i18n/ar.json
new file mode 100644
index 000000000..256b4f917
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ديك رومى",
+  "regionNames": "محافظات تركيا"
+}
diff --git a/packages/plugins/src/countries/Turkey/i18n/de.json b/packages/plugins/src/countries/Turkey/i18n/de.json
new file mode 100644
index 000000000..5d6b59fec
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Truthahn",
+  "regionNames": "Provinzen der Türkei"
+}
diff --git a/packages/plugins/src/countries/Turkey/i18n/en.json b/packages/plugins/src/countries/Turkey/i18n/en.json
new file mode 100644
index 000000000..7e5cd83ef
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Turkey",
+  "regionNames": "Turkey prov."
+}
diff --git a/packages/plugins/src/countries/Turkey/i18n/es.json b/packages/plugins/src/countries/Turkey/i18n/es.json
new file mode 100644
index 000000000..bc28b02ab
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Turquía",
+  "regionNames": "Provincias de Turquía"
+}
diff --git a/packages/plugins/src/countries/Turkey/i18n/fr.json b/packages/plugins/src/countries/Turkey/i18n/fr.json
new file mode 100644
index 000000000..8a4ecc90c
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Turquie",
+  "regionNames": "Provinces de Turquie"
+}
diff --git a/packages/plugins/src/countries/Turkey/i18n/hi.json b/packages/plugins/src/countries/Turkey/i18n/hi.json
new file mode 100644
index 000000000..96e339eea
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "पूर्व के पास",
+  "regionNames": "तुर्की प्रांत"
+}
diff --git a/packages/plugins/src/countries/Turkey/i18n/ja.json b/packages/plugins/src/countries/Turkey/i18n/ja.json
new file mode 100644
index 000000000..cc6ad490e
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "トルコの国",
+  "regionNames": "トルコの地方"
+}
diff --git a/packages/plugins/src/countries/Turkey/i18n/nl.json b/packages/plugins/src/countries/Turkey/i18n/nl.json
new file mode 100644
index 000000000..1b97c7389
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Turkije",
+  "regionNames": "turkije provincies"
+}
diff --git a/packages/plugins/src/countries/Turkey/i18n/pt.json b/packages/plugins/src/countries/Turkey/i18n/pt.json
new file mode 100644
index 000000000..e8ced47bf
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Turquia",
+  "regionNames": "Províncias da Turquia"
+}
diff --git a/packages/plugins/src/countries/Turkey/i18n/ru.json b/packages/plugins/src/countries/Turkey/i18n/ru.json
new file mode 100644
index 000000000..3d077a4ca
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Турция",
+  "regionNames": "Турция пров."
+}
diff --git a/packages/plugins/src/countries/Turkey/i18n/ta.json b/packages/plugins/src/countries/Turkey/i18n/ta.json
new file mode 100644
index 000000000..f8b68314f
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "துருக்கி",
+  "regionNames": "துருக்கி மாகாணங்கள்"
+}
diff --git a/packages/plugins/src/countries/Turkey/i18n/zh.json b/packages/plugins/src/countries/Turkey/i18n/zh.json
new file mode 100644
index 000000000..18c75ee37
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "土耳其",
+  "regionNames": "土耳其省份"
+}
diff --git a/packages/plugins/src/countries/Turkey/names.ts b/packages/plugins/src/countries/Turkey/names.ts
new file mode 100644
index 000000000..771ea78fd
--- /dev/null
+++ b/packages/plugins/src/countries/Turkey/names.ts
@@ -0,0 +1,529 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Aynur',
+  'Aysel',
+  'Ayşe',
+  'Ayşegül',
+  'Ayşen',
+  'Ayşenaz',
+  'Ayşenur',
+  'Başak',
+  'Beyza',
+  'Buket',
+  'Büşra',
+  'Canan',
+  'Candan',
+  'Cansel',
+  'Cansu',
+  'Ceren',
+  'Ceylan',
+  'Defne',
+  'Dilek',
+  'Ebru',
+  'Eda',
+  'Elif',
+  'Elmas',
+  'Emine',
+  'Esra',
+  'Fadime',
+  'Fi̇li̇z',
+  'Gökçe',
+  'Gül',
+  'Gülay',
+  'Gülbahar',
+  'Gülcan',
+  'Güler',
+  'Güllü',
+  'Gülseren',
+  'Gülsüm',
+  'Gülten',
+  'Gülşen',
+  'Hacer',
+  'Hanife',
+  'Hatice',
+  'Havva',
+  'Hülya',
+  'İlknur',
+  'Kardelen',
+  'Kübra',
+  'Lale',
+  'Leyla',
+  'Manolya',
+  'Melek',
+  'Melike',
+  'Meli̇sa',
+  'Menekşe',
+  'Meral',
+  'Merve',
+  'Meryem',
+  'Müge',
+  'Naz',
+  'Nazan',
+  'Nazar',
+  'Nazi̇fe',
+  'Nazi̇k',
+  'Nazi̇me',
+  'Nazi̇re',
+  'Nazli',
+  'Nazlican',
+  'Nazmi̇ye',
+  'Nida',
+  'Nisa',
+  'Nur',
+  'Nuran',
+  'Nuray',
+  'Nurcan',
+  'Nurdan',
+  'Nurgül',
+  'Nurhan',
+  'Nuriye',
+  'Nursel',
+  'Nurten',
+  'Rabia',
+  'Semra',
+  'Sevim',
+  'Sevi̇',
+  'Sevi̇lay',
+  'Sevi̇m',
+  'Sevi̇n',
+  'Sevi̇nç',
+  'Songül',
+  'Su',
+  'Sude',
+  'Sudenaz',
+  'Sudenur',
+  'Sultan',
+  'Suna',
+  'Sunay',
+  'Suzan',
+  'Sümeyra',
+  'Tuğba',
+  'Yasemin',
+  'Zehra',
+  'Zeynep',
+  'Çağla',
+  'Çiçek',
+  'Özlem',
+  'Ümmü',
+  'Ümmügülsüm',
+  'Şenay',
+  'Şenel',
+  'Şengül',
+  'Şeni̇z',
+  'Şennur',
+  'Şerife',
+  'Fatma'
+];
+
+const maleNames = [
+  'Abdullah',
+  'Abuzer',
+  'Adem',
+  'Ahmet',
+  'Ali̇',
+  'Ali̇can',
+  'Ali̇han',
+  'Ali̇m',
+  'Ali̇şan',
+  'Alp',
+  'Alparslan',
+  'Alpay',
+  'Alpcan',
+  'Alper',
+  'Alperen',
+  'Alphan',
+  'Alpteki̇n',
+  'Alptuğ',
+  'Ata',
+  'Ataberk',
+  'Atabey',
+  'Atacan',
+  'Atahan',
+  'Atakan',
+  'Atalay',
+  'Ataman',
+  'Atay',
+  'Azi̇z',
+  'Bedirhan',
+  'Berk',
+  'Berkan',
+  'Berkant',
+  'Berkay',
+  'Berkcan',
+  'Berke',
+  'Berkehan',
+  'Berker',
+  'Berki̇n',
+  'Burak',
+  'Can',
+  'Canberk',
+  'Caner',
+  'Cankat',
+  'Cem',
+  'Cemal',
+  'Cemaletti̇n',
+  'Cemali̇',
+  'Cemi̇l',
+  'Cemre',
+  'Efe',
+  'Emirhan',
+  'Emi̇n',
+  'Emre',
+  'Enes',
+  'Ercan',
+  'Eren',
+  'Ergun',
+  'Fati̇h',
+  'Furkan',
+  'Gürsel',
+  'Hakan',
+  'Hali̇l',
+  'Hami̇t',
+  'Hasan',
+  'Hüseyi̇n',
+  'İbrahi̇m',
+  'İhsan',
+  'İsmai̇L',
+  'İsmai̇l',
+  'Kadi̇r',
+  'Kemal',
+  'Keri̇m',
+  'Kubilay',
+  'Mahmut',
+  'Mehmet',
+  'Menderes',
+  'Mert',
+  'Murat',
+  'Mustafa',
+  'Nur',
+  'Nureddi̇n',
+  'Nuretti̇n',
+  'Nuri̇',
+  'Nurullah',
+  'Olcay',
+  'Osman',
+  'Poyraz',
+  'Ramazan',
+  'Recep',
+  'Rıza',
+  'Sali̇h',
+  'Samet',
+  'Serhat',
+  'Serkan',
+  'Sonat',
+  'Süleyman',
+  'Tayfun',
+  'Temel',
+  'Volkan',
+  'Yusuf',
+  'Ömer',
+  'Şahi̇n',
+  'Mehmet'
+];
+
+const lastNames = [
+  'Acar',
+  'Adıgüzel',
+  'Ak',
+  'Akar',
+  'Akay',
+  'Akbaş',
+  'Akbulut',
+  'Akdağ',
+  'Akdemir',
+  'Akdeniz',
+  'Akdoğan',
+  'Akgül',
+  'Akgün',
+  'Akkaya',
+  'Akkuş',
+  'Akman',
+  'Akpınar',
+  'Aksoy',
+  'Aksu',
+  'Aktaş',
+  'Akyol',
+  'Akyüz',
+  'Akça',
+  'Akçay',
+  'Akın',
+  'Albayrak',
+  'Alkan',
+  'Altay',
+  'Altun',
+  'Altuntaş',
+  'Altın',
+  'Altıntaş',
+  'Aras',
+  'Arslan',
+  'Arı',
+  'Arıkan',
+  'Aslan',
+  'Atalay',
+  'Ataş',
+  'Ateş',
+  'Atmaca',
+  'Avcı',
+  'Ay',
+  'Ayaz',
+  'Aydemir',
+  'Aydoğan',
+  'Aydoğdu',
+  'Aydın',
+  'Aygün',
+  'Ayhan',
+  'Açıkgöz',
+  'Bakır',
+  'Bal',
+  'Balcı',
+  'Baran',
+  'Bayrak',
+  'Bayraktar',
+  'Bayram',
+  'Baş',
+  'Başaran',
+  'Bektaş',
+  'Bilgin',
+  'Bingöl',
+  'Biçer',
+  'Bolat',
+  'Boz',
+  'Bozkurt',
+  'Budak',
+  'Bulut',
+  'Bülbül',
+  'Can',
+  'Cengiz',
+  'Ceylan',
+  'Coşkun',
+  'Dağ',
+  'Demir',
+  'Demirbaş',
+  'Demircan',
+  'Demirci',
+  'Demirel',
+  'Demirtaş',
+  'Deniz',
+  'Dinç',
+  'Dinçer',
+  'Doğan',
+  'Doğru',
+  'Duman',
+  'Durak',
+  'Duran',
+  'Durmaz',
+  'Durmuş',
+  'Dursun',
+  'Dönmez',
+  'Dündar',
+  'Efe',
+  'Eker',
+  'Ekici',
+  'Ekinci',
+  'Er',
+  'Ercan',
+  'Erdem',
+  'Erdoğan',
+  'Eren',
+  'Ergin',
+  'Ergün',
+  'Erkan',
+  'Erol',
+  'Eroğlu',
+  'Ersoy',
+  'Ertaş',
+  'Ertürk',
+  'Esen',
+  'Eser',
+  'Fidan',
+  'Fırat',
+  'Gedik',
+  'Genç',
+  'Gezer',
+  'Gök',
+  'Göktaş',
+  'Gökçe',
+  'Gül',
+  'Güler',
+  'Güleç',
+  'Gültekin',
+  'Gümüş',
+  'Gün',
+  'Günay',
+  'Gündoğdu',
+  'Gündüz',
+  'Güner',
+  'Güney',
+  'Güneş',
+  'Güngör',
+  'Gür',
+  'Gürbüz',
+  'Gürsoy',
+  'Güven',
+  'Güzel',
+  'Güçlü',
+  'Işık',
+  'Kahraman',
+  'Kalkan',
+  'Kandemir',
+  'Kaplan',
+  'Kara',
+  'Karabulut',
+  'Karaca',
+  'Karadağ',
+  'Karadeniz',
+  'Karagöz',
+  'Karahan',
+  'Karakaya',
+  'Karakaş',
+  'Karakoç',
+  'Karakuş',
+  'Karaman',
+  'Karataş',
+  'Kartal',
+  'Kaya',
+  'Kaçar',
+  'Keleş',
+  'Keskin',
+  'Koca',
+  'Korkmaz',
+  'Koyuncu',
+  'Koç',
+  'Koçak',
+  'Kurt',
+  'Kuru',
+  'Kutlu',
+  'Kuş',
+  'Köksal',
+  'Köse',
+  'Küçük',
+  'Kılınç',
+  'Kılıç',
+  'Mert',
+  'Metin',
+  'Mutlu',
+  'Oral',
+  'Orhan',
+  'Oruç',
+  'Oğuz',
+  'Parlak',
+  'Pehlivan',
+  'Polat',
+  'Sarı',
+  'Sarıkaya',
+  'Savaş',
+  'Sağlam',
+  'Sert',
+  'Sevim',
+  'Sevinç',
+  'Sezer',
+  'Sezgin',
+  'Soylu',
+  'Sönmez',
+  'Tan',
+  'Taş',
+  'Taşdemir',
+  'Taşkın',
+  'Taşçi',
+  'Tekin',
+  'Temel',
+  'Topal',
+  'Toprak',
+  'Topçu',
+  'Torun',
+  'Tosun',
+  'Tuna',
+  'Tuncer',
+  'Tunç',
+  'Turan',
+  'Turgut',
+  'Turhan',
+  'Türk',
+  'Türkmen',
+  'Türkoğlu',
+  'Uslu',
+  'Usta',
+  'Uyar',
+  'Uysal',
+  'Uzun',
+  'Uçar',
+  'Uğur',
+  'Uğurlu',
+  'Varol',
+  'Vural',
+  'Yalçın',
+  'Yalçınkaya',
+  'Yaman',
+  'Yavuz',
+  'Yazici',
+  'Yaşar',
+  'Yeşil',
+  'Yiğit',
+  'Yüce',
+  'Yücel',
+  'Yüksel',
+  'Yıldırım',
+  'Yıldız',
+  'Zengin',
+  'Çakar',
+  'Çakmak',
+  'Çakır',
+  'Çalışkan',
+  'Çam',
+  'Çağlar',
+  'Çelebi',
+  'Çelik',
+  'Çetin',
+  'Çetinkaya',
+  'Çevik',
+  'Çiftçi',
+  'Çimen',
+  'Çiçek',
+  'Çoban',
+  'Çolak',
+  'Çınar',
+  'Öksüz',
+  'Ölmez',
+  'Önal',
+  'Önder',
+  'Öner',
+  'Öz',
+  'Özbek',
+  'Özcan',
+  'Özdemir',
+  'Özden',
+  'Özel',
+  'Özen',
+  'Özer',
+  'Özkan',
+  'Özkaya',
+  'Özmen',
+  'Öztürk',
+  'Özçelik',
+  'Ünal',
+  'Ünlü',
+  'Ünsal',
+  'İlhan',
+  'İnan',
+  'İnce',
+  'İpek',
+  'Şahin',
+  'Şanli',
+  'Şeker',
+  'Şen',
+  'Şener',
+  'Şengül',
+  'Şenol',
+  'Şentürk',
+  'Şimşek',
+  'Yılmaz'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/UK/bundle.ts b/packages/plugins/src/countries/UK/bundle.ts
new file mode 100644
index 000000000..9e800db62
--- /dev/null
+++ b/packages/plugins/src/countries/UK/bundle.ts
@@ -0,0 +1,613 @@
+import { GetCountryData } from '@generatedata/types';
+
+const UK: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'united_kingdom',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+
+  extendedData: {
+    zipFormat: {
+      format: 'Lx xLL|Lxx xLL|LxL xLL|LLx xLL|LLxx xLL|LLxL xLL'
+    },
+    phoneFormat: {
+      displayFormats: ['0xxxx xxxxxx']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Aberdeenshire',
+      regionShort: 'AB',
+      regionSlug: 'aberdeenshire',
+      weight: 1,
+      cities: ['Aberdeen', 'Peterhead', 'Fraserburgh', 'Inverurie', 'Huntley', 'Ellon', 'Turriff']
+    },
+    {
+      regionName: 'Anglesey',
+      regionShort: 'AG',
+      regionSlug: 'anglesey',
+      weight: 1,
+      cities: ['Beaumaris', 'Holyhead', 'Llangefni', 'Amlwch', 'Menai Bridge']
+    },
+    {
+      regionName: 'Angus',
+      regionShort: 'AN',
+      regionSlug: 'angus',
+      weight: 1,
+      cities: ['Forfar', 'Dundee', 'Arbroath', 'Brechin', 'Montrose', 'Carnoustie', 'Kirriemuir']
+    },
+    {
+      regionName: 'Argyllshire',
+      regionShort: 'AR',
+      regionSlug: 'argyllshire',
+      weight: 1,
+      cities: ['Inveraray', 'Oban', 'Dunoon', 'Campbeltown', 'Lochgilphead', 'Tobermory']
+    },
+    {
+      regionName: 'Ayrshire',
+      regionShort: 'AY',
+      regionSlug: 'ayrshire',
+      weight: 1,
+      cities: ['Ayr', 'Kilmarnock', 'Irvine', 'Saltcoats', 'Kilwinning', 'Largs', 'Troon', 'Cumnock']
+    },
+    {
+      regionName: 'Banffshire',
+      regionShort: 'BA',
+      regionSlug: 'banffshire',
+      weight: 1,
+      cities: ['Banff', 'Buckie', 'Keith', 'Macduff', 'Portsoy', 'Dufftown']
+    },
+    {
+      regionName: 'Bedfordshire',
+      regionShort: 'BD',
+      regionSlug: 'bedfordshire',
+      weight: 1,
+      cities: ['Bedford', 'Luton', 'Dunstable', 'Leighton Buzzard', 'Biggleswade', 'Sandy']
+    },
+    {
+      regionName: 'Berwickshire',
+      regionShort: 'BE',
+      regionSlug: 'berwickshire',
+      weight: 1,
+      cities: ['Greenlaw', 'Duns', 'Eyemouth', 'Lauder', 'Coldstream']
+    },
+    {
+      regionName: 'Buckinghamshire',
+      regionShort: 'BK',
+      regionSlug: 'buckinghamshire',
+      weight: 1,
+      cities: ['Aylesbury', 'Milton Keynes', 'Slough', 'Buckingham', 'High Wycombe']
+    },
+    {
+      regionName: 'Berkshire',
+      regionShort: 'BR',
+      regionSlug: 'berkshire',
+      weight: 1,
+      cities: ['Reading', 'Bracknell', 'Maidenhead', 'Newbury', 'Windsor', 'Wokingham', 'Abingdon']
+    },
+    {
+      regionName: 'Caithness',
+      regionShort: 'CA',
+      regionSlug: 'caithness',
+      weight: 1,
+      cities: ['Wick', 'Thurso', 'Halkirk', 'Castletown']
+    },
+    {
+      regionName: 'Cambridgeshire',
+      regionShort: 'CA',
+      regionSlug: 'cambridgeshire',
+      weight: 1,
+      cities: ['Cambridge', 'Wisbech', 'Ely', 'March', 'Whittlesey', 'Chatteris', 'Linton']
+    },
+    {
+      regionName: 'Cardiganshire',
+      regionShort: 'CG',
+      regionSlug: 'cardiganshire',
+      weight: 1,
+      cities: ['Cardigan', 'Aberystwyth', 'Lampeter', 'New Quay', 'Tregaron']
+    },
+    {
+      regionName: 'Cheshire',
+      regionShort: 'CH',
+      regionSlug: 'cheshire',
+      weight: 1,
+      cities: ['Chester', 'Stockport', 'Ellesmere Port', 'Birkenhead', 'Wallasey', 'Runcorn', 'Macclesfield', 'Crewe']
+    },
+    {
+      regionName: 'Clackmannanshire',
+      regionShort: 'CL',
+      regionSlug: 'clackmannanshire',
+      weight: 1,
+      cities: ['Clackmannan', 'Alloa', 'Tillicoultry', 'Tullibody']
+    },
+    {
+      regionName: 'Carmarthenshire',
+      regionShort: 'CM',
+      regionSlug: 'carmarthenshire',
+      weight: 1,
+      cities: ['Carmarthen', 'Llanelli', 'Ammanford', 'Llandovery', 'Kidwelly', 'St. Clears']
+    },
+    {
+      regionName: 'Cornwall',
+      regionShort: 'CO',
+      regionSlug: 'cornwall',
+      weight: 1,
+      cities: ['Bodmin', 'Truro', 'Camborne', 'Redruth', 'St. Austell', 'Falmouth', 'Penzance', 'Newquay']
+    },
+    {
+      regionName: 'Cumberland',
+      regionShort: 'CU',
+      regionSlug: 'cumberland',
+      weight: 1,
+      cities: ['Carlisle', 'Whitehaven', 'Workington', 'Penrith', 'Keswick', 'Brampton']
+    },
+    {
+      regionName: 'Derbyshire',
+      regionShort: 'DB',
+      regionSlug: 'derbyshire',
+      weight: 1,
+      cities: ['Derby', 'Chesterfield', 'Glossop', 'Ilkeston', 'Long Eaton', 'Swadlincote', 'Buxton', 'Matlock', 'Ashbourne']
+    },
+    {
+      regionName: 'Denbighshire',
+      regionShort: 'DE',
+      regionSlug: 'denbighshire',
+      weight: 1,
+      cities: ['Denbigh', 'Wrexham', 'Ruthin', 'Abergele', 'Llangollen']
+    },
+    {
+      regionName: 'Devon',
+      regionShort: 'DE',
+      regionSlug: 'devon',
+      weight: 1,
+      cities: ['Exeter', 'Plymouth', 'Torquay', 'Paignton', 'Barnstaple', 'Tiverton', 'Newton Abbot', 'Tavistock']
+    },
+    {
+      regionName: 'Dunbartonshire',
+      regionShort: 'DN',
+      regionSlug: 'dunbartonshire',
+      weight: 1,
+      cities: ['Dumbarton', 'Clydebank', 'Cumbernauld', 'Helensburgh', 'Alexandria', 'Kirkintilloch']
+    },
+    {
+      regionName: 'Dorset',
+      regionShort: 'DO',
+      regionSlug: 'dorset',
+      weight: 1,
+      cities: ['Dorchester', 'Poole', 'Weymouth', 'Sherborne', 'Wimborne Minster', 'Shaftesbury']
+    },
+    {
+      regionName: 'East Lothian',
+      regionShort: 'EL',
+      regionSlug: 'east_lothian',
+      weight: 1,
+      cities: ['Haddington', 'North Berwick', 'Dunbar', 'Tranent', 'East Linton']
+    },
+    {
+      regionName: 'Essex',
+      regionShort: 'ES',
+      regionSlug: 'essex',
+      weight: 1,
+      cities: ['Chelmsford', 'Basildon', 'Romford', 'Southend', 'Colchester', 'Harlow', 'Brentwood', 'West Ham']
+    },
+    {
+      regionName: 'Fife',
+      regionShort: 'FI',
+      regionSlug: 'fife',
+      weight: 1,
+      cities: ['Cupar', 'Dunfermline', 'Glenrothes', 'Kirkcaldy', 'St. Andrews', 'Cowdenbeath', 'Burntisland']
+    },
+    {
+      regionName: 'Flintshire',
+      regionShort: 'FL',
+      regionSlug: 'flintshire',
+      weight: 1,
+      cities: ['Mold', 'Flint', 'Rhyl', 'Prestatyn', "Connah's Quay", 'Holywell', 'Buckley', 'St. Asaph']
+    },
+    {
+      regionName: 'Glamorgan',
+      regionShort: 'GL',
+      regionSlug: 'glamorgan',
+      weight: 1,
+      cities: ['Cardiff', 'Swansea', 'Merthyr Tydfil', 'Barry', 'Caerphilly', 'Bridgend', 'Neath', 'Pontypridd']
+    },
+    {
+      regionName: 'Gloucestershire',
+      regionShort: 'GL',
+      regionSlug: 'gloucestershire',
+      weight: 1,
+      cities: ['Gloucester', 'Bristol', 'Cheltenham', 'Stroud', 'Cirencester', 'Tewkesbury']
+    },
+    {
+      regionName: 'Hampshire',
+      regionShort: 'HA',
+      regionSlug: 'hampshire',
+      weight: 1,
+      cities: ['Winchester', 'Southampton', 'Portsmouth', 'Bournemouth', 'Basingstoke', 'Newport']
+    },
+    {
+      regionName: 'Herefordshire',
+      regionShort: 'HE',
+      regionSlug: 'herefordshire',
+      weight: 1,
+      cities: ['Hereford', 'Ross-on-Wye', 'Leominster', 'Ledbury', 'Bromyard', 'Kington']
+    },
+    {
+      regionName: 'Hertfordshire',
+      regionShort: 'HR',
+      regionSlug: 'hertfordshire',
+      weight: 1,
+      cities: ['Hertford', 'Watford', 'St. Albans', 'Hemel Hempstead', 'Stevenage', 'Hatfield']
+    },
+    {
+      regionName: 'Huntingdonshire',
+      regionShort: 'HU',
+      regionSlug: 'huntingdonshire',
+      weight: 1,
+      cities: ['Huntingdon', 'St. Ives', 'St. Neots', 'Ramsey', 'Yaxley']
+    },
+    {
+      regionName: 'Inverness-shire',
+      regionShort: 'IN',
+      regionSlug: 'inverness_shire',
+      weight: 1,
+      cities: ['Inverness', 'Fort William', 'Kingussie', 'Newtonmore', 'Portree']
+    },
+    {
+      regionName: 'Kincardineshire',
+      regionShort: 'KC',
+      regionSlug: 'kincardineshire',
+      weight: 1,
+      cities: ['Stonehaven', 'Banchory', 'Laurencekirk', 'Inverbervie']
+    },
+    {
+      regionName: 'Kent',
+      regionShort: 'KE',
+      regionSlug: 'kent',
+      weight: 1,
+      cities: ['Maidstone', 'Canterbury', 'Bromley', 'Rochester', 'Margate', 'Folkestone', 'Dover', 'Greenwich']
+    },
+    {
+      regionName: 'Kirkcudbrightshire',
+      regionShort: 'KK',
+      regionSlug: 'kirkcudbrightshire',
+      weight: 1,
+      cities: ['Kircudbright', 'Castle Douglas', 'Dalbeattie', 'New Galloway']
+    },
+    {
+      regionName: 'Kinross-shire',
+      regionShort: 'KR',
+      regionSlug: 'kinross_shire',
+      weight: 1,
+      cities: ['Kinross', 'Milnathort']
+    },
+    {
+      regionName: 'Lancashire',
+      regionShort: 'LA',
+      regionSlug: 'lancashire',
+      weight: 1,
+      cities: ['Lancaster', 'Liverpool', 'Manchester', 'Preston', 'Bolton', 'Warrington', 'Barrow-in-Furness']
+    },
+    {
+      regionName: 'Leicestershire',
+      regionShort: 'LE',
+      regionSlug: 'leicestershire',
+      weight: 1,
+      cities: ['Leicester', 'Loughborough', 'Hinckley', 'Melton Mowbray', 'Coalville', 'Lutterworth']
+    },
+    {
+      regionName: 'Lincolnshire',
+      regionShort: 'LI',
+      regionSlug: 'lincolnshire',
+      weight: 1,
+      cities: ['Lincoln', 'Grimsby', 'Scunthorpe', 'Boston', 'Grantham', 'Stamford', 'Skegness', 'Louth']
+    },
+    {
+      regionName: 'Lanarkshire',
+      regionShort: 'LK',
+      regionSlug: 'lanarkshire',
+      weight: 1,
+      cities: ['Lanark', 'Glasgow', 'East Kilbride', 'Hamilton', 'Motherwell', 'Coatbridge', 'Carluke']
+    },
+    {
+      regionName: 'Merionethshire',
+      regionShort: 'ME',
+      regionSlug: 'merionethshire',
+      weight: 1,
+      cities: ['Dolgellau', 'Bala', 'Tywyn', 'Blaenau Ffestiniog', 'Barmouth', 'Harlech']
+    },
+    {
+      regionName: 'Montgomeryshire',
+      regionShort: 'MG',
+      regionSlug: 'montgomeryshire',
+      weight: 1,
+      cities: ['Montgomery', 'Newtown', 'Welshpool', 'Machynlleth', 'Llanidloes']
+    },
+    {
+      regionName: 'Midlothian',
+      regionShort: 'ML',
+      regionSlug: 'midlothian',
+      weight: 1,
+      cities: ['Edinburgh', 'Musselburgh', 'Penicuik', 'Dalkeith', 'Bonnyrigg']
+    },
+    {
+      regionName: 'Monmouthshire',
+      regionShort: 'MO',
+      regionSlug: 'monmouthshire',
+      weight: 1,
+      cities: ['Monmouth', 'Newport', 'Blackwood', 'Cwmbran', 'Abergavenny', 'Chepstow', 'Tredegar']
+    },
+    {
+      regionName: 'Morayshire',
+      regionShort: 'MO',
+      regionSlug: 'morayshire',
+      weight: 1,
+      cities: ['Elgin', 'Forres', 'Rothes', 'Lossiemouth', 'Fochabers']
+    },
+    {
+      regionName: 'Northumberland',
+      regionShort: 'NB',
+      regionSlug: 'northumberland',
+      weight: 1,
+      cities: ['Alnwick', 'Newcastle-upon-Tyne', 'Morpeth', 'Hexham', 'Berwick-upon-Tweed']
+    },
+    {
+      regionName: 'Norfolk',
+      regionShort: 'NF',
+      regionSlug: 'norfolk',
+      weight: 1,
+      cities: ['Norwich', 'Great Yarmouth', "King's Lynn", 'Dereham', 'Cromer', 'Hunstanton']
+    },
+    {
+      regionName: 'Northamptonshire',
+      regionShort: 'NT',
+      regionSlug: 'northamptonshire',
+      weight: 1,
+      cities: ['Northampton', 'Peterborough', 'Corby', 'Kettering', 'Wellingborough']
+    },
+    {
+      regionName: 'Nottinghamshire',
+      regionShort: 'NT',
+      regionSlug: 'nottinghamshire',
+      weight: 1,
+      cities: ['Nottingham', 'Mansfield', 'Worksop', 'Newark', 'Retford', 'Southwell']
+    },
+    {
+      regionName: 'Orkney',
+      regionShort: 'OK',
+      regionSlug: 'orkney',
+      weight: 1,
+      cities: ['Kirkwall', 'Sromness', 'Balfour']
+    },
+    {
+      regionName: 'Oxfordshire',
+      regionShort: 'OX',
+      regionSlug: 'oxfordshire',
+      weight: 1,
+      cities: ['Oxford', 'Banbury', 'Witney', 'Bicester', 'Henley-on-Thames', 'Carterton', 'Thame', 'Bloxham']
+    },
+    {
+      regionName: 'Pembrokeshire',
+      regionShort: 'PE',
+      regionSlug: 'pembrokeshire',
+      weight: 1,
+      cities: ['Pembroke', 'Milford Haven', 'Haverfordwest', 'Fishguard', 'Tenby', "St. David's"]
+    },
+    {
+      regionName: 'Radnorshire',
+      regionShort: 'RA',
+      regionSlug: 'radnorshire',
+      weight: 1,
+      cities: ['Presteigne', 'Llandrindod Wells', 'Knighton', 'Rhayader', 'New Radnor']
+    },
+    {
+      regionName: 'Renfrewshire',
+      regionShort: 'RF',
+      regionSlug: 'renfrewshire',
+      weight: 1,
+      cities: ['Renfrew', 'Paisley', 'Greenock', 'Johnstone', 'Port Glasgow', 'Barrhead', 'Kilmalcolm']
+    },
+    {
+      regionName: 'Roxburghshire',
+      regionShort: 'RO',
+      regionSlug: 'roxburghshire',
+      weight: 1,
+      cities: ['Jedburgh', 'Hawick', 'Kelso', 'Melrose', 'Roxburgh']
+    },
+    {
+      regionName: 'Rutland',
+      regionShort: 'RU',
+      regionSlug: 'rutland',
+      weight: 1,
+      cities: ['Oakham', 'Uppingham. Cottesmore']
+    },
+    {
+      regionName: 'Shropshire',
+      regionShort: 'SA',
+      regionSlug: 'shropshire',
+      weight: 1,
+      cities: ['Shrewsbury', 'Telford', 'Oswestry', 'Bridgnorth', 'Whitchurch', 'Market Drayton', 'Ludlow']
+    },
+    {
+      regionName: 'Selkirkshire',
+      regionShort: 'SE',
+      regionSlug: 'selkirkshire',
+      weight: 1,
+      cities: ['Selkirk', 'Clovenfords', 'Galashiels']
+    },
+    {
+      regionName: 'Suffolk',
+      regionShort: 'SF',
+      regionSlug: 'suffolk',
+      weight: 1,
+      cities: ['Ipswich', 'Bury St. Edmunds', 'Lowestoft', 'Felixstowe', 'Sudbury', 'Haverhill', 'Bungay']
+    },
+    {
+      regionName: 'Shetland',
+      regionShort: 'SH',
+      regionSlug: 'shetland',
+      weight: 1,
+      cities: ['Lerwick', 'Scalloway', 'Baltasound']
+    },
+    {
+      regionName: 'Somerset',
+      regionShort: 'SO',
+      regionSlug: 'somerset',
+      weight: 1,
+      cities: ['Taunton', 'Bath', 'Weston-super-Mare', 'Yeovil', 'Bridgwater', 'Wells', 'Glastonbury']
+    },
+    {
+      regionName: 'Surrey',
+      regionShort: 'SR',
+      regionSlug: 'surrey',
+      weight: 1,
+      cities: ['Guildford', 'Croydon', 'Woking', 'Sutton', 'Kingston-on-Thames', 'Wandsworth', 'Wimbledon', 'Brixton']
+    },
+    {
+      regionName: 'Sussex',
+      regionShort: 'SS',
+      regionSlug: 'sussex',
+      weight: 1,
+      cities: ['Chichester', 'Brighton', 'Worthing', 'Crawley', 'Hastings', 'Eastbourne', 'Bognor Regis', 'Horsham']
+    },
+    {
+      regionName: 'Stirlingshire',
+      regionShort: 'ST',
+      regionSlug: 'stirlingshire',
+      weight: 1,
+      cities: ['Stirling', 'Falkirk', 'Grangemouth', 'Kilsyth', 'Bridge of Allan', 'Denny', 'Alva']
+    },
+    {
+      regionName: 'Staffordshire',
+      regionShort: 'ST',
+      regionSlug: 'staffordshire',
+      weight: 1,
+      cities: ['Stafford', 'Stoke-on-Trent', 'Wolverhampton', 'Walsall', 'Cannock', 'Lichfield']
+    },
+    {
+      regionName: 'Sutherland',
+      regionShort: 'SU',
+      regionSlug: 'sutherland',
+      weight: 1,
+      cities: ['Dornoch', 'Helmsdale', 'Brora', 'Golspie', 'Lairg', 'Durness', 'Tongue']
+    },
+    {
+      regionName: 'Warwickshire',
+      regionShort: 'WA',
+      regionSlug: 'warwickshire',
+      weight: 1,
+      cities: ['Warwick', 'Birmingham', 'Coventry', 'Nuneaton', 'Rugby', 'Solihull', 'Stratford-upon-Avon']
+    },
+    {
+      regionName: 'Westmorland',
+      regionShort: 'WE',
+      regionSlug: 'westmorland',
+      weight: 1,
+      cities: ['Appleby', 'Kendal', 'Windermere', 'Ambleside', 'Kirkby Lonsdale']
+    },
+    {
+      regionName: 'Wigtownshire',
+      regionShort: 'WI',
+      regionSlug: 'wigtownshire',
+      weight: 1,
+      cities: ['Wigtown', 'Stranraer', 'Newton Stewart', 'Whithorn']
+    },
+    {
+      regionName: 'Wiltshire',
+      regionShort: 'WI',
+      regionSlug: 'wiltshire',
+      weight: 1,
+      cities: ['Trowbridge', 'Salisbury', 'Swindon', 'Chippenham', 'Devizes', 'Marlborough', 'Warminster']
+    },
+    {
+      regionName: 'West Lothian',
+      regionShort: 'WL',
+      regionSlug: 'west_lothian',
+      weight: 1,
+      cities: ['Linlithgow', 'Livingston', "Bo'ness", 'Broxburn', 'Whitburn', 'Armadale', 'Bathgate']
+    },
+    {
+      regionName: 'Worcestershire',
+      regionShort: 'WO',
+      regionSlug: 'worcestershire',
+      weight: 1,
+      cities: ['Worcester', 'Dudley', 'Kidderminster', 'Stourbridge', 'Halesowen', 'Malvern', 'Evesham']
+    },
+    {
+      regionName: 'Yorkshire',
+      regionShort: 'YK',
+      regionSlug: 'yorkshire',
+      weight: 1,
+      cities: [
+        'Northallerton',
+        'Middlesbrough',
+        'Scarborough',
+        'Whitby',
+        'Beverley',
+        'Hull',
+        'Bridlington',
+        'Driffield',
+        'Hornsea',
+        'Filey',
+        'Wakefield',
+        'Leeds',
+        'Sheffield',
+        'Bradford',
+        'Halifax',
+        'Harrogate',
+        'York'
+      ]
+    },
+    {
+      regionName: 'Durham',
+      regionShort: 'DU',
+      regionSlug: 'durham',
+      weight: 1,
+      cities: ['Durham', 'Sunderland', 'Stockton-on-Tees', 'Darlington', 'Hartlepool', 'Gateshead', 'Washington']
+    },
+    {
+      regionName: 'Brecknockshire',
+      regionShort: 'BR',
+      regionSlug: 'brecknockshire',
+      weight: 1,
+      cities: ['Brecon', 'Builth Wells', 'Hay-on-Wye', 'Talgarth', 'Llanwrtwd Wells']
+    },
+    {
+      regionName: 'Buteshire',
+      regionShort: 'BU',
+      regionSlug: 'buteshire',
+      weight: 1,
+      cities: ['Rothesay', 'Millport', 'Brodick', 'Lochranza']
+    },
+    {
+      regionName: 'Dumfriesshire',
+      regionShort: 'DF',
+      regionSlug: 'dumfriesshire',
+      weight: 1,
+      cities: ['Dumfries', 'Annan', 'Lockerbie', 'Moffat', 'Sanquhar', 'Langholm', 'Gretna']
+    },
+    {
+      regionName: 'Nairnshire',
+      regionShort: 'NA',
+      regionSlug: 'nairnshire',
+      weight: 1,
+      cities: ['Nairn', 'Auldearn', 'Cawdor', 'Ferness']
+    },
+    {
+      regionName: 'Perthshire',
+      regionShort: 'PE',
+      regionSlug: 'perthshire',
+      weight: 1,
+      cities: ['Perth', 'Crieff', 'Pitlochry', 'Callander', 'Blairgowrie', 'Rattray', 'Coupar Angus', 'Kincardine']
+    },
+    {
+      regionName: 'Ross-shire',
+      regionShort: 'RO',
+      regionSlug: 'ross_shire',
+      weight: 1,
+      cities: ['Dingwall', 'Stornaway', 'Tain', 'Alness', 'Invergordon']
+    }
+  ]
+});
+
+export default UK;
diff --git a/packages/plugins/src/countries/UK/i18n/ar.json b/packages/plugins/src/countries/UK/i18n/ar.json
new file mode 100644
index 000000000..0c1237ad2
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "المملكة المتحدة",
+  "regionNames": "مقاطعات المملكة المتحدة"
+}
diff --git a/packages/plugins/src/countries/UK/i18n/de.json b/packages/plugins/src/countries/UK/i18n/de.json
new file mode 100644
index 000000000..c53ddbb35
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Großbritannien",
+  "regionNames": "Britische Grafschaften"
+}
diff --git a/packages/plugins/src/countries/UK/i18n/en.json b/packages/plugins/src/countries/UK/i18n/en.json
new file mode 100644
index 000000000..e83335700
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "United Kingdom",
+  "regionNames": "UK Counties"
+}
diff --git a/packages/plugins/src/countries/UK/i18n/es.json b/packages/plugins/src/countries/UK/i18n/es.json
new file mode 100644
index 000000000..af7b4b734
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Reino Unido",
+  "regionNames": "Condados del Reino Unido"
+}
diff --git a/packages/plugins/src/countries/UK/i18n/fr.json b/packages/plugins/src/countries/UK/i18n/fr.json
new file mode 100644
index 000000000..5ac2ce93b
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Royaume-Uni",
+  "regionNames": "Comtés du Royaume-Uni"
+}
diff --git a/packages/plugins/src/countries/UK/i18n/hi.json b/packages/plugins/src/countries/UK/i18n/hi.json
new file mode 100644
index 000000000..7897a559d
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "यूनाइटेड किंगडम",
+  "regionNames": "यूके काउंटियों"
+}
diff --git a/packages/plugins/src/countries/UK/i18n/ja.json b/packages/plugins/src/countries/UK/i18n/ja.json
new file mode 100644
index 000000000..a270866cb
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "イギリス",
+  "regionNames": "英国の郡"
+}
diff --git a/packages/plugins/src/countries/UK/i18n/nl.json b/packages/plugins/src/countries/UK/i18n/nl.json
new file mode 100644
index 000000000..cd6534846
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Verenigd Koninkrijk",
+  "regionNames": "Britse provincies"
+}
diff --git a/packages/plugins/src/countries/UK/i18n/pt.json b/packages/plugins/src/countries/UK/i18n/pt.json
new file mode 100644
index 000000000..b64326a4c
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Reino Unido",
+  "regionNames": "Condados do Reino Unido"
+}
diff --git a/packages/plugins/src/countries/UK/i18n/ru.json b/packages/plugins/src/countries/UK/i18n/ru.json
new file mode 100644
index 000000000..df988fa21
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Соединенное Королевство",
+  "regionNames": "Округа Великобритании"
+}
diff --git a/packages/plugins/src/countries/UK/i18n/ta.json b/packages/plugins/src/countries/UK/i18n/ta.json
new file mode 100644
index 000000000..161d3c7f8
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ஐக்கிய இராச்சியம்",
+  "regionNames": "இங்கிலாந்து மாவட்டங்கள்"
+}
diff --git a/packages/plugins/src/countries/UK/i18n/zh.json b/packages/plugins/src/countries/UK/i18n/zh.json
new file mode 100644
index 000000000..6750261d5
--- /dev/null
+++ b/packages/plugins/src/countries/UK/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "英国",
+  "regionNames": "英国各县"
+}
diff --git a/packages/plugins/src/countries/US/bundle.ts b/packages/plugins/src/countries/US/bundle.ts
new file mode 100644
index 000000000..e7be0db08
--- /dev/null
+++ b/packages/plugins/src/countries/US/bundle.ts
@@ -0,0 +1,364 @@
+import { GetCountryData } from '@generatedata/types';
+
+const US: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'US',
+  regionNames: i18n.regionNames,
+  continent: 'north_america',
+
+  extendedData: {
+    zipFormat: {
+      format: 'Xxxxx'
+    },
+    phoneFormat: {
+      displayFormats: ['(AAA} Xxx-xxxx', '1 (AAA} Xxx-xxxx', '1-AAA-Xxx-xxxx']
+    }
+  },
+
+  regions: [
+    {
+      regionName: 'Alabama',
+      regionShort: 'AL',
+      regionSlug: 'alabama',
+      weight: 2,
+      cities: [
+        'Birmingham',
+        'Montgomery',
+        'Mobile',
+        'Huntsville',
+        'Tuscaloosa',
+        'Birmingham',
+        'Montgomery',
+        'Mobile',
+        'Huntsville',
+        'Tuscaloosa'
+      ],
+      extendedData: {
+        zipFormat: {
+          format: 'ZYxxx',
+          replacements: {
+            Z: '3',
+            Y: '56',
+            x: '0123456789'
+          }
+        }
+      }
+    },
+    {
+      regionName: 'Alaska',
+      regionShort: 'AK',
+      regionSlug: 'alaska',
+      weight: 2,
+      cities: ['Anchorage', 'Fairbanks', 'Juneau', 'College', 'Anchorage', 'Fairbanks', 'Juneau', 'College', 'Ketchikan'],
+      extendedData: {
+        zipFormat: {
+          format: 'ZZYxx',
+          replacements: {
+            Z: '9',
+            Y: '56789',
+            x: '0123456789'
+          }
+        }
+      }
+    },
+    {
+      regionName: 'Arizona',
+      regionShort: 'AZ',
+      regionSlug: 'arizona',
+      weight: 2,
+      cities: ['Phoenix', 'Tucson', 'Mesa', 'Glendale', 'Chandler'],
+      extendedData: {
+        zipFormat: {
+          format: 'ZYxxx',
+          replacements: {
+            Z: '8',
+            Y: '56',
+            x: '0123456789'
+          }
+        }
+      }
+    },
+    {
+      regionName: 'Arkansas',
+      regionShort: 'AR',
+      regionSlug: 'arkansas',
+      weight: 2,
+      cities: ['Little Rock', 'Fort Smith', 'Fayetteville', 'Springdale', 'Jonesboro'],
+      extendedData: {
+        zipFormat: {
+          format: 'ZYxxx',
+          replacements: {
+            Z: '7',
+            Y: '12',
+            x: '0123456789'
+          }
+        }
+      }
+    },
+    {
+      regionName: 'California',
+      regionShort: 'CA',
+      regionSlug: 'california',
+      weight: 2,
+      cities: ['Los Angeles', 'San Diego', 'San Jose', 'San Francisco', 'Fresno', 'Sacramento'],
+      extendedData: {
+        zipFormat: {
+          // 'area': 'US-CA',
+          format: 'ZYxxx',
+          replacements: {
+            Z: '9',
+            Y: '0123456',
+            x: '0123456789'
+          }
+        }
+      }
+    },
+    {
+      regionName: 'Colorado',
+      regionShort: 'CO',
+      regionSlug: 'colorado',
+      weight: 2,
+      cities: ['Denver', 'Colorado Springs', 'Aurora', 'Lakewood', 'Fort Collins']
+    },
+    {
+      regionName: 'Connecticut',
+      regionShort: 'CT',
+      regionSlug: 'connecticut',
+      weight: 2,
+      cities: ['Bridgeport', 'New Haven', 'Hartford', 'Stamford', 'Waterbury']
+    },
+    {
+      regionName: 'Delaware',
+      regionShort: 'DE',
+      regionSlug: 'delaware',
+      weight: 2,
+      cities: ['Wilmington', 'Dover', 'Newark', 'Pike Creek', 'Bear']
+    },
+    {
+      regionName: 'Florida',
+      regionShort: 'FL',
+      regionSlug: 'florida',
+      weight: 2,
+      cities: ['Jacksonville', 'Miami', 'Tampa', 'St. Petersburg', 'Orlando', 'Tallahassee']
+    },
+    {
+      regionName: 'Georgia',
+      regionShort: 'GA',
+      regionSlug: 'georgia',
+      weight: 2,
+      cities: ['Georgia', 'Atlanta', 'Augusta', 'Columbus', 'Savannah', 'Athens']
+    },
+    {
+      regionName: 'Hawaii',
+      regionShort: 'HI',
+      regionSlug: 'hawaii',
+      weight: 2,
+      cities: ['Honolulu', 'Hilo', 'Kailua', 'Kaneohe', 'Kapolei']
+    },
+    {
+      regionName: 'Idaho',
+      regionShort: 'ID',
+      regionSlug: 'idaho',
+      weight: 2,
+      cities: ['Boise', 'Nampa', 'Meridian', 'Pocatello', 'Idaho Falls']
+    },
+    {
+      regionName: 'Illinois',
+      regionShort: 'IL',
+      regionSlug: 'illinois',
+      weight: 2,
+      cities: ['Chicago', 'Aurora', 'Rockford', 'Joliet', 'Naperville', 'Springfield']
+    },
+    {
+      regionName: 'Indiana',
+      regionShort: 'IN',
+      regionSlug: 'indiana',
+      weight: 2,
+      cities: ['Indianapolis', 'Fort Wayne', 'Evansville', 'South Bend', 'Gary']
+    },
+    {
+      regionName: 'Iowa',
+      regionShort: 'IA',
+      regionSlug: 'iowa',
+      weight: 2,
+      cities: ['Des Moines', 'Cedar Rapids', 'Davenport', 'Sioux City', 'Iowa City']
+    },
+    {
+      regionName: 'Kansas',
+      regionShort: 'KS',
+      regionSlug: 'kansas',
+      weight: 2,
+      cities: ['Wichita', 'Overland Park', 'Kansas City', 'Topeka', 'Olathe']
+    },
+    {
+      regionName: 'Kentucky',
+      regionShort: 'KY',
+      regionSlug: 'kentucky',
+      weight: 2,
+      cities: ['Louisville', 'Lexington', 'Owensboro', 'Bowling Green', 'Covington', 'Frankfort']
+    },
+    {
+      regionName: 'Louisiana',
+      regionShort: 'LA',
+      regionSlug: 'louisiana',
+      weight: 2,
+      cities: ['New Orleans', 'Baton Rouge', 'Shreveport', 'Metairie', 'Lafayette']
+    },
+    {
+      regionName: 'Maine',
+      regionShort: 'ME',
+      regionSlug: 'maine',
+      weight: 2,
+      cities: ['Portland', 'Lewiston', 'Bangor', 'South Portland', 'Auburn', 'Augusta']
+    },
+    {
+      regionName: 'Maryland',
+      regionShort: 'MD',
+      regionSlug: 'maryland',
+      weight: 2,
+      cities: ['Baltimore', 'Rockville', 'Frederick', 'Gaithersburg', 'Columbia', 'Annapolis']
+    },
+    {
+      regionName: 'Massachusetts',
+      regionShort: 'MA',
+      regionSlug: 'massachusetts',
+      weight: 2,
+      cities: ['Boston', 'Worcester', 'Springfield', 'Lowell', 'Cambridge']
+    },
+    {
+      regionName: 'Michigan',
+      regionShort: 'MI',
+      regionSlug: 'michigan',
+      weight: 2,
+      cities: ['Detroit', 'Grand Rapids', 'Warren', 'Sterling Heights', 'Flint', 'Lansing']
+    },
+    {
+      regionName: 'Minnesota',
+      regionShort: 'MN',
+      regionSlug: 'minnesota',
+      weight: 2,
+      cities: ['Minneapolis', 'Saint Paul', 'Rochester', 'Duluth', 'Bloomington']
+    },
+    {
+      regionName: 'Mississippi',
+      regionShort: 'MS',
+      regionSlug: 'mississippi',
+      weight: 2,
+      cities: ['Jackson', 'Gulfport', 'Hattiesburg', 'Biloxi', 'Southaven']
+    },
+    {
+      regionName: 'Missouri',
+      regionShort: 'MO',
+      regionSlug: 'missouri',
+      weight: 2,
+      cities: ['Kansas City', 'Saint Louis', 'Springfield', 'Independence', 'Columbia', 'Jefferson City']
+    },
+    {
+      regionName: 'Montana',
+      regionShort: 'MT',
+      regionSlug: 'montana',
+      weight: 2,
+      cities: ['Billings', 'Missoula', 'Great Falls', 'Butte', 'Bozeman', 'Helena']
+    },
+    {
+      regionName: 'Nebraska',
+      regionShort: 'NE',
+      regionSlug: 'nebraska',
+      weight: 2,
+      cities: ['Omaha', 'Lincoln', 'Bellevue', 'Grand Island', 'Kearney']
+    },
+    {
+      regionName: 'Nevada',
+      regionShort: 'NV',
+      regionSlug: 'nevada',
+      weight: 2,
+      cities: ['Las Vegas', 'Henderson', 'North Las Vegas', 'Reno', 'Paradise', 'Carson City']
+    },
+    {
+      regionName: 'Ohio',
+      regionShort: 'OH',
+      regionSlug: 'ohio',
+      weight: 2,
+      cities: ['Columbus', 'Cleveland', 'Cincinnati', 'Toledo', 'Akron']
+    },
+    {
+      regionName: 'Oklahoma',
+      regionShort: 'OK',
+      regionSlug: 'oklahoma',
+      weight: 2,
+      cities: ['Oklahoma City', 'Tulsa', 'Norman', 'Lawton', 'Broken Arrow']
+    },
+    {
+      regionName: 'Oregon',
+      regionShort: 'OR',
+      regionSlug: 'oregon',
+      weight: 2,
+      cities: ['Portland', 'Eugene', 'Salem', 'Gresham', 'Hillsboro']
+    },
+    {
+      regionName: 'Pennsylvania',
+      regionShort: 'PA',
+      regionSlug: 'pennsylvania',
+      weight: 2,
+      cities: ['Philadelphia', 'Pittsburgh', 'Allentown', 'Erie', 'Reading', 'Harrisburg']
+    },
+    {
+      regionName: 'Tennessee',
+      regionShort: 'TN',
+      regionSlug: 'tennessee',
+      weight: 2,
+      cities: ['Memphis', 'Nashville', 'Knoxville', 'Chattanooga', 'Clarksville']
+    },
+    {
+      regionName: 'Texas',
+      regionShort: 'TX',
+      regionSlug: 'texas',
+      weight: 2,
+      cities: ['Houston', 'San Antonio', 'Dallas', 'Austin', 'Fort Worth']
+    },
+    {
+      regionName: 'Utah',
+      regionShort: 'UT',
+      regionSlug: 'utah',
+      weight: 2,
+      cities: ['Salt Lake City', 'West Valley City', 'Provo', 'West Jordan', 'Sandy']
+    },
+    {
+      regionName: 'Vermont',
+      regionShort: 'VT',
+      regionSlug: 'vermont',
+      weight: 2,
+      cities: ['Burlington', 'Essex', 'Rutland', 'Colchester', 'South Burlington', 'Montpelier']
+    },
+    {
+      regionName: 'Virginia',
+      regionShort: 'VA',
+      regionSlug: 'virginia',
+      weight: 2,
+      cities: ['Virginia Beach', 'Norfolk', 'Chesapeake', 'Richmond', 'Newport News']
+    },
+    {
+      regionName: 'Washington',
+      regionShort: 'WA',
+      regionSlug: 'washington',
+      weight: 2,
+      cities: ['Seattle', 'Spokane', 'Tacoma', 'Vancouver', 'Bellevue', 'Olympia']
+    },
+    {
+      regionName: 'Wisconsin',
+      regionShort: 'WI',
+      regionSlug: 'wisconsin',
+      weight: 2,
+      cities: ['Milwaukee', 'Madison', 'Green Bay', 'Kenosha', 'Racine']
+    },
+    {
+      regionName: 'Wyoming',
+      regionShort: 'WY',
+      regionSlug: 'wyoming',
+      weight: 2,
+      cities: ['Wyoming', 'Cheyenne', 'Casper', 'Laramie', 'Gillette', 'Rock Springs']
+    }
+  ]
+});
+
+export default US;
diff --git a/packages/plugins/src/countries/US/i18n/ar.json b/packages/plugins/src/countries/US/i18n/ar.json
new file mode 100644
index 000000000..634266052
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "الولايات المتحدة",
+  "regionNames": "الولايات المتحدة"
+}
diff --git a/packages/plugins/src/countries/US/i18n/de.json b/packages/plugins/src/countries/US/i18n/de.json
new file mode 100644
index 000000000..c9c8b70e4
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Vereinigte Staaten",
+  "regionNames": "US-Bundesstaaten"
+}
diff --git a/packages/plugins/src/countries/US/i18n/en.json b/packages/plugins/src/countries/US/i18n/en.json
new file mode 100644
index 000000000..59a7c8e44
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "United States",
+  "regionNames": "US States"
+}
diff --git a/packages/plugins/src/countries/US/i18n/es.json b/packages/plugins/src/countries/US/i18n/es.json
new file mode 100644
index 000000000..b049141e1
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Estados Unidos",
+  "regionNames": "Nuestros estados"
+}
diff --git a/packages/plugins/src/countries/US/i18n/fr.json b/packages/plugins/src/countries/US/i18n/fr.json
new file mode 100644
index 000000000..457de0e4b
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "États-Unis",
+  "regionNames": "États américains"
+}
diff --git a/packages/plugins/src/countries/US/i18n/hi.json b/packages/plugins/src/countries/US/i18n/hi.json
new file mode 100644
index 000000000..5fe7bfdd2
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "संयुक्त राज्य अमेरिका",
+  "regionNames": "अमेरिकी राज्य"
+}
diff --git a/packages/plugins/src/countries/US/i18n/ja.json b/packages/plugins/src/countries/US/i18n/ja.json
new file mode 100644
index 000000000..3940e422c
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "アメリカ",
+  "regionNames": "米国の州"
+}
diff --git a/packages/plugins/src/countries/US/i18n/nl.json b/packages/plugins/src/countries/US/i18n/nl.json
new file mode 100644
index 000000000..f501691a6
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Verenigde Staten",
+  "regionNames": "Amerikaanse staten"
+}
diff --git a/packages/plugins/src/countries/US/i18n/pt.json b/packages/plugins/src/countries/US/i18n/pt.json
new file mode 100644
index 000000000..f0671dde1
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Estados Unidos",
+  "regionNames": "Estados dos EUA"
+}
diff --git a/packages/plugins/src/countries/US/i18n/ru.json b/packages/plugins/src/countries/US/i18n/ru.json
new file mode 100644
index 000000000..8d4c18ff1
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Соединенные Штаты",
+  "regionNames": "Штаты США"
+}
diff --git a/packages/plugins/src/countries/US/i18n/ta.json b/packages/plugins/src/countries/US/i18n/ta.json
new file mode 100644
index 000000000..6c8cba1c1
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "அமெரிக்கா",
+  "regionNames": "அமெரிக்க மாநிலங்கள்"
+}
diff --git a/packages/plugins/src/countries/US/i18n/zh.json b/packages/plugins/src/countries/US/i18n/zh.json
new file mode 100644
index 000000000..a3272a8c5
--- /dev/null
+++ b/packages/plugins/src/countries/US/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "美国",
+  "regionNames": "美国各州"
+}
diff --git a/packages/plugins/src/countries/US/names.ts b/packages/plugins/src/countries/US/names.ts
new file mode 100644
index 000000000..c39e2c415
--- /dev/null
+++ b/packages/plugins/src/countries/US/names.ts
@@ -0,0 +1,918 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Agnes',
+  'Alice',
+  'Alicia',
+  'Allison',
+  'Alma',
+  'Amanda',
+  'Amber',
+  'Amy',
+  'Ana',
+  'Andrea',
+  'Angela',
+  'Anita',
+  'Ann',
+  'Anna',
+  'Anne',
+  'Annette',
+  'Annie',
+  'April',
+  'Arlene',
+  'Ashley',
+  'Audrey',
+  'Barbara',
+  'Beatrice',
+  'Becky',
+  'Bernice',
+  'Bertha',
+  'Bessie',
+  'Beth',
+  'Betty',
+  'Beverly',
+  'Billie',
+  'Bobbie',
+  'Bonnie',
+  'Brandy',
+  'Brenda',
+  'Brittany',
+  'Carla',
+  'Carmen',
+  'Carol',
+  'Carole',
+  'Caroline',
+  'Carolyn',
+  'Carrie',
+  'Cassandra',
+  'Catherine',
+  'Cathy',
+  'Charlene',
+  'Charlotte',
+  'Cheryl',
+  'Christina',
+  'Christine',
+  'Christy',
+  'Cindy',
+  'Claire',
+  'Clara',
+  'Claudia',
+  'Colleen',
+  'Connie',
+  'Constance',
+  'Courtney',
+  'Crystal',
+  'Cynthia',
+  'Daisy',
+  'Dana',
+  'Danielle',
+  'Darlene',
+  'Dawn',
+  'Deanna',
+  'Debbie',
+  'Deborah',
+  'Debra',
+  'Delores',
+  'Denise',
+  'Diana',
+  'Diane',
+  'Dianne',
+  'Dolores',
+  'Donna',
+  'Dora',
+  'Doris',
+  'Dorothy',
+  'Edith',
+  'Edna',
+  'Eileen',
+  'Elaine',
+  'Eleanor',
+  'Elizabeth',
+  'Ella',
+  'Ellen',
+  'Elsie',
+  'Emily',
+  'Emma',
+  'Erica',
+  'Erika',
+  'Erin',
+  'Esther',
+  'Ethel',
+  'Eva',
+  'Evelyn',
+  'Felicia',
+  'Florence',
+  'Frances',
+  'Gail',
+  'Georgia',
+  'Geraldine',
+  'Gertrude',
+  'Gina',
+  'Gladys',
+  'Glenda',
+  'Gloria',
+  'Grace',
+  'Gwendolyn',
+  'Hazel',
+  'Heather',
+  'Heidi',
+  'Helen',
+  'Hilda',
+  'Holly',
+  'Ida',
+  'Irene',
+  'Irma',
+  'Jackie',
+  'Jacqueline',
+  'Jamie',
+  'Jane',
+  'Janet',
+  'Janice',
+  'Jean',
+  'Jeanette',
+  'Jeanne',
+  'Jennie',
+  'Jennifer',
+  'Jenny',
+  'Jessica',
+  'Jessie',
+  'Jill',
+  'Jo',
+  'Joan',
+  'Joann',
+  'Joanne',
+  'Josephine',
+  'Joy',
+  'Joyce',
+  'Juanita',
+  'Judith',
+  'Judy',
+  'Julia',
+  'Julie',
+  'June',
+  'Karen',
+  'Katherine',
+  'Kathleen',
+  'Kathryn',
+  'Kathy',
+  'Katie',
+  'Katrina',
+  'Kay',
+  'Kelly',
+  'Kim',
+  'Kimberly',
+  'Kristen',
+  'Kristin',
+  'Kristina',
+  'Laura',
+  'Lauren',
+  'Laurie',
+  'Leah',
+  'Lena',
+  'Leona',
+  'Leslie',
+  'Lillian',
+  'Lillie',
+  'Linda',
+  'Lisa',
+  'Lois',
+  'Loretta',
+  'Lori',
+  'Lorraine',
+  'Louise',
+  'Lucille',
+  'Lucy',
+  'Lydia',
+  'Lynn',
+  'Mabel',
+  'Mae',
+  'Marcia',
+  'Margaret',
+  'Margie',
+  'Maria',
+  'Marian',
+  'Marie',
+  'Marilyn',
+  'Marion',
+  'Marjorie',
+  'Marlene',
+  'Marsha',
+  'Martha',
+  'Mary',
+  'Mattie',
+  'Maureen',
+  'Maxine',
+  'Megan',
+  'Melanie',
+  'Melinda',
+  'Melissa',
+  'Michele',
+  'Michelle',
+  'Mildred',
+  'Minnie',
+  'Miriam',
+  'Misty',
+  'Monica',
+  'Myrtle',
+  'Nancy',
+  'Naomi',
+  'Natalie',
+  'Nellie',
+  'Nicole',
+  'Nina',
+  'Nora',
+  'Norma',
+  'Olga',
+  'Pamela',
+  'Patricia',
+  'Patsy',
+  'Paula',
+  'Pauline',
+  'Pearl',
+  'Peggy',
+  'Penny',
+  'Phyllis',
+  'Priscilla',
+  'Rachel',
+  'Ramona',
+  'Rebecca',
+  'Regina',
+  'Renee',
+  'Rhonda',
+  'Rita',
+  'Roberta',
+  'Robin',
+  'Rosa',
+  'Rose',
+  'Rosemary',
+  'Ruby',
+  'Ruth',
+  'Sally',
+  'Samantha',
+  'Sandra',
+  'Sara',
+  'Sarah',
+  'Shannon',
+  'Sharon',
+  'Sheila',
+  'Shelly',
+  'Sherri',
+  'Sherry',
+  'Shirley',
+  'Sonia',
+  'Stacey',
+  'Stacy',
+  'Stella',
+  'Stephanie',
+  'Sue',
+  'Susan',
+  'Suzanne',
+  'Sylvia',
+  'Tamara',
+  'Tammy',
+  'Tanya',
+  'Tara',
+  'Teresa',
+  'Terri',
+  'Terry',
+  'Thelma',
+  'Theresa',
+  'Tiffany',
+  'Tina',
+  'Toni',
+  'Tonya',
+  'Tracey',
+  'Tracy',
+  'Valerie',
+  'Vanessa',
+  'Velma',
+  'Vera',
+  'Veronica',
+  'Vicki',
+  'Vickie',
+  'Victoria',
+  'Viola',
+  'Violet',
+  'Virginia',
+  'Vivian',
+  'Wanda',
+  'Wendy',
+  'Willie',
+  'Wilma',
+  'Yolanda',
+  'Yvonne'
+];
+
+const maleNames = [
+  'Aaron',
+  'Adam',
+  'Adrian',
+  'Alan',
+  'Albert',
+  'Alberto',
+  'Alex',
+  'Alexander',
+  'Alfred',
+  'Alfredo',
+  'Allan',
+  'Allen',
+  'Alvin',
+  'Andre',
+  'Andrew',
+  'Andy',
+  'Angel',
+  'Anthony',
+  'Antonio',
+  'Armando',
+  'Arnold',
+  'Arthur',
+  'Barry',
+  'Ben',
+  'Benjamin',
+  'Bernard',
+  'Bill',
+  'Billy',
+  'Bob',
+  'Bobby',
+  'Brad',
+  'Bradley',
+  'Brandon',
+  'Brent',
+  'Brett',
+  'Brian',
+  'Bruce',
+  'Bryan',
+  'Byron',
+  'Calvin',
+  'Carl',
+  'Carlos',
+  'Casey',
+  'Cecil',
+  'Chad',
+  'Charles',
+  'Charlie',
+  'Chester',
+  'Chris',
+  'Christian',
+  'Christopher',
+  'Clarence',
+  'Claude',
+  'Clayton',
+  'Clifford',
+  'Clifton',
+  'Clinton',
+  'Clyde',
+  'Cody',
+  'Corey',
+  'Cory',
+  'Craig',
+  'Curtis',
+  'Dale',
+  'Dan',
+  'Daniel',
+  'Danny',
+  'Darrell',
+  'Darren',
+  'Darryl',
+  'Daryl',
+  'Dave',
+  'David',
+  'Dean',
+  'Dennis',
+  'Derek',
+  'Derrick',
+  'Don',
+  'Donald',
+  'Douglas',
+  'Duane',
+  'Dustin',
+  'Dwayne',
+  'Dwight',
+  'Earl',
+  'Eddie',
+  'Edgar',
+  'Eduardo',
+  'Edward',
+  'Edwin',
+  'Elmer',
+  'Enrique',
+  'Eric',
+  'Erik',
+  'Ernest',
+  'Eugene',
+  'Everett',
+  'Felix',
+  'Fernando',
+  'Floyd',
+  'Francis',
+  'Francisco',
+  'Frank',
+  'Franklin',
+  'Fred',
+  'Freddie',
+  'Frederick',
+  'Gabriel',
+  'Gary',
+  'Gene',
+  'George',
+  'Gerald',
+  'Gilbert',
+  'Glen',
+  'Glenn',
+  'Gordon',
+  'Greg',
+  'Gregory',
+  'Guy',
+  'Harold',
+  'Harry',
+  'Harvey',
+  'Hector',
+  'Henry',
+  'Herbert',
+  'Herman',
+  'Howard',
+  'Hugh',
+  'Ian',
+  'Isaac',
+  'Ivan',
+  'Jack',
+  'Jacob',
+  'Jaime',
+  'James',
+  'Jamie',
+  'Jared',
+  'Jason',
+  'Javier',
+  'Jay',
+  'Jeff',
+  'Jeffery',
+  'Jeffrey',
+  'Jeremy',
+  'Jerome',
+  'Jerry',
+  'Jesse',
+  'Jessie',
+  'Jesus',
+  'Jim',
+  'Jimmie',
+  'Jimmy',
+  'Joe',
+  'Joel',
+  'John',
+  'Johnnie',
+  'Johnny',
+  'Jon',
+  'Jonathan',
+  'Jordan',
+  'Jorge',
+  'Jose',
+  'Joseph',
+  'Joshua',
+  'Juan',
+  'Julian',
+  'Julio',
+  'Justin',
+  'Karl',
+  'Keith',
+  'Kelly',
+  'Ken',
+  'Kenneth',
+  'Kent',
+  'Kevin',
+  'Kirk',
+  'Kurt',
+  'Kyle',
+  'Lance',
+  'Larry',
+  'Lawrence',
+  'Lee',
+  'Leo',
+  'Leon',
+  'Leonard',
+  'Leroy',
+  'Leslie',
+  'Lester',
+  'Lewis',
+  'Lloyd',
+  'Lonnie',
+  'Louis',
+  'Luis',
+  'Manuel',
+  'Marc',
+  'Marcus',
+  'Mario',
+  'Marion',
+  'Mark',
+  'Marshall',
+  'Martin',
+  'Marvin',
+  'Mathew',
+  'Matthew',
+  'Maurice',
+  'Max',
+  'Melvin',
+  'Michael',
+  'Micheal',
+  'Miguel',
+  'Mike',
+  'Milton',
+  'Mitchell',
+  'Morris',
+  'Nathan',
+  'Nathaniel',
+  'Neil',
+  'Nelson',
+  'Nicholas',
+  'Norman',
+  'Oscar',
+  'Patrick',
+  'Paul',
+  'Pedro',
+  'Perry',
+  'Peter',
+  'Philip',
+  'Phillip',
+  'Rafael',
+  'Ralph',
+  'Ramon',
+  'Randall',
+  'Randy',
+  'Raul',
+  'Ray',
+  'Raymond',
+  'Reginald',
+  'Rene',
+  'Ricardo',
+  'Richard',
+  'Rick',
+  'Ricky',
+  'Robert',
+  'Roberto',
+  'Rodney',
+  'Roger',
+  'Roland',
+  'Ron',
+  'Ronald',
+  'Ronnie',
+  'Ross',
+  'Roy',
+  'Ruben',
+  'Russell',
+  'Ryan',
+  'Salvador',
+  'Sam',
+  'Samuel',
+  'Scott',
+  'Sean',
+  'Sergio',
+  'Seth',
+  'Shane',
+  'Shawn',
+  'Sidney',
+  'Stanley',
+  'Stephen',
+  'Steve',
+  'Steven',
+  'Ted',
+  'Terrance',
+  'Terrence',
+  'Terry',
+  'Theodore',
+  'Thomas',
+  'Tim',
+  'Timothy',
+  'Todd',
+  'Tom',
+  'Tommy',
+  'Tony',
+  'Tracy',
+  'Travis',
+  'Troy',
+  'Tyler',
+  'Tyrone',
+  'Vernon',
+  'Victor',
+  'Vincent',
+  'Virgil',
+  'Wade',
+  'Wallace',
+  'Walter',
+  'Warren',
+  'Wayne',
+  'Wesley',
+  'Willard',
+  'William',
+  'Willie',
+  'Zachary'
+];
+
+const lastNames = [
+  'Adams',
+  'Aguilar',
+  'Alexander',
+  'Allen',
+  'Alvarado',
+  'Alvarez',
+  'Anderson',
+  'Andrews',
+  'Armstrong',
+  'Arnold',
+  'Austin',
+  'Bailey',
+  'Baker',
+  'Banks',
+  'Barnes',
+  'Bell',
+  'Bennett',
+  'Berry',
+  'Bishop',
+  'Black',
+  'Bowman',
+  'Boyd',
+  'Bradley',
+  'Brooks',
+  'Brown',
+  'Bryant',
+  'Burke',
+  'Burns',
+  'Burton',
+  'Butler',
+  'Campbell',
+  'Carlson',
+  'Carpenter',
+  'Carr',
+  'Carroll',
+  'Carter',
+  'Castillo',
+  'Castro',
+  'Chapman',
+  'Chavez',
+  'Chen',
+  'Clark',
+  'Cole',
+  'Coleman',
+  'Collins',
+  'Contreras',
+  'Cook',
+  'Cooper',
+  'Cox',
+  'Crawford',
+  'Cruz',
+  'Cunningham',
+  'Daniels',
+  'Davis',
+  'Day',
+  'Dean',
+  'Delgado',
+  'Diaz',
+  'Dixon',
+  'Dominguez',
+  'Duncan',
+  'Dunn',
+  'Edwards',
+  'Elliott',
+  'Ellis',
+  'Espinoza',
+  'Estrada',
+  'Evans',
+  'Ferguson',
+  'Fernandez',
+  'Fields',
+  'Fisher',
+  'Flores',
+  'Ford',
+  'Foster',
+  'Fowler',
+  'Fox',
+  'Franklin',
+  'Freeman',
+  'Fuller',
+  'Garcia',
+  'Gardner',
+  'Garrett',
+  'Garza',
+  'George',
+  'Gibson',
+  'Gilbert',
+  'Gomez',
+  'Gonzales',
+  'Gonzalez',
+  'Gordon',
+  'Graham',
+  'Grant',
+  'Gray',
+  'Green',
+  'Greene',
+  'Griffin',
+  'Guerrero',
+  'Gutierrez',
+  'Guzman',
+  'Hall',
+  'Hamilton',
+  'Hansen',
+  'Hanson',
+  'Harper',
+  'Harris',
+  'Harrison',
+  'Hart',
+  'Harvey',
+  'Hawkins',
+  'Hayes',
+  'Henderson',
+  'Henry',
+  'Hernandez',
+  'Herrera',
+  'Hicks',
+  'Hill',
+  'Hoffman',
+  'Holmes',
+  'Howard',
+  'Howell',
+  'Hudson',
+  'Hughes',
+  'Hunt',
+  'Hunter',
+  'Jackson',
+  'Jacobs',
+  'James',
+  'Jenkins',
+  'Jensen',
+  'Jimenez',
+  'Johnson',
+  'Johnston',
+  'Jones',
+  'Jordan',
+  'Kelley',
+  'Kelly',
+  'Kennedy',
+  'Kim',
+  'King',
+  'Knight',
+  'Lane',
+  'Larson',
+  'Lawrence',
+  'Lawson',
+  'Le',
+  'Lee',
+  'Lewis',
+  'Li',
+  'Little',
+  'Long',
+  'Lopez',
+  'Lucas',
+  'Luna',
+  'Lynch',
+  'Maldonado',
+  'Marquez',
+  'Marshall',
+  'Martin',
+  'Martinez',
+  'Mason',
+  'Matthews',
+  'Mccoy',
+  'Mcdonald',
+  'Medina',
+  'Mendez',
+  'Mendoza',
+  'Meyer',
+  'Miller',
+  'Mills',
+  'Mitchell',
+  'Montgomery',
+  'Moore',
+  'Morales',
+  'Moreno',
+  'Morgan',
+  'Morris',
+  'Morrison',
+  'Munoz',
+  'Murphy',
+  'Murray',
+  'Myers',
+  'Name',
+  'Nelson',
+  'Nguyen',
+  'Nichols',
+  'Nunez',
+  'Obrien',
+  'Oliver',
+  'Olson',
+  'Ortega',
+  'Ortiz',
+  'Owens',
+  'Padilla',
+  'Palmer',
+  'Park',
+  'Parker',
+  'Patel',
+  'Patterson',
+  'Payne',
+  'Pena',
+  'Perez',
+  'Perkins',
+  'Perry',
+  'Peters',
+  'Peterson',
+  'Phillips',
+  'Pierce',
+  'Porter',
+  'Powell',
+  'Price',
+  'Ramirez',
+  'Ramos',
+  'Ray',
+  'Reed',
+  'Reid',
+  'Reyes',
+  'Reynolds',
+  'Rice',
+  'Richards',
+  'Richardson',
+  'Riley',
+  'Rios',
+  'Rivera',
+  'Roberts',
+  'Robertson',
+  'Robinson',
+  'Rodriguez',
+  'Rogers',
+  'Rojas',
+  'Romero',
+  'Rose',
+  'Ross',
+  'Ruiz',
+  'Russell',
+  'Ryan',
+  'Salazar',
+  'Sanchez',
+  'Sanders',
+  'Sandoval',
+  'Santiago',
+  'Santos',
+  'Schmidt',
+  'Schultz',
+  'Scott',
+  'Shaw',
+  'Silva',
+  'Simmons',
+  'Simpson',
+  'Sims',
+  'Singh',
+  'Smith',
+  'Snyder',
+  'Soto',
+  'Spencer',
+  'Stephens',
+  'Stevens',
+  'Stewart',
+  'Stone',
+  'Sullivan',
+  'Taylor',
+  'Thomas',
+  'Thompson',
+  'Torres',
+  'Tran',
+  'Tucker',
+  'Turner',
+  'Valdez',
+  'Vargas',
+  'Vasquez',
+  'Vazquez',
+  'Vega',
+  'Wagner',
+  'Walker',
+  'Wallace',
+  'Walsh',
+  'Wang',
+  'Ward',
+  'Warren',
+  'Washington',
+  'Watkins',
+  'Watson',
+  'Weaver',
+  'Webb',
+  'Weber',
+  'Welch',
+  'Wells',
+  'West',
+  'Wheeler',
+  'White',
+  'Williams',
+  'Williamson',
+  'Willis',
+  'Wilson',
+  'Wong',
+  'Wood',
+  'Woods',
+  'Wright',
+  'Yang',
+  'Young'
+];
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/Ukraine/bundle.ts b/packages/plugins/src/countries/Ukraine/bundle.ts
new file mode 100644
index 000000000..49733a92b
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/bundle.ts
@@ -0,0 +1,190 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Spain: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  countrySlug: 'ukraine',
+  regionNames: i18n.regionNames,
+  continent: 'europe',
+  extendedData: {
+    zipFormat: {
+      // could be more specific
+      // https://en.wikipedia.org/wiki/Postal_codes_in_Ukraine
+      format: 'XX-XX'
+    },
+    phoneFormat: {
+      displayFormats: ['XXX-XX-XX']
+    }
+  },
+  regions: [
+    {
+      regionName: 'Cherkasy oblast',
+      regionShort: 'CK',
+      regionSlug: 'cherkasy',
+      weight: 12,
+      cities: ['Cherkasy', 'Uman', 'Smila']
+    },
+    {
+      regionName: 'Chernihiv oblast',
+      regionShort: 'CH',
+      regionSlug: 'chernihiv',
+      weight: 10,
+      cities: ['Chernihiv', 'Nizhyn']
+    },
+    {
+      regionName: 'Chernivtsi oblast',
+      regionShort: 'CV',
+      regionSlug: 'chernivtsi',
+      weight: 9,
+      cities: ['Chernivtsi', 'Kitsman', 'Vashkivtsi']
+    },
+    {
+      regionName: 'Dnipropetrovsk oblast',
+      regionShort: 'DP',
+      regionSlug: 'dnipropetrovsk',
+      weight: 32,
+      cities: ['Dnipro', 'Kryvyi Rih', 'Kamianske', 'Nikopol', 'Pavlohrad', 'Novomoskovsk']
+    },
+    {
+      regionName: 'Donetsk oblast',
+      regionShort: 'DT',
+      regionSlug: 'donetsk',
+      weight: 42,
+      cities: ['Donetsk', 'Mariupol', 'Makiivka', 'Horlivka', 'Kramatorsk', 'Sloviansk', 'Yenakiieve', 'Bakhmut', 'Kostiantynivka']
+    },
+    {
+      regionName: 'Ivano-Frankivsk oblast',
+      regionShort: 'IF',
+      regionSlug: 'ivano-frankivsk',
+      weight: 14,
+      cities: ['Ivano-Frankivsk', 'Kalush']
+    },
+    {
+      regionName: 'Kharkiv oblast',
+      regionShort: 'KK',
+      regionSlug: 'kharkiv',
+      weight: 27,
+      cities: ['Kharkiv', 'Lozova', 'Izium']
+    },
+    {
+      regionName: 'Kherson oblast',
+      regionShort: 'KS',
+      regionSlug: 'kherson',
+      weight: 10,
+      cities: ['Kherson', 'Nova Kakhovka']
+    },
+    {
+      regionName: 'Khmelnytskyi oblast',
+      regionShort: 'KM',
+      regionSlug: 'khmelnytskyi',
+      weight: 13,
+      cities: ['Khmelnytskyi', 'Kamianets-Podilskyi']
+    },
+    {
+      regionName: 'Kyiv oblast',
+      regionShort: 'KV',
+      regionSlug: 'kyiv',
+      weight: 18,
+      cities: ['Kyiv', 'Bila Tserkva', 'Brovary', 'Boryspil', 'Irpin']
+    },
+    {
+      regionName: 'Kirovohrad oblast',
+      regionShort: 'KH',
+      regionSlug: 'kirovohrad',
+      weight: 9,
+      cities: ['Kropyvnytskyi', 'Oleksandriia']
+    },
+    {
+      regionName: 'Luhansk oblast',
+      regionShort: 'LH',
+      regionSlug: 'luhansk',
+      weight: 22,
+      cities: ['Luhansk', 'Alchevsk', 'Sievierodonetsk', 'Lysychansk', 'Khrustalnyi', 'Kadiyivka', 'Dovzhansk']
+    },
+    {
+      regionName: 'Lviv oblast',
+      regionShort: 'LV',
+      regionSlug: 'lviv',
+      weight: 25,
+      cities: ['Lviv', 'Drohobych', 'Chervonohrad']
+    },
+    {
+      regionName: 'Mykolaiv oblast',
+      regionShort: 'MY',
+      regionSlug: 'mykolaiv',
+      weight: 11,
+      cities: ['Mykolaiv', 'Pervomaisk']
+    },
+    {
+      regionName: 'Odessa oblast',
+      regionShort: 'OD',
+      regionSlug: 'odessa',
+      weight: 24,
+      cities: ['Odessa', 'Izmail']
+    },
+    {
+      regionName: 'Poltava oblast',
+      regionShort: 'PL',
+      regionSlug: 'poltava',
+      weight: 14,
+      cities: ['Poltava', 'Kremenchuk']
+    },
+    {
+      regionName: 'Rivne oblast',
+      regionShort: 'RV',
+      regionSlug: 'rivne',
+      weight: 12,
+      cities: ['Rivne', 'Varash', 'Dubno']
+    },
+    {
+      regionName: 'Sumy oblast',
+      regionShort: 'SM',
+      regionSlug: 'sumy',
+      weight: 11,
+      cities: ['Sumy', 'Konotop', 'Shostka']
+    },
+    {
+      regionName: 'Ternopil oblast',
+      regionShort: 'TP',
+      regionSlug: 'ternopil',
+      weight: 10,
+      cities: ['Ternopil', 'Chortkiv']
+    },
+    {
+      regionName: 'Vinnytsia oblast',
+      regionShort: 'VI',
+      regionSlug: 'vinnytsia',
+      weight: 16,
+      cities: ['Vinnytsia', 'Khmilnyk', 'Haisyn']
+    },
+    {
+      regionName: 'Volyn oblast',
+      regionShort: 'VO',
+      regionSlug: 'volyn',
+      weight: 10,
+      cities: ['Lutsk', 'Kovel']
+    },
+    {
+      regionName: 'Zakarpattia oblast',
+      regionShort: 'ZK',
+      regionSlug: 'zakarpattia',
+      weight: 13,
+      cities: ['Uzhhorod', 'Mukachevo']
+    },
+    {
+      regionName: 'Zaporizhzhia oblast',
+      regionShort: 'ZP',
+      regionSlug: 'zaporizhzhia',
+      weight: 17,
+      cities: ['Zaporizhzhia', 'Melitopol', 'Berdiansk']
+    },
+    {
+      regionName: 'Zhytomyr oblast',
+      regionShort: 'ZT',
+      regionSlug: 'zhytomyr',
+      weight: 12,
+      cities: ['Zhytomyr', 'Berdychiv', 'Korosten']
+    }
+  ]
+});
+
+export default Spain;
diff --git a/packages/plugins/src/countries/Ukraine/i18n/ar.json b/packages/plugins/src/countries/Ukraine/i18n/ar.json
new file mode 100644
index 000000000..c59370896
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "أوكرانيا",
+  "regionNames": "مقاطعات أوكرانيا"
+}
diff --git a/packages/plugins/src/countries/Ukraine/i18n/de.json b/packages/plugins/src/countries/Ukraine/i18n/de.json
new file mode 100644
index 000000000..e61be09af
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Ukraine",
+  "regionNames": "Oblaste der Ukraine"
+}
diff --git a/packages/plugins/src/countries/Ukraine/i18n/en.json b/packages/plugins/src/countries/Ukraine/i18n/en.json
new file mode 100644
index 000000000..9a2eacd7b
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Ukraine",
+  "regionNames": "Ukrainian Oblasts"
+}
diff --git a/packages/plugins/src/countries/Ukraine/i18n/es.json b/packages/plugins/src/countries/Ukraine/i18n/es.json
new file mode 100644
index 000000000..2ad9504f1
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Ucrania",
+  "regionNames": "Óblasts de Ucrania"
+}
diff --git a/packages/plugins/src/countries/Ukraine/i18n/fr.json b/packages/plugins/src/countries/Ukraine/i18n/fr.json
new file mode 100644
index 000000000..f02a3428e
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Ukraine",
+  "regionNames": "Oblasts ukrainiens"
+}
diff --git a/packages/plugins/src/countries/Ukraine/i18n/hi.json b/packages/plugins/src/countries/Ukraine/i18n/hi.json
new file mode 100644
index 000000000..d5b49ab88
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "यूक्रेन",
+  "regionNames": "यूक्रेनियन ओब्लास्ट"
+}
diff --git a/packages/plugins/src/countries/Ukraine/i18n/ja.json b/packages/plugins/src/countries/Ukraine/i18n/ja.json
new file mode 100644
index 000000000..5933248cc
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "ウクライナ",
+  "regionNames": "ウクライナの州"
+}
diff --git a/packages/plugins/src/countries/Ukraine/i18n/nl.json b/packages/plugins/src/countries/Ukraine/i18n/nl.json
new file mode 100644
index 000000000..62e367435
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Oekraïne",
+  "regionNames": "Oekraïense oblasten"
+}
diff --git a/packages/plugins/src/countries/Ukraine/i18n/pt.json b/packages/plugins/src/countries/Ukraine/i18n/pt.json
new file mode 100644
index 000000000..664c4ebdb
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Ucrânia",
+  "regionNames": "Oblasts Ucranianos"
+}
diff --git a/packages/plugins/src/countries/Ukraine/i18n/ru.json b/packages/plugins/src/countries/Ukraine/i18n/ru.json
new file mode 100644
index 000000000..3cb25f088
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Украина",
+  "regionNames": "Украинские области"
+}
diff --git a/packages/plugins/src/countries/Ukraine/i18n/ta.json b/packages/plugins/src/countries/Ukraine/i18n/ta.json
new file mode 100644
index 000000000..c6b2b9081
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "உக்ரைன்",
+  "regionNames": "உக்ரேனிய மாகாணங்கள்"
+}
diff --git a/packages/plugins/src/countries/Ukraine/i18n/zh.json b/packages/plugins/src/countries/Ukraine/i18n/zh.json
new file mode 100644
index 000000000..d45c0ff7b
--- /dev/null
+++ b/packages/plugins/src/countries/Ukraine/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "乌克兰",
+  "regionNames": "乌克兰州"
+}
diff --git a/packages/plugins/src/countries/Vietnam/bundle.ts b/packages/plugins/src/countries/Vietnam/bundle.ts
new file mode 100644
index 000000000..6973de869
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/bundle.ts
@@ -0,0 +1,586 @@
+import { GetCountryData } from '@generatedata/types';
+
+const Vietnam: GetCountryData = (i18n) => ({
+  countryName: i18n.countryName,
+  continent: 'asia',
+  countrySlug: 'VN',
+  regionNames: i18n.regionNames, // + 5 Municipalities which are the 5 largest cities
+
+  extendedData: {
+    // the general zip format for the country. This may be optionally overridden for each region if a more
+    // specific format is desired. To prevent duplicate code, the replacements listed here cover ALL zip formats
+    // for each province
+    zipFormat: {
+      format: '%*****',
+      replacements: {
+        '%': '123456789',
+        '*': '0123456789'
+      }
+    },
+
+    // the general phone format and area codes for the country
+    // https://en.wikipedia.org/wiki/Telephone_numbers_in_Vietnam
+    phoneFormat: {
+      areaCodes: [
+        203,
+        204,
+        205,
+        206,
+        207,
+        208,
+        209, // Landlines
+        210,
+        211,
+        212,
+        213,
+        214,
+        215,
+        216,
+        218,
+        219,
+        220,
+        221,
+        222,
+        225,
+        226,
+        227,
+        228,
+        229,
+        232,
+        233,
+        234,
+        235,
+        236,
+        237,
+        238,
+        239,
+        242,
+        243,
+        244,
+        245,
+        246,
+        247,
+        248,
+        251,
+        252,
+        254,
+        255,
+        256,
+        257,
+        258,
+        259,
+        260,
+        261,
+        262,
+        263,
+        269,
+        270,
+        271,
+        272,
+        273,
+        274,
+        275,
+        276,
+        277,
+        278,
+        279,
+        282,
+        283,
+        284,
+        285,
+        286,
+        287,
+        290,
+        291,
+        292,
+        293,
+        294,
+        296,
+        297,
+        299
+      ],
+      displayFormats: [
+        '(AAA) Xxx-xxxx',
+        '+84 AAAXxxxxxx',
+        '+84 (AAA) Xxx-xxxx', // Outside Vietnam use 84 as Country Calling Code
+        '+84-AAA-Xxx-xxxx'
+      ]
+    }
+  },
+
+  // our country-wide data, with info separated into regions
+  // https://en.wikipedia.org/wiki/Vietnam
+  regions: [
+    // Red River Delta
+    {
+      regionName: 'Bắc Ninh',
+      regionShort: 'Bắc Ninh',
+      regionSlug: 'bac_ninh',
+      weight: 1,
+      cities: ['Bắc Ninh', 'Từ Sơn', 'Hồ', 'Phố Mới', 'Lim', 'Chờ', 'Gia Bình', 'Thứa']
+    },
+    {
+      regionName: 'Hà Nam',
+      regionShort: 'Hà Nam',
+      regionSlug: 'ha_nam',
+      weight: 1,
+      cities: ['Phủ Lý', 'Bình Mỹ', 'Hòa Mạc', 'Quế', 'Vĩnh Trụ', 'Kiện Khê']
+    },
+    {
+      regionName: 'Hải Dương',
+      regionShort: 'Hải Dương',
+      regionSlug: 'hai_duong',
+      weight: 1,
+      cities: [
+        'Hải Dương',
+        'Chí Linh',
+        'Kẻ Sặt',
+        'Lai Cách',
+        'Gia Lộc',
+        'Phú Thái',
+        'Kinh Môn',
+        'Nam Sách',
+        'Ninh Giang',
+        'Thanh Hà',
+        'Thanh Miện',
+        'Tứ Kỳ'
+      ]
+    },
+    {
+      regionName: 'Hưng Yên',
+      regionShort: 'Hưng Yên',
+      regionSlug: 'hung_yen',
+      weight: 1,
+      cities: ['Hưng Yên', 'Mỹ Hào', 'Ân Thi', 'Khoái Châu', 'Lương Bằng', 'Trần Cao', 'Vương', 'Văn Giang', 'Như Quỳnh', 'Yên Mỹ']
+    },
+    {
+      regionName: 'Nam Định',
+      regionShort: 'Nam Định',
+      regionSlug: 'nam_dinh',
+      weight: 1,
+      cities: ['Nam Định', 'Ngô Đồng', 'Yên Định', 'Mỹ Lộc', 'Nam Giang', 'Liễu Đề', 'Cổ Lễ', 'Gôi', 'Xuân Trường', 'Lâm']
+    },
+    {
+      regionName: 'Ninh Bình',
+      regionShort: 'Ninh Bình',
+      regionSlug: 'ninh_binh',
+      weight: 1,
+      cities: ['Ninh Bình', 'Tam Điệp', 'Me', 'Thiên Tôn', 'Phát Diệm', 'Nho Quan', 'Yên Ninh', 'Yên Thịnh']
+    },
+    {
+      regionName: 'Thái Bình',
+      regionShort: 'Thái Bình',
+      regionSlug: 'thai_binh',
+      weight: 1,
+      cities: ['Thái Bình', 'Vũ Thư', 'Tiền Hải', 'Diêm Điền', 'Quỳnh Côi', 'Thanh Nê', 'Hưng Hà', 'Đông Hưng']
+    },
+    {
+      regionName: 'Vĩnh Phúc',
+      regionShort: 'Vĩnh Phúc',
+      regionSlug: 'vinh_phuc',
+      weight: 1,
+      cities: ['Vĩnh Yên', 'Phúc Yên', 'Yên Lạc', 'Vĩnh Tường', 'Hợp Hòa', 'Tam Đảo', 'Hoa Sơn', 'Hương Canh']
+    },
+    {
+      regionName: 'Hà Nội',
+      regionShort: 'Hà Nội',
+      regionSlug: 'ha_noi_city',
+      weight: 1,
+      cities: ['Hà Nội']
+    },
+    {
+      regionName: 'Hải Phòng',
+      regionShort: 'Hải Phòng',
+      regionSlug: 'hai_phong_city',
+      weight: 1,
+      cities: ['Hải Phòng']
+    },
+
+    // Northeast Region
+    {
+      regionName: 'Bắc Giang',
+      regionShort: 'Bắc Giang',
+      regionSlug: 'bac_giang',
+      weight: 1,
+      cities: ['Bắc Giang']
+    },
+    {
+      regionName: 'Bắc Kạn',
+      regionShort: 'Bắc Kạn',
+      regionSlug: 'bac_kan',
+      weight: 1,
+      cities: ['Bắc Kạn']
+    },
+    {
+      regionName: 'Cao Bằng',
+      regionShort: 'Cao Bằng',
+      regionSlug: 'cao_bang',
+      weight: 1,
+      cities: ['Cao Bằng']
+    },
+    {
+      regionName: 'Hà Giang',
+      regionShort: 'Hà Giang',
+      regionSlug: 'ha_giang',
+      weight: 1,
+      cities: ['Hà Giang']
+    },
+    {
+      regionName: 'Lạng Sơn',
+      regionShort: 'Lạng Sơn',
+      regionSlug: 'lang_son',
+      weight: 1,
+      cities: ['Lạng Sơn']
+    },
+    {
+      regionName: 'Lào Cai',
+      regionShort: 'Lào Cai',
+      regionSlug: 'lao_cai',
+      weight: 1,
+      cities: ['Lào Cai']
+    },
+    {
+      regionName: 'Phú Thọ',
+      regionShort: 'Phú Thọ',
+      regionSlug: 'phu_tho',
+      weight: 1,
+      cities: ['Việt Trì']
+    },
+    {
+      regionName: 'Quảng Ninh',
+      regionShort: 'Quảng Ninh',
+      regionSlug: 'quang_ninh',
+      weight: 1,
+      cities: ['Hạ Long']
+    },
+    {
+      regionName: 'Thái Nguyên',
+      regionShort: 'Thái Nguyên',
+      regionSlug: 'thai_nguyen',
+      weight: 1,
+      cities: ['Thái Nguyên']
+    },
+    {
+      regionName: 'Tuyên Quang',
+      regionShort: 'Tuyên Quang',
+      regionSlug: 'tuyen_quang',
+      weight: 1,
+      cities: ['Tuyên Quang']
+    },
+    {
+      regionName: 'Yên Bái',
+      regionShort: 'Yên Bái',
+      regionSlug: 'yen_bai',
+      weight: 1,
+      cities: ['Yên Bái', 'Nghĩa Lộ']
+    },
+
+    // Northwest Region
+    {
+      regionName: 'Điện Biên',
+      regionShort: 'Điện Biên',
+      regionSlug: 'dien_bien',
+      weight: 1,
+      cities: ['Điện Biên Phủ', 'Mường Lay']
+    },
+    {
+      regionName: 'Hòa Bình',
+      regionShort: 'Hòa Bình',
+      regionSlug: 'hoa_binh',
+      weight: 1,
+      cities: ['Hòa Bình', 'Cao Phong', 'Bo', 'Kỳ Sơn']
+    },
+    {
+      regionName: 'Lai Châu',
+      regionShort: 'Lai Châu',
+      regionSlug: 'lai_chau',
+      weight: 1,
+      cities: ['Lai Châu', 'Mường Tè', 'Nậm Nhùn', 'Phong Thổ', 'Sìn Hồ', 'Tam Đường', 'Tân Uyên', 'Than Uyên']
+    },
+    {
+      regionName: 'Sơn La',
+      regionShort: 'Sơn La',
+      regionSlug: 'son_la',
+      weight: 1,
+      cities: ['Sơn La', 'Bắc Yên', 'Hát Lót', 'Mộc Châu', 'Ong', 'Phú Yên', 'Quỳnh Nhai', 'Sông Mã', 'Sốp Cộp', 'Thuận Châu', 'Yên Châu']
+    },
+
+    // North Central Coast
+    {
+      regionName: 'Hà Tĩnh',
+      regionShort: 'Hà Tĩnh',
+      regionSlug: 'ha_tinh',
+      weight: 1,
+      cities: ['Hà Tĩnh']
+    },
+    {
+      regionName: 'Nghệ An',
+      regionShort: 'Nghệ An',
+      regionSlug: 'nghe_an',
+      weight: 1,
+      cities: ['Vinh']
+    },
+    {
+      regionName: 'Quảng Bình',
+      regionShort: 'Quảng Bình',
+      regionSlug: 'quang_binh',
+      weight: 1,
+      cities: ['Đồng Hới']
+    },
+    {
+      regionName: 'Quảng Trị',
+      regionShort: 'Quảng Trị',
+      regionSlug: 'quang_tri',
+      weight: 1,
+      cities: ['Đông Hà']
+    },
+    {
+      regionName: 'Thanh Hóa',
+      regionShort: 'Thanh Hóa',
+      regionSlug: 'thanh_hoa',
+      weight: 1,
+      cities: ['Thanh Hóa']
+    },
+    {
+      regionName: 'Thừa Thiên–Huế',
+      regionShort: 'Thừa Thiên–Huế',
+      regionSlug: 'thua_thien-hue',
+      weight: 1,
+      cities: ['Huế']
+    },
+
+    // Central Highlands
+    {
+      regionName: 'Đắk Lắk',
+      regionShort: 'Đắk Lắk',
+      regionSlug: 'dak_lak',
+      weight: 1,
+      cities: ['Buôn Ma Thuột']
+    },
+    {
+      regionName: 'Đắk Nông',
+      regionShort: 'Đắk Nông',
+      regionSlug: 'dak_nong',
+      weight: 1,
+      cities: ['Gia Nghĩa']
+    },
+    {
+      regionName: 'Gia Lai',
+      regionShort: 'Gia Lai',
+      regionSlug: 'gia_lai',
+      weight: 1,
+      cities: ['Pleiku']
+    },
+    {
+      regionName: 'Kon Tum',
+      regionShort: 'Kon Tum',
+      regionSlug: 'kon_tum',
+      weight: 1,
+      cities: ['Kon Tum']
+    },
+    {
+      regionName: 'Lâm Đồng',
+      regionShort: 'Lâm Đồng',
+      regionSlug: 'lam_dong',
+      weight: 1,
+      cities: ['Da Lat']
+    },
+
+    // South Central Coast
+    {
+      regionName: 'Bình Định',
+      regionShort: 'Bình Định',
+      regionSlug: 'binh_dinh',
+      weight: 1,
+      cities: ['Quy Nhơn']
+    },
+    {
+      regionName: 'Bình Thuận',
+      regionShort: 'Bình Thuận',
+      regionSlug: 'binh_thuan',
+      weight: 1,
+      cities: ['Phan Thiết']
+    },
+    {
+      regionName: 'Khánh Hòa',
+      regionShort: 'Khánh Hòa',
+      regionSlug: 'khanh_hoa',
+      weight: 1,
+      cities: ['Nha Trang']
+    },
+    {
+      regionName: 'Ninh Thuận',
+      regionShort: 'Ninh Thuận',
+      regionSlug: 'ninh_thuan',
+      weight: 1,
+      cities: ['Phan Rang–Tháp Chàm']
+    },
+    {
+      regionName: 'Phú Yên',
+      regionShort: 'Phú Yên',
+      regionSlug: 'phu_yen',
+      weight: 1,
+      cities: ['Tuy Hòa']
+    },
+    {
+      regionName: 'Quảng Nam',
+      regionShort: 'Quảng Nam',
+      regionSlug: 'quang_nam',
+      weight: 1,
+      cities: ['Tam Kỳ']
+    },
+    {
+      regionName: 'Quảng Ngãi',
+      regionShort: 'Quảng Ngãi',
+      regionSlug: 'quang_ngai',
+      weight: 1,
+      cities: ['Quảng Ngãi']
+    },
+    {
+      regionName: 'Đà Nẵng',
+      regionShort: 'Đà Nẵng',
+      regionSlug: 'da_nang_city',
+      weight: 1,
+      cities: ['Đà Nẵng']
+    },
+
+    // Southeast
+    {
+      regionName: 'Bà Rịa–Vũng Tàu',
+      regionShort: 'Bà Rịa–Vũng Tàu',
+      regionSlug: 'ba_ria-vung_tau',
+      weight: 1,
+      cities: ['Quảng Ngãi']
+    },
+    {
+      regionName: 'Bình Dương',
+      regionShort: 'Bình Dương',
+      regionSlug: 'binh_duong',
+      weight: 1,
+      cities: ['Thủ Dầu Một']
+    },
+    {
+      regionName: 'Bình Phước',
+      regionShort: 'Bình Phước',
+      regionSlug: 'binh_phuoc',
+      weight: 1,
+      cities: ['Đồng Xoài']
+    },
+    {
+      regionName: 'Đồng Nai',
+      regionShort: 'Đồng Nai',
+      regionSlug: 'dong_nai',
+      weight: 1,
+      cities: ['Biên Hòa']
+    },
+    {
+      regionName: 'Tây Ninh',
+      regionShort: 'Tây Ninh',
+      regionSlug: 'tag_ninh',
+      weight: 1,
+      cities: ['Tây Ninh']
+    },
+    {
+      regionName: 'Hồ Chí Minh City',
+      regionShort: 'Hồ Chí Minh City',
+      regionSlug: 'ho_chi_minh_city',
+      weight: 1,
+      cities: ['Hồ Chí Minh City']
+    },
+
+    // Mekong Delta
+    {
+      regionName: 'An Giang',
+      regionShort: 'An Giang',
+      regionSlug: 'an_giang',
+      weight: 1,
+      cities: ['Long Xuyên']
+    },
+    {
+      regionName: 'Bạc Liêu',
+      regionShort: 'Bạc Liêu',
+      regionSlug: 'bac_lieu',
+      weight: 1,
+      cities: ['Bạc Liêu']
+    },
+    {
+      regionName: 'Bến Tre',
+      regionShort: 'Bến Tre',
+      regionSlug: 'ben_tre',
+      weight: 1,
+      cities: ['Bến Tre']
+    },
+    {
+      regionName: 'Cà Mau',
+      regionShort: 'Cà Mau',
+      regionSlug: 'ca_mau',
+      weight: 1,
+      cities: ['Cà Mau']
+    },
+    {
+      regionName: 'Đồng Tháp',
+      regionShort: 'Đồng Tháp',
+      regionSlug: 'dong_thap',
+      weight: 1,
+      cities: ['Cao Lãnh']
+    },
+    {
+      regionName: 'Hậu Giang',
+      regionShort: 'Hậu Giang',
+      regionSlug: 'hau_giang',
+      weight: 1,
+      cities: ['Vị Thanh']
+    },
+    {
+      regionName: 'Kiên Giang',
+      regionShort: 'Kiên Giang',
+      regionSlug: 'kien_giang',
+      weight: 1,
+      cities: ['Rạch Giá']
+    },
+    {
+      regionName: 'Long An',
+      regionShort: 'Long An',
+      regionSlug: 'long_an',
+      weight: 1,
+      cities: ['Tân An']
+    },
+    {
+      regionName: 'Sóc Trăng',
+      regionShort: 'Sóc Trăng',
+      regionSlug: 'soc_trang',
+      weight: 1,
+      cities: ['Sóc Trăng']
+    },
+    {
+      regionName: 'Tiền Giang',
+      regionShort: 'Tiền Giang',
+      regionSlug: 'tien_gian',
+      weight: 1,
+      cities: ['Mỹ Tho']
+    },
+    {
+      regionName: 'Trà Vinh',
+      regionShort: 'Trà Vinh',
+      regionSlug: 'tra_vinh',
+      weight: 1,
+      cities: ['Trà Vinh']
+    },
+    {
+      regionName: 'Vĩnh Long',
+      regionShort: 'Vĩnh Long',
+      regionSlug: 'vinh_long',
+      weight: 1,
+      cities: ['Vĩnh Long']
+    },
+    {
+      regionName: 'Cần Thơ',
+      regionShort: 'Cần Thơ',
+      regionSlug: 'can_tho',
+      weight: 1,
+      cities: ['Cần Thơ']
+    }
+  ]
+});
+
+export default Vietnam;
diff --git a/packages/plugins/src/countries/Vietnam/i18n/ar.json b/packages/plugins/src/countries/Vietnam/i18n/ar.json
new file mode 100644
index 000000000..e269a061e
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "فيتنام",
+    "regionNames": "المقاطعات الفيتنامية"
+}
diff --git a/packages/plugins/src/countries/Vietnam/i18n/de.json b/packages/plugins/src/countries/Vietnam/i18n/de.json
new file mode 100644
index 000000000..0ca250303
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Vietnam",
+  "regionNames": "Vietnam Provinzen"
+}
diff --git a/packages/plugins/src/countries/Vietnam/i18n/en.json b/packages/plugins/src/countries/Vietnam/i18n/en.json
new file mode 100644
index 000000000..021c089f8
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/en.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Vietnam",
+    "regionNames": "Vietnam regions"
+}
diff --git a/packages/plugins/src/countries/Vietnam/i18n/es.json b/packages/plugins/src/countries/Vietnam/i18n/es.json
new file mode 100644
index 000000000..ee109c7fb
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Vietnam",
+  "regionNames": "Provincias de Vietnam"
+}
diff --git a/packages/plugins/src/countries/Vietnam/i18n/fr.json b/packages/plugins/src/countries/Vietnam/i18n/fr.json
new file mode 100644
index 000000000..f877344a2
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Viêt Nam",
+  "regionNames": "Provinces du Vietnam"
+}
diff --git a/packages/plugins/src/countries/Vietnam/i18n/hi.json b/packages/plugins/src/countries/Vietnam/i18n/hi.json
new file mode 100644
index 000000000..5f8e3be02
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "वियतनाम",
+    "regionNames": "वियतनाम क्षेत्र"
+}
diff --git a/packages/plugins/src/countries/Vietnam/i18n/ja.json b/packages/plugins/src/countries/Vietnam/i18n/ja.json
new file mode 100644
index 000000000..5947d0d54
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "ベトナム",
+    "regionNames": "ベトナムの省"
+}
diff --git a/packages/plugins/src/countries/Vietnam/i18n/nl.json b/packages/plugins/src/countries/Vietnam/i18n/nl.json
new file mode 100644
index 000000000..31b35387d
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "countryName": "Vietnam",
+  "regionNames": "Vietnamese provincies"
+}
diff --git a/packages/plugins/src/countries/Vietnam/i18n/pt.json b/packages/plugins/src/countries/Vietnam/i18n/pt.json
new file mode 100644
index 000000000..83f8692ea
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Vietnã",
+    "regionNames": "Regiões vietnamitas"
+}
diff --git a/packages/plugins/src/countries/Vietnam/i18n/ru.json b/packages/plugins/src/countries/Vietnam/i18n/ru.json
new file mode 100644
index 000000000..52df45c19
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "Вьетнам",
+    "regionNames": "Вьетнам регионы"
+}
diff --git a/packages/plugins/src/countries/Vietnam/i18n/ta.json b/packages/plugins/src/countries/Vietnam/i18n/ta.json
new file mode 100644
index 000000000..aca579d27
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "வியட்நாம்",
+    "regionNames": "வியட்நாம் மாகாணங்கள்"
+}
diff --git a/packages/plugins/src/countries/Vietnam/i18n/zh.json b/packages/plugins/src/countries/Vietnam/i18n/zh.json
new file mode 100644
index 000000000..1247b2eff
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+    "countryName": "越南",
+    "regionNames": "越南各省"
+}
diff --git a/packages/plugins/src/countries/Vietnam/names.ts b/packages/plugins/src/countries/Vietnam/names.ts
new file mode 100644
index 000000000..08820f4ce
--- /dev/null
+++ b/packages/plugins/src/countries/Vietnam/names.ts
@@ -0,0 +1,410 @@
+import { CountryNames } from '@generatedata/types';
+
+const femaleNames = [
+  'Alex',
+  'Alissa',
+  'An',
+  'Anh',
+  'Annie',
+  'Bao Tran',
+  'Bella',
+  'Binh',
+  'Cara',
+  'Cat',
+  'Charollte',
+  'Chau Anh',
+  'Chi',
+  'Chloe',
+  'Chu',
+  'Da Hyun',
+  'Diem Hang',
+  'Eunice',
+  'Fio',
+  'Giang',
+  'Ha',
+  'Ha Tit',
+  'Hai Anh',
+  'Hana',
+  'Hang',
+  'Hoang',
+  'Hoàng Anh',
+  'Huong',
+  'Huong Lan',
+  'Huyen',
+  'Isabella',
+  'Jane',
+  'Jiyoon',
+  'Kaylee',
+  'Khaingan',
+  'Khanh',
+  'Kim',
+  'Lala',
+  'Lam',
+  'Lan',
+  'Lien',
+  'Liliane',
+  'Linh',
+  'Louis',
+  'Maki',
+  'Marielle',
+  'Mellisa',
+  'Merry',
+  'Mia',
+  'Min',
+  'Minh',
+  'Mo',
+  'My',
+  'Nabi',
+  'Nga',
+  'Ngan',
+  'Nghi',
+  'Ngoc',
+  'Nguyen',
+  'Nguyen Phuong Tra',
+  'Nguyen Quynh Ngan',
+  'Nguyen Thi',
+  'Nguyet Quyen',
+  'Ngọc',
+  'Nhi',
+  'Nhu',
+  'Nhung',
+  'Nhân',
+  'Oanh',
+  'Phung',
+  'Phuong',
+  'Quynh',
+  'Quynh Anh',
+  'Renesmee',
+  'Sal',
+  'Sam',
+  'Sara',
+  'Sue',
+  'Sunny',
+  'Sylvia',
+  'Tg',
+  'Thao',
+  'Thu',
+  'Thuan',
+  'Thuy',
+  'Thủy',
+  'Tien',
+  'Tina',
+  'Tio',
+  'Tr.li',
+  'Tra',
+  'Tracy',
+  'Tram',
+  'Trang',
+  'Trinh',
+  'Uyên',
+  'Van',
+  'Vi',
+  'Vy',
+  'Xuan Thuong'
+];
+
+const maleNames = [
+  'Andy',
+  'Anh Tuan',
+  'Arif',
+  'Bao',
+  'Binh',
+  'Bui',
+  'Calvin',
+  'Chien',
+  'Dang',
+  'Daniel',
+  'Dao',
+  'David',
+  'Daòt',
+  'Derick',
+  'Dinh',
+  'Dong',
+  'Duc',
+  'Duc Anh',
+  'Duong',
+  'Eddy',
+  'Finney',
+  'Garrett',
+  'Hai',
+  'Hao',
+  'Harrison',
+  'Harry',
+  'Henry',
+  'Hiep',
+  'Hoang',
+  'Hrishikesh',
+  'Huy',
+  'Huynh Chi Hai',
+  'Hy Khánh',
+  'Hyeon Gyu',
+  'Hyun Sik',
+  'Hùng',
+  'Jackson',
+  'James ',
+  'Jason',
+  'Jason',
+  'Jie',
+  'John',
+  'Joontae',
+  'Ken',
+  'Khanh',
+  'Kiet',
+  'Kong',
+  'Kwonmin',
+  'Lam Anh',
+  'Le',
+  'Lee',
+  'Lee Viert',
+  'Liam',
+  'Linh',
+  'Minh',
+  'Mop',
+  'Nabi',
+  'Nam',
+  'Nathan',
+  'Nghi',
+  'Ngoc',
+  'Nguyen',
+  'Nhân',
+  'Philip',
+  'Phuc',
+  'Phung Huu',
+  'Quang',
+  'Quyen',
+  'Quyền',
+  'Redge',
+  'Ron',
+  'Sam',
+  'Tam',
+  'Tan',
+  'Thai Duong',
+  'Thang',
+  'Thanh',
+  'Thien',
+  'Thomas',
+  'Thuan',
+  'Tie',
+  'Tien',
+  'Toni',
+  'Tony',
+  'Tran',
+  'Tran Van',
+  'Tri',
+  'Trinh',
+  'Trung',
+  'Tsundere',
+  'Tuan',
+  'Tuan Anh',
+  'Tyuo(µµà±)',
+  'Tú',
+  'Van',
+  'Viet',
+  'Viet Phung',
+  'Vũ',
+  'Wade',
+  'Williams'
+];
+
+const lastNames = [
+  'An',
+  'Bao',
+  'Biên',
+  'Biện',
+  'Bành',
+  'Bạch',
+  'Cao',
+  'Chiêm',
+  'Chu',
+  'Chung',
+  'Chân',
+  'Châu',
+  'Cung',
+  'Cung',
+  'Cái',
+  'Cát',
+  'Cảnh',
+  'Cảnh',
+  'Cổ',
+  'Củng',
+  'Cừu',
+  'Diệp',
+  'Doãn',
+  'Dung',
+  'Dũ',
+  'Dư',
+  'Dịch',
+  'Dữu',
+  'Gia Cát',
+  'Giang',
+  'Giả',
+  'Giản',
+  'Hoa',
+  'Hoạn',
+  'Hoắc',
+  'Hy',
+  'Hà',
+  'Hàn',
+  'Hác',
+  'Hình',
+  'Hướng',
+  'Hạ',
+  'Hầu',
+  'Hậ',
+  'Hồng',
+  'Hứa',
+  'Kha',
+  'Khuất',
+  'Khâu',
+  'Khổng',
+  'Kim',
+  'Kiều',
+  'Kỳ',
+  'Kỷ',
+  'La',
+  'Lai',
+  'Lam',
+  'Liên',
+  'Liêu',
+  'Liễu',
+  'Long',
+  'Lâm',
+  'Lãnh',
+  'Lôi',
+  'Lăng',
+  'Lư',
+  'Lưu',
+  'Lương',
+  'Lạc',
+  'Lệ',
+  'Lục',
+  'Lữ',
+  'Mai',
+  'Mao',
+  'Minh',
+  'Miêu',
+  'Mã',
+  'Mông',
+  'Mạc',
+  'Mạch',
+  'Mạnh',
+  'Mẫn',
+  'Nghiêm',
+  'Nghê',
+  'Ngân',
+  'Ngư',
+  'Ngưu',
+  'Nhan',
+  'Nhiếp',
+  'Nhiều',
+  'Nhung',
+  'Nhâm',
+  'Nhạc',
+  'Ninh',
+  'Nông',
+  'Phí',
+  'Phòng',
+  'Phó',
+  'Phù',
+  'Phùng',
+  'Phương',
+  'Quan',
+  'Quang',
+  'Quyền',
+  'Quách',
+  'Quản',
+  'Quảng',
+  'Quế',
+  'Sài',
+  'Sầm',
+  'Sử',
+  'Thai',
+  'Thang',
+  'Thanh Hóa',
+  'Thi',
+  'Thiện',
+  'Thiệu',
+  'Thành',
+  'Thái',
+  'Thân',
+  'Thích',
+  'Thôi',
+  'Thư',
+  'Thường',
+  'Thạch',
+  'Thảo',
+  'Thủy',
+  'Tiêu',
+  'Tiêu',
+  'Tiết',
+  'Tiền',
+  'Trang',
+  'Triệu',
+  'Trác',
+  'Trâu',
+  'Trì',
+  'Trương',
+  'Trạch',
+  'Trại',
+  'Trầm',
+  'Trịnh',
+  'Tào',
+  'Tân',
+  'Tô',
+  'Tôn',
+  'Tôn Thất',
+  'Tông',
+  'Tăng',
+  'Tư Mã',
+  'Tưởng',
+  'Tạ',
+  'Tất',
+  'Tần',
+  'Tề',
+  'Tống',
+  'Từ',
+  'Vi',
+  'Vân',
+  'Văn',
+  'Vĩnh',
+  'Vũ',
+  'Vũ Văn',
+  'Vưu',
+  'Vương',
+  'Vạn',
+  'Xà',
+  'Xầm',
+  'Xế',
+  'Yên',
+  'Yến',
+  'Ái',
+  'Ân',
+  'Ôn',
+  'Ông',
+  'Úc',
+  'Đinh',
+  'Điền',
+  'Đoàn',
+  'Đàm',
+  'Đào',
+  'Đái',
+  'Đường',
+  'Đậu',
+  'Đồ',
+  'Đồng',
+  'Đổng',
+  'Ổn',
+  'Ứng'
+];
+
+// a large proportion of surnames (40%) of Vietnamese are Nguyễn. Since we can't weight them, we just repeat them
+const num = Math.round((lastNames.length * 100) / 40);
+const names = Array(num).fill('Nguyễn');
+
+const namesData: CountryNames = {
+  femaleNames,
+  maleNames,
+  lastNames: [...lastNames, ...names]
+};
+
+export default namesData;
diff --git a/packages/plugins/src/countries/types.d.ts b/packages/plugins/src/countries/types.d.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/plugins/src/country.ts b/packages/plugins/src/country.ts
new file mode 100644
index 000000000..536fc9b46
--- /dev/null
+++ b/packages/plugins/src/country.ts
@@ -0,0 +1 @@
+// TODO move entire file to countries plugin section
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.generate.ts b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.generate.ts
new file mode 100644
index 000000000..dbbf2fe2b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.generate.ts
@@ -0,0 +1,16 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = ({ rowState }: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  // for backward compatibility
+  const value = Array.isArray(rowState) ? rowState : rowState.value;
+
+  const formats = value.split('|');
+  let chosenFormat = formats[0];
+  if (formats.length > 1) {
+    chosenFormat = formats[utils.randomUtils.getRandomNum(0, formats.length - 1)];
+  }
+  const val = utils.randomUtils.generateRandomAlphanumericStr(chosenFormat);
+
+  return { display: val };
+};
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.scss b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.scss
new file mode 100644
index 000000000..af16e025f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.scss
@@ -0,0 +1,22 @@
+.row {
+	display: flex;
+	align-items: flex-start;
+	padding-bottom: 12px;
+
+	.col1 {
+		flex: 0 0 30px;
+	}
+	.col2 {
+		flex: 1;
+	}
+	.col3 {
+		flex: 0 0 30px;
+	}
+	.col4 {
+		flex: 1;
+	}
+}
+
+.copy {
+	margin: 4px 0 0 4px;
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.scss.d.ts b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.scss.d.ts
new file mode 100644
index 000000000..810bcfc7a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.scss.d.ts
@@ -0,0 +1,17 @@
+declare namespace AlphanumericScssNamespace {
+	export interface IAlphanumericScss {
+		col1: string;
+		col2: string;
+		col3: string;
+		col4: string;
+		copy: string;
+		row: string;
+	}
+}
+
+declare const AlphanumericScssModule: AlphanumericScssNamespace.IAlphanumericScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: AlphanumericScssNamespace.IAlphanumericScss;
+};
+
+export = AlphanumericScssModule;
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.state.tsx b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.state.tsx
new file mode 100644
index 000000000..ab0d43867
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.state.tsx
@@ -0,0 +1,17 @@
+export type GenerationOptionsType = {
+	value: string;
+};
+
+export const defaultGenerationOptions: GenerationOptionsType = {
+	value: 'LLLxxLLLxLL'
+};
+
+export type AlphanumericState = {
+	example: string;
+	value: string;
+};
+
+export const initialState: AlphanumericState = {
+	example: 'LLLxxLLLxLL',
+	...defaultGenerationOptions
+};
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.tsx b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.tsx
new file mode 100644
index 000000000..9f7094d50
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.tsx
@@ -0,0 +1,164 @@
+import * as React from 'react';
+import Dropdown from '~components/dropdown/Dropdown';
+import TextField from '~components/TextField';
+import CopyToClipboard from '~components/copyToClipboard/CopyToClipboard';
+import { DTExampleProps, DTOptionsProps, DTHelpProps, DTMetadata } from '~types/dataTypes';
+import { AlphanumericState, GenerationOptionsType } from './Alphanumeric.state';
+import styles from './Alphanumeric.scss';
+import sharedStyles from '../../../styles/shared.scss';
+
+const Copy = ({ content, tooltip, message }: any) => (
+  <span className={styles.copy}>
+    <CopyToClipboard content={content} message={message} tooltip={tooltip} />
+  </span>
+);
+
+export const Example = ({ i18n, data, onUpdate }: DTExampleProps) => {
+  const onChange = (value: any): void => {
+    onUpdate({
+      example: value,
+      value: value
+    });
+  };
+
+  const options = [
+    { value: 'LxL xLx', label: `V6M 4C1 ${i18n.exampleCanPostalCode}` },
+    { value: 'xxxxx', label: `90210 ${i18n.exampleUSZipCode}` },
+    { value: 'LLLxxLLLxLL', label: `eZg29gdF5K1 ${i18n.examplePassword}` }
+  ];
+
+  return <Dropdown value={data.example} onChange={(i: any): void => onChange(i.value)} options={options} />;
+};
+
+export const Options = ({ coreI18n, data, throttle, onUpdate }: DTOptionsProps) => {
+  const titleColError = data.value.trim() === '' ? coreI18n.requiredField : '';
+
+  return (
+    <TextField
+      error={titleColError}
+      value={data.value}
+      onChange={(e: any): void => onUpdate({ ...data, value: e.target.value })}
+      style={{ width: '100%' }}
+      throttle={throttle}
+    />
+  );
+};
+Options.defaultProps = {
+  throttle: true
+};
+
+export const Help = ({ coreI18n, i18n }: DTHelpProps) => (
+  <>
+    <p>{i18n.helpIntro}</p>
+
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label className={sharedStyles.pill}>L</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="L" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2} dangerouslySetInnerHTML={{ __html: i18n.help1 }} />
+      <div className={styles.col3}>
+        <label className={sharedStyles.pill}>V</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="V" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col4} dangerouslySetInnerHTML={{ __html: i18n.help2 }} />
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label className={sharedStyles.pill}>l</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="l" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2} dangerouslySetInnerHTML={{ __html: i18n.help3 }} />
+      <div className={styles.col3}>
+        <label className={sharedStyles.pill}>v</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="v" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col4} dangerouslySetInnerHTML={{ __html: i18n.help4 }} />
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label className={sharedStyles.pill}>D</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="D" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2} dangerouslySetInnerHTML={{ __html: i18n.help5 }} />
+      <div className={styles.col3}>
+        <label className={sharedStyles.pill}>F</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="F" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col4} dangerouslySetInnerHTML={{ __html: i18n.help6 }} />
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label className={sharedStyles.pill}>C</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="C" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2} dangerouslySetInnerHTML={{ __html: i18n.help7 }} />
+      <div className={styles.col3}>
+        <label className={sharedStyles.pill}>x</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="x" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col4} dangerouslySetInnerHTML={{ __html: i18n.help8 }} />
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label className={sharedStyles.pill}>c</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="c" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2} dangerouslySetInnerHTML={{ __html: i18n.help9 }} />
+      <div className={styles.col3}>
+        <label className={sharedStyles.pill}>X</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="X" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col4} dangerouslySetInnerHTML={{ __html: i18n.help10 }} />
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label className={sharedStyles.pill}>E</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="E" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2} dangerouslySetInnerHTML={{ __html: i18n.help11 }} />
+      <div className={styles.col3}>
+        <label className={sharedStyles.pill}>H</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content="H" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col4} dangerouslySetInnerHTML={{ __html: i18n.help12 }} />
+    </div>
+  </>
+);
+
+export const rowStateReducer = (state: AlphanumericState): GenerationOptionsType => ({ value: state.value });
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'varchar(255)',
+    field_Oracle: 'varchar2(255)',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  },
+  general: {
+    dataType: 'infer'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.worker.ts b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.worker.ts
new file mode 100644
index 000000000..f07ab9bdf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/Alphanumeric.worker.ts
@@ -0,0 +1,12 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Alphanumeric.generate';
+
+let utilsLoaded = false;
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/README.md b/packages/plugins/src/dataTypes/Alphanumeric/README.md
new file mode 100644
index 000000000..f58874851
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/README.md
@@ -0,0 +1,150 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Alphanumeric
+
+This Data Type generates random alphanumeric strings in a custom format. This can be used for anything you fancy. The only
+limit is your imagination. (It's late, I can't believe I just typed that).
+
+## Typings
+
+The `settings` value for the `Alphanumeric` plugin `dataTemplate` entry contains a single `value` property, which is a
+string containing whatever placeholder characters you want. See the Examples section below to see how it all fits
+together.
+
+```typescript
+{
+	value: string;
+}
+```
+
+## Placeholders
+
+These are the available placeholders. Any character not specified here will be output as-is.
+
+```
+C, c, E - any consonant (upper case, lower case, any)
+V, v, F - any vowel (upper case, lower case, any)
+L, l, D - any letter (upper case, lower case, any)
+X       - 1-9
+x       - 0-9
+H       - 0-F (hexidecimal value)
+```
+
+## Misc notes / caveats
+
+- To generate multiple different formats in a single field, just separate the `value` contents with a pipe, e.g.
+
+```javascript
+{
+    plugin: "Alphanumeric",
+    title: "multipleFormats",
+    settings: {
+        value: "Xxxxx|xxxx|CXxxx"
+    }
+}
+```
+
+- Currently you can't escape any of the placeholders listed above. Feature Request issue open here: https://github.com/benkeen/generatedata/issues/817
+- This is an older Data Type. Most of the new ones use an array for the value/options field within settings. At some point
+  we may update it for consistency.
+
+## Examples
+
+- [US zip code](#us-zip-code)
+- [Tag numbers](#tag-numbers)
+
+### US zip code
+
+Note, this can actually be produced more accurately with the [Postal/Zip](../PostalZip/README.md) Data Type. This is just
+for illustration purposes.
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Alphanumeric",
+            title: "US Zip",
+            settings: {
+                value: "Xxxxx"
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "Zip": 42694
+    },
+    {
+        "Zip": 23645
+    },
+    {
+        "Zip": 12831
+    },
+    {
+        "Zip": 34048
+    },
+    {
+        "Zip": 51791
+    },
+    ...
+]
+```
+
+### Tag numbers
+
+This generates a fake clothing tag number of the format `C-152314-DG`.
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Alphanumeric",
+            title: "TagNumber",
+            settings: {
+                value: "C-xxxxxx-CC"
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "TagNumber": "L-670724-GG"
+    },
+    {
+        "TagNumber": "S-371395-QY"
+    },
+    {
+        "TagNumber": "C-861426-QF"
+    },
+    {
+        "TagNumber": "F-750425-VY"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/__tests__/Alphanumeric.generate.test.ts b/packages/plugins/src/dataTypes/Alphanumeric/__tests__/Alphanumeric.generate.test.ts
new file mode 100644
index 000000000..68e3009a3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/__tests__/Alphanumeric.generate.test.ts
@@ -0,0 +1,33 @@
+import sinon from 'sinon';
+import utils from '../../../../utils';
+import { onmessage } from '../Alphanumeric.worker';
+import { initialState } from '../Alphanumeric.state';
+import { getBlankDTGeneratorPayload } from '../../../../../tests/testHelpers';
+
+const i18n = require('../i18n/en.json');
+
+describe('onmessage', () => {
+	const postMessage = jest.fn();
+	const importScripts = jest.fn();
+	beforeAll(() => {
+		window.postMessage = postMessage;
+		window.importScripts = importScripts;
+	});
+
+	it('generates random data', () => {
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				rowState: {
+					value: initialState.value
+				},
+				i18n
+			}
+		};
+
+		sinon.stub(utils.randomUtils, 'generateRandomAlphanumericStr').returns('*****');
+
+		onmessage(payload);
+		expect(postMessage).toHaveBeenCalledWith({ display: '*****' });
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/__tests__/Alphanumeric.test.tsx b/packages/plugins/src/dataTypes/Alphanumeric/__tests__/Alphanumeric.test.tsx
new file mode 100644
index 000000000..5a63d111b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/__tests__/Alphanumeric.test.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import sinon from 'sinon';
+import { render, fireEvent } from '@testing-library/react';
+import { Options, Help, Example } from '../Alphanumeric';
+import { initialState } from '../Alphanumeric.state';
+import * as langUtils from '~utils/langUtils';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	gridPanelDimensions: { width: 100, height: 100 },
+	isCountryNamesLoading: false,
+	isCountryNamesLoaded: false,
+	countryNamesMap: null
+};
+
+describe('Example', () => {
+	it('renders', () => {
+		sinon.stub(langUtils, 'getStrings').returns({ core: {} });
+
+		const data = { ...initialState };
+		const onUpdate = jest.fn();
+		const { container } = render(<Example {...defaultProps} data={data} onUpdate={onUpdate} />);
+		expect(container).toBeTruthy();
+	});
+});
+
+describe('Options', () => {
+	it('changing the content should call callback', () => {
+		const data = { ...initialState };
+		const onUpdate = jest.fn();
+		const { container } = render(<Options {...defaultProps} data={data} onUpdate={onUpdate} throttle={false} />);
+		const field = container.querySelector('input');
+
+		// @ts-ignore
+		fireEvent.change(field, {
+			target: {
+				value: 'new value!!'
+			}
+		});
+
+		expect(onUpdate).toBeCalledWith({
+			...initialState,
+			value: 'new value!!'
+		});
+	});
+});
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps} />);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/bundle.ts b/packages/plugins/src/dataTypes/Alphanumeric/bundle.ts
new file mode 100644
index 000000000..724d3131a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/bundle.ts
@@ -0,0 +1,14 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, rowStateReducer, getMetadata } from './Alphanumeric';
+import { initialState } from './Alphanumeric.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	rowStateReducer,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/config.ts b/packages/plugins/src/dataTypes/Alphanumeric/config.ts
new file mode 100644
index 000000000..e1e661969
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'numeric',
+  fieldGroupOrder: 10
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/ar.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/ar.json
new file mode 100644
index 000000000..787f97c5a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/ar.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "أبجدي رقمي",
+  "DESC": "يولد سلسلة أبجدية رقمية عشوائية مخصصة أو أي طول أو تنسيق محدد بواسطة أحرف العنصر النائب.",
+  "DEFAULT_TITLE": "أبجدي رقمي",
+  "exampleCanPostalCode": "(الرمز البريدي الكندي)",
+  "examplePassword": "(كلمه السر)",
+  "exampleUSZipCode": "(الرمز البريدي للولايات المتحدة)",
+  "help1": "حرف كبير <b> L </b> حرف.",
+  "help10": "أي رقم ، 1-9.",
+  "help11": "ساكن (علوي أو سفلي).",
+  "help12": "رقم سداسي عشري (0-F)",
+  "help2": "حرف متحرك كبير.",
+  "help3": "حرف صغير.",
+  "help4": "حرف متحرك صغير.",
+  "help5": "حرف (علوي أو سفلي).",
+  "help6": "حرف علة (علوي أو سفلي).",
+  "help7": "حرف ساكن كبير.",
+  "help8": "أي رقم ، 0-9.",
+  "help9": "حرف ساكن صغير.",
+  "helpIntro": "يتيح لك نوع البيانات هذا إنشاء سلاسل أبجدية رقمية عشوائية. يحتوي الجدول التالي على وسيلة إيضاح الأحرف لهذا الحقل. ستظهر أية أحرف أخرى تدخلها في هذا الحقل بدون إلغاء....",
+  "incompleteFields": "تتطلب الحقول الأبجدية الرقمية إدخال التنسيق في حقل نص الخيارات. الرجاء إصلاح الصفوف التالية:"
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/de.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/de.json
new file mode 100644
index 000000000..ccfbe8b65
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/de.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "Alphanumerisch",
+  "DESC": "Erzeugt eine benutzerdefinierte zufällige alphanumerische Zeichenfolge oder Länge oder Format , durch Platzhalter Zeichen definiert.",
+  "DEFAULT_TITLE": "alphanumerisch",
+  "exampleCanPostalCode": "(Can. PLZ)",
+  "examplePassword": "(Password)",
+  "exampleUSZipCode": "(US Postleitzahl)",
+  "help1": "Ein Groß-<b>L</b> etter.",
+  "help10": "Jede Anzahl, 1-9.",
+  "help11": "Ein Konsonant (obere oder untere).",
+  "help12": "Ein <b>H</b> exidecimal Nummer (0-F)",
+  "help2": "Ein Groß-<b>V</b>owel.",
+  "help3": "Ein Kleinbuchstaben <b>l</b> etter.",
+  "help4": "Ein Kleinbuchstaben <b>v</b> owel.",
+  "help5": "Ein Brief (oben oder unten).",
+  "help6": "Ein Vokal (obere oder untere).",
+  "help7": "Ein Groß-<b>C</b> onsonant.",
+  "help8": "Jede Zahl, 0-9.",
+  "help9": "Ein Kleinbuchstaben <b>c</b> onsonant.",
+  "helpIntro": "Dieser Datentyp können Sie zufällige alphanumerische Zeichenfolgen. Die folgende Tabelle enthält die Zeichenlegende für dieses Feld. Alle anderen Zeichen, die Sie in diesem Feld erscheint unescaped.",
+  "incompleteFields": "Alphanumerische Felder müssen Sie das Format, in dem Optionen Textfeld eingeben. Bitte beheben Sie die folgenden Zeilen:"
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/en.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/en.json
new file mode 100644
index 000000000..7d207679b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/en.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "Alphanumeric",
+  "DESC": "Generates a custom random alphanumeric string or any length or format, defined by placeholder chars.",
+  "DEFAULT_TITLE": "alphanumeric",
+  "exampleCanPostalCode": "(Can. Postal code)",
+  "examplePassword": "(Password)",
+  "exampleUSZipCode": "(US Zip code)",
+  "help1": "An uppercase <b>L</b>etter.",
+  "help10": "Any number, 1-9.",
+  "help11": "A consonant (upper or lower).",
+  "help12": "An <b>H</b>exidecimal number (0-F)",
+  "help2": "An uppercase <b>V</b>owel.",
+  "help3": "A lowercase <b>l</b>etter.",
+  "help4": "A lowercase <b>v</b>owel.",
+  "help5": "A letter (upper or lower).",
+  "help6": "A vowel (upper or lower).",
+  "help7": "An uppercase <b>C</b>onsonant.",
+  "help8": "Any number, 0-9.",
+  "help9": "A lowercase <b>c</b>onsonant.",
+  "helpIntro": "This Data Type lets you generate random alphanumeric strings. You can use the placeholders listed below to customize the form of the values generated. Any other characters besides the ones listed below will be output as they are.",
+  "incompleteFields": "Alphanumeric fields require you to enter the format in the Options text field. Please fix the following rows:"
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/es.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/es.json
new file mode 100644
index 000000000..8902344f7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/es.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "Alfanumérico",
+  "DESC": "Genera una cadena alfanumérica personalizada azar o cualquier longitud o formato, definida por caracteres de marcador de posición .",
+  "DEFAULT_TITLE": "alfanumérico",
+  "exampleCanPostalCode": "(Código postal canadiense)",
+  "examplePassword": "(Contraseña)",
+  "exampleUSZipCode": "(Código postal yankee)",
+  "help1": "Una <b>L</b>etra mayúscula.",
+  "help10": "Cualquier número, 1-9.",
+  "help11": "Una constante (mayúscula o minúscula).",
+  "help12": "Un número <b>H</b>exadecimal (0-F)",
+  "help2": "Una <b>V</b>ocal mayúscula.",
+  "help3": "Una <b>l</b>etra minúscula.",
+  "help4": "Una <b>v</b>ocal minúscula.",
+  "help5": "Una letra (mayúscula o minúscula).",
+  "help6": "Una vocal (mayúscula o minúscula).",
+  "help7": "Una <b>C</b>onstante mayúscula.",
+  "help8": "Cualquier número, 0-9.",
+  "help9": "Una <b>c</b>onstante minúscula.",
+  "helpIntro": "Estos tipos de datos te permiten generar cadenas alfanuméricas aleatorias. La siguiente tabla contiene la leyenda para este campo. Cualquier otro carácter que introduzcas en este campo aparecerá sin escapar.",
+  "incompleteFields": "Los campos alfanuméricos requieren que se introduzca el formato en el campo de texto Opciones. Por favor, corrija las siguientes filas:"
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/fr.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/fr.json
new file mode 100644
index 000000000..7abc2eaaa
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/fr.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "Alphanumérique",
+  "DESC": "Génère une chaîne alphanumérique aléatoire coutume ou toute longueur ou le format , définie par les caractères d'espace réservé .",
+  "DEFAULT_TITLE": "alphanumérique",
+  "exampleCanPostalCode": "(Code postal Canada)",
+  "examplePassword": "(Mot de passe)",
+  "exampleUSZipCode": "(Code postal US)",
+  "help1": "Une <b>L</b>ettre majuscule.",
+  "help10": "N'importe quel nombre, 1-9.",
+  "help11": "Une consonne (majuscule ou minuscule).",
+  "help12": "Un nombre <b>H</b>exadécimal (0-F)",
+  "help2": "Une <b>V</b>oyelle majuscule.",
+  "help3": "Une <b>l</b>ettre minuscule.",
+  "help4": "Une <b>v</b>oyelle minuscule.",
+  "help5": "Une lettre (majuscule ou minuscule).",
+  "help6": "Une voyelle (majuscule ou minuscule).",
+  "help7": "Une <b>C</b>onsonne majuscule.",
+  "help8": "N'importe quel nombre, 0-9.",
+  "help9": "Une <b>c</b>onsonne minuscule.",
+  "helpIntro": "Ce type de données permet de générer au hasard des chaînes alphanumériques. Le tableau suivant contient la légende de caractères pour ce champ. Tous les autres caractères que vous entrez dans ce champ apparaîtront non-échappés.",
+  "incompleteFields": "Les champs alphanumériques nécessitent la saisie du format dans le champ de texte Options. Corrigez les lignes suivantes:"
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/hi.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/hi.json
new file mode 100644
index 000000000..da7360034
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/hi.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "अक्षरांकीय",
+  "DESC": "प्लेसहोल्डर वर्णों द्वारा परिभाषित एक कस्टम यादृच्छिक अल्फ़ान्यूमेरिक स्ट्रिंग या कोई लंबाई या प्रारूप उत्पन्न करता है।",
+  "DEFAULT_TITLE": "अक्षरांकीय",
+  "exampleCanPostalCode": "(कनाडाई पोस्टल कोड)",
+  "examplePassword": "(पासवर्ड)",
+  "exampleUSZipCode": "(यूएस ज़िप कोड)",
+  "help1": "एक बड़े अक्षर।",
+  "help10": "कोई भी संख्या, 1-9।",
+  "help11": "एक व्यंजन (ऊपरी या निचला)।",
+  "help12": "एक हेक्साडेसिमल संख्या (0-एफ)",
+  "help2": "एक अपरकेस स्वर।",
+  "help3": "एक छोटा अक्षर।",
+  "help4": "एक लोअरकेस स्वर।",
+  "help5": "एक अक्षर (ऊपरी या निचला)।",
+  "help6": "एक स्वर (ऊपरी या निचला)।",
+  "help7": "एक अपरकेस व्यंजन।",
+  "help8": "कोई भी संख्या, 0-9।",
+  "help9": "एक लोअरकेस व्यंजन।",
+  "helpIntro": "यह डेटा प्रकार आपको यादृच्छिक अल्फ़ान्यूमेरिक स्ट्रिंग उत्पन्न करने देता है। आप जेनरेट किए गए मानों के रूप को अनुकूलित करने के लिए नीचे सूचीबद्ध प्लेसहोल्डर का उपयोग कर सकते हैं। नीचे सूचीबद्ध लोगों के अलावा कोई भी अन्य वर्ण आउटपुट होंगे जैसे वे हैं।",
+  "incompleteFields": "अल्फ़ान्यूमेरिक फ़ील्ड के लिए आपको विकल्प टेक्स्ट फ़ील्ड में प्रारूप दर्ज करना होगा। कृपया निम्न पंक्तियों को ठीक करें:"
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/ja.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/ja.json
new file mode 100644
index 000000000..ba6247908
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/ja.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "字母数字",
+  "DESC": "プレースホルダー文字で定義された、カスタムのランダムな英数字の文字列または任意の長さまたは形式を生成します。",
+  "DEFAULT_TITLE": "英数字",
+  "exampleCanPostalCode": "（カナダの郵便番号）",
+  "examplePassword": "（パスワード）",
+  "exampleUSZipCode": "（米国の郵便番号）",
+  "help1": "大文字。",
+  "help10": "任意の数、1〜9。",
+  "help11": "子音（上または下）。",
+  "help12": "16進数（0-F）",
+  "help2": "大文字の母音。",
+  "help3": "小文字。",
+  "help4": "小文字の母音。",
+  "help5": "文字（上または下）。",
+  "help6": "母音（上または下）。",
+  "help7": "大文字の子音。",
+  "help8": "0〜9の任意の数。",
+  "help9": "小文字の子音。",
+  "helpIntro": "このデータ型を使用すると、ランダムな英数字の文字列を生成できます。 次の表には、このフィールドの文字の凡例が含まれています。 このフィールドに入力した他の文字は、エスケープされていないように見えます。",
+  "incompleteFields": "英数字フィールドでは、[オプション]テキストフィールドに形式を入力する必要があります。 次の行を修正してください。"
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/nl.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/nl.json
new file mode 100644
index 000000000..5a999fbae
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/nl.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "Alfanumeriek",
+  "DESC": "Genereert een aangepaste willekeurige alfanumerieke tekenreeks van een bepaalde lengte in het opgegeven formaat, gedefinieerd door placeholder tekens.",
+  "DEFAULT_TITLE": "alfanumeriek",
+  "exampleCanPostalCode": "(Canadese Postcode)",
+  "examplePassword": "(Wachtwoord)",
+  "exampleUSZipCode": "(US Postcode)",
+  "help1": "Een hoofdletter <b>L</b>etter.",
+  "help10": "Een getal, 1-9.",
+  "help11": "Een medeklinker (klein of groot geschreven).",
+  "help12": "Een <b>H</b> exidecimal getal (0-F)",
+  "help2": "<b>V</b> Een klinker in hoofdletter.",
+  "help3": "Een kleine letter <b>l</b> etter.",
+  "help4": "<b>v</b> Een klinker, klein geschreven.",
+  "help5": "Een letter (klein of groot geschreven).",
+  "help6": "Een klinker (klein of groot geschreven).",
+  "help7": "Een medeklinker groot geschreven <b>C</b>.",
+  "help8": "Een getal, 0-9.",
+  "help9": "<b>c</b> Een klein geschreven medeklinker.",
+  "helpIntro": "Met dit gegevenstype kunt u een string genereren met willekeurige alfanumerieke tekens. De volgende tabel bevat de karakter legenda voor dit veld. Alle andere tekens die u in dit veld invoert zullen onveranderd in de string worden opgenomen.",
+  "incompleteFields": "Voor Alfanumerieke velden moet u het formaat in het Opties tekstveld in voeren. Pas AUB de volgende rijen aan:"
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/pt.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/pt.json
new file mode 100644
index 000000000..dae2dac1d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/pt.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "Alfanumérica",
+  "DESC": "Gera uma string alfanumérica aleatória personalizada ou qualquer comprimento ou formato, definido por caracteres de espaço reservado.",
+  "DEFAULT_TITLE": "alfanumérica",
+  "exampleCanPostalCode": "(Can. Código postal)",
+  "examplePassword": "(Senha)",
+  "exampleUSZipCode": "(Código postal dos EUA)",
+  "help1": "AUma letra maiúscula.",
+  "help10": "Qualquer número, 1-9.",
+  "help11": "Uma consoante (superior ou inferior).",
+  "help12": "Um número hexadecimal (0-F)",
+  "help2": "Uma vogal maiúscula.",
+  "help3": "Uma letra minúscula.",
+  "help4": "Uma vogal minúscula.",
+  "help5": "Uma letra (superior ou inferior).",
+  "help6": "Uma vogal (superior ou inferior).",
+  "help7": "Uma consoante maiúscula.",
+  "help8": "Qualquer número, 0-9.",
+  "help9": "Uma consoante minúscula.",
+  "helpIntro": "Este tipo de dados permite gerar strings alfanuméricas aleatórias. Você pode usar os marcadores de posição listados abaixo para personalizar a forma dos valores gerados. Quaisquer outros caracteres além dos listados abaixo serão produzidos como estão.",
+  "incompleteFields": "Os campos alfanuméricos exigem que você insira o formato no campo de texto Opções. Corrija as seguintes linhas:"
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/ru.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/ru.json
new file mode 100644
index 000000000..af8757414
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/ru.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "буквенно-цифровой",
+  "DESC": "Создает пользовательскую случайную буквенно-цифровую строку любой длины или формата, определяемую символами-заполнителями.",
+  "DEFAULT_TITLE": "буквенно-цифровой",
+  "exampleCanPostalCode": "(канадский почтовый индекс)",
+  "examplePassword": "(Пароль)",
+  "exampleUSZipCode": "(почтовый индекс США)",
+  "help1": "Прописная буква.",
+  "help10": "Любое число, 1-9.",
+  "help11": "Согласный (верхний или нижний).",
+  "help12": "Шестнадцатеричный номер (0-F)",
+  "help2": "Заглавная гласная.",
+  "help3": "Строчная буква.",
+  "help4": "Гласная в нижнем регистре.",
+  "help5": "Буква (верхняя или нижняя).",
+  "help6": "Гласная (верхняя или нижняя).",
+  "help7": "Согласная в верхнем регистре.",
+  "help8": "Любое число, 0-9.",
+  "help9": "Строчная согласная.",
+  "helpIntro": "Этот тип данных позволяет генерировать случайные буквенно-цифровые строки. Вы можете использовать перечисленные ниже заполнители, чтобы настроить форму генерируемых значений. Любые другие символы, кроме перечисленных ниже, будут выводиться как есть.",
+  "incompleteFields": "Буквенно-цифровые поля требуют ввода формата в текстовом поле «Параметры». Исправьте следующие строки:"
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/ta.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/ta.json
new file mode 100644
index 000000000..cba1edecc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/ta.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "எண்ணெழுத்து",
+  "DESC": "தனிப்பயன் சீரற்ற எண்ணெழுத்து சரம் அல்லது எந்த நீளம் அல்லது வடிவமைப்பை உருவாக்குகிறது, இது ஒதுக்கிட எழுத்துகளால் வரையறுக்கப்படுகிறது.",
+  "DEFAULT_TITLE": "எண்ணெழுத்து",
+  "exampleCanPostalCode": "(கனடிய அஞ்சல் குறியீடு)",
+  "examplePassword": "(கடவுச்சொல்)",
+  "exampleUSZipCode": "(யு.எஸ். ஜிப் குறியீடு)",
+  "help1": "ஒரு பெரிய கடிதம்.",
+  "help10": "எந்த எண்ணும், 1-9.",
+  "help11": "ஒரு மெய் (மேல் அல்லது கீழ்).",
+  "help12": "ஒரு <b> ஹெக்ஸாடெசிமல் எண் (0-எஃப்)",
+  "help2": "ஒரு பெரிய உயிரெழுத்து.",
+  "help3": "ஒரு சிறிய கடிதம்.",
+  "help4": "ஒரு சிறிய உயிரெழுத்து.",
+  "help5": "ஒரு கடிதம் (மேல் அல்லது கீழ்).",
+  "help6": "ஒரு உயிர் (மேல் அல்லது கீழ்).",
+  "help7": "ஒரு பெரிய மெய்.",
+  "help8": "எந்த எண்ணும், 0-9.",
+  "help9": "ஒரு சிறிய மெய்.",
+  "helpIntro": "சீரற்ற ஆல்பா-எண் சரங்களை உருவாக்க இந்த தரவு வகை உங்களை அனுமதிக்கிறது. பின்வரும் அட்டவணையில் இந்த புலத்திற்கான எழுத்து புராணம் உள்ளது. இந்தத் துறையில் நீங்கள் உள்ளிட்ட வேறு எந்த எழுத்துக்களும் தப்பிக்கப்படாமல் தோன்றும்.",
+  "incompleteFields": "விருப்பங்கள் உரை புலத்தில் வடிவமைப்பை உள்ளிட எண்ணெழுத்து புலங்கள் தேவை. பின்வரும் வரிசைகளை சரிசெய்யவும்:"
+}
diff --git a/packages/plugins/src/dataTypes/Alphanumeric/i18n/zh.json b/packages/plugins/src/dataTypes/Alphanumeric/i18n/zh.json
new file mode 100644
index 000000000..41fcf6afa
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Alphanumeric/i18n/zh.json
@@ -0,0 +1,22 @@
+{
+  "NAME": "字母数字",
+  "DESC": "生成由占位符定义的自定义随机字母数字字符串或任何长度或格式。",
+  "DEFAULT_TITLE": "字母数字",
+  "exampleCanPostalCode": "（加拿大邮政编码）",
+  "examplePassword": "（密码）",
+  "exampleUSZipCode": "（美国邮政编码）",
+  "help1": "一个大写字母。",
+  "help10": "1-9之间的任何数字。",
+  "help11": "辅音（上或下）。",
+  "help12": "十六进制数（0-F）",
+  "help2": "大写元音。",
+  "help3": "小写字母。",
+  "help4": "小写的元音",
+  "help5": "字母（大写或小写）。",
+  "help6": "字母（大写或小写）。",
+  "help7": "大写辅音。",
+  "help8": "任何数字，0-9。",
+  "help9": "小写的辅音。",
+  "helpIntro": "通过此数据类型，您可以生成随机的字母数字字符串。 下表包含此字段的字符图例。 您在此字段中输入的任何其他字符都将显示为未转义。",
+  "incompleteFields": "字母数字字段要求您在“选项”文本字段中输入格式。 请修复以下行："
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.generate.ts b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.generate.ts
new file mode 100644
index 000000000..ffb564ad6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.generate.ts
@@ -0,0 +1,13 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const rowNum = data.rowNum;
+  const { incrementStart, incrementValue, incrementPlaceholder } = data.rowState;
+
+  let value = (rowNum - 1) * incrementValue + incrementStart;
+  if (incrementPlaceholder) {
+    value = utils.generalUtils.template(incrementPlaceholder, { INCR: value });
+  }
+  return { display: value };
+};
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.scss b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.scss
new file mode 100644
index 000000000..7eb1d2e11
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.scss
@@ -0,0 +1,3 @@
+.options span {
+	margin-right: 2px;
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.scss.d.ts b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.scss.d.ts
new file mode 100644
index 000000000..2aa079d08
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace AutoIncrementScssNamespace {
+	export interface IAutoIncrementScss {
+		options: string;
+	}
+}
+
+declare const AutoIncrementScssModule: AutoIncrementScssNamespace.IAutoIncrementScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: AutoIncrementScssNamespace.IAutoIncrementScss;
+};
+
+export = AutoIncrementScssModule;
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.state.tsx b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.state.tsx
new file mode 100755
index 000000000..5fa6461ff
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.state.tsx
@@ -0,0 +1,25 @@
+export type GenerationOptionsType = {
+	incrementStart: number;
+	incrementValue: number;
+	incrementPlaceholder?: string;
+};
+
+export const defaultGenerationOptions: GenerationOptionsType = {
+	incrementStart: 1,
+	incrementValue: 1,
+	incrementPlaceholder: ''
+};
+
+export type AutoIncrementState = {
+	example: string;
+	incrementStart: string;
+	incrementValue: string;
+	incrementPlaceholder: string;
+};
+
+export const initialState: AutoIncrementState = {
+	example: '1,1',
+	incrementStart: '1',
+	incrementValue: '1',
+	incrementPlaceholder: ''
+};
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.tsx b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.tsx
new file mode 100755
index 000000000..215336563
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.tsx
@@ -0,0 +1,125 @@
+import * as React from 'react';
+import Dropdown from '~components/dropdown/Dropdown';
+import TextField from '~components/TextField';
+import { isNumeric } from '@generatedata/utils/number';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTMetadataType, DTOptionsProps } from '~types/dataTypes';
+import { AutoIncrementState, GenerationOptionsType } from './AutoIncrement.state';
+import styles from './AutoIncrement.scss';
+
+export const Example = ({ data, onUpdate }: DTExampleProps) => {
+  const onChange = (value: string): void => {
+    const [incrementStart, incrementValue, incrementPlaceholder] = value.split(',');
+
+    onUpdate({
+      example: value,
+      incrementStart,
+      incrementValue,
+      incrementPlaceholder
+    });
+  };
+
+  const options = [
+    { value: '1,1,', label: '1, 2, 3, 4, 5, 6...' },
+    { value: '100,1,', label: '100, 101, 102, 103, 104...' },
+    { value: '0,2,', label: '0, 2, 4, 6, 8, 10...' },
+    { value: '0,5,', label: '0, 5, 10, 15, 20, 25...' },
+    { value: '1000,-1,', label: '1000, 999, 998, 997...' },
+    { value: '0,-1,', label: '0, -1, -2, -3, -4...' },
+    { value: '0,0.5,', label: '0, 0.5, 1, 1.5, 2...' },
+    { value: '1,1,ROW-{{INCR}}', label: 'ROW-1, ROW-2, ROW-3,...' },
+    { value: '2,4,{{INCR}}i', label: '2i, 4i, 6i, 8i...' }
+  ];
+
+  return <Dropdown value={data.example} onChange={(i: any): void => onChange(i.value)} options={options} />;
+};
+
+export const Options = ({ coreI18n, i18n, data, onUpdate }: DTOptionsProps) => {
+  const onChange = (field: string, value: number | string): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  const incStartError = data.incrementStart.trim() === '' ? coreI18n.requiredField : '';
+  const incValueError = data.incrementValue.trim() === '' ? coreI18n.requiredField : '';
+
+  return (
+    <div className={styles.options}>
+      <div style={{ marginBottom: 2 }}>
+        <span>{i18n.startAt}</span>
+        <TextField
+          error={incStartError}
+          style={{ width: 60, marginRight: 2 }}
+          value={data.incrementStart}
+          onChange={(e: any): void => onChange('incrementStart', e.target.value)}
+        />
+
+        <span>{i18n.increment}</span>
+        <TextField
+          error={incValueError}
+          style={{ width: 60 }}
+          value={data.incrementValue}
+          onChange={(e: any): void => onChange('incrementValue', e.target.value)}
+        />
+      </div>
+
+      <div>
+        <span>{i18n.placeholderStr}</span>
+        <TextField
+          style={{ width: 100 }}
+          value={data.incrementPlaceholder}
+          onChange={(e: any): void => onChange('incrementPlaceholder', e.target.value)}
+        />
+      </div>
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p>{i18n.helpIntro}</p>
+    <p dangerouslySetInnerHTML={{ __html: i18n.helpPara2 }} />
+    <ul>
+      <li>
+        <b>ROW-{'{{INCR}}'}</b> -&gt; ROW-1, ROW-2, ROW-3, ROW-4, ...
+      </li>
+      <li>
+        <b>{'{{INCR}}'}F</b> -&gt; 1F, 2F, 3F, 4F, ...
+      </li>
+    </ul>
+  </>
+);
+
+export const getMetadata = (rowData: AutoIncrementState): DTMetadata => {
+  let dataType: DTMetadataType = isNumeric(rowData.incrementStart) && isNumeric(rowData.incrementValue) ? 'number' : 'string';
+
+  // if there's a placeholder defined, set it to a string if it contains any chars besides numbers & {{INCR}}, even spaces
+  if (rowData.incrementPlaceholder.trim()) {
+    const val = rowData.incrementPlaceholder.replace(/{{INCR}}/g, '');
+    dataType = val === '' || /^[\d\.]+$/.test(val) ? 'number' : 'string';
+  }
+
+  return {
+    general: {
+      dataType
+    },
+    sql: {
+      field: 'mediumint',
+      field_Oracle: 'number default NULL',
+      field_MSSQL: 'INTEGER NULL',
+      field_Postgres: 'integer NULL'
+    }
+  };
+};
+
+export const rowStateReducer = (state: AutoIncrementState): GenerationOptionsType => {
+  const incrementStart = state.incrementStart ? parseFloat(state.incrementStart) : 0;
+  const incrementValue = state.incrementValue ? parseFloat(state.incrementValue) : 0;
+
+  return {
+    incrementStart,
+    incrementValue,
+    incrementPlaceholder: state.incrementPlaceholder
+  };
+};
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.worker.ts b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.worker.ts
new file mode 100644
index 000000000..eba203e1c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/AutoIncrement.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './AutoIncrement.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/README.md b/packages/plugins/src/dataTypes/AutoIncrement/README.md
new file mode 100644
index 000000000..b999bef40
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/README.md
@@ -0,0 +1,154 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; AutoIncrement
+
+This Data Type generates auto-increment sequences in a variety of different ways.
+
+> Note: if you're generating a database table and are looking for a simple _auto-increment primary key_ field, that option
+> actually already exists in the [SQL Export Type](../../exportTypes/SQL/README.md) - you don't need a separate field for
+> that.
+
+## Typings
+
+```typescript
+{
+    incrementStart: number;
+    incrementValue: number;
+    incrementPlaceholder?: string;
+}
+
+```
+
+## The `incrementPlaceholder` property
+
+Providing the start value and the increment jump (plus or minus) is required via the `incrementStart` and `incrementValue`
+properties. But providing a totally custom placeholder is optional. That lets you fine-tune exactly how the value is
+outputted.
+
+The `{{INCR}}` string has special meaning within that field. That string gets switched out for whatever the auto-increment
+number has been calculated. That lets you use that value within the context of an entire string.
+
+# Examples
+
+This example generates four separate fields with different auto-increment values, like so:
+
+- 1, 2, 3, 4, ...
+- A-10, A-20, A-30, A-40, ...
+- 100B, 95B, 90B, 85B, ...
+- 10-20, 11-22, 12-24, 13-35...
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "AutoIncrement",
+            title: "Simple increment",
+            settings: {
+                incrementStart: 1,
+                incrementValue: 1
+            }
+        },
+        {
+            plugin: "AutoIncrement",
+            title: "Tens with prefix",
+            settings: {
+                incrementStart: 10,
+                incrementValue: 10,
+                incrementPlaceholder: "A-{{INCR}}"
+            }
+        },
+        {
+            plugin: "AutoIncrement",
+            title: "Decrement with suffix",
+            settings: {
+                incrementStart: 100,
+                incrementValue: -5,
+                incrementPlaceholder: "{{INCR}}B"
+            }
+        },
+        {
+            plugin: "AutoIncrement",
+            title: "Incrementing range",
+            settings: {
+                incrementStart: 10,
+                incrementValue: 1,
+                incrementPlaceholder: "{{INCR}}-{{INCR*2}}"
+            }
+        }
+    ],
+    exportSettings: {
+        type: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "Simple increment": 1,
+        "Tens with prefix": "A-10",
+        "Decrement with suffix": "100B",
+        "Incrementing range": "10-20"
+    },
+    {
+        "Simple increment": 2,
+        "Tens with prefix": "A-20",
+        "Decrement with suffix": "95B",
+        "Incrementing range": "11-22"
+    },
+    {
+        "Simple increment": 3,
+        "Tens with prefix": "A-30",
+        "Decrement with suffix": "90B",
+        "Incrementing range": "12-24"
+    },
+    {
+        "Simple increment": 4,
+        "Tens with prefix": "A-40",
+        "Decrement with suffix": "85B",
+        "Incrementing range": "13-26"
+    },
+    {
+        "Simple increment": 5,
+        "Tens with prefix": "A-50",
+        "Decrement with suffix": "80B",
+        "Incrementing range": "14-28"
+    },
+    {
+        "Simple increment": 6,
+        "Tens with prefix": "A-60",
+        "Decrement with suffix": "75B",
+        "Incrementing range": "15-30"
+    },
+    {
+        "Simple increment": 7,
+        "Tens with prefix": "A-70",
+        "Decrement with suffix": "70B",
+        "Incrementing range": "16-32"
+    },
+    {
+        "Simple increment": 8,
+        "Tens with prefix": "A-80",
+        "Decrement with suffix": "65B",
+        "Incrementing range": "17-34"
+    },
+    {
+        "Simple increment": 9,
+        "Tens with prefix": "A-90",
+        "Decrement with suffix": "60B",
+        "Incrementing range": "18-36"
+    },
+    {
+        "Simple increment": 10,
+        "Tens with prefix": "A-100",
+        "Decrement with suffix": "55B",
+        "Incrementing range": "19-38"
+    }
+]
+```
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/__tests__/AutoIncrement.generate.test.ts b/packages/plugins/src/dataTypes/AutoIncrement/__tests__/AutoIncrement.generate.test.ts
new file mode 100644
index 000000000..2bb6eaa57
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/__tests__/AutoIncrement.generate.test.ts
@@ -0,0 +1,32 @@
+import { onmessage } from '../AutoIncrement.worker';
+import { initialState } from '../AutoIncrement.state';
+import { getBlankDTGeneratorPayload } from '../../../../../tests/testHelpers';
+const i18n = require('../i18n/en.json');
+
+describe('onmessage', () => {
+	const postMessage = jest.fn();
+	const importScripts = jest.fn();
+	beforeAll(() => {
+		window.postMessage = postMessage;
+		window.importScripts = importScripts;
+	});
+
+	const rowState = {
+		incrementStart: parseInt(initialState.incrementStart, 10),
+		incrementValue: parseInt(initialState.incrementValue, 10),
+		incrementPlaceholder: initialState.incrementPlaceholder
+	};
+
+	it('generates random data', () => {
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				rowState,
+				i18n
+			}
+		};
+
+		onmessage(payload);
+		expect(postMessage).toHaveBeenCalledWith({ display: 1 });
+	});
+});
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/__tests__/AutoIncrement.test.tsx b/packages/plugins/src/dataTypes/AutoIncrement/__tests__/AutoIncrement.test.tsx
new file mode 100644
index 000000000..fca00ac02
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/__tests__/AutoIncrement.test.tsx
@@ -0,0 +1,104 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Help, getMetadata } from '../AutoIncrement';
+import { AutoIncrementState } from '../AutoIncrement.state';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps} />);
+		expect(container).toBeTruthy();
+	});
+});
+
+describe('getMetadata', () => {
+	it('returns number as the general data type when no placeholder and numeric values for the incr + starting value', () => {
+		const rowData1: AutoIncrementState = {
+			incrementPlaceholder: '',
+			incrementValue: '1',
+			incrementStart: '1',
+			example: ''
+		};
+		expect(getMetadata(rowData1).general!.dataType).toEqual('number');
+
+		const rowData2: AutoIncrementState = {
+			incrementPlaceholder: '',
+			incrementValue: '1.5',
+			incrementStart: '1',
+			example: ''
+		};
+		expect(getMetadata(rowData2).general!.dataType).toEqual('number');
+	});
+
+	it('still returns a number when the placeholder is set but only contains the placeholder or numeric vals', () => {
+		const rowData1: AutoIncrementState = {
+			incrementPlaceholder: '{{INCR}}',
+			incrementValue: '1',
+			incrementStart: '1',
+			example: ''
+		};
+		expect(getMetadata(rowData1).general!.dataType).toEqual('number');
+
+		const rowData2: AutoIncrementState = {
+			incrementPlaceholder: '100{{INCR}}',
+			incrementValue: '1',
+			incrementStart: '1',
+			example: ''
+		};
+		expect(getMetadata(rowData2).general!.dataType).toEqual('number');
+
+		const rowData3: AutoIncrementState = {
+			incrementPlaceholder: '123{{INCR}}456',
+			incrementValue: '1',
+			incrementStart: '1',
+			example: ''
+		};
+		expect(getMetadata(rowData3).general!.dataType).toEqual('number');
+	});
+
+	it('returns a number when the placeholder contains whitespace only', () => {
+		const rowData1: AutoIncrementState = {
+			incrementPlaceholder: ' ',
+			incrementValue: '1',
+			incrementStart: '1',
+			example: ''
+		};
+		expect(getMetadata(rowData1).general!.dataType).toEqual('number');
+	});
+
+	it('returns a number when the placeholder string contains multiple placeholders and nothing else', () => {
+		const rowData1: AutoIncrementState = {
+			incrementPlaceholder: '{{INCR}}{{INCR}}{{INCR}}',
+			incrementValue: '1',
+			incrementStart: '1',
+			example: ''
+		};
+		expect(getMetadata(rowData1).general!.dataType).toEqual('number');
+	});
+
+	it('returns a string when the placeholder contains whitespace and the placeholder', () => {
+		const rowData1: AutoIncrementState = {
+			incrementPlaceholder: ' {{INCR}}',
+			incrementValue: '1',
+			incrementStart: '1',
+			example: ''
+		};
+		expect(getMetadata(rowData1).general!.dataType).toEqual('string');
+	});
+
+	it('returns a string when the placeholder contains any non-numeric chars and the placeholder', () => {
+		const rowData1: AutoIncrementState = {
+			incrementPlaceholder: 'b{{INCR}}',
+			incrementValue: '1',
+			incrementStart: '1',
+			example: ''
+		};
+		expect(getMetadata(rowData1).general!.dataType).toEqual('string');
+	});
+});
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/bundle.ts b/packages/plugins/src/dataTypes/AutoIncrement/bundle.ts
new file mode 100644
index 000000000..96f0a2f7f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/bundle.ts
@@ -0,0 +1,14 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, rowStateReducer, getMetadata } from './AutoIncrement';
+import { initialState } from './AutoIncrement.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	rowStateReducer,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/config.ts b/packages/plugins/src/dataTypes/AutoIncrement/config.ts
new file mode 100644
index 000000000..ad789ad88
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'numeric',
+  fieldGroupOrder: 20
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/ar.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/ar.json
new file mode 100644
index 000000000..f54c6ea2f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/ar.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "زيادة تلقائية",
+  "DESC": "يوفر العديد من الاختلافات في حقل زيادة تلقائية قياسي: قيمة بدء مخصصة ، وأحجام خطوات قابلة للتخصيص ، وإدراج سلسلة عشوائية ، وزيادة أو إنقاص والمزيد.",
+  "DEFAULT_TITLE": "زيادة تلقائية",
+  "helpIntro": "يُنشئ عمودًا يحتوي على رقم فريد في كل صف ، يتزايد حسب القيمة التي تدخلها. يمكن أن يكون هذا الخيار مفيدًا لإدراج البيانات في حقل قاعدة بيانات باستخدام مفتاح أساسي لزيادة تلقائية.",
+  "helpPara2": "تتيح لك سلسلة العنصر النائب الاختيارية تضمين قيمة الزيادة المُنشأة داخل سلسلة ، عبر العنصر النائب {{INCR}}. فمثلا:",
+  "increment": "زيادة راتب:",
+  "placeholderStr": "سلسلة العنصر النائب:",
+  "startAt": "تبدأ في:",
+  "incompleteFields": "الرجاء إدخال حقلي البدء عند والزيادة لجميع صفوف الزيادة التلقائية:"
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/de.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/de.json
new file mode 100644
index 000000000..7ee2d5bef
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/de.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "Automatisches Inkrementieren",
+  "DESC": "Bietet viele Variationen eines Standardfelds für die automatische Inkrementierung: benutzerdefinierter Startwert, anpassbare Schrittgrößen, willkürliche Zeichenfolgeneinbeziehung, Inkrementierung oder Dekrementierung und mehr.",
+  "DEFAULT_TITLE": "autoink",
+  "helpIntro": "Erzeugt eine Spalte, die in jeder Zeile eine eindeutige Nummer enthält, die um den von Ihnen eingegebenen Wert erhöht wird. Diese Option kann hilfreich sein, um die Daten mit einem automatisch inkrementierten Primärschlüssel in ein Datenbankfeld einzufügen.",
+  "helpPara2": "Mit der optionalen Platzhalterzeichenfolge können Sie den generierten Inkrementwert über den Platzhalter {{INCR}} in eine Zeichenfolge einbetten. Beispielsweise:",
+  "increment": "Zuwachs:",
+  "placeholderStr": "Platzhalterzeichenfolge:",
+  "startAt": "Anfangen bei:",
+  "incompleteFields": "Bitte geben Sie die Felder Start bei und Inkrementieren für alle Zeilen mit automatischer Inkrementierung ein:"
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/en.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/en.json
new file mode 100644
index 000000000..178c960e0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/en.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "Auto-increment",
+  "DESC": "Provides many variations on an standard auto-increment field: custom start value, customizable step sizes, arbitrary string inclusion, increment or decrement and more. ",
+  "DEFAULT_TITLE": "autoincrement",
+  "helpIntro": "Generates a column that contains a unique number on each row, incrementing by whatever value you enter. This option can be helpful for inserting the data into a database field with an auto-increment primary key.",
+  "helpPara2": "The optional placeholder string lets you embed the generated increment value within a string, via the <b>{{INCR}}</b> placeholder. For example:",
+  "increment": "Increment:",
+  "placeholderStr": "Placeholder string:",
+  "startAt": "Start at:",
+  "incompleteFields": "Please enter the Start At and Increment fields for all Auto-increment rows:"
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/es.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/es.json
new file mode 100644
index 000000000..a9bc6a17e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/es.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "Auto-incrementado",
+  "DESC": "Proporciona muchas variaciones en un campo de incremento automático estándar : se inicia la costumbre de valor, tamaños de paso personalizables , la inclusión cadena arbitraria , incremento o decremento y más.",
+  "DEFAULT_TITLE": "autoincremento",
+  "helpIntro": "Genera una columna que contiene un número único en cada fila, incrementándolo en el valor que introduzcas. Esta opción puede ser de ayuda para insertar los datos en una columna de base de datos con una clave primaria auto-incrementada.",
+  "helpPara2": "La cadena de patrón opcional permite introducir el valor de incremento generado dentro de una cadena de texto usando el patrón de sustitución <b>{{INCR}}</b>. Por ejemplo:",
+  "increment": "Incremento:",
+  "placeholderStr": "Patrón de sustitución:",
+  "startAt": "Comenzar en:",
+  "incompleteFields": "Por favor, introduce los campos &quot;Empezar en&quot; e &quot;Incremento&quot; para todas las filas auto-incrementadas:"
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/fr.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/fr.json
new file mode 100644
index 000000000..da654fd7b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/fr.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "Auto-incrémentation",
+  "DESC": "Fournit beaucoup de variations sur un champ à incrémentation automatique norme : commencer personnalisé valeur , tailles de pas personnalisables , l'inclusion arbitraire de chaîne , augmentation ou la diminution et plus encore. ",
+  "DEFAULT_TITLE": "incrementation",
+  "helpIntro": "Génère une colonne qui contient un numéro unique sur chaque ligne, quel que soit la valeur d'incrémentation que vous entrez. Cette option peut être utile pour insérer les données dans un champ de base de données avec une clé primaire auto-incrémentée.",
+  "helpPara2": "L'option 'chaîne complémentaire' vous permet d'intégrer la valeur d'incrément généré dans une chaîne grâce à la balise <b>{{INCR}}</b>. Par exemple:",
+  "incompleteFields": "Renseignez l'option 'Début' des champs d'incrémentation pour toutes les lignes concernées:",
+  "increment": "Pas:",
+  "placeholderStr": "Chaîne complémentaire:",
+  "startAt": "Début:"
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/hi.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/hi.json
new file mode 100644
index 000000000..2ea6dc9ce
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/hi.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "स्वत: वेतनवृद्धि",
+  "DESC": "एक मानक ऑटो-इंक्रीमेंट फ़ील्ड पर कई विविधताएँ प्रदान करता है: कस्टम प्रारंभ मान, अनुकूलन योग्य चरण आकार, मनमाना स्ट्रिंग समावेशन, वृद्धि या कमी और बहुत कुछ।",
+  "DEFAULT_TITLE": "स्वत: वेतनवृद्धि",
+  "helpIntro": "एक कॉलम उत्पन्न करता है जिसमें प्रत्येक पंक्ति पर एक अद्वितीय संख्या होती है, जो आपके द्वारा दर्ज किए गए मान से बढ़ती है। यह विकल्प ऑटो-इन्क्रीमेंट प्राथमिक कुंजी के साथ डेटाबेस फ़ील्ड में डेटा डालने के लिए सहायक हो सकता है।",
+  "helpPara2": "वैकल्पिक प्लेसहोल्डर स्ट्रिंग आपको <b>{{INCR}}</b> प्लेसहोल्डर के माध्यम से एक स्ट्रिंग के भीतर उत्पन्न वृद्धि मान को एम्बेड करने देती है। उदाहरण के लिए:",
+  "increment": "वेतन वृद्धि:",
+  "placeholderStr": "प्लेसहोल्डर स्ट्रिंग:",
+  "startAt": "पर शुरू करें:",
+  "incompleteFields": "कृपया सभी ऑटो-इन्क्रीमेंट पंक्तियों के लिए स्टार्ट एट और इंक्रीमेंट फ़ील्ड दर्ज करें:"
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/ja.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/ja.json
new file mode 100644
index 000000000..c7c5a2403
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/ja.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "自動増加",
+  "DESC": "標準の自動インクリメントフィールドに多くのバリエーションを提供します：カスタム開始値、カスタマイズ可能なステップサイズ、任意の文字列の包含、インクリメントまたはデクリメントなど。",
+  "DEFAULT_TITLE": "自動増加",
+  "helpIntro": "入力した値に応じて、各行に一意の番号を含む列を生成します。 このオプションは、自動インクリメントの主キーを使用してデータベースフィールドにデータを挿入する場合に役立ちます。",
+  "helpPara2": "オプションのプレースホルダー文字列を使用すると、{{INCR}}プレースホルダーを介して、生成された増分値を文字列内に埋め込むことができます。 例えば：",
+  "increment": "インクリメント：",
+  "placeholderStr": "プレースホルダー文字列：",
+  "startAt": "開始：",
+  "incompleteFields": "すべての自動インクリメント行の[開始位置]フィールドと[インクリメント]フィールドに入力してください。"
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/nl.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/nl.json
new file mode 100644
index 000000000..cd5afde43
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/nl.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "Auto-increment",
+  "DESC": "Biedt een groot aantal variaties op een standaard auto-increment veld : aangepaste begin waarde , aanpasbare stap maten , willekeurige reeks opnemen , verhogen of verlagen en meer.",
+  "DEFAULT_TITLE": "automatisch",
+  "helpIntro": "Genereert een kolom die een uniek nummer in elke rij opneemt, verhoogt met de waarde die u hebt ingevoerd. Deze optie kan nuttig zijn voor het inlezen van de gegevens in een database dat een veld met een auto-increment bevat (unieke sleutel).",
+  "helpPara2": "Met de optionele placeholderstring kunt u de gegenereerde waarde opnemen als onderdeel van een string. Gebruik hiervoor de <b>{{INCR}}</b> binnen de string. Bijvoorbeeld:",
+  "incompleteFields": "Vul de Startwaarde en Increment velden voor alle Auto-increment rijen:",
+  "increment": "Increment:",
+  "placeholderStr": "Placeholder string:",
+  "startAt": "Start met:"
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/pt.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/pt.json
new file mode 100644
index 000000000..0ac5a7bf3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/pt.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "Incremento automático",
+  "DESC": "Fornece muitas variações em um campo de incremento automático padrão: valor inicial personalizado, tamanhos de etapa personalizáveis, inclusão de string arbitrária, incremento ou decremento e muito mais.",
+  "DEFAULT_TITLE": "incremento",
+  "helpIntro": "Gera uma coluna que contém um número exclusivo em cada linha, incrementando por qualquer valor que você inserir. Esta opção pode ser útil para inserir os dados em um campo de banco de dados com uma chave primária de incremento automático.",
+  "helpPara2": "A string de espaço reservado opcional permite incorporar o valor de incremento gerado em uma string, por meio do marcador de posição <b>{{INCR}}</b>. Por exemplo:",
+  "increment": "Incremento:",
+  "placeholderStr": "String de espaço reservado:",
+  "startAt": "Começa ás:",
+  "incompleteFields": "Insira os campos Iniciar em e Incremento para todas as linhas de incremento automático:"
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/ru.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/ru.json
new file mode 100644
index 000000000..5c9697795
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/ru.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "Автоматическое приращение",
+  "DESC": "Предоставляет множество вариантов стандартного поля автоинкремента: пользовательское начальное значение, настраиваемые размеры шага, включение произвольной строки, увеличение или уменьшение и многое другое.",
+  "DEFAULT_TITLE": "автоматическоеприращение",
+  "helpIntro": "Создает столбец, содержащий уникальный номер в каждой строке, увеличивающийся на любое введенное вами значение. Этот параметр может быть полезен для вставки данных в поле базы данных с автоматически увеличивающимся первичным ключом.",
+  "helpPara2": "Необязательная строка-заполнитель позволяет встроить сгенерированное значение приращения в строку с помощью заполнителя <b>{{INCR}}</b>. Например:",
+  "increment": "Приращение:",
+  "placeholderStr": "Строка-заполнитель:",
+  "startAt": "Начните с:",
+  "incompleteFields": "Пожалуйста, введите поля Start At и Increment для всех строк с автоинкрементом:"
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/ta.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/ta.json
new file mode 100644
index 000000000..34ede21f2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/ta.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "தானாக அதிகரிப்பு",
+  "DESC": "நிலையான தானாக அதிகரிக்கும் துறையில் பல வேறுபாடுகளை வழங்குகிறது: தனிப்பயன் தொடக்க மதிப்பு, தனிப்பயனாக்கக்கூடிய படி அளவுகள், தன்னிச்சையான சரம் சேர்த்தல், அதிகரிப்பு அல்லது குறைவு மற்றும் பல.",
+  "DEFAULT_TITLE": "autoincrement",
+  "helpIntro": "ஒவ்வொரு வரிசையிலும் தனித்துவமான எண்ணைக் கொண்ட ஒரு நெடுவரிசையை உருவாக்குகிறது, நீங்கள் உள்ளிட்ட எந்த மதிப்பையும் அதிகரிக்கிறது. தானாக அதிகரிக்கும் முதன்மை விசையுடன் தரவுத்தள புலத்தில் தரவைச் செருக இந்த விருப்பம் உதவியாக இருக்கும்.",
+  "helpPara2": "{{INCR}} ஒதுக்கிடத்தின் வழியாக, ஒரு சரத்திற்குள் உருவாக்கப்பட்ட அதிகரிப்பு மதிப்பை உட்பொதிக்க விருப்ப ஒதுக்கிட சரம் உங்களை அனுமதிக்கிறது. உதாரணத்திற்கு:",
+  "increment": "அதிகரிப்பு:",
+  "placeholderStr": "ஒதுக்கிட சரம்:",
+  "startAt": "தொடங்கும் இடம் அல்லது நேரம்:",
+  "incompleteFields": "அனைத்து தானியங்கு-அதிகரிக்கும் வரிசைகளுக்கும் தொடக்க மற்றும் அதிகரிப்பு புலங்களை உள்ளிடவும்:"
+}
diff --git a/packages/plugins/src/dataTypes/AutoIncrement/i18n/zh.json b/packages/plugins/src/dataTypes/AutoIncrement/i18n/zh.json
new file mode 100644
index 000000000..ef043d6dc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/AutoIncrement/i18n/zh.json
@@ -0,0 +1,11 @@
+{
+  "NAME": "自动递增",
+  "DESC": "在标准自动递增字段上提供了多种变体：自定义起始值，可自定义步长，任意字符串包含，递增或递减等等。",
+  "DEFAULT_TITLE": "自动递增",
+  "helpIntro": "生成一列，该列在每一行上包含一个唯一的数字，并按您输入的任何值递增。 此选项对于使用自动增量主键将数据插入数据库字段很有用。",
+  "helpPara2": "可选的占位符字符串使您可以通过{{INCR}}占位符将生成的增量值嵌入到字符串中。 例如：",
+  "increment": "增量：",
+  "placeholderStr": "占位符字符串：",
+  "startAt": "开始于：",
+  "incompleteFields": "请为所有自动增量行输入“开始于”和“增量”字段："
+}
diff --git a/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.generate.ts b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.generate.ts
new file mode 100644
index 000000000..6944e6fb1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.generate.ts
@@ -0,0 +1,50 @@
+import { BitcoinAddressFormat } from './BitcoinAddress.state';
+// import { WorkerUtils } from '../../';
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+// import { BitcoinAddressFormat, BitcoinAddressState } from './BitcoinAddress';
+// import ECPairFactory from 'ecpair';
+// import * as ecc from 'tiny-secp256k1';
+// import { payments } from 'bitcoinjs-lib';
+
+// const ECPair = ECPairFactory(ecc);
+
+export const generate = ({ rowState }: DTGenerationData): DTGenerateResult => {
+  // utils: WorkerUtils
+  const formats: any = {};
+  if (rowState[BitcoinAddressFormat.Legacy].enabled && rowState[BitcoinAddressFormat.Legacy].weight) {
+    formats[BitcoinAddressFormat.Legacy] = rowState[BitcoinAddressFormat.Legacy].weight;
+  }
+  if (rowState[BitcoinAddressFormat.Compatibility].enabled && rowState[BitcoinAddressFormat.Compatibility].weight) {
+    formats[BitcoinAddressFormat.Compatibility] = rowState[BitcoinAddressFormat.Compatibility].weight;
+  }
+  if (rowState[BitcoinAddressFormat.Segwit].enabled && rowState[BitcoinAddressFormat.Segwit].weight) {
+    formats[BitcoinAddressFormat.Segwit] = rowState[BitcoinAddressFormat.Segwit].weight;
+  }
+
+  // get a random format
+  // const format = utils.randomUtils.getRandomWeightedValue(formats);
+
+  // let display;
+  // switch (format) {
+  // 	// Nope! actual generation needs to be better than this. Will put this on hold.
+  //
+  // 	// case BitcoinAddressFormat.Legacy: {
+  // 	// 	const length = utils.randomUtils.getRandomNum(25, 35);
+  // 	// 	display = utils.randomUtils.generateRandomAlphanumericStr('1' + ('x'.repeat(length)), placeholders);
+  // 	// 	break;
+  // 	// }
+  // 	// case BitcoinAddressFormat.Compatibility: {
+  // 	// 	const length = utils.randomUtils.getRandomNum(25, 35);
+  // 	// 	display = utils.randomUtils.generateRandomAlphanumericStr('3' + ('x'.repeat(length)), placeholders);
+  // 	// 	break;
+  // 	// }
+  // 	// case BitcoinAddressFormat.Segwit:
+  // 	// 	display = utils.randomUtils.generateRandomAlphanumericStr('bc1' + ('y'.repeat(39)), placeholders);
+  // 	// 	break;
+  // }
+
+  return { display: '' };
+  // const keyPair = ECPair.makeRandom();
+  // const { address } = bitcoin.payments.p2pkh({ pubkey: keyPair.publicKey });
+  // return address;
+};
diff --git a/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.scss b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.scss
new file mode 100644
index 000000000..335a26b79
--- /dev/null
+++ b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.scss
@@ -0,0 +1,21 @@
+.formatHeader {
+	display: flex;
+
+	svg {
+		color: #666666;
+	}
+	span {
+		display: inline-block;
+		margin-right: 4px;
+	}
+}
+
+.labelCol {
+	padding-right: 20px;
+}
+
+.table {
+	input:disabled {
+		color: #999999;
+	}
+}
diff --git a/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.scss.d.ts b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.scss.d.ts
new file mode 100644
index 000000000..3a9ba4b4d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.scss.d.ts
@@ -0,0 +1,14 @@
+declare namespace BitcoinAddressScssNamespace {
+	export interface IBitcoinAddressScss {
+		formatHeader: string;
+		labelCol: string;
+		table: string;
+	}
+}
+
+declare const BitcoinAddressScssModule: BitcoinAddressScssNamespace.IBitcoinAddressScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: BitcoinAddressScssNamespace.IBitcoinAddressScss;
+};
+
+export = BitcoinAddressScssModule;
diff --git a/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.state.tsx b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.state.tsx
new file mode 100644
index 000000000..d1bbc2cb7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.state.tsx
@@ -0,0 +1,37 @@
+export const enum BitcoinAddressFormat {
+	Legacy = 'Legacy',
+	Compatibility = 'Compatibility',
+	Segwit = 'Segwit'
+}
+
+export type BitcoinAddressState = {
+	[BitcoinAddressFormat.Legacy]: {
+		enabled: boolean;
+		weight: number;
+	};
+	[BitcoinAddressFormat.Compatibility]: {
+		enabled: boolean;
+		weight: number;
+	};
+	[BitcoinAddressFormat.Segwit]: {
+		enabled: boolean;
+		weight: number;
+	};
+};
+
+export type GenerationOptionsType = BitcoinAddressState;
+
+export const initialState: BitcoinAddressState = {
+	[BitcoinAddressFormat.Legacy]: {
+		enabled: true,
+		weight: 1
+	},
+	[BitcoinAddressFormat.Compatibility]: {
+		enabled: true,
+		weight: 1
+	},
+	[BitcoinAddressFormat.Segwit]: {
+		enabled: true,
+		weight: 1
+	}
+};
diff --git a/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.tsx b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.tsx
new file mode 100644
index 000000000..ea20f6257
--- /dev/null
+++ b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.tsx
@@ -0,0 +1,177 @@
+import React from 'react';
+import Button from '@mui/material/Button';
+import InfoIcon from '@mui/icons-material/Info';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import TextField from '~components/TextField';
+import CheckboxPill from '~components/pills/CheckboxPill';
+import { DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import { Tooltip } from '~components/tooltips';
+import { BitcoinAddressFormat } from './BitcoinAddress.state';
+import styles from './BitcoinAddress.scss';
+
+const BitcoinDialog = ({ visible, data, id, onClose, coreI18n, onUpdate, i18n }: any) => {
+  const onToggleFormat = (format: BitcoinAddressFormat, checked: boolean): void => {
+    onUpdate({
+      ...data,
+      [format]: {
+        ...data[format],
+        enabled: checked
+      }
+    });
+  };
+
+  const onChangeWeight = (prop: BitcoinAddressFormat, weight: number): void => {
+    onUpdate({
+      ...data,
+      [prop]: {
+        ...data[prop],
+        weight
+      }
+    });
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 400 }}>
+        <DialogTitle onClose={onClose}>{i18n.bitcoinSettings}</DialogTitle>
+        <DialogContent dividers>
+          <table className={styles.table}>
+            <thead>
+              <tr>
+                <td className={styles.labelCol}>{coreI18n.format}</td>
+                <td>
+                  <div className={styles.formatHeader}>
+                    <span>{i18n.weight}</span>
+                    <Tooltip title={i18n.weightDesc} arrow>
+                      <InfoIcon />
+                    </Tooltip>
+                  </div>
+                </td>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td className={styles.labelCol}>
+                  <CheckboxPill
+                    label="P2PKH / Legacy"
+                    onClick={(): void => onToggleFormat(BitcoinAddressFormat.Legacy, !data[BitcoinAddressFormat.Legacy].enabled)}
+                    name={`format-${id}`}
+                    checked={data[BitcoinAddressFormat.Legacy].enabled}
+                  />
+                </td>
+                <td>
+                  <TextField
+                    type="number"
+                    min={0}
+                    step={1}
+                    value={data[BitcoinAddressFormat.Legacy].weight}
+                    style={{ width: 60 }}
+                    disabled={!data[BitcoinAddressFormat.Legacy].enabled}
+                    onChange={(e: any): void => onChangeWeight(BitcoinAddressFormat.Legacy, parseInt(e.target.value))}
+                  />
+                </td>
+              </tr>
+              <tr>
+                <td className={styles.labelCol}>
+                  <CheckboxPill
+                    label="P2SH / Compatibility"
+                    onClick={(): void =>
+                      onToggleFormat(BitcoinAddressFormat.Compatibility, !data[BitcoinAddressFormat.Compatibility].enabled)
+                    }
+                    name={`format-${id}`}
+                    checked={data[BitcoinAddressFormat.Compatibility].enabled}
+                  />
+                </td>
+                <td>
+                  <TextField
+                    type="number"
+                    min={0}
+                    step={1}
+                    value={data[BitcoinAddressFormat.Compatibility].weight}
+                    style={{ width: 60 }}
+                    disabled={!data[BitcoinAddressFormat.Compatibility].enabled}
+                    onChange={(e: any): void => onChangeWeight(BitcoinAddressFormat.Compatibility, parseInt(e.target.value))}
+                  />
+                </td>
+              </tr>
+              <tr>
+                <td className={styles.labelCol}>
+                  <CheckboxPill
+                    label="P2WPKH / Bech32"
+                    onClick={(): void => onToggleFormat(BitcoinAddressFormat.Segwit, !data[BitcoinAddressFormat.Segwit].enabled)}
+                    name={`format-${id}`}
+                    checked={data[BitcoinAddressFormat.Segwit].enabled}
+                  />
+                </td>
+                <td>
+                  <TextField
+                    type="number"
+                    min={0}
+                    step={1}
+                    value={data[BitcoinAddressFormat.Segwit].weight}
+                    style={{ width: 60 }}
+                    disabled={!data[BitcoinAddressFormat.Segwit].enabled}
+                    onChange={(e: any): void => onChangeWeight(BitcoinAddressFormat.Segwit, parseInt(e.target.value))}
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ data, id, i18n, coreI18n, onUpdate }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+
+  let count = 0;
+  if (data[BitcoinAddressFormat.Legacy].enabled) {
+    count++;
+  }
+  if (data[BitcoinAddressFormat.Compatibility].enabled) {
+    count++;
+  }
+  if (data[BitcoinAddressFormat.Segwit].enabled) {
+    count++;
+  }
+
+  let buttonLabel = `1 ${i18n.format}`;
+  if (count > 1) {
+    buttonLabel = `${count} ${i18n.formats}`;
+  }
+
+  return (
+    <div>
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        <span dangerouslySetInnerHTML={{ __html: buttonLabel }} />
+      </Button>
+      <BitcoinDialog
+        visible={dialogVisible}
+        data={data}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        onClose={(): void => setDialogVisibility(false)}
+        onUpdate={onUpdate}
+      />
+    </div>
+  );
+};
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'varchar(50)',
+    field_Oracle: 'varchar2(50)',
+    field_MSSQL: 'VARCHAR(50) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.worker.ts b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.worker.ts
new file mode 100644
index 000000000..d5b827bb1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/BitcoinAddress/BitcoinAddress.worker.ts
@@ -0,0 +1,6 @@
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './BitcoinAddress.generate';
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/dataTypes/BitcoinAddress/__tests__/BitcoinAddress.generate.test.ts b/packages/plugins/src/dataTypes/BitcoinAddress/__tests__/BitcoinAddress.generate.test.ts
new file mode 100644
index 000000000..123b66f11
--- /dev/null
+++ b/packages/plugins/src/dataTypes/BitcoinAddress/__tests__/BitcoinAddress.generate.test.ts
@@ -0,0 +1,26 @@
+import { generate } from '../BitcoinAddress.generate';
+import { BitcoinAddressFormat, BitcoinAddressState } from '../BitcoinAddress.state';
+import { DTGenerationData } from '~types/dataTypes';
+
+describe('generate', () => {
+	it('generates', () => {
+		const rowState: BitcoinAddressState = {
+			[BitcoinAddressFormat.Legacy]: {
+				enabled: true,
+				weight: 1
+			},
+			[BitcoinAddressFormat.Compatibility]: {
+				enabled: false,
+				weight: 1
+			},
+			[BitcoinAddressFormat.Segwit]: {
+				enabled: false,
+				weight: 1
+			}
+		};
+		const state = {
+			rowState
+		};
+		expect(generate(state as unknown as DTGenerationData)).toEqual({ display: '' });
+	});
+});
diff --git a/packages/plugins/src/dataTypes/BitcoinAddress/bundle.ts b/packages/plugins/src/dataTypes/BitcoinAddress/bundle.ts
new file mode 100644
index 000000000..d7da7cdc9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/BitcoinAddress/bundle.ts
@@ -0,0 +1,11 @@
+import { DTBundle } from '~types/dataTypes';
+import { Options, getMetadata } from './BitcoinAddress';
+import { initialState } from './BitcoinAddress.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Options,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/BitcoinAddress/config.ts b/packages/plugins/src/dataTypes/BitcoinAddress/config.ts
new file mode 100644
index 000000000..f6026c471
--- /dev/null
+++ b/packages/plugins/src/dataTypes/BitcoinAddress/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'financial',
+  fieldGroupOrder: 5
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/BitcoinAddress/i18n/en.json b/packages/plugins/src/dataTypes/BitcoinAddress/i18n/en.json
new file mode 100644
index 000000000..a43f3d31e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/BitcoinAddress/i18n/en.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "Bitcoin Address",
+  "DESC": "This generates a random Bitcoin address in any of the three formats: P2PKH/Legacy, P2SH/Compatibility and P2WPKH/Bech32.",
+  "DEFAULT_TITLE": "bitcoin",
+  "weight": "Weight",
+  "weightDesc": "The weight field determines how likely the format will be generated relative to the other selected formats. So if you select 2 formats and enter weights of 9 and 1, the first format will be 9 times more likely to appear than the second.",
+  "format": "Format",
+  "formats": "Formats",
+  "bitcoinSettings": "Bitcoin Settings"
+}
diff --git a/packages/plugins/src/dataTypes/BitcoinAddress/i18n/ru.json b/packages/plugins/src/dataTypes/BitcoinAddress/i18n/ru.json
new file mode 100644
index 000000000..5533d1ee8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/BitcoinAddress/i18n/ru.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "Биткойн-адрес",
+  "DESC": "Это генерирует случайный биткойн-адрес в любом из трех форматов: P2PKH/Legacy, P2SH/Compatibility и P2WPKH/Bech32.",
+  "DEFAULT_TITLE": "биткойн",
+  "weight": "Масса",
+  "weightDesc": "Поле веса определяет вероятность того, что формат будет сгенерирован относительно других выбранных форматов. Таким образом, если вы выберете 2 формата и введете веса 9 и 1, вероятность появления первого формата будет в 9 раз выше, чем второго.",
+  "format": "Формат",
+  "formats": "Форматы",
+  "bitcoinSettings": "Настройки биткойнов"
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/Boolean.generate.ts b/packages/plugins/src/dataTypes/Boolean/Boolean.generate.ts
new file mode 100644
index 000000000..dfa9a8754
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/Boolean.generate.ts
@@ -0,0 +1,18 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  // for backward compatibility
+  const formats = Array.isArray(data.rowState) ? data.rowState : data.rowState.values;
+
+  let val = '';
+  if (formats.length) {
+    let chosenFormat = formats[0];
+    if (formats.length > 1) {
+      chosenFormat = formats[utils.randomUtils.getRandomNum(0, formats.length - 1)];
+    }
+    val = chosenFormat.trim();
+  }
+
+  return { display: val };
+};
diff --git a/packages/plugins/src/dataTypes/Boolean/Boolean.state.tsx b/packages/plugins/src/dataTypes/Boolean/Boolean.state.tsx
new file mode 100755
index 000000000..2de0b25a1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/Boolean.state.tsx
@@ -0,0 +1,17 @@
+export type GenerationOptionsType = {
+	values: string[];
+};
+
+export type BooleanState = {
+	example: string;
+	values: string[];
+};
+
+export const defaultGenerationOptions = {
+	values: ['Yes', 'No']
+};
+
+export const initialState: BooleanState = {
+	example: 'Yes|No',
+	...defaultGenerationOptions
+};
diff --git a/packages/plugins/src/dataTypes/Boolean/Boolean.tsx b/packages/plugins/src/dataTypes/Boolean/Boolean.tsx
new file mode 100755
index 000000000..0c27ddbe1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/Boolean.tsx
@@ -0,0 +1,54 @@
+import * as React from 'react';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import Dropdown from '~components/dropdown/Dropdown';
+import CreatablePillField from '~components/creatablePillField/CreatablePillField';
+import { BooleanState, GenerationOptionsType } from './Boolean.state';
+
+export const Example = ({ data, onUpdate }: DTExampleProps) => {
+  const onChange = (value: any): void => {
+    onUpdate({
+      example: value,
+      values: value.split('|')
+    });
+  };
+
+  const options = [
+    { value: 'Yes|No', label: 'Yes / No' },
+    { value: 'true|false', label: 'true / false' },
+    { value: 'True|False', label: 'True / False' },
+    { value: '0|1', label: '0 / 1' },
+    { value: 'Y|N', label: 'Y / N' },
+    { value: 'T|F', label: 'T / F' },
+    { value: 'On|Off', label: 'On / Off' },
+    { value: 'Down|Up', label: 'Down / Up' }
+  ];
+
+  return <Dropdown value={data.example} onChange={(i: any): void => onChange(i.value)} options={options} />;
+};
+
+export const Options = ({ coreI18n, data, onUpdate }: DTOptionsProps) => (
+  <CreatablePillField
+    error={data.values.length ? '' : coreI18n.requiredField}
+    value={data.values}
+    onChange={(values: any): void => onUpdate({ ...data, values })}
+  />
+);
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p dangerouslySetInnerHTML={{ __html: `${i18n.DESC} ${i18n.helpIntro}` }} />
+  </>
+);
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'boolean'
+  },
+  sql: {
+    field: 'varchar(255) default NULL',
+    field_Oracle: 'varchar2(255) default NULL',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
+
+export const rowStateReducer = (state: BooleanState): GenerationOptionsType => ({ values: state.values });
diff --git a/packages/plugins/src/dataTypes/Boolean/Boolean.worker.ts b/packages/plugins/src/dataTypes/Boolean/Boolean.worker.ts
new file mode 100644
index 000000000..326484c1d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/Boolean.worker.ts
@@ -0,0 +1,13 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Boolean.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Boolean/README.md b/packages/plugins/src/dataTypes/Boolean/README.md
new file mode 100644
index 000000000..8ff450bbe
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/README.md
@@ -0,0 +1,113 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Boolean
+
+This Data Type generates random Boolean strings according to whatever format you want. It's actually just a convenience
+wrapper over some lower-level functions that supplies a bunch of preset boolean options via the UI, like `Yes/No`, `0/1`
+and others.
+
+By the way, even though you'll typically enter two values to randomly choose between, there's no reason why you can't
+add more - like the in the final field here.
+
+## Typings
+
+The settings for this Data Type are just a single `value` property, containing an array of the values you want the script
+to randomly pull from.
+
+```typescript
+{
+    value: string[];
+}
+```
+
+Note that they **must be** strings - so even if you want to generate a numeric boolean value (e.g. `0` and `1`), you'll still
+need to enter a string here (`["0", "1"]`). Whether or not the actual generated content will be a string, number, boolean
+etc. value will depend on the Export Type you've chosen. e.g. in XML, it would just output the character as-is without
+single or double quotes around it, even if it was a string. But if it's in a programming language, it has to be
+syntactically correct for that language.
+
+This Data Type asks the Export Types to _infer_ the type of data it us, based on the content generated. So it's up to the
+Export Type to determine exactly it appears. In the examples below, you can see that the [JSON](../../exportTypes/JSON/README.md)
+Export Type chose to render the genuine JS boolean and numbers as booleans and numbers, and not double quote them.
+
+### Example
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Boolean",
+            title: "boolean1",
+            settings: {
+                values: ["Yes", "No"]
+            }
+        },
+        {
+            plugin: "Boolean",
+            title: "boolean2",
+            settings: {
+                values: ["0", "1"]
+            }
+        },
+        {
+            plugin: "Boolean",
+            title: "boolean3",
+            settings: {
+                values: ["true", "false"]
+            }
+        },
+        {
+            plugin: "Boolean",
+            title: "notReallyABoolean",
+            settings: {
+                values: ["Yes", "No", "Maybe"]
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "boolean1": "No",
+        "boolean2": 1,
+        "boolean3": true,
+        "notReallyABoolean": "Maybe"
+    },
+    {
+        "boolean1": "Yes",
+        "boolean2": 0,
+        "boolean3": false,
+        "notReallyABoolean": "Maybe"
+    },
+    {
+        "boolean1": "No",
+        "boolean2": 0,
+        "boolean3": false,
+        "notReallyABoolean": "Maybe"
+    },
+    {
+       "boolean1": "Yes",
+        "boolean2": 0,
+        "boolean3": false,
+        "notReallyABoolean": "No"
+    },
+    {
+        "boolean1": "Yes",
+        "boolean2": 1,
+        "boolean3": true,
+        "notReallyABoolean": "No"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/Boolean/__tests__/Boolean.generate.test.ts b/packages/plugins/src/dataTypes/Boolean/__tests__/Boolean.generate.test.ts
new file mode 100644
index 000000000..093918791
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/__tests__/Boolean.generate.test.ts
@@ -0,0 +1,26 @@
+import { onmessage } from '../Boolean.worker';
+import { getBlankDTGeneratorPayload } from '../../../../../tests/testHelpers';
+
+const i18n = require('../i18n/en.json');
+
+describe('onmessage', () => {
+	const postMessage = jest.fn();
+	const importScripts = jest.fn();
+	beforeAll(() => {
+		window.postMessage = postMessage;
+		window.importScripts = importScripts;
+	});
+
+	it('generates random data', () => {
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				rowState: ['Booyah'],
+				i18n
+			}
+		};
+
+		onmessage(payload);
+		expect(postMessage).toHaveBeenCalledWith({ display: 'Booyah' });
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Boolean/__tests__/Boolean.test.tsx b/packages/plugins/src/dataTypes/Boolean/__tests__/Boolean.test.tsx
new file mode 100644
index 000000000..6a0c54cc4
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/__tests__/Boolean.test.tsx
@@ -0,0 +1,19 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../Boolean';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	dimensions: { width: 100, height: 100 }
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Boolean/bundle.ts b/packages/plugins/src/dataTypes/Boolean/bundle.ts
new file mode 100644
index 000000000..b7e88fda6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/bundle.ts
@@ -0,0 +1,14 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, rowStateReducer, getMetadata } from './Boolean';
+import { initialState } from './Boolean.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	rowStateReducer,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Boolean/config.ts b/packages/plugins/src/dataTypes/Boolean/config.ts
new file mode 100644
index 000000000..ca6feaadd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'numeric',
+  fieldGroupOrder: 11
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/ar.json b/packages/plugins/src/dataTypes/Boolean/i18n/ar.json
new file mode 100644
index 000000000..974dc5aa7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/ar.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "قيمة منطقية",
+  "DESC": "يولد قيمة منطقية بالتنسيق الذي تحتاجه.",
+  "DEFAULT_TITLE": "قيمة منطقية",
+  "helpIntro": "تحتوي القائمة المنسدلة \"الأمثلة\" على عدة أمثلة على قيم منطقية (كلها بالإنجليزية أو عالمية). لإنشاء قيم أخرى ، ما عليك سوى كتابة نص في حقل الخيارات والنقر فوق إدخال."
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/de.json b/packages/plugins/src/dataTypes/Boolean/i18n/de.json
new file mode 100644
index 000000000..9ab8ba063
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/de.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "Boolean",
+  "DESC": "Dieser Datentyp zufällig generiert eine Boolean nach dem Format, das Sie angeben.",
+  "DEFAULT_TITLE": "boolescherwert",
+  "helpIntro": "Die Dropdown-Liste Beispiele enthält mehrere boolesche Beispielwerte (alle englisch oder universell). Um andere Werte zu erstellen, geben Sie einfach Text in das Feld Optionen ein und klicken Sie auf die Eingabetaste."
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/en.json b/packages/plugins/src/dataTypes/Boolean/i18n/en.json
new file mode 100644
index 000000000..04224b0e2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/en.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "Boolean",
+  "DESC": "Generates a boolean value in the format you need.",
+  "DEFAULT_TITLE": "boolean",
+  "helpIntro": "The Examples dropdown contains several example boolean values (all English or universal). To create other values, just type text into the Options field and click &lt;enter&gt;."
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/es.json b/packages/plugins/src/dataTypes/Boolean/i18n/es.json
new file mode 100644
index 000000000..cc1dd97a0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/es.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "Boolean",
+  "DESC": "Este tipo de dato genera aleatoriamente Boolean de acuerdo al formato que especifiques.",
+  "DEFAULT_TITLE": "booleano",
+  "helpIntro": "El menú desplegable Ejemplos contiene varios valores booleanos de ejemplo (todos en inglés o universales). Para crear otros valores, simplemente escriba texto en el campo Opciones y haga clic en Intro."
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/fr.json b/packages/plugins/src/dataTypes/Boolean/i18n/fr.json
new file mode 100644
index 000000000..3626d8472
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/fr.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "Booléen",
+  "DESC": "Ce type de données génère aléatoirement des noms de personnes (principalement occidentaux) en fonction du format que vous spécifiez.",
+  "DEFAULT_TITLE": "booleen",
+  "helpIntro": "La liste déroulante Exemples contient plusieurs exemples de valeurs booléennes (toutes en anglais ou universelles). Pour créer d'autres valeurs, tapez simplement du texte dans le champ Options et cliquez sur Entrée."
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/hi.json b/packages/plugins/src/dataTypes/Boolean/i18n/hi.json
new file mode 100644
index 000000000..6bab50e09
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/hi.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "बूलियन",
+  "DESC": "आपको आवश्यक प्रारूप में एक बूलियन मान उत्पन्न करता है।",
+  "DEFAULT_TITLE": "बूलियन",
+  "helpIntro": "उदाहरण ड्रॉपडाउन में कई उदाहरण बूलियन मान (सभी अंग्रेज़ी या सार्वभौमिक) हैं। अन्य मान बनाने के लिए, बस विकल्प फ़ील्ड में टेक्स्ट टाइप करें और एंटर पर क्लिक करें।"
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/ja.json b/packages/plugins/src/dataTypes/Boolean/i18n/ja.json
new file mode 100644
index 000000000..c15528f9d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/ja.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "ブール値",
+  "DESC": "必要な形式でブール値を生成します。",
+  "DEFAULT_TITLE": "ブール値",
+  "helpIntro": "[例]ドロップダウンには、いくつかのブール値の例（すべて英語またはユニバーサル）が含まれています。 他の値を作成するには、[オプション]フィールドにテキストを入力して、[Enter]をクリックします。"
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/nl.json b/packages/plugins/src/dataTypes/Boolean/i18n/nl.json
new file mode 100644
index 000000000..d15e4bf8f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/nl.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "Boolean",
+  "DESC": "Genereerd een Boolean waarde in elk gewenst formaat.",
+  "DEFAULT_TITLE": "boolean",
+  "helpIntro": "De vervolgkeuzelijst Voorbeelden bevat verschillende voorbeeldbooleaanse waarden (allemaal Engels of universeel). Om andere waarden te maken, typ gewoon tekst in het veld Opties en klik op Enter."
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/pt.json b/packages/plugins/src/dataTypes/Boolean/i18n/pt.json
new file mode 100644
index 000000000..e11cdde7b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/pt.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "Boleano",
+  "DESC": "Gera um valor booleano no formato que você precisa.",
+  "DEFAULT_TITLE": "boleano",
+  "helpIntro": "A lista suspensa Exemplos contém vários valores booleanos de exemplo (todos em inglês ou universais). Para criar outros valores, basta digitar o texto no campo Opções e clicar em &lt;inserir&gt;."
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/ru.json b/packages/plugins/src/dataTypes/Boolean/i18n/ru.json
new file mode 100644
index 000000000..cecc3e717
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/ru.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "логический",
+  "DESC": "Генерирует логическое значение в нужном вам формате.",
+  "DEFAULT_TITLE": "логический",
+  "helpIntro": "Раскрывающийся список «Примеры» содержит несколько примеров логических значений (все на английском или универсальном языке). Чтобы создать другие значения, просто введите текст в поле «Параметры» и нажмите «Ввод»."
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/ta.json b/packages/plugins/src/dataTypes/Boolean/i18n/ta.json
new file mode 100644
index 000000000..efd36d5f2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/ta.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "பூலியன்",
+  "DESC": "உங்களுக்கு தேவையான வடிவத்தில் பூலியன் மதிப்பை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "பூலியன்",
+  "helpIntro": "எடுத்துக்காட்டுகள் கீழிறங்கும் பல உதாரண பூலியன் மதிப்புகள் உள்ளன (அனைத்தும் ஆங்கிலம் அல்லது உலகளாவியவை). பிற மதிப்புகளை உருவாக்க, விருப்பங்கள் புலத்தில் உரையைத் தட்டச்சு செய்து உள்ளிடவும் என்பதைக் கிளிக் செய்யவும்."
+}
diff --git a/packages/plugins/src/dataTypes/Boolean/i18n/zh.json b/packages/plugins/src/dataTypes/Boolean/i18n/zh.json
new file mode 100644
index 000000000..7b9c5a296
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Boolean/i18n/zh.json
@@ -0,0 +1,6 @@
+{
+  "NAME": "布尔型",
+  "DESC": "以所需的格式生成布尔值。",
+  "DEFAULT_TITLE": "布尔值",
+  "helpIntro": "“示例”下拉列表包含几个示例布尔值（全部为英语或通用）。 要创建其他值，只需在“选项”字段中键入文本，然后单击Enter。"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/CVV.generate.ts b/packages/plugins/src/dataTypes/CVV/CVV.generate.ts
new file mode 100644
index 000000000..3ad656dd7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/CVV.generate.ts
@@ -0,0 +1,8 @@
+// @author Ben Keen <ben.keen@gmail.com>, origin code Zeeshan Shaikh
+// @package DataTypes
+import { DTGenerateResult } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = (_data: any, utils: WorkerUtils): DTGenerateResult => ({
+  display: utils.randomUtils.getRandomNum(111, 999)
+});
diff --git a/packages/plugins/src/dataTypes/CVV/CVV.state.tsx b/packages/plugins/src/dataTypes/CVV/CVV.state.tsx
new file mode 100644
index 000000000..e2d9ec4d2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/CVV.state.tsx
@@ -0,0 +1,2 @@
+export const defaultGenerationOptions = {};
+export type GenerationOptionsType = {};
diff --git a/packages/plugins/src/dataTypes/CVV/CVV.tsx b/packages/plugins/src/dataTypes/CVV/CVV.tsx
new file mode 100644
index 000000000..48a6ccc49
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/CVV.tsx
@@ -0,0 +1,12 @@
+import * as React from 'react';
+import { DTHelpProps, DTMetadata } from '~types/dataTypes';
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.DESC}</p>;
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'varchar(255)',
+    field_Oracle: 'varchar2(255)',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/CVV/CVV.worker.ts b/packages/plugins/src/dataTypes/CVV/CVV.worker.ts
new file mode 100644
index 000000000..29d350fb2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/CVV.worker.ts
@@ -0,0 +1,17 @@
+// @author Ben Keen <ben.keen@gmail.com>, origin code Zeeshan Shaikh
+// @package DataTypes
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './CVV.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(undefined, utils));
+};
+
diff --git a/packages/plugins/src/dataTypes/CVV/README.md b/packages/plugins/src/dataTypes/CVV/README.md
new file mode 100644
index 000000000..c03dacd1f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/README.md
@@ -0,0 +1,56 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; CVV
+
+CVV stands for Card Verification Value. It's that 3-digit number you see on the back of your credit card. This Data Type
+generates a random CVV. All it really does is generate a random 3 digit code. Simple! 
+
+## Examples
+
+```typescript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "CVV",
+            title: "cvv",
+            settings: {}
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+ [
+    {
+        "cvv": 454
+    },
+    {
+        "cvv": 742
+    },
+    {
+        "cvv": 945
+    },
+    {
+        "cvv": 285
+    },
+    {
+        "cvv": 907
+    },
+    {
+        "cvv": 408
+    },
+    {
+        "cvv": 572
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/CVV/__tests__/CVV.generate.test.ts b/packages/plugins/src/dataTypes/CVV/__tests__/CVV.generate.test.ts
new file mode 100644
index 000000000..8b82cd473
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/__tests__/CVV.generate.test.ts
@@ -0,0 +1,29 @@
+import sinon from 'sinon';
+import { onmessage } from '../CVV.worker';
+import { getBlankDTGeneratorPayload } from '../../../../../tests/testHelpers';
+import utils from '~utils/index';
+
+const i18n = require('../i18n/en.json');
+
+describe('onmessage', () => {
+	const postMessage = jest.fn();
+	const importScripts = jest.fn();
+	beforeAll(() => {
+		window.postMessage = postMessage;
+		window.importScripts = importScripts;
+	});
+
+	it('generates random data', () => {
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				i18n
+			}
+		};
+
+		sinon.stub(utils.randomUtils, 'getRandomNum').onCall(0).returns(123);
+
+		onmessage(payload);
+		expect(postMessage).toHaveBeenCalledWith({ display: 123 });
+	});
+});
diff --git a/packages/plugins/src/dataTypes/CVV/__tests__/CVV.ui.test.tsx b/packages/plugins/src/dataTypes/CVV/__tests__/CVV.ui.test.tsx
new file mode 100644
index 000000000..d7b34ebf3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/__tests__/CVV.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../CVV';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/CVV/bundle.ts b/packages/plugins/src/dataTypes/CVV/bundle.ts
new file mode 100644
index 000000000..07b6355c6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/bundle.ts
@@ -0,0 +1,9 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, getMetadata } from './CVV';
+
+const bundle: DTBundle = {
+	Help,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/CVV/config.ts b/packages/plugins/src/dataTypes/CVV/config.ts
new file mode 100644
index 000000000..1607848f5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'financial',
+  fieldGroupOrder: 50
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/ar.json b/packages/plugins/src/dataTypes/CVV/i18n/ar.json
new file mode 100644
index 000000000..f3484f376
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/ar.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "يولد رقم بطاقة ائتمان عشوائي CVV من 111 إلى 999",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/de.json b/packages/plugins/src/dataTypes/CVV/i18n/de.json
new file mode 100644
index 000000000..2eba57fae
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/de.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "Erzeugt eine Zufalls CVV-Nummer von 111 bis 999.",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/en.json b/packages/plugins/src/dataTypes/CVV/i18n/en.json
new file mode 100644
index 000000000..63716d146
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/en.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "Generates a random credit card CVV number from 111 to 999.",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/es.json b/packages/plugins/src/dataTypes/CVV/i18n/es.json
new file mode 100644
index 000000000..b2d696771
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/es.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "Genera un número de tarjeta de crédito CVV azar 111-999.",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/fr.json b/packages/plugins/src/dataTypes/CVV/i18n/fr.json
new file mode 100644
index 000000000..9ef7c4d27
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/fr.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "Génère un nombre aléatoire de CVV de la carte de crédit de 111 à 999.",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/hi.json b/packages/plugins/src/dataTypes/CVV/i18n/hi.json
new file mode 100644
index 000000000..51d3c5ceb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/hi.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "111 से 999 तक एक रैंडम क्रेडिट कार्ड CVV नंबर जेनरेट करता है।",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/ja.json b/packages/plugins/src/dataTypes/CVV/i18n/ja.json
new file mode 100644
index 000000000..94d00a14e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/ja.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "111から999までのランダムなクレジットカードCVV番号を生成します。",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/nl.json b/packages/plugins/src/dataTypes/CVV/i18n/nl.json
new file mode 100644
index 000000000..81adec4be
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/nl.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "Genereert een willekeurig creditcard CVV-nummer tussen 111 en 999.",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/pt.json b/packages/plugins/src/dataTypes/CVV/i18n/pt.json
new file mode 100644
index 000000000..26829071b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/pt.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "Gera um número CVV de cartão de crédito aleatório de 111 a 999.",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/ru.json b/packages/plugins/src/dataTypes/CVV/i18n/ru.json
new file mode 100644
index 000000000..8c2272898
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/ru.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "Генерирует случайный номер CVV кредитной карты от 111 до 999.",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/ta.json b/packages/plugins/src/dataTypes/CVV/i18n/ta.json
new file mode 100644
index 000000000..301b06623
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/ta.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "சீரற்ற கிரெடிட் கார்டு சி.வி.வி எண்ணை 111 முதல் 999 வரை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/CVV/i18n/zh.json b/packages/plugins/src/dataTypes/CVV/i18n/zh.json
new file mode 100644
index 000000000..e656d99d9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/CVV/i18n/zh.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "CVV",
+  "DESC": "生成从111到999的随机信用卡CVV号码。",
+  "DEFAULT_TITLE": "cvv"
+}
diff --git a/packages/plugins/src/dataTypes/City/City.generate.ts b/packages/plugins/src/dataTypes/City/City.generate.ts
new file mode 100644
index 000000000..ee1b89765
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/City.generate.ts
@@ -0,0 +1,49 @@
+import { CityState, RegionSource, RegionSourceEnum } from './City.state';
+import { CountryType, Region } from '~types/countries';
+import { DTGenerateResult, DTGenerationExistingRowData, DTGenerationData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+import { countryList } from '../../../../_plugins';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { rowState } = data;
+  const { source, selectedCountries } = rowState as CityState;
+
+  let country: CountryType;
+  let regionRow: any;
+  if (source === RegionSourceEnum.regionRow) {
+    regionRow = data.existingRowData.find(({ id }: DTGenerationExistingRowData) => id === rowState.targetRowId);
+    country = regionRow!.data.countryDataType;
+  } else if (source === RegionSourceEnum.any) {
+    country = utils.randomUtils.getRandomArrayValue(countryList as CountryType[]);
+  } else {
+    const list = rowState.selectedCountries.length ? selectedCountries : countryList;
+    country = utils.randomUtils.getRandomArrayValue(list as string[]) as CountryType;
+  }
+
+  // this can occur if the user hasn't configured the region DT properly
+  if (!country) {
+    return { display: '' };
+  }
+
+  const countryData = data.countryData[country];
+
+  let selectedRegion;
+  if (regionRow) {
+    // check the user fully filled out the region row. If the didn't include a display format, it'll be incomplete
+    if (!regionRow.data.displayFormat || !regionRow.data.display) {
+      return { display: '' };
+    }
+    selectedRegion = countryData.regions.find((i: Region) => {
+      if (regionRow.data.displayFormat === 'short') {
+        return i.regionShort === regionRow.data.display;
+      }
+      return i.regionName === regionRow.data.display;
+    });
+  } else {
+    selectedRegion = utils.randomUtils.getRandomArrayValue(countryData.regions);
+  }
+
+  return {
+    display: utils.randomUtils.getRandomArrayValue(selectedRegion.cities)
+  };
+};
diff --git a/packages/plugins/src/dataTypes/City/City.scss b/packages/plugins/src/dataTypes/City/City.scss
new file mode 100644
index 000000000..a013c6a46
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/City.scss
@@ -0,0 +1,3 @@
+.buttonLabel {
+	margin-top: 4px;
+}
diff --git a/packages/plugins/src/dataTypes/City/City.scss.d.ts b/packages/plugins/src/dataTypes/City/City.scss.d.ts
new file mode 100644
index 000000000..45e0a5d12
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/City.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace CityScssNamespace {
+	export interface ICityScss {
+		buttonLabel: string;
+	}
+}
+
+declare const CityScssModule: CityScssNamespace.ICityScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: CityScssNamespace.ICityScss;
+};
+
+export = CityScssModule;
diff --git a/packages/plugins/src/dataTypes/City/City.state.tsx b/packages/plugins/src/dataTypes/City/City.state.tsx
new file mode 100644
index 000000000..230863fe1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/City.state.tsx
@@ -0,0 +1,37 @@
+import { CountryType } from '../../';
+
+export const enum RegionSourceEnum {
+  any = 'any',
+  countries = 'countries',
+  regionRow = 'regionRow'
+}
+export type RegionSource = `${RegionSourceEnum}`;
+
+export type CityStateAny = {
+  source: 'any';
+  selectedCountries?: [];
+  targetRowId?: '';
+};
+
+export type CityStateRegionRow = {
+  source: 'regionRow';
+  selectedCountries?: [];
+  targetRowId: string;
+};
+
+export type CityStateCountryRow = {
+  source: 'countries';
+  selectedCountries: CountryType[];
+};
+
+export type CityState = CityStateAny | CityStateRegionRow | CityStateCountryRow;
+
+export type GenerationOptionsType = CityState;
+
+export const initialState: CityState = {
+  source: 'any',
+  selectedCountries: [],
+  targetRowId: ''
+};
+
+export const defaultGenerationOptions = initialState;
diff --git a/packages/plugins/src/dataTypes/City/City.store.tsx b/packages/plugins/src/dataTypes/City/City.store.tsx
new file mode 100644
index 000000000..983913312
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/City.store.tsx
@@ -0,0 +1,40 @@
+import { createSelector } from 'reselect';
+import { DTCustomProps } from '~types/dataTypes';
+import { getSortedRowsArray } from '~store/generator/generator.selectors';
+import { REMOVE_ROW, SELECT_DATA_TYPE } from '~store/generator/generator.actions';
+import { CityState, CityStateRegionRow, RegionSourceEnum } from './City.state';
+
+const getRegionRows = createSelector(getSortedRowsArray, (rows) =>
+	rows.map((row, index) => ({ ...row, index })).filter(({ dataType }) => dataType === 'Region')
+);
+
+export const customProps: DTCustomProps = {
+	regionRows: getRegionRows
+};
+
+export const actionInterceptors = {
+	// when a Region plugin row is removed, clean up any city fields that may have been mapped to it
+	[REMOVE_ROW]: (regionRowId: string, rowState: CityStateRegionRow, actionPayload: any): CityState | null => {
+		if (actionPayload.id === rowState.targetRowId) {
+			return {
+				...rowState,
+				source: RegionSourceEnum.any,
+				targetRowId: ''
+			};
+		}
+		return null;
+	},
+
+	[SELECT_DATA_TYPE]: (regionRowId: string, rowState: CityStateRegionRow, actionPayload: any): CityState | null => {
+		if (actionPayload.id === rowState.targetRowId) {
+			if (actionPayload.value !== 'Region') {
+				return {
+					...rowState,
+					source: RegionSourceEnum.any,
+					targetRowId: ''
+				};
+			}
+		}
+		return null;
+	}
+};
diff --git a/packages/plugins/src/dataTypes/City/City.tsx b/packages/plugins/src/dataTypes/City/City.tsx
new file mode 100644
index 000000000..c73c595cf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/City.tsx
@@ -0,0 +1,168 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import { getI18nString } from '~utils/langUtils';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import { countryList } from '../../../../_plugins';
+import { RegionSourceEnum, RegionSource } from './City.state';
+import styles from './City.scss';
+
+const CityDialog = ({ visible, data, id, onClose, countryI18n, coreI18n, i18n, onUpdate, regionRows }: any) => {
+  const regionPluginRows = regionRows.map(({ index, id, title }: any) => ({
+    value: id,
+    label: `${i18n.row} #${index + 1}: ${title}`
+  }));
+
+  const regionPluginRowsExist = regionPluginRows.length > 0;
+
+  const onUpdateSource = (source: RegionSource): void => {
+    const newValues = {
+      ...data,
+      source
+    };
+    if (source === RegionSourceEnum.regionRow) {
+      newValues.targetRowId = regionPluginRows[0].value;
+    }
+    onUpdate(newValues);
+  };
+
+  const onChangeTargetRow = (row: DropdownOption): void => {
+    onUpdate({
+      ...data,
+      targetRowId: row.value
+    });
+  };
+
+  const onSelectCountries = (countries: any): void => {
+    onUpdate({
+      ...data,
+      selectedCountries: countries ? countries.map(({ value }: DropdownOption) => value) : []
+    });
+  };
+
+  const getRegionRow = (): React.ReactNode => {
+    if (data.source !== RegionSourceEnum.regionRow) {
+      return null;
+    }
+
+    return <Dropdown value={data.targetRowId} onChange={onChangeTargetRow} options={regionPluginRows} />;
+  };
+
+  const getCountryPluginsList = (): React.ReactNode => {
+    if (data.source !== RegionSourceEnum.countries) {
+      return null;
+    }
+    const countryPluginOptions = countryList.map((countryName) => ({
+      value: countryName,
+      label: countryI18n[countryName].countryName
+    }));
+
+    return (
+      <Dropdown
+        isMulti
+        closeMenuOnSelect={false}
+        isClearable={true}
+        value={data.selectedCountries}
+        onChange={onSelectCountries}
+        options={countryPluginOptions}
+      />
+    );
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ maxWidth: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.selectCities}</DialogTitle>
+        <DialogContent dividers>
+          <div>{i18n.explanation}</div>
+
+          <h3>{i18n.source}</h3>
+
+          <RadioPillRow>
+            <RadioPill
+              label={i18n.anyCity}
+              onClick={(): void => onUpdateSource(RegionSourceEnum.any)}
+              name={`${id}-source`}
+              checked={data.source === RegionSourceEnum.any}
+              tooltip={i18n.anyDesc}
+            />
+            <RadioPill
+              label={i18n.countries}
+              onClick={(): void => onUpdateSource(RegionSourceEnum.countries)}
+              name={`${id}-source`}
+              checked={data.source === RegionSourceEnum.countries}
+              tooltip={i18n.countriesDesc}
+            />
+            <RadioPill
+              label={i18n.regionRow}
+              onClick={(): void => onUpdateSource(RegionSourceEnum.regionRow)}
+              name={`${id}-source`}
+              checked={data.source === RegionSourceEnum.regionRow}
+              tooltip={i18n.rowDesc}
+              disabled={!regionPluginRowsExist}
+            />
+          </RadioPillRow>
+
+          {getRegionRow()}
+          {getCountryPluginsList()}
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ id, data, coreI18n, i18n, countryI18n, onUpdate, regionRows }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+  const numSelected = data.selectedCountries.length;
+
+  let label = '';
+  if (data.source === RegionSourceEnum.any) {
+    label = i18n.anyCity;
+  } else if (data.source === RegionSourceEnum.countries) {
+    if (numSelected === 1) {
+      label = i18n.anyCityFrom1Country;
+    } else {
+      label = getI18nString(i18n.anyCityFromNCountries, [`<b>${numSelected}</b>`]);
+    }
+  } else if (data.source === RegionSourceEnum.regionRow) {
+    const row = regionRows.find((row: any) => row.id === data.targetRowId);
+    const rowNum = row.index + 1;
+    label = `${i18n.regionRow} #${rowNum}`;
+  }
+
+  return (
+    <div className={styles.buttonLabel}>
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        <span dangerouslySetInnerHTML={{ __html: label }} />
+      </Button>
+      <CityDialog
+        visible={dialogVisible}
+        data={data}
+        regionRows={regionRows}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        countryI18n={countryI18n}
+        onUpdate={onUpdate}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.DESC}</p>;
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'varchar(255)',
+    field_Oracle: 'varchar2(255)',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/City/City.worker.ts b/packages/plugins/src/dataTypes/City/City.worker.ts
new file mode 100644
index 000000000..f7bf686a1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/City.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './City.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/City/README.md b/packages/plugins/src/dataTypes/City/README.md
new file mode 100644
index 000000000..472e1631e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/README.md
@@ -0,0 +1,182 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; City
+
+Generates a random city name. You have the choice of generating a city name from anywhere in the world, or mapping
+it to other data in the generated row, so the city is actually within a region or country from another field. This makes
+the generated data more realistic.
+
+## Typings
+
+```
+{
+    source: RegionSource; // 'any', 'countries', 'regionRow'
+    selectedCountries: CountryType[];
+    targetRowId: string;
+}
+```
+
+## Examples
+
+- [Random city from anywhere](#random-city-from-anywhere)
+- [Random city within a specific country list](#random-city-within-a-specific-country-list)
+- [Random city within a generated region row](#random-city-within-a-generated-region-row)
+
+### Random city from anywhere
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "City",
+            title: "any-city",
+            settings: {
+                source: "any"
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "any-city": "Changi"
+    },
+    {
+        "any-city": "Kitzbühel"
+    },
+    {
+        "any-city": "Glendale"
+    },
+    {
+        "any-city": "Coevorden"
+    },
+    {
+        "any-city": "Edam"
+    },
+    {
+        "any-city": "Te Awamutu"
+    },
+    ...
+]
+```
+
+### Random city within a specific country list
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "City",
+            title: "city-within-country",
+            settings: {
+                source: "countries",
+                selectedCountries: ["Australia", "Canada"]
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "city-within-country": "Greater Hobart"
+    },
+    {
+        "city-within-country": "Palmerston"
+    },
+    {
+        "city-within-country": "Coleville Lake"
+    },
+    {
+        "city-within-country": "Stratford"
+    },
+    {
+        "city-within-country": "Gjoa Haven"
+    },
+    {
+        "city-within-country": "Mount Isa"
+    },
+    ...
+]
+```
+
+### Random city within a generated region row
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "City",
+            title: "city-within-country",
+            settings: {
+                source: "countries",
+                selectedCountries: ["Australia", "Canada"]
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "region-source": "South Australia",
+        "city-within-region": "Whyalla"
+    },
+    {
+        "region-source": "Queensland",
+        "city-within-region": "Hervey Bay"
+    },
+    {
+        "region-source": "Bayern",
+        "city-within-region": "Fürth"
+    },
+    {
+        "region-source": "Baden Württemberg",
+        "city-within-region": "Friedrichshafen"
+    },
+    {
+        "region-source": "Baden Württemberg",
+        "city-within-region": "Tübingen"
+    },
+    {
+        "region-source": "Australian Capital Territory",
+        "city-within-region": "Canberra"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/City/__tests__/City.test.tsx b/packages/plugins/src/dataTypes/City/__tests__/City.test.tsx
new file mode 100644
index 000000000..356f2a9af
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/__tests__/City.test.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Help, Options } from '../City';
+import { initialState } from '../City.state';
+
+const i18n = require('../i18n/en.json');
+
+const helpProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+const optionsProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	gridPanelDimensions: { width: 100, height: 100 },
+	isCountryNamesLoading: false,
+	isCountryNamesLoaded: false,
+	countryNamesMap: null
+};
+
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...helpProps} />);
+		expect(container).toBeTruthy();
+	});
+});
+
+describe('Options', () => {
+	it('renders', () => {
+		const data = { ...initialState };
+		const onUpdate = jest.fn();
+
+		const { container } = render(
+			<Options
+				{...optionsProps}
+				data={data}
+				onUpdate={onUpdate}
+				regionRows={[]}
+			/>
+		);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/City/bundle.ts b/packages/plugins/src/dataTypes/City/bundle.ts
new file mode 100644
index 000000000..e42d56a50
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/bundle.ts
@@ -0,0 +1,15 @@
+import { DTBundle } from '~types/dataTypes';
+import { Options, Help, getMetadata } from './City';
+import { initialState } from './City.state';
+import { customProps, actionInterceptors } from './City.store';
+
+const bundle: DTBundle = {
+	getMetadata,
+	initialState,
+	Options,
+	Help,
+	customProps,
+	actionInterceptors
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/City/config.ts b/packages/plugins/src/dataTypes/City/config.ts
new file mode 100644
index 000000000..fcd0351d2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/config.ts
@@ -0,0 +1,9 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'geo',
+  fieldGroupOrder: 20,
+  dependencies: ['Country', 'Region']
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/City/i18n/ar.json b/packages/plugins/src/dataTypes/City/i18n/ar.json
new file mode 100644
index 000000000..a14aa6710
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/ar.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "مدينة",
+  "DESC": "يعرض مدينة عشوائية ، أو إذا كانت البيانات متاحة ، يعرض مدينة للبلد / المنطقة المناسبة.",
+  "DEFAULT_TITLE": "مدينة",
+  "selectCities": "حدد المدن",
+  "regionRow": "صف المنطقة",
+  "source": "مصدر",
+  "anyCity": "أي مدينة",
+  "explanation": "يتحكم هذا في أسماء المدن التي سيتم إنشاؤها بواسطة هذا الحقل.",
+  "anyDesc": "يولد أي اسم مدينة.",
+  "countriesDesc": "يولد أسماء المدن من البلدان المحددة.",
+  "rowDesc": "يشير هذا إلى حقل منطقة معين في مجموعة البيانات الخاصة بك التي تحتوي على ملحقات المنطقة كمصدر لها. يُنشئ المدن التي تحدد القيمة في هذا المجال.",
+  "row": "صف",
+  "country": "بلد",
+  "countries": "بلدان",
+  "anyCityFrom1Country": "أي مدينة من دولة واحدة",
+  "anyCityFromNCountries": "أي مدينة من%1دولة"
+}
diff --git a/packages/plugins/src/dataTypes/City/i18n/de.json b/packages/plugins/src/dataTypes/City/i18n/de.json
new file mode 100644
index 000000000..e71e414a8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/de.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "Stadt",
+  "DESC": "Zeigt eine zufällige Stadt an oder wenn Daten verfügbar sind, wird eine Stadt für das entsprechende Land / die entsprechende Region angezeigt.",
+  "DEFAULT_TITLE": "stadt",
+  "selectCities": "Wählen Sie Städte",
+  "regionRow": "Regionszeile",
+  "source": "Quelle",
+  "anyCity": "Irgendeine Stadt",
+  "explanation": "Hiermit wird gesteuert, welche Städtenamen von diesem Feld generiert werden.",
+  "anyDesc": "Erzeugt einen beliebigen Städtenamen.",
+  "countriesDesc": "Generiert Städtenamen aus den angegebenen Ländern.",
+  "rowDesc": "Dadurch wird ein bestimmtes Regionsfeld in Ihrem Datensatz ermittelt, dessen Quelle Regions-Plugins sind. Es werden Städte generiert, die dem Wert in diesem Feld zugeordnet sind.",
+  "row": "Reihe",
+  "country": "Land",
+  "countries": "Länder",
+  "anyCityFrom1Country": "Jede Stadt aus 1 Land",
+  "anyCityFromNCountries": "Jede Stadt aus %1 Ländern"
+}
diff --git a/packages/plugins/src/dataTypes/City/i18n/en.json b/packages/plugins/src/dataTypes/City/i18n/en.json
new file mode 100644
index 000000000..1e4737cf2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/en.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "City",
+  "DESC": "Displays a random city, or if data is available, displays a city for the appropriate country/region.",
+  "DEFAULT_TITLE": "city",
+  "selectCities": "Select Cities",
+  "regionRow": "Region row",
+  "source": "Source",
+  "anyCity": "Any city",
+  "explanation": "This controls what city names will be generated by this field.",
+  "anyDesc": "Generates any city name.",
+  "countriesDesc": "Generates city names from the specified countries.",
+  "rowDesc": "This pinpoints a specific Region field in your data set that has Region Plugins as its source. It generates cities that map to the value in that field.",
+  "row": "Row",
+  "country": "country",
+  "countries": "countries",
+  "anyCityFrom1Country": "Any city from 1 country",
+  "anyCityFromNCountries": "Any city from %1 countries"
+}
diff --git a/packages/plugins/src/dataTypes/City/i18n/es.json b/packages/plugins/src/dataTypes/City/i18n/es.json
new file mode 100644
index 000000000..3349cbfcf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/es.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "Ciudad",
+  "DESC": "Muestra una ciudad aleatoria o, si hay datos disponibles, muestra una ciudad para el país / región correspondiente.",
+  "DEFAULT_TITLE": "ciudad",
+  "selectCities": "Seleccionar ciudades",
+  "regionRow": "Fila de región",
+  "source": "Fuente",
+  "anyCity": "Alguna ciudad",
+  "explanation": "Esto controla qué nombres de ciudades serán generados por este campo.",
+  "anyDesc": "Genera cualquier nombre de ciudad.",
+  "countriesDesc": "Genera nombres de ciudades de los países especificados.",
+  "rowDesc": "Esto señala un campo de región específico en su conjunto de datos que tiene complementos de región como fuente. Genera ciudades que se asignan al valor en ese campo.",
+  "row": "Fila",
+  "country": "país",
+  "countries": "países",
+  "anyCityFrom1Country": "Cualquier ciudad de 1 país",
+  "anyCityFromNCountries": "Cualquier ciudad de %1 países"
+}
diff --git a/packages/plugins/src/dataTypes/City/i18n/fr.json b/packages/plugins/src/dataTypes/City/i18n/fr.json
new file mode 100644
index 000000000..7403958bb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/fr.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "Ville",
+  "DESC": "Affiche une ville au hasard ou, si des données sont disponibles, affiche une ville pour le pays / la région approprié.",
+  "DEFAULT_TITLE": "ville",
+  "selectCities": "Sélectionnez les villes",
+  "regionRow": "Ligne de région",
+  "source": "La source",
+  "anyCity": "N'importe quelle ville",
+  "explanation": "Cela contrôle les noms de villes qui seront générés par ce champ.",
+  "anyDesc": "Génère n'importe quel nom de ville.",
+  "countriesDesc": "Génère des noms de villes à partir des pays spécifiés.",
+  "rowDesc": "Cela identifie un champ de région spécifique dans votre ensemble de données qui a des plugins de région comme source. Il génère des villes qui correspondent à la valeur de ce champ.",
+  "row": "Rangée",
+  "country": "pays",
+  "countries": "des pays",
+  "anyCityFrom1Country": "Cualquier ciudad de 1 país",
+  "anyCityFromNCountries": "Cualquier ciudad de %1 países"
+}
diff --git a/packages/plugins/src/dataTypes/City/i18n/hi.json b/packages/plugins/src/dataTypes/City/i18n/hi.json
new file mode 100644
index 000000000..e65e559f2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/hi.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "शहर",
+  "DESC": "एक यादृच्छिक शहर प्रदर्शित करता है, या यदि डेटा उपलब्ध है, तो उपयुक्त देश/क्षेत्र के लिए एक शहर प्रदर्शित करता है।",
+  "DEFAULT_TITLE": "शहर",
+  "selectCities": "शहरों का चयन करें",
+  "regionRow": "क्षेत्र पंक्ति",
+  "source": "स्रोत",
+  "anyCity": "कोई भी शहर",
+  "explanation": "यह नियंत्रित करता है कि इस क्षेत्र द्वारा कौन से शहर के नाम उत्पन्न किए जाएंगे।",
+  "anyDesc": "किसी भी शहर का नाम उत्पन्न करता है।",
+  "countriesDesc": "निर्दिष्ट देशों से शहर के नाम उत्पन्न करता है।",
+  "rowDesc": "यह आपके डेटा सेट में एक विशिष्ट क्षेत्र फ़ील्ड को इंगित करता है जिसमें इसके स्रोत के रूप में क्षेत्र प्लगइन्स हैं। यह उन शहरों को उत्पन्न करता है जो उस क्षेत्र में मूल्य के लिए मैप करते हैं।",
+  "row": "पंक्ति",
+  "country": "देश",
+  "countries": "देशों",
+  "anyCityFrom1Country": "1 देश का कोई भी शहर",
+  "anyCityFromNCountries": "%1 देशों का कोई भी शहर"
+}
diff --git a/packages/plugins/src/dataTypes/City/i18n/ja.json b/packages/plugins/src/dataTypes/City/i18n/ja.json
new file mode 100644
index 000000000..fd4d2fa53
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/ja.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "市",
+  "DESC": "ランダムな都市を表示します。データが利用可能な場合は、適切な国/地域の都市を表示します。",
+  "DEFAULT_TITLE": "市",
+  "selectCities": "都市を選択",
+  "regionRow": "地域の行",
+  "source": "ソース",
+  "anyCity": "任意の都市",
+  "explanation": "これは、このフィールドによって生成される都市名を制御します。",
+  "anyDesc": "任意の都市名を生成します。",
+  "countriesDesc": "指定された国から都市名を生成します。",
+  "rowDesc": "これにより、リージョンプラグインをソースとして持つデータセット内の特定のリージョンフィールドが特定されます。 そのフィールドの値にマップする都市を生成します。",
+  "row": "行",
+  "country": "国",
+  "countries": "国",
+  "anyCityFrom1Country": "1か国の任意の都市",
+  "anyCityFromNCountries": "%1か国の任意の都市"
+}
diff --git a/packages/plugins/src/dataTypes/City/i18n/nl.json b/packages/plugins/src/dataTypes/City/i18n/nl.json
new file mode 100644
index 000000000..81cfbcca6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/nl.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "Stad",
+  "DESC": "Geeft een willekeurige stad weer, of als gegevens beschikbaar zijn, wordt een stad voor het betreffende land / regio weergegeven.",
+  "DEFAULT_TITLE": "stad",
+  "selectCities": "Selecteer steden",
+  "regionRow": "Regio rij",
+  "source": "Bron",
+  "anyCity": "Elke stad",
+  "explanation": "Dit bepaalt welke stadsnamen door dit veld worden gegenereerd.",
+  "anyDesc": "Genereert een willekeurige plaatsnaam.",
+  "countriesDesc": "Genereert plaatsnamen uit de opgegeven landen.",
+  "rowDesc": "Dit lokaliseert een specifiek regioveld in uw dataset dat regioplug-ins als bron heeft. Het genereert steden die overeenkomen met de waarde in dat veld.",
+  "row": "Rij",
+  "country": "land",
+  "countries": "landen",
+  "anyCityFrom1Country": "Elke stad uit 1 land",
+  "anyCityFromNCountries": "Elke stad uit %1 landen"
+}
diff --git a/packages/plugins/src/dataTypes/City/i18n/pt.json b/packages/plugins/src/dataTypes/City/i18n/pt.json
new file mode 100644
index 000000000..47e9245ef
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/pt.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "Cidade",
+  "DESC": "Exibe uma cidade aleatória ou, se houver dados disponíveis, exibe uma cidade para o país / região apropriado.",
+  "DEFAULT_TITLE": "cidade",
+  "selectCities": "Selecione as cidades",
+  "regionRow": "Linha de região",
+  "source": "Fonte",
+  "anyCity": "Qualquer cidade",
+  "explanation": "Isso controla quais nomes de cidades serão gerados por este campo.",
+  "anyDesc": "Gera qualquer nome de cidade.",
+  "countriesDesc": "Gera nomes de cidades dos países especificados.",
+  "rowDesc": "Isso aponta um campo de região específico em seu conjunto de dados que tem Plugins de região como sua fonte. Ele gera cidades que mapeiam para o valor naquele campo.",
+  "row": "Linha",
+  "country": "país",
+  "countries": "países",
+  "anyCityFrom1Country": "Qualquer cidade de 1 país",
+  "anyCityFromNCountries": "Qualquer cidade de %1 países"
+}
diff --git a/packages/plugins/src/dataTypes/City/i18n/ru.json b/packages/plugins/src/dataTypes/City/i18n/ru.json
new file mode 100644
index 000000000..87894fdf7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/ru.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "Город",
+  "DESC": "Отображает случайный город или, если данные доступны, отображает город для соответствующей страны/региона.",
+  "DEFAULT_TITLE": "город",
+  "selectCities": "Выберите города",
+  "regionRow": "Строка региона",
+  "source": "Источник",
+  "anyCity": "Любой город",
+  "explanation": "Это определяет, какие названия городов будут генерироваться этим полем.",
+  "anyDesc": "Генерирует любое название города.",
+  "countriesDesc": "Генерирует названия городов из указанных стран.",
+  "rowDesc": "Это указывает на конкретное поле «Регион» в вашем наборе данных, источником которого являются «Плагины регионов». Он генерирует города, которые сопоставляются со значением в этом поле.",
+  "row": "Строка",
+  "country": "страна",
+  "countries": "страны",
+  "anyCityFrom1Country": "Любой город из 1 страны",
+  "anyCityFromNCountries": "Любой город из %1 страны"
+}
diff --git a/packages/plugins/src/dataTypes/City/i18n/ta.json b/packages/plugins/src/dataTypes/City/i18n/ta.json
new file mode 100644
index 000000000..fe50e97ca
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/ta.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "நகரம்",
+  "DESC": "ஒரு சீரற்ற நகரத்தைக் காட்டுகிறது, அல்லது தரவு கிடைத்தால், பொருத்தமான நாடு / பிராந்தியத்திற்கு ஒரு நகரத்தைக் காண்பிக்கும்.",
+  "DEFAULT_TITLE": "நகரம்",
+  "selectCities": "நகரங்களைத் தேர்ந்தெடுக்கவும்",
+  "regionRow": "பிராந்திய வரிசை",
+  "source": "மூல",
+  "anyCity": "எந்த நகரமும்",
+  "explanation": "இந்தத் துறையால் எந்த நகரப் பெயர்கள் உருவாக்கப்படும் என்பதை இது கட்டுப்படுத்துகிறது.",
+  "anyDesc": "எந்த நகரப் பெயரையும் உருவாக்குகிறது.",
+  "countriesDesc": "குறிப்பிட்ட நாடுகளிலிருந்து நகரப் பெயர்களை உருவாக்குகிறது.",
+  "rowDesc": "இது உங்கள் தரவுத் தொகுப்பில் பிராந்திய செருகுநிரல்களை அதன் மூலமாகக் கொண்ட ஒரு குறிப்பிட்ட பிராந்திய புலத்தை சுட்டிக்காட்டுகிறது. அந்த துறையில் உள்ள மதிப்பைக் குறிக்கும் நகரங்களை இது உருவாக்குகிறது.",
+  "row": "வரிசை",
+  "country": "நாடு",
+  "countries": "நாடுகள்",
+  "anyCityFrom1Country": "1 நாட்டிலிருந்து எந்த நகரமும்",
+  "anyCityFromNCountries": "%1 நாடுகளைச் சேர்ந்த எந்த நகரமும்"
+}
diff --git a/packages/plugins/src/dataTypes/City/i18n/zh.json b/packages/plugins/src/dataTypes/City/i18n/zh.json
new file mode 100644
index 000000000..03e4dec30
--- /dev/null
+++ b/packages/plugins/src/dataTypes/City/i18n/zh.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "市",
+  "DESC": "显示一个随机的城市，或者如果有数据，则显示相应国家/地区的城市。",
+  "DEFAULT_TITLE": "市",
+  "selectCities": "选择城市",
+  "regionRow": "区域行",
+  "source": "资源",
+  "anyCity": "任何城市",
+  "explanation": "这控制了此字段将生成的城市名称。",
+  "anyDesc": "生成任何城市名称。",
+  "countriesDesc": "从指定国家/地区生成城市名称。",
+  "rowDesc": "这将在数据集中以区域插件为源的特定区域字段中查明。 它生成映射到该字段中的值的城市。",
+  "row": "行",
+  "country": "国家",
+  "countries": "国家",
+  "anyCityFrom1Country": "来自1个国家/地区的任何城市",
+  "anyCityFromNCountries": "来自%1个国家/地区的任何城市"
+}
diff --git a/packages/plugins/src/dataTypes/Colour/Colour.generate.ts b/packages/plugins/src/dataTypes/Colour/Colour.generate.ts
new file mode 100644
index 000000000..6ae6b8155
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/Colour.generate.ts
@@ -0,0 +1,19 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import rc from 'randomcolor';
+import { ColourFormatEnum } from './Colour.state';
+
+export const generate = (data: DTGenerationData): DTGenerateResult => {
+	const { value, luminosity, format, alpha } = data.rowState;
+
+	const display: any = rc({
+		count: 1,
+		hue: value,
+		luminosity: luminosity,
+		format,
+		alpha: format === ColourFormatEnum.rgba ? alpha : 1
+	});
+
+	return {
+		display
+	};
+};
diff --git a/packages/plugins/src/dataTypes/Colour/Colour.scss b/packages/plugins/src/dataTypes/Colour/Colour.scss
new file mode 100644
index 000000000..2a448cd94
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/Colour.scss
@@ -0,0 +1,42 @@
+.demoColours {
+	margin: 0;
+	padding: 0;
+	display: inline-flex;
+	gap: 7px;
+	flex-wrap: wrap;
+	list-style-type: none;
+
+	li {
+		span {
+			width: 40px;
+			height: 40px;
+			display: inline-block;
+			border-radius: 20px;
+		}
+	}
+}
+
+.buttonLabel {
+	margin-top: 4px;
+}
+
+.labelCol {
+	padding-right: 20px;
+}
+
+.settings {
+	margin-bottom: 20px;
+
+	tr {
+		height: 35px;
+
+		td > div {
+			margin-bottom: 0;
+		}
+	}
+}
+
+.colourDropdown {
+	width: 150px;
+	display: inline-block;
+}
diff --git a/packages/plugins/src/dataTypes/Colour/Colour.scss.d.ts b/packages/plugins/src/dataTypes/Colour/Colour.scss.d.ts
new file mode 100644
index 000000000..e1103a602
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/Colour.scss.d.ts
@@ -0,0 +1,16 @@
+declare namespace ColourScssNamespace {
+	export interface IColourScss {
+		buttonLabel: string;
+		colourDropdown: string;
+		demoColours: string;
+		labelCol: string;
+		settings: string;
+	}
+}
+
+declare const ColourScssModule: ColourScssNamespace.IColourScss & {
+	/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+	locals: ColourScssNamespace.IColourScss;
+};
+
+export = ColourScssModule;
diff --git a/packages/plugins/src/dataTypes/Colour/Colour.state.tsx b/packages/plugins/src/dataTypes/Colour/Colour.state.tsx
new file mode 100755
index 000000000..c1f3565ff
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/Colour.state.tsx
@@ -0,0 +1,41 @@
+export const enum ColourFormatEnum {
+	hex = 'hex',
+	rgb = 'rgb',
+	rgba = 'rgba'
+}
+export type ColourFormat = `${ColourFormatEnum}`;
+
+export const enum LuminosityTypeEnum {
+	any = 'any',
+	bright = 'bright',
+	light = 'light',
+	dark = 'dark'
+}
+export type LuminosityType = `${LuminosityTypeEnum}`;
+
+export type ColourState = {
+	example: string;
+	value: string;
+	format: ColourFormat;
+	luminosity: LuminosityType;
+	alpha: number;
+};
+
+export type GenerationOptionsType = {
+	value: string;
+	format: ColourFormat;
+	luminosity?: LuminosityType;
+	alpha?: number;
+};
+
+export const defaultGenerationOptions: ColourState = {
+	example: 'any',
+	value: 'any',
+	luminosity: 'any',
+	format: 'hex',
+	alpha: 1
+};
+
+export const initialState: ColourState = {
+	...defaultGenerationOptions
+};
diff --git a/packages/plugins/src/dataTypes/Colour/Colour.tsx b/packages/plugins/src/dataTypes/Colour/Colour.tsx
new file mode 100755
index 000000000..7e2fba127
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/Colour.tsx
@@ -0,0 +1,226 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import Slider from '@mui/material/Slider';
+import rc from 'randomcolor';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import { Tooltip } from '~components/tooltips';
+import { ColourFormatEnum, ColourState, LuminosityTypeEnum, GenerationOptionsType } from './Colour.state';
+import styles from './Colour.scss';
+
+const getModalOptions = ({ i18n }: any): DropdownOption[] => [
+  { value: 'any', label: i18n.anyColour },
+  { value: 'blue', label: i18n.blues },
+  { value: 'green', label: i18n.greens },
+  { value: 'red', label: i18n.reds },
+  { value: 'orange', label: i18n.oranges },
+  { value: 'yellow', label: i18n.yellows },
+  { value: 'purple', label: i18n.purples },
+  { value: 'pink', label: i18n.pinks },
+  { value: 'monochrome', label: i18n.monochromes }
+];
+
+export const Example = ({ i18n, data, onUpdate }: DTExampleProps) => {
+  const onChange = (value: any): void => {
+    onUpdate({
+      example: value,
+      value: value
+    });
+  };
+
+  return <Dropdown value={data.example} onChange={(i: any): void => onChange(i.value)} options={getModalOptions({ i18n })} />;
+};
+
+const ColourDialog = ({ visible, data, id, onClose, coreI18n, onUpdate, i18n }: any) => {
+  const [randomDemoColours, setRandomDemoColours] = React.useState<string[]>([]);
+  const [counter, setCounter] = React.useState(0);
+
+  React.useEffect(() => {
+    setRandomDemoColours(
+      rc({
+        count: 30,
+        hue: data.value,
+        luminosity: data.luminosity,
+        format: data.format,
+        alpha: data.format === ColourFormatEnum.rgba ? data.alpha : 1
+      })
+    );
+  }, [data, counter]);
+
+  const onChange = (prop: string, value: any): void => {
+    onUpdate({
+      ...data,
+      [prop]: value
+    });
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.configureColours}</DialogTitle>
+        <DialogContent dividers>
+          <table className={styles.settings}>
+            <tbody>
+              <tr>
+                <td className={styles.labelCol}>{i18n.colour}</td>
+                <td>
+                  <Dropdown
+                    value={data.value}
+                    onChange={(i: any): void => onChange('value', i.value)}
+                    options={getModalOptions({ i18n })}
+                  />
+                </td>
+              </tr>
+              <tr>
+                <td className={styles.labelCol}>{i18n.luminosity}</td>
+                <td>
+                  <RadioPillRow>
+                    <RadioPill
+                      label={i18n.any}
+                      onClick={(): void => onChange('luminosity', LuminosityTypeEnum.any)}
+                      name={`luminosity-${id}`}
+                      checked={data.luminosity === LuminosityTypeEnum.any}
+                      style={{ marginRight: 6 }}
+                    />
+                    <RadioPill
+                      label={i18n.bright}
+                      onClick={(): void => onChange('luminosity', LuminosityTypeEnum.bright)}
+                      name={`luminosity-${id}`}
+                      checked={data.luminosity === LuminosityTypeEnum.bright}
+                      style={{ marginRight: 6 }}
+                    />
+                    <RadioPill
+                      label={i18n.light}
+                      onClick={(): void => onChange('luminosity', LuminosityTypeEnum.light)}
+                      name={`luminosity-${id}`}
+                      checked={data.luminosity === LuminosityTypeEnum.light}
+                      style={{ marginRight: 6 }}
+                    />
+                    <RadioPill
+                      label={i18n.dark}
+                      onClick={(): void => onChange('luminosity', LuminosityTypeEnum.dark)}
+                      name={`luminosity-${id}`}
+                      checked={data.luminosity === LuminosityTypeEnum.dark}
+                    />
+                  </RadioPillRow>
+                </td>
+              </tr>
+              <tr>
+                <td className={styles.labelCol}>{i18n.format}</td>
+                <td>
+                  <RadioPillRow>
+                    <RadioPill
+                      label="Hex"
+                      onClick={(): void => onChange('format', ColourFormatEnum.hex)}
+                      name={`format-${id}`}
+                      checked={data.format === ColourFormatEnum.hex}
+                      style={{ marginRight: 6 }}
+                    />
+                    <RadioPill
+                      label="rgb"
+                      onClick={(): void => onChange('format', ColourFormatEnum.rgb)}
+                      name={`format-${id}`}
+                      checked={data.format === ColourFormatEnum.rgb}
+                      style={{ marginRight: 6 }}
+                    />
+                    <RadioPill
+                      label="rbga"
+                      onClick={(): void => onChange('format', ColourFormatEnum.rgba)}
+                      name={`format-${id}`}
+                      checked={data.format === ColourFormatEnum.rgba}
+                    />
+                  </RadioPillRow>
+                </td>
+              </tr>
+              <tr>
+                <td className={styles.labelCol}>{i18n.alpha}</td>
+                <td>
+                  <Slider
+                    value={data.alpha}
+                    onChange={(e: any, value): void => onChange('alpha', value)}
+                    step={0.001}
+                    min={0}
+                    max={1}
+                    valueLabelDisplay="auto"
+                    disabled={data.format !== ColourFormatEnum.rgba}
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+
+          <ul className={styles.demoColours}>
+            {randomDemoColours.map((colour: string, index: number) => (
+              <li key={`${colour}-${index}`}>
+                <Tooltip title={colour}>
+                  <span style={{ backgroundColor: colour }} />
+                </Tooltip>
+              </li>
+            ))}
+          </ul>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={(): void => setCounter(counter + 1)} color="primary" variant="outlined">
+            {i18n.refresh}
+          </Button>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ id, i18n, coreI18n, data, onUpdate }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+
+  const options = getModalOptions({ i18n });
+  let buttonLabel = '';
+
+  options.forEach(({ value, label }) => {
+    if (data.value === value) {
+      buttonLabel = label;
+    }
+  });
+
+  return (
+    <div className={styles.buttonLabel}>
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        <span dangerouslySetInnerHTML={{ __html: buttonLabel }} />
+      </Button>
+      <ColourDialog
+        visible={dialogVisible}
+        data={data}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        onClose={(): void => setDialogVisibility(false)}
+        onUpdate={onUpdate}
+      />
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p>{i18n.helpDesc1}</p>
+    <p>{i18n.helpDesc2}</p>
+  </>
+);
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'string(12) default NULL',
+    field_Oracle: 'varchar2(12) default NULL',
+    field_MSSQL: 'VARCHAR(12) NULL'
+  }
+});
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const rowStateReducer = ({ example, ...other }: ColourState): GenerationOptionsType => other;
diff --git a/packages/plugins/src/dataTypes/Colour/Colour.worker.ts b/packages/plugins/src/dataTypes/Colour/Colour.worker.ts
new file mode 100644
index 000000000..43b51138b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/Colour.worker.ts
@@ -0,0 +1,6 @@
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Colour.generate';
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/dataTypes/Colour/README.md b/packages/plugins/src/dataTypes/Colour/README.md
new file mode 100644
index 000000000..70c180e63
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/README.md
@@ -0,0 +1,201 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Colour
+
+The Colour Data Type generates colours in different formats (hex, rgb, rgba), luminosities (bright, light, dark) and
+alphas. Under the hood it uses the [randomColor package](https://github.com/davidmerfield/randomColor).
+
+## Typings
+
+```typescript
+export const enum ColourFormatEnum {
+	hex = 'hex',
+	rgb = 'rgb',
+	rgba = 'rgba'
+}
+export type ColourFormat = `${ColourFormatEnum}`;
+
+export const enum LuminosityTypeEnum {
+	any = 'any',
+	bright = 'bright',
+	light = 'light',
+	dark = 'dark'
+}
+export type LuminosityType = `${LuminosityTypeEnum}`;
+
+export type ColourState = {
+	example: string;
+	value: string;
+	luminosity: LuminosityType;
+	format: ColourFormat;
+	alpha: number;
+};
+```
+
+Note: `value` maps to the `hue` setting in the [randomColor package](https://github.com/davidmerfield/randomColor). It can
+either be a hex code or one of the predefined constants: `red, orange, yellow, green, blue, purple, pink, monochrome`.
+
+## Examples
+
+When it comes to actually illustrating the colours generated, markdown isn't exacty great! But these examples are here
+anyway, just so you can see how they work.
+
+- [Any random color in hex mode](#any-random-color-in-hex-mode)
+- [Any bright red](#any-bright-red)
+- [Any green with 0.5% alpha in rgba](#any-green-with-05-alpha-in-rgba)
+
+### Any random color in hex mode
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Colour",
+            title: "colour",
+            settings: {
+                value: "",
+                format: "hex"
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "colour": "#fcbebd"
+    },
+    {
+        "colour": "#21d147"
+    },
+    {
+        "colour": "#70e26a"
+    },
+    {
+        "colour": "#bbd852"
+    },
+    {
+        "colour": "#39b513"
+    },
+    {
+        "colour": "#60acc4"
+    },
+    ...
+]
+```
+
+### Any bright red
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Colour",
+            title: "bright-red",
+            settings: {
+                value: "#EE4B2B",
+                format: "hex",
+                luminosity: "bright"
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "bright-red": "#e84c80"
+    },
+    {
+        "bright-red": "#a3033d"
+    },
+    {
+        "bright-red": "#f7270c"
+    },
+    {
+        "bright-red": "#ea697f"
+    },
+    {
+        "bright-red": "#f9653b"
+    },
+    {
+        "bright-red": "#b71a17"
+    },
+    ...
+]
+```
+
+### Any green with 0.5% alpha in RGBA
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Colour",
+            title: "green-with-alpha",
+            settings: {
+                value: "green",
+                format: "rgba",
+                alpha: 0.5
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "green-with-alpha": "rgba(65, 224, 208, 0.5)"
+    },
+    {
+        "green-with-alpha": "rgba(130, 229, 134, 0.5)"
+    },
+    {
+        "green-with-alpha": "rgba(105, 229, 169, 0.5)"
+    },
+    {
+        "green-with-alpha": "rgba(164, 252, 193, 0.5)"
+    },
+    {
+        "green-with-alpha": "rgba(7, 163, 1, 0.5)"
+    },
+    {
+        "green-with-alpha": "rgba(119, 244, 130, 0.5)"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/Colour/__tests__/Colour.test.tsx b/packages/plugins/src/dataTypes/Colour/__tests__/Colour.test.tsx
new file mode 100644
index 000000000..c7a5146e2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/__tests__/Colour.test.tsx
@@ -0,0 +1,19 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../Colour';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	dimensions: { width: 100, height: 100 }
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Colour/bundle.ts b/packages/plugins/src/dataTypes/Colour/bundle.ts
new file mode 100644
index 000000000..4c95982b5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/bundle.ts
@@ -0,0 +1,14 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, getMetadata, rowStateReducer } from './Colour';
+import { initialState } from './Colour.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	getMetadata,
+	rowStateReducer
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Colour/config.ts b/packages/plugins/src/dataTypes/Colour/config.ts
new file mode 100644
index 000000000..1085c8184
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'other',
+  fieldGroupOrder: 50
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/ar.json b/packages/plugins/src/dataTypes/Colour/i18n/ar.json
new file mode 100644
index 000000000..01ce6ef52
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/ar.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "لون",
+  "DESC": "يولد لونًا عشوائيًا بتدرج وتنسيق معينين.",
+  "DEFAULT_TITLE": "لون",
+  "anyColour": "اي لون",
+  "blues": "بلوز",
+  "greens": "الخضر",
+  "reds": "ريدز",
+  "oranges": "البرتقال",
+  "yellows": "يصفر",
+  "purples": "الأرجواني",
+  "pinks": "الوردي",
+  "monochromes": "أحادية اللون",
+  "configureColours": "تكوين الألوان",
+  "colour": "لون",
+  "luminosity": "لمعان",
+  "any": "أي",
+  "bright": "لامع",
+  "light": "ضوء",
+  "dark": "داكن",
+  "format": "صيغة",
+  "alpha": "ألفا",
+  "refresh": "ينعش",
+  "helpDesc1": "يولد نوع البيانات هذا ألوانًا عشوائية بأشكال وتنسيقات مختلفة (Hex و rgb و rgba) وإضاءة. باستخدام rgba ، يمكنك اختيار قيمة ألفا لتوفير ألوان باهتة.",
+  "helpDesc2": "لمشاهدة جميع الإعدادات ، ما عليك سوى النقر فوق الزر الموجود في العمود \"خيارات\"."
+}
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/de.json b/packages/plugins/src/dataTypes/Colour/i18n/de.json
new file mode 100644
index 000000000..5f3a4e538
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/de.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Farbe",
+  "DESC": "Erzeugt eine zufällige Farbe in einem bestimmten Farbton und Format.",
+  "DEFAULT_TITLE": "Farbe",
+  "anyColour": "Jede Farbe",
+  "blues": "Blues",
+  "greens": "Grüne",
+  "reds": "Rote",
+  "oranges": "Orangen",
+  "yellows": "Gelbe",
+  "purples": "Purpur",
+  "pinks": "Rosa",
+  "monochromes": "Monochrome",
+  "configureColours": "Farben konfigurieren",
+  "colour": "Farbe",
+  "luminosity": "Helligkeit",
+  "any": "Irgendein",
+  "bright": "Hell",
+  "light": "Hell",
+  "dark": "Dunkel",
+  "format": "Format",
+  "alpha": "Alpha",
+  "refresh": "Aktualisierung",
+  "helpDesc1": "Dieser Datentyp generiert zufällige Farben in verschiedenen Farbtönen, Formaten (Hex, rgb, rgba) und Helligkeiten. Mit rgba können Sie den Alpha-Wert wählen, um verblasste Farben bereitzustellen.",
+  "helpDesc2": "Um alle Einstellungen anzuzeigen, klicken Sie einfach auf die Schaltfläche in der Spalte Optionen."
+}
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/en.json b/packages/plugins/src/dataTypes/Colour/i18n/en.json
new file mode 100644
index 000000000..28970287d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/en.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Colour",
+  "DESC": "Generates a random colour in a specific hue and format.",
+  "DEFAULT_TITLE": "colour",
+  "anyColour": "Any colour",
+  "blues": "Blues",
+  "greens": "Greens",
+  "reds": "Reds",
+  "oranges": "Oranges",
+  "yellows": "Yellows",
+  "purples": "Purples",
+  "pinks": "Pinks",
+  "monochromes": "Monochromes",
+  "configureColours": "Configure Colours",
+  "colour": "Colour",
+  "luminosity": "Luminosity",
+  "any": "Any",
+  "bright": "Bright",
+  "light": "Light",
+  "dark": "Dark",
+  "format": "Format",
+  "alpha": "Alpha",
+  "refresh": "Refresh",
+  "helpDesc1": "This Data Type generates random colours in different hues, formats (Hex, rgb, rbga) and luminosities. With rgba you can choose the alpha value to provide faded colours.",
+  "helpDesc2": "To see all the settings, just click on the button in the Options column."
+}
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/es.json b/packages/plugins/src/dataTypes/Colour/i18n/es.json
new file mode 100644
index 000000000..b4206a7fd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/es.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Color",
+  "DESC": "Genera un color aleatorio en un tono y formato específicos.",
+  "DEFAULT_TITLE": "color",
+  "anyColour": "Cualquier color",
+  "blues": "Blues",
+  "greens": "Verduras",
+  "reds": "Rojas",
+  "oranges": "Naranjas",
+  "yellows": "Amarillos",
+  "purples": "Morados",
+  "pinks": "Rosas",
+  "monochromes": "Monocromas",
+  "configureColours": "Configurar colores",
+  "colour": "Color",
+  "luminosity": "Luminosidad",
+  "any": "Alguna",
+  "bright": "Brillante",
+  "light": "Ligera",
+  "dark": "Oscura",
+  "format": "Formato",
+  "alpha": "Alfa",
+  "refresh": "Actualizar",
+  "helpDesc1": "TEste tipo de datos genera colores aleatorios en diferentes tonalidades, formatos (Hex, rgb, rgba) y luminosidades. Con rgba puede elegir el valor alfa para proporcionar colores desvaídos.",
+  "helpDesc2": "Para ver todas las configuraciones, simplemente haga clic en el botón en la columna Opciones."
+}
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/fr.json b/packages/plugins/src/dataTypes/Colour/i18n/fr.json
new file mode 100644
index 000000000..743ca074c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/fr.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Couleur",
+  "DESC": "Génère une couleur aléatoire dans une teinte et un format spécifiques.",
+  "DEFAULT_TITLE": "Couleur",
+  "anyColour": "N'importe quelle couleur",
+  "blues": "Bleues",
+  "greens": "Légumes verts",
+  "reds": "rouges",
+  "oranges": "Des oranges",
+  "yellows": "Jaunes",
+  "purples": "Violets",
+  "pinks": "Roses",
+  "monochromes": "Monochromes",
+  "configureColours": "Configurer les couleurs",
+  "colour": "Couleur",
+  "luminosity": "Luminosité",
+  "any": "Toute",
+  "bright": "Brillante",
+  "light": "Légère",
+  "dark": "Sombre",
+  "format": "Format",
+  "alpha": "Alpha",
+  "refresh": "Rafraîchir",
+  "helpDesc1": "Ce type de données génère des couleurs aléatoires dans différentes teintes, formats (Hex, rgb, rgba) et luminosités. Avec rgba, vous pouvez choisir la valeur alpha pour fournir des couleurs fanées.",
+  "helpDesc2": "Pour voir tous les paramètres, cliquez simplement sur le bouton dans la colonne Options."
+}
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/hi.json b/packages/plugins/src/dataTypes/Colour/i18n/hi.json
new file mode 100644
index 000000000..25dadcabf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/hi.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "रंग",
+  "DESC": "एक विशिष्ट रंग और प्रारूप में एक यादृच्छिक रंग उत्पन्न करता है।",
+  "DEFAULT_TITLE": "रंग",
+  "anyColour": "कोई भी रंग",
+  "blues": "ब्लूज़",
+  "greens": "साग",
+  "reds": "रेड्स",
+  "oranges": "संतरे",
+  "yellows": "पीली",
+  "purples": "बैंगनी",
+  "pinks": "गुलाबी",
+  "monochromes": "मोनोक्रोम",
+  "configureColours": "रंग कॉन्फ़िगर करें",
+  "colour": "रंग",
+  "luminosity": "चमक",
+  "any": "कोई भी",
+  "bright": "पूर्व",
+  "light": "रोशनी",
+  "dark": "अंधेरा",
+  "format": "प्रारूप",
+  "alpha": "अल्फा",
+  "refresh": "ताज़ा करना",
+  "helpDesc1": "यह डेटा प्रकार विभिन्न रंगों, स्वरूपों (हेक्स, आरजीबी, आरजीबीए) और चमक में यादृच्छिक रंग उत्पन्न करता है। आरजीबीए के साथ आप फीका रंग प्रदान करने के लिए अल्फा मान चुन सकते हैं।",
+  "helpDesc2": "सभी सेटिंग्स देखने के लिए, बस विकल्प कॉलम में बटन पर क्लिक करें।"
+}
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/ja.json b/packages/plugins/src/dataTypes/Colour/i18n/ja.json
new file mode 100644
index 000000000..8cc6bf6a4
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/ja.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "色",
+  "DESC": "特定の色相と形式でランダムな色を生成します。",
+  "DEFAULT_TITLE": "色",
+  "anyColour": "任意の色",
+  "blues": "ブルース",
+  "greens": "グリーンズ",
+  "reds": "レッズ",
+  "oranges": "オレンジ",
+  "yellows": "黄色",
+  "purples": "パープル",
+  "pinks": "ピンク",
+  "monochromes": "モノクローム",
+  "configureColours": "色を構成する",
+  "colour": "色",
+  "luminosity": "輝度",
+  "any": "どれでも",
+  "bright": "明るい",
+  "light": "光",
+  "dark": "暗い",
+  "format": "フォーマット",
+  "alpha": "アルファ",
+  "refresh": "更新",
+  "helpDesc1": "このデータ型は、さまざまな色相、形式（Hex、rgb、rgba）、および明度でランダムな色を生成します。 rgbaを使用すると、アルファ値を選択して色あせた色を提供できます。",
+  "helpDesc2": "すべての設定を表示するには、[オプション]列のボタンをクリックするだけです。"
+}
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/nl.json b/packages/plugins/src/dataTypes/Colour/i18n/nl.json
new file mode 100644
index 000000000..cddc42bc7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/nl.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Kleur",
+  "DESC": "Genereert een willekeurige kleur in een specifieke tint en formaat.",
+  "DEFAULT_TITLE": "kleur",
+  "anyColour": "Elke kleur",
+  "blues": "Blues",
+  "greens": "Groenen",
+  "reds": "rood",
+  "oranges": "Sinaasappels",
+  "yellows": "geel",
+  "purples": "paars",
+  "pinks": "roze",
+  "monochromes": "Monochromen",
+  "configureColours": "Kleuren configureren",
+  "colour": "Kleur",
+  "luminosity": "Helderheid",
+  "any": "Ieder",
+  "bright": "Helder",
+  "light": "Licht",
+  "dark": "Donker",
+  "format": "Formaat",
+  "alpha": "Alfa",
+  "refresh": "Vernieuwen",
+  "helpDesc1": "Dit gegevenstype genereert willekeurige kleuren in verschillende tinten, formaten (Hex, rgb, rgba) en lichtsterkten. Met rgba kunt u de alpha-waarde kiezen om vervaagde kleuren te geven.",
+  "helpDesc2": "Om alle instellingen te zien, klikt u op de knop in de kolom Opties."
+}
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/pt.json b/packages/plugins/src/dataTypes/Colour/i18n/pt.json
new file mode 100644
index 000000000..2c8495ba9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/pt.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Cor",
+  "DESC": "Gera uma cor aleatória em um matiz e formato específicos.",
+  "DEFAULT_TITLE": "cor",
+  "anyColour": "Qualquer cor",
+  "blues": "Blues",
+  "greens": "Verdes",
+  "reds": "Vermelhas",
+  "oranges": "Laranjas",
+  "yellows": "Amarelas",
+  "purples": "Roxos",
+  "pinks": "Rosa",
+  "monochromes": "Monocromos",
+  "configureColours": "Configurar Cores",
+  "colour": "Cor",
+  "luminosity": "Luminosidade",
+  "any": "Alguma",
+  "bright": "Brilhante",
+  "light": "Luz",
+  "dark": "Escura",
+  "format": "Formato",
+  "alpha": "Alfa",
+  "refresh": "Atualizar",
+  "helpDesc1": "Este tipo de dados gera cores aleatórias em diferentes matizes, formatos (Hex, rgb, rgba) e luminosidades. Com rgba, você pode escolher o valor alfa para fornecer cores esmaecidas.",
+  "helpDesc2": "Para ver todas as configurações, basta clicar no botão na coluna Opções."
+}
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/ru.json b/packages/plugins/src/dataTypes/Colour/i18n/ru.json
new file mode 100644
index 000000000..d479e42b5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/ru.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Цвет",
+  "DESC": "Генерирует случайный цвет определенного оттенка и формата.",
+  "DEFAULT_TITLE": "цвет",
+  "anyColour": "Любой цвет",
+  "blues": "Блюз",
+  "greens": "Зелень",
+  "reds": "Красные",
+  "oranges": "Апельсины",
+  "yellows": "Желтые",
+  "purples": "Пурпурные",
+  "pinks": "Розовые",
+  "monochromes": "Монохромы",
+  "configureColours": "Настройка цветов",
+  "colour": "Цвет",
+  "luminosity": "Светимость",
+  "any": "Любой",
+  "bright": "Яркий",
+  "light": "Легкий",
+  "dark": "Темный",
+  "format": "Формат",
+  "alpha": "Альфа",
+  "refresh": "Обновить",
+  "helpDesc1": "Этот тип данных генерирует случайные цвета различных оттенков, форматов (Hex, rgb, rbga) и яркости. С помощью rgba вы можете выбрать альфа-значение, чтобы получить блеклые цвета.",
+  "helpDesc2": "Чтобы увидеть все настройки, просто нажмите на кнопку в столбце «Параметры»."
+}
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/ta.json b/packages/plugins/src/dataTypes/Colour/i18n/ta.json
new file mode 100644
index 000000000..49671f9dd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/ta.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "நிறம்",
+  "DESC": "ஒரு குறிப்பிட்ட சாயல் மற்றும் வடிவத்தில் ஒரு சீரற்ற நிறத்தை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "நிறம்",
+  "anyColour": "எந்த நிறமும்",
+  "blues": "ப்ளூஸ்",
+  "greens": "கீரைகள்",
+  "reds": "சிவப்பு",
+  "oranges": "ஆரஞ்சு",
+  "yellows": "மஞ்சள்",
+  "purples": "ஊதா",
+  "pinks": "இளஞ்சிவப்பு",
+  "monochromes": "ஒரே வண்ணமுடையவை",
+  "configureColours": "வண்ணங்களை உள்ளமைக்கவும்",
+  "colour": "நிறம்",
+  "luminosity": "ஒளிர்வு",
+  "any": "ஏதேனும்",
+  "bright": "பிரகாசமான",
+  "light": "ஒளி",
+  "dark": "இருள்",
+  "format": "வடிவம்",
+  "alpha": "ஆல்பா",
+  "refresh": "புதுப்பிப்பு",
+  "helpDesc1": "இந்த டேட்டா வகை பல்வேறு நிறங்கள், வடிவங்கள் (ஹெக்ஸ், ஆர்ஜிபி, ஆர்க்பா) மற்றும் ஒளிரும் வகையில் சீரற்ற வண்ணங்களை உருவாக்குகிறது. Rgba உடன் நீங்கள் மங்கலான வண்ணங்களை வழங்க ஆல்பா மதிப்பை தேர்வு செய்யலாம்.",
+  "helpDesc2": "அனைத்து அமைப்புகளையும் காண, விருப்பங்கள் நெடுவரிசையில் உள்ள பொத்தானைக் கிளிக் செய்யவும்."
+}
diff --git a/packages/plugins/src/dataTypes/Colour/i18n/zh.json b/packages/plugins/src/dataTypes/Colour/i18n/zh.json
new file mode 100644
index 000000000..0e67ca496
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Colour/i18n/zh.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "颜色",
+  "DESC": "以特定的色调和格式生成随机颜色。",
+  "DEFAULT_TITLE": "颜色",
+  "anyColour": "任何颜色",
+  "blues": "蓝调",
+  "greens": "青菜",
+  "reds": "红人",
+  "oranges": "橙子",
+  "yellows": "黄种人",
+  "purples": "紫色",
+  "pinks": "粉红色",
+  "monochromes": "单色",
+  "colour": "颜色",
+  "luminosity": "亮度",
+  "any": "任何",
+  "bright": "明亮的",
+  "light": "光",
+  "dark": "黑暗的",
+  "format": "格式",
+  "alpha": "Α",
+  "refresh": "刷新",
+  "helpDesc1": "此数据类型生成不同色调、格式（Hex、rgb、rgba）和亮度的随机颜色。 使用 rgba，您可以选择 alpha 值以提供褪色的颜色。",
+  "helpDesc2": "要查看所有设置，只需单击“选项”列中的按钮。",
+  "configureColours": "配置颜色"
+}
diff --git a/packages/plugins/src/dataTypes/Company/Company.generate.ts b/packages/plugins/src/dataTypes/Company/Company.generate.ts
new file mode 100644
index 000000000..2246f517a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/Company.generate.ts
@@ -0,0 +1,49 @@
+import { WorkerUtils } from '../../';
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+
+let utils: WorkerUtils;
+
+const getWords = (): string[] => {
+  const { words } = utils.stringUtils.getLipsumWords();
+  return words;
+};
+
+const companyTypes = [
+  'Company',
+  'Corp.',
+  'Corporation',
+  'Inc.',
+  'Incorporated',
+  'LLC',
+  'LLP',
+  'Ltd',
+  'Limited',
+  'PC',
+  'Foundation',
+  'Institute',
+  'Associates',
+  'Industries',
+  'Consulting'
+];
+
+const removePunctuation = (arr: string[]): string[] => arr.map((i: string) => i.replace(/[.,:;]/g, ''));
+
+export const generateCompanyName = (wordsArr: string[], types = companyTypes): string => {
+  const numCompanyNameWords = utils.randomUtils.getRandomNum(1, 3);
+  const offset = utils.randomUtils.getRandomNum(0, wordsArr.length - (numCompanyNameWords + 1));
+  const selectedWords = removePunctuation(wordsArr.slice(offset, offset + numCompanyNameWords));
+  const companyType = types[utils.randomUtils.getRandomNum(0, types.length - 1)];
+
+  return utils.stringUtils.uppercaseWords(selectedWords.join(' ')) + ' ' + companyType;
+};
+
+export const setUtils = (workerUtils: WorkerUtils) => (utils = workerUtils);
+
+export const generate = (data: DTGenerationData, workerUtils: WorkerUtils): DTGenerateResult => {
+  setUtils(workerUtils);
+
+  const words = getWords();
+  return {
+    display: generateCompanyName(words)
+  };
+};
diff --git a/packages/plugins/src/dataTypes/Company/Company.state.tsx b/packages/plugins/src/dataTypes/Company/Company.state.tsx
new file mode 100644
index 000000000..e2d9ec4d2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/Company.state.tsx
@@ -0,0 +1,2 @@
+export const defaultGenerationOptions = {};
+export type GenerationOptionsType = {};
diff --git a/packages/plugins/src/dataTypes/Company/Company.tsx b/packages/plugins/src/dataTypes/Company/Company.tsx
new file mode 100644
index 000000000..48a6ccc49
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/Company.tsx
@@ -0,0 +1,12 @@
+import * as React from 'react';
+import { DTHelpProps, DTMetadata } from '~types/dataTypes';
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.DESC}</p>;
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'varchar(255)',
+    field_Oracle: 'varchar2(255)',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/Company/Company.worker.ts b/packages/plugins/src/dataTypes/Company/Company.worker.ts
new file mode 100644
index 000000000..7f0bb2bde
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/Company.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Company.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Company/README.md b/packages/plugins/src/dataTypes/Company/README.md
new file mode 100644
index 000000000..bad21783e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/README.md
@@ -0,0 +1,54 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Company
+
+Generates a random company name. This is a very simple plugin and the same functionality can actually be achieved with 
+the [Custom List](../List) Data Type. But it's a quick convenient way to have all the company names auto-generated with
+no additional configuration.
+
+### Examples
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Company",
+            title: "company-name",
+            settings: {}
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "company-name": "Rutrum LLC"
+    },
+    {
+        "company-name": "Orci Ltd"
+    },
+    {
+        "company-name": "Pede Nonummy Ut LLP"
+    },
+    {
+        "company-name": "Aliquam Adipiscing Foundation"
+    },
+    {
+        "company-name": "Luctus Vulputate Institute"
+    },
+    {
+        "company-name": "Morbi LLC"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/Company/__tests__/Company.generate.test.tsx b/packages/plugins/src/dataTypes/Company/__tests__/Company.generate.test.tsx
new file mode 100644
index 000000000..343964a32
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/__tests__/Company.generate.test.tsx
@@ -0,0 +1,53 @@
+import * as sinon from 'sinon';
+import * as generation from '../Company.generate';
+import utils from '../../../../utils';
+
+const companyTypes = ['Inc.', 'Co.'];
+const words = ['one', 'two', 'three'];
+
+describe('generateCompanyName', () => {
+    beforeAll(() => {
+        generation.setUtils(utils);
+    });
+
+    afterEach(function () {
+        sinon.restore();
+    });
+
+    it('generates a company name', () => {
+        sinon.stub(utils.randomUtils, 'getRandomNum')
+            .onCall(0).returns(1) // number of words
+            .onCall(1).returns(0) // company name words offset
+            .onCall(2).returns(0); // company type
+
+        expect(generation.generateCompanyName(words, companyTypes)).toEqual('One Inc.');
+    });
+
+    it('picks a random company word', () => {
+        sinon.stub(utils.randomUtils, 'getRandomNum')
+            .onCall(0).returns(1) // number of words
+            .onCall(1).returns(1) // company name words offset
+            .onCall(2).returns(0); // company type
+
+        expect(generation.generateCompanyName(words, companyTypes)).toEqual('Two Inc.');
+    });
+
+    it('picks multiple company words', () => {
+        sinon.stub(utils.randomUtils, 'getRandomNum')
+            .onCall(0).returns(3) // number of words
+            .onCall(1).returns(0) // company name words offset
+            .onCall(2).returns(0); // company type
+
+        expect(generation.generateCompanyName(words, companyTypes)).toEqual('One Two Three Inc.');
+    });
+
+    it('picks a random company type', () => {
+        sinon.stub(utils.randomUtils, 'getRandomNum')
+            .onCall(0).returns(1) // number of words
+            .onCall(1).returns(2) // company name words offset
+            .onCall(2).returns(1); // company type
+
+        expect(generation.generateCompanyName(words, companyTypes)).toEqual('Three Co.');
+    });
+});
+
diff --git a/packages/plugins/src/dataTypes/Company/__tests__/Company.ui.test.tsx b/packages/plugins/src/dataTypes/Company/__tests__/Company.ui.test.tsx
new file mode 100644
index 000000000..1a0e02e26
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/__tests__/Company.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../Company';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Company/bundle.ts b/packages/plugins/src/dataTypes/Company/bundle.ts
new file mode 100644
index 000000000..2b949391a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/bundle.ts
@@ -0,0 +1,9 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, getMetadata } from './Company';
+
+const bundle: DTBundle = {
+	Help,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Company/config.ts b/packages/plugins/src/dataTypes/Company/config.ts
new file mode 100644
index 000000000..1ca22fd49
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'humanData',
+  fieldGroupOrder: 60
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Company/i18n/ar.json b/packages/plugins/src/dataTypes/Company/i18n/ar.json
new file mode 100644
index 000000000..0417a6c43
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/ar.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "شركة",
+  "DESC": "يولد اسم شركة عشوائيًا ، يتكون من كلمة lorem ipsum ولاحقة مناسبة ، مثل Dolor Inc. ، أو Convallis Limited.",
+  "DEFAULT_TITLE": "شركة"
+}
diff --git a/packages/plugins/src/dataTypes/Company/i18n/de.json b/packages/plugins/src/dataTypes/Company/i18n/de.json
new file mode 100644
index 000000000..68898a042
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/de.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "Firma",
+  "DESC": "Dieser Datentyp generiert einen zufälligen Name des Unternehmens, einer Lorem ipsum Wort besteht und eine entsprechende Suffix, wie Dolor Inc., oder Convallis Begrenzte.",
+  "DEFAULT_TITLE": "unternehmen"
+}
diff --git a/packages/plugins/src/dataTypes/Company/i18n/en.json b/packages/plugins/src/dataTypes/Company/i18n/en.json
new file mode 100644
index 000000000..7d91f0f03
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/en.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "Company",
+  "DESC": "Generates a random company name, comprised of a lorem ipsum word and an appropriate suffix, like Dolor Inc., or Convallis Limited.",
+  "DEFAULT_TITLE": "company"
+}
diff --git a/packages/plugins/src/dataTypes/Company/i18n/es.json b/packages/plugins/src/dataTypes/Company/i18n/es.json
new file mode 100644
index 000000000..b59a87f5b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/es.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "Empresa",
+  "DESC": "Este tipo de dato genera un nombre de empresa al azar, generado a partir de una palabra lorem ipsum y de un sufijo apropiado como Dolor Inc., o Convallis Limited.",
+  "DEFAULT_TITLE": "empresa"
+}
diff --git a/packages/plugins/src/dataTypes/Company/i18n/fr.json b/packages/plugins/src/dataTypes/Company/i18n/fr.json
new file mode 100644
index 000000000..e7d01a035
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/fr.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "Entreprise",
+  "DESC": "Ce type de données génère un nom d'entreprise aléatoire, composé d'un mot Lorem ipsum et un suffixe, comme Dolor Inc, ou Convallis limitée.",
+  "DEFAULT_TITLE": "compagnie"
+}
diff --git a/packages/plugins/src/dataTypes/Company/i18n/hi.json b/packages/plugins/src/dataTypes/Company/i18n/hi.json
new file mode 100644
index 000000000..1c56f2fe0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/hi.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "कंपनी",
+  "DESC": "एक यादृच्छिक कंपनी नाम उत्पन्न करता है, जिसमें एक लोरेम इप्सम शब्द और एक उपयुक्त प्रत्यय होता है, जैसे डोलर इंक, या कॉन्वलिस लिमिटेड।",
+  "DEFAULT_TITLE": "कंपनी"
+}
diff --git a/packages/plugins/src/dataTypes/Company/i18n/ja.json b/packages/plugins/src/dataTypes/Company/i18n/ja.json
new file mode 100644
index 000000000..08bcdf9cf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/ja.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "会社",
+  "DESC": "Loremipsumの単語と適切な接尾辞で構成されるランダムな会社名を生成します（DolorInc。やConvallisLimitedなど）。",
+  "DEFAULT_TITLE": "会社"
+}
diff --git a/packages/plugins/src/dataTypes/Company/i18n/nl.json b/packages/plugins/src/dataTypes/Company/i18n/nl.json
new file mode 100644
index 000000000..572a618a3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/nl.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "Bedrijfsnaam",
+  "DESC": "Dit gegevenstype genereert een willekeurige bedrijfsnaam, bestaande uit een Lorem ipsum woord en een passend achtervoegsel, zoals bijvoorbeeld Dolor Inc, of Convallis Limited.",
+  "DEFAULT_TITLE": "bedrijf"
+}
diff --git a/packages/plugins/src/dataTypes/Company/i18n/pt.json b/packages/plugins/src/dataTypes/Company/i18n/pt.json
new file mode 100644
index 000000000..8eb6ddf08
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/pt.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "Empresa",
+  "DESC": "Gera um nome de empresa aleatório, composto de uma palavra lorem ipsum e um sufixo apropriado, como Dolor Inc. ou Convallis Limited.",
+  "DEFAULT_TITLE": "empresa"
+}
diff --git a/packages/plugins/src/dataTypes/Company/i18n/ru.json b/packages/plugins/src/dataTypes/Company/i18n/ru.json
new file mode 100644
index 000000000..559f01e4d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/ru.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "Компания",
+  "DESC": "Генерирует случайное название компании, состоящее из слова lorem ipsum и соответствующего суффикса, например, Dolor Inc. или Convallis Limited.",
+  "DEFAULT_TITLE": "Компания"
+}
diff --git a/packages/plugins/src/dataTypes/Company/i18n/ta.json b/packages/plugins/src/dataTypes/Company/i18n/ta.json
new file mode 100644
index 000000000..0c4513736
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/ta.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "நிறுவனம்",
+  "DESC": "ஒரு லோரெம் இப்சம் சொல் மற்றும் டோலர் இன்க், அல்லது கான்வாலிஸ் லிமிடெட் போன்ற பொருத்தமான பின்னொட்டு ஆகியவற்றைக் கொண்ட ஒரு சீரற்ற நிறுவனத்தின் பெயரை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "நிறுவனம்"
+}
diff --git a/packages/plugins/src/dataTypes/Company/i18n/zh.json b/packages/plugins/src/dataTypes/Company/i18n/zh.json
new file mode 100644
index 000000000..06ad6a6e1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Company/i18n/zh.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "公司",
+  "DESC": "生成一个随机的公司名称，该名称由lorem ipsum单词和适当的后缀组成，例如Dolor Inc.或Convallis Limited。",
+  "DEFAULT_TITLE": "公司"
+}
diff --git a/packages/plugins/src/dataTypes/Computed/Computed.generate.ts b/packages/plugins/src/dataTypes/Computed/Computed.generate.ts
new file mode 100644
index 000000000..50aee0f75
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/Computed.generate.ts
@@ -0,0 +1,16 @@
+import { DTGenerateResult, DTGenerationData, DTGenerationExistingRowData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const placeholders: any = {};
+
+  data.existingRowData.forEach((row: DTGenerationExistingRowData) => {
+    placeholders[`ROW${row.colIndex + 1}`] = row.data.display;
+    placeholders[`ROWDATA${row.colIndex + 1}`] = row;
+  });
+  placeholders.ROWNUM = data.rowNum;
+
+  return {
+    display: utils.generalUtils.template(data.rowState.value, placeholders)
+  };
+};
diff --git a/packages/plugins/src/dataTypes/Computed/Computed.scss b/packages/plugins/src/dataTypes/Computed/Computed.scss
new file mode 100644
index 000000000..52b9b2220
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/Computed.scss
@@ -0,0 +1,25 @@
+.row {
+	display: flex;
+	margin-bottom: 15px;
+
+	.col1 {
+		flex: 0 0 160px;
+	}
+	.col2 {
+		flex: 1;
+	}
+
+	label {
+		background-color: #dfecfc;
+		border-radius: 3px;
+		padding: 1px 6px;
+	}
+}
+
+.copyCol {
+	flex: 0 0 26px;
+}
+
+.copy {
+	margin: 4px 0 0 4px;
+}
diff --git a/packages/plugins/src/dataTypes/Computed/Computed.scss.d.ts b/packages/plugins/src/dataTypes/Computed/Computed.scss.d.ts
new file mode 100644
index 000000000..909480aa7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/Computed.scss.d.ts
@@ -0,0 +1,16 @@
+declare namespace ComputedScssNamespace {
+  export interface IComputedScss {
+    col1: string;
+    col2: string;
+    copy: string;
+    copyCol: string;
+    row: string;
+  }
+}
+
+declare const ComputedScssModule: ComputedScssNamespace.IComputedScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: ComputedScssNamespace.IComputedScss;
+};
+
+export = ComputedScssModule;
diff --git a/packages/plugins/src/dataTypes/Computed/Computed.state.tsx b/packages/plugins/src/dataTypes/Computed/Computed.state.tsx
new file mode 100755
index 000000000..959bd9257
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/Computed.state.tsx
@@ -0,0 +1,11 @@
+export type GenerationOptionsType = {
+	value: string;
+};
+
+export const initialState = {
+	value: ''
+};
+
+export const defaultGenerationOptions: GenerationOptionsType = {
+	value: ''
+};
diff --git a/packages/plugins/src/dataTypes/Computed/Computed.tsx b/packages/plugins/src/dataTypes/Computed/Computed.tsx
new file mode 100755
index 000000000..7c2f003b2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/Computed.tsx
@@ -0,0 +1,105 @@
+import * as React from 'react';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import CopyToClipboard from '~components/copyToClipboard/CopyToClipboard';
+import sharedStyles from '../../../styles/shared.scss';
+import styles from './Computed.scss';
+
+const Copy = ({ content, message, tooltip }: any) => (
+  <span className={styles.copy}>
+    <CopyToClipboard tooltip={tooltip} content={content} message={message} />
+  </span>
+);
+
+export const Example = ({ coreI18n }: DTExampleProps) => <div className={sharedStyles.emptyCol}>{coreI18n.seeHelpDialog}</div>;
+
+export const Options = ({ data, onUpdate }: DTOptionsProps) => (
+  <textarea onChange={(e): void => onUpdate({ value: e.target.value })} value={data.value} style={{ width: '100%' }} />
+);
+
+export const Help = ({ coreI18n, i18n }: DTHelpProps) => (
+  <>
+    <p>{i18n.DESC}</p>
+
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>
+          {'{{ROW1}}'}, {'{{ROW2}}'}, ...
+        </label>
+      </div>
+      <div className={styles.copyCol}>
+        <Copy content="{{ROW1}}" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2}>{i18n.rowPlaceholder}</div>
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>{'{{ROWNUM}}'}</label>
+      </div>
+      <div className={styles.copyCol}>
+        <Copy content="{{ROWNUM}}" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2}>{i18n.rowNumPlaceholder}</div>
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>{'{{ROWDATA1}}'}, ...</label>
+      </div>
+      <div className={styles.copyCol}>
+        <Copy content="{{ROWDATA1}}" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2}>
+        {i18n.additionalInfo}
+        <ul>
+          <li>
+            <label>{'{{ROWDATA1.colIndex}}'}</label> - {i18n.colIndex}
+          </li>
+          <li>
+            <label>{'{{ROWDATA1.id}}'}</label> - {i18n.randomUniqueId}
+          </li>
+          <li>
+            <label>{'{{ROWDATA1.dataType}}'}</label> - {i18n.dataType}
+          </li>
+          <li>
+            <label>{'{{ROWDATA1.data}}'}</label> - {i18n.generateDataObj}
+          </li>
+        </ul>
+
+        {i18n.objExpl}
+        <label>{'{{JSON.stringify(ROWDATA1)}}'}</label>
+        <Copy content="{{JSON.stringify(ROWDATA1)}}" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+    </div>
+
+    <p dangerouslySetInnerHTML={{ __html: i18n.compositeHelp3 }} />
+
+    <ul>
+      <li dangerouslySetInnerHTML={{ __html: i18n.compositeHelp4 }} />
+      <li>
+        {i18n.compositeHelp5}
+        <ul>
+          <li>
+            <b>{'{{ROW2-ROW1}}'}</b> - {i18n.compositeSubtraction}
+          </li>
+          <li>
+            <b>{'{{ROW2*ROW1}}'}</b> - {i18n.compositeMultiplication}
+          </li>
+          <li>
+            <b>{'{{ROW2/ROW1}}'}</b> - {i18n.compositeDivision}
+          </li>
+        </ul>
+      </li>
+      <li>
+        {i18n.compositeHelp6}
+        <b>{'{{ROW1 % 2 ? "even" : ROW2}}'}</b>
+      </li>
+    </ul>
+  </>
+);
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'TEXT default NULL',
+    field_Oracle: 'BLOB default NULL',
+    field_MSSQL: 'VARCHAR(MAX) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/Computed/Computed.worker.ts b/packages/plugins/src/dataTypes/Computed/Computed.worker.ts
new file mode 100644
index 000000000..fb14f645e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/Computed.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Computed.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Computed/README.md b/packages/plugins/src/dataTypes/Computed/README.md
new file mode 100644
index 000000000..1f9e61540
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/README.md
@@ -0,0 +1,64 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Computed
+
+This Data Type lets you re-use the content from other generate fields in the row and manipulate that information however
+you need.
+
+
+### Examples
+
+This example generates 2 rows of random numbers, then 2 rows of Composite fields that use the random numbers.
+    
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "NumberRange",
+            "title": "Random Num 1",
+            "settings": {
+                "rangeMin": 1, 
+                "rangeMax": 100
+            }
+        },
+        {
+            "type": "NumberRange",
+            "title": "Random Num 2",
+            "settings": {
+                "rangeMin": 1, 
+                "rangeMax": 100
+            }
+        },
+        {
+            "type": "Composite",
+            "title": "Num 1 + Num 2",
+            "settings": {
+                "placeholder": "{$ROW1+$ROW2}"
+            }
+        },
+        {
+            "type": "Composite",
+            "title": "Display the original nums",
+            "settings": {
+                "placeholder": "Values: {$ROW1}, {$ROW2}"
+            }
+        }
+    ],
+    "export": {
+        "type": "JSON",
+        "settings": {
+            "stripWhitespace": false,
+            "dataStructureFormat": "complex"
+        }
+    }
+}
+```
+
+Notes:
+- This Data Type always outputs strings.
+- The `{$ROW1}` placeholders get switched out with the generated value in the `rows` array. So the first index == `{$ROW1}` 
+ 
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/dataTypes/Computed/__tests__/Computed.ui.test.tsx b/packages/plugins/src/dataTypes/Computed/__tests__/Computed.ui.test.tsx
new file mode 100644
index 000000000..3b487a3d7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/__tests__/Computed.ui.test.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react';
+import { Help, Options } from '../Computed';
+import { initialState } from '../Computed.state';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	gridPanelDimensions: { width: 100, height: 100 },
+	isCountryNamesLoading: false,
+	isCountryNamesLoaded: false,
+	countryNamesMap: null
+};
+
+describe('Options', () => {
+	it('changing the content should call callback', () => {
+		const data = { ...initialState };
+		const onUpdate = jest.fn();
+		const { container } = render(
+			<Options
+				{...defaultProps}
+				data={data}
+				onUpdate={onUpdate}
+			/>
+		);
+		const field = container.querySelector('textarea') as HTMLTextAreaElement;
+		fireEvent.change(field, {
+			target: {
+				value: 'new value!!'
+			}
+		});
+
+		expect(onUpdate).toBeCalledWith({
+			...initialState,
+			value: 'new value!!'
+		});
+	});
+});
+
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Computed/bundle.ts b/packages/plugins/src/dataTypes/Computed/bundle.ts
new file mode 100644
index 000000000..bbfecd845
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/bundle.ts
@@ -0,0 +1,13 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, getMetadata } from './Computed';
+import { initialState } from './Computed.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Computed/config.ts b/packages/plugins/src/dataTypes/Computed/config.ts
new file mode 100644
index 000000000..352b411be
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/config.ts
@@ -0,0 +1,43 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'other',
+  fieldGroupOrder: 20,
+  dependencies: [
+    'Alphanumeric',
+    'AutoIncrement',
+    'Boolean',
+    'City',
+    'Company',
+    'Constant',
+    'Country',
+    'Currency',
+    'CVV',
+    'Date',
+    'Email',
+    'GUID',
+    'IBAN',
+    'LatLng',
+    'List',
+    'Names',
+    'NormalDistribution',
+    'NumberRange',
+    'OrganizationNumber',
+    'PAN',
+    'PersonalNumber',
+    'Phone',
+    'PIN',
+    'PostalZip',
+    'Region',
+    'Rut',
+    'SIRET',
+    'StreetAddress',
+    'TextFixed',
+    'TextRandom',
+    'Track1',
+    'Track2',
+    'WeightedList'
+  ]
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/ar.json b/packages/plugins/src/dataTypes/Computed/i18n/ar.json
new file mode 100644
index 000000000..7dcb714aa
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/ar.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "مركب",
+  "DESC": "يتيح لك نوع البيانات المركبة دمج البيانات من أي صف أو صفوف أخرى ، وتغييرها / دمج المعلومات والمزيد. يستخدم قوالب underscorejs لمحرك القوالب.",
+  "DEFAULT_TITLE": "مركب",
+  "compositeDivision": "قطاع",
+  "compositeHelp3": "وفيما يلي بعض الأمثلة على ذلك:",
+  "compositeHelp4": "عرض قيمة من الصف 6: {{ROW6}}",
+  "compositeHelp5": "بافتراض أن الصفين 1 والصف 2 يحتويان على أرقام عشوائية ، فيما يلي أمثلة لبعض العمليات الحسابية البسيطة:",
+  "compositeHelp6": "إذا كان الصف 1 زوجيًا ، اعرض \"زوجي\" ، وإلا اعرض القيم من الصف 2.",
+  "compositeMultiplication": "عمليه الضرب",
+  "compositeNa": "غير متاح",
+  "compositeSubtraction": "الطرح",
+  "rowPlaceholder": "إخراج القيمة من أي صف آخر في الشبكة",
+  "rowNumPlaceholder": "إخراج رقم الصف الحالي لمجموعة البيانات التي تم إنشاؤها. لذا ، إذا كان في الصف 10000 ، فسيكون له قيمة 10000.",
+  "additionalInfo": "يحتوي على معلومات إضافية حول كل صف.",
+  "colIndex": "فهرس العمود",
+  "randomUniqueId": "معرّف فريد عشوائي للصف",
+  "dataType": "نوع البيانات",
+  "generatedDataObj": "البيانات التي تم إنشاؤها. هذا كائن بخاصية \"عرض\" ، وربما بيانات وصفية إضافية عنه.",
+  "objExpl": "لفحص المحتوى الكامل لهذا الكائن ، استخدم:"
+}
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/de.json b/packages/plugins/src/dataTypes/Computed/i18n/de.json
new file mode 100644
index 000000000..6bcd312e6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/de.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "Berechnet",
+  "DESC": "Mit dem berechneten Datentyp können Sie die Daten aus einer oder mehreren anderen Zeilen kombinieren und die Informationen ändern und kombinieren und vieles mehr. Es verwendet Unterstriche als Vorlagen-Engine.",
+  "DEFAULT_TITLE": "berechnet",
+  "compositeDivision": "Teilung",
+  "compositeHelp3": "Hier einige Beispiele:",
+  "compositeHelp4": "Zeigen Sie einen Wert aus Zeile 6 an: {{ROW6}}",
+  "compositeHelp5": "Angenommen, Zeile 1 und Zeile 2 enthalten Zufallszahlen, sind die folgenden Beispiele für eine einfache Mathematik:",
+  "compositeHelp6": "Wenn Zeile 1 gerade ist, zeigen Sie \"gerade\" an, andernfalls zeigen Sie die Werte aus Zeile 2 an.",
+  "compositeMultiplication": "Multiplikation",
+  "compositeNa": "N / A",
+  "compositeSubtraction": "Subtraktion",
+  "rowPlaceholder": "Gibt den Wert aus einer anderen Zeile im Raster aus",
+  "rowNumPlaceholder": "Gibt die aktuelle Zeilennummer des generierten Datensatzes aus. Wenn es sich also in der 10.000sten Zeile befindet, hat dies einen Wert von 10000.",
+  "additionalInfo": "Enthält zusätzliche Informationen zu jeder Zeile.",
+  "colIndex": "der Spaltenindex",
+  "randomUniqueId": "eine zufällige eindeutige ID für die Zeile",
+  "dataType": "der Datentyp",
+  "generatedDataObj": "die generierten Daten. Dies ist ein Objekt mit einer \"display\" -Eigenschaft und möglicherweise zusätzlichen Metadaten dazu.",
+  "objExpl": "Verwenden Sie Folgendes, um den vollständigen Inhalt dieses Objekts zu überprüfen:"
+}
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/en.json b/packages/plugins/src/dataTypes/Computed/i18n/en.json
new file mode 100644
index 000000000..b30a39f5a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/en.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "Computed",
+  "DESC": "The Computed data type lets you combine the data from any other row or rows, and change it / combine the information and more. It uses underscorejs as the templating engine.",
+  "DEFAULT_TITLE": "computed",
+  "compositeDivision": "division",
+  "compositeHelp3": "Here are a few examples:",
+  "compositeHelp4": "Display a value from row 6: <b>{{ROW6}}</b>",
+  "compositeHelp5": "Assuming row 1 and row 2 contain random numbers, the following are examples of some simple math:",
+  "compositeHelp6": "If row 1 is even, display \"even\", otherwise display the values from row 2.",
+  "compositeMultiplication": "multiplication",
+  "compositeNa": "N/A",
+  "compositeSubtraction": "subtraction",
+  "rowPlaceholder": "Outputs the value from any other row in the grid",
+  "rowNumPlaceholder": "Outputs the current row number of generated data set. So if it's on the 10,000th row, this will have a value of 10000.",
+  "additionalInfo": "Contains additional information about each row.",
+  "colIndex": "the column index",
+  "randomUniqueId": "a random unique ID for the row",
+  "dataType": "the Data Type",
+  "generatedDataObj": "the generated data. This is an object with a `display` property, and perhaps additional metadata about it.",
+  "objExpl": "To examine the full content of this object, use: "
+}
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/es.json b/packages/plugins/src/dataTypes/Computed/i18n/es.json
new file mode 100644
index 000000000..fa326aebf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/es.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "Computada",
+  "DESC": "El tipo de datos Computado le permite combinar los datos de cualquier otra fila o filas, y cambiarlos / combinar la información y más. Utiliza underscorejs como motor de plantillas.",
+  "DEFAULT_TITLE": "computada",
+  "compositeDivision": "división",
+  "compositeHelp3": "Aquí están algunos ejemplos:",
+  "compositeHelp4": "Mostrar un valor de la fila 6: {{ROW6}}",
+  "compositeHelp5": "Suponiendo que la fila 1 y la fila 2 contienen números aleatorios, los siguientes son ejemplos de algunas matemáticas simples:",
+  "compositeHelp6": "Si la fila 1 es par, muestre \"even\"; de lo contrario, muestre los valores de la fila 2.",
+  "compositeMultiplication": "multiplicación",
+  "compositeNa": "N / A",
+  "compositeSubtraction": "sustracción",
+  "rowPlaceholder": "Muestra el valor de cualquier otra fila de la cuadrícula",
+  "rowNumPlaceholder": "Muestra el número de fila actual del conjunto de datos generado. Entonces, si está en la fila 10,000, esto tendrá un valor de 10,000.",
+  "additionalInfo": "Contiene información adicional sobre cada fila.",
+  "colIndex": "el índice de la columna",
+  "randomUniqueId": "un ID único aleatorio para la fila",
+  "dataType": "el tipo de datos",
+  "generatedDataObj": "los datos generados. Este es un objeto con una propiedad `display`, y quizás metadatos adicionales al respecto.",
+  "objExpl": "Para examinar el contenido completo de este objeto, utilice: "
+}
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/fr.json b/packages/plugins/src/dataTypes/Computed/i18n/fr.json
new file mode 100644
index 000000000..6a3d1acea
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/fr.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "Calculé",
+  "DESC": "Le type de données Calculé vous permet de combiner les données de n'importe quelle autre ligne ou lignes, et de les modifier / combiner les informations et plus encore. Il utilise des underscorejs comme moteur de création de modèles.",
+  "DEFAULT_TITLE": "calculé",
+  "compositeDivision": "division",
+  "compositeHelp3": "Voici quelques exemples:",
+  "compositeHelp4": "Afficher une valeur de la ligne 6: {{ROW6}}",
+  "compositeHelp5": "En supposant que la ligne 1 et la ligne 2 contiennent des nombres aléatoires, voici des exemples de mathématiques simples:",
+  "compositeHelp6": "Si la ligne 1 est paire, affichez «pair», sinon affichez les valeurs de la ligne 2.",
+  "compositeMultiplication": "multiplication",
+  "compositeNa": "N / A",
+  "compositeSubtraction": "soustraction",
+  "rowPlaceholder": "Sort la valeur de n'importe quelle autre ligne de la grille",
+  "rowNumPlaceholder": "Renvoie le numéro de ligne actuel de l'ensemble de données généré. Donc, si c'est sur la 10 000e ligne, cela aura une valeur de 10 000.",
+  "additionalInfo": "Contient des informations supplémentaires sur chaque ligne.",
+  "colIndex": "l'index de la colonne",
+  "randomUniqueId": "un ID unique aléatoire pour la ligne",
+  "dataType": "le type de données",
+  "generatedDataObj": "les données générées. Il s'agit d'un objet avec une propriété `display`, et peut-être des métadonnées supplémentaires à son sujet.",
+  "objExpl": "Pour examiner le contenu complet de cet objet, utilisez: "
+}
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/hi.json b/packages/plugins/src/dataTypes/Computed/i18n/hi.json
new file mode 100644
index 000000000..2a36f176f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/hi.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "गणना",
+  "DESC": "परिकलित डेटा प्रकार आपको किसी भी अन्य पंक्ति या पंक्तियों से डेटा को संयोजित करने देता है, और इसे बदल सकता है / जानकारी को जोड़ सकता है और बहुत कुछ। यह टेम्प्लेटिंग इंजन के रूप में अंडरस्कोरज का उपयोग करता है।",
+  "DEFAULT_TITLE": "गणना",
+  "compositeDivision": "विभाजन",
+  "compositeHelp3": "कुछ उदाहरण निम्नलिखित हैं:",
+  "compositeHelp4": "पंक्ति 6 से एक मान प्रदर्शित करें: <b>{{ROW6}}</b>",
+  "compositeHelp5": "मान लें कि पंक्ति 1 और पंक्ति 2 में यादृच्छिक संख्याएँ हैं, कुछ सरल गणित के उदाहरण निम्नलिखित हैं:",
+  "compositeHelp6": "यदि पंक्ति 1 सम है, तो \"सम\" प्रदर्शित करें, अन्यथा पंक्ति 2 से मान प्रदर्शित करें।",
+  "compositeMultiplication": "गुणा",
+  "compositeNa": "एन/ए",
+  "compositeSubtraction": "घटाव",
+  "rowPlaceholder": "ग्रिड में किसी भी अन्य पंक्ति से मान आउटपुट करता है",
+  "rowNumPlaceholder": "उत्पन्न डेटा सेट की वर्तमान पंक्ति संख्या को आउटपुट करता है। तो अगर यह १०,०००वीं पंक्ति पर है, तो इसका मान १००००० होगा।",
+  "additionalInfo": "प्रत्येक पंक्ति के बारे में अतिरिक्त जानकारी शामिल है।",
+  "colIndex": "कॉलम इंडेक्स",
+  "randomUniqueId": "पंक्ति के लिए एक यादृच्छिक अद्वितीय आईडी",
+  "dataType": "डेटा प्रकार",
+  "generatedDataObj": "उत्पन्न डेटा। यह एक 'डिस्प्ले' प्रॉपर्टी वाला ऑब्जेक्ट है, और शायद इसके बारे में अतिरिक्त मेटाडेटा।",
+  "objExpl": "इस वस्तु की पूरी सामग्री की जांच करने के लिए उपयोग करें:"
+}
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/ja.json b/packages/plugins/src/dataTypes/Computed/i18n/ja.json
new file mode 100644
index 000000000..66a87b8c0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/ja.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "計算済み",
+  "DESC": "Computedデータ型を使用すると、他の1つまたは複数の行のデータを組み合わせたり、変更したり、情報を組み合わせたりすることができます。 テンプレートエンジンとしてunderscorejsを使用します。",
+  "DEFAULT_TITLE": "計算済み",
+  "compositeDivision": "分割",
+  "compositeHelp3": "次にいくつかの例を示します。",
+  "compositeHelp4": "Display a value from row 6: {{ROW6}}",
+  "compositeHelp5": "行1と行2に乱数が含まれていると仮定すると、以下はいくつかの簡単な計算の例です。",
+  "compositeHelp6": "行1が偶数の場合は「偶数」を表示し、そうでない場合は行2の値を表示します。",
+  "compositeMultiplication": "乗算",
+  "compositeNa": "該当なし",
+  "compositeSubtraction": "減算",
+  "rowPlaceholder": "グリッド内の他の行から値を出力します",
+  "rowNumPlaceholder": "生成されたデータセットの現在の行番号を出力します。 したがって、10,000行目にある場合、これは10000の値になります。",
+  "additionalInfo": "各行に関する追加情報が含まれています。",
+  "colIndex": "列インデックス",
+  "randomUniqueId": "行のランダムな一意のID",
+  "dataType": "データ型",
+  "generatedDataObj": "生成されたデータ。 これは `display`プロパティを持つオブジェクトであり、おそらくそれに関する追加のメタデータです。",
+  "objExpl": "このオブジェクトの完全なコンテンツを調べるには、次を使用します。"
+}
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/nl.json b/packages/plugins/src/dataTypes/Computed/i18n/nl.json
new file mode 100644
index 000000000..c1e477d7b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/nl.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "Berekend",
+  "DESC": "Met het gegevenstype Berekend kunt u de gegevens van elke andere rij of rijen combineren en deze wijzigen / de informatie combineren en meer. Het gebruikt underscorejs als sjabloonengine.",
+  "DEFAULT_TITLE": "berekend",
+  "compositeDivision": "afdeling",
+  "compositeHelp3": "Hier zijn een paar voorbeelden:",
+  "compositeHelp4": "Geef een waarde weer uit rij 6: {{ROW6}}",
+  "compositeHelp5": "Ervan uitgaande dat rij 1 en rij 2 willekeurige getallen bevatten, zijn de volgende voorbeelden van enkele eenvoudige wiskunde:",
+  "compositeHelp6": "Als rij 1 even is, geeft u \"even\" weer, anders geeft u de waarden van rij 2 weer.",
+  "compositeMultiplication": "vermenigvuldiging",
+  "compositeNa": "Nvt",
+  "compositeSubtraction": "aftrekken",
+  "rowPlaceholder": "Voert de waarde uit van elke andere rij in het raster",
+  "rowNumPlaceholder": "Voert het huidige rijnummer van de gegenereerde gegevensset uit. Dus als het op de 10.000ste rij staat, heeft dit een waarde van 10000.",
+  "additionalInfo": "Bevat aanvullende informatie over elke rij.",
+  "colIndex": "de kolomindex",
+  "randomUniqueId": "een willekeurig uniek ID voor de rij",
+  "dataType": "het gegevenstype",
+  "generatedDataObj": "de gegenereerde gegevens. Dit is een object met een 'display'-eigenschap, en misschien aanvullende metadata erover.",
+  "objExpl": "Gebruik om de volledige inhoud van dit object te bekijken:"
+}
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/pt.json b/packages/plugins/src/dataTypes/Computed/i18n/pt.json
new file mode 100644
index 000000000..451a165bd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/pt.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "Computada",
+  "DESC": "O tipo de dados Computado permite combinar os dados de qualquer outra linha ou linhas e alterá-los / combinar as informações e muito mais. Ele usa o underscorejs como mecanismo de modelagem.",
+  "DEFAULT_TITLE": "computada",
+  "compositeDivision": "divisão",
+  "compositeHelp3": "Aqui estão alguns exemplos:",
+  "compositeHelp4": "Exibir um valor da linha 6: <b>{{ROW6}}</b>",
+  "compositeHelp5": "Supondo que as linhas 1 e 2 contenham números aleatórios, os seguintes são exemplos de matemática simples:",
+  "compositeHelp6": "Se a linha 1 for par, exiba \"par\"; caso contrário, exiba os valores da linha 2.",
+  "compositeMultiplication": "multiplicação",
+  "compositeNa": "N / D",
+  "compositeSubtraction": "subtração",
+  "rowPlaceholder": "Exibe o valor de qualquer outra linha na grade",
+  "rowNumPlaceholder": "Exibe o número da linha atual do conjunto de dados gerado. Portanto, se estiver na linha 10.000, terá um valor de 10.000.",
+  "additionalInfo": "Contém informações adicionais sobre cada linha.",
+  "colIndex": "o índice da coluna",
+  "randomUniqueId": "um ID único aleatório para a linha",
+  "dataType": "o tipo de dados",
+  "generatedDataObj": "os dados gerados. Este é um objeto com uma propriedade `display`, e talvez metadados adicionais sobre ele.",
+  "objExpl": "Para examinar todo o conteúdo deste objeto, use:"
+}
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/ru.json b/packages/plugins/src/dataTypes/Computed/i18n/ru.json
new file mode 100644
index 000000000..072596bb4
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/ru.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "Вычислено",
+  "DESC": "Тип вычисляемых данных позволяет комбинировать данные из любой другой строки или строк, изменять их/комбинировать информацию и многое другое. Он использует underscorejs в качестве шаблонизатора.",
+  "DEFAULT_TITLE": "рассчитанный",
+  "compositeDivision": "разделение",
+  "compositeHelp3": "Вот несколько примеров:",
+  "compositeHelp4": "Показать значение из строки 6: {{ROW6}}",
+  "compositeHelp5": "Предполагая, что строка 1 и строка 2 содержат случайные числа, ниже приведены примеры некоторых простых математических операций:",
+  "compositeHelp6": "Если строка 1 четная, отобразите «четный», в противном случае отобразите значения из строки 2.",
+  "compositeMultiplication": "умножение",
+  "compositeNa": "Н/Д",
+  "compositeSubtraction": "вычитание",
+  "rowPlaceholder": "Выводит значение из любой другой строки в сетке",
+  "rowNumPlaceholder": "Выводит текущий номер строки сгенерированного набора данных. Поэтому, если он находится в 10 000-й строке, это будет иметь значение 10 000.",
+  "additionalInfo": "Содержит дополнительную информацию о каждой строке.",
+  "colIndex": "индекс столбца",
+  "randomUniqueId": "случайный уникальный идентификатор для строки",
+  "dataType": "тип данных",
+  "generatedDataObj": "сгенерированные данные. Это объект со свойством display и, возможно, дополнительными метаданными о нем.",
+  "objExpl": "Чтобы изучить полное содержимое этого объекта, используйте:"
+}
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/ta.json b/packages/plugins/src/dataTypes/Computed/i18n/ta.json
new file mode 100644
index 000000000..c9af53988
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/ta.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "கணக்கிடப்பட்டது",
+  "DESC": "கம்ப்யூட்டட் தரவு வகை வேறு எந்த வரிசை அல்லது வரிசைகளிலிருந்தும் தரவை இணைக்கவும், அதை மாற்றவும் / தகவலை இணைக்கவும் மேலும் பலவற்றை அனுமதிக்கிறது. இது அடிக்கோடிடும் இயந்திரமாக அடிக்கோடிட்டுகளைப் பயன்படுத்துகிறது.",
+  "DEFAULT_TITLE": "கணக்கிடப்பட்டது",
+  "compositeDivision": "பிரிவு",
+  "compositeHelp3": "இங்கே சில எடுத்துக்காட்டுகள்:",
+  "compositeHelp4": "6 வது வரிசையில் இருந்து மதிப்பைக் காண்பி: {{ROW6}}",
+  "compositeHelp5": "வரிசை 1 மற்றும் வரிசை 2 சீரற்ற எண்களைக் கொண்டிருப்பதாகக் கருதினால், பின்வருபவை சில எளிய கணிதத்தின் எடுத்துக்காட்டுகள்:",
+  "compositeHelp6": "வரிசை 1 சமமாக இருந்தால், \"சமமாக\" காண்பி, இல்லையெனில் வரிசை 2 இலிருந்து மதிப்புகளைக் காண்பி.",
+  "compositeMultiplication": "பெருக்கல்",
+  "compositeNa": "ந / அ",
+  "compositeSubtraction": "கழித்தல்",
+  "rowPlaceholder": "கட்டத்தில் உள்ள வேறு எந்த வரிசையிலிருந்தும் மதிப்பை வெளியிடுகிறது",
+  "rowNumPlaceholder": "உருவாக்கப்பட்ட தரவு தொகுப்பின் தற்போதைய வரிசை எண்ணை வெளியிடுகிறது. எனவே இது 10,000 வது வரிசையில் இருந்தால், இதன் மதிப்பு 10000 ஆகும்.",
+  "additionalInfo": "ஒவ்வொரு வரிசையையும் பற்றிய கூடுதல் தகவல்களைக் கொண்டுள்ளது.",
+  "colIndex": "நெடுவரிசை குறியீடு",
+  "randomUniqueId": "வரிசைக்கு ஒரு சீரற்ற தனிப்பட்ட ஐடி",
+  "dataType": "தரவு வகை",
+  "generatedDataObj": "உருவாக்கப்பட்ட தரவு. இது ஒரு `காட்சி` சொத்து, மற்றும் அதைப் பற்றிய கூடுதல் மெட்டாடேட்டா கொண்ட ஒரு பொருள்.",
+  "objExpl": "இந்த பொருளின் முழு உள்ளடக்கத்தையும் ஆராய, இதைப் பயன்படுத்தவும்:"
+}
diff --git a/packages/plugins/src/dataTypes/Computed/i18n/zh.json b/packages/plugins/src/dataTypes/Computed/i18n/zh.json
new file mode 100644
index 000000000..81faa84e1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Computed/i18n/zh.json
@@ -0,0 +1,21 @@
+{
+  "NAME": "已计算",
+  "DESC": "Computed数据类型使您可以合并任何其他行或多行中的数据，并对其进行更改/合并信息等。 它使用underscorejs模板作为模板引擎。",
+  "DEFAULT_TITLE": "已计算",
+  "compositeDivision": "师",
+  "compositeHelp3": "这里有一些例子：",
+  "compositeHelp4": "显示第6行的值：{{ROW6}}",
+  "compositeHelp5": "假设第1行和第2行包含随机数，以下是一些简单数学示例：",
+  "compositeHelp6": "如果第1行是偶数，则显示“偶数”，否则显示第2行的值。",
+  "compositeMultiplication": "乘法",
+  "compositeNa": "不适用",
+  "compositeSubtraction": "减法",
+  "rowPlaceholder": "从网格中的任何其他行输出值",
+  "rowNumPlaceholder": "输出生成的数据集的当前行号。 因此，如果它在第10,000行，则其值为10000。",
+  "additionalInfo": "包含有关每一行的其他信息。",
+  "colIndex": "列索引",
+  "randomUniqueId": "该行的随机唯一ID",
+  "dataType": "数据类型",
+  "generatedDataObj": "生成的数据。 这是一个具有“ display”属性的对象，也许还有其他有关它的元数据。",
+  "objExpl": "要检查此对象的全部内容，请使用："
+}
diff --git a/packages/plugins/src/dataTypes/Constant/Constant.generate.ts b/packages/plugins/src/dataTypes/Constant/Constant.generate.ts
new file mode 100644
index 000000000..0c1534cb7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/Constant.generate.ts
@@ -0,0 +1,24 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+
+export const generate = (data: DTGenerationData): DTGenerateResult => {
+	const rowNum = data.rowNum;
+	const { loopCount, values } = data.rowState;
+	const numValues = values.length;
+
+	let value;
+	if (numValues === 0 || !loopCount) {
+		value = '';
+	} else if (numValues === 1) {
+		value = values[0];
+	} else {
+		let itemIndex = Math.floor((rowNum-1) / loopCount);
+		if (itemIndex > numValues - 1) {
+			itemIndex = (itemIndex % numValues);
+		}
+		value = values[itemIndex];
+	}
+
+	return {
+		display: value
+	};
+};
diff --git a/packages/plugins/src/dataTypes/Constant/Constant.scss b/packages/plugins/src/dataTypes/Constant/Constant.scss
new file mode 100644
index 000000000..ff669ac12
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/Constant.scss
@@ -0,0 +1,13 @@
+.options {
+	label {
+		margin-right: 5px;
+	}
+}
+
+.values {
+	display: flex;
+	align-items: center;
+	&>div {
+		flex: 1;
+	}
+}
diff --git a/packages/plugins/src/dataTypes/Constant/Constant.scss.d.ts b/packages/plugins/src/dataTypes/Constant/Constant.scss.d.ts
new file mode 100644
index 000000000..d4dc88779
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/Constant.scss.d.ts
@@ -0,0 +1,13 @@
+declare namespace ConstantScssNamespace {
+  export interface IConstantScss {
+    options: string;
+    values: string;
+  }
+}
+
+declare const ConstantScssModule: ConstantScssNamespace.IConstantScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: ConstantScssNamespace.IConstantScss;
+};
+
+export = ConstantScssModule;
diff --git a/packages/plugins/src/dataTypes/Constant/Constant.state.tsx b/packages/plugins/src/dataTypes/Constant/Constant.state.tsx
new file mode 100755
index 000000000..023c78cc1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/Constant.state.tsx
@@ -0,0 +1,16 @@
+export type GenerationOptionsType = {
+	loopCount: number;
+	values: any[];
+};
+
+export type ConstantState = {
+	loopCount: number;
+	values: string[];
+};
+
+export const initialState: ConstantState = {
+	loopCount: 2,
+	values: ['1', '2']
+};
+
+export const defaultGenerationOptions = initialState;
diff --git a/packages/plugins/src/dataTypes/Constant/Constant.tsx b/packages/plugins/src/dataTypes/Constant/Constant.tsx
new file mode 100755
index 000000000..0b6062113
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/Constant.tsx
@@ -0,0 +1,101 @@
+import * as React from 'react';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTMetadataType, DTOptionsProps } from '~types/dataTypes';
+import CreatablePillField from '~components/creatablePillField/CreatablePillField';
+import TextField from '~components/TextField';
+import { isBoolean } from '@generatedata/utils/general';
+import { isNumeric } from '@generatedata/utils/number';
+import styles from './Constant.scss';
+import sharedStyles from '../../../styles/shared.scss';
+
+export type GenerationOptionsType = {
+  loopCount: number;
+  values: any[];
+};
+
+export type ConstantState = {
+  loopCount: number;
+  values: string[];
+};
+
+export const initialState: ConstantState = {
+  loopCount: 2,
+  values: ['1', '2']
+};
+
+export const Example = ({ coreI18n }: DTExampleProps) => <div className={sharedStyles.emptyCol}>{coreI18n.seeHelpDialog}</div>;
+
+export const Options = ({ i18n, coreI18n, data, onUpdate }: DTOptionsProps) => {
+  const onChange = (field: string, value: string): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  const loopCountError = data.loopCount ? '' : coreI18n.requiredField;
+  const valuesError = data.values.length ? '' : coreI18n.requiredField;
+
+  return (
+    <div className={styles.options}>
+      <div style={{ marginBottom: 2 }}>
+        <label>{i18n.loopCount}</label>
+        <TextField
+          error={loopCountError}
+          type="number"
+          value={data.loopCount}
+          style={{ width: 50 }}
+          onChange={(e: any): void => onChange('loopCount', e.target.value)}
+        />
+      </div>
+      <div className={styles.values}>
+        <label>{i18n.values}</label>
+        <CreatablePillField
+          error={valuesError}
+          value={data.values}
+          onChange={(values: any): void => onUpdate({ ...data, values })}
+          placeholder={coreI18n.pressEnterAddItem}
+        />
+      </div>
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p>{i18n.help1}</p>
+    <ul>
+      <li>{i18n.help2}</li>
+      <li>{i18n.help3}</li>
+      <li>{i18n.help4}</li>
+    </ul>
+    <p>{i18n.help5}</p>
+  </>
+);
+
+// this assumes validation has already been performed. Perhaps a `valid` flag should be set in the state?
+export const rowStateReducer = ({ loopCount, values }: ConstantState): GenerationOptionsType => ({ loopCount, values });
+
+export const getMetadata = (rowData: ConstantState): DTMetadata => {
+  let dataType: DTMetadataType = 'string';
+  const allNumbers = rowData.values.every(isNumeric);
+  if (allNumbers) {
+    dataType = 'number';
+  } else {
+    const allBoolean = rowData.values.every(isBoolean);
+    if (allBoolean) {
+      dataType = 'boolean';
+    }
+  }
+
+  return {
+    general: {
+      dataType
+    },
+    sql: {
+      field: 'TEXT default NULL',
+      field_Oracle: 'BLOB default NULL',
+      field_MSSQL: 'VARCHAR(MAX) NULL',
+      field_Postgres: 'TEXT NULL'
+    }
+  };
+};
diff --git a/packages/plugins/src/dataTypes/Constant/Constant.worker.ts b/packages/plugins/src/dataTypes/Constant/Constant.worker.ts
new file mode 100644
index 000000000..f4ab79ce8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/Constant.worker.ts
@@ -0,0 +1,13 @@
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Constant.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/dataTypes/Constant/README.md b/packages/plugins/src/dataTypes/Constant/README.md
new file mode 100644
index 000000000..78d616498
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/README.md
@@ -0,0 +1,128 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Constant
+
+This Data Type is an unusual one for the data generator, because the data it generates isn't random at all! It generates
+a constant value (any string / number) for a specified number of rows (`N`), then switches to a different constant for
+the next `N` rows, and so on until it exhausts all the constants you entered, and it repeats. You can control the size
+of `N` and the list of constants to be inserted. See the examples.
+
+## Examples
+
+- [Every odd row gets a "One" value and every even gets a "Two"](#every-odd-row-gets-a-one-value-and-every-even-gets-a-two)
+- [The first 2 rows get "A", the second two rows "B", the third two rows "C", then loops](#the-first-2-rows-get-a-the-second-two-rows-b-the-third-two-rows-c-then-loops)  
+
+
+### Every odd row gets a "One" value and every even gets a "Two"
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Constant",
+            title: "ones-and-twos",
+            settings: {
+                loopCount: 1,
+                values: ["One", "Two"]
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "ones-and-twos": "One"
+    },
+    {
+        "ones-and-twos": "Two"
+    },
+    {
+        "ones-and-twos": "One"
+    },
+    {
+        "ones-and-twos": "Two"
+    },
+    {
+        "ones-and-twos": "One"
+    },
+    {
+        "ones-and-twos": "Two"
+    },
+    ...
+]
+```
+
+### The first 2 rows get "A", the second two rows "B", the third two rows "C", then loops
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Constant",
+            title: "ABCs",
+            settings: {
+                loopCount: 2,
+                values: ["A", "B", "C"]
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+
+Sample output:
+
+```javascript
+[
+    {
+        "ABCs": "A"
+    },
+    {
+        "ABCs": "A"
+    },
+    {
+        "ABCs": "B"
+    },
+    {
+        "ABCs": "B"
+    },
+    {
+        "ABCs": "C"
+    },
+    {
+        "ABCs": "C"
+    },
+    {
+        "ABCs": "A"
+    },
+    {
+        "ABCs": "A"
+    },
+    {
+        "ABCs": "B"
+    },
+    {
+        "ABCs": "B"
+    }
+]
+```
diff --git a/packages/plugins/src/dataTypes/Constant/__tests__/Constant.generate.test.ts b/packages/plugins/src/dataTypes/Constant/__tests__/Constant.generate.test.ts
new file mode 100644
index 000000000..a98d7fd90
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/__tests__/Constant.generate.test.ts
@@ -0,0 +1,91 @@
+import { onmessage } from '../Constant.worker';
+import { getBlankDTGeneratorPayload } from '../../../../../tests/testHelpers';
+
+const testLoop = (rowNum: number, loopCount: number, values: any[], expected: any) => {
+	window.postMessage = jest.fn();
+	window.importScripts = jest.fn();
+
+	const payload: any = {
+		data: {
+			...getBlankDTGeneratorPayload(),
+			rowNum,
+			rowState: {
+				values,
+				loopCount
+			}
+		}
+	};
+
+	onmessage(payload);
+	expect(window.postMessage).toHaveBeenCalledWith({ display: expected });
+};
+
+describe('onmessage', () => {
+	it('generates nothing when there are no values', () => {
+		window.postMessage = jest.fn();
+		window.importScripts = jest.fn();
+
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				rowState: {
+					values: [],
+					loopCount: 5
+				}
+			}
+		};
+
+		onmessage(payload);
+		expect(window.postMessage).toHaveBeenCalledWith({ display: '' });
+	});
+
+	it('generates a single value', () => {
+		window.postMessage = jest.fn();
+		window.importScripts = jest.fn();
+
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				rowState: {
+					values: [4455],
+					loopCount: 1
+				}
+			}
+		};
+
+		onmessage(payload);
+		expect(window.postMessage).toHaveBeenCalledWith({ display: 4455 });
+	});
+
+	it('generates appropriate value with loop count #1', () => {
+		testLoop(1, 1, [111, 222, 333], 111);
+	});
+
+	it('generates appropriate value with loop count #2', () => {
+		testLoop(2, 1, [111, 222, 333], 222);
+	});
+
+	it('generates appropriate value with loop count #2', () => {
+		testLoop(3, 1, [111, 222, 333], 333);
+	});
+
+	it('generates appropriate value with loop count #2', () => {
+		testLoop(4, 1, [111, 222, 333], 111);
+	});
+
+	it('generates appropriate value with loop count > 1 - #1', () => {
+		testLoop(1, 2, [111, 222, 333], 111);
+	});
+
+	it('generates appropriate value with loop count > 1 - #2', () => {
+		testLoop(2, 2, [111, 222, 333], 111);
+	});
+
+	it('generates appropriate value with loop count > 1 - #3', () => {
+		testLoop(3, 2, [111, 222, 333], 222);
+	});
+
+	it('generates appropriate value with loop count > 1 - #4', () => {
+		testLoop(4, 2, [111, 222, 333], 222);
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Constant/__tests__/Constant.test.tsx b/packages/plugins/src/dataTypes/Constant/__tests__/Constant.test.tsx
new file mode 100644
index 000000000..47d7cb211
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/__tests__/Constant.test.tsx
@@ -0,0 +1,42 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Example, Help, Options } from '../Constant';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	data: {},
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	gridPanelDimensions: { width: 100, height: 100 },
+	onUpdate: () => {},
+	isCountryNamesLoading: false,
+	isCountryNamesLoaded: false,
+	countryNamesMap: null
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
+
+describe('Example', () => {
+	it('renders', () => {
+		const { container } = render(<Example {...defaultProps} />);
+		expect(container).toBeTruthy();
+	});
+});
+
+describe('Options', () => {
+	it('renders', () => {
+		const props = { ...defaultProps };
+		props.data = {
+			values: []
+		};
+		const { container } = render(<Options {...props} />);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Constant/bundle.ts b/packages/plugins/src/dataTypes/Constant/bundle.ts
new file mode 100644
index 000000000..54e57a9c1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/bundle.ts
@@ -0,0 +1,14 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, getMetadata, rowStateReducer } from './Constant';
+import { initialState } from './Constant.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	rowStateReducer,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Constant/config.ts b/packages/plugins/src/dataTypes/Constant/config.ts
new file mode 100644
index 000000000..9e2f43b19
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/config.ts
@@ -0,0 +1,9 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'other',
+  fieldGroupOrder: 10,
+  dependencies: []
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/ar.json b/packages/plugins/src/dataTypes/Constant/i18n/ar.json
new file mode 100644
index 000000000..e94600414
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/ar.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "ثابت",
+  "DESC": "يُنشئ عمود بيانات يحتوي على قيم متكررة لصفوف متعددة. يمكنك جعل جميع الصفوف لها نفس القيمة ، أو تعيين نفس القيمة لمجموعات منها.",
+  "DEFAULT_TITLE": "constant",
+  "help1": "يتيح لك نوع البيانات هذا إنشاء عمود بيانات يحتوي على قيم متكررة من صف إلى آخر. إليك بعض الأمثلة لإعطائك فكرة عن كيفية عمل ذلك.",
+  "help2": "إذا كنت ترغب في تقديم القيمة \"1\" لكل صف ، يمكنك إدخال \"1\" في حقل \"القيم\" وأي قيمة (> 0) في حقل \"عدد التكرار\".",
+  "help3": "إذا كنت ترغب في الحصول على 100 صف من السلسلة \"ذكر\" متبوعة بـ 100 صف من السلسلة \"أنثى\" وتكرار ذلك ، يمكنك إدخال \"100\" في حقل \"عدد الحلقات\" و \"ذكر | أنثى\" في القيمة (القيم) ) حقل.",
+  "help4": "إذا كنت تريد 5 صفوف من 1 إلى 10 ، فأدخل \"5\" لحقل Loop Count ، و \"1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10\" في القيمة (القيم) حقل.",
+  "help5": "حاول العبث بها. ستفهم الفكرة.",
+  "loopCount": "عدد الحلقات:",
+  "values": "القيم):",
+  "invalidLoopCounts": "الرجاء إدخال أرقام لحقول عدد الحلقات الثابتة. الرجاء إصلاح الصف (الصفوف) التالية:",
+  "incompleteFields": "يحتاج نوع البيانات الثابت إلى إدخال الثوابت في حقل القيمة (القيم). الرجاء إصلاح الصفوف التالية:"
+}
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/de.json b/packages/plugins/src/dataTypes/Constant/i18n/de.json
new file mode 100644
index 000000000..b4c7c658b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/de.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Konstante",
+  "DESC": "Erzeugt eine Spalte mit Daten, die Werte für mehrere Zeilen wiederholt hat. Sie können machen alle Zeilen den gleichen Wert haben, oder den gleichen Wert auf Gruppen von ihnen zuweisen.",
+  "DEFAULT_TITLE": "konstante",
+  "help1": "Dieser Datentyp können Sie erzeugen eine Spalte von Daten, die sich wiederholende Werte hat sich von Zeile zu Zeile. Hier eine paar Beispiele, um Ihnen eine Vorstellung davon, wie das funktioniert.",
+  "help2": "Wenn Sie möchten, um den Wert \"1\" für jede Zeile, die Sie auf den Wert \"1\" in der Value (s)-Feld und einem Wert (> 0) in der Loop Count Feld.",
+  "help3": "Wenn Sie möchten, dass 100 Zeilen des Strings \"Male\" von 100 Zeilen die Zeichenfolge \"Female\" und wiederholen Sie gefolgt sind, können Sie \"100\" in der Loop Count Feld und \"männlich | weiblich\", in der Value (s) ein.",
+  "help4": "Wenn Sie 5 Reihen von 1 bis 10 möchten, geben Sie \"5\" für die Loop Count Feld, und \"1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10\" in der Wert (e) ein.",
+  "help5": "Versuchen Sie bastelt herum. Sie bekommen die Idee.",
+  "incompleteFields": "The Constant Datentyp muss die Konstanten in den Wert (e) eingegeben werden müssen. Bitte beheben Sie die folgenden Zeilen:",
+  "invalidLoopCounts": "Bitte geben Sie Zahlen für Constant Schleifenzähler Felder. Korrigieren Sie die folgende Zeile (n):",
+  "loopCount": "Loop count:",
+  "values": "Wert (e):"
+}
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/en.json b/packages/plugins/src/dataTypes/Constant/i18n/en.json
new file mode 100644
index 000000000..abc9a6fae
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/en.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Constant",
+  "DESC": "Generates a column of data that has repeated values for multiple rows. You can make all rows have the same value, or assign the same value to groups of them.",
+  "DEFAULT_TITLE": "constant",
+  "help1": "This Data Type lets you generate a column of data that has repeating values from row to row. Here's a couple of examples to give you an idea of how this works.",
+  "help2": "If you'd like to provide the value \"1\" for every row, you can enter \"1\" in the Value(s) field and any value (>0) in the Loop Count field.",
+  "help3": "If you'd like to have 100 rows of the string \"Male\" followed by 100 rows of the string \"Female\" and repeat, you can enter \"100\" in the Loop Count field and \"Male\", \"Female\" in the Value(s) field. To add multiple values in the Value(s) field just enter a string then click enter.",
+  "help4": "If you'd like 5 rows of 1 through 10, enter \"5\" for the Loop Count field, and \"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7\", \"8\", \"9\", and \"10\" in the Value(s) field.",
+  "help5": "Try tinkering around with it. You'll get the idea.",
+  "loopCount": "Loop count:",
+  "values": "Value(s):",
+  "invalidLoopCounts": "Please enter numbers for Constant loop count fields. Please fix the following row(s):",
+  "incompleteFields": "The Constant data type needs to have the constants to be entered into the value(s) field. Please fix the following rows:"
+}
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/es.json b/packages/plugins/src/dataTypes/Constant/i18n/es.json
new file mode 100644
index 000000000..79d4316b7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/es.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Constante",
+  "DESC": "Genera una columna de datos que se ha repetido valores para varias filas. Usted puede hacer todas las filas tienen el mismo valor o asignar el mismo valor a los grupos de ellos .",
+  "DEFAULT_TITLE": "constante",
+  "help1": "Este tipo de dato permite generar una columna de datos que tiene valores repetidos de fila a fila. He aquí un par de ejemplos para darte una idea de cómo funciona.",
+  "help2": "Si quieres proveer el valor \"1\" para cada fila, para cada fila, puedes introducir \"1\" en el campo Valores y cualquier valor (>0) in el campo Contador de bucle.",
+  "help3": "Si quieres tener 100 filas de la cadena \"Hombre\" seguidas por 100 filas de la cadena \"Mujer\" y repetir, puedes introducir \"100\" en el campo de Contador de bucle y \"Hombre|Mujer\" en el campo Valores.",
+  "help4": "Si quieres 5 filas de 1 hasta 10, introduce \"5\" en el campo Contador de bucle y \"1|2|3|4|5|6|7|8|9|10\" en el campo Valores.",
+  "help5": "Prueba a jugar con esto. Te harás una idea.",
+  "loopCount": "Contador del bucle:",
+  "values": "Valores:",
+  "invalidLoopCounts": "Por favor, introduce números en los campos de Constante de contador de bucle. Por favor, arregla las siguientes filas:",
+  "incompleteFields": "Es necesario que el tipo de dato Constante tenga introducidas constantes en el campo Valores. Por favor, corrija las siguientes filas:"
+}
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/fr.json b/packages/plugins/src/dataTypes/Constant/i18n/fr.json
new file mode 100644
index 000000000..6acfe256a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/fr.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Constante",
+  "DESC": "Génère une colonne de données qui a répétées valeurs pour plusieurs lignes. Vous pouvez faire toutes les lignes ont la même valeur , ou affecter la même valeur à des groupes d'entre eux.",
+  "DEFAULT_TITLE": "constant",
+  "help1": "Ce type de données permet de générer une colonne de données qui répète des valeurs de ligne en ligne. Voici une série d'exemples pour vous donner une idée de son fonctionnement.",
+  "help2": "Si vous souhaitez avoir la valeur \"1\" pour chaque ligne, vous devez entrer \"1\" dans le champ 'Valeur' et un nombre (> 0) dans le champ 'Boucles'.",
+  "help3": "Si vous voulez avoir 100 lignes contentant la chaîne \"Homme\" suivi par 100 lignes contentant la chaîne \"Femme\" et répéter cette opération jusqu'à la fin, vous pouvez entrer \"100\" dans le champ 'Valeur' et \"Homme | Femme\", dans le champ 'Boucles'.",
+  "help4": "Si vous souhaitez obtenir 5 rangées de 1 à 10, entrez \"5\" pour le champ 'Boucle', et «1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10» dans le champ 'Valeur'.",
+  "help5": "Essayez de bricoler un peu avec ce type de données, vous comprendrez vite.",
+  "incompleteFields": "Le type de données Constante nécessite un champ 'Valeur' renseigné. Corrigez les lignes suivantes:",
+  "invalidLoopCounts": "Le type de données Constante nécessite un champ 'Boucles' renseigné. Corrigez les lignes suivantes:",
+  "loopCount": "Boucles:",
+  "values": "Valeur:"
+}
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/hi.json b/packages/plugins/src/dataTypes/Constant/i18n/hi.json
new file mode 100644
index 000000000..1d9dbd110
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/hi.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "लगातार",
+  "DESC": "डेटा का एक कॉलम बनाता है जिसमें कई पंक्तियों के लिए बार-बार मान होते हैं। आप सभी पंक्तियों का मान समान बना सकते हैं, या उनके समूहों को समान मान निर्दिष्ट कर सकते हैं।",
+  "DEFAULT_TITLE": "लगातार",
+  "help1": "यह डेटा प्रकार आपको डेटा का एक कॉलम जेनरेट करने देता है जिसमें पंक्ति से पंक्ति में दोहराए जाने वाले मान होते हैं। यह कैसे काम करता है, इसका अंदाजा लगाने के लिए यहां कुछ उदाहरण दिए गए हैं।",
+  "help2": "यदि आप प्रत्येक पंक्ति के लिए \"1\" मान प्रदान करना चाहते हैं, तो आप मान फ़ील्ड में \"1\" और लूप गणना फ़ील्ड में कोई भी मान (>0) दर्ज कर सकते हैं।",
+  "help3": "यदि आप स्ट्रिंग \"पुरुष\" की 100 पंक्तियों के बाद स्ट्रिंग \"महिला\" की 100 पंक्तियों को दोहराना चाहते हैं, तो आप लूप काउंट फ़ील्ड में \"100\" और मान में \"पुरुष\", \"महिला\" दर्ज कर सकते हैं। (एस) क्षेत्र। मान फ़ील्ड में एकाधिक मान जोड़ने के लिए बस एक स्ट्रिंग दर्ज करें और फिर एंटर पर क्लिक करें।",
+  "help4": "यदि आप 1 से 10 तक की 5 पंक्तियाँ चाहते हैं, तो लूप काउंट फ़ील्ड के लिए \"5\" और \"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7\" दर्ज करें। , \"8\", \"9\", और \"10\" मान फ़ील्ड में।",
+  "help5": "इसके साथ छेड़छाड़ करने का प्रयास करें। आपको अंदाजा हो जाएगा।",
+  "loopCount": "लूप गिनती:",
+  "values": "मूल्य (ओं):",
+  "invalidLoopCounts": "कृपया लगातार लूप काउंट फ़ील्ड के लिए नंबर दर्ज करें। कृपया निम्न पंक्ति(पंक्तियों) को ठीक करें:",
+  "incompleteFields": "लगातार डेटा प्रकार को स्थिरांक को मान फ़ील्ड में दर्ज करने की आवश्यकता होती है। कृपया निम्न पंक्तियों को ठीक करें:"
+}
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/ja.json b/packages/plugins/src/dataTypes/Constant/i18n/ja.json
new file mode 100644
index 000000000..5329473ae
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/ja.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "絶え間ない",
+  "DESC": "複数の行に対して値が繰り返されるデータの列を生成します。 すべての行に同じ値を設定することも、それらのグループに同じ値を割り当てることもできます。",
+  "DEFAULT_TITLE": "絶え間ない",
+  "help1": "このデータ型を使用すると、行ごとに値が繰り返されるデータの列を生成できます。 これがどのように機能するかを理解するための例をいくつか示します。",
+  "help2": "すべての行に値「1」を指定する場合は、「値」フィールドに「1」を入力し、「ループカウント」フィールドに任意の値（> 0）を入力できます。",
+  "help3": "100行の文字列「Male」の後に100行の文字列「Female」を繰り返して繰り返したい場合は、「ループカウント」フィールドに「100」を入力し、「値」に「男性|女性」を入力できます。 ）フィールド。",
+  "help4": "1から10までの5行が必要な場合は、[ループカウント]フィールドに「5」を入力し、[値]に「1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10」と入力します。 フィールド。",
+  "help5": "それをいじってみてください。 あなたはその考えを理解するでしょう。",
+  "loopCount": "ループ数：",
+  "values": "値：",
+  "invalidLoopCounts": "定数ループカウントフィールドに数値を入力してください。 次の行を修正してください。",
+  "incompleteFields": "定数データ型には、値フィールドに入力する定数が必要です。 次の行を修正してください。"
+}
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/nl.json b/packages/plugins/src/dataTypes/Constant/i18n/nl.json
new file mode 100644
index 000000000..e24a5b52d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/nl.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Constante",
+  "DESC": "Genereert een kolom die een waarde bevat die voor meerdere rijen hetzelfde is. Alle rijen hebben dezelfde waarde of een (herhalend) blok of groep van rijen heeft dezelfde waarde",
+  "DEFAULT_TITLE": "constante",
+  "help1": "Met dit gegevenstype kunt u een waarde genereren voor een kolom. De waarde kan voor elke rij gelden of voor een herhalend blok van rijen. Hier volgen een aantal voorbeelden om u een idee te geven hoe dit werkt.",
+  "help2": "Als de waarde \"1\" voor elke rij geldt, kunt u \"1\" als opgeven in het Waardenveld en elke waarde (> 0) in de Loopveld.",
+  "help3": "Als u 100 rijen van de string \"Man\", gevolgd door 100 rijen van de string \"Vrouw\" en dat herhalend, kunt u \"100\" in de Loopveld invoeren en \"Man | Vrouw\", in het Waardeveld.",
+  "help4": "Als u 5 rijen van 1 tot en met 10 wilt vullen, voert u \"5\" in het Loopveld in en \"1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10\" in het Waardeveld.",
+  "help5": "Gewoon wat uitproberen als test.",
+  "incompleteFields": "Verplicht om in het Waardeveld een constante in te voeren. Pas AUB de volgende rij(en) aan:",
+  "invalidLoopCounts": "Voer een waaarde (getal) in voor de herhaal Loop. Pas AUB de volgende rij(en) aan:",
+  "loopCount": "Loop getal:",
+  "values": "Waarden:"
+}
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/pt.json b/packages/plugins/src/dataTypes/Constant/i18n/pt.json
new file mode 100644
index 000000000..5ea49af41
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/pt.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Constante",
+  "DESC": "Gera uma coluna de dados que possui valores repetidos para várias linhas. Você pode fazer com que todas as linhas tenham o mesmo valor ou atribuir o mesmo valor a grupos delas.",
+  "DEFAULT_TITLE": "constante",
+  "help1": "Este tipo de dados permite gerar uma coluna de dados com valores repetidos de uma linha para outra. Aqui estão alguns exemplos para dar uma ideia de como isso funciona.",
+  "help2": "Se desejar fornecer o valor \"1\" para cada linha, você pode inserir \"1\" no campo Valor (es) e qualquer valor (> 0) no campo Contagem de loop.",
+  "help3": "Se você gostaria de ter 100 linhas da string \"Masculino\" seguidas por 100 linhas da string \"Fêmea\" e repetir, você pode inserir \"100\" no campo Contagem de Loop e \"Masculino\", \"Feminino\" no Valor (s) campo. Para adicionar vários valores no campo Valor (es), basta inserir uma string e clicar em inserir.",
+  "help4": "Se desejar 5 linhas de 1 a 10, insira \"5\" para o campo Contagem de loops e \"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7\" , \"8\", \"9\" e \"10\" no campo Valor (es).",
+  "help5": "Experimente mexer nele. Você vai pegar a ideia.",
+  "loopCount": "Contagem de loops:",
+  "values": "Valor (es):",
+  "invalidLoopCounts": "Insira números para os campos de contagem de loop constante. Corrija a (s) seguinte (s) linha (s):",
+  "incompleteFields": "O tipo de dados Constante precisa ter constantes a serem inseridas no campo de valor (es). Corrija as seguintes linhas:"
+}
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/ru.json b/packages/plugins/src/dataTypes/Constant/i18n/ru.json
new file mode 100644
index 000000000..7ac2c8a54
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/ru.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Постоянный",
+  "DESC": "Создает столбец данных с повторяющимися значениями для нескольких строк. Вы можете сделать так, чтобы все строки имели одинаковое значение, или присвоить одно и то же значение их группам.",
+  "DEFAULT_TITLE": "постоянный",
+  "help1": "Этот тип данных позволяет создать столбец данных с повторяющимися значениями от строки к строке. Вот несколько примеров, чтобы дать вам представление о том, как это работает.",
+  "help2": "Если вы хотите указать значение «1» для каждой строки, вы можете ввести «1» в поле «Значение» и любое значение (> 0) в поле «Количество циклов».",
+  "help3": "Если вы хотите иметь 100 строк строки «Мужской», за которыми следуют 100 строк строки «Женский» и повторить, вы можете ввести «100» в поле «Количество циклов» и «Мужской», «Женский» в поле «Значение». (с) поле. Чтобы добавить несколько значений в поле «Значение», просто введите строку и нажмите «Ввод».",
+  "help4": "Если вы хотите 5 строк от 1 до 10, введите «5» в поле «Количество циклов» и «1», «2», «3», «4», «5», «6», «7». , «8», «9» и «10» в поле «Значение».",
+  "help5": "Попробуйте с ним повозиться. Вы получите идею.",
+  "loopCount": "Количество циклов:",
+  "values": "Ценности):",
+  "invalidLoopCounts": "Пожалуйста, введите числа в поля счетчика постоянных циклов. Исправьте следующие строки:",
+  "incompleteFields": "Тип данных «Константа» должен иметь константы, которые необходимо ввести в поле значений. Исправьте следующие строки:"
+}
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/ta.json b/packages/plugins/src/dataTypes/Constant/i18n/ta.json
new file mode 100644
index 000000000..9352b587b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/ta.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "நிலையான",
+  "DESC": "பல வரிசைகளுக்கு மீண்டும் மீண்டும் மதிப்புகளைக் கொண்ட தரவின் நெடுவரிசையை உருவாக்குகிறது. எல்லா வரிசைகளையும் ஒரே மதிப்பாக மாற்றலாம் அல்லது அவற்றின் குழுக்களுக்கு ஒரே மதிப்பை ஒதுக்கலாம்.",
+  "DEFAULT_TITLE": "மாறிலி",
+  "help1": "இந்த தரவு வகை, வரிசையிலிருந்து வரிசைக்கு மீண்டும் மீண்டும் மதிப்புகளைக் கொண்ட தரவின் நெடுவரிசையை உருவாக்க உங்களை அனுமதிக்கிறது. இது எவ்வாறு செயல்படுகிறது என்பதற்கான ஒரு யோசனையை உங்களுக்கு வழங்க இரண்டு எடுத்துக்காட்டுகள் இங்கே.",
+  "help2": "ஒவ்வொரு வரிசையிலும் \"1\" மதிப்பை வழங்க விரும்பினால், நீங்கள் மதிப்பு (கள்) புலத்தில் \"1\" ஐயும், லூப் கவுண்ட் புலத்தில் எந்த மதிப்பையும் (> 0) உள்ளிடலாம்.",
+  "help3": "\"ஆண்\" என்ற சரத்தின் 100 வரிசைகளைத் தொடர்ந்து \"பெண்\" என்ற சரத்தின் 100 வரிசைகள் மற்றும் மீண்டும் செய்ய விரும்பினால், நீங்கள் லூப் கவுன்ட் புலத்தில் \"100\" ஐயும், மதிப்பில் \"ஆண் | பெண்\" ஐ உள்ளிடலாம். ) புலம்.",
+  "help4": "1 முதல் 10 வரையிலான 5 வரிசைகளை நீங்கள் விரும்பினால், லூப் கவுன்ட் புலத்திற்கு \"5\" ஐயும், மதிப்பு (களில்) இல் \"1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10\" ஐ உள்ளிடவும் புலம்.",
+  "help5": "அதைச் சுற்றிலும் முயற்சிக்கவும். நீங்கள் யோசனை பெறுவீர்கள்.",
+  "loopCount": "சுழற்சியின் எண்ணிக்கை:",
+  "values": "மதிப்பு (கள்):",
+  "invalidLoopCounts": "நிலையான வளைய எண்ணிக்கை புலங்களுக்கு எண்களை உள்ளிடவும். பின்வரும் வரிசை (களை) சரிசெய்யவும்:",
+  "incompleteFields": "நிலையான தரவு வகைக்கு மதிப்பு (கள்) புலத்தில் நுழைய மாறிலிகள் இருக்க வேண்டும். பின்வரும் வரிசைகளை சரிசெய்யவும்:"
+}
diff --git a/packages/plugins/src/dataTypes/Constant/i18n/zh.json b/packages/plugins/src/dataTypes/Constant/i18n/zh.json
new file mode 100644
index 000000000..e5c31c559
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Constant/i18n/zh.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "不变",
+  "DESC": "生成一列具有多个行重复值的数据。 您可以使所有行具有相同的值，或将相同的值分配给它们的组。",
+  "DEFAULT_TITLE": "不变",
+  "help1": "通过此数据类型，您可以生成一列数据，每一列都有重复的值。 以下是一些示例，可让您大致了解其工作原理。",
+  "help2": "如果要为每行提供值“ 1”，则可以在“值”字段中输入“ 1”，并在“循环计数”字段中输入任何值（> 0）。",
+  "help3": "如果您希望字符串“ Male”具有100行，然后字符串“ Female”具有100行并重复，则可以在“循环计数”字段中输入“ 100”，在“值”中输入“ Male | Female” ）字段。",
+  "help4": "如果要从1到10排5排，请在“循环计数”字段中输入“ 5”，并在“值”中输入“ 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10” 领域。",
+  "help5": "尝试修改它。 您会明白的。",
+  "loopCount": "循环计数：",
+  "values": "值：",
+  "invalidLoopCounts": "请为“恒定循环计数”字段输入数字。 请修复以下行：",
+  "incompleteFields": "常量数据类型需要具有要在值字段中输入的常量。 请修复以下行："
+}
diff --git a/packages/plugins/src/dataTypes/Country/Country.generate.ts b/packages/plugins/src/dataTypes/Country/Country.generate.ts
new file mode 100644
index 000000000..654dcfa54
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/Country.generate.ts
@@ -0,0 +1,28 @@
+import fullCountryList from './fullCountryList';
+import { countryList } from '../../../../_plugins';
+import { CountryState } from './Country.state';
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { CountryType } from '~types/countries';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { rowState, countryData } = data;
+  const { source, selectedCountries } = rowState as CountryState;
+
+  const hasFilteredCountryList = selectedCountries && selectedCountries.length > 0;
+
+  if (source === 'all') {
+    return {
+      display: utils.randomUtils.getRandomArrayValue(hasFilteredCountryList ? selectedCountries : fullCountryList)
+    };
+  } else {
+    const randomCountry = utils.randomUtils.getRandomArrayValue(hasFilteredCountryList ? selectedCountries : countryList) as CountryType;
+    const randomCountryData = countryData[randomCountry];
+
+    return {
+      display: randomCountryData.countryName,
+      slug: randomCountryData.countrySlug,
+      countryDataType: randomCountry
+    };
+  }
+};
diff --git a/packages/plugins/src/dataTypes/Country/Country.scss b/packages/plugins/src/dataTypes/Country/Country.scss
new file mode 100644
index 000000000..a013c6a46
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/Country.scss
@@ -0,0 +1,3 @@
+.buttonLabel {
+	margin-top: 4px;
+}
diff --git a/packages/plugins/src/dataTypes/Country/Country.scss.d.ts b/packages/plugins/src/dataTypes/Country/Country.scss.d.ts
new file mode 100644
index 000000000..e84541b34
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/Country.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace CountryScssNamespace {
+  export interface ICountryScss {
+    buttonLabel: string;
+  }
+}
+
+declare const CountryScssModule: CountryScssNamespace.ICountryScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: CountryScssNamespace.ICountryScss;
+};
+
+export = CountryScssModule;
diff --git a/packages/plugins/src/dataTypes/Country/Country.state.tsx b/packages/plugins/src/dataTypes/Country/Country.state.tsx
new file mode 100755
index 000000000..2411523d1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/Country.state.tsx
@@ -0,0 +1,26 @@
+import { CountryType } from '../../';
+
+export type CountrySource = 'plugins' | 'all';
+
+export type CountryState = {
+  source: CountrySource;
+  selectedCountries: CountryType[];
+};
+
+export type CountryStateAll = {
+  source: 'all';
+};
+
+export type CountryStatePlugins = {
+  source: 'plugins';
+  selectedCountries: CountryType[];
+};
+
+export type GenerationOptionsType = CountryStateAll | CountryStatePlugins;
+
+export const initialState: CountryState = {
+  source: 'plugins',
+  selectedCountries: []
+};
+
+export const defaultGenerationOptions = initialState;
diff --git a/packages/plugins/src/dataTypes/Country/Country.tsx b/packages/plugins/src/dataTypes/Country/Country.tsx
new file mode 100755
index 000000000..040ae0a9a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/Country.tsx
@@ -0,0 +1,139 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import fullCountryList from './fullCountryList';
+import { countryList } from '../../../../_plugins';
+import styles from './Country.scss';
+import { CountrySource } from './Country.state';
+import { CountryType } from '~types/countries';
+
+const fullCountryListOptions = fullCountryList.map((countryName) => ({
+  value: countryName,
+  label: countryName
+}));
+
+const CountryDialog = ({ visible, data, id, onClose, countryI18n, onUpdateSource, onUpdateSelectedCountries, coreI18n, i18n }: any) => {
+  const countryPluginOptions = countryList.map((countryName: CountryType) => ({
+    value: countryName,
+    label: countryI18n[countryName]?.countryName // `?` is for testing right now
+  }));
+
+  const onSelectCountries = (countries: any): void => {
+    onUpdateSelectedCountries(countries ? countries.map(({ value }: DropdownOption) => value) : []);
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.selectCountries}</DialogTitle>
+        <DialogContent dividers>
+          <div>{i18n.explanation}</div>
+
+          <h3>{i18n.source}</h3>
+
+          <RadioPillRow>
+            <RadioPill
+              label={`${i18n.countryPlugins} (${countryList.length})`}
+              onClick={(): void => onUpdateSource('plugins')}
+              name={`${id}-source`}
+              checked={data.source === 'plugins'}
+              tooltip={i18n.countryPluginsDesc}
+            />
+            <RadioPill
+              label={`${i18n.allCountries} (${fullCountryList.length})`}
+              onClick={(): void => onUpdateSource('all')}
+              name={`${id}-source`}
+              checked={data.source === 'all'}
+            />
+          </RadioPillRow>
+
+          <h3>{i18n.filter}</h3>
+          <p>{i18n.filterDesc}</p>
+
+          <Dropdown
+            isMulti
+            closeMenuOnSelect={false}
+            isClearable={true}
+            value={data.selectedCountries}
+            onChange={onSelectCountries}
+            options={data.source === 'all' ? fullCountryListOptions : countryPluginOptions}
+          />
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ i18n, coreI18n, countryI18n, id, data, onUpdate }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+  const numSelected = data.selectedCountries.length;
+
+  const onUpdateSource = (source: CountrySource): void => {
+    onUpdate({
+      source,
+      selectedCountries: []
+    });
+  };
+
+  const onUpdateSelectedCountries = (selectedCountries: string[]): void => {
+    onUpdate({
+      ...data,
+      selectedCountries
+    });
+  };
+
+  let label = '';
+  if (data.source === 'all') {
+    if (data.selectedCountries.length) {
+      label = `<b>${numSelected}</b> ` + (numSelected === 1 ? i18n.country : i18n.countries);
+    } else {
+      label = i18n.allCountries;
+    }
+  } else {
+    if (data.selectedCountries.length) {
+      label = `<b>${numSelected}</b> ` + (numSelected === 1 ? i18n.countryPlugin : i18n.countryPlugins);
+    } else {
+      label = i18n.allCountryPlugins;
+    }
+  }
+
+  return (
+    <div className={styles.buttonLabel}>
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        <span dangerouslySetInnerHTML={{ __html: label }} />
+      </Button>
+      <CountryDialog
+        visible={dialogVisible}
+        data={data}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        countryI18n={countryI18n}
+        onUpdateSource={onUpdateSource}
+        onUpdateSelectedCountries={onUpdateSelectedCountries}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </div>
+  );
+};
+
+export const Help = ({}: DTHelpProps) => <div />;
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'varchar(100) default NULL',
+    field_Oracle: 'varchar2(100) default NULL',
+    field_MSSQL: 'VARCHAR(100) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/Country/Country.worker.ts b/packages/plugins/src/dataTypes/Country/Country.worker.ts
new file mode 100644
index 000000000..b02a01355
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/Country.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { generate } from './Country.generate';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Country/README.md b/packages/plugins/src/dataTypes/Country/README.md
new file mode 100644
index 000000000..97492c6a4
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/README.md
@@ -0,0 +1,101 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Country
+
+This Data Type generates a random country name. It can be used in two ways:
+1. Generates a random country name from the ~250 countries in the world. 
+2. Generates a random country name from the list of Country plugins (~35 countries). 
+ 
+_Wait, why would you choose the plugin option? It has way fewer countries!_
+
+The Country plugins provide a much richer set of data for use by the Data Generator. Each plugin contains regions, cities, 
+postal/zip formats and phone numbers - anything specific to the country. These let you tie multiple rows together in your 
+data set, like `Country`, `Region` and `City`: it ensures that the data looks realistic for a single row of data, i.e. 
+a random city name is within a random region within the randomly selected country. 
+
+## Examples
+
+This generates three rows of data:
+1. Any country from the full list of ~250 countries in the world.
+2. Any country from the full list of plugins (pass empty array for `selectedCountries`)
+3. One of the selected country plugins (Canada, Nigeria, Spain, Norway)
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Country",
+            title: "any-country",
+            settings: {
+                source: "all"
+            }
+        },
+        {
+            plugin: "Country",
+            title: "country-plugin",
+            settings: {
+                source: "plugins",
+                selectedCountries: []
+            }
+        },
+        {
+            plugin: "Country",
+            title: "country-plugin",
+            settings: {
+                source: "plugins",
+                selectedCountries: [
+                    "Canada",
+                    "Nigeria",
+                    "Spain",
+                    "Norway"
+                ]
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "any-country": "Armenia",
+        "country-plugin": "Germany",
+        "country-plugins-subset": "Norway"
+    },
+    {
+        "any-country": "Argentina",
+        "country-plugin": "Colombia",
+        "country-plugins-subset": "Norway"
+    },
+    {
+        "any-country": "Micronesia",
+        "country-plugin": "Poland",
+        "country-plugins-subset": "Nigeria"
+    },
+    {
+        "any-country": "Estonia",
+        "country-plugin": "Costa Rica",
+        "country-plugins-subset": "Spain"
+    },
+    {
+        "any-country": "Mongolia",
+        "country-plugin": "Ireland",
+        "country-plugins-subset": "Spain"
+    },
+    {
+        "any-country": "Bouvet Island",
+        "country-plugin": "Australia",
+        "country-plugins-subset": "Canada"
+    },
+    ...
+}
+```
diff --git a/packages/plugins/src/dataTypes/Country/__tests__/Country.generate.test.ts b/packages/plugins/src/dataTypes/Country/__tests__/Country.generate.test.ts
new file mode 100644
index 000000000..c76987079
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/__tests__/Country.generate.test.ts
@@ -0,0 +1,64 @@
+import sinon from 'sinon';
+import utils from '../../../../utils';
+import { onmessage } from '../Country.worker';
+import { getBlankDTGeneratorPayload } from '../../../../../tests/testHelpers';
+
+const i18n = require('../i18n/en.json');
+
+describe('onmessage', () => {
+	afterEach(function () {
+		sinon.restore();
+	});
+
+	it('generates random data from all sources', () => {
+		window.postMessage = jest.fn();
+		window.importScripts = jest.fn();
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				rowState: {
+					source: 'all',
+					selectedCountries: []
+				},
+				i18n
+			}
+		};
+
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue').returns('Zimbabwe');
+
+		onmessage(payload);
+		expect(postMessage).toHaveBeenCalledWith({ display: 'Zimbabwe' });
+	});
+
+	it('generates random data from list of plugins', () => {
+		window.postMessage = jest.fn();
+		window.importScripts = jest.fn();
+
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				rowState: {
+					source: 'plugins',
+					selectedCountries: ['Canada']
+				},
+				countryData: {
+					Canada: {
+						countryName: 'Canada',
+						countrySlug: 'CA'
+					}
+				},
+				i18n
+			}
+		};
+
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue').returns('Canada');
+
+		onmessage(payload);
+		expect(postMessage).toHaveBeenCalledWith({
+			display: 'Canada',
+			countryDataType: 'Canada',
+			slug: 'CA'
+		});
+	});
+
+});
diff --git a/packages/plugins/src/dataTypes/Country/__tests__/Country.test.tsx b/packages/plugins/src/dataTypes/Country/__tests__/Country.test.tsx
new file mode 100644
index 000000000..54a01bbd7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/__tests__/Country.test.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Help, Options } from '../Country';
+import { initialState } from '../Country.state';
+
+const i18n = require('../i18n/en.json');
+
+const helpProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+const optionsProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	gridPanelDimensions: { width: 100, height: 100 },
+	isCountryNamesLoading: false,
+	isCountryNamesLoaded: false,
+	countryNamesMap: null
+};
+
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...helpProps} />);
+		expect(container).toBeTruthy();
+	});
+});
+
+describe('Options', () => {
+	it('renders', () => {
+		const data = { ...initialState };
+		const onUpdate = jest.fn();
+
+		const { container } = render(
+			<Options
+				{...optionsProps}
+				data={data}
+				onUpdate={onUpdate}
+				regionRows={[]}
+			/>
+		);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Country/bundle.ts b/packages/plugins/src/dataTypes/Country/bundle.ts
new file mode 100644
index 000000000..04bc19ac6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/bundle.ts
@@ -0,0 +1,11 @@
+import { DTBundle } from '~types/dataTypes';
+import { Options, getMetadata } from './Country';
+import { initialState } from './Country.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Options,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Country/config.ts b/packages/plugins/src/dataTypes/Country/config.ts
new file mode 100644
index 000000000..99628deb5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'geo',
+  fieldGroupOrder: 50
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Country/fullCountryList.ts b/packages/plugins/src/dataTypes/Country/fullCountryList.ts
new file mode 100644
index 000000000..0ce20eb64
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/fullCountryList.ts
@@ -0,0 +1,37 @@
+// hmmm... pull this from country-region-data repo?
+export default [
+	'Afghanistan', 'Åland Islands', 'Albania', 'Algeria', 'American Samoa', 'Andorra',
+	'Angola', 'Anguilla', 'Antarctica', 'Antigua and Barbuda', 'Argentina', 'Armenia', 'Aruba', 'Australia',
+	'Austria', 'Azerbaijan', 'Bahamas', 'Bahrain', 'Bangladesh', 'Barbados', 'Belarus', 'Belgium', 'Belize', 'Benin',
+	'Bermuda', 'Bhutan', 'Bolivia', 'Bonaire, Sint Eustatius and Saba', 'Bosnia and Herzegovina', 'Botswana',
+	'Bouvet Island', 'Brazil', 'British Indian Ocean Territory', 'Brunei', 'Bulgaria', 'Burkina Faso', 'Burundi',
+	'Cambodia', 'Cameroon', 'Canada', 'Cape Verde', 'Cayman Islands', 'Central African Republic', 'Chad', 'Chile',
+	'China', 'Christmas Island', 'Cocos (Keeling) Islands', 'Colombia', 'Comoros', 'Congo (Brazzaville)',
+	'Congo, the Democratic Republic of the', 'Cook Islands', 'Costa Rica', 'Côte D\'Ivoire (Ivory Coast)', 'Croatia',
+	'Cuba', 'Curaçao', 'Cyprus', 'Czech Republic', 'Denmark', 'Djibouti', 'Dominica', 'Dominican Republic',
+	'Ecuador', 'Egypt', 'El Salvador', 'Equatorial Guinea', 'Eritrea', 'Estonia', 'Ethiopia', 'Falkland Islands',
+	'Faroe Islands', 'Fiji', 'Finland', 'France', 'French Guiana', 'French Polynesia', 'French Southern Territories',
+	'Gabon', 'Gambia', 'Georgia', 'Germany', 'Ghana', 'Gibraltar', 'Greece', 'Greenland', 'Grenada', 'Guadeloupe',
+	'Guam', 'Guatemala', 'Guernsey', 'Guinea', 'Guinea-Bissau', 'Guyana', 'Haiti', 'Heard Island and Mcdonald Islands',
+	'Holy See (Vatican City State)', 'Honduras', 'Hong Kong', 'Hungary', 'Iceland', 'India', 'Indonesia',
+	'Iran', 'Iraq', 'Ireland', 'Isle of Man', 'Israel', 'Italy', 'Jamaica', 'Japan', 'Jersey', 'Jordan', 'Kazakhstan',
+	'Kenya', 'Kiribati', 'Korea, North', 'Korea, South', 'Kuwait', 'Kyrgyzstan', 'Laos', 'Latvia', 'Lebanon',
+	'Lesotho', 'Liberia', 'Libya', 'Liechtenstein', 'Lithuania', 'Luxembourg', 'Macao', 'Macedonia', 'Madagascar',
+	'Malawi', 'Malaysia', 'Maldives', 'Mali', 'Malta', 'Marshall Islands', 'Martinique', 'Mauritania', 'Mauritius',
+	'Mayotte', 'Mexico', 'Micronesia', 'Moldova', 'Monaco', 'Mongolia', 'Montenegro', 'Montserrat', 'Morocco',
+	'Mozambique', 'Myanmar', 'Namibia', 'Nauru', 'Nepal', 'Netherlands', 'New Caledonia', 'New Zealand', 'Nicaragua',
+	'Niger', 'Nigeria', 'Niue', 'Norfolk Island', 'Northern Mariana Islands', 'Norway', 'Oman', 'Pakistan', 'Palau',
+	'Palestine, State of', 'Panama', 'Papua New Guinea', 'Paraguay', 'Peru', 'Philippines', 'Pitcairn Islands',
+	'Poland', 'Portugal', 'Puerto Rico', 'Qatar', 'Reunion', 'Romania', 'Russian Federation', 'Rwanda',
+	'Saint Barthélemy', 'Saint Helena, Ascension and Tristan da Cunha', 'Saint Kitts and Nevis', 'Saint Lucia',
+	'Saint Martin', 'Saint Pierre and Miquelon', 'Saint Vincent and The Grenadines', 'Samoa', 'San Marino',
+	'Sao Tome and Principe', 'Saudi Arabia', 'Senegal', 'Serbia', 'Seychelles', 'Sierra Leone', 'Singapore',
+	'Sint Maarten', 'Slovakia', 'Slovenia', 'Solomon Islands', 'Somalia', 'South Africa',
+	'South Georgia and The South Sandwich Islands', 'Spain', 'Sri Lanka', 'Sudan', 'South Sudan', 'Suriname',
+	'Svalbard and Jan Mayen Islands', 'Swaziland', 'Sweden', 'Switzerland', 'Syria', 'Taiwan', 'Tajikistan',
+	'Tanzania', 'Thailand', 'Timor-Leste', 'Togo', 'Tokelau', 'Tonga', 'Trinidad and Tobago', 'Tunisia', 'Turkey',
+	'Turkmenistan', 'Turks and Caicos Islands', 'Tuvalu', 'Uganda', 'Ukraine', 'United Arab Emirates',
+	'United Kingdom (Great Britain)', 'United States', 'United States Minor Outlying Islands', 'Uruguay',
+	'Uzbekistan', 'Vanuatu', 'Venezuela', 'Viet Nam', 'Virgin Islands, British', 'Virgin Islands, United States',
+	'Wallis and Futuna', 'Western Sahara', 'Yemen', 'Zambia', 'Zimbabwe'
+];
diff --git a/packages/plugins/src/dataTypes/Country/i18n/ar.json b/packages/plugins/src/dataTypes/Country/i18n/ar.json
new file mode 100644
index 000000000..bf1e4a5be
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/ar.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "بلد",
+  "DESC": "يولد اسم بلد عشوائي ، مع خيار قصر المجموعة الفرعية على تلك البلدان التي يتم إدخالها عبر الواجهة.",
+  "DEFAULT_TITLE": "country",
+  "limitResults": "تقييد البلدان على الاختيار العالمي",
+  "country": "بلد",
+  "countries": "بلدان",
+  "allCountryPlugins": "كل الإضافات الخاصة بالبلد",
+  "allCountries": "كل البلدان",
+  "selectCountries": "حدد البلدان",
+  "source": "مصدر",
+  "explanation": "يتحكم هذا في أسماء الدول التي سيتم إنشاؤها بواسطة هذا الحقل.",
+  "countryPlugins": "الإضافات البلد",
+  "countryPlugin": "البرنامج المساعد البلد",
+  "countryPluginsDesc": "توفر المكونات الإضافية للبلدان مجموعة بيانات أكثر ثراءً لتوليد نتائج أكثر واقعية. مع تحديد هذا الخيار ، يمكنك تعيين حقول أخرى مثل المنطقة والمدينة والبريد / الرمز البريدي والهاتف لهذا الصف ، مما يضمن أن كل صف أخير له منطقة عشوائية داخل البلد المحدد عشوائيًا ، ومدينة عشوائية داخل المنطقة - وما إلى ذلك.",
+  "filter": "منقي",
+  "filterDesc": "هذا يجعل الحقل ينشئ فقط مجموعة فرعية من البلدان المحددة أعلاه."
+}
diff --git a/packages/plugins/src/dataTypes/Country/i18n/de.json b/packages/plugins/src/dataTypes/Country/i18n/de.json
new file mode 100644
index 000000000..b05cd5730
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/de.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "Land",
+  "DESC": "Generiert einen zufälligen Ländernamen mit der Option, die Teilmenge auf die über die Schnittstelle eingegebenen Länder zu beschränken.",
+  "DEFAULT_TITLE": "land",
+  "limitResults": "Beschränken Sie die Länder auf die globale Auswahl",
+  "country": "Land",
+  "countries": "Länder",
+  "allCountryPlugins": "Alle Länder-Plugins",
+  "allCountries": "Alle Länder",
+  "selectCountries": "Länder auswählen",
+  "source": "Quelle",
+  "explanation": "Hiermit wird gesteuert, welche Ländernamen von diesem Feld generiert werden.",
+  "countryPlugins": "Länder-Plugins",
+  "countryPlugin": "Länder-Plugin",
+  "countryPluginsDesc": "Länder-Plugins bieten einen umfangreicheren Datensatz, um realistischere Ergebnisse zu erzielen. Wenn diese Option ausgewählt ist, können Sie dieser Zeile andere Felder wie Region, Stadt, Post / Postleitzahl und Telefon zuordnen, um sicherzustellen, dass jede letzte Zeile eine zufällige Region innerhalb des zufällig ausgewählten Landes, eine zufällige Stadt innerhalb der Region usw. hat.",
+  "filter": "Filter",
+  "filterDesc": "Dadurch generiert das Feld nur eine Teilmenge der oben ausgewählten Länder."
+}
+
diff --git a/packages/plugins/src/dataTypes/Country/i18n/en.json b/packages/plugins/src/dataTypes/Country/i18n/en.json
new file mode 100644
index 000000000..c7d88fe0f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/en.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "Country",
+  "DESC": "Generates a random country name, with the option to limit the subset to those countries entered via the interface.",
+  "DEFAULT_TITLE": "country",
+  "limitResults": "Limit countries to global selection",
+  "country": "country",
+  "countries": "countries",
+  "allCountryPlugins": "All country plugins",
+  "allCountries": "All countries",
+  "selectCountries": "Select Countries",
+  "source": "Source",
+  "explanation": "This controls what country names will be generated by this field.",
+  "countryPlugins": "Country plugins",
+  "countryPlugin": "Country plugin",
+  "countryPluginsDesc": "Country plugins provide a richer data set for generating more realistic results. With this option selected you can map other fields like Region, City, Postal/Zip and Phone to this row, ensuring that each final row has a random region within the randomly selected country, a random city within the region - and so on.",
+  "filter": "Filter",
+  "filterDesc": "This makes the field only generate a subset of the countries selected above."
+}
diff --git a/packages/plugins/src/dataTypes/Country/i18n/es.json b/packages/plugins/src/dataTypes/Country/i18n/es.json
new file mode 100644
index 000000000..5b7af8029
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/es.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "País",
+  "DESC": "Genera un nombre de país al azar , con la opción de limitar el subconjunto de esos países entraron a través de la interfaz.",
+  "DEFAULT_TITLE": "pais",
+  "limitResults": "Limitar países a la selección global",
+  "country": "país",
+  "countries": "países",
+  "allCountryPlugins": "Todos los complementos de países",
+  "allCountries": "Todos los países",
+  "selectCountries": "Seleccionar países",
+  "source": "Fuente",
+  "explanation": "Esto controla qué nombres de países serán generados por este campo.",
+  "countryPlugins": "Complementos de países",
+  "countryPlugin": "Complemento de país",
+  "countryPluginsDesc": "Los complementos de países proporcionan un conjunto de datos más rico para generar resultados más realistas. Con esta opción seleccionada, puede asignar otros campos como Región, Ciudad, Postal / Código postal y Teléfono a esta fila, asegurándose de que cada fila final tenga una región aleatoria dentro del país seleccionado aleatoriamente, una ciudad aleatoria dentro de la región, y así sucesivamente.",
+  "filter": "Filtrar",
+  "filterDesc": "Esto hace que el campo solo genere un subconjunto de los países seleccionados anteriormente."
+}
diff --git a/packages/plugins/src/dataTypes/Country/i18n/fr.json b/packages/plugins/src/dataTypes/Country/i18n/fr.json
new file mode 100644
index 000000000..1e4beda3e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/fr.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "Pays",
+  "DESC": "Génère un nom de pays aléatoire , avec la possibilité de limiter le sous-ensemble de ces pays sont entrés via l'interface .",
+  "DEFAULT_TITLE": "pays",
+  "limitResults": "Limiter les pays à la sélection mondiale",
+  "country": "pays",
+  "countries": "des pays",
+  "allCountryPlugins": "Tous les plugins de pays",
+  "allCountries": "Tous les pays",
+  "selectCountries": "Sélectionnez des pays",
+  "source": "La source",
+  "explanation": "Cela contrôle quels noms de pays seront générés par ce champ.",
+  "countryPlugins": "Plugins de pays",
+  "countryPlugin": "Plugin de pays",
+  "countryPluginsDesc": "Les plugins de pays fournissent un ensemble de données plus riche pour générer des résultats plus réalistes. Avec cette option sélectionnée, vous pouvez mapper d'autres champs tels que Région, Ville, Postal / Zip et Téléphone à cette ligne, en vous assurant que chaque ligne finale a une région aléatoire dans le pays sélectionné au hasard, une ville aléatoire dans la région - et ainsi de suite.",
+  "filter": "Filtre",
+  "filterDesc": "Cela fait que le champ ne génère qu'un sous-ensemble des pays sélectionnés ci-dessus."
+}
diff --git a/packages/plugins/src/dataTypes/Country/i18n/hi.json b/packages/plugins/src/dataTypes/Country/i18n/hi.json
new file mode 100644
index 000000000..d757b3192
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/hi.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "देश",
+  "DESC": "इंटरफ़ेस के माध्यम से दर्ज किए गए उन देशों तक उपसमुच्चय को सीमित करने के विकल्प के साथ, एक यादृच्छिक देश का नाम उत्पन्न करता है।",
+  "DEFAULT_TITLE": "देश",
+  "limitResults": "देशों को वैश्विक चयन तक सीमित करें",
+  "country": "देश",
+  "countries": "देशों",
+  "allCountryPlugins": "सभी देश प्लगइन्स",
+  "allCountries": "सभी देश",
+  "selectCountries": "देशों का चयन करें",
+  "source": "स्रोत",
+  "explanation": "यह नियंत्रित करता है कि इस क्षेत्र द्वारा कौन से देश के नाम उत्पन्न किए जाएंगे।",
+  "countryPlugins": "देश प्लगइन्स",
+  "countryPlugin": "देश प्लगइन",
+  "countryPluginsDesc": "देश प्लगइन्स अधिक यथार्थवादी परिणाम उत्पन्न करने के लिए एक समृद्ध डेटा सेट प्रदान करते हैं। इस विकल्प के चयन से आप इस पंक्ति में क्षेत्र, शहर, डाक/ज़िप और फोन जैसे अन्य क्षेत्रों को मैप कर सकते हैं, यह सुनिश्चित करते हुए कि प्रत्येक अंतिम पंक्ति में यादृच्छिक रूप से चयनित देश के भीतर एक यादृच्छिक क्षेत्र है, क्षेत्र के भीतर एक यादृच्छिक शहर है - और इसी तरह।",
+  "filter": "फ़िल्टर",
+  "filterDesc": "इससे फ़ील्ड केवल ऊपर चुने गए देशों का एक सबसेट जेनरेट करती है।"
+}
diff --git a/packages/plugins/src/dataTypes/Country/i18n/ja.json b/packages/plugins/src/dataTypes/Country/i18n/ja.json
new file mode 100644
index 000000000..ced7c7085
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/ja.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "国",
+  "DESC": "ランダムな国名を生成し、インターフェイスを介して入力された国にサブセットを制限するオプションがあります。",
+  "DEFAULT_TITLE": "国",
+  "limitResults": "国をグローバルな選択に制限する",
+  "country": "国",
+  "countries": "国",
+  "allCountryPlugins": "すべての国のプラグイン",
+  "allCountries": "全ての国々",
+  "selectCountries": "国を選択",
+  "source": "ソース",
+  "explanation": "これは、このフィールドによって生成される国名を制御します。",
+  "countryPlugins": "国のプラグイン",
+  "countryPlugin": "国のプラグイン",
+  "countryPluginsDesc": "国のプラグインは、より現実的な結果を生成するためのより豊富なデータセットを提供します。 このオプションを選択すると、Region、City、Postal / Zip、Phoneなどの他のフィールドをこの行にマップして、各最終行にランダムに選択された国内のランダムな地域、地域内のランダムな都市などが含まれるようにすることができます。",
+  "filter": "フィルタ",
+  "filterDesc": "これにより、フィールドは上記で選択した国のサブセットのみを生成します。"
+}
diff --git a/packages/plugins/src/dataTypes/Country/i18n/nl.json b/packages/plugins/src/dataTypes/Country/i18n/nl.json
new file mode 100644
index 000000000..10e5a7509
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/nl.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "Land",
+  "DESC": "Genereert een willekeurige landnaam, met de optie om de subset te beperken tot die landen die zijn opgegeven via de interface.",
+  "DEFAULT_TITLE": "land",
+  "limitResults": "Beperk landen tot wereldwijde selectie",
+  "country": "land",
+  "countries": "landen",
+  "allCountryPlugins": "Alle landplug-ins",
+  "allCountries": "Alle landen",
+  "selectCountries": "Selecteer landen",
+  "source": "Bron",
+  "explanation": "Dit bepaalt welke landnamen door dit veld worden gegenereerd.",
+  "countryPlugins": "Land plug-ins",
+  "countryPlugin": "Land plug-in",
+  "countryPluginsDesc": "Land-plug-ins bieden een rijkere dataset voor het genereren van meer realistische resultaten. Als deze optie is geselecteerd, kunt u andere velden, zoals Regio, Stad, Post / postcode en Telefoon, aan deze rij toewijzen, zodat elke laatste rij een willekeurige regio heeft binnen het willekeurig geselecteerde land, een willekeurige stad binnen de regio, enzovoort.",
+  "filter": "Filter",
+  "filterDesc": "Hierdoor genereert het veld alleen een subset van de hierboven geselecteerde landen."
+}
diff --git a/packages/plugins/src/dataTypes/Country/i18n/pt.json b/packages/plugins/src/dataTypes/Country/i18n/pt.json
new file mode 100644
index 000000000..bcc03ae6a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/pt.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "País",
+  "DESC": "Gera um nome de país aleatório, com a opção de limitar o subconjunto aos países inseridos por meio da interface.",
+  "DEFAULT_TITLE": "país",
+  "limitResults": "Limitar os países à seleção global",
+  "country": "país",
+  "countries": "países",
+  "allCountryPlugins": "Todos os plug-ins de país",
+  "allCountries": "Todos os países",
+  "selectCountries": "Selecione os países",
+  "source": "Fonte",
+  "explanation": "Isso controla quais nomes de países serão gerados por este campo.",
+  "countryPlugins": "Plugins country",
+  "countryPlugin": "Plugin de país",
+  "countryPluginsDesc": "Os plug-ins de país fornecem um conjunto de dados mais rico para a geração de resultados mais realistas. Com esta opção selecionada, você pode mapear outros campos como Região, Cidade, Postal / CEP e Telefone para esta linha, garantindo que cada linha final tenha uma região aleatória dentro do país selecionado aleatoriamente, uma cidade aleatória dentro da região - e assim por diante.",
+  "filter": "Filtro",
+  "filterDesc": "Isso faz com que o campo gere apenas um subconjunto dos países selecionados acima."
+}
diff --git a/packages/plugins/src/dataTypes/Country/i18n/ru.json b/packages/plugins/src/dataTypes/Country/i18n/ru.json
new file mode 100644
index 000000000..8b4d082c3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/ru.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "Страна",
+  "DESC": "Генерирует случайное название страны с возможностью ограничить подмножество странами, введенными через интерфейс.",
+  "DEFAULT_TITLE": "страна",
+  "limitResults": "Ограничение стран для глобального выбора",
+  "country": "страна",
+  "countries": "страны",
+  "allCountryPlugins": "Все плагины страны",
+  "allCountries": "Все страны",
+  "selectCountries": "Выберите страны",
+  "source": "Источник",
+  "explanation": "Это определяет, какие названия стран будут генерироваться этим полем.",
+  "countryPlugins": "Плагины страны",
+  "countryPlugin": "Плагин страны",
+  "countryPluginsDesc": "Плагины стран предоставляют более богатый набор данных для получения более реалистичных результатов. При выборе этого параметра вы можете сопоставить другие поля, такие как «Регион», «Город», «Почтовый индекс» и «Телефон», с этой строкой, гарантируя, что каждая последняя строка будет иметь случайный регион в случайно выбранной стране, случайный город в регионе и так далее.",
+  "filter": "Фильтр",
+  "filterDesc": "Это заставляет поле генерировать только подмножество стран, выбранных выше."
+}
diff --git a/packages/plugins/src/dataTypes/Country/i18n/ta.json b/packages/plugins/src/dataTypes/Country/i18n/ta.json
new file mode 100644
index 000000000..6b26f0eb7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/ta.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "நாடு",
+  "DESC": "ஒரு சீரற்ற நாட்டின் பெயரை உருவாக்குகிறது, இடைமுகத்தின் வழியாக உள்ளிட்ட நாடுகளுக்கு துணைக்குழுவை மட்டுப்படுத்தும் விருப்பத்துடன்.",
+  "DEFAULT_TITLE": "நாடு",
+  "limitResults": "உலகளாவிய தேர்வுக்கு நாடுகளை மட்டுப்படுத்தவும்",
+  "country": "நாடு",
+  "countries": "நாடுகள்",
+  "allCountryPlugins": "அனைத்து நாட்டு செருகுநிரல்களும்",
+  "allCountries": "அனைத்து நாடுகளும்",
+  "selectCountries": "நாடுகளைத் தேர்ந்தெடுக்கவும்",
+  "source": "மூல",
+  "explanation": "இந்த புலத்தால் எந்த நாட்டின் பெயர்கள் உருவாக்கப்படும் என்பதை இது கட்டுப்படுத்துகிறது.",
+  "countryPlugins": "நாட்டின் செருகுநிரல்கள்",
+  "countryPlugin": "நாட்டின் சொருகி",
+  "countryPluginsDesc": "நாட்டின் செருகுநிரல்கள் மிகவும் யதார்த்தமான முடிவுகளை உருவாக்குவதற்கான பணக்கார தரவு தொகுப்பை வழங்குகின்றன. தேர்ந்தெடுக்கப்பட்ட இந்த விருப்பத்தின் மூலம் நீங்கள் பிராந்திய, நகரம், அஞ்சல் / ஜிப் மற்றும் தொலைபேசி போன்ற பிற துறைகளை இந்த வரிசையில் வரைபடமாக்கலாம், ஒவ்வொரு இறுதி வரிசையிலும் தோராயமாக தேர்ந்தெடுக்கப்பட்ட நாட்டிற்குள் ஒரு சீரற்ற பகுதி, பிராந்தியத்திற்குள் ஒரு சீரற்ற நகரம் - மற்றும் பலவற்றை உறுதிசெய்கிறது.",
+  "filter": "வடிகட்டி",
+  "filterDesc": "இது மேலே தேர்ந்தெடுக்கப்பட்ட நாடுகளின் துணைக்குழுவை மட்டுமே புலம் உருவாக்குகிறது."
+}
diff --git a/packages/plugins/src/dataTypes/Country/i18n/zh.json b/packages/plugins/src/dataTypes/Country/i18n/zh.json
new file mode 100644
index 000000000..7cd594762
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Country/i18n/zh.json
@@ -0,0 +1,18 @@
+{
+  "NAME": "国家",
+  "DESC": "生成一个随机的国家/地区名称，并可以选择将子集限制为通过界面输入的国家/地区。",
+  "DEFAULT_TITLE": "国家",
+  "limitResults": "将国家限制在全球范围内",
+  "country": "国家",
+  "countries": "国家",
+  "allCountryPlugins": "所有国家/地区插件",
+  "allCountries": "所有国家",
+  "selectCountries": "选择国家",
+  "source": "资源",
+  "explanation": "这控制了此字段将生成的国家名称。",
+  "countryPlugins": "国家/地区插件",
+  "countryPlugin": "国家插件",
+  "countryPluginsDesc": "国家/地区插件可提供更丰富的数据集，以产生更真实的结果。 选中此选项后，您可以将其他字段（如“地区”，“城市”，“邮政/邮政编码”和“电话”）映射到该行，以确保最后一行在随机选择的国家/地区内具有随机区域，在该区域内具有随机城市，依此类推。",
+  "filter": "过滤",
+  "filterDesc": "这使得该字段仅生成上面选择的国家/地区的子集。"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/Currency.generate.ts b/packages/plugins/src/dataTypes/Currency/Currency.generate.ts
new file mode 100644
index 000000000..3f7cc8575
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/Currency.generate.ts
@@ -0,0 +1,36 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { from, to, currencySymbol, currencySymbolLocation, includeCents, thousandsSeparator, centsSeparator } = data.rowState;
+
+  let minValue = from;
+  let maxValue = to;
+  let decimals = 0;
+  if (includeCents) {
+    minValue = from * 100;
+    maxValue = to * 100;
+    decimals = 2;
+  }
+
+  let randNum = utils.randomUtils.getRandomNum(minValue, maxValue);
+  if (includeCents) {
+    randNum = randNum / 100;
+  }
+
+  const negativePrefix = randNum < 0 ? '-' : '';
+
+  let formatted = utils.numberUtils.numberFormat(Math.abs(randNum), decimals, centsSeparator, thousandsSeparator);
+
+  if (currencySymbol) {
+    if (currencySymbolLocation === 'prefix') {
+      formatted = `${negativePrefix}${currencySymbol}${formatted}`;
+    } else {
+      formatted = `${negativePrefix}${formatted}${currencySymbol}`;
+    }
+  }
+
+  return {
+    display: formatted
+  };
+};
diff --git a/packages/plugins/src/dataTypes/Currency/Currency.scss b/packages/plugins/src/dataTypes/Currency/Currency.scss
new file mode 100644
index 000000000..21621e96c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/Currency.scss
@@ -0,0 +1,46 @@
+.row {
+	display: flex;
+	align-items: center;
+	margin-bottom: 8px;
+
+	.col1 {
+		flex: 0 0 130px;
+	}
+	.col2 {
+		flex: 1;
+	}
+}
+
+.buttonLabel {
+	margin-top: 4px;
+}
+
+div.radioPill {
+	margin-bottom: 0;
+}
+
+.currencyLine {
+	display: flex;
+	align-items: center;
+}
+
+.separatorLine {
+	font-style: italic;
+	color: #999999;
+
+	input {
+		margin-left: 3px;
+	}
+}
+
+.helpDialog {
+	.row {
+		align-items: flex-start;
+	}
+
+	label {
+		background-color: #dfecfc;
+		border-radius: 3px;
+		padding: 1px 6px;
+	}
+}
diff --git a/packages/plugins/src/dataTypes/Currency/Currency.scss.d.ts b/packages/plugins/src/dataTypes/Currency/Currency.scss.d.ts
new file mode 100644
index 000000000..837d37c6b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/Currency.scss.d.ts
@@ -0,0 +1,19 @@
+declare namespace CurrencyScssNamespace {
+  export interface ICurrencyScss {
+    buttonLabel: string;
+    col1: string;
+    col2: string;
+    currencyLine: string;
+    helpDialog: string;
+    radioPill: string;
+    row: string;
+    separatorLine: string;
+  }
+}
+
+declare const CurrencyScssModule: CurrencyScssNamespace.ICurrencyScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: CurrencyScssNamespace.ICurrencyScss;
+};
+
+export = CurrencyScssModule;
diff --git a/packages/plugins/src/dataTypes/Currency/Currency.state.tsx b/packages/plugins/src/dataTypes/Currency/Currency.state.tsx
new file mode 100644
index 000000000..404c1836d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/Currency.state.tsx
@@ -0,0 +1,30 @@
+export enum PrefixLocationEnum {
+	prefix = 'prefix',
+	suffix = 'suffix'
+}
+export type PrefixLocation = `${PrefixLocationEnum}`;
+
+export type GenerationOptionsType = {
+	from: number;
+	to: number;
+	currencySymbol: string;
+	currencySymbolLocation: PrefixLocation;
+	includeCents: boolean;
+	thousandsSeparator: string;
+	centsSeparator: string;
+}
+
+export const defaultGenerationOptions = {
+	from: '0.00',
+	to: '100.00',
+	currencySymbol: '$',
+	currencySymbolLocation: PrefixLocationEnum.prefix,
+	includeCents: true,
+	thousandsSeparator: ',',
+	centsSeparator: '.'
+};
+
+export const initialState = {
+	example: '0.00|100.00|$|prefix|true|,|.',
+	...defaultGenerationOptions
+};
diff --git a/packages/plugins/src/dataTypes/Currency/Currency.tsx b/packages/plugins/src/dataTypes/Currency/Currency.tsx
new file mode 100644
index 000000000..8acb7487f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/Currency.tsx
@@ -0,0 +1,231 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import ArrowRightAlt from '@mui/icons-material/ArrowRightAlt';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import Dropdown from '~components/dropdown/Dropdown';
+import TextField from '~components/TextField';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import { PrefixLocationEnum } from './Currency.state';
+import styles from './Currency.scss';
+
+export const Example = ({ i18n, data, onUpdate }: any) => {
+  const onChange = (i: any): void => {
+    const [from, to, currencySymbol, currencySymbolLocation, includeCents, thousandsSeparator, centsSeparator] = i.value.split('|');
+
+    onUpdate({
+      example: i.value,
+      from,
+      to,
+      currencySymbol,
+      currencySymbolLocation,
+      includeCents: includeCents === 'true',
+      thousandsSeparator,
+      centsSeparator
+    });
+  };
+
+  const examples = [
+    {
+      label: 'US/Canada',
+      options: [
+        { value: '0.00|100.00|$|prefix|true|,|.', label: '$0.00 -> $100.00' },
+        { value: '5000|10000|$|prefix||,|.', label: `$5,000 -> $10,000 (${i18n.noCents})` },
+        { value: '1000.00|10000.00|$|prefix|true||.', label: `$1000.00 -> $10000.00 (${i18n.noThousandDelimiters})` },
+        { value: '-100000.00|100000.00|$|prefix|true|,|.', label: '-$100,000.00 -> $100,000.00' },
+        { value: '0.01|1.00||prefix|true|,|.', label: `0.01 -> 1.00 (${i18n.noDollarSign})` },
+        { value: '100.00|1000.00| $|suffix|true|.|,', label: '100,00 $ -> 1.000,00 $ (French Canadian)' },
+        { value: '10|100000||prefix|| |.', label: '10 -> 100 000' }
+      ]
+    },
+    {
+      label: 'UK',
+      options: [
+        { value: '0.00|100.00|£|prefix|true|,|.', label: '£0.00 -> £100.00' },
+        { value: '-100000.00|100000.00|£|prefix|true|,|.', label: '-£100.000.00 -> £100,000.00' }
+      ]
+    },
+    {
+      label: 'Euro',
+      options: [{ value: '100000|200000|€|prefix||,|', label: '€100,000 -> €200,000' }]
+    }
+  ];
+
+  return <Dropdown isGrouped={true} value={data.example} onChange={onChange} options={examples} />;
+};
+
+const CurrencySettingsDialog = ({ id, visible, data, onUpdate, onClose, coreI18n, i18n }: any) => {
+  const onChange = (field: string, value: any): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 500 }}>
+        <DialogTitle onClose={onClose}>Currency Settings</DialogTitle>
+        <DialogContent dividers>
+          <div style={{ marginBottom: 20 }}>
+            <h3>{coreI18n.example}</h3>
+            <Example i18n={i18n} data={data} onUpdate={onUpdate} />
+          </div>
+
+          <h3>{coreI18n.settings}</h3>
+
+          <div className={styles.row}>
+            <div className={styles.col1}>{i18n.currencySymbol}</div>
+            <div className={`${styles.col2} ${styles.currencyLine}`}>
+              <TextField
+                value={data.currencySymbol}
+                style={{ width: 30 }}
+                onChange={(e: any): void => onChange('currencySymbol', e.target.value)}
+              />
+              <input
+                type="radio"
+                checked={data.currencySymbolLocation === PrefixLocationEnum.prefix}
+                name={`${id}-currencySymbolLocation`}
+                id={`${id}-currencySymbolLocation1`}
+                onChange={(): void => onChange('currencySymbolLocation', PrefixLocationEnum.prefix)}
+              />
+              <label htmlFor={`${id}-currencySymbolLocation1`}>Prefix</label>
+              <input
+                type="radio"
+                checked={data.currencySymbolLocation === PrefixLocationEnum.suffix}
+                name={`${id}-currencySymbolLocation`}
+                id={`${id}-currencySymbolLocation2`}
+                onChange={(): void => onChange('currencySymbolLocation', PrefixLocationEnum.suffix)}
+              />
+              <label htmlFor={`${id}-currencySymbolLocation2`}>Suffix</label>
+            </div>
+          </div>
+          <div className={styles.row}>
+            <div className={styles.col1}>Separators</div>
+            <div className={`${styles.col2} ${styles.separatorLine}`}>
+              {i18n.thousands}
+              <TextField
+                value={data.thousandsSeparator}
+                onChange={(e: any): void => onChange('thousandsSeparator', e.target.value)}
+                style={{ width: 30, marginRight: 20 }}
+              />
+
+              {i18n.cents}
+              <TextField
+                value={data.centsSeparator}
+                onChange={(e: any): void => onChange('centsSeparator', e.target.value)}
+                style={{ width: 30 }}
+              />
+            </div>
+          </div>
+          <div className={styles.row}>
+            <div className={styles.col1}>
+              <input
+                type="checkbox"
+                id={`${id}-includeCents`}
+                checked={data.includeCents}
+                onChange={(e: any): void => onChange('includeCents', e.target.checked)}
+              />
+              <label htmlFor={`${id}-includeCents`}>{i18n.includeCents}</label>
+            </div>
+          </div>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ i18n, coreI18n, id, data, onUpdate }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+
+  const onChange = (field: string, value: any): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  const step = data.includeCents ? 0.01 : 1;
+
+  return (
+    <>
+      <TextField
+        type="number"
+        value={data.from}
+        style={{ width: 80 }}
+        step={step}
+        onChange={(e: any): void => onChange('from', parseFloat(e.target.value).toFixed(2))}
+      />
+      <ArrowRightAlt style={{ marginBottom: -4 }} />
+      <TextField
+        type="number"
+        value={data.to}
+        style={{ width: 80, marginRight: 2 }}
+        step={step}
+        onChange={(e: any): void => onChange('to', parseFloat(e.target.value).toFixed(2))}
+      />
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        {coreI18n.settings}
+      </Button>
+
+      <CurrencySettingsDialog
+        visible={dialogVisible}
+        data={data}
+        id={id}
+        onUpdate={onUpdate}
+        i18n={i18n}
+        coreI18n={coreI18n}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <div className={styles.helpDialog}>
+    <p>{i18n.helpIntro}</p>
+
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>{i18n.rangeFrom}</label>
+      </div>
+      <div className={styles.col2}>{i18n.rangeFromDesc}</div>
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>{i18n.rangeTo}</label>
+      </div>
+      <div className={styles.col2}>{i18n.rangeToDesc}</div>
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>{i18n.currencySymbol}</label>
+      </div>
+      <div className={styles.col2} dangerouslySetInnerHTML={{ __html: i18n.currencySymbolDesc }} />
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>{i18n.prefixSuffix}</label>
+      </div>
+      <div className={styles.col2}>{i18n.prefixSuffixDesc}</div>
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>{i18n.separators}</label>
+      </div>
+      <div className={styles.col2}>{i18n.separatorsDesc}</div>
+    </div>
+  </div>
+);
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'varchar(100) default NULL',
+    field_Oracle: 'varchar2(100) default NULL',
+    field_MSSQL: 'VARCHAR(100) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/Currency/Currency.worker.ts b/packages/plugins/src/dataTypes/Currency/Currency.worker.ts
new file mode 100644
index 000000000..e2a76b1fd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/Currency.worker.ts
@@ -0,0 +1,14 @@
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Currency.generate';
+import utils from '../../../utils';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Currency/README.md b/packages/plugins/src/dataTypes/Currency/README.md
new file mode 100644
index 000000000..4be4c743f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/README.md
@@ -0,0 +1,197 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Currency
+
+This Data Type generates a random monetary value. It's pretty versatile and can be used for many, if not all country
+currencies.
+
+## Typings
+
+There are a lot of fields you need to enter for this field. See the examples below.
+
+```typescript
+export enum PrefixLocationEnum {
+	prefix = 'prefix',
+	suffix = 'suffix'
+}
+export type PrefixLocation = `${PrefixLocationEnum}`;
+
+export type GenerationOptionsType = {
+	from: number;
+	to: number;
+	currencySymbol: string;
+	currencySymbolLocation: PrefixLocation;
+	includeCents: boolean;
+	thousandsSeparator: string;
+	centsSeparator: string;
+}
+```
+
+## Examples
+
+- [US Dollars with cents between $1 and $1,000,000](#us-dollars-with-cents-between-1-and-1000000)
+- [French Canadian dollars without cents](#french-canadian-dollars-without-cents)
+- [€100,000 - €200,000](#100000---200000)
+
+### US Dollars with cents between $1 and $1,000,000
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Currency",
+            title: "us-dollars",
+            settings: {
+                from: 1,
+                to: 1000000,
+                currencySymbol: "$",
+                currencySymbolLocation: "prefix",
+                includeCents: true,
+                thousandsSeparator: ",",
+                centsSeparator: "."
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "us-dollars": "$95,100.93"
+    },
+    {
+        "us-dollars": "$568,419.68"
+    },
+    {
+        "us-dollars": "$986,749.00"
+    },
+    {
+        "us-dollars": "$477,687.42"
+    },
+    {
+        "us-dollars": "$830,433.46"
+    },
+    {
+        "us-dollars": "$659,647.45"
+    },
+    ...
+]
+```
+
+### French Canadian dollars without cents
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Currency",
+            title: "french-canadian",
+            settings: {
+                from: 1000,
+                to: 5000,
+                currencySymbol: " $",
+                currencySymbolLocation: "suffix",
+                includeCents: true,
+                thousandsSeparator: ".",
+                centsSeparator: ","
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "french-canadian": "1.268,40 $"
+    },
+    {
+        "french-canadian": "4.937,54 $"
+    },
+    {
+        "french-canadian": "4.350,88 $"
+    },
+    {
+        "french-canadian": "2.064,24 $"
+    },
+    {
+        "french-canadian": "1.535,07 $"
+    },
+    ...
+]
+```
+
+### €100,000 - €200,000
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "Currency",
+            title: "french-canadian",
+            settings: {
+                from: 1000,
+                to: 5000,
+                currencySymbol: " $",
+                currencySymbolLocation: "suffix",
+                includeCents: true,
+                thousandsSeparator: ".",
+                centsSeparator: ","
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "euros-no-cents": "€124,107"
+    },
+    {
+        "euros-no-cents": "€135,657"
+    },
+    {
+        "euros-no-cents": "€114,426"
+    },
+    {
+        "euros-no-cents": "€174,806"
+    },
+    {
+        "euros-no-cents": "€139,199"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/Currency/__tests__/Currency.ui.test.tsx b/packages/plugins/src/dataTypes/Currency/__tests__/Currency.ui.test.tsx
new file mode 100644
index 000000000..6e7ec7953
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/__tests__/Currency.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../Currency';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Currency/bundle.ts b/packages/plugins/src/dataTypes/Currency/bundle.ts
new file mode 100644
index 000000000..1f92e23b8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/bundle.ts
@@ -0,0 +1,13 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, Example, Options, getMetadata } from './Currency';
+import { initialState } from './Currency.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Currency/config.ts b/packages/plugins/src/dataTypes/Currency/config.ts
new file mode 100644
index 000000000..e4c30a5c5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'financial',
+  fieldGroupOrder: 10
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/ar.json b/packages/plugins/src/dataTypes/Currency/i18n/ar.json
new file mode 100644
index 000000000..20eefffdc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/ar.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "عملة",
+  "DESC": "يولد قيمة عملة عشوائية بأي تنسيق ونطاق تريده.",
+  "DEFAULT_TITLE": "currency",
+  "helpIntro": "يُنشئ نوع البيانات هذا قيمًا عشوائية للعملات بأي تنسيق ونطاق تريده. تحتوي القائمة المنسدلة للمثال على عدة خيارات حتى تتمكن من التعرف على كيفية عملها ، ولكن إليك ما يعنيه كل خيار من الخيارات.",
+  "rangeFrom": "النطاق - من",
+  "rangeFromDesc": "يحدد النطاق الأدنى لأي قيم تريد تكوينها.",
+  "rangeTo": "النطاق - إلى",
+  "rangeToDesc": "النطاق العلوي للأرقام المراد إنشاؤها.",
+  "currencySymbol": "رمز العملة",
+  "currencySymbolDesc": "مهما كان رمز العملة الذي تريد استخدامه ، على سبيل المثال $ ، € ، إلخ.",
+  "prefixSuffix": "لاحقة البادئة",
+  "prefixSuffixDesc": "هذا يحدد مكان ظهور رمز العملة.",
+  "noCents": "لا سنتات",
+  "noDollarSign": "لا علامة الدولار",
+  "range": "نطاق",
+  "to": "إلى",
+  "prefix": "اختصار",
+  "suffix": "لاحقة",
+  "noThousandDelimiters": "لا يوجد فاصل آلاف",
+  "separators": "فواصل",
+  "separatorsDesc": "يتيح لك حقل الفواصل تخصيص الأحرف الفاصلة بالآلاف والسنتات.",
+  "thousands": "بالآلاف",
+  "cents": "سنتا",
+  "includeCents": "تضمين سنتات"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/de.json b/packages/plugins/src/dataTypes/Currency/i18n/de.json
new file mode 100644
index 000000000..e044cf172
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/de.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Währung",
+  "DESC": "Erzeugt einen zufälligen Währungswert in dem von Ihnen benötigten Format und Bereich.",
+  "DEFAULT_TITLE": "Währung",
+  "helpIntro": "Dieser Datentyp generiert zufällige Währungswerte in jedem gewünschten Format und Bereich. Das Beispiel-Dropdown-Menü enthält mehrere Optionen, damit Sie einen Eindruck davon bekommen, wie es funktioniert. Hier ist jedoch, was jede der Optionen bedeutet.",
+  "rangeFrom": "Bereich von",
+  "rangeFromDesc": "Gibt den unteren Bereich der Werte an, die Sie generieren möchten.",
+  "rangeTo": "Reichweite - bis",
+  "rangeToDesc": "Der obere Bereich der zu generierenden Zahlen.",
+  "currencySymbol": "Währungszeichen",
+  "currencySymbolDesc": "Welches Währungssymbol Sie auch verwenden möchten, z. $, € usw.",
+  "prefixSuffix": "Präfix Suffix",
+  "prefixSuffixDesc": "Dies bestimmt, wo das Währungssymbol erscheinen soll.",
+  "noCents": "keine Cent",
+  "noDollarSign": "kein Dollarzeichen",
+  "range": "Reichweite",
+  "to": "Zu",
+  "prefix": "Präfix",
+  "suffix": "Suffix",
+  "noThousandDelimiters": "Kein Tausendertrennzeichen",
+  "separators": "Trennzeichen",
+  "separatorsDesc": "Im Trennfeld können Sie die Tausender- und Cent-Trennzeichen anpassen.",
+  "thousands": "Tausende",
+  "cents": "Cent",
+  "includeCents": "Cent einschließen"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/en.json b/packages/plugins/src/dataTypes/Currency/i18n/en.json
new file mode 100644
index 000000000..660d5a40d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/en.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Currency",
+  "DESC": "Generates a random currency value in whatever format and range you need.",
+  "DEFAULT_TITLE": "currency",
+  "helpIntro": "This data type generates random currency values in whatever format and range you want. The example dropdown contains several options so you can get a sense of how it works, but here's what each of the options means.",
+  "rangeFrom": "Range - From",
+  "rangeFromDesc": "Specifies the lower range of whatever values you want to generate.",
+  "rangeTo": "Range - To",
+  "rangeToDesc": "The upper range of the numbers to generate.",
+  "currencySymbol": "Currency Symbol",
+  "currencySymbolDesc": "Whatever currency symbol you want to use, e.g. <b>$</b>, <b>€</b>, etc.",
+  "prefixSuffix": "Prefix/Suffix",
+  "prefixSuffixDesc": "This determines where the currency symbol should appear.",
+  "noCents": "no cents",
+  "noDollarSign": "no dollar sign",
+  "range": "Range",
+  "to": "To",
+  "prefix": "prefix",
+  "suffix": "suffix",
+  "noThousandDelimiters": "No thousands separator",
+  "separators": "Separators",
+  "separatorsDesc": "The separators field lets you customize the thousands and cents separator characters.",
+  "thousands": "thousands",
+  "cents": "cents",
+  "includeCents": "Include cents"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/es.json b/packages/plugins/src/dataTypes/Currency/i18n/es.json
new file mode 100644
index 000000000..39bbe82af
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/es.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Moneda",
+  "DESC": "Genera un valor de moneda aleatorio en cualquier formato y rango que necesite.",
+  "DEFAULT_TITLE": "moneda",
+  "helpIntro": "Este tipo de datos genera valores de moneda aleatorios en cualquier formato y rango que desee. El menú desplegable de ejemplo contiene varias opciones para que pueda tener una idea de cómo funciona, pero esto es lo que significa cada una de las opciones.",
+  "rangeFrom": "Intervalo de",
+  "rangeFromDesc": "Especifica el rango inferior de los valores que desea generar.",
+  "rangeTo": "Rango - Hasta",
+  "rangeToDesc": "El rango superior de los números a generar.",
+  "currencySymbol": "Símbolo de moneda",
+  "currencySymbolDesc": "Cualquier símbolo de moneda que desee utilizar, p. Ej. $, €, etc.",
+  "prefixSuffix": "Prefijo sufijo",
+  "prefixSuffixDesc": "Esto determina dónde debe aparecer el símbolo de la moneda.",
+  "noCents": "sin centavos",
+  "noDollarSign": "sin signo de dólar",
+  "range": "Rango",
+  "to": "A",
+  "prefix": "prefijo",
+  "suffix": "sufijo",
+  "noThousandDelimiters": "No hay separadora de miles",
+  "separators": "Separadores",
+  "separatorsDesc": "El campo de separadores le permite personalizar los caracteres separadores de miles y centavos.",
+  "thousands": "miles",
+  "cents": "centavos",
+  "includeCents": "Incluir centavos"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/fr.json b/packages/plugins/src/dataTypes/Currency/i18n/fr.json
new file mode 100644
index 000000000..0fc70bb7a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/fr.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Devise",
+  "DESC": "Génère une valeur de devise aléatoire dans le format et la plage dont vous avez besoin.",
+  "DEFAULT_TITLE": "devise",
+  "helpIntro": "Ce type de données génère des valeurs monétaires aléatoires dans le format et la plage souhaités. L'exemple de liste déroulante contient plusieurs options afin que vous puissiez avoir une idée de son fonctionnement, mais voici ce que signifie chacune des options.",
+  "rangeFrom": "Plage de",
+  "rangeFromDesc": "Spécifie la plage inférieure des valeurs que vous souhaitez générer.",
+  "rangeTo": "Gamme - À",
+  "rangeToDesc": "La plage supérieure des nombres à générer.",
+  "currencySymbol": "Symbole de la monnaie",
+  "currencySymbolDesc": "Quel que soit le symbole de devise que vous souhaitez utiliser, par exemple $, €, etc.",
+  "prefixSuffix": "Préfixe suffixe",
+  "prefixSuffixDesc": "Cela détermine où le symbole monétaire doit apparaître.",
+  "noCents": "pas de centimes",
+  "noDollarSign": "aucun signe dollar",
+  "range": "Gamme",
+  "to": "À",
+  "prefix": "préfixe",
+  "suffix": "suffixe",
+  "noThousandDelimiters": "Pas de séparateur de milliers",
+  "separators": "Séparatrices",
+  "separatorsDesc": "Le champ séparateurs vous permet de personnaliser les caractères séparateurs des milliers et des cents.",
+  "thousands": "milliers",
+  "cents": "cents",
+  "includeCents": "Inclure les cents"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/hi.json b/packages/plugins/src/dataTypes/Currency/i18n/hi.json
new file mode 100644
index 000000000..7f9940271
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/hi.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "मुद्रा",
+  "DESC": "आपको जिस भी प्रारूप और श्रेणी की आवश्यकता है, उसमें एक यादृच्छिक मुद्रा मूल्य उत्पन्न करता है।",
+  "DEFAULT_TITLE": "मुद्रा",
+  "helpIntro": "यह डेटा प्रकार आपके इच्छित प्रारूप और श्रेणी में यादृच्छिक मुद्रा मान उत्पन्न करता है। उदाहरण ड्रॉपडाउन में कई विकल्प हैं ताकि आप समझ सकें कि यह कैसे काम करता है, लेकिन यहां प्रत्येक विकल्प का अर्थ बताया गया है।",
+  "rangeFrom": "से रेंज",
+  "rangeFromDesc": "आप जो भी मान उत्पन्न करना चाहते हैं उसकी निचली सीमा निर्दिष्ट करता है।",
+  "rangeTo": "रेंज - To",
+  "rangeToDesc": "उत्पन्न करने के लिए संख्याओं की ऊपरी सीमा।",
+  "currencySymbol": "मुद्रा चिन्ह",
+  "currencySymbolDesc": "आप जिस भी मुद्रा चिह्न का उपयोग करना चाहते हैं, उदा. <b>$</b>, <b>€</b>, आदि।",
+  "prefixSuffix": "उपसर्ग प्रत्यय",
+  "prefixSuffixDesc": "यह निर्धारित करता है कि मुद्रा प्रतीक कहाँ दिखाई देना चाहिए।",
+  "noCents": "कोई सेंट नहीं",
+  "noDollarSign": "कोई डॉलर का संकेत नहीं",
+  "range": "श्रेणी",
+  "to": "प्रति",
+  "prefix": "उपसर्ग",
+  "suffix": "प्रत्यय",
+  "noThousandDelimiters": "कोई हजारों विभाजक नहीं",
+  "separators": "विभाजक",
+  "separatorsDesc": "विभाजक फ़ील्ड आपको हज़ारों और सेंट विभाजक वर्णों को अनुकूलित करने देता है।",
+  "thousands": "हजारों",
+  "cents": "सेंट",
+  "includeCents": "सेंट शामिल करें"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/ja.json b/packages/plugins/src/dataTypes/Currency/i18n/ja.json
new file mode 100644
index 000000000..b296964e7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/ja.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "通貨",
+  "DESC": "必要な形式と範囲でランダムな通貨値を生成します。",
+  "DEFAULT_TITLE": "currency",
+  "helpIntro": "このデータ型は、任意の形式と範囲でランダムな通貨値を生成します。 ドロップダウンの例にはいくつかのオプションが含まれているため、どのように機能するかを理解できますが、各オプションの意味は次のとおりです。",
+  "rangeFrom": "の範囲",
+  "rangeFromDesc": "生成する値の下限を指定します。",
+  "rangeTo": "範囲-〜",
+  "rangeToDesc": "生成する数値の上限。",
+  "currencySymbol": "通貨記号",
+  "currencySymbolDesc": "使用したい通貨記号（例： $、€など",
+  "prefixSuffix": "プレフィックス/サフィックス",
+  "prefixSuffixDesc": "これにより、通貨記号を表示する場所が決まります。",
+  "noCents": "セントなし",
+  "noDollarSign": "ドル記号なし",
+  "range": "範囲",
+  "to": "に",
+  "prefix": "プレフィックス",
+  "suffix": "サフィックス",
+  "noThousandDelimiters": "千単位の区切り文字なし",
+  "separators": "セパレーター",
+  "separatorsDesc": "区切り文字フィールドでは、千とセントの区切り文字をカスタマイズできます。",
+  "thousands": "数千人",
+  "cents": "セント",
+  "includeCents": "セントを含める"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/nl.json b/packages/plugins/src/dataTypes/Currency/i18n/nl.json
new file mode 100644
index 000000000..8b948f5c8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/nl.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Valuta",
+  "DESC": "Genereert een willekeurige valutawaarde in elk formaat en bereik dat u nodig heeft.",
+  "DEFAULT_TITLE": "valuta",
+  "helpIntro": "Dit gegevenstype genereert willekeurige valutawaarden in elk gewenst formaat en bereik. De vervolgkeuzelijst met voorbeelden bevat verschillende opties, zodat u een idee krijgt van hoe het werkt, maar dit is wat elk van de opties betekent.",
+  "rangeFrom": "Variëren van",
+  "rangeFromDesc": "Specificeert het onderste bereik van de waarden die u wilt genereren.",
+  "rangeTo": "Bereik - tot",
+  "rangeToDesc": "Het bovenste bereik van de te genereren nummers.",
+  "currencySymbol": "Symbool van munteenheid",
+  "currencySymbolDesc": "Welk valutasymbool u ook wilt gebruiken, bijv. $, €, enz.",
+  "prefixSuffix": "Voorvoegsel / achtervoegsel",
+  "prefixSuffixDesc": "Dit bepaalt waar het valutasymbool moet verschijnen.",
+  "noCents": "geen cent",
+  "noDollarSign": "geen dollarteken",
+  "range": "Bereik",
+  "to": "Naar",
+  "prefix": "voorvoegsel",
+  "suffix": "achtervoegsel",
+  "noThousandDelimiters": "Geen scheidingsteken voor duizendtallen",
+  "separators": "Afscheiders",
+  "separatorsDesc": "Met het scheidingstekenveld kunt u de scheidingstekens voor duizenden en centen aanpassen.",
+  "thousands": "duizenden",
+  "cents": "cent",
+  "includeCents": "Inclusief centen"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/pt.json b/packages/plugins/src/dataTypes/Currency/i18n/pt.json
new file mode 100644
index 000000000..876569197
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/pt.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Moeda",
+  "DESC": "Gera um valor monetário aleatório em qualquer formato e intervalo de que você precisa.",
+  "DEFAULT_TITLE": "moeda",
+  "helpIntro": "Este tipo de dados gera valores monetários aleatórios em qualquer formato e intervalo que você desejar. A lista suspensa de exemplo contém várias opções para que você tenha uma noção de como funciona, mas aqui está o que cada uma das opções significa.",
+  "rangeFrom": "Vai de",
+  "rangeFromDesc": "Especifica o intervalo inferior de quaisquer valores que você deseja gerar.",
+  "rangeTo": "Alcance - até",
+  "rangeToDesc": "A faixa superior dos números a serem gerados.",
+  "currencySymbol": "Símbolo da Moeda",
+  "currencySymbolDesc": "Qualquer símbolo de moeda que você deseja usar, por exemplo, <b>$</b>, <b>€</b>, etc.",
+  "prefixSuffix": "Prefixo sufixo",
+  "prefixSuffixDesc": "Isso determina onde o símbolo da moeda deve aparecer.",
+  "noCents": "sem centavos",
+  "noDollarSign": "sem cifrão",
+  "range": "Faixa",
+  "to": "Para",
+  "prefix": "prefixa",
+  "suffix": "sufixo",
+  "noThousandDelimiters": "Sem separador de milhares",
+  "separators": "Separadoras",
+  "separatorsDesc": "O campo separadores permite que você personalize os caracteres separadores de milhares e centavos.",
+  "thousands": "milhares",
+  "cents": "centavos",
+  "includeCents": "Incluir centavos"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/ru.json b/packages/plugins/src/dataTypes/Currency/i18n/ru.json
new file mode 100644
index 000000000..ec9cc14af
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/ru.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "Валюта",
+  "DESC": "Генерирует случайное значение валюты в любом формате и диапазоне, который вам нужен.",
+  "DEFAULT_TITLE": "валюта",
+  "helpIntro": "Этот тип данных генерирует случайные значения валюты в любом формате и диапазоне, который вы хотите. Раскрывающийся список примера содержит несколько параметров, чтобы вы могли понять, как он работает, но вот что означает каждый из параметров.",
+  "rangeFrom": "Диапазон - От",
+  "rangeFromDesc": "Указывает нижний диапазон любых значений, которые вы хотите сгенерировать.",
+  "rangeTo": "Диапазон - До",
+  "rangeToDesc": "Верхний диапазон чисел для генерации.",
+  "currencySymbol": "Символ валюты",
+  "currencySymbolDesc": "Какой бы символ валюты вы ни использовали, например. $, € и т. д.",
+  "prefixSuffix": "Префикс Суффикс",
+  "prefixSuffixDesc": "Это определяет, где должен появиться символ валюты.",
+  "noCents": "без центов",
+  "noDollarSign": "нет знака доллара",
+  "range": "Диапазон",
+  "to": "К",
+  "prefix": "префикс",
+  "suffix": "суффикс",
+  "noThousandDelimiters": "Без разделителя тысяч",
+  "separators": "Сепараторы",
+  "separatorsDesc": "Поле разделителей позволяет настроить символы разделителя тысяч и центов.",
+  "thousands": "тысячи",
+  "cents": "центов",
+  "includeCents": "Включить центы"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/ta.json b/packages/plugins/src/dataTypes/Currency/i18n/ta.json
new file mode 100644
index 000000000..2b24f6d59
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/ta.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "நாணய",
+  "DESC": "உங்களுக்கு தேவையான எந்த வடிவத்திலும் வரம்பிலும் சீரற்ற நாணய மதிப்பை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "நாணய",
+  "helpIntro": "இந்த தரவு வகை நீங்கள் விரும்பும் எந்த வடிவத்திலும் வரம்பிலும் சீரற்ற நாணய மதிப்புகளை உருவாக்குகிறது. எடுத்துக்காட்டு கீழ்தோன்றலில் பல விருப்பங்கள் உள்ளன, எனவே இது எவ்வாறு இயங்குகிறது என்பதைப் புரிந்து கொள்ள முடியும், ஆனால் ஒவ்வொரு விருப்பமும் என்ன என்பதை இங்கே காணலாம்.",
+  "rangeFrom": "வரம்பு - இருந்து",
+  "rangeFromDesc": "நீங்கள் உருவாக்க விரும்பும் மதிப்புகளின் குறைந்த வரம்பைக் குறிப்பிடுகிறது.",
+  "rangeTo": "வரம்பு - க்கு",
+  "rangeToDesc": "உருவாக்க எண்களின் மேல் வரம்பு.",
+  "currencySymbol": "நாணய சின்னம்",
+  "currencySymbolDesc": "நீங்கள் பயன்படுத்த விரும்பும் நாணய சின்னம் எதுவாக இருந்தாலும், எ.கா. $, €, முதலியன.",
+  "prefixSuffix": "முன்னொட்டு / பின்னொட்டு",
+  "prefixSuffixDesc": "நாணய சின்னம் எங்கு தோன்ற வேண்டும் என்பதை இது தீர்மானிக்கிறது.",
+  "noCents": "சென்ட் இல்லை",
+  "noDollarSign": "டாலர் அடையாளம் இல்லை",
+  "range": "சரகம்",
+  "to": "க்கு",
+  "prefix": "முன்னொட்டு",
+  "suffix": "பின்னொட்டு",
+  "noThousandDelimiters": "ஆயிரக்கணக்கான பிரிப்பான் இல்லை",
+  "separators": "பிரிப்பான்கள்",
+  "separatorsDesc": "பிரிப்பான்கள் புலம் ஆயிரக்கணக்கான மற்றும் சென்ட் பிரிப்பான் எழுத்துக்களைத் தனிப்பயனாக்க உங்களை அனுமதிக்கிறது.",
+  "thousands": "ஆயிரக்கணக்கான",
+  "cents": "சென்ட்",
+  "includeCents": "சென்ட் சேர்க்கவும்"
+}
diff --git a/packages/plugins/src/dataTypes/Currency/i18n/zh.json b/packages/plugins/src/dataTypes/Currency/i18n/zh.json
new file mode 100644
index 000000000..0d088b083
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Currency/i18n/zh.json
@@ -0,0 +1,26 @@
+{
+  "NAME": "货币",
+  "DESC": "生成任意所需格式和范围的随机货币值。",
+  "DEFAULT_TITLE": "货币",
+  "helpIntro": "此数据类型生成所需的任何格式和范围的随机货币值。 该示例下拉列表包含几个选项，因此您可以大致了解它的工作方式，但这就是每个选项的含义。",
+  "rangeFrom": "范围",
+  "rangeFromDesc": "指定要生成的任何值的下限范围。",
+  "rangeTo": "范围-至",
+  "rangeToDesc": "要生成的数字的上限。",
+  "currencySymbol": "货币符号",
+  "currencySymbolDesc": "您想使用的任何货币符号，例如 $，€等",
+  "prefixSuffix": "前缀/后缀",
+  "prefixSuffixDesc": "这确定了货币符号应出现的位置。",
+  "noCents": "没有钱",
+  "noDollarSign": "没有美元符号",
+  "range": "范围",
+  "to": "至",
+  "prefix": "字首",
+  "suffix": "后缀",
+  "noThousandDelimiters": "没有千位分隔符",
+  "separators": "分离器",
+  "separatorsDesc": "分隔符字段使您可以自定义千分制分隔符。",
+  "thousands": "千",
+  "cents": "美分",
+  "includeCents": "包括仙"
+}
diff --git a/packages/plugins/src/dataTypes/Date/Date.generate.ts b/packages/plugins/src/dataTypes/Date/Date.generate.ts
new file mode 100644
index 000000000..ebeacec7e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/Date.generate.ts
@@ -0,0 +1,20 @@
+import { format, fromUnixTime } from 'date-fns';
+import { DTGenerationData, DTGenerateResult } from '~types/dataTypes';
+import { isValidDateFormat } from '~utils/dateUtils';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { fromDate, toDate, format: displayFormat } = data.rowState;
+  if (!displayFormat) {
+    return { display: '' };
+  }
+  const date = utils.randomUtils.getRandomNum(fromDate, toDate);
+
+  // if they entered an invalid date format the UI will let them know
+  let display = '';
+  if (isValidDateFormat(displayFormat)) {
+    display = format(fromUnixTime(date), displayFormat);
+  }
+
+  return { display };
+};
diff --git a/packages/plugins/src/dataTypes/Date/Date.scss b/packages/plugins/src/dataTypes/Date/Date.scss
new file mode 100644
index 000000000..127469344
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/Date.scss
@@ -0,0 +1,62 @@
+.dateRow {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: 4px;
+
+    label {
+        margin-right: 6px;
+    }
+
+    span {
+        text-transform: none;
+    }
+}
+
+.formatCodeLabel {
+	margin-right: 4px;
+}
+
+.dateField {
+    margin: 0;
+
+    div input {
+        border: 0;
+    }
+
+    & > div {
+        border-bottom: 0;
+    }
+}
+
+.dateBtn {
+	background-color: #ffffff;
+	padding: 4px 6px;
+}
+
+.row {
+	display: flex;
+	align-items: flex-start;
+	padding-bottom: 12px;
+
+	.col1 {
+		flex: 0 0 70px;
+	}
+	.col2 {
+		flex: 1;
+	}
+	.col3 {
+		flex: 1;
+		color: #999999;
+	}
+
+	label {
+		background-color: #dfecfc;
+		border-radius: 3px;
+		padding: 1px 6px;
+	}
+}
+
+.copy {
+	margin: 4px 0 0 4px;
+}
diff --git a/packages/plugins/src/dataTypes/Date/Date.scss.d.ts b/packages/plugins/src/dataTypes/Date/Date.scss.d.ts
new file mode 100644
index 000000000..a4945d397
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/Date.scss.d.ts
@@ -0,0 +1,20 @@
+declare namespace DateScssNamespace {
+  export interface IDateScss {
+    col1: string;
+    col2: string;
+    col3: string;
+    copy: string;
+    dateBtn: string;
+    dateField: string;
+    dateRow: string;
+    formatCodeLabel: string;
+    row: string;
+  }
+}
+
+declare const DateScssModule: DateScssNamespace.IDateScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: DateScssNamespace.IDateScss;
+};
+
+export = DateScssModule;
diff --git a/packages/plugins/src/dataTypes/Date/Date.state.tsx b/packages/plugins/src/dataTypes/Date/Date.state.tsx
new file mode 100755
index 000000000..654174271
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/Date.state.tsx
@@ -0,0 +1,19 @@
+import { addYears, format, subYears } from 'date-fns';
+
+export type DateState = {
+	fromDate: number;
+	toDate: number;
+	example: string;
+	format: string;
+};
+
+export type GenerationOptionsType = Omit<DateState, 'example'>;
+
+export const initialState: DateState = {
+	fromDate: parseInt(format(subYears(new Date(), 1), 't'), 10),
+	toDate: parseInt(format(addYears(new Date(), 1), 't'), 10),
+	example: 'MMM d, y',
+	format: 'MMM d, y'
+};
+
+export const defaultGenerationOptions = initialState;
diff --git a/packages/plugins/src/dataTypes/Date/Date.tsx b/packages/plugins/src/dataTypes/Date/Date.tsx
new file mode 100755
index 000000000..73b9e26cf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/Date.tsx
@@ -0,0 +1,211 @@
+import * as React from 'react';
+import { format, fromUnixTime } from 'date-fns';
+import { LocalizedDatePicker, LocalizedDatePickerProvider } from '~components/datePicker/LocalizedDatePicker.component';
+import Button from '@mui/material/Button';
+import Dropdown from '~components/dropdown/Dropdown';
+import Event from '@mui/icons-material/Event';
+import ArrowRightAlt from '@mui/icons-material/ArrowRightAlt';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import { ErrorTooltip } from '~components/tooltips';
+import TextField from '~components/TextField';
+import CopyToClipboard from '~components/copyToClipboard/CopyToClipboard';
+import { isValidDateFormat } from '@generatedata/utils/date';
+import * as sharedStyles from '../../../styles/shared.scss';
+import { DateState, GenerationOptionsType } from './Date.state';
+import * as styles from './Date.scss';
+import C from '@generatedata/config/constants';
+
+export const rowStateReducer = ({ fromDate, toDate, format }: DateState): GenerationOptionsType => ({
+  fromDate,
+  toDate,
+  format
+});
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'date'
+  },
+  sql: {
+    field: 'varchar(255)',
+    field_Oracle: 'varchar2(255)',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
+
+export const getOptions = (): any[] => {
+  const now = new Date();
+
+  const options: any = [];
+  const formats = [
+    'MMM d, y', // Jan 1, 2020
+    'MMMM do, y', // January 1st, 2020
+    'EEE, MMM dd', // Wed, Jan 01
+    'EEE, MMM do, y', // Wed, Jan 1st, 2012
+    'LL.dd.yy', // 03.25.20
+    'LL-dd-yy', // 03-25-06
+    'LL/dd/yy', // 03/25/06,
+    'LL/dd/y', // 03/25/2012
+    'dd.LL.yy', // 25.03.2020
+    'dd-LL-yy', // 25-03-06
+    'dd/LL/y' // 25/03/2012
+  ];
+  formats.forEach((currFormat) => {
+    options.push({
+      label: format(new Date(now.getFullYear(), now.getMonth(), now.getDate()), currFormat),
+      value: currFormat
+    });
+  });
+
+  return options.concat([
+    { label: 'MySQL datetime', value: 'y-LL-dd HH:mm:ss' },
+    { label: 'Unix timestamp (secs)', value: 't' },
+    { label: 'Unix timestamp (millisecs)', value: 'T' }
+  ]);
+};
+
+export const Example = ({ i18n, data, onUpdate }: DTExampleProps) => {
+  const onChange = ({ value }: { value: string }): void => {
+    onUpdate({
+      ...data,
+      example: value,
+      format: value
+    });
+  };
+
+  return <Dropdown placeholder={i18n.dateFormat} value={data.example} options={getOptions()} onChange={onChange} />;
+};
+
+// N.B. The DatePicker component is out of date now. There appears to be a bug where even though setting the right date
+// it doesn't show it properly. This happens all the time when clicking on the "to" field (the second one). That shows
+// the first date. Soon as you click out of the dialog, you can see it set itself to right value. Clicking again shows
+// the right value. I couldn't find any doc about this issue & I don't recall it occurring with earlier versions of this
+// code. Upgrading is probably the best option but that's a lot of work, so for now there are two pickers, one for From and
+// To each. Klutzy, but functional.
+export const Options = ({ data, onUpdate, i18n, coreI18n }: DTOptionsProps) => {
+  const [fromDatePickerOpen, setFromDatePickerOpen] = React.useState(false);
+  const [toDatePickerOpen, setToDatePickerOpen] = React.useState(false);
+  const [selectedDatePicker, setDatePicker] = React.useState('fromDate');
+
+  const onChange = (field: string, value: any): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  const onBtnClick = (btn: string): void => {
+    setDatePicker(btn);
+    if (btn === 'fromDate') {
+      setFromDatePickerOpen(true);
+    } else {
+      setToDatePickerOpen(true);
+    }
+  };
+
+  const onSelectDate = (btn: string, value: any): void => {
+    onChange(btn, parseInt(value, 10));
+    setFromDatePickerOpen(false);
+    setToDatePickerOpen(false);
+  };
+
+  let toDateClass = styles.dateBtn;
+  let toDateError = '';
+  if (data.fromDate > data.toDate) {
+    toDateClass += ` ${sharedStyles.errorField}`;
+    toDateError = i18n.endDateEarlierThanStartDate;
+  }
+
+  let formatError = coreI18n.requiredField;
+  if (data.format) {
+    formatError = '';
+
+    if (!isValidDateFormat(data.format)) {
+      formatError = i18n.invalidDateFormat;
+    }
+  }
+
+  return (
+    <LocalizedDatePickerProvider>
+      <div>
+        <div className={styles.dateRow}>
+          <Button onClick={(): void => onBtnClick('fromDate')} variant="outlined" disableElevation className={styles.dateBtn}>
+            <span style={{ marginRight: 3 }}>{format(fromUnixTime(data.fromDate), C.DATE_FORMAT)}</span>
+            <Event />
+          </Button>
+          <ArrowRightAlt />
+          <ErrorTooltip title={toDateError} arrow disableHoverListener={!toDateError} disableFocusListener={!toDateError}>
+            <Button onClick={(): void => onBtnClick('toDate')} variant="outlined" disableElevation className={toDateClass}>
+              <span style={{ marginRight: 3 }}>{format(fromUnixTime(data.toDate), C.DATE_FORMAT)}</span>
+              <Event />
+            </Button>
+          </ErrorTooltip>
+        </div>
+        <div>
+          <span className={styles.formatCodeLabel}>{i18n.formatCode}</span>
+          <TextField
+            error={formatError}
+            value={data.format}
+            style={{ width: 140 }}
+            onChange={(e: any): void => onChange('format', e.target.value)}
+          />
+        </div>
+        <div style={{ display: 'none' }}>
+          <LocalizedDatePicker
+            autoOk
+            open={fromDatePickerOpen}
+            className={styles.dateField}
+            value={fromUnixTime(data.fromDate)}
+            onChange={(val: any): void => onSelectDate(selectedDatePicker, format(val, 't'))}
+            onClose={(): void => setFromDatePickerOpen(false)}
+          />
+          <LocalizedDatePicker
+            autoOk
+            open={toDatePickerOpen}
+            className={styles.dateField}
+            value={fromUnixTime(data.toDate)}
+            onChange={(val: any): void => onSelectDate(selectedDatePicker, format(val, 't'))}
+            onClose={(): void => setToDatePickerOpen(false)}
+          />
+        </div>
+      </div>
+    </LocalizedDatePickerProvider>
+  );
+};
+
+const Copy = ({ content, tooltip, message }: any) => (
+  <span className={styles.copy}>
+    <CopyToClipboard content={content} message={message} tooltip={tooltip} />
+  </span>
+);
+
+const generateRows = (letters: string[], i18n: any, coreI18n: any) =>
+  letters.map((letter: string) => (
+    <div className={styles.row} key={letter}>
+      <div className={styles.col1}>
+        <label>{letter}</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content={letter} message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2}>{i18n[`${letter}Format`]}</div>
+      <div className={styles.col3}>{i18n[`${letter}FormatExample`]}</div>
+    </div>
+  ));
+
+export const Help = ({ coreI18n, i18n }: DTHelpProps) => (
+  <>
+    <p dangerouslySetInnerHTML={{ __html: i18n.helpIntro }} />
+
+    <h3>{i18n.day}</h3>
+    {generateRows(['d', 'do', 'E', 'EEEE', 'EEEEE', 'EEEEEE', 'D'], i18n, coreI18n)}
+
+    <h3>{i18n.week}</h3>
+    {generateRows(['l'], i18n, coreI18n)}
+
+    <h3>{i18n.month}</h3>
+    {generateRows(['M', 'Mo', 'MMM', 'MMMM'], i18n, coreI18n)}
+
+    <h3>{i18n.year}</h3>
+    {generateRows(['Y'], i18n, coreI18n)}
+  </>
+);
diff --git a/packages/plugins/src/dataTypes/Date/Date.worker.ts b/packages/plugins/src/dataTypes/Date/Date.worker.ts
new file mode 100644
index 000000000..9c80d2bdc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/Date.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Date.generate';
+
+let workerUtilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!workerUtilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		workerUtilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Date/README.md b/packages/plugins/src/dataTypes/Date/README.md
new file mode 100644
index 000000000..2553e6b79
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/README.md
@@ -0,0 +1,70 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Date
+
+This Data Type generates a random date in a particular format. 
+
+- the `fromDate` and `toDate` settings should be a number in _seconds timestamp_ format. I realize this isn't the 
+easiest format to work with, so we have a feature request to improve the DX here: https://github.com/benkeen/generatedata/issues/825
+Try using an online service such as the [epochconvertor site](https://www.epochconverter.com/) to generate those values for you.
+- the `placeholder` setting should define a date format as per the [datefns library formatting options](https://date-fns.org/v2.16.1/docs/format). 
+
+## Typings
+
+```typescript
+export type GenerationOptionsType = {
+	fromDate: number;
+	toDate: number;
+	format: string;
+};
+```
+
+## Examples
+
+### Any date from from Jan 1st 2023, to Dec 31st, 2023 in `MMM, d, Y` format.
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Date',
+            title: 'date1',
+            settings: {
+                fromDate: 1672531200,
+                toDate: 1702511999,
+                format: 'MMM d, y'
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+ 
+Sample output:
+
+```
+[
+    {
+        "date1": "Jul 26, 2023"
+    },
+    {
+        "date1": "Mar 25, 2023"
+    },
+    {
+        "date1": "Oct 1, 2023"
+    },
+    {
+        "date1": "Nov 27, 2023"
+    },
+    {
+        "date1": "Aug 13, 2023"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/Date/__tests__/Date.ui.test.ts b/packages/plugins/src/dataTypes/Date/__tests__/Date.ui.test.ts
new file mode 100644
index 000000000..5146746a9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/__tests__/Date.ui.test.ts
@@ -0,0 +1,29 @@
+import { format } from 'date-fns';
+import * as ui from '../Date';
+
+const date = new Date(2020, 0, 3);
+
+describe('getOptions', () => {
+    it('confirm that all provided formats generate the expected value', () => {
+		const expected: any = {
+			'MMM d, y': 'Jan 3, 2020',
+			'MMMM do, y': 'January 3rd, 2020',
+			'EEE, MMM dd': 'Fri, Jan 03',
+			'EEE, MMM do, y': 'Fri, Jan 3rd, 2020',
+			'LL.dd.yy': '01.03.20',
+			'LL-dd-yy': '01-03-20',
+			'LL/dd/yy': '01/03/20',
+			'LL/dd/y': '01/03/2020',
+			'dd.LL.yy': '03.01.20',
+			'dd-LL-yy': '03-01-20',
+			'dd/LL/y': '03/01/2020',
+			'y-LL-dd HH:mm:ss': '2020-01-03 00:00:00'
+		};
+
+		ui.getOptions().forEach(({ value }: any) => {
+			if (expected.hasOwnProperty(value)) {
+				expect(format(date, value)).toEqual(expected[value]);
+			}
+		});
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Date/bundle.ts b/packages/plugins/src/dataTypes/Date/bundle.ts
new file mode 100644
index 000000000..e0c099541
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/bundle.ts
@@ -0,0 +1,14 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, Example, Options, rowStateReducer, getMetadata } from './Date';
+import { initialState } from './Date.state';
+
+const bundle: DTBundle = {
+	initialState,
+	rowStateReducer,
+	Help,
+	Example,
+	Options,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Date/config.ts b/packages/plugins/src/dataTypes/Date/config.ts
new file mode 100644
index 000000000..1809bab96
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'humanData',
+  fieldGroupOrder: 40
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Date/i18n/ar.json b/packages/plugins/src/dataTypes/Date/i18n/ar.json
new file mode 100644
index 000000000..0d9b5f6a3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/ar.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "تاريخ",
+  "DESC": "يولد تاريخًا منسقًا مخصصًا / تاريخًا / وقتًا بين تاريخين.",
+  "DEFAULT_TITLE": "تاريخ",
+  "day": "يوم",
+  "description": "وصف",
+  "example": "مثال",
+  "formatCode": "كود التنسيق:",
+  "from": "من عند:",
+  "dFormat": "يوم من الشهر بدون أصفار بادئة",
+  "dFormatExample": "من 1 إلى 31",
+  "doFormat": "يوم من الشهر مع لاحقة",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "يوم من الشهر بالأصفار البادئة",
+  "ddFormatExample": "من 01 إلى 31",
+  "EFormat": "يوم من الأسبوع",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "يوم من الأسبوع ، ممتلئ",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "يوم من الأسبوع ، حرف واحد",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "يوم من الأسبوع ، حرفان",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "يوم السنة",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "أسبوع ISO من العام",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "الشهر من العام",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "شهر من السنة غير مبطن",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "شهر من ثلاثة أحرف من السنة",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "شهر كامل من العام",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "السنة",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "يُنشئ نوع البيانات هذا بشكل عشوائي تاريخًا منسقًا بين تاريخين. راجع الجدول أدناه للحصول على قائمة بقواعد التنسيق القابلة للتطبيق. هذه مأخوذة من خيارات تنسيق تاريخ fns. استخدم مثال القائمة المنسدلة للاختيار من تنسيقات التاريخ القياسية.",
+  "month": "شهر",
+  "to": "إلى:",
+  "week": "أسبوع",
+  "year": "عام",
+  "endDateEarlierThanStartDate": "يجب أن يأتي تاريخ الانتهاء بعد تاريخ البدء",
+  "dateFormat": "صيغة التاريخ",
+  "invalidDateFormat": "تنسيق غير صالح. انقر فوق رمز تعليمات الصف للحصول على خيارات التنسيق المتاحة."
+}
diff --git a/packages/plugins/src/dataTypes/Date/i18n/de.json b/packages/plugins/src/dataTypes/Date/i18n/de.json
new file mode 100644
index 000000000..e344c7421
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/de.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Date",
+  "DESC": "Generates a custom formatted date/datetime/time between two dates.",
+  "DEFAULT_TITLE": "date",
+  "day": "Day",
+  "description": "Description",
+  "example": "Example",
+  "formatCode": "Format code:",
+  "from": "From:",
+  "dFormat": "Day of the month without leading zeros",
+  "dFormatExample": "1 to 31",
+  "doFormat": "Day of the month with suffix",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "Day of the month with leading zeros",
+  "ddFormatExample": "01 through 31",
+  "EFormat": "Day of week",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "Day of week, full",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "Day of week, single char",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "Day of week, two chars",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "The day of the year",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "ISO week of year",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "Month of year",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "Zero-padded month of year",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "Three-letter month of year",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "Full month of year",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "The year",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "This data type randomly generates a formatted date between two dates. See the table below for a list of viable formatting rules. These are taken from the <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">date-fns date formatting options</a>. Use the example dropdown to select from standard date formats.",
+  "month": "Month",
+  "to": "To:",
+  "week": "Week",
+  "year": "Year",
+  "endDateEarlierThanStartDate": "The end date should be later than the start date",
+  "dateFormat": "Date format",
+  "invalidDateFormat": "Ungültiges Format. Klicken Sie auf das Zeilenhilfesymbol, um die verfügbaren Formatierungsoptionen anzuzeigen."
+}
diff --git a/packages/plugins/src/dataTypes/Date/i18n/en.json b/packages/plugins/src/dataTypes/Date/i18n/en.json
new file mode 100644
index 000000000..1704f17c7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/en.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Date",
+  "DESC": "Generates a custom formatted date/datetime/time between two dates.",
+  "DEFAULT_TITLE": "date",
+  "day": "Day",
+  "description": "Description",
+  "example": "Example",
+  "formatCode": "Format code:",
+  "from": "From:",
+  "dFormat": "Day of the month without leading zeros",
+  "dFormatExample": "1 to 31",
+  "doFormat": "Day of the month with suffix",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "Day of the month with leading zeros",
+  "ddFormatExample": "01 through 31",
+  "EFormat": "Day of week",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "Day of week, full",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "Day of week, single char",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "Day of week, two chars",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "The day of the year",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "ISO week of year",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "Month of year",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "Zero-padded month of year",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "Three-letter month of year",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "Full month of year",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "The year",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "This data type randomly generates a formatted date between two dates. See the table below for a list of viable formatting rules. These are taken from the <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">date-fns date formatting options</a>. Use the example dropdown to select from standard date formats.",
+  "month": "Month",
+  "to": "To:",
+  "week": "Week",
+  "year": "Year",
+  "endDateEarlierThanStartDate": "The end date should be later than the start date",
+  "dateFormat": "Date format",
+  "invalidDateFormat": "Invalid format. Click on row help icon for available formatting options."
+}
diff --git a/packages/plugins/src/dataTypes/Date/i18n/es.json b/packages/plugins/src/dataTypes/Date/i18n/es.json
new file mode 100644
index 000000000..98c9383e3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/es.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Fecha",
+  "DESC": "Genera una fecha / fecha / hora / hora con formato personalizado entre dos fechas.",
+  "DEFAULT_TITLE": "fecha",
+  "day": "Día",
+  "description": "Descripción",
+  "example": "Ejemplo",
+  "formatCode": "Código de formato:",
+  "from": "Desde:",
+  "dFormat": "Día del mes sin ceros a la izquierda",
+  "dFormatExample": "1 hasta 31",
+  "doFormat": "Día del mes con sufijo",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "Día del mes con ceros a la izquierda",
+  "ddFormatExample": "01 a 31",
+  "EFormat": "Día de la semana",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "Día de la semana, llena",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "Día de la semana, carácter único",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "Day of week, two chars",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "El día del año",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "Semana ISO del año",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "Mes del año",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "Zero-padded month of year",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "Mes del año de tres letras",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "Mes completo del año",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "El año",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "Este tipo de datos genera aleatoriamente una fecha formateada entre dos fechas. Consulte la tabla a continuación para obtener una lista de reglas de formato viables. Estos se han tomado de las <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">opciones de formato de fecha date-fns</a> . Utilice el menú desplegable de ejemplo para seleccionar entre los formatos de fecha estándar.",
+  "month": "Mes",
+  "to": "A:",
+  "week": "Semana",
+  "year": "Año",
+  "endDateEarlierThanStartDate": "La fecha de finalización debe ser posterior a la fecha de inicio.",
+  "dateFormat": "Formato de fecha",
+  "invalidDateFormat": "Formato inválido. Haga clic en el icono de ayuda de la fila para ver las opciones de formato disponibles."
+}
diff --git a/packages/plugins/src/dataTypes/Date/i18n/fr.json b/packages/plugins/src/dataTypes/Date/i18n/fr.json
new file mode 100644
index 000000000..3e7bab5a6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/fr.json
@@ -0,0 +1,61 @@
+{
+  "NAME": "Date",
+  "DESC": "Génère une date / date / heure / heure formatée personnalisée entre deux dates.",
+  "DEFAULT_TITLE": "date",
+  "day": "journée",
+  "description": "La description",
+  "example": "Example",
+  "formatCode": "Code de format:",
+  "from": "De:",
+  "dFormat": "Jour du mois sans zéros non significatifs",
+  "dFormatExample": "1 à 31",
+  "doFormat": "Jour du mois avec suffixe",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "Jour du mois avec zéros non significatifs",
+  "ddFormatExample": "01 à 31",
+  "EFormat": "Jour de la semaine",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "Jour de la semaine, plein",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "Jour de la semaine, un seul caractère",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "Jour de la semaine, deux caractères",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "Le jour de l'année",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "Semaine ISO de l'année",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "Mois de l'année",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "Mois de l'année sans rembourrage",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "Mois de l'année à trois lettres",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "Mois complet de l'année",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "L'année",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "Ce type de données génère de manière aléatoire une date formatée entre deux dates. Consultez le tableau ci-dessous pour une liste de règles de mise en forme viables. Celles-ci proviennent des <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">options de mise en forme de date date-fns</a>. Utilisez l'exemple de liste déroulante pour sélectionner parmi les formats de date standard.",
+  "month": "Mois",
+  "to": "À:",
+  "week": "La semaine",
+  "year": "An",
+  "endDateEarlierThanStartDate": "La date de fin doit être postérieure à la date de début",
+  "dateFormat": "Format de date",
+  "invalidDateFormat": "Format invalide. Cliquez sur l'icône d'aide de ligne pour les options de formatage disponibles."
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/plugins/src/dataTypes/Date/i18n/hi.json b/packages/plugins/src/dataTypes/Date/i18n/hi.json
new file mode 100644
index 000000000..443a67655
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/hi.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "दिनांक",
+  "DESC": "दो तिथियों के बीच एक कस्टम स्वरूपित दिनांक/दिनांक समय/समय उत्पन्न करता है।",
+  "DEFAULT_TITLE": "दिनांक",
+  "day": "दिन",
+  "description": "विवरण",
+  "example": "उदाहरण",
+  "formatCode": "प्रारूप कोड:",
+  "from": "से:",
+  "dFormat": "अग्रणी शून्य के बिना महीने का दिन",
+  "dFormatExample": "1 से 31",
+  "doFormat": "प्रत्यय के साथ महीने का दिन",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "प्रमुख शून्य के साथ महीने का दिन",
+  "ddFormatExample": "01 से 31",
+  "EFormat": "सप्ताह के दिन",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "सप्ताह का दिन, पूर्ण",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "सप्ताह का दिन, एकल चर",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "सप्ताह का दिन, दो वर्ण",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "साल का दिन",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "ISO साल का सप्ताह",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "साल का महीना",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "साल का शून्य-गद्देदार महीना",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "साल का तीन अक्षर वाला महीना",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "साल का पूरा महीना",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "वर्ष",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "यह डेटा प्रकार बेतरतीब ढंग से दो तिथियों के बीच एक स्वरूपित दिनांक उत्पन्न करता है। व्यवहार्य स्वरूपण नियमों की सूची के लिए नीचे दी गई तालिका देखें। ये <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">date-fns</a> दिनांक स्वरूपण विकल्पों से लिए गए हैं . मानक दिनांक स्वरूपों में से चयन करने के लिए उदाहरण ड्रॉपडाउन का उपयोग करें।",
+  "month": "महीना",
+  "to": "प्रति:",
+  "week": "सप्ताह",
+  "year": "वर्ष",
+  "endDateEarlierThanStartDate": "खत्म होने की तारीख, शुरू होने की तारीख के बाद की होनी चाहिए",
+  "dateFormat": "डेटा प्रारूप",
+  "invalidDateFormat": "अवैध प्रारूप। उपलब्ध स्वरूपण विकल्पों के लिए पंक्ति सहायता आइकन पर क्लिक करें।"
+}
diff --git a/packages/plugins/src/dataTypes/Date/i18n/ja.json b/packages/plugins/src/dataTypes/Date/i18n/ja.json
new file mode 100644
index 000000000..b73cb9054
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/ja.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "日付",
+  "DESC": "2つの日付の間のカスタム形式の日付/日時/時刻を生成します。",
+  "DEFAULT_TITLE": "日付",
+  "day": "日",
+  "description": "説明",
+  "example": "例",
+  "formatCode": "フォーマットコード：",
+  "from": "から：",
+  "dFormat": "先行ゼロのない月の日",
+  "dFormatExample": "1から31",
+  "doFormat": "接尾辞が付いた月の日",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "先行ゼロのある月の日",
+  "ddFormatExample": "01から31",
+  "EFormat": "曜日",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "曜日、満員",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "曜日、単一文字",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "曜日、2文字",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "年間最優秀日",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "ISOの週",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "年の月",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "ゼロが埋め込まれた月",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "1年の3文字の月",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "一年の丸月",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "年",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "このデータ型は、2つの日付の間にフォーマットされた日付をランダムに生成します。 実行可能なフォーマット規則のリストについては、以下の表を参照してください。 これらは、<a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">date-fns</a>日付フォーマットオプション</a>から取得されます。 。 ドロップダウンの例を使用して、標準の日付形式から選択します。",
+  "month": "月",
+  "to": "に：",
+  "week": "週間",
+  "year": "年",
+  "endDateEarlierThanStartDate": "終了日は開始日より後でなければなりません",
+  "dateFormat": "日付形式",
+  "invalidDateFormat": "無効な形式。 使用可能な書式設定オプションを表示するには、行のヘルプ アイコンをクリックします。"
+}
diff --git a/packages/plugins/src/dataTypes/Date/i18n/nl.json b/packages/plugins/src/dataTypes/Date/i18n/nl.json
new file mode 100644
index 000000000..deb48b7e9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/nl.json
@@ -0,0 +1,65 @@
+{
+  "NAME": "Datum",
+  "DESC": "Genereert een aangepaste opgemaakte datum / datetime / tijd tussen twee datums.",
+  "DEFAULT_TITLE": "datum",
+  "day": "Dag",
+  "description": "Omschrijving",
+  "example": "Voorbeeld",
+  "formatCode": "Formaatcode:",
+  "from": "Van:",
+  "dFormat": "Dag van de maand zonder voorloopnullen",
+  "dFormatExample": "1 tot 31",
+  "doFormat": "Dag van de maand met achtervoegsel",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "Dag van de maand met voorloopnullen",
+  "ddFormatExample": "01 tot en met 31",
+  "EFormat": "Dag van de week",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "Dag van de week, vol",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "Dag van de week, één teken",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "Dag van de week, twee tekens",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "De dag van het jaar",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "ISO week van het jaar",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "Maand van het jaar",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "Nul-gewatteerde maand van het jaar",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "Maand van het jaar met drie letters",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "Volledige maand van het jaar",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "Het jaar",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "Dit gegevenstype genereert willekeurig een opgemaakte datum tussen twee datums. Zie de onderstaande tabel voor een lijst met bruikbare opmaakregels. Deze zijn afkomstig uit de <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">date-fns datumopmaakopties</a>. Gebruik het vervolgkeuzemenu met voorbeelden om uit de standaard datumnotaties te kiezen.",
+  "month": "Maand",
+  "to": "Naar:",
+  "week": "Week",
+  "year": "Jaar",
+  "endDateEarlierThanStartDate": "De einddatum moet later zijn dan de startdatum",
+  "dateFormat": "Date format",
+  "invalidDateFormat": "Ongeldig formaat. Klik op het rijhulppictogram voor beschikbare opmaakopties."
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/plugins/src/dataTypes/Date/i18n/pt.json b/packages/plugins/src/dataTypes/Date/i18n/pt.json
new file mode 100644
index 000000000..be1cbf20b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/pt.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Encontro",
+  "DESC": "Gera uma data / data / hora / hora formatada personalizada entre duas datas.",
+  "DEFAULT_TITLE": "encontro",
+  "day": "Dia",
+  "description": "Descrição",
+  "example": "Exemplo",
+  "formatCode": "Código de formato:",
+  "from": "Desde:",
+  "dFormat": "Dia do mês sem zeros à esquerda",
+  "dFormatExample": "1 a 31",
+  "doFormat": "Dia do mês com sufixo",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "Dia do mês com zeros à esquerda",
+  "ddFormatExample": "01 a 31",
+  "EFormat": "Dia da semana",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "Dia da semana, cheio",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "Dia da semana, caractere único",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "Dia da semana, dois caracteres",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "O dia do ano",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "Semana ISO do ano",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "Mês do ano",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "Mês do ano com zeros",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "Mês do ano com três letras",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "Mês inteiro do ano",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "O ano",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "Este tipo de dados gera aleatoriamente uma data formatada entre duas datas. Consulte a tabela abaixo para obter uma lista de regras de formatação viáveis. Eles são retirados das <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\"> opções de formatação de data date-fns </a> . Use o menu suspenso de exemplo para selecionar os formatos de data padrão.",
+  "month": "Mês",
+  "to": "Para:",
+  "week": "Semana",
+  "year": "Ano",
+  "endDateEarlierThanStartDate": "A data de término deve ser posterior à data de início",
+  "dateFormat": "Formato de data",
+  "invalidDateFormat": "Formato Inválido. Clique no ícone de ajuda da linha para obter as opções de formatação disponíveis."
+}
diff --git a/packages/plugins/src/dataTypes/Date/i18n/ru.json b/packages/plugins/src/dataTypes/Date/i18n/ru.json
new file mode 100644
index 000000000..3044edaa7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/ru.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Свидание",
+  "DESC": "Генерирует дату/дату/время/время в пользовательском формате между двумя датами.",
+  "DEFAULT_TITLE": "свидание",
+  "day": "День",
+  "description": "Описание",
+  "example": "Пример",
+  "formatCode": "Код формата:",
+  "from": "Из:",
+  "dFormat": "День месяца без лидирующих нулей",
+  "dFormatExample": "от 1 до 31",
+  "doFormat": "День месяца с суффиксом",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "День месяца с ведущими нулями",
+  "ddFormatExample": "с 01 по 31",
+  "EFormat": "День недели",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "День недели, полный",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "День недели, один символ",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "День недели, два символа",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "День года",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "ИСО неделя года",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "Месяц года",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "Месяц года с нулевым дополнением",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "Трехбуквенный месяц года",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "Полный месяц года",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "Год",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "Этот тип данных случайным образом генерирует отформатированную дату между двумя датами. См. таблицу ниже для списка жизнеспособных правил форматирования. Они взяты из <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">параметров форматирования даты date-fns</a>. . Используйте пример раскрывающегося списка, чтобы выбрать один из стандартных форматов даты.",
+  "month": "Месяц",
+  "to": "К:",
+  "week": "Неделя",
+  "year": "Год",
+  "endDateEarlierThanStartDate": "Дата окончания должна быть позже даты начала",
+  "dateFormat": "Формат даты",
+  "invalidDateFormat": "Неверный формат. Щелкните значок справки по строке, чтобы просмотреть доступные параметры форматирования."
+}
diff --git a/packages/plugins/src/dataTypes/Date/i18n/ta.json b/packages/plugins/src/dataTypes/Date/i18n/ta.json
new file mode 100644
index 000000000..f83523313
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/ta.json
@@ -0,0 +1,64 @@
+{
+  "NAME": "தேதி",
+  "DESC": "தனிப்பயன் வடிவமைக்கப்பட்ட தேதி / தேதிநேரம் / இரண்டு தேதிகளுக்கு இடையில் நேரத்தை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "தேதி",
+  "day": "நாள்",
+  "description": "விளக்கம்",
+  "example": "உதாரணமாக",
+  "formatCode": "வடிவமைப்பு குறியீடு:",
+  "from": "இருந்து:",
+  "dFormat": "முன்னணி பூஜ்ஜியங்கள் இல்லாமல் மாதத்தின் நாள்",
+  "dFormatExample": "1 முதல் 31 வரை",
+  "doFormat": "பின்னொட்டுடன் மாதத்தின் நாள்",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "முன்னணி பூஜ்ஜியங்களுடன் மாதத்தின் நாள்",
+  "ddFormatExample": "01 முதல் 31 வரை",
+  "EFormat": "வாரத்தின் நாள்",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "வாரத்தின் நாள், நிறைந்தது",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "வாரத்தின் நாள், ஒற்றை கரி",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "வாரத்தின் நாள், இரண்டு எழுத்துக்கள்",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "ஆண்டின் நாள்",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "ஆண்டின் ஐஎஸ்ஓ வாரம்",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "ஆண்டு மாதம்",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "ஆண்டின் பூஜ்ஜிய-திணிக்கப்பட்ட மாதம்",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "ஆண்டு மூன்று கடித மாதம்",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "ஆண்டின் முழு மாதம்",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "ஆண்டு",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "இந்த தரவு வகை தோராயமாக இரண்டு தேதிகளுக்கு இடையில் வடிவமைக்கப்பட்ட தேதியை உருவாக்குகிறது. சாத்தியமான வடிவமைப்பு விதிகளின் பட்டியலுக்கு கீழே உள்ள அட்டவணையைப் பார்க்கவும். இவை <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">date-fns தேதி வடிவமைப்பு விருப்பங்கள்</a> . நிலையான தேதி வடிவங்களிலிருந்து தேர்ந்தெடுக்க எடுத்துக்காட்டு கீழ்தோன்றலைப் பயன்படுத்தவும்.",
+  "month": "மாதம்",
+  "to": "க்கு:",
+  "week": "வாரம்",
+  "year": "ஆண்டு",
+  "endDateEarlierThanStartDate": "இறுதி தேதி தொடக்க தேதியை விட பிற்பகுதியில் இருக்க வேண்டும்",
+  "dateFormat": "தேதி வடிவம்",
+  "invalidDateFormat": "தவறான வடிவம். கிடைக்கக்கூடிய வடிவமைப்பு விருப்பங்களுக்கு வரிசை உதவி ஐகானைக் கிளிக் செய்யவும்."
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/plugins/src/dataTypes/Date/i18n/zh.json b/packages/plugins/src/dataTypes/Date/i18n/zh.json
new file mode 100644
index 000000000..365158752
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Date/i18n/zh.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "日期",
+  "DESC": "在两个日期之间生成自定义格式的日期/日期时间/时间。",
+  "DEFAULT_TITLE": "日期",
+  "day": "天",
+  "description": "描述",
+  "example": "例",
+  "formatCode": "格式代码：",
+  "from": "从：",
+  "dFormat": "没有前导零的月份中的一天",
+  "dFormatExample": "1至31",
+  "doFormat": "带后缀的日期",
+  "doFormatExample": "1st, 2nd, 3rd",
+  "ddFormat": "每月的前导零",
+  "ddFormatExample": "01至31",
+  "EFormat": "星期几",
+  "EFormatExample": "Mon, Tue, Wed",
+  "EEEEFormat": "星期几，已满",
+  "EEEEFormatExample": "Monday, Sunday",
+  "EEEEEFormat": "星期几，单字符",
+  "EEEEEFormatExample": "M, T, W, T, F, S, S",
+  "EEEEEEFormat": "星期几，两个字符",
+  "EEEEEEFormatExample": "Mo, Tu, We, Th, Fr, Su, Sa",
+  "DFormat": "一年中的一天",
+  "DFormatExample": "1, 2, ... 365",
+  "lFormat": "一年中的ISO周",
+  "lFormatExample": "1, 2, ... 53",
+  "MFormat": "一年中的月份",
+  "MFormatExample": "1, 2, ... 12",
+  "MoFormat": "一年零填充的月份",
+  "MoFormatExample": "01, 02, ... 12",
+  "MMMFormat": "一年中的三个字母",
+  "MMMFormatExample": "Jan, Feb, ... Dec",
+  "MMMMFormat": "一年中的整个月份",
+  "MMMMFormatExample": "January, ... December",
+  "YFormat": "那一年",
+  "YFormatExample": "2020, 2021",
+  "helpIntro": "此数据类型随机生成两个日期之间的格式化日期。 请参阅下表，以获取可行的格式设置规则列表。 这些取自<a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\"> date-fns日期格式设置选项</a> 。 使用示例下拉列表从标准日期格式中进行选择。",
+  "month": "月",
+  "to": "至：",
+  "week": "周",
+  "year": "年",
+  "endDateEarlierThanStartDate": "结束日期应晚于开始日期",
+  "dateFormat": "日期格式",
+  "invalidDateFormat": "无效的格式。单击行帮助图标以获得可用的格式选项。"
+}
diff --git a/packages/plugins/src/dataTypes/Email/Email.generate.ts b/packages/plugins/src/dataTypes/Email/Email.generate.ts
new file mode 100644
index 000000000..51d79a138
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/Email.generate.ts
@@ -0,0 +1,129 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+import { StringSourceEnum } from './Email.state';
+
+let utils: WorkerUtils;
+const MAX_EMAIL_LENGTH = 254;
+
+const getWords = (): string[] => {
+  const { words } = utils.stringUtils.getLipsumWords();
+  return words;
+};
+
+export const setUtils = (workerUtils: WorkerUtils) => (utils = workerUtils);
+
+export const cleanChars = (str: string): string => str.replace(/[^0-9a-zA-Z]/g, '').toLowerCase();
+export const cleanArray = (arr: string[]): string[] => arr.map(cleanChars);
+
+const getOneNameField = (name: string): string => {
+  const parts = cleanArray(name.split(/\s+/));
+  const delim = utils.randomUtils.getRandomArrayValue(['.', '_', '-', '']);
+  const randomSize = utils.randomUtils.getRandomNum(1, parts.length);
+
+  let email = utils.randomUtils.getRandomSubset(parts, randomSize).join(delim); // 5 is arbitrary - names should probably only ever have 2 or 3
+
+  if (utils.randomUtils.getRandomBool()) {
+    email += utils.randomUtils.getRandomNum(1, 9999);
+  }
+
+  return email;
+};
+
+const getTwoNameField = (data: string[]): string => {
+  const pattern = utils.randomUtils.getRandomNum(0, 3);
+  const delim = utils.randomUtils.getRandomArrayValue(['.', '_', '-', '']);
+
+  let email = '';
+  switch (pattern) {
+    case 0:
+      email = `${data[0]}${delim}${data[1]}`;
+      break;
+    case 1:
+      email = `${data[1]}${delim}${data[0]}`;
+      break;
+    case 2:
+      email = `${data[0].substring(0, 1)}${delim}${data[1]}`;
+      break;
+    case 3:
+      email = `${data[1].substring(0, 1)}${delim}${data[0]}`;
+      break;
+  }
+
+  if (utils.randomUtils.getRandomBool()) {
+    email += utils.randomUtils.getRandomNum(1, 9999);
+  }
+
+  return email;
+};
+
+export const getEmailPrefix = (fieldData: string[]): string => {
+  let prefix = '';
+  if (fieldData.length === 1) {
+    prefix = getOneNameField(fieldData[0]);
+  } else if (fieldData.length === 2) {
+    prefix = getTwoNameField(fieldData);
+  }
+  return prefix;
+};
+
+export const getRandomEmailPrefix = (wordsArr: string[]): string => {
+  const numWords = wordsArr.length;
+  const numPrefixWords = utils.randomUtils.getRandomNum(1, 3);
+  const offset = utils.randomUtils.getRandomNum(0, numWords - (numPrefixWords + 1));
+  const selectedWords = cleanArray(wordsArr.slice(offset, offset + numPrefixWords));
+  return selectedWords.join('.');
+};
+
+export const getDomain = (domains: string[], domainSuffixes: string[]): string => {
+  let domainStr = utils.randomUtils.getRandomArrayValue(domains);
+  if (domainStr.indexOf('.') === -1) {
+    domainStr += `.${utils.randomUtils.getRandomArrayValue(domainSuffixes)}`;
+  }
+  return domainStr;
+};
+
+const getFinalEmail = (prefix: string, domain: string): string => {
+  // if the email exceeded 254 chars (the max valid number of chars), truncate it. This could be way
+  // more elegant, but it's SUCH a fringe case I don't much mind
+  let email = `${prefix}@${domain}`.toLowerCase();
+
+  const length = email.length;
+  if (length > MAX_EMAIL_LENGTH) {
+    const prefixChunk = prefix.slice(0, Math.ceil(prefix.length / 2));
+    email = `${prefixChunk}@${domain}`.toLowerCase();
+  }
+
+  return email;
+};
+
+export const generate = (data: DTGenerationData, workerUtils: WorkerUtils): DTGenerateResult => {
+  setUtils(workerUtils);
+
+  const { source, fieldId1, fieldId2, domains, domainSuffixes } = data.rowState;
+  const { existingRowData } = data;
+
+  if (!domains.length || !domainSuffixes.length) {
+    return { display: '' };
+  }
+
+  let prefix = '';
+  if (!source || source === StringSourceEnum.random) {
+    const words = getWords();
+    prefix = getRandomEmailPrefix(words);
+  } else {
+    const fieldData: any[] = [];
+    existingRowData.forEach(({ id, data }) => {
+      if (id === fieldId1 || id === fieldId2) {
+        fieldData.push(cleanChars(data.display as string));
+      }
+    });
+
+    prefix = getEmailPrefix(fieldData);
+  }
+
+  const domain = getDomain(domains, domainSuffixes);
+
+  return {
+    display: getFinalEmail(prefix, domain)
+  };
+};
diff --git a/packages/plugins/src/dataTypes/Email/Email.scss b/packages/plugins/src/dataTypes/Email/Email.scss
new file mode 100644
index 000000000..8181b9101
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/Email.scss
@@ -0,0 +1,26 @@
+.buttonLabel {
+	margin-top: 4px;
+}
+
+.fieldRow {
+	flex: 1;
+	margin-top: 8px;
+
+	label {
+		display: flex;
+		padding: 3px 0;
+		color: #999999;
+	}
+
+	input {
+		width: 100%;
+	}
+
+	svg {
+		margin-left: 4px;
+	}
+}
+
+.fieldsRow {
+	display: flex;
+}
diff --git a/packages/plugins/src/dataTypes/Email/Email.scss.d.ts b/packages/plugins/src/dataTypes/Email/Email.scss.d.ts
new file mode 100644
index 000000000..7d92feace
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/Email.scss.d.ts
@@ -0,0 +1,14 @@
+declare namespace EmailScssNamespace {
+  export interface IEmailScss {
+    buttonLabel: string;
+    fieldRow: string;
+    fieldsRow: string;
+  }
+}
+
+declare const EmailScssModule: EmailScssNamespace.IEmailScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: EmailScssNamespace.IEmailScss;
+};
+
+export = EmailScssModule;
diff --git a/packages/plugins/src/dataTypes/Email/Email.state.tsx b/packages/plugins/src/dataTypes/Email/Email.state.tsx
new file mode 100644
index 000000000..915d7e2de
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/Email.state.tsx
@@ -0,0 +1,34 @@
+export const enum StringSourceEnum {
+	random = 'random',
+	fields = 'fields'
+}
+export type StringSource = `${StringSourceEnum}`;
+
+export type EmailState = {
+	source: StringSource;
+	fieldId1: string;
+	fieldId2: string;
+	domains: string;
+	domainSuffixes: string;
+}
+
+export const defaultDomains = 'google,hotmail,aol,icloud,outlook,yahoo,protonmail';
+export const defaultDomainSuffixes = 'com,org,ca,net,co.uk,edu';
+
+export const initialState: EmailState = {
+	source: StringSourceEnum.random,
+	fieldId1: '',
+	fieldId2: '',
+	domains: defaultDomains,
+	domainSuffixes: defaultDomainSuffixes
+};
+
+export type GenerationOptionsType = {
+	source: StringSource;
+	domains?: string[];
+	domainSuffixes?: string[];
+	fieldId1?: string;
+	fieldId2?: string;
+};
+
+export const defaultGenerationOptions = initialState;
diff --git a/packages/plugins/src/dataTypes/Email/Email.store.tsx b/packages/plugins/src/dataTypes/Email/Email.store.tsx
new file mode 100644
index 000000000..a300e1f61
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/Email.store.tsx
@@ -0,0 +1,12 @@
+import { createSelector } from 'reselect';
+import { getSortedRowsArray } from '~store/generator/generator.selectors';
+import { DTCustomProps } from '~types/dataTypes';
+
+const getNameRows = createSelector(
+	getSortedRowsArray,
+	(rows) => rows.map((row, index) => ({ ...row, index })).filter(({ dataType }) => dataType === 'Names')
+);
+
+export const customProps: DTCustomProps = {
+	nameRows: getNameRows
+};
diff --git a/packages/plugins/src/dataTypes/Email/Email.tsx b/packages/plugins/src/dataTypes/Email/Email.tsx
new file mode 100644
index 000000000..4ab58c92d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/Email.tsx
@@ -0,0 +1,200 @@
+import React from 'react';
+import Button from '@mui/material/Button';
+import InfoIcon from '@mui/icons-material/InfoOutlined';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import Dropdown from '~components/dropdown/Dropdown';
+import TextField from '~components/TextField';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import * as styles from './Email.scss';
+import { StringSourceEnum, EmailState, defaultDomainSuffixes, defaultDomains, GenerationOptionsType } from './Email.state';
+import { Tooltip } from '~components/tooltips';
+
+const EmailDialog = ({ visible, data, id, onClose, coreI18n, onUpdate, rowOptions, i18n }: any) => {
+  const getFieldsRow = () => {
+    if (data.source === StringSourceEnum.random) {
+      return null;
+    }
+
+    return (
+      <div className={styles.fieldsRow}>
+        <div className={styles.fieldRow} style={{ marginRight: 10 }}>
+          <label>{i18n.sourceDataField1}</label>
+          <Dropdown
+            value={data.fieldId1}
+            onChange={(item: any): any => onUpdate('fieldId1', item.value)}
+            options={[{ value: '', label: coreI18n.pleaseSelect }, ...rowOptions]}
+          />
+        </div>
+        <div className={styles.fieldRow}>
+          <label>{i18n.sourceDataField2}</label>
+          <Dropdown
+            value={data.fieldId2}
+            onChange={(item: any): any => onUpdate('fieldId2', item.value)}
+            options={[{ value: '', label: i18n.optional }, ...rowOptions]}
+          />
+        </div>
+      </div>
+    );
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.selectSource}</DialogTitle>
+        <DialogContent dividers>
+          <div>{i18n.emailDesc}</div>
+
+          <h3>{i18n.source}</h3>
+
+          <RadioPillRow>
+            <RadioPill
+              label={i18n.randomStringsLabel}
+              onClick={(): void => onUpdate('source', StringSourceEnum.random)}
+              name={`${id}-source`}
+              checked={data.source === StringSourceEnum.random}
+              tooltip={i18n.countryPluginsDesc}
+              style={{ marginRight: 10 }}
+            />
+            <RadioPill
+              label={i18n.fieldsLabel}
+              onClick={(): void => onUpdate('source', StringSourceEnum.fields)}
+              name={`${id}-source`}
+              checked={data.source === StringSourceEnum.fields}
+              disabled={rowOptions.length === 0}
+              tooltip={rowOptions.length === 0 ? 'disabled.' : ''}
+            />
+          </RadioPillRow>
+          {getFieldsRow()}
+          <div className={styles.fieldRow}>
+            <label>
+              {i18n.domains}
+              <Tooltip title={i18n.domainsDesc} arrow>
+                <InfoIcon />
+              </Tooltip>
+            </label>
+            <TextField
+              value={data.domains}
+              onChange={(e: any): void => onUpdate('domains', e.target.value)}
+              error={data.domains ? '' : coreI18n.requiredField}
+            />
+          </div>
+          <div className={styles.fieldRow}>
+            <label>
+              {i18n.domainSuffixes}
+              <Tooltip title={i18n.domainSuffixDesc} arrow>
+                <InfoIcon />
+              </Tooltip>
+            </label>
+            <TextField
+              value={data.domainSuffixes}
+              onChange={(e: any): void => onUpdate('domainSuffixes', e.target.value)}
+              error={data.domainSuffixes ? '' : coreI18n.requiredField}
+            />
+          </div>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+// earlier version of this DT didn't have any state whatsoever
+const getSafeState = (data: EmailState | undefined): EmailState => {
+  return data
+    ? data
+    : {
+        source: StringSourceEnum.random,
+        fieldId1: '',
+        fieldId2: '',
+        domains: defaultDomains,
+        domainSuffixes: defaultDomainSuffixes
+      };
+};
+
+export const Options = ({ i18n, coreI18n, id, data, onUpdate, nameRows }: DTOptionsProps) => {
+  const safeData = getSafeState(data);
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+
+  let label = `${i18n.source} ${i18n.random}`;
+  if (safeData.source === StringSourceEnum.fields) {
+    label = `${i18n.source} ${i18n.fieldsLabel}`;
+  }
+
+  const rowOptions = nameRows.map(({ id: currentId, title, index }: any) => ({
+    value: currentId,
+    label: `${i18n.row} #${index + 1}: ${title}`
+  }));
+
+  React.useEffect(() => {
+    if (!nameRows.length && safeData.source === StringSourceEnum.fields) {
+      onUpdate({
+        ...safeData,
+        source: StringSourceEnum.random
+      });
+    }
+  }, [nameRows]);
+
+  return (
+    <div className={styles.buttonLabel}>
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        <span dangerouslySetInnerHTML={{ __html: label }} />
+      </Button>
+      <EmailDialog
+        visible={dialogVisible}
+        data={safeData}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        onUpdate={(field: string, value: any): void => onUpdate({ ...safeData, [field]: value })}
+        rowOptions={rowOptions}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p>{i18n.emailHelp1}</p>
+
+    <h3>{i18n.sourceTitle}</h3>
+    <p>{i18n.emailHelp2}</p>
+
+    <h3>{i18n.domains}</h3>
+    <p>{i18n.emailHelp3}</p>
+
+    <h3>{i18n.domainSuffixes}</h3>
+    <p>{i18n.emailHelp4}</p>
+  </>
+);
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'varchar(255) default NULL',
+    field_Oracle: 'varchar2(255) default NULL',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
+
+export const rowStateReducer = (state: EmailState): GenerationOptionsType => {
+  const safeData = getSafeState(state);
+  return {
+    ...safeData,
+    domains: safeData.domains
+      .split(',')
+      .filter((i) => !!i)
+      .map((i) => i.replace(/[^0-9a-zA-Z]/g, '')),
+    domainSuffixes: safeData.domainSuffixes
+      .split(',')
+      .filter((i) => !!i)
+      .map((i) => i.replace(/[^0-9a-zA-Z]/g, ''))
+  };
+};
diff --git a/packages/plugins/src/dataTypes/Email/Email.worker.ts b/packages/plugins/src/dataTypes/Email/Email.worker.ts
new file mode 100644
index 000000000..cf8b5ddde
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/Email.worker.ts
@@ -0,0 +1,13 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from "./Email.generate";
+
+let utilsLoaded = false;
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Email/README.md b/packages/plugins/src/dataTypes/Email/README.md
new file mode 100644
index 000000000..5580ddf61
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/README.md
@@ -0,0 +1,29 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Email
+
+This Data Type generates a random email address. 
+
+### Example API Usage
+
+```javascript
+{
+    "numRows": 20,
+    "rows": [
+        {
+            "type": "Email",
+            "title": "Email"
+        }
+    ],
+    "export": {
+        "type": "JSON",
+        "settings": {
+            "stripWhitespace": false,
+            "dataStructureFormat": "complex"
+        }
+    }
+}
+```
+ 
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/dataTypes/Email/__tests__/Email.generate.test.ts b/packages/plugins/src/dataTypes/Email/__tests__/Email.generate.test.ts
new file mode 100644
index 000000000..2e0bf0303
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/__tests__/Email.generate.test.ts
@@ -0,0 +1,77 @@
+import * as sinon from 'sinon';
+import * as generation from '../Email.generate';
+import utils from '../../../../utils';
+
+const words = ['one', 'two', 'three', 'four', 'five', 'six'];
+describe('getRandomEmailPrefix', () => {
+    beforeAll(() => {
+        generation.setUtils(utils);
+    });
+
+    afterEach(function () {
+        sinon.restore();
+    });
+
+    it('generates an email address with a single word prefix (word before the @)', () => {
+        sinon.stub(utils.randomUtils, 'getRandomNum')
+            .onCall(0).returns(1)  // number of prefixed words
+            .onCall(1).returns(0); // prefix word offset
+
+        expect(generation.getRandomEmailPrefix(words)).toEqual('one');
+    });
+
+    it('gets a specific single prefix word', () => {
+        sinon.stub(utils.randomUtils, 'getRandomNum')
+            .onCall(0).returns(1)  // number of prefixed words
+            .onCall(1).returns(4); // prefix word offset
+
+        expect(generation.getRandomEmailPrefix(words)).toEqual('five');
+    });
+
+    it('multiple prefix words are separated by dots #1', () => {
+        sinon.stub(utils.randomUtils, 'getRandomNum')
+            .onCall(0).returns(2)  // number of prefixed words
+            .onCall(1).returns(3); // prefix word offset
+
+        expect(generation.getRandomEmailPrefix(words)).toEqual('four.five');
+    });
+
+    it('multiple prefix words are separated by dots #3', () => {
+        sinon.stub(utils.randomUtils, 'getRandomNum')
+            .onCall(0).returns(3)  // number of prefixed words
+            .onCall(1).returns(2); // prefix word offset
+
+        expect(generation.getRandomEmailPrefix(words)).toEqual('three.four.five');
+    });
+
+    it('punctuation in words (.,;:) are removed', () => {
+        sinon.stub(utils.randomUtils, 'getRandomNum')
+            .onCall(0).returns(4)  // number of prefixed words
+            .onCall(1).returns(0); // prefix word offset
+
+        expect(generation.getRandomEmailPrefix(['one.', 'two:', 'th,ree', 'four;'])).toEqual('one.two.three.four');
+    });
+
+    it('picks a random suffix', () => {
+        sinon.stub(utils.randomUtils, 'getRandomNum')
+            .onCall(0).returns(1) // number of prefixed words
+            .onCall(1).returns(0) // prefix word offset
+            .onCall(2).returns(1) // number of domain words
+			.onCall(3).returns(2); // domain word offset
+
+        expect(generation.getRandomEmailPrefix(words)).toEqual('one');
+    });
+
+    // it('truncates the email if it is over 254 chars', () => {
+    //     const words = ['a'.repeat(150), 'b'.repeat(150)];
+    //     sinon.stub(utils.randomUtils, 'getRandomNum')
+    //         .onCall(0).returns(1) // number of prefixed words
+    //         .onCall(1).returns(0) // prefix word offset
+    //         .onCall(2).returns(1) // number of domain words
+    //         .onCall(3).returns(1); // domain word offset
+	//
+	// 	sinon.stub(utils.randomUtils, 'getRandomArrayValue').returns('ca'); // suffix
+	//
+    //     expect(generation.getRandomEmailPrefix(words, ['b'.repeat(150)], ['ca'])).toEqual(`${'a'.repeat(75)}@${'b'.repeat(75)}.ca`);
+    // });
+});
diff --git a/packages/plugins/src/dataTypes/Email/bundle.ts b/packages/plugins/src/dataTypes/Email/bundle.ts
new file mode 100644
index 000000000..d093bd589
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/bundle.ts
@@ -0,0 +1,15 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, Options, getMetadata, rowStateReducer } from './Email';
+import { customProps } from './Email.store';
+import { initialState } from './Email.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Help,
+	Options,
+	getMetadata,
+	customProps,
+	rowStateReducer
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Email/config.ts b/packages/plugins/src/dataTypes/Email/config.ts
new file mode 100644
index 000000000..9e4b36505
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/config.ts
@@ -0,0 +1,41 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'humanData',
+  fieldGroupOrder: 30,
+  dependencies: [
+    'Alphanumeric',
+    'AutoIncrement',
+    'Boolean',
+    'City',
+    'Company',
+    'Constant',
+    'Country',
+    'Currency',
+    'CVV',
+    'Date',
+    'GUID',
+    'IBAN',
+    'LatLng',
+    'List',
+    'Names',
+    'NormalDistribution',
+    'NumberRange',
+    'OrganizationNumber',
+    'PAN',
+    'PersonalNumber',
+    'Phone',
+    'PIN',
+    'PostalZip',
+    'Region',
+    'Rut',
+    'SIRET',
+    'StreetAddress',
+    'TextFixed',
+    'TextRandom',
+    'Track1',
+    'Track2'
+  ]
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Email/i18n/ar.json b/packages/plugins/src/dataTypes/Email/i18n/ar.json
new file mode 100644
index 000000000..91848a30b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/ar.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "بريد الالكتروني",
+  "DESC": "يولد عنوان بريد إلكتروني عشوائي. حاليًا هذا فقط يولدهم من الكلمات العشوائية lorem ipsum.",
+  "DEFAULT_TITLE": "البريد الإلكتروني",
+  "row": "صف",
+  "source": "مصدر:",
+  "random": "عشوائي",
+  "fields": "مجالات",
+  "randomStringsLabel": "سلاسل عشوائية",
+  "fieldsLabel": "حقول الاسم",
+  "sourceDataField1": "حقل الاسم 1",
+  "sourceDataField2": "حقل الاسم 2 (اختياري)",
+  "optional": "اختياري",
+  "selectSource": "اختر مصدر",
+  "domains": "المجالات",
+  "domainSuffixes": "لاحقات المجال",
+  "domainSuffixDesc": "أدخل أي مجال تريده (.com ، .org) مفصولاً بفواصل.",
+  "domainsDesc": "أدخل أي مجالات تريد أن تظهر في عناوين البريد الإلكتروني هنا ، مفصولة بفواصل. ستظهر أي نطاقات تدخلها هنا تتضمن لاحقة (.com ، .org) دائمًا كما هي - أي أنها لن تظهر مع لاحقات المجال الأخرى.",
+  "sourceTitle": "مصدر",
+  "emailDesc": "بشكل افتراضي ، يُنشئ نوع البيانات هذا عناوين بريد إلكتروني عشوائية باستخدام نص lorem ipsum ، ولكن إذا كنت ترغب في إنشاء عناوين بريد إلكتروني تبدو أكثر واقعية ، فاستهدف واحدًا أو اثنين من حقول الاسم في مجموعة البيانات الخاصة بك لاستخدام هذه السلاسل كأساس لعنوان البريد الإلكتروني .",
+  "emailHelp1": "يقوم نوع البيانات هذا بإنشاء عناوين بريد إلكتروني عشوائية. اعتبارًا من الإصدار 4.0.6 ، هناك عدد قليل من الخيارات لتخصيص محتوى عنوان البريد الإلكتروني لجعله يبدو أكثر واقعية.",
+  "emailHelp2": "هنا لديك خياران: سلاسل عشوائية أو حقول. يتحكم هذا الإعداد في المواد المصدر للجزء المحلي - الجزء الذي يظهر قبل الحرف \"@\" في عنوان البريد الإلكتروني. يستخدم خيار Random Strings الافتراضي كلمات ipsum (نص العنصر النائب) كمواد مصدر ، بينما يتيح لك خيار الحقول استهداف حقول الاسم الأخرى في مجموعة البيانات الخاصة بك. يتيح لك ذلك إنشاء عناوين بريد إلكتروني تبدو أكثر واقعية.",
+  "emailHelp3": "قائمة بأسماء النطاقات المراد استخدامها مفصولة بفواصل. إذا كنت تريد أن يكون للمجال دائمًا لاحقة محددة (على سبيل المثال ، mydomain.com) ، فقط أدخل هذه السلسلة الكاملة هنا. خلاف ذلك ، سيختار البرنامج النصي بشكل عشوائي إحدى لاحقات المجال المحددة في الحقل التالي.",
+  "emailHelp4": "قائمة لواحق المجال مفصولة بفواصل (.com ، .ca وما إلى ذلك)."
+}
diff --git a/packages/plugins/src/dataTypes/Email/i18n/de.json b/packages/plugins/src/dataTypes/Email/i18n/de.json
new file mode 100644
index 000000000..2203d72d4
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/de.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "Email",
+  "DESC": "Erzeugt eine zufällige E-Mail-Adresse. Derzeit werden sie nur aus zufälligen Lorem-Ipsum-Wörtern generiert.",
+  "DEFAULT_TITLE": "email",
+  "row": "Reihe",
+  "source": "Quelle:",
+  "random": "willkürlich",
+  "fields": "Felder",
+  "randomStringsLabel": "Zufällige Zeichenfolgen",
+  "fieldsLabel": "Namensfelder",
+  "sourceDataField1": "Namensfeld 1",
+  "sourceDataField2": "Namensfeld 2 (optional)",
+  "optional": "Optional",
+  "selectSource": "Quelle auswählen",
+  "domains": "Domänen",
+  "domainSuffixes": "Domain-Suffixe",
+  "domainSuffixDesc": "Geben Sie eine beliebige Domain (.com, .org) durch Kommas getrennt ein.",
+  "domainsDesc": "Geben Sie hier alle Domains ein, die in den E-Mail-Adressen erscheinen sollen, getrennt durch Kommas. Alle hier eingegebenen Domains mit einem Suffix (.com, .org) werden immer unverändert angezeigt, d. h. sie werden nicht mit anderen Domain-Suffixen angezeigt.",
+  "sourceTitle": "Quelle",
+  "emailDesc": "Standardmäßig generiert dieser Datentyp zufällige E-Mail-Adressen mit Lorem ipsum-Text. Wenn Sie jedoch realistischer aussehende E-Mail-Adressen generieren möchten, verwenden Sie ein oder zwei Namensfelder in Ihrem Datensatz, um diese Zeichenfolgen als Grundlage der E-Mail-Adresse zu verwenden .",
+  "emailHelp1": "Dieser Datentyp generiert zufällige E-Mail-Adressen. Ab Version 4.0.6 gibt es einige Möglichkeiten, den Inhalt der E-Mail-Adresse so anzupassen, dass er realistischer aussieht.",
+  "emailHelp2": "Hier haben Sie zwei Möglichkeiten: Zufällige Zeichenfolgen oder Felder. Diese Einstellung steuert das Quellmaterial für den lokalen Teil - den Teil, der vor dem \"@\"-Zeichen in der E-Mail-Adresse erscheint. Die Standardoption Random Strings verwendet Lorem-Ipsum-Wörter (Platzhaltertext) als Quellmaterial, während Sie mit der Option Fields auf andere Namensfelder in Ihrem Datensatz abzielen können. Auf diese Weise können Sie E-Mail-Adressen generieren, die realistischer aussehen.",
+  "emailHelp3": "Eine durch Kommas getrennte Liste von zu verwendenden Domänennamen. Wenn Sie möchten, dass eine Domain immer ein bestimmtes Suffix hat (z. B. mydomain.com), geben Sie hier einfach diese vollständige Zeichenfolge ein. Andernfalls wählt das Skript zufällig eines der im nächsten Feld angegebenen Domänensuffixe aus.",
+  "emailHelp4": "Eine durch Kommas getrennte Liste von Domain-Suffixen (.com, .ca usw.)."
+}
diff --git a/packages/plugins/src/dataTypes/Email/i18n/en.json b/packages/plugins/src/dataTypes/Email/i18n/en.json
new file mode 100644
index 000000000..822552f4a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/en.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "Email",
+  "DESC": "Generates a random email address.",
+  "DEFAULT_TITLE": "email",
+  "row": "Row",
+  "source": "Source:",
+  "random": "random",
+  "fields": "fields",
+  "randomStringsLabel": "Random strings",
+  "fieldsLabel": "Name Fields",
+  "sourceDataField1": "Name field 1",
+  "sourceDataField2": "Name field 2 (optional)",
+  "optional": "Optional",
+  "selectSource": "Select source",
+  "domains": "Domains",
+  "domainSuffixes": "Domain suffixes",
+  "domainSuffixDesc": "Enter any domain suffixes you want (.com, .org) separated by commas.",
+  "domainsDesc": "Enter any domains you want to appear in the email addresses here, separated by commas. Any domains you enter that include a suffix (.com, .org) will always appear as-is - i.e. they won't appear with other domain suffixes.",
+  "sourceTitle": "Source",
+  "emailDesc": "By default this Data Type generates random email addresses using lorem ipsum text, but if you'd like to generate more realistic-looking email addresses, target one or two Name fields in your data set to use those strings as the basis of the email address.",
+  "emailHelp1": "This Data Type generates random email addresses. As of version 4.0.6, there are a few options for customizing the content of the email address to make it look more realistic.",
+  "emailHelp2": "Here you have two options: Random Strings or Fields. This setting controls the source material for the local part - the part that appears before the \"@\" character in the email address. The default Random Strings option uses lorem ipsum words (placeholder text) as the source material, whereas the Fields option lets you target other Name fields in your data set. This allows you to generate email addresses that look more realistic.",
+  "emailHelp3": "A comma-delimited list of domain names to use. If you want a domain to always have a specific suffix (e.g. mydomain.com), just enter that full string here. Otherwise, the script will randomly choose one of the domain suffixes specified in the next field.",
+  "emailHelp4": "A comma-delimited list of domain suffixes (.com, .ca etc.)."
+}
diff --git a/packages/plugins/src/dataTypes/Email/i18n/es.json b/packages/plugins/src/dataTypes/Email/i18n/es.json
new file mode 100644
index 000000000..752c9f77b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/es.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "Correo electrónico",
+  "DESC": "Genera una dirección de correo electrónico aleatoria. Actualmente, esto solo los genera a partir de palabras aleatorias de lorem ipsum.",
+  "DEFAULT_TITLE": "email",
+  "row": "Hilera",
+  "source": "Fuente:",
+  "random": "aleatoria",
+  "fields": "los campos",
+  "randomStringsLabel": "Cadenas aleatorias",
+  "fieldsLabel": "Campos de nombre",
+  "sourceDataField1": "Campo de nombre 1",
+  "sourceDataField2": "Campo de nombre 2 (opcional)",
+  "optional": "Opcional",
+  "selectSource": "Seleccionar fuente",
+  "domains": "Dominios",
+  "domainSuffixes": "Sufijos de dominio",
+  "domainSuffixDesc": "Ingrese cualquier dominio que desee (.com, .org) separado por comas.",
+  "domainsDesc": "Introduzca aquí los dominios que desee que aparezcan en las direcciones de correo electrónico, separados por comas. Cualquier dominio que ingrese aquí que incluya un sufijo (.com, .org) siempre aparecerá como está, es decir, no aparecerá con otros sufijos de dominio.",
+  "sourceTitle": "Fuente",
+  "emailDesc": "De forma predeterminada, este tipo de datos genera direcciones de correo electrónico aleatorias utilizando el texto de lorem ipsum, pero si desea generar direcciones de correo electrónico con un aspecto más realista, seleccione uno o dos campos de nombre en su conjunto de datos para usar esas cadenas como base de la dirección de correo electrónico. .",
+  "emailHelp1": "Este tipo de datos genera direcciones de correo electrónico aleatorias. A partir de la versión 4.0.6, existen algunas opciones para personalizar el contenido de la dirección de correo electrónico para que parezca más realista.",
+  "emailHelp2": "Aquí tiene dos opciones: Cadenas aleatorias o Campos. Esta configuración controla el material de origen de la parte local, la parte que aparece antes del carácter \"@\" en la dirección de correo electrónico. La opción de cadenas aleatorias predeterminada utiliza palabras lorem ipsum (texto de marcador de posición) como material de origen, mientras que la opción Campos le permite apuntar a otros campos de nombre en su conjunto de datos. Esto le permite generar direcciones de correo electrónico que se ven más realistas.",
+  "emailHelp3": "Una lista delimitada por comas de nombres de dominio para usar. Si desea que un dominio siempre tenga un sufijo específico (por ejemplo, midominio.com), simplemente ingrese la cadena completa aquí. De lo contrario, el script elegirá aleatoriamente uno de los sufijos de dominio especificados en el siguiente campo.",
+  "emailHelp4": "Una lista delimitada por comas de sufijos de dominio (.com, .ca, etc.)."
+}
diff --git a/packages/plugins/src/dataTypes/Email/i18n/fr.json b/packages/plugins/src/dataTypes/Email/i18n/fr.json
new file mode 100644
index 000000000..ff3a907c9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/fr.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "E-mail",
+  "DESC": "Génère une adresse e-mail aléatoire. Actuellement, cela les génère simplement à partir de mots lorem ipsum aléatoires.",
+  "DEFAULT_TITLE": "e-mail",
+  "row": "Ligne",
+  "source": "La source:",
+  "random": "aléatoire",
+  "fields": "contributions",
+  "randomStringsLabel": "Chaînes aléatoires",
+  "fieldsLabel": "Champs de nom",
+  "sourceDataField1": "Nom champ 1",
+  "sourceDataField2": "Nom champ 2 (facultatif)",
+  "optional": "Optionnelle",
+  "selectSource": "Sélectionner la source",
+  "domains": "Domaines",
+  "domainSuffixes": "Suffixes de domaine",
+  "domainSuffixDesc": "Saisissez les suffixes de domaine que vous souhaitez (.com, .org) séparés par des virgules.",
+  "domainsDesc": "Saisissez ici les domaines que vous souhaitez voir apparaître dans les adresses e-mail, séparés par des virgules. Tous les domaines que vous entrez ici et qui incluent un suffixe (.com, .org) apparaîtront toujours tels quels, c'est-à-dire qu'ils n'apparaîtront pas avec d'autres suffixes de domaine.",
+  "sourceTitle": "La source",
+  "emailDesc": "Par défaut, ce type de données génère des adresses e-mail aléatoires en utilisant le texte lorem ipsum, mais si vous souhaitez générer des adresses e-mail plus réalistes, ciblez un ou deux champs Nom dans votre ensemble de données pour utiliser ces chaînes comme base de l'adresse e-mail .",
+  "emailHelp1": "Ce type de données génère des adresses e-mail aléatoires. Depuis la version 4.0.6, il existe quelques options pour personnaliser le contenu de l'adresse e-mail afin de la rendre plus réaliste.",
+  "emailHelp2": "Ici, vous avez deux options : Chaînes aléatoires ou Champs. Ce paramètre contrôle le matériel source pour la partie locale - la partie qui apparaît avant le caractère \"@\" dans l'adresse e-mail. L'option Chaînes aléatoires par défaut utilise des mots lorem ipsum (texte d'espace réservé) comme matériau source, tandis que l'option Champs vous permet de cibler d'autres champs Nom dans votre ensemble de données. Cela vous permet de générer des adresses e-mail plus réalistes.",
+  "emailHelp3": "Une liste délimitée par des virgules de noms de domaine à utiliser. Si vous voulez qu'un domaine ait toujours un suffixe spécifique (par exemple mondomaine.com), entrez simplement cette chaîne complète ici. Sinon, le script choisira au hasard l'un des suffixes de domaine spécifiés dans le champ suivant.",
+  "emailHelp4": "Une liste délimitée par des virgules de suffixes de domaine (.com, .ca, etc.)."
+}
diff --git a/packages/plugins/src/dataTypes/Email/i18n/hi.json b/packages/plugins/src/dataTypes/Email/i18n/hi.json
new file mode 100644
index 000000000..d7e893f48
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/hi.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "ईमेल",
+  "DESC": "एक यादृच्छिक ईमेल पता उत्पन्न करता है। वर्तमान में यह उन्हें यादृच्छिक लोरेम इप्सम शब्दों से उत्पन्न करता है।",
+  "DEFAULT_TITLE": "ईमेल",
+  "row": "पंक्ति",
+  "source": "स्रोत:",
+  "random": "यादृच्छिक रूप से",
+  "fields": "खेत",
+  "randomStringsLabel": "यादृच्छिक तार",
+  "fieldsLabel": "नाम फ़ील्ड",
+  "sourceDataField1": "नाम फ़ील्ड 1",
+  "sourceDataField2": "नाम फ़ील्ड 2 (वैकल्पिक)",
+  "optional": "ऐच्छिक",
+  "selectSource": "सोर्स चुनें",
+  "domains": "डोमेन",
+  "domainSuffixes": "डोमेन प्रत्यय",
+  "domainSuffixDesc": "कॉमा से अलग करते हुए कोई भी डोमेन सफ़िक्स (.com, .org) दर्ज करें जो आप चाहते हैं।",
+  "domainsDesc": "कोई भी डोमेन दर्ज करें जिसे आप अल्पविराम से अलग करके यहां ईमेल पतों में दिखाना चाहते हैं। आपके द्वारा यहां दर्ज किया गया कोई भी डोमेन जिसमें प्रत्यय (.com, .org) शामिल है, हमेशा यथावत दिखाई देगा - अर्थात वे अन्य डोमेन प्रत्ययों के साथ प्रकट नहीं होंगे।",
+  "sourceTitle": "स्रोत",
+  "emailDesc": "डिफ़ॉल्ट रूप से यह डेटा प्रकार लोरेम इप्सम टेक्स्ट का उपयोग करके यादृच्छिक ईमेल पते उत्पन्न करता है, लेकिन यदि आप अधिक यथार्थवादी दिखने वाले ईमेल पते उत्पन्न करना चाहते हैं, तो ईमेल पते के आधार के रूप में उन स्ट्रिंग्स का उपयोग करने के लिए अपने डेटा सेट में एक या दो नाम फ़ील्ड लक्षित करें। .",
+  "emailHelp1": "यह डेटा प्रकार यादृच्छिक ईमेल पते उत्पन्न करता है। संस्करण 4.0.6 के अनुसार, ईमेल पते की सामग्री को और अधिक यथार्थवादी बनाने के लिए उसे अनुकूलित करने के लिए कुछ विकल्प हैं।",
+  "emailHelp2": "यहां आपके पास दो विकल्प हैं: रैंडम स्ट्रिंग्स या फ़ील्ड्स। यह सेटिंग स्थानीय भाग के लिए स्रोत सामग्री को नियंत्रित करती है - वह भाग जो ईमेल पते में \"@\" वर्ण से पहले दिखाई देता है। डिफ़ॉल्ट रैंडम स्ट्रिंग्स विकल्प स्रोत सामग्री के रूप में लोरेम इप्सम शब्द (प्लेसहोल्डर टेक्स्ट) का उपयोग करता है, जबकि फ़ील्ड विकल्प आपको अपने डेटा सेट में अन्य नाम फ़ील्ड को लक्षित करने देता है। यह आपको अधिक यथार्थवादी दिखने वाले ईमेल पते उत्पन्न करने की अनुमति देता है।",
+  "emailHelp3": "उपयोग करने के लिए डोमेन नामों की अल्पविराम-सीमांकित सूची। यदि आप चाहते हैं कि किसी डोमेन में हमेशा एक विशिष्ट प्रत्यय हो (उदा. mydomain.com), तो बस वह पूर्ण स्ट्रिंग यहां दर्ज करें। अन्यथा, स्क्रिप्ट बेतरतीब ढंग से अगले क्षेत्र में निर्दिष्ट डोमेन प्रत्ययों में से एक का चयन करेगी।",
+  "emailHelp4": "डोमेन प्रत्यय (.com, .ca आदि) की अल्पविराम-सीमांकित सूची।"
+}
diff --git a/packages/plugins/src/dataTypes/Email/i18n/ja.json b/packages/plugins/src/dataTypes/Email/i18n/ja.json
new file mode 100644
index 000000000..2b2c38439
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/ja.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "Eメール",
+  "DESC": "ランダムな電子メールアドレスを生成します。 現在、これはランダムなloremipsum単語からそれらを生成するだけです。",
+  "DEFAULT_TITLE": "Eメール",
+  "row": "行",
+  "source": "ソース：",
+  "random": "ランダム",
+  "fields": "田畑",
+  "randomStringsLabel": "ランダムな文字列",
+  "fieldsLabel": "名前フィールド",
+  "sourceDataField1": "名前フィールド1",
+  "sourceDataField2": "名前フィールド2（オプション）",
+  "optional": "オプション",
+  "selectSource": "ソースを選択",
+  "domains": "ドメイン",
+  "domainSuffixes": "ドメインサフィックス",
+  "domainSuffixDesc": "必要なドメイン（.com、.org）をコンマで区切って入力します。",
+  "domainsDesc": "メールアドレスに表示するドメインをカンマで区切ってここに入力します。 ここに入力したサフィックス（.com、.org）を含むドメインは、常に現状のまま表示されます。つまり、他のドメインサフィックスと一緒に表示されることはありません。",
+  "sourceTitle": "ソース",
+  "emailDesc": "デフォルトでは、このデータ型はlorem ipsumテキストを使用してランダムな電子メールアドレスを生成しますが、よりリアルな電子メールアドレスを生成する場合は、データセットの1つまたは2つの名前フィールドをターゲットにして、それらの文字列を電子メールアドレスの基礎として使用します 。",
+  "emailHelp1": "このデータ型はランダムな電子メールアドレスを生成します。 バージョン4.0.6以降、電子メールアドレスの内容をより現実的に見えるようにカスタマイズするためのいくつかのオプションがあります。",
+  "emailHelp2": "ここでは、ランダムな文字列またはフィールドの2つのオプションがあります。 この設定は、ローカルパーツ（電子メールアドレスの「@」文字の前に表示されるパーツ）のソースマテリアルを制御します。 デフォルトの[ランダム文字列]オプションでは、ソースマテリアルとしてlorem ipsum単語（プレースホルダーテキスト）を使用しますが、[フィールド]オプションでは、データセット内の他の名前フィールドをターゲットにできます。 これにより、よりリアルに見える電子メールアドレスを生成できます。",
+  "emailHelp3": "使用するドメイン名のコンマ区切りのリスト。 ドメインに常に特定のサフィックス（mydomain.comなど）を付ける場合は、ここにその完全な文字列を入力するだけです。 それ以外の場合、スクリプトは次のフィールドで指定されたドメインサフィックスの1つをランダムに選択します。",
+  "emailHelp4": "ドメインサフィックス（.com、.caなど）のコンマ区切りリスト。"
+}
diff --git a/packages/plugins/src/dataTypes/Email/i18n/nl.json b/packages/plugins/src/dataTypes/Email/i18n/nl.json
new file mode 100644
index 000000000..12775476a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/nl.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "E-mail",
+  "DESC": "Genereert een willekeurig e-mailadres. Momenteel genereert dit ze gewoon uit willekeurige lorem ipsum-woorden.",
+  "DEFAULT_TITLE": "e-mail",
+  "row": "Rij",
+  "source": "Bron:",
+  "random": "willekeurig",
+  "fields": "velden",
+  "randomStringsLabel": "Willekeurige tekenreeksen",
+  "fieldsLabel": "Naam Velden",
+  "sourceDataField1": "Naamveld 1",
+  "sourceDataField2": "Naamveld 2 (optioneel)",
+  "optional": "Optioneel",
+  "selectSource": "Selecteer bron",
+  "domains": "Domeinen",
+  "domainSuffixes": "Domeinachtervoegsels",
+  "domainSuffixDesc": "Voer elk domein in dat u wilt (.com, .org) gescheiden door komma's.",
+  "domainsDesc": "Voer hier de domeinen in die u in de e-mailadressen wilt weergeven, gescheiden door komma's. Alle domeinen die u hier invoert en die een achtervoegsel (.com, .org) bevatten, worden altijd weergegeven zoals ze zijn, d.w.z. ze verschijnen niet met andere domeinachtervoegsels.",
+  "sourceTitle": "Bron",
+  "emailDesc": "Standaard genereert dit gegevenstype willekeurige e-mailadressen met behulp van lorem ipsum-tekst, maar als u meer realistisch ogende e-mailadressen wilt genereren, target dan een of twee naamvelden in uw gegevensset om die tekenreeksen als basis van het e-mailadres te gebruiken .",
+  "emailHelp1": "Dit gegevenstype genereert willekeurige e-mailadressen. Vanaf versie 4.0.6 zijn er een paar opties om de inhoud van het e-mailadres aan te passen om het er realistischer uit te laten zien.",
+  "emailHelp2": "Hier heb je twee opties: Willekeurige tekenreeksen of velden. Deze instelling regelt het bronmateriaal voor het lokale deel - het deel dat vóór het \"@\"-teken in het e-mailadres verschijnt. De standaardoptie Willekeurige tekenreeksen gebruikt lorem ipsum-woorden (plaatsaanduidingstekst) als het bronmateriaal, terwijl u met de optie Velden andere naamvelden in uw gegevensset kunt targeten. Hiermee kunt u e-mailadressen genereren die er realistischer uitzien.",
+  "emailHelp3": "Een door komma's gescheiden lijst van te gebruiken domeinnamen. Als u wilt dat een domein altijd een specifiek achtervoegsel heeft (bijvoorbeeld mijndomein.com), voert u hier die volledige tekenreeks in. Anders kiest het script willekeurig een van de domeinachtervoegsels die in het volgende veld zijn opgegeven.",
+  "emailHelp4": "Een door komma's gescheiden lijst met domeinachtervoegsels (.com, .ca enz.)."
+}
diff --git a/packages/plugins/src/dataTypes/Email/i18n/pt.json b/packages/plugins/src/dataTypes/Email/i18n/pt.json
new file mode 100644
index 000000000..66e90b07c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/pt.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "O email",
+  "DESC": "Gera um endereço de e-mail aleatório. Atualmente, isso apenas os gera a partir de palavras lorem ipsum aleatórias.",
+  "DEFAULT_TITLE": "oemail",
+  "row": "Linha",
+  "source": "Fonte:",
+  "random": "aleatória",
+  "fields": "Campos",
+  "randomStringsLabel": "Strings aleatórias",
+  "fieldsLabel": "Naam Velden",
+  "sourceDataField1": "Naamveld 1",
+  "sourceDataField2": "Naamveld 2 (optioneel)",
+  "optional": "Opcional",
+  "selectSource": "Selecione a fonte",
+  "domains": "Domínios",
+  "domainSuffixes": "Sufixos de domínio",
+  "domainSuffixDesc": "Insira qualquer domínio suficiente que você deseja (.com, .org) separados por vírgulas.",
+  "domainsDesc": "Insira quaisquer domínios que você deseja que apareçam nos endereços de e-mail aqui, separados por vírgulas. Qualquer domínio inserido aqui que inclua um sufixo (.com, .org) sempre aparecerá no estado em que se encontra - ou seja, não aparecerá com outros sufixos de domínio.",
+  "sourceTitle": "Fonte",
+  "emailDesc": "Por padrão, este tipo de dados gera endereços de e-mail aleatórios usando texto lorem ipsum, mas se você quiser gerar endereços de e-mail com aparência mais realista, direcione um ou dois campos de nome em seu conjunto de dados para usar essas strings como base do endereço de e-mail .",
+  "emailHelp1": "Este tipo de dados gera endereços de e-mail aleatórios. A partir da versão 4.0.6, existem algumas opções para personalizar o conteúdo do endereço de e-mail para torná-lo mais realista.",
+  "emailHelp2": "Aqui você tem duas opções: Random Strings ou Fields. Esta configuração controla o material de origem da parte local - a parte que aparece antes do caractere \"@\" no endereço de e-mail. A opção Random Strings padrão usa lorem ipsum words (placeholder text) como o material de origem, enquanto a opção Fields permite direcionar outros campos Name em seu conjunto de dados. Isso permite que você gere endereços de e-mail que parecem mais realistas.",
+  "emailHelp3": "Uma lista delimitada por vírgulas de nomes de domínio a serem usados. Se você quiser que um domínio sempre tenha um sufixo específico (por exemplo, meudominio.com), basta inserir a string completa aqui. Caso contrário, o script escolherá aleatoriamente um dos sufixos de domínio especificados no próximo campo.",
+  "emailHelp4": "Uma lista delimitada por vírgulas de sufixos de domínio (.com, .ca etc.)."
+}
diff --git a/packages/plugins/src/dataTypes/Email/i18n/ru.json b/packages/plugins/src/dataTypes/Email/i18n/ru.json
new file mode 100644
index 000000000..37911a032
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/ru.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "Эл. адрес",
+  "DESC": "Генерирует случайный адрес электронной почты.",
+  "DEFAULT_TITLE": "email",
+  "row": "Строка",
+  "source": "Источник:",
+  "random": "случайный",
+  "fields": "поля",
+  "randomStringsLabel": "Случайные строки",
+  "fieldsLabel": "Поля имени",
+  "sourceDataField1": "Поле имени 1",
+  "sourceDataField2": "Поле имени 2 (необязательно)",
+  "optional": "По желанию",
+  "selectSource": "Выберите источник",
+  "domains": "Домены",
+  "domainSuffixes": "Суффиксы домена",
+  "domainSuffixDesc": "Введите любые доменные суффиксы, которые вы хотите (.com, .org), разделенные запятыми.",
+  "domainsDesc": "Введите здесь любые домены, которые должны отображаться в адресах электронной почты, через запятую. Любые введенные вами домены с суффиксом (.com, .org) всегда будут отображаться как есть, т. е. они не будут отображаться с другими суффиксами домена.",
+  "sourceTitle": "Источник",
+  "emailDesc": "По умолчанию этот тип данных генерирует случайные адреса электронной почты с использованием текста lorem ipsum, но если вы хотите создать более реалистичные адреса электронной почты, выберите одно или два поля имени в своем наборе данных, чтобы использовать эти строки в качестве основы для адреса электронной почты. .",
+  "emailHelp1": "Этот тип данных генерирует случайные адреса электронной почты. Начиная с версии 4.0.6, есть несколько вариантов настройки содержимого адреса электронной почты, чтобы сделать его более реалистичным.",
+  "emailHelp2": "Здесь у вас есть два варианта: случайные строки или поля. Этот параметр управляет исходным материалом для локальной части — части, которая появляется перед символом «@» в адресе электронной почты. Параметр «Случайные строки» по умолчанию использует слова lorem ipsum (текст-заполнитель) в качестве исходного материала, тогда как параметр «Поля» позволяет вам ориентироваться на другие поля имени в вашем наборе данных. Это позволяет создавать адреса электронной почты, которые выглядят более реалистично.",
+  "emailHelp3": "Разделенный запятыми список доменных имен для использования. Если вы хотите, чтобы домен всегда имел определенный суффикс (например, mydomain.com), просто введите здесь полную строку. В противном случае скрипт случайным образом выберет один из доменных суффиксов, указанных в следующем поле.",
+  "emailHelp4": "Список доменных суффиксов, разделенных запятыми (.com, .ca и т. д.)."
+}
diff --git a/packages/plugins/src/dataTypes/Email/i18n/ta.json b/packages/plugins/src/dataTypes/Email/i18n/ta.json
new file mode 100644
index 000000000..eeea1baf9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/ta.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "மின்னஞ்சல்",
+  "DESC": "ஒரு சீரற்ற மின்னஞ்சல் முகவரியை உருவாக்குகிறது. தற்போது இது சீரற்ற லோரம் இப்சம் சொற்களிலிருந்து அவற்றை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "மின்னஞ்சல்",
+  "row": "வரிசை",
+  "source": "ஆதாரம்:",
+  "random": "சீரற்ற",
+  "fields": "துறைகள்",
+  "randomStringsLabel": "சீரற்ற சரங்கள்",
+  "fieldsLabel": "புலங்களின் பெயர்",
+  "sourceDataField1": "பெயர் புலம் 1",
+  "sourceDataField2": "பெயர் புலம் 2 (விரும்பினால்)",
+  "optional": "விருப்பமானது",
+  "selectSource": "மூலத்தைத் தேர்ந்தெடுக்கவும்",
+  "domains": "களங்கள்",
+  "domainSuffixes": "கள பின்னொட்டுகள்",
+  "domainSuffixDesc": "காற்புள்ளிகளால் பிரிக்கப்பட்ட உங்களுக்கு (.com, .org) போதுமான டொமைனை உள்ளிடவும்.",
+  "domainsDesc": "காம்களால் பிரிக்கப்பட்ட இங்கே உள்ள மின்னஞ்சல் முகவரிகளில் நீங்கள் தோன்றும் எந்த களங்களையும் உள்ளிடவும். நீங்கள் இங்கு நுழையும் எந்த டொமைன்களும் (.com, .org) எப்பொழுதும் அப்படியே இருக்கும் - அதாவது அவை மற்ற டொமைன் பின்னொட்டுகளுடன் தோன்றாது.",
+  "sourceTitle": "ஆதாரம்",
+  "emailDesc": "முன்னிருப்பாக இந்த தரவு வகை லாரெம் இப்சம் உரையைப் பயன்படுத்தி சீரற்ற மின்னஞ்சல் முகவரிகளை உருவாக்குகிறது, ஆனால் நீங்கள் மிகவும் யதார்த்தமான தோற்றமுடைய மின்னஞ்சல் முகவரிகளை உருவாக்க விரும்பினால், உங்கள் தரவில் உள்ள ஒன்று அல்லது இரண்டு பெயர் புலங்களை இலக்கு வைத்து அந்த சரங்களை மின்னஞ்சல் முகவரியின் அடிப்படையில் பயன்படுத்தவும் .",
+  "emailHelp1": "இந்த தரவு வகை சீரற்ற மின்னஞ்சல் முகவரிகளை உருவாக்குகிறது. பதிப்பு 4.0.6 இன் படி, மின்னஞ்சல் முகவரியின் உள்ளடக்கத்தை மிகவும் யதார்த்தமாக பார்க்க தனிப்பயனாக்க சில விருப்பங்கள் உள்ளன.",
+  "emailHelp2": "இங்கே உங்களுக்கு இரண்டு விருப்பங்கள் உள்ளன: சீரற்ற சரங்கள் அல்லது புலங்கள். இந்த அமைப்பு உள்ளூர் பகுதிக்கான மூலப் பொருளைக் கட்டுப்படுத்துகிறது - மின்னஞ்சல் முகவரியில் \"@\" எழுத்துக்கு முன் தோன்றும் பகுதி. இயல்புநிலை ரேண்டம் ஸ்ட்ரிங்ஸ் விருப்பம் லோரெம் இப்சம் சொற்களை (பிளேஸ்ஹோல்டர் டெக்ஸ்ட்) மூலப் பொருளாகப் பயன்படுத்துகிறது, அதேசமயம் ஃபீல்ட்ஸ் விருப்பம் உங்கள் டேட்டா செட்டில் மற்ற பெயர் புலங்களை குறிவைக்க உதவுகிறது. இது மிகவும் யதார்த்தமான மின்னஞ்சல் முகவரிகளை உருவாக்க உங்களை அனுமதிக்கிறது.",
+  "emailHelp3": "பயன்படுத்த டொமைன் பெயர்களின் கமாவால் வரையறுக்கப்பட்ட பட்டியல். ஒரு டொமைன் எப்போதும் ஒரு குறிப்பிட்ட பின்னொட்டை (எ.கா. mydomain.com) வைத்திருக்க விரும்பினால், அந்த முழு சரத்தையும் இங்கே உள்ளிடவும். இல்லையெனில், ஸ்கிரிப்ட் தோராயமாக அடுத்த புலத்தில் குறிப்பிடப்பட்ட டொமைன் பின்னொட்டுகளில் ஒன்றைத் தேர்ந்தெடுக்கும்.",
+  "emailHelp4": "டொமைன் பின்னொட்டுகளின் கமாவால் வரையறுக்கப்பட்ட பட்டியல் (.com, .ca போன்றவை)."
+}
diff --git a/packages/plugins/src/dataTypes/Email/i18n/zh.json b/packages/plugins/src/dataTypes/Email/i18n/zh.json
new file mode 100644
index 000000000..e02be376e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Email/i18n/zh.json
@@ -0,0 +1,25 @@
+{
+  "NAME": "电子邮件",
+  "DESC": "生成随机电子邮件地址。 目前，这只是从随机 lorem ipsum 单词中生成它们。",
+  "DEFAULT_TITLE": "电子邮件",
+  "row": "排",
+  "source": "来源：",
+  "random": "随机的",
+  "fields": "领域",
+  "randomStringsLabel": "随机字符串",
+  "fieldsLabel": "名称字段",
+  "sourceDataField1": "名称字段 1",
+  "sourceDataField2": "名称字段 2（可选）",
+  "optional": "可选的",
+  "selectSource": "选择来源",
+  "domains": "域",
+  "domainSuffixes": "域后缀",
+  "domainSuffixDesc": "输入您想要的任何域名（.com、.org），以逗号分隔。",
+  "domainsDesc": "在此处输入您希望出现在电子邮件地址中的任何域，以逗号分隔。 您在此处输入的任何包含后缀（.com、.org）的域将始终按原样显示 - 即它们不会与其他域后缀一起出现。",
+  "sourceTitle": "来源",
+  "emailDesc": "默认情况下，此数据类型使用 lorem ipsum 文本生成随机电子邮件地址，但如果您想生成看起来更逼真的电子邮件地址，请将数据集中的一两个 Name 字段作为目标，以使用这些字符串作为电子邮件地址的基础 .",
+  "emailHelp1": "此数据类型生成随机电子邮件地址。 从 4.0.6 版本开始，有几个选项可以自定义电子邮件地址的内容，使其看起来更逼真。",
+  "emailHelp2": "在这里您有两个选择：随机字符串或字段。 此设置控制本地部分的源材料 - 电子邮件地址中出现在“@”字符之前的部分。 默认的 Random Strings 选项使用 lorem ipsum words（占位符文本）作为源材料，而 Fields 选项允许您定位数据集中的其他 Name 字段。 这使您可以生成看起来更逼真的电子邮件地址。",
+  "emailHelp3": "要使用的域名的逗号分隔列表。 如果您希望域始终具有特定的后缀（例如 mydomain.com），只需在此处输入完整的字符串。 否则，脚本将随机选择下一个字段中指定的域后缀之一。",
+  "emailHelp4": "以逗号分隔的域后缀列表（.com、.ca 等）。"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/GUID.generate.ts b/packages/plugins/src/dataTypes/GUID/GUID.generate.ts
new file mode 100644
index 000000000..15a71b293
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/GUID.generate.ts
@@ -0,0 +1,17 @@
+import { DTGenerateResult } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+const generatedGUIDs: any = {};
+
+export const generate = (_data: any, utils: WorkerUtils): DTGenerateResult => {
+  const placeholderStr = 'HHHHHHHH-HHHH-HHHH-HHHH-HHHHHHHHHHHH';
+  let guid = utils.randomUtils.generateRandomAlphanumericStr(placeholderStr);
+
+  // pretty sodding unlikely, but just in case. Uniqueness is kinda the point of the Data Type after all.
+  while (generatedGUIDs[guid]) {
+    guid = utils.randomUtils.generateRandomAlphanumericStr(placeholderStr);
+  }
+  generatedGUIDs[guid] = true;
+
+  return { display: guid };
+};
diff --git a/packages/plugins/src/dataTypes/GUID/GUID.state.tsx b/packages/plugins/src/dataTypes/GUID/GUID.state.tsx
new file mode 100644
index 000000000..e2d9ec4d2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/GUID.state.tsx
@@ -0,0 +1,2 @@
+export const defaultGenerationOptions = {};
+export type GenerationOptionsType = {};
diff --git a/packages/plugins/src/dataTypes/GUID/GUID.tsx b/packages/plugins/src/dataTypes/GUID/GUID.tsx
new file mode 100644
index 000000000..ef4944be4
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/GUID.tsx
@@ -0,0 +1,12 @@
+import * as React from 'react';
+import { DTHelpProps, DTMetadata } from '~types/dataTypes';
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.help}</p>;
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'varchar(36) NOT NULL',
+    field_Oracle: 'varchar2(36) NOT NULL',
+    field_MSSQL: 'UNIQUEIDENTIFIER NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/GUID/GUID.worker.ts b/packages/plugins/src/dataTypes/GUID/GUID.worker.ts
new file mode 100644
index 000000000..3ca3a0310
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/GUID.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './GUID.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(undefined, utils));
+};
diff --git a/packages/plugins/src/dataTypes/GUID/README.md b/packages/plugins/src/dataTypes/GUID/README.md
new file mode 100644
index 000000000..ff5ff836e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/README.md
@@ -0,0 +1,53 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; GUID
+
+This Data Type generates a random GUID of the form: **HHHHHHHH-HHHH-HHHH-HHHH-HHHHHHHHHHHH**  
+
+
+### Examples
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "GUID",
+            title: "guid",
+            settings: {}
+        },
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "guid": "C18F6297-C66D-CBBE-A989-87C96D9622A9"
+    },
+    {
+        "guid": "73666931-A5C4-C95A-A695-D5C16DA44B52"
+    },
+    {
+        "guid": "6B143394-30D2-ED74-E84B-79624967B3B4"
+    },
+    {
+        "guid": "6991BE69-164A-6B79-8034-FE6A252BA645"
+    },
+    {
+        "guid": "4B873844-3297-0BB9-3FA8-11E99B5BCBE8"
+    },
+    {
+        "guid": "C363AB2E-7B16-46BD-BADD-CBCA58EEE404"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/GUID/__tests__/GUID.test.tsx b/packages/plugins/src/dataTypes/GUID/__tests__/GUID.test.tsx
new file mode 100644
index 000000000..38d83f65d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/__tests__/GUID.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../GUID';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/GUID/bundle.ts b/packages/plugins/src/dataTypes/GUID/bundle.ts
new file mode 100644
index 000000000..1c158851b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/bundle.ts
@@ -0,0 +1,9 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, getMetadata } from './GUID';
+
+const bundle: DTBundle = {
+	Help,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/GUID/config.ts b/packages/plugins/src/dataTypes/GUID/config.ts
new file mode 100644
index 000000000..0f3d0a7db
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'numeric',
+  fieldGroupOrder: 50
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/ar.json b/packages/plugins/src/dataTypes/GUID/i18n/ar.json
new file mode 100644
index 000000000..88e4f3e9a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/ar.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "GUID",
+  "DESC": "يولد GUID فريدًا عشوائيًا (معرف فريد عمومي) للنموذج: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX ، حيث X هي أي رقم سداسي عشري).",
+  "DEFAULT_TITLE": "guid"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/de.json b/packages/plugins/src/dataTypes/GUID/i18n/de.json
new file mode 100644
index 000000000..a0aa29bc5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/de.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "GUID",
+  "DESC": "Generiert einen eindeutigen, zufälligen GUID (Globally Unique Identifier) ​​der Form: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, wobei X eine beliebige Hexadezimalzahl).",
+  "DEFAULT_TITLE": "guid"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/en.json b/packages/plugins/src/dataTypes/GUID/i18n/en.json
new file mode 100644
index 000000000..c997b0def
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/en.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "GUID",
+  "DESC": "Generates a unique, random GUID (globally unique identifier) of the form: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, where X is any hexidecimal digit).",
+  "DEFAULT_TITLE": "guid"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/es.json b/packages/plugins/src/dataTypes/GUID/i18n/es.json
new file mode 100644
index 000000000..9dd596727
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/es.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "GUID",
+  "DESC": "Genera un GUID (identificador único global) al azar con el formato XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, donde X es un dígito hexadecimal.",
+  "DEFAULT_TITLE": "guid"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/fr.json b/packages/plugins/src/dataTypes/GUID/i18n/fr.json
new file mode 100644
index 000000000..790bc5fb0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/fr.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "GUID",
+  "DESC": "Génère un GUID (identificateur global unique) unique aléatoire de la forme: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, où X est un chiffre hexadécimal).",
+  "DEFAULT_TITLE": "guid"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/hi.json b/packages/plugins/src/dataTypes/GUID/i18n/hi.json
new file mode 100644
index 000000000..6355c32c5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/hi.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "GUID",
+  "DESC": "प्रपत्र का एक अद्वितीय, यादृच्छिक GUID (वैश्विक रूप से विशिष्ट पहचानकर्ता) उत्पन्न करता है: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, जहां X कोई हेक्साडेसिमल अंक है)।",
+  "DEFAULT_TITLE": "guid"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/ja.json b/packages/plugins/src/dataTypes/GUID/i18n/ja.json
new file mode 100644
index 000000000..84ebf0bfe
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/ja.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "GUID",
+  "DESC": "次の形式の一意のランダムGUID（グローバルに一意の識別子）を生成します：XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX、ここでXは任意の16進数です）。",
+  "DEFAULT_TITLE": "guid"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/nl.json b/packages/plugins/src/dataTypes/GUID/i18n/nl.json
new file mode 100644
index 000000000..e5f48ae84
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/nl.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "GUID",
+  "DESC": "Genereert een unieke, willekeurige GUID (globally unique identifier) in het formaat: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, waar X een hexadecimaal cijfer bevat.",
+  "DEFAULT_TITLE": "guid"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/pt.json b/packages/plugins/src/dataTypes/GUID/i18n/pt.json
new file mode 100644
index 000000000..d66ddcb9b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/pt.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "GUID",
+  "DESC": "Gera um GUID único e aleatório (identificador globalmente exclusivo) no formato: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, onde X é qualquer dígito hexadecimal).",
+  "DEFAULT_TITLE": "guid"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/ru.json b/packages/plugins/src/dataTypes/GUID/i18n/ru.json
new file mode 100644
index 000000000..246dcd8ce
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/ru.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "GUID",
+  "DESC": "Создает уникальный случайный GUID (глобальный уникальный идентификатор) в следующем формате: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, где X — любая шестнадцатеричная цифра).",
+  "DEFAULT_TITLE": "guid"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/ta.json b/packages/plugins/src/dataTypes/GUID/i18n/ta.json
new file mode 100644
index 000000000..d23d9b5f5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/ta.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "GUID",
+  "DESC": "வடிவத்தின் தனித்துவமான, சீரற்ற GUID (உலகளவில் தனித்துவமான அடையாளங்காட்டி) ஐ உருவாக்குகிறது: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+  "DEFAULT_TITLE": "guid"
+}
diff --git a/packages/plugins/src/dataTypes/GUID/i18n/zh.json b/packages/plugins/src/dataTypes/GUID/i18n/zh.json
new file mode 100644
index 000000000..dc0a587c2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/GUID/i18n/zh.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "图形用户界面",
+  "DESC": "生成格式为XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX的唯一，随机的GUID（全局唯一标识符），其中X是任何十六进制数字）。",
+  "DEFAULT_TITLE": "图形用户界面"
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/IBAN.generate.ts b/packages/plugins/src/dataTypes/IBAN/IBAN.generate.ts
new file mode 100755
index 000000000..9ff8371b4
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/IBAN.generate.ts
@@ -0,0 +1,180 @@
+/**
+ * Original author (PHP): Joeri Noort <joert@joert.net>
+ */
+import { DTGenerateResult } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+let utils: WorkerUtils;
+
+// Template definition
+// 	b :	NATIONAL_BANK_CODE
+// 	i :	BIC_CODE
+// 	d :	BRANCH_ID
+// 	c :	ACCOUNT_NUMBER
+// 	k :	IBAN_CHECKSUM
+// 	x :	NATIONAL_CHECKSUM
+// 	m :	MOD11_CHECKSUM
+// 	t :	ACCOUNT_TYPE
+// 	p :	PERSONAL_NUMBER
+// 	n :	COUNTRY_CODE
+//
+//  Based on http://en.wikipedia.org/wiki/International_Bank_Account_Number#IBAN_formats_by_country
+//  Corrected using various sources
+const countryCodes = [
+  { code: 'AL', sepa: false, template: 'ALkkbbbddddxcccccccccccccccc', name: 'Albania' },
+  { code: 'AD', sepa: false, template: 'ADkkbbbbddddcccccccccccc', name: 'Andorra' },
+  { code: 'AT', sepa: true, template: 'ATkkbbbbbccccccccccc', name: 'Austria' },
+  { code: 'AZ', sepa: false, template: 'AZkkbbbbcccccccccccccccccccc', name: 'Azerbaijan' },
+  { code: 'BE', sepa: true, template: 'BEkkbbbcccccccxx', name: 'Belgium' },
+  { code: 'BH', sepa: false, template: 'BHkkbbbbcccccccccccccc', name: 'Bahrain' },
+  { code: 'BA', sepa: false, template: 'BAkkbbbdddccccccccxx', name: 'Bosnia and Herzegovina' },
+  { code: 'BG', sepa: true, template: 'BGkkiiiiddddttcccccccc', name: 'Bulgaria' },
+  { code: 'CR', sepa: false, template: 'CRkkbbbcccccccccccccc', name: 'Costa Rica' },
+  { code: 'HR', sepa: false, template: 'HRkkbbbbbbbcccccccccc', name: 'Croatia' },
+  { code: 'CY', sepa: true, template: 'CYkkbbbdddddcccccccccccccccc', name: 'Cyprus' },
+  { code: 'CZ', sepa: true, template: 'CZkkbbbbddddddcccccccccc', name: 'Czech Republic' },
+  { code: 'DK', sepa: true, template: 'DKkkbbbbcccccccccc', name: 'Denmark' },
+  { code: 'DO', sepa: false, template: 'DOkkbbbbcccccccccccccccccccc', name: 'Dominican Republic' },
+  { code: 'EE', sepa: true, template: 'EEkkbbddcccccccccccx', name: 'Estonia' },
+  { code: 'FO', sepa: false, template: 'FOkkbbbbcccccccccx', name: 'Faroe Islands' },
+  { code: 'FI', sepa: true, template: 'FIkkbbbbbbcccccccx', name: 'Finland' },
+  { code: 'FR', sepa: true, template: 'FRkkbbbbbdddddcccccccccccxx', name: 'France' },
+  { code: 'GE', sepa: false, template: 'GEkkbbcccccccccccccccc', name: 'Georgia' },
+  { code: 'DE', sepa: true, template: 'DEkkbbbbbbbbcccccccccc', name: 'Germany' },
+  { code: 'GI', sepa: false, template: 'GIkkiiiiccccccccccccccc', name: 'Gibraltar' },
+  { code: 'GR', sepa: true, template: 'GRkkbbbddddcccccccccccccccc', name: 'Greece' },
+  { code: 'GL', sepa: false, template: 'GLkkbbbbcccccccccc', name: 'Greenland' },
+  { code: 'GT', sepa: false, template: 'GTkkbbbbcccccccccccccccccccc', name: 'Guatemala' },
+  { code: 'HU', sepa: true, template: 'HUkkbbbddddxcccccccccccccccx', name: 'Hungary' },
+  { code: 'IS', sepa: true, template: 'ISkkbbbbddccccccpppppppppp', name: 'Iceland' },
+  { code: 'IE', sepa: true, template: 'IEkkiiiibbbbbbcccccccc', name: 'Ireland' },
+  { code: 'IL', sepa: false, template: 'ILkkbbbnnnccccccccccccc', name: 'Israel' },
+  { code: 'IT', sepa: true, template: 'ITkkxiiiiibbbbbcccccccccccc', name: 'Italy' },
+  { code: 'KZ', sepa: false, template: 'KZkkbbbccccccccccccc', name: 'Kazakhstan' },
+  { code: 'KW', sepa: false, template: 'KWkkbbbbcccccccccccccccccccccc', name: 'Kuwait' },
+  { code: 'LV', sepa: true, template: 'LVkkiiiiccccccccccccc', name: 'Latvia' },
+  { code: 'LB', sepa: false, template: 'LBkkbbbbcccccccccccccccccccc', name: 'Lebanon' },
+  { code: 'LI', sepa: true, template: 'LIkkbbbbbcccccccccccc', name: 'Liechtenstein' },
+  { code: 'LT', sepa: true, template: 'LTkkbbbbbccccccccccc', name: 'Lithuania' },
+  { code: 'LU', sepa: true, template: 'LUkkbbbccccccccccccc', name: 'Luxembourg' },
+  { code: 'MK', sepa: false, template: 'MKkkbbbccccccccccxx', name: 'Macedonia' },
+  { code: 'MT', sepa: true, template: 'MTkkiiiidddddcccccccccccccccccc', name: 'Malta' },
+  { code: 'MR', sepa: false, template: 'MRkkbbbbbdddddcccccccccccxx', name: 'Mauritania' },
+  { code: 'MU', sepa: false, template: 'MUkkbbbbbbddcccccccccccccccccc', name: 'Mauritius' },
+  { code: 'MC', sepa: true, template: 'MCkkbbbbbdddddcccccccccccxx', name: 'Monaco' },
+  { code: 'MD', sepa: false, template: 'MDkkbbcccccccccccccccccc', name: 'Moldova' },
+  { code: 'ME', sepa: false, template: 'MEkkbbbcccccccccccccxx', name: 'Montenegro' },
+  { code: 'NL', sepa: true, template: 'NLkkiiiicccccccccc', name: 'Netherlands' },
+  { code: 'NO', sepa: true, template: 'NOkkbbbbccccccx', name: 'Norway' },
+  { code: 'PK', sepa: false, template: 'PKkkbbbbcccccccccccccccc', name: 'Pakistan' },
+  { code: 'PS', sepa: false, template: 'PSkkbbbbxxxxxxxxxcccccccccccc', name: 'Palestinian Territory, Occupied' },
+  { code: 'PL', sepa: true, template: 'PLkkbbbddddxcccccccccccccccc', name: 'Poland' },
+  { code: 'PT', sepa: true, template: 'PTkkbbbbddddcccccccccccxx', name: 'Portugal' },
+  { code: 'RO', sepa: true, template: 'ROkkiiiicccccccccccccccc', name: 'Romania' },
+  { code: 'SM', sepa: false, template: 'SMkkxbbbbbdddddcccccccccccc', name: 'San Marino' },
+  { code: 'SA', sepa: false, template: 'SAkkbbcccccccccccccccccc', name: 'Saudi Arabia' },
+  { code: 'RS', sepa: false, template: 'RSkkbbbcccccccccccccxx', name: 'Serbia' },
+  { code: 'SK', sepa: true, template: 'SKkkbbbbddddddcccccccccc', name: 'Slovakia' },
+  { code: 'SI', sepa: true, template: 'SIkkbbdddccccccccxx', name: 'Slovenia' },
+  { code: 'ES', sepa: true, template: 'ESkkbbbbddddxxcccccccccc', name: 'Spain' },
+  { code: 'SE', sepa: true, template: 'SEkkbbbccccccccccccccccx', name: 'Sweden' },
+  { code: 'CH', sepa: true, template: 'CHkkbbbbbcccccccccccc', name: 'Switzerland' },
+  { code: 'TN', sepa: false, template: 'TNkkbbdddccccccccccccccc', name: 'Tunisia' },
+  { code: 'TR', sepa: false, template: 'TRkkbbbbbxcccccccccccccccc', name: 'Turkey' },
+  { code: 'AE', sepa: false, template: 'AEkkbbbcccccccccccccccc', name: 'United Arab Emirates' },
+  { code: 'GB', sepa: true, template: 'GBkkiiiiddddddcccccccc', name: 'United Kingdom' },
+  { code: 'VG', sepa: false, template: 'VGkkbbbbcccccccccccccccc', name: 'Virgin Islands, British' }
+];
+
+const generateBic = (countryCode: string): string => {
+  const withBranchCode = utils.randomUtils.getRandomBool();
+  const branchCode = withBranchCode ? 'xxX' : '';
+  const format = `LLLL${countryCode}LL${branchCode}`;
+  return utils.randomUtils.generateRandomAlphanumericStr(format);
+};
+
+const fillTemplate = (template: string, countryCode: string): string => {
+  const bic = generateBic(countryCode);
+  let bicPos = 0;
+  let unsigned = '';
+
+  const uppercaseTemplate = template.toUpperCase();
+  for (let i = 0; i < template.length; i++) {
+    const c = template[i];
+    if (uppercaseTemplate[i] === c) {
+      unsigned += c;
+      continue;
+    }
+    if (c === 'i') {
+      unsigned += bic[bicPos++];
+      continue;
+    }
+    if (c === 'k') {
+      unsigned += '_';
+      continue;
+    }
+    unsigned += utils.randomUtils.generateRandomAlphanumericStr('x');
+  }
+
+  return recalculateChecksum(unsigned);
+};
+
+// removes the current checksum digit from an IBAN string, and replaces it with what it should have been
+const recalculateChecksum = (ibanString: string): string => {
+  if (ibanString.length < 6) {
+    return ibanString;
+  }
+
+  const reordered = ibanString.substring(4) + ibanString.substring(0, 2);
+  let numerical = '';
+
+  const reorderedLength = reordered.length;
+  for (let i = 0; i < reorderedLength; i++) {
+    numerical += chr2Int(reordered[i]);
+  }
+  numerical += '00';
+  const checksum = 98 - bigMod(numerical, 97);
+
+  return ibanString.substring(0, 2) + checksum.toString().padStart(2, '0') + ibanString.substring(4);
+};
+
+const bigMod = (x: string, y: number): number => {
+  // how many numbers to take at once? careful not to exceed (int)
+  const take = 5;
+  let mod = '';
+
+  while (x.length > 0) {
+    const a = parseInt(mod + x.substring(0, take));
+    x = x.substring(take);
+    mod = (a % y).toString();
+  }
+
+  return parseInt(mod, 10);
+};
+
+const chr2Int = (chr: string): number => {
+  const ord = getOrd(chr);
+
+  if (ord <= 57 && ord >= 48) {
+    //48 = '0', 57 = '9'
+    return ord - 48;
+  }
+  if (ord <= 90 && ord >= 65) {
+    //90 = 'Z', 65 = 'A'
+    return 10 + (ord - 65);
+  }
+
+  // throw new Exception("Input character {$chr}({$ord}) does not map to an integer");
+  return 0;
+};
+
+const getOrd = (str: string): number => str.charCodeAt(0);
+
+export const generate = (_data: any, workerUtils: WorkerUtils): DTGenerateResult => {
+  utils = workerUtils;
+
+  const countryCode = utils.randomUtils.getRandomArrayValue(countryCodes);
+  const iban = fillTemplate(countryCode.template, countryCode.code);
+
+  return { display: iban };
+};
diff --git a/packages/plugins/src/dataTypes/IBAN/IBAN.state.tsx b/packages/plugins/src/dataTypes/IBAN/IBAN.state.tsx
new file mode 100644
index 000000000..e2d9ec4d2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/IBAN.state.tsx
@@ -0,0 +1,2 @@
+export const defaultGenerationOptions = {};
+export type GenerationOptionsType = {};
diff --git a/packages/plugins/src/dataTypes/IBAN/IBAN.tsx b/packages/plugins/src/dataTypes/IBAN/IBAN.tsx
new file mode 100644
index 000000000..bc39f011c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/IBAN.tsx
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import { DTHelpProps, DTMetadata } from '~types/dataTypes';
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p dangerouslySetInnerHTML={{ __html: i18n.DESC }} />
+    <p>
+      <span dangerouslySetInnerHTML={{ __html: i18n.help1 }} /> <span dangerouslySetInnerHTML={{ __html: i18n.help2 }} />
+    </p>
+  </>
+);
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'varchar(34)',
+    field_Oracle: 'varchar2(34) NULL',
+    field_MSSQL: 'VARCHAR(34) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/IBAN/IBAN.worker.ts b/packages/plugins/src/dataTypes/IBAN/IBAN.worker.ts
new file mode 100755
index 000000000..5ddc1923a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/IBAN.worker.ts
@@ -0,0 +1,17 @@
+/**
+ * Original author (PHP): Joeri Noort <joert@joert.net>
+ */
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './IBAN.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(undefined, utils));
+};
diff --git a/packages/plugins/src/dataTypes/IBAN/README.md b/packages/plugins/src/dataTypes/IBAN/README.md
new file mode 100644
index 000000000..27978638a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/README.md
@@ -0,0 +1,52 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; IBAN
+
+This Data Type generates a random International Bank Account Number (IBAN).
+
+## Examples
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "IBAN",
+            title: "iban",
+            settings: {}
+        },
+    ],
+        exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "iban": "KW6507127736867163816748311366"
+    },
+    {
+        "iban": "NO0253423327445"
+    },
+    {
+        "iban": "TR744462537189752134298717"
+    },
+    {
+        "iban": "SK7083803211961717418112"
+    },
+    {
+        "iban": "KZ266045443160727663"
+    },
+    {
+        "iban": "SM5647721660133189212975872"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/IBAN/__tests__/IBAN.ui.test.tsx b/packages/plugins/src/dataTypes/IBAN/__tests__/IBAN.ui.test.tsx
new file mode 100644
index 000000000..c591ba3ce
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/__tests__/IBAN.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../IBAN';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/IBAN/bundle.ts b/packages/plugins/src/dataTypes/IBAN/bundle.ts
new file mode 100644
index 000000000..eaefc010e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/bundle.ts
@@ -0,0 +1,9 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, getMetadata } from './IBAN';
+
+const bundle: DTBundle = {
+	Help,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/IBAN/config.ts b/packages/plugins/src/dataTypes/IBAN/config.ts
new file mode 100644
index 000000000..e9d260385
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'financial',
+  fieldGroupOrder: 25
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/ar.json b/packages/plugins/src/dataTypes/IBAN/i18n/ar.json
new file mode 100644
index 000000000..7aaf53039
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/ar.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "أرقام الحسابات المصرفية (آيبان)",
+  "DESC": "يولد أرقام حسابات بنكية دولية (IBAN).",
+  "DEFAULT_TITLE": "iban",
+  "help1": "يحتوي IBAN الذي تم إنشاؤه على مجموع اختباري صالح ورمز البلد والطول و BIC في المكان المناسب.",
+  "help2": "من غير المرجح أن يكون الرقم صحيحًا حقًا ، نظرًا لوجود مجموعة من الفحوصات التي يجب القيام بها حسب البلد."
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/de.json b/packages/plugins/src/dataTypes/IBAN/i18n/de.json
new file mode 100644
index 000000000..7d979b12a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/de.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Kontonummern (IBAN)",
+  "DESC": "Erzeugt IBAN (International Bank Account Number).",
+  "DEFAULT_TITLE": "iban",
+  "help1": "Die erzeugte IBAN hat eine gültige Prüfsumme, Landes-und Länge und die BIC ist an der richtigen Stelle.",
+  "help2": "Die Zahl ist höchst unwahrscheinlich, dass wirklich <i>gültig</i> tho sein, da in der Regel eine Reihe von Kontrollen zu tun, die länderspezifisch sind."
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/en.json b/packages/plugins/src/dataTypes/IBAN/i18n/en.json
new file mode 100644
index 000000000..737b12959
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/en.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Bank Account Nums (IBAN)",
+  "DESC": "Generates International Bank Account Numbers (IBAN).",
+  "DEFAULT_TITLE": "iban",
+  "help1": "The generated IBAN has a valid checksum, country code and length and the BIC is in the right place.",
+  "help2": "The number is highly unlikely to be really <i>valid</i> though, since there are usually a bunch of checks to do which are country specific."
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/es.json b/packages/plugins/src/dataTypes/IBAN/i18n/es.json
new file mode 100644
index 000000000..1b09ad5d6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/es.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Nums de cuenta bancaria (IBAN)",
+  "DESC": "Genera IBAN (International Bank Account Number).",
+  "DEFAULT_TITLE": "iban",
+  "help1": "El IBAN generado tiene una suma de comprobación válida, código del país, la longitud, el BIC se encuentra en el lugar correcto.",
+  "help2": "El número es muy poco probable que sea verdad aunque válida, ya que por lo general hay un montón de cheques que hacer, que son específicos de cada país."
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/fr.json b/packages/plugins/src/dataTypes/IBAN/i18n/fr.json
new file mode 100644
index 000000000..e8fca97db
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/fr.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Nums de compte bancaire (IBAN)",
+  "DESC": "Génère IBAN (International Bank Account Number).",
+  "DEFAULT_TITLE": "iban",
+  "help1": "L'IBAN a généré une somme de contrôle valide, countrycode la longueur et le BIC est au bon endroit.",
+  "help2": "Le nombre est hautement improbable qu'il soit vraiment tho <i>valide</i>, car il ya généralement un tas de vérifications à faire qui sont spécifiques des pays."
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/hi.json b/packages/plugins/src/dataTypes/IBAN/i18n/hi.json
new file mode 100644
index 000000000..58f7358d8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/hi.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "बैंक खाता संख्या (IBAN)",
+  "DESC": "अंतर्राष्ट्रीय बैंक खाता संख्या (IBAN) उत्पन्न करता है।",
+  "DEFAULT_TITLE": "iban",
+  "help1": "उत्पन्न IBAN में एक वैध चेकसम, देश कोड और लंबाई है और BIC सही जगह पर है।",
+  "help2": "यह संख्या वास्तव में <i>वैध</i> होने की अत्यधिक संभावना नहीं है, क्योंकि आमतौर पर चेक का एक गुच्छा होता है जो देश विशिष्ट होते हैं।"
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/ja.json b/packages/plugins/src/dataTypes/IBAN/i18n/ja.json
new file mode 100644
index 000000000..ac0397cec
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/ja.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "銀行口座番号（IBAN）",
+  "DESC": "国際銀行口座番号（IBAN）を生成します。",
+  "DEFAULT_TITLE": "iban",
+  "help1": "生成されたIBANには有効なチェックサム、国コード、および長さがあり、BICは適切な場所にあります。",
+  "help2": "ただし、国固有のチェックが通常行われるため、この数値が実際に有効になる可能性はほとんどありません。"
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/nl.json b/packages/plugins/src/dataTypes/IBAN/i18n/nl.json
new file mode 100644
index 000000000..ccad26f9e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/nl.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Burgerservicenummer",
+  "DESC": "Genereert een willekeurige Amerikaanse sofi-nummer.",
+  "DEFAULT_TITLE": "iban",
+  "help1": "De gegenereerde IBAN heeft een geldige checksum, landcode en lengte en de BIC staat op de juiste plaats.",
+  "help2": "Het is echter hoogst onwaarschijnlijk dat het nummer echt geldig is, aangezien er meestal een aantal controles moet worden uitgevoerd die landspecifiek zijn."
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/pt.json b/packages/plugins/src/dataTypes/IBAN/i18n/pt.json
new file mode 100644
index 000000000..49e79b09c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/pt.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Número de contas bancárias (IBAN)",
+  "DESC": "Gera números de contas bancárias internacionais (IBAN).",
+  "DEFAULT_TITLE": "iban",
+  "help1": "O IBAN gerado tem uma soma de verificação válida, código de país e comprimento e o BIC está no lugar certo.",
+  "help2": "No entanto, é altamente improvável que o número seja realmente <i>válido</i>, uma vez que geralmente há um monte de verificações para fazer que são específicas de cada país."
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/ru.json b/packages/plugins/src/dataTypes/IBAN/i18n/ru.json
new file mode 100644
index 000000000..af2b193eb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/ru.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Номера банковских счетов (IBAN)",
+  "DESC": "Генерирует международные номера банковских счетов (IBAN).",
+  "DEFAULT_TITLE": "iban",
+  "help1": "Сгенерированный IBAN имеет действительную контрольную сумму, код страны и длину, а BIC находится в нужном месте.",
+  "help2": "Однако маловероятно, что это число будет действительно действительным, поскольку обычно требуется выполнить множество проверок, зависящих от страны."
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/ta.json b/packages/plugins/src/dataTypes/IBAN/i18n/ta.json
new file mode 100644
index 000000000..9df070dc2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/ta.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "வங்கி கணக்கு எண் (IBAN)",
+  "DESC": "சர்வதேச வங்கி கணக்கு எண்களை (IBAN) உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "iban",
+  "help1": "உருவாக்கப்பட்ட ஐபிஏஎன் செல்லுபடியாகும் செக்சம், நாட்டின் குறியீடு மற்றும் நீளம் மற்றும் பிஐசி சரியான இடத்தில் உள்ளது.",
+  "help2": "வழக்கமாக குறிப்பிட்ட எண்ணிக்கையிலான காசோலைகள் இருப்பதால், இந்த எண்ணிக்கை உண்மையிலேயே செல்லுபடியாகும்."
+}
diff --git a/packages/plugins/src/dataTypes/IBAN/i18n/zh.json b/packages/plugins/src/dataTypes/IBAN/i18n/zh.json
new file mode 100644
index 000000000..05bf100bf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/IBAN/i18n/zh.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "银行帐号（IBAN）",
+  "DESC": "生成国际银行帐号（IBAN）。",
+  "DEFAULT_TITLE": "iban",
+  "help1": "生成的IBAN具有有效的校验和，国家/地区代码和长度，并且BIC在正确的位置。",
+  "help2": "但是，该数字不太可能真正有效，因为通常要进行一系列针对特定国家/地区的检查。"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/LatLng.generate.ts b/packages/plugins/src/dataTypes/LatLng/LatLng.generate.ts
new file mode 100644
index 000000000..f5b4503f8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/LatLng.generate.ts
@@ -0,0 +1,39 @@
+import { DTGenerationData, DTGenerateResult } from '~types/dataTypes';
+import { getRandomNum } from '~utils/randomUtils';
+
+const DECIMAL_PLACES = 5;
+
+// Valid ranges:
+// Lat: -90 -> + 90
+// Lng: -180 -> +180
+const pow = Math.pow(DECIMAL_PLACES, 10);
+const cachedMath = {
+	minLat: -90 * pow,
+	maxLat: 90 * pow,
+	minLng: -180 * pow,
+	maxLng: 180 * pow,
+	divisor: pow
+};
+
+export const generate = ({ rowState }: DTGenerationData): DTGenerateResult => {
+	const coords = [];
+	let lat, lng;
+	if (rowState.lat && rowState.lng) {
+		lat = getRandomNum(cachedMath.minLat, cachedMath.maxLat) / cachedMath.divisor;
+		coords.push(lat);
+		lng = getRandomNum(cachedMath.minLng, cachedMath.maxLng) / cachedMath.divisor;
+		coords.push(lng);
+	} else if (rowState.lat) {
+		lat = getRandomNum(cachedMath.minLat, cachedMath.maxLat) / cachedMath.divisor;
+		coords.push(lat);
+	} else if (rowState.lng) {
+		lng = getRandomNum(cachedMath.minLng, cachedMath.maxLng) / cachedMath.divisor;
+		coords.push(lng);
+	}
+
+	return {
+		lat,
+		lng,
+		display: coords.join(', ')
+	};
+};
diff --git a/packages/plugins/src/dataTypes/LatLng/LatLng.state.tsx b/packages/plugins/src/dataTypes/LatLng/LatLng.state.tsx
new file mode 100755
index 000000000..fd48268c9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/LatLng.state.tsx
@@ -0,0 +1,16 @@
+export type LatLngState = {
+	lat: boolean;
+	lng: boolean;
+};
+
+export type GenerationOptionsType = {
+	lat: boolean;
+	lng: boolean;
+}
+
+export const initialState: LatLngState = {
+	lat: true,
+	lng: true
+};
+
+export const defaultGenerationOptions = {};
diff --git a/packages/plugins/src/dataTypes/LatLng/LatLng.tsx b/packages/plugins/src/dataTypes/LatLng/LatLng.tsx
new file mode 100755
index 000000000..49b73dd0f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/LatLng.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+
+export const Options = ({ i18n, data, id, onUpdate }: DTOptionsProps) => {
+  const onChange = (field: string, checked: boolean): void => {
+    onUpdate({
+      ...data,
+      [field]: checked
+    });
+  };
+
+  return (
+    <div style={{ margin: '5px 0' }}>
+      <input type="checkbox" id={`${id}-lat`} checked={data.lat} onChange={(e): void => onChange('lat', e.target.checked)} />
+      <label htmlFor={`${id}-lat`}>{i18n.latitude}</label>
+      <input type="checkbox" id={`${id}-lng`} checked={data.lng} onChange={(e): void => onChange('lng', e.target.checked)} />
+      <label htmlFor={`${id}-lng`}>{i18n.longitude}</label>
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.DESC}</p>;
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'varchar(30) default NULL',
+    field_Oracle: 'varchar2(30) default NULL',
+    field_MSSQL: 'VARCHAR(30) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/LatLng/LatLng.worker.ts b/packages/plugins/src/dataTypes/LatLng/LatLng.worker.ts
new file mode 100644
index 000000000..7fc1fecc6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/LatLng.worker.ts
@@ -0,0 +1,6 @@
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './LatLng.generate';
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/dataTypes/LatLng/README.md b/packages/plugins/src/dataTypes/LatLng/README.md
new file mode 100644
index 000000000..e7f3eac63
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/README.md
@@ -0,0 +1,80 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; LatLng
+
+This Data Type generates a random latitude / longitude.
+
+## Examples
+
+This example generates three rows: a latitude, a longitude, and both, separated with a comma.
+    
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'LatLng',
+            title: 'lat',
+            settings: {
+                lat: true,
+                lng: false
+            }
+        },
+        {
+            plugin: 'LatLng',
+            title: 'lng',
+            settings: {
+                lat: false,
+                lng: true
+            }
+        },
+        {
+            plugin: 'LatLng',
+            title: 'both-lat-and-lng',
+            settings: {
+                lat: true,
+                lng: true
+            }
+        },
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+ 
+Sample output:
+
+```typescript
+[
+    {
+        "lat": -55.1789842432,
+        "lng": 151.5933492224,
+        "both-lat-and-lng": "8.7877393408, 43.5034121216"
+    },
+    {
+        "lat": 0.4672530432,
+        "lng": -61.3726205952,
+        "both-lat-and-lng": "68.9980720128, -67.1795554304"
+    },
+    {
+        "lat": -21.713129472,
+        "lng": -148.3536177152,
+        "both-lat-and-lng": "-76.6886816768, 59.1793447936"
+    },
+    {
+        "lat": 27.9004695552,
+        "lng": -167.0897762304,
+        "both-lat-and-lng": "-22.875338752, 161.7839232"
+    },
+    {
+        "lat": 61.4346559488,
+        "lng": 80.5961156608,
+        "both-lat-and-lng": "83.5639343104, -31.7441731584"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/LatLng/__tests__/LatLng.generate.test.ts b/packages/plugins/src/dataTypes/LatLng/__tests__/LatLng.generate.test.ts
new file mode 100644
index 000000000..410becac2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/__tests__/LatLng.generate.test.ts
@@ -0,0 +1,56 @@
+import { generate } from '../LatLng.generate';
+import { DTGenerationData } from '~types/dataTypes';
+
+// klutzy tests
+describe('generation method', () => {
+
+	const defaultSettings: DTGenerationData = {
+		rowNum: 1,
+		rowState: {},
+		existingRowData: [],
+		i18n: {},
+		countryI18n: {},
+		countryData: {},
+		template: {}
+	};
+
+	it('generates a single item when only lat is selected', () => {
+		const result = generate({
+			...defaultSettings,
+    		rowState: { lat: true, lng: false }
+		 });
+		 expect(result.lat).toBeTruthy();
+		 expect(result.lng).toBeFalsy();
+		 expect(result.display).toEqual(`${result.lat}`); // yup. It's a string.
+	});
+
+	it('generates a single item when only lat is selected', () => {
+		const result = generate({
+			...defaultSettings,
+    		rowState: { lat: false, lng: true }
+		 });
+		 expect(result.lat).toBeFalsy();
+		 expect(result.lng).toBeTruthy();
+		 expect(result.display).toEqual(`${result.lng}`);
+	});
+
+	it('generates two item when both lat and lng are selected', () => {
+		const result = generate({
+			...defaultSettings,
+    		rowState: { lat: true, lng: true }
+		 });
+		 expect(result.lat).toBeTruthy();
+		 expect(result.lng).toBeTruthy();
+		 expect(result.display).toEqual(`${result.lat}, ${result.lng}`);
+	});
+
+	it('generates an empty string when neither lat nor lng is selected', () => {
+		const result = generate({
+			...defaultSettings,
+    		rowState: { lat: false, lng: false }
+		 });
+		 expect(result.lat).toBeFalsy();
+		 expect(result.lng).toBeFalsy();
+		 expect(result.display).toEqual('');
+	});
+});
diff --git a/packages/plugins/src/dataTypes/LatLng/__tests__/LatLng.test.tsx b/packages/plugins/src/dataTypes/LatLng/__tests__/LatLng.test.tsx
new file mode 100644
index 000000000..2e773891d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/__tests__/LatLng.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../LatLng';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/LatLng/bundle.ts b/packages/plugins/src/dataTypes/LatLng/bundle.ts
new file mode 100644
index 000000000..e630a3d41
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/bundle.ts
@@ -0,0 +1,12 @@
+import { DTBundle } from '~types/dataTypes';
+import { Options, Help, getMetadata } from './LatLng';
+import { initialState } from './LatLng.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Options,
+	Help,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/LatLng/config.ts b/packages/plugins/src/dataTypes/LatLng/config.ts
new file mode 100644
index 000000000..d8a92c17d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'geo',
+  fieldGroupOrder: 100
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/ar.json b/packages/plugins/src/dataTypes/LatLng/i18n/ar.json
new file mode 100644
index 000000000..a52b145a6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/ar.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "خطوط العرض والطول",
+  "DESC": "يُنشئ نوع البيانات هذا خط عرض و / أو خط طول عشوائيًا. إذا تم تحديد كلاهما ، فسيتم عرض كلاهما مفصول بفاصلة.",
+  "DEFAULT_TITLE": "latlng",
+  "latitude": "خط العرض",
+  "longitude": "خط الطول"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/de.json b/packages/plugins/src/dataTypes/LatLng/i18n/de.json
new file mode 100644
index 000000000..1d7c8e15c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/de.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Breite / Länge",
+  "DESC": "Dieser Datentyp generiert einen zufälligen Breite und / oder Länge. Wenn beide ausgewählt sind, zeigt er sowohl durch ein Komma getrennt.",
+  "DEFAULT_TITLE": "latlng",
+  "latitude": "Breite",
+  "longitude": "Länge"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/en.json b/packages/plugins/src/dataTypes/LatLng/i18n/en.json
new file mode 100644
index 000000000..78d73075d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/en.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Latitude / Longitude",
+  "DESC": "This data type generates a random latitude and/or longitude. If both are selected, it displays both separated by a comma.",
+  "DEFAULT_TITLE": "latlng",
+  "latitude": "Latitude",
+  "longitude": "Longitude"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/es.json b/packages/plugins/src/dataTypes/LatLng/i18n/es.json
new file mode 100644
index 000000000..279cc0206
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/es.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Latitud / Longitud",
+  "DESC": "Este tipo de dato genera una longitud y/o latitud aleatoria. Si se eligen ambas, mostrará ambas separadas por una coma.",
+  "DEFAULT_TITLE": "latlng",
+  "latitude": "Latitud",
+  "longitude": "Longitud"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/fr.json b/packages/plugins/src/dataTypes/LatLng/i18n/fr.json
new file mode 100644
index 000000000..1bb5279bf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/fr.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Lat/Lng",
+  "DESC": "Ce type de données génère une latitude et / ou une longitude aléatoire. Si les deux sont sélectionnés, il les affiche séparés par une virgule.",
+  "DEFAULT_TITLE": "latlng",
+  "latitude": "Latitude",
+  "longitude": "Longitude"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/hi.json b/packages/plugins/src/dataTypes/LatLng/i18n/hi.json
new file mode 100644
index 000000000..17b2f1960
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/hi.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "अक्षांश देशांतर",
+  "DESC": "यह डेटा प्रकार एक यादृच्छिक अक्षांश और/या देशांतर उत्पन्न करता है। यदि दोनों का चयन किया जाता है, तो यह दोनों को अल्पविराम से अलग करके प्रदर्शित करता है।",
+  "DEFAULT_TITLE": "latlng",
+  "latitude": "अक्षांश",
+  "longitude": "देशान्तर"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/ja.json b/packages/plugins/src/dataTypes/LatLng/i18n/ja.json
new file mode 100644
index 000000000..d023a7083
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/ja.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "緯度/経度",
+  "DESC": "このデータ型は、ランダムな緯度や経度を生成します。 両方を選択すると、両方がコンマで区切られて表示されます。",
+  "DEFAULT_TITLE": "latlng",
+  "latitude": "緯度",
+  "longitude": "経度"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/nl.json b/packages/plugins/src/dataTypes/LatLng/i18n/nl.json
new file mode 100644
index 000000000..4d4e3c206
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/nl.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Breedtegraad / Lengtegraad",
+  "DESC": "Dit gegevenstype genereert een willekeurige lengte- en/of breedtegraad. Indien beide zijn geselecteerd worden beide weergegeven gescheiden door een komma.",
+  "DEFAULT_TITLE": "latlng",
+  "latitude": "Breedtegraad",
+  "longitude": "Lengtegraad"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/pt.json b/packages/plugins/src/dataTypes/LatLng/i18n/pt.json
new file mode 100644
index 000000000..903f65048
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/pt.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Latitude ou Longitude",
+  "DESC": "Este tipo de dados gera uma latitude e / ou longitude aleatória. Se ambos forem selecionados, serão exibidos ambos separados por uma vírgula.",
+  "DEFAULT_TITLE": "latlng",
+  "latitude": "Latitude",
+  "longitude": "Longitude"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/ru.json b/packages/plugins/src/dataTypes/LatLng/i18n/ru.json
new file mode 100644
index 000000000..cb2d73992
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/ru.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Широта Долгота",
+  "DESC": "Этот тип данных генерирует случайную широту и/или долготу. Если выбраны оба, они отображаются через запятую.",
+  "DEFAULT_TITLE": "latlng",
+  "latitude": "Широта",
+  "longitude": "Долгота"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/ta.json b/packages/plugins/src/dataTypes/LatLng/i18n/ta.json
new file mode 100644
index 000000000..9e0f7f013
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/ta.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "அட்சரேகை தீர்க்கரேகை",
+  "DESC": "இந்த தரவு வகை ஒரு சீரற்ற அட்சரேகை மற்றும் / அல்லது தீர்க்கரேகைகளை உருவாக்குகிறது. இரண்டும் தேர்ந்தெடுக்கப்பட்டால், அது இரண்டையும் கமாவால் பிரித்து காண்பிக்கும்.",
+  "DEFAULT_TITLE": "latlng",
+  "latitude": "அட்சரேகை",
+  "longitude": "தீர்க்கரேகை"
+}
diff --git a/packages/plugins/src/dataTypes/LatLng/i18n/zh.json b/packages/plugins/src/dataTypes/LatLng/i18n/zh.json
new file mode 100644
index 000000000..2a28f5920
--- /dev/null
+++ b/packages/plugins/src/dataTypes/LatLng/i18n/zh.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "纬度/经度",
+  "DESC": "此数据类型生成随机的纬度和/或经度。 如果同时选择了两者，则会显示两者并以逗号分隔。",
+  "DEFAULT_TITLE": "拉特朗",
+  "latitude": "纬度",
+  "longitude": "经度"
+}
diff --git a/packages/plugins/src/dataTypes/List/List.generate.ts b/packages/plugins/src/dataTypes/List/List.generate.ts
new file mode 100644
index 000000000..998aa1cc3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/List.generate.ts
@@ -0,0 +1,27 @@
+import { DTGenerationData, DTGenerateResult } from '~types/dataTypes';
+import { ListType } from './List.state';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { listType, values, exactly, betweenLow, betweenHigh, delimiter } = data.rowState;
+
+  let items: any = [];
+  if (listType === ListType.exactly) {
+    items = utils.randomUtils.getRandomSubset(values, exactly);
+  } else if (betweenLow && betweenHigh) {
+    const numItems = utils.randomUtils.getRandomNum(betweenLow, betweenHigh);
+    items = utils.randomUtils.getRandomSubset(values, numItems);
+  } else if (betweenLow) {
+    if (betweenLow <= values.length) {
+      const numItems = utils.randomUtils.getRandomNum(betweenLow, values.length);
+      items = utils.randomUtils.getRandomSubset(values, numItems);
+    }
+  } else if (betweenHigh !== '') {
+    const numItems = utils.randomUtils.getRandomNum(0, betweenHigh);
+    items = utils.randomUtils.getRandomSubset(values, numItems);
+  }
+
+  return {
+    display: items.join(delimiter)
+  };
+};
diff --git a/packages/plugins/src/dataTypes/List/List.scss b/packages/plugins/src/dataTypes/List/List.scss
new file mode 100644
index 000000000..8efec8552
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/List.scss
@@ -0,0 +1,31 @@
+.colLabel {
+	display: flex;
+	flex: 0 0 120px;
+	align-items: center;
+	margin-top: 5px;
+
+	svg {
+		margin-left: 5px;
+	}
+}
+
+.content {
+	flex: 1;
+	align-items: flex-start;
+
+	& > ul {
+		margin: 0;
+		padding: 0;
+		list-style-type: none;
+
+		li {
+			margin-bottom: 5px;
+		}
+	}
+}
+
+.row {
+	display: flex;
+	align-items: flex-start;
+	margin-bottom: 10px;
+}
diff --git a/packages/plugins/src/dataTypes/List/List.scss.d.ts b/packages/plugins/src/dataTypes/List/List.scss.d.ts
new file mode 100644
index 000000000..67887e27a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/List.scss.d.ts
@@ -0,0 +1,14 @@
+declare namespace ListScssNamespace {
+  export interface IListScss {
+    colLabel: string;
+    content: string;
+    row: string;
+  }
+}
+
+declare const ListScssModule: ListScssNamespace.IListScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: ListScssNamespace.IListScss;
+};
+
+export = ListScssModule;
diff --git a/packages/plugins/src/dataTypes/List/List.state.tsx b/packages/plugins/src/dataTypes/List/List.state.tsx
new file mode 100644
index 000000000..8ac042a17
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/List.state.tsx
@@ -0,0 +1,37 @@
+export const enum ListType {
+	exactly = 'exactly',
+	between = 'between'
+}
+
+export type ListState = {
+	example: string;
+	listType: ListType;
+	exactly: string;
+	betweenLow: string;
+	betweenHigh: string;
+	values: string[];
+	delimiter: string;
+};
+
+export type GenerationOptionsType = {
+	listType: ListType;
+	exactly: number;
+	betweenLow: number;
+	betweenHigh: number;
+	values: string[];
+	delimiter: string;
+}
+
+export const defaultGenerationOptions = {
+	listType: ListType.exactly,
+	exactly: '1',
+	betweenLow: '',
+	betweenHigh: '',
+	values: ['1', '3', '5', '7', '9', '11', '13', '15', '17', '19'],
+	delimiter: ', '
+};
+
+export const initialState: ListState = {
+	example: '1|3|5|7|9|11|13|15|17|19',
+	...defaultGenerationOptions
+};
diff --git a/packages/plugins/src/dataTypes/List/List.tsx b/packages/plugins/src/dataTypes/List/List.tsx
new file mode 100644
index 000000000..6275cd177
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/List.tsx
@@ -0,0 +1,305 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import InfoIcon from '@mui/icons-material/InfoOutlined';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import Dropdown from '~components/dropdown/Dropdown';
+import CreatablePillField from '~components/creatablePillField/CreatablePillField';
+import TextField from '~components/TextField';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import { Tooltip } from '~components/tooltips';
+import * as langUtils from '~utils/langUtils';
+import { ListType, ListState, GenerationOptionsType } from './List.state';
+import * as styles from './List.scss';
+
+export const Example = ({ data, onUpdate, i18n }: DTExampleProps) => {
+  const onChange = (example: any): void => {
+    onUpdate({
+      ...data,
+      example: example,
+      values: example.split('|')
+    });
+  };
+
+  const options = [
+    { value: '1|3|5|7|9|11|13|15|17|19', label: i18n.example1 },
+    { value: '2|4|6|8|10|12|14|16|18|20', label: i18n.example2 },
+    { value: '1|2|3|4|5|6|7|8|9|10', label: '1-10' },
+    { value: i18n.oneToTen, label: i18n.example3 },
+    { value: '1|2|3|5|7|11|13|17|19|23|29|31|37|41|43|47|53|59|61|67|71|73|79|83|89|97', label: i18n.example4 },
+    { value: i18n.colours, label: i18n.example5 },
+    { value: i18n.relationshipStates, label: i18n.example6 },
+    { value: i18n.prefix, label: i18n.example7 },
+    { value: i18n.departmentNames, label: i18n.example8 },
+    { value: i18n.companies, label: i18n.example9 },
+    { value: i18n.drugNames, label: i18n.example10 },
+    { value: i18n.foodTypes, label: i18n.example11 },
+    { value: i18n.carBrands, label: i18n.example12 },
+    {
+      value:
+        "ALL|DZD|AOA|ARS|AMD|AUD|EUR|AZN|BHD|BBD|BYN|EUR|BMD|BOB|BAM|BWP|BRL|BGN|CVE|KHR|XAF|CAD|KYD|XAF|CLP|CNY|COP|CDF|XAF|CRC|HRK|EUR|'CZK|DKK|DOP|USD|EGP|USD|XAF|EUR|FJD|EUR|EUR|XAF|GEL|EUR|GHS|GIP|'EUR|DKK|GTQ|GBP|GYD|HNL|HKD|HUF|ISK|INR|IDR|IQD|EUR|IMP|ILS|EUR|'XOF|JMD|JPY|GBP|JOD|KZT|KES|KRW|EUR|KWD|KGS|LAK|EUR|LBP|LYD|CHF|'EUR|EUR|MOP|MGA|MWK|MYR|MVR|EUR|MRU|MUR|MXN|MDL|MNT|EUR|MAD|MZN|'MMK|NAD|EUR|NZD|NIO|NGN|MKD|NOK|OMR|PKR|PGK|PYG|PEN|PHP|PLN|EUR|USD|QAR|RON|RUB|RWF|XCD|SAR|XOF|RSD|SGD|EUR|EUR|ZAR|EUR|LKR|SZL|SEK|CHF|TWD|TJS|TZS|THB|USD|TTD|TND|TRY|TMT|UGX|UAH|AED|GBP|USD|UYU|UZS|VEF|VND|ZMW|ZWD",
+      label: i18n.currencyCode
+    },
+    {
+      value:
+        'lek|dinar|kwanza|peso|dram|dollar|euro|manat|rouble|boliviano|konvertibilna marka|pula|real|lev|escudo|riel|yuan|franc|colon|kuna|koruna|kroner|pound|lari|cedi|Danish krone|quetzal|lempira|forint|krona|rupee|rupiah|shekel|yen|tenge|shilling|won|som|kip|pound|pataca|ariary|kwacha|ringgit|rufiyaa|ouguiya|leu|tugrik|dirham|metical|kyat|cordoba oro|naira|denar|rial|kina|guarani|nuevo sol|zloty|riyal|ruble|rand|lilangeni|somoni|baht|lira|hryvnia|sterling|sum|bolivar|dong',
+      label: i18n.currencyName
+    }
+  ];
+
+  return <Dropdown value={data.example} onChange={(i: any): void => onChange(i.value)} options={options} />;
+};
+
+const ListDialog = ({ visible, data, id, onClose, onUpdate, coreI18n, i18n }: any) => {
+  const exactlyField = React.useRef<any>();
+  const dtListBetweenLow = React.useRef<any>();
+
+  const onChange = (field: string, value: any): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  const updateDelimiter = (e: any): void => {
+    onUpdate({
+      ...data,
+      delimiter: e.target.value
+    });
+  };
+
+  const exactlyError = data.exactly ? '' : coreI18n.requiredField;
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.listSettings}</DialogTitle>
+        <DialogContent dividers>
+          <div className={styles.row}>
+            <div className={styles.colLabel}>
+              {i18n.numItemsLabel}
+              <Tooltip title={i18n.numItemsLabelDesc} arrow>
+                <InfoIcon />
+              </Tooltip>
+            </div>
+            <div className={styles.content}>
+              <ul>
+                <li>
+                  <input
+                    type="radio"
+                    id={`listType1-${id}`}
+                    value={ListType.exactly}
+                    checked={data.listType === ListType.exactly}
+                    onChange={(): void => {
+                      onChange('listType', ListType.exactly);
+                      exactlyField.current.focus();
+                    }}
+                  />
+                  <label htmlFor={`listType1-${id}`}>{i18n.exactly}</label>
+                  <TextField
+                    error={exactlyError}
+                    ref={exactlyField}
+                    type="intOnly"
+                    min={1}
+                    id={`dtListExactly_${id}`}
+                    value={data.exactly}
+                    style={{ margin: '0 6px 0 4px', width: 50 }}
+                    onChange={(e: any): void => {
+                      onUpdate({
+                        ...data,
+                        exactly: e.target.value,
+                        listType: ListType.exactly
+                      });
+                    }}
+                  />
+                </li>
+                <li>
+                  <input
+                    type="radio"
+                    id={`listType2-${id}`}
+                    value={ListType.between}
+                    checked={data.listType !== ListType.exactly}
+                    onChange={(): void => {
+                      onChange('listType', ListType.between);
+                      dtListBetweenLow.current.focus();
+                    }}
+                  />
+                  <label htmlFor={`listType2-${id}`}>{i18n.between}</label>
+                  <TextField
+                    ref={dtListBetweenLow}
+                    type="intOnly"
+                    min={0}
+                    placeholder="-"
+                    id={`dtListAtMost_${id}`}
+                    value={data.betweenLow}
+                    style={{ margin: '0 6px 0 4px', width: 50 }}
+                    onChange={(e: any): void => {
+                      onUpdate({
+                        ...data,
+                        betweenLow: e.target.value,
+                        listType: ListType.between
+                      });
+                    }}
+                  />
+                  {i18n.and}
+                  <TextField
+                    type="intOnly"
+                    min={0}
+                    placeholder="-"
+                    id={`dtListBetweenHigh_${id}`}
+                    value={data.betweenHigh}
+                    style={{ margin: '0 6px 0 4px', width: 50 }}
+                    onChange={(e: any): void => {
+                      onUpdate({
+                        ...data,
+                        betweenHigh: e.target.value,
+                        listType: ListType.between
+                      });
+                    }}
+                  />
+                  {i18n.items}
+                </li>
+              </ul>
+            </div>
+          </div>
+          <div className={styles.row}>
+            <div className={styles.colLabel}>{i18n.delimChars}</div>
+            <div className={styles.content}>
+              <input type="text" style={{ width: 40 }} value={data.delimiter} onChange={updateDelimiter} />
+            </div>
+          </div>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ coreI18n, i18n, data, id, onUpdate }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+
+  const safeData = {
+    ...data
+  };
+
+  if (safeData.atMost) {
+    safeData.betweenHigh = safeData.atMost;
+    delete safeData.atMost;
+  }
+
+  if (!safeData.betweenLow) {
+    safeData.betweenLow = '';
+  }
+  if (!safeData.betweenHigh) {
+    safeData.betweenHigh = '';
+  }
+
+  let label;
+  if (safeData.listType === ListType.exactly) {
+    if (safeData.exactly === '1') {
+      label = langUtils.getI18nString(i18n.exactly1Item, ['<b>1</b>']);
+    } else {
+      label = langUtils.getI18nString(i18n.exactlyNItems, [`<b>${safeData.exactly}</b>`]);
+    }
+  } else if (!safeData.betweenLow && !safeData.betweenHigh) {
+    label = i18n.noRangeEntered;
+  } else if (safeData.betweenLow && safeData.betweenHigh) {
+    label = langUtils.getI18nString(i18n.betweenNumItems, [`<b>${safeData.betweenLow}</b>`, `<b>${safeData.betweenHigh}</b>`]);
+  } else if (safeData.betweenLow) {
+    if (safeData.betweenLow === '1') {
+      label = langUtils.getI18nString(i18n.atLeast1Item, ['<b>1</b>']);
+    } else {
+      label = langUtils.getI18nString(i18n.atLeastNItems, [`<b>${safeData.betweenLow}</b>`]);
+    }
+  } else {
+    if (safeData.betweenHigh === '1') {
+      label = langUtils.getI18nString(i18n.atMost1Item, ['<b>1</b>']);
+    } else {
+      label = langUtils.getI18nString(i18n.atMostNItems, [`<b>${safeData.betweenHigh}</b>`]);
+    }
+  }
+
+  return (
+    <>
+      <div style={{ margin: 4 }}>
+        <span dangerouslySetInnerHTML={{ __html: label }} />
+        <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small" style={{ marginLeft: 6 }}>
+          {i18n.customize}
+        </Button>
+      </div>
+      <div>
+        <CreatablePillField value={safeData.values} onChange={(values: any): void => onUpdate({ ...safeData, values })} />
+      </div>
+      <ListDialog
+        visible={dialogVisible}
+        data={safeData}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        onUpdate={onUpdate}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => <p dangerouslySetInnerHTML={{ __html: i18n.help }} />;
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'infer'
+  },
+  sql: {
+    field: 'varchar(255) default NULL',
+    field_Oracle: 'varchar2(255) default NULL',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
+
+export const rowStateReducer = ({
+  delimiter,
+  listType,
+  exactly,
+  betweenLow = '',
+  betweenHigh = '',
+  values
+}: ListState): GenerationOptionsType => {
+  let cleanExactly: any = '';
+  let cleanBetweenLow: any = '';
+  let cleanBetweenHigh: any = '';
+
+  if (listType === ListType.exactly) {
+    if (exactly.trim() !== '') {
+      cleanExactly = parseInt(exactly.trim(), 10);
+    }
+  } else {
+    if (betweenLow.trim() !== '') {
+      cleanBetweenLow = parseInt(betweenLow.trim(), 10);
+    }
+    if (betweenHigh.trim() !== '') {
+      cleanBetweenHigh = parseInt(betweenHigh.trim(), 10);
+    }
+
+    // ensure that the number are sorted low to high - makes the generation code have to do less work on every
+    // iteration
+    if (cleanBetweenLow !== '' && cleanBetweenHigh !== '') {
+      if (cleanBetweenLow > cleanBetweenHigh) {
+        const oldLow = cleanBetweenLow;
+        cleanBetweenLow = cleanBetweenHigh;
+        cleanBetweenHigh = oldLow;
+      }
+    }
+  }
+
+  return {
+    listType,
+    exactly: cleanExactly,
+    betweenLow: cleanBetweenLow,
+    betweenHigh: cleanBetweenHigh,
+    values,
+    delimiter: delimiter ? delimiter : ', '
+  };
+};
diff --git a/packages/plugins/src/dataTypes/List/List.worker.ts b/packages/plugins/src/dataTypes/List/List.worker.ts
new file mode 100644
index 000000000..693d723eb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/List.worker.ts
@@ -0,0 +1,38 @@
+import utils from '../../../utils';
+import { DTGenerationData, DTGenerateResult, DTWorkerOnMessage } from '~types/dataTypes';
+import { ListType } from './List.state';
+
+export const generate = (data: DTGenerationData): DTGenerateResult => {
+	const { listType, values, exactly, betweenLow, betweenHigh, delimiter } = data.rowState;
+
+	let items: any = [];
+	if (listType === ListType.exactly) {
+		items = utils.randomUtils.getRandomSubset(values, exactly);
+	} else if (betweenLow && betweenHigh) {
+		const numItems = utils.randomUtils.getRandomNum(betweenLow, betweenHigh);
+		items = utils.randomUtils.getRandomSubset(values, numItems);
+	} else if (betweenLow) {
+		if (betweenLow <= values.length) {
+			const numItems = utils.randomUtils.getRandomNum(betweenLow, values.length);
+			items = utils.randomUtils.getRandomSubset(values, numItems);
+		}
+	} else if (betweenHigh !== '') {
+		const numItems = utils.randomUtils.getRandomNum(0, betweenHigh);
+		items = utils.randomUtils.getRandomSubset(values, numItems);
+	}
+
+	return {
+		display: items.join(delimiter)
+	};
+};
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/dataTypes/List/README.md b/packages/plugins/src/dataTypes/List/README.md
new file mode 100644
index 000000000..1bd9291cc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/README.md
@@ -0,0 +1,44 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; List
+
+This Data Type generates a item from a random list. 
+
+
+### Example API Usage
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "List",
+            "title": "Colour",
+            "settings": {
+                "listType": "exactly", 
+                "exactly": 1,
+                "list": "red|orange|yellow|green|blue|indigo|violet"
+            }
+        },
+        {
+            "type": "List",
+            "title": "Numbers",
+            "settings": {
+                "listType": "atMost", 
+                "atMost": 3,
+                "list": "1|2|3|4|5"
+            }
+        }
+    ],
+    "export": {
+        "type": "JSON",
+        "settings": {
+            "stripWhitespace": false,
+            "dataStructureFormat": "complex"
+        }
+    }
+}
+```
+ 
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/dataTypes/List/__tests__/List.generate.test.ts b/packages/plugins/src/dataTypes/List/__tests__/List.generate.test.ts
new file mode 100644
index 000000000..a720cf3cc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/__tests__/List.generate.test.ts
@@ -0,0 +1,28 @@
+import { onmessage } from '../List.worker';
+import { getBlankDTGeneratorPayload } from '../../../../../tests/testHelpers';
+
+describe('onmessage', () => {
+	const postMessage = jest.fn();
+	const importScripts = jest.fn();
+	beforeAll(() => {
+		window.postMessage = postMessage;
+		window.importScripts = importScripts;
+	});
+
+	it('generates random data', () => {
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				rowState: {
+					listType: 'exactly',
+					values: [123],
+					exactly: 1,
+					atMost: 1
+				}
+			}
+		};
+
+		onmessage(payload);
+		expect(postMessage).toHaveBeenCalledWith({ display: '123' });
+	});
+});
diff --git a/packages/plugins/src/dataTypes/List/__tests__/List.test.tsx b/packages/plugins/src/dataTypes/List/__tests__/List.test.tsx
new file mode 100644
index 000000000..884934684
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/__tests__/List.test.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Help, Options } from '../List';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+  data: {
+    values: []
+  },
+  coreI18n: {},
+  countryI18n: {},
+  i18n,
+  id: 'id',
+  gridPanelDimensions: { width: 100, height: 100 },
+  onUpdate: () => {},
+  isCountryNamesLoading: false,
+  isCountryNamesLoaded: false,
+  countryNamesMap: null
+};
+
+describe('Help', () => {
+  it('renders', () => {
+    const { container } = render(<Help {...defaultProps} />);
+    expect(container).toBeTruthy();
+  });
+});
+
+describe('Options', () => {
+  it('renders', () => {
+    const { container } = render(<Options {...defaultProps} />);
+    expect(container).toBeTruthy();
+  });
+});
diff --git a/packages/plugins/src/dataTypes/List/bundle.ts b/packages/plugins/src/dataTypes/List/bundle.ts
new file mode 100644
index 000000000..f91a698ac
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/bundle.ts
@@ -0,0 +1,14 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, getMetadata, rowStateReducer } from './List';
+import { initialState } from './List.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	getMetadata,
+	rowStateReducer
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/List/config.ts b/packages/plugins/src/dataTypes/List/config.ts
new file mode 100644
index 000000000..2bf964448
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'other',
+  fieldGroupOrder: 40
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/List/i18n/ar.json b/packages/plugins/src/dataTypes/List/i18n/ar.json
new file mode 100644
index 000000000..abafdc3db
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/ar.json
@@ -0,0 +1,47 @@
+{
+  "NAME": "قائمة",
+  "DESC": "يولد قيمة عشوائية واحدة أو أكثر من قائمة عناصر عشوائية.",
+  "DEFAULT_TITLE": "list",
+  "atMost": "في الغالب",
+  "colours": "أحمر|برتقالي|أصفر|أخضر|أزرق|نيلي|بنفسجي",
+  "companies": "Microsoft|Google|Yahoo|Lycos|Altavista|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple Systems|Amazon",
+  "departmentNames": "Accounting|Advertising|Asset Management|Customer Relations|Customer Service|Finances|Human Resources|Legal Department|Media Relations|Payroll|Public Relations|Quality Assurance|Sales and Marketing|Research and Development|Tech Support",
+  "exactly": "بالضبط",
+  "example1": "الأعداد الفردية أقل من 20",
+  "example2": "حتى الأعداد الأقل من 20 عامًا",
+  "example3": "واحد على عشرة",
+  "example4": "الأعداد الأولية أقل من 100",
+  "example5": "الألوان",
+  "example6": "الحالة الاجتماعية",
+  "example7": "عنوان",
+  "example8": "أسماء الأقسام",
+  "example9": "أسماء الشركات",
+  "example10": "أسماء الأدوية",
+  "example11": "أنواع الطعام",
+  "example12": "ماركات السيارات",
+  "help": "أدخل عددًا من العناصر عن طريق إدخال نص ثم النقر فوق إدخال. ثم حدد ما إذا كنت تريد عدد X بالضبط من العناصر ، أو X عنصرًا على الأكثر من القائمة. يتم إرجاع عناصر متعددة في قائمة مفصولة بفواصل في النتائج.",
+  "oneToTen": "واحد|اثنان|ثلاثة|أربعة|خمسة|ستة|سبعة|ثمانية|تسعة|عشرة",
+  "prefix": "دكتور|السيد|السيدة|السيدة.",
+  "relationshipStates": "أعزب|متزوج|مطلق|قانون عام",
+  "incompleteFields": "يحتاج نوع بيانات القائمة المخصصة إلى إدخال التنسيق في حقل نص الخيارات. الرجاء إصلاح الصفوف التالية:",
+  "invalidIntFields": "الرجاء إدخال الأرقام فقط في حقلي \"بالضبط\" و \"على الأكثر\" لنوع بيانات القائمة المخصصة. الرجاء إصلاح الصفوف التالية:",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "معكرونة|فطائر|سلطات|شطائر|شوربات|يخنات|حبوب|مأكولات بحرية|حلويات|نودلز",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+  "numItemsLabel": "عدد العناصر",
+  "numItemsLabelDesc": "يتحكم هذا الإعداد في عدد العناصر التي تم إنشاؤها من قائمتك. يمكنك اختيار عدد محدد من العناصر لتوليدها ، أو رقم بين نطاق من اختيارك.",
+  "exactly1Item": "%1 عنصر بالضبط من القائمة",
+  "exactlyNItems": "%1 عنصر بالضبط من القائمة",
+  "atMost1Item": "على الأكثر%1  عنصر من القائمة",
+  "atMostNItems": "على الأكثر%1 عنصر من القائمة",
+  "customize": "يعدل أو يكيف",
+  "listSettings": "إعدادات القائمة",
+  "delimChars": "حرف (أحرف) محدد",
+  "betweenNumItems": "بين %1 و %2 عناصر",
+  "atLeast1Item": "ما لا يقل عن %1 عنصر من القائمة",
+  "atLeastNItems": "%1 عنصر على الأقل",
+  "noRangeEntered": "لم يتم إدخال أي نطاق",
+  "between": "ما بين",
+  "and": "و",
+  "items": "أغراض"
+}
diff --git a/packages/plugins/src/dataTypes/List/i18n/de.json b/packages/plugins/src/dataTypes/List/i18n/de.json
new file mode 100644
index 000000000..552ea661f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/de.json
@@ -0,0 +1,47 @@
+{
+  "NAME": "Liste",
+  "DESC": "Erzeugt einen oder mehrere zufällige Werte aus einer beliebigen Liste von Elementen .",
+  "DEFAULT_TITLE": "liste",
+  "atMost": "Am meisten",
+  "colours": "red|orange|gelb|grün|blau|indigo|violett",
+  "companies": "Microsoft|Google|Yahoo|Lycos|Altavista|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple Systems|Amazon",
+  "departmentNames": "Accounting | Werbung | Asset Management | Customer Relations | Kundenservice | Finanzen | Human Resources | Legal Department | Media Relations | Payroll | Public Relations | Qualitätssicherung | Vertrieb und Marketing | Forschung und Entwicklung | Tech Support",
+  "exactly": "Genau",
+  "example1": "Odd Nums unter 20",
+  "example2": "Auch Nums unter 20",
+  "example3": "One-Ten",
+  "example4": "Prime Nums unter 100",
+  "example5": "Farben",
+  "example6": "Familienstand",
+  "example7": "Titel",
+  "example8": "Abteilung Namen",
+  "example9": "Firmennamen",
+  "example10": "Drug Namen",
+  "example11": "Lebensmitteltypen",
+  "example12": "Automarken",
+  "help": "Geben Sie eine Reihe von Elementen ein, indem Sie Text eingeben und dann auf die Eingabetaste klicken. Wählen Sie dann aus der Liste aus, ob Sie genau X Elemente oder höchstens X Elemente möchten. In den Ergebnissen werden mehrere Elemente in einer durch Kommas getrennten Liste zurückgegeben.",
+  "oneToTen": "eins|zwei|drei|vier|five|sechs|sieben|acht|neun|zehn",
+  "prefix": "Dr.|Herr|Frau|Frau",
+  "relationshipStates": "Single|Verheiratet|Geschieden|Common-Law",
+  "incompleteFields": "Die Benutzerdefinierte Liste Datentyp haben muss das Format eingetragen im Options Textfeld. Bitte beheben Sie die folgenden Zeilen:",
+  "invalidIntFields": "Bitte geben Sie nur Zahlen in der \"Genau\" und \"höchstens\" Felder für die Benutzerdefinierte Liste Datentyp. Bitte beheben Sie die folgenden Zeilen:",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "pasta|Torten|Salate|Sandwichs|Suppen|Eintöpfe|Getreide|Meeresfrüchten|Desserts|Nudeln",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+  "numItemsLabel": "Anzahl Artikel",
+  "numItemsLabelDesc": "Diese Einstellung steuert die Anzahl der Elemente, die aus Ihrer Liste generiert werden. Sie können eine genaue Anzahl von zu generierenden Elementen oder eine Anzahl aus einem Bereich Ihrer Wahl auswählen.",
+  "exactly1Item": "Genau %1 Element aus der Liste",
+  "exactlyNItems": "Genau %1 Elemente aus der Liste",
+  "atMost1Item": "Höchstens %1 Eintrag aus der Liste",
+  "atMostNItems": "Höchstens %1 Elemente aus der Liste",
+  "customize": "Anpassen",
+  "listSettings": "Listeneinstellungen",
+  "delimChars": "Trennzeichen (e)",
+  "betweenNumItems": "Zwischen %1 und %2 Artikel",
+  "atLeast1Item": "Mindestens %1 Element aus der Liste",
+  "atLeastNItems": "Mindestens %1 Elemente aus der Liste",
+  "noRangeEntered": "Kein Bereich eingegeben",
+  "between": "Zwischen",
+  "and": "und",
+  "items": "Produkte"
+}
diff --git a/packages/plugins/src/dataTypes/List/i18n/en.json b/packages/plugins/src/dataTypes/List/i18n/en.json
new file mode 100644
index 000000000..2bd15e7fe
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/en.json
@@ -0,0 +1,49 @@
+{
+  "NAME": "List",
+  "DESC": "Generates one or more random values from an arbitrary list of items.",
+  "DEFAULT_TITLE": "list",
+  "atMost": "At Most",
+  "colours": "red|orange|yellow|green|blue|indigo|violet",
+  "companies": "Microsoft|Google|Yahoo|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple|Amazon",
+  "departmentNames": "Accounting|Advertising|Asset Management|Customer Relations|Customer Service|Finances|Human Resources|Legal Department|Media Relations|Payroll|Public Relations|Quality Assurance|Sales and Marketing|Research and Development|Tech Support",
+  "exactly": "Exactly",
+  "example1": "Odd Nums under 20",
+  "example2": "Even Nums under 20",
+  "example3": "One-Ten",
+  "example4": "Prime Nums under 100",
+  "example5": "Colours",
+  "example6": "Marital Status",
+  "example7": "Title",
+  "example8": "Department Names",
+  "example9": "Company Names",
+  "example10": "Drug Names",
+  "example11": "Food Types",
+  "example12": "Car Brands",
+  "help": "Enter a number of items by entering text then clicking enter. Then select whether you want <b>Exactly</b> X number of items, or <b>At most</b> X items from the list. Multiple items are returned in a comma-delimited list in the results.",
+  "oneToTen": "one|two|three|four|five|six|seven|eight|nine|ten",
+  "prefix": "Dr.|Mr.|Mrs.|Ms.",
+  "relationshipStates": "Single|Married|Divorced|Common-Law",
+  "incompleteFields": "The Custom List Data Type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "invalidIntFields": "Please only enter numbers in the \"Exactly\" and \"At Most\" fields for the Custom List Data Type. Please fix the following rows:",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "pasta|pies|salads|sandwiches|soups|stews|cereals|seafood|desserts|noodles",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+  "numItemsLabel": "Num items",
+  "numItemsLabelDesc": "This setting controls the number of items generated from your list. You can choose an exact number of items to generate, or a number between a range of your choosing.",
+  "exactly1Item": "Exactly %1 item from list",
+  "exactlyNItems": "Exactly %1 items from list",
+  "atMost1Item": "At most %1 item from list",
+  "atMostNItems": "At most %1 items from list",
+  "customize": "Customize",
+  "listSettings": "List Settings",
+  "delimChars": "Delimiter char(s)",
+  "betweenNumItems": "Between %1 and %2 items",
+  "atLeast1Item": "At least %1 item from list",
+  "atLeastNItems": "At least %1 items from list",
+  "noRangeEntered": "No range entered",
+  "between": "Between",
+  "and": "and",
+  "items": "items",
+  "currencyCode": "Currency code",
+  "currencyName": "Currency name"
+}
diff --git a/packages/plugins/src/dataTypes/List/i18n/es.json b/packages/plugins/src/dataTypes/List/i18n/es.json
new file mode 100644
index 000000000..2eb83856d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/es.json
@@ -0,0 +1,47 @@
+{
+  "NAME": "Lista",
+  "DESC": "Genera uno o más valores aleatorios a partir de una lista arbitraria de artículos.",
+  "DEFAULT_TITLE": "lista",
+  "atMost": "Al menos",
+  "colours": "rojo|naranja|amarillo|verde|azul|índigo|violeta",
+  "companies": "Microsoft|Google|Yahoo|Lycos|Altavista|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple Systems|Amazon",
+  "departmentNames": "Contabilidad|Publicidad|Gestión de activos|Atención al cliente|Finanzas|Recursos humanos|Departamento legal|Relaciones con los medios|Nóminas|Relaciones públicas|Gestión de la calidad|Ventas y Mercadotécnia|Investigación y desarrollo|Soporte técnico",
+  "exactly": "Exactamente",
+  "example1": "Números impares menores de 20",
+  "example2": "Números pares menores de 20",
+  "example3": "Uno-Diez",
+  "example4": "Números primos menores de 100",
+  "example5": "Colores",
+  "example6": "Estado civil",
+  "example7": "Tratamiento",
+  "example8": "Nombres de departamento",
+  "example9": "Nombres de empresa",
+  "example10": "Nombres de medicamentos",
+  "example11": "Tipos de alimentos",
+  "example12": "Marcas de coches",
+  "help": "Ingrese una cantidad de elementos ingresando texto y luego haciendo clic en Intro. A continuación, seleccione si desea exactamente X número de elementos o como máximo X elementos de la lista. Se devuelven varios elementos en una lista delimitada por comas en los resultados.",
+  "oneToTen": "uno|dos|tres|cuatro|cinco|seis|siete|ocho|nueve|diez",
+  "prefix": "Dr.|Sr.|Sra.|Srta.|",
+  "relationshipStates": "Soltero|Casado|Divorciado|Pareja de hecho|Viudo",
+  "incompleteFields": "El tipo de dato Lista personalizada requiere que se informe el campo de texto Opciones con el formato. Por favor, arregle las siguientes filas:",
+  "invalidIntFields": "Por favor, introduzca sólo números en los campos \"Exactamente\" y \"Al Menos\" del tipo de dato Lista personalizada. Por favor, arregle las siguientes filas:",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "pasta|empanadas|ensaladas|sándwiches|sopas|guisos|cereales|mariscos|postres|fideos",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+  "numItemsLabel": "Num elementos",
+  "numItemsLabelDesc": "Esta configuración controla la cantidad de elementos generados a partir de su lista. Puede elegir un número exacto de elementos para generar, o un número entre un rango de su elección.",
+  "exactly1Item": "Exactamente %1 elemento de la lista",
+  "exactlyNItems": "Exactamente %1 elementos de la lista",
+  "atMost1Item": "Como máximo %1 elemento de la lista",
+  "atMostNItems": "Como máximo %1 elementos de la lista",
+  "customize": "Personalizar",
+  "listSettings": "Configuración de lista",
+  "delimChars": "Carácter (s) delimitador",
+  "betweenNumItems": "Entre %1 y %2 elementos",
+  "atLeast1Item": "Al menos %1 elemento de la lista",
+  "atLeastNItems": "Al menos %1 elementos de la lista",
+  "noRangeEntered": "No se ingresó rango",
+  "between": "Entre",
+  "and": "y",
+  "items": "elementos"
+}
diff --git a/packages/plugins/src/dataTypes/List/i18n/fr.json b/packages/plugins/src/dataTypes/List/i18n/fr.json
new file mode 100644
index 000000000..e17ee62ea
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/fr.json
@@ -0,0 +1,47 @@
+{
+  "NAME": "Liste",
+  "DESC": "Génère une ou plusieurs valeurs aléatoires à partir d'une liste d'objets arbitraire .",
+  "DEFAULT_TITLE": "liste",
+  "atMost": "Au maximum",
+  "colours": "rouge|orange|jaune|vert|bleu|indigo|violet",
+  "companies": "Microsoft|Google|Yahoo|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple Systems|Amazon",
+  "departmentNames": "Comptables|Publicité|Asset Management|Relations clientèle|Service clientèle|Finances|Ressources Humaines|Juridique|Relations presse|Paie|Relations publiques|Assurance qualité|Ventes et marketing|Recherche et Développement|Support technique",
+  "exactly": "Exactement",
+  "example1": "Nombres impairs jusqu'à 20",
+  "example2": "Nombres pairs jusqu'à 20",
+  "example3": "Un à dix",
+  "example4": "Nombres premiers jusqu'à 100",
+  "example5": "Couleurs",
+  "example6": "État civil",
+  "example7": "Titre",
+  "example8": "Services",
+  "example9": "Entreprises",
+  "example10": "Les noms de médicaments",
+  "example11": "Types alimentaires",
+  "example12": "Marques de voitures",
+  "help": "Entrez un certain nombre d'éléments en saisissant du texte puis en cliquant sur Entrée. Sélectionnez ensuite si vous voulez un nombre Exactement X d'éléments ou Au plus X éléments dans la liste. Plusieurs éléments sont renvoyés dans une liste délimitée par des virgules dans les résultats.",
+  "oneToTen": "un|deux|trois|quatre|cinq|six|sept|huit|neuf|dix",
+  "prefix": "Dr.|M.|Mme|Mme|Mlle|",
+  "relationshipStates": "Célibataire|Marié|Veuf|",
+  "incompleteFields": "La Type de données Liste doit avoir un format précisé. Corrigez les lignes suivantes:",
+  "invalidIntFields": "Entrez uniquement des numéros dans les champs \"=\" et \"<=\". Corrigez les lignes suivantes:",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "pâtes|tartes|salades|sandwiches|soupes|ragoûts|céréales|fruits de mer|desserts|nouilles",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+  "numItemsLabel": "Nombre d'articles",
+  "numItemsLabelDesc": "Ce paramètre contrôle le nombre d'éléments générés à partir de votre liste. Vous pouvez choisir un nombre exact d'éléments à générer ou un nombre entre une plage de votre choix.",
+  "exactly1Item": "Exactement %1 élément de la liste",
+  "exactlyNItems": "Exactement %1 éléments de la liste",
+  "atMost1Item": "Au plus %1 élément de la liste",
+  "atMostNItems": "Au plus %1 éléments de la liste",
+  "customize": "Personnaliser",
+  "listSettings": "Paramètres de liste",
+  "delimChars": "Caractère (s) de délimitation",
+  "betweenNumItems": "Entre %1 et %2 éléments",
+  "atLeast1Item": "Au moins %1 élément de la liste",
+  "atLeastNItems": "Au moins %1 éléments de la liste",
+  "noRangeEntered": "Aucune plage entrée",
+  "between": "Compris entre",
+  "and": "et",
+  "items": "éléments"
+}
diff --git a/packages/plugins/src/dataTypes/List/i18n/hi.json b/packages/plugins/src/dataTypes/List/i18n/hi.json
new file mode 100644
index 000000000..9ca13e8c3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/hi.json
@@ -0,0 +1,47 @@
+{
+  "NAME": "सूची",
+  "DESC": "वस्तुओं की मनमानी सूची से एक या अधिक यादृच्छिक मान उत्पन्न करता है।",
+  "DEFAULT_TITLE": "सूची",
+  "atMost": "अधिक से अधिक",
+  "colours": "लाल|नारंगी|पीला|हरा|नीला|इंडिगो|वायलेट",
+  "companies": "Microsoft|Google|Yahoo|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple|Amazon",
+  "departmentNames": "अकाउंटिंग|विज्ञापन|एसेट मैनेजमेंट|ग्राहक संबंध|ग्राहक सेवा|वित्त|मानव संसाधन|कानूनी विभाग|मीडिया संबंध|पेरोल|जनसंपर्क|गुणवत्ता आश्वासन|बिक्री और विपणन|अनुसंधान और विकास|तकनीकी सहायता",
+  "exactly": "बिल्कुल",
+  "example1": "20 . के तहत विषम संख्याएं",
+  "example2": "20 . से भी कम संख्या",
+  "example3": "एक दस",
+  "example4": "100 से कम के प्राइम नंबर",
+  "example5": "रंग की",
+  "example6": "वैवाहिक स्थिति",
+  "example7": "शीर्षक",
+  "example8": "विभाग के नाम",
+  "example9": "कंपनी के नाम",
+  "example10": "दवा के नाम",
+  "example11": "भोजन के प्रकार",
+  "example12": "कार ब्रांड",
+  "help": "टेक्स्ट दर्ज करके और फिर एंटर पर क्लिक करके कई आइटम दर्ज करें। फिर चुनें कि क्या आप सूची से <b>बिल्कुल</b> X संख्या में आइटम चाहते हैं, या <b>अधिकतम</b> X आइटम चाहते हैं। परिणामों में अल्पविराम-सीमांकित सूची में एकाधिक आइटम लौटाए जाते हैं।",
+  "oneToTen": "एक|दो|तीन|चार|पांच|छह|सात|आठ|नौ|दस",
+  "prefix": "डॉ.|श्रीमान|श्रीमती|सुश्री।",
+  "relationshipStates": "अविवाहित|विवाहित|तलाकशुदा|सामान्य कानून",
+  "incompleteFields": "कस्टम सूची डेटा प्रकार को विकल्प टेक्स्ट फ़ील्ड में प्रारूप दर्ज करने की आवश्यकता है। कृपया निम्न पंक्तियों को ठीक करें:",
+  "invalidIntFields": "कस्टम सूची डेटा प्रकार के लिए कृपया केवल \"बिल्कुल\" और \"अधिकतम\" फ़ील्ड में नंबर दर्ज करें। कृपया निम्न पंक्तियों को ठीक करें:",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "पास्ता|पाई|सलाद|सैंडविच|सूप|स्टू|अनाज|समुद्री भोजन|डेसर्ट|नूडल्स",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+  "numItemsLabel": "संख्या आइटम",
+  "numItemsLabelDesc": "यह सेटिंग आपकी सूची से उत्पन्न वस्तुओं की संख्या को नियंत्रित करती है। आप उत्पन्न करने के लिए वस्तुओं की एक सटीक संख्या चुन सकते हैं, या अपने चयन की एक सीमा के बीच एक संख्या चुन सकते हैं।",
+  "exactly1Item": "सूची से ठीक %1आइटम",
+  "exactlyNItems": "सूची से ठीक %1 आइटम",
+  "atMost1Item": "सूची से अधिकतम %1आइटम",
+  "atMostNItems": "सूची से अधिकतम %1 आइटम",
+  "customize": "अनुकूलित करें",
+  "listSettings": "सूची सेटिंग्स",
+  "delimChars": "सीमांकक चार(रों)",
+  "betweenNumItems": "%1 और %2 मदों के बीच",
+  "atLeast1Item": "सूची से कम से कम %1 आइटम",
+  "atLeastNItems": "सूची से कम से कम %1 आइटम",
+  "noRangeEntered": "कोई सीमा दर्ज नहीं की गई",
+  "between": "बीच में",
+  "and": "तथा",
+  "items": "आइटम"
+}
diff --git a/packages/plugins/src/dataTypes/List/i18n/ja.json b/packages/plugins/src/dataTypes/List/i18n/ja.json
new file mode 100644
index 000000000..b323d703e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/ja.json
@@ -0,0 +1,47 @@
+{
+  "NAME": "リスト",
+  "DESC": "アイテムの任意のリストから1つ以上のランダムな値を生成します。",
+  "DEFAULT_TITLE": "リスト",
+  "atMost": "せいぜい",
+  "colours": "赤|オレンジ|黄|緑|青|藍|紫",
+  "companies": "Microsoft|Google|Yahoo|Lycos|Altavista|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple Systems|Amazon",
+  "departmentNames": "経理|広告|資産管理|カスタマーリレーションズ|カスタマーサービス|ファイナンス|人事|法務部門|メディアリレーションズ|給与|広報|品質保証|販売およびマーケティング|研究開発|技術サポート",
+  "exactly": "丁度",
+  "example1": "20歳未満の奇数の数字",
+  "example2": "20歳未満のナムでも",
+  "example3": "1から10",
+  "example4": "100未満の素数",
+  "example5": "色",
+  "example6": "配偶者の有無",
+  "example7": "題名",
+  "example8": "部門名",
+  "example9": "会社名",
+  "example10": "薬名",
+  "example11": "食品の種類",
+  "example12": "車のブランド",
+  "help": "テキストを入力してEnterをクリックして、いくつかの項目を入力します。 次に、正確にX個のアイテムを使用するか、リストから最大X個のアイテムを使用するかを選択します。 結果では、複数の項目がコンマ区切りのリストで返されます。",
+  "oneToTen": "1|2|3|4|5|6|7|8|9|10",
+  "prefix": "Dr.|Mr.|Mrs.|Ms.",
+  "relationshipStates": "独身|既婚|離婚|内縁関係",
+  "incompleteFields": "カスタムリストデータ型では、[オプション]テキストフィールドに形式を入力する必要があります。 次の行を修正してください。",
+  "invalidIntFields": "カスタムリストデータ型の[正確]フィールドと[最大]フィールドにのみ数値を入力してください。 次の行を修正してください。",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "パスタ|パイ|サラダ|サンドイッチ|スープ|シチュー|シリアル|シーフード|デザート|麺",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+  "numItemsLabel": "アイテム数",
+  "numItemsLabelDesc": "この設定は、リストから生成されるアイテムの数を制御します。 生成するアイテムの正確な数、または選択した範囲からの数を選択できます。",
+  "exactly1Item": "リストから正確に%1アイテム",
+  "exactlyNItems": "リストから正確に%1アイテム",
+  "atMost1Item": "リストから最大%1個のアイテム",
+  "atMostNItems": "リストから最大%1個のアイテム",
+  "customize": "カスタマイズ",
+  "listSettings": "リスト設定",
+  "delimChars": "区切り文字",
+  "betweenNumItems": "%1から%2のアイテム",
+  "atLeast1Item": "リストから少なくとも%1アイテム",
+  "atLeastNItems": "リストから少なくとも%1個のアイテム",
+  "noRangeEntered": "範囲が入力されていません",
+  "between": "間",
+  "and": "と",
+  "items": "アイテム"
+}
diff --git a/packages/plugins/src/dataTypes/List/i18n/nl.json b/packages/plugins/src/dataTypes/List/i18n/nl.json
new file mode 100644
index 000000000..cb3195ab7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/nl.json
@@ -0,0 +1,47 @@
+{
+  "NAME": "Lijst",
+  "DESC": "Genereert een of meer willekeurige waarden uit een willekeurige lijst van items.",
+  "DEFAULT_TITLE": "lijst",
+  "atMost": "Maximaal",
+  "colours": "rood|oranje|geel|groen|blauw|indigo|violet|wit|zwart|zilver|goud",
+  "companies": "Microsoft|Google|Yahoo|Lycos|Altavista|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple Systems|Amazon",
+  "departmentNames": "Boekhouding|Adverteren|Asset Management|Customer Relations|Klantenservice|Financiën|Personeelszaken|Juridische afdeling|Media Zaken|Salaris Administratie|PR Afdeling|Kwaliteitsgarantie|Sales en Marketing|Onderzoek en Ontwikkeling|Technische ondersteuning",
+  "exactly": "Precies",
+  "example1": "Oneven nummers onder de 20",
+  "example2": "Even nummers onder de 20",
+  "example3": "Een-Tien",
+  "example4": "Priemgetallen onder de 100",
+  "example5": "Kleuren",
+  "example6": "Burgerlijke staat",
+  "example7": "Titelatuur",
+  "example8": "Afdelingsnamen",
+  "example9": "Bedrijfsnamen",
+  "example10": "Medicijnen",
+  "example11": "Soorten Eten",
+  "example12": "Automerken",
+  "help": "Voer een aantal items in door tekst in te voeren en vervolgens op enter te klikken. Selecteer vervolgens of u Exact X aantal items of Maximaal X items uit de lijst wilt. Meerdere items worden geretourneerd in een door komma's gescheiden lijst in de resultaten.",
+  "incompleteFields": "De Aangepaste lijst Gegevenstype dient te beschikken over het formaat ingevoerd in het Opties tekstveld. Please fix de volgende rijen:",
+  "invalidIntFields": "Gelieve enkel getallen in te voeren in de \\\"Precies\\\" en \\\"maximaal\\\" velden voor de Aangepaste lijst Gegevenstype. Pas AUB de volgende rijen aan:",
+  "oneToTen": "een|twee|drie|vier|vijf|zes|zeven|acht|negen|tien",
+  "prefix": "Dr.|De heer|Mevrouw|Ms|Prof.|Drs.|Mr.|Ir.|Ing.",
+  "relationshipStates": "Alleenstaand|Getrouwd|Gescheiden|Samenwonend",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "pasta|pies|salades|sandwiches|soepen|stoofschotels|granen|schaal-en schelpdieren|nagerechten|noodles",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+  "numItemsLabel": "Aantal items",
+  "numItemsLabelDesc": "Deze instelling bepaalt het aantal items dat uit uw lijst wordt gegenereerd. U kunt een exact aantal items kiezen om te genereren, of een aantal tussen een bereik naar keuze.",
+  "exactly1Item": "Precies %1 item uit de lijst",
+  "exactlyNItems": "Precies %1 items uit de lijst",
+  "atMost1Item": "Maximaal %1 item uit lijst",
+  "atMostNItems": "Maximaal %1 items uit lijst",
+  "customize": "Aanpassen",
+  "listSettings": "Lijstinstellingen",
+  "delimChars": "Scheidingsteken (s)",
+  "betweenNumItems": "Tussen %1 en %2 items",
+  "atLeast1Item": "Ten minste %1 item uit lijst",
+  "atLeastNItems": "Minstens %1 items uit de lijst",
+  "noRangeEntered": "Geen bereik ingevoerd",
+  "between": "Tussen",
+  "and": "en",
+  "items": "artikelen"
+}
diff --git a/packages/plugins/src/dataTypes/List/i18n/pt.json b/packages/plugins/src/dataTypes/List/i18n/pt.json
new file mode 100644
index 000000000..d25f056da
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/pt.json
@@ -0,0 +1,47 @@
+{
+  "NAME": "Lista",
+  "DESC": "Gera um ou mais valores aleatórios de uma lista arbitrária de itens.",
+  "DEFAULT_TITLE": "lista",
+  "atMost": "No máximo",
+  "colours": "vermelho|laranja|amarelo|verde|azul|índigo|violeta",
+  "companies": "Microsoft|Google|Yahoo|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple|Amazon",
+  "departmentNames": "Accounting|Advertising|Asset Management|Customer Relations|Customer Service|Finances|Human Resources|Legal Department|Media Relations|Payroll|Public Relations|Quality Assurance|Sales and Marketing|Research and Development|Tech Support",
+  "exactly": "Exatamente",
+  "example1": "Odd Nums com menos de 20 anos",
+  "example2": "Até mesmo Nums com menos de 20 anos",
+  "example3": "Um a Dez",
+  "example4": "Números primos abaixo de 100",
+  "example5": "Cores",
+  "example6": "Estado civil",
+  "example7": "Título",
+  "example8": "Nomes de Departamento",
+  "example9": "Nomes de Empresa",
+  "example10": "Nomes de Drogas",
+  "example11": "Tipos de Alimentos",
+  "example12": "Marcas de automóveis",
+  "help": "Insira um número de itens digitando o texto e clicando em Enter. Em seguida, selecione se deseja um número <b>Exatamente</b> X de itens ou <b>No máximo</b> X itens da lista. Vários itens são retornados em uma lista delimitada por vírgulas nos resultados.",
+  "oneToTen": "um|dois|três|quatro|cinco|seis|sete|oito|nove|dez",
+  "prefix": "Dr.|Sr.|Sra.|Sra.",
+  "relationshipStates": "Solteiro|Casado|Divorciado|União",
+  "incompleteFields": "O tipo de dados da lista personalizada precisa ter o formato inserido no campo de texto Opções. Corrija as seguintes linhas: ",
+  "invalidIntFields": "Insira apenas números nos campos \"Exatamente\" e \"No máximo\" para o tipo de dados de lista personalizada. Corrija as seguintes linhas:",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "massas|tortas|saladas|sanduíches|sopas|guisados|cereais|frutos do mar|sobremesas|macarrão",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+  "numItemsLabel": "Núm itens",
+  "numItemsLabelDesc": "Esta configuração controla o número de itens gerados a partir de sua lista. Você pode escolher um número exato de itens a serem gerados ou um número entre um intervalo de sua escolha.",
+  "exactly1Item": "Exatamente %1 item da lista",
+  "exactlyNItems": "Exatamente %1 itens da lista",
+  "atMost1Item": "No máximo %1 item da lista",
+  "atMostNItems": "No máximo %1 itens da lista",
+  "customize": "Customizar",
+  "listSettings": "Configurações da lista",
+  "delimChars": "Configurações da lista",
+  "betweenNumItems": "Entre %1 e %2 itens",
+  "atLeast1Item": "Pelo menos %1 item da lista",
+  "atLeastNItems": "Pelo menos %1 itens da lista",
+  "noRangeEntered": "Nenhum intervalo inserido",
+  "between": "Entre",
+  "and": "e",
+  "items": "Itens"
+}
diff --git a/packages/plugins/src/dataTypes/List/i18n/ru.json b/packages/plugins/src/dataTypes/List/i18n/ru.json
new file mode 100644
index 000000000..f389ea88c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/ru.json
@@ -0,0 +1,49 @@
+{
+  "NAME": "Список",
+  "DESC": "Генерирует одно или несколько случайных значений из произвольного списка элементов.",
+  "DEFAULT_TITLE": "список",
+  "atMost": "В большинстве",
+  "colours": "red|orange|yellow|green|blue|indigo|violet",
+  "companies": "Microsoft|Google|Yahoo|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple|Amazon",
+  "departmentNames": "Accounting|Advertising|Asset Management|Customer Relations|Customer Service|Finances|Human Resources|Legal Department|Media Relations|Payroll|Public Relations|Quality Assurance|Sales and Marketing|Research and Development|Tech Support",
+  "exactly": "В яблочко",
+  "example1": "Нечетные числа до 20",
+  "example2": "Четные числа до 20",
+  "example3": "Один-десять",
+  "example4": "Простые числа до 100",
+  "example5": "Цвета",
+  "example6": "Семейный статус",
+  "example7": "Заголовок",
+  "example8": "Названия отделов",
+  "example9": "Названия компаний",
+  "example10": "Названия лекарств",
+  "example11": "Типы продуктов питания",
+  "example12": "Марки автомобилей",
+  "help": "Введите количество элементов, введя текст и нажав Enter. Затем выберите, хотите ли вы точно X элементов или максимум X элементов из списка. Несколько элементов возвращаются в списке с разделителями-запятыми в результатах.",
+  "oneToTen": "one|two|three|four|five|six|seven|eight|nine|ten",
+  "prefix": "Dr.|Mr.|Mrs.|Ms.",
+  "relationshipStates": "Холост|Замужем|Разведен|Гражданское право",
+  "incompleteFields": "Тип данных пользовательского списка должен иметь формат, введенный в текстовом поле «Параметры». Исправьте следующие строки:",
+  "invalidIntFields": "Пожалуйста, вводите только числа в поля «Точно» и «Не более» для Типа данных пользовательского списка. Исправьте следующие строки:",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "pasta|pies|salads|sandwiches|soups|stews|cereals|seafood|desserts|noodles",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+  "numItemsLabel": "Количество предметов",
+  "numItemsLabelDesc": "Этот параметр управляет количеством элементов, созданных из вашего списка. Вы можете выбрать точное количество элементов для генерации или число из диапазона по вашему выбору.",
+  "exactly1Item": "Ровно %1 элемент из списка",
+  "exactlyNItems": "Ровно %1 элементов из списка",
+  "atMost1Item": "Не более %1 элемента из списка",
+  "atMostNItems": "Не более %1 элементов из списка",
+  "customize": "Настроить",
+  "listSettings": "Список настроек",
+  "delimChars": "Символ(ы) разделителя",
+  "betweenNumItems": "Между %1 и %2 элементами",
+  "atLeast1Item": "По крайней мере %1 элемент из списка",
+  "atLeastNItems": "Не менее %1 элементов из списка",
+  "noRangeEntered": "Диапазон не указан",
+  "between": "Между",
+  "and": "а также",
+  "items": "Предметы",
+  "currencyCode": "Код валюты",
+  "currencyName": "Название валюты"
+}
diff --git a/packages/plugins/src/dataTypes/List/i18n/ta.json b/packages/plugins/src/dataTypes/List/i18n/ta.json
new file mode 100644
index 000000000..25f8f98c3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/ta.json
@@ -0,0 +1,48 @@
+{
+  "NAME": "பட்டியல்",
+  "DESC": "உருப்படிகளின் தன்னிச்சையான பட்டியலிலிருந்து ஒன்று அல்லது அதற்கு மேற்பட்ட சீரற்ற மதிப்புகளை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "பட்டியல்",
+  "atMost": "அதிக பட்சம்",
+  "colours": "சிவப்பு|ஆரஞ்சு|மஞ்சள்|பச்சை|நீலம்|இண்டிகோ|வயலட்",
+  "companies": "Microsoft|Google|Yahoo|Lycos|Altavista|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple Systems|Amazon",
+  "departmentNames": "கணக்கியல்|விளம்பரம்|சொத்து மேலாண்மை|வாடிக்கையாளர் உறவுகள்|வாடிக்கையாளர் சேவை|நிதி|மனித வளங்கள்|சட்டத்துறை|ஊடக உறவுகள்|ஊதியம்|மக்கள் தொடர்புகள்|தர உறுதி|விற்பனை மற்றும் சந்தைப்படுத்தல்|ஆராய்ச்சி மற்றும் மேம்பாடு|தொழில்நுட்ப ஆதரவு",
+  "exactly": "சரியாக",
+  "example1": "20 வயதிற்குட்பட்ட ஒற்றைப்படை",
+  "example2": "20 வயதிற்குட்பட்ட Nums கூட",
+  "example3": "ஒன்று-பத்து",
+  "example4": "100 க்கு கீழ் உள்ள பிரைம் எண்கள்",
+  "example5": "வண்ணங்கள்",
+  "example6": "திருமண நிலை",
+  "example7": "தலைப்பு",
+  "example8": "துறை பெயர்கள்",
+  "example9": "நிறுவனத்தின் பெயர்கள்",
+  "example10": "மருந்து பெயர்கள்",
+  "example11": "உணவு வகைகள்",
+  "example12": "கார் பிராண்டுகள்",
+  "help": "உரையை உள்ளிட்டு பல உருப்படிகளை உள்ளிட்டு Enter என்பதைக் கிளிக் செய்க. நீங்கள் சரியாக எக்ஸ் எண் உருப்படிகளை விரும்புகிறீர்களா, அல்லது பட்டியலிலிருந்து அதிகபட்சம் எக்ஸ் உருப்படிகளை விரும்புகிறீர்களா என்பதைத் தேர்ந்தெடுக்கவும். முடிவுகளில் கமாவால் பிரிக்கப்பட்ட பட்டியலில் பல உருப்படிகள் திரும்பப் பெறப்படுகின்றன.",
+  "oneToTen": "ஒன்று|இரண்டு|மூன்று|நான்கு|ஐந்து|ஆறு|ஏழு|எட்டு|ஒன்பது|பத்து",
+  "prefix": "டாக்டர்|திரு|திருமதி|செல்வி.",
+  "relationshipStates": "ஒற்றை|திருமணமானவர்|விவாகரத்து|பொதுவான சட்டம்",
+  "incompleteFields": "விருப்ப பட்டியல் தரவு வகைக்கு விருப்பங்கள் உரை புலத்தில் உள்ளீடு இருக்க வேண்டும். பின்வரும் வரிசைகளை சரிசெய்யவும்:",
+  "invalidIntFields": "தனிப்பயன் பட்டியல் தரவு வகைக்கு \"சரியாக\" மற்றும் \"அதிகபட்சம்\" புலங்களில் மட்டுமே எண்களை உள்ளிடவும். பின்வரும் வரிசைகளை சரிசெய்யவும்:",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "பாஸ்தா|துண்டுகள்|சாலடுகள்|சாண்ட்விச்கள்|சூப்கள்|குண்டுகள்|தானியங்கள்|கடல் உணவுகள்|இனிப்புகள்|நூடுல்ஸ்",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+
+  "numItemsLabel": "பொருட்களின் எண்ணிக்கை",
+  "numItemsLabelDesc": "இந்த அமைப்பு உங்கள் பட்டியலில் இருந்து உருவாக்கப்பட்ட உருப்படிகளின் எண்ணிக்கையைக் கட்டுப்படுத்துகிறது. உருவாக்க வேண்டிய உருப்படிகளின் சரியான எண்ணிக்கையையோ அல்லது நீங்கள் தேர்ந்தெடுக்கும் வரம்பிற்கு இடையே உள்ள எண்ணையோ தேர்வு செய்யலாம்.",
+  "exactly1Item": "பட்டியலிலிருந்து சரியாக %1 உருப்படி",
+  "exactlyNItems": "பட்டியலில் இருந்து சரியாக %1 உருப்படிகள்",
+  "atMost1Item": "பட்டியலிலிருந்து அதிகபட்சம் %1 உருப்படி",
+  "atMostNItems": "பட்டியலிலிருந்து அதிகபட்சம் %1 உருப்படிகள்",
+  "customize": "தனிப்பயனாக்கலாம்",
+  "listSettings": "பட்டியல் அமைப்புகள்",
+  "delimChars": "டிலிமிட்டர் கரி (கள்)",
+  "betweenNumItems": "%1 மற்றும் %2 உருப்படிகளுக்கு இடையில்",
+  "atLeast1Item": "பட்டியலில் இருந்து குறைந்தது %1 உருப்படி",
+  "atLeastNItems": "பட்டியலில் இருந்து குறைந்தது %1 உருப்படிகள்",
+  "noRangeEntered": "வரம்பு இல்லை",
+  "between": "இடையில்",
+  "and": "மற்றும்",
+  "items": "பொருட்களை"
+}
diff --git a/packages/plugins/src/dataTypes/List/i18n/zh.json b/packages/plugins/src/dataTypes/List/i18n/zh.json
new file mode 100644
index 000000000..e5cd53e3b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/List/i18n/zh.json
@@ -0,0 +1,47 @@
+{
+  "NAME": "清单",
+  "DESC": "从任意项目列表中生成一个或多个随机值。",
+  "DEFAULT_TITLE": "清单",
+  "atMost": "最多",
+  "colours": "红色|橙色|黄色|绿色|蓝色|靛蓝|紫色",
+  "companies": "Microsoft|Google|Yahoo|Lycos|Altavista|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple Systems|Amazon",
+  "departmentNames": "会计|广告|资产管理|客户关系|客户服务|财务|人力资源|法律部门|媒体关系|工资表|公共关系|质量保证|销售和营销|研发|技术支持",
+  "exactly": "究竟",
+  "example1": "20岁以下的怪胎",
+  "example2": "20岁以下的小女孩",
+  "example3": "一对十",
+  "example4": "小于100的素数",
+  "example5": "色彩",
+  "example6": "婚姻状况",
+  "example7": "标题",
+  "example8": "部门名称",
+  "example9": "公司名称",
+  "example10": "药品名称",
+  "example11": "食物种类",
+  "example12": "汽车品牌",
+  "help": "通过输入文本然后单击Enter输入许多项目。 然后从列表中选择是否要精确地X个项目，或最多X个项目。 结果中以逗号分隔的列表返回多个项目。",
+  "oneToTen": "一|二|三|四|五|六|七|八|九|十",
+  "prefix": "博士|先生|夫人|女士",
+  "relationshipStates": "单身|已婚|已离婚|普通法",
+  "incompleteFields": "自定义列表数据类型需要在“选项”文本字段中输入格式。 请修复以下行：",
+  "invalidIntFields": "请仅在“自定义列表数据类型”的“完全”和“最多”字段中输入数字。 请修复以下行：",
+  "drugNames": "Hydrocodone/APAP|LevothyroxineSodium|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|Metoprolol Tartrate|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Tramadol HCl|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Metoprolol Succinate|Seroquel|Promethazine HCl|Amoxicillin Trihydrate/Potassium Clavulanate|Oxycodone/APAP|Zolpidem Tartrate|Metformin HCl|Prednisone|Fluconazole|Clonazepam|Actos|Gabapentin|Lantus|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Celebrex|Venlafaxine HCl ER|Lyrica|Nasonex|Spiriva Handihaler|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Carvedilol|Potassium Chloride|Viagra||Vyvanse|Zetia|Albuterol|Namenda|Januvia|Tricor|Lisinopril|Loestrin 24 Fe|Allopurinol|Cialis|Alendronate Sodium|Losartan Potassium|Amitriptyline HCl|Oxycodone HCl|Suboxone|Oxycontin|Niaspan|Doxycycline Hyclate|Digoxin|Vytorin|Lantus Solostar|APAP/Codeine|Triamcinolone Acetonide|Premarin|Paroxetine HCl|Metoprolol Succinatee|Flovent HFA|Carisoprodol|Klor-Con M20|Benicar|Lovastatin|Amphetamine Salts|Risperidone|Levoxyl|Naproxen|Lovaza|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Nuvaring|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Benicar HCT|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Tri-Sprintec|Symbicort|Lidoderm|Pantoprazole Sodium|Zyprexa|Endocet|Gianvi|Diazepam",
+  "foodTypes": "面食|馅饼|沙拉|三明治|汤|炖菜|谷物|海鲜|甜点|面条",
+  "carBrands": "Toyota|Volkswagen|BMW|Mercedes-Benz|Ford|Nissan|Honda|Porsche|Hyundai Motors|Renault|Peugeot|Chevrolet|Fiat|Audi|Kia Motors|Suzuki|General Motors|Citroën|Daimler|GMC|JLR|Ferrari|Tata Motors|Mazda|Subaru|Lexus|Volvo|MINI|Vauxhall|Isuzu|Dongfeng Motor|Mitsubishi Motors|Mahindra and Mahindra|Daihatsu|Jeep|Kenworth|Dodge|Cadillac|Chrysler|Skoda|Acura|Infiniti|Buick|Lincoln|RAM Trucks|Maruti Suzuki|Smart|Dacia|FAW|Seat",
+  "numItemsLabel": "数量项目",
+  "numItemsLabelDesc": "此设置控制从列表中生成的项目数。 您可以选择要生成的确切数量的项目，或您选择的范围之间的数字。",
+  "exactly1Item": "清单中完全是%1个项目",
+  "exactlyNItems": "清单中有%1个项目",
+  "atMost1Item": "列表中最多%1个项目",
+  "atMostNItems": "列表中最多%1个项目",
+  "customize": "定制",
+  "listSettings": "清单设定",
+  "delimChars": "分隔符",
+  "betweenNumItems": "%1 到 %2 个项目之间",
+  "atLeast1Item": "列表中至少有 %1 项",
+  "atLeastNItems": "列表中至少有 %1 项",
+  "noRangeEntered": "未输入范围",
+  "between": "之间",
+  "and": "和",
+  "items": "项目"
+}
diff --git a/packages/plugins/src/dataTypes/Names/Names.generate.ts b/packages/plugins/src/dataTypes/Names/Names.generate.ts
new file mode 100644
index 000000000..4527597db
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/Names.generate.ts
@@ -0,0 +1,2260 @@
+import { NamesSource } from './Names.state';
+import { WorkerUtils } from '../../';
+import { DTGenerateResult } from '~types/dataTypes';
+
+const maleNames = [
+  'Aaron',
+  'Abbot',
+  'Abdul',
+  'Abel',
+  'Abraham',
+  'Acton',
+  'Adam',
+  'Addison',
+  'Adrian',
+  'Ahmed',
+  'Aidan',
+  'Akeem',
+  'Aladdin',
+  'Alan',
+  'Alden',
+  'Alec',
+  'Alexander',
+  'Alfonso',
+  'Ali',
+  'Allen',
+  'Allistair',
+  'Alvin',
+  'Amal',
+  'Amery',
+  'Amir',
+  'Amos',
+  'Andrew',
+  'Anthony',
+  'Aquila',
+  'Arden',
+  'Aristotle',
+  'Armand',
+  'Armando',
+  'Arsenio',
+  'Arthur',
+  'Asher',
+  'Ashton',
+  'August',
+  'Austin',
+  'Avram',
+  'Axel',
+  'Baker',
+  'Barclay',
+  'Barrett',
+  'Barry',
+  'Basil',
+  'Baxter',
+  'Beau',
+  'Beck',
+  'Benedict',
+  'Benjamin',
+  'Berk',
+  'Bernard',
+  'Bert',
+  'Bevis',
+  'Blake',
+  'Blaze',
+  'Boris',
+  'Bradley',
+  'Brady',
+  'Branden',
+  'Brandon',
+  'Brendan',
+  'Brenden',
+  'Brennan',
+  'Brent',
+  'Brett',
+  'Brian',
+  'Brock',
+  'Brody',
+  'Bruce',
+  'Bruno',
+  'Buckminster',
+  'Burke',
+  'Burton',
+  'Byron',
+  'Cade',
+  'Cadman',
+  'Caesar',
+  'Cain',
+  'Cairo',
+  'Caldwell',
+  'Caleb',
+  'Callum',
+  'Calvin',
+  'Camden',
+  'Cameron',
+  'Carl',
+  'Carlos',
+  'Carson',
+  'Carter',
+  'Castor',
+  'Cedric',
+  'Chadwick',
+  'Chaim',
+  'Chancellor',
+  'Chandler',
+  'Chaney',
+  'Channing',
+  'Charles',
+  'Chase',
+  'Chester',
+  'Christian',
+  'Christopher',
+  'Ciaran',
+  'Clark',
+  'Clarke',
+  'Clayton',
+  'Clinton',
+  'Coby',
+  'Cody',
+  'Colby',
+  'Cole',
+  'Colin',
+  'Colorado',
+  'Colt',
+  'Colton',
+  'Conan',
+  'Connor',
+  'Cooper',
+  'Craig',
+  'Cruz',
+  'Cullen',
+  'Curran',
+  'Cyrus',
+  'Dale',
+  'Dalton',
+  'Damian',
+  'Damon',
+  'Dane',
+  'Daniel',
+  'Dante',
+  'Daquan',
+  'Darius',
+  'David',
+  'Davis',
+  'Deacon',
+  'Dean',
+  'Declan',
+  'Demetrius',
+  'Dennis',
+  'Denton',
+  'Derek',
+  'Devin',
+  'Dexter',
+  'Dieter',
+  'Dillon',
+  'Dolan',
+  'Dominic',
+  'Donovan',
+  'Dorian',
+  'Drake',
+  'Drew',
+  'Driscoll',
+  'Duncan',
+  'Dustin',
+  'Dylan',
+  'Eagan',
+  'Eaton',
+  'Edan',
+  'Edward',
+  'Elijah',
+  'Elliott',
+  'Elmo',
+  'Elton',
+  'Elvis',
+  'Emerson',
+  'Emery',
+  'Emmanuel',
+  'Erasmus',
+  'Eric',
+  'Erich',
+  'Ethan',
+  'Evan',
+  'Ezekiel',
+  'Ezra',
+  'Felix',
+  'Ferdinand',
+  'Ferris',
+  'Finn',
+  'Fitzgerald',
+  'Fletcher',
+  'Flynn',
+  'Forrest',
+  'Francis',
+  'Fritz',
+  'Fuller',
+  'Fulton',
+  'Gabriel',
+  'Gage',
+  'Galvin',
+  'Gannon',
+  'Gareth',
+  'Garrett',
+  'Garrison',
+  'Garth',
+  'Gary',
+  'Gavin',
+  'Geoffrey',
+  'George',
+  'Giacomo',
+  'Gil',
+  'Grady',
+  'Graham',
+  'Graiden',
+  'Grant',
+  'Gray',
+  'Gregory',
+  'Griffin',
+  'Griffith',
+  'Guy',
+  'Hakeem',
+  'Hall',
+  'Hamilton',
+  'Hamish',
+  'Hammett',
+  'Harding',
+  'Harlan',
+  'Harper',
+  'Harrison',
+  'Hasad',
+  'Hashim',
+  'Hayden',
+  'Hayes',
+  'Hector',
+  'Hedley',
+  'Henry',
+  'Herman',
+  'Herrod',
+  'Hilel',
+  'Hiram',
+  'Holmes',
+  'Honorato',
+  'Hop',
+  'Howard',
+  'Hoyt',
+  'Hu',
+  'Hunter',
+  'Hyatt',
+  'Ian',
+  'Ignatius',
+  'Igor',
+  'Ira',
+  'Isaac',
+  'Isaiah',
+  'Ishmael',
+  'Ivan',
+  'Ivor',
+  'Jack',
+  'Jackson',
+  'Jacob',
+  'Jakeem',
+  'Jamal',
+  'James',
+  'Jameson',
+  'Jared',
+  'Jarrod',
+  'Jason',
+  'Jasper',
+  'Jelani',
+  'Jeremy',
+  'Jermaine',
+  'Jerome',
+  'Jerry',
+  'Jesse',
+  'Jin',
+  'Joel',
+  'John',
+  'Jonah',
+  'Jonas',
+  'Jordan',
+  'Joseph',
+  'Joshua',
+  'Josiah',
+  'Judah',
+  'Julian',
+  'Justin',
+  'Kadeem',
+  'Kamal',
+  'Kane',
+  'Kareem',
+  'Kaseem',
+  'Kasimir',
+  'Kasper',
+  'Kato',
+  'Keane',
+  'Keaton',
+  'Keefe',
+  'Keegan',
+  'Keith',
+  'Kelly',
+  'Kennan',
+  'Kennedy',
+  'Kenneth',
+  'Kenyon',
+  'Kermit',
+  'Kevin',
+  'Kibo',
+  'Kieran',
+  'Kirk',
+  'Knox',
+  'Kuame',
+  'Kyle',
+  'Laith',
+  'Lamar',
+  'Lance',
+  'Lane',
+  'Lars',
+  'Lawrence',
+  'Lee',
+  'Len',
+  'Leo',
+  'Leonard',
+  'Leroy',
+  'Lester',
+  'Lev',
+  'Levi',
+  'Lewis',
+  'Linus',
+  'Lionel',
+  'Logan',
+  'Louis',
+  'Lucas',
+  'Lucian',
+  'Lucius',
+  'Luke',
+  'Lyle',
+  'Macaulay',
+  'Macon',
+  'Magee',
+  'Malachi',
+  'Malcolm',
+  'Malik',
+  'Mannix',
+  'Mark',
+  'Marsden',
+  'Marshall',
+  'Martin',
+  'Marvin',
+  'Mason',
+  'Matthew',
+  'Maxwell',
+  'Melvin',
+  'Merrill',
+  'Merritt',
+  'Micah',
+  'Michael',
+  'Mohammad',
+  'Moses',
+  'Mufutau',
+  'Murphy',
+  'Myles',
+  'Nash',
+  'Nasim',
+  'Nathan',
+  'Nathaniel',
+  'Nehru',
+  'Neil',
+  'Nero',
+  'Neville',
+  'Nicholas',
+  'Nigel',
+  'Nissim',
+  'Noah',
+  'Noble',
+  'Nolan',
+  'Norman',
+  'Octavius',
+  'Odysseus',
+  'Oleg',
+  'Oliver',
+  'Omar',
+  'Oren',
+  'Orlando',
+  'Orson',
+  'Oscar',
+  'Otto',
+  'Owen',
+  'Paki',
+  'Palmer',
+  'Patrick',
+  'Paul',
+  'Perry',
+  'Peter',
+  'Phelan',
+  'Philip',
+  'Phillip',
+  'Plato',
+  'Porter',
+  'Prescott',
+  'Preston',
+  'Price',
+  'Quamar',
+  'Quentin',
+  'Quinlan',
+  'Quinn',
+  'Rafael',
+  'Rahim',
+  'Raja',
+  'Rajah',
+  'Ralph',
+  'Randall',
+  'Raphael',
+  'Rashad',
+  'Ray',
+  'Raymond',
+  'Reece',
+  'Reed',
+  'Reese',
+  'Reuben',
+  'Richard',
+  'Rigel',
+  'Robert',
+  'Rogan',
+  'Ronan',
+  'Rooney',
+  'Ross',
+  'Roth',
+  'Rudyard',
+  'Russell',
+  'Ryan',
+  'Ryder',
+  'Salvador',
+  'Samson',
+  'Samuel',
+  'Sawyer',
+  'Scott',
+  'Sean',
+  'Sebastian',
+  'Seth',
+  'Shad',
+  'Silas',
+  'Simon',
+  'Slade',
+  'Solomon',
+  'Steel',
+  'Stephen',
+  'Steven',
+  'Stewart',
+  'Stone',
+  'Stuart',
+  'Sylvester',
+  'Tad',
+  'Talon',
+  'Tanek',
+  'Tanner',
+  'Tarik',
+  'Tate',
+  'Thaddeus',
+  'Thane',
+  'Theodore',
+  'Thomas',
+  'Thor',
+  'Tiger',
+  'Timon',
+  'Timothy',
+  'Tobias',
+  'Todd',
+  'Travis',
+  'Trevor',
+  'Troy',
+  'Tucker',
+  'Tyler',
+  'Tyrone',
+  'Ulric',
+  'Ulysses',
+  'Upton',
+  'Uriah',
+  'Uriel',
+  'Valentine',
+  'Vance',
+  'Vaughan',
+  'Vernon',
+  'Victor',
+  'Vincent',
+  'Vladimir',
+  'Wade',
+  'Walker',
+  'Wallace',
+  'Walter',
+  'Wang',
+  'Warren',
+  'Wayne',
+  'Wesley',
+  'William',
+  'Wing',
+  'Wyatt',
+  'Wylie',
+  'Xander',
+  'Xanthus',
+  'Xavier',
+  'Xenos',
+  'Yardley',
+  'Yasir',
+  'Yoshio',
+  'Yuli',
+  'Zachary',
+  'Zachery',
+  'Zahir',
+  'Zane',
+  'Zeph',
+  'Zephania',
+  'Zeus'
+];
+const femaleNames = [
+  'Abigail',
+  'Abra',
+  'Adara',
+  'Adele',
+  'Adena',
+  'Adria',
+  'Adrienne',
+  'Aiko',
+  'Aileen',
+  'Aimee',
+  'Ainsley',
+  'Alana',
+  'Alea',
+  'Alexa',
+  'Alexandra',
+  'Alexis',
+  'Alfreda',
+  'Alice',
+  'Alika',
+  'Aline',
+  'Alisa',
+  'Allegra',
+  'Alma',
+  'Althea',
+  'Alyssa',
+  'Amanda',
+  'Amaya',
+  'Amber',
+  'Amela',
+  'Amelia',
+  'Amena',
+  'Amethyst',
+  'Amity',
+  'Amy',
+  'Anastasia',
+  'Angela',
+  'Angelica',
+  'Anika',
+  'Anjolie',
+  'Ann',
+  'Anne',
+  'Aphrodite',
+  'April',
+  'Aretha',
+  'Ariana',
+  'Ariel',
+  'Ashely',
+  'Aspen',
+  'Astra',
+  'Athena',
+  'Audra',
+  'Audrey',
+  'Aurelia',
+  'Aurora',
+  'Autumn',
+  'Ava',
+  'Avye',
+  'Ayanna',
+  'Azalia',
+  'Barbara',
+  'Basia',
+  'Beatrice',
+  'Bell',
+  'Belle',
+  'Bertha',
+  'Bethany',
+  'Beverly',
+  'Bianca',
+  'Blossom',
+  'Blythe',
+  'Bo',
+  'Breanna',
+  'Bree',
+  'Brenda',
+  'Brenna',
+  'Brianna',
+  'Briar',
+  'Brielle',
+  'Britanney',
+  'Britanni',
+  'Brittany',
+  'Brooke',
+  'Bryar',
+  'Brynn',
+  'Brynne',
+  'Buffy',
+  'Cailin',
+  'Calista',
+  'Callie',
+  'Cally',
+  'Cameran',
+  'Cameron',
+  'Camilla',
+  'Camille',
+  'Candace',
+  'Candice',
+  'Cara',
+  'Carissa',
+  'Carla',
+  'Carly',
+  'Carol',
+  'Carolyn',
+  'Caryn',
+  'Cassady',
+  'Cassandra',
+  'Cassidy',
+  'Catherine',
+  'Cathleen',
+  'Cecilia',
+  'Celeste',
+  'Chanda',
+  'Chantale',
+  'Charde',
+  'Charissa',
+  'Charity',
+  'Charlotte',
+  'Chastity',
+  'Chava',
+  'Chelsea',
+  'Cherokee',
+  'Cheryl',
+  'Cheyenne',
+  'Chiquita',
+  'Chloe',
+  'Christen',
+  'Christine',
+  'Ciara',
+  'Claire',
+  'Clare',
+  'Claudia',
+  'Clementine',
+  'Cleo',
+  'Clio',
+  'Colette',
+  'Colleen',
+  'Constance',
+  'Cora',
+  'Courtney',
+  'Cynthia',
+  'Dacey',
+  'Dahlia',
+  'Dai',
+  'Dana',
+  'Danielle',
+  'Daphne',
+  'Dara',
+  'Daria',
+  'Darrel',
+  'Darryl',
+  'Daryl',
+  'Dawn',
+  'Deanna',
+  'Deborah',
+  'Debra',
+  'Deirdre',
+  'Delilah',
+  'Demetria',
+  'Denise',
+  'Desirae',
+  'Desiree',
+  'Destiny',
+  'Diana',
+  'Dominique',
+  'Donna',
+  'Dora',
+  'Doris',
+  'Dorothy',
+  'Ebony',
+  'Echo',
+  'Elaine',
+  'Eleanor',
+  'Eliana',
+  'Elizabeth',
+  'Ella',
+  'Emerald',
+  'Emi',
+  'Emily',
+  'Emma',
+  'Erica',
+  'Erin',
+  'Eugenia',
+  'Evangeline',
+  'Eve',
+  'Evelyn',
+  'Faith',
+  'Fallon',
+  'Farrah',
+  'Fatima',
+  'Fay',
+  'Felicia',
+  'Fiona',
+  'Flavia',
+  'Fleur',
+  'Florence',
+  'Frances',
+  'Francesca',
+  'Fredericka',
+  'Freya',
+  'Gail',
+  'Galena',
+  'Gay',
+  'Gemma',
+  'Genevieve',
+  'Georgia',
+  'Geraldine',
+  'Germaine',
+  'Germane',
+  'Gillian',
+  'Ginger',
+  'Gisela',
+  'Giselle',
+  'Glenna',
+  'Gloria',
+  'Grace',
+  'Gretchen',
+  'Guinevere',
+  'Gwendolyn',
+  'Hadassah',
+  'Hadley',
+  'Halee',
+  'Haley',
+  'Halla',
+  'Hanae',
+  'Hanna',
+  'Hannah',
+  'Harriet',
+  'Haviva',
+  'Hayfa',
+  'Hayley',
+  'Heather',
+  'Hedda',
+  'Hedwig',
+  'Hedy',
+  'Heidi',
+  'Helen',
+  'Hermione',
+  'Hilary',
+  'Hilda',
+  'Hillary',
+  'Hiroko',
+  'Hollee',
+  'Holly',
+  'Hope',
+  'Hyacinth',
+  'Idola',
+  'Idona',
+  'Ifeoma',
+  'Ignacia',
+  'Ila',
+  'Iliana',
+  'Illana',
+  'Illiana',
+  'Ima',
+  'Imani',
+  'Imelda',
+  'Imogene',
+  'Ina',
+  'India',
+  'Indigo',
+  'Indira',
+  'Inez',
+  'Inga',
+  'Ingrid',
+  'Iola',
+  'Iona',
+  'Irene',
+  'Iris',
+  'Irma',
+  'Isabella',
+  'Isabelle',
+  'Isadora',
+  'Ivana',
+  'Ivory',
+  'Ivy',
+  'Jada',
+  'Jade',
+  'Jaden',
+  'Jael',
+  'Jaime',
+  'Jamalia',
+  'Jana',
+  'Jane',
+  'Janna',
+  'Jaquelyn',
+  'Jasmine',
+  'Jayme',
+  'Jeanette',
+  'Jemima',
+  'Jena',
+  'Jenette',
+  'Jenna',
+  'Jennifer',
+  'Jescie',
+  'Jessamine',
+  'Jessica',
+  'Jillian',
+  'Joan',
+  'Jocelyn',
+  'Joelle',
+  'Jolene',
+  'Jolie',
+  'Jordan',
+  'Jorden',
+  'Josephine',
+  'Joy',
+  'Judith',
+  'Julie',
+  'Juliet',
+  'Justina',
+  'Justine',
+  'Kai',
+  'Kaitlin',
+  'Kalia',
+  'Kameko',
+  'Karen',
+  'Karina',
+  'Karleigh',
+  'Karly',
+  'Karyn',
+  'Katell',
+  'Katelyn',
+  'Kathleen',
+  'Kay',
+  'Kaye',
+  'Keelie',
+  'Keely',
+  'Keiko',
+  'Kellie',
+  'Kelly',
+  'Kelsey',
+  'Kelsie',
+  'Kerry',
+  'Kessie',
+  'Kevyn',
+  'Kiara',
+  'Kiayada',
+  'Kim',
+  'Kimberley',
+  'Kimberly',
+  'Kiona',
+  'Kirby',
+  'Kirestin',
+  'Kirsten',
+  'Kitra',
+  'Kristen',
+  'Kyla',
+  'Kylan',
+  'Kylee',
+  'Kylie',
+  'Kylynn',
+  'Kyra',
+  'Lacey',
+  'Lacota',
+  'Lacy',
+  'Lael',
+  'Lana',
+  'Lani',
+  'Lara',
+  'Lareina',
+  'Larissa',
+  'Latifah',
+  'Laura',
+  'Laurel',
+  'Lavinia',
+  'Leah',
+  'Leandra',
+  'Lee',
+  'Leigh',
+  'Leila',
+  'Leilani',
+  'Lenore',
+  'Lesley',
+  'Leslie',
+  'Libby',
+  'Liberty',
+  'Lila',
+  'Lilah',
+  'Lillian',
+  'Lillith',
+  'Linda',
+  'Lisandra',
+  'Lois',
+  'Lucy',
+  'Lunea',
+  'Lydia',
+  'Lynn',
+  'Lysandra',
+  'MacKensie',
+  'MacKenzie',
+  'Macey',
+  'Macy',
+  'Madaline',
+  'Madeline',
+  'Madeson',
+  'Madison',
+  'Madonna',
+  'Maggie',
+  'Maggy',
+  'Maia',
+  'Maile',
+  'Maisie',
+  'Maite',
+  'Mallory',
+  'Mara',
+  'Marah',
+  'Marcia',
+  'Margaret',
+  'Mari',
+  'Mariam',
+  'Mariko',
+  'Maris',
+  'Marny',
+  'Martena',
+  'Martha',
+  'Martina',
+  'Mary',
+  'Maryam',
+  'Maxine',
+  'May',
+  'Maya',
+  'McKenzie',
+  'Mechelle',
+  'Medge',
+  'Megan',
+  'Meghan',
+  'Melanie',
+  'Melinda',
+  'Melissa',
+  'Melodie',
+  'Melyssa',
+  'Mercedes',
+  'Meredith',
+  'Mia',
+  'Michelle',
+  'Mikayla',
+  'Minerva',
+  'Mira',
+  'Miranda',
+  'Miriam',
+  'Moana',
+  'Mollie',
+  'Molly',
+  'Mona',
+  'Montana',
+  'Morgan',
+  'Myra',
+  'Nadine',
+  'Naida',
+  'Naomi',
+  'Natalie',
+  'Nayda',
+  'Nell',
+  'Nelle',
+  'Nerea',
+  'Nevada',
+  'Neve',
+  'Nichole',
+  'Nicole',
+  'Nina',
+  'Nita',
+  'Noel',
+  'Noelani',
+  'Noelle',
+  'Nola',
+  'Nomlanga',
+  'Nora',
+  'Nyssa',
+  'Ocean',
+  'Octavia',
+  'Odessa',
+  'Odette',
+  'Olga',
+  'Olivia',
+  'Olympia',
+  'Oprah',
+  'Ora',
+  'Ori',
+  'Orla',
+  'Orli',
+  'Paloma',
+  'Pamela',
+  'Pandora',
+  'Pascale',
+  'Patience',
+  'Patricia',
+  'Paula',
+  'Pearl',
+  'Penelope',
+  'Petra',
+  'Phoebe',
+  'Phyllis',
+  'Piper',
+  'Portia',
+  'Priscilla',
+  'Quail',
+  'Quemby',
+  'Quin',
+  'Quinn',
+  'Quintessa',
+  'Quon',
+  'Quyn',
+  'Quynn',
+  'Rachel',
+  'Rae',
+  'Rama',
+  'Ramona',
+  'Rana',
+  'Raven',
+  'Raya',
+  'Reagan',
+  'Rebecca',
+  'Rebekah',
+  'Regan',
+  'Regina',
+  'Remedios',
+  'Renee',
+  'Rhea',
+  'Rhiannon',
+  'Rhoda',
+  'Rhona',
+  'Rhonda',
+  'Ria',
+  'Riley',
+  'Rina',
+  'Rinah',
+  'Risa',
+  'Roanna',
+  'Roary',
+  'Robin',
+  'Rosalyn',
+  'Rose',
+  'Rowan',
+  'Ruby',
+  'Ruth',
+  'Rylee',
+  'Sacha',
+  'Sade',
+  'Sage',
+  'Samantha',
+  'Sandra',
+  'Sara',
+  'Sarah',
+  'Sasha',
+  'Savannah',
+  'Scarlet',
+  'Scarlett',
+  'Selma',
+  'September',
+  'Serena',
+  'Serina',
+  'Shaeleigh',
+  'Shafira',
+  'Shaine',
+  'Shana',
+  'Shannon',
+  'Sharon',
+  'Shay',
+  'Shea',
+  'Sheila',
+  'Shelby',
+  'Shelley',
+  'Shellie',
+  'Shelly',
+  'Shoshana',
+  'Sierra',
+  'Signe',
+  'Sigourney',
+  'Simone',
+  'Skyler',
+  'Sonia',
+  'Sonya',
+  'Sophia',
+  'Sopoline',
+  'Stacey',
+  'Stacy',
+  'Stella',
+  'Stephanie',
+  'Suki',
+  'Summer',
+  'Susan',
+  'Sybil',
+  'Sybill',
+  'Sydnee',
+  'Sydney',
+  'Sylvia',
+  'TaShya',
+  'Tallulah',
+  'Tamara',
+  'Tamekah',
+  'Tana',
+  'Tanisha',
+  'Tanya',
+  'Tara',
+  'Tasha',
+  'Tashya',
+  'Tatiana',
+  'Tatum',
+  'Tatyana',
+  'Teagan',
+  'Teegan',
+  'Ulla',
+  'Uma',
+  'Unity',
+  'Urielle',
+  'Ursa',
+  'Ursula',
+  'Uta',
+  'Vanna',
+  'Veda',
+  'Velma',
+  'Venus',
+  'Vera',
+  'Veronica',
+  'Victoria',
+  'Vielka',
+  'Violet',
+  'Virginia',
+  'Vivian',
+  'Vivien',
+  'Wanda',
+  'Wendy',
+  'Whilemina',
+  'Whitney',
+  'Whoopi',
+  'Willa',
+  'Willow',
+  'Wilma',
+  'Winifred',
+  'Winter',
+  'Wynne',
+  'Wynter',
+  'Wyoming',
+  'Xandra',
+  'Xantha',
+  'Xaviera',
+  'Xena',
+  'Xyla',
+  'Yael',
+  'Yen',
+  'Yeo',
+  'Yetta',
+  'Yoko',
+  'Yolanda',
+  'Yoshi',
+  'Yuri',
+  'Yvette',
+  'Yvonne',
+  'Zelda',
+  'Zelenia',
+  'Zena',
+  'Zenaida',
+  'Zenia',
+  'Zephr',
+  'Zia',
+  'Zoe',
+  'Zorita',
+  'Jacqueline'
+];
+const lastNames = [
+  'Abbott',
+  'Acevedo',
+  'Acosta',
+  'Adams',
+  'Adkins',
+  'Aguilar',
+  'Aguirre',
+  'Albert',
+  'Alexander',
+  'Alford',
+  'Allen',
+  'Allison',
+  'Alston',
+  'Alvarado',
+  'Alvarez',
+  'Anderson',
+  'Andrews',
+  'Anthony',
+  'Armstrong',
+  'Arnold',
+  'Ashley',
+  'Atkins',
+  'Atkinson',
+  'Austin',
+  'Avery',
+  'Avila',
+  'Ayala',
+  'Ayers',
+  'Bailey',
+  'Baird',
+  'Baker',
+  'Baldwin',
+  'Ball',
+  'Ballard',
+  'Banks',
+  'Barber',
+  'Barker',
+  'Barlow',
+  'Barnes',
+  'Barnett',
+  'Barr',
+  'Barrera',
+  'Barrett',
+  'Barron',
+  'Barry',
+  'Bartlett',
+  'Barton',
+  'Bass',
+  'Bates',
+  'Battle',
+  'Bauer',
+  'Baxter',
+  'Beach',
+  'Bean',
+  'Beard',
+  'Beasley',
+  'Beck',
+  'Becker',
+  'Bell',
+  'Bender',
+  'Benjamin',
+  'Bennett',
+  'Benson',
+  'Bentley',
+  'Benton',
+  'Berg',
+  'Berger',
+  'Bernard',
+  'Berry',
+  'Best',
+  'Bird',
+  'Bishop',
+  'Black',
+  'Blackburn',
+  'Blackwell',
+  'Blair',
+  'Blake',
+  'Blanchard',
+  'Blankenship',
+  'Blevins',
+  'Bolton',
+  'Bond',
+  'Bonner',
+  'Booker',
+  'Boone',
+  'Booth',
+  'Bowen',
+  'Bowers',
+  'Bowman',
+  'Boyd',
+  'Boyer',
+  'Boyle',
+  'Bradford',
+  'Bradley',
+  'Bradshaw',
+  'Brady',
+  'Branch',
+  'Bray',
+  'Brennan',
+  'Brewer',
+  'Bridges',
+  'Briggs',
+  'Bright',
+  'Britt',
+  'Brock',
+  'Brooks',
+  'Brown',
+  'Browning',
+  'Bruce',
+  'Bryan',
+  'Bryant',
+  'Buchanan',
+  'Buck',
+  'Buckley',
+  'Buckner',
+  'Bullock',
+  'Burch',
+  'Burgess',
+  'Burke',
+  'Burks',
+  'Burnett',
+  'Burns',
+  'Burris',
+  'Burt',
+  'Burton',
+  'Bush',
+  'Butler',
+  'Byers',
+  'Byrd',
+  'Cabrera',
+  'Cain',
+  'Calderon',
+  'Caldwell',
+  'Calhoun',
+  'Callahan',
+  'Camacho',
+  'Cameron',
+  'Campbell',
+  'Campos',
+  'Cannon',
+  'Cantrell',
+  'Cantu',
+  'Cardenas',
+  'Carey',
+  'Carlson',
+  'Carney',
+  'Carpenter',
+  'Carr',
+  'Carrillo',
+  'Carroll',
+  'Carson',
+  'Carter',
+  'Carver',
+  'Case',
+  'Casey',
+  'Cash',
+  'Castaneda',
+  'Castillo',
+  'Castro',
+  'Cervantes',
+  'Chambers',
+  'Chan',
+  'Chandler',
+  'Chaney',
+  'Chang',
+  'Chapman',
+  'Charles',
+  'Chase',
+  'Chavez',
+  'Chen',
+  'Cherry',
+  'Christensen',
+  'Christian',
+  'Church',
+  'Clark',
+  'Clarke',
+  'Clay',
+  'Clayton',
+  'Clements',
+  'Clemons',
+  'Cleveland',
+  'Cline',
+  'Cobb',
+  'Cochran',
+  'Coffey',
+  'Cohen',
+  'Cole',
+  'Coleman',
+  'Collier',
+  'Collins',
+  'Colon',
+  'Combs',
+  'Compton',
+  'Conley',
+  'Conner',
+  'Conrad',
+  'Contreras',
+  'Conway',
+  'Cook',
+  'Cooke',
+  'Cooley',
+  'Cooper',
+  'Copeland',
+  'Cortez',
+  'Cote',
+  'Cotton',
+  'Cox',
+  'Craft',
+  'Craig',
+  'Crane',
+  'Crawford',
+  'Crosby',
+  'Cross',
+  'Cruz',
+  'Cummings',
+  'Cunningham',
+  'Curry',
+  'Curtis',
+  'Dale',
+  'Dalton',
+  'Daniel',
+  'Daniels',
+  'Daugherty',
+  'Davenport',
+  'David',
+  'Davidson',
+  'Davis',
+  'Dawson',
+  'Day',
+  'Dean',
+  'Decker',
+  'Dejesus',
+  'Delacruz',
+  'Delaney',
+  'Deleon',
+  'Delgado',
+  'Dennis',
+  'Diaz',
+  'Dickerson',
+  'Dickson',
+  'Dillard',
+  'Dillon',
+  'Dixon',
+  'Dodson',
+  'Dominguez',
+  'Donaldson',
+  'Donovan',
+  'Dorsey',
+  'Dotson',
+  'Douglas',
+  'Downs',
+  'Doyle',
+  'Drake',
+  'Dudley',
+  'Duffy',
+  'Duke',
+  'Duncan',
+  'Dunlap',
+  'Dunn',
+  'Duran',
+  'Durham',
+  'Dyer',
+  'Eaton',
+  'Edwards',
+  'Elliott',
+  'Ellis',
+  'Ellison',
+  'Emerson',
+  'England',
+  'English',
+  'Erickson',
+  'Espinoza',
+  'Estes',
+  'Estrada',
+  'Evans',
+  'Everett',
+  'Ewing',
+  'Farley',
+  'Farmer',
+  'Farrell',
+  'Faulkner',
+  'Ferguson',
+  'Fernandez',
+  'Ferrell',
+  'Fields',
+  'Figueroa',
+  'Finch',
+  'Finley',
+  'Fischer',
+  'Fisher',
+  'Fitzgerald',
+  'Fitzpatrick',
+  'Fleming',
+  'Fletcher',
+  'Flores',
+  'Flowers',
+  'Floyd',
+  'Flynn',
+  'Foley',
+  'Forbes',
+  'Ford',
+  'Foreman',
+  'Foster',
+  'Fowler',
+  'Fox',
+  'Francis',
+  'Franco',
+  'Frank',
+  'Franklin',
+  'Franks',
+  'Frazier',
+  'Frederick',
+  'Freeman',
+  'French',
+  'Frost',
+  'Fry',
+  'Frye',
+  'Fuentes',
+  'Fuller',
+  'Fulton',
+  'Gaines',
+  'Gallagher',
+  'Gallegos',
+  'Galloway',
+  'Gamble',
+  'Garcia',
+  'Gardner',
+  'Garner',
+  'Garrett',
+  'Garrison',
+  'Garza',
+  'Gates',
+  'Gay',
+  'Gentry',
+  'George',
+  'Gibbs',
+  'Gibson',
+  'Gilbert',
+  'Giles',
+  'Gill',
+  'Gillespie',
+  'Gilliam',
+  'Gilmore',
+  'Glass',
+  'Glenn',
+  'Glover',
+  'Goff',
+  'Golden',
+  'Gomez',
+  'Gonzales',
+  'Gonzalez',
+  'Good',
+  'Goodman',
+  'Goodwin',
+  'Gordon',
+  'Gould',
+  'Graham',
+  'Grant',
+  'Graves',
+  'Gray',
+  'Green',
+  'Greene',
+  'Greer',
+  'Gregory',
+  'Griffin',
+  'Griffith',
+  'Grimes',
+  'Gross',
+  'Guerra',
+  'Guerrero',
+  'Guthrie',
+  'Gutierrez',
+  'Guy',
+  'Guzman',
+  'Hahn',
+  'Hale',
+  'Haley',
+  'Hall',
+  'Hamilton',
+  'Hammond',
+  'Hampton',
+  'Hancock',
+  'Haney',
+  'Hansen',
+  'Hanson',
+  'Hardin',
+  'Harding',
+  'Hardy',
+  'Harmon',
+  'Harper',
+  'Harrell',
+  'Harrington',
+  'Harris',
+  'Harrison',
+  'Hart',
+  'Hartman',
+  'Harvey',
+  'Hatfield',
+  'Hawkins',
+  'Hayden',
+  'Hayes',
+  'Haynes',
+  'Hays',
+  'Head',
+  'Heath',
+  'Hebert',
+  'Henderson',
+  'Hendricks',
+  'Hendrix',
+  'Henry',
+  'Hensley',
+  'Henson',
+  'Herman',
+  'Hernandez',
+  'Herrera',
+  'Herring',
+  'Hess',
+  'Hester',
+  'Hewitt',
+  'Hickman',
+  'Hicks',
+  'Higgins',
+  'Hill',
+  'Hines',
+  'Hinton',
+  'Hobbs',
+  'Hodge',
+  'Hodges',
+  'Hoffman',
+  'Hogan',
+  'Holcomb',
+  'Holden',
+  'Holder',
+  'Holland',
+  'Holloway',
+  'Holman',
+  'Holmes',
+  'Holt',
+  'Hood',
+  'Hooper',
+  'Hoover',
+  'Hopkins',
+  'Hopper',
+  'Horn',
+  'Horne',
+  'Horton',
+  'House',
+  'Houston',
+  'Howard',
+  'Howe',
+  'Howell',
+  'Hubbard',
+  'Huber',
+  'Hudson',
+  'Huff',
+  'Huffman',
+  'Hughes',
+  'Hull',
+  'Humphrey',
+  'Hunt',
+  'Hunter',
+  'Hurley',
+  'Hurst',
+  'Hutchinson',
+  'Hyde',
+  'Ingram',
+  'Irwin',
+  'Jackson',
+  'Jacobs',
+  'Jacobson',
+  'James',
+  'Jarvis',
+  'Jefferson',
+  'Jenkins',
+  'Jennings',
+  'Jensen',
+  'Jimenez',
+  'Johns',
+  'Johnson',
+  'Johnston',
+  'Jones',
+  'Jordan',
+  'Joseph',
+  'Joyce',
+  'Joyner',
+  'Juarez',
+  'Justice',
+  'Kane',
+  'Kaufman',
+  'Keith',
+  'Keller',
+  'Kelley',
+  'Kelly',
+  'Kemp',
+  'Kennedy',
+  'Kent',
+  'Kerr',
+  'Key',
+  'Kidd',
+  'Kim',
+  'King',
+  'Kinney',
+  'Kirby',
+  'Kirk',
+  'Kirkland',
+  'Klein',
+  'Kline',
+  'Knapp',
+  'Knight',
+  'Knowles',
+  'Knox',
+  'Koch',
+  'Kramer',
+  'Lamb',
+  'Lambert',
+  'Lancaster',
+  'Landry',
+  'Lane',
+  'Lang',
+  'Langley',
+  'Lara',
+  'Larsen',
+  'Larson',
+  'Lawrence',
+  'Lawson',
+  'Le',
+  'Leach',
+  'Leblanc',
+  'Lee',
+  'Leon',
+  'Leonard',
+  'Lester',
+  'Levine',
+  'Levy',
+  'Lewis',
+  'Lindsay',
+  'Lindsey',
+  'Little',
+  'Livingston',
+  'Lloyd',
+  'Logan',
+  'Long',
+  'Lopez',
+  'Lott',
+  'Love',
+  'Lowe',
+  'Lowery',
+  'Lucas',
+  'Luna',
+  'Lynch',
+  'Lynn',
+  'Lyons',
+  'Macdonald',
+  'Macias',
+  'Mack',
+  'Madden',
+  'Maddox',
+  'Maldonado',
+  'Malone',
+  'Mann',
+  'Manning',
+  'Marks',
+  'Marquez',
+  'Marsh',
+  'Marshall',
+  'Martin',
+  'Martinez',
+  'Mason',
+  'Massey',
+  'Mathews',
+  'Mathis',
+  'Matthews',
+  'Maxwell',
+  'May',
+  'Mayer',
+  'Maynard',
+  'Mayo',
+  'Mays',
+  'Mcbride',
+  'Mccall',
+  'Mccarthy',
+  'Mccarty',
+  'Mcclain',
+  'Mcclure',
+  'Mcconnell',
+  'Mccormick',
+  'Mccoy',
+  'Mccray',
+  'Mccullough',
+  'Mcdaniel',
+  'Mcdonald',
+  'Mcdowell',
+  'Mcfadden',
+  'Mcfarland',
+  'Mcgee',
+  'Mcgowan',
+  'Mcguire',
+  'Mcintosh',
+  'Mcintyre',
+  'Mckay',
+  'Mckee',
+  'Mckenzie',
+  'Mckinney',
+  'Mcknight',
+  'Mclaughlin',
+  'Mclean',
+  'Mcleod',
+  'Mcmahon',
+  'Mcmillan',
+  'Mcneil',
+  'Mcpherson',
+  'Meadows',
+  'Medina',
+  'Mejia',
+  'Melendez',
+  'Melton',
+  'Mendez',
+  'Mendoza',
+  'Mercado',
+  'Mercer',
+  'Merrill',
+  'Merritt',
+  'Meyer',
+  'Meyers',
+  'Michael',
+  'Middleton',
+  'Miles',
+  'Miller',
+  'Mills',
+  'Miranda',
+  'Mitchell',
+  'Molina',
+  'Monroe',
+  'Montgomery',
+  'Montoya',
+  'Moody',
+  'Moon',
+  'Mooney',
+  'Moore',
+  'Morales',
+  'Moran',
+  'Moreno',
+  'Morgan',
+  'Morin',
+  'Morris',
+  'Morrison',
+  'Morrow',
+  'Morse',
+  'Morton',
+  'Moses',
+  'Mosley',
+  'Moss',
+  'Mueller',
+  'Mullen',
+  'Mullins',
+  'Munoz',
+  'Murphy',
+  'Murray',
+  'Myers',
+  'Nash',
+  'Navarro',
+  'Neal',
+  'Nelson',
+  'Newman',
+  'Newton',
+  'Nguyen',
+  'Nichols',
+  'Nicholson',
+  'Nielsen',
+  'Nieves',
+  'Nixon',
+  'Noble',
+  'Noel',
+  'Nolan',
+  'Norman',
+  'Norris',
+  'Norton',
+  'Nunez',
+  "O'brien",
+  'Ochoa',
+  "O'connor",
+  'Odom',
+  "O'donnell",
+  'Oliver',
+  'Olsen',
+  'Olson',
+  'Oneal',
+  'Oneil',
+  "O'Neill",
+  'Orr',
+  'Ortega',
+  'Ortiz',
+  'Osborn',
+  'Osborne',
+  'Owen',
+  'Owens',
+  'Pace',
+  'Pacheco',
+  'Padilla',
+  'Page',
+  'Palmer',
+  'Park',
+  'Parker',
+  'Parks',
+  'Parrish',
+  'Parsons',
+  'Pate',
+  'Patel',
+  'Patrick',
+  'Patterson',
+  'Patton',
+  'Paul',
+  'Payne',
+  'Pearson',
+  'Peck',
+  'Pena',
+  'Pennington',
+  'Perez',
+  'Perkins',
+  'Perry',
+  'Peters',
+  'Petersen',
+  'Peterson',
+  'Petty',
+  'Phelps',
+  'Phillips',
+  'Pickett',
+  'Pierce',
+  'Pittman',
+  'Pitts',
+  'Pollard',
+  'Poole',
+  'Pope',
+  'Porter',
+  'Potter',
+  'Potts',
+  'Powell',
+  'Powers',
+  'Pratt',
+  'Preston',
+  'Price',
+  'Prince',
+  'Pruitt',
+  'Puckett',
+  'Pugh',
+  'Quinn',
+  'Ramirez',
+  'Ramos',
+  'Ramsey',
+  'Randall',
+  'Randolph',
+  'Rasmussen',
+  'Ratliff',
+  'Ray',
+  'Raymond',
+  'Reed',
+  'Reese',
+  'Reeves',
+  'Reid',
+  'Reilly',
+  'Reyes',
+  'Reynolds',
+  'Rhodes',
+  'Rice',
+  'Rich',
+  'Richard',
+  'Richards',
+  'Richardson',
+  'Richmond',
+  'Riddle',
+  'Riggs',
+  'Riley',
+  'Rios',
+  'Rivas',
+  'Rivera',
+  'Rivers',
+  'Roach',
+  'Robbins',
+  'Roberson',
+  'Roberts',
+  'Robertson',
+  'Robinson',
+  'Robles',
+  'Rocha',
+  'Rodgers',
+  'Rodriguez',
+  'Rodriquez',
+  'Rogers',
+  'Rojas',
+  'Rollins',
+  'Roman',
+  'Romero',
+  'Rosa',
+  'Rosales',
+  'Rosario',
+  'Rose',
+  'Ross',
+  'Roth',
+  'Rowe',
+  'Rowland',
+  'Roy',
+  'Ruiz',
+  'Rush',
+  'Russell',
+  'Russo',
+  'Rutledge',
+  'Ryan',
+  'Salas',
+  'Salazar',
+  'Salinas',
+  'Sampson',
+  'Sanchez',
+  'Sanders',
+  'Sandoval',
+  'Sanford',
+  'Santana',
+  'Santiago',
+  'Santos',
+  'Sargent',
+  'Saunders',
+  'Savage',
+  'Sawyer',
+  'Schmidt',
+  'Schneider',
+  'Schroeder',
+  'Schultz',
+  'Schwartz',
+  'Scott',
+  'Sears',
+  'Sellers',
+  'Serrano',
+  'Sexton',
+  'Shaffer',
+  'Shannon',
+  'Sharp',
+  'Sharpe',
+  'Shaw',
+  'Shelton',
+  'Shepard',
+  'Shepherd',
+  'Sheppard',
+  'Sherman',
+  'Shields',
+  'Short',
+  'Silva',
+  'Simmons',
+  'Simon',
+  'Simpson',
+  'Sims',
+  'Singleton',
+  'Skinner',
+  'Slater',
+  'Sloan',
+  'Small',
+  'Smith',
+  'Snider',
+  'Snow',
+  'Snyder',
+  'Solis',
+  'Solomon',
+  'Sosa',
+  'Soto',
+  'Sparks',
+  'Spears',
+  'Spence',
+  'Spencer',
+  'Stafford',
+  'Stanley',
+  'Stanton',
+  'Stark',
+  'Steele',
+  'Stein',
+  'Stephens',
+  'Stephenson',
+  'Stevens',
+  'Stevenson',
+  'Stewart',
+  'Stokes',
+  'Stone',
+  'Stout',
+  'Strickland',
+  'Strong',
+  'Stuart',
+  'Suarez',
+  'Sullivan',
+  'Summers',
+  'Sutton',
+  'Swanson',
+  'Sweeney',
+  'Sweet',
+  'Sykes',
+  'Talley',
+  'Tanner',
+  'Tate',
+  'Taylor',
+  'Terrell',
+  'Terry',
+  'Thomas',
+  'Thompson',
+  'Thornton',
+  'Tillman',
+  'Todd',
+  'Torres',
+  'Townsend',
+  'Tran',
+  'Travis',
+  'Trevino',
+  'Trujillo',
+  'Tucker',
+  'Turner',
+  'Tyler',
+  'Tyson',
+  'Underwood',
+  'Valdez',
+  'Valencia',
+  'Valentine',
+  'Valenzuela',
+  'Vance',
+  'Vang',
+  'Vargas',
+  'Vasquez',
+  'Vaughan',
+  'Vaughn',
+  'Vazquez',
+  'Vega',
+  'Velasquez',
+  'Velazquez',
+  'Velez',
+  'Villarreal',
+  'Vincent',
+  'Vinson',
+  'Wade',
+  'Wagner',
+  'Walker',
+  'Wall',
+  'Wallace',
+  'Waller',
+  'Walls',
+  'Walsh',
+  'Walter',
+  'Walters',
+  'Walton',
+  'Ward',
+  'Ware',
+  'Warner',
+  'Warren',
+  'Washington',
+  'Waters',
+  'Watkins',
+  'Watson',
+  'Watts',
+  'Weaver',
+  'Webb',
+  'Weber',
+  'Webster',
+  'Weeks',
+  'Weiss',
+  'Welch',
+  'Wells',
+  'West',
+  'Wheeler',
+  'Whitaker',
+  'White',
+  'Whitehead',
+  'Whitfield',
+  'Whitley',
+  'Whitney',
+  'Wiggins',
+  'Wilcox',
+  'Wilder',
+  'Wiley',
+  'Wilkerson',
+  'Wilkins',
+  'Wilkinson',
+  'William',
+  'Williams',
+  'Williamson',
+  'Willis',
+  'Wilson',
+  'Winters',
+  'Wise',
+  'Witt',
+  'Wolf',
+  'Wolfe',
+  'Wong',
+  'Wood',
+  'Woodard',
+  'Woods',
+  'Woodward',
+  'Wooten',
+  'Workman',
+  'Wright',
+  'Wyatt',
+  'Wynn',
+  'Yang',
+  'Yates',
+  'York',
+  'Young',
+  'Zamora',
+  'Zimmerman'
+];
+const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+const genders = ['male', 'female'];
+
+export const getRandomGender = (utils: WorkerUtils): string => (utils.randomUtils.getRandomBool() ? genders[0] : genders[1]);
+
+export const generate = (data: any, utils: WorkerUtils): DTGenerateResult => {
+  const { rowState, countryNames } = data;
+
+  // for backward compatibility. Prior to 4.0.6, rowState would just be an array of options
+  let options = [];
+  let source = NamesSource.any;
+  let selectedCountries = [];
+  if (rowState.hasOwnProperty('source')) {
+    options = rowState.options;
+    source = rowState.source;
+    selectedCountries = rowState.selectedCountries;
+  } else {
+    options = rowState;
+  }
+
+  if (source === NamesSource.countries && !selectedCountries.length) {
+    return {
+      display: ''
+    };
+  }
+
+  // in case the user entered multiple | separated formats, pick one first
+  let chosenFormat = options.length ? options[0] : '';
+  if (options.length > 1) {
+    chosenFormat = utils.randomUtils.getRandomArrayValue(options);
+  }
+
+  // the placeholder string with all the placeholders removed
+  let output = chosenFormat;
+
+  // the user can enter any old thing in the placeholder field. We do our best to return some 'gender' metadata
+  // based on what we find. In case we find multiple genders, we return 'unknown'
+  const foundGenders = [];
+
+  let maleNamesSource = maleNames;
+  let femaleNamesSource = femaleNames;
+  let lastNamesSource = lastNames;
+
+  if (source === NamesSource.countries) {
+    const randomCountry: string = utils.randomUtils.getRandomArrayValue(selectedCountries);
+    maleNamesSource = countryNames[randomCountry].maleNames;
+    femaleNamesSource = countryNames[randomCountry].femaleNames;
+    lastNamesSource = countryNames[randomCountry].lastNames;
+  }
+
+  while (/MaleName/.test(output)) {
+    foundGenders.push('male');
+    output = output.replace(/MaleName/, utils.randomUtils.getRandomArrayValue(maleNamesSource));
+  }
+
+  while (/FemaleName/.test(output)) {
+    foundGenders.push('female');
+    output = output.replace(/FemaleName/, utils.randomUtils.getRandomArrayValue(femaleNamesSource));
+  }
+
+  while (/Name/.test(output)) {
+    const gender = getRandomGender(utils);
+    foundGenders.push(gender);
+
+    const selectedSource = gender === 'male' ? maleNamesSource : femaleNamesSource;
+    output = output.replace(/Name/, utils.randomUtils.getRandomArrayValue(selectedSource));
+  }
+
+  while (/Surname/.test(output)) {
+    output = output.replace(/Surname/, utils.randomUtils.getRandomArrayValue(lastNamesSource));
+  }
+  while (/Initial/.test(output)) {
+    output = output.replace(/Initial/, utils.randomUtils.getRandomCharInString(letters));
+  }
+
+  let gender = 'unknown';
+  if (foundGenders.length === 1) {
+    gender = foundGenders[0];
+  } else if (foundGenders.length > 1) {
+    const uniques = utils.arrayUtils.getUnique(foundGenders);
+    if (uniques.length === 1) {
+      gender = uniques[0];
+    }
+  }
+
+  return {
+    display: output.trim(),
+    gender
+  };
+};
diff --git a/packages/plugins/src/dataTypes/Names/Names.scss b/packages/plugins/src/dataTypes/Names/Names.scss
new file mode 100644
index 000000000..1b0132a34
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/Names.scss
@@ -0,0 +1,45 @@
+@use '../../../styles/variables' as c;
+
+.row {
+	display: flex;
+	height: 30px;
+	align-items: center;
+
+	.col1 {
+		flex: 0 0 120px;
+	}
+	.col2 {
+		flex: 1;
+	}
+
+	label {
+		background-color: #dfecfc;
+		border-radius: 3px;
+		padding: 1px 6px;
+	}
+}
+
+.copyCol {
+	flex: 0 0 26px;
+}
+
+.copy {
+	margin: 4px 0 0 4px;
+}
+
+.pillField {
+	flex: 1;
+	margin-right: 2px;
+}
+
+.optionsBtn {
+	margin-right: 4px;
+}
+
+.regionalNamesIcon {
+	color: c.$primary-submit-hover;
+}
+
+.anyNamesIcon {
+	color: #cccccc;
+}
diff --git a/packages/plugins/src/dataTypes/Names/Names.scss.d.ts b/packages/plugins/src/dataTypes/Names/Names.scss.d.ts
new file mode 100644
index 000000000..ea4db56be
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/Names.scss.d.ts
@@ -0,0 +1,20 @@
+declare namespace NamesScssNamespace {
+  export interface INamesScss {
+    anyNamesIcon: string;
+    col1: string;
+    col2: string;
+    copy: string;
+    copyCol: string;
+    optionsBtn: string;
+    pillField: string;
+    regionalNamesIcon: string;
+    row: string;
+  }
+}
+
+declare const NamesScssModule: NamesScssNamespace.INamesScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: NamesScssNamespace.INamesScss;
+};
+
+export = NamesScssModule;
diff --git a/packages/plugins/src/dataTypes/Names/Names.state.ts b/packages/plugins/src/dataTypes/Names/Names.state.ts
new file mode 100644
index 000000000..74825baf1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/Names.state.ts
@@ -0,0 +1,30 @@
+import { CountryNameFiles } from '../../names';
+
+export const enum NamesSource {
+  any = 'any',
+  countries = 'countries'
+}
+
+export type NamesState = {
+  example: string;
+  options: string[];
+  source: NamesSource;
+  selectedCountries: CountryNameFiles[];
+};
+
+export type GenerationOptionsType = {
+  options: string[];
+  source?: NamesSource;
+  selectedCountries?: CountryNameFiles[];
+};
+
+export const defaultGenerationOptions: Required<GenerationOptionsType> = {
+  options: ['Name Surname'],
+  source: NamesSource.any,
+  selectedCountries: []
+};
+
+export const initialState: NamesState = {
+  example: 'Name Surname',
+  ...defaultGenerationOptions
+};
diff --git a/packages/plugins/src/dataTypes/Names/Names.tsx b/packages/plugins/src/dataTypes/Names/Names.tsx
new file mode 100755
index 000000000..7829634ec
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/Names.tsx
@@ -0,0 +1,287 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import IconButton from '@mui/material/IconButton';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import { SmallSpinner } from '~components/loaders/loaders';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import { Tooltip } from '~components/tooltips';
+import WorldIcon from '@mui/icons-material/Public';
+import CopyToClipboard from '~components/copyToClipboard/CopyToClipboard';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import CreatablePillField from '~components/creatablePillField/CreatablePillField';
+import { countryList } from '../../../../_plugins';
+import { CountryType } from '~types/countries';
+import { NamesState, NamesSource, GenerationOptionsType } from './Names.state';
+import styles from './Names.scss';
+
+export const rowStateReducer = ({ options, source, selectedCountries }: NamesState): GenerationOptionsType => ({
+  options,
+  source,
+  selectedCountries
+});
+
+export const Example = ({ i18n, data, onUpdate }: DTExampleProps) => {
+  const onChange = (selected: DropdownOption): void => {
+    onUpdate({
+      example: selected.value,
+      options: selected.value.split('|')
+    });
+  };
+
+  const options = [
+    { value: 'Name Surname', label: i18n.example_Name_Surname },
+    { value: 'Name', label: i18n.example_Name },
+    { value: 'MaleName', label: i18n.example_MaleName },
+    { value: 'FemaleName', label: i18n.example_FemaleName },
+    { value: 'MaleName Surname', label: i18n.example_MaleName_Surname },
+    { value: 'FemaleName Surname', label: i18n.example_FemaleName_Surname },
+    { value: 'Name Initial. Surname', label: i18n.example_Name_Initial_Surname },
+    { value: 'Surname', label: i18n.example_surname },
+    { value: 'Surname, Name Initial.', label: i18n.example_Surname_Name_Initial },
+    { value: 'Name, Name, Name, Name', label: i18n.example_Name4 },
+    { value: 'Name Surname|Name Initial. Surname', label: i18n.example_fullnames }
+  ];
+
+  return <Dropdown value={data.example} options={options} onChange={onChange} />;
+};
+
+const NamesDialog = ({
+  visible,
+  data,
+  id,
+  onClose,
+  countryI18n,
+  onUpdateSource,
+  onUpdateSelectedCountries,
+  isCountryNamesLoaded,
+  isCountryNamesLoading,
+  countryNamesMap,
+  coreI18n,
+  i18n
+}: any) => {
+  const [countryPluginOptions, setCountryPluginOptions] = React.useState<DropdownOption[]>([]);
+
+  React.useEffect(() => {
+    if (!isCountryNamesLoaded) {
+      return;
+    }
+
+    const countryPluginsWithNames = Object.keys(countryNamesMap);
+    const options = countryList
+      .filter((countryName: CountryType) => countryPluginsWithNames.indexOf(countryName) !== -1)
+      .map((countryName: CountryType) => ({
+        value: countryName,
+        label: countryI18n[countryName]?.countryName
+      }));
+    setCountryPluginOptions(options);
+  }, [isCountryNamesLoaded]);
+
+  const onSelectCountries = (countries: any): void => {
+    onUpdateSelectedCountries(countries ? countries.map(({ value }: DropdownOption) => value) : []);
+  };
+
+  const getCountryContent = () => {
+    if (data.source !== NamesSource.countries) {
+      return null;
+    }
+
+    if (isCountryNamesLoading) {
+      return null;
+    }
+
+    return (
+      <Dropdown
+        isMulti
+        closeMenuOnSelect={false}
+        isClearable={true}
+        value={data.selectedCountries}
+        onChange={onSelectCountries}
+        options={countryPluginOptions}
+      />
+    );
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.customizeSource}</DialogTitle>
+        <DialogContent dividers>
+          <div>{i18n.customizeSourceDesc}</div>
+
+          <h3>{i18n.source}</h3>
+
+          <RadioPillRow>
+            <RadioPill
+              label={i18n.westernNames}
+              onClick={(): void => onUpdateSource(NamesSource.any)}
+              name={`${id}-source`}
+              checked={data.source === NamesSource.any}
+              tooltip={i18n.defaultWesternNames}
+            />
+            <RadioPill
+              label={i18n.regionalNames}
+              onClick={(): void => onUpdateSource(NamesSource.countries)}
+              name={`${id}-source`}
+              checked={data.source === NamesSource.countries}
+            />
+            {isCountryNamesLoading && data.source === NamesSource.countries && <SmallSpinner />}
+          </RadioPillRow>
+          {getCountryContent()}
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({
+  data,
+  id,
+  onUpdate,
+  i18n,
+  coreI18n,
+  countryI18n,
+  isCountryNamesLoaded,
+  isCountryNamesLoading,
+  countryNamesMap
+}: DTOptionsProps) => {
+  const [visible, setDialogVisibility] = React.useState(false);
+
+  const safeData = {
+    source: NamesSource.any,
+    selectedCountries: [],
+    ...data
+  };
+
+  const onUpdateSource = (source: NamesSource): void => {
+    onUpdate(
+      {
+        ...safeData,
+        source
+      },
+      {
+        useCountryNames: source === NamesSource.countries
+      }
+    );
+  };
+
+  const onUpdateSelectedCountries = (selectedCountries: string[]): void => {
+    onUpdate({
+      ...safeData,
+      selectedCountries
+    });
+  };
+
+  let iconClasses = styles.anyNamesIcon;
+  let iconTooltip = i18n.westernNames;
+  if (data.source === NamesSource.countries) {
+    iconClasses = styles.regionalNamesIcon;
+    iconTooltip = i18n.regionalNames;
+  }
+
+  return (
+    <div style={{ display: 'flex', width: '100%', alignItems: 'center' }}>
+      <div className={styles.pillField}>
+        <CreatablePillField value={safeData.options} onChange={(options: any): void => onUpdate({ ...safeData, options })} />
+      </div>
+      <Tooltip title={iconTooltip} placement="bottom" arrow>
+        <span>
+          <IconButton size="small" onClick={(): void => setDialogVisibility(true)} className={iconClasses}>
+            <WorldIcon fontSize="small" />
+          </IconButton>
+        </span>
+      </Tooltip>
+      <NamesDialog
+        visible={visible}
+        data={safeData}
+        id={id}
+        isCountryNamesLoaded={isCountryNamesLoaded}
+        isCountryNamesLoading={isCountryNamesLoading}
+        countryNamesMap={countryNamesMap}
+        onClose={(): void => setDialogVisibility(false)}
+        onUpdateSource={onUpdateSource}
+        onUpdateSelectedCountries={onUpdateSelectedCountries}
+        i18n={i18n}
+        coreI18n={coreI18n}
+        countryI18n={countryI18n}
+      />
+    </div>
+  );
+};
+
+const Copy = ({ content, message, tooltip }: any) => (
+  <span className={styles.copy}>
+    <CopyToClipboard tooltip={tooltip} content={content} message={message} />
+  </span>
+);
+
+export const Help = ({ coreI18n, i18n }: DTHelpProps) => (
+  <>
+    <p>
+      {i18n.DESC} {i18n.help_intro}
+    </p>
+
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>Name</label>
+      </div>
+      <div className={styles.copyCol}>
+        <Copy content="Name" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2}>{i18n.type_Name}</div>
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>MaleName</label>
+      </div>
+      <div className={styles.copyCol}>
+        <Copy content="MaleName" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2}>{i18n.type_MaleName}</div>
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>FemaleName</label>
+      </div>
+      <div className={styles.copyCol}>
+        <Copy content="FemaleName" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2}>{i18n.type_FemaleName}</div>
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>Initial</label>
+      </div>
+      <div className={styles.copyCol}>
+        <Copy content="Initial" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2}>{i18n.type_Initial}</div>
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>
+        <label>Surname</label>
+      </div>
+      <div className={styles.copyCol}>
+        <Copy content="Surname" message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2}>{i18n.type_Surname}</div>
+    </div>
+
+    <h3>{i18n.namesSource}</h3>
+
+    <p>{i18n.namesSourceDesc}</p>
+  </>
+);
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'varchar(255) default NULL',
+    field_Oracle: 'varchar2(255) default NULL',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/Names/Names.worker.ts b/packages/plugins/src/dataTypes/Names/Names.worker.ts
new file mode 100644
index 000000000..daeff4b8e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/Names.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Names.generate';
+
+let workerUtilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!workerUtilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		workerUtilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Names/README.md b/packages/plugins/src/dataTypes/Names/README.md
new file mode 100644
index 000000000..681fa6e0d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/README.md
@@ -0,0 +1,309 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Names
+
+This Data Type lets you generate realistic **names** in a wide variety of formats. The options available are: male or
+female first names, surnames and initials, plus any combination of those in whatever order you want. You can also generate
+regional names for specific countries that support the feature.
+
+## Typings
+
+The `settings` property for the `Names` plugin `dataTemplate` entry allows the following options (see examples below 
+for an illustration of all of these):
+
+```
+{
+    options: string[]; // an array of strings containing placeholders that get replaced with names
+    source?: NamesSource; // 'any' or 'countries'
+    selectedCountries?: CountryNameFiles[]; // see typing for list of support countries, but array of country names
+}
+```
+
+## Placeholders
+
+The `options` property is an array of strings that outlines a list of name formats. The script will randomly choose 
+one of the formats for each row (see the [Single name field with different formats](#single-name-field-with-different-formats) 
+for an illustration of this). These are the available placeholders within that field:
+
+- `Name` - a random first name (male or female)
+- `FemaleName` - a random female name
+- `MaleName` - a random male name
+- `Initial` - a random letter, generally you'll want to follow this with a period
+- `Surname` - a random surname.
+
+
+## Examples
+
+- [First and last names in separate fields](#first-and-last-names-in-separate-fields)
+- [Single name field with first name, last name with middle initial](#single-name-field-with-first-name-last-name-with-middle-initial)
+- [Single field containing male name, female name, any gender name in a comma delimited list](#single-field-containing-male-name-female-name-any-gender-name-in-a-comma-delimited-list)
+- [Single name field with different formats](#single-name-field-with-different-formats)
+- [Regional Names](#regional-names)
+
+
+### First and last names in separate fields
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Names',
+            title: 'First Name',
+            settings: {
+                options: ['Name']
+            }
+        },
+        {
+            plugin: 'Names',
+            title: 'Last Name',
+            settings: {
+                options: ['Surname']
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "First Name": "Hayley",
+        "Last Name": "Hopper"
+    },
+    {
+        "First Name": "Wyatt",
+        "Last Name": "Williams"
+    },
+    {
+         "First Name": "Uriah",
+         "Last Name": "Moses"
+    },
+    ...
+]
+```
+
+### Single name field with first name, last name with middle initial
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Names',
+            title: 'Name',
+            settings: {
+                options: ['Name Initial. Surname']
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'XML',
+        settings: {
+            rootNodeName: 'listOfNames',
+            recordNodeName: 'row'
+        }
+    }
+}
+```
+
+Sample output:
+
+```xml
+<?xml version="1.0" encoding="UTF-8" ?>
+<listOfNames>
+    <row>
+        <Name>Eliana G. Riggs</Name>
+    </row>
+    <row>
+        <Name>Charde T. Marquez</Name>
+    </row>
+    <row>
+        <Name>Kieran I. Hendricks</Name>
+    </row>
+    <row>
+        <Name>Hyatt F. Hendricks</Name>
+    </row>
+    <row>
+        <Name>Martena U. O'donnell</Name>
+    </row>
+    ...
+</listOfNames>
+```
+
+## Single field containing male name, female name, any gender name in a comma delimited list
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Names',
+            title: 'Name',
+            settings: {
+                options: ['MaleName, FemaleName, Name']
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "Name List": "Demetrius, Xyla, Irma"
+    },
+    {
+        "Name List": "Brian, Pamela, Quamar"
+    },
+    {
+        "Name List": "Owen, Jacqueline, Magee"
+    },
+    {
+        "Name List": "Quinn, MacKensie, Hyacinth"
+    },
+    ...
+]
+```
+
+## Single name field with different formats
+
+```javascript
+{
+    generationSettings: {
+        numResults: 8
+    },
+    dataTemplate: [
+        {
+            plugin: 'Names',
+            title: 'Any Formatted Name',
+            settings: {
+                options: ['Name Initial. Surname', 'Name Surname', 'Surname, Name']
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "Any Formatted Name": "Rios, Wesley"
+    },
+    {
+        "Any Formatted Name": "Beck, Kaitlin"
+    },
+    {
+        "Any Formatted Name": "Aristotle I. Maxwell"
+    },
+    {
+        "Any Formatted Name": "Ethan B. Levy"
+    },
+    {
+        "Any Formatted Name": "Elvis Peters"
+    },
+    {
+        "Any Formatted Name": "Nomlanga N. Dickson"
+    },
+    {
+        "Any Formatted Name": "Mercado, Tashya"
+    },
+    {
+        "Any Formatted Name": "Tanek W. Stevens"
+    }
+]
+```
+
+
+## Regional names
+
+```javascript
+{
+    generationSettings: {
+        numResults: 8
+    },
+    dataTemplate: [
+        {
+            plugin: 'Names',
+            title: 'Vietnamese Name',
+            settings: {
+                options: ['Name Surname'],
+                source: 'countries',
+                selectedCountries: ['Vietnam']
+            }
+        },
+        {
+            plugin: 'Names',
+            title: 'Nigerian Name',
+            settings: {
+                options: ['Name Surname'],
+                source: 'countries',
+                selectedCountries: ['Nigeria']
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "Vietnamese Name": "Rae Nguyễn",
+        "Nigerian Name": "Rose Bakare"
+    },
+    {
+        "Vietnamese Name": "Timothy Nguyễn",
+        "Nigerian Name": "Tad Makinde"
+    },
+    {
+        "Vietnamese Name": "Slade Điền",
+        "Nigerian Name": "Camille Ibekwe"
+    },
+    {
+        "Vietnamese Name": "Ciaran Nguyễn",
+        "Nigerian Name": "Ursa Ibekwe"
+    },
+    {
+        "Vietnamese Name": "TaShya Nguyễn",
+        "Nigerian Name": "Bernard Sofoluwe"
+    },
+    ...
+]
+```
+
diff --git a/packages/plugins/src/dataTypes/Names/__tests__/Names.generate.test.ts b/packages/plugins/src/dataTypes/Names/__tests__/Names.generate.test.ts
new file mode 100644
index 000000000..fcbd2e7cb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/__tests__/Names.generate.test.ts
@@ -0,0 +1,126 @@
+import * as sinon from 'sinon';
+import { generate } from '../Names.generate';
+import utils from '../../../../utils';
+import { NamesSource } from '../Names.state';
+
+describe('generate method converts all placeholders', () => {
+	afterEach(() => {
+		sinon.restore();
+	});
+
+	it('generates a single male name', () => {
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue').returns('Jim');
+		expect(generate({
+			rowState: {
+				options: ['MaleName'],
+				source: NamesSource.any
+			}
+		}, utils)).toEqual({
+			display: 'Jim',
+			gender: 'male'
+		});
+	});
+
+	it('generates a single female name', () => {
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue').returns('Sue');
+
+		expect(generate({
+			rowState: {
+				options: ['FemaleName'],
+				source: NamesSource.any
+			}
+		}, utils)).toEqual({
+			display: 'Sue',
+			gender: 'female'
+		});
+	});
+
+	it('generates two male names', () => {
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue')
+			.onCall(0).returns('Jim')
+			.onCall(1).returns('Bob');
+
+		expect(generate({
+			rowState: {
+				options: ['MaleName, MaleName'],
+				source: NamesSource.any
+			}
+		}, utils)).toEqual({
+			display: 'Jim, Bob',
+			gender: 'male'
+		});
+	});
+
+	it('generates multiple male names', () => {
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue')
+			.onCall(0).returns('Jim')
+			.onCall(1).returns('Jimbo')
+			.onCall(2).returns('Bob');
+
+		expect(generate({
+			rowState: {
+				options: ['[MaleName]!!MaleName--MaleName'],
+				source: NamesSource.any
+			}
+		}, utils)).toEqual({
+			display: '[Jim]!!Jimbo--Bob',
+			gender: 'male'
+		});
+	});
+
+	it('generates male and female names', () => {
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue')
+			.onCall(0).returns('Thomas')
+			.onCall(1).returns('Susan');
+
+		expect(generate({
+			rowState: {
+				options: ['FemaleName,MaleName'],
+				source: NamesSource.any
+			}
+		}, utils)).toEqual({
+			display: 'Susan,Thomas',
+			gender: 'unknown'
+		});
+	});
+
+	it('generates surnames', () => {
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue')
+			.onCall(0).returns('Whatever');
+
+		expect(generate({
+			rowState: {
+				options: ['Surname'],
+				source: NamesSource.any
+			}
+		}, utils)).toEqual({
+			display: 'Whatever',
+			gender: 'unknown'
+		});
+	});
+
+	it('generates surnames', () => {
+		sinon.stub(utils.randomUtils, 'getRandomCharInString')
+			.onCall(0).returns('A');
+
+		expect(generate({
+			rowState: {
+				options: ['Initial'],
+				source: NamesSource.any
+			}
+		}, utils)).toEqual({
+			display: 'A',
+			gender: 'unknown'
+		});
+	});
+
+	it('is backward-compatible for old (pre 4.0.6) saved Names fields that just contains an array of options', () => {
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue').returns('Jim');
+		expect(generate({
+			rowState: ['MaleName']
+		}, utils)).toEqual({
+			display: 'Jim',
+			gender: 'male'
+		});
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Names/__tests__/Names.ui.test.tsx b/packages/plugins/src/dataTypes/Names/__tests__/Names.ui.test.tsx
new file mode 100644
index 000000000..2de78917c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/__tests__/Names.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../Names';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Names/bundle.ts b/packages/plugins/src/dataTypes/Names/bundle.ts
new file mode 100644
index 000000000..95d99008d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/bundle.ts
@@ -0,0 +1,20 @@
+import { DTBundle } from '~types/dataTypes';
+import {
+	Example,
+	Options,
+	Help,
+	getMetadata,
+	rowStateReducer
+} from './Names';
+import { initialState } from './Names.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	getMetadata,
+	rowStateReducer
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Names/config.ts b/packages/plugins/src/dataTypes/Names/config.ts
new file mode 100644
index 000000000..0c81ea6e6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'humanData',
+  fieldGroupOrder: 10
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Names/i18n/ar.json b/packages/plugins/src/dataTypes/Names/i18n/ar.json
new file mode 100644
index 000000000..8753e93f8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/ar.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "الأسماء",
+  "DESC": "This Data Type generates human names in any format you need.",
+  "DEFAULT_TITLE": "اسم",
+  "help_intro": "يمكنك تحديد تنسيقات متعددة بالنقر فوق إدخال. سيتم تحويل السلاسل التالية إلى ما يعادل اسمها العشوائي:",
+  "name": "اسم",
+  "example_FemaleName": "Jane (اسم انثى)",
+  "example_FemaleName_Surname": "Jane Smith",
+  "example_MaleName": "John (اسم الذكر)",
+  "example_MaleName_Surname": "John Smith",
+  "example_Name": "Alex (أي جنس)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith or Alex J. Smith",
+  "example_surname": "Smith (لقب)",
+  "type_FemaleName": "الاسم الأول أنثى.",
+  "type_Initial": "حرف كبير ، A-Z.",
+  "type_MaleName": "ذكر الاسم الأول.",
+  "type_Name": "الاسم الاول ذكر او انثى.",
+  "type_Surname": "لقب عشوائي.",
+  "source": "مصدر",
+  "westernNames": "الأسماء الغربية",
+  "regionalNames": "الأسماء الإقليمية",
+  "namesSource": "مصدر الأسماء",
+  "namesSourceDesc": "بشكل افتراضي ، يولد نوع البيانات هذا أسماء غربية في الغالب. لاستهداف الأسماء الشائعة لبلد أو بلدان معينة ، في شبكة البيانات الرئيسية ، انقر فوق رمز \"العالم\" الصغير على يمين حقل الخيارات. سيؤدي ذلك إلى فتح مربع حوار حيث يمكنك تخصيص المصدر.",
+  "defaultWesternNames": "بشكل افتراضي ، يولد نوع البيانات هذا أسماء غربية في الغالب",
+  "customizeSourceDesc": "يُنشئ نوع البيانات هذا أسماء غربية في الغالب ولكن إذا كنت تريد إنشاء أسماء أكثر ملاءمة لمنطقة معينة ، فحدد البلدان التي تريدها أدناه.",
+  "customizeSource": "تخصيص مصدر الأسماء"
+}
diff --git a/packages/plugins/src/dataTypes/Names/i18n/de.json b/packages/plugins/src/dataTypes/Names/i18n/de.json
new file mode 100644
index 000000000..9e1696922
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/de.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "Namen",
+  "DESC": "This Data Type generates human names in any format you need.",
+  "DEFAULT_TITLE": "name",
+  "example_FemaleName": "Jane (Weiblicher Name)",
+  "example_FemaleName_Surname": "Jane Smith",
+  "example_MaleName": "John (männlich Name)",
+  "example_MaleName_Surname": "John Smith",
+  "example_Name": "Alex (geschlechtsspezifische)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith oder Alex J. Smith",
+  "example_surname": "Smith (Familienname)",
+  "help_intro": "Sie können mehrere Formate angeben, indem Sie auf die Eingabetaste klicken. Die folgenden Zeichenfolgen werden in ihre zufälligen Namensäquivalente konvertiert:",
+  "name": "Name",
+  "type_FemaleName": "Ein weiblicher Vorname.",
+  "type_Initial": "Ein Großbuchstaben, AZ.",
+  "type_MaleName": "Ein männlicher Vorname.",
+  "type_Name": "Ein Vorname, männlich oder weiblich.",
+  "type_Surname": "Eine zufällige Nachnamen.",
+  "source": "Quelle",
+  "westernNames": "Westliche Namen",
+  "regionalNames": "Regionale Namen",
+  "namesSource": "Namensquelle",
+  "namesSourceDesc": "Standardmäßig generiert dieser Datentyp hauptsächlich westliche Namen. Um auf Namen abzuzielen, die für ein oder mehrere bestimmte Länder gebräuchlich sind, klicken Sie im Hauptdatenraster auf das kleine \"Welt\"-Symbol rechts neben dem Optionsfeld. Dadurch wird ein Dialogfeld geöffnet, in dem Sie die Quelle anpassen können.",
+  "defaultWesternNames": "Standardmäßig generiert dieser Datentyp hauptsächlich westliche Namen",
+  "customizeSourceDesc": "Dieser Datentyp generiert hauptsächlich westliche Namen. Wenn Sie jedoch Namen generieren möchten, die für eine bestimmte Region besser geeignet sind, wählen Sie unten die gewünschten Länder aus.",
+  "customizeSource": "Namensquelle anpassen"
+}
diff --git a/packages/plugins/src/dataTypes/Names/i18n/en.json b/packages/plugins/src/dataTypes/Names/i18n/en.json
new file mode 100644
index 000000000..852bbb903
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/en.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "Names",
+  "DESC": "This Data Type generates human names in any format you need.",
+  "DEFAULT_TITLE": "name",
+  "help_intro": "You can specify multiple formats by clicking <enter> in the options field. The following strings will be converted to their random name equivalent:",
+  "name": "Name",
+  "example_FemaleName": "Jane (Female Name)",
+  "example_FemaleName_Surname": "Jane Smith",
+  "example_MaleName": "John (Male Name)",
+  "example_MaleName_Surname": "John Smith",
+  "example_Name": "Alex (any gender)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith or Alex J. Smith",
+  "example_surname": "Smith (surname)",
+  "type_FemaleName": "A female first name.",
+  "type_Initial": "An upper-case letter, A-Z.",
+  "type_MaleName": "A male first name.",
+  "type_Name": "A first name, male or female.",
+  "type_Surname": "A random surname.",
+  "source": "Source",
+  "westernNames": "Western names",
+  "regionalNames": "Regional names",
+  "namesSource": "Names source",
+  "namesSourceDesc": "By default this Data Type generates mostly Western names. To target names that are common for a particular country or countries, in the main data grid, click the little \"World\" icon to the right of the options field. That will open a dialog where you can customize the source.",
+  "defaultWesternNames": "By default this Data Type generates mostly Western names",
+  "customizeSourceDesc": "This Data Type generates mostly Western names but if you want to generate names more appropriate to a particular region, select the countries you would like below.",
+  "customizeSource": "Customize names source"
+}
diff --git a/packages/plugins/src/dataTypes/Names/i18n/es.json b/packages/plugins/src/dataTypes/Names/i18n/es.json
new file mode 100644
index 000000000..b7e5290ec
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/es.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "Nombres",
+  "DESC": "Este tipo de datos genera nombres humanos en cualquier formato que necesite.",
+  "DEFAULT_TITLE": "nombre",
+  "help_intro": "Puede especificar varios formatos haciendo clic en Intro. Las siguientes cadenas se convertirán a su equivalente de nombre aleatorio:",
+  "name": "Nombre",
+  "example_FemaleName": "Jane (Nombre de mujer)",
+  "example_FemaleName_Surname": "Jane Smith",
+  "example_MaleName": "John (Nombre de hombre)",
+  "example_MaleName_Surname": "John Smith",
+  "example_Name": "Alex (cualquier sexo)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith o Alex J. Smith",
+  "example_surname": "Smith (apellido)",
+  "type_FemaleName": "Un nombre de mujer.",
+  "type_Initial": "Una letra mayúscula, A-Z.",
+  "type_MaleName": "Un nombre de hombre.",
+  "type_Name": "Un nombre, de hombre o mujer.",
+  "type_Surname": "Un apellido aleatorio.",
+  "source": "Fuente",
+  "westernNames": "Nombres occidentales",
+  "regionalNames": "Nombres regionales",
+  "namesSource": "Fuente de nombres",
+  "namesSourceDesc": "De forma predeterminada, este tipo de datos genera principalmente nombres occidentales. Para orientar nombres que son comunes para un país o países en particular, en la cuadrícula de datos principal, haga clic en el pequeño icono \"Mundo\" a la derecha del campo de opciones. Eso abrirá un cuadro de diálogo donde puede personalizar la fuente.",
+  "defaultWesternNames": "De forma predeterminada, este tipo de datos genera principalmente nombres occidentales",
+  "customizeSourceDesc": "Este tipo de datos genera principalmente nombres occidentales, pero si desea generar nombres más apropiados para una región en particular, seleccione los países que desea a continuación.",
+  "customizeSource": "Personalizar la fuente de nombres"
+}
diff --git a/packages/plugins/src/dataTypes/Names/i18n/fr.json b/packages/plugins/src/dataTypes/Names/i18n/fr.json
new file mode 100644
index 000000000..db4b77c0f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/fr.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "Noms",
+  "DESC": "Ce type de données génère des noms humains dans n'importe quel format dont vous avez besoin.",
+  "DEFAULT_TITLE": "nom",
+  "example_FemaleName": "Jane (prénom féminin)",
+  "example_FemaleName_Surname": "Jane Smith (nom complet féminin)",
+  "example_MaleName": "John (prénom masculin)",
+  "example_MaleName_Surname": "John Smith (nom complet masculin)",
+  "example_Name": "Alex (prénom masculin ou féminin)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith ou Alex J. Smith",
+  "example_surname": "Smith (nom de famille)",
+  "help_intro": "Vous pouvez spécifier plusieurs formats en cliquant sur Entrée. Les chaînes suivantes seront converties en leur équivalent de nom aléatoire:",
+  "name": "Nom",
+  "type_FemaleName": "Un prénom féminin.",
+  "type_Initial": "Une lettre majuscule, AZ.",
+  "type_MaleName": "Un prénom masculin.",
+  "type_Name": "Un prénom masculin ou féminin.",
+  "type_Surname": "Un nom aléatoire.",
+  "source": "La source",
+  "westernNames": "Noms occidentaux",
+  "regionalNames": "Noms régionaux",
+  "namesSource": "Source des noms",
+  "namesSourceDesc": "Par défaut, ce type de données génère principalement des noms occidentaux. Pour cibler des noms communs à un ou plusieurs pays en particulier, dans la grille de données principale, cliquez sur la petite icône « Monde » à droite du champ d'options. Cela ouvrira une boîte de dialogue dans laquelle vous pourrez personnaliser la source.",
+  "defaultWesternNames": "Par défaut, ce type de données génère principalement des noms occidentaux",
+  "customizeSourceDesc": "Ce type de données génère principalement des noms occidentaux, mais si vous souhaitez générer des noms plus appropriés à une région particulière, sélectionnez les pays que vous souhaitez ci-dessous.",
+  "customizeSource": "Personnaliser la source des noms"
+}
diff --git a/packages/plugins/src/dataTypes/Names/i18n/hi.json b/packages/plugins/src/dataTypes/Names/i18n/hi.json
new file mode 100644
index 000000000..f76fc8c60
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/hi.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "नाम",
+  "DESC": "यह डेटा प्रकार आपके लिए आवश्यक किसी भी प्रारूप में मानव नाम उत्पन्न करता है।",
+  "DEFAULT_TITLE": "नाम",
+  "help_intro": "आप एंटर पर क्लिक करके कई फॉर्मेट निर्दिष्ट कर सकते हैं। निम्नलिखित स्ट्रिंग्स को उनके यादृच्छिक नाम समकक्ष में परिवर्तित किया जाएगा:",
+  "name": "नाम",
+  "example_FemaleName": "Jane (महिला का नाम)",
+  "example_FemaleName_Surname": "Jane Smith",
+  "example_MaleName": "John (पुरुष का नाम)",
+  "example_MaleName_Surname": "John Smith",
+  "example_Name": "Alex (कोई भी लिंग)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith या Alex J. Smith",
+  "example_surname": "Smith (उपनाम)",
+  "type_FemaleName": "एक महिला का पहला नाम।",
+  "type_Initial": "एक अपर-केस अक्षर, A-Z।",
+  "type_MaleName": "एक पुरुष का पहला नाम।",
+  "type_Name": "पहला नाम, पुरुष या महिला।",
+  "type_Surname": "एक यादृच्छिक उपनाम।.",
+  "source": "स्रोत",
+  "westernNames": "पश्चिमी नाम",
+  "regionalNames": "क्षेत्रीय नाम",
+  "namesSource": "नाम स्रोत",
+  "namesSourceDesc": "डिफ़ॉल्ट रूप से यह डेटा प्रकार ज्यादातर पश्चिमी नाम उत्पन्न करता है। उन नामों को लक्षित करने के लिए जो किसी विशेष देश या देशों के लिए सामान्य हैं, मुख्य डेटा ग्रिड में, विकल्प फ़ील्ड के दाईं ओर छोटे \"विश्व\" आइकन पर क्लिक करें। वह एक संवाद खोलेगा जहाँ आप स्रोत को अनुकूलित कर सकते हैं।",
+  "defaultWesternNames": "डिफ़ॉल्ट रूप से यह डेटा प्रकार ज्यादातर पश्चिमी नाम उत्पन्न करता है",
+  "customizeSourceDesc": "यह डेटा प्रकार ज्यादातर पश्चिमी नाम उत्पन्न करता है, लेकिन यदि आप किसी विशेष क्षेत्र के लिए अधिक उपयुक्त नाम बनाना चाहते हैं, तो उन देशों का चयन करें जिन्हें आप नीचे चाहते हैं।",
+  "customizeSource": "नाम स्रोत अनुकूलित करें"
+}
diff --git a/packages/plugins/src/dataTypes/Names/i18n/ja.json b/packages/plugins/src/dataTypes/Names/i18n/ja.json
new file mode 100644
index 000000000..09e36655c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/ja.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "名前",
+  "DESC": "このデータ型は、必要な形式で人間の名前を生成します。",
+  "DEFAULT_TITLE": "名前",
+  "help_intro": "Enterをクリックすると、複数の形式を指定できます。 次の文字列は、同等のランダムな名前に変換されます。",
+  "name": "名前",
+  "example_FemaleName": "Jane (女性の名前)",
+  "example_FemaleName_Surname": "Jane Smith",
+  "example_MaleName": "John (男性の名前)",
+  "example_MaleName_Surname": "John Smith",
+  "example_Name": "Alex (性別を問わず)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith or Alex J. Smith",
+  "example_surname": "Smith (姓)",
+  "type_FemaleName": "女性の名。",
+  "type_Initial": "大文字のA-Z。",
+  "type_MaleName": "男性の名。",
+  "type_Name": "男性または女性の名。",
+  "type_Surname": "ランダムな姓。",
+  "source": "ソース",
+  "westernNames": "西洋の名前",
+  "regionalNames": "地域名",
+  "namesSource": "名前のソース",
+  "namesSourceDesc": "デフォルトでは、このデータ型は主に西洋の名前を生成します。 特定の国に共通する名前をターゲットにするには、メインデータグリッドで、オプションフィールドの右側にある小さな「世界」アイコンをクリックします。 これにより、ソースをカスタマイズできるダイアログが開きます。",
+  "defaultWesternNames": "デフォルトでは、このデータ型は主に西洋の名前を生成します",
+  "customizeSourceDesc": "このデータ型は主に西洋の名前を生成しますが、特定の地域により適した名前を生成する場合は、以下で希望する国を選択してください。",
+  "customizeSource": "名前のソースをカスタマイズする"
+}
diff --git a/packages/plugins/src/dataTypes/Names/i18n/nl.json b/packages/plugins/src/dataTypes/Names/i18n/nl.json
new file mode 100644
index 000000000..7c4a84546
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/nl.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "Namen",
+  "DESC": "Dit gegevenstype genereert menselijke namen in elk gewenst formaat.",
+  "DEFAULT_TITLE": "naam",
+  "help_intro": "U kunt meerdere formaten specificeren door op enter te klikken. De volgende strings worden geconverteerd naar hun equivalent voor willekeurige naam:",
+  "name": "Naam",
+  "example_FemaleName": "Jane (Vrouwen Voornaam)",
+  "example_FemaleName_Surname": "Jane Smith",
+  "example_MaleName": "John (Mannen Voornaam)",
+  "example_MaleName_Surname": "John Smith",
+  "example_Name": "Alex (willekeurig geslacht)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith of Alex J. Smith",
+  "example_surname": "Smith (Achternaam)",
+  "type_FemaleName": "Een vrouwen voornaam.",
+  "type_Initial": "Een hoofdletter, A-Z.",
+  "type_MaleName": "Een mannen voornaam.",
+  "type_Name": "Een voornaam, willekeurig mannelijk of vrouwelijk.",
+  "type_Surname": "Een willekeurige achternaam",
+  "source": "Bron",
+  "westernNames": "Westerse namen",
+  "regionalNames": "Regionale namen",
+  "namesSource": "Namen bron",
+  "namesSourceDesc": "Standaard genereert dit gegevenstype voornamelijk westerse namen. Als u namen wilt targeten die gebruikelijk zijn voor een bepaald land of bepaalde landen, klikt u in het hoofdgegevensraster op het kleine 'Wereld'-pictogram rechts van het optieveld. Dat opent een dialoogvenster waarin u de bron kunt aanpassen.",
+  "defaultWesternNames": "Standaard genereert dit gegevenstype voornamelijk westerse namen",
+  "customizeSourceDesc": "Dit gegevenstype genereert voornamelijk westerse namen, maar als u namen wilt genereren die beter passen bij een bepaalde regio, selecteert u hieronder de gewenste landen.",
+  "customizeSource": "Namenbron aanpassen"
+}
diff --git a/packages/plugins/src/dataTypes/Names/i18n/pt.json b/packages/plugins/src/dataTypes/Names/i18n/pt.json
new file mode 100644
index 000000000..235edc639
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/pt.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "Nomes",
+  "DESC": "Este tipo de dados gera nomes humanos em qualquer formato de que você precisa.",
+  "DEFAULT_TITLE": "nome",
+  "help_intro": "Você pode especificar vários formatos clicando em Enter. As seguintes strings serão convertidas em seu equivalente de nome aleatório:",
+  "name": "Nome",
+  "example_FemaleName": "Jane (Nome feminino)",
+  "example_FemaleName_Surname": "Jane Smith",
+  "example_MaleName": "John (Nome Masculino)",
+  "example_MaleName_Surname": "John Smith",
+  "example_Name": "Alex (qualquer gênero)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith ou Alex J. Smith",
+  "example_surname": "Smith (sobrenome)",
+  "type_FemaleName": "Um primeiro nome feminino.",
+  "type_Initial": "Uma letra maiúscula, A-Z.",
+  "type_MaleName": "Um nome próprio masculino.",
+  "type_Name": "Um primeiro nome, masculino ou feminino.",
+  "type_Surname": "Um sobrenome aleatório..",
+  "source": "Fonte",
+  "westernNames": "Nomes ocidentais",
+  "regionalNames": "Nomes regionais",
+  "namesSource": "Fonte de nomes",
+  "namesSourceDesc": "Por padrão, este tipo de dados gera principalmente nomes ocidentais. Para direcionar nomes que são comuns para um determinado país ou países, na grade de dados principal, clique no pequeno ícone \"Mundo\" à direita do campo de opções. Isso abrirá uma caixa de diálogo onde você pode personalizar a fonte.",
+  "defaultWesternNames": "Por padrão, este tipo de dados gera principalmente nomes ocidentais",
+  "customizeSourceDesc": "Este tipo de dados gera principalmente nomes ocidentais, mas se você deseja gerar nomes mais apropriados para uma determinada região, selecione os países que deseja abaixo.",
+  "customizeSource": "Personalize a fonte de nomes"
+}
diff --git a/packages/plugins/src/dataTypes/Names/i18n/ru.json b/packages/plugins/src/dataTypes/Names/i18n/ru.json
new file mode 100644
index 000000000..00150d843
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/ru.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "Имена",
+  "DESC": "Этот тип данных генерирует человеческие имена в любом нужном вам формате.",
+  "DEFAULT_TITLE": "имя",
+  "help_intro": "Вы можете указать несколько форматов, нажав <enter> в поле параметров. Следующие строки будут преобразованы в эквивалентные им случайные имена:",
+  "name": "Имя",
+  "example_FemaleName": "Jane (женское имя)",
+  "example_FemaleName_Surname": "Jane Smith",
+  "example_MaleName": "John (Мужское имя)",
+  "example_MaleName_Surname": "John Smith",
+  "example_Name": "Alex (любой пол)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith или Alex J. Smith",
+  "example_surname": "Smith (фамилия)",
+  "type_FemaleName": "Женское имя.",
+  "type_Initial": "Заглавная буква, A-Z.",
+  "type_MaleName": "Мужское имя.",
+  "type_Name": "Имя, мужское или женское.",
+  "type_Surname": "Случайная фамилия.",
+  "source": "Источник",
+  "westernNames": "Западные имена",
+  "regionalNames": "Региональные названия",
+  "namesSource": "Источник имен",
+  "namesSourceDesc": "По умолчанию этот тип данных генерирует в основном западные имена. Чтобы настроить таргетинг на имена, общие для определенной страны или стран, в основной сетке данных щелкните маленький значок «Мир» справа от поля параметров. Откроется диалоговое окно, в котором вы можете настроить источник.",
+  "defaultWesternNames": "По умолчанию этот тип данных генерирует в основном западные имена.",
+  "customizeSourceDesc": "Этот тип данных генерирует в основном западные имена, но если вы хотите генерировать имена, более подходящие для определенного региона, выберите нужные страны ниже.",
+  "customizeSource": "Настроить источник имен"
+}
diff --git a/packages/plugins/src/dataTypes/Names/i18n/ta.json b/packages/plugins/src/dataTypes/Names/i18n/ta.json
new file mode 100644
index 000000000..b1ec11460
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/ta.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "பெயர்கள்",
+  "DESC": "இந்தத் தரவு வகை உங்களுக்குத் தேவையான எந்த வடிவத்திலும் மனிதப் பெயர்களை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "பெயர்",
+  "help_intro": "Enter என்பதைக் கிளிக் செய்வதன் மூலம் பல வடிவங்களைக் குறிப்பிடலாம். பின்வரும் சரங்கள் அவற்றின் சீரற்ற பெயருக்கு சமமானதாக மாற்றப்படும்:",
+  "name": "பெயர்",
+  "example_FemaleName": "Jane (பெண் பெயர்)",
+  "example_FemaleName_Surname": "Jane Smith",
+  "example_MaleName": "John (ஆண் பெயர்)",
+  "example_MaleName_Surname": "John Smith",
+  "example_Name": "Alex (எந்த பாலினமும்)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith or Alex J. Smith",
+  "example_surname": "Smith (குடும்ப பெயர்)",
+  "type_FemaleName": "ஒரு பெண் முதல் பெயர்.",
+  "type_Initial": "ஒரு மேல் எழுத்து, A-Z.",
+  "type_MaleName": "ஒரு ஆண் முதல் பெயர்.",
+  "type_Name": "முதல் பெயர், ஆண் அல்லது பெண்.",
+  "type_Surname": "ஒரு சீரற்ற குடும்பப்பெயர்.",
+  "source": "ஆதாரம்",
+  "westernNames": "மேற்கத்திய பெயர்கள்",
+  "regionalNames": "பிராந்திய பெயர்கள்",
+  "namesSource": "பெயர்களின் ஆதாரம்",
+  "namesSourceDesc": "இயல்பாக, இந்த தரவு வகை பெரும்பாலும் மேற்கத்திய பெயர்களை உருவாக்குகிறது. ஒரு குறிப்பிட்ட நாடு அல்லது நாடுகளுக்கு பொதுவான பெயர்களைக் குறிவைக்க, பிரதான தரவுக் கட்டத்தில், விருப்பங்கள் புலத்தின் வலதுபுறத்தில் உள்ள சிறிய \"உலகம்\" ஐகானைக் கிளிக் செய்யவும். இது ஒரு உரையாடலைத் திறக்கும், அங்கு நீங்கள் மூலத்தைத் தனிப்பயனாக்கலாம்.",
+  "defaultWesternNames": "இயல்பாக, இந்த தரவு வகை பெரும்பாலும் மேற்கத்திய பெயர்களை உருவாக்குகிறது",
+  "customizeSourceDesc": "இந்த தரவு வகை பெரும்பாலும் மேற்கத்திய பெயர்களை உருவாக்குகிறது, ஆனால் நீங்கள் ஒரு குறிப்பிட்ட பிராந்தியத்திற்கு மிகவும் பொருத்தமான பெயர்களை உருவாக்க விரும்பினால், கீழே நீங்கள் விரும்பும் நாடுகளைத் தேர்ந்தெடுக்கவும்.",
+  "customizeSource": "பெயர்களின் மூலத்தைத் தனிப்பயனாக்கு"
+}
diff --git a/packages/plugins/src/dataTypes/Names/i18n/zh.json b/packages/plugins/src/dataTypes/Names/i18n/zh.json
new file mode 100644
index 000000000..dc2cfd8fd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Names/i18n/zh.json
@@ -0,0 +1,31 @@
+{
+  "NAME": "名字",
+  "DESC": "此数据类型以您需要的任何格式生成人名。",
+  "DEFAULT_TITLE": "名称",
+  "help_intro": "您可以通过单击Enter指定多种格式。 以下字符串将被转换为其等效的随机名称：",
+  "name": "名称",
+  "example_FemaleName": "Jane (女名)",
+  "example_FemaleName_Surname": "Jane Smith",
+  "example_MaleName": "John (男性名字)",
+  "example_MaleName_Surname": "John Smith",
+  "example_Name": "Alex (任何性别)",
+  "example_Name4": "Jenny, Toby, Ben, Peter",
+  "example_Name_Initial_Surname": "Alex J. Smith",
+  "example_Name_Surname": "Alex Smith",
+  "example_Surname_Name_Initial": "Smith, John P.",
+  "example_fullnames": "Alex Smith or Alex J. Smith",
+  "example_surname": "Smith (姓)",
+  "type_FemaleName": "女名。",
+  "type_Initial": "大写字母A-Z。",
+  "type_MaleName": "男性名字。",
+  "type_Name": "男性或女性的名字。",
+  "type_Surname": "随机姓氏。",
+  "source": "来源",
+  "westernNames": "西方名字",
+  "regionalNames": "地区名称",
+  "namesSource": "名称来源",
+  "namesSourceDesc": "默认情况下，此数据类型主要生成西方名称。 要定位特定国家/地区常见的名称，请在主数据网格中，单击选项字段右侧的小“世界”图标。 这将打开一个对话框，您可以在其中自定义源。",
+  "defaultWesternNames": "默认情况下，此数据类型主要生成西方名称",
+  "customizeSourceDesc": "此数据类型主要生成西方名称，但如果您想生成更适合特定地区的名称，请在下方选择您想要的国家/地区。",
+  "customizeSource": "自定义名称来源"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.generate.ts b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.generate.ts
new file mode 100644
index 000000000..3a8ce286d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.generate.ts
@@ -0,0 +1,44 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+
+export const generate = ({ rowState }: DTGenerationData): DTGenerateResult => {
+	const { mean, sigma, precision } = rowState;
+
+	return {
+		display: gaussMs(mean, sigma).toFixed(precision)
+	};
+};
+
+// adjust our gaussian random to fit the mean and standard deviation. The division by 4 is an arbitrary value to help
+// fit the distribution within our required range, and gives a best fit for stddev = 1.0
+export const gaussMs = (mean: number, stddev: number): number => gauss() * (stddev / 4) + mean;
+
+let useExists = false;
+let useValue: number;
+
+export const gauss = (): number => {
+	if (useExists) {
+		// use value from a previous call to this function
+		useExists = false;
+		return useValue;
+	} else {
+		// polar form of the Box-Muller transformation
+		let w = 2.0;
+		let x = 0;
+		let y = 0;
+		while (w >= 1 || w === 0.0) {
+			x = randomPN();
+			y = randomPN();
+			w = (x * x) + (y * y);
+		}
+		w = Math.sqrt((-2.0 * Math.log(w)) / w);
+
+		// set value for next call to this function
+		useValue = y * w;
+		useExists = true;
+
+		return x * w;
+	}
+};
+
+// returns random number with a flat distribution from -1 to 1 inclusive
+export const randomPN = (): number => (2.0 * Math.random()) - 1.0;
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.scss b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.scss
new file mode 100644
index 000000000..e096fc44c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.scss
@@ -0,0 +1,8 @@
+.options {
+	label {
+		margin-right: 2px;
+	}
+	input {
+		margin-right: 2px;
+	}
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.scss.d.ts b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.scss.d.ts
new file mode 100644
index 000000000..eae7c8de3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace NormalDistributionScssNamespace {
+  export interface INormalDistributionScss {
+    options: string;
+  }
+}
+
+declare const NormalDistributionScssModule: NormalDistributionScssNamespace.INormalDistributionScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: NormalDistributionScssNamespace.INormalDistributionScss;
+};
+
+export = NormalDistributionScssModule;
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.state.tsx b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.state.tsx
new file mode 100644
index 000000000..ee6440c13
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.state.tsx
@@ -0,0 +1,15 @@
+export type NormalDistributionState = {
+	mean: number;
+	sigma: number;
+	precision: number;
+};
+
+export type GenerationOptionsType = NormalDistributionState;
+
+export const initialState: NormalDistributionState = {
+	mean: 0,
+	sigma: 1,
+	precision: 10
+};
+
+export const defaultGenerationOptions = initialState;
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.tsx b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.tsx
new file mode 100644
index 000000000..110a3c319
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.tsx
@@ -0,0 +1,49 @@
+import * as React from 'react';
+import { DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import styles from './NormalDistribution.scss';
+
+export const Options = ({ i18n, id, data, onUpdate }: DTOptionsProps) => {
+  const onChange = (field: string, value: string): void => {
+    onUpdate({
+      ...data,
+      [field]: value ? parseInt(value, 10) : ''
+    });
+  };
+
+  return (
+    <div className={styles.options}>
+      <label htmlFor={`${id}-mean`}>{i18n.mean}</label>
+      <input
+        type="number"
+        id={`${id}-mean`}
+        style={{ width: 45 }}
+        value={data.mean}
+        onChange={(e: any): void => onChange('mean', e.target.value)}
+      />
+      <label htmlFor={`${id}-sigma`}>{i18n.standardDeviation}</label>
+      <input
+        type="number"
+        id={`${id}-sigma`}
+        style={{ width: 45 }}
+        value={data.sigma}
+        onChange={(e: any): void => onChange('sigma', e.target.value)}
+      />
+      <label htmlFor={`${id}-precision`} title="Number of decimal places.">
+        {i18n.precision}
+      </label>
+      <input
+        type="number"
+        id={`${id}-precision`}
+        style={{ width: 45 }}
+        value={data.precision}
+        onChange={(e: any): void => onChange('precision', e.target.value)}
+      />
+    </div>
+  );
+};
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'varchar(100)'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.worker.ts b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.worker.ts
new file mode 100644
index 000000000..460167d79
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/NormalDistribution.worker.ts
@@ -0,0 +1,6 @@
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './NormalDistribution.generate';
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/README.md b/packages/plugins/src/dataTypes/NormalDistribution/README.md
new file mode 100644
index 000000000..142cf6a4a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/README.md
@@ -0,0 +1,38 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; NormalDistribution
+
+This Data Type generates a random distribution based on a mean and a standard deviation.
+
+
+### Example API Usage
+
+Just POST the following JSON content to: 
+`http://[your site]/[generate data folder]/api/v1/data`
+
+```javascript
+{
+    "numRows": 50,
+    "rows": [
+        {
+            "type": "NormalDistribution",
+            "title": "val",
+            "settings": {
+                "mean": "0.7",
+                "sigma": "1",
+                "precision": "3"
+            }
+        }
+    ],
+    "export": {
+        "type": "JSON",
+        "settings": {
+            "stripWhitespace": false,
+            "dataStructureFormat": "simple"
+        }
+    }
+}
+```
+ 
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/__tests__/NormalDistribution.test.tsx b/packages/plugins/src/dataTypes/NormalDistribution/__tests__/NormalDistribution.test.tsx
new file mode 100644
index 000000000..54ffe9ed6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/__tests__/NormalDistribution.test.tsx
@@ -0,0 +1,28 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Options } from '../NormalDistribution';
+const i18n = require('../i18n/en.json');
+
+const optionsProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	gridPanelDimensions: { width: 100, height: 100 },
+	isCountryNamesLoaded: false,
+	isCountryNamesLoading: false,
+	countryNamesMap: null
+};
+
+describe('Options', () => {
+	it('renders', () => {
+		const { container } = render(
+			<Options
+				{...optionsProps}
+				data={{}}
+				onUpdate={() => {}}
+			/>
+		);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/bundle.ts b/packages/plugins/src/dataTypes/NormalDistribution/bundle.ts
new file mode 100644
index 000000000..b11c9e5de
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/bundle.ts
@@ -0,0 +1,11 @@
+import { DTBundle } from '~types/dataTypes';
+import { Options, getMetadata } from './NormalDistribution';
+import { initialState } from './NormalDistribution.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Options,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/config.ts b/packages/plugins/src/dataTypes/NormalDistribution/config.ts
new file mode 100644
index 000000000..6171e75c1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'numeric',
+  fieldGroupOrder: 35
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/ar.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/ar.json
new file mode 100644
index 000000000..f4787f093
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/ar.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "التوزيع الطبيعي",
+  "DESC": "يولد قيمًا عشوائية موزعة بشكل طبيعي بمتوسط قابل للتخصيص وانحراف معياري.",
+  "DEFAULT_TITLE": "normaldist",
+  "mean": "متوسط",
+  "standardDeviation": "معيار التنمية.",
+  "precision": "الاحكام"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/de.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/de.json
new file mode 100644
index 000000000..400331137
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/de.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Standardabweichung",
+  "DESC": "Erzeugt ZufallsnormalverteiltenWerten mit einem kundengerechten Mittelwert und Standardabweichung .",
+  "DEFAULT_TITLE": "feld",
+  "mean": "Bedeuten",
+  "precision": "Präzision",
+  "standardDeviation": "Standardabweichung"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/en.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/en.json
new file mode 100644
index 000000000..9ac162712
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/en.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Normal Distribution",
+  "DESC": "Generates random normally distributed values with a customizable mean and standard deviation.",
+  "DEFAULT_TITLE": "normaldist",
+  "mean": "Mean",
+  "standardDeviation": "Standard Dev.",
+  "precision": "Precision"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/es.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/es.json
new file mode 100644
index 000000000..9e8b1fcce
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/es.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Distribución normal",
+  "DESC": "Genera valores normalmente distribuidos al azar con una desviación media y estándar adaptable .",
+  "DEFAULT_TITLE": "campo",
+  "mean": "Media",
+  "standardDeviation": "Desviación estándar",
+  "precision": "Precisión"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/fr.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/fr.json
new file mode 100644
index 000000000..d8196436a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/fr.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Distribution Normale",
+  "DESC": "Génère des valeurs aléatoires normalement distribuées avec un écart moyen et l'écart personnalisable .",
+  "DEFAULT_TITLE": "champ",
+  "mean": "Moyenne",
+  "standardDeviation": "Écart type",
+  "precision": "Précision"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/hi.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/hi.json
new file mode 100644
index 000000000..4dae5feb3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/hi.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "सामान्य वितरण",
+  "DESC": "अनुकूलन योग्य माध्य और मानक विचलन के साथ यादृच्छिक सामान्य रूप से वितरित मान उत्पन्न करता है।",
+  "DEFAULT_TITLE": "normaldist",
+  "mean": "माध्य",
+  "standardDeviation": "मानक विचलन",
+  "precision": "शुद्धता"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/ja.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/ja.json
new file mode 100644
index 000000000..efaf03c91
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/ja.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "正規分布",
+  "DESC": "カスタマイズ可能な平均と標準偏差を持つランダムな正規分布値を生成します。",
+  "DEFAULT_TITLE": "正規分布",
+  "mean": "平均",
+  "standardDeviation": "標準偏差",
+  "precision": "精度"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/nl.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/nl.json
new file mode 100644
index 000000000..00fb87250
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/nl.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Normaal Distributie",
+  "DESC": "Toevalsgetallen normaal waarden met een aanpasbare gemiddelde en de standaarddeviatie .",
+  "DEFAULT_TITLE": "veld",
+  "mean": "Signifier",
+  "standardDeviation": "Écart type",
+  "precision": "Précision"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/pt.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/pt.json
new file mode 100644
index 000000000..43ff31adf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/pt.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Distribuição normal",
+  "DESC": "Gera valores aleatórios normalmente distribuídos com uma média e desvio padrão personalizáveis.",
+  "DEFAULT_TITLE": "distnormal",
+  "mean": "média",
+  "standardDeviation": "Desvio padrão",
+  "precision": "Precisão"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/ru.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/ru.json
new file mode 100644
index 000000000..bbfc201b2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/ru.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Нормальное распределение",
+  "DESC": "Генерирует случайные нормально распределенные значения с настраиваемыми средним значением и стандартным отклонением.",
+  "DEFAULT_TITLE": "normaldist",
+  "mean": "средняя величина",
+  "standardDeviation": "Стандартное отклонение",
+  "precision": "Точность"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/ta.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/ta.json
new file mode 100644
index 000000000..073837189
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/ta.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "இயல்பான விநியோகம்",
+  "DESC": "தனிப்பயனாக்கக்கூடிய சராசரி மற்றும் நிலையான விலகலுடன் சீரற்ற பொதுவாக விநியோகிக்கப்பட்ட மதிப்புகளை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "normaldist",
+  "mean": "கருத்து",
+  "standardDeviation": "நிலையான தேவ்.",
+  "precision": "துல்லியம்"
+}
diff --git a/packages/plugins/src/dataTypes/NormalDistribution/i18n/zh.json b/packages/plugins/src/dataTypes/NormalDistribution/i18n/zh.json
new file mode 100644
index 000000000..917ec0908
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NormalDistribution/i18n/zh.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "正态分布",
+  "DESC": "生成具有可自定义平均值和标准偏差的随机正态分布值。",
+  "DEFAULT_TITLE": "normaldist",
+  "mean": "意思",
+  "standardDeviation": "标准开发",
+  "precision": "精确"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/NumberRange.generate.ts b/packages/plugins/src/dataTypes/NumberRange/NumberRange.generate.ts
new file mode 100644
index 000000000..b1cb7bffb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/NumberRange.generate.ts
@@ -0,0 +1,10 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = ({ rowState }: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { min, max } = rowState;
+
+  return {
+    display: utils.randomUtils.getRandomNum(min, max)
+  };
+};
diff --git a/packages/plugins/src/dataTypes/NumberRange/NumberRange.state.tsx b/packages/plugins/src/dataTypes/NumberRange/NumberRange.state.tsx
new file mode 100755
index 000000000..113064069
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/NumberRange.state.tsx
@@ -0,0 +1,16 @@
+export type NumberRangeState = {
+	min: number;
+	max: number;
+};
+
+export const initialState: NumberRangeState = {
+	min: 0,
+	max: 10
+};
+
+export const defaultGenerationOptions = initialState;
+
+export type GenerationOptionsType = {
+	min?: number;
+	max?: number;
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/NumberRange.tsx b/packages/plugins/src/dataTypes/NumberRange/NumberRange.tsx
new file mode 100755
index 000000000..b229ffb53
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/NumberRange.tsx
@@ -0,0 +1,100 @@
+import * as React from 'react';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import { NumberRangeState } from './NumberRange.state';
+import TextField from '~components/TextField';
+
+export const rowStateReducer = (state: NumberRangeState): NumberRangeState => state;
+
+export const Options = ({ data, i18n, onUpdate }: DTOptionsProps) => {
+  const onChange = (field: string, value: string): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  let minFieldError = '';
+  if (data.min === '') {
+    minFieldError = i18n.enterNumericValue;
+  }
+
+  let maxFieldError = '';
+  if (data.max === '') {
+    maxFieldError = i18n.enterNumericValue;
+  }
+  if (data.min !== '' && data.max !== '') {
+    const min = parseInt(data.min, 10);
+    const max = parseInt(data.max, 10);
+    if (min > max) {
+      maxFieldError = i18n.minValueGreaterThanMax;
+    }
+  }
+
+  return (
+    <div>
+      {i18n.between}
+      <TextField
+        type="number"
+        error={minFieldError}
+        style={{ width: 50, marginLeft: 2, marginRight: 2 }}
+        min={0}
+        value={data.min}
+        onChange={(e: any): void => onChange('min', e.target.value)}
+      />
+      {i18n.and}
+      <TextField
+        type="number"
+        error={maxFieldError}
+        style={{ width: 50, marginLeft: 2 }}
+        min={0}
+        value={data.max}
+        onChange={(e: any): void => onChange('max', e.target.value)}
+      />
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.DESC}</p>;
+
+// var _validate = function(rows) {
+// 	var visibleProblemRows = [];
+// 	var problemFields      = [];
+//
+// 	var intOnly = /^[\-\d]+$/;
+// 	for (var i=0; i<rows.length; i++) {
+// 		var numWordsMin = $.trim($("#dtNumRangeMin_" + rows[i]).val());
+// 		var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
+//
+// 		var hasError = false;
+// 		if (numWordsMin === "" || !intOnly.test(numWordsMin)) {
+// 			hasError = true;
+// 			problemFields.push($("#dtNumRangeMin_" + rows[i]));
+// 		}
+// 		var numWordsMax = $.trim($("#dtNumRangeMax_" + rows[i]).val());
+// 		if (numWordsMax === "" || !intOnly.test(numWordsMax)) {
+// 			hasError = true;
+// 			problemFields.push($("#dtNumRangeMax_" + rows[i]));
+// 		}
+// 		if (hasError) {
+// 			visibleProblemRows.push(visibleRowNum);
+// 		}
+// 	}
+//
+// 	var errors = [];
+// 	if (visibleProblemRows.length) {
+// 		errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
+// 	}
+// 	return errors;
+// };
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'number'
+  },
+  sql: {
+    field: 'mediumint default NULL',
+    field_Oracle: 'varchar2(50) default NULL',
+    field_MSSQL: 'INTEGER NULL',
+    field_Postgres: 'integer NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/NumberRange/NumberRange.worker.ts b/packages/plugins/src/dataTypes/NumberRange/NumberRange.worker.ts
new file mode 100644
index 000000000..30ffba747
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/NumberRange.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './NumberRange.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/NumberRange/README.md b/packages/plugins/src/dataTypes/NumberRange/README.md
new file mode 100644
index 000000000..0446505c9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/README.md
@@ -0,0 +1,74 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; NumberRange
+
+This Data Type generates a number.
+
+
+### Examples
+
+This example generates 2 pieces of data:
+- a random number between 1 and 100.
+- a random number between -10000 and -20000.
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'NumberRange',
+            title: 'num1',
+            settings: {
+                min: 1,
+                max: 100
+            }
+        },
+        {
+            plugin: 'NumberRange',
+            title: 'num2',
+            settings: {
+                min: -10000,
+                max: -20000
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+ 
+Sample output:
+
+```
+[
+    {
+        "num1": 100,
+        "num2": -2811
+    },
+    {
+        "num1": 23,
+        "num2": -4337
+    },
+    {
+        "num1": 89,
+        "num2": -8604
+    },
+    {
+        "num1": 72,
+        "num2": -9465
+    },
+    {
+        "num1": 8,
+        "num2": -2012
+    },
+    {
+        "num1": 4,
+        "num2": -8977
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/NumberRange/__tests__/NumberRange.ui.test.tsx b/packages/plugins/src/dataTypes/NumberRange/__tests__/NumberRange.ui.test.tsx
new file mode 100644
index 000000000..fe8a801b8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/__tests__/NumberRange.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../NumberRange';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/NumberRange/bundle.ts b/packages/plugins/src/dataTypes/NumberRange/bundle.ts
new file mode 100644
index 000000000..94140a61c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/bundle.ts
@@ -0,0 +1,13 @@
+import { DTBundle } from '~types/dataTypes';
+import { rowStateReducer, Help, Options, getMetadata } from './NumberRange';
+import { initialState } from './NumberRange.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Options,
+	Help,
+	rowStateReducer,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/NumberRange/config.ts b/packages/plugins/src/dataTypes/NumberRange/config.ts
new file mode 100644
index 000000000..d0e84e8ff
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'numeric',
+  fieldGroupOrder: 30
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/ar.json b/packages/plugins/src/dataTypes/NumberRange/i18n/ar.json
new file mode 100644
index 000000000..ee915d53c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/ar.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "نطاق العدد",
+  "DESC": "يقوم هذا بشكل عشوائي بإنشاء رقم بين القيم التي تحددها. كلا الحقلين يسمحان لك بإدخال أرقام سالبة.",
+  "DEFAULT_TITLE": "ترقيم",
+  "and": "و",
+  "between": "ما بين",
+  "enterNumericValue": "الرجاء إدخال رقم",
+  "minValueGreaterThanMax": "يرجى جعل القيمة القصوى أكبر من أو تساوي الحد الأدنى للقيمة"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/de.json b/packages/plugins/src/dataTypes/NumberRange/i18n/de.json
new file mode 100644
index 000000000..81c0d6c1f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/de.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "Nummernkreis",
+  "DESC": "Diese zufällig generiert eine Zahl zwischen den Werten, die Sie angeben. Beide Felder können Sie negative Werte eingeben.",
+  "DEFAULT_TITLE": "nummernkreis",
+  "and": "und",
+  "between": "Zwischen",
+  "enterNumericValue": "Bitte geben Sie einen numerischen Wert ein",
+  "minValueGreaterThanMax": "Bitte machen Sie den Maximalwert größer als den Minimalwert"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/en.json b/packages/plugins/src/dataTypes/NumberRange/i18n/en.json
new file mode 100644
index 000000000..5a18d1c55
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/en.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "Number Range",
+  "DESC": "This randomly generates a number between the values you specify. Both fields allow you to enter negative numbers.",
+  "DEFAULT_TITLE": "numberrange",
+  "and": "and",
+  "between": "Between",
+  "enterNumericValue": "Please enter a number",
+  "minValueGreaterThanMax": "Please make the max value larger than or equal to the min value"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/es.json b/packages/plugins/src/dataTypes/NumberRange/i18n/es.json
new file mode 100644
index 000000000..734ef9616
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/es.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "Rango numérico",
+  "DESC": "Este tipo genera un número aleatorio entre los valores que especifiques. Ambos campos permite introducir números negativos.",
+  "DEFAULT_TITLE": "rangonumeros",
+  "and": "y",
+  "between": "Entre",
+  "enterNumericValue": "Por favor, introduzca un valor numérico",
+  "minValueGreaterThanMax": "Haz que el valor máximo sea mayor que el valor mínimo"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/fr.json b/packages/plugins/src/dataTypes/NumberRange/i18n/fr.json
new file mode 100644
index 000000000..d2a199195
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/fr.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "Plage de numéros",
+  "DESC": "Cela génère au hasard un nombre entre les valeurs que vous spécifiez. Les deux champs vous permettent d'entrer des nombres négatifs.",
+  "DEFAULT_TITLE": "plagenumeros",
+  "and": "et",
+  "between": "Entre",
+  "enterNumericValue": "Veuillez saisir une valeur numérique",
+  "minValueGreaterThanMax": "Veuillez rendre la valeur maximale supérieure à la valeur minimale"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/hi.json b/packages/plugins/src/dataTypes/NumberRange/i18n/hi.json
new file mode 100644
index 000000000..61a1b1019
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/hi.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "संख्या सीमा",
+  "DESC": "यह बेतरतीब ढंग से आपके द्वारा निर्दिष्ट मानों के बीच एक संख्या उत्पन्न करता है। दोनों फ़ील्ड आपको ऋणात्मक संख्याएँ दर्ज करने देती हैं।",
+  "DEFAULT_TITLE": "numberrange",
+  "and": "तथा",
+  "between": "बीच में",
+  "enterNumericValue": "एक संख्या दर्ज करें",
+  "minValueGreaterThanMax": "कृपया अधिकतम मान को न्यूनतम मान से बड़ा या उसके बराबर करें"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/ja.json b/packages/plugins/src/dataTypes/NumberRange/i18n/ja.json
new file mode 100644
index 000000000..b7a7989a6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/ja.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "番号の範囲",
+  "DESC": "これにより、指定した値の間にランダムに数値が生成されます。 どちらのフィールドでも、負の数を入力できます。",
+  "DEFAULT_TITLE": "番号の範囲",
+  "and": "そして",
+  "between": "の間に",
+  "enterNumericValue": "数値を入力してください",
+  "minValueGreaterThanMax": "最大値を最小値より大きくしてください"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/nl.json b/packages/plugins/src/dataTypes/NumberRange/i18n/nl.json
new file mode 100644
index 000000000..8dc8a86aa
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/nl.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "Nummer Range",
+  "DESC": "Dit genereert een willekeurig getal tussen de waarden die u opgeeft. In beide velden kunt u een negatieve waarde invoeren.",
+  "DEFAULT_TITLE": "nummerbereik",
+  "and": "en",
+  "between": "Tussen",
+  "enterNumericValue": "Voer een numerieke waarde in",
+  "minValueGreaterThanMax": "Maak de maximale waarde groter dan de minimale waarde"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/pt.json b/packages/plugins/src/dataTypes/NumberRange/i18n/pt.json
new file mode 100644
index 000000000..814424d4b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/pt.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "Faixa de Números",
+  "DESC": "Isso gera aleatoriamente um número entre os valores que você especifica. Ambos os campos permitem que você insira números negativos.",
+  "DEFAULT_TITLE": "faixanumero",
+  "and": "e",
+  "between": "Entre",
+  "enterNumericValue": "Por favor, coloque um numero",
+  "minValueGreaterThanMax": "Faça o valor máximo maior ou igual ao valor mínimo"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/ru.json b/packages/plugins/src/dataTypes/NumberRange/i18n/ru.json
new file mode 100644
index 000000000..a20a2e19a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/ru.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "Диапазон номеров",
+  "DESC": "Это случайным образом генерирует число между указанными вами значениями. Оба поля позволяют вводить отрицательные числа.",
+  "DEFAULT_TITLE": "numberrange",
+  "and": "а также",
+  "between": "Между",
+  "enterNumericValue": "Пожалуйста, введите номер",
+  "minValueGreaterThanMax": "Пожалуйста, сделайте максимальное значение больше или равным минимальному значению"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/ta.json b/packages/plugins/src/dataTypes/NumberRange/i18n/ta.json
new file mode 100644
index 000000000..248dac5c9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/ta.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "எண் வரம்பு",
+  "DESC": "இது நீங்கள் குறிப்பிடும் மதிப்புகளுக்கு இடையில் தோராயமாக ஒரு எண்ணை உருவாக்குகிறது. இரண்டு புலங்களும் எதிர்மறை எண்களை உள்ளிட உங்களை அனுமதிக்கின்றன.",
+  "DEFAULT_TITLE": "எண்",
+  "and": "மற்றும்",
+  "between": "இடையில்",
+  "enterNumericValue": "எண் மதிப்பை உள்ளிடவும்",
+  "minValueGreaterThanMax": "அதிகபட்ச மதிப்பை நிமிட மதிப்பை விட பெரிதாக்கவும்"
+}
diff --git a/packages/plugins/src/dataTypes/NumberRange/i18n/zh.json b/packages/plugins/src/dataTypes/NumberRange/i18n/zh.json
new file mode 100644
index 000000000..149f2814d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/NumberRange/i18n/zh.json
@@ -0,0 +1,9 @@
+{
+  "NAME": "编号范围",
+  "DESC": "这将在您指定的值之间随机生成一个数字。 这两个字段均允许您输入负数。",
+  "DEFAULT_TITLE": "数字范围",
+  "and": "和",
+  "between": "之间",
+  "enterNumericValue": "请输入一个数值",
+  "minValueGreaterThanMax": "请使最大值大于最小值"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.generate.ts b/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.generate.ts
new file mode 100644
index 000000000..55e79b898
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.generate.ts
@@ -0,0 +1,88 @@
+import { DTGenerateResult } from '~types/dataTypes';
+
+// data: GenerationData
+export const generate = (): DTGenerateResult => {
+	return { display: '' };
+};
+
+
+/*
+	private $generatedOrgNrs = array();
+	static $sep = "-";
+
+	 * Generate a random personal number, and return the display string and additional meta data for use
+	 * by any other Data Type.
+	public function generate($generator, $generationContextData) {
+		$generationOptions = $generationContextData["generationOptions"];
+
+		// Default, 10 siffers + '-'
+		// TODO: support several countries?
+                static::$sep = self::getOrganisationNumberSeparator($generationOptions["cc_separator"]);
+
+		$orgnr = $this->generateRandomSwedishOrganisationNumber(static::$sep);
+
+		// pretty sodding unlikely, but just in case!
+		while (in_array($orgnr, $this->generatedOrgNrs)) {
+			$orgnr = $this->generateRandomSwedishOrganisationNumber(static::$sep);
+		}
+		$this->generatedOrgNrs[] = $orgnr;
+		return array(
+			"display" => $orgnr
+		);
+	}
+
+	// TODO: add support for separator
+	// TODO: add support for organisation numbers
+	private static function generateRandomSwedishOrganisationNumber($sep) {
+		$new_str = "";
+		$rand = 0;
+
+		$cnt = 11;	// 10 siffers + 1 increment for separator
+
+		for ($i=0; $i<$cnt; $i++) {
+			switch ($i) {
+				case 0:
+					$rand = mt_rand(0, 99);
+					$new_str .= sprintf("%02d", $rand);
+					break;
+				case 2:
+					$rand = mt_rand(20, 99);
+					$new_str .= sprintf("%02d", $rand);
+					break;
+				case 4:
+					$rand = mt_rand(0, 99);
+					$new_str .= sprintf("%02d", $rand);
+					break;
+				case 6:
+					$new_str .= $sep;
+					break;
+				case 7:
+					$rand = mt_rand(0, 999);
+					$new_str .= sprintf("%03d", $rand);
+					break;
+				case 10:
+					// Same calculation as for personal numbers
+					// TODO: move to Utils??
+					$ctrl = DataType_PersonalNumber::recalcCtrl($new_str . "0", $sep);
+					$new_str .= sprintf("%01d", $ctrl);
+					break;
+				default:
+					break;
+			}
+		}
+
+		return $new_str;
+	}
+
+	private static function getOrganisationNumberSeparator($separators) {
+		$separatorList = explode("|", $separators);
+		$chosenSep = $separatorList[rand(0, count($separatorList)-1)];
+
+		// if no separator was entered use '' as default
+		if ($separators == "") {
+			$chosenSep = "";
+		}
+		return $chosenSep;
+	}
+
+*/
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.state.tsx b/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.state.tsx
new file mode 100644
index 000000000..c82162254
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.state.tsx
@@ -0,0 +1,11 @@
+export type OrganizationNumberState = {
+	example: string;
+	separator: string;
+};
+
+export const initialState: OrganizationNumberState = {
+	example: '',
+	separator: ' '
+};
+
+export const defaultGenerationOptions = {};
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.tsx b/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.tsx
new file mode 100644
index 000000000..d7d93b0cf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.tsx
@@ -0,0 +1,130 @@
+import * as React from 'react';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import Dropdown from '~components/dropdown/Dropdown';
+
+export const Example = ({ i18n, data, onUpdate }: DTExampleProps) => {
+  const onChange = (value: any): void => {
+    onUpdate({
+      example: value,
+      value: value
+    });
+  };
+
+  const options = [
+    { value: 'OrganisationNumberWithoutHyphen', label: i18n.example_OrganisationNumberWithoutHyphen },
+    { value: 'OrganisationNumberWithHyphen', label: i18n.example_OrganisationNumberWithHyphen }
+  ];
+
+  return <Dropdown value={data.example} onChange={(i: any): void => onChange(i.value)} options={options} />;
+};
+
+export const Options = ({ id, data, onUpdate, i18n }: DTOptionsProps) => {
+  const onChange = (separator: string): void => {
+    onUpdate({
+      ...data,
+      separator
+    });
+  };
+
+  return (
+    <span>
+      {i18n.separators}
+      <input
+        type="text"
+        id={`${id}-separator`}
+        style={{ width: 78 }}
+        value={data.separator}
+        title={i18n.separator_help}
+        onChange={(e): void => onChange(e.target.value)}
+      />
+    </span>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p>
+      {i18n.DESC}
+      {i18n.help_text}
+    </p>
+
+    <table cellPadding="0" cellSpacing="1">
+      <tbody>
+        <tr>
+          <td>
+            <h4>OrganisationNumberWithoutHyphen</h4>
+          </td>
+          <td>{i18n.type_OrganisationNumberWithoutHyphen}</td>
+        </tr>
+        <tr>
+          <td>
+            <h4>OrganisationNumberWithHyphen</h4>
+          </td>
+          <td>{i18n.type_OrganisationNumberWithHyphen}</td>
+        </tr>
+      </tbody>
+    </table>
+  </>
+);
+
+export const getMetadata = (): DTMetadata => {
+  // Called before separator is set, so margin should be used
+  // $len = 10 + strlen(static::$sep);
+  const len = 11; // Should be enough, allow for max one char sep
+  return {
+    sql: {
+      field: `varchar(${len}) default NULL`,
+      field_Oracle: `varchar2(${len}) default NULL`,
+      field_MSSQL: `VARCHAR(${len}) NULL`
+    }
+  };
+};
+
+// var _exampleChange = function (msg) {
+// 	var rowID = msg.rowID;
+// 	var selectedFormat = msg.value;
+//
+// 	var $separatorField = $("#dtOptionOrganisationNumber_sep_" + rowID);
+//
+// 	switch (selectedFormat) {
+// 		case "OrganisationNumberWithoutHyphen":
+// 			$separatorField.val("");
+// 			break;
+//
+// 		case "OrganisationNumberWithHyphen":
+// 			$separatorField.val("-");
+// 			break;
+//
+// 		default:
+// 			//$separatorField.val(selectedFormat);
+// 			break;
+//
+// 	}
+// };
+
+/**
+ * Called when the user submits the form to generate some data. If the selected data set contains
+ * one or more rows of this data type, this function is called with the list of row numbers. Note that
+ * the row numbers passed are the *original* row numbers of the rows on creation. It's possible that the
+ * user has re-sorted or deleted some rows. So to get the visible row number for a row, call
+ * gen._getVisibleRowOrderByRowNum(row)
+ */
+// var _validate = function (rows) {
+// 	var visibleProblemRows = [];
+// 	var problemFields = [];
+// 	for (var i = 0; i < rows.length; i++) {
+// 		if ($("#dtOption_" + rows[i]).val() === "") {
+// 			var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
+// 			visibleProblemRows.push(visibleRowNum);
+// 			problemFields.push($("#dtOption_" + rows[i]));
+// 		}
+// 	}
+// 	var errors = [];
+// 	if (visibleProblemRows.length) {
+// 		errors.push({
+// 			els: problemFields,
+// 			error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"
+// 		});
+// 	}
+// 	return errors;
+// };
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.worker.ts b/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.worker.ts
new file mode 100644
index 000000000..6b6135fbb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/OrganizationNumber.worker.ts
@@ -0,0 +1,5 @@
+import { generate } from './OrganizationNumber.generate';
+
+export const onmessage = () => {
+	postMessage(generate());
+};
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/README.md b/packages/plugins/src/dataTypes/OrganizationNumber/README.md
new file mode 100644
index 000000000..ced66c22c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/README.md
@@ -0,0 +1,7 @@
+## Organization Number
+
+This Data Type generates a random organisation number, used in some countries for registration of companies, associations etc...
+
+### Example API Usage
+
+Not available.
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/__tests__/OrganizationNumber.test.tsx b/packages/plugins/src/dataTypes/OrganizationNumber/__tests__/OrganizationNumber.test.tsx
new file mode 100644
index 000000000..ededb38bc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/__tests__/OrganizationNumber.test.tsx
@@ -0,0 +1,41 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help, Options } from '../OrganizationNumber';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+const optionsProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	gridPanelDimensions: { width: 100, height: 100 },
+	isCountryNamesLoaded: false,
+	isCountryNamesLoading: false,
+	countryNamesMap: null
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
+
+describe('Options', () => {
+	it('renders', () => {
+		const { container } = render(
+			<Options
+				{...optionsProps}
+				data={{}}
+				onUpdate={() => {}}
+			/>
+		);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/bundle.ts b/packages/plugins/src/dataTypes/OrganizationNumber/bundle.ts
new file mode 100644
index 000000000..48bf9b376
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/bundle.ts
@@ -0,0 +1,13 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, getMetadata } from './OrganizationNumber';
+import { initialState } from './OrganizationNumber.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/config.ts b/packages/plugins/src/dataTypes/OrganizationNumber/config.ts
new file mode 100644
index 000000000..4a6e452cb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'countrySpecific',
+  fieldGroupOrder: 40
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ar.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ar.json
new file mode 100644
index 000000000..f089b16ce
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ar.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Organisation Number",
+  "DESC": "Generates organisation numbers, used in some countries for registration of companies, associations etc.",
+  "DEFAULT_TITLE": "orgnumber",
+  "help_text": "At the present time only Swedish ones are supported. The organisation numbers are generated according to the format you specify:",
+  "incomplete_fields": "The Organisation Number Data Type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "A (Swedish) organisation number with 12 siffers and no hyphen",
+  "type_OrganisationNumberWithHyphen": "A (Swedish) organisation number with 12 siffers and a hyphen",
+  "separators": "Separators:",
+  "separator_help": "The characters you enter here will be used as separator in the organisation number fields. Note: you can mix several separators, use | to separate them (for example -|+)"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/de.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/de.json
new file mode 100644
index 000000000..dac7a43e8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/de.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Organisation Anzahl",
+  "DESC": "Erzeugt Organisation Zahlen in einigen Ländern für die Registrierung von Unternehmen, Verbänden , etc. verwendet",
+  "DEFAULT_TITLE": "nummer",
+  "help_text": "In der heutigen Zeit nur schwedische diejenigen unterstützt werden. Die Organisation Zahlen werden nach dem Format, das Sie angeben, generiert:",
+  "incomplete_fields": "Die Organisation Nummer Datentyp muss den im Textfeld eingegebenen Optionen Format haben . Bitte korrigieren Sie die folgenden Zeilen :",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "A (Swedish) Organisation Anzahl mit 12 siffers und ohne Bindestrich",
+  "type_OrganisationNumberWithHyphen": "A (Swedish) Organisation Anzahl mit 12 siffers und einem Bindestrich",
+  "separators": "Abscheider :",
+  "separator_help": "Die Zeichen, die Sie hier eingeben, wird als Trennzeichen in der Organisation Zahlenfeldern verwendet werden. Hinweis: Sie können mehrere Trennzeichen zu mischen, zu verwenden | um sie zu trennen (zum Beispiel - | +)"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/en.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/en.json
new file mode 100644
index 000000000..f089b16ce
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/en.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Organisation Number",
+  "DESC": "Generates organisation numbers, used in some countries for registration of companies, associations etc.",
+  "DEFAULT_TITLE": "orgnumber",
+  "help_text": "At the present time only Swedish ones are supported. The organisation numbers are generated according to the format you specify:",
+  "incomplete_fields": "The Organisation Number Data Type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "A (Swedish) organisation number with 12 siffers and no hyphen",
+  "type_OrganisationNumberWithHyphen": "A (Swedish) organisation number with 12 siffers and a hyphen",
+  "separators": "Separators:",
+  "separator_help": "The characters you enter here will be used as separator in the organisation number fields. Note: you can mix several separators, use | to separate them (for example -|+)"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/es.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/es.json
new file mode 100644
index 000000000..8b2622d38
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/es.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Número Organización",
+  "DESC": "Genera números de organización , que se utiliza en algunos países para el registro de empresas , asociaciones , etc.",
+  "DEFAULT_TITLE": "numero",
+  "help_text": "En la actualidad sólo se admiten los suecos. Los números de la organización se generan de acuerdo con el formato que se especifica :",
+  "incomplete_fields": "El tipo de datos Número organización tiene que tener el formato especificado en el campo de texto Opciones . Por favor, corrija los siguientes filas :",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "Un (sueco ) Número de organización con 12 siffers y sin guión",
+  "type_OrganisationNumberWithHyphen": "Un (sueco ) Número de organización con 12 siffers y un guión",
+  "separators": "Separadores :",
+  "separator_help": "Los caracteres que introduzca aquí se utilizará como separador de los campos de número de organizaciones . Nota: usted puede mezclar varios separadores , utilice | para separarlos ( por ejemplo - | +)"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/fr.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/fr.json
new file mode 100644
index 000000000..ea0a09b57
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/fr.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Nombre d' Organisation",
+  "DESC": "Génère des numéros de l'organisation , utilisées dans certains pays pour l'enregistrement des entreprises , associations, etc.",
+  "DEFAULT_TITLE": "nombre",
+  "help_text": "À l'heure actuelle seuls suédoises sont pris en charge . Les numéros de l'organisation sont générées selon le format que vous spécifiez :",
+  "incomplete_fields": "L' Organisation Nombre Type de données doit avoir le format entré dans le champ de texte Options. S'il vous plaît fixer les lignes suivantes :",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "Un ( suédois) le numéro de l'organisation avec 12 siffers et sans trait d'union",
+  "type_OrganisationNumberWithHyphen": "Un ( suédois) le numéro de l'organisation avec 12 siffers et un trait d'union",
+  "separators": "Séparateurs :",
+  "separator_help": "Les caractères que vous entrez ici seront utilisés comme séparateur dans les champs de numéro de l'organisation . Remarque : vous pouvez mélanger plusieurs séparateurs , utilisez | pour les séparer ( par exemple - | + )"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/hi.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/hi.json
new file mode 100644
index 000000000..62ded395f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/hi.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "संगठन संख्या",
+  "DESC": "कुछ देशों में कंपनियों, संघों आदि के पंजीकरण के लिए उपयोग की जाने वाली संगठन संख्या उत्पन्न करता है।",
+  "DEFAULT_TITLE": "orgnumber",
+  "help_text": "वर्तमान समय में केवल स्वीडिश समर्थित हैं। संगठन संख्या आपके द्वारा निर्दिष्ट प्रारूप के अनुसार उत्पन्न होती है:",
+  "incomplete_fields": "संगठन संख्या डेटा प्रकार को विकल्प टेक्स्ट फ़ील्ड में प्रारूप दर्ज करने की आवश्यकता है। कृपया निम्न पंक्तियों को ठीक करें:",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "A (स्वीडिश) संगठन संख्या जिसमें 12 सिफ़र हैं और कोई हाइफ़न नहीं है",
+  "type_OrganisationNumberWithHyphen": "ए (स्वीडिश) संगठन संख्या 12 सिफर और एक हाइफ़न के साथ",
+  "separators": "विभाजक:",
+  "separator_help": "आपके द्वारा यहां दर्ज किए गए वर्ण संगठन संख्या फ़ील्ड में विभाजक के रूप में उपयोग किए जाएंगे। नोट: आप कई विभाजकों को मिला सकते हैं, उपयोग करें | उन्हें अलग करने के लिए (उदाहरण के लिए -|+)"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ja.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ja.json
new file mode 100644
index 000000000..f089b16ce
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ja.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Organisation Number",
+  "DESC": "Generates organisation numbers, used in some countries for registration of companies, associations etc.",
+  "DEFAULT_TITLE": "orgnumber",
+  "help_text": "At the present time only Swedish ones are supported. The organisation numbers are generated according to the format you specify:",
+  "incomplete_fields": "The Organisation Number Data Type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "A (Swedish) organisation number with 12 siffers and no hyphen",
+  "type_OrganisationNumberWithHyphen": "A (Swedish) organisation number with 12 siffers and a hyphen",
+  "separators": "Separators:",
+  "separator_help": "The characters you enter here will be used as separator in the organisation number fields. Note: you can mix several separators, use | to separate them (for example -|+)"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/nl.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/nl.json
new file mode 100644
index 000000000..178ec0926
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/nl.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Organisatie Nummer",
+  "DESC": "Genereert een organisatienummer, dat in sommige landen voor de registratie van bedrijven, verenigingen etc. wordt gebruikt.",
+  "DEFAULT_TITLE": "aantal",
+  "help_text": "Op dit moment wordt alleen het Zweedse organisatienummer ondersteund. De organisatienummers worden gegenereerd volgens het formaat dat u opgeeft :",
+  "incomplete_fields": "Het Optie veld moet verplicht worden ingevuld bij het data type Organisatie Nummer. Corrigeer de volgende rij(en):",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "Een (Zweeds) organisatienummer met 12 cijfers zonder koppelteken",
+  "type_OrganisationNumberWithHyphen": "Een (Zweeds) organisatienummer met 12 cijfers en een koppelteken",
+  "separators": "Scheidingsteken:",
+  "separator_help": "De tekens die u hier invoert worden als scheidingsteken gebruikt in de organisatienummer veld. Let op : je kunt verschillende scheidingstekens combineren door ze te scheiden met een | ( bijvoorbeeld - | + )"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/pt.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/pt.json
new file mode 100644
index 000000000..92a886feb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/pt.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Número da Organização",
+  "DESC": "Gera números de organizações, usados em alguns países para registro de empresas, associações etc.",
+  "DEFAULT_TITLE": "numero",
+  "help_text": "No momento, apenas os suecos são suportados. Os números da organização são gerados de acordo com o formato que você especificar:",
+  "incomplete_fields": "O tipo de dados do número da organização precisa ter o formato inserido no campo de texto Opções. Corrija as seguintes linhas:",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "Um número de organização (sueco) com 12 siffers e nenhum hífen",
+  "type_OrganisationNumberWithHyphen": "Um número de organização (sueco) com 12 siffers e um hífen",
+  "separators": "Separadores:",
+  "separator_help": "Os caracteres inseridos aqui serão usados como separadores nos campos de número da organização. Nota: você pode misturar vários separadores, use | para separá-los (por exemplo - | +)"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ru.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ru.json
new file mode 100644
index 000000000..f882561f5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ru.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Номер организации",
+  "DESC": "Генерирует номера организаций, используемые в некоторых странах для регистрации компаний, ассоциаций и т. д.",
+  "DEFAULT_TITLE": "orgnumber",
+  "help_text": "В настоящее время поддерживаются только шведские. Номера организаций генерируются в соответствии с указанным форматом:",
+  "incomplete_fields": "Тип данных «Номер организации» должен иметь формат, введенный в текстовом поле «Параметры». Исправьте следующие строки:",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "(Шведский) номер организации с 12 сифферсами и без дефиса.",
+  "type_OrganisationNumberWithHyphen": "(Шведский) номер организации с 12 сифферсами и дефисом.",
+  "separators": "Сепараторы:",
+  "separator_help": "Введенные здесь символы будут использоваться в качестве разделителя в полях номера организации. Примечание: вы можете смешивать несколько разделителей, используйте | чтобы разделить их (например -|+)"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ta.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ta.json
new file mode 100644
index 000000000..f089b16ce
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/ta.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Organisation Number",
+  "DESC": "Generates organisation numbers, used in some countries for registration of companies, associations etc.",
+  "DEFAULT_TITLE": "orgnumber",
+  "help_text": "At the present time only Swedish ones are supported. The organisation numbers are generated according to the format you specify:",
+  "incomplete_fields": "The Organisation Number Data Type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "A (Swedish) organisation number with 12 siffers and no hyphen",
+  "type_OrganisationNumberWithHyphen": "A (Swedish) organisation number with 12 siffers and a hyphen",
+  "separators": "Separators:",
+  "separator_help": "The characters you enter here will be used as separator in the organisation number fields. Note: you can mix several separators, use | to separate them (for example -|+)"
+}
diff --git a/packages/plugins/src/dataTypes/OrganizationNumber/i18n/zh.json b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/zh.json
new file mode 100644
index 000000000..f089b16ce
--- /dev/null
+++ b/packages/plugins/src/dataTypes/OrganizationNumber/i18n/zh.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Organisation Number",
+  "DESC": "Generates organisation numbers, used in some countries for registration of companies, associations etc.",
+  "DEFAULT_TITLE": "orgnumber",
+  "help_text": "At the present time only Swedish ones are supported. The organisation numbers are generated according to the format you specify:",
+  "incomplete_fields": "The Organisation Number Data Type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "example_OrganisationNumberWithoutHyphen": "167502241016",
+  "example_OrganisationNumberWithHyphen": "16750224-1016",
+  "type_OrganisationNumberWithoutHyphen": "A (Swedish) organisation number with 12 siffers and no hyphen",
+  "type_OrganisationNumberWithHyphen": "A (Swedish) organisation number with 12 siffers and a hyphen",
+  "separators": "Separators:",
+  "separator_help": "The characters you enter here will be used as separator in the organisation number fields. Note: you can mix several separators, use | to separate them (for example -|+)"
+}
diff --git a/packages/plugins/src/dataTypes/PAN/PAN.generate.ts b/packages/plugins/src/dataTypes/PAN/PAN.generate.ts
new file mode 100644
index 000000000..ff4400cad
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/PAN.generate.ts
@@ -0,0 +1,74 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+let utils: WorkerUtils;
+
+export const generate = (data: DTGenerationData, workerUtils: WorkerUtils): DTGenerateResult => {
+  utils = workerUtils;
+
+  const cards = Object.keys(data.rowState.cardFormats);
+  if (!cards.length) {
+    return { display: '' };
+  }
+
+  const randomCard = utils.randomUtils.getRandomArrayValue(cards);
+
+  const { formats, prefix } = data.rowState.cardFormats[randomCard];
+  const randomPrefix: number = utils.randomUtils.getRandomArrayValue(prefix);
+  const randomFormat: string = utils.randomUtils.getRandomArrayValue(formats);
+
+  const shouldDisplay = !!randomPrefix && !!randomFormat;
+
+  return {
+    display: shouldDisplay ? generatePAN(randomPrefix, randomFormat) : '',
+    cardType: randomCard
+  };
+};
+
+const generatePAN = (prefix: number, format: string): string => {
+  // first, strip out the non-X formatting chars, we'll add them back in at the end
+  const xChars = format.replace(/[^X]/g, '');
+  const prefixStr = prefix.toString();
+
+  let panNums = prefixStr + utils.randomUtils.generateRandomAlphanumericStr(xChars.substring(prefixStr.length + 1));
+  const numChars = panNums.length;
+  const reversedNums = utils.stringUtils.reverse(panNums);
+
+  // calculate sum
+  let sum = 0;
+  let pos = 0;
+  while (pos < numChars) {
+    // see issue 843 - incorrect PAN check digits
+    const currentNum: number = +reversedNums[pos];
+    let odd = currentNum * 2;
+    if (odd > 9) {
+      odd -= 9;
+    }
+    sum += odd;
+
+    if (pos + 1 < numChars) {
+      // see issue 843 - incorrect PAN check digits
+      sum += +reversedNums[pos + 1];
+    }
+    pos += 2;
+  }
+
+  // calculate check digit
+  const checkDigit = ((Math.floor(sum / 10) + 1) * 10 - sum) % 10;
+  panNums += checkDigit;
+
+  // lastly, convert it into the format provided
+  let finalPan = '';
+  let index = 0;
+
+  for (let i = 0; i < format.length; i++) {
+    if (format[i] === 'X') {
+      finalPan += panNums[index];
+      index++;
+    } else {
+      finalPan += format[i];
+    }
+  }
+
+  return finalPan;
+};
diff --git a/packages/plugins/src/dataTypes/PAN/PAN.scss b/packages/plugins/src/dataTypes/PAN/PAN.scss
new file mode 100644
index 000000000..250987db9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/PAN.scss
@@ -0,0 +1,23 @@
+@use '../../../styles/variables' as c;
+
+.buttonLabel {
+	margin-top: 4px;
+}
+
+.validLengthsTip {
+	b {
+		color: c.$primary-color;
+		font-weight: bold;
+	}
+	margin: 2px 0 6px;
+}
+
+.error {
+	color: c.$error;
+	padding: 2px 0 6px;
+}
+
+.noCreditCards {
+	color: #666666;
+	font-style: italic;
+}
diff --git a/packages/plugins/src/dataTypes/PAN/PAN.scss.d.ts b/packages/plugins/src/dataTypes/PAN/PAN.scss.d.ts
new file mode 100644
index 000000000..47148bc62
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/PAN.scss.d.ts
@@ -0,0 +1,15 @@
+declare namespace PanScssNamespace {
+  export interface IPanScss {
+    buttonLabel: string;
+    error: string;
+    noCreditCards: string;
+    validLengthsTip: string;
+  }
+}
+
+declare const PanScssModule: PanScssNamespace.IPanScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: PanScssNamespace.IPanScss;
+};
+
+export = PanScssModule;
diff --git a/packages/plugins/src/dataTypes/PAN/PAN.state.tsx b/packages/plugins/src/dataTypes/PAN/PAN.state.tsx
new file mode 100644
index 000000000..50e0cec8e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/PAN.state.tsx
@@ -0,0 +1,24 @@
+import { creditCardFormats, CreditCardFormatType, CreditCardType, creditCardTypes } from './formats';
+import { cloneObj } from '@generatedata/utils/general';
+
+export type PanState = {
+  example: string;
+  cardTypes: CreditCardType[];
+  cardFormats: CreditCardFormatType;
+};
+
+export type GenerationOptionsType = {
+  cardFormats: CreditCardFormatType;
+  ccCard: CreditCardType | 'any';
+};
+
+export const defaultGenerationOptions = {
+  cardFormats: Object.values(CreditCardType),
+  ccCard: 'any'
+};
+
+export const initialState: PanState = {
+  example: 'any',
+  cardTypes: creditCardTypes,
+  cardFormats: cloneObj(creditCardFormats)
+};
diff --git a/packages/plugins/src/dataTypes/PAN/PAN.tsx b/packages/plugins/src/dataTypes/PAN/PAN.tsx
new file mode 100644
index 000000000..412c73a42
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/PAN.tsx
@@ -0,0 +1,264 @@
+import React, { useEffect, useState } from 'react';
+import Button from '@mui/material/Button';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import CreatablePillField from '~components/creatablePillField/CreatablePillField';
+import { cloneObj } from '~utils/generalUtils';
+import { toSentenceCase } from '~utils/stringUtils';
+import { getI18nString } from '~utils/langUtils';
+import { PanState, GenerationOptionsType } from './PAN.state';
+import { creditCardFormats, CreditCardFormatType, CreditCardType, creditCardTypes } from './formats';
+import styles from './PAN.scss';
+
+export const getCreditCardOptions = (formats: string[], i18n: any): DropdownOption[] =>
+  formats.map((format) => ({
+    value: format,
+    label: i18n[format]
+  }));
+
+export const Example = ({ i18n, data, onUpdate }: DTExampleProps): React.ReactNode => {
+  const onChange = (value: string): void => {
+    const newData: Partial<PanState> = {
+      ...data,
+      example: value
+    };
+
+    if (value === 'any') {
+      newData.cardTypes = creditCardTypes;
+      newData.cardFormats = cloneObj(creditCardFormats);
+    } else if (value === 'visa_mastercard') {
+      newData.cardTypes = [CreditCardType.visa, CreditCardType.mastercard];
+      newData.cardFormats = {
+        [CreditCardType.visa as string]: creditCardFormats[CreditCardType.visa],
+        [CreditCardType.mastercard as string]: creditCardFormats[CreditCardType.mastercard]
+      };
+    } else if (value === 'visa_mastercard_amex') {
+      newData.cardTypes = [CreditCardType.visa, CreditCardType.mastercard, CreditCardType.amex];
+      newData.cardFormats = {
+        [CreditCardType.visa as string]: creditCardFormats[CreditCardType.visa],
+        [CreditCardType.mastercard as string]: creditCardFormats[CreditCardType.mastercard],
+        [CreditCardType.amex as string]: creditCardFormats[CreditCardType.amex]
+      };
+    } else {
+      newData.cardTypes = [value as CreditCardType];
+      newData.cardFormats = {
+        [value]: creditCardFormats[value as CreditCardType]
+      };
+    }
+    onUpdate(newData);
+  };
+
+  const options = [
+    {
+      label: i18n.multipleCards,
+      options: [
+        { value: 'any', label: i18n.anyCard },
+        { value: 'visa_mastercard', label: i18n.visaMastercard },
+        { value: 'visa_mastercard_amex', label: i18n.visaMastercardAmex }
+      ]
+    },
+    {
+      label: i18n.specificCards,
+      options: getCreditCardOptions(creditCardTypes, i18n)
+    }
+  ];
+
+  return <Dropdown isGrouped={true} value={data.example} onChange={(i: any): void => onChange(i.value)} options={options} />;
+};
+
+const validFormat = (cardType: CreditCardType, format: string, allFormats: CreditCardFormatType): boolean => {
+  const validNumChars = allFormats[cardType]!.validNumChars;
+  const numChars = format.replace(/[^X]/gi, '').length;
+  return validNumChars.indexOf(numChars) !== -1;
+};
+
+const PANDialog = ({ visible, data, onClose, onUpdateSelectedCards, onUpdateCardFormats, coreI18n, i18n }: any) => {
+  const [selectedCard, setSelectedCard] = useState<CreditCardType | null>(null);
+  const [formatError, setFormatError] = useState('');
+
+  useEffect(() => {
+    if (data.cardTypes.indexOf(selectedCard) === -1) {
+      const firstCard = data.cardTypes[0] as CreditCardType;
+      setSelectedCard(firstCard);
+    }
+  }, [data.cardTypes.length]);
+
+  const updateFormats = (formats: string[]): void => {
+    setFormatError('');
+    const uppercaseFormats = formats.map((format) => format.replace(/x/g, 'X'));
+    onUpdateCardFormats(selectedCard, uppercaseFormats);
+  };
+
+  const validateFormat = (format: string): boolean => {
+    const isValid = validFormat(selectedCard as CreditCardType, format, creditCardFormats);
+    if (!isValid) {
+      setFormatError(i18n.invalidNewFormat);
+    }
+    return isValid;
+  };
+
+  const selectCreditCard = (creditCard: CreditCardType): void => {
+    setSelectedCard(creditCard);
+  };
+
+  const getFormatDesc = (creditCard: CreditCardType | null): JSX.Element | null => {
+    if (!creditCard) {
+      return null;
+    }
+
+    const validLengths = creditCardFormats[creditCard]!.validNumChars;
+    const i18nKey = validLengths.length === 1 ? i18n.validCardNumberSingleLength : i18n.validCardNumberMultipleLengths;
+
+    const text = getI18nString(i18nKey, [
+      `<b>${i18n[creditCard]}</b>`,
+      validLengths.map((length, index) => `<b key=${index}>${length}</b>`).join(', ')
+    ]);
+
+    return <div className={styles.validLengthsTip} dangerouslySetInnerHTML={{ __html: text }} />;
+  };
+
+  const getFormatError = (): JSX.Element | null => {
+    if (!formatError) {
+      return null;
+    }
+    return <div className={styles.error}>{formatError}</div>;
+  };
+
+  const getFormatsSection = () => {
+    if (!data.cardTypes.length) {
+      return <div className={styles.noCreditCards}>{i18n.noCreditCards}</div>;
+    }
+
+    return (
+      <>
+        <div style={{ marginBottom: 6 }}>
+          <Dropdown
+            value={selectedCard}
+            options={getCreditCardOptions(data.cardTypes, i18n)}
+            onChange={({ value }: { value: CreditCardType }): void => selectCreditCard(value)}
+          />
+        </div>
+
+        {getFormatDesc(selectedCard)}
+        {getFormatError()}
+
+        <CreatablePillField
+          value={selectedCard && data.cardFormats[selectedCard] ? data.cardFormats[selectedCard].formats : []}
+          onChange={(formats: string[]): void => updateFormats(formats)}
+          placeholder={i18n.enterFormats}
+          onValidateNewItem={(newFormat: string): boolean => validateFormat(newFormat)}
+        />
+      </>
+    );
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.selectCreditCards}</DialogTitle>
+        <DialogContent dividers>
+          <div style={{ marginBottom: 16 }}>
+            <h3>{toSentenceCase(i18n.creditCards)}</h3>
+            <Dropdown
+              isMulti
+              value={data.cardTypes}
+              options={getCreditCardOptions(creditCardTypes, i18n)}
+              closeMenuOnSelect={false}
+              onChange={(formats: any): void => {
+                onUpdateSelectedCards(formats ? formats.map(({ value }: DropdownOption) => value) : []);
+              }}
+            />
+          </div>
+
+          <h3>{i18n.formats}</h3>
+          <p>{i18n.formatsDesc}</p>
+
+          {getFormatsSection()}
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ data, i18n, coreI18n, onUpdate }: DTOptionsProps): React.ReactNode => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+  const numSelected = data.cardTypes.length;
+
+  const onUpdateSelectedCards = (cardTypes: CreditCardType[]): void => {
+    const cardFormats: CreditCardFormatType = {};
+    cardTypes.forEach((cardType) => {
+      if (data.cardFormats[cardType]) {
+        cardFormats[cardType] = data.cardFormats[cardType];
+      } else {
+        cardFormats[cardType] = creditCardFormats[cardType];
+      }
+    });
+
+    onUpdate({
+      ...data,
+      cardTypes,
+      cardFormats
+    });
+  };
+
+  const onUpdateCardFormats = (cardType: CreditCardType, formats: string[]): void => {
+    onUpdate({
+      ...data,
+      cardFormats: {
+        ...data.cardFormats,
+        [cardType]: {
+          ...data.cardFormats[cardType],
+          formats
+        }
+      }
+    });
+  };
+
+  const label = `<b>${numSelected}</b> ` + (numSelected === 1 ? i18n.creditCard : i18n.creditCards);
+
+  return (
+    <div className={styles.buttonLabel}>
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        <span dangerouslySetInnerHTML={{ __html: label }} />
+      </Button>
+      <PANDialog
+        visible={dialogVisible}
+        data={data}
+        i18n={i18n}
+        coreI18n={coreI18n}
+        onUpdateSelectedCards={onUpdateSelectedCards}
+        onUpdateCardFormats={onUpdateCardFormats}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p>{i18n.help1}</p>
+    <p>{i18n.help2}</p>
+  </>
+);
+
+export const rowStateReducer = ({ cardFormats, example }: PanState): GenerationOptionsType => ({
+  cardFormats,
+  ccCard: example as CreditCardType
+});
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'varchar(255)',
+    field_Oracle: 'varchar2(255)',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/PAN/PAN.worker.ts b/packages/plugins/src/dataTypes/PAN/PAN.worker.ts
new file mode 100644
index 000000000..7f17d3913
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/PAN.worker.ts
@@ -0,0 +1,13 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './PAN.generate';
+
+let utilsLoaded = false;
+export const onmessage = (e: DTWorkerOnMessage): void => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/PAN/README.md b/packages/plugins/src/dataTypes/PAN/README.md
new file mode 100644
index 000000000..a06ebf0f6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/README.md
@@ -0,0 +1,48 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; PAN
+
+This Data Type generates a *valid* Personal Access Number (PAN) for a variety of credit card types.  
+
+- *brand*: the credit card name. Options: `mastercard, visa, visaElectron, amex, discover, carteBlanche, dinersClubInt,
+dinersClubEnRoute, jcb, maestro, solo, switch, laser, rand_card`. The last item is special. If it's entered, you need to 
+include the *random_card* setting as well. 
+to generate from.
+- *separator*: defaults to space ` `. The separator character 
+- *format*: an array of possible formats to output the CC number.
+- *length*: this one's a bit confusing, honestly. You need to pass in a list of comma-delimited lengths of possible
+credit card lengths. [But aren't they defined in the format list?]
+- *random_card*: an array of credit card names to indicate the subset of credit card types to generate.
+
+
+### Example API Usage
+
+This generates a Visa number. Just POST the following JSON content to: 
+`http://[your site]/[generate data folder]/api/v1/data`
+
+```javascript
+{
+    "numRows": 50,
+    "rows": [
+        {
+            "type": "PAN",
+            "title": "cc_num",
+            "settings": {
+                "brand": "visa",
+                "format": ["XXXX XXXX XXXX XXXX", "XXX XXXXX XXXXX XXX"],
+                "length": "16"
+            }
+        }
+    ],
+    "export": {
+        "type": "JSON",
+        "settings": {
+            "stripWhitespace": false,
+            "dataStructureFormat": "simple"
+        }
+    }
+}
+```
+ 
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/dataTypes/PAN/__tests__/PAN.ui.test.tsx b/packages/plugins/src/dataTypes/PAN/__tests__/PAN.ui.test.tsx
new file mode 100644
index 000000000..148331bcd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/__tests__/PAN.ui.test.tsx
@@ -0,0 +1,32 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { getCreditCardOptions, Help } from '../PAN';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('getCreditCardOptions', () => {
+	it('returns data in the expected format', () => {
+		const i18n = {
+			one: 'First one',
+			two: 'Second one',
+			three: 'Third one'
+		};
+		expect(getCreditCardOptions(['one', 'two', 'three'], i18n)).toEqual([
+			{ value: 'one', label: 'First one' },
+			{ value: 'two', label: 'Second one' },
+			{ value: 'three', label: 'Third one' }
+		]);
+	});
+});
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps} />);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/PAN/bundle.ts b/packages/plugins/src/dataTypes/PAN/bundle.ts
new file mode 100644
index 000000000..9c689984f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/bundle.ts
@@ -0,0 +1,14 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, rowStateReducer, getMetadata } from './PAN';
+import { initialState } from './PAN.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	rowStateReducer,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/PAN/config.ts b/packages/plugins/src/dataTypes/PAN/config.ts
new file mode 100644
index 000000000..a4b99d4da
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'financial',
+  fieldGroupOrder: 30
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/PAN/formats.ts b/packages/plugins/src/dataTypes/PAN/formats.ts
new file mode 100644
index 000000000..2cbd9c90e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/formats.ts
@@ -0,0 +1,150 @@
+const formatGroup1 = [
+	'XXXXXXXXXXXXXXXX',
+	'XXXX XXXX XXXX XXXX',
+	'XXXXXX XXXXXX XXXX',
+	'XXX XXXXX XXXXX XXX',
+	'XXXXXX XXXXXXXXXX'
+];
+
+const formatGroup2 = [
+	'XXXXXXXXXXXXXXX',
+	'XXXX XXXXXX XXXXX'
+];
+
+const formatGroup3 = [
+	'XXXXXXXXXXXXXXXX', // 16
+	'XXXX XXXX XXXX XXXX',
+	'XXXXXX XXXXXX XXXX',
+	'XXX XXXXX XXXXX XXX',
+	'XXXXXX XXXXXXXXXX',
+	'XXXXXXXXXXXXXXXXXX', // 18
+	'XXXXXXXXXXXXXXXXXXX', // 19
+	'XXXXXX XX XXXX XXXX XXX'
+];
+
+export enum CreditCardType {
+	visa = 'visa',
+	visaElectron = 'visaElectron',
+	mastercard = 'mastercard',
+	discover = 'discover',
+	amex = 'amex',
+	carteBlanche = 'carteBlanche',
+	dinersClubInt = 'dinersClubInt',
+	dinersClubEnRoute = 'dinersClubEnRoute',
+	maestro = 'maestro',
+	solo = 'solo',
+	switch = 'switch',
+	laser = 'laser',
+}
+
+// all available credit cards in array format
+export const creditCardTypes: CreditCardType[] = [];
+for (const value in CreditCardType) {
+	creditCardTypes.push(value as CreditCardType);
+}
+
+export type CreditCardFormatType = {
+	[key in CreditCardType]?: {
+		prefix: number[];
+		formats: string[];
+		validNumChars: number[];
+	};
+}
+
+export const creditCardFormats: CreditCardFormatType = {
+	visa: {
+		prefix: [4539, 4556, 4916, 4532, 4929, 40240071, 4485, 4716, 4],
+		formats: [
+			'XXXXXXXXXXXXX',
+			'XXXX XXX XX XXXX',
+			'XXXXXXXXXXXXXXXX',
+			'XXXX XXXX XXXX XXXX',
+			'XXXXXX XXXXXX XXXX',
+			'XXX XXXXX XXXXX XXX',
+			'XXXXXX XXXXXXXXXX'
+		],
+		validNumChars: [13, 16]
+	},
+	visaElectron: {
+		prefix: [4026, 417500, 4508, 4844, 4913, 4917],
+		formats: formatGroup1,
+		validNumChars: [16]
+	},
+	mastercard: {
+		prefix: [51, 52, 53, 54, 55],
+		formats: formatGroup1,
+		validNumChars: [16]
+	},
+	discover: {
+		prefix: [6011, 644, 645, 646, 647, 648, 649, 65],
+		formats: formatGroup1,
+		validNumChars: [16]
+	},
+	amex: {
+		prefix: [34, 37],
+		formats: formatGroup2,
+		validNumChars: [15]
+	},
+	carteBlanche: {
+		prefix: [300, 301, 302, 303, 304, 305],
+		formats: formatGroup2,
+		validNumChars: [15]
+	},
+	dinersClubInt: {
+		prefix: [36],
+		formats: formatGroup2,
+		validNumChars: [15]
+	},
+	dinersClubEnRoute: {
+		prefix: [2014, 2149],
+		formats: formatGroup2,
+		validNumChars: [15]
+	},
+	maestro: {
+		prefix: [5018, 5038, 6304, 6759, 6761, 6762, 6763, 5893, 56, 57, 58],
+		formats: [
+			'XXXXXXXXXXXX',
+			'XXXXXXXXXXXXX',
+			'XXXX XXX XX XXXX',
+			'XXXXXXXXXXXXXX',
+			'XXXX XXXXXX XXXX',
+			'XXXXXXXXXXXXXXX',
+			'XXXX XXXXXX XXXXX',
+			'XXXXXXXXXXXXXXXX',
+			'XXXX XXXX XXXX XXXX',
+			'XXXXXX XXXXXX XXXX',
+			'XXX XXXXX XXXXX XXX',
+			'XXXXXX XXXXXXXXXX',
+			'XXXXXXXXXXXXXXXXX',
+			'XXXXXXXXXXXXXXXXXX',
+			'XXXXXXXXXXXXXXXXXXX',
+			'XXXXXX XX XXXX XXXX XXX'
+		],
+		validNumChars: [12, 13, 14, 15, 16, 17, 18, 19]
+	},
+	solo: {
+		prefix: [6334, 6767],
+		formats: formatGroup3,
+		validNumChars: [16, 18, 19]
+	},
+	switch: {
+		prefix: [4903, 4905, 4905, 4911, 4936, 564182, 633110, 6333, 6759],
+		formats: formatGroup3,
+		validNumChars: [16, 18, 19]
+	},
+	laser: {
+		prefix: [6304, 6706, 6771, 6709],
+		formats: [
+			'XXXXXXXXXXXXXXXX', // 16
+			'XXXX XXXX XXXX XXXX',
+			'XXXXXX XXXXXX XXXX',
+			'XXX XXXXX XXXXX XXX',
+			'XXXXXX XXXXXXXXXX',
+			'XXXXXXXXXXXXXXXXX', // 17
+			'XXXXXXXXXXXXXXXXXX', // 18
+			'XXXXXXXXXXXXXXXXXXX', // 19
+			'XXXXXX XX XXXX XXXX XXX'
+		],
+		validNumChars: [16, 17, 18, 19]
+	}
+};
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/ar.json b/packages/plugins/src/dataTypes/PAN/i18n/ar.json
new file mode 100644
index 000000000..2b2ceb74c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/ar.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "بطاقة الائتمان PAN",
+  "DESC": "يقوم نوع البيانات هذا بإنشاء أرقام بطاقات ائتمان عشوائية وصالحة بتنسيق قابل للتخصيص.",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "أي بطاقة",
+  "creditCard": "بطاقة ائتمان",
+  "creditCards": "بطاقات الائتمان",
+  "creditCardTypes": "أنواع بطاقات الائتمان",
+  "formats": "التنسيقات",
+  "multipleCards": "بطاقات متعددة",
+  "specificCards": "بطاقات محددة",
+  "visaMastercard": "Visa و Mastercard",
+  "visaMastercardAmex": "Visa و Mastercard و Amex",
+  "validCardNumberSingleLength": "يجب أن يحتوي رقم %1 الصالح على %2 X's.",
+  "validCardNumberMultipleLengths": "يجب أن يحتوي الرقم%1 الصالح على واحد من عدد X التالي:%2",
+  "selectCreditCards": "حدد بطاقات الائتمان",
+  "formatsDesc": "يتيح لك هذا تخصيص تنسيقات العرض لكل بطاقة ائتمان حددتها أعلاه. يمكنك إضافة التنسيقات الخاصة بك ، باستخدام أي محدد حرف تريده - طالما أن عدد X (الذي يتم تحويله تلقائيًا إلى أرقام) الذي تدخله صالحًا لهذا الائتمان نوع البطاقة.",
+  "enterFormats": "أدخل تنسيقات بطاقة الائتمان",
+  "help1": "يؤدي هذا إلى إنشاء PANs صالحة لبطاقات الائتمان (أرقام الوصول الأساسية) للعديد من بطاقات الائتمان الرئيسية في جميع أنحاء العالم. بشكل افتراضي ، ستُنشئ أرقام بطاقات الائتمان من أي نوع مدعوم (Visa و Mastercard و American Express وغيرها) ، ولكن لديك خيار اختيار أيهما تريد.",
+  "help2": "بالإضافة إلى ذلك ، يمكنك تخصيص تنسيق الرقم الذي تم إنشاؤه (على سبيل المثال ، توفير محدد أحرف مخصص). لذلك ، يمكنك إدخال سلسلة من X في حقل التنسيق المخصص ، مع أي أحرف أخرى تريدها ، ثم انقر فوق إدخال. سيتحقق الحقل من أنك أدخلت عددًا صالحًا من X's: بطاقات ائتمان مختلفة لها أطوال أحرف صالحة مختلفة. ستخبرك كل بطاقة ائتمان محددة بعدد صحيح من الأحرف X تحتاج إلى إدخاله",
+  "invalidNewFormat": "الرجاء إدخال سلسلة تحتوي على العدد الصحيح من X.",
+  "noCreditCards": "لم يتم اختيار بطاقات ائتمان."
+}
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/de.json b/packages/plugins/src/dataTypes/PAN/i18n/de.json
new file mode 100644
index 000000000..9ff4feee3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/de.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "Kreditkarte - PAN",
+  "DESC": "Dieser Datentyp generiert zufällige, gültige Kreditkartennummern in einem anpassbaren Format.",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "Beliebige Karte",
+  "creditCard": "Kreditkarte",
+  "creditCards": "Kreditkarten",
+  "creditCardTypes": "Kreditkartentypen",
+  "formats": "Formate",
+  "multipleCards": "Mehrere Karten",
+  "specificCards": "Spezifische Karten",
+  "visaMastercard": "Visa, Mastercard",
+  "visaMastercardAmex": "Visa, Mastercard und Amex",
+  "validCardNumberSingleLength": "Eine gültige %1-Zahl muss %2 X enthalten.",
+  "validCardNumberMultipleLengths": "Eine gültige %1-Zahl muss eine der folgenden X-Zahlen enthalten: %2",
+  "selectCreditCards": "Wählen Sie Kreditkarten aus",
+  "formatsDesc": "Auf diese Weise können Sie die Anzeigeformate jeder oben ausgewählten Kreditkarte anpassen. Sie können Ihre eigenen Formate mit einem beliebigen Zeichenbegrenzer hinzufügen - solange die von Ihnen eingegebene Anzahl von X (automatisch in Zahlen konvertiert) für diesen Kreditkartentyp gültig ist.",
+  "enterFormats": "Geben Sie die Kreditkartenformate ein",
+  "help1": "Dadurch werden gültige Kreditkarten-PANs (Primary Access Numbers) für viele der weltweit wichtigsten Kreditkarten generiert. Standardmäßig werden Kreditkartennummern von jedem unterstützten Typ (Visa, Mastercard, American Express und andere) generiert. Sie können jedoch auswählen, was Sie möchten.",
+  "help2": "Darüber hinaus können Sie das Format der generierten Nummer anpassen (z. B. ein benutzerdefiniertes Zeichenbegrenzer angeben). Dazu geben Sie im Feld für das benutzerdefinierte Format eine X-Zeichenfolge mit den gewünschten anderen Zeichen ein und klicken auf die Eingabetaste. Das Feld bestätigt, dass Sie eine gültige Anzahl von X eingegeben haben: Verschiedene Kreditkarten haben unterschiedliche gültige Zeichenlängen. Jede ausgewählte Kreditkarte informiert Sie über die gültige Anzahl von X Zeichen, die Sie eingeben müssen.",
+  "invalidNewFormat": "Bitte geben Sie eine Zeichenfolge ein, die die richtige Anzahl von X enthält.",
+  "noCreditCards": "Keine Kreditkarten ausgewählt."
+}
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/en.json b/packages/plugins/src/dataTypes/PAN/i18n/en.json
new file mode 100644
index 000000000..c4f05a5bd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/en.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "Credit Card - PAN",
+  "DESC": "This data type generates random, valid credit card numbers in a customizable format.",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "Any card",
+  "creditCard": "credit card",
+  "creditCards": "credit cards",
+  "creditCardTypes": "Credit card types",
+  "formats": "Formats",
+  "multipleCards": "Multiple cards",
+  "specificCards": "Specific cards",
+  "visaMastercard": "Visa, Mastercard",
+  "visaMastercardAmex": "Visa, Mastercard and Amex",
+  "validCardNumberSingleLength": "A valid %1 number must contain %2 X's.",
+  "validCardNumberMultipleLengths": "A valid %1 number must contain one of the following number of X's: %2",
+  "selectCreditCards": "Select credit cards",
+  "formatsDesc": "This lets you customize the display formats of each credit card you have selected above. You can add your own formats, using whatever character delimiter you like - as long as the number of X's (automatically converted to numbers) you enter is valid for that credit card type.",
+  "enterFormats": "Enter credit card formats",
+  "help1": "This generates valid credit card PANs (Primary Access Numbers) for many of the major worldwide credit cards. By default, it'll generate credit card numbers from any supported type (Visa, Mastercard, American Express and others), but you have the option to choose whichever you want.",
+  "help2": "In addition, you can customize the format of the generated number (e.g. supply a custom character delimiter). For that, you would enter a string of X's in the custom format field, with whatever other characters you want, then click enter. The field will validate that you've entered a valid number of X's: different credit cards have different valid character lengths. Each credit card selected will inform you of the valid number of X characters you need to enter.",
+  "invalidNewFormat": "Please enter a string that contains the correct number of X's.",
+  "noCreditCards": "No credit cards selected."
+}
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/es.json b/packages/plugins/src/dataTypes/PAN/i18n/es.json
new file mode 100644
index 000000000..a587cf0cb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/es.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "Tarjeta de crédito - PAN",
+  "DESC": "Este tipo de datos genera números de tarjetas de crédito válidos y aleatorios en un formato personalizable.",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "Cualquier tarjeta",
+  "creditCard": "tarjeta de crédito",
+  "creditCards": "tarjetas de crédito",
+  "creditCardTypes": "Tipos de tarjetas de crédito",
+  "formats": "Formatos",
+  "multipleCards": "Varias cartas",
+  "specificCards": "Cartas específicas",
+  "visaMastercard": "Visa, Mastercard",
+  "visaMastercardAmex": "Visa, Mastercard y Amex",
+  "validCardNumberSingleLength": "Un número %1 válido debe contener %2 X.",
+  "validCardNumberMultipleLengths": "Un número %1 válido debe contener uno de los siguientes números de X: %2",
+  "selectCreditCards": "Seleccionar tarjetas de crédito",
+  "formatsDesc": "Esto le permite personalizar los formatos de visualización de cada tarjeta de crédito que haya seleccionado anteriormente. Puede agregar sus propios formatos, utilizando el delimitador de caracteres que desee, siempre que el número de X (convertido automáticamente en números) que ingrese sea válido para ese tipo de tarjeta de crédito.",
+  "enterFormats": "Ingrese los formatos de la tarjeta de crédito",
+  "help1": "Esto genera PAN de tarjetas de crédito (números de acceso primarios) válidos para muchas de las principales tarjetas de crédito del mundo. De forma predeterminada, generará números de tarjetas de crédito de cualquier tipo admitido (Visa, Mastercard, American Express y otros), pero tiene la opción de elegir el que desee.",
+  "help2": "Además, puede personalizar el formato del número generado (por ejemplo, proporcionar un delimitador de caracteres personalizado). Para eso, debe ingresar una cadena de X en el campo de formato personalizado, con cualquier otro carácter que desee, luego haga clic en ingresar. El campo validará que ha ingresado un número válido de X: diferentes tarjetas de crédito tienen diferentes longitudes de caracteres válidos. Cada tarjeta de crédito seleccionada le informará del número válido de X caracteres que debe ingresar.",
+  "invalidNewFormat": "Ingrese una cadena que contenga el número correcto de X.",
+  "noCreditCards": "No se seleccionaron tarjetas de crédito."
+}
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/fr.json b/packages/plugins/src/dataTypes/PAN/i18n/fr.json
new file mode 100644
index 000000000..f821f0aa6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/fr.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "Carte de crédit - PAN",
+  "DESC": "Ce type de données génère des numéros de carte de crédit aléatoires et valides dans un format personnalisable.",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "N'importe quelle carte",
+  "creditCard": "carte de crédit",
+  "creditCards": "cartes de crédit",
+  "creditCardTypes": "Types de cartes de crédit",
+  "formats": "Formats",
+  "multipleCards": "Cartes multiples",
+  "specificCards": "Cartes spécifiques",
+  "visaMastercard": "Visa, Mastercard",
+  "visaMastercardAmex": "Visa, Mastercard et Amex",
+  "validCardNumberSingleLength": "Un nombre %1 valide doit contenir %2 X.",
+  "validCardNumberMultipleLengths": "Un nombre %1 valide doit contenir l'un des nombres de X suivants: %2",
+  "selectCreditCards": "Sélectionnez les cartes de crédit",
+  "formatsDesc": "Cela vous permet de personnaliser les formats d'affichage de chaque carte de crédit que vous avez sélectionnée ci-dessus. Vous pouvez ajouter vos propres formats, en utilisant le séparateur de caractères de votre choix - à condition que le nombre de X (automatiquement converti en nombres) que vous entrez soit valide pour ce type de carte de crédit.",
+  "enterFormats": "Entrez les formats de carte de crédit",
+  "help1": "Cela génère des PAN de cartes de crédit valides (numéros d'accès primaires) pour la plupart des principales cartes de crédit mondiales. Par défaut, il générera des numéros de carte de crédit à partir de n'importe quel type pris en charge (Visa, Mastercard, American Express et autres), mais vous avez la possibilité de choisir celui que vous voulez.",
+  "help2": "De plus, vous pouvez personnaliser le format du nombre généré (par exemple, fournir un séparateur de caractères personnalisé). Pour cela, vous devez entrer une chaîne de X dans le champ de format personnalisé, avec les autres caractères souhaités, puis cliquez sur Entrée. Le champ validera que vous avez entré un nombre valide de X: différentes cartes de crédit ont des longueurs de caractères valides différentes. Chaque carte de crédit sélectionnée vous informera du nombre valide de X caractères que vous devez saisir.",
+  "invalidNewFormat": "Veuillez saisir une chaîne contenant le nombre correct de X.",
+  "noCreditCards": "Aucune carte de crédit sélectionnée."
+}
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/hi.json b/packages/plugins/src/dataTypes/PAN/i18n/hi.json
new file mode 100644
index 000000000..02a97f7e6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/hi.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "क्रेडिट कार्ड - पर्सनल एक्सेस नंबर",
+  "DESC": "यह डेटा प्रकार एक अनुकूलन योग्य प्रारूप में यादृच्छिक, मान्य क्रेडिट कार्ड नंबर उत्पन्न करता है।",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "कोई भी कार्ड",
+  "creditCard": "क्रेडिट कार्ड",
+  "creditCards": "क्रेडिट कार्ड",
+  "creditCardTypes": "क्रेडिट कार्ड के प्रकार",
+  "formats": "प्रारूप",
+  "multipleCards": "एकाधिक कार्ड",
+  "specificCards": "विशिष्ट कार्ड",
+  "visaMastercard": "Visa, Mastercard",
+  "visaMastercardAmex": "Visa, Mastercard तथा Amex",
+  "validCardNumberSingleLength": "एक वैध %1 संख्या में %2 X होना चाहिए।",
+  "validCardNumberMultipleLengths": "एक वैध %1 संख्या में निम्न में से एक X की संख्या होनी चाहिए: %2",
+  "selectCreditCards": "क्रेडिट कार्ड चुनें",
+  "formatsDesc": "इससे आप ऊपर चुने गए प्रत्येक क्रेडिट कार्ड के प्रदर्शन स्वरूपों को अनुकूलित कर सकते हैं। आप जो भी वर्ण सीमांकक पसंद करते हैं, उसका उपयोग करके आप अपने स्वयं के प्रारूप जोड़ सकते हैं - जब तक कि आपके द्वारा दर्ज किए गए X की संख्या (स्वचालित रूप से संख्याओं में परिवर्तित) उस क्रेडिट कार्ड प्रकार के लिए मान्य है।",
+  "enterFormats": "क्रेडिट कार्ड प्रारूप दर्ज करें",
+  "help1": "यह दुनिया भर के कई प्रमुख क्रेडिट कार्डों के लिए वैध क्रेडिट कार्ड पैन (प्राथमिक एक्सेस नंबर) उत्पन्न करता है। डिफ़ॉल्ट रूप से, यह किसी भी समर्थित प्रकार (वीज़ा, मास्टरकार्ड, अमेरिकन एक्सप्रेस और अन्य) से क्रेडिट कार्ड नंबर उत्पन्न करेगा, लेकिन आपके पास जो भी आप चाहते हैं उसे चुनने का विकल्प है।",
+  "help2": "इसके अलावा, आप जनरेट की गई संख्या के प्रारूप को अनुकूलित कर सकते हैं (उदाहरण के लिए एक कस्टम वर्ण सीमांकक की आपूर्ति)। उसके लिए, आप कस्टम प्रारूप फ़ील्ड में एक्स की एक स्ट्रिंग दर्ज करेंगे, जो भी अन्य वर्ण आप चाहते हैं, फिर एंटर पर क्लिक करें। फ़ील्ड मान्य करेगा कि आपने X की मान्य संख्या दर्ज की है: विभिन्न क्रेडिट कार्डों की अलग-अलग मान्य वर्ण लंबाई होती है। चयनित प्रत्येक क्रेडिट कार्ड आपको X वर्णों की वैध संख्या के बारे में सूचित करेगा, जिन्हें आपको दर्ज करने की आवश्यकता है।",
+  "invalidNewFormat": "कृपया एक स्ट्रिंग दर्ज करें जिसमें X की सही संख्या हो।",
+  "noCreditCards": "कोई क्रेडिट कार्ड नहीं चुना गया."
+}
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/ja.json b/packages/plugins/src/dataTypes/PAN/i18n/ja.json
new file mode 100644
index 000000000..2df41baf9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/ja.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "クレジットカード-PAN",
+  "DESC": "このデータ型は、カスタマイズ可能な形式でランダムで有効なクレジットカード番号を生成します。",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "任意のカード",
+  "creditCard": "クレジットカード",
+  "creditCards": "クレジットカード",
+  "creditCardTypes": "クレジットカードの種類",
+  "formats": "フォーマット",
+  "multipleCards": "複数のカード",
+  "specificCards": "特定のカード",
+  "visaMastercard": "Visa、Mastercard",
+  "visaMastercardAmex": "Visa、Mastercard、Amex",
+  "validCardNumberSingleLength": "有効な%1番号には、%2Xが含まれている必要があります。",
+  "validCardNumberMultipleLengths": "有効な%1番号には、次のXの番号のいずれかが含まれている必要があります：%2",
+  "selectCreditCards": "クレジットカードを選択",
+  "formatsDesc": "これにより、上記で選択した各クレジットカードの表示形式をカスタマイズできます。 入力したXの数（自動的に数字に変換される）がそのクレジットカードタイプで有効である限り、任意の文字区切り文字を使用して、独自の形式を追加できます。",
+  "enterFormats": "クレジットカードのフォーマットを入力してください",
+  "help1": "これにより、世界中の主要なクレジットカードの多くに有効なクレジットカードPAN（プライマリアクセス番号）が生成されます。 デフォルトでは、サポートされている任意のタイプ（Visa、Mastercard、American Expressなど）からクレジットカード番号が生成されますが、必要に応じて選択することもできます。",
+  "help2": "さらに、生成された数値の形式をカスタマイズできます（たとえば、カスタム文字区切り文字を指定します）。 そのためには、カスタムフォーマットフィールドにXの文字列を他の任意の文字とともに入力し、Enterをクリックします。 このフィールドは、有効な数のXを入力したことを検証します。クレジットカードが異なれば、有効な文字長も異なります。 選択した各クレジットカードは、入力する必要のあるX文字の有効な数を通知します。",
+  "invalidNewFormat": "正しい数のXを含む文字列を入力してください。",
+  "noCreditCards": "クレジットカードが選択されていません。"
+}
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/nl.json b/packages/plugins/src/dataTypes/PAN/i18n/nl.json
new file mode 100644
index 000000000..bdc3de4eb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/nl.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "Creditcard - PAN",
+  "DESC": "Dit gegevenstype genereert willekeurige, geldige creditcardnummers in een aanpasbare indeling.",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "Elke kaart",
+  "creditCard": "kredietkaart",
+  "creditCards": "kredietkaarten",
+  "creditCardTypes": "Creditcardtypes",
+  "formats": "Formaten",
+  "multipleCards": "Meerdere kaarten",
+  "specificCards": "Specifieke kaarten",
+  "visaMastercard": "Visa, Mastercard",
+  "visaMastercardAmex": "Visa, Mastercard en Amex",
+  "validCardNumberSingleLength": "Een geldig %1-nummer moet %2 X-en bevatten.",
+  "validCardNumberMultipleLengths": "Een geldig %1-nummer moet een van de volgende X'en bevatten: %2",
+  "selectCreditCards": "Selecteer creditcards",
+  "formatsDesc": "Hiermee kunt u de weergaveformaten van elke creditcard die u hierboven heeft geselecteerd, aanpassen. U kunt uw eigen formaten toevoegen, met elk tekenscheidingsteken dat u maar wilt - zolang het aantal X-en (automatisch omgezet naar getallen) dat u invoert geldig is voor dat creditcardtype.",
+  "enterFormats": "Voer creditcardformaten in",
+  "help1": "Dit genereert geldige creditcard-PAN's (primaire toegangsnummers) voor veel van de belangrijkste wereldwijde creditcards. Standaard genereert het creditcardnummers van elk ondersteund type (Visa, Mastercard, American Express en andere), maar u heeft de mogelijkheid om te kiezen wat u maar wilt.",
+  "help2": "Bovendien kunt u het formaat van het gegenereerde nummer aanpassen (bijv. Een aangepast scheidingsteken voor tekens opgeven). Daarvoor zou je een reeks X-en in het aangepaste formaatveld invoeren, met welke andere tekens je maar wilt, en vervolgens op Enter klikken. Het veld bevestigt dat u een geldig aantal X-en heeft ingevoerd: verschillende creditcards hebben verschillende geldige tekenlengtes. Elke geselecteerde creditcard zal u informeren over het geldige aantal X-tekens dat u moet invoeren.",
+  "invalidNewFormat": "Voer een string in die het juiste aantal X-en bevat.",
+  "noCreditCards": "Geen creditcards geselecteerd."
+}
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/pt.json b/packages/plugins/src/dataTypes/PAN/i18n/pt.json
new file mode 100644
index 000000000..f7664e2fc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/pt.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "Cartão de Crédito - PAN",
+  "DESC": "Este tipo de dados gera números de cartão de crédito válidos aleatórios em um formato personalizável.",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "Qualquer cartão",
+  "creditCard": "Cartão de crédito",
+  "creditCards": "cartões de crédito",
+  "creditCardTypes": "Tipos de cartão de crédito",
+  "formats": "Formatos",
+  "multipleCards": "Múltiplas cartas",
+  "specificCards": "Múltiplas cartas",
+  "visaMastercard": "Visa, Mastercard",
+  "visaMastercardAmex": "Visa, Mastercard e Amex",
+  "validCardNumberSingleLength": "Um número %1 válido deve conter %2 X's.",
+  "validCardNumberMultipleLengths": "Um número %1 válido deve conter um dos seguintes números de X: %2",
+  "selectCreditCards": "Selecione os cartões de crédito",
+  "formatsDesc": "Isso permite que você personalize os formatos de exibição de cada cartão de crédito que você selecionou acima. Você pode adicionar seus próprios formatos, usando qualquer delimitador de caracteres que desejar - desde que o número de Xs (convertidos automaticamente em números) que você inserir seja válido para esse tipo de cartão de crédito.",
+  "enterFormats": "Insira formatos de cartão de crédito",
+  "help1": "Isso gera PANs (números de acesso primários) de cartão de crédito válidos para muitos dos principais cartões de crédito em todo o mundo. Por padrão, ele irá gerar números de cartão de crédito de qualquer tipo compatível (Visa, Mastercard, American Express e outros), mas você tem a opção de escolher o que quiser.",
+  "help2": "Além disso, você pode personalizar o formato do número gerado (por exemplo, fornecer um delimitador de caractere personalizado). Para isso, você deve inserir uma string de X no campo de formato personalizado, com quaisquer outros caracteres que desejar, e clicar em entrar. O campo validará se você inseriu um número válido de Xs: diferentes cartões de crédito têm diferentes comprimentos de caracteres válidos. Cada cartão de crédito selecionado irá informá-lo do número válido de X caracteres que você precisa inserir.",
+  "invalidNewFormat": "Insira uma string que contenha o número correto de Xs.",
+  "noCreditCards": "Nenhum cartão de crédito selecionado."
+}
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/ru.json b/packages/plugins/src/dataTypes/PAN/i18n/ru.json
new file mode 100644
index 000000000..161392b60
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/ru.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "Кредитная карта — ПАН",
+  "DESC": "Этот тип данных генерирует случайные действительные номера кредитных карт в настраиваемом формате.",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "Любая карта",
+  "creditCard": "кредитная карта",
+  "creditCards": "кредитные карты",
+  "creditCardTypes": "Типы кредитных карт",
+  "formats": "Форматы",
+  "multipleCards": "Несколько карт",
+  "specificCards": "Конкретные карты",
+  "visaMastercard": "Visa, Mastercard",
+  "visaMastercardAmex": "Visa, Mastercard and Amex",
+  "validCardNumberSingleLength": "Допустимый номер %1 должен содержать %2 X.",
+  "validCardNumberMultipleLengths": "Действительный номер %1 должен содержать один из следующих количеств X: %2",
+  "selectCreditCards": "Выберите кредитные карты",
+  "formatsDesc": "Это позволяет вам настроить форматы отображения каждой кредитной карты, которую вы выбрали выше. Вы можете добавить свои собственные форматы, используя любой разделитель символов, который вам нравится, при условии, что введенное вами количество X (автоматически преобразованное в числа) допустимо для этого типа кредитной карты.",
+  "enterFormats": "Введите форматы кредитных карт",
+  "help1": "Это генерирует действительные PAN кредитных карт (первичные номера доступа) для многих основных мировых кредитных карт. По умолчанию он генерирует номера кредитных карт любого поддерживаемого типа (Visa, Mastercard, American Express и другие), но у вас есть возможность выбрать любой из них.",
+  "help2": "Кроме того, вы можете настроить формат сгенерированного числа (например, указать пользовательский разделитель символов). Для этого вы должны ввести строку X в поле пользовательского формата с любыми другими символами, которые вы хотите, а затем нажать Enter. Поле подтвердит, что вы ввели допустимое количество X: разные кредитные карты имеют разную допустимую длину символов. Каждая выбранная кредитная карта будет информировать вас о допустимом количестве X символов, которые необходимо ввести.",
+  "invalidNewFormat": "Пожалуйста, введите строку, содержащую правильное количество X.",
+  "noCreditCards": "Кредитные карты не выбраны."
+}
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/ta.json b/packages/plugins/src/dataTypes/PAN/i18n/ta.json
new file mode 100644
index 000000000..5c0531e6a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/ta.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "கடன் அட்டை - PAN",
+  "DESC": "இந்த தரவு வகை தனிப்பயனாக்கக்கூடிய வடிவத்தில் சீரற்ற, செல்லுபடியாகும் கிரெடிட் கார்டு எண்களை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "எந்த அட்டையும்",
+  "creditCard": "கடன் அட்டை",
+  "creditCards": "கடன் அட்டைகள்",
+  "creditCardTypes": "கடன் அட்டை வகைகள்",
+  "formats": "வடிவங்கள்",
+  "multipleCards": "பல அட்டைகள்",
+  "specificCards": "குறிப்பிட்ட அட்டைகள்",
+  "visaMastercard": "Visa, Mastercard",
+  "visaMastercardAmex": "Visa, Mastercard, Amex",
+  "validCardNumberSingleLength": "செல்லுபடியாகும் %1 எண்ணில் %2 X கள் இருக்க வேண்டும்.",
+  "validCardNumberMultipleLengths": "செல்லுபடியாகும் %1 எண்ணில் பின்வரும் X இன் எண்ணிக்கையில் ஒன்று இருக்க வேண்டும்: %2",
+  "selectCreditCards": "கடன் அட்டைகளைத் தேர்ந்தெடுக்கவும்",
+  "formatsDesc": "நீங்கள் மேலே தேர்ந்தெடுத்த ஒவ்வொரு கிரெடிட் கார்டின் காட்சி வடிவங்களையும் தனிப்பயனாக்க இது உங்களை அனுமதிக்கிறது. நீங்கள் விரும்பும் எழுத்துக்குறி டிலிமிட்டரைப் பயன்படுத்தி உங்கள் சொந்த வடிவங்களைச் சேர்க்கலாம் - நீங்கள் உள்ளிட்ட எக்ஸ் இன் எண்ணிக்கை (தானாக எண்களாக மாற்றப்படும்) அந்த கிரெடிட் கார்டு வகைக்கு செல்லுபடியாகும்.",
+  "enterFormats": "கிரெடிட் கார்டு வடிவங்களை உள்ளிடவும்",
+  "help1": "இது உலகளாவிய பல முக்கிய கிரெடிட் கார்டுகளுக்கு செல்லுபடியாகும் கிரெடிட் கார்டு பான் (முதன்மை அணுகல் எண்கள்) உருவாக்குகிறது. இயல்பாக, இது எந்தவொரு ஆதரவு வகையிலிருந்தும் (விசா, மாஸ்டர்கார்டு, அமெரிக்கன் எக்ஸ்பிரஸ் மற்றும் பிறவற்றிலிருந்து) கிரெடிட் கார்டு எண்களை உருவாக்கும், ஆனால் நீங்கள் விரும்பும் ஒன்றைத் தேர்வுசெய்ய உங்களுக்கு விருப்பம் உள்ளது.",
+  "help2": "கூடுதலாக, நீங்கள் உருவாக்கிய எண்ணின் வடிவமைப்பைத் தனிப்பயனாக்கலாம் (எ.கா. தனிப்பயன் எழுத்துக்குறி டிலிமிட்டரை வழங்குதல்). அதற்காக, நீங்கள் தனிப்பயன் வடிவமைப்பு புலத்தில் X இன் ஒரு சரத்தை உள்ளிடுவீர்கள், நீங்கள் விரும்பும் வேறு எந்த எழுத்துகளையும் கொண்டு, பின்னர் Enter என்பதைக் கிளிக் செய்க. நீங்கள் X இன் செல்லுபடியாகும் எண்ணை உள்ளிட்டுள்ளீர்கள் என்பதை புலம் சரிபார்க்கும்: வெவ்வேறு கிரெடிட் கார்டுகள் வெவ்வேறு செல்லுபடியாகும் எழுத்து நீளங்களைக் கொண்டுள்ளன. தேர்ந்தெடுக்கப்பட்ட ஒவ்வொரு கிரெடிட் கார்டும் நீங்கள் உள்ளிட வேண்டிய எக்ஸ் எழுத்துக்களின் சரியான எண்ணிக்கையை உங்களுக்குத் தெரிவிக்கும்.",
+  "invalidNewFormat": "எக்ஸ் இன் சரியான எண்ணிக்கையைக் கொண்ட ஒரு சரத்தை உள்ளிடவும்.",
+  "noCreditCards": "கடன் அட்டைகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை."
+}
diff --git a/packages/plugins/src/dataTypes/PAN/i18n/zh.json b/packages/plugins/src/dataTypes/PAN/i18n/zh.json
new file mode 100644
index 000000000..fce07a73f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PAN/i18n/zh.json
@@ -0,0 +1,35 @@
+{
+  "NAME": "信用卡-PAN",
+  "DESC": "此数据类型以可自定义的格式生成随机的有效信用卡号。",
+  "DEFAULT_TITLE": "pan",
+  "mastercard": "Mastercard",
+  "visa": "Visa",
+  "visaElectron": "Visa Electron",
+  "amex": "American Express",
+  "discover": "Discover",
+  "carteBlanche": "Carte Blanche",
+  "dinersClubInt": "Diners Club International",
+  "dinersClubEnRoute": "Diners Club enRoute",
+  "maestro": "Maestro",
+  "solo": "Solo",
+  "switch": "Switch",
+  "laser": "Laser",
+  "anyCard": "任何卡",
+  "creditCard": "信用卡",
+  "creditCards": "信用卡",
+  "creditCardTypes": "信用卡种类",
+  "formats": "格式",
+  "multipleCards": "多张卡",
+  "specificCards": "特定卡",
+  "visaMastercard": "Visa, Mastercard",
+  "visaMastercardAmex": "Visa, Mastercard, Amex",
+  "validCardNumberSingleLength": "有效的%1数字必须包含%2X。",
+  "validCardNumberMultipleLengths": "有效的%1数字必须包含以下X之一：%2",
+  "selectCreditCards": "选择信用卡",
+  "formatsDesc": "这使您可以自定义上面选择的每张信用卡的显示格式。 您可以使用任意喜欢的字符定界符来添加自己的格式-只要输入的X的数量（自动转换为数字）对于该信用卡类型有效即可。",
+  "enterFormats": "输入信用卡格式",
+  "help1": "这将为全球许多主要信用卡生成有效的信用卡PAN（主要访问号码）。 默认情况下，它将从任何受支持的类型（Visa，Mastercard，American Express和其他类型）生成信用卡号，但是您可以选择所需的任何一种。",
+  "help2": "此外，您可以自定义生成数字的格式（例如，提供自定义字符定界符）。 为此，您需要在自定义格式字段中输入X字符串，并输入所需的其他任何字符，然后单击Enter。 该字段将验证您是否输入了有效的X：不同的信用卡具有不同的有效字符长度。 所选的每张信用卡都会告知您需要输入的有效X字符数。",
+  "invalidNewFormat": "请输入包含正确数量X的字符串。",
+  "noCreditCards": "未选择信用卡。"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/PIN.generate.ts b/packages/plugins/src/dataTypes/PIN/PIN.generate.ts
new file mode 100644
index 000000000..2a11da536
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/PIN.generate.ts
@@ -0,0 +1,8 @@
+import { WorkerUtils } from '../../';
+import { DTGenerateResult } from '~types/dataTypes';
+
+export const generate = (data: any, utils: WorkerUtils): DTGenerateResult => {
+  return {
+    display: utils.randomUtils.getRandomNum(1111, 9999)
+  };
+};
diff --git a/packages/plugins/src/dataTypes/PIN/PIN.state.tsx b/packages/plugins/src/dataTypes/PIN/PIN.state.tsx
new file mode 100644
index 000000000..e2d9ec4d2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/PIN.state.tsx
@@ -0,0 +1,2 @@
+export const defaultGenerationOptions = {};
+export type GenerationOptionsType = {};
diff --git a/packages/plugins/src/dataTypes/PIN/PIN.tsx b/packages/plugins/src/dataTypes/PIN/PIN.tsx
new file mode 100644
index 000000000..dc6b0c800
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/PIN.tsx
@@ -0,0 +1,15 @@
+import * as React from 'react';
+import { DTHelpProps, DTMetadata } from '~types/dataTypes';
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.DESC}</p>;
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'number'
+  },
+  sql: {
+    field: 'varchar(4)',
+    field_Oracle: 'varchar2(4)',
+    field_MSSQL: 'VARCHAR(4) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/PIN/PIN.worker.ts b/packages/plugins/src/dataTypes/PIN/PIN.worker.ts
new file mode 100644
index 000000000..d7960956a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/PIN.worker.ts
@@ -0,0 +1,12 @@
+import utils from '../../../utils';
+import { generate } from './PIN.generate';
+import { DTWorkerOnMessage } from "~types/dataTypes";
+
+let workerUtilsLoaded = false;
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!workerUtilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		workerUtilsLoaded = true;
+	}
+	postMessage(generate(undefined, utils));
+};
diff --git a/packages/plugins/src/dataTypes/PIN/README.md b/packages/plugins/src/dataTypes/PIN/README.md
new file mode 100644
index 000000000..3c8f59928
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/README.md
@@ -0,0 +1,34 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; PIN
+
+This Data Type generates a four character PIN.
+
+
+### Example API Usage
+
+Just POST the following JSON content to: 
+`http://[your site]/[generate data folder]/api/v1/data`
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "PIN",
+            "title": "pin"
+        }
+    ],
+    "export": {
+        "type": "JSON",
+        "settings": {
+            "stripWhitespace": false,
+            "dataStructureFormat": "simple"
+        }
+    }
+}
+```
+
+ 
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/dataTypes/PIN/__tests__/PIN.generate.test.ts b/packages/plugins/src/dataTypes/PIN/__tests__/PIN.generate.test.ts
new file mode 100644
index 000000000..958dbe5d2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/__tests__/PIN.generate.test.ts
@@ -0,0 +1,25 @@
+import sinon from 'sinon';
+import { onmessage } from '../PIN.worker';
+import utils from '~utils/index';
+
+describe('onmessage', () => {
+	const postMessage = jest.fn();
+	const importScripts = jest.fn();
+	beforeAll(() => {
+		window.postMessage = postMessage;
+		window.importScripts = importScripts;
+	});
+
+	it('generates random data', () => {
+		sinon.stub(utils.randomUtils, 'getRandomNum').returns(444);
+
+		const payload: any = {
+			data: {
+				workerUtilsUrl: ''
+			}
+		};
+
+		onmessage(payload);
+		expect(postMessage).toHaveBeenCalledWith({ display: 444 });
+	});
+});
diff --git a/packages/plugins/src/dataTypes/PIN/__tests__/PIN.ui.test.tsx b/packages/plugins/src/dataTypes/PIN/__tests__/PIN.ui.test.tsx
new file mode 100644
index 000000000..5477f152d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/__tests__/PIN.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../PIN';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/PIN/bundle.ts b/packages/plugins/src/dataTypes/PIN/bundle.ts
new file mode 100644
index 000000000..42c5c5d12
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/bundle.ts
@@ -0,0 +1,9 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, getMetadata } from './PIN';
+
+const bundle: DTBundle = {
+	Help,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/PIN/config.ts b/packages/plugins/src/dataTypes/PIN/config.ts
new file mode 100644
index 000000000..1607848f5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'financial',
+  fieldGroupOrder: 50
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/ar.json b/packages/plugins/src/dataTypes/PIN/i18n/ar.json
new file mode 100644
index 000000000..2f710fc31
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/ar.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "يُنشئ رقم PIN عشوائيًا لبطاقة الائتمان من 1111 إلى 9999.",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/de.json b/packages/plugins/src/dataTypes/PIN/i18n/de.json
new file mode 100644
index 000000000..4ed42be2f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/de.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "Erzeugt eine Zufallskreditkarte PIN-Nummer von 1111 bis 9999.",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/en.json b/packages/plugins/src/dataTypes/PIN/i18n/en.json
new file mode 100644
index 000000000..8e61f99f6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/en.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "Generates a random credit card PIN number from 1111 to 9999.",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/es.json b/packages/plugins/src/dataTypes/PIN/i18n/es.json
new file mode 100644
index 000000000..01ff963e3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/es.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "Genera un número PIN de la tarjeta de crédito azar de 1111 a 9999.",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/fr.json b/packages/plugins/src/dataTypes/PIN/i18n/fr.json
new file mode 100644
index 000000000..c48285214
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/fr.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "Génère un code PIN aléatoire de carte de crédit de 1111 à 9999.",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/hi.json b/packages/plugins/src/dataTypes/PIN/i18n/hi.json
new file mode 100644
index 000000000..f8cbca128
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/hi.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "1111 से 9999 तक एक यादृच्छिक क्रेडिट कार्ड पिन नंबर उत्पन्न करता है।",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/ja.json b/packages/plugins/src/dataTypes/PIN/i18n/ja.json
new file mode 100644
index 000000000..24115c4a8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/ja.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "1111から9999までのランダムなクレジットカードPIN番号を生成します。",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/nl.json b/packages/plugins/src/dataTypes/PIN/i18n/nl.json
new file mode 100644
index 000000000..b3022d664
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/nl.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "Genereert een willekeurig creditcard pincode van 1111 tot 9999.",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/pt.json b/packages/plugins/src/dataTypes/PIN/i18n/pt.json
new file mode 100644
index 000000000..b5b108252
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/pt.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "Gera um número PIN de cartão de crédito aleatório de 1111 a 9999.",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/ru.json b/packages/plugins/src/dataTypes/PIN/i18n/ru.json
new file mode 100644
index 000000000..05b876583
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/ru.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "Генерирует случайный PIN-код кредитной карты от 1111 до 9999.",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/ta.json b/packages/plugins/src/dataTypes/PIN/i18n/ta.json
new file mode 100644
index 000000000..590fdf674
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/ta.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "சீரற்ற கிரெடிட் கார்டு பின் எண்ணை 1111 முதல் 9999 வரை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PIN/i18n/zh.json b/packages/plugins/src/dataTypes/PIN/i18n/zh.json
new file mode 100644
index 000000000..2d50ea10d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PIN/i18n/zh.json
@@ -0,0 +1,5 @@
+{
+  "NAME": "PIN",
+  "DESC": "生成1111到9999之间的随机信用卡PIN码。",
+  "DEFAULT_TITLE": "pin"
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.generate.ts b/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.generate.ts
new file mode 100644
index 000000000..333469342
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.generate.ts
@@ -0,0 +1,5 @@
+import { DTGenerateResult } from '~types/dataTypes';
+
+export const generate = (): DTGenerateResult => {
+	return { display: '' };
+};
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.state.tsx b/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.state.tsx
new file mode 100644
index 000000000..1fe0e737e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.state.tsx
@@ -0,0 +1,8 @@
+export const defaultGenerationOptions = {
+	separator: ' '
+};
+
+export const initialState = {
+	example: '',
+	...defaultGenerationOptions
+};
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.tsx b/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.tsx
new file mode 100644
index 000000000..1401fc649
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.tsx
@@ -0,0 +1,69 @@
+import * as React from 'react';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import Dropdown from '~components/dropdown/Dropdown';
+
+// TODO: figure out what this component IS. Is it for specific countries? Sweden has 12 chars...
+// https://en.wikipedia.org/wiki/Personal_identity_number_%28Sweden%29
+
+export const Example = ({ coreI18n, i18n, data, onUpdate }: DTExampleProps) => {
+  const onChange = (value: any): void => {
+    onUpdate({
+      example: value,
+      value: value
+    });
+  };
+
+  const options = [
+    { value: '', label: coreI18n.pleaseSelect },
+    { value: 'PersonalNumberWithoutHyphen', label: i18n.example_PersonalNumberWithoutHyphen },
+    { value: 'PersonalNumberWithHyphen', label: i18n.example_PersonalNumberWithHyphen }
+  ];
+
+  return <Dropdown value={data.example} onChange={(i: any): void => onChange(i.value)} options={options} />;
+};
+
+export const Options = ({ i18n, data }: DTOptionsProps) => (
+  <div>
+    {i18n.separators}
+    <input type="text" style={{ width: 78 }} value={data.separator} title={i18n.separator_help} />
+  </div>
+);
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p>
+      {i18n.DESC}
+      {i18n.help_text}
+    </p>
+
+    <table cellPadding="0" cellSpacing="1">
+      <tbody>
+        <tr>
+          <td>
+            <h4>PersonalNumberWithoutHyphen</h4>
+          </td>
+          <td>{i18n.type_PersonalNumberWithoutHyphen}</td>
+        </tr>
+        <tr>
+          <td>
+            <h4>PersonalNumberWithHyphen</h4>
+          </td>
+          <td>{i18n.type_PersonalNumberWithHyphen}</td>
+        </tr>
+      </tbody>
+    </table>
+  </>
+);
+
+export const getMetadata = (): DTMetadata => {
+  // Called before separator is set, so margin should be used
+  // $len = 12 + strlen(static::$sep);
+  const len = 13; // should be enough, allow for max one char sep
+  return {
+    sql: {
+      field: `varchar(${len}) default NULL`,
+      field_Oracle: `varchar2(${len}) default NULL`,
+      field_MSSQL: `VARCHAR(${len}) NULL`
+    }
+  };
+};
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.worker.ts b/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.worker.ts
new file mode 100644
index 000000000..81c0bf02a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/PersonalNumber.worker.ts
@@ -0,0 +1,134 @@
+import { DTGenerateResult, DTMetadata } from '~types/dataTypes';
+
+export const generate = (): DTGenerateResult => {
+	return { display: '' };
+};
+
+/*
+	protected $isEnabled = true;
+	protected $dataTypeName = "PersonalNumber";
+	protected $dataTypeFieldGroup = "humanData";
+	protected $dataTypeFieldGroupOrder = 110;
+	protected $jsModules = array("PersonalNumber.js");
+	private $generatedPersonnrs = array();
+
+	// Separator in personal number
+	static $sep = "-";
+
+
+	// Generate a random personal number, and return the display string and additional meta data for use
+	// by any other Data Type.
+	public function generate($generator, $generationContextData) {
+		$generationOptions = $generationContextData["generationOptions"];
+
+		// Default, 12 siffers + '-'
+		// TODO: Option for 12 siffers without '-'
+		// TODO: more options? (not 10 siffers since it could generate real personal number)
+		// TODO: support several countries?
+                static::$sep = self::getPersonalNumberSeparator($generationOptions["cc_separator"]);
+		$personnr = $this->generateRandomSwedishPersonalNumber(static::$sep);
+
+		// pretty sodding unlikely, but just in case!
+		while (in_array($personnr, $this->generatedPersonnrs)) {
+			$personnr = $this->generateRandomSwedishPersonalNumber(static::$sep);
+		}
+		$this->generatedPersonnrs[] = $personnr;
+		return array(
+			"display" => $personnr
+		);
+	}
+
+	// TODO: add support for separator
+	// TODO: add support for organisation numbers
+	private static function generateRandomSwedishPersonalNumber($sep) {
+		$new_str = "16";
+		$cnt = 13;	// 12 siffers + 1 increment for separator
+
+		for ($i=2; $i<$cnt; $i++) {
+			switch ($i) {
+				case 2:
+					$rand = mt_rand(0, 99);
+					$new_str .= sprintf("%02d", $rand);
+					break;
+				case 4:
+					$rand = mt_rand(1, 12);
+					$new_str .= sprintf("%02d", $rand);
+					break;
+				case 6:
+					$rand = mt_rand(1, 30);
+					$new_str .= sprintf("%02d", $rand);
+					break;
+				case 8:
+					$new_str .= $sep;
+					break;
+				case 9:
+					$rand = mt_rand(0, 999);
+					$new_str .= sprintf("%03d", $rand);
+					break;
+				case 12:
+					$ctrl = static::recalcCtrl($new_str . "0", $sep);
+					$new_str .= sprintf("%01d", $ctrl);
+					break;
+				default:
+					break;
+			}
+		}
+
+		return $new_str;
+	}
+
+	// Function to recalculate control siffer in swedish personal number
+	public static function recalcCtrl($idNumber, $separator) {
+		$strArr = explode($separator, $idNumber);
+		$idNr = "";
+		for ($i=0; $i<count($strArr); $i++) {
+            $idNr .= $strArr[$i];
+        }
+
+		$idNrArr = str_split($idNr);
+
+		// Ogiltig längd
+		if (!((strlen($idNr) == 12) || (strlen($idNr) == 10))) {
+            return 99;
+        }
+
+		// OK, 12 siffers (person) or 10 siffers (organisation), recalculate control siffer
+		$sum = 0;
+
+		for ($i = strlen($idNr) - 10; $i< strlen($idNr) - 1; $i++) {
+			if ($i%2 == 0) {
+				$siffra = intval($idNrArr[$i]);
+				$partSum = $siffra * 2;
+				if ($partSum >= 10) {
+                    $partSum = (int)($partSum / 10) + ($partSum % 10);
+                }
+			} else {
+                $partSum = intval($idNrArr[$i]);
+            }
+			$sum += $partSum;
+		}
+
+		$ctrl = (10 - ($sum % 10)) % 10;
+
+		return $ctrl;
+	}
+
+
+	private static function getPersonalNumberSeparator($separators) {
+		$separatorList = explode("|", $separators);
+		$chosenSep = $separatorList[rand(0, count($separatorList)-1)];
+
+		// if no separator was entered use '' as default
+		if ($separators == "") {
+			$chosenSep = "";
+		}
+		return $chosenSep;
+	}
+
+	public function getRowGenerationOptionsUI($generator, $postdata, $colNum, $numCols) {
+		return array(
+			"cc_separator" => $postdata["dtOptionPersonalNumber_sep_$colNum"]
+		);
+	}
+
+*/
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/README.md b/packages/plugins/src/dataTypes/PersonalNumber/README.md
new file mode 100644
index 000000000..364424000
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/README.md
@@ -0,0 +1,4 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; PersonalNumber
+
+This Data Type generates a random personal number, used in some countries for social security insurance.
+
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/__tests__/PersonalNumber.test.tsx b/packages/plugins/src/dataTypes/PersonalNumber/__tests__/PersonalNumber.test.tsx
new file mode 100644
index 000000000..2dba02b6d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/__tests__/PersonalNumber.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../PersonalNumber';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps} />);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/bundle.ts b/packages/plugins/src/dataTypes/PersonalNumber/bundle.ts
new file mode 100644
index 000000000..0d0f07c16
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/bundle.ts
@@ -0,0 +1,13 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, getMetadata } from './PersonalNumber';
+import { initialState } from './PersonalNumber.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/config.ts b/packages/plugins/src/dataTypes/PersonalNumber/config.ts
new file mode 100644
index 000000000..19a79dca0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'countrySpecific',
+  fieldGroupOrder: 30
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/ar.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/ar.json
new file mode 100644
index 000000000..99f71d30a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/ar.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Personal Number",
+  "DESC": "Generates a personal number, used in some countries for social security insurance.",
+  "DEFAULT_TITLE": "number",
+  "help_text": "At the present time only swedish ones are supported. The personal numbers are generated according to the format you specify:",
+  "incomplete_fields": "The PersonalNumber data type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "A (swedish) personal number with 12 siffers and no hyphen",
+  "type_PersonalNumberWithHyphen": "A (swedish) personal number with 12 siffers and an hyphen",
+  "separators": "Separators:",
+  "separator_help": "The characters you enter here will be used as separator in the personal number fields. Note: you can mix several separators, use | to separate them (for example -|+)."
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/de.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/de.json
new file mode 100644
index 000000000..6d4bf6b9c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/de.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Persönliche Nummer",
+  "DESC": "Erzeugt persönliche Nummer , in einigen Ländern für die Sozialversicherung verwendet .",
+  "DEFAULT_TITLE": "number",
+  "help_text": "In der heutigen Zeit nur schwedisch diejenigen unterstützt werden. Die persönlichen Nummern werden nach dem Format, das Sie angeben, generiert:",
+  "incomplete_fields": "Die PersonalNumber Datentyp muss den im Textfeld eingegebenen Optionen Format haben . Bitte korrigieren Sie die folgenden Zeilen :",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "A ( schwedisch ) persönliche Nummer mit 12 siffers und ohne Bindestrich",
+  "type_PersonalNumberWithHyphen": "A ( schwedisch ) persönliche Nummer mit 12 siffers und einem Bindestrich",
+  "separators": "Abscheider :",
+  "separator_help": "Die Zeichen, die Sie hier eingeben, wird als Trennzeichen in den persönlichen Zahlenfeldern verwendet werden. Hinweis: Sie können mehrere Trennzeichen zu mischen, zu verwenden | um sie zu trennen (zum Beispiel - | +) ."
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/en.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/en.json
new file mode 100644
index 000000000..9ef8265e4
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/en.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Swedish Personal Number",
+  "DESC": "Generates a personal number, used in some countries for social security insurance.",
+  "DEFAULT_TITLE": "number",
+  "help_text": "The personal numbers are generated according to the format you specify:",
+  "incomplete_fields": "The PersonalNumber data type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "A (swedish) personal number with 12 siffers and no hyphen",
+  "type_PersonalNumberWithHyphen": "A (swedish) personal number with 12 siffers and an hyphen",
+  "separators": "Separators:",
+  "separator_help": "The characters you enter here will be used as separator in the personal number fields. Note: you can mix several separators, use | to separate them (for example -|+)."
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/es.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/es.json
new file mode 100644
index 000000000..c2fe0449f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/es.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Número personal",
+  "DESC": "Genera número personal , que se utiliza en algunos países para el seguro de la seguridad social.",
+  "DEFAULT_TITLE": "number",
+  "help_text": "En la actualidad sólo se admiten los suecos . Los números personales se generan de acuerdo con el formato que se especifica :",
+  "incomplete_fields": "El tipo de datos PersonalNumber necesita tener el formato especificado en el campo de texto Opciones . Por favor, corrija los siguientes filas :",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "Un número personal ( sueco ) con 12 siffers y sin guión",
+  "type_PersonalNumberWithHyphen": "Un número personal ( sueco ) con 12 siffers y un guión",
+  "separators": "Separadores :",
+  "separator_help": "Los caracteres que introduzca aquí se utilizará como separador de los campos de número de personales . Nota: usted puede mezclar varios separadores , utilice | para separarlos ( por ejemplo - | +) ."
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/fr.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/fr.json
new file mode 100644
index 000000000..ebf802064
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/fr.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Numéro personnel",
+  "DESC": "Génère numéro personnel , utilisé dans certains pays pour l'assurance de la sécurité sociale .",
+  "DEFAULT_TITLE": "number",
+  "help_text": "À l'heure actuelle seuls suédois sont pris en charge . Les numéros personnels sont générées selon le format que vous spécifiez :",
+  "incomplete_fields": "Le type de données PersonalNumber doit avoir le format entré dans le champ de texte Options. S'il vous plaît fixer les lignes suivantes :",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "Un ( swedish ) numéro personnel avec 12 siffers et sans trait d'union",
+  "type_PersonalNumberWithHyphen": "Un ( swedish ) numéro personnel avec 12 siffers et un trait d'union",
+  "separators": "Séparateurs :",
+  "separator_help": "Les caractères que vous entrez ici seront utilisés comme séparateur dans les champs numériques personnels . Remarque : vous pouvez mélanger plusieurs séparateurs , utilisez | pour les séparer ( par exemple - | + ) ."
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/hi.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/hi.json
new file mode 100644
index 000000000..8cdbcfc59
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/hi.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "स्वीडिश व्यक्तिगत नंबर",
+  "DESC": "कुछ देशों में सामाजिक सुरक्षा बीमा के लिए उपयोग किया जाने वाला एक व्यक्तिगत नंबर बनाता है।",
+  "DEFAULT_TITLE": "number",
+  "help_text": "व्यक्तिगत नंबर आपके द्वारा निर्दिष्ट प्रारूप के अनुसार उत्पन्न होते हैं:",
+  "incomplete_fields": "PersonalNumber डेटा प्रकार के लिए विकल्प टेक्स्ट फ़ील्ड में प्रारूप दर्ज होना आवश्यक है। कृपया निम्न पंक्तियों को ठीक करें:",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "A (स्वीडिश) व्यक्तिगत नंबर जिसमें 12 सिफ़र हैं और कोई हाइफ़न नहीं है",
+  "type_PersonalNumberWithHyphen": "A (स्वीडिश) १२ सिफ़र्स और एक हाइफ़न के साथ व्यक्तिगत नंबर",
+  "separators": "विभाजक:",
+  "separator_help": "आपके द्वारा यहां दर्ज किए गए वर्ण व्यक्तिगत संख्या फ़ील्ड में विभाजक के रूप में उपयोग किए जाएंगे। नोट: आप कई विभाजकों को मिला सकते हैं, उपयोग करें | उन्हें अलग करने के लिए (उदाहरण के लिए -|+)।"
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/ja.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/ja.json
new file mode 100644
index 000000000..99f71d30a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/ja.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Personal Number",
+  "DESC": "Generates a personal number, used in some countries for social security insurance.",
+  "DEFAULT_TITLE": "number",
+  "help_text": "At the present time only swedish ones are supported. The personal numbers are generated according to the format you specify:",
+  "incomplete_fields": "The PersonalNumber data type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "A (swedish) personal number with 12 siffers and no hyphen",
+  "type_PersonalNumberWithHyphen": "A (swedish) personal number with 12 siffers and an hyphen",
+  "separators": "Separators:",
+  "separator_help": "The characters you enter here will be used as separator in the personal number fields. Note: you can mix several separators, use | to separate them (for example -|+)."
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/nl.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/nl.json
new file mode 100644
index 000000000..53d82f3ba
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/nl.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Persoonsnummer",
+  "DESC": "Genereert persoonlijke nummers die in sommige landen worden gebruikt voor de sociale verzekering .",
+  "DEFAULT_TITLE": "number",
+  "help_text": "Op dit moment worden alleen de Zweedse persoonsnummers ondersteund. De persoonlijke nummers worden gegenereerd volgens het formaat dat u opgeeft :",
+  "incomplete_fields": "U moet in het Optieveld het formaat opgeven. Corrigeer de volgende rijen :",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "Een (Zweeds) persoonsnummer van 12 cijferszonder koppelteken",
+  "type_PersonalNumberWithHyphen": "Een (Zweeds) persoonsnummer van 12 cijfers met eenkoppelteken",
+  "separators": "Scheidingstekens :",
+  "separator_help": "De tekens die u hier invoert worden gebruikt als scheidingsteken in het persoonnummer. Let op : je kunt meerdere schedingstekens tegelijkertijd gebruiken. Scheiden door een | teken. Bijvoorbeeld - | + ."
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/pt.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/pt.json
new file mode 100644
index 000000000..396bc10af
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/pt.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Número pessoal sueco",
+  "DESC": "Gera um número pessoal, usado em alguns países para seguro de previdência social.",
+  "DEFAULT_TITLE": "númeropessoal",
+  "help_text": "Os números pessoais são gerados de acordo com o formato que você especificar:",
+  "incomplete_fields": "O tipo de dados PersonalNumber precisa ter o formato inserido no campo de texto Opções. Corrija as seguintes linhas:",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "Um número pessoal (sueco) com 12 siffers e nenhum hífen",
+  "type_PersonalNumberWithHyphen": "Um número pessoal (sueco) com 12 siffers e um hífen",
+  "separators": "Separadores:",
+  "separator_help": "Os caracteres inseridos aqui serão usados como separadores nos campos de números pessoais. Nota: você pode misturar vários separadores, use | para separá-los (por exemplo - | +)."
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/ru.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/ru.json
new file mode 100644
index 000000000..4ca343028
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/ru.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Шведский личный номер",
+  "DESC": "Генерирует личный номер, используемый в некоторых странах для социального страхования.",
+  "DEFAULT_TITLE": "number",
+  "help_text": "Персональные номера генерируются в соответствии с указанным вами форматом:",
+  "incomplete_fields": "Тип данных PersonalNumber должен иметь формат, введенный в текстовом поле Options. Исправьте следующие строки:",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "(Шведский) личный номер с 12 сифферами и без дефиса.",
+  "type_PersonalNumberWithHyphen": "(Шведский) личный номер с 12 сифферами и дефисом.",
+  "separators": "Сепараторы:",
+  "separator_help": "Введенные здесь символы будут использоваться в качестве разделителя в полях личного номера. Примечание: вы можете смешивать несколько разделителей, используйте | чтобы разделить их (например, -|+)."
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/ta.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/ta.json
new file mode 100644
index 000000000..99f71d30a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/ta.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Personal Number",
+  "DESC": "Generates a personal number, used in some countries for social security insurance.",
+  "DEFAULT_TITLE": "number",
+  "help_text": "At the present time only swedish ones are supported. The personal numbers are generated according to the format you specify:",
+  "incomplete_fields": "The PersonalNumber data type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "A (swedish) personal number with 12 siffers and no hyphen",
+  "type_PersonalNumberWithHyphen": "A (swedish) personal number with 12 siffers and an hyphen",
+  "separators": "Separators:",
+  "separator_help": "The characters you enter here will be used as separator in the personal number fields. Note: you can mix several separators, use | to separate them (for example -|+)."
+}
diff --git a/packages/plugins/src/dataTypes/PersonalNumber/i18n/zh.json b/packages/plugins/src/dataTypes/PersonalNumber/i18n/zh.json
new file mode 100644
index 000000000..99f71d30a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PersonalNumber/i18n/zh.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Personal Number",
+  "DESC": "Generates a personal number, used in some countries for social security insurance.",
+  "DEFAULT_TITLE": "number",
+  "help_text": "At the present time only swedish ones are supported. The personal numbers are generated according to the format you specify:",
+  "incomplete_fields": "The PersonalNumber data type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "example_PersonalNumberWithoutHyphen": "167502241016",
+  "example_PersonalNumberWithHyphen": "16750224-1016",
+  "type_PersonalNumberWithoutHyphen": "A (swedish) personal number with 12 siffers and no hyphen",
+  "type_PersonalNumberWithHyphen": "A (swedish) personal number with 12 siffers and an hyphen",
+  "separators": "Separators:",
+  "separator_help": "The characters you enter here will be used as separator in the personal number fields. Note: you can mix several separators, use | to separate them (for example -|+)."
+}
diff --git a/packages/plugins/src/dataTypes/Phone/Phone.generate.ts b/packages/plugins/src/dataTypes/Phone/Phone.generate.ts
new file mode 100644
index 000000000..f1bfdd7ba
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/Phone.generate.ts
@@ -0,0 +1,12 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = ({ rowState }: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  // for backward compatibility
+  const value = Array.isArray(rowState) ? rowState : rowState.option;
+  const item: string = utils.randomUtils.getRandomArrayValue(value);
+
+  return {
+    display: utils.randomUtils.generateRandomAlphanumericStr(item)
+  };
+};
diff --git a/packages/plugins/src/dataTypes/Phone/Phone.state.tsx b/packages/plugins/src/dataTypes/Phone/Phone.state.tsx
new file mode 100755
index 000000000..cc1b8c704
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/Phone.state.tsx
@@ -0,0 +1,17 @@
+export type PhoneState = {
+	example: string;
+	option: string[];
+};
+
+export type GenerationOptionsType = {
+	option: string[];
+};
+
+export const defaultGenerationOptions: GenerationOptionsType = {
+	option: ['1-Xxx-Xxx-xxxx', '(Xxx) Xxx-xxxx']
+};
+
+export const initialState: PhoneState = {
+	example: '1-Xxx-Xxx-xxxx|(Xxx) Xxx-xxxx',
+	...defaultGenerationOptions
+};
diff --git a/packages/plugins/src/dataTypes/Phone/Phone.tsx b/packages/plugins/src/dataTypes/Phone/Phone.tsx
new file mode 100755
index 000000000..c7c8ff652
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/Phone.tsx
@@ -0,0 +1,55 @@
+import * as React from 'react';
+import Dropdown from '~components/dropdown/Dropdown';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import CreatablePillField from '~components/creatablePillField/CreatablePillField';
+import { PhoneState, GenerationOptionsType } from './Phone.state';
+
+export const rowStateReducer = (state: PhoneState): GenerationOptionsType => ({ option: state.option });
+
+export const Example = ({ i18n, data, onUpdate }: DTExampleProps) => {
+  const onChange = (value: any): void => {
+    onUpdate({
+      example: value,
+      option: value.split('|')
+    });
+  };
+
+  const options = [
+    { value: '1-Xxx-Xxx-xxxx|(Xxx) Xxx-xxxx', label: i18n.northAmerica },
+    {
+      value:
+        '(01xxxx) xxxxx|(01xxx) xxxxxx|(01x1) xxx xxxx|(011x) xxx xxxx|(02x) xxxx xxxx|03xx xxx xxxx|055 xxxx xxxx|056 xxxx xxxx|070 xxxx xxxx|07624 xxxxxx|076 xxxx xxxx|07xxx xxxxxx|0800 xxx xxxx|08xx xxx xxxx|09xx xxx xxxx|(016977) xxxx|(01xxx) xxxxx|0500 xxxxxx|0800 xxxxxx|0800 1111|0845 46 4x',
+      label: i18n.uk
+    },
+    { value: '0X xx xx xx xx', label: i18n.france },
+    { value: '(0X) xxxx xxxx', label: i18n.australia },
+    { value: '(0xx) xxxxxxxx|(0xxx) xxxxxxxx|(0xxxx) xxxxxxx|(03xxxx) xxxxxx', label: i18n.germany },
+    { value: '0xx-xxx-xxxx', label: i18n.japan },
+    { value: '1-Xxx-Xxx-xxxx|Xxx-xxxx', label: i18n.differentFormats }
+  ];
+
+  return <Dropdown value={data.example} onChange={(i: any): void => onChange(i.value)} options={options} />;
+};
+
+export const Options = ({ data, coreI18n, onUpdate }: DTOptionsProps) => (
+  <CreatablePillField
+    error={data.option.length ? '' : coreI18n.requiredField}
+    value={data.option}
+    onChange={(values: any): void => onUpdate({ ...data, option: values })}
+  />
+);
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p dangerouslySetInnerHTML={{ __html: i18n.helpText1 }} />
+    <p dangerouslySetInnerHTML={{ __html: i18n.helpText2 }} />
+  </>
+);
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'varchar(100) default NULL',
+    field_Oracle: 'varchar2(100) default NULL',
+    field_MSSQL: 'VARCHAR(100) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/Phone/Phone.worker.ts b/packages/plugins/src/dataTypes/Phone/Phone.worker.ts
new file mode 100644
index 000000000..84ff39c22
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/Phone.worker.ts
@@ -0,0 +1,13 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from "~types/dataTypes";
+import { generate } from './Phone.generate';
+
+let workerUtilsLoaded = false;
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!workerUtilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		workerUtilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Phone/README.md b/packages/plugins/src/dataTypes/Phone/README.md
new file mode 100644
index 000000000..8e1be1617
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/README.md
@@ -0,0 +1,116 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Phone
+
+This Data Type generates a phone number with a simple search-replace algorithm. Any `X`'s in the placeholder
+string are replaced with 1-9; any `x`'s (lowercase) are replaced with 0-9. 
+
+
+## Examples
+
+- [Generate a random phone number in a single format](#generate-a-random-phone-number-in-a-single-format) 
+- [Generate a random phone number in multiple formats](#generate-a-random-phone-number-in-multiple-formats)
+
+### Generate a random phone number in a single format
+
+```typescript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Phone',
+            title: 'phoneNum',
+            settings: {
+                option: ['(Xxx) Xxx-xxxx']
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: ExportType.JSON,
+        settings: {
+            dataStructureFormat
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "phoneNum": "(143) 454-2481"
+    },
+    {
+        "phoneNum": "(988) 411-7252"
+    },
+    {
+        "phoneNum": "(340) 460-3834"
+    },
+    {
+        "phoneNum": "(380) 685-3692"
+    },
+    {
+        "phoneNum": "(337) 643-8780"
+    },
+    {
+        "phoneNum": "(344) 746-2939"
+    },
+    ...
+]
+```
+
+### Generate a random phone number in multiple formats
+
+```typescript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Phone',
+            title: 'phoneNum',
+            settings: {
+                option: [
+					'(Xxx) Xxx-xxxx',
+                    '1 (Xxx) Xxx-xxxx',
+					'Xxx Xxx-xxxx'
+                ]
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output:
+
+```javascript
+[
+    {
+        "phoneNum": "882 579-5511"
+    },
+    {
+        "phoneNum": "(237) 433-6484"
+    },
+    {
+        "phoneNum": "(244) 278-9347"
+    },
+    {
+        "phoneNum": "1 (927) 607-4334"
+    },
+    {
+        "phoneNum": "553 957-8737"
+    },
+    {
+        "phoneNum": "302 923-7126"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/Phone/__tests__/Phone.generate.test.ts b/packages/plugins/src/dataTypes/Phone/__tests__/Phone.generate.test.ts
new file mode 100644
index 000000000..ec8cf5fda
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/__tests__/Phone.generate.test.ts
@@ -0,0 +1,30 @@
+import sinon from 'sinon';
+import { onmessage } from '../Phone.worker';
+import { getBlankDTGeneratorPayload } from '../../../../../tests/testHelpers';
+import utils from '~utils/index';
+
+describe('onmessage', () => {
+	const postMessage = jest.fn();
+	const importScripts = jest.fn();
+	beforeAll(() => {
+		window.postMessage = postMessage;
+		window.importScripts = importScripts;
+	});
+
+	it('generates random data', () => {
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				rowState: {
+					option: 'Xxx-xxxx'
+				}
+			}
+		};
+
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue').returns(0);
+		sinon.stub(utils.randomUtils, 'generateRandomAlphanumericStr').returns('converted');
+
+		onmessage(payload);
+		expect(postMessage).toHaveBeenCalledWith({ display: 'converted' });
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Phone/__tests__/Phone.ui.test.tsx b/packages/plugins/src/dataTypes/Phone/__tests__/Phone.ui.test.tsx
new file mode 100644
index 000000000..8d7c26f75
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/__tests__/Phone.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../Phone';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Phone/bundle.ts b/packages/plugins/src/dataTypes/Phone/bundle.ts
new file mode 100644
index 000000000..7cc8a0091
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/bundle.ts
@@ -0,0 +1,14 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, rowStateReducer, getMetadata } from './Phone';
+import { initialState } from './Phone.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	rowStateReducer,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Phone/config.ts b/packages/plugins/src/dataTypes/Phone/config.ts
new file mode 100644
index 000000000..452499b09
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'humanData',
+  fieldGroupOrder: 20
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/ar.json b/packages/plugins/src/dataTypes/Phone/i18n/ar.json
new file mode 100644
index 000000000..f10a5e0ec
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/ar.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "الهاتف / الفاكس",
+  "DESC": "يولد رقم هاتف / فاكس عشوائيًا بتنسيقات متنوعة لبلدان / مناطق مختلفة.",
+  "DEFAULT_TITLE": "هاتف",
+  "differentFormats": "تنسيقات مختلفة",
+  "northAmerica": "شمال امريكا",
+  "helpText1": "أيًا كان النص الذي تدخله في حقل نص الخيارات ، فسيتم استخدامه لإنشاء أرقام هواتف. سيتم تحويل رأس المال X إلى رقم عشوائي بين 1 و 9 ؛ سيتم تحويل أحرف x الصغيرة إلى رقم عشوائي بين 0 و 9.",
+  "helpText2": "حدد إحدى القيم في أمثلة القائمة المنسدلة لبعض الأفكار. تذكر: أي شيء بخلاف الحرفين x و X يتم تركهما بدون تحويل",
+  "incompleteFields": "يحتاج نوع بيانات الهاتف / الفاكس إلى إدخال التنسيق في حقل نص الخيارات. الرجاء إصلاح الصفوف التالية:",
+  "uk": "المملكة المتحدة",
+  "france": "فرنسا",
+  "germany": "ألمانيا",
+  "australia": "أستراليا",
+  "japan": "اليابان"
+}
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/de.json b/packages/plugins/src/dataTypes/Phone/i18n/de.json
new file mode 100644
index 000000000..451805332
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/de.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Telefon / Fax",
+  "DESC": "Erzeugt eine Zufalls Telefon- / Faxnummer in einer Vielzahl von Formaten für verschiedene Länder / Regionen .",
+  "DEFAULT_TITLE": "telefon",
+  "australia": "Australien",
+  "differentFormats": "Unterschiedliche Formate",
+  "northAmerica": "Nordamerika",
+  "france": "Frankreich",
+  "germany": "Deutschland",
+  "helpText1": "Was Text Sie in den Optionen Textfeld eingeben werden verwendet, um Telefonnummern zu generieren. Kapital <b>X</b>'s zu einer Zufallszahl zwischen 1 und 9 umgewandelt werden; Kleinbuchstaben <b>x</b>'s zu einer Zufallszahl umgewandelt werden zwischen 0 und 9.",
+  "helpText2": "Wählen Sie einen der Werte im Beispiel Dropdown für einige Ideen. Denken Sie daran: alles andere als die <b>X</b> und <b>x</b>-Zeichen übrig unbekehrt.",
+  "incompleteFields": "The Phone / Fax Datentyp haben muss das Format eingetragen im Options Textfeld. Bitte beheben Sie die folgenden Zeilen:",
+  "japan": "Japan",
+  "uk": "Vereinigtes Königreich"
+}
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/en.json b/packages/plugins/src/dataTypes/Phone/i18n/en.json
new file mode 100644
index 000000000..a1c7f0c95
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/en.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Phone / Fax",
+  "DESC": "Generates a random phone/fax number in a variety of formats for different countries/regions.",
+  "DEFAULT_TITLE": "phone",
+  "differentFormats": "Different formats",
+  "northAmerica": "North America",
+  "helpText1": "Whatever text you enter into the options text field will be used to generate telephone numbers. Uppercase <b>X</b>'s will be converted to a random number between 1 and 9; lowercase <b>x</b>'s will be converted to a random number between 0 and 9.",
+  "helpText2": "Select one of the values in the example dropdown for some ideas. Remember: any other characters besides <b>X</b> and <b>x</b> will be left unconverted.",
+  "incompleteFields": "The Phone / Fax data type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "uk": "UK",
+  "france": "France",
+  "germany": "Germany",
+  "australia": "Australia",
+  "japan": "Japan"
+}
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/es.json b/packages/plugins/src/dataTypes/Phone/i18n/es.json
new file mode 100644
index 000000000..3616fea30
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/es.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Teléfono / Fax",
+  "DESC": "Genera un número de teléfono / fax al azar en una variedad de formatos para diferentes países / regiones.",
+  "DEFAULT_TITLE": "telefono",
+  "differentFormats": "Formatos diferentes",
+  "northAmerica": "Norteamérica",
+  "helpText1": "Cualquier texto que introduces en el campo de texto de las opciones será usado para generar números de teléfono. Una <b>X</b> mayúscula será convertida a un número aleatorio entre 1 y 9; Una <b>x</b> minúscula será convertida a un número entre 0 y 9.",
+  "helpText2": "Elije uno de los valores del desplegable de ejemplos para ver algunas ideas. Recuerda: cualquier cosa distinta de los caracteres <b>X</b> y <b>x</b> no será convertida.",
+  "incompleteFields": "El tipo de dato Teléfono requiere informar el formato en el campo de texto Opciones. Por favor, arregla las siguientes filas:",
+  "uk": "Reino Unido",
+  "france": "Francia",
+  "germany": "Alemania",
+  "australia": "Australia",
+  "japan": "Japón"
+}
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/fr.json b/packages/plugins/src/dataTypes/Phone/i18n/fr.json
new file mode 100644
index 000000000..c5c7fc898
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/fr.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Téléphone / Fax",
+  "DESC": "Génère un numéro de téléphone / fax aléatoire dans une variété de formats pour les différents pays / régions .",
+  "DEFAULT_TITLE": "telephone",
+  "australia": "Australie",
+  "differentFormats": "Différents formats",
+  "northAmerica": "Amérique du Nord",
+  "france": "France",
+  "germany": "Allemagne",
+  "helpText1": "Quel que soit le texte que vous saisissez dans le champ de texte options, il sera utilisé pour générer des numéros de téléphone. Les <b>X</b> majuscules seront converties en un nombre aléatoire compris entre 1 et 9 et les <b>x</b> minuscules seront converties en un nombre aléatoire entre 0 et 9.",
+  "helpText2": "Sélectionnez l'une des valeurs de l'exemple pour avoir une idée du fonctionnement. Rappelez-vous: rien d'autre que les caractères <b>X</b> et <b>x</b> ne sera converti.",
+  "incompleteFields": "Le type de téléphone / fax de données doit avoir un format précisé dans le champ de texte Options. Corrigez les lignes suivantes:",
+  "japan": "Japon",
+  "uk": "Royaume-Uni"
+}
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/hi.json b/packages/plugins/src/dataTypes/Phone/i18n/hi.json
new file mode 100644
index 000000000..1359060c8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/hi.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "फोन / फैक्स",
+  "DESC": "विभिन्न देशों/क्षेत्रों के लिए विभिन्न स्वरूपों में एक यादृच्छिक फोन/फैक्स नंबर उत्पन्न करता है।",
+  "DEFAULT_TITLE": "फ़ोन",
+  "differentFormats": "विभिन्न प्रारूप",
+  "northAmerica": "उत्तरी अमेरिका",
+  "helpText1": "आप विकल्प टेक्स्ट फ़ील्ड में जो भी टेक्स्ट दर्ज करते हैं, उसका उपयोग टेलीफ़ोन नंबर जेनरेट करने के लिए किया जाएगा। अपरकेस <b>X</b> को 1 और 9 के बीच एक यादृच्छिक संख्या में बदल दिया जाएगा; लोअरकेस <b>x</b> को 0 और 9 के बीच एक यादृच्छिक संख्या में बदल दिया जाएगा।",
+  "helpText2": "कुछ उपायों के लिए उदाहरण ड्रॉपडाउन में से किसी एक मान का चयन करें। याद रखें: <b>X</b> और <b>x</b> के अलावा कोई अन्य वर्ण अपरिवर्तित छोड़ दिया जाएगा।",
+  "incompleteFields": "फ़ोन / फ़ैक्स डेटा प्रकार को विकल्प टेक्स्ट फ़ील्ड में प्रारूप दर्ज करने की आवश्यकता है। कृपया निम्न पंक्तियों को ठीक करें:",
+  "uk": "यूके",
+  "france": "फ्रांस",
+  "germany": "जर्मनी",
+  "australia": "ऑस्ट्रेलिया",
+  "japan": "जापान"
+}
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/ja.json b/packages/plugins/src/dataTypes/Phone/i18n/ja.json
new file mode 100644
index 000000000..a78f6ced4
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/ja.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "電話/ファックス",
+  "DESC": "国/地域ごとにさまざまな形式でランダムな電話/ファックス番号を生成します。",
+  "DEFAULT_TITLE": "電話",
+  "differentFormats": "さまざまな形式",
+  "northAmerica": "北米",
+  "helpText1": "オプションテキストフィールドに入力したテキストはすべて、電話番号の生成に使用されます。 大文字のXは、1から9までの乱数に変換されます。 小文字のxは、0から9までの乱数に変換されます。",
+  "helpText2": "いくつかのアイデアについては、例のドロップダウンで値の1つを選択してください。 覚えておいてください：Xとx文字以外は変換されないままです。",
+  "incompleteFields": "電話/ファックスのデータ型では、[オプション]テキストフィールドに形式を入力する必要があります。 次の行を修正してください。",
+  "uk": "英国",
+  "france": "フランス",
+  "germany": "ドイツ",
+  "australia": "オーストラリア",
+  "japan": "日本"
+}
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/nl.json b/packages/plugins/src/dataTypes/Phone/i18n/nl.json
new file mode 100644
index 000000000..095d648a3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/nl.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Telefoon / Faxnummer",
+  "DESC": "Genereert een willekeurig telefoonnummer of faxnummer in een verscheidenheid van formaten voor verschillende landen of regio's.",
+  "DEFAULT_TITLE": "telefoon",
+  "australia": "Australië",
+  "differentFormats": "Verschillende formaten",
+  "northAmerica": "Noord Amerika",
+  "france": "Frankrijk",
+  "germany": "Duitsland",
+  "helpText1": "De tekst/tekens die u in het optieveld invoerd worden gebruikt voor het genereren van de nummers. Hoofdletter <b>X</b> zal worden omgezet in een willekeurig getal tussen 1 en 9; Kleine letter <b>x</b>' zal worden omgezet naar een willekeurig getal tussen 0 en 9.",
+  "helpText2": "In de dropdown staan verschillende voorbeelden. Vergeet niet: iets anders dan de <b>X</b> en <b>x</b> karakter worden 1 op 1 overgenomen.",
+  "incompleteFields": "U moet een waarde invoeren in het Optieveld. Pas de volgende rij(en) aan:",
+  "japan": "Japan",
+  "uk": "UK"
+}
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/pt.json b/packages/plugins/src/dataTypes/Phone/i18n/pt.json
new file mode 100644
index 000000000..c49ee3265
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/pt.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Telefone / Fax",
+  "DESC": "Gera um número de telefone / fax aleatório em uma variedade de formatos para diferentes países / regiões.",
+  "DEFAULT_TITLE": "telefone",
+  "differentFormats": "Formatos diferentes",
+  "northAmerica": "América do Norte",
+  "helpText1": "Qualquer texto inserido no campo de texto de opções será usado para gerar números de telefone. <b>X</b> em maiúsculas serão convertidos em um número aleatório entre 1 e 9; <b>x</b> minúsculos serão convertidos em um número aleatório entre 0 e 9.",
+  "helpText2": "Selecione um dos valores no menu suspenso de exemplo para algumas ideias. Lembre-se: quaisquer outros caracteres além de <b>X</b> e <b>x</b> não serão convertidos.",
+  "incompleteFields": "O tipo de dados Telefone / Fax precisa ter o formato inserido no campo de texto Opções. Corrija as seguintes linhas:",
+  "uk": "Reino Unido",
+  "france": "França",
+  "germany": "Alemanha",
+  "australia": "Austrália",
+  "japan": "Japão"
+}
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/ru.json b/packages/plugins/src/dataTypes/Phone/i18n/ru.json
new file mode 100644
index 000000000..d754afed1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/ru.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Телефон/факс",
+  "DESC": "Генерирует случайный номер телефона/факса в различных форматах для разных стран/регионов.",
+  "DEFAULT_TITLE": "Телефон",
+  "differentFormats": "Различные форматы",
+  "northAmerica": "Северная Америка",
+  "helpText1": "Какой бы текст вы ни ввели в текстовое поле параметров, он будет использоваться для генерации телефонных номеров. Прописные X будут преобразованы в случайное число от 1 до 9; строчные x будут преобразованы в случайное число от 0 до 9.",
+  "helpText2": "Выберите одно из значений в раскрывающемся списке примеров для некоторых идей. Помните: любые другие символы, кроме X и x, не будут преобразованы.",
+  "incompleteFields": "Тип данных «Телефон/факс» должен иметь формат, введенный в текстовом поле «Параметры». Исправьте следующие строки:",
+  "uk": "Великобритания",
+  "france": "Франция",
+  "germany": "Германия",
+  "australia": "Австралия",
+  "japan": "Япония"
+}
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/ta.json b/packages/plugins/src/dataTypes/Phone/i18n/ta.json
new file mode 100644
index 000000000..c8bf6ad62
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/ta.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "தொலைபேசி / தொலைநகல்",
+  "DESC": "வெவ்வேறு நாடுகள் / பிராந்தியங்களுக்கான பல்வேறு வடிவங்களில் சீரற்ற தொலைபேசி / தொலைநகல் எண்ணை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "தொலைபேசி",
+  "differentFormats": "வெவ்வேறு வடிவங்கள்",
+  "northAmerica": "வட அமெரிக்கா",
+  "helpText1": "தொலைபேசி எண்களை உருவாக்க விருப்பங்கள் உரை புலத்தில் நீங்கள் எந்த உரையை உள்ளிடுகிறீர்கள். மூலதன எக்ஸ் 1 மற்றும் 9 க்கு இடையில் ஒரு சீரற்ற எண்ணாக மாற்றப்படும்; லோயர்-கேஸ் x கள் 0 மற்றும் 9 க்கு இடையில் ஒரு சீரற்ற எண்ணாக மாற்றப்படும்.",
+  "helpText2": "சில யோசனைகளுக்கு எடுத்துக்காட்டு கீழ்தோன்றலில் உள்ள மதிப்புகளில் ஒன்றைத் தேர்ந்தெடுக்கவும். நினைவில் கொள்ளுங்கள்: எக்ஸ் மற்றும் எக்ஸ் எழுத்துக்களைத் தவிர வேறு எதுவும் மாற்றப்படாமல் உள்ளன.",
+  "incompleteFields": "தொலைபேசி / தொலைநகல் தரவு வகைக்கு விருப்பங்கள் உரை புலத்தில் உள்ளிடப்பட்டிருக்க வேண்டும். பின்வரும் வரிசைகளை சரிசெய்யவும்:",
+  "uk": "யுகே",
+  "france": "பிரான்ஸ்",
+  "germany": "ஜெர்மனி",
+  "australia": "ஆஸ்திரேலியா",
+  "japan": "ஜப்பான்"
+}
diff --git a/packages/plugins/src/dataTypes/Phone/i18n/zh.json b/packages/plugins/src/dataTypes/Phone/i18n/zh.json
new file mode 100644
index 000000000..a6e1450d3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Phone/i18n/zh.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "电话/传真",
+  "DESC": "为不同的国家/地区生成各种格式的随机电话/传真号码。",
+  "DEFAULT_TITLE": "电话",
+  "differentFormats": "不同格式",
+  "northAmerica": "北美",
+  "helpText1": "您在选项文本字段中输入的任何文本都将用于生成电话号码。 大写的X将转换为1到9之间的随机数； 小写的x将转换为0到9之间的随机数。",
+  "helpText2": "在示例下拉列表中选择一些值以获取一些想法。 请记住：X和x字符以外的任何其他字符都将保持不变。",
+  "incompleteFields": "电话/传真数据类型需要具有在“选项”文本字段中输入的格式。 请修正以下几行：",
+  "uk": "英国",
+  "france": "法国",
+  "germany": "德国",
+  "australia": "澳大利亚",
+  "japan": "日本"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/PostalZip.generate.ts b/packages/plugins/src/dataTypes/PostalZip/PostalZip.generate.ts
new file mode 100644
index 000000000..5e3fb5c9a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/PostalZip.generate.ts
@@ -0,0 +1,82 @@
+import utils from '../../../utils';
+import { DTGenerationData, DTGenerateResult } from '~types/dataTypes';
+import { CountryDataType, CountryType, Region } from '~types/countries';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { rowState, countryData, existingRowData } = data;
+  const { source, selectedCountries } = rowState;
+
+  const countryList = utils.countryUtils.getCountryList();
+  let country: CountryType;
+  let regionRow: any;
+
+  if (source === 'any') {
+    country = utils.randomUtils.getRandomArrayValue(countryList as CountryType[]);
+  } else if (source === 'countries') {
+    const list = selectedCountries.length ? selectedCountries : countryList;
+    country = utils.randomUtils.getRandomArrayValue(list);
+  } else if (source === 'countryRow') {
+    const countryRow = existingRowData.find(({ id }) => id === rowState.targetRowId);
+    country = countryRow!.data.countryDataType;
+
+    // region row
+  } else {
+    regionRow = existingRowData.find(({ id }) => id === rowState.targetRowId);
+    country = regionRow!.data.countryDataType;
+  }
+
+  if (!country) {
+    return { display: '' };
+  }
+
+  // if the user selected a row containing region data as the source for generating a zip, check the user has
+  // actually entered all necessary UI options for formatting options (short / full), otherwise we won't know what to generate
+  if (regionRow) {
+    if (!regionRow!.data.display || !regionRow!.data.displayFormat) {
+      return { display: '' };
+    }
+  }
+
+  const selectedCountry = countryData[country];
+  let selectedRegion: Region;
+  if (regionRow) {
+    const property = regionRow!.data.displayFormat === 'short' ? 'regionShort' : 'regionName';
+    selectedRegion = selectedCountry.regions.find((i: Region) => i[property] === regionRow!.data.display) as Region;
+  } else {
+    selectedRegion = utils.randomUtils.getRandomArrayValue(selectedCountry.regions);
+  }
+
+  return {
+    display: getRegionPostalCode(selectedCountry, selectedRegion)
+  };
+};
+
+const getRegionPostalCode = (countryData: CountryDataType, region: Region): string => {
+  let placeholders: any = {};
+
+  let format: string = countryData.extendedData.zipFormat.format;
+
+  if (countryData.extendedData.zipFormat.replacements) {
+    placeholders = countryData.extendedData.zipFormat.replacements;
+  }
+
+  if (region.extendedData) {
+    if (region.extendedData.zipFormat) {
+      if (region.extendedData.zipFormat.format) {
+        format = region.extendedData.zipFormat.format;
+      }
+      if (region.extendedData.zipFormat.replacements) {
+        placeholders = {
+          ...placeholders,
+          ...region.extendedData.zipFormat.replacements
+        };
+      }
+    }
+  }
+
+  const formats = format.split('|');
+  const selectedFormat = utils.randomUtils.getRandomArrayValue(formats);
+
+  return utils.randomUtils.generatePlaceholderStr(selectedFormat, placeholders);
+};
diff --git a/packages/plugins/src/dataTypes/PostalZip/PostalZip.scss b/packages/plugins/src/dataTypes/PostalZip/PostalZip.scss
new file mode 100644
index 000000000..a013c6a46
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/PostalZip.scss
@@ -0,0 +1,3 @@
+.buttonLabel {
+	margin-top: 4px;
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/PostalZip.scss.d.ts b/packages/plugins/src/dataTypes/PostalZip/PostalZip.scss.d.ts
new file mode 100644
index 000000000..b54f0596c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/PostalZip.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace PostalZipScssNamespace {
+  export interface IPostalZipScss {
+    buttonLabel: string;
+  }
+}
+
+declare const PostalZipScssModule: PostalZipScssNamespace.IPostalZipScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: PostalZipScssNamespace.IPostalZipScss;
+};
+
+export = PostalZipScssModule;
diff --git a/packages/plugins/src/dataTypes/PostalZip/PostalZip.state.tsx b/packages/plugins/src/dataTypes/PostalZip/PostalZip.state.tsx
new file mode 100755
index 000000000..94193f20e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/PostalZip.state.tsx
@@ -0,0 +1,39 @@
+import { CountryType } from '../../';
+
+export const enum PostalZipSourceEnum {
+  any = 'any',
+  countries = 'countries',
+  countryRow = 'countryRow',
+  regionRow = 'regionRow'
+}
+export type PostalZipSource = `${PostalZipSourceEnum}`;
+
+export type PostalZipState = {
+  source: PostalZipSource;
+  selectedCountries: CountryType[];
+  targetRowId: string;
+};
+
+export const initialState: PostalZipState = {
+  source: PostalZipSourceEnum.any,
+  selectedCountries: [],
+  targetRowId: ''
+};
+
+export const defaultGenerationOptions = initialState;
+
+export type PostalZipStateAny = {
+  source: 'any' | PostalZipSourceEnum.any;
+};
+
+export type PostalZipStateCountries = {
+  source: 'countries' | PostalZipSourceEnum.countries;
+  selectedCountries: CountryType[];
+};
+
+export type PostalZipStateDataRow = {
+  source: PostalZipSourceEnum.countryRow | PostalZipSourceEnum.regionRow | 'countryRow' | 'regionRow';
+  targetRowId: string;
+};
+
+export type GenerationOptionsType = PostalZipStateAny | PostalZipStateCountries | PostalZipStateDataRow;
diff --git a/packages/plugins/src/dataTypes/PostalZip/PostalZip.store.tsx b/packages/plugins/src/dataTypes/PostalZip/PostalZip.store.tsx
new file mode 100644
index 000000000..0ee5e923d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/PostalZip.store.tsx
@@ -0,0 +1,54 @@
+import { createSelector } from 'reselect';
+import { DTCustomProps } from '~types/dataTypes';
+import { getSortedRowsArray } from '~store/generator/generator.selectors';
+import { PostalZipState, PostalZipSource } from './PostalZip.state';
+import { REMOVE_ROW, SELECT_DATA_TYPE } from '~store/generator/generator.actions';
+
+
+// Postal/Zip Data Types can take their source as either Country fields (set to "Plugins" as the source), Regions, or
+// even City rows. All this info is presented in the UI for the user to choose
+const getCountryRows = createSelector(
+	getSortedRowsArray,
+	(rows) => rows.map((row, index) => ({ ...row, index })).filter(({ dataType, data }) => (
+		dataType === 'Country' && data.source === 'plugins'
+	))
+);
+
+const getRegionRows = createSelector(
+	getSortedRowsArray,
+	(rows) => rows.map((row, index) => ({ ...row, index })).filter(({ dataType }) => dataType === 'Region')
+);
+
+export const customProps: DTCustomProps = {
+	countryRows: getCountryRows,
+	regionRows: getRegionRows
+};
+
+export const actionInterceptors = {
+
+	// when a Country/Region plugin row is removed, clean up any postal/zip fields that were mapped to it
+	[REMOVE_ROW]: (sourceRowId: string, rowState: PostalZipState, actionPayload: any): PostalZipState | null => {
+		if (actionPayload.id === rowState.targetRowId) {
+			return {
+				...rowState,
+				source: 'any',
+				targetRowId: ''
+			};
+		}
+		return null;
+	},
+
+	[SELECT_DATA_TYPE]: (sourceRowId: string, rowState: PostalZipState, actionPayload: any): PostalZipState | null => {
+		if (actionPayload.id === rowState.targetRowId) {
+			if ((rowState.source === 'regionRow' && actionPayload.value !== 'Region') ||
+				(rowState.source === 'countryRow' && actionPayload.value !== 'Country')) {
+				return {
+					...rowState,
+					source: 'any',
+					targetRowId: ''
+				};
+			}
+		}
+		return null;
+	}
+};
diff --git a/packages/plugins/src/dataTypes/PostalZip/PostalZip.tsx b/packages/plugins/src/dataTypes/PostalZip/PostalZip.tsx
new file mode 100755
index 000000000..f12f9a5b2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/PostalZip.tsx
@@ -0,0 +1,190 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import { countryList } from '../../../../_plugins';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import { PostalZipSource } from './PostalZip.state';
+import styles from './PostalZip.scss';
+
+const ZipDialog = ({ visible, data, id, onClose, countryI18n, coreI18n, i18n, onUpdate, countryRows, regionRows }: any) => {
+  const countryPluginRows = countryRows.map(({ index, id, title }: any) => ({ value: id, label: `${i18n.row} #${index + 1}: ${title}` }));
+  const countryPluginRowsExist = countryPluginRows.length > 0;
+  const regionPluginRows = regionRows.map(({ index, id, title }: any) => ({ value: id, label: `${i18n.row} #${index + 1}: ${title}` }));
+  const regionPluginRowsExist = regionPluginRows.length > 0;
+
+  const onUpdateSource = (source: PostalZipSource): void => {
+    const newValues = {
+      ...data,
+      source
+    };
+    if (source === 'countryRow') {
+      newValues.targetRowId = countryPluginRows[0].value;
+    }
+    if (source === 'regionRow') {
+      newValues.targetRowId = regionPluginRows[0].value;
+    }
+    onUpdate(newValues);
+  };
+
+  const onChangeTargetRow = (row: DropdownOption): void => {
+    onUpdate({
+      ...data,
+      targetRowId: row.value
+    });
+  };
+
+  const onSelectCountries = (countries: any): void => {
+    onUpdate({
+      ...data,
+      selectedCountries: countries ? countries.map(({ value }: DropdownOption) => value) : []
+    });
+  };
+
+  const getRegionRowDropdown = (): React.ReactNode => {
+    if (data.source !== 'regionRow') {
+      return null;
+    }
+
+    return <Dropdown value={data.targetRowId} onChange={onChangeTargetRow} options={regionPluginRows} />;
+  };
+
+  const getCountryPluginDropdown = (): React.ReactNode => {
+    if (data.source !== 'countryRow') {
+      return null;
+    }
+
+    return <Dropdown value={data.targetRowId} onChange={onChangeTargetRow} options={countryPluginRows} />;
+  };
+
+  const getCountriesDropdown = (): React.ReactNode => {
+    if (data.source !== 'countries') {
+      return null;
+    }
+
+    const countryPluginOptions = countryList.map((countryName) => ({
+      value: countryName,
+      label: countryI18n[countryName].countryName
+    }));
+
+    return (
+      <Dropdown
+        isMulti
+        closeMenuOnSelect={false}
+        isClearable={true}
+        value={data.selectedCountries}
+        onChange={onSelectCountries}
+        options={data.source === 'countries' ? countryPluginOptions : countryPluginRows}
+      />
+    );
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ maxWidth: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.selectPostalCodes}</DialogTitle>
+        <DialogContent dividers>
+          <div>{i18n.explanation}</div>
+
+          <h3>{i18n.source}</h3>
+
+          <RadioPillRow>
+            <RadioPill
+              label={i18n.anyFormat}
+              onClick={(): void => onUpdateSource('any')}
+              name={`${id}-source`}
+              checked={data.source === 'any'}
+              tooltip={i18n.anyFormatDesc}
+            />
+            <RadioPill
+              label={i18n.countries}
+              onClick={(): void => onUpdateSource('countries')}
+              name={`${id}-source`}
+              checked={data.source === 'countries'}
+              tooltip={i18n.countriesDesc}
+            />
+            <RadioPill
+              label={i18n.countryRow}
+              onClick={(): void => onUpdateSource('countryRow')}
+              name={`${id}-source`}
+              checked={data.source === 'countryRow'}
+              disabled={!countryPluginRowsExist}
+              tooltip={i18n.countryRowDesc}
+            />
+            <RadioPill
+              label={i18n.regionRow}
+              onClick={(): void => onUpdateSource('regionRow')}
+              name={`${id}-source`}
+              checked={data.source === 'regionRow'}
+              disabled={!regionPluginRowsExist}
+              tooltip={i18n.regionRowDesc}
+            />
+          </RadioPillRow>
+          {getCountriesDropdown()}
+          {getCountryPluginDropdown()}
+          {getRegionRowDropdown()}
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ id, data, coreI18n, i18n, countryI18n, onUpdate, countryRows, regionRows, cityRows }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+  const numSelected = data.selectedCountries.length;
+
+  let label = '';
+  if (data.source === 'any') {
+    label = i18n.anyFormat;
+  } else if (data.source === 'countries') {
+    label = `${i18n.anyPostalZipFrom} <b>${numSelected}</b> ` + (numSelected === 1 ? i18n.country : i18n.countries);
+  } else if (data.source === 'countryRow') {
+    const row = countryRows.find((row: any) => row.id === data.targetRowId);
+    const rowNum = row.index + 1;
+    label = `${i18n.countryRow} #${rowNum}`;
+  } else if (data.source === 'regionRow') {
+    const row = regionRows.find((row: any) => row.id === data.targetRowId);
+    const rowNum = row.index + 1;
+    label = `${i18n.regionRow} #${rowNum}`;
+  }
+
+  return (
+    <div className={styles.buttonLabel}>
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        <span dangerouslySetInnerHTML={{ __html: label }} />
+      </Button>
+      <ZipDialog
+        visible={dialogVisible}
+        data={data}
+        countryRows={countryRows}
+        regionRows={regionRows}
+        cityRows={cityRows}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        countryI18n={countryI18n}
+        onUpdate={onUpdate}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.DESC}</p>;
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'varchar(10) default NULL',
+    field_Oracle: 'varchar2(10) default NULL',
+    field_MSSQL: 'VARCHAR(10) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/PostalZip/PostalZip.worker.ts b/packages/plugins/src/dataTypes/PostalZip/PostalZip.worker.ts
new file mode 100644
index 000000000..56baf1b0a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/PostalZip.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './PostalZip.generate';
+
+let workerUtilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!workerUtilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		workerUtilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/PostalZip/README.md b/packages/plugins/src/dataTypes/PostalZip/README.md
new file mode 100644
index 000000000..33bade1ff
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/README.md
@@ -0,0 +1,281 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; PostalZip
+
+This Data Type works in conjunction with the Countries plugins to generate country-specific postal/zip formats 
+for consistency of data across each row.
+
+## Examples 
+
+- [Generate a postal/zip code in a random format](#generate-a-postalzip-code-in-a-random-format)
+- [Generate a postal code from a set of predefined countries](#generate-a-postal-code-from-a-set-of-predefined-countries)
+- [Generate a postal code that maps to a country row](#generate-a-postal-code-that-maps-to-a-country-row)
+- [Generate a postal code that maps to a region row](#generate-a-postal-code-that-maps-to-a-region-row)
+
+
+### Generate a postal/zip code in a random format
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "PostalZip",
+            title: "Any postal code",
+            settings: {
+                source: "any"
+            }
+        },
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```typescript
+[
+    {
+        "Any postal code": 95201
+    },
+    {
+        "Any postal code": 8322
+    },
+    {
+        "Any postal code": 34353
+    },
+    {
+        "Any postal code": "7933-9534"
+    },
+    {
+        "Any postal code": "39456-26578"
+    },
+    {
+        "Any postal code": 16580
+    },
+    ...
+]
+```
+
+### Generate a postal code from a set of predefined countries
+
+This example outputs a random postal code from either Canada or the US. 
+
+```typescript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: "PostalZip",
+            title: "two-countries",
+            settings: {
+                source: "countries",
+                selectedCountries: ["Canada", "US"]
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: "JSON",
+        settings: {
+            dataStructureFormat: "simple"
+        }
+    }
+}
+```
+
+Sample output:
+
+```typescript
+[
+    {
+        "two-countries": "L4S 7S6"
+    },
+    {
+        "two-countries": "H1P 6R6"
+    },
+    {
+        "two-countries": 37488
+    },
+    {
+        "two-countries": 84824
+    },
+    {
+        "two-countries": 47702
+    },
+    {
+        "two-countries": "B7G 6Z7"
+    },
+    ...
+]
+```
+
+### Generate a postal code that maps to a country row
+
+This generates a random country from a short list, then generates a postal code in the format of each country.
+
+```typescript
+{
+	generationSettings: {
+		numResults: 10
+	},
+	dataTemplate: [
+		{
+			plugin: 'Country',
+			title: 'country-plugins-subset',
+			settings: {
+				source: 'plugins',
+				selectedCountries: [
+					'Canada',
+					'US',
+					'Norway'
+				]
+			},
+			id: '123'
+		},
+		{
+			plugin: 'PostalZip',
+			title: 'zip',
+			settings: {
+				source: 'countryRow',
+				targetRowId: '123'
+			}
+		}
+	],
+		exportSettings: {
+		plugin: ExportType.JSON,
+			settings: {
+			dataStructureFormat: 'simple'
+		}
+	}
+}
+```
+
+Sample output:
+
+```typescript
+[
+    {
+        "country-plugins-subset": "United States",
+        "zip": 71534
+    },
+    {
+        "country-plugins-subset": "Norway",
+        "zip": 6225
+    },
+    {
+        "country-plugins-subset": "Norway",
+        "zip": 1466
+    },
+    {
+        "country-plugins-subset": "Canada",
+        "zip": "J1N 8M4"
+    },
+    {
+        "country-plugins-subset": "Canada",
+        "zip": "B4X 8E8"
+    },
+	{
+		"country-plugins-subset": "United States",
+		"zip": 38648
+	},
+    {
+        "country-plugins-subset": "Norway",
+        "zip": 7797
+    },
+    {
+        "country-plugins-subset": "Norway",
+        "zip": 7802
+    },
+    ...
+]
+```
+
+### Generate a postal code that maps to a region row
+
+```
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Region',
+            title: 'Region from 2 countries',
+            settings: {
+                source: 'countries',
+                selectedCountries: ['Canada', 'US'],
+                formats: ['full']
+            },
+            id: '555'
+        },
+        {
+            plugin: 'PostalZip',
+            title: 'zip',
+            settings: {
+                source: 'regionRow',
+                targetRowId: '555'
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: ExportType.JSON,
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output:
+
+```typescript
+[
+    {
+        "Region from 2 countries": "Connecticut",
+        "zip": 79839
+    },
+    {
+        "Region from 2 countries": "Northwest Territories",
+        "zip": "35H 2C5"
+    },
+    {
+        "Region from 2 countries": "Louisiana",
+        "zip": 67174
+    },
+    {
+        "Region from 2 countries": "Prince Edward Island",
+        "zip": "F1V 2H3"
+    },
+    {
+        "Region from 2 countries": "Ontario",
+        "zip": "N0Z 1L0"
+    },
+    {
+        "Region from 2 countries": "Nevada",
+        "zip": 72129
+    },
+    {
+        "Region from 2 countries": "Ohio",
+        "zip": 28624
+    },
+    {
+        "Region from 2 countries": "Arizona",
+        "zip": 85129
+    },
+    {
+        "Region from 2 countries": "Yukon",
+        "zip": "Y7R 9N2"
+    },
+    {
+        "Region from 2 countries": "Tennessee",
+        "zip": 60459
+    }
+  ]
+```
diff --git a/packages/plugins/src/dataTypes/PostalZip/__tests__/PostalZip.cli.test.ts b/packages/plugins/src/dataTypes/PostalZip/__tests__/PostalZip.cli.test.ts
new file mode 100644
index 000000000..9afb6c57e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/__tests__/PostalZip.cli.test.ts
@@ -0,0 +1,88 @@
+// @ts-ignore
+import generate, { DataType, ExportType, GDTemplate } from '../../../../../../cli/dist/cli/src';
+
+describe('CLI data generation', () => {
+	const getTemplate = (): GDTemplate => ({
+		generationSettings: {
+			numResults: 10
+		},
+		dataTemplate: [
+			{
+				plugin: DataType.PostalZip,
+				title: 'Any postal code',
+				settings: {
+					source: 'any'
+				}
+			},
+			{
+				plugin: DataType.PostalZip,
+				title: 'two-countries',
+				settings: {
+					source: 'countries',
+					selectedCountries: ['Canada', 'US']
+				}
+			},
+			{
+				plugin: 'Country',
+				title: 'country-plugins-subset',
+				settings: {
+					source: 'plugins',
+					selectedCountries: [
+						'Canada',
+						'US',
+						'Norway'
+					]
+				},
+				id: '123'
+			},
+			{
+				plugin: 'PostalZip',
+				title: 'zip',
+				settings: {
+					source: 'countryRow',
+					targetRowId: '123'
+				}
+			},
+			{
+				plugin: 'Region',
+				title: 'Region from 2 countries',
+				settings: {
+					source: 'countries',
+					selectedCountries: ['Canada', 'US'],
+					formats: ['full']
+				},
+				id: '555'
+			},
+			{
+				plugin: 'PostalZip',
+				title: 'zip2',
+				settings: {
+					source: 'regionRow',
+					targetRowId: '555'
+				}
+			}
+		],
+		exportSettings: {
+			plugin: ExportType.JSON,
+			settings: {
+				dataStructureFormat: 'simple'
+			}
+		}
+	});
+
+	it('Generates as expected', async () => {
+		const data: any = await generate(getTemplate());
+		const generatedJSON = JSON.parse(data);
+
+		expect(generatedJSON.length).toEqual(10);
+		expect(Object.keys(generatedJSON[0])).toEqual([
+			'Any postal code',
+			'two-countries',
+			'country-plugins-subset',
+			'zip',
+			'Region from 2 countries',
+			'zip2'
+		]);
+	});
+});
+
diff --git a/packages/plugins/src/dataTypes/PostalZip/__tests__/PostalZip.test.tsx b/packages/plugins/src/dataTypes/PostalZip/__tests__/PostalZip.test.tsx
new file mode 100644
index 000000000..8eb29683e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/__tests__/PostalZip.test.tsx
@@ -0,0 +1,44 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help, Options } from '../PostalZip';
+const i18n = require('../i18n/en.json');
+
+const defaultHelpProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+const optionsProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	gridPanelDimensions: { width: 100, height: 100 },
+	isCountryNamesLoading: false,
+	isCountryNamesLoaded: false,
+	countryNamesMap: null
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultHelpProps} />);
+		expect(container).toBeTruthy();
+	});
+});
+
+describe('Options', () => {
+	it('renders', () => {
+		const { container } = render(
+			<Options
+				{...optionsProps}
+				data={{
+					selectedCountries: []
+				}}
+				onUpdate={() => {}}
+				countryRows={[]}
+				regionRows={[]}
+			/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/PostalZip/bundle.ts b/packages/plugins/src/dataTypes/PostalZip/bundle.ts
new file mode 100644
index 000000000..bdd87e928
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/bundle.ts
@@ -0,0 +1,15 @@
+import { DTBundle } from '~types/dataTypes';
+import { Options, Help, getMetadata } from './PostalZip';
+import { customProps, actionInterceptors } from './PostalZip.store';
+import { initialState } from './PostalZip.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Options,
+	Help,
+	getMetadata,
+	customProps,
+	actionInterceptors
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/PostalZip/config.ts b/packages/plugins/src/dataTypes/PostalZip/config.ts
new file mode 100644
index 000000000..e802c25a0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/config.ts
@@ -0,0 +1,9 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'geo',
+  fieldGroupOrder: 30,
+  dependencies: ['Country', 'Region']
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/ar.json b/packages/plugins/src/dataTypes/PostalZip/i18n/ar.json
new file mode 100644
index 000000000..a21c0d7dd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/ar.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "البريدي / الرمز البريدي",
+  "DESC": "يولد رمزًا بريديًا أو رمزًا بريديًا عشوائيًا. لمزيد من التحكم ، استخدم خيار نوع البيانات الأبجدي الرقمي.",
+  "DEFAULT_TITLE": "البريدي / الرمز البريدي",
+  "selectPostalCodes": "حدد الرمز البريدي / الرمز البريدي",
+  "explanation": "يتحكم هذا في تنسيقات البريد / البريد / الرمز البريدي التي تم إنشاؤها بواسطة هذا الحقل. إذا كنت تريد شيئًا أكثر أساسية ، فجرّب نوع البيانات الأبجدي الرقمي.",
+  "source": "مصدر",
+  "anyFormat": "بأي شكل",
+  "anyFormatDesc": "يولد رمزًا بريديًا / بريديًا / بريديًا من أي بلد بأي تنسيق معروف.",
+  "countries": "بلدان",
+  "countriesDesc": "يولد رمزًا بريديًا / بريديًا / بريديًا بتنسيق من قائمة محددة من البلدان.",
+  "countryRow": "صف البلد",
+  "countryRowDesc": "يتيح لك هذا تحديد حقل بلد معين في مجموعة البيانات الخاصة بك التي تحتوي على مكونات البلد الإضافية كمصدر لها. يقوم بإنشاء الرموز البريدية / البريدية / البريدية التي تحدد القيمة من هذا الحقل.",
+  "regionRow": "صف المنطقة",
+  "regionRowDesc": "يتيح لك هذا تحديد حقل منطقة معين في مجموعة البيانات الخاصة بك. يقوم بإنشاء الرموز البريدية / البريدية / البريدية التي تحدد القيمة من هذا الحقل.",
+  "country": "بلد",
+  "row": "صف",
+  "anyPostalZipFrom": "أي بريد / الرمز البريدي من"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/de.json b/packages/plugins/src/dataTypes/PostalZip/i18n/de.json
new file mode 100644
index 000000000..c813b2a28
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/de.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "Post / Postleitzahl",
+  "DESC": "Erzeugt eine zufällige Postleitzahl. Verwenden Sie zur besseren Kontrolle die Option für alphanumerische Datentypen.",
+  "DEFAULT_TITLE": "postalZip",
+  "selectPostalCodes": "Wählen Sie die Postleitzahl / Postleitzahl",
+  "explanation": "Dies steuert die Formate von Post / Post / Postleitzahl, die von diesem Feld generiert werden. Wenn Sie etwas wesentlich grundlegenderes wünschen, versuchen Sie es mit dem alphanumerischen Datentyp.",
+  "source": "Quelle",
+  "anyFormat": "Beliebiges Format",
+  "anyFormatDesc": "Generiert eine Post / Post / Postleitzahl aus einem beliebigen Land in einem bekannten Format.",
+  "countries": "Länder",
+  "countriesDesc": "Generiert eine Post / Post / Postleitzahl in einem Format aus einer bestimmten Liste von Ländern.",
+  "countryRow": "Country Row",
+  "countryRowDesc": "Auf diese Weise können Sie ein bestimmtes Länderfeld in Ihrem Datensatz bestimmen, dessen Quelle Länder-Plugins sind. Es werden Post- / Post- / Postleitzahlen generiert, die dem Wert aus diesem Feld zugeordnet sind.",
+  "regionRow": "Regionszeile",
+  "regionRowDesc": "Auf diese Weise können Sie ein bestimmtes Regionsfeld in Ihrem Datensatz genau bestimmen. Es werden Post- / Post- / Postleitzahlen generiert, die dem Wert aus diesem Feld zugeordnet sind.",
+  "country": "Land",
+  "row": "Reihe",
+  "anyPostalZipFrom": "Jede Post / Postleitzahl von"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/en.json b/packages/plugins/src/dataTypes/PostalZip/i18n/en.json
new file mode 100644
index 000000000..20a148dd5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/en.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "Postal / Zip",
+  "DESC": "Generates a random zip or postal code. For greater control, use the alpha-numeric data type option.",
+  "DEFAULT_TITLE": "postalZip",
+  "selectPostalCodes": "Select postal code / zips",
+  "explanation": "This controls the formats of post/postal/zipcode generated by this field. If you want something far more basic, try the Alphanumeric data type.",
+  "source": "Source",
+  "anyFormat": "Any format",
+  "anyFormatDesc": "Generates a postal/post/zipcode from any country in any known format.",
+  "countries": "Countries",
+  "countriesDesc": "Generates a postal/post/zipcode in a format from a specific list of countries.",
+  "countryRow": "Country Row",
+  "countryRowDesc": "This lets you pinpoint a specific Country field in your data set that has Country Plugins as its source. It generates postal/post/zip codes that map to the value from that field.",
+  "regionRow": "Region Row",
+  "regionRowDesc": "This lets you pinpoint a specific Region field in your data set. It generates postal/post/zip codes that map to the value from that field.",
+  "country": "Country",
+  "row": "Row",
+  "anyPostalZipFrom": "Any postal/zip from"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/es.json b/packages/plugins/src/dataTypes/PostalZip/i18n/es.json
new file mode 100644
index 000000000..c04cb127f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/es.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "Postal / Código Postal",
+  "DESC": "Genera un código postal aleatorio. Para un mayor control, utilice la opción de tipo de datos alfanuméricos.",
+  "DEFAULT_TITLE": "postalZip",
+  "selectPostalCodes": "Seleccionar código postal / cremalleras",
+  "explanation": "Esto controla los formatos de correo postal / postal / código postal generados por este campo. Si desea algo mucho más básico, pruebe el tipo de datos alfanuméricos.",
+  "source": "Fuente",
+  "anyFormat": "Cualquier formato",
+  "anyFormatDesc": "Genera un código postal / postal / postal de cualquier país en cualquier formato conocido.",
+  "countries": "Países",
+  "countriesDesc": "Genera un código postal / postal / postal en un formato de una lista específica de países.",
+  "countryRow": "Fila de país",
+  "countryRowDesc": "Esto le permite identificar un campo de país específico en su conjunto de datos que tiene complementos de país como fuente. Genera códigos postales / postales / postales que se asignan al valor de ese campo.",
+  "regionRow": "Fila de región",
+  "regionRowDesc": "Esto le permite señalar un campo de región específico en su conjunto de datos. Genera códigos postales / postales / postales que se asignan al valor de ese campo.",
+  "country": "País",
+  "row": "Fila",
+  "anyPostalZipFrom": "Cualquier postal / zip de"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/fr.json b/packages/plugins/src/dataTypes/PostalZip/i18n/fr.json
new file mode 100644
index 000000000..f0a7af357
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/fr.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "Postal / Zip",
+  "DESC": "Génère un zip ou un code postal aléatoire. Pour un meilleur contrôle, utilisez l'option de type de données alphanumériques.",
+  "DEFAULT_TITLE": "postalZip",
+  "selectPostalCodes": "Sélectionnez le code postal / zips",
+  "explanation": "Ceci contrôle les formats de courrier / postal / code postal générés par ce champ. Si vous voulez quelque chose de beaucoup plus basique, essayez le type de données alphanumériques.",
+  "source": "La source",
+  "anyFormat": "Tout format",
+  "anyFormatDesc": "Génère un code postal / postal / postal de n'importe quel pays dans n'importe quel format connu.",
+  "countries": "Des pays",
+  "countriesDesc": "Génère un code postal / postal / postal dans un format à partir d'une liste spécifique de pays.",
+  "countryRow": "Country Row",
+  "countryRowDesc": "Cela vous permet d'identifier un champ Pays spécifique dans votre ensemble de données dont la source est les Plugins Pays. Il génère des codes postaux / postaux / zip qui correspondent à la valeur de ce champ.",
+  "regionRow": "Ligne de région",
+  "regionRowDesc": "Cela vous permet d'identifier un champ de région spécifique dans votre ensemble de données. Il génère des codes postaux / postaux / zip qui correspondent à la valeur de ce champ.",
+  "country": "Pays",
+  "row": "Rangée",
+  "anyPostalZipFrom": "Tout courrier / zip de"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/hi.json b/packages/plugins/src/dataTypes/PostalZip/i18n/hi.json
new file mode 100644
index 000000000..9bff0727b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/hi.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "डाक / ज़िप",
+  "DESC": "एक यादृच्छिक ज़िप या डाक कोड उत्पन्न करता है। अधिक नियंत्रण के लिए, अल्फ़ा-न्यूमेरिक डेटा प्रकार विकल्प का उपयोग करें।",
+  "DEFAULT_TITLE": "postalZip",
+  "selectPostalCodes": "डाक कोड / ज़िप चुनें",
+  "explanation": "यह इस क्षेत्र द्वारा उत्पन्न डाक/डाक/ज़िपकोड के स्वरूपों को नियंत्रित करता है। यदि आप कुछ अधिक बुनियादी चाहते हैं, तो अल्फ़ान्यूमेरिक डेटा प्रकार आज़माएं।",
+  "source": "स्रोत",
+  "anyFormat": "कोई भी प्रारूप",
+  "anyFormatDesc": "किसी भी ज्ञात प्रारूप में किसी भी देश से डाक/पोस्ट/ज़िप कोड उत्पन्न करता है।",
+  "countries": "देशों",
+  "countriesDesc": "देशों की विशिष्ट सूची से एक प्रारूप में डाक/पोस्ट/ज़िपकोड उत्पन्न करता है।",
+  "countryRow": "देश पंक्ति",
+  "countryRowDesc": "यह आपको अपने डेटा सेट में एक विशिष्ट देश फ़ील्ड को इंगित करने देता है जिसमें इसके स्रोत के रूप में देश प्लगइन्स हैं। यह डाक/पोस्ट/ज़िप कोड उत्पन्न करता है जो उस क्षेत्र से मूल्य के लिए मैप करता है।",
+  "regionRow": "क्षेत्र पंक्ति",
+  "regionRowDesc": "यह आपको अपने डेटा सेट में एक विशिष्ट क्षेत्र फ़ील्ड को इंगित करने देता है। यह डाक/पोस्ट/ज़िप कोड उत्पन्न करता है जो उस क्षेत्र से मूल्य के लिए मैप करता है।",
+  "country": "देश",
+  "row": "पंक्ति",
+  "anyPostalZipFrom": "से कोई डाक/ज़िप"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/ja.json b/packages/plugins/src/dataTypes/PostalZip/i18n/ja.json
new file mode 100644
index 000000000..3013a096c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/ja.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "郵便番号/郵便番号",
+  "DESC": "ランダムな郵便番号または郵便番号を生成します。 制御を強化するには、英数字のデータ型オプションを使用します。",
+  "DEFAULT_TITLE": "postalZip",
+  "selectPostalCodes": "郵便番号/郵便番号を選択します",
+  "explanation": "这控制了此字段生成的邮编/邮政编码/邮政编码的格式。 如果您想要更基本的东西，请尝试字母数字数据类型。",
+  "source": "资源",
+  "anyFormat": "任何格式",
+  "anyFormatDesc": "从任何国家/地区以任何已知格式生成邮政编码。",
+  "countries": "国别",
+  "countriesDesc": "以特定国家/地区列表的格式生成邮政编码。",
+  "countryRow": "国家行",
+  "countryRowDesc": "这样，您就可以在数据集中以“国家/地区插件”作为来源的特定“国家/地区”字段中定位。 它将生成映射到该字段值的邮政编码。",
+  "regionRow": "区域行",
+  "regionRowDesc": "这使您可以精确定位数据集中的特定“区域”字段。 它将生成映射到该字段值的邮政编码。",
+  "country": "国家",
+  "row": "行",
+  "anyPostalZipFrom": "来自的任何邮政/邮编"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/nl.json b/packages/plugins/src/dataTypes/PostalZip/i18n/nl.json
new file mode 100644
index 000000000..3cbde50a6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/nl.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "Post / postcode",
+  "DESC": "Genereert een willekeurige postcode. Gebruik de optie voor alfanumerieke gegevenstypen voor meer controle.",
+  "DEFAULT_TITLE": "postalZip",
+  "selectPostalCodes": "Selecteer postcode / ritsen",
+  "explanation": "Dit beheert de formaten van post / post / postcode die door dit veld worden gegenereerd. Als u iets veel eenvoudiger wilt, probeer dan het gegevenstype Alfanumeriek.",
+  "source": "Bron",
+  "anyFormat": "Elk formaat",
+  "anyFormatDesc": "Genereert een postcode / post / postcode vanuit elk land in elk bekend formaat.",
+  "countries": "Landen",
+  "countriesDesc": "Genereert een postcode / post / postcode in een indeling uit een specifieke lijst met landen.",
+  "countryRow": "Country Row",
+  "countryRowDesc": "Hiermee kunt u een specifiek landveld in uw dataset lokaliseren dat landplug-ins als bron heeft. Het genereert post- / post- / postcodes die verwijzen naar de waarde uit dat veld.",
+  "regionRow": "Regio Rij",
+  "regionRowDesc": "Hiermee kunt u een specifiek regioveld in uw gegevensset lokaliseren. Het genereert post- / post- / postcodes die verwijzen naar de waarde uit dat veld.",
+  "country": "Land",
+  "row": "Rij",
+  "anyPostalZipFrom": "Elke post / zip van"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/pt.json b/packages/plugins/src/dataTypes/PostalZip/i18n/pt.json
new file mode 100644
index 000000000..90822f163
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/pt.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "Postal / Zip",
+  "DESC": "Gera um CEP ou código postal aleatório. Para maior controle, use a opção de tipo de dados alfanuméricos.",
+  "DEFAULT_TITLE": "postalZip",
+  "selectPostalCodes": "Selecione o código postal / CEPs",
+  "explanation": "Isso controla os formatos de post / postal / CEP gerados por este campo. Se você quiser algo muito mais básico, tente o tipo de dados alfanumérico.",
+  "source": "Fonte",
+  "anyFormat": "Qualquer formato",
+  "anyFormatDesc": "Gera um código postal / postal / CEP de qualquer país em qualquer formato conhecido.",
+  "countries": "Países",
+  "countriesDesc": "Gera um código postal / postal / CEP em um formato de uma lista específica de países.",
+  "countryRow": "Country Row",
+  "countryRowDesc": "Isso permite que você localize um campo de país específico em seu conjunto de dados que tem Plug-ins de país como sua fonte. Ele gera códigos postais / postais / CEP que mapeiam para o valor desse campo.",
+  "regionRow": "Region Row",
+  "regionRowDesc": "Isso permite que você localize um campo de região específico em seu conjunto de dados. Ele gera códigos postais / postais / CEP que mapeiam para o valor desse campo.",
+  "country": "País",
+  "row": "Linha",
+  "anyPostalZipFrom": "Qualquer postal / zip de"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/ru.json b/packages/plugins/src/dataTypes/PostalZip/i18n/ru.json
new file mode 100644
index 000000000..553106f5f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/ru.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "Почтовый / ИНдекс",
+  "DESC": "Генерирует случайный почтовый индекс или почтовый индекс. Для большего контроля используйте опцию буквенно-цифрового типа данных.",
+  "DEFAULT_TITLE": "postalZip",
+  "selectPostalCodes": "Выберите почтовый индекс / почтовый индекс",
+  "explanation": "Это управляет форматами почтового индекса/почтового индекса, генерируемого этим полем. Если вы хотите что-то гораздо более простое, попробуйте тип данных Alphanumeric.",
+  "source": "Источник",
+  "anyFormat": "Любой формат",
+  "anyFormatDesc": "Генерирует почтовый/почтовый/почтовый индекс из любой страны в любом известном формате.",
+  "countries": "Страны",
+  "countriesDesc": "Генерирует почтовый/почтовый/почтовый индекс в формате из определенного списка стран.",
+  "countryRow": "Кантри Роу",
+  "countryRowDesc": "Это позволяет вам точно определить конкретное поле страны в вашем наборе данных, источником которого являются плагины страны. Он генерирует почтовые/почтовые/почтовые индексы, которые сопоставляются со значением из этого поля.",
+  "regionRow": "Строка региона",
+  "regionRowDesc": "Это позволяет точно определить конкретное поле «Регион» в наборе данных. Он генерирует почтовые/почтовые/почтовые индексы, которые сопоставляются со значением из этого поля.",
+  "country": "Страна",
+  "row": "Строка",
+  "anyPostalZipFrom": "Любая почта/zip от"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/ta.json b/packages/plugins/src/dataTypes/PostalZip/i18n/ta.json
new file mode 100644
index 000000000..bce0232cd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/ta.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "அஞ்சல் / ஜிப்",
+  "DESC": "சீரற்ற ஜிப் அல்லது அஞ்சல் குறியீட்டை உருவாக்குகிறது. அதிக கட்டுப்பாட்டுக்கு, ஆல்பா-எண் தரவு வகை விருப்பத்தைப் பயன்படுத்தவும்.",
+  "DEFAULT_TITLE": "postalZip",
+  "selectPostalCodes": "அஞ்சல் குறியீடு / ஜிப்ஸைத் தேர்ந்தெடுக்கவும்",
+  "explanation": "இந்த புலத்தால் உருவாக்கப்பட்ட அஞ்சல் / அஞ்சல் / ஜிப்கோடின் வடிவங்களை இது கட்டுப்படுத்துகிறது. நீங்கள் மிகவும் அடிப்படை ஒன்றை விரும்பினால், எண்ணெழுத்து தரவு வகையை முயற்சிக்கவும்.",
+  "source": "மூல",
+  "anyFormat": "எந்த வடிவமும்",
+  "anyFormatDesc": "எந்தவொரு நாட்டிலிருந்தும் எந்தவொரு அறியப்பட்ட வடிவத்திலும் ஒரு அஞ்சல் / இடுகை / ஜிப்கோடை உருவாக்குகிறது.",
+  "countries": "நாடுகள்",
+  "countriesDesc": "ஒரு குறிப்பிட்ட நாடுகளின் பட்டியலிலிருந்து ஒரு வடிவத்தில் ஒரு அஞ்சல் / இடுகை / ஜிப்கோடை உருவாக்குகிறது.",
+  "countryRow": "நாட்டின் வரிசை",
+  "countryRowDesc": "இது உங்கள் தரவுத் தொகுப்பில் ஒரு குறிப்பிட்ட நாட்டு புலத்தை அதன் மூல செருகிகளைக் கொண்டிருக்கும். இது அந்தத் துறையிலிருந்து மதிப்பைக் குறிக்கும் அஞ்சல் / இடுகை / ஜிப் குறியீடுகளை உருவாக்குகிறது.",
+  "regionRow": "பிராந்திய வரிசை",
+  "regionRowDesc": "உங்கள் தரவு தொகுப்பில் ஒரு குறிப்பிட்ட பிராந்திய புலத்தை சுட்டிக்காட்ட இது உங்களை அனுமதிக்கிறது. இது அந்தத் துறையிலிருந்து மதிப்பைக் குறிக்கும் அஞ்சல் / இடுகை / ஜிப் குறியீடுகளை உருவாக்குகிறது.",
+  "country": "நாடு",
+  "row": "வரிசை",
+  "anyPostalZipFrom": "எந்த அஞ்சல் / ஜிப்"
+}
diff --git a/packages/plugins/src/dataTypes/PostalZip/i18n/zh.json b/packages/plugins/src/dataTypes/PostalZip/i18n/zh.json
new file mode 100644
index 000000000..4e01f767e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/PostalZip/i18n/zh.json
@@ -0,0 +1,19 @@
+{
+  "NAME": "邮政/邮编",
+  "DESC": "生成一个随机的邮政编码。 为了更好地控制，请使用字母数字数据类型选项。",
+  "DEFAULT_TITLE": "邮政编码",
+  "selectPostalCodes": "选择邮政编码/邮编",
+  "explanation": "这控制由该字段生成的邮政/邮政编码/邮政编码的格式。 如果您想要更基本的东西，请尝试字母数字数据类型。",
+  "source": "来源",
+  "anyFormat": "任何格式",
+  "anyFormatDesc": "以任何已知格式从任何国家/地区生成邮政编码。",
+  "countries": "国家",
+  "countriesDesc": "以特定国家/地区列表的格式生成邮政编码。",
+  "countryRow": "乡村行",
+  "countryRowDesc": "这使您可以在以国家/地区插件为来源的数据集中查明特定国家/地区字段。 它生成映射到该字段值的邮政编码。",
+  "regionRow": "区域行",
+  "regionRowDesc": "这使您可以查明数据集中的特定区域字段。 它生成映射到该字段值的邮政编码。",
+  "country": "国家",
+  "row": "排",
+  "anyPostalZipFrom": "来自的任何邮政/邮编"
+}
diff --git a/packages/plugins/src/dataTypes/README.md b/packages/plugins/src/dataTypes/README.md
new file mode 100644
index 000000000..8213ca130
--- /dev/null
+++ b/packages/plugins/src/dataTypes/README.md
@@ -0,0 +1,42 @@
+# [Docs](../../../../docs/README.md) &raquo; [Plugins](../README.md) &raquo; Data Types
+
+These pages demonstrate the available configurations for each Data Type. Most of them use JSON as the export format,
+because it's nice and concise for illustration purposes. But remember that all of them can be used with any Export
+Types (XML, SQL, CSV etc.). See the [Export Types](#export-types) section below for how to configure those.
+
+- [Alphanumeric](./Alphanumeric/README.md)
+- [AutoIncrement](./AutoIncrement/README.md)
+- [Boolean](./Boolean/README.md)
+- [City](./City/README.md)
+- [Colour](./Colour/README.md)
+- [Company](./Company/README.md)
+- Computed
+- [Constant](./Constant/README.md)
+- [Country](./Country/README.md)
+- [Currency](./Currency/README.md)
+- [CVV](./CVV/README.md)
+- [Date](./Date/README.md)
+- [Email](./Email/README.md)
+- [GUID](./GUID/README.md)
+- [IBAN](./IBAN/README.md)
+- [LatLng](./LatLng/README.md)
+- List
+- [Names](./Names/README.md)
+- NormalDistribution
+- [NumberRange](./NumberRange/README.md)
+- OrganizationNumber
+- PAN
+- PersonalNumber
+- [Phone](./Phone/README.md)
+- PIN
+- [PostalZip](./PostalZip/README.md)
+- [Region](./Region/README.md)
+- Rut
+- [StreetAddress](./StreetAddress/README.md)
+- [TextFixed](./TextFixed/README.md)
+- TextRandom
+- [Time](./Time/README.md)
+- Track1
+- Track2
+- URLs
+- [WeightedList](./WeightedList/README.md)
diff --git a/packages/plugins/src/dataTypes/Region/README.md b/packages/plugins/src/dataTypes/Region/README.md
new file mode 100644
index 000000000..c4a7c45b6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/README.md
@@ -0,0 +1,338 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Region
+
+This Data Type generates a random region. A region is something like a State, Province or County - whatever is 
+applicable for a particular country. The region data is stored in the [Country Plugins](../../countries/README.md), so 
+see that section to see what information is currently available. All country plugins provide regions.
+
+Countries are typically subdivided geographically in numerous ways, so we choose the one that's most useful overall -
+almost always whatever region is used for addresses. For the shortcodes, typically they follow the ISO-3166-2 standard.
+
+This Data Type lets you generate regions in a number of different ways, hence the varied typings listed below. 
+
+You can choose to generate regions from 3 different sources: 
+1. `Any region` - This will generate a random region pulled from _any_ of the country plugins. 
+2. `Countries` - This generates a region from whatever list of countries you supply.
+3. `Country Row` - This option lets you target a Country Data Type row in your data set, and use that as the source. It'll
+then generate a region in whatever random country is generated for that row. 
+
+You can also choose whether this field outputs the full region name or a shortcode version (or either). 
+
+## Typings
+
+```typescript
+export type RegionSource = 'anyRegion' | 'countries' | 'countryRow';
+export type RegionFormat = 'full' | 'short';
+
+export type RegionState = {
+    source: RegionSource;
+    targetRowId: string;
+    selectedCountries: CountryType[];
+    formats: RegionFormat[];
+}
+
+export type RegionStateAny = Pick<RegionState, 'source' | 'formats'>;
+export type RegionStateCountryRow = Pick<RegionState, 'source' | 'targetRowId' | 'formats'>;
+export type RegionStateCountries = Pick<RegionState, 'source' | 'selectedCountries' | 'formats'>;
+```
+
+## Examples 
+
+- [Any region, with full and short names](#any-region-with-full-and-short-names)
+- [Any region from two countries](#any-region-from-two-countries)
+- [Any region mapped to a country row](#any-region-mapped-to-a-country-row)
+- [Full Region mapped to Country Subset row](#full-region-mapped-to-country-subset-row)
+
+
+### Any region, with full and short names
+
+This example outputs three rows of region data using the `anyRegion` option as a data source. The first displays the
+full region name, the second shows their shortcode, the third shows randomly short or full. 
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Region',
+            title: 'Full Region',
+            settings: {
+                source: 'anyRegion',
+                formats: ['full']
+            }
+        },
+        {
+            plugin: 'Region',
+            title: 'Short Region Code',
+            settings: {
+                source: 'anyRegion',
+                formats: ['short']
+            }
+        },
+        {
+            plugin: 'Region',
+            title: 'Short/Full Region Code',
+            settings: {
+                source: 'anyRegion',
+                formats: ['short', 'full']
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "Full Region": "Moscow Oblast",
+        "Short Region Code": "MP",
+        "Short/Full Region Code": "SB",
+    },
+    {
+        "Full Region": "Hidalgo",
+        "Short Region Code": "DS",
+        "Short/Full Region Code": "Agder",
+    },
+    {
+        "Full Region": "Gilgit Baltistan",
+        "Short Region Code": "QC",
+        "Short/Full Region Code": "Extremadura",
+    },
+    {
+        "Full Region": "Alajuela",
+        "Short Region Code": "Manisa",
+        "Short/Full Region Code": "Dr",
+    },
+    {
+        "Full Region": "Punjab",
+        "Short Region Code": "Adana",
+        "Short/Full Region Code": "Overijssel"
+    },    
+    ...
+]
+```
+
+### Any region from two countries
+
+This example use the `countries` source to let you fine-tune what countries should be used as the region data source.
+This generates regions from either Canada or Russia.
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Region',
+            title: 'Region from 2 countries',
+            settings: {
+                source: 'countries',
+                selectedCountries: ['Canada', 'Russia'],
+                formats: ['full']
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "Region from 2 countries": "Prince Edward Island"
+    },
+    {
+        "Region from 2 countries": "Saint Petersburg City"
+    },
+    {
+        "Region from 2 countries": "Bryansk Oblast"
+    },
+    {
+        "Region from 2 countries": "Ulyanovsk Oblast"
+    },
+    {
+        "Region from 2 countries": "Newfoundland and Labrador"
+    },
+    ...
+]
+```
+
+### Any region mapped to a country row
+
+This example shows how you can map one or more Region fields to a Country row. When generating the group of data,
+the generator will know to generate a region from the randomly generated country for that group, ensuring consistency.
+
+Note the use of the `id` and `targetRowId` properties. You can enter _any string value_ you want for those, as long as
+it's unique across the entire data template. In the website, it generates a random GUID internally for each row.
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Country',
+            title: 'Country',
+            settings: {
+                source: 'plugins',
+                selectedCountries: []
+            },
+            id: '1'
+        },
+        {
+            plugin: 'Region',
+            title: 'Full Region mapped to Country Row #1',
+            settings: {
+                source: 'countryRow',
+                targetRowId: '1',
+                formats: ['full']
+            }
+        },
+        {
+            plugin: 'Region',
+            title: 'Short Region mapped to Country Row #1',
+            settings: {
+                source: 'countryRow',
+                targetRowId: '1',
+                formats: ['short']
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "Country": "Chile",
+        "Full Region mapped to Country Row #1": "Metropolitana de Santiago",
+        "Short Region mapped to Country Row #1": "X"
+    },
+    {
+        "Country": "Sweden",
+        "Full Region mapped to Country Row #1": "Östergötlands län",
+        "Short Region mapped to Country Row #1": "E"
+    },
+    {
+        "Country": "Australia",
+        "Full Region mapped to Country Row #1": "Tasmania",
+        "Short Region mapped to Country Row #1": "NT"
+    },
+    {
+        "Country": "New Zealand",
+        "Full Region mapped to Country Row #1": "North Island",
+        "Short Region mapped to Country Row #1": "NI"
+    },
+    {
+        "Country": "Chile",
+        "Full Region mapped to Country Row #1": "Valparaíso",
+        "Short Region mapped to Country Row #1": "VII"
+    },
+    {
+        "Country": "Ukraine",
+        "Full Region mapped to Country Row #1": "Volyn oblast",
+        "Short Region mapped to Country Row #1": "RV"
+    },
+    ...
+]
+```
+
+### Full Region mapped to Country Subset row
+
+This example generates a region for a subset of countries.
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Country',
+            title: 'country-plugin2',
+            settings: {
+                source: 'plugins',
+                selectedCountries: ['Canada', 'US']
+            },
+            id: '123'
+        },
+        {
+            plugin: 'Region',
+            title: 'Full Region mapped to Country Subset row',
+            settings: {
+                source: 'countryRow',
+                targetRowId: '123',
+                formats: ['full']
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output:
+
+```
+[
+    {
+        "country": "Canada",
+        "region": "Nova Scotia"
+    },
+    {
+        "country": "United States",
+        "region": "California"
+    },
+    {
+        "country": "Canada",
+        "region": "Northwest Territories"
+    },
+    {
+        "country": "Canada",
+        "region": "Alberta"
+    },
+    {
+        "country": "Canada",
+        "region": "Northwest Territories"
+    },
+    {
+        "country": "Canada",
+        "region": "British Columbia"
+    },
+    {
+        "country": "United States",
+        "region": "Arkansas"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/Region/Region.generate.ts b/packages/plugins/src/dataTypes/Region/Region.generate.ts
new file mode 100644
index 000000000..cf2081aab
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/Region.generate.ts
@@ -0,0 +1,59 @@
+import { countryList } from '../../../../_plugins';
+import { getRandomArrayValue } from '~utils/randomUtils';
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { Region, CountryType } from '~types/countries';
+import { RegionFormat } from './Region.state';
+
+// used for caching purposes
+const countryRegions: any = {};
+
+export const generate = (data: DTGenerationData): DTGenerateResult => {
+	const { rowState, countryData, existingRowData } = data;
+
+	let country: CountryType;
+
+	if (rowState.source === 'countryRow') {
+		const countryRow = existingRowData.find(({ id }: any) => id === rowState.targetRowId);
+		country = countryRow!.data.countryDataType;
+	} else {
+		const list = rowState.source === 'anyRegion' ? countryList : rowState.selectedCountries;
+		country = getRandomArrayValue(list);
+	}
+
+	if (!country) {
+		return {
+			display: '',
+			countryDataType: ''
+		};
+	}
+
+	if (!rowState.formats.length) {
+		return {
+			display: '',
+			displayFormat: '',
+			countryDataType: country
+		};
+	}
+
+	const displayFormat = getRandomArrayValue(rowState.formats) as RegionFormat;
+	if (countryRegions[country]) {
+		return {
+			display: getRandomArrayValue(countryRegions[country][displayFormat]),
+			displayFormat,
+			countryDataType: country
+		};
+	} else {
+		const selectedCountryData = countryData[country];
+
+		countryRegions[country] = {
+			full: selectedCountryData.regions.map((i: Region) => i.regionName),
+			short: selectedCountryData.regions.map((i: Region) => i.regionShort)
+		};
+
+		return {
+			display: getRandomArrayValue(countryRegions[country][displayFormat]),
+			displayFormat,
+			countryDataType: country
+		};
+	}
+};
diff --git a/packages/plugins/src/dataTypes/Region/Region.scss b/packages/plugins/src/dataTypes/Region/Region.scss
new file mode 100644
index 000000000..a013c6a46
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/Region.scss
@@ -0,0 +1,3 @@
+.buttonLabel {
+	margin-top: 4px;
+}
diff --git a/packages/plugins/src/dataTypes/Region/Region.scss.d.ts b/packages/plugins/src/dataTypes/Region/Region.scss.d.ts
new file mode 100644
index 000000000..47b5f3c54
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/Region.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace RegionScssNamespace {
+  export interface IRegionScss {
+    buttonLabel: string;
+  }
+}
+
+declare const RegionScssModule: RegionScssNamespace.IRegionScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: RegionScssNamespace.IRegionScss;
+};
+
+export = RegionScssModule;
diff --git a/packages/plugins/src/dataTypes/Region/Region.state.tsx b/packages/plugins/src/dataTypes/Region/Region.state.tsx
new file mode 100644
index 000000000..128a8e938
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/Region.state.tsx
@@ -0,0 +1,26 @@
+import { CountryType } from '../../';
+
+export type RegionSource = 'anyRegion' | 'countries' | 'countryRow';
+export type RegionFormat = 'full' | 'short';
+
+export type RegionState = {
+  source: RegionSource;
+  targetRowId: string;
+  selectedCountries: CountryType[];
+  formats: RegionFormat[];
+};
+
+export type RegionStateAny = Pick<RegionState, 'source' | 'formats'>;
+export type RegionStateCountryRow = Pick<RegionState, 'source' | 'targetRowId' | 'formats'>;
+export type RegionStateCountries = Pick<RegionState, 'source' | 'selectedCountries' | 'formats'>;
+
+export const initialState: RegionState = {
+  source: 'anyRegion',
+  selectedCountries: [],
+  targetRowId: '',
+  formats: ['full']
+};
+
+export const defaultGenerationOptions = initialState;
+
+export type GenerationOptionsType = RegionStateAny | RegionStateCountryRow | RegionStateCountries;
diff --git a/packages/plugins/src/dataTypes/Region/Region.store.tsx b/packages/plugins/src/dataTypes/Region/Region.store.tsx
new file mode 100644
index 000000000..2eee5eaad
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/Region.store.tsx
@@ -0,0 +1,61 @@
+import { createSelector } from 'reselect';
+import { DTCustomProps } from '~types/dataTypes';
+import { getSortedRowsArray } from '~store/generator/generator.selectors';
+import { RegionState } from './Region.state';
+import { REMOVE_ROW, CONFIGURE_DATA_TYPE, SELECT_DATA_TYPE } from '~store/generator/generator.actions';
+
+// custom selector that extracts information about the country fields, needed by this component. The
+// core script handles processing this and passing it back via a `countryRows` prop to our Options component, as defined
+// in the `customProps` bit below
+const getCountryRows = createSelector(
+	getSortedRowsArray,
+	(rows) => rows.map((row, index) => ({ ...row, index })).filter(({ dataType, data }) => (
+		dataType === 'Country' && data.source === 'plugins'
+	))
+);
+
+export const customProps: DTCustomProps = {
+	countryRows: getCountryRows
+};
+
+export const actionInterceptors = {
+	// when a Country plugin row is removed, clean up any region fields that may have been mapped to it
+	[REMOVE_ROW]: (countryRowId: string, rowState: RegionState, actionPayload: any): RegionState | null => {
+		if (actionPayload.id === rowState.targetRowId) {
+			return {
+				...rowState,
+				source: 'anyRegion',
+				targetRowId: ''
+			};
+		}
+		return null;
+	},
+
+	// check any mapped Country rows don't make changes to their config that invalidates the region mapping
+	[CONFIGURE_DATA_TYPE]: (countryRowId: string, rowState: RegionState, actionPayload: any): RegionState | null => {
+		if (actionPayload.id === rowState.targetRowId) {
+			if (actionPayload.data.source !== 'plugins') {
+				return {
+					...rowState,
+					source: 'anyRegion',
+					targetRowId: ''
+				};
+			}
+		}
+		return null;
+	},
+
+	// when a user changes a Country row to something else, update any region mapping
+	[SELECT_DATA_TYPE]: (countryRowId: string, rowState: RegionState, actionPayload: any): RegionState | null => {
+		if (actionPayload.id === rowState.targetRowId) {
+			if (actionPayload.value !== 'Country') {
+				return {
+					...rowState,
+					source: 'anyRegion',
+					targetRowId: ''
+				};
+			}
+		}
+		return null;
+	}
+};
diff --git a/packages/plugins/src/dataTypes/Region/Region.tsx b/packages/plugins/src/dataTypes/Region/Region.tsx
new file mode 100644
index 000000000..cf1d62a6c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/Region.tsx
@@ -0,0 +1,209 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import { countryList } from '../../../../_plugins';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import styles from './Region.scss';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import { removeItem } from '~utils/arrayUtils';
+import { getI18nString } from '~utils/langUtils';
+import { RegionSource, RegionFormat } from './Region.state';
+
+const RegionDialog = ({ visible, data, id, onClose, onSetFormats, countryI18n, coreI18n, i18n, onUpdate, countryRows }: any) => {
+  const countryPluginRows = countryRows.map(({ index, id, title }: any) => ({ value: id, label: `${i18n.row} #${index + 1}: ${title}` }));
+
+  const countryPluginRowsExist = countryPluginRows.length > 0;
+
+  const onUpdateSource = (source: RegionSource): void => {
+    const newValues = {
+      ...data,
+      source
+    };
+
+    // always autoselect the first Country row when switching to `Country Row` as the source
+    if (source === 'countryRow') {
+      newValues.targetRowId = countryPluginRows[0].value;
+    }
+    onUpdate(newValues);
+  };
+
+  const onChangeTargetRow = (row: DropdownOption): void => {
+    onUpdate({
+      ...data,
+      targetRowId: row.value
+    });
+  };
+
+  const onSelectCountries = (countries: any): void => {
+    onUpdate({
+      ...data,
+      selectedCountries: countries ? countries.map(({ value }: DropdownOption) => value) : []
+    });
+  };
+
+  const getCountryRow = (): React.ReactNode => {
+    if (data.source !== 'countryRow') {
+      return null;
+    }
+
+    return <Dropdown value={data.targetRowId} onChange={onChangeTargetRow} options={countryPluginRows} />;
+  };
+
+  const getCountryPluginsList = (): React.ReactNode => {
+    if (data.source !== 'countries') {
+      return null;
+    }
+    const countryPluginOptions = countryList.map((countryName) => ({
+      value: countryName,
+      label: countryI18n[countryName].countryName
+    }));
+
+    return (
+      <Dropdown
+        isMulti
+        closeMenuOnSelect={false}
+        isClearable={true}
+        value={data.selectedCountries}
+        onChange={onSelectCountries}
+        options={countryPluginOptions}
+      />
+    );
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ maxWidth: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.selectRegions}</DialogTitle>
+        <DialogContent dividers>
+          <div>{i18n.explanation}</div>
+
+          <h3>{i18n.source}</h3>
+
+          <RadioPillRow>
+            <RadioPill
+              label={i18n.anyRegion}
+              onClick={(): void => onUpdateSource('anyRegion')}
+              name={`${id}-source`}
+              checked={data.source === 'anyRegion'}
+              tooltip={i18n.anyDesc}
+            />
+            <RadioPill
+              label={i18n.countries}
+              onClick={(): void => onUpdateSource('countries')}
+              name={`${id}-source`}
+              checked={data.source === 'countries'}
+              tooltip={i18n.countriesDesc}
+            />
+            <RadioPill
+              label={i18n.countryRow}
+              onClick={(): void => onUpdateSource('countryRow')}
+              name={`${id}-source`}
+              checked={data.source === 'countryRow'}
+              tooltip={i18n.rowDesc}
+              disabled={!countryPluginRowsExist}
+            />
+          </RadioPillRow>
+
+          {getCountryRow()}
+          {getCountryPluginsList()}
+
+          <h3>{i18n.format}</h3>
+
+          <p>
+            <input
+              type="checkbox"
+              value="full"
+              id={`${id}-full`}
+              checked={data.formats.indexOf('full') !== -1}
+              onChange={(e): void => onSetFormats('full', e.target.checked)}
+            />
+            <label htmlFor={`${id}-full`}>{i18n.full}</label>
+            <input
+              type="checkbox"
+              value="short"
+              id={`${id}-short`}
+              checked={data.formats.indexOf('short') !== -1}
+              onChange={(e): void => onSetFormats('short', e.target.checked)}
+            />
+            <label htmlFor={`${id}-short`}>{i18n.short}</label>
+          </p>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ id, data, coreI18n, i18n, countryI18n, onUpdate, countryRows }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+  const numSelected = data.selectedCountries.length;
+
+  const onSetFormats = (field: RegionFormat, checked: boolean): void => {
+    let formats = [...data.formats];
+
+    if (checked) {
+      formats.push(field);
+    } else {
+      formats = removeItem(formats, field);
+    }
+
+    onUpdate({
+      ...data,
+      formats
+    });
+  };
+
+  let label = '';
+  if (data.source === 'anyRegion') {
+    label = i18n.anyRegion;
+  } else if (data.source === 'countries') {
+    if (numSelected === 1) {
+      label = i18n.anyRegionFromCountry;
+    } else {
+      label = getI18nString(i18n.anyRegionFromCountries, [numSelected]);
+    }
+  } else if (data.source === 'countryRow') {
+    const row = countryRows.find((row: any) => row.id === data.targetRowId);
+    const rowNum = row.index + 1;
+    label = `${i18n.countryRow} #${rowNum}`;
+  }
+
+  return (
+    <div className={styles.buttonLabel}>
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        <span dangerouslySetInnerHTML={{ __html: label }} />
+      </Button>
+      <RegionDialog
+        visible={dialogVisible}
+        data={data}
+        countryRows={countryRows}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        countryI18n={countryI18n}
+        onUpdate={onUpdate}
+        onSetFormats={onSetFormats}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <p>
+    {i18n.DESC} <span dangerouslySetInnerHTML={{ __html: i18n.help_text }} />
+  </p>
+);
+
+export const getMetadata = (): DTMetadata => ({
+  sql: {
+    field: 'varchar(50) default NULL',
+    field_Oracle: 'varchar2(50) default NULL',
+    field_MSSQL: 'VARCHAR(50) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/Region/Region.worker.ts b/packages/plugins/src/dataTypes/Region/Region.worker.ts
new file mode 100644
index 000000000..0d19c07d3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/Region.worker.ts
@@ -0,0 +1,6 @@
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Region.generate';
+
+export const onmessage = (e: DTWorkerOnMessage): void => {
+	postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/dataTypes/Region/__tests__/Region.test.tsx b/packages/plugins/src/dataTypes/Region/__tests__/Region.test.tsx
new file mode 100644
index 000000000..4b8f071fc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/__tests__/Region.test.tsx
@@ -0,0 +1,51 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help, Options } from '../Region';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	data: {
+		selectedCountries: []
+	},
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	gridPanelDimensions: { width: 100, height: 100 },
+	onUpdate: () => {}
+};
+
+const optionsProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	gridPanelDimensions: { width: 100, height: 100 },
+	isCountryNamesLoading: false,
+	isCountryNamesLoaded: false,
+	countryNamesMap: null
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
+
+describe('Options', () => {
+	it('renders', () => {
+		const { container } = render(
+			<Options
+				{...optionsProps}
+				data={{
+					selectedCountries: [],
+					formats: ['full']
+				}}
+				onUpdate={() => {}}
+				countryRows={[]}
+			/>
+		);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Region/bundle.ts b/packages/plugins/src/dataTypes/Region/bundle.ts
new file mode 100644
index 000000000..39789a9c7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/bundle.ts
@@ -0,0 +1,15 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, Options, getMetadata } from './Region';
+import { customProps, actionInterceptors } from './Region.store';
+import { initialState } from './Region.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Options,
+	Help,
+	getMetadata,
+	customProps,
+	actionInterceptors
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Region/config.ts b/packages/plugins/src/dataTypes/Region/config.ts
new file mode 100644
index 000000000..1a2b05479
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/config.ts
@@ -0,0 +1,9 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'geo',
+  fieldGroupOrder: 40,
+  dependencies: ['Country', 'Names']
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Region/i18n/ar.json b/packages/plugins/src/dataTypes/Region/i18n/ar.json
new file mode 100644
index 000000000..33c251df6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/ar.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "منطقة",
+  "DESC": "يولد مقاطعات أو ولايات أو أقاليم أو مقاطعات كندية عشوائية ، بناءً على الخيارات التي تحددها.",
+  "DEFAULT_TITLE": "منطقة",
+  "helpText": "يحدد الخياران الفرعيان للاسم الكامل والاختصار ما إذا كان الناتج سيحتوي على السلسلة الكاملة (مثل \"كولومبيا البريطانية\") أو اختصارها (مثل \"BC\"). بالنسبة لمقاطعات المملكة المتحدة ، يكون الاختصار هو رمز تشابمان القياسي المكون من 3 أحرف.",
+  "explanation": "يتحكم هذا في أسماء المناطق التي سيتم إنشاؤها بواسطة هذا الحقل.",
+  "full": "ممتلئ",
+  "short": "قصيرة",
+  "noCountriesSelected": "لم يتم اختيار دول.",
+  "countries": "بلدان",
+  "country": "بلد",
+  "anyRegion": "أي منطقة",
+  "source": "مصدر",
+  "format": "شكل",
+  "selectRegions": "حدد المناطق",
+  "anyDesc": "يولد أي اسم منطقة.",
+  "countriesDesc": "يولد مناطق لأي من البلدان المحددة.",
+  "countryRow": "صف البلد",
+  "rowDesc": "يتيح لك هذا تحديد حقل بلد معين في مجموعة البيانات الخاصة بك التي تحتوي على مكونات البلد الإضافية كمصدر لها. يُنشئ المناطق التي تحدد القيمة الموجودة في هذا الحقل.",
+  "row": "صف",
+  "anyRegionFromCountry": "أي منطقة من بلد واحد",
+  "anyRegionFromCountries": "أي منطقة من دول %1"
+}
diff --git a/packages/plugins/src/dataTypes/Region/i18n/de.json b/packages/plugins/src/dataTypes/Region/i18n/de.json
new file mode 100644
index 000000000..6ee00aca8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/de.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Region",
+  "DESC": "Generiert zufällige kanadische Provinzen, Bundesstaaten, Territorien oder Landkreise basierend auf den von Ihnen ausgewählten Optionen.",
+  "DEFAULT_TITLE": "region",
+  "helpText": "Die Unteroptionen Vollständiger Name und Abkürzung bestimmen, ob die Ausgabe die vollständige Zeichenfolge (z. B. \"British Columbia\") oder deren Abkürzung (z. B. \"BC\") enthält. Für Grafschaften in Großbritannien ist die Abkürzung der standardmäßige 3-stellige Chapman-Code.",
+  "explanation": "Hiermit wird gesteuert, welche Regionsnamen von diesem Feld generiert werden.",
+  "full": "Voll",
+  "short": "Kurz",
+  "noCountriesSelected": "Keine Länder ausgewählt.",
+  "countries": "Länder",
+  "country": "Land",
+  "anyRegion": "Jede Region",
+  "source": "Quelle",
+  "format": "Format",
+  "selectRegions": "Wählen Sie Regionen",
+  "anyDesc": "Erzeugt einen beliebigen Regionsnamen.",
+  "countriesDesc": "Generiert Regionen für eines der angegebenen Länder.",
+  "countryRow": "Country Row",
+  "rowDesc": "Auf diese Weise können Sie ein bestimmtes Länderfeld in Ihrem Datensatz bestimmen, dessen Quelle Länder-Plugins sind. Es werden Regionen generiert, die dem Wert in diesem Feld zugeordnet sind.",
+  "row": "Reihe",
+  "anyRegionFromCountry": "Jede Region aus 1 Land",
+  "anyRegionFromCountries": "Jede Region aus %1 Ländern"
+}
diff --git a/packages/plugins/src/dataTypes/Region/i18n/en.json b/packages/plugins/src/dataTypes/Region/i18n/en.json
new file mode 100644
index 000000000..84e15797c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/en.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Region",
+  "DESC": "Generates random Canadian provinces, states, territories or counties, based on the options you select.",
+  "DEFAULT_TITLE": "region",
+  "helpText": "The <b>Full Name</b> and <b>Abbreviation</b> sub-options determine whether the output will contain the full string (e.g. \"British Columbia\") or its abbreviation (e.g. \"BC\"). For UK counties, the abbreviation is the standard 3-character Chapman code.",
+  "explanation": "This controls what region names will be generated by this field.",
+  "full": "Full",
+  "short": "Short",
+  "noCountriesSelected": "No countries selected.",
+  "countries": "Countries",
+  "country": "Country",
+  "anyRegion": "Any region",
+  "source": "Source",
+  "format": "Format",
+  "selectRegions": "Select Regions",
+  "anyDesc": "Generates any region name.",
+  "countriesDesc": "Generates regions for any of the specified countries.",
+  "countryRow": "Country Row",
+  "rowDesc": "This lets you pinpoint a specific Country field in your data set that has Country Plugins as its source. It generates regions that map to the value in that field.",
+  "row": "Row",
+  "anyRegionFromCountry": "Any region from 1 country",
+  "anyRegionFromCountries": "Any region from %1 countries"
+}
diff --git a/packages/plugins/src/dataTypes/Region/i18n/es.json b/packages/plugins/src/dataTypes/Region/i18n/es.json
new file mode 100644
index 000000000..095ac5112
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/es.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Región",
+  "DESC": "Genera provincias, estados, territorios o condados canadienses aleatorios, según las opciones que seleccione.",
+  "DEFAULT_TITLE": "región",
+  "helpText": "Las subopciones de nombre completo y abreviatura determinan si la salida contendrá la cadena completa (por ejemplo, \"Columbia Británica\") o su abreviatura (por ejemplo, \"BC\"). Para los condados del Reino Unido, la abreviatura es el código Chapman estándar de 3 caracteres.",
+  "explanation": "Esto controla qué nombres de región generará este campo.",
+  "full": "Llena",
+  "short": "Corta",
+  "noCountriesSelected": "No se seleccionó ningún país.",
+  "countries": "Países",
+  "country": "País",
+  "anyRegion": "Cualquier región",
+  "source": "Fuente",
+  "format": "Formato",
+  "selectRegions": "Seleccionar regiones",
+  "anyDesc": "Genera cualquier nombre de región.",
+  "countriesDesc": "Genera regiones para cualquiera de los países especificados.",
+  "countryRow": "Fila de país",
+  "rowDesc": "Esto le permite identificar un campo de país específico en su conjunto de datos que tiene complementos de país como fuente. Genera regiones que se asignan al valor en ese campo.",
+  "row": "Fila",
+  "anyRegionFromCountry": "Cualquier región de 1 país",
+  "anyRegionFromCountries": "Cualquier región de %1 países"
+}
diff --git a/packages/plugins/src/dataTypes/Region/i18n/fr.json b/packages/plugins/src/dataTypes/Region/i18n/fr.json
new file mode 100644
index 000000000..b6d6e8bf0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/fr.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Région",
+  "DESC": "Génère des provinces, états, territoires ou comtés canadiens aléatoires, selon les options que vous sélectionnez.",
+  "DEFAULT_TITLE": "région",
+  "helpText": "Les sous-options Nom complet et Abréviation déterminent si la sortie contiendra la chaîne complète (par exemple «Colombie-Britannique») ou son abréviation (par exemple «BC»). Pour les comtés britanniques, l'abréviation est le code Chapman standard à 3 caractères.",
+  "explanation": "Cela contrôle les noms de région générés par ce champ.",
+  "full": "Pleine",
+  "short": "Courte",
+  "noCountriesSelected": "Aucun pays sélectionné.",
+  "countries": "Des pays",
+  "country": "Pays",
+  "anyRegion": "Toute région",
+  "source": "La source",
+  "format": "Format",
+  "selectRegions": "Sélectionnez les régions",
+  "anyDesc": "Génère n'importe quel nom de région.",
+  "countriesDesc": "Génère des régions pour l'un des pays spécifiés.",
+  "countryRow": "Country Row",
+  "rowDesc": "Cela vous permet d'identifier un champ Pays spécifique dans votre ensemble de données dont la source est les Plugins Pays. Il génère des régions qui correspondent à la valeur de ce champ.",
+  "row": "Rangée",
+  "anyRegionFromCountry": "Toute région d'un pays",
+  "anyRegionFromCountries": "Toute région de %1 pays"
+}
diff --git a/packages/plugins/src/dataTypes/Region/i18n/hi.json b/packages/plugins/src/dataTypes/Region/i18n/hi.json
new file mode 100644
index 000000000..5f4766cca
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/hi.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "क्षेत्र",
+  "DESC": "आपके द्वारा चुने गए विकल्पों के आधार पर यादृच्छिक कनाडाई प्रांत, राज्य, क्षेत्र या काउंटी उत्पन्न करता है।",
+  "DEFAULT_TITLE": "क्षेत्र",
+  "helpText": "<b>पूरा नाम</b> और <b>संक्षिप्त नाम</b> उप-विकल्प यह निर्धारित करते हैं कि आउटपुट में पूरी स्ट्रिंग होगी (जैसे \"ब्रिटिश कोलंबिया\") या उसका संक्षिप्त नाम (जैसे \"BC\")। यूके काउंटियों के लिए, संक्षिप्त नाम मानक 3-वर्ण चैपमैन कोड है।",
+  "explanation": "यह नियंत्रित करता है कि इस क्षेत्र द्वारा कौन से क्षेत्र के नाम उत्पन्न किए जाएंगे।",
+  "full": "भरा हुआ",
+  "short": "छोटा",
+  "noCountriesSelected": "कोई देश नहीं चुना गया.",
+  "countries": "देशों",
+  "country": "देश",
+  "anyRegion": "कोई भी क्षेत्र",
+  "source": "स्रोत",
+  "format": "प्रारूप",
+  "selectRegions": "क्षेत्रों का चयन करें",
+  "anyDesc": "किसी भी क्षेत्र का नाम उत्पन्न करता है।",
+  "countriesDesc": "निर्दिष्ट देशों में से किसी के लिए क्षेत्र उत्पन्न करता है।",
+  "countryRow": "देश पंक्ति",
+  "rowDesc": "यह आपको अपने डेटा सेट में एक विशिष्ट देश फ़ील्ड को इंगित करने देता है जिसमें इसके स्रोत के रूप में देश प्लगइन्स हैं। यह उन क्षेत्रों को उत्पन्न करता है जो उस क्षेत्र में मूल्य के लिए मैप करते हैं।",
+  "row": "पंक्ति",
+  "anyRegionFromCountry": "1 देश का कोई भी क्षेत्र",
+  "anyRegionFromCountries": "%1 देशों से कोई भी क्षेत्र"
+}
diff --git a/packages/plugins/src/dataTypes/Region/i18n/ja.json b/packages/plugins/src/dataTypes/Region/i18n/ja.json
new file mode 100644
index 000000000..6536c6915
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/ja.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "領域",
+  "DESC": "選択したオプションに基づいて、ランダムなカナダの州、州、準州、または郡を生成します。",
+  "DEFAULT_TITLE": "領域",
+  "helpText": "[フルネーム]および[略語]サブオプションは、出力に完全な文字列（「ブリティッシュコロンビア」など）を含めるか、その略語（「BC」など）を含めるかを決定します。 英国の郡の場合、略語は標準の3文字のチャップマンコードです。",
+  "explanation": "これは、このフィールドによって生成されるリージョン名を制御します。",
+  "full": "フル",
+  "short": "ショーツ",
+  "noCountriesSelected": "国が選択されていません。",
+  "countries": "国",
+  "country": "国",
+  "anyRegion": "任意の地域",
+  "source": "ソース",
+  "format": "フォーマット",
+  "selectRegions": "地域を選択",
+  "anyDesc": "任意のリージョン名を生成します。",
+  "countriesDesc": "指定された国のいずれかの地域を生成します。",
+  "countryRow": "国の行",
+  "rowDesc": "これにより、カントリープラグインをソースとして持つデータセット内の特定の国フィールドを特定できます。 そのフィールドの値にマップする領域を生成します。",
+  "row": "行",
+  "anyRegionFromCountry": "1か国の任意の地域",
+  "anyRegionFromCountries": "%1諸国の任意の地域"
+}
diff --git a/packages/plugins/src/dataTypes/Region/i18n/nl.json b/packages/plugins/src/dataTypes/Region/i18n/nl.json
new file mode 100644
index 000000000..2e19ead03
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/nl.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Regio",
+  "DESC": "Genereert willekeurige Canadese provincies, staten, territoria of provincies op basis van de opties die u selecteert.",
+  "DEFAULT_TITLE": "regio",
+  "helpText": "De subopties Volledige naam en afkorting bepalen of de uitvoer de volledige tekenreeks (bijvoorbeeld \"British Columbia\") of de afkorting ervan (bijvoorbeeld \"BC\") zal bevatten. Voor Britse provincies is de afkorting de standaard Chapman-code van 3 tekens.",
+  "explanation": "Dit bepaalt welke regionamen door dit veld worden gegenereerd.",
+  "full": "Vol",
+  "short": "Kort",
+  "noCountriesSelected": "Geen landen geselecteerd.",
+  "countries": "Landen",
+  "country": "Land",
+  "anyRegion": "Elke regio",
+  "source": "Bron",
+  "format": "Formaat",
+  "selectRegions": "Selecteer Regio's",
+  "anyDesc": "Genereert een regionale naam.",
+  "countriesDesc": "Genereert regio's voor elk van de opgegeven landen.",
+  "countryRow": "Country Row",
+  "rowDesc": "Hiermee kunt u een specifiek landveld in uw dataset lokaliseren dat landplug-ins als bron heeft. Het genereert regio's die zijn toegewezen aan de waarde in dat veld.",
+  "row": "Rij",
+  "anyRegionFromCountry": "Elke regio uit 1 land",
+  "anyRegionFromCountries": "Elke regio uit %1 landen"
+}
diff --git a/packages/plugins/src/dataTypes/Region/i18n/pt.json b/packages/plugins/src/dataTypes/Region/i18n/pt.json
new file mode 100644
index 000000000..f825c858c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/pt.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Região",
+  "DESC": "Gera províncias, estados, territórios ou condados canadenses aleatórios, com base nas opções selecionadas.",
+  "DEFAULT_TITLE": "região",
+  "helpText": "As subopções <b>Nome completo</b> e <b>Abreviação</b> determinam se a saída conterá a string completa (por exemplo, \"British Columbia\") ou sua abreviação (por exemplo, \"BC\"). Para condados do Reino Unido, a abreviatura é o código Chapman padrão de 3 caracteres.",
+  "explanation": "Isso controla quais nomes de região serão gerados por este campo.",
+  "full": "Cheia",
+  "short": "Baixa",
+  "noCountriesSelected": "Nenhum país selecionado.",
+  "countries": "Países",
+  "country": "País",
+  "anyRegion": "Qualquer região",
+  "source": "Fonte",
+  "format": "Formato",
+  "selectRegions": "Selecione as regiões",
+  "anyDesc": "Gera qualquer nome de região.",
+  "countriesDesc": "Gera regiões para qualquer um dos países especificados.",
+  "countryRow": "Country Row",
+  "rowDesc": "Isso permite que você localize um campo de país específico em seu conjunto de dados que tem Plug-ins de país como sua fonte. Ele gera regiões que mapeiam para o valor naquele campo.",
+  "row": "Linha",
+  "anyRegionFromCountry": "Qualquer região de 1 país",
+  "anyRegionFromCountries": "Qualquer região de %1 países"
+}
diff --git a/packages/plugins/src/dataTypes/Region/i18n/ru.json b/packages/plugins/src/dataTypes/Region/i18n/ru.json
new file mode 100644
index 000000000..798298ea2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/ru.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Pегион",
+  "DESC": "Генерирует случайные канадские провинции, штаты, территории или округа на основе выбранных вами параметров.",
+  "DEFAULT_TITLE": "pегион",
+  "helpText": "Подпараметры «Полное имя» и «Аббревиатура» определяют, будет ли вывод содержать полную строку (например, «Британская Колумбия») или ее аббревиатуру (например, «BC»). Для округов Великобритании аббревиатура представляет собой стандартный трехзначный код Чепмена.",
+  "explanation": "Это определяет, какие имена регионов будут генерироваться этим полем.",
+  "full": "Полный",
+  "short": "короткий",
+  "noCountriesSelected": "Страны не выбраны.",
+  "countries": "Страны",
+  "country": "Страна",
+  "anyRegion": "Любой регион",
+  "source": "Источник",
+  "format": "Формат",
+  "selectRegions": "Выберите регионы",
+  "anyDesc": "Генерирует любое имя региона.",
+  "countriesDesc": "Генерирует регионы для любой из указанных стран.",
+  "countryRow": "Кантри Роу",
+  "rowDesc": "Это позволяет вам точно определить конкретное поле страны в вашем наборе данных, источником которого являются плагины страны. Он генерирует области, которые сопоставляются со значением в этом поле.",
+  "row": "Строка",
+  "anyRegionFromCountry": "Любой регион из 1 страны",
+  "anyRegionFromCountries": "Любой регион из %1 страны"
+}
diff --git a/packages/plugins/src/dataTypes/Region/i18n/ta.json b/packages/plugins/src/dataTypes/Region/i18n/ta.json
new file mode 100644
index 000000000..7d58cb041
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/ta.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "பிராந்தியம்",
+  "DESC": "நீங்கள் தேர்ந்தெடுக்கும் விருப்பங்களின் அடிப்படையில் சீரற்ற கனேடிய மாகாணங்கள், மாநிலங்கள், பிரதேசங்கள் அல்லது மாவட்டங்களை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "பகுதி",
+  "helpText": "வெளியீட்டில் முழு சரம் (எ.கா. \"பிரிட்டிஷ் கொலம்பியா\") அல்லது அதன் சுருக்கம் (எ.கா. \"கிமு\") உள்ளதா என்பதை முழு பெயர் மற்றும் சுருக்க துணை விருப்பங்கள் தீர்மானிக்கின்றன. இங்கிலாந்து மாவட்டங்களைப் பொறுத்தவரை, சுருக்கமானது நிலையான 3-எழுத்து சாப்மேன் குறியீடாகும்.",
+  "explanation": "இந்த புலத்தால் எந்த பிராந்திய பெயர்கள் உருவாக்கப்படும் என்பதை இது கட்டுப்படுத்துகிறது.",
+  "full": "முழு",
+  "short": "குறுகிய",
+  "noCountriesSelected": "எந்த நாடுகளும் தேர்ந்தெடுக்கப்படவில்லை.",
+  "countries": "நாடுகள்",
+  "country": "நாடு",
+  "anyRegion": "எந்த பிராந்தியமும்",
+  "source": "மூல",
+  "format": "வடிவம்",
+  "selectRegions": "பிராந்தியங்களைத் தேர்ந்தெடுக்கவும்",
+  "anyDesc": "எந்த பிராந்திய பெயரையும் உருவாக்குகிறது.",
+  "countriesDesc": "குறிப்பிட்ட எந்த நாடுகளுக்கும் பிராந்தியங்களை உருவாக்குகிறது.",
+  "countryRow": "நாட்டின் வரிசை",
+  "rowDesc": "இது உங்கள் தரவுத் தொகுப்பில் ஒரு குறிப்பிட்ட நாட்டு புலத்தை அதன் மூல செருகிகளைக் கொண்டிருக்கும். அந்த புலத்தின் மதிப்பைக் குறிக்கும் பகுதிகளை இது உருவாக்குகிறது.",
+  "row": "வரிசை",
+  "anyRegionFromCountry": "1 நாட்டிலிருந்து எந்த பிராந்தியமும்",
+  "anyRegionFromCountries": "%1 நாடுகளில் இருந்து எந்த பிராந்தியமும்"
+}
diff --git a/packages/plugins/src/dataTypes/Region/i18n/zh.json b/packages/plugins/src/dataTypes/Region/i18n/zh.json
new file mode 100644
index 000000000..e6f3a80bd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Region/i18n/zh.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "地区",
+  "DESC": "根据您选择的选项，生成随机的加拿大省，州，地区或县。",
+  "DEFAULT_TITLE": "地区",
+  "helpText": "全名和缩写子选项确定输出将包含完整字符串（例如“ British Columbia”）还是其缩写（例如“ BC”）。 对于英国县，该缩写是标准的3个字符的查普曼代码。",
+  "explanation": "这控制了此字段将生成的区域名称。",
+  "full": "充分",
+  "short": "短",
+  "noCountriesSelected": "未选择国家。",
+  "countries": "国别",
+  "country": "国家",
+  "anyRegion": "任何地区",
+  "source": "资源",
+  "format": "格式",
+  "selectRegions": "选择地区",
+  "anyDesc": "生成任何区域名称。",
+  "countriesDesc": "生成任何指定国家/地区的区域。",
+  "countryRow": "国家行",
+  "rowDesc": "这样，您就可以在数据集中以“国家/地区插件”作为来源的特定“国家/地区”字段中定位。 它生成映射到该字段中值的区域。",
+  "row": "行",
+  "anyRegionFromCountry": "1个国家/地区的任何地区",
+  "anyRegionFromCountries": "来自%1个国家/地区的任何地区"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/README.md b/packages/plugins/src/dataTypes/Rut/README.md
new file mode 100644
index 000000000..5e89ba810
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/README.md
@@ -0,0 +1,26 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Rut
+
+This Data Type generates a random Chilean Unique National Role Number
+
+
+### Example API Usage
+
+```javascript
+{
+    "numRows": 20,
+    "rows": [
+        {
+            "type": "Rut",
+            "title": "Rut"
+        }
+    ],
+    "export": {
+        "type": "JSON"
+    }
+}
+```
+ 
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/dataTypes/Rut/Rut.generate.ts b/packages/plugins/src/dataTypes/Rut/Rut.generate.ts
new file mode 100644
index 000000000..ebcd2329b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/Rut.generate.ts
@@ -0,0 +1,52 @@
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = ({ rowState }: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { formatCode, uppercaseDigit } = rowState;
+
+  const { getRandomNum } = utils.randomUtils;
+  const rutNumber = `${getRandomNum(5, 50)}${getRandomNum(0, 999)}${getRandomNum(0, 999)}`;
+  const digit = getDigit(rutNumber);
+
+  let display = '';
+
+  if (formatCode === '12.345.678-9' || formatCode === '12.345.678-9' || formatCode === '12.345.678') {
+    display = utils.numberUtils.numberFormat(Number(rutNumber), 0, ',', '.');
+  } else if (formatCode === '12345678-9' || formatCode === '123456789' || formatCode === '12345678') {
+    display = rutNumber;
+  }
+
+  if (formatCode.indexOf('-') !== -1) {
+    display += '-';
+  }
+
+  if (formatCode.indexOf('9') !== -1) {
+    display += uppercaseDigit ? digit.toUpperCase() : digit;
+  }
+
+  return {
+    display,
+    rut: rutNumber,
+    digit
+  };
+};
+
+const getDigit = (rut: string): string => {
+  const rutNumReversedChars = rut.split('').reverse();
+
+  let n = 0;
+  for (let i = 0; i < rutNumReversedChars.length; i++) {
+    n += parseInt(rutNumReversedChars[i], 10) * ((i % 6) + 2);
+  }
+
+  const digit = 11 - (n % 11);
+
+  if (digit == 10) {
+    return 'k';
+  }
+  if (digit == 11) {
+    return '0';
+  }
+
+  return digit.toString();
+};
diff --git a/packages/plugins/src/dataTypes/Rut/Rut.state.tsx b/packages/plugins/src/dataTypes/Rut/Rut.state.tsx
new file mode 100644
index 000000000..57714b513
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/Rut.state.tsx
@@ -0,0 +1,19 @@
+export type FormatCode = '12345678-9' | '12.345.678-9' | '123456789' | '12.345.678-9' | '12345678' | '12.345.678' | '9';
+
+export type RutState = {
+	example: string;
+	formatCode: FormatCode;
+	uppercaseDigit: boolean;
+};
+
+export type GenerationOptionsType = Omit<RutState, 'example'>;
+
+export const defaultGenerationOptions = {
+	formatCode: '12345678-9' as FormatCode,
+	uppercaseDigit: true
+};
+
+export const initialState: RutState = {
+	example: '',
+	...defaultGenerationOptions
+};
diff --git a/packages/plugins/src/dataTypes/Rut/Rut.tsx b/packages/plugins/src/dataTypes/Rut/Rut.tsx
new file mode 100644
index 000000000..34102fec7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/Rut.tsx
@@ -0,0 +1,61 @@
+import * as React from 'react';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import { DTMetadata, DTOptionsProps } from '~types/dataTypes';
+
+export const Options = ({ i18n, id, data, onUpdate }: DTOptionsProps) => {
+  const options = [
+    { value: '12345678-9', label: '12345678-9' },
+    { value: '12.345.678-9', label: '12.345.678-9' },
+    { value: '123456789', label: '123456789' },
+    { value: '12.345.6789', label: '12.345.6789' },
+    { value: '12345678', label: '12345678' },
+    { value: '12.345.678', label: '12.345.678' },
+    { value: '9', label: `9 (${i18n.onlyDigit})` }
+  ];
+
+  const onChange = (field: string, value: string | boolean): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  // the uppercase checkbox only applies to formats that include the final digit
+  const getUppercaseCheckbox = (): JSX.Element | null => {
+    if (data.formatCode === '12345678' || data.formatCode === '12.345.678') {
+      return null;
+    }
+
+    return (
+      <div style={{ flex: '0 0 auto' }}>
+        <input
+          type="checkbox"
+          id={`${id}-upper`}
+          checked={data.uppercaseDigit}
+          onChange={(e): void => onChange('uppercaseDigit', e.target.checked)}
+        />
+        <label htmlFor={`${id}-upper`}>{i18n.digitUppercase}</label>
+      </div>
+    );
+  };
+
+  return (
+    <div style={{ display: 'flex', alignItems: 'center' }}>
+      <div style={{ flex: 1 }}>
+        <Dropdown value={data.formatCode} options={options} onChange={({ value }: DropdownOption): any => onChange('formatCode', value)} />
+      </div>
+      {getUppercaseCheckbox()}
+    </div>
+  );
+};
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'varchar(15) default NULL',
+    field_Oracle: 'varchar2(15) default NULL',
+    field_MSSQL: 'VARCHAR(15) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/Rut/Rut.worker.ts b/packages/plugins/src/dataTypes/Rut/Rut.worker.ts
new file mode 100644
index 000000000..e7f669077
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/Rut.worker.ts
@@ -0,0 +1,20 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Rut.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
+
+
+
+
+
+
diff --git a/packages/plugins/src/dataTypes/Rut/bundle.ts b/packages/plugins/src/dataTypes/Rut/bundle.ts
new file mode 100644
index 000000000..7a1e1abb5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/bundle.ts
@@ -0,0 +1,11 @@
+import { DTBundle } from '~types/dataTypes';
+import { Options, getMetadata } from './Rut';
+import { initialState } from './Rut.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Options,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Rut/config.ts b/packages/plugins/src/dataTypes/Rut/config.ts
new file mode 100644
index 000000000..33dc2aff8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'countrySpecific',
+  fieldGroupOrder: 20
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/ar.json b/packages/plugins/src/dataTypes/Rut/i18n/ar.json
new file mode 100644
index 000000000..c2396f830
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/ar.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "رقم RUT التشيلي",
+  "DESC": "يُنشئ رقم تعريف RUT / RUN الوطني الشيلي.",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "فقط رقم التحقق",
+  "digitUppercase": "رقم كبير"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/de.json b/packages/plugins/src/dataTypes/Rut/i18n/de.json
new file mode 100644
index 000000000..9215c1e5d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/de.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Chilenische RUT-Nummer",
+  "DESC": "Generiert eine chilenische nationale RUT / RUN-Identifikationsnummer.",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "Nur Bestätigungsziffer",
+  "digitUppercase": "Großbuchstabe"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/en.json b/packages/plugins/src/dataTypes/Rut/i18n/en.json
new file mode 100644
index 000000000..2857958ed
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/en.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Chilean RUT number",
+  "DESC": "Generates a RUT/RUN Chilean National Identification Number.",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "Only verification digit",
+  "digitUppercase": "Uppercase digit"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/es.json b/packages/plugins/src/dataTypes/Rut/i18n/es.json
new file mode 100644
index 000000000..56a10c07d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/es.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Número de RUT chileno",
+  "DESC": "Genera un Número de Identificación Nacional de Chile RUT / RUN.",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "Solo dígito de verificación",
+  "digitUppercase": "Dígito en mayúsculas"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/fr.json b/packages/plugins/src/dataTypes/Rut/i18n/fr.json
new file mode 100644
index 000000000..b4bc3d649
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/fr.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Numéro RUT chilien",
+  "DESC": "Génère un numéro d'identification national chilien RUT / RUN.",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "Seul le chiffre de vérification",
+  "digitUppercase": "Chiffre majuscule"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/hi.json b/packages/plugins/src/dataTypes/Rut/i18n/hi.json
new file mode 100644
index 000000000..50c106631
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/hi.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "चिली आरयूटी नंबर",
+  "DESC": "एक RUT/RUN चिली राष्ट्रीय पहचान संख्या उत्पन्न करता है।",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "केवल सत्यापन अंक",
+  "digitUppercase": "अपरकेस अंक"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/ja.json b/packages/plugins/src/dataTypes/Rut/i18n/ja.json
new file mode 100644
index 000000000..17ddc40db
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/ja.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "チリのRUT番号",
+  "DESC": "RUT / RUNチリ国民識別番号を生成します。",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "確認桁のみ",
+  "digitUppercase": "大文字"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/nl.json b/packages/plugins/src/dataTypes/Rut/i18n/nl.json
new file mode 100644
index 000000000..9a022682f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/nl.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Chileens RUT-nummer",
+  "DESC": "Genereert een RUT / RUN Chileens nationaal identificatienummer.",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "Alleen verificatiecijfer",
+  "digitUppercase": "Cijfer in hoofdletters"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/pt.json b/packages/plugins/src/dataTypes/Rut/i18n/pt.json
new file mode 100644
index 000000000..198f724c2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/pt.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Número RUT chileno",
+  "DESC": "Gera um número de identificação nacional chileno RUT / RUN.",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "Apenas dígito de verificação",
+  "digitUppercase": "Dígito maiúsculo"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/ru.json b/packages/plugins/src/dataTypes/Rut/i18n/ru.json
new file mode 100644
index 000000000..c0c15c06d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/ru.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "Чилийский номер RUT",
+  "DESC": "Генерирует чилийский национальный идентификационный номер RUT/RUN.",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "Только проверочная цифра",
+  "digitUppercase": "Заглавная цифра"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/ta.json b/packages/plugins/src/dataTypes/Rut/i18n/ta.json
new file mode 100644
index 000000000..d392562ee
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/ta.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "சிலி RUT எண்",
+  "DESC": "RUT / RUN சிலி தேசிய அடையாள எண்ணை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "சரிபார்ப்பு இலக்கத்தை மட்டுமே",
+  "digitUppercase": "பெரிய எண்"
+}
diff --git a/packages/plugins/src/dataTypes/Rut/i18n/zh.json b/packages/plugins/src/dataTypes/Rut/i18n/zh.json
new file mode 100644
index 000000000..f5c5ea7b5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Rut/i18n/zh.json
@@ -0,0 +1,7 @@
+{
+  "NAME": "智利RUT号码",
+  "DESC": "生成RUT / RUN智利国家标识号。",
+  "DEFAULT_TITLE": "rut",
+  "onlyDigit": "仅验证码",
+  "digitUppercase": "大写数字"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/SIRET.generate.ts b/packages/plugins/src/dataTypes/SIRET/SIRET.generate.ts
new file mode 100644
index 000000000..4c32604c6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/SIRET.generate.ts
@@ -0,0 +1,147 @@
+import { DTGenerateResult } from '~types/dataTypes';
+
+// data: DTGenerationData
+export const generate = (): DTGenerateResult => {
+	return { display: '' };
+};
+
+
+/*
+	// custom member vars for this Data Type
+	private $rSIREN = '';
+	private $rNIC = '';
+
+	public function generate($generator, $generationContextData) {
+		$myOption = $generationContextData["generationOptions"];
+
+		self::generateSiret();
+		if ($myOption == "SIRET") {
+			$myResult = self::getSIREN() . '-' . self::getNIC();
+		} else {
+			$myResult = self::getSIREN();
+		}
+
+		return array(
+			"display" => $myResult
+		);
+	}
+
+	private function generateSiret() {
+		$sumSiren = 0;
+		$sumSiret = 0;
+		$cleSiren= 1;
+		$cleSiret= 2;
+		$minRan = 0;
+		$maxRan = 9;
+		$siren = '';
+
+		// generation d'un siren valide
+		for ($i=0; $i<8; $i++) {
+
+			// on génére un nombre entre 0 et 9
+			$rand = mt_rand($minRan, $maxRan);
+
+			// on concatène se nombre au siret
+			$siren .= $rand;
+
+			 * Le numéro SIRET est composé de 14 chiffres,
+			 *  dont un chiffre de contrôle (le dernier) qui permet de vérifier la validité du numéro de SIRET (SIREN + NIC).
+			 *   Celui-ci est calculé suivant la formule de Luhn.
+			 *   Le principe est le suivant : on multiplie les chiffres de rang impair à partir de la droite par 1, ceux de rang pair par 2 ;
+			 *    la somme des chiffres obtenus doit être multiple de 10.
+			$ctrlSiren = $rand * $cleSiren;
+			$ctrlSiret = $rand * $cleSiret;
+
+			// Si la valeur obtenu et supérieur ou egale à 10 il faut décomposer en 1+0
+			// ce qui équivaux à lui retirer 9
+			// contôle pour le siren
+			if ($ctrlSiren > 9) {
+				$sumSiren += ($ctrlSiren-9);
+			} else {
+				$sumSiren += $ctrlSiren;
+			}
+
+			// contôle pour le siret
+			if ($ctrlSiret > 9) {
+				$sumSiret += ($ctrlSiret - 9);
+			} else {
+				$sumSiret += $ctrlSiret;
+			}
+
+			// mise à jour des clés
+			if ($cleSiren == 1) {
+				$cleSiren = 2;
+				$cleSiret = 1;
+			} else {
+				$cleSiren = 1;
+				$cleSiret = 2;
+			}
+		}
+
+		// la somme doit être congrue à zéro modulo 10
+		$moduloSiren = ($sumSiren % 10);
+		if ($moduloSiren == 0) {
+			$diffSiren = 0;
+		} else {
+			$diffSiren = 10 - $moduloSiren;
+		}
+
+		$siren .= $diffSiren;
+
+		// la cle du siren est ajouté au calcul du siret
+		$ctrlSiret = $diffSiren * $cleSiret;
+
+		// contôle pour le siret
+		if ($ctrlSiret > 9) {
+			$sumSiret += ($ctrlSiret - 9);
+		} else {
+			$sumSiret += $ctrlSiret;
+		}
+
+		// aon ajoute un début de NIC au siren
+		$siret = $siren . "0000";
+
+		// la somme doit être congrue à zéro modulo 10
+		$moduloSiret = ($sumSiret % 10);
+		if ($moduloSiret == 0) {
+			$diffSiret = 0;
+		} else {
+			$diffSiret = 10 - $moduloSiret;
+		}
+
+		$siret .= $diffSiret;
+
+		$this->rSIREN = substr($siret, 0, 9);
+		$this->rNIC = substr($siret, 9, 14);
+	}
+
+	public function getRowGenerationOptionsUI($generator, $post, $colNum, $numCols) {
+		if (!isset($post["dtOption_$colNum"]) || empty($post["dtOption_$colNum"])) {
+			return false;
+		}
+		return $post["dtOption_$colNum"];
+	}
+
+	public function getRowGenerationOptionsAPI($generator, $post, $colNum, $numCols) {
+		if (!isset($post["dtOption_$colNum"]) || empty($post["dtOption_$colNum"])) {
+			return false;
+		}
+		return $post["dtOption_$colNum"];
+	}
+
+	public function getDataTypeMetadata() {
+		return array(
+			"SQLField" => "varchar(14)",
+			"SQLField_Oracle" => "varchar2(14)",
+			"SQLField_MSSQL" => "VARCHAR(14) NULL"
+		);
+	}
+
+	public function getSIREN() {
+		return $this->rSIREN;
+	}
+
+	public function getNIC() {
+		return $this->rNIC;
+	}
+*/
diff --git a/packages/plugins/src/dataTypes/SIRET/SIRET.scss b/packages/plugins/src/dataTypes/SIRET/SIRET.scss
new file mode 100644
index 000000000..0d33a2dd6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/SIRET.scss
@@ -0,0 +1,19 @@
+.row {
+	display: flex;
+	align-items: flex-start;
+	padding-bottom: 12px;
+
+	.col1 {
+		flex: 0 0 60px;
+		font-weight: bold;
+	}
+	.col2 {
+		flex: 1;
+	}
+
+	label {
+		background-color: #dfecfc;
+		border-radius: 3px;
+		padding: 1px 6px;
+	}
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/SIRET.scss.d.ts b/packages/plugins/src/dataTypes/SIRET/SIRET.scss.d.ts
new file mode 100644
index 000000000..cda3fccd7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/SIRET.scss.d.ts
@@ -0,0 +1,14 @@
+declare namespace SiretScssNamespace {
+  export interface ISiretScss {
+    col1: string;
+    col2: string;
+    row: string;
+  }
+}
+
+declare const SiretScssModule: SiretScssNamespace.ISiretScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: SiretScssNamespace.ISiretScss;
+};
+
+export = SiretScssModule;
diff --git a/packages/plugins/src/dataTypes/SIRET/SIRET.state.tsx b/packages/plugins/src/dataTypes/SIRET/SIRET.state.tsx
new file mode 100644
index 000000000..b55bd7533
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/SIRET.state.tsx
@@ -0,0 +1,17 @@
+type SiretState = {
+	example: string;
+	option: string;
+};
+
+export type GenerationOptions = {
+	option: string;
+};
+
+export const defaultGenerationOptions: GenerationOptions = {
+	option: ''
+};
+
+export const initialState: SiretState = {
+	example: '',
+	...defaultGenerationOptions
+};
diff --git a/packages/plugins/src/dataTypes/SIRET/SIRET.tsx b/packages/plugins/src/dataTypes/SIRET/SIRET.tsx
new file mode 100644
index 000000000..3d56df762
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/SIRET.tsx
@@ -0,0 +1,49 @@
+import * as React from 'react';
+import { DTHelpProps, DTOptionsProps } from '~types/dataTypes';
+import styles from './SIRET.scss';
+
+export const Options = ({ id, data, onUpdate }: DTOptionsProps) => {
+  const onChange = (e: React.FormEvent<HTMLInputElement>): void => {
+    // @ts-ignore
+    const value = e.target.value;
+    onUpdate({
+      ...data,
+      option: value
+    });
+  };
+
+  return (
+    <>
+      <input type="radio" id={`${id}-siret`} value="SIRET" checked={data.option === 'SIRET'} onChange={onChange} />
+      <label htmlFor={`${id}-siret`}>SIRET</label>
+      <input type="radio" id={`${id}-siren`} value="SIREN" checked={data.option === 'SIREN'} onChange={onChange} />
+      <label htmlFor={`${id}-siren`}>SIREN</label>
+    </>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p>{i18n.DESC}</p>
+
+    <div className={styles.row}>
+      <div className={styles.col1}>{i18n.SIRET}</div>
+      <div className={styles.col2}>{i18n.typeSIRET}</div>
+    </div>
+    <div className={styles.row}>
+      <div className={styles.col1}>{i18n.SIREN}</div>
+      <div className={styles.col2}>{i18n.typeSIREN}</div>
+    </div>
+
+    <p>
+      {i18n.moreInfo}{' '}
+      <a
+        href="http://fr.wikipedia.org/wiki/Syst%C3%A8me_d%27identification_du_r%C3%A9pertoire_des_%C3%A9tablissements"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        Wikipedia - SIRET
+      </a>
+    </p>
+  </>
+);
diff --git a/packages/plugins/src/dataTypes/SIRET/SIRET.worker.ts b/packages/plugins/src/dataTypes/SIRET/SIRET.worker.ts
new file mode 100644
index 000000000..44e955363
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/SIRET.worker.ts
@@ -0,0 +1,158 @@
+import { DTGenerateResult, DTWorkerOnMessage } from '~types/dataTypes';
+
+// data: DTGenerationData
+export const generate = (): DTGenerateResult => {
+	return { display: '' };
+};
+
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate());
+};
+
+/*
+	// custom member vars for this Data Type
+	private $rSIREN = '';
+	private $rNIC = '';
+
+	public function generate($generator, $generationContextData) {
+		$myOption = $generationContextData["generationOptions"];
+
+		self::generateSiret();
+		if ($myOption == "SIRET") {
+			$myResult = self::getSIREN() . '-' . self::getNIC();
+		} else {
+			$myResult = self::getSIREN();
+		}
+
+		return array(
+			"display" => $myResult
+		);
+	}
+
+	private function generateSiret() {
+		$sumSiren = 0;
+		$sumSiret = 0;
+		$cleSiren= 1;
+		$cleSiret= 2;
+		$minRan = 0;
+		$maxRan = 9;
+		$siren = '';
+
+		// generation d'un siren valide
+		for ($i=0; $i<8; $i++) {
+
+			// on génére un nombre entre 0 et 9
+			$rand = mt_rand($minRan, $maxRan);
+
+			// on concatène se nombre au siret
+			$siren .= $rand;
+
+			 * Le numéro SIRET est composé de 14 chiffres,
+			 *  dont un chiffre de contrôle (le dernier) qui permet de vérifier la validité du numéro de SIRET (SIREN + NIC).
+			 *   Celui-ci est calculé suivant la formule de Luhn.
+			 *   Le principe est le suivant : on multiplie les chiffres de rang impair à partir de la droite par 1, ceux de rang pair par 2 ;
+			 *    la somme des chiffres obtenus doit être multiple de 10.
+			$ctrlSiren = $rand * $cleSiren;
+			$ctrlSiret = $rand * $cleSiret;
+
+			// Si la valeur obtenu et supérieur ou egale à 10 il faut décomposer en 1+0
+			// ce qui équivaux à lui retirer 9
+			// contôle pour le siren
+			if ($ctrlSiren > 9) {
+				$sumSiren += ($ctrlSiren-9);
+			} else {
+				$sumSiren += $ctrlSiren;
+			}
+
+			// contôle pour le siret
+			if ($ctrlSiret > 9) {
+				$sumSiret += ($ctrlSiret - 9);
+			} else {
+				$sumSiret += $ctrlSiret;
+			}
+
+			// mise à jour des clés
+			if ($cleSiren == 1) {
+				$cleSiren = 2;
+				$cleSiret = 1;
+			} else {
+				$cleSiren = 1;
+				$cleSiret = 2;
+			}
+		}
+
+		// la somme doit être congrue à zéro modulo 10
+		$moduloSiren = ($sumSiren % 10);
+		if ($moduloSiren == 0) {
+			$diffSiren = 0;
+		} else {
+			$diffSiren = 10 - $moduloSiren;
+		}
+
+		$siren .= $diffSiren;
+
+		// la cle du siren est ajouté au calcul du siret
+		$ctrlSiret = $diffSiren * $cleSiret;
+
+		// contôle pour le siret
+		if ($ctrlSiret > 9) {
+			$sumSiret += ($ctrlSiret - 9);
+		} else {
+			$sumSiret += $ctrlSiret;
+		}
+
+		// aon ajoute un début de NIC au siren
+		$siret = $siren . "0000";
+
+		// la somme doit être congrue à zéro modulo 10
+		$moduloSiret = ($sumSiret % 10);
+		if ($moduloSiret == 0) {
+			$diffSiret = 0;
+		} else {
+			$diffSiret = 10 - $moduloSiret;
+		}
+
+		$siret .= $diffSiret;
+
+		$this->rSIREN = substr($siret, 0, 9);
+		$this->rNIC = substr($siret, 9, 14);
+	}
+
+	public function getRowGenerationOptionsUI($generator, $post, $colNum, $numCols) {
+		if (!isset($post["dtOption_$colNum"]) || empty($post["dtOption_$colNum"])) {
+			return false;
+		}
+		return $post["dtOption_$colNum"];
+	}
+
+	public function getRowGenerationOptionsAPI($generator, $post, $colNum, $numCols) {
+		if (!isset($post["dtOption_$colNum"]) || empty($post["dtOption_$colNum"])) {
+			return false;
+		}
+		return $post["dtOption_$colNum"];
+	}
+
+	public function getDataTypeMetadata() {
+		return array(
+			"SQLField" => "varchar(14)",
+			"SQLField_Oracle" => "varchar2(14)",
+			"SQLField_MSSQL" => "VARCHAR(14) NULL"
+		);
+	}
+
+	public function getSIREN() {
+		return $this->rSIREN;
+	}
+
+	public function getNIC() {
+		return $this->rNIC;
+	}
+*/
diff --git a/packages/plugins/src/dataTypes/SIRET/__tests__/SIRET.ui.test.tsx b/packages/plugins/src/dataTypes/SIRET/__tests__/SIRET.ui.test.tsx
new file mode 100644
index 000000000..4c8f582b7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/__tests__/SIRET.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../SIRET';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/SIRET/bundle.ts b/packages/plugins/src/dataTypes/SIRET/bundle.ts
new file mode 100644
index 000000000..dc8c82a84
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/bundle.ts
@@ -0,0 +1,11 @@
+import { DTBundle } from '~types/dataTypes';
+import { Options, Help } from './SIRET';
+import { initialState } from './SIRET.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Options,
+	Help,
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/SIRET/config.ts b/packages/plugins/src/dataTypes/SIRET/config.ts
new file mode 100644
index 000000000..07dc88903
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'countrySpecific',
+  fieldGroupOrder: 10
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/ar.json b/packages/plugins/src/dataTypes/SIRET/i18n/ar.json
new file mode 100644
index 000000000..b83228bca
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/ar.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "SIRET",
+  "DESC": "This Data Type generates a random SIRET/SIREN French business identification number.",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "The SIRET data type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": " A random SIRET compound of a SIREN and NIC (508102811-00009).",
+  "typeSIREN": " A random SIREN (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "More info:"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/de.json b/packages/plugins/src/dataTypes/SIRET/i18n/de.json
new file mode 100644
index 000000000..e3cfcaa7a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/de.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "SIRET",
+  "DESC": "Dieser Datentyp erzeugt zufällig SIRET nach dem Format, das Sie angeben.",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "Der SIRET Datentyp muß das im Optionstext-Feld eingegangene Format lassen. Befestigen Sie bitte die folgenden Reihen(Rudern):",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": " Ein zusammengesetzter unsicherer SIRET eines SIREN und NIC (508102811-00009).",
+  "typeSIREN": " Ein SIREN unsicher (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "Mehr Informationen:"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/en.json b/packages/plugins/src/dataTypes/SIRET/i18n/en.json
new file mode 100644
index 000000000..425951f9c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/en.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "French SIRET",
+  "DESC": "This Data Type generates a random SIRET/SIREN French business identification number.",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "The SIRET data type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": " A random SIRET compound of a SIREN and NIC (508102811-00009).",
+  "typeSIREN": " A random SIREN (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "More info:"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/es.json b/packages/plugins/src/dataTypes/SIRET/i18n/es.json
new file mode 100644
index 000000000..f737fffee
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/es.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "SIRET",
+  "DESC": "Este tipo de datos al azar genera SIRET según el formato que usted especifica.",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "El tipo de datos SIRET tiene que tener el formato entrado en el campo de texto de Opciones. Por favor fije las filas siguientes:",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": " Un SIRET aleatorio compuesto de un SIREN y un NIC 508102811-00009.",
+  "typeSIREN": " Un SIREN aleatorio (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "Más información:"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/fr.json b/packages/plugins/src/dataTypes/SIRET/i18n/fr.json
new file mode 100644
index 000000000..a0b812872
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/fr.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "SIRET",
+  "DESC": "Ce type de données produit aléatoirement des SIRET selon le format que vous spécifiez.",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "Le type de données SIRET a besoin du format dans le champ texte d'Options. S'il vous plaît corrigez les colonnes suivantes :",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": " Un SIRET aléatoire composé d'un SIREN et NIC (508102811-00009).",
+  "typeSIREN": " Un SIREN aléatoire (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "Lien Wiki:"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/hi.json b/packages/plugins/src/dataTypes/SIRET/i18n/hi.json
new file mode 100644
index 000000000..ca5eaabcb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/hi.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "फ्रेंच SIRET",
+  "DESC": "यह डेटा प्रकार एक यादृच्छिक SIRET/SIREN फ़्रेंच व्यवसाय पहचान संख्या उत्पन्न करता है।",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "SIRET डेटा प्रकार को विकल्प टेक्स्ट फ़ील्ड में प्रारूप दर्ज करने की आवश्यकता है। कृपया निम्न पंक्तियों को ठीक करें:",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": "A random SIRET compound of a SIREN and NIC (508102811-00009).",
+  "typeSIREN": "A random SIREN (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "और जानकारी:"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/ja.json b/packages/plugins/src/dataTypes/SIRET/i18n/ja.json
new file mode 100644
index 000000000..b83228bca
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/ja.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "SIRET",
+  "DESC": "This Data Type generates a random SIRET/SIREN French business identification number.",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "The SIRET data type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": " A random SIRET compound of a SIREN and NIC (508102811-00009).",
+  "typeSIREN": " A random SIREN (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "More info:"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/nl.json b/packages/plugins/src/dataTypes/SIRET/i18n/nl.json
new file mode 100644
index 000000000..42a9ac9f1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/nl.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "SIRET",
+  "DESC": "Dit datatype genereert een willekeurig SIRET nummer volgens het opgegeven formaat.",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "De SIRET gegevenstype moet hebben het formaat in de Opties tekst veld. Verbeter de volgende rijen:",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": " EEN willekeurige SIRET samengesteld van een SIREN en NIC ( 508102811-00009 ).",
+  "typeSIREN": " EEN willekeurige SIREN (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "Meer informatie:"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/pt.json b/packages/plugins/src/dataTypes/SIRET/i18n/pt.json
new file mode 100644
index 000000000..7a9a4f213
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/pt.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "SIRET francês",
+  "DESC": "Este tipo de dados gera um número de identificação comercial francês SIRET / SIREN aleatório.",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "O tipo de dados SIRET precisa ter o formato inserido no campo de texto Opções. Corrija as seguintes linhas:",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": "Um composto SIRET aleatório de um SIREN e NIC (508102811-00009).",
+  "typeSIREN": "Uma SIRENE aleatória (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "Mais informações:"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/ru.json b/packages/plugins/src/dataTypes/SIRET/i18n/ru.json
new file mode 100644
index 000000000..e25741e1a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/ru.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "Французский SIRET",
+  "DESC": "Этот тип данных генерирует случайный французский бизнес-идентификационный номер SIRET/SIREN.",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "Тип данных SIRET должен иметь формат, введенный в текстовом поле «Параметры». Исправьте следующие строки:",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": "Случайное соединение SIRET SIREN и NIC (508102811-00009).",
+  "typeSIREN": "Случайная СИРЕНА (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "Больше информации:"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/ta.json b/packages/plugins/src/dataTypes/SIRET/i18n/ta.json
new file mode 100644
index 000000000..b83228bca
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/ta.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "SIRET",
+  "DESC": "This Data Type generates a random SIRET/SIREN French business identification number.",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "The SIRET data type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": " A random SIRET compound of a SIREN and NIC (508102811-00009).",
+  "typeSIREN": " A random SIREN (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "More info:"
+}
diff --git a/packages/plugins/src/dataTypes/SIRET/i18n/zh.json b/packages/plugins/src/dataTypes/SIRET/i18n/zh.json
new file mode 100644
index 000000000..b83228bca
--- /dev/null
+++ b/packages/plugins/src/dataTypes/SIRET/i18n/zh.json
@@ -0,0 +1,13 @@
+{
+  "NAME": "SIRET",
+  "DESC": "This Data Type generates a random SIRET/SIREN French business identification number.",
+  "DEFAULT_TITLE": "siret",
+  "incompleteFields": "The SIRET data type needs to have the format entered in the Options text field. Please fix the following rows:",
+  "exampleSIRET": "508102811-00009 (SIRET : SIREN-NIC)",
+  "exampleSIREN": "508102811 (SIREN)",
+  "typeSIRET": " A random SIRET compound of a SIREN and NIC (508102811-00009).",
+  "typeSIREN": " A random SIREN (508102811).",
+  "SIRET": "SIRET:",
+  "SIREN": "SIREN:",
+  "moreInfo": "More info:"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/README.md b/packages/plugins/src/dataTypes/StreetAddress/README.md
new file mode 100644
index 000000000..29d6d758e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/README.md
@@ -0,0 +1,53 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; StreetAddress
+
+This Data Type generates a basic, westernized street address out of lorem ipsum text and standard address formats.
+
+
+## Examples
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'StreetAddress',
+            title: 'street_address',
+            settings: {}
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+ 
+Sample output:
+
+```
+[
+    {
+        "street_address": "105-6473 Amet Avenue"
+    },
+    {
+        "street_address": "2200 Ac Rd."
+    },
+    {
+        "street_address": "474-7655 Dolor Rd."
+    },
+    {
+        "street_address": "720-4330 Sit Rd."
+    },
+    {
+        "street_address": "806 Duis Rd."
+    },
+    {
+        "street_address": "912-1517 Egestas. Street"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.generate.ts b/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.generate.ts
new file mode 100644
index 000000000..21e107378
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.generate.ts
@@ -0,0 +1,36 @@
+import utils from '../../../utils';
+import { DTGenerateResult, DTGenerationData } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+const getWords = (): string[] => {
+  const { words } = utils.stringUtils.getLipsumWords();
+  return words;
+};
+
+export const generate = ({ i18n }: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { streetTypes, poBox, apNum } = i18n;
+  const streetName = utils.stringUtils.uppercaseWords(utils.randomUtils.generateRandomTextStr(getWords(), false, 1));
+  const streetType = utils.randomUtils.getRandomArrayValue(streetTypes.split(','));
+
+  const format = utils.randomUtils.getRandomNum(1, 4);
+  let streetAddress = '';
+
+  switch (format) {
+    case 1:
+      streetAddress = `${poBox} ${utils.randomUtils.getRandomNum(100, 999)}, ${utils.randomUtils.getRandomNum(100, 9999)} ${streetName} ${streetType}`;
+      break;
+    case 2:
+      streetAddress = `${utils.randomUtils.getRandomNum(100, 999)}-${utils.randomUtils.getRandomNum(100, 9999)} ${streetName} ${streetType}`;
+      break;
+    case 3:
+      streetAddress = `${apNum}${utils.randomUtils.getRandomNum(100, 999)}-${utils.randomUtils.getRandomNum(100, 9999)} ${streetName} ${streetType}`;
+      break;
+    case 4:
+      streetAddress = `${utils.randomUtils.getRandomNum(100, 9999)} ${streetName} ${streetType}`;
+      break;
+  }
+
+  return {
+    display: streetAddress
+  };
+};
diff --git a/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.state.ts b/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.state.ts
new file mode 100644
index 000000000..e2d9ec4d2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.state.ts
@@ -0,0 +1,2 @@
+export const defaultGenerationOptions = {};
+export type GenerationOptionsType = {};
diff --git a/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.ts b/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.ts
new file mode 100644
index 000000000..e17c48cfa
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.ts
@@ -0,0 +1,9 @@
+import { DTMetadata } from '~types/dataTypes';
+
+export const getMetadata = (): DTMetadata => ({
+	sql: {
+		field: 'varchar(255) default NULL',
+		field_Oracle: 'varchar2(255) default NULL',
+		field_MSSQL: 'VARCHAR(255) NULL'
+	}
+});
diff --git a/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.worker.ts b/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.worker.ts
new file mode 100644
index 000000000..375e9cbdf
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/StreetAddress.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './StreetAddress.generate';
+
+let workerUtilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!workerUtilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		workerUtilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/StreetAddress/__tests__/StreetAddress.generate.test.ts b/packages/plugins/src/dataTypes/StreetAddress/__tests__/StreetAddress.generate.test.ts
new file mode 100644
index 000000000..6b9ad8315
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/__tests__/StreetAddress.generate.test.ts
@@ -0,0 +1,74 @@
+import { generate } from '../StreetAddress.generate';
+import * as sinon from 'sinon';
+import utils from '../../../../utils';
+import { DTGenerationData } from '~types/dataTypes';
+const i18n = require('../i18n/en.json');
+
+describe('generate', () => {
+	let data: DTGenerationData = {
+		rowNum: 1,
+		rowState: '',
+		i18n,
+		countryI18n: {},
+		existingRowData: [],
+		countryData: {},
+		template: {}
+	};
+
+	afterEach(() => {
+		sinon.restore();
+	});
+
+	it('street address format 1', () => {
+		sinon.stub(utils.randomUtils, 'generateRandomTextStr').returns('Wilkins');
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue').returns('St');
+		sinon.stub(utils.randomUtils, 'getRandomNum')
+			.onCall(0).returns(1) // format #1
+			.onCall(1).returns(555) // PO Box
+			.onCall(2).returns(1234); // street name number
+
+		expect(generate(data, utils)).toEqual({
+			display: 'P.O. Box 555, 1234 Wilkins St'
+		});
+	});
+
+	it('street address format 2', () => {
+		sinon.stub(utils.randomUtils, 'generateRandomTextStr').returns('Wilkins');
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue').returns('St');
+		sinon.stub(utils.randomUtils, 'getRandomNum')
+			.onCall(0).returns(2) // format #2
+			.onCall(1).returns(555)
+			.onCall(2).returns(1234);
+
+		expect(generate(data, utils)).toEqual({
+			display: '555-1234 Wilkins St'
+		});
+	});
+
+	it('street address format 3', () => {
+		sinon.stub(utils.randomUtils, 'generateRandomTextStr').returns('Wilkins');
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue').returns('St');
+		sinon.stub(utils.randomUtils, 'getRandomNum')
+			.onCall(0).returns(3) // format #3
+			.onCall(1).returns(555)
+			.onCall(2).returns(1234);
+
+		expect(generate(data, utils)).toEqual({
+			display: 'Ap #555-1234 Wilkins St'
+		});
+	});
+
+	it('street address format 4', () => {
+		sinon.stub(utils.randomUtils, 'generateRandomTextStr').returns('Wilkins');
+		sinon.stub(utils.randomUtils, 'getRandomArrayValue').returns('St');
+		sinon.stub(utils.randomUtils, 'getRandomNum')
+			.onCall(0).returns(4) // format #4
+			.onCall(1).returns(555)
+			.onCall(2).returns(1234);
+
+		expect(generate(data, utils)).toEqual({
+			display: '555 Wilkins St'
+		});
+	});
+
+});
diff --git a/packages/plugins/src/dataTypes/StreetAddress/bundle.ts b/packages/plugins/src/dataTypes/StreetAddress/bundle.ts
new file mode 100644
index 000000000..2883fa736
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/bundle.ts
@@ -0,0 +1,8 @@
+import { DTBundle } from '~types/dataTypes';
+import { getMetadata } from './StreetAddress';
+
+const bundle: DTBundle = {
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/StreetAddress/config.ts b/packages/plugins/src/dataTypes/StreetAddress/config.ts
new file mode 100644
index 000000000..ecb94606e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'geo',
+  fieldGroupOrder: 10
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/ar.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/ar.json
new file mode 100644
index 000000000..34a32096a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/ar.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "عنوان الشارع",
+  "DESC": "يولد عناوين شوارع عشوائية.",
+  "DEFAULT_TITLE": "عنوان",
+  "apNum": "أب #",
+  "poBox": "ص. صندوق",
+  "streetTypes": "St.,St.,Street,Road,Rd.,Rd.,Ave,Av.,Avenue"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/de.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/de.json
new file mode 100644
index 000000000..ea9cd3541
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/de.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Straße",
+  "DESC": "Generiert zufällige Straßenadressen .",
+  "DEFAULT_TITLE": "adresse",
+  "apNum": "Ap #",
+  "poBox": "Postfach",
+  "streetTypes": "St., St., Straße, Straße, Rd., Rd., Ave, Av., Avenue"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/en.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/en.json
new file mode 100644
index 000000000..04226b17a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/en.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Street Address",
+  "DESC": "Generates random street addresses.",
+  "DEFAULT_TITLE": "address",
+  "apNum": "Ap #",
+  "poBox": "P.O. Box",
+  "streetTypes": "St.,St.,Street,Road,Rd.,Rd.,Ave,Av.,Avenue"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/es.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/es.json
new file mode 100644
index 000000000..440652be2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/es.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Dirección",
+  "DESC": "Genera direcciones de calles al azar .",
+  "DEFAULT_TITLE": "habla",
+  "apNum": "Apdo.:",
+  "poBox": "Apartado núm.:",
+  "streetTypes": "C/,C.,Calle,Carretera,Ctra.,,Av.,Avda.,Avenida"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/fr.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/fr.json
new file mode 100644
index 000000000..2f38a2412
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/fr.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Adresse",
+  "DESC": "Génère des adresses aléatoires .",
+  "DEFAULT_TITLE": "habla",
+  "apNum": "Appartement",
+  "poBox": "CP",
+  "streetTypes": "Rue,Route,Chemin,Rd.,Ave,Av.,Avenue,Impasse"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/hi.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/hi.json
new file mode 100644
index 000000000..20dcb7613
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/hi.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "गली का पता",
+  "DESC": "यादृच्छिक सड़क पते उत्पन्न करता है।",
+  "DEFAULT_TITLE": "पता",
+  "apNum": "Ap #",
+  "poBox": "P.O. Box",
+  "streetTypes": "St.,St.,Street,Road,Rd.,Rd.,Ave,Av.,Avenue"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/ja.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/ja.json
new file mode 100644
index 000000000..3ad734ef1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/ja.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "住所",
+  "DESC": "ランダムな番地を生成します。",
+  "DEFAULT_TITLE": "住所",
+  "apNum": "Ap #",
+  "poBox": "P.O. ボックス",
+  "streetTypes": "St.,St.,Street,Road,Rd.,Rd.,Ave,Av.,Avenue"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/nl.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/nl.json
new file mode 100644
index 000000000..3ce650ec9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/nl.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Straatnamen",
+  "DESC": "Genereert willekeurige adressen.",
+  "DEFAULT_TITLE": "adresse",
+  "apNum": "Appartement #",
+  "poBox": "Postbus",
+  "streetTypes": "Street, St., Straat, Weg, Road, Rd., Ave, Av., Avenue"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/pt.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/pt.json
new file mode 100644
index 000000000..c46c67c5d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/pt.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Endereço da Rua",
+  "DESC": "Gera endereços de ruas aleatórios.",
+  "DEFAULT_TITLE": "morada",
+  "apNum": "Ap #",
+  "poBox": "P.O. Caixa",
+  "streetTypes": "St.,St.,Street,Road,Rd.,Rd.,Ave,Av.,Avenue"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/ru.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/ru.json
new file mode 100644
index 000000000..00c54f990
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/ru.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "Адрес улицы",
+  "DESC": "Генерирует случайные адреса улиц.",
+  "DEFAULT_TITLE": "адрес",
+  "apNum": "Ap #",
+  "poBox": "P.O. Box",
+  "streetTypes": "St.,St.,Street,Road,Rd.,Rd.,Ave,Av.,Avenue"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/ta.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/ta.json
new file mode 100644
index 000000000..80df78adb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/ta.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "தெரு முகவரி",
+  "DESC": "சீரற்ற தெரு முகவரிகளை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "முகவரி",
+  "apNum": "Ap #",
+  "poBox": "பி.ஓ. பெட்டி",
+  "streetTypes": "St.,St.,Street,Road,Rd.,Rd.,Ave,Av.,Avenue"
+}
diff --git a/packages/plugins/src/dataTypes/StreetAddress/i18n/zh.json b/packages/plugins/src/dataTypes/StreetAddress/i18n/zh.json
new file mode 100644
index 000000000..921eea685
--- /dev/null
+++ b/packages/plugins/src/dataTypes/StreetAddress/i18n/zh.json
@@ -0,0 +1,8 @@
+{
+  "NAME": "街道地址",
+  "DESC": "生成随机的街道地址。",
+  "DEFAULT_TITLE": "地址",
+  "apNum": "Ap #",
+  "poBox": "P.O. Box",
+  "streetTypes": "St.,St.,Street,Road,Rd.,Rd.,Ave,Av.,Avenue"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/README.md b/packages/plugins/src/dataTypes/TextFixed/README.md
new file mode 100644
index 000000000..3fc08cde3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/README.md
@@ -0,0 +1,45 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; TextFixed
+
+This Data Type generates a fixed number of words. You supply two parameters: an array of words to pull from, and the number
+of words you want to generate.
+
+## Typings
+
+```typescript
+export type GenerationOptionsType = {
+	words: string[];
+	numWordsToGenerate: number;
+}
+```
+
+### Examples
+
+```javascript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'TextFixed',
+            title: 'text1',
+            settings: {
+                numWordsToGenerate: 2,
+                words: ['One', 'Two', 'Three', 'Four']
+            }
+        }
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output: 
+
+```javascript
+
+```
diff --git a/packages/plugins/src/dataTypes/TextFixed/TextFixed.generate.ts b/packages/plugins/src/dataTypes/TextFixed/TextFixed.generate.ts
new file mode 100644
index 000000000..ed14bd826
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/TextFixed.generate.ts
@@ -0,0 +1,11 @@
+import { DTGenerationData, DTGenerateResult } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = ({ rowState }: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { words, numWordsToGenerate } = rowState;
+  const textStr = utils.randomUtils.generateRandomTextStr(words, false, numWordsToGenerate);
+
+  return {
+    display: textStr
+  };
+};
diff --git a/packages/plugins/src/dataTypes/TextFixed/TextFixed.scss b/packages/plugins/src/dataTypes/TextFixed/TextFixed.scss
new file mode 100644
index 000000000..31bcb3a0e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/TextFixed.scss
@@ -0,0 +1,4 @@
+.customText {
+	width: 100%;
+	height: 150px;
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/TextFixed.scss.d.ts b/packages/plugins/src/dataTypes/TextFixed/TextFixed.scss.d.ts
new file mode 100644
index 000000000..e3781af3a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/TextFixed.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace TextFixedScssNamespace {
+  export interface ITextFixedScss {
+    customText: string;
+  }
+}
+
+declare const TextFixedScssModule: TextFixedScssNamespace.ITextFixedScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: TextFixedScssNamespace.ITextFixedScss;
+};
+
+export = TextFixedScssModule;
diff --git a/packages/plugins/src/dataTypes/TextFixed/TextFixed.state.tsx b/packages/plugins/src/dataTypes/TextFixed/TextFixed.state.tsx
new file mode 100755
index 000000000..e9a45c8fb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/TextFixed.state.tsx
@@ -0,0 +1,20 @@
+export type TextSource = 'lipsum' | 'custom';
+
+export type TextFixedState = {
+	numWords: number;
+	textSource: TextSource;
+	customText: string;
+};
+
+export type GenerationOptionsType = {
+	words: string[];
+	numWordsToGenerate: number;
+}
+
+export const initialState: TextFixedState = {
+	numWords: 10,
+	textSource: 'lipsum',
+	customText: ''
+};
+
+export const defaultGenerationOptions = initialState;
diff --git a/packages/plugins/src/dataTypes/TextFixed/TextFixed.tsx b/packages/plugins/src/dataTypes/TextFixed/TextFixed.tsx
new file mode 100755
index 000000000..97c7b8fcd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/TextFixed.tsx
@@ -0,0 +1,130 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import TextField from '~components/TextField';
+import { getLipsumWords } from '~utils/stringUtils';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import { TextSource, TextFixedState, GenerationOptionsType } from './TextFixed.state';
+import styles from './TextFixed.scss';
+
+const TextFieldDialog = ({ visible, data, id, onClose, onUpdateSource, onUpdateCustomText, coreI18n, i18n }: any) => {
+  const getCustomTextField = (): JSX.Element | null => {
+    if (data.textSource !== 'custom') {
+      return null;
+    }
+
+    return (
+      <textarea value={data.customText} placeholder={i18n.enterCustomText} className={styles.customText} onChange={onUpdateCustomText} />
+    );
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.selectTextSource}</DialogTitle>
+        <DialogContent dividers>
+          <div>{i18n.explanation}</div>
+
+          <h3>{i18n.source}</h3>
+
+          <RadioPillRow>
+            <RadioPill
+              label="Lorem ipsum"
+              onClick={(): void => onUpdateSource('lipsum')}
+              name={`${id}-source`}
+              checked={data.textSource === 'lipsum'}
+              tooltip={i18n.lipsumDesc}
+            />
+            <RadioPill
+              label={i18n.custom}
+              onClick={(): void => onUpdateSource('custom')}
+              name={`${id}-source`}
+              checked={data.textSource === 'custom'}
+              tooltip={i18n.customTextDesc}
+            />
+          </RadioPillRow>
+          {getCustomTextField()}
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ coreI18n, i18n, id, data, onUpdate }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+
+  const onUpdateSource = (textSource: TextSource): void => {
+    onUpdate({
+      ...data,
+      textSource
+    });
+  };
+
+  const onUpdateNumWords = (e: React.ChangeEvent<HTMLInputElement>): void => {
+    onUpdate({
+      ...data,
+      numWords: parseInt(e.target.value, 10)
+    });
+  };
+
+  const onUpdateCustomText = (e: React.ChangeEvent<HTMLTextAreaElement>): void => {
+    onUpdate({
+      ...data,
+      customText: e.target.value
+    });
+  };
+
+  return (
+    <>
+      {i18n.TextFixed_generate}
+      <TextField
+        error={data.numWords ? '' : coreI18n.requiredField}
+        type="number"
+        min="0"
+        style={{ width: 50, margin: '0 2px' }}
+        value={data.numWords}
+        onChange={onUpdateNumWords}
+      />
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        {i18n.TextFixed_words}
+      </Button>
+      <TextFieldDialog
+        visible={dialogVisible}
+        data={data}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        onUpdateSource={onUpdateSource}
+        onUpdateCustomText={onUpdateCustomText}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.TextFixed_help}</p>;
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'TEXT default NULL',
+    field_Oracle: 'BLOB default NULL',
+    field_MSSQL: 'VARCHAR(MAX) NULL'
+  }
+});
+
+export const rowStateReducer = ({ customText, textSource, numWords }: TextFixedState): GenerationOptionsType => {
+  const { words } = getLipsumWords();
+  return {
+    words: textSource === 'lipsum' ? words : customText.split(/\s+/),
+    numWordsToGenerate: numWords
+  };
+};
diff --git a/packages/plugins/src/dataTypes/TextFixed/TextFixed.worker.ts b/packages/plugins/src/dataTypes/TextFixed/TextFixed.worker.ts
new file mode 100644
index 000000000..15fc16a81
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/TextFixed.worker.ts
@@ -0,0 +1,12 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './TextFixed.generate';
+
+let utilsLoaded = false;
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/TextFixed/__tests__/TextFixed.generate.test.ts b/packages/plugins/src/dataTypes/TextFixed/__tests__/TextFixed.generate.test.ts
new file mode 100644
index 000000000..e0a6e18dc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/__tests__/TextFixed.generate.test.ts
@@ -0,0 +1,30 @@
+import sinon from 'sinon';
+import { onmessage } from '../TextFixed.worker';
+import utils from '../../../../utils';
+import { getBlankDTGeneratorPayload } from '../../../../../tests/testHelpers';
+
+describe('onmessage', () => {
+	const postMessage = jest.fn();
+	const importScripts = jest.fn();
+	beforeAll(() => {
+		window.postMessage = postMessage;
+		window.importScripts = importScripts;
+	});
+
+	it('generates random data', () => {
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				rowState: {
+					words: ['word'],
+					numWordsToGenerate: 1
+				}
+			}
+		};
+
+		sinon.stub(utils.randomUtils, 'generateRandomTextStr').returns('chicken');
+
+		onmessage(payload);
+		expect(postMessage).toHaveBeenCalledWith({ display: 'chicken' });
+	});
+});
diff --git a/packages/plugins/src/dataTypes/TextFixed/__tests__/TextFixed.ui.test.tsx b/packages/plugins/src/dataTypes/TextFixed/__tests__/TextFixed.ui.test.tsx
new file mode 100644
index 000000000..643887f1a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/__tests__/TextFixed.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../TextFixed';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps} />);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/TextFixed/bundle.ts b/packages/plugins/src/dataTypes/TextFixed/bundle.ts
new file mode 100644
index 000000000..034b99c76
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/bundle.ts
@@ -0,0 +1,13 @@
+import { DTBundle } from '~types/dataTypes';
+import { Options, Help, getMetadata, rowStateReducer } from './TextFixed';
+import { initialState } from './TextFixed.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Options,
+	Help,
+	getMetadata,
+	rowStateReducer
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/TextFixed/config.ts b/packages/plugins/src/dataTypes/TextFixed/config.ts
new file mode 100644
index 000000000..e36f9090c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'text',
+  fieldGroupOrder: 10
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/ar.json b/packages/plugins/src/dataTypes/TextFixed/i18n/ar.json
new file mode 100644
index 000000000..4a950df2c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/ar.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "عدد الكلمات الثابتة",
+  "DESC": "يُنشئ هذا الخيار عددًا ثابتًا من الكلمات العشوائية ، مأخوذة من النص القياسي lorem ipsum latin.",
+  "DEFAULT_TITLE": "text",
+  "TextFixed_generate": "انشاء",
+  "TextFixed_help": "يُنشئ نوع البيانات هذا سلسلة عشوائية من الكلمات. لديك خيار استخدام النص الافتراضي العشوائي lorem ipsum dummy ، أو تقديم نص خاص بك.",
+  "TextFixed_words": "كلمات",
+  "selectTextSource": "حدد مصدر النص",
+  "lipsumDesc": "Lorem ipsum هو نص وهمي قياسي يستند إلى اللاتينية ويستخدم منذ القرن الخامس عشر الميلادي.",
+  "customTextDesc": "يتيح لك هذا الحقل إدخال أي نص ترغب في استخدامه كمصدر للبيانات.",
+  "source": "مصدر",
+  "explanation": "يتيح لك هذا القسم اختيار مصدر البيانات للكلمات.",
+  "enterCustomText": "أدخل بعض النص المخصص هنا. تأكد من إدخال كمية جيدة من الكلمات.",
+  "custom": "مخصص"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/de.json b/packages/plugins/src/dataTypes/TextFixed/i18n/de.json
new file mode 100644
index 000000000..da075e33f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/de.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Feste Anzahl der Worte",
+  "DESC": "Diese Option erzeugt eine feste Anzahl von zufälligen Wörtern, von der Norm Lorem ipsum lateinischen Text.",
+  "DEFAULT_TITLE": "text",
+  "TextFixed_generate": "Erzeugen",
+  "TextFixed_help": "Dieser Datentyp generiert eine zufällige Wortfolge. Sie haben die Wahl, den standardmäßigen zufälligen Lorem-Ipsum-Dummy-Text zu verwenden oder einen eigenen Text bereitzustellen.",
+  "TextFixed_words": "Text",
+  "selectTextSource": "Wählen Sie Textquelle",
+  "lipsumDesc": "Lorem ipsum ist ein Standard-Dummy-Text in lateinischer Sprache, der seit dem 16. Jahrhundert verwendet wird.",
+  "customTextDesc": "In dieses Feld können Sie den Text eingeben, den Sie als Datenquelle verwenden möchten.",
+  "source": "Quelle",
+  "explanation": "In diesem Abschnitt können Sie die Datenquelle für die Wörter auswählen.",
+  "enterCustomText": "Geben Sie hier einen benutzerdefinierten Text ein. Stellen Sie sicher, dass Sie eine gute Anzahl von Wörtern eingeben.",
+  "custom": "Benutzerdefiniert"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/en.json b/packages/plugins/src/dataTypes/TextFixed/i18n/en.json
new file mode 100644
index 000000000..0112b2abc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/en.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Fixed Number of Words",
+  "DESC": "This option generates a fixed number of random words, pulled from the lorem ipsum latin text.",
+  "DEFAULT_TITLE": "text",
+  "TextFixed_generate": "Generate",
+  "TextFixed_help": "This Data Type generates a random string of words. You have the choice of using the default random lorem ipsum dummy text, or provide a text of your own.",
+  "TextFixed_words": "words",
+  "selectTextSource": "Select Text Source",
+  "lipsumDesc": "Lorem ipsum is a standard dummy text based in Latin that's been in use since the 1500's.",
+  "customTextDesc": "This field lets you enter whatever text you would like to be used as the data source.",
+  "source": "Source",
+  "explanation": "This section lets you customize the text used as the data source.",
+  "enterCustomText": "Enter some custom text here. Make sure you enter a good amount of words.",
+  "custom": "Custom"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/es.json b/packages/plugins/src/dataTypes/TextFixed/i18n/es.json
new file mode 100644
index 000000000..d8df4d7eb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/es.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Número fijo de palabras",
+  "DESC": "Esta opción genera un número fijo palabras al azar, sacadas del texto estándar en Latín lorem ipsum.",
+  "DEFAULT_TITLE": "texto",
+  "TextFixed_generate": "Generar",
+  "TextFixed_help": "Este tipo de datos genera una cadena de palabras aleatoria. Tiene la opción de utilizar el texto de relleno de lorem ipsum aleatorio predeterminado o proporcionar un texto propio.",
+  "TextFixed_words": "palabras",
+  "selectTextSource": "Seleccionar fuente de texto",
+  "lipsumDesc": "Lorem ipsum es un texto ficticio estándar basado en latín que se utiliza desde el siglo XVI.",
+  "customTextDesc": "Este campo le permite ingresar cualquier texto que desee utilizar como fuente de datos.",
+  "source": "Fuente",
+  "explanation": "Esta sección le permite elegir la fuente de datos para las palabras.",
+  "enterCustomText": "Ingrese un texto personalizado aquí. Asegúrese de ingresar una buena cantidad de palabras.",
+  "custom": "Personalizada"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/fr.json b/packages/plugins/src/dataTypes/TextFixed/i18n/fr.json
new file mode 100644
index 000000000..5380e2afb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/fr.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Texte - Longueur Fixe",
+  "DESC": "Cette option génère un nombre fixe de mots aléatoires lorem ipsum (faux texte latin).",
+  "DEFAULT_TITLE": "texto",
+  "TextFixed_generate": "Générer",
+  "TextFixed_help": "Ce type de données génère une chaîne aléatoire de mots. Vous avez le choix d'utiliser le texte factice aléatoire par défaut de lorem ipsum ou de fournir un texte de votre choix.",
+  "TextFixed_words": "mots",
+  "selectTextSource": "Sélectionnez la source du texte",
+  "lipsumDesc": "Lorem ipsum est un texte factice standard basé en latin et utilisé depuis les années 1500.",
+  "customTextDesc": "Ce champ vous permet de saisir le texte que vous souhaitez utiliser comme source de données.",
+  "source": "La source",
+  "explanation": "Cette section vous permet de choisir la source de données pour les mots.",
+  "enterCustomText": "Entrez un texte personnalisé ici. Assurez-vous de saisir une bonne quantité de mots.",
+  "custom": "Douane"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/hi.json b/packages/plugins/src/dataTypes/TextFixed/i18n/hi.json
new file mode 100644
index 000000000..466a10ea6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/hi.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "शब्दों की निश्चित संख्या",
+  "DESC": "यह विकल्प लोरेम इप्सम लैटिन टेक्स्ट से खींचे गए यादृच्छिक शब्दों की एक निश्चित संख्या उत्पन्न करता है।",
+  "DEFAULT_TITLE": "मूलपाठ",
+  "TextFixed_generate": "उत्पन्न",
+  "TextFixed_help": "यह डेटा प्रकार शब्दों की एक यादृच्छिक स्ट्रिंग उत्पन्न करता है। आपके पास डिफ़ॉल्ट रैंडम लोरेम इप्सम डमी टेक्स्ट का उपयोग करने का विकल्प है, या अपना खुद का टेक्स्ट प्रदान करें।",
+  "TextFixed_words": "शब्दों",
+  "selectTextSource": "पाठ स्रोत का चयन करें",
+  "lipsumDesc": "लोरेम इप्सम लैटिन में आधारित एक मानक डमी टेक्स्ट है जो 1500 के दशक से उपयोग में है।",
+  "customTextDesc": "यह फ़ील्ड आपको वह टेक्स्ट दर्ज करने देती है जिसे आप डेटा स्रोत के रूप में उपयोग करना चाहते हैं।",
+  "source": "स्रोत",
+  "explanation": "यह अनुभाग आपको डेटा स्रोत के रूप में उपयोग किए गए टेक्स्ट को कस्टमाइज़ करने देता है।",
+  "enterCustomText": "यहां कुछ कस्टम टेक्स्ट दर्ज करें। सुनिश्चित करें कि आपने अच्छी मात्रा में शब्द दर्ज किए हैं।",
+  "custom": "रीति"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/ja.json b/packages/plugins/src/dataTypes/TextFixed/i18n/ja.json
new file mode 100644
index 000000000..35c914a45
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/ja.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "固定単語数",
+  "DESC": "このオプションは、標準のlorem ipsumlatinテキストから取得した固定数のランダムな単語を生成します。",
+  "DEFAULT_TITLE": "テキスト",
+  "TextFixed_generate": "生む",
+  "TextFixed_help": "このデータ型は、ランダムな単語の文字列を生成します。 デフォルトのランダムloremipsumダミーテキストを使用するか、独自のテキストを提供するかを選択できます。",
+  "TextFixed_words": "言葉",
+  "selectTextSource": "抽出ソースを選択",
+  "lipsumDesc": "Lorem ipsumは、1500年代から使用されている、ラテン語に基づく標準のダミーテキストです。",
+  "customTextDesc": "このフィールドでは、データソースとして使用するテキストを入力できます。",
+  "source": "ソース",
+  "explanation": "このセクションでは、単語のデータソースを選択できます。",
+  "enterCustomText": "ここにカスタムテキストを入力します。 十分な量の単語を入力してください。",
+  "custom": "カスタム"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/nl.json b/packages/plugins/src/dataTypes/TextFixed/i18n/nl.json
new file mode 100644
index 000000000..9188428d5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/nl.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Vast Aantal Woorden",
+  "DESC": "Deze optie genereert een vast aantal willekeurige woorden, die uit de standaard Latijnse tekst Lorem ipsum worden gehaald.",
+  "DEFAULT_TITLE": "tekst",
+  "TextFixed_generate": "Genereer",
+  "TextFixed_help": "Dit gegevenstype genereert een willekeurige reeks woorden. U heeft de keuze om de standaard willekeurige lorem ipsum dummy-tekst te gebruiken, of u kunt uw eigen tekst opgeven.",
+  "TextFixed_words": "woorden",
+  "selectTextSource": "Selecteer Tekstbron",
+  "lipsumDesc": "Lorem ipsum is een standaard dummy-tekst op basis van het Latijn die al sinds de jaren 1500 in gebruik is.",
+  "customTextDesc": "In dit veld kunt u elke tekst invoeren die u als gegevensbron wilt gebruiken.",
+  "source": "Bron",
+  "explanation": "In dit gedeelte kunt u de gegevensbron voor de woorden kiezen.",
+  "enterCustomText": "Voer hier wat aangepaste tekst in. Zorg ervoor dat u een groot aantal woorden invoert.",
+  "custom": "Op maat"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/pt.json b/packages/plugins/src/dataTypes/TextFixed/i18n/pt.json
new file mode 100644
index 000000000..5150d355f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/pt.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Número Fixo de Palavras",
+  "DESC": "Esta opção gera um número fixo de palavras aleatórias, extraídas do texto latino lorem ipsum.",
+  "DEFAULT_TITLE": "texto",
+  "TextFixed_generate": "Gerar",
+  "TextFixed_help": "Este tipo de dados gera uma sequência aleatória de palavras. Você tem a opção de usar o texto fictício lorem ipsum aleatório padrão ou fornecer um texto próprio.",
+  "TextFixed_words": "palavras",
+  "selectTextSource": "Selecione a fonte do texto",
+  "lipsumDesc": "Lorem ipsum é um texto fictício padrão baseado em latim que é usado desde 1500.",
+  "customTextDesc": "Este campo permite inserir qualquer texto que você gostaria de usar como fonte de dados.",
+  "source": "Fonte",
+  "explanation": "Esta seção permite personalizar o texto usado como fonte de dados.",
+  "enterCustomText": "Insira algum texto personalizado aqui. Certifique-se de inserir uma boa quantidade de palavras.",
+  "custom": "Personalizada"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/ru.json b/packages/plugins/src/dataTypes/TextFixed/i18n/ru.json
new file mode 100644
index 000000000..d36222b99
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/ru.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "Фиксированное количество слов",
+  "DESC": "Эта опция генерирует фиксированное количество случайных слов, взятых из латинского текста lorem ipsum.",
+  "DEFAULT_TITLE": "text",
+  "TextFixed_generate": "Создать",
+  "TextFixed_help": "Этот тип данных генерирует случайную строку слов. У вас есть выбор: использовать стандартный фиктивный текст lorem ipsum по умолчанию или предоставить свой собственный текст.",
+  "TextFixed_words": "слова",
+  "selectTextSource": "Выберите источник текста",
+  "lipsumDesc": "Lorem ipsum — стандартный фиктивный текст на латыни, используемый с 1500-х годов.",
+  "customTextDesc": "Это поле позволяет вам ввести любой текст, который вы хотите использовать в качестве источника данных.",
+  "source": "Источник",
+  "explanation": "Этот раздел позволяет настроить текст, используемый в качестве источника данных.",
+  "enterCustomText": "Введите здесь произвольный текст. Убедитесь, что вы вводите достаточное количество слов.",
+  "custom": "Обычай"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/ta.json b/packages/plugins/src/dataTypes/TextFixed/i18n/ta.json
new file mode 100644
index 000000000..a2f133342
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/ta.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "சொற்களின் நிலையான எண்ணிக்கை",
+  "DESC": "இந்த விருப்பம் ஒரு நிலையான எண்ணிக்கையிலான சீரற்ற சொற்களை உருவாக்குகிறது, இது நிலையான லோரெம் இப்சம் லத்தீன் உரையிலிருந்து இழுக்கப்படுகிறது.",
+  "DEFAULT_TITLE": "உரை",
+  "TextFixed_generate": "உருவாக்கு",
+  "TextFixed_help": "இந்த தரவு வகை சீரற்ற சொற்களை உருவாக்குகிறது. இயல்புநிலை சீரற்ற லோரெம் இப்சம் போலி உரையைப் பயன்படுத்துவதற்கான தேர்வு உங்களுக்கு உள்ளது, அல்லது உங்கள் சொந்த உரையை வழங்கவும்.",
+  "TextFixed_words": "சொற்கள்",
+  "selectTextSource": "உரை மூலத்தைத் தேர்ந்தெடுக்கவும்",
+  "lipsumDesc": "லோரெம் இப்சம் என்பது லத்தீன் மொழியை அடிப்படையாகக் கொண்ட ஒரு நிலையான போலி உரை, இது 1500 களில் இருந்து பயன்பாட்டில் உள்ளது.",
+  "customTextDesc": "தரவு மூலமாக நீங்கள் பயன்படுத்த விரும்பும் எந்த உரையையும் உள்ளிட இந்த புலம் உங்களை அனுமதிக்கிறது.",
+  "source": "மூல",
+  "explanation": "இந்த பிரிவு சொற்களுக்கான தரவு மூலத்தைத் தேர்வுசெய்ய உங்களை அனுமதிக்கிறது.",
+  "enterCustomText": "சில தனிப்பயன் உரையை இங்கே உள்ளிடவும். நீங்கள் ஒரு நல்ல அளவு சொற்களை உள்ளிடுவதை உறுதிசெய்க.",
+  "custom": "தனிப்பயன்"
+}
diff --git a/packages/plugins/src/dataTypes/TextFixed/i18n/zh.json b/packages/plugins/src/dataTypes/TextFixed/i18n/zh.json
new file mode 100644
index 000000000..eed4ef93f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextFixed/i18n/zh.json
@@ -0,0 +1,15 @@
+{
+  "NAME": "固定字数",
+  "DESC": "此选项会从标准lorem ipsum拉丁文文本中提取固定数量的随机词。",
+  "DEFAULT_TITLE": "文本",
+  "TextFixed_generate": "生成",
+  "TextFixed_help": "此数据类型生成随机的单词字符串。 您可以选择使用默认的随机lorem ipsum虚拟文本，也可以提供自己的文本。",
+  "TextFixed_words": "话",
+  "selectTextSource": "选择文字来源",
+  "lipsumDesc": "Lorem ipsum是基于拉丁文的标准伪文本，自1500以来一直在使用。",
+  "customTextDesc": "通过此字段，您可以输入任何想要用作数据源的文本。",
+  "source": "资源",
+  "explanation": "本部分允许您选择单词的数据源。",
+  "enterCustomText": "在此处输入一些自定义文本。 确保输入了大量单词。",
+  "custom": "自订"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/README.md b/packages/plugins/src/dataTypes/TextRandom/README.md
new file mode 100644
index 000000000..0c9c52fcb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/README.md
@@ -0,0 +1,29 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; TextRandom
+
+This Data Type generates a random number of random words, taken from lorem ipsum. You can specify the min and max
+number of words. 
+
+
+### Example API Usage
+
+```javascript
+{
+    "numRows": 20,
+    "rows": [
+        {
+            "type": "TextFixed",
+            "title": "text",
+            "settings": {
+                "numWords": 5 
+            }
+        }
+    ],
+    "export": {
+        "type": "JSON",
+        "settings": {
+            "stripWhitespace": false,
+            "dataStructureFormat": "complex"
+        }
+    }
+}
+```
diff --git a/packages/plugins/src/dataTypes/TextRandom/TextRandom.generate.ts b/packages/plugins/src/dataTypes/TextRandom/TextRandom.generate.ts
new file mode 100644
index 000000000..c5e56a9c3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/TextRandom.generate.ts
@@ -0,0 +1,10 @@
+import { DTGenerationData, DTGenerateResult } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { fromStart, minWords, maxWords, words } = data.rowState;
+  const textStr = utils.randomUtils.generateRandomTextStr(words, fromStart, minWords, maxWords);
+  return {
+    display: textStr
+  };
+};
diff --git a/packages/plugins/src/dataTypes/TextRandom/TextRandom.scss b/packages/plugins/src/dataTypes/TextRandom/TextRandom.scss
new file mode 100644
index 000000000..31bcb3a0e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/TextRandom.scss
@@ -0,0 +1,4 @@
+.customText {
+	width: 100%;
+	height: 150px;
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/TextRandom.scss.d.ts b/packages/plugins/src/dataTypes/TextRandom/TextRandom.scss.d.ts
new file mode 100644
index 000000000..6fa6d4962
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/TextRandom.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace TextRandomScssNamespace {
+  export interface ITextRandomScss {
+    customText: string;
+  }
+}
+
+declare const TextRandomScssModule: TextRandomScssNamespace.ITextRandomScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: TextRandomScssNamespace.ITextRandomScss;
+};
+
+export = TextRandomScssModule;
diff --git a/packages/plugins/src/dataTypes/TextRandom/TextRandom.state.tsx b/packages/plugins/src/dataTypes/TextRandom/TextRandom.state.tsx
new file mode 100644
index 000000000..5c58dcec7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/TextRandom.state.tsx
@@ -0,0 +1,26 @@
+export type TextSource = 'lipsum' | 'custom';
+
+export type TextRandomState = {
+	fromStart: boolean;
+	minWords: number;
+	maxWords: number;
+	textSource: TextSource;
+	customText: string;
+};
+
+export type GenerationOptionsType = {
+	fromStart: boolean;
+	minWords: number;
+	maxWords: number;
+	words: string[];
+}
+
+export const initialState: TextRandomState = {
+	fromStart: false,
+	minWords: 1,
+	maxWords: 10,
+	textSource: 'lipsum',
+	customText: ''
+};
+
+export const defaultGenerationOptions = initialState;
diff --git a/packages/plugins/src/dataTypes/TextRandom/TextRandom.tsx b/packages/plugins/src/dataTypes/TextRandom/TextRandom.tsx
new file mode 100644
index 000000000..003e10ae1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/TextRandom.tsx
@@ -0,0 +1,155 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import TextField from '~components/TextField';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import { getLipsumWords } from '~utils/stringUtils';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import { TextSource, TextRandomState, GenerationOptionsType } from './TextRandom.state';
+import styles from './TextRandom.scss';
+
+const TextRandomDialog = ({ visible, data, id, onClose, onChangeFromStart, onUpdateSource, onUpdateCustomText, coreI18n, i18n }: any) => {
+  const getCustomTextField = (): JSX.Element | null => {
+    if (data.textSource !== 'custom') {
+      return null;
+    }
+
+    return (
+      <textarea value={data.customText} placeholder={i18n.enterCustomText} className={styles.customText} onChange={onUpdateCustomText} />
+    );
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.selectTextSource}</DialogTitle>
+        <DialogContent dividers>
+          <div>{i18n.explanation}</div>
+
+          <h3>{i18n.source}</h3>
+
+          <RadioPillRow>
+            <RadioPill
+              label="Lorem ipsum"
+              onClick={(): void => onUpdateSource('lipsum')}
+              name={`${id}-source`}
+              checked={data.textSource === 'lipsum'}
+              tooltip={i18n.lipsumDesc}
+            />
+            <RadioPill
+              label={i18n.custom}
+              onClick={(): void => onUpdateSource('custom')}
+              name={`${id}-source`}
+              checked={data.textSource === 'custom'}
+              tooltip={i18n.customTextDesc}
+            />
+          </RadioPillRow>
+          {getCustomTextField()}
+          <div>
+            <input
+              type="checkbox"
+              id={`${id}-fromStart`}
+              checked={data.fromStart}
+              onChange={(e: any): void => onChangeFromStart(e.target.checked)}
+            />
+            <label htmlFor={`${id}-fromStart`}>{i18n.fromStart}</label>
+          </div>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ coreI18n, i18n, id, data, onUpdate }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+
+  const onChange = (field: string, value: string | boolean): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  const onUpdateSource = (textSource: TextSource): void => {
+    onUpdate({
+      ...data,
+      textSource
+    });
+  };
+
+  const onUpdateCustomText = (e: React.FormEvent<HTMLTextAreaElement>): void => {
+    onUpdate({
+      ...data,
+      customText: e.currentTarget.value
+    });
+  };
+
+  return (
+    <>
+      {i18n.generate}
+      <TextField
+        type="number"
+        min="0"
+        error={data.minWords ? '' : coreI18n.requiredField}
+        id={`${id}-minWords`}
+        style={{ width: 50, margin: '0 2px' }}
+        value={data.minWords}
+        onChange={(e: any): void => onChange('minWords', e.target.value)}
+      />
+      {i18n.to}
+      <TextField
+        type="number"
+        min="0"
+        error={data.maxWords ? '' : coreI18n.requiredField}
+        id={`${id}-maxWords`}
+        style={{ width: 50, margin: '0 2px' }}
+        value={data.maxWords}
+        onChange={(e: any): void => onChange('maxWords', e.target.value)}
+      />
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        {i18n.words}
+      </Button>
+      <TextRandomDialog
+        visible={dialogVisible}
+        data={data}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        customText={data.customText}
+        source={data.textSource}
+        onChangeFromStart={(isChecked: boolean): void => onChange('fromStart', isChecked)}
+        onUpdateSource={onUpdateSource}
+        onUpdateCustomText={onUpdateCustomText}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.help}</p>;
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'TEXT default NULL',
+    field_Oracle: 'BLOB default NULL',
+    field_MSSQL: 'VARCHAR(MAX) NULL'
+  }
+});
+
+export const rowStateReducer = ({ fromStart, customText, textSource, minWords, maxWords }: TextRandomState): GenerationOptionsType => {
+  const { words } = getLipsumWords();
+  return {
+    fromStart,
+    minWords,
+    maxWords,
+    words: textSource === 'lipsum' ? words : customText.split(/\s+/)
+  };
+};
diff --git a/packages/plugins/src/dataTypes/TextRandom/TextRandom.worker.ts b/packages/plugins/src/dataTypes/TextRandom/TextRandom.worker.ts
new file mode 100644
index 000000000..1959ede4d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/TextRandom.worker.ts
@@ -0,0 +1,12 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './TextRandom.generate';
+
+let utilsLoaded = false;
+export const onmessage = (e: DTWorkerOnMessage): void => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/TextRandom/__tests__/TextRandom.generate.test.ts b/packages/plugins/src/dataTypes/TextRandom/__tests__/TextRandom.generate.test.ts
new file mode 100644
index 000000000..f45333575
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/__tests__/TextRandom.generate.test.ts
@@ -0,0 +1,33 @@
+import sinon from 'sinon';
+import { onmessage } from '../TextRandom.worker';
+import utils from '../../../../utils';
+import { getBlankDTGeneratorPayload } from '../../../../../tests/testHelpers';
+
+describe('onmessage', () => {
+	const postMessage = jest.fn();
+	const importScripts = jest.fn();
+	beforeAll(() => {
+		window.postMessage = postMessage;
+		window.importScripts = importScripts;
+	});
+
+	it('generates random data', () => {
+		const payload: any = {
+			data: {
+				...getBlankDTGeneratorPayload(),
+				rowState: {
+					numWordsToGenerate: 1,
+					fromStart: 1,
+					minWords: 1,
+					maxWords: 1,
+					words: ['word']
+				}
+			}
+		};
+
+		sinon.stub(utils.randomUtils, 'generateRandomTextStr').returns('testXXX');
+
+		onmessage(payload);
+		expect(postMessage).toHaveBeenCalledWith({ display: 'testXXX' });
+	});
+});
diff --git a/packages/plugins/src/dataTypes/TextRandom/__tests__/TextRandom.ui.test.tsx b/packages/plugins/src/dataTypes/TextRandom/__tests__/TextRandom.ui.test.tsx
new file mode 100644
index 000000000..4be7f2536
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/__tests__/TextRandom.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../TextRandom';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps} />);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/TextRandom/bundle.ts b/packages/plugins/src/dataTypes/TextRandom/bundle.ts
new file mode 100644
index 000000000..26f50cfac
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/bundle.ts
@@ -0,0 +1,13 @@
+import { DTBundle } from '~types/dataTypes';
+import { Options, Help, getMetadata, rowStateReducer } from './TextRandom';
+import { initialState } from './TextRandom.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Options,
+	Help,
+	getMetadata,
+	rowStateReducer
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/TextRandom/config.ts b/packages/plugins/src/dataTypes/TextRandom/config.ts
new file mode 100644
index 000000000..e36f9090c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'text',
+  fieldGroupOrder: 10
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/ar.json b/packages/plugins/src/dataTypes/TextRandom/i18n/ar.json
new file mode 100644
index 000000000..06d1f7ee9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/ar.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "عدد عشوائي من الكلمات",
+  "DESC": "يُنشئ نوع البيانات هذا عددًا عشوائيًا من الكلمات ضمن النطاق المحدد.",
+  "DEFAULT_TITLE": "text",
+  "fromStart": "ابدأ من بداية النص",
+  "generate": "انشاء",
+  "to": "إلى",
+  "words": "كلمات",
+  "help": "يُنشئ نوع البيانات هذا عددًا عشوائيًا من الكلمات ضمن النطاق المحدد. يمكنك اختيار إنشاء كلمات من النص الافتراضي lorem ipsum dummy text ، أو توفير نص خاص بك.",
+  "selectTextSource": "حدد مصدر النص",
+  "lipsumDesc": "Lorem ipsum هو نص وهمي قياسي يستند إلى اللاتينية ويستخدم منذ القرن الخامس عشر الميلادي.",
+  "customTextDesc": "يتيح لك هذا الحقل إدخال أي نص ترغب في استخدامه كمصدر للبيانات.",
+  "source": "مصدر",
+  "explanation": "يتيح لك هذا القسم تخصيص النص المستخدم كمصدر بيانات.",
+  "enterCustomText": "أدخل بعض النص المخصص هنا. تأكد من إدخال كمية جيدة من الكلمات.",
+  "custom": "مخصص"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/de.json b/packages/plugins/src/dataTypes/TextRandom/i18n/de.json
new file mode 100644
index 000000000..457819bd9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/de.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "Zufällige Anzahl von Wörtern",
+  "DESC": "Dieser Datentyp generiert eine zufällige Anzahl von Wörtern innerhalb des angegebenen Bereichs.",
+  "DEFAULT_TITLE": "Text",
+  "fromStart": "Beginnen Sie am Anfang des Textes",
+  "generate": "Generieren",
+  "to": "zu",
+  "words": "Wörter",
+  "help": "Dieser Datentyp generiert eine zufällige Anzahl von Wörtern innerhalb des angegebenen Bereichs. Sie können wählen, ob Sie Wörter aus dem Standard-Lorem-Ipsum-Dummy-Text generieren oder einen eigenen Text angeben möchten.",
+  "selectTextSource": "Wählen Sie Textquelle",
+  "lipsumDesc": "Lorem ipsum ist ein Standard-Dummy-Text in lateinischer Sprache, der seit dem 16. Jahrhundert verwendet wird.",
+  "customTextDesc": "In dieses Feld können Sie den Text eingeben, den Sie als Datenquelle verwenden möchten.",
+  "source": "Quelle",
+  "explanation": "In diesem Abschnitt können Sie den als Datenquelle verwendeten Text anpassen.",
+  "enterCustomText": "Geben Sie hier einen benutzerdefinierten Text ein. Stellen Sie sicher, dass Sie eine gute Anzahl von Wörtern eingeben.",
+  "custom": "Benutzerdefiniert"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/en.json b/packages/plugins/src/dataTypes/TextRandom/i18n/en.json
new file mode 100644
index 000000000..1f2a4b7b5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/en.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "Random Number of Words",
+  "DESC": "This Data Type generates a random number of words within the range specified.",
+  "DEFAULT_TITLE": "text",
+  "fromStart": "Start from beginning of text",
+  "generate": "Generate",
+  "to": "to",
+  "words": "words",
+  "help": "This Data Type generates a random number of words within the range specified. You can choose to generate words from the default lorem ipsum dummy text, or supply a text of your own.",
+  "selectTextSource": "Select Text Source",
+  "lipsumDesc": "Lorem ipsum is a standard dummy text based in Latin that's been in use since the 1500's.",
+  "customTextDesc": "This field lets you enter whatever text you would like to be used as the data source.",
+  "source": "Source",
+  "explanation": "This section lets you customize the text used as the data source.",
+  "enterCustomText": "Enter some custom text here. Make sure you enter enough words to cover what you need.",
+  "custom": "Custom"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/es.json b/packages/plugins/src/dataTypes/TextRandom/i18n/es.json
new file mode 100644
index 000000000..6c2b35c98
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/es.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "Número aleatorio de palabras",
+  "DESC": "Este tipo de datos genera un número aleatorio de palabras dentro del rango especificado.",
+  "DEFAULT_TITLE": "texto",
+  "fromStart": "Empezar desde el principio del texto",
+  "generate": "Generar",
+  "to": "a",
+  "words": "palabras",
+  "help": "Este tipo de datos genera un número aleatorio de palabras dentro del rango especificado. Puede optar por generar palabras a partir del texto ficticio predeterminado de lorem ipsum o proporcionar un texto propio.",
+  "selectTextSource": "Seleccionar fuente de texto",
+  "lipsumDesc": "Lorem ipsum es un texto ficticio estándar basado en latín que ha estado en uso desde el siglo XVI.",
+  "customTextDesc": "Este campo le permite ingresar cualquier texto que le gustaría que se use como fuente de datos.",
+  "source": "Fuente",
+  "explanation": "Esta sección le permite personalizar el texto utilizado como fuente de datos.",
+  "enterCustomText": "Ingrese un texto personalizado aquí. Asegúrate de introducir una buena cantidad de palabras.",
+  "custom": "Costumbre"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/fr.json b/packages/plugins/src/dataTypes/TextRandom/i18n/fr.json
new file mode 100644
index 000000000..6c3751b53
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/fr.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "Nombre aléatoire de mots",
+  "DESC": "Ce type de données génère un nombre aléatoire de mots dans la plage spécifiée.",
+  "DEFAULT_TITLE": "texte",
+  "fromStart": "Commencer au début du texte",
+  "generate": "produire",
+  "to": "à",
+  "words": "mots",
+  "help": "Ce type de données génère un nombre aléatoire de mots dans la plage spécifiée. Vous pouvez choisir de générer des mots à partir du texte factice par défaut de lorem ipsum ou de fournir votre propre texte.",
+  "selectTextSource": "Sélectionnez la source du texte",
+  "lipsumDesc": "Lorem ipsum est un texte factice standard basé en latin et utilisé depuis les années 1500.",
+  "customTextDesc": "Ce champ vous permet de saisir le texte que vous souhaitez utiliser comme source de données.",
+  "source": "La source",
+  "explanation": "Cette section vous permet de personnaliser le texte utilisé comme source de données.",
+  "enterCustomText": "Entrez un texte personnalisé ici. Assurez-vous de saisir une bonne quantité de mots.",
+  "custom": "Douane"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/hi.json b/packages/plugins/src/dataTypes/TextRandom/i18n/hi.json
new file mode 100644
index 000000000..8f19f2045
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/hi.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "शब्दों की यादृच्छिक संख्या",
+  "DESC": "यह डेटा प्रकार निर्दिष्ट सीमा के भीतर शब्दों की एक यादृच्छिक संख्या उत्पन्न करता है।",
+  "DEFAULT_TITLE": "मूलपाठ",
+  "fromStart": "पाठ की शुरुआत से शुरू करें",
+  "generate": "उत्पन्न",
+  "to": "प्रति",
+  "words": "शब्दों",
+  "help": "यह डेटा प्रकार निर्दिष्ट सीमा के भीतर शब्दों की एक यादृच्छिक संख्या उत्पन्न करता है। आप डिफ़ॉल्ट लोरेम इप्सम डमी टेक्स्ट से शब्द उत्पन्न करना चुन सकते हैं, या अपना खुद का टेक्स्ट प्रदान कर सकते हैं।",
+  "selectTextSource": "पाठ स्रोत का चयन करें",
+  "lipsumDesc": "लोरेम इप्सम लैटिन में आधारित एक मानक डमी टेक्स्ट है जो 1500 के दशक से उपयोग में है।",
+  "customTextDesc": "यह फ़ील्ड आपको वह टेक्स्ट दर्ज करने देती है जिसे आप डेटा स्रोत के रूप में उपयोग करना चाहते हैं।",
+  "source": "स्रोत",
+  "explanation": "यह अनुभाग आपको डेटा स्रोत के रूप में उपयोग किए गए टेक्स्ट को कस्टमाइज़ करने देता है।",
+  "enterCustomText": "यहां कुछ कस्टम टेक्स्ट दर्ज करें। सुनिश्चित करें कि आप जो चाहते हैं उसे कवर करने के लिए पर्याप्त शब्द दर्ज करें।",
+  "custom": "रीति"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/ja.json b/packages/plugins/src/dataTypes/TextRandom/i18n/ja.json
new file mode 100644
index 000000000..46bcfaa39
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/ja.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "ランダムな単語数",
+  "DESC": "このデータ型は、指定された範囲内でランダムな数の単語を生成します。",
+  "DEFAULT_TITLE": "テキスト",
+  "fromStart": "テキストの最初から始める",
+  "generate": "生む",
+  "to": "に",
+  "words": "言葉",
+  "help": "このデータ型は、指定された範囲内でランダムな数の単語を生成します。 デフォルトのloremipsumダミーテキストから単語を生成するか、独自のテキストを提供するかを選択できます。",
+  "selectTextSource": "テキストソースを選択",
+  "lipsumDesc": "Lorem ipsumは、1500年代から使用されている、ラテン語に基づく標準のダミーテキストです。",
+  "customTextDesc": "このフィールドでは、データソースとして使用するテキストを入力できます。",
+  "source": "ソース",
+  "explanation": "このセクションでは、データソースとして使用されるテキストをカスタマイズできます。",
+  "enterCustomText": "ここにカスタムテキストを入力します。 十分な量の単語を入力してください。",
+  "custom": "カスタム"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/nl.json b/packages/plugins/src/dataTypes/TextRandom/i18n/nl.json
new file mode 100644
index 000000000..c5afa005b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/nl.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "Willekeurig aantal woorden",
+  "DESC": "Dit gegevenstype genereert een willekeurig aantal woorden binnen het opgegeven bereik.",
+  "DEFAULT_TITLE": "tekst",
+  "fromStart": "Begin vanaf het begin van de tekst",
+  "generate": "Genereer",
+  "to": "naar",
+  "words": "woorden",
+  "help": "Dit gegevenstype genereert een willekeurig aantal woorden binnen het opgegeven bereik. U kunt ervoor kiezen om woorden te genereren uit de standaard lorem ipsum dummy-tekst, of u kunt zelf een tekst opgeven.",
+  "selectTextSource": "Selecteer Tekstbron",
+  "lipsumDesc": "Lorem ipsum is een standaard dummy-tekst op basis van het Latijn die al sinds de jaren 1500 in gebruik is.",
+  "customTextDesc": "In dit veld kunt u elke tekst invoeren die u als gegevensbron wilt gebruiken.",
+  "source": "Bron",
+  "explanation": "In dit gedeelte kunt u de tekst aanpassen die als gegevensbron wordt gebruikt.",
+  "enterCustomText": "Voer hier wat aangepaste tekst in. Zorg ervoor dat u een groot aantal woorden invoert.",
+  "custom": "Op maat"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/pt.json b/packages/plugins/src/dataTypes/TextRandom/i18n/pt.json
new file mode 100644
index 000000000..432327fa6
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/pt.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "Número Aleatório de Palavras",
+  "DESC": "Este tipo de dados gera um número aleatório de palavras dentro do intervalo especificado.",
+  "DEFAULT_TITLE": "texto",
+  "fromStart": "Comece do início do texto",
+  "generate": "Gerar",
+  "to": "para",
+  "words": "palavras",
+  "help": "Este tipo de dados gera um número aleatório de palavras dentro do intervalo especificado. Você pode optar por gerar palavras a partir do texto fictício lorem ipsum padrão ou fornecer um texto próprio.",
+  "selectTextSource": "Selecione a fonte do texto",
+  "lipsumDesc": "Lorem ipsum é um texto fictício padrão baseado em latim que é usado desde 1500.",
+  "customTextDesc": "Este campo permite inserir qualquer texto que você gostaria de usar como fonte de dados.",
+  "source": "Fonte",
+  "explanation": "Esta seção permite personalizar o texto usado como fonte de dados.",
+  "enterCustomText": "Insira algum texto personalizado aqui. Certifique-se de inserir palavras suficientes para cobrir o que você precisa.",
+  "custom": "Personalizada"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/ru.json b/packages/plugins/src/dataTypes/TextRandom/i18n/ru.json
new file mode 100644
index 000000000..fb80fb626
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/ru.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "Случайное количество слов",
+  "DESC": "Этот тип данных генерирует случайное количество слов в указанном диапазоне.",
+  "DEFAULT_TITLE": "text",
+  "fromStart": "Начать с начала текста",
+  "generate": "Создать",
+  "to": "K",
+  "words": "слова",
+  "help": "Этот тип данных генерирует случайное количество слов в указанном диапазоне. Вы можете генерировать слова из фиктивного текста lorem ipsum по умолчанию или предоставить свой собственный текст.",
+  "selectTextSource": "Выберите источник текста",
+  "lipsumDesc": "Lorem ipsum — стандартный фиктивный текст на латыни, используемый с 1500-х годов.",
+  "customTextDesc": "Это поле позволяет вам ввести любой текст, который вы хотите использовать в качестве источника данных.",
+  "source": "Источник",
+  "explanation": "Этот раздел позволяет настроить текст, используемый в качестве источника данных.",
+  "enterCustomText": "Введите здесь произвольный текст. Убедитесь, что вы ввели достаточно слов, чтобы покрыть то, что вам нужно.",
+  "custom": "Обычай"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/ta.json b/packages/plugins/src/dataTypes/TextRandom/i18n/ta.json
new file mode 100644
index 000000000..fb111014d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/ta.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "சொற்களின் சீரற்ற எண்",
+  "DESC": "இந்த தரவு வகை குறிப்பிட்ட வரம்பிற்குள் சீரற்ற எண்ணிக்கையிலான சொற்களை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "உரை",
+  "fromStart": "உரையின் தொடக்கத்திலிருந்து தொடங்குங்கள்",
+  "generate": "உருவாக்கு",
+  "to": "க்கு",
+  "words": "சொற்கள்",
+  "help": "இந்த தரவு வகை குறிப்பிட்ட வரம்பிற்குள் சீரற்ற எண்ணிக்கையிலான சொற்களை உருவாக்குகிறது. இயல்புநிலை லோரெம் இப்சம் போலி உரையிலிருந்து சொற்களை உருவாக்க நீங்கள் தேர்வு செய்யலாம் அல்லது உங்கள் சொந்த உரையை வழங்கலாம்.",
+  "selectTextSource": "உரை மூலத்தைத் தேர்ந்தெடுக்கவும்",
+  "lipsumDesc": "லோரெம் இப்சம் என்பது லத்தீன் மொழியை அடிப்படையாகக் கொண்ட ஒரு நிலையான போலி உரை, இது 1500 களில் இருந்து பயன்பாட்டில் உள்ளது.",
+  "customTextDesc": "தரவு மூலமாக நீங்கள் பயன்படுத்த விரும்பும் எந்த உரையையும் உள்ளிட இந்த புலம் உங்களை அனுமதிக்கிறது.",
+  "source": "மூல",
+  "explanation": "தரவு மூலமாகப் பயன்படுத்தப்படும் உரையைத் தனிப்பயனாக்க இந்த பிரிவு உங்களை அனுமதிக்கிறது.",
+  "enterCustomText": "சில தனிப்பயன் உரையை இங்கே உள்ளிடவும். நீங்கள் ஒரு நல்ல அளவு சொற்களை உள்ளிடுவதை உறுதிசெய்க.",
+  "custom": "தனிப்பயன்"
+}
diff --git a/packages/plugins/src/dataTypes/TextRandom/i18n/zh.json b/packages/plugins/src/dataTypes/TextRandom/i18n/zh.json
new file mode 100644
index 000000000..715b3e777
--- /dev/null
+++ b/packages/plugins/src/dataTypes/TextRandom/i18n/zh.json
@@ -0,0 +1,17 @@
+{
+  "NAME": "随机词数",
+  "DESC": "此数据类型生成指定范围内的随机单词数。",
+  "DEFAULT_TITLE": "文本",
+  "fromStart": "从文字开始",
+  "generate": "生成",
+  "to": "至",
+  "words": "话",
+  "help": "此数据类型生成指定范围内的随机单词数。 您可以选择从默认lorem ipsum虚拟文本生成单词，也可以提供自己的文本。",
+  "selectTextSource": "选择文字来源",
+  "lipsumDesc": "Lorem ipsum是基于拉丁文的标准伪文本，自1500以来一直在使用。",
+  "customTextDesc": "通过此字段，您可以输入任何想要用作数据源的文本。",
+  "source": "资源",
+  "explanation": "本部分允许您自定义用作数据源的文本。",
+  "enterCustomText": "在此处输入一些自定义文本。 确保输入了大量单词。",
+  "custom": "自订"
+}
diff --git a/packages/plugins/src/dataTypes/Time/README.md b/packages/plugins/src/dataTypes/Time/README.md
new file mode 100644
index 000000000..1a9e935af
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/README.md
@@ -0,0 +1,73 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Time
+
+This Data Type generates a random time in a particular format. It's currently a bit of an awkward interface in that it 
+requires passing the `fromTime` and `toTime` settings sin _seconds timestamp_ format. I realize this isn't the
+easiest format to work with, so we have a feature request to improve the DX here: https://github.com/benkeen/generatedata/issues/825
+Try using an online service such as the [epochconvertor site](https://www.epochconverter.com/) to generate those values for you.
+
+## Formats
+
+This Data Type uses date-fns for the time formats. [See their documentation](https://date-fns.org/v2.29.3/docs/format) for 
+a full descriptions of each of the formatting placeholders. A few examples:
+
+- `h:mm aaa` - 3:35 pm
+- `h:mm a` - 3:35 PM
+- `h:mm aaaa` - 3:35 p.m.
+- `h:mm:ss aaa` - 3:35:00 pm
+- `h:mm:ss aa` - 3:35:00 PM
+- `h:mm:ss aaaa` - 3:35:00 P.M.
+- `H:mm` - 15:35
+- `H:mm:ss` - 15:35:00
+
+## Examples
+
+```typescript
+{
+    generationSettings: {
+        numResults: 10
+    },
+    dataTemplate: [
+        {
+            plugin: 'Time',
+            title: 'time',
+            settings: {
+                fromTime: 1678944164,
+                toTime: 1679030564,
+                format: 'h:mm a'
+            }
+        },
+    ],
+    exportSettings: {
+        plugin: 'JSON',
+        settings: {
+            dataStructureFormat: 'simple'
+        }
+    }
+}
+```
+
+Sample output: 
+
+```typescript
+[
+    {
+        "time": "7:45 AM"
+    },
+    {
+        "time": "7:44 AM"
+    },
+    {
+        "time": "4:54 AM"
+    },
+    {
+        "time": "4:06 AM"
+    },
+    {
+        "time": "7:13 PM"
+    },
+    {
+        "time": "9:53 PM"
+    },
+    ...
+]
+```
diff --git a/packages/plugins/src/dataTypes/Time/Time.generate.ts b/packages/plugins/src/dataTypes/Time/Time.generate.ts
new file mode 100644
index 000000000..5696e2da4
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/Time.generate.ts
@@ -0,0 +1,20 @@
+import { format, fromUnixTime } from 'date-fns';
+import { DTGenerationData, DTGenerateResult } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { fromTime, toTime, format: displayFormat } = data.rowState;
+  if (!displayFormat) {
+    return { display: '' };
+  }
+  const time = utils.randomUtils.getRandomNum(fromTime, toTime);
+
+  let display = '';
+  try {
+    display = format(fromUnixTime(time), displayFormat);
+  } catch (e) {}
+
+  return {
+    display
+  };
+};
diff --git a/packages/plugins/src/dataTypes/Time/Time.scss b/packages/plugins/src/dataTypes/Time/Time.scss
new file mode 100644
index 000000000..2cdb6f1bb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/Time.scss
@@ -0,0 +1,71 @@
+.dateRow {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: 4px;
+
+    label {
+        margin-right: 6px;
+    }
+
+    span {
+        text-transform: none;
+    }
+}
+
+.formatCodeLabel {
+	margin-right: 4px;
+}
+
+.dateField {
+    margin: 0;
+
+    div input {
+        border: 0;
+    }
+
+    & > div {
+        border-bottom: 0;
+    }
+}
+
+.dateBtn {
+	background-color: #ffffff;
+	padding: 4px 6px;
+}
+
+.row {
+	display: flex;
+	align-items: flex-start;
+	padding-bottom: 12px;
+
+	.col1 {
+		flex: 0 0 70px;
+	}
+	.col2 {
+		flex: 1;
+	}
+	.col3 {
+		flex: 1;
+		color: #999999;
+	}
+
+	label {
+		background-color: #dfecfc;
+		border-radius: 3px;
+		padding: 1px 6px;
+	}
+}
+
+.copy {
+	margin: 4px 0 0 4px;
+}
+
+.field {
+	margin: 3px;
+	width: 90px;
+
+	input:focus {
+		border: 0
+	}
+}
diff --git a/packages/plugins/src/dataTypes/Time/Time.scss.d.ts b/packages/plugins/src/dataTypes/Time/Time.scss.d.ts
new file mode 100644
index 000000000..41a1a8bea
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/Time.scss.d.ts
@@ -0,0 +1,21 @@
+declare namespace TimeScssNamespace {
+  export interface ITimeScss {
+    col1: string;
+    col2: string;
+    col3: string;
+    copy: string;
+    dateBtn: string;
+    dateField: string;
+    dateRow: string;
+    field: string;
+    formatCodeLabel: string;
+    row: string;
+  }
+}
+
+declare const TimeScssModule: TimeScssNamespace.ITimeScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: TimeScssNamespace.ITimeScss;
+};
+
+export = TimeScssModule;
diff --git a/packages/plugins/src/dataTypes/Time/Time.state.tsx b/packages/plugins/src/dataTypes/Time/Time.state.tsx
new file mode 100755
index 000000000..551027680
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/Time.state.tsx
@@ -0,0 +1,19 @@
+import { endOfDay, format, startOfDay } from 'date-fns';
+
+export type DateState = {
+	fromTime: number;
+	toTime: number;
+	example: string;
+	format: string;
+};
+
+export type GenerationOptionsType = Omit<DateState, 'example'>;
+
+export const initialState: DateState = {
+	fromTime: parseInt(format(startOfDay(new Date()), 't'), 10),
+	toTime: parseInt(format(endOfDay(new Date()), 't'), 10),
+	example: 'h:mm a',
+	format: 'h:mm a'
+};
+
+export const defaultGenerationOptions = initialState;
diff --git a/packages/plugins/src/dataTypes/Time/Time.tsx b/packages/plugins/src/dataTypes/Time/Time.tsx
new file mode 100755
index 000000000..898f0ae8e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/Time.tsx
@@ -0,0 +1,148 @@
+import * as React from 'react';
+import { format, fromUnixTime, parse } from 'date-fns';
+import Dropdown from '~components/dropdown/Dropdown';
+import ArrowRightAlt from '@mui/icons-material/ArrowRightAlt';
+import TextField from '@mui/material/TextField';
+import CoreTextField from '~components/TextField';
+import CopyToClipboard from '~components/copyToClipboard/CopyToClipboard';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import { ErrorTooltip } from '~components/tooltips';
+import { DateState, GenerationOptionsType } from './Time.state';
+import * as styles from './Time.scss';
+import * as sharedStyles from '../../../styles/shared.scss';
+
+const SECS_IN_DAY = 86400;
+export const rowStateReducer = ({ fromTime, toTime, format }: DateState): GenerationOptionsType => ({
+  fromTime,
+  toTime: fromTime > toTime ? toTime + SECS_IN_DAY : toTime,
+  format
+});
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'varchar(255)',
+    field_Oracle: 'varchar2(255)',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
+
+export const getOptions = (): any[] => {
+  const formats = [
+    'h:mm aaa', // 3:35 pm
+    'h:mm a', // 3:35 PM
+    'h:mm aaaa', // 3:35 p.m.
+    'h:mm:ss aaa', // 3:35:00 pm
+    'h:mm:ss aa', // 3:35:00 PM
+    'h:mm:ss aaaa', // 3:35:00 P.M.
+    'H:mm', // 15:35
+    'H:mm:ss' // 15:35:00
+  ];
+
+  return formats.map((currFormat) => ({
+    label: format(new Date(), currFormat),
+    value: currFormat
+  }));
+};
+
+export const Example = ({ i18n, data, onUpdate }: DTExampleProps) => {
+  const onChange = ({ value }: { value: string }): void => {
+    onUpdate({
+      ...data,
+      example: value,
+      format: value
+    });
+  };
+
+  return <Dropdown placeholder={i18n.dateFormat} value={data.example} options={getOptions()} onChange={onChange} />;
+};
+
+export const Options = ({ data, onUpdate, i18n, coreI18n }: DTOptionsProps) => {
+  const onChange = (field: string, value: any): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  let toTimeError = '';
+  if (data.fromTime > data.toTime) {
+    toTimeError = i18n.endDateEarlierThanStartDate;
+  }
+
+  return (
+    <div>
+      <div className={styles.dateRow}>
+        <TextField
+          type="time"
+          defaultValue={format(fromUnixTime(data.fromTime), 'HH:mm')}
+          className={styles.field}
+          InputLabelProps={{
+            shrink: true
+          }}
+          inputProps={{ step: 60 }}
+          onChange={(e: any): void => {
+            const date = parse(e.target.value, 'HH:mm', new Date());
+            onChange('fromTime', parseInt(format(date, 't'), 10));
+          }}
+        />
+        <ArrowRightAlt />
+        <ErrorTooltip title={toTimeError} arrow disableHoverListener={!toTimeError} disableFocusListener={!toTimeError}>
+          <TextField
+            type="time"
+            defaultValue={format(fromUnixTime(data.toTime), 'H:mm')}
+            className={styles.field}
+            InputLabelProps={{
+              shrink: true
+            }}
+            inputProps={{ step: 60 }}
+            onChange={(e: any): void => {
+              const date = parse(e.target.value, 'HH:mm', new Date());
+              onChange('toTime', parseInt(format(date, 't'), 10));
+            }}
+          />
+        </ErrorTooltip>
+      </div>
+      <div>
+        <span className={styles.formatCodeLabel}>{i18n.formatCode}</span>
+        <CoreTextField
+          error={data.format ? '' : coreI18n.requiredField}
+          value={data.format}
+          style={{ width: 140 }}
+          onChange={(e: any): void => onChange('format', e.target.value)}
+          maxLength={255}
+        />
+      </div>
+    </div>
+  );
+};
+
+const Copy = ({ content, tooltip, message }: any) => (
+  <span className={styles.copy}>
+    <CopyToClipboard content={content} message={message} tooltip={tooltip} />
+  </span>
+);
+
+const generateRows = (letters: string[], i18n: any, coreI18n: any): JSX.Element[] =>
+  letters.map((letter: string) => (
+    <div className={styles.row} key={letter}>
+      <div className={styles.col1}>
+        <label>{letter}</label>
+      </div>
+      <div className={sharedStyles.copyCol}>
+        <Copy content={letter} message={coreI18n.copiedToClipboard} tooltip={coreI18n.copyToClipboard} />
+      </div>
+      <div className={styles.col2}>{i18n[`${letter}Format`]}</div>
+      <div className={styles.col3}>{i18n[`${letter}FormatExample`]}</div>
+    </div>
+  ));
+
+export const Help = ({ i18n, coreI18n }: DTHelpProps) => (
+  <>
+    <p dangerouslySetInnerHTML={{ __html: i18n.helpIntro }} />
+
+    {generateRows(['h', 'H', 'mm', 'ss', 'a', 'aaa', 'aaaa'], i18n, coreI18n)}
+  </>
+);
diff --git a/packages/plugins/src/dataTypes/Time/Time.worker.ts b/packages/plugins/src/dataTypes/Time/Time.worker.ts
new file mode 100644
index 000000000..2eedd4508
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/Time.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Time.generate';
+
+let workerUtilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage): void => {
+	if (!workerUtilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		workerUtilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Time/__tests__/Time.test.ts b/packages/plugins/src/dataTypes/Time/__tests__/Time.test.ts
new file mode 100644
index 000000000..30cee8483
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/__tests__/Time.test.ts
@@ -0,0 +1,29 @@
+import { format } from 'date-fns';
+import * as ui from '../Time';
+
+const date = new Date(2020, 0, 3);
+
+describe('getOptions', () => {
+    it('confirm that all provided formats generate the expected value', () => {
+		const expected: any = {
+			'MMM d, y': 'Jan 3, 2020',
+			'MMMM do, y': 'January 3rd, 2020',
+			'EEE, MMM dd': 'Fri, Jan 03',
+			'EEE, MMM do, y': 'Fri, Jan 3rd, 2020',
+			'LL.dd.yy': '01.03.20',
+			'LL-dd-yy': '01-03-20',
+			'LL/dd/yy': '01/03/20',
+			'LL/dd/y': '01/03/2020',
+			'dd.LL.yy': '03.01.20',
+			'dd-LL-yy': '03-01-20',
+			'dd/LL/y': '03/01/2020',
+			'y-LL-dd HH:mm:ss': '2020-01-03 00:00:00'
+		};
+
+		ui.getOptions().forEach(({ value }: any) => {
+			if (expected.hasOwnProperty(value)) {
+				expect(format(date, value)).toEqual(expected[value]);
+			}
+		});
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Time/bundle.ts b/packages/plugins/src/dataTypes/Time/bundle.ts
new file mode 100644
index 000000000..591bbad56
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/bundle.ts
@@ -0,0 +1,14 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, Example, Options, rowStateReducer, getMetadata } from './Time';
+import { initialState } from './Time.state';
+
+const bundle: DTBundle = {
+	initialState,
+	rowStateReducer,
+	Help,
+	Example,
+	Options,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Time/config.ts b/packages/plugins/src/dataTypes/Time/config.ts
new file mode 100644
index 000000000..02a637f12
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'humanData',
+  fieldGroupOrder: 50
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Time/i18n/ar.json b/packages/plugins/src/dataTypes/Time/i18n/ar.json
new file mode 100644
index 000000000..4949d6383
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/ar.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "زمن",
+  "DESC": "يولد وقتًا منسقًا مخصصًا ضمن نطاق زمني.",
+  "DEFAULT_TITLE": "زمن",
+  "description": "وصف",
+  "example": "مثال",
+  "formatCode": "كود التنسيق:",
+  "helpIntro": "يقوم نوع البيانات هذا بشكل عشوائي بإنشاء وقت منسق بين النطاق. راجع الجدول أدناه <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">للحصول على قائمة بقواعد التنسيق المتاحة. هذه مأخوذة من</a> خيارات تنسيق تاريخ .استخدم مثال القائمة المنسدلة للاختيار من تنسيقات التاريخ القياسية.",
+  "hFormat": "ساعة",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "ساعة بدون مبطن",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "دقائق مبطنة صفريًا",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "ثواني بدون مبطن",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "الأحرف الكبيرة صباحا ، مساء",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "صغيرة صباحا ، مساءا",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "أحرف صغيرة صباحا ، مساءا",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Time/i18n/de.json b/packages/plugins/src/dataTypes/Time/i18n/de.json
new file mode 100644
index 000000000..c4976980f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/de.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Zeit",
+  "DESC": "Generiert eine benutzerdefinierte formatierte Zeit innerhalb eines Zeitbereichs.",
+  "DEFAULT_TITLE": "Zeit",
+  "description": "Beschreibung",
+  "example": "Beispiel",
+  "formatCode": "Formatcode:",
+  "helpIntro": "Dieser Datentyp generiert zufällig eine formatierte Zeit zwischen einem Bereich. In der folgenden Tabelle finden Sie eine Liste der verfügbaren Formatierungsregeln. Diese stammen aus den <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">date-fns Datumsformatierungsoptionen</a>. Verwenden Sie das Dropdown-Beispiel, um aus den Standard-Datumsformaten auszuwählen.",
+  "hFormat": "Stunde",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "Null aufgefüllte Stunde",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "Null aufgefüllte Minuten",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "Mit Null aufgefüllte Sekunden",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "AM, PM in Großbuchstaben",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "Kleinbuchstaben am, pm",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "Kleinbuchstaben a.m., p.m.",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Time/i18n/en.json b/packages/plugins/src/dataTypes/Time/i18n/en.json
new file mode 100644
index 000000000..1f36da61a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/en.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Time",
+  "DESC": "Generates a custom formatted time within a time range.",
+  "DEFAULT_TITLE": "time",
+  "description": "Description",
+  "example": "Example",
+  "formatCode": "Format code:",
+  "helpIntro": "This data type randomly generates a formatted time between a range. See the table below for a list of available formatting rules. These are taken from the <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">date-fns date formatting options</a>. Use the example dropdown to select from standard date formats.",
+  "hFormat": "Hour",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "Zero-padded hour",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "Zero-padded minutes",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "Zero-padded seconds",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "Uppercase AM, PM",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "Lowercase am, pm",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "Lowercase a.m., p.m.",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Time/i18n/es.json b/packages/plugins/src/dataTypes/Time/i18n/es.json
new file mode 100644
index 000000000..846a851bb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/es.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Tiempo",
+  "DESC": "Genera una hora con formato personalizado dentro de un rango de tiempo.",
+  "DEFAULT_TITLE": "tiempo",
+  "description": "Descripción",
+  "example": "Ejemplo",
+  "formatCode": "Código de formato:",
+  "helpIntro": "Este tipo de datos genera aleatoriamente un tiempo formateado entre un rango. Consulte la tabla a continuación para obtener una lista de las reglas de formato disponibles. Estos se toman de las <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">opciones de formato de fecha date-fns</a>. Utilice el menú desplegable de ejemplo para seleccionar entre los formatos de fecha estándar.",
+  "hFormat": "Hora",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "Hora acolchada con cero",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "Minutos sin relleno",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "Segundos acolchados con cero",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "Mayúsculas AM, PM",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "Minúsculas am, pm",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "Minúsculas a.m., p.m.",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Time/i18n/fr.json b/packages/plugins/src/dataTypes/Time/i18n/fr.json
new file mode 100644
index 000000000..9517e9491
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/fr.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Temps",
+  "DESC": "Génère une heure formatée personnalisée dans une plage de temps.",
+  "DEFAULT_TITLE": "temps",
+  "description": "La description",
+  "example": "Exemple",
+  "formatCode": "Code de formatage :",
+  "helpIntro": "Ce type de données génère de manière aléatoire un temps formaté entre une plage. Voir le tableau ci-dessous pour une liste des règles de formatage disponibles. Celles-ci sont extraites des <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">options de formatage de date date-fns</a>. Utilisez l'exemple de liste déroulante pour sélectionner des formats de date standard.",
+  "hFormat": "Heure",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "Heure zéro-rembourrée",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "Minutes sans zéro",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "Secondes zéro-rembourrées",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "Majuscules AM, PM",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "Minuscule am, pm",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "Minuscule a.m., p.m.",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Time/i18n/hi.json b/packages/plugins/src/dataTypes/Time/i18n/hi.json
new file mode 100644
index 000000000..b3d00f8ac
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/hi.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "समय",
+  "DESC": "एक समय सीमा के भीतर एक कस्टम स्वरूपित समय उत्पन्न करता है।",
+  "DEFAULT_TITLE": "समय",
+  "description": "विवरण",
+  "example": "उदाहरण",
+  "formatCode": "प्रारूप कोड:",
+  "helpIntro": "यह डेटा प्रकार बेतरतीब ढंग से एक सीमा के बीच एक स्वरूपित समय उत्पन्न करता है। उपलब्ध स्वरूपण नियमों की सूची के लिए नीचे दी गई तालिका देखें। ये <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">date-fns दिनांक स्वरूपण विकल्पों</a> से लिए गए हैं . मानक दिनांक स्वरूपों में से चयन करने के लिए उदाहरण ड्रॉपडाउन का उपयोग करें।",
+  "hFormat": "घंटा",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "शून्य गद्देदार घंटा",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "शून्य-गद्देदार मिनट",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "शून्य-गद्देदार सेकंड",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "अपरकेस AM, PM",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "छोटे am, pm",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "छोटे a.m., p.m.",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Time/i18n/ja.json b/packages/plugins/src/dataTypes/Time/i18n/ja.json
new file mode 100644
index 000000000..22d70933b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/ja.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "時間",
+  "DESC": "時間範囲内にカスタムフォーマットされた時間を生成します。",
+  "DEFAULT_TITLE": "時間",
+  "description": "説明",
+  "example": "例",
+  "formatCode": "フォーマットコード：",
+  "helpIntro": "このデータ型は、範囲間のフォーマットされた時間をランダムに生成します。 使用可能なフォーマット規則のリストについては、以下の表を参照してください。 これらは、<a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\"> date-fns日付フォーマットオプション</a>から取得されます。 。 ドロップダウンの例を使用して、標準の日付形式から選択します。",
+  "hFormat": "時間",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "ゼロが埋め込まれた時間",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "ゼロが埋め込まれた分",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "ゼロが埋め込まれた秒",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "大文字の午前、午後",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "小文字の午前、午後",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "小文字の午前、午後",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Time/i18n/nl.json b/packages/plugins/src/dataTypes/Time/i18n/nl.json
new file mode 100644
index 000000000..66e74d344
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/nl.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Tijd",
+  "DESC": "Genereert een aangepaste opgemaakte tijd binnen een tijdbereik.",
+  "DEFAULT_TITLE": "tijd",
+  "description": "Beschrijving",
+  "example": "Voorbeeld",
+  "formatCode": "Formaatcode:",
+  "helpIntro": "Dit gegevenstype genereert willekeurig een opgemaakte tijd tussen een bereik. Zie de onderstaande tabel voor een lijst met beschikbare opmaakregels. Deze zijn afkomstig uit de <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">date-fns datumopmaakopties</a> . Gebruik de vervolgkeuzelijst met voorbeelden om te kiezen uit standaard datumnotaties.",
+  "hFormat": "Uur",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "Zero-padded uur",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "Nul gevulde minuten",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "Nulgevulde seconden",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "Hoofdletters AM, PM",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "Kleine letters am, pm",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "Kleine letters a.m., p.m.",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Time/i18n/pt.json b/packages/plugins/src/dataTypes/Time/i18n/pt.json
new file mode 100644
index 000000000..5f9f894c2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/pt.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Tempo",
+  "DESC": "Gera uma hora formatada personalizada dentro de um intervalo de tempo.",
+  "DEFAULT_TITLE": "Tempo",
+  "description": "Descrição",
+  "example": "Exemplo",
+  "formatCode": "Código de formato:",
+  "helpIntro": "Este tipo de dados gera aleatoriamente um tempo formatado entre um intervalo. Consulte a tabela abaixo para obter uma lista das regras de formatação disponíveis. Eles são retirados das <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\"> opções de formatação de data date-fns</a>. Use o menu suspenso de exemplo para selecionar os formatos de data padrão.",
+  "hFormat": "Hora",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "Hora zerada",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "Minutos zerados",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "Segundos zerados",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "Maiúsculas AM, PM",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "Minúsculas am, pm",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "Minúsculas a.m., p.m.",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Time/i18n/ru.json b/packages/plugins/src/dataTypes/Time/i18n/ru.json
new file mode 100644
index 000000000..cac5a730f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/ru.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "Время",
+  "DESC": "Генерирует пользовательское форматированное время в диапазоне времени.",
+  "DEFAULT_TITLE": "время",
+  "description": "Описание",
+  "example": "Пример",
+  "formatCode": "Код формата:",
+  "helpIntro": "Этот тип данных случайным образом генерирует отформатированное время между диапазоном. В таблице ниже приведен список доступных правил форматирования. Они взяты из <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">параметров форматирования даты date-fns</a>. . Используйте пример раскрывающегося списка, чтобы выбрать один из стандартных форматов даты.",
+  "hFormat": "Час",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "Час с нулевым дополнением",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "Минуты с нулями",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "Секунды с нулями",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "Заглавные буквы AM, PM",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "Строчные утра, вечера",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "Строчные am, p.m.",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Time/i18n/ta.json b/packages/plugins/src/dataTypes/Time/i18n/ta.json
new file mode 100644
index 000000000..29119cb3a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/ta.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "நேரம்",
+  "DESC": "ஒரு கால எல்லைக்குள் தனிப்பயன் வடிவமைக்கப்பட்ட நேரத்தை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "நேரம்",
+  "description": "விளக்கம்",
+  "example": "உதாரணமாக",
+  "formatCode": "வடிவமைப்பு குறியீடு:",
+  "helpIntro": "இந்த தரவு வகை தோராயமாக ஒரு வரம்பிற்கு இடையில் வடிவமைக்கப்பட்ட நேரத்தை உருவாக்குகிறது. கிடைக்கக்கூடிய வடிவமைப்பு விதிகளின் பட்டியலுக்கு கீழே உள்ள அட்டவணையைப் பார்க்கவும். இவை <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">தேதி- fns தேதி வடிவமைப்பு விருப்பங்கள் </a> இலிருந்து எடுக்கப்பட்டது . நிலையான தேதி வடிவங்களிலிருந்து தேர்ந்தெடுக்க எடுத்துக்காட்டு கீழ்தோன்றலைப் பயன்படுத்தவும்.",
+  "hFormat": "மணி",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "பூஜ்ஜிய-திணிப்பு மணி",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "பூஜ்ஜியத்துடன் கூடிய நிமிடங்கள்",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "பூஜ்ஜியத்துடன் கூடிய வினாடிகள்",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "பெரிய எழுத்து AM, PM",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "சிறிய எழுத்து காலை, மாலை",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "சிறிய எழுத்து காலை, மாலை",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Time/i18n/zh.json b/packages/plugins/src/dataTypes/Time/i18n/zh.json
new file mode 100644
index 000000000..4947b289a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Time/i18n/zh.json
@@ -0,0 +1,23 @@
+{
+  "NAME": "时间",
+  "DESC": "在时间范围内生成自定义格式的时间。",
+  "DEFAULT_TITLE": "时间",
+  "description": "描述",
+  "example": "例子",
+  "formatCode": "格式代码：",
+  "helpIntro": "此数据类型随机生成一个范围之间的格式化时间。 有关可用格式规则的列表，请参阅下表。 这些取自 <a href=\"https://date-fns.org/v2.16.1/docs/format\" target=\"_blank\" rel=\"noopener noreferrer\">date-fns 日期格式选项</a> . 使用示例下拉菜单从标准日期格式中进行选择。",
+  "hFormat": "小时",
+  "hFormatExample": "1, 2, ..., 11, 12",
+  "HFormat": "零填充小时",
+  "HFormatExample": "01, 02, ..., 11, 12",
+  "mmFormat": "零填充分钟",
+  "mmFormatExample": "01, 02, ..., 58, 59",
+  "ssFormat": "零填充秒",
+  "ssFormatExample": "01, 02, ..., 58, 59",
+  "aFormat": "零填充秒",
+  "aFormatExample": "AM, PM",
+  "aaaFormat": "小写 am, pm",
+  "aaaFormatExample": "am, pm",
+  "aaaaFormat": "小写 a.m., p.m.",
+  "aaaaFormatExample": "a.m., p.m."
+}
diff --git a/packages/plugins/src/dataTypes/Track1/README.md b/packages/plugins/src/dataTypes/Track1/README.md
new file mode 100644
index 000000000..7c5b4ca41
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/README.md
@@ -0,0 +1,30 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Track1
+
+This Data Type generates a random Track1 number.
+
+
+### Example API Usage
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "Track1",
+            "title": "track 1"
+        }
+    ],
+    "export": {
+        "type": "JSON",
+        "settings": {
+            "stripWhitespace": false,
+            "dataStructureFormat": "complex"
+        }
+    }
+}
+```
+ 
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/dataTypes/Track1/Track1.generate.ts b/packages/plugins/src/dataTypes/Track1/Track1.generate.ts
new file mode 100644
index 000000000..5426fb091
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/Track1.generate.ts
@@ -0,0 +1,67 @@
+import { DTGenerationData, DTGenerateResult } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+/*
+	Source - http://en.wikipedia.org/wiki/Magnetic_stripe_card#Financial_cards
+
+	Start sentinel — one character (generally '%')
+	Format code = "B" — one character (alpha only)
+	Primary account number (PAN) — up to 19 characters. Usually, but not always, matches the credit card number
+		printed on the front of the card.
+	Field Separator — one character (generally '^')
+	Name — two to 26 characters
+	Field Separator — one character (generally '^')
+	Expiration date — four characters in the form YYMM.
+	Service code — three characters
+	Discretionary data — may include Pin Verification Key Indicator (PVKI, 1 character), PIN Verification
+		Value (PVV, 4 characters), Card Verification 	Value or Card Verification Code (CVV or CVC, 3 characters)
+	End sentinel — one character (generally '?')
+	Longitudinal redundancy check (LRC) — it is one character and a validity character calculated from other
+		data on the track.
+*/
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { nameSource, panSource, targetNameRowId, targetPanRowId } = data.rowState;
+
+  let pan = '';
+  if (panSource === 'random') {
+    pan = utils.randomUtils.generateRandomAlphanumericStr('Xxxxxxxxxxxxxxxx');
+  } else {
+    const found = data.existingRowData.find(({ id }) => id === targetPanRowId);
+    if (found) {
+      pan = found.data.display as string;
+    }
+  }
+
+  let name = '';
+  if (nameSource === 'random') {
+    name = utils.randomUtils.generateRandomAlphanumericStr('Lllllll Llllll');
+  } else {
+    const found = data.existingRowData.find(({ id }) => id === targetNameRowId);
+    if (found) {
+      name = found.data.display as string;
+    }
+  }
+
+  // replace whitespace in the name and PAN
+  const nameWithoutSpaces = name.replace(/\s+/g, '');
+  const panWithoutSpaces = pan.replace(/[^\d]/g, '');
+
+  const randYear = utils.stringUtils.padString(utils.randomUtils.getRandomNum(0, 99), 2);
+  const randMonth = utils.stringUtils.padString(utils.randomUtils.getRandomNum(1, 12), 2);
+  const date = `${randYear}${randMonth}`;
+  const serviceCode = utils.randomUtils.getRandomNum(111, 999);
+
+  // could be more efficient
+  const discretionaryData = [
+    utils.randomUtils.getRandomNum(1, 9),
+    utils.randomUtils.getRandomNum(111, 999),
+    utils.randomUtils.getRandomNum(1111, 9999)
+  ];
+  const index = utils.randomUtils.getRandomNum(0, 2);
+  const dataItem = discretionaryData[index];
+  const lrc = utils.randomUtils.getRandomCharInString(' 123456789');
+
+  return {
+    display: `%B${panWithoutSpaces}^${nameWithoutSpaces}^${date}${serviceCode}${dataItem}?${lrc}`
+  };
+};
diff --git a/packages/plugins/src/dataTypes/Track1/Track1.scss b/packages/plugins/src/dataTypes/Track1/Track1.scss
new file mode 100644
index 000000000..a013c6a46
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/Track1.scss
@@ -0,0 +1,3 @@
+.buttonLabel {
+	margin-top: 4px;
+}
diff --git a/packages/plugins/src/dataTypes/Track1/Track1.scss.d.ts b/packages/plugins/src/dataTypes/Track1/Track1.scss.d.ts
new file mode 100644
index 000000000..04cc421df
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/Track1.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace Track1ScssNamespace {
+  export interface ITrack1Scss {
+    buttonLabel: string;
+  }
+}
+
+declare const Track1ScssModule: Track1ScssNamespace.ITrack1Scss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: Track1ScssNamespace.ITrack1Scss;
+};
+
+export = Track1ScssModule;
diff --git a/packages/plugins/src/dataTypes/Track1/Track1.state.tsx b/packages/plugins/src/dataTypes/Track1/Track1.state.tsx
new file mode 100644
index 000000000..c6689abe0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/Track1.state.tsx
@@ -0,0 +1,19 @@
+export type Track1Source = 'row' | 'random';
+
+export type Track1State = {
+	panSource: Track1Source;
+	targetPanRowId: string;
+	nameSource: Track1Source;
+	targetNameRowId: string;
+}
+
+export const initialState: Track1State = {
+	panSource: 'random',
+	targetPanRowId: '',
+	nameSource: 'random',
+	targetNameRowId: ''
+};
+
+export const defaultGenerationOptions = initialState;
+
+export type GenerationOptionsType = Track1State;
diff --git a/packages/plugins/src/dataTypes/Track1/Track1.store.tsx b/packages/plugins/src/dataTypes/Track1/Track1.store.tsx
new file mode 100644
index 000000000..4ce20aba0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/Track1.store.tsx
@@ -0,0 +1,70 @@
+import { createSelector } from 'reselect';
+import { DTCustomProps } from '~types/dataTypes';
+import { getSortedRowsArray } from '~store/generator/generator.selectors';
+import { Track1State } from './Track1.state';
+import { REMOVE_ROW, SELECT_DATA_TYPE } from '~store/generator/generator.actions';
+
+// this defines a custom selector that extracts information about the country fields, needed by this component. The
+// core script handles processing this and passing it back via a `countryRows` prop to our Options component
+const getPANRows = createSelector(
+	getSortedRowsArray,
+	(rows) => rows.map((row, index) => ({ ...row, index })).filter(({ dataType }) => (
+		dataType === 'PAN'
+	))
+);
+
+const getNameRows = createSelector(
+	getSortedRowsArray,
+	(rows) => rows.map((row, index) => ({ ...row, index })).filter(({ dataType }) => (
+		dataType === 'Names'
+	))
+);
+
+export const customProps: DTCustomProps = {
+	panRows: getPANRows,
+	nameRows: getNameRows
+};
+
+export const actionInterceptors = {
+	// when a PAN plugin row is removed, clean up any region fields that may have been mapped to it
+	[REMOVE_ROW]: (rowId: string, rowState: Track1State, actionPayload: any): Track1State | null => {
+		if (actionPayload.id === rowState.targetPanRowId) {
+			return {
+				...rowState,
+				panSource: 'random',
+				targetPanRowId: ''
+			};
+		}
+		if (actionPayload.id === rowState.targetNameRowId) {
+			return {
+				...rowState,
+				nameSource: 'random',
+				targetNameRowId: ''
+			};
+		}
+		return null;
+	},
+
+	// when a user changes a PAN row to something else, update any Track1 mapping
+	[SELECT_DATA_TYPE]: (rowId: string, rowState: Track1State, actionPayload: any): Track1State | null => {
+		if (actionPayload.id === rowState.targetPanRowId) {
+			if (actionPayload.value !== 'PAN') {
+				return {
+					...rowState,
+					panSource: 'random',
+					targetPanRowId: ''
+				};
+			}
+		}
+		if (actionPayload.id === rowState.targetNameRowId) {
+			if (actionPayload.value !== 'Names') {
+				return {
+					...rowState,
+					nameSource: 'random',
+					targetNameRowId: ''
+				};
+			}
+		}
+		return null;
+	}
+};
diff --git a/packages/plugins/src/dataTypes/Track1/Track1.tsx b/packages/plugins/src/dataTypes/Track1/Track1.tsx
new file mode 100644
index 000000000..fa60cc3de
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/Track1.tsx
@@ -0,0 +1,187 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import styles from './Track1.scss';
+
+const Track1Dialog = ({
+  visible,
+  data,
+  id,
+  panRows,
+  nameRows,
+  onClose,
+  onUpdatePANSource,
+  onUpdateNameSource,
+  onUpdateRowSource,
+  coreI18n,
+  i18n
+}: any) => {
+  const getPanSourceDropdown = (): JSX.Element | null => {
+    if (data.panSource !== 'row') {
+      return null;
+    }
+
+    const panRowOptions = panRows.map(({ id, title, index }: any) => ({
+      value: id,
+      label: `${i18n.row} #${index + 1}: ${title}`
+    }));
+
+    return (
+      <Dropdown
+        value={data.targetPanRowId}
+        onChange={({ value }: DropdownOption): void => onUpdateRowSource('targetPanRowId', value)}
+        options={panRowOptions}
+      />
+    );
+  };
+
+  const getNameSourceDropdown = (): JSX.Element | null => {
+    if (data.nameSource !== 'row') {
+      return null;
+    }
+
+    const nameRowOptions = nameRows.map(({ title, id, index }: any) => ({
+      value: id,
+      label: `${i18n.row} #${index + 1}: ${title}`
+    }));
+
+    return (
+      <Dropdown
+        value={data.targetNameRowId}
+        onChange={({ value }: DropdownOption): void => onUpdateRowSource('targetNameRowId', value)}
+        options={nameRowOptions}
+      />
+    );
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ maxWidth: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.dialogTitle}</DialogTitle>
+        <DialogContent dividers>
+          <div>{i18n.dialogDesc}</div>
+
+          <h3>{i18n.panSource}</h3>
+
+          <RadioPillRow>
+            <RadioPill
+              label={i18n.randomString}
+              onClick={(): void => onUpdatePANSource('random')}
+              name={`${id}-panSource`}
+              checked={data.panSource === 'random'}
+              style={{ marginRight: 10 }}
+            />
+            <RadioPill
+              label={i18n.panRow}
+              onClick={(): void => onUpdatePANSource('row')}
+              name={`${id}-panSource`}
+              checked={data.panSource === 'row'}
+              tooltip={i18n.countryPluginsDesc}
+              disabled={panRows.length === 0}
+            />
+          </RadioPillRow>
+
+          {getPanSourceDropdown()}
+
+          <h3>{i18n.nameSource}</h3>
+
+          <RadioPillRow>
+            <RadioPill
+              label={i18n.randomString}
+              onClick={(): void => onUpdateNameSource('random')}
+              name={`${id}-nameSource`}
+              checked={data.nameSource === 'random'}
+              style={{ marginRight: 10 }}
+            />
+            <RadioPill
+              label={i18n.nameRow}
+              onClick={(): void => onUpdateNameSource('row')}
+              name={`${id}-nameSource`}
+              checked={data.nameSource === 'row'}
+              tooltip={i18n.countryPluginsDesc}
+              disabled={nameRows.length === 0}
+            />
+          </RadioPillRow>
+
+          {getNameSourceDropdown()}
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ i18n, coreI18n, countryI18n, panRows, nameRows, id, data, onUpdate }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+
+  const onUpdateSource = (prop: string, value: any): void => {
+    const newValues = {
+      ...data,
+      [prop]: value
+    };
+
+    // always autoselect the first PAN/Name row when switching to a row as the source
+    if (prop === 'panSource') {
+      newValues.targetPanRowId = value === 'row' ? panRows[0].id : '';
+    } else if (prop === 'nameSource') {
+      newValues.targetNameRowId = value === 'row' ? nameRows[0].id : '';
+    }
+
+    onUpdate(newValues);
+  };
+
+  let label = i18n.customizeSource;
+  if (data.targetPanRowId !== '' && data.targetNameRowId !== '') {
+    const { index: panIndex } = panRows.find((row: any) => row.id === data.targetPanRowId);
+    const { index: nameIndex } = nameRows.find((row: any) => row.id === data.targetNameRowId);
+    label = `${i18n.panRow}: #${panIndex + 1}, ${i18n.nameRow}: #${nameIndex + 1}`;
+  } else if (data.targetPanRowId !== '') {
+    const { index } = panRows.find((row: any) => row.id === data.targetPanRowId);
+    label = `${i18n.panRow}: #${index + 1}`;
+  } else if (data.targetNameRowId !== '') {
+    const row = nameRows.find((row: any) => row.id === data.targetNameRowId);
+    label = `${i18n.nameRow}: #${row.index + 1}`;
+  }
+
+  return (
+    <div className={styles.buttonLabel}>
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        <span dangerouslySetInnerHTML={{ __html: label }} />
+      </Button>
+      <Track1Dialog
+        visible={dialogVisible}
+        data={data}
+        panRows={panRows}
+        nameRows={nameRows}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        countryI18n={countryI18n}
+        onUpdateRowSource={(section: any, value: any): void => onUpdateSource(section, value)}
+        onUpdatePANSource={(value: any): void => onUpdateSource('panSource', value)}
+        onUpdateNameSource={(value: any): void => onUpdateSource('nameSource', value)}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.DESC}</p>;
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'varchar(255)',
+    field_Oracle: 'varchar2(255)',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/Track1/Track1.worker.ts b/packages/plugins/src/dataTypes/Track1/Track1.worker.ts
new file mode 100644
index 000000000..55fb15d54
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/Track1.worker.ts
@@ -0,0 +1,12 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Track1.generate';
+
+let utilsLoaded = false;
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Track1/__tests__/Track1.ui.test.tsx b/packages/plugins/src/dataTypes/Track1/__tests__/Track1.ui.test.tsx
new file mode 100644
index 000000000..b328d9eb7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/__tests__/Track1.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../Track1';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps} />);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Track1/bundle.ts b/packages/plugins/src/dataTypes/Track1/bundle.ts
new file mode 100644
index 000000000..e2b707dd1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/bundle.ts
@@ -0,0 +1,15 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, Options, getMetadata } from './Track1';
+import { customProps, actionInterceptors } from './Track1.store';
+import { initialState } from './Track1.state';
+
+const bundle: DTBundle = {
+	Help,
+	Options,
+	initialState,
+	customProps,
+	actionInterceptors,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Track1/config.ts b/packages/plugins/src/dataTypes/Track1/config.ts
new file mode 100644
index 000000000..97b61515e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/config.ts
@@ -0,0 +1,9 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'financial',
+  fieldGroupOrder: 70,
+  dependencies: ['PAN', 'Names']
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/ar.json b/packages/plugins/src/dataTypes/Track1/i18n/ar.json
new file mode 100644
index 000000000..1cd822572
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/ar.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track1",
+  "DESC": "المسار 1 هو تنسيق بيانات يستخدم لتخزين المعلومات على أشرطة البطاقة الممغنطة. يحتوي على اسم حامل البطاقة بالإضافة إلى رقم الحساب والبيانات التقديرية الأخرى. قد تكون بطاقة الائتمان من أي نوع (Visa ، Mastercard ، إلخ).",
+  "DEFAULT_TITLE": "المسار رقم 1",
+  "dialogTitle": "مصدر بيانات المسار 1",
+  "dialogDesc": "يتيح لك هذا استهداف الحقول الأخرى لإنشاء قيم Track1 أكثر واقعية. بشكل افتراضي ، يقوم بإنشاء سلاسل عشوائية لأجزاء PAN والاسم ، لذا فإن توفير صفوف المصدر الفعلية يضمن قيمة Track1 صالحة ومتسقة.",
+  "panSource": "مصدر PAN",
+  "randomString": "سلسلة عشوائية",
+  "panRow": "صف PAN",
+  "nameRow": "صف الاسم",
+  "row": "صف",
+  "nameSource": "مصدر الاسم",
+  "customizeSource": "تخصيص المصدر"
+}
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/de.json b/packages/plugins/src/dataTypes/Track1/i18n/de.json
new file mode 100644
index 000000000..fa0f72d94
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/de.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track1",
+  "DESC": "Track1 ist ein Datenformat, in dem Informationen auf Magnetkartenstreifen gespeichert werden. Es enthält den Namen des Karteninhabers sowie die Kontonummer und andere diskretionäre Daten. Die Kreditkarte kann von einem beliebigen Typ sein (Visa, Mastercard usw.).",
+  "DEFAULT_TITLE": "Lied1",
+  "dialogTitle": "Track1-Datenquelle",
+  "dialogDesc": "Auf diese Weise können Sie auf andere Felder zielen, um realistischere Track1-Werte zu erstellen. Standardmäßig werden beliebige Zeichenfolgen für die PAN- und Namensteile generiert, sodass durch die Angabe der tatsächlichen Quellzeilen ein gültiger und konsistenter Track1-Wert sichergestellt wird.",
+  "panSource": "PAN-Quelle",
+  "randomString": "Zufällige Zeichenfolge",
+  "panRow": "PAN-Reihe",
+  "nameRow": "Namenszeile",
+  "row": "Reihe",
+  "nameSource": "Namensquelle",
+  "customizeSource": "Quelle anpassen"
+}
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/en.json b/packages/plugins/src/dataTypes/Track1/i18n/en.json
new file mode 100644
index 000000000..ad01f5ecb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/en.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track1",
+  "DESC": "Track1 is a data format used to store information on magnetic card stripes. It contains the cardholder's name as well as account number and other discretionary data. The credit card may be of any type (Visa, Mastercard, etc).",
+  "DEFAULT_TITLE": "track1",
+  "dialogTitle": "Track1 Data Source",
+  "dialogDesc": "This lets you target other fields to create more realistic Track1 values. By default it generates arbitrary strings for the PAN and name parts, so supplying actual rows generating that data ensures a valid and consistent Track1 value.",
+  "panSource": "PAN source",
+  "randomString": "Random string",
+  "panRow": "PAN row",
+  "nameRow": "Name row",
+  "row": "Row",
+  "nameSource": "Name source",
+  "customizeSource": "Customize source"
+}
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/es.json b/packages/plugins/src/dataTypes/Track1/i18n/es.json
new file mode 100644
index 000000000..a05033620
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/es.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track1",
+  "DESC": "Track1 es un formato de datos que se utiliza para almacenar información en bandas de tarjetas magnéticas. Contiene el nombre del titular de la tarjeta, así como el número de cuenta y otros datos discrecionales. La tarjeta de crédito puede ser de cualquier tipo (Visa, Mastercard, etc).",
+  "DEFAULT_TITLE": "track1",
+  "dialogTitle": "Fuente de datos Track1",
+  "dialogDesc": "Esto le permite apuntar a otros campos para crear valores Track1 más realistas. De forma predeterminada, genera cadenas arbitrarias para el PAN y las partes del nombre, por lo que el suministro de filas de origen reales garantiza un valor Track1 válido y consistente.",
+  "panSource": "Fuente PAN",
+  "randomString": "Cadena aleatoria",
+  "panRow": "Fila PAN",
+  "nameRow": "Fila de nombre",
+  "row": "Fila",
+  "nameSource": "Fuente de nombre",
+  "customizeSource": "Personalizar fuente"
+}
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/fr.json b/packages/plugins/src/dataTypes/Track1/i18n/fr.json
new file mode 100644
index 000000000..3bd4774ca
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/fr.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track1",
+  "DESC": "Track1 est un format de données utilisé pour stocker des informations sur des bandes de cartes magnétiques. Il contient le nom du titulaire de la carte ainsi que le numéro de compte et d'autres données discrétionnaires. La carte de crédit peut être de tout type (Visa, Mastercard, etc.).",
+  "DEFAULT_TITLE": "track1",
+  "dialogTitle": "Source de données Track1",
+  "dialogDesc": "Cela vous permet de cibler d'autres champs pour créer des valeurs Track1 plus réalistes. Par défaut, il génère des chaînes arbitraires pour les parties PAN et nom, de sorte que la fourniture de lignes source réelles garantit une valeur Track1 valide et cohérente.",
+  "panSource": "Source PAN",
+  "randomString": "Chaîne aléatoire",
+  "panRow": "Rangée PAN",
+  "nameRow": "Ligne de nom",
+  "row": "Rangée",
+  "nameSource": "Nom de la source",
+  "customizeSource": "Personnaliser la source"
+}
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/hi.json b/packages/plugins/src/dataTypes/Track1/i18n/hi.json
new file mode 100644
index 000000000..0aec4cdd0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/hi.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track1",
+  "DESC": "Track1 एक डेटा प्रारूप है जिसका उपयोग चुंबकीय कार्ड धारियों पर जानकारी संग्रहीत करने के लिए किया जाता है। इसमें कार्डधारक का नाम के साथ-साथ खाता संख्या और अन्य विवेकाधीन डेटा शामिल हैं। क्रेडिट कार्ड किसी भी प्रकार का हो सकता है (वीज़ा, मास्टरकार्ड, आदि)।",
+  "DEFAULT_TITLE": "track1",
+  "dialogTitle": "ट्रैक1 डेटा स्रोत",
+  "dialogDesc": "यह आपको अधिक यथार्थवादी Track1 मान बनाने के लिए अन्य क्षेत्रों को लक्षित करने देता है। डिफ़ॉल्ट रूप से यह पैन और नाम भागों के लिए मनमाना तार उत्पन्न करता है, इसलिए उस डेटा को उत्पन्न करने वाली वास्तविक पंक्तियों की आपूर्ति एक वैध और सुसंगत Track1 मान सुनिश्चित करती है।",
+  "panSource": "पैन स्रोत",
+  "randomString": "यादृच्छिक स्ट्रिंग",
+  "panRow": "PAN पंक्ति",
+  "nameRow": "नाम पंक्ति",
+  "row": "पंक्ति",
+  "nameSource": "नाम स्रोत",
+  "customizeSource": "स्रोत को अनुकूलित करें"
+}
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/ja.json b/packages/plugins/src/dataTypes/Track1/i18n/ja.json
new file mode 100644
index 000000000..8e17dde54
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/ja.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track1",
+  "DESC": "トラック1は、磁気カードストライプに情報を保存するために使用されるデータ形式です。 カード所有者の名前、口座番号、その他の任意のデータが含まれています。 クレジットカードはどのタイプでもかまいません（Visa、Mastercardなど）。",
+  "DEFAULT_TITLE": "track1",
+  "dialogTitle": "Track1データソース",
+  "dialogDesc": "これにより、他のフィールドをターゲットにして、より現実的なTrack1値を作成できます。 デフォルトでは、PANと名前の部分に任意の文字列が生成されるため、実際のソース行を指定すると、有効で一貫性のあるTrack1値が保証されます。",
+  "panSource": "PANソース",
+  "randomString": "ランダムな文字列",
+  "panRow": "PAN行",
+  "nameRow": "名前の行",
+  "row": "行",
+  "nameSource": "名前の出典",
+  "customizeSource": "ソースをカスタマイズする"
+}
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/nl.json b/packages/plugins/src/dataTypes/Track1/i18n/nl.json
new file mode 100644
index 000000000..051598689
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/nl.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track1",
+  "DESC": "Track1 is een gegevensformaat dat wordt gebruikt om informatie op magnetische kaartstrips op te slaan. Het bevat zowel de naam van de kaarthouder als het rekeningnummer en andere discretionaire gegevens. De creditcard kan van elk type zijn (Visa, Mastercard, enz.).",
+  "DEFAULT_TITLE": "Spoor1",
+  "dialogTitle": "Track1-gegevensbron",
+  "dialogDesc": "Hierdoor kunt u zich op andere velden richten om realistischere Track1-waarden te creëren. Standaard genereert het willekeurige strings voor de PAN- en naamgedeelten, dus het leveren van werkelijke bronrijen zorgt voor een geldige en consistente Track1-waarde.",
+  "panSource": "PAN-bron",
+  "randomString": "Willekeurige tekenreeks",
+  "panRow": "PAN-rij",
+  "nameRow": "Naam rij",
+  "row": "Rij",
+  "nameSource": "Naam bron",
+  "customizeSource": "Pas de bron aan"
+}
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/pt.json b/packages/plugins/src/dataTypes/Track1/i18n/pt.json
new file mode 100644
index 000000000..3a3067ecd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/pt.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track1",
+  "DESC": "Track1 é um formato de dados usado para armazenar informações em tarjas magnéticas de cartões. Ele contém o nome do titular do cartão, bem como o número da conta e outros dados discricionários. O cartão de crédito pode ser de qualquer tipo (Visa, Mastercard, etc).",
+  "DEFAULT_TITLE": "track1",
+  "dialogTitle": "Fonte de dados Track1",
+  "dialogDesc": "Isso permite que você direcione outros campos para criar valores Track1 mais realistas. Por padrão, ele gera strings arbitrárias para o PAN e as partes do nome, portanto, o fornecimento de linhas reais que geram esses dados garante um valor Track1 válido e consistente.",
+  "panSource": "Fonte PAN",
+  "randomString": "String aleatória",
+  "panRow": "Linha PAN",
+  "nameRow": "Linha de nome",
+  "row": "Linha",
+  "nameSource": "Fonte do nome",
+  "customizeSource": "Personalizar fonte"
+}
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/ru.json b/packages/plugins/src/dataTypes/Track1/i18n/ru.json
new file mode 100644
index 000000000..50d8bf6c0
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/ru.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track1",
+  "DESC": "Track1 — это формат данных, используемый для хранения информации на полосах магнитных карт. Он содержит имя держателя карты, а также номер счета и другие необязательные данные. Кредитная карта может быть любого типа (Visa, Mastercard и т.д.).",
+  "DEFAULT_TITLE": "track1",
+  "dialogTitle": "Источник данных Track1",
+  "dialogDesc": "Это позволяет настроить другие поля для создания более реалистичных значений Track1. По умолчанию он генерирует произвольные строки для части PAN и имени, поэтому предоставление фактических строк, генерирующих эти данные, гарантирует правильное и согласованное значение Track1.",
+  "panSource": "Источник PAN",
+  "randomString": "Случайная строка",
+  "panRow": "ПАНОРАМИРОВАНИЕ строки",
+  "nameRow": "Строка имени",
+  "row": "Строка",
+  "nameSource": "Источник имени",
+  "customizeSource": "Настроить источник"
+}
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/ta.json b/packages/plugins/src/dataTypes/Track1/i18n/ta.json
new file mode 100644
index 000000000..14d6887d7
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/ta.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track 1",
+  "DESC": "Track1 என்பது காந்த அட்டை கோடுகளில் தகவல்களை சேமிக்க பயன்படுத்தப்படும் தரவு வடிவமாகும். இது அட்டைதாரரின் பெயர் மற்றும் கணக்கு எண் மற்றும் பிற விருப்ப தரவுகளைக் கொண்டுள்ளது. கிரெடிட் கார்டு எந்த வகையிலும் இருக்கலாம் (விசா, மாஸ்டர்கார்டு போன்றவை).",
+  "DEFAULT_TITLE": "track1",
+  "dialogTitle": "ட்ராக் 1 தரவு மூல",
+  "dialogDesc": "இது மிகவும் யதார்த்தமான ட்ராக் 1 மதிப்புகளை உருவாக்க பிற புலங்களை குறிவைக்க உங்களை அனுமதிக்கிறது. முன்னிருப்பாக இது பான் மற்றும் பெயர் பகுதிகளுக்கு தன்னிச்சையான சரங்களை உருவாக்குகிறது, எனவே உண்மையான மூல வரிசைகளை வழங்குவது சரியான மற்றும் நிலையான ட்ராக் 1 மதிப்பை உறுதி செய்கிறது.",
+  "panSource": "PAN மூல",
+  "randomString": "சீரற்ற சரம்",
+  "panRow": "PAN வரிசை",
+  "nameRow": "பெயர் வரிசை",
+  "row": "வரிசை",
+  "nameSource": "பெயர் மூல",
+  "customizeSource": "மூலத்தைத் தனிப்பயனாக்குங்கள்"
+}
diff --git a/packages/plugins/src/dataTypes/Track1/i18n/zh.json b/packages/plugins/src/dataTypes/Track1/i18n/zh.json
new file mode 100644
index 000000000..dd382a032
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track1/i18n/zh.json
@@ -0,0 +1,14 @@
+{
+  "NAME": "Track1",
+  "DESC": "磁道1是一种用于在磁卡条带上存储信息的数据格式。 它包含持卡人的姓名，帐号和其他可自行决定的数据。 信用卡可以是任何类型（Visa，Mastercard等）。",
+  "DEFAULT_TITLE": "track1",
+  "dialogTitle": "Track1数据源",
+  "dialogDesc": "这使您可以将其他字段作为目标以创建更逼真的Track1值。 默认情况下，它将为PAN和名称部分生成任意字符串，因此提供实际的源行可确保有效且一致的Track1值。",
+  "panSource": "PAN源",
+  "randomString": "随机字符串",
+  "panRow": "PAN行",
+  "nameRow": "姓名行",
+  "row": "排",
+  "nameSource": "名称来源",
+  "customizeSource": "自订来源"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/README.md b/packages/plugins/src/dataTypes/Track2/README.md
new file mode 100644
index 000000000..a7f50077c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/README.md
@@ -0,0 +1,30 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; Track2
+
+This Data Type generates a random Track2 number.
+
+
+### Example API Usage
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "Track2",
+            "title": "track 2"
+        }
+    ],
+    "export": {
+        "type": "JSON",
+        "settings": {
+            "stripWhitespace": false,
+            "dataStructureFormat": "complex"
+        }
+    }
+}
+```
+ 
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/dataTypes/Track2/Track2.generate.ts b/packages/plugins/src/dataTypes/Track2/Track2.generate.ts
new file mode 100644
index 000000000..d896c7f69
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/Track2.generate.ts
@@ -0,0 +1,57 @@
+/**
+ * @author Ben Keen <ben.keen@gmail.com>, original code Zeeshan Shaikh <zeeshanyshaikh@gmail.com>
+ */
+import { DTGenerationData, DTGenerateResult } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+/*
+	Source - http://en.wikipedia.org/wiki/Magnetic_stripe_card#Financial_cards
+
+	- Start sentinel: one character (generally ';')
+	- Primary account number (PAN): up to 19 characters. Usually, but not always, matches the credit card
+	  number printed on the front of the card.
+	- Separator: one char (generally '=')
+	- Expiration date: four characters in the form YYMM.
+	- Service code: three digits. The first digit specifies the interchange rules, the second specifies
+		authorisation processing and the third specifies the range of services
+	- Discretionary data: as in track one
+	- End sentinel: one character (generally '?')
+	- Longitudinal redundancy check (LRC): it is one character and a validity character calculated from
+		other data on the track.
+	- Most reader devices do not return this value when the card is swiped to the presentation layer, and
+		use it only to verify the input internally to the reader.
+*/
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { panSource, targetPanRowId } = data.rowState;
+
+  let pan = '';
+  if (panSource === 'random') {
+    pan = utils.randomUtils.generateRandomAlphanumericStr('Xxxxxxxxxxxxxxxx');
+  } else {
+    const found = data.existingRowData.find(({ id }) => id === targetPanRowId);
+    if (found) {
+      pan = found.data.display as string;
+    }
+  }
+
+  const panWithoutSpaces = pan.replace(/[^\d]/g, '');
+
+  const randYear = utils.stringUtils.padString(utils.randomUtils.getRandomNum(0, 99), 2);
+  const randMonth = utils.stringUtils.padString(utils.randomUtils.getRandomNum(1, 12), 2);
+  const date = `${randYear}${randMonth}`;
+  const serviceCode = utils.randomUtils.getRandomNum(111, 999);
+
+  // could be more efficient
+  const discretionaryData = [
+    utils.randomUtils.getRandomNum(1, 9),
+    utils.randomUtils.getRandomNum(111, 999),
+    utils.randomUtils.getRandomNum(1111, 9999)
+  ];
+  const index = utils.randomUtils.getRandomNum(0, 2);
+  const dataItem = discretionaryData[index];
+  const lrc = utils.randomUtils.getRandomCharInString(' 123456789');
+
+  return {
+    display: `%B${panWithoutSpaces}=${date}${serviceCode}${dataItem}?${lrc}`
+  };
+};
diff --git a/packages/plugins/src/dataTypes/Track2/Track2.scss b/packages/plugins/src/dataTypes/Track2/Track2.scss
new file mode 100644
index 000000000..a013c6a46
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/Track2.scss
@@ -0,0 +1,3 @@
+.buttonLabel {
+	margin-top: 4px;
+}
diff --git a/packages/plugins/src/dataTypes/Track2/Track2.scss.d.ts b/packages/plugins/src/dataTypes/Track2/Track2.scss.d.ts
new file mode 100644
index 000000000..7150370cd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/Track2.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace Track2ScssNamespace {
+  export interface ITrack2Scss {
+    buttonLabel: string;
+  }
+}
+
+declare const Track2ScssModule: Track2ScssNamespace.ITrack2Scss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: Track2ScssNamespace.ITrack2Scss;
+};
+
+export = Track2ScssModule;
diff --git a/packages/plugins/src/dataTypes/Track2/Track2.state.tsx b/packages/plugins/src/dataTypes/Track2/Track2.state.tsx
new file mode 100644
index 000000000..fb246ad62
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/Track2.state.tsx
@@ -0,0 +1,15 @@
+export type Track2Source = 'row' | 'random';
+
+export type Track2State = {
+	panSource: Track2Source;
+	targetPanRowId: string;
+}
+
+export const initialState: Track2State = {
+	panSource: 'random',
+	targetPanRowId: '',
+};
+
+export const defaultGenerationOptions = initialState;
+
+export type GenerationOptionsType = Track2State;
diff --git a/packages/plugins/src/dataTypes/Track2/Track2.store.tsx b/packages/plugins/src/dataTypes/Track2/Track2.store.tsx
new file mode 100644
index 000000000..295f2aefc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/Track2.store.tsx
@@ -0,0 +1,46 @@
+import { createSelector } from 'reselect';
+import { DTCustomProps } from '~types/dataTypes';
+import { getSortedRowsArray } from '~store/generator/generator.selectors';
+import { Track2State } from './Track2.state';
+import { REMOVE_ROW, SELECT_DATA_TYPE } from '~store/generator/generator.actions';
+
+// this defines a custom selector that extracts information about the country fields, needed by this component. The
+// core script handles processing this and passing it back via a `countryRows` prop to our Options component
+const getPANRows = createSelector(
+	getSortedRowsArray,
+	(rows) => rows.map((row, index) => ({ ...row, index })).filter(({ dataType }) => (
+		dataType === 'PAN'
+	))
+);
+
+export const customProps: DTCustomProps = {
+	panRows: getPANRows
+};
+
+export const actionInterceptors = {
+	// when a PAN plugin row is removed, clean up any region fields that may have been mapped to it
+	[REMOVE_ROW]: (rowId: string, rowState: Track2State, actionPayload: any): Track2State | null => {
+		if (actionPayload.id === rowState.targetPanRowId) {
+			return {
+				...rowState,
+				panSource: 'random',
+				targetPanRowId: ''
+			};
+		}
+		return null;
+	},
+
+	// when a user changes a PAN row to something else, update any Track1 mapping
+	[SELECT_DATA_TYPE]: (rowId: string, rowState: Track2State, actionPayload: any): Track2State | null => {
+		if (actionPayload.id === rowState.targetPanRowId) {
+			if (actionPayload.value !== 'PAN') {
+				return {
+					...rowState,
+					panSource: 'random',
+					targetPanRowId: ''
+				};
+			}
+		}
+		return null;
+	}
+};
diff --git a/packages/plugins/src/dataTypes/Track2/Track2.tsx b/packages/plugins/src/dataTypes/Track2/Track2.tsx
new file mode 100644
index 000000000..e922307c5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/Track2.tsx
@@ -0,0 +1,122 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import { DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import styles from './Track2.scss';
+
+const Track2Dialog = ({ visible, data, id, panRows, onClose, onUpdatePANSource, onUpdateRowSource, coreI18n, i18n }: any) => {
+  const getPanSourceDropdown = (): JSX.Element | null => {
+    if (data.panSource !== 'row') {
+      return null;
+    }
+
+    const panRowOptions = panRows.map(({ id, title, index }: any) => ({
+      value: id,
+      label: `${i18n.row} #${index + 1}: ${title}`
+    }));
+
+    return (
+      <Dropdown
+        value={data.targetPanRowId}
+        onChange={({ value }: DropdownOption): void => onUpdateRowSource('targetPanRowId', value)}
+        options={panRowOptions}
+      />
+    );
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ maxWidth: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.dialogTitle}</DialogTitle>
+        <DialogContent dividers>
+          <div>{i18n.dialogDesc}</div>
+
+          <h3>{i18n.panSource}</h3>
+
+          <RadioPillRow>
+            <RadioPill
+              label={i18n.randomString}
+              onClick={(): void => onUpdatePANSource('random')}
+              name={`${id}-panSource`}
+              checked={data.panSource === 'random'}
+            />
+            <RadioPill
+              label={i18n.panRow}
+              onClick={(): void => onUpdatePANSource('row')}
+              name={`${id}-panSource`}
+              checked={data.panSource === 'row'}
+              tooltip={i18n.countryPluginsDesc}
+              disabled={panRows.length === 0}
+            />
+          </RadioPillRow>
+
+          {getPanSourceDropdown()}
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ i18n, coreI18n, countryI18n, panRows, id, data, onUpdate }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+
+  const onUpdateSource = (prop: string, value: any): void => {
+    const newValues = {
+      ...data,
+      [prop]: value
+    };
+
+    // always autoselect the first Country row when switching to `Country Row` as the source
+    if (prop === 'panSource') {
+      newValues.targetPanRowId = value === 'row' ? panRows[0].id : '';
+    }
+
+    onUpdate(newValues);
+  };
+
+  let label = i18n.customizeSource;
+  if (data.targetPanRowId !== '') {
+    const { index: panIndex } = panRows.find((row: any) => row.id === data.targetPanRowId);
+    label = `${i18n.panRow}: #${panIndex + 1}`;
+  }
+
+  return (
+    <div className={styles.buttonLabel}>
+      <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small">
+        <span dangerouslySetInnerHTML={{ __html: label }} />
+      </Button>
+      <Track2Dialog
+        visible={dialogVisible}
+        data={data}
+        panRows={panRows}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        countryI18n={countryI18n}
+        onUpdateRowSource={(section: any, value: any): void => onUpdateSource(section, value)}
+        onUpdatePANSource={(value: any): void => onUpdateSource('panSource', value)}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </div>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => <p>{i18n.DESC}</p>;
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'varchar(255)',
+    field_Oracle: 'varchar2(255)',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
diff --git a/packages/plugins/src/dataTypes/Track2/Track2.worker.ts b/packages/plugins/src/dataTypes/Track2/Track2.worker.ts
new file mode 100644
index 000000000..290fbee6f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/Track2.worker.ts
@@ -0,0 +1,15 @@
+/**
+ * @author Ben Keen <ben.keen@gmail.com>, original code Zeeshan Shaikh <zeeshanyshaikh@gmail.com>
+ */
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './Track2.generate';
+
+let utilsLoaded = false;
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/Track2/__tests__/Track2.ui.test.tsx b/packages/plugins/src/dataTypes/Track2/__tests__/Track2.ui.test.tsx
new file mode 100644
index 000000000..1b31d75bd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/__tests__/Track2.ui.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { Help } from '../Track2';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	coreI18n: {},
+	countryI18n: {},
+	i18n
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps} />);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/dataTypes/Track2/bundle.ts b/packages/plugins/src/dataTypes/Track2/bundle.ts
new file mode 100644
index 000000000..76ee44b52
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/bundle.ts
@@ -0,0 +1,15 @@
+import { DTBundle } from '~types/dataTypes';
+import { Help, Options, getMetadata } from './Track2';
+import { customProps, actionInterceptors } from './Track2.store';
+import { initialState } from './Track2.state';
+
+const bundle: DTBundle = {
+	Help,
+	Options,
+	initialState,
+	customProps,
+	actionInterceptors,
+	getMetadata
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/Track2/config.ts b/packages/plugins/src/dataTypes/Track2/config.ts
new file mode 100644
index 000000000..a82794516
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/config.ts
@@ -0,0 +1,9 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'financial',
+  fieldGroupOrder: 80,
+  dependencies: ['PAN']
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/ar.json b/packages/plugins/src/dataTypes/Track2/i18n/ar.json
new file mode 100644
index 000000000..de31b6f4c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/ar.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "المسار 2 هو تنسيق بيانات يستخدم لتخزين المعلومات على أشرطة البطاقة الممغنطة. يحتوي على رقم حساب حامل البطاقة ورقم التعريف الشخصي المشفر والبيانات التقديرية الأخرى. قد تكون بطاقة الائتمان من أي نوع (Visa ، Mastercard ، إلخ).",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "مصدر بيانات Track2",
+  "dialogDesc": "يتيح لك هذا استهداف صف PAN لإنشاء قيم Track2 أكثر واقعية. بشكل افتراضي ، يقوم بإنشاء سلاسل عشوائية لـ PAN ، لذا فإن توفير صف PAN فعلي يضمن قيمة Track2 صالحة ومتسقة.",
+  "panSource": "مصدر PAN",
+  "randomString": "سلسلة عشوائية",
+  "panRow": "صف PAN",
+  "row": "صف",
+  "customizeSource": "تخصيص المصدر"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/de.json b/packages/plugins/src/dataTypes/Track2/i18n/de.json
new file mode 100644
index 000000000..8a6d0579b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/de.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "Track2 ist ein Datenformat, in dem Informationen auf Magnetkartenstreifen gespeichert werden. Es enthält die Kontonummer des Karteninhabers, die verschlüsselte PIN und andere diskretionäre Daten. Die Kreditkarte kann von einem beliebigen Typ sein (Visa, Mastercard usw.).",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "Track2-Datenquelle",
+  "dialogDesc": "Auf diese Weise können Sie eine PAN-Zeile als Ziel festlegen, um realistischere Track2-Werte zu erstellen. Standardmäßig werden beliebige Zeichenfolgen für die PAN generiert, sodass durch die Angabe einer tatsächlichen PAN-Zeile ein gültiger und konsistenter Track2-Wert sichergestellt wird.",
+  "panSource": "PAN-Quelle",
+  "randomString": "Zufällige Zeichenfolge",
+  "panRow": "PAN-Reihe",
+  "row": "Reihe",
+  "customizeSource": "Quelle anpassen"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/en.json b/packages/plugins/src/dataTypes/Track2/i18n/en.json
new file mode 100644
index 000000000..d6fe62a7e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/en.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "Track2 is a data format used to store information on magnetic card stripes. It contains the cardholder's account number, encrypted PIN and other discretionary data. The credit card may be of any type (Visa, Mastercard, etc).",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "Track2 Data Source",
+  "dialogDesc": "This lets you target a PAN row to create more realistic Track2 values. By default it generates arbitrary strings for the PAN, so supplying an actual PAN row ensures a valid and consistent Track2 value.",
+  "panSource": "PAN source",
+  "randomString": "Random string",
+  "panRow": "PAN row",
+  "row": "Row",
+  "customizeSource": "Customize source"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/es.json b/packages/plugins/src/dataTypes/Track2/i18n/es.json
new file mode 100644
index 000000000..d89428102
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/es.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "Track2 es un formato de datos que se utiliza para almacenar información en bandas de tarjetas magnéticas. Contiene el número de cuenta del titular de la tarjeta, el PIN cifrado y otros datos discrecionales. La tarjeta de crédito puede ser de cualquier tipo (Visa, Mastercard, etc).",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "Fuente de datos Track2",
+  "dialogDesc": "Esto le permite apuntar a una fila PAN para crear valores Track2 más realistas. De forma predeterminada, genera cadenas arbitrarias para el PAN, por lo que el suministro de una fila PAN real garantiza un valor Track2 válido y consistente.",
+  "panSource": "Fuente PAN",
+  "randomString": "Cadena aleatoria",
+  "panRow": "Fila PAN",
+  "row": "Fila",
+  "customizeSource": "Personalizar fuente"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/fr.json b/packages/plugins/src/dataTypes/Track2/i18n/fr.json
new file mode 100644
index 000000000..b9d2ab935
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/fr.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "Track2 est un format de données utilisé pour stocker des informations sur des bandes de cartes magnétiques. Il contient le numéro de compte du titulaire de la carte, le code PIN crypté et d'autres données discrétionnaires. La carte de crédit peut être de tout type (Visa, Mastercard, etc.).",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "Source de données Track2",
+  "dialogDesc": "Cela vous permet de cibler une ligne PAN pour créer des valeurs Track2 plus réalistes. Par défaut, il génère des chaînes arbitraires pour le PAN, de sorte que la fourniture d'une ligne PAN réelle garantit une valeur Track2 valide et cohérente.",
+  "panSource": "Source PAN",
+  "randomString": "Chaîne aléatoire",
+  "panRow": "Rangée PAN",
+  "row": "Rangée",
+  "customizeSource": "Personnaliser la source"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/hi.json b/packages/plugins/src/dataTypes/Track2/i18n/hi.json
new file mode 100644
index 000000000..bfeea5cf5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/hi.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "Track2 एक डेटा प्रारूप है जिसका उपयोग चुंबकीय कार्ड धारियों पर जानकारी संग्रहीत करने के लिए किया जाता है। इसमें कार्डधारक का खाता नंबर, एन्क्रिप्टेड पिन और अन्य विवेकाधीन डेटा होता है। क्रेडिट कार्ड किसी भी प्रकार का हो सकता है (वीज़ा, मास्टरकार्ड, आदि)।",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "Track2 डेटा स्रोत",
+  "dialogDesc": "यह आपको अधिक यथार्थवादी Track2 मान बनाने के लिए पैन पंक्ति को लक्षित करने देता है। डिफ़ॉल्ट रूप से यह पैन के लिए मनमाना तार उत्पन्न करता है, इसलिए वास्तविक पैन पंक्ति की आपूर्ति एक वैध और सुसंगत Track2 मान सुनिश्चित करती है।",
+  "panSource": "PAN स्रोत",
+  "randomString": "यादृच्छिक स्ट्रिंग",
+  "panRow": "PAN पंक्ति",
+  "row": "पंक्ति",
+  "customizeSource": "स्रोत को अनुकूलित करें"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/ja.json b/packages/plugins/src/dataTypes/Track2/i18n/ja.json
new file mode 100644
index 000000000..57c6cb1d8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/ja.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "Track2は、磁気カードストライプに情報を保存するために使用されるデータ形式です。 カード所有者のアカウント番号、暗号化されたPIN、およびその他の任意のデータが含まれています。 クレジットカードはどのタイプでもかまいません（Visa、Mastercardなど）。",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "Track2データソース",
+  "dialogDesc": "これにより、PAN行をターゲットにして、より現実的なTrack2値を作成できます。 デフォルトでは、PANに対して任意の文字列が生成されるため、実際のPAN行を指定すると、有効で一貫性のあるTrack2値が保証されます。",
+  "panSource": "PANソース",
+  "randomString": "ランダムな文字列",
+  "panRow": "PAN行",
+  "row": "行",
+  "customizeSource": "ソースをカスタマイズする"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/nl.json b/packages/plugins/src/dataTypes/Track2/i18n/nl.json
new file mode 100644
index 000000000..d0ba95d5c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/nl.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "Track2は、磁気カードストライプに情報を保存するために使用されるデータ形式です。 カード所有者のアカウント番号、暗号化されたPIN、およびその他の任意のデータが含まれています。 クレジットカードはどのタイプでもかまいません（Visa、Mastercardなど）。",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "Track2-gegevensbron",
+  "dialogDesc": "Hiermee kunt u een PAN-rij targeten om meer realistische Track2-waarden te creëren. Standaard genereert het willekeurige strings voor de PAN, dus het leveren van een werkelijke PAN-rij zorgt voor een geldige en consistente Track2-waarde.",
+  "panSource": "PAN-bron",
+  "randomString": "Willekeurige tekenreeks",
+  "panRow": "PAN-rij",
+  "row": "Rij",
+  "customizeSource": "Pas de bron aan"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/pt.json b/packages/plugins/src/dataTypes/Track2/i18n/pt.json
new file mode 100644
index 000000000..523cebb17
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/pt.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "Track2 é um formato de dados usado para armazenar informações em tarjas magnéticas de cartões. Ele contém o número da conta do titular do cartão, PIN criptografado e outros dados discricionários. O cartão de crédito pode ser de qualquer tipo (Visa, Mastercard, etc).",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "Fonte de dados Track2",
+  "dialogDesc": "Isso permite que você direcione uma linha PAN para criar valores Track2 mais realistas. Por padrão, ele gera sequências arbitrárias para o PAN, portanto, fornecer uma linha PAN real garante um valor Track2 válido e consistente.",
+  "panSource": "Fonte PAN",
+  "randomString": "String aleatória",
+  "panRow": "Linha PAN",
+  "row": "Linha",
+  "customizeSource": "Personalizar fonte"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/ru.json b/packages/plugins/src/dataTypes/Track2/i18n/ru.json
new file mode 100644
index 000000000..43a29a243
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/ru.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "Track2 — это формат данных, используемый для хранения информации на полосах магнитных карт. Он содержит номер счета держателя карты, зашифрованный PIN-код и другие необязательные данные. Кредитная карта может быть любого типа (Visa, Mastercard и т.д.).",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "Источник данных Track2",
+  "dialogDesc": "Это позволяет нацеливать строку PAN для создания более реалистичных значений Track2. По умолчанию он генерирует произвольные строки для PAN, поэтому предоставление фактической строки PAN обеспечивает допустимое и согласованное значение Track2.",
+  "panSource": "Источник PAN",
+  "randomString": "Случайная строка",
+  "panRow": "PAN строка",
+  "row": "Cтрока",
+  "customizeSource": "Настроить источник"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/ta.json b/packages/plugins/src/dataTypes/Track2/i18n/ta.json
new file mode 100644
index 000000000..98b35a21a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/ta.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "ட்ராக் 2 என்பது காந்த அட்டை கோடுகளில் தகவல்களைச் சேமிக்கப் பயன்படுத்தப்படும் தரவு வடிவமாகும். இது அட்டைதாரரின் கணக்கு எண், மறைகுறியாக்கப்பட்ட பின் மற்றும் பிற விருப்ப தரவுகளைக் கொண்டுள்ளது. கிரெடிட் கார்டு எந்த வகையிலும் இருக்கலாம் (விசா, மாஸ்டர்கார்டு போன்றவை).",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "ட்ராக் 2 தரவு மூல",
+  "dialogDesc": "இது மிகவும் யதார்த்தமான ட்ராக் 2 மதிப்புகளை உருவாக்க பான் வரிசையை குறிவைக்க உங்களை அனுமதிக்கிறது. முன்னிருப்பாக இது பானுக்கான தன்னிச்சையான சரங்களை உருவாக்குகிறது, எனவே உண்மையான பான் வரிசையை வழங்குவது சரியான மற்றும் நிலையான ட்ராக் 2 மதிப்பை உறுதி செய்கிறது.",
+  "panSource": "பான் மூல",
+  "randomString": "சீரற்ற சரம்",
+  "panRow": "பான் வரிசை",
+  "row": "வரிசை",
+  "customizeSource": "மூலத்தைத் தனிப்பயனாக்குங்கள்"
+}
diff --git a/packages/plugins/src/dataTypes/Track2/i18n/zh.json b/packages/plugins/src/dataTypes/Track2/i18n/zh.json
new file mode 100644
index 000000000..009a6e69f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/Track2/i18n/zh.json
@@ -0,0 +1,12 @@
+{
+  "NAME": "Track2",
+  "DESC": "Track2是用于在磁卡条带上存储信息的数据格式。 它包含持卡人的帐号，加密的PIN和其他任意数据。 信用卡可以是任何类型（Visa，Mastercard等）。",
+  "DEFAULT_TITLE": "track2",
+  "dialogTitle": "Track2数据源",
+  "dialogDesc": "这使您可以将PAN行作为目标，以创建更逼真的Track值。 默认情况下，它将为PAN生成任意字符串，因此提供实际的PAN行可确保有效且一致的Track2值。",
+  "panSource": "PAN源",
+  "randomString": "随机字符串",
+  "panRow": "PAN行",
+  "row": "排",
+  "customizeSource": "自订来源"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/README.md b/packages/plugins/src/dataTypes/URLs/README.md
new file mode 100644
index 000000000..f3a8d9edd
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/README.md
@@ -0,0 +1,3 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; URLs
+
+This Data Type generates random URLs.
diff --git a/packages/plugins/src/dataTypes/URLs/URLs.generate.ts b/packages/plugins/src/dataTypes/URLs/URLs.generate.ts
new file mode 100644
index 000000000..56fc11af2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/URLs.generate.ts
@@ -0,0 +1,33 @@
+import { DTGenerationData, DTGenerateResult } from '~types/dataTypes';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const {
+    protocolEnabled,
+    protocolOptions,
+    hostnameEnabled,
+    hostnameOptions,
+    pathEnabled,
+    pathOptions,
+    queryParamsEnabled,
+    queryParamsOptions
+  } = data.rowState;
+
+  let url = '';
+  if (protocolEnabled) {
+    url += utils.randomUtils.getRandomArrayValue(protocolOptions);
+  }
+  if (hostnameEnabled) {
+    url += utils.randomUtils.getRandomArrayValue(hostnameOptions);
+  }
+  if (pathEnabled) {
+    url += '/' + utils.randomUtils.getRandomArrayValue(pathOptions);
+  }
+  if (queryParamsEnabled) {
+    url += '?' + utils.randomUtils.getRandomArrayValue(queryParamsOptions);
+  }
+
+  return {
+    display: url
+  };
+};
diff --git a/packages/plugins/src/dataTypes/URLs/URLs.scss b/packages/plugins/src/dataTypes/URLs/URLs.scss
new file mode 100644
index 000000000..516eb85ad
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/URLs.scss
@@ -0,0 +1,38 @@
+.buttonLabel {
+	margin-top: 3px;
+}
+
+.settingsRow {
+	display: flex;
+	height: 34px;
+
+	.firstCol {
+		flex: 0 0 160px;
+	}
+	.secondCol {
+		flex: 1;
+
+		input {
+			width: 100%;
+		}
+	}
+}
+
+.enabledSection {
+	color: black;
+}
+
+.disabledSection {
+	color: #cccccc;
+}
+
+.optionsView {
+	background-color: #f2f2f2;
+	padding: 8px;
+	margin: 0 0 10px;
+	border-radius: 3px;
+
+	pre {
+		margin: 0;
+	}
+}
diff --git a/packages/plugins/src/dataTypes/URLs/URLs.scss.d.ts b/packages/plugins/src/dataTypes/URLs/URLs.scss.d.ts
new file mode 100644
index 000000000..4fc9ec21c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/URLs.scss.d.ts
@@ -0,0 +1,18 @@
+declare namespace UrLsScssNamespace {
+  export interface IUrLsScss {
+    buttonLabel: string;
+    disabledSection: string;
+    enabledSection: string;
+    firstCol: string;
+    optionsView: string;
+    secondCol: string;
+    settingsRow: string;
+  }
+}
+
+declare const UrLsScssModule: UrLsScssNamespace.IUrLsScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: UrLsScssNamespace.IUrLsScss;
+};
+
+export = UrLsScssModule;
diff --git a/packages/plugins/src/dataTypes/URLs/URLs.state.tsx b/packages/plugins/src/dataTypes/URLs/URLs.state.tsx
new file mode 100644
index 000000000..62258f16c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/URLs.state.tsx
@@ -0,0 +1,38 @@
+export type URLsState = {
+  example: string;
+  protocolEnabled: boolean;
+  protocolOptions: string;
+  hostnameEnabled: boolean;
+  hostnameOptions: string;
+  pathEnabled: boolean;
+  pathOptions: string;
+  queryParamsEnabled: boolean;
+  queryParamsOptions: string;
+};
+
+export type GenerationOptionsType = {
+  protocolEnabled: boolean;
+  protocolOptions: string[];
+  hostnameEnabled: boolean;
+  hostnameOptions: string[];
+  pathEnabled: boolean;
+  pathOptions: string[];
+  queryParamsEnabled: boolean;
+  queryParamsOptions: string[];
+};
+
+export const defaultGenerationOptions = {
+  protocolEnabled: true,
+  protocolOptions: 'http://,https://',
+  hostnameEnabled: true,
+  hostnameOptions: 'facebook.com,google.com,instagram.com,bbc.co.uk,guardian.co.uk,nytimes.com,cnn.com,youtube.com,wikipedia.org,netflix.com,x.com,whatsapp.com,zoom.us,reddit.com,naver.com,pinterest.com,yahoo.com,baidu.com,walmart.com,ebay.com',
+  pathEnabled: false,
+  pathOptions: 'one,sub/cars,group/9,site,en-us,en-ca,fr,settings,sub,user/110',
+  queryParamsEnabled: false,
+  queryParamsOptions: 'search=1,page=1&offset=1,q=test,client=g,ad=115,gi=100,p=8,ab=441&aad=2,g=1,str=se,k=0,q=4,q=11,q=0,search=1&q=de'
+};
+
+export const initialState: URLsState = {
+  example: '',
+  ...defaultGenerationOptions
+};
diff --git a/packages/plugins/src/dataTypes/URLs/URLs.tsx b/packages/plugins/src/dataTypes/URLs/URLs.tsx
new file mode 100644
index 000000000..56e948c30
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/URLs.tsx
@@ -0,0 +1,200 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import { DTExampleProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import Dropdown from '~components/dropdown/Dropdown';
+import CheckboxPill from '~components/pills/CheckboxPill';
+import { URLsState, GenerationOptionsType, initialState } from './URLs.state';
+import styles from './URLs.scss';
+
+export const Example = ({ data, onUpdate }: DTExampleProps) => {
+  const onChange = (value: any): void => {
+    const parts = value.split(',');
+
+    onUpdate({
+      ...data,
+      example: value,
+      protocolEnabled: parts.indexOf('protocol') !== -1,
+      hostnameEnabled: parts.indexOf('hostname') !== -1,
+      pathEnabled: parts.indexOf('path') !== -1,
+      queryParamsEnabled: parts.indexOf('queryparams') !== -1
+    });
+  };
+
+  const options = [
+    { value: 'protocol,hostname', label: 'protocol://hostname' },
+    { value: 'protocol', label: 'protocol://' },
+    { value: 'hostname', label: 'hostname' },
+    { value: 'protocol,hostname,path', label: 'protocol://hostname/path' },
+    { value: 'protocol,hostname,path,queryparams', label: 'protocol://hostname/path?queryparams' },
+    { value: 'protocol,hostname,queryparams', label: 'protocol://hostname/?queryparams' },
+    { value: 'queryparams', label: '?queryparams' }
+  ];
+
+  return <Dropdown value={data.example} onChange={(i: any): void => onChange(i.value)} options={options} />;
+};
+
+const URLsDialog = ({ visible, data, id, onClose, onUpdate, coreI18n, i18n }: any) => {
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.NAME}</DialogTitle>
+        <DialogContent dividers>
+          <div>{i18n.optionsDesc}</div>
+
+          <h3>{coreI18n.options}</h3>
+
+          <blockquote className={styles.optionsView}>
+            <pre>
+              <span className={data.protocolEnabled ? styles.enabledSection : styles.disabledSection}>protocol://</span>
+              <span className={data.hostnameEnabled ? styles.enabledSection : styles.disabledSection}>hostname</span>
+              <span className={data.pathEnabled ? styles.enabledSection : styles.disabledSection}>/path</span>
+              <span className={data.queryParamsEnabled ? styles.enabledSection : styles.disabledSection}>?queryparams</span>
+            </pre>
+          </blockquote>
+
+          <div>
+            <div className={styles.settingsRow}>
+              <div className={styles.firstCol}>
+                <CheckboxPill
+                  label={i18n.protocol}
+                  onClick={(): void => onUpdate({ ...data, protocolEnabled: !data.protocolEnabled })}
+                  name={`protocol-${id}`}
+                  checked={data.protocolEnabled}
+                />
+              </div>
+              <div className={styles.secondCol}>
+                <input
+                  type="text"
+                  value={data.protocolOptions}
+                  onChange={(e): void => onUpdate({ ...data, protocolOptions: e.target.value })}
+                  disabled={!data.protocolEnabled}
+                />
+              </div>
+            </div>
+            <div className={styles.settingsRow}>
+              <div className={styles.firstCol}>
+                <CheckboxPill
+                  label={i18n.hostname}
+                  onClick={(): void => onUpdate({ ...data, hostnameEnabled: !data.hostnameEnabled })}
+                  name={`hostname-${id}`}
+                  checked={data.hostnameEnabled}
+                />
+              </div>
+              <div className={styles.secondCol}>
+                <input
+                  type="text"
+                  value={data.hostnameOptions}
+                  onChange={(e): void => onUpdate({ ...data, hostnameOptions: e.target.value })}
+                  disabled={!data.hostnameEnabled}
+                />
+              </div>
+            </div>
+            <div className={styles.settingsRow}>
+              <div className={styles.firstCol}>
+                <CheckboxPill
+                  label={i18n.path}
+                  onClick={(): void => onUpdate({ ...data, pathEnabled: !data.pathEnabled })}
+                  name={`path-${id}`}
+                  checked={data.pathEnabled}
+                />
+              </div>
+              <div className={styles.secondCol}>
+                <input
+                  type="text"
+                  value={data.pathOptions}
+                  onChange={(e): void => onUpdate({ ...data, pathOptions: e.target.value })}
+                  disabled={!data.pathEnabled}
+                />
+              </div>
+            </div>
+            <div className={styles.settingsRow}>
+              <div className={styles.firstCol}>
+                <CheckboxPill
+                  label={i18n.queryParams}
+                  onClick={(): void => onUpdate({ ...data, queryParamsEnabled: !data.queryParamsEnabled })}
+                  name={`queryParams-${id}`}
+                  checked={data.queryParamsEnabled}
+                />
+              </div>
+              <div className={styles.secondCol}>
+                <input
+                  type="text"
+                  value={data.queryParamsOptions}
+                  onChange={(e): void => onUpdate({ ...data, queryParamsOptions: e.target.value })}
+                  disabled={!data.queryParamsEnabled}
+                />
+              </div>
+            </div>
+          </div>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ i18n, id, coreI18n, data, onUpdate }: DTOptionsProps) => {
+  const [visible, setDialogVisibility] = React.useState(false);
+
+  return (
+    <>
+      <Button
+        onClick={(): void => setDialogVisibility(true)}
+        variant="outlined"
+        color="primary"
+        size="small"
+        className={styles.buttonLabel}
+      >
+        {coreI18n.options}
+      </Button>
+      <URLsDialog
+        visible={visible}
+        id={id}
+        data={data}
+        onUpdate={onUpdate}
+        coreI18n={coreI18n}
+        onClose={(): void => setDialogVisibility(false)}
+        i18n={i18n}
+      />
+    </>
+  );
+};
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'string'
+  },
+  sql: {
+    field: 'varchar(255)',
+    field_Oracle: 'varchar2(255)',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
+
+export const cleanListWithBackup = (listStr: string, backup: string): string[] => {
+  const list: string[] = [];
+  listStr.split(',').forEach((item) => {
+    const cleanItem = item.trim();
+    if (cleanItem) {
+      list.push(cleanItem);
+    }
+  });
+  return list.length ? list : backup.split(',');
+};
+
+// clean up the UI data so the generator script doesn't have to worry about it on every call
+export const rowStateReducer = (state: URLsState): GenerationOptionsType => ({
+  protocolEnabled: state.protocolEnabled,
+  protocolOptions: cleanListWithBackup(state.protocolOptions, initialState.protocolOptions),
+  hostnameEnabled: state.hostnameEnabled,
+  hostnameOptions: cleanListWithBackup(state.hostnameOptions, initialState.hostnameOptions),
+  pathEnabled: state.pathEnabled,
+  pathOptions: cleanListWithBackup(state.pathOptions, initialState.pathOptions),
+  queryParamsEnabled: state.queryParamsEnabled,
+  queryParamsOptions: cleanListWithBackup(state.queryParamsOptions, initialState.queryParamsOptions)
+});
diff --git a/packages/plugins/src/dataTypes/URLs/URLs.worker.ts b/packages/plugins/src/dataTypes/URLs/URLs.worker.ts
new file mode 100644
index 000000000..2a652b54c
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/URLs.worker.ts
@@ -0,0 +1,12 @@
+import utils from '../../../utils';
+import { generate } from './URLs.generate';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+
+let utilsLoaded = false;
+export const onmessage = (e: DTWorkerOnMessage): void => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/URLs/__tests__/URLs.test.tsx b/packages/plugins/src/dataTypes/URLs/__tests__/URLs.test.tsx
new file mode 100644
index 000000000..91c7ac47e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/__tests__/URLs.test.tsx
@@ -0,0 +1,51 @@
+import { cleanListWithBackup } from '../URLs';
+
+describe('cleanListWithBackup', () => {
+	it('converts list of comma-delimited spaces to an array', () => {
+		const items = 'one,two,three';
+		expect(cleanListWithBackup(items, '')).toEqual([
+			'one',
+			'two',
+			'three'
+		]);
+	});
+
+	it('removes whitespace around items', () => {
+		const items = 'one, two, three,      four,five';
+		expect(cleanListWithBackup(items, '')).toEqual([
+			'one',
+			'two',
+			'three',
+			'four',
+			'five'
+		]);
+	});
+
+	it('removes completely empty elements', () => {
+		const items = 'one, two, ,          ,,three';
+		expect(cleanListWithBackup(items, '')).toEqual([
+			'one',
+			'two',
+			'three',
+		]);
+	});
+
+	it('if everything is empty, relies on backup string', () => {
+		const items = '';
+		expect(cleanListWithBackup(items, 'backup,values,here')).toEqual([
+			'backup',
+			'values',
+			'here',
+		]);
+	});
+
+	it('if everything is empty, relies on backup string #2', () => {
+		const items = ', , , , , ,,,,,,,';
+		expect(cleanListWithBackup(items, 'backup,values,here')).toEqual([
+			'backup',
+			'values',
+			'here',
+		]);
+	});
+
+});
diff --git a/packages/plugins/src/dataTypes/URLs/bundle.ts b/packages/plugins/src/dataTypes/URLs/bundle.ts
new file mode 100644
index 000000000..97105cf82
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/bundle.ts
@@ -0,0 +1,13 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, getMetadata, rowStateReducer } from './URLs';
+import { initialState } from './URLs.state';
+
+const bundle: DTBundle = {
+	Example,
+	Options,
+	initialState,
+	getMetadata,
+	rowStateReducer
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/URLs/config.ts b/packages/plugins/src/dataTypes/URLs/config.ts
new file mode 100644
index 000000000..1085c8184
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'other',
+  fieldGroupOrder: 50
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/ar.json b/packages/plugins/src/dataTypes/URLs/i18n/ar.json
new file mode 100644
index 000000000..19eae3ef2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/ar.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "عناوين المواقع",
+  "DESC": "يقوم نوع البيانات هذا بإنشاء عناوين URL عشوائية ، مما يسمح لك بإنشاء عنوان URL كامل باستخدام البروتوكول واسم المضيف واسم المسار ومعلمات الاستعلام. بدلاً من ذلك ، يمكنك إنشاء أي مجموعة فرعية من هذه الخيارات.",
+  "DEFAULT_TITLE": "عنوان url",
+  "optionsDesc": "استخدم الحقول أدناه لتخصيص تنسيق عناوين URL التي تم إنشاؤها بواسطة هذا الحقل. تحتوي الحقول النصية على خيارات مفصولة بفواصل سيتم استخدامها لهذا القسم من عنوان URL.",
+  "protocol": "بروتوكول",
+  "hostname": "اسم المضيف",
+  "path": "طريق",
+  "queryParams": "معلمات الاستعلام"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/de.json b/packages/plugins/src/dataTypes/URLs/i18n/de.json
new file mode 100644
index 000000000..f5d4d1b3f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/de.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "URLs",
+  "DESC": "Dieser Datentyp generiert zufällige URLs, sodass Sie eine vollständige URL mit Protokoll, Hostname, Pfadname und Abfrageparametern generieren können. Alternativ können Sie eine beliebige Teilmenge dieser Optionen generieren.",
+  "DEFAULT_TITLE": "URL",
+  "optionsDesc": "Verwenden Sie die Felder unten, um das Format der von diesem Feld generierten URLs anzupassen. Die Textfelder enthalten durch Kommas getrennte Optionen, die für diesen Abschnitt der URL verwendet werden.",
+  "protocol": "Protokoll",
+  "hostname": "Hostname",
+  "path": "Weg",
+  "queryParams": "Parameter abfragen"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/en.json b/packages/plugins/src/dataTypes/URLs/i18n/en.json
new file mode 100644
index 000000000..7db510728
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/en.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "URLs",
+  "DESC": "This Data Type generates random URLs, allowing you to generate a full URL with protocol, hostname, pathname and query params. Alternatively, you can generated any subset of those options.",
+  "DEFAULT_TITLE": "url",
+  "optionsDesc": "Use the fields below to customize the format of the URLs generated by this field. The text fields contain comma-delimited options that will be used for that section of the URL.",
+  "protocol": "Protocol",
+  "hostname": "Hostname",
+  "path": "Path",
+  "queryParams": "Query Params"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/es.json b/packages/plugins/src/dataTypes/URLs/i18n/es.json
new file mode 100644
index 000000000..9344d3ab1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/es.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "URLs",
+  "DESC": "Este tipo de datos genera direcciones URL aleatorias, lo que le permite generar una dirección URL completa con protocolo, nombre de host, nombre de ruta y parámetros de consulta. Alternativamente, puede generar cualquier subconjunto de esas opciones.",
+  "DEFAULT_TITLE": "URL",
+  "optionsDesc": "Utilice los campos a continuación para personalizar el formato de las URL generadas por este campo. Los campos de texto contienen opciones delimitadas por comas que se utilizarán para esa sección de la URL.",
+  "protocol": "Protocolo",
+  "hostname": "Nombre de host",
+  "path": "Sendero",
+  "queryParams": "Paráms de consulta"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/fr.json b/packages/plugins/src/dataTypes/URLs/i18n/fr.json
new file mode 100644
index 000000000..5084d5259
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/fr.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "URLs",
+  "DESC": "Ce type de données génère des URL aléatoires, vous permettant de générer une URL complète avec les paramètres de protocole, de nom d'hôte, de chemin et de requête. Alternativement, vous pouvez générer n'importe quel sous-ensemble de ces options.",
+  "DEFAULT_TITLE": "url",
+  "optionsDesc": "Utilisez les champs ci-dessous pour personnaliser le format des URL générées par ce champ. Les champs de texte contiennent des options délimitées par des virgules qui seront utilisées pour cette section de l'URL.",
+  "protocol": "Protocole",
+  "hostname": "Nom d'hôte",
+  "path": "Chemin",
+  "queryParams": "Param de requête"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/hi.json b/packages/plugins/src/dataTypes/URLs/i18n/hi.json
new file mode 100644
index 000000000..09783738a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/hi.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "यूआरएल",
+  "DESC": "यह डेटा प्रकार यादृच्छिक यूआरएल उत्पन्न करता है, जिससे आप प्रोटोकॉल, होस्टनाम, पथनाम और क्वेरी पैरामीटर के साथ एक पूर्ण यूआरएल उत्पन्न कर सकते हैं। वैकल्पिक रूप से, आप उन विकल्पों में से कोई भी सबसेट जेनरेट कर सकते हैं।",
+  "DEFAULT_TITLE": "यूआरएल",
+  "optionsDesc": "इस फ़ील्ड द्वारा उत्पन्न URL के प्रारूप को अनुकूलित करने के लिए नीचे दिए गए फ़ील्ड का उपयोग करें। टेक्स्ट फ़ील्ड में अल्पविराम-सीमांकित विकल्प होते हैं जिनका उपयोग URL के उस अनुभाग के लिए किया जाएगा।",
+  "protocol": "शिष्टाचार",
+  "hostname": "होस्ट का नाम",
+  "path": "पथ",
+  "queryParams": "क्वेरी पैराम्स"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/ja.json b/packages/plugins/src/dataTypes/URLs/i18n/ja.json
new file mode 100644
index 000000000..9770c9fa8
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/ja.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "URL",
+  "DESC": "このデータ型はランダムなURLを生成し、プロトコル、ホスト名、パス名、クエリパラメータを含む完全なURLを生成できるようにします。 または、これらのオプションのサブセットを生成することもできます。",
+  "DEFAULT_TITLE": "url",
+  "optionsDesc": "以下のフィールドを使用して、このフィールドによって生成されるURLの形式をカスタマイズします。 テキストフィールドには、URLのそのセクションで使用されるコンマ区切りのオプションが含まれています。",
+  "protocol": "プロトコル",
+  "hostname": "ホスト名",
+  "path": "道",
+  "queryParams": "クエリパラメータ"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/nl.json b/packages/plugins/src/dataTypes/URLs/i18n/nl.json
new file mode 100644
index 000000000..944208984
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/nl.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "URL's",
+  "DESC": "Dit gegevenstype genereert willekeurige URL's, zodat u een volledige URL kunt genereren met protocol-, hostnaam, padnaam en queryparameters. Als alternatief kunt u een subset van die opties genereren.",
+  "DEFAULT_TITLE": "url",
+  "optionsDesc": "Gebruik de onderstaande velden om de indeling aan te passen van de URL's die door dit veld worden gegenereerd. De tekstvelden bevatten door komma's gescheiden opties die voor dat gedeelte van de URL worden gebruikt.",
+  "protocol": "Protocol",
+  "hostname": "Hostnaam",
+  "path": "Pad",
+  "queryParams": "Queryparameters"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/pt.json b/packages/plugins/src/dataTypes/URLs/i18n/pt.json
new file mode 100644
index 000000000..ea4f9779d
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/pt.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "URLs",
+  "DESC": "Este tipo de dados gera URLs aleatórios, permitindo que você gere um URL completo com protocolo, nome de host, nome de caminho e parâmetros de consulta. Como alternativa, você pode gerar qualquer subconjunto dessas opções.",
+  "DEFAULT_TITLE": "URL",
+  "optionsDesc": "Use os campos abaixo para personalizar o formato das URLs geradas por este campo. Os campos de texto contêm opções delimitadas por vírgulas que serão usadas para essa seção da URL.",
+  "protocol": "Protocolo",
+  "hostname": "Nome de anfitrião",
+  "path": "Caminho",
+  "queryParams": "Parâmetros de consulta"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/ru.json b/packages/plugins/src/dataTypes/URLs/i18n/ru.json
new file mode 100644
index 000000000..01676c435
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/ru.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "URLs",
+  "DESC": "Этот тип данных генерирует случайные URL-адреса, позволяя вам создать полный URL-адрес с протоколом, именем хоста, путем и параметрами запроса. Кроме того, вы можете сгенерировать любое подмножество этих опций.",
+  "DEFAULT_TITLE": "url",
+  "optionsDesc": "Используйте поля ниже, чтобы настроить формат URL-адресов, генерируемых этим полем. Текстовые поля содержат параметры, разделенные запятыми, которые будут использоваться для этого раздела URL-адреса.",
+  "protocol": "Протокол",
+  "hostname": "Имя хоста",
+  "path": "Дорожка",
+  "queryParams": "Параметры запроса"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/ta.json b/packages/plugins/src/dataTypes/URLs/i18n/ta.json
new file mode 100644
index 000000000..f3b646558
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/ta.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "URLகள்",
+  "DESC": "இந்த தரவு வகை சீரற்ற URLகளை உருவாக்குகிறது, இது நெறிமுறை, ஹோஸ்ட்பெயர், பாதை பெயர் மற்றும் வினவல் அளவுருக்களுடன் முழு URL ஐ உருவாக்க அனுமதிக்கிறது. மாற்றாக, அந்த விருப்பங்களின் எந்த துணைக்குழுவையும் நீங்கள் உருவாக்கலாம்.",
+  "DEFAULT_TITLE": "url",
+  "optionsDesc": "இந்தப் புலத்தால் உருவாக்கப்பட்ட URLகளின் வடிவமைப்பைத் தனிப்பயனாக்க, கீழே உள்ள புலங்களைப் பயன்படுத்தவும். உரைப் புலங்களில் கமாவால் பிரிக்கப்பட்ட விருப்பங்கள் உள்ளன, அவை URL இன் அந்தப் பிரிவிற்குப் பயன்படுத்தப்படும்.",
+  "protocol": "நெறிமுறை",
+  "hostname": "ஹோஸ்ட் பெயர்",
+  "path": "பாதை",
+  "queryParams": "வினவல் பரிமாணங்கள்"
+}
diff --git a/packages/plugins/src/dataTypes/URLs/i18n/zh.json b/packages/plugins/src/dataTypes/URLs/i18n/zh.json
new file mode 100644
index 000000000..ce4e8fec2
--- /dev/null
+++ b/packages/plugins/src/dataTypes/URLs/i18n/zh.json
@@ -0,0 +1,10 @@
+{
+  "NAME": "网址",
+  "DESC": "此数据类型生成随机 URL，允许您生成包含协议、主机名、路径名和查询参数的完整 URL。 或者，您可以生成这些选项的任何子集。",
+  "DEFAULT_TITLE": "网址",
+  "optionsDesc": "使用以下字段自定义此字段生成的 URL 的格式。 文本字段包含将用于 URL 的该部分的逗号分隔选项。",
+  "protocol": "协议",
+  "hostname": "主机名",
+  "path": "小路",
+  "queryParams": "查询参数"
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/README.md b/packages/plugins/src/dataTypes/WeightedList/README.md
new file mode 100644
index 000000000..f36c9c45a
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/README.md
@@ -0,0 +1,16 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Data Types](../README.md) &raquo; WeightedList
+
+This Data Type generates random item or items from a weighted list. A weighted list is just a list of items where each
+item has a certain probability of occurring, for example:
+
+```
+A: 5
+B: 10
+C: 5
+```
+
+In this instance, we have three list items: A, B and C, and the number next to them represent their weight. So B is 
+twice as likely to appear in the results as either A or C.
+
+## Examples
+
diff --git a/packages/plugins/src/dataTypes/WeightedList/WeightedList.generate.ts b/packages/plugins/src/dataTypes/WeightedList/WeightedList.generate.ts
new file mode 100644
index 000000000..1993ca2e9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/WeightedList.generate.ts
@@ -0,0 +1,28 @@
+import { DTGenerationData, DTGenerateResult } from '~types/dataTypes';
+import { WeightedListTypeEnum } from './WeightedList.state';
+import { WorkerUtils } from '../../';
+
+export const generate = (data: DTGenerationData, utils: WorkerUtils): DTGenerateResult => {
+  const { listType, values, exactly, betweenLow, betweenHigh, delimiter, allowDuplicates } = data.rowState;
+  const numValues = Object.keys(values).length;
+
+  let items: any = [];
+  if (listType === WeightedListTypeEnum.exactly) {
+    items = utils.randomUtils.getRandomWeightedSubset(values, exactly, allowDuplicates);
+  } else if (betweenLow && betweenHigh) {
+    const numItems = utils.randomUtils.getRandomNum(betweenLow, betweenHigh);
+    items = utils.randomUtils.getRandomWeightedSubset(values, numItems, allowDuplicates);
+  } else if (betweenLow) {
+    if (betweenLow <= numValues) {
+      const numItems = utils.randomUtils.getRandomNum(betweenLow, numValues);
+      items = utils.randomUtils.getRandomWeightedSubset(values, numItems, allowDuplicates);
+    }
+  } else if (betweenHigh !== '') {
+    const numItems = utils.randomUtils.getRandomNum(0, betweenHigh);
+    items = utils.randomUtils.getRandomWeightedSubset(values, numItems, allowDuplicates);
+  }
+
+  return {
+    display: items.join(delimiter)
+  };
+};
diff --git a/packages/plugins/src/dataTypes/WeightedList/WeightedList.scss b/packages/plugins/src/dataTypes/WeightedList/WeightedList.scss
new file mode 100644
index 000000000..5fbc30ba3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/WeightedList.scss
@@ -0,0 +1,103 @@
+.colLabel {
+	display: flex;
+	flex: 0 0 140px;
+	align-items: center;
+	margin-top: 5px;
+
+	svg {
+		margin-left: 5px;
+	}
+}
+
+.content {
+	flex: 1;
+	align-items: flex-start;
+
+	& > ul {
+		margin: 0;
+		padding: 0;
+		list-style-type: none;
+
+		li {
+			margin-bottom: 5px;
+		}
+	}
+}
+
+.row {
+	display: flex;
+	align-items: flex-start;
+	margin-bottom: 10px;
+}
+
+.listTable {
+	li {
+		display: flex;
+		width: 100%;
+		padding: 2px;
+
+		&:nth-child(odd) {
+			background: #efefef;
+		}
+	}
+	input {
+		width: 100%;
+	}
+	.valueCol {
+		width: 100%;
+		margin-right: 4px;
+	}
+	.weightCol {
+		width: 80px;
+	}
+	.delCol {
+		width: 40px;
+		margin-left: 4px;
+		align-self: center;
+		cursor: pointer;
+
+		&:hover {
+			svg {
+				fill: #990000;
+			}
+		}
+	}
+	.orderCol {
+		width: 25px;
+		font-weight: bold;
+		text-align: center;
+		align-self: center;
+	}
+}
+
+ul.listTableHeader {
+	li:nth-child(odd) {
+		background: transparent;
+	}
+}
+
+.listTableBody {
+	max-height: 200px;
+	overflow: scroll;
+}
+
+.addValueRow {
+	display: flex;
+	margin: 5px 0 10px;
+
+	label {
+		color: #999999;
+		display: block;
+		height: 20px;
+	}
+	input {
+		margin-right: 4px;
+	}
+	button {
+		padding: 5px 6px;
+	}
+}
+
+.allowDuplicatesCheckbox {
+	margin-top: 8px;
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/WeightedList.scss.d.ts b/packages/plugins/src/dataTypes/WeightedList/WeightedList.scss.d.ts
new file mode 100644
index 000000000..c8e6d1e14
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/WeightedList.scss.d.ts
@@ -0,0 +1,23 @@
+declare namespace WeightedListScssNamespace {
+  export interface IWeightedListScss {
+    addValueRow: string;
+    allowDuplicatesCheckbox: string;
+    colLabel: string;
+    content: string;
+    delCol: string;
+    listTable: string;
+    listTableBody: string;
+    listTableHeader: string;
+    orderCol: string;
+    row: string;
+    valueCol: string;
+    weightCol: string;
+  }
+}
+
+declare const WeightedListScssModule: WeightedListScssNamespace.IWeightedListScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: WeightedListScssNamespace.IWeightedListScss;
+};
+
+export = WeightedListScssModule;
diff --git a/packages/plugins/src/dataTypes/WeightedList/WeightedList.state.tsx b/packages/plugins/src/dataTypes/WeightedList/WeightedList.state.tsx
new file mode 100644
index 000000000..b3f656c98
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/WeightedList.state.tsx
@@ -0,0 +1,118 @@
+import { WeightedOptions } from '@generatedata/utils';
+
+export const convertListItemsToObj = (values: WeightedListItem[]): WeightedOptions => {
+  const valuesObj: WeightedOptions = {};
+  values.forEach(({ value, weight }: WeightedListItem) => {
+    valuesObj[value] = parseInt(weight, 10);
+  });
+
+  return valuesObj;
+};
+
+export const getWeightedListItems = (values: string[]): WeightedListItem[] =>
+  values.map((value) => {
+    const match = value.match(/^(.*):\s(\d+)$/) as string[];
+    return {
+      value: match[1],
+      weight: match[2]
+    };
+  });
+
+export const getWeightedListLabels = (values: WeightedListItem[]): string[] => values.map(({ value, weight }) => `${value}: ${weight}`);
+
+export const presets = {
+  evenOdd: {
+    values: [
+      { value: '1', weight: '1' },
+      { value: '2', weight: '2' },
+      { value: '3', weight: '1' },
+      { value: '4', weight: '2' },
+      { value: '5', weight: '1' },
+      { value: '6', weight: '2' },
+      { value: '7', weight: '1' },
+      { value: '8', weight: '2' },
+      { value: '9', weight: '1' },
+      { value: '10', weight: '2' }
+    ]
+  },
+  professions: {
+    values: [
+      { value: 'Astronaut', weight: '1' },
+      { value: 'Banker', weight: '5000' },
+      { value: 'Brain surgeon', weight: '1' },
+      { value: 'Cook', weight: '8000' },
+      { value: 'Fast food/counter worker', weight: '90000' },
+      { value: 'Musician', weight: '5000' },
+      { value: 'Retail salesperson', weight: '100000' },
+      { value: 'Software Developer', weight: '10000' },
+      { value: 'Surgeon', weight: '200' }
+    ]
+  },
+  householdPets: {
+    values: [
+      { value: 'Dog', weight: '50000' },
+      { value: 'Cat', weight: '35000' },
+      { value: 'Fish', weight: '10000' },
+      { value: 'Reptile', weight: '3700' },
+      { value: 'Bird', weight: '3500' },
+      { value: 'Rabbit', weight: '1500' },
+      { value: 'Capybara', weight: '1' },
+      { value: 'Sugar glider', weight: '1' },
+      { value: 'Prairie dog', weight: '1' },
+      { value: 'Pot-bellied pig', weight: '1' }
+    ]
+  }
+};
+
+export const enum WeightedListTypeEnum {
+  exactly = 'exactly',
+  between = 'between'
+}
+export type WeightedListType = `${WeightedListTypeEnum}`;
+
+export type WeightedListItem = {
+  value: string;
+  weight: string; // for convenience this is stored as a string, but when passed to
+};
+
+export type WeightedListState = {
+  example: string;
+  listType: WeightedListType;
+  exactly: string;
+  betweenLow: string;
+  betweenHigh: string;
+  allowDuplicates: boolean;
+  delimiter: string;
+  values: WeightedListItem[];
+};
+
+export type GenerationOptionsType = {
+  listType: WeightedListType;
+  exactly: string;
+  betweenLow: string;
+  betweenHigh: string;
+  allowDuplicates: boolean;
+  delimiter: string;
+  values: WeightedOptions;
+};
+
+export const defaultGenerationOptions: GenerationOptionsType = {
+  listType: 'exactly',
+  exactly: '1',
+  betweenLow: '',
+  betweenHigh: '',
+  allowDuplicates: true,
+  delimiter: ', ',
+  values: convertListItemsToObj(presets.evenOdd.values)
+};
+
+export const initialState: WeightedListState = {
+  example: 'even-odd',
+  listType: 'exactly',
+  exactly: '1',
+  betweenLow: '',
+  betweenHigh: '',
+  values: presets.evenOdd.values,
+  delimiter: ', ',
+  allowDuplicates: true
+};
diff --git a/packages/plugins/src/dataTypes/WeightedList/WeightedList.tsx b/packages/plugins/src/dataTypes/WeightedList/WeightedList.tsx
new file mode 100644
index 000000000..661769f76
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/WeightedList.tsx
@@ -0,0 +1,447 @@
+import * as React from 'react';
+import Button from '@mui/material/Button';
+import InfoIcon from '@mui/icons-material/InfoOutlined';
+import { DTExampleProps, DTHelpProps, DTMetadata, DTOptionsProps } from '~types/dataTypes';
+import Dropdown from '~components/dropdown/Dropdown';
+import TextField from '~components/TextField';
+import CreatablePillField from '~components/creatablePillField/CreatablePillField';
+import { Dialog, DialogActions, DialogContent, DialogTitle } from '~components/dialogs';
+import { Tooltip } from '~components/tooltips';
+import * as langUtils from '~utils/langUtils';
+import {
+  presets,
+  WeightedListTypeEnum,
+  WeightedListItem,
+  getWeightedListLabels,
+  getWeightedListItems,
+  WeightedListState,
+  GenerationOptionsType,
+  convertListItemsToObj
+} from './WeightedList.state';
+import * as styles from './WeightedList.scss';
+
+export const Example = ({ data, onUpdate, i18n }: DTExampleProps) => {
+  const onChange = (example: any): void => {
+    let values: WeightedListItem[] = [];
+    if (example === 'even-odd') {
+      values = presets.evenOdd.values;
+    } else if (example === 'professions') {
+      values = presets.professions.values;
+    } else if (example === 'household-pets') {
+      values = presets.householdPets.values;
+    }
+    onUpdate({
+      ...data,
+      example: example,
+      values
+    });
+  };
+
+  const options = [
+    { value: 'even-odd', label: i18n.mostlyEvenNumbers },
+    { value: 'professions', label: i18n.professions },
+    { value: 'household-pets', label: i18n.householdPets }
+  ];
+
+  return <Dropdown value={data.example} onChange={(i: any): void => onChange(i.value)} options={options} />;
+};
+
+const WeightedListDialog = ({ visible, data, id, onClose, onUpdate, coreI18n, i18n }: any) => {
+  const exactlyField = React.useRef<any>();
+  const dtListBetweenLow = React.useRef<any>();
+  const [showErrors, setShowErrors] = React.useState(false);
+  const [value, setValue] = React.useState('');
+  const [weight, setWeight] = React.useState('');
+  const [displayStrings, setDisplayStrings] = React.useState<string[]>([]);
+
+  const onChangeValue = (e: any): void => setValue(e.target.value);
+  const onChangeWeight = (e: any): void => setWeight(e.target.value);
+
+  React.useEffect(() => {
+    setDisplayStrings(getWeightedListLabels(data.values));
+  }, [data.values]);
+
+  const onChange = (field: string, value: any): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  const onAdd = (): void => {
+    setShowErrors(true);
+    if (value && weight) {
+      onUpdate({
+        ...data,
+        values: [...data.values, { value, weight }]
+      });
+      setShowErrors(false);
+      setValue('');
+      setWeight('');
+    }
+  };
+
+  const updateDelimiter = (e: any): void => {
+    onUpdate({
+      ...data,
+      delimiter: e.target.value
+    });
+  };
+
+  let exactlyError = '';
+  let betweenLowError = '';
+  let betweenHighError = '';
+  if (data.listType === WeightedListTypeEnum.exactly) {
+    if (!data.exactly) {
+      exactlyError = coreI18n.requiredField;
+    } else if (displayStrings.length < parseInt(data.exactly, 10)) {
+      exactlyError = i18n.listTooShort;
+    }
+  } else {
+    if (!data.betweenLow) {
+      betweenLowError = coreI18n.requiredField;
+    } else if (displayStrings.length < parseInt(data.betweenLow, 10)) {
+      betweenLowError = i18n.listTooShort;
+    }
+    if (!data.betweenHigh) {
+      betweenHighError = coreI18n.requiredField;
+    } else if (displayStrings.length < parseInt(data.betweenHigh, 10)) {
+      betweenHighError = i18n.listTooShort;
+    }
+  }
+
+  const onChangeList = (newValues: string[]): void => {
+    onUpdate({
+      ...data,
+      values: getWeightedListItems(newValues)
+    });
+  };
+
+  const updateAllowDuplicates = (e: any): void => {
+    onUpdate({
+      ...data,
+      allowDuplicates: e.target.checked
+    });
+  };
+
+  return (
+    <Dialog onClose={onClose} open={visible}>
+      <div style={{ width: 500 }}>
+        <DialogTitle onClose={onClose}>{i18n.weightedListSettings}</DialogTitle>
+        <DialogContent dividers>
+          <div className={styles.row}>
+            <div className={styles.colLabel}>
+              {i18n.numItemsLabel}
+              <Tooltip title={i18n.numItemsLabelDesc} arrow>
+                <InfoIcon />
+              </Tooltip>
+            </div>
+            <div className={styles.content}>
+              <ul>
+                <li>
+                  <input
+                    type="radio"
+                    id={`listType1-${id}`}
+                    value={WeightedListTypeEnum.exactly}
+                    checked={data.listType === WeightedListTypeEnum.exactly}
+                    onChange={(): void => {
+                      onChange('listType', WeightedListTypeEnum.exactly);
+                      exactlyField.current.focus();
+                    }}
+                  />
+                  <label htmlFor={`listType1-${id}`}>{i18n.exactly}</label>
+                  <TextField
+                    error={exactlyError}
+                    ref={exactlyField}
+                    type="intOnly"
+                    min={1}
+                    id={`dtListExactly_${id}`}
+                    value={data.exactly}
+                    style={{ margin: '0 6px 0 4px', width: 50 }}
+                    onChange={(e: any): void => {
+                      onUpdate({
+                        ...data,
+                        exactly: e.target.value,
+                        listType: WeightedListTypeEnum.exactly
+                      });
+                    }}
+                  />
+                </li>
+                <li>
+                  <input
+                    type="radio"
+                    id={`listType2-${id}`}
+                    value={WeightedListTypeEnum.between}
+                    checked={data.listType !== WeightedListTypeEnum.exactly}
+                    onChange={(): void => {
+                      onChange('listType', WeightedListTypeEnum.between);
+                      dtListBetweenLow.current.focus();
+                    }}
+                  />
+                  <label htmlFor={`listType2-${id}`}>{i18n.between}</label>
+                  <TextField
+                    ref={dtListBetweenLow}
+                    error={betweenLowError}
+                    type="intOnly"
+                    min={0}
+                    placeholder="-"
+                    id={`dtListBetweenLow${id}`}
+                    value={data.betweenLow}
+                    style={{ margin: '0 6px 0 4px', width: 50 }}
+                    onChange={(e: any): void => {
+                      onUpdate({
+                        ...data,
+                        betweenLow: e.target.value,
+                        listType: WeightedListTypeEnum.between
+                      });
+                    }}
+                  />
+                  {i18n.and}
+                  <TextField
+                    type="intOnly"
+                    error={betweenHighError}
+                    min={0}
+                    placeholder="-"
+                    id={`dtListBetweenHigh_${id}`}
+                    value={data.betweenHigh}
+                    style={{ margin: '0 6px 0 4px', width: 50 }}
+                    onChange={(e: any): void => {
+                      onUpdate({
+                        ...data,
+                        betweenHigh: e.target.value,
+                        listType: WeightedListTypeEnum.between
+                      });
+                    }}
+                  />
+                  {i18n.items}
+                </li>
+              </ul>
+            </div>
+          </div>
+          <div className={styles.row}>
+            <div className={styles.colLabel}>
+              {i18n.allowDuplicates}
+              <Tooltip title={i18n.allowDuplicatesDesc} arrow>
+                <InfoIcon />
+              </Tooltip>
+            </div>
+            <div className={styles.content}>
+              <input
+                type="checkbox"
+                checked={data.allowDuplicates}
+                onChange={updateAllowDuplicates}
+                className={styles.allowDuplicatesCheckbox}
+              />
+            </div>
+          </div>
+          <div className={styles.row}>
+            <div className={styles.colLabel}>
+              {i18n.delimChars}
+              <Tooltip title={i18n.delimCharsDesc} arrow>
+                <InfoIcon />
+              </Tooltip>
+            </div>
+            <div className={styles.content}>
+              <input type="text" style={{ width: 40 }} value={data.delimiter} onChange={updateDelimiter} />
+            </div>
+          </div>
+          <div className={styles.row}>
+            <div className={styles.colLabel}>{i18n.itemsTitle}</div>
+            <div className={styles.content}>
+              <form onSubmit={(e): void => e.preventDefault()}>
+                <div className={styles.addValueRow}>
+                  <div>
+                    <label>{i18n.value}</label>
+                    <TextField
+                      value={value}
+                      throttle={false}
+                      style={{ width: 150 }}
+                      error={showErrors ? coreI18n.requiredField : ''}
+                      onChange={onChangeValue}
+                    />
+                  </div>
+                  <div>
+                    <label>{i18n.weight}</label>
+                    <TextField
+                      type="number"
+                      value={weight}
+                      min={1}
+                      throttle={false}
+                      style={{ width: 80 }}
+                      error={showErrors ? coreI18n.requiredField : ''}
+                      onChange={onChangeWeight}
+                    />
+                  </div>
+                  <div>
+                    <label />
+                    <Button type="submit" onClick={onAdd} variant="outlined" color="primary" size="small">
+                      <span dangerouslySetInnerHTML={{ __html: i18n.addBtnLabel }} />
+                    </Button>
+                  </div>
+                </div>
+              </form>
+              <div>
+                {displayStrings.length ? (
+                  <CreatablePillField onChange={onChangeList} value={displayStrings} />
+                ) : (
+                  <p>{i18n.pleaseAddItems}</p>
+                )}
+              </div>
+            </div>
+          </div>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={onClose} color="primary" variant="outlined">
+            {coreI18n.close}
+          </Button>
+        </DialogActions>
+      </div>
+    </Dialog>
+  );
+};
+
+export const Options = ({ coreI18n, i18n, data, id, onUpdate }: DTOptionsProps) => {
+  const [dialogVisible, setDialogVisibility] = React.useState(false);
+
+  const safeData = {
+    ...data
+  };
+
+  if (safeData.atMost) {
+    safeData.betweenHigh = safeData.atMost;
+    delete safeData.atMost;
+  }
+
+  if (!safeData.betweenLow) {
+    safeData.betweenLow = '';
+  }
+  if (!safeData.betweenHigh) {
+    safeData.betweenHigh = '';
+  }
+
+  let label;
+  if (safeData.listType === WeightedListTypeEnum.exactly) {
+    if (safeData.exactly === '1') {
+      label = langUtils.getI18nString(i18n.exactly1Item, ['<b>1</b>']);
+    } else {
+      label = langUtils.getI18nString(i18n.exactlyNItems, [`<b>${safeData.exactly}</b>`]);
+    }
+  } else if (!safeData.betweenLow && !safeData.betweenHigh) {
+    label = i18n.noRangeEntered;
+  } else if (safeData.betweenLow && safeData.betweenHigh) {
+    label = langUtils.getI18nString(i18n.betweenNumItems, [`<b>${safeData.betweenLow}</b>`, `<b>${safeData.betweenHigh}</b>`]);
+  } else if (safeData.betweenLow) {
+    if (safeData.betweenLow === '1') {
+      label = langUtils.getI18nString(i18n.atLeast1Item, ['<b>1</b>']);
+    } else {
+      label = langUtils.getI18nString(i18n.atLeastNItems, [`<b>${safeData.betweenLow}</b>`]);
+    }
+  } else {
+    if (safeData.betweenHigh === '1') {
+      label = langUtils.getI18nString(i18n.atMost1Item, ['<b>1</b>']);
+    } else {
+      label = langUtils.getI18nString(i18n.atMostNItems, [`<b>${safeData.betweenHigh}</b>`]);
+    }
+  }
+
+  return (
+    <>
+      <div style={{ margin: 4 }}>
+        <span dangerouslySetInnerHTML={{ __html: label }} />
+        <Button onClick={(): void => setDialogVisibility(true)} variant="outlined" color="primary" size="small" style={{ marginLeft: 6 }}>
+          {i18n.customize}
+        </Button>
+      </div>
+      <WeightedListDialog
+        visible={dialogVisible}
+        data={safeData}
+        id={id}
+        coreI18n={coreI18n}
+        i18n={i18n}
+        onUpdate={onUpdate}
+        onClose={(): void => setDialogVisibility(false)}
+      />
+    </>
+  );
+};
+
+export const Help = ({ i18n }: DTHelpProps) => (
+  <>
+    <p dangerouslySetInnerHTML={{ __html: i18n.helpIntro }} />
+
+    <ul>
+      <li>
+        <b>{i18n.helpValueWeight}</b>
+      </li>
+      <li>{i18n.helpBrainSurgeon}</li>
+      <li>{i18n.helpAstronaut}</li>
+      <li>{i18n.helpBanker}</li>
+      <li>{i18n.helpSoftwareDeveloper}</li>
+      <li>{i18n.helpEtc}</li>
+    </ul>
+    <p>{i18n.helpOtherOptions}</p>
+    <ul>
+      <li>{i18n.helpOption1}</li>
+      <li>{i18n.helpOption2}</li>
+      <li>{i18n.helpOption3}</li>
+    </ul>
+  </>
+);
+
+export const getMetadata = (): DTMetadata => ({
+  general: {
+    dataType: 'infer'
+  },
+  sql: {
+    field: 'varchar(255) default NULL',
+    field_Oracle: 'varchar2(255) default NULL',
+    field_MSSQL: 'VARCHAR(255) NULL'
+  }
+});
+
+export const rowStateReducer = ({
+  delimiter,
+  listType,
+  exactly,
+  betweenLow = '',
+  betweenHigh = '',
+  values,
+  allowDuplicates
+}: WeightedListState): GenerationOptionsType => {
+  let cleanExactly: any = '';
+  let cleanBetweenLow: any = '';
+  let cleanBetweenHigh: any = '';
+
+  if (listType === WeightedListTypeEnum.exactly) {
+    if (exactly.trim() !== '') {
+      cleanExactly = parseInt(exactly.trim(), 10);
+    }
+  } else {
+    if (betweenLow.trim() !== '') {
+      cleanBetweenLow = parseInt(betweenLow.trim(), 10);
+    }
+    if (betweenHigh.trim() !== '') {
+      cleanBetweenHigh = parseInt(betweenHigh.trim(), 10);
+    }
+
+    // ensure that the number are sorted low to high - makes the generation code have to do less work on every
+    // iteration
+    if (cleanBetweenLow !== '' && cleanBetweenHigh !== '') {
+      if (cleanBetweenLow > cleanBetweenHigh) {
+        const oldLow = cleanBetweenLow;
+        cleanBetweenLow = cleanBetweenHigh;
+        cleanBetweenHigh = oldLow;
+      }
+    }
+  }
+
+  return {
+    listType,
+    exactly: cleanExactly,
+    betweenLow: cleanBetweenLow,
+    betweenHigh: cleanBetweenHigh,
+    values: convertListItemsToObj(values),
+    delimiter: delimiter ? delimiter : ', ',
+    allowDuplicates
+  };
+};
diff --git a/packages/plugins/src/dataTypes/WeightedList/WeightedList.worker.ts b/packages/plugins/src/dataTypes/WeightedList/WeightedList.worker.ts
new file mode 100644
index 000000000..1cfae6d4f
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/WeightedList.worker.ts
@@ -0,0 +1,14 @@
+import utils from '../../../utils';
+import { DTWorkerOnMessage } from '~types/dataTypes';
+import { generate } from './WeightedList.generate';
+
+let utilsLoaded = false;
+
+export const onmessage = (e: DTWorkerOnMessage) => {
+	if (!utilsLoaded) {
+		importScripts(e.data.workerUtilsUrl);
+		utilsLoaded = true;
+	}
+
+	postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/dataTypes/WeightedList/__tests__/WeightedList.generate.test.ts b/packages/plugins/src/dataTypes/WeightedList/__tests__/WeightedList.generate.test.ts
new file mode 100644
index 000000000..1ef85cc62
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/__tests__/WeightedList.generate.test.ts
@@ -0,0 +1,22 @@
+import utils from '../../../../utils';
+import { generate } from '../WeightedList.generate';
+import { getBlankDTGeneratorPayload } from '../../../../../tests/testHelpers';
+
+describe('onmessage', () => {
+	it('generates random data', () => {
+		const data: any = {
+			...getBlankDTGeneratorPayload(),
+			rowState: {
+				listType: 'exactly',
+				values: {
+					"123": 1
+				},
+				exactly: 1,
+				atMost: 1,
+				allowDuplicates: true
+			}
+		};
+
+		expect(generate(data, utils)).toEqual({ display: '123' });
+	});
+});
diff --git a/packages/plugins/src/dataTypes/WeightedList/__tests__/WeightedList.test.tsx b/packages/plugins/src/dataTypes/WeightedList/__tests__/WeightedList.test.tsx
new file mode 100644
index 000000000..08fe12efb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/__tests__/WeightedList.test.tsx
@@ -0,0 +1,67 @@
+import React from 'react'
+import { render } from '@testing-library/react';
+import { getWeightedListItems, WeightedListItem } from '../WeightedList.state';
+import { Help, Options } from '../WeightedList';
+const i18n = require('../i18n/en.json');
+
+const defaultProps = {
+	data: {
+		values: []
+	},
+	coreI18n: {},
+	countryI18n: {},
+	i18n,
+	id: 'id',
+	gridPanelDimensions: { width: 100, height: 100 },
+	onUpdate: () => {},
+	isCountryNamesLoading: false,
+	isCountryNamesLoaded: false,
+	countryNamesMap: null
+};
+
+describe('Help', () => {
+	it('renders', () => {
+		const { container } = render(<Help {...defaultProps}/>);
+		expect(container).toBeTruthy();
+	});
+});
+
+describe('Options', () => {
+	it('renders', () => {
+		const { container } = render(
+			<Options
+				{...defaultProps}
+			/>
+		);
+		expect(container).toBeTruthy();
+	});
+});
+
+describe('getWeightedListItems', () => {
+	it('converts strings as expected', () => {
+		const items = [
+			'one: 1',
+			'two: 2',
+			'three: 22491',
+			'four: 0'
+		];
+		const expected: WeightedListItem[] = [
+			{ value: 'one', weight: '1' },
+			{ value: 'two', weight: '2' },
+			{ value: 'three', weight: '22491' },
+			{ value: 'four', weight: '0' }
+		]
+		expect(getWeightedListItems(items)).toEqual(expected);
+	});
+
+	it('converts strings that contain the delim chars', () => {
+		const items = [
+			'one: two: three: 1',
+		];
+		const expected: WeightedListItem[] = [
+			{ value: 'one: two: three', weight: '1' }
+		]
+		expect(getWeightedListItems(items)).toEqual(expected);
+	});
+});
+
diff --git a/packages/plugins/src/dataTypes/WeightedList/bundle.ts b/packages/plugins/src/dataTypes/WeightedList/bundle.ts
new file mode 100644
index 000000000..96ed0f305
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/bundle.ts
@@ -0,0 +1,14 @@
+import { DTBundle } from '~types/dataTypes';
+import { Example, Options, Help, getMetadata, rowStateReducer } from './WeightedList';
+import { initialState } from './WeightedList.state';
+
+const bundle: DTBundle = {
+	initialState,
+	Example,
+	Options,
+	Help,
+	getMetadata,
+	rowStateReducer
+};
+
+export default bundle;
diff --git a/packages/plugins/src/dataTypes/WeightedList/config.ts b/packages/plugins/src/dataTypes/WeightedList/config.ts
new file mode 100644
index 000000000..a23e8ced9
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/config.ts
@@ -0,0 +1,8 @@
+import { DTDefinition } from '../../';
+
+const definition: DTDefinition = {
+  fieldGroup: 'other',
+  fieldGroupOrder: 45
+};
+
+export default definition;
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/ar.json b/packages/plugins/src/dataTypes/WeightedList/i18n/ar.json
new file mode 100644
index 000000000..31e6316dc
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/ar.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "قائمة مرجحة",
+  "DESC": "يولد قيمة عشوائية مرجحة واحدة أو أكثر من قائمة العناصر.",
+  "DEFAULT_TITLE": "weightedlist",
+  "weightedListSettings": "إعدادات القائمة المرجحة",
+  "atMost": "في الغالب",
+  "exactly": "بالضبط",
+  "numItemsLabel": "عدد العناصر",
+  "numItemsLabelDesc": "يتحكم هذا الإعداد في عدد العناصر التي تم إنشاؤها من قائمتك. يمكنك اختيار عدد محدد من العناصر لتوليدها ، أو رقم بين نطاق من اختيارك.",
+  "exactly1Item": "عنصر واحد بالضبط من القائمة",
+  "exactlyNItems": "بالضبط %1 من العناصر من القائمة",
+  "atMost1Item": "على الأكثر %1 عنصر من القائمة",
+  "atMostNItems": "على الأكثر %1 عناصر من القائمة",
+  "customize": "يعدل أو يكيف",
+  "delimChars": "حرف (أحرف) محدد",
+  "betweenNumItems": "بين العناصر %1 و %2.",
+  "atLeast1Item": "ما لا يقل عن %1 عنصر من القائمة",
+  "atLeastNItems": "ما لا يقل عن %1 عناصر من القائمة",
+  "noRangeEntered": "لم يتم إدخال أي نطاق",
+  "between": "بين",
+  "and": "و",
+  "items": "العناصر",
+  "itemsTitle": "العناصر",
+  "mostlyEvenNumbers": "في الغالب أرقام زوجية",
+  "professions": "المهن",
+  "householdPets": "الحيوانات الأليفة المنزلية",
+  "listTooShort": "تأكد من أنك أدخلت عددًا كافيًا من العناصر في قائمتك ، وإلا فلن تنشئ عدد العناصر المحددة هنا.",
+  "allowDuplicates": "السماح بالتكرارات",
+  "value": "قيمة",
+  "weight": "وزن",
+  "addBtnLabel": "يضيف",
+  "pleaseAddItems": "الرجاء إضافة بعض العناصر.",
+  "helpIntro": "يُنشئ نوع بيانات القائمة الموزونة عنصرًا أو عناصر تم اختيارها عشوائيًا من قائمة معرّفة بشكل مخصص ، مع مراعاة الوزن الذي تريد تطبيقه على كل عنصر. يتيح لك حقل الوزن تغيير احتمالية ظهور كل عنصر حتى تتمكن من إنشاء بيانات أكثر واقعية. على سبيل المثال ، لنفترض أنك أردت إنشاء قائمة بالمهن ، لكنك أردت أن يظهر \"جراح الدماغ\" و \"رائد الفضاء\" بشكل غير متكرر لأنهما غير شائعين. لذلك ، يمكنك فقط رفع أوزان الآخرين:",
+  "helpValueWeight": "(قيمة الوزن)",
+  "helpBrainSurgeon": "جراح المخ ، 1",
+  "helpAstronaut": "رائد فضاء ، 1",
+  "helpBanker": "بانكر ، 800",
+  "helpSoftwareDeveloper": "مطور برامج ، 1000",
+  "helpEtc": "مساعدة إلخ.",
+  "helpOtherOptions": "يوفر نوع البيانات أيضًا الخيارات التالية:",
+  "helpOption1": "يتيح لك إنشاء إما عدد محدد من العناصر من القائمة ، أو مجموعة فرعية من حجم عشوائي.",
+  "helpOption2": "اختر أي حرف (أحرف) محدد يتم استخدامه لعناصر متعددة.",
+  "helpOption3": "اختر ما إذا كنت تريد إزالة التكرارات عندما يُنشئ صف واحد أكثر من عنصر واحد.",
+  "allowDuplicatesDesc": "عندما تقوم بإنشاء أكثر من عنصر واحد من قائمتك ، فإن هذا الإعداد يتحكم في ما إذا كان مسموحًا بالتكرارات أم لا.",
+  "delimCharsDesc": "إذا كنت تقوم بتوليد عناصر متعددة ، فإن هذا الحقل يحدد الحرف الذي يجب استخدامه لفصل القيم."
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/de.json b/packages/plugins/src/dataTypes/WeightedList/i18n/de.json
new file mode 100644
index 000000000..00967484b
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/de.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Gewichtete Liste",
+  "DESC": "Generiert einen oder mehrere gewichtete Zufallswerte aus einer Liste von Elementen.",
+  "DEFAULT_TITLE": "gewichteteliste",
+  "weightedListSettings": "Gewichtete Listeneinstellungen",
+  "atMost": "Maximal",
+  "exactly": "Exakt",
+  "numItemsLabel": "Anzahl Artikel",
+  "numItemsLabelDesc": "Diese Einstellung steuert die Anzahl der aus Ihrer Liste generierten Elemente. Sie können eine genaue Anzahl der zu generierenden Elemente oder eine Anzahl aus einem Bereich Ihrer Wahl auswählen.",
+  "exactly1Item": "Genau %1 Element aus der Liste",
+  "exactlyNItems": "Genau %1 Elemente aus der Liste",
+  "atMost1Item": "Höchstens %1 Element aus der Liste",
+  "atMostNItems": "Höchstens %1 Elemente aus der Liste",
+  "customize": "Anpassen",
+  "delimChars": "Trennzeichen",
+  "betweenNumItems": "Zwischen %1 und %2 Artikel",
+  "atLeast1Item": "Mindestens %1 Element aus der Liste",
+  "atLeastNItems": "Mindestens %1 Elemente aus der Liste",
+  "noRangeEntered": "Kein Bereich eingegeben",
+  "between": "Zwischen",
+  "and": "und",
+  "items": "Artikel",
+  "itemsTitle": "Artikel",
+  "mostlyEvenNumbers": "Meist gerade Zahlen",
+  "professions": "Berufe",
+  "householdPets": "Haustiere",
+  "listTooShort": "Stellen Sie sicher, dass Sie genügend Artikel in Ihre Liste eingegeben haben, sonst wird die hier angegebene Anzahl von Artikeln nicht generiert.",
+  "allowDuplicates": "Duplikate zulassen",
+  "value": "Wert",
+  "weight": "Gewicht",
+  "addBtnLabel": "Hinzufügen",
+  "pleaseAddItems": "Bitte fügen Sie einige Artikel hinzu.",
+  "helpIntro": "Der Datentyp „Gewichtete Liste“ generiert zufällig ausgewählte Elemente aus einer benutzerdefinierten Liste, wobei die Gewichtung berücksichtigt wird, die Sie auf jedes Element anwenden möchten. Mit dem Gewichtungsfeld können Sie die Wahrscheinlichkeit ändern, mit der jedes Element erscheint, sodass Sie realistischere Daten erstellen können. Angenommen, Sie möchten eine Liste mit Berufen erstellen, möchten aber, dass „Gehirnchirurg“ und „Astronaut“ sehr selten erscheinen, weil sie nicht üblich sind. Dafür könnten Sie einfach die Gewichte der anderen erhöhen:",
+  "helpValueWeight": "(Wert, Gewicht)",
+  "helpBrainSurgeon": "Gehirnchirurg, 1",
+  "helpAstronaut": "Astronaut, 1",
+  "helpBanker": "Bankier, 800",
+  "helpSoftwareDeveloper": "Softwareentwickler, 1000",
+  "helpEtc": "Hilfe usw.",
+  "helpOtherOptions": "Der Datentyp bietet außerdem die folgenden Optionen:",
+  "helpOption1": "Sie können damit entweder eine bestimmte Anzahl von Elementen aus der Liste oder eine Teilmenge einer zufälligen Größe generieren.",
+  "helpOption2": "Wählen Sie die Trennzeichen aus, die für mehrere Elemente verwendet werden.",
+  "helpOption3": "Wählen Sie aus, ob Sie Duplikate eliminieren möchten, wenn eine einzelne Zeile mehr als ein Element generiert.",
+  "allowDuplicatesDesc": "Wenn Sie mehr als ein Element aus Ihrer Liste generieren, steuert diese Einstellung, ob Duplikate zulässig sind.",
+  "delimCharsDesc": "Wenn Sie mehrere Elemente generieren, bestimmt dieses Feld, welches Zeichen zum Trennen der Werte verwendet werden soll."
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/en.json b/packages/plugins/src/dataTypes/WeightedList/i18n/en.json
new file mode 100644
index 000000000..b1c47beeb
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/en.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Weighted List",
+  "DESC": "Generates one or more weighted random values from a list of items.",
+  "DEFAULT_TITLE": "weightedlist",
+  "weightedListSettings": "Weighted List Settings",
+  "atMost": "At Most",
+  "exactly": "Exactly",
+  "numItemsLabel": "Num items",
+  "numItemsLabelDesc": "This setting controls the number of items generated from your list. You can choose an exact number of items to generate, or a number between a range of your choosing.",
+  "exactly1Item": "Exactly %1 item from list",
+  "exactlyNItems": "Exactly %1 items from list",
+  "atMost1Item": "At most %1 item from list",
+  "atMostNItems": "At most %1 items from list",
+  "customize": "Customize",
+  "delimChars": "Delimiter char(s)",
+  "betweenNumItems": "Between %1 and %2 items",
+  "atLeast1Item": "At least %1 item from list",
+  "atLeastNItems": "At least %1 items from list",
+  "noRangeEntered": "No range entered",
+  "between": "Between",
+  "and": "and",
+  "items": "items",
+  "itemsTitle": "Items",
+  "mostlyEvenNumbers": "Mostly even numbers",
+  "professions": "Professions",
+  "householdPets": "Household pets",
+  "listTooShort": "Make sure you've entered enough items in your list, or it won't generate the number of items specified here.",
+  "allowDuplicates": "Allow duplicates",
+  "value": "Value",
+  "weight": "Weight",
+  "addBtnLabel": "Add &raquo;",
+  "pleaseAddItems": "Please add some items.",
+  "helpIntro": "The <b>Weighted List</b> Data Type generates randomly chosen item or items from a custom-defined list, factoring in whatever weight you want to apply to each item. The weight field lets you change the probability of each item appearing so you can create more realistic-looking data. For example, say you wanted to generate a list of professions, but wanted 'Brain surgeon' and 'Astronaut' to appear very infrequently because they're not common. For that, you could just bump up the weights of the others:",
+  "helpValueWeight": "(value, weight)",
+  "helpBrainSurgeon": "Brain surgeon, 1",
+  "helpAstronaut": "Astronaut, 1",
+  "helpBanker": "Banker, 800",
+  "helpSoftwareDeveloper": "Software Developer, 1000",
+  "helpEtc": "Help etc.",
+  "helpOtherOptions": "The Data Type also provides the following options:",
+  "helpOption1": "It lets you generate either a specific number of items from the list, or a subset of a random size.",
+  "helpOption2": "Choose whatever delimiter character(s) are used for multiple items.",
+  "helpOption3": "Choose whether you want to eliminate duplicates when a single row generates more than one item.",
+  "allowDuplicatesDesc": "When you are generating more than one item from your list, this setting controls whether duplicates are permitted.",
+  "delimCharsDesc": "If you are generating multiple items, this field determines what character should be used to separate the values."
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/es.json b/packages/plugins/src/dataTypes/WeightedList/i18n/es.json
new file mode 100644
index 000000000..66618bbab
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/es.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Lista ponderada",
+  "DESC": "Genera uno o más valores aleatorios ponderados a partir de una lista de elementos.",
+  "DEFAULT_TITLE": "listaponderada",
+  "weightedListSettings": "Configuración de la lista ponderada",
+  "atMost": "A lo sumo",
+  "exactly": "Exactamente",
+  "numItemsLabel": "Número de elementos",
+  "numItemsLabelDesc": "Esta configuración controla la cantidad de elementos generados a partir de su lista. Puede elegir un número exacto de elementos para generar, o un número entre un rango de su elección.",
+  "exactly1Item": "Exactamente %1 elemento de la lista",
+  "exactlyNItems": "Exactamente %1 elementos de la lista",
+  "atMost1Item": "Como máximo %1 elemento de la lista",
+  "atMostNItems": "Como máximo %1 elementos de la lista",
+  "customize": "Personalizar",
+  "delimChars": "Carácter(es) delimitador(es)",
+  "betweenNumItems": "Entre %1 y %2 elementos",
+  "atLeast1Item": "Al menos %1 elemento de la lista",
+  "atLeastNItems": "Al menos %1 elementos de la lista",
+  "noRangeEntered": "No se ingresó rango",
+  "between": "Entre",
+  "and": "y",
+  "items": "elementos",
+  "itemsTitle": "Elementos",
+  "mostlyEvenNumbers": "En su mayoría números pares",
+  "professions": "Profesiones",
+  "householdPets": "Animales domésticos",
+  "listTooShort": "Asegúrese de haber ingresado suficientes elementos en su lista, o no generará la cantidad de elementos especificados aquí.",
+  "allowDuplicates": "Permitir duplicados",
+  "value": "Valor",
+  "weight": "Peso",
+  "addBtnLabel": "Agregar",
+  "pleaseAddItems": "Agregue algunos artículos.",
+  "helpIntro": "El tipo de datos de lista ponderada genera un elemento o elementos elegidos al azar de una lista definida de forma personalizada, teniendo en cuenta el peso que desee aplicar a cada elemento. El campo de ponderación le permite cambiar la probabilidad de que aparezca cada elemento para que pueda crear datos que parezcan más realistas. Por ejemplo, supongamos que desea generar una lista de profesiones, pero desea que 'Cirujano cerebral' y 'Astronauta' aparezcan con poca frecuencia porque no son comunes. Para eso, podrías aumentar el peso de los demás:",
+  "helpValueWeight": "(valor de peso)",
+  "helpBrainSurgeon": "Neurocirujano, 1",
+  "helpAstronaut": "Astronauta, 1",
+  "helpBanker": "Banquero, 800",
+  "helpSoftwareDeveloper": "Desarrollador de software, 1000",
+  "helpEtc": "Ayuda etc",
+  "helpOtherOptions": "El tipo de datos también proporciona las siguientes opciones:",
+  "helpOption1": "Le permite generar un número específico de elementos de la lista o un subconjunto de un tamaño aleatorio.",
+  "helpOption2": "Elija los caracteres delimitadores que se utilicen para varios elementos.",
+  "helpOption3": "Elija si desea eliminar los duplicados cuando una sola fila genera más de un elemento.",
+  "allowDuplicatesDesc": "Cuando está generando más de un elemento de su lista, esta configuración controla si se permiten duplicados.",
+  "delimCharsDesc": "Si está generando varios elementos, este campo determina qué carácter debe usarse para separar los valores."
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/fr.json b/packages/plugins/src/dataTypes/WeightedList/i18n/fr.json
new file mode 100644
index 000000000..bf4351955
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/fr.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Liste pondérée",
+  "DESC": "Génère une ou plusieurs valeurs aléatoires pondérées à partir d'une liste d'éléments.",
+  "DEFAULT_TITLE": "listepondérée",
+  "weightedListSettings": "Paramètres de la liste pondérée",
+  "atMost": "Au plus",
+  "exactly": "Exactement",
+  "numItemsLabel": "Nombre d'éléments",
+  "numItemsLabelDesc": "Ce paramètre contrôle le nombre d'éléments générés à partir de votre liste. Vous pouvez choisir un nombre exact d'éléments à générer, ou un nombre entre une plage de votre choix.",
+  "exactly1Item": "Exactement %1 élément de la liste",
+  "exactlyNItems": "Exactement %1 éléments de la liste",
+  "atMost1Item": "Au plus %1 élément de la liste",
+  "atMostNItems": "Au plus %1 éléments de la liste",
+  "customize": "Personnaliser",
+  "delimChars": "Caractère(s) délimiteur(s)",
+  "betweenNumItems": "Entre %1 et %2 éléments",
+  "atLeast1Item": "Au moins %1 élément de la liste",
+  "atLeastNItems": "Au moins %1 éléments de la liste",
+  "noRangeEntered": "Aucune plage saisie",
+  "between": "Entre",
+  "and": "et",
+  "items": "éléments",
+  "itemsTitle": "Articles",
+  "mostlyEvenNumbers": "Surtout des nombres pairs",
+  "professions": "Les professions",
+  "householdPets": "Animaux domestiques",
+  "listTooShort": "Assurez-vous d'avoir saisi suffisamment d'éléments dans votre liste, sinon elle ne générera pas le nombre d'éléments spécifié ici.",
+  "allowDuplicates": "Autoriser les doublons",
+  "value": "Évaluer",
+  "weight": "Lester",
+  "addBtnLabel": "Ajouter &raquo;",
+  "pleaseAddItems": "Veuillez ajouter quelques éléments.",
+  "helpIntro": "Le type de données Liste pondérée génère un ou plusieurs éléments choisis au hasard dans une liste personnalisée, en tenant compte du poids que vous souhaitez appliquer à chaque élément. Le champ de pondération vous permet de modifier la probabilité d'apparition de chaque élément afin que vous puissiez créer des données plus réalistes. Par exemple, imaginons que vous vouliez générer une liste de professions, mais que \"Chirurgien du cerveau\" et \"Astronaute\" n'apparaissent que très rarement car ils ne sont pas courants. Pour cela, vous pouvez simplement augmenter le poids des autres :",
+  "helpValueWeight": "(valeur, poids)",
+  "helpBrainSurgeon": "Chirurgien du cerveau, 1",
+  "helpAstronaut": "Astronaute, 1",
+  "helpBanker": "Banquier, 800",
+  "helpSoftwareDeveloper": "Développeur de logiciels, 1000",
+  "helpEtc": "Aide etc",
+  "helpOtherOptions": "Le type de données fournit également les options suivantes :",
+  "helpOption1": "Il vous permet de générer soit un nombre spécifique d'éléments de la liste, soit un sous-ensemble de taille aléatoire.",
+  "helpOption2": "Choisissez le ou les caractères de délimitation utilisés pour plusieurs éléments.",
+  "helpOption3": "Choisissez si vous souhaitez éliminer les doublons lorsqu'une seule ligne génère plusieurs éléments.",
+  "allowDuplicatesDesc": "Lorsque vous générez plusieurs éléments de votre liste, ce paramètre contrôle si les doublons sont autorisés.",
+  "delimCharsDesc": "Si vous générez plusieurs éléments, ce champ détermine le caractère à utiliser pour séparer les valeurs."
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/hi.json b/packages/plugins/src/dataTypes/WeightedList/i18n/hi.json
new file mode 100644
index 000000000..9302d7fc5
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/hi.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "भारित सूची",
+  "DESC": "वस्तुओं की सूची से एक या अधिक भारित यादृच्छिक मान उत्पन्न करता है।",
+  "DEFAULT_TITLE": "भारितसूची",
+  "weightedListSettings": "भारित सूची सेटिंग्स",
+  "atMost": "अधिक से अधिक",
+  "exactly": "बिल्कुल",
+  "numItemsLabel": "आइटमों की संख्या",
+  "numItemsLabelDesc": "यह सेटिंग आपकी सूची से उत्पन्न वस्तुओं की संख्या को नियंत्रित करती है। आप उत्पन्न करने के लिए वस्तुओं की सटीक संख्या चुन सकते हैं, या अपनी पसंद की सीमा के बीच एक संख्या चुन सकते हैं।",
+  "exactly1Item": "सूची से ठीक %1 आइटम",
+  "exactlyNItems": "सूची से ठीक %1 आइटम",
+  "atMost1Item": "सूची से ज़्यादा से ज़्यादा %1 आइटम",
+  "atMostNItems": "सूची से अधिकतम %1 आइटम",
+  "customize": "अनुकूलित करें",
+  "delimChars": "सीमांकक वर्ण",
+  "betweenNumItems": "%1 और %2 आइटम के बीच",
+  "atLeast1Item": "सूची से कम से कम %1 आइटम",
+  "atLeastNItems": "सूची से कम से कम %1 आइटम",
+  "noRangeEntered": "कोई सीमा दर्ज नहीं की गई",
+  "between": "बीच में",
+  "and": "तथा",
+  "items": "सामान",
+  "itemsTitle": "सामान",
+  "mostlyEvenNumbers": "अधिकतर सम संख्याएँ",
+  "professions": "व्यवसायों",
+  "householdPets": "घरेलू पालतू जानवर",
+  "listTooShort": "सुनिश्चित करें कि आपने अपनी सूची में पर्याप्त आइटम दर्ज किए हैं, या यह यहां निर्दिष्ट आइटमों की संख्या उत्पन्न नहीं करेगा।",
+  "allowDuplicates": "डुप्लीकेट की अनुमति दें",
+  "value": "मूल्य",
+  "weight": "वज़न",
+  "addBtnLabel": "जोड़ें &raquo;",
+  "pleaseAddItems": "कृपया कुछ आइटम जोड़ें।",
+  "helpIntro": "<b>भारित सूची</b> डेटा प्रकार एक कस्टम-निर्धारित सूची से बेतरतीब ढंग से चुने गए आइटम या आइटम उत्पन्न करता है, प्रत्येक आइटम पर आप जो भी भार लागू करना चाहते हैं, उसमें फैक्टरिंग करते हैं। वज़न फ़ील्ड आपको प्रत्येक आइटम के प्रदर्शित होने की संभावना को बदलने देता है ताकि आप अधिक यथार्थवादी दिखने वाला डेटा बना सकें। उदाहरण के लिए, मान लें कि आप व्यवसायों की एक सूची तैयार करना चाहते हैं, लेकिन चाहते हैं कि 'ब्रेन सर्जन' और 'एस्ट्रोनॉट' बहुत कम दिखाई दें क्योंकि वे आम नहीं हैं। उसके लिए, आप बस दूसरों का वजन बढ़ा सकते हैं:",
+  "helpValueWeight": "(मूल्य, वजन)",
+  "helpBrainSurgeon": "ब्रेन सर्जन, 1",
+  "helpAstronaut": "अंतरिक्ष यात्री, 1",
+  "helpBanker": "बैंकर, 800",
+  "helpSoftwareDeveloper": "सॉफ्टवेयर डेवलपर, 1000",
+  "helpEtc": "मदद आदि।",
+  "helpOtherOptions": "डेटा प्रकार निम्नलिखित विकल्प भी प्रदान करता है:",
+  "helpOption1": "यह आपको सूची से या तो विशिष्ट संख्या में आइटम उत्पन्न करने देता है, या एक यादृच्छिक आकार का सबसेट।",
+  "helpOption2": "एक से अधिक मदों के लिए उपयोग किए जाने वाले परिसीमक वर्ण चुनें।",
+  "helpOption3": "चुनें कि क्या आप डुप्लिकेट को हटाना चाहते हैं जब एक पंक्ति एक से अधिक आइटम उत्पन्न करती है।",
+  "allowDuplicatesDesc": "जब आप अपनी सूची से एक से अधिक आइटम उत्पन्न कर रहे होते हैं, तो यह सेटिंग नियंत्रित करती है कि डुप्लिकेट की अनुमति है या नहीं।",
+  "delimCharsDesc": "यदि आप एकाधिक आइटम उत्पन्न कर रहे हैं, तो यह फ़ील्ड निर्धारित करती है कि मानों को अलग करने के लिए किस वर्ण का उपयोग किया जाना चाहिए।"
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/ja.json b/packages/plugins/src/dataTypes/WeightedList/i18n/ja.json
new file mode 100644
index 000000000..bf85c1b55
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/ja.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "加重リスト",
+  "DESC": "アイテムのリストから 1 つ以上の加重ランダム値を生成します。",
+  "DEFAULT_TITLE": "加重リスト",
+  "weightedListSettings": "加重リストの設定",
+  "atMost": "せいぜい",
+  "exactly": "丁度",
+  "numItemsLabel": "アイテム数",
+  "numItemsLabelDesc": "この設定は、リストから生成されるアイテムの数を制御します。 生成するアイテムの正確な数、または選択した範囲内の数を選択できます。",
+  "exactly1Item": "リストからちょうど %1 アイテム",
+  "exactlyNItems": "リストからちょうど %1 個のアイテム",
+  "atMost1Item": "リストから最大 %1 アイテム",
+  "atMostNItems": "リストから最大 %1 アイテム",
+  "customize": "カスタマイズ",
+  "delimChars": "区切り文字",
+  "betweenNumItems": "%1 と %2 の間のアイテム",
+  "atLeast1Item": "リストから少なくとも %1 アイテム",
+  "atLeastNItems": "リストから少なくとも %1 アイテム",
+  "noRangeEntered": "範囲が入力されていません",
+  "between": "間",
+  "and": "と",
+  "items": "アイテム",
+  "itemsTitle": "アイテム",
+  "mostlyEvenNumbers": "偶数がほとんど",
+  "professions": "職業",
+  "householdPets": "家庭用ペット",
+  "listTooShort": "リストに十分な項目を入力したことを確認してください。そうしないと、ここで指定した数の項目が生成されません。",
+  "allowDuplicates": "重複を許可",
+  "value": "価値",
+  "weight": "重さ",
+  "addBtnLabel": "追加",
+  "pleaseAddItems": "項目を追加してください。",
+  "helpIntro": "Weighted List Data Type は、カスタム定義リストからランダムに選択されたアイテムを生成し、各アイテムに適用するウェイトを考慮します。 重みフィールドを使用すると、各アイテムが表示される確率を変更できるため、より現実的なデータを作成できます。 たとえば、職業のリストを生成したいが、「脳外科医」と「宇宙飛行士」は一般的ではないため、ごくまれにしか表示されないようにしたいとします。 そのためには、他のウェイトを増やすだけです。",
+  "helpValueWeight": "(値、重量)",
+  "helpBrainSurgeon": "脳外科医 1",
+  "helpAstronaut": "宇宙飛行士 1",
+  "helpBanker": "バンカー、800",
+  "helpSoftwareDeveloper": "ソフトウェア開発者、1000",
+  "helpEtc": "ヘルプなど",
+  "helpOtherOptions": "データ型には、次のオプションもあります。",
+  "helpOption1": "リストから特定の数のアイテムを生成するか、ランダムなサイズのサブセットを生成できます。",
+  "helpOption2": "複数の項目に使用する区切り文字を選択します。",
+  "helpOption3": "1 つの行が複数の項目を生成する場合に、重複を排除するかどうかを選択します。",
+  "allowDuplicatesDesc": "リストから複数のアイテムを生成する場合、この設定は重複を許可するかどうかを制御します。",
+  "delimCharsDesc": "複数のアイテムを生成する場合、このフィールドは、値を区切るために使用する文字を決定します。"
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/nl.json b/packages/plugins/src/dataTypes/WeightedList/i18n/nl.json
new file mode 100644
index 000000000..cdd4e5246
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/nl.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Gewogen lijst",
+  "DESC": "Genereert een of meer gewogen willekeurige waarden uit een lijst met items.",
+  "DEFAULT_TITLE": "gewogenlijst",
+  "weightedListSettings": "Gewogen lijst instellingen",
+  "atMost": "Bij de meeste",
+  "exactly": "Precies",
+  "numItemsLabel": "Aantal items",
+  "numItemsLabelDesc": "Deze instelling bepaalt het aantal items dat uit uw lijst wordt gegenereerd. U kunt een exact aantal items kiezen om te genereren, of een aantal uit een bereik naar keuze.",
+  "exactly1Item": "Exact %1 item uit lijst",
+  "exactlyNItems": "Exact %1 items uit lijst",
+  "atMost1Item": "Maximaal %1 item uit lijst",
+  "atMostNItems": "Maximaal %1 items uit de lijst",
+  "customize": "Aanpassen",
+  "delimChars": "Scheidingsteken(s)",
+  "betweenNumItems": "Tussen %1 en %2 items",
+  "atLeast1Item": "Minstens %1 item uit lijst",
+  "atLeastNItems": "Minstens %1 items uit de lijst",
+  "noRangeEntered": "Geen bereik ingevoerd",
+  "between": "Tussen",
+  "and": "en",
+  "items": "artikelen",
+  "itemsTitle": "Artikelen",
+  "mostlyEvenNumbers": "Meestal even getallen",
+  "professions": "Beroepen",
+  "householdPets": "Huisdieren",
+  "listTooShort": "Zorg ervoor dat u voldoende items in uw lijst heeft ingevoerd, anders wordt niet het aantal items gegenereerd dat hier is opgegeven.",
+  "allowDuplicates": "Duplicaten toestaan",
+  "value": "Waarde",
+  "weight": "Gewicht",
+  "addBtnLabel": "Toevoegen &raquo;",
+  "pleaseAddItems": "Voeg enkele items toe.",
+  "helpIntro": "Het gegevenstype <b>Gewogen lijst</b> genereert willekeurig gekozen item of items uit een zelf gedefinieerde lijst, rekening houdend met het gewicht dat u op elk item wilt toepassen. Met het gewichtsveld kunt u de kans wijzigen dat elk item wordt weergegeven, zodat u meer realistisch ogende gegevens kunt creëren. Stel dat u een lijst met beroepen wilt genereren, maar dat 'Hersenchirurg' en 'Astronaut' zeer zelden voorkomen omdat ze niet gebruikelijk zijn. Daarvoor zou je gewoon de gewichten van de anderen kunnen verhogen:",
+  "helpValueWeight": "(waarde, gewicht)",
+  "helpBrainSurgeon": "Hersenchirurg, 1",
+  "helpAstronaut": "Astronaut, 1",
+  "helpBanker": "Bankier, 800",
+  "helpSoftwareDeveloper": "Softwareontwikkelaar, 1000",
+  "helpEtc": "Hulp enz.",
+  "helpOtherOptions": "Het gegevenstype biedt ook de volgende opties:",
+  "helpOption1": "Hiermee kunt u een specifiek aantal items uit de lijst genereren, of een subset van een willekeurige grootte.",
+  "helpOption2": "Kies welk(e) scheidingsteken(s) dan ook worden gebruikt voor meerdere items.",
+  "helpOption3": "Kies of u duplicaten wilt verwijderen wanneer een enkele rij meer dan één item genereert.",
+  "allowDuplicatesDesc": "Wanneer u meer dan één item uit uw lijst genereert, bepaalt deze instelling of duplicaten zijn toegestaan.",
+  "delimCharsDesc": "Als u meerdere items genereert, bepaalt dit veld welk teken moet worden gebruikt om de waarden te scheiden."
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/pt.json b/packages/plugins/src/dataTypes/WeightedList/i18n/pt.json
new file mode 100644
index 000000000..6a5aad32e
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/pt.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Lista Ponderada",
+  "DESC": "Gera um ou mais valores aleatórios ponderados de uma lista de itens.",
+  "DEFAULT_TITLE": "listaponderada",
+  "weightedListSettings": "Configurações da lista ponderada",
+  "atMost": "No máximo",
+  "exactly": "Exatamente",
+  "numItemsLabel": "Num itens",
+  "numItemsLabelDesc": "Esta configuração controla o número de itens gerados de sua lista. Você pode escolher um número exato de itens para gerar ou um número entre um intervalo de sua escolha.",
+  "exactly1Item": "Exatamente %1 item da lista",
+  "exactlyNItems": "Exatamente %1 itens da lista",
+  "atMost1Item": "No máximo %1 item da lista",
+  "atMostNItems": "No máximo %1 itens da lista",
+  "customize": "Customizar",
+  "delimChars": "Caracteres delimitadores",
+  "betweenNumItems": "Entre %1 e %2 itens",
+  "atLeast1Item": "Pelo menos %1 item da lista",
+  "atLeastNItems": "Pelo menos %1 itens da lista",
+  "noRangeEntered": "Nenhum intervalo inserido",
+  "between": "Entre",
+  "and": "e",
+  "items": "Itens",
+  "itemsTitle": "Itens",
+  "mostlyEvenNumbers": "Principalmente números pares",
+  "professions": "Profissões",
+  "householdPets": "Animais domésticos",
+  "listTooShort": "Certifique-se de que inseriu itens suficientes em sua lista ou ela não gerará o número de itens especificados aqui.",
+  "allowDuplicates": "Permitir duplicatas",
+  "value": "Valor",
+  "weight": "Peso",
+  "addBtnLabel": "Adicionar &raquo;",
+  "pleaseAddItems": "Por favor, adicione alguns itens.",
+  "helpIntro": "O tipo de dados <b>Lista ponderada</b> gera itens escolhidos aleatoriamente de uma lista definida de forma personalizada, considerando o peso que você deseja aplicar a cada item. O campo de peso permite alterar a probabilidade de cada item aparecer para que você possa criar dados com aparência mais realista. Por exemplo, digamos que você queira gerar uma lista de profissões, mas deseja que 'Cirurgião cerebral' e 'Astronauta' apareçam com pouca frequência porque não são comuns. Para isso, você poderia apenas aumentar os pesos dos outros:",
+  "helpValueWeight": "(valor, peso)",
+  "helpBrainSurgeon": "Cirurgião cerebral, 1",
+  "helpAstronaut": "Astronauta, 1",
+  "helpBanker": "Banqueiro, 800",
+  "helpSoftwareDeveloper": "Desenvolvedor de software, 1000",
+  "helpEtc": "Ajuda etc",
+  "helpOtherOptions": "O tipo de dados também fornece as seguintes opções:",
+  "helpOption1": "Ele permite gerar um número específico de itens da lista ou um subconjunto de tamanho aleatório.",
+  "helpOption2": "Escolha quaisquer caracteres delimitadores usados para vários itens.",
+  "helpOption3": "Escolha se deseja eliminar duplicatas quando uma única linha gera mais de um item.",
+  "allowDuplicatesDesc": "Quando você está gerando mais de um item de sua lista, esta configuração controla se as duplicatas são permitidas.",
+  "delimCharsDesc": "Se você estiver gerando vários itens, esse campo determinará qual caractere deve ser usado para separar os valores."
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/ru.json b/packages/plugins/src/dataTypes/WeightedList/i18n/ru.json
new file mode 100644
index 000000000..8aa7c6bf1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/ru.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "Взвешенный список",
+  "DESC": "Генерирует одно или несколько взвешенных случайных значений из списка элементов.",
+  "DEFAULT_TITLE": "weightedlist",
+  "weightedListSettings": "Настройки взвешенного списка",
+  "atMost": "В большинстве",
+  "exactly": "В яблочко",
+  "numItemsLabel": "Количество предметов",
+  "numItemsLabelDesc": "Этот параметр управляет количеством элементов, созданных из вашего списка. Вы можете выбрать точное количество элементов для генерации или число из диапазона по вашему выбору.",
+  "exactly1Item": "Ровно %1 элемент из списка",
+  "exactlyNItems": "Ровно %1 элементов из списка",
+  "atMost1Item": "Не более %1 элемента из списка",
+  "atMostNItems": "Не более %1 элементов из списка",
+  "customize": "Настроить",
+  "delimChars": "Символ(ы) разделителя",
+  "betweenNumItems": "Между %1 и %2 элементами",
+  "atLeast1Item": "По крайней мере %1 элемент из списка",
+  "atLeastNItems": "Не менее %1 элементов из списка",
+  "noRangeEntered": "Диапазон не указан",
+  "between": "Между",
+  "and": "и",
+  "items": "Предметы",
+  "itemsTitle": "Предметы",
+  "mostlyEvenNumbers": "В основном четные числа",
+  "professions": "Профессии",
+  "householdPets": "Домашние животные",
+  "listTooShort": "Убедитесь, что вы ввели достаточное количество элементов в свой список, иначе он не будет генерировать указанное здесь количество элементов.",
+  "allowDuplicates": "Разрешить дубликаты",
+  "value": "Ценность",
+  "weight": "Масса",
+  "addBtnLabel": "Добавлять &raquo;",
+  "pleaseAddItems": "Пожалуйста, добавьте некоторые элементы.",
+  "helpIntro": "Тип данных Взвешенный список генерирует случайно выбранный элемент или элементы из пользовательского списка с учетом любого веса, который вы хотите применить к каждому элементу. Поле веса позволяет изменить вероятность появления каждого элемента, чтобы вы могли создавать более реалистичные данные. Например, предположим, что вы хотели создать список профессий, но хотели, чтобы «нейрохирург» и «астронавт» появлялись очень редко, потому что они не распространены. Для этого вы можете просто увеличить веса других:",
+  "helpValueWeight": "(стоимость, вес)",
+  "helpBrainSurgeon": "Нейрохирург, 1",
+  "helpAstronaut": "Космонавта, 1",
+  "helpBanker": "Банкир, 800",
+  "helpSoftwareDeveloper": "Программист, 1000",
+  "helpEtc": "Помощь и т. д.",
+  "helpOtherOptions": "Тип данных также предоставляет следующие параметры:",
+  "helpOption1": "Он позволяет генерировать либо определенное количество элементов из списка, либо подмножество случайного размера.",
+  "helpOption2": "Выберите любые символы-разделители, используемые для нескольких элементов.",
+  "helpOption3": "Выберите, хотите ли вы устранить дубликаты, когда одна строка создает более одного элемента.",
+  "allowDuplicatesDesc": "Когда вы создаете более одного элемента из своего списка, этот параметр определяет, разрешены ли дубликаты.",
+  "delimCharsDesc": "Если вы создаете несколько элементов, это поле определяет, какой символ следует использовать для разделения значений."
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/ta.json b/packages/plugins/src/dataTypes/WeightedList/i18n/ta.json
new file mode 100644
index 000000000..8a1b538b1
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/ta.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "எடையுள்ள பட்டியல்",
+  "DESC": "உருப்படிகளின் பட்டியலிலிருந்து ஒன்று அல்லது அதற்கு மேற்பட்ட எடையுள்ள சீரற்ற மதிப்புகளை உருவாக்குகிறது.",
+  "DEFAULT_TITLE": "எடையுள்ளபட்டியல்",
+  "weightedListSettings": "எடையுள்ள பட்டியல் அமைப்புகள்",
+  "atMost": "அதிக பட்சம்",
+  "exactly": "சரியாக",
+  "numItemsLabel": "பொருட்களின் எண்ணிக்கை",
+  "numItemsLabelDesc": "இந்த அமைப்பு உங்கள் பட்டியலில் இருந்து உருவாக்கப்பட்ட உருப்படிகளின் எண்ணிக்கையைக் கட்டுப்படுத்துகிறது. உருவாக்க வேண்டிய உருப்படிகளின் சரியான எண்ணிக்கையையோ அல்லது நீங்கள் தேர்ந்தெடுக்கும் வரம்பிற்கு இடையே உள்ள எண்ணையோ தேர்வு செய்யலாம்.",
+  "exactly1Item": "பட்டியலிலிருந்து சரியாக %1 உருப்படி",
+  "exactlyNItems": "பட்டியலிலிருந்து சரியாக %1 உருப்படிகள்",
+  "atMost1Item": "பட்டியலில் இருந்து அதிகபட்சம் %1 உருப்படி",
+  "atMostNItems": "பட்டியலில் இருந்து அதிகபட்சம் %1 உருப்படிகள்",
+  "customize": "தனிப்பயனாக்கலாம்",
+  "delimChars": "டிலிமிட்டர் எழுத்து(கள்)",
+  "betweenNumItems": "%1 மற்றும் %2 உருப்படிகளுக்கு இடையில்",
+  "atLeast1Item": "பட்டியலிலிருந்து குறைந்தது %1 உருப்படி",
+  "atLeastNItems": "பட்டியலில் இருந்து குறைந்தது %1 உருப்படிகள்",
+  "noRangeEntered": "வரம்பு இல்லை",
+  "between": "இடையில்",
+  "and": "மற்றும்",
+  "items": "பொருட்களை",
+  "itemsTitle": "பொருட்களை",
+  "mostlyEvenNumbers": "பெரும்பாலும் இரட்டை எண்கள்",
+  "professions": "தொழில்கள்",
+  "householdPets": "வீட்டு செல்லப்பிராணிகள்",
+  "listTooShort": "உங்கள் பட்டியலில் போதுமான உருப்படிகளை உள்ளிட்டுள்ளீர்கள் என்பதை உறுதிப்படுத்திக்கொள்ளவும் அல்லது இங்கு குறிப்பிடப்பட்டுள்ள உருப்படிகளின் எண்ணிக்கையை அது உருவாக்காது.",
+  "allowDuplicates": "நகல்களை அனுமதிக்கவும்",
+  "value": "மதிப்பு",
+  "weight": "எடை",
+  "addBtnLabel": "சேர் &raquo;",
+  "pleaseAddItems": "தயவுசெய்து சில பொருட்களைச் சேர்க்கவும்.",
+  "helpIntro": "எடையிடப்பட்ட பட்டியல் தரவு வகையானது, தனிப்பயன் வரையறுக்கப்பட்ட பட்டியலிலிருந்து தோராயமாக தேர்ந்தெடுக்கப்பட்ட உருப்படி அல்லது உருப்படிகளை உருவாக்குகிறது, ஒவ்வொரு பொருளுக்கும் நீங்கள் பயன்படுத்த விரும்பும் எடையை காரணியாக்குகிறது. எடைப் புலமானது ஒவ்வொரு பொருளின் தோற்றத்தின் நிகழ்தகவை மாற்ற உதவுகிறது, எனவே நீங்கள் மிகவும் யதார்த்தமான தரவை உருவாக்கலாம். எடுத்துக்காட்டாக, நீங்கள் தொழில்களின் பட்டியலை உருவாக்க விரும்புகிறீர்கள், ஆனால் 'மூளை அறுவை சிகிச்சை நிபுணர்' மற்றும் 'விண்வெளி வீரர்' மிகவும் அரிதாகவே தோன்ற வேண்டும், ஏனெனில் அவை பொதுவானவை அல்ல. அதற்காக, நீங்கள் மற்றவர்களின் எடையை அதிகரிக்கலாம்:",
+  "helpValueWeight": "(மதிப்பு, எடை)",
+  "helpBrainSurgeon": "மூளை அறுவை சிகிச்சை நிபுணர், 1",
+  "helpAstronaut": "விண்வெளி வீரர், 1",
+  "helpBanker": "வங்கியாளர், 800",
+  "helpSoftwareDeveloper": "மென்பொருள் உருவாக்குநர், 1000",
+  "helpEtc": "உதவி போன்றவை.",
+  "helpOtherOptions": "தரவு வகை பின்வரும் விருப்பங்களையும் வழங்குகிறது:",
+  "helpOption1": "பட்டியலிலிருந்து குறிப்பிட்ட எண்ணிக்கையிலான உருப்படிகள் அல்லது சீரற்ற அளவின் துணைக்குழுவை உருவாக்க இது உங்களை அனுமதிக்கிறது.",
+  "helpOption2": "பல உருப்படிகளுக்கு எந்த டிலிமிட்டர் எழுத்து(கள்) பயன்படுத்தப்படுகிறதோ அதைத் தேர்ந்தெடுக்கவும்.",
+  "helpOption3": "ஒரு வரிசை ஒன்றுக்கு மேற்பட்ட உருப்படிகளை உருவாக்கும் போது நகல்களை அகற்ற வேண்டுமா என்பதைத் தேர்வுசெய்யவும்.",
+  "allowDuplicatesDesc": "உங்கள் பட்டியலிலிருந்து ஒன்றுக்கு மேற்பட்ட உருப்படிகளை உருவாக்கும்போது, இந்த அமைப்பு நகல் அனுமதிக்கப்படுகிறதா என்பதைக் கட்டுப்படுத்தும்.",
+  "delimCharsDesc": "நீங்கள் பல உருப்படிகளை உருவாக்கினால், மதிப்புகளைப் பிரிக்க எந்த எழுத்துக்குறி பயன்படுத்தப்பட வேண்டும் என்பதை இந்தப் புலம் தீர்மானிக்கிறது."
+}
diff --git a/packages/plugins/src/dataTypes/WeightedList/i18n/zh.json b/packages/plugins/src/dataTypes/WeightedList/i18n/zh.json
new file mode 100644
index 000000000..9dc8582b3
--- /dev/null
+++ b/packages/plugins/src/dataTypes/WeightedList/i18n/zh.json
@@ -0,0 +1,46 @@
+{
+  "NAME": "加权列表",
+  "DESC": "从项目列表中生成一个或多个加权随机值。",
+  "DEFAULT_TITLE": "加权列表",
+  "weightedListSettings": "加权列表设置",
+  "atMost": "最多",
+  "exactly": "确切地",
+  "numItemsLabel": "项目数",
+  "numItemsLabelDesc": "此设置控制从列表中生成的项目数。 您可以选择要生成的项目的确切数量，或您选择的范围之间的数字。",
+  "exactly1Item": "恰好是列表中的 %1 项",
+  "exactlyNItems": "正好是列表中的 %1 个项目",
+  "atMost1Item": "列表中最多 %1 项",
+  "atMostNItems": "列表中最多 %1 个项目",
+  "customize": "定制",
+  "delimChars": "分隔符字符",
+  "betweenNumItems": "在 %1 到 %2 个项目之间",
+  "atLeast1Item": "列表中至少有 %1 项",
+  "atLeastNItems": "列表中至少有 %1 项",
+  "noRangeEntered": "未输入范围",
+  "between": "之间",
+  "and": "和",
+  "items": "项目",
+  "itemsTitle": "项目",
+  "mostlyEvenNumbers": "偶数居多",
+  "professions": "职业",
+  "householdPets": "家庭宠物",
+  "listTooShort": "确保您在列表中输入了足够的项目，否则它不会生成此处指定的项目数。",
+  "allowDuplicates": "允许重复",
+  "value": "价值",
+  "weight": "重量",
+  "addBtnLabel": "添加 &raquo;",
+  "pleaseAddItems": "请添加一些项目。",
+  "helpIntro": "<b>加权列表</b> 数据类型从自定义列表中生成随机选择的一个或多个项目，将您想要应用到每个项目的任何权重都考虑在内。 权重字段允许您更改每个项目出现的概率，以便您可以创建更逼真的数据。 例如，假设您想生成一份职业列表，但希望“脑外科医生”和“宇航员”很少出现，因为它们不常见。 为此，您可以增加其他人的权重：",
+  "helpValueWeight": "（价值，重量）",
+  "helpBrainSurgeon": "脑外科医生，1",
+  "helpAstronaut": "宇航员，1",
+  "helpBanker": "银行家，800",
+  "helpSoftwareDeveloper": "软件开发人员，1000",
+  "helpEtc": "帮助等",
+  "helpOtherOptions": "数据类型还提供以下选项：",
+  "helpOption1": "它允许您从列表中生成特定数量的项目，或随机大小的子集。",
+  "helpOption2": "选择用于多个项目的任何定界符。",
+  "helpOption3": "选择当单行生成多个项目时是否要消除重复项。",
+  "allowDuplicatesDesc": "当您从列表中生成多个项目时，此设置控制是否允许重复项。",
+  "delimCharsDesc": "如果您要生成多个项目，则此字段确定应该使用什么字符来分隔这些值。"
+}
diff --git a/packages/plugins/src/exportTypes/CSV/CSV.generate.ts b/packages/plugins/src/exportTypes/CSV/CSV.generate.ts
new file mode 100644
index 000000000..a69003056
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/CSV.generate.ts
@@ -0,0 +1,35 @@
+import { ETMessageData } from '../../';
+
+export const generate = (data: ETMessageData): string => {
+  const { columns, rows, isFirstBatch, settings } = data;
+  const { delimiter, lineEndings } = settings;
+
+  const map: any = {
+    Windows: '\r\n',
+    Unix: '\n',
+    Mac: '\r'
+  };
+  const eol = map[lineEndings];
+
+  let content = '';
+  if (isFirstBatch) {
+    const titleRow = columns.map(({ title }) => title).join(delimiter);
+    content += `${titleRow}${eol}`;
+  }
+
+  const numCols = columns.length;
+  rows.forEach((row) => {
+    const cleanRow = [];
+    for (let i = 0; i < numCols; i++) {
+      // see if any of the cells contains the delimiter. If it does, wrap the cell in double quotes
+      if (row[i] && row[i].toString().indexOf(delimiter) !== -1) {
+        cleanRow.push(`"${row[i]}"`);
+      } else {
+        cleanRow.push(row[i]);
+      }
+    }
+    content += cleanRow.join(delimiter) + eol;
+  });
+
+  return content;
+};
diff --git a/packages/plugins/src/exportTypes/CSV/CSV.scss b/packages/plugins/src/exportTypes/CSV/CSV.scss
new file mode 100644
index 000000000..065084a23
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/CSV.scss
@@ -0,0 +1,11 @@
+.settings {
+	display: flex;
+
+	&>div {
+		flex: 1;
+	}
+
+	label {
+		display: block;
+	}
+}
diff --git a/packages/plugins/src/exportTypes/CSV/CSV.scss.d.ts b/packages/plugins/src/exportTypes/CSV/CSV.scss.d.ts
new file mode 100644
index 000000000..d06a46500
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/CSV.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace CsvScssNamespace {
+  export interface ICsvScss {
+    settings: string;
+  }
+}
+
+declare const CsvScssModule: CsvScssNamespace.ICsvScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: CsvScssNamespace.ICsvScss;
+};
+
+export = CsvScssModule;
diff --git a/packages/plugins/src/exportTypes/CSV/CSV.state.tsx b/packages/plugins/src/exportTypes/CSV/CSV.state.tsx
new file mode 100644
index 000000000..53bee9e97
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/CSV.state.tsx
@@ -0,0 +1,13 @@
+export type CSVSettings = {
+	delimiter: string;
+	lineEndings: 'Windows' | 'Unix' | 'Mac';
+};
+
+export const initialState: CSVSettings = {
+	delimiter: ',',
+	lineEndings: 'Unix'
+};
+
+export const defaultGenerationOptions = initialState;
+
+export type GenerationOptionsType = CSVSettings;
diff --git a/packages/plugins/src/exportTypes/CSV/CSV.tsx b/packages/plugins/src/exportTypes/CSV/CSV.tsx
new file mode 100644
index 000000000..a7877c9a3
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/CSV.tsx
@@ -0,0 +1,64 @@
+import * as React from 'react';
+import TextField from '~components/TextField';
+import Dropdown, { DropdownOption } from '~components/dropdown/Dropdown';
+import { ETDownloadPacket, ETDownloadPacketResponse, ETSettings } from '@generatedata/types';
+import { CSVSettings } from './CSV.state';
+import etShared from '../../../styles/etShared.scss';
+import styles from './CSV.scss';
+
+const options = [
+  { value: 'Windows', label: 'Windows' },
+  { value: 'Unix', label: 'Unix' },
+  { value: 'Mac', label: 'Mac' }
+];
+
+export const Settings = ({ i18n, id, data, onUpdate }: ETSettings) => {
+  const onChange = (prop: string, value: string): void => {
+    onUpdate({
+      ...data,
+      [prop]: value
+    });
+  };
+
+  return (
+    <div className={`${etShared.settingRow} ${styles.settings}`}>
+      <div>
+        <label htmlFor={`${id}-delimiter`}>{i18n.delimiterChars}</label>
+        <TextField
+          error={data.delimiter ? '' : i18n.validationNoDelimiter}
+          style={{ width: 30 }}
+          id={`${id}-delimiter`}
+          value={data.delimiter}
+          onChange={(e: any): void => onChange('delimiter', e.target.value)}
+        />
+      </div>
+      <div>
+        <label htmlFor={`${id}-eolChar`}>{i18n.eolChar}</label>
+        <Dropdown
+          id={`${id}-eolChar`}
+          value={data.lineEndings}
+          options={options}
+          onChange={({ value }: DropdownOption): void => onChange('lineEndings', value)}
+        />
+      </div>
+    </div>
+  );
+};
+
+// CSV supplies their own custom Preview component, since showing raw CSV code via CodeMirror isn't much of a preview.
+// Instead, this simply renders the preview data as a table - closer to what they're actually going to end up with
+// TODO
+// export const Preview = () => {
+//
+// };
+
+export const getCodeMirrorMode = (): string => 'application/csv';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.csv`,
+  fileType: 'application/csv'
+});
+
+export const isValid = (settings: CSVSettings): boolean => {
+  return settings.delimiter !== ''; // technically spaces are valid, I suppose
+};
diff --git a/packages/plugins/src/exportTypes/CSV/CSV.worker.ts b/packages/plugins/src/exportTypes/CSV/CSV.worker.ts
new file mode 100644
index 000000000..8008b3865
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/CSV.worker.ts
@@ -0,0 +1,8 @@
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './CSV.generate';
+
+const context: Worker = self as any;
+
+export const onmessage = (e: ETOnMessage) => {
+  context.postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/exportTypes/CSV/README.md b/packages/plugins/src/exportTypes/CSV/README.md
new file mode 100644
index 000000000..6f65e83b0
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/README.md
@@ -0,0 +1,49 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; CSV
+
+The CSV Export Type generates the random data in CSV format. It provides a couple of simple options:
+
+- `delimiter`: the character used to delimit columns 
+- `eol`: the end of line character to use. For this setting, pass a string corresponding to the eol you want to 
+use: `Windows`, `Unix` or `Mac`. These correspond to `\r\n`, `\n` and `\r` respectively.
+
+
+### Example API Usage
+
+Try POSTing the following JSON content to the following URL:
+`http://[your site]/[generate data folder]/api/v1/data`
+
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "AutoIncrement",
+            "title": "Row",
+            "settings": {
+                "incrementStart": 1,
+                "incrementValue": 1
+            }
+        },
+        {
+            "type": "Names",
+            "title": "name",
+            "settings": {
+                 "placeholder": "Name Initial. Surname"
+            }
+        }
+    ],
+    "export": {
+        "type": "CSV",
+        "settings": {
+            "delimiter": "|",
+            "eol": "Unix"
+        }
+    }
+}
+```
+
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/exportTypes/CSV/__tests__/CSV.test.tsx b/packages/plugins/src/exportTypes/CSV/__tests__/CSV.test.tsx
new file mode 100644
index 000000000..c39574898
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/__tests__/CSV.test.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import sinon from 'sinon';
+import { render } from '@testing-library/react';
+import { Settings } from '../CSV';
+import { initialState } from '../CSV.state';
+import { defaultETSettings } from '../../../../../tests/testHelpers';
+import * as langUtils from '~utils/langUtils';
+
+const i18n = require('../i18n/en.json');
+
+describe('Settings', () => {
+	it('renders', () => {
+		const data = { ...initialState };
+		const onUpdate = jest.fn();
+
+		sinon.stub(langUtils, 'getStrings').returns({
+			core: i18n,
+			dataTypes: {}
+		});
+
+		const { container } = render(
+			<Settings
+				{...defaultETSettings}
+				i18n={i18n}
+				data={data}
+				onUpdate={onUpdate}
+			/>
+		);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/exportTypes/CSV/bundle.ts b/packages/plugins/src/exportTypes/CSV/bundle.ts
new file mode 100644
index 000000000..c94592130
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/bundle.ts
@@ -0,0 +1,13 @@
+import { ETBundle } from '@generatedata/types';
+import { Settings, getCodeMirrorMode, getDownloadFileInfo, isValid } from './CSV';
+import { initialState } from './CSV.state';
+
+const bundle: ETBundle = {
+  Settings,
+  initialState,
+  getCodeMirrorMode,
+  getDownloadFileInfo,
+  isValid
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/CSV/config.ts b/packages/plugins/src/exportTypes/CSV/config.ts
new file mode 100644
index 000000000..2126ebd7b
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'core',
+  codeMirrorModes: []
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/ar.json b/packages/plugins/src/exportTypes/CSV/i18n/ar.json
new file mode 100644
index 000000000..3c50d2243
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/ar.json
@@ -0,0 +1,6 @@
+{
+	"EXPORT_TYPE_NAME": "CSV",
+	"delimiterChars": "حرف (أحرف) محدد",
+	"validationNoDelimiter": "الرجاء إدخال حرف محدد لنوع تصدير CSV.",
+	"eolChar": "نهاية حرف السطر"
+}
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/de.json b/packages/plugins/src/exportTypes/CSV/i18n/de.json
new file mode 100644
index 000000000..0456f8231
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/de.json
@@ -0,0 +1,6 @@
+{
+	"EXPORT_TYPE_NAME": "CSV",
+	"delimiterChars": "Delimiter char (s)",
+	"eolChar": "Zeilenendezeichen",
+	"validationNoDelimiter": "Bitte geben Sie ein Trennzeichen für die CSV-Export-Typ."
+}
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/en.json b/packages/plugins/src/exportTypes/CSV/i18n/en.json
new file mode 100644
index 000000000..b76cfdad2
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/en.json
@@ -0,0 +1,6 @@
+{
+	"EXPORT_TYPE_NAME": "CSV",
+	"delimiterChars": "Delimiter char(s)",
+	"validationNoDelimiter": "Please enter a delimiter character for the CSV export type.",
+	"eolChar": "End of line character"
+}
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/es.json b/packages/plugins/src/exportTypes/CSV/i18n/es.json
new file mode 100644
index 000000000..1f54bba86
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/es.json
@@ -0,0 +1,6 @@
+{
+	"EXPORT_TYPE_NAME": "CSV",
+	"delimiterChars": "Carácter(es) delimitador(es)",
+	"validationNoDelimiter": "Por favor, introduce un carácter delimitador para el tipo de exportación CSV.",
+	"eolChar": "Carácter de fin de línea"
+}
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/fr.json b/packages/plugins/src/exportTypes/CSV/i18n/fr.json
new file mode 100644
index 000000000..edbe9a7dd
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/fr.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "CSV",
+  "delimiterChars": "Caractère de séparation",
+  "validationNoDelimiter": "Entrez un caractère de séparation pour le type d'exportation CSV.",
+  "eolChar": "Caractère de fin de ligne"
+}
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/hi.json b/packages/plugins/src/exportTypes/CSV/i18n/hi.json
new file mode 100644
index 000000000..06e4522a3
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/hi.json
@@ -0,0 +1,6 @@
+{
+	"EXPORT_TYPE_NAME": "CSV",
+	"delimiterChars": "सीमांकक चार(रों)",
+	"validationNoDelimiter": "कृपया CSV निर्यात प्रकार के लिए एक सीमांकक वर्ण दर्ज करें।",
+	"eolChar": "पंक्ति वर्ण का अंत"
+}
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/ja.json b/packages/plugins/src/exportTypes/CSV/i18n/ja.json
new file mode 100644
index 000000000..41112f752
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/ja.json
@@ -0,0 +1,6 @@
+{
+	"EXPORT_TYPE_NAME": "CSV",
+	"delimiterChars": "区切り文字",
+	"validationNoDelimiter": "CSVエクスポートタイプの区切り文字を入力してください。",
+	"eolChar": "行末文字"
+}
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/nl.json b/packages/plugins/src/exportTypes/CSV/i18n/nl.json
new file mode 100644
index 000000000..daac925a0
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/nl.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "CSV",
+  "delimiterChars": "Scheidingsteken",
+  "eolChar": "Einde van de lijn karakter",
+  "validationNoDelimiter": "Geef een scheidingsteken voor het CSV export type."
+}
+
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/pt.json b/packages/plugins/src/exportTypes/CSV/i18n/pt.json
new file mode 100644
index 000000000..27c3dba49
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/pt.json
@@ -0,0 +1,6 @@
+{
+	"EXPORT_TYPE_NAME": "CSV",
+	"delimiterChars": "Delimitador de caracteres",
+	"validationNoDelimiter": "Insira um caractere delimitador para o tipo de exportação CSV.",
+	"eolChar": "Caractere de fim de linha"
+}
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/ru.json b/packages/plugins/src/exportTypes/CSV/i18n/ru.json
new file mode 100644
index 000000000..cd5f3de20
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/ru.json
@@ -0,0 +1,6 @@
+{
+	"EXPORT_TYPE_NAME": "CSV",
+	"delimiterChars": "Символ(ы) разделителя",
+	"validationNoDelimiter": "Введите символ-разделитель для типа экспорта CSV.",
+	"eolChar": "Символ конца строки"
+}
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/ta.json b/packages/plugins/src/exportTypes/CSV/i18n/ta.json
new file mode 100644
index 000000000..451ebf3f4
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/ta.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "CSV",
+  "delimiterChars": "டிலிமிட்டர் கரி (கள்)",
+  "validationNoDelimiter": "CSV ஏற்றுமதி வகைக்கு ஒரு டிலிமிட்டர் எழுத்தை உள்ளிடவும்.",
+  "eolChar": "வரி எழுத்தின் முடிவு"
+}
diff --git a/packages/plugins/src/exportTypes/CSV/i18n/zh.json b/packages/plugins/src/exportTypes/CSV/i18n/zh.json
new file mode 100644
index 000000000..8b80fd2e9
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSV/i18n/zh.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "CSV",
+  "delimiterChars": "行尾字符",
+  "validationNoDelimiter": "请输入CSV导出类型的分隔符。",
+  "eolChar": "行尾字符"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/CSharp.generate.ts b/packages/plugins/src/exportTypes/CSharp/CSharp.generate.ts
new file mode 100644
index 000000000..164cdfc53
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/CSharp.generate.ts
@@ -0,0 +1,47 @@
+import { ETMessageData } from '../../';
+import { WorkerUtils } from '../../workerUtils';
+
+export const generate = (data: ETMessageData, utils: WorkerUtils): string => {
+  const { stripWhitespace } = data;
+
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+
+  let content = '';
+  if (data.isFirstBatch) {
+    content += `var data = new [] {${newline}`;
+  }
+
+  data.rows.forEach((row: any, rowIndex: number) => {
+    content += `${tab}new {${newline}${tab}${tab}`;
+    const pairs: string[] = [];
+
+    data.columns.forEach(({ title, metadata }, colIndex) => {
+      let value = row[colIndex];
+
+      // if a DT has explicitly said it's a number, use a number
+      if (
+        metadata &&
+        metadata.general &&
+        metadata.general.dataType &&
+        metadata.general.dataType === 'number' &&
+        utils.numberUtils.isNumeric(value)
+      ) {
+        // do nothin'!
+      } else {
+        value = `"${value}"`;
+      }
+
+      pairs.push(`${title} = ${value}`);
+    });
+    content += pairs.join(`,${newline}${tab}${tab}`);
+
+    if (data.isLastBatch && rowIndex === data.rows.length - 1) {
+      content += `${newline}${tab}}${newline}};`;
+    } else {
+      content += `${newline}${tab}},${newline}`;
+    }
+  });
+
+  return content;
+};
diff --git a/packages/plugins/src/exportTypes/CSharp/CSharp.state.tsx b/packages/plugins/src/exportTypes/CSharp/CSharp.state.tsx
new file mode 100644
index 000000000..e2d9ec4d2
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/CSharp.state.tsx
@@ -0,0 +1,2 @@
+export const defaultGenerationOptions = {};
+export type GenerationOptionsType = {};
diff --git a/packages/plugins/src/exportTypes/CSharp/CSharp.tsx b/packages/plugins/src/exportTypes/CSharp/CSharp.tsx
new file mode 100644
index 000000000..f5ffd70e6
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/CSharp.tsx
@@ -0,0 +1,8 @@
+import { ETDownloadPacket, ETDownloadPacketResponse } from '@generatedata/types';
+
+export const getCodeMirrorMode = (): string => 'text/x-csharp';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.cs`,
+  fileType: ''
+});
diff --git a/packages/plugins/src/exportTypes/CSharp/CSharp.worker.ts b/packages/plugins/src/exportTypes/CSharp/CSharp.worker.ts
new file mode 100644
index 000000000..7bf675bfc
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/CSharp.worker.ts
@@ -0,0 +1,15 @@
+import utils from '../../../utils';
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './CSharp.generate';
+
+let workerUtilsLoaded = false;
+const context: Worker = self as any;
+
+export const onmessage = (e: ETOnMessage) => {
+  if (!workerUtilsLoaded) {
+    importScripts(e.data.workerUtilsUrl);
+    workerUtilsLoaded = true;
+  }
+
+  context.postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/exportTypes/CSharp/README.md b/packages/plugins/src/exportTypes/CSharp/README.md
new file mode 100644
index 000000000..1c1cae6c0
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/README.md
@@ -0,0 +1 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; CSharp
diff --git a/packages/plugins/src/exportTypes/CSharp/bundle.ts b/packages/plugins/src/exportTypes/CSharp/bundle.ts
new file mode 100644
index 000000000..31f4f793a
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/bundle.ts
@@ -0,0 +1,9 @@
+import { ETBundle } from '@generatedata/types';
+import { getCodeMirrorMode, getDownloadFileInfo } from './CSharp';
+
+const bundle: ETBundle = {
+  getCodeMirrorMode,
+  getDownloadFileInfo
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/CSharp/config.ts b/packages/plugins/src/exportTypes/CSharp/config.ts
new file mode 100644
index 000000000..4470accff
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'programmingLanguage',
+  codeMirrorModes: ['javascript/javascript', 'clike/clike']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/ar.json b/packages/plugins/src/exportTypes/CSharp/i18n/ar.json
new file mode 100644
index 000000000..d80c652b9
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "اسم الخاصية"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/de.json b/packages/plugins/src/exportTypes/CSharp/i18n/de.json
new file mode 100644
index 000000000..9186585ab
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "Name des Anwesens"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/en.json b/packages/plugins/src/exportTypes/CSharp/i18n/en.json
new file mode 100644
index 000000000..c425224f1
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "Property Name"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/es.json b/packages/plugins/src/exportTypes/CSharp/i18n/es.json
new file mode 100644
index 000000000..5e3682862
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "Nombre de la propiedad"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/fr.json b/packages/plugins/src/exportTypes/CSharp/i18n/fr.json
new file mode 100644
index 000000000..ffb8406cd
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "Nom de la propriété"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/hi.json b/packages/plugins/src/exportTypes/CSharp/i18n/hi.json
new file mode 100644
index 000000000..7fd652a42
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "संपत्ति का नाम"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/ja.json b/packages/plugins/src/exportTypes/CSharp/i18n/ja.json
new file mode 100644
index 000000000..69da77795
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "プロパティ名"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/nl.json b/packages/plugins/src/exportTypes/CSharp/i18n/nl.json
new file mode 100644
index 000000000..c7e243a76
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "Eigendomsnaam"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/pt.json b/packages/plugins/src/exportTypes/CSharp/i18n/pt.json
new file mode 100644
index 000000000..9a51b8c29
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "Nome da propriedade"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/ru.json b/packages/plugins/src/exportTypes/CSharp/i18n/ru.json
new file mode 100644
index 000000000..c4045b4c1
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "Имя свойства"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/ta.json b/packages/plugins/src/exportTypes/CSharp/i18n/ta.json
new file mode 100644
index 000000000..db956716c
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "சொத்தின் பெயர்"
+}
diff --git a/packages/plugins/src/exportTypes/CSharp/i18n/zh.json b/packages/plugins/src/exportTypes/CSharp/i18n/zh.json
new file mode 100644
index 000000000..8df0e6d78
--- /dev/null
+++ b/packages/plugins/src/exportTypes/CSharp/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "C#",
+  "COL_TITLE": "物业名称"
+}
diff --git a/packages/plugins/src/exportTypes/HTML/HTML.generate.ts b/packages/plugins/src/exportTypes/HTML/HTML.generate.ts
new file mode 100644
index 000000000..e7c6c0aab
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/HTML.generate.ts
@@ -0,0 +1,87 @@
+import { ETMessageData } from '../../';
+
+export const generate = (data: any): string => {
+  const { exportFormat } = data.settings;
+
+  let content = '';
+  if (exportFormat === 'table') {
+    content = generateTableFormat(data);
+  } else if (exportFormat === 'ul') {
+    content = generateUlFormat(data);
+  } else if (exportFormat === 'dl') {
+    content = generateDlFormat(data);
+  }
+
+  return content;
+};
+
+export const generateTableFormat = (data: ETMessageData): string => {
+  const stripWhitespace = data.stripWhitespace;
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+
+  let content = '';
+  if (data.isFirstBatch) {
+    content += `<table>${newline}${tab}<tr>${newline}`;
+    data.columns.forEach(({ title }) => {
+      content += `${tab}${tab}<th>${title}</th>${newline}`;
+    });
+    content += `${tab}</tr>${newline}`;
+  }
+
+  data.rows.forEach((row) => {
+    content += `${tab}<tr>${newline}`;
+    data.columns.forEach((col, colIndex) => {
+      content += `${tab}${tab}<td>${row[colIndex]}</td>${newline}`;
+    });
+    content += `${tab}</tr>${newline}`;
+  });
+
+  if (data.isLastBatch) {
+    content += '</table>';
+  }
+
+  return content;
+};
+
+export const generateUlFormat = (data: ETMessageData): string => {
+  const stripWhitespace = data.stripWhitespace;
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+
+  let content = '';
+  if (data.isFirstBatch) {
+    content += `<ul class="columns">${newline}`;
+    data.columns.forEach(({ title }) => {
+      content += `${tab}<li>${title}</li>${newline}`;
+    });
+    content += `</ul>${newline}`;
+  }
+
+  data.rows.forEach((row) => {
+    content += `<ul>${newline}`;
+    data.columns.forEach((col, colIndex) => {
+      content += `${tab}<li>${row[colIndex]}</li>${newline}`;
+    });
+    content += `</ul>${newline}`;
+  });
+
+  return content;
+};
+
+export const generateDlFormat = (data: ETMessageData): string => {
+  const stripWhitespace = data.stripWhitespace;
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+
+  let content = '';
+  data.rows.forEach((row) => {
+    content += `<dl>${newline}`;
+    data.columns.forEach(({ title }, colIndex) => {
+      content += `${tab}<dt>${title}</dt>${newline}`;
+      content += `${tab}<dd>${row[colIndex]}</dd>${newline}`;
+    });
+    content += `</dl>${newline}`;
+  });
+  return content;
+};
diff --git a/packages/plugins/src/exportTypes/HTML/HTML.state.tsx b/packages/plugins/src/exportTypes/HTML/HTML.state.tsx
new file mode 100644
index 000000000..ad9db98f4
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/HTML.state.tsx
@@ -0,0 +1,18 @@
+import { ETState } from '@generatedata/types';
+
+export type ExportFormat = 'table' | 'ul' | 'dl';
+
+export type GenerationOptionsType = {
+  exportFormat: ExportFormat;
+};
+
+export const defaultGenerationOptions: GenerationOptionsType = {
+  exportFormat: 'table'
+};
+
+export interface HTMLSettings extends ETState, GenerationOptionsType {}
+
+export const initialState: HTMLSettings = {
+  ...defaultGenerationOptions,
+  isValid: true // there's no way the config settings for the HTML ET can be misconfigured, so this is always true
+};
diff --git a/packages/plugins/src/exportTypes/HTML/HTML.tsx b/packages/plugins/src/exportTypes/HTML/HTML.tsx
new file mode 100644
index 000000000..18037691c
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/HTML.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import etShared from '../../../styles/etShared.scss';
+import { ETDownloadPacket, ETDownloadPacketResponse, ETSettings } from '@generatedata/types';
+import { ExportFormat } from './HTML.state';
+
+export const Settings = ({ i18n, id, data, onUpdate }: ETSettings) => {
+  const onChange = (exportFormat: ExportFormat): void => {
+    onUpdate({
+      ...data,
+      exportFormat
+    });
+  };
+
+  return (
+    <div className={etShared.settingRow}>
+      <label>{i18n.dataFormat}</label>
+      <RadioPillRow>
+        <RadioPill
+          label="table"
+          onClick={(): void => onChange('table')}
+          name={`${id}-dataFormat`}
+          checked={data.exportFormat === 'table'}
+        />
+        <RadioPill label="ul" onClick={(): void => onChange('ul')} name={`${id}-dataFormat`} checked={data.exportFormat === 'ul'} />
+        <RadioPill label="dl" onClick={(): void => onChange('dl')} name={`${id}-dataFormat`} checked={data.exportFormat === 'dl'} />
+      </RadioPillRow>
+    </div>
+  );
+};
+
+export const getCodeMirrorMode = (): string => 'text/html';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.html`,
+  fileType: 'text/html'
+});
diff --git a/packages/plugins/src/exportTypes/HTML/HTML.worker.ts b/packages/plugins/src/exportTypes/HTML/HTML.worker.ts
new file mode 100644
index 000000000..150edac1d
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/HTML.worker.ts
@@ -0,0 +1,8 @@
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './HTML.generate';
+
+const context: Worker = self as any;
+
+context.onmessage = (e: ETOnMessage) => {
+  context.postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/exportTypes/HTML/README.md b/packages/plugins/src/exportTypes/HTML/README.md
new file mode 100644
index 000000000..ec2846133
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/README.md
@@ -0,0 +1,82 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; HTML
+
+This plugin outputs the data in HTML format. You can either choose to output the data in a `<table>`, a `<ul>` or 
+`<dl>`'s, or if you're feeling really fancy, you can control the exact output via a custom Smarty template. The 
+latter's intended for advanced users and requires knowledge of the PHP Smarty templating language
+
+### Example API Usage
+
+Try POSTing the following JSON content to the following URL:
+`http://[your site]/[generate data folder]/api/v1/data`
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "AutoIncrement",
+            "title": "Row",
+            "settings": {
+                "incrementStart": 1,
+                "incrementValue": 1
+            }
+        },
+        {
+            "type": "Names",
+            "title": "name",
+            "settings": {
+                "placeholder": "Name Initial. Surname"
+            }
+        }
+    ],
+    "export": {
+        "type": "HTML",
+        "settings": {
+            "exportFormat": "table"
+        }
+    }
+}
+```
+
+### Custom template example
+
+Here's a second example that uses a custom Smarty template to customize the generated HTML. Note: the inconvenient 
+thing about using the API for this is that you need to serialize the template into a single line. Yeah, that's a pain. 
+
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "AutoIncrement",
+            "title": "Row",
+            "settings": {
+                "incrementStart": 1,
+                "incrementValue": 1
+            }
+        },
+        {
+            "type": "Names",
+            "title": "name",
+            "settings": {
+                "placeholder": "Name Initial. Surname"
+            }
+        }
+    ],
+    "export": {
+        "type": "HTML",
+        "settings": {
+            "exportFormat": "custom",
+            "customTemplate": "{if $isFirstBatch}<table cellspacing=\"0\" cellpadding=\"1\">\n<tr>\n{foreach $colData as $col}  <th>{$col}</th>\n{/foreach}\n</tr>\n{/if}{foreach $rowData as $row}<tr>\n{foreach $row as $r}  <td>{$r}</td>\n{/foreach}</tr>\n{/foreach}{if $isLastBatch}</table>{/if}"
+        }
+    }
+}
+```
+
+
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
+
diff --git a/packages/plugins/src/exportTypes/HTML/__tests__/HTML.test.tsx b/packages/plugins/src/exportTypes/HTML/__tests__/HTML.test.tsx
new file mode 100644
index 000000000..54c0e2d39
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/__tests__/HTML.test.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Settings } from '../HTML';
+import { initialState } from '../HTML.state';
+import { defaultETSettings } from '../../../../../tests/testHelpers';
+
+const i18n = require('../i18n/en.json');
+
+describe('Settings', () => {
+	it('renders', () => {
+		const data = { ...initialState };
+		const onUpdate = jest.fn();
+
+		const { container } = render(
+			<Settings
+				{...defaultETSettings}
+				i18n={i18n}
+				data={data}
+				onUpdate={onUpdate}
+			/>
+		);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/exportTypes/HTML/bundle.ts b/packages/plugins/src/exportTypes/HTML/bundle.ts
new file mode 100644
index 000000000..218a3465e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/bundle.ts
@@ -0,0 +1,12 @@
+import { ETBundle } from '@generatedata/types';
+import { Settings, getCodeMirrorMode, getDownloadFileInfo } from './HTML';
+import { initialState } from './HTML.state';
+
+const bundle: ETBundle = {
+  Settings,
+  initialState,
+  getCodeMirrorMode,
+  getDownloadFileInfo
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/HTML/config.ts b/packages/plugins/src/exportTypes/HTML/config.ts
new file mode 100644
index 000000000..d9c7b99d1
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'core',
+  codeMirrorModes: ['htmlmixed/htmlmixed', 'javascript/javascript', 'xml/xml', 'css/css']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/ar.json b/packages/plugins/src/exportTypes/HTML/i18n/ar.json
new file mode 100644
index 000000000..ffef72f19
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/ar.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "عنوان العمود",
+  "dataFormat": "تنسيق البيانات",
+  "batchVars": "القيم المنطقية لمعرفة ما إذا كانت الدفعة الحالية من النتائج التي يتم إنشاؤها هي الأولى أم الأخيرة. يتم استخدام هذا فقط للمستخدمين الذين يقومون بإنشاء البيانات في الصفحة ، مما يؤدي إلى إنشاء النتائج في أجزاء. بالنسبة لجميع المواقف الأخرى ، كلاهما صحيح دائمًا."
+}
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/de.json b/packages/plugins/src/exportTypes/HTML/i18n/de.json
new file mode 100644
index 000000000..771e5236f
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/de.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "Spaltentitel",
+  "dataFormat": "Datenformat",
+  "batchVars": "Boolsche ob die aktuelle Charge der Ergebnisse erzeugt ist die erste oder letzte. Dies wird immer nur für Benutzer Erzeugen der Daten in-Seite, die die Ergebnisse in Blöcken generiert verwendet. In allen anderen Situationen, beide sind immer wahr."
+}
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/en.json b/packages/plugins/src/exportTypes/HTML/i18n/en.json
new file mode 100644
index 000000000..c3722c8ea
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/en.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "Column Title",
+  "dataFormat": "Data format",
+  "batchVars": "Booleans for whether or not the current batch of results being generated is the first or last. This is only ever used for users generating the data in-page, which generates the results in chunks. For all other situations, both are always true."
+}
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/es.json b/packages/plugins/src/exportTypes/HTML/i18n/es.json
new file mode 100644
index 000000000..954124f4b
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/es.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "Título de la columna",
+  "dataFormat": "Formato de datos",
+  "batchVars": "Indica si el lote actual de resultados que será generado será el primero o el último. Esto sólo se usa para datos generado en la misma página, lo que genera los resultados por lotes. En el resto de situaciones, ambos son verdaderos."
+}
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/fr.json b/packages/plugins/src/exportTypes/HTML/i18n/fr.json
new file mode 100644
index 000000000..766dfd6bc
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/fr.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "Titre de la colonne",
+  "dataFormat": "Format des données",
+  "batchVars": "Booléen permettant de savoir si le lot courant des résultats générés est le premier ou le dernier. N'est utilisé que dans le cas d'une génération des données dans la page, ce qui génère des résultats en morceaux. Pour tous les autres cas, les deux valeurs sont toujours vrai."
+}
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/hi.json b/packages/plugins/src/exportTypes/HTML/i18n/hi.json
new file mode 100644
index 000000000..6c9783078
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/hi.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "कॉलम शीर्षक",
+  "dataFormat": "डेटा स्वरूप",
+  "batchVars": "उत्पन्न होने वाले परिणामों का वर्तमान बैच पहला या अंतिम है या नहीं, इसके लिए बूलियन। यह केवल उन उपयोगकर्ताओं के लिए उपयोग किया जाता है जो इन-पेज डेटा उत्पन्न करते हैं, जो परिणामों को विखंडू में उत्पन्न करता है। अन्य सभी स्थितियों के लिए, दोनों हमेशा सत्य होते हैं।"
+}
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/ja.json b/packages/plugins/src/exportTypes/HTML/i18n/ja.json
new file mode 100644
index 000000000..e71533c1e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/ja.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "列タイトル",
+  "dataFormat": "データ形式",
+  "batchVars": "生成されている結果の現在のバッチが最初であるか最後であるかを示すブール値。 これは、結果をチャンクで生成するページ内のデータを生成するユーザーにのみ使用されます。 他のすべての状況では、両方が常に当てはまります。"
+}
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/nl.json b/packages/plugins/src/exportTypes/HTML/i18n/nl.json
new file mode 100644
index 000000000..59863f4d5
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/nl.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "Kolomtitel",
+  "batchVars": "Booleans om aan te geven van de huidige export batch de eerste van de laatste is. Dit wordt alleen gebruikt bij data die in-page wordt gegenereerd, waarbij de resultaten in blokken worden gegenereerd. In alle andere gevallen is deze waarde altijd waar.",
+  "dataFormat": "Data Formaat"
+}
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/pt.json b/packages/plugins/src/exportTypes/HTML/i18n/pt.json
new file mode 100644
index 000000000..1b900fb88
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/pt.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "Título da Coluna",
+  "dataFormat": "Formato de dados",
+  "batchVars": "Booleanos para definir se o lote atual de resultados sendo gerado é o primeiro ou o último. Isso só é usado para usuários que geram os dados na página, o que gera os resultados em blocos. Para todas as outras situações, ambos são sempre verdadeiros."
+}
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/ru.json b/packages/plugins/src/exportTypes/HTML/i18n/ru.json
new file mode 100644
index 000000000..635c6e5b3
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/ru.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "Название столбца",
+  "dataFormat": "Формат данных",
+  "batchVars": "Логические значения, определяющие, является ли текущая партия генерируемых результатов первой или последней. Это когда-либо используется только для пользователей, генерирующих данные на странице, которые генерируют результаты в виде фрагментов. Для всех других ситуаций оба всегда верны."
+}
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/ta.json b/packages/plugins/src/exportTypes/HTML/i18n/ta.json
new file mode 100644
index 000000000..63408fc54
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/ta.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "நெடுவரிசை தலைப்பு",
+  "dataFormat": "தரவு வடிவம்",
+  "batchVars": "தற்போதைய தொகுதி முடிவுகள் உருவாக்கப்படுகிறதா இல்லையா என்பதற்கான பூலியன்ஸ் முதல் அல்லது கடைசி. பக்கத்திலுள்ள தரவை உருவாக்கும் பயனர்களுக்கு மட்டுமே இது எப்போதும் பயன்படுத்தப்படுகிறது, இது துகள்களில் முடிவுகளை உருவாக்குகிறது. மற்ற எல்லா சூழ்நிலைகளுக்கும், இரண்டும் எப்போதும் உண்மைதான்."
+}
diff --git a/packages/plugins/src/exportTypes/HTML/i18n/zh.json b/packages/plugins/src/exportTypes/HTML/i18n/zh.json
new file mode 100644
index 000000000..cf27d43fc
--- /dev/null
+++ b/packages/plugins/src/exportTypes/HTML/i18n/zh.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "HTML",
+  "COL_TITLE": "栏标题",
+  "dataFormat": "资料格式",
+  "batchVars": "布尔值，用于确定当前生成的结果批次是第一个还是最后一个。 仅用于生成页内数据的用户，页内数据以块的形式生成结果。 对于所有其他情况，两者始终都是正确的。"
+}
diff --git a/packages/plugins/src/exportTypes/JSON/JSON.generate.ts b/packages/plugins/src/exportTypes/JSON/JSON.generate.ts
new file mode 100644
index 000000000..8c6072282
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/JSON.generate.ts
@@ -0,0 +1,125 @@
+import { ETMessageData } from '../../';
+import { WorkerUtils } from '../../';
+
+let utils: WorkerUtils;
+export const generate = (data: any, workerUtils: WorkerUtils): string => {
+  utils = workerUtils;
+
+  const { settings, stripWhitespace } = data;
+
+  return settings.dataStructureFormat === 'simple' ? generateSimple(data, stripWhitespace) : generateComplex(data, stripWhitespace);
+};
+
+const maybeEnquote = (value: any) => {
+  const isNumeric = utils.numberUtils.isNumeric(value);
+
+  let startsWithZero = false;
+  if ((value || '').toString().length > 0) {
+    startsWithZero = value.toString()[0] === '0';
+  }
+  const isValidNumber = isNumeric && !startsWithZero;
+  if (!isValidNumber && !isJavascriptBoolean(value)) {
+    value = `"${value}"`;
+  }
+
+  return value;
+};
+
+const generateSimple = (generationData: ETMessageData, stripWhitespace: boolean): string => {
+  let content = '';
+  let comma = '';
+
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+  const space = stripWhitespace ? '' : ' ';
+
+  if (generationData.isFirstBatch) {
+    content += '[';
+  } else {
+    comma = ',';
+  }
+
+  generationData.rows.forEach((row: any) => {
+    content += `${comma}${newline}${tab}{`;
+    comma = '';
+
+    generationData.columns.forEach(({ title, metadata }: any, colIndex: number) => {
+      const propName: string = title.replace(/"/, '"');
+
+      let value = row[colIndex];
+
+      // if a DT has explicitly said it's a string, use a string
+      if (metadata && metadata.general && metadata.general.dataType && metadata.general.dataType === 'string') {
+        value = `"${value}"`;
+
+        // otherwise, do a safety check and encase it in double quote if necessary
+      } else {
+        value = maybeEnquote(value);
+      }
+
+      content += `${comma}${newline}${tab}${tab}"${propName}":${space}${value}`;
+      comma = ',';
+    });
+
+    content += `${newline}${tab}}`;
+  });
+
+  if (generationData.isLastBatch) {
+    content += `${newline}]`;
+  }
+
+  return content;
+};
+
+const generateComplex = (generationData: ETMessageData, stripWhitespace: boolean): string => {
+  let content = '';
+  const colTitles = generationData.columns.map(({ title }: any) => title);
+
+  if (generationData.isFirstBatch) {
+    if (stripWhitespace) {
+      const cols = `"${colTitles.join('","')}"`;
+      content += `{"cols":[${cols}],"data":[`;
+    } else {
+      const cols = `"${colTitles.join('",\n\t\t"')}"`;
+      content += `{\n\t"cols": [\n\t\t${cols}\n\t],\n\t"data": [\n`;
+    }
+  }
+
+  const numRows = generationData.rows.length;
+  generationData.rows.forEach((row: any, rowIndex: number) => {
+    const rowValsArr: any[] = [];
+    colTitles.forEach((colTitle: string, colIndex: number) => {
+      let value = row[colIndex];
+      value = maybeEnquote(value);
+      rowValsArr.push(value);
+    });
+
+    if (stripWhitespace) {
+      const rowVals = rowValsArr.join(',');
+      content += `[${rowVals}]`;
+      if (rowIndex < numRows - 1) {
+        content += ',';
+      }
+    } else {
+      const rowVals = rowValsArr.join(',\n\t\t\t');
+      content += `\t\t[\n\t\t\t${rowVals}\n\t\t]`;
+      if (rowIndex < numRows - 1) {
+        content += ',\n';
+      } else if (!generationData.isLastBatch) {
+        content += ',\n';
+      }
+    }
+  });
+
+  if (generationData.isLastBatch) {
+    if (stripWhitespace) {
+      content += ']}';
+    } else {
+      content += '\n\t]\n}';
+    }
+  }
+
+  return content;
+};
+
+const isJavascriptBoolean = (n: any): boolean => n === 'true' || n === 'false' || n === true || n === false;
diff --git a/packages/plugins/src/exportTypes/JSON/JSON.state.ts b/packages/plugins/src/exportTypes/JSON/JSON.state.ts
new file mode 100644
index 000000000..fccbdc6ff
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/JSON.state.ts
@@ -0,0 +1,16 @@
+import { ETState } from '@generatedata/types';
+
+export type DataStructureFormat = 'simple' | 'complex';
+
+export interface GenerationOptionsType {
+  dataStructureFormat: DataStructureFormat;
+}
+
+export interface JSONSettings extends ETState, GenerationOptionsType {}
+
+export const initialState: JSONSettings = {
+  dataStructureFormat: 'simple',
+  isValid: true
+};
+
+export const defaultGenerationOptions = initialState;
diff --git a/packages/plugins/src/exportTypes/JSON/JSON.tsx b/packages/plugins/src/exportTypes/JSON/JSON.tsx
new file mode 100644
index 000000000..e7477fdb8
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/JSON.tsx
@@ -0,0 +1,41 @@
+import * as React from 'react';
+import { ETDownloadPacket, ETDownloadPacketResponse, ETSettings } from '@generatedata/types';
+import etShared from '../../../styles/etShared.scss';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+
+export const Settings = ({ data, id, i18n, onUpdate }: ETSettings) => {
+  const onChange = (field: string, value: any): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  return (
+    <div className={etShared.settingRow}>
+      <label>{i18n.dataStructureFormat}</label>
+
+      <RadioPillRow>
+        <RadioPill
+          label={i18n.simple}
+          onClick={(): void => onChange('dataStructureFormat', 'simple')}
+          name={`${id}-simple`}
+          checked={data.dataStructureFormat === 'simple'}
+        />
+        <RadioPill
+          label={i18n.complex}
+          onClick={(): void => onChange('dataStructureFormat', 'complex')}
+          name={`${id}-complex`}
+          checked={data.dataStructureFormat === 'complex'}
+        />
+      </RadioPillRow>
+    </div>
+  );
+};
+
+export const getCodeMirrorMode = (): string => 'application/ld+json';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.json`,
+  fileType: 'application/json'
+});
diff --git a/packages/plugins/src/exportTypes/JSON/JSON.worker.ts b/packages/plugins/src/exportTypes/JSON/JSON.worker.ts
new file mode 100644
index 000000000..e0ae6afd7
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/JSON.worker.ts
@@ -0,0 +1,15 @@
+import utils from '../../../utils';
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './JSON.generate';
+
+const context: Worker = self as any;
+
+let workerUtilsLoaded = false;
+export const onmessage = (e: ETOnMessage) => {
+  if (!workerUtilsLoaded) {
+    importScripts(e.data.workerUtilsUrl);
+    workerUtilsLoaded = true;
+  }
+
+  context.postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/exportTypes/JSON/README.md b/packages/plugins/src/exportTypes/JSON/README.md
new file mode 100644
index 000000000..cde61ee39
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/README.md
@@ -0,0 +1,178 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; JSON
+
+- [Intro](#intro)
+- [Example API Usage](#example-api-usage)
+- [API Help](#api-help)
+- [Generating complex objects](#generating-complex-objects)
+
+
+
+### Intro
+ 
+The JSON Export Type generates the random data in JSON format. It provides a couple of simple options:
+
+- `stripWhitespace` to keep file size down
+- `dataStructureFormat`: this should be set to a string, and can be `simple` or `complex` - `simple` means that it 
+outputs a simple array of objects, with each object being grouped in key-value pairs based on whatever title you entered
+for the row; `complex` arranges the generated content differently: it groups the generated data into two top level 
+properties, like this:
+
+```javascript
+{
+	"cols": [
+		"name",
+		"email"
+	],
+	"data": [
+		[
+		    "Tom Filkin",
+			"eu.odio.Phasellus@utodio.net"
+		],
+		[
+		    "Ed Phillips",
+			"vulputate.velit.eu@metus.edu"
+		],
+		[
+		    "Sally Etkins",
+			"ut@et.net"
+		]
+	]
+}
+```
+
+
+### Example API Usage
+
+To generate JSON data using the API, you need to specify the JSON Export Type in the `export` setting and post the 
+JSON content to here: 
+`http://[your site]/[generate data folder]/api/v1/data`
+
+Here's an example pulled from the Alphanumeric Data Type example:
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "Alphanumeric",
+            "title": "Random Password",
+            "settings": {
+                "placeholder": "LLLxxLLLxLL"
+            }
+        },
+        {
+            "type": "Alphanumeric",
+            "title": "US Zipcode",
+            "settings": {
+                "placeholder": "xxxxx"
+            }
+        }
+    ],
+    "export": {
+        "type": "JSON",
+        "settings": {
+            "stripWhitespace": false,
+            "dataStructureFormat": "simple"
+        }
+    }
+}
+```
+
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
+
+
+### Generating Complex Objects
+
+As of 3.2.5, @tohagan added a nice feature to allow the *Simple* JSON format to generate nested objects. This is how 
+it works.
+
+When field names contain "." delimiters and a JSON | Simple export is selected, nested objects will be 
+generated corresponding to the structure of the fields names.  The only restriction is that fields related to the same 
+object must be sequential.
+
+
+#### Example 1: 2 Field Names
+
+- name.first
+- name.last
+- address.0 
+- address.1
+
+##### Generates:
+
+```javascript
+	[
+		{
+			"name": {
+				"first": "Rahim",
+				"last": "Wyatt"
+			},
+			"address": {
+				"0": "Ap #496-4933 Non, Street",
+				"1": "190-7424 Malesuada Street"
+			}
+		},
+		{
+			"name": {
+				"first": "Emi",
+				"last": "King"
+			},
+			"address": {
+				"0": "5331 Lacinia. Avenue",
+				"1": "486-7654 Nisl Road"
+			}
+		}
+	]
+```
+
+#### Example 2: 3-level Nested JSON 
+
+Field names ... All "Email" type
+
+- a
+- b.c
+- b.d.e
+- b.d.f
+- b.p.a
+- b.p.b
+
+
+##### Generates:
+
+```javascript
+	[
+		{
+			"a": "et.commodo@amet.org",
+			"b": {
+				"c": "vestibulum.neque.sed@nuncsedlibero.org",
+				"d": {
+					"e": "ac@musAeneaneget.ca",
+					"f": "tellus.Suspendisse@etpedeNunc.ca"
+				},
+				"p": {
+					"a": "est.ac@nostra.ca",
+					"b": "et.tristique@rutrum.org"
+				}
+			}
+		},
+		{
+			"a": "sit.amet.ante@varius.com",
+			"b": {
+				"c": "et@neque.net",
+				"d": {
+					"e": "lacus.Quisque@Nullatempor.edu",
+					"f": "ac@sem.edu"
+				},
+				"p": {
+					"a": "libero.dui.nec@sit.ca",
+					"b": "nec@malesuada.com"
+				}
+			}
+		}
+	]
+```
+
+
diff --git a/packages/plugins/src/exportTypes/JSON/__tests__/JSON.generator.test.ts b/packages/plugins/src/exportTypes/JSON/__tests__/JSON.generator.test.ts
new file mode 100644
index 000000000..42fd71b23
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/__tests__/JSON.generator.test.ts
@@ -0,0 +1,170 @@
+test.skip('skip', () => {});
+
+// import { generateSimple, isNested } from '../JSON.generator';
+// import { ETMessageData } from '../../';
+//
+//
+// describe('isNested', () => {
+//     it('should return false when no columns have dots in them', () => {
+//         const cols = [
+//             'one',
+//             'two',
+//             'three'
+//         ];
+//         expect(isNested(cols)).toEqual(false);
+//     });
+//
+//     it('should return false when there are no columns', () => {
+//         expect(isNested([])).toEqual(false);
+//     });
+//
+//
+//     it('should return true when one item contains a dot', () => {
+//         expect(isNested(['a.c', 'b', 'c'])).toEqual(true);
+//         expect(isNested(['a', 'b.e', 'b.c'])).toEqual(true);
+//         expect(isNested(['a', 'b', 'b.c'])).toEqual(true);
+//     });
+// });
+//
+//
+// describe('generateSimple', () => {
+//     const data: ETMessageData = {
+//         columns: [
+//         	{ title: 'One', dataType: 'Names' },
+// 			{ title: 'Two', dataType: 'Names' }
+// 		],
+//         rows: [
+//             ['Row #1, Cell #1', 'Row #1, Cell #2'],
+//             ['Row #2, Cell #1', 'Row #2, Cell #2']
+//         ],
+//         isFirstBatch: true,
+//         isLastBatch: true,
+// 		dataTypeMetadata: {}
+//     };
+//
+//     // my IDE likes to convert tabs to spaces & I'm not going to argue with it. This'll work across all developers
+//     // systems, regardless of their preferences
+//     it('should return expected JSON content', () => {
+//         expect(generateSimple(data, false)).toEqual(
+// `[
+// \t{
+// \t\t"One": "Row #1, Cell #1",
+// \t\t"Two": "Row #1, Cell #2"
+// \t},
+// \t{
+// \t\t"One": "Row #2, Cell #1",
+// \t\t"Two": "Row #2, Cell #2"
+// \t}
+// ]`
+//         );
+//     });
+//
+//     it('should return expected minified JSON content', () => {
+//         expect(generateSimple(data, true)).toEqual(
+//             `[{"One":"Row #1, Cell #1","Two":"Row #1, Cell #2"},{"One":"Row #2, Cell #1","Two":"Row #2, Cell #2"}]`
+//         );
+//     });
+//
+//     it('should escape double quotes within property names', () => {
+//         const doubleQuoteData: ETMessageData = {
+//             columns: [
+//             	{ title: 'Name', dataType: 'Names' },
+// 				{ title: '"Phone" Number', dataType: 'Names' }
+// 			],
+//             rows: [
+//                 ['Tom', '(604) 123-1234'],
+//                 ['Susan', '(604) 733-1224'],
+//             ],
+//             isFirstBatch: true,
+//             isLastBatch: true,
+// 			dataTypeMetadata: {}
+//         };
+//
+//         expect(generateSimple(doubleQuoteData, false)).toEqual(
+//             `[
+// \t{
+// \t\t"Name": "Tom",
+// \t\t"\"Phone\" Number": "(604) 123-1234"
+// \t},
+// \t{
+// \t\t"Name": "Susan",
+// \t\t"\"Phone\" Number": "(604) 733-1224"
+// \t}
+// ]`
+//         );
+//     });
+//
+//     it('should escape double quotes within values', () => {
+//         const doubleQuoteValueData: ETMessageData = {
+//             columns: [
+//             	{ title: 'Name', dataType: 'Names' },
+// 				{ title: 'Phone', dataType: 'Names' }
+// 			],
+//             rows: [
+//                 ['Tom', '"Whoah" he said...'],
+//                 ['Susan', 'Like "TOTALLY!"'],
+//             ],
+//             isFirstBatch: true,
+//             isLastBatch: true,
+// 			dataTypeMetadata: {}
+//         };
+//
+//         expect(generateSimple(doubleQuoteValueData, false)).toEqual(
+//             `[
+// \t{
+// \t\t"Name": "Tom",
+// \t\t"Phone": "\"Whoah\" he said..."
+// \t},
+// \t{
+// \t\t"Name": "Susan",
+// \t\t"Phone": "Like \"TOTALLY!\""
+// \t}
+// ]`
+//         );
+//     });
+//
+//     it('should not put double quotes around numbers', () => {
+//         const numData: ETMessageData = {
+//             columns: [
+// 				{ title: 'Num1', dataType: 'Names' },
+// 				{ title: 'Num2', dataType: 'Names' },
+// 				{ title: 'Num3', dataType: 'Names' },
+// 				{ title: 'Num4', dataType: 'Names' },
+// 				{ title: 'Num5', dataType: 'Names' },
+// 				{ title: 'Num6', dataType: 'Names' }
+// 			],
+//             rows: [
+//                 ['0', 0, '1', 1, '1.23', 1.23]
+//             ],
+//             isFirstBatch: true,
+//             isLastBatch: true,
+// 			dataTypeMetadata: {}
+//         };
+//
+//         expect(generateSimple(numData, true)).toEqual(
+//             `[{"Num1":0,"Num2":0,"Num3":1,"Num4":1,"Num5":1.23,"Num6":1.23}]`
+//         );
+//     });
+//
+//     it('should not put double quotes around boolean values', () => {
+//         const numData: ETMessageData = {
+//             columns: [
+//             	{ title: 'a', dataType: 'Names' },
+// 				{ title: 'b', dataType: 'Names' },
+// 				{ title: 'c', dataType: 'Names' },
+// 				{ title: 'd', dataType: 'Names' }
+// 			],
+//             rows: [
+//                 ['false', false, 'true', true]
+//             ],
+//             isFirstBatch: true,
+//             isLastBatch: true,
+// 			dataTypeMetadata: {}
+//         };
+//
+//         expect(generateSimple(numData, true)).toEqual(
+//             `[{"a":false,"b":false,"c":true,"d":true}]`
+//         );
+//     });
+//
+// });
diff --git a/packages/plugins/src/exportTypes/JSON/__tests__/JSON.test.tsx b/packages/plugins/src/exportTypes/JSON/__tests__/JSON.test.tsx
new file mode 100644
index 000000000..4e865a15b
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/__tests__/JSON.test.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Settings } from '../JSON';
+import { initialState } from '../JSON.state';
+import { defaultETSettings } from '../../../../../tests/testHelpers';
+
+const i18n = require('../i18n/en.json');
+
+describe('Settings', () => {
+  it('renders', () => {
+    const data = { ...initialState };
+    const onUpdate = jest.fn();
+
+    const { container } = render(<Settings {...defaultETSettings} i18n={i18n} data={data} onUpdate={onUpdate} />);
+    expect(container).toBeTruthy();
+  });
+});
diff --git a/packages/plugins/src/exportTypes/JSON/bundle.ts b/packages/plugins/src/exportTypes/JSON/bundle.ts
new file mode 100644
index 000000000..b6c72d2d5
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/bundle.ts
@@ -0,0 +1,12 @@
+import { ETBundle } from '@generatedata/types';
+import { Settings, getCodeMirrorMode, getDownloadFileInfo } from './JSON';
+import { initialState } from './JSON.state';
+
+const bundle: ETBundle = {
+  Settings,
+  initialState,
+  getCodeMirrorMode,
+  getDownloadFileInfo
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/JSON/config.ts b/packages/plugins/src/exportTypes/JSON/config.ts
new file mode 100644
index 000000000..824114250
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'core',
+  codeMirrorModes: ['javascript/javascript', 'xml/xml', 'markdown/markdown']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/ar.json b/packages/plugins/src/exportTypes/JSON/i18n/ar.json
new file mode 100644
index 000000000..d4ab3ea16
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/ar.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "اسم الخاصية",
+  "complex": "مركب",
+  "simple": "بسيط",
+  "dataStructureFormat": "تنسيق هيكل البيانات"
+}
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/de.json b/packages/plugins/src/exportTypes/JSON/i18n/de.json
new file mode 100644
index 000000000..25b4c25cd
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/de.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "Name des Anwesens",
+  "complex": "Komplex",
+  "dataStructureFormat": "Datenstruktur-Format",
+  "simple": "Einfach"
+}
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/en.json b/packages/plugins/src/exportTypes/JSON/i18n/en.json
new file mode 100644
index 000000000..ca65c2fe6
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/en.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "Property Name",
+  "complex": "Complex",
+  "simple": "Simple",
+  "dataStructureFormat": "Data structure format"
+}
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/es.json b/packages/plugins/src/exportTypes/JSON/i18n/es.json
new file mode 100644
index 000000000..0dc9d6835
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/es.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "Nombre de la propiedad",
+  "complex": "Complejo",
+  "simple": "Simple",
+  "dataStructureFormat": "Formato de estructura de datos"
+}
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/fr.json b/packages/plugins/src/exportTypes/JSON/i18n/fr.json
new file mode 100644
index 000000000..b4312f854
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/fr.json
@@ -0,0 +1,8 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "Nom de la propriété",
+  "complex": "Complexe",
+  "dataStructureFormat": "Format de la structure des données",
+  "simple": "Simple"
+}
+
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/hi.json b/packages/plugins/src/exportTypes/JSON/i18n/hi.json
new file mode 100644
index 000000000..ff32623e1
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/hi.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "संपत्ति का नाम",
+  "complex": "जटिल",
+  "simple": "सरल",
+  "dataStructureFormat": "डेटा संरचना प्रारूप"
+}
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/ja.json b/packages/plugins/src/exportTypes/JSON/i18n/ja.json
new file mode 100644
index 000000000..e4767523e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/ja.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "プロパティ名",
+  "complex": "繁雑",
+  "simple": "シンプル",
+  "dataStructureFormat": "データ構造フォーマット"
+}
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/nl.json b/packages/plugins/src/exportTypes/JSON/i18n/nl.json
new file mode 100644
index 000000000..c490a3e69
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/nl.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "Eigendomsnaam",
+  "complex": "Complex",
+  "dataStructureFormat": "Datastructuur format",
+  "simple": "Eenvoudig"
+}
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/pt.json b/packages/plugins/src/exportTypes/JSON/i18n/pt.json
new file mode 100644
index 000000000..93d2813e6
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/pt.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "Nome da propriedade",
+  "complex": "Complexa",
+  "simple": "Simples",
+  "dataStructureFormat": "Formato de estrutura de dados"
+}
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/ru.json b/packages/plugins/src/exportTypes/JSON/i18n/ru.json
new file mode 100644
index 000000000..2ecfa8af2
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/ru.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "Имя свойства",
+  "complex": "Сложный",
+  "simple": "Простой",
+  "dataStructureFormat": "Формат структуры данных"
+}
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/ta.json b/packages/plugins/src/exportTypes/JSON/i18n/ta.json
new file mode 100644
index 000000000..61c9f3ddb
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/ta.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "சொத்தின் பெயர்",
+  "complex": "சிக்கலான",
+  "simple": "எளிமையானது",
+  "dataStructureFormat": "தரவு கட்டமைப்பு வடிவம்"
+}
diff --git a/packages/plugins/src/exportTypes/JSON/i18n/zh.json b/packages/plugins/src/exportTypes/JSON/i18n/zh.json
new file mode 100644
index 000000000..3b5afbc88
--- /dev/null
+++ b/packages/plugins/src/exportTypes/JSON/i18n/zh.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "JSON",
+  "COL_TITLE": "物业名称",
+  "complex": "数据结构格式",
+  "simple": "简单",
+  "dataStructureFormat": "数据结构格式"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/Javascript.generate.ts b/packages/plugins/src/exportTypes/Javascript/Javascript.generate.ts
new file mode 100644
index 000000000..5903fcd13
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/Javascript.generate.ts
@@ -0,0 +1,42 @@
+import { ETMessageData } from '../../';
+
+export const generate = (data: ETMessageData): string => {
+  const { isFirstBatch, isLastBatch, rows, columns, settings, stripWhitespace } = data;
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+
+  let content = '';
+  if (isFirstBatch) {
+    if (settings.jsExportFormat === 'variable') {
+      content += `var data = [${newline}`;
+    } else if (settings.jsExportFormat == 'es6') {
+      content += `export default [${newline}`;
+    } else {
+      content += `module.exports = [${newline}`;
+    }
+  }
+
+  rows.forEach((row: any, rowIndex: number) => {
+    content += `${tab}{${newline}${tab}${tab}`;
+
+    const pairs: string[] = [];
+    columns.forEach(({ title }, colIndex) => {
+      const currValue = row[colIndex];
+      pairs.push(`"${title}": "${currValue}"`);
+    });
+
+    content += pairs.join(`,${newline}${tab}${tab}`);
+
+    if (isLastBatch && rowIndex == rows.length - 1) {
+      content += `${newline}${tab}}${newline}`;
+    } else {
+      content += `${newline}${tab}},${newline}`;
+    }
+  });
+
+  if (isLastBatch) {
+    content += `];${newline}`;
+  }
+
+  return content;
+};
diff --git a/packages/plugins/src/exportTypes/Javascript/Javascript.state.tsx b/packages/plugins/src/exportTypes/Javascript/Javascript.state.tsx
new file mode 100644
index 000000000..fb2c3c3c3
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/Javascript.state.tsx
@@ -0,0 +1,18 @@
+import { ETState } from '@generatedata/types';
+
+export type JavascriptExportFormat = 'variable' | 'es6' | 'commonJs';
+
+export type GenerationOptionsType = {
+  jsExportFormat: JavascriptExportFormat;
+};
+
+export const defaultGenerationOptions: GenerationOptionsType = {
+  jsExportFormat: 'variable'
+};
+
+export interface ProgrammingLanguageState extends ETState, GenerationOptionsType {}
+
+export const initialState: ProgrammingLanguageState = {
+  ...defaultGenerationOptions,
+  isValid: true
+};
diff --git a/packages/plugins/src/exportTypes/Javascript/Javascript.tsx b/packages/plugins/src/exportTypes/Javascript/Javascript.tsx
new file mode 100644
index 000000000..d76b46a63
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/Javascript.tsx
@@ -0,0 +1,48 @@
+import * as React from 'react';
+import RadioPill, { RadioPillRow } from '~components/pills/RadioPill';
+import etShared from '../../../styles/etShared.scss';
+import { ETDownloadPacket, ETDownloadPacketResponse, ETSettings } from '@generatedata/types';
+
+export const Settings = ({ i18n, id, data, onUpdate }: ETSettings) => {
+  const onChange = (prop: string, value: any): void => {
+    onUpdate({
+      ...data,
+      [prop]: value
+    });
+  };
+
+  return (
+    <div className={etShared.settingRow}>
+      <label>{i18n.format}</label>
+      <RadioPillRow>
+        <RadioPill
+          label={i18n.variable}
+          onClick={(): void => onChange('jsExportFormat', 'variable')}
+          name={`${id}-js-export-format`}
+          checked={data.jsExportFormat === 'variable'}
+        />
+        <RadioPill
+          label={i18n.es6Format}
+          onClick={(): void => onChange('jsExportFormat', 'es6')}
+          name={`${id}-js-export-format`}
+          checked={data.jsExportFormat === 'es6'}
+        />
+        <RadioPill
+          label={i18n.commonJsFormat}
+          onClick={(): void => onChange('jsExportFormat', 'commonJs')}
+          name={`${id}-js-export-format`}
+          checked={data.jsExportFormat === 'commonJs'}
+        />
+      </RadioPillRow>
+    </div>
+  );
+};
+
+export const getCodeMirrorMode = (): string => 'text/javascript';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => {
+  return {
+    filename: `data-${packetId}.js}`,
+    fileType: ''
+  };
+};
diff --git a/packages/plugins/src/exportTypes/Javascript/Javascript.worker.ts b/packages/plugins/src/exportTypes/Javascript/Javascript.worker.ts
new file mode 100644
index 000000000..25e89e914
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/Javascript.worker.ts
@@ -0,0 +1,8 @@
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './Javascript.generate';
+
+const context: Worker = self as any;
+
+context.onmessage = (e: ETOnMessage) => {
+  context.postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/exportTypes/Javascript/README.md b/packages/plugins/src/exportTypes/Javascript/README.md
new file mode 100644
index 000000000..3112f5658
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/README.md
@@ -0,0 +1 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; Javascript
diff --git a/packages/plugins/src/exportTypes/Javascript/__tests__/Javascript.test.tsx b/packages/plugins/src/exportTypes/Javascript/__tests__/Javascript.test.tsx
new file mode 100644
index 000000000..7726bcd08
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/__tests__/Javascript.test.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Settings } from '../Javascript';
+import { initialState } from '../Javascript.state';
+import { defaultETSettings } from '../../../../../tests/testHelpers';
+
+const i18n = require('../i18n/en.json');
+
+describe('Settings', () => {
+	it('renders', () => {
+		const data = { ...initialState };
+		const onUpdate = jest.fn();
+
+		const { container } = render(
+			<Settings
+				{...defaultETSettings}
+				i18n={i18n}
+				data={data}
+				onUpdate={onUpdate}
+			/>
+		);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/exportTypes/Javascript/bundle.ts b/packages/plugins/src/exportTypes/Javascript/bundle.ts
new file mode 100644
index 000000000..856686356
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/bundle.ts
@@ -0,0 +1,12 @@
+import { ETBundle } from '@generatedata/types';
+import { Settings, getCodeMirrorMode, getDownloadFileInfo } from './Javascript';
+import { initialState } from './Javascript.state';
+
+const bundle: ETBundle = {
+  Settings,
+  initialState,
+  getCodeMirrorMode,
+  getDownloadFileInfo
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/Javascript/config.ts b/packages/plugins/src/exportTypes/Javascript/config.ts
new file mode 100644
index 000000000..7619b3acc
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'programmingLanguage',
+  codeMirrorModes: ['javascript/javascript', 'xml/xml', 'markdown/markdown', 'clike/clike', 'perl/perl', 'php/php', 'ruby/ruby']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/ar.json b/packages/plugins/src/exportTypes/Javascript/i18n/ar.json
new file mode 100644
index 000000000..42222144c
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/ar.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "اسم الخاصية",
+  "row_label": "Var / اسم الدعامة",
+  "language": "لغة",
+  "variable": "متغير",
+  "format": "شكل",
+  "es6Format": "تصدير ES6",
+  "commonJsFormat": "تصدير CommonJS"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/de.json b/packages/plugins/src/exportTypes/Javascript/i18n/de.json
new file mode 100644
index 000000000..080f4ecf3
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/de.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "Name des Anwesens",
+  "row_label": "Var/Prop Name",
+  "language": "Sprache",
+  "variable": "Variable",
+  "format": "Format",
+  "es6Format": "ES6-Export",
+  "commonJsFormat": "CommonJS-Export"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/en.json b/packages/plugins/src/exportTypes/Javascript/i18n/en.json
new file mode 100644
index 000000000..77fcc56af
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/en.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "Property Name",
+  "row_label": "Var/Prop Name",
+  "language": "Language",
+  "variable": "Variable",
+  "format": "Format",
+  "es6Format": "ES6 export",
+  "commonJsFormat": "CommonJS export"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/es.json b/packages/plugins/src/exportTypes/Javascript/i18n/es.json
new file mode 100644
index 000000000..9f2cfa8c1
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/es.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "Nombre de la propiedad",
+  "row_label": "Var/Prop Name",
+  "language": "Idioma",
+  "variable": "Variable",
+  "format": "Formato",
+  "es6Format": "Exportación ES6",
+  "commonJsFormat": "Exportación CommonJS"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/fr.json b/packages/plugins/src/exportTypes/Javascript/i18n/fr.json
new file mode 100644
index 000000000..8b10fcbcd
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/fr.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "Nom de la propriété",
+  "row_label": "Nom de la variable / prop",
+  "language": "Langue",
+  "variable": "Variable",
+  "format": "Format",
+  "es6Format": "Exportation ES6",
+  "commonJsFormat": "Exportation CommonJS"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/hi.json b/packages/plugins/src/exportTypes/Javascript/i18n/hi.json
new file mode 100644
index 000000000..c15d8c31b
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/hi.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "संपत्ति का नाम",
+  "row_label": "वार/प्रोप का नाम",
+  "language": "भाषा",
+  "variable": "चर",
+  "format": "प्रारूप",
+  "es6Format": "ES6 निर्यात",
+  "commonJsFormat": "CommonJS निर्यात"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/ja.json b/packages/plugins/src/exportTypes/Javascript/i18n/ja.json
new file mode 100644
index 000000000..5f8dc1a06
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/ja.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "プロパティ名",
+  "row_label": "変数/小道具名",
+  "language": "言語",
+  "variable": "変数",
+  "format": "フォーマット",
+  "es6Format": "ES6エクスポート",
+  "commonJsFormat": "CommonJSエクスポート"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/nl.json b/packages/plugins/src/exportTypes/Javascript/i18n/nl.json
new file mode 100644
index 000000000..53358c215
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/nl.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "Eigendomsnaam",
+  "row_label": "Var / Prop-naam",
+  "language": "Taal",
+  "variable": "Variabel",
+  "format": "Formaat",
+  "es6Format": "ES6-export",
+  "commonJsFormat": "CommonJS-export"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/pt.json b/packages/plugins/src/exportTypes/Javascript/i18n/pt.json
new file mode 100644
index 000000000..40805d774
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/pt.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "Nome da propriedade",
+  "row_label": "Variável / Nome do Prop",
+  "language": "Língua",
+  "variable": "Variável",
+  "format": "Formato",
+  "es6Format": "Exportação ES6",
+  "commonJsFormat": "Exportação CommonJS"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/ru.json b/packages/plugins/src/exportTypes/Javascript/i18n/ru.json
new file mode 100644
index 000000000..b557b1de9
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/ru.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "Имя свойства",
+  "row_label": "Имя переменной/свойства",
+  "language": "Язык",
+  "variable": "Переменная",
+  "format": "Формат",
+  "es6Format": "Экспорт ES6",
+  "commonJsFormat": "Экспорт CommonJS"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/ta.json b/packages/plugins/src/exportTypes/Javascript/i18n/ta.json
new file mode 100644
index 000000000..df6488b75
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/ta.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "சொத்தின் பெயர்",
+  "row_label": "வர் / ப்ராப் பெயர்",
+  "language": "மொழி",
+  "variable": "மாறி",
+  "format": "வடிவம்",
+  "es6Format": "ES6 ஏற்றுமதி",
+  "commonJsFormat": "காமன்ஜேஎஸ் ஏற்றுமதி"
+}
diff --git a/packages/plugins/src/exportTypes/Javascript/i18n/zh.json b/packages/plugins/src/exportTypes/Javascript/i18n/zh.json
new file mode 100644
index 000000000..6284b08ec
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Javascript/i18n/zh.json
@@ -0,0 +1,10 @@
+{
+  "EXPORT_TYPE_NAME": "Javascript",
+  "COL_TITLE": "物业名称",
+  "row_label": "变量/道具名称",
+  "language": "语言",
+  "variable": "变量",
+  "format": "格式",
+  "es6Format": "ES6导出",
+  "commonJsFormat": "CommonJS导出"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/LDIF.generate.ts b/packages/plugins/src/exportTypes/LDIF/LDIF.generate.ts
new file mode 100644
index 000000000..b1f23e68d
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/LDIF.generate.ts
@@ -0,0 +1,16 @@
+// Original author: Marco Corona <coronam@allegheny.edu>
+import { ETMessageData } from '../../';
+
+export const generate = (data: ETMessageData): string => {
+  const { columns, rows } = data;
+
+  let content = '';
+  rows.forEach((row) => {
+    columns.forEach((col, index) => {
+      content += `${col.title}: ${row[index]}\n`;
+    });
+    content += '\n';
+  });
+
+  return content;
+};
diff --git a/packages/plugins/src/exportTypes/LDIF/LDIF.state.tsx b/packages/plugins/src/exportTypes/LDIF/LDIF.state.tsx
new file mode 100644
index 000000000..e2d9ec4d2
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/LDIF.state.tsx
@@ -0,0 +1,2 @@
+export const defaultGenerationOptions = {};
+export type GenerationOptionsType = {};
diff --git a/packages/plugins/src/exportTypes/LDIF/LDIF.tsx b/packages/plugins/src/exportTypes/LDIF/LDIF.tsx
new file mode 100644
index 000000000..22e15bbdf
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/LDIF.tsx
@@ -0,0 +1,8 @@
+import { ETDownloadPacket, ETDownloadPacketResponse } from '@generatedata/types';
+
+export const getCodeMirrorMode = (): string => 'text/x-yaml';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.ldf`,
+  fileType: 'application/csv'
+});
diff --git a/packages/plugins/src/exportTypes/LDIF/LDIF.worker.ts b/packages/plugins/src/exportTypes/LDIF/LDIF.worker.ts
new file mode 100644
index 000000000..99a8ad732
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/LDIF.worker.ts
@@ -0,0 +1,9 @@
+// Original author: Marco Corona <coronam@allegheny.edu>
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './LDIF.generate';
+
+const context: Worker = self as any;
+
+context.onmessage = (e: ETOnMessage) => {
+  context.postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/exportTypes/LDIF/README.md b/packages/plugins/src/exportTypes/LDIF/README.md
new file mode 100644
index 000000000..3fae966d4
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/README.md
@@ -0,0 +1,41 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; LDIF
+
+This plugin generates data in LDIF (LDAP Data Exchange Format).
+
+
+### Example API Usage
+
+Post the following JSON content to the following API path: 
+`http://[your site]/[generate data folder]/api/v1/data`
+
+Here's an example pulled from the Alphanumeric Data Type example:
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "AlphaNumeric",
+            "title": "Random Password",
+            "settings": {
+                "placeholder": "LLLxxLLLxLL"
+            }
+        },
+        {
+            "type": "AlphaNumeric",
+            "title": "US Zipcode",
+            "settings": {
+                "placeholder": "xxxxx"
+            }
+        }
+    ],
+    "export": {
+        "type": "LDIF"
+    }
+}
+```
+
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/exportTypes/LDIF/bundle.ts b/packages/plugins/src/exportTypes/LDIF/bundle.ts
new file mode 100644
index 000000000..d566d79d8
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/bundle.ts
@@ -0,0 +1,9 @@
+import { ETBundle } from '@generatedata/types';
+import { getCodeMirrorMode, getDownloadFileInfo } from './LDIF';
+
+const bundle: ETBundle = {
+  getCodeMirrorMode,
+  getDownloadFileInfo
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/LDIF/config.ts b/packages/plugins/src/exportTypes/LDIF/config.ts
new file mode 100644
index 000000000..d93c8b120
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'core',
+  codeMirrorModes: ['yaml/yaml']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/ar.json b/packages/plugins/src/exportTypes/LDIF/i18n/ar.json
new file mode 100644
index 000000000..6590ca76a
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "سمة LDAP"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/de.json b/packages/plugins/src/exportTypes/LDIF/i18n/de.json
new file mode 100644
index 000000000..e2b683676
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "LDAP Attribute"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/en.json b/packages/plugins/src/exportTypes/LDIF/i18n/en.json
new file mode 100644
index 000000000..e2b683676
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "LDAP Attribute"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/es.json b/packages/plugins/src/exportTypes/LDIF/i18n/es.json
new file mode 100644
index 000000000..c00300530
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "Atributo LDAP"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/fr.json b/packages/plugins/src/exportTypes/LDIF/i18n/fr.json
new file mode 100644
index 000000000..1a88e9a8d
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "Attribut LDAP"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/hi.json b/packages/plugins/src/exportTypes/LDIF/i18n/hi.json
new file mode 100644
index 000000000..032b76bda
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "LDAP गुण"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/ja.json b/packages/plugins/src/exportTypes/LDIF/i18n/ja.json
new file mode 100644
index 000000000..eccdce485
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "LDAP属性"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/nl.json b/packages/plugins/src/exportTypes/LDIF/i18n/nl.json
new file mode 100644
index 000000000..bc868b1ba
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "LDAP-kenmerk"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/pt.json b/packages/plugins/src/exportTypes/LDIF/i18n/pt.json
new file mode 100644
index 000000000..c00300530
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "Atributo LDAP"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/ru.json b/packages/plugins/src/exportTypes/LDIF/i18n/ru.json
new file mode 100644
index 000000000..c0296db34
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "Атрибут LDAP"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/ta.json b/packages/plugins/src/exportTypes/LDIF/i18n/ta.json
new file mode 100644
index 000000000..c3b71d80e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "LDAP பண்புக்கூறு"
+}
diff --git a/packages/plugins/src/exportTypes/LDIF/i18n/zh.json b/packages/plugins/src/exportTypes/LDIF/i18n/zh.json
new file mode 100644
index 000000000..eccdce485
--- /dev/null
+++ b/packages/plugins/src/exportTypes/LDIF/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "LDIF",
+  "COL_TITLE": "LDAP属性"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/PHP.generate.ts b/packages/plugins/src/exportTypes/PHP/PHP.generate.ts
new file mode 100644
index 000000000..f483b2682
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/PHP.generate.ts
@@ -0,0 +1,32 @@
+import { ETMessageData } from '../../';
+
+export const generate = ({ stripWhitespace, isFirstBatch, isLastBatch, rows, columns }: ETMessageData): string => {
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+
+  let content = '';
+  if (isFirstBatch) {
+    content += `<?php${newline}${newline}\$data = [${newline}`;
+  }
+
+  rows.forEach((row: any, rowIndex: number) => {
+    const pairs: string[] = [];
+    columns.forEach(({ title }, colIndex) => {
+      const currValue = row[colIndex];
+      pairs.push(`"${title}" => "${currValue}"`);
+    });
+    content += `${tab}[${newline}${tab}${tab}` + pairs.join(`,${newline}${tab}${tab}`) + `${newline}${tab}]`;
+
+    if (isLastBatch && rowIndex == rows.length - 1) {
+      content += newline;
+    } else {
+      content += `,${newline}`;
+    }
+  });
+
+  if (isLastBatch) {
+    content += '];';
+  }
+
+  return content;
+};
diff --git a/packages/plugins/src/exportTypes/PHP/PHP.state.tsx b/packages/plugins/src/exportTypes/PHP/PHP.state.tsx
new file mode 100644
index 000000000..9fe588c8d
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/PHP.state.tsx
@@ -0,0 +1,2 @@
+export type GenerationOptionsType = {};
+export const defaultGenerationOptions = {};
diff --git a/packages/plugins/src/exportTypes/PHP/PHP.tsx b/packages/plugins/src/exportTypes/PHP/PHP.tsx
new file mode 100644
index 000000000..799297b22
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/PHP.tsx
@@ -0,0 +1,8 @@
+import { ETDownloadPacket, ETDownloadPacketResponse } from '@generatedata/types';
+
+export const getCodeMirrorMode = (): string => 'text/x-php';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.php`,
+  fileType: ''
+});
diff --git a/packages/plugins/src/exportTypes/PHP/PHP.worker.ts b/packages/plugins/src/exportTypes/PHP/PHP.worker.ts
new file mode 100644
index 000000000..8bc3c7b48
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/PHP.worker.ts
@@ -0,0 +1,8 @@
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './PHP.generate';
+
+const context: Worker = self as any;
+
+context.onmessage = (e: ETOnMessage) => {
+  context.postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/exportTypes/PHP/README.md b/packages/plugins/src/exportTypes/PHP/README.md
new file mode 100644
index 000000000..0e9e3e843
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/README.md
@@ -0,0 +1,41 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; PHP
+
+This plugin generates data in LDIF (LDAP Data Exchange Format).
+
+
+### Example API Usage
+
+Post the following JSON content to the following API path: 
+`http://[your site]/[generate data folder]/api/v1/data`
+
+Here's an example pulled from the Alphanumeric Data Type example:
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "AlphaNumeric",
+            "title": "Random Password",
+            "settings": {
+                "placeholder": "LLLxxLLLxLL"
+            }
+        },
+        {
+            "type": "AlphaNumeric",
+            "title": "US Zipcode",
+            "settings": {
+                "placeholder": "xxxxx"
+            }
+        }
+    ],
+    "export": {
+        "type": "LDIF"
+    }
+}
+```
+
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/exportTypes/PHP/bundle.ts b/packages/plugins/src/exportTypes/PHP/bundle.ts
new file mode 100644
index 000000000..6deb7576a
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/bundle.ts
@@ -0,0 +1,9 @@
+import { ETBundle } from '@generatedata/types';
+import { getCodeMirrorMode, getDownloadFileInfo } from './PHP';
+
+const bundle: ETBundle = {
+  getCodeMirrorMode,
+  getDownloadFileInfo
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/PHP/config.ts b/packages/plugins/src/exportTypes/PHP/config.ts
new file mode 100644
index 000000000..8f69e3b11
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'programmingLanguage',
+  codeMirrorModes: ['clike/clike', 'php/php']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/ar.json b/packages/plugins/src/exportTypes/PHP/i18n/ar.json
new file mode 100644
index 000000000..d7ff4d365
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "اسم الخاصية"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/de.json b/packages/plugins/src/exportTypes/PHP/i18n/de.json
new file mode 100644
index 000000000..46c20f55f
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "Name des Anwesens"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/en.json b/packages/plugins/src/exportTypes/PHP/i18n/en.json
new file mode 100644
index 000000000..b417a18b4
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "Property Name"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/es.json b/packages/plugins/src/exportTypes/PHP/i18n/es.json
new file mode 100644
index 000000000..bcdddf739
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "Nombre de la propiedad"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/fr.json b/packages/plugins/src/exportTypes/PHP/i18n/fr.json
new file mode 100644
index 000000000..21d906436
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "Nom de la propriété"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/hi.json b/packages/plugins/src/exportTypes/PHP/i18n/hi.json
new file mode 100644
index 000000000..1abe7f74e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "संपत्ति का नाम"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/ja.json b/packages/plugins/src/exportTypes/PHP/i18n/ja.json
new file mode 100644
index 000000000..5db61aebd
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "プロパティ名"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/nl.json b/packages/plugins/src/exportTypes/PHP/i18n/nl.json
new file mode 100644
index 000000000..a673d4a4e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "Eigendomsnaam"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/pt.json b/packages/plugins/src/exportTypes/PHP/i18n/pt.json
new file mode 100644
index 000000000..994682e23
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "Nome da propriedade"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/ru.json b/packages/plugins/src/exportTypes/PHP/i18n/ru.json
new file mode 100644
index 000000000..0e936a995
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "Имя свойства"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/ta.json b/packages/plugins/src/exportTypes/PHP/i18n/ta.json
new file mode 100644
index 000000000..f856a118d
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "சொத்தின் பெயர்"
+}
diff --git a/packages/plugins/src/exportTypes/PHP/i18n/zh.json b/packages/plugins/src/exportTypes/PHP/i18n/zh.json
new file mode 100644
index 000000000..c9b2b6a26
--- /dev/null
+++ b/packages/plugins/src/exportTypes/PHP/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "PHP",
+  "COL_TITLE": "物业名称"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/Perl.generate.ts b/packages/plugins/src/exportTypes/Perl/Perl.generate.ts
new file mode 100644
index 000000000..480cf59b3
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/Perl.generate.ts
@@ -0,0 +1,36 @@
+import { ETMessageData } from '../../';
+
+export const generate = (data: ETMessageData): string => {
+  const { stripWhitespace } = data;
+
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+  let content = '';
+
+  const { isFirstBatch, isLastBatch, rows, columns } = data;
+  if (isFirstBatch) {
+    content += `@data = (${newline}`;
+  }
+
+  rows.forEach((row: any, rowIndex: number) => {
+    const pairs: string[] = [];
+    columns.forEach(({ title }, colIndex) => {
+      const currValue = row[colIndex];
+      pairs.push(`"${title}" => "${currValue}"`);
+    });
+
+    content += `${tab}{${newline}${tab}${tab}` + pairs.join(`,${newline}${tab}${tab}`) + `${newline}${tab}}`;
+
+    if (isLastBatch && rowIndex == rows.length - 1) {
+      content += newline;
+    } else {
+      content += `,${newline}`;
+    }
+  });
+
+  if (isLastBatch) {
+    content += ');';
+  }
+
+  return content;
+};
diff --git a/packages/plugins/src/exportTypes/Perl/Perl.state.tsx b/packages/plugins/src/exportTypes/Perl/Perl.state.tsx
new file mode 100644
index 000000000..e2d9ec4d2
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/Perl.state.tsx
@@ -0,0 +1,2 @@
+export const defaultGenerationOptions = {};
+export type GenerationOptionsType = {};
diff --git a/packages/plugins/src/exportTypes/Perl/Perl.tsx b/packages/plugins/src/exportTypes/Perl/Perl.tsx
new file mode 100644
index 000000000..656499d30
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/Perl.tsx
@@ -0,0 +1,8 @@
+import { ETDownloadPacket, ETDownloadPacketResponse } from '@generatedata/types';
+
+export const getCodeMirrorMode = (): string => 'text/x-perl';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.pl`,
+  fileType: ''
+});
diff --git a/packages/plugins/src/exportTypes/Perl/Perl.worker.ts b/packages/plugins/src/exportTypes/Perl/Perl.worker.ts
new file mode 100644
index 000000000..8318ec3a4
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/Perl.worker.ts
@@ -0,0 +1,8 @@
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './Perl.generate';
+
+const context: Worker = self as any;
+
+context.onmessage = (e: ETOnMessage) => {
+  context.postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/exportTypes/Perl/README.md b/packages/plugins/src/exportTypes/Perl/README.md
new file mode 100644
index 000000000..5ff4b77d0
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/README.md
@@ -0,0 +1,41 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; Perl
+
+This plugin generates data in LDIF (LDAP Data Exchange Format).
+
+
+### Example API Usage
+
+Post the following JSON content to the following API path: 
+`http://[your site]/[generate data folder]/api/v1/data`
+
+Here's an example pulled from the Alphanumeric Data Type example:
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "AlphaNumeric",
+            "title": "Random Password",
+            "settings": {
+                "placeholder": "LLLxxLLLxLL"
+            }
+        },
+        {
+            "type": "AlphaNumeric",
+            "title": "US Zipcode",
+            "settings": {
+                "placeholder": "xxxxx"
+            }
+        }
+    ],
+    "export": {
+        "type": "LDIF"
+    }
+}
+```
+
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/exportTypes/Perl/bundle.ts b/packages/plugins/src/exportTypes/Perl/bundle.ts
new file mode 100644
index 000000000..a1c1c8037
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/bundle.ts
@@ -0,0 +1,9 @@
+import { ETBundle } from '@generatedata/types';
+import { getCodeMirrorMode, getDownloadFileInfo } from './Perl';
+
+const bundle: ETBundle = {
+  getCodeMirrorMode,
+  getDownloadFileInfo
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/Perl/config.ts b/packages/plugins/src/exportTypes/Perl/config.ts
new file mode 100644
index 000000000..7619b3acc
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'programmingLanguage',
+  codeMirrorModes: ['javascript/javascript', 'xml/xml', 'markdown/markdown', 'clike/clike', 'perl/perl', 'php/php', 'ruby/ruby']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/ar.json b/packages/plugins/src/exportTypes/Perl/i18n/ar.json
new file mode 100644
index 000000000..05c3b70bd
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "اسم الخاصية"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/de.json b/packages/plugins/src/exportTypes/Perl/i18n/de.json
new file mode 100644
index 000000000..c9a05da9e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "Name des Anwesens"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/en.json b/packages/plugins/src/exportTypes/Perl/i18n/en.json
new file mode 100644
index 000000000..6a6525a43
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "Property Name"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/es.json b/packages/plugins/src/exportTypes/Perl/i18n/es.json
new file mode 100644
index 000000000..3c579e211
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "Nombre de la propiedad"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/fr.json b/packages/plugins/src/exportTypes/Perl/i18n/fr.json
new file mode 100644
index 000000000..a9db7fcdb
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "Nom de la propriété"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/hi.json b/packages/plugins/src/exportTypes/Perl/i18n/hi.json
new file mode 100644
index 000000000..f6bee6135
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "संपत्ति का नाम"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/ja.json b/packages/plugins/src/exportTypes/Perl/i18n/ja.json
new file mode 100644
index 000000000..4159e55af
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "プロパティ名"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/nl.json b/packages/plugins/src/exportTypes/Perl/i18n/nl.json
new file mode 100644
index 000000000..9f2a8262b
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "Eigendomsnaam"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/pt.json b/packages/plugins/src/exportTypes/Perl/i18n/pt.json
new file mode 100644
index 000000000..7f871e35e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "Nome da propriedade"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/ru.json b/packages/plugins/src/exportTypes/Perl/i18n/ru.json
new file mode 100644
index 000000000..d03170dad
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "Имя свойства"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/ta.json b/packages/plugins/src/exportTypes/Perl/i18n/ta.json
new file mode 100644
index 000000000..4e5e4990c
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "சொத்தின் பெயர்"
+}
diff --git a/packages/plugins/src/exportTypes/Perl/i18n/zh.json b/packages/plugins/src/exportTypes/Perl/i18n/zh.json
new file mode 100644
index 000000000..08de76c62
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Perl/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Perl",
+  "COL_TITLE": "物业名称"
+}
diff --git a/packages/plugins/src/exportTypes/Python/Python.generate.ts b/packages/plugins/src/exportTypes/Python/Python.generate.ts
new file mode 100644
index 000000000..a0fa60b6a
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/Python.generate.ts
@@ -0,0 +1,32 @@
+import { ETMessageData } from '../../';
+
+export const generate = ({ stripWhitespace, isFirstBatch, isLastBatch, rows, columns }: ETMessageData): string => {
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+
+  let content = '';
+  if (isFirstBatch) {
+    content += `data = [${newline}`;
+  }
+
+  rows.forEach((row: any, rowIndex: number) => {
+    const pairs: string[] = [];
+    columns.forEach(({ title }, colIndex) => {
+      const currValue = row[colIndex];
+      pairs.push(`${title}: "${currValue}"`);
+    });
+    content += `${tab}{${newline}${tab}${tab}` + pairs.join(`,${newline}${tab}${tab}`) + `${newline}${tab}}`;
+
+    if (isLastBatch && rowIndex == rows.length - 1) {
+      content += newline;
+    } else {
+      content += `,${newline}`;
+    }
+  });
+
+  if (isLastBatch) {
+    content += ']';
+  }
+
+  return content;
+};
diff --git a/packages/plugins/src/exportTypes/Python/Python.state.tsx b/packages/plugins/src/exportTypes/Python/Python.state.tsx
new file mode 100644
index 000000000..e2d9ec4d2
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/Python.state.tsx
@@ -0,0 +1,2 @@
+export const defaultGenerationOptions = {};
+export type GenerationOptionsType = {};
diff --git a/packages/plugins/src/exportTypes/Python/Python.tsx b/packages/plugins/src/exportTypes/Python/Python.tsx
new file mode 100644
index 000000000..ed0926624
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/Python.tsx
@@ -0,0 +1,8 @@
+import { ETDownloadPacket, ETDownloadPacketResponse } from '@generatedata/types';
+
+export const getCodeMirrorMode = (): string => 'text/x-python';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.py`,
+  fileType: ''
+});
diff --git a/packages/plugins/src/exportTypes/Python/Python.worker.ts b/packages/plugins/src/exportTypes/Python/Python.worker.ts
new file mode 100644
index 000000000..ff0dbe0e9
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/Python.worker.ts
@@ -0,0 +1,7 @@
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './Python.generate';
+const context: Worker = self as any;
+
+context.onmessage = (e: ETOnMessage) => {
+  context.postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/exportTypes/Python/README.md b/packages/plugins/src/exportTypes/Python/README.md
new file mode 100644
index 000000000..108e0228b
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/README.md
@@ -0,0 +1,41 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; Python
+
+This plugin generates data in LDIF (LDAP Data Exchange Format).
+
+
+### Example API Usage
+
+Post the following JSON content to the following API path: 
+`http://[your site]/[generate data folder]/api/v1/data`
+
+Here's an example pulled from the Alphanumeric Data Type example:
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "AlphaNumeric",
+            "title": "Random Password",
+            "settings": {
+                "placeholder": "LLLxxLLLxLL"
+            }
+        },
+        {
+            "type": "AlphaNumeric",
+            "title": "US Zipcode",
+            "settings": {
+                "placeholder": "xxxxx"
+            }
+        }
+    ],
+    "export": {
+        "type": "LDIF"
+    }
+}
+```
+
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/exportTypes/Python/bundle.ts b/packages/plugins/src/exportTypes/Python/bundle.ts
new file mode 100644
index 000000000..259e112dc
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/bundle.ts
@@ -0,0 +1,9 @@
+import { ETBundle } from '@generatedata/types';
+import { getCodeMirrorMode, getDownloadFileInfo } from './Python';
+
+const bundle: ETBundle = {
+  getCodeMirrorMode,
+  getDownloadFileInfo
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/Python/config.ts b/packages/plugins/src/exportTypes/Python/config.ts
new file mode 100644
index 000000000..752f92325
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'programmingLanguage',
+  codeMirrorModes: ['python/python']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/Python/i18n/ar.json b/packages/plugins/src/exportTypes/Python/i18n/ar.json
new file mode 100644
index 000000000..bc4ecb4ab
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "اسم الخاصية"
+}
diff --git a/packages/plugins/src/exportTypes/Python/i18n/de.json b/packages/plugins/src/exportTypes/Python/i18n/de.json
new file mode 100644
index 000000000..e442e5883
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "Name des Anwesens"
+}
diff --git a/packages/plugins/src/exportTypes/Python/i18n/en.json b/packages/plugins/src/exportTypes/Python/i18n/en.json
new file mode 100644
index 000000000..f8b2e9b42
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "Property Name"
+}
diff --git a/packages/plugins/src/exportTypes/Python/i18n/es.json b/packages/plugins/src/exportTypes/Python/i18n/es.json
new file mode 100644
index 000000000..d0db9abfb
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "Nombre de la propiedad"
+}
diff --git a/packages/plugins/src/exportTypes/Python/i18n/fr.json b/packages/plugins/src/exportTypes/Python/i18n/fr.json
new file mode 100644
index 000000000..87d7868fc
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "Nom de la propriété"
+}
diff --git a/packages/plugins/src/exportTypes/Python/i18n/hi.json b/packages/plugins/src/exportTypes/Python/i18n/hi.json
new file mode 100644
index 000000000..fe4472874
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "संपत्ति का नाम"
+}
diff --git a/packages/plugins/src/exportTypes/Python/i18n/ja.json b/packages/plugins/src/exportTypes/Python/i18n/ja.json
new file mode 100644
index 000000000..ad78b54a7
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "プロパティ名"
+}
diff --git a/packages/plugins/src/exportTypes/Python/i18n/nl.json b/packages/plugins/src/exportTypes/Python/i18n/nl.json
new file mode 100644
index 000000000..124ea598d
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "Eigendomsnaam"
+}
diff --git a/packages/plugins/src/exportTypes/Python/i18n/pt.json b/packages/plugins/src/exportTypes/Python/i18n/pt.json
new file mode 100644
index 000000000..b91aee157
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "Nome da propriedade"
+}
diff --git a/packages/plugins/src/exportTypes/Python/i18n/ru.json b/packages/plugins/src/exportTypes/Python/i18n/ru.json
new file mode 100644
index 000000000..d934182e1
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "Имя свойства"
+}
diff --git a/packages/plugins/src/exportTypes/Python/i18n/ta.json b/packages/plugins/src/exportTypes/Python/i18n/ta.json
new file mode 100644
index 000000000..5d80f790d
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "சொத்தின் பெயர்"
+}
diff --git a/packages/plugins/src/exportTypes/Python/i18n/zh.json b/packages/plugins/src/exportTypes/Python/i18n/zh.json
new file mode 100644
index 000000000..8c1db608c
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Python/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Python",
+  "COL_TITLE": "物业名称"
+}
diff --git a/packages/plugins/src/exportTypes/README.md b/packages/plugins/src/exportTypes/README.md
new file mode 100644
index 000000000..67671f9ed
--- /dev/null
+++ b/packages/plugins/src/exportTypes/README.md
@@ -0,0 +1,19 @@
+Each plugin has its own unique configuration settings. See the pages below for details and explanations of each plugin and
+what the options do.
+
+### Export Types
+
+- CSharp
+- CSV
+- HTML
+- Javascript
+- JSON
+- LDIF
+- Perl
+- PHP
+- Python
+- Ruby
+- SQL
+- Typescript
+- XML
+
diff --git a/packages/plugins/src/exportTypes/Ruby/README.md b/packages/plugins/src/exportTypes/Ruby/README.md
new file mode 100644
index 000000000..efbde9625
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/README.md
@@ -0,0 +1,41 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; Ruby
+
+This plugin generates data in LDIF (LDAP Data Exchange Format).
+
+
+### Example API Usage
+
+Post the following JSON content to the following API path: 
+`http://[your site]/[generate data folder]/api/v1/data`
+
+Here's an example pulled from the Alphanumeric Data Type example:
+
+```javascript
+{
+    "numRows": 10,
+    "rows": [
+        {
+            "type": "AlphaNumeric",
+            "title": "Random Password",
+            "settings": {
+                "placeholder": "LLLxxLLLxLL"
+            }
+        },
+        {
+            "type": "AlphaNumeric",
+            "title": "US Zipcode",
+            "settings": {
+                "placeholder": "xxxxx"
+            }
+        }
+    ],
+    "export": {
+        "type": "LDIF"
+    }
+}
+```
+
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/exportTypes/Ruby/Ruby.generate.ts b/packages/plugins/src/exportTypes/Ruby/Ruby.generate.ts
new file mode 100644
index 000000000..e8b71b249
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/Ruby.generate.ts
@@ -0,0 +1,32 @@
+import { ETMessageData } from '../../';
+
+export const generate = ({ stripWhitespace, rows, columns, isLastBatch, isFirstBatch }: ETMessageData): string => {
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+
+  let content = '';
+  if (isFirstBatch) {
+    content += `data = [${newline}`;
+  }
+
+  rows.forEach((row: any, rowIndex: number) => {
+    const pairs: string[] = [];
+    columns.forEach(({ title }, colIndex) => {
+      const currValue = row[colIndex];
+      pairs.push(`'${title}': '${currValue}'`);
+    });
+    content += `${tab}{${newline}${tab}${tab}` + pairs.join(`,${newline}${tab}${tab}`) + `${newline}${tab}}`;
+
+    if (isLastBatch && rowIndex == rows.length - 1) {
+      content += newline;
+    } else {
+      content += `,${newline}`;
+    }
+  });
+
+  if (isLastBatch) {
+    content += '];';
+  }
+
+  return content;
+};
diff --git a/packages/plugins/src/exportTypes/Ruby/Ruby.state.tsx b/packages/plugins/src/exportTypes/Ruby/Ruby.state.tsx
new file mode 100644
index 000000000..e2d9ec4d2
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/Ruby.state.tsx
@@ -0,0 +1,2 @@
+export const defaultGenerationOptions = {};
+export type GenerationOptionsType = {};
diff --git a/packages/plugins/src/exportTypes/Ruby/Ruby.tsx b/packages/plugins/src/exportTypes/Ruby/Ruby.tsx
new file mode 100644
index 000000000..dff5b8ea2
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/Ruby.tsx
@@ -0,0 +1,8 @@
+import { ETDownloadPacket, ETDownloadPacketResponse } from '@generatedata/types';
+
+export const getCodeMirrorMode = (): string => 'text/x-ruby';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.pl`,
+  fileType: ''
+});
diff --git a/packages/plugins/src/exportTypes/Ruby/Ruby.worker.ts b/packages/plugins/src/exportTypes/Ruby/Ruby.worker.ts
new file mode 100644
index 000000000..016244ca9
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/Ruby.worker.ts
@@ -0,0 +1,8 @@
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './Ruby.generate';
+
+const context: Worker = self as any;
+
+context.onmessage = (e: ETOnMessage): void => {
+  context.postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/exportTypes/Ruby/bundle.ts b/packages/plugins/src/exportTypes/Ruby/bundle.ts
new file mode 100644
index 000000000..32f5b583b
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/bundle.ts
@@ -0,0 +1,9 @@
+import { ETBundle } from '@generatedata/types';
+import { getCodeMirrorMode, getDownloadFileInfo } from './Ruby';
+
+const bundle: ETBundle = {
+  getCodeMirrorMode,
+  getDownloadFileInfo
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/Ruby/config.ts b/packages/plugins/src/exportTypes/Ruby/config.ts
new file mode 100644
index 000000000..7d028815a
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'programmingLanguage',
+  codeMirrorModes: ['clike/clike', 'ruby/ruby']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/ar.json b/packages/plugins/src/exportTypes/Ruby/i18n/ar.json
new file mode 100644
index 000000000..2beed3b70
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/ar.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "اسم الخاصية"
+}
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/de.json b/packages/plugins/src/exportTypes/Ruby/i18n/de.json
new file mode 100644
index 000000000..3f643bb09
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/de.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "Name des Anwesens"
+}
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/en.json b/packages/plugins/src/exportTypes/Ruby/i18n/en.json
new file mode 100644
index 000000000..c994a4b97
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/en.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "Property Name"
+}
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/es.json b/packages/plugins/src/exportTypes/Ruby/i18n/es.json
new file mode 100644
index 000000000..f073d2e58
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/es.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "Nombre de la propiedad"
+}
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/fr.json b/packages/plugins/src/exportTypes/Ruby/i18n/fr.json
new file mode 100644
index 000000000..f06a6cea9
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/fr.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "Nom de la propriété"
+}
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/hi.json b/packages/plugins/src/exportTypes/Ruby/i18n/hi.json
new file mode 100644
index 000000000..56b04f4bb
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/hi.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "संपत्ति का नाम"
+}
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/ja.json b/packages/plugins/src/exportTypes/Ruby/i18n/ja.json
new file mode 100644
index 000000000..f32a41763
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/ja.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "プロパティ名"
+}
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/nl.json b/packages/plugins/src/exportTypes/Ruby/i18n/nl.json
new file mode 100644
index 000000000..aa3c344e2
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/nl.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "Eigendomsnaam"
+}
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/pt.json b/packages/plugins/src/exportTypes/Ruby/i18n/pt.json
new file mode 100644
index 000000000..284cf8ee7
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/pt.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "Nome da propriedade"
+}
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/ru.json b/packages/plugins/src/exportTypes/Ruby/i18n/ru.json
new file mode 100644
index 000000000..40cea9c7a
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/ru.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "Имя свойства"
+}
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/ta.json b/packages/plugins/src/exportTypes/Ruby/i18n/ta.json
new file mode 100644
index 000000000..f71672d17
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/ta.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "சொத்தின் பெயர்"
+}
diff --git a/packages/plugins/src/exportTypes/Ruby/i18n/zh.json b/packages/plugins/src/exportTypes/Ruby/i18n/zh.json
new file mode 100644
index 000000000..933b2227f
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Ruby/i18n/zh.json
@@ -0,0 +1,4 @@
+{
+  "EXPORT_TYPE_NAME": "Ruby",
+  "COL_TITLE": "物业名称"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/README.md b/packages/plugins/src/exportTypes/SQL/README.md
new file mode 100644
index 000000000..574573536
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/README.md
@@ -0,0 +1,75 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; SQL
+
+
+This plugin is probably the most configurable Export Type currently available. It generates the random data in SQL
+format for use in populating database such as MySQL, Oracle, SQLite and more. It offers a range of controls
+to generate exactly what you want: table names, database types, query type (INSERT/UPDATE), INSERT IGNORE, Primary Keys
+and others. Pretty cool.
+
+Using the GenerateData interface you can just select whatever options you want using your mouse & keyboard,
+but if you're using the API, these are the settings you'll be interested in.
+
+- `tableName`: the string name of the database table to insert/update the data. *required*
+- `databaseType`: a string. One of: `MySQL`, `Postgres`, `SQLite`, `Oracle`, `MSSQL`. *required* 
+- `createTable`: a boolean, defaults to `true`. If this is set to true, the generated output will contain a 
+`CREATE TABLE` query at the start.
+- `dropTable`: a boolean, defaults to `false`. If this is set to true, the first generated query will be a safe 
+DROP TABLE to ensure the table doesn't already exist prior to the INSERT queries.
+- `encloseWithBackquotes`: a boolean, defaults to `false`. Whether column and table names will be enclosed in backquotes.
+- `statementType`: a string, one of: `insert`, `insertignore`, `update`. This governs the type of query that'll be 
+generated. By and large you'll want this to be set to `insert`, the default value. 
+- `insertBatchSize`: an integer. This allows you to reduce the number of queries by grouping them, e.g. a single
+INSERT statement to insert 10 rows at once. Defaults to 1.
+- `addPrimaryKey`: a boolean, defaults to `false`. This lets you choose to add a Primary Key field to your SQL 
+statements.
+
+
+#### Conditional settings
+
+Some settings are database specific. 
+
+- Postgres will ignore the `encloseWithBackquotes` setting.
+- Postgres, SQLite, Oracle and MSSQL won't accept the `insertignore` as a value for the `statementType` setting. That 
+only works with MySQL.
+
+
+### Example API Usage
+
+Post the following JSON content to the following API path: 
+`http://[your site]/[generate data folder]/api/v1/data`
+
+```javascript
+{
+    "numRows": 15,
+    "rows": [
+        {
+            "type": "AlphaNumeric",
+            "title": "Random Password",
+            "settings": {
+                "placeholder": "LLLxxLLLxLL"
+            }
+        },
+        {
+            "type": "AlphaNumeric",
+            "title": "US Zipcode",
+            "settings": {
+                "placeholder": "xxxxx"
+            }
+        }
+    ],
+    "export": {
+        "type": "SQL",
+        "settings": {
+            "tableName": "myTable",
+            "databaseType": "MySQL",
+            "encloseWithBackquotes": true,
+            "createTable": true
+        }
+    }
+}
+```
+
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/exportTypes/SQL/SQL.generate.ts b/packages/plugins/src/exportTypes/SQL/SQL.generate.ts
new file mode 100644
index 000000000..0b7afbb57
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/SQL.generate.ts
@@ -0,0 +1,471 @@
+import { ETMessageData } from '../../';
+import { ColumnData } from '~types/general';
+import { SQLSettings } from './SQL.state';
+
+export const generate = (data: ETMessageData): string => {
+  let content = '';
+  if (data.settings.databaseType === 'MySQL') {
+    content = generateMySQL(data);
+  } else if (data.settings.databaseType === 'Postgres') {
+    content = generatePostgres(data);
+  } else if (data.settings.databaseType === 'SQLite') {
+    content = generateSQLite(data);
+  } else if (data.settings.databaseType === 'Oracle') {
+    content = generateOracle(data);
+  } else if (data.settings.databaseType === 'MSSQL') {
+    content = generateMSSQL(data);
+  }
+
+  return content;
+};
+
+export const enum QuoteType {
+  single = "'",
+  double = '"'
+}
+
+const getCurrentRow = (batch: number, batchSize: number, rowIndex: number) => {
+  return batchSize * (batch - 1) + rowIndex + 1;
+};
+
+const getWrappedValue = (value: any, colIndex: number, numericFieldIndexes: number[], quote: QuoteType = QuoteType.double): any => {
+  let val = '';
+  if (numericFieldIndexes.indexOf(colIndex) !== -1) {
+    val = value;
+  } else {
+    if (quote === QuoteType.double) {
+      if (value.toString().indexOf(QuoteType.double) !== -1) {
+        value = value.replaceAll(QuoteType.double, `${QuoteType.double}${QuoteType.double}`);
+      }
+    } else {
+      if (value.toString().indexOf(QuoteType.single) !== -1) {
+        value = value.replaceAll(QuoteType.single, `${QuoteType.single}${QuoteType.single}`);
+      }
+    }
+    val = `${quote}${value}${quote}`;
+  }
+  return val;
+};
+
+export const generateMySQL = (data: ETMessageData): string => {
+  const sqlSettings: SQLSettings = data.settings;
+  const { isFirstBatch, currentBatch, batchSize, columns, rows } = data;
+  const backquote = sqlSettings.encloseInBackQuotes ? '`' : '';
+  const colTitles = columns.map(({ title }) => title);
+  let content = '';
+
+  const numericFieldIndexes = getNumericFieldColumnIndexes(data.columns);
+
+  if (isFirstBatch) {
+    if (sqlSettings.dropTable) {
+      content += `DROP TABLE IF EXISTS ${backquote}${sqlSettings.tableName}${backquote};\n\n`;
+    }
+    if (sqlSettings.createTable) {
+      content += `CREATE TABLE ${backquote}${sqlSettings.tableName}${backquote} (\n`;
+      if (sqlSettings.addPrimaryKey) {
+        content += `  ${backquote}id${backquote} mediumint(8) unsigned NOT NULL auto_increment,\n`;
+      }
+      const cols: any[] = [];
+      columns.forEach(({ title, dataType, metadata }) => {
+        let columnTypeInfo = 'MEDIUMTEXT';
+        if (metadata && metadata.sql) {
+          if (metadata.sql.field_MySQL) {
+            columnTypeInfo = metadata.sql.field_MySQL;
+          } else if (metadata.sql.field) {
+            columnTypeInfo = metadata.sql.field;
+          }
+        }
+        cols.push(`  ${backquote}${title}${backquote} ${columnTypeInfo}`);
+      });
+
+      content += cols.join(',\n');
+      if (sqlSettings.addPrimaryKey) {
+        content += `,\n  PRIMARY KEY (${backquote}id${backquote})\n) AUTO_INCREMENT=1;\n\n`;
+      } else {
+        content += '\n);\n\n';
+      }
+    }
+  }
+
+  let colNamesStr = '';
+  if (sqlSettings.encloseInBackQuotes) {
+    colNamesStr = `\`${colTitles.join('`,`')}\``;
+  } else {
+    colNamesStr = colTitles.join(',');
+  }
+
+  let rowDataStr: string[] = [];
+  rows.forEach((row: any, rowIndex: number) => {
+    if (sqlSettings.statementType === 'insert') {
+      const displayVals: any = [];
+      colTitles.forEach((columnTitle: string, colIndex: number) => {
+        displayVals.push(getWrappedValue(row[colIndex], colIndex, numericFieldIndexes));
+      });
+      rowDataStr.push(displayVals.join(','));
+      if (rowDataStr.length === sqlSettings.insertBatchSize) {
+        content += `INSERT INTO ${backquote}${sqlSettings.tableName}${backquote} (${colNamesStr})\nVALUES\n  (${rowDataStr.join('),\n  (')});\n`;
+        rowDataStr = [];
+      }
+    } else if (sqlSettings.statementType === 'insertIgnore') {
+      const displayVals: any = [];
+      colTitles.forEach((columnTitle: string, colIndex: number) => {
+        displayVals.push(getWrappedValue(row[colIndex], colIndex, numericFieldIndexes));
+      });
+      rowDataStr.push(displayVals.join(','));
+      if (rowDataStr.length === sqlSettings.insertBatchSize) {
+        content += `INSERT IGNORE INTO ${backquote}${sqlSettings.tableName}${backquote} (${colNamesStr})\nVALUES\n  (${rowDataStr.join('),\n  (')});\n`;
+        rowDataStr = [];
+      }
+    } else {
+      const pairs: string[] = [];
+      colTitles.forEach((title: string, colIndex: number) => {
+        const colValue = getWrappedValue(row[colIndex], colIndex, numericFieldIndexes);
+        pairs.push(`${backquote}${title}${backquote} = ${colValue}`);
+      });
+      const pairsStr = pairs.join(', ');
+      const id = getCurrentRow(currentBatch, batchSize, rowIndex);
+      content += `UPDATE ${backquote}${sqlSettings.tableName}${backquote} SET ${pairsStr} WHERE ${backquote}id${backquote} = ${id};\n`;
+    }
+  });
+
+  if (rowDataStr.length) {
+    if (sqlSettings.statementType === 'insert') {
+      content += `INSERT INTO ${backquote}${sqlSettings.tableName}${backquote} (${colNamesStr})\nVALUES\n  (${rowDataStr.join('),\n  (')});\n`;
+    } else if (sqlSettings.statementType === 'insertIgnore') {
+      content += `INSERT IGNORE INTO ${backquote}${sqlSettings.tableName}${backquote} (${colNamesStr})\nVALUES\n  (${rowDataStr.join('),\n  (')});\n`;
+    }
+  }
+
+  return content;
+};
+
+export const generatePostgres = (generationData: ETMessageData): string => {
+  const sqlSettings: SQLSettings = generationData.settings;
+  const colTitles = generationData.columns.map(({ title }) => title);
+  let content = '';
+
+  const numericFieldIndexes = getNumericFieldColumnIndexes(generationData.columns);
+
+  if (generationData.isFirstBatch) {
+    if (sqlSettings.dropTable) {
+      content += `DROP TABLE IF EXISTS "${sqlSettings.tableName}";\n\n`;
+    }
+    if (sqlSettings.createTable) {
+      content += `CREATE TABLE "${sqlSettings.tableName}" (\n`;
+
+      if (sqlSettings.addPrimaryKey) {
+        content += '  id SERIAL PRIMARY KEY,\n';
+      }
+      const cols: any[] = [];
+      generationData.columns.forEach(({ title, dataType, metadata }) => {
+        let columnTypeInfo = 'MEDIUMTEXT';
+        if (metadata) {
+          if (metadata.sql && metadata.sql.field_Postgres) {
+            columnTypeInfo = metadata.sql.field_Postgres;
+          } else if (metadata.sql && metadata.sql.field) {
+            columnTypeInfo = metadata.sql.field;
+          }
+        }
+        cols.push(`  ${title} ${columnTypeInfo}`);
+      });
+
+      content += cols.join(',\n');
+      content += '\n);\n\n';
+    }
+  }
+
+  const colNamesStr = colTitles.join(',');
+
+  let rowDataStr: string[] = [];
+  generationData.rows.forEach((row: any, rowIndex: number) => {
+    if (sqlSettings.statementType === 'insert') {
+      const displayVals: any = [];
+      colTitles.forEach((columnTitle: string, colIndex: number) => {
+        displayVals.push(getWrappedValue(row[colIndex], colIndex, numericFieldIndexes, QuoteType.single));
+      });
+      rowDataStr.push(displayVals.join(','));
+      if (rowDataStr.length === sqlSettings.insertBatchSize) {
+        content += `INSERT INTO ${sqlSettings.tableName} (${colNamesStr})\nVALUES\n  (${rowDataStr.join('),\n  (')});\n`;
+        rowDataStr = [];
+      }
+    } else {
+      const pairs: string[] = [];
+      colTitles.forEach((title: string, colIndex: number) => {
+        const colValue = getWrappedValue(row[colIndex], colIndex, numericFieldIndexes);
+        pairs.push(`${title} = ${colValue}`);
+      });
+      const pairsStr = pairs.join(', ');
+      const id = getCurrentRow(generationData.currentBatch, generationData.batchSize, rowIndex);
+      content += `UPDATE ${sqlSettings.tableName} SET ${pairsStr} WHERE id = ${id};\n`;
+    }
+  });
+
+  if (rowDataStr.length && sqlSettings.statementType === 'insert') {
+    content += `INSERT INTO ${sqlSettings.tableName} (${colNamesStr})\nVALUES\n  (${rowDataStr.join('),\n  (')});\n`;
+  }
+
+  return content;
+};
+
+export const generateSQLite = (generationData: ETMessageData): string => {
+  const sqlSettings: SQLSettings = generationData.settings;
+  const backquote = sqlSettings.encloseInBackQuotes ? '`' : '';
+  const colTitles = generationData.columns.map(({ title }) => title);
+  let content = '';
+
+  const numericFieldIndexes = getNumericFieldColumnIndexes(generationData.columns);
+
+  if (generationData.isFirstBatch) {
+    if (sqlSettings.dropTable) {
+      content += `DROP TABLE IF EXISTS ${backquote}${sqlSettings.tableName}${backquote};\n\n`;
+    }
+    if (sqlSettings.createTable) {
+      content += `CREATE TABLE ${backquote}${sqlSettings.tableName}${backquote} (\n`;
+      if (sqlSettings.addPrimaryKey) {
+        content += `  ${backquote}id${backquote} number primary key,\n`;
+      }
+      const cols: any[] = [];
+
+      generationData.columns.forEach(({ title, dataType, metadata }) => {
+        let columnTypeInfo = 'MEDIUMTEXT';
+
+        // figure out the content type. Default to MEDIUMTEXT, then use the specific SQLField_MySQL, then the SQLField
+        if (metadata && metadata.sql) {
+          if (metadata.sql.field_SQLite) {
+            columnTypeInfo = metadata.sql.field_SQLite;
+          } else if (metadata.sql.field) {
+            columnTypeInfo = metadata.sql.field;
+          }
+        }
+        cols.push(`  ${backquote}${title}${backquote} ${columnTypeInfo}`);
+      });
+
+      content += cols.join(',\n');
+      if (sqlSettings.addPrimaryKey) {
+        content += `,\n  PRIMARY KEY (${backquote}id${backquote})\n) AUTO_INCREMENT=1;\n\n`;
+      } else {
+        content += '\n);\n\n';
+      }
+    }
+  }
+
+  let colNamesStr = '';
+  if (sqlSettings.encloseInBackQuotes) {
+    colNamesStr = `\`${colTitles.join('`,`')}\``;
+  } else {
+    colNamesStr = colTitles.join(',');
+  }
+
+  let rowDataStr: string[] = [];
+  generationData.rows.forEach((row: any, rowIndex: number) => {
+    if (sqlSettings.statementType === 'insert') {
+      const displayVals: any = [];
+      colTitles.forEach((columnTitle: string, colIndex: number) => {
+        displayVals.push(getWrappedValue(row[colIndex], colIndex, numericFieldIndexes));
+      });
+      rowDataStr.push(displayVals.join(','));
+      if (rowDataStr.length === sqlSettings.insertBatchSize) {
+        content += `INSERT INTO ${backquote}${sqlSettings.tableName}${backquote} (${colNamesStr})\nVALUES\n  (${rowDataStr.join('),\n  (')});\n`;
+        rowDataStr = [];
+      }
+    } else {
+      const pairs: string[] = [];
+      colTitles.forEach((title: string, colIndex: number) => {
+        const colValue = getWrappedValue(row[colIndex], colIndex, numericFieldIndexes);
+        pairs.push(`${backquote}${title}${backquote} = ${colValue}`);
+      });
+      const pairsStr = pairs.join(', ');
+      const id = getCurrentRow(generationData.currentBatch, generationData.batchSize, rowIndex);
+      content += `UPDATE ${backquote}${sqlSettings.tableName}${backquote} SET ${pairsStr} WHERE ${backquote}id${backquote} = ${id};\n`;
+    }
+  });
+
+  if (rowDataStr.length && sqlSettings.statementType === 'insert') {
+    content += `INSERT INTO ${backquote}${sqlSettings.tableName}${backquote} (${colNamesStr})\nVALUES\n  (${rowDataStr.join('),\n  (')});\n`;
+  }
+
+  return content;
+};
+
+export const generateOracle = (generationData: ETMessageData): string => {
+  const sqlSettings: SQLSettings = generationData.settings;
+  const backquote = sqlSettings.encloseInBackQuotes ? '`' : '';
+  const colTitles = generationData.columns.map(({ title }) => title);
+  let content = '';
+
+  const numericFieldIndexes = getNumericFieldColumnIndexes(generationData.columns);
+
+  if (generationData.isFirstBatch) {
+    if (sqlSettings.dropTable) {
+      content += `DROP TABLE ${backquote}${sqlSettings.tableName}${backquote};\n\n`;
+    }
+    if (sqlSettings.createTable) {
+      content += `CREATE TABLE ${backquote}${sqlSettings.tableName}${backquote} (\n`;
+      if (sqlSettings.addPrimaryKey) {
+        content += `  ${backquote}id${backquote} number primary key,\n`;
+      }
+
+      const cols: any[] = [];
+      generationData.columns.forEach(({ title, dataType, metadata }) => {
+        let columnTypeInfo = 'MEDIUMTEXT';
+        if (metadata && metadata.sql) {
+          if (metadata.sql.field_Oracle) {
+            columnTypeInfo = metadata.sql.field_Oracle;
+          } else if (metadata.sql.field) {
+            columnTypeInfo = metadata.sql.field;
+          }
+        }
+        cols.push(`  ${backquote}${title}${backquote} ${columnTypeInfo}`);
+      });
+
+      content += cols.join(',\n');
+      if (sqlSettings.addPrimaryKey) {
+        content += `,\n  PRIMARY KEY (${backquote}id${backquote})\n) AUTO_INCREMENT=1;\n\n`;
+      } else {
+        content += '\n);\n\n';
+      }
+    }
+  }
+
+  let colNamesStr = '';
+  if (sqlSettings.encloseInBackQuotes) {
+    colNamesStr = `\`${colTitles.join('`,`')}\``;
+  } else {
+    colNamesStr = colTitles.join(',');
+  }
+
+  const rowDataStr: string[] = [];
+  generationData.rows.forEach((row: any, rowIndex: number) => {
+    if (sqlSettings.statementType === 'insert') {
+      const displayVals: any = [];
+      colTitles.forEach((columnTitle: string, colIndex: number) => {
+        displayVals.push(getWrappedValue(row[colIndex], colIndex, numericFieldIndexes));
+      });
+      const rowDataStr = displayVals.join(',');
+      content += `INSERT INTO ${backquote}${sqlSettings.tableName}${backquote} (${colNamesStr})\nVALUES (${rowDataStr});\n`;
+    } else {
+      const pairs: string[] = [];
+      colTitles.forEach((title: string, colIndex: number) => {
+        const colValue = getWrappedValue(row[colIndex], colIndex, numericFieldIndexes);
+        pairs.push(`${backquote}${title}${backquote} = ${colValue}`);
+      });
+      const pairsStr = pairs.join(', ');
+      const id = getCurrentRow(generationData.currentBatch, generationData.batchSize, rowIndex);
+      content += `UPDATE ${backquote}${sqlSettings.tableName}${backquote} SET ${pairsStr} WHERE ${backquote}id${backquote} = ${id};\n`;
+    }
+  });
+
+  if (rowDataStr.length && sqlSettings.statementType === 'insert') {
+    content += `INSERT INTO ${backquote}${sqlSettings.tableName}${backquote} (${colNamesStr})\nVALUES\n  (${rowDataStr.join('),\n  (')});\n`;
+  }
+
+  return content;
+};
+
+export const generateMSSQL = (generationData: ETMessageData): string => {
+  const sqlSettings: SQLSettings = generationData.settings;
+  const colTitles = generationData.columns.map(({ title }) => title);
+  const quote = sqlSettings.quotes === 'single' ? QuoteType.single : QuoteType.double;
+  let content = '';
+
+  const numericFieldIndexes = getNumericFieldColumnIndexes(generationData.columns);
+
+  if (generationData.isFirstBatch) {
+    if (sqlSettings.dropTable) {
+      content += `IF EXISTS(SELECT 1 FROM sys.tables WHERE object_id = OBJECT_ID(${quote}${sqlSettings.tableName}${quote}))\n`;
+      content += 'BEGIN;\n';
+      content += `    DROP TABLE [${sqlSettings.tableName}];\n`;
+      content += 'END;\n';
+      content += 'GO\n\n';
+    }
+
+    if (sqlSettings.createTable) {
+      content += `CREATE TABLE [${sqlSettings.tableName}] (\n`;
+      if (sqlSettings.addPrimaryKey) {
+        content += `    [${sqlSettings.tableName}ID] INTEGER NOT NULL IDENTITY(1, 1),\n`;
+      }
+
+      const cols: any[] = [];
+      generationData.columns.forEach(({ title, dataType, metadata }) => {
+        let columnTypeInfo = 'MEDIUMTEXT';
+        if (metadata && metadata.sql) {
+          if (metadata.sql.field_MSSQL) {
+            columnTypeInfo = metadata.sql.field_MSSQL;
+          } else if (metadata.sql.field) {
+            columnTypeInfo = metadata.sql.field;
+          }
+        }
+        cols.push(`    [${title}] ${columnTypeInfo}`);
+      });
+
+      content += cols.join(',\n');
+      if (sqlSettings.addPrimaryKey) {
+        content += `,\n    PRIMARY KEY ([${sqlSettings.tableName}ID])\n);\nGO\n\n`;
+      } else {
+        content += '\n);\nGO\n\n';
+      }
+    }
+  }
+
+  const colNamesStr = colTitles.join(',');
+
+  let rowDataStr: string[] = [];
+  generationData.rows.forEach((row: any, rowIndex: number) => {
+    if (sqlSettings.statementType === 'insert') {
+      const displayVals: any = [];
+      colTitles.forEach((columnTitle: string, colIndex: number) => {
+        displayVals.push(getWrappedValue(row[colIndex], colIndex, numericFieldIndexes, quote));
+      });
+      rowDataStr.push(displayVals.join(','));
+      if (rowDataStr.length === sqlSettings.insertBatchSize) {
+        content += `INSERT INTO [${sqlSettings.tableName}] (${colNamesStr})\nVALUES\n  (${rowDataStr.join('),\n  (')});\n`;
+        rowDataStr = [];
+      }
+
+      // TODO - need the current row
+      // if (($currentRow % 1000) == 0) {
+      // 	$content .= $endLineChar;
+      // 	$content .= "PRINT 'Row {$currentRow} inserted';$endLineChar";
+      // 	$content .= "GO";
+      // 	$content .= $endLineChar;
+      // }
+    } else {
+      const pairs: string[] = [];
+      colTitles.forEach((title: string, colIndex: number) => {
+        const colValue = getWrappedValue(row[colIndex], colIndex, numericFieldIndexes);
+        pairs.push(`[${title}] = ${colValue}`);
+      });
+      const pairsStr = pairs.join(', ');
+      const id = getCurrentRow(generationData.currentBatch, generationData.batchSize, rowIndex);
+      content += `UPDATE [${sqlSettings.tableName}] SET ${pairsStr} WHERE [{$this->tableName}ID] = ${id};\n`;
+
+      // if (($currentRow % 1000) == 0) {
+      // 	$content .= $endLineChar;
+      // 	$content .= "PRINT 'Row {$currentRow} updated';$endLineChar";
+      // 	$content .= "GO";
+      // 	$content .= $endLineChar;
+      // }
+    }
+  });
+
+  if (rowDataStr.length && sqlSettings.statementType === 'insert') {
+    content += `INSERT INTO [${sqlSettings.tableName}] (${colNamesStr})\nVALUES\n  (${rowDataStr.join('),\n  (')});\n`;
+  }
+
+  return content;
+};
+
+export const getNumericFieldColumnIndexes = (columns: ColumnData[]): number[] => {
+  const numericFieldColIndexes: number[] = [];
+
+  columns.forEach((col: ColumnData, colIndex: number) => {
+    const { metadata } = col;
+    const dataType = metadata.general && metadata.general.dataType;
+
+    if (dataType === 'number') {
+      numericFieldColIndexes.push(colIndex);
+    }
+  });
+
+  return numericFieldColIndexes;
+};
diff --git a/packages/plugins/src/exportTypes/SQL/SQL.scss b/packages/plugins/src/exportTypes/SQL/SQL.scss
new file mode 100644
index 000000000..c517b9615
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/SQL.scss
@@ -0,0 +1,65 @@
+.row {
+	display: flex;
+	margin: 12px 0 14px;
+	&>div {
+		flex: 1;
+
+		&>label {
+			height: 20px;
+			color: #555555;
+			display: block;
+		}
+	}
+	ul {
+		list-style: none;
+		padding: 0;
+		margin: 0 20px 0 0;
+		line-height: 30px;
+		li {
+			display: flex;
+			align-items: center;
+			input {
+				margin: 0 6px 0 0;
+			}
+		}
+	}
+}
+
+.batchSize {
+	display: flex;
+	align-items: center;
+	height: 31px;
+
+	&.withBrace {
+		height: 58px;
+	}
+
+	> span {
+		height: 38px;
+		margin-right: 4px;
+	}
+	> label {
+		margin: 0 4px 0 5px;
+	}
+	input {
+		margin-top: -2px;
+	}
+}
+
+.batchSizeHyphen {
+	color: #cccccc;
+}
+
+.brace {
+	font-size: 50px;
+	color: #dddddd;
+	margin-top: -40px;
+}
+
+.block {
+	margin-bottom: 10px;
+	.title {
+		margin: 0 0 8px;
+		color: #555555;
+	}
+}
diff --git a/packages/plugins/src/exportTypes/SQL/SQL.scss.d.ts b/packages/plugins/src/exportTypes/SQL/SQL.scss.d.ts
new file mode 100644
index 000000000..0fea05895
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/SQL.scss.d.ts
@@ -0,0 +1,18 @@
+declare namespace SqlScssNamespace {
+  export interface ISqlScss {
+    batchSize: string;
+    batchSizeHyphen: string;
+    block: string;
+    brace: string;
+    row: string;
+    title: string;
+    withBrace: string;
+  }
+}
+
+declare const SqlScssModule: SqlScssNamespace.ISqlScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: SqlScssNamespace.ISqlScss;
+};
+
+export = SqlScssModule;
diff --git a/packages/plugins/src/exportTypes/SQL/SQL.state.tsx b/packages/plugins/src/exportTypes/SQL/SQL.state.tsx
new file mode 100644
index 000000000..068a29ef8
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/SQL.state.tsx
@@ -0,0 +1,32 @@
+import { ETState } from '@generatedata/types';
+
+export type GenerationOptionsType = {
+  tableName: string;
+  databaseType: 'MySQL' | 'Postgres' | 'SQLite' | 'Oracle' | 'MSSQL';
+  createTable: boolean;
+  dropTable: boolean;
+  encloseInBackQuotes: boolean;
+  statementType: 'insert' | 'insertIgnore' | 'update';
+  insertBatchSize: number;
+  addPrimaryKey: boolean;
+  quotes: 'single' | 'double';
+};
+
+export const defaultGenerationOptions: GenerationOptionsType = {
+  tableName: 'myTable',
+  databaseType: 'MySQL',
+  createTable: true,
+  dropTable: true,
+  encloseInBackQuotes: true,
+  statementType: 'insert',
+  insertBatchSize: 10,
+  addPrimaryKey: true,
+  quotes: 'single'
+};
+
+export interface SQLSettings extends ETState, GenerationOptionsType {}
+
+export const initialState: SQLSettings = {
+  ...defaultGenerationOptions,
+  isValid: true
+};
diff --git a/packages/plugins/src/exportTypes/SQL/SQL.tsx b/packages/plugins/src/exportTypes/SQL/SQL.tsx
new file mode 100644
index 000000000..9c052fa0d
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/SQL.tsx
@@ -0,0 +1,293 @@
+import * as React from 'react';
+import Switch from '@mui/material/Switch';
+import Dropdown from '~components/dropdown/Dropdown';
+import TextField from '~components/TextField';
+import { SQLSettings } from './SQL.state';
+import { ETDownloadPacket, ETDownloadPacketResponse, ETSettings } from '@generatedata/types';
+import styles from './SQL.scss';
+
+export const Settings = ({ coreI18n, i18n, onUpdate, id, data }: ETSettings): any => {
+  const onChange = (field: string, value: any): void => {
+    onUpdate({
+      ...data,
+      [field]: value
+    });
+  };
+
+  const options = [
+    { value: 'MySQL', label: 'MySQL' },
+    { value: 'Postgres', label: 'Postgres' },
+    { value: 'SQLite', label: 'SQLite' },
+    { value: 'Oracle', label: 'Oracle' },
+    { value: 'MSSQL', label: 'MSSQL' }
+  ];
+
+  const getBackQuotesOption = (): React.ReactNode => {
+    if (data.databaseType === 'Postgres' || data.databaseType === 'MSSQL') {
+      return null;
+    }
+
+    return (
+      <div>
+        <Switch
+          checked={data.encloseInBackQuotes}
+          id={`${id}-encloseInBackQuotes`}
+          value="checked"
+          color="primary"
+          onChange={(): void => onChange('encloseInBackQuotes', !data.encloseInBackQuotes)}
+        />
+        <label htmlFor={`${id}-encloseInBackQuotes`}>{i18n.encloseTableBackquotes}</label>
+      </div>
+    );
+  };
+
+  const getInsertIgnoreOption = (): React.ReactNode => {
+    if (data.databaseType !== 'MySQL') {
+      return null;
+    }
+    return (
+      <li>
+        <input
+          type="radio"
+          value="insertIgnore"
+          id={`${id}-insertIgnore`}
+          onChange={(): void => onChange('statementType', 'insertIgnore')}
+          checked={data.statementType === 'insertIgnore'}
+        />
+        <label htmlFor={`${id}-insertIgnore`}>INSERT IGNORE</label>
+      </li>
+    );
+  };
+
+  const getInsertBatchSize = (): React.ReactNode => {
+    if (data.databaseType === 'Oracle') {
+      return null;
+    }
+
+    let classes = styles.batchSize;
+    let brace = null;
+    let label = (
+      <span>
+        <span className={styles.batchSizeHyphen}>&#8212;</span> {i18n.batchSize}
+      </span>
+    );
+    if (data.databaseType === 'MySQL') {
+      classes += ` ${styles.withBrace}`;
+      brace = <span className={styles.brace}>&#125;</span>;
+      label = i18n.batchSize;
+    }
+
+    return (
+      <div className={classes}>
+        {brace}
+        <label htmlFor={`${id}_insertBatchSize`} id={`${id}_insertBatchSize`}>
+          {label}
+        </label>
+        <TextField
+          type="number"
+          id={`${id}-insertBatchSize`}
+          value={data.insertBatchSize}
+          style={{ width: 60 }}
+          disabled={data.statementType === 'update'}
+          error={data.insertBatchSize ? '' : coreI18n.requiredField}
+          min={1}
+          max={1000}
+          onChange={(e: any): void => onChange('insertBatchSize', parseInt(e.target.value, 10))}
+        />
+      </div>
+    );
+  };
+
+  const getQuotes = (): React.ReactNode => {
+    if (data.databaseType !== 'MSSQL') {
+      return null;
+    }
+
+    return (
+      <div className={styles.block}>
+        <div>
+          <label className={styles.title}>Quotes</label>
+        </div>
+        <div>
+          <div className={styles.row}>
+            <ul>
+              <li>
+                <input
+                  type="radio"
+                  value="single"
+                  name={`${id}-quotes`}
+                  id={`${id}-quotesSingle`}
+                  onChange={(): void => onChange('quotes', 'single')}
+                  checked={data.quotes === 'single'}
+                />
+                <label htmlFor={`${id}-quotesSingle`}>Single</label>
+              </li>
+              <li>
+                <input
+                  type="radio"
+                  value="double"
+                  name={`${id}-quotes`}
+                  id={`${id}-quotesDouble`}
+                  onChange={(): void => onChange('quotes', 'double')}
+                  checked={data.quotes === 'double'}
+                />
+                <label htmlFor={`${id}-quotesDouble`}>Double</label>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    );
+  };
+
+  // TODO - add title for TextField above... title={i18n.batchSizeDesc}
+
+  // TODO need better validation on the database table name
+
+  return (
+    <>
+      <div>
+        <div className={styles.row}>
+          <div>
+            <label htmlFor={`${id}-tableName`}>{i18n.dbTableName}</label>
+            <div>
+              <TextField
+                error={data.tableName.trim() !== '' ? '' : coreI18n.requiredField}
+                id={`${id}-tableName`}
+                value={data.tableName}
+                onChange={(e: any): void => onChange('tableName', e.target.value)}
+              />
+            </div>
+          </div>
+          <div>
+            <label htmlFor={`${id}-databaseType`}>{i18n.dbType}</label>
+            <div>
+              <Dropdown
+                id={`${id}-databaseType`}
+                value={data.databaseType}
+                options={options}
+                onChange={(i: any): void => onChange('databaseType', i.value)}
+              />
+            </div>
+          </div>
+        </div>
+
+        <div className={styles.block}>
+          <div>
+            <label className={styles.title}>{i18n.miscOptions}</label>
+          </div>
+          <div>
+            <div>
+              <Switch
+                checked={data.dropTable}
+                id={`${id}-dropTable`}
+                value="checked"
+                color="primary"
+                onChange={(): void => onChange('dropTable', !data.dropTable)}
+              />
+              <label htmlFor={`${id}-dropTable`}>{i18n.includeDropTableQuery}</label>
+            </div>
+            <div>
+              <Switch
+                checked={data.createTable}
+                id={`${id}-createTable`}
+                value="checked"
+                color="primary"
+                onChange={(): void => onChange('createTable', !data.createTable)}
+              />
+              <label htmlFor={`${id}-createTable`}>{i18n.includeCreateTableQuery}</label>
+            </div>
+            {getBackQuotesOption()}
+            <div>
+              <Switch
+                checked={data.addPrimaryKey}
+                id={`${id}-addPrimaryKey`}
+                value="checked"
+                color="primary"
+                onChange={(): void => onChange('addPrimaryKey', !data.addPrimaryKey)}
+              />
+              <label htmlFor={`${id}-addPrimaryKey`}>{i18n.addDefaultAutoIncrementPrimaryKey}</label>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div className={styles.block}>
+        <div>
+          <label className={styles.title}>{i18n.statementType}</label>
+        </div>
+        <div>
+          <div className={styles.row}>
+            <ul>
+              <li>
+                <input
+                  type="radio"
+                  value="insert"
+                  id={`${id}-insert`}
+                  onChange={(): void => onChange('statementType', 'insert')}
+                  checked={data.statementType === 'insert'}
+                />
+                <label htmlFor={`${id}-insert`}>INSERT</label>
+              </li>
+              {getInsertIgnoreOption()}
+              <li>
+                <input
+                  type="radio"
+                  value="update"
+                  id={`${id}-update`}
+                  onChange={(): void => onChange('statementType', 'update')}
+                  checked={data.statementType === 'update'}
+                />
+                <label htmlFor={`${id}-update`}>UPDATE</label>
+              </li>
+            </ul>
+
+            {getInsertBatchSize()}
+          </div>
+        </div>
+      </div>
+
+      {getQuotes()}
+    </>
+  );
+};
+
+export const getCodeMirrorMode = (): string => 'text/x-sql';
+
+export const getExportTypeLabel = (data: SQLSettings): string => data.databaseType;
+
+export const validateTitleField = (title: string, i18n: any, settings: SQLSettings): null | string => {
+  // as noted in issues/262, SQL Server allows spaces in the db names, hence the separate regexp. issues/426 noted
+  // that MySQL tables can begin with _ (and 0-9 as it turns out).
+  const validTableCol = new RegExp('^[0-9a-zA-Z_$]*$');
+  const validTableColSQLServer = new RegExp('^[_a-zA-Z][0-9a-zA-Z_-\\s]*$');
+
+  if (settings.databaseType === 'MSSQL') {
+    if (!validTableColSQLServer.test(title)) {
+      return i18n.validationInvalidColName;
+    }
+  } else {
+    if (!validTableCol.test(title)) {
+      return i18n.validationInvalidColName;
+    }
+  }
+
+  return null;
+};
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.sql`,
+  fileType: 'text/x-sql'
+});
+
+export const isValid = (settings: SQLSettings): boolean => {
+  if (!settings.tableName) {
+    return false;
+  }
+
+  if (settings.databaseType !== 'Oracle' && !settings.insertBatchSize) {
+    return false;
+  }
+
+  return true;
+};
diff --git a/packages/plugins/src/exportTypes/SQL/SQL.worker.ts b/packages/plugins/src/exportTypes/SQL/SQL.worker.ts
new file mode 100644
index 000000000..a77002736
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/SQL.worker.ts
@@ -0,0 +1,8 @@
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './SQL.generate';
+
+const context: Worker = self as any;
+
+context.onmessage = (e: ETOnMessage) => {
+  context.postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/exportTypes/SQL/__tests__/SQL.generate.test.tsx b/packages/plugins/src/exportTypes/SQL/__tests__/SQL.generate.test.tsx
new file mode 100644
index 000000000..89c357d36
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/__tests__/SQL.generate.test.tsx
@@ -0,0 +1,27 @@
+import { getNumericFieldColumnIndexes } from '../SQL.generate';
+
+describe('getNumericFieldColumnIndexes', () => {
+
+	it('returns nothing when there are no numeric fields', () => {
+		expect(getNumericFieldColumnIndexes([])).toEqual([]);
+		expect(getNumericFieldColumnIndexes([
+			{ title: 'Col 1', metadata: {}, dataType: 'Names' }
+		])).toEqual([]);
+
+		expect(getNumericFieldColumnIndexes([
+			{ title: 'Col 1', metadata: { general: { dataType: 'string' } }, dataType: 'Names' },
+			{ title: 'Col 2', metadata: { general: { dataType: 'string' } }, dataType: 'Phone' },
+		])).toEqual([]);
+	});
+
+	it('identifies numeric fields', () => {
+		expect(getNumericFieldColumnIndexes([
+			{ title: 'Col 1', metadata: { general: { dataType: 'number' } }, dataType: 'Names' },
+			{ title: 'Col 2', metadata: { general: { dataType: 'string' } }, dataType: 'Phone' },
+			{ title: 'Col 3', metadata: { general: { dataType: 'string' } }, dataType: 'Phone' },
+			{ title: 'Col 4', metadata: { general: { dataType: 'number' } }, dataType: 'List' },
+			{ title: 'Col 5', metadata: { general: { dataType: 'infer' } }, dataType: 'Phone' },
+		])).toEqual([0, 3]);
+	});
+
+});
diff --git a/packages/plugins/src/exportTypes/SQL/bundle.ts b/packages/plugins/src/exportTypes/SQL/bundle.ts
new file mode 100644
index 000000000..5835f9157
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/bundle.ts
@@ -0,0 +1,15 @@
+import { ETBundle } from '@generatedata/types';
+import { Settings, getCodeMirrorMode, getExportTypeLabel, validateTitleField, getDownloadFileInfo, isValid } from './SQL';
+import { initialState } from './SQL.state';
+
+const bundle: ETBundle = {
+  Settings,
+  initialState,
+  getExportTypeLabel,
+  getCodeMirrorMode,
+  validateTitleField,
+  isValid,
+  getDownloadFileInfo
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/SQL/config.ts b/packages/plugins/src/exportTypes/SQL/config.ts
new file mode 100644
index 000000000..9cebcdafe
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'core',
+  codeMirrorModes: ['sql/sql']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/ar.json b/packages/plugins/src/exportTypes/SQL/i18n/ar.json
new file mode 100644
index 000000000..d8b8286ab
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/ar.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "اسم العمود",
+  "rowLabel": "عمود الجدول",
+  "rowLabelPlural": "أعمدة الجدول",
+  "validationInvalidColName": "الرجاء إدخال أسماء أعمدة صالحة لقاعدة البيانات (من الألف إلى الياء والأحرف السفلية فقط).",
+  "validationInvalidTableName": "الرجاء إدخال اسم صالح لجدول قاعدة البيانات (من الألف إلى الياء والأحرف السفلية فقط).",
+  "dbTableName": "اسم جدول قاعدة البيانات",
+  "dbType": "نوع قاعدة البيانات",
+  "miscOptions": "خيارات متنوعة",
+  "includeCreateTableQuery": "تضمين CREATE TABLE الاستعلام",
+  "includeDropTableQuery": "تضمين استعلام DROP TABLE",
+  "encloseTableBackquotes": "قم بإرفاق أسماء الجداول والحقول بعلامات اقتباس خلفية",
+  "statementType": "نوع البيان",
+  "primaryKey": "المفتاح الأساسي",
+  "addDefaultAutoIncrementPrimaryKey": "أضف عمود المفتاح الأساسي الافتراضي للزيادة التلقائية",
+  "batchSize": "حجم الدفعة",
+  "batchSizeDesc": "عدد الصفوف المراد إدراجها لكل استعلام (1-300)"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/de.json b/packages/plugins/src/exportTypes/SQL/i18n/de.json
new file mode 100644
index 000000000..a3b6e97f9
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/de.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "Spaltenname",
+  "dbTableName": "Datenbankname der Tabelle",
+  "dbType": "Datenbanktyp",
+  "encloseTableBackquotes": "Schließen Sie Tabellen-und Feldnamen mit Backquotes",
+  "includeCreateTableQuery": "Fügen Sie CREATE TABLE-Abfrage",
+  "includeDropTableQuery": "Fügen Sie DROP TABLE-Abfrage",
+  "miscOptions": "Verschiedene Optionen",
+  "primaryKey": "Primärschlüssel",
+  "rowLabel": "Tabellenspalte",
+  "rowLabelPlural": "Tabellenspalten",
+  "statementType": "Anweisungstyp",
+  "validationInvalidColName": "Bitte geben Sie einen gültigen Datenbankspaltennamen ein (nur a-Z und Unterstriche).",
+  "validationInvalidTableName": "Bitte geben Sie einen gültigen Datenbanktabellennamen ein (nur a-Z und Unterstriche).",
+  "batchSizeDesc": "Anzahl der Zeilen, die pro Abfrage einfügen (1 - 300)",
+  "addDefaultAutoIncrementPrimaryKey": "Fügen Sie die Standard-Primärschlüsselspalte für die automatische Inkrementierung hinzu",
+  "batchSize": "Chargengröße"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/en.json b/packages/plugins/src/exportTypes/SQL/i18n/en.json
new file mode 100644
index 000000000..8dd6847a8
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/en.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "Column Name",
+  "rowLabel": "Table Column",
+  "rowLabelPlural": "Table Columns",
+  "validationInvalidColName": "Please enter a valid database column name (a-Z and underscore characters only).",
+  "validationInvalidTableName": "Please enter a valid database table name (a-Z and underscore characters only).",
+  "dbTableName": "Database table name",
+  "dbType": "Database Type",
+  "miscOptions": "Misc Options",
+  "includeCreateTableQuery": "Include CREATE TABLE query",
+  "includeDropTableQuery": "Include DROP TABLE query",
+  "encloseTableBackquotes": "Enclose table and field names with backquotes",
+  "statementType": "Statement Type",
+  "primaryKey": "Primary Key",
+  "addDefaultAutoIncrementPrimaryKey": "Add default auto-increment primary key column",
+  "batchSize": "batch size",
+  "batchSizeDesc": "Number of rows to insert per query (1 - 300)"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/es.json b/packages/plugins/src/exportTypes/SQL/i18n/es.json
new file mode 100644
index 000000000..23460d538
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/es.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "Nombre de columna",
+  "rowLabel": "Columna de la tabla",
+  "rowLabelPlural": "Columnas de la tabla",
+  "validationInvalidColName": "Ingrese un nombre de columna de base de datos válido (a-Z y caracteres de subrayado solamente).",
+  "validationInvalidTableName": "Ingrese un nombre de tabla de base de datos válido (a-Z y caracteres de subrayado solamente).",
+  "dbTableName": "Nombre de tabla",
+  "dbType": "Tipo de base de datos",
+  "miscOptions": "Opciones varias",
+  "includeCreateTableQuery": "Incluir sentencia CREATE TABLE",
+  "includeDropTableQuery": "Incluir sentencia DROP TABLE",
+  "encloseTableBackquotes": "Entrecomillar nombres (tablas, columnas)",
+  "statementType": "Tipo de sentencia",
+  "primaryKey": "Clave primaria",
+  "batchSizeDesc": "Número de filas a insertar por una consulta (1-300)",
+  "addDefaultAutoIncrementPrimaryKey": "Agregar columna de clave primaria predeterminada de incremento automático",
+  "batchSize": "tamaño del lote"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/fr.json b/packages/plugins/src/exportTypes/SQL/i18n/fr.json
new file mode 100644
index 000000000..cbee81f65
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/fr.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "Column Name",
+  "dbTableName": "Nom de la table",
+  "dbType": "Type de base de données",
+  "encloseTableBackquotes": "Protéger les noms des tables et des champs avec des `backquotes`",
+  "includeCreateTableQuery": "Inclure une requête CREATE TABLE",
+  "includeDropTableQuery": "Inclure une requête DROP TABLE",
+  "miscOptions": "Options diverses",
+  "primaryKey": "Clé primaire",
+  "rowLabel": "Colonne",
+  "rowLabelPlural": "Colonnes",
+  "statementType": "Type de requêtes",
+  "validationInvalidColName": "Veuillez saisir un nom de colonne de base de données valide (a-Z et caractères de soulignement uniquement).",
+  "validationInvalidTableName": "Veuillez saisir un nom de table de base de données valide (a-Z et caractères de soulignement uniquement).",
+  "batchSizeDesc": "Nombre de lignes à insérer par une requête (1 - 300)",
+  "addDefaultAutoIncrementPrimaryKey": "Ajouter une colonne de clé primaire à incrémentation automatique par défaut",
+  "batchSize": "taille du lot"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/hi.json b/packages/plugins/src/exportTypes/SQL/i18n/hi.json
new file mode 100644
index 000000000..2e7776f53
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/hi.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "आम नाम",
+  "rowLabel": "टेबल कॉलम",
+  "rowLabelPlural": "टेबल कॉलम",
+  "validationInvalidColName": "कृपया एक मान्य डेटाबेस कॉलम नाम दर्ज करें (केवल a-Z और अंडरस्कोर वर्ण)।",
+  "validationInvalidTableName": "कृपया एक मान्य डेटाबेस तालिका नाम दर्ज करें (केवल a-Z और अंडरस्कोर वर्ण)।",
+  "dbTableName": "डेटाबेस तालिका का नाम",
+  "dbType": "डेटाबेस प्रकार",
+  "miscOptions": "विविध विकल्प",
+  "includeCreateTableQuery": "तालिका क्वेरी बनाएं शामिल करें",
+  "includeDropTableQuery": "ड्रॉप टेबल क्वेरी शामिल करें",
+  "encloseTableBackquotes": "बैककोट्स के साथ टेबल और फील्ड नाम संलग्न करें",
+  "statementType": "विवरण प्रकार",
+  "primaryKey": "प्राथमिक कुंजी",
+  "addDefaultAutoIncrementPrimaryKey": "डिफ़ॉल्ट ऑटो-इंक्रीमेंट प्राथमिक कुंजी कॉलम जोड़ें",
+  "batchSize": "बैच का आकार",
+  "batchSizeDesc": "प्रति क्वेरी सम्मिलित करने के लिए पंक्तियों की संख्या (1 - 300)"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/ja.json b/packages/plugins/src/exportTypes/SQL/i18n/ja.json
new file mode 100644
index 000000000..09635fd5b
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/ja.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "列名",
+  "rowLabel": "テーブル列",
+  "rowLabelPlural": "テーブル列",
+  "validationInvalidColName": "有効なデータベース列名を入力してください (a-Z とアンダースコア文字のみ)。",
+  "validationInvalidTableName": "有効なデータベース テーブル名を入力してください (a ～ Z とアンダースコア文字のみ)。",
+  "dbTableName": "データベーステーブル名",
+  "dbType": "データベースタイプ",
+  "miscOptions": "その他のオプション",
+  "includeCreateTableQuery": "CREATETABLEクエリを含める",
+  "includeDropTableQuery": "DROPTABLEクエリを含める",
+  "encloseTableBackquotes": "テーブル名とフィールド名をバッククォートで囲みます",
+  "statementType": "ステートメントタイプ",
+  "primaryKey": "主キー",
+  "addDefaultAutoIncrementPrimaryKey": "デフォルトの自動インクリメント主キー列を追加します",
+  "batchSize": "バッチサイズ",
+  "batchSizeDesc": "クエリごとに挿入する行数（1〜300）"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/nl.json b/packages/plugins/src/exportTypes/SQL/i18n/nl.json
new file mode 100644
index 000000000..bf190b182
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/nl.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "Kolomnaam",
+  "dbTableName": "Database tabelnaam",
+  "dbType": "Databasetype",
+  "encloseTableBackquotes": "Omsluit tabel-en veldnamen met aanhalingstekens",
+  "includeCreateTableQuery": "Inclusief CREATE TABLE statement",
+  "includeDropTableQuery": "Inclusief DROP TABLE statement",
+  "miscOptions": "Overige Opties",
+  "primaryKey": "Primaire sleutel",
+  "rowLabel": "Tabelkolom",
+  "rowLabelPlural": "Tabel Kolommen",
+  "statementType": "Statement Type",
+  "validationInvalidColName": "Voer een geldige databasekolomnaam in (alleen a-Z en onderstrepingstekens).",
+  "validationInvalidTableName": "Voer een geldige databasetabelnaam in (alleen a-Z en onderstrepingstekens).",
+  "batchSizeDesc": "Aantal rijen dat per query moet worden ingevoegd (1-300)",
+  "addDefaultAutoIncrementPrimaryKey": "Standaard automatisch verhogen primaire sleutelkolom toevoegen",
+  "batchSize": "seriegrootte"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/pt.json b/packages/plugins/src/exportTypes/SQL/i18n/pt.json
new file mode 100644
index 000000000..61d0c9c7e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/pt.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "Nome da coluna",
+  "rowLabel": "Coluna da Tabela",
+  "rowLabelPlural": "Colunas da Tabela",
+  "validationInvalidColName": "Insira um nome de coluna de banco de dados válido (somente caracteres a-Z e sublinhado).",
+  "validationInvalidTableName": "Insira um nome de tabela de banco de dados válido (somente caracteres a-Z e sublinhado).",
+  "dbTableName": "Nome da tabela de banco de dados",
+  "dbType": "Tipo de banco de dados",
+  "miscOptions": "Opções diversas",
+  "includeCreateTableQuery": "Incluir consulta CREATE TABLE",
+  "includeDropTableQuery": "Incluir consulta DROP TABLE",
+  "encloseTableBackquotes": "Coloque nomes de tabelas e campos entre aspas",
+  "statementType": "Tipo de Declaração",
+  "primaryKey": "Chave primária",
+  "addDefaultAutoIncrementPrimaryKey": "Adicionar coluna de chave primária de incremento automático padrão",
+  "batchSize": "tamanho do batch",
+  "batchSizeDesc": "Número de linhas a inserir por consulta (1 - 300)"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/ru.json b/packages/plugins/src/exportTypes/SQL/i18n/ru.json
new file mode 100644
index 000000000..ec80a3908
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/ru.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "Имя столбца",
+  "rowLabel": "Столбец таблицы",
+  "rowLabelPlural": "Столбцы таблицы",
+  "validationInvalidColName": "Пожалуйста, введите допустимое имя столбца базы данных (только символы AZ и подчеркивания).",
+  "validationInvalidTableName": "Пожалуйста, введите допустимое имя таблицы базы данных (только символы AZ и подчеркивания).",
+  "dbTableName": "Имя таблицы базы данных",
+  "dbType": "Тип базы данных",
+  "miscOptions": "Разные параметры",
+  "includeCreateTableQuery": "Включить запрос CREATE TABLE",
+  "includeDropTableQuery": "Включить запрос DROP TABLE",
+  "encloseTableBackquotes": "Заключите имена таблиц и полей в обратные кавычки",
+  "statementType": "Тип заявления",
+  "primaryKey": "Первичный ключ",
+  "addDefaultAutoIncrementPrimaryKey": "Добавить столбец первичного ключа с автоинкрементом по умолчанию",
+  "batchSize": "размер партии",
+  "batchSizeDesc": "Количество строк для вставки на запрос (1–300)"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/ta.json b/packages/plugins/src/exportTypes/SQL/i18n/ta.json
new file mode 100644
index 000000000..49c9a09e3
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/ta.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "நெடுவரிசை பெயர்",
+  "rowLabel": "அட்டவணை நெடுவரிசை",
+  "rowLabelPlural": "அட்டவணை நெடுவரிசைகள்",
+  "validationInvalidColName": "சரியான தரவுத்தள நெடுவரிசைப் பெயரை உள்ளிடவும் (a-Z மற்றும் அடிக்கோடிட்டு எழுத்துக்கள் மட்டும்).",
+  "validationInvalidTableName": "சரியான தரவுத்தள அட்டவணைப் பெயரை உள்ளிடவும் (a-Z மற்றும் அடிக்கோடிட்டு எழுத்துக்கள் மட்டும்).",
+  "dbTableName": "தரவுத்தள அட்டவணை பெயர்",
+  "dbType": "தரவுத்தள வகை",
+  "miscOptions": "தவறான விருப்பங்கள்",
+  "includeCreateTableQuery": "CREATE TABLE வினவலைச் சேர்க்கவும்",
+  "includeDropTableQuery": "டிராப் டேபிள் வினவலைச் சேர்க்கவும்",
+  "encloseTableBackquotes": "அட்டவணை மற்றும் புலம் பெயர்களை பேக் கோட்டுகளுடன் இணைக்கவும்",
+  "statementType": "அறிக்கை வகை",
+  "primaryKey": "முதன்மை விசை",
+  "addDefaultAutoIncrementPrimaryKey": "இயல்புநிலை தானாக அதிகரிக்கும் முதன்மை விசை நெடுவரிசையைச் சேர்க்கவும்",
+  "batchSize": "தொகுதி அளவு",
+  "batchSizeDesc": "வினவலுக்குச் செருக வரிசைகளின் எண்ணிக்கை (1 - 300)"
+}
diff --git a/packages/plugins/src/exportTypes/SQL/i18n/zh.json b/packages/plugins/src/exportTypes/SQL/i18n/zh.json
new file mode 100644
index 000000000..10801204e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/SQL/i18n/zh.json
@@ -0,0 +1,19 @@
+{
+  "EXPORT_TYPE_NAME": "SQL",
+  "COL_TITLE": "栏名",
+  "rowLabel": "表格栏",
+  "rowLabelPlural": "表格栏",
+  "validationInvalidColName": "请输入有效的数据库列名称（仅限 a-Z 和下划线字符）。",
+  "validationInvalidTableName": "请输入有效的数据库表名（仅限 a-Z 和下划线字符）。",
+  "dbTableName": "数据库表名称",
+  "dbType": "数据库类型",
+  "miscOptions": "杂项选项",
+  "includeCreateTableQuery": "包括CREATE TABLE查询",
+  "includeDropTableQuery": "包括DROP TABLE查询",
+  "encloseTableBackquotes": "用反引号将表和字段名称引起来",
+  "statementType": "报表类型",
+  "primaryKey": "首要的关键",
+  "addDefaultAutoIncrementPrimaryKey": "添加默认的自动增量主键列",
+  "batchSize": "批量",
+  "batchSizeDesc": "每个查询要插入的行数（1-300）"
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/README.md b/packages/plugins/src/exportTypes/Typescript/README.md
new file mode 100644
index 000000000..93e3da805
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/README.md
@@ -0,0 +1,3 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; Typescript
+
+TODO.
diff --git a/packages/plugins/src/exportTypes/Typescript/Typescript.generate.ts b/packages/plugins/src/exportTypes/Typescript/Typescript.generate.ts
new file mode 100644
index 000000000..4d840fcb5
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/Typescript.generate.ts
@@ -0,0 +1,94 @@
+import { ETMessageData } from '../../';
+import { ColumnData } from '~types/general';
+import { WorkerUtils } from '../../';
+
+let utils: WorkerUtils;
+const maybeEnquote = (value: any) => {
+  const isNumeric = utils.numberUtils.isNumeric(value);
+
+  let startsWithZero = false;
+  if ((value || '').toString().length > 0) {
+    startsWithZero = value.toString()[0] === '0';
+  }
+  const isValidNumber = isNumeric && !startsWithZero;
+  if (!isValidNumber && !isJavascriptBoolean(value)) {
+    value = `"${value}"`;
+  }
+
+  return value;
+};
+
+export const generate = (
+  { stripWhitespace, isFirstBatch, isLastBatch, settings, columns, rows }: ETMessageData,
+  workerUtils: WorkerUtils
+): string => {
+  let content = '';
+  let comma = '';
+  utils = workerUtils;
+
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+  const space = stripWhitespace ? '' : ' ';
+
+  if (isFirstBatch) {
+    const { typeName, varName } = settings;
+
+    content += generateTypes(typeName, columns);
+    content += `export const ${varName}: ${typeName}[] = [`;
+  } else {
+    comma = ',';
+  }
+
+  rows.forEach((row: any) => {
+    content += `${comma}${newline}${tab}{`;
+    comma = '';
+
+    columns.forEach(({ title, metadata }: any, colIndex: number) => {
+      const propName: string = title.replace(/"/, '"');
+
+      let value = row[colIndex];
+
+      // if a DT has explicitly said it's a string, use a string
+      if (metadata && metadata.general && metadata.general.dataType && metadata.general.dataType === 'string') {
+        value = `"${value}"`;
+
+        // otherwise, do a safety check and encase it in double quote if necessary
+      } else {
+        value = maybeEnquote(value);
+      }
+
+      content += `${comma}${newline}${tab}${tab}${propName}:${space}${value}`;
+      comma = ',';
+    });
+
+    content += `${newline}${tab}}`;
+  });
+
+  if (isLastBatch) {
+    content += `${newline}];`;
+  }
+
+  return content;
+};
+
+const generateTypes = (typeName: string, colData: ColumnData[]): string => {
+  let typeBlock = `export type ${typeName} = {\n`;
+
+  colData.forEach(({ title, metadata }) => {
+    let type = 'string';
+    if (metadata && metadata.general) {
+      if (metadata.general.dataType === 'infer') {
+        type = 'number | string';
+      } else if (metadata.general.dataType !== 'string') {
+        type = metadata.general.dataType;
+      }
+    }
+    typeBlock += `\t${title}: ${type};\n`;
+  });
+
+  typeBlock += '};\n\n';
+
+  return typeBlock;
+};
+
+const isJavascriptBoolean = (n: any): boolean => n === 'true' || n === 'false' || n === true || n === false;
diff --git a/packages/plugins/src/exportTypes/Typescript/Typescript.scss b/packages/plugins/src/exportTypes/Typescript/Typescript.scss
new file mode 100644
index 000000000..22b3ec345
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/Typescript.scss
@@ -0,0 +1,7 @@
+.settingsBlock {
+	label {
+		display: block;
+		margin-bottom: 4px;
+		color: #666666;
+	}
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/Typescript.scss.d.ts b/packages/plugins/src/exportTypes/Typescript/Typescript.scss.d.ts
new file mode 100644
index 000000000..95ad35461
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/Typescript.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace TypescriptScssNamespace {
+  export interface ITypescriptScss {
+    settingsBlock: string;
+  }
+}
+
+declare const TypescriptScssModule: TypescriptScssNamespace.ITypescriptScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: TypescriptScssNamespace.ITypescriptScss;
+};
+
+export = TypescriptScssModule;
diff --git a/packages/plugins/src/exportTypes/Typescript/Typescript.state.tsx b/packages/plugins/src/exportTypes/Typescript/Typescript.state.tsx
new file mode 100644
index 000000000..2051e649c
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/Typescript.state.tsx
@@ -0,0 +1,18 @@
+import { ETState } from '@generatedata/types';
+
+export type GenerationOptionsType = {
+  typeName: string;
+  varName: string;
+};
+
+export const defaultGenerationOptions: GenerationOptionsType = {
+  typeName: 'RandomData',
+  varName: 'data'
+};
+
+export interface TypescriptSettings extends ETState, GenerationOptionsType {}
+
+export const initialState: TypescriptSettings = {
+  ...defaultGenerationOptions,
+  isValid: true
+};
diff --git a/packages/plugins/src/exportTypes/Typescript/Typescript.tsx b/packages/plugins/src/exportTypes/Typescript/Typescript.tsx
new file mode 100644
index 000000000..a62cd1952
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/Typescript.tsx
@@ -0,0 +1,53 @@
+import * as React from 'react';
+import TextField from '~components/TextField';
+import { TypescriptSettings } from './Typescript.state';
+import { ETDownloadPacket, ETDownloadPacketResponse, ETSettings } from '@generatedata/types';
+import styles from './Typescript.scss';
+
+export const Settings = ({ i18n, data, id, coreI18n, onUpdate }: ETSettings) => {
+  const onChange = (field: string, value: string): void => {
+    const newValues = {
+      ...data,
+      [field]: value
+    };
+
+    const isValid = newValues.typeName.trim() !== '' && newValues.varName.trim() !== '';
+    onUpdate({
+      ...newValues,
+      isValid
+    });
+  };
+
+  return (
+    <div className={styles.settingsBlock}>
+      <label htmlFor={`${id}-typeName`}>{i18n.typeName}</label>
+      <TextField
+        id={`${id}-typeName`}
+        error={data.typeName !== '' ? '' : coreI18n.requiredField}
+        value={data.typeName}
+        style={{ width: '100%', marginBottom: 10 }}
+        onChange={(e: any): void => onChange('typeName', e.target.value)}
+      />
+
+      <label htmlFor={`${id}-exportedVarName`}>{i18n.exportedVarName}</label>
+      <TextField
+        id={`${id}-exportedVarName`}
+        error={data.varName !== '' ? '' : coreI18n.requiredField}
+        value={data.varName}
+        style={{ width: '100%' }}
+        onChange={(e: any): void => onChange('varName', e.target.value)}
+      />
+    </div>
+  );
+};
+
+export const getCodeMirrorMode = (): string => 'text/typescript';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.ts`,
+  fileType: 'application/x-typescript'
+});
+
+export const isValid = (settings: TypescriptSettings): boolean => {
+  return settings.typeName.trim() !== '' && settings.varName.trim() !== '';
+};
diff --git a/packages/plugins/src/exportTypes/Typescript/Typescript.worker.ts b/packages/plugins/src/exportTypes/Typescript/Typescript.worker.ts
new file mode 100644
index 000000000..b6db4a40a
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/Typescript.worker.ts
@@ -0,0 +1,15 @@
+import utils from '../../../utils';
+import { ETOnMessage } from '../../';
+import { generate } from './Typescript.generate';
+
+const context: Worker = self as any;
+
+let workerUtilsLoaded = false;
+context.onmessage = (e: ETOnMessage) => {
+  if (!workerUtilsLoaded) {
+    importScripts(e.data.workerUtilsUrl);
+    workerUtilsLoaded = true;
+  }
+
+  context.postMessage(generate(e.data, utils));
+};
diff --git a/packages/plugins/src/exportTypes/Typescript/__tests__/Typescript.generator.test.ts b/packages/plugins/src/exportTypes/Typescript/__tests__/Typescript.generator.test.ts
new file mode 100644
index 000000000..42fd71b23
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/__tests__/Typescript.generator.test.ts
@@ -0,0 +1,170 @@
+test.skip('skip', () => {});
+
+// import { generateSimple, isNested } from '../JSON.generator';
+// import { ETMessageData } from '../../';
+//
+//
+// describe('isNested', () => {
+//     it('should return false when no columns have dots in them', () => {
+//         const cols = [
+//             'one',
+//             'two',
+//             'three'
+//         ];
+//         expect(isNested(cols)).toEqual(false);
+//     });
+//
+//     it('should return false when there are no columns', () => {
+//         expect(isNested([])).toEqual(false);
+//     });
+//
+//
+//     it('should return true when one item contains a dot', () => {
+//         expect(isNested(['a.c', 'b', 'c'])).toEqual(true);
+//         expect(isNested(['a', 'b.e', 'b.c'])).toEqual(true);
+//         expect(isNested(['a', 'b', 'b.c'])).toEqual(true);
+//     });
+// });
+//
+//
+// describe('generateSimple', () => {
+//     const data: ETMessageData = {
+//         columns: [
+//         	{ title: 'One', dataType: 'Names' },
+// 			{ title: 'Two', dataType: 'Names' }
+// 		],
+//         rows: [
+//             ['Row #1, Cell #1', 'Row #1, Cell #2'],
+//             ['Row #2, Cell #1', 'Row #2, Cell #2']
+//         ],
+//         isFirstBatch: true,
+//         isLastBatch: true,
+// 		dataTypeMetadata: {}
+//     };
+//
+//     // my IDE likes to convert tabs to spaces & I'm not going to argue with it. This'll work across all developers
+//     // systems, regardless of their preferences
+//     it('should return expected JSON content', () => {
+//         expect(generateSimple(data, false)).toEqual(
+// `[
+// \t{
+// \t\t"One": "Row #1, Cell #1",
+// \t\t"Two": "Row #1, Cell #2"
+// \t},
+// \t{
+// \t\t"One": "Row #2, Cell #1",
+// \t\t"Two": "Row #2, Cell #2"
+// \t}
+// ]`
+//         );
+//     });
+//
+//     it('should return expected minified JSON content', () => {
+//         expect(generateSimple(data, true)).toEqual(
+//             `[{"One":"Row #1, Cell #1","Two":"Row #1, Cell #2"},{"One":"Row #2, Cell #1","Two":"Row #2, Cell #2"}]`
+//         );
+//     });
+//
+//     it('should escape double quotes within property names', () => {
+//         const doubleQuoteData: ETMessageData = {
+//             columns: [
+//             	{ title: 'Name', dataType: 'Names' },
+// 				{ title: '"Phone" Number', dataType: 'Names' }
+// 			],
+//             rows: [
+//                 ['Tom', '(604) 123-1234'],
+//                 ['Susan', '(604) 733-1224'],
+//             ],
+//             isFirstBatch: true,
+//             isLastBatch: true,
+// 			dataTypeMetadata: {}
+//         };
+//
+//         expect(generateSimple(doubleQuoteData, false)).toEqual(
+//             `[
+// \t{
+// \t\t"Name": "Tom",
+// \t\t"\"Phone\" Number": "(604) 123-1234"
+// \t},
+// \t{
+// \t\t"Name": "Susan",
+// \t\t"\"Phone\" Number": "(604) 733-1224"
+// \t}
+// ]`
+//         );
+//     });
+//
+//     it('should escape double quotes within values', () => {
+//         const doubleQuoteValueData: ETMessageData = {
+//             columns: [
+//             	{ title: 'Name', dataType: 'Names' },
+// 				{ title: 'Phone', dataType: 'Names' }
+// 			],
+//             rows: [
+//                 ['Tom', '"Whoah" he said...'],
+//                 ['Susan', 'Like "TOTALLY!"'],
+//             ],
+//             isFirstBatch: true,
+//             isLastBatch: true,
+// 			dataTypeMetadata: {}
+//         };
+//
+//         expect(generateSimple(doubleQuoteValueData, false)).toEqual(
+//             `[
+// \t{
+// \t\t"Name": "Tom",
+// \t\t"Phone": "\"Whoah\" he said..."
+// \t},
+// \t{
+// \t\t"Name": "Susan",
+// \t\t"Phone": "Like \"TOTALLY!\""
+// \t}
+// ]`
+//         );
+//     });
+//
+//     it('should not put double quotes around numbers', () => {
+//         const numData: ETMessageData = {
+//             columns: [
+// 				{ title: 'Num1', dataType: 'Names' },
+// 				{ title: 'Num2', dataType: 'Names' },
+// 				{ title: 'Num3', dataType: 'Names' },
+// 				{ title: 'Num4', dataType: 'Names' },
+// 				{ title: 'Num5', dataType: 'Names' },
+// 				{ title: 'Num6', dataType: 'Names' }
+// 			],
+//             rows: [
+//                 ['0', 0, '1', 1, '1.23', 1.23]
+//             ],
+//             isFirstBatch: true,
+//             isLastBatch: true,
+// 			dataTypeMetadata: {}
+//         };
+//
+//         expect(generateSimple(numData, true)).toEqual(
+//             `[{"Num1":0,"Num2":0,"Num3":1,"Num4":1,"Num5":1.23,"Num6":1.23}]`
+//         );
+//     });
+//
+//     it('should not put double quotes around boolean values', () => {
+//         const numData: ETMessageData = {
+//             columns: [
+//             	{ title: 'a', dataType: 'Names' },
+// 				{ title: 'b', dataType: 'Names' },
+// 				{ title: 'c', dataType: 'Names' },
+// 				{ title: 'd', dataType: 'Names' }
+// 			],
+//             rows: [
+//                 ['false', false, 'true', true]
+//             ],
+//             isFirstBatch: true,
+//             isLastBatch: true,
+// 			dataTypeMetadata: {}
+//         };
+//
+//         expect(generateSimple(numData, true)).toEqual(
+//             `[{"a":false,"b":false,"c":true,"d":true}]`
+//         );
+//     });
+//
+// });
diff --git a/packages/plugins/src/exportTypes/Typescript/__tests__/Typescript.test.tsx b/packages/plugins/src/exportTypes/Typescript/__tests__/Typescript.test.tsx
new file mode 100644
index 000000000..5589a90b6
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/__tests__/Typescript.test.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Settings } from '../Typescript';
+import { initialState } from '../Typescript.state';
+import { defaultETSettings } from '../../../../../tests/testHelpers';
+
+const i18n = require('../i18n/en.json');
+
+describe('Settings', () => {
+	it('renders', () => {
+		const data = { ...initialState };
+		const onUpdate = jest.fn();
+
+		const { container } = render(
+			<Settings
+				{...defaultETSettings}
+				i18n={i18n}
+				data={data}
+				onUpdate={onUpdate}
+			/>
+		);
+		expect(container).toBeTruthy();
+	});
+});
diff --git a/packages/plugins/src/exportTypes/Typescript/bundle.ts b/packages/plugins/src/exportTypes/Typescript/bundle.ts
new file mode 100644
index 000000000..a19584019
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/bundle.ts
@@ -0,0 +1,13 @@
+import { ETBundle } from '@generatedata/types';
+import { Settings, getCodeMirrorMode, getDownloadFileInfo, isValid } from './Typescript';
+import { initialState } from './Typescript.state';
+
+const bundle: ETBundle = {
+  initialState,
+  Settings,
+  getCodeMirrorMode,
+  getDownloadFileInfo,
+  isValid
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/Typescript/config.ts b/packages/plugins/src/exportTypes/Typescript/config.ts
new file mode 100644
index 000000000..654993b2a
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'programmingLanguage',
+  codeMirrorModes: ['javascript/javascript', 'xml/xml', 'markdown/markdown']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/ar.json b/packages/plugins/src/exportTypes/Typescript/i18n/ar.json
new file mode 100644
index 000000000..39d25b19c
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/ar.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "اسم الخاصية",
+  "typeName": "أكتب اسم",
+  "exportedVarName": "تم تصدير اسم المتغير"
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/de.json b/packages/plugins/src/exportTypes/Typescript/i18n/de.json
new file mode 100644
index 000000000..3c59ed1c7
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/de.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "Name des Anwesens",
+  "typeName": "Modellname",
+  "exportedVarName": "Name der exportierten Variablen"
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/en.json b/packages/plugins/src/exportTypes/Typescript/i18n/en.json
new file mode 100644
index 000000000..bf2b63797
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/en.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "Property Name",
+  "typeName": "Type name",
+  "exportedVarName": "Exported variable name"
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/es.json b/packages/plugins/src/exportTypes/Typescript/i18n/es.json
new file mode 100644
index 000000000..1b239fb17
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/es.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "Nombre de la propiedad",
+  "typeName": "Escribe un nombre",
+  "exportedVarName": "Nombre de variable exportada"
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/fr.json b/packages/plugins/src/exportTypes/Typescript/i18n/fr.json
new file mode 100644
index 000000000..25e589f8b
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/fr.json
@@ -0,0 +1,7 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "Nom de la propriété",
+  "typeName": "Nom du type",
+  "exportedVarName": "Nom de la variable exportée"
+}
+
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/hi.json b/packages/plugins/src/exportTypes/Typescript/i18n/hi.json
new file mode 100644
index 000000000..c04e7acfc
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/hi.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "संपत्ति का नाम",
+  "typeName": "नाम लिखो",
+  "exportedVarName": "निर्यातित चर नाम"
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/ja.json b/packages/plugins/src/exportTypes/Typescript/i18n/ja.json
new file mode 100644
index 000000000..b2b45f4a9
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/ja.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "プロパティ名",
+  "typeName": "タイプ名",
+  "exportedVarName": "エクスポートされた変数名"
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/nl.json b/packages/plugins/src/exportTypes/Typescript/i18n/nl.json
new file mode 100644
index 000000000..274d326ee
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/nl.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "Eigendomsnaam",
+  "typeName": "Typ de naam",
+  "exportedVarName": "Geëxporteerde variabelenaam"
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/pt.json b/packages/plugins/src/exportTypes/Typescript/i18n/pt.json
new file mode 100644
index 000000000..8a71e1d80
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/pt.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "Nome da propriedade",
+  "typeName": "Digite o nome",
+  "exportedVarName": "Nome da variável exportada"
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/ru.json b/packages/plugins/src/exportTypes/Typescript/i18n/ru.json
new file mode 100644
index 000000000..7b2fb03a9
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/ru.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "Имя свойства",
+  "typeName": "Введите название",
+  "exportedVarName": "Имя экспортируемой переменной"
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/ta.json b/packages/plugins/src/exportTypes/Typescript/i18n/ta.json
new file mode 100644
index 000000000..0f15b58dc
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/ta.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "சொத்தின் பெயர்",
+  "typeName": "பெயரைத் தட்டச்சு செய்க",
+  "exportedVarName": "ஏற்றுமதி செய்யப்பட்ட மாறி பெயர்"
+}
diff --git a/packages/plugins/src/exportTypes/Typescript/i18n/zh.json b/packages/plugins/src/exportTypes/Typescript/i18n/zh.json
new file mode 100644
index 000000000..a2b29d7f7
--- /dev/null
+++ b/packages/plugins/src/exportTypes/Typescript/i18n/zh.json
@@ -0,0 +1,6 @@
+{
+  "EXPORT_TYPE_NAME": "Typescript",
+  "COL_TITLE": "物业名称",
+  "typeName": "类型名称",
+  "exportedVarName": "导出的变量名称"
+}
diff --git a/packages/plugins/src/exportTypes/XML/README.md b/packages/plugins/src/exportTypes/XML/README.md
new file mode 100644
index 000000000..1484ed7a2
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/README.md
@@ -0,0 +1,85 @@
+# [Docs](../../../../../docs/README.md) &raquo; [Plugins](../../README.md) &raquo; [Export Types](../README.md) &raquo; XML
+
+This Export Type lets you generate your random data in XML format. You can use this plugin in one of two ways:
+
+1. Rely on the plugin generating the XML structure by just passing in `rootNodeName` and `recordNodeName` settings, 
+which govern the key node names, or
+2. Pass in a `useCustomExportFormat` (true) and a `customTemplate` setting that contains a Smarty template to 
+control the generated markup.
+ 
+See below for an example of each.
+
+
+### Example API Usage
+
+Here's a simple example that uses the `rootNodeName` and `recordNodeName` setting to generate the XM content. Just 
+POST the following JSON content to the following API path: 
+`http://[your site]/[generate data folder]/api/v1/data`
+
+```javascript
+{
+    "numRows": 15,
+    "rows": [
+        {
+            "type": "AlphaNumeric",
+            "title": "RandomPassword",
+            "settings": {
+                "placeholder": "LLLxxLLLxLL"
+            }
+        },
+        {
+            "type": "AlphaNumeric",
+            "title": "USZipcode",
+            "settings": {
+                "placeholder": "xxxxx"
+            }
+        }
+    ],
+    "export": {
+        "type": "XML",
+        "settings": {
+            "rootNodeName": "rows",
+            "recordNodeName": "row"
+        }
+    }
+}
+```
+
+Here's a second example. Like with the HTML Export Type, you can provide your own custom Smarty template to generate
+the XML with. It's ungainly and a pain, since you need to serialize your template into a JSON string, but the option is
+there if you want it.
+
+```javascript
+{
+    "numRows": 15,
+    "rows": [
+        {
+            "type": "AlphaNumeric",
+            "title": "RandomPassword",
+            "settings": {
+                "placeholder": "LLLxxLLLxLL"
+            }
+        },
+        {
+            "type": "AlphaNumeric",
+            "title": "USZipcode",
+            "settings": {
+                "placeholder": "xxxxx"
+            }
+        }
+    ],
+    "export": {
+        "type": "XML",
+        "settings": {
+            "useCustomExportFormat": true,
+            "customTemplate": "{if $isFirstBatch}<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n<records>\n{/if}{foreach $rowData as $row}  <record>{foreach from=$colData item=col name=c}    <{$col}>{$row[$smarty.foreach.c.index]}</{$col}>{/foreach}  </record>{/foreach}{if $isLastBatch}</records>{/if}"
+        }
+    }
+}
+```
+
+
+### API help
+
+For more information about the API, check out:
+[http://benkeen.github.io/generatedata/api.html](http://benkeen.github.io/generatedata/api.html)
diff --git a/packages/plugins/src/exportTypes/XML/XML.generate.ts b/packages/plugins/src/exportTypes/XML/XML.generate.ts
new file mode 100644
index 000000000..3cb1cac87
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/XML.generate.ts
@@ -0,0 +1,30 @@
+import { ETMessageData } from '../../';
+import { XMLSettings } from './XML.state';
+
+export const generate = (data: ETMessageData): string => {
+  const { isFirstBatch, isLastBatch, rows, columns, stripWhitespace } = data;
+  const { rootNodeName, recordNodeName } = data.settings as XMLSettings;
+
+  const newline = stripWhitespace ? '' : '\n';
+  const tab = stripWhitespace ? '' : '\t';
+
+  let content = '';
+  if (isFirstBatch) {
+    content += `<?xml version="1.0" encoding="UTF-8" ?>${newline}`;
+    content += `<${rootNodeName}>${newline}`;
+  }
+
+  rows.forEach((row: any) => {
+    content += `${tab}<${recordNodeName}>${newline}`;
+    columns.forEach(({ title }: any, colIndex: number) => {
+      content += `${tab}${tab}<${title}>${row[colIndex]}</${title}>${newline}`;
+    });
+    content += `${tab}</${recordNodeName}>${newline}`;
+  });
+
+  if (isLastBatch) {
+    content += `</${rootNodeName}>`;
+  }
+
+  return content;
+};
diff --git a/packages/plugins/src/exportTypes/XML/XML.scss b/packages/plugins/src/exportTypes/XML/XML.scss
new file mode 100644
index 000000000..915958302
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/XML.scss
@@ -0,0 +1,13 @@
+.row {
+	display: flex;
+	align-items: center;
+	margin-bottom: 4px;
+
+	label {
+		flex: 0 0 150px;
+		color: #666666;
+	}
+	input {
+		flex: 1;
+	}
+}
diff --git a/packages/plugins/src/exportTypes/XML/XML.scss.d.ts b/packages/plugins/src/exportTypes/XML/XML.scss.d.ts
new file mode 100644
index 000000000..c307f9140
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/XML.scss.d.ts
@@ -0,0 +1,12 @@
+declare namespace XmlScssNamespace {
+  export interface IXmlScss {
+    row: string;
+  }
+}
+
+declare const XmlScssModule: XmlScssNamespace.IXmlScss & {
+  /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
+  locals: XmlScssNamespace.IXmlScss;
+};
+
+export = XmlScssModule;
diff --git a/packages/plugins/src/exportTypes/XML/XML.state.tsx b/packages/plugins/src/exportTypes/XML/XML.state.tsx
new file mode 100644
index 000000000..bff15c88e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/XML.state.tsx
@@ -0,0 +1,22 @@
+import { ETState } from '@generatedata/types';
+
+export type GenerationOptionsType = {
+  rootNodeName: string;
+  recordNodeName: string;
+  useCustomExportFormat?: boolean;
+  customFormat?: string;
+};
+
+export const defaultGenerationOptions: GenerationOptionsType = {
+  rootNodeName: 'records',
+  recordNodeName: 'record',
+  useCustomExportFormat: false,
+  customFormat: ''
+};
+
+export interface XMLSettings extends ETState, GenerationOptionsType {}
+
+export const initialState: XMLSettings = {
+  ...defaultGenerationOptions,
+  isValid: true
+};
diff --git a/packages/plugins/src/exportTypes/XML/XML.tsx b/packages/plugins/src/exportTypes/XML/XML.tsx
new file mode 100644
index 000000000..e61af8dcd
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/XML.tsx
@@ -0,0 +1,71 @@
+import * as React from 'react';
+import styles from './XML.scss';
+import { ETDownloadPacket, ETDownloadPacketResponse, ETSettings, ETValidateTitleField } from '@generatedata/types';
+import TextField from '~components/TextField';
+
+export const Settings = ({ data, i18n, coreI18n, id, onUpdate }: ETSettings) => {
+  const onChange = (prop: string, value: any): void => {
+    onUpdate({
+      ...data,
+      [prop]: value
+    });
+  };
+
+  let rootNodeNameError = '';
+  if (data.rootNodeName.trim() === '') {
+    rootNodeNameError = coreI18n.requiredField;
+  } else if (!isValidNodeName(data.rootNodeName)) {
+    rootNodeNameError = i18n.invalidNodeName;
+  }
+
+  let recordNodeNameError = '';
+  if (data.recordNodeName.trim() === '') {
+    recordNodeNameError = coreI18n.requiredField;
+  } else if (!isValidNodeName(data.recordNodeName)) {
+    recordNodeNameError = i18n.invalidNodeName;
+  }
+
+  return (
+    <>
+      <div className={styles.row}>
+        <label htmlFor={`${id}-rootNodeName`}>{i18n.rootNodeName}</label>
+        <TextField
+          error={rootNodeNameError}
+          id={`${id}-rootNodeName`}
+          value={data.rootNodeName}
+          onChange={(e: any): void => onChange('rootNodeName', e.target.value)}
+        />
+      </div>
+      <div className={styles.row}>
+        <label htmlFor={`${id}-recordNodeName`}>{i18n.recordNodeName}</label>
+        <TextField
+          error={recordNodeNameError}
+          id={`${id}-recordNodeName`}
+          value={data.recordNodeName}
+          onChange={(e: any): void => onChange('recordNodeName', e.target.value)}
+        />
+      </div>
+    </>
+  );
+};
+
+export const getCodeMirrorMode = (): string => 'text/html';
+
+export const getDownloadFileInfo = ({ packetId }: ETDownloadPacket): ETDownloadPacketResponse => ({
+  filename: `data-${packetId}.xml`,
+  fileType: 'text/xml'
+});
+
+export const isValidNodeName = (str: string): boolean => {
+  const valid = new RegExp(
+    '^(:|[A-Z]|_|[a-z]|[\xC0-\xD6]|[\xD8-\xF6]|[\xF8-\u02FF]|[\u0370-\u037D]|[\u037F-\u1FFF]|[\u200C-\u200D]|[\u2070-\u218F]|[\u2C00-\u2FEF]|[\u3001-\uD7FF]|[\uF900-\uFDCF]|[\uFDF0-\uFFFD])(:|[A-Z]|_|[a-z]|[\xC0-\xD6]|[\xD8-\xF6]|[\xF8-\u02FF]|[\u0370-\u037D]|[\u037F-\u1FFF]|[\u200C-\u200D]|[\u2070-\u218F]|[\u2C00-\u2FEF]|[\u3001-\uD7FF]|[\uF900-\uFDCF]|[\uFDF0-\uFFFD]|-|\\\\.|[0-9]|\xB7|[\u0300-\u036F]|[\u203F-\u2040])*$'
+  );
+  return valid.test(str);
+};
+
+export const validateTitleField: ETValidateTitleField = (title, i18n) => {
+  if (!isValidNodeName(title)) {
+    return i18n.invalidNodeName;
+  }
+  return null;
+};
diff --git a/packages/plugins/src/exportTypes/XML/XML.worker.ts b/packages/plugins/src/exportTypes/XML/XML.worker.ts
new file mode 100644
index 000000000..6ce82597d
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/XML.worker.ts
@@ -0,0 +1,8 @@
+import { ETOnMessage } from '@generatedata/types';
+import { generate } from './XML.generate';
+
+const context: Worker = self as any;
+
+context.onmessage = (e: ETOnMessage) => {
+  context.postMessage(generate(e.data));
+};
diff --git a/packages/plugins/src/exportTypes/XML/bundle.ts b/packages/plugins/src/exportTypes/XML/bundle.ts
new file mode 100644
index 000000000..d79331243
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/bundle.ts
@@ -0,0 +1,13 @@
+import { ETBundle } from '@generatedata/types';
+import { Settings, getCodeMirrorMode, getDownloadFileInfo, validateTitleField } from './XML';
+import { initialState } from './XML.state';
+
+const bundle: ETBundle = {
+  Settings,
+  initialState,
+  getCodeMirrorMode,
+  getDownloadFileInfo,
+  validateTitleField
+};
+
+export default bundle;
diff --git a/packages/plugins/src/exportTypes/XML/config.ts b/packages/plugins/src/exportTypes/XML/config.ts
new file mode 100644
index 000000000..d93e779f1
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/config.ts
@@ -0,0 +1,8 @@
+import { ETDefinition } from '@generatedata/types';
+
+const definition: ETDefinition = {
+  fieldGroup: 'core',
+  codeMirrorModes: ['xml/xml']
+};
+
+export default definition;
diff --git a/packages/plugins/src/exportTypes/XML/i18n/ar.json b/packages/plugins/src/exportTypes/XML/i18n/ar.json
new file mode 100644
index 000000000..9f69b463e
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/ar.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "اسم العقدة",
+  "rowLabel": "اسم العقدة",
+  "rowLabelPlural": "أسماء العقدة",
+  "invalidNodeName": "الرجاء إدخال اسم صالح لعقدة XML.",
+  "rootNodeName": "اسم عقدة الجذر",
+  "recordNodeName": "تسجيل اسم العقدة"
+}
diff --git a/packages/plugins/src/exportTypes/XML/i18n/de.json b/packages/plugins/src/exportTypes/XML/i18n/de.json
new file mode 100644
index 000000000..64bc083c5
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/de.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "Knotenname",
+  "rowLabel": "Knotenname",
+  "rowLabelPlural": "Knotennamen",
+  "invalidNodeName": "Bitte geben Sie einen gültigen XML-Knotennamen ein.",
+  "rootNodeName": "Stammknotenname",
+  "recordNodeName": "Knotennamen aufzeichnen"
+}
diff --git a/packages/plugins/src/exportTypes/XML/i18n/en.json b/packages/plugins/src/exportTypes/XML/i18n/en.json
new file mode 100644
index 000000000..5636f339b
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/en.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "Node name",
+  "rowLabel": "Node Name",
+  "rowLabelPlural": "Node Names",
+  "invalidNodeName": "Please enter a valid XML node name.",
+  "rootNodeName": "Root node name",
+  "recordNodeName": "Record node name"
+}
diff --git a/packages/plugins/src/exportTypes/XML/i18n/es.json b/packages/plugins/src/exportTypes/XML/i18n/es.json
new file mode 100644
index 000000000..b8bf2c9c3
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/es.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "Nombre del nodo",
+  "rowLabel": "Nombre del nodo",
+  "rowLabelPlural": "Nombres de nodo",
+  "invalidNodeName": "Introduzca un nombre de nodo XML válido.",
+  "rootNodeName": "Nombre del nodo raíz",
+  "recordNodeName": "Registrar nombre de nodo"
+}
diff --git a/packages/plugins/src/exportTypes/XML/i18n/fr.json b/packages/plugins/src/exportTypes/XML/i18n/fr.json
new file mode 100644
index 000000000..81bce6ca6
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/fr.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "Nom du nœud",
+  "rowLabel": "Nom du nœud",
+  "rowLabelPlural": "Noms des nœuds",
+  "invalidNodeName": "Veuillez entrer un nom de nœud XML valide.",
+  "rootNodeName": "Nom du nœud racine",
+  "recordNodeName": "Enregistrer le nom du nœud"
+}
diff --git a/packages/plugins/src/exportTypes/XML/i18n/hi.json b/packages/plugins/src/exportTypes/XML/i18n/hi.json
new file mode 100644
index 000000000..ecc1c72a9
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/hi.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "नोड का नाम",
+  "rowLabel": "नोड का नाम",
+  "rowLabelPlural": "नोड नाम",
+  "invalidNodeName": "कृपया एक मान्य XML नोड नाम दर्ज करें।",
+  "rootNodeName": "रूट नोड नाम",
+  "recordNodeName": "रिकॉर्ड नोड नाम"
+}
diff --git a/packages/plugins/src/exportTypes/XML/i18n/ja.json b/packages/plugins/src/exportTypes/XML/i18n/ja.json
new file mode 100644
index 000000000..9ac7998a6
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/ja.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "ノード名",
+  "rowLabel": "ノード名",
+  "rowLabelPlural": "ノード名",
+  "invalidNodeName": "有効な XML ノード名を入力してください。",
+  "rootNodeName": "ルートノード名",
+  "recordNodeName": "レコードノード名"
+}
diff --git a/packages/plugins/src/exportTypes/XML/i18n/nl.json b/packages/plugins/src/exportTypes/XML/i18n/nl.json
new file mode 100644
index 000000000..cb75ff427
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/nl.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "Knooppuntnaam",
+  "rowLabel": "Knooppuntnaam",
+  "rowLabelPlural": "Node Namen",
+  "invalidNodeName": "Voer een geldige XML-knooppuntnaam in.",
+  "rootNodeName": "Naam van hoofdknooppunt",
+  "recordNodeName": "Knooppuntnaam opnemen"
+}
diff --git a/packages/plugins/src/exportTypes/XML/i18n/pt.json b/packages/plugins/src/exportTypes/XML/i18n/pt.json
new file mode 100644
index 000000000..7133dba2a
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/pt.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "Nome do nó",
+  "rowLabel": "Nome do nó",
+  "rowLabelPlural": "Nomes de Nó",
+  "invalidNodeName": "Insira um nome de nó XML válido.",
+  "rootNodeName": "Nome do nó raiz",
+  "recordNodeName": "Nome do nó de registro"
+}
diff --git a/packages/plugins/src/exportTypes/XML/i18n/ru.json b/packages/plugins/src/exportTypes/XML/i18n/ru.json
new file mode 100644
index 000000000..8af01fb8a
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/ru.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "Имя узла",
+  "rowLabel": "Имя узла",
+  "rowLabelPlural": "Имена узлов",
+  "invalidNodeName": "Введите допустимое имя узла XML.",
+  "rootNodeName": "Имя корневого узла",
+  "recordNodeName": "Записать имя узла"
+}
diff --git a/packages/plugins/src/exportTypes/XML/i18n/ta.json b/packages/plugins/src/exportTypes/XML/i18n/ta.json
new file mode 100644
index 000000000..8f71c5f76
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/ta.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "முனை பெயர்",
+  "rowLabel": "முனை பெயர்",
+  "rowLabelPlural": "முனை பெயர்கள்",
+  "invalidNodeName": "சரியான XML நோட் பெயரை உள்ளிடவும்.",
+  "rootNodeName": "ரூட் முனை பெயர்",
+  "recordNodeName": "பதிவு முனை பெயர்"
+}
diff --git a/packages/plugins/src/exportTypes/XML/i18n/zh.json b/packages/plugins/src/exportTypes/XML/i18n/zh.json
new file mode 100644
index 000000000..1f43dd934
--- /dev/null
+++ b/packages/plugins/src/exportTypes/XML/i18n/zh.json
@@ -0,0 +1,9 @@
+{
+  "EXPORT_TYPE_NAME": "XML",
+  "COL_TITLE": "节点名称",
+  "rowLabel": "节点名称",
+  "rowLabelPlural": "节点名称",
+  "invalidNodeName": "请输入有效的 XML 节点名称。",
+  "rootNodeName": "根节点名称",
+  "recordNodeName": "记录节点名称"
+}
diff --git a/packages/plugins/src/index.ts b/packages/plugins/src/index.ts
new file mode 100644
index 000000000..2f51fc90e
--- /dev/null
+++ b/packages/plugins/src/index.ts
@@ -0,0 +1,779 @@
+import Alphanumeric from './dataTypes/Alphanumeric/config';
+import AutoIncrement from './dataTypes/AutoIncrement/config';
+import BitcoinAddress from './dataTypes/BitcoinAddress/config';
+import Boolean from './dataTypes/Boolean/config';
+import CVV from './dataTypes/CVV/config';
+import City from './dataTypes/City/config';
+import Colour from './dataTypes/Colour/config';
+import Company from './dataTypes/Company/config';
+import Computed from './dataTypes/Computed/config';
+import Constant from './dataTypes/Constant/config';
+import Country from './dataTypes/Country/config';
+import Currency from './dataTypes/Currency/config';
+import Date from './dataTypes/Date/config';
+import Email from './dataTypes/Email/config';
+import GUID from './dataTypes/GUID/config';
+import IBAN from './dataTypes/IBAN/config';
+import LatLng from './dataTypes/LatLng/config';
+import List from './dataTypes/List/config';
+import Names from './dataTypes/Names/config';
+import NormalDistribution from './dataTypes/NormalDistribution/config';
+import NumberRange from './dataTypes/NumberRange/config';
+import OrganizationNumber from './dataTypes/OrganizationNumber/config';
+import PAN from './dataTypes/PAN/config';
+import PIN from './dataTypes/PIN/config';
+import PersonalNumber from './dataTypes/PersonalNumber/config';
+import Phone from './dataTypes/Phone/config';
+import PostalZip from './dataTypes/PostalZip/config';
+import Region from './dataTypes/Region/config';
+import Rut from './dataTypes/Rut/config';
+import SIRET from './dataTypes/SIRET/config';
+import StreetAddress from './dataTypes/StreetAddress/config';
+import TextFixed from './dataTypes/TextFixed/config';
+import TextRandom from './dataTypes/TextRandom/config';
+import Time from './dataTypes/Time/config';
+import Track1 from './dataTypes/Track1/config';
+import Track2 from './dataTypes/Track2/config';
+import URLs from './dataTypes/URLs/config';
+import WeightedList from './dataTypes/WeightedList/config';
+import { CountryDataType, CountryNames, DatabaseTypes } from '@generatedata/types';
+import { getStrings } from '@generatedata/utils/lang';
+
+export type ETMessageData = {
+  action: 'generate' | 'pause' | 'continue' | 'abort';
+  columns: ColumnData[];
+  rows: any[];
+  isFirstBatch: boolean;
+  isLastBatch: boolean;
+  currentBatch: number;
+  batchSize: number;
+  settings: any; // TODO generic possible? This is the export type settings
+  stripWhitespace: boolean;
+  rowState: any;
+  workerUtilsUrl: string;
+  exportTypes: ExportTypeMap;
+  dataTypes: DataTypeMap;
+  countries: CountryMap;
+};
+
+export type ColumnData = {
+  title: string;
+  dataType: DataTypeFolder;
+  metadata: DTMetadata;
+};
+
+export type DTDefinition = {
+  fieldGroup: DTFieldGroup;
+  fieldGroupOrder: number;
+  dependencies?: DataTypeFolder[];
+};
+
+export type DTFieldGroup = 'numeric' | 'geo' | 'humanData' | 'other' | 'financial' | 'text' | 'countrySpecific';
+
+export type DTMetadataType = 'number' | 'string' | 'boolean' | 'date' | 'infer';
+
+export type GeneralMetadataTypes = {
+  dataType: DTMetadataType;
+};
+
+export type DTMetadata = {
+  general?: GeneralMetadataTypes;
+  sql?: DatabaseTypes;
+};
+
+export type ExportTypeMap = {
+  [exportType in ExportTypeFolder]?: string;
+};
+
+export type DataTypeMap = {
+  [dataType in DataTypeFolder]?: string;
+};
+
+export type CountryMap = {
+  [country in CountryType]?: string;
+};
+
+export type countryTuple = typeof countries;
+export type CountryType = countryTuple[number];
+export type CountryNamesMap = {
+  [country in CountryType]?: CountryNames;
+};
+
+export interface ETOnMessage extends MessageEvent {
+  data: ETMessageData;
+}
+
+export const dataTypes = {
+  Alphanumeric,
+  AutoIncrement,
+  BitcoinAddress,
+  Boolean,
+  CVV,
+  City,
+  Colour,
+  Company,
+  Computed,
+  Constant,
+  Country,
+  Currency,
+  Date,
+  Email,
+  GUID,
+  IBAN,
+  LatLng,
+  List,
+  Names,
+  NormalDistribution,
+  NumberRange,
+  OrganizationNumber,
+  PAN,
+  PIN,
+  PersonalNumber,
+  Phone,
+  PostalZip,
+  Region,
+  Rut,
+  SIRET,
+  StreetAddress,
+  TextFixed,
+  TextRandom,
+  Time,
+  Track1,
+  Track2,
+  URLs,
+  WeightedList
+};
+
+export type DataTypeFolder = keyof typeof dataTypes;
+
+export const blacklistedDataTypeFolders = ['BitcoinAddress', 'OrganizationNumber', 'PersonalNumber', 'SIRET'];
+
+import CSV from './exportTypes/CSV/config';
+import CSharp from './exportTypes/CSharp/config';
+import HTML from './exportTypes/HTML/config';
+import JSON from './exportTypes/JSON/config';
+import Javascript from './exportTypes/Javascript/config';
+import LDIF from './exportTypes/LDIF/config';
+import PHP from './exportTypes/PHP/config';
+import Perl from './exportTypes/Perl/config';
+import Python from './exportTypes/Python/config';
+import Ruby from './exportTypes/Ruby/config';
+import SQL from './exportTypes/SQL/config';
+import Typescript from './exportTypes/Typescript/config';
+import XML from './exportTypes/XML/config';
+
+export const exportTypes = {
+  CSV,
+  CSharp,
+  HTML,
+  JSON,
+  Javascript,
+  LDIF,
+  PHP,
+  Perl,
+  Python,
+  Ruby,
+  SQL,
+  Typescript,
+  XML
+};
+
+export type ExportTypeFolder = keyof typeof exportTypes;
+
+import CountryAustralia from './countries/Australia/bundle';
+import CountryAustria from './countries/Austria/bundle';
+import CountryBelgium from './countries/Belgium/bundle';
+import CountryBrazil from './countries/Brazil/bundle';
+import CountryCanada from './countries/Canada/bundle';
+import CountryChile from './countries/Chile/bundle';
+import CountryChina from './countries/China/bundle';
+import CountryColombia from './countries/Colombia/bundle';
+import CountryCostaRica from './countries/CostaRica/bundle';
+import CountryFrance from './countries/France/bundle';
+import CountryGermany from './countries/Germany/bundle';
+import CountryIndia from './countries/India/bundle';
+import CountryIndonesia from './countries/Indonesia/bundle';
+import CountryIreland from './countries/Ireland/bundle';
+import CountryItaly from './countries/Italy/bundle';
+import CountryMexico from './countries/Mexico/bundle';
+import CountryNetherlands from './countries/Netherlands/bundle';
+import CountryNewZealand from './countries/NewZealand/bundle';
+import CountryNigeria from './countries/Nigeria/bundle';
+import CountryNorway from './countries/Norway/bundle';
+import CountryPakistan from './countries/Pakistan/bundle';
+import CountryPeru from './countries/Peru/bundle';
+import CountryPhilippines from './countries/Philippines/bundle';
+import CountryPoland from './countries/Poland/bundle';
+import CountryRussia from './countries/Russia/bundle';
+import CountrySingapore from './countries/Singapore/bundle';
+import CountrySouthAfrica from './countries/SouthAfrica/bundle';
+import CountrySouthKorea from './countries/SouthKorea/bundle';
+import CountrySpain from './countries/Spain/bundle';
+import CountrySweden from './countries/Sweden/bundle';
+import CountryTurkey from './countries/Turkey/bundle';
+import CountryUK from './countries/UK/bundle';
+import CountryUS from './countries/US/bundle';
+import CountryUkraine from './countries/Ukraine/bundle';
+import CountryVietnam from './countries/Vietnam/bundle';
+
+export const countryList = [
+  'Australia',
+  'Austria',
+  'Belgium',
+  'Brazil',
+  'Canada',
+  'Chile',
+  'China',
+  'Colombia',
+  'CostaRica',
+  'France',
+  'Germany',
+  'India',
+  'Indonesia',
+  'Ireland',
+  'Italy',
+  'Mexico',
+  'Netherlands',
+  'NewZealand',
+  'Nigeria',
+  'Norway',
+  'Pakistan',
+  'Peru',
+  'Philippines',
+  'Poland',
+  'Russia',
+  'Singapore',
+  'SouthAfrica',
+  'SouthKorea',
+  'Spain',
+  'Sweden',
+  'Turkey',
+  'UK',
+  'US',
+  'Ukraine',
+  'Vietnam'
+];
+export const countries = [
+  'Australia',
+  'Austria',
+  'Belgium',
+  'Brazil',
+  'Canada',
+  'Chile',
+  'China',
+  'Colombia',
+  'CostaRica',
+  'France',
+  'Germany',
+  'India',
+  'Indonesia',
+  'Ireland',
+  'Italy',
+  'Mexico',
+  'Netherlands',
+  'NewZealand',
+  'Nigeria',
+  'Norway',
+  'Pakistan',
+  'Peru',
+  'Philippines',
+  'Poland',
+  'Russia',
+  'Singapore',
+  'SouthAfrica',
+  'SouthKorea',
+  'Spain',
+  'Sweden',
+  'Turkey',
+  'UK',
+  'US',
+  'Ukraine',
+  'Vietnam'
+] as const;
+export const countryMethods = {
+  Australia: CountryAustralia,
+  Austria: CountryAustria,
+  Belgium: CountryBelgium,
+  Brazil: CountryBrazil,
+  Canada: CountryCanada,
+  Chile: CountryChile,
+  China: CountryChina,
+  Colombia: CountryColombia,
+  CostaRica: CountryCostaRica,
+  France: CountryFrance,
+  Germany: CountryGermany,
+  India: CountryIndia,
+  Indonesia: CountryIndonesia,
+  Ireland: CountryIreland,
+  Italy: CountryItaly,
+  Mexico: CountryMexico,
+  Netherlands: CountryNetherlands,
+  NewZealand: CountryNewZealand,
+  Nigeria: CountryNigeria,
+  Norway: CountryNorway,
+  Pakistan: CountryPakistan,
+  Peru: CountryPeru,
+  Philippines: CountryPhilippines,
+  Poland: CountryPoland,
+  Russia: CountryRussia,
+  Singapore: CountrySingapore,
+  SouthAfrica: CountrySouthAfrica,
+  SouthKorea: CountrySouthKorea,
+  Spain: CountrySpain,
+  Sweden: CountrySweden,
+  Turkey: CountryTurkey,
+  UK: CountryUK,
+  US: CountryUS,
+  Ukraine: CountryUkraine,
+  Vietnam: CountryVietnam
+};
+
+export enum DataType {
+  Alphanumeric = 'Alphanumeric',
+  AutoIncrement = 'AutoIncrement',
+  Boolean = 'Boolean',
+  CVV = 'CVV',
+  City = 'City',
+  Colour = 'Colour',
+  Company = 'Company',
+  Computed = 'Computed',
+  Constant = 'Constant',
+  Country = 'Country',
+  Currency = 'Currency',
+  Date = 'Date',
+  Email = 'Email',
+  GUID = 'GUID',
+  IBAN = 'IBAN',
+  LatLng = 'LatLng',
+  List = 'List',
+  Names = 'Names',
+  NormalDistribution = 'NormalDistribution',
+  NumberRange = 'NumberRange',
+  PAN = 'PAN',
+  PIN = 'PIN',
+  Phone = 'Phone',
+  PostalZip = 'PostalZip',
+  Region = 'Region',
+  Rut = 'Rut',
+  StreetAddress = 'StreetAddress',
+  TextFixed = 'TextFixed',
+  TextRandom = 'TextRandom',
+  Time = 'Time',
+  Track1 = 'Track1',
+  Track2 = 'Track2',
+  URLs = 'URLs',
+  WeightedList = 'WeightedList'
+}
+
+import { GenerationOptionsType as AlphanumericGenerationOptions } from './dataTypes/Alphanumeric/Alphanumeric.state';
+import { GenerationOptionsType as AutoIncrementGenerationOptions } from './dataTypes/AutoIncrement/AutoIncrement.state';
+import { GenerationOptionsType as BooleanGenerationOptions } from './dataTypes/Boolean/Boolean.state';
+import { GenerationOptionsType as CVVGenerationOptions } from './dataTypes/CVV/CVV.state';
+import { GenerationOptionsType as CityGenerationOptions } from './dataTypes/City/City.state';
+import { GenerationOptionsType as ColourGenerationOptions } from './dataTypes/Colour/Colour.state';
+import { GenerationOptionsType as CompanyGenerationOptions } from './dataTypes/Company/Company.state';
+import { GenerationOptionsType as ComputedGenerationOptions } from './dataTypes/Computed/Computed.state';
+import { GenerationOptionsType as ConstantGenerationOptions } from './dataTypes/Constant/Constant.state';
+import { GenerationOptionsType as CountryGenerationOptions } from './dataTypes/Country/Country.state';
+import { GenerationOptionsType as CurrencyGenerationOptions } from './dataTypes/Currency/Currency.state';
+import { GenerationOptionsType as DateGenerationOptions } from './dataTypes/Date/Date.state';
+import { GenerationOptionsType as EmailGenerationOptions } from './dataTypes/Email/Email.state';
+import { GenerationOptionsType as GUIDGenerationOptions } from './dataTypes/GUID/GUID.state';
+import { GenerationOptionsType as IBANGenerationOptions } from './dataTypes/IBAN/IBAN.state';
+import { GenerationOptionsType as LatLngGenerationOptions } from './dataTypes/LatLng/LatLng.state';
+import { GenerationOptionsType as ListGenerationOptions } from './dataTypes/List/List.state';
+import { GenerationOptionsType as NamesGenerationOptions } from './dataTypes/Names/Names.state';
+import { GenerationOptionsType as NormalDistributionGenerationOptions } from './dataTypes/NormalDistribution/NormalDistribution.state';
+import { GenerationOptionsType as NumberRangeGenerationOptions } from './dataTypes/NumberRange/NumberRange.state';
+import { GenerationOptionsType as PANGenerationOptions } from './dataTypes/PAN/PAN.state';
+import { GenerationOptionsType as PINGenerationOptions } from './dataTypes/PIN/PIN.state';
+import { GenerationOptionsType as PhoneGenerationOptions } from './dataTypes/Phone/Phone.state';
+import { GenerationOptionsType as PostalZipGenerationOptions } from './dataTypes/PostalZip/PostalZip.state';
+import { GenerationOptionsType as RegionGenerationOptions } from './dataTypes/Region/Region.state';
+import { GenerationOptionsType as RutGenerationOptions } from './dataTypes/Rut/Rut.state';
+import { GenerationOptionsType as StreetAddressGenerationOptions } from './dataTypes/StreetAddress/StreetAddress.state';
+import { GenerationOptionsType as TextFixedGenerationOptions } from './dataTypes/TextFixed/TextFixed.state';
+import { GenerationOptionsType as TextRandomGenerationOptions } from './dataTypes/TextRandom/TextRandom.state';
+import { GenerationOptionsType as TimeGenerationOptions } from './dataTypes/Time/Time.state';
+import { GenerationOptionsType as Track1GenerationOptions } from './dataTypes/Track1/Track1.state';
+import { GenerationOptionsType as Track2GenerationOptions } from './dataTypes/Track2/Track2.state';
+import { GenerationOptionsType as URLsGenerationOptions } from './dataTypes/URLs/URLs.state';
+import { GenerationOptionsType as WeightedListGenerationOptions } from './dataTypes/WeightedList/WeightedList.state';
+interface AlphanumericDataTypeRow {
+  plugin: DataType.Alphanumeric | 'Alphanumeric';
+  title: string;
+  settings: AlphanumericGenerationOptions;
+  id?: string;
+}
+interface AutoIncrementDataTypeRow {
+  plugin: DataType.AutoIncrement | 'AutoIncrement';
+  title: string;
+  settings: AutoIncrementGenerationOptions;
+  id?: string;
+}
+interface BooleanDataTypeRow {
+  plugin: DataType.Boolean | 'Boolean';
+  title: string;
+  settings: BooleanGenerationOptions;
+  id?: string;
+}
+interface CVVDataTypeRow {
+  plugin: DataType.CVV | 'CVV';
+  title: string;
+  settings: CVVGenerationOptions;
+  id?: string;
+}
+interface CityDataTypeRow {
+  plugin: DataType.City | 'City';
+  title: string;
+  settings: CityGenerationOptions;
+  id?: string;
+}
+interface ColourDataTypeRow {
+  plugin: DataType.Colour | 'Colour';
+  title: string;
+  settings: ColourGenerationOptions;
+  id?: string;
+}
+interface CompanyDataTypeRow {
+  plugin: DataType.Company | 'Company';
+  title: string;
+  settings: CompanyGenerationOptions;
+  id?: string;
+}
+interface ComputedDataTypeRow {
+  plugin: DataType.Computed | 'Computed';
+  title: string;
+  settings: ComputedGenerationOptions;
+  id?: string;
+}
+interface ConstantDataTypeRow {
+  plugin: DataType.Constant | 'Constant';
+  title: string;
+  settings: ConstantGenerationOptions;
+  id?: string;
+}
+interface CountryDataTypeRow {
+  plugin: DataType.Country | 'Country';
+  title: string;
+  settings: CountryGenerationOptions;
+  id?: string;
+}
+interface CurrencyDataTypeRow {
+  plugin: DataType.Currency | 'Currency';
+  title: string;
+  settings: CurrencyGenerationOptions;
+  id?: string;
+}
+interface DateDataTypeRow {
+  plugin: DataType.Date | 'Date';
+  title: string;
+  settings: DateGenerationOptions;
+  id?: string;
+}
+interface EmailDataTypeRow {
+  plugin: DataType.Email | 'Email';
+  title: string;
+  settings: EmailGenerationOptions;
+  id?: string;
+}
+interface GUIDDataTypeRow {
+  plugin: DataType.GUID | 'GUID';
+  title: string;
+  settings: GUIDGenerationOptions;
+  id?: string;
+}
+interface IBANDataTypeRow {
+  plugin: DataType.IBAN | 'IBAN';
+  title: string;
+  settings: IBANGenerationOptions;
+  id?: string;
+}
+interface LatLngDataTypeRow {
+  plugin: DataType.LatLng | 'LatLng';
+  title: string;
+  settings: LatLngGenerationOptions;
+  id?: string;
+}
+interface ListDataTypeRow {
+  plugin: DataType.List | 'List';
+  title: string;
+  settings: ListGenerationOptions;
+  id?: string;
+}
+interface NamesDataTypeRow {
+  plugin: DataType.Names | 'Names';
+  title: string;
+  settings: NamesGenerationOptions;
+  id?: string;
+}
+interface NormalDistributionDataTypeRow {
+  plugin: DataType.NormalDistribution | 'NormalDistribution';
+  title: string;
+  settings: NormalDistributionGenerationOptions;
+  id?: string;
+}
+interface NumberRangeDataTypeRow {
+  plugin: DataType.NumberRange | 'NumberRange';
+  title: string;
+  settings: NumberRangeGenerationOptions;
+  id?: string;
+}
+interface PANDataTypeRow {
+  plugin: DataType.PAN | 'PAN';
+  title: string;
+  settings: PANGenerationOptions;
+  id?: string;
+}
+interface PINDataTypeRow {
+  plugin: DataType.PIN | 'PIN';
+  title: string;
+  settings: PINGenerationOptions;
+  id?: string;
+}
+interface PhoneDataTypeRow {
+  plugin: DataType.Phone | 'Phone';
+  title: string;
+  settings: PhoneGenerationOptions;
+  id?: string;
+}
+interface PostalZipDataTypeRow {
+  plugin: DataType.PostalZip | 'PostalZip';
+  title: string;
+  settings: PostalZipGenerationOptions;
+  id?: string;
+}
+interface RegionDataTypeRow {
+  plugin: DataType.Region | 'Region';
+  title: string;
+  settings: RegionGenerationOptions;
+  id?: string;
+}
+interface RutDataTypeRow {
+  plugin: DataType.Rut | 'Rut';
+  title: string;
+  settings: RutGenerationOptions;
+  id?: string;
+}
+interface StreetAddressDataTypeRow {
+  plugin: DataType.StreetAddress | 'StreetAddress';
+  title: string;
+  settings: StreetAddressGenerationOptions;
+  id?: string;
+}
+interface TextFixedDataTypeRow {
+  plugin: DataType.TextFixed | 'TextFixed';
+  title: string;
+  settings: TextFixedGenerationOptions;
+  id?: string;
+}
+interface TextRandomDataTypeRow {
+  plugin: DataType.TextRandom | 'TextRandom';
+  title: string;
+  settings: TextRandomGenerationOptions;
+  id?: string;
+}
+interface TimeDataTypeRow {
+  plugin: DataType.Time | 'Time';
+  title: string;
+  settings: TimeGenerationOptions;
+  id?: string;
+}
+interface Track1DataTypeRow {
+  plugin: DataType.Track1 | 'Track1';
+  title: string;
+  settings: Track1GenerationOptions;
+  id?: string;
+}
+interface Track2DataTypeRow {
+  plugin: DataType.Track2 | 'Track2';
+  title: string;
+  settings: Track2GenerationOptions;
+  id?: string;
+}
+interface URLsDataTypeRow {
+  plugin: DataType.URLs | 'URLs';
+  title: string;
+  settings: URLsGenerationOptions;
+  id?: string;
+}
+interface WeightedListDataTypeRow {
+  plugin: DataType.WeightedList | 'WeightedList';
+  title: string;
+  settings: WeightedListGenerationOptions;
+  id?: string;
+}
+
+export type DataTemplateRow =
+  | AlphanumericDataTypeRow
+  | AutoIncrementDataTypeRow
+  | BooleanDataTypeRow
+  | CVVDataTypeRow
+  | CityDataTypeRow
+  | ColourDataTypeRow
+  | CompanyDataTypeRow
+  | ComputedDataTypeRow
+  | ConstantDataTypeRow
+  | CountryDataTypeRow
+  | CurrencyDataTypeRow
+  | DateDataTypeRow
+  | EmailDataTypeRow
+  | GUIDDataTypeRow
+  | IBANDataTypeRow
+  | LatLngDataTypeRow
+  | ListDataTypeRow
+  | NamesDataTypeRow
+  | NormalDistributionDataTypeRow
+  | NumberRangeDataTypeRow
+  | PANDataTypeRow
+  | PINDataTypeRow
+  | PhoneDataTypeRow
+  | PostalZipDataTypeRow
+  | RegionDataTypeRow
+  | RutDataTypeRow
+  | StreetAddressDataTypeRow
+  | TextFixedDataTypeRow
+  | TextRandomDataTypeRow
+  | TimeDataTypeRow
+  | Track1DataTypeRow
+  | Track2DataTypeRow
+  | URLsDataTypeRow
+  | WeightedListDataTypeRow;
+
+import { GenerationOptionsType as CSVGenerationOptions } from './exportTypes/CSV/CSV.state';
+import { GenerationOptionsType as CSharpGenerationOptions } from './exportTypes/CSharp/CSharp.state';
+import { GenerationOptionsType as HTMLGenerationOptions } from './exportTypes/HTML/HTML.state';
+import { GenerationOptionsType as JSONGenerationOptions } from './exportTypes/JSON/JSON.state';
+import { GenerationOptionsType as JavascriptGenerationOptions } from './exportTypes/Javascript/Javascript.state';
+import { GenerationOptionsType as LDIFGenerationOptions } from './exportTypes/LDIF/LDIF.state';
+import { GenerationOptionsType as PHPGenerationOptions } from './exportTypes/PHP/PHP.state';
+import { GenerationOptionsType as PerlGenerationOptions } from './exportTypes/Perl/Perl.state';
+import { GenerationOptionsType as PythonGenerationOptions } from './exportTypes/Python/Python.state';
+import { GenerationOptionsType as RubyGenerationOptions } from './exportTypes/Ruby/Ruby.state';
+import { GenerationOptionsType as SQLGenerationOptions } from './exportTypes/SQL/SQL.state';
+import { GenerationOptionsType as TypescriptGenerationOptions } from './exportTypes/Typescript/Typescript.state';
+import { GenerationOptionsType as XMLGenerationOptions } from './exportTypes/XML/XML.state';
+interface CSVExportTypeConfig {
+  plugin: ExportType.CSV | 'CSV';
+  settings: CSVGenerationOptions;
+}
+interface CSharpExportTypeConfig {
+  plugin: ExportType.CSharp | 'CSharp';
+  settings: CSharpGenerationOptions;
+}
+interface HTMLExportTypeConfig {
+  plugin: ExportType.HTML | 'HTML';
+  settings: HTMLGenerationOptions;
+}
+interface JSONExportTypeConfig {
+  plugin: ExportType.JSON | 'JSON';
+  settings: JSONGenerationOptions;
+}
+interface JavascriptExportTypeConfig {
+  plugin: ExportType.Javascript | 'Javascript';
+  settings: JavascriptGenerationOptions;
+}
+interface LDIFExportTypeConfig {
+  plugin: ExportType.LDIF | 'LDIF';
+  settings: LDIFGenerationOptions;
+}
+interface PHPExportTypeConfig {
+  plugin: ExportType.PHP | 'PHP';
+  settings: PHPGenerationOptions;
+}
+interface PerlExportTypeConfig {
+  plugin: ExportType.Perl | 'Perl';
+  settings: PerlGenerationOptions;
+}
+interface PythonExportTypeConfig {
+  plugin: ExportType.Python | 'Python';
+  settings: PythonGenerationOptions;
+}
+interface RubyExportTypeConfig {
+  plugin: ExportType.Ruby | 'Ruby';
+  settings: RubyGenerationOptions;
+}
+interface SQLExportTypeConfig {
+  plugin: ExportType.SQL | 'SQL';
+  settings: SQLGenerationOptions;
+}
+interface TypescriptExportTypeConfig {
+  plugin: ExportType.Typescript | 'Typescript';
+  settings: TypescriptGenerationOptions;
+}
+interface XMLExportTypeConfig {
+  plugin: ExportType.XML | 'XML';
+  settings: XMLGenerationOptions;
+}
+
+export type ExportTypeConfig =
+  | CSVExportTypeConfig
+  | CSharpExportTypeConfig
+  | HTMLExportTypeConfig
+  | JSONExportTypeConfig
+  | JavascriptExportTypeConfig
+  | LDIFExportTypeConfig
+  | PHPExportTypeConfig
+  | PerlExportTypeConfig
+  | PythonExportTypeConfig
+  | RubyExportTypeConfig
+  | SQLExportTypeConfig
+  | TypescriptExportTypeConfig
+  | XMLExportTypeConfig;
+
+export enum ExportType {
+  CSV = 'CSV',
+  CSharp = 'CSharp',
+  HTML = 'HTML',
+  JSON = 'JSON',
+  Javascript = 'Javascript',
+  LDIF = 'LDIF',
+  PHP = 'PHP',
+  Perl = 'Perl',
+  Python = 'Python',
+  Ruby = 'Ruby',
+  SQL = 'SQL',
+  Typescript = 'Typescript',
+  XML = 'XML'
+}
+
+export const getCountryList = (): string[] => countryList;
+
+export const getCountryData = (): CountryDataType => {
+  const localeStrings = getStrings();
+
+  const data: any = {};
+  countryList.map((country: CountryType) => {
+    data[country] = countryMethods[country](localeStrings.countries[country]);
+  });
+
+  return data;
+};
+
+const countryRawData =
+  "AF|Afghanistan`AX|Åland Islands`AL|Albania`DZ|Algeria`AS|American Samoa`AD|Andorra`AO|Angola`AI|Anguilla`AQ|Antarctica`AG|Antigua and Barbuda`AR|Argentina`AM|Armenia`AW|Aruba`AU|Australia`AT|Austria`AZ|Azerbaijan`BS|Bahamas`BH|Bahrain`BD|Bangladesh`BB|Barbados`BY|Belarus`BE|Belgium`BZ|Belize`BJ|Benin`BM|Bermuda`BT|Bhutan`BO|Bolivia`BQ|Bonaire, Sint Eustatius and Saba`BA|Bosnia and Herzegovina`BW|Botswana`BV|Bouvet Island`BR|Brazil`IO|British Indian Ocean Territory`BN|Brunei Darussalam`BG|Bulgaria`BF|Burkina Faso`BI|Burundi`KH|Cambodia`CM|Cameroon`CA|Canada`CV|Cape Verde`KY|Cayman Islands`CF|Central African Republic`TD|Chad`CL|Chile`CN|China`CX|Christmas Island`CC|Cocos (Keeling) Islands`CO|Colombia`KM|Comoros`CG|Congo, Republic of the (Brazzaville)`CD|Congo, the Democratic Republic of the (Kinshasa)`CK|Cook Islands`CR|Costa Rica`CI|Côte d'Ivoire, Republic of`HR|Croatia`CU|Cuba`CW|Curaçao`CY|Cyprus`CZ|Czech Republic`DK|Denmark`DJ|Djibouti`DM|Dominica`DO|Dominican Republic`EC|Ecuador`EG|Egypt`SV|El Salvador`GQ|Equatorial Guinea`ER|Eritrea`EE|Estonia`ET|Ethiopia`FK|Falkland Islands (Islas Malvinas)`FO|Faroe Islands`FJ|Fiji`FI|Finland`FR|France`GF|French Guiana`PF|French Polynesia`TF|French Southern and Antarctic Lands`GA|Gabon`GM|Gambia, The`GE|Georgia`DE|Germany`GH|Ghana`GI|Gibraltar`GR|Greece`GL|Greenland`GD|Grenada`GP|Guadeloupe`GU|Guam`GT|Guatemala`GG|Guernsey`GN|Guinea`GW|Guinea-Bissau`GY|Guyana`HT|Haiti`HM|Heard Island and McDonald Islands`VA|Holy See (Vatican City)`HN|Honduras`HK|Hong Kong`HU|Hungary`IS|Iceland`IN|India`ID|Indonesia`IR|Iran, Islamic Republic of`IQ|Iraq`IE|Ireland`IM|Isle of Man`IL|Israel`IT|Italy`JM|Jamaica`JP|Japan`JE|Jersey`JO|Jordan`KZ|Kazakhstan`KE|Kenya`KI|Kiribati`KP|Korea, Democratic People's Republic of`KR|Korea, Republic of`KS|Kosovo`KW|Kuwait`KG|Kyrgyzstan`LA|Laos`LV|Latvia`LB|Lebanon`LS|Lesotho`LR|Liberia`LY|Libya`LI|Liechtenstein`LT|Lithuania`LU|Luxembourg`MO|Macao`MK|Macedonia, Republic of`MG|Madagascar`MW|Malawi`MY|Malaysia`MV|Maldives`ML|Mali`MT|Malta`MH|Marshall Islands`MQ|Martinique`MR|Mauritania`MU|Mauritius`YT|Mayotte`MX|Mexico`FM|Micronesia, Federated States of`MD|Moldova`MC|Monaco`MN|Mongolia`ME|Montenegro`MS|Montserrat`MA|Morocco`MZ|Mozambique`MM|Myanmar`NA|Namibia`NR|Nauru`NP|Nepal`NL|Netherlands`NC|New Caledonia`NZ|New Zealand`NI|Nicaragua`NE|Niger`NG|Nigeria`NU|Niue`NF|Norfolk Island`MP|Northern Mariana Islands`NO|Norway`OM|Oman`PK|Pakistan`PW|Palau`PS|Palestine, State of`PA|Panama`PG|Papua New Guinea`PY|Paraguay`PE|Peru`PH|Philippines`PN|Pitcairn`PL|Poland`PT|Portugal`PR|Puerto Rico`QA|Qatar`RE|Réunion`RO|Romania`RU|Russian Federation`RW|Rwanda`BL|Saint Barthélemy`SH|Saint Helena, Ascension and Tristan da Cunha`KN|Saint Kitts and Nevis`LC|Saint Lucia`MF|Saint Martin`PM|Saint Pierre and Miquelon`VC|Saint Vincent and the Grenadines`WS|Samoa`SM|San Marino`ST|Sao Tome and Principe`SA|Saudi Arabia`SN|Senegal`RS|Serbia`SC|Seychelles`SL|Sierra Leone`SG|Singapore`SX|Sint Maarten (Dutch part)`SK|Slovakia`SI|Slovenia`SB|Solomon Islands`SO|Somalia`ZA|South Africa`GS|South Georgia and South Sandwich Islands`SS|South Sudan`ES|Spain`LK|Sri Lanka`SD|Sudan`SR|Suriname`SZ|Swaziland`SE|Sweden`CH|Switzerland`SY|Syrian Arab Republic`TW|Taiwan`TJ|Tajikistan`TZ|Tanzania, United Republic of`TH|Thailand`TL|Timor-Leste`TG|Togo`TK|Tokelau`TO|Tonga`TT|Trinidad and Tobago`TN|Tunisia`TR|Turkey`TM|Turkmenistan`TC|Turks and Caicos Islands`TV|Tuvalu`UG|Uganda`UA|Ukraine`AE|United Arab Emirates`GB|United Kingdom`US|United States`UM|United States Minor Outlying Islands`UY|Uruguay`UZ|Uzbekistan`VU|Vanuatu`VE|Venezuela, Bolivarian Republic of`VN|Vietnam`VG|Virgin Islands, British`VI|Virgin Islands, U.S.`WF|Wallis and Futuna`EH|Western Sahara`YE|Yemen`ZM|Zambia`ZW|Zimbabwe";
+const regionRawData =
+  'AB|Alberta`BC|British Columbia`MB|Manitoba`NB|New Brunswick`NL|Newfoundland and Labrador`NT|Northwest Territories`NS|Nova Scotia`NU|Nunavut`ON|Ontario`PE|Prince Edward Island`QC|Quebec`SK|Saskatchewan`YT|Yukon';
+
+const convert = (data: string): any[] => {
+  const pairs = data.split('`');
+
+  return pairs.map((pair) => {
+    const [value, label] = pair.split('|');
+    return { value, label };
+  });
+};
+
+export const countryDropdownOptions = convert(countryRawData);
+export const canadianProvinceOptions = convert(regionRawData);
+
+// export const getCountryNameMap = (): CountryMap => {
+//   const localeStrings = getStrings();
+
+//   const data: CountryMap = {};
+//   countryList.map((country: CountryType) => {
+//     data[country] = localeStrings.countries[country];
+//   });
+
+//   return data;
+// };
diff --git a/packages/plugins/src/names.ts b/packages/plugins/src/names.ts
new file mode 100644
index 000000000..c5cd45661
--- /dev/null
+++ b/packages/plugins/src/names.ts
@@ -0,0 +1,38 @@
+import Australia from './countries/Australia/names';
+import Austria from './countries/Austria/names';
+import Belgium from './countries/Belgium/names';
+import Brazil from './countries/Brazil/names';
+import Canada from './countries/Canada/names';
+import Chile from './countries/Chile/names';
+import China from './countries/China/names';
+import Germany from './countries/Germany/names';
+import India from './countries/India/names';
+import Netherlands from './countries/Netherlands/names';
+import Nigeria from './countries/Nigeria/names';
+import Singapore from './countries/Singapore/names';
+import Spain from './countries/Spain/names';
+import Turkey from './countries/Turkey/names';
+import US from './countries/US/names';
+import Vietnam from './countries/Vietnam/names';
+
+const nameFiles = {
+  Australia,
+  Austria,
+  Belgium,
+  Brazil,
+  Canada,
+  Chile,
+  China,
+  Germany,
+  India,
+  Netherlands,
+  Nigeria,
+  Singapore,
+  Spain,
+  Turkey,
+  US,
+  Vietnam
+};
+export default nameFiles;
+
+export type CountryNameFiles = keyof typeof nameFiles;
diff --git a/packages/plugins/tsconfig.json b/packages/plugins/tsconfig.json
new file mode 100644
index 000000000..088e0876e
--- /dev/null
+++ b/packages/plugins/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./dist",
+    "target": "esnext",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "declaration": true,
+    "skipLibCheck": true,
+    "jsx": "react-jsx"
+  },
+  "include": ["src/*.ts", "./typings"],
+  "exclude": ["node_modules"]
+}
diff --git a/packages/types/countries.d.ts b/packages/types/countries.d.ts
new file mode 100644
index 000000000..6bc4f1634
--- /dev/null
+++ b/packages/types/countries.d.ts
@@ -0,0 +1,41 @@
+export interface GetCountryData {
+  (i18n: any): CountryDataType;
+}
+
+// TODO move to plugins package
+export type CountryDataType = {
+  countrySlug: string;
+  countryName: string;
+  regionNames: string;
+  continent: Continent;
+  regions: Region[];
+  extendedData: ExtendedData;
+};
+
+export type CountryNames = {
+  femaleNames: string[];
+  maleNames: string[];
+  lastNames: string[];
+};
+
+export type Continent = 'africa' | 'asia' | 'central_america' | 'europe' | 'oceania' | 'south_america' | 'north_america';
+
+export type ExtendedData = {
+  zipFormat: {
+    format: string;
+    replacements?: any;
+  };
+  phoneFormat?: {
+    areaCodes?: number[] | string[];
+    displayFormats?: string[];
+  };
+};
+
+export type Region = {
+  regionName: string;
+  regionShort: string;
+  regionSlug: string;
+  weight: number;
+  cities: string[];
+  extendedData?: ExtendedData;
+};
diff --git a/packages/types/dataSets.d.ts b/packages/types/dataSets.d.ts
new file mode 100644
index 000000000..4cdf52fad
--- /dev/null
+++ b/packages/types/dataSets.d.ts
@@ -0,0 +1,11 @@
+export type DataSetListItem = {
+  historyId: number;
+  dataSetId: number;
+  dataSetName: string;
+  status: 'private' | 'public';
+  accountId: number;
+  content: string;
+  numRowsGenerated: number;
+  dateCreatedUnix: string;
+  historyDateCreatedUnix: string;
+};
diff --git a/packages/types/generator.d.ts b/packages/types/generator.d.ts
new file mode 100644
index 000000000..df45f5272
--- /dev/null
+++ b/packages/types/generator.d.ts
@@ -0,0 +1,18 @@
+export const enum GeneratorLayout {
+  horizontal = 'horizontal',
+  vertical = 'vertical'
+}
+
+// this is for Data Types to describe how their field should be described for the SQL DB table creation statement
+export type DatabaseTypes = {
+  // e.g. "varchar(50)". This is the default value used for all DB types if they're not defined in one of the custom
+  // properties below
+  field?: string;
+
+  // database type-specific field descriptions
+  field_Oracle?: string;
+  field_MySQL?: string;
+  field_MSSQL?: string;
+  field_Postgres?: string;
+  field_SQLite?: string;
+};
diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts
new file mode 100644
index 000000000..f2389aa74
--- /dev/null
+++ b/packages/types/index.d.ts
@@ -0,0 +1,7 @@
+export * from './countries';
+export * from './dataSets';
+export * from './dataTypes';
+export * from '../../apps/client/types/exportTypes';
+export * from './generator';
+
+export { GDLocale, GDLocaleMap } from '@generatedata/config';
diff --git a/packages/types/locales.d.ts b/packages/types/locales.d.ts
new file mode 100644
index 000000000..585bf186b
--- /dev/null
+++ b/packages/types/locales.d.ts
@@ -0,0 +1,2 @@
+// TODO
+type GDLocale = [];
diff --git a/packages/types/node_modules/@generatedata/config b/packages/types/node_modules/@generatedata/config
new file mode 120000
index 000000000..101d54382
--- /dev/null
+++ b/packages/types/node_modules/@generatedata/config
@@ -0,0 +1 @@
+../../../config
\ No newline at end of file
diff --git a/packages/types/package.json b/packages/types/package.json
new file mode 100644
index 000000000..39588b175
--- /dev/null
+++ b/packages/types/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@generatedata/types",
+  "description": "Shared types for the suite of @generatedata packages",
+  "version": "1.0.0",
+  "module": "./index.d.ts",
+  "devDependencies": {
+    "@generatedata/config": "workspace:*"
+  }
+}
diff --git a/packages/utils/.gitignore b/packages/utils/.gitignore
new file mode 100644
index 000000000..4f12aa03a
--- /dev/null
+++ b/packages/utils/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist/*
\ No newline at end of file
diff --git a/packages/utils/README.md b/packages/utils/README.md
new file mode 100644
index 000000000..ae79821f2
--- /dev/null
+++ b/packages/utils/README.md
@@ -0,0 +1,3 @@
+## @generatedata/utils
+
+General utility methods for use across the front and backend packages.
diff --git a/packages/utils/package.json b/packages/utils/package.json
new file mode 100644
index 000000000..e9a816e2a
--- /dev/null
+++ b/packages/utils/package.json
@@ -0,0 +1,72 @@
+{
+  "name": "@generatedata/utils",
+  "description": "Utility methods and code",
+  "scripts": {
+    "clean": "",
+    "build": "tsc"
+  },
+  "dependencies": {
+    "@mui/material": "^7.3.1",
+    "@mui/lab": "^7.0.0-beta.16",
+    "bcrypt": "^5.0.0",
+    "date-fns": "^2.17.0",
+    "nanoid": "^3.3.4"
+  },
+  "devDependencies": {
+    "@date-io/date-fns": "^1.3.13",
+    "@generatedata/config": "workspace:*",
+    "@generatedata/types": "workspace:*",
+    "@testing-library/react": "^10.4.7",
+    "@types/jest": "^29",
+    "@types/sinon": "^7.5.1",
+    "jest": "^29.4.3",
+    "sinon": "^8.0.4",
+    "typescript": "^5.7.3"
+  },
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./array": {
+      "default": "./dist/array.js",
+      "types": "./dist/array.d.ts"
+    },
+    "./auth": {
+      "default": "./dist/auth.js",
+      "types": "./dist/auth.d.ts"
+    },
+    "./country": {
+      "default": "./dist/country.js",
+      "types": "./dist/country.d.ts"
+    },
+    "./date": {
+      "default": "./dist/date.js",
+      "types": "./dist/date.d.ts"
+    },
+    "./extension": {
+      "default": "./dist/extension.js",
+      "types": "./dist/extension.d.ts"
+    },
+    "./general": {
+      "default": "./dist/general.js",
+      "types": "./dist/general.d.ts"
+    },
+    "./lang": {
+      "default": "./dist/lang.js",
+      "types": "./dist/lang.d.ts"
+    },
+    "./random": {
+      "default": "./dist/random.js",
+      "types": "./dist/random.d.ts"
+    },
+    "./number": {
+      "default": "./dist/number.js",
+      "types": "./dist/number.d.ts"
+    },
+    "./string": {
+      "default": "./dist/string.js",
+      "types": "./dist/string.d.ts"
+    }
+  }
+}
diff --git a/packages/utils/src/__tests__/arrayUtils.test.ts b/packages/utils/src/__tests__/arrayUtils.test.ts
new file mode 100644
index 000000000..53cf6c10e
--- /dev/null
+++ b/packages/utils/src/__tests__/arrayUtils.test.ts
@@ -0,0 +1,42 @@
+import * as arrayUtils from '../array';
+
+describe('getUnique', () => {
+  it('generates expected characters', () => {
+    expect(arrayUtils.getUnique([1, 1, 1, 2])).toEqual([1, 2]);
+    expect(arrayUtils.getUnique([])).toEqual([]);
+  });
+});
+
+describe('getArrayOfSize', () => {
+  it('generated iterable array of specific size', () => {
+    const arr = arrayUtils.getArrayOfSize(10);
+    const newArray = arr.map((i, index) => index);
+
+    expect(arr.length).toEqual(10);
+    expect(newArray).toEqual([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
+  });
+});
+
+describe('removeItem', () => {
+  it('removes an item from an array', () => {
+    expect(arrayUtils.removeItem([1, 2, 3], 1)).toEqual([2, 3]);
+  });
+
+  it('removes an item from an array', () => {
+    expect(arrayUtils.removeItem([1, 2, 3], 1)).toEqual([2, 3]);
+  });
+
+  it('uses strict comparison check for comparison', () => {
+    expect(arrayUtils.removeItem(['1', '2', '3'], 1)).toEqual(['1', '2', '3']);
+  });
+
+  it('removes all items with the value', () => {
+    expect(arrayUtils.removeItem([5, 11, 2, 29, 2, 22, 2], 2)).toEqual([5, 11, 29, 22]);
+  });
+
+  it('bounds checking', () => {
+    expect(arrayUtils.removeItem([], 1)).toEqual([]);
+    expect(arrayUtils.removeItem([1], 1)).toEqual([]);
+    expect(arrayUtils.removeItem([1, 1, 1, 1, 1], 1)).toEqual([]);
+  });
+});
diff --git a/packages/utils/src/__tests__/dataTypeUtils.test.ts b/packages/utils/src/__tests__/dataTypeUtils.test.ts
new file mode 100644
index 000000000..07791d1db
--- /dev/null
+++ b/packages/utils/src/__tests__/dataTypeUtils.test.ts
@@ -0,0 +1,145 @@
+// import { getProcessBatches, getAffectedDataTypes } from '../dataTypeUtils';
+
+// describe('getProcessBatches', () => {
+//   it('data types with no dependencies all get added to the first process batch', () => {
+//     const testDataTypes = {
+//       One: {},
+//       Two: {},
+//       Three: {}
+//     };
+//     expect(getProcessBatches(testDataTypes)).toEqual({ One: 1, Two: 1, Three: 1 });
+//   });
+
+//   it('data types with a dependency end up in the second batch', () => {
+//     const testDataTypes = {
+//       One: {
+//         dependencies: ['Two']
+//       },
+//       Two: {},
+//       Three: {}
+//     };
+//     expect(getProcessBatches(testDataTypes)).toEqual({ One: 2, Two: 1, Three: 1 });
+//   });
+
+//   it('a chain of dependencies results in separate batches for each one', () => {
+//     const testDataTypes = {
+//       One: {},
+//       Two: {
+//         dependencies: ['One']
+//       },
+//       Three: {
+//         dependencies: ['Two']
+//       },
+//       Four: {
+//         dependencies: ['Three']
+//       }
+//     };
+//     expect(getProcessBatches(testDataTypes)).toEqual({ One: 1, Two: 2, Three: 3, Four: 4 });
+//   });
+
+//   it('multiple items with fulfilled items should end up the same batch', () => {
+//     const testDataTypes = {
+//       One: {},
+//       Two: {
+//         dependencies: ['One']
+//       },
+//       Three: {
+//         dependencies: ['Two']
+//       },
+//       Four: {
+//         dependencies: ['Two']
+//       },
+//       Five: {
+//         dependencies: ['Three']
+//       },
+//       Six: {
+//         dependencies: ['Four']
+//       },
+//       Seven: {
+//         dependencies: ['Three']
+//       }
+//     };
+//     expect(getProcessBatches(testDataTypes)).toEqual({
+//       One: 1,
+//       Two: 2,
+//       Three: 3,
+//       Four: 3,
+//       Five: 4,
+//       Six: 4,
+//       Seven: 4
+//     });
+//   });
+
+//   it('recursive dependencies throw an error', () => {
+//     const testDataTypes = {
+//       One: {
+//         dependencies: ['Two']
+//       },
+//       Two: {
+//         dependencies: ['One']
+//       }
+//     };
+//     try {
+//       getProcessBatches(testDataTypes);
+//     } catch (e) {
+//       expect(e.name).toEqual('Recursive dependency');
+//     }
+//   });
+
+//   it('recursive dependencies triggered after first batch throw an error', () => {
+//     const testDataTypes = {
+//       One: {
+//         dependencies: ['Two']
+//       },
+//       Two: {
+//         dependencies: ['One']
+//       },
+//       Three: {}
+//     };
+//     try {
+//       getProcessBatches(testDataTypes);
+//     } catch (e) {
+//       expect(e.name).toEqual('Recursive dependency');
+//     }
+//   });
+// });
+
+// describe('getAffectedDataTypes', () => {
+//   it('calculates which Data Types are affected for each Data Type change #1', () => {
+//     const testDataTypes = {
+//       One: {
+//         dependencies: ['Four']
+//       },
+//       Two: {},
+//       Three: {},
+//       Four: {}
+//     };
+
+//     expect(getAffectedDataTypes(testDataTypes)).toEqual({
+//       One: [],
+//       Two: [],
+//       Three: [],
+//       Four: ['One']
+//     });
+//   });
+
+//   it('calculates which Data Types are affected for each Data Type change #2', () => {
+//     const testDataTypes = {
+//       One: {
+//         dependencies: ['Four', 'Two', 'Three']
+//       },
+//       Two: {
+//         dependencies: ['Three']
+//       },
+//       Three: {},
+//       Four: {}
+//     };
+
+//     expect(getAffectedDataTypes(testDataTypes)).toEqual({
+//       One: [],
+//       Two: ['One'],
+//       Three: ['One', 'Two'],
+//       Four: ['One']
+//     });
+//   });
+// });
diff --git a/packages/utils/src/__tests__/dateUtils.test.ts b/packages/utils/src/__tests__/dateUtils.test.ts
new file mode 100644
index 000000000..1cde050d6
--- /dev/null
+++ b/packages/utils/src/__tests__/dateUtils.test.ts
@@ -0,0 +1,18 @@
+import { formatDuration } from '../date';
+
+describe('formatDuration', () => {
+  it('displays < 60 seconds as seconds only', () => {
+    expect(formatDuration(10)).toEqual('0:10');
+    expect(formatDuration(20)).toEqual('0:20');
+    expect(formatDuration(1)).toEqual('0:01');
+    expect(formatDuration(59)).toEqual('0:59');
+  });
+
+  it('displays < 60 minutes as minutes & seconds', () => {
+    expect(formatDuration(60)).toEqual('1:00');
+    expect(formatDuration(61)).toEqual('1:01');
+    expect(formatDuration(90)).toEqual('1:30');
+    expect(formatDuration(120)).toEqual('2:00');
+    expect(formatDuration(1000)).toEqual('16:40');
+  });
+});
diff --git a/packages/utils/src/__tests__/generalUtils.test.ts b/packages/utils/src/__tests__/generalUtils.test.ts
new file mode 100644
index 000000000..a4eae3ba0
--- /dev/null
+++ b/packages/utils/src/__tests__/generalUtils.test.ts
@@ -0,0 +1,50 @@
+import * as generalUtils from '../general';
+
+describe('isBoolean', () => {
+  it('evaluates as booleans', () => {
+    expect(generalUtils.isBoolean('one')).toEqual(false);
+    expect(generalUtils.isBoolean('true')).toEqual(false);
+    expect(generalUtils.isBoolean('false')).toEqual(false);
+    expect(generalUtils.isBoolean(false)).toEqual(true);
+    expect(generalUtils.isBoolean(true)).toEqual(true);
+    expect(generalUtils.isBoolean(1)).toEqual(false);
+    expect(generalUtils.isBoolean(0)).toEqual(false);
+    expect(generalUtils.isBoolean(undefined)).toEqual(false);
+    expect(generalUtils.isBoolean(null)).toEqual(false);
+    expect(generalUtils.isBoolean(NaN)).toEqual(false);
+  });
+});
+
+describe('cloneObj', () => {
+  it('clones an object', () => {
+    const obj = { one: 114 };
+    expect(obj === obj).toBeTruthy();
+
+    const clone: any = generalUtils.cloneObj(obj);
+    expect(obj === clone).toBeFalsy();
+    expect(obj.one === clone.one).toBeTruthy();
+  });
+});
+
+describe('template', () => {
+  it('renders plain string', () => {
+    expect(generalUtils.template('hello', {})).toEqual('hello');
+  });
+
+  it('renders placeholder', () => {
+    expect(generalUtils.template('Hello {{name}}', { name: 'Ben' })).toEqual('Hello Ben');
+  });
+
+  it('check basic math', () => {
+    expect(generalUtils.template('Hello {{value+1}}', { value: 1 })).toEqual('Hello 2');
+    expect(generalUtils.template('{{value/10}}', { value: 250 })).toEqual('25');
+  });
+});
+
+describe('isValidEmail', () => {
+  it('validates email as expected', () => {
+    expect(generalUtils.isValidEmail('nope')).toEqual(false);
+    expect(generalUtils.isValidEmail('')).toEqual(false);
+    expect(generalUtils.isValidEmail('a@b.com')).toEqual(true);
+  });
+});
diff --git a/packages/utils/src/__tests__/langUtils.test.ts b/packages/utils/src/__tests__/langUtils.test.ts
new file mode 100644
index 000000000..01535536c
--- /dev/null
+++ b/packages/utils/src/__tests__/langUtils.test.ts
@@ -0,0 +1,92 @@
+import { getI18nString, getCurrentLocalizedPath } from '../lang';
+
+describe('getI18nString', () => {
+  it('bounds checking', () => {
+    expect(getI18nString('test', [])).toEqual('test');
+    expect(getI18nString('test', ['whatever'])).toEqual('test');
+    expect(getI18nString('', [])).toEqual('');
+  });
+
+  it('replaces as expected', () => {
+    expect(getI18nString('Hello %1', ['world'])).toEqual('Hello world');
+    expect(getI18nString('Double %1 %1 test', ['tap'])).toEqual('Double tap tap test');
+    expect(getI18nString('Nonexistent placeholder %1 test', [])).toEqual('Nonexistent placeholder %1 test');
+    expect(getI18nString('Multiple %1 %2', ['placeholder', 'test'])).toEqual('Multiple placeholder test');
+  });
+});
+
+describe('getCurrentLocalizedPath', () => {
+  const { location } = window;
+
+  beforeAll(() => {
+    // @ts-ignore
+    delete window.location;
+  });
+
+  afterAll(() => {
+    window.location = location;
+  });
+
+  it('gets expected localized path from blank English path', () => {
+    // @ts-ignore-line
+    window.location = { pathname: '' };
+
+    expect(getCurrentLocalizedPath('fr')).toEqual('/fr');
+  });
+
+  it('gets expected localized path from blank English path with trailing slash', () => {
+    // @ts-ignore-line
+    window.location = { pathname: '/' };
+
+    expect(getCurrentLocalizedPath('fr')).toEqual('/fr');
+  });
+
+  it('appends locale to existing path (single folder)', () => {
+    // @ts-ignore-line
+    window.location = { pathname: '/accounts' };
+
+    expect(getCurrentLocalizedPath('de')).toEqual('/de/accounts');
+  });
+
+  it('appends locale to existing path (single folder) with trailing slash', () => {
+    // @ts-ignore-line
+    window.location = { pathname: '/accounts/' };
+
+    expect(getCurrentLocalizedPath('de')).toEqual('/de/accounts');
+  });
+
+  it('appends locale to existing path (multiple folders)', () => {
+    // @ts-ignore-line
+    window.location = { pathname: '/accounts/subpagehere' };
+
+    expect(getCurrentLocalizedPath('de')).toEqual('/de/accounts/subpagehere');
+  });
+
+  it('appends locale to existing path (single folder) with trailing slash', () => {
+    // @ts-ignore-line
+    window.location = { pathname: '/accounts/subpagehere/' };
+
+    expect(getCurrentLocalizedPath('de')).toEqual('/de/accounts/subpagehere');
+  });
+
+  it('invalid localization strings just returns the original path', () => {
+    // @ts-ignore-line
+    window.location = { pathname: '/accounts' };
+
+    expect(getCurrentLocalizedPath('zz' as any)).toEqual('/accounts');
+  });
+
+  it('English does not change an existing english path', () => {
+    // @ts-ignore-line
+    window.location = { pathname: '/accounts' };
+
+    expect(getCurrentLocalizedPath('en')).toEqual('/accounts');
+  });
+
+  it('English removes an existing non-English path', () => {
+    // @ts-ignore-line
+    window.location = { pathname: '/fr/accounts' };
+
+    expect(getCurrentLocalizedPath('en')).toEqual('/accounts');
+  });
+});
diff --git a/packages/utils/src/__tests__/numberUtils.test.ts b/packages/utils/src/__tests__/numberUtils.test.ts
new file mode 100644
index 000000000..cc6c5210a
--- /dev/null
+++ b/packages/utils/src/__tests__/numberUtils.test.ts
@@ -0,0 +1,35 @@
+import * as numberUtils from '../number';
+
+describe('isNumeric', () => {
+  it('evaluates numeric values correctly', () => {
+    expect(numberUtils.isNumeric(0)).toEqual(true);
+    expect(numberUtils.isNumeric(1)).toEqual(true);
+    expect(numberUtils.isNumeric(1.5)).toEqual(true);
+    expect(numberUtils.isNumeric('0')).toEqual(true);
+    expect(numberUtils.isNumeric('0.5')).toEqual(true);
+  });
+
+  it('evaluates non-numeric values correctly', () => {
+    expect(numberUtils.isNumeric('0x')).toEqual(false);
+    expect(numberUtils.isNumeric('blah')).toEqual(false);
+  });
+});
+
+describe('numberFormat', () => {
+  it('formats numbers as expected', () => {
+    expect(numberUtils.numberFormat(1234.56)).toEqual('1,235');
+    expect(numberUtils.numberFormat(1234.56, 1)).toEqual('1,234.6');
+    expect(numberUtils.numberFormat(1234.56, 2, ',', ' ')).toEqual('1 234,56');
+    expect(numberUtils.numberFormat(1234.5678, 2, '.', '')).toEqual('1234.57');
+    expect(numberUtils.numberFormat(67, 2, ',', '.')).toEqual('67,00');
+    expect(numberUtils.numberFormat(1000)).toEqual('1,000');
+    expect(numberUtils.numberFormat(67.311, 2)).toEqual('67.31');
+    expect(numberUtils.numberFormat(1000.55, 1)).toEqual('1,000.6');
+    expect(numberUtils.numberFormat(67000, 5, ',', '.')).toEqual('67.000,00000');
+    expect(numberUtils.numberFormat(0.9, 0)).toEqual('1');
+    expect(numberUtils.numberFormat(1.2, 2)).toEqual('1.20');
+    expect(numberUtils.numberFormat(1.2, 4)).toEqual('1.2000');
+    expect(numberUtils.numberFormat(1.2, 3)).toEqual('1.200');
+    expect(numberUtils.numberFormat(1e-8, 8, '.', '')).toEqual('0.00000001');
+  });
+});
diff --git a/packages/utils/src/__tests__/randomUtils.test.ts b/packages/utils/src/__tests__/randomUtils.test.ts
new file mode 100644
index 000000000..ec31c0aa2
--- /dev/null
+++ b/packages/utils/src/__tests__/randomUtils.test.ts
@@ -0,0 +1,232 @@
+import * as sinon from 'sinon';
+import * as randomUtils from '../random';
+
+describe('getRandomNum', () => {
+  it('generates numbers in expected range #1', () => {
+    const expected = [1, 2, 3];
+    for (let i = 0; i < 50; i++) {
+      const val = randomUtils.getRandomNum(1, 3);
+      expect(expected.indexOf(val) !== -1).toBeTruthy();
+    }
+  });
+
+  it('generates numbers in expected range #2', () => {
+    const expected = [5, 6, 7];
+    for (let i = 0; i < 50; i++) {
+      expect(expected.indexOf(randomUtils.getRandomNum(5, 7)) !== -1).toBeTruthy();
+    }
+  });
+
+  it('generates numbers in expected range #3', () => {
+    const expected = [0, 1];
+    for (let i = 0; i < 50; i++) {
+      expect(expected.indexOf(randomUtils.getRandomNum(0, 1)) !== -1).toBeTruthy();
+    }
+  });
+
+  it('generates numbers in expected range #4', () => {
+    const expected = [-2, -1, 0, 1, 2];
+    for (let i = 0; i < 50; i++) {
+      expect(expected.indexOf(randomUtils.getRandomNum(-2, 2)) !== -1).toBeTruthy();
+    }
+  });
+
+  it('generates numbers when number range entirely negative', () => {
+    const expected = [-4, -3, -2, -1];
+    for (let i = 0; i < 50; i++) {
+      expect(expected.indexOf(randomUtils.getRandomNum(-4, -1)) !== -1).toBeTruthy();
+    }
+  });
+
+  it('generates the same number when min and max have same values', () => {
+    for (let i = 0; i < 50; i++) {
+      expect(randomUtils.getRandomNum(0, 0) === 0).toBeTruthy();
+      expect(randomUtils.getRandomNum(-800, -800) === -800).toBeTruthy();
+    }
+  });
+});
+
+describe('generateRandomTextStr', () => {
+  const words = ['one', 'two', 'three'];
+
+  afterEach(function () {
+    sinon.restore();
+  });
+
+  it('generates a single word starting from the first word', () => {
+    expect(randomUtils.generateRandomTextStr(words, true, 1)).toEqual('one');
+  });
+
+  it('generates multiple words starting from the first word', () => {
+    expect(randomUtils.generateRandomTextStr(words, true, 2)).toEqual('one two');
+    expect(randomUtils.generateRandomTextStr(words, true, 3)).toEqual('one two three');
+  });
+
+  it('generates a random word', () => {
+    sinon.stub(randomUtils, 'getRandomNum').onCall(0).returns(0);
+    expect(randomUtils.generateRandomTextStr(words, false, 1)).toEqual('one');
+  });
+
+  it('generates another random word', () => {
+    sinon.stub(randomUtils, 'getRandomNum').onCall(0).returns(1);
+    expect(randomUtils.generateRandomTextStr(words, false, 1)).toEqual('two');
+  });
+
+  it('generates two random words', () => {
+    expect(randomUtils.generateRandomTextStr(words, false, 2)).toMatch(/[a-z]+\s[a-z]+/);
+  });
+
+  it('generates the same string every time when min num of words is the total number of words', () => {
+    for (let i = 0; i < 10; i++) {
+      expect(randomUtils.generateRandomTextStr(['a', 'b', 'c'], false, 3)).toEqual('a b c');
+    }
+  });
+});
+
+describe('generateRandomAlphanumericStr', () => {
+  afterEach(function () {
+    sinon.restore();
+  });
+
+  it('whitespace is trimmed', () => {
+    expect(randomUtils.generateRandomAlphanumericStr('    ')).toEqual('');
+  });
+
+  it('special characters are converted as expected', () => {
+    const str = 'CcEVvFLlDXxH';
+    for (let i = 0; i < 50; i++) {
+      const generated = randomUtils.generateRandomAlphanumericStr(str);
+
+      // C = uppercase consonant
+      expect(randomUtils.consonants.indexOf(generated[0]) !== -1).toBeTruthy();
+
+      // c = lowercase consonant
+      expect(randomUtils.lowercaseConsonants.indexOf(generated[1]) !== -1).toBeTruthy();
+
+      // A = any case consonant
+      expect(randomUtils.consonants.concat(randomUtils.lowercaseConsonants).indexOf(generated[2]) !== -1).toBeTruthy();
+
+      // V = uppercase vowel
+      expect(randomUtils.vowels.indexOf(generated[3]) !== -1).toBeTruthy();
+
+      // v = uppercase vowel
+      expect(randomUtils.lowercaseVowels.indexOf(generated[4]) !== -1).toBeTruthy();
+
+      // F = any case vowel
+      expect(randomUtils.vowels.concat(randomUtils.lowercaseVowels).indexOf(generated[5]) !== -1).toBeTruthy();
+
+      // L = uppercase letter
+      expect(randomUtils.letters.indexOf(generated[6]) !== -1).toBeTruthy();
+
+      // l = lowercase letter
+      expect(randomUtils.lowercaseLetters.indexOf(generated[7]) !== -1).toBeTruthy();
+
+      // D = any case letter
+      expect(randomUtils.letters.concat(randomUtils.lowercaseLetters).indexOf(generated[8]) !== -1).toBeTruthy();
+
+      // X = 1-9
+      expect(['1', '2', '3', '4', '5', '6', '7', '8', '9'].indexOf(generated[9]) !== -1).toBeTruthy();
+
+      // x = 0-9
+      expect(['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'].indexOf(generated[10]) !== -1).toBeTruthy();
+
+      // H = 0-F
+      expect(['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'].indexOf(generated[11]) !== -1).toBeTruthy();
+    }
+  });
+});
+
+describe('getRandomCharInString', () => {
+  afterEach(function () {
+    sinon.restore();
+  });
+
+  it('returns a random char', () => {
+    sinon.stub(randomUtils, 'getRandomNum').onCall(0).returns(1);
+
+    expect(randomUtils.getRandomCharInString('abc')).toEqual('b');
+  });
+
+  it('returns a random char', () => {
+    sinon.stub(randomUtils, 'getRandomNum').onCall(0).returns(2);
+
+    expect(randomUtils.getRandomCharInString('abc')).toEqual('c');
+  });
+});
+
+describe('getRandomSubset', () => {
+  it('returns an array of the expected size', () => {
+    expect(randomUtils.getRandomSubset([1, 2, 3, 4, 5], 1).length).toEqual(1);
+    expect(randomUtils.getRandomSubset([1, 2, 3, 4, 5], 2).length).toEqual(2);
+    expect(randomUtils.getRandomSubset([1, 2, 3, 4, 5], 3).length).toEqual(3);
+    expect(randomUtils.getRandomSubset([1, 2, 3, 4, 5], 4).length).toEqual(4);
+    expect(randomUtils.getRandomSubset([1, 2, 3, 4, 5], 5).length).toEqual(5);
+  });
+
+  it('returns an array of size no greater than the original size', () => {
+    expect(randomUtils.getRandomSubset([1, 2, 3, 4, 5], 10).length).toEqual(5);
+  });
+
+  it('returns the same content when passing a full array', () => {
+    expect(randomUtils.getRandomSubset([1, 2, 3], 3).sort()).toEqual([1, 2, 3].sort());
+  });
+});
+
+describe('generatePlaceholderStr', () => {
+  it('generates string using custom placeholders', () => {
+    const defaultPlaceholders = {
+      A: '1',
+      B: '2',
+      C: '3'
+    };
+    expect(randomUtils.generatePlaceholderStr('ABC', defaultPlaceholders)).toEqual('123');
+  });
+});
+
+describe('getRandomWeightedValue', () => {
+  // Out of 1, the relative and cumulative values for these are:
+  // 		a: 0.1666	-> 0.16666
+  // 	 	b: 0.3333   -> 0.5
+  // 	 	c: 0.5      -> 1
+  const values = { a: 10, b: 20, c: 30 };
+
+  it('returns appropriate values for particular random value', () => {
+    // any random number under 0.166666 should return "a"
+    const stub1 = sinon.stub(Math, 'random').returns(0);
+    const result1 = randomUtils.getRandomWeightedValue(values);
+    expect(result1).toEqual('a');
+    stub1.restore();
+
+    const stub2 = sinon.stub(Math, 'random').returns(0.1666);
+    const result2 = randomUtils.getRandomWeightedValue(values);
+    expect(result2).toEqual('a');
+    stub2.restore();
+
+    // any random number between 0.166666 and 0.5 should return "b"
+    const stub3 = sinon.stub(Math, 'random').returns(0.17);
+    const result3 = randomUtils.getRandomWeightedValue(values);
+    expect(result3).toEqual('b');
+    stub3.restore();
+
+    const stub4 = sinon.stub(Math, 'random').returns(0.3333);
+    const result4 = randomUtils.getRandomWeightedValue(values);
+    expect(result4).toEqual('b');
+    stub4.restore();
+
+    const stub5 = sinon.stub(Math, 'random').returns(0.5);
+    const result5 = randomUtils.getRandomWeightedValue(values);
+    expect(result5).toEqual('b');
+    stub5.restore();
+
+    // any random number above 0.5 should return "c"
+    const stub6 = sinon.stub(Math, 'random').returns(0.500001);
+    const result6 = randomUtils.getRandomWeightedValue(values);
+    expect(result6).toEqual('c');
+    stub6.restore();
+
+    const stub7 = sinon.stub(Math, 'random').returns(1);
+    const result7 = randomUtils.getRandomWeightedValue(values);
+    expect(result7).toEqual('c');
+    stub7.restore();
+  });
+});
diff --git a/packages/utils/src/__tests__/routeUtils.test.ts b/packages/utils/src/__tests__/routeUtils.test.ts
new file mode 100644
index 000000000..4c97e9fb1
--- /dev/null
+++ b/packages/utils/src/__tests__/routeUtils.test.ts
@@ -0,0 +1,41 @@
+// import { getRoutes, removeLocale } from '../routeUtils';
+
+// describe('getRoutes', () => {
+// 	it('returns all available routes by default with the generator page the last one with the root path', () => {
+// 		const defaultPaths = [
+// 			'/account',
+// 			'/accounts',
+// 			'/login',
+// 			'/datasets',
+// 			'/register',
+// 			'/'
+// 		];
+
+// 		const foundPaths = getRoutes().map(({ path }) => path);
+// 		expect(foundPaths).toEqual(defaultPaths);
+// 	});
+// });
+
+// describe('removeLocale', () => {
+// 	it('removes nothing for root', () => {
+// 		expect(removeLocale('/')).toEqual('/');
+// 		expect(removeLocale('')).toEqual('');
+// 	});
+
+// 	it('removes nothing for non-locale path', () => {
+// 		expect(removeLocale('/accounts')).toEqual('/accounts');
+// 		expect(removeLocale('/blah/de/blah')).toEqual('/blah/de/blah');
+// 	});
+
+// 	it('removes valid locales from root', () => {
+// 		expect(removeLocale('/de')).toEqual('');
+// 		expect(removeLocale('/en')).toEqual('');
+// 		expect(removeLocale('/zz')).toEqual('/zz');
+// 	});
+
+// 	it('removes valid locales from full path', () => {
+// 		expect(removeLocale('/de/accounts')).toEqual('/accounts');
+// 		expect(removeLocale('/ta/accounts/')).toEqual('/accounts/');
+// 		expect(removeLocale('/zz/accounts')).toEqual('/zz/accounts');
+// 	});
+// });
diff --git a/packages/utils/src/__tests__/stringUtils.test.ts b/packages/utils/src/__tests__/stringUtils.test.ts
new file mode 100644
index 000000000..054102d6f
--- /dev/null
+++ b/packages/utils/src/__tests__/stringUtils.test.ts
@@ -0,0 +1,47 @@
+import * as stringUtils from '../string';
+
+describe('uppercaseWords', () => {
+  it('uppercases a single word', () => {
+    expect(stringUtils.uppercaseWords('one')).toEqual('One');
+    expect(stringUtils.uppercaseWords('ONE')).toEqual('One');
+  });
+
+  it('uppercases multiple word', () => {
+    expect(stringUtils.uppercaseWords('one two')).toEqual('One Two');
+    expect(stringUtils.uppercaseWords('ONE TWO')).toEqual('One Two');
+    expect(stringUtils.uppercaseWords('ONE-TWO')).toEqual('One-two');
+  });
+});
+
+describe('getUniqueString', () => {
+  it('returns the original string if the string is not already taken', () => {
+    expect(stringUtils.getUniqueString('one', [])).toEqual('one');
+    expect(stringUtils.getUniqueString('one', ['two', 'three'])).toEqual('one');
+  });
+  it('returns the string plus 1 if it is taken', () => {
+    expect(stringUtils.getUniqueString('one', ['one'])).toEqual('one1');
+    expect(stringUtils.getUniqueString('one', ['one', 'one1'])).toEqual('one2');
+    expect(stringUtils.getUniqueString('one', ['one', 'one1', 'one2'])).toEqual('one3');
+    expect(stringUtils.getUniqueString('one', ['one1', 'one2'])).toEqual('one');
+  });
+});
+
+describe('toSentenceCase', () => {
+  it('converts strings to sentence case as expected', () => {
+    expect(stringUtils.toSentenceCase('')).toEqual('');
+    expect(stringUtils.toSentenceCase('hello')).toEqual('Hello');
+    expect(stringUtils.toSentenceCase('hello world')).toEqual('Hello world');
+    expect(stringUtils.toSentenceCase('HELLO WORLD')).toEqual('Hello world');
+  });
+});
+
+describe('trimChars', () => {
+  it('trims characters as expected', () => {
+    expect(stringUtils.trimChars('hello', '')).toEqual('hello');
+    expect(stringUtils.trimChars('hello', '/')).toEqual('hello');
+    expect(stringUtils.trimChars('hello/', '/')).toEqual('hello');
+    expect(stringUtils.trimChars('/hello/', '/')).toEqual('hello');
+    expect(stringUtils.trimChars('/hello!', '!')).toEqual('/hello');
+    expect(stringUtils.trimChars('/hello!!!', '!')).toEqual('/hello');
+  });
+});
diff --git a/packages/utils/src/array.ts b/packages/utils/src/array.ts
new file mode 100644
index 000000000..cdca4a590
--- /dev/null
+++ b/packages/utils/src/array.ts
@@ -0,0 +1,22 @@
+export const getUnique = <T>(arr: T[]): T[] => arr.filter((v, i, a) => a.indexOf(v) === i);
+
+// returns an empty array of a particular size
+export const getArrayOfSize = (size: number): any[] => [...Array(size)];
+
+export const removeItem = <T>(arr: T[], value: any): T[] => {
+  let i = 0;
+  while (i < arr.length) {
+    if (arr[i] === value) {
+      arr.splice(i, 1);
+    } else {
+      ++i;
+    }
+  }
+  return arr;
+};
+
+export const arrayMove = (array: any[], from: number, to: number): any[] => {
+  array = array.slice();
+  array.splice(to < 0 ? array.length + to : to, 0, array.splice(from, 1)[0]);
+  return array;
+};
diff --git a/packages/utils/src/auth.ts b/packages/utils/src/auth.ts
new file mode 100644
index 000000000..2e5422f43
--- /dev/null
+++ b/packages/utils/src/auth.ts
@@ -0,0 +1,43 @@
+import bcrypt from 'bcrypt';
+import clientConfig from '@generatedata/config/clientConfig';
+
+// TODO maybe invert this?
+// import { SignInWithGoogleButton, initGoogleAuth } from '~core/auth/google/google';
+
+// refresh the token 1 minute before it expires
+export const setAuthTokenRefresh = (tokenExpiry: number, onRefresh: any): void => {
+  const oneMinFromExpiry = clientConfig.auth.GD_JWT_LIFESPAN_MINS * 60 * 1000 - 60 * 1000;
+  const timeout = setTimeout((): void => {
+    clearTimeout(timeout);
+    onRefresh();
+  }, oneMinFromExpiry);
+};
+
+export const initAuthVendors = (): void => {
+  if (clientConfig.auth.GD_GOOGLE_AUTH_CLIENT_ID) {
+    // initGoogleAuth();
+  }
+};
+
+export const hasVendorLogin = (): boolean => {
+  if (clientConfig.auth.GD_GOOGLE_AUTH_CLIENT_ID) {
+    return true;
+  }
+  return false;
+};
+
+export const getVendorLoginButtons = (): React.ReactNode[] => {
+  const buttons: any[] = [];
+
+  if (clientConfig.auth.GD_GOOGLE_AUTH_CLIENT_ID) {
+    // buttons.push(SignInWithGoogleButton);
+  }
+
+  return buttons;
+};
+
+const saltRounds = 10;
+export const getPasswordHash = async (plainTextPassword) => {
+  const salt = await bcrypt.genSalt(saltRounds);
+  return await bcrypt.hash(plainTextPassword, salt);
+};
diff --git a/packages/utils/src/dataType.tsx b/packages/utils/src/dataType.tsx
new file mode 100644
index 000000000..e70d45170
--- /dev/null
+++ b/packages/utils/src/dataType.tsx
@@ -0,0 +1,231 @@
+// import React from 'react';
+// import { getLocale, getStrings } from './langUtils';
+// // import { dataTypes, DataTypeFolder, blacklistedDataTypeFolders } from '../../_plugins';
+// import { DTBundle, DTCustomProps, DTHelpProps } from '@generatedata/types';
+// // import { Store } from '~types/general';
+// import { constants as C } from '@generatedata/config';
+
+// type LoadedDataTypes = {
+//   [name in DataTypeFolder]: DTBundle;
+// };
+
+// // this houses all Export Type code loaded async after the application starts
+// const loadedDataTypes: Partial<LoadedDataTypes> = {};
+
+// export const dataTypeNames = Object.keys(dataTypes);
+
+// // used for the Data Type selection dropdown
+// let lastLocale: any;
+// let cachedSortedGroupedDataTypes: any;
+// export const getSortedGroupedDataTypes = (): any => {
+//   const locale = getLocale();
+//   const i18n = getStrings();
+
+//   if (cachedSortedGroupedDataTypes && lastLocale == locale) {
+//     return cachedSortedGroupedDataTypes;
+//   }
+
+//   lastLocale = locale;
+//   cachedSortedGroupedDataTypes = C.DATA_TYPE_GROUPS.map((group: string) => {
+//     const options = Object.keys(dataTypes)
+//       .filter((dataType: DataTypeFolder) => dataTypes[dataType].fieldGroup === group)
+//       .filter((dataType: DataTypeFolder) => blacklistedDataTypeFolders.indexOf(dataType) === -1)
+//       .map((dataType: DataTypeFolder) => ({
+//         dataType,
+//         sortOrder: dataTypes[dataType].fieldGroupOrder
+//       }));
+
+//     options.sort((a: any, b: any) => {
+//       if (a.sortOrder < b.sortOrder) {
+//         return -1;
+//       } else if (a.sortOrder > b.sortOrder) {
+//         return 1;
+//       }
+//       return 0;
+//     });
+
+//     const sortedOptions = options.map(({ dataType }: { dataType: DataTypeFolder }) => ({
+//       value: dataType,
+//       label: i18n.dataTypes[dataType].NAME
+//     }));
+
+//     return {
+//       label: i18n.core[group],
+//       options: sortedOptions
+//     };
+//   });
+
+//   return cachedSortedGroupedDataTypes;
+// };
+
+// export const DefaultHelpComponent = ({ i18n }: DTHelpProps) => <p dangerouslySetInnerHTML={{ __html: i18n.DESC }} />;
+
+// const showNothing = (): null => null;
+
+// export const getDataType = (dataType: DataTypeFolder | null): any => {
+//   // TODO return type is important here. Dense method!
+//   if (!dataType || !loadedDataTypes[dataType]) {
+//     return {
+//       Example: !dataType ? showNothing : null,
+//       Options: showNothing,
+//       Help: null,
+//       isLoaded: false
+//     };
+//   }
+
+//   let Example = null;
+//   let Options = null;
+//   let Help;
+
+//   if (loadedDataTypes[dataType]!.Example) {
+//     Example = loadedDataTypes[dataType]!.Example;
+//   }
+
+//   if (loadedDataTypes[dataType]!.Options) {
+//     Options = loadedDataTypes[dataType]!.Options;
+//   }
+
+//   if (dataType && loadedDataTypes[dataType]!.Help) {
+//     Help = loadedDataTypes[dataType]!.Help;
+//   } else {
+//     Help = DefaultHelpComponent;
+//   }
+
+//   const customProps = dataType && loadedDataTypes[dataType]!.customProps ? loadedDataTypes[dataType]!.customProps : {};
+//   const actionInterceptors = dataType && loadedDataTypes[dataType]!.actionInterceptors ? loadedDataTypes[dataType]!.actionInterceptors : {};
+
+//   const { getMetadata, rowStateReducer } = loadedDataTypes[dataType] as DTBundle;
+//   return {
+//     isLoaded: true,
+//     Options,
+//     Help,
+//     Example,
+//     getMetadata,
+//     rowStateReducer,
+//     customProps,
+//     actionInterceptors
+//   };
+// };
+
+// export type ProcessBatches = {
+//   [dt in DataTypeFolder]?: number;
+// };
+
+// export function RecursiveErrorException(remaining: string[]): void {
+//   // @ts-ignore-line
+//   this.possibleProblematicDataTypes = remaining;
+//   // @ts-ignore-line
+//   this.name = 'Recursive dependency';
+// }
+
+// /**
+//  * Data Types can register dependencies on other Data Types (the `dependencies` property of their config.ts file) so
+//  * that when the row data is generated, the script ensures the dependencies are generated first and available for use.
+//  * For example:
+//  *
+//  * Country <- Region <- City
+//  *
+//  * Here, the City DT expects the Region DT to be generated first, so it can generate a random city within whatever
+//  * random region was generated. Then the same goes for Region with Country.
+//  *
+//  * This method examines all the dependencies and creates a flat object of dataType => process batch. Any recursive
+//  * dependencies throw an error.
+//  */
+// export const getProcessBatches = (dataTypes: any): ProcessBatches => {
+//   let dataTypesToProcess = Object.keys(dataTypes);
+
+//   const processBatches: ProcessBatches = {};
+//   let previousLength = dataTypesToProcess.length;
+//   let currentBatch = 1;
+
+//   while (dataTypesToProcess.length > 0) {
+//     const resolvedDataTypes: any = [];
+//     dataTypesToProcess.forEach((dataType) => {
+//       // here, we're dealing with Data Types that have dependencies. Loop through them all and figure out if all
+//       // of them have already been assigned to a process batch
+//       const allDependenciesPositioned =
+//         !dataTypes[dataType].dependencies ||
+//         dataTypes[dataType].dependencies.every((dependency: string) => !!processBatches[dependency as DataTypeFolder]);
+//       if (allDependenciesPositioned) {
+//         resolvedDataTypes.push(dataType);
+//       }
+//     });
+
+//     if (resolvedDataTypes.length) {
+//       resolvedDataTypes.forEach((dataType: string) => {
+//         processBatches[dataType as DataTypeFolder] = currentBatch;
+//       });
+//       dataTypesToProcess = dataTypesToProcess.filter((dataType) => resolvedDataTypes.indexOf(dataType) === -1);
+//       currentBatch++;
+//     }
+
+//     // simple check: every single pass of the DataTypes should be able to resolve at least one of them to a
+//     // new batch number. If none got resolved we have a problem.
+//     if (dataTypesToProcess.length === previousLength) {
+//       // @ts-ignore-line
+//       throw new RecursiveErrorException(dataTypesToProcess);
+//     }
+
+//     previousLength = dataTypesToProcess.length;
+//   }
+
+//   return processBatches;
+// };
+
+// export const processBatches = getProcessBatches(dataTypes);
+
+// // returns a hash of { [data type] => [array of affected data types] }. This means that when the property Data Type
+// // is changed, the Data Types in the key array could be affected
+// export const getAffectedDataTypes = (dataTypes: any): any => {
+//   const affectedDataTypes: any = {};
+
+//   Object.keys(dataTypes).forEach((dataType: DataTypeFolder) => {
+//     if (!affectedDataTypes[dataType]) {
+//       affectedDataTypes[dataType] = [];
+//     }
+
+//     if (dataTypes[dataType].dependencies) {
+//       dataTypes[dataType].dependencies.forEach((dep: DataTypeFolder) => {
+//         if (!affectedDataTypes[dep]) {
+//           affectedDataTypes[dep] = [];
+//         }
+//         affectedDataTypes[dep].push(dataType);
+//       });
+//     }
+//   });
+
+//   return affectedDataTypes;
+// };
+
+// export const affectedDataTypes = getAffectedDataTypes(dataTypes);
+
+// export const requestDataTypeBundle = (dataType: DataTypeFolder): any => {
+//   return new Promise((resolve, reject) => {
+//     import(
+//       /* webpackChunkName: "DT-[request]" */
+//       /* webpackMode: "lazy" */
+//       `../plugins/dataTypes/${dataType}/bundle`
+//     )
+//       .then((definition: any) => {
+//         loadedDataTypes[dataType] = definition.default;
+//         resolve(definition.default);
+//       })
+//       .catch((e) => {
+//         reject(e);
+//       });
+//   });
+// };
+
+// // TODO - this is causing a repaint on every method call, which is causing the most slowness in the UI. But using
+// // noValue below doesn't help: when the DT selectors called here return different values, it doesn't get reflected in the UI
+// // const noValue: any = {};
+// export const getCustomProps = (customProps: DTCustomProps, state: Store): object => {
+//   const values: any = {};
+//   if (customProps) {
+//     Object.keys(customProps).map((propName: string) => {
+//       values[propName] = customProps[propName](state);
+//     });
+//   }
+
+//   return values;
+// };
diff --git a/packages/utils/src/date.ts b/packages/utils/src/date.ts
new file mode 100644
index 000000000..a090ad7db
--- /dev/null
+++ b/packages/utils/src/date.ts
@@ -0,0 +1,37 @@
+import { format, fromUnixTime } from 'date-fns';
+import C from '@generatedata/config/constants';
+
+export const formatDuration = (duration: number): string => {
+  const secondsStr = Math.floor(duration % 60).toString();
+  const minutes = Math.floor(duration / 60) % 60;
+  const minutesStr = minutes.toString();
+  const hours = Math.floor(duration / 60 / 60);
+
+  const paddedSecondsStr = secondsStr.length < 2 ? 0 + secondsStr : secondsStr;
+  const paddedMinutesStr = minutesStr.length < 2 ? 0 + minutesStr : minutesStr;
+
+  if (hours) {
+    return `${hours}:${paddedMinutesStr}:${paddedSecondsStr}`;
+  } else if (minutes) {
+    return `${minutes}:${paddedSecondsStr}`;
+  } else {
+    return `0:${paddedSecondsStr}`;
+  }
+};
+
+export const formatUnixTime = (time: number, formatStr: string = C.DATETIME_FORMAT): string => {
+  if (!time) {
+    return '';
+  }
+  return format(fromUnixTime(time), formatStr);
+};
+
+export const isValidDateFormat = (dateFormat: string) => {
+  let isValid = true;
+  try {
+    format(new Date(), dateFormat);
+  } catch (e) {
+    isValid = false;
+  }
+  return isValid;
+};
diff --git a/packages/utils/src/debug.tsx b/packages/utils/src/debug.tsx
new file mode 100644
index 000000000..5b3c8b03e
--- /dev/null
+++ b/packages/utils/src/debug.tsx
@@ -0,0 +1,26 @@
+/* istanbul ignore file */
+
+// debugging methods. These should never be included in the actual code
+import * as React from 'react';
+
+interface Props<P> {
+  [key: string]: any;
+}
+
+// quick debugging HOC to find out what props are causing repaints
+export function withPropsCheck<P>(WrappedComponent: React.ComponentType<P>): React.ComponentClass<Props<P>> {
+  return class PropsChecker extends React.Component<Props<P>> {
+    componentWillReceiveProps(nextProps: Props<P>): void {
+      Object.keys(nextProps)
+        .filter((key) => nextProps[key] !== this.props[key])
+        .map((key): void => {
+          console.log('changed property:', key, 'from', this.props[key], 'to', nextProps[key]);
+        });
+    }
+
+    render(): any {
+      // @ts-ignore-line
+      return <WrappedComponent {...this.props} />;
+    }
+  };
+}
diff --git a/packages/utils/src/extension.tsx b/packages/utils/src/extension.tsx
new file mode 100644
index 000000000..589d0d7ff
--- /dev/null
+++ b/packages/utils/src/extension.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+const customFooterLinks: any[] = [];
+
+// to keep things simple, a registered footer link should be wrapped in it's own <li>. That way it can
+// supply any additional styling for the whole link externally.
+export const registerCustomFooterLink = (link: any): void => {
+  customFooterLinks.push(link);
+};
+
+export const getCustomFooterLinks = (): any[] => customFooterLinks.map((Link: any, index: number) => <Link key={index} />);
diff --git a/packages/utils/src/general.ts b/packages/utils/src/general.ts
new file mode 100644
index 000000000..98552305f
--- /dev/null
+++ b/packages/utils/src/general.ts
@@ -0,0 +1,45 @@
+/* eslint max-len:0 */
+// @ts-ignore-line
+import { template as uTemplate, templateSettings } from 'underscore';
+import { AlertProps } from '@mui/material/Alert';
+import { SnackbarOrigin } from '@mui/material';
+
+templateSettings.interpolate = /\{\{(.+?)\}\}/g;
+
+export const isBoolean = (n: any): boolean => typeof n === 'boolean';
+
+export const cloneObj = <T>(obj: object): T => JSON.parse(JSON.stringify(obj));
+
+export const template = (str: string, params: object): string => {
+  const compiled = uTemplate(str);
+  return compiled(params);
+};
+
+export const isValidEmail = (email: string): boolean =>
+  /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/.test(
+    email
+  );
+
+let toastRef: any;
+export const initToast = (ref: any): void => {
+  toastRef = ref;
+};
+
+export type ToastType = {
+  message: string;
+  type: AlertProps['severity'];
+  verticalPosition?: SnackbarOrigin['vertical'];
+  horizontalPosition?: SnackbarOrigin['horizontal'];
+  autoHideDuration?: number;
+};
+
+export const addToast = (toast: ToastType): void => {
+  toastRef.add(toast);
+};
+
+let tourComponents: any;
+export const setTourComponents = (tour: any): void => {
+  tourComponents = tour;
+};
+
+export const getTourComponents = (): any => tourComponents;
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
new file mode 100644
index 000000000..5644574a1
--- /dev/null
+++ b/packages/utils/src/index.ts
@@ -0,0 +1,3 @@
+export * as langUtils from './lang';
+
+export { WeightedOptions } from './random';
diff --git a/packages/utils/src/lang.ts b/packages/utils/src/lang.ts
new file mode 100644
index 000000000..cade1e239
--- /dev/null
+++ b/packages/utils/src/lang.ts
@@ -0,0 +1,97 @@
+import { GDLocale } from '@generatedata/types';
+import C from '@generatedata/config/constants';
+
+// standalone location for the selected locale. Keeping this out of redux lets us just import it wherever
+let currentLocale: GDLocale;
+const langStrings: any = {};
+
+export const setLocale = (locale: GDLocale, localeStrings: any): void => {
+  currentLocale = locale;
+  langStrings[locale] = localeStrings;
+};
+
+export const getLocale = (): GDLocale => currentLocale;
+
+export const getStrings = (locale?: GDLocale): any => langStrings[locale || currentLocale];
+
+// use this for constructing JSX
+export const getI18n = (i18nString: string, placeholders: any[]): any => {
+  const parts = i18nString.split(/(%\d+)/);
+  const parsed: any = [];
+
+  parts.forEach((part) => {
+    if (/%\d+/.test(part)) {
+      const index = parseInt(part.replace('%', ''), 10) - 1;
+
+      if (index < placeholders.length) {
+        parsed.push(placeholders[index]);
+
+        // if there's no placeholder for this, just add the original value which looked like a placeholder
+      } else {
+        parsed.push(part);
+      }
+    } else {
+      parsed.push(part);
+    }
+  });
+
+  return parsed;
+};
+
+// use this getting a string
+export const getI18nString = (i18nString: string, placeholders: any[]): string => getI18n(i18nString, placeholders).join('');
+
+// looks at the current URL and figures out what locale is being used
+export const getCurrentPageLocale = (): GDLocale => {
+  const availableLocaleMap = getLocaleMap();
+  const path = window.location.pathname.replace(/^\//, '').split('/');
+
+  let locale = 'en';
+  if (path.length > 0 && availableLocaleMap[path[0]]) {
+    locale = path[0];
+  }
+
+  return locale as GDLocale;
+};
+
+const localeMap = Object.keys(C.GD_ALL_SUPPORTED_LOCALES).reduce((map: any, locale) => {
+  map[locale] = true;
+  return map;
+}, {});
+
+// just for O(1) lookup of our list of locale shortcodes
+export const getLocaleMap = (): any => localeMap;
+
+// returns the localized version of the current page. Note: this strips out any query strings right now.
+export const getCurrentLocalizedPath = (targetLocale: GDLocale): string => {
+  const availableLocaleMap = getLocaleMap();
+
+  // first, if the target locale being passed isn't valid, just return the current URL
+  const targetLocaleIsValid = !!availableLocaleMap[targetLocale];
+  if (!targetLocaleIsValid) {
+    return window.location.pathname;
+  }
+
+  const path = window.location.pathname
+    .replace(/^\//, '')
+    .replace(/\/$/, '')
+    .split('/')
+    .filter((path) => !!path);
+
+  const currentPathHasLocale = !!availableLocaleMap[path[0]];
+  if (path.length > 0 && currentPathHasLocale) {
+    path.shift();
+  }
+
+  let newPath = '';
+  if (targetLocale === 'en') {
+    newPath = `/${path.join('/')}`;
+  } else {
+    newPath = `/${targetLocale}`;
+    if (path.length > 0) {
+      newPath += `/${path.join('/')}`;
+    }
+  }
+
+  return newPath;
+};
diff --git a/packages/utils/src/number.ts b/packages/utils/src/number.ts
new file mode 100644
index 000000000..404f48bf8
--- /dev/null
+++ b/packages/utils/src/number.ts
@@ -0,0 +1,41 @@
+import { GDLocale } from '@generatedata/types';
+import { getLocale } from './lang';
+
+export const getFormattedNum = (num: number, locale: GDLocale = getLocale()): string => {
+  return Intl.NumberFormat(locale).format(num);
+};
+
+// @ts-ignore
+export const isNumeric = (n: any): boolean => !isNaN(parseFloat(n)) && isFinite(n);
+
+// based on a JS port of the PHP number_format() method: https://locutus.io/php/strings/number_format/
+export const numberFormat = (number: number, decimals = 0, decPoint = '.', thousandsSep = ','): string => {
+  const n = !isFinite(+number) ? 0 : +number;
+  const prec = !isFinite(+decimals) ? 0 : Math.abs(decimals);
+  const sep = typeof thousandsSep === 'undefined' ? ',' : thousandsSep;
+  const dec = typeof decPoint === 'undefined' ? '.' : decPoint;
+
+  const toFixedFix = (num: number, precision: number): any => {
+    if (('' + num).indexOf('e') === -1) {
+      return +(Math.round(Number(n + 'e+' + precision)) + 'e-' + precision);
+    } else {
+      const arr = ('' + n).split('e');
+      let sig = '';
+      if (+arr[1] + prec > 0) {
+        sig = '+';
+      }
+      return (+(Math.round(Number(+arr[0] + 'e' + sig + (+arr[1] + precision))) + 'e-' + precision)).toFixed(precision);
+    }
+  };
+
+  const s = (prec ? toFixedFix(n, prec).toString() : '' + Math.round(n)).split('.');
+  if (s[0].length > 3) {
+    s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, sep);
+  }
+  if ((s[1] || '').length < prec) {
+    s[1] = s[1] || '';
+    s[1] += new Array(prec - s[1].length + 1).join('0');
+  }
+
+  return s.join(dec);
+};
diff --git a/packages/utils/src/random.ts b/packages/utils/src/random.ts
new file mode 100644
index 000000000..8f6c39d39
--- /dev/null
+++ b/packages/utils/src/random.ts
@@ -0,0 +1,163 @@
+export const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+export const lowercaseLetters = letters.toLowerCase();
+export const consonants = 'BCDFGHJKLMNPQRSTVWXYZ';
+export const lowercaseConsonants = consonants.toLowerCase();
+export const vowels = 'AEIOU';
+export const lowercaseVowels = vowels.toLowerCase();
+export const hex = '0123456789ABCDEF';
+
+// TODO should accommodate negative numbers
+export const getRandomNum = (min: number, max: number): number => {
+  const range = Math.abs(max - min);
+  let val = Math.round(Math.random() * range);
+  if (min < 0) {
+    val -= Math.abs(min);
+  } else {
+    val += Math.abs(min);
+  }
+  return val;
+};
+
+export const getRandomBool = (): boolean => Math.random() < 0.5;
+export const getRandomArrayValue = <T>(arr: T[]): T => arr[Math.floor(Math.random() * arr.length)];
+export const getRandomCharInString = (str: string): string => {
+  const index = getRandomNum(0, str.length - 1);
+  return str[index];
+};
+
+export const defaultPlaceholders = {
+  X: '123456789',
+  x: '0123456789',
+  L: letters,
+  l: lowercaseLetters,
+  D: letters + lowercaseLetters,
+  C: consonants,
+  c: lowercaseConsonants,
+  E: consonants + lowercaseConsonants,
+  V: vowels,
+  v: lowercaseVowels,
+  F: vowels + lowercaseVowels,
+  H: hex
+};
+
+/**
+ * Converts the following characters in the parameter string and returns the random string.
+ *     C, c, E - any consonant (Upper case, lower case, any)
+ *     V, v, F - any vowel (Upper case, lower case, any)
+ *     L, l, D - any letter (Upper case, lower case, any)
+ *     X       - 1-9
+ *     x       - 0-9
+ *     H       - 0-F
+ */
+export const generateRandomAlphanumericStr = (str: string, placeholders: any = defaultPlaceholders): string => {
+  if (!str) {
+    return '';
+  }
+  let newStr = '';
+  for (let i = 0, j = str.length; i < j; i++) {
+    if (placeholders.hasOwnProperty(str[i])) {
+      newStr += placeholders[str[i]][getRandomNum(0, placeholders[str[i]].length - 1)];
+    } else {
+      newStr += str[i];
+    }
+  }
+  return newStr.trim();
+};
+
+// Returns a random subset of an array of a particular size. The result may be empty, or the same set.
+export const getRandomSubset = <T>(arr: T[], size: number): T[] => {
+  const shuffled = arr.slice(0);
+  let totalArrSize = arr.length;
+  const min = totalArrSize - size;
+
+  while (totalArrSize-- > min) {
+    const index = Math.floor((totalArrSize + 1) * Math.random());
+    const temp = shuffled[index];
+    shuffled[index] = shuffled[totalArrSize];
+    shuffled[totalArrSize] = temp;
+  }
+  return shuffled.slice(min);
+};
+
+export const getRandomWeightedSubset = (options: WeightedOptions, size: number, allowDuplicates: boolean): string[] => {
+  const subset: string[] = [];
+  const weightedOptions = {
+    ...options
+  };
+  let totalArrSize = Object.keys(weightedOptions).length;
+
+  if (!totalArrSize) {
+    return subset;
+  }
+
+  while (subset.length < size && totalArrSize > 0) {
+    const value = getRandomWeightedValue(weightedOptions);
+    subset.push(value);
+    if (!allowDuplicates) {
+      delete weightedOptions[value];
+      totalArrSize = totalArrSize - 1;
+    }
+  }
+
+  return subset;
+};
+
+/**
+ * Generates a string of words from a source array of strings.
+ */
+export const generateRandomTextStr = (words: string[], fromStart: boolean, min: number, max?: number): string => {
+  let numWords = max ? getRandomNum(min, max) : min;
+
+  const totalWords = words.length;
+  if (numWords > totalWords) {
+    numWords = totalWords;
+  }
+
+  if (numWords === 0) {
+    return '';
+  }
+
+  if (fromStart) {
+    return words.slice(0, numWords).join(' ');
+  } else {
+    const offset = getRandomNum(0, totalWords - numWords);
+    return words.slice(offset, offset + numWords).join(' ');
+  }
+};
+
+export const generatePlaceholderStr = (str: string, customPlaceholders: any): string => {
+  const placeholders = {
+    ...defaultPlaceholders,
+    ...customPlaceholders
+  };
+  return generateRandomAlphanumericStr(str, placeholders);
+};
+
+export type WeightedOptions = {
+  [option: string]: number;
+};
+
+// pass in an object like { a: 10, b: 4, c: 400 } and it'll return either "a", "b", or "c", factoring in their respective
+// weight. So in this example, "c" is likely to be returned 400 times out of 414
+export const getRandomWeightedValue = (options: WeightedOptions): string => {
+  const keys = Object.keys(options);
+  const totalSum = keys.reduce((acc, item) => acc + options[item], 0);
+
+  let runningTotal = 0;
+  const cumulativeValues = keys.map((key) => {
+    const relativeValue = options[key] / totalSum;
+    const cv = {
+      key,
+      value: relativeValue + runningTotal
+    };
+    runningTotal += relativeValue;
+    return cv;
+  });
+
+  if (keys.length === 0) {
+    return '';
+  }
+
+  const r = Math.random();
+  return cumulativeValues.find(({ value }) => r <= value)!.key;
+};
diff --git a/packages/utils/src/string.ts b/packages/utils/src/string.ts
new file mode 100644
index 000000000..b69e8b998
--- /dev/null
+++ b/packages/utils/src/string.ts
@@ -0,0 +1,45 @@
+/* eslint max-len:0 */
+export const lipsum =
+  'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.';
+const words = lipsum.split(/\s+/);
+const numWords = words.length;
+
+export const getLipsumWords = (): { words: string[]; numWords: number } => ({
+  words,
+  numWords
+});
+
+export const uppercaseWords = (str: string): string =>
+  str.replace(/\w\S*/g, (txt) => txt.charAt(0).toUpperCase() + txt.slice(1).toLowerCase());
+
+export const toSentenceCase = (str: string): string =>
+  str
+    .toLowerCase()
+    .replace(/[a-z]/i, (letter) => letter.toUpperCase())
+    .trim();
+
+export const getUniqueString = (str: string, existingStrings: string[]): string => {
+  if (existingStrings.indexOf(str) === -1) {
+    return str;
+  }
+  let currNum = 1;
+  while (existingStrings.indexOf(`${str}${currNum}`) !== -1) {
+    currNum++;
+  }
+  return `${str}${currNum}`;
+};
+
+export const reverse = (s: string): string => s.split('').reverse().join('');
+
+export const padString = (val: number | string, length: number): string => {
+  let str = '' + val;
+  while (str.length < length) {
+    str = '0' + str;
+  }
+  return str;
+};
+
+export const trimChars = (str: string, c: string) => {
+  const re = new RegExp(`^[${c}]+|[${c}]+$`, 'g');
+  return str.replace(re, '');
+};
diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json
new file mode 100644
index 000000000..85b4b5469
--- /dev/null
+++ b/packages/utils/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./dist",
+    "target": "esnext",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "declaration": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "types": ["node", "jest"],
+    "jsx": "react-jsx"
+  }
+}
diff --git a/plugins/countries/Australia/Australia.class.php b/plugins/countries/Australia/Australia.class.php
deleted file mode 100644
index cc312cd56..000000000
--- a/plugins/countries/Australia/Australia.class.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_Australia extends CountryPlugin {
-	protected $countryName = "Australia";
-	protected $countrySlug = "australia";
-	protected $regionNames = "Australian St./Terr.";
-	protected $continent = "oceania";
-
-	protected $extendedData = array(
-		"zipFormat" => array(
-			"format" => "Xxxx",
-			"replacements" => array(
-				"X" => "123456789",
-				"x" => "0123456789"
-			)
-		),
- 		"phoneFormat" => array(
-			"displayFormats" => array(
-				"xxxx-xxxx",
-				"(0x) xxxx xxxx",
-				"04xx xxx xxx"
-			)
-		)
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => "Australian Capital Territories",
-			"regionShort" => "AC",
-			"regionSlug" => "australian_capital_territories",
-			"weight" => 3,
-			"cities" => array(
-				"Canberra"
-			)
-		),
-		array(
-			"regionName" => "New South Wales",
-			"regionShort" => "NS",
-			"regionSlug" => "new_south_wales",
-			"weight" => 69,
-			"cities" => array(
-				"Sydney", "Albury", "Armidale", "Bathurst", "Blue Mountains", "Broken Hill",
-				"Campbelltown", "Cessnock", "Dubbo", "Goulburn", "Grafton", "Lithgow",
-				"Liverpool", "Newcastle", "Orange", "Parramatta", "Penrith", "Queanbeyan",
-				"Tamworth", "Wagga Wagga", "Wollongong"
-			)
-		),
-		array(
-			"regionName" => "Northern Territory",
-			"regionShort" => "NT",
-			"regionSlug" => "northern_territory",
-			"weight" => 2,
-			"cities" => array(
-				"Darwin", "Palmerston"
-			)
-		),
-		array(
-			"regionName" => "Queensland",
-			"regionShort" => "QL",
-			"regionSlug" => "queensland",
-			"weight" => 42,
-			"cities" => array(
-				"Brisbane", "Bundaberg", "Cairns", "Caloundra", "Charters Towers", "Gladstone", "Gold Coast",
-				"Hervey Bay", "Ipswich", "Logan City", "Mackay", "Maryborough", "Mount Isa", "Redcliffe",
-				"Redlands", "Rockhampton", "Toowoomba", "Townsville"
-			)
-		),
-		array(
-			"regionName" => "South Australia",
-			"regionShort" => "SA",
-			"regionSlug" => "south_australia",
-			"weight" => 16,
-			"cities" => array(
-				"Adelaide", "Mount Gambier", "Murray Bridge", "Port Augusta", "Port Pirie", "Port Lincoln",
-				"Victor Harbor", "Whyalla"
-			)
-		),
-		array(
-			"regionName" => "Tasmania",
-			"regionShort" => "TA",
-			"regionSlug" => "tasmania",
-			"weight" => 5,
-			"cities" => array(
-				"Greater Hobart", "Burnie", "Devonport", "Launceston"
-			)
-		),
-		array(
-			"regionName" => "Victoria",
-			"regionShort" => "VI",
-			"regionSlug" => "victoria",
-			"weight" => 52,
-			"cities" => array(
-				"Melbourne", "Ararat", "Bairnsdale", "Benalla", "Ballarat", "Bendigo", "Belgrave",
-				"Dandenong", "Frankston", "Geelong", "Hamilton", "Horsham", "Melton", "Moe", "Morwell",
-				"Mildura", "Sale", "Shepparton", "Swan Hill", "Traralgon", "Wangaratta", "Warrnambool",
-				"Wodonga"
-			)
-		),
-		array(
-			"regionName" => "Western Australia",
-			"regionShort" => "WA",
-			"regionSlug" => "western_australia",
-			"weight" => 21,
-			"cities" => array(
-				"Perth", "Albany", "Armadale", "Bayswater", "Belmont", "Bunbury", "Canning", "Cockburn",
-				"Fremantle", "Geraldton-Greenough", "Gosnells", "Joondalup", "Kalgoorlie-Boulder", "Mandurah",
-				"Melville", "Nedlands", "Rockingham", "South Perth", "Stirling", "Subiaco", "Swan", "Wanneroo"
-			)
-		)
-	);
-
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
diff --git a/plugins/countries/Austria/Austria.class.php b/plugins/countries/Austria/Austria.class.php
deleted file mode 100644
index e5f24bb99..000000000
--- a/plugins/countries/Austria/Austria.class.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_Austria extends CountryPlugin {
-	protected $countryName = "Austria";
-	protected $countrySlug = "austria";
-	protected $regionNames = "Austrian states";
-	protected $continent = "europe";
-
-	protected $extendedData = array(
-		"zipFormat" => "Xxxx"
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => "Vienna",
-			"regionShort" => "Wien",
-			"regionSlug" => "vienna",
-			"weight" => 4113,
-			"cities" => array(
-				"Vienna"
-			)
-		),
-		array(
-			"regionName" => "Vorarlberg",
-			"regionShort" => "Vbg.",
-			"regionSlug" => "voralberg",
-			"weight" => 142,
-			"cities" => array(
-				"Dornbirn", "Feldkirch", "Bregenz", "Lustenau", "Hohenems", "Bludenz", "Hard", "Rankweil",
-				"Götzis", "Lauterach", "Wolfurt", "Höchst",	"Altach"
-			)
-		),
-		array(
-			"regionName" => "Upper Austria",
-			"regionShort" => "OÖ.",
-			"regionSlug" => "upper_austria",
-			"weight" => 117,
-			"cities" => array(
-				"Linz", "Wels", "Steyr", "Leonding", "Traun", "Braunau am Inn", "Ansfelden", "Bad Ischl",
-				"Gmunden", "Marchtrenk", "Vöcklabruck", "Ried im Innkreis", "Enns", "Altmünster", "Laakirchen",
-				"Sierning"
-			)
-		),
-		array(
-			"regionName" => "Lower Austria",
-			"regionShort" => "NÖ.",
-			"regionSlug" => "lower_austria",
-			"weight" => 84,
-			"cities" => array(
-				"St. Pölten", "Wiener Neustadt", "Klosterneuburg", "Baden", "Krems an der Donau",
-				"Amstetten", "Mödling", "Traiskirchen", "Schwechat", "Stockerau", "Tulln an der Donau",
-				"Ternitz", "Perchtoldsdorf", "Korneuburg", "Neunkirchen", "Hollabrunn", "Waidhofen an der Ybbs",
-				"Bad Vöslau", "Brunn am Gebirge", "Zwettl-Niederösterreich"
-			)
-		),
-		array(
-			"regionName" => "Salzburg",
-			"regionShort" => "Sbg.",
-			"regionSlug" => "salzburg",
-			"weight" => 74,
-			"cities" => array(
-				"Salzburg", "Hallein", "Saalfelden am Steinernen Meer", "Wals-Siezenheim", "Sankt Johann im Pongau",
-				"Bischofshofen"
-			)
-		),
-		array(
-			"regionName" => "Styria",
-			"regionShort" => "Stm.",
-			"regionSlug" => "styria",
-			"weight" => 73,
-			"cities" => array(
-				"Graz", "Leoben", "Kapfenberg", "Bruck an der Mur", "Knittelfeld", "Köflach", "Voitsberg",
-				"Judenburg", "Weiz"
-			)
-		),
-		array(
-			"regionName" => "Burgenland",
-			"regionShort" => "Bgl.",
-			"regionSlug" => "burgenland",
-			"weight" => 72,
-			"cities" => array(
-				"Eisenstadt", "Oberwart", "Neusiedl am See", "Mattersburg", "Pinkafeld", "Neudörfl", "Parndorf",
-				"Jennersdorf", "Güssing", "Gols", "Großpetersdorf", "Neufeld an der Leitha", "Deutschkreutz",
-				"Rechnitz", "Oberpullendorf", "Siegendorf", "Pöttsching", "Bruckneudorf", "Frauenkirchen",
-				"Forchtenstein"
-			)
-		),
-		array(
-			"regionName" => "Carinthia",
-			"regionShort" => "Ktn.",
-			"regionSlug" => "carinthia",
-			"weight" => 59,
-			"cities" => array(
-				"Klagenfurt", "Villach", "Wolfsberg", "Spittal an der Drau", "Feldkirchen in Kärnten", "St. Veit an der Glan",
-				"Völkermarkt", "St. Andrä", "Velden am Wörther See", "Finkenstein am Faaker See", "Ebenthal in Kärnten",
-				"Ferlach"
-			)
-		),
-		array(
-			"regionName" => "Tyrol",
-			"regionShort" => "Tirol",
-			"regionSlug" => "tyrol",
-			"weight" => 56,
-			"cities" => array(
-				"Innsbruck", "Kufstein", "Telfs", "Schwaz", "Hall in Tirol", "Wörgl", "Lienz", "Imst", "Rum", "St. Johann in Tirol",
-				"Kitzbühel", "Zirl", "Landeck"
-			)
-		),
-	);
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
diff --git a/plugins/countries/Belgium/Belgium.class.php b/plugins/countries/Belgium/Belgium.class.php
deleted file mode 100644
index 7ff96aa31..000000000
--- a/plugins/countries/Belgium/Belgium.class.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_Belgium extends CountryPlugin {
-	protected $countryName = "Belgium";
-	protected $countrySlug = "belgium";
-	protected $regionNames = "Belgium Prov.";
-	protected $continent = "europe";
-
-	protected $extendedData = array(
-		"zipFormat" => "Xxxx"
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => "Antwerpen",
-			"regionShort" => "AN",
-			"regionSlug" => "antwerpen",
-			"weight" => 1,
-			"cities" => array(
-				"Antwerpen", "Burcht", "Zwijndrecht", "Deurne", "Wijnegem", "Borgerhout", "Borsbeek", "Wommelgem", "Merksem",
-				"Ekeren", "Herentals", "Morkhoven", "Noorderwijk", "Hallaar", "Heist-op-den-Berg", "Booischot", "Itegem",
-				"Wiekevorst", "Schriek", "Herselt", "Ramsel", "Houtvenne", "Hulshout", "Westmeerbeek", "Massenhoven", "Viersel",
-				"Zandhoven", "Pulderbos", "Pulle", "Olen", "Oevel", "Tongerlo", "Westerlo", "Zoerle-Parwijs", "Herenthout",
-				"Gierle", "Lille", "Poederlee", "Wechelderzande", "Grobbendonk", "Bouwel", "Vorselaar", "Turnhout", "Rijkevorsel",
-				"Hoogstraten", "Meer", "Minderhout", "Wortel", "Meerle", "Merksplas", "Beerse", "Vlimmeren", "Vosselaar",
-				"Oud-Turnhout", "Arendonk", "Ravels", "Weelde", "Poppel", "Baarle-Hertog", "Malle", "Oostmalle", "Westmalle",
-				"Mol", "Eindhout", "Laakdal", "Vorst", "Varendonk", "Veerle", "Geel", "Meerhout", "Kasterlee", "Lichtaart",
-				"Tielen", "Retie", "Dessel", "Balen", "Olmen", "Koningshooikt", "Lier", "Broechem", "Emblem", "Oelegem", "Ranst",
-				"Boechout", "Vremde", "Hove", "Lint", "Kontich", "Waarloos", "Bevel", "Kessel", "Nijlen", "Duffel", "Beerzel"
-			)
-		),
-		array(
-			"regionName" => "Brussels Hoofdstedelijk Gewest",
-			"regionShort" => "BU",
-			"regionSlug" => "brussels_hoofdstedelijk_gewest",
-			"weight" => 1,
-			"cities" => array(
-				"Brussel", "Laken", "Schaarbeek", "Etterbeek", "Elsene", "Sint-Gillis", "Anderlecht", "Sint-Jans-Molenbeek",
-				"Koekelberg", "Sint-Agatha-Berchem", "Ganshoren", "Jette", "Neder-Over-Heembeek", "Haren", "Evere",
-				"Sint-Pieters-Woluwe", "Oudergem", "Watermaal-Bosvoorde", "Ukkel", "Vorst", "Sint-Lambrechts-Woluwe",
-				"Sint-Joost-ten-Node"
-			)
-		),
-		array(
-			"regionName" => "Waals-Brabant",
-			"regionShort" => "WB",
-			"regionSlug" => "waals_brabant",
-			"weight" => 1,
-			"cities" => array(
-				"Limal", "Waver", "Bierges", "La Hulpe", "Glimes", "Incourt", "Opprebais", "Pi�trebais", "Roux-Miroir",
-				"Beauvechain", "Hamme-Mille", "l'Ecluse", "Nodebais", "Tourinnes-la-Grosse", "Bonlez", "Chaumont-Gistoux",
-				"Corroy-le-Grand", "Dion-Valmont", "Longueville", "Rixensart", "Rosi�res", "Genval", "Ottignies",
-				"Ottignies-Louvain-la-Neuve", "C�roux-Mousty", "Limelette", "Louvain-la-Neuve", "Enines", "Folx-les-Caves",
-				"Jandrain-Jandrenouille", "Jauche", "Marilles", "Noduwez", "Orp-Jauche", "Orp-le-Grand", "H�l�cine",
-				"Linsmeau", "Neerheylissem", "Opheylissem", "Mal�ves-Sainte-Marie-Wastines", "Orbais", "Perwez",
-				"Thorembais-les-B�guines", "Thorembais-Saint-Trond", "Autre-Eglise", "Bomal", "Geest-G�rompont-Petit-Rosi�re",
-				"G�rompont", "Grand-Rosi�re-Hottomont", "Huppaye", "Mont-Saint-Andr�", "Ramillies", "Dongelberg", "Jauchelette",
-				"Jodoigne", "Jodoigne-Souveraine", "Lathuy", "M�lin", "Pi�train", "Saint-Jean-Geest", "Saint-Remy-Geest",
-				"Z�trud-Lumay", "Couture-Saint-Germain", "Lasne", "Lasne-Chapelle-Saint-Lambert", "Maransart", "Ohain",
-				"Plancenoit", "Archennes", "Graven Grez-Doiceau", "Biez", "Bossut-Gottechain", "Nethen", "Monstreux",
-				"Nivelles", "Baulers", "Thines", "Bornival", "Waterloo", "Promo-Control", "Eigenbrakel",
-				"Ophain-Bois-Seigneur-Isaac", "Lillois-Witterz�e", "Bierk Bierghes", "Roosbeek", "Quenast", "Rebecq",
-				"Corbais", "H�villers", "Mont-Saint-Guibert", "Kasteelbrakel", "Woutersbrakel", "Chastre",
-				"Chastre-Villeroux-Blanmont", "Cortil-Noirmont", "Gentinnes", "Saint-G�ry", "Nil-Saint-Vincent-Saint-Martin",
-				"Tourinnes-Saint-Lambert", "Walhain", "Walhain-Saint-Paul", "Itter", "Virginal-Samme", "Haut-Ittre", "Genappe",
-				"Baisy-Thy", "Bousval", "Loupoigne", "Vieux-Genappe", "Glabais", "Ways", "Houtain-le-Val", "Klabbeek",
-				"Oostkerk", "Sint-Renelde Saintes", "Tubeke Tubize", "Court-Saint-Etienne", "Marbais", "Mellery",
-				"Sart-Dames-Avelines", "Tilly", "Villers-la-Ville"
-			)
-		),
-		array(
-			"regionName" => "Vlaams-Brabant",
-			"regionShort" => "VB",
-			"regionSlug" => "vlaams_brabant",
-			"weight" => 1,
-			"cities" => array(
-				"Halle", "Buizingen", "Lembeek", "Herfelingen", "Herne", "Sint-Pieters-Kapelle", "Bever Bievene", "Hoeilaart",
-				"Galmaarden", "Tollembeek", "Vollezele", "Oudenaken", "Sint-Laureins-Berchem", "Sint-Pieters-Leeuw", "Ruisbroek",
-				"Vlezenbeek", "Drogenbos", "Linkebeek", "Sint-Genesius-Rode", "Beersel", "Lot", "Alsemberg", "Dworp", "Huizingen",
-				"Bogaarden", "Heikruis", "Pepingen", "Elingen", "Beert", "Bellingen", "Dilbeek", "Sint-Martens-Bodegem",
-				"Sint-Ulriks-Kapelle", "Itterbeek", "Groot-Bijgaarden", "Schepdaal", "Asse", "Bekkerzeel", "Kobbegem", "Mollem",
-				"Relegem", "Zellik", "Ternat", "Wambeek", "Sint-Katherina-Lombeek", "Mazenzele", "Opwijk", "Gaasbeek", "Lennik",
-				"Sint-Kwintens-Lennik", "Sint-Martens-Lennik", "Gooik", "Kester", "Leerbeek", "Oetingen", "Onze-Lieve-Vrouw-Lombeek",
-				"Pamel", "Roosdaal", "Strijtem", "Borchtlombeek", "Liedekerke", "Wemmel", "Brussegem", "Hamme", "Merchtem", "Affligem",
-				"Essene", "Hekelgem", "Teralfene", "Peutie", "Vilvoorde", "Cargovil", "VTM", "Melsbroek", "Perk", "Steenokkerzeel",
-				"Machelen", "Diegem", "Londerzeel", "Malderen", "Steenhuffel", "Grimbergen", "Humbeek", "Beigem", "Strombeek-Bever",
-				"Meise", "Wolvertem", "Kapelle-op-den-Bos", "Nieuwenrode", "Ramsdonk", "Berg", "Buken", "Kampenhout", "Nederokkerzeel",
-				"Nossegem", "Zaventem", "Brucargo", "Sint-Stevens-Woluwe", "Sterrebeek", "Brussel X-Luchthaven Remailing"
-			)
-		),
-		array(
-			"regionName" => "Luik",
-			"regionShort" => "LU",
-			"regionSlug" => "luik",
-			"weight" => 1,
-			"cities" => array(
-				"Glain", "Luik", "Rocourt", "Bressoux", "Jupille-sur-Meuse", "Li�ge", "Wandre", "Grivegn�e", "Li�ge", "Angleur",
-				"Herstal", "Milmort", "Vottem", "Liers", "Chaudfontaine", "Vaux-sous-Ch�vremont", "Beaufays", "Embourg", "B.S.D.",
-				"Boncelles", "Seraing", "Jemeppe-sur-Meuse", "Ougr�e", "Ehein", "Neupr�", "Rotheux-Rimi�re", "Neuville-en-Condroz",
-				"Plainevaux", "Esneux", "Tilff", "Dolembreux", "Gomz�-Andoumont", "Rouvreux", "Sprimont", "Louveign�", "Anthisnes",
-				"Villers-aux-Tours", "Hody", "Tavier", "Comblain-au-Pont", "Poulseur", "Comblain-Fairon", "Comblain-la-Tour", "Hamoir",
-				"Filot", "Ferri�res", "My", "Vieuxville", "Werbomont", "Xhoris", "Burdinne", "Hann�che", "Lamontz�e", "Marneffe",
-				"Oteppe", "H�ron", "Lavoir", "Waret-l'Ev�que", "Couthuin", "Acosse", "Ambresin", "Meeffe", "Wasseiges", "Bo�lhe",
-				"Geer", "Hollogne-sur-Geer", "Lens-Saint-Servais", "Omal", "Darion", "Ligney", "Berloz", "Corswarem", "Rosoux-Crenwick",
-				"Avennes", "Braives", "Ciplet", "Fallais", "Fumal", "Ville-en-Hesbaye", "Latinne", "Tourinne", "Abolens",
-				"Avernas-le-Bauduin", "Avin", "Bertr�e", "Blehen", "Cras-Avernas", "Crehen", "Grand-Hallet", "Hannut", "Lens-Saint-Remy",
-				"Merdorp", "Moxhe", "Petit-Hallet", "Poucet", "Thisnes", "Trogn�e", "Villers-le-Peuplier", "Wansin"
-			)
-		),
-		array(
-			"regionName" => "Namen",
-			"regionShort" => "NA",
-			"regionSlug" => "namen",
-			"weight" => 1,
-			"cities" => array(
-				"Beez", "Namen", "Belgrade", "Saint-Servais", "Saint-Marc", "Bouge", "Champion", "Daussoulx", "Flawinne",
-				"Malonne", "Suarlee", "Temploux", "Vedrin", "Boninne", "Cognelee", "Gelbressee", "Marche-les-Dames", "Beuzet",
-				"Ernage", "Gembloux", "Grand-Manil", "Lonzee", "Sauveni�re", "Grand-Leez", "Bossi�re", "Bothey", "Corroy-le-Ch�teau",
-				"Isnes", "Mazy", "Arsimont", "Auvelais", "Falisolle", "Keumiee", "Moignelee", "Sambreville", "Tamines",
-				"Velaine-sur-Sambre", "Aisemont", "Fosses-la-Ville", "Sart-Eustache", "Vitrival", "Emines", "Rhisnes",
-				"Villers-lez-Heest", "Warisoulx", "Bovesse", "Meux", "Saint-Denis-Bovesse", "Dave", "Jambes", "Naninne", "Wepion",
-				"Wierde", "Erpe", "Lives-sur-Meuse", "Loy", "Boignee", "Ligny", "Sombreffe", "Tongrinne", "Floreffe", "Floriffoux",
-				"Soye", "Arbre", "Bois-de-Villers", "Lesve", "Lustin", "Profondeville", "Rivi�re", "Bal�tre", "Ham-sur-Sambre",
-				"Jemeppe-sur-Sambre", "Mornimont", "Moustier-sur-Sambre", "Onoz", "Saint-Martin", "Spy", "Andenne", "Bonneville",
-				"Coutisse", "Landenne", "Maizeret", "Sclayn", "Seilles", "Thon", "Vezin", "Bolinne", "Boneffe", "Branchon", "Dhuy",
-				"Eghezee", "Hanret", "Leuze", "Liernu"
-			)
-		),
-		array(
-			"regionName" => "Henegouwen",
-			"regionShort" => "HE",
-			"regionSlug" => "henegouwen",
-			"weight" => 1,
-			"cities" => array(
-				"Charleroi", "Marcinelle", "Couillet", "Dampremy", "Goutroux", "Marchienne-au-Pont", "Monceau-sur-Sambre",
-				"Mont-sur-Marchienne", "Jumet", "Gosselies", "Lodelinsart", "Ransart", "Roux", "Gilly", "Montignies-sur-Sambre",
-				"Montigny-le-Tilleul", "Landelies", "Cour-sur-Heure", "Ham-sur-Heure", "Ham-sur-Heure-Nalinnes", "Jamioulx",
-				"Marbaix", "Nalinnes", "Fontaine-l'Ev�que", "Forchies-la-Marche", "Leernes", "Anderlues", "Courcelles",
-				"Gouy-lez-Pi�ton", "Souvret", "Trazegnies", "Bouffioulx", "Ch�telet", "Ch�telineau", "Frasnes-lez-Gosselies",
-				"Les Bons Villers", "R�ves", "Villers-Perwin", "Wayaux", "Mellet", "Fleurus", "Heppignies", "Lambusart", "Brye",
-				"Wagnel�e", "Wanferc�e-Baulet", "Buzet", "Obaix", "Pont-�-Celles", "Thim�on", "Viesville", "Liberchies", "Luttre",
-				"Farciennes", "Pironchamps", "Aiseau", "Aiseau-Presles", "Pont-de-Loup", "Presles", "Roselies", "Acoz", "Gerpinnes",
-				"Gougnies", "Joncret", "Loverval", "Villers-Poterie", "Boussu-lez-Walcourt", "Fourbechies", "Froidchapelle",
-				"Vergnies", "Erpion", "Baili�vre", "Chimay", "Robechies", "Saint-Remy", "Salles", "Villers-la-Tour", "Virelles",
-				"Vaulx-lez-Chimay", "Lompret", "Baileux", "Bourlers", "Forges", "l'Escaill�re", "Ri�zes", "Grandrieu", "Montbliart",
-				"Rance", "Sautin", "Sivry", "Sivry-Rance", "Beaumont", "Leugnies", "Leval-Chaudeville", "Renlies", "Solre-Saint-G�ry",
-				"Thirimont", "Str�e", "Leers-et-Fosteau", "Thuin", "Biesme-sous-Thuin", "Ragnies", "Bierc�e", "Goz�e", "Donstiennes",
-				"Thuillies", "Lobbes", "Mont-Sainte-Genevi�ve", "Sars-la-Buissi�re", "Bienne-lez-Happart", "Bersillies-l'Abbaye",
-				"Erquelinnes", "Grand-Reng", "Hantes-Wih�ries", "Montignies-Saint-Christophe", "Solre-sur-Sambre", "Fontaine-Valmont",
-				"Labuissi�re", "Merbes-le-Ch�teau", "Merbes-Sainte-Marie", "Momignies", "Macon", "Monceau-Imbrechies", "Macquenoise",
-				"Beauwelz", "Forge-Philippe", "Seloignes", "Bergen Mons", "Ghlin", "Fl�nu", "Jemappes", "Maisi�res", "Nimy", "Havr�"
-			)
-		),
-		array(
-			"regionName" => "Luxemburg",
-			"regionShort" => "LX",
-			"regionSlug" => "luxemburg",
-			"weight" => 1,
-			"cities" => array(
-				"Bastogne", "Longvilly", "Noville", "Villers-la-Bonne-Eau", "Wardin", "Martelange", "Fauvillers", "Hollange",
-				"Tintange", "Hompr�", "Morhet", "Nives", "Sibret", "Vaux-lez-Rosieres", "Vaux-sur-Sure", "Juseret", "Houffalize",
-				"Nadrin", "Mont", "Tailles", "Tavigny", "Mabompr�", "Wibrin", "Gouvy", "Limerl�", "Bovigny", "Beho", "Cherain",
-				"Montleban", "Amberloup", "Sainte-Ode", "Tillet", "Lavacherie", "Flamierge", "Bertogne", "Longchamps", "Bihain",
-				"Vielsalm", "Petit-Thier", "Grand-Halleux", "Arlon", "Bonnert", "Heinsch", "Toernich", "Guirsch", "Autelbas",
-				"Attert", "Nobressart", "Nothomb", "Thiaumont", "Tontelange", "Habay", "Habay-la-Neuve", "Hachy", "Anlier",
-				"Habay-la-Vieille", "Houdemont", "Rulles", "Bellefontaine", "Rossignol", "Saint-Vincent", "Tintigny", "Etalle",
-				"Sainte-Marie-sur-Semois", "Villers-sur-Semois", "Vance", "Chantemelle", "Buzenol", "Ch�tillon", "Meix-le-Tige",
-				"Saint-L�ger", "Musson", "Mussy-la-Ville", "Signeulx", "Bleid", "Ethe", "Ruette", "Virton", "Latour", "Saint-Mard",
-				"Dampicourt", "Harnoncourt", "Lamorteau", "Rouvroy", "Torgny", "G�rouville", "Meix-Devant-Virton", "Robelmont",
-				"Sommethonne", "Villers-la-Loue", "Hondelange", "Messancy", "Wolkrange", "S�lange", "Habergy", "Aubange",
-				"Athus", "Halanzy", "Rachecourt", "Bras", "Freux", "Libramont-Chevigny", "Moircy", "Recogne", "Remagne",
-				"Sainte-Marie-Chevigny", "Saint-Pierre", "Chiny", "Izel", "Jamoigne", "Les Bulles", "Suxy", "Termes",
-				"Florenville", "Fontenoille", "Muno"
-			)
-		),
-		array(
-			"regionName" => "West-Vlaanderen",
-			"regionShort" => "WV",
-			"regionSlug" => "west_vlaanderen",
-			"weight" => 1,
-			"cities" => array(
-				"Brugge Bruges", "Koolkerke", "Hertsberge", "Oostkamp", "Ruddervoorde", "Waardamme", "Sint-Andries",
-				"Sint-Michiels", "Loppem", "Veldegem", "Zedelgem", "Aartrijke", "Knokke", "Knokke-Heist", "Westkapelle",
-				"Heist-aan-Zee", "Ramskapelle", "Assebroek", "Sint-Kruis", "Damme", "Hoeke", "Lapscheure", "Moerkerke",
-				"Oostkerke", "Sijsele", "Blankenberge", "Uitkerke", "Houtave", "Meetkerke", "Nieuwmunster", "Zuienkerke",
-				"Dudzele", "Lissewege", "Zeebrugge", "Oostende", "Stene", "Zandvoorde", "De Haan", "Klemskerke", "Wenduine",
-				"Vlissegem", "Middelkerke", "Wilskerke", "Leffinge", "Mannekensvere", "Schore", "Sint-Pieters-Kapelle",
-				"Slijpe", "Spermalie", "Lombardsijde", "Westende", "Bredene", "Ettelgem", "Oudenburg", "Roksem", "Westkerke",
-				"Gistel", "Moere", "Snaaskerke", "Zevekote", "Bekegem", "Eernegem", "Ichtegem", "Jabbeke", "Snellegem",
-				"Stalhille", "Varsenare", "Zerkegem", "Kortrijk", "Bissegem", "Heule", "Bellegem", "Kooigem", "Marke",
-				"Rollegem", "Aalbeke", "Kuurne", "Harelbeke", "Bavikhove", "Hulste", "Deerlijk", "Zwevegem", "Heestert", "Moen",
-				"Otegem", "Sint-Denijs", "Gullegem", "Moorsele", "Wevelgem", "Anzegem", "Gijzelbrechtegem", "Ingooigem", "Vichte",
-				"Kaster", "Tiegem", "Avelgem", "Kerkhove", "Waarmaarde", "Outrijve", "Bossuit", "Helkijn", "Spiere",
-				"Spiere-Helkijn", "Beerst", "Diksmuide", "Driekapellen", "Esen", "Kaaskerke", "Keiem", "Lampernisse", "Leke",
-				"Nieuwkapelle", "Oostkerke", "Oudekapelle"
-			)
-		),
-		array(
-			"regionName" => "Oost-Vlaanderen",
-			"regionShort" => "OV",
-			"regionSlug" => "oost_vlaanderen",
-			"weight" => 1,
-			"cities" => array(
-				"Gent", "Mariakerke", "Drongen", "Wondelgem", "Sint-Amandsberg", "Oostakker", "Desteldonk", "Mendonk", "Sint-Kruis-Winkel",
-				"Gentbrugge", "Ledeberg", "Afsnee", "Sint-Denijs-Westrem", "Zwijnaarde", "Zelzate", "Destelbergen", "Heusden",
-				"Beervelde", "Lochristi", "Zaffelare", "Zeveneken", "Gontrode", "Melle", "Nieuwkerken-Waas", "Sint-Niklaas",
-				"Belsele", "Sinaai-Waas", "Beveren", "Haasdonk", "Kallo", "Melsele", "Vrasene", "Doel", "Kallo", "Kieldrecht",
-				"Verrebroek", "Elversele", "Steendorp", "Temse", "Tielrode", "Bazel", "Kruibeke", "Rupelmonde", "Daknam", "Eksaarde",
-				"Lokeren", "De Klinge", "Meerdonk", "Sint-Gillis-Waas", "Sint-Pauwels", "Moerbeke", "Wachtebeke", "Kemzeke", "Stekene",
-				"Appels", "Baasrode", "Dendermonde", "Grembergen", "Mespelare", "Oudegem", "Schoonaarde", "Sint-Gillis-bij-Dendermonde",
-				"Hamme", "Moerzeke", "Massemen", "Westrem", "Wetteren", "Zele", "Waasmunster", "Buggenhout", "Opdorp", "Schellebelle",
-				"Serskamp", "Wichelen", "Kalken", "Laarne", "Denderbelle", "Lebbeke", "Wieze", "Berlare", "Overmere", "Uitbergen",
-				"Aalst", "Gijzegem", "Hofstade", "Baardegem", "Herdersem", "Meldert", "Moorsel", "Erembodegem", "Nieuwerkerken", "Impe",
-				"Lede", "Oordegem", "Smetlede", "Wanzele", "Appelterre-Eichem", "Denderwindeke", "Lieferinge", "Nederhasselt"
-			)
-		)
-	);
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
diff --git a/plugins/countries/Brazil/Brazil.class.php b/plugins/countries/Brazil/Brazil.class.php
deleted file mode 100644
index e2e15c2c4..000000000
--- a/plugins/countries/Brazil/Brazil.class.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_Brazil extends CountryPlugin {
-	protected $countryName = "Brazil";
-	protected $countrySlug = "brazil";
-	protected $regionNames = "Brazilian States";
-	protected $continent = "south_america";
-
-	protected $extendedData = array(
-		"zipFormat" => array(
-			"format" => "xxxxx-xxx",
-			"replacements" => array(
-				"X" => "123456789",
-				"x" => "0123456789",
-				"Y" => "012345678",
-				"W" => "01234567",
-				"V" => "0123456",
-				"U" => "012345",
-				"T" => "01234",
-				"S" => "0123",
-				"R" => "678",
-				"Q" => "89",
-				"P" => "3456"
-			)
-		)
-	);
-
-
-	protected $countryData = array(
-		array(
-			"regionName" => "São Paulo",
-			"regionShort" => "SP",
-			"regionSlug" => "sau_paulo",
-			"weight" => 41,
-			"cities" => array(
-				"Guarulhos", "Campinas", "Osasco", "Ribeirão Preto", "Mauá", "Mogi das Cruzes", "Diadema",
-				"Jundiaí", "Carapicuíba", "Piracicaba"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "1Xxxx-xxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Minas Gerais",
-			"regionShort" => "MG",
-			"regionSlug" => "minas_gerais",
-			"weight" => 20,
-			"cities" => array(
-				"Belo Horizonte", "Uberlândia", "Contagem", "Juiz de Fora", "Betim", "Montes Claros",
-				"Ribeirão das Neves", "Uberaba", "Governador Valadares", "Ipatinga", "Sete Lagoas",
-				"Divinópolis", "Santa Luzia"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "3xxxxxxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Rio de Janeiro",
-			"regionShort" => "RJ",
-			"regionSlug" => "rio",
-			"weight" => 16,
-			"cities" => array(
-				"Rio de Janeiro", "São Gonçalo", "Duque de Caxias", "Nova Iguaçu", "Niterói", "Belford Roxo",
-				"Campos dos Goytacazes", "São João de Meriti", "Petrópolis"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "2Yxxx-xxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Bahia",
-			"regionShort" => "BA",
-			"regionSlug" => "bahia",
-			"weight" => 14,
-			"cities" => array(
-				"Salvador", "Feira de Santana", "Vitória da Conquista", "Camaçari", "Itabuna",
-				"Juazeiro", "Ilhéus", "Lauro de Freitas"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "4Yxxx-xxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Rio Grande do Sul",
-			"regionShort" => "RS",
-			"regionSlug" => "rio_grande",
-			"weight" => 11,
-			"cities" => array(
-				"Porto Alegre", "Caxias do Sul", "Pelotas", "Canoas", "Santa Maria", "Gravataí",
-				"Novo Hamburgo", "Rio Grande"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "9xxxx-xxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Paraná",
-			"regionShort" => "PR",
-			"regionSlug" => "parana",
-			"weight" => 11,
-			"cities" => array(
-				"Curitiba", "Londrina", "Maringá", "Ponta Grossa", "Cascavel", "São José dos Pinhais",
-				"Foz do Iguaçu", "Colombo", "Guarapuava", "Paranaguá"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "8Wxxx-xxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Pernambuco",
-			"regionShort" => "PE",
-			"regionSlug" => "pernambuco",
-			"weight" => 9,
-			"cities" => array(
-				"Recife", "Jaboatão dos Guararapes", "Olinda", "Caruaru", "Paulista", "Petrolina",
-				"Cabo de Santo Agostinho", "Camaragibe"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "5Vxxx-xxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Ceará",
-			"regionShort" => "CE",
-			"regionSlug" => "ceara",
-			"weight" => 9,
-			"cities" => array(
-				"Fortaleza", "Caucaia", "Juazeiro do Norte", "Maracanaú", "Sobral", "Crato",
-				"Itapipoca", "Maranguape"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "6Sxxx-xxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Pará",
-			"regionShort" => "PA",
-			"regionSlug" => "para",
-			"weight" => 8,
-			"cities" => array(
-				"Belém", "Ananindeua", "Santarém", "Marabá", "Castanhal", "Parauapebas",
-				"Abaetetuba", "Cametá", "Bragança"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "6RYxx-xxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Maranhão",
-			"regionShort" => "MA",
-			"regionSlug" => "maranhao",
-			"weight" => 7,
-			"cities" => array(
-				"São Luís", "Imperatriz", "Timon", "Caxias", "Codó", "Paço do Lumiar", "Açailândia",
-				"Bacabal", "Santa Inês", "Balsas", "Chapadinha", "Barra do Corda"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "65xxx-xxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Santa Catarina",
-			"regionShort" => "SC",
-			"regionSlug" => "santa_catarina",
-			"weight" => 6,
-			"cities" => array(
-				"Joinville", "Florianópolis", "Blumenau", "São José", "Criciúma", "Chapecó", "Itajaí"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "8Qxxx-xxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Goiás",
-			"regionShort" => "GO",
-			"regionSlug" => "goias",
-			"weight" => 6,
-			"cities" => array(
-				"Goiânia", "Aparecida de Goiânia", "Anápolis", "Rio Verde", "Luziânia",
-				"Águas Lindas de Goiás", "Valparaíso de Goiás"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "7P7xx-xxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Paraíba",
-			"regionShort" => "PB",
-			"regionSlug" => "paraiba",
-			"weight" => 4,
-			"cities" => array(
-				"João Pessoa", "Campina Grande", "Santa Rita", "Patos",  "Bayeux", "Sousa", "Cajazeiras"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "58xxx-xxx"
-				)
-			)
-		)
-	);
-
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
diff --git a/plugins/countries/Canada/Canada.class.php b/plugins/countries/Canada/Canada.class.php
deleted file mode 100644
index a74b576e8..000000000
--- a/plugins/countries/Canada/Canada.class.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_Canada extends CountryPlugin {
-	protected $continent   = "north_america";
-	protected $countryName = "Canada";
-	protected $countrySlug = "CA";
-	protected $regionNames = "Canadian Provinces";
-
-	protected $extendedData = array(
-		// the general zip format for the country. This may be optionally overridden for each region if a more
-		// specific format is desired. To prevent duplicate code, the replacements listed here cover ALL zip formats
-		// for each province
-		"zipFormat" => array(
-			"format" => "%*@ *@*",
-			"replacements" => array(
-				"%" => "ABCEGHJKLMNPRSTVXY",
-				"*" => "0123456789",
-				"@" => "ABCEGHJKLMNPRSTVWXYZ",
-
-				// used in individual provinces below
-				"&" => "GHJ",
-				"^" => "KLMNP"
-			)
-		),
-
-		// the general phone format and area codes for the country
-		"phoneFormat" => array(
-			"areaCodes" => array(587, 603, 780, 205, 604, 778, 204, 431, 506, 709, 902, 867, 416, 647, 437, 519, 226, 613,
-				343, 705, 249, 807, 905, 289, 365, 902, 418, 581, 450, 579, 514, 438, 819, 873, 306),
-			"displayFormats" => array(
-				"(AAA) Xxx-xxxx",
-				"1 (AAA) Xxx-xxxx",
-				"1-AAA-Xxx-xxxx"
-			)
-		)
-	);
-
-	// our country-wide data, with info separated into regions
-	protected $countryData = array(
-		array(
-			"regionName" => "Alberta",
-			"regionShort" => "AB",
-			"regionSlug" => "alberta",
-			"weight" => 11,
-			"cities" => array(
-				"Airdrie", "Alix", "Banff", "Barrhead", "Bearberry", "Beaumont", "Bon Accord", "Bonnyville",
-				"Bonnyville Municipal District", "Bowden", "Breton", "Bruderheim", "Calgary", "Calmar", "Camrose",
-				"Canmore", "Carstairs", "Castor", "Chestermere", "Clearwater Municipal District", "Coaldale", "Coalhurst",
-				"Cochrane", "Crowsnest Pass", "Crystal Springs", "Devon", "Drayton Valley", "Drumheller", "Eckville",
-				"Edmonton", "Fahler", "Fort Saskatchewan", "Gibbons", "Glendon", "Grande Prairie", "Grande Cache",
-				"High Level", "Hines Creek", "Innisfail", "Irricana", "Jasper", "Kitscoty", "Lac La Biche County",
-				"Lac Ste. Anne", "Lacombe", "Lacombe County", "Lakeland County", "Lamont", "Leduc", "Legal", "Lloydminster",
-				"Lethbridge", "Mayerthorpe", "Medicine Hat", "Millet", "Morinville", "Mundare", "Nanton", "New Sarepta",
-				"Okotoks", "Oyen", "Provost", "Parkland County", "Penhold", "Picture Butte", "Pincher Creek", "Ponoka",
-				"Raymond", "Red Deer", "Redwater", "Rimbey", "Rocky Mountain House", "Rocky View", "Rycroft", "St. Albert",
-				"St. Paul", "Sedgewick", "Smoky Lake", "Spruce Grove", "Stirling", "Strathcona County", "Stony Plain", "Sundrie",
-				"Sunset Point", "Swan Hills", "Sylvan Lake", "Taber", "Tofield", "Trochu", "Valleyview", "Vegreville", "Vilna",
-				"Wabamun", "Warburg", "Warspite", "Westlock", "Wetaskiwin", "Wood Buffalo", "Woodlands County", "Yellowhead County"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "T*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(587, 603, 780)
-				)
-			)
-		),
-		array(
-			"regionName" => "British Columbia",
-			"regionShort" => "BC",
-			"regionSlug" => "british_columbia",
-			"weight" => 13,
-			"cities" => array(
-				"100 Mile House", "Abbotsford", "Alert Bay", "Armstrong", "Belcarra", "Burnaby", "Burns Lake", "Cache Creek",
-				"Cariboo Regional District", "Castlegar", "Chetwynd", "Chilliwack", "Coldstream", "Colwood", "Comox", "Coquitlam",
-				"Cranbrook", "Dawson Creek", "Delta", "Fernie", "Duncan", "Fort St. John", "Fraser Lake", "Fraser-Fort George",
-				"Gibsons", "Harrison Hot Springs", "Hope", "Houston", "Hudson's Hope", "Kelowna", "Kent", "Kimberly", "Kitimat",
-				"Lake Cowichan", "Langford", "Langley", "Lions Bay", "Mission", "Maple Ridge", "Merritt", "Midway", "Nanaimo",
-				"Nakusp", "Nelson", "New Westminster", "North Cowichan", "North Saanich", "North Vancouver", "Oliver",
-				"Pemberton", "Penticton", "Pitt Meadows", "Port Alice", "Port Coquitlam", "Port Moody", "Prince George",
-				"Qualicum Beach", "Richmond", "Salt Spring Island", "Silverton", "Smithers", "Sooke", "Sparwood", "Stewart",
-				"Sunshine Coast Regional District", "Surrey", "Terrance", "Tumbler Ridge", "Ucluelet", "Vancouver", "Vanderhoof",
-				"Victoria", "West Vancouver", "White Rock", "Williams Lake"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "V*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(205, 604, 778)
-				)
-			)
-		),
-		array(
-			"regionName" => "Manitoba",
-			"regionShort" => "MB",
-			"regionSlug" => "manitoba",
-			"weight" => 4,
-			"cities" => array(
-				'Winnipeg', 'Stonewall', 'Minitonas', 'Lourdes', 'Flin Flon', 'Daly', 'Brandon', 'Beausejour'
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "R*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(204, 431)
-				)
-			)
-		),
-		array(
-			"regionName" => "New Brunswick",
-			"regionShort" => "NB",
-			"regionSlug" => "new_brunswick",
-			"weight" => 2,
-			"cities" => array(
-				'Tracadie-Shelia', 'Sh�diac', 'Shippagan', 'Saint-L�onard', 'Saint John', 'Saint Andr�', 'Rothesay', 'Rexton',
-				'Quispamsis', 'Oromocto', 'New Maryland', 'Moncton', 'Miramichi', 'Grand Falls', 'Fredericton', 'Edmundston',
-				'Dieppe', 'Clare', 'Carlton'
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "E*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(506)
-				)
-			)
-		),
-		array(
-			"regionName" => "Newfoundland and Labrador",
-			"regionShort" => "NL",
-			"regionSlug" => "newfoundland_and_labrador",
-			"weight" => 2,
-			"cities" => array(
-				'St. John\'s', 'Springdale', 'Spaniard\'s Bay', 'Rigolet', 'Paradise', 'Mount Pearl', 'McCallum', 'Marystown',
-				'Harbour Grace', 'Glovertown', 'Gander', 'Fogo', 'Fortune', 'Carbonear', 'Burin', 'Bonavista', 'Bay Roberts'
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "A*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(709)
-				)
-			)
-		),
-		array(
-			"regionName" => "Northwest Territories",
-			"regionShort" => "NT",
-			"regionSlug" => "northwest_territories",
-			"weight" => 1,
-			"cities" => array(
-				"Yellowknife", "Wrigley", "Wha Ti", "Wekweti", "Tulita", "Tuktoyaktuk", "Tsiigehtchic", "Sachs Harbour",
-				"Rae Lakes", "Rae-Edzo", "Paulatuk", "Norman Wells", "Lutsel K'e", "Kakisa", "Inuvik", "Holman", "Hay River",
-				"Fort Smith", "Fort Simpson", "Fort Resolution", "Fort Providence", "Fort McPherson", "Fort Laird",
-				"Fort Good Hope", "Enterprise", "Deline", "Coleville Lake", "Aklavik"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "X*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(867)
-				)
-			)
-		),
-		array(
-			"regionName" => "Nova Scotia",
-			"regionShort" => "NS",
-			"regionSlug" => "nova_scotia",
-			"weight" => 1,
-			"cities" => array(
-				'Municipal District', 'Town of Yarmouth', 'Wolfville', 'Pugwash', 'Pictou', 'New Glasgow',
-				'Halifax', 'Guysborough', 'Cumberland County', 'Cape Breton Island', 'Berwick', 'Baddeck', 'Argyle',
-				'Annapolis Royal', 'Annapolis County'
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "B*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(902)
-				)
-			)
-		),
-		array(
-			"regionName" => "Nunavut",
-			"regionShort" => "NU",
-			"regionSlug" => "nunavut",
-			"weight" => 1,
-			"cities" => array(
-				"Arviat", "Cambridge Bay", "Gjoa Haven", "Pangnirtung", "Iqaluit"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "X*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(867)
-				)
-			)
-		),
-		array(
-			"regionName" => "Ontario",
-			"regionShort" => "ON",
-			"regionSlug" => "ontario",
-			"weight" => 39,
-			"cities" => array(
-				"Ajax", "Aurora", "Ancaster Town", "Barrie", "Bath", "Blind River", "Burlington", "Caledon", "Cobourg",
-				"Cornwall", "Cumberland", "East Gwillimbury", "Essex", "Etobicoke", "Gloucester", "Goderich", "Grey County",
-				"Guelph", "Hamilton", "Hearst", "Kapuskasing", "Kawartha Lakes", "Kearny", "King Township", "Kingston",
-				"Kitchener", "Lakeshore", "Lanark County", "LaSalle", "Leamington", "Malahide", "Markham",
-				"Merrickville-Wolford", "Midlands", "Township of Minden Hills", "Minto", "Newbury", "Newmarket",
-				"Norfolk County", "North Bay", "Northumberland", "Orangeville", "Orilla", "Osgoode", "Ottawa",
-				"Ottawa-Carleton", "Owen Sound", "Oxford County", "Pickering", "Port Hope", "Quinte West", "Ramara",
-				"Renfrew", "Richmond Hill", "Russell", "Scarborough", "St. Catharines", "St. Thomas", "Greater Sudbury",
-				"Tay", "Thorold", "Thunder Bay", "Toronto", "Valley East", "Vanier", "Vaughan", "Warwick", "Welland",
-				"Whitby", "Whitchurch-Stouffville", "Whitewater Region Township", "Wilmont", "Windsor", "Woodstock"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "^*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(416, 647, 437, 519, 226, 613, 343, 705, 249, 807, 905, 289, 365)
-				)
-			)
-		),
-		array(
-			"regionName" => "Prince Edward Island",
-			"regionShort" => "PE",
-			"regionSlug" => "prince_edward_island",
-			"weight" => 1,
-			"cities" => array(
-				"Charlottetown", "Montague", "Stratford"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "C*@ *@*"
-				),
-				"phoneFormats" => array(
-					"areaCodes" => array(902)
-				)
-			)
-		),
-		array(
-			"regionName" => "Quebec",
-			"regionShort" => "QC",
-			"regionSlug" => "quebec",
-			"weight" => 23,
-			"cities" => array(
-				"Amqui", "Cabano", "D�gelis", "La Matap�dia", "Price", "Rimouski", "Rivi�re-du-Loup", "Saint-Eug�ne-de-Ladri�re",
-				"Sainte-Flavie", "Alma", "Chambord", "Chicoutimi", "Jonqui�re", "La Baie", "Labrecque", "Saguenay", "Saint-Honor�",
-				"Saint-Prime", "Shipshaw", "Baie-Saint-Paul", "Beauport", "Cap-Rouge", "Deschambault", "Isle-aux-Coudres", "Lac-Serent",
-				"Malbaie", "Neuville", "Pointe-au-Pic", "Qu�bec City", "Saint-Hilarion", "Saint-Urbain", "Batiscan",
-				"Cap-de-la-Madeleine", "Champlain", "H�rouxville", "Pointe-du-Lac", "Saint-Georges", "Shawinigan", "Trois-Rivi�res",
-				"Asbestos", "Richmond", "Sherbrooke", "Valcourt", "Anjou", "Baie-d'Urf�", "Beaconsfield", "C�te-Saint-Luc",
-				"Dollard-des-Ormeaux", "Dorval", "Hampstead", "Kirkland", "Lachine", "LaSalle", "Montreal", "Outremont", "Pierrefonds",
-				"Pointe-aux-Trembles", "Pointe-Claire", "Roxboro", "Saint-Laurent", "Saint-L�onard", "Saint-Pierre", "Senneville",
-				"Verdun", "Westmount", "Aylmer", "Buckingham", "Cantley", "Chelsea", "Collines-de-l'Outaouais", "Gatineau", "Hull",
-				"Ville de Maniwaki", "Mansfield-et-Pontefract", "Montebello", "Montpellier", "Namur", "Notre-Dame-de-la-Salette",
-				"Shawville", "Thurso", "Dubuisson", "Malartic", "Notre-Dame-du-Nord", "Rouyn-Noranda", "Saint-Eug�ne-de-Guigues",
-				"Baie-Comeau", "Fermont", "Kawawachikamach", "Matagami", "Caplan", "Carleton", "Gasp�", "Gespeg", "Maria",
-				"Murdochville", "Cap-Saint-Ignace", "Charny", "L�vis"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "&*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(418, 581, 450, 579, 514, 438, 819, 873)
-				)
-			)
-		),
-		array(
-			"regionName" => "Saskatchewan",
-			"regionShort" => "SK",
-			"regionSlug" => "saskatchewan",
-			"weight" => 4,
-			"cities" => array(
-				"Assiniboia", "Calder", "Canora", "Estevan", "Gravelbourg", "Hudson Bay", "Lang", "Langenburg", "Lloydminster",
-				"Macklin", "Maple Creek", "Milestone", "Moose Jaw", "North Battleford", "Prince Albert", "Regina", "Saskatoon",
-				"Weyburn", "Yorkton"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "S*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(306)
-				)
-			)
-		),
-		array(
-			"regionName" => "Yukon",
-			"regionShort" => "YT",
-			"regionSlug" => "yukon",
-			"weight" => 1,
-			"cities" => array(
-				"Whitehorse", "Watson Lake"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "Y*@ *@*"
-				),
-				"phoneFormat" => array(
-					"areaCodes" => array(867)
-				)
-			)
-		)
-	);
-
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
diff --git a/plugins/countries/CostaRica/CostaRica.class.php b/plugins/countries/CostaRica/CostaRica.class.php
deleted file mode 100644
index f54d6ae4d..000000000
--- a/plugins/countries/CostaRica/CostaRica.class.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-/**
- * @package Countries
- *
- * @author Andre Fortin <andre.v.fortin@gmail.com>
- */
-
-class Country_CostaRica extends CountryPlugin {
-	protected $continent   = "central_america";
-	protected $countryName = "Costa Rica";
-	protected $countrySlug = "CR";
-	protected $regionNames = "Costa Rican Provinces";
-
-	protected $extendedData = array(
-		"zipFormat" => array(
-			"format" => "ZYxYx",
-			"replacements" => array(
-				"Z" => "1234567",
-				"Y" => "01",
-				"x" => "0123456789"
-			)
-		),
-		"phoneFormat" => array(
-			"displayFormats" => array(
-				"xxxxxxxx",
-				"xxxx-xxxx"
-			)
-		)
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => "Alajuela",
-			"regionShort" => "A",
-			"regionSlug" => "alajuela",
-			"weight" => 20,
-			"cities" => array(
-				"Alajuela", "Quesada", "San José de Alajuela", "San Rafael"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "2zxYx",
-					"replacements" => array(
-						"z" => "01",
-						"Y" => "01",
-						"x" => "0123456789"
-					)
-				),
-				"phoneFormat" => array(
-					"format" => "24xxxxxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Cartago",
-			"regionShort" => "C",
-			"regionSlug" => "cartago",
-			"weight" => 11,
-			"cities" => array(
-				"Aguacaliente (San Francisco)", "Carmen", "Cartago", "Paraíso", "San Diego", "San Nicolás",
-				"San Rafael", "Tejar", "Turrialba"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "30xYx",
-					"replacements" => array(
-						"Y" => "01",
-						"x" => "0123456789"
-					)
-				),
-				"phoneFormat" => array(
-					"format" => "25xxxxxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Guanacaste",
-			"regionShort" => "G",
-			"regionSlug" => "guanacaste",
-			"weight" => 8,
-			"cities" => array(
-				"Cañas", "Liberia", "Nicoya"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "5zxYx",
-					"replacements" => array(
-						"z" => "01",
-						"Y" => "01",
-						"x" => "0123456789"
-					)
-				),
-				"phoneFormat" => array(
-					"format" => "26xxxxxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Heredia",
-			"regionShort" => "H",
-			"regionSlug" => "heredia",
-			"weight" => 10,
-			"cities" => array(
-				"Heredia", "Mercedes", "San Francisco", "San Pablo", "Ulloa (Barrial)"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "4zxYx",
-					"replacements" => array(
-						"z" => "01",
-						"Y" => "01",
-						"x" => "0123456789"
-					)
-				),
-				"phoneFormat" => array(
-					"format" => "25xxxxxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Limón",
-			"regionShort" => "L",
-			"regionSlug" => "limón",
-			"weight" => 2,
-			"cities" => array(
-				"Guápiles", "Limón (Puerto Limón)", "Siquirres"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "50yYx",
-					"replacements" => array(
-						"y" => "12",
-						"Y" => "01",
-						"x" => "0123456789"
-					)
-				),
-				"phoneFormat" => array(
-					"format" => "27xxxxxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "Puntarenas",
-			"regionShort" => "P",
-			"regionSlug" => "puntarenas",
-			"weight" => 2,
-			"cities" => array(
-				"Barranca", "Puntarenas"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "ZYxYx",
-					"replacements" => array(
-						"Z" => "1234567",
-						"Y" => "01",
-						"x" => "0123456789"
-					)
-				),
-				"phoneFormat" => array(
-					"format" => "27xxxxxx"
-				)
-			)
-		),
-		array(
-			"regionName" => "San José",
-			"regionShort" => "SJ",
-			"regionSlug" => "san_josé",
-			"weight" => 33,
-			"cities" => array(
-				"Alajuelita", "Aserrí", "Calle Blancos", "Cinco Esquinas", "Concepción", "Curridabat", "Desamparados", "Gravilias", "Guadalupe", "Ipís",
-				"Mata de Plátano", "Patalillo", "Patarrá", "Purral", "San Antonio", "San Felipe", "San Isidro", "San Isidro de El General",	"San José",
-				"San Juan (San Juan de Tibás)", "San Juan de Dios", "San Miguel", "San Pedro", "San Rafael", "San Rafael Abajo", "San Vicente", "Tirrases"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "1zxYx",
-					"replacements" => array(
-						"z" => "012",
-						"Y" => "01",
-						"x" => "0123456789"
-					)
-				),
-				"phoneFormat" => array(
-					"format" => "25xxxxxx"
-				)
-			)
-		)
-	);
-
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
diff --git a/plugins/countries/France/France.class.php b/plugins/countries/France/France.class.php
deleted file mode 100644
index 4b077f116..000000000
--- a/plugins/countries/France/France.class.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_France extends CountryPlugin {
-	protected $countryName = "France";
-	protected $countrySlug = "france";
-	protected $regionNames = "Régions Françaises";
-	protected $continent = "europe";
-
-	protected $extendedData = array(
-		"zipFormat" => "xxxxx"
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => "Île-de-France",
-			"regionShort" => "IL",
-			"regionSlug" => "ile_de_france",
-			"weight" => 18.3,
-			"cities" => array(
-				"Paris", "Boulogne-Billancourt", "Saint-Denis", "Argenteuil", "Montreuil", "Créteil", "Nanterre",
-				"Courbevoie", "Versailles", "Vitry-sur-Seine", "Colombes", "Asnières-sur-Seine", "Aulnay-sous-Bois",
-				"Rueil-Malmaison", "Aubervilliers", "Champigny-sur-Marne", "Saint-Maur-des-Fossés", "Drancy",
-				"Issy-les-Moulineaux", "Levallois-Perret", "Noisy-le-Grand"
-			)
-		),
-		array(
-			"regionName" => "Provence-Alpes-Côte d'Azur",
-			"regionShort" => "PR",
-			"regionSlug" => "provence_alpes",
-			"weight" => 9.6,
-			"cities" => array(
-				"Marseille", "Nice", "Toulon", "Aix-en-Provence", "Avignon", "Antibes", "Cannes", "La Seyne-sur-Mer",
-				"Hyères", "Arles", "Fréjus", "Grasse", "Martigues", "Cagnes-sur-Mer", "Aubagne", "Salon-de-Provence",
-				"Istres", "Le Cannet", "Gap", "Draguignan", "Vitrolles"
-			)
-		),
-		array(
-			"regionName" => "Nord-Pas-de-Calais",
-			"regionShort" => "NO",
-			"regionSlug" => "nord_pas_de_calais",
-			"weight" => 7.6,
-			"cities" => array(
-				"Lille", "Roubaix", "Dunkerque", "Tourcoing", "Calais", "Villeneuve-d'Ascq", "Valenciennes", "Boulogne-sur-Mer",
-				"Douai", "Arras", "Wattrelos", "Marcq-en-Baroeul", "Lens", "Cambrai", "Liévin", "Maubeuge", "Lambersart",
-				"Hénin-Beaumont", "Béthune"
-			)
-		),
-		array(
-			"regionName" => "Pays de la Loire",
-			"regionShort" => "PA",
-			"regionSlug" => "pays_de_la_loire",
-			"weight" => 6.3,
-			"cities" => array(
-				"Nantes", "Angers", "Le Mans", "Saint-Nazaire", "Cholet", "La Roche-sur-Yon", "Laval", "Saint-Herblain",
-				"Rezé", "Saumur", "Saint-Sébastien-sur-Loire", "Orvault", "Vertou"
-			)
-		),
-		array(
-			"regionName" => "Aquitaine",
-			"regionShort" => "AQ",
-			"regionSlug" => "aquitaine",
-			"weight" => 5.5,
-			"cities" => array(
-				"Bordeaux", "Pau", "Mérignac", "Pessac", "Bayonne", "Talence", "Anglet", "Agen", "Mont-de-Marsan",
-				"Périgueux", "Villenave-d'Ornon", "Saint-Médard-en-Jalles", "Bergerac", "Biarritz", "Bègles"
-			)
-		),
-		array(
-			"regionName" => "Bretagne",
-			"regionShort" => "BR",
-			"regionSlug" => "bretagne",
-			"weight" => 4.9,
-			"cities" => array(
-				"Rennes", "Brest", "Quimper", "Lorient", "Vannes", "Saint-Malo", "Saint-Brieuc", "Lanester"
-			)
-		),
-		array(
-			"regionName" => "Midi-Pyrénées",
-			"regionShort" => "MI",
-			"regionSlug" => "midi_pyrenees",
-			"weight" => 4.4,
-			"cities" => array(
-				"Toulouse", "Montauban", "Albi", "Tarbes", "Castres", "Colomiers", "Tournefeuille", "Rodez"
-			)
-		),
-		array(
-			"regionName" => "Languedoc-Roussillon",
-			"regionShort" => "LA",
-			"regionSlug" => "languedoc_rousillon",
-			"weight" => 4.1,
-			"cities" => array(
-				"Montpellier", "Nîmes", "Perpignan", "Béziers", "Narbonne", "Carcassonne", "Sète", "Alès", "Lunel"
-			)
-		),
-		array(
-			"regionName" => "Centre",
-			"regionShort" => "CE",
-			"regionSlug" => "centre",
-			"weight" => 4,
-			"cities" => array(
-				"Tours", "Orléans", "Bourges", "Blois", "Châteauroux", "Chartres", "Joué-lès-Tours", "Dreux", "Vierzon"
-			)
-		),
-		array(
-			"regionName" => "Lorraine",
-			"regionShort" => "LO",
-			"regionSlug" => "lorraine",
-			"weight" => 3.7,
-			"cities" => array(
-				"Metz", "Nancy", "Thionville", "Épinal", "Vandoeuvre-lès-Nancy", "Montigny-lès-Metz", "Sarreguemines",
-				"Forbach", "Saint-Dié-des-Vosges"
-			)
-		),
-		array(
-			"regionName" => "Picardie",
-			"regionShort" => "PI",
-			"regionSlug" => "picardie",
-			"weight" => 3,
-			"cities" => array(
-				"Amiens", "Saint-Quentin", "Beauvais", "Compiègne", "Creil", "Soissons", "Laon", "Abbeville"
-			)
-		),
-		array(
-			"regionName" => "Alsace",
-			"regionShort" => "AL",
-			"regionSlug" => "alsace",
-			"weight" => 2.9,
-			"cities" => array(
-				"Strasbourg", "Mulhouse", "Colmar", "Haguenau", "Schiltigheim", "Illkirch-Graffenstaden", "Saint-Louis"
-			)
-		),
-		array(
-			"regionName" => "Haute-Normandie",
-			"regionShort" => "HA",
-			"regionSlug" => "haute_normandie",
-			"weight" => 2.8,
-			"cities" => array(
-				"Le Havre", "Rouen", "Évreux", "Dieppe", "Sotteville-lès-Rouen", "Saint-Étienne-du-Rouvray", "Vernon",
-				"Le Grand-Quevilly", "Le Petit-Quevilly"
-			)
-		),
-		array(
-			"regionName" => "Poitou-Charentes",
-			"regionShort" => "PO",
-			"regionSlug" => "poitou_charentes",
-			"weight" => 2.7,
-			"cities" => array(
-				"Poitiers", "La Rochelle", "Niort", "Angoulême", "Châtellerault", "Saintes"
-			)
-		),
-		array(
-			"regionName" => "Bourgogne",
-			"regionShort" => "BO",
-			"regionSlug" => "bourgogne",
-			"weight" => 2.6,
-			"cities" => array(
-				"Dijon", "Chalon-sur-Saône", "Nevers", "Auxerre", "Mâcon", "Sens"
-			)
-		),
-		array(
-			"regionName" => "Basse-Normandie",
-			"regionShort" => "BA",
-			"regionSlug" => "basse_normandie",
-			"weight" => 2.3,
-			"cities" => array(
-				"Caen", "Cherbourg-Octeville", "Alençon", "Lisieux", "Hérouville-Saint-Clair", "Saint-Lô"
-			)
-		),
-		array(
-			"regionName" => "Auvergne",
-			"regionShort" => "AU",
-			"regionSlug" => "auvergne",
-			"weight" => 2.1,
-			"cities" => array(
-				"Clermont-Ferrand", "Montluçon", "Aurillac", "Vichy", "Moulins", "Le Puy-en-Velay"
-			)
-		),
-		array(
-			"regionName" => "Champagne-Ardenne",
-			"regionShort" => "CH",
-			"regionSlug" => "champagne_ardenne",
-			"weight" => 2.1,
-			"cities" => array(
-				"Reims", "Troyes", "Charleville-Mézières", "Châlons-en-Champagne", "Saint-Dizier", "Épernay"
-			)
-		),
-		array(
-			"regionName" => "Franche-Comté",
-			"regionShort" => "FC",
-			"regionSlug" => "franche_comte",
-			"weight" => 1.8,
-			"cities" => array(
-				"Besançon", "Belfort", "Montbéliard", "Dole", "Pontarlier"
-			)
-		),
-		array(
-			"regionName" => "Limousin",
-			"regionShort" => "LI",
-			"regionSlug" => "limousin",
-			"weight" => 1.1,
-			"cities" => array(
-				"Limoges", "Brive-la-Gaillarde"
-			)
-		),
-		array(
-			"regionName" => "Corse",
-			"regionShort" => "CO",
-			"regionSlug" => "corse",
-			"weight" => 0.5,
-			"cities" => array(
-				"Ajaccio", "Bastia"
-			)
-		)
-	);
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
\ No newline at end of file
diff --git a/plugins/countries/Germany/Germany.class.php b/plugins/countries/Germany/Germany.class.php
deleted file mode 100644
index 336518db7..000000000
--- a/plugins/countries/Germany/Germany.class.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_Germany extends CountryPlugin {
-	protected $countryName = "Germany";
-	protected $countrySlug = "germany";
-	protected $regionNames = "German States";
-	protected $continent = "europe";
-
-	protected $extendedData = array(
-		"zipFormat" => "xxxxx"
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => "Baden",
-			"regionShort" => "BW",
-			"regionSlug" => "baden",
-			"weight" => 301,
-			"cities" => array(
-				"Stuttgart", "Mannheim", "Karlsruhe", "Freiburg", "Heidelberg", "Heilbronn", "Ulm", "Pforzheim", "Reutlingen",
-				"Esslingen", "T�bingen", "Ludwigsburg", "Konstanz", "Villingen-Schwennin", "Aalen", "Sindelfingen", "Schw�bisch Gm�nd",
-				"Friedrichshafen", "Offenburg", "G�ppingen", "Baden-Baden", "Waiblingen", "Ravensburg", "L�rrach", "Heidenheim",
-				"Rastatt", "B�blingen"
-			)
-		),
-		array(
-			"regionName" => "Bavaria",
-			"regionShort" => "BY",
-			"regionSlug" => "bavaria",
-			"weight" => 178,
-			"cities" => array(
-				"Munich", "Nuremberg", "Augsburg", "Regensburg", "W�rzburg", "Ingolstadt", "F�rth", "Erlangen",
-				"Bayreuth", "Bamberg", "Aschaffenburg", "Landshut", "Kempten", "Rosenheim", "Neu-Ulm", "Schweinfurt",
-				"Passau", "Hof", "Freising", "Straubing"
-			)
-		),
-		array(
-			"regionName" => "Berlin",
-			"regionShort" => "BE",
-			"regionSlug" => "berlin",
-			"weight" => 3890,
-			"cities" => array(
-				"Berlin"
-			)
-		),
-		array(
-			"regionName" => "Brandenburg",
-			"regionShort" => "BB",
-			"regionSlug" => "brandenburg",
-			"weight" => 85,
-			"cities" => array(
-				"Potsdam", "Cottbus", "Brandenburg", "Frankfurt", "Oranienburg", "Falkensee", "Eberswalde-Finow",
-				"Bernau", "K�nigs Wusterhausen", "Schwedt", "F�rstenwalde", "Neuruppin", "Eisenh�ttenstadt", "Senftenberg",
-				"Strausberg", "Hennigsdorf", "Blankenfelde-Mahlow", "Rathenow", "Hohen Neuendorf", "Ludwigsfelde", "Spremberg",
-				"Werder", "Teltow", "Wandlitz", "Luckenwalde", "Forst", "Kleinmachnow", "Prenzlau", "Panketal", "Guben"
-			)
-		),
-		array(
-			"regionName" => "Bremen",
-			"regionShort" => "HB",
-			"regionSlug" => "bremen",
-			"weight" => 1577,
-			"cities" => array(
-				"Bremen", "Bremerhaven"
-			)
-		),
-		array(
-			"regionName" => "Hamburg",
-			"regionShort" => "HH",
-			"regionSlug" => "hamburg",
-			"weight" => 2368,
-			"cities" => array(
-				"Hamburg"
-			)
-		),
-		array(
-			"regionName" => "Hesse",
-			"regionShort" => "HE",
-			"regionSlug" => "hesse",
-			"weight" => 287,
-			"cities" => array(
-				"Frankfurt am Main", "Wiesbaden", "Kassel", "Darmstadt", "Offenbach am Main", "Hanau", "Marburg", "Gie�en", "Fulda",
-				"R�sselsheim", "Wetzlar", "Bad Homburg v. d. H�he", "Rodgau", "Oberursel", "Dreieich", "Maintal", "Bensheim",
-				"Hofheim am Taunus", "Neu-Isenburg", "Langen", "Limburg a.d. Lahn", "Dietzenbach", "Lampertheim", "M�rfelden-Walldorf",
-				"Viernheim", "Bad Hersfeld", "Bad Nauheim", "Taunusstein", "Baunatal", "Kelkheim", "Bad Vilbel", "Friedberg",
-				"M�hlheim am Main", "R�dermark", "Heppenheim", "Dillenburg", "Pfungstadt", "Hattersheim am Main", "Butzbach",
-				"Friedrichsdorf", "Obertshausen", "Korbach", "Griesheim", "Gro�-Gerau", "Weiterstadt", "Eschwege"
-			)
-		),
-		array(
-			"regionName" => "Lower Saxony",
-			"regionShort" => "NI",
-			"regionSlug" => "lower_saxony",
-			"weight" => 166,
-			"cities" => array(
-				"Hannover", "Braunschweig", "Osnabr�ck", "Oldenburg", "Wolfsburg", "G�ttingen", "Hildesheim", "Salzgitter", "Wilhelmshaven",
-				"Delmenhorst", "L�neburg", "Celle", "Garbsen", "Hameln", "Wolfenb�ttel", "Nordhorn", "Langenhagen", "Emden", "Lingen",
-				"Cuxhaven", "Peine", "Stade", "Melle", "Neustadt am R�benberge", "Lehrte", "Seevetal", "Gifhorn", "Wunstorf", "Goslar"
-			)
-		),
-		array(
-			"regionName" => "Mecklenburg-Vorpommern",
-			"regionShort" => "MV",
-			"regionSlug" => "meckleburg",
-			"weight" => 71,
-			"cities" => array(
-				"Anklam", "Bergen", "Greifswald", "G�strow", "Neubrandenburg", "Neustrelitz", "Parchim	City", "Ribnitz-Damgarten",
-				"Rostock", "Schwerin", "Stralsund", "Waren", "Wismar"
-			)
-		),
-		array(
-			"regionName" => "North Rhine-Westphalia",
-			"regionShort" => "NW",
-			"regionSlug" => "westphalia",
-			"weight" => 523,
-			"cities" => array(
-				"K�ln", "D�sseldorf", "Dortmund", "Essen", "Duisburg", "Bochum", "Wuppertal", "Bonn", "Bielefeld", "M�nster", "Aachen",
-				"M�nchengladbach", "Gelsenkirchen", "Krefeld", "Oberhausen", "Hagen", "Hamm", "M�lheim", "Herne", "Leverkusen", "Solingen",
-				"Neuss", "Paderborn", "Recklinghausen", "Bottrop", "Remscheid", "Bergisch Gladbach"
-			)
-		),
-		array(
-			"regionName" => "Rhineland-Palatinate",
-			"regionShort" => "RP",
-			"regionSlug" => "rhineland",
-			"weight" => 202,
-			"cities" => array(
-				"Mainz", "Ludwigshafen", "Koblenz", "Trier", "Kaiserslauter", "Worms", "Neuwied", "Neustadt", "Speyer", "Frankenthal",
-				"Bad Kreuznach", "Landau", "Pirmasens", "Zweibr�cken", "Idar-Oberstei", "Andernach", "Bad Neuenahr-Ahrweiler",
-				"Bingen", "Ingelheim", "Germersheim", "Ha�loch", "Schifferstadt", "Bad D�rkheim"
-			)
-		),
-		array(
-			"regionName" => "Saarland",
-			"regionShort" => "SL",
-			"regionSlug" => "saarland",
-			"weight" => 400,
-			"cities" => array(
-				"Saarbr�cken", "Neunkirchen", "Homburg", "V�lklingen", "Sankt Ingbert", "Saarlouis", "Merzig", "Sankt Wendel",
-				"Blieskastel", "Dillingen", "Lebach", "P�ttlingen", "Heusweiler", "Wadgassen", "Bexbach", "Schwalbach", "Sulzbach"
-			)
-		),
-		array(
-			"regionName" => "Saxony",
-			"regionShort" => "SN",
-			"regionSlug" => "saxony",
-			"weight" => 227,
-			"cities" => array(
-				"Leipzig", "Dresden", "Chemnitz", "Zwickau", "Plauen", "G�rlitz", "Freiberg", "Bautzen", "Freital", "Pirna",
-				"Hoyerswerda", "Radebeul", "Riesa", "Grimma", "Zittau", "Mei�en", "Delitzsch", "Limbach-Oberfrohna", "Markkleeberg", "Glauchau"
-			)
-		),
-		array(
-			"regionName" => "Saxony-Anhalt",
-			"regionShort" => "ST",
-			"regionSlug" => "saxony_anhalt",
-			"weight" => 116,
-			"cities" => array(
-				"Halle", "Magdeburg", "Dessau", "Wittenberg", "Bitterfeld-Wolfen", "Stendal", "Halberstadt", "Wei�enfels", "Bernburg",
-				"Merseburg", "Wernigerode", "Naumburg", "Sch�nebeck", "Zeitz", "Sangerhausen", "Aschersleben", "Quedlinburg", "Sta�furt",
-				"K�then", "Eisleben", "Salzwedel", "Burg"
-			)
-		),
-		array(
-			"regionName" => "Schleswig-Holstein",
-			"regionShort" => "SH",
-			"regionSlug" => "saarland",
-			"weight" => 179,
-			"cities" => array(
-				"Kiel", "L�beck", "Flensburg", "Neum�nster", "Norderstedt", "Elmshorn", "Pinneberg", "Itzehoe", "Wedel", "Ahrensburg",
-				"Geesthacht", "Rendsburg", "Henstedt-Ulzburg", "Reinbek", "Bad Oldesloe", "Schleswig", "Eckernf�rde", "Husum", "Heide",
-				"Quickborn"
-			)
-		)
-	);
-
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
\ No newline at end of file
diff --git a/plugins/countries/India/India.class.php b/plugins/countries/India/India.class.php
deleted file mode 100644
index 1cee10099..000000000
--- a/plugins/countries/India/India.class.php
+++ /dev/null
@@ -1,398 +0,0 @@
-<?php
-
-/**
- * @package Countries
- *
- * @author Fareez Ahamed <fareez.ahamed@gmail.com>
- */
-
-class Country_India extends CountryPlugin {
-	protected $countryName = "India";
-	protected $countrySlug = "india";
-	protected $regionNames = "Indian States & UT"; //Union Territories
-	protected $continent = "asia";
-
-	protected $extendedData = array(
-		"zipFormat" => array(
-			"format" => "Xxxxxx",
-			"replacements" => array(
-				"X" => "123456789",
-				"x" => "0123456789"
-			)
-		),
- 		"phoneFormat" => array(
-			"displayFormats" => array(
-				"+91 xxxxxxxxxx",
-				"0xx-xxxxxxxx",
-				"0xxx-xxxxxxx",
-				"0xxxx-xxxxxx",
-			)
-		)
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => "Andhra Pradesh",
-			"regionShort" => "AP",
-			"regionSlug" => "andhra_pradesh",
-			"weight" => 1314,
-			"cities" => array(
-				"Adoni","Anantapur","Bhimavaram","Chittoor","Cuddapah","Eluru","Gudivada",
-				"Guntakal","Guntur","Hindupur","Hyderabad","Kakinada","Karimnagar","Khammam",
-				"Kukatpalle","Kurnool","Lalbahadur Nagar","Machilipatnam",
-				"Mahbubnagar","Malkajgiri","Nandyal","Nellore","Nizamabad","Ongole",
-				"Proddatur","Qutubullapur","Rajahmundry","Ramagundam","Secunderabad",
-				"Tenali","Tirupati","Vijayawada","Vishakhapatnam","Vizianagaram","Warangal"
-			)
-		),
-		array(
-			"regionName" => "Arunachal Pradesh",
-			"regionShort" => "AR",
-			"regionSlug" => "arunachal_pradesh",
-			"weight" => 21,
-			"cities" => array(
-				"Itanagar"
-			)
-		),
-		array(
-			"regionName" => "Assam",
-			"regionShort" => "AS",
-			"regionSlug" => "assam",
-			"weight" => 484,
-			"cities" => array(
-				"Guwahati","Dibrugarh","Silchar","Nagaon",
-			)
-		),
-		array(
-			"regionName" => "Bihar",
-			"regionShort" => "BR",
-			"regionSlug" => "bihar",
-			"weight" => 1611,
-			"cities" => array(
-				"Patna","Gaya","Bhagalpur","Muzaffarpur","Darbhanga","Bihar Sharif",
-				"Arrah","Katihar","Munger","Chapra","Sasaram","Dehri","Bettiah"
-			)
-		),
-		array(
-			"regionName" => "Chhattisgarh",
-			"regionShort" => "CT",
-			"regionSlug" => "chhattisgarh",
-			"weight" => 396,
-			"cities" => array(
-				"Raipur","Bhilai","Bilaspur","Durg","Raj Nandgaon","Korba","Raigarh"
-			)
-		),
-		array(
-			"regionName" => "Goa",
-			"regionShort" => "GA",
-			"regionSlug" => "goa",
-			"weight" => 23,
-			"cities" => array(
-				"Panjim"
-			)
-		),
-		array(
-			"regionName" => "Gujarat",
-			"regionShort" => "GJ",
-			"regionSlug" => "gujarat",
-			"weight" => 937,
-			"cities" => array(
-				"Ahmedabad","Surat","Vadodara","Rajkot","Bhavnagar","Jamnagar","Nadiad",
-				"Bharuch","Junagadh","Navsari","Gandhinagar","Veraval","Porbandar","Anand",
-				"Surendranagar","Gandhidham","Bhuj","Godhra","Patan","Morvi","Vejalpur"
-			)
-		),
-		array(
-			"regionName" => "Haryana",
-			"regionShort" => "HR",
-			"regionSlug" => "haryana",
-			"weight" => 394,
-			"cities" => array(
-				"Ambala","Ambala Sadar","Bhiwani","Faridabad","Gurgaon","Hisar","Karnal",
-				"Panipat","Rohtak","Sirsa","Sonipat","Yamuna Nagar"
-			)
-		),
-		array(
-			"regionName" => "Himachal Pradesh",
-			"regionShort" => "HP",
-			"regionSlug" => "himachal_pradesh",
-			"weight" => 106,
-			"cities" => array(
-				"Shimla"
-			)
-		),
-		array(
-			"regionName" => "Jammu and Kashmir",
-			"regionShort" => "JK",
-			"regionSlug" => "jammu_and_kashmir",
-			"weight" => 195,
-			"cities" => array(
-				"Jammu", "Srinagar"
-			)
-		),
-		array(
-			"regionName" => "Jharkhand",
-			"regionShort" => "JH",
-			"regionSlug" => "jharkhand",
-			"weight" => 512,
-			"cities" => array(
-				"Bokaro Steel City","Dhanbad","Hazaribag","Jamshedpur","Mango","Purnea",
-				"Purulia","Ranchi"
-			)
-		),
-		array(
-			"regionName" => "Karnataka",
-			"regionShort" => "KA",
-			"regionSlug" => "karnataka",
-			"weight" => 949,
-			"cities" => array(
-				"Bangalore","Belgaum","Bellary","Bidar","Bijapur","Davangere","Gadag Betigeri",
-				"Gulbarga","Hassan","Hospet","Hubli","Mandya","Mangalore","Mysore","Raichur",
-				"Shimoga","Timkur"
-			)
-		),
-		array(
-			"regionName" => "Kerala",
-			"regionShort" => "KL",
-			"regionSlug" => "kerala",
-			"weight" => 518,
-			"cities" => array(
-				"Allappuzha","Kozhikode","Cochin","Kollam","Palakkad","Thalassery","Trivandrum"
-			)
-		),
-		array(
-			"regionName" => "Madhya Pradesh",
-			"regionShort" => "MP",
-			"regionSlug" => "madhya_pradesh",
-			"weight" => 1127,
-			"cities" => array(
-				"Bhind","Bhopal","Burhanpur","Chhindwara","Damoh","Dewas","Guna","Gwalior",
-				"Indore","Jabalpur","Khandwa","Mandasor","Morena","Murwara","Ratlam","Rewa",
-				"Sagar","Satna","Shivapuri","Ujjain","Vidisha"
-			)
-		),
-		array(
-			"regionName" => "Maharastra",
-			"regionShort" => "MH",
-			"regionSlug" => "maharastra",
-			"weight" => 1744,
-			"cities" => array(
-				"Achalpur","Ahmadnagar","Akola","Amravati","Bhir","Bhiwandi","Bhusawal",
-				"Chandrapur","Dhule","Gondiya","Ichalkaranji","Jalgaon","Jalna","Kalyan",
-				"Kolhapur","Latur","Malegaon","Mira Bhayandar","Miraj","Mumbai","Nagpur",
-				"Nanded","Nashik","New Bombay","Parbhani","Pimpri-Chinchwad","Pune","Sangli",
-				"Satara","Aurangabad","Solapur","Thane","Ulhasnagar","Wardha","Yeotmal"
-			)
-		),
-		array(
-			"regionName" => "Manipur",
-			"regionShort" => "MN",
-			"regionSlug" => "manipur",
-			"weight" => 42,
-			"cities" => array(
-				"Imphal"
-			)
-		),
-		array(
-			"regionName" => "Meghalaya",
-			"regionShort" => "ML",
-			"regionSlug" => "meghalaya",
-			"weight" => 46,
-			"cities" => array(
-				"Shillong"
-			)
-		),
-		array(
-			"regionName" => "Mizoram",
-			"regionShort" => "MZ",
-			"regionSlug" => "mizoram",
-			"weight" => 17,
-			"cities" => array(
-				"Aizwal"
-			)
-		),
-		array(
-			"regionName" => "Nagaland",
-			"regionShort" => "NL",
-			"regionSlug" => "nagaland",
-			"weight" => 31,
-			"cities" => array(
-				"Kohima"
-			)
-		),
-		array(
-			"regionName" => "Odisha",
-			"regionShort" => "OR",
-			"regionSlug" => "odisha",
-			"weight" => 651,
-			"cities" => array(
-				"Bhubaneswar","Brahmapur","Cuttack","Puri","Raurkela","Raurkela Civil Township","Sambalpur"
-			)
-		),
-		array(
-			"regionName" => "Punjab",
-			"regionShort" => "PB",
-			"regionSlug" => "punjab",
-			"weight" => 430,
-			"cities" => array(
-				"Abohar","Ahmadpur East","Amritsar","Bahawalnagar","Bahawalpur","Bhatinda","Chiniot",
-				"Chishtian Mandi","Daska","Dera Ghazi Khan","Faisalabad","Gojra","Gujranwala","Gujrat",
-				"Hafizabad","Hoshiarpur","Jalandhar (Jullundur)","Jaranwala","Jhang","Jhelum","Kamalia",
-				"Kamoke","Kasur","Khanewal","Khanpur","Lahore","Ludhiana","Mandi Bahauddin","Mandi Burewala",
-				"Moga","Multan","Muridke","Muzaffargarh","Okara","Pak Pattan","Pathankot","Patiala",
-				"Rahim Yar Khan","Rawalpindi","Sadiqabad","Sahiwal","Sargodha","Sheikhupura","Sialkot",
-				"Vihari","Wah","Wazirabad"
-			)
-		),
-		array(
-			"regionName" => "Rajasthan",
-			"regionShort" => "RJ",
-			"regionSlug" => "rajasthan",
-			"weight" => 1065,
-			"cities" => array(
-				"Ajmer","Alwar","Beawar","Bharatpur","Bhilwara","Bikaner","Ganganagar",
-				"Jaipur","Jodhpur","Kota","Pali","Sikar","Tonk","Udaipur"	
-			)
-		),
-		array(
-			"regionName" => "Sikkim",
-			"regionShort" => "SK",
-			"regionSlug" => "sikkim",
-			"weight" => 9,
-			"cities" => array(
-				"Gangtok"
-			)
-		),
-		array(
-			"regionName" => "Tamil Nadu",
-			"regionShort" => "TN",
-			"regionSlug" => "Tamil Nadu",
-			"weight" => 1120,
-			"cities" => array(
-				"Alandur","Ambattur","Avadi","Chennai","Coimbatore","Cuddalore","Dindigul","Erode",
-				"Kanchipuram","Kumbakonam","Madurai","Nagarcoil","Neyveli","Palayankottai","Pallavaram",
-				"Pudukkottai","Rajapalaiyam","Salem","Tambaram","Thanjavur","Tiruchirapalli",
-				"Tirunelveli","Tiruppur","Tiruvannamalai","Tiruvarur","Tiruvottiyur","Tuticorin",
-				"Valparai","Vellore"
-			)
-		),
-		array(
-			"regionName" => "Tripura",
-			"regionShort" => "TR",
-			"regionSlug" => "tripura",
-			"weight" => 57,
-			"cities" => array(
-				"Agartala"	
-			)
-		),
-		array(
-			"regionName" => "Uttar Pradesh",
-			"regionShort" => "UP",
-			"regionSlug" => "uttar_pradesh",
-			"weight" => 3098,
-			"cities" => array(
-				"Agra","Aligarh","Allahabad","Amroha","Bahraich","Banda","Bareilly","Budaun",
-				"Bulandshahr","Etawah","Faizabad","Farrukhabad-cum-Fatehgarh","Fatehpur","Firozabad",
-				"Ghaziabad","Gonda","Gorakhpur","Hapur","Hathras","Jaunpur","Jhansi","Kanpur",
-				"Kanpur Cantonment","Lucknow","Mathura","Maunath Bhanjan","Meerut",
-				"Meerut Cantonment","Mirzapur-cum-Vindhyachal","Modinagar","Moradabad",
-				"Muzaffarnagar","Noida","Orai","Pilibhit","Rae Bareli","Rampur","Saharanpur",
-				"Sambhal","Shahjahanpur","Sitapur","Unnao","Varanasi"
-			)
-		),
-		array(
-			"regionName" => "Uttarakhand",
-			"regionShort" => "UT",
-			"regionSlug" => "uttarakhand",
-			"weight" => 157,
-			"cities" => array(
-				"Dehradun", "Haridwar"
-			)
-		),
-		array(
-			"regionName" => "West Bengal",
-			"regionShort" => "WB",
-			"regionSlug" => "west_bengal",
-			"weight" => 1418,
-			"cities" => array(
-				"Asansol","Ashoknagar-Kalyangarh","Baidyabati","Bally","Balurghat","Bankura",
-				"Bansberia","Barahanagar","Barasat","Barddhaman","Barrackpur","Basirhat",
-				"Berhampore","Bhatpara","Burnpur","Kolkata","Champdani","Chandannagar","Dabgram",
-				"Durgapur","Habra","Haldia","Halisahar","Howrah","Hugli-Chinsurah","Ingraj Bazar",
-				"Kamarhati","Kanchrapara","Kharagpur","Krishnanagar","Kulti-Barakar","Midnapore",
-				"Naihati","Navadwip","North Barrackpur","North Dum Dum","Panihati","Raiganj",
-				"Rishra","Santipur","Serampore","Siliguri","South Dum Dum","Titagarh","Uluberia",
-				"Uttarpara-Kotrung"
-			)
-		),
-		//Union Territories
-		array(
-			"regionName" => "Andaman and Nicobar Islands",
-			"regionShort" => "AN",
-			"regionSlug" => "andaman_and_nicobar_islands",
-			"weight" => 6,
-			"cities" => array(
-				"Port Blair"
-			)
-		),
-		array(
-			"regionName" => "Chandigarh",
-			"regionShort" => "CH",
-			"regionSlug" => "Chandigarh",
-			"weight" => 16,
-			"cities" => array(
-				"Chandigarh"
-			)
-		),
-		array(
-			"regionName" => "Dadra and Nagar Haveli",
-			"regionShort" => "DN",
-			"regionSlug" => "dadra_and_nagar_haveli",
-			"weight" => 5,
-			"cities" => array(
-				"Silvassa"
-			)
-		),
-		array(
-			"regionName" => "Daman and Diu",
-			"regionShort" => "DD",
-			"regionSlug" => "Daman and Diu",
-			"weight" => 4,
-			"cities" => array(
-				"Daman"
-			)
-		),
-		array(
-			"regionName" => "Lakshadweep",
-			"regionShort" => "LD",
-			"regionSlug" => "lakshadweep",
-			"weight" => 1,
-			"cities" => array(
-				"Kavaratti"
-			)
-		),
-		array(
-			"regionName" => "Delhi",
-			"regionShort" => "DL",
-			"regionSlug" => "delhi",
-			"weight" => 260,
-			"cities" => array(
-				"Delhi"
-			)
-		),
-		array(
-			"regionName" => "Pondicherry",
-			"regionShort" => "PY",
-			"regionSlug" => "pondicherry",
-			"weight" => 19,
-			"cities" => array(
-				"Pondicherry"
-			)
-		)
-	);
-
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
diff --git a/plugins/countries/Italy/Italy.class.php b/plugins/countries/Italy/Italy.class.php
deleted file mode 100644
index 3013c5768..000000000
--- a/plugins/countries/Italy/Italy.class.php
+++ /dev/null
@@ -1,1202 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_Italy extends CountryPlugin {
-	protected $countryName = "Italy";
-	protected $countrySlug = "italy";
-	protected $regionNames = "Regioni";
-	protected $continent = "europe";
-
-	protected $extendedData = array(
-		"zipFormat" => "xxxxx"
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => "Piemonte",
-			"regionShort" => "PIE",
-			"regionSlug" => "piemonte",
-			"weight" => 7,
-			"cities" => array(
-				"Alessandria",
-				"Asti",
-				"Barbania",
-				"Bonvicino",
-				"Borghetto di Borbera",
-				"Borgomasino",
-				"Borgone Susa",
-				"Borriana",
-				"Caprauna",
-				"Casanova Elvo",
-				"Cassano Spinola",
-				"Coassolo Torinese",
-				"Colleretto Castelnuovo",
-				"Crescentino",
-				"Cressa",
-				"Cuceglio",
-				"Ferrere",
-				"Ghislarengo",
-				"Marentino",
-				"Massello",
-				"Melazzo",
-				"Meugliano",
-				"Molino dei Torti",
-				"Mombaruzzo",
-				"Moncrivello",
-				"Montacuto",
-				"Montaldo Bormida",
-				"Monteu Roero",
-				"Olcenengo",
-				"Olivola",
-				"Orta San Giulio",
-				"Ponti",
-				"Premeno",
-				"Priero",
-				"Quarona",
-				"Rocca d'Arazzo",
-				"Roccabruna",
-				"Rueglio",
-				"San Maurizio Canavese",
-				"Serralunga d'Alba",
-				"Sommariva Perno",
-				"Strona",
-				"Torino",
-				"Valmacca",
-				"Vauda Canavese",
-				"Vespolate",
-				"Villafalletto",
-				"Villafranca d'Asti",
-				"Villar Pellice",
-				"Villata",
-			)
-		),
-
-		array(
-			"regionName" => "Valle d'Aosta",
-			"regionShort" => "VDA",
-			"regionSlug" => "valledaosta",
-			"weight" => 1,
-			"cities" => array(
-				"Allein",
-				"Antey-Saint-Andrè",
-				"Aosta",
-				"Arvier",
-				"Avise",
-				"Ayas",
-				"Bard",
-				"Bionaz",
-				"Brusson",
-				"Challand-Saint-Victor",
-				"Chambave",
-				"Champorcher",
-				"Chatillon",
-				"Donnas",
-				"Doues",
-				"Emarèse",
-				"Etroubles",
-				"Gignod",
-				"Gressan",
-				"Gressoney-La-Trinitè",
-				"Gressoney-Saint-Jean",
-				"Introd",
-				"Issime",
-				"La Magdeleine",
-				"La Salle",
-				"La Thuile",
-				"Lillianes",
-				"Montjovet",
-				"Morgex",
-				"Nus",
-				"Oyace",
-				"Pollein",
-				"Pont-Saint-Martin",
-				"Pontboset",
-				"Pontey",
-				"Prè-Saint-Didier",
-				"Rhemes-Notre-Dame",
-				"Rhemes-Saint-Georges",
-				"Saint-Denis",
-				"Saint-Marcel",
-				"Saint-Nicolas",
-				"Saint-Oyen",
-				"Saint-Pierre",
-				"Saint-Rhémy-en-Bosses",
-				"Sarre",
-				"Torgnon",
-				"Valpelline",
-				"Valtournenche",
-				"Verrayes",
-				"Verrès",
-			)
-		),
-
-		array(
-			"regionName" => "Lombardia",
-			"regionShort" => "LOM",
-			"regionSlug" => "lombardia",
-			"weight" => 16,
-			"cities" => array(
-				"Acquafredda",
-				"Annone di Brianza",
-				"Asso",
-				"Barghe",
-				"Blevio",
-				"Borno",
-				"Brescia",
-				"Calco",
-				"Cambiago",
-				"Caprino Bergamasco",
-				"Casnate con Bernate",
-				"Castello dell'Acqua",
-				"Castelmarte",
-				"Castelseprio",
-				"Chiari",
-				"Cisano Bergamasco",
-				"Civo",
-				"Colico",
-				"Corvino San Quirico",
-				"Crotta d'Adda",
-				"Fino Mornasco",
-				"Galbiate",
-				"Gambolò",
-				"Gavirate",
-				"Gianico",
-				"Lasnigo",
-				"Lenna",
-				"Luino",
-				"Mantova",
-				"Malgesso",
-				"Milano",
-				"Motta Visconti",
-				"Ospedaletto Lodigiano",
-				"Pagazzano",
-				"Pavone del Mella",
-				"Pero",
-				"Pogliano Milanese",
-				"Polpenazze del Garda",
-				"Rea",
-				"Ripalta Guerina",
-				"Rudiano",
-				"Salvirola",
-				"San Damiano al Colle",
-				"Sannazzaro de' Burgondi",
-				"Somma Lombardo",
-				"Sulzano",
-				"Torno",
-				"Val Rezzo",
-				"Valera Fratta",
-				"Villa Cortese",
-			)
-		),
-
-		array(
-			"regionName" => "Trentino-Alto Adige",
-			"regionShort" => "TAA",
-			"regionSlug" => "trentinoaltoadige",
-			"weight" => 2,
-			"cities" => array(
-				"Albiano",
-				"Andalo",
-				"Bedollo",
-				"Bolzano/Bozen",
-				"Bondo",
-				"Borgo Valsugana",
-				"Braies/Prags",
-				"Campitello di Fassa",
-				"Castello Tesino",
-				"Centa San Nicolò",
-				"Chiusa/Klausen",
-				"Cles",
-				"Curon Venosta/Graun im Vinschgau",
-				"Daiano",
-				"Dro",
-				"Gargazzone/Gargazon",
-				"Giustino",
-				"La Valle/Wengen",
-				"Laces/Latsch",
-				"Lagundo/Algund",
-				"Laives/Leifers",
-				"Lauregno/Laurein",
-				"Livo",
-				"Martello/Martell",
-				"Mezzana",
-				"Monguelfo-Tesido/Welsberg-Taisten",
-				"Panchià",
-				"Pellizzano",
-				"Pomarolo",
-				"Preore",
-				"Rabbi",
-				"Rodengo/Rodeneck",
-				"Rovereto",
-				"San Martino in Badia/St. Martin in Thurn",
-				"Sanzeno",
-				"Scena/Schenna",
-				"Sfruz",
-				"Spormaggiore",
-				"Terlago",
-				"Termeno sulla strada del vino/Tramin an der Weinstrasse",
-				"Terragnolo",
-				"Tiarno di Sopra",
-				"Tione di Trento",
-				"Trento",
-				"Valda",
-				"Vandoies/Vintl",
-				"Varena",
-				"Varna/Vahrn",
-				"Villa Agnedo",
-				"Ziano di Fiemme",
-			)
-		),
-
-		array(
-			"regionName" => "Veneto",
-			"regionShort" => "VEN",
-			"regionSlug" => "veneto",
-			"weight" => 8,
-			"cities" => array(
-				"Adria",
-				"Arsiè",
-				"Asigliano Veneto",
-				"Bevilacqua",
-				"Bolzano Vicentino",
-				"Bussolengo",
-				"Camponogara",
-				"Castelbaldo",
-				"Castello di Godego",
-				"Cavaion Veronese",
-				"Cavaso del Tomba",
-				"Codognè",
-				"Feltre",
-				"Ficarolo",
-				"Follina",
-				"Galzignano Terme",
-				"Grezzana",
-				"Limena",
-				"Lozzo Atestino",
-				"Maser",
-				"Monfumo",
-				"Montebelluna",
-				"Oderzo",
-				"Pescantina",
-				"Pieve di Cadore",
-				"Piovene Rocchette",
-				"Polesella",
-				"Ponte San Nicolò",
-				"Ponte nelle Alpi",
-				"Portobuffolè",
-				"Posina",
-				"Pramaggiore",
-				"Romano d'Ezzelino",
-				"San Gregorio nelle Alpi",
-				"San Pietro Mussolino",
-				"San Zenone degli Ezzelini",
-				"Sant'Elena",
-				"Sant'Urbano",
-				"Selva di Cadore",
-				"Solesino",
-				"Sorgà",
-				"Sossano",
-				"Soverzene",
-				"Sovizzo",
-				"Spresiano",
-				"Susegana",
-				"Tarzo",
-				"Tezze sul Brenta",
-				"Venezia",
-				"Verona",
-			)
-		),
-
-		array(
-			"regionName" => "Friuli-Venezia Giulia",
-			"regionShort" => "FVG",
-			"regionSlug" => "friuliveneziagiulia",
-			"weight" => 2,
-			"cities" => array(
-				"Amaro",
-				"Attimis",
-				"Bertiolo",
-				"Bicinicco",
-				"Castelnovo del Friuli",
-				"Cavasso Nuovo",
-				"Cimolais",
-				"Clauzetto",
-				"Colloredo di Monte Albano",
-				"Comeglians",
-				"Dignano",
-				"Fogliano Redipuglia",
-				"Fontanafredda",
-				"Forgaria nel Friuli",
-				"Gonars",
-				"Grado",
-				"Latisana",
-				"Lauco",
-				"Lestizza",
-				"Ligosullo",
-				"Lusevera",
-				"Marano Lagunare",
-				"Medea",
-				"Meduno",
-				"Paularo",
-				"Polcenigo",
-				"Pordenone",
-				"Porpetto",
-				"Pozzuolo del Friuli",
-				"Pradamano",
-				"Prato Carnico",
-				"Precenicco",
-				"Ragogna",
-				"Reana del Rojale",
-				"Roveredo in Piano",
-				"Ruda",
-				"San Floriano del Collio",
-				"San Vito al Tagliamento",
-				"Sauris",
-				"Sesto al Reghena",
-				"Sgonico",
-				"Socchieve",
-				"Tarcento",
-				"Tarvisio",
-				"Tramonti di Sopra",
-				"Treppo Carnico",
-				"Trieste",
-				"Turriaco",
-				"Verzegnis",
-				"Vito d'Asio",
-			)
-		),
-
-		array(
-			"regionName" => "Liguria",
-			"regionShort" => "LIG",
-			"regionSlug" => "liguria",
-			"weight" => 3,
-			"cities" => array(
-				"Alassio",
-				"Albisola Superiore",
-				"Aquila d'Arroscia",
-				"Armo",
-				"Bajardo",
-				"Bargagli",
-				"Bergeggi",
-				"Bolano",
-				"Borghetto di Vara",
-				"Borgomaro",
-				"Cairo Montenotte",
-				"Calice al Cornoviglio",
-				"Campomorone",
-				"Castelbianco",
-				"Castelnuovo Magra",
-				"Castelvecchio di Rocca Barbena",
-				"Ceranesi",
-				"Chiavari",
-				"Chiusanico",
-				"Cicagna",
-				"Cisano sul Neva",
-				"Diano Arentino",
-				"Dolceacqua",
-				"Dolcedo",
-				"Erli",
-				"Fontanigorda",
-				"Genova",
-				"La Spezia",
-				"Masone",
-				"Massimino",
-				"Mignanego",
-				"Millesimo",
-				"Montoggio",
-				"Nasino",
-				"Ortonovo",
-				"Perinaldo",
-				"Portofino",
-				"Recco",
-				"Rezzoaglio",
-				"Savona",
-				"Seborga",
-				"Terzorio",
-				"Tribogna",
-				"Urbe",
-				"Valbrevenna",
-				"Vezzi Portio",
-				"Villa Faraldi",
-				"Villanova d'Albenga",
-				"Zignago",
-				"Zuccarello",
-			)
-		),
-
-		array(
-			"regionName" => "Emilia-Romagna",
-			"regionShort" => "ERM",
-			"regionSlug" => "emiliaromagna",
-			"weight" => 7,
-			"cities" => array(
-				"Baiso",
-				"Baricella",
-				"Bazzano",
-				"Berceto",
-				"Bologna",
-				"Calestano",
-				"Casina",
-				"Castel Guelfo di Bologna",
-				"Castel Maggiore",
-				"Codigoro",
-				"Collecchio",
-				"Colorno",
-				"Compiano",
-				"Conselice",
-				"Corte Brugnatella",
-				"Fontanellato",
-				"Forlì",
-				"Fusignano",
-				"Gaggio Montano",
-				"Gattatico",
-				"Jolanda di Savoia",
-				"Luzzara",
-				"Maranello",
-				"Marzabotto",
-				"Modena",
-				"Monghidoro",
-				"Montese",
-				"Monticelli d'Ongina",
-				"Ostellato",
-				"Palagano",
-				"Palanzano",
-				"Pievepelago",
-				"Poggio Berni",
-				"Porretta Terme",
-				"Portico e San Benedetto",
-				"Poviglio",
-				"Reggio nell'Emilia",
-				"Rio Saliceto",
-				"Sala Baganza",
-				"San Clemente",
-				"San Lazzaro di Savena",
-				"San Polo d'Enza",
-				"Sant'Agata Bolognese",
-				"Sant'Agata sul Santerno",
-				"Santarcangelo di Romagna",
-				"Sissa",
-				"Travo",
-				"Tresigallo",
-				"Viano",
-				"Zerba",
-			)
-		),
-
-		array(
-			"regionName" => "Toscana",
-			"regionShort" => "TOS",
-			"regionSlug" => "toscana",
-			"weight" => 6,
-			"cities" => array(
-				"Anghiari",
-				"Bientina",
-				"Buti",
-				"Capannori",
-				"Casciana Terme",
-				"Casole d'Elsa",
-				"Castel San Niccolò",
-				"Castellina in Chianti",
-				"Castiglione di Garfagnana",
-				"Certaldo",
-				"Comano",
-				"Coreglia Antelminelli",
-				"Empoli",
-				"Fauglia",
-				"Firenze",
-				"Gavorrano",
-				"Grosseto",
-				"Livorno",
-				"Massa e Cozzile",
-				"Massarosa",
-				"Minucciano",
-				"Monte San Savino",
-				"Montelupo Fiorentino",
-				"Montemignaio",
-				"Monteroni d'Arbia",
-				"Montignoso",
-				"Orciano Pisano",
-				"Pelago",
-				"Piancastagnaio",
-				"Pietrasanta",
-				"Pisa",
-				"Ponsacco",
-				"Pontedera",
-				"Pratovecchio",
-				"Radicofani",
-				"Rio Marina",
-				"Rio nell'Elba",
-				"Riparbella",
-				"Sambuca Pistoiese",
-				"San Marcello Pistoiese",
-				"San Piero a Sieve",
-				"Santa Croce sull'Arno",
-				"Santa Fiora",
-				"Santa Maria a Monte",
-				"Siena",
-				"Subbiano",
-				"Vagli Sotto",
-				"Vergemoli",
-				"Villafranca in Lunigiana",
-				"Vinci",
-			)
-		),
-
-		array(
-			"regionName" => "Umbria",
-			"regionShort" => "UMB",
-			"regionSlug" => "umbria",
-			"weight" => 1,
-			"cities" => array(
-				"Acquasparta",
-				"Allerona",
-				"Alviano",
-				"Amelia",
-				"Arrone",
-				"Attigliano",
-				"Avigliano Umbro",
-				"Baschi",
-				"Bastia Umbra",
-				"Bevagna",
-				"Castel Giorgio",
-				"Castel Ritaldi",
-				"Castiglione del Lago",
-				"Cerreto di Spoleto",
-				"Fabro",
-				"Ficulle",
-				"Foligno",
-				"Fossato di Vico",
-				"Fratta Todina",
-				"Giove",
-				"Gualdo Cattaneo",
-				"Gualdo Tadino",
-				"Gubbio",
-				"Lisciano Niccone",
-				"Lugnano in Teverina",
-				"Marsciano",
-				"Massa Martana",
-				"Monte Santa Maria Tiberina",
-				"Monteleone di Spoleto",
-				"Montone",
-				"Nocera Umbra",
-				"Norcia",
-				"Orvieto",
-				"Otricoli",
-				"Parrano",
-				"Penna in Teverina",
-				"Perugia",
-				"Piegaro",
-				"Poggiodomo",
-				"Polino",
-				"San Venanzo",
-				"Scheggino",
-				"Sellano",
-				"Sigillo",
-				"Spoleto",
-				"Terni",
-				"Todi",
-				"Torgiano",
-				"Umbertide",
-				"Valfabbrica",
-			)
-		),
-
-		array(
-			"regionName" => "Marche",
-			"regionShort" => "MAR",
-			"regionSlug" => "marche",
-			"weight" => 3,
-			"cities" => array(
-				"Acquasanta Terme",
-				"Altidona",
-				"Ancona",
-				"Arquata del Tronto",
-				"Barchi",
-				"Belvedere Ostrense",
-				"Cagli",
-				"Caldarola",
-				"Camerino",
-				"Camporotondo di Fiastrone",
-				"Castel Colonna",
-				"Cossignano",
-				"Falerone",
-				"Fiuminata",
-				"Loreto",
-				"Macerata",
-				"Maiolati Spontini",
-				"Maltignano",
-				"Mogliano",
-				"Mondolfo",
-				"Monte Giberto",
-				"Monte San Pietrangeli",
-				"Monte Vidon Corrado",
-				"Montecarotto",
-				"Montefiore dell'Aso",
-				"Montegranaro",
-				"Morro d'Alba",
-				"Morrovalle",
-				"Offida",
-				"Osimo",
-				"Ostra Vetere",
-				"Palmiano",
-				"Penna San Giovanni",
-				"Pergola",
-				"Piagge",
-				"Pietrarubbia",
-				"Poggio San Marcello",
-				"Rapagnano",
-				"Recanati",
-				"Saltara",
-				"San Benedetto del Tronto",
-				"San Marcello",
-				"Sant'Angelo in Pontano",
-				"Sant'Elpidio a Mare",
-				"Santa Vittoria in Matenano",
-				"Sassocorvaro",
-				"Sefro",
-				"Serrungarina",
-				"Tolentino",
-				"Visso",
-			)
-		),
-
-		array(
-			"regionName" => "Lazio",
-			"regionShort" => "LAZ",
-			"regionSlug" => "lazio",
-			"weight" => 9,
-			"cities" => array(
-				"Acquafondata",
-				"Allumiere",
-				"Alvito",
-				"Anzio",
-				"Arsoli",
-				"Artena",
-				"Bassano in Teverina",
-				"Bassiano",
-				"Canino",
-				"Cantalupo in Sabina",
-				"Canterano",
-				"Capena",
-				"Casalvieri",
-				"Casperia",
-				"Castel di Tora",
-				"Cisterna di Latina",
-				"Filacciano",
-				"Frascati",
-				"Labico",
-				"Labro",
-				"Ladispoli",
-				"Latera",
-				"Mandela",
-				"Mazzano Romano",
-				"Minturno",
-				"Monte San Giovanni in Sabina",
-				"Moricone",
-				"Morolo",
-				"Morro Reatino",
-				"Nemi",
-				"Palestrina",
-				"Pastena",
-				"Picinisco",
-				"Rocca Massima",
-				"Rocca Santo Stefano",
-				"Rocca d'Arce",
-				"Roma",
-				"Ronciglione",
-				"San Lorenzo Nuovo",
-				"Scandriglia",
-				"Segni",
-				"Sonnino",
-				"Torre Cajetani",
-				"Trevignano Romano",
-				"Vallepietra",
-				"Vejano",
-				"Velletri",
-				"Vico nel Lazio",
-				"Villa Latina",
-				"Villa Santo Stefano",
-			)
-		),
-
-		array(
-			"regionName" => "Abruzzo",
-			"regionShort" => "ABR",
-			"regionSlug" => "abruzzo",
-			"weight" => 2,
-			"cities" => array(
-				"Abbateggio",
-				"Acciano",
-				"Ancarano",
-				"Bellante",
-				"Campli",
-				"Campotosto",
-				"Capestrano",
-				"Cappelle sul Tavo",
-				"Caramanico Terme",
-				"Carunchio",
-				"Casoli",
-				"Castellafiume",
-				"Castelvecchio Calvisio",
-				"Castiglione Messer Raimondo",
-				"Castiglione a Casauria",
-				"Cerchio",
-				"Chieti",
-				"Colledimacine",
-				"Colonnella",
-				"Crecchio",
-				"Fallo",
-				"Fontecchio",
-				"Guilmi",
-				"Isola del Gran Sasso d'Italia",
-				"Manoppello",
-				"Montebello sul Sangro",
-				"Montereale",
-				"Mosciano Sant'Angelo",
-				"Nocciano",
-				"Ofena",
-				"Orsogna",
-				"Paglieta",
-				"Palombaro",
-				"Pereto",
-				"Pizzoferrato",
-				"Pretoro",
-				"Rocca di Cambio",
-				"Roio del Sangro",
-				"Rosciano",
-				"San Giovanni Lipioni",
-				"San Valentino in Abruzzo Citeriore",
-				"San Vito Chietino",
-				"Sant'Egidio alla Vibrata",
-				"Sant'Eufemia a Maiella",
-				"Sant'Eusanio Forconese",
-				"Sant'Omero",
-				"Serramonacesca",
-				"Torrevecchia Teatina",
-				"Treglio",
-				"Vicoli",
-			)
-		),
-
-		array(
-			"regionName" => "Molise",
-			"regionShort" => "MOL",
-			"regionSlug" => "molise",
-			"weight" => 1,
-			"cities" => array(
-				"Baranello",
-				"Belmonte del Sannio",
-				"Bojano",
-				"Bonefro",
-				"Busso",
-				"Campochiaro",
-				"Campolieto",
-				"Campomarino",
-				"Carovilli",
-				"Casacalenda",
-				"Castel del Giudice",
-				"Campobasso",
-				"Cercemaggiore",
-				"Cercepiccola",
-				"Chiauci",
-				"Civitacampomarano",
-				"Colli a Volturno",
-				"Conca Casale",
-				"Ferrazzano",
-				"Filignano",
-				"Isernia",
-				"Longano",
-				"Macchia Valfortore",
-				"Miranda",
-				"Monacilioni",
-				"Montefalcone nel Sannio",
-				"Montenero Val Cocchiara",
-				"Petacciato",
-				"Pettoranello del Molise",
-				"Pietracatella",
-				"Ripabottoni",
-				"Roccasicura",
-				"Rotello",
-				"Salcito",
-				"San Giacomo degli Schiavoni",
-				"San Giovanni in Galdo",
-				"San Giuliano di Puglia",
-				"San Martino in Pensilis",
-				"San Massimo",
-				"San Pietro Avellana",
-				"Sant'Agapito",
-				"Sant'Angelo Limosano",
-				"Sant'Elia a Pianisi",
-				"Sepino",
-				"Sesto Campano",
-				"Termoli",
-				"Torella del Sannio",
-				"Tufara",
-				"Ururi",
-				"Vastogirardi",
-			)
-		),
-
-		array(
-			"regionName" => "Campania",
-			"regionShort" => "CAM",
-			"regionSlug" => "campania",
-			"weight" => 10,
-			"cities" => array(
-				"Acerra",
-				"Altavilla Irpina",
-				"Arzano",
-				"Avellino",
-				"Calvi Risorta",
-				"Campagna",
-				"Cannalonga",
-				"Casalbuono",
-				"Castel Baronia",
-				"Castel Volturno",
-				"Castelvetere in Val Fortore",
-				"Ceppaloni",
-				"Cervinara",
-				"Cervino",
-				"Cetara",
-				"Cimitile",
-				"Corbara",
-				"Cuccaro Vetere",
-				"Ercolano",
-				"Falciano del Massico",
-				"Felitto",
-				"Forio",
-				"Frigento",
-				"Frignano",
-				"Giugliano in Campania",
-				"Guardia Sanframondi",
-				"Napoli",
-				"Ospedaletto d'Alpinolo",
-				"Paternopoli",
-				"Paupisi",
-				"Pellezzano",
-				"Pietraroja",
-				"Pollena Trocchia",
-				"Portici",
-				"Rocca San Felice",
-				"Salerno",
-				"San Felice a Cancello",
-				"San Leucio del Sannio",
-				"San Mauro Cilento",
-				"San Pietro al Tanagro",
-				"San Sebastiano al Vesuvio",
-				"Sant'Angelo a Cupolo",
-				"Sant'Angelo a Fasanella",
-				"Sant'Arsenio",
-				"Sant'Egidio del Monte Albino",
-				"Santa Marina",
-				"Santo Stefano del Sole",
-				"Santomenna",
-				"Sorbo Serpico",
-				"Tufo",
-			)
-		),
-
-		array(
-			"regionName" => "Puglia",
-			"regionShort" => "PUG",
-			"regionSlug" => "puglia",
-			"weight" => 7,
-			"cities" => array(
-				"Accadia",
-				"Altamura",
-				"Arnesano",
-				"Bari",
-				"Brindisi",
-				"Candela",
-				"Cannole",
-				"Carpignano Salentino",
-				"Castelluccio Valmaggiore",
-				"Castri di Lecce",
-				"Cavallino",
-				"Cerignola",
-				"Copertino",
-				"Erchie",
-				"Francavilla Fontana",
-				"Gagliano del Capo",
-				"Giurdignano",
-				"Grumo Appula",
-				"Lecce",
-				"Maglie",
-				"Manfredonia",
-				"Minervino di Lecce",
-				"Molfetta",
-				"Montemesola",
-				"Mottola",
-				"Noicattaro",
-				"Novoli",
-				"Oria",
-				"Orsara di Puglia",
-				"Otranto",
-				"Palagianello",
-				"Palmariggi",
-				"Poggiorsini",
-				"Porto Cesareo",
-				"Putignano",
-				"Rignano Garganico",
-				"Rutigliano",
-				"Salice Salentino",
-				"San Cesario di Lecce",
-				"San Pancrazio Salentino",
-				"Santa Cesarea Terme",
-				"Scorrano",
-				"Sogliano Cavour",
-				"Surbo",
-				"Torchiarolo",
-				"Trani",
-				"Tuglie",
-				"Vernole",
-				"Vico del Gargano",
-				"Vieste",
-			)
-		),
-
-		array(
-			"regionName" => "Basilicata",
-			"regionShort" => "BAS",
-			"regionSlug" => "basilicata",
-			"weight" => 1,
-			"cities" => array(
-				"Albano di Lucania",
-				"Aliano",
-				"Anzi",
-				"Armento",
-				"Balvano",
-				"Bella",
-				"Calvello",
-				"Calvera",
-				"Castelluccio Inferiore",
-				"Castelluccio Superiore",
-				"Castelmezzano",
-				"Chiaromonte",
-				"Colobraro",
-				"Craco",
-				"Episcopia",
-				"Ferrandina",
-				"Francavilla in Sinni",
-				"Gallicchio",
-				"Garaguso",
-				"Genzano di Lucania",
-				"Guardia Perticara",
-				"Lagonegro",
-				"Latronico",
-				"Matera",
-				"Moliterno",
-				"Montemilone",
-				"Nemoli",
-				"Pescopagano",
-				"Pietragalla",
-				"Pomarico",
-				"Potenza",
-				"Rapone",
-				"Rionero in Vulture",
-				"Ripacandida",
-				"Rivello",
-				"Roccanova",
-				"Ruoti",
-				"Ruvo del Monte",
-				"San Chirico Nuovo",
-				"San Fele",
-				"Satriano di Lucania",
-				"Scanzano Jonico",
-				"Spinoso",
-				"Stigliano",
-				"Tolve",
-				"Tramutola",
-				"Trivigno",
-				"Vietri di Potenza",
-				"Viggianello",
-				"Viggiano",
-			)
-		),
-
-		array(
-			"regionName" => "Calabria",
-			"regionShort" => "CAL",
-			"regionSlug" => "calabria",
-			"weight" => 3,
-			"cities" => array(
-				"Aiello Calabro",
-				"Aieta",
-				"Benestare",
-				"Bocchigliero",
-				"Candidoni",
-				"Catanzaro",
-				"Cellara",
-				"Cittanova",
-				"Cropalati",
-				"Davoli",
-				"Delianuova",
-				"Dipignano",
-				"Filadelfia",
-				"Fiumara",
-				"Fossato Serralta",
-				"Gagliato",
-				"Girifalco",
-				"Grimaldi",
-				"Isca sullo Ionio",
-				"Isola di Capo Rizzuto",
-				"Laino Castello",
-				"Marcedusa",
-				"Marzi",
-				"Mesoraca",
-				"Montalto Uffugo",
-				"Oppido Mamertina",
-				"Papasidero",
-				"Pedace",
-				"Placanica",
-				"Portigliola",
-				"Rosarno",
-				"San Calogero",
-				"San Costantino Calabro",
-				"San Demetrio Corone",
-				"San Donato di Ninea",
-				"San Giorgio Albanese",
-				"San Lorenzo",
-				"San Luca",
-				"San Mauro Marchesato",
-				"San Sostene",
-				"Sant'Ilario dello Ionio",
-				"Sant'Onofrio",
-				"Scala Coeli",
-				"Sellia Marina",
-				"Serrata",
-				"Squillace",
-				"Stilo",
-				"Strongoli",
-				"Tarsia",
-				"Tropea",
-			)
-		),
-
-		array(
-			"regionName" => "Sicilia",
-			"regionShort" => "SIC",
-			"regionSlug" => "sicilia",
-			"weight" => 8,
-			"cities" => array(
-				"Acireale",
-				"Acquedolci",
-				"Adrano",
-				"Buccheri",
-				"Caccamo",
-				"Campofelice di Fitalia",
-				"Cassaro",
-				"Castelbuono",
-				"Castellana Sicula",
-				"Castiglione di Sicilia",
-				"Cefalà Diana",
-				"Cerami",
-				"Chiusa Sclafani",
-				"Cinisi",
-				"Enna",
-				"Francofonte",
-				"Gallodoro",
-				"Giardinello",
-				"Giarratana",
-				"Mascalucia",
-				"Milazzo",
-				"Milena",
-				"Moio Alcantara",
-				"Motta Camastra",
-				"Motta Sant'Anastasia",
-				"Naro",
-				"Nicolosi",
-				"Pace del Mela",
-				"Palermo",
-				"Pettineo",
-				"Piana degli Albanesi",
-				"Priolo Gargallo",
-				"Randazzo",
-				"Roccalumera",
-				"Roccamena",
-				"Rodì Milici",
-				"Rosolini",
-				"San Fratello",
-				"San Giovanni la Punta",
-				"San Piero Patti",
-				"Santa Caterina Villarmosa",
-				"Santa Flavia",
-				"Santo Stefano Quisquina",
-				"Sciacca",
-				"Siculiana",
-				"Siracusa",
-				"Sperlinga",
-				"Termini Imerese",
-				"Valverde",
-				"Villafranca Tirrena",
-			)
-		),
-
-		array(
-			"regionName" => "Sardegna",
-			"regionShort" => "SAR",
-			"regionSlug" => "sardegna",
-			"weight" => 3,
-			"cities" => array(
-				"Albagiara",
-				"Armungia",
-				"Birori",
-				"Bosa",
-				"Bottidda",
-				"Bulzi",
-				"Cabras",
-				"Cagliari",
-				"Cardedu",
-				"Collinas",
-				"Cuglieri",
-				"Dorgali",
-				"Esterzili",
-				"Gonnosfanadiga",
-				"Gonnosnò",
-				"Ilbono",
-				"Jerzu",
-				"Lodine",
-				"Maracalagonis",
-				"Masullas",
-				"Montresta",
-				"Mores",
-				"Narbolia",
-				"Narcao",
-				"Noragugume",
-				"Nuragus",
-				"Nurallao",
-				"Nuraminis",
-				"Ollolai",
-				"Oristano",
-				"Orosei",
-				"Orroli",
-				"Ortacesus",
-				"Piscinas",
-				"San Giovanni Suergiu",
-				"Sanluri",
-				"Santu Lussurgiu",
-				"Sennariolo",
-				"Siddi",
-				"Silius",
-				"Sorradile",
-				"Stintino",
-				"Tramatza",
-				"Trinità d'Agultu e Vignola",
-				"Tula",
-				"Ussassai",
-				"Viddalba",
-				"Villa Verde",
-				"Villamassargia",
-				"Villanovafranca",
-			)
-		),
-	);
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
\ No newline at end of file
diff --git a/plugins/countries/Netherlands/Netherlands.class.php b/plugins/countries/Netherlands/Netherlands.class.php
deleted file mode 100644
index 2d287e1db..000000000
--- a/plugins/countries/Netherlands/Netherlands.class.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_Netherlands extends CountryPlugin {
-	protected $countryName = "Netherlands";
-	protected $countrySlug = "netherlands";
-	protected $regionNames = "Netherlands Prov.";
-	protected $continent = "europe";
-
-	protected $extendedData = array(
-		"zipFormat" => "xxxxLL"
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => "Drenthe",
-			"regionShort" => "Dr",
-			"regionSlug" => "drenthe",
-			"weight" => "5",
-			"cities" => array(
-				"Assen", "Coevorden", "Emmen", "Hoogeveen", "Meppel"
-			)
-		),
-		array(
-			"regionName" => "Flevoland",
-			"regionShort" => "Fl",
-			"regionSlug" => "flevoland",
-			"weight" => "1",
-			"cities" => array(
-				"Almere", "Lelystad"
-			)
-		),
-		array(
-			"regionName" => "Friesland",
-			"regionShort" => "Fr",
-			"regionSlug" => "friesland",
-			"weight" => "6",
-			"cities" => array(
-				"Bolsward", "Dokkum", "Drachten", "Franeker", "Harlingen", "Heerenveen", "Hindeloopen", "IJlst",
-				"Leeuwarden", "Sloten", "Sneek", "Stavoren", "Workum"
-			)
-		),
-		array(
-			"regionName" => "Gelderland",
-			"regionShort" => "Gl",
-			"regionSlug" => "gelderland",
-			"weight" => "20",
-			"cities" => array(
-				"Apeldoorn", "Arnhem", "Buren", "Culemborg", "Doetinchem", "Ede", "Groenlo", "Harderwijk", "Hattem",
-				"Huissen", "Nijkerk", "Nijmegen", "Tiel", "Wageningen", "Winterswijk", "Zaltbommel", "Zutphen"
-			)
-		),
-		array(
-			"regionName" => "Limburg",
-			"regionShort" => "L.",
-			"regionSlug" => "limburg",
-			"weight" => "11",
-			"cities" => array(
-				"Geleen", "Heerlen", "Kerkrade", "Maastricht", "Roermond", "Sittard", "Thorn", "Valkenburg aan de Geul",
-				"Venlo", "Weert", "Hasselt", "Sint-Lambrechts-Herk", "Wimmertingen", "Kermt", "Spalbeek", "Kuringen",
-				"Stokrooie", "Stevoort", "Zonhoven", "Helchteren", "Houthalen", "Houthalen-Helchteren", "Berbroek", "Donk",
-				"Herk-de-Stad", "Schulen", "Halen", "Loksbergen", "Zelem", "Heusden", "Heusden-Zolder", "Zolder", "Linkhout",
-				"Lummen", "Meldert", "Alken", "Beringen", "Beverlo", "Koersel", "Paal", "Diepenbeek", "Genk", "Gellik",
-				"Lanaken", "Neerharen", "Veldwezelt", "Rekem", "Eisden", "Leut", "Maasmechelen", "Mechelen-aan-de-Maas",
-				"Meeswijk", "Opgrimbie", "Vucht", "Boorsem", "Uikhoven", "Kessenich", "Kinrooi", "Molenbeersel", "Ophoven",
-				"Dilsen-Stokkem", "Elen", "Lanklaar", "Rotem", "Stokkem", "Opglabbeek", "As", "Niel-bij-As", "Ellikom",
-				"Gruitrode", "Meeuwen", "Meeuwen-Gruitrode", "Neerglabbeek", "Wijshagen", "Maaseik", "Neeroeteren",
-				"Opoeteren", "Zutendaal", "Berg", "Diets-Heur", "Haren", "Henis", "Kolmont", "Koninksem", "Lauw", "Mal",
-				"Neerrepen", "Nerem", "Overrepen", "Piringen", "Riksingen", "Rutten", "s Herenelderen", "Sluizen", "Tongeren",
-				"Vreren", "Widooie", "Herstappe", "Kortessem", "Vliermaalroot"
-			)
-		),
-		array(
-			"regionName" => "Noord Brabant",
-			"regionShort" => "N.",
-			"regionSlug" => "noord_brabant",
-			"weight" => "24",
-			"cities" => array(
-				"Bergen op Zoom", "Breda", "Eindhoven", "Geertruidenberg", "Grave", "Helmond", "Heusden", "Oosterhout",
-				"Oss", "Ravenstein", "Roosendaal", "Tilburg", "Waalwijk"
-			)
-		),
-		array(
-			"regionName" => "Noord Holland",
-			"regionShort" => "N.",
-			"regionSlug" => "noord_holland",
-			"weight" => "26",
-			"cities" => array(
-				"Alkmaar", "Amstelveen", "Amsterdam", "Den Helder", "Edam", "Enkhuizen", "Haarlem", "Heerhugowaard", "Hilversum",
-				"Hoofddorp", "Hoorn", "Laren", "Purmerend", "Medemblik", "Muiden", "Naarden", "Schagen", "Weesp", "Zaanstad"
-			)
-		),
-		array(
-			"regionName" => "Overijssel",
-			"regionShort" => "Ov",
-			"regionSlug" => "overijssel",
-			"weight" => "11",
-			"cities" => array(
-				"Almelo", "Deventer", "Enschede", "Hengelo", "Oldenzaal", "Zwolle"
-			)
-		),
-		array(
-			"regionName" => "Zuid Holland",
-			"regionShort" => "Z.",
-			"regionSlug" => "zuid_holland",
-			"weight" => "12",
-			"cities" => array(
-				"Alphen aan den Rijn", "Delft", "Dordrecht", "Gorinchem", "Gouda", "Leiden", "Rotterdam", "Spijkenisse",
-				"The Hague", "Zoetermeer"
-			)
-		),
-		array(
-			"regionName" => "Utrecht",
-			"regionShort" => "U.",
-			"regionSlug" => "utrecht",
-			"weight" => "4",
-			"cities" => array(
-				"Amersfoort", "Leersum", "Nieuwegein", "Utrecht", "Veenendaal", "Woerden", "Zeist"
-			)
-		),
-		array(
-			"regionName" => "Zeeland",
-			"regionShort" => "Zl",
-			"regionSlug" => "zeeland",
-			"weight" => "35",
-			"cities" => array(
-				"Flushing", "Goes", "Hulst", "Middelburg", "Sluis", "Terneuzen", "Veere", "Zierikzee"
-			)
-		)
-	);
-
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
diff --git a/plugins/countries/NewZealand/NewZealand.class.php b/plugins/countries/NewZealand/NewZealand.class.php
deleted file mode 100644
index 9c1e6d038..000000000
--- a/plugins/countries/NewZealand/NewZealand.class.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_NewZealand extends CountryPlugin {
-	protected $countryName = "New Zealand";
-	protected $countrySlug = "newzealand";
-	protected $regionNames = "NZ Regions";
-	protected $continent = "oceania";
-
-	protected $extendedData = array(
-		"zipFormat" => "xxxx"
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => "North Island",
-			"regionShort" => "NI",
-			"regionSlug" => "north_island",
-			"weight" => 3,
-			"cities" => array(
-				"Auckland", "Manukau", "North Shore", "Waitakere", "Wellington", "Hamilton", "Tauranga",
-				"Lower Hutt", "Palmerston North", "Hastings", "Napier", "Rotorua", "New Plymouth", "Whangarei",
-				"Porirua", "Wanganui", "Kapiti", "Upper Hutt", "Gisborne", "Pukekohe", "Taupo", "Masterton",
-				"Levin", "Whakatane", "Cambridge", "Te Awamutu", "Feilding", "Tokoroa", "Hawera", "Waiuku",
-				"Waiheke Island", "Te Puke", "Kawerau", "Huntly", "Thames", "Morrinsville", "Matamata", "Waitara",
-				"Kerikeri", "Dannevirke"
-			)
-		),
-		array(
-			"regionName" => "South Island",
-			"regionShort" => "SI",
-			"regionSlug" => "south_island",
-			"weight" => 1,
-			"cities" => array(
-				"Christchurch", "Dunedin", "Nelson", "Invercargill", "Blenheim", "Timaru", "Ashburton",
-				"Oamaru", "Rangiora", "Queenstown", "Greymouth", "Gore", "Motueka", "Wanaka", "Alexandra",
-				"Picton", "Balclutha", "Temuka", "Westport"
-			)
-		)
-	);
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
diff --git a/plugins/countries/Spain/Spain.class.php b/plugins/countries/Spain/Spain.class.php
deleted file mode 100644
index 9e7119a7a..000000000
--- a/plugins/countries/Spain/Spain.class.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-/**
-* Spanish autonomies and cities with population >= 100.000 or province heads
-* Weight: percentage of population of the region to the total of Spain * 100
-* Source: https://es.wikipedia.org/wiki/Anexo%3AMunicipios_de_Espa%C3%B1a_por_poblaci%C3%B3n
-* @package Countries
-*/
-class Country_Spain extends CountryPlugin {
-	protected $countryName = "Spain";
-	protected $countrySlug = "spain";
-	protected $regionNames = "Spanish Autonomies";
-	protected $continent = "europe";
-
-	protected $extendedData = array(
-		"zipFormat" => "xxxxx"
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => "Andalucía",
-			"regionShort" => "AN",
-			"regionSlug" => "andalucia",
-			"weight" => 1788,
-			"cities" => array(
-				"Almería",
-				"Cádiz",
-				"Córdoba",
-				"Granada",
-				"Sevilla",
-				"Huelva",
-				"Jaén",
-				"Málaga",
-				"Jerez de la Frontera",
-				"Marbella",
-				"Dos Hermanas",
-				"Algeciras"
-			)
-		),
-		array(
-			"regionName" => "Aragón",
-			"regionShort" => "AR",
-			"regionSlug" => "aragon",
-			"weight" => 286,
-			"cities" => array(
-				"Huesca",
-				"Teruel",
-				"Zaragoza"
-			)
-		),
-		array(
-			"regionName" => "Principado de Asturias",
-			"regionShort" => "AS",
-			"regionSlug" => "asturias",
-			"weight" => 228,
-			"cities" => array(
-				"Oviedo",
-				"Gijón"
-			)
-		),
-		array(
-			"regionName" => "Cantabria",
-			"regionShort" => "CA",
-			"regionSlug" => "cantabria",
-			"weight" => 126,
-			"cities" => array(
-				"Santander"
-			)
-		),
-		array(
-			"regionName" => "Castilla - La Mancha",
-			"regionShort" => "CM",
-			"regionSlug" => "clm",
-			"weight" => 449,
-			"cities" => array(
-				"Ciudad Real",
-				"Albacete",
-				"Cuenca",
-				"Toledo",
-				"Guadalajara"
-			)
-		),
-		array(
-			"regionName" => "Castilla y León",
-			"regionShort" => "CL",
-			"regionSlug" => "cle",
-			"weight" => 539,
-			"cities" => array(
-				"Burgos",
-				"León",
-				"Palencia",
-				"Valladolid",
-				"Zamora",
-				"Ávila",
-				"Salamanca",
-				"Segovia",
-				"Soria"
-			)
-		),
-		array(
-			"regionName" => "Catalunya",
-			"regionShort" => "CA",
-			"regionSlug" => "cataluña",
-			"weight" => 1602,
-			"cities" => array(
-				"Barcelona",
-				"Tarragona",
-				"Girona",
-				"Lleida",
-				"L'Hospitalet de Llobregat",
-				"Badalona",
-				"Tarrasa",
-				"Sabadell",
-				"Mataró",
-				"Santa Coloma de Gramenet",
-				"Reus"
-			)
-		),
-		array(
-			"regionName" => "Ceuta",
-			"regionShort" => "CE",
-			"regionSlug" => "ceuta",
-			"weight" => 18,
-			"cities" => array(
-				"Ceuta"
-			)
-		),
-		array(
-			"regionName" => "Comunitat Valenciana",
-			"regionShort" => "CV",
-			"regionSlug" => "valencia",
-			"weight" => 1085,
-			"cities" => array(
-				"Castelló",
-				"Valéncia",
-				"Alacant",
-				"Elx",
-				"Torrevieja"
-			)
-		),
-		array(
-			"regionName" => "Canarias",
-			"regionShort" => "CN",
-			"regionSlug" => "canarias",
-			"weight" => 448,
-			"cities" => array(
-				"Santa Cruz de Tenerife",
-				"Las Palmas",
-				"San Cristóbal de la Laguna",
-				"Telde"
-			)
-		),
-		array(
-			"regionName" => "Illes Balears",
-			"regionShort" => "BA",
-			"regionSlug" => "baleares",
-			"weight" => 237,
-			"cities" => array(
-				"Palma de Mallorca"
-			)
-		),
-		array(
-			"regionName" => "Extremadura",
-			"regionShort" => "EX",
-			"regionSlug" => "extremadura",
-			"weight" => 234,
-			"cities" => array(
-				"Badajoz",
-				"Cáceres"
-			)
-		),
-		array(
-			"regionName" => "Galicia",
-			"regionShort" => "GA",
-			"regionSlug" => "galicia",
-			"weight" => 588,
-			"cities" => array(
-				"A Coruña",
-				"Ourense",
-				"Lugo",
-				"Pontevedra",
-				"Vigo"
-			)
-		),
-		array(
-			"regionName" => "Madrid",
-			"regionShort" => "MA",
-			"regionSlug" => "madrid",
-			"weight" => 1375,
-			"cities" => array(
-				"Madrid",
-				"Móstoles",
-				"Alcalá de Henares",
-				"Fuenlabrada",
-				"Leganés",
-				"Getafe",
-				"Alcorcón",
-				"Torrejón de Ardoz",
-				"Parla",
-				"Alcobendas"
-			)
-		),
-		array(
-			"regionName" => "Melilla",
-			"regionShort" => "ME",
-			"regionSlug" => "melilla",
-			"weight" => 17,
-			"cities" => array(
-				"Melilla"
-			)
-		),
-		array(
-			"regionName" => "Murcia",
-			"regionShort" => "MU",
-			"regionSlug" => "murcia",
-			"weight" => 312,
-			"cities" => array(
-				"Murcia",
-				"Cartagena"
-			)
-		),
-		array(
-			"regionName" => "Navarra",
-			"regionShort" => "NA",
-			"regionSlug" => "navarra",
-			"weight" => 136,
-			"cities" => array(
-				"Pamplona"
-			)
-		),
-		array(
-			"regionName" => "Euskadi",
-			"regionShort" => "PV",
-			"regionSlug" => "paisvasco",
-			"weight" => 464,
-			"cities" => array(
-				"Bilbo",
-				"Donosti",
-				"Gasteiz",
-				"Baracaldo"
-			)
-		),
-		array(
-			"regionName" => "La Rioja",
-			"regionShort" => "LR",
-			"regionSlug" => "larioja",
-			"weight" => 68,
-			"cities" => array(
-				"Logroño"
-			)
-		)
-	);
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
\ No newline at end of file
diff --git a/plugins/countries/UK/UK.class.php b/plugins/countries/UK/UK.class.php
deleted file mode 100644
index ad38e893d..000000000
--- a/plugins/countries/UK/UK.class.php
+++ /dev/null
@@ -1,770 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_UK extends CountryPlugin {
-	protected $countryName = "United Kingdom";
-	protected $countrySlug = "united_kingdom";
-	protected $regionNames = "UK Counties";
-	protected $continent = "europe";
-
-	protected $extendedData = array(
-		"zipFormat" => "Lx xLL|Lxx xLL|LxL xLL|LLx xLL|LLxx xLL|LLxL xLL",
-		"phoneFormat" => array(
-			"displayFormats" => array(
-				"0xxxx xxxxxx"	
-			)	
-		)
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => 'Aberdeenshire',
-			"regionShort" => 'AB',
-			"regionSlug" => 'aberdeenshire',
-			"weight" => 1,
-			"cities" => array(
-				"Aberdeen", "Peterhead", "Fraserburgh", "Inverurie", "Huntley", "Ellon", "Turriff"
-			)
-		),
-		array(
-			"regionName" => 'Anglesey',
-			"regionShort" => 'AG',
-			"regionSlug" => 'anglesey',
-			"weight" => 1,
-			"cities" => array(
-				"Beaumaris", "Holyhead", "Llangefni", "Amlwch", "Menai Bridge"
-			)
-		),
-		array(
-			"regionName" => 'Angus',
-			"regionShort" => 'AN',
-			"regionSlug" => 'angus',
-			"weight" => 1,
-			"cities" => array(
-				"Forfar", "Dundee", "Arbroath", "Brechin", "Montrose", "Carnoustie", "Kirriemuir"
-			)
-		),
-		array(
-			"regionName" => 'Argyllshire',
-			"regionShort" => 'AR',
-			"regionSlug" => 'argyllshire',
-			"weight" => 1,
-			"cities" => array(
-				"Inveraray", "Oban", "Dunoon", "Campbeltown", "Lochgilphead", "Tobermory"
-			)
-		),
-		array(
-			"regionName" => 'Ayrshire',
-			"regionShort" => 'AY',
-			"regionSlug" => 'ayrshire',
-			"weight" => 1,
-			"cities" => array(
-				"Ayr", "Kilmarnock", "Irvine", "Saltcoats", "Kilwinning", "Largs", "Troon", "Cumnock"
-			)
-		),
-		array(
-			"regionName" => 'Banffshire',
-			"regionShort" => 'BA',
-			"regionSlug" => 'banffshire',
-			"weight" => 1,
-			"cities" => array(
-				"Banff", "Buckie", "Keith", "Macduff", "Portsoy", "Dufftown"
-			)
-		),
-		array(
-			"regionName" => 'Bedfordshire',
-			"regionShort" => 'BD',
-			"regionSlug" => 'bedfordshire',
-			"weight" => 1,
-			"cities" => array(
-				"Bedford", "Luton", "Dunstable", "Leighton Buzzard", "Biggleswade", "Sandy"
-			)
-		),
-		array(
-			"regionName" => 'Berwickshire',
-			"regionShort" => 'BE',
-			"regionSlug" => 'berwickshire',
-			"weight" => 1,
-			"cities" => array(
-				"Greenlaw", "Duns", "Eyemouth", "Lauder", "Coldstream"
-			)
-		),
-		array(
-			"regionName" => 'Buckinghamshire',
-			"regionShort" => 'BK',
-			"regionSlug" => 'buckinghamshire',
-			"weight" => 1,
-			"cities" => array(
-				"Aylesbury", "Milton Keynes", "Slough", "Buckingham", "High Wycombe"
-			)
-		),
-		array(
-			"regionName" => 'Berkshire',
-			"regionShort" => 'BR',
-			"regionSlug" => 'berkshire',
-			"weight" => 1,
-			"cities" => array(
-				"Reading", "Bracknell", "Maidenhead", "Newbury", "Windsor", "Wokingham", "Abingdon"
-			)
-		),
-		array(
-			"regionName" => 'Caithness',
-			"regionShort" => 'CA',
-			"regionSlug" => 'caithness',
-			"weight" => 1,
-			"cities" => array(
-				"Wick", "Thurso", "Halkirk", "Castletown"
-			)
-		),
-		array(
-			"regionName" => 'Cambridgeshire',
-			"regionShort" => 'CA',
-			"regionSlug" => 'cambridgeshire',
-			"weight" => 1,
-			"cities" => array(
-				"Cambridge", "Wisbech", "Ely", "March", "Whittlesey", "Chatteris", "Linton"
-			)
-		),
-		array(
-			"regionName" => 'Cardiganshire',
-			"regionShort" => 'CG',
-			"regionSlug" => 'cardiganshire',
-			"weight" => 1,
-			"cities" => array(
-				"Cardigan", "Aberystwyth", "Lampeter", "New Quay", "Tregaron"
-			)
-		),
-		array(
-			"regionName" => 'Cheshire',
-			"regionShort" => 'CH',
-			"regionSlug" => 'cheshire',
-			"weight" => 1,
-			"cities" => array(
-				"Chester", "Stockport", "Ellesmere Port", "Birkenhead", "Wallasey", "Runcorn", "Macclesfield", "Crewe"
-			)
-		),
-		array(
-			"regionName" => 'Clackmannanshire',
-			"regionShort" => 'CL',
-			"regionSlug" => 'clackmannanshire',
-			"weight" => 1,
-			"cities" => array(
-				"Clackmannan", "Alloa", "Tillicoultry", "Tullibody"
-			)
-		),
-		array(
-			"regionName" => 'Carmarthenshire',
-			"regionShort" => 'CM',
-			"regionSlug" => 'carmarthenshire',
-			"weight" => 1,
-			"cities" => array(
-				"Carmarthen", "Llanelli", "Ammanford", "Llandovery", "Kidwelly", "St. Clears"
-			)
-		),
-		array(
-			"regionName" => 'Cornwall',
-			"regionShort" => 'CO',
-			"regionSlug" => 'cornwall',
-			"weight" => 1,
-			"cities" => array(
-				"Bodmin", "Truro", "Camborne", "Redruth", "St. Austell", "Falmouth", "Penzance", "Newquay"
-			)
-		),
-		array(
-			"regionName" => 'Cumberland',
-			"regionShort" => 'CU',
-			"regionSlug" => 'cumberland',
-			"weight" => 1,
-			"cities" => array(
-				"Carlisle", "Whitehaven", "Workington", "Penrith", "Keswick", "Brampton"
-			)
-		),
-		array(
-			"regionName" => 'Derbyshire',
-			"regionShort" => 'DB',
-			"regionSlug" => 'derbyshire',
-			"weight" => 1,
-			"cities" => array(
-				"Derby", "Chesterfield", "Glossop", "Ilkeston", "Long Eaton", "Swadlincote", "Buxton", "Matlock", "Ashbourne"
-			)
-		),
-		array(
-			"regionName" => 'Denbighshire',
-			"regionShort" => 'DE',
-			"regionSlug" => 'denbighshire',
-			"weight" => 1,
-			"cities" => array(
-				"Denbigh", "Wrexham", "Ruthin", "Abergele", "Llangollen"
-			)
-		),
-		array(
-			"regionName" => 'Devon',
-			"regionShort" => 'DE',
-			"regionSlug" => 'devon',
-			"weight" => 1,
-			"cities" => array(
-				"Exeter", "Plymouth", "Torquay", "Paignton", "Barnstaple", "Tiverton", "Newton Abbot", "Tavistock"
-			)
-		),
-		array(
-			"regionName" => 'Dunbartonshire',
-			"regionShort" => 'DN',
-			"regionSlug" => 'dunbartonshire',
-			"weight" => 1,
-			"cities" => array(
-				"Dumbarton", "Clydebank", "Cumbernauld", "Helensburgh", "Alexandria", "Kirkintilloch"
-			)
-		),
-		array(
-			"regionName" => 'Dorset',
-			"regionShort" => 'DO',
-			"regionSlug" => 'dorset',
-			"weight" => 1,
-			"cities" => array(
-				"Dorchester", "Poole", "Weymouth", "Sherborne", "Wimborne Minster", "Shaftesbury"
-			)
-		),
-		array(
-			"regionName" => 'East Lothian',
-			"regionShort" => 'EL',
-			"regionSlug" => 'east_lothian',
-			"weight" => 1,
-			"cities" => array(
-				"Haddington", "North Berwick", "Dunbar", "Tranent", "East Linton"
-			)
-		),
-		array(
-			"regionName" => 'Essex',
-			"regionShort" => 'ES',
-			"regionSlug" => 'essex',
-			"weight" => 1,
-			"cities" => array(
-				"Chelmsford", "Basildon", "Romford", "Southend", "Colchester", "Harlow", "Brentwood", "West Ham"
-			)
-		),
-		array(
-			"regionName" => 'Fife',
-			"regionShort" => 'FI',
-			"regionSlug" => 'fife',
-			"weight" => 1,
-			"cities" => array(
-				"Cupar", "Dunfermline", "Glenrothes", "Kirkcaldy", "St. Andrews", "Cowdenbeath", "Burntisland"
-			)
-		),
-		array(
-			"regionName" => 'Flintshire',
-			"regionShort" => 'FL',
-			"regionSlug" => 'flintshire',
-			"weight" => 1,
-			"cities" => array(
-				"Mold", "Flint", "Rhyl", "Prestatyn", "Connah's Quay", "Holywell", "Buckley", "St. Asaph"
-			)
-		),
-		array(
-			"regionName" => 'Glamorgan',
-			"regionShort" => 'GL',
-			"regionSlug" => 'glamorgan',
-			"weight" => 1,
-			"cities" => array(
-				"Cardiff", "Swansea", "Merthyr Tydfil", "Barry", "Caerphilly", "Bridgend", "Neath", "Pontypridd"
-			)
-		),
-		array(
-			"regionName" => 'Gloucestershire',
-			"regionShort" => 'GL',
-			"regionSlug" => 'gloucestershire',
-			"weight" => 1,
-			"cities" => array(
-				"Gloucester", "Bristol", "Cheltenham", "Stroud", "Cirencester", "Tewkesbury"
-			)
-		),
-		array(
-			"regionName" => 'Hampshire',
-			"regionShort" => 'HA',
-			"regionSlug" => 'hampshire',
-			"weight" => 1,
-			"cities" => array(
-				"Winchester", "Southampton", "Portsmouth", "Bournemouth", "Basingstoke", "Newport"
-			)
-		),
-		array(
-			"regionName" => 'Herefordshire',
-			"regionShort" => 'HE',
-			"regionSlug" => 'herefordshire',
-			"weight" => 1,
-			"cities" => array(
-				"Hereford", "Ross-on-Wye", "Leominster", "Ledbury", "Bromyard", "Kington"
-			)
-		),
-		array(
-			"regionName" => 'Hertfordshire',
-			"regionShort" => 'HR',
-			"regionSlug" => 'hertfordshire',
-			"weight" => 1,
-			"cities" => array(
-				"Hertford", "Watford", "St. Albans", "Hemel Hempstead", "Stevenage", "Hatfield"
-			)
-		),
-		array(
-			"regionName" => 'Huntingdonshire',
-			"regionShort" => 'HU',
-			"regionSlug" => 'huntingdonshire',
-			"weight" => 1,
-			"cities" => array(
-				"Huntingdon", "St. Ives", "St. Neots", "Ramsey", "Yaxley"
-			)
-		),
-		array(
-			"regionName" => 'Inverness-shire',
-			"regionShort" => 'IN',
-			"regionSlug" => 'inverness_shire',
-			"weight" => 1,
-			"cities" => array(
-				"Inverness", "Fort William", "Kingussie", "Newtonmore", "Portree"
-			)
-		),
-		array(
-			"regionName" => 'Kincardineshire',
-			"regionShort" => 'KC',
-			"regionSlug" => 'kincardineshire',
-			"weight" => 1,
-			"cities" => array(
-				"Stonehaven", "Banchory", "Laurencekirk", "Inverbervie"
-			)
-		),
-		array(
-			"regionName" => 'Kent',
-			"regionShort" => 'KE',
-			"regionSlug" => 'kent',
-			"weight" => 1,
-			"cities" => array(
-				"Maidstone", "Canterbury", "Bromley", "Rochester", "Margate", "Folkestone", "Dover", "Greenwich"
-			)
-		),
-		array(
-			"regionName" => 'Kirkcudbrightshire',
-			"regionShort" => 'KK',
-			"regionSlug" => 'kirkcudbrightshire',
-			"weight" => 1,
-			"cities" => array(
-				"Kircudbright", "Castle Douglas", "Dalbeattie", "New Galloway"
-			)
-		),
-		array(
-			"regionName" => 'Kinross-shire',
-			"regionShort" => 'KR',
-			"regionSlug" => 'kinross_shire',
-			"weight" => 1,
-			"cities" => array(
-				"Kinross", "Milnathort"
-			)
-		),
-		array(
-			"regionName" => 'Lancashire',
-			"regionShort" => 'LA',
-			"regionSlug" => 'lancashire',
-			"weight" => 1,
-			"cities" => array(
-				"Lancaster", "Liverpool", "Manchester", "Preston", "Bolton", "Warrington", "Barrow-in-Furness"
-			)
-		),
-		array(
-			"regionName" => 'Leicestershire',
-			"regionShort" => 'LE',
-			"regionSlug" => 'leicestershire',
-			"weight" => 1,
-			"cities" => array(
-				"Leicester", "Loughborough", "Hinckley", "Melton Mowbray", "Coalville", "Lutterworth"
-			)
-		),
-		array(
-			"regionName" => 'Lincolnshire',
-			"regionShort" => 'LI',
-			"regionSlug" => 'lincolnshire',
-			"weight" => 1,
-			"cities" => array(
-				"Lincoln", "Grimsby", "Scunthorpe", "Boston", "Grantham", "Stamford", "Skegness", "Louth"
-			)
-		),
-		array(
-			"regionName" => 'Lanarkshire',
-			"regionShort" => 'LK',
-			"regionSlug" => 'lanarkshire',
-			"weight" => 1,
-			"cities" => array(
-				"Lanark", "Glasgow", "East Kilbride", "Hamilton", "Motherwell", "Coatbridge", "Carluke"
-			)
-		),
-		array(
-			"regionName" => 'Merionethshire',
-			"regionShort" => 'ME',
-			"regionSlug" => 'merionethshire',
-			"weight" => 1,
-			"cities" => array(
-				"Dolgellau", "Bala", "Tywyn", "Blaenau Ffestiniog", "Barmouth", "Harlech"
-			)
-		),
-		array(
-			"regionName" => 'Montgomeryshire',
-			"regionShort" => 'MG',
-			"regionSlug" => 'montgomeryshire',
-			"weight" => 1,
-			"cities" => array(
-				"Montgomery", "Newtown", "Welshpool", "Machynlleth", "Llanidloes"
-			)
-		),
-		array(
-			"regionName" => 'Midlothian',
-			"regionShort" => 'ML',
-			"regionSlug" => 'midlothian',
-			"weight" => 1,
-			"cities" => array(
-				"Edinburgh", "Musselburgh", "Penicuik", "Dalkeith", "Bonnyrigg"
-			)
-		),
-		array(
-			"regionName" => 'Monmouthshire',
-			"regionShort" => 'MO',
-			"regionSlug" => 'monmouthshire',
-			"weight" => 1,
-			"cities" => array(
-				"Monmouth", "Newport", "Blackwood", "Cwmbran", "Abergavenny", "Chepstow", "Tredegar"
-			)
-		),
-		array(
-			"regionName" => 'Morayshire',
-			"regionShort" => 'MO',
-			"regionSlug" => 'morayshire',
-			"weight" => 1,
-			"cities" => array(
-				"Elgin", "Forres", "Rothes", "Lossiemouth", "Fochabers"
-			)
-		),
-		array(
-			"regionName" => 'Northumberland',
-			"regionShort" => 'NB',
-			"regionSlug" => 'northumberland',
-			"weight" => 1,
-			"cities" => array(
-				"Alnwick", "Newcastle-upon-Tyne", "Morpeth", "Hexham", "Berwick-upon-Tweed"
-			)
-		),
-		array(
-			"regionName" => 'Norfolk',
-			"regionShort" => 'NF',
-			"regionSlug" => 'norfolk',
-			"weight" => 1,
-			"cities" => array(
-				"Norwich", "Great Yarmouth", "King's Lynn", "Dereham", "Cromer", "Hunstanton"
-			)
-		),
-		array(
-			"regionName" => 'Northamptonshire',
-			"regionShort" => 'NT',
-			"regionSlug" => 'northamptonshire',
-			"weight" => 1,
-			"cities" => array(
-				"Northampton", "Peterborough", "Corby", "Kettering", "Wellingborough"
-			)
-		),
-		array(
-			"regionName" => 'Nottinghamshire',
-			"regionShort" => 'NT',
-			"regionSlug" => 'nottinghamshire',
-			"weight" => 1,
-			"cities" => array(
-				"Nottingham", "Mansfield", "Worksop", "Newark", "Retford", "Southwell"
-			)
-		),
-		array(
-			"regionName" => 'Orkney',
-			"regionShort" => 'OK',
-			"regionSlug" => 'orkney',
-			"weight" => 1,
-			"cities" => array(
-				"Kirkwall", "Sromness", "Balfour"
-			)
-		),
-		array(
-			"regionName" => 'Oxfordshire',
-			"regionShort" => 'OX',
-			"regionSlug" => 'oxfordshire',
-			"weight" => 1,
-			"cities" => array(
-				"Oxford", "Banbury", "Witney", "Bicester", "Henley-on-Thames", "Carterton", "Thame", "Bloxham"
-			)
-		),
-		array(
-			"regionName" => 'Pembrokeshire',
-			"regionShort" => 'PE',
-			"regionSlug" => 'pembrokeshire',
-			"weight" => 1,
-			"cities" => array(
-				"Pembroke", "Milford Haven", "Haverfordwest", "Fishguard", "Tenby", "St. David's"
-			)
-		),
-		array(
-			"regionName" => 'Radnorshire',
-			"regionShort" => 'RA',
-			"regionSlug" => 'radnorshire',
-			"weight" => 1,
-			"cities" => array(
-				"Presteigne", "Llandrindod Wells", "Knighton", "Rhayader", "New Radnor"
-			)
-		),
-		array(
-			"regionName" => 'Renfrewshire',
-			"regionShort" => 'RF',
-			"regionSlug" => 'renfrewshire',
-			"weight" => 1,
-			"cities" => array(
-				"Renfrew", "Paisley", "Greenock", "Johnstone", "Port Glasgow", "Barrhead", "Kilmalcolm"
-			)
-		),
-		array(
-			"regionName" => 'Roxburghshire',
-			"regionShort" => 'RO',
-			"regionSlug" => 'roxburghshire',
-			"weight" => 1,
-			"cities" => array(
-				"Jedburgh", "Hawick", "Kelso", "Melrose", "Roxburgh"
-			)
-		),
-		array(
-			"regionName" => 'Rutland',
-			"regionShort" => 'RU',
-			"regionSlug" => 'rutland',
-			"weight" => 1,
-			"cities" => array(
-				"Oakham", "Uppingham. Cottesmore"
-			)
-		),
-		array(
-			"regionName" => 'Shropshire',
-			"regionShort" => 'SA',
-			"regionSlug" => 'shropshire',
-			"weight" => 1,
-			"cities" => array(
-				"Shrewsbury", "Telford", "Oswestry", "Bridgnorth", "Whitchurch", "Market Drayton", "Ludlow"
-			)
-		),
-		array(
-			"regionName" => 'Selkirkshire',
-			"regionShort" => 'SE',
-			"regionSlug" => 'selkirkshire',
-			"weight" => 1,
-			"cities" => array(
-				"Selkirk", "Clovenfords", "Galashiels"
-			)
-		),
-		array(
-			"regionName" => 'Suffolk',
-			"regionShort" => 'SF',
-			"regionSlug" => 'suffolk',
-			"weight" => 1,
-			"cities" => array(
-				"Ipswich", "Bury St. Edmunds", "Lowestoft", "Felixstowe", "Sudbury", "Haverhill", "Bungay"
-			)
-		),
-		array(
-			"regionName" => 'Shetland',
-			"regionShort" => 'SH',
-			"regionSlug" => 'shetland',
-			"weight" => 1,
-			"cities" => array(
-				"Lerwick", "Scalloway", "Baltasound"
-			)
-		),
-		array(
-			"regionName" => 'Somerset',
-			"regionShort" => 'SO',
-			"regionSlug" => 'somerset',
-			"weight" => 1,
-			"cities" => array(
-				"Taunton", "Bath", "Weston-super-Mare", "Yeovil", "Bridgwater", "Wells", "Glastonbury"
-			)
-		),
-		array(
-			"regionName" => 'Surrey',
-			"regionShort" => 'SR',
-			"regionSlug" => 'surrey',
-			"weight" => 1,
-			"cities" => array(
-				"Guildford", "Croydon", "Woking", "Sutton", "Kingston-on-Thames", "Wandsworth", "Wimbledon", "Brixton"
-			)
-		),
-		array(
-			"regionName" => 'Sussex',
-			"regionShort" => 'SS',
-			"regionSlug" => 'sussex',
-			"weight" => 1,
-			"cities" => array(
-				"Chichester", "Brighton", "Worthing", "Crawley", "Hastings", "Eastbourne", "Bognor Regis", "Horsham"
-			)
-		),
-		array(
-			"regionName" => 'Stirlingshire',
-			"regionShort" => 'ST',
-			"regionSlug" => 'stirlingshire',
-			"weight" => 1,
-			"cities" => array(
-				"Stirling", "Falkirk", "Grangemouth", "Kilsyth", "Bridge of Allan", "Denny", "Alva"
-			)
-		),
-		array(
-			"regionName" => 'Staffordshire',
-			"regionShort" => 'ST',
-			"regionSlug" => 'staffordshire',
-			"weight" => 1,
-			"cities" => array(
-				"Stafford", "Stoke-on-Trent", "Wolverhampton", "Walsall", "Cannock", "Lichfield"
-			)
-		),
-		array(
-			"regionName" => 'Sutherland',
-			"regionShort" => 'SU',
-			"regionSlug" => 'sutherland',
-			"weight" => 1,
-			"cities" => array(
-				"Dornoch", "Helmsdale", "Brora", "Golspie", "Lairg", "Durness", "Tongue"
-			)
-		),
-		array(
-			"regionName" => 'Warwickshire',
-			"regionShort" => 'WA',
-			"regionSlug" => 'warwickshire',
-			"weight" => 1,
-			"cities" => array(
-				"Warwick", "Birmingham", "Coventry", "Nuneaton", "Rugby", "Solihull", "Stratford-upon-Avon"
-			)
-		),
-		array(
-			"regionName" => 'Westmorland',
-			"regionShort" => 'WE',
-			"regionSlug" => 'westmorland',
-			"weight" => 1,
-			"cities" => array(
-				"Appleby", "Kendal", "Windermere", "Ambleside", "Kirkby Lonsdale"
-			)
-		),
-		array(
-			"regionName" => 'Wigtownshire',
-			"regionShort" => 'WI',
-			"regionSlug" => 'wigtownshire',
-			"weight" => 1,
-			"cities" => array(
-				"Wigtown", "Stranraer", "Newton Stewart", "Whithorn"
-			)
-		),
-		array(
-			"regionName" => 'Wiltshire',
-			"regionShort" => 'WI',
-			"regionSlug" => 'wiltshire',
-			"weight" => 1,
-			"cities" => array(
-				"Trowbridge", "Salisbury", "Swindon", "Chippenham", "Devizes", "Marlborough", "Warminster"
-			)
-		),
-		array(
-			"regionName" => 'West Lothian',
-			"regionShort" => 'WL',
-			"regionSlug" => 'west_lothian',
-			"weight" => 1,
-			"cities" => array(
-				"Linlithgow", "Livingston", "Bo'ness", "Broxburn", "Whitburn", "Armadale", "Bathgate"
-			)
-		),
-		array(
-			"regionName" => 'Worcestershire',
-			"regionShort" => 'WO',
-			"regionSlug" => 'worcestershire',
-			"weight" => 1,
-			"cities" => array(
-				"Worcester", "Dudley", "Kidderminster", "Stourbridge", "Halesowen", "Malvern", "Evesham"
-			)
-		),
-		array(
-			"regionName" => 'Yorkshire',
-			"regionShort" => 'YK',
-			"regionSlug" => 'yorkshire',
-			"weight" => 1,
-			"cities" => array(
-				"Northallerton", "Middlesbrough", "Scarborough", "Whitby", "Beverley", "Hull", "Bridlington",
-				"Driffield", "Hornsea", "Filey", "Wakefield", "Leeds", "Sheffield", "Bradford", "Halifax",
-				"Harrogate", "York"
-			)
-		),
-		array(
-			"regionName" => 'Durham',
-			"regionShort" => 'DU',
-			"regionSlug" => 'durham',
-			"weight" => 1,
-			"cities" => array(
-				"Durham", "Sunderland", "Stockton-on-Tees", "Darlington", "Hartlepool", "Gateshead", "Washington"
-			)
-		),
-		array(
-			"regionName" => 'Brecknockshire',
-			"regionShort" => 'BR',
-			"regionSlug" => 'brecknockshire',
-			"weight" => 1,
-			"cities" => array(
-				"Brecon", "Builth Wells", "Hay-on-Wye", "Talgarth", "Llanwrtwd Wells"
-			)
-		),
-		array(
-			"regionName" => 'Buteshire',
-			"regionShort" => 'BU',
-			"regionSlug" => 'buteshire',
-			"weight" => 1,
-			"cities" => array(
-				"Rothesay", "Millport", "Brodick", "Lochranza"
-			)
-		),
-		array(
-			"regionName" => 'Dumfriesshire',
-			"regionShort" => 'DF',
-			"regionSlug" => 'dumfriesshire',
-			"weight" => 1,
-			"cities" => array(
-				"Dumfries", "Annan", "Lockerbie", "Moffat", "Sanquhar", "Langholm", "Gretna"
-			)
-		),
-		array(
-			"regionName" => 'Nairnshire',
-			"regionShort" => 'NA',
-			"regionSlug" => 'nairnshire',
-			"weight" => 1,
-			"cities" => array(
-				"Nairn", "Auldearn", "Cawdor", "Ferness"
-			)
-		),
-		array(
-			"regionName" => 'Perthshire',
-			"regionShort" => 'PE',
-			"regionSlug" => 'perthshire',
-			"weight" => 1,
-			"cities" => array(
-				"Perth", "Crieff", "Pitlochry", "Callander", "Blairgowrie", "Rattray", "Coupar Angus", "Kincardine"
-			)
-		),
-		array(
-			"regionName" => 'Ross-shire',
-			"regionShort" => 'RO',
-			"regionSlug" => 'ross_shire',
-			"weight" => 1,
-			"cities" => array(
-				"Dingwall", "Stornaway", "Tain", "Alness", "Invergordon"
-			)
-		)
-	);
-
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
-
diff --git a/plugins/countries/US/US.class.php b/plugins/countries/US/US.class.php
deleted file mode 100644
index 91bc86a9f..000000000
--- a/plugins/countries/US/US.class.php
+++ /dev/null
@@ -1,447 +0,0 @@
-<?php
-
-/**
- * @package Countries
- */
-
-class Country_US extends CountryPlugin {
-	protected $continent   = "north_america";
-	protected $countryName = "United States";
-	protected $countrySlug = "US";
-	protected $regionNames = "US States";
-
-	protected $extendedData = array(
-		"zipFormat" => array(
-			"format" => "Xxxxx",
-			"replacements" => array(
-				"X" => "123456789",
-				"x" => "0123456789"
-			)
-		),
-		"phoneFormat" => array(
-			"displayFormats" => array(
-				"(AAA) Xxx-xxxx",
-				"1 (AAA) Xxx-xxxx",
-				"1-AAA-Xxx-xxxx"
-			)
-		)
-	);
-
-	protected $countryData = array(
-		array(
-			"regionName" => 'Alabama',
-			"regionShort" => 'AL',
-			"regionSlug" => 'alabama',
-			"weight" => 2,
-			"cities" => array(
-				"Birmingham", "Montgomery", "Mobile", "Huntsville", "Tuscaloosa", "Birmingham", "Montgomery", "Mobile", "Huntsville", "Tuscaloosa"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "ZYxxx",
-					"replacements" => array(
-						"Z" => "3",
-						"Y" => "56",
-						"x" => "0123456789"
-					)
-				)
-			)
-		),
-		array(
-			"regionName" => 'Alaska',
-			"regionShort" => 'AK',
-			"regionSlug" => 'alaska',
-			"weight" => 2,
-			"cities" => array(
-				"Anchorage", "Fairbanks", "Juneau", "College", "Anchorage", "Fairbanks", "Juneau", "College", "Ketchikan"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "ZZYxx",
-					"replacements" => array(
-						"Z" => "9",
-						"Y" => "56789",
-						"x" => "0123456789"
-					)
-				)
-			)
-		),
-		array(
-			"regionName" => 'Arizona',
-			"regionShort" => 'AZ',
-			"regionSlug" => 'arizona',
-			"weight" => 2,
-			"cities" => array(
-				"Phoenix", "Tucson", "Mesa", "Glendale", "Chandler"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "ZYxxx",
-					"replacements" => array(
-						"Z" => "8",
-						"Y" => "56",
-						"x" => "0123456789"
-					)
-				)
-			)
-		),
-		array(
-			"regionName" => 'Arkansas',
-			"regionShort" => 'AR',
-			"regionSlug" => 'arkansas',
-			"weight" => 2,
-			"cities" => array(
-				"Little Rock", "Fort Smith", "Fayetteville", "Springdale", "Jonesboro"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"format" => "ZYxxx",
-					"replacements" => array(
-						"Z" => "7",
-						"Y" => "12",
-						"x" => "0123456789"
-					)
-				)
-			)
-		),
-		array(
-			"regionName" => 'California',
-			"regionShort" => 'CA',
-			"regionSlug" => 'california',
-			"weight" => 2,
-			"cities" => array(
-				"Los Angeles", "San Diego", "San Jose", "San Francisco", "Fresno", "Sacramento"
-			),
-			"extendedData" => array(
-				"zipFormat" => array(
-					"area" => "US-CA",
-					"format" => "ZYxxx",
-					"replacements" => array(
-						"Z" => "9",
-						"Y" => "0123456",
-						"x" => "0123456789"
-					)
-				)
-			)
-		),
-		array(
-			"regionName" => 'Colorado',
-			"regionShort" => 'CO',
-			"regionSlug" => 'colorado',
-			"weight" => 2,
-			"cities" => array(
-				"Denver", "Colorado Springs", "Aurora", "Lakewood", "Fort Collins"
-			)
-		),
-		array(
-			"regionName" => 'Connecticut',
-			"regionShort" => 'CT',
-			"regionSlug" => 'connecticut',
-			"weight" => 2,
-			"cities" => array(
-				"Bridgeport", "New Haven", "Hartford", "Stamford", "Waterbury"
-			)
-		),
-		array(
-			"regionName" => 'Delaware',
-			"regionShort" => 'DE',
-			"regionSlug" => 'delaware',
-			"weight" => 2,
-			"cities" => array(
-				"Wilmington", "Dover", "Newark", "Pike Creek", "Bear"
-			)
-		),
-		array(
-			"regionName" => 'Florida',
-			"regionShort" => 'FL',
-			"regionSlug" => 'florida',
-			"weight" => 2,
-			"cities" => array(
-				"Jacksonville", "Miami", "Tampa", "St. Petersburg", "Orlando", "Tallahassee"
-			)
-		),
-		array(
-			"regionName" => 'Georgia',
-			"regionShort" => 'GA',
-			"regionSlug" => 'georgia',
-			"weight" => 2,
-			"cities" => array(
-				"Georgia", "Atlanta", "Augusta", "Columbus", "Savannah", "Athens"
-			)
-		),
-		array(
-			"regionName" => 'Hawaii',
-			"regionShort" => 'HI',
-			"regionSlug" => 'hawaii',
-			"weight" => 2,
-			"cities" => array(
-				"Honolulu", "Hilo", "Kailua", "Kaneohe", "Kapolei"
-			)
-		),
-		array(
-			"regionName" => 'Idaho',
-			"regionShort" => 'ID',
-			"regionSlug" => 'idaho',
-			"weight" => 2,
-			"cities" => array(
-				"Boise", "Nampa", "Meridian", "Pocatello", "Idaho Falls"
-			)
-		),
-		array(
-			"regionName" => 'Illinois',
-			"regionShort" => 'IL',
-			"regionSlug" => 'illinois',
-			"weight" => 2,
-			"cities" => array(
-				"Chicago", "Aurora", "Rockford", "Joliet", "Naperville", "Springfield"
-			)
-		),
-		array(
-			"regionName" => 'Indiana',
-			"regionShort" => 'IN',
-			"regionSlug" => 'indiana',
-			"weight" => 2,
-			"cities" => array(
-				"Indianapolis", "Fort Wayne", "Evansville", "South Bend", "Gary"
-			)
-		),
-		array(
-			"regionName" => 'Iowa',
-			"regionShort" => 'IA',
-			"regionSlug" => 'iowa',
-			"weight" => 2,
-			"cities" => array(
-				"Des Moines", "Cedar Rapids", "Davenport", "Sioux City", "Iowa City"
-			)
-		),
-		array(
-			"regionName" => 'Kansas',
-			"regionShort" => 'KS',
-			"regionSlug" => 'kansas',
-			"weight" => 2,
-			"cities" => array(
-				"Wichita", "Overland Park", "Kansas City", "Topeka", "Olathe"
-			)
-		),
-		array(
-			"regionName" => 'Kentucky',
-			"regionShort" => 'KY',
-			"regionSlug" => 'kentucky',
-			"weight" => 2,
-			"cities" => array(
-				"Louisville", "Lexington", "Owensboro", "Bowling Green", "Covington", "Frankfort"
-			)
-		),
-		array(
-			"regionName" => 'Louisiana',
-			"regionShort" => 'LA',
-			"regionSlug" => 'louisiana',
-			"weight" => 2,
-			"cities" => array(
-				"New Orleans", "Baton Rouge", "Shreveport", "Metairie", "Lafayette"
-			)
-		),
-		array(
-			"regionName" => 'Maine',
-			"regionShort" => 'ME',
-			"regionSlug" => 'maine',
-			"weight" => 2,
-			"cities" => array(
-				"Portland", "Lewiston", "Bangor", "South Portland", "Auburn", "Augusta"
-			)
-		),
-		array(
-			"regionName" => 'Maryland',
-			"regionShort" => 'MD',
-			"regionSlug" => 'maryland',
-			"weight" => 2,
-			"cities" => array(
-				"Baltimore", "Rockville", "Frederick", "Gaithersburg", "Columbia", "Annapolis"
-			)
-		),
-		array(
-			"regionName" => 'Massachusetts',
-			"regionShort" => 'MA',
-			"regionSlug" => 'massachusetts',
-			"weight" => 2,
-			"cities" => array(
-				"Boston", "Worcester", "Springfield", "Lowell", "Cambridge"
-			)
-		),
-		array(
-			"regionName" => 'Michigan',
-			"regionShort" => 'MI',
-			"regionSlug" => 'michigan',
-			"weight" => 2,
-			"cities" => array(
-				"Detroit", "Grand Rapids", "Warren", "Sterling Heights", "Flint", "Lansing"
-			)
-		),
-		array(
-			"regionName" => 'Minnesota',
-			"regionShort" => 'MN',
-			"regionSlug" => 'minnesota',
-			"weight" => 2,
-			"cities" => array(
-				"Minneapolis", "Saint Paul", "Rochester", "Duluth", "Bloomington"
-			)
-		),
-		array(
-			"regionName" => 'Mississippi',
-			"regionShort" => 'MS',
-			"regionSlug" => 'mississippi',
-			"weight" => 2,
-			"cities" => array(
-				"Jackson", "Gulfport", "Hattiesburg", "Biloxi", "Southaven"
-			)
-		),
-		array(
-			"regionName" => 'Missouri',
-			"regionShort" => 'MO',
-			"regionSlug" => 'missouri',
-			"weight" => 2,
-			"cities" => array(
-				"Kansas City", "Saint Louis", "Springfield", "Independence", "Columbia", "Jefferson City"
-			)
-		),
-		array(
-			"regionName" => 'Montana',
-			"regionShort" => 'MT',
-			"regionSlug" => 'montana',
-			"weight" => 2,
-			"cities" => array(
-				"Billings", "Missoula", "Great Falls", "Butte", "Bozeman", "Helena"
-			)
-		),
-		array(
-			"regionName" => 'Nebraska',
-			"regionShort" => 'NE',
-			"regionSlug" => 'nebraska',
-			"weight" => 2,
-			"cities" => array(
-				"Omaha", "Lincoln", "Bellevue", "Grand Island", "Kearney"
-			)
-		),
-		array(
-			"regionName" => 'Nevada',
-			"regionShort" => 'NV',
-			"regionSlug" => 'nevada',
-			"weight" => 2,
-			"cities" => array(
-				"Las Vegas", "Henderson", "North Las Vegas", "Reno", "Paradise", "Carson City"
-			)
-		),
-		array(
-			"regionName" => 'Ohio',
-			"regionShort" => 'OH',
-			"regionSlug" => 'ohio',
-			"weight" => 2,
-			"cities" => array(
-				"Columbus", "Cleveland", "Cincinnati", "Toledo", "Akron"
-			)
-		),
-		array(
-			"regionName" => 'Oklahoma',
-			"regionShort" => 'OK',
-			"regionSlug" => 'oklahoma',
-			"weight" => 2,
-			"cities" => array(
-				"Oklahoma City", "Tulsa", "Norman", "Lawton", "Broken Arrow"
-			)
-		),
-		array(
-			"regionName" => 'Oregon',
-			"regionShort" => 'OR',
-			"regionSlug" => 'oregon',
-			"weight" => 2,
-			"cities" => array(
-				"Portland", "Eugene", "Salem", "Gresham", "Hillsboro"
-			)
-		),
-		array(
-			"regionName" => 'Pennsylvania',
-			"regionShort" => 'PA',
-			"regionSlug" => 'pennsylvania',
-			"weight" => 2,
-			"cities" => array(
-				"Philadelphia", "Pittsburgh", "Allentown", "Erie", "Reading", "Harrisburg"
-			)
-		),
-		array(
-			"regionName" => 'Tennessee',
-			"regionShort" => 'TN',
-			"regionSlug" => 'tennessee',
-			"weight" => 2,
-			"cities" => array(
-				"Memphis", "Nashville", "Knoxville", "Chattanooga", "Clarksville"
-			)
-		),
-		array(
-			"regionName" => 'Texas',
-			"regionShort" => 'TX',
-			"regionSlug" => 'texas',
-			"weight" => 2,
-			"cities" => array(
-				"Houston", "San Antonio", "Dallas", "Austin", "Fort Worth"
-			)
-		),
-		array(
-			"regionName" => 'Utah',
-			"regionShort" => 'UT',
-			"regionSlug" => 'utah',
-			"weight" => 2,
-			"cities" => array(
-				"Salt Lake City", "West Valley City", "Provo", "West Jordan", "Sandy"
-			)
-		),
-		array(
-			"regionName" => 'Vermont',
-			"regionShort" => 'VT',
-			"regionSlug" => 'vermont',
-			"weight" => 2,
-			"cities" => array(
-				"Burlington", "Essex", "Rutland", "Colchester", "South Burlington", "Montpelier"
-			)
-		),
-		array(
-			"regionName" => 'Virginia',
-			"regionShort" => 'VA',
-			"regionSlug" => 'virginia',
-			"weight" => 2,
-			"cities" => array(
-				"Virginia Beach", "Norfolk", "Chesapeake", "Richmond", "Newport News"
-			)
-		),
-		array(
-			"regionName" => 'Washington',
-			"regionShort" => 'WA',
-			"regionSlug" => 'washington',
-			"weight" => 2,
-			"cities" => array(
-				"Seattle", "Spokane", "Tacoma", "Vancouver", "Bellevue", "Olympia"
-			)
-		),
-		array(
-			"regionName" => 'Wisconsin',
-			"regionShort" => 'WI',
-			"regionSlug" => 'wisconsin',
-			"weight" => 2,
-			"cities" => array(
-				"Milwaukee", "Madison", "Green Bay", "Kenosha", "Racine"
-			)
-		),
-		array(
-			"regionName" => 'Wyoming',
-			"regionShort" => 'WY',
-			"regionSlug" => 'wyoming',
-			"weight" => 2,
-			"cities" => array(
-				"Wyoming", "Cheyenne", "Casper", "Laramie", "Gillette", "Rock Springs"
-			)
-		)
-	);
-
-	public function install() {
-		return CountryPluginHelper::populateDB($this->countryName, $this->countrySlug, $this->countryData);
-	}
-}
diff --git a/plugins/dataTypes/AlphaNumeric/AlphaNumeric.class.php b/plugins/dataTypes/AlphaNumeric/AlphaNumeric.class.php
deleted file mode 100644
index 0ea560c7a..000000000
--- a/plugins/dataTypes/AlphaNumeric/AlphaNumeric.class.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package DataTypes
- */
-class DataType_AlphaNumeric extends DataTypePlugin {
-
-	/**#@+
-     * @access protected
-     */
-	protected $isEnabled = true;
-	protected $dataTypeName = "Alphanumeric";
-	protected $dataTypeFieldGroup = "numeric";
-	protected $dataTypeFieldGroupOrder = 10;
-	protected $jsModules = array("AlphaNumeric.js");
-
-
-	public function generate($generator, $generationContextData) {
-		$formats = explode("|", $generationContextData["generationOptions"]);
-		$chosenFormat = $formats[0];
-		if (count($formats) > 1) {
-			$chosenFormat = $formats[mt_rand(0, count($formats)-1)];
-		}
-		$val = Utils::generateRandomAlphanumericStr($chosenFormat);
-		return array(
-			"display" => $val
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		if (!isset($postdata["dtOption_$colNum"]) || empty($postdata["dtOption_$colNum"])) {
-			return false;
-		}
-		return $postdata["dtOption_$colNum"];
-	}
-
-	public function getExampleColumnHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-		$html =<<< END
-	<select name="dtExample_%ROW%" id="dtExample_%ROW%">
-		<option value="">{$L["please_select"]}</option>
-		<option value="LxL xLx">V6M 4C1 {$this->L["example_CanPostalCode"]}</option>
-		<option value="xxxxx">90210 {$this->L["example_USZipCode"]}</option>
-		<option value="LLLxxLLLxLL">eZg29gdF5K1 {$this->L["example_Password"]}</option>
-	</select>
-END;
-		return $html;
-	}
-
-	public function getOptionsColumnHTML() {
-		return '<input type="text" name="dtOption_%ROW%" id="dtOption_%ROW%" style="width: 267px" />';
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255)",
-			"SQLField_Oracle" => "varchar2(255)",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		$content =<<<EOF
-			<p>
-				{$this->L["help_intro"]}
-			</p>
-
-			<table cellpadding="0" cellspacing="1" width="100%">
-			<tr>
-				<td width="20"><h4>L</h4></td>
-				<td width="200">{$this->L["help_1"]}</td>
-				<td width="20"><h4>V</h4></td>
-				<td>{$this->L["help_2"]}</td>
-			</tr>
-			<tr>
-				<td><h4>l</h4></td>
-				<td>{$this->L["help_3"]}</td>
-				<td><h4>v</h4></td>
-				<td>{$this->L["help_4"]}</td>
-			</tr>
-			<tr>
-				<td><h4>D</h4></td>
-				<td>{$this->L["help_5"]}</td>
-				<td><h4>F</h4></td>
-				<td>{$this->L["help_6"]}</td>
-			</tr>
-			<tr>
-				<td><h4>C</h4></td>
-				<td>{$this->L["help_7"]}</td>
-				<td><h4>x</h4></td>
-				<td>{$this->L["help_8"]}</td>
-			</tr>
-			<tr>
-				<td><h4>c</h4></td>
-				<td>{$this->L["help_9"]}</td>
-				<td><h4>X</h4></td>
-				<td>{$this->L["help_10"]}</td>
-			</tr>
-			<tr>
-				<td><h4>E</h4></td>
-				<td>{$this->L["help_11"]}</td>
-				<td><h4>H</h4></td>
-				<td>{$this->L["help_12"]}</td>
-			</tr>
-			</table>
-EOF;
-
-		return $content;
-	}
-
-
-	public function getRestOptionsFormat() {
-		return array(
-			"key" => "options",
-			"required" => true,
-			"type" => "mixed"
-		);
-	}
-}
\ No newline at end of file
diff --git a/plugins/dataTypes/AlphaNumeric/AlphaNumeric.js b/plugins/dataTypes/AlphaNumeric/AlphaNumeric.js
deleted file mode 100755
index a96ba0467..000000000
--- a/plugins/dataTypes/AlphaNumeric/AlphaNumeric.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name AlphaNumeric
-	 * @description JS code for the AlphaNumeric Data Type.
-	 * @see DataType
-	 * @namespace
-	 */
-
-	var MODULE_ID = "data-type-AlphaNumeric";
-	var LANG = L.dataTypePlugins.AlphaNumeric;
-	var subscriptions = {};
-
-	var _init = function() {
-		subscriptions[C.EVENT.DATA_TABLE.ROW.EXAMPLE_CHANGE + "__" + MODULE_ID] = _exampleChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			"example": $("#dtExample_" + rowNum).val(),
-			"option":  $("#dtOption_" + rowNum).val()
-		};
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {
-				$("#dtExample_" + rowNum).val(data.example);
-				$("#dtOption_" + rowNum).val(data.option);
-			},
-			isComplete: function() { return $("#dtOption_" + rowNum).length > 0; }
-		};
-	};
-
-	var _exampleChange = function(msg) {
-		$("#dtOption_" + msg.rowID).val(msg.value);
-	};
-
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-		for (var i=0; i<rows.length; i++) {
-			var currEl = $("#dtOption_" + rows[i]);
-			if ($.trim(currEl.val()) === "") {
-				var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-				visibleProblemRows.push(visibleRowNum);
-				problemFields.push(currEl);
-			}
-		}
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		validate: _validate,
-		saveRow: _saveRow,
-		loadRow: _loadRow
-	});
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/AlphaNumeric/lang/de.php b/plugins/dataTypes/AlphaNumeric/lang/de.php
deleted file mode 100644
index 5f6f85248..000000000
--- a/plugins/dataTypes/AlphaNumeric/lang/de.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Alphanumerisch";
-
-$L["example_CanPostalCode"] = "(Can. PLZ)";
-$L["example_Password"] = "(Password)";
-$L["example_USZipCode"] = "(US Postleitzahl)";
-$L["help_1"] = "Ein Groß-<b>L</b> etter.";
-$L["help_10"] = "Jede Anzahl, 1-9.";
-$L["help_11"] = "Ein Konsonant (obere oder untere).";
-$L["help_12"] = "Ein <b>H</b> exidecimal Nummer (0-F)";
-$L["help_2"] = "Ein Groß-<b>V</b>owel.";
-$L["help_3"] = "Ein Kleinbuchstaben <b>l</b> etter.";
-$L["help_4"] = "Ein Kleinbuchstaben <b>v</b> owel.";
-$L["help_5"] = "Ein Brief (oben oder unten).";
-$L["help_6"] = "Ein Vokal (obere oder untere).";
-$L["help_7"] = "Ein Groß-<b>C</b> onsonant.";
-$L["help_8"] = "Jede Zahl, 0-9.";
-$L["help_9"] = "Ein Kleinbuchstaben <b>c</b> onsonant.";
-$L["help_intro"] = "Dieser Datentyp können Sie zufällige alphanumerische Zeichenfolgen. Die folgende Tabelle enthält die Zeichenlegende für dieses Feld. Alle anderen Zeichen, die Sie in diesem Feld erscheint unescaped.";
-$L["incomplete_fields"] = "Alphanumerische Felder müssen Sie das Format, in dem Optionen Textfeld eingeben. Bitte beheben Sie die folgenden Zeilen:";
-
diff --git a/plugins/dataTypes/AlphaNumeric/lang/en.php b/plugins/dataTypes/AlphaNumeric/lang/en.php
deleted file mode 100644
index 4175be185..000000000
--- a/plugins/dataTypes/AlphaNumeric/lang/en.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-$L = array();
-
-$L["name"] = "Alphanumeric";
-$L["example_CanPostalCode"] = "(Can. Postal code)";
-$L["example_Password"] = "(Password)";
-$L["example_USZipCode"] = "(US Zip code)";
-$L["help_1"] = "An uppercase <b>L</b>etter.";
-$L["help_10"] = "Any number, 1-9.";
-$L["help_11"] = "A consonant (upper or lower).";
-$L["help_12"] = "An <b>H</b>exidecimal number (0-F)";
-$L["help_2"] = "An uppercase <b>V</b>owel.";
-$L["help_3"] = "A lowercase <b>l</b>etter.";
-$L["help_4"] = "A lowercase <b>v</b>owel.";
-$L["help_5"] = "A letter (upper or lower).";
-$L["help_6"] = "A vowel (upper or lower).";
-$L["help_7"] = "An uppercase <b>C</b>onsonant.";
-$L["help_8"] = "Any number, 0-9.";
-$L["help_9"] = "A lowercase <b>c</b>onsonant.";
-$L["help_intro"] = "This Data Type lets you generate random alpha-numeric strings. The following table contains the character legend for this field. Any other characters you enter into this field will appear unescaped.";
-$L["incomplete_fields"] = "Alphanumeric fields require you to enter the format in the Options text field. Please fix the following rows:";
diff --git a/plugins/dataTypes/AlphaNumeric/lang/es.php b/plugins/dataTypes/AlphaNumeric/lang/es.php
deleted file mode 100644
index f68337e85..000000000
--- a/plugins/dataTypes/AlphaNumeric/lang/es.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Alfanumérico";
-
-$L["name"] = "Alfanumérico";
-$L["example_CanPostalCode"] = "(Código postal canadiense)";
-$L["example_Password"] = "(Contraseña)";
-$L["example_USZipCode"] = "(Código postal yankee)";
-$L["help_1"] = "Una <b>L</b>etra mayúscula.";
-$L["help_10"] = "Cualquier número, 1-9.";
-$L["help_11"] = "Una constante (mayúscula o minúscula).";
-$L["help_12"] = "Un número <b>H</b>exadecimal (0-F)";
-$L["help_2"] = "Una <b>V</b>ocal mayúscula.";
-$L["help_3"] = "Una <b>l</b>etra minúscula.";
-$L["help_4"] = "Una <b>v</b>ocal minúscula.";
-$L["help_5"] = "Una letra (mayúscula o minúscula).";
-$L["help_6"] = "Una vocal (mayúscula o minúscula).";
-$L["help_7"] = "Una <b>C</b>onstante mayúscula.";
-$L["help_8"] = "Cualquier número, 0-9.";
-$L["help_9"] = "Una <b>c</b>onstante minúscula.";
-$L["help_intro"] = "Estos tipos de datos te permiten generar cadenas alfanuméricas aleatorias. La siguiente tabla contiene la leyenda para este campo. Cualquier otro carácter que introduzcas en este campo aparecerá sin escapar.";
-$L["incomplete_fields"] = "Los campos alfanuméricos requieren que se introduzca el formato en el campo de texto Opciones. Por favor, corrija las siguientes filas:";
diff --git a/plugins/dataTypes/AlphaNumeric/lang/fr.php b/plugins/dataTypes/AlphaNumeric/lang/fr.php
deleted file mode 100644
index f64443b34..000000000
--- a/plugins/dataTypes/AlphaNumeric/lang/fr.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Alphanumérique";
-
-$L["example_CanPostalCode"] = "(Code postal Canada)";
-$L["example_Password"] = "(Mot de passe)";
-$L["example_USZipCode"] = "(Code postal US)";
-$L["help_1"] = "Une <b>L</b>ettre majuscule.";
-$L["help_10"] = "N'importe quel nombre, 1-9.";
-$L["help_11"] = "Une consonne (majuscule ou minuscule).";
-$L["help_12"] = "Un nombre <b>H</b>exadécimal (0-F)";
-$L["help_2"] = "Une <b>V</b>oyelle majuscule.";
-$L["help_3"] = "Une <b>l</b>ettre minuscule.";
-$L["help_4"] = "Une <b>v</b>oyelle minuscule.";
-$L["help_5"] = "Une lettre (majuscule ou minuscule).";
-$L["help_6"] = "Une voyelle (majuscule ou minuscule).";
-$L["help_7"] = "Une <b>C</b>onsonne majuscule.";
-$L["help_8"] = "N'importe quel nombre, 0-9.";
-$L["help_9"] = "Une <b>c</b>onsonne minuscule.";
-$L["help_intro"] = "Ce type de données permet de générer au hasard des chaînes alphanumériques. Le tableau suivant contient la légende de caractères pour ce champ. Tous les autres caractères que vous entrez dans ce champ apparaîtront non-échappés.";
-$L["incomplete_fields"] = "Les champs alphanumériques nécessitent la saisie du format dans le champ de texte Options. Corrigez les lignes suivantes:";
diff --git a/plugins/dataTypes/AlphaNumeric/lang/nl.php b/plugins/dataTypes/AlphaNumeric/lang/nl.php
deleted file mode 100644
index eb96037df..000000000
--- a/plugins/dataTypes/AlphaNumeric/lang/nl.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Alfanumeriek";
-
-$L["example_CanPostalCode"] = "(Can. Postcode)";
-$L["example_Password"] = "(Wachtwoord)";
-$L["example_USZipCode"] = "(US postcode)";
-$L["help_1"] = "Een hoofdletter <b>L</b>etter.";
-$L["help_10"] = "Elk aantal, 1-9.";
-$L["help_11"] = "Een medeklinker (boven of onder).";
-$L["help_12"] = "Een <b>H</b> exidecimal nummer (0-F)";
-$L["help_2"] = "Een hoofdletter <b>V</b> Owel.";
-$L["help_3"] = "Een kleine letter <b>l</b> etter.";
-$L["help_4"] = "Een kleine <b>v</b>owel.";
-$L["help_5"] = "Een brief (boven of onder).";
-$L["help_6"] = "Een klinker (boven of onder).";
-$L["help_7"] = "Een hoofdletter <b>C</b>onsonant.";
-$L["help_8"] = "Elk nummer, 0-9.";
-$L["help_9"] = "Een kleine <b>c</b>onsonant.";
-$L["help_intro"] = "Dit gegevenstype kunt u het genereren van willekeurige alfanumerieke strings. De volgende tabel bevat het karakter legende voor dit veld. Alle andere tekens die u invoert in dit veld zal verschijnen beschermd en onbeschermd weergegeven.";
-$L["incomplete_fields"] = "Alfanumerieke velden moet u het formaat in het Opties tekstveld in te voeren. Please fix de volgende rijen:";
diff --git a/plugins/dataTypes/AutoIncrement/AutoIncrement.class.php b/plugins/dataTypes/AutoIncrement/AutoIncrement.class.php
deleted file mode 100644
index 9f58d9ff5..000000000
--- a/plugins/dataTypes/AutoIncrement/AutoIncrement.class.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-
-class DataType_AutoIncrement extends DataTypePlugin {
-
-	protected $isEnabled = true;
-	protected $dataTypeName = "AutoIncrement";
-	protected $hasHelpDialog = true;
-	protected $dataTypeFieldGroup = "numeric";
-	protected $dataTypeFieldGroupOrder = 20;
-	protected $jsModules = array("AutoIncrement.js");
-
-
-	public function generate($generator, $generationContextData) {
-		$rowSettings = $generationContextData["generationOptions"];
-		$start       = $rowSettings["start"];
-		$increment   = $rowSettings["increment"];
-		$placeholder = $rowSettings["placeholder"];
-		$val = (($generationContextData["rowNum"]-1) * $increment) + $start;
-
-		if (!empty($placeholder)) {
-			$val = preg_replace('/\{\$INCR\}/', $val, $placeholder);
-		}
-
-		return array(
-			"display" => $val
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $col, $num_cols) {
-		$start = isset($postdata["dtAutoIncrementStart_$col"]) ? $postdata["dtAutoIncrementStart_$col"] : null;
-		$end   = isset($postdata["dtAutoIncrementValue_$col"]) ? $postdata["dtAutoIncrementValue_$col"] : null;
-
-		if ($start == null || $end == null || $start == "") {
-			return false;
-		}
-
-		$options = array(
-			"start"       => $postdata["dtAutoIncrementStart_$col"],
-			"increment"   => $postdata["dtAutoIncrementValue_$col"],
-			"placeholder" => $postdata["dtAutoIncrementPlaceholder_$col"]
-		);
-
-		return $options;
-	}
-
-	public function getExampleColumnHTML() {
-		$html =<<< END
-	<select name="dtExample_%ROW%" id="dtExample_%ROW%">
-		<option value="1,1,">1, 2, 3, 4, 5, 6...</option>
-		<option value="100,1,">100, 101, 102, 103, 104...</option>
-		<option value="0,2,">0, 2, 4, 6, 8, 10...</option>
-		<option value="0,5,">0, 5, 10, 15, 20, 25...</option>
-		<option value="1000,-1,">1000, 999, 998, 997...</option>
-		<option value="0,-1,">0, -1, -2, -3, -4...</option>
-		<option value="0,0.5,">0, 0.5, 1, 1.5, 2...</option>
-		<option value="1,1,ROW-{\$INCR}">ROW-1, ROW-2, ROW-3,...</option>
-		<option value="2,4,{\$INCR}i">2i, 4i, 6i, 8i...</option>
-	</select>
-END;
-		return $html;
-	}
-
-	public function getOptionsColumnHTML() {
-		$html =<<< END
-&nbsp;{$this->L["start_at_c"]} <input type="text" name="dtAutoIncrementStart_%ROW%" id="dtAutoIncrementStart_%ROW%" style="width: 40px" value="1" />&nbsp;
-&nbsp;{$this->L["increment_c"]} <input type="text" name="dtAutoIncrementValue_%ROW%" id="dtAutoIncrementValue_%ROW%" style="width: 40px" value="1" />
-&nbsp;{$this->L["placeholder_str"]} <input type="text" name="dtAutoIncrementPlaceholder_%ROW%" id="dtAutoIncrementPlaceholder_%ROW%" style="width: 140px" />
-END;
-		return $html;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"type" => "numeric",
-			"SQLField" => "mediumint",
-			"SQLField_Oracle" => "number default NULL",
-			"SQLField_MSSQL" => "INTEGER NULL",
-			"SQLField_Postgres" => "integer NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		$content =<<< END
-	<p>
-		{$this->L["help_intro"]}
-	</p>
-	<p>
-		{$this->L["help_para2"]}
-	</p>
-	<ul>
-		<li><b>ROW-{\$INCR}</b> -> ROW-1, ROW-2, ROW-3, ROW-4, ...</li>
-		<li><b>{\$INCR}F</b> -> 1F, 2F, 3F, 4F, ...</li>
-	</ul>
-END;
-
-		return $content;
-	}
-}
diff --git a/plugins/dataTypes/AutoIncrement/AutoIncrement.js b/plugins/dataTypes/AutoIncrement/AutoIncrement.js
deleted file mode 100755
index 1c49ed540..000000000
--- a/plugins/dataTypes/AutoIncrement/AutoIncrement.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name AutoIncrement
-	 * @description JS code for the AutoIncrement Data Type.
-	 * @see DataType
-	 * @namespace
-	 */
-
-	/* @private */
-	var MODULE_ID = "data-type-AutoIncrement";
-
-	var LANG = L.dataTypePlugins.AutoIncrement;
-	var subscriptions = {};
-
-	var _init = function() {
-		subscriptions[C.EVENT.DATA_TABLE.ROW.EXAMPLE_CHANGE + "__" + MODULE_ID] = _exampleChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			example: $("#dtExample_" + rowNum).val(),
-			incrementStart: $("#dtAutoIncrementStart_" + rowNum).val(),
-			incrementValue: $("#dtAutoIncrementValue_" + rowNum).val(),
-			incrementPlaceholder: $("#dtAutoIncrementPlaceholder_" + rowNum).val()
-		};
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() { },
-			isComplete: function() {
-				if ($("#dtAutoIncrementPlaceholder_" + rowNum).length) {
-					$("#dtExample_" + rowNum).val(data.example);
-					$("#dtAutoIncrementStart_" + rowNum).val(data.incrementStart);
-					$("#dtAutoIncrementValue_" + rowNum).val(data.incrementValue);
-					$("#dtAutoIncrementPlaceholder_" + rowNum).val(data.incrementPlaceholder);
-					return true;
-				}
-				return false;
-			}
-		};
-	};
-
-	var _exampleChange = function(msg) {
-		var parts = msg.value.split(',');
-		var rowNum = msg.rowID;
-		$("#dtAutoIncrementStart_" + rowNum).val(parts[0]);
-		$("#dtAutoIncrementValue_" + rowNum).val(parts[1]);
-		$("#dtAutoIncrementPlaceholder_" + rowNum).val(parts[2]);
-	};
-
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-		for (var i=0; i<rows.length; i++) {
-			var autoIncrementStart = $.trim($("#dtAutoIncrementStart_" + rows[i]).val());
-			var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-			if (autoIncrementStart === "") {
-				problemFields.push($("#dtAutoIncrementStart_" + rows[i]));
-			}
-			var autoIncrementEnd = $.trim($("#dtAutoIncrementValue_" + rows[i]).val());
-			if (autoIncrementEnd === "") {
-				problemFields.push($("#dtAutoIncrementValue_" + rows[i]));
-			}
-			if (autoIncrementStart === "" || autoIncrementEnd === "") {
-				visibleProblemRows.push(visibleRowNum);
-			}
-		}
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		validate: _validate,
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-});
diff --git a/plugins/dataTypes/AutoIncrement/lang/de.php b/plugins/dataTypes/AutoIncrement/lang/de.php
deleted file mode 100644
index ebdd66866..000000000
--- a/plugins/dataTypes/AutoIncrement/lang/de.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Auto-Inkrement";
-
-$L["help_intro"] = "Erzeugt eine Spalte, die eine eindeutige Nummer in jeder Zeile enthält, Inkrementieren mit welchen Wert Sie eingeben. Diese Option kann hilfreich sein, zum Einsetzen der Daten in eine Datenbank Feld mit einem auto-increment Primärschlüssel.";
-$L["help_para2"] = "Die optionale Platzhalter-String können Sie betten die generierten Inkrementwert innerhalb einer Zeichenkette über die <b>{\$ROW}</b> Platzhalter. Zum Beispiel:";
-$L["incomplete_fields"] = "Bitte geben Sie die Start At und Increment Felder für alle Auto-increment Zeilen:";
-$L["increment_c"] = "Schrittweite:";
-$L["name"] = "Auto-Inkrement";
-$L["placeholder_str"] = "Platzhalter-String:";
-$L["start_at_c"] = "Start bei:";
diff --git a/plugins/dataTypes/AutoIncrement/lang/en.php b/plugins/dataTypes/AutoIncrement/lang/en.php
deleted file mode 100644
index 9a21555bc..000000000
--- a/plugins/dataTypes/AutoIncrement/lang/en.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-
-$L["help_intro"] = "Generates a column that contains a unique number on each row, incrementing by whatever value you enter. This option can be helpful for inserting the data into a database field with an auto-increment primary key.";
-$L["help_para2"] = "The optional placeholder string lets you embed the generated increment value within a string, via the <b>{\$INCR}</b> placeholder. For example:";
-$L["increment_c"] = "Increment:";
-$L["name"] = "Auto-increment";
-$L["placeholder_str"] = "Placeholder string:";
-$L["start_at_c"] = "Start at:";
-$L["incomplete_fields"] = "Please enter the Start At and Increment fields for all Auto-increment rows:";
diff --git a/plugins/dataTypes/AutoIncrement/lang/es.php b/plugins/dataTypes/AutoIncrement/lang/es.php
deleted file mode 100644
index 8a037fb4d..000000000
--- a/plugins/dataTypes/AutoIncrement/lang/es.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Auto-incrementado";
-
-$L["help_intro"] = "Genera una columna que contiene un número único en cada fila, incrementándolo en el valor que introduzcas. Esta opción puede ser de ayuda para insertar los datos en una columna de base de datos con una clave primaria auto-incrementada.";
-$L["help_para2"] = "La cadena de patrón opcional permite introducir el valor de incremento generado dentro de una cadena de texto usando el patrón de sustitución <b>{\$INCR}</b>. Por ejemplo:";
-$L["increment_c"] = "Incremento:";
-$L["name"] = "Auto-incremento";
-$L["placeholder_str"] = "Patrón de sustitución:";
-$L["start_at_c"] = "Comenzar en:";
-$L["incomplete_fields"] = "Por favor, introduce los campos &quot;Empezar en&quot; e &quot;Incremento&quot; para todas las filas auto-incrementadas:";
diff --git a/plugins/dataTypes/AutoIncrement/lang/fr.php b/plugins/dataTypes/AutoIncrement/lang/fr.php
deleted file mode 100644
index 409f6e5e6..000000000
--- a/plugins/dataTypes/AutoIncrement/lang/fr.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Auto-incrémentation";
-
-$L["help_intro"] = "Génère une colonne qui contient un numéro unique sur chaque ligne, quel que soit la valeur d'incrémentation que vous entrez. Cette option peut être utile pour insérer les données dans un champ de base de données avec une clé primaire auto-incrémentée.";
-$L["help_para2"] = "L'option 'chaîne complémentaire' vous permet d'intégrer la valeur d'incrément généré dans une chaîne grâce à la balise <b>{\$INCR}</b>. Par exemple:";
-$L["incomplete_fields"] = "Renseignez l'option 'Début' des champs d'incrémentation pour toutes les lignes concernées:";
-$L["increment_c"] = "Pas:";
-$L["name"] = "Auto-incrémentation";
-$L["placeholder_str"] = "Chaîne complémentaire:";
-$L["start_at_c"] = "Début:";
diff --git a/plugins/dataTypes/AutoIncrement/lang/nl.php b/plugins/dataTypes/AutoIncrement/lang/nl.php
deleted file mode 100644
index 85799284b..000000000
--- a/plugins/dataTypes/AutoIncrement/lang/nl.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-
-$L["help_intro"] = "Genereert een kolom die een uniek nummer op elke rij bevat, verhogen met welke waarde die u invoert. Deze optie kan nuttig zijn voor het inbrengen van de gegevens in een database veld met een auto-increment primaire sleutel.";
-$L["help_para2"] = "De optionele tijdelijke aanduiding snaar kunt u insluiten de gegenereerde toename waarde binnen een string, via de <b>{\$INCR}</b> tijdelijke aanduiding. Bijvoorbeeld:";
-$L["incomplete_fields"] = "Vul de Start At en Increment velden voor alle Auto-increment rijen:";
-$L["increment_c"] = "Increment:";
-$L["name"] = "Auto-increment";
-$L["placeholder_str"] = "Placeholder string:";
-$L["start_at_c"] = "Start bij:";
\ No newline at end of file
diff --git a/plugins/dataTypes/CVV/CVV.class.php b/plugins/dataTypes/CVV/CVV.class.php
deleted file mode 100644
index d7e363cb0..000000000
--- a/plugins/dataTypes/CVV/CVV.class.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>, origin code Zeeshan Shaikh
- * @package DataTypes
- */
-class DataType_CVV extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "CVV";
-	protected $hasHelpDialog = true;
-	protected $dataTypeFieldGroup = "credit_card_data";
-	protected $dataTypeFieldGroupOrder = 30;
-
-
-	public function generate($generator, $generationContextData) {
-		return array(
-			"display" => rand(111, 999)
-		);
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255)",
-			"SQLField_Oracle" => "varchar2(255)",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["help"]}</p>";
-	}
-}
\ No newline at end of file
diff --git a/plugins/dataTypes/CVV/lang/de.php b/plugins/dataTypes/CVV/lang/de.php
deleted file mode 100644
index 135209bff..000000000
--- a/plugins/dataTypes/CVV/lang/de.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["help"] = "Erzeugt eine Zufalls CVV-Nummer von <b>111</b> bis <b>999</b>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/CVV/lang/en.php b/plugins/dataTypes/CVV/lang/en.php
deleted file mode 100644
index a77817dc4..000000000
--- a/plugins/dataTypes/CVV/lang/en.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["help"] = "Generates a random credit card CVV number from <b>111</b> to <b>999</b>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/CVV/lang/es.php b/plugins/dataTypes/CVV/lang/es.php
deleted file mode 100644
index c2f89b3b1..000000000
--- a/plugins/dataTypes/CVV/lang/es.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["help"] = "Genera un número de tarjeta de crédito CVV azar <b>111</b>-<b>999</b>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/CVV/lang/fr.php b/plugins/dataTypes/CVV/lang/fr.php
deleted file mode 100644
index 1d1860a7d..000000000
--- a/plugins/dataTypes/CVV/lang/fr.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["help"] = "Génère un nombre aléatoire de CVV de la carte de crédit de <b>111</b> à <b>999</b>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/CVV/lang/nl.php b/plugins/dataTypes/CVV/lang/nl.php
deleted file mode 100644
index ac9058eaa..000000000
--- a/plugins/dataTypes/CVV/lang/nl.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["help"] = "Genereert een willekeurig creditcard CVV nummer <b>111</b>-<b>999</b>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/City/City.class.php b/plugins/dataTypes/City/City.class.php
deleted file mode 100644
index d59b665f6..000000000
--- a/plugins/dataTypes/City/City.class.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_City extends DataTypePlugin {
-
-	protected $isEnabled = true;
-	protected $dataTypeName = "City";
-	protected $dataTypeFieldGroup = "geo";
-	protected $dataTypeFieldGroupOrder = 20;
-	protected $processOrder = 3;
-	private $countryRegions;
-	private $citiesByCountryRegion;
-
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			self::initCityList();
-			$this->countryRegions = Core::$geoData->getCountryRegionHash();
-		}
-	}
-
-
-	public function generate($generator, $generationContextData) {
-		// see if this row has a region [N.B. This is something that could be calculated ONCE on the first row]
-		$rowRegionInfo = array();
-		while (list($key, $info) = each($generationContextData["existingRowData"])) {
-			if ($info["dataTypeFolder"] == "Region") {
-				$rowRegionInfo = $info;
-				break;
-			}
-		}
-		reset($generationContextData["existingRowData"]);
-
-		// if there was no region specified, see if this row has a country [N.B. This is also
-		// something that could be calculated ONCE on the first row]
-		$rowCountryInfo = array();
-		if (empty($rowRegionInfo)) {
-			while (list($key, $info) = each($generationContextData["existingRowData"])) {
-				if ($info["dataTypeFolder"] == "Country") {
-					$rowCountryInfo = $info;
-					break;
-				}
-			}
-		}
-
-		$randomCity = "";
-		if (!empty($rowRegionInfo)) {
-			$countrySlug = $rowRegionInfo["randomData"]["country_slug"];
-			$regionSlug = $rowRegionInfo["randomData"]["region_slug"];
-
-			// now pick the random city in the country-region specified
-			// TODO bug here (when user unselected particular row regions)
-			$regionData = $this->citiesByCountryRegion[$countrySlug]["regions"][$regionSlug];
-			$numCitiesInRegion = $this->citiesByCountryRegion[$countrySlug]["regions"][$regionSlug]["numCities"];
-			$citiesInRegion    = $this->citiesByCountryRegion[$countrySlug]["regions"][$regionSlug]["cities"];
-			$randomCity = $citiesInRegion[mt_rand(0, $numCitiesInRegion-1)]["city"];
-		} else if (!empty($rowCountryInfo)) {
-			// pick a random region in this country. If the existing row data had a slug, it means there's
-			// a country-plugin for that country, so we can intelligently load a City
-			if (isset($rowCountryInfo["randomData"]["slug"])) {
-				$countrySlug = $rowCountryInfo["randomData"]["slug"];
-				$countryRegions    = $this->citiesByCountryRegion[$countrySlug]["regions"];
-				$key = array_rand($countryRegions);
-				$cities = $countryRegions[$key]["cities"];
-				$numCities = $countryRegions[$key]["numCities"];
-				$randomCity = $cities[mt_rand(0, $numCities-1)]["city"];
-			} else {
-				$randomCity = $this->cities[mt_rand(0, $this->numCities-1)];
-			}
-		} else {
-			$randomCity = $this->cities[mt_rand(0, $this->numCities-1)];
-		}
-
-		return array(
-			"display" => $randomCity
-		);
-	}
-
-
-	/**
-	 * Called when the plugin is initialized during data generation. Initializes the 
-	 * $citiesByCountryRegion private var.
-	 */
-	private function initCityList() {
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			SELECT *
-			FROM {$prefix}cities
-		");
-
-		if (!$response["success"]) {
-			return;
-		}
-
-		$cities = array();
-		$citiesByCountryRegion = array();
-		while ($cityInfo = mysqli_fetch_assoc($response["results"])) {
-			$currCountrySlug = $cityInfo["country_slug"];
-			$currRegionSlug  = $cityInfo["region_slug"];
-			if (!array_key_exists($currCountrySlug, $citiesByCountryRegion)) {
-				$citiesByCountryRegion[$currCountrySlug] = array(
-					"numRegions" => 0,
-					"regions" => array()
-				);
-			}
-			if (!array_key_exists($currRegionSlug, $citiesByCountryRegion[$currCountrySlug]["regions"])) {
-				$citiesByCountryRegion[$currCountrySlug]["regions"][$currRegionSlug] = array(
-					"numCities" => 0,
-					"cities" => array()
-				);
-				$citiesByCountryRegion[$currCountrySlug]["numRegions"]++;
-			}
-			$citiesByCountryRegion[$currCountrySlug]["regions"][$currRegionSlug]["cities"][] = array(
-				"city"    => $cityInfo["city"],
-				"city_id" => $cityInfo["city_id"]
-			);
-			$citiesByCountryRegion[$currCountrySlug]["regions"][$currRegionSlug]["numCities"]++;
-			$cities[] = $cityInfo["city"];
-		}
-
-		// now we've put together all the info, add in "numRegions" and "numCities" hash keys
-		// at the appropriate spots in the data structure. This'll help speed up the data generation
-		$this->citiesByCountryRegion = $citiesByCountryRegion;
-		$this->cities = $cities;
-		$this->numCities = count($cities);
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255)",
-			"SQLField_Oracle" => "varchar2(255)",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-}
diff --git a/plugins/dataTypes/City/lang/de.php b/plugins/dataTypes/City/lang/de.php
deleted file mode 100644
index 1f4e7dc9e..000000000
--- a/plugins/dataTypes/City/lang/de.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "City";
diff --git a/plugins/dataTypes/City/lang/en.php b/plugins/dataTypes/City/lang/en.php
deleted file mode 100644
index 1f4e7dc9e..000000000
--- a/plugins/dataTypes/City/lang/en.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "City";
diff --git a/plugins/dataTypes/City/lang/es.php b/plugins/dataTypes/City/lang/es.php
deleted file mode 100644
index 2f1916e4b..000000000
--- a/plugins/dataTypes/City/lang/es.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Ciudad";
diff --git a/plugins/dataTypes/City/lang/fr.php b/plugins/dataTypes/City/lang/fr.php
deleted file mode 100644
index 4546ecc11..000000000
--- a/plugins/dataTypes/City/lang/fr.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Ville";
\ No newline at end of file
diff --git a/plugins/dataTypes/City/lang/nl.php b/plugins/dataTypes/City/lang/nl.php
deleted file mode 100644
index 69cb43d2e..000000000
--- a/plugins/dataTypes/City/lang/nl.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "City";
\ No newline at end of file
diff --git a/plugins/dataTypes/Company/Company.class.php b/plugins/dataTypes/Company/Company.class.php
deleted file mode 100644
index 7cea56706..000000000
--- a/plugins/dataTypes/Company/Company.class.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_Company extends DataTypePlugin {
-
-	protected $isEnabled = true;
-	protected $dataTypeName = "Company Names";
-	protected $hasHelpDialog = true;
-	protected $dataTypeFieldGroup = "human_data";
-	protected $dataTypeFieldGroupOrder = 50;
-	private $companyTypes = array(
-		"Company", "Corp.", "Corporation", "Inc.", "Incorporated", "LLC", "LLP", "Ltd", "Limited",
-		"PC", "Foundation", "Institute", "Associates", "Industries", "Consulting"
-	);
-	private $numCompanyTypes;
-	private $words;
-	private $numWords;
-
-
-	/**
-	 * Our custom constructor. This instantiates $words and $numWords for use by the generate() function.
-	 *
-	 * @param string $runtimeContext
-	 */
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			$this->words = Utils::getLipsum();
-			$this->numWords = count($this->words);
-			$this->numCompanyTypes = count($this->companyTypes);
-		}
-	}
-
-	public function generate($generator, $generationContextData) {
-		$numCompanyNameWords = mt_rand(1, 3);
-		$offset = mt_rand(0, $this->numWords - ($numCompanyNameWords + 1));
-		$words = array_slice($this->words, $offset, $numCompanyNameWords);
-		$words = preg_replace("/[,.:]/", "", $words);
-		$companyType = $this->companyTypes[mt_rand(0, $this->numCompanyTypes-1)];
-
-		return array(
-			"display" => ucwords(implode(" ", $words) . " " . $companyType)
-		);
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255)",
-			"SQLField_Oracle" => "varchar2(255)",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["help"]}</p>";
-	}
-}
diff --git a/plugins/dataTypes/Company/lang/de.php b/plugins/dataTypes/Company/lang/de.php
deleted file mode 100644
index 15c5cd5f7..000000000
--- a/plugins/dataTypes/Company/lang/de.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Firma";
-
-$L["help"] = "Dieser Datentyp generiert einen zufälligen Name des Unternehmens, einer Lorem ipsum Wort besteht und eine entsprechende Suffix, wie <i>Dolor Inc.</i>, oder <i>Convallis Begrenzte</i>.";
diff --git a/plugins/dataTypes/Company/lang/en.php b/plugins/dataTypes/Company/lang/en.php
deleted file mode 100644
index c04c5afc2..000000000
--- a/plugins/dataTypes/Company/lang/en.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Company";
-$L["help"] = "This data type generates a random company name, comprised of a lorem ipsum word and an appropriate suffix, like <i>Dolor Inc.</i>, or <i>Convallis Limited</i>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/Company/lang/es.php b/plugins/dataTypes/Company/lang/es.php
deleted file mode 100644
index 3b40a9bcb..000000000
--- a/plugins/dataTypes/Company/lang/es.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Empresa";
-$L["help"] = "Este tipo de dato genera un nombre de empresa al azar, generado a partir de una palabra <i>lorem ipsum</i> y de un sufijo apropiado como <i>Dolor Inc.</i>, o <i>Convallis Limited</i>.";
diff --git a/plugins/dataTypes/Company/lang/fr.php b/plugins/dataTypes/Company/lang/fr.php
deleted file mode 100644
index a18ed34cb..000000000
--- a/plugins/dataTypes/Company/lang/fr.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Entreprise";
-
-$L["help"] = "Ce type de données génère un nom d'entreprise aléatoire, composé d'un mot Lorem ipsum et un suffixe, comme Dolor <i>Inc</i>, ou <i>Convallis limitée</i>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/Company/lang/nl.php b/plugins/dataTypes/Company/lang/nl.php
deleted file mode 100644
index edd5e7aeb..000000000
--- a/plugins/dataTypes/Company/lang/nl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Vennootschap";
-$L["help"] = "Dit gegevenstype genereert een willekeurige naam, bestaande uit een Lorem ipsum woord en een passende achtervoegsel, zoals <i>Dolor Inc</i>, of <i>Convallis Limited</i>.";
diff --git a/plugins/dataTypes/Composite/Composite.class.php b/plugins/dataTypes/Composite/Composite.class.php
deleted file mode 100644
index 7c36ae21d..000000000
--- a/plugins/dataTypes/Composite/Composite.class.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_Composite extends DataTypePlugin {
-
-	protected $isEnabled = true;
-	protected $dataTypeName = "Composite";
-	protected $hasHelpDialog = true;
-	protected $dataTypeFieldGroup = "other";
-	protected $dataTypeFieldGroupOrder = 20;
-	protected $jsModules = array("Composite.js");
-	protected $processOrder = 100;
-	private $smarty;
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			$this->smarty = new SecureSmarty();
-			$this->smarty->template_dir = realpath(__DIR__ . "/../../../resources/libs/smarty");
-			$this->smarty->compile_dir  = realpath(__DIR__ . "/../../../cache");
-		}
-	}
-
-	public function generate($generator, $generationContextData) {
-		$placeholders = array();
-		foreach ($generationContextData["existingRowData"] as $rowInfo) {
-			$colNum = $rowInfo["colNum"];
-			$randomData  = is_array($rowInfo["randomData"]) ? $rowInfo["randomData"]["display"] : $rowInfo["randomData"];
-			$placeholders["ROW{$colNum}"] = $randomData;
-		}
-		while (list($key, $value) = each($placeholders)) {
-			$this->smarty->assign($key, $value);
-		}
-		$output = $this->smarty->fetch('string:' . $generationContextData["generationOptions"]);
-
-		return array(
-			"display" => $output
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $col, $num_cols) {
-		if (!isset($postdata["dtOption_$col"]) || empty($postdata["dtOption_$col"])) {
-			return false;
-		}
-		return $postdata["dtOption_$col"];
-	}
-
-	public function getExampleColumnHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-		return $L["see_help_dialog"];
-	}
-
-	public function getOptionsColumnHTML() {
-		return '<textarea name="dtOption_%ROW%" id="dtOption_%ROW%" style="height: 70px; width: 260px"></textarea>';
-	}
-
-	public function getHelpHTML() {
-		$content =<<< END
-	<p>
-		{$this->L["Composite_help_1"]}
-	</p>
-	<p>
-		{$this->L["Composite_help_2"]}
-	</p>
-	<p>
-		{$this->L["Composite_help_3"]}
-	</p>
-	<ul>
-		<li>{$this->L["Composite_help_4"]}</li>
-		<li>{$this->L["Composite_help_5"]}
-			<ul>
-				<li><b>{\$ROW2-\$ROW1}</b> - {$this->L["Composite_subtraction"]}</li>
-				<li><b>{\$ROW2*\$ROW1}</b> - {$this->L["Composite_multiplication"]}</li>
-				<li><b>{\$ROW2/\$ROW1}</b> - {$this->L["Composite_division"]}</li>
-			</ul>
-		</li>
-		<li>
-			{$this->L["Composite_help_6"]}
-			<b>{if \$ROW1 == 5}{$this->L["Composite_na"]}{else}{\$ROW1}{/if}</b>
-		</li>
-	</ul>
-	<p>
-		{$this->L["Composite_help_7"]}
-	</p>
-END;
-
-		return $content;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "TEXT default NULL",
-			"SQLField_Oracle" => "BLOB default NULL",
-			"SQLField_MSSQL" => "VARCHAR(MAX) NULL"
-		);
-	}
-}
diff --git a/plugins/dataTypes/Composite/Composite.js b/plugins/dataTypes/Composite/Composite.js
deleted file mode 100755
index afe4af05c..000000000
--- a/plugins/dataTypes/Composite/Composite.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name Composite
-	 * @description JS code for the Composite Data Type.
-	 * @see DataType
-	 * @namespace
-	 */
-
-	/* @private */
-	var MODULE_ID = "data-type-Composite";
-	var LANG = L.dataTypePlugins.Composite;
-
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-		for (var i=0; i<rows.length; i++) {
-			if ($("#dtOption_" + rows[i]).val() === "") {
-				var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-				visibleProblemRows.push(visibleRowNum);
-				problemFields.push($("#option_" + rows[i]));
-			}
-		}
-
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: L.AlphaNumeric_incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-
-		return errors;
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {
-				$("#dtExample_" + rowNum).val(data.example);
-				$("#dtOption_" + rowNum).val(data.option);
-			},
-			isComplete: function() { return $("#dtOption_" + rowNum).length > 0; }
-		};
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			"example":  $("#dtExample_" + rowNum).val(),
-			"option":   $("#dtOption_" + rowNum).val()
-		};
-	};
-
-
-	manager.registerDataType(MODULE_ID, {
-		validate: _validate,
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-});
-
diff --git a/plugins/dataTypes/Composite/lang/de.php b/plugins/dataTypes/Composite/lang/de.php
deleted file mode 100644
index 01dbeeadb..000000000
--- a/plugins/dataTypes/Composite/lang/de.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Zusammengesetzt";
-
-$L["Composite_division"] = "Teilung";
-$L["Composite_help_1"] = "Der Composite-Datentyp können Sie kombinieren die Daten aus einer anderen Zeile oder Zeilen, und manipulieren, ändern, kombinieren die Informationen und vieles mehr. Der Inhalt sollte in der Smarty Template-Sprache eingegeben werden.";
-$L["Composite_help_2"] = "Um den Wert von jeder Zeile ausgeben, verwenden Sie einfach die Platzhalter <b>{\$ROW1}</b>, <b>{\$ROW2}</b>, etc. Sie können nicht auf der aktuellen Zeile beziehen - das würde entweder schmelzen der Server und / oder das Universum implodieren.";
-$L["Composite_help_3"] = "Hier sind ein paar Beispiele:";
-$L["Composite_help_4"] = "Anzeige einen Wert aus Zeile 6: <b>{\$ROW6}</b>";
-$L["Composite_help_5"] = "Unter der Annahme, Zeile 1 und Zeile 2 enthalten Zufallszahlen, werden die folgenden Beispiele von einigen einfachen Mathematik:";
-$L["Composite_help_6"] = "Wenn Zeile 1 enthält die Nummer 5, die Anzeige \"N / A\", sonst nur zeigt die Anzahl.";
-$L["Composite_help_7"] = "Bitte lesen Sie die <a href=\"http://www.smarty.net/\">Smarty Homepage</a> für weitere Informationen über die Syntax.";
-$L["Composite_multiplication"] = "Multiplikation";
-$L["Composite_na"] = "N / A";
-$L["Composite_subtraction"] = "Subtraktion";
\ No newline at end of file
diff --git a/plugins/dataTypes/Composite/lang/en.php b/plugins/dataTypes/Composite/lang/en.php
deleted file mode 100644
index 2e4697cd9..000000000
--- a/plugins/dataTypes/Composite/lang/en.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Composite";
-
-$L["Composite_division"] = "division";
-$L["Composite_help_1"] = "The Composite data type lets you combine the data from any other row or rows, and manipulate it, change it, combine the information and more. The content should be entered in the Smarty templating language.";
-$L["Composite_help_2"] = "To output the value from any row, just use the placeholders <b>{\$ROW1}</b>, <b>{\$ROW2}</b>, etc. You cannot refer to the current row - that would either melt the server and/or make the universe implode.";
-$L["Composite_help_3"] = "Here are a few examples:";
-$L["Composite_help_4"] = "Display a value from row 6: <b>{\$ROW6}</b>";
-$L["Composite_help_5"] = "Assuming row 1 and row 2 contain random numbers, the following are examples of some simple math:";
-$L["Composite_help_6"] = "If row 1 contains the number 5, display &quot;N/A&quot;, otherwise just display the number.";
-$L["Composite_help_7"] = "Please see the <a href=\"http://www.smarty.net/\">Smarty website</a> for more information on the syntax.";
-$L["Composite_multiplication"] = "multiplication";
-$L["Composite_na"] = "N/A";
-$L["Composite_subtraction"] = "subtraction";
\ No newline at end of file
diff --git a/plugins/dataTypes/Composite/lang/es.php b/plugins/dataTypes/Composite/lang/es.php
deleted file mode 100644
index c5eb00847..000000000
--- a/plugins/dataTypes/Composite/lang/es.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Compuesto";
-
-$L["Composite_division"] = "división";
-$L["Composite_help_1"] = "El tipo de dato Compueso permite combinar los datos de cualquier otra fila o filas y manipularlo, cambiarlo, combinar la información y mucho más. El contenido debería ser introducido en el lenguaje de plantillas Smarty.";
-$L["Composite_help_2"] = "Para producir el valor de cualquier fila, basta usar los patrones de sustitución <b>{\$ROW1}</b>, <b>{\$ROW2}</b>, etc. No puedes hacer referencia a la fila actual, lo que podría fundir el servidor y/o hacer que el Universo explotara.";
-$L["Composite_help_3"] = "Aquí tienes algunos ejemplos:";
-$L["Composite_help_4"] = "Mostrar un valor de la fila 6: <b>{\$ROW6}</b>";
-$L["Composite_help_5"] = "Asumiendo que las filas 1 y 2 contienen números aleatorios, lo siguiente es un ejemplo de un cálculo sencillo:";
-$L["Composite_help_6"] = "Si la fila 1 contiene el número 5, mostrar &quot;N/D&quot;, en caso contrario, mostrar el número.";
-$L["Composite_help_7"] = "Por favor, visita el sitio de <a href=\"http://www.smarty.net/\">Smarty</a> para ampliar información de la sintaxis.";
-$L["Composite_multiplication"] = "multiplicación";
-$L["Composite_na"] = "N/D";
-$L["Composite_subtraction"] = "substracción";
diff --git a/plugins/dataTypes/Composite/lang/fr.php b/plugins/dataTypes/Composite/lang/fr.php
deleted file mode 100644
index 9cf653cfb..000000000
--- a/plugins/dataTypes/Composite/lang/fr.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Composite";
-
-$L["Composite_division"] = "Division";
-$L["Composite_help_1"] = "Le type de données composite permet de combiner les données de n'importe quel autre ligne ou lignes, de les manipuler, les modifier, combiner les informations et plus encore. Le contenu doit être entré dans le langage de templates Smarty.";
-$L["Composite_help_2"] = "Pour utiliser la valeur de n'importe quelle ligne, il suffit d'utiliser les chaînes complémentaires <b>{\$ROW1}</b>, <b>{\$ROW2}</b>, etc. Vous ne pouvez pas utiliser la ligne actuelle - ce qui ferait fondre le serveur et / ou imploser l'univers.";
-$L["Composite_help_3"] = "Voici quelques exemples:";
-$L["Composite_help_4"] = "Afficher la valeur de la ligne 6: <b>{\$ROW6}</b>";
-$L["Composite_help_5"] = "En supposant que la ligne 1 et la ligne 2 contiennent des nombres aléatoires, les éléments suivants sont des exemples de quelques calculs simples:";
-$L["Composite_help_6"] = "Si la ligne 1 contient le nombre 5, afficher \"N/A\", sinon il suffit d'afficher le nombre.";
-$L["Composite_help_7"] = "Consultez <a href=\"http://www.smarty.net/\">le site Web de Smarty</a> pour plus d'informations sur la syntaxe.";
-$L["Composite_multiplication"] = "Multiplication";
-$L["Composite_na"] = "N / A";
-$L["Composite_name"] = "Composite";
-$L["Composite_subtraction"] = "Soustraction";
diff --git a/plugins/dataTypes/Composite/lang/nl.php b/plugins/dataTypes/Composite/lang/nl.php
deleted file mode 100644
index 7cfd51e4a..000000000
--- a/plugins/dataTypes/Composite/lang/nl.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Samengesteld";
-
-$L["Composite_division"] = "divisie";
-$L["Composite_help_1"] = "De Composite gegevenstype kunt u combineren de gegevens van een andere rij of rijen, en te manipuleren, wijzigen, combineren de informatie en meer. De inhoud moet worden opgenomen in de Smarty template taal.";
-$L["Composite_help_2"] = "Om de waarde van een rij uit te voeren, gewoon gebruik maken van de tijdelijke aanduidingen <b>{\$ROW1}</b>, <b>{\$ROW2}</b>, enz. U kunt niet verwijzen naar de huidige rij - dat zou een smeltpunt de server en / of maak het universum imploderen.";
-$L["Composite_help_3"] = "Hier zijn een paar voorbeelden:";
-$L["Composite_help_4"] = "Geef een waarde van rij 6: <b>{\$ROW6}</b>";
-$L["Composite_help_5"] = "Ervan uitgaande dat rij 1 en rij 2 bevatten willekeurige getallen, worden de volgende voorbeelden van een aantal eenvoudige wiskunde:";
-$L["Composite_help_6"] = "Als rij 1 bevat het nummer 5, weer te geven \"N / A\", anders gewoon weer het nummer.";
-$L["Composite_help_7"] = "Raadpleeg de <a href=\"http://www.smarty.net/\">Smarty website</a> voor meer informatie over de syntaxis.";
-$L["Composite_multiplication"] = "vermenigvuldiging";
-$L["Composite_na"] = "N / A";
-$L["Composite_subtraction"] = "aftrekking";
diff --git a/plugins/dataTypes/Constant/Constant.class.php b/plugins/dataTypes/Constant/Constant.class.php
deleted file mode 100644
index 66ddf4cf4..000000000
--- a/plugins/dataTypes/Constant/Constant.class.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_Constant extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Constant";
-	protected $hasHelpDialog = true;
-	protected $dataTypeFieldGroup = "other";
-	protected $dataTypeFieldGroupOrder = 10;
-	protected $jsModules = array("Constant.js");
-	protected $processOrder = 100;
-
-
-	public function generate($generator, $generationContextData) {
-		$options = $generationContextData["generationOptions"];
-		$rowNum  = $generationContextData["rowNum"];
-		$numValues = count($options["values"]);
-		if ($numValues == 1) {
-			$value = $options["values"][0];
-		} else {
-			$itemIndex = floor(($rowNum-1) / $options["loopCount"]);
-			if ($itemIndex > ($numValues - 1)) {
-				$itemIndex = ($itemIndex % $numValues);
-			}
-			$value = $options["values"][$itemIndex];
-		}
-		return array(
-			"display" => $value
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		if (!isset($postdata["dtOption_$colNum"])) {
-			return false;
-		}
-
-		// fix for https://github.com/benkeen/generatedata/issues/166
-		$optionValue = trim($postdata["dtOption_$colNum"]);
-		if ($optionValue == "") {
-			return false;
-		}
-
-		if (!isset($postdata["dtConstantLoopCount_$colNum"]) || empty($postdata["dtConstantLoopCount_$colNum"])) {
-			return false;
-		}
-		$loopCount = trim($postdata["dtConstantLoopCount_$colNum"]);
-		if (!is_numeric($loopCount) || $loopCount <= 0) {
-			return false;
-		}
-
-		$options = array(
-			"loopCount" => $loopCount,
-			"values"    => explode("|", $postdata["dtOption_$colNum"])
-		);
-
-		return $options;
-	}
-
-	public function getExampleColumnHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-		return $L["see_help_dialog"];
-	}
-
-	public function getOptionsColumnHTML() {
-		$html =<<<EOF
-<table cellspacing="0" cellpadding="0" width="260">
-	<tr>
-		<td>{$this->L["loop_count"]}</td>
-		<td><input type="text" name="dtConstantLoopCount_%ROW%" id="dtConstantLoopCount_%ROW%" size="5" value="10" /></td>
-	</tr>
-	<tr>
-		<td>{$this->L["values"]}</td>
-		<td><input name="dtOption_%ROW%" id="dtOption_%ROW%" style="width: 100%" /></td>
-	</tr>
-</table>
-EOF;
-		return $html;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "TEXT default NULL",
-			"SQLField_Oracle" => "BLOB default NULL",
-			"SQLField_MSSQL" => "VARCHAR(MAX) NULL",
-			"SQLField_Postgres" => "TEXT NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		$html =<<< END
-	<p>
-		{$this->L["help_1"]}
-	</p>
-	<ul>
-		<li>{$this->L["help_2"]}</li>
-		<li>{$this->L["help_3"]}</li>
-		<li>{$this->L["help_4"]}</li>
-	</ul>
-	<p>
-		{$this->L["help_5"]}
-	</p>
-END;
-
-		return $html;
-	}
-}
diff --git a/plugins/dataTypes/Constant/Constant.js b/plugins/dataTypes/Constant/Constant.js
deleted file mode 100755
index 242df6d26..000000000
--- a/plugins/dataTypes/Constant/Constant.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/*global $:false,define:false*/
-define([
-	"manager",
-	"generator",
-	"constants",
-	"lang"
-], function(manager, generator, C, L) {
-
-	"use strict";
-
-	/**
-	* @name Constant
-	* @description JS code for the Constant Data Type.
-	* @see DataType
-	* @namespace
-	*/
-
-	var MODULE_ID = "data-type-Constant";
-	var LANG = L.dataTypePlugins.Constant;
-
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {},
-			isComplete: function() {
-				if ($("#dtOption_" + rowNum).length) {
-					$("#dtConstantLoopCount_" + rowNum).val(data.loopCount);
-					$("#dtOption_" + rowNum).val(data.values);
-					return true;
-				} else {
-					return false;
-				}
-			}
-		};
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			loopCount: $("#dtConstantLoopCount_" + rowNum).val(),
-			values: $("#dtOption_" + rowNum).val()
-		};
-	};
-
-	var _validate = function(rows) {
-		var invalidLoopCountFields = [];
-		var loopCountVisibleProblemRows = [];
-
-		var emptyFields = [];
-		var emptyFieldProblemRows = [];
-
-		for (var i=0; i<rows.length; i++) {
-			var loopVal = $.trim($("#dtConstantLoopCount_" + rows[i]).val());
-			var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-			if (loopVal === "" || !(/^\d+$/.test(loopVal))) {
-				loopCountVisibleProblemRows.push(visibleRowNum);
-				invalidLoopCountFields.push($("#dtConstantLoopCount_" + rows[i]));
-			}
-			if ($("#dtOption_" + rows[i]).val() === "") {
-				emptyFieldProblemRows.push(visibleRowNum);
-				emptyFields.push($("#dtOption_" + rows[i]));
-			}
-		}
-		var errors = [];
-		if (loopCountVisibleProblemRows.length) {
-			errors.push({ els: invalidLoopCountFields, error: LANG.invalid_loop_counts + " <b>" + loopCountVisibleProblemRows.join(", ") + "</b>"});
-		}
-		if (emptyFields.length) {
-			errors.push({ els: emptyFields, error: LANG.incomplete_fields + " <b>" + emptyFieldProblemRows.join(", ") + "</b>"});
-		}
-
-		return errors;
-	};
-
-	// register our module
-	manager.registerDataType(MODULE_ID, {
-		loadRow: _loadRow,
-		saveRow: _saveRow,
-		validate: _validate
-	});
-
-});
-
-
-
-/*
-var Constant_ns = {
-  validate: function(rows)
-  {
-    var visibleProblemRows = [];
-    var problemFields      = [];
-    for (var i=0; i<rows.length; i++)
-    {
-      if ($("#option_" + rows[i]).val() == "")
-      {
-        var visibleRowNum = gd._getVisibleRowOrderByRowNum(rows[i]);
-        visibleProblemRows.push(visibleRowNum);
-        problemFields.push($("#option_" + rows[i]));
-      }
-    }
-
-    if (visibleProblemRows.length)
-      gd.errors.push({ els: problemFields, error: L.Constant_incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-  },
-}
-*/
\ No newline at end of file
diff --git a/plugins/dataTypes/Constant/lang/de.php b/plugins/dataTypes/Constant/lang/de.php
deleted file mode 100644
index ad610276c..000000000
--- a/plugins/dataTypes/Constant/lang/de.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Konstante";
-
-$L["help_1"] = "Dieser Datentyp können Sie erzeugen eine Spalte von Daten, die sich wiederholende Werte hat sich von Zeile zu Zeile. Hier eine paar Beispiele, um Ihnen eine Vorstellung davon, wie das funktioniert.";
-$L["help_2"] = "Wenn Sie möchten, um den Wert \"1\" für jede Zeile, die Sie auf den Wert \"1\" in der Value (s)-Feld und einem Wert (> 0) in der Loop Count Feld.";
-$L["help_3"] = "Wenn Sie möchten, dass 100 Zeilen des Strings \"Male\" von 100 Zeilen die Zeichenfolge \"Female\" und wiederholen Sie gefolgt sind, können Sie \"100\" in der Loop Count Feld und \"männlich | weiblich\" , in der Value (s) ein.";
-$L["help_4"] = "Wenn Sie 5 Reihen von 1 bis 10 möchten, geben Sie \"5\" für die Loop Count Feld, und \"1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10\" in der Wert (e) ein.";
-$L["help_5"] = "Versuchen Sie bastelt herum. Sie bekommen die Idee.";
-$L["incomplete_fields"] = "The Constant Datentyp muss die Konstanten in den Wert (e) eingegeben werden müssen. Bitte beheben Sie die folgenden Zeilen:";
-$L["invalid_loop_counts"] = "Bitte geben Sie Zahlen für Constant Schleifenzähler Felder. Korrigieren Sie die folgende Zeile (n):";
-$L["loop_count"] = "Loop count:";
-$L["name"] = "Konstante";
-$L["values"] = "Wert (e):";
diff --git a/plugins/dataTypes/Constant/lang/en.php b/plugins/dataTypes/Constant/lang/en.php
deleted file mode 100644
index e0b62b206..000000000
--- a/plugins/dataTypes/Constant/lang/en.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Constant";
-
-$L["help_1"] = "This data type lets you generate a column of data that has repeating values from row to row. Here&#39;s a couple of examples to give you an idea of how this works.";
-$L["help_2"] = "If you&#39;d like to provide the value &quot;1&quot; for every row, you can enter &quot;1&quot; in the Value(s) field and any value (>0) in the Loop Count field.";
-$L["help_3"] = "If you&#39;d like to have 100 rows of the string &quot;Male&quot; followed by 100 rows of the string &quot;Female&quot; and repeat, you can enter &quot;100&quot; in the Loop Count field and &quot;Male|Female&quot; in the Value(s) field.";
-$L["help_4"] = "If you&#39;d like 5 rows of 1 through 10, enter &quot;5&quot; for the Loop Count field, and &quot;1|2|3|4|5|6|7|8|9|10&quot; in the Value(s) field.";
-$L["help_5"] = "Try tinkering around with it. You&#39;ll get the idea.";
-$L["loop_count"] = "Loop count:";
-$L["values"] = "Value(s):";
-$L["invalid_loop_counts"] = "Please enter numbers for Constant loop count fields. Please fix the following row(s):";
-$L["incomplete_fields"] = "The Constant data type needs to have the constants to be entered into the value(s) field. Please fix the following rows:";
diff --git a/plugins/dataTypes/Constant/lang/es.php b/plugins/dataTypes/Constant/lang/es.php
deleted file mode 100644
index 9fbbe8a79..000000000
--- a/plugins/dataTypes/Constant/lang/es.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Constante";
-
-$L["help_1"] = "Este tipo de dato permite generar una columna de datos que tiene valores repetidos de fila a fila. He aquí un par de ejemplos para darte una idea de cómo funciona.";
-$L["help_2"] = "Si quieres proveer el valor &quot;1&quot; para cada fila, para cada fila, puedes introducir &quot;1&quot; en el campo Valores y cualquier valor (>0) in el campo Contador de bucle.";
-$L["help_3"] = "Si quieres tener 100 filas de la cadena &quot;Hombre&quot; seguidas por 100 filas de la cadena &quot;Mujer&quot; y repetir, puedes introducir &quot;100&quot; en el campo de Contador de bucle y &quot;Hombre|Mujer&quot; en el campo Valores.";
-$L["help_4"] = "Si quieres 5 filas de 1 hasta 10, introduce &quot;5&quot; en el campo Contador de bucle y &quot;1|2|3|4|5|6|7|8|9|10&quot; en el campo Valores.";
-$L["help_5"] = "Prueba a jugar con esto. Te harás una idea.";
-$L["loop_count"] = "Contador del bucle:";
-$L["values"] = "Valores:";
-$L["invalid_loop_counts"] = "Por favor, introduce números en los campos de Constante de contador de bucle. Por favor, arregla las siguientes filas:";
-$L["incomplete_fields"] = "Es necesario que el tipo de dato Constante tenga introducidas constantes en el campo Valores. Por favor, corrija las siguientes filas:";
diff --git a/plugins/dataTypes/Constant/lang/fr.php b/plugins/dataTypes/Constant/lang/fr.php
deleted file mode 100644
index eeac8605c..000000000
--- a/plugins/dataTypes/Constant/lang/fr.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Constante";
-
-$L["help_1"] = "Ce type de données permet de générer une colonne de données qui répète des valeurs de ligne en ligne. Voici une série d'exemples pour vous donner une idée de son fonctionnement.";
-$L["help_2"] = "Si vous souhaitez avoir la valeur \"1\" pour chaque ligne, vous devez entrer \"1\" dans le champ 'Valeur' et un nombre (> 0) dans le champ 'Boucles'.";
-$L["help_3"] = "Si vous voulez avoir 100 lignes contentant la chaîne \"Homme\" suivi par 100 lignes contentant la chaîne \"Femme\" et répéter cette opération jusqu'à la fin, vous pouvez entrer \"100\" dans le champ 'Valeur' et \"Homme | Femme\", dans le champ 'Boucles'.";
-$L["help_4"] = "Si vous souhaitez obtenir 5 rangées de 1 à 10, entrez \"5\" pour le champ 'Boucle', et «1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10» dans le champ 'Valeur'.";
-$L["help_5"] = "Essayez de bricoler un peu avec ce type de données, vous comprendrez vite.";
-$L["incomplete_fields"] = "Le type de données Constante nécessite un champ 'Valeur' renseigné. Corrigez les lignes suivantes:";
-$L["invalid_loop_counts"] = "Le type de données Constante nécessite un champ 'Boucles' renseigné. Corrigez les lignes suivantes:";
-$L["loop_count"] = "Boucles:";
-$L["name"] = "Constante";
-$L["values"] = "Valeur:";
diff --git a/plugins/dataTypes/Constant/lang/nl.php b/plugins/dataTypes/Constant/lang/nl.php
deleted file mode 100644
index 24a2280e2..000000000
--- a/plugins/dataTypes/Constant/lang/nl.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE"] = "Constante";
-
-$L["help_1"] = "Dit gegevenstype kunt u het genereren van een kolom met gegevens die waarden is het herhalen van rij tot rij. Hier volgt een aantal voorbeelden om u een idee van hoe dit werkt.";
-$L["help_2"] = "Als u wilt de waarde \"1\" voor elke rij geven, kunt u \"1\" in de Waarde (n) veld en elke waarde (> 0) in de Loop veld Aantal.";
-$L["help_3"] = "Als u wilt 100 rijen van de string \"Male\", gevolgd door 100 rijen van de string \"Vrouw\" en herhaal, kunt u \"100\" in de Loop veld Aantal en \"Man | Vrouw\", in de Waarde (n) veld.";
-$L["help_4"] = "Als u wilt 5 rijen van 1 willen tot en met 10, voert u \"5\" voor de Loop veld Aantal en \"1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10\" in het Waarde (n) veld.";
-$L["help_5"] = "Probeer knutselen rond met het. Je krijgt het idee.";
-$L["incomplete_fields"] = "De Constant gegevenstype moet hebben de constanten te worden ingevoerd in de waarde (n) veld. Please fix de volgende rijen:";
-$L["invalid_loop_counts"] = "Geef cijfers voor constante lus tellen velden. Please fix de volgende rij (en):";
-$L["loop_count"] = "Loop count:";
-$L["values"] = "Waarde (n):";
-
diff --git a/plugins/dataTypes/Country/Country.class.php b/plugins/dataTypes/Country/Country.class.php
deleted file mode 100644
index 0d579193c..000000000
--- a/plugins/dataTypes/Country/Country.class.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * This data type generates a random country name. A few things to know:
- * - The Core script comes with three database tables for country, region and city.
- * - The only countries listed in the country table are those for the Country-Specific Data plugins.
- * - This data type offers a single option when selected: "limit countries to those selected above". This
- *   is used to let the module know to either limit results to the selected Country plugins, or to pull from a much
- *   larger list (hardcoded in the class below). The benefits to using the country-specific data mapping is that
- *   it allows the script to intelligently generate rows of data where the City, Region and Country fields are
- *   in sync (i.e. no cities that don't belong to a particular region, etc).
- *
- * @author Ben Keen <ben.keen@gmail.com>
- * @package DataTypes
- */
-class DataType_Country extends DataTypePlugin {
-	protected $dataTypeName = "Country";
-	protected $dataTypeFieldGroup = "geo";
-	protected $dataTypeFieldGroupOrder = 50;
-	protected $jsModules = array("Country.js");
-	private $countries = array('Afghanistan', 'Åland Islands', 'Albania', 'Algeria', 'American Samoa', 'Andorra',
-		'Angola', 'Anguilla', 'Antarctica', 'Antigua and Barbuda', 'Argentina', 'Armenia', 'Aruba', 'Australia',
-		'Austria', 'Azerbaijan', 'Bahamas', 'Bahrain', 'Bangladesh', 'Barbados', 'Belarus', 'Belgium', 'Belize', 'Benin',
-		'Bermuda', 'Bhutan', 'Bolivia', 'Bonaire, Sint Eustatius and Saba', 'Bosnia and Herzegovina', 'Botswana',
-		'Bouvet Island', 'Brazil', 'British Indian Ocean Territory', 'Brunei', 'Bulgaria', 'Burkina Faso', 'Burundi',
-		'Cambodia', 'Cameroon', 'Canada', 'Cape Verde', 'Cayman Islands', 'Central African Republic', 'Chad', 'Chile',
-		'China', 'Christmas Island', 'Cocos (Keeling) Islands', 'Colombia', 'Comoros', 'Congo (Brazzaville)',
-		'Congo, the Democratic Republic of the', 'Cook Islands', 'Costa Rica', "Côte D'Ivoire (Ivory Coast)", 'Croatia',
-		'Cuba', 'Curaçao', 'Cyprus', 'Czech Republic', 'Denmark', 'Djibouti', 'Dominica', 'Dominican Republic',
-		'Ecuador', 'Egypt', 'El Salvador', 'Equatorial Guinea', 'Eritrea', 'Estonia', 'Ethiopia', 'Falkland Islands',
-		'Faroe Islands', 'Fiji', 'Finland', 'France', 'French Guiana', 'French Polynesia', 'French Southern Territories',
-		'Gabon', 'Gambia', 'Georgia', 'Germany', 'Ghana', 'Gibraltar', 'Greece', 'Greenland', 'Grenada', 'Guadeloupe',
-		'Guam', 'Guatemala', 'Guernsey', 'Guinea', 'Guinea-Bissau', 'Guyana', 'Haiti', 'Heard Island and Mcdonald Islands',
-		'Holy See (Vatican City State)', 'Honduras', 'Hong Kong', 'Hungary', 'Iceland', 'India', 'Indonesia',
-		'Iran', 'Iraq', 'Ireland', 'Isle of Man', 'Israel', 'Italy', 'Jamaica', 'Japan', 'Jersey', 'Jordan', 'Kazakhstan',
-		'Kenya', 'Kiribati', 'Korea, North', 'Korea, South', 'Kuwait', 'Kyrgyzstan', 'Laos', 'Latvia', 'Lebanon',
-		'Lesotho', 'Liberia', 'Libya', 'Liechtenstein', 'Lithuania', 'Luxembourg', 'Macao', 'Macedonia', 'Madagascar',
-		'Malawi', 'Malaysia', 'Maldives', 'Mali', 'Malta', 'Marshall Islands', 'Martinique', 'Mauritania', 'Mauritius',
-		'Mayotte', 'Mexico', 'Micronesia', 'Moldova', 'Monaco', 'Mongolia', 'Montenegro', 'Montserrat', 'Morocco',
-		'Mozambique', 'Myanmar', 'Namibia', 'Nauru', 'Nepal', 'Netherlands', 'New Caledonia', 'New Zealand', 'Nicaragua',
-		'Niger', 'Nigeria', 'Niue', 'Norfolk Island', 'Northern Mariana Islands', 'Norway', 'Oman', 'Pakistan', 'Palau',
-		'Palestine, State of', 'Panama', 'Papua New Guinea', 'Paraguay', 'Peru', 'Philippines', 'Pitcairn Islands',
-		'Poland', 'Portugal', 'Puerto Rico', 'Qatar', 'Reunion', 'Romania', 'Russian Federation', 'Rwanda',
-		'Saint Barthélemy',  'Saint Helena, Ascension and Tristan da Cunha', 'Saint Kitts and Nevis', 'Saint Lucia',
-		'Saint Martin', 'Saint Pierre and Miquelon', 'Saint Vincent and The Grenadines', 'Samoa', 'San Marino',
-		'Sao Tome and Principe', 'Saudi Arabia', 'Senegal', 'Serbia', 'Seychelles', 'Sierra Leone', 'Singapore',
-		'Sint Maarten', 'Slovakia', 'Slovenia', 'Solomon Islands', 'Somalia', 'South Africa',
-		'South Georgia and The South Sandwich Islands', 'Spain', 'Sri Lanka', 'Sudan', 'South Sudan', 'Suriname',
-		'Svalbard and Jan Mayen Islands', 'Swaziland', 'Sweden', 'Switzerland', 'Syria', 'Taiwan', 'Tajikistan',
-		'Tanzania', 'Thailand', 'Timor-Leste', 'Togo', 'Tokelau', 'Tonga', 'Trinidad and Tobago', 'Tunisia', 'Turkey',
-		'Turkmenistan', 'Turks and Caicos Islands', 'Tuvalu', 'Uganda', 'Ukraine', 'United Arab Emirates',
-		'United Kingdom (Great Britain)', 'United States', 'United States Minor Outlying Islands', 'Uruguay',
-		'Uzbekistan', 'Vanuatu', 'Venezuela', 'Viet Nam', 'Virgin Islands, British', 'Virgin Islands, United States',
-		'Wallis and Futuna', 'Western Sahara', 'Yemen', 'Zambia', 'Zimbabwe');
-	private $numCountries;
-	private $selectedCountrySlugs;
-	private $numSelectedCountrySlugs;
-	private $countryRegionData;
-	private $numCountryRegionData;
-
-
-	/**
-	 * For convenience, the constructor gets ALL country-plugin installed and stores all their data locally.
-	 * The individual generate() calls for each row filter out the country data it's not interested in.
-	 * @param string $runtimeContext
-	 */
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			$this->numCountries = count($this->countries);
-			$this->countryRegionData = Core::$geoData->getCountryRegionHash();
-			$this->numCountryRegionData = count($this->countryRegionData);
-		}
-	}
-
-	public function generate($generator, $generationContextData) {
-		$data = array();
-		if ($generationContextData["generationOptions"] == "all") {
-			$data["display"] = $this->countries[mt_rand(0, $this->numCountries-1)];
-		} else {
-			// pick a random country from whatever countries were selected
-			$randomCountrySlug = $this->selectedCountrySlugs[mt_rand(0, $this->numSelectedCountrySlugs-1)];
-			$randomCountry     = $this->countryRegionData[$randomCountrySlug];
-
-			$data = array(
-				"display" => $randomCountry["country"],
-				"slug"    => $randomCountry["country_slug"],
-				"id"      => $randomCountry["id"]
-			);
-		}
-		return $data;
-	}
-
-	/**
-	 * @see DataTypePlugin::getRowGenerationOptions()
-	 */
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		$selectedCountrySlugs = $generator->getCountries();
-
-		$option = "all";
-		if (isset($postdata["dtOption_$colNum"])) {
-			$option = "countryPluginsOnly";
-		}
-
-		// if the user didn't select any countries and they checked the "limit to those countries selected above
-		// option, there's nothing for us to generate. Just return false so the row is ignored. TODO: update the 
-		// JS code to throw an error 
-		if (empty($selectedCountrySlugs) && $option == "countryPluginsOnly") {
-			return false;
-		}
-
-		$this->selectedCountrySlugs    = $selectedCountrySlugs;
-		$this->numSelectedCountrySlugs = count($selectedCountrySlugs);
-
-		return $option;
-	}
-
-
-	public function getOptionsColumnHTML() {
-		$html =<<< END
-<input type="checkbox" name="dtOption_%ROW%" class="dtCountry_allCountries" value="" id="dtOption_%ROW%" /><label
-	class="dtCountry_allCountriesLabel" for="dtOption_%ROW%">{$this->L["limit_results"]}</label>
-END;
-		return $html;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(100) default NULL",
-			"SQLField_Oracle" => "varchar2(100) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(100) NULL"
-		);
-	}
-
-	/**
-	 * Returns an array of countries.
-	 */
-	public function getCountries($countrySlugs) {
-		$whereClause = "";
-		if (!empty($countrySlugs)) {
-			$whereClause = "WHERE has_full_data_set = 'yes'";
-			$slugClauses = array();
-			foreach ($countrySlugs as $slug) {
-				$slugClauses[] = "country_slug = '$slug'";
-			}
-
-			$slugClause = "(" . implode(" OR ", $slugClauses) . ")";
-			$whereClause .= "AND $slugClause";
-		}
-
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			SELECT *
-			FROM   {$prefix}countries
-			$whereClause
-		");
-
-		$countries = array();
-		while ($countryInfo = mysqli_fetch_assoc($query)) {
-			$countries[] = array(
-				"country" => $countryInfo['country'],
-				"id"      => $countryInfo['id'],
-				"slug"    => $countryInfo["country_slug"]
-			);
-		}
-		return $countries;
-	}
-
-	function getRegions($countryID) {
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			SELECT *
-			FROM  {$prefix}regions
-			WHERE country_id = $countryID
-		");
-
-		if ($response["success"]) {
-			$regionInfo = array();
-			while ($row = mysqli_fetch_assoc($response["results"])) {
-				$regionInfo[] = $row;
-			}
-		}
-
-		return $regionInfo;
-	}
-}
diff --git a/plugins/dataTypes/Country/Country.js b/plugins/dataTypes/Country/Country.js
deleted file mode 100755
index cec8b7471..000000000
--- a/plugins/dataTypes/Country/Country.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*global $:false,define:false*/
-define([
-	"manager",
-	"constants"
-], function(manager, C) {
-
-	"use strict";
-
-	/**
-	* @name Country
-	* @description JS code for the Country Data Type.
-	* @see DataType
-	* @namespace
-	*/
-
-	var MODULE_ID = "data-type-Country";
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.COUNTRIES.CHANGE] = _countryChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {},
-			isComplete: function() {
-				var optionField = $("#dtOption_" + rowNum);
-				if (optionField.length) {
-					if (data.checked) {
-						optionField.attr("checked", "checked");
-					} else {
-						optionField.removeAttr("checked");
-					}
-					return true;
-				} else {
-					return false;
-				}
-			}
-		};
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			"checked": ($("#dtOption_" + rowNum).attr("checked")) ? "checked" : ""
-		};
-	};
-
-	/**
-	 * This function has two convenient side-effects:
-	 * 1. It runs on page load, so we don't need to do anything special.
-	 * 2. It also affects the hidden template, so we don't need to do anything special for Country
-	 *    Data Types that are selected in the future - they'll already have the appropriate DOM changes.
-	 */
-	var _countryChange = function(msg) {
-		if (msg.countries.length > 0) {
-			$(".dtCountry_allCountries").removeAttr("disabled");
-			$(".dtCountry_allCountriesLabel").removeClass("gdDisabled");
-		} else {
-			$(".dtCountry_allCountries").attr("disabled", "disabled").removeAttr("checked");
-			$(".dtCountry_allCountriesLabel").addClass("gdDisabled");
-		}
-	};
-
-
-	// register our module
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/Country/lang/de.php b/plugins/dataTypes/Country/lang/de.php
deleted file mode 100644
index ee216ef0b..000000000
--- a/plugins/dataTypes/Country/lang/de.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Land";
-
-$L["limit_results"] = "Beschränken Ländern zu den oben ausgewählten";
\ No newline at end of file
diff --git a/plugins/dataTypes/Country/lang/en.php b/plugins/dataTypes/Country/lang/en.php
deleted file mode 100644
index 3ec22171f..000000000
--- a/plugins/dataTypes/Country/lang/en.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Country";
-$L["limit_results"] = "Limit countries to those selected above";
diff --git a/plugins/dataTypes/Country/lang/es.php b/plugins/dataTypes/Country/lang/es.php
deleted file mode 100644
index 5e830e1d0..000000000
--- a/plugins/dataTypes/Country/lang/es.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "País";
-$L["limit_results"] = "Limitar los países a los elegidos más arriba";
diff --git a/plugins/dataTypes/Country/lang/fr.php b/plugins/dataTypes/Country/lang/fr.php
deleted file mode 100644
index 54b403b04..000000000
--- a/plugins/dataTypes/Country/lang/fr.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Pays";
-
-$L["limit_results"] = "Limiter les pays à ceux sélectionnés ci-dessus";
diff --git a/plugins/dataTypes/Country/lang/nl.php b/plugins/dataTypes/Country/lang/nl.php
deleted file mode 100644
index 61854279d..000000000
--- a/plugins/dataTypes/Country/lang/nl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Land";
-$L["limit_results"] = "Beperk landen met de hierboven geselecteerde";
diff --git a/plugins/dataTypes/Currency/Currency.class.php b/plugins/dataTypes/Currency/Currency.class.php
deleted file mode 100644
index b225d5b4e..000000000
--- a/plugins/dataTypes/Currency/Currency.class.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package DataTypes
- */
-class DataType_Currency extends DataTypePlugin {
-	protected $dataTypeName = "Currency";
-	protected $dataTypeFieldGroup = "numeric";
-	protected $dataTypeFieldGroupOrder = 60;
-	protected $jsModules = array("Currency.js");
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-
-		}
-	}
-
-	// meh. All this string manipulation code could be improved, I'm sure
-	public function generate($generator, $generationContextData) {
-
-		$rangeFrom    = preg_replace("/\D/", "", $generationContextData["generationOptions"]["rangeFrom"]);
-		$rangeTo      = preg_replace("/\D/", "", $generationContextData["generationOptions"]["rangeTo"]);
-		$format       = $generationContextData["generationOptions"]["format"];
-		$dollarSymbol = $generationContextData["generationOptions"]["symbol"];
-		$dollarSymbolLocation = $generationContextData["generationOptions"]["symbolLocation"];
-
-		$randString = (string) mt_rand($rangeFrom, $rangeTo);
-		$randStringRev = strrev($randString);
-		$randStringRevLength = strlen($randStringRev);
-		$reversedFormat = strrev($format);
-
-		$display = "";
-
-		$randNumIndex = 0;
-		for ($i=0; $i<strlen($reversedFormat); $i++) {
-			if ($i > $randStringRevLength) {
-				break;
-			}
-			if ($reversedFormat[$i] == "X") {
-				$display .= $randStringRev[$randNumIndex];
-				$randNumIndex++;
-			} else {
-				$display .= $reversedFormat[$i];
-			}
-		}
-		$display = strrev($display);
-
-		// if it's under 1 dollar (or whatever) and has cents, we need to fix really small generated
-		// nums. Pretty feeble logic here, and I'm not 100% sure this will work for all currency formats
-		$hasCents = preg_match("/\D/", $format[strlen($format)-3]);
-		$numChars = strlen($display);
-		if ($hasCents && $numChars < 4) {
-			$truncatedFormat = preg_replace("/X/", "0", substr($format, -4));
-
-			if ($numChars === 0) {
-				$display = $truncatedFormat;
-			} else if ($numChars == 1) {
-				$display = substr($truncatedFormat, 0, 3) . $display;
-			} else if ($numChars == 2) {
-				$display = substr($truncatedFormat, 0, 2) . $display;
-			} else if ($numChars == 3) {
-				$display = "0" . $display;
-			}
-		}
-
-		// if $display begins with a non-digit, we need to prefix it with a zero
-		if (preg_match("/\D/", $display[0])) {
-			$display = "0" . $display;
-		}
-
-		// apply the dollar symbol
-		if (!empty($dollarSymbol)) {
-			if ($dollarSymbolLocation == "prefix") {
-				$display = $dollarSymbol . $display;
-			} else {
-				$display = $display . $dollarSymbol;
-			}
-		}
-
-		return array(
-			"display" => $display
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		$generationOptions = array(
-			"format"         => $postdata["dtCurrencyFormat_$colNum"],
-			"rangeFrom"      => $postdata["dtCurrencyRangeFrom_$colNum"],
-			"rangeTo"        => $postdata["dtCurrencyRangeTo_$colNum"],
-			"symbol"         => $postdata["dtCurrencySymbol_$colNum"],
-			"symbolLocation" => $postdata["dtCurrencySymbolLocation_$colNum"]
-		);
-
-		return $generationOptions;
-	}
-
-
-
-	public function getExampleColumnHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-
-		$html =<<< END
-	<select name="dtExample_%ROW%" id="dtExample_%ROW%" style="width:98%">
-		<option value="">{$L["please_select"]}</option>
-		<optgroup label="US/Canada">
-			<option value="XXX.XX|0.00|100.00|$|prefix">$0.00 -> $100.00</option>
-			<option value="XX,XXX|5000|10000|$|prefix">$5,000 -> $10,000 ({$this->L["no_cents"]})</option>
-			<option value="XXXXX.XX|1000.00|10000.00|$|prefix">$1000.00 -> $10000.00 ({$this->L["no_thousand_delimiters"]})</option>
-			<option value="XXX,XXX.XX|-100000.00|100000.00|$|prefix">-$100,000.00 -> $100,000.00</option>
-			<option value="X.XX|0.00|100.00||prefix">0.01 -> 1.00 ({$this->L["no_dollar_sign"]})</option>
-			<option value="X.XXX.XXX,XX|100.00|1000.00|$|suffix">100,00 $ -> 1.000,00 $ (French Canadian)</option>
-			<option value="XXX XXX|10|100000||prefix">10 -> 100 000</option>
-		</optgroup>
-		<optgroup label="UK">
-			<option value="XXX.XX|0.00|100.00|£|prefix">£0.00 -> £100.00</option
-		</optgroup>
-		<optgroup label="Euro">
-			<option value="XXX,XXX|100000|200000|€|prefix">€100,000 -> €200,000</option
-		</optgroup>
-	</select>
-END;
-		return $html;
-	}
-
-
-	public function getOptionsColumnHTML() {
-		$html =<<< END
-<div>
-	{$this->L["format"]}: <input type="text" id="dtCurrencyFormat_%ROW%" name="dtCurrencyFormat_%ROW%" style="width:160px" />
-</div>
-<div>
-	{$this->L["range"]} <input type="text" id="dtCurrencyRangeFrom_%ROW%" name="dtCurrencyRangeFrom_%ROW%" style="width:80px" />
-	{$this->L["to"]} <input type="text" id="dtCurrencyRangeTo_%ROW%" name="dtCurrencyRangeTo_%ROW%" style="width:80px" />
-</div>
-<div>
-	{$this->L["currency_symbol"]}
-	<input type="text" id="dtCurrencySymbol_%ROW%" name="dtCurrencySymbol_%ROW%" style="width: 20px" />
-	<select id="dtCurrencySymbolLocation_%ROW%" name="dtCurrencySymbolLocation_%ROW%">
-		<option value="prefix">{$this->L["prefix"]}</option>
-		<option value="suffix">{$this->L["suffix"]}</option>
-	</select>
-</div>
-
-END;
-		return $html;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(100) default NULL",
-			"SQLField_Oracle" => "varchar2(100) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(100) NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		$content =<<<EOF
-	<p>
-		{$this->L["help_intro"]}
-	</p>
-
-	<table cellpadding="0" cellspacing="1">
-	<tr>
-		<td width="120" valign="top"><h4>{$this->L["format"]}</h4></td>
-		<td>{$this->L["format_desc"]}</td>
-	</tr>
-	<tr>
-		<td valign="top"><h4>{$this->L["range_from"]}</h4></td>
-		<td>{$this->L["range_from_desc"]}</td>
-	</tr>
-	<tr>
-		<td valign="top"><h4>{$this->L["range_to"]}</h4></td>
-		<td>{$this->L["range_to_desc"]}</td>
-	</tr>
-	<tr>
-		<td valign="top"><h4>{$this->L["currency_symbol"]}</h4></td>
-		<td>{$this->L["currency_symbol_desc"]}</td>
-	</tr>
-	<tr>
-		<td valign="top"><h4>{$this->L["prefix_suffix"]}</h4></td>
-		<td>{$this->L["prefix_suffix_desc"]}</td>
-	</tr>
-	</table>
-EOF;
-
-		return $content;
-	}
-}
diff --git a/plugins/dataTypes/Currency/Currency.js b/plugins/dataTypes/Currency/Currency.js
deleted file mode 100644
index 2a90d3f30..000000000
--- a/plugins/dataTypes/Currency/Currency.js
+++ /dev/null
@@ -1,144 +0,0 @@
-/*global $:false,define:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name Currency
-	 * @description JS code for the Currency Data Type.
-	 * @see DataType
-	 * @namespace
-	 */
-
-	var MODULE_ID = "data-type-Currency";
-	var LANG = L.dataTypePlugins.Currency;
-
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.DATA_TABLE.ROW.EXAMPLE_CHANGE + "__" + MODULE_ID] = _exampleChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _exampleChange = function(msg) {
-		var format = "";
-		var rangeFrom = "";
-		var rangeTo = "";
-		var symbol = "";
-		var symbolLocation = "";
-		if (msg.value) {
-			var parts = msg.value.split("|");
-			format = parts[0];
-			rangeFrom = parts[1];
-			rangeTo = parts[2];
-			symbol = parts[3];
-			symbolLocation = parts[4];
-		}
-		$("#dtCurrencyFormat_" + msg.rowID).val(format);
-		$("#dtCurrencyRangeFrom_" + msg.rowID).val(rangeFrom);
-		$("#dtCurrencyRangeTo_" + msg.rowID).val(rangeTo);
-		$("#dtCurrencySymbol_" + msg.rowID).val(symbol);
-		$("#dtCurrencySymbolLocation_" + msg.rowID).val(symbolLocation);
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {
-				$("#dtCurrencyFormat_" + rowNum).val(data.format);
-				$("#dtCurrencyRangeFrom_" + rowNum).val(data.rangeFrom);
-				$("#dtCurrencyRangeTo_" + rowNum).val(data.rangeTo);
-				$("#dtCurrencySymbol_" + rowNum).val(data.symbol);
-				$("#dtCurrencySymbolLocation_" + rowNum).val(data.symbolLocation);
-			},
-			isComplete: function() {
-				return true;
-			}
-		};
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			"format": $("#dtCurrencyFormat_" + rowNum).val(),
-			"rangeFrom": $("#dtCurrencyRangeFrom_" + rowNum).val(),
-			"rangeTo": $("#dtCurrencyRangeTo_" + rowNum).val(),
-			"symbol": $("#dtCurrencySymbol_" + rowNum).val(),
-			"symbolLocation": $("#dtCurrencySymbolLocation_" + rowNum).val()
-		};
-	};
-
-	var _validate = function(rows) {
-		var problemFields = [];
-		var problemFields2 = [];
-		var problemFields3 = [];
-		var invalidFormatRows = [];
-		var rowsWithInvalidRange = [];
-		var fromRangeGreaterThanToRange = [];
-
-		for (var i=0; i<rows.length; i++) {
-			var format = $("#dtCurrencyFormat_" + rows[i]);
-			var from   = $("#dtCurrencyRangeFrom_" + rows[i]);
-			var to     = $("#dtCurrencyRangeTo_" + rows[i]);
-			var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-
-			if ($.trim(format.val()) === "") {
-				invalidFormatRows.push(visibleRowNum);
-				problemFields.push(format);
-			}
-
-			var validFromRange = true;
-			var validToRange = true;
-			if (from.val() === "" || from.val().match(/[^\d\.\-]/)) {
-				rowsWithInvalidRange.push(visibleRowNum);
-				validFromRange = false;
-				problemFields2.push(from);
-			}
-			if (to.val() === "" || to.val().match(/[^\d\.\-]/)) {
-				if ($.inArray(visibleRowNum, rowsWithInvalidRange) === -1) {
-					rowsWithInvalidRange.push(visibleRowNum);
-				}
-				validToRange = false;
-				problemFields2.push(to);
-			}
-
-			if (validFromRange && validToRange) {
-				var fromNum = parseFloat(from.val());
-				var toNum   = parseFloat(to.val());
-
-				// allow the same value, just in case users want to have the same currency outputted for all
-				// rows (you never know)
-				if (fromNum > toNum) {
-					fromRangeGreaterThanToRange.push(visibleRowNum);
-					problemFields3.push(from);
-				}
-			}
-		}
-
-		var errors = [];
-		if (invalidFormatRows.length) {
-			errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + invalidFormatRows.join(", ") + "</b>"});
-		}
-		if (rowsWithInvalidRange.length) {
-			errors.push({ els: problemFields2, error: LANG.invalid_range_fields + " <b>" + rowsWithInvalidRange.join(", ") + "</b>"});
-		}
-		if (fromRangeGreaterThanToRange.length) {
-			errors.push({ els: problemFields3, error: LANG.invalid_range + " <b>" + fromRangeGreaterThanToRange.join(", ") + "</b>"});
-		}
-
-
-		return errors;
-	};
-
-	// register our module
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		loadRow: _loadRow,
-		saveRow: _saveRow,
-		validate: _validate
-	});
-
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/Currency/lang/de.php b/plugins/dataTypes/Currency/lang/de.php
deleted file mode 100644
index ecfb93fc8..000000000
--- a/plugins/dataTypes/Currency/lang/de.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-$L = array();
-
-$L["help_intro"] = "Dieser Datentyp erzeugt zufällige Werte Währung, in welchem ​​Format und reichen Sie wollen. Das Beispiel Dropdown enthält mehrere Optionen, so dass Sie ein Gefühl dafür, wie es funktioniert bekommen können, aber hier ist, was jeder der Optionen bedeutet.";
-$L["format"] = "Formatieren";
-$L["format_desc"] = "Das Format Feld regelt genau, wie das Geld Wert formatiert werden soll. <b>X</b>'s in eine Zahl umgewandelt: alle anderen Werte bleiben wie sie ist.";
-$L["range_from"] = "Reichweite - Von";
-$L["range_from_desc"] = "Gibt den unteren Bereich der Werte, was Sie generieren möchten. Hinweis: Dieses Feld darf nur Zahlen enthalten und (wenn Sie wollen) einen Dezimalpunkt und zwei folgenden Nummern Cent / Pence / etc darstellen.";
-$L["range_to"] = "Reichweite - Um";
-$L["range_to_desc"] = "Der obere Bereich der Zahlen zu erzeugen.";
-$L["currency_symbol"] = "Währungssymbol";
-$L["currency_symbol_desc"] = "Was auch immer Währungssymbol Sie verwenden möchten, z. B. <b>$</b>, <b>€</b>, usw.";
-$L["prefix_suffix"] = "Präfix / Suffix";
-$L["prefix_suffix_desc"] = "Dieser legt fest, wo die Währung Symbol erscheinen soll.";
-$L["no_cents"] = "keine Cent";
-$L["no_thousand_delimiters"] = "keine tausend Trennzeichen";
-$L["no_dollar_sign"] = "keine Dollarzeichen";
-$L["range"] = "Reichweite";
-$L["to"] = "auf";
-$L["currency_symbol"] = "Währungssymbol";
-$L["prefix"] = "präfix";
-$L["suffix"] = "suffix";
-$L["incomplete_fields"] = "Der Currency-Datentyp haben muss das Format eingegeben. Bitte korrigieren Sie die folgenden Zeilen:";
-$L["invalid_range_fields"] = "Bitte geben Sie nur Zahlen in den Feldern Währung Bereich (0-9 und Dezimalpunkt). Bitte korrigieren Sie die folgenden Zeilen:";
-$L["invalid_range"] = "Bitte überprüfen Sie die Palette reicht von klein bis groß. Bitte korrigieren Sie die folgenden Zeilen:";
\ No newline at end of file
diff --git a/plugins/dataTypes/Currency/lang/en.php b/plugins/dataTypes/Currency/lang/en.php
deleted file mode 100644
index 4a29175cb..000000000
--- a/plugins/dataTypes/Currency/lang/en.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-$L = array();
-
-$L["help_intro"] = "This data type generates random currency values, in whatever format and range you want. The example dropdown contains several options so you can get a sense of how it works, but here's what each of the options means.";
-$L["format"] = "Format";
-$L["format_desc"] = "The format field governs exactly how the money value should be formatted. <b>X</b>'s are converted into a number: all other values are left as-is.";
-$L["range_from"] = "Range - From";
-$L["range_from_desc"] = "Specifies the lower range of whatever values you want to generate. Note: this field should only contain numbers and (if you want) a decimal point and two following numbers to represent cents/pence/etc.";
-$L["range_to"] = "Range - To";
-$L["range_to_desc"] = "The upper range of the numbers to generate.";
-$L["currency_symbol"] = "Currency Symbol";
-$L["currency_symbol_desc"] = "Whatever currency symbol you want to use, e.g. <b>$</b>, <b>€</b>, etc.";
-$L["prefix_suffix"] = "Prefix/Suffix";
-$L["prefix_suffix_desc"] = "This determines where the currency symbol should appear.";
-
-$L["no_cents"] = "no cents";
-$L["no_thousand_delimiters"] = "no thousand delimiters";
-$L["no_dollar_sign"] = "no dollar sign";
-$L["range"] = "Range";
-$L["to"] = "To";
-$L["currency_symbol"] = "Currency Symbol";
-$L["prefix"] = "prefix";
-$L["suffix"] = "suffix";
-$L["incomplete_fields"] = "The Currency data type needs to have the format entered. Please fix the following rows:";
-$L["invalid_range_fields"] = "Please only enter numbers in the Currency range fields (0-9 and decimal point). Please fix the following rows: ";
-$L["invalid_range"] = "Please check the range goes from small to large. Please fix the following rows: ";
\ No newline at end of file
diff --git a/plugins/dataTypes/Currency/lang/es.php b/plugins/dataTypes/Currency/lang/es.php
deleted file mode 100644
index cb31b280e..000000000
--- a/plugins/dataTypes/Currency/lang/es.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-$L = array();
-
-$L["help_intro"] = "Este tipo de datos genera valores de moneda al azar, en cualquier formato y el rango que desea. El ejemplo desplegable contiene varias opciones para que puedas tener una idea de cómo funciona, pero esto es lo que significa cada una de las opciones.";
-$L["format"] = "Formato";
-$L["format_desc"] = "El campo de formato regula exactamente cómo se debe dar formato al valor del dinero. <b>X</b>'s se convierte en un número: el resto de los valores se dejan tal cual.";
-$L["range_from"] = "Range - De";
-$L["range_from_desc"] = "Especifica el rango más bajo de lo que los valores que desea generar. Nota: Este campo sólo debe contener números y (si lo desea) un punto decimal y dos cifras siguientes para representar centavos / peniques / etc.";
-$L["range_to"] = "Range - Para";
-$L["range_to_desc"] = "El rango superior de los números de generar.";
-$L["currency_symbol"] = "Símbolo monetario";
-$L["currency_symbol_desc"] = "Cualquiera que sea moneda de símbolo que desea de usar, por ejemplo, <b>$</b>, <b>€</b>, etc";
-$L["prefix_suffix"] = "Prefijo / Sufijo";
-$L["prefix_suffix_desc"] = "Esto determina dónde debe aparecer el símbolo de moneda.";
-$L["no_cents"] = "sin centavos";
-$L["no_thousand_delimiters"] = "hay miles de delimitadores";
-$L["no_dollar_sign"] = "ningún signo de dólar";
-$L["range"] = "Alcance";
-$L["to"] = "a";
-$L["currency_symbol"] = "Símbolo de moneda";
-$L["prefix"] = "prefijo";
-$L["suffix"] = "sufijo";
-$L["incomplete_fields"] = "El tipo de datos de moneda debe tener el formato introducido. Por favor, corrija los siguientes filas:";
-$L["invalid_range_fields"] = "Les rogamos introducir números en los campos de intervalo de Divisas (0-9 y el punto decimal). Por favor, corrija los siguientes filas: ";
-$L["invalid_range"] = "Por favor, compruebe el rango va desde pequeñas a grandes. Por favor, corrija los siguientes filas:";
\ No newline at end of file
diff --git a/plugins/dataTypes/Currency/lang/fr.php b/plugins/dataTypes/Currency/lang/fr.php
deleted file mode 100644
index 98d04e5b2..000000000
--- a/plugins/dataTypes/Currency/lang/fr.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-$L = array();
-
-$L["help_intro"] = "Ce type de données génère des valeurs monétaires au hasard, dans n'importe quel format et dans la fourchette que vous souhaitez. La colonne Exemples contient déjà plusieurs options afin que vous puissiez avoir une idée du fonctionnement, mais voici la signification de chacune des options.";
-$L["format"] = "Format";
-$L["format_desc"] = "Le champ 'Format' permet de choisir le format exacte des valeurs générées. Les <b>X</b> sont remplacés par des chiffres et toutes les autres valeurs sont laissées telles quelles.";
-$L["range_from"] = "Fourchette - De";
-$L["range_from_desc"] = "Indique la fourchette basse des valeurs que vous souhaitez générer. Remarque: ce champ ne doit contenir que des chiffres et (si vous voulez) une virgule et les deux numéros suivants pour représenter les centimes.";
-$L["range_to"] = "Fourchette - A";
-$L["range_to_desc"] = "Indique la fourchette supérieure des nombres à générer.";
-$L["currency_symbol"] = "Symbole monétaire";
-$L["currency_symbol_desc"] = "Indique le symbole monétaire à utiliser, par exemple <b>$</b>, <b>€</b>, etc";
-$L["prefix_suffix"] = "Préfixe / Suffixe";
-$L["prefix_suffix_desc"] = "Détermine la position du symbole monétaire.";
-$L["no_cents"] = "Pas de centime";
-$L["no_thousand_delimiters"] = "Pas de séparateur des milliers";
-$L["no_dollar_sign"] = "Pas de signe de dollar";
-$L["range"] = "Fourchette - De";
-$L["to"] = "à";
-$L["currency_symbol"] = "Symbole monétaire";
-$L["prefix"] = "Préfixe";
-$L["suffix"] = "Suffixe";
-$L["incomplete_fields"] = "Le type de données monétaire nécessite un format. Corrigez les lignes suivantes:";
-$L["invalid_range_fields"] = "N'entrez que des chiffres dans les champs 'Fourchette' (0-9 et séparateur décimal). Corrigez les lignes suivantes:";
-$L["invalid_range"] = "Veuillez vérifier la gamme va du petit au grand. Corrigez les lignes suivantes:";
\ No newline at end of file
diff --git a/plugins/dataTypes/Currency/lang/nl.php b/plugins/dataTypes/Currency/lang/nl.php
deleted file mode 100644
index 5f8ee7b47..000000000
--- a/plugins/dataTypes/Currency/lang/nl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-$L = array();
-
-$L["help_intro"] = "Dit gegevenstype genereert willekeurige valuta waarden, in welke vorm en bereik je wilt. Het voorbeeld dropdown bevat verschillende opties, zodat u een idee van hoe het werkt kan krijgen, maar hier is wat elk van de opties betekent.";
-$L["format"] = "Formaat";
-$L["format_desc"] = "Het notatieveld regelt precies hoe het geld waarde moet worden geformatteerd. <b>X</b>'s worden omgezet in een getal: alle andere waarden worden gelaten voor wat het is.";
-$L["range_from"] = "Range - Van";
-$L["range_from_desc"] = "Geeft de ondergrens van welke waarden u wilt genereren. Opmerking: dit veld mag alleen nummers bevatten en (als je wilt) een decimale punt en twee volgende nummers te cent / pence / etc vertegenwoordigen.";
-$L["range_to"] = "Range - Om";
-$L["range_to_desc"] = "De bovengrens van de getallen te genereren.";
-$L["currency_symbol"] = "Valutasymbool";
-$L["currency_symbol_desc"] = "Ongeacht valuta symbool dat u wilt gebruiken, bijvoorbeeld <b>$</b>, <b>€</b>, enz.";
-$L["prefix_suffix"] = "Prefix/Suffix";
-$L["prefix_suffix_desc"] = "Dit bepaalt waar de valuta symbool moet verschijnen.";
-$L["no_cents"] = "geen cent";
-$L["no_thousand_delimiters"] = "geen duizend scheidingsteken";
-$L["no_dollar_sign"] = "geen dollarteken";
-$L["range"] = "reeks";
-$L["to"] = "naar";
-$L["currency_symbol"] = "Valutasymbool";
-$L["prefix"] = "voorvoegsel";
-$L["suffix"] = "achtervoegsel";
-$L["incomplete_fields"] = "Het gegevenstype Valuta dient te hebben het formaat ingevoerd. Please fix de volgende regels:";
-$L["invalid_range_fields"] = "Gelieve enkel getallen in te voeren in de Valuta range velden (0-9 en decimale punt). Please fix de volgende regels:";
-$L["invalid_range"] = "Controleer het bereik gaat van klein tot groot. Please fix de volgende regels: ";
\ No newline at end of file
diff --git a/plugins/dataTypes/Date/Date.class.php b/plugins/dataTypes/Date/Date.class.php
deleted file mode 100644
index f13a6baf9..000000000
--- a/plugins/dataTypes/Date/Date.class.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_Date extends DataTypePlugin {
-
-	protected $isEnabled = true;
-	protected $dataTypeName = "Date";
-	protected $dataTypeFieldGroup = "human_data";
-	protected $dataTypeFieldGroupOrder = 40;
-	protected $jsModules = array("Date.js");
-
-
-	public function generate($generator, $generationContextData) {
-		$options = $generationContextData["generationOptions"];
-
-		// convert the From and To dates to datetimes
-		list($month, $day, $year) = split("/", $options["from"]);
-		$fromDate = mktime(0, 0, 0, $month, $day, $year);
-		list($month, $day, $year) = split("/", $options["to"]);
-		$toDate = mktime(0, 0, 0, $month, $day, $year);
-
-		// randomly pick a date between those dates
-		$randDate = mt_rand($fromDate, $toDate);
-
-		// display the new date in the value specified
-		$date = date($options["formatCode"], $randDate);
-		return array(
-			"display" => $date
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		if (empty($postdata["dtFromDate_$colNum"]) || empty($postdata["dtToDate_$colNum"]) || empty($postdata["dtOption_$colNum"])) {
-			return false;
-		}
-
-		$options = array(
-			"formatCode" => $postdata["dtOption_$colNum"],
-			"from"       => $postdata["dtFromDate_$colNum"],
-			"to"         => $postdata["dtToDate_$colNum"]
-		);
-
-		return $options;
-	}
-	
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255)",
-			"SQLField_Oracle" => "varchar2(255)",
-			"SQLField_MSSQL" => "DATETIME NULL"
-		);
-	}
-
-	public function getExampleColumnHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-
-		$html =<<<EOF
-			<select id="dtExample_%ROW%">
-				<option value="">{$L["please_select"]}</option>
-				<option value="M j, Y">Jan 1, 2012</option>
-				<option value="F jS, Y">January 1st, 2012</option>
-				<option value="D, M d">Mon, Jan 01</option>
-				<option value="D, jS, Y">Mon, Jan 1st, 2012</option>
-				<option value="m.d.y">03.25.06</option>
-				<option value="m-d-y">03-25-06</option>
-				<option value="m/d/y">03/25/06</option>
-				<option value="m/d/Y">03/25/2012</option>
-				<option value="d.m.y">25.03.06</option>
-				<option value="d-m-y">25-03-06</option>
-				<option value="d/m/y">25/03/06</option>
-				<option value="d/m/Y">25/03/2012</option>
-				<option value="Y-m-d H:i:s">MySQL datetime</option>
-				<option value="U">UNIX timestamp</option>
-				<option value="c">ISO 8601 date</option>
-				<option value="r">RFC 2822 formatted date</option>
-				<option value="T">A timezone</option>
-			</select>
-EOF;
-		return $html;
-	}
-
-	public function getOptionsColumnHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-
-		$nextYear = date("m/d/Y", mktime(0, 0, 0, date("m"), date("d"), date("Y")+1));
-		$lastYear = date("m/d/Y", mktime(0, 0, 0, date("m"), date("d"), date("Y")-1));
-
-		$html =<<< END
-	{$this->L["from"]} <input type="text" name="dtFromDate_%ROW%" id="dtFromDate_%ROW%" size="10" value="$lastYear" readonly="readonly" />
-	{$this->L["to"]} <input type="text" name="dtToDate_%ROW%" id="dtToDate_%ROW%" size="10" value="$nextYear" readonly="readonly" />
-	<div>
-		{$this->L["format_code"]}&nbsp;<input type="text" name="dtOption_%ROW%" id="dtOption_%ROW%" style="width: 160px" />
-	</div>
-END;
-
-		return $html;
-	}
-
-	public function getHelpHTML() {
-		$html =<<<END
-			<p>
-				{$this->L["help_intro"]}
-			</p>
-
-			<table cellpadding="0" cellspacing="1">
-			<tr>
-				<td width="50"><h2>{$this->L["char"]}</h2></td>
-				<td width="300"><h2>{$this->L["description"]}</h2></td>
-				<td><h2>{$this->L["example"]}</h2></td>
-			</tr>
-			</table>
-			<hr size="1" />
-
-			<h3 class="gdSubtitle">{$this->L["day"]}</h3>
-			<hr size="1" />
-
-			<table cellpadding="0" cellspacing="1">
-			<tr>
-				<td width="50"><h4>d</h4></td>
-				<td width="300">{$this->L["help_d"]}</td>
-				<td>{$this->L["help_d_example"]}</td>
-			</tr>
-			<tr>
-				<td><h4>D</h4></td>
-				<td>{$this->L["help_D"]}</td>
-				<td>{$this->L["help_D_example"]}</td>
-			</tr>
-			<tr>
-				<td><h4>j</h4></td>
-				<td>{$this->L["help_j"]}</td>
-				<td>{$this->L["help_j_example"]}</td>
-			</tr>
-			<tr>
-				<td><h4>l</h4></td>
-				<td>{$this->L["help_l"]}</td>
-				<td>{$this->L["help_l_example"]}</td>
-			</tr>
-			<tr>
-				<td valign="top"><h4>S</h4></td>
-				<td>{$this->L["help_S"]}</td>
-				<td valign="top">{$this->L["help_S_example"]}</td>
-			</tr>
-			<tr>
-				<td valign="top"><h4>w</h4></td>
-				<td valign="top">{$this->L["help_w"]}</td>
-				<td valign="top">{$this->L["help_w_example"]}</td>
-			</tr>
-			<tr>
-				<td><h4>z</h4></td>
-				<td>{$this->L["help_z"]}</td>
-				<td>{$this->L["help_z_example"]}</td>
-			</tr>
-			</table>
-
-			<h3 class="gdSubtitle">{$this->L["week"]}</h3>
-			<hr size="1" />
-
-			<table cellpadding="0" cellspacing="1">
-			<tr>
-				<td width="50" valign="top"><h4>W</h4></td>
-				<td width="300" valign="top">{$this->L["help_W"]}</td>
-				<td valign="top">{$this->L["help_W_example"]}</td>
-			</tr>
-			</table>
-
-			<h3 class="gdSubtitle">{$this->L["month"]}</h3>
-			<hr size="1" />
-
-			<table cellpadding="0" cellspacing="1">
-			<tr>
-				<td width="50" valign="top"><h4>F</h4></td>
-				<td width="300">{$this->L["help_F"]}</td>
-				<td valign="top">{$this->L["help_F_example"]}</td>
-			</tr>
-			<tr>
-				<td><h4>m</h4></td>
-				<td>{$this->L["help_m"]}</td>
-				<td>{$this->L["help_m_example"]}</td>
-			</tr>
-			<tr>
-				<td><h4>M</h4></td>
-				<td>{$this->L["help_M"]}</td>
-				<td>{$this->L["help_M_example"]}</td>
-			</tr>
-			<tr>
-				<td valign="top"><h4>n</h4></td>
-				<td>{$this->L["help_n"]}</td>
-				<td valign="top">{$this->L["help_n_example"]}</td>
-			</tr>
-			<tr>
-				<td><h4>t</h4></td>
-				<td>{$this->L["help_t"]}</td>
-				<td>{$this->L["help_t_example"]}</td>
-			</tr>
-			</table>
-
-
-			<h3 class="gdSubtitle">{$this->L["year"]}</h3>
-			<hr size="1" />
-
-			<table cellpadding="0" cellspacing="1">
-			<tr>
-				<td width="50"><h4>L</h4></td>
-				<td width="300">{$this->L["help_L"]}</td>
-				<td>{$this->L["help_L_example"]}</td>
-			</tr>
-			<tr>
-				<td><h4>Y</h4></td>
-				<td>{$this->L["help_Y"]}</td>
-				<td>{$this->L["help_Y_example"]}</td>
-			</tr>
-			<tr>
-				<td><h4>y</h4></td>
-				<td>{$this->L["help_y"]}</td>
-				<td>{$this->L["help_y_example"]}</td>
-			</tr>
-			</table>
-
-			<br />
-END;
-
-		return $html;
-	}
-
-}
diff --git a/plugins/dataTypes/Date/Date.js b/plugins/dataTypes/Date/Date.js
deleted file mode 100755
index 5352b5c5f..000000000
--- a/plugins/dataTypes/Date/Date.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name Date
-	 * @description JS code for the Date Data Type.
-	 * @see DataType
-	 * @namespace
-	 */
-
-	var MODULE_ID = "data-type-Date";
-	var LANG = L.dataTypePlugins.Date;
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.DATA_TABLE.ROW.TYPE_CHANGE] = _dataTypeChange;
-		subscriptions[C.EVENT.DATA_TABLE.ROW.EXAMPLE_CHANGE + "__" + MODULE_ID] = _exampleChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _dataTypeChange = function(msg) {
-		var currYear = _getCurrentYear();
-		var yearRangeFrom = (currYear - 200);
-		var yearRangeTo   = (currYear + 200);
-		var yearRange = yearRangeFrom + ":" + yearRangeTo;
-		$("#dtFromDate_" + msg.rowID).datepicker({
-			showOn:          "both",
-			buttonImage:     "resources/themes/" + C.THEME + "/images/calendarIcon.gif",
-			buttonImageOnly: true,
-			buttonText:      "Choose date",
-			changeMonth: true,
-			changeYear: true,
-			yearRange: yearRange
-		});
-		$("#dtToDate_" + msg.rowID).datepicker({
-			showOn:          "both",
-			buttonImage:     "resources/themes/" + C.THEME + "/images/calendarIcon.gif",
-			buttonImageOnly: true,
-			buttonText:      "Choose date",
-			changeMonth: true,
-			changeYear: true,
-			yearRange: yearRange
-		});
-	};
-
-	var _exampleChange = function(msg) {
-		$("#dtOption_" + msg.rowID).val(msg.value);
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			"fromDate": $("#dtFromDate_" + rowNum).val(),
-			"toDate":   $("#dtToDate_" + rowNum).val(),
-			"example":  $("#dtExample_" + rowNum).val(),
-			"option":   $("#dtOption_" + rowNum).val()
-		};
-	};
-
-	var _getCurrentYear = function() {
-		return new Date().getFullYear();
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() { },
-			isComplete: function() {
-				if ($("#dtOption_" + rowNum).length > 0) {
-					$("#dtFromDate_" + rowNum).val(data.fromDate);
-					$("#dtToDate_" + rowNum).val(data.toDate);
-					$("#dtExample_" + rowNum).val(data.example);
-					$("#dtOption_" + rowNum).val(data.option);
-					return true;
-				}
-				return false;
-			}
-		};
-	};
-
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-		for (var i=0; i<rows.length; i++) {
-			if ($("#dtOption_" + rows[i]).val() === "") {
-				var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-				visibleProblemRows.push(visibleRowNum);
-				problemFields.push($("#dtOption_" + rows[i]));
-			}
-		}
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		validate: _validate,
-		saveRow: _saveRow,
-		loadRow: _loadRow
-	});
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/Date/lang/de.php b/plugins/dataTypes/Date/lang/de.php
deleted file mode 100644
index d88c11c04..000000000
--- a/plugins/dataTypes/Date/lang/de.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Datum";
-
-$L["char"] = "Saibling";
-$L["day"] = "Tag";
-$L["description"] = "Beschreibung";
-$L["example"] = "Beispiel";
-$L["format_code"] = "Format-Code:";
-$L["from"] = "Von:";
-$L["help_D"] = "Eine textuelle Repräsentation eines Tages drei Buchstaben";
-$L["help_D_example"] = "Mo bis So";
-$L["help_F"] = "Eine vollständige textuelle Repräsentation eines Monats, wie Januar oder März";
-$L["help_F_example"] = "Januar bis Dezember";
-$L["help_L"] = "Ob es ist ein Schaltjahr";
-$L["help_L_example"] = "1, wenn es sich um ein Schaltjahr, sonst 0.";
-$L["help_M"] = "Eine kurze textuelle Repräsentation eines Monats drei Buchstaben";
-$L["help_M_example"] = "Jan bis Dezember";
-$L["help_S"] = "Englisch ordinal Suffix für den Tag des Monats, 2 Zeichen st, nd, rd oder th. Funktioniert gut mit j";
-$L["help_S_example"] = "Sonntag bis Samstag";
-$L["help_W"] = "ISO-8601 Wochennummer des Jahres, Wochen beginnt am Montag";
-$L["help_W_example"] = "42 (die 42. Woche im Jahr)";
-$L["help_Y"] = "Eine vollständige numerische Repräsentation eines Jahres, 4-stellig";
-$L["help_Y_example"] = "1999 oder 2003";
-$L["help_d"] = "Tag des Monats, 2-stellig mit führenden Nullen";
-$L["help_d_example"] = "01 bis 31";
-$L["help_intro"] = "Dieser Datentyp zufällig generiert ein Datum zwischen den angegebenen Daten und ermöglicht einzigartige Formatierung des Ergebnisses. In der Tabelle unten finden Sie eine Liste von lebensfähigen Formatierungsregeln (diese werden von der Standard-PHP-Funktion date (abgeschaut) Formatierungsoptionen). Werfen Sie einen Blick auf das Beispiel Dropdown-Liste aus bestehenden Formatierung auszuwählen.";
-$L["help_j"] = "Tag des Monats ohne führende Nullen";
-$L["help_j_example"] = "1-31";
-$L["help_l"] = "Eine vollständige textuelle Repräsentation des Tages der Woche";
-$L["help_l_example"] = "Sonntag bis Samstag";
-$L["help_m"] = "Numerische Darstellung eines Monats, mit führenden Nullen";
-$L["help_m_example"] = "01 bis 12";
-$L["help_n"] = "Numerische Darstellung eines Monats ohne führende Nullen";
-$L["help_n_example"] = "1 bis 12";
-$L["help_t"] = "Anzahl der Tage im angegebenen Monat";
-$L["help_t_example"] = "28 bis 31";
-$L["help_w"] = "Numerische Darstellung des Tag der Woche";
-$L["help_w_example"] = "0 (für Sonntag) bis 6 (für Samstag)";
-$L["help_y"] = "Eine zweistellige Darstellung eines Jahr";
-$L["help_y_example"] = "99 oder 03";
-$L["help_z"] = "Der Tag des Jahres (ab 0)";
-$L["help_z_example"] = "0 bis 365";
-$L["incomplete_fields"] = "Termine braucht, um das Format eingetragen im Options Textfeld. Bitte beheben Sie die folgenden Zeilen:";
-$L["month"] = "Monat";
-$L["to"] = "To:";
-$L["week"] = "Woche";
-$L["year"] = "Jahr";
diff --git a/plugins/dataTypes/Date/lang/en.php b/plugins/dataTypes/Date/lang/en.php
deleted file mode 100644
index 939126559..000000000
--- a/plugins/dataTypes/Date/lang/en.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-$L = array();
-
-$L["char"] = "Char";
-$L["day"] = "Day";
-$L["description"] = "Description";
-$L["example"] = "Example";
-$L["format_code"] = "Format code:";
-$L["from"] = "From:";
-$L["help_D"] = "A textual representation of a day, three letters";
-$L["help_D_example"] = "Mon through Sun";
-$L["help_F"] = "A full textual representation of a month, such as January or March";
-$L["help_F_example"] = "January through December";
-$L["help_L"] = "Whether it&#39;s a leap year";
-$L["help_L_example"] = "1 if it is a leap year, 0 otherwise.";
-$L["help_M"] = "A short textual representation of a month, three letters";
-$L["help_M_example"] = "Jan through Dec";
-$L["help_S"] = "English ordinal suffix for the day of the month, 2 characters	st, nd, rd or th. Works well with j";
-$L["help_S_example"] = "Sunday through Saturday";
-$L["help_W"] = "ISO-8601 week number of year, weeks starting on Monday";
-$L["help_W_example"] = "42 (the 42nd week in the year)";
-$L["help_Y"] = "A full numeric representation of a year, 4 digits";
-$L["help_Y_example"] = "1999 or 2003";
-$L["help_d"] = "Day of the month, 2 digits with leading zeros";
-$L["help_d_example"] = "01 to 31";
-$L["help_intro"] = "This data type randomly generates a date between the dates specified, and allows for unique formatting of the result. See the table below for a list of viable formatting rules (these are cribbed from the standard PHP date() formatting options). Take a look at the example dropdown to select from existing formatting options.";
-$L["help_j"] = "Day of the month without leading zeros";
-$L["help_j_example"] = "1 to 31";
-$L["help_l"] = "A full textual representation of the day of the week";
-$L["help_l_example"] = "Sunday through Saturday";
-$L["help_m"] = "Numeric representation of a month, with leading zeros";
-$L["help_m_example"] = "01 through 12";
-$L["help_n"] = "Numeric representation of a month, without leading zeros";
-$L["help_n_example"] = "1 through 12";
-$L["help_t"] = "Number of days in the given month";
-$L["help_t_example"] = "28 through 31";
-$L["help_w"] = "Numeric representation of the day of the week";
-$L["help_w_example"] = "0 (for Sunday) through 6 (for Saturday)";
-$L["help_y"] = "A two digit representation of a year";
-$L["help_y_example"] = "99 or 03";
-$L["help_z"] = "The day of the year (starting from 0)";
-$L["help_z_example"] = "0 through 365";
-$L["incomplete_fields"] = "Dates needs to have the format entered in the Options text field. Please fix the following rows:";
-$L["month"] = "Month";
-$L["name"] = "Date";
-$L["to"] = "To:";
-$L["week"] = "Week";
-$L["year"] = "Year";
diff --git a/plugins/dataTypes/Date/lang/es.php b/plugins/dataTypes/Date/lang/es.php
deleted file mode 100644
index 9e42a7e40..000000000
--- a/plugins/dataTypes/Date/lang/es.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Fecha";
-
-$L["char"] = "Carácter";
-$L["day"] = "Día";
-$L["description"] = "Descripción";
-$L["example"] = "Ejemplo";
-$L["format_code"] = "Código de formato:";
-$L["from"] = "De:";
-$L["help_D"] = "Una representación textual un día, tres letras";
-$L["help_D_example"] = "Lun a Dom";
-$L["help_F"] = "Una representación textual del mes, como Enero o Marzo";
-$L["help_F_example"] = "Enero a Diciembre";
-$L["help_L"] = "Si es un año bisiesto";
-$L["help_L_example"] = "1 si es un año bisiesto, 0 en caso contrario.";
-$L["help_M"] = "Una representación textual corta del mes, tres letras";
-$L["help_M_example"] = "Ene a Dic";
-$L["help_S"] = "Sufijo ordinal inglés del día del mes, 2 caracteres: st, nd, rd o th. Funciona bien con j";
-$L["help_S_example"] = "Domingo a Sabado";
-$L["help_W"] = "Número de semana anual ISO-8601, la semana empieza en lunes";
-$L["help_W_example"] = "42 (la semana 42ª del año)";
-$L["help_Y"] = "Una representación numérica completa del año, 4 dígitos";
-$L["help_Y_example"] = "1999 o 2003";
-$L["help_d"] = "Día del mes, 2 dígitos con ceros por delante";
-$L["help_d_example"] = "01 a 31";
-$L["help_intro"] = "Este tipo de dato genera aleatoriamente una fecha entre las fechas especificadas, y permite un formato único del resultado. Vea la tabla de abajo para una lista de reglas de formato viables (son algunas de las opciones de formato estándar date() de PHP). Eche un vistazo al desplegable de ejemplos para elegir entre las opciones de formato existentes..";
-$L["help_j"] = "Día del mes sin ceros por delante";
-$L["help_j_example"] = "1 a 31";
-$L["help_l"] = "Una representación textual del día de la semana";
-$L["help_l_example"] = "Domingo a Sábado";
-$L["help_m"] = "Representación numérica del mes, con ceros por delante";
-$L["help_m_example"] = "01 a 12";
-$L["help_n"] = "Representación numérica del mes, sin ceros por delante";
-$L["help_n_example"] = "1 a 12";
-$L["help_t"] = "Número de días de un mes dado";
-$L["help_t_example"] = "28 a 31";
-$L["help_w"] = "Representación numérica del día de la semana";
-$L["help_w_example"] = "0 (para Domingo) a 6 (a Sábado)";
-$L["help_y"] = "Una representación del año en dos dígitos";
-$L["help_y_example"] = "99 o 03";
-$L["help_z"] = "El día del año (comenzando en 0)";
-$L["help_z_example"] = "0 a 365";
-$L["incomplete_fields"] = "Es necesario que las fechas tengan el formato introducido en el campo de texto Opciones. Por favor, arregle las siguientes filas:";
-$L["month"] = "Mes";
-$L["name"] = "Fecha";
-$L["to"] = "A:";
-$L["week"] = "Semana";
-$L["year"] = "Año";
diff --git a/plugins/dataTypes/Date/lang/fr.php b/plugins/dataTypes/Date/lang/fr.php
deleted file mode 100644
index 8fedf504e..000000000
--- a/plugins/dataTypes/Date/lang/fr.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Date";
-
-$L["char"] = "Lettre";
-$L["day"] = "Jour";
-$L["description"] = "Description";
-$L["example"] = "Exemple";
-$L["format_code"] = "Format:";
-$L["from"] = "De:";
-$L["help_D"] = "Jour de la semaine sur 3 lettres";
-$L["help_D_example"] = "Lun à Dim";
-$L["help_F"] = "Mois complet";
-$L["help_F_example"] = "Janvier à Décembre";
-$L["help_L"] = "Année bissextile ou non";
-$L["help_L_example"] = "1 si c'est une année bissextile, 0 sinon.";
-$L["help_M"] = "Mois sur 3 lettres";
-$L["help_M_example"] = "Jan à Dec";
-$L["help_S"] = "Suffixe ordinal anglais pour le jour du mois sur 2 caractères: nd, rd ou th. Fonctionne bien avec j";
-$L["help_S_example"] = "nd, rd ou th";
-$L["help_W"] = "Code ISO-8601 du numéro de semaine dans l'année, les semaines commençant le lundi";
-$L["help_W_example"] = "42 (la 42ème semaine de l'année)";
-$L["help_Y"] = "Année sur 4 chiffres";
-$L["help_Y_example"] = "1999 ou 2003";
-$L["help_d"] = "Jour du mois sur 2 chiffres avec les zéros non significatifs";
-$L["help_d_example"] = "01 au 31";
-$L["help_intro"] = "Ce type de données génère de manière aléatoire une date comprise entre les deux dates spécifiées et permet de choisir le formatage unique du résultat. Voir la tableau ci-dessous pour une liste des règles de formatage possibles (ceux-ci sont réccupérés à partir de la fonction date() standard de PHP). Jetez un coup d'oeil à la colonne 'Exemples' pour choisir entre les options de formatage existantes.";
-$L["help_j"] = "Jour du mois sans les zéros initiaux";
-$L["help_j_example"] = "De 1 à 31";
-$L["help_l"] = "Jour de la semaine complet";
-$L["help_l_example"] = "Du dimanche au samedi";
-$L["help_m"] = "Numéro du mois sur 2 chiffres avec les zéros non significatifs";
-$L["help_m_example"] = "De 01 à 12";
-$L["help_n"] = "Numéro du mois sans les zéros initiaux";
-$L["help_n_example"] = "De 1 à 12";
-$L["help_t"] = "Nombre de jours dans le mois";
-$L["help_t_example"] = "De 28 à 31";
-$L["help_w"] = "Numéro du jour de la semaine";
-$L["help_w_example"] = "0 (pour dimanche) à 6 (pour samedi)";
-$L["help_y"] = "Année sur 2 chiffres";
-$L["help_y_example"] = "99 ou 03";
-$L["help_z"] = "Le jour de l'année (à partir de 0)";
-$L["help_z_example"] = "0 à 365";
-$L["incomplete_fields"] = "Les champs de type Date doivent avoir un format. Corrigez les lignes suivantes:";
-$L["month"] = "Mois";
-$L["name"] = "Date";
-$L["to"] = "à:";
-$L["week"] = "Semaine";
-$L["year"] = "Année";
\ No newline at end of file
diff --git a/plugins/dataTypes/Date/lang/nl.php b/plugins/dataTypes/Date/lang/nl.php
deleted file mode 100644
index 8452ef3fb..000000000
--- a/plugins/dataTypes/Date/lang/nl.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Datum";
-
-$L["char"] = "Verkolen";
-$L["day"] = "Dag";
-$L["description"] = "Beschrijving";
-$L["example"] = "Voorbeeld";
-$L["format_code"] = "Formaat-code:";
-$L["from"] = "Van:";
-$L["help_D"] = "Een tekstuele weergave van een dag, drie letters";
-$L["help_D_example"] = "Ma t zon";
-$L["help_F"] = "Een volledige tekstuele representatie van een maand, bijvoorbeeld januari of maart";
-$L["help_F_example"] = "Januari tot december";
-$L["help_L"] = "Of het nu een schrikkeljaar";
-$L["help_L_example"] = "1 als het gaat om een ​​schrikkeljaar, 0 anders.";
-$L["help_M"] = "Een korte tekstuele voorstelling van een maand, drie letters";
-$L["help_M_example"] = "Jan door december";
-$L["help_S"] = "Engels ordinale suffix voor de dag van de maand, 2 karakters st, nd, rd of th. Werkt goed met j";
-$L["help_S_example"] = "Zondag tot en met zaterdag";
-$L["help_W"] = "ISO-8601 weeknummer van het jaar, weken beginnend op maandag";
-$L["help_W_example"] = "42 (de 42e week in het jaar)";
-$L["help_Y"] = "Een volledige numerieke weergave van een jaar, 4 cijfers";
-$L["help_Y_example"] = "1999 of 2003";
-$L["help_d"] = "Dag van de maand, 2 cijfers met nullen";
-$L["help_d_example"] = "01-31";
-$L["help_intro"] = "Dit gegevenstype genereert willekeurig een datum tussen de gespecificeerde data en zorgt voor een unieke opmaak van het resultaat. Zie de onderstaande tabel voor een lijst van levensvatbare opmaak regels (deze zijn cribbed van de standaard PHP date () opmaakopties). Neem een ​​kijkje op het voorbeeld dropdown om te kiezen uit bestaande opmaakopties.";
-$L["help_j"] = "Dag van de maand zonder nullen aan het begin";
-$L["help_j_example"] = "1 tot 31";
-$L["help_l"] = "Een volledige tekstuele weergave van de dag van de week";
-$L["help_l_example"] = "Zondag tot en met zaterdag";
-$L["help_m"] = "Numerieke weergave van een maand, met nullen";
-$L["help_m_example"] = "01 tot en met 12";
-$L["help_n"] = "Numerieke weergave van een maand, zonder voorloopnullen";
-$L["help_n_example"] = "1 tot 12";
-$L["help_t"] = "Aantal dagen in de betreffende maand";
-$L["help_t_example"] = "28 tot 31";
-$L["help_w"] = "Numerieke weergave van de dag van de week";
-$L["help_w_example"] = "0 (voor zondag) tot 6 (voor zaterdag)";
-$L["help_y"] = "Een twee digit afbeelding van een jaar";
-$L["help_y_example"] = "99 of 03";
-$L["help_z"] = "De dag van het jaar (vanaf 0)";
-$L["help_z_example"] = "0 tot en met 365";
-$L["incomplete_fields"] = "Data dient te beschikken over het formaat ingevoerd in het Opties tekstveld. Please fix de volgende rijen:";
-$L["month"] = "Maand";
-$L["to"] = "Naar:";
-$L["week"] = "Week";
-$L["year"] = "Jaar";
\ No newline at end of file
diff --git a/plugins/dataTypes/Email/Email.class.php b/plugins/dataTypes/Email/Email.class.php
deleted file mode 100644
index 8f79cce76..000000000
--- a/plugins/dataTypes/Email/Email.class.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-
-class DataType_Email extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Email";
-	protected $dataTypeFieldGroup = "human_data";
-	protected $dataTypeFieldGroupOrder = 30;
-	private $words;
-	private $numWords;
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			$this->words = Utils::getLipsum();
-			$this->numWords = count($this->words);
-		}
-	}
-
-	public function generate($generator, $generationContextData) {
-		// prefix
-		$numPrefixWords = mt_rand(1, 3);
-		$offset = mt_rand(0, $this->numWords - ($numPrefixWords + 1));
-		$words = array_slice($this->words, $offset, $numPrefixWords);
-		$words = preg_replace("/[,.:;]/", "", $words);
-		$prefix = join(".", $words);
-
-		// domain
-		$numDomainWords = mt_rand(1, 3);
-		$offset = mt_rand(0, $this->numWords - ($numDomainWords + 1));
-		$words = array_slice($this->words, $offset, $numDomainWords);
-		$words = preg_replace("/[,.:;]/", "", $words);
-		$domain = join("", $words);
-
-		// suffix
-		$validSuffixes = array("edu", "com", "org", "ca", "net", "co.uk");
-		$suffix = $validSuffixes[mt_rand(0, count($validSuffixes)-1)];
-
-		return array(
-			"display" => "$prefix@$domain.$suffix"
-		);
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255) default NULL",
-			"SQLField_Oracle" => "varchar2(255) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-}
diff --git a/plugins/dataTypes/Email/lang/de.php b/plugins/dataTypes/Email/lang/de.php
deleted file mode 100644
index 2fd7909dc..000000000
--- a/plugins/dataTypes/Email/lang/de.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "E-mail";
diff --git a/plugins/dataTypes/Email/lang/en.php b/plugins/dataTypes/Email/lang/en.php
deleted file mode 100644
index 0befeb861..000000000
--- a/plugins/dataTypes/Email/lang/en.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Email";
diff --git a/plugins/dataTypes/Email/lang/es.php b/plugins/dataTypes/Email/lang/es.php
deleted file mode 100644
index 11052812c..000000000
--- a/plugins/dataTypes/Email/lang/es.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Correo electrónico";
diff --git a/plugins/dataTypes/Email/lang/fr.php b/plugins/dataTypes/Email/lang/fr.php
deleted file mode 100644
index 0befeb861..000000000
--- a/plugins/dataTypes/Email/lang/fr.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Email";
diff --git a/plugins/dataTypes/Email/lang/nl.php b/plugins/dataTypes/Email/lang/nl.php
deleted file mode 100644
index 30c3b0b24..000000000
--- a/plugins/dataTypes/Email/lang/nl.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "E-mail";
\ No newline at end of file
diff --git a/plugins/dataTypes/GUID/GUID.class.php b/plugins/dataTypes/GUID/GUID.class.php
deleted file mode 100644
index e45c587fb..000000000
--- a/plugins/dataTypes/GUID/GUID.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_GUID extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "GUID";
-	protected $dataTypeFieldGroup = "numeric";
-	protected $dataTypeFieldGroupOrder = 50;
-	private $generatedGUIDs = array();
-
-
-	public function generate($generator, $generationContextData) {
-		$placeholderStr = "HHHHHHHH-HHHH-HHHH-HHHH-HHHHHHHHHHHH";
-		$guid = Utils::generateRandomAlphanumericStr($placeholderStr);
-
-		// pretty sodding unlikely, but just in case!
-		while (in_array($guid, $this->generatedGUIDs)) {
-			$guid = Utils::generateRandomAlphanumericStr($placeholderStr);
-		}
-		$this->generatedGUIDs[] = $guid;
-		return array(
-			"display" => $guid
-		);
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["help"]}</p>";
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(36) NOT NULL",
-			"SQLField_Oracle" => "varchar2(36) NOT NULL",
-			"SQLField_MSSQL" => "UNIQUEIDENTIFIER NULL"
-		);
-	}
-}
\ No newline at end of file
diff --git a/plugins/dataTypes/GUID/lang/de.php b/plugins/dataTypes/GUID/lang/de.php
deleted file mode 100644
index c8bf91e86..000000000
--- a/plugins/dataTypes/GUID/lang/de.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "GUID";
-
-$L["help"] = "Generiert einen eindeutigen, zufälligen GUID (Globally Unique Identifier) ​​der Form: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, wobei X eine beliebige Hexadezimalzahl).";
diff --git a/plugins/dataTypes/GUID/lang/en.php b/plugins/dataTypes/GUID/lang/en.php
deleted file mode 100644
index 8024f72f0..000000000
--- a/plugins/dataTypes/GUID/lang/en.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "GUID";
-$L["help"] = "Generates a unique, random GUID (globally unique identifier) of the form: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, where X is any hexidecimal digit).";
diff --git a/plugins/dataTypes/GUID/lang/es.php b/plugins/dataTypes/GUID/lang/es.php
deleted file mode 100644
index 4b6133bce..000000000
--- a/plugins/dataTypes/GUID/lang/es.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "GUID";
-$L["help"] = "Genera un GUID (identificador único global) al azar con el formato XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, donde X es un dígito hexadecimal.";
diff --git a/plugins/dataTypes/GUID/lang/fr.php b/plugins/dataTypes/GUID/lang/fr.php
deleted file mode 100644
index 8b29857cb..000000000
--- a/plugins/dataTypes/GUID/lang/fr.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "GUID";
-
-$L["help"] = "Génère un GUID (identificateur global unique) unique aléatoire de la forme: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, où X est un chiffre hexadécimal).";
diff --git a/plugins/dataTypes/GUID/lang/nl.php b/plugins/dataTypes/GUID/lang/nl.php
deleted file mode 100644
index 01094e091..000000000
--- a/plugins/dataTypes/GUID/lang/nl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "GUID";
-$L["help"] = "Genereert een unieke, willekeurige GUID (globally unique identifier) ​​van de vorm: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX, waar X een hexadecimaal cijfer).";
diff --git a/plugins/dataTypes/IBAN/IBAN.class.php b/plugins/dataTypes/IBAN/IBAN.class.php
deleted file mode 100755
index e10428abd..000000000
--- a/plugins/dataTypes/IBAN/IBAN.class.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- * @author Joeri Noort <joert@joert.net>
- */
-
-class DataType_IBAN extends DataTypePlugin {
-
-	protected $isEnabled = true;
-	protected $dataTypeName = "Bank Account Numbers (IBAN)";
-	protected $hasHelpDialog = true;
-	protected $dataTypeFieldGroup = "human_data";
-	protected $dataTypeFieldGroupOrder = 100;
-
-	/**
-	 * Template definition
-	 * 	b :	NATIONAL_BANK_CODE
-	 * 	i :	BIC_CODE
-	 * 	d :	BRANCH_ID
-	 * 	c :	ACCOUNT_NUMBER
-	 * 	k :	IBAN_CHECKSUM
-	 * 	x :	NATIONAL_CHECKSUM
-	 * 	m :	MOD11_CHECKSUM
-	 * 	t :	ACCOUNT_TYPE
-	 * 	p :	PERSONAL_NUMBER
-	 * 	n :	COUNTRY_CODE
-	 *
-	 * Based on http://en.wikipedia.org/wiki/International_Bank_Account_Number#IBAN_formats_by_country
-	 * Corrected using various sources
-	 * @var array
-	 */
-	private $allCountryCodes = array(
-		array('code'=>'AL',	'sepa'=>false,	'template'=>'ALkkbbbddddxcccccccccccccccc',		'name'=>'Albania'),
-		array('code'=>'AD',	'sepa'=>false,	'template'=>'ADkkbbbbddddcccccccccccc',			'name'=>'Andorra'),
-		array('code'=>'AT',	'sepa'=>true,	'template'=>'ATkkbbbbbccccccccccc',				'name'=>'Austria'),
-		array('code'=>'AZ',	'sepa'=>false,	'template'=>'AZkkbbbbcccccccccccccccccccc',		'name'=>'Azerbaijan'),
-		array('code'=>'BE',	'sepa'=>true,	'template'=>'BEkkbbbcccccccxx',					'name'=>'Belgium'),
-		array('code'=>'BH',	'sepa'=>false,	'template'=>'BHkkbbbbcccccccccccccc',			'name'=>'Bahrain'),
-		array('code'=>'BA',	'sepa'=>false,	'template'=>'BAkkbbbdddccccccccxx',				'name'=>'Bosnia and Herzegovina'),
-		array('code'=>'BG',	'sepa'=>true,	'template'=>'BGkkiiiiddddttcccccccc',			'name'=>'Bulgaria'),
-		array('code'=>'CR',	'sepa'=>false,	'template'=>'CRkkbbbcccccccccccccc',			'name'=>'Costa Rica'),
-		array('code'=>'HR',	'sepa'=>false,	'template'=>'HRkkbbbbbbbcccccccccc',			'name'=>'Croatia'),
-		array('code'=>'CY',	'sepa'=>true,	'template'=>'CYkkbbbdddddcccccccccccccccc',		'name'=>'Cyprus'),
-		array('code'=>'CZ',	'sepa'=>true,	'template'=>'CZkkbbbbddddddcccccccccc',			'name'=>'Czech Republic'),
-		array('code'=>'DK',	'sepa'=>true,	'template'=>'DKkkbbbbcccccccccc',				'name'=>'Denmark'),
-		array('code'=>'DO',	'sepa'=>false,	'template'=>'DOkkbbbbcccccccccccccccccccc',		'name'=>'Dominican Republic'),
-		array('code'=>'EE',	'sepa'=>true,	'template'=>'EEkkbbddcccccccccccx',				'name'=>'Estonia'),
-		array('code'=>'FO',	'sepa'=>false,	'template'=>'FOkkbbbbcccccccccx',				'name'=>'Faroe Islands'),
-		array('code'=>'FI',	'sepa'=>true,	'template'=>'FIkkbbbbbbcccccccx',				'name'=>'Finland'),
-		array('code'=>'FR',	'sepa'=>true,	'template'=>'FRkkbbbbbdddddcccccccccccxx',		'name'=>'France'),
-		array('code'=>'GE',	'sepa'=>false,	'template'=>'GEkkbbcccccccccccccccc',			'name'=>'Georgia'),
-		array('code'=>'DE',	'sepa'=>true,	'template'=>'DEkkbbbbbbbbcccccccccc',			'name'=>'Germany'),
-		array('code'=>'GI',	'sepa'=>false,	'template'=>'GIkkiiiiccccccccccccccc',			'name'=>'Gibraltar'),
-		array('code'=>'GR',	'sepa'=>true,	'template'=>'GRkkbbbddddcccccccccccccccc',		'name'=>'Greece'),
-		array('code'=>'GL',	'sepa'=>false,	'template'=>'GLkkbbbbcccccccccc',				'name'=>'Greenland'),
-		array('code'=>'GT',	'sepa'=>false,	'template'=>'GTkkbbbbcccccccccccccccccccc',		'name'=>'Guatemala'),
-		array('code'=>'HU',	'sepa'=>true,	'template'=>'HUkkbbbddddxcccccccccccccccx',		'name'=>'Hungary'),
-		array('code'=>'IS',	'sepa'=>true,	'template'=>'ISkkbbbbddccccccpppppppppp',		'name'=>'Iceland'),
-		array('code'=>'IE',	'sepa'=>true,	'template'=>'IEkkiiiibbbbbbcccccccc',			'name'=>'Ireland'),
-		array('code'=>'IL',	'sepa'=>false,	'template'=>'ILkkbbbnnnccccccccccccc',			'name'=>'Israel'),
-		array('code'=>'IT',	'sepa'=>true,	'template'=>'ITkkxiiiiibbbbbcccccccccccc',		'name'=>'Italy'),
-		array('code'=>'KZ',	'sepa'=>false,	'template'=>'KZkkbbbccccccccccccc',				'name'=>'Kazakhstan'),
-		array('code'=>'KW',	'sepa'=>false,	'template'=>'KWkkbbbbcccccccccccccccccccccc',	'name'=>'Kuwait'),
-		array('code'=>'LV',	'sepa'=>true,	'template'=>'LVkkiiiiccccccccccccc',			'name'=>'Latvia'),
-		array('code'=>'LB',	'sepa'=>false,	'template'=>'LBkkbbbbcccccccccccccccccccc',		'name'=>'Lebanon'),
-		array('code'=>'LI',	'sepa'=>true,	'template'=>'LIkkbbbbbcccccccccccc',			'name'=>'Liechtenstein'),
-		array('code'=>'LT',	'sepa'=>true,	'template'=>'LTkkbbbbbccccccccccc',				'name'=>'Lithuania'),
-		array('code'=>'LU',	'sepa'=>true,	'template'=>'LUkkbbbccccccccccccc',				'name'=>'Luxembourg'),
-		array('code'=>'MK',	'sepa'=>false,	'template'=>'MKkkbbbccccccccccxx',				'name'=>'Macedonia'),
-		array('code'=>'MT',	'sepa'=>true,	'template'=>'MTkkiiiidddddcccccccccccccccccc',	'name'=>'Malta'),
-		array('code'=>'MR',	'sepa'=>false,	'template'=>'MRkkbbbbbdddddcccccccccccxx',		'name'=>'Mauritania'),
-		array('code'=>'MU',	'sepa'=>false,	'template'=>'MUkkbbbbbbddcccccccccccccccccc',	'name'=>'Mauritius'),
-		array('code'=>'MC',	'sepa'=>true,	'template'=>'MCkkbbbbbdddddcccccccccccxx',		'name'=>'Monaco'),
-		array('code'=>'MD',	'sepa'=>false,	'template'=>'MDkkbbcccccccccccccccccc',			'name'=>'Moldova'),
-		array('code'=>'ME',	'sepa'=>false,	'template'=>'MEkkbbbcccccccccccccxx',			'name'=>'Montenegro'),
-		array('code'=>'NL',	'sepa'=>true,	'template'=>'NLkkiiiicccccccccc',				'name'=>'Netherlands'),
-		array('code'=>'NO',	'sepa'=>true,	'template'=>'NOkkbbbbccccccx',					'name'=>'Norway'),
-		array('code'=>'PK',	'sepa'=>false,	'template'=>'PKkkbbbbcccccccccccccccc',			'name'=>'Pakistan'),
-		array('code'=>'PS',	'sepa'=>false,	'template'=>'PSkkbbbbxxxxxxxxxcccccccccccc',	'name'=>'Palestinian Territory, Occupied'),
-		array('code'=>'PL',	'sepa'=>true,	'template'=>'PLkkbbbddddxcccccccccccccccc',		'name'=>'Poland'),
-		array('code'=>'PT',	'sepa'=>true,	'template'=>'PTkkbbbbddddcccccccccccxx',		'name'=>'Portugal'),
-		array('code'=>'RO',	'sepa'=>true,	'template'=>'ROkkiiiicccccccccccccccc',			'name'=>'Romania'),
-		array('code'=>'SM',	'sepa'=>false,	'template'=>'SMkkxbbbbbdddddcccccccccccc',		'name'=>'San Marino'),
-		array('code'=>'SA',	'sepa'=>false,	'template'=>'SAkkbbcccccccccccccccccc',			'name'=>'Saudi Arabia'),
-		array('code'=>'RS',	'sepa'=>false,	'template'=>'RSkkbbbcccccccccccccxx',			'name'=>'Serbia'),
-		array('code'=>'SK',	'sepa'=>true,	'template'=>'SKkkbbbbddddddcccccccccc',			'name'=>'Slovakia'),
-		array('code'=>'SI',	'sepa'=>true,	'template'=>'SIkkbbdddccccccccxx',				'name'=>'Slovenia'),
-		array('code'=>'ES',	'sepa'=>true,	'template'=>'ESkkbbbbddddxxcccccccccc',			'name'=>'Spain'),
-		array('code'=>'SE',	'sepa'=>true,	'template'=>'SEkkbbbccccccccccccccccx',			'name'=>'Sweden'),
-		array('code'=>'CH',	'sepa'=>true,	'template'=>'CHkkbbbbbcccccccccccc',			'name'=>'Switzerland'),
-		array('code'=>'TN',	'sepa'=>false,	'template'=>'TNkkbbdddccccccccccccccc',			'name'=>'Tunisia'),
-		array('code'=>'TR',	'sepa'=>false,	'template'=>'TRkkbbbbbxcccccccccccccccc',		'name'=>'Turkey'),
-		array('code'=>'AE',	'sepa'=>false,	'template'=>'AEkkbbbcccccccccccccccc',			'name'=>'United Arab Emirates'),
-		array('code'=>'GB',	'sepa'=>true,	'template'=>'GBkkiiiiddddddcccccccc',			'name'=>'United Kingdom'),
-		array('code'=>'VG',	'sepa'=>false,	'template'=>'VGkkbbbbcccccccccccccccc',			'name'=>'Virgin Islands, British'),	
-	);
-	
-	public $countryCodes;
-	
-
-	/**
-	 * @todo make the $onlySepa option variable
-	 * @param string $runtimeContext
-	 */
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		$onlySepa = false;
-		if ($runtimeContext == "generation") {
-			foreach ($this->allCountryCodes as $details) {
-				if (!$onlySepa || $details['sepa']) {
-					$this->countryCodes[] = $details;
-				}
-			}
-		}
-	}
-	
-	public static function GenerateBic($countryCode) {
-		$withBranchCode = mt_rand(0,1) == true;
-		$branchCode = $withBranchCode ? 'xxX' : '';
-		$format = 'LLLL'.$countryCode.'LL'.$branchCode;
-		
-		return Utils::generateRandomAlphanumericStr($format);
-	}
-
-	private static function FillTemplate($template, $countryCode) {
-		$bic = self::GenerateBic($countryCode);
-		$bicPos = 0;
-		$len = strlen($template);
-		$unsigned = '';
-		for ($i=0; $i<$len; $i++) {
-			$c = $template[$i];
-			if (strtoupper($c) === $c) {
-				$unsigned .= $c;
-				continue;
-			}
-			if ($c === 'i') {
-				$unsigned .= $bic{$bicPos++};
-				continue;
-			}
-			if ($c === 'k') {
-				$unsigned .= '_';
-				continue;
-			}
-			$unsigned .= Utils::generateRandomAlphanumericStr('x');
-		}
-		return self::RecalculateChecksum($unsigned);
-	}
-	
-	public function getRandomCountry() {
-		return $this->countryCodes[mt_rand(0, count($this->countryCodes)-1)];
-	}
-	
-	/**
-	 * @todo Respect the selected country.
-	 */
-	public function generate($generator, $generationContextData) {
-		$code = $this->getRandomCountry();
-		$IBAN = self::FillTemplate($code['template'], $code['code']);
-		return array(
-			"display" => $IBAN
-		);
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(34)",
-			"SQLField_Oracle" => "varchar2(34)",
-			"SQLField_MSSQL" => "VARCHAR(34) NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["help"]}</p>";
-	}
-	
-	private static function Chr2Int($chr) {
-		if (strlen($chr) != 1) {
-			throw new Exception("Requires a single character");
-		}
-		$ord = ord($chr);
-	
-		if ($ord <=57 && $ord >=48) { //48 = '0', 57 = '9'
-			return $ord-48;
-		}
-		if ($ord <= 90 && $ord >= 65) { //90 = 'Z', 65 = 'A'
-			return 10 + ($ord - 65);
-		}
-		throw new Exception("Input character {$chr}({$ord}) does not map to an integer");
-	
-	}
-	
-	private static function BigMod( $x, $y ) {
-		// how many numbers to take at once? carefull not to exceed (int)
-		$take = 5;
-		$mod = '';
-	
-		do {
-			$a = intval($mod.substr($x, 0, $take));
-			$x = substr( $x, $take );
-			$mod = $a % $y;
-		} while (strlen($x));
-	
-		return intval($mod);
-	}
-	/**
-	 * Removes the current checksum digits from an IBAN string, and replaces it with what it should have been.
-	 */
-	private static function RecalculateChecksum($ibanString) {
-		if (strlen($ibanString) < 6) {
-			return $ibanString;
-		}
-		
-		$reordered =  substr($ibanString, 4).substr($ibanString, 0, 2);
-		$numerical = '';
-		for ($i=0; $i<strlen($reordered); $i++) {
-			$numerical .= self::Chr2Int($reordered[$i]);
-		}
-		$numerical .= '00';
-		
-		$checksum = 98 - self::BigMod($numerical, 97);
-		
-		return substr($ibanString, 0, 2).str_pad($checksum,2, '0', STR_PAD_LEFT).substr($ibanString, 4);
-	}
-}
diff --git a/plugins/dataTypes/IBAN/lang/de.php b/plugins/dataTypes/IBAN/lang/de.php
deleted file mode 100644
index 0159867b5..000000000
--- a/plugins/dataTypes/IBAN/lang/de.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Kontonummern (IBAN)";
-$L["help"] = <<<EOT
-	Erzeugt IBAN (International Bank Account Number).<br />
-	Die erzeugte IBAN hat eine gültige Prüfsumme, Landes-und Länge und die BIC ist an der richtigen Stelle.<br/>
-	Die Zahl ist höchst unwahrscheinlich, dass wirklich "gültig" tho sein, da in der Regel eine Reihe von Kontrollen zu tun, die länderspezifisch sind.
-EOT;
-//meh. the page crashes on newlines in my help? odd.
-$L["help"]  = str_replace(array("\r","\n","\t"), " ", $L["help"]);
\ No newline at end of file
diff --git a/plugins/dataTypes/IBAN/lang/en.php b/plugins/dataTypes/IBAN/lang/en.php
deleted file mode 100755
index c51d5e8ae..000000000
--- a/plugins/dataTypes/IBAN/lang/en.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Bank Account Nums (IBAN)";
-$L["help"] = <<<EOT
-	Generates IBAN (International Bank Account Number).<br />
-	The generated IBAN has a valid checksum, countrycode and length and the BIC is in the right place.<br/>
-	The number is highly unlikely to be really "valid" tho, since there are usually a bunch of checks to do which are country specific.
-EOT;
-//meh. the page crashes on newlines in my help? odd.
-$L["help"]  = str_replace(array("\r","\n","\t"), " ", $L["help"]);
\ No newline at end of file
diff --git a/plugins/dataTypes/IBAN/lang/es.php b/plugins/dataTypes/IBAN/lang/es.php
deleted file mode 100644
index c3ca1a1c1..000000000
--- a/plugins/dataTypes/IBAN/lang/es.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Nums de cuenta bancaria (IBAN)";
-$L["help"] = <<<EOT
-	Genera IBAN (International Bank Account Number).<br />
-	El IBAN generado tiene una suma de comprobación válida, código del país, la longitud, el BIC se encuentra en el lugar correcto.<br/>
-	El número es muy poco probable que sea verdad aunque "válida", ya que por lo general hay un montón de cheques que hacer, que son específicos de cada país.
-EOT;
-//meh. the page crashes on newlines in my help? odd.
-$L["help"]  = str_replace(array("\r","\n","\t"), " ", $L["help"]);
\ No newline at end of file
diff --git a/plugins/dataTypes/IBAN/lang/fr.php b/plugins/dataTypes/IBAN/lang/fr.php
deleted file mode 100644
index 39cdd03ff..000000000
--- a/plugins/dataTypes/IBAN/lang/fr.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Nums de compte bancaire (IBAN)";
-$L["help"] = <<<EOT
-	Génère IBAN (International Bank Account Number).<br />
-	L'IBAN a généré une somme de contrôle valide, countrycode la longueur et le BIC est au bon endroit.<br/>
-	Le nombre est hautement improbable qu'il soit vraiment tho "valide", car il ya généralement un tas de vérifications à faire qui sont spécifiques des pays.
-EOT;
-//meh. the page crashes on newlines in my help? odd.
-$L["help"]  = str_replace(array("\r","\n","\t"), " ", $L["help"]);
\ No newline at end of file
diff --git a/plugins/dataTypes/IBAN/lang/nl.php b/plugins/dataTypes/IBAN/lang/nl.php
deleted file mode 100644
index 4ae790b2d..000000000
--- a/plugins/dataTypes/IBAN/lang/nl.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Bankrekening Nums";
-$L["help"] = <<<EOT
-	Genereert IBAN (International Bank Account Number).<br />
-	De gegenereerde IBAN heeft een geldige checksum, landcode en de lengte en de BIC is op de juiste plaats.<br/>
-	Het nummer is zeer onwaarschijnlijk om echt "geldig" tho zijn, aangezien er meestal een heleboel controles te doen, tegen specifieke landen.
-EOT;
-//meh. the page crashes on newlines in my help? odd.
-$L["help"]  = str_replace(array("\r","\n","\t"), " ", $L["help"]);
\ No newline at end of file
diff --git a/plugins/dataTypes/LatLng/LatLng.class.php b/plugins/dataTypes/LatLng/LatLng.class.php
deleted file mode 100644
index 22290544e..000000000
--- a/plugins/dataTypes/LatLng/LatLng.class.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_LatLng extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Latitude / Longitude";
-	protected $dataTypeFieldGroup = "geo";
-	protected $dataTypeFieldGroupOrder = 100;
-	protected $jsModules = array("LatLng.js");
-
-	// $this->cachedMath = array();
-	private $helpDialogWidth = 410;
-	private $cachedMath;
-
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			self::initVars();
-		}
-	}
-
-	/**
-	 * Valid ranges:
-	 *   Lat: -90 -> + 90
-	 *   Lng: -180 -> +180
-	 */
-	public function generate($generator, $generationContextData) {
-		$options = $generationContextData["generationOptions"];
-
-		$info = array();
-		if ($options["lat"] && $options["lng"]) {
-			$info[] = (mt_rand($this->cachedMath["minLatCalc"], $this->cachedMath["maxLatCalc"]) / $this->cachedMath["divisor"]);
-			$info[] = (mt_rand($this->cachedMath["minLngCalc"], $this->cachedMath["maxLngCalc"]) / $this->cachedMath["divisor"]);
-		} else if ($options["lat"]) {
-			$info[] = (mt_rand($this->cachedMath["minLatCalc"], $this->cachedMath["maxLatCalc"]) / $this->cachedMath["divisor"]);
-		} else if ($options["lng"]) {
-			$info[] = (mt_rand($this->cachedMath["minLngCalc"], $this->cachedMath["maxLngCalc"]) / $this->cachedMath["divisor"]);
-		}
-
-		return array(
-			"display" => join(", ", $info)
-		);
-	}
-
-
-	public function getRowGenerationOptions($generator, $postdata, $column, $numCols) {
-		if (!isset($postdata["dtLatLng_Lat$column"]) && empty($postdata["dtLatLng_Lng$column"])) {
-			return false;
-		}
-		$options = array(
-			"lat" => isset($postdata["dtLatLng_Lat$column"]) ? true : false,
-			"lng" => isset($postdata["dtLatLng_Lng$column"]) ? true : false
-		);
-		return $options;
-	}
-
-
-	public function getOptionsColumnHTML() {
-		$html =<<< END
-<input type="checkbox" name="dtLatLng_Lat%ROW%" id="dtLatLng_Lat%ROW%" checked="checked" />
-	<label for="dtLatLng_Lat%ROW%">{$this->L["latitude"]}</label>&nbsp;
-<input type="checkbox" name="dtLatLng_Lng%ROW%" id="dtLatLng_Lng%ROW%" checked="checked" />
-	<label for="dtLatLng_Lng%ROW%">{$this->L["longitude"]}</label>
-END;
-		return $html;
-	}
-
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["help"]}</p>";
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(30) default NULL",
-			"SQLField_Oracle" => "varchar2(30) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(30) NULL"
-		);
-	}
-
-	private function initVars() {
-		// to 5 D.P. Arbitrary - should be configurable, but it should be good enough for most cases
-		$decimalPlaces = 5;
-		$this->cachedMath = array(
-			"minLatCalc" => -90 * (pow(10, $decimalPlaces)),
-			"maxLatCalc" => 90 * (pow(10, $decimalPlaces)),
-			"minLngCalc" => -180 * (pow(10, $decimalPlaces)),
-			"maxLngCalc" => 180 * (pow(10, $decimalPlaces)),
-			"divisor"    => pow(10, $decimalPlaces)
-		);
-	}
-}
diff --git a/plugins/dataTypes/LatLng/LatLng.js b/plugins/dataTypes/LatLng/LatLng.js
deleted file mode 100755
index e3023a699..000000000
--- a/plugins/dataTypes/LatLng/LatLng.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang"
-], function(manager, C, L) {
-
-	"use strict";
-
-	/**
-	* @name LatLng
-	* @description JS code for the LatLng Data Type.
-	* @see DataType
-	* @namespace
-	*/
-
-	var MODULE_ID = "data-type-LatLng";
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {},
-			isComplete: function() {
-				if ($("#dtLatLng_Lng" + rowNum).length) {
-					if (data.lat) {
-						$("#dtLatLng_Lat" + rowNum).attr("checked", "checked");
-					} else {
-						$("#dtLatLng_Lat" + rowNum).removeAttr("checked");
-					}
-					if (data.lng) {
-						$("#dtLatLng_Lng" + rowNum).attr("checked", "checked");
-					} else {
-						$("#dtLatLng_Lng" + rowNum).removeAttr("checked");
-					}
-					return true;
-				} else {
-					return false;
-				}
-			}
-		};
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			"lat": ($("#dtLatLng_Lat" + rowNum).attr("checked")) ? "checked" : "",
-			"lng": ($("#dtLatLng_Lng" + rowNum).attr("checked")) ? "checked" : ""
-		};
-	};
-
-	// register our module
-	manager.registerDataType(MODULE_ID, {
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/LatLng/lang/de.php b/plugins/dataTypes/LatLng/lang/de.php
deleted file mode 100644
index 8995b5360..000000000
--- a/plugins/dataTypes/LatLng/lang/de.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Breite / Länge";
-
-$L["help"] = "Dieser Datentyp generiert einen zufälligen Breite und / oder Länge. Wenn beide ausgewählt sind, zeigt er sowohl durch ein Komma getrennt.";
-$L["latitude"] = "Breite";
-$L["longitude"] = "Länge";
diff --git a/plugins/dataTypes/LatLng/lang/en.php b/plugins/dataTypes/LatLng/lang/en.php
deleted file mode 100644
index 5c4ae24b1..000000000
--- a/plugins/dataTypes/LatLng/lang/en.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Latitude / Longitude";
-
-$L["latitude"] = "Latitude";
-$L["longitude"] = "Longitude";
-$L["help"] = "This data type generates a random latitude and/or longitude. If both are selected, it displays both separated by a comma.";
diff --git a/plugins/dataTypes/LatLng/lang/es.php b/plugins/dataTypes/LatLng/lang/es.php
deleted file mode 100644
index 3a8ec7fc4..000000000
--- a/plugins/dataTypes/LatLng/lang/es.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Latitud / Longitud";
-
-$L["latitude"] = "Latitud";
-$L["longitude"] = "Longitud";
-$L["help"] = "Este tipo de dato genera una longitud y/o latitud aleatoria. Si se eligen ambas, mostrará ambas separadas por una coma.";
diff --git a/plugins/dataTypes/LatLng/lang/fr.php b/plugins/dataTypes/LatLng/lang/fr.php
deleted file mode 100644
index 520ce4a0c..000000000
--- a/plugins/dataTypes/LatLng/lang/fr.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Lat/Lng";
-
-$L["help"] = "Ce type de données génère une latitude et / ou une longitude aléatoire. Si les deux sont sélectionnés, il les affiche séparés par une virgule.";
-$L["latitude"] = "Latitude";
-$L["longitude"] = "Longitude";
\ No newline at end of file
diff --git a/plugins/dataTypes/LatLng/lang/nl.php b/plugins/dataTypes/LatLng/lang/nl.php
deleted file mode 100644
index 14ed08f5e..000000000
--- a/plugins/dataTypes/LatLng/lang/nl.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Latitude / Longitude";
-$L["help"] = "Dit gegevenstype genereert een willekeurig lengte-en / of lengte. Als beide zijn geselecteerd, geeft zowel een komma.";
-$L["latitude"] = "Speelruimte";
-$L["longitude"] = "Lengte";
diff --git a/plugins/dataTypes/List/List.class.php b/plugins/dataTypes/List/List.class.php
deleted file mode 100644
index ad36a9f0c..000000000
--- a/plugins/dataTypes/List/List.class.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_List extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Custom List";
-	protected $dataTypeFieldGroup = "other";
-	protected $dataTypeFieldGroupOrder = 40;
-	protected $jsModules = array("List.js");
-
-
-	public function generate($generator, $generationContextData) {
-		$options = $generationContextData["generationOptions"];
-		$allElements = explode("|", $options["values"]);
-
-		$val = "";
-		if ($options["listType"] == "Exactly") {
-			$val = implode(", ", Utils::returnRandomSubset($allElements, $options["number"]));
-		} else {
-			// at MOST. So randomly calculate a number up to the num specified
-			$numItems = mt_rand(0, $options["number"]);
-			$val = implode(", ", Utils::returnRandomSubset($allElements, $numItems));
-		}
-
-		return array(
-			"display" => $val
-		);
-	}
-
-
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		if (empty($postdata["dtOption_$colNum"])) {
-			return false;
-		}
-
-		$listType = $postdata["dtListType_$colNum"]; // Exactly or AtMost
-		$number   = ($listType == "Exactly") ? $postdata["dtListExactly_$colNum"] : $postdata["dtListAtMost_$colNum"];
-		$options = array(
-			"listType" => $listType,
-			"number"   => $number,
-			"values"   => $postdata["dtOption_$colNum"]
-		);
-
-		return $options;
-	}
-
-
-	public function getExampleColumnHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-		$html =<<< END
-	<select name="dtExample_%ROW%" id="dtExample_%ROW%">
-		<option value="">{$L["please_select"]}</option>
-		<option value="1|3|5|7|9|11|13|15|17|19|21|23|25|27|29|31|33|35|37|39|41|43|45|47|49">{$this->L["example_1"]}</option>
-		<option value="2|4|6|8|10|12|14|16|18|20|22|24|26|28|30|32|34|36|38|40|42|44|46|48|50">{$this->L["example_2"]}</option>
-		<option value="1|2|3|4|5|6|7|8|9|10">1-10</option>
-		<option value="{$this->L["one_to_ten"]}">{$this->L["example_3"]}</option>
-		<option value="1|2|3|5|7|11|13|17|19|23|29|31|37|41|43|47|53|59|61|67|71|73|79|83|89|97">{$this->L["example_4"]}</option>
-		<option value="{$this->L["colours"]}">{$this->L["example_5"]}</option>
-		<option value="{$this->L["relationship_states"]}">{$this->L["example_6"]}</option>
-		<option value="{$this->L["prefix"]}">{$this->L["example_7"]}</option>
-		<option value="{$this->L["company_names"]}">{$this->L["example_8"]}</option>
-		<option value="{$this->L["companies"]}">{$this->L["example_9"]}</option>
-		<option value="{$this->L["drug_names"]}">{$this->L["example_10"]}</option>
-	</select>
-	<div>
-		&nbsp;{$this->L["separated_by_pipe"]}
-	</div>
-END;
-		return $html;
-	}
-
-	public function getOptionsColumnHTML() {
-		$html =<<< END
-	<div>
-		<input type="radio" name="dtListType_%ROW%" id="dtListType1_%ROW%" value="Exactly" checked="checked"  />
-		<label for="dtListType1_%ROW%">{$this->L["exactly"]}</label>
-		<input type="text" size="2" name="dtListExactly_%ROW%" id="dtListExactly_%ROW%" value="1" />&nbsp;&nbsp;
-		<input type="radio" name="dtListType_%ROW%" id="dtListType2_%ROW%" value="AtMost" />
-		<label for="dtListType2_%ROW%">{$this->L["at_most"]}</label>
-		<input type="text" size="2" name="dtListAtMost_%ROW%" id="dtListAtMost_%ROW%" value="1" />
-	</div>
-	<div>
-		<input type="text" name="dtOption_%ROW%" id="dtOption_%ROW%" style="width: 267px;" />
-	</div>
-END;
-		return $html;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255) default NULL",
-			"SQLField_Oracle" => "varchar2(255) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["help"]}</p>";
-	}
-}
diff --git a/plugins/dataTypes/List/List.js b/plugins/dataTypes/List/List.js
deleted file mode 100644
index 0f3a1f19b..000000000
--- a/plugins/dataTypes/List/List.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/*global $:false,define:false*/
-define([
-  "manager",
-  "constants",
-  "lang",
-  "generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-  
-	/**
-	* @name List
-	* @description JS code for the List Data Type.
-	* @see DataType
-	* @namespace
-	*/
-
-	var MODULE_ID = "data-type-List";
-	var LANG = L.dataTypePlugins.List;
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.DATA_TABLE.ROW.EXAMPLE_CHANGE + "__" + MODULE_ID] = _exampleChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			example:   $("#dtExample_" + rowNum).val(),
-			listType1: $("#dtListType1_" + rowNum).attr("checked"),
-			listType2: $("#dtListType2_" + rowNum).attr("checked"),
-			exactly:   $("#dtListExactly_" + rowNum).val(),
-			atMost:    $("#dtListAtMost_" + rowNum).val(),
-			option:    $("#dtOption_" + rowNum).val()
-		};
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {
-				$("#dtExample_" + rowNum).val(data.example);
-				$("#dtListType1_" + rowNum).attr("checked", data.listType1);
-				$("#dtListType2_" + rowNum).attr("checked", data.listType2);
-				$("#dtListExactly_" + rowNum).val(data.exactly);
-				$("#dtListAtMost_" + rowNum).val(data.atMost);
-				$("#dtOption_" + rowNum).val(data.option);
-			},
-			isComplete: function() {
-				return $("#dtOption_" + rowNum).length > 0;
-			}
-		};
-	};
-
-	/**
-	 * Confirm the "Exactly" and "At Most" fields are all integers, and the Options field has been filled in.
-	 *
-	 */
-	var _validate = function(rows) {
-		var missingOptions = {
-			fields: [],
-			visibleProblemRows: []
-		};
-		var invalidIntFields = {
-			fields: [],
-			visibleProblemRows: []
-		};
-
-		var intOnly = /^\d+$/;
-		for (var i=0; i<rows.length; i++) {
-			var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-
-			// check the At Most and Exactly fields
-			var exactlyField = $("#dtListExactly_" + rows[i]);
-			var exactlyFieldValid = intOnly.test(exactlyField.val());
-			var atMostField = $("#dtListExactly_" + rows[i]);
-			var atMostFieldValid  = intOnly.test(atMostField.val());
-
-			if (!exactlyFieldValid || !atMostFieldValid) {
-				if (!exactlyFieldValid) {
-					invalidIntFields.fields.push(exactlyField);
-				}
-				if (!atMostFieldValid) {
-					invalidIntFields.fields.push(atMostField);
-				}
-				invalidIntFields.visibleProblemRows.push(visibleRowNum);
-			}
-
-			// check the option is filled in
-			var option = $.trim($("#dtOption_" + rows[i]).val());
-			if (option === "") {
-				missingOptions.visibleProblemRows.push(visibleRowNum);
-				missingOptions.fields.push($("#dtOption_" + rows[i]));
-			}
-		}
-		var errors = [];
-		if (missingOptions.visibleProblemRows.length) {
-			errors.push({ els: missingOptions.fields, error: LANG.incomplete_fields + " <b>" + missingOptions.visibleProblemRows.join(", ") + "</b>"});
-		}
-		if (invalidIntFields.visibleProblemRows.length) {
-			errors.push({ els: invalidIntFields.fields, error: LANG.invalid_int_fields + " <b>" + invalidIntFields.visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-	var _exampleChange = function(msg) {
-		$("#dtOption_" + msg.rowID).val(msg.value);
-	};
-
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		validate: _validate,
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/List/lang/de.php b/plugins/dataTypes/List/lang/de.php
deleted file mode 100644
index 43f73ada5..000000000
--- a/plugins/dataTypes/List/lang/de.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Benutzerdefinierte Liste";
-
-$L["at_most"] = "Am meisten";
-$L["colours"] = "red | orange | gelb | grün | blau | indigo | violett";
-$L["companies"] = "Systeme";
-$L["company_names"] = "Accounting | Werbung | Asset Management | Customer Relations | Kundenservice | Finanzen | Human Resources | Legal Department | Media Relations | Payroll | Public Relations | Qualitätssicherung | Vertrieb und Marketing | Forschung und Entwicklung | Tech Support";
-$L["exactly"] = "Genau";
-$L["example_1"] = "Odd Nums unter 50";
-$L["example_2"] = "Auch Nums unter 50";
-$L["example_3"] = "One-Ten";
-$L["example_4"] = "Prime Nums unter 100";
-$L["example_5"] = "Farben";
-$L["example_6"] = "Familienstand";
-$L["example_7"] = "Titel";
-$L["example_8"] = "Abteilung Namen";
-$L["example_9"] = "Firmennamen";
-$L["example_10"] = "Drug Namen";
-$L["help"] = "Geben Sie eine Liste der Elemente, durch ein Rohr | getrennt Charakter. Wählen Sie dann, ob Sie Genau <b>X</b> Anzahl der Elemente oder Allenfalls <b>X</b> Elemente aus der Liste. Mehrere Artikel werden in einer durch Komma getrennte Liste in den Ergebnissen zurückgegeben. Wenn Sie möchten, können Sie Ihre Daten auf leere Werte sind, fügen Sie einfach ein oder mehrere Pipe-Zeichen am Ende - je mehr Rohre Sie eingeben, desto größer ist die Wahrscheinlichkeit, dass ein leerer Wert erzeugt wird.";
-$L["incomplete_fields"] = "Die Benutzerdefinierte Liste Datentyp haben muss das Format eingetragen im Options Textfeld. Bitte beheben Sie die folgenden Zeilen:";
-$L["invalid_int_fields"] = "Bitte geben Sie nur Zahlen in der \"Genau\" und \"höchstens\" Felder für die Benutzerdefinierte Liste Datentyp. Bitte beheben Sie die folgenden Zeilen:";
-$L["one_to_ten"] = "eins | zwei | drei | vier | five | sechs | sieben | acht | neun | zehn";
-$L["prefix"] = "Dr. | Herr | Frau | Frau |";
-$L["relationship_states"] = "Single | Verheiratet | Geschieden | Common-Law";
-$L["separated_by_pipe"] = "Geben Sie die Werte getrennt durch |";
-$L["drug_names"] = "Hydrocodone/APAP|Hydrocodone/APAP|LevothyroxineSodium|Lisinopril|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|LevothyroxineSodium|Metoprolol Tartrate |Hydrocodone/APAP|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Azithromycin|Tramadol HCl|Omeprazole (Rx)|Amoxicillin|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Simvastatin|Metoprolol Succinate|Lisinopril/Hydrochlorothiazide|Seroquel|Promethazine HCl|Metoprolol Succinate|Amoxicillin Trihydrate/Potassium Clavulanate|Simvastatin|Amlodipine Besylate|Oxycodone/APAP|Warfarin Sodium|Zolpidem Tartrate|Metformin HCl|Prednisone|Metformin HCl|Fluconazole|Clonazepam|Omeprazole (Rx)|Diovan HCT|Simvastatin|Actos|Sertraline HCl|Gabapentin|Lantus|Amlodipine Besylate|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Alprazolam|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Prednisone|Celebrex|Venlafaxine HCl ER|Lisinopril|Lyrica|Nasonex|Spiriva Handihaler|Furosemide|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Cyclobenzaprin HCl|Carvedilol|Metformin HCl|Potassium Chloride|Viagra|Amlodipine Besylate|Furosemide|Ibuprofen (Rx)|Azithromycin|Vyvanse|Zetia|Albuterol|Zolpidem Tartrate|Tramadol HCl|Prednisone|Simvastatin|Clonazepam|Namenda|Januvia|Tricor|Diazepam|Simvastatin|Lisinopril|Lisinopril|Loestrin 24 Fe|Metformin HCl|Furosemide|Prednisone|Allopurinol|Amoxicillin Trihydrate/Potassium Clavulanate|Cialis|Alendronate Sodium|Losartan Potassium|Triamterene/Hydrochlorothiazide|Sertraline HCl|Amitriptyline HCl|Oxycodone HCl|Alprazolam|Alprazolam|Fluticasone Propionate|Fluticasone Propionate|Simvastatin|Triamterene/Hydrochlorothiazide|Suboxone|Oxycontin|Niaspan|Lorazepam|Doxycycline Hyclate|Amoxicillin|Digoxin|Potassium Chloride|Vytorin|Lantus Solostar|APAP/Codeine|Hydrocodone/APAP|Triamcinolone Acetonide|Atenolol|Premarin|Paroxetine HCl|Metoprolol Succinatee|Fluoxetine HCl|Flovent HFA|Promethazine HCl|Carisoprodol|Klor-Con M20|Lorazepam|Benicar|Lovastatin|Lisinopril|Amphetamine Salts|Ciprofloxacin HCl|Carvedilol|Risperidone|Levoxyl|Atenolol|Naproxen|Lovaza|Lisinopril|Alprazolam|Atenolol|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Gabapentin|Nuvaring|Alendronate Sodium|Amoxicillin|Cephalexin|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Prednisone|Benicar HCT|Gabapentin|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Doxycycline Hyclate|Tri-Sprintec|Amlodipine Besylate|Symbicort|Lidoderm|Pantoprazole Sodium|Pantoprazole Sodium|Zyprexa|Endocet|Zolpidem Tartrate|Gianvi|Lisinopril|Diazepam";
diff --git a/plugins/dataTypes/List/lang/en.php b/plugins/dataTypes/List/lang/en.php
deleted file mode 100644
index 82a6e12f9..000000000
--- a/plugins/dataTypes/List/lang/en.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Custom List";
-
-$L["at_most"] = "At Most";
-$L["colours"] = "red|orange|yellow|green|blue|indigo|violet";
-$L["companies"] = "Microsoft|Macromedia|Google|Yahoo|Lycos|Altavista|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple Systems";
-$L["company_names"] = "Accounting|Advertising|Asset Management|Customer Relations|Customer Service|Finances|Human Resources|Legal Department|Media Relations|Payroll|Public Relations|Quality Assurance|Sales and Marketing|Research and Development|Tech Support";
-$L["exactly"] = "Exactly";
-$L["example_1"] = "Odd Nums under 50";
-$L["example_2"] = "Even Nums under 50";
-$L["example_3"] = "One-Ten";
-$L["example_4"] = "Prime Nums under 100";
-$L["example_5"] = "Colours";
-$L["example_6"] = "Marital Status";
-$L["example_7"] = "Title";
-$L["example_8"] = "Department Names";
-$L["example_9"] = "Company Names";
-$L["example_10"] = "Drug Names";
-$L["help"] = "Enter a list of items, separated by a pipe | character. Then select whether you want <b>Exactly</b> X number of items, or <b>At most</b> X items from the list. Multiple items are returned in a comma-delimited list in the results. If you want your data set to include empty values, just add one or more pipe characters at the end - the more pipes you enter, the greater the probability of an empty value being generated.";
-$L["one_to_ten"] = "one|two|three|four|five|six|seven|eight|nine|ten";
-$L["prefix"] = "Dr.|Mr.|Mrs.|Ms.|";
-$L["relationship_states"] = "Single|Married|Divorced|Common-Law";
-$L["separated_by_pipe"] = "Enter values separated by |";
-$L["incomplete_fields"] = "The Custom List Data Type needs to have the format entered in the Options text field. Please fix the following rows:";
-$L["invalid_int_fields"] = "Please only enter numbers in the \"Exactly\" and \"At Most\" fields for the Custom List Data Type. Please fix the following rows:";
-$L["drug_names"] = "Hydrocodone/APAP|Hydrocodone/APAP|LevothyroxineSodium|Lisinopril|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|LevothyroxineSodium|Metoprolol Tartrate |Hydrocodone/APAP|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Azithromycin|Tramadol HCl|Omeprazole (Rx)|Amoxicillin|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Simvastatin|Metoprolol Succinate|Lisinopril/Hydrochlorothiazide|Seroquel|Promethazine HCl|Metoprolol Succinate|Amoxicillin Trihydrate/Potassium Clavulanate|Simvastatin|Amlodipine Besylate|Oxycodone/APAP|Warfarin Sodium|Zolpidem Tartrate|Metformin HCl|Prednisone|Metformin HCl|Fluconazole|Clonazepam|Omeprazole (Rx)|Diovan HCT|Simvastatin|Actos|Sertraline HCl|Gabapentin|Lantus|Amlodipine Besylate|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Alprazolam|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Prednisone|Celebrex|Venlafaxine HCl ER|Lisinopril|Lyrica|Nasonex|Spiriva Handihaler|Furosemide|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Cyclobenzaprin HCl|Carvedilol|Metformin HCl|Potassium Chloride|Viagra|Amlodipine Besylate|Furosemide|Ibuprofen (Rx)|Azithromycin|Vyvanse|Zetia|Albuterol|Zolpidem Tartrate|Tramadol HCl|Prednisone|Simvastatin|Clonazepam|Namenda|Januvia|Tricor|Diazepam|Simvastatin|Lisinopril|Lisinopril|Loestrin 24 Fe|Metformin HCl|Furosemide|Prednisone|Allopurinol|Amoxicillin Trihydrate/Potassium Clavulanate|Cialis|Alendronate Sodium|Losartan Potassium|Triamterene/Hydrochlorothiazide|Sertraline HCl|Amitriptyline HCl|Oxycodone HCl|Alprazolam|Alprazolam|Fluticasone Propionate|Fluticasone Propionate|Simvastatin|Triamterene/Hydrochlorothiazide|Suboxone|Oxycontin|Niaspan|Lorazepam|Doxycycline Hyclate|Amoxicillin|Digoxin|Potassium Chloride|Vytorin|Lantus Solostar|APAP/Codeine|Hydrocodone/APAP|Triamcinolone Acetonide|Atenolol|Premarin|Paroxetine HCl|Metoprolol Succinatee|Fluoxetine HCl|Flovent HFA|Promethazine HCl|Carisoprodol|Klor-Con M20|Lorazepam|Benicar|Lovastatin|Lisinopril|Amphetamine Salts|Ciprofloxacin HCl|Carvedilol|Risperidone|Levoxyl|Atenolol|Naproxen|Lovaza|Lisinopril|Alprazolam|Atenolol|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Gabapentin|Nuvaring|Alendronate Sodium|Amoxicillin|Cephalexin|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Prednisone|Benicar HCT|Gabapentin|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Doxycycline Hyclate|Tri-Sprintec|Amlodipine Besylate|Symbicort|Lidoderm|Pantoprazole Sodium|Pantoprazole Sodium|Zyprexa|Endocet|Zolpidem Tartrate|Gianvi|Lisinopril|Diazepam";
diff --git a/plugins/dataTypes/List/lang/es.php b/plugins/dataTypes/List/lang/es.php
deleted file mode 100644
index bfaa89b67..000000000
--- a/plugins/dataTypes/List/lang/es.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Lista personalizada";
-
-$L["at_most"] = "Al menos";
-$L["colours"] = "rojo|naranja|amarillo|verde|azul|índigo|violeta";
-$L["companies"] = "Microsoft|Macromedia|Google|Yahoo|Lycos|Altavista|Chami|Adobe|Borland|Lavasoft|Cakewalk|Sibelius|Finale|Apple Systems";
-$L["company_names"] = "Contabilidad|Publicidad|Gestión de activos|Atención al cliente|Finanzas|Recursos humanos|Departamento legal|Relaciones con los medios|Nóminas|Relaciones públicas|Gestión de la calidad|Ventas y Mercadotécnia|Investigación y desarrollo|Soporte técnico";
-$L["exactly"] = "Exactamente";
-$L["example_1"] = "Números impares menores de 50";
-$L["example_2"] = "Números pares menores de 50";
-$L["example_3"] = "Uno-Diez";
-$L["example_4"] = "Números primos menores de 100";
-$L["example_5"] = "Colores";
-$L["example_6"] = "Estado civil";
-$L["example_7"] = "Tratamiento";
-$L["example_8"] = "Nombres de departamento";
-$L["example_9"] = "Nombres de empresa";
-$L["example_10"] = "Nombres de medicamentos";
-$L["help"] = "Introduce una lista de ítems separados por el carácter tubería, |. Después, elije si quieres <b>Exactamente</b> X número de ítems o <b>Al menos</b> X ítems de la lista. Se devolverán múltiples ítems separados por coma en el resultado. Si quiere que su conjunto de datos incluya valores vacíos, basta con añadir una o más caracteres tubería al final. Cuantas más tuberías incluya, más probabilidad tendrá de que se genere un valor vacío.";
-$L["one_to_ten"] = "uno|dos|tres|cuatro|cinco|seis|siete|ocho|nueve|diez";
-$L["prefix"] = "Dr.|Sr.|Sra.|Srta.|";
-$L["relationship_states"] = "Soltero|Casado|Divorciado|Pareja de hecho|Viudo";
-$L["separated_by_pipe"] = "Introduzca valores separados por |";
-$L["incomplete_fields"] = "El tipo de dato Lista personalizada requiere que se informe el campo de texto Opciones con el formato. Por favor, arregle las siguientes filas:";
-$L["invalid_int_fields"] = "Por favor, introduzca sólo números en los campos \"Exactamente\" y \"Al Menos\" del tipo de dato Lista personalizada. Por favor, arregle las siguientes filas:";
-$L["drug_names"] = "Hydrocodone/APAP|Hydrocodone/APAP|LevothyroxineSodium|Lisinopril|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|LevothyroxineSodium|Metoprolol Tartrate |Hydrocodone/APAP|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Azithromycin|Tramadol HCl|Omeprazole (Rx)|Amoxicillin|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Simvastatin|Metoprolol Succinate|Lisinopril/Hydrochlorothiazide|Seroquel|Promethazine HCl|Metoprolol Succinate|Amoxicillin Trihydrate/Potassium Clavulanate|Simvastatin|Amlodipine Besylate|Oxycodone/APAP|Warfarin Sodium|Zolpidem Tartrate|Metformin HCl|Prednisone|Metformin HCl|Fluconazole|Clonazepam|Omeprazole (Rx)|Diovan HCT|Simvastatin|Actos|Sertraline HCl|Gabapentin|Lantus|Amlodipine Besylate|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Alprazolam|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Prednisone|Celebrex|Venlafaxine HCl ER|Lisinopril|Lyrica|Nasonex|Spiriva Handihaler|Furosemide|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Cyclobenzaprin HCl|Carvedilol|Metformin HCl|Potassium Chloride|Viagra|Amlodipine Besylate|Furosemide|Ibuprofen (Rx)|Azithromycin|Vyvanse|Zetia|Albuterol|Zolpidem Tartrate|Tramadol HCl|Prednisone|Simvastatin|Clonazepam|Namenda|Januvia|Tricor|Diazepam|Simvastatin|Lisinopril|Lisinopril|Loestrin 24 Fe|Metformin HCl|Furosemide|Prednisone|Allopurinol|Amoxicillin Trihydrate/Potassium Clavulanate|Cialis|Alendronate Sodium|Losartan Potassium|Triamterene/Hydrochlorothiazide|Sertraline HCl|Amitriptyline HCl|Oxycodone HCl|Alprazolam|Alprazolam|Fluticasone Propionate|Fluticasone Propionate|Simvastatin|Triamterene/Hydrochlorothiazide|Suboxone|Oxycontin|Niaspan|Lorazepam|Doxycycline Hyclate|Amoxicillin|Digoxin|Potassium Chloride|Vytorin|Lantus Solostar|APAP/Codeine|Hydrocodone/APAP|Triamcinolone Acetonide|Atenolol|Premarin|Paroxetine HCl|Metoprolol Succinatee|Fluoxetine HCl|Flovent HFA|Promethazine HCl|Carisoprodol|Klor-Con M20|Lorazepam|Benicar|Lovastatin|Lisinopril|Amphetamine Salts|Ciprofloxacin HCl|Carvedilol|Risperidone|Levoxyl|Atenolol|Naproxen|Lovaza|Lisinopril|Alprazolam|Atenolol|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Gabapentin|Nuvaring|Alendronate Sodium|Amoxicillin|Cephalexin|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Prednisone|Benicar HCT|Gabapentin|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Doxycycline Hyclate|Tri-Sprintec|Amlodipine Besylate|Symbicort|Lidoderm|Pantoprazole Sodium|Pantoprazole Sodium|Zyprexa|Endocet|Zolpidem Tartrate|Gianvi|Lisinopril|Diazepam";
diff --git a/plugins/dataTypes/List/lang/fr.php b/plugins/dataTypes/List/lang/fr.php
deleted file mode 100644
index 885f797bf..000000000
--- a/plugins/dataTypes/List/lang/fr.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Liste";
-
-$L["at_most"] = "Au maximum";
-$L["colours"] = "rouge|orange|jaune|vert|bleu|indigo|violet";
-$L["companies"] = "Entreprises";
-$L["company_names"] = "Comptables|Publicité|Asset Management|Relations clientèle|Service clientèle|Finances|Ressources Humaines|Juridique|Relations presse|Paie|Relations publiques|Assurance qualité|Ventes et marketing|Recherche et Développement|Support technique";
-$L["exactly"] = "Exactement";
-$L["example_1"] = "Nombres impairs jusqu'à 50";
-$L["example_2"] = "Nombres pairs jusqu'à 50";
-$L["example_3"] = "Un à dix";
-$L["example_4"] = "Nombres premiers jusqu'à 100";
-$L["example_5"] = "Couleurs";
-$L["example_6"] = "État civil";
-$L["example_7"] = "Titre";
-$L["example_8"] = "Services";
-$L["example_9"] = "Entreprises";
-$L["example_10"] = "Les noms de médicaments";
-$L["help"] = "Entrez une liste d'éléments, séparés par le caractère pipe: |. Choisissez ensuite entre utiliser <b>exactement</b> X éléments (=), ou <b>au maximum</b> X éléments (<=) de la liste pour générer la valeur de la colonne; plusieurs éléments peuvent être retournés séparés par des virgules. Si vous voulez que vos données incluent des valeurs vides, il suffit d'ajouter un ou plusieurs caractères pipe à la fin: plus il y aura de | et  plus la probabilité d'une valeur vide sera importante.";
-$L["one_to_ten"] = "un|deux|trois|quatre|cinq|six|sept|huit|neuf|dix";
-$L["prefix"] = "Dr.|M.|Mme|Mme|Mlle|";
-$L["relationship_states"] = "Célibataire|Marié|Veuf|";
-$L["separated_by_pipe"] = "Valeurs séparées par des |";
-$L["incomplete_fields"] = "La Type de données Liste doit avoir un format précisé. Corrigez les lignes suivantes:";
-$L["invalid_int_fields"] = "Entrez uniquement des numéros dans les champs \"=\" et \"<=\". Corrigez les lignes suivantes:";
-$L["drug_names"] = "Hydrocodone/APAP|Hydrocodone/APAP|LevothyroxineSodium|Lisinopril|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|LevothyroxineSodium|Metoprolol Tartrate |Hydrocodone/APAP|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Azithromycin|Tramadol HCl|Omeprazole (Rx)|Amoxicillin|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Simvastatin|Metoprolol Succinate|Lisinopril/Hydrochlorothiazide|Seroquel|Promethazine HCl|Metoprolol Succinate|Amoxicillin Trihydrate/Potassium Clavulanate|Simvastatin|Amlodipine Besylate|Oxycodone/APAP|Warfarin Sodium|Zolpidem Tartrate|Metformin HCl|Prednisone|Metformin HCl|Fluconazole|Clonazepam|Omeprazole (Rx)|Diovan HCT|Simvastatin|Actos|Sertraline HCl|Gabapentin|Lantus|Amlodipine Besylate|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Alprazolam|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Prednisone|Celebrex|Venlafaxine HCl ER|Lisinopril|Lyrica|Nasonex|Spiriva Handihaler|Furosemide|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Cyclobenzaprin HCl|Carvedilol|Metformin HCl|Potassium Chloride|Viagra|Amlodipine Besylate|Furosemide|Ibuprofen (Rx)|Azithromycin|Vyvanse|Zetia|Albuterol|Zolpidem Tartrate|Tramadol HCl|Prednisone|Simvastatin|Clonazepam|Namenda|Januvia|Tricor|Diazepam|Simvastatin|Lisinopril|Lisinopril|Loestrin 24 Fe|Metformin HCl|Furosemide|Prednisone|Allopurinol|Amoxicillin Trihydrate/Potassium Clavulanate|Cialis|Alendronate Sodium|Losartan Potassium|Triamterene/Hydrochlorothiazide|Sertraline HCl|Amitriptyline HCl|Oxycodone HCl|Alprazolam|Alprazolam|Fluticasone Propionate|Fluticasone Propionate|Simvastatin|Triamterene/Hydrochlorothiazide|Suboxone|Oxycontin|Niaspan|Lorazepam|Doxycycline Hyclate|Amoxicillin|Digoxin|Potassium Chloride|Vytorin|Lantus Solostar|APAP/Codeine|Hydrocodone/APAP|Triamcinolone Acetonide|Atenolol|Premarin|Paroxetine HCl|Metoprolol Succinatee|Fluoxetine HCl|Flovent HFA|Promethazine HCl|Carisoprodol|Klor-Con M20|Lorazepam|Benicar|Lovastatin|Lisinopril|Amphetamine Salts|Ciprofloxacin HCl|Carvedilol|Risperidone|Levoxyl|Atenolol|Naproxen|Lovaza|Lisinopril|Alprazolam|Atenolol|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Gabapentin|Nuvaring|Alendronate Sodium|Amoxicillin|Cephalexin|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Prednisone|Benicar HCT|Gabapentin|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Doxycycline Hyclate|Tri-Sprintec|Amlodipine Besylate|Symbicort|Lidoderm|Pantoprazole Sodium|Pantoprazole Sodium|Zyprexa|Endocet|Zolpidem Tartrate|Gianvi|Lisinopril|Diazepam";
diff --git a/plugins/dataTypes/List/lang/nl.php b/plugins/dataTypes/List/lang/nl.php
deleted file mode 100644
index f799ad6d6..000000000
--- a/plugins/dataTypes/List/lang/nl.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Aangepaste lijst";
-
-$L["at_most"] = "Op zijn hoogst";
-$L["colours"] = "Rood | Oranje | geel | groen | blauw | indigo | violet";
-$L["companies"] = "Systemen";
-$L["company_names"] = "Accounting | Adverteren | Asset Management | Customer Relations | Klantenservice | Financiën | Human Resources | Juridische afdeling | Media Relations | Payroll | Public Relations | Kwaliteitsgarantie | Sales en Marketing | Onderzoek en ontwikkeling | technische ondersteuning";
-$L["exactly"] = "Precies";
-$L["example_1"] = "Odd Nums onder de 50";
-$L["example_2"] = "Zelfs onder 50 Nums";
-$L["example_3"] = "One-Ten";
-$L["example_4"] = "Prime Nums onder de 100";
-$L["example_5"] = "Kleuren";
-$L["example_6"] = "Burgerlijke staat";
-$L["example_7"] = "Titel";
-$L["example_8"] = "Afdeling Namen";
-$L["example_9"] = "Bedrijf Namen";
-$L["example_10"] = "Drug Namen";
-$L["help"] = "Voer een lijst met items, gescheiden door een pipe | karakter. Selecteer vervolgens of u wilt <b>Precies</b> X aantal items, of <b>Bij de meeste</b> X items uit de lijst. Meerdere items worden geretourneerd in een door komma's gescheiden lijst in de resultaten. Als u wilt dat uw gegevens op lege waarden zijn, voeg dan een of meer pipe tekens aan het eind - de meer buizen die u invoert, des te groter de kans op een lege waarde wordt gegenereerd.";
-$L["incomplete_fields"] = "De Aangepaste lijst Gegevenstype dient te beschikken over het formaat ingevoerd in het Opties tekstveld. Please fix de volgende rijen:";
-$L["invalid_int_fields"] = "Gelieve enkel getallen in te voeren in de \"Precies\" en \"ten hoogste\" velden voor de Aangepaste lijst Gegevenstype. Please fix de volgende rijen:";
-$L["one_to_ten"] = "een | twee | drie | vier | vijf | zes | zeven | acht | negen | tien";
-$L["prefix"] = "Dr | De heer | Mevrouw | Ms |";
-$L["relationship_states"] = "Single | Getrouwd | Gescheiden | Common-Law";
-$L["separated_by_pipe"] = "Voer waarden gescheiden door |";
-$L["drug_names"] = "Hydrocodone/APAP|Hydrocodone/APAP|LevothyroxineSodium|Lisinopril|Lipitor|Simvastatin|Plavix|Singulair|Azithromycin|Crestor|Nexium|LevothyroxineSodium|Metoprolol Tartrate |Hydrocodone/APAP|Synthroid|Lexapro|Proair HFA|Ibuprofen (Rx)|Trazodone HCl|Amoxicillin|Omeprazole (Rx)|Advair Diskus|Cymbalta|Azithromycin|Tramadol HCl|Omeprazole (Rx)|Amoxicillin|Sulfamethoxazole/Trimethoprim|Amlodipine Besylate|Fluticasone Propionate|Hydrochlorothiazide|Hydrochlorothiazide|Ventolin HFA|Diovan|Warfarin Sodium|Sertraline HCl|Alprazolam|Pravastatin Sodium|Simvastatin|Metoprolol Succinate|Lisinopril/Hydrochlorothiazide|Seroquel|Promethazine HCl|Metoprolol Succinate|Amoxicillin Trihydrate/Potassium Clavulanate|Simvastatin|Amlodipine Besylate|Oxycodone/APAP|Warfarin Sodium|Zolpidem Tartrate|Metformin HCl|Prednisone|Metformin HCl|Fluconazole|Clonazepam|Omeprazole (Rx)|Diovan HCT|Simvastatin|Actos|Sertraline HCl|Gabapentin|Lantus|Amlodipine Besylate|Vitamin D (Rx)|Fluoxetine HCl|Furosemide|Citalopram HBr|Alprazolam|Ciprofloxacin HCl|Atenolol|Meloxicam|Lorazepam|Prednisone|Celebrex|Venlafaxine HCl ER|Lisinopril|Lyrica|Nasonex|Spiriva Handihaler|Furosemide|Cyclobenzaprin HCl|Cephalexin|Abilify|Citalopram HBR|Cyclobenzaprin HCl|Carvedilol|Metformin HCl|Potassium Chloride|Viagra|Amlodipine Besylate|Furosemide|Ibuprofen (Rx)|Azithromycin|Vyvanse|Zetia|Albuterol|Zolpidem Tartrate|Tramadol HCl|Prednisone|Simvastatin|Clonazepam|Namenda|Januvia|Tricor|Diazepam|Simvastatin|Lisinopril|Lisinopril|Loestrin 24 Fe|Metformin HCl|Furosemide|Prednisone|Allopurinol|Amoxicillin Trihydrate/Potassium Clavulanate|Cialis|Alendronate Sodium|Losartan Potassium|Triamterene/Hydrochlorothiazide|Sertraline HCl|Amitriptyline HCl|Oxycodone HCl|Alprazolam|Alprazolam|Fluticasone Propionate|Fluticasone Propionate|Simvastatin|Triamterene/Hydrochlorothiazide|Suboxone|Oxycontin|Niaspan|Lorazepam|Doxycycline Hyclate|Amoxicillin|Digoxin|Potassium Chloride|Vytorin|Lantus Solostar|APAP/Codeine|Hydrocodone/APAP|Triamcinolone Acetonide|Atenolol|Premarin|Paroxetine HCl|Metoprolol Succinatee|Fluoxetine HCl|Flovent HFA|Promethazine HCl|Carisoprodol|Klor-Con M20|Lorazepam|Benicar|Lovastatin|Lisinopril|Amphetamine Salts|Ciprofloxacin HCl|Carvedilol|Risperidone|Levoxyl|Atenolol|Naproxen|Lovaza|Lisinopril|Alprazolam|Atenolol|Bystolic|Penicillin VK|Famotidine|Methylprednisolone|Gabapentin|Nuvaring|Alendronate Sodium|Amoxicillin|Cephalexin|Glyburide|Clindamycin HCl|Folic Acid|Enalapril Maleate|Tamsulosin HCl|Cheratussin AC|Prednisone|Benicar HCT|Gabapentin|Levaquin|TriNessa|Ranitidine HCl|Levothyroxine Sodium|Glipizide|Doxycycline Hyclate|Tri-Sprintec|Amlodipine Besylate|Symbicort|Lidoderm|Pantoprazole Sodium|Pantoprazole Sodium|Zyprexa|Endocet|Zolpidem Tartrate|Gianvi|Lisinopril|Diazepam";
diff --git a/plugins/dataTypes/Names/Names.class.php b/plugins/dataTypes/Names/Names.class.php
deleted file mode 100644
index 4f473428d..000000000
--- a/plugins/dataTypes/Names/Names.class.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_Names extends DataTypePlugin {
-
-	protected $isEnabled = true;
-	protected $dataTypeName = "Names";
-	protected $hasHelpDialog = true;
-	protected $dataTypeFieldGroup = "human_data";
-	protected $dataTypeFieldGroupOrder = 10;
-	protected $jsModules = array("Names.js");
-
-	// custom member vars for this Data Type
-	private $maleNames    = array();
-	private $femaleNames  = array();
-	private $firstNames   = array();
-	private $lastNames    = array();
-	private $letters      = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-
-	/**
-	 * @param string $runtimeContext "generation" or "ui"
-	 */
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			self::initFirstNames();
-			self::initLastNames();
-		}
-	}
-
-
-	public function generate($generator, $generationContextData) {
-		$placeholderStr = $generationContextData["generationOptions"];
-
-		while (preg_match("/MaleName/", $placeholderStr)) {
-			$placeholderStr = preg_replace("/MaleName/", $this->getRandomFirstName($this->maleNames), $placeholderStr, 1);
-		}
-		while (preg_match("/FemaleName/", $placeholderStr)) {
-			$placeholderStr = preg_replace("/FemaleName/", $this->getRandomFirstName($this->femaleNames), $placeholderStr, 1);
-		}
-		while (preg_match("/Name/", $placeholderStr)) {
-			$placeholderStr = preg_replace("/Name/", $this->getRandomFirstName($this->firstNames), $placeholderStr, 1);
-		}
-		while (preg_match("/Surname/", $placeholderStr)) {
-			$placeholderStr = preg_replace("/Surname/", $this->lastNames[mt_rand(0, count($this->lastNames)-1)], $placeholderStr, 1);
-		}
-		while (preg_match("/Initial/", $placeholderStr)) {
-			$placeholderStr = preg_replace("/Initial/", $this->letters[mt_rand(0, strlen($this->letters)-1)], $placeholderStr, 1);
-		}
-
-		// in case the user entered multiple | separated formats, pick one
-		$formats = explode("|", $placeholderStr);
-		$chosenFormat = $formats[0];
-		if (count($formats) > 1) {
-			$chosenFormat = $formats[mt_rand(0, count($formats)-1)];
-		}
-
-		return array(
-			"display" => trim($chosenFormat)
-		);
-	}
-
-
-	public function getRowGenerationOptions($generator, $post, $colNum, $numCols) {
-		if (!isset($post["dtOption_$colNum"]) || empty($post["dtOption_$colNum"])) {
-			return false;
-		}
-		return $post["dtOption_$colNum"];
-	}
-
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255) default NULL",
-			"SQLField_Oracle" => "varchar2(255) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-
-	public function getExampleColumnHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-
-		$html =<<< END
-	<select name="dtExample_%ROW%" id="dtExample_%ROW%">
-		<option value="">{$L["please_select"]}</option>
-		<option value="MaleName">{$this->L["example_MaleName"]}</option>
-		<option value="FemaleName">{$this->L["example_FemaleName"]}</option>
-		<option value="Name">{$this->L["example_Name"]}</option>
-		<option value="MaleName Surname">{$this->L["example_MaleName_Surname"]}</option>
-		<option value="FemaleName Surname">{$this->L["example_FemaleName_Surname"]}</option>
-		<option value="Name Surname">{$this->L["example_Name_Surname"]}</option>
-		<option value="Name Initial. Surname">{$this->L["example_Name_Initial_Surname"]}</option>
-		<option value="Surname">{$this->L["example_surname"]}</option>
-		<option value="Surname, Name Initial.">{$this->L["example_Surname_Name_Initial"]}</option>
-		<option value="Name, Name, Name, Name">{$this->L["example_Name4"]}</option>
-		<option value="Name Surname|Name Initial. Surname">{$this->L["example_fullnames"]}</option>
-	</select>
-END;
-		return $html;
-	}
-
-	public function getOptionsColumnHTML() {
-		return '<input type="text" name="dtOption_%ROW%" id="dtOption_%ROW%" style="width: 267px" />';
-	}
-
-	public function getNames() {
-		return $this->firstNames;
-	}
-
-	public function getFirstNames() {
-		return $this->firstNames;
-	}
-
-	public function getLastNames() {
-		return $this->lastNames;
-	}
-
-
-	// -------- private member functions ---------
-
-	/**
-	 * Called when instantiating the plugin during data generation. Set the firstNames, maleNames and
-	 * femaleNames.
-	 */
-	private function initFirstNames() {
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			SELECT *
-			FROM   {$prefix}first_names
-		");
-
-		if ($response["success"]) {
-			$names = array();
-			$maleNames = array();
-			$femaleNames = array();
-			while ($row = mysqli_fetch_assoc($response["results"])) {
-				$gender = $row["gender"];
-				$name   = $row["first_name"];
-
-				$names[] = $name;
-				if ($gender == "male") {
-					$maleNames[] = $name;
-				} else {
-					$femaleNames[] = $name;
-				}
-			}
-
-			$this->firstNames  = $names;
-			$this->maleNames   = $maleNames;
-			$this->femaleNames = $femaleNames;
-		}
-	}
-
-
-	private function initLastNames() {
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			SELECT *
-			FROM   {$prefix}last_names
-		");
-
-		if ($response["success"]) {
-			$lastNames = array();
-			while ($row = mysqli_fetch_assoc($response["results"])) {
-				$lastNames[] = $row["last_name"];
-			}
-			$this->lastNames = $lastNames;
-		}
-	}
-
-
-	private function getRandomFirstName($nameArray) {
-		return $nameArray[mt_rand(0, count($nameArray)-1)];
-	}
-
-
-	/**
-	 * Called during installation. This creates and populates the first_names and last_names DB tables.
-	 *
-	 * @return array [0] success / error (boolean)
-	 *               [1] the error message, if there was an error
-	 */
-	public static function install() {
-		$prefix = Core::getDbTablePrefix();
-
-		// always clear out the previous tables, just in case
-		$rollbackQueries = array();
-		$rollbackQueries[] = "DROP TABLE {$prefix}first_names";
-		$rollbackQueries[] = "DROP TABLE {$prefix}last_names";
-		Core::$db->query($rollbackQueries);
-
-		$queries = array();
-		$queries[] = "
-			CREATE TABLE {$prefix}first_names (
-				id mediumint(9) NOT NULL auto_increment,
-				first_name varchar(50) NOT NULL default '',
-				gender enum('male','female','both') NOT NULL default 'male',
-				PRIMARY KEY (id)
-			)
-		";
-		$queries[] = "
-			INSERT INTO {$prefix}first_names (first_name, gender)
-			VALUES ('Aaron','male'),('Abbot','male'),('Abdul','male'),('Abel','male'),('Abigail','female'),('Abra','female'),('Abraham','male'),('Acton','male'),('Adam','male'),('Adara','female'),('Addison','male'),('Adele','female'),('Adena','female'),('Adria','female'),('Adrian','male'),('Adrienne','female'),('Ahmed','male'),('Aidan','male'),('Aiko','female'),('Aileen','female'),('Aimee','female'),('Ainsley','female'),('Akeem','male'),('Aladdin','male'),('Alan','male'),('Alana','female'),('Alden','male'),('Alea','female'),('Alec','male'),('Alexa','female'),('Alexander','male'),('Alexandra','female'),('Alexis','female'),('Alfonso','male'),('Alfreda','female'),('Ali','male'),('Alice','female'),('Alika','female'),('Aline','female'),('Alisa','female'),('Allegra','female'),('Allen','male'),('Allistair','male'),('Alma','female'),('Althea','female'),('Alvin','male'),('Alyssa','female'),('Amal','male'),('Amanda','female'),('Amaya','female'),('Amber','female'),('Amela','female'),('Amelia','female'),('Amena','female'),('Amery','male'),('Amethyst','female'),('Amir','male'),('Amity','female'),('Amos','male'),('Amy','female'),('Anastasia','female'),('Andrew','male'),	('Angela','female'),('Angelica','female'),('Anika','female'),('Anjolie','female'),('Ann','female'),('Anne','female'),('Anthony','male'),('Aphrodite','female'),('April','female'),('Aquila','male'),('Arden','male'),('Aretha','female'),('Ariana','female'),('Ariel','female'),('Aristotle','male'),('Armand','male'),('Armando','male'),('Arsenio','male'),('Arthur','male'),('Ashely','female'),('Asher','male'),('Ashton','male'),('Aspen','female'),('Astra','female'),('Athena','female'),('Aubrey','both'),('Audra','female'),('Audrey','female'),('August','male'),('Aurelia','female'),('Aurora','female'),('Austin','male'),('Autumn','female'),('Ava','female'),('Avram','male'),('Avye','female'),('Axel','male'),('Ayanna','female'),('Azalia','female'),('Baker','male'),('Barbara','female'),('Barclay','male'),('Barrett','male'),('Barry','male'),('Basia','female'),('Basil','male'),('Baxter','male'),('Beatrice','female'),('Beau','male'),('Beck','male'),('Bell','female'),('Belle','female'),('Benedict','male'),('Benjamin','male'),('Berk','male'),('Bernard','male'),('Bert','male'),('Bertha','female'),('Bethany','female'),('Beverly','female'),('Bevis','male'),('Bianca','female'),('Blaine','both'),('Blair','both'),('Blake','male'),('Blaze','male'),('Blossom','female'),('Blythe','female'),('Bo','female'),('Boris','male'),('Bradley','male'),('Brady','male'),('Branden','male'),('Brandon','male'),('Breanna','female'),('Bree','female'),('Brenda','female'),('Brendan','male'),('Brenden','male'),('Brenna','female'),('Brennan','male'),('Brent','male'),('Brett','male'),('Brian','male'),('Brianna','female'),('Briar','female'),('Brielle','female'),('Britanney','female'),('Britanni','female'),('Brittany','female'),('Brock','male'),('Brody','male'),('Brooke','female'),('Bruce','male'),('Bruno','male'),('Bryar','female'),('Brynn','female'),('Brynne','female'),('Buckminster','male'),('Buffy','female'),('Burke','male'),('Burton','male'),('Byron','male'),('Cade','male'),('Cadman','male'),('Caesar','male'),('Cailin','female'),('Cain','male'),('Cairo','male'),('Caldwell','male'),('Caleb','male'),('Calista','female'),('Callie','female'),('Callum','male'),('Cally','female'),('Calvin','male'),('Camden','male'),('Cameran','female'),('Cameron','female'),('Cameron','male'),('Camilla','female'),('Camille','female'),('Candace','female'),('Candice','female'),('Cara','female'),('Carissa','female'),('Carl','male'),('Carla','female'),('Carlos','male'),('Carly','female'),('Carol','female'),('Carolyn','female'),('Carson','male'),('Carter','male'),('Caryn','female'),('Casey','both'),('Cassady','female'),('Cassandra','female'),('Cassidy','female'),('Castor','male'),('Catherine','female'),('Cathleen','female'),('Cecilia','female'),('Cedric','male'),('Celeste','female'),('Chadwick','male'),('Chaim','male'),('Chancellor','male'),('Chanda','female'),('Chandler','male'),('Chaney','male'),('Channing','male'),('Chantale','female'),('Charde','female'),('Charissa','female'),('Charity','female'),('Charles','male'),('Charlotte','female'),('Chase','male'),('Chastity','female'),('Chava','female'),('Chelsea','female'),('Cherokee','female'),('Cheryl','female'),('Chester','male'),('Cheyenne','female'),('Chiquita','female'),('Chloe','female'),('Christen','female'),('Christian','male'),('Christine','female'),('Christopher','male'),('Ciara','female'),('Ciaran','male'),('Claire','female'),('Clare','female'),('Clark','male'),('Clarke','male'),('Claudia','female'),('Clayton','male'),('Clementine','female'),('Cleo','female'),('Clinton','male'),('Clio','female'),('Coby','male'),('Cody','male'),('Colby','male'),('Cole','male'),('Colette','female'),('Colin','male'),('Colleen','female'),('Colorado','male'),('Colt','male'),('Colton','male'),('Conan','male'),('Connor','male'),('Constance','female'),('Cooper','male'),('Cora','female'),('Courtney','female'),('Craig','male'),('Cruz','male'),('Cullen','male'),('Curran','male'),('Cynthia','female'),('Cyrus','male'),('Dacey','female'),('Dahlia','female'),('Dai','female'),('Dakota','both'),('Dale','male'),('Dalton','male'),('Damian','male'),('Damon','male'),('Dana','female'),('Dane','male'),('Daniel','male'),('Danielle','female'),('Dante','male'),('Daphne','female'),('Daquan','male'),('Dara','female'),('Daria','female'),('Darius','male'),('Darrel','female'),('Darryl','female'),('Daryl','female'),('David','male'),('Davis','male'),('Dawn','female'),('Deacon','male'),('Dean','male'),('Deanna','female'),('Deborah','female'),('Debra','female'),('Declan','male'),('Deirdre','female'),('Delilah','female'),('Demetria','female'),('Demetrius','male'),('Denise','female'),('Dennis','male'),('Denton','male'),('Derek','male'),('Desirae','female'),('Desiree','female'),('Destiny','female'),('Devin','male'),('Dexter','male'),('Diana','female'),('Dieter','male'),('Dillon','male'),('Dolan','male'),('Dominic','male'),('Dominique','female'),('Donna','female'),('Donovan','male'),('Dora','female'),('Dorian','male'),('Doris','female'),('Dorothy','female'),('Drake','male'),('Drew','male'),('Driscoll','male'),('Duncan','male'),('Dustin','male'),('Dylan','male'),('Eagan','male'),('Eaton','male'),('Ebony','female'),('Echo','female'),('Edan','male'),('Eden','both'),('Edward','male'),('Elaine','female'),('Eleanor','female'),('Eliana','female'),('Elijah','male'),('Elizabeth','female'),('Ella','female'),('Elliott','male'),('Elmo','male'),('Elton','male'),('Elvis','male'),('Emerald','female'),('Emerson','male'),('Emery','male'),('Emi','female'),('Emily','female'),('Emma','female'),('Emmanuel','male'),('Erasmus','male'),('Eric','male'),('Erica','female'),('Erich','male'),('Erin','female'),('Ethan','male'),('Eugenia','female'),('Evan','male'),('Evangeline','female'),('Eve','female'),('Evelyn','female'),('Ezekiel','male'),('Ezra','male'),('Faith','female'),('Fallon','female'),('Farrah','female'),('Fatima','female'),('Fay','female'),('Felicia','female'),('Felix','male'),('Ferdinand','male'),('Ferris','male'),('Finn','male'),('Fiona','female'),('Fitzgerald','male'),('Flavia','female'),('Fletcher','male'),('Fleur','female'),('Florence','female'),('Flynn','male'),('Forrest','male'),('Frances','female'),('Francesca','female'),('Francis','male'),('Fredericka','female'),('Freya','female'),('Fritz','male'),('Fuller','male'),('Fulton','male'),('Gabriel','male'),('Gage','male'),('Gail','female'),('Galena','female'),('Galvin','male'),('Gannon','male'),('Gareth','male'),('Garrett','male'),('Garrison','male'),('Garth','male'),('Gary','male'),('Gavin','male'),('Gay','female'),('Gemma','female'),('Genevieve','female'),('Geoffrey','male'),('George','male'),('Georgia','female'),('Geraldine','female'),('Germaine','female'),('Germane','female'),('Giacomo','male'),('Gil','male'),('Gillian','female'),('Ginger','female'),('Gisela','female'),('Giselle','female'),('Glenna','female'),('Gloria','female'),('Grace','female'),('Grady','male'),('Graham','male'),('Graiden','male'),('Grant','male'),('Gray','male'),('Gregory','male'),('Gretchen','female'),('Griffin','male'),('Griffith','male'),('Guinevere','female'),('Guy','male'),('Gwendolyn','female'),('Hadassah','female'),('Hadley','female'),('Hakeem','male'),('Halee','female'),('Haley','female'),('Hall','male'),('Halla','female'),('Hamilton','male'),('Hamish','male'),('Hammett','male'),('Hanae','female'),('Hanna','female'),('Hannah','female'),('Harding','male'),('Harlan','male'),('Harper','male'),('Harriet','female'),('Harrison','male'),('Hasad','male'),('Hashim','male'),('Haviva','female'),('Hayden','male'),('Hayes','male'),('Hayfa','female'),('Hayley','female'),('Heather','female'),('Hector','male'),('Hedda','female'),('Hedley','male'),('Hedwig','female'),('Hedy','female'),('Heidi','female'),('Helen','female'),('Henry','male'),('Herman','male'),('Hermione','female'),('Herrod','male'),('Hilary','female'),('Hilda','female'),('Hilel','male'),('Hillary','female'),('Hiram','male'),('Hiroko','female'),('Hollee','female'),('Holly','female'),('Holmes','male'),('Honorato','male'),('Hop','male'),('Hope','female'),('Howard','male'),('Hoyt','male'),('Hu','male'),('Hunter','male'),('Hyacinth','female'),('Hyatt','male'),('Ian','male'),('Idola','female'),('Idona','female'),('Ifeoma','female'),('Ignacia','female'),('Ignatius','male'),('Igor','male'),('Ila','female'),('Iliana','female'),('Illana','female'),('Illiana','female'),('Ima','female'),('Imani','female'),('Imelda','female'),('Imogene','female'),('Ina','female'),('India','female'),('Indigo','female'),('Indira','female'),('Inez','female'),('Inga','female'),('Ingrid','female'),('Iola','female'),('Iona','female'),('Ira','male'),('Irene','female'),('Iris','female'),('Irma','female'),('Isaac','male'),('Isabella','female'),('Isabelle','female'),('Isadora','female'),('Isaiah','male'),('Ishmael','male'),('Ivan','male'),('Ivana','female'),('Ivor','male'),('Ivory','female'),('Ivy','female'),('Jack','male'),('Jackson','male'),('Jacob','male'),('Jada','female'),('Jade','female'),('Jaden','female'),('Jael','female'),('Jaime','female'),('Jakeem','male'),('Jamal','male'),('Jamalia','female'),('James','male'),('Jameson','male'),('Jana','female'),('Jane','female'),('Janna','female'),('Jaquelyn','female'),('Jared','male'),('Jarrod','male'),('Jasmine','female'),('Jason','male'),('Jasper','male'),('Jayme','female'),('Jeanette','female'),('Jelani','male'),('Jemima','female'),('Jena','female'),('Jenette','female'),('Jenna','female'),('Jennifer','female'),('Jeremy','male'),('Jermaine','male'),('Jerome','male'),('Jerry','male'),('Jescie','female'),('Jessamine','female'),('Jesse','male'),('Jessica','female'),('Jillian','female'),('Jin','male'),('Joan','female'),('Jocelyn','female'),('Joel','male'),('Joelle','female'),('John','male'),('Jolene','female'),('Jolie','female'),('Jonah','male'),('Jonas','male'),('Jordan','female'),('Jordan','male'),('Jorden','female'),('Joseph','male'),('Josephine','female'),('Joshua','male'),('Josiah','male'),('Joy','female'),('Judah','male'),('Judith','female'),('Julian','male'),('Julie','female'),('Juliet','female'),('Justin','male'),('Justina','female'),('Justine','female'),('Kadeem','male'),('Kaden','both'),('Kai','female'),('Kaitlin','female'),('Kalia','female'),('Kamal','male'),('Kameko','female'),('Kane','male'),('Kareem','male'),('Karen','female'),('Karina','female'),('Karleigh','female'),('Karly','female'),('Karyn','female'),('Kaseem','male'),('Kasimir','male'),('Kasper','male'),('Katell','female'),('Katelyn','female'),('Kathleen','female'),('Kato','male'),('Kay','female'),('Kaye','female'),('Keane','male'),('Keaton','male'),('Keefe','male'),('Keegan','male'),('Keelie','female'),('Keely','female'),('Keiko','female'),('Keith','male'),('Kellie','female'),('Kelly','female'),('Kelly','male'),('Kelsey','female'),('Kelsie','female'),('Kendall','both'),('Kennan','male'),('Kennedy','male'),('Kenneth','male'),('Kenyon','male'),('Kermit','male'),('Kerry','female'),('Kessie','female'),('Kevin','male'),('Kevyn','female'),('Kiara','female'),('Kiayada','female'),('Kibo','male'),('Kieran','male'),('Kim','female'),('Kimberley','female'),('Kimberly','female'),('Kiona','female'),('Kirby','female'),('Kirestin','female'),('Kirk','male'),('Kirsten','female'),('Kitra','female'),('Knox','male'),('Kristen','female'),('Kuame','male'),('Kyla','female'),('Kylan','female'),('Kyle','male'),('Kylee','female'),('Kylie','female'),('Kylynn','female'),('Kyra','female'),('Lacey','female'),('Lacota','female'),('Lacy','female'),('Lael','female'),('Laith','male'),('Lamar','male'),('Lana','female'),('Lance','male'),('Lane','male'),('Lani','female'),('Lara','female'),('Lareina','female'),('Larissa','female'),('Lars','male'),('Latifah','female'),('Laura','female'),('Laurel','female'),('Lavinia','female'),('Lawrence','male'),('Leah','female'),('Leandra','female'),('Lee','female'),('Lee','male'),('Leigh','female'),('Leila','female'),('Leilani','female'),('Len','male'),('Lenore','female'),('Leo','male'),('Leonard','male'),('Leroy','male'),('Lesley','female'),('Leslie','female'),('Lester','male'),('Lev','male'),('Levi','male'),('Lewis','male'),('Libby','female'),('Liberty','female'),('Lila','female'),('Lilah','female'),('Lillian','female'),('Lillith','female'),('Linda','female'),('Linus','male'),('Lionel','male'),('Lisandra','female'),('Logan','male'),('Lois','female'),('Louis','male'),('Lucas','male'),('Lucian','male'),('Lucius','male'),('Lucy','female'),('Luke','male'),('Lunea','female'),('Lydia','female'),('Lyle','male'),('Lynn','female'),('Lysandra','female'),('MacKensie','female'),('MacKenzie','female'),('Macaulay','male'),('Macey','female'),('Macon','male'),('Macy','female'),('Madaline','female'),('Madeline','female'),('Madeson','female'),('Madison','female'),('Madonna','female'),('Magee','male'),('Maggie','female'),('Maggy','female'),('Maia','female'),('Maile','female'),('Maisie','female'),('Maite','female'),('Malachi','male'),('Malcolm','male'),('Malik','male'),('Mallory','female'),('Mannix','male'),('Mara','female'),('Marah','female'),('Marcia','female'),('Margaret','female'),('Mari','female'),('Mariam','female'),('Mariko','female'),('Maris','female'),('Mark','male'),('Marny','female'),('Marsden','male'),('Marshall','male'),('Martena','female'),('Martha','female'),('Martin','male'),('Martina','female'),('Marvin','male'),('Mary','female'),('Maryam','female'),('Mason','male'),('Matthew','male'),('Maxine','female'),('Maxwell','male'),('May','female'),('Maya','female'),('McKenzie','female'),('Mechelle','female'),('Medge','female'),('Megan','female'),('Meghan','female'),('Melanie','female'),('Melinda','female'),('Melissa','female'),('Melodie','female'),('Melvin','male'),('Melyssa','female'),('Mercedes','female'),('Meredith','female'),('Merrill','male'),('Merritt','male'),('Mia','female'),('Micah','male'),('Michael','male'),('Michelle','female'),('Mikayla','female'),('Minerva','female'),('Mira','female'),('Miranda','female'),('Miriam','female'),('Moana','female'),('Mohammad','male'),('Mollie','female'),('Molly','female'),('Mona','female'),('Montana','female'),('Morgan','female'),('Moses','male'),('Mufutau','male'),('Murphy','male'),('Myles','male'),('Myra','female'),('Nadine','female'),('Naida','female'),('Naomi','female'),('Nash','male'),('Nasim','male'),('Natalie','female'),('Nathan','male'),('Nathaniel','male'),('Nayda','female'),('Nehru','male'),('Neil','male'),('Nell','female'),('Nelle','female'),('Nerea','female'),('Nero','male'),('Nevada','female'),('Neve','female'),('Neville','male'),('Nicholas','male'),('Nichole','female'),('Nicole','female'),('Nigel','male'),('Nina','female'),('Nissim','male'),('Nita','female'),('Noah','male'),('Noble','male'),('Noel','female'),('Noelani','female'),('Noelle','female'),('Nola','female'),('Nolan','male'),('Nomlanga','female'),('Nora','female'),('Norman','male'),('Nyssa','female'),('Ocean','female'),('Octavia','female'),('Octavius','male'),('Odessa','female'),('Odette','female'),('Odysseus','male'),('Oleg','male'),('Olga','female'),('Oliver','male'),('Olivia','female'),('Olympia','female'),('Omar','male'),('Oprah','female'),('Ora','female'),('Oren','male'),('Ori','female'),('Orla','female'),('Orlando','male'),('Orli','female'),('Orson','male'),('Oscar','male'),('Otto','male'),('Owen','male'),('Paki','male'),('Palmer','male'),('Paloma','female'),('Pamela','female'),('Pandora','female'),('Pascale','female'),('Patience','female'),('Patricia','female'),('Patrick','male'),('Paul','male'),('Paula','female'),('Pearl','female'),('Penelope','female'),('Perry','male'),('Peter','male'),('Petra','female'),('Phelan','male'),('Philip','male'),('Phillip','male'),('Phoebe','female'),('Phyllis','female'),('Piper','female'),('Plato','male'),('Porter','male'),('Portia','female'),('Prescott','male'),('Preston','male'),('Price','male'),('Priscilla','female'),('Quail','female'),('Quamar','male'),('Quemby','female'),('Quentin','male'),('Quin','female'),('Quincy','both'),('Quinlan','male'),('Quinn','female'),('Quinn','male'),('Quintessa','female'),('Quon','female'),('Quyn','female'),('Quynn','female'),('Rachel','female'),('Rae','female'),('Rafael','male'),('Rahim','male'),('Raja','male'),('Rajah','male'),('Ralph','male'),('Rama','female'),('Ramona','female'),('Rana','female'),('Randall','male'),('Raphael','male'),('Rashad','male'),('Raven','female'),('Ray','male'),('Raya','female'),('Raymond','male'),('Reagan','female'),('Rebecca','female'),('Rebekah','female'),('Reece','male'),('Reed','male'),('Reese','male'),('Regan','female'),('Regina','female'),('Remedios','female'),('Renee','female'),('Reuben','male'),('Rhea','female'),('Rhiannon','female'),('Rhoda','female'),('Rhona','female'),('Rhonda','female'),('Ria','female'),('Richard','male'),('Rigel','male'),('Riley','female'),('Rina','female'),('Rinah','female'),('Risa','female'),('Roanna','female'),('Roary','female'),('Robert','male'),('Robin','female'),('Rogan','male'),('Ronan','male'),('Rooney','male'),('Rosalyn','female'),('Rose','female'),('Ross','male'),('Roth','male'),('Rowan','female'),('Ruby','female'),('Rudyard','male'),('Russell','male'),('Ruth','female'),('Ryan','male'),('Ryder','male'),('Rylee','female'),('Sacha','female'),('Sade','female'),('Sage','female'),('Salvador','male'),('Samantha','female'),('Samson','male'),('Samuel','male'),('Sandra','female'),('Sara','female'),('Sarah','female'),('Sasha','female'),('Savannah','female'),('Sawyer','male'),('Scarlet','female'),('Scarlett','female'),('Scott','male'),('Sean','male'),('Sebastian','male'),('Selma','female'),('September','female'),('Serena','female'),('Serina','female'),('Seth','male'),('Shad','male'),('Shaeleigh','female'),('Shafira','female'),('Shaine','female'),('Shana','female'),('Shannon','female'),('Sharon','female'),('Shay','female'),('Shea','female'),('Sheila','female'),('Shelby','female'),('Shelley','female'),('Shellie','female'),('Shelly','female'),('Shoshana','female'),('Sierra','female'),('Signe','female'),('Sigourney','female'),('Silas','male'),('Simon','male'),('Simone','female'),('Skyler','female'),('Slade','male'),('Sloane','both'),('Solomon','male'),('Sonia','female'),('Sonya','female'),('Sophia','female'),('Sopoline','female'),('Stacey','female'),('Stacy','female'),('Steel','male'),('Stella','female'),('Stephanie','female'),('Stephen','male'),('Steven','male'),('Stewart','male'),('Stone','male'),('Stuart','male'),('Suki','female'),('Summer','female'),('Susan','female'),('Sybil','female'),('Sybill','female'),('Sydnee','female'),('Sydney','female'),('Sylvester','male'),('Sylvia','female'),('TaShya','female'),('Tad','male'),('Tallulah','female'),('Talon','male'),('Tamara','female'),('Tamekah','female'),('Tana','female'),('Tanek','male'),('Tanisha','female'),('Tanner','male'),('Tanya','female'),('Tara','female'),('Tarik','male'),('Tasha','female'),('Tashya','female'),('Tate','male'),('Tatiana','female'),('Tatum','female'),('Tatyana','female'),('Taylor','both'),('Teagan','female'),('Teegan','female'),('Thaddeus','male'),('Thane','male'),('Theodore','male'),('Thomas','male'),('Thor','male'),('Tiger','male'),('Timon','male'),('Timothy','male'),('Tobias','male'),('Todd','male'),('Travis','male'),('Trevor','male'),('Troy','male'),('Tucker','male'),('Tyler','male'),('Tyrone','male'),('Ulla','female'),('Ulric','male'),('Ulysses','male'),('Uma','female'),('Unity','female'),('Upton','male'),('Uriah','male'),('Uriel','male'),('Urielle','female'),('Ursa','female'),('Ursula','female'),('Uta','female'),('Valentine','male'),('Vance','male'),('Vanna','female'),('Vaughan','male'),('Veda','female'),('Velma','female'),('Venus','female'),('Vera','female'),('Vernon','male'),('Veronica','female'),('Victor','male'),('Victoria','female'),('Vielka','female'),('Vincent','male'),('Violet','female'),('Virginia','female'),('Vivian','female'),('Vivien','female'),('Vladimir','male'),('Wade','male'),('Walker','male'),('Wallace','male'),('Walter','male'),('Wanda','female'),('Wang','male'),('Warren','male'),('Wayne','male'),('Wendy','female'),('Wesley','male'),('Whilemina','female'),('Whitney','female'),('Whoopi','female'),('Willa','female'),('William','male'),('Willow','female'),('Wilma','female'),('Wing','male'),('Winifred','female'),('Winter','female'),('Wyatt','male'),('Wylie','male'),('Wynne','female'),('Wynter','female'),('Wyoming','female'),('Xander','male'),('Xandra','female'),('Xantha','female'),('Xanthus','male'),('Xavier','male'),('Xaviera','female'),('Xena','female'),('Xenos','male'),('Xerxes','both'),('Xyla','female'),('Yael','female'),('Yardley','male'),('Yasir','male'),('Yen','female'),('Yeo','female'),('Yetta','female'),('Yoko','female'),('Yolanda','female'),('Yoshi','female'),('Yoshio','male'),('Yuli','male'),('Yuri','female'),('Yvette','female'),('Yvonne','female'),('Zachary','male'),('Zachery','male'),('Zahir','male'),('Zane','male'),('Zelda','female'),('Zelenia','female'),('Zena','female'),('Zenaida','female'),('Zenia','female'),('Zeph','male'),('Zephania','male'),('Zephr','female'),('Zeus','male'),('Zia','female'),('Zoe','female'),('Zorita','female'),('Jacqueline','female')
-		";
-		$queries[] = "
-			CREATE TABLE {$prefix}last_names (
-				id mediumint(9) NOT NULL auto_increment,
-				last_name varchar(100) NOT NULL default '',
-				PRIMARY KEY (id)
-			)
-		";
-		$queries[] = "
-			INSERT INTO {$prefix}last_names (last_name)
-			VALUES ('Abbott'),('Acevedo'),('Acosta'),('Adams'),('Adkins'),('Aguilar'),('Aguirre'),('Albert'),('Alexander'),('Alford'),('Allen'),('Allison'),('Alston'),('Alvarado'),('Alvarez'),('Anderson'),('Andrews'),('Anthony'),('Armstrong'),('Arnold'),('Ashley'),('Atkins'),('Atkinson'),('Austin'),('Avery'),('Avila'),('Ayala'),('Ayers'),('Bailey'),('Baird'),('Baker'),('Baldwin'),('Ball'),('Ballard'),('Banks'),('Barber'),('Barker'),('Barlow'),('Barnes'),('Barnett'),('Barr'),('Barrera'),('Barrett'),('Barron'),('Barry'),('Bartlett'),('Barton'),('Bass'),('Bates'),('Battle'),('Bauer'),('Baxter'),('Beach'),('Bean'),('Beard'),('Beasley'),('Beck'),('Becker'),('Bell'),('Bender'),('Benjamin'),('Bennett'),('Benson'),('Bentley'),('Benton'),('Berg'),('Berger'),('Bernard'),('Berry'),('Best'),('Bird'),('Bishop'),('Black'),('Blackburn'),('Blackwell'),('Blair'),('Blake'),('Blanchard'),('Blankenship'),('Blevins'),('Bolton'),('Bond'),('Bonner'),('Booker'),('Boone'),('Booth'),('Bowen'),('Bowers'),('Bowman'),('Boyd'),('Boyer'),('Boyle'),('Bradford'),('Bradley'),('Bradshaw'),('Brady'),('Branch'),('Bray'),('Brennan'),('Brewer'),('Bridges'),('Briggs'),('Bright'),('Britt'),('Brock'),('Brooks'),('Brown'),('Browning'),('Bruce'),('Bryan'),('Bryant'),('Buchanan'),('Buck'),('Buckley'),('Buckner'),('Bullock'),('Burch'),('Burgess'),('Burke'),('Burks'),('Burnett'),('Burns'),('Burris'),('Burt'),('Burton'),('Bush'),('Butler'),('Byers'),('Byrd'),('Cabrera'),('Cain'),('Calderon'),('Caldwell'),('Calhoun'),('Callahan'),('Camacho'),('Cameron'),('Campbell'),('Campos'),('Cannon'),('Cantrell'),('Cantu'),('Cardenas'),('Carey'),('Carlson'),('Carney'),('Carpenter'),('Carr'),('Carrillo'),('Carroll'),('Carson'),('Carter'),('Carver'),('Case'),('Casey'),('Cash'),('Castaneda'),('Castillo'),('Castro'),('Cervantes'),('Chambers'),('Chan'),('Chandler'),('Chaney'),('Chang'),('Chapman'),('Charles'),('Chase'),('Chavez'),('Chen'),('Cherry'),('Christensen'),('Christian'),('Church'),('Clark'),('Clarke'),('Clay'),('Clayton'),('Clements'),('Clemons'),('Cleveland'),('Cline'),('Cobb'),('Cochran'),('Coffey'),('Cohen'),('Cole'),('Coleman'),('Collier'),('Collins'),('Colon'),('Combs'),('Compton'),('Conley'),('Conner'),('Conrad'),('Contreras'),('Conway'),('Cook'),('Cooke'),('Cooley'),('Cooper'),('Copeland'),('Cortez'),('Cote'),('Cotton'),('Cox'),('Craft'),('Craig'),('Crane'),('Crawford'),('Crosby'),('Cross'),('Cruz'),('Cummings'),('Cunningham'),('Curry'),('Curtis'),('Dale'),('Dalton'),('Daniel'),('Daniels'),('Daugherty'),('Davenport'),('David'),('Davidson'),('Davis'),('Dawson'),('Day'),('Dean'),('Decker'),('Dejesus'),('Delacruz'),('Delaney'),('Deleon'),('Delgado'),('Dennis'),('Diaz'),('Dickerson'),('Dickson'),('Dillard'),('Dillon'),('Dixon'),('Dodson'),('Dominguez'),('Donaldson'),('Donovan'),('Dorsey'),('Dotson'),('Douglas'),('Downs'),('Doyle'),('Drake'),('Dudley'),('Duffy'),('Duke'),('Duncan'),('Dunlap'),('Dunn'),('Duran'),('Durham'),('Dyer'),('Eaton'),('Edwards'),('Elliott'),('Ellis'),('Ellison'),('Emerson'),('England'),('English'),('Erickson'),('Espinoza'),('Estes'),('Estrada'),('Evans'),('Everett'),('Ewing'),('Farley'),('Farmer'),('Farrell'),('Faulkner'),('Ferguson'),('Fernandez'),('Ferrell'),('Fields'),('Figueroa'),('Finch'),('Finley'),('Fischer'),('Fisher'),('Fitzgerald'),('Fitzpatrick'),('Fleming'),('Fletcher'),('Flores'),('Flowers'),('Floyd'),('Flynn'),('Foley'),('Forbes'),('Ford'),('Foreman'),('Foster'),('Fowler'),('Fox'),('Francis'),('Franco'),('Frank'),('Franklin'),('Franks'),('Frazier'),('Frederick'),('Freeman'),('French'),('Frost'),('Fry'),('Frye'),('Fuentes'),('Fuller'),('Fulton'),('Gaines'),('Gallagher'),('Gallegos'),('Galloway'),('Gamble'),('Garcia'),('Gardner'),('Garner'),('Garrett'),('Garrison'),('Garza'),('Gates'),('Gay'),('Gentry'),('George'),('Gibbs'),('Gibson'),('Gilbert'),('Giles'),('Gill'),('Gillespie'),('Gilliam'),('Gilmore'),('Glass'),('Glenn'),('Glover'),('Goff'),('Golden'),('Gomez'),('Gonzales'),('Gonzalez'),('Good'),('Goodman'),('Goodwin'),('Gordon'),('Gould'),('Graham'),('Grant'),('Graves'),('Gray'),('Green'),('Greene'),('Greer'),('Gregory'),('Griffin'),('Griffith'),('Grimes'),('Gross'),('Guerra'),('Guerrero'),('Guthrie'),('Gutierrez'),('Guy'),('Guzman'),('Hahn'),('Hale'),('Haley'),('Hall'),('Hamilton'),('Hammond'),('Hampton'),('Hancock'),('Haney'),('Hansen'),('Hanson'),('Hardin'),('Harding'),('Hardy'),('Harmon'),('Harper'),('Harrell'),('Harrington'),('Harris'),('Harrison'),('Hart'),('Hartman'),('Harvey'),('Hatfield'),('Hawkins'),('Hayden'),('Hayes'),('Haynes'),('Hays'),('Head'),('Heath'),('Hebert'),('Henderson'),('Hendricks'),('Hendrix'),('Henry'),('Hensley'),('Henson'),('Herman'),('Hernandez'),('Herrera'),('Herring'),('Hess'),('Hester'),('Hewitt'),('Hickman'),('Hicks'),('Higgins'),('Hill'),('Hines'),('Hinton'),('Hobbs'),('Hodge'),('Hodges'),('Hoffman'),('Hogan'),('Holcomb'),('Holden'),('Holder'),('Holland'),('Holloway'),('Holman'),('Holmes'),('Holt'),('Hood'),('Hooper'),('Hoover'),('Hopkins'),('Hopper'),('Horn'),('Horne'),('Horton'),('House'),('Houston'),('Howard'),('Howe'),('Howell'),('Hubbard'),('Huber'),('Hudson'),('Huff'),('Huffman'),('Hughes'),('Hull'),('Humphrey'),('Hunt'),('Hunter'),('Hurley'),('Hurst'),('Hutchinson'),('Hyde'),('Ingram'),('Irwin'),('Jackson'),('Jacobs'),('Jacobson'),('James'),('Jarvis'),('Jefferson'),('Jenkins'),('Jennings'),('Jensen'),('Jimenez'),('Johns'),('Johnson'),('Johnston'),('Jones'),('Jordan'),('Joseph'),('Joyce'),('Joyner'),('Juarez'),('Justice'),('Kane'),('Kaufman'),('Keith'),('Keller'),('Kelley'),('Kelly'),('Kemp'),('Kennedy'),('Kent'),('Kerr'),('Key'),('Kidd'),('Kim'),('King'),('Kinney'),('Kirby'),('Kirk'),('Kirkland'),('Klein'),('Kline'),('Knapp'),('Knight'),('Knowles'),('Knox'),('Koch'),('Kramer'),('Lamb'),('Lambert'),('Lancaster'),('Landry'),('Lane'),('Lang'),('Langley'),('Lara'),('Larsen'),('Larson'),('Lawrence'),('Lawson'),('Le'),('Leach'),('Leblanc'),('Lee'),('Leon'),('Leonard'),('Lester'),('Levine'),('Levy'),('Lewis'),('Lindsay'),('Lindsey'),('Little'),('Livingston'),('Lloyd'),('Logan'),('Long'),('Lopez'),('Lott'),('Love'),('Lowe'),('Lowery'),('Lucas'),('Luna'),('Lynch'),('Lynn'),('Lyons'),('Macdonald'),('Macias'),('Mack'),('Madden'),('Maddox'),('Maldonado'),('Malone'),('Mann'),('Manning'),('Marks'),('Marquez'),('Marsh'),('Marshall'),('Martin'),('Martinez'),('Mason'),('Massey'),('Mathews'),('Mathis'),('Matthews'),('Maxwell'),('May'),('Mayer'),('Maynard'),('Mayo'),('Mays'),('Mcbride'),('Mccall'),('Mccarthy'),('Mccarty'),('Mcclain'),('Mcclure'),('Mcconnell'),('Mccormick'),('Mccoy'),('Mccray'),('Mccullough'),('Mcdaniel'),('Mcdonald'),('Mcdowell'),('Mcfadden'),('Mcfarland'),('Mcgee'),('Mcgowan'),('Mcguire'),('Mcintosh'),('Mcintyre'),('Mckay'),('Mckee'),('Mckenzie'),('Mckinney'),('Mcknight'),('Mclaughlin'),('Mclean'),('Mcleod'),('Mcmahon'),('Mcmillan'),('Mcneil'),('Mcpherson'),('Meadows'),('Medina'),('Mejia'),('Melendez'),('Melton'),('Mendez'),('Mendoza'),('Mercado'),('Mercer'),('Merrill'),('Merritt'),('Meyer'),('Meyers'),('Michael'),('Middleton'),('Miles'),('Miller'),('Mills'),('Miranda'),('Mitchell'),('Molina'),('Monroe'),('Montgomery'),('Montoya'),('Moody'),('Moon'),('Mooney'),('Moore'),('Morales'),('Moran'),('Moreno'),('Morgan'),('Morin'),('Morris'),('Morrison'),('Morrow'),('Morse'),('Morton'),('Moses'),('Mosley'),('Moss'),('Mueller'),('Mullen'),('Mullins'),('Munoz'),('Murphy'),('Murray'),('Myers'),('Nash'),('Navarro'),('Neal'),('Nelson'),('Newman'),('Newton'),('Nguyen'),('Nichols'),('Nicholson'),('Nielsen'),('Nieves'),('Nixon'),('Noble'),('Noel'),('Nolan'),('Norman'),('Norris'),('Norton'),('Nunez'),('Obrien'),('Ochoa'),('Oconnor'),('Odom'),('Odonnell'),('Oliver'),('Olsen'),('Olson'),('Oneal'),('Oneil'),('Oneill'),('Orr'),('Ortega'),('Ortiz'),('Osborn'),('Osborne'),('Owen'),('Owens'),('Pace'),('Pacheco'),('Padilla'),('Page'),('Palmer'),('Park'),('Parker'),('Parks'),('Parrish'),('Parsons'),('Pate'),('Patel'),('Patrick'),('Patterson'),('Patton'),('Paul'),('Payne'),('Pearson'),('Peck'),('Pena'),('Pennington'),('Perez'),('Perkins'),('Perry'),('Peters'),('Petersen'),('Peterson'),('Petty'),('Phelps'),('Phillips'),('Pickett'),('Pierce'),('Pittman'),('Pitts'),('Pollard'),('Poole'),('Pope'),('Porter'),('Potter'),('Potts'),('Powell'),('Powers'),('Pratt'),('Preston'),('Price'),('Prince'),('Pruitt'),('Puckett'),('Pugh'),('Quinn'),('Ramirez'),('Ramos'),('Ramsey'),('Randall'),('Randolph'),('Rasmussen'),('Ratliff'),('Ray'),('Raymond'),('Reed'),('Reese'),('Reeves'),('Reid'),('Reilly'),('Reyes'),('Reynolds'),('Rhodes'),('Rice'),('Rich'),('Richard'),('Richards'),('Richardson'),('Richmond'),('Riddle'),('Riggs'),('Riley'),('Rios'),('Rivas'),('Rivera'),('Rivers'),('Roach'),('Robbins'),('Roberson'),('Roberts'),('Robertson'),('Robinson'),('Robles'),('Rocha'),('Rodgers'),('Rodriguez'),('Rodriquez'),('Rogers'),('Rojas'),('Rollins'),('Roman'),('Romero'),('Rosa'),('Rosales'),('Rosario'),('Rose'),('Ross'),('Roth'),('Rowe'),('Rowland'),('Roy'),('Ruiz'),('Rush'),('Russell'),('Russo'),('Rutledge'),('Ryan'),('Salas'),('Salazar'),('Salinas'),('Sampson'),('Sanchez'),('Sanders'),('Sandoval'),('Sanford'),('Santana'),('Santiago'),('Santos'),('Sargent'),('Saunders'),('Savage'),('Sawyer'),('Schmidt'),('Schneider'),('Schroeder'),('Schultz'),('Schwartz'),('Scott'),('Sears'),('Sellers'),('Serrano'),('Sexton'),('Shaffer'),('Shannon'),('Sharp'),('Sharpe'),('Shaw'),('Shelton'),('Shepard'),('Shepherd'),('Sheppard'),('Sherman'),('Shields'),('Short'),('Silva'),('Simmons'),('Simon'),('Simpson'),('Sims'),('Singleton'),('Skinner'),('Slater'),('Sloan'),('Small'),('Smith'),('Snider'),('Snow'),('Snyder'),('Solis'),('Solomon'),('Sosa'),('Soto'),('Sparks'),('Spears'),('Spence'),('Spencer'),('Stafford'),('Stanley'),('Stanton'),('Stark'),('Steele'),('Stein'),('Stephens'),('Stephenson'),('Stevens'),('Stevenson'),('Stewart'),('Stokes'),('Stone'),('Stout'),('Strickland'),('Strong'),('Stuart'),('Suarez'),('Sullivan'),('Summers'),('Sutton'),('Swanson'),('Sweeney'),('Sweet'),('Sykes'),('Talley'),('Tanner'),('Tate'),('Taylor'),('Terrell'),('Terry'),('Thomas'),('Thompson'),('Thornton'),('Tillman'),('Todd'),('Torres'),('Townsend'),('Tran'),('Travis'),('Trevino'),('Trujillo'),('Tucker'),('Turner'),('Tyler'),('Tyson'),('Underwood'),('Valdez'),('Valencia'),('Valentine'),('Valenzuela'),('Vance'),('Vang'),('Vargas'),('Vasquez'),('Vaughan'),('Vaughn'),('Vazquez'),('Vega'),('Velasquez'),('Velazquez'),('Velez'),('Villarreal'),('Vincent'),('Vinson'),('Wade'),('Wagner'),('Walker'),('Wall'),('Wallace'),('Waller'),('Walls'),('Walsh'),('Walter'),('Walters'),('Walton'),('Ward'),('Ware'),('Warner'),('Warren'),('Washington'),('Waters'),('Watkins'),('Watson'),('Watts'),('Weaver'),('Webb'),('Weber'),('Webster'),('Weeks'),('Weiss'),('Welch'),('Wells'),('West'),('Wheeler'),('Whitaker'),('White'),('Whitehead'),('Whitfield'),('Whitley'),('Whitney'),('Wiggins'),('Wilcox'),('Wilder'),('Wiley'),('Wilkerson'),('Wilkins'),('Wilkinson'),('William'),('Williams'),('Williamson'),('Willis'),('Wilson'),('Winters'),('Wise'),('Witt'),('Wolf'),('Wolfe'),('Wong'),('Wood'),('Woodard'),('Woods'),('Woodward'),('Wooten'),('Workman'),('Wright'),('Wyatt'),('Wynn'),('Yang'),('Yates'),('York'),('Young'),('Zamora'),('Zimmerman')
-		";
-
-		$response = Core::$db->query($queries, $rollbackQueries);
-
-		if ($response["success"]) {
-			return array(true, "");
-		} else {
-			return array(false, $response["errorMessage"]);
-		}
-	}
-
-
-	public function getHelpHTML() {
-		$content =<<<EOF
-	<p>
-		{$this->L["help_intro"]}
-	</p>
-
-	<table cellpadding="0" cellspacing="1">
-	<tr>
-		<td width="100"><h4>Name</h4></td>
-		<td>{$this->L["type_Name"]}</td>
-	</tr>
-	<tr>
-		<td><h4>MaleName</h4></td>
-		<td>{$this->L["type_MaleName"]}</td>
-	</tr>
-	<tr>
-		<td><h4>FemaleName</h4></td>
-		<td>{$this->L["type_FemaleName"]}</td>
-	</tr>
-	<tr>
-		<td><h4>Initial</h4></td>
-		<td>{$this->L["type_Initial"]}</td>
-	</tr>
-	<tr>
-		<td><h4>Surname</h4></td>
-		<td>{$this->L["type_Surname"]}</td>
-	</tr>
-	</table>
-EOF;
-
-		return $content;
-	}
-
-	public function getRestOptionsFormat() {
-		return array(
-			"required" => true,
-			"type" => "string"
-		);
-	}
-
-}
diff --git a/plugins/dataTypes/Names/Names.js b/plugins/dataTypes/Names/Names.js
deleted file mode 100755
index 1ee28875e..000000000
--- a/plugins/dataTypes/Names/Names.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	var MODULE_ID = "data-type-Names";
-	var LANG = L.dataTypePlugins.Names;
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.DATA_TABLE.ROW.EXAMPLE_CHANGE + "__" + MODULE_ID] = _exampleChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _exampleChange = function(msg) {
-		$("#dtOption_" + msg.rowID).val(msg.value);
-	};
-
-	/**
-	 * Called when the user submits the form to generate some data. If the selected data set contains
-	 * one or more rows of this data type, this function is called with the list of row numbers. Note that
-	 * the row numbers passed are the *original* row numbers of the rows on creation. It's possible that the
-	 * user has re-sorted or deleted some rows. So to get the visible row number for a row, call
-	 * gen._getVisibleRowOrderByRowNum(row)
-	 */
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-		for (var i=0; i<rows.length; i++) {
-			if ($("#dtOption_" + rows[i]).val() === "") {
-				var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-				visibleProblemRows.push(visibleRowNum);
-				problemFields.push($("#dtOption_" + rows[i]));
-			}
-		}
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-	/**
-	 * Called when the user saves a form. This function is passed the row number of the row to
-	 * save. It should return a JSON object (of whatever structure is relevant).
-	 */
-	var _saveRow = function(rowNum) {
-		return {
-			"example": $("#dtExample_" + rowNum).val(),
-			"option":  $("#dtOption_" + rowNum).val()
-		};
-	};
-
-	/**
-	 * Called when a form is loaded that contains this data type. This is passed the row number and
-	 * the custom data type data to populate the fields. loadRow functions all must return an array
-	 * with two indexes - both functions:
-	 *  [0] code to execute (generally inserting data into fields)
-	 *  [1] a boolean test to determine WHEN the content has been inserted.
-	 */
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() { },
-			isComplete: function() {
-				if ($("#dtOption_" + rowNum).length) {
-					$("#dtExample_" + rowNum).val(data.example);
-					$("#dtOption_" + rowNum).val(data.option);
-					return true;
-				} else {
-					return false;
-				}
-			}
-		};
-	};
-
-
-	// register our module
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		validate: _validate,
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/Names/lang/de.php b/plugins/dataTypes/Names/lang/de.php
deleted file mode 100644
index 33c95ef06..000000000
--- a/plugins/dataTypes/Names/lang/de.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Namen";
-
-// Category: Lang Strings
-$L["example_FemaleName"] = "Jane (Female Name)";
-$L["example_FemaleName_Surname"] = "Jane Smith";
-$L["example_MaleName"] = "John (männlich Name)";
-$L["example_MaleName_Surname"] = "John Smith";
-$L["example_Name"] = "Alex (geschlechtsspezifische)";
-$L["example_Name4"] = "Jenny, Toby, Ben, Peter";
-$L["example_Name_Initial_Surname"] = "Alex J. Smith";
-$L["example_Name_Surname"] = "Alex Smith";
-$L["example_Surname_Name_Initial"] = "Smith, John P.";
-$L["example_fullnames"] = "Alex Smith oder Alex J. Smith";
-$L["example_surname"] = "Smith (Familienname)";
-$L["help_intro"] = "Dieser Datentyp zufällig generiert menschlichen Namen (meist Western) nach dem Format, das Sie angeben. Zeichen (|) können Sie mehrere Formate, indem Sie sie mit dem Rohr geben. Die folgenden Zeichenfolgen werden auf die zufälligen Namen umgerechnet werden:";
-$L["incomplete_fields"] = "Der Name Datentyp haben muss das Format eingetragen im Options Textfeld. Bitte beheben Sie die folgenden Zeilen:";
-$L["name"] = "Name";
-$L["type_FemaleName"] = "Ein weiblicher Vorname.";
-$L["type_Initial"] = "Ein Großbuchstaben, AZ.";
-$L["type_MaleName"] = "Ein männlicher Vorname.";
-$L["type_Name"] = "Ein Vorname, männlich oder weiblich.";
-$L["type_Surname"] = "Eine zufällige Nachnamen.";
diff --git a/plugins/dataTypes/Names/lang/en.php b/plugins/dataTypes/Names/lang/en.php
deleted file mode 100644
index 5d50d241e..000000000
--- a/plugins/dataTypes/Names/lang/en.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Names";
-
-$L["help_intro"] = "This data type randomly generates human names (mostly Western) according to the format you specify. You can specify multiple formats by separating them with the pipe (|) character. The following strings will be converted to their random name equivalent:";
-$L["incomplete_fields"] = "The Name data type needs to have the format entered in the Options text field. Please fix the following rows:";
-$L["name"] = "Name";
-$L["example_FemaleName"] = "Jane (Female Name)";
-$L["example_FemaleName_Surname"] = "Jane Smith";
-$L["example_MaleName"] = "John (Male Name)";
-$L["example_MaleName_Surname"] = "John Smith";
-$L["example_Name"] = "Alex (any gender)";
-$L["example_Name4"] = "Jenny, Toby, Ben, Peter";
-$L["example_Name_Initial_Surname"] = "Alex J. Smith";
-$L["example_Name_Surname"] = "Alex Smith";
-$L["example_Surname_Name_Initial"] = "Smith, John P.";
-$L["example_fullnames"] = "Alex Smith or Alex J. Smith";
-$L["example_surname"] = "Smith (surname)";
-$L["type_FemaleName"] = "A female first name.";
-$L["type_Initial"] = "An upper-case letter, A-Z.";
-$L["type_MaleName"] = "A male first name.";
-$L["type_Name"] = "A first name, male or female.";
-$L["type_Surname"] = "A random surname.";
diff --git a/plugins/dataTypes/Names/lang/es.php b/plugins/dataTypes/Names/lang/es.php
deleted file mode 100644
index 9d8d08535..000000000
--- a/plugins/dataTypes/Names/lang/es.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Nombres";
-
-$L["help_intro"] = "Este tipo de dato genera aleatoriamente nombres de persona (mayoritariamente occidentales) de acuerdo al formato que especifiques. Pues especificar múltiples formatos separándolos con el carácter tubería, |. Las siguientes cadenas serán convertidas a su nombre aleatorio equivalente:";
-$L["incomplete_fields"] = "The Name data type needs to have the format entered in the Options text field. Please fix the following rows:";
-$L["name"] = "Nombre";
-$L["example_FemaleName"] = "Jane (Nombre de mujer)";
-$L["example_FemaleName_Surname"] = "Jane Smith";
-$L["example_MaleName"] = "John (Nombre de hombre)";
-$L["example_MaleName_Surname"] = "John Smith";
-$L["example_Name"] = "Alex (cualquier sexo)";
-$L["example_Name4"] = "Jenny, Toby, Ben, Peter";
-$L["example_Name_Initial_Surname"] = "Alex J. Smith";
-$L["example_Name_Surname"] = "Alex Smith";
-$L["example_Surname_Name_Initial"] = "Smith, John P.";
-$L["example_fullnames"] = "Alex Smith o Alex J. Smith";
-$L["example_surname"] = "Smith (apellido)";
-$L["type_FemaleName"] = "Un nombre de mujer.";
-$L["type_Initial"] = "Una letra mayúscula, A-Z.";
-$L["type_MaleName"] = "Un nombre de hombre.";
-$L["type_Name"] = "Un nombre, de hombre o mujer.";
-$L["type_Surname"] = "Un apellido aleatorio.";
diff --git a/plugins/dataTypes/Names/lang/fr.php b/plugins/dataTypes/Names/lang/fr.php
deleted file mode 100644
index 74e5883b4..000000000
--- a/plugins/dataTypes/Names/lang/fr.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Noms";
-
-$L["example_FemaleName"] = "Jane (prénom féminin)";
-$L["example_FemaleName_Surname"] = "Jane Smith (nom complet féminin)";
-$L["example_MaleName"] = "John (prénom masculin)";
-$L["example_MaleName_Surname"] = "John Smith (nom complet masculin)";
-$L["example_Name"] = "Alex (prénom masculin ou féminin)";
-$L["example_Name4"] = "Jenny, Toby, Ben, Peter";
-$L["example_Name_Initial_Surname"] = "Alex J. Smith";
-$L["example_Name_Surname"] = "Alex Smith";
-$L["example_Surname_Name_Initial"] = "Smith, John P.";
-$L["example_fullnames"] = "Alex Smith ou Alex J. Smith";
-$L["example_surname"] = "Smith (nom de famille)";
-$L["help_intro"] = "Ce type de données génère aléatoirement des noms de personnes (principalement occidentaux) en fonction du format que vous spécifiez. Vous pouvez spécifier les formats multiples en les séparant par le caractère pipe (|). Les chaînes suivantes seront converties en leur équivalent aléatoire:";
-$L["incomplete_fields"] = "Le type de données Nom doit avoir un format précisé dans le champ de texte Options. Corrigez les lignes suivantes:";
-$L["name"] = "Nom";
-$L["type_FemaleName"] = "Un prénom féminin.";
-$L["type_Initial"] = "Une lettre majuscule, AZ.";
-$L["type_MaleName"] = "Un prénom masculin.";
-$L["type_Name"] = "Un prénom masculin ou féminin.";
-$L["type_Surname"] = "Un nom aléatoire.";
\ No newline at end of file
diff --git a/plugins/dataTypes/Names/lang/nl.php b/plugins/dataTypes/Names/lang/nl.php
deleted file mode 100644
index 578e0cf7d..000000000
--- a/plugins/dataTypes/Names/lang/nl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Des noms";
-
-$L["example_FemaleName"] = "Jane (nom féminin)";
-$L["example_FemaleName_Surname"] = "Jane Smith";
-$L["example_MaleName"] = "John (nom masculin)";
-$L["example_MaleName_Surname"] = "John Smith";
-$L["example_Name"] = "Alex (tout genre)";
-$L["example_Name4"] = "Jenny, Toby, Ben, Peter";
-$L["example_Name_Initial_Surname"] = "Alex J. Smith";
-$L["example_Name_Surname"] = "Alex Smith";
-$L["example_Surname_Name_Initial"] = "Smith, John P.";
-$L["example_fullnames"] = "Alex Smith ou Alex J. Smith";
-$L["example_surname"] = "Smith (nom de famille)";
-$L["help_intro"] = "Ce type de données génère aléatoirement des noms humains (principalement occidentale) en fonction du format que vous spécifiez. Vous pouvez spécifier les formats multiples en les séparant par le pipe (|) caractère. Les chaînes suivantes seront converties en leur équivalent nom aléatoire:";
-$L["incomplete_fields"] = "Le type de données Nom doit avoir le format entré dans le champ de texte Options. S'il vous plaît corriger les lignes suivantes:";
-$L["name"] = "Nom";
-$L["type_FemaleName"] = "Un prénom féminin.";
-$L["type_Initial"] = "Une lettre majuscule, AZ.";
-$L["type_MaleName"] = "Un prénom masculin.";
-$L["type_Name"] = "Un prénom, mâle ou femelle.";
-$L["type_Surname"] = "Un nom aléatoire.";
\ No newline at end of file
diff --git a/plugins/dataTypes/NamesRegional/NamesRegional.class.php b/plugins/dataTypes/NamesRegional/NamesRegional.class.php
deleted file mode 100644
index 8bc6c6c4b..000000000
--- a/plugins/dataTypes/NamesRegional/NamesRegional.class.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- *
- * This Data Type provides some more fine-tuning of names (first + last) so that they're mapped to whatever
- * country the row happens to contain. If the $regionalNames private var doesn't contain names for the
- * current country, it defaults to loading ANY name pulled from the database - just like with the Names plugin.
- */
-
-class DataType_NamesRegional extends DataTypePlugin {
-
-	protected $isEnabled = true;
-	protected $dataTypeName = "Names, Regional";
-	protected $hasHelpDialog = true;
-	protected $dataTypeFieldGroup = "human_data";
-	protected $dataTypeFieldGroupOrder = 15;
-	protected $processOrder = 2;
-	protected $jsModules = array("NamesRegional.js");
-
-	private $letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	private $regionalNames = array(
-		"italy" => array(
-			"firstNamesFemale" => array(
-				"Alessandra", "Alessia", "Alice", "Angela", "Anna", "Arianna", "Aurora", "Beatrice", "Camilla",
-				"Caterina", "Chiara", "Claudia", "Cristina", "Debora", "Elena", "Eleonora", "Elisa", "Emma", "Erica",
-				"Erika", "Federica", "Francesca", "Gaia", "Giada", "Ginevra", "Giorgia", "Giulia", "Giulietta", "Greta",
-				"Ilaria", "Irene", "Jessica", "Lara", "Laura", "Lisa", "Lucia", "Manuela", "Margherita", "Maria",
-				"Marta", "Martina", "Matilde", "Michela", "Monica", "Nicole", "Nicoletta", "Noemi", "Paola", "Rebecca",
-				"Roberta", "Sara", "Serena", "Silvia", "Simona", "Sofia", "Stefania", "Valentina", "Valeria", "Vanessa",
-				"Veronica", "Viola", "Vittoria"
-			),
-			"firstNamesMale" => array(
-				"Alberto", "Alessandro", "Alessio", "Alex", "Andrea", "Angelo", "Antonio", "Armando", "Augusto",
-				"Christian", "Claudio", "Cristian", "Cristiano", "Daniele", "Dario", "Davide", "Diego", "Domenico",
-				"Edoardo", "Emanuele", "Enrico", "Fabio", "Federico", "Filippo", "Francesco", "Gabriele", "Giacomo",
-				"Gianluca", "Gianni", "Gianpaolo", "Gianpiero", "Giorgio", "Giovanni", "Giulio", "Giuseppe", "Jacopo",
-				"Leonardo", "Lorenzo", "Luca", "Lucio", "Luigi", "Manuel", "Marco", "Mario", "Marcello", "Matteo",
-				"Mattia", "Michele", "Mirko", "Nicola", "Nicolò", "Paolo", "Pietro", "Riccardo", "Roberto", "Salvatore",
-				"Samuel", "Samuele", "Simone", "Stefano", "Tommaso", "Valerio", "Vincenzo"
-			),
-			"lastNames" => array(
-				"Agostini", "Aiello", "Albanese", "Amato", "Antonelli", "Arena", "Baldi", "Barbieri", "Barone", "Basile",
-				"Battaglia", "Bellini", "Benedetti", "Bernardi", "Bianchi", "Bianco", "Brambilla", "Bruni", "Bruno",
-				"Calabrese", "Caputo", "Carbone", "Caruso", "Castelli", "Catalano", "Cattaneo", "Cavallo", "Ceccarelli",
-				"Cirillo", "Colombo", "Conte", "Conti", "Coppola", "Costa", "Costantini", "De Angelis", "De Luca",
-				"De Rosa", "De Santis", "De Simone", "Di Stefano", "Donati", "Esposito", "Fabbri", "Farina", "Ferrante",
-				"Ferrara", "Ferrari", "Ferraro", "Ferrero", "Ferretti", "Ferri", "Ferro", "Fiore", "Fontana", "Franco",
-				"Fumagalli", "Fusco", "Galli", "Gallo", "Gargiulo", "Garofalo", "Gatti", "Gentile", "Giordano", "Giorgi",
-				"Giuliani", "Grassi", "Grasso", "Greco", "Grimaldi", "Guerra", "Guidi", "Leone", "Lombardi", "Lombardo",
-				"Longo", "Lorusso", "Mancini", "Marchetti", "Marchi", "Mariani", "Marini", "Marino", "Marra", "Martinelli",
-				"Martini", "Martino", "Mazza", "Mele", "Meloni", "Messina", "Milani", "Monaco", "Montanari", "Monti",
-				"Morelli", "Moretti", "Moro", "Napolitano", "Neri", "Olivieri", "Orlando", "Pace", "Pagano", "Palmieri",
-				"Palumbo", "Parisi", "Pastore", "Pellegrini", "Pellegrino", "Pepe", "Perrone", "Piazza", "Piccolo",
-				"Pinna", "Piras", "Poli", "Pozzi", "Proietti", "Ricci", "Ricciardi", "Rinaldi", "Riva", "Rizzi", "Rizzo",
-				"Romano", "Romeo", "Rossetti", "Rossi", "Ruggeri", "Ruggiero", "Russo", "Sala", "Sanna", "Santini",
-				"Santoro", "Sartori", "Serra", "Silvestri", "Sorrentino", "Testa", "Valente", "Valentini", "Villa",
-				"Villani", "Vitale", "Vitali", "Volpe", "Zanetti"
-			)
-		),
-		"france" => array(
-			"firstNamesFemale" => array(
-				"Agathe", "Alexandra", "Alexia", "Alice", "Alicia", "Amandine", "Ambre", "Amélie", "Anaël", "Anaëlle",
-				"Anaïs", "Angelina", "Anna", "Bienvenue", "Candice", "Capucine", "Carla", "Catherine", "Charlotte",
-				"Chaïma", "Chloé", "Clara", "Clotilde", "Cloé", "Clémence", "Célia", "Edwige", "Elsa", "Emma", "Eva",
-				"Fanny", "Françoise", "Guillemette", "Inès", "Jade", "Jasmine", "Jeanne", "Julia", "Julie", "Juliette",
-				"Justine", "Katell", "Kimberley", "Lamia", "Lana", "Laura", "Lauriane", "Lena", "Lilou", "Lily", "Lina",
-				"Lisa", "Loane", "Lola", "Lou", "Louise", "Louna", "Lucie", "Luna", "Lutécia", "Léa", "Léane", "Léonie",
-				"Maelys", "Manon", "Margaux", "Margot", "Marie", "Marine", "Marion", "Maryam", "Mathilde", "Maéva",
-				"Maëlle", "Maïlé", "Maïwenn", "Mélanie", "Mélissa", "Nina", "Noémie", "Océane", "Pauline", "Romane",
-				"Rosalie", "Rose", "Salomé", "Sara", "Sarah", "Solene", "Syrine", "Tatiana", "Valentine", "Yasmine",
-				"Yüna", "Zoé", "Élisa", "Élise", "Éloïse", "Éléna", "Émilie"
-			),
-			"firstNamesMale" => array(
-				"Aaron", "Adam", "Adrian", "Adrien", "Alexandre", "Alexis", "Amine", "Anthony", "Antoine", "Antonin",
-				"Arthur", "Baptiste", "Bastien", "Benjamin", "Bruno", "Clément", "Colin", "Constant", "Corentin",
-				"Cédric", "Davy", "Diego", "Dimitri", "Dorian", "Dylan", "Enzo", "Erwan", "Esteban", "Ethan", "Evan",
-				"Florentin", "Florian", "Félix", "Gabin", "Gabriel", "Gaspard", "Gilbert", "Grégory", "Guillaume",
-				"Hugo", "Jordan", "Jules", "Julien", "Jérémy", "Kevin", "Kilian", "Killian", "Kylian", "Kyllian",
-				"Lilian", "Loevan", "Lorenzo", "Louis", "Lucas", "Léo", "Léon", "Léonard", "Macéo", "Malik", "Malo",
-				"Martin", "Marwane", "Mathieu", "Mathis", "Mathéo", "Mattéo", "Maxence", "Maxime", "Mehdi", "Mohamed",
-				"Nathan", "Nicolas", "Noah", "Nolan", "Noë", "Paul", "Pierre", "Quentin", "Renaud", "Robin", "Romain",
-				"Roméo", "Rémi", "Samuel", "Simon", "Thibault", "Thomas", "Théo", "Timothée", "Timéo", "Titouan",
-				"Tom", "Tristan", "Valentin", "Victor", "Yanis", "Yohan", "Zacharis", "Élouan", "Émile"
-			),
-			"lastNames" => array(
-				"Adam", "Albert", "Andre", "Arnaud", "Aubert", "Aubry", "Bailly", "Barbier", "Baron", "Barre", "Benoit",
-				"Berger", "Bernard", "Bertrand", "Blanc", "Blanchard", "Bonnet", "Boucher", "Boulanger", "Bourgeois",
-				"Bouvier", "Boyer", "Breton", "Brun", "Brunet", "Caron", "Carpentier", "Carre", "Charles", "Charpentier",
-				"Chevalier", "Chevallier", "Clement", "Colin", "Collet", "Collin", "Cordier", "Cousin", "Daniel",
-				"David", "Denis", "Deschamps", "Dubois", "Dufour", "Dumas", "Dumont", "Dupont", "Dupuis", "Dupuy",
-				"Durand", "Duval", "Etienne", "Evrard", "Fabre", "Faure", "Fernandez", "Fleury", "Fontaine", "Fournier",
-				"Francois", "Gaillard", "Garcia", "Garnier", "Gauthier", "Gautier", "Gay", "Gerard", "Germain", "Gillet",
-				"Girard", "Giraud", "Gomez", "Gonzalez", "Guerin", "Guillaume", "Guillot", "Guyot", "Henry", "Herve",
-				"Hubert", "Huet", "Humbert", "Jacob", "Jacquet", "Jean", "Joly", "Julien", "Klein", "Lacroix", "Laine",
-				"Lambert", "Laurent", "Le gall", "Le goff", "Le roux", "Lebrun", "Leclerc", "Leclercq", "Lecomte",
-				"Lefebvre", "Lefevre", "Legrand", "Lemaire", "Lemoine", "Leroux", "Leroy", "Leveque", "Lopez", "Louis",
-				"Lucas", "Maillard", "Mallet", "Marchal", "Marchand", "Marechal", "Marie", "Martin", "Martinez",
-				"Marty", "Masson", "Mathieu", "Menard", "Mercier", "Meunier", "Meyer", "Michel", "Millet", "Moreau",
-				"Morel", "Morin", "Moulin", "Muller", "Nguyen", "Nicolas", "Noel", "Olivier", "Paris", "Pasquier",
-				"Paul", "Pereira", "Perez", "Perrin", "Perrot", "Petit", "Philippe", "Picard", "Pierre", "Poirier",
-				"Pons", "Poulain", "Prevost", "Remy", "Renard", "Renaud", "Renault", "Rey", "Richard", "Riviere",
-				"Robert", "Robin", "Roche", "Rodriguez", "Roger", "Rolland", "Rousseau", "Roussel", "Roux", "Roy",
-				"Royer", "Sanchez", "Schmitt", "Schneider", "Simon", "Thomas", "Vasseur", "Vidal", "Vincent", "Weber"
-			)
-		)
-	);
-	private $generalMaleNames   = array();
-	private $generalFemaleNames = array();
-	private $generalFirstNames  = array();
-	private $generalLastNames   = array();
-
-
-	/**
-	 * @param string $runtimeContext "generation" or "ui"
-	 */
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			self::initFirstNames();
-			self::initLastNames();
-			self::combineRegionalFirstNames();
-		}
-	}
-
-	public function generate($generator, $generationContextData) {
-		$placeholderStr = $generationContextData["generationOptions"];
-		$selectedCountryPlugins = $generator->getCountries();
-
-		$rowCountryInfo = array();
-		while (list($key, $info) = each($generationContextData["existingRowData"])) {
-			if ($info["dataTypeFolder"] == "Country") {
-				$rowCountryInfo = $info;
-				break;
-			}
-		}
-
-		$maleNames   = $this->generalMaleNames;
-		$femaleNames = $this->generalFemaleNames;
-		$firstNames  = $this->generalFirstNames;
-		$lastNames   = $this->generalLastNames;
-
-		// if there's a country for this row,
-		$countrySlug = "";
-		if (!empty($rowCountryInfo) && isset($rowCountryInfo["randomData"]["slug"])) {
-			if (array_key_exists($rowCountryInfo["randomData"]["slug"], $this->regionalNames)) {
-				$countrySlug = $rowCountryInfo["randomData"]["slug"];
-			}
-		} else if (!empty($selectedCountryPlugins)) {
-			$availableRegionalCountries = array_keys($this->regionalNames);
-			$inBoth = array_intersect($availableRegionalCountries, $selectedCountryPlugins);
-
-			if (!empty($inBoth)) {
-				$countrySlug = $inBoth[mt_rand(0, count($inBoth) - 1)];
-			}
-		}
-
-		if (!empty($countrySlug)) {
-			$maleNames   = $this->regionalNames[$countrySlug]["firstNamesMale"];
-			$femaleNames = $this->regionalNames[$countrySlug]["firstNamesFemale"];
-			$firstNames  = $this->regionalNames[$countrySlug]["firstNames"];
-			$lastNames   = $this->regionalNames[$countrySlug]["lastNames"];
-		}
-
-
-		while (preg_match("/MaleName/", $placeholderStr)) {
-			$placeholderStr = preg_replace("/MaleName/", $this->getRandomFirstName($maleNames), $placeholderStr, 1);
-		}
-		while (preg_match("/FemaleName/", $placeholderStr)) {
-			$placeholderStr = preg_replace("/FemaleName/", $this->getRandomFirstName($femaleNames), $placeholderStr, 1);
-		}
-		while (preg_match("/Name/", $placeholderStr)) {
-			$placeholderStr = preg_replace("/Name/", $this->getRandomFirstName($firstNames), $placeholderStr, 1);
-		}
-		while (preg_match("/Surname/", $placeholderStr)) {
-			$placeholderStr = preg_replace("/Surname/", $lastNames[mt_rand(0, count($lastNames)-1)], $placeholderStr, 1);
-		}
-		while (preg_match("/Initial/", $placeholderStr)) {
-			$placeholderStr = preg_replace("/Initial/", $this->letters[mt_rand(0, strlen($this->letters)-1)], $placeholderStr, 1);
-		}
-
-		// in case the user entered multiple | separated formats, pick one
-		$formats = explode("|", $placeholderStr);
-		$chosenFormat = $formats[0];
-		if (count($formats) > 1) {
-			$chosenFormat = $formats[mt_rand(0, count($formats)-1)];
-		}
-
-		return array(
-			"display" => trim($chosenFormat)
-		);
-	}
-
-
-	public function getRowGenerationOptions($generator, $post, $colNum, $numCols) {
-		if (!isset($post["dtOption_$colNum"]) || empty($post["dtOption_$colNum"])) {
-			return false;
-		}
-		return $post["dtOption_$colNum"];
-	}
-
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255) default NULL",
-			"SQLField_Oracle" => "varchar2(255) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-
-	public function getExampleColumnHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-
-		$html =<<< END
-	<select name="dtExample_%ROW%" id="dtExample_%ROW%">
-		<option value="">{$L["please_select"]}</option>
-		<option value="MaleName">{$this->L["example_MaleName"]}</option>
-		<option value="FemaleName">{$this->L["example_FemaleName"]}</option>
-		<option value="Name">{$this->L["example_Name"]}</option>
-		<option value="MaleName Surname">{$this->L["example_MaleName_Surname"]}</option>
-		<option value="FemaleName Surname">{$this->L["example_FemaleName_Surname"]}</option>
-		<option value="Name Surname">{$this->L["example_Name_Surname"]}</option>
-		<option value="Name Initial. Surname">{$this->L["example_Name_Initial_Surname"]}</option>
-		<option value="Surname">{$this->L["example_surname"]}</option>
-		<option value="Surname, Name Initial.">{$this->L["example_Surname_Name_Initial"]}</option>
-		<option value="Name, Name, Name, Name">{$this->L["example_Name4"]}</option>
-		<option value="Name Surname|Name Initial. Surname">{$this->L["example_fullnames"]}</option>
-	</select>
-END;
-		return $html;
-	}
-
-	public function getOptionsColumnHTML() {
-		return '<input type="text" name="dtOption_%ROW%" id="dtOption_%ROW%" style="width: 267px" />';
-	}
-
-	public function getNames() {
-		return $this->firstNames;
-	}
-
-	public function getFirstNames() {
-		return $this->firstNames;
-	}
-
-	public function getLastNames() {
-		return $this->lastNames;
-	}
-
-	/**
-	 * Called when instantiating the plugin during data generation. Set the firstNames, maleNames and
-	 * femaleNames.
-	 */
-	private function initFirstNames() {
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			SELECT *
-			FROM   {$prefix}first_names
-		");
-
-		if ($response["success"]) {
-			$names = array();
-			$maleNames = array();
-			$femaleNames = array();
-			while ($row = mysqli_fetch_assoc($response["results"])) {
-				$gender = $row["gender"];
-				$name   = $row["first_name"];
-
-				$names[] = $name;
-				if ($gender == "male") {
-					$maleNames[] = $name;
-				} else {
-					$femaleNames[] = $name;
-				}
-			}
-
-			$this->generalFirstNames  = $names;
-			$this->generalMaleNames   = $maleNames;
-			$this->generalFemaleNames = $femaleNames;
-		}
-	}
-
-
-	private function initLastNames() {
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			SELECT *
-			FROM   {$prefix}last_names
-		");
-
-		if ($response["success"]) {
-			$lastNames = array();
-			while ($row = mysqli_fetch_assoc($response["results"])) {
-				$lastNames[] = $row["last_name"];
-			}
-			$this->generalLastNames = $lastNames;
-		}
-	}
-
-	/**
-	 * Called on instantiation. This combines the male and female first names in the $regionalNames hash
-	 * into a single "first_names" key, for quick reference.
-	 */
-	private function combineRegionalFirstNames() {
-		$updatedRegionalNames = array();
-		while (list($country, $content) = each($this->regionalNames)) {
-			$content["firstNames"] = array_merge($content["firstNamesFemale"], $content["firstNamesMale"]);
-			$updatedRegionalNames[$country] = $content;
-		}
-		$this->regionalNames = $updatedRegionalNames;
-	}
-
-
-	private function getRandomFirstName($nameArray) {
-		return $nameArray[mt_rand(0, count($nameArray)-1)];
-	}
-
-	/**
-	 * Called during installation. This creates and populates the first_names and last_names DB tables.
-	 *
-	 * @return array [0] success / error (boolean)
-	 *               [1] the error message, if there was an error
-	 */
-	public static function install() {
-		$prefix = Core::getDbTablePrefix();
-
-		// always clear out the previous tables, just in case
-		$rollbackQueries = array();
-		$rollbackQueries[] = "DROP TABLE {$prefix}first_names";
-		$rollbackQueries[] = "DROP TABLE {$prefix}last_names";
-		Core::$db->query($rollbackQueries);
-
-		$queries = array();
-		$queries[] = "
-			CREATE TABLE {$prefix}first_names (
-				id mediumint(9) NOT NULL auto_increment,
-				first_name varchar(50) NOT NULL default '',
-				gender enum('male','female','both') NOT NULL default 'male',
-				PRIMARY KEY (id)
-			)
-		";
-		$queries[] = "
-			INSERT INTO {$prefix}first_names (first_name, gender)
-			VALUES ('Aaron','male'),('Abbot','male'),('Abdul','male'),('Abel','male'),('Abigail','female'),('Abra','female'),('Abraham','male'),('Acton','male'),('Adam','male'),('Adara','female'),('Addison','male'),('Adele','female'),('Adena','female'),('Adria','female'),('Adrian','male'),('Adrienne','female'),('Ahmed','male'),('Aidan','male'),('Aiko','female'),('Aileen','female'),('Aimee','female'),('Ainsley','female'),('Akeem','male'),('Aladdin','male'),('Alan','male'),('Alana','female'),('Alden','male'),('Alea','female'),('Alec','male'),('Alexa','female'),('Alexander','male'),('Alexandra','female'),('Alexis','female'),('Alfonso','male'),('Alfreda','female'),('Ali','male'),('Alice','female'),('Alika','female'),('Aline','female'),('Alisa','female'),('Allegra','female'),('Allen','male'),('Allistair','male'),('Alma','female'),('Althea','female'),('Alvin','male'),('Alyssa','female'),('Amal','male'),('Amanda','female'),('Amaya','female'),('Amber','female'),('Amela','female'),('Amelia','female'),('Amena','female'),('Amery','male'),('Amethyst','female'),('Amir','male'),('Amity','female'),('Amos','male'),('Amy','female'),('Anastasia','female'),('Andrew','male'),	('Angela','female'),('Angelica','female'),('Anika','female'),('Anjolie','female'),('Ann','female'),('Anne','female'),('Anthony','male'),('Aphrodite','female'),('April','female'),('Aquila','male'),('Arden','male'),('Aretha','female'),('Ariana','female'),('Ariel','female'),('Aristotle','male'),('Armand','male'),('Armando','male'),('Arsenio','male'),('Arthur','male'),('Ashely','female'),('Asher','male'),('Ashton','male'),('Aspen','female'),('Astra','female'),('Athena','female'),('Aubrey','both'),('Audra','female'),('Audrey','female'),('August','male'),('Aurelia','female'),('Aurora','female'),('Austin','male'),('Autumn','female'),('Ava','female'),('Avram','male'),('Avye','female'),('Axel','male'),('Ayanna','female'),('Azalia','female'),('Baker','male'),('Barbara','female'),('Barclay','male'),('Barrett','male'),('Barry','male'),('Basia','female'),('Basil','male'),('Baxter','male'),('Beatrice','female'),('Beau','male'),('Beck','male'),('Bell','female'),('Belle','female'),('Benedict','male'),('Benjamin','male'),('Berk','male'),('Bernard','male'),('Bert','male'),('Bertha','female'),('Bethany','female'),('Beverly','female'),('Bevis','male'),('Bianca','female'),('Blaine','both'),('Blair','both'),('Blake','male'),('Blaze','male'),('Blossom','female'),('Blythe','female'),('Bo','female'),('Boris','male'),('Bradley','male'),('Brady','male'),('Branden','male'),('Brandon','male'),('Breanna','female'),('Bree','female'),('Brenda','female'),('Brendan','male'),('Brenden','male'),('Brenna','female'),('Brennan','male'),('Brent','male'),('Brett','male'),('Brian','male'),('Brianna','female'),('Briar','female'),('Brielle','female'),('Britanney','female'),('Britanni','female'),('Brittany','female'),('Brock','male'),('Brody','male'),('Brooke','female'),('Bruce','male'),('Bruno','male'),('Bryar','female'),('Brynn','female'),('Brynne','female'),('Buckminster','male'),('Buffy','female'),('Burke','male'),('Burton','male'),('Byron','male'),('Cade','male'),('Cadman','male'),('Caesar','male'),('Cailin','female'),('Cain','male'),('Cairo','male'),('Caldwell','male'),('Caleb','male'),('Calista','female'),('Callie','female'),('Callum','male'),('Cally','female'),('Calvin','male'),('Camden','male'),('Cameran','female'),('Cameron','female'),('Cameron','male'),('Camilla','female'),('Camille','female'),('Candace','female'),('Candice','female'),('Cara','female'),('Carissa','female'),('Carl','male'),('Carla','female'),('Carlos','male'),('Carly','female'),('Carol','female'),('Carolyn','female'),('Carson','male'),('Carter','male'),('Caryn','female'),('Casey','both'),('Cassady','female'),('Cassandra','female'),('Cassidy','female'),('Castor','male'),('Catherine','female'),('Cathleen','female'),('Cecilia','female'),('Cedric','male'),('Celeste','female'),('Chadwick','male'),('Chaim','male'),('Chancellor','male'),('Chanda','female'),('Chandler','male'),('Chaney','male'),('Channing','male'),('Chantale','female'),('Charde','female'),('Charissa','female'),('Charity','female'),('Charles','male'),('Charlotte','female'),('Chase','male'),('Chastity','female'),('Chava','female'),('Chelsea','female'),('Cherokee','female'),('Cheryl','female'),('Chester','male'),('Cheyenne','female'),('Chiquita','female'),('Chloe','female'),('Christen','female'),('Christian','male'),('Christine','female'),('Christopher','male'),('Ciara','female'),('Ciaran','male'),('Claire','female'),('Clare','female'),('Clark','male'),('Clarke','male'),('Claudia','female'),('Clayton','male'),('Clementine','female'),('Cleo','female'),('Clinton','male'),('Clio','female'),('Coby','male'),('Cody','male'),('Colby','male'),('Cole','male'),('Colette','female'),('Colin','male'),('Colleen','female'),('Colorado','male'),('Colt','male'),('Colton','male'),('Conan','male'),('Connor','male'),('Constance','female'),('Cooper','male'),('Cora','female'),('Courtney','female'),('Craig','male'),('Cruz','male'),('Cullen','male'),('Curran','male'),('Cynthia','female'),('Cyrus','male'),('Dacey','female'),('Dahlia','female'),('Dai','female'),('Dakota','both'),('Dale','male'),('Dalton','male'),('Damian','male'),('Damon','male'),('Dana','female'),('Dane','male'),('Daniel','male'),('Danielle','female'),('Dante','male'),('Daphne','female'),('Daquan','male'),('Dara','female'),('Daria','female'),('Darius','male'),('Darrel','female'),('Darryl','female'),('Daryl','female'),('David','male'),('Davis','male'),('Dawn','female'),('Deacon','male'),('Dean','male'),('Deanna','female'),('Deborah','female'),('Debra','female'),('Declan','male'),('Deirdre','female'),('Delilah','female'),('Demetria','female'),('Demetrius','male'),('Denise','female'),('Dennis','male'),('Denton','male'),('Derek','male'),('Desirae','female'),('Desiree','female'),('Destiny','female'),('Devin','male'),('Dexter','male'),('Diana','female'),('Dieter','male'),('Dillon','male'),('Dolan','male'),('Dominic','male'),('Dominique','female'),('Donna','female'),('Donovan','male'),('Dora','female'),('Dorian','male'),('Doris','female'),('Dorothy','female'),('Drake','male'),('Drew','male'),('Driscoll','male'),('Duncan','male'),('Dustin','male'),('Dylan','male'),('Eagan','male'),('Eaton','male'),('Ebony','female'),('Echo','female'),('Edan','male'),('Eden','both'),('Edward','male'),('Elaine','female'),('Eleanor','female'),('Eliana','female'),('Elijah','male'),('Elizabeth','female'),('Ella','female'),('Elliott','male'),('Elmo','male'),('Elton','male'),('Elvis','male'),('Emerald','female'),('Emerson','male'),('Emery','male'),('Emi','female'),('Emily','female'),('Emma','female'),('Emmanuel','male'),('Erasmus','male'),('Eric','male'),('Erica','female'),('Erich','male'),('Erin','female'),('Ethan','male'),('Eugenia','female'),('Evan','male'),('Evangeline','female'),('Eve','female'),('Evelyn','female'),('Ezekiel','male'),('Ezra','male'),('Faith','female'),('Fallon','female'),('Farrah','female'),('Fatima','female'),('Fay','female'),('Felicia','female'),('Felix','male'),('Ferdinand','male'),('Ferris','male'),('Finn','male'),('Fiona','female'),('Fitzgerald','male'),('Flavia','female'),('Fletcher','male'),('Fleur','female'),('Florence','female'),('Flynn','male'),('Forrest','male'),('Frances','female'),('Francesca','female'),('Francis','male'),('Fredericka','female'),('Freya','female'),('Fritz','male'),('Fuller','male'),('Fulton','male'),('Gabriel','male'),('Gage','male'),('Gail','female'),('Galena','female'),('Galvin','male'),('Gannon','male'),('Gareth','male'),('Garrett','male'),('Garrison','male'),('Garth','male'),('Gary','male'),('Gavin','male'),('Gay','female'),('Gemma','female'),('Genevieve','female'),('Geoffrey','male'),('George','male'),('Georgia','female'),('Geraldine','female'),('Germaine','female'),('Germane','female'),('Giacomo','male'),('Gil','male'),('Gillian','female'),('Ginger','female'),('Gisela','female'),('Giselle','female'),('Glenna','female'),('Gloria','female'),('Grace','female'),('Grady','male'),('Graham','male'),('Graiden','male'),('Grant','male'),('Gray','male'),('Gregory','male'),('Gretchen','female'),('Griffin','male'),('Griffith','male'),('Guinevere','female'),('Guy','male'),('Gwendolyn','female'),('Hadassah','female'),('Hadley','female'),('Hakeem','male'),('Halee','female'),('Haley','female'),('Hall','male'),('Halla','female'),('Hamilton','male'),('Hamish','male'),('Hammett','male'),('Hanae','female'),('Hanna','female'),('Hannah','female'),('Harding','male'),('Harlan','male'),('Harper','male'),('Harriet','female'),('Harrison','male'),('Hasad','male'),('Hashim','male'),('Haviva','female'),('Hayden','male'),('Hayes','male'),('Hayfa','female'),('Hayley','female'),('Heather','female'),('Hector','male'),('Hedda','female'),('Hedley','male'),('Hedwig','female'),('Hedy','female'),('Heidi','female'),('Helen','female'),('Henry','male'),('Herman','male'),('Hermione','female'),('Herrod','male'),('Hilary','female'),('Hilda','female'),('Hilel','male'),('Hillary','female'),('Hiram','male'),('Hiroko','female'),('Hollee','female'),('Holly','female'),('Holmes','male'),('Honorato','male'),('Hop','male'),('Hope','female'),('Howard','male'),('Hoyt','male'),('Hu','male'),('Hunter','male'),('Hyacinth','female'),('Hyatt','male'),('Ian','male'),('Idola','female'),('Idona','female'),('Ifeoma','female'),('Ignacia','female'),('Ignatius','male'),('Igor','male'),('Ila','female'),('Iliana','female'),('Illana','female'),('Illiana','female'),('Ima','female'),('Imani','female'),('Imelda','female'),('Imogene','female'),('Ina','female'),('India','female'),('Indigo','female'),('Indira','female'),('Inez','female'),('Inga','female'),('Ingrid','female'),('Iola','female'),('Iona','female'),('Ira','male'),('Irene','female'),('Iris','female'),('Irma','female'),('Isaac','male'),('Isabella','female'),('Isabelle','female'),('Isadora','female'),('Isaiah','male'),('Ishmael','male'),('Ivan','male'),('Ivana','female'),('Ivor','male'),('Ivory','female'),('Ivy','female'),('Jack','male'),('Jackson','male'),('Jacob','male'),('Jada','female'),('Jade','female'),('Jaden','female'),('Jael','female'),('Jaime','female'),('Jakeem','male'),('Jamal','male'),('Jamalia','female'),('James','male'),('Jameson','male'),('Jana','female'),('Jane','female'),('Janna','female'),('Jaquelyn','female'),('Jared','male'),('Jarrod','male'),('Jasmine','female'),('Jason','male'),('Jasper','male'),('Jayme','female'),('Jeanette','female'),('Jelani','male'),('Jemima','female'),('Jena','female'),('Jenette','female'),('Jenna','female'),('Jennifer','female'),('Jeremy','male'),('Jermaine','male'),('Jerome','male'),('Jerry','male'),('Jescie','female'),('Jessamine','female'),('Jesse','male'),('Jessica','female'),('Jillian','female'),('Jin','male'),('Joan','female'),('Jocelyn','female'),('Joel','male'),('Joelle','female'),('John','male'),('Jolene','female'),('Jolie','female'),('Jonah','male'),('Jonas','male'),('Jordan','female'),('Jordan','male'),('Jorden','female'),('Joseph','male'),('Josephine','female'),('Joshua','male'),('Josiah','male'),('Joy','female'),('Judah','male'),('Judith','female'),('Julian','male'),('Julie','female'),('Juliet','female'),('Justin','male'),('Justina','female'),('Justine','female'),('Kadeem','male'),('Kaden','both'),('Kai','female'),('Kaitlin','female'),('Kalia','female'),('Kamal','male'),('Kameko','female'),('Kane','male'),('Kareem','male'),('Karen','female'),('Karina','female'),('Karleigh','female'),('Karly','female'),('Karyn','female'),('Kaseem','male'),('Kasimir','male'),('Kasper','male'),('Katell','female'),('Katelyn','female'),('Kathleen','female'),('Kato','male'),('Kay','female'),('Kaye','female'),('Keane','male'),('Keaton','male'),('Keefe','male'),('Keegan','male'),('Keelie','female'),('Keely','female'),('Keiko','female'),('Keith','male'),('Kellie','female'),('Kelly','female'),('Kelly','male'),('Kelsey','female'),('Kelsie','female'),('Kendall','both'),('Kennan','male'),('Kennedy','male'),('Kenneth','male'),('Kenyon','male'),('Kermit','male'),('Kerry','female'),('Kessie','female'),('Kevin','male'),('Kevyn','female'),('Kiara','female'),('Kiayada','female'),('Kibo','male'),('Kieran','male'),('Kim','female'),('Kimberley','female'),('Kimberly','female'),('Kiona','female'),('Kirby','female'),('Kirestin','female'),('Kirk','male'),('Kirsten','female'),('Kitra','female'),('Knox','male'),('Kristen','female'),('Kuame','male'),('Kyla','female'),('Kylan','female'),('Kyle','male'),('Kylee','female'),('Kylie','female'),('Kylynn','female'),('Kyra','female'),('Lacey','female'),('Lacota','female'),('Lacy','female'),('Lael','female'),('Laith','male'),('Lamar','male'),('Lana','female'),('Lance','male'),('Lane','male'),('Lani','female'),('Lara','female'),('Lareina','female'),('Larissa','female'),('Lars','male'),('Latifah','female'),('Laura','female'),('Laurel','female'),('Lavinia','female'),('Lawrence','male'),('Leah','female'),('Leandra','female'),('Lee','female'),('Lee','male'),('Leigh','female'),('Leila','female'),('Leilani','female'),('Len','male'),('Lenore','female'),('Leo','male'),('Leonard','male'),('Leroy','male'),('Lesley','female'),('Leslie','female'),('Lester','male'),('Lev','male'),('Levi','male'),('Lewis','male'),('Libby','female'),('Liberty','female'),('Lila','female'),('Lilah','female'),('Lillian','female'),('Lillith','female'),('Linda','female'),('Linus','male'),('Lionel','male'),('Lisandra','female'),('Logan','male'),('Lois','female'),('Louis','male'),('Lucas','male'),('Lucian','male'),('Lucius','male'),('Lucy','female'),('Luke','male'),('Lunea','female'),('Lydia','female'),('Lyle','male'),('Lynn','female'),('Lysandra','female'),('MacKensie','female'),('MacKenzie','female'),('Macaulay','male'),('Macey','female'),('Macon','male'),('Macy','female'),('Madaline','female'),('Madeline','female'),('Madeson','female'),('Madison','female'),('Madonna','female'),('Magee','male'),('Maggie','female'),('Maggy','female'),('Maia','female'),('Maile','female'),('Maisie','female'),('Maite','female'),('Malachi','male'),('Malcolm','male'),('Malik','male'),('Mallory','female'),('Mannix','male'),('Mara','female'),('Marah','female'),('Marcia','female'),('Margaret','female'),('Mari','female'),('Mariam','female'),('Mariko','female'),('Maris','female'),('Mark','male'),('Marny','female'),('Marsden','male'),('Marshall','male'),('Martena','female'),('Martha','female'),('Martin','male'),('Martina','female'),('Marvin','male'),('Mary','female'),('Maryam','female'),('Mason','male'),('Matthew','male'),('Maxine','female'),('Maxwell','male'),('May','female'),('Maya','female'),('McKenzie','female'),('Mechelle','female'),('Medge','female'),('Megan','female'),('Meghan','female'),('Melanie','female'),('Melinda','female'),('Melissa','female'),('Melodie','female'),('Melvin','male'),('Melyssa','female'),('Mercedes','female'),('Meredith','female'),('Merrill','male'),('Merritt','male'),('Mia','female'),('Micah','male'),('Michael','male'),('Michelle','female'),('Mikayla','female'),('Minerva','female'),('Mira','female'),('Miranda','female'),('Miriam','female'),('Moana','female'),('Mohammad','male'),('Mollie','female'),('Molly','female'),('Mona','female'),('Montana','female'),('Morgan','female'),('Moses','male'),('Mufutau','male'),('Murphy','male'),('Myles','male'),('Myra','female'),('Nadine','female'),('Naida','female'),('Naomi','female'),('Nash','male'),('Nasim','male'),('Natalie','female'),('Nathan','male'),('Nathaniel','male'),('Nayda','female'),('Nehru','male'),('Neil','male'),('Nell','female'),('Nelle','female'),('Nerea','female'),('Nero','male'),('Nevada','female'),('Neve','female'),('Neville','male'),('Nicholas','male'),('Nichole','female'),('Nicole','female'),('Nigel','male'),('Nina','female'),('Nissim','male'),('Nita','female'),('Noah','male'),('Noble','male'),('Noel','female'),('Noelani','female'),('Noelle','female'),('Nola','female'),('Nolan','male'),('Nomlanga','female'),('Nora','female'),('Norman','male'),('Nyssa','female'),('Ocean','female'),('Octavia','female'),('Octavius','male'),('Odessa','female'),('Odette','female'),('Odysseus','male'),('Oleg','male'),('Olga','female'),('Oliver','male'),('Olivia','female'),('Olympia','female'),('Omar','male'),('Oprah','female'),('Ora','female'),('Oren','male'),('Ori','female'),('Orla','female'),('Orlando','male'),('Orli','female'),('Orson','male'),('Oscar','male'),('Otto','male'),('Owen','male'),('Paki','male'),('Palmer','male'),('Paloma','female'),('Pamela','female'),('Pandora','female'),('Pascale','female'),('Patience','female'),('Patricia','female'),('Patrick','male'),('Paul','male'),('Paula','female'),('Pearl','female'),('Penelope','female'),('Perry','male'),('Peter','male'),('Petra','female'),('Phelan','male'),('Philip','male'),('Phillip','male'),('Phoebe','female'),('Phyllis','female'),('Piper','female'),('Plato','male'),('Porter','male'),('Portia','female'),('Prescott','male'),('Preston','male'),('Price','male'),('Priscilla','female'),('Quail','female'),('Quamar','male'),('Quemby','female'),('Quentin','male'),('Quin','female'),('Quincy','both'),('Quinlan','male'),('Quinn','female'),('Quinn','male'),('Quintessa','female'),('Quon','female'),('Quyn','female'),('Quynn','female'),('Rachel','female'),('Rae','female'),('Rafael','male'),('Rahim','male'),('Raja','male'),('Rajah','male'),('Ralph','male'),('Rama','female'),('Ramona','female'),('Rana','female'),('Randall','male'),('Raphael','male'),('Rashad','male'),('Raven','female'),('Ray','male'),('Raya','female'),('Raymond','male'),('Reagan','female'),('Rebecca','female'),('Rebekah','female'),('Reece','male'),('Reed','male'),('Reese','male'),('Regan','female'),('Regina','female'),('Remedios','female'),('Renee','female'),('Reuben','male'),('Rhea','female'),('Rhiannon','female'),('Rhoda','female'),('Rhona','female'),('Rhonda','female'),('Ria','female'),('Richard','male'),('Rigel','male'),('Riley','female'),('Rina','female'),('Rinah','female'),('Risa','female'),('Roanna','female'),('Roary','female'),('Robert','male'),('Robin','female'),('Rogan','male'),('Ronan','male'),('Rooney','male'),('Rosalyn','female'),('Rose','female'),('Ross','male'),('Roth','male'),('Rowan','female'),('Ruby','female'),('Rudyard','male'),('Russell','male'),('Ruth','female'),('Ryan','male'),('Ryder','male'),('Rylee','female'),('Sacha','female'),('Sade','female'),('Sage','female'),('Salvador','male'),('Samantha','female'),('Samson','male'),('Samuel','male'),('Sandra','female'),('Sara','female'),('Sarah','female'),('Sasha','female'),('Savannah','female'),('Sawyer','male'),('Scarlet','female'),('Scarlett','female'),('Scott','male'),('Sean','male'),('Sebastian','male'),('Selma','female'),('September','female'),('Serena','female'),('Serina','female'),('Seth','male'),('Shad','male'),('Shaeleigh','female'),('Shafira','female'),('Shaine','female'),('Shana','female'),('Shannon','female'),('Sharon','female'),('Shay','female'),('Shea','female'),('Sheila','female'),('Shelby','female'),('Shelley','female'),('Shellie','female'),('Shelly','female'),('Shoshana','female'),('Sierra','female'),('Signe','female'),('Sigourney','female'),('Silas','male'),('Simon','male'),('Simone','female'),('Skyler','female'),('Slade','male'),('Sloane','both'),('Solomon','male'),('Sonia','female'),('Sonya','female'),('Sophia','female'),('Sopoline','female'),('Stacey','female'),('Stacy','female'),('Steel','male'),('Stella','female'),('Stephanie','female'),('Stephen','male'),('Steven','male'),('Stewart','male'),('Stone','male'),('Stuart','male'),('Suki','female'),('Summer','female'),('Susan','female'),('Sybil','female'),('Sybill','female'),('Sydnee','female'),('Sydney','female'),('Sylvester','male'),('Sylvia','female'),('TaShya','female'),('Tad','male'),('Tallulah','female'),('Talon','male'),('Tamara','female'),('Tamekah','female'),('Tana','female'),('Tanek','male'),('Tanisha','female'),('Tanner','male'),('Tanya','female'),('Tara','female'),('Tarik','male'),('Tasha','female'),('Tashya','female'),('Tate','male'),('Tatiana','female'),('Tatum','female'),('Tatyana','female'),('Taylor','both'),('Teagan','female'),('Teegan','female'),('Thaddeus','male'),('Thane','male'),('Theodore','male'),('Thomas','male'),('Thor','male'),('Tiger','male'),('Timon','male'),('Timothy','male'),('Tobias','male'),('Todd','male'),('Travis','male'),('Trevor','male'),('Troy','male'),('Tucker','male'),('Tyler','male'),('Tyrone','male'),('Ulla','female'),('Ulric','male'),('Ulysses','male'),('Uma','female'),('Unity','female'),('Upton','male'),('Uriah','male'),('Uriel','male'),('Urielle','female'),('Ursa','female'),('Ursula','female'),('Uta','female'),('Valentine','male'),('Vance','male'),('Vanna','female'),('Vaughan','male'),('Veda','female'),('Velma','female'),('Venus','female'),('Vera','female'),('Vernon','male'),('Veronica','female'),('Victor','male'),('Victoria','female'),('Vielka','female'),('Vincent','male'),('Violet','female'),('Virginia','female'),('Vivian','female'),('Vivien','female'),('Vladimir','male'),('Wade','male'),('Walker','male'),('Wallace','male'),('Walter','male'),('Wanda','female'),('Wang','male'),('Warren','male'),('Wayne','male'),('Wendy','female'),('Wesley','male'),('Whilemina','female'),('Whitney','female'),('Whoopi','female'),('Willa','female'),('William','male'),('Willow','female'),('Wilma','female'),('Wing','male'),('Winifred','female'),('Winter','female'),('Wyatt','male'),('Wylie','male'),('Wynne','female'),('Wynter','female'),('Wyoming','female'),('Xander','male'),('Xandra','female'),('Xantha','female'),('Xanthus','male'),('Xavier','male'),('Xaviera','female'),('Xena','female'),('Xenos','male'),('Xerxes','both'),('Xyla','female'),('Yael','female'),('Yardley','male'),('Yasir','male'),('Yen','female'),('Yeo','female'),('Yetta','female'),('Yoko','female'),('Yolanda','female'),('Yoshi','female'),('Yoshio','male'),('Yuli','male'),('Yuri','female'),('Yvette','female'),('Yvonne','female'),('Zachary','male'),('Zachery','male'),('Zahir','male'),('Zane','male'),('Zelda','female'),('Zelenia','female'),('Zena','female'),('Zenaida','female'),('Zenia','female'),('Zeph','male'),('Zephania','male'),('Zephr','female'),('Zeus','male'),('Zia','female'),('Zoe','female'),('Zorita','female'),('Jacqueline','female')
-		";
-		$queries[] = "
-			CREATE TABLE {$prefix}last_names (
-				id mediumint(9) NOT NULL auto_increment,
-				last_name varchar(100) NOT NULL default '',
-				PRIMARY KEY (id)
-			)
-		";
-		$queries[] = "
-			INSERT INTO {$prefix}last_names (last_name)
-			VALUES ('Abbott'),('Acevedo'),('Acosta'),('Adams'),('Adkins'),('Aguilar'),('Aguirre'),('Albert'),('Alexander'),('Alford'),('Allen'),('Allison'),('Alston'),('Alvarado'),('Alvarez'),('Anderson'),('Andrews'),('Anthony'),('Armstrong'),('Arnold'),('Ashley'),('Atkins'),('Atkinson'),('Austin'),('Avery'),('Avila'),('Ayala'),('Ayers'),('Bailey'),('Baird'),('Baker'),('Baldwin'),('Ball'),('Ballard'),('Banks'),('Barber'),('Barker'),('Barlow'),('Barnes'),('Barnett'),('Barr'),('Barrera'),('Barrett'),('Barron'),('Barry'),('Bartlett'),('Barton'),('Bass'),('Bates'),('Battle'),('Bauer'),('Baxter'),('Beach'),('Bean'),('Beard'),('Beasley'),('Beck'),('Becker'),('Bell'),('Bender'),('Benjamin'),('Bennett'),('Benson'),('Bentley'),('Benton'),('Berg'),('Berger'),('Bernard'),('Berry'),('Best'),('Bird'),('Bishop'),('Black'),('Blackburn'),('Blackwell'),('Blair'),('Blake'),('Blanchard'),('Blankenship'),('Blevins'),('Bolton'),('Bond'),('Bonner'),('Booker'),('Boone'),('Booth'),('Bowen'),('Bowers'),('Bowman'),('Boyd'),('Boyer'),('Boyle'),('Bradford'),('Bradley'),('Bradshaw'),('Brady'),('Branch'),('Bray'),('Brennan'),('Brewer'),('Bridges'),('Briggs'),('Bright'),('Britt'),('Brock'),('Brooks'),('Brown'),('Browning'),('Bruce'),('Bryan'),('Bryant'),('Buchanan'),('Buck'),('Buckley'),('Buckner'),('Bullock'),('Burch'),('Burgess'),('Burke'),('Burks'),('Burnett'),('Burns'),('Burris'),('Burt'),('Burton'),('Bush'),('Butler'),('Byers'),('Byrd'),('Cabrera'),('Cain'),('Calderon'),('Caldwell'),('Calhoun'),('Callahan'),('Camacho'),('Cameron'),('Campbell'),('Campos'),('Cannon'),('Cantrell'),('Cantu'),('Cardenas'),('Carey'),('Carlson'),('Carney'),('Carpenter'),('Carr'),('Carrillo'),('Carroll'),('Carson'),('Carter'),('Carver'),('Case'),('Casey'),('Cash'),('Castaneda'),('Castillo'),('Castro'),('Cervantes'),('Chambers'),('Chan'),('Chandler'),('Chaney'),('Chang'),('Chapman'),('Charles'),('Chase'),('Chavez'),('Chen'),('Cherry'),('Christensen'),('Christian'),('Church'),('Clark'),('Clarke'),('Clay'),('Clayton'),('Clements'),('Clemons'),('Cleveland'),('Cline'),('Cobb'),('Cochran'),('Coffey'),('Cohen'),('Cole'),('Coleman'),('Collier'),('Collins'),('Colon'),('Combs'),('Compton'),('Conley'),('Conner'),('Conrad'),('Contreras'),('Conway'),('Cook'),('Cooke'),('Cooley'),('Cooper'),('Copeland'),('Cortez'),('Cote'),('Cotton'),('Cox'),('Craft'),('Craig'),('Crane'),('Crawford'),('Crosby'),('Cross'),('Cruz'),('Cummings'),('Cunningham'),('Curry'),('Curtis'),('Dale'),('Dalton'),('Daniel'),('Daniels'),('Daugherty'),('Davenport'),('David'),('Davidson'),('Davis'),('Dawson'),('Day'),('Dean'),('Decker'),('Dejesus'),('Delacruz'),('Delaney'),('Deleon'),('Delgado'),('Dennis'),('Diaz'),('Dickerson'),('Dickson'),('Dillard'),('Dillon'),('Dixon'),('Dodson'),('Dominguez'),('Donaldson'),('Donovan'),('Dorsey'),('Dotson'),('Douglas'),('Downs'),('Doyle'),('Drake'),('Dudley'),('Duffy'),('Duke'),('Duncan'),('Dunlap'),('Dunn'),('Duran'),('Durham'),('Dyer'),('Eaton'),('Edwards'),('Elliott'),('Ellis'),('Ellison'),('Emerson'),('England'),('English'),('Erickson'),('Espinoza'),('Estes'),('Estrada'),('Evans'),('Everett'),('Ewing'),('Farley'),('Farmer'),('Farrell'),('Faulkner'),('Ferguson'),('Fernandez'),('Ferrell'),('Fields'),('Figueroa'),('Finch'),('Finley'),('Fischer'),('Fisher'),('Fitzgerald'),('Fitzpatrick'),('Fleming'),('Fletcher'),('Flores'),('Flowers'),('Floyd'),('Flynn'),('Foley'),('Forbes'),('Ford'),('Foreman'),('Foster'),('Fowler'),('Fox'),('Francis'),('Franco'),('Frank'),('Franklin'),('Franks'),('Frazier'),('Frederick'),('Freeman'),('French'),('Frost'),('Fry'),('Frye'),('Fuentes'),('Fuller'),('Fulton'),('Gaines'),('Gallagher'),('Gallegos'),('Galloway'),('Gamble'),('Garcia'),('Gardner'),('Garner'),('Garrett'),('Garrison'),('Garza'),('Gates'),('Gay'),('Gentry'),('George'),('Gibbs'),('Gibson'),('Gilbert'),('Giles'),('Gill'),('Gillespie'),('Gilliam'),('Gilmore'),('Glass'),('Glenn'),('Glover'),('Goff'),('Golden'),('Gomez'),('Gonzales'),('Gonzalez'),('Good'),('Goodman'),('Goodwin'),('Gordon'),('Gould'),('Graham'),('Grant'),('Graves'),('Gray'),('Green'),('Greene'),('Greer'),('Gregory'),('Griffin'),('Griffith'),('Grimes'),('Gross'),('Guerra'),('Guerrero'),('Guthrie'),('Gutierrez'),('Guy'),('Guzman'),('Hahn'),('Hale'),('Haley'),('Hall'),('Hamilton'),('Hammond'),('Hampton'),('Hancock'),('Haney'),('Hansen'),('Hanson'),('Hardin'),('Harding'),('Hardy'),('Harmon'),('Harper'),('Harrell'),('Harrington'),('Harris'),('Harrison'),('Hart'),('Hartman'),('Harvey'),('Hatfield'),('Hawkins'),('Hayden'),('Hayes'),('Haynes'),('Hays'),('Head'),('Heath'),('Hebert'),('Henderson'),('Hendricks'),('Hendrix'),('Henry'),('Hensley'),('Henson'),('Herman'),('Hernandez'),('Herrera'),('Herring'),('Hess'),('Hester'),('Hewitt'),('Hickman'),('Hicks'),('Higgins'),('Hill'),('Hines'),('Hinton'),('Hobbs'),('Hodge'),('Hodges'),('Hoffman'),('Hogan'),('Holcomb'),('Holden'),('Holder'),('Holland'),('Holloway'),('Holman'),('Holmes'),('Holt'),('Hood'),('Hooper'),('Hoover'),('Hopkins'),('Hopper'),('Horn'),('Horne'),('Horton'),('House'),('Houston'),('Howard'),('Howe'),('Howell'),('Hubbard'),('Huber'),('Hudson'),('Huff'),('Huffman'),('Hughes'),('Hull'),('Humphrey'),('Hunt'),('Hunter'),('Hurley'),('Hurst'),('Hutchinson'),('Hyde'),('Ingram'),('Irwin'),('Jackson'),('Jacobs'),('Jacobson'),('James'),('Jarvis'),('Jefferson'),('Jenkins'),('Jennings'),('Jensen'),('Jimenez'),('Johns'),('Johnson'),('Johnston'),('Jones'),('Jordan'),('Joseph'),('Joyce'),('Joyner'),('Juarez'),('Justice'),('Kane'),('Kaufman'),('Keith'),('Keller'),('Kelley'),('Kelly'),('Kemp'),('Kennedy'),('Kent'),('Kerr'),('Key'),('Kidd'),('Kim'),('King'),('Kinney'),('Kirby'),('Kirk'),('Kirkland'),('Klein'),('Kline'),('Knapp'),('Knight'),('Knowles'),('Knox'),('Koch'),('Kramer'),('Lamb'),('Lambert'),('Lancaster'),('Landry'),('Lane'),('Lang'),('Langley'),('Lara'),('Larsen'),('Larson'),('Lawrence'),('Lawson'),('Le'),('Leach'),('Leblanc'),('Lee'),('Leon'),('Leonard'),('Lester'),('Levine'),('Levy'),('Lewis'),('Lindsay'),('Lindsey'),('Little'),('Livingston'),('Lloyd'),('Logan'),('Long'),('Lopez'),('Lott'),('Love'),('Lowe'),('Lowery'),('Lucas'),('Luna'),('Lynch'),('Lynn'),('Lyons'),('Macdonald'),('Macias'),('Mack'),('Madden'),('Maddox'),('Maldonado'),('Malone'),('Mann'),('Manning'),('Marks'),('Marquez'),('Marsh'),('Marshall'),('Martin'),('Martinez'),('Mason'),('Massey'),('Mathews'),('Mathis'),('Matthews'),('Maxwell'),('May'),('Mayer'),('Maynard'),('Mayo'),('Mays'),('Mcbride'),('Mccall'),('Mccarthy'),('Mccarty'),('Mcclain'),('Mcclure'),('Mcconnell'),('Mccormick'),('Mccoy'),('Mccray'),('Mccullough'),('Mcdaniel'),('Mcdonald'),('Mcdowell'),('Mcfadden'),('Mcfarland'),('Mcgee'),('Mcgowan'),('Mcguire'),('Mcintosh'),('Mcintyre'),('Mckay'),('Mckee'),('Mckenzie'),('Mckinney'),('Mcknight'),('Mclaughlin'),('Mclean'),('Mcleod'),('Mcmahon'),('Mcmillan'),('Mcneil'),('Mcpherson'),('Meadows'),('Medina'),('Mejia'),('Melendez'),('Melton'),('Mendez'),('Mendoza'),('Mercado'),('Mercer'),('Merrill'),('Merritt'),('Meyer'),('Meyers'),('Michael'),('Middleton'),('Miles'),('Miller'),('Mills'),('Miranda'),('Mitchell'),('Molina'),('Monroe'),('Montgomery'),('Montoya'),('Moody'),('Moon'),('Mooney'),('Moore'),('Morales'),('Moran'),('Moreno'),('Morgan'),('Morin'),('Morris'),('Morrison'),('Morrow'),('Morse'),('Morton'),('Moses'),('Mosley'),('Moss'),('Mueller'),('Mullen'),('Mullins'),('Munoz'),('Murphy'),('Murray'),('Myers'),('Nash'),('Navarro'),('Neal'),('Nelson'),('Newman'),('Newton'),('Nguyen'),('Nichols'),('Nicholson'),('Nielsen'),('Nieves'),('Nixon'),('Noble'),('Noel'),('Nolan'),('Norman'),('Norris'),('Norton'),('Nunez'),('Obrien'),('Ochoa'),('Oconnor'),('Odom'),('Odonnell'),('Oliver'),('Olsen'),('Olson'),('Oneal'),('Oneil'),('Oneill'),('Orr'),('Ortega'),('Ortiz'),('Osborn'),('Osborne'),('Owen'),('Owens'),('Pace'),('Pacheco'),('Padilla'),('Page'),('Palmer'),('Park'),('Parker'),('Parks'),('Parrish'),('Parsons'),('Pate'),('Patel'),('Patrick'),('Patterson'),('Patton'),('Paul'),('Payne'),('Pearson'),('Peck'),('Pena'),('Pennington'),('Perez'),('Perkins'),('Perry'),('Peters'),('Petersen'),('Peterson'),('Petty'),('Phelps'),('Phillips'),('Pickett'),('Pierce'),('Pittman'),('Pitts'),('Pollard'),('Poole'),('Pope'),('Porter'),('Potter'),('Potts'),('Powell'),('Powers'),('Pratt'),('Preston'),('Price'),('Prince'),('Pruitt'),('Puckett'),('Pugh'),('Quinn'),('Ramirez'),('Ramos'),('Ramsey'),('Randall'),('Randolph'),('Rasmussen'),('Ratliff'),('Ray'),('Raymond'),('Reed'),('Reese'),('Reeves'),('Reid'),('Reilly'),('Reyes'),('Reynolds'),('Rhodes'),('Rice'),('Rich'),('Richard'),('Richards'),('Richardson'),('Richmond'),('Riddle'),('Riggs'),('Riley'),('Rios'),('Rivas'),('Rivera'),('Rivers'),('Roach'),('Robbins'),('Roberson'),('Roberts'),('Robertson'),('Robinson'),('Robles'),('Rocha'),('Rodgers'),('Rodriguez'),('Rodriquez'),('Rogers'),('Rojas'),('Rollins'),('Roman'),('Romero'),('Rosa'),('Rosales'),('Rosario'),('Rose'),('Ross'),('Roth'),('Rowe'),('Rowland'),('Roy'),('Ruiz'),('Rush'),('Russell'),('Russo'),('Rutledge'),('Ryan'),('Salas'),('Salazar'),('Salinas'),('Sampson'),('Sanchez'),('Sanders'),('Sandoval'),('Sanford'),('Santana'),('Santiago'),('Santos'),('Sargent'),('Saunders'),('Savage'),('Sawyer'),('Schmidt'),('Schneider'),('Schroeder'),('Schultz'),('Schwartz'),('Scott'),('Sears'),('Sellers'),('Serrano'),('Sexton'),('Shaffer'),('Shannon'),('Sharp'),('Sharpe'),('Shaw'),('Shelton'),('Shepard'),('Shepherd'),('Sheppard'),('Sherman'),('Shields'),('Short'),('Silva'),('Simmons'),('Simon'),('Simpson'),('Sims'),('Singleton'),('Skinner'),('Slater'),('Sloan'),('Small'),('Smith'),('Snider'),('Snow'),('Snyder'),('Solis'),('Solomon'),('Sosa'),('Soto'),('Sparks'),('Spears'),('Spence'),('Spencer'),('Stafford'),('Stanley'),('Stanton'),('Stark'),('Steele'),('Stein'),('Stephens'),('Stephenson'),('Stevens'),('Stevenson'),('Stewart'),('Stokes'),('Stone'),('Stout'),('Strickland'),('Strong'),('Stuart'),('Suarez'),('Sullivan'),('Summers'),('Sutton'),('Swanson'),('Sweeney'),('Sweet'),('Sykes'),('Talley'),('Tanner'),('Tate'),('Taylor'),('Terrell'),('Terry'),('Thomas'),('Thompson'),('Thornton'),('Tillman'),('Todd'),('Torres'),('Townsend'),('Tran'),('Travis'),('Trevino'),('Trujillo'),('Tucker'),('Turner'),('Tyler'),('Tyson'),('Underwood'),('Valdez'),('Valencia'),('Valentine'),('Valenzuela'),('Vance'),('Vang'),('Vargas'),('Vasquez'),('Vaughan'),('Vaughn'),('Vazquez'),('Vega'),('Velasquez'),('Velazquez'),('Velez'),('Villarreal'),('Vincent'),('Vinson'),('Wade'),('Wagner'),('Walker'),('Wall'),('Wallace'),('Waller'),('Walls'),('Walsh'),('Walter'),('Walters'),('Walton'),('Ward'),('Ware'),('Warner'),('Warren'),('Washington'),('Waters'),('Watkins'),('Watson'),('Watts'),('Weaver'),('Webb'),('Weber'),('Webster'),('Weeks'),('Weiss'),('Welch'),('Wells'),('West'),('Wheeler'),('Whitaker'),('White'),('Whitehead'),('Whitfield'),('Whitley'),('Whitney'),('Wiggins'),('Wilcox'),('Wilder'),('Wiley'),('Wilkerson'),('Wilkins'),('Wilkinson'),('William'),('Williams'),('Williamson'),('Willis'),('Wilson'),('Winters'),('Wise'),('Witt'),('Wolf'),('Wolfe'),('Wong'),('Wood'),('Woodard'),('Woods'),('Woodward'),('Wooten'),('Workman'),('Wright'),('Wyatt'),('Wynn'),('Yang'),('Yates'),('York'),('Young'),('Zamora'),('Zimmerman')
-		";
-
-		$response = Core::$db->query($queries, $rollbackQueries);
-
-		if ($response["success"]) {
-			return array(true, "");
-		} else {
-			return array(false, $response["errorMessage"]);
-		}
-	}
-
-
-	public function getHelpHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-
-		$content =<<<EOF
-	<p>
-		{$this->L["help_intro"]}
-	</p>
-
-	<table cellpadding="0" cellspacing="1">
-	<tr>
-		<td width="100"><h4>Name</h4></td>
-		<td>{$this->L["type_Name"]}</td>
-	</tr>
-	<tr>
-		<td><h4>MaleName</h4></td>
-		<td>{$this->L["type_MaleName"]}</td>
-	</tr>
-	<tr>
-		<td><h4>FemaleName</h4></td>
-		<td>{$this->L["type_FemaleName"]}</td>
-	</tr>
-	<tr>
-		<td><h4>Initial</h4></td>
-		<td>{$this->L["type_Initial"]}</td>
-	</tr>
-	<tr>
-		<td><h4>Surname</h4></td>
-		<td>{$this->L["type_Surname"]}</td>
-	</tr>
-	</table>
-EOF;
-
-		return $content;
-	}
-}
diff --git a/plugins/dataTypes/NamesRegional/NamesRegional.js b/plugins/dataTypes/NamesRegional/NamesRegional.js
deleted file mode 100644
index 493175fee..000000000
--- a/plugins/dataTypes/NamesRegional/NamesRegional.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	var MODULE_ID = "data-type-NamesRegional";
-	var LANG = L.dataTypePlugins.NamesRegional;
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.DATA_TABLE.ROW.EXAMPLE_CHANGE + "__" + MODULE_ID] = _exampleChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _exampleChange = function(msg) {
-		$("#dtOption_" + msg.rowID).val(msg.value);
-	};
-
-	/**
-	 * Called when the user submits the form to generate some data. If the selected data set contains
-	 * one or more rows of this data type, this function is called with the list of row numbers. Note that
-	 * the row numbers passed are the *original* row numbers of the rows on creation. It's possible that the
-	 * user has re-sorted or deleted some rows. So to get the visible row number for a row, call
-	 * gen._getVisibleRowOrderByRowNum(row)
-	 */
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-		for (var i=0; i<rows.length; i++) {
-			if ($("#dtOption_" + rows[i]).val() === "") {
-				var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-				visibleProblemRows.push(visibleRowNum);
-				problemFields.push($("#dtOption_" + rows[i]));
-			}
-		}
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-	/**
-	 * Called when the user saves a form. This function is passed the row number of the row to
-	 * save. It should return a JSON object (of whatever structure is relevant).
-	 */
-	var _saveRow = function(rowNum) {
-		return {
-			"example": $("#dtExample_" + rowNum).val(),
-			"option":  $("#dtOption_" + rowNum).val()
-		};
-	};
-
-	/**
-	 * Called when a form is loaded that contains this data type. This is passed the row number and
-	 * the custom data type data to populate the fields. loadRow functions all must return an array
-	 * with two indexes - both functions:
-	 *  [0] code to execute (generally inserting data into fields)
-	 *  [1] a boolean test to determine WHEN the content has been inserted.
-	 */
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() { },
-			isComplete: function() {
-				if ($("#dtOption_" + rowNum).length) {
-					$("#dtExample_" + rowNum).val(data.example);
-					$("#dtOption_" + rowNum).val(data.option);
-					return true;
-				} else {
-					return false;
-				}
-			}
-		};
-	};
-
-
-	// register our module
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		validate: _validate,
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/NamesRegional/lang/de.php b/plugins/dataTypes/NamesRegional/lang/de.php
deleted file mode 100644
index 33c95ef06..000000000
--- a/plugins/dataTypes/NamesRegional/lang/de.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Namen";
-
-// Category: Lang Strings
-$L["example_FemaleName"] = "Jane (Female Name)";
-$L["example_FemaleName_Surname"] = "Jane Smith";
-$L["example_MaleName"] = "John (männlich Name)";
-$L["example_MaleName_Surname"] = "John Smith";
-$L["example_Name"] = "Alex (geschlechtsspezifische)";
-$L["example_Name4"] = "Jenny, Toby, Ben, Peter";
-$L["example_Name_Initial_Surname"] = "Alex J. Smith";
-$L["example_Name_Surname"] = "Alex Smith";
-$L["example_Surname_Name_Initial"] = "Smith, John P.";
-$L["example_fullnames"] = "Alex Smith oder Alex J. Smith";
-$L["example_surname"] = "Smith (Familienname)";
-$L["help_intro"] = "Dieser Datentyp zufällig generiert menschlichen Namen (meist Western) nach dem Format, das Sie angeben. Zeichen (|) können Sie mehrere Formate, indem Sie sie mit dem Rohr geben. Die folgenden Zeichenfolgen werden auf die zufälligen Namen umgerechnet werden:";
-$L["incomplete_fields"] = "Der Name Datentyp haben muss das Format eingetragen im Options Textfeld. Bitte beheben Sie die folgenden Zeilen:";
-$L["name"] = "Name";
-$L["type_FemaleName"] = "Ein weiblicher Vorname.";
-$L["type_Initial"] = "Ein Großbuchstaben, AZ.";
-$L["type_MaleName"] = "Ein männlicher Vorname.";
-$L["type_Name"] = "Ein Vorname, männlich oder weiblich.";
-$L["type_Surname"] = "Eine zufällige Nachnamen.";
diff --git a/plugins/dataTypes/NamesRegional/lang/en.php b/plugins/dataTypes/NamesRegional/lang/en.php
deleted file mode 100644
index 87887d37b..000000000
--- a/plugins/dataTypes/NamesRegional/lang/en.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Names, Regional";
-
-$L["help_intro"] = "This data type randomly generates names. It works in the same way as the <b>Names</b> data type, except that it creates slightly more realistic data sets since the names are mapped to the country; e.g. Italian names appear when the data set row has Italy for the country field. Because of this additional complexity, however, the code runs slightly slower. You can specify multiple formats by separating them with the pipe (|) character. The following strings will be converted to their random name equivalent:";
-$L["incomplete_fields"] = "The Name data type needs to have the format entered in the Options text field. Please fix the following rows:";
-$L["name"] = "Name";
-$L["example_FemaleName"] = "Jane (Female Name)";
-$L["example_FemaleName_Surname"] = "Jane Smith";
-$L["example_MaleName"] = "John (Male Name)";
-$L["example_MaleName_Surname"] = "John Smith";
-$L["example_Name"] = "Alex (any gender)";
-$L["example_Name4"] = "Jenny, Toby, Ben, Peter";
-$L["example_Name_Initial_Surname"] = "Alex J. Smith";
-$L["example_Name_Surname"] = "Alex Smith";
-$L["example_Surname_Name_Initial"] = "Smith, John P.";
-$L["example_fullnames"] = "Alex Smith or Alex J. Smith";
-$L["example_surname"] = "Smith (surname)";
-$L["type_FemaleName"] = "A female first name.";
-$L["type_Initial"] = "An upper-case letter, A-Z.";
-$L["type_MaleName"] = "A male first name.";
-$L["type_Name"] = "A first name, male or female.";
-$L["type_Surname"] = "A random surname.";
diff --git a/plugins/dataTypes/NamesRegional/lang/es.php b/plugins/dataTypes/NamesRegional/lang/es.php
deleted file mode 100644
index 9d8d08535..000000000
--- a/plugins/dataTypes/NamesRegional/lang/es.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Nombres";
-
-$L["help_intro"] = "Este tipo de dato genera aleatoriamente nombres de persona (mayoritariamente occidentales) de acuerdo al formato que especifiques. Pues especificar múltiples formatos separándolos con el carácter tubería, |. Las siguientes cadenas serán convertidas a su nombre aleatorio equivalente:";
-$L["incomplete_fields"] = "The Name data type needs to have the format entered in the Options text field. Please fix the following rows:";
-$L["name"] = "Nombre";
-$L["example_FemaleName"] = "Jane (Nombre de mujer)";
-$L["example_FemaleName_Surname"] = "Jane Smith";
-$L["example_MaleName"] = "John (Nombre de hombre)";
-$L["example_MaleName_Surname"] = "John Smith";
-$L["example_Name"] = "Alex (cualquier sexo)";
-$L["example_Name4"] = "Jenny, Toby, Ben, Peter";
-$L["example_Name_Initial_Surname"] = "Alex J. Smith";
-$L["example_Name_Surname"] = "Alex Smith";
-$L["example_Surname_Name_Initial"] = "Smith, John P.";
-$L["example_fullnames"] = "Alex Smith o Alex J. Smith";
-$L["example_surname"] = "Smith (apellido)";
-$L["type_FemaleName"] = "Un nombre de mujer.";
-$L["type_Initial"] = "Una letra mayúscula, A-Z.";
-$L["type_MaleName"] = "Un nombre de hombre.";
-$L["type_Name"] = "Un nombre, de hombre o mujer.";
-$L["type_Surname"] = "Un apellido aleatorio.";
diff --git a/plugins/dataTypes/NamesRegional/lang/fr.php b/plugins/dataTypes/NamesRegional/lang/fr.php
deleted file mode 100644
index a68a759db..000000000
--- a/plugins/dataTypes/NamesRegional/lang/fr.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Noms régionaux";
-
-$L["example_FemaleName"] = "Jane (prénom féminin)";
-$L["example_FemaleName_Surname"] = "Jane Smith (nom complet féminin)";
-$L["example_MaleName"] = "John (prénom masculin)";
-$L["example_MaleName_Surname"] = "John Smith (nom complet masculin)";
-$L["example_Name"] = "Alex (prénom masculin ou féminin)";
-$L["example_Name4"] = "Jenny, Toby, Ben, Peter";
-$L["example_Name_Initial_Surname"] = "Alex J. Smith";
-$L["example_Name_Surname"] = "Alex Smith";
-$L["example_Surname_Name_Initial"] = "Smith, John P.";
-$L["example_fullnames"] = "Alex Smith ou Alex J. Smith";
-$L["example_surname"] = "Smith (nom de famille)";
-$L["help_intro"] = "Ce type de données génère aléatoirement des noms. Il fonctionne comme le type de données <b>Noms</b>, à l'exception du fait qu'il génère des noms plus réalistes en fonction des pays précisés. Par exemple des noms italiens seront générés si le pays Italie est sélectionné dans le champs 'Pays'. A cause de cette difficulté supplémentaire le script risque de fonctionner un peut plus lentement. Vous pouvez spécifier les formats multiples en les séparant par le caractère pipe (|). Les chaînes suivantes seront converties en leur équivalent aléatoire:";
-$L["incomplete_fields"] = "Le type de données Nom doit avoir un format précisé dans le champ de texte Options. Corrigez les lignes suivantes:";
-$L["name"] = "Nom";
-$L["type_FemaleName"] = "Un prénom féminin.";
-$L["type_Initial"] = "Une lettre majuscule, AZ.";
-$L["type_MaleName"] = "Un prénom masculin.";
-$L["type_Name"] = "Un prénom majuscule ou féminin.";
-$L["type_Surname"] = "Un nom aléatoire.";
\ No newline at end of file
diff --git a/plugins/dataTypes/NamesRegional/lang/nl.php b/plugins/dataTypes/NamesRegional/lang/nl.php
deleted file mode 100644
index 578e0cf7d..000000000
--- a/plugins/dataTypes/NamesRegional/lang/nl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Des noms";
-
-$L["example_FemaleName"] = "Jane (nom féminin)";
-$L["example_FemaleName_Surname"] = "Jane Smith";
-$L["example_MaleName"] = "John (nom masculin)";
-$L["example_MaleName_Surname"] = "John Smith";
-$L["example_Name"] = "Alex (tout genre)";
-$L["example_Name4"] = "Jenny, Toby, Ben, Peter";
-$L["example_Name_Initial_Surname"] = "Alex J. Smith";
-$L["example_Name_Surname"] = "Alex Smith";
-$L["example_Surname_Name_Initial"] = "Smith, John P.";
-$L["example_fullnames"] = "Alex Smith ou Alex J. Smith";
-$L["example_surname"] = "Smith (nom de famille)";
-$L["help_intro"] = "Ce type de données génère aléatoirement des noms humains (principalement occidentale) en fonction du format que vous spécifiez. Vous pouvez spécifier les formats multiples en les séparant par le pipe (|) caractère. Les chaînes suivantes seront converties en leur équivalent nom aléatoire:";
-$L["incomplete_fields"] = "Le type de données Nom doit avoir le format entré dans le champ de texte Options. S'il vous plaît corriger les lignes suivantes:";
-$L["name"] = "Nom";
-$L["type_FemaleName"] = "Un prénom féminin.";
-$L["type_Initial"] = "Une lettre majuscule, AZ.";
-$L["type_MaleName"] = "Un prénom masculin.";
-$L["type_Name"] = "Un prénom, mâle ou femelle.";
-$L["type_Surname"] = "Un nom aléatoire.";
\ No newline at end of file
diff --git a/plugins/dataTypes/NormalDistribution/NormalDistribution.class.php b/plugins/dataTypes/NormalDistribution/NormalDistribution.class.php
deleted file mode 100644
index 7284796bd..000000000
--- a/plugins/dataTypes/NormalDistribution/NormalDistribution.class.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package DataTypes
- */
-class DataType_NormalDistribution extends DataTypePlugin {
-
-	/**#@+
-     * @access protected
-     */
-	protected $isEnabled = true;
-	protected $dataTypeName = "Standard Normal Distribution";
-	protected $dataTypeFieldGroup = "math";
-	protected $dataTypeFieldGroupOrder = 10;
-	protected $jsModules = array("NormalDistribution.js");
-	protected $randMax = null;
-
-
-	public function generate($generator, $generationContextData) {
-		$mean   = (float) $generationContextData["generationOptions"]["mean"];
-		$stddev = (float) $generationContextData["generationOptions"]["stddev"];
-
-		return array(
-			"display" => $this->gauss_ms($mean, $stddev)
-		);
-	}
-
-
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		if ((empty($postdata["dtOptionMean_$colNum"]) && $postdata["dtOptionMean_$colNum"] !== "0") ||
-			(empty($postdata["dtOptionSigma_$colNum"]) && $postdata["dtOptionSigma_$colNum"] !== "0")) {
-			return false;
-		}
-		$this->randMax = (float) getrandmax();
-
-		return array(
-			"mean"   => $postdata["dtOptionMean_$colNum"],
-			"stddev" => $postdata["dtOptionSigma_$colNum"]
-		);
-	}
-
-	public function getOptionsColumnHTML() {
-		$options =<<< END
-			<label for="dtOptionMean_%ROW%">{$this->L["mean"]}</label>
-				<input type="text" name="dtOptionMean_%ROW%" id="dtOptionMean_%ROW%" style="width: 30px" value="0" />
-			<label for="dtOptionSigma_%ROW%">{$this->L["standard_deviation"]}</label>
-				<input type="text" name="dtOptionSigma_%ROW%" id="dtOptionSigma_%ROW%" style="width: 30px" value="1" />
-END;
-
-		return $options;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(100)"
-		);
-	}
-
-	//  returns random number using mt_rand() with a flat distribution from -1 to 1 inclusive
-	public function random_PN() {
-		return (2.0 * $this->random_0_1()) - 1.0;
-	}
-
-	public function random_0_1() {
-		return (float) mt_rand() / (float) mt_getrandmax() ;
-	}
-
-	public function gauss() {
-		static $useExists = false;
-		static $useValue;
-
-		if ($useExists) {
-			//  Use value from a previous call to this function
-			$useExists = false;
-			return $useValue;
-		} else {
-			//  Polar form of the Box-Muller transformation
-			$w = 2.0 ;
-			while (($w >= 1.0) || ($w == 0.0)) {
-				$x = $this->random_PN();
-				$y = $this->random_PN();
-				$w = ($x * $x) + ($y * $y);
-			}
-			$w = sqrt((-2.0 * log($w)) / $w);
-
-			//  Set value for next call to this function
-			$useValue = $y * $w;
-			$useExists = true;
-
-			return $x * $w;
-		}
-	}
-
-	public function gauss_ms($mean, $stddev) {
-		//  Adjust our gaussian random to fit the mean and standard deviation
-		//  The division by 4 is an arbitrary value to help fit the distribution
-		//      within our required range, and gives a best fit for $stddev = 1.0
-		return $this->gauss() * ($stddev / 4) + $mean;
-	}
-}
\ No newline at end of file
diff --git a/plugins/dataTypes/NormalDistribution/NormalDistribution.js b/plugins/dataTypes/NormalDistribution/NormalDistribution.js
deleted file mode 100644
index 9a41ef5fa..000000000
--- a/plugins/dataTypes/NormalDistribution/NormalDistribution.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name NormalDistribution
-	 * @description JS code for the NormalDistribution Data Type.
-	 * @see DataType
-	 * @namespace
-	 */
-
-	var MODULE_ID = "data-type-NormalDistribution";
-	var LANG = L.dataTypePlugins.NormalDistribution;
-	var subscriptions = {};
-
-	var _init = function() {
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			"mean": $("#dtOptionMean_" + rowNum).val(),
-			"sigma": $("#dtOptionSigma_" + rowNum).val()
-		};
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {
-				$("#dtOptionMean_" + rowNum).val(data.mean);
-				$("#dtOptionSigma_" + rowNum).val(data.sigma);
-			},
-			isComplete: function() { return $("#dtOptionSigma_" + rowNum).length > 0; }
-		};
-	};
-
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-		for (var i=0; i<rows.length; i++) {
-			var currMean  = $("#dtOptionMean_" + rows[i]);
-			var currSigma = $("#dtOptionSigma_" + rows[i]);
-
-			var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-			if ($.trim(currMean.val()) === "" || $.trim(currSigma.val()) === "") {
-				visibleProblemRows.push(visibleRowNum);
-
-				if ($.trim(currMean.val()) === "") {
-					problemFields.push(currMean);
-				}
-				if ($.trim(currSigma.val()) === "") {
-					problemFields.push(currSigma);
-				}
-			}
-		}
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		validate: _validate,
-		saveRow: _saveRow,
-		loadRow: _loadRow
-	});
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/NormalDistribution/lang/de.php b/plugins/dataTypes/NormalDistribution/lang/de.php
deleted file mode 100644
index b6edb3620..000000000
--- a/plugins/dataTypes/NormalDistribution/lang/de.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Standardabweichung";
-
-$L["incomplete_fields"] = "Der Mittelwert und Sigma Felder sind für alle Normal Distribution Zeilen erforderlich. Bitte beheben Sie die folgenden Zeilen:";
-$L["mean"] = "Bedeuten";
diff --git a/plugins/dataTypes/NormalDistribution/lang/en.php b/plugins/dataTypes/NormalDistribution/lang/en.php
deleted file mode 100644
index 6805ba8f0..000000000
--- a/plugins/dataTypes/NormalDistribution/lang/en.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Normal Distribution";
-
-$L["mean"] = "Mean";
-$L["standard_deviation"] = "Standard Deviation";
-$L["incomplete_fields"] = "The Mean and Sigma fields are required for all Normal Distribution rows. Please fix the following rows:";
\ No newline at end of file
diff --git a/plugins/dataTypes/NormalDistribution/lang/es.php b/plugins/dataTypes/NormalDistribution/lang/es.php
deleted file mode 100644
index c532159a1..000000000
--- a/plugins/dataTypes/NormalDistribution/lang/es.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Distribución normal";
-
-$L["mean"] = "Media";
-$L["standard_deviation"] = "Desviación estándar";
-$L["incomplete_fields"] = "Los campos Media y Sigma son obligatorios para todas las filas de Distribución normal. Por favor, corrija las siguientes filas:";
diff --git a/plugins/dataTypes/NormalDistribution/lang/fr.php b/plugins/dataTypes/NormalDistribution/lang/fr.php
deleted file mode 100644
index dce4ccfd5..000000000
--- a/plugins/dataTypes/NormalDistribution/lang/fr.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Distribution Normale";
-
-$L["incomplete_fields"] = "Les champs 'Moyenne' et 'Ecart type' sont nécessaires pour toutes les lignes de distribution normale. Corrigez les lignes suivantes:";
-$L["mean"] = "Moyenne";
-$L["standard_deviation"] = "Écart type";
diff --git a/plugins/dataTypes/NormalDistribution/lang/nl.php b/plugins/dataTypes/NormalDistribution/lang/nl.php
deleted file mode 100644
index 743afa92b..000000000
--- a/plugins/dataTypes/NormalDistribution/lang/nl.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Normaal Distributie";
-
-$L["incomplete_fields"] = "Les champs moyens et Sigma sont nécessaires pour toutes les lignes de distribution normale. S'il vous plaît corriger les lignes suivantes:";
-$L["mean"] = "Signifier";
-$L["standard_deviation"] = "Écart type";
diff --git a/plugins/dataTypes/NumberRange/NumberRange.class.php b/plugins/dataTypes/NumberRange/NumberRange.class.php
deleted file mode 100644
index 3de15ef91..000000000
--- a/plugins/dataTypes/NumberRange/NumberRange.class.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_NumberRange extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Number Range";
-	protected $dataTypeFieldGroup = "numeric";
-	protected $dataTypeFieldGroupOrder = 30;
-	protected $jsModules = array("NumberRange.js");
-
-
-	public function generate($generator, $generationContextData) {
-		$options = $generationContextData["generationOptions"];
-		return array(
-			"display" => mt_rand($options["min"], $options["max"])
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $column, $numCols) {
-		if ((empty($postdata["dtNumRangeMin_$column"]) && $postdata["dtNumRangeMin_$column"] !== "0") ||
-			(empty($postdata["dtNumRangeMax_$column"]) && $postdata["dtNumRangeMax_$column"] !== "0")) {
-			return false;
-		}
-		if (!is_numeric($postdata["dtNumRangeMin_$column"]) || !is_numeric($postdata["dtNumRangeMax_$column"])) {
-			return false;
-		}
-		$options = array(
-			"min" => $postdata["dtNumRangeMin_$column"],
-			"max" => $postdata["dtNumRangeMax_$column"]
-		);
-		return $options;
-	}
-
-	public function getOptionsColumnHTML() {
-		$html =<<<END
-&nbsp;{$this->L["between"]} <input type="text" name="dtNumRangeMin_%ROW%" id="dtNumRangeMin_%ROW%" style="width: 30px" value="1" />
-{$this->L["and"]} <input type="text" name="dtNumRangeMax_%ROW%" id="dtNumRangeMax_%ROW%" style="width: 30px" value="10" />
-END;
-		return $html;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"type" => "numeric",
-			"SQLField" => "mediumint default NULL",
-			"SQLField_Oracle" => "varchar2(50) default NULL",
-			"SQLField_MSSQL" => "INTEGER NULL",
-			"SQLField_Postgres" => "integer NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["help"]}</p>";
-	}
-}
diff --git a/plugins/dataTypes/NumberRange/NumberRange.js b/plugins/dataTypes/NumberRange/NumberRange.js
deleted file mode 100755
index 15184c1dd..000000000
--- a/plugins/dataTypes/NumberRange/NumberRange.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*global $:false,define:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	var MODULE_ID = "data-type-NumberRange";
-	var LANG = L.dataTypePlugins.NumberRange;
-
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {
-				$("#dtNumRangeMin_" + rowNum).val(data.rangeMin);
-				$("#dtNumRangeMax_" + rowNum).val(data.rangeMax);
-			},
-			isComplete: function() { return true; }
-		};
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			rangeMin: $("#dtNumRangeMin_" + rowNum).val(),
-			rangeMax: $("#dtNumRangeMax_" + rowNum).val()
-		};
-	};
-
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-
-		var intOnly = /^\d+$/;
-		for (var i=0; i<rows.length; i++) {
-			var numWordsMin = $.trim($("#dtNumRangeMin_" + rows[i]).val());
-			var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-
-			var hasError = false;
-			if (numWordsMin === "" || !intOnly.test(numWordsMin)) {
-				hasError = true;
-				problemFields.push($("#dtNumRangeMin_" + rows[i]));
-			}
-			var numWordsMax = $.trim($("#dtNumRangeMax_" + rows[i]).val());
-			if (numWordsMax === "" || !intOnly.test(numWordsMax)) {
-				hasError = true;
-				problemFields.push($("#dtNumRangeMax_" + rows[i]));
-			}
-			if (hasError) {
-				visibleProblemRows.push(visibleRowNum);
-			}
-		}
-
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-	manager.registerDataType(MODULE_ID, {
-		validate: _validate,
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/NumberRange/lang/de.php b/plugins/dataTypes/NumberRange/lang/de.php
deleted file mode 100644
index 4936b3f7e..000000000
--- a/plugins/dataTypes/NumberRange/lang/de.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Number Range";
-
-$L["and"] = "und";
-$L["between"] = "Zwischen";
-$L["help"] = "Diese zufällig generiert eine Zahl zwischen den Werten, die Sie angeben. Beide Felder können Sie negative Werte eingeben.";
-$L["incomplete_fields"] = "Bitte geben Sie den Zahlenbereich (niedrigster und höchster Zahlen) für die folgenden Zeilen:";
\ No newline at end of file
diff --git a/plugins/dataTypes/NumberRange/lang/en.php b/plugins/dataTypes/NumberRange/lang/en.php
deleted file mode 100644
index dcf0aec2f..000000000
--- a/plugins/dataTypes/NumberRange/lang/en.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Number Range";
-
-$L["and"] = "and";
-$L["between"] = "Between";
-$L["help"] = "This randomly generates a number between the values you specify. Both fields allow you to enter negative numbers.";
-$L["incomplete_fields"] = "Please enter the number range (lowest and highest numbers) for the following rows: ";
\ No newline at end of file
diff --git a/plugins/dataTypes/NumberRange/lang/es.php b/plugins/dataTypes/NumberRange/lang/es.php
deleted file mode 100644
index 50e9c9a3d..000000000
--- a/plugins/dataTypes/NumberRange/lang/es.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Rango numérico";
-
-$L["and"] = "y";
-$L["between"] = "Entre";
-$L["help"] = "Este tipo genera un número aleatorio entre los valores que especifiques. Ambos campos permite introducir números negativos.";
-$L["incomplete_fields"] = "Por favor, introduce el rango numérico (números inferior y superior) para las siguientes filas:";
diff --git a/plugins/dataTypes/NumberRange/lang/fr.php b/plugins/dataTypes/NumberRange/lang/fr.php
deleted file mode 100644
index 3b54742af..000000000
--- a/plugins/dataTypes/NumberRange/lang/fr.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Plage de numéros";
-
-$L["and"] = "et";
-$L["between"] = "Entre";
-$L["help"] = "Cela génère au hasard un nombre entre les valeurs que vous spécifiez. Les deux champs vous permettent d'entrer des nombres négatifs.";
-$L["incomplete_fields"] = "Précisez un minimum et un maximum pour les lignes suivantes:";
diff --git a/plugins/dataTypes/NumberRange/lang/nl.php b/plugins/dataTypes/NumberRange/lang/nl.php
deleted file mode 100644
index ec486d6c3..000000000
--- a/plugins/dataTypes/NumberRange/lang/nl.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Aantal Range";
-
-$L["and"] = "en";
-$L["between"] = "Tussen";
-$L["help"] = "Dit genereert willekeurig een getal tussen de waarden die u opgeeft. Beide velden kunt u negatieve getallen in te voeren.";
-$L["incomplete_fields"] = "Vul het nummer bereik (laagste en hoogste aantallen) voor de volgende rijen:";
\ No newline at end of file
diff --git a/plugins/dataTypes/PAN/PAN.class.php b/plugins/dataTypes/PAN/PAN.class.php
deleted file mode 100644
index 7db12690d..000000000
--- a/plugins/dataTypes/PAN/PAN.class.php
+++ /dev/null
@@ -1,524 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>, origin code Zeeshan Shaikh
- * @package DataTypes
- */
-class DataType_PAN extends DataTypePlugin {
-
-	protected $isEnabled = true;
-	protected $dataTypeName = "PAN";
-	protected $dataTypeFieldGroup = "credit_card_data";
-	protected $dataTypeFieldGroupOrder = 10;
-	protected $jsModules = array("PAN.js");
-
-
-	private static $creditCardData = array(
-		"visa" => array(
-			"prefix"  => array(4539, 4556, 4916, 4532, 4929, 40240071, 4485, 4716, 4),
-			"length"  => "13,16",
-			"formats" => array(
-				"XXXXXXXXXXXXX",
-				"XXXX XXX XX XXXX",
-				"XXXXXXXXXXXXXXXX",
-				"XXXX XXXX XXXX XXXX",
-				"XXXXXX XXXXXX XXXX",
-				"XXX XXXXX XXXXX XXX",
-				"XXXXXX XXXXXXXXXX"
-			)
-		),
-		"visaElectron" => array(
-			"prefix" => array(4026, 417500, 4508, 4844, 4913, 4917),
-			"length" => "16",
-			"formats" => array(
-				"XXXXXXXXXXXXXXXX",
-				"XXXX XXXX XXXX XXXX",
-				"XXXXXX XXXXXX XXXX",
-				"XXX XXXXX XXXXX XXX",
-				"XXXXXX XXXXXXXXXX"
-			)
-		),
-		"mastercard" => array(
-			"prefix" => array(51, 52, 53, 54, 55),
-			"length" => "16",
-			"formats" => array(
-				"XXXXXXXXXXXXXXXX",
-				"XXXX XXXX XXXX XXXX",
-				"XXXXXX XXXXXX XXXX",
-				"XXX XXXXX XXXXX XXX",
-				"XXXXXX XXXXXXXXXX"
-			)
-		),
-		"amex" => array(
-			"prefix" => array(34, 37),
-			"length" => "15",
-			"formats" => array(
-				"XXXXXXXXXXXXXXX",
-				"XXXX XXXXXX XXXXX"
-			)
-		),
-		"discover" => array(
-			"prefix" => array(6011, 644, 645, 646, 647, 648, 649, 65),
-			"length" => "16",
-			"formats" => array(
-				"XXXXXXXXXXXXXXXX",
-				"XXXX XXXX XXXX XXXX",
-				"XXXXXX XXXXXX XXXX",
-				"XXX XXXXX XXXXX XXX",
-				"XXXXXX XXXXXXXXXX"
-			)
-		),
-		"carteBlanche" => array(
-			"prefix" => array(300, 301, 302, 303, 304, 305),
-			"length" => "14",
-			"formats" => array(
-				"XXXXXXXXXXXXXXX",
-				"XXXX XXXXXX XXXXX"
-			)
-		),
-		"dinersClubInt" => array(
-			"prefix" => array(36),
-			"length" => "14",
-			"formats" => array(
-				"XXXXXXXXXXXXXXX",
-				"XXXX XXXXXX XXXXX"
-			)
-		),
-		"dinersClubEnRoute" => array(
-			"prefix" => array(2014, 2149),
-			"length" => "15",
-			"formats" => array(
-				"XXXXXXXXXXXXXXX",
-				"XXXX XXXXXX XXXXX"
-			)
-		),
-		"jcb15" => array(
-			"prefix" => array(2131, 1800),
-			"length" => "15,16",
-			"formats" => array(
-				"XXXXXXXXXXXXXXX",
-				"XXXX XXXXXX XXXXX",
-				"XXXXXXXXXXXXXXXX",
-				"XXXX XXXX XXXX XXXX",
-				"XXXXXX XXXXXX XXXX",
-				"XXX XXXXX XXXXX XXX",
-				"XXXXXX XXXXXXXXXX"
-			)
-		),
-		"jcb16" => array(
-			"prefix" => array(31, 309),
-			"length" => "15,16",
-			"formats" => array(
-				"XXXXXXXXXXXXXXX",
-				"XXXX XXXXXX XXXXX",
-				"XXXXXXXXXXXXXXXX",
-				"XXXX XXXX XXXX XXXX",
-				"XXXXXX XXXXXX XXXX",
-				"XXX XXXXX XXXXX XXX",
-				"XXXXXX XXXXXXXXXX"
-			)
-		),
-		"maestro" => array(
-			"prefix" => array(5018, 5038, 6304, 6759, 6761, 6762, 6763, 5893, 56, 57, 58),
-			"length" => "12-19",
-			"formats" => array(
-				"XXXXXXXXXXXX",
-				"XXXXXXXXXXXXX",
-				"XXXX XXX XX XXXX",
-				"XXXXXXXXXXXXXX",
-				"XXXX XXXXXX XXXX",
-				"XXXXXXXXXXXXXXX",
-				"XXXX XXXXXX XXXXX",
-				"XXXXXXXXXXXXXXXX",
-				"XXXX XXXX XXXX XXXX",
-				"XXXXXX XXXXXX XXXX",
-				"XXX XXXXX XXXXX XXX",
-				"XXXXXX XXXXXXXXXX",
-				"XXXXXXXXXXXXXXXXX",
-				"XXXXXXXXXXXXXXXXXX",
-				"XXXXXXXXXXXXXXXXXXX",
-				"XXXXXX XX XXXX XXXX XXX"
-			)
-		),
-		"solo" => array(
-			"prefix" => array(6334, 6767),
-			"length" => "16,18,19",
-			"formats" => array(
-				"XXXXXXXXXXXXXXXX",
-				"XXXX XXXX XXXX XXXX",
-				"XXXXXX XXXXXX XXXX",
-				"XXX XXXXX XXXXX XXX",
-				"XXXXXX XXXXXXXXXX",
-				"XXXXXXXXXXXXXXXXXX",
-				"XXXXXXXXXXXXXXXXXXX",
-				"XXXXXX XX XXXX XXXX XXX"
-			)
-		),
-		"switch" => array(
-			"prefix" => array(4903, 4905, 4905, 4911, 4936, 564182, 633110, 6333, 6759),
-			"length" => "16,18,19",
-			"formats" => array(
-				"XXXXXXXXXXXXXXXX",
-				"XXXX XXXX XXXX XXXX",
-				"XXXXXX XXXXXX XXXX",
-				"XXX XXXXX XXXXX XXX",
-				"XXXXXX XXXXXXXXXX",
-				"XXXXXXXXXXXXXXXXXX",
-				"XXXXXXXXXXXXXXXXXXX",
-				"XXXXXX XX XXXX XXXX XXX"
-			)
-		),
-		"laser" => array(
-			"prefix" => array(6304, 6706, 6771, 6709),
-			"length" => "16-19",
-			"formats" => array(
-				"XXXXXXXXXXXXXXXX",
-				"XXXX XXXX XXXX XXXX",
-				"XXXXXX XXXXXX XXXX",
-				"XXX XXXXX XXXXX XXX",
-				"XXXXXX XXXXXXXXXX",
-				"XXXXXXXXXXXXXXXXX",
-				"XXXXXXXXXXXXXXXXXX",
-				"XXXXXXXXXXXXXXXXXXX",
-				"XXXXXX XX XXXX XXXX XXX"
-			)
-		)
-	);
-
-
-	public function __construct($runtimeContext) {
-		for ($i=622126; $i<=622925; $i++) {
-			$this->creditCardData["discover"][] = $i;
-		}
-		for ($i=3528; $i<=3589; $i++) {
-			$this->creditCardData["jcb16"][] = $i;
-		}
-		parent::__construct($runtimeContext);
-	}
-
-
-	public function generate($generator, $generationContextData) {
-		$options = $generationContextData["generationOptions"];
-
-		if ($options["cc_brand"] == "rand_card") {
-			$options = $this->setRandomCardInfo($options);
-		}
-
-		$ccLength    = self::getRandomPANLength($options["cc_length"]);
-		$ccFormat    = self::getRandomPANFormat($options["cc_format"], $options["cc_length"]);
-		$ccSeparator = self::getRandomPANSeparator($options["cc_separator"], $options["cc_format"]);
-
-		$ccData = self::getCreditCardData($options["cc_brand"]);
-		$card = self::generateCreditCardNumber($ccData["prefix"], $ccLength);
-		$cardNumber = $this->convertFormat($ccLength, $ccFormat, $ccSeparator, $card);
-
-		if (empty($cardNumber)) {
-			$cardNumber = "$ccLength, $ccFormat, {$options["cc_brand"]}, {$options["cc_format"]}";
-		}
-		return array(
-			"display" => $cardNumber
-		);
-	}
-
-
-	public function setRandomCardInfo($options) {
-		$selectedCard = $options["cc_random_card"][array_rand($options["cc_random_card"])];
-
-		if ($selectedCard == "jcb") {
-			$jcbCards = array("jcb15", "jcb16");
-			$selectedCard = $jcbCards[mt_rand(0, 1)];
-		}
-
-		$cardData = self::getCreditCardData($selectedCard);
-		$options["cc_format"] = $cardData["formats"][array_rand($cardData["formats"])];
-		$options["cc_length"] = self::getRandomPANLength($cardData["length"]);
-
-		return $options;
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		return array(
-			"cc_brand"	     => $postdata["dtExample_$colNum"],
-			"cc_separator"   => $postdata["dtOptionPAN_sep_$colNum"],
-			"cc_format"      => $postdata["dtOption_$colNum"],
-			"cc_length"      => $postdata["dtOptionPAN_digit_$colNum"],
-			"cc_random_card" => $postdata["dtOptionPAN_randomCardFormat_$colNum"]
-		);
-	}
-
-	public function getExampleColumnHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-
-		$html =<<< END
-	<select name="dtExample_%ROW%" id="dtExample_%ROW%">
-		<option value="">{$L["please_select"]}</option>
-		<option value="mastercard">{$this->L["mastercard"]}</option>
-		<option value="visa">{$this->L["visa"]}</option>
-		<option value="visaElectron">{$this->L["visa_electron"]}</option>
-		<option value="amex">{$this->L["americanexpress"]}</option>
-		<option value="discover">{$this->L["discover"]}</option>
-		<option value="carteBlanche">{$this->L["carte_blanche"]}</option>
-		<option value="dinersClubInt">{$this->L["diners_club_international"]}</option>
-		<option value="dinersClubEnRoute">{$this->L["enRoute"]}</option>
-		<option value="jcb">{$this->L["jcb"]}</option>
-		<option value="maestro">{$this->L["maestro"]}</option>
-		<option value="solo">{$this->L["solo"]}</option>
-		<option value="switch">{$this->L["switch"]}</option>
-		<option value="laser">{$this->L["laser"]}</option>
-		<option value="rand_card">{$this->L["rand_card"]}</option>
-	</select>
-END;
-		return $html;
-	}
-
-	public function getOptionsColumnHTML() {
-		$html =<<< END
-<span id="dtOptionPAN_cardDigitSection_%ROW%">
-	{$this->L["length"]}
-	<input type="text" name="dtOptionPAN_digit_%ROW%" id="dtOptionPAN_digit_%ROW%" style="width: 60px" readonly="readonly" />
-</span>
-
-<span id="dtOptionPAN_cardSeparator_%ROW%">
-	{$this->L["separators"]}
-	<input type="text" name="dtOptionPAN_sep_%ROW%" id="dtOptionPAN_sep_%ROW%" style="width: 78px" value=" " title="{$this->L["separator_help"]}" />
-</span>
-
-<span id="dtOptionPAN_cardFormat_%ROW%">
-	{$this->L["ccformats"]}
-	<textarea name="dtOption_%ROW%" id="dtOption_%ROW%" title="{$this->L["format_title"]}" style="height: 100px; width: 260px"></textarea>
-</span>
-
-<span id="dtOptionPAN_randomCardFormatSection_%ROW%" style="display:none;">
-	{$this->L["ccrandom"]}
-	<select multiple="multiple" name="dtOptionPAN_randomCardFormat_%ROW%[]" id="dtOptionPAN_randomCardFormat_%ROW%" title="{$this->L["rand_brand_title"]}" style="height: 100px; width: 260px">
-		<option value="mastercard">{$this->L["mastercard"]}</option>
-		<option value="visa">{$this->L["visa"]}</option>
-		<option value="visaElectron">{$this->L["visa_electron"]}</option>
-		<option value="amex">{$this->L["americanexpress"]}</option>
-		<option value="discover">{$this->L["discover"]}</option>
-		<option value="carteBlanche">{$this->L["carte_blanche"]}</option>
-		<option value="dinersClubInt">{$this->L["diners_club_international"]}</option>
-		<option value="dinersClubEnRoute">{$this->L["enRoute"]}</option>
-		<option value="jcb">{$this->L["jcb"]}</option>
-		<option value="maestro">{$this->L["maestro"]}</option>
-		<option value="solo">{$this->L["solo"]}</option>
-		<option value="switch">{$this->L["switch"]}</option>
-		<option value="laser">{$this->L["laser"]}</option>
-	</select>
-</span>
-END;
-		return $html;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255)",
-			"SQLField_Oracle" => "varchar2(255)",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		$html =<<<EOF
-<p>
-	{$this->L["pan_help_intro"]}
-	<b>{$this->L["mastercard"]}</b>, <b>{$this->L["visa"]}</b>, <b>{$this->L["visa_electron"]}</b>,
-	<b>{$this->L["americanexpress"]}</b>, <b>{$this->L["discover"]}</b>, <b>{$this->L["american_diners"]}</b>,
-	<b>{$this->L["carte_blanche"]}</b>, <b>{$this->L["diners_club_international"]}</b>, <b>{$this->L["enroute"]}</b>,
-	<b>{$this->L["jcb"]}</b>, <b>{$this->L["maestro"]}</b>, <b>{$this->L["solo"]}</b>,
-	<b>{$this->L["switch"]}</b>, <b>{$this->L["laser"]}</b>.
-</p>
-EOF;
-
-		return $html;
-	}
-
-
-	/**
-	 * @param $ccLength
-	 * @param $ccFormat
-	 * @param $ccSeparator
-	 * @param $ccNumber
-	 * @return array|bool|string
-	 */
-	private static function convertFormat($ccLength, $ccFormat, $ccSeparator, $ccNumber) {
-
-		// TODO pity we need this extra test on each call
-		if ($ccLength == strlen($ccNumber)) {
-			$a = self::convertXtoNumber($ccFormat, $ccNumber);
-
-			if ($a == $ccNumber) {
-				return $a;
-			} else {
-				return implode($ccSeparator, $a);
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Convert X's to the specified number
-	 */
-	private static function convertXtoNumber($chosen_format, $ccnumber){
-		$positions = array();
-		$pos = -1;
-		while (($pos = strpos($chosen_format, " ", $pos+1)) !== false) {
-			$positions[] = $pos;
-		}
-
-		if (empty($positions)) {
-			return $ccnumber;
-		}
-
-		$result   = array();
-		$result_f = array();
-		$j = 1;
-
-		for ($i=0; $i<count($positions); $i++) {
-			$result[$i] = substr($ccnumber, 0, $positions[$i]-$i);
-		}
-
-		$result_f[0] = ($result[0]);
-		for ($i=0; $i<count($positions)-1; $i++) {
-			$result_f[$j] = substr($result[$j], $positions[$i]-$i);
-			$j++;
-		}
-		$result_f[count($positions)] = substr($ccnumber, ($positions[count($positions)-1])-(count($positions)-1));
-
-		return $result_f;
-	}
-
-
-	private static function getRandomPANFormat($userSelectedFormats, $randCardLength) {
-
-		// if no format is selected then by default continuous number of that length will be displayed
-		if ($userSelectedFormats == "") {
-			return str_repeat("X", $randCardLength);
-		}
-
-		$formats = explode("\n", $userSelectedFormats);
-
-		$sortedFormat = array();
-		$not_i = 0;
-
-		for ($fc = 0; $fc < count($formats); $fc++){
-			$count_X = "0"; // get count of X's to match with the card length
-
-			for ($i=0; $i<strlen($formats[$fc]); $i++) {
-				if (substr($formats[$fc], $i, 1) == "X") {
-					$count_X++;
-				}
-			}
-
-			if ($count_X == $randCardLength) {
-				$sortedFormat[$not_i] = $formats[$fc];
-				$not_i++;
-			}
-		}
-
-		$chosenFormat = "";
-		if (count($sortedFormat) >= 1) {
-			$chosenFormat = $sortedFormat[mt_rand(0, count($sortedFormat)-1)];
-		}
-
-		return trim($chosenFormat);
-	}
-
-
-	// will give a random separator
-	private static function getRandomPANSeparator($separators, $randCardFormat) {
-
-		$chosenSep = "";
-		if (preg_match("/[^X]/", $randCardFormat)) {
-
-			$separatorList = explode("|", $separators);
-			$chosenSep = $separatorList[rand(0, count($separatorList)-1)];
-
-			// if no separator was entered
-			if ($separators == "") {
-				$chosenSep = " ";
-			}
-		}
-
-		return $chosenSep;
-	}
-
-
-	private static function getRandomPANLength($userSelectedLength) {
-
-		// this would be better
-//		$groups = explode(",", $userSelectedLength);
-//		for ($i=0; $i<count($groups); $i++) {
-//			$groups = explode(",", $groups[$i]);
-//		}
-
-		// if there's more than 1 card length then pick a random one
-		if ($userSelectedLength == "12-19") {
-			$userSelectedLength = "12,13,14,15,16,17,18,19";
-		} else if ($userSelectedLength == "16-19") {
-			$userSelectedLength = "16,17,18,19";
-		}
-
-		$lengths = explode(",", $userSelectedLength);
-		$chosenLength = 0;
-		if (count($lengths) >= 1) {
-			$chosenLength = $lengths[mt_rand(0, count($lengths)-1)];
-		}
-
-		return $chosenLength;
-	}
-
-	// --------------------------------------------------------------------------------------------
-	// Public functions
-
-	public static function generateCreditCardNumber($prefixList, $length) {
-		$ccNumber = $prefixList[array_rand($prefixList)];
-
-		// generate digits
-		while (strlen($ccNumber)<($length-1)) {
-			$ccNumber .= mt_rand(0,9);
-		}
-
-		// calculate sum
-		$sum = 0;
-		$pos = 0;
-
-		$reversedCCnumber = strrev($ccNumber);
-		while ($pos < $length - 1) {
-			$odd = $reversedCCnumber[$pos]*2;
-			if ($odd > 9) {
-				$odd -= 9;
-			}
-			$sum += $odd;
-
-			if ($pos != ($length - 2)) {
-				$sum += $reversedCCnumber[ $pos +1 ];
-			}
-			$pos += 2;
-		}
-
-		// calculate check digit
-		$checkDigit = ((floor($sum/10) + 1) * 10 - $sum) % 10;
-		$ccNumber .= $checkDigit;
-
-		return $ccNumber;
-	}
-
-
-	public static function getCreditCardData($ccBrand) {
-		$data = array();
-		reset(self::$creditCardData);
-		while (list($currBrand, $ccData) = each(self::$creditCardData)) {
-			if ($ccBrand != $currBrand) {
-				continue;
-			}
-			$data = $ccData;
-		}
-		return $data;
-	}
-
-	public static function getAllCreditCardData() {
-		return self::$creditCardData;
-	}
-}
\ No newline at end of file
diff --git a/plugins/dataTypes/PAN/PAN.js b/plugins/dataTypes/PAN/PAN.js
deleted file mode 100644
index c1fd3895d..000000000
--- a/plugins/dataTypes/PAN/PAN.js
+++ /dev/null
@@ -1,251 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name PAN
-	 * @description JS code for the PAN Data Type.
-	 * @see DataType
-	 * @namespace
-	 */
-
-	var MODULE_ID = "data-type-PAN";
-	var LANG = L.dataTypePlugins.PAN;
-	var subscriptions = {};
-
-	var _init = function() {
-		subscriptions[C.EVENT.DATA_TABLE.ROW.EXAMPLE_CHANGE + "__" + MODULE_ID] = _exampleChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _saveRow = function(rowNum) {
-		var randomBrands = $("#dtOptionPAN_randomCardFormat_" + rowNum).val();
-		return {
-			example:      $("#dtExample_" + rowNum).val(),
-			digit:        $("#dtOptionPAN_digit_" + rowNum).val(),
-			separator:    $("#dtOptionPAN_sep_" + rowNum).val(),
-			format:       $("#dtOption_" + rowNum).val(),
-			randomBrands: randomBrands
-		};
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {
-				$("#dtExample_" + rowNum).val(data.example);
-				$("#dtOptionPAN_digit_" + rowNum).val(data.digit);
-				$("#dtOptionPAN_sep_" + rowNum).val(data.separator);
-				$("#dtOption_" + rowNum).val(data.format);
-
-				var $cardFormat       = $("#dtOptionPAN_cardFormat_" + rowNum);
-				var $digitSection     = $("#dtOptionPAN_digitSection_" + rowNum);
-				var $randCardFormatSection = $("#dtOptionPAN_randomCardFormatSection_" + rowNum);
-
-				if (data.example === "rand_card") {
-					$digitSection.hide();
-					$cardFormat.hide();
-					$randCardFormatSection.show();
-
-					var options = $("#dtOptionPAN_randomCardFormat_" + rowNum).find("option");
-					for (var i=0; i<options.length; i++) {
-						if ($.inArray(options[i].value, data.randomBrands) !== -1) {
-							$(options[i]).prop("selected", "selected");
-						}
-					}
-
-				} else {
-					$cardFormat.show();
-					$digitSection.show();
-					$randCardFormatSection.hide();
-				}
-			},
-			isComplete: function() { return $("#dtOptionPAN_randomCardFormat_" + rowNum).length > 0; }
-		};
-	};
-
-
-	var _exampleChange = function(msg) {
-		var rowID = msg.rowID;
-		var selectedCard = msg.value;
-
-		var $digitSection     = $("#dtOptionPAN_digitSection_" + rowID);
-		var $digitLengthField = $("#dtOptionPAN_digit_" + rowID);
-		var $cardFormat       = $("#dtOptionPAN_cardFormat_" + rowID);
-		var $option           = $("#dtOption_" + rowID);
-		var $randCardFormatSection = $("#dtOptionPAN_randomCardFormatSection_" + rowID);
-
-		// default states shared by most options
-		$cardFormat.show();
-		$digitSection.show();
-		$randCardFormatSection.hide();
-
-		var formats = [];
-		switch (selectedCard) {
-			case "mastercard":
-			case "discover":
-			case "visaElectron":
-				$digitLengthField.val("16");
-				formats = [
-					"XXXXXXXXXXXXXXXX",
-					"XXXX XXXX XXXX XXXX",
-					"XXXXXX XXXXXX XXXX",
-					"XXX XXXXX XXXXX XXX",
-					"XXXXXX XXXXXXXXXX"
-				];
-				break;
-
-			case "visa":
-				$digitLengthField.val("13,16");
-				formats = [
-					"XXXXXXXXXXXXX",
-					"XXXX XXX XX XXXX",
-					"XXXXXXXXXXXXXXXX",
-					"XXXX XXXX XXXX XXXX",
-					"XXXXXX XXXXXX XXXX",
-					"XXX XXXXX XXXXX XXX",
-					"XXXXXX XXXXXXXXXX"
-				];
-				break;
-
-			case "amex":
-			case "dinersClubEnRoute":
-				$digitLengthField.val("15");
-				formats = [
-					"XXXXXXXXXXXXXXX",
-					"XXXX XXXXXX XXXXX"
-				];
-				break;
-
-			case "carteBlanche":
-			case "dinersClubInt":
-				$digitLengthField.val('14');
-				formats = [
-					"XXXXXXXXXXXXXX",
-					"XXXX XXXXXX XXXX"
-				];
-				break;
-
-			case "jcb":
-				$digitLengthField.val("15,16");
-				formats = [
-					"XXXXXXXXXXXXXXX",
-					"XXXX XXXXXX XXXXX",
-					"XXXXXXXXXXXXXXXX",
-					"XXXX XXXX XXXX XXXX",
-					"XXXXXX XXXXXX XXXX",
-					"XXX XXXXX XXXXX XXX",
-					"XXXXXX XXXXXXXXXX"
-				];
-				break;
-
-			case "maestro":
-				$digitLengthField.val("12-19");
-				formats = [
-					"XXXXXXXXXXXX",
-					"XXXXXXXXXXXXX",
-					"XXXX XXX XX XXXX",
-					"XXXXXXXXXXXXXX",
-					"XXXX XXXXXX XXXX",
-					"XXXXXXXXXXXXXXX",
-					"XXXX XXXXXX XXXXX",
-					"XXXXXXXXXXXXXXXX",
-					"XXXX XXXX XXXX XXXX",
-					"XXXXXX XXXXXX XXXX",
-					"XXX XXXXX XXXXX XXX",
-					"XXXXXX XXXXXXXXXX",
-					"XXXXXXXXXXXXXXXXX",
-					"XXXXXXXXXXXXXXXXXX",
-					"XXXXXXXXXXXXXXXXXXX",
-					"XXXXXX XX XXXX XXXX XXX"
-				];
-				break;
-
-			case "solo":
-			case "switch":
-				$digitLengthField.val("16,18,19");
-				formats = [
-					"XXXXXXXXXXXXXXXX",
-					"XXXX XXXX XXXX XXXX",
-					"XXXXXX XXXXXX XXXX",
-					"XXX XXXXX XXXXX XXX",
-					"XXXXXX XXXXXXXXXX",
-					"XXXXXXXXXXXXXXXXXX",
-					"XXXXXXXXXXXXXXXXXXX",
-					"XXXXXX XX XXXX XXXX XXX"
-				];
-				break;
-
-			case "laser":
-				$digitLengthField.val("16-19");
-				formats = [
-					"XXXXXXXXXXXXXXXX",
-					"XXXX XXXX XXXX XXXX",
-					"XXXXXX XXXXXX XXXX",
-					"XXX XXXXX XXXXX XXX",
-					"XXXXXX XXXXXXXXXX",
-					"XXXXXXXXXXXXXXXXX",
-					"XXXXXXXXXXXXXXXXXX",
-					"XXXXXXXXXXXXXXXXXXX",
-					"XXXXXX XX XXXX XXXX XXX"
-				];
-				break;
-
-			case "rand_card":
-				$digitSection.hide();
-				$cardFormat.hide();
-				$randCardFormatSection.show();
-				break;
-		}
-
-		$option.val(formats.join("\n"));
-	};
-
-
-	var _validate = function(rows) {
-		var cardTypeProblemVisibleRows = [];
-		var cardTypeProblemFields      = [];
-		var cardFormatProblemVisibleRows = [];
-		var cardFormatProblemFields      = [];
-
-		for (var i=0; i<rows.length; i++) {
-
-			// check if the examples dropdown (card type) isn't blank
-			var $exampleField = $("#dtExample_" + rows[i]);
-			if ($exampleField.val() === "") {
-				cardTypeProblemVisibleRows.push(generator.getVisibleRowOrderByRowNum(rows[i]));
-				cardTypeProblemFields.push($exampleField);
-			}
-
-			// check if card format is proper
-			var format = $("#dtOption_" + rows[i]).val();
-			if (format.match(/[^X\s]/g)) {
-				cardFormatProblemVisibleRows.push(generator.getVisibleRowOrderByRowNum(rows[i]));
-				cardFormatProblemFields.push($("#dtOption_" + rows[i]));
-			}
-		}
-
-		var errors = [];
-		if (cardTypeProblemVisibleRows.length) {
-			errors.push({ els: cardTypeProblemFields, error: LANG.pan_incomplete_fields + " <b>" + cardTypeProblemVisibleRows.join(", ") + "</b>"});
-		}
-		if (cardFormatProblemVisibleRows.length) {
-			errors.push({ els: cardFormatProblemFields, error: LANG.format_incomplete_fields + " <b>" + cardFormatProblemVisibleRows.join(", ") + "</b>"});
-		}
-
-		return errors;
-	};
-
-
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		validate: _validate,
-		saveRow: _saveRow,
-		loadRow: _loadRow
-	});
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/PAN/lang/de.php b/plugins/dataTypes/PAN/lang/de.php
deleted file mode 100644
index 3f20be590..000000000
--- a/plugins/dataTypes/PAN/lang/de.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-$L = array();
-
-$L["pan_incomplete_fields"] = "Mindestens ein Kartenmarke gewählt werden. Bitte korrigieren Sie die folgenden Zeilen:";
-$L["separator_help"] = "Die Zeichen, die Sie hier eingeben, wird verwendet, um die Räume in der Formatfeld Kreditkarte unten ersetzen. Um mehr als eine Trenn einzugeben, trennen Sie diese mit einer Pipe (|) Zeichen.";
-$L["format_incomplete_fields"] = "Für PAN Feld CC Zahlenformate, Eingangs <b>X</b> und für Abscheider Eingangs <b>Räume</b> nach der Kartenlänge. Bitte korrigieren Sie die folgenden Zeilen:";
-$L["pan_help_intro"] = "Dieser Datentyp generiert zufällige, gültige Kreditkartennummern nach dem Format, das Sie angeben. Es ist derzeit in der Lage ist Nummern für die folgenden Marken:";
-$L["mastercard"] = "Mastercard";
-$L["visa_electron"] = "Visa Electron";
-$L["visa"] = "Visa";
-$L["americanexpress"] = "American Express";
-$L["discover"] = "Discover";
-$L["american_diners"] = "American Diner's";
-$L["carte_blanche"] = "Carte Blanche";
-$L["diners_club_international"] = "Diner's Club International";
-$L["enroute"] = "enRoute";
-$L["jcb"] = "JCB";
-$L["maestro"] = "Maestro";
-$L["solo"] = "Solo";
-$L["switch"] = "Switch";
-$L["laser"] = "Laser";
-$L["rand_card"] = "Zufällige Kreditkarte";
-$L["ccrandom"] = "Wählen Karte Marke:";
-$L["format_title"] = "Wenn die Länge der X nicht gleich der Kartenlänge so dass Format nicht erzeugt zu werden.";
-$L["rand_brand_title"] = "Die ausgewählte Marke Kartenlänge und Format werden zufällig ausgewählt.";
-$L["length"] = "Länge:";
-$L["separators"] = "Abscheider:";
-$L["ccformats"] = "Kreditkartenformate:";
diff --git a/plugins/dataTypes/PAN/lang/en.php b/plugins/dataTypes/PAN/lang/en.php
deleted file mode 100644
index 2ebefa11c..000000000
--- a/plugins/dataTypes/PAN/lang/en.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-$L = array();
-
-$L["pan_incomplete_fields"] = "At least one card brand should be selected. Please fix the following rows:";
-$L["separator_help"] = "The characters you enter here will be used to replace the spaces in the Credit Card format field below. To enter more than one separator, just separate them with a pipe (|) character.";
-$L["format_incomplete_fields"] = "For PAN field CC Number formats, input <b>X's</b> and for separators input <b>spaces</b> according to the card length. Please fix the following rows:";
-$L["pan_help_intro"] = "This data type generates random, valid credit card numbers according to the format you specify. It is currently capable of generating numbers for the following brands: ";
-$L["mastercard"] = "Mastercard";
-$L["visa_electron"] = "Visa Electron";
-$L["visa"] = "Visa";
-$L["americanexpress"] = "American Express";
-$L["discover"] = "Discover";
-$L["american_diners"] = "American Diner's";
-$L["carte_blanche"] = "Carte Blanche";
-$L["diners_club_international"] = "Diner's Club International";
-$L["enRoute"] = "enRoute";
-$L["jcb"] = "JCB";
-$L["maestro"] = "Maestro";
-$L["solo"] = "Solo";
-$L["switch"] = "Switch";
-$L["laser"] = "Laser";
-$L["rand_card"] = "Random Credit Card";
-$L["ccrandom"] = "Select Card Brand:";
-$L["format_title"] = "If length of X is not equal to the card length then that format will not get generated.";
-$L["rand_brand_title"] = "The selected brand's card length and format are picked randomly.";
-$L["length"] = "Length:";
-$L["separators"] = "Separators:";
-$L["ccformats"] = "Credit Card Formats:";
diff --git a/plugins/dataTypes/PAN/lang/es.php b/plugins/dataTypes/PAN/lang/es.php
deleted file mode 100644
index 16f171435..000000000
--- a/plugins/dataTypes/PAN/lang/es.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-$L = array();
-
-$L["pan_incomplete_fields"] = "Por lo menos una marca de la tarjeta debe ser seleccionado. Por favor, corrija los siguientes filas:";
-$L["separator_help"] = "Los caracteres que introduzca aquí se utilizarán para reemplazar los espacios en el campo de formato de tarjeta de crédito a continuación. Para introducir más de un separador, simplemente separarlos con una barra vertical (|) carácter.";
-$L["format_incomplete_fields"] = "Por campo PAN Formatos de número CC, entrada <b>X</b> de y para los separadores de entrada <b>espacios</b> de acuerdo a la longitud de la tarjeta. Por favor, corrija los siguientes filas:";
-$L["pan_help_intro"] = "Este tipo de datos genera números, tarjeta de crédito válida al azar de acuerdo con el formato que se especifique. Actualmente es capaz de generar los números de las siguientes marcas: ";
-$L["mastercard"] = "Mastercard";
-$L["visa_electron"] = "Visa Electron";
-$L["visa"] = "Visa";
-$L["americanexpress"] = "American Express";
-$L["discover"] = "Discover";
-$L["american_diners"] = "American Diner's";
-$L["carte_blanche"] = "Carte Blanche";
-$L["diners_club_international"] = "Diner's Club International";
-$L["enroute"] = "enRoute";
-$L["jcb"] = "JCB";
-$L["maestro"] = "Maestro";
-$L["solo"] = "Solo";
-$L["switch"] = "Switch";
-$L["laser"] = "Laser";
-$L["rand_card"] = "Tarjeta de crédito aleatorio";
-$L["ccrandom"] = "Seleccione Tarjeta Marca:";
-$L["format_title"] = "Si la longitud de X no es igual a la longitud de la tarjeta, entonces ese formato no conseguirá generado.";
-$L["rand_brand_title"] = "Longitud de la tarjeta del marca seleccionada y el formato son recogidos al azar.";
-$L["length"] = "Largo:";
-$L["separators"] = "Separadores:";
-$L["ccformats"] = "Formatos de Tarjeta de Crédito:";
diff --git a/plugins/dataTypes/PAN/lang/fr.php b/plugins/dataTypes/PAN/lang/fr.php
deleted file mode 100644
index 5a58affc3..000000000
--- a/plugins/dataTypes/PAN/lang/fr.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-$L = array();
-
-$L["pan_incomplete_fields"] = "Au moins une marque de la carte doit être sélectionné. S'il vous plaît corriger les lignes suivantes:";
-$L["separator_help"] = "Les caractères que vous entrez ici seront utilisés pour remplacer les espaces dans le champ de format de carte de crédit ci-dessous. Pour entrer plus d'un séparateur, il suffit de les séparer par une barre verticale (|) caractère.";
-$L["format_incomplete_fields"] = "Pour le terrain de PAN formats numériques CC, entrée <b>X</b> de et pour les séparateurs entrée <b>espaces</b> en fonction de la longueur de la carte. S'il vous plaît corriger les lignes suivantes:";
-$L["pan_help_intro"] = "Ce type de données génère des nombres aléatoires, carte de crédit valide selon le format que vous spécifiez. Il est actuellement capable de générer des nombres pour les marques suivantes:";
-$L["mastercard"] = "Mastercard";
-$L["visa_electron"] = "Visa Electron";
-$L["visa"] = "Visa";
-$L["americanexpress"] = "American Express";
-$L["discover"] = "Discover";
-$L["american_diners"] = "American Diner's";
-$L["carte_blanche"] = "Carte Blanche";
-$L["diners_club_international"] = "Diner's Club International";
-$L["enroute"] = "enRoute";
-$L["jcb"] = "JCB";
-$L["maestro"] = "Maestro";
-$L["solo"] = "Solo";
-$L["switch"] = "Switch";
-$L["laser"] = "Laser";
-$L["rand_card"] = "Aléatoire de carte de crédit";
-$L["ccrandom"] = "Sélectionnez Card Marque:";
-$L["format_title"] = "Si la longueur de X n'est pas égale à la longueur de la carte alors que le format ne sera pas généré.";
-$L["rand_brand_title"] = "La longueur et le format de la carte de la marque sélectionnée sont choisis au hasard.";
-$L["length"] = "Longueur:";
-$L["separators"] = "Séparateurs:";
-$L["ccformats"] = "Formats de carte de crédit:";
diff --git a/plugins/dataTypes/PAN/lang/nl.php b/plugins/dataTypes/PAN/lang/nl.php
deleted file mode 100644
index 2d4de09cd..000000000
--- a/plugins/dataTypes/PAN/lang/nl.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-$L = array();
-
-$L["pan_incomplete_fields"] = "Tenminste een kaart merk worden gekozen. Please fix de volgende regels:";
-$L["separator_help"] = "De tekens die u hier invoert, zal worden gebruikt om de ruimtes te vervangen in de Credit Card formaat veld hieronder. Om meer dan een separator te voeren, ze gewoon scheiden met een pijp (|) karakter.";
-$L["format_incomplete_fields"] = "Voor PAN veld CC Getalnotaties, ingang <b>X</b> en voor afscheider ingang <b>ruimtes</b> volgens de kaart lengte. Please fix de volgende regels:";
-$L["pan_help_intro"] = "Dit soort gegevens genereert willekeurig, geldige credit card nummers volgens de indeling die u opgeeft. Het is momenteel geschikt voor het genereren nummers voor de volgende merken: ";
-$L["mastercard"] = "Mastercard";
-$L["visa_electron"] = "Visa Electron";
-$L["visa"] = "Visa";
-$L["americanexpress"] = "American Express";
-$L["discover"] = "Discover";
-$L["american_diners"] = "American Diner's";
-$L["carte_blanche"] = "Carte Blanche";
-$L["diners_club_international"] = "Diner's Club International";
-$L["enroute"] = "enRoute";
-$L["jcb"] = "JCB";
-$L["maestro"] = "Maestro";
-$L["solo"] = "Solo";
-$L["switch"] = "Switch";
-$L["laser"] = "Laser";
-$L["rand_card"] = "Random Credit Card";
-$L["ccrandom"] = "Selecteer Card Merk:";
-$L["format_title"] = "Indien de lengte van X niet gelijk is aan de kaart lengte dan dat formaat niet gegenereerd.";
-$L["rand_brand_title"] = "De geselecteerde merk kaart lengte en het formaat zijn willekeurig gekozen.";
-$L["length"] = "Lengte:";
-$L["separators"] = "Scheiders:";
-$L["ccformats"] = "Credit Card formaten:";
diff --git a/plugins/dataTypes/PIN/PIN.class.php b/plugins/dataTypes/PIN/PIN.class.php
deleted file mode 100644
index e37d4e660..000000000
--- a/plugins/dataTypes/PIN/PIN.class.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>, origin code Zeeshan Shaikh
- * @package DataTypes
- */
-class DataType_PIN extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "PIN";
-	protected $hasHelpDialog = true;
-	protected $dataTypeFieldGroup = "credit_card_data";
-	protected $dataTypeFieldGroupOrder = 20;
-
-
-	public function generate($generator, $generationContextData) {
-		return array(
-			"display" => mt_rand(1111, 9999)
-		);
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255)",
-			"SQLField_Oracle" => "varchar2(255)",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["help"]}</p>";
-	}
-}
diff --git a/plugins/dataTypes/PIN/lang/de.php b/plugins/dataTypes/PIN/lang/de.php
deleted file mode 100644
index bf87402dd..000000000
--- a/plugins/dataTypes/PIN/lang/de.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["help"] = "Erzeugt eine Zufallskreditkarte PIN-Nummer von <b>1111</b> bis <b>9999</b>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/PIN/lang/en.php b/plugins/dataTypes/PIN/lang/en.php
deleted file mode 100644
index f12851951..000000000
--- a/plugins/dataTypes/PIN/lang/en.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-
-$L["help"] = "Generates a random credit card PIN number from <b>1111</b> to <b>9999</b>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/PIN/lang/es.php b/plugins/dataTypes/PIN/lang/es.php
deleted file mode 100644
index 361f800d2..000000000
--- a/plugins/dataTypes/PIN/lang/es.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-
-$L["help"] = "Genera un número PIN de la tarjeta de crédito azar de <b>1111</b> a <b>9999</b>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/PIN/lang/fr.php b/plugins/dataTypes/PIN/lang/fr.php
deleted file mode 100644
index 6c5059d68..000000000
--- a/plugins/dataTypes/PIN/lang/fr.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-
-$L["help"] = "Génère un code PIN aléatoire de carte de crédit de <b>1111</b> à <b>9999</b>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/PIN/lang/nl.php b/plugins/dataTypes/PIN/lang/nl.php
deleted file mode 100644
index db44352aa..000000000
--- a/plugins/dataTypes/PIN/lang/nl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-fr.php<?php
-
-$L = array();
-
-$L["help"] = "Genereert een willekeurig creditcard pincode van <b>1111</b> om <b>9999</b>.";
\ No newline at end of file
diff --git a/plugins/dataTypes/Phone/Phone.class.php b/plugins/dataTypes/Phone/Phone.class.php
deleted file mode 100644
index 0dcb7a7e6..000000000
--- a/plugins/dataTypes/Phone/Phone.class.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_Phone extends DataTypePlugin {
-
-	protected $isEnabled = true;
-	protected $dataTypeName = "Phone / Fax";
-	protected $dataTypeFieldGroup = "human_data";
-	protected $dataTypeFieldGroupOrder = 20;
-	protected $jsModules = array("Phone.js");
-
-
-	public function generate($generator, $generationContextData) {
-		$phoneStr = Utils::generateRandomAlphanumericStr($generationContextData["generationOptions"]);
-		$formats = explode("|", $phoneStr);
-		$chosenFormat = $formats[0];
-		if (count($formats) > 1) {
-			$chosenFormat = $formats[mt_rand(0, count($formats)-1)];
-		}
-		return array(
-			"display" => $chosenFormat
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $post, $colNum, $numCols) {
-		if (!isset($post["dtOption_$colNum"]) || empty($post["dtOption_$colNum"])) {
-			return false;
-		}
-		return $post["dtOption_$colNum"];
-	}
-
-	public function getExampleColumnHTML() {
-		$L = Core::$language->getCurrentLanguageStrings();
-
-		$html =<<<EOF
-	<select name="dtExample_%ROW%" id="dtExample_%ROW%">
-		<option value="">{$L["please_select"]}</option>
-		<option value="1-Xxx-Xxx-xxxx">{$this->L["example_1"]}</option>
-		<option value="(Xxx) Xxx-xxxx">{$this->L["example_2"]}</option>
-		<option value="(01xxxx) xxxxx|(01xxx) xxxxxx|(01x1) xxx xxxx|(011x) xxx xxxx|(02x) xxxx xxxx|03xx xxx xxxx|055 xxxx xxxx|056 xxxx xxxx|070 xxxx xxxx|07624 xxxxxx|076 xxxx xxxx|07xxx xxxxxx|0800 xxx xxxx|08xx xxx xxxx|09xx xxx xxxx|(016977) xxxx|(01xxx) xxxxx|0500 xxxxxx|0800 xxxxxx|0800 1111|0845 46 4x">{$this->L["uk"]}</option>
-		<option value="0X xx xx xx xx">{$this->L["france"]}</option>
-		<option value="(0X) xxxx xxxx">{$this->L["australia"]}</option>
-		<option value="(0xx) xxxxxxxx|(0xxx) xxxxxxxx|(0xxxx) xxxxxxx|(03xxxx) xxxxxx">{$this->L["germany"]}</option>
-		<option value="0xx-xxx-xxxx">{$this->L["japan"]}</option>
-		<option value="1-Xxx-Xxx-xxxx|Xxx-xxxx">{$this->L["different_formats"]}</option>
-	</select>
-EOF;
-		return $html;
-	}
-
-	public function getOptionsColumnHTML() {
-		$html = '<input type="text" name="dtOption_%ROW%" id="dtOption_%ROW%" style="width: 267px" />';
-		return $html;
-	}
-
-	public function getHelpHTML() {
-		$html =<<<END
-	<p>
-		{$this->L["help_text1"]}
-	</p>
-	<p>
-		{$this->L["help_text2"]}
-	</p>
-	<p>
-		{$this->L["help_text3"]}
-	</p>
-END;
-
-	    return $html;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(100) default NULL",
-			"SQLField_Oracle" => "varchar2(100) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(100) NULL"
-		);
-	}
-}
\ No newline at end of file
diff --git a/plugins/dataTypes/Phone/Phone.js b/plugins/dataTypes/Phone/Phone.js
deleted file mode 100755
index a9c243c4c..000000000
--- a/plugins/dataTypes/Phone/Phone.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	var MODULE_ID = "data-type-Phone";
-	var LANG = L.dataTypePlugins.Phone;
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.DATA_TABLE.ROW.EXAMPLE_CHANGE + "__" + MODULE_ID] = _exampleChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _saveRow = function(rowNum) {
-		return {
-			"example":  $("#dtExample_" + rowNum).val(),
-			"option":   $("#dtOption_" + rowNum).val()
-		};
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {
-				$("#dtExample_" + rowNum).val(data.example);
-				$("#dtOption_" + rowNum).val(data.option);
-			},
-			isComplete: function() { return $("#dtOption_" + rowNum).length > 0; }
-		};
-	};
-
-	var _exampleChange = function(msg) {
-		$("#dtOption_" + msg.rowID).val(msg.value);
-	};
-
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-		for (var i=0; i<rows.length; i++) {
-			if ($("#dtOption_" + rows[i]).val() === "") {
-				var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-				visibleProblemRows.push(visibleRowNum);
-				problemFields.push($("#dtOption_" + rows[i]));
-			}
-		}
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		validate: _validate,
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/Phone/lang/de.php b/plugins/dataTypes/Phone/lang/de.php
deleted file mode 100644
index 280c6cad9..000000000
--- a/plugins/dataTypes/Phone/lang/de.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Telefon / Fax";
-
-$L["australia"] = "Australien";
-$L["different_formats"] = "Unterschiedliche Formate";
-$L["example_1"] = "Kanada (1)";
-$L["example_2"] = "Kanada (2)";
-$L["france"] = "Frankreich";
-$L["germany"] = "Deutschland";
-$L["help_text1"] = "Was Text Sie in den Optionen Textfeld eingeben werden verwendet, um Telefonnummern zu generieren. Kapital <b>X</b>'s zu einer Zufallszahl zwischen 1 und 9 umgewandelt werden; Kleinbuchstaben <b>x</b>'s zu einer Zufallszahl umgewandelt werden zwischen 0 und 9.";
-$L["help_text2"] = "Wählen Sie einen der Werte im Beispiel Dropdown für einige Ideen. Denken Sie daran: alles andere als die <b>X</b> und <b>x</b>-Zeichen übrig unbekehrt.";
-$L["help_text3"] = "Wie bei vielen der anderen Datentypen zu generieren Telefonnummern in mehreren Formaten trennen Sie sie mit einem Rohr | Charakter.";
-$L["incomplete_fields"] = "The Phone / Fax Datentyp haben muss das Format eingetragen im Options Textfeld. Bitte beheben Sie die folgenden Zeilen:";
-$L["japan"] = "Japan";
-$L["uk"] = "Vereinigtes Königreich";
diff --git a/plugins/dataTypes/Phone/lang/en.php b/plugins/dataTypes/Phone/lang/en.php
deleted file mode 100644
index 0f3a6737c..000000000
--- a/plugins/dataTypes/Phone/lang/en.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Phone / Fax";
-
-$L["different_formats"] = "Different formats";
-$L["example_1"] = "Canada (1)";
-$L["example_2"] = "Canada (2)";
-$L["help_text1"] = "Whatever text you enter into the options text field will be used to generate telephone numbers. Capital <b>X</b>&#39;s will be converted to a random number between 1 and 9; lower-case <b>x</b>&#39;s will be converted to a random number between 0 and 9.";
-$L["help_text2"] = "Select one of the values in the example dropdown for some ideas. Remember: anything other than the <b>X</b> and <b>x</b> character are left unconverted.";
-$L["help_text3"] = "As with many of the other data types, to generate phone numbers in multiple format separate them with a pipe | character.";
-$L["incomplete_fields"] = "The Phone data type needs to have the format entered in the Options text field. Please fix the following rows:";
-$L["uk"] = "UK";
-$L["france"] = "France";
-$L["germany"] = "Germany";
-$L["australia"] = "Australia";
-$L["japan"] = "Japan";
-$L["incomplete_fields"] = "The Phone / Fax data type needs to have the format entered in the Options text field. Please fix the following rows:";
diff --git a/plugins/dataTypes/Phone/lang/es.php b/plugins/dataTypes/Phone/lang/es.php
deleted file mode 100644
index e66293538..000000000
--- a/plugins/dataTypes/Phone/lang/es.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Teléfono / Fax";
-
-$L["different_formats"] = "Formatos diferentes";
-$L["example_1"] = "Canada (1)";
-$L["example_2"] = "Canada (2)";
-$L["help_text1"] = "Cualquier texto que introduces en el campo de texto de las opciones será usado para generar números de teléfono. Una <b>X</b> mayúscula será convertida a un número aleatorio entre 1 y 9; Una <b>x</b> minúscula será convertida a un número entre 0 y 9.";
-$L["help_text2"] = "Elije uno de los valores del desplegable de ejemplos para ver algunas ideas. Recuerda: cualquier cosa distinta de los caracteres <b>X</b> y <b>x</b> no será convertida.";
-$L["help_text3"] = "Como con muchos de los otros tipos de dato, para generar números de teléfono in múltiples formatos, sepáralos con un carácter tubería, |.";
-$L["incomplete_fields"] = "El tipo de dato Teléfono requiere informar el formato en el campo de texto Opciones. Por favor, arregla las siguientes filas:";
-$L["uk"] = "Reino Unido";
-$L["france"] = "Francia";
-$L["germany"] = "Alemania";
-$L["australia"] = "Australia";
-$L["japan"] = "Japón";
diff --git a/plugins/dataTypes/Phone/lang/fr.php b/plugins/dataTypes/Phone/lang/fr.php
deleted file mode 100644
index bef9358c1..000000000
--- a/plugins/dataTypes/Phone/lang/fr.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Téléphone / Fax";
-
-$L["australia"] = "Australie";
-$L["different_formats"] = "Différents formats";
-$L["example_1"] = "Canada (1)";
-$L["example_2"] = "Canada (2)";
-$L["france"] = "France";
-$L["germany"] = "Allemagne";
-$L["help_text1"] = "Quel que soit le texte que vous saisissez dans le champ de texte options, il sera utilisé pour générer des numéros de téléphone. Les <b>X</b> majuscules seront converties en un nombre aléatoire compris entre 1 et 9 et les <b>x</b> minuscules seront converties en un nombre aléatoire entre 0 et 9.";
-$L["help_text2"] = "Sélectionnez l'une des valeurs de l'exemple pour avoir une idée du fonctionnement. Rappelez-vous: rien d'autre que les caractères <b>X</b> et <b>x</b> ne sera converti.";
-$L["help_text3"] = "Comme avec la plupart des autres types de données, il est possible de générer des numéros de téléphone au formats multiples: séparez-les par un caractère pipe |.";
-$L["incomplete_fields"] = "Le type de téléphone / fax de données doit avoir un format précisé dans le champ de texte Options. Corrigez les lignes suivantes:";
-$L["japan"] = "Japon";
-$L["name"] = "Téléphone / Fax";
-$L["uk"] = "Royaume-Uni";
\ No newline at end of file
diff --git a/plugins/dataTypes/Phone/lang/nl.php b/plugins/dataTypes/Phone/lang/nl.php
deleted file mode 100644
index 224567bae..000000000
--- a/plugins/dataTypes/Phone/lang/nl.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Telefoon / Fax";
-
-$L["australia"] = "Australië";
-$L["different_formats"] = "Verschillende formaten";
-$L["example_1"] = "Canada (1)";
-$L["example_2"] = "Canada (2)";
-$L["france"] = "Frankrijk";
-$L["germany"] = "Duitsland";
-$L["help_text1"] = "Wat tekst die u invoert in het opties tekstveld wordt gebruikt om telefoonnummers te genereren. Hoofdstad <b>X</b> 's zal worden omgezet naar een willekeurig getal tussen 1 en 9; kleine letters <b>x</b>' s zal worden omgezet naar een willekeurig getal tussen 0 en 9.";
-$L["help_text2"] = "Selecteer een van de waarden in het voorbeeld dropdown voor een aantal ideeën. Vergeet niet: iets anders dan de <b>X</b> en <b>x</b> karakter overblijven onbekeerd.";
-$L["help_text3"] = "Zoals met veel van de andere soorten gegevens, het genereren van telefoonnummers in meerdere formaat ze te scheiden met een pijp | karakter.";
-$L["incomplete_fields"] = "The Phone / Fax gegevenstype dient te beschikken over het formaat ingevoerd in het Opties tekstveld. Please fix de volgende rijen:";
-$L["japan"] = "Japan";
-$L["uk"] = "UK";
\ No newline at end of file
diff --git a/plugins/dataTypes/PhoneRegional/PhoneRegional.class.php b/plugins/dataTypes/PhoneRegional/PhoneRegional.class.php
deleted file mode 100644
index 343e84df5..000000000
--- a/plugins/dataTypes/PhoneRegional/PhoneRegional.class.php
+++ /dev/null
@@ -1,315 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_PhoneRegional extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Phone / Fax, Regional";
-	protected $dataTypeFieldGroup = "human_data";
-	protected $dataTypeFieldGroupOrder = 25;
-	protected $jsModules = array("PhoneRegional.js");
-	protected $cssFiles = array("PhoneRegional.css");
-	protected $processOrder = 3;
-	private   $phoneFormats;
-	private   $unknownCountryPhoneFormat = "(Xxx) Xxx-xxxx";
-
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-
-		// initialize the phone number formats needed for this Data Type
-		if ($runtimeContext == "generation") {
-			self::initPhoneFormats();
-		}
-	}
-
-	public function generate($generator, $generationContextData) {
-
-		// this contains all the country-specific phone formats that the user selected in the UI
-		$countryPhoneFormats = $generationContextData["generationOptions"];
-
-		// 1. check the existing row data to see if this data set contains a country or a region
-		$rowCountryField = $this->getRowCountryField($generationContextData);
-		$rowRegionField  = $this->getRowRegionField($generationContextData);
-
-		// 2. again check the existing data set to get a (maybe) random country and a (maybe) region-specific phone format
-		list($countrySlug, $regionSlug, $customRegionalFormat) = $this->getCountryAndRegionalFormat($countryPhoneFormats, $rowCountryField, $rowRegionField);
-
-		// 3. see if this country-region has any area codes to mess with. Returns an empty array if there are no area codes
-		$areaCodes = $this->getAreaCodes($countrySlug, $regionSlug);
-
-		// 4. now get the desired phone format entered in the UI
-		$desiredFormat = $this->getDesiredPhoneFormat($countrySlug, $countryPhoneFormats);
-
-		// now generate a phone number
-		$phoneNumber = $this->generatePhoneNumber($desiredFormat, $customRegionalFormat, $areaCodes);
-
-		return array(
-			"display" => $phoneNumber
-		);
-	}
-
-
-	/**
-	 * Returns three things based on the data passed:
-	 *  - a random country slug
-	 *  - a region slug
-	 *  - the phone number format for the country-region. If one isn't defined, it returns an empty string.
-	 */
-	private function getCountryAndRegionalFormat($countryPhoneFormats, $rowCountryField, $rowRegionField) {
-		$customRegionalFormat = "";
-		$countrySlug = "";
-		$regionSlug = "";
-
-		// now get the most specific format we have for this country-region
-		if (empty($rowCountryField) && empty($rowRegionField)) {
-			$countrySlug = array_rand($countryPhoneFormats);
-		} else if (!empty($rowRegionField)) {
-			$countrySlug = $rowRegionField["randomData"]["country_slug"];
-			$regionSlug  = $rowRegionField["randomData"]["region_slug"];
-
-			// if there's a custom format for this region, use it. Otherwise use the default format for the country
-			if (array_key_exists($countrySlug, $this->phoneFormats)) {
-				if (array_key_exists($regionSlug, $this->phoneFormats[$countrySlug]["regionSpecificFormat"])) {
-					if (array_key_exists("format", $this->phoneFormats[$countrySlug]["regionSpecificFormat"][$regionSlug])) {
-						$customRegionalFormat = $this->phoneFormats[$countrySlug]["regionSpecificFormat"][$regionSlug]["format"];
-					}
-				}
-			}
-		} else {
-			if (isset($rowCountryField["randomData"]["slug"]) && array_key_exists($rowCountryField["randomData"]["slug"], $countryPhoneFormats)) {
-				$countrySlug = $rowCountryField["randomData"]["slug"];
-			} else {
-				$countrySlug = array_rand($countryPhoneFormats);
-			}
-		}
-
-		return array($countrySlug, $regionSlug, $customRegionalFormat);
-	}
-
-	private function getDesiredPhoneFormat($countrySlug, $countryPhoneFormats) {
-		$phoneFormat = "";
-
-		if (array_key_exists($countrySlug, $countryPhoneFormats)) {
-			$phoneFormat = $countryPhoneFormats[$countrySlug];
-		} else {
-			// here we're generating a row for a country whose format we have NO idea. The whole purpose of the regional phone
-			// Data Type is for countries that we do, so in this case we simple
-			$phoneFormat = $this->unknownCountryPhoneFormat;
-		}
-
-		return $phoneFormat;
-	}
-
-	public function getRowCountryField($generationContextData) {
-		$rowCountryInfo = array();
-		foreach ($generationContextData["existingRowData"] as $row) {
-			if ($row["dataTypeFolder"] == "Country") {
-				$rowCountryInfo = $row;
-				break;
-			}
-		}
-		return $rowCountryInfo;
-	}
-
-	public function getRowRegionField($generationContextData) {
-		$rowRegionInfo = array();
-		foreach ($generationContextData["existingRowData"] as $row) {
-			if ($row["dataTypeFolder"] == "Region") {
-				$rowRegionInfo = $row;
-				break;
-			}
-		}
-		return $rowRegionInfo;
-	}
-
-	// it blows my mind how awful this method is
-	private function getAreaCodes($countrySlug, $regionSlug) {
-		if (!array_key_exists($countrySlug, $this->phoneFormats)) {
-			return array();
-		}
-		if (!array_key_exists("phoneFormat", $this->phoneFormats[$countrySlug])) {
-			return array();
-		}
-		if (!array_key_exists("areaCodes", $this->phoneFormats[$countrySlug]["phoneFormat"])) {
-			return array();
-		}
-		$areaCodes = $this->phoneFormats[$countrySlug]["phoneFormat"]["areaCodes"];
-
-		if (array_key_exists($regionSlug, $this->phoneFormats[$countrySlug]["regionSpecificFormat"])) {
-			if (array_key_exists("areaCodes", $this->phoneFormats[$countrySlug]["regionSpecificFormat"][$regionSlug])) {
-				$areaCodes = $this->phoneFormats[$countrySlug]["regionSpecificFormat"][$regionSlug]["areaCodes"];
-			}
-		}
-
-		return $areaCodes;
-	}
-
-	public function getOptionsColumnHTML() {
-		$countryPlugins = Core::$countryPlugins;
-
-		$html = "";
-		foreach ($countryPlugins as $pluginInfo) {
-			$slug       = $pluginInfo->getSlug();
-			$regionName = $pluginInfo->getRegionNames();
-			$extendedData = $pluginInfo->getExtendedData();
-
-			if (!isset($extendedData["phoneFormat"]) || !isset($extendedData["phoneFormat"]["displayFormats"])) {
-				continue;
-			}
-
-			$options = $this->getDisplayFormatOptions($slug, $extendedData["phoneFormat"]["displayFormats"]);
-			$html .= <<<EOF
-<div class="dtPhoneRegionalCountry dtPhoneRegionalCountry_$slug">
-	<label for="dtPhoneRegional_{$slug}_%ROW%">$regionName</label>
-	$options
-</div>
-EOF;
-		}
-		$html .= '<div id="dtPhoneRegional_Complete%ROW%"></div>';
-
-		return $html;
-	}
-
-	public function getDisplayFormatOptions($countrySlug, $displayFormats) {
-		$options = "";
-		$id = "dtPhoneRegional_{$countrySlug}_%ROW%";
-
-		if (is_string($displayFormats)) {
-			$options = "<input type=\"hidden\" name=\"$id\" id=\"$id\" value=\"$displayFormats\" />$displayFormats";
-		} else {
-			if (is_array($displayFormats) && count($displayFormats) == 1) {
-				$options = "<input type=\"hidden\" name=\"$id\" id=\"$id\" value=\"{$displayFormats[0]}\" />{$displayFormats[0]}";
-			} else {
-				$options = "<select name=\"$id\" id=\"$id\">";
-				for ($i=0; $i<count($displayFormats); $i++) {
-					$options .= "<option value=\"{$displayFormats[$i]}\">{$displayFormats[$i]}</option>";
-				}
-				$options .= "</select>";
-			}
-		}
-
-		return $options;
-	}
-
-	/**
-	 * Loop through the formats returned by the client for the supported country plugins and make a note of the
-	 * format chosen.
-	 * @param object $generator
-	 * @param $postdata
-	 * @param $colNum
-	 * @param $numCols
-	 * @return array|mixed
-	 */
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		$countries = $generator->getCountries();
-
-		// if the user didn't select any Country plugins, they want ANY old region
-		$countryPhoneFormats = array();
-		foreach ($countries as $slug) {
-			$key = "dtPhoneRegional_{$slug}_$colNum";
-			if (array_key_exists($key, $postdata)) {
-				$countryPhoneFormats[$slug] = $postdata[$key];
-			}
-		}
-
-		return $countryPhoneFormats;
-	}
-
-
-	public function getHelpHTML() {
-		$html =<<<END
-	<p>
-		{$this->L["help_text"]}
-	</p>
-END;
-	    return $html;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(100) default NULL",
-			"SQLField_Oracle" => "varchar2(100) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(100) NULL"
-		);
-	}
-
-	private function initPhoneFormats() {
-		$countryPlugins = Core::$countryPlugins;
-		$formats = array();
-		foreach ($countryPlugins as $countryInfo) {
-			$extendedData = $countryInfo->getExtendedData();
-			if (!isset($extendedData["phoneFormat"]) || !isset($extendedData["phoneFormat"]["displayFormats"])) {
-				continue;
-			}
-
-			$formats[$countryInfo->getSlug()] = array(
-				"phoneFormat"=> $extendedData["phoneFormat"],
-				"regionSpecificFormat" => $countryInfo->getRegionalExtendedData("phoneFormat")
-			);
-		}
-		$this->phoneFormats = $formats;
-	}
-
-
-	private function generatePhoneNumber($desiredFormat, $customRegionFormat, $areaCodes) {
-
-		// first off, replace any area code in the desired format
-		$phoneNumber = $this->replaceRandomAreaCode($desiredFormat, $areaCodes);
-
-		// if there isn't a custom region format, no problem - just switch out the X's and x's
-		if (empty($customRegionFormat)) {
-			$phoneNumber = Utils::generateRandomAlphanumericStr($phoneNumber);
-		} else {
-			// there IS a custom format. This is more complicated. We need to now merge $customRegionFormat (e.g. 123xxxx)
-			// with the $desiredFormat (e.g. 1 (604) xxx-xxxx). The assumption here is that area codes always come first.
-			$replacementChars = Utils::generateRandomAlphanumericStr($customRegionFormat);
-
-			$phoneNumberRev      = strrev($phoneNumber);
-			$replacementCharsRev = strrev($replacementChars);
-			$xIndex = 0;
-			$newPhoneNumber = "";
-			for ($i=0; $i<strlen($phoneNumberRev); $i++) {
-				$currChar = $phoneNumberRev[$i];
-				if ($currChar === "x") {
-					$newPhoneNumber .= $replacementCharsRev[$xIndex];
-					$xIndex++;
-				} else {
-					$newPhoneNumber .= $currChar;
-				}
-			}
-			$phoneNumber = strrev($newPhoneNumber);
-		}
-
-		return $phoneNumber;
-	}
-
-	/**
-	 * Assumption: the area code is in a single block of A's.
-	 * @param $desiredFormat
-	 * @param $areaCodes
-	 * @return mixed|string
-	 */
-	private function replaceRandomAreaCode($desiredFormat, $areaCodes) {
-
-		// if the desired format doesn't contain an area code, shut down the party
-		if (!strstr($desiredFormat, "A")) {
-			return $desiredFormat;
-		}
-
-		$str = "";
-		if (!empty($areaCodes)) {
-			$areaCode = $areaCodes[mt_rand(0, count($areaCodes)-1)];
-			$str = preg_replace("/A+/", $areaCode, $desiredFormat);
-		} else {
-			preg_match("/A+/", $desiredFormat, $matches);
-			$areaCodeLength = strlen($matches[0]);
-			$replacement = substr("Xxxxxxxxxxxxxxxx", 0, $areaCodeLength);
-			$str = preg_replace("/A+/", Utils::generateRandomAlphanumericStr($replacement), $desiredFormat);
-		}
-		return $str;
-	}
-
-}
diff --git a/plugins/dataTypes/PhoneRegional/PhoneRegional.css b/plugins/dataTypes/PhoneRegional/PhoneRegional.css
deleted file mode 100644
index 13e6d75fa..000000000
--- a/plugins/dataTypes/PhoneRegional/PhoneRegional.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.dtPhoneRegionalCountry {
-    clear: both;
-}
-
-.dtPhoneRegionalCountry label {
-    float: left;
-    width: 150px;
-}
-.dtPhoneRegionalCountry input {
-    float: left;
-    width: 115px;
-}
-.dtPhoneRegionalCountry select {
-    float: left;
-    width: 120px;
-}
\ No newline at end of file
diff --git a/plugins/dataTypes/PhoneRegional/PhoneRegional.js b/plugins/dataTypes/PhoneRegional/PhoneRegional.js
deleted file mode 100644
index 8c885b56f..000000000
--- a/plugins/dataTypes/PhoneRegional/PhoneRegional.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*global define:false,$:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-	"use strict";
-
-	var MODULE_ID = "data-type-PhoneRegional";
-	var LANG = L.dataTypePlugins.PhoneRegional;
-	var _currSelectedCountries = null;
-
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.COUNTRIES.CHANGE] = _countryChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _saveRow = function(rowNum) {
-		var data = {};
-		for (var i=0; i<_currSelectedCountries.length; i++) {
-			var el = $("#dtPhoneRegional_" + _currSelectedCountries[i] + "_" + rowNum);
-			if (el.length) {
-				data[_currSelectedCountries[i]] = el.val();
-			}
-		}
-
-		// find the checkboxes in this row
-		return data;
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() {
-				for (var countrySlug in data) {
-					$("#dtPhoneRegional_" + countrySlug + "_" + rowNum).val(data[countrySlug]);
-				}
-			},
-			isComplete: function() { return true; }
-		}
-	};
-
-	/**
-	 * This is called any time the country list changes - including on load. It ensures only the appropriate
-	 * regions are displayed.
-	 */
-	var _countryChange = function(msg) {
-		_currSelectedCountries = msg.countries;
-		var shownClassesSelectors = [];
-		for (var i=0; i<msg.countries.length; i++) {
-			shownClassesSelectors.push(".dtPhoneRegionalCountry_" + msg.countries[i]);
-		}
-		var shownClassesSelector = shownClassesSelectors.join(",");
-		$(".dtPhoneRegionalCountry").hide();
-		$(shownClassesSelector).show();
-	};
-
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-});
diff --git a/plugins/dataTypes/PhoneRegional/lang/de.php b/plugins/dataTypes/PhoneRegional/lang/de.php
deleted file mode 100644
index e1e76479b..000000000
--- a/plugins/dataTypes/PhoneRegional/lang/de.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Telefon / Fax, Regional";
-
-$L["help_text"] = "Dieser Datentyp versucht, eine Telefonnummer in einem geeigneten Format für die Reihe von Daten zu generieren. Wenn es ein unbekanntes Land trifft, erzeugt es einen Standard-Rufnummer im Format (xxx) xxx-xxxx.";
diff --git a/plugins/dataTypes/PhoneRegional/lang/en.php b/plugins/dataTypes/PhoneRegional/lang/en.php
deleted file mode 100644
index dfaf88cc9..000000000
--- a/plugins/dataTypes/PhoneRegional/lang/en.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Phone / Fax, Regional";
-
-$L["help_text"] = "This Data Type tries to generate a phone number in an appropriate format for the row of data. If it encounters an unfamiliar country, it generates a default phone number in the format (xxx) xxx-xxxx.";
diff --git a/plugins/dataTypes/PhoneRegional/lang/es.php b/plugins/dataTypes/PhoneRegional/lang/es.php
deleted file mode 100644
index fc48e436c..000000000
--- a/plugins/dataTypes/PhoneRegional/lang/es.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Teléfono / Fax, Regional";
-
-$L["help_text"] = "Este tipo de datos trata de generar un número de teléfono en un formato adecuado para la fila de datos. Si se encuentra con un país desconocido, genera un número de teléfono predeterminado en el formato (xxx) xxx-xxxx.";
diff --git a/plugins/dataTypes/PhoneRegional/lang/fr.php b/plugins/dataTypes/PhoneRegional/lang/fr.php
deleted file mode 100644
index 842c19056..000000000
--- a/plugins/dataTypes/PhoneRegional/lang/fr.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Téléphone / Fax, Régional";
-
-$L["help_text"] = "Ce type de données tente de générer un numéro de téléphone dans un format approprié pour la ligne de données. Si elle rencontre un pays inconnu, il génère un numéro de téléphone par défaut dans le format (xxx) xxx-xxxx.";
diff --git a/plugins/dataTypes/PhoneRegional/lang/nl.php b/plugins/dataTypes/PhoneRegional/lang/nl.php
deleted file mode 100644
index 8f56a9f7a..000000000
--- a/plugins/dataTypes/PhoneRegional/lang/nl.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Telefoon / Fax, Regionaal ";
-
-$L["help_text"] = "Dit Gegevenstype probeert een telefoonnummer in een geschikt formaat voor de rij met gegevens genereren. Komt hij een onbekend land, het genereert een standaard telefoonnummer in het formaat (xxx) xxx-xxxx.";
diff --git a/plugins/dataTypes/PostalZip/PostalZip.class.php b/plugins/dataTypes/PostalZip/PostalZip.class.php
deleted file mode 100644
index b14d76a41..000000000
--- a/plugins/dataTypes/PostalZip/PostalZip.class.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_PostalZip extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Postal / Zip";
-	protected $dataTypeFieldGroup = "geo";
-	protected $dataTypeFieldGroupOrder = 30;
-	protected $processOrder = 3;
-	protected $jsModules = array("PostalZip.js");
-	private $zipFormats;
-
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-
-		// if we're in the process of generating data then initialize a private var with the
-		// zip formats of all countries registered the system
-		if ($runtimeContext == "generation") {
-			self::initZipFormats();
-		}
-	}
-
-	// this kind of sucks! Way too dense logic - too high cyclomatic complexity.
-	public function generate($generator, $generationContextData) {
-		$selectedCountrySlugs = $generationContextData["generationOptions"];
-
-		// track the country info (this finds the FIRST country field listed)
-		$rowCountryInfo = array();
-		while (list($key, $info) = each($generationContextData["existingRowData"])) {
-			if ($info["dataTypeFolder"] == "Country") {
-				$rowCountryInfo = $info;
-				break;
-			}
-		}
-		
-		// if there was no country, see if there's a region
-		$rowRegionInfo = array();
-		if (empty($rowCountryInfo)) {
-			reset($generationContextData["existingRowData"]);
-			while (list($key, $info) = each($generationContextData["existingRowData"])) {
-				if ($info["dataTypeFolder"] == "Region") {
-					$rowRegionInfo = $info;
-					break;
-				}
-			}
-		}
-
-		// if we have a region, get the short code to use with the convert() function
-		$regionCode = "";
-		reset($generationContextData["existingRowData"]);
-		while (list($key, $info) = each($generationContextData["existingRowData"])) {
-			if ($info["dataTypeFolder"] == "Region") {
-				$regionCode = $info["randomData"]["region_slug"];
-				break;
-			}
-		}
-		
-		$randomZip = "";
-
-		// if there's neither a country nor a region, get a random country and generate a random zip/postal code
-		// in that format
-		if (empty($rowCountryInfo) && empty($rowRegionInfo)) {
-			if (empty($selectedCountrySlugs)) {
-				$randCountrySlug = array_rand($this->zipFormats);
-			} else {
-				$randCountrySlug = $selectedCountrySlugs[mt_rand(0, count($selectedCountrySlugs)-1)];
-			}
-			$randomZip = $this->convert($randCountrySlug, "");
-		} else {
-
-			$countrySlug = "";
-			if (!empty($rowCountryInfo) && is_array($rowCountryInfo["randomData"]) && array_key_exists("slug", $rowCountryInfo["randomData"])) {
-				$countrySlug = $rowCountryInfo["randomData"]["slug"];
-			} else {
-				if (isset($rowRegionInfo["randomData"]) && is_array($rowRegionInfo["randomData"]) && array_key_exists("country_slug", $rowRegionInfo["randomData"])) {
-					$countrySlug = $rowRegionInfo["randomData"]["country_slug"];
-				}
-			}
-
-			if (!empty($countrySlug) && in_array($countrySlug, $selectedCountrySlugs)) {
-				$randomZip = $this->convert($countrySlug, $regionCode);
-			} else {
-				$randCountrySlug = array_rand($this->zipFormats);
-				$randomZip = $this->convert($randCountrySlug, $regionCode);
-			}
-		}
-
-		return array(
-			"display" => $randomZip
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		$countries = $generator->getCountries();
-		$options = array();
-		foreach ($countries as $slug) {
-			if (isset($postdata["dtCountryIncludeZip_{$slug}_$colNum"])) {
-				$options[] = $slug;
-			}
-		}
-		return $options;
-	}
-
-	public function getOptionsColumnHTML() {
-		$countryPlugins = Core::$countryPlugins;
-		$html = "";
-		foreach ($countryPlugins as $pluginInfo) {
-			$slug       = $pluginInfo->getSlug();
-			$regionName = $pluginInfo->getRegionNames();
-
-			$html .= <<<EOF
-<div class="dtCountry dtCountry_$slug">
-	<input type="checkbox" name="dtCountryIncludeZip_{$slug}_%ROW%"
-	id="dtCountryIncludeZip_{$slug}_%ROW%" checked="checked" data-country="{$slug}" /><label for="dtCountryIncludeZip_{$slug}_%ROW%">$regionName</label>
-</div>
-EOF;
-		}
-		$html .= '<div id="dtCountry_Complete%ROW%"></div>';
-
-		return $html;
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["help_text"]}</p>";
-	}
-
-	/**
-	 * This is called when data generation starts. It does the work of generating a data structure containing all
-	 * the info we need to intelligently generate a zip format for the country-region.
-	 */
-	private function initZipFormats() {
-		$countryPlugins = Core::$countryPlugins;
-		$formats = array();
-		foreach ($countryPlugins as $countryInfo) {
-			$extendedData = $countryInfo->getExtendedData();
-
-			if (!isset($extendedData["zipFormat"])) {
-				continue;
-			}
-
-			$format = "";
-			$isAdvanced = false;
-			$replacements = array();
-			if (is_string($extendedData["zipFormat"])) {
-				$format = $extendedData["zipFormat"];
-			} else if (array_key_exists("format", $extendedData["zipFormat"]) && is_string($extendedData["zipFormat"]["format"])) {
-				$format = $extendedData["zipFormat"]["format"];
-				$replacements = isset($extendedData["zipFormat"]["replacements"]) ? $extendedData["zipFormat"]["replacements"] : array(); // TODO double check empty array is valid
-				$isAdvanced = true;
-			}
-
-			if (empty($format)) {
-				continue;
-			}
-
-			$returnInfo = array(
-				"format"       => $format,
-				"replacements" => $replacements,
-				"isAdvanced"   => $isAdvanced,
-				"regionSpecificFormat" => array()
-			);
-			if ($isAdvanced) {
-				$returnInfo["regionSpecificFormat"] = $countryInfo->getRegionalExtendedData("zipFormat");
-			}
-			$formats[$countryInfo->getSlug()] = $returnInfo;
-		}
-		$this->zipFormats = $formats;
-	}
-
-
-	private function convert($countrySlug, $regionShort = "") {
-		$zipInfo = $this->zipFormats[$countrySlug];
-
-		$result = "";
-		if ($zipInfo["isAdvanced"]) {
-
-			// if the country plugin defined a custom zip format for this region, use it
-			if (!empty($regionShort) && !empty($zipInfo["regionSpecificFormat"]) && array_key_exists($regionShort, $zipInfo["regionSpecificFormat"])) {
-				$customFormat = isset($zipInfo["regionSpecificFormat"][$regionShort]["format"]) ? $zipInfo["regionSpecificFormat"][$regionShort]["format"]: "";
-				$replacements = isset($zipInfo["regionSpecificFormat"][$regionShort]["replacements"]) ? $zipInfo["regionSpecificFormat"][$regionShort]["replacements"] : "";
-			}
-			$customFormat = !empty($customFormat) ? $customFormat : $zipInfo["format"];
-			$replacements = !empty($replacements) ? $replacements : $zipInfo["replacements"];
-
-			// now iterate over $customFormat and do whatever replacements have been specified
-			for ($i=0; $i<strlen($customFormat); $i++) {
-				if (array_key_exists($customFormat[$i], $replacements)) {
-					$replacementKey = $replacements[$customFormat[$i]];
-					$randChar = $replacementKey[mt_rand(0, strlen($replacementKey)-1)];
-					$result .= $randChar;
-				} else {
-					$result .= $customFormat[$i];
-				}
-			}
-		} else {
-			$formats = explode("|", $zipInfo["format"]);
-			if (count($formats) == 1) {
-				$format = $formats[0];
-			} else {
-				$format = $formats[mt_rand(0, count($formats)-1)];
-			}
-			$result = Utils::generateRandomAlphanumericStr($format);
-		}
-
-		return $result;
-	}
-
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(10) default NULL",
-			"SQLField_Oracle" => "varchar2(10) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(10) NULL"
-		);
-	}
-}
diff --git a/plugins/dataTypes/PostalZip/PostalZip.js b/plugins/dataTypes/PostalZip/PostalZip.js
deleted file mode 100755
index 0d5028da7..000000000
--- a/plugins/dataTypes/PostalZip/PostalZip.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang"
-], function(manager, C, L) {
-
-	"use strict";
-
-	var MODULE_ID = "data-type-PostalZip";
-	var LANG = L.dataTypePlugins.PostalZip;
-	var _currSelectedCountries = null;
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.COUNTRIES.CHANGE] = _countryChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _saveRow = function(rowNum) {
-		var shownClassesSelectors = [];
-		for (var i=0; i<_currSelectedCountries.length; i++) {
-			shownClassesSelectors.push(".dtCountry_" + _currSelectedCountries[i] + " input");
-		}
-		var shownClassesSelector = shownClassesSelectors.join(",");
-
-		// find the checkboxes in this row
-		var visible = $("#gdColOptions_" + rowNum).find(shownClassesSelector);
-		var checked = [];
-		for (var j=0; j<visible.length; j++) {
-			if (visible[j].checked) {
-				checked.push($(visible[j]).data("country"));
-			}
-		}
-		return {
-			"checked": checked
-		};
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() { },
-			isComplete: function() {
-				if ($("#dtCountry_Complete" + rowNum).length) {
-					$("#gdColOptions_" + rowNum + " input").removeAttr("checked");
-					for (var i=0; i<data.checked.length; i++) {
-						$("#dtCountryIncludeZip_" + data.checked[i] + "_" + rowNum).attr("checked", "checked");
-					}
-					return true;
-				} else {
-					return false;
-				}
-			}
-		};
-	};
-
-	// N.B this also fires on page load, ensuring that _currSelectedCountries is initialized
-	var _countryChange = function(msg) {
-		_currSelectedCountries = msg.countries;
-		var shownClassesSelectors = [];
-		for (var i=0; i<msg.countries.length; i++) {
-			shownClassesSelectors.push(".dtCountry_" + msg.countries[i]);
-		}
-		var shownClassesSelector = shownClassesSelectors.join(",");
-		$(".dtCountry").hide();
-		$(shownClassesSelector).show();
-	};
-
-	var _validate = function() {
-
-	};
-
-	// register our module
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		validate: _validate,
-		saveRow: _saveRow,
-		loadRow: _loadRow
-	});
-});
-
-
-/*
-var PostalZip_ns = {
-  loadRow: function(rowNum, data)
-  {
-    var cleanData = [];
-    $(data.zips).each(function() {
-      cleanData.push(this.replace(/\d/g, ""));
-    });
-
-    return [
-      function() {
-        $("#options_" + rowNum + " input:checkbox").each(function() {
-          var nameWithoutNum = this.name.replace(/\d/g, "");
-          $(this).attr("checked", $.inArray(nameWithoutNum, cleanData) != -1);
-        });
-      },
-
-			<?php
-			// find out how many checkboxes are in the generated markup: one for each country. Then,
-			// use that info to let the calling script know when the markup is fully generated.
-			$num_countries = count(gd_get_configurable_countries());
-			?>
-      function() { return ($("#options_" + rowNum + " input:checkbox").size() == <?=$num_countries ?>); }
-    ];
-  },
-
-  saveRow: function(rowNum)
-  {
-    var zips = [];
-    $("#options_" + rowNum + " input:checked").each(function() {
-      // strip out any row numbers from the name attributes. We're not interested in them. When
-      // it comes to reloading the content, they'll be in the way
-      zips.push(this.name.replace(/\d/g, ""));
-    });
-
-    return { "zips": zips };
-  }
-}
-*/
\ No newline at end of file
diff --git a/plugins/dataTypes/PostalZip/lang/de.php b/plugins/dataTypes/PostalZip/lang/de.php
deleted file mode 100644
index eefad7e6c..000000000
--- a/plugins/dataTypes/PostalZip/lang/de.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Postal / Zip";
-
-$L["help_text"] = "Generiert einen zufälligen Postleitzahl ein. Für eine bessere Kontrolle, verwenden Sie den alpha-numerischen Daten-Option aus.";
diff --git a/plugins/dataTypes/PostalZip/lang/en.php b/plugins/dataTypes/PostalZip/lang/en.php
deleted file mode 100644
index 5447cea6e..000000000
--- a/plugins/dataTypes/PostalZip/lang/en.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Postal / Zip";
-$L["help_text"] = "Generates a random zip or postal code. For greater control, use the alpha-numeric data type option.";
\ No newline at end of file
diff --git a/plugins/dataTypes/PostalZip/lang/es.php b/plugins/dataTypes/PostalZip/lang/es.php
deleted file mode 100644
index 78926f4ae..000000000
--- a/plugins/dataTypes/PostalZip/lang/es.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Código postal";
-$L["help_text"] = "Genera un código postal aleatorio. Para mayor control, utilice la opción de tipo de dato alfanumérico.";
diff --git a/plugins/dataTypes/PostalZip/lang/fr.php b/plugins/dataTypes/PostalZip/lang/fr.php
deleted file mode 100644
index 96295d36e..000000000
--- a/plugins/dataTypes/PostalZip/lang/fr.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Code Postal";
-
-$L["help_text"] = "Génère un code postal aléatoire. Pour un meilleur contrôle, utilisez le type de données Alphanumérique.";
diff --git a/plugins/dataTypes/PostalZip/lang/nl.php b/plugins/dataTypes/PostalZip/lang/nl.php
deleted file mode 100644
index 1b553adbc..000000000
--- a/plugins/dataTypes/PostalZip/lang/nl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Postal / Zip";
-$L["help_text"] = "Genereert een willekeurig zip of postcode. Voor meer controle gebruikt u de alpha-numeriek gegevenstype optie.";
diff --git a/plugins/dataTypes/Region/Region.class.php b/plugins/dataTypes/Region/Region.class.php
deleted file mode 100644
index fdeb4acc7..000000000
--- a/plugins/dataTypes/Region/Region.class.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_Region extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Region";
-	protected $dataTypeFieldGroup = "geo";
-	protected $dataTypeFieldGroupOrder = 40;
-	protected $processOrder = 2;
-	protected $jsModules = array("Region.js");
-	protected $cssFiles = array("Region.css");
-	private $countryRegionHash;
-
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-
-		if ($runtimeContext == "generation") {
-			$this->countryRegionHash = Core::$geoData->getCountryRegionHash();
-		}
-	}
-
-	/**
-	 * Generate a random region, and return the display string and additional meta data for use
-	 * by any other Data Type.
-	 */
-	public function generate($generator, $generationContextData) {
-		$generationOptions = $generationContextData["generationOptions"];
-
-		$regionInfo = array();
-		$keys = array("region", "region_short");
-
-		// if no country plugins were defined, we just randomly grab a region from what's available
-		if ($generationOptions["resultType"] == "any") {
-
-			$randRegionInfo = $this->getRandRegion($this->countryRegionHash);
-
-			$index = mt_rand(0, 1);
-			$regionInfo["display"]      = $randRegionInfo[$keys[$index]];
-			$regionInfo["region_slug"]  = $randRegionInfo["region_slug"];
-			$regionInfo["country_slug"] = $randRegionInfo["countrySlug"];
-
-		// here, one or more Country plugins were included
-		// 	- if there's a country row, pick a region within it.
-		// 	- if not, pick any region within the list of country plugins
-		} else {
-
-			// see if this row has a country - TODO memoize
-			$rowCountryInfo = array();
-			while (list($key, $info) = each($generationContextData["existingRowData"])) {
-				if ($info["dataTypeFolder"] == "Country") {
-					$rowCountryInfo = $info;
-					break;
-				}
-			}
-
-			// if the data set didn't include a Country, just generate any old region pulled from any of the
-			// Country plugins selected
-			if (empty($rowCountryInfo)) {
-				$randRegionInfo = $this->getRandRegion($generationOptions["countries"]);
-				$randCountrySlug = $randRegionInfo["countrySlug"];
-
-				// pick a format (short / long) based on whatever the specified through the UI
-				$formatIndex = $this->getRandIndex($generationOptions["countries"], $randCountrySlug);
-				$regionInfo["display"]      = $randRegionInfo[$keys[$formatIndex]];
-				$regionInfo["region_slug"]  = $randRegionInfo["region_slug"];
-				$regionInfo["country_slug"] = $randCountrySlug;
-
-			// here, there *was* a country Data Type chosen and the Country row is pulling from the subset of
-			// Country plugins
-			} else {
-
-				// the slug exists if the row country was one of the Country plugins
-				$currRowCountrySlug = array_key_exists("slug", $rowCountryInfo["randomData"]) ? $rowCountryInfo["randomData"]["slug"] : "";
-
-				// here, we've gotten the slug of the country for this particular row, but the user may have unselected
-				// it from the row's generation options. See if it's available and if so, use that; otherwise, display
-				// any old region from the selected Country plugins
-				if (array_key_exists($currRowCountrySlug, $generationOptions["countries"])) {
-					$regions = $this->countryRegionHash[$currRowCountrySlug];
-					$regionInfo = $regions["regions"][mt_rand(0, $regions["numRegions"]-1)];
-					$index = $this->getRandIndex($generationOptions["countries"], $currRowCountrySlug);
-					$regionInfo["display"] = $regionInfo[$keys[$index]];
-				} else {
-					$randRegionInfo = $this->getRandRegion($generationOptions["countries"]);
-					$randCountrySlug = $randRegionInfo["countrySlug"];
-					$formatIndex = $this->getRandIndex($generationOptions["countries"], $randCountrySlug);
-					$randCountry = $this->countryRegionHash[$randCountrySlug];
-					$regionInfo = $randCountry["regions"][mt_rand(0, $randCountry["numRegions"]-1)];
-					$regionInfo["display"] = $regionInfo[$keys[$formatIndex]];
-				}
-
-				$regionInfo["country_slug"] = $currRowCountrySlug;
-			}
-		}
-
-		return $regionInfo;
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		$countries = $generator->getCountries();
-		$generationOptions = array();
-
-		// if the user didn't select any Country plugins, they want ANY old region
-		if (empty($countries)) {
-			$generationOptions["resultType"] = "any";
-		} else {
-			$generationOptions["resultType"] = "specificCountries";
-			$generationOptions["countries"] = array();
-
-			foreach ($countries as $slug) {
-				if (isset($postdata["dtIncludeRegion_{$slug}_$colNum"])) {
-					$region_full  = (isset($postdata["dtIncludeRegion_{$slug}_Full_$colNum"])) ? true : false;
-					$region_short = (isset($postdata["dtIncludeRegion_{$slug}_Short_$colNum"])) ? true : false;
-					$generationOptions["countries"][$slug] = array(
-						"full"  => $region_full,
-						"short" => $region_short
-					);
-				}
-			}
-		}
-
-		return $generationOptions;
-	}
-
-
-	public function getOptionsColumnHTML() {
-		$countryPlugins = Core::$countryPlugins;
-
-		$html = "<div class=\"dtRegionCountry_noCountries\">{$this->L["no_countries_selected"]}</div>";
-		foreach ($countryPlugins as $pluginInfo) {
-			$slug       = $pluginInfo->getSlug();
-			$regionName = $pluginInfo->getRegionNames();
-
-			$html .= <<<EOF
-<div class="dtRegionCountry dtRegionCountry_$slug">
-	<input type="checkbox" name="dtIncludeRegion_{$slug}_%ROW%" id="dtIncludeRegion_{$slug}_%ROW%" class="dtIncludeRegion dtIncludeRegion_{$slug}"
-		checked="checked" /><label for="dtIncludeRegion_{$slug}_%ROW%">$regionName</label>
-	<span class="dtRegionFull">
-		<input type="checkbox" name="dtIncludeRegion_{$slug}_Full_%ROW%" id="dtIncludeRegion_{$slug}_Full_%ROW%"
-			checked="checked" /><label for="dtIncludeRegion_{$slug}_Full_%ROW%"
-		id="dtIncludeRegion_{$slug}_FullLabel_%ROW%" class="dtRegionSuboptionActive">{$this->L["full"]}</label>
-	</span>
-	<span class="dtRegionShort">
-		<input type="checkbox" name="dtIncludeRegion_{$slug}_Short_%ROW%" id="dtIncludeRegion_{$slug}_Short_%ROW%" checked="checked"
-			/><label for="dtIncludeRegion_{$slug}_Short_%ROW%" id="dtIncludeRegion_{$slug}_ShortLabel_%ROW%"
-		class="dtRegionSuboptionActive">{$this->L["short"]}</label>
-	</span>
-</div>
-EOF;
-		}
-		$html .= '<div id="dtRegionCountry_Complete%ROW%"></div>';
-
-		return $html;
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["help_text"]}</p>";
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(50) default NULL",
-			"SQLField_Oracle" => "varchar2(50) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(50) NULL"
-		);
-	}
-
-	private function getRandIndex($options, $randCountrySlug) {
-		$index = null;
-		if ($options[$randCountrySlug]["full"] == 1 && $options[$randCountrySlug]["short"] == 1) {
-			$index = mt_rand(0, 1); // weird, mt_rand()&1 doesn't work - always returns 1 0 1 0 1 0...
-		} else if ($options[$randCountrySlug]["full"] == 1) {
-			$index = 0;
-		} else if ($options[$randCountrySlug]["short"] == 1) {
-			$index = 1;
-		}
-		return $index;
-	}
-
-	private function getRandRegion($countries) {
-		$randCountrySlug = array_rand($countries);
-		$randCountry = $this->countryRegionHash[$randCountrySlug];
-
-		// now get a random region, taking into account it's weight
-		$weightedValues = array();
-		$regions = $randCountry["regions"];
-		for ($i=0; $i<count($regions); $i++) {
-			$weightedValues["{$i}"] = $regions[$i]["weight"];
-		}
-		$randomIndex = Utils::weightedRand($weightedValues);
-		$regionInfo = $regions[$randomIndex];
-		$regionInfo["countrySlug"] = $randCountrySlug;
-
-		return $regionInfo;
-	}
-}
diff --git a/plugins/dataTypes/Region/Region.css b/plugins/dataTypes/Region/Region.css
deleted file mode 100644
index 19d08986f..000000000
--- a/plugins/dataTypes/Region/Region.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/** supplementary styles to display the Options section properly */
-.dtRegionCountry {
-	position: relative;
-}
-.dtRegionSuboptionActive {
-	color: #555555;
-	line-height: 17pt;
-}
-.dtRegionSuboptionInactive {
-	color: #cccccc;
-	line-height: 17pt;
-}
-.dtRegionFull {
-	position: absolute;
-	left: 125px;
-	border-left: 1px solid #dddddd;
-	margin-left: 5px;
-}
-.dtRegionShort {
-	position: absolute;
-	left: 175px;
-}
\ No newline at end of file
diff --git a/plugins/dataTypes/Region/Region.js b/plugins/dataTypes/Region/Region.js
deleted file mode 100644
index 79dbc066d..000000000
--- a/plugins/dataTypes/Region/Region.js
+++ /dev/null
@@ -1,118 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-	"use strict";
-
-	/**
-	 * @name Region
-	 * @description JS code for the Region Data Type.
-	 * @see DataType
-	 * @namespace
-	 */
-
-	var MODULE_ID = "data-type-Region";
-	var subscriptions = {};
-	var _currSelectedCountries = null;
-
-	var _init = function() {
-		subscriptions[C.EVENT.COUNTRIES.CHANGE] = _countryChange;
-		manager.subscribe(MODULE_ID, subscriptions);
-		$("#gdTableRows").on("click", ".dtIncludeRegion", _toggleCountryRegion);
-	};
-
-	var _saveRow = function(rowNum) {
-		var checked = [];
-		for (var i=0; i<_currSelectedCountries.length; i++) {
-			checked.push({
-				country: _currSelectedCountries[i],
-				regionSelected: ($("#dtIncludeRegion_" + _currSelectedCountries[i] + "_" + rowNum).attr("checked") === "checked") ? 1 : 0,
-				regionFull: ($("#dtIncludeRegion_" + _currSelectedCountries[i] + "_Full_" + rowNum).attr("checked") === "checked") ? 1 : 0,
-				regionShort: ($("#dtIncludeRegion_" + _currSelectedCountries[i] + "_Short_" + rowNum).attr("checked") === "checked") ? 1 : 0
-			});
-		}
-
-
-		// find the checkboxes in this row
-		return {
-			"checked": checked
-		};
-	};
-
-	var _loadRow = function(rowNum, data) {
-
-		// a real mystery here. On Chrome (and maybe other browsers) if _saveRow returns an empty array for "checkedRows",
-		// the object key-value pair is completely dropped. Hence the check here
-		var rows = [];
-		if (typeof data !== 'undefined') {
-			rows = data.checked;
-		}
-		return {
-			execute: function() { },
-			isComplete: function() {
-				if ($("#dtRegionCountry_Complete" + rowNum).length) {
-					for (var i=0; i<rows.length; i++) {
-						var currCountry = rows[i].country;
-						if (rows[i].regionSelected === "0") {
-							$("#dtIncludeRegion_" + currCountry + "_" + rowNum).removeAttr("checked").trigger("click");
-						}
-						if (rows[i].regionFull === "0") {
-							$("#dtIncludeRegion_" + currCountry + "_Full_" + rowNum).removeAttr("checked");
-						}
-						if (rows[i].regionShort === "0") {
-							$("#dtIncludeRegion_" + currCountry + "_Short_" + rowNum).removeAttr("checked");
-						}
-					}
-					return true;
-				} else {
-					return false;
-				}
-			}
-		};
-	};
-
-	/**
-	 * This is called any time the country list changes - including on load. It ensures only the appropriate
-	 * regions are displayed.
-	 */
-	var _countryChange = function(msg) {
-		_currSelectedCountries = msg.countries;
-		var shownClassesSelectors = [];
-		for (var i=0; i<msg.countries.length; i++) {
-			shownClassesSelectors.push(".dtRegionCountry_" + msg.countries[i] + ",.dtIncludeRegion_" + msg.countries[i]);
-		}
-		var shownClassesSelector = shownClassesSelectors.join(",");
-		$(".dtRegionCountry").hide();
-		$(shownClassesSelector).show();
-
-		if (msg.countries.length > 0) {
-			$(".dtRegionCountry_noCountries").hide();
-		} else {
-			$(".dtRegionCountry_noCountries").show();
-		}
-	};
-
-	var _toggleCountryRegion = function(e) {
-		var el = e.target;
-		var parent = $(el).parent();
-		if (el.checked) {
-			parent.find("span input").removeAttr("disabled");
-			parent.find("span label").addClass("dtRegionSuboptionActive").removeClass("dtRegionSuboptionInactive");
-		} else {
-			$(el).parent().find("span input").attr("disabled", "disabled");
-			parent.find("span label").addClass("dtRegionSuboptionInactive").removeClass("dtRegionSuboptionActive");
-		}
-	};
-
-
-	// register our module
-	manager.registerDataType(MODULE_ID, {
-		init: _init,
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-
-});
diff --git a/plugins/dataTypes/Region/lang/de.php b/plugins/dataTypes/Region/lang/de.php
deleted file mode 100644
index 370f1e73f..000000000
--- a/plugins/dataTypes/Region/lang/de.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Staat / Provinz / Kreis";
-$L["full"] = "Voll";
-$L["help_text"] = "Generiert zufällige kanadischen Provinzen, Staaten, Territorien oder Landkreise, auf den von Ihnen gewählten Optionen basiert. Die <b>Vollständiger Name</b> und <b>Abkürzung</b> sub-Optionen bestimmen, ob die Ausgabe die vollständige Zeichenfolge (zB \"British Columbia\") oder dessen Abkürzung (zB \"BC\") enthalten. Für UK Grafschaften, ist die Abkürzung der Standard 3-Zeichen-Chapman-Code.";
-$L["short"] = "Kurz";
-$L["no_countries_selected"] = "Keine Ländern ausgewählt.";
\ No newline at end of file
diff --git a/plugins/dataTypes/Region/lang/en.php b/plugins/dataTypes/Region/lang/en.php
deleted file mode 100644
index f4cfb6928..000000000
--- a/plugins/dataTypes/Region/lang/en.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Region";
-$L["help_text"] = "Generates random Canadian provinces, states, territories or counties, based on the options you select. The <b>Full Name</b> and <b>Abbreviation</b> sub-options determine whether the output will contain the full string (e.g. &quot;British Columbia&quot;) or its abbreviation (e.g. &quot;BC&quot;). For UK counties, the abbreviation is the standard 3-character Chapman code.";
-$L["full"] = "Full";
-$L["short"] = "Short";
-$L["no_countries_selected"] = "No countries selected.";
\ No newline at end of file
diff --git a/plugins/dataTypes/Region/lang/es.php b/plugins/dataTypes/Region/lang/es.php
deleted file mode 100644
index 1ea9b16f4..000000000
--- a/plugins/dataTypes/Region/lang/es.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Región";
-$L["help_text"] = "Genera provincias, estados, territorios o condados al azar, basados en las opciones que elijas. La sub-opciones <b>Nombre completo</b> y la <b>Abreviatura</b> determinan si la salid contendrá la cadena completa (p.e. &quot;Columbia Británica&quot;) o su abreviatura (p.e. &quot;BC&quot;). Para los condados de UK, la abreviatura es el código Chapman estándar de tres caracteres.";
-$L["full"] = "Completo";
-$L["short"] = "Corto";
-$L["no_countries_selected"] = "No hay países seleccionados.";
\ No newline at end of file
diff --git a/plugins/dataTypes/Region/lang/fr.php b/plugins/dataTypes/Region/lang/fr.php
deleted file mode 100644
index f6125775c..000000000
--- a/plugins/dataTypes/Region/lang/fr.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "État / Province / Régions";
-$L["full"] = "Complet";
-$L["help_text"] = "Génère au hasard des provinces, États, territoires, régions ou départements, en fonction des options que vous sélectionnez. Les sous-options <b>Complet</b> et <b>Abréviation</b> déterminent si la sortie contiendra la chaîne complète (par exemple, «Colombie-Britannique») ou son abréviation (par exemple «BC»). Pour les comtés du Royaume-Uni, l'abréviation suit la norme 3-caractères du code Chapman.";
-$L["short"] = "Abbréviation";
-$L["no_countries_selected"] = "Aucun pays sélectionnés.";
\ No newline at end of file
diff --git a/plugins/dataTypes/Region/lang/nl.php b/plugins/dataTypes/Region/lang/nl.php
deleted file mode 100644
index 9e9947e2c..000000000
--- a/plugins/dataTypes/Region/lang/nl.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Regio";
-$L["full"] = "Volledig";
-$L["help_text"] = "Genereert willekeurige Canadese provincies, staten, gebieden of provincies, op basis van de opties die u selecteert. De <b>Volledige naam</b> en <b>Afkorting</b> sub-opties bepalen of de uitgang zal de volledige string (bijv. \"British Columbia\") of de afkorting (bijv. \"BC\") bevatten. Voor het Verenigd Koninkrijk provincies, de afkorting is van de standaard 3-tekens Chapman code.";
-$L["short"] = "Kort";
-$L["no_countries_selected"] = "Geen landen geselecteerd.";
\ No newline at end of file
diff --git a/plugins/dataTypes/StreetAddress/StreetAddress.class.php b/plugins/dataTypes/StreetAddress/StreetAddress.class.php
deleted file mode 100644
index 2430f7e8d..000000000
--- a/plugins/dataTypes/StreetAddress/StreetAddress.class.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_StreetAddress extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Street Address";
-	protected $dataTypeFieldGroup = "geo";
-	protected $dataTypeFieldGroupOrder = 10;
-	private $words;
-	private $validStreetTypes;
-	private $numValidStreetTypes;
-
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			$this->words = Utils::getLipsum();
-			$this->validStreetTypes = explode(",", $this->L["street_types"]);
-			$this->numValidStreetTypes = count($this->validStreetTypes);
-		}
-	}
-
-
-	public function generate($generator, $generationContextData) {
-		$streetName = ucwords(Utils::generateRandomTextStr($this->words, false, "fixed", 1));
-		$streetType = $this->validStreetTypes[mt_rand(0, $this->numValidStreetTypes-1)];
-
-		$format = mt_rand(1, 4);
-		$streetAddress = "";
-		switch($format) {
-			case "1":
-				$streetAddress = $this->L["po_box"] . " " . mt_rand(100, 999) . ", " . mt_rand(100, 9999) . " $streetName " . $streetType;
-				break;
-			case "2":
-				$streetAddress = mt_rand(100, 999) . "-" . mt_rand(100, 9999) . " $streetName $streetType";
-				break;
-			case "3":
-				$streetAddress = $this->L["ap_num"] . mt_rand(100, 999) . "-" . mt_rand(100, 9999) . " $streetName " . $streetType;
-				break;
-			case "4":
-				$streetAddress = mt_rand(100, 9999) . " $streetName " . $streetType;
-				break;
-		}
-
-		return array(
-			"display" => $streetAddress
-		);
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255) default NULL",
-			"SQLField_Oracle" => "varchar2(255) default NULL",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-}
diff --git a/plugins/dataTypes/StreetAddress/lang/de.php b/plugins/dataTypes/StreetAddress/lang/de.php
deleted file mode 100644
index 5b2a24f0a..000000000
--- a/plugins/dataTypes/StreetAddress/lang/de.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Straße";
-
-$L["ap_num"] = "Ap #";
-$L["name"] = "Straße";
-$L["po_box"] = "Postfach";
-$L["street_types"] = "St., St., Straße, Straße, Rd., Rd., Ave, Av., Avenue";
\ No newline at end of file
diff --git a/plugins/dataTypes/StreetAddress/lang/en.php b/plugins/dataTypes/StreetAddress/lang/en.php
deleted file mode 100644
index deb96c613..000000000
--- a/plugins/dataTypes/StreetAddress/lang/en.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Street Address";
-$L["ap_num"] = "Ap #";
-$L["po_box"] = "P.O. Box";
-$L["street_types"] = "St.,St.,Street,Road,Rd.,Rd.,Ave,Av.,Avenue";
diff --git a/plugins/dataTypes/StreetAddress/lang/es.php b/plugins/dataTypes/StreetAddress/lang/es.php
deleted file mode 100644
index 7256a20fe..000000000
--- a/plugins/dataTypes/StreetAddress/lang/es.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Dirección";
-$L["ap_num"] = "Apdo.:";
-$L["po_box"] = "Apartado núm.:";
-$L["street_types"] = "C/,C.,Calle,Carretera,Ctra.,,Av.,Avda.,Avenida";
diff --git a/plugins/dataTypes/StreetAddress/lang/fr.php b/plugins/dataTypes/StreetAddress/lang/fr.php
deleted file mode 100644
index 94a085b30..000000000
--- a/plugins/dataTypes/StreetAddress/lang/fr.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Adresse";
-
-$L["ap_num"] = "Appartement ";
-$L["name"] = "Adresse";
-$L["po_box"] = "CP";
-$L["street_types"] = "Rue,Route,Chemin,Rd.,Ave,Av.,Avenue,Impasse";
diff --git a/plugins/dataTypes/StreetAddress/lang/nl.php b/plugins/dataTypes/StreetAddress/lang/nl.php
deleted file mode 100644
index 275009fed..000000000
--- a/plugins/dataTypes/StreetAddress/lang/nl.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Straat en huisnummer";
-$L["ap_num"] = "Ap #";
-$L["po_box"] = "PO Box";
-$L["street_types"] = "St., St., straat, weg, Rd., Rd., Ave, Av., Avenue";
diff --git a/plugins/dataTypes/TextFixed/TextFixed.class.php b/plugins/dataTypes/TextFixed/TextFixed.class.php
deleted file mode 100644
index be58e8cea..000000000
--- a/plugins/dataTypes/TextFixed/TextFixed.class.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_TextFixed extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Fixed Number of Words";
-	protected $dataTypeFieldGroup = "text";
-	protected $dataTypeFieldGroupOrder = 10;
-	protected $jsModules = array("TextFixed.js");
-	private $words;
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			$this->words = Utils::getLipsum();
-		}
-	}
-
-	public function generate($generator, $generationContextData) {
-		$options = $generationContextData["generationOptions"];
-		$textStr = Utils::generateRandomTextStr($this->words, false, "fixed", $options);
-		return array(
-			"display" => $textStr
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		if (empty($postdata["dtNumWords_$colNum"])) {
-			return false;
-		}
-		return $postdata["dtNumWords_$colNum"];
-	}
-
-	public function getOptionsColumnHTML() {
-		$html =<<<END
-&nbsp;{$this->L["TextFixed_generate"]} #<input type="text" name="dtNumWords_%ROW%" id="dtNumWords_%ROW%" style="width: 30px" value="10" />
-{$this->L["TextFixed_words"]}
-END;
-		return $html;
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["TextFixed_help"]}</p>";
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "TEXT default NULL",
-			"SQLField_Oracle" => "BLOB default NULL",
-			"SQLField_MSSQL" => "VARCHAR(MAX) NULL"
-		);
-	}
-}
diff --git a/plugins/dataTypes/TextFixed/TextFixed.js b/plugins/dataTypes/TextFixed/TextFixed.js
deleted file mode 100755
index 08e263ce8..000000000
--- a/plugins/dataTypes/TextFixed/TextFixed.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*global $:false,define:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name TextFixed
-	 * @description JS code for the TextFixed Data Type.
-	 * @see DataType
-	 * @namespace
-	 */
-
-	var MODULE_ID = "data-type-TextFixed";
-	var LANG = L.dataTypePlugins.TextFixed;
-
-	var _saveRow = function(rowNum) {
-		return {
-			numWords: $("#dtNumWords_" + rowNum).val()
-		};
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() { },
-			isComplete: function() {
-				if (data && $("#dtNumWords_" + rowNum).length) {
-					$("#dtNumWords_" + rowNum).val(data.numWords);
-					return true;
-				} else {
-					return false;
-				}
-			}
-		};
-	};
-
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-		var isInt = /^\d+$/;
-		for (var i=0; i<rows.length; i++) {
-			var numWords = $.trim($("#dtNumWords_" + rows[i]).val());
-			if (numWords === "" || !isInt.test(numWords)) {
-				var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-				visibleProblemRows.push(visibleRowNum);
-				problemFields.push($("#dtNumWords_" + rows[i]));
-			}
-		}
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-	// register our module
-	manager.registerDataType(MODULE_ID, {
-		validate: _validate,
-		loadRow: _loadRow,
-		saveRow: _saveRow
-	});
-});
diff --git a/plugins/dataTypes/TextFixed/lang/de.php b/plugins/dataTypes/TextFixed/lang/de.php
deleted file mode 100644
index 841681dfb..000000000
--- a/plugins/dataTypes/TextFixed/lang/de.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Feste Anzahl der Worte";
-
-$L["TextFixed_generate"] = "Erzeugen";
-$L["TextFixed_help"] = "Diese Option erzeugt eine feste Anzahl von zufälligen Wörtern, von der Norm <a href=\"http://en.wikipedia.org/wiki/Lorem_ipsum\" target=\"_blank\">Lorem ipsum</a> lateinischen Text.";
-$L["TextFixed_words"] = "Text";
-$L["incomplete_fields"] = "Bitte geben Sie die Anzahl der Wörter, die Sie für alle Feste Wortzahl Felder erzeugen. Siehe Zeilen:";
diff --git a/plugins/dataTypes/TextFixed/lang/en.php b/plugins/dataTypes/TextFixed/lang/en.php
deleted file mode 100644
index 6d27683ae..000000000
--- a/plugins/dataTypes/TextFixed/lang/en.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Fixed Number of Words";
-$L["TextFixed_generate"] = "Generate";
-$L["TextFixed_help"] = "This option generates a fixed number of random words, pulled from the standard <a href=&quot;http://en.wikipedia.org/wiki/Lorem_ipsum&quot; target=&quot;_blank&quot;>lorem ipsum</a> latin text.";
-$L["TextFixed_words"] = "words";
-$L["incomplete_fields"] = "Please enter the number of words you want to generate for all Fixed Number of Words fields. See rows: ";
\ No newline at end of file
diff --git a/plugins/dataTypes/TextFixed/lang/es.php b/plugins/dataTypes/TextFixed/lang/es.php
deleted file mode 100644
index 5d692d903..000000000
--- a/plugins/dataTypes/TextFixed/lang/es.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Número fijo de palabras";
-$L["TextFixed_generate"] = "Generar";
-$L["TextFixed_help"] = "Esta opción genera un número fijo palabras al azar, sacadas del texto estándar en Latín <a href=&quot;http://en.wikipedia.org/wiki/Lorem_ipsum&quot; target=&quot;_blank&quot;>lorem ipsum</a>.";
-$L["TextFixed_words"] = "palabras";
-$L["incomplete_fields"] = "Por favor, introduce el número de palabras que quieres general para todos los campos Número fijo de palabras. Revisa las filas:";
diff --git a/plugins/dataTypes/TextFixed/lang/fr.php b/plugins/dataTypes/TextFixed/lang/fr.php
deleted file mode 100644
index 2e10e9d12..000000000
--- a/plugins/dataTypes/TextFixed/lang/fr.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Texte - Longueur Fixe";
-
-$L["TextFixed_generate"] = "Générer";
-$L["TextFixed_help"] = "Cette option génère un nombre fixe de mots aléatoires <a href=\"http://en.wikipedia.org/wiki/Lorem_ipsum\" target=\"_blank\">lorem ipsum</a> (faux texte latin).";
-$L["TextFixed_name"] = "Nombre fixe de mots";
-$L["TextFixed_words"] = "mots";
-$L["incomplete_fields"] = "Entrez le nombre de mots que vous souhaitez générer. Voir les lignes:";
diff --git a/plugins/dataTypes/TextFixed/lang/nl.php b/plugins/dataTypes/TextFixed/lang/nl.php
deleted file mode 100644
index ba2c704eb..000000000
--- a/plugins/dataTypes/TextFixed/lang/nl.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Vast Aantal woorden";
-$L["TextFixed_generate"] = "Voortbrengen";
-$L["TextFixed_help"] = "Deze optie genereert een vast aantal willekeurige woorden, getrokken uit de standaard <a href=\"http://en.wikipedia.org/wiki/Lorem_ipsum\" target=\"_blank\">Lorem ipsum</a> Latijnse tekst.";
-$L["TextFixed_words"] = "tekst";
-$L["incomplete_fields"] = "Vul het aantal woorden in dat u wilt genereren voor alle vaste Aantal woorden velden. Zie rijen:";
diff --git a/plugins/dataTypes/TextRandom/TextRandom.class.php b/plugins/dataTypes/TextRandom/TextRandom.class.php
deleted file mode 100644
index a3d1b6101..000000000
--- a/plugins/dataTypes/TextRandom/TextRandom.class.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_TextRandom extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Random Number of Words";
-	protected $dataTypeFieldGroup = "text";
-	protected $dataTypeFieldGroupOrder = 20;
-	protected $jsModules = array("TextRandom.js");
-	private $words;
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			$this->words = Utils::getLipsum();
-		}
-	}
-
-	public function generate($generator, $generationContextData) {
-		$options = $generationContextData["generationOptions"];
-		$textStr = Utils::generateRandomTextStr($this->words, $options["startsWithLipsum"], "range", $options["numWordsMin"], $options["numWordsMax"]);
-		return array(
-			"display" => $textStr
-		);
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "TEXT default NULL",
-			"SQLField_Oracle" => "BLOB default NULL",
-			"SQLField_MSSQL" => "VARCHAR(MAX) NULL"
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $column, $numCols) {
-		if (empty($postdata["dtNumWordsMin_$column"]) || empty($postdata["dtNumWordsMin_$column"])) {
-			return false;
-		}
-
-		$options = array(
-			"numWordsMin"      => $postdata["dtNumWordsMin_$column"],
-			"numWordsMax"      => $postdata["dtNumWordsMax_$column"],
-			"startsWithLipsum" => isset($postdata["dtStartsWithLipsum_$column"]) ? true : false
-		);
-
-		return $options;
-	}
-
-	public function getOptionsColumnHTML() {
-		$html =<<< END
-		<div>
-			<input type="checkbox" name="dtStartsWithLipsum_%ROW%" id="dtStartsWithLipsum_%ROW%" />
-			<label for="dtStartsWithLipsum_%ROW%">{$this->L["start_with_lipsum"]}</label>
-		</div>
-		<div>
-			{$this->L["generate"]} #<input type="text" name="dtNumWordsMin_%ROW%" id="dtNumWordsMin_%ROW%" style="width: 40px" value="1" />
-			{$this->L["to"]} #<input type="text" name="dtNumWordsMax_%ROW%" id="dtNumWordsMax_%ROW%" style="width: 40px" value="10" /> 
-			{$this->L["words"]}
-		</div>
-END;
-		return $html;
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["help"]}</p>";
-	}
-}
diff --git a/plugins/dataTypes/TextRandom/TextRandom.js b/plugins/dataTypes/TextRandom/TextRandom.js
deleted file mode 100644
index 481aaf603..000000000
--- a/plugins/dataTypes/TextRandom/TextRandom.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/*global $:false,define:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name TextRandom
-	 * @description JS code for the TextRandom Data Type.
-	 * @see DataType
-	 * @namespace
-	 */
-
-	var MODULE_ID = "data-type-TextRandom";
-	var LANG = L.dataTypePlugins.TextRandom;
-
-	var _saveRow = function(rowNum) {
-		return {
-			startsWithLipsum: $("#dtStartsWithLipsum_" + rowNum).attr("checked") ? 1 : 0,
-			minWords: $("#dtNumWordsMin_" + rowNum).val(),
-			maxWords: $("#dtNumWordsMax_" + rowNum).val()
-		};
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() { },
-			isComplete: function() {
-				if ($("#dtNumWordsMax_" + rowNum).length) {
-					if (data.startsWithLipsum == "1") {
-						$("#dtStartsWithLipsum_" + rowNum).attr("checked", "checked");
-					} else {
-						$("#dtStartsWithLipsum_" + rowNum).removeAttr("checked");
-					}
-					$("#dtNumWordsMin_" + rowNum).val(data.minWords);
-					$("#dtNumWordsMax_" + rowNum).val(data.maxWords);
-					return true;
-				}
-				return false;
-			}
-		};
-	};
-
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-		var isInt = /^\d+$/;
-		for (var i=0; i<rows.length; i++) {
-			var numWordsMin = $.trim($("#dtNumWordsMin_" + rows[i]).val());
-			var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-			if (numWordsMin === "" || !isInt.test(numWordsMin)) {
-				visibleProblemRows.push(visibleRowNum);
-				problemFields.push($("#dtNumWordsMin_" + rows[i]));
-			}
-			var numWordsMax = $.trim($("#dtNumWordsMax_" + rows[i]).val());
-			if (numWordsMax === "" || !isInt.test(numWordsMax)) {
-				if ($.inArray(visibleRowNum, visibleProblemRows) == -1) {
-					visibleProblemRows.push(visibleRowNum);
-				}
-				problemFields.push($("#dtNumWordsMax_" + rows[i]));
-			}
-		}
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: LANG.incomplete_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-
-	manager.registerDataType(MODULE_ID, {
-		validate: _validate,
-		saveRow: _saveRow,
-		loadRow: _loadRow
-	});
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/TextRandom/lang/de.php b/plugins/dataTypes/TextRandom/lang/de.php
deleted file mode 100644
index 42cf829b0..000000000
--- a/plugins/dataTypes/TextRandom/lang/de.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Beliebige Anzahl von Wörtern";;
-
-$L["generate"] = "Erzeugen";
-$L["help"] = "Diese Option erzeugt eine beliebige Anzahl von Wörtern - die Gesamtzahl im Bereich, den Sie angeben (einschließlich). Wie bei der Festnetznummer Option werden die Worte der Standard Lorem ipsum lateinischen Text gezogen.";
-$L["incomplete_fields"] = "Bitte geben Sie die min und max Anzahl der Wörter, die Sie für alle Random Number of Words Felder erzeugen. Siehe Zeilen:";
-$L["start_with_lipsum"] = "Beginnen Sie mit \"Lorem ipsum...\"";
-$L["to"] = "auf";
-$L["words"] = "Text";
\ No newline at end of file
diff --git a/plugins/dataTypes/TextRandom/lang/en.php b/plugins/dataTypes/TextRandom/lang/en.php
deleted file mode 100644
index 619c3da10..000000000
--- a/plugins/dataTypes/TextRandom/lang/en.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Random Number of Words";
-$L["incomplete_fields"] = "Please enter the min and max number of words you want to generate for all Random Number of Words fields. See rows: ";
-$L["start_with_lipsum"] = "Start with \"Lorem Ipsum...\"";
-$L["generate"] = "Generate";
-$L["to"] = "to";
-$L["words"] = "words";
-$L["help"] = "This option generates a random number of words - the total number within the range that you specify (inclusive). As with the Fixed number option, the words are pulled the standard lorem ipsum latin text.";
\ No newline at end of file
diff --git a/plugins/dataTypes/TextRandom/lang/es.php b/plugins/dataTypes/TextRandom/lang/es.php
deleted file mode 100644
index da68b28cb..000000000
--- a/plugins/dataTypes/TextRandom/lang/es.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Número aleatorio de palabras";
-$L["incomplete_fields"] = "Por favor, introduce el número mínimo y máximo de palabras que quieres generar para todos los campos Número aleatorio de palabras. Revise las filas:";
-$L["start_with_lipsum"] = "Start with \"Lorem Ipsum...\"";
-$L["generate"] = "Generar";
-$L["to"] = "a";
-$L["words"] = "palabras";
-$L["help"] = "Esta opción genera un número aleatorio de palabras, el número total dentro del rango que especifiques (inclusivo). Al igual que con la opción de número Fijo, las palabras son sacadas del texto estándar en Latín <i>lorem ipsum</i>.";
diff --git a/plugins/dataTypes/TextRandom/lang/fr.php b/plugins/dataTypes/TextRandom/lang/fr.php
deleted file mode 100644
index 755d942b6..000000000
--- a/plugins/dataTypes/TextRandom/lang/fr.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Texte - Longueur Aléatoire";
-
-$L["generate"] = "Générer entre";
-$L["help"] = "Cette option génère un nombre aléatoire de mots - le nombre total étant compris dans la plage que vous spécifiez (maximum inclus). Comme pour l'option Texte - Longueur fixe, les mots sont des mots aléatoires <a href=\"http://en.wikipedia.org/wiki/Lorem_ipsum\" target=\"_blank\">lorem ipsum</a> (faux texte latin).";
-$L["incomplete_fields"] = "Entrez les nombres de mots minimum et maximum que vous souhaitez générer. Voir les lignes:";
-$L["start_with_lipsum"] = "Commencez par \"Lorem Ipsum...\"";
-$L["to"] = "et";
-$L["words"] = "mots";
diff --git a/plugins/dataTypes/TextRandom/lang/nl.php b/plugins/dataTypes/TextRandom/lang/nl.php
deleted file mode 100644
index 6a395c1a6..000000000
--- a/plugins/dataTypes/TextRandom/lang/nl.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Random Number of Words";
-$L["generate"] = "Voortbrengen";
-$L["help"] = "Deze optie genereert een willekeurig aantal woorden - het totale aantal binnen het bereik dat u opgeeft (inclusief). Net als bij de vaste nummer optie, worden de woorden trok de standaard Lorem ipsum Latijnse tekst.";
-$L["incomplete_fields"] = "Voer de minimum en maximum aantal woorden in dat u wilt genereren voor alle willekeurig aantal woorden velden. Zie rijen:";
-$L["start_with_lipsum"] = "Begin met \"Lorem Ipsum...\"";
-$L["to"] = "naar";
-$L["words"] = "tekst";
diff --git a/plugins/dataTypes/Track1/Track1.class.php b/plugins/dataTypes/Track1/Track1.class.php
deleted file mode 100644
index f87d5561a..000000000
--- a/plugins/dataTypes/Track1/Track1.class.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>, origin code Zeeshan Shaikh
- * @package DataTypes
- * @description this class has a hard dependency on the PAN class. That class contains a few public
- *              helper functions.
- */
-class DataType_Track1 extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Track 1";
-	protected $hasHelpDialog = true;
-	protected $dataTypeFieldGroup = "credit_card_data";
-	protected $dataTypeFieldGroupOrder = 40;
-
-
-	private $cardData;
-
-	public function __construct($runtimeContext) {
-		for ($i=622126; $i<=622925; $i++){
-			$this->prefixList["prefix"][] = $i;
-		}
-		for ($i=3528; $i<=3589; $i++){
-			$this->prefixList["jcb16"][] = $i;
-		}
-		parent::__construct($runtimeContext);
-
-		if (class_exists("DataType_PAN")) {
-			$this->cardData = DataType_PAN::getAllCreditCardData();
-		}
-	}
-
-	public function generate($generator, $generationContextData) {
-		$cardData = $this->cardData[array_rand($this->cardData)];
-		$generatedCardNumber = DataType_PAN::generateCreditCardNumber($cardData["prefix"], $cardData["length"]);
-
-		$characters = array("A","B","C","D","E","F","G","H","J","K","L","M","N","P","Q","R","S","T","U","V","W","X","Y","Z");
-		$chars = array();
-		while (count($chars) < 4) {
-			$char = $characters[mt_rand(0, count($characters)-1)];
-			if (!in_array($char, $chars)) {
-				$chars[] = $char;
-			}
-		}
-		$randomChars = implode("", $chars);
-
-		$calendar = date("ym", mt_rand());
-		$serviceCode = mt_rand(111, 999);
-		$num1 = Utils::generateRandomAlphanumericStr(str_repeat("x", 26));
-
-		$track1 = "%B$generatedCardNumber^CardUser/$randomChars^$calendar$serviceCode$num1?";
-
-		return array(
-			"display" => $track1
-		);
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255)",
-			"SQLField_Oracle" => "varchar2(255)",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["track1_help_intro"]}</p>";
-	}
-}
\ No newline at end of file
diff --git a/plugins/dataTypes/Track1/lang/de.php b/plugins/dataTypes/Track1/lang/de.php
deleted file mode 100644
index 1f12846e9..000000000
--- a/plugins/dataTypes/Track1/lang/de.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["track1_help_intro"] = "Spur 1 enthält den Namen des Karteninhabers sowie die Kontonummer und andere Ermessens Daten. Die Kreditkarte kann von jedem Typ (Visa, Mastercard, etc.) sein.";
\ No newline at end of file
diff --git a/plugins/dataTypes/Track1/lang/en.php b/plugins/dataTypes/Track1/lang/en.php
deleted file mode 100644
index 6a4c0f91c..000000000
--- a/plugins/dataTypes/Track1/lang/en.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["track1_help_intro"] = "Track 1 contains the cardholder's name as well as account number and other discretionary data. The credit card may be of any type (Visa, Mastercard, etc).";
\ No newline at end of file
diff --git a/plugins/dataTypes/Track1/lang/es.php b/plugins/dataTypes/Track1/lang/es.php
deleted file mode 100644
index 2c82aa5be..000000000
--- a/plugins/dataTypes/Track1/lang/es.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["track1_help_intro"] = "Track 1 contiene el nombre del titular de la tarjeta, así como el número de cuenta y otros datos discrecionales. La tarjeta de crédito puede ser de cualquier tipo (Visa, Mastercard, etc).";
\ No newline at end of file
diff --git a/plugins/dataTypes/Track1/lang/fr.php b/plugins/dataTypes/Track1/lang/fr.php
deleted file mode 100644
index 4f17c3b57..000000000
--- a/plugins/dataTypes/Track1/lang/fr.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["track1_help_intro"] = "Le morceau 1 contient le nom du titulaire de la carte ainsi que le numéro de compte et d'autres données discrétionnaires. La carte de crédit peut être de tout type (Visa, Mastercard, etc.)";
\ No newline at end of file
diff --git a/plugins/dataTypes/Track1/lang/nl.php b/plugins/dataTypes/Track1/lang/nl.php
deleted file mode 100644
index bb4ce0094..000000000
--- a/plugins/dataTypes/Track1/lang/nl.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["track1_help_intro"] = "Track 1 bevat de naam van de kaarthouder en rekeningnummer en andere discretionaire gegevens. De creditcard kan van elk type zijn (Visa, Mastercard, etc).";
\ No newline at end of file
diff --git a/plugins/dataTypes/Track2/Track2.class.php b/plugins/dataTypes/Track2/Track2.class.php
deleted file mode 100644
index d92784ae3..000000000
--- a/plugins/dataTypes/Track2/Track2.class.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>, origin code Zeeshan Shaikh
- * @package DataTypes
- * @description this class has a hard dependency on the PAN class. That class contains a few public
- *              helper functions.
- */
-class DataType_Track2 extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Track 2";
-	protected $hasHelpDialog = true;
-	protected $dataTypeFieldGroup = "credit_card_data";
-	protected $dataTypeFieldGroupOrder = 50;
-
-
-	private $cardData;
-
-	public function __construct($runtimeContext) {
-		for ($i=622126; $i<=622925; $i++){
-			$this->prefixList["prefix"][] = $i;
-		}
-		for ($i=3528; $i<=3589; $i++){
-			$this->prefixList["jcb16"][] = $i;
-		}
-		parent::__construct($runtimeContext);
-
-		if (class_exists("DataType_PAN")) {
-			$this->cardData = DataType_PAN::getAllCreditCardData();
-		}
-	}
-
-
-	public function generate($generator, $generationContextData) {
-		$cardData = $this->cardData[array_rand($this->cardData)];
-		$generatedCardNumber = DataType_PAN::generateCreditCardNumber($cardData["prefix"], $cardData["length"]);
-
-		$calendar = date("ym", mt_rand());
-		$serviceCode = mt_rand(111, 999);
-		$num = Utils::generateRandomAlphanumericStr(str_repeat("x", 26));
-
-		$track2 = ";$generatedCardNumber=$calendar$serviceCode$num?";
-
-		return array(
-			"display" => $track2
-		);
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "varchar(255)",
-			"SQLField_Oracle" => "varchar2(255)",
-			"SQLField_MSSQL" => "VARCHAR(255) NULL"
-		);
-	}
-
-	public function getHelpHTML() {
-		return "<p>{$this->L["track2_help_intro"]}</p>";
-	}
-}
\ No newline at end of file
diff --git a/plugins/dataTypes/Track2/lang/de.php b/plugins/dataTypes/Track2/lang/de.php
deleted file mode 100644
index bd32547c1..000000000
--- a/plugins/dataTypes/Track2/lang/de.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["track2_help_intro"] = "Track 2 enthält Konto des Karteninhabers, verschlüsselte PIN sowie weitere Ermessens Daten. Die Kreditkarte kann von jedem Typ (Visa, Mastercard, etc.) sein.";
\ No newline at end of file
diff --git a/plugins/dataTypes/Track2/lang/en.php b/plugins/dataTypes/Track2/lang/en.php
deleted file mode 100644
index c272fc91a..000000000
--- a/plugins/dataTypes/Track2/lang/en.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["track2_help_intro"] = "Track 2 contains the cardholder's account, encrypted PIN, plus other discretionary data. The credit card may be of any type (Visa, Mastercard, etc).";
\ No newline at end of file
diff --git a/plugins/dataTypes/Track2/lang/es.php b/plugins/dataTypes/Track2/lang/es.php
deleted file mode 100644
index e6fc220b5..000000000
--- a/plugins/dataTypes/Track2/lang/es.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["track2_help_intro"] = "Track 2 contiene la cuenta del titular de la tarjeta, PIN cifrado, además de otros datos discrecionales. La tarjeta de crédito puede ser de cualquier tipo (Visa, Mastercard, etc).";
\ No newline at end of file
diff --git a/plugins/dataTypes/Track2/lang/fr.php b/plugins/dataTypes/Track2/lang/fr.php
deleted file mode 100644
index 2a40c8524..000000000
--- a/plugins/dataTypes/Track2/lang/fr.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["track2_help_intro"] = "Piste 2 contient le compte du titulaire de carte, code PIN crypté, ainsi que d'autres données discrétionnaires. La carte de crédit peut être de tout type (Visa, Mastercard, etc.)";
\ No newline at end of file
diff --git a/plugins/dataTypes/Track2/lang/nl.php b/plugins/dataTypes/Track2/lang/nl.php
deleted file mode 100644
index 6f5a53125..000000000
--- a/plugins/dataTypes/Track2/lang/nl.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$L = array();
-$L["track2_help_intro"] = "Track 2 bevat rekening van de kaarthouder, versleutelde PIN, plus andere discretionaire gegevens. De creditcard kan van elk type zijn (Visa, Mastercard, etc).";
\ No newline at end of file
diff --git a/plugins/dataTypes/Tree/Tree.class.php b/plugins/dataTypes/Tree/Tree.class.php
deleted file mode 100644
index 82fa74191..000000000
--- a/plugins/dataTypes/Tree/Tree.class.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-/**
- * @package DataTypes
- */
-
-class DataType_Tree extends DataTypePlugin {
-	protected $isEnabled = true;
-	protected $dataTypeName = "Tree";
-	protected $dataTypeFieldGroup = "other";
-	protected $dataTypeFieldGroupOrder = 30;
-	protected $processOrder = 2;
-	protected $jsModules = array("Tree.js");
-	private $openTreeNodes = array();
-
-
-	/**
-	 * Our generation function. Unlike other Data Types, the Tree Data type relies on knowing about 
-	 * previously generated rows. Since the Data Generator provides the option to generate the data 
-	 * sets all at once ("New Window/Tab", "Prompt to Download") or in pieces, we need to accommodate
-	 * each scenario. 
-	 * (1) If we're generating in batches, store the relevant info in sessions.
-	 * (2) Otherwise, store in $openTreeNodes private var.
-	 */
-	public function generate($generator, $generationContextData) {
-		$options = $generationContextData["generationOptions"];
-		$autoIncrementRowNum = $options["autoIncrementRowNum"];
-
-		if ($generationContextData["rowNum"] == 1) {
-			$_SESSION["gdTree_openTreeNodes"] = "";
-		}
-
-		$storageType = ($generator->isFirstBatch() && $generator->isLastBatch()) ? "privateVar" : "sessions";
-
-		// find the auto-increment column
-		$parentRowData = array();
-		foreach ($generationContextData["existingRowData"] as $data) {
-			if ($data["colNum"] == $autoIncrementRowNum) {
-				$parentRowData = $data;
-				break;
-			}
-		}
-
-		// hmm... needs fixing
-		if (empty($parentRowData)) {
-			return array("display" => "");
-		}
-
-		// awesome var name, hey?
-		$probablyUniqueParentRowValue = $parentRowData["randomData"]["display"];
-
-		if ($storageType == "privateVar") {
-			if ($probablyUniqueParentRowValue == 1) {
-				$this->openTreeNodes[] = array($probablyUniqueParentRowValue, 1);
-				return "0";
-			}
-
-			// randomly pick an open (non-full) node
-			$randIndex  = mt_rand(0, count($this->openTreeNodes)-1);
-			$randRow    = $this->openTreeNodes[$randIndex];
-			$randParentRowValue = $randRow[0];
-
-			// increment this node. If it's full, remove it from the array
-			$this->openTreeNodes[$randIndex][1]++;
-			if ($this->openTreeNodes[$randIndex][1] > $options["maxSiblings"]) {
-				array_splice($this->openTreeNodes, $randIndex, 1);
-			}
-
-			// finally, add the new index
-			$this->openTreeNodes[] = array($probablyUniqueParentRowValue, 1);
-
-		}  else {
-
-			$sessions_openTreeNodes = unserialize($_SESSION["gdTree_openTreeNodes"]);
-			if ($probablyUniqueParentRowValue == 1) {
-				$sessions_openTreeNodes[] = array($probablyUniqueParentRowValue, 1);
-				$_SESSION["gdTree_openTreeNodes"] = serialize($sessions_openTreeNodes);
-				return "0";
-			}
-
-			// randomly pick an open (non-full) node
-			$randIndex  = mt_rand(0, count($sessions_openTreeNodes)-1);
-			$randRow    = $sessions_openTreeNodes[$randIndex];
-			$randParentRowValue = $randRow[0];
-
-			// increment this node. If it's full, remove it from the array
-			$sessions_openTreeNodes[$randIndex][1]++;
-			if ($sessions_openTreeNodes[$randIndex][1] > $options["maxSiblings"]) {
-				array_splice($sessions_openTreeNodes, $randIndex, 1);
-			}
-
-			// finally, add the new index
-			$sessions_openTreeNodes[] = array($probablyUniqueParentRowValue, 1);
-			$_SESSION["gdTree_openTreeNodes"] = serialize($sessions_openTreeNodes);
-		}
-
-		return array(
-			"display" => $randParentRowValue
-		);
-	}
-
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		if (empty($postdata["dtTreeAutoIncrementRowNum_$colNum"]) || empty($postdata["dtTreeMaxSiblings_$colNum"])) {
-			return false;
-		}
-
-		// note that we don't bother confirming that the AutoIncrement row specified actually exists. The
-		// reason being perhaps the user wants to use another field, like an alpha-numeric or GUID
-		$options = array(
-			"autoIncrementRowNum" => $postdata["dtTreeAutoIncrementRowNum_$colNum"],
-			"maxSiblings"         => $postdata["dtTreeMaxSiblings_$colNum"]
-		);
-
-		return $options;
-	}
-
-	public function getOptionsColumnHTML() {
-		$html =<<<END
-<div>{$this->L["auto_increment_row_num"]} <input type="text" id="dtTreeAutoIncrementRowNum_%ROW%" name="dtTreeAutoIncrementRowNum_%ROW%" value="1" size="3" maxlength="3" /></div>
-<div>{$this->L["max_num_sibling_nodes"]} <input type="text" id="dtTreeMaxSiblings_%ROW%" name="dtTreeMaxSiblings_%ROW%" value="2" size="3" maxlength="3" /></div>
-END;
-		return $html;
-	}
-
-	public function getDataTypeMetadata() {
-		return array(
-			"SQLField" => "mediumint default NULL",
-			"SQLField_Oracle" => "number",
-			"SQLField_MSSQL" => "INTEGER NULL",
-			"SQLField_Postgres" => "integer NULL",
-		);
-	}
-
-	public function getHelpHTML() {
-		$html =<<<END
-	<p>
-		{$this->L["help_1"]}
-	</p>
-	<p>
-		{$this->L["help_2"]}
-	</p>
-END;
-		return $html;
-	}
-}
\ No newline at end of file
diff --git a/plugins/dataTypes/Tree/Tree.js b/plugins/dataTypes/Tree/Tree.js
deleted file mode 100755
index 20596204e..000000000
--- a/plugins/dataTypes/Tree/Tree.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*global $:false,define:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name Tree
-	 * @description JS code for the Tree Data Type.
-	 * @see DataType
-	 * @namespace
-	 */
-
-	var MODULE_ID = "data-type-Tree";
-	var LANG = L.dataTypePlugins.Tree;
-
-
-	var _saveRow = function(rowNum) {
-		return {
-			autoIncRowNum: $("#dtTreeAutoIncrementRowNum_" + rowNum).val(),
-			maxSiblings: $("#dtTreeMaxSiblings_" + rowNum).val()
-		};
-	};
-
-	var _loadRow = function(rowNum, data) {
-		return {
-			execute: function() { },
-			isComplete: function() {
-				if ($("#dtTreeMaxSiblings_" + rowNum).length) {
-					$("#dtTreeAutoIncrementRowNum_" + rowNum).val(data.autoIncRowNum);
-					$("#dtTreeMaxSiblings_" + rowNum).val(data.maxSiblings);
-					return true;
-				}
-				return false;
-			}
-		};
-	};
-
-	var _validate = function(rows) {
-		var visibleProblemRows = [];
-		var problemFields      = [];
-		var isInt = /^\d+$/;
-		for (var i=0; i<rows.length; i++) {
-			var autoIncRowNum = $.trim($("#dtTreeAutoIncrementRowNum_" + rows[i]).val());
-			var visibleRowNum = generator.getVisibleRowOrderByRowNum(rows[i]);
-			if (autoIncRowNum === "" || !isInt.test(autoIncRowNum)) {
-				visibleProblemRows.push(visibleRowNum);
-				problemFields.push($("#dtTreeAutoIncrementRowNum_" + rows[i]));
-			}
-			var maxSiblings = $.trim($("#dtTreeMaxSiblings_" + rows[i]).val());
-			if (maxSiblings === "" || !isInt.test(maxSiblings)) {
-				if ($.inArray(visibleRowNum, visibleProblemRows) == -1) {
-					visibleProblemRows.push(visibleRowNum);
-				}
-				problemFields.push($("#dtTreeMaxSiblings_" + rows[i]));
-			}
-		}
-	
-		var errors = [];
-		if (visibleProblemRows.length) {
-			errors.push({ els: problemFields, error: LANG.invalid_fields + " <b>" + visibleProblemRows.join(", ") + "</b>"});
-		}
-		return errors;
-	};
-
-
-	manager.registerDataType(MODULE_ID, {
-		validate: _validate,
-		saveRow: _saveRow,
-		loadRow: _loadRow
-	});
-
-});
\ No newline at end of file
diff --git a/plugins/dataTypes/Tree/lang/de.php b/plugins/dataTypes/Tree/lang/de.php
deleted file mode 100644
index 03915b51d..000000000
--- a/plugins/dataTypes/Tree/lang/de.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Tree (übergeordnete Zeile ID)";
-
-$L["auto_increment_row_num"] = "Auto-increment Zeilennummer:";
-$L["help_1"] = "Dieser Datentyp können Sie erzeugen eine Baum-wie Daten, in denen jede Zeile ist ein Kind von einer anderen Zeile - mit Ausnahme der ersten Zeile, die den Stamm des Baumes ist. Dieser Datentyp muss in Verbindung mit dem Auto-Increment Datentyp verwendet werden: das gewährleistet, dass jede Zeile einen eindeutigen numerischen Wert, der dieser Datentyp verwendet, um die übergeordneten Zeilen verweisen muss.";
-$L["help_2"] = "Die Optionen können Sie festlegen, welches Ihrer Formularfelder ist die geeignete auto-increment-Feld und die maximale Anzahl von Kindern ein Knoten haben kann.";
-$L["invalid_fields"] = "Bitte nur Zahlen für den Baum Feld Datentyp Einstellungen. Bitte beheben Zeilen:";
-$L["invalid_parent"] = "[Ungültige parent]";
-$L["max_num_sibling_nodes"] = "Max. Anzahl der Geschwister-Knoten:";
\ No newline at end of file
diff --git a/plugins/dataTypes/Tree/lang/en.php b/plugins/dataTypes/Tree/lang/en.php
deleted file mode 100644
index 0235866a6..000000000
--- a/plugins/dataTypes/Tree/lang/en.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Tree (parent row ID)";
-$L["auto_increment_row_num"] = "Auto-increment row number:";
-$L["help_1"] = "This data type lets you generate tree-like data in which every row is a child of another row - except the very first row, which is the trunk of the tree. This data type must be used in conjunction with the Auto-Increment data type: that ensures that every row has a unique numeric value, which this data type uses to reference the parent rows.";
-$L["help_2"] = "The options let you specify which of your form fields is the appropriate auto-increment field and the maximum number of children a node may have.";
-$L["invalid_parent"] = "[invalid parent]";
-$L["max_num_sibling_nodes"] = "Max number of sibling nodes:";
-$L["invalid_fields"] = "Please only numbers for the Tree Data Type field settings. Please fix rows: ";
\ No newline at end of file
diff --git a/plugins/dataTypes/Tree/lang/es.php b/plugins/dataTypes/Tree/lang/es.php
deleted file mode 100644
index 9926211ac..000000000
--- a/plugins/dataTypes/Tree/lang/es.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Árbol (Id. de fila padre)";
-$L["auto_increment_row_num"] = "Número de fila auto-incrementada:";
-$L["help_1"] = "Este tipo de dato te permite generar datos en forma de árbol en los cuales cada fila es un hijo de otra fila, excepto la primera fila que es la raíz del árbol. Este tipo de dato debe ser usado en conjunción con el tipo de dato Auto-incremento. Esto asegura que cada fila tiene un valor numérico único, que es el utilizado por este tipo de dato para hacer referencia a las filas padre.";
-$L["help_2"] = "Las opciones permiten especificar cuál de los campos del formulario es el campo auto-incrementado apropiado y el máximo número de hijos que un nodo puede tener.";
-$L["invalid_parent"] = "[padre no válido]";
-$L["max_num_sibling_nodes"] = "Núm. máximo de nodos hermanos:";
-$L["invalid_fields"] = "Por favor, usa sólo números para los ajustes de los campos de tipo Árbol. Por favor, arregla las filas: ";
diff --git a/plugins/dataTypes/Tree/lang/fr.php b/plugins/dataTypes/Tree/lang/fr.php
deleted file mode 100644
index 5d5a08c68..000000000
--- a/plugins/dataTypes/Tree/lang/fr.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Arborescence";
-
-$L["auto_increment_row_num"] = "Numéro de la ligne d'auto-incrémentation:";
-$L["help_1"] = "Ce type de données permet de générer des arbres dans laquelle chaque ligne est un enfant d'une autre ligne - sauf la toute première ligne, qui est la racine de l'arbre. Ce type de données doit être utilisé en coordination avec le type de données Auto-incrémentation qui assure que chaque ligne a une valeur numérique unique. C'est cet identifiant qui est utilisé pour référencer les lignes parentes.";
-$L["help_2"] = "Les options vous permettent de spécifier lequel de vos lignes est celle d'auto-incrémentation et le nombre maximum d'enfants qu'un noeud peut avoir.";
-$L["invalid_fields"] = "Les options du type de données Arborescence doivent être des nombres. Corrigez les lignes:";
-$L["invalid_parent"] = "[Parent non valide]";
-$L["max_num_sibling_nodes"] = "Nombre maximum de noeuds frères:";
-$L["name"] = "Arbre (ID de ligne mère)";
diff --git a/plugins/dataTypes/Tree/lang/nl.php b/plugins/dataTypes/Tree/lang/nl.php
deleted file mode 100644
index 515509804..000000000
--- a/plugins/dataTypes/Tree/lang/nl.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$L = array();
-$L["DATA_TYPE_NAME"] = "Boom (ouder rij ID)";
-$L["auto_increment_row_num"] = "Auto-increment rijnummer:";
-$L["help_1"] = "Dit gegevenstype kunt u het genereren van boom-achtige data waarin elke rij is een kind van een andere rij - met uitzondering van de eerste rij, dat is de stam van de boom. Dit gegevenstype moet worden gebruikt in combinatie met de Auto-Increment gegevenstype: die ervoor zorgt dat elke rij een unieke numerieke waarde, die dit gegevenstype gebruikt om te verwijzen naar de bovenliggende rijen.";
-$L["help_2"] = "De opties kunt u aangeven welke van uw formulier velden is de juiste auto-increment veld en het maximale aantal kinderen een knooppunt kan hebben.";
-$L["invalid_fields"] = "Gelieve enkel cijfers voor de Tree Data Type veld instellingen. Please fix rijen:";
-$L["invalid_parent"] = "[Ongeldig ouder]";
-$L["max_num_sibling_nodes"] = "Max aantal broers en zussen knooppunten:";
diff --git a/plugins/dataTypes/index.php b/plugins/dataTypes/index.php
deleted file mode 100755
index 170718246..000000000
--- a/plugins/dataTypes/index.php
+++ /dev/null
@@ -1 +0,0 @@
-<html><head></head><body></body></html>
\ No newline at end of file
diff --git a/plugins/exportTypes/CSV/CSV.class.php b/plugins/exportTypes/CSV/CSV.class.php
deleted file mode 100644
index 25f542f39..000000000
--- a/plugins/exportTypes/CSV/CSV.class.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/**
- * @package ExportTypes
- */
-
-class CSV extends ExportTypePlugin {
-	protected $isEnabled = true;
-	protected $exportTypeName = "CSV";
-	protected $jsModules = array("CSV.js");
-	protected $contentTypeHeader = "application/csv";
-	public $L = array();
-
-
-	function generate($generator) {
-		$exportTarget = $generator->getExportTarget();
-		$postData     = $generator->getPostData();
-		$data         = $generator->generateExportData();
-
-		$csvDelimiter = ($postData["etCSV_delimiter"] == '\t') ? "\t" : $postData["etCSV_delimiter"];
-		$csvLineEndings = $postData["etCSV_lineEndings"];
-
-		switch ($csvLineEndings) {
-			case "Windows":
-				$newline = "\r\n";
-				break;
-			case "Unix":
-				$newline = "\n";
-				break;
-			case "Mac":
-			default:
-				$newline = "\r";
-				break;
-		}
-
-		$content = "";
-		if ($data["isFirstBatch"]) {
-			$content .= implode($csvDelimiter, $data["colData"]);
-		}
-		$numCols = count($data["colData"]);
-		foreach ($data["rowData"] as $row) {
-
-			// see if any of the cells contains the delimiter. If it does, wrap it in double quotes.
-			$cleanRow = array();
-			for ($i=0; $i<$numCols; $i++) {
-				if (strpos($row[$i], $csvDelimiter) !== false) {
-					$cleanRow[] = "\"" . preg_replace("/\"/", "\\\"", $row[$i]) . "\"";
-				} else {
-					$cleanRow[] = $row[$i];
-				}
-			}
-			$content .= $newline . implode($csvDelimiter, $cleanRow);
-		}
-
-		return array(
-			"success" => true,
-			"content" => $content
-		);
-	}
-
-	/**
-	 * Used for constructing the filename of the filename when downloading.
-	 * @see ExportTypePlugin::getDownloadFilename()
-	 * @param Generator $generator
-	 * @return string
-	 */
-	function getDownloadFilename($generator) {
-		$time = date("M-j-Y");
-		return "data{$time}.csv";
-	}
-
-	function getAdditionalSettingsHTML() {
-		$LANG = Core::$language->getCurrentLanguageStrings();
-
-		$html =<<< END
-<table cellspacing="0" cellpadding="0" width="100%">
-<tr>
-	<td width="50%">
-		<table cellspacing="2" cellpadding="0" width="100%">
-		<tr>
-			<td width="160">{$this->L["delimiter_chars"]}</td>
-			<td>
-				<input type="text" size="2" name="etCSV_delimiter" id="etCSV_delimiter" value="|" />
-			</td>
-		</tr>
-		</table>
-	</td>
-	<td width="50%">
-		<table cellspacing="0" cellpadding="0" width="100%">
-		<tr>
-			<td width="160">{$this->L["eol_char"]}</td>
-			<td>
-				<select name="etCSV_lineEndings" id="etCSV_lineEndings">
-					<option value="Windows">Windows</option>
-					<option value="Unix">Unix</option>
-					<option value="Mac">Mac</option>
-				</select>
-			</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-END;
-
-		return $html;
-	}
-}
diff --git a/plugins/exportTypes/CSV/CSV.js b/plugins/exportTypes/CSV/CSV.js
deleted file mode 100644
index 677e3f654..000000000
--- a/plugins/exportTypes/CSV/CSV.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name CSV
-	 * @see ExportType
-	 * @description Client-side code for the CSV Export Type.
-	 * @namespace
-	 */
-
-	var MODULE_ID = "export-type-CSV";
-	var LANG = L.exportTypePlugins.CSV;
-
-
-	var _loadSettings = function(settings) {
-		$("#etCSV_delimiter").val(settings.delimiter);
-		$("#etCSV_lineEndings").val(settings.eol);
-	};
-
-	var _saveSettings = function() {
-		return {
-			"delimiter": $("#etCSV_delimiter").val(),
-			"eol":       $("#etCSV_lineEndings").val()
-		};
-	};
-
-	var _resetSettings = function() {
-		$("#etCSV_delimiter").val("|");
-		$("#etCSV_lineEndings").val("Windows");
-	};
-
-	var _validate = function() {
-		var delimiterField = $("#etCSV_delimiter");
-		var errors = [];
-
-		// note we don't trim it. I figure whitespace could, technically be used as a delimiter
-		if (delimiterField.val() === "") {
-			errors.push({
-				els: delimiterField,
-				error: LANG.validation_no_delimiter
-			});
-		}
-
-		return errors;
-	};
-
-	manager.registerExportType(MODULE_ID, {
-		validate: _validate,
-		loadSettings: _loadSettings,
-		saveSettings: _saveSettings,
-		resetSettings: _resetSettings
-	});
-});
diff --git a/plugins/exportTypes/CSV/lang/de.php b/plugins/exportTypes/CSV/lang/de.php
deleted file mode 100644
index 039980106..000000000
--- a/plugins/exportTypes/CSV/lang/de.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "CSV";
-
-$L["delimiter_chars"] = "Delimiter char (s)";
-$L["eol_char"] = "Zeilenendezeichen";
-$L["validation_no_delimiter"] = "Bitte geben Sie ein Trennzeichen für die CSV-Export-Typ.";
diff --git a/plugins/exportTypes/CSV/lang/en.php b/plugins/exportTypes/CSV/lang/en.php
deleted file mode 100644
index 60ee040ef..000000000
--- a/plugins/exportTypes/CSV/lang/en.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "CSV";
-
-$L["delimiter_chars"] = "Delimiter char(s)";
-$L["validation_no_delimiter"] = "Please enter a delimiter character for the CSV export type.";
-$L["eol_char"] = "End of line character";
diff --git a/plugins/exportTypes/CSV/lang/es.php b/plugins/exportTypes/CSV/lang/es.php
deleted file mode 100644
index f72636ce8..000000000
--- a/plugins/exportTypes/CSV/lang/es.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "CSV";
-
-$L["delimiter_chars"] = "Carácter(es) delimitador(es)";
-$L["validation_no_delimiter"] = "Por favor, introduce un carácter delimitador para el tipo de exportación CSV.";
-$L["eol_char"] = "Carácter de fin de línea";
diff --git a/plugins/exportTypes/CSV/lang/fr.php b/plugins/exportTypes/CSV/lang/fr.php
deleted file mode 100644
index 2456ce147..000000000
--- a/plugins/exportTypes/CSV/lang/fr.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "CSV";
-
-$L["delimiter_chars"] = "Caractère de séparation";
-$L["eol_char"] = "Caractère de fin de ligne";
-$L["validation_no_delimiter"] = "Entrez un caractère de séparation pour le type d'exportation CSV.";
diff --git a/plugins/exportTypes/CSV/lang/nl.php b/plugins/exportTypes/CSV/lang/nl.php
deleted file mode 100644
index e569b9e47..000000000
--- a/plugins/exportTypes/CSV/lang/nl.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$L = array();
-
-$L["delimiter_chars"] = "Scheidingsteken char (s)";
-$L["eol_char"] = "Einde van de lijn karakter";
-$L["validation_no_delimiter"] = "Geef een scheidingsteken voor de CSV export type.";
diff --git a/plugins/exportTypes/Excel/Excel.class.php b/plugins/exportTypes/Excel/Excel.class.php
deleted file mode 100644
index 9dbd7fc4e..000000000
--- a/plugins/exportTypes/Excel/Excel.class.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * @package ExportTypes
- */
-
-class Excel extends ExportTypePlugin {
-	protected $isEnabled = true;
-	protected $exportTypeName = "Excel";
-	protected $jsModules = array("Excel.js");
-	protected $compatibleExportTargets = array("promptDownload");
-	public $L = array();
-	private $chars;
-	private $charArray;
-
-
-	function generate($generator) {
-		require_once("PHPExcel.php");
-
-		$data = $generator->generateExportData();
-		$this->chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-		$this->charArray = str_split($this->chars, 1);
-
-		$objPHPExcel = new PHPExcel();
-
-		// set document properties
-		$objPHPExcel->getProperties()->setTitle("Test Data");
-
-		// create a first sheet and populate the headings
-		$objPHPExcel->setActiveSheetIndex(0);
-
-		// hardcoded limitation of 26 x 27 columns (right now)
-		$numCols = count($data["colData"]);
-		for ($i=0; $i<$numCols; $i++) {
-			$col = $this->getExcelCol($i, 1);
-			$objPHPExcel->getActiveSheet()->setCellValue($col, $data["colData"][$i]);
-		}
-
-		for ($i=0; $i<count($data["rowData"]); $i++) {
-			for ($j=0; $j<$numCols; $j++) {
-				$col = $this->getExcelCol($j, $i+2);
-				$objPHPExcel->getActiveSheet()->setCellValue($col, $data["rowData"][$i][$j]);
-			}
-		}
-		
-		//We'll need to check if the compression option is turned on. And then execute this code - unullmass
-
-		$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
-		//get the name of the save file
-		$filepath=$this->getDownloadFilename($generator);
-		//save the excel data to that file
-		$objWriter->save($filepath);
-		if(!($generator->isPromptDownloadZipped())){
-		
-			// redirect output to a client’s web browser (Excel5)
-			header('Content-Type: application/vnd.ms-excel');
-			header('Content-Disposition: attachment;filename="'.$filepath.'"');
-			header('Cache-Control: max-age=0');
-			readfile($filepath);
-
-		}else{
-			//create archive and send back
-			$zippath=$filepath.".zip";
-			$zip = new ZipArchive();
-			$zipfile = $zip->open($zippath,ZipArchive::CREATE);
-			if($zipfile){
-				if ($zip->addFile($filepath,$filepath)){
-					//we've got our zip file now we may set the response header
-					$zip->close();
-					header("Cache-Control: private, no-cache, must-revalidate");
-					header("Content-type: application/zip"); 
-					header('Content-Disposition: attachment; filename="'.$filepath.'.zip"');
-					readfile($zippath);
-					unlink($zippath);
-					unlink($filepath);
-					//exit sending the zip back
-					exit;
-				}
-			}
-		}
-	}
-
-	private function getExcelCol($index, $row) {
-		$remainder = floor($index / 26) - 1;
-		if ($remainder == -1) {
-			$firstColChar = "";
-		} else {
-			$firstColChar = $this->charArray[$remainder];
-		}
-		$secondColChar = $this->charArray[$index % 26];
-		return "{$firstColChar}{$secondColChar}$row";
-	}
-
-	/**
-	 * Used for constructing the filename of the filename when downloading.
-	 * @see ExportTypePlugin::getDownloadFilename()
-	 * @param Generator $generator
-	 * @return string
-	 */
-	function getDownloadFilename($generator) {
-		$time = date("M-j-Y");
-		return session_id()."data{$time}.xls";
-	}
-}
diff --git a/plugins/exportTypes/Excel/Excel.js b/plugins/exportTypes/Excel/Excel.js
deleted file mode 100644
index a6c4ff1f1..000000000
--- a/plugins/exportTypes/Excel/Excel.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*global $:false,CodeMirror:false*/
- define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name Excel
-	 * @see ExportType
-	 * @description Client-side code for the Excel Export Type.
-	 * @namespace
-	 */
-
-	var MODULE_ID = "export-type-Excel";
-	var LANG = L.exportTypePlugins.Excel;
-
-
-	manager.registerExportType(MODULE_ID, {
-
-	});
-});
diff --git a/plugins/exportTypes/Excel/PHPExcel.php b/plugins/exportTypes/Excel/PHPExcel.php
deleted file mode 100755
index cc70286d4..000000000
--- a/plugins/exportTypes/Excel/PHPExcel.php
+++ /dev/null
@@ -1,823 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel
-{
-	/**
-	 * Document properties
-	 *
-	 * @var PHPExcel_DocumentProperties
-	 */
-	private $_properties;
-
-	/**
-	 * Document security
-	 *
-	 * @var PHPExcel_DocumentSecurity
-	 */
-	private $_security;
-
-	/**
-	 * Collection of Worksheet objects
-	 *
-	 * @var PHPExcel_Worksheet[]
-	 */
-	private $_workSheetCollection = array();
-
-	/**
-	 * Active sheet index
-	 *
-	 * @var int
-	 */
-	private $_activeSheetIndex = 0;
-
-	/**
-	 * Named ranges
-	 *
-	 * @var PHPExcel_NamedRange[]
-	 */
-	private $_namedRanges = array();
-
-	/**
-	 * CellXf supervisor
-	 *
-	 * @var PHPExcel_Style
-	 */
-	private $_cellXfSupervisor;
-
-	/**
-	 * CellXf collection
-	 *
-	 * @var PHPExcel_Style[]
-	 */
-	private $_cellXfCollection = array();
-
-	/**
-	 * CellStyleXf collection
-	 *
-	 * @var PHPExcel_Style[]
-	 */
-	private $_cellStyleXfCollection = array();
-
-	/**
-	 * Create a new PHPExcel with one Worksheet
-	 */
-	public function __construct()
-	{
-		// Initialise worksheet collection and add one worksheet
-		$this->_workSheetCollection = array();
-		$this->_workSheetCollection[] = new PHPExcel_Worksheet($this);
-		$this->_activeSheetIndex = 0;
-
-		// Create document properties
-		$this->_properties = new PHPExcel_DocumentProperties();
-
-		// Create document security
-		$this->_security = new PHPExcel_DocumentSecurity();
-
-		// Set named ranges
-		$this->_namedRanges = array();
-
-		// Create the cellXf supervisor
-		$this->_cellXfSupervisor = new PHPExcel_Style(true);
-		$this->_cellXfSupervisor->bindParent($this);
-
-		// Create the default style
-		$this->addCellXf(new PHPExcel_Style);
-		$this->addCellStyleXf(new PHPExcel_Style);
-	}
-
-
-	/**
-	 * Disconnect all worksheets from this PHPExcel workbook object,
-	 *    typically so that the PHPExcel object can be unset
-	 *
-	 */
-	public function disconnectWorksheets() {
-		foreach($this->_workSheetCollection as $k => &$worksheet) {
-			$worksheet->disconnectCells();
-			$this->_workSheetCollection[$k] = null;
-		}
-		unset($worksheet);
-		$this->_workSheetCollection = array();
-	}
-
-	/**
-	 * Get properties
-	 *
-	 * @return PHPExcel_DocumentProperties
-	 */
-	public function getProperties()
-	{
-		return $this->_properties;
-	}
-
-	/**
-	 * Set properties
-	 *
-	 * @param PHPExcel_DocumentProperties	$pValue
-	 */
-	public function setProperties(PHPExcel_DocumentProperties $pValue)
-	{
-		$this->_properties = $pValue;
-	}
-
-	/**
-	 * Get security
-	 *
-	 * @return PHPExcel_DocumentSecurity
-	 */
-	public function getSecurity()
-	{
-		return $this->_security;
-	}
-
-	/**
-	 * Set security
-	 *
-	 * @param PHPExcel_DocumentSecurity	$pValue
-	 */
-	public function setSecurity(PHPExcel_DocumentSecurity $pValue)
-	{
-		$this->_security = $pValue;
-	}
-
-	/**
-	 * Get active sheet
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getActiveSheet()
-	{
-		return $this->_workSheetCollection[$this->_activeSheetIndex];
-	}
-
-    /**
-     * Create sheet and add it to this workbook
-     *
-	 * @param int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
-     * @return PHPExcel_Worksheet
-     * @throws Exception
-     */
-    public function createSheet($iSheetIndex = NULL)
-    {
-        $newSheet = new PHPExcel_Worksheet($this);
-        $this->addSheet($newSheet, $iSheetIndex);
-        return $newSheet;
-    }
-
-    /**
-     * Chech if a sheet with a specified name already exists
-     *
-     * @param string $pSheetName  Name of the worksheet to check
-     * @return boolean
-     */
-    public function sheetNameExists($pSheetName)
-    {
-		return ($this->getSheetByName($pSheetName) !== NULL);
-    }
-
-    /**
-     * Add sheet
-     *
-     * @param PHPExcel_Worksheet $pSheet
-	 * @param int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
-     * @return PHPExcel_Worksheet
-     * @throws Exception
-     */
-    public function addSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = NULL)
-    {
-		if ($this->sheetNameExists($pSheet->getTitle())) {
-			throw new Exception("Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename this worksheet first.");
-		}
-
-        if($iSheetIndex === NULL) {
-            if ($this->_activeSheetIndex < 0) {
-            	$this->_activeSheetIndex = 0;
-            }
-            $this->_workSheetCollection[] = $pSheet;
-        } else {
-            // Insert the sheet at the requested index
-            array_splice(
-                $this->_workSheetCollection,
-                $iSheetIndex,
-                0,
-                array($pSheet)
-                );
-
-			// Adjust active sheet index if necessary
-			if ($this->_activeSheetIndex >= $iSheetIndex) {
-				++$this->_activeSheetIndex;
-			}
-        }
-		return $pSheet;
-    }
-
-	/**
-	 * Remove sheet by index
-	 *
-	 * @param int $pIndex Active sheet index
-	 * @throws Exception
-	 */
-	public function removeSheetByIndex($pIndex = 0)
-	{
-		if ($pIndex > count($this->_workSheetCollection) - 1) {
-			throw new Exception("Sheet index is out of bounds.");
-		} else {
-			array_splice($this->_workSheetCollection, $pIndex, 1);
-		}
-		// Adjust active sheet index if necessary
-		if (($this->_activeSheetIndex >= $pIndex) &&
-			($pIndex > count($this->_workSheetCollection) - 1)) {
-			--$this->_activeSheetIndex;
-		}
-
-	}
-
-	/**
-	 * Get sheet by index
-	 *
-	 * @param int $pIndex Sheet index
-	 * @return PHPExcel_Worksheet
-	 * @throws Exception
-	 */
-	public function getSheet($pIndex = 0)
-	{
-		if ($pIndex > count($this->_workSheetCollection) - 1) {
-			throw new Exception("Sheet index is out of bounds.");
-		} else {
-			return $this->_workSheetCollection[$pIndex];
-		}
-	}
-
-	/**
-	 * Get all sheets
-	 *
-	 * @return PHPExcel_Worksheet[]
-	 */
-	public function getAllSheets()
-	{
-		return $this->_workSheetCollection;
-	}
-
-	/**
-	 * Get sheet by name
-	 *
-	 * @param string $pName Sheet name
-	 * @return PHPExcel_Worksheet
-	 * @throws Exception
-	 */
-	public function getSheetByName($pName = '')
-	{
-		$worksheetCount = count($this->_workSheetCollection);
-		for ($i = 0; $i < $worksheetCount; ++$i) {
-			if ($this->_workSheetCollection[$i]->getTitle() == $pName) {
-				return $this->_workSheetCollection[$i];
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get index for sheet
-	 *
-	 * @param PHPExcel_Worksheet $pSheet
-	 * @return Sheet index
-	 * @throws Exception
-	 */
-	public function getIndex(PHPExcel_Worksheet $pSheet)
-	{
-		foreach ($this->_workSheetCollection as $key => $value) {
-			if ($value->getHashCode() == $pSheet->getHashCode()) {
-				return $key;
-			}
-		}
-	}
-
-    /**
-	 * Set index for sheet by sheet name.
-	 *
-	 * @param string $sheetName Sheet name to modify index for
-	 * @param int $newIndex New index for the sheet
-	 * @return New sheet index
-	 * @throws Exception
-	 */
-    public function setIndexByName($sheetName, $newIndex)
-    {
-        $oldIndex = $this->getIndex($this->getSheetByName($sheetName));
-        $pSheet = array_splice(
-            $this->_workSheetCollection,
-            $oldIndex,
-            1
-            );
-        array_splice(
-            $this->_workSheetCollection,
-            $newIndex,
-            0,
-            $pSheet
-            );
-        return $newIndex;
-    }
-
-	/**
-	 * Get sheet count
-	 *
-	 * @return int
-	 */
-	public function getSheetCount()
-	{
-		return count($this->_workSheetCollection);
-	}
-
-	/**
-	 * Get active sheet index
-	 *
-	 * @return int Active sheet index
-	 */
-	public function getActiveSheetIndex()
-	{
-		return $this->_activeSheetIndex;
-	}
-
-	/**
-	 * Set active sheet index
-	 *
-	 * @param int $pIndex Active sheet index
-	 * @throws Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setActiveSheetIndex($pIndex = 0)
-	{
-		if ($pIndex > count($this->_workSheetCollection) - 1) {
-			throw new Exception("Active sheet index is out of bounds.");
-		} else {
-			$this->_activeSheetIndex = $pIndex;
-		}
-		return $this->getActiveSheet();
-	}
-
-	/**
-	 * Set active sheet index by name
-	 *
-	 * @param string $pValue Sheet title
-	 * @return PHPExcel_Worksheet
-	 * @throws Exception
-	 */
-	public function setActiveSheetIndexByName($pValue = '')
-	{
-		if (($worksheet = $this->getSheetByName($pValue)) instanceof PHPExcel_Worksheet) {
-			$this->setActiveSheetIndex($this->getIndex($worksheet));
-			return $worksheet;
-		}
-
-		throw new Exception('Workbook does not contain sheet:' . $pValue);
-	}
-
-	/**
-	 * Get sheet names
-	 *
-	 * @return string[]
-	 */
-	public function getSheetNames()
-	{
-		$returnValue = array();
-		$worksheetCount = $this->getSheetCount();
-		for ($i = 0; $i < $worksheetCount; ++$i) {
-			$returnValue[] = $this->getSheet($i)->getTitle();
-		}
-
-		return $returnValue;
-	}
-
-	/**
-	 * Add external sheet
-	 *
-	 * @param PHPExcel_Worksheet $pSheet External sheet to add
-	 * @param int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
-	 * @throws Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function addExternalSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = null) {
-		if ($this->sheetNameExists($pSheet->getTitle())) {
-			throw new Exception("Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename the external sheet first.");
-		}
-
-		// count how many cellXfs there are in this workbook currently, we will need this below
-		$countCellXfs = count($this->_cellXfCollection);
-
-		// copy all the shared cellXfs from the external workbook and append them to the current
-		foreach ($pSheet->getParent()->getCellXfCollection() as $cellXf) {
-			$this->addCellXf(clone $cellXf);
-		}
-
-		// move sheet to this workbook
-		$pSheet->rebindParent($this);
-
-		// update the cellXfs
-		foreach ($pSheet->getCellCollection(false) as $cellID) {
-			$cell = $pSheet->getCell($cellID);
-			$cell->setXfIndex( $cell->getXfIndex() + $countCellXfs );
-		}
-
-		return $this->addSheet($pSheet, $iSheetIndex);
-	}
-
-	/**
-	 * Get named ranges
-	 *
-	 * @return PHPExcel_NamedRange[]
-	 */
-	public function getNamedRanges() {
-		return $this->_namedRanges;
-	}
-
-	/**
-	 * Add named range
-	 *
-	 * @param PHPExcel_NamedRange $namedRange
-	 * @return PHPExcel
-	 */
-	public function addNamedRange(PHPExcel_NamedRange $namedRange) {
-		if ($namedRange->getScope() == null) {
-			// global scope
-			$this->_namedRanges[$namedRange->getName()] = $namedRange;
-		} else {
-			// local scope
-			$this->_namedRanges[$namedRange->getScope()->getTitle().'!'.$namedRange->getName()] = $namedRange;
-		}
-		return true;
-	}
-
-	/**
-	 * Get named range
-	 *
-	 * @param string $namedRange
-	 * @param PHPExcel_Worksheet|null $pSheet Scope. Use null for global scope
-	 * @return PHPExcel_NamedRange|null
-	 */
-	public function getNamedRange($namedRange, PHPExcel_Worksheet $pSheet = null) {
-		$returnValue = null;
-
-		if ($namedRange != '' && ($namedRange !== NULL)) {
-			// first look for global defined name
-			if (isset($this->_namedRanges[$namedRange])) {
-				$returnValue = $this->_namedRanges[$namedRange];
-			}
-
-			// then look for local defined name (has priority over global defined name if both names exist)
-			if (($pSheet !== NULL) && isset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-				$returnValue = $this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange];
-			}
-		}
-
-		return $returnValue;
-	}
-
-	/**
-	 * Remove named range
-	 *
-	 * @param  string  $namedRange
-	 * @param  PHPExcel_Worksheet|null  $pSheet  Scope: use null for global scope.
-	 * @return PHPExcel
-	 */
-	public function removeNamedRange($namedRange, PHPExcel_Worksheet $pSheet = null) {
-		if ($pSheet === NULL) {
-			if (isset($this->_namedRanges[$namedRange])) {
-				unset($this->_namedRanges[$namedRange]);
-			}
-		} else {
-			if (isset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-				unset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange]);
-			}
-		}
-		return $this;
-	}
-
-	/**
-	 * Get worksheet iterator
-	 *
-	 * @return PHPExcel_WorksheetIterator
-	 */
-	public function getWorksheetIterator() {
-		return new PHPExcel_WorksheetIterator($this);
-	}
-
-	/**
-	 * Copy workbook (!= clone!)
-	 *
-	 * @return PHPExcel
-	 */
-	public function copy() {
-		$copied = clone $this;
-
-		$worksheetCount = count($this->_workSheetCollection);
-		for ($i = 0; $i < $worksheetCount; ++$i) {
-			$this->_workSheetCollection[$i] = $this->_workSheetCollection[$i]->copy();
-			$this->_workSheetCollection[$i]->rebindParent($this);
-		}
-
-		return $copied;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		foreach($this as $key => $val) {
-			if (is_object($val) || (is_array($val))) {
-				$this->{$key} = unserialize(serialize($val));
-			}
-		}
-	}
-
-	/**
-	 * Get the workbook collection of cellXfs
-	 *
-	 * @return PHPExcel_Style[]
-	 */
-	public function getCellXfCollection()
-	{
-		return $this->_cellXfCollection;
-	}
-
-	/**
-	 * Get cellXf by index
-	 *
-	 * @param int $pIndex
-	 * @return PHPExcel_Style
-	 */
-	public function getCellXfByIndex($pIndex = 0)
-	{
-		return $this->_cellXfCollection[$pIndex];
-	}
-
-	/**
-	 * Get cellXf by hash code
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style|false
-	 */
-	public function getCellXfByHashCode($pValue = '')
-	{
-		foreach ($this->_cellXfCollection as $cellXf) {
-			if ($cellXf->getHashCode() == $pValue) {
-				return $cellXf;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Get default style
-	 *
-	 * @return PHPExcel_Style
-	 * @throws Exception
-	 */
-	public function getDefaultStyle()
-	{
-		if (isset($this->_cellXfCollection[0])) {
-			return $this->_cellXfCollection[0];
-		}
-		throw new Exception('No default style found for this workbook');
-	}
-
-	/**
-	 * Add a cellXf to the workbook
-	 *
-	 * @param PHPExcel_Style $style
-	 */
-	public function addCellXf(PHPExcel_Style $style)
-	{
-		$this->_cellXfCollection[] = $style;
-		$style->setIndex(count($this->_cellXfCollection) - 1);
-	}
-
-	/**
-	 * Remove cellXf by index. It is ensured that all cells get their xf index updated.
-	 *
-	 * @param int $pIndex Index to cellXf
-	 * @throws Exception
-	 */
-	public function removeCellXfByIndex($pIndex = 0)
-	{
-		if ($pIndex > count($this->_cellXfCollection) - 1) {
-			throw new Exception("CellXf index is out of bounds.");
-		} else {
-			// first remove the cellXf
-			array_splice($this->_cellXfCollection, $pIndex, 1);
-
-			// then update cellXf indexes for cells
-			foreach ($this->_workSheetCollection as $worksheet) {
-				foreach ($worksheet->getCellCollection(false) as $cellID) {
-					$cell = $worksheet->getCell($cellID);
-					$xfIndex = $cell->getXfIndex();
-					if ($xfIndex > $pIndex ) {
-						// decrease xf index by 1
-						$cell->setXfIndex($xfIndex - 1);
-					} else if ($xfIndex == $pIndex) {
-						// set to default xf index 0
-						$cell->setXfIndex(0);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get the cellXf supervisor
-	 *
-	 * @return PHPExcel_Style
-	 */
-	public function getCellXfSupervisor()
-	{
-		return $this->_cellXfSupervisor;
-	}
-
-	/**
-	 * Get the workbook collection of cellStyleXfs
-	 *
-	 * @return PHPExcel_Style[]
-	 */
-	public function getCellStyleXfCollection()
-	{
-		return $this->_cellStyleXfCollection;
-	}
-
-	/**
-	 * Get cellStyleXf by index
-	 *
-	 * @param int $pIndex
-	 * @return PHPExcel_Style
-	 */
-	public function getCellStyleXfByIndex($pIndex = 0)
-	{
-		return $this->_cellStyleXfCollection[$pIndex];
-	}
-
-	/**
-	 * Get cellStyleXf by hash code
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style|false
-	 */
-	public function getCellStyleXfByHashCode($pValue = '')
-	{
-		foreach ($this->_cellXfStyleCollection as $cellStyleXf) {
-			if ($cellStyleXf->getHashCode() == $pValue) {
-				return $cellStyleXf;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Add a cellStyleXf to the workbook
-	 *
-	 * @param PHPExcel_Style $pStyle
-	 */
-	public function addCellStyleXf(PHPExcel_Style $pStyle)
-	{
-		$this->_cellStyleXfCollection[] = $pStyle;
-		$pStyle->setIndex(count($this->_cellStyleXfCollection) - 1);
-	}
-
-	/**
-	 * Remove cellStyleXf by index
-	 *
-	 * @param int $pIndex
-	 * @throws Exception
-	 */
-	public function removeCellStyleXfByIndex($pIndex = 0)
-	{
-		if ($pIndex > count($this->_cellStyleXfCollection) - 1) {
-			throw new Exception("CellStyleXf index is out of bounds.");
-		} else {
-			array_splice($this->_cellStyleXfCollection, $pIndex, 1);
-		}
-	}
-
-	/**
-	 * Eliminate all unneeded cellXf and afterwards update the xfIndex for all cells
-	 * and columns in the workbook
-	 */
-	public function garbageCollect()
-	{
-    	// how many references are there to each cellXf ?
-		$countReferencesCellXf = array();
-		foreach ($this->_cellXfCollection as $index => $cellXf) {
-			$countReferencesCellXf[$index] = 0;
-		}
-
-		foreach ($this->getWorksheetIterator() as $sheet) {
-
-			// from cells
-			foreach ($sheet->getCellCollection(false) as $cellID) {
-				$cell = $sheet->getCell($cellID);
-				++$countReferencesCellXf[$cell->getXfIndex()];
-			}
-
-			// from row dimensions
-			foreach ($sheet->getRowDimensions() as $rowDimension) {
-				if ($rowDimension->getXfIndex() !== null) {
-					++$countReferencesCellXf[$rowDimension->getXfIndex()];
-				}
-			}
-
-			// from column dimensions
-			foreach ($sheet->getColumnDimensions() as $columnDimension) {
-				++$countReferencesCellXf[$columnDimension->getXfIndex()];
-			}
-		}
-
-		// remove cellXfs without references and create mapping so we can update xfIndex
-		// for all cells and columns
-		$countNeededCellXfs = 0;
-		foreach ($this->_cellXfCollection as $index => $cellXf) {
-			if ($countReferencesCellXf[$index] > 0 || $index == 0) { // we must never remove the first cellXf
-				++$countNeededCellXfs;
-			} else {
-				unset($this->_cellXfCollection[$index]);
-			}
-			$map[$index] = $countNeededCellXfs - 1;
-		}
-		$this->_cellXfCollection = array_values($this->_cellXfCollection);
-
-		// update the index for all cellXfs
-		foreach ($this->_cellXfCollection as $i => $cellXf) {
-			$cellXf->setIndex($i);
-		}
-
-		// make sure there is always at least one cellXf (there should be)
-		if (empty($this->_cellXfCollection)) {
-			$this->_cellXfCollection[] = new PHPExcel_Style();
-		}
-
-		// update the xfIndex for all cells, row dimensions, column dimensions
-		foreach ($this->getWorksheetIterator() as $sheet) {
-
-			// for all cells
-			foreach ($sheet->getCellCollection(false) as $cellID) {
-				$cell = $sheet->getCell($cellID);
-				$cell->setXfIndex( $map[$cell->getXfIndex()] );
-			}
-
-			// for all row dimensions
-			foreach ($sheet->getRowDimensions() as $rowDimension) {
-				if ($rowDimension->getXfIndex() !== null) {
-					$rowDimension->setXfIndex( $map[$rowDimension->getXfIndex()] );
-				}
-			}
-
-			// for all column dimensions
-			foreach ($sheet->getColumnDimensions() as $columnDimension) {
-				$columnDimension->setXfIndex( $map[$columnDimension->getXfIndex()] );
-			}
-		}
-
-		// also do garbage collection for all the sheets
-		foreach ($this->getWorksheetIterator() as $sheet) {
-			$sheet->garbageCollect();
-		}
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Autoloader.php b/plugins/exportTypes/Excel/PHPExcel/Autoloader.php
deleted file mode 100755
index 6b6bf6d63..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Autoloader.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-PHPExcel_Autoloader::Register();
-//	As we always try to run the autoloader before anything else, we can use it to do a few
-//		simple checks and initialisations
-PHPExcel_Shared_ZipStreamWrapper::register();
-// check mbstring.func_overload
-if (ini_get('mbstring.func_overload') & 2) {
-    throw new Exception('Multibyte function overloading in PHP must be disabled for string functions (2).');
-}
-PHPExcel_Shared_String::buildCharacterSets();
-
-
-/**
- * PHPExcel_Autoloader
- *
- * @category	PHPExcel
- * @package		PHPExcel
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Autoloader
-{
-	/**
-	 * Register the Autoloader with SPL
-	 *
-	 */
-	public static function Register() {
-		if (function_exists('__autoload')) {
-			//	Register any existing autoloader function with SPL, so we don't get any clashes
-			spl_autoload_register('__autoload');
-		}
-		//	Register ourselves with SPL
-		return spl_autoload_register(array('PHPExcel_Autoloader', 'Load'));
-	}	//	function Register()
-
-
-	/**
-	 * Autoload a class identified by name
-	 *
-	 * @param	string	$pClassName		Name of the object to load
-	 */
-	public static function Load($pClassName){
-		if ((class_exists($pClassName,FALSE)) || (strpos($pClassName, 'PHPExcel') !== 0)) {
-			//	Either already loaded, or not a PHPExcel class request
-			return FALSE;
-		}
-
-		$pClassFilePath = PHPEXCEL_ROOT .
-						  str_replace('_',DIRECTORY_SEPARATOR,$pClassName) .
-						  '.php';
-
-		if ((file_exists($pClassFilePath) === false) || (is_readable($pClassFilePath) === false)) {
-			//	Can't load
-			return FALSE;
-		}
-
-		require($pClassFilePath);
-	}	//	function Load()
-
-}
\ No newline at end of file
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/APC.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/APC.php
deleted file mode 100755
index e7c4919bf..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/APC.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_APC
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Prefix used to uniquely identify cache data for this worksheet
-	 *
-	 * @access	private
-	 * @var string
-	 */
-	private $_cachePrefix = null;
-
-	/**
-	 * Cache timeout
-	 *
-	 * @access	private
-	 * @var integer
-	 */
-	private $_cacheTime = 600;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @access	private
-	 * @return	void
-     * @throws	Exception
-     */
-	private function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
-
-			if (!apc_store($this->_cachePrefix.$this->_currentObjectID.'.cache',serialize($this->_currentObject),$this->_cacheTime)) {
-				$this->__destruct();
-				throw new Exception('Failed to store cell '.$this->_currentObjectID.' in APC');
-			}
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-	 * @access	public
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-		$this->_cellCache[$pCoord] = true;
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @access	public
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	void
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		//	Check if the requested entry is the current object, or exists in the cache
-		if (parent::isDataSet($pCoord)) {
-			if ($this->_currentObjectID == $pCoord) {
-				return true;
-			}
-			//	Check if the requested entry still exists in apc
-			$success = apc_fetch($this->_cachePrefix.$pCoord.'.cache');
-			if ($success === false) {
-				//	Entry no longer exists in APC, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$pCoord.' no longer exists in APC');
-			}
-			return true;
-		}
-		return false;
-	}	//	function isDataSet()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-	 * @access	public
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (parent::isDataSet($pCoord)) {
-			$obj = apc_fetch($this->_cachePrefix.$pCoord.'.cache');
-			if ($obj === false) {
-				//	Entry no longer exists in APC, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$pCoord.' no longer exists in APC');
-			}
-		} else {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($obj);
-		//	Re-attach the parent worksheet
-		$this->_currentObject->attach($this->_parent);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-	 * @access	public
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	Exception
-     */
-	public function deleteCacheData($pCoord) {
-		//	Delete the entry from APC
-		apc_delete($this->_cachePrefix.$pCoord.'.cache');
-
-		//	Delete the entry from our cell address array
-		parent::deleteCacheData($pCoord);
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @access	public
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newCachePrefix = substr(md5($baseUnique),0,8).'.';
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			if ($cellID != $this->_currentObjectID) {
-				$obj = apc_fetch($this->_cachePrefix.$cellID.'.cache');
-				if ($obj === false) {
-					//	Entry no longer exists in APC, so clear it from the cache array
-					parent::deleteCacheData($cellID);
-					throw new Exception('Cell entry '.$cellID.' no longer exists in APC');
-				}
-				if (!apc_store($newCachePrefix.$cellID.'.cache',$obj,$this->_cacheTime)) {
-					$this->__destruct();
-					throw new Exception('Failed to store cell '.$cellID.' in APC');
-				}
-			}
-		}
-		$this->_cachePrefix = $newCachePrefix;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if ($this->_currentObject !== NULL) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-
-		//	Flush the APC cache
-		$this->__destruct();
-
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$cacheTime	= (isset($arguments['cacheTime']))	? $arguments['cacheTime']	: 600;
-
-		if ($this->_cachePrefix === NULL) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
-			$this->_cacheTime = $cacheTime;
-
-			parent::__construct($parent);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			apc_delete($this->_cachePrefix.$cellID.'.cache');
-		}
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('apc_store')) {
-			return false;
-		}
-		if (apc_sma_info() === false) {
-			return false;
-		}
-
-		return true;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/CacheBase.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/CacheBase.php
deleted file mode 100755
index 822a655a0..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/CacheBase.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_CacheBase
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_CachedObjectStorage_CacheBase {
-
-	/**
-	 * Parent worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	protected $_parent;
-
-	/**
-	 * The currently active Cell
-	 *
-	 * @var PHPExcel_Cell
-	 */
-	protected $_currentObject = null;
-
-	/**
-	 * Coordinate address of the currently active Cell
-	 *
-	 * @var string
-	 */
-	protected $_currentObjectID = null;
-
-
-	/**
-	 * Flag indicating whether the currently active Cell requires saving
-	 *
-	 * @var boolean
-	 */
-	protected $_currentCellIsDirty = true;
-
-	/**
-	 * An array of cells or cell pointers for the worksheet cells held in this cache,
-	 *		and indexed by their coordinate address within the worksheet
-	 *
-	 * @var array of mixed
-	 */
-	protected $_cellCache = array();
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 */
-	public function __construct(PHPExcel_Worksheet $parent) {
-		//	Set our parent worksheet.
-		//	This is maintained within the cache controller to facilitate re-attaching it to PHPExcel_Cell objects when
-		//		they are woken from a serialized state
-		$this->_parent = $parent;
-	}	//	function __construct()
-
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return true;
-		}
-		//	Check if the requested entry exists in the cache
-		return isset($this->_cellCache[$pCoord]);
-	}	//	function isDataSet()
-
-
-    /**
-     * Add or Update a cell in cache
-     *
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function updateCacheData(PHPExcel_Cell $cell) {
-		return $this->addCacheData($cell->getCoordinate(),$cell);
-	}	//	function updateCacheData()
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	Exception
-     */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = null;
-		}
-
-		if (is_object($this->_cellCache[$pCoord])) {
-			$this->_cellCache[$pCoord]->detach();
-			unset($this->_cellCache[$pCoord]);
-		}
-		$this->_currentCellIsDirty = false;
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	array of string
-	 */
-	public function getCellList() {
-		return array_keys($this->_cellCache);
-	}	//	function getCellList()
-
-
-	/**
-	 * Sort the list of all cell addresses currently held in cache by row and column
-	 *
-	 * @return	void
-	 */
-	public function getSortedCellList() {
-		$sortKeys = array();
-		foreach ($this->getCellList() as $coord) {
-			list($column,$row) = sscanf($coord,'%[A-Z]%d');
-			$sortKeys[sprintf('%09d%3s',$row,$column)] = $coord;
-		}
-		ksort($sortKeys);
-
-		return array_values($sortKeys);
-	}	//	function sortCellList()
-
-
-
-	/**
-	 * Get highest worksheet column and highest row that have cell records
-	 *
-	 * @return array Highest column name and highest row number
-	 */
-	public function getHighestRowAndColumn()
-	{
-		// Lookup highest column and highest row
-		$col = array('A' => '1A');
-		$row = array(1);
-		foreach ($this->getCellList() as $coord) {
-			list($c,$r) = sscanf($coord,'%[A-Z]%d');
-			$row[$r] = $r;
-			$col[$c] = strlen($c).$c;
-		}
-		if (!empty($row)) {
-			// Determine highest column and row
-			$highestRow = max($row);
-			$highestColumn = substr(max($col),1);
-		}
-
-		return array( 'row'	   => $highestRow,
-					  'column' => $highestColumn
-					);
-	}
-
-
-	/**
-	 * Get highest worksheet column
-	 *
-	 * @return string Highest column name
-	 */
-	public function getHighestColumn()
-	{
-		$colRow = $this->getHighestRowAndColumn();
-		return $colRow['column'];
-	}
-
-	/**
-	 * Get highest worksheet row
-	 *
-	 * @return int Highest row number
-	 */
-	public function getHighestRow()
-	{
-		$colRow = $this->getHighestRowAndColumn();
-		return $colRow['row'];
-	}
-
-
-	/**
-	 * Generate a unique ID for cache referencing
-	 *
-	 * @return string Unique Reference
-	 */
-	protected function _getUniqueID() {
-		if (function_exists('posix_getpid')) {
-			$baseUnique = posix_getpid();
-		} else {
-			$baseUnique = mt_rand();
-		}
-		return uniqid($baseUnique,true);
-	}
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		$this->_parent = $parent;
-		if (($this->_currentObject !== NULL) && (is_object($this->_currentObject))) {
-			$this->_currentObject->attach($parent);
-		}
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		return true;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/DiscISAM.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/DiscISAM.php
deleted file mode 100755
index edae09daf..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/DiscISAM.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_DiscISAM
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Name of the file for this cache
-	 *
-	 * @var string
-	 */
-	private $_fileName = null;
-
-	/**
-	 * File handle for this cache file
-	 *
-	 * @var resource
-	 */
-	private $_fileHandle = null;
-
-	/**
-	 * Directory/Folder where the cache file is located
-	 *
-	 * @var string
-	 */
-	private $_cacheDirectory = NULL;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	Exception
-     */
-	private function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
-
-			fseek($this->_fileHandle,0,SEEK_END);
-			$offset = ftell($this->_fileHandle);
-			fwrite($this->_fileHandle, serialize($this->_currentObject));
-			$this->_cellCache[$this->_currentObjectID]	= array('ptr' => $offset,
-																'sz'  => ftell($this->_fileHandle) - $offset
-															   );
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		fseek($this->_fileHandle,$this->_cellCache[$pCoord]['ptr']);
-		$this->_currentObject = unserialize(fread($this->_fileHandle,$this->_cellCache[$pCoord]['sz']));
-		//	Re-attach the parent worksheet
-		$this->_currentObject->attach($this->_parent);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newFileName = $this->_cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
-		//	Copy the existing cell cache file
-		copy ($this->_fileName,$newFileName);
-		$this->_fileName = $newFileName;
-		//	Open the copied cell cache file
-		$this->_fileHandle = fopen($this->_fileName,'a+');
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the temporary cache file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$this->_cacheDirectory	= ((isset($arguments['dir'])) && ($arguments['dir'] !== NULL))
-									? $arguments['dir']
-									: PHPExcel_Shared_File::sys_get_temp_dir();
-
-		parent::__construct($parent);
-		if (is_null($this->_fileHandle)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_fileName = $this->_cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
-			$this->_fileHandle = fopen($this->_fileName,'a+');
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_fileHandle)) {
-			fclose($this->_fileHandle);
-			unlink($this->_fileName);
-		}
-		$this->_fileHandle = null;
-	}	//	function __destruct()
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/ICache.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/ICache.php
deleted file mode 100755
index 1caceea7a..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/ICache.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_ICache
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_CachedObjectStorage_ICache
-{
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell);
-
-    /**
-     * Add or Update a cell in cache
-     *
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function updateCacheData(PHPExcel_Cell $cell);
-
-    /**
-     * Fetch a cell from cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to retrieve
-     * @return PHPExcel_Cell 	Cell that was found, or null if not found
-     * @throws	Exception
-     */
-	public function getCacheData($pCoord);
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	Exception
-     */
-	public function deleteCacheData($pCoord);
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord);
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	array of string
-	 */
-	public function getCellList();
-
-	/**
-	 * Get the list of all cell addresses currently held in cache sorted by column and row
-	 *
-	 * @return	void
-	 */
-	public function getSortedCellList();
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent);
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable();
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Igbinary.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Igbinary.php
deleted file mode 100755
index 3728d6784..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Igbinary.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Igbinary
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	Exception
-     */
-	private function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
-
-			$this->_cellCache[$this->_currentObjectID] = igbinary_serialize($this->_currentObject);
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = igbinary_unserialize($this->_cellCache[$pCoord]);
-		//	Re-attach the parent worksheet
-		$this->_currentObject->attach($this->_parent);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('igbinary_serialize')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Memcache.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Memcache.php
deleted file mode 100755
index a72fa1914..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Memcache.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Memcache
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Prefix used to uniquely identify cache data for this worksheet
-	 *
-	 * @var string
-	 */
-	private $_cachePrefix = null;
-
-	/**
-	 * Cache timeout
-	 *
-	 * @var integer
-	 */
-	private $_cacheTime = 600;
-
-	/**
-	 * Memcache interface
-	 *
-	 * @var resource
-	 */
-	private $_memcache = null;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	Exception
-     */
-	private function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
-
-			$obj = serialize($this->_currentObject);
-			if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
-				if (!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
-					$this->__destruct();
-					throw new Exception('Failed to store cell '.$this->_currentObjectID.' in MemCache');
-				}
-			}
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-		$this->_cellCache[$pCoord] = true;
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	void
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		//	Check if the requested entry is the current object, or exists in the cache
-		if (parent::isDataSet($pCoord)) {
-			if ($this->_currentObjectID == $pCoord) {
-				return true;
-			}
-			//	Check if the requested entry still exists in Memcache
-			$success = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache');
-			if ($success === false) {
-				//	Entry no longer exists in Memcache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
-			}
-			return true;
-		}
-		return false;
-	}	//	function isDataSet()
-
-
-	/**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (parent::isDataSet($pCoord)) {
-			$obj = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache');
-			if ($obj === false) {
-				//	Entry no longer exists in Memcache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
-			}
-		} else {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($obj);
-		//	Re-attach the parent worksheet
-		$this->_currentObject->attach($this->_parent);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	Exception
-     */
-	public function deleteCacheData($pCoord) {
-		//	Delete the entry from Memcache
-		$this->_memcache->delete($this->_cachePrefix.$pCoord.'.cache');
-
-		//	Delete the entry from our cell address array
-		parent::deleteCacheData($pCoord);
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newCachePrefix = substr(md5($baseUnique),0,8).'.';
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			if ($cellID != $this->_currentObjectID) {
-				$obj = $this->_memcache->get($this->_cachePrefix.$cellID.'.cache');
-				if ($obj === false) {
-					//	Entry no longer exists in Memcache, so clear it from the cache array
-					parent::deleteCacheData($cellID);
-					throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache');
-				}
-				if (!$this->_memcache->add($newCachePrefix.$cellID.'.cache',$obj,NULL,$this->_cacheTime)) {
-					$this->__destruct();
-					throw new Exception('Failed to store cell '.$cellID.' in MemCache');
-				}
-			}
-		}
-		$this->_cachePrefix = $newCachePrefix;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-
-		//	Flush the Memcache cache
-		$this->__destruct();
-
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$memcacheServer	= (isset($arguments['memcacheServer']))	? $arguments['memcacheServer']	: 'localhost';
-		$memcachePort	= (isset($arguments['memcachePort']))	? $arguments['memcachePort']	: 11211;
-		$cacheTime		= (isset($arguments['cacheTime']))		? $arguments['cacheTime']		: 600;
-
-		if (is_null($this->_cachePrefix)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
-
-			//	Set a new Memcache object and connect to the Memcache server
-			$this->_memcache = new Memcache();
-			if (!$this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) {
-				throw new Exception('Could not connect to MemCache server at '.$memcacheServer.':'.$memcachePort);
-			}
-			$this->_cacheTime = $cacheTime;
-
-			parent::__construct($parent);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Memcache error handler
-	 *
-	 * @param	string	$host		Memcache server
-	 * @param	integer	$port		Memcache port
-     * @throws	Exception
-	 */
-	public function failureCallback($host, $port) {
-		throw new Exception('memcache '.$host.':'.$port.' failed');
-	}
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			$this->_memcache->delete($this->_cachePrefix.$cellID.'.cache');
-		}
-	}	//	function __destruct()
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('memcache_add')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Memory.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Memory.php
deleted file mode 100755
index be84c43d0..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Memory.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Memory
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		$this->_cellCache[$pCoord] = $cell;
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Return requested entry
-		return $this->_cellCache[$pCoord];
-	}	//	function getCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-
-		$newCollection = array();
-		foreach($this->_cellCache as $k => &$cell) {
-			$newCollection[$k] = clone $cell;
-			$newCollection[$k]->attach($parent);
-		}
-
-		$this->_cellCache = $newCollection;
-	}
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		//	Because cells are all stored as intact objects in memory, we need to detach each one from the parent
-		foreach($this->_cellCache as $k => &$cell) {
-			$cell->detach();
-			$this->_cellCache[$k] = null;
-		}
-		unset($cell);
-
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/MemoryGZip.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/MemoryGZip.php
deleted file mode 100755
index 9ee3aaea5..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/MemoryGZip.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_MemoryGZip
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	Exception
-     */
-	private function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
-
-			$this->_cellCache[$this->_currentObjectID] = gzdeflate(serialize($this->_currentObject));
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize(gzinflate($this->_cellCache[$pCoord]));
-		//	Re-attach the parent worksheet
-		$this->_currentObject->attach($this->_parent);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/MemorySerialized.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/MemorySerialized.php
deleted file mode 100755
index 82dc167b2..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/MemorySerialized.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_MemorySerialized
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	Exception
-     */
-	private function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
-
-			$this->_cellCache[$this->_currentObjectID] = serialize($this->_currentObject);
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($this->_cellCache[$pCoord]);
-		//	Re-attach the parent worksheet
-		$this->_currentObject->attach($this->_parent);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/PHPTemp.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/PHPTemp.php
deleted file mode 100755
index e5af520bf..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/PHPTemp.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_PHPTemp
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Name of the file for this cache
-	 *
-	 * @var string
-	 */
-	private $_fileHandle = null;
-
-	/**
-	 * Memory limit to use before reverting to file cache
-	 *
-	 * @var integer
-	 */
-	private $_memoryCacheSize = null;
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	Exception
-     */
-	private function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
-
-			fseek($this->_fileHandle,0,SEEK_END);
-			$offset = ftell($this->_fileHandle);
-			fwrite($this->_fileHandle, serialize($this->_currentObject));
-			$this->_cellCache[$this->_currentObjectID]	= array('ptr' => $offset,
-																'sz'  => ftell($this->_fileHandle) - $offset
-															   );
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		fseek($this->_fileHandle,$this->_cellCache[$pCoord]['ptr']);
-		$this->_currentObject = unserialize(fread($this->_fileHandle,$this->_cellCache[$pCoord]['sz']));
-		//	Re-attach the parent worksheet
-		$this->_currentObject->attach($this->_parent);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Open a new stream for the cell cache data
-		$newFileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+');
-		//	Copy the existing cell cache data to the new stream
-		fseek($this->_fileHandle,0);
-		while (!feof($this->_fileHandle)) {
-			fwrite($newFileHandle,fread($this->_fileHandle, 1024));
-		}
-		$this->_fileHandle = $newFileHandle;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the php://temp file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$this->_memoryCacheSize	= (isset($arguments['memoryCacheSize']))	? $arguments['memoryCacheSize']	: '1MB';
-
-		parent::__construct($parent);
-		if (is_null($this->_fileHandle)) {
-			$this->_fileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+');
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_fileHandle)) {
-			fclose($this->_fileHandle);
-		}
-		$this->_fileHandle = null;
-	}	//	function __destruct()
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/SQLite.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/SQLite.php
deleted file mode 100755
index 56cc3f9bf..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/SQLite.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_SQLite
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Database table name
-	 *
-	 * @var string
-	 */
-	private $_TableName = null;
-
-	/**
-	 * Database handle
-	 *
-	 * @var resource
-	 */
-	private $_DBHandle = null;
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	Exception
-     */
-	private function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
-
-			if (!$this->_DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')"))
-				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		$query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
-		if ($cellResultSet === false) {
-			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
-		} elseif ($cellResultSet->numRows() == 0) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-
-		$cellResult = $cellResultSet->fetchSingle();
-		$this->_currentObject = unserialize($cellResult);
-		//	Re-attach the parent worksheet
-		$this->_currentObject->attach($this->_parent);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Is a value set for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return true;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
-		if ($cellResultSet === false) {
-			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
-		} elseif ($cellResultSet->numRows() == 0) {
-			//	Return null if requested entry doesn't exist in cache
-			return false;
-		}
-		return true;
-	}	//	function isDataSet()
-
-
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	Exception
-     */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = null;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		if (!$this->_DBHandle->queryExec($query))
-			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
-
-		$this->_currentCellIsDirty = false;
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	array of string
-	 */
-	public function getCellList() {
-		$query = "SELECT id FROM kvp_".$this->_TableName;
-		$cellIdsResult = $this->_DBHandle->unbufferedQuery($query,SQLITE_ASSOC);
-		if ($cellIdsResult === false)
-			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
-
-		$cellKeys = array();
-		foreach($cellIdsResult as $row) {
-			$cellKeys[] = $row['id'];
-		}
-
-		return $cellKeys;
-	}	//	function getCellList()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		//	Get a new id for the new table name
-		$tableName = str_replace('.','_',$this->_getUniqueID());
-		if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-													AS SELECT * FROM kvp_'.$this->_TableName))
-			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
-
-		//	Copy the existing cell cache file
-		$this->_TableName = $tableName;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the temporary cache file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 */
-	public function __construct(PHPExcel_Worksheet $parent) {
-		parent::__construct($parent);
-		if (is_null($this->_DBHandle)) {
-			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
-			$_DBName = ':memory:';
-
-			$this->_DBHandle = new SQLiteDatabase($_DBName);
-			if ($this->_DBHandle === false)
-				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
-			if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		$this->_DBHandle = null;
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('sqlite_open')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/SQLite3.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/SQLite3.php
deleted file mode 100755
index 3c3cf745b..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/SQLite3.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_SQLite3
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Database table name
-	 *
-	 * @var string
-	 */
-	private $_TableName = null;
-
-	/**
-	 * Database handle
-	 *
-	 * @var resource
-	 */
-	private $_DBHandle = null;
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	Exception
-     */
-	private function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
-
-			$query = $this->_DBHandle->prepare("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES(:id,:data)");
-			$query->bindValue('id',$this->_currentObjectID,SQLITE3_TEXT);
-			$query->bindValue('data',serialize($this->_currentObject),SQLITE3_BLOB);
-			$result = $query->execute();
-			if ($result === false)
-				throw new Exception($this->_DBHandle->lastErrorMsg());
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-     * @throws	Exception
-     */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-    /**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		$query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResult = $this->_DBHandle->querySingle($query);
-		if ($cellResult === false) {
-			throw new Exception($this->_DBHandle->lastErrorMsg());
-		} elseif (is_null($cellResult)) {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-
-		$this->_currentObject = unserialize($cellResult);
-		//	Re-attach the parent worksheet
-		$this->_currentObject->attach($this->_parent);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 *	Is a value set for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return true;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResult = $this->_DBHandle->querySingle($query);
-		if ($cellResult === false) {
-			throw new Exception($this->_DBHandle->lastErrorMsg());
-		} elseif (is_null($cellResult)) {
-			//	Return null if requested entry doesn't exist in cache
-			return false;
-		}
-		return true;
-	}	//	function isDataSet()
-
-
-    /**
-     *	Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	Exception
-     */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = null;
-		}
-
-		//	Check if the requested entry exists in the cache
-		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$result = $this->_DBHandle->exec($query);
-		if ($result === false)
-			throw new Exception($this->_DBHandle->lastErrorMsg());
-
-		$this->_currentCellIsDirty = false;
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Get a list of all cell addresses currently held in cache
-	 *
-	 * @return	array of string
-	 */
-	public function getCellList() {
-		$query = "SELECT id FROM kvp_".$this->_TableName;
-		$cellIdsResult = $this->_DBHandle->query($query);
-		if ($cellIdsResult === false)
-			throw new Exception($this->_DBHandle->lastErrorMsg());
-
-		$cellKeys = array();
-		while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
-			$cellKeys[] = $row['id'];
-		}
-
-		return $cellKeys;
-	}	//	function getCellList()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		//	Get a new id for the new table name
-		$tableName = str_replace('.','_',$this->_getUniqueID());
-		if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-		                                       AS SELECT * FROM kvp_'.$this->_TableName))
-			throw new Exception($this->_DBHandle->lastErrorMsg());
-
-		//	Copy the existing cell cache file
-		$this->_TableName = $tableName;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-
-		//	Close down the temporary cache file
-		$this->__destruct();
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 */
-	public function __construct(PHPExcel_Worksheet $parent) {
-		parent::__construct($parent);
-		if (is_null($this->_DBHandle)) {
-			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
-			$_DBName = ':memory:';
-
-			$this->_DBHandle = new SQLite3($_DBName);
-			if ($this->_DBHandle === false)
-				throw new Exception($this->_DBHandle->lastErrorMsg());
-			if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-				throw new Exception($this->_DBHandle->lastErrorMsg());
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_DBHandle)) {
-			$this->_DBHandle->close();
-		}
-		$this->_DBHandle = null;
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!class_exists('SQLite3',FALSE)) {
-			return false;
-		}
-
-		return true;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Wincache.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Wincache.php
deleted file mode 100755
index 30fe7e1f5..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorage/Wincache.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Wincache
- *
- * @category   PHPExcel
- * @package	PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Prefix used to uniquely identify cache data for this worksheet
-	 *
-	 * @var string
-	 */
-	private $_cachePrefix = null;
-
-	/**
-	 * Cache timeout
-	 *
-	 * @var integer
-	 */
-	private $_cacheTime = 600;
-
-
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
-	 * @return	void
-     * @throws	Exception
-     */
-	private function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
-
-			$obj = serialize($this->_currentObject);
-			if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) {
-				if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
-					$this->__destruct();
-					throw new Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
-				}
-			} else {
-				if (!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
-					$this->__destruct();
-					throw new Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
-				}
-			}
-			$this->_currentCellIsDirty = false;
-		}
-
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
-
-	/**
-	 * Add or Update a cell in cache identified by coordinate address
-	 *
-	 * @param	string			$pCoord		Coordinate address of the cell to update
-	 * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
-	 * @throws	Exception
-	 */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
-		}
-		$this->_cellCache[$pCoord] = true;
-
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
-
-
-	/**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	public function isDataSet($pCoord) {
-		//	Check if the requested entry is the current object, or exists in the cache
-		if (parent::isDataSet($pCoord)) {
-			if ($this->_currentObjectID == $pCoord) {
-				return true;
-			}
-			//	Check if the requested entry still exists in cache
-			$success = wincache_ucache_exists($this->_cachePrefix.$pCoord.'.cache');
-			if ($success === false) {
-				//	Entry no longer exists in Wincache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
-			}
-			return true;
-		}
-		return false;
-	}	//	function isDataSet()
-
-
-	/**
-	 * Get cell at a specific coordinate
-	 *
-	 * @param	string			$pCoord		Coordinate of the cell
-	 * @throws	Exception
-	 * @return	PHPExcel_Cell	Cell that was found, or null if not found
-	 */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
-		}
-		$this->_storeData();
-
-		//	Check if the entry that has been requested actually exists
-		$obj = null;
-		if (parent::isDataSet($pCoord)) {
-			$success = false;
-			$obj = wincache_ucache_get($this->_cachePrefix.$pCoord.'.cache', $success);
-			if ($success === false) {
-				//	Entry no longer exists in WinCache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
-			}
-		} else {
-			//	Return null if requested entry doesn't exist in cache
-			return null;
-		}
-
-		//	Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($obj);
-		//	Re-attach the parent worksheet
-		$this->_currentObject->attach($this->_parent);
-
-		//	Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
-
-	/**
-	 * Delete a cell in cache identified by coordinate address
-	 *
-	 * @param	string			$pCoord		Coordinate address of the cell to delete
-	 * @throws	Exception
-	 */
-	public function deleteCacheData($pCoord) {
-		//	Delete the entry from Wincache
-		wincache_ucache_delete($this->_cachePrefix.$pCoord.'.cache');
-
-		//	Delete the entry from our cell address array
-		parent::deleteCacheData($pCoord);
-	}	//	function deleteCacheData()
-
-
-	/**
-	 * Clone the cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newCachePrefix = substr(md5($baseUnique),0,8).'.';
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			if ($cellID != $this->_currentObjectID) {
-				$success = false;
-				$obj = wincache_ucache_get($this->_cachePrefix.$cellID.'.cache', $success);
-				if ($success === false) {
-					//	Entry no longer exists in WinCache, so clear it from the cache array
-					parent::deleteCacheData($cellID);
-					throw new Exception('Cell entry '.$cellID.' no longer exists in Wincache');
-				}
-				if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->_cacheTime)) {
-					$this->__destruct();
-					throw new Exception('Failed to store cell '.$cellID.' in Wincache');
-				}
-			}
-		}
-		$this->_cachePrefix = $newCachePrefix;
-	}	//	function copyCellCollection()
-
-
-	/**
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-
-		//	Flush the WinCache cache
-		$this->__destruct();
-
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
-	 */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$cacheTime	= (isset($arguments['cacheTime']))	? $arguments['cacheTime']	: 600;
-
-		if (is_null($this->_cachePrefix)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
-			$this->_cacheTime = $cacheTime;
-
-			parent::__construct($parent);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			wincache_ucache_delete($this->_cachePrefix.$cellID.'.cache');
-		}
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('wincache_ucache_add')) {
-			return false;
-		}
-
-		return true;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorageFactory.php b/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorageFactory.php
deleted file mode 100755
index 42d2f88fe..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/CachedObjectStorageFactory.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_CachedObjectStorageFactory
- *
- * @category	PHPExcel
- * @package		PHPExcel_CachedObjectStorage
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorageFactory
-{
-	const cache_in_memory				= 'Memory';
-	const cache_in_memory_gzip			= 'MemoryGZip';
-	const cache_in_memory_serialized	= 'MemorySerialized';
-	const cache_igbinary				= 'Igbinary';
-	const cache_to_discISAM				= 'DiscISAM';
-	const cache_to_apc					= 'APC';
-	const cache_to_memcache				= 'Memcache';
-	const cache_to_phpTemp				= 'PHPTemp';
-	const cache_to_wincache				= 'Wincache';
-	const cache_to_sqlite				= 'SQLite';
-	const cache_to_sqlite3				= 'SQLite3';
-
-
-	/**
-	 * Name of the method used for cell cacheing
-	 *
-	 * @var string
-	 */
-	private static $_cacheStorageMethod = NULL;
-
-	/**
-	 * Name of the class used for cell cacheing
-	 *
-	 * @var string
-	 */
-	private static $_cacheStorageClass = NULL;
-
-
-	/**
-	 * List of all possible cache storage methods
-	 *
-	 * @var string[]
-	 */
-	private static $_storageMethods = array(
-		self::cache_in_memory,
-		self::cache_in_memory_gzip,
-		self::cache_in_memory_serialized,
-		self::cache_igbinary,
-		self::cache_to_phpTemp,
-		self::cache_to_discISAM,
-		self::cache_to_apc,
-		self::cache_to_memcache,
-		self::cache_to_wincache,
-		self::cache_to_sqlite,
-		self::cache_to_sqlite3,
-	);
-
-
-	/**
-	 * Default arguments for each cache storage method
-	 *
-	 * @var array of mixed array
-	 */
-	private static $_storageMethodDefaultParameters = array(
-		self::cache_in_memory				=> array(
-													),
-		self::cache_in_memory_gzip			=> array(
-													),
-		self::cache_in_memory_serialized	=> array(
-													),
-		self::cache_igbinary				=> array(
-													),
-		self::cache_to_phpTemp				=> array( 'memoryCacheSize'	=> '1MB'
-													),
-		self::cache_to_discISAM				=> array( 'dir'				=> NULL
-													),
-		self::cache_to_apc					=> array( 'cacheTime'		=> 600
-													),
-		self::cache_to_memcache				=> array( 'memcacheServer'	=> 'localhost',
-													  'memcachePort'	=> 11211,
-													  'cacheTime'		=> 600
-													),
-		self::cache_to_wincache				=> array( 'cacheTime'		=> 600
-													),
-		self::cache_to_sqlite				=> array(
-													),
-		self::cache_to_sqlite3				=> array(
-													),
-	);
-
-
-	/**
-	 * Arguments for the active cache storage method
-	 *
-	 * @var array of mixed array
-	 */
-	private static $_storageMethodParameters = array();
-
-
-	/**
-	 * Return the current cache storage method
-	 *
-	 * @return string|NULL
-	 **/
-	public static function getCacheStorageMethod()
-	{
-		return self::$_cacheStorageMethod;
-	}	//	function getCacheStorageMethod()
-
-
-	/**
-	 * Return the current cache storage class
-	 *
-	 * @return PHPExcel_CachedObjectStorage_ICache|NULL
-	 **/
-	public static function getCacheStorageClass()
-	{
-		return self::$_cacheStorageClass;
-	}	//	function getCacheStorageClass()
-
-
-	/**
-	 * Return the list of all possible cache storage methods
-	 *
-	 * @return string[]
-	 **/
-	public static function getAllCacheStorageMethods()
-	{
-		return self::$_storageMethods;
-	}	//	function getCacheStorageMethods()
-
-
-	/**
-	 * Return the list of all available cache storage methods
-	 *
-	 * @return string[]
-	 **/
-	public static function getCacheStorageMethods()
-	{
-		$activeMethods = array();
-		foreach(self::$_storageMethods as $storageMethod) {
-			$cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $storageMethod;
-			if (call_user_func(array($cacheStorageClass, 'cacheMethodIsAvailable'))) {
-				$activeMethods[] = $storageMethod;
-			}
-		}
-		return $activeMethods;
-	}	//	function getCacheStorageMethods()
-
-
-	/**
-	 * Identify the cache storage method to use
-	 *
-	 * @param	string			$method		Name of the method to use for cell cacheing
-	 * @param	array of mixed	$arguments	Additional arguments to pass to the cell caching class
-	 *										when instantiating
-	 * @return boolean
-	 **/
-	public static function initialize($method = self::cache_in_memory, $arguments = array())
-	{
-		if (!in_array($method,self::$_storageMethods)) {
-			return FALSE;
-		}
-
-		$cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$method;
-		if (!call_user_func(array( $cacheStorageClass,
-								   'cacheMethodIsAvailable'))) {
-			return FALSE;
-		}
-
-		self::$_storageMethodParameters[$method] = self::$_storageMethodDefaultParameters[$method];
-		foreach($arguments as $k => $v) {
-			if (isset(self::$_storageMethodParameters[$method][$k])) {
-				self::$_storageMethodParameters[$method][$k] = $v;
-			}
-		}
-
-		if (self::$_cacheStorageMethod === NULL) {
-			self::$_cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $method;
-			self::$_cacheStorageMethod = $method;
-		}
-		return TRUE;
-	}	//	function initialize()
-
-
-	/**
-	 * Initialise the cache storage
-	 *
-	 * @param	PHPExcel_Worksheet 	$parent		Enable cell caching for this worksheet
-	 * @return	PHPExcel_CachedObjectStorage_ICache
-	 **/
-	public static function getInstance(PHPExcel_Worksheet $parent)
-	{
-		$cacheMethodIsAvailable = TRUE;
-		if (self::$_cacheStorageMethod === NULL) {
-			$cacheMethodIsAvailable = self::initialize();
-		}
-
-		if ($cacheMethodIsAvailable) {
-			$instance = new self::$_cacheStorageClass( $parent,
-													   self::$_storageMethodParameters[self::$_cacheStorageMethod]
-													 );
-			if ($instance !== NULL) {
-				return $instance;
-			}
-		}
-
-		return FALSE;
-	}	//	function getInstance()
-
-}
\ No newline at end of file
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation.php b/plugins/exportTypes/Excel/PHPExcel/Calculation.php
deleted file mode 100755
index 385d1920c..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation.php
+++ /dev/null
@@ -1,3811 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-if (!defined('CALCULATION_REGEXP_CELLREF')) {
-	//	Test for support of \P (multibyte options) in PCRE
-	if(defined('PREG_BAD_UTF8_ERROR')) {
-		//	Cell reference (cell or range of cells, with or without a sheet reference)
-		define('CALCULATION_REGEXP_CELLREF','((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d{1,7})');
-		//	Named Range of cells
-		define('CALCULATION_REGEXP_NAMEDRANGE','((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_A-Z][_A-Z0-9\.]*)');
-	} else {
-		//	Cell reference (cell or range of cells, with or without a sheet reference)
-		define('CALCULATION_REGEXP_CELLREF','(((\w*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d+)');
-		//	Named Range of cells
-		define('CALCULATION_REGEXP_NAMEDRANGE','(((\w*)|(\'.*\')|(\".*\"))!)?([_A-Z][_A-Z0-9\.]*)');
-	}
-}
-
-
-/**
- * PHPExcel_Calculation (Singleton)
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation {
-
-	/** Constants				*/
-	/** Regular Expressions		*/
-	//	Numeric operand
-	const CALCULATION_REGEXP_NUMBER		= '[-+]?\d*\.?\d+(e[-+]?\d+)?';
-	//	String operand
-	const CALCULATION_REGEXP_STRING		= '"(?:[^"]|"")*"';
-	//	Opening bracket
-	const CALCULATION_REGEXP_OPENBRACE	= '\(';
-	//	Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
-	const CALCULATION_REGEXP_FUNCTION	= '@?([A-Z][A-Z0-9\.]*)[\s]*\(';
-	//	Cell reference (cell or range of cells, with or without a sheet reference)
-	const CALCULATION_REGEXP_CELLREF	= CALCULATION_REGEXP_CELLREF;
-	//	Named Range of cells
-	const CALCULATION_REGEXP_NAMEDRANGE	= CALCULATION_REGEXP_NAMEDRANGE;
-	//	Error
-	const CALCULATION_REGEXP_ERROR		= '\#[A-Z][A-Z0_\/]*[!\?]?';
-
-
-	/** constants */
-	const RETURN_ARRAY_AS_ERROR = 'error';
-	const RETURN_ARRAY_AS_VALUE = 'value';
-	const RETURN_ARRAY_AS_ARRAY = 'array';
-
-	private static $returnArrayAsType	= self::RETURN_ARRAY_AS_VALUE;
-
-
-	/**
-	 * Instance of this class
-	 *
-	 * @access	private
-	 * @var PHPExcel_Calculation
-	 */
-	private static $_instance;
-
-
-	/**
-	 * Calculation cache
-	 *
-	 * @access	private
-	 * @var array
-	 */
-	private static $_calculationCache = array ();
-
-
-	/**
-	 * Calculation cache enabled
-	 *
-	 * @access	private
-	 * @var boolean
-	 */
-	private static $_calculationCacheEnabled = true;
-
-
-	/**
-	 * Calculation cache expiration time
-	 *
-	 * @access	private
-	 * @var float
-	 */
-	private static $_calculationCacheExpirationTime = 15;
-
-
-	/**
-	 * List of operators that can be used within formulae
-	 * The true/false value indicates whether it is a binary operator or a unary operator
-	 *
-	 * @access	private
-	 * @var array
-	 */
-	private static $_operators			= array('+' => true,	'-' => true,	'*' => true,	'/' => true,
-												'^' => true,	'&' => true,	'%' => false,	'~' => false,
-												'>' => true,	'<' => true,	'=' => true,	'>=' => true,
-												'<=' => true,	'<>' => true,	'|' => true,	':' => true
-											   );
-
-
-	/**
-	 * List of binary operators (those that expect two operands)
-	 *
-	 * @access	private
-	 * @var array
-	 */
-	private static $_binaryOperators	= array('+' => true,	'-' => true,	'*' => true,	'/' => true,
-												'^' => true,	'&' => true,	'>' => true,	'<' => true,
-												'=' => true,	'>=' => true,	'<=' => true,	'<>' => true,
-												'|' => true,	':' => true
-											   );
-
-	/**
-	 * Flag to determine how formula errors should be handled
-	 *		If true, then a user error will be triggered
-	 *		If false, then an exception will be thrown
-	 *
-	 * @access	public
-	 * @var boolean
-	 *
-	 */
-	public $suppressFormulaErrors = false;
-
-	/**
-	 * Error message for any error that was raised/thrown by the calculation engine
-	 *
-	 * @access	public
-	 * @var string
-	 *
-	 */
-	public $formulaError = null;
-
-	/**
-	 * Flag to determine whether a debug log should be generated by the calculation engine
-	 *		If true, then a debug log will be generated
-	 *		If false, then a debug log will not be generated
-	 *
-	 * @access	public
-	 * @var boolean
-	 *
-	 */
-	public $writeDebugLog = false;
-
-	/**
-	 * Flag to determine whether a debug log should be echoed by the calculation engine
-	 *		If true, then a debug log will be echoed
-	 *		If false, then a debug log will not be echoed
-	 * A debug log can only be echoed if it is generated
-	 *
-	 * @access	public
-	 * @var boolean
-	 *
-	 */
-	public $echoDebugLog = false;
-
-
-	/**
-	 * An array of the nested cell references accessed by the calculation engine, used for the debug log
-	 *
-	 * @access	private
-	 * @var array of string
-	 *
-	 */
-	private $debugLogStack = array();
-
-	/**
-	 * The debug log generated by the calculation engine
-	 *
-	 * @access	public
-	 * @var array of string
-	 *
-	 */
-	public $debugLog = array();
-	private $_cyclicFormulaCount = 0;
-	private $_cyclicFormulaCell = '';
-	public $cyclicFormulaCount = 0;
-
-
-	private $_savedPrecision	= 12;
-
-
-	private static $_localeLanguage = 'en_us';					//	US English	(default locale)
-	private static $_validLocaleLanguages = array(	'en'		//	English		(default language)
-												 );
-	private static $_localeArgumentSeparator = ',';
-	private static $_localeFunctions = array();
-	public static $_localeBoolean = array(	'TRUE'	=> 'TRUE',
-											'FALSE'	=> 'FALSE',
-											'NULL'	=> 'NULL'
-										  );
-
-
-	//	Constant conversion from text name/value to actual (datatyped) value
-	private static $_ExcelConstants = array('TRUE'	=> true,
-											'FALSE'	=> false,
-											'NULL'	=> null
-										   );
-
-	//	PHPExcel functions
-	private static $_PHPExcelFunctions = array(	// PHPExcel functions
-				'ABS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'abs',
-												 'argumentCount'	=>	'1'
-												),
-				'ACCRINT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::ACCRINT',
-												 'argumentCount'	=>	'4-7'
-												),
-				'ACCRINTM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::ACCRINTM',
-												 'argumentCount'	=>	'3-5'
-												),
-				'ACOS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'acos',
-												 'argumentCount'	=>	'1'
-												),
-				'ACOSH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'acosh',
-												 'argumentCount'	=>	'1'
-												),
-				'ADDRESS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::CELL_ADDRESS',
-												 'argumentCount'	=>	'2-5'
-												),
-				'AMORDEGRC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::AMORDEGRC',
-												 'argumentCount'	=>	'6,7'
-												),
-				'AMORLINC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::AMORLINC',
-												 'argumentCount'	=>	'6,7'
-												),
-				'AND'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::LOGICAL_AND',
-												 'argumentCount'	=>	'1+'
-												),
-				'AREAS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'ASC'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'ASIN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'asin',
-												 'argumentCount'	=>	'1'
-												),
-				'ASINH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'asinh',
-												 'argumentCount'	=>	'1'
-												),
-				'ATAN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'atan',
-												 'argumentCount'	=>	'1'
-												),
-				'ATAN2'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::ATAN2',
-												 'argumentCount'	=>	'2'
-												),
-				'ATANH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'atanh',
-												 'argumentCount'	=>	'1'
-												),
-				'AVEDEV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::AVEDEV',
-												 'argumentCount'	=>	'1+'
-												),
-				'AVERAGE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::AVERAGE',
-												 'argumentCount'	=>	'1+'
-												),
-				'AVERAGEA'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::AVERAGEA',
-												 'argumentCount'	=>	'1+'
-												),
-				'AVERAGEIF'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::AVERAGEIF',
-												 'argumentCount'	=>	'2,3'
-												),
-				'AVERAGEIFS'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'3+'
-												),
-				'BAHTTEXT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'BESSELI'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BESSELI',
-												 'argumentCount'	=>	'2'
-												),
-				'BESSELJ'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BESSELJ',
-												 'argumentCount'	=>	'2'
-												),
-				'BESSELK'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BESSELK',
-												 'argumentCount'	=>	'2'
-												),
-				'BESSELY'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BESSELY',
-												 'argumentCount'	=>	'2'
-												),
-				'BETADIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::BETADIST',
-												 'argumentCount'	=>	'3-5'
-												),
-				'BETAINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::BETAINV',
-												 'argumentCount'	=>	'3-5'
-												),
-				'BIN2DEC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BINTODEC',
-												 'argumentCount'	=>	'1'
-												),
-				'BIN2HEX'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BINTOHEX',
-												 'argumentCount'	=>	'1,2'
-												),
-				'BIN2OCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::BINTOOCT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'BINOMDIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::BINOMDIST',
-												 'argumentCount'	=>	'4'
-												),
-				'CEILING'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::CEILING',
-												 'argumentCount'	=>	'2'
-												),
-				'CELL'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1,2'
-												),
-				'CHAR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::CHARACTER',
-												 'argumentCount'	=>	'1'
-												),
-				'CHIDIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CHIDIST',
-												 'argumentCount'	=>	'2'
-												),
-				'CHIINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CHIINV',
-												 'argumentCount'	=>	'2'
-												),
-				'CHITEST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'CHOOSE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::CHOOSE',
-												 'argumentCount'	=>	'2+'
-												),
-				'CLEAN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::TRIMNONPRINTABLE',
-												 'argumentCount'	=>	'1'
-												),
-				'CODE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::ASCIICODE',
-												 'argumentCount'	=>	'1'
-												),
-				'COLUMN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::COLUMN',
-												 'argumentCount'	=>	'-1',
-												 'passByReference'	=>	array(true)
-												),
-				'COLUMNS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::COLUMNS',
-												 'argumentCount'	=>	'1'
-												),
-				'COMBIN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::COMBIN',
-												 'argumentCount'	=>	'2'
-												),
-				'COMPLEX'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::COMPLEX',
-												 'argumentCount'	=>	'2,3'
-												),
-				'CONCATENATE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::CONCATENATE',
-												 'argumentCount'	=>	'1+'
-												),
-				'CONFIDENCE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CONFIDENCE',
-												 'argumentCount'	=>	'3'
-												),
-				'CONVERT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::CONVERTUOM',
-												 'argumentCount'	=>	'3'
-												),
-				'CORREL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CORREL',
-												 'argumentCount'	=>	'2'
-												),
-				'COS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'cos',
-												 'argumentCount'	=>	'1'
-												),
-				'COSH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'cosh',
-												 'argumentCount'	=>	'1'
-												),
-				'COUNT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::COUNT',
-												 'argumentCount'	=>	'1+'
-												),
-				'COUNTA'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::COUNTA',
-												 'argumentCount'	=>	'1+'
-												),
-				'COUNTBLANK'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::COUNTBLANK',
-												 'argumentCount'	=>	'1'
-												),
-				'COUNTIF'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::COUNTIF',
-												 'argumentCount'	=>	'2'
-												),
-				'COUNTIFS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'COUPDAYBS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPDAYBS',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COUPDAYS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPDAYS',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COUPDAYSNC'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPDAYSNC',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COUPNCD'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPNCD',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COUPNUM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPNUM',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COUPPCD'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::COUPPCD',
-												 'argumentCount'	=>	'3,4'
-												),
-				'COVAR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::COVAR',
-												 'argumentCount'	=>	'2'
-												),
-				'CRITBINOM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CRITBINOM',
-												 'argumentCount'	=>	'3'
-												),
-				'CUBEKPIMEMBER'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBEMEMBER'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBEMEMBERPROPERTY'	=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBERANKEDMEMBER'		=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBESET'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBESETCOUNT'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUBEVALUE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_CUBE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'CUMIPMT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::CUMIPMT',
-												 'argumentCount'	=>	'6'
-												),
-				'CUMPRINC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::CUMPRINC',
-												 'argumentCount'	=>	'6'
-												),
-				'DATE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DATE',
-												 'argumentCount'	=>	'3'
-												),
-				'DATEDIF'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DATEDIF',
-												 'argumentCount'	=>	'2,3'
-												),
-				'DATEVALUE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DATEVALUE',
-												 'argumentCount'	=>	'1'
-												),
-				'DAVERAGE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DAVERAGE',
-												 'argumentCount'	=>	'3'
-												),
-				'DAY'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DAYOFMONTH',
-												 'argumentCount'	=>	'1'
-												),
-				'DAYS360'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DAYS360',
-												 'argumentCount'	=>	'2,3'
-												),
-				'DB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::DB',
-												 'argumentCount'	=>	'4,5'
-												),
-				'DCOUNT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DCOUNT',
-												 'argumentCount'	=>	'3'
-												),
-				'DCOUNTA'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DCOUNTA',
-												 'argumentCount'	=>	'3'
-												),
-				'DDB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::DDB',
-												 'argumentCount'	=>	'4,5'
-												),
-				'DEC2BIN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::DECTOBIN',
-												 'argumentCount'	=>	'1,2'
-												),
-				'DEC2HEX'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::DECTOHEX',
-												 'argumentCount'	=>	'1,2'
-												),
-				'DEC2OCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::DECTOOCT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'DEGREES'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'rad2deg',
-												 'argumentCount'	=>	'1'
-												),
-				'DELTA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::DELTA',
-												 'argumentCount'	=>	'1,2'
-												),
-				'DEVSQ'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::DEVSQ',
-												 'argumentCount'	=>	'1+'
-												),
-				'DGET'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DGET',
-												 'argumentCount'	=>	'3'
-												),
-				'DISC'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::DISC',
-												 'argumentCount'	=>	'4,5'
-												),
-				'DMAX'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DMAX',
-												 'argumentCount'	=>	'3'
-												),
-				'DMIN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DMIN',
-												 'argumentCount'	=>	'3'
-												),
-				'DOLLAR'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::DOLLAR',
-												 'argumentCount'	=>	'1,2'
-												),
-				'DOLLARDE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::DOLLARDE',
-												 'argumentCount'	=>	'2'
-												),
-				'DOLLARFR'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::DOLLARFR',
-												 'argumentCount'	=>	'2'
-												),
-				'DPRODUCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DPRODUCT',
-												 'argumentCount'	=>	'3'
-												),
-				'DSTDEV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DSTDEV',
-												 'argumentCount'	=>	'3'
-												),
-				'DSTDEVP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DSTDEVP',
-												 'argumentCount'	=>	'3'
-												),
-				'DSUM'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DSUM',
-												 'argumentCount'	=>	'3'
-												),
-				'DURATION'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'5,6'
-												),
-				'DVAR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DVAR',
-												 'argumentCount'	=>	'3'
-												),
-				'DVARP'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Database::DVARP',
-												 'argumentCount'	=>	'3'
-												),
-				'EDATE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::EDATE',
-												 'argumentCount'	=>	'2'
-												),
-				'EFFECT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::EFFECT',
-												 'argumentCount'	=>	'2'
-												),
-				'EOMONTH'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::EOMONTH',
-												 'argumentCount'	=>	'2'
-												),
-				'ERF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::ERF',
-												 'argumentCount'	=>	'1,2'
-												),
-				'ERFC'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::ERFC',
-												 'argumentCount'	=>	'1'
-												),
-				'ERROR.TYPE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::ERROR_TYPE',
-												 'argumentCount'	=>	'1'
-												),
-				'EVEN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::EVEN',
-												 'argumentCount'	=>	'1'
-												),
-				'EXACT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'EXP'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'exp',
-												 'argumentCount'	=>	'1'
-												),
-				'EXPONDIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::EXPONDIST',
-												 'argumentCount'	=>	'3'
-												),
-				'FACT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::FACT',
-												 'argumentCount'	=>	'1'
-												),
-				'FACTDOUBLE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::FACTDOUBLE',
-												 'argumentCount'	=>	'1'
-												),
-				'FALSE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::FALSE',
-												 'argumentCount'	=>	'0'
-												),
-				'FDIST'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'3'
-												),
-				'FIND'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::SEARCHSENSITIVE',
-												 'argumentCount'	=>	'2,3'
-												),
-				'FINDB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::SEARCHSENSITIVE',
-												 'argumentCount'	=>	'2,3'
-												),
-				'FINV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'3'
-												),
-				'FISHER'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::FISHER',
-												 'argumentCount'	=>	'1'
-												),
-				'FISHERINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::FISHERINV',
-												 'argumentCount'	=>	'1'
-												),
-				'FIXED'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::FIXEDFORMAT',
-												 'argumentCount'	=>	'1-3'
-												),
-				'FLOOR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::FLOOR',
-												 'argumentCount'	=>	'2'
-												),
-				'FORECAST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::FORECAST',
-												 'argumentCount'	=>	'3'
-												),
-				'FREQUENCY'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'FTEST'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'FV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::FV',
-												 'argumentCount'	=>	'3-5'
-												),
-				'FVSCHEDULE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::FVSCHEDULE',
-												 'argumentCount'	=>	'2'
-												),
-				'GAMMADIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::GAMMADIST',
-												 'argumentCount'	=>	'4'
-												),
-				'GAMMAINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::GAMMAINV',
-												 'argumentCount'	=>	'3'
-												),
-				'GAMMALN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::GAMMALN',
-												 'argumentCount'	=>	'1'
-												),
-				'GCD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::GCD',
-												 'argumentCount'	=>	'1+'
-												),
-				'GEOMEAN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::GEOMEAN',
-												 'argumentCount'	=>	'1+'
-												),
-				'GESTEP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::GESTEP',
-												 'argumentCount'	=>	'1,2'
-												),
-				'GETPIVOTDATA'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2+'
-												),
-				'GROWTH'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::GROWTH',
-												 'argumentCount'	=>	'1-4'
-												),
-				'HARMEAN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::HARMEAN',
-												 'argumentCount'	=>	'1+'
-												),
-				'HEX2BIN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::HEXTOBIN',
-												 'argumentCount'	=>	'1,2'
-												),
-				'HEX2DEC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::HEXTODEC',
-												 'argumentCount'	=>	'1'
-												),
-				'HEX2OCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::HEXTOOCT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'HLOOKUP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'3,4'
-												),
-				'HOUR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::HOUROFDAY',
-												 'argumentCount'	=>	'1'
-												),
-				'HYPERLINK'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::HYPERLINK',
-												 'argumentCount'	=>	'1,2',
-												 'passCellReference'=>	true
-												),
-				'HYPGEOMDIST'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::HYPGEOMDIST',
-												 'argumentCount'	=>	'4'
-												),
-				'IF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::STATEMENT_IF',
-												 'argumentCount'	=>	'1-3'
-												),
-				'IFERROR'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::IFERROR',
-												 'argumentCount'	=>	'2'
-												),
-				'IMABS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMABS',
-												 'argumentCount'	=>	'1'
-												),
-				'IMAGINARY'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMAGINARY',
-												 'argumentCount'	=>	'1'
-												),
-				'IMARGUMENT'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMARGUMENT',
-												 'argumentCount'	=>	'1'
-												),
-				'IMCONJUGATE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMCONJUGATE',
-												 'argumentCount'	=>	'1'
-												),
-				'IMCOS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMCOS',
-												 'argumentCount'	=>	'1'
-												),
-				'IMDIV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMDIV',
-												 'argumentCount'	=>	'2'
-												),
-				'IMEXP'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMEXP',
-												 'argumentCount'	=>	'1'
-												),
-				'IMLN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMLN',
-												 'argumentCount'	=>	'1'
-												),
-				'IMLOG10'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMLOG10',
-												 'argumentCount'	=>	'1'
-												),
-				'IMLOG2'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMLOG2',
-												 'argumentCount'	=>	'1'
-												),
-				'IMPOWER'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMPOWER',
-												 'argumentCount'	=>	'2'
-												),
-				'IMPRODUCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMPRODUCT',
-												 'argumentCount'	=>	'1+'
-												),
-				'IMREAL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMREAL',
-												 'argumentCount'	=>	'1'
-												),
-				'IMSIN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMSIN',
-												 'argumentCount'	=>	'1'
-												),
-				'IMSQRT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMSQRT',
-												 'argumentCount'	=>	'1'
-												),
-				'IMSUB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMSUB',
-												 'argumentCount'	=>	'2'
-												),
-				'IMSUM'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::IMSUM',
-												 'argumentCount'	=>	'1+'
-												),
-				'INDEX'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::INDEX',
-												 'argumentCount'	=>	'1-4'
-												),
-				'INDIRECT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::INDIRECT',
-												 'argumentCount'	=>	'1,2',
-												 'passCellReference'=>	true
-												),
-				'INFO'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'INT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::INT',
-												 'argumentCount'	=>	'1'
-												),
-				'INTERCEPT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::INTERCEPT',
-												 'argumentCount'	=>	'2'
-												),
-				'INTRATE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::INTRATE',
-												 'argumentCount'	=>	'4,5'
-												),
-				'IPMT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::IPMT',
-												 'argumentCount'	=>	'4-6'
-												),
-				'IRR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::IRR',
-												 'argumentCount'	=>	'1,2'
-												),
-				'ISBLANK'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_BLANK',
-												 'argumentCount'	=>	'1'
-												),
-				'ISERR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_ERR',
-												 'argumentCount'	=>	'1'
-												),
-				'ISERROR'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_ERROR',
-												 'argumentCount'	=>	'1'
-												),
-				'ISEVEN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_EVEN',
-												 'argumentCount'	=>	'1'
-												),
-				'ISLOGICAL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_LOGICAL',
-												 'argumentCount'	=>	'1'
-												),
-				'ISNA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_NA',
-												 'argumentCount'	=>	'1'
-												),
-				'ISNONTEXT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_NONTEXT',
-												 'argumentCount'	=>	'1'
-												),
-				'ISNUMBER'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_NUMBER',
-												 'argumentCount'	=>	'1'
-												),
-				'ISODD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_ODD',
-												 'argumentCount'	=>	'1'
-												),
-				'ISPMT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::ISPMT',
-												 'argumentCount'	=>	'4'
-												),
-				'ISREF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'ISTEXT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::IS_TEXT',
-												 'argumentCount'	=>	'1'
-												),
-				'JIS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'KURT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::KURT',
-												 'argumentCount'	=>	'1+'
-												),
-				'LARGE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::LARGE',
-												 'argumentCount'	=>	'2'
-												),
-				'LCM'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::LCM',
-												 'argumentCount'	=>	'1+'
-												),
-				'LEFT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::LEFT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'LEFTB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::LEFT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'LEN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::STRINGLENGTH',
-												 'argumentCount'	=>	'1'
-												),
-				'LENB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::STRINGLENGTH',
-												 'argumentCount'	=>	'1'
-												),
-				'LINEST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::LINEST',
-												 'argumentCount'	=>	'1-4'
-												),
-				'LN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'log',
-												 'argumentCount'	=>	'1'
-												),
-				'LOG'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::LOG_BASE',
-												 'argumentCount'	=>	'1,2'
-												),
-				'LOG10'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'log10',
-												 'argumentCount'	=>	'1'
-												),
-				'LOGEST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::LOGEST',
-												 'argumentCount'	=>	'1-4'
-												),
-				'LOGINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::LOGINV',
-												 'argumentCount'	=>	'3'
-												),
-				'LOGNORMDIST'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::LOGNORMDIST',
-												 'argumentCount'	=>	'3'
-												),
-				'LOOKUP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::LOOKUP',
-												 'argumentCount'	=>	'2,3'
-												),
-				'LOWER'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::LOWERCASE',
-												 'argumentCount'	=>	'1'
-												),
-				'MATCH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::MATCH',
-												 'argumentCount'	=>	'2,3'
-												),
-				'MAX'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MAX',
-												 'argumentCount'	=>	'1+'
-												),
-				'MAXA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MAXA',
-												 'argumentCount'	=>	'1+'
-												),
-				'MAXIF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MAXIF',
-												 'argumentCount'	=>	'2+'
-												),
-				'MDETERM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MDETERM',
-												 'argumentCount'	=>	'1'
-												),
-				'MDURATION'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'5,6'
-												),
-				'MEDIAN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MEDIAN',
-												 'argumentCount'	=>	'1+'
-												),
-				'MEDIANIF'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2+'
-												),
-				'MID'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::MID',
-												 'argumentCount'	=>	'3'
-												),
-				'MIDB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::MID',
-												 'argumentCount'	=>	'3'
-												),
-				'MIN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MIN',
-												 'argumentCount'	=>	'1+'
-												),
-				'MINA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MINA',
-												 'argumentCount'	=>	'1+'
-												),
-				'MINIF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MINIF',
-												 'argumentCount'	=>	'2+'
-												),
-				'MINUTE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::MINUTEOFHOUR',
-												 'argumentCount'	=>	'1'
-												),
-				'MINVERSE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MINVERSE',
-												 'argumentCount'	=>	'1'
-												),
-				'MIRR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::MIRR',
-												 'argumentCount'	=>	'3'
-												),
-				'MMULT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MMULT',
-												 'argumentCount'	=>	'2'
-												),
-				'MOD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MOD',
-												 'argumentCount'	=>	'2'
-												),
-				'MODE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::MODE',
-												 'argumentCount'	=>	'1+'
-												),
-				'MONTH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::MONTHOFYEAR',
-												 'argumentCount'	=>	'1'
-												),
-				'MROUND'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MROUND',
-												 'argumentCount'	=>	'2'
-												),
-				'MULTINOMIAL'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::MULTINOMIAL',
-												 'argumentCount'	=>	'1+'
-												),
-				'N'						=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::N',
-												 'argumentCount'	=>	'1'
-												),
-				'NA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::NA',
-												 'argumentCount'	=>	'0'
-												),
-				'NEGBINOMDIST'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::NEGBINOMDIST',
-												 'argumentCount'	=>	'3'
-												),
-				'NETWORKDAYS'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::NETWORKDAYS',
-												 'argumentCount'	=>	'2+'
-												),
-				'NOMINAL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::NOMINAL',
-												 'argumentCount'	=>	'2'
-												),
-				'NORMDIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::NORMDIST',
-												 'argumentCount'	=>	'4'
-												),
-				'NORMINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::NORMINV',
-												 'argumentCount'	=>	'3'
-												),
-				'NORMSDIST'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::NORMSDIST',
-												 'argumentCount'	=>	'1'
-												),
-				'NORMSINV'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::NORMSINV',
-												 'argumentCount'	=>	'1'
-												),
-				'NOT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::NOT',
-												 'argumentCount'	=>	'1'
-												),
-				'NOW'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DATETIMENOW',
-												 'argumentCount'	=>	'0'
-												),
-				'NPER'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::NPER',
-												 'argumentCount'	=>	'3-5'
-												),
-				'NPV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::NPV',
-												 'argumentCount'	=>	'2+'
-												),
-				'OCT2BIN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::OCTTOBIN',
-												 'argumentCount'	=>	'1,2'
-												),
-				'OCT2DEC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::OCTTODEC',
-												 'argumentCount'	=>	'1'
-												),
-				'OCT2HEX'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_ENGINEERING,
-												 'functionCall'		=>	'PHPExcel_Calculation_Engineering::OCTTOHEX',
-												 'argumentCount'	=>	'1,2'
-												),
-				'ODD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::ODD',
-												 'argumentCount'	=>	'1'
-												),
-				'ODDFPRICE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'8,9'
-												),
-				'ODDFYIELD'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'8,9'
-												),
-				'ODDLPRICE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'7,8'
-												),
-				'ODDLYIELD'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'7,8'
-												),
-				'OFFSET'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::OFFSET',
-												 'argumentCount'	=>	'3,5',
-												 'passCellReference'=>	true,
-												 'passByReference'	=>	array(true)
-												),
-				'OR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::LOGICAL_OR',
-												 'argumentCount'	=>	'1+'
-												),
-				'PEARSON'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::CORREL',
-												 'argumentCount'	=>	'2'
-												),
-				'PERCENTILE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::PERCENTILE',
-												 'argumentCount'	=>	'2'
-												),
-				'PERCENTRANK'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::PERCENTRANK',
-												 'argumentCount'	=>	'2,3'
-												),
-				'PERMUT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::PERMUT',
-												 'argumentCount'	=>	'2'
-												),
-				'PHONETIC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'PI'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'pi',
-												 'argumentCount'	=>	'0'
-												),
-				'PMT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PMT',
-												 'argumentCount'	=>	'3-5'
-												),
-				'POISSON'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::POISSON',
-												 'argumentCount'	=>	'3'
-												),
-				'POWER'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::POWER',
-												 'argumentCount'	=>	'2'
-												),
-				'PPMT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PPMT',
-												 'argumentCount'	=>	'4-6'
-												),
-				'PRICE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PRICE',
-												 'argumentCount'	=>	'6,7'
-												),
-				'PRICEDISC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PRICEDISC',
-												 'argumentCount'	=>	'4,5'
-												),
-				'PRICEMAT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PRICEMAT',
-												 'argumentCount'	=>	'5,6'
-												),
-				'PROB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'3,4'
-												),
-				'PRODUCT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::PRODUCT',
-												 'argumentCount'	=>	'1+'
-												),
-				'PROPER'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::PROPERCASE',
-												 'argumentCount'	=>	'1'
-												),
-				'PV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::PV',
-												 'argumentCount'	=>	'3-5'
-												),
-				'QUARTILE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::QUARTILE',
-												 'argumentCount'	=>	'2'
-												),
-				'QUOTIENT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::QUOTIENT',
-												 'argumentCount'	=>	'2'
-												),
-				'RADIANS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'deg2rad',
-												 'argumentCount'	=>	'1'
-												),
-				'RAND'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::RAND',
-												 'argumentCount'	=>	'0'
-												),
-				'RANDBETWEEN'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::RAND',
-												 'argumentCount'	=>	'2'
-												),
-				'RANK'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::RANK',
-												 'argumentCount'	=>	'2,3'
-												),
-				'RATE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::RATE',
-												 'argumentCount'	=>	'3-6'
-												),
-				'RECEIVED'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::RECEIVED',
-												 'argumentCount'	=>	'4-5'
-												),
-				'REPLACE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::REPLACE',
-												 'argumentCount'	=>	'4'
-												),
-				'REPLACEB'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::REPLACE',
-												 'argumentCount'	=>	'4'
-												),
-				'REPT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'str_repeat',
-												 'argumentCount'	=>	'2'
-												),
-				'RIGHT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::RIGHT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'RIGHTB'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::RIGHT',
-												 'argumentCount'	=>	'1,2'
-												),
-				'ROMAN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::ROMAN',
-												 'argumentCount'	=>	'1,2'
-												),
-				'ROUND'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'round',
-												 'argumentCount'	=>	'2'
-												),
-				'ROUNDDOWN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::ROUNDDOWN',
-												 'argumentCount'	=>	'2'
-												),
-				'ROUNDUP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::ROUNDUP',
-												 'argumentCount'	=>	'2'
-												),
-				'ROW'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::ROW',
-												 'argumentCount'	=>	'-1',
-												 'passByReference'	=>	array(true)
-												),
-				'ROWS'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::ROWS',
-												 'argumentCount'	=>	'1'
-												),
-				'RSQ'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::RSQ',
-												 'argumentCount'	=>	'2'
-												),
-				'RTD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1+'
-												),
-				'SEARCH'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::SEARCHINSENSITIVE',
-												 'argumentCount'	=>	'2,3'
-												),
-				'SEARCHB'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::SEARCHINSENSITIVE',
-												 'argumentCount'	=>	'2,3'
-												),
-				'SECOND'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::SECONDOFMINUTE',
-												 'argumentCount'	=>	'1'
-												),
-				'SERIESSUM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SERIESSUM',
-												 'argumentCount'	=>	'4'
-												),
-				'SIGN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SIGN',
-												 'argumentCount'	=>	'1'
-												),
-				'SIN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'sin',
-												 'argumentCount'	=>	'1'
-												),
-				'SINH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'sinh',
-												 'argumentCount'	=>	'1'
-												),
-				'SKEW'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::SKEW',
-												 'argumentCount'	=>	'1+'
-												),
-				'SLN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::SLN',
-												 'argumentCount'	=>	'3'
-												),
-				'SLOPE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::SLOPE',
-												 'argumentCount'	=>	'2'
-												),
-				'SMALL'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::SMALL',
-												 'argumentCount'	=>	'2'
-												),
-				'SQRT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'sqrt',
-												 'argumentCount'	=>	'1'
-												),
-				'SQRTPI'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SQRTPI',
-												 'argumentCount'	=>	'1'
-												),
-				'STANDARDIZE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STANDARDIZE',
-												 'argumentCount'	=>	'3'
-												),
-				'STDEV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STDEV',
-												 'argumentCount'	=>	'1+'
-												),
-				'STDEVA'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STDEVA',
-												 'argumentCount'	=>	'1+'
-												),
-				'STDEVP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STDEVP',
-												 'argumentCount'	=>	'1+'
-												),
-				'STDEVPA'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STDEVPA',
-												 'argumentCount'	=>	'1+'
-												),
-				'STEYX'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::STEYX',
-												 'argumentCount'	=>	'2'
-												),
-				'SUBSTITUTE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::SUBSTITUTE',
-												 'argumentCount'	=>	'3,4'
-												),
-				'SUBTOTAL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUBTOTAL',
-												 'argumentCount'	=>	'2+'
-												),
-				'SUM'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUM',
-												 'argumentCount'	=>	'1+'
-												),
-				'SUMIF'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMIF',
-												 'argumentCount'	=>	'2,3'
-												),
-				'SUMIFS'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'?'
-												),
-				'SUMPRODUCT'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMPRODUCT',
-												 'argumentCount'	=>	'1+'
-												),
-				'SUMSQ'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMSQ',
-												 'argumentCount'	=>	'1+'
-												),
-				'SUMX2MY2'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMX2MY2',
-												 'argumentCount'	=>	'2'
-												),
-				'SUMX2PY2'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMX2PY2',
-												 'argumentCount'	=>	'2'
-												),
-				'SUMXMY2'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::SUMXMY2',
-												 'argumentCount'	=>	'2'
-												),
-				'SYD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::SYD',
-												 'argumentCount'	=>	'4'
-												),
-				'T'						=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::RETURNSTRING',
-												 'argumentCount'	=>	'1'
-												),
-				'TAN'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'tan',
-												 'argumentCount'	=>	'1'
-												),
-				'TANH'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'tanh',
-												 'argumentCount'	=>	'1'
-												),
-				'TBILLEQ'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::TBILLEQ',
-												 'argumentCount'	=>	'3'
-												),
-				'TBILLPRICE'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::TBILLPRICE',
-												 'argumentCount'	=>	'3'
-												),
-				'TBILLYIELD'			=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::TBILLYIELD',
-												 'argumentCount'	=>	'3'
-												),
-				'TDIST'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::TDIST',
-												 'argumentCount'	=>	'3'
-												),
-				'TEXT'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::TEXTFORMAT',
-												 'argumentCount'	=>	'2'
-												),
-				'TIME'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::TIME',
-												 'argumentCount'	=>	'3'
-												),
-				'TIMEVALUE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::TIMEVALUE',
-												 'argumentCount'	=>	'1'
-												),
-				'TINV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::TINV',
-												 'argumentCount'	=>	'2'
-												),
-				'TODAY'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DATENOW',
-												 'argumentCount'	=>	'0'
-												),
-				'TRANSPOSE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::TRANSPOSE',
-												 'argumentCount'	=>	'1'
-												),
-				'TREND'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::TREND',
-												 'argumentCount'	=>	'1-4'
-												),
-				'TRIM'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::TRIMSPACES',
-												 'argumentCount'	=>	'1'
-												),
-				'TRIMMEAN'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::TRIMMEAN',
-												 'argumentCount'	=>	'2'
-												),
-				'TRUE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOGICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Logical::TRUE',
-												 'argumentCount'	=>	'0'
-												),
-				'TRUNC'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_MATH_AND_TRIG,
-												 'functionCall'		=>	'PHPExcel_Calculation_MathTrig::TRUNC',
-												 'argumentCount'	=>	'1,2'
-												),
-				'TTEST'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'4'
-												),
-				'TYPE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::TYPE',
-												 'argumentCount'	=>	'1'
-												),
-				'UPPER'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_TextData::UPPERCASE',
-												 'argumentCount'	=>	'1'
-												),
-				'USDOLLAR'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'2'
-												),
-				'VALUE'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_TEXT_AND_DATA,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'1'
-												),
-				'VAR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::VARFunc',
-												 'argumentCount'	=>	'1+'
-												),
-				'VARA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::VARA',
-												 'argumentCount'	=>	'1+'
-												),
-				'VARP'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::VARP',
-												 'argumentCount'	=>	'1+'
-												),
-				'VARPA'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::VARPA',
-												 'argumentCount'	=>	'1+'
-												),
-				'VDB'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'5-7'
-												),
-				'VERSION'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_INFORMATION,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::VERSION',
-												 'argumentCount'	=>	'0'
-												),
-				'VLOOKUP'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-												 'functionCall'		=>	'PHPExcel_Calculation_LookupRef::VLOOKUP',
-												 'argumentCount'	=>	'3,4'
-												),
-				'WEEKDAY'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::DAYOFWEEK',
-												 'argumentCount'	=>	'1,2'
-												),
-				'WEEKNUM'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::WEEKOFYEAR',
-												 'argumentCount'	=>	'1,2'
-												),
-				'WEIBULL'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::WEIBULL',
-												 'argumentCount'	=>	'4'
-												),
-				'WORKDAY'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::WORKDAY',
-												 'argumentCount'	=>	'2+'
-												),
-				'XIRR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::XIRR',
-												 'argumentCount'	=>	'2,3'
-												),
-				'XNPV'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::XNPV',
-												 'argumentCount'	=>	'3'
-												),
-				'YEAR'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::YEAR',
-												 'argumentCount'	=>	'1'
-												),
-				'YEARFRAC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
-												 'functionCall'		=>	'PHPExcel_Calculation_DateTime::YEARFRAC',
-												 'argumentCount'	=>	'2,3'
-												),
-				'YIELD'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
-												 'argumentCount'	=>	'6,7'
-												),
-				'YIELDDISC'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::YIELDDISC',
-												 'argumentCount'	=>	'4,5'
-												),
-				'YIELDMAT'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_FINANCIAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Financial::YIELDMAT',
-												 'argumentCount'	=>	'5,6'
-												),
-				'ZTEST'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_STATISTICAL,
-												 'functionCall'		=>	'PHPExcel_Calculation_Statistical::ZTEST',
-												 'argumentCount'	=>	'2-3'
-												)
-			);
-
-
-	//	Internal functions used for special control purposes
-	private static $_controlFunctions = array(
-				'MKMATRIX'	=> array('argumentCount'	=>	'*',
-									 'functionCall'		=>	'self::_mkMatrix'
-									)
-			);
-
-
-
-
-	private function __construct() {
-		$localeFileDirectory = PHPEXCEL_ROOT.'PHPExcel/locale/';
-		foreach (glob($localeFileDirectory.'/*',GLOB_ONLYDIR) as $filename) {
-			$filename = substr($filename,strlen($localeFileDirectory)+1);
-			if ($filename != 'en') {
-				self::$_validLocaleLanguages[] = $filename;
-			}
-		}
-
-		$setPrecision = (PHP_INT_SIZE == 4) ? 12 : 16;
-		$this->_savedPrecision = ini_get('precision');
-		if ($this->_savedPrecision < $setPrecision) {
-			ini_set('precision',$setPrecision);
-		}
-	}	//	function __construct()
-
-
-	public function __destruct() {
-		if ($this->_savedPrecision != ini_get('precision')) {
-			ini_set('precision',$this->_savedPrecision);
-		}
-	}
-
-	/**
-	 * Get an instance of this class
-	 *
-	 * @access	public
-	 * @return PHPExcel_Calculation
-	 */
-	public static function getInstance() {
-		if (!isset(self::$_instance) || (self::$_instance === NULL)) {
-			self::$_instance = new PHPExcel_Calculation();
-		}
-
-		return self::$_instance;
-	}	//	function getInstance()
-
-
-	/**
-	 * Flush the calculation cache for any existing instance of this class
-	 *		but only if a PHPExcel_Calculation instance exists
-	 *
-	 * @access	public
-	 * @return null
-	 */
-	public static function flushInstance() {
-		if (isset(self::$_instance) && (self::$_instance !== NULL)) {
-			self::$_instance->clearCalculationCache();
-		}
-	}	//	function flushInstance()
-
-
-	/**
-	 * __clone implementation. Cloning should not be allowed in a Singleton!
-	 *
-	 * @access	public
-	 * @throws	Exception
-	 */
-	public final function __clone() {
-		throw new Exception ('Cloning a Singleton is not allowed!');
-	}	//	function __clone()
-
-
-	/**
-	 * Return the locale-specific translation of TRUE
-	 *
-	 * @access	public
-	 * @return	 string		locale-specific translation of TRUE
-	 */
-	public static function getTRUE() {
-		return self::$_localeBoolean['TRUE'];
-	}
-
-	/**
-	 * Return the locale-specific translation of FALSE
-	 *
-	 * @access	public
-	 * @return	 string		locale-specific translation of FALSE
-	 */
-	public static function getFALSE() {
-		return self::$_localeBoolean['FALSE'];
-	}
-
-	/**
-	 * Set the Array Return Type (Array or Value of first element in the array)
-	 *
-	 * @access	public
-	 * @param	 string	$returnType			Array return type
-	 * @return	 boolean					Success or failure
-	 */
-	public static function setArrayReturnType($returnType) {
-		if (($returnType == self::RETURN_ARRAY_AS_VALUE) ||
-			($returnType == self::RETURN_ARRAY_AS_ERROR) ||
-			($returnType == self::RETURN_ARRAY_AS_ARRAY)) {
-			self::$returnArrayAsType = $returnType;
-			return true;
-		}
-		return false;
-	}	//	function setExcelCalendar()
-
-
-	/**
-	 * Return the Array Return Type (Array or Value of first element in the array)
-	 *
-	 * @access	public
-	 * @return	 string		$returnType			Array return type
-	 */
-	public static function getArrayReturnType() {
-		return self::$returnArrayAsType;
-	}	//	function getExcelCalendar()
-
-
-	/**
-	 * Is calculation caching enabled?
-	 *
-	 * @access	public
-	 * @return boolean
-	 */
-	public function getCalculationCacheEnabled() {
-		return self::$_calculationCacheEnabled;
-	}	//	function getCalculationCacheEnabled()
-
-
-	/**
-	 * Enable/disable calculation cache
-	 *
-	 * @access	public
-	 * @param boolean $pValue
-	 */
-	public function setCalculationCacheEnabled($pValue = true) {
-		self::$_calculationCacheEnabled = $pValue;
-		$this->clearCalculationCache();
-	}	//	function setCalculationCacheEnabled()
-
-
-	/**
-	 * Enable calculation cache
-	 */
-	public function enableCalculationCache() {
-		$this->setCalculationCacheEnabled(true);
-	}	//	function enableCalculationCache()
-
-
-	/**
-	 * Disable calculation cache
-	 */
-	public function disableCalculationCache() {
-		$this->setCalculationCacheEnabled(false);
-	}	//	function disableCalculationCache()
-
-
-	/**
-	 * Clear calculation cache
-	 */
-	public function clearCalculationCache() {
-		self::$_calculationCache = array();
-	}	//	function clearCalculationCache()
-
-
-	/**
-	 * Get calculation cache expiration time
-	 *
-	 * @return float
-	 */
-	public function getCalculationCacheExpirationTime() {
-		return self::$_calculationCacheExpirationTime;
-	}	//	getCalculationCacheExpirationTime()
-
-
-	/**
-	 * Set calculation cache expiration time
-	 *
-	 * @param float $pValue
-	 */
-	public function setCalculationCacheExpirationTime($pValue = 15) {
-		self::$_calculationCacheExpirationTime = $pValue;
-	}	//	function setCalculationCacheExpirationTime()
-
-
-
-
-	/**
-	 * Get the currently defined locale code
-	 *
-	 * @return string
-	 */
-	public function getLocale() {
-		return self::$_localeLanguage;
-	}	//	function getLocale()
-
-
-	/**
-	 * Set the locale code
-	 *
-	 * @return boolean
-	 */
-	public function setLocale($locale='en_us') {
-		//	Identify our locale and language
-		$language = $locale = strtolower($locale);
-		if (strpos($locale,'_') !== false) {
-			list($language) = explode('_',$locale);
-		}
-
-		//	Test whether we have any language data for this language (any locale)
-		if (in_array($language,self::$_validLocaleLanguages)) {
-			//	initialise language/locale settings
-			self::$_localeFunctions = array();
-			self::$_localeArgumentSeparator = ',';
-			self::$_localeBoolean = array('TRUE' => 'TRUE', 'FALSE' => 'FALSE', 'NULL' => 'NULL');
-			//	Default is English, if user isn't requesting english, then read the necessary data from the locale files
-			if ($locale != 'en_us') {
-				//	Search for a file with a list of function names for locale
-				$functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_',DIRECTORY_SEPARATOR,$locale).DIRECTORY_SEPARATOR.'functions';
-				if (!file_exists($functionNamesFile)) {
-					//	If there isn't a locale specific function file, look for a language specific function file
-					$functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'functions';
-					if (!file_exists($functionNamesFile)) {
-						return false;
-					}
-				}
-				//	Retrieve the list of locale or language specific function names
-				$localeFunctions = file($functionNamesFile,FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-				foreach ($localeFunctions as $localeFunction) {
-					list($localeFunction) = explode('##',$localeFunction);	//	Strip out comments
-					if (strpos($localeFunction,'=') !== false) {
-						list($fName,$lfName) = explode('=',$localeFunction);
-						$fName = trim($fName);
-						$lfName = trim($lfName);
-						if ((isset(self::$_PHPExcelFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) {
-							self::$_localeFunctions[$fName] = $lfName;
-						}
-					}
-				}
-				//	Default the TRUE and FALSE constants to the locale names of the TRUE() and FALSE() functions
-				if (isset(self::$_localeFunctions['TRUE'])) { self::$_localeBoolean['TRUE'] = self::$_localeFunctions['TRUE']; }
-				if (isset(self::$_localeFunctions['FALSE'])) { self::$_localeBoolean['FALSE'] = self::$_localeFunctions['FALSE']; }
-
-				$configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_',DIRECTORY_SEPARATOR,$locale).DIRECTORY_SEPARATOR.'config';
-				if (!file_exists($configFile)) {
-					$configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'config';
-				}
-				if (file_exists($configFile)) {
-					$localeSettings = file($configFile,FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-					foreach ($localeSettings as $localeSetting) {
-						list($localeSetting) = explode('##',$localeSetting);	//	Strip out comments
-						if (strpos($localeSetting,'=') !== false) {
-							list($settingName,$settingValue) = explode('=',$localeSetting);
-							$settingName = strtoupper(trim($settingName));
-							switch ($settingName) {
-								case 'ARGUMENTSEPARATOR' :
-									self::$_localeArgumentSeparator = trim($settingValue);
-									break;
-							}
-						}
-					}
-				}
-			}
-
-			self::$functionReplaceFromExcel = self::$functionReplaceToExcel =
-			self::$functionReplaceFromLocale = self::$functionReplaceToLocale = null;
-			self::$_localeLanguage = $locale;
-			return true;
-		}
-		return false;
-	}	//	function setLocale()
-
-
-
-	public static function _translateSeparator($fromSeparator,$toSeparator,$formula,&$inBraces) {
-		$strlen = mb_strlen($formula);
-		for ($i = 0; $i < $strlen; ++$i) {
-			$chr = mb_substr($formula,$i,1);
-			switch ($chr) {
-				case '{' :	$inBraces = true;
-							break;
-				case '}' :	$inBraces = false;
-							break;
-				case $fromSeparator :
-							if (!$inBraces) {
-								$formula = mb_substr($formula,0,$i).$toSeparator.mb_substr($formula,$i+1);
-							}
-			}
-		}
-		return $formula;
-	}
-
-	private static function _translateFormula($from,$to,$formula,$fromSeparator,$toSeparator) {
-		//	Convert any Excel function names to the required language
-		if (self::$_localeLanguage !== 'en_us') {
-			$inBraces = false;
-			//	If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
-			if (strpos($formula,'"') !== false) {
-				//	So instead we skip replacing in any quoted strings by only replacing in every other array element after we've exploded
-				//		the formula
-				$temp = explode('"',$formula);
-				$i = false;
-				foreach($temp as &$value) {
-					//	Only count/replace in alternating array entries
-					if ($i = !$i) {
-						$value = preg_replace($from,$to,$value);
-						$value = self::_translateSeparator($fromSeparator,$toSeparator,$value,$inBraces);
-					}
-				}
-				unset($value);
-				//	Then rebuild the formula string
-				$formula = implode('"',$temp);
-			} else {
-				//	If there's no quoted strings, then we do a simple count/replace
-				$formula = preg_replace($from,$to,$formula);
-				$formula = self::_translateSeparator($fromSeparator,$toSeparator,$formula,$inBraces);
-			}
-		}
-
-		return $formula;
-	}
-
-	private static $functionReplaceFromExcel	= null;
-	private static $functionReplaceToLocale		= null;
-
-	public function _translateFormulaToLocale($formula) {
-		if (self::$functionReplaceFromExcel === NULL) {
-			self::$functionReplaceFromExcel = array();
-			foreach(array_keys(self::$_localeFunctions) as $excelFunctionName) {
-				self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelFunctionName).'([\s]*\()/Ui';
-			}
-			foreach(array_keys(self::$_localeBoolean) as $excelBoolean) {
-				self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelBoolean).'([^\w\.])/Ui';
-			}
-
-		}
-
-		if (self::$functionReplaceToLocale === NULL) {
-			self::$functionReplaceToLocale = array();
-			foreach(array_values(self::$_localeFunctions) as $localeFunctionName) {
-				self::$functionReplaceToLocale[] = '$1'.trim($localeFunctionName).'$2';
-			}
-			foreach(array_values(self::$_localeBoolean) as $localeBoolean) {
-				self::$functionReplaceToLocale[] = '$1'.trim($localeBoolean).'$2';
-			}
-		}
-
-		return self::_translateFormula(self::$functionReplaceFromExcel,self::$functionReplaceToLocale,$formula,',',self::$_localeArgumentSeparator);
-	}	//	function _translateFormulaToLocale()
-
-
-	private static $functionReplaceFromLocale	= null;
-	private static $functionReplaceToExcel		= null;
-
-	public function _translateFormulaToEnglish($formula) {
-		if (self::$functionReplaceFromLocale === NULL) {
-			self::$functionReplaceFromLocale = array();
-			foreach(array_values(self::$_localeFunctions) as $localeFunctionName) {
-				self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($localeFunctionName).'([\s]*\()/Ui';
-			}
-			foreach(array_values(self::$_localeBoolean) as $excelBoolean) {
-				self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($excelBoolean).'([^\w\.])/Ui';
-			}
-		}
-
-		if (self::$functionReplaceToExcel === NULL) {
-			self::$functionReplaceToExcel = array();
-			foreach(array_keys(self::$_localeFunctions) as $excelFunctionName) {
-				self::$functionReplaceToExcel[] = '$1'.trim($excelFunctionName).'$2';
-			}
-			foreach(array_keys(self::$_localeBoolean) as $excelBoolean) {
-				self::$functionReplaceToExcel[] = '$1'.trim($excelBoolean).'$2';
-			}
-		}
-
-		return self::_translateFormula(self::$functionReplaceFromLocale,self::$functionReplaceToExcel,$formula,self::$_localeArgumentSeparator,',');
-	}	//	function _translateFormulaToEnglish()
-
-
-	public static function _localeFunc($function) {
-		if (self::$_localeLanguage !== 'en_us') {
-			$functionName = trim($function,'(');
-			if (isset(self::$_localeFunctions[$functionName])) {
-				$brace = ($functionName != $function);
-				$function = self::$_localeFunctions[$functionName];
-				if ($brace) { $function .= '('; }
-			}
-		}
-		return $function;
-	}
-
-
-
-
-	/**
-	 * Wrap string values in quotes
-	 *
-	 * @param mixed $value
-	 * @return mixed
-	 */
-	public static function _wrapResult($value) {
-		if (is_string($value)) {
-			//	Error values cannot be "wrapped"
-			if (preg_match('/^'.self::CALCULATION_REGEXP_ERROR.'$/i', $value, $match)) {
-				//	Return Excel errors "as is"
-				return $value;
-			}
-			//	Return strings wrapped in quotes
-			return '"'.$value.'"';
-		//	Convert numeric errors to NaN error
-		} else if((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return $value;
-	}	//	function _wrapResult()
-
-
-	/**
-	 * Remove quotes used as a wrapper to identify string values
-	 *
-	 * @param mixed $value
-	 * @return mixed
-	 */
-	public static function _unwrapResult($value) {
-		if (is_string($value)) {
-			if ((isset($value{0})) && ($value{0} == '"') && (substr($value,-1) == '"')) {
-				return substr($value,1,-1);
-			}
-		//	Convert numeric errors to NaN error
-		} else if((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		return $value;
-	}	//	function _unwrapResult()
-
-
-
-
-	/**
-	 * Calculate cell value (using formula from a cell ID)
-	 * Retained for backward compatibility
-	 *
-	 * @access	public
-	 * @param	PHPExcel_Cell	$pCell	Cell to calculate
-	 * @return	mixed
-	 * @throws	Exception
-	 */
-	public function calculate(PHPExcel_Cell $pCell = null) {
-		try {
-			return $this->calculateCellValue($pCell);
-		} catch (Exception $e) {
-			throw(new Exception($e->getMessage()));
-		}
-	}	//	function calculate()
-
-
-	/**
-	 * Calculate the value of a cell formula
-	 *
-	 * @access	public
-	 * @param	PHPExcel_Cell	$pCell		Cell to calculate
-	 * @param	Boolean			$resetLog	Flag indicating whether the debug log should be reset or not
-	 * @return	mixed
-	 * @throws	Exception
-	 */
-	public function calculateCellValue(PHPExcel_Cell $pCell = null, $resetLog = true) {
-		if ($resetLog) {
-			//	Initialise the logging settings if requested
-			$this->formulaError = null;
-			$this->debugLog = $this->debugLogStack = array();
-			$this->_cyclicFormulaCount = 1;
-
-			$returnArrayAsType = self::$returnArrayAsType;
-			self::$returnArrayAsType = self::RETURN_ARRAY_AS_ARRAY;
-		}
-
-		//	Read the formula from the cell
-		if ($pCell === NULL) {
-			return NULL;
-		}
-
-		if ($resetLog) {
-			self::$returnArrayAsType = $returnArrayAsType;
-		}
-		//	Execute the calculation for the cell formula
-		try {
-			$result = self::_unwrapResult($this->_calculateFormulaValue($pCell->getValue(), $pCell->getCoordinate(), $pCell));
-		} catch (Exception $e) {
-			throw(new Exception($e->getMessage()));
-		}
-
-		if ((is_array($result)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) {
-			$testResult = PHPExcel_Calculation_Functions::flattenArray($result);
-			if (self::$returnArrayAsType == self::RETURN_ARRAY_AS_ERROR) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-			//	If there's only a single cell in the array, then we allow it
-			if (count($testResult) != 1) {
-				//	If keys are numeric, then it's a matrix result rather than a cell range result, so we permit it
-				$r = array_keys($result);
-				$r = array_shift($r);
-				if (!is_numeric($r)) { return PHPExcel_Calculation_Functions::VALUE(); }
-				if (is_array($result[$r])) {
-					$c = array_keys($result[$r]);
-					$c = array_shift($c);
-					if (!is_numeric($c)) {
-						return PHPExcel_Calculation_Functions::VALUE();
-					}
-				}
-			}
-			$result = array_shift($testResult);
-		}
-
-		if ($result === NULL) {
-			return 0;
-		} elseif((is_float($result)) && ((is_nan($result)) || (is_infinite($result)))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		return $result;
-	}	//	function calculateCellValue(
-
-
-	/**
-	 * Validate and parse a formula string
-	 *
-	 * @param	string		$formula		Formula to parse
-	 * @return	array
-	 * @throws	Exception
-	 */
-	public function parseFormula($formula) {
-		//	Basic validation that this is indeed a formula
-		//	We return an empty array if not
-		$formula = trim($formula);
-		if ((!isset($formula{0})) || ($formula{0} != '=')) return array();
-		$formula = ltrim(substr($formula,1));
-		if (!isset($formula{0})) return array();
-
-		//	Parse the formula and return the token stack
-		return $this->_parseFormula($formula);
-	}	//	function parseFormula()
-
-
-	/**
-	 * Calculate the value of a formula
-	 *
-	 * @param	string		$formula		Formula to parse
-	 * @return	mixed
-	 * @throws	Exception
-	 */
-	public function calculateFormula($formula, $cellID=null, PHPExcel_Cell $pCell = null) {
-		//	Initialise the logging settings
-		$this->formulaError = null;
-		$this->debugLog = $this->debugLogStack = array();
-
-		//	Disable calculation cacheing because it only applies to cell calculations, not straight formulae
-		//	But don't actually flush any cache
-		$resetCache = $this->getCalculationCacheEnabled();
-		self::$_calculationCacheEnabled = false;
-		//	Execute the calculation
-		try {
-			$result = self::_unwrapResult($this->_calculateFormulaValue($formula, $cellID, $pCell));
-		} catch (Exception $e) {
-			throw(new Exception($e->getMessage()));
-		}
-
-		//	Reset calculation cacheing to its previous state
-		self::$_calculationCacheEnabled = $resetCache;
-
-		return $result;
-	}	//	function calculateFormula()
-
-
-	/**
-	 * Parse a cell formula and calculate its value
-	 *
-	 * @param	string			$formula	The formula to parse and calculate
-	 * @param	string			$cellID		The ID (e.g. A3) of the cell that we are calculating
-	 * @param	PHPExcel_Cell	$pCell		Cell to calculate
-	 * @return	mixed
-	 * @throws	Exception
-	 */
-	public function _calculateFormulaValue($formula, $cellID=null, PHPExcel_Cell $pCell = null) {
-//		echo '<b>'.$cellID.'</b><br />';
-		$cellValue = '';
-
-		//	Basic validation that this is indeed a formula
-		//	We simply return the "cell value" (formula) if not
-		$formula = trim($formula);
-		if ($formula{0} != '=') return self::_wrapResult($formula);
-		$formula = ltrim(substr($formula,1));
-		if (!isset($formula{0})) return self::_wrapResult($formula);
-
-		$wsTitle = "\x00Wrk";
-		if ($pCell !== NULL) {
-			$pCellParent = $pCell->getParent();
-			if ($pCellParent !== NULL) {
-				$wsTitle = $pCellParent->getTitle();
-			}
-		}
-		// Is calculation cacheing enabled?
-		if ($cellID !== NULL) {
-			if (self::$_calculationCacheEnabled) {
-				// Is the value present in calculation cache?
-//				echo 'Testing cache value<br />';
-				if (isset(self::$_calculationCache[$wsTitle][$cellID])) {
-//					echo 'Value is in cache<br />';
-					$this->_writeDebug('Testing cache value for cell '.$cellID);
-					//	Is cache still valid?
-					if ((microtime(true) - self::$_calculationCache[$wsTitle][$cellID]['time']) < self::$_calculationCacheExpirationTime) {
-//						echo 'Cache time is still valid<br />';
-						$this->_writeDebug('Retrieving value for '.$cellID.' from cache');
-						// Return the cached result
-						$returnValue = self::$_calculationCache[$wsTitle][$cellID]['data'];
-//						echo 'Retrieving data value of '.$returnValue.' for '.$cellID.' from cache<br />';
-						if (is_array($returnValue)) {
-							$returnValue = PHPExcel_Calculation_Functions::flattenArray($returnValue);
-							return array_shift($returnValue);
-						}
-						return $returnValue;
-					} else {
-//						echo 'Cache has expired<br />';
-						$this->_writeDebug('Cache value for '.$cellID.' has expired');
-						//	Clear the cache if it's no longer valid
-						unset(self::$_calculationCache[$wsTitle][$cellID]);
-					}
-				}
-			}
-		}
-
-		if ((in_array($wsTitle.'!'.$cellID,$this->debugLogStack)) && ($wsTitle != "\x00Wrk")) {
-			if ($this->cyclicFormulaCount <= 0) {
-				return $this->_raiseFormulaError('Cyclic Reference in Formula');
-			} elseif (($this->_cyclicFormulaCount >= $this->cyclicFormulaCount) &&
-					  ($this->_cyclicFormulaCell == $wsTitle.'!'.$cellID)) {
-				return $cellValue;
-			} elseif ($this->_cyclicFormulaCell == $wsTitle.'!'.$cellID) {
-				++$this->_cyclicFormulaCount;
-				if ($this->_cyclicFormulaCount >= $this->cyclicFormulaCount) {
-					return $cellValue;
-				}
-			} elseif ($this->_cyclicFormulaCell == '') {
-				$this->_cyclicFormulaCell = $wsTitle.'!'.$cellID;
-				if ($this->_cyclicFormulaCount >= $this->cyclicFormulaCount) {
-					return $cellValue;
-				}
-			}
-		}
-		$this->debugLogStack[] = $wsTitle.'!'.$cellID;
-		//	Parse the formula onto the token stack and calculate the value
-		$cellValue = $this->_processTokenStack($this->_parseFormula($formula, $pCell), $cellID, $pCell);
-		array_pop($this->debugLogStack);
-
-		// Save to calculation cache
-		if ($cellID !== NULL) {
-			if (self::$_calculationCacheEnabled) {
-				self::$_calculationCache[$wsTitle][$cellID]['time'] = microtime(true);
-				self::$_calculationCache[$wsTitle][$cellID]['data'] = $cellValue;
-			}
-		}
-
-		//	Return the calculated value
-		return $cellValue;
-	}	//	function _calculateFormulaValue()
-
-
-	/**
-	 * Ensure that paired matrix operands are both matrices and of the same size
-	 *
-	 * @param	mixed		&$operand1	First matrix operand
-	 * @param	mixed		&$operand2	Second matrix operand
-	 * @param	integer		$resize		Flag indicating whether the matrices should be resized to match
-	 *										and (if so), whether the smaller dimension should grow or the
-	 *										larger should shrink.
-	 *											0 = no resize
-	 *											1 = shrink to fit
-	 *											2 = extend to fit
-	 */
-	private static function _checkMatrixOperands(&$operand1,&$operand2,$resize = 1) {
-		//	Examine each of the two operands, and turn them into an array if they aren't one already
-		//	Note that this function should only be called if one or both of the operand is already an array
-		if (!is_array($operand1)) {
-			list($matrixRows,$matrixColumns) = self::_getMatrixDimensions($operand2);
-			$operand1 = array_fill(0,$matrixRows,array_fill(0,$matrixColumns,$operand1));
-			$resize = 0;
-		} elseif (!is_array($operand2)) {
-			list($matrixRows,$matrixColumns) = self::_getMatrixDimensions($operand1);
-			$operand2 = array_fill(0,$matrixRows,array_fill(0,$matrixColumns,$operand2));
-			$resize = 0;
-		}
-
-		list($matrix1Rows,$matrix1Columns) = self::_getMatrixDimensions($operand1);
-		list($matrix2Rows,$matrix2Columns) = self::_getMatrixDimensions($operand2);
-		if (($matrix1Rows == $matrix2Columns) && ($matrix2Rows == $matrix1Columns)) {
-			$resize = 1;
-		}
-
-		if ($resize == 2) {
-			//	Given two matrices of (potentially) unequal size, convert the smaller in each dimension to match the larger
-			self::_resizeMatricesExtend($operand1,$operand2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns);
-		} elseif ($resize == 1) {
-			//	Given two matrices of (potentially) unequal size, convert the larger in each dimension to match the smaller
-			self::_resizeMatricesShrink($operand1,$operand2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns);
-		}
-		return array( $matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns);
-	}	//	function _checkMatrixOperands()
-
-
-	/**
-	 * Read the dimensions of a matrix, and re-index it with straight numeric keys starting from row 0, column 0
-	 *
-	 * @param	mixed		&$matrix		matrix operand
-	 * @return	array		An array comprising the number of rows, and number of columns
-	 */
-	public static function _getMatrixDimensions(&$matrix) {
-		$matrixRows = count($matrix);
-		$matrixColumns = 0;
-		foreach($matrix as $rowKey => $rowValue) {
-			$matrixColumns = max(count($rowValue),$matrixColumns);
-			if (!is_array($rowValue)) {
-				$matrix[$rowKey] = array($rowValue);
-			} else {
-				$matrix[$rowKey] = array_values($rowValue);
-			}
-		}
-		$matrix = array_values($matrix);
-		return array($matrixRows,$matrixColumns);
-	}	//	function _getMatrixDimensions()
-
-
-	/**
-	 * Ensure that paired matrix operands are both matrices of the same size
-	 *
-	 * @param	mixed		&$matrix1	First matrix operand
-	 * @param	mixed		&$matrix2	Second matrix operand
-	 */
-	private static function _resizeMatricesShrink(&$matrix1,&$matrix2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns) {
-		if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
-			if ($matrix2Columns < $matrix1Columns) {
-				for ($i = 0; $i < $matrix1Rows; ++$i) {
-					for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {
-						unset($matrix1[$i][$j]);
-					}
-				}
-			}
-			if ($matrix2Rows < $matrix1Rows) {
-				for ($i = $matrix2Rows; $i < $matrix1Rows; ++$i) {
-					unset($matrix1[$i]);
-				}
-			}
-		}
-
-		if (($matrix1Columns < $matrix2Columns) || ($matrix1Rows < $matrix2Rows)) {
-			if ($matrix1Columns < $matrix2Columns) {
-				for ($i = 0; $i < $matrix2Rows; ++$i) {
-					for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {
-						unset($matrix2[$i][$j]);
-					}
-				}
-			}
-			if ($matrix1Rows < $matrix2Rows) {
-				for ($i = $matrix1Rows; $i < $matrix2Rows; ++$i) {
-					unset($matrix2[$i]);
-				}
-			}
-		}
-	}	//	function _resizeMatricesShrink()
-
-
-	/**
-	 * Ensure that paired matrix operands are both matrices of the same size
-	 *
-	 * @param	mixed		&$matrix1	First matrix operand
-	 * @param	mixed		&$matrix2	Second matrix operand
-	 */
-	private static function _resizeMatricesExtend(&$matrix1,&$matrix2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns) {
-		if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
-			if ($matrix2Columns < $matrix1Columns) {
-				for ($i = 0; $i < $matrix2Rows; ++$i) {
-					$x = $matrix2[$i][$matrix2Columns-1];
-					for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {
-						$matrix2[$i][$j] = $x;
-					}
-				}
-			}
-			if ($matrix2Rows < $matrix1Rows) {
-				$x = $matrix2[$matrix2Rows-1];
-				for ($i = 0; $i < $matrix1Rows; ++$i) {
-					$matrix2[$i] = $x;
-				}
-			}
-		}
-
-		if (($matrix1Columns < $matrix2Columns) || ($matrix1Rows < $matrix2Rows)) {
-			if ($matrix1Columns < $matrix2Columns) {
-				for ($i = 0; $i < $matrix1Rows; ++$i) {
-					$x = $matrix1[$i][$matrix1Columns-1];
-					for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {
-						$matrix1[$i][$j] = $x;
-					}
-				}
-			}
-			if ($matrix1Rows < $matrix2Rows) {
-				$x = $matrix1[$matrix1Rows-1];
-				for ($i = 0; $i < $matrix2Rows; ++$i) {
-					$matrix1[$i] = $x;
-				}
-			}
-		}
-	}	//	function _resizeMatricesExtend()
-
-
-	/**
-	 * Format details of an operand for display in the log (based on operand type)
-	 *
-	 * @param	mixed		$value	First matrix operand
-	 * @return	mixed
-	 */
-	private function _showValue($value) {
-		if ($this->writeDebugLog) {
-			$testArray = PHPExcel_Calculation_Functions::flattenArray($value);
-			if (count($testArray) == 1) {
-				$value = array_pop($testArray);
-			}
-
-			if (is_array($value)) {
-				$returnMatrix = array();
-				$pad = $rpad = ', ';
-				foreach($value as $row) {
-					if (is_array($row)) {
-						$returnMatrix[] = implode($pad,array_map(array($this,'_showValue'),$row));
-						$rpad = '; ';
-					} else {
-						$returnMatrix[] = $this->_showValue($row);
-					}
-				}
-				return '{ '.implode($rpad,$returnMatrix).' }';
-			} elseif(is_string($value) && (trim($value,'"') == $value)) {
-				return '"'.$value.'"';
-			} elseif(is_bool($value)) {
-				return ($value) ? self::$_localeBoolean['TRUE'] : self::$_localeBoolean['FALSE'];
-			}
-		}
-		return PHPExcel_Calculation_Functions::flattenSingleValue($value);
-	}	//	function _showValue()
-
-
-	/**
-	 * Format type and details of an operand for display in the log (based on operand type)
-	 *
-	 * @param	mixed		$value	First matrix operand
-	 * @return	mixed
-	 */
-	private function _showTypeDetails($value) {
-		if ($this->writeDebugLog) {
-			$testArray = PHPExcel_Calculation_Functions::flattenArray($value);
-			if (count($testArray) == 1) {
-				$value = array_pop($testArray);
-			}
-
-			if ($value === NULL) {
-				return 'a NULL value';
-			} elseif (is_float($value)) {
-				$typeString = 'a floating point number';
-			} elseif(is_int($value)) {
-				$typeString = 'an integer number';
-			} elseif(is_bool($value)) {
-				$typeString = 'a boolean';
-			} elseif(is_array($value)) {
-				$typeString = 'a matrix';
-			} else {
-				if ($value == '') {
-					return 'an empty string';
-				} elseif ($value{0} == '#') {
-					return 'a '.$value.' error';
-				} else {
-					$typeString = 'a string';
-				}
-			}
-			return $typeString.' with a value of '.$this->_showValue($value);
-		}
-	}	//	function _showTypeDetails()
-
-
-	private static function _convertMatrixReferences($formula) {
-		static $matrixReplaceFrom = array('{',';','}');
-		static $matrixReplaceTo = array('MKMATRIX(MKMATRIX(','),MKMATRIX(','))');
-
-		//	Convert any Excel matrix references to the MKMATRIX() function
-		if (strpos($formula,'{') !== false) {
-			//	If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
-			if (strpos($formula,'"') !== false) {
-				//	So instead we skip replacing in any quoted strings by only replacing in every other array element after we've exploded
-				//		the formula
-				$temp = explode('"',$formula);
-				//	Open and Closed counts used for trapping mismatched braces in the formula
-				$openCount = $closeCount = 0;
-				$i = false;
-				foreach($temp as &$value) {
-					//	Only count/replace in alternating array entries
-					if ($i = !$i) {
-						$openCount += substr_count($value,'{');
-						$closeCount += substr_count($value,'}');
-						$value = str_replace($matrixReplaceFrom,$matrixReplaceTo,$value);
-					}
-				}
-				unset($value);
-				//	Then rebuild the formula string
-				$formula = implode('"',$temp);
-			} else {
-				//	If there's no quoted strings, then we do a simple count/replace
-				$openCount = substr_count($formula,'{');
-				$closeCount = substr_count($formula,'}');
-				$formula = str_replace($matrixReplaceFrom,$matrixReplaceTo,$formula);
-			}
-			//	Trap for mismatched braces and trigger an appropriate error
-			if ($openCount < $closeCount) {
-				if ($openCount > 0) {
-					return $this->_raiseFormulaError("Formula Error: Mismatched matrix braces '}'");
-				} else {
-					return $this->_raiseFormulaError("Formula Error: Unexpected '}' encountered");
-				}
-			} elseif ($openCount > $closeCount) {
-				if ($closeCount > 0) {
-					return $this->_raiseFormulaError("Formula Error: Mismatched matrix braces '{'");
-				} else {
-					return $this->_raiseFormulaError("Formula Error: Unexpected '{' encountered");
-				}
-			}
-		}
-
-		return $formula;
-	}	//	function _convertMatrixReferences()
-
-
-	private static function _mkMatrix() {
-		return func_get_args();
-	}	//	function _mkMatrix()
-
-
-	// Convert infix to postfix notation
-	private function _parseFormula($formula, PHPExcel_Cell $pCell = null) {
-		if (($formula = self::_convertMatrixReferences(trim($formula))) === false) {
-			return FALSE;
-		}
-
-		//	If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent worksheet),
-		//		so we store the parent worksheet so that we can re-attach it when necessary
-		$pCellParent = ($pCell !== NULL) ? $pCell->getParent() : NULL;
-
-		//	Binary Operators
-		//	These operators always work on two values
-		//	Array key is the operator, the value indicates whether this is a left or right associative operator
-		$operatorAssociativity	= array('^' => 0,															//	Exponentiation
-										'*' => 0, '/' => 0, 												//	Multiplication and Division
-										'+' => 0, '-' => 0,													//	Addition and Subtraction
-										'&' => 0,															//	Concatenation
-										'|' => 0, ':' => 0,													//	Intersect and Range
-										'>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0		//	Comparison
-								 	  );
-		//	Comparison (Boolean) Operators
-		//	These operators work on two values, but always return a boolean result
-		$comparisonOperators	= array('>' => true, '<' => true, '=' => true, '>=' => true, '<=' => true, '<>' => true);
-
-		//	Operator Precedence
-		//	This list includes all valid operators, whether binary (including boolean) or unary (such as %)
-		//	Array key is the operator, the value is its precedence
-		$operatorPrecedence	= array(':' => 8,																//	Range
-									'|' => 7,																//	Intersect
-									'~' => 6,																//	Negation
-									'%' => 5,																//	Percentage
-									'^' => 4,																//	Exponentiation
-									'*' => 3, '/' => 3, 													//	Multiplication and Division
-									'+' => 2, '-' => 2,														//	Addition and Subtraction
-									'&' => 1,																//	Concatenation
-									'>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0			//	Comparison
-								   );
-
-		$regexpMatchString = '/^('.self::CALCULATION_REGEXP_FUNCTION.
-							   '|'.self::CALCULATION_REGEXP_NUMBER.
-							   '|'.self::CALCULATION_REGEXP_STRING.
-							   '|'.self::CALCULATION_REGEXP_OPENBRACE.
-							   '|'.self::CALCULATION_REGEXP_CELLREF.
-							   '|'.self::CALCULATION_REGEXP_NAMEDRANGE.
-							   '|'.self::CALCULATION_REGEXP_ERROR.
-							 ')/si';
-
-		//	Start with initialisation
-		$index = 0;
-		$stack = new PHPExcel_Calculation_Token_Stack;
-		$output = array();
-		$expectingOperator = false;					//	We use this test in syntax-checking the expression to determine when a
-													//		- is a negation or + is a positive operator rather than an operation
-		$expectingOperand = false;					//	We use this test in syntax-checking the expression to determine whether an operand
-													//		should be null in a function call
-		//	The guts of the lexical parser
-		//	Loop through the formula extracting each operator and operand in turn
-		while(true) {
-//			echo 'Assessing Expression <b>'.substr($formula, $index).'</b><br />';
-			$opCharacter = $formula{$index};	//	Get the first character of the value at the current index position
-//			echo 'Initial character of expression block is '.$opCharacter.'<br />';
-			if ((isset($comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset($comparisonOperators[$formula{$index+1}]))) {
-				$opCharacter .= $formula{++$index};
-//				echo 'Initial character of expression block is comparison operator '.$opCharacter.'<br />';
-			}
-
-			//	Find out if we're currently at the beginning of a number, variable, cell reference, function, parenthesis or operand
-			$isOperandOrFunction = preg_match($regexpMatchString, substr($formula, $index), $match);
-//			echo '$isOperandOrFunction is '.(($isOperandOrFunction) ? 'True' : 'False').'<br />';
-//			var_dump($match);
-
-			if ($opCharacter == '-' && !$expectingOperator) {				//	Is it a negation instead of a minus?
-//				echo 'Element is a Negation operator<br />';
-				$stack->push('Unary Operator','~');							//	Put a negation on the stack
-				++$index;													//		and drop the negation symbol
-			} elseif ($opCharacter == '%' && $expectingOperator) {
-//				echo 'Element is a Percentage operator<br />';
-				$stack->push('Unary Operator','%');							//	Put a percentage on the stack
-				++$index;
-			} elseif ($opCharacter == '+' && !$expectingOperator) {			//	Positive (unary plus rather than binary operator plus) can be discarded?
-//				echo 'Element is a Positive number, not Plus operator<br />';
-				++$index;													//	Drop the redundant plus symbol
-			} elseif ((($opCharacter == '~') || ($opCharacter == '|')) && (!$isOperandOrFunction)) {	//	We have to explicitly deny a tilde or pipe, because they are legal
-				return $this->_raiseFormulaError("Formula Error: Illegal character '~'");				//		on the stack but not in the input expression
-
-			} elseif ((isset(self::$_operators[$opCharacter]) or $isOperandOrFunction) && $expectingOperator) {	//	Are we putting an operator on the stack?
-//				echo 'Element with value '.$opCharacter.' is an Operator<br />';
-				while($stack->count() > 0 &&
-					($o2 = $stack->last()) &&
-					isset(self::$_operators[$o2['value']]) &&
-					@($operatorAssociativity[$opCharacter] ? $operatorPrecedence[$opCharacter] < $operatorPrecedence[$o2['value']] : $operatorPrecedence[$opCharacter] <= $operatorPrecedence[$o2['value']])) {
-					$output[] = $stack->pop();								//	Swap operands and higher precedence operators from the stack to the output
-				}
-				$stack->push('Binary Operator',$opCharacter);	//	Finally put our current operator onto the stack
-				++$index;
-				$expectingOperator = false;
-
-			} elseif ($opCharacter == ')' && $expectingOperator) {			//	Are we expecting to close a parenthesis?
-//				echo 'Element is a Closing bracket<br />';
-				$expectingOperand = false;
-				while (($o2 = $stack->pop()) && $o2['value'] != '(') {		//	Pop off the stack back to the last (
-					if ($o2 === NULL) return $this->_raiseFormulaError('Formula Error: Unexpected closing brace ")"');
-					else $output[] = $o2;
-				}
-				$d = $stack->last(2);
-				if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {	//	Did this parenthesis just close a function?
-					$functionName = $matches[1];										//	Get the function name
-//					echo 'Closed Function is '.$functionName.'<br />';
-					$d = $stack->pop();
-					$argumentCount = $d['value'];		//	See how many arguments there were (argument count is the next value stored on the stack)
-//					if ($argumentCount == 0) {
-//						echo 'With no arguments<br />';
-//					} elseif ($argumentCount == 1) {
-//						echo 'With 1 argument<br />';
-//					} else {
-//						echo 'With '.$argumentCount.' arguments<br />';
-//					}
-					$output[] = $d;						//	Dump the argument count on the output
-					$output[] = $stack->pop();			//	Pop the function and push onto the output
-					if (isset(self::$_controlFunctions[$functionName])) {
-//						echo 'Built-in function '.$functionName.'<br />';
-						$expectedArgumentCount = self::$_controlFunctions[$functionName]['argumentCount'];
-						$functionCall = self::$_controlFunctions[$functionName]['functionCall'];
-					} elseif (isset(self::$_PHPExcelFunctions[$functionName])) {
-//						echo 'PHPExcel function '.$functionName.'<br />';
-						$expectedArgumentCount = self::$_PHPExcelFunctions[$functionName]['argumentCount'];
-						$functionCall = self::$_PHPExcelFunctions[$functionName]['functionCall'];
-					} else {	// did we somehow push a non-function on the stack? this should never happen
-						return $this->_raiseFormulaError("Formula Error: Internal error, non-function on stack");
-					}
-					//	Check the argument count
-					$argumentCountError = false;
-					if (is_numeric($expectedArgumentCount)) {
-						if ($expectedArgumentCount < 0) {
-//							echo '$expectedArgumentCount is between 0 and '.abs($expectedArgumentCount).'<br />';
-							if ($argumentCount > abs($expectedArgumentCount)) {
-								$argumentCountError = true;
-								$expectedArgumentCountString = 'no more than '.abs($expectedArgumentCount);
-							}
-						} else {
-//							echo '$expectedArgumentCount is numeric '.$expectedArgumentCount.'<br />';
-							if ($argumentCount != $expectedArgumentCount) {
-								$argumentCountError = true;
-								$expectedArgumentCountString = $expectedArgumentCount;
-							}
-						}
-					} elseif ($expectedArgumentCount != '*') {
-						$isOperandOrFunction = preg_match('/(\d*)([-+,])(\d*)/',$expectedArgumentCount,$argMatch);
-//						print_r($argMatch);
-//						echo '<br />';
-						switch ($argMatch[2]) {
-							case '+' :
-								if ($argumentCount < $argMatch[1]) {
-									$argumentCountError = true;
-									$expectedArgumentCountString = $argMatch[1].' or more ';
-								}
-								break;
-							case '-' :
-								if (($argumentCount < $argMatch[1]) || ($argumentCount > $argMatch[3])) {
-									$argumentCountError = true;
-									$expectedArgumentCountString = 'between '.$argMatch[1].' and '.$argMatch[3];
-								}
-								break;
-							case ',' :
-								if (($argumentCount != $argMatch[1]) && ($argumentCount != $argMatch[3])) {
-									$argumentCountError = true;
-									$expectedArgumentCountString = 'either '.$argMatch[1].' or '.$argMatch[3];
-								}
-								break;
-						}
-					}
-					if ($argumentCountError) {
-						return $this->_raiseFormulaError("Formula Error: Wrong number of arguments for $functionName() function: $argumentCount given, ".$expectedArgumentCountString." expected");
-					}
-				}
-				++$index;
-
-			} elseif ($opCharacter == ',') {			//	Is this the separator for function arguments?
-//				echo 'Element is a Function argument separator<br />';
-				while (($o2 = $stack->pop()) && $o2['value'] != '(') {		//	Pop off the stack back to the last (
-					if ($o2 === NULL) return $this->_raiseFormulaError("Formula Error: Unexpected ,");
-					else $output[] = $o2;	// pop the argument expression stuff and push onto the output
-				}
-				//	If we've a comma when we're expecting an operand, then what we actually have is a null operand;
-				//		so push a null onto the stack
-				if (($expectingOperand) || (!$expectingOperator)) {
-					$output[] = array('type' => 'NULL Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => null);
-				}
-				// make sure there was a function
-				$d = $stack->last(2);
-				if (!preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches))
-					return $this->_raiseFormulaError("Formula Error: Unexpected ,");
-				$d = $stack->pop();
-				$stack->push($d['type'],++$d['value'],$d['reference']);	// increment the argument count
-				$stack->push('Brace', '(');	// put the ( back on, we'll need to pop back to it again
-				$expectingOperator = false;
-				$expectingOperand = true;
-				++$index;
-
-			} elseif ($opCharacter == '(' && !$expectingOperator) {
-//				echo 'Element is an Opening Bracket<br />';
-				$stack->push('Brace', '(');
-				++$index;
-
-			} elseif ($isOperandOrFunction && !$expectingOperator) {	// do we now have a function/variable/number?
-				$expectingOperator = true;
-				$expectingOperand = false;
-				$val = $match[1];
-				$length = strlen($val);
-//				echo 'Element with value '.$val.' is an Operand, Variable, Constant, String, Number, Cell Reference or Function<br />';
-
-				if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $val, $matches)) {
-					$val = preg_replace('/\s/','',$val);
-//					echo 'Element '.$val.' is a Function<br />';
-					if (isset(self::$_PHPExcelFunctions[strtoupper($matches[1])]) || isset(self::$_controlFunctions[strtoupper($matches[1])])) {	// it's a function
-						$stack->push('Function', strtoupper($val));
-						$ax = preg_match('/^\s*(\s*\))/i', substr($formula, $index+$length), $amatch);
-						if ($ax) {
-							$stack->push('Operand Count for Function '.strtoupper($val).')', 0);
-							$expectingOperator = true;
-						} else {
-							$stack->push('Operand Count for Function '.strtoupper($val).')', 1);
-							$expectingOperator = false;
-						}
-						$stack->push('Brace', '(');
-					} else {	// it's a var w/ implicit multiplication
-						$output[] = array('type' => 'Value', 'value' => $matches[1], 'reference' => null);
-					}
-				} elseif (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $val, $matches)) {
-//					echo 'Element '.$val.' is a Cell reference<br />';
-					//	Watch for this case-change when modifying to allow cell references in different worksheets...
-					//	Should only be applied to the actual cell column, not the worksheet name
-
-					//	If the last entry on the stack was a : operator, then we have a cell range reference
-					$testPrevOp = $stack->last(1);
-					if ($testPrevOp['value'] == ':') {
-						//	If we have a worksheet reference, then we're playing with a 3D reference
-						if ($matches[2] == '') {
-							//	Otherwise, we 'inherit' the worksheet reference from the start cell reference
-							//	The start of the cell range reference should be the last entry in $output
-							$startCellRef = $output[count($output)-1]['value'];
-							preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $startCellRef, $startMatches);
-							if ($startMatches[2] > '') {
-								$val = $startMatches[2].'!'.$val;
-							}
-						} else {
-							return $this->_raiseFormulaError("3D Range references are not yet supported");
-						}
-					}
-
-					$output[] = array('type' => 'Cell Reference', 'value' => $val, 'reference' => $val);
-//					$expectingOperator = false;
-				} else {	// it's a variable, constant, string, number or boolean
-//					echo 'Element is a Variable, Constant, String, Number or Boolean<br />';
-					//	If the last entry on the stack was a : operator, then we may have a row or column range reference
-					$testPrevOp = $stack->last(1);
-					if ($testPrevOp['value'] == ':') {
-						$startRowColRef = $output[count($output)-1]['value'];
-						$rangeWS1 = '';
-						if (strpos('!',$startRowColRef) !== false) {
-							list($rangeWS1,$startRowColRef) = explode('!',$startRowColRef);
-						}
-						if ($rangeWS1 != '') $rangeWS1 .= '!';
-						$rangeWS2 = $rangeWS1;
-						if (strpos('!',$val) !== false) {
-							list($rangeWS2,$val) = explode('!',$val);
-						}
-						if ($rangeWS2 != '') $rangeWS2 .= '!';
-						if ((is_integer($startRowColRef)) && (ctype_digit($val)) &&
-							($startRowColRef <= 1048576) && ($val <= 1048576)) {
-							//	Row range
-							$endRowColRef = ($pCellParent !== NULL) ? $pCellParent->getHighestColumn() : 'XFD';	//	Max 16,384 columns for Excel2007
-							$output[count($output)-1]['value'] = $rangeWS1.'A'.$startRowColRef;
-							$val = $rangeWS2.$endRowColRef.$val;
-						} elseif ((ctype_alpha($startRowColRef)) && (ctype_alpha($val)) &&
-							(strlen($startRowColRef) <= 3) && (strlen($val) <= 3)) {
-							//	Column range
-							$endRowColRef = ($pCellParent !== NULL) ? $pCellParent->getHighestRow() : 1048576;		//	Max 1,048,576 rows for Excel2007
-							$output[count($output)-1]['value'] = $rangeWS1.strtoupper($startRowColRef).'1';
-							$val = $rangeWS2.$val.$endRowColRef;
-						}
-					}
-
-					$localeConstant = false;
-					if ($opCharacter == '"') {
-//						echo 'Element is a String<br />';
-						//	UnEscape any quotes within the string
-						$val = self::_wrapResult(str_replace('""','"',self::_unwrapResult($val)));
-					} elseif (is_numeric($val)) {
-//						echo 'Element is a Number<br />';
-						if ((strpos($val,'.') !== false) || (stripos($val,'e') !== false) || ($val > PHP_INT_MAX) || ($val < -PHP_INT_MAX)) {
-//							echo 'Casting '.$val.' to float<br />';
-							$val = (float) $val;
-						} else {
-//							echo 'Casting '.$val.' to integer<br />';
-							$val = (integer) $val;
-						}
-					} elseif (isset(self::$_ExcelConstants[trim(strtoupper($val))])) {
-						$excelConstant = trim(strtoupper($val));
-//						echo 'Element '.$excelConstant.' is an Excel Constant<br />';
-						$val = self::$_ExcelConstants[$excelConstant];
-					} elseif (($localeConstant = array_search(trim(strtoupper($val)), self::$_localeBoolean)) !== false) {
-//						echo 'Element '.$localeConstant.' is an Excel Constant<br />';
-						$val = self::$_ExcelConstants[$localeConstant];
-					}
-					$details = array('type' => 'Value', 'value' => $val, 'reference' => null);
-					if ($localeConstant) { $details['localeValue'] = $localeConstant; }
-					$output[] = $details;
-				}
-				$index += $length;
-
-			} elseif ($opCharacter == '$') {	// absolute row or column range
-				++$index;
-			} elseif ($opCharacter == ')') {	// miscellaneous error checking
-				if ($expectingOperand) {
-					$output[] = array('type' => 'NULL Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => null);
-					$expectingOperand = false;
-					$expectingOperator = true;
-				} else {
-					return $this->_raiseFormulaError("Formula Error: Unexpected ')'");
-				}
-			} elseif (isset(self::$_operators[$opCharacter]) && !$expectingOperator) {
-				return $this->_raiseFormulaError("Formula Error: Unexpected operator '$opCharacter'");
-			} else {	// I don't even want to know what you did to get here
-				return $this->_raiseFormulaError("Formula Error: An unexpected error occured");
-			}
-			//	Test for end of formula string
-			if ($index == strlen($formula)) {
-				//	Did we end with an operator?.
-				//	Only valid for the % unary operator
-				if ((isset(self::$_operators[$opCharacter])) && ($opCharacter != '%')) {
-					return $this->_raiseFormulaError("Formula Error: Operator '$opCharacter' has no operands");
-				} else {
-					break;
-				}
-			}
-			//	Ignore white space
-			while (($formula{$index} == "\n") || ($formula{$index} == "\r")) {
-				++$index;
-			}
-			if ($formula{$index} == ' ') {
-				while ($formula{$index} == ' ') {
-					++$index;
-				}
-				//	If we're expecting an operator, but only have a space between the previous and next operands (and both are
-				//		Cell References) then we have an INTERSECTION operator
-//				echo 'Possible Intersect Operator<br />';
-				if (($expectingOperator) && (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'.*/Ui', substr($formula, $index), $match)) &&
-					($output[count($output)-1]['type'] == 'Cell Reference')) {
-//					echo 'Element is an Intersect Operator<br />';
-					while($stack->count() > 0 &&
-						($o2 = $stack->last()) &&
-						isset(self::$_operators[$o2['value']]) &&
-						@($operatorAssociativity[$opCharacter] ? $operatorPrecedence[$opCharacter] < $operatorPrecedence[$o2['value']] : $operatorPrecedence[$opCharacter] <= $operatorPrecedence[$o2['value']])) {
-						$output[] = $stack->pop();								//	Swap operands and higher precedence operators from the stack to the output
-					}
-					$stack->push('Binary Operator','|');	//	Put an Intersect Operator on the stack
-					$expectingOperator = false;
-				}
-			}
-		}
-
-		while (($op = $stack->pop()) !== NULL) {	// pop everything off the stack and push onto output
-			if ((is_array($opCharacter) && $opCharacter['value'] == '(') || ($opCharacter === '('))
-				return $this->_raiseFormulaError("Formula Error: Expecting ')'");	// if there are any opening braces on the stack, then braces were unbalanced
-			$output[] = $op;
-		}
-		return $output;
-	}	//	function _parseFormula()
-
-
-	private static function _dataTestReference(&$operandData)
-	{
-		$operand = $operandData['value'];
-		if (($operandData['reference'] === NULL) && (is_array($operand))) {
-			$rKeys = array_keys($operand);
-			$rowKey = array_shift($rKeys);
-			$cKeys = array_keys(array_keys($operand[$rowKey]));
-			$colKey = array_shift($cKeys);
-			if (ctype_upper($colKey)) {
-				$operandData['reference'] = $colKey.$rowKey;
-			}
-		}
-		return $operand;
-	}
-
-	// evaluate postfix notation
-	private function _processTokenStack($tokens, $cellID = null, PHPExcel_Cell $pCell = null) {
-		if ($tokens == false) return false;
-
-		//	If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent worksheet),
-		//		so we store the parent worksheet so that we can re-attach it when necessary
-		$pCellParent = ($pCell !== NULL) ? $pCell->getParent() : null;
-		$stack = new PHPExcel_Calculation_Token_Stack;
-
-		//	Loop through each token in turn
-		foreach ($tokens as $tokenData) {
-//			print_r($tokenData);
-//			echo '<br />';
-			$token = $tokenData['value'];
-//			echo '<b>Token is '.$token.'</b><br />';
-			// if the token is a binary operator, pop the top two values off the stack, do the operation, and push the result back on the stack
-			if (isset(self::$_binaryOperators[$token])) {
-//				echo 'Token is a binary operator<br />';
-				//	We must have two operands, error if we don't
-				if (($operand2Data = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
-				if (($operand1Data = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
-
-				$operand1 = self::_dataTestReference($operand1Data);
-				$operand2 = self::_dataTestReference($operand2Data);
-
-				//	Log what we're doing
-				if ($token == ':') {
-					$this->_writeDebug('Evaluating Range '.$this->_showValue($operand1Data['reference']).$token.$this->_showValue($operand2Data['reference']));
-				} else {
-					$this->_writeDebug('Evaluating '.$this->_showValue($operand1).' '.$token.' '.$this->_showValue($operand2));
-				}
-
-				//	Process the operation in the appropriate manner
-				switch ($token) {
-					//	Comparison (Boolean) Operators
-					case '>'	:			//	Greater than
-					case '<'	:			//	Less than
-					case '>='	:			//	Greater than or Equal to
-					case '<='	:			//	Less than or Equal to
-					case '='	:			//	Equality
-					case '<>'	:			//	Inequality
-						$this->_executeBinaryComparisonOperation($cellID,$operand1,$operand2,$token,$stack);
-						break;
-					//	Binary Operators
-					case ':'	:			//	Range
-						$sheet1 = $sheet2 = '';
-						if (strpos($operand1Data['reference'],'!') !== false) {
-							list($sheet1,$operand1Data['reference']) = explode('!',$operand1Data['reference']);
-						} else {
-							$sheet1 = ($pCellParent !== NULL) ? $pCellParent->getTitle() : '';
-						}
-						if (strpos($operand2Data['reference'],'!') !== false) {
-							list($sheet2,$operand2Data['reference']) = explode('!',$operand2Data['reference']);
-						} else {
-							$sheet2 = $sheet1;
-						}
-						if ($sheet1 == $sheet2) {
-							if ($operand1Data['reference'] === NULL) {
-								if ((trim($operand1Data['value']) != '') && (is_numeric($operand1Data['value']))) {
-									$operand1Data['reference'] = $pCell->getColumn().$operand1Data['value'];
-								} elseif (trim($operand1Data['reference']) == '') {
-									$operand1Data['reference'] = $pCell->getCoordinate();
-								} else {
-									$operand1Data['reference'] = $operand1Data['value'].$pCell->getRow();
-								}
-							}
-							if ($operand2Data['reference'] === NULL) {
-								if ((trim($operand2Data['value']) != '') && (is_numeric($operand2Data['value']))) {
-									$operand2Data['reference'] = $pCell->getColumn().$operand2Data['value'];
-								} elseif (trim($operand2Data['reference']) == '') {
-									$operand2Data['reference'] = $pCell->getCoordinate();
-								} else {
-									$operand2Data['reference'] = $operand2Data['value'].$pCell->getRow();
-								}
-							}
-
-							$oData = array_merge(explode(':',$operand1Data['reference']),explode(':',$operand2Data['reference']));
-							$oCol = $oRow = array();
-							foreach($oData as $oDatum) {
-								$oCR = PHPExcel_Cell::coordinateFromString($oDatum);
-								$oCol[] = PHPExcel_Cell::columnIndexFromString($oCR[0]) - 1;
-								$oRow[] = $oCR[1];
-							}
-							$cellRef = PHPExcel_Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.PHPExcel_Cell::stringFromColumnIndex(max($oCol)).max($oRow);
-							if ($pCellParent !== NULL) {
-								$cellValue = $this->extractCellRange($cellRef, $pCellParent->getParent()->getSheetByName($sheet1), false);
-							} else {
-								return $this->_raiseFormulaError('Unable to access Cell Reference');
-							}
-							$stack->push('Cell Reference',$cellValue,$cellRef);
-						} else {
-							$stack->push('Error',PHPExcel_Calculation_Functions::REF(),null);
-						}
-
-						break;
-					case '+'	:			//	Addition
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'plusEquals',$stack);
-						break;
-					case '-'	:			//	Subtraction
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'minusEquals',$stack);
-						break;
-					case '*'	:			//	Multiplication
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'arrayTimesEquals',$stack);
-						break;
-					case '/'	:			//	Division
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'arrayRightDivide',$stack);
-						break;
-					case '^'	:			//	Exponential
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'power',$stack);
-						break;
-					case '&'	:			//	Concatenation
-						//	If either of the operands is a matrix, we need to treat them both as matrices
-						//		(converting the other operand to a matrix if need be); then perform the required
-						//		matrix operation
-						if (is_bool($operand1)) {
-							$operand1 = ($operand1) ? self::$_localeBoolean['TRUE'] : self::$_localeBoolean['FALSE'];
-						}
-						if (is_bool($operand2)) {
-							$operand2 = ($operand2) ? self::$_localeBoolean['TRUE'] : self::$_localeBoolean['FALSE'];
-						}
-						if ((is_array($operand1)) || (is_array($operand2))) {
-							//	Ensure that both operands are arrays/matrices
-							self::_checkMatrixOperands($operand1,$operand2,2);
-							try {
-								//	Convert operand 1 from a PHP array to a matrix
-								$matrix = new PHPExcel_Shared_JAMA_Matrix($operand1);
-								//	Perform the required operation against the operand 1 matrix, passing in operand 2
-								$matrixResult = $matrix->concat($operand2);
-								$result = $matrixResult->getArray();
-							} catch (Exception $ex) {
-								$this->_writeDebug('JAMA Matrix Exception: '.$ex->getMessage());
-								$result = '#VALUE!';
-							}
-						} else {
-							$result = '"'.str_replace('""','"',self::_unwrapResult($operand1,'"').self::_unwrapResult($operand2,'"')).'"';
-						}
-						$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($result));
-						$stack->push('Value',$result);
-						break;
-					case '|'	:			//	Intersect
-						$rowIntersect = array_intersect_key($operand1,$operand2);
-						$cellIntersect = $oCol = $oRow = array();
-						foreach(array_keys($rowIntersect) as $row) {
-							$oRow[] = $row;
-							foreach($rowIntersect[$row] as $col => $data) {
-								$oCol[] = PHPExcel_Cell::columnIndexFromString($col) - 1;
-								$cellIntersect[$row] = array_intersect_key($operand1[$row],$operand2[$row]);
-							}
-						}
-						$cellRef = PHPExcel_Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.PHPExcel_Cell::stringFromColumnIndex(max($oCol)).max($oRow);
-						$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($cellIntersect));
-						$stack->push('Value',$cellIntersect,$cellRef);
-						break;
-				}
-
-			// if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
-			} elseif (($token === '~') || ($token === '%')) {
-//				echo 'Token is a unary operator<br />';
-				if (($arg = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
-				$arg = $arg['value'];
-				if ($token === '~') {
-//					echo 'Token is a negation operator<br />';
-					$this->_writeDebug('Evaluating Negation of '.$this->_showValue($arg));
-					$multiplier = -1;
-				} else {
-//					echo 'Token is a percentile operator<br />';
-					$this->_writeDebug('Evaluating Percentile of '.$this->_showValue($arg));
-					$multiplier = 0.01;
-				}
-				if (is_array($arg)) {
-					self::_checkMatrixOperands($arg,$multiplier,2);
-					try {
-						$matrix1 = new PHPExcel_Shared_JAMA_Matrix($arg);
-						$matrixResult = $matrix1->arrayTimesEquals($multiplier);
-						$result = $matrixResult->getArray();
-					} catch (Exception $ex) {
-						$this->_writeDebug('JAMA Matrix Exception: '.$ex->getMessage());
-						$result = '#VALUE!';
-					}
-					$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($result));
-					$stack->push('Value',$result);
-				} else {
-					$this->_executeNumericBinaryOperation($cellID,$multiplier,$arg,'*','arrayTimesEquals',$stack);
-				}
-
-			} elseif (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $token, $matches)) {
-				$cellRef = null;
-//				echo 'Element '.$token.' is a Cell reference<br />';
-				if (isset($matches[8])) {
-//					echo 'Reference is a Range of cells<br />';
-					if ($pCell === NULL) {
-//						We can't access the range, so return a REF error
-						$cellValue = PHPExcel_Calculation_Functions::REF();
-					} else {
-						$cellRef = $matches[6].$matches[7].':'.$matches[9].$matches[10];
-						if ($matches[2] > '') {
-							$matches[2] = trim($matches[2],"\"'");
-							if ((strpos($matches[2],'[') !== false) || (strpos($matches[2],']') !== false)) {
-								//	It's a Reference to an external workbook (not currently supported)
-								return $this->_raiseFormulaError('Unable to access External Workbook');
-							}
-							$matches[2] = trim($matches[2],"\"'");
-//							echo '$cellRef='.$cellRef.' in worksheet '.$matches[2].'<br />';
-							$this->_writeDebug('Evaluating Cell Range '.$cellRef.' in worksheet '.$matches[2]);
-							if ($pCellParent !== NULL) {
-								$cellValue = $this->extractCellRange($cellRef, $pCellParent->getParent()->getSheetByName($matches[2]), false);
-							} else {
-								return $this->_raiseFormulaError('Unable to access Cell Reference');
-							}
-							$this->_writeDebug('Evaluation Result for cells '.$cellRef.' in worksheet '.$matches[2].' is '.$this->_showTypeDetails($cellValue));
-//							$cellRef = $matches[2].'!'.$cellRef;
-						} else {
-//							echo '$cellRef='.$cellRef.' in current worksheet<br />';
-							$this->_writeDebug('Evaluating Cell Range '.$cellRef.' in current worksheet');
-							if ($pCellParent !== NULL) {
-								$cellValue = $this->extractCellRange($cellRef, $pCellParent, false);
-							} else {
-								return $this->_raiseFormulaError('Unable to access Cell Reference');
-							}
-							$this->_writeDebug('Evaluation Result for cells '.$cellRef.' is '.$this->_showTypeDetails($cellValue));
-						}
-					}
-				} else {
-//					echo 'Reference is a single Cell<br />';
-					if ($pCell === NULL) {
-//						We can't access the cell, so return a REF error
-						$cellValue = PHPExcel_Calculation_Functions::REF();
-					} else {
-						$cellRef = $matches[6].$matches[7];
-						if ($matches[2] > '') {
-							$matches[2] = trim($matches[2],"\"'");
-							if ((strpos($matches[2],'[') !== false) || (strpos($matches[2],']') !== false)) {
-								//	It's a Reference to an external workbook (not currently supported)
-								return $this->_raiseFormulaError('Unable to access External Workbook');
-							}
-//							echo '$cellRef='.$cellRef.' in worksheet '.$matches[2].'<br />';
-							$this->_writeDebug('Evaluating Cell '.$cellRef.' in worksheet '.$matches[2]);
-							if ($pCellParent !== NULL) {
-								if ($pCellParent->getParent()->getSheetByName($matches[2])->cellExists($cellRef)) {
-									$cellValue = $this->extractCellRange($cellRef, $pCellParent->getParent()->getSheetByName($matches[2]), false);
-									$pCell->attach($pCellParent);
-								} else {
-									$cellValue = null;
-								}
-							} else {
-								return $this->_raiseFormulaError('Unable to access Cell Reference');
-							}
-							$this->_writeDebug('Evaluation Result for cell '.$cellRef.' in worksheet '.$matches[2].' is '.$this->_showTypeDetails($cellValue));
-//							$cellRef = $matches[2].'!'.$cellRef;
-						} else {
-//							echo '$cellRef='.$cellRef.' in current worksheet<br />';
-							$this->_writeDebug('Evaluating Cell '.$cellRef.' in current worksheet');
-							if ($pCellParent->cellExists($cellRef)) {
-								$cellValue = $this->extractCellRange($cellRef, $pCellParent, false);
-								$pCell->attach($pCellParent);
-							} else {
-								$cellValue = null;
-							}
-							$this->_writeDebug('Evaluation Result for cell '.$cellRef.' is '.$this->_showTypeDetails($cellValue));
-						}
-					}
-				}
-				$stack->push('Value',$cellValue,$cellRef);
-
-			// if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
-			} elseif (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $token, $matches)) {
-//				echo 'Token is a function<br />';
-				$functionName = $matches[1];
-				$argCount = $stack->pop();
-				$argCount = $argCount['value'];
-				if ($functionName != 'MKMATRIX') {
-					$this->_writeDebug('Evaluating Function '.self::_localeFunc($functionName).'() with '.(($argCount == 0) ? 'no' : $argCount).' argument'.(($argCount == 1) ? '' : 's'));
-				}
-				if ((isset(self::$_PHPExcelFunctions[$functionName])) || (isset(self::$_controlFunctions[$functionName]))) {	// function
-					if (isset(self::$_PHPExcelFunctions[$functionName])) {
-						$functionCall = self::$_PHPExcelFunctions[$functionName]['functionCall'];
-						$passByReference = isset(self::$_PHPExcelFunctions[$functionName]['passByReference']);
-						$passCellReference = isset(self::$_PHPExcelFunctions[$functionName]['passCellReference']);
-					} elseif (isset(self::$_controlFunctions[$functionName])) {
-						$functionCall = self::$_controlFunctions[$functionName]['functionCall'];
-						$passByReference = isset(self::$_controlFunctions[$functionName]['passByReference']);
-						$passCellReference = isset(self::$_controlFunctions[$functionName]['passCellReference']);
-					}
-					// get the arguments for this function
-//					echo 'Function '.$functionName.' expects '.$argCount.' arguments<br />';
-					$args = $argArrayVals = array();
-					for ($i = 0; $i < $argCount; ++$i) {
-						$arg = $stack->pop();
-						$a = $argCount - $i - 1;
-						if (($passByReference) &&
-							(isset(self::$_PHPExcelFunctions[$functionName]['passByReference'][$a])) &&
-							(self::$_PHPExcelFunctions[$functionName]['passByReference'][$a])) {
-							if ($arg['reference'] === NULL) {
-								$args[] = $cellID;
-								if ($functionName != 'MKMATRIX') { $argArrayVals[] = $this->_showValue($cellID); }
-							} else {
-								$args[] = $arg['reference'];
-								if ($functionName != 'MKMATRIX') { $argArrayVals[] = $this->_showValue($arg['reference']); }
-							}
-						} else {
-							$args[] = self::_unwrapResult($arg['value']);
-							if ($functionName != 'MKMATRIX') { $argArrayVals[] = $this->_showValue($arg['value']); }
-						}
-					}
-					//	Reverse the order of the arguments
-					krsort($args);
-					if (($passByReference) && ($argCount == 0)) {
-						$args[] = $cellID;
-						$argArrayVals[] = $this->_showValue($cellID);
-					}
-//					echo 'Arguments are: ';
-//					print_r($args);
-//					echo '<br />';
-					if ($functionName != 'MKMATRIX') {
-						if ($this->writeDebugLog) {
-							krsort($argArrayVals);
-							$this->_writeDebug('Evaluating '. self::_localeFunc($functionName).'( '.implode(self::$_localeArgumentSeparator.' ',PHPExcel_Calculation_Functions::flattenArray($argArrayVals)).' )');
-						}
-					}
-					//	Process each argument in turn, building the return value as an array
-//					if (($argCount == 1) && (is_array($args[1])) && ($functionName != 'MKMATRIX')) {
-//						$operand1 = $args[1];
-//						$this->_writeDebug('Argument is a matrix: '.$this->_showValue($operand1));
-//						$result = array();
-//						$row = 0;
-//						foreach($operand1 as $args) {
-//							if (is_array($args)) {
-//								foreach($args as $arg) {
-//									$this->_writeDebug('Evaluating '.self::_localeFunc($functionName).'( '.$this->_showValue($arg).' )');
-//									$r = call_user_func_array($functionCall,$arg);
-//									$this->_writeDebug('Evaluation Result for '.self::_localeFunc($functionName).'() function call is '.$this->_showTypeDetails($r));
-//									$result[$row][] = $r;
-//								}
-//								++$row;
-//							} else {
-//								$this->_writeDebug('Evaluating '.self::_localeFunc($functionName).'( '.$this->_showValue($args).' )');
-//								$r = call_user_func_array($functionCall,$args);
-//								$this->_writeDebug('Evaluation Result for '.self::_localeFunc($functionName).'() function call is '.$this->_showTypeDetails($r));
-//								$result[] = $r;
-//							}
-//						}
-//					} else {
-					//	Process the argument with the appropriate function call
-						if ($passCellReference) {
-							$args[] = $pCell;
-						}
-						if (strpos($functionCall,'::') !== false) {
-							$result = call_user_func_array(explode('::',$functionCall),$args);
-						} else {
-							foreach($args as &$arg) {
-								$arg = PHPExcel_Calculation_Functions::flattenSingleValue($arg);
-							}
-							unset($arg);
-							$result = call_user_func_array($functionCall,$args);
-						}
-//					}
-					if ($functionName != 'MKMATRIX') {
-						$this->_writeDebug('Evaluation Result for '.self::_localeFunc($functionName).'() function call is '.$this->_showTypeDetails($result));
-					}
-					$stack->push('Value',self::_wrapResult($result));
-				}
-
-			} else {
-				// if the token is a number, boolean, string or an Excel error, push it onto the stack
-				if (isset(self::$_ExcelConstants[strtoupper($token)])) {
-					$excelConstant = strtoupper($token);
-//					echo 'Token is a PHPExcel constant: '.$excelConstant.'<br />';
-					$stack->push('Constant Value',self::$_ExcelConstants[$excelConstant]);
-					$this->_writeDebug('Evaluating Constant '.$excelConstant.' as '.$this->_showTypeDetails(self::$_ExcelConstants[$excelConstant]));
-				} elseif ((is_numeric($token)) || ($token === NULL) || (is_bool($token)) || ($token == '') || ($token{0} == '"') || ($token{0} == '#')) {
-//					echo 'Token is a number, boolean, string, null or an Excel error<br />';
-					$stack->push('Value',$token);
-				// if the token is a named range, push the named range name onto the stack
-				} elseif (preg_match('/^'.self::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $token, $matches)) {
-//					echo 'Token is a named range<br />';
-					$namedRange = $matches[6];
-//					echo 'Named Range is '.$namedRange.'<br />';
-					$this->_writeDebug('Evaluating Named Range '.$namedRange);
-					$cellValue = $this->extractNamedRange($namedRange, ((null !== $pCell) ? $pCellParent : null), false);
-					$pCell->attach($pCellParent);
-					$this->_writeDebug('Evaluation Result for named range '.$namedRange.' is '.$this->_showTypeDetails($cellValue));
-					$stack->push('Named Range',$cellValue,$namedRange);
-				} else {
-					return $this->_raiseFormulaError("undefined variable '$token'");
-				}
-			}
-		}
-		// when we're out of tokens, the stack should have a single element, the final result
-		if ($stack->count() != 1) return $this->_raiseFormulaError("internal error");
-		$output = $stack->pop();
-		$output = $output['value'];
-
-//		if ((is_array($output)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) {
-//			return array_shift(PHPExcel_Calculation_Functions::flattenArray($output));
-//		}
-		return $output;
-	}	//	function _processTokenStack()
-
-
-	private function _validateBinaryOperand($cellID,&$operand,&$stack) {
-		//	Numbers, matrices and booleans can pass straight through, as they're already valid
-		if (is_string($operand)) {
-			//	We only need special validations for the operand if it is a string
-			//	Start by stripping off the quotation marks we use to identify true excel string values internally
-			if ($operand > '' && $operand{0} == '"') { $operand = self::_unwrapResult($operand); }
-			//	If the string is a numeric value, we treat it as a numeric, so no further testing
-			if (!is_numeric($operand)) {
-				//	If not a numeric, test to see if the value is an Excel error, and so can't be used in normal binary operations
-				if ($operand > '' && $operand{0} == '#') {
-					$stack->push('Value', $operand);
-					$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($operand));
-					return false;
-				} elseif (!PHPExcel_Shared_String::convertToNumberIfFraction($operand)) {
-					//	If not a numeric or a fraction, then it's a text string, and so can't be used in mathematical binary operations
-					$stack->push('Value', '#VALUE!');
-					$this->_writeDebug('Evaluation Result is a '.$this->_showTypeDetails('#VALUE!'));
-					return false;
-				}
-			}
-		}
-
-		//	return a true if the value of the operand is one that we can use in normal binary operations
-		return true;
-	}	//	function _validateBinaryOperand()
-
-
-	private function _executeBinaryComparisonOperation($cellID,$operand1,$operand2,$operation,&$stack,$recursingArrays=false) {
-		//	If we're dealing with matrix operations, we want a matrix result
-		if ((is_array($operand1)) || (is_array($operand2))) {
-			$result = array();
-			if ((is_array($operand1)) && (!is_array($operand2))) {
-				foreach($operand1 as $x => $operandData) {
-					$this->_writeDebug('Evaluating Comparison '.$this->_showValue($operandData).' '.$operation.' '.$this->_showValue($operand2));
-					$this->_executeBinaryComparisonOperation($cellID,$operandData,$operand2,$operation,$stack);
-					$r = $stack->pop();
-					$result[$x] = $r['value'];
-				}
-			} elseif ((!is_array($operand1)) && (is_array($operand2))) {
-				foreach($operand2 as $x => $operandData) {
-					$this->_writeDebug('Evaluating Comparison '.$this->_showValue($operand1).' '.$operation.' '.$this->_showValue($operandData));
-					$this->_executeBinaryComparisonOperation($cellID,$operand1,$operandData,$operation,$stack);
-					$r = $stack->pop();
-					$result[$x] = $r['value'];
-				}
-			} else {
-				if (!$recursingArrays) { self::_checkMatrixOperands($operand1,$operand2,2); }
-				foreach($operand1 as $x => $operandData) {
-					$this->_writeDebug('Evaluating Comparison '.$this->_showValue($operandData).' '.$operation.' '.$this->_showValue($operand2[$x]));
-					$this->_executeBinaryComparisonOperation($cellID,$operandData,$operand2[$x],$operation,$stack,true);
-					$r = $stack->pop();
-					$result[$x] = $r['value'];
-				}
-			}
-			//	Log the result details
-			$this->_writeDebug('Comparison Evaluation Result is '.$this->_showTypeDetails($result));
-			//	And push the result onto the stack
-			$stack->push('Array',$result);
-			return true;
-		}
-
-		//	Simple validate the two operands if they are string values
-		if (is_string($operand1) && $operand1 > '' && $operand1{0} == '"') { $operand1 = self::_unwrapResult($operand1); }
-		if (is_string($operand2) && $operand2 > '' && $operand2{0} == '"') { $operand2 = self::_unwrapResult($operand2); }
-
-		//	execute the necessary operation
-		switch ($operation) {
-			//	Greater than
-			case '>':
-				$result = ($operand1 > $operand2);
-				break;
-			//	Less than
-			case '<':
-				$result = ($operand1 < $operand2);
-				break;
-			//	Equality
-			case '=':
-				$result = ($operand1 == $operand2);
-				break;
-			//	Greater than or equal
-			case '>=':
-				$result = ($operand1 >= $operand2);
-				break;
-			//	Less than or equal
-			case '<=':
-				$result = ($operand1 <= $operand2);
-				break;
-			//	Inequality
-			case '<>':
-				$result = ($operand1 != $operand2);
-				break;
-		}
-
-		//	Log the result details
-		$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($result));
-		//	And push the result onto the stack
-		$stack->push('Value',$result);
-		return true;
-	}	//	function _executeBinaryComparisonOperation()
-
-
-	private function _executeNumericBinaryOperation($cellID,$operand1,$operand2,$operation,$matrixFunction,&$stack) {
-		//	Validate the two operands
-		if (!$this->_validateBinaryOperand($cellID,$operand1,$stack)) return false;
-		if (!$this->_validateBinaryOperand($cellID,$operand2,$stack)) return false;
-
-		$executeMatrixOperation = false;
-		//	If either of the operands is a matrix, we need to treat them both as matrices
-		//		(converting the other operand to a matrix if need be); then perform the required
-		//		matrix operation
-		if ((is_array($operand1)) || (is_array($operand2))) {
-			//	Ensure that both operands are arrays/matrices
-			$executeMatrixOperation = true;
-			$mSize = array();
-			list($mSize[],$mSize[],$mSize[],$mSize[]) = self::_checkMatrixOperands($operand1,$operand2,2);
-
-			//	But if they're both single cell matrices, then we can treat them as simple values
-			if (array_sum($mSize) == 4) {
-				$executeMatrixOperation = false;
-				$operand1 = $operand1[0][0];
-				$operand2 = $operand2[0][0];
-			}
-		}
-
-		if ($executeMatrixOperation) {
-			try {
-				//	Convert operand 1 from a PHP array to a matrix
-				$matrix = new PHPExcel_Shared_JAMA_Matrix($operand1);
-				//	Perform the required operation against the operand 1 matrix, passing in operand 2
-				$matrixResult = $matrix->$matrixFunction($operand2);
-				$result = $matrixResult->getArray();
-			} catch (Exception $ex) {
-				$this->_writeDebug('JAMA Matrix Exception: '.$ex->getMessage());
-				$result = '#VALUE!';
-			}
-		} else {
-			if ((PHPExcel_Calculation_Functions::getCompatibilityMode() != PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) &&
-				((is_string($operand1) && !is_numeric($operand1)) || (is_string($operand2) && !is_numeric($operand2)))) {
-				$result = PHPExcel_Calculation_Functions::VALUE();
-			} else {
-				//	If we're dealing with non-matrix operations, execute the necessary operation
-				switch ($operation) {
-					//	Addition
-					case '+':
-						$result = $operand1+$operand2;
-						break;
-					//	Subtraction
-					case '-':
-						$result = $operand1-$operand2;
-						break;
-					//	Multiplication
-					case '*':
-						$result = $operand1*$operand2;
-						break;
-					//	Division
-					case '/':
-						if ($operand2 == 0) {
-							//	Trap for Divide by Zero error
-							$stack->push('Value','#DIV/0!');
-							$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails('#DIV/0!'));
-							return false;
-						} else {
-							$result = $operand1/$operand2;
-						}
-						break;
-					//	Power
-					case '^':
-						$result = pow($operand1,$operand2);
-						break;
-				}
-			}
-		}
-
-		//	Log the result details
-		$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($result));
-		//	And push the result onto the stack
-		$stack->push('Value',$result);
-		return true;
-	}	//	function _executeNumericBinaryOperation()
-
-
-	private function _writeDebug($message) {
-		//	Only write the debug log if logging is enabled
-		if ($this->writeDebugLog) {
-			if ($this->echoDebugLog) {
-				echo implode(' -> ',$this->debugLogStack).' -> '.$message,'<br />';
-			}
-			$this->debugLog[] = implode(' -> ',$this->debugLogStack).' -> '.$message;
-		}
-	}	//	function _writeDebug()
-
-
-	// trigger an error, but nicely, if need be
-	protected function _raiseFormulaError($errorMessage) {
-		$this->formulaError = $errorMessage;
-		$this->debugLogStack = array();
-		if (!$this->suppressFormulaErrors) throw new Exception($errorMessage);
-		trigger_error($errorMessage, E_USER_ERROR);
-	}	//	function _raiseFormulaError()
-
-
-	/**
-	 * Extract range values
-	 *
-	 * @param	string				&$pRange		String based range representation
-	 * @param	PHPExcel_Worksheet	$pSheet		Worksheet
-	 * @return  mixed				Array of values in range if range contains more than one element. Otherwise, a single value is returned.
-	 * @throws	Exception
-	 */
-	public function extractCellRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog=true) {
-		// Return value
-		$returnValue = array ();
-
-//		echo 'extractCellRange('.$pRange.')<br />';
-		if ($pSheet !== NULL) {
-//			echo 'Passed sheet name is '.$pSheet->getTitle().'<br />';
-//			echo 'Range reference is '.$pRange.'<br />';
-			if (strpos ($pRange, '!') !== false) {
-//				echo '$pRange reference includes sheet reference<br />';
-				$worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pRange, true);
-				$pSheet = $pSheet->getParent()->getSheetByName($worksheetReference[0]);
-//				echo 'New sheet name is '.$pSheet->getTitle().'<br />';
-				$pRange = $worksheetReference[1];
-//				echo 'Adjusted Range reference is '.$pRange.'<br />';
-			}
-
-			// Extract range
-			$aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
-			$pRange = $pSheet->getTitle().'!'.$pRange;
-			if (!isset($aReferences[1])) {
-				//	Single cell in range
-				list($currentCol,$currentRow) = sscanf($aReferences[0],'%[A-Z]%d');
-				if ($pSheet->cellExists($aReferences[0])) {
-					$returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
-				} else {
-					$returnValue[$currentRow][$currentCol] = null;
-				}
-			} else {
-				// Extract cell data for all cells in the range
-				foreach ($aReferences as $reference) {
-					// Extract range
-					list($currentCol,$currentRow) = sscanf($reference,'%[A-Z]%d');
-
-					if ($pSheet->cellExists($reference)) {
-						$returnValue[$currentRow][$currentCol] = $pSheet->getCell($reference)->getCalculatedValue($resetLog);
-					} else {
-						$returnValue[$currentRow][$currentCol] = null;
-					}
-				}
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function extractCellRange()
-
-
-	/**
-	 * Extract range values
-	 *
-	 * @param	string				&$pRange	String based range representation
-	 * @param	PHPExcel_Worksheet	$pSheet		Worksheet
-	 * @return  mixed				Array of values in range if range contains more than one element. Otherwise, a single value is returned.
-	 * @throws	Exception
-	 */
-	public function extractNamedRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog=true) {
-		// Return value
-		$returnValue = array ();
-
-//		echo 'extractNamedRange('.$pRange.')<br />';
-		if ($pSheet !== NULL) {
-//			echo 'Current sheet name is '.$pSheet->getTitle().'<br />';
-//			echo 'Range reference is '.$pRange.'<br />';
-			if (strpos ($pRange, '!') !== false) {
-//				echo '$pRange reference includes sheet reference<br />';
-				$worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pRange, true);
-				$pSheet = $pSheet->getParent()->getSheetByName($worksheetReference[0]);
-//				echo 'New sheet name is '.$pSheet->getTitle().'<br />';
-				$pRange = $worksheetReference[1];
-//				echo 'Adjusted Range reference is '.$pRange.'<br />';
-			}
-
-			// Named range?
-			$namedRange = PHPExcel_NamedRange::resolveRange($pRange, $pSheet);
-			if ($namedRange !== NULL) {
-				$pSheet = $namedRange->getWorksheet();
-//				echo 'Named Range '.$pRange.' (';
-				$pRange = $namedRange->getRange();
-				$splitRange = PHPExcel_Cell::splitRange($pRange);
-				//	Convert row and column references
-				if (ctype_alpha($splitRange[0][0])) {
-					$pRange = $splitRange[0][0] . '1:' . $splitRange[0][1] . $namedRange->getWorksheet()->getHighestRow();
-				} elseif(ctype_digit($splitRange[0][0])) {
-					$pRange = 'A' . $splitRange[0][0] . ':' . $namedRange->getWorksheet()->getHighestColumn() . $splitRange[0][1];
-				}
-//				echo $pRange.') is in sheet '.$namedRange->getWorksheet()->getTitle().'<br />';
-
-//				if ($pSheet->getTitle() != $namedRange->getWorksheet()->getTitle()) {
-//					if (!$namedRange->getLocalOnly()) {
-//						$pSheet = $namedRange->getWorksheet();
-//					} else {
-//						return $returnValue;
-//					}
-//				}
-			} else {
-				return PHPExcel_Calculation_Functions::REF();
-			}
-
-			// Extract range
-			$aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
-//			var_dump($aReferences);
-			if (!isset($aReferences[1])) {
-				//	Single cell (or single column or row) in range
-				list($currentCol,$currentRow) = PHPExcel_Cell::coordinateFromString($aReferences[0]);
-				if ($pSheet->cellExists($aReferences[0])) {
-					$returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
-				} else {
-					$returnValue[$currentRow][$currentCol] = null;
-				}
-			} else {
-				// Extract cell data for all cells in the range
-				foreach ($aReferences as $reference) {
-					// Extract range
-					list($currentCol,$currentRow) = PHPExcel_Cell::coordinateFromString($reference);
-//					echo 'NAMED RANGE: $currentCol='.$currentCol.' $currentRow='.$currentRow.'<br />';
-					if ($pSheet->cellExists($reference)) {
-						$returnValue[$currentRow][$currentCol] = $pSheet->getCell($reference)->getCalculatedValue($resetLog);
-					} else {
-						$returnValue[$currentRow][$currentCol] = null;
-					}
-				}
-			}
-//				print_r($returnValue);
-//			echo '<br />';
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function extractNamedRange()
-
-
-	/**
-	 * Is a specific function implemented?
-	 *
-	 * @param	string	$pFunction	Function Name
-	 * @return	boolean
-	 */
-	public function isImplemented($pFunction = '') {
-		$pFunction = strtoupper ($pFunction);
-		if (isset(self::$_PHPExcelFunctions[$pFunction])) {
-			return (self::$_PHPExcelFunctions[$pFunction]['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY');
-		} else {
-			return false;
-		}
-	}	//	function isImplemented()
-
-
-	/**
-	 * Get a list of all implemented functions as an array of function objects
-	 *
-	 * @return	array of PHPExcel_Calculation_Function
-	 */
-	public function listFunctions() {
-		// Return value
-		$returnValue = array();
-		// Loop functions
-		foreach(self::$_PHPExcelFunctions as $functionName => $function) {
-			if ($function['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY') {
-				$returnValue[$functionName] = new PHPExcel_Calculation_Function($function['category'],
-																				$functionName,
-																				$function['functionCall']
-																			   );
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function listFunctions()
-
-
-	/**
-	 * Get a list of all Excel function names
-	 *
-	 * @return	array
-	 */
-	public function listAllFunctionNames() {
-		return array_keys(self::$_PHPExcelFunctions);
-	}	//	function listAllFunctionNames()
-
-	/**
-	 * Get a list of implemented Excel function names
-	 *
-	 * @return	array
-	 */
-	public function listFunctionNames() {
-		// Return value
-		$returnValue = array();
-		// Loop functions
-		foreach(self::$_PHPExcelFunctions as $functionName => $function) {
-			if ($function['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY') {
-				$returnValue[] = $functionName;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function listFunctionNames()
-
-}	//	class PHPExcel_Calculation
-
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/Database.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/Database.php
deleted file mode 100755
index 02f27006e..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/Database.php
+++ /dev/null
@@ -1,725 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_Database
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Database {
-
-
-	/**
-	 * __fieldExtract
-	 *
-	 * Extracts the column ID to use for the data field.
-	 *
-	 * @access	private
-	 * @param	mixed[]		$database		The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	mixed		$field			Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @return	string|NULL
-	 *
-	 */
-	private static function __fieldExtract($database,$field) {
-		$field = strtoupper(PHPExcel_Calculation_Functions::flattenSingleValue($field));
-		$fieldNames = array_map('strtoupper',array_shift($database));
-
-		if (is_numeric($field)) {
-			$keys = array_keys($fieldNames);
-			return $keys[$field-1];
-		}
-		$key = array_search($field,$fieldNames);
-		return ($key) ? $key : NULL;
-	}
-
-	/**
-	 * __filter
-	 *
-	 * Parses the selection criteria, extracts the database rows that match those criteria, and
-	 * returns that subset of rows.
-	 *
-	 * @access	private
-	 * @param	mixed[]		$database		The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	mixed[]		$criteria		The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	array of mixed
-	 *
-	 */
-	private static function __filter($database,$criteria) {
-		$fieldNames = array_shift($database);
-		$criteriaNames = array_shift($criteria);
-
-		//	Convert the criteria into a set of AND/OR conditions with [:placeholders]
-		$testConditions = $testValues = array();
-		$testConditionsCount = 0;
-		foreach($criteriaNames as $key => $criteriaName) {
-			$testCondition = array();
-			$testConditionCount = 0;
-			foreach($criteria as $row => $criterion) {
-				if ($criterion[$key] > '') {
-					$testCondition[] = '[:'.$criteriaName.']'.PHPExcel_Calculation_Functions::_ifCondition($criterion[$key]);
-					$testConditionCount++;
-				}
-			}
-			if ($testConditionCount > 1) {
-				$testConditions[] = 'OR('.implode(',',$testCondition).')';
-				$testConditionsCount++;
-			} elseif($testConditionCount == 1) {
-				$testConditions[] = $testCondition[0];
-				$testConditionsCount++;
-			}
-		}
-
-		if ($testConditionsCount > 1) {
-			$testConditionSet = 'AND('.implode(',',$testConditions).')';
-		} elseif($testConditionsCount == 1) {
-			$testConditionSet = $testConditions[0];
-		}
-
-		//	Loop through each row of the database
-		foreach($database as $dataRow => $dataValues) {
-			//	Substitute actual values from the database row for our [:placeholders]
-			$testConditionList = $testConditionSet;
-			foreach($criteriaNames as $key => $criteriaName) {
-				$k = array_search($criteriaName,$fieldNames);
-				if (isset($dataValues[$k])) {
-					$dataValue = $dataValues[$k];
-					$dataValue = (is_string($dataValue)) ? PHPExcel_Calculation::_wrapResult(strtoupper($dataValue)) : $dataValue;
-					$testConditionList = str_replace('[:'.$criteriaName.']',$dataValue,$testConditionList);
-				}
-			}
-			//	evaluate the criteria against the row data
-			$result = PHPExcel_Calculation::getInstance()->_calculateFormulaValue('='.$testConditionList);
-			//	If the row failed to meet the criteria, remove it from the database
-			if (!$result) {
-				unset($database[$dataRow]);
-			}
-		}
-
-		return $database;
-	}
-
-
-	/**
-	 * DAVERAGE
-	 *
-	 * Averages the values in a column of a list or database that match conditions you specify.
-	 *
-	 * Excel Function:
-	 *		DAVERAGE(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DAVERAGE($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::AVERAGE($colData);
-	}	//	function DAVERAGE()
-
-
-	/**
-	 * DCOUNT
-	 *
-	 * Counts the cells that contain numbers in a column of a list or database that match conditions
-	 * that you specify.
-	 *
-	 * Excel Function:
-	 *		DCOUNT(database,[field],criteria)
-	 *
-	 * Excel Function:
-	 *		DAVERAGE(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	integer
-	 *
-	 * @TODO	The field argument is optional. If field is omitted, DCOUNT counts all records in the
-	 *			database that match the criteria.
-	 *
-	 */
-	public static function DCOUNT($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::COUNT($colData);
-	}	//	function DCOUNT()
-
-
-	/**
-	 * DCOUNTA
-	 *
-	 * Counts the nonblank cells in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DCOUNTA(database,[field],criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	integer
-	 *
-	 * @TODO	The field argument is optional. If field is omitted, DCOUNTA counts all records in the
-	 *			database that match the criteria.
-	 *
-	 */
-	public static function DCOUNTA($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::COUNTA($colData);
-	}	//	function DCOUNTA()
-
-
-	/**
-	 * DGET
-	 *
-	 * Extracts a single value from a column of a list or database that matches conditions that you
-	 * specify.
-	 *
-	 * Excel Function:
-	 *		DGET(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	mixed
-	 *
-	 */
-	public static function DGET($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		if (count($colData) > 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return $colData[0];
-	}	//	function DGET()
-
-
-	/**
-	 * DMAX
-	 *
-	 * Returns the largest number in a column of a list or database that matches conditions you that
-	 * specify.
-	 *
-	 * Excel Function:
-	 *		DMAX(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DMAX($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::MAX($colData);
-	}	//	function DMAX()
-
-
-	/**
-	 * DMIN
-	 *
-	 * Returns the smallest number in a column of a list or database that matches conditions you that
-	 * specify.
-	 *
-	 * Excel Function:
-	 *		DMIN(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DMIN($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::MIN($colData);
-	}	//	function DMIN()
-
-
-	/**
-	 * DPRODUCT
-	 *
-	 * Multiplies the values in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DPRODUCT(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DPRODUCT($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_MathTrig::PRODUCT($colData);
-	}	//	function DPRODUCT()
-
-
-	/**
-	 * DSTDEV
-	 *
-	 * Estimates the standard deviation of a population based on a sample by using the numbers in a
-	 * column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DSTDEV(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DSTDEV($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::STDEV($colData);
-	}	//	function DSTDEV()
-
-
-	/**
-	 * DSTDEVP
-	 *
-	 * Calculates the standard deviation of a population based on the entire population by using the
-	 * numbers in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DSTDEVP(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DSTDEVP($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::STDEVP($colData);
-	}	//	function DSTDEVP()
-
-
-	/**
-	 * DSUM
-	 *
-	 * Adds the numbers in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DSUM(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DSUM($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_MathTrig::SUM($colData);
-	}	//	function DSUM()
-
-
-	/**
-	 * DVAR
-	 *
-	 * Estimates the variance of a population based on a sample by using the numbers in a column
-	 * of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DVAR(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DVAR($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::VARFunc($colData);
-	}	//	function DVAR()
-
-
-	/**
-	 * DVARP
-	 *
-	 * Calculates the variance of a population based on the entire population by using the numbers
-	 * in a column of a list or database that match conditions that you specify.
-	 *
-	 * Excel Function:
-	 *		DVARP(database,field,criteria)
-	 *
-	 * @access	public
-	 * @category Database Functions
-	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
-	 *										A database is a list of related data in which rows of related
-	 *										information are records, and columns of data are fields. The
-	 *										first row of the list contains labels for each column.
-	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
-	 *										column label enclosed between double quotation marks, such as
-	 *										"Age" or "Yield," or a number (without quotation marks) that
-	 *										represents the position of the column within the list: 1 for
-	 *										the first column, 2 for the second column, and so on.
-	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
-	 *										You can use any range for the criteria argument, as long as it
-	 *										includes at least one column label and at least one cell below
-	 *										the column label in which you specify a condition for the
-	 *										column.
-	 * @return	float
-	 *
-	 */
-	public static function DVARP($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
-		if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
-		}
-
-		// Return
-		return PHPExcel_Calculation_Statistical::VARP($colData);
-	}	//	function DVARP()
-
-
-}	//	class PHPExcel_Calculation_Database
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/DateTime.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/DateTime.php
deleted file mode 100755
index ebc9359d0..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/DateTime.php
+++ /dev/null
@@ -1,1447 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_DateTime
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_DateTime {
-
-	/**
-	 * Identify if a year is a leap year or not
-	 *
-	 * @param	integer	$year	The year to test
-	 * @return	boolean			TRUE if the year is a leap year, otherwise FALSE
-	 */
-	public static function _isLeapYear($year) {
-		return ((($year % 4) == 0) && (($year % 100) != 0) || (($year % 400) == 0));
-	}	//	function _isLeapYear()
-
-
-	private static function _dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, $methodUS) {
-		if ($startDay == 31) {
-			--$startDay;
-		} elseif ($methodUS && ($startMonth == 2 && ($startDay == 29 || ($startDay == 28 && !self::_isLeapYear($startYear))))) {
-			$startDay = 30;
-		}
-		if ($endDay == 31) {
-			if ($methodUS && $startDay != 30) {
-				$endDay = 1;
-				if ($endMonth == 12) {
-					++$endYear;
-					$endMonth = 1;
-				} else {
-					++$endMonth;
-				}
-			} else {
-				$endDay = 30;
-			}
-		}
-
-		return $endDay + $endMonth * 30 + $endYear * 360 - $startDay - $startMonth * 30 - $startYear * 360;
-	}	//	function _dateDiff360()
-
-
-	/**
-	 * _getDateValue
-	 *
-	 * @param	string	$dateValue
-	 * @return	mixed	Excel date/time serial value, or string if error
-	 */
-	public static function _getDateValue($dateValue) {
-		if (!is_numeric($dateValue)) {
-			if ((is_string($dateValue)) &&
-				(PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-			if ((is_object($dateValue)) && ($dateValue instanceof PHPExcel_Shared_Date::$dateTimeObjectType)) {
-				$dateValue = PHPExcel_Shared_Date::PHPToExcel($dateValue);
-			} else {
-				$saveReturnDateType = PHPExcel_Calculation_Functions::getReturnDateType();
-				PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
-				$dateValue = self::DATEVALUE($dateValue);
-				PHPExcel_Calculation_Functions::setReturnDateType($saveReturnDateType);
-			}
-		}
-		return $dateValue;
-	}	//	function _getDateValue()
-
-
-	/**
-	 * _getTimeValue
-	 *
-	 * @param	string	$timeValue
-	 * @return	mixed	Excel date/time serial value, or string if error
-	 */
-	private static function _getTimeValue($timeValue) {
-		$saveReturnDateType = PHPExcel_Calculation_Functions::getReturnDateType();
-		PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
-		$timeValue = self::TIMEVALUE($timeValue);
-		PHPExcel_Calculation_Functions::setReturnDateType($saveReturnDateType);
-		return $timeValue;
-	}	//	function _getTimeValue()
-
-
-	private static function _adjustDateByMonths($dateValue = 0, $adjustmentMonths = 0) {
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-		$oMonth = (int) $PHPDateObject->format('m');
-		$oYear = (int) $PHPDateObject->format('Y');
-
-		$adjustmentMonthsString = (string) $adjustmentMonths;
-		if ($adjustmentMonths > 0) {
-			$adjustmentMonthsString = '+'.$adjustmentMonths;
-		}
-		if ($adjustmentMonths != 0) {
-			$PHPDateObject->modify($adjustmentMonthsString.' months');
-		}
-		$nMonth = (int) $PHPDateObject->format('m');
-		$nYear = (int) $PHPDateObject->format('Y');
-
-		$monthDiff = ($nMonth - $oMonth) + (($nYear - $oYear) * 12);
-		if ($monthDiff != $adjustmentMonths) {
-			$adjustDays = (int) $PHPDateObject->format('d');
-			$adjustDaysString = '-'.$adjustDays.' days';
-			$PHPDateObject->modify($adjustDaysString);
-		}
-		return $PHPDateObject;
-	}	//	function _adjustDateByMonths()
-
-
-	/**
-	 * DATETIMENOW
-	 *
-	 * Returns the current date and time.
-	 * The NOW function is useful when you need to display the current date and time on a worksheet or
-	 * calculate a value based on the current date and time, and have that value updated each time you
-	 * open the worksheet.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-	 * and time format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		NOW()
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function DATETIMENOW() {
-		$saveTimeZone = date_default_timezone_get();
-		date_default_timezone_set('UTC');
-		$retValue = False;
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					$retValue = (float) PHPExcel_Shared_Date::PHPToExcel(time());
-					break;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					$retValue = (integer) time();
-					break;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					$retValue = new DateTime();
-					break;
-		}
-		date_default_timezone_set($saveTimeZone);
-
-		return $retValue;
-	}	//	function DATETIMENOW()
-
-
-	/**
-	 * DATENOW
-	 *
-	 * Returns the current date.
-	 * The NOW function is useful when you need to display the current date and time on a worksheet or
-	 * calculate a value based on the current date and time, and have that value updated each time you
-	 * open the worksheet.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-	 * and time format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		TODAY()
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function DATENOW() {
-		$saveTimeZone = date_default_timezone_get();
-		date_default_timezone_set('UTC');
-		$retValue = False;
-		$excelDateTime = floor(PHPExcel_Shared_Date::PHPToExcel(time()));
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					$retValue = (float) $excelDateTime;
-					break;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					$retValue = (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateTime);
-					break;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					$retValue = PHPExcel_Shared_Date::ExcelToPHPObject($excelDateTime);
-					break;
-		}
-		date_default_timezone_set($saveTimeZone);
-
-		return $retValue;
-	}	//	function DATENOW()
-
-
-	/**
-	 * DATE
-	 *
-	 * The DATE function returns a value that represents a particular date.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		DATE(year,month,day)
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	integer		$year	The value of the year argument can include one to four digits.
-	 *								Excel interprets the year argument according to the configured
-	 *								date system: 1900 or 1904.
-	 *								If year is between 0 (zero) and 1899 (inclusive), Excel adds that
-	 *								value to 1900 to calculate the year. For example, DATE(108,1,2)
-	 *								returns January 2, 2008 (1900+108).
-	 *								If year is between 1900 and 9999 (inclusive), Excel uses that
-	 *								value as the year. For example, DATE(2008,1,2) returns January 2,
-	 *								2008.
-	 *								If year is less than 0 or is 10000 or greater, Excel returns the
-	 *								#NUM! error value.
-	 * @param	integer		$month	A positive or negative integer representing the month of the year
-	 *								from 1 to 12 (January to December).
-	 *								If month is greater than 12, month adds that number of months to
-	 *								the first month in the year specified. For example, DATE(2008,14,2)
-	 *								returns the serial number representing February 2, 2009.
-	 *								If month is less than 1, month subtracts the magnitude of that
-	 *								number of months, plus 1, from the first month in the year
-	 *								specified. For example, DATE(2008,-3,2) returns the serial number
-	 *								representing September 2, 2007.
-	 * @param	integer		$day	A positive or negative integer representing the day of the month
-	 *								from 1 to 31.
-	 *								If day is greater than the number of days in the month specified,
-	 *								day adds that number of days to the first day in the month. For
-	 *								example, DATE(2008,1,35) returns the serial number representing
-	 *								February 4, 2008.
-	 *								If day is less than 1, day subtracts the magnitude that number of
-	 *								days, plus one, from the first day of the month specified. For
-	 *								example, DATE(2008,1,-15) returns the serial number representing
-	 *								December 16, 2007.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function DATE($year = 0, $month = 1, $day = 1) {
-		$year	= PHPExcel_Calculation_Functions::flattenSingleValue($year);
-		$month	= PHPExcel_Calculation_Functions::flattenSingleValue($month);
-		$day	= PHPExcel_Calculation_Functions::flattenSingleValue($day);
-
-		$year	= ($year !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($year) : 0;
-		$month	= ($month !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($month) : 0;
-		$day	= ($day !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($day) : 0;
-		if ((!is_numeric($year)) ||
-			(!is_numeric($month)) ||
-			(!is_numeric($day))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$year	= (integer) $year;
-		$month	= (integer) $month;
-		$day	= (integer) $day;
-
-		$baseYear = PHPExcel_Shared_Date::getExcelCalendar();
-		// Validate parameters
-		if ($year < ($baseYear-1900)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ((($baseYear-1900) != 0) && ($year < $baseYear) && ($year >= 1900)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		if (($year < $baseYear) && ($year >= ($baseYear-1900))) {
-			$year += 1900;
-		}
-
-		if ($month < 1) {
-			//	Handle year/month adjustment if month < 1
-			--$month;
-			$year += ceil($month / 12) - 1;
-			$month = 13 - abs($month % 12);
-		} elseif ($month > 12) {
-			//	Handle year/month adjustment if month > 12
-			$year += floor($month / 12);
-			$month = ($month % 12);
-		}
-
-		// Re-validate the year parameter after adjustments
-		if (($year < $baseYear) || ($year >= 10000)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year, $month, $day);
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					return (float) $excelDateValue;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					return (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateValue);
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					return PHPExcel_Shared_Date::ExcelToPHPObject($excelDateValue);
-		}
-	}	//	function DATE()
-
-
-	/**
-	 * TIME
-	 *
-	 * The TIME function returns a value that represents a particular time.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
-	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		TIME(hour,minute,second)
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	integer		$hour		A number from 0 (zero) to 32767 representing the hour.
-	 *									Any value greater than 23 will be divided by 24 and the remainder
-	 *									will be treated as the hour value. For example, TIME(27,0,0) =
-	 *									TIME(3,0,0) = .125 or 3:00 AM.
-	 * @param	integer		$minute		A number from 0 to 32767 representing the minute.
-	 *									Any value greater than 59 will be converted to hours and minutes.
-	 *									For example, TIME(0,750,0) = TIME(12,30,0) = .520833 or 12:30 PM.
-	 * @param	integer		$second		A number from 0 to 32767 representing the second.
-	 *									Any value greater than 59 will be converted to hours, minutes,
-	 *									and seconds. For example, TIME(0,0,2000) = TIME(0,33,22) = .023148
-	 *									or 12:33:20 AM
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function TIME($hour = 0, $minute = 0, $second = 0) {
-		$hour	= PHPExcel_Calculation_Functions::flattenSingleValue($hour);
-		$minute	= PHPExcel_Calculation_Functions::flattenSingleValue($minute);
-		$second	= PHPExcel_Calculation_Functions::flattenSingleValue($second);
-
-		if ($hour == '') { $hour = 0; }
-		if ($minute == '') { $minute = 0; }
-		if ($second == '') { $second = 0; }
-
-		if ((!is_numeric($hour)) || (!is_numeric($minute)) || (!is_numeric($second))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$hour	= (integer) $hour;
-		$minute	= (integer) $minute;
-		$second	= (integer) $second;
-
-		if ($second < 0) {
-			$minute += floor($second / 60);
-			$second = 60 - abs($second % 60);
-			if ($second == 60) { $second = 0; }
-		} elseif ($second >= 60) {
-			$minute += floor($second / 60);
-			$second = $second % 60;
-		}
-		if ($minute < 0) {
-			$hour += floor($minute / 60);
-			$minute = 60 - abs($minute % 60);
-			if ($minute == 60) { $minute = 0; }
-		} elseif ($minute >= 60) {
-			$hour += floor($minute / 60);
-			$minute = $minute % 60;
-		}
-
-		if ($hour > 23) {
-			$hour = $hour % 24;
-		} elseif ($hour < 0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					$date = 0;
-					$calendar = PHPExcel_Shared_Date::getExcelCalendar();
-					if ($calendar != PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900) {
-						$date = 1;
-					}
-					return (float) PHPExcel_Shared_Date::FormattedPHPToExcel($calendar, 1, $date, $hour, $minute, $second);
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::FormattedPHPToExcel(1970, 1, 1, $hour, $minute, $second));	// -2147468400; //	-2147472000 + 3600
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					$dayAdjust = 0;
-					if ($hour < 0) {
-						$dayAdjust = floor($hour / 24);
-						$hour = 24 - abs($hour % 24);
-						if ($hour == 24) { $hour = 0; }
-					} elseif ($hour >= 24) {
-						$dayAdjust = floor($hour / 24);
-						$hour = $hour % 24;
-					}
-					$phpDateObject = new DateTime('1900-01-01 '.$hour.':'.$minute.':'.$second);
-					if ($dayAdjust != 0) {
-						$phpDateObject->modify($dayAdjust.' days');
-					}
-					return $phpDateObject;
-		}
-	}	//	function TIME()
-
-
-	/**
-	 * DATEVALUE
-	 *
-	 * Returns a value that represents a particular date.
-	 * Use DATEVALUE to convert a date represented by a text string to an Excel or PHP date/time stamp
-	 * value.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
-	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		DATEVALUE(dateValue)
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	string	$dateValue		Text that represents a date in a Microsoft Excel date format.
-	 *									For example, "1/30/2008" or "30-Jan-2008" are text strings within
-	 *									quotation marks that represent dates. Using the default date
-	 *									system in Excel for Windows, date_text must represent a date from
-	 *									January 1, 1900, to December 31, 9999. Using the default date
-	 *									system in Excel for the Macintosh, date_text must represent a date
-	 *									from January 1, 1904, to December 31, 9999. DATEVALUE returns the
-	 *									#VALUE! error value if date_text is out of this range.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function DATEVALUE($dateValue = 1) {
-		$dateValue = trim(PHPExcel_Calculation_Functions::flattenSingleValue($dateValue),'"');
-		//	Strip any ordinals because they're allowed in Excel (English only)
-		$dateValue = preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui','$1$3',$dateValue);
-		//	Convert separators (/ . or space) to hyphens (should also handle dot used for ordinals in some countries, e.g. Denmark, Germany)
-		$dateValue	= str_replace(array('/','.','-','  '),array(' ',' ',' ',' '),$dateValue);
-
-		$yearFound = false;
-		$t1 = explode(' ',$dateValue);
-		foreach($t1 as &$t) {
-			if ((is_numeric($t)) && ($t > 31)) {
-				if ($yearFound) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				} else {
-					if ($t < 100) { $t += 1900; }
-					$yearFound = true;
-				}
-			}
-		}
-		if ((count($t1) == 1) && (strpos($t,':') != false)) {
-			//	We've been fed a time value without any date
-			return 0.0;
-		} elseif (count($t1) == 2) {
-			//	We only have two parts of the date: either day/month or month/year
-			if ($yearFound) {
-				array_unshift($t1,1);
-			} else {
-				array_push($t1,date('Y'));
-			}
-		}
-		unset($t);
-		$dateValue = implode(' ',$t1);
-
-		$PHPDateArray = date_parse($dateValue);
-		if (($PHPDateArray === False) || ($PHPDateArray['error_count'] > 0)) {
-			$testVal1 = strtok($dateValue,'- ');
-			if ($testVal1 !== False) {
-				$testVal2 = strtok('- ');
-				if ($testVal2 !== False) {
-					$testVal3 = strtok('- ');
-					if ($testVal3 === False) {
-						$testVal3 = strftime('%Y');
-					}
-				} else {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-			$PHPDateArray = date_parse($testVal1.'-'.$testVal2.'-'.$testVal3);
-			if (($PHPDateArray === False) || ($PHPDateArray['error_count'] > 0)) {
-				$PHPDateArray = date_parse($testVal2.'-'.$testVal1.'-'.$testVal3);
-				if (($PHPDateArray === False) || ($PHPDateArray['error_count'] > 0)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			}
-		}
-
-		if (($PHPDateArray !== False) && ($PHPDateArray['error_count'] == 0)) {
-			// Execute function
-			if ($PHPDateArray['year'] == '')	{ $PHPDateArray['year'] = strftime('%Y'); }
-			if ($PHPDateArray['year'] < 1900)
-				return PHPExcel_Calculation_Functions::VALUE();
-			if ($PHPDateArray['month'] == '')	{ $PHPDateArray['month'] = strftime('%m'); }
-			if ($PHPDateArray['day'] == '')		{ $PHPDateArray['day'] = strftime('%d'); }
-			$excelDateValue = floor(PHPExcel_Shared_Date::FormattedPHPToExcel($PHPDateArray['year'],$PHPDateArray['month'],$PHPDateArray['day'],$PHPDateArray['hour'],$PHPDateArray['minute'],$PHPDateArray['second']));
-
-			switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-				case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-						return (float) $excelDateValue;
-				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-						return (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateValue);
-				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-						return new DateTime($PHPDateArray['year'].'-'.$PHPDateArray['month'].'-'.$PHPDateArray['day'].' 00:00:00');
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function DATEVALUE()
-
-
-	/**
-	 * TIMEVALUE
-	 *
-	 * Returns a value that represents a particular time.
-	 * Use TIMEVALUE to convert a time represented by a text string to an Excel or PHP date/time stamp
-	 * value.
-	 *
-	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
-	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
-	 *
-	 * Excel Function:
-	 *		TIMEVALUE(timeValue)
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	string	$timeValue		A text string that represents a time in any one of the Microsoft
-	 *									Excel time formats; for example, "6:45 PM" and "18:45" text strings
-	 *									within quotation marks that represent time.
-	 *									Date information in time_text is ignored.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function TIMEVALUE($timeValue) {
-		$timeValue = trim(PHPExcel_Calculation_Functions::flattenSingleValue($timeValue),'"');
-		$timeValue	= str_replace(array('/','.'),array('-','-'),$timeValue);
-
-		$PHPDateArray = date_parse($timeValue);
-		if (($PHPDateArray !== False) && ($PHPDateArray['error_count'] == 0)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel($PHPDateArray['year'],$PHPDateArray['month'],$PHPDateArray['day'],$PHPDateArray['hour'],$PHPDateArray['minute'],$PHPDateArray['second']);
-			} else {
-				$excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel(1900,1,1,$PHPDateArray['hour'],$PHPDateArray['minute'],$PHPDateArray['second']) - 1;
-			}
-
-			switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-				case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-						return (float) $excelDateValue;
-				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-						return (integer) $phpDateValue = PHPExcel_Shared_Date::ExcelToPHP($excelDateValue+25569) - 3600;;
-				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-						return new DateTime('1900-01-01 '.$PHPDateArray['hour'].':'.$PHPDateArray['minute'].':'.$PHPDateArray['second']);
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TIMEVALUE()
-
-
-	/**
-	 * DATEDIF
-	 *
-	 * @param	mixed	$startDate		Excel date serial value, PHP date/time stamp, PHP DateTime object
-	 *									or a standard date string
-	 * @param	mixed	$endDate		Excel date serial value, PHP date/time stamp, PHP DateTime object
-	 *									or a standard date string
-	 * @param	string	$unit
-	 * @return	integer	Interval between the dates
-	 */
-	public static function DATEDIF($startDate = 0, $endDate = 0, $unit = 'D') {
-		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
-		$endDate	= PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
-		$unit		= strtoupper(PHPExcel_Calculation_Functions::flattenSingleValue($unit));
-
-		if (is_string($startDate = self::_getDateValue($startDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($endDate = self::_getDateValue($endDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Validate parameters
-		if ($startDate >= $endDate) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$difference = $endDate - $startDate;
-
-		$PHPStartDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($startDate);
-		$startDays = $PHPStartDateObject->format('j');
-		$startMonths = $PHPStartDateObject->format('n');
-		$startYears = $PHPStartDateObject->format('Y');
-
-		$PHPEndDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($endDate);
-		$endDays = $PHPEndDateObject->format('j');
-		$endMonths = $PHPEndDateObject->format('n');
-		$endYears = $PHPEndDateObject->format('Y');
-
-		$retVal = PHPExcel_Calculation_Functions::NaN();
-		switch ($unit) {
-			case 'D':
-				$retVal = intval($difference);
-				break;
-			case 'M':
-				$retVal = intval($endMonths - $startMonths) + (intval($endYears - $startYears) * 12);
-				//	We're only interested in full months
-				if ($endDays < $startDays) {
-					--$retVal;
-				}
-				break;
-			case 'Y':
-				$retVal = intval($endYears - $startYears);
-				//	We're only interested in full months
-				if ($endMonths < $startMonths) {
-					--$retVal;
-				} elseif (($endMonths == $startMonths) && ($endDays < $startDays)) {
-					--$retVal;
-				}
-				break;
-			case 'MD':
-				if ($endDays < $startDays) {
-					$retVal = $endDays;
-					$PHPEndDateObject->modify('-'.$endDays.' days');
-					$adjustDays = $PHPEndDateObject->format('j');
-					if ($adjustDays > $startDays) {
-						$retVal += ($adjustDays - $startDays);
-					}
-				} else {
-					$retVal = $endDays - $startDays;
-				}
-				break;
-			case 'YM':
-				$retVal = intval($endMonths - $startMonths);
-				if ($retVal < 0) $retVal = 12 + $retVal;
-				//	We're only interested in full months
-				if ($endDays < $startDays) {
-					--$retVal;
-				}
-				break;
-			case 'YD':
-				$retVal = intval($difference);
-				if ($endYears > $startYears) {
-					while ($endYears > $startYears) {
-						$PHPEndDateObject->modify('-1 year');
-						$endYears = $PHPEndDateObject->format('Y');
-					}
-					$retVal = $PHPEndDateObject->format('z') - $PHPStartDateObject->format('z');
-					if ($retVal < 0) { $retVal += 365; }
-				}
-				break;
-			default:
-				$retVal = PHPExcel_Calculation_Functions::NaN();
-		}
-		return $retVal;
-	}	//	function DATEDIF()
-
-
-	/**
-	 * DAYS360
-	 *
-	 * Returns the number of days between two dates based on a 360-day year (twelve 30-day months),
-	 * which is used in some accounting calculations. Use this function to help compute payments if
-	 * your accounting system is based on twelve 30-day months.
-	 *
-	 * Excel Function:
-	 *		DAYS360(startDate,endDate[,method])
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	mixed		$startDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *										PHP DateTime object, or a standard date string
-	 * @param	mixed		$endDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *										PHP DateTime object, or a standard date string
-	 * @param	boolean		$method			US or European Method
-	 *										FALSE or omitted: U.S. (NASD) method. If the starting date is
-	 *										the last day of a month, it becomes equal to the 30th of the
-	 *										same month. If the ending date is the last day of a month and
-	 *										the starting date is earlier than the 30th of a month, the
-	 *										ending date becomes equal to the 1st of the next month;
-	 *										otherwise the ending date becomes equal to the 30th of the
-	 *										same month.
-	 *										TRUE: European method. Starting dates and ending dates that
-	 *										occur on the 31st of a month become equal to the 30th of the
-	 *										same month.
-	 * @return	integer		Number of days between start date and end date
-	 */
-	public static function DAYS360($startDate = 0, $endDate = 0, $method = false) {
-		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
-		$endDate	= PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
-
-		if (is_string($startDate = self::_getDateValue($startDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($endDate = self::_getDateValue($endDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Execute function
-		$PHPStartDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($startDate);
-		$startDay = $PHPStartDateObject->format('j');
-		$startMonth = $PHPStartDateObject->format('n');
-		$startYear = $PHPStartDateObject->format('Y');
-
-		$PHPEndDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($endDate);
-		$endDay = $PHPEndDateObject->format('j');
-		$endMonth = $PHPEndDateObject->format('n');
-		$endYear = $PHPEndDateObject->format('Y');
-
-		return self::_dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, !$method);
-	}	//	function DAYS360()
-
-
-	/**
-	 * YEARFRAC
-	 *
-	 * Calculates the fraction of the year represented by the number of whole days between two dates
-	 * (the start_date and the end_date).
-	 * Use the YEARFRAC worksheet function to identify the proportion of a whole year's benefits or
-	 * obligations to assign to a specific term.
-	 *
-	 * Excel Function:
-	 *		YEARFRAC(startDate,endDate[,method])
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	mixed	$startDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @param	mixed	$endDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @param	integer	$method			Method used for the calculation
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float	fraction of the year
-	 */
-	public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0) {
-		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
-		$endDate	= PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
-		$method		= PHPExcel_Calculation_Functions::flattenSingleValue($method);
-
-		if (is_string($startDate = self::_getDateValue($startDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($endDate = self::_getDateValue($endDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (((is_numeric($method)) && (!is_string($method))) || ($method == '')) {
-			switch($method) {
-				case 0	:
-					return self::DAYS360($startDate,$endDate) / 360;
-				case 1	:
-					$days = self::DATEDIF($startDate,$endDate);
-					$startYear = self::YEAR($startDate);
-					$endYear = self::YEAR($endDate);
-					$years = $endYear - $startYear + 1;
-					$leapDays = 0;
-					if ($years == 1) {
-						if (self::_isLeapYear($endYear)) {
-							$startMonth = self::MONTHOFYEAR($startDate);
-							$endMonth = self::MONTHOFYEAR($endDate);
-							$endDay = self::DAYOFMONTH($endDate);
-							if (($startMonth < 3) ||
-								(($endMonth * 100 + $endDay) >= (2 * 100 + 29))) {
-				     			$leapDays += 1;
-							}
-						}
-					} else {
-						for($year = $startYear; $year <= $endYear; ++$year) {
-							if ($year == $startYear) {
-								$startMonth = self::MONTHOFYEAR($startDate);
-								$startDay = self::DAYOFMONTH($startDate);
-								if ($startMonth < 3) {
-									$leapDays += (self::_isLeapYear($year)) ? 1 : 0;
-								}
-							} elseif($year == $endYear) {
-								$endMonth = self::MONTHOFYEAR($endDate);
-								$endDay = self::DAYOFMONTH($endDate);
-								if (($endMonth * 100 + $endDay) >= (2 * 100 + 29)) {
-									$leapDays += (self::_isLeapYear($year)) ? 1 : 0;
-								}
-							} else {
-								$leapDays += (self::_isLeapYear($year)) ? 1 : 0;
-							}
-						}
-						if ($years == 2) {
-							if (($leapDays == 0) && (self::_isLeapYear($startYear)) && ($days > 365)) {
-								$leapDays = 1;
-							} elseif ($days < 366) {
-								$years = 1;
-							}
-						}
-						$leapDays /= $years;
-					}
-					return $days / (365 + $leapDays);
-				case 2	:
-					return self::DATEDIF($startDate,$endDate) / 360;
-				case 3	:
-					return self::DATEDIF($startDate,$endDate) / 365;
-				case 4	:
-					return self::DAYS360($startDate,$endDate,True) / 360;
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function YEARFRAC()
-
-
-	/**
-	 * NETWORKDAYS
-	 *
-	 * Returns the number of whole working days between start_date and end_date. Working days
-	 * exclude weekends and any dates identified in holidays.
-	 * Use NETWORKDAYS to calculate employee benefits that accrue based on the number of days
-	 * worked during a specific term.
-	 *
-	 * Excel Function:
-	 *		NETWORKDAYS(startDate,endDate[,holidays[,holiday[,...]]])
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	mixed			$startDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *											PHP DateTime object, or a standard date string
-	 * @param	mixed			$endDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *											PHP DateTime object, or a standard date string
-	 * @param	mixed			$holidays,...	Optional series of Excel date serial value (float), PHP date
-	 *											timestamp (integer), PHP DateTime object, or a standard date
-	 *											strings that will be excluded from the working calendar, such
-	 *											as state and federal holidays and floating holidays.
-	 * @return	integer			Interval between the dates
-	 */
-	public static function NETWORKDAYS($startDate,$endDate) {
-		//	Retrieve the mandatory start and end date that are referenced in the function definition
-		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
-		$endDate	= PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
-		//	Flush the mandatory start and end date that are referenced in the function definition, and get the optional days
-		$dateArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		array_shift($dateArgs);
-		array_shift($dateArgs);
-
-		//	Validate the start and end dates
-		if (is_string($startDate = $sDate = self::_getDateValue($startDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$startDate = (float) floor($startDate);
-		if (is_string($endDate = $eDate = self::_getDateValue($endDate))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$endDate = (float) floor($endDate);
-
-		if ($sDate > $eDate) {
-			$startDate = $eDate;
-			$endDate = $sDate;
-		}
-
-		// Execute function
-		$startDoW = 6 - self::DAYOFWEEK($startDate,2);
-		if ($startDoW < 0) { $startDoW = 0; }
-		$endDoW = self::DAYOFWEEK($endDate,2);
-		if ($endDoW >= 6) { $endDoW = 0; }
-
-		$wholeWeekDays = floor(($endDate - $startDate) / 7) * 5;
-		$partWeekDays = $endDoW + $startDoW;
-		if ($partWeekDays > 5) {
-			$partWeekDays -= 5;
-		}
-
-		//	Test any extra holiday parameters
-		$holidayCountedArray = array();
-		foreach ($dateArgs as $holidayDate) {
-			if (is_string($holidayDate = self::_getDateValue($holidayDate))) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-			if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
-				if ((self::DAYOFWEEK($holidayDate,2) < 6) && (!in_array($holidayDate,$holidayCountedArray))) {
-					--$partWeekDays;
-					$holidayCountedArray[] = $holidayDate;
-				}
-			}
-		}
-
-		if ($sDate > $eDate) {
-			return 0 - ($wholeWeekDays + $partWeekDays);
-		}
-		return $wholeWeekDays + $partWeekDays;
-	}	//	function NETWORKDAYS()
-
-
-	/**
-	 * WORKDAY
-	 *
-	 * Returns the date that is the indicated number of working days before or after a date (the
-	 * starting date). Working days exclude weekends and any dates identified as holidays.
-	 * Use WORKDAY to exclude weekends or holidays when you calculate invoice due dates, expected
-	 * delivery times, or the number of days of work performed.
-	 *
-	 * Excel Function:
-	 *		WORKDAY(startDate,endDays[,holidays[,holiday[,...]]])
-	 *
-	 * @access	public
-	 * @category Date/Time Functions
-	 * @param	mixed		$startDate		Excel date serial value (float), PHP date timestamp (integer),
-	 *										PHP DateTime object, or a standard date string
-	 * @param	integer		$endDays		The number of nonweekend and nonholiday days before or after
-	 *										startDate. A positive value for days yields a future date; a
-	 *										negative value yields a past date.
-	 * @param	mixed		$holidays,...	Optional series of Excel date serial value (float), PHP date
-	 *										timestamp (integer), PHP DateTime object, or a standard date
-	 *										strings that will be excluded from the working calendar, such
-	 *										as state and federal holidays and floating holidays.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function WORKDAY($startDate,$endDays) {
-		//	Retrieve the mandatory start date and days that are referenced in the function definition
-		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
-		$endDays	= PHPExcel_Calculation_Functions::flattenSingleValue($endDays);
-		//	Flush the mandatory start date and days that are referenced in the function definition, and get the optional days
-		$dateArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		array_shift($dateArgs);
-		array_shift($dateArgs);
-
-		if ((is_string($startDate = self::_getDateValue($startDate))) || (!is_numeric($endDays))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$startDate = (float) floor($startDate);
-		$endDays = (int) floor($endDays);
-		//	If endDays is 0, we always return startDate
-		if ($endDays == 0) { return $startDate; }
-
-		$decrementing = ($endDays < 0) ? True : False;
-
-		//	Adjust the start date if it falls over a weekend
-
-		$startDoW = self::DAYOFWEEK($startDate,3);
-		if (self::DAYOFWEEK($startDate,3) >= 5) {
-			$startDate += ($decrementing) ? -$startDoW + 4: 7 - $startDoW;
-			($decrementing) ? $endDays++ : $endDays--;
-		}
-
-		//	Add endDays
-		$endDate = (float) $startDate + (intval($endDays / 5) * 7) + ($endDays % 5);
-
-		//	Adjust the calculated end date if it falls over a weekend
-		$endDoW = self::DAYOFWEEK($endDate,3);
-		if ($endDoW >= 5) {
-			$endDate += ($decrementing) ? -$endDoW + 4: 7 - $endDoW;
-		}
-
-		//	Test any extra holiday parameters
-		if (!empty($dateArgs)) {
-			$holidayCountedArray = $holidayDates = array();
-			foreach ($dateArgs as $holidayDate) {
-				if (($holidayDate !== NULL) && (trim($holidayDate) > '')) {
-					if (is_string($holidayDate = self::_getDateValue($holidayDate))) {
-						return PHPExcel_Calculation_Functions::VALUE();
-					}
-					if (self::DAYOFWEEK($holidayDate,3) < 5) {
-						$holidayDates[] = $holidayDate;
-					}
-				}
-			}
-			if ($decrementing) {
-				rsort($holidayDates, SORT_NUMERIC);
-			} else {
-				sort($holidayDates, SORT_NUMERIC);
-			}
-			foreach ($holidayDates as $holidayDate) {
-				if ($decrementing) {
-					if (($holidayDate <= $startDate) && ($holidayDate >= $endDate)) {
-						if (!in_array($holidayDate,$holidayCountedArray)) {
-							--$endDate;
-							$holidayCountedArray[] = $holidayDate;
-						}
-					}
-				} else {
-					if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
-						if (!in_array($holidayDate,$holidayCountedArray)) {
-							++$endDate;
-							$holidayCountedArray[] = $holidayDate;
-						}
-					}
-				}
-				//	Adjust the calculated end date if it falls over a weekend
-				$endDoW = self::DAYOFWEEK($endDate,3);
-				if ($endDoW >= 5) {
-					$endDate += ($decrementing) ? -$endDoW + 4: 7 - $endDoW;
-				}
-
-			}
-		}
-
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					return (float) $endDate;
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					return (integer) PHPExcel_Shared_Date::ExcelToPHP($endDate);
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					return PHPExcel_Shared_Date::ExcelToPHPObject($endDate);
-		}
-	}	//	function WORKDAY()
-
-
-	/**
-	 * DAYOFMONTH
-	 *
-	 * Returns the day of the month, for a specified date. The day is given as an integer
-	 * ranging from 1 to 31.
-	 *
-	 * Excel Function:
-	 *		DAY(dateValue)
-	 *
-	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @return	int		Day of the month
-	 */
-	public static function DAYOFMONTH($dateValue = 1) {
-		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($dateValue == 0.0) {
-			return 0;
-		} elseif ($dateValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-
-		return (int) $PHPDateObject->format('j');
-	}	//	function DAYOFMONTH()
-
-
-	/**
-	 * DAYOFWEEK
-	 *
-	 * Returns the day of the week for a specified date. The day is given as an integer
-	 * ranging from 0 to 7 (dependent on the requested style).
-	 *
-	 * Excel Function:
-	 *		WEEKDAY(dateValue[,style])
-	 *
-	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @param	int		$style			A number that determines the type of return value
-	 *										1 or omitted	Numbers 1 (Sunday) through 7 (Saturday).
-	 *										2				Numbers 1 (Monday) through 7 (Sunday).
-	 *										3				Numbers 0 (Monday) through 6 (Sunday).
-	 * @return	int		Day of the week value
-	 */
-	public static function DAYOFWEEK($dateValue = 1, $style = 1) {
-		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$style		= PHPExcel_Calculation_Functions::flattenSingleValue($style);
-
-		if (!is_numeric($style)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif (($style < 1) || ($style > 3)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$style = floor($style);
-
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($dateValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-		$DoW = $PHPDateObject->format('w');
-
-		$firstDay = 1;
-		switch ($style) {
-			case 1: ++$DoW;
-					break;
-			case 2: if ($DoW == 0) { $DoW = 7; }
-					break;
-			case 3: if ($DoW == 0) { $DoW = 7; }
-					$firstDay = 0;
-					--$DoW;
-					break;
-		}
-		if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL) {
-			//	Test for Excel's 1900 leap year, and introduce the error as required
-			if (($PHPDateObject->format('Y') == 1900) && ($PHPDateObject->format('n') <= 2)) {
-				--$DoW;
-				if ($DoW < $firstDay) {
-					$DoW += 7;
-				}
-			}
-		}
-
-		return (int) $DoW;
-	}	//	function DAYOFWEEK()
-
-
-	/**
-	 * WEEKOFYEAR
-	 *
-	 * Returns the week of the year for a specified date.
-	 * The WEEKNUM function considers the week containing January 1 to be the first week of the year.
-	 * However, there is a European standard that defines the first week as the one with the majority
-	 * of days (four or more) falling in the new year. This means that for years in which there are
-	 * three days or less in the first week of January, the WEEKNUM function returns week numbers
-	 * that are incorrect according to the European standard.
-	 *
-	 * Excel Function:
-	 *		WEEKNUM(dateValue[,style])
-	 *
-	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @param	boolean	$method			Week begins on Sunday or Monday
-	 *										1 or omitted	Week begins on Sunday.
-	 *										2				Week begins on Monday.
-	 * @return	int		Week Number
-	 */
-	public static function WEEKOFYEAR($dateValue = 1, $method = 1) {
-		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$method		= PHPExcel_Calculation_Functions::flattenSingleValue($method);
-
-		if (!is_numeric($method)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif (($method < 1) || ($method > 2)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$method = floor($method);
-
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($dateValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-		$dayOfYear = $PHPDateObject->format('z');
-		$dow = $PHPDateObject->format('w');
-		$PHPDateObject->modify('-'.$dayOfYear.' days');
-		$dow = $PHPDateObject->format('w');
-		$daysInFirstWeek = 7 - (($dow + (2 - $method)) % 7);
-		$dayOfYear -= $daysInFirstWeek;
-		$weekOfYear = ceil($dayOfYear / 7) + 1;
-
-		return (int) $weekOfYear;
-	}	//	function WEEKOFYEAR()
-
-
-	/**
-	 * MONTHOFYEAR
-	 *
-	 * Returns the month of a date represented by a serial number.
-	 * The month is given as an integer, ranging from 1 (January) to 12 (December).
-	 *
-	 * Excel Function:
-	 *		MONTH(dateValue)
-	 *
-	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @return	int		Month of the year
-	 */
-	public static function MONTHOFYEAR($dateValue = 1) {
-		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($dateValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-
-		return (int) $PHPDateObject->format('n');
-	}	//	function MONTHOFYEAR()
-
-
-	/**
-	 * YEAR
-	 *
-	 * Returns the year corresponding to a date.
-	 * The year is returned as an integer in the range 1900-9999.
-	 *
-	 * Excel Function:
-	 *		YEAR(dateValue)
-	 *
-	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard date string
-	 * @return	int		Year
-	 */
-	public static function YEAR($dateValue = 1) {
-		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($dateValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Execute function
-		$PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
-
-		return (int) $PHPDateObject->format('Y');
-	}	//	function YEAR()
-
-
-	/**
-	 * HOUROFDAY
-	 *
-	 * Returns the hour of a time value.
-	 * The hour is given as an integer, ranging from 0 (12:00 A.M.) to 23 (11:00 P.M.).
-	 *
-	 * Excel Function:
-	 *		HOUR(timeValue)
-	 *
-	 * @param	mixed	$timeValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard time string
-	 * @return	int		Hour
-	 */
-	public static function HOUROFDAY($timeValue = 0) {
-		$timeValue	= PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
-
-		if (!is_numeric($timeValue)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				$testVal = strtok($timeValue,'/-: ');
-				if (strlen($testVal) < strlen($timeValue)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			}
-			$timeValue = self::_getTimeValue($timeValue);
-			if (is_string($timeValue)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		// Execute function
-		if ($timeValue >= 1) {
-			$timeValue = fmod($timeValue,1);
-		} elseif ($timeValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
-
-		return (int) gmdate('G',$timeValue);
-	}	//	function HOUROFDAY()
-
-
-	/**
-	 * MINUTEOFHOUR
-	 *
-	 * Returns the minutes of a time value.
-	 * The minute is given as an integer, ranging from 0 to 59.
-	 *
-	 * Excel Function:
-	 *		MINUTE(timeValue)
-	 *
-	 * @param	mixed	$timeValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard time string
-	 * @return	int		Minute
-	 */
-	public static function MINUTEOFHOUR($timeValue = 0) {
-		$timeValue = $timeTester	= PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
-
-		if (!is_numeric($timeValue)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				$testVal = strtok($timeValue,'/-: ');
-				if (strlen($testVal) < strlen($timeValue)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			}
-			$timeValue = self::_getTimeValue($timeValue);
-			if (is_string($timeValue)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		// Execute function
-		if ($timeValue >= 1) {
-			$timeValue = fmod($timeValue,1);
-		} elseif ($timeValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
-
-		return (int) gmdate('i',$timeValue);
-	}	//	function MINUTEOFHOUR()
-
-
-	/**
-	 * SECONDOFMINUTE
-	 *
-	 * Returns the seconds of a time value.
-	 * The second is given as an integer in the range 0 (zero) to 59.
-	 *
-	 * Excel Function:
-	 *		SECOND(timeValue)
-	 *
-	 * @param	mixed	$timeValue		Excel date serial value (float), PHP date timestamp (integer),
-	 *									PHP DateTime object, or a standard time string
-	 * @return	int		Second
-	 */
-	public static function SECONDOFMINUTE($timeValue = 0) {
-		$timeValue	= PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
-
-		if (!is_numeric($timeValue)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				$testVal = strtok($timeValue,'/-: ');
-				if (strlen($testVal) < strlen($timeValue)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			}
-			$timeValue = self::_getTimeValue($timeValue);
-			if (is_string($timeValue)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		// Execute function
-		if ($timeValue >= 1) {
-			$timeValue = fmod($timeValue,1);
-		} elseif ($timeValue < 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
-
-		return (int) gmdate('s',$timeValue);
-	}	//	function SECONDOFMINUTE()
-
-
-	/**
-	 * EDATE
-	 *
-	 * Returns the serial number that represents the date that is the indicated number of months
-	 * before or after a specified date (the start_date).
-	 * Use EDATE to calculate maturity dates or due dates that fall on the same day of the month
-	 * as the date of issue.
-	 *
-	 * Excel Function:
-	 *		EDATE(dateValue,adjustmentMonths)
-	 *
-	 * @param	mixed	$dateValue			Excel date serial value (float), PHP date timestamp (integer),
-	 *										PHP DateTime object, or a standard date string
-	 * @param	int		$adjustmentMonths	The number of months before or after start_date.
-	 *										A positive value for months yields a future date;
-	 *										a negative value yields a past date.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function EDATE($dateValue = 1, $adjustmentMonths = 0) {
-		$dateValue			= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$adjustmentMonths	= PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths);
-
-		if (!is_numeric($adjustmentMonths)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$adjustmentMonths = floor($adjustmentMonths);
-
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Execute function
-		$PHPDateObject = self::_adjustDateByMonths($dateValue,$adjustmentMonths);
-
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					return (float) PHPExcel_Shared_Date::PHPToExcel($PHPDateObject);
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::PHPToExcel($PHPDateObject));
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					return $PHPDateObject;
-		}
-	}	//	function EDATE()
-
-
-	/**
-	 * EOMONTH
-	 *
-	 * Returns the date value for the last day of the month that is the indicated number of months
-	 * before or after start_date.
-	 * Use EOMONTH to calculate maturity dates or due dates that fall on the last day of the month.
-	 *
-	 * Excel Function:
-	 *		EOMONTH(dateValue,adjustmentMonths)
-	 *
-	 * @param	mixed	$dateValue			Excel date serial value (float), PHP date timestamp (integer),
-	 *										PHP DateTime object, or a standard date string
-	 * @param	int		$adjustmentMonths	The number of months before or after start_date.
-	 *										A positive value for months yields a future date;
-	 *										a negative value yields a past date.
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function EOMONTH($dateValue = 1, $adjustmentMonths = 0) {
-		$dateValue			= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$adjustmentMonths	= PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths);
-
-		if (!is_numeric($adjustmentMonths)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$adjustmentMonths = floor($adjustmentMonths);
-
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Execute function
-		$PHPDateObject = self::_adjustDateByMonths($dateValue,$adjustmentMonths+1);
-		$adjustDays = (int) $PHPDateObject->format('d');
-		$adjustDaysString = '-'.$adjustDays.' days';
-		$PHPDateObject->modify($adjustDaysString);
-
-		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
-			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
-					return (float) PHPExcel_Shared_Date::PHPToExcel($PHPDateObject);
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::PHPToExcel($PHPDateObject));
-			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
-					return $PHPDateObject;
-		}
-	}	//	function EOMONTH()
-
-}	//	class PHPExcel_Calculation_DateTime
-
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/Engineering.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/Engineering.php
deleted file mode 100755
index 84dcd388f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/Engineering.php
+++ /dev/null
@@ -1,2502 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/** EULER */
-define('EULER', 2.71828182845904523536);
-
-
-/**
- * PHPExcel_Calculation_Engineering
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Engineering {
-
-	/**
-	 * Details of the Units of measure that can be used in CONVERTUOM()
-	 *
-	 * @var mixed[]
-	 */
-	private static $_conversionUnits = array( 'g'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'Gram',						'AllowPrefix'	=> True		),
-											  'sg'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'Slug',						'AllowPrefix'	=> False	),
-											  'lbm'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'Pound mass (avoirdupois)',	'AllowPrefix'	=> False	),
-											  'u'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'U (atomic mass unit)',		'AllowPrefix'	=> True		),
-											  'ozm'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'Ounce mass (avoirdupois)',	'AllowPrefix'	=> False	),
-											  'm'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Meter',						'AllowPrefix'	=> True		),
-											  'mi'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Statute mile',				'AllowPrefix'	=> False	),
-											  'Nmi'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Nautical mile',				'AllowPrefix'	=> False	),
-											  'in'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Inch',						'AllowPrefix'	=> False	),
-											  'ft'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Foot',						'AllowPrefix'	=> False	),
-											  'yd'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Yard',						'AllowPrefix'	=> False	),
-											  'ang'		=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Angstrom',					'AllowPrefix'	=> True		),
-											  'Pica'	=> array(	'Group'	=> 'Distance',		'Unit Name'	=> 'Pica (1/72 in)',			'AllowPrefix'	=> False	),
-											  'yr'		=> array(	'Group'	=> 'Time',			'Unit Name'	=> 'Year',						'AllowPrefix'	=> False	),
-											  'day'		=> array(	'Group'	=> 'Time',			'Unit Name'	=> 'Day',						'AllowPrefix'	=> False	),
-											  'hr'		=> array(	'Group'	=> 'Time',			'Unit Name'	=> 'Hour',						'AllowPrefix'	=> False	),
-											  'mn'		=> array(	'Group'	=> 'Time',			'Unit Name'	=> 'Minute',					'AllowPrefix'	=> False	),
-											  'sec'		=> array(	'Group'	=> 'Time',			'Unit Name'	=> 'Second',					'AllowPrefix'	=> True		),
-											  'Pa'		=> array(	'Group'	=> 'Pressure',		'Unit Name'	=> 'Pascal',					'AllowPrefix'	=> True		),
-											  'p'		=> array(	'Group'	=> 'Pressure',		'Unit Name'	=> 'Pascal',					'AllowPrefix'	=> True		),
-											  'atm'		=> array(	'Group'	=> 'Pressure',		'Unit Name'	=> 'Atmosphere',				'AllowPrefix'	=> True		),
-											  'at'		=> array(	'Group'	=> 'Pressure',		'Unit Name'	=> 'Atmosphere',				'AllowPrefix'	=> True		),
-											  'mmHg'	=> array(	'Group'	=> 'Pressure',		'Unit Name'	=> 'mm of Mercury',				'AllowPrefix'	=> True		),
-											  'N'		=> array(	'Group'	=> 'Force',			'Unit Name'	=> 'Newton',					'AllowPrefix'	=> True		),
-											  'dyn'		=> array(	'Group'	=> 'Force',			'Unit Name'	=> 'Dyne',						'AllowPrefix'	=> True		),
-											  'dy'		=> array(	'Group'	=> 'Force',			'Unit Name'	=> 'Dyne',						'AllowPrefix'	=> True		),
-											  'lbf'		=> array(	'Group'	=> 'Force',			'Unit Name'	=> 'Pound force',				'AllowPrefix'	=> False	),
-											  'J'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Joule',						'AllowPrefix'	=> True		),
-											  'e'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Erg',						'AllowPrefix'	=> True		),
-											  'c'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Thermodynamic calorie',		'AllowPrefix'	=> True		),
-											  'cal'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'IT calorie',				'AllowPrefix'	=> True		),
-											  'eV'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Electron volt',				'AllowPrefix'	=> True		),
-											  'ev'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Electron volt',				'AllowPrefix'	=> True		),
-											  'HPh'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Horsepower-hour',			'AllowPrefix'	=> False	),
-											  'hh'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Horsepower-hour',			'AllowPrefix'	=> False	),
-											  'Wh'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Watt-hour',					'AllowPrefix'	=> True		),
-											  'wh'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Watt-hour',					'AllowPrefix'	=> True		),
-											  'flb'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'Foot-pound',				'AllowPrefix'	=> False	),
-											  'BTU'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'BTU',						'AllowPrefix'	=> False	),
-											  'btu'		=> array(	'Group'	=> 'Energy',		'Unit Name'	=> 'BTU',						'AllowPrefix'	=> False	),
-											  'HP'		=> array(	'Group'	=> 'Power',			'Unit Name'	=> 'Horsepower',				'AllowPrefix'	=> False	),
-											  'h'		=> array(	'Group'	=> 'Power',			'Unit Name'	=> 'Horsepower',				'AllowPrefix'	=> False	),
-											  'W'		=> array(	'Group'	=> 'Power',			'Unit Name'	=> 'Watt',						'AllowPrefix'	=> True		),
-											  'w'		=> array(	'Group'	=> 'Power',			'Unit Name'	=> 'Watt',						'AllowPrefix'	=> True		),
-											  'T'		=> array(	'Group'	=> 'Magnetism',		'Unit Name'	=> 'Tesla',						'AllowPrefix'	=> True		),
-											  'ga'		=> array(	'Group'	=> 'Magnetism',		'Unit Name'	=> 'Gauss',						'AllowPrefix'	=> True		),
-											  'C'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Celsius',					'AllowPrefix'	=> False	),
-											  'cel'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Celsius',					'AllowPrefix'	=> False	),
-											  'F'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Fahrenheit',				'AllowPrefix'	=> False	),
-											  'fah'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Fahrenheit',				'AllowPrefix'	=> False	),
-											  'K'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Kelvin',					'AllowPrefix'	=> False	),
-											  'kel'		=> array(	'Group'	=> 'Temperature',	'Unit Name'	=> 'Kelvin',					'AllowPrefix'	=> False	),
-											  'tsp'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Teaspoon',					'AllowPrefix'	=> False	),
-											  'tbs'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Tablespoon',				'AllowPrefix'	=> False	),
-											  'oz'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Fluid Ounce',				'AllowPrefix'	=> False	),
-											  'cup'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Cup',						'AllowPrefix'	=> False	),
-											  'pt'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'U.S. Pint',					'AllowPrefix'	=> False	),
-											  'us_pt'	=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'U.S. Pint',					'AllowPrefix'	=> False	),
-											  'uk_pt'	=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'U.K. Pint',					'AllowPrefix'	=> False	),
-											  'qt'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Quart',						'AllowPrefix'	=> False	),
-											  'gal'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Gallon',					'AllowPrefix'	=> False	),
-											  'l'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Litre',						'AllowPrefix'	=> True		),
-											  'lt'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Litre',						'AllowPrefix'	=> True		)
-											);
-
-	/**
-	 * Details of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM()
-	 *
-	 * @var mixed[]
-	 */
-	private static $_conversionMultipliers = array(	'Y'	=> array(	'multiplier'	=> 1E24,	'name'	=> 'yotta'	),
-													'Z'	=> array(	'multiplier'	=> 1E21,	'name'	=> 'zetta'	),
-													'E'	=> array(	'multiplier'	=> 1E18,	'name'	=> 'exa'	),
-													'P'	=> array(	'multiplier'	=> 1E15,	'name'	=> 'peta'	),
-													'T'	=> array(	'multiplier'	=> 1E12,	'name'	=> 'tera'	),
-													'G'	=> array(	'multiplier'	=> 1E9,		'name'	=> 'giga'	),
-													'M'	=> array(	'multiplier'	=> 1E6,		'name'	=> 'mega'	),
-													'k'	=> array(	'multiplier'	=> 1E3,		'name'	=> 'kilo'	),
-													'h'	=> array(	'multiplier'	=> 1E2,		'name'	=> 'hecto'	),
-													'e'	=> array(	'multiplier'	=> 1E1,		'name'	=> 'deka'	),
-													'd'	=> array(	'multiplier'	=> 1E-1,	'name'	=> 'deci'	),
-													'c'	=> array(	'multiplier'	=> 1E-2,	'name'	=> 'centi'	),
-													'm'	=> array(	'multiplier'	=> 1E-3,	'name'	=> 'milli'	),
-													'u'	=> array(	'multiplier'	=> 1E-6,	'name'	=> 'micro'	),
-													'n'	=> array(	'multiplier'	=> 1E-9,	'name'	=> 'nano'	),
-													'p'	=> array(	'multiplier'	=> 1E-12,	'name'	=> 'pico'	),
-													'f'	=> array(	'multiplier'	=> 1E-15,	'name'	=> 'femto'	),
-													'a'	=> array(	'multiplier'	=> 1E-18,	'name'	=> 'atto'	),
-													'z'	=> array(	'multiplier'	=> 1E-21,	'name'	=> 'zepto'	),
-													'y'	=> array(	'multiplier'	=> 1E-24,	'name'	=> 'yocto'	)
-												 );
-
-	/**
-	 * Details of the Units of measure conversion factors, organised by group
-	 *
-	 * @var mixed[]
-	 */
-	private static $_unitConversions = array(	'Mass'		=> array(	'g'		=> array(	'g'		=> 1.0,
-																							'sg'	=> 6.85220500053478E-05,
-																							'lbm'	=> 2.20462291469134E-03,
-																							'u'		=> 6.02217000000000E+23,
-																							'ozm'	=> 3.52739718003627E-02
-																						),
-																		'sg'	=> array(	'g'		=> 1.45938424189287E+04,
-																							'sg'	=> 1.0,
-																							'lbm'	=> 3.21739194101647E+01,
-																							'u'		=> 8.78866000000000E+27,
-																							'ozm'	=> 5.14782785944229E+02
-																						),
-																		'lbm'	=> array(	'g'		=> 4.5359230974881148E+02,
-																							'sg'	=> 3.10810749306493E-02,
-																							'lbm'	=> 1.0,
-																							'u'		=> 2.73161000000000E+26,
-																							'ozm'	=> 1.60000023429410E+01
-																						),
-																		'u'		=> array(	'g'		=> 1.66053100460465E-24,
-																							'sg'	=> 1.13782988532950E-28,
-																							'lbm'	=> 3.66084470330684E-27,
-																							'u'		=> 1.0,
-																							'ozm'	=> 5.85735238300524E-26
-																						),
-																		'ozm'	=> array(	'g'		=> 2.83495152079732E+01,
-																							'sg'	=> 1.94256689870811E-03,
-																							'lbm'	=> 6.24999908478882E-02,
-																							'u'		=> 1.70725600000000E+25,
-																							'ozm'	=> 1.0
-																						)
-																	),
-												'Distance'	=> array(	'm'		=> array(	'm'		=> 1.0,
-																							'mi'	=> 6.21371192237334E-04,
-																							'Nmi'	=> 5.39956803455724E-04,
-																							'in'	=> 3.93700787401575E+01,
-																							'ft'	=> 3.28083989501312E+00,
-																							'yd'	=> 1.09361329797891E+00,
-																							'ang'	=> 1.00000000000000E+10,
-																							'Pica'	=> 2.83464566929116E+03
-																						),
-																		'mi'	=> array(	'm'		=> 1.60934400000000E+03,
-																							'mi'	=> 1.0,
-																							'Nmi'	=> 8.68976241900648E-01,
-																							'in'	=> 6.33600000000000E+04,
-																							'ft'	=> 5.28000000000000E+03,
-																							'yd'	=> 1.76000000000000E+03,
-																							'ang'	=> 1.60934400000000E+13,
-																							'Pica'	=> 4.56191999999971E+06
-																						),
-																		'Nmi'	=> array(	'm'		=> 1.85200000000000E+03,
-																							'mi'	=> 1.15077944802354E+00,
-																							'Nmi'	=> 1.0,
-																							'in'	=> 7.29133858267717E+04,
-																							'ft'	=> 6.07611548556430E+03,
-																							'yd'	=> 2.02537182785694E+03,
-																							'ang'	=> 1.85200000000000E+13,
-																							'Pica'	=> 5.24976377952723E+06
-																						),
-																		'in'	=> array(	'm'		=> 2.54000000000000E-02,
-																							'mi'	=> 1.57828282828283E-05,
-																							'Nmi'	=> 1.37149028077754E-05,
-																							'in'	=> 1.0,
-																							'ft'	=> 8.33333333333333E-02,
-																							'yd'	=> 2.77777777686643E-02,
-																							'ang'	=> 2.54000000000000E+08,
-																							'Pica'	=> 7.19999999999955E+01
-																						),
-																		'ft'	=> array(	'm'		=> 3.04800000000000E-01,
-																							'mi'	=> 1.89393939393939E-04,
-																							'Nmi'	=> 1.64578833693305E-04,
-																							'in'	=> 1.20000000000000E+01,
-																							'ft'	=> 1.0,
-																							'yd'	=> 3.33333333223972E-01,
-																							'ang'	=> 3.04800000000000E+09,
-																							'Pica'	=> 8.63999999999946E+02
-																						),
-																		'yd'	=> array(	'm'		=> 9.14400000300000E-01,
-																							'mi'	=> 5.68181818368230E-04,
-																							'Nmi'	=> 4.93736501241901E-04,
-																							'in'	=> 3.60000000118110E+01,
-																							'ft'	=> 3.00000000000000E+00,
-																							'yd'	=> 1.0,
-																							'ang'	=> 9.14400000300000E+09,
-																							'Pica'	=> 2.59200000085023E+03
-																						),
-																		'ang'	=> array(	'm'		=> 1.00000000000000E-10,
-																							'mi'	=> 6.21371192237334E-14,
-																							'Nmi'	=> 5.39956803455724E-14,
-																							'in'	=> 3.93700787401575E-09,
-																							'ft'	=> 3.28083989501312E-10,
-																							'yd'	=> 1.09361329797891E-10,
-																							'ang'	=> 1.0,
-																							'Pica'	=> 2.83464566929116E-07
-																						),
-																		'Pica'	=> array(	'm'		=> 3.52777777777800E-04,
-																							'mi'	=> 2.19205948372629E-07,
-																							'Nmi'	=> 1.90484761219114E-07,
-																							'in'	=> 1.38888888888898E-02,
-																							'ft'	=> 1.15740740740748E-03,
-																							'yd'	=> 3.85802469009251E-04,
-																							'ang'	=> 3.52777777777800E+06,
-																							'Pica'	=> 1.0
-																						)
-																	),
-												'Time'		=> array(	'yr'	=> array(	'yr'		=> 1.0,
-																							'day'		=> 365.25,
-																							'hr'		=> 8766.0,
-																							'mn'		=> 525960.0,
-																							'sec'		=> 31557600.0
-																						),
-																		'day'	=> array(	'yr'		=> 2.73785078713210E-03,
-																							'day'		=> 1.0,
-																							'hr'		=> 24.0,
-																							'mn'		=> 1440.0,
-																							'sec'		=> 86400.0
-																						),
-																		'hr'	=> array(	'yr'		=> 1.14077116130504E-04,
-																							'day'		=> 4.16666666666667E-02,
-																							'hr'		=> 1.0,
-																							'mn'		=> 60.0,
-																							'sec'		=> 3600.0
-																						),
-																		'mn'	=> array(	'yr'		=> 1.90128526884174E-06,
-																							'day'		=> 6.94444444444444E-04,
-																							'hr'		=> 1.66666666666667E-02,
-																							'mn'		=> 1.0,
-																							'sec'		=> 60.0
-																						),
-																		'sec'	=> array(	'yr'		=> 3.16880878140289E-08,
-																							'day'		=> 1.15740740740741E-05,
-																							'hr'		=> 2.77777777777778E-04,
-																							'mn'		=> 1.66666666666667E-02,
-																							'sec'		=> 1.0
-																						)
-																	),
-												'Pressure'	=> array(	'Pa'	=> array(	'Pa'		=> 1.0,
-																							'p'			=> 1.0,
-																							'atm'		=> 9.86923299998193E-06,
-																							'at'		=> 9.86923299998193E-06,
-																							'mmHg'		=> 7.50061707998627E-03
-																						),
-																		'p'		=> array(	'Pa'		=> 1.0,
-																							'p'			=> 1.0,
-																							'atm'		=> 9.86923299998193E-06,
-																							'at'		=> 9.86923299998193E-06,
-																							'mmHg'		=> 7.50061707998627E-03
-																						),
-																		'atm'	=> array(	'Pa'		=> 1.01324996583000E+05,
-																							'p'			=> 1.01324996583000E+05,
-																							'atm'		=> 1.0,
-																							'at'		=> 1.0,
-																							'mmHg'		=> 760.0
-																						),
-																		'at'	=> array(	'Pa'		=> 1.01324996583000E+05,
-																							'p'			=> 1.01324996583000E+05,
-																							'atm'		=> 1.0,
-																							'at'		=> 1.0,
-																							'mmHg'		=> 760.0
-																						),
-																		'mmHg'	=> array(	'Pa'		=> 1.33322363925000E+02,
-																							'p'			=> 1.33322363925000E+02,
-																							'atm'		=> 1.31578947368421E-03,
-																							'at'		=> 1.31578947368421E-03,
-																							'mmHg'		=> 1.0
-																						)
-																	),
-												'Force'		=> array(	'N'		=> array(	'N'			=> 1.0,
-																							'dyn'		=> 1.0E+5,
-																							'dy'		=> 1.0E+5,
-																							'lbf'		=> 2.24808923655339E-01
-																						),
-																		'dyn'	=> array(	'N'			=> 1.0E-5,
-																							'dyn'		=> 1.0,
-																							'dy'		=> 1.0,
-																							'lbf'		=> 2.24808923655339E-06
-																						),
-																		'dy'	=> array(	'N'			=> 1.0E-5,
-																							'dyn'		=> 1.0,
-																							'dy'		=> 1.0,
-																							'lbf'		=> 2.24808923655339E-06
-																						),
-																		'lbf'	=> array(	'N'			=> 4.448222,
-																							'dyn'		=> 4.448222E+5,
-																							'dy'		=> 4.448222E+5,
-																							'lbf'		=> 1.0
-																						)
-																	),
-												'Energy'	=> array(	'J'		=> array(	'J'			=> 1.0,
-																							'e'			=> 9.99999519343231E+06,
-																							'c'			=> 2.39006249473467E-01,
-																							'cal'		=> 2.38846190642017E-01,
-																							'eV'		=> 6.24145700000000E+18,
-																							'ev'		=> 6.24145700000000E+18,
-																							'HPh'		=> 3.72506430801000E-07,
-																							'hh'		=> 3.72506430801000E-07,
-																							'Wh'		=> 2.77777916238711E-04,
-																							'wh'		=> 2.77777916238711E-04,
-																							'flb'		=> 2.37304222192651E+01,
-																							'BTU'		=> 9.47815067349015E-04,
-																							'btu'		=> 9.47815067349015E-04
-																						),
-																		'e'		=> array(	'J'			=> 1.00000048065700E-07,
-																							'e'			=> 1.0,
-																							'c'			=> 2.39006364353494E-08,
-																							'cal'		=> 2.38846305445111E-08,
-																							'eV'		=> 6.24146000000000E+11,
-																							'ev'		=> 6.24146000000000E+11,
-																							'HPh'		=> 3.72506609848824E-14,
-																							'hh'		=> 3.72506609848824E-14,
-																							'Wh'		=> 2.77778049754611E-11,
-																							'wh'		=> 2.77778049754611E-11,
-																							'flb'		=> 2.37304336254586E-06,
-																							'BTU'		=> 9.47815522922962E-11,
-																							'btu'		=> 9.47815522922962E-11
-																						),
-																		'c'		=> array(	'J'			=> 4.18399101363672E+00,
-																							'e'			=> 4.18398900257312E+07,
-																							'c'			=> 1.0,
-																							'cal'		=> 9.99330315287563E-01,
-																							'eV'		=> 2.61142000000000E+19,
-																							'ev'		=> 2.61142000000000E+19,
-																							'HPh'		=> 1.55856355899327E-06,
-																							'hh'		=> 1.55856355899327E-06,
-																							'Wh'		=> 1.16222030532950E-03,
-																							'wh'		=> 1.16222030532950E-03,
-																							'flb'		=> 9.92878733152102E+01,
-																							'BTU'		=> 3.96564972437776E-03,
-																							'btu'		=> 3.96564972437776E-03
-																						),
-																		'cal'	=> array(	'J'			=> 4.18679484613929E+00,
-																							'e'			=> 4.18679283372801E+07,
-																							'c'			=> 1.00067013349059E+00,
-																							'cal'		=> 1.0,
-																							'eV'		=> 2.61317000000000E+19,
-																							'ev'		=> 2.61317000000000E+19,
-																							'HPh'		=> 1.55960800463137E-06,
-																							'hh'		=> 1.55960800463137E-06,
-																							'Wh'		=> 1.16299914807955E-03,
-																							'wh'		=> 1.16299914807955E-03,
-																							'flb'		=> 9.93544094443283E+01,
-																							'BTU'		=> 3.96830723907002E-03,
-																							'btu'		=> 3.96830723907002E-03
-																						),
-																		'eV'	=> array(	'J'			=> 1.60219000146921E-19,
-																							'e'			=> 1.60218923136574E-12,
-																							'c'			=> 3.82933423195043E-20,
-																							'cal'		=> 3.82676978535648E-20,
-																							'eV'		=> 1.0,
-																							'ev'		=> 1.0,
-																							'HPh'		=> 5.96826078912344E-26,
-																							'hh'		=> 5.96826078912344E-26,
-																							'Wh'		=> 4.45053000026614E-23,
-																							'wh'		=> 4.45053000026614E-23,
-																							'flb'		=> 3.80206452103492E-18,
-																							'BTU'		=> 1.51857982414846E-22,
-																							'btu'		=> 1.51857982414846E-22
-																						),
-																		'ev'	=> array(	'J'			=> 1.60219000146921E-19,
-																							'e'			=> 1.60218923136574E-12,
-																							'c'			=> 3.82933423195043E-20,
-																							'cal'		=> 3.82676978535648E-20,
-																							'eV'		=> 1.0,
-																							'ev'		=> 1.0,
-																							'HPh'		=> 5.96826078912344E-26,
-																							'hh'		=> 5.96826078912344E-26,
-																							'Wh'		=> 4.45053000026614E-23,
-																							'wh'		=> 4.45053000026614E-23,
-																							'flb'		=> 3.80206452103492E-18,
-																							'BTU'		=> 1.51857982414846E-22,
-																							'btu'		=> 1.51857982414846E-22
-																						),
-																		'HPh'	=> array(	'J'			=> 2.68451741316170E+06,
-																							'e'			=> 2.68451612283024E+13,
-																							'c'			=> 6.41616438565991E+05,
-																							'cal'		=> 6.41186757845835E+05,
-																							'eV'		=> 1.67553000000000E+25,
-																							'ev'		=> 1.67553000000000E+25,
-																							'HPh'		=> 1.0,
-																							'hh'		=> 1.0,
-																							'Wh'		=> 7.45699653134593E+02,
-																							'wh'		=> 7.45699653134593E+02,
-																							'flb'		=> 6.37047316692964E+07,
-																							'BTU'		=> 2.54442605275546E+03,
-																							'btu'		=> 2.54442605275546E+03
-																						),
-																		'hh'	=> array(	'J'			=> 2.68451741316170E+06,
-																							'e'			=> 2.68451612283024E+13,
-																							'c'			=> 6.41616438565991E+05,
-																							'cal'		=> 6.41186757845835E+05,
-																							'eV'		=> 1.67553000000000E+25,
-																							'ev'		=> 1.67553000000000E+25,
-																							'HPh'		=> 1.0,
-																							'hh'		=> 1.0,
-																							'Wh'		=> 7.45699653134593E+02,
-																							'wh'		=> 7.45699653134593E+02,
-																							'flb'		=> 6.37047316692964E+07,
-																							'BTU'		=> 2.54442605275546E+03,
-																							'btu'		=> 2.54442605275546E+03
-																						),
-																		'Wh'	=> array(	'J'			=> 3.59999820554720E+03,
-																							'e'			=> 3.59999647518369E+10,
-																							'c'			=> 8.60422069219046E+02,
-																							'cal'		=> 8.59845857713046E+02,
-																							'eV'		=> 2.24692340000000E+22,
-																							'ev'		=> 2.24692340000000E+22,
-																							'HPh'		=> 1.34102248243839E-03,
-																							'hh'		=> 1.34102248243839E-03,
-																							'Wh'		=> 1.0,
-																							'wh'		=> 1.0,
-																							'flb'		=> 8.54294774062316E+04,
-																							'BTU'		=> 3.41213254164705E+00,
-																							'btu'		=> 3.41213254164705E+00
-																						),
-																		'wh'	=> array(	'J'			=> 3.59999820554720E+03,
-																							'e'			=> 3.59999647518369E+10,
-																							'c'			=> 8.60422069219046E+02,
-																							'cal'		=> 8.59845857713046E+02,
-																							'eV'		=> 2.24692340000000E+22,
-																							'ev'		=> 2.24692340000000E+22,
-																							'HPh'		=> 1.34102248243839E-03,
-																							'hh'		=> 1.34102248243839E-03,
-																							'Wh'		=> 1.0,
-																							'wh'		=> 1.0,
-																							'flb'		=> 8.54294774062316E+04,
-																							'BTU'		=> 3.41213254164705E+00,
-																							'btu'		=> 3.41213254164705E+00
-																						),
-																		'flb'	=> array(	'J'			=> 4.21400003236424E-02,
-																							'e'			=> 4.21399800687660E+05,
-																							'c'			=> 1.00717234301644E-02,
-																							'cal'		=> 1.00649785509554E-02,
-																							'eV'		=> 2.63015000000000E+17,
-																							'ev'		=> 2.63015000000000E+17,
-																							'HPh'		=> 1.56974211145130E-08,
-																							'hh'		=> 1.56974211145130E-08,
-																							'Wh'		=> 1.17055614802000E-05,
-																							'wh'		=> 1.17055614802000E-05,
-																							'flb'		=> 1.0,
-																							'BTU'		=> 3.99409272448406E-05,
-																							'btu'		=> 3.99409272448406E-05
-																						),
-																		'BTU'	=> array(	'J'			=> 1.05505813786749E+03,
-																							'e'			=> 1.05505763074665E+10,
-																							'c'			=> 2.52165488508168E+02,
-																							'cal'		=> 2.51996617135510E+02,
-																							'eV'		=> 6.58510000000000E+21,
-																							'ev'		=> 6.58510000000000E+21,
-																							'HPh'		=> 3.93015941224568E-04,
-																							'hh'		=> 3.93015941224568E-04,
-																							'Wh'		=> 2.93071851047526E-01,
-																							'wh'		=> 2.93071851047526E-01,
-																							'flb'		=> 2.50369750774671E+04,
-																							'BTU'		=> 1.0,
-																							'btu'		=> 1.0,
-																						),
-																		'btu'	=> array(	'J'			=> 1.05505813786749E+03,
-																							'e'			=> 1.05505763074665E+10,
-																							'c'			=> 2.52165488508168E+02,
-																							'cal'		=> 2.51996617135510E+02,
-																							'eV'		=> 6.58510000000000E+21,
-																							'ev'		=> 6.58510000000000E+21,
-																							'HPh'		=> 3.93015941224568E-04,
-																							'hh'		=> 3.93015941224568E-04,
-																							'Wh'		=> 2.93071851047526E-01,
-																							'wh'		=> 2.93071851047526E-01,
-																							'flb'		=> 2.50369750774671E+04,
-																							'BTU'		=> 1.0,
-																							'btu'		=> 1.0,
-																						)
-																	),
-												'Power'		=> array(	'HP'	=> array(	'HP'		=> 1.0,
-																							'h'			=> 1.0,
-																							'W'			=> 7.45701000000000E+02,
-																							'w'			=> 7.45701000000000E+02
-																						),
-																		'h'		=> array(	'HP'		=> 1.0,
-																							'h'			=> 1.0,
-																							'W'			=> 7.45701000000000E+02,
-																							'w'			=> 7.45701000000000E+02
-																						),
-																		'W'		=> array(	'HP'		=> 1.34102006031908E-03,
-																							'h'			=> 1.34102006031908E-03,
-																							'W'			=> 1.0,
-																							'w'			=> 1.0
-																						),
-																		'w'		=> array(	'HP'		=> 1.34102006031908E-03,
-																							'h'			=> 1.34102006031908E-03,
-																							'W'			=> 1.0,
-																							'w'			=> 1.0
-																						)
-																	),
-												'Magnetism'	=> array(	'T'		=> array(	'T'			=> 1.0,
-																							'ga'		=> 10000.0
-																						),
-																		'ga'	=> array(	'T'			=> 0.0001,
-																							'ga'		=> 1.0
-																						)
-																	),
-												'Liquid'	=> array(	'tsp'	=> array(	'tsp'		=> 1.0,
-																							'tbs'		=> 3.33333333333333E-01,
-																							'oz'		=> 1.66666666666667E-01,
-																							'cup'		=> 2.08333333333333E-02,
-																							'pt'		=> 1.04166666666667E-02,
-																							'us_pt'		=> 1.04166666666667E-02,
-																							'uk_pt'		=> 8.67558516821960E-03,
-																							'qt'		=> 5.20833333333333E-03,
-																							'gal'		=> 1.30208333333333E-03,
-																							'l'			=> 4.92999408400710E-03,
-																							'lt'		=> 4.92999408400710E-03
-																						),
-																		'tbs'	=> array(	'tsp'		=> 3.00000000000000E+00,
-																							'tbs'		=> 1.0,
-																							'oz'		=> 5.00000000000000E-01,
-																							'cup'		=> 6.25000000000000E-02,
-																							'pt'		=> 3.12500000000000E-02,
-																							'us_pt'		=> 3.12500000000000E-02,
-																							'uk_pt'		=> 2.60267555046588E-02,
-																							'qt'		=> 1.56250000000000E-02,
-																							'gal'		=> 3.90625000000000E-03,
-																							'l'			=> 1.47899822520213E-02,
-																							'lt'		=> 1.47899822520213E-02
-																						),
-																		'oz'	=> array(	'tsp'		=> 6.00000000000000E+00,
-																							'tbs'		=> 2.00000000000000E+00,
-																							'oz'		=> 1.0,
-																							'cup'		=> 1.25000000000000E-01,
-																							'pt'		=> 6.25000000000000E-02,
-																							'us_pt'		=> 6.25000000000000E-02,
-																							'uk_pt'		=> 5.20535110093176E-02,
-																							'qt'		=> 3.12500000000000E-02,
-																							'gal'		=> 7.81250000000000E-03,
-																							'l'			=> 2.95799645040426E-02,
-																							'lt'		=> 2.95799645040426E-02
-																						),
-																		'cup'	=> array(	'tsp'		=> 4.80000000000000E+01,
-																							'tbs'		=> 1.60000000000000E+01,
-																							'oz'		=> 8.00000000000000E+00,
-																							'cup'		=> 1.0,
-																							'pt'		=> 5.00000000000000E-01,
-																							'us_pt'		=> 5.00000000000000E-01,
-																							'uk_pt'		=> 4.16428088074541E-01,
-																							'qt'		=> 2.50000000000000E-01,
-																							'gal'		=> 6.25000000000000E-02,
-																							'l'			=> 2.36639716032341E-01,
-																							'lt'		=> 2.36639716032341E-01
-																						),
-																		'pt'	=> array(	'tsp'		=> 9.60000000000000E+01,
-																							'tbs'		=> 3.20000000000000E+01,
-																							'oz'		=> 1.60000000000000E+01,
-																							'cup'		=> 2.00000000000000E+00,
-																							'pt'		=> 1.0,
-																							'us_pt'		=> 1.0,
-																							'uk_pt'		=> 8.32856176149081E-01,
-																							'qt'		=> 5.00000000000000E-01,
-																							'gal'		=> 1.25000000000000E-01,
-																							'l'			=> 4.73279432064682E-01,
-																							'lt'		=> 4.73279432064682E-01
-																						),
-																		'us_pt'	=> array(	'tsp'		=> 9.60000000000000E+01,
-																							'tbs'		=> 3.20000000000000E+01,
-																							'oz'		=> 1.60000000000000E+01,
-																							'cup'		=> 2.00000000000000E+00,
-																							'pt'		=> 1.0,
-																							'us_pt'		=> 1.0,
-																							'uk_pt'		=> 8.32856176149081E-01,
-																							'qt'		=> 5.00000000000000E-01,
-																							'gal'		=> 1.25000000000000E-01,
-																							'l'			=> 4.73279432064682E-01,
-																							'lt'		=> 4.73279432064682E-01
-																						),
-																		'uk_pt'	=> array(	'tsp'		=> 1.15266000000000E+02,
-																							'tbs'		=> 3.84220000000000E+01,
-																							'oz'		=> 1.92110000000000E+01,
-																							'cup'		=> 2.40137500000000E+00,
-																							'pt'		=> 1.20068750000000E+00,
-																							'us_pt'		=> 1.20068750000000E+00,
-																							'uk_pt'		=> 1.0,
-																							'qt'		=> 6.00343750000000E-01,
-																							'gal'		=> 1.50085937500000E-01,
-																							'l'			=> 5.68260698087162E-01,
-																							'lt'		=> 5.68260698087162E-01
-																						),
-																		'qt'	=> array(	'tsp'		=> 1.92000000000000E+02,
-																							'tbs'		=> 6.40000000000000E+01,
-																							'oz'		=> 3.20000000000000E+01,
-																							'cup'		=> 4.00000000000000E+00,
-																							'pt'		=> 2.00000000000000E+00,
-																							'us_pt'		=> 2.00000000000000E+00,
-																							'uk_pt'		=> 1.66571235229816E+00,
-																							'qt'		=> 1.0,
-																							'gal'		=> 2.50000000000000E-01,
-																							'l'			=> 9.46558864129363E-01,
-																							'lt'		=> 9.46558864129363E-01
-																						),
-																		'gal'	=> array(	'tsp'		=> 7.68000000000000E+02,
-																							'tbs'		=> 2.56000000000000E+02,
-																							'oz'		=> 1.28000000000000E+02,
-																							'cup'		=> 1.60000000000000E+01,
-																							'pt'		=> 8.00000000000000E+00,
-																							'us_pt'		=> 8.00000000000000E+00,
-																							'uk_pt'		=> 6.66284940919265E+00,
-																							'qt'		=> 4.00000000000000E+00,
-																							'gal'		=> 1.0,
-																							'l'			=> 3.78623545651745E+00,
-																							'lt'		=> 3.78623545651745E+00
-																						),
-																		'l'		=> array(	'tsp'		=> 2.02840000000000E+02,
-																							'tbs'		=> 6.76133333333333E+01,
-																							'oz'		=> 3.38066666666667E+01,
-																							'cup'		=> 4.22583333333333E+00,
-																							'pt'		=> 2.11291666666667E+00,
-																							'us_pt'		=> 2.11291666666667E+00,
-																							'uk_pt'		=> 1.75975569552166E+00,
-																							'qt'		=> 1.05645833333333E+00,
-																							'gal'		=> 2.64114583333333E-01,
-																							'l'			=> 1.0,
-																							'lt'		=> 1.0
-																						),
-																		'lt'	=> array(	'tsp'		=> 2.02840000000000E+02,
-																							'tbs'		=> 6.76133333333333E+01,
-																							'oz'		=> 3.38066666666667E+01,
-																							'cup'		=> 4.22583333333333E+00,
-																							'pt'		=> 2.11291666666667E+00,
-																							'us_pt'		=> 2.11291666666667E+00,
-																							'uk_pt'		=> 1.75975569552166E+00,
-																							'qt'		=> 1.05645833333333E+00,
-																							'gal'		=> 2.64114583333333E-01,
-																							'l'			=> 1.0,
-																							'lt'		=> 1.0
-																						)
-																	)
-											);
-
-
-	/**
-	 * _parseComplex
-	 *
-	 * Parses a complex number into its real and imaginary parts, and an I or J suffix
-	 *
-	 * @param	string		$complexNumber	The complex number
-	 * @return	string[]	Indexed on "real", "imaginary" and "suffix"
-	 */
-	public static function _parseComplex($complexNumber) {
-		$workString = (string) $complexNumber;
-
-		$realNumber = $imaginary = 0;
-		//	Extract the suffix, if there is one
-		$suffix = substr($workString,-1);
-		if (!is_numeric($suffix)) {
-			$workString = substr($workString,0,-1);
-		} else {
-			$suffix = '';
-		}
-
-		//	Split the input into its Real and Imaginary components
-		$leadingSign = 0;
-		if (strlen($workString) > 0) {
-			$leadingSign = (($workString{0} == '+') || ($workString{0} == '-')) ? 1 : 0;
-		}
-		$power = '';
-		$realNumber = strtok($workString, '+-');
-		if (strtoupper(substr($realNumber,-1)) == 'E') {
-			$power = strtok('+-');
-			++$leadingSign;
-		}
-
-		$realNumber = substr($workString,0,strlen($realNumber)+strlen($power)+$leadingSign);
-
-		if ($suffix != '') {
-			$imaginary = substr($workString,strlen($realNumber));
-
-			if (($imaginary == '') && (($realNumber == '') || ($realNumber == '+') || ($realNumber == '-'))) {
-				$imaginary = $realNumber.'1';
-				$realNumber = '0';
-			} else if ($imaginary == '') {
-				$imaginary = $realNumber;
-				$realNumber = '0';
-			} elseif (($imaginary == '+') || ($imaginary == '-')) {
-				$imaginary .= '1';
-			}
-		}
-
-		return array( 'real'		=> $realNumber,
-					  'imaginary'	=> $imaginary,
-					  'suffix'		=> $suffix
-					);
-	}	//	function _parseComplex()
-
-
-	/**
-	 * _cleanComplex
-	 *
-	 * Cleans the leading characters in a complex number string
-	 *
-	 * @param	string		$complexNumber	The complex number to clean
-	 * @return	string		The "cleaned" complex number
-	 */
-	private static function _cleanComplex($complexNumber) {
-		if ($complexNumber{0} == '+') $complexNumber = substr($complexNumber,1);
-		if ($complexNumber{0} == '0') $complexNumber = substr($complexNumber,1);
-		if ($complexNumber{0} == '.') $complexNumber = '0'.$complexNumber;
-		if ($complexNumber{0} == '+') $complexNumber = substr($complexNumber,1);
-		return $complexNumber;
-	}
-
-
-	private static function _nbrConversionFormat($xVal,$places) {
-		if (!is_null($places)) {
-			if (strlen($xVal) <= $places) {
-				return substr(str_pad($xVal,$places,'0',STR_PAD_LEFT),-10);
-			} else {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-		}
-
-		return substr($xVal,-10);
-	}	//	function _nbrConversionFormat()
-
-
-	/**
-	 *	BESSELI
-	 *
-	 *	Returns the modified Bessel function In(x), which is equivalent to the Bessel function evaluated
-	 *		for purely imaginary arguments
-	 *
-	 *	Excel Function:
-	 *		BESSELI(x,ord)
-	 *
-	 *	@access	public
-	 *	@category Engineering Functions
-	 *	@param	float		$x		The value at which to evaluate the function.
-	 *								If x is nonnumeric, BESSELI returns the #VALUE! error value.
-	 *	@param	integer		$ord	The order of the Bessel function.
-	 *								If ord is not an integer, it is truncated.
-	 *								If $ord is nonnumeric, BESSELI returns the #VALUE! error value.
-	 *								If $ord < 0, BESSELI returns the #NUM! error value.
-	 *	@return	float
-	 *
-	 */
-	public static function BESSELI($x, $ord) {
-		$x	= (is_null($x))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$ord	= (is_null($ord))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($ord);
-
-		if ((is_numeric($x)) && (is_numeric($ord))) {
-			$ord	= floor($ord);
-			if ($ord < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			if (abs($x) <= 30) {
-				$fResult = $fTerm = pow($x / 2, $ord) / PHPExcel_Calculation_MathTrig::FACT($ord);
-				$ordK = 1;
-				$fSqrX = ($x * $x) / 4;
-				do {
-					$fTerm *= $fSqrX;
-					$fTerm /= ($ordK * ($ordK + $ord));
-					$fResult += $fTerm;
-				} while ((abs($fTerm) > 1e-12) && (++$ordK < 100));
-			} else {
-				$f_2_PI = 2 * M_PI;
-
-				$fXAbs = abs($x);
-				$fResult = exp($fXAbs) / sqrt($f_2_PI * $fXAbs);
-				if (($ord & 1) && ($x < 0)) {
-					$fResult = -$fResult;
-				}
-			}
-			return (is_nan($fResult)) ? PHPExcel_Calculation_Functions::NaN() : $fResult;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BESSELI()
-
-
-	/**
-	 *	BESSELJ
-	 *
-	 *	Returns the Bessel function
-	 *
-	 *	Excel Function:
-	 *		BESSELJ(x,ord)
-	 *
-	 *	@access	public
-	 *	@category Engineering Functions
-	 *	@param	float		$x		The value at which to evaluate the function.
-	 *								If x is nonnumeric, BESSELJ returns the #VALUE! error value.
-	 *	@param	integer		$ord	The order of the Bessel function. If n is not an integer, it is truncated.
-	 *								If $ord is nonnumeric, BESSELJ returns the #VALUE! error value.
-	 *								If $ord < 0, BESSELJ returns the #NUM! error value.
-	 *	@return	float
-	 *
-	 */
-	public static function BESSELJ($x, $ord) {
-		$x	= (is_null($x))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$ord	= (is_null($ord))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($ord);
-
-		if ((is_numeric($x)) && (is_numeric($ord))) {
-			$ord	= floor($ord);
-			if ($ord < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			$fResult = 0;
-			if (abs($x) <= 30) {
-				$fResult = $fTerm = pow($x / 2, $ord) / PHPExcel_Calculation_MathTrig::FACT($ord);
-				$ordK = 1;
-				$fSqrX = ($x * $x) / -4;
-				do {
-					$fTerm *= $fSqrX;
-					$fTerm /= ($ordK * ($ordK + $ord));
-					$fResult += $fTerm;
-				} while ((abs($fTerm) > 1e-12) && (++$ordK < 100));
-			} else {
-				$f_PI_DIV_2 = M_PI / 2;
-				$f_PI_DIV_4 = M_PI / 4;
-
-				$fXAbs = abs($x);
-				$fResult = sqrt(M_2DIVPI / $fXAbs) * cos($fXAbs - $ord * $f_PI_DIV_2 - $f_PI_DIV_4);
-				if (($ord & 1) && ($x < 0)) {
-					$fResult = -$fResult;
-				}
-			}
-			return (is_nan($fResult)) ? PHPExcel_Calculation_Functions::NaN() : $fResult;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BESSELJ()
-
-
-	private static function _Besselk0($fNum) {
-		if ($fNum <= 2) {
-			$fNum2 = $fNum * 0.5;
-			$y = ($fNum2 * $fNum2);
-			$fRet = -log($fNum2) * self::BESSELI($fNum, 0) +
-					(-0.57721566 + $y * (0.42278420 + $y * (0.23069756 + $y * (0.3488590e-1 + $y * (0.262698e-2 + $y *
-					(0.10750e-3 + $y * 0.74e-5))))));
-		} else {
-			$y = 2 / $fNum;
-			$fRet = exp(-$fNum) / sqrt($fNum) *
-					(1.25331414 + $y * (-0.7832358e-1 + $y * (0.2189568e-1 + $y * (-0.1062446e-1 + $y *
-					(0.587872e-2 + $y * (-0.251540e-2 + $y * 0.53208e-3))))));
-		}
-		return $fRet;
-	}	//	function _Besselk0()
-
-
-	private static function _Besselk1($fNum) {
-		if ($fNum <= 2) {
-			$fNum2 = $fNum * 0.5;
-			$y = ($fNum2 * $fNum2);
-			$fRet = log($fNum2) * self::BESSELI($fNum, 1) +
-					(1 + $y * (0.15443144 + $y * (-0.67278579 + $y * (-0.18156897 + $y * (-0.1919402e-1 + $y *
-					(-0.110404e-2 + $y * (-0.4686e-4))))))) / $fNum;
-		} else {
-			$y = 2 / $fNum;
-			$fRet = exp(-$fNum) / sqrt($fNum) *
-					(1.25331414 + $y * (0.23498619 + $y * (-0.3655620e-1 + $y * (0.1504268e-1 + $y * (-0.780353e-2 + $y *
-					(0.325614e-2 + $y * (-0.68245e-3)))))));
-		}
-		return $fRet;
-	}	//	function _Besselk1()
-
-
-	/**
-	 *	BESSELK
-	 *
-	 *	Returns the modified Bessel function Kn(x), which is equivalent to the Bessel functions evaluated
-	 *		for purely imaginary arguments.
-	 *
-	 *	Excel Function:
-	 *		BESSELK(x,ord)
-	 *
-	 *	@access	public
-	 *	@category Engineering Functions
-	 *	@param	float		$x		The value at which to evaluate the function.
-	 *								If x is nonnumeric, BESSELK returns the #VALUE! error value.
-	 *	@param	integer		$ord	The order of the Bessel function. If n is not an integer, it is truncated.
-	 *								If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
-	 *								If $ord < 0, BESSELK returns the #NUM! error value.
-	 *	@return	float
-	 *
-	 */
-	public static function BESSELK($x, $ord) {
-		$x		= (is_null($x))		? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$ord	= (is_null($ord))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($ord);
-
-		if ((is_numeric($x)) && (is_numeric($ord))) {
-			if (($ord < 0) || ($x == 0.0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			switch(floor($ord)) {
-				case 0 :	return self::_Besselk0($x);
-							break;
-				case 1 :	return self::_Besselk1($x);
-							break;
-				default :	$fTox	= 2 / $x;
-							$fBkm	= self::_Besselk0($x);
-							$fBk	= self::_Besselk1($x);
-							for ($n = 1; $n < $ord; ++$n) {
-								$fBkp	= $fBkm + $n * $fTox * $fBk;
-								$fBkm	= $fBk;
-								$fBk	= $fBkp;
-							}
-			}
-			return (is_nan($fBk)) ? PHPExcel_Calculation_Functions::NaN() : $fBk;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BESSELK()
-
-
-	private static function _Bessely0($fNum) {
-		if ($fNum < 8.0) {
-			$y = ($fNum * $fNum);
-			$f1 = -2957821389.0 + $y * (7062834065.0 + $y * (-512359803.6 + $y * (10879881.29 + $y * (-86327.92757 + $y * 228.4622733))));
-			$f2 = 40076544269.0 + $y * (745249964.8 + $y * (7189466.438 + $y * (47447.26470 + $y * (226.1030244 + $y))));
-			$fRet = $f1 / $f2 + 0.636619772 * self::BESSELJ($fNum, 0) * log($fNum);
-		} else {
-			$z = 8.0 / $fNum;
-			$y = ($z * $z);
-			$xx = $fNum - 0.785398164;
-			$f1 = 1 + $y * (-0.1098628627e-2 + $y * (0.2734510407e-4 + $y * (-0.2073370639e-5 + $y * 0.2093887211e-6)));
-			$f2 = -0.1562499995e-1 + $y * (0.1430488765e-3 + $y * (-0.6911147651e-5 + $y * (0.7621095161e-6 + $y * (-0.934945152e-7))));
-			$fRet = sqrt(0.636619772 / $fNum) * (sin($xx) * $f1 + $z * cos($xx) * $f2);
-		}
-		return $fRet;
-	}	//	function _Bessely0()
-
-
-	private static function _Bessely1($fNum) {
-		if ($fNum < 8.0) {
-			$y = ($fNum * $fNum);
-			$f1 = $fNum * (-0.4900604943e13 + $y * (0.1275274390e13 + $y * (-0.5153438139e11 + $y * (0.7349264551e9 + $y *
-				(-0.4237922726e7 + $y * 0.8511937935e4)))));
-			$f2 = 0.2499580570e14 + $y * (0.4244419664e12 + $y * (0.3733650367e10 + $y * (0.2245904002e8 + $y *
-				(0.1020426050e6 + $y * (0.3549632885e3 + $y)))));
-			$fRet = $f1 / $f2 + 0.636619772 * ( self::BESSELJ($fNum, 1) * log($fNum) - 1 / $fNum);
-		} else {
-			$fRet = sqrt(0.636619772 / $fNum) * sin($fNum - 2.356194491);
-		}
-		return $fRet;
-	}	//	function _Bessely1()
-
-
-	/**
-	 *	BESSELY
-	 *
-	 *	Returns the Bessel function, which is also called the Weber function or the Neumann function.
-	 *
-	 *	Excel Function:
-	 *		BESSELY(x,ord)
-	 *
-	 *	@access	public
-	 *	@category Engineering Functions
-	 *	@param	float		$x		The value at which to evaluate the function.
-	 *								If x is nonnumeric, BESSELK returns the #VALUE! error value.
-	 *	@param	integer		$ord	The order of the Bessel function. If n is not an integer, it is truncated.
-	 *								If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
-	 *								If $ord < 0, BESSELK returns the #NUM! error value.
-	 *
-	 *	@return	float
-	 */
-	public static function BESSELY($x, $ord) {
-		$x		= (is_null($x))		? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$ord	= (is_null($ord))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($ord);
-
-		if ((is_numeric($x)) && (is_numeric($ord))) {
-			if (($ord < 0) || ($x == 0.0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			switch(floor($ord)) {
-				case 0 :	return self::_Bessely0($x);
-							break;
-				case 1 :	return self::_Bessely1($x);
-							break;
-				default:	$fTox	= 2 / $x;
-							$fBym	= self::_Bessely0($x);
-							$fBy	= self::_Bessely1($x);
-							for ($n = 1; $n < $ord; ++$n) {
-								$fByp	= $n * $fTox * $fBy - $fBym;
-								$fBym	= $fBy;
-								$fBy	= $fByp;
-							}
-			}
-			return (is_nan($fBy)) ? PHPExcel_Calculation_Functions::NaN() : $fBy;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BESSELY()
-
-
-	/**
-	 * BINTODEC
-	 *
-	 * Return a binary value as decimal.
-	 *
-	 * Excel Function:
-	 *		BIN2DEC(x)
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The binary number (as a string) that you want to convert. The number
-	 *								cannot contain more than 10 characters (10 bits). The most significant
-	 *								bit of number is the sign bit. The remaining 9 bits are magnitude bits.
-	 *								Negative numbers are represented using two's-complement notation.
-	 *								If number is not a valid binary number, or if number contains more than
-	 *								10 characters (10 bits), BIN2DEC returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function BINTODEC($x) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-			$x = floor($x);
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[01]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if (strlen($x) > 10) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (strlen($x) == 10) {
-			//	Two's Complement
-			$x = substr($x,-9);
-			return '-'.(512-bindec($x));
-		}
-		return bindec($x);
-	}	//	function BINTODEC()
-
-
-	/**
-	 * BINTOHEX
-	 *
-	 * Return a binary value as hex.
-	 *
-	 * Excel Function:
-	 *		BIN2HEX(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The binary number (as a string) that you want to convert. The number
-	 *								cannot contain more than 10 characters (10 bits). The most significant
-	 *								bit of number is the sign bit. The remaining 9 bits are magnitude bits.
-	 *								Negative numbers are represented using two's-complement notation.
-	 *								If number is not a valid binary number, or if number contains more than
-	 *								10 characters (10 bits), BIN2HEX returns the #NUM! error value.
-	 * @param	integer		$places	The number of characters to use. If places is omitted, BIN2HEX uses the
-	 *								minimum number of characters necessary. Places is useful for padding the
-	 *								return value with leading 0s (zeros).
-	 *								If places is not an integer, it is truncated.
-	 *								If places is nonnumeric, BIN2HEX returns the #VALUE! error value.
-	 *								If places is negative, BIN2HEX returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function BINTOHEX($x, $places=NULL) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-			$x = floor($x);
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[01]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if (strlen($x) > 10) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (strlen($x) == 10) {
-			//	Two's Complement
-			return str_repeat('F',8).substr(strtoupper(dechex(bindec(substr($x,-9)))),-2);
-		}
-		$hexVal = (string) strtoupper(dechex(bindec($x)));
-
-		return self::_nbrConversionFormat($hexVal,$places);
-	}	//	function BINTOHEX()
-
-
-	/**
-	 * BINTOOCT
-	 *
-	 * Return a binary value as octal.
-	 *
-	 * Excel Function:
-	 *		BIN2OCT(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The binary number (as a string) that you want to convert. The number
-	 *								cannot contain more than 10 characters (10 bits). The most significant
-	 *								bit of number is the sign bit. The remaining 9 bits are magnitude bits.
-	 *								Negative numbers are represented using two's-complement notation.
-	 *								If number is not a valid binary number, or if number contains more than
-	 *								10 characters (10 bits), BIN2OCT returns the #NUM! error value.
-	 * @param	integer		$places	The number of characters to use. If places is omitted, BIN2OCT uses the
-	 *								minimum number of characters necessary. Places is useful for padding the
-	 *								return value with leading 0s (zeros).
-	 *								If places is not an integer, it is truncated.
-	 *								If places is nonnumeric, BIN2OCT returns the #VALUE! error value.
-	 *								If places is negative, BIN2OCT returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function BINTOOCT($x, $places=NULL) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-			$x = floor($x);
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[01]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if (strlen($x) > 10) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (strlen($x) == 10) {
-			//	Two's Complement
-			return str_repeat('7',7).substr(strtoupper(decoct(bindec(substr($x,-9)))),-3);
-		}
-		$octVal = (string) decoct(bindec($x));
-
-		return self::_nbrConversionFormat($octVal,$places);
-	}	//	function BINTOOCT()
-
-
-	/**
-	 * DECTOBIN
-	 *
-	 * Return a decimal value as binary.
-	 *
-	 * Excel Function:
-	 *		DEC2BIN(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The decimal integer you want to convert. If number is negative,
-	 *								valid place values are ignored and DEC2BIN returns a 10-character
-	 *								(10-bit) binary number in which the most significant bit is the sign
-	 *								bit. The remaining 9 bits are magnitude bits. Negative numbers are
-	 *								represented using two's-complement notation.
-	 *								If number < -512 or if number > 511, DEC2BIN returns the #NUM! error
-	 *								value.
-	 *								If number is nonnumeric, DEC2BIN returns the #VALUE! error value.
-	 *								If DEC2BIN requires more than places characters, it returns the #NUM!
-	 *								error value.
-	 * @param	integer		$places	The number of characters to use. If places is omitted, DEC2BIN uses
-	 *								the minimum number of characters necessary. Places is useful for
-	 *								padding the return value with leading 0s (zeros).
-	 *								If places is not an integer, it is truncated.
-	 *								If places is nonnumeric, DEC2BIN returns the #VALUE! error value.
-	 *								If places is zero or negative, DEC2BIN returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function DECTOBIN($x, $places=NULL) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[-0123456789.]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) floor($x);
-		$r = decbin($x);
-		if (strlen($r) == 32) {
-			//	Two's Complement
-			$r = substr($r,-10);
-		} elseif (strlen($r) > 11) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return self::_nbrConversionFormat($r,$places);
-	}	//	function DECTOBIN()
-
-
-	/**
-	 * DECTOHEX
-	 *
-	 * Return a decimal value as hex.
-	 *
-	 * Excel Function:
-	 *		DEC2HEX(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The decimal integer you want to convert. If number is negative,
-	 *								places is ignored and DEC2HEX returns a 10-character (40-bit)
-	 *								hexadecimal number in which the most significant bit is the sign
-	 *								bit. The remaining 39 bits are magnitude bits. Negative numbers
-	 *								are represented using two's-complement notation.
-	 *								If number < -549,755,813,888 or if number > 549,755,813,887,
-	 *								DEC2HEX returns the #NUM! error value.
-	 *								If number is nonnumeric, DEC2HEX returns the #VALUE! error value.
-	 *								If DEC2HEX requires more than places characters, it returns the
-	 *								#NUM! error value.
-	 * @param	integer		$places	The number of characters to use. If places is omitted, DEC2HEX uses
-	 *								the minimum number of characters necessary. Places is useful for
-	 *								padding the return value with leading 0s (zeros).
-	 *								If places is not an integer, it is truncated.
-	 *								If places is nonnumeric, DEC2HEX returns the #VALUE! error value.
-	 *								If places is zero or negative, DEC2HEX returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function DECTOHEX($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[-0123456789.]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) floor($x);
-		$r = strtoupper(dechex($x));
-		if (strlen($r) == 8) {
-			//	Two's Complement
-			$r = 'FF'.$r;
-		}
-
-		return self::_nbrConversionFormat($r,$places);
-	}	//	function DECTOHEX()
-
-
-	/**
-	 * DECTOOCT
-	 *
-	 * Return an decimal value as octal.
-	 *
-	 * Excel Function:
-	 *		DEC2OCT(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The decimal integer you want to convert. If number is negative,
-	 *								places is ignored and DEC2OCT returns a 10-character (30-bit)
-	 *								octal number in which the most significant bit is the sign bit.
-	 *								The remaining 29 bits are magnitude bits. Negative numbers are
-	 *								represented using two's-complement notation.
-	 *								If number < -536,870,912 or if number > 536,870,911, DEC2OCT
-	 *								returns the #NUM! error value.
-	 *								If number is nonnumeric, DEC2OCT returns the #VALUE! error value.
-	 *								If DEC2OCT requires more than places characters, it returns the
-	 *								#NUM! error value.
-	 * @param	integer		$places	The number of characters to use. If places is omitted, DEC2OCT uses
-	 *								the minimum number of characters necessary. Places is useful for
-	 *								padding the return value with leading 0s (zeros).
-	 *								If places is not an integer, it is truncated.
-	 *								If places is nonnumeric, DEC2OCT returns the #VALUE! error value.
-	 *								If places is zero or negative, DEC2OCT returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function DECTOOCT($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$x = (int) $x;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[-0123456789.]/',$x,$out)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) floor($x);
-		$r = decoct($x);
-		if (strlen($r) == 11) {
-			//	Two's Complement
-			$r = substr($r,-10);
-		}
-
-		return self::_nbrConversionFormat($r,$places);
-	}	//	function DECTOOCT()
-
-
-	/**
-	 * HEXTOBIN
-	 *
-	 * Return a hex value as binary.
-	 *
-	 * Excel Function:
-	 *		HEX2BIN(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x			the hexadecimal number you want to convert. Number cannot
-	 *									contain more than 10 characters. The most significant bit of
-	 *									number is the sign bit (40th bit from the right). The remaining
-	 *									9 bits are magnitude bits. Negative numbers are represented
-	 *									using two's-complement notation.
-	 *									If number is negative, HEX2BIN ignores places and returns a
-	 *									10-character binary number.
-	 *									If number is negative, it cannot be less than FFFFFFFE00, and
-	 *									if number is positive, it cannot be greater than 1FF.
-	 *									If number is not a valid hexadecimal number, HEX2BIN returns
-	 *									the #NUM! error value.
-	 *									If HEX2BIN requires more than places characters, it returns
-	 *									the #NUM! error value.
-	 * @param	integer		$places		The number of characters to use. If places is omitted,
-	 *									HEX2BIN uses the minimum number of characters necessary. Places
-	 *									is useful for padding the return value with leading 0s (zeros).
-	 *									If places is not an integer, it is truncated.
-	 *									If places is nonnumeric, HEX2BIN returns the #VALUE! error value.
-	 *									If places is negative, HEX2BIN returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function HEXTOBIN($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/',strtoupper($x),$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$binVal = decbin(hexdec($x));
-
-		return substr(self::_nbrConversionFormat($binVal,$places),-10);
-	}	//	function HEXTOBIN()
-
-
-	/**
-	 * HEXTODEC
-	 *
-	 * Return a hex value as decimal.
-	 *
-	 * Excel Function:
-	 *		HEX2DEC(x)
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The hexadecimal number you want to convert. This number cannot
-	 *								contain more than 10 characters (40 bits). The most significant
-	 *								bit of number is the sign bit. The remaining 39 bits are magnitude
-	 *								bits. Negative numbers are represented using two's-complement
-	 *								notation.
-	 *								If number is not a valid hexadecimal number, HEX2DEC returns the
-	 *								#NUM! error value.
-	 * @return	string
-	 */
-	public static function HEXTODEC($x) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/',strtoupper($x),$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		return hexdec($x);
-	}	//	function HEXTODEC()
-
-
-	/**
-	 * HEXTOOCT
-	 *
-	 * Return a hex value as octal.
-	 *
-	 * Excel Function:
-	 *		HEX2OCT(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x			The hexadecimal number you want to convert. Number cannot
-	 *									contain more than 10 characters. The most significant bit of
-	 *									number is the sign bit. The remaining 39 bits are magnitude
-	 *									bits. Negative numbers are represented using two's-complement
-	 *									notation.
-	 *									If number is negative, HEX2OCT ignores places and returns a
-	 *									10-character octal number.
-	 *									If number is negative, it cannot be less than FFE0000000, and
-	 *									if number is positive, it cannot be greater than 1FFFFFFF.
-	 *									If number is not a valid hexadecimal number, HEX2OCT returns
-	 *									the #NUM! error value.
-	 *									If HEX2OCT requires more than places characters, it returns
-	 *									the #NUM! error value.
-	 * @param	integer		$places		The number of characters to use. If places is omitted, HEX2OCT
-	 *									uses the minimum number of characters necessary. Places is
-	 *									useful for padding the return value with leading 0s (zeros).
-	 *									If places is not an integer, it is truncated.
-	 *									If places is nonnumeric, HEX2OCT returns the #VALUE! error
-	 *									value.
-	 *									If places is negative, HEX2OCT returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function HEXTOOCT($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/',strtoupper($x),$out)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$octVal = decoct(hexdec($x));
-
-		return self::_nbrConversionFormat($octVal,$places);
-	}	//	function HEXTOOCT()
-
-
-	/**
-	 * OCTTOBIN
-	 *
-	 * Return an octal value as binary.
-	 *
-	 * Excel Function:
-	 *		OCT2BIN(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x			The octal number you want to convert. Number may not
-	 *									contain more than 10 characters. The most significant
-	 *									bit of number is the sign bit. The remaining 29 bits
-	 *									are magnitude bits. Negative numbers are represented
-	 *									using two's-complement notation.
-	 *									If number is negative, OCT2BIN ignores places and returns
-	 *									a 10-character binary number.
-	 *									If number is negative, it cannot be less than 7777777000,
-	 *									and if number is positive, it cannot be greater than 777.
-	 *									If number is not a valid octal number, OCT2BIN returns
-	 *									the #NUM! error value.
-	 *									If OCT2BIN requires more than places characters, it
-	 *									returns the #NUM! error value.
-	 * @param	integer		$places		The number of characters to use. If places is omitted,
-	 *									OCT2BIN uses the minimum number of characters necessary.
-	 *									Places is useful for padding the return value with
-	 *									leading 0s (zeros).
-	 *									If places is not an integer, it is truncated.
-	 *									If places is nonnumeric, OCT2BIN returns the #VALUE!
-	 *									error value.
-	 *									If places is negative, OCT2BIN returns the #NUM! error
-	 *									value.
-	 * @return	string
-	 */
-	public static function OCTTOBIN($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (preg_match_all('/[01234567]/',$x,$out) != strlen($x)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$r = decbin(octdec($x));
-
-		return self::_nbrConversionFormat($r,$places);
-	}	//	function OCTTOBIN()
-
-
-	/**
-	 * OCTTODEC
-	 *
-	 * Return an octal value as decimal.
-	 *
-	 * Excel Function:
-	 *		OCT2DEC(x)
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x		The octal number you want to convert. Number may not contain
-	 *								more than 10 octal characters (30 bits). The most significant
-	 *								bit of number is the sign bit. The remaining 29 bits are
-	 *								magnitude bits. Negative numbers are represented using
-	 *								two's-complement notation.
-	 *								If number is not a valid octal number, OCT2DEC returns the
-	 *								#NUM! error value.
-	 * @return	string
-	 */
-	public static function OCTTODEC($x) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (preg_match_all('/[01234567]/',$x,$out) != strlen($x)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		return octdec($x);
-	}	//	function OCTTODEC()
-
-
-	/**
-	 * OCTTOHEX
-	 *
-	 * Return an octal value as hex.
-	 *
-	 * Excel Function:
-	 *		OCT2HEX(x[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$x			The octal number you want to convert. Number may not contain
-	 *									more than 10 octal characters (30 bits). The most significant
-	 *									bit of number is the sign bit. The remaining 29 bits are
-	 *									magnitude bits. Negative numbers are represented using
-	 *									two's-complement notation.
-	 *									If number is negative, OCT2HEX ignores places and returns a
-	 *									10-character hexadecimal number.
-	 *									If number is not a valid octal number, OCT2HEX returns the
-	 *									#NUM! error value.
-	 *									If OCT2HEX requires more than places characters, it returns
-	 *									the #NUM! error value.
-	 * @param	integer		$places		The number of characters to use. If places is omitted, OCT2HEX
-	 *									uses the minimum number of characters necessary. Places is useful
-	 *									for padding the return value with leading 0s (zeros).
-	 *									If places is not an integer, it is truncated.
-	 *									If places is nonnumeric, OCT2HEX returns the #VALUE! error value.
-	 *									If places is negative, OCT2HEX returns the #NUM! error value.
-	 * @return	string
-	 */
-	public static function OCTTOHEX($x, $places=null) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
-
-		if (is_bool($x)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$x = (string) $x;
-		if (preg_match_all('/[01234567]/',$x,$out) != strlen($x)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$hexVal = strtoupper(dechex(octdec($x)));
-
-		return self::_nbrConversionFormat($hexVal,$places);
-	}	//	function OCTTOHEX()
-
-
-	/**
-	 * COMPLEX
-	 *
-	 * Converts real and imaginary coefficients into a complex number of the form x + yi or x + yj.
-	 *
-	 * Excel Function:
-	 *		COMPLEX(realNumber,imaginary[,places])
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	float		$realNumber		The real coefficient of the complex number.
-	 * @param	float		$imaginary		The imaginary coefficient of the complex number.
-	 * @param	string		$suffix			The suffix for the imaginary component of the complex number.
-	 *										If omitted, the suffix is assumed to be "i".
-	 * @return	string
-	 */
-	public static function COMPLEX($realNumber=0.0, $imaginary=0.0, $suffix='i') {
-		$realNumber	= (is_null($realNumber))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($realNumber);
-		$imaginary	= (is_null($imaginary))		? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($imaginary);
-		$suffix		= (is_null($suffix))		? 'i' :	PHPExcel_Calculation_Functions::flattenSingleValue($suffix);
-
-		if (((is_numeric($realNumber)) && (is_numeric($imaginary))) &&
-			(($suffix == 'i') || ($suffix == 'j') || ($suffix == ''))) {
-			$realNumber	= (float) $realNumber;
-			$imaginary	= (float) $imaginary;
-
-			if ($suffix == '') $suffix = 'i';
-			if ($realNumber == 0.0) {
-				if ($imaginary == 0.0) {
-					return (string) '0';
-				} elseif ($imaginary == 1.0) {
-					return (string) $suffix;
-				} elseif ($imaginary == -1.0) {
-					return (string) '-'.$suffix;
-				}
-				return (string) $imaginary.$suffix;
-			} elseif ($imaginary == 0.0) {
-				return (string) $realNumber;
-			} elseif ($imaginary == 1.0) {
-				return (string) $realNumber.'+'.$suffix;
-			} elseif ($imaginary == -1.0) {
-				return (string) $realNumber.'-'.$suffix;
-			}
-			if ($imaginary > 0) { $imaginary = (string) '+'.$imaginary; }
-			return (string) $realNumber.$imaginary.$suffix;
-		}
-
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function COMPLEX()
-
-
-	/**
-	 * IMAGINARY
-	 *
-	 * Returns the imaginary coefficient of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMAGINARY(complexNumber)
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$complexNumber	The complex number for which you want the imaginary
-	 * 										coefficient.
-	 * @return	float
-	 */
-	public static function IMAGINARY($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-		return $parsedComplex['imaginary'];
-	}	//	function IMAGINARY()
-
-
-	/**
-	 * IMREAL
-	 *
-	 * Returns the real coefficient of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMREAL(complexNumber)
-	 *
-	 * @access	public
-	 * @category Engineering Functions
-	 * @param	string		$complexNumber	The complex number for which you want the real coefficient.
-	 * @return	float
-	 */
-	public static function IMREAL($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-		return $parsedComplex['real'];
-	}	//	function IMREAL()
-
-
-	/**
-	 * IMABS
-	 *
-	 * Returns the absolute value (modulus) of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMABS(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the absolute value.
-	 * @return	float
-	 */
-	public static function IMABS($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		return sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary']));
-	}	//	function IMABS()
-
-
-	/**
-	 * IMARGUMENT
-	 *
-	 * Returns the argument theta of a complex number, i.e. the angle in radians from the real
-	 * axis to the representation of the number in polar coordinates.
-	 *
-	 * Excel Function:
-	 *		IMARGUMENT(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the argument theta.
-	 * @return	float
-	 */
-	public static function IMARGUMENT($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if ($parsedComplex['real'] == 0.0) {
-			if ($parsedComplex['imaginary'] == 0.0) {
-				return 0.0;
-			} elseif($parsedComplex['imaginary'] < 0.0) {
-				return M_PI / -2;
-			} else {
-				return M_PI / 2;
-			}
-		} elseif ($parsedComplex['real'] > 0.0) {
-			return atan($parsedComplex['imaginary'] / $parsedComplex['real']);
-		} elseif ($parsedComplex['imaginary'] < 0.0) {
-			return 0 - (M_PI - atan(abs($parsedComplex['imaginary']) / abs($parsedComplex['real'])));
-		} else {
-			return M_PI - atan($parsedComplex['imaginary'] / abs($parsedComplex['real']));
-		}
-	}	//	function IMARGUMENT()
-
-
-	/**
-	 * IMCONJUGATE
-	 *
-	 * Returns the complex conjugate of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMCONJUGATE(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the conjugate.
-	 * @return	string
-	 */
-	public static function IMCONJUGATE($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if ($parsedComplex['imaginary'] == 0.0) {
-			return $parsedComplex['real'];
-		} else {
-			return self::_cleanComplex( self::COMPLEX( $parsedComplex['real'],
-													   0 - $parsedComplex['imaginary'],
-													   $parsedComplex['suffix']
-													 )
-									  );
-		}
-	}	//	function IMCONJUGATE()
-
-
-	/**
-	 * IMCOS
-	 *
-	 * Returns the cosine of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMCOS(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the cosine.
-	 * @return	string|float
-	 */
-	public static function IMCOS($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if ($parsedComplex['imaginary'] == 0.0) {
-			return cos($parsedComplex['real']);
-		} else {
-			return self::IMCONJUGATE(self::COMPLEX(cos($parsedComplex['real']) * cosh($parsedComplex['imaginary']),sin($parsedComplex['real']) * sinh($parsedComplex['imaginary']),$parsedComplex['suffix']));
-		}
-	}	//	function IMCOS()
-
-
-	/**
-	 * IMSIN
-	 *
-	 * Returns the sine of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMSIN(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the sine.
-	 * @return	string|float
-	 */
-	public static function IMSIN($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if ($parsedComplex['imaginary'] == 0.0) {
-			return sin($parsedComplex['real']);
-		} else {
-			return self::COMPLEX(sin($parsedComplex['real']) * cosh($parsedComplex['imaginary']),cos($parsedComplex['real']) * sinh($parsedComplex['imaginary']),$parsedComplex['suffix']);
-		}
-	}	//	function IMSIN()
-
-
-	/**
-	 * IMSQRT
-	 *
-	 * Returns the square root of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMSQRT(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the square root.
-	 * @return	string
-	 */
-	public static function IMSQRT($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		$theta = self::IMARGUMENT($complexNumber);
-		$d1 = cos($theta / 2);
-		$d2 = sin($theta / 2);
-		$r = sqrt(sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary'])));
-
-		if ($parsedComplex['suffix'] == '') {
-			return self::COMPLEX($d1 * $r,$d2 * $r);
-		} else {
-			return self::COMPLEX($d1 * $r,$d2 * $r,$parsedComplex['suffix']);
-		}
-	}	//	function IMSQRT()
-
-
-	/**
-	 * IMLN
-	 *
-	 * Returns the natural logarithm of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMLN(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the natural logarithm.
-	 * @return	string
-	 */
-	public static function IMLN($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$logR = log(sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary'])));
-		$t = self::IMARGUMENT($complexNumber);
-
-		if ($parsedComplex['suffix'] == '') {
-			return self::COMPLEX($logR,$t);
-		} else {
-			return self::COMPLEX($logR,$t,$parsedComplex['suffix']);
-		}
-	}	//	function IMLN()
-
-
-	/**
-	 * IMLOG10
-	 *
-	 * Returns the common logarithm (base 10) of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMLOG10(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the common logarithm.
-	 * @return	string
-	 */
-	public static function IMLOG10($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (($parsedComplex['real'] > 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return log10($parsedComplex['real']);
-		}
-
-		return self::IMPRODUCT(log10(EULER),self::IMLN($complexNumber));
-	}	//	function IMLOG10()
-
-
-	/**
-	 * IMLOG2
-	 *
-	 * Returns the common logarithm (base 10) of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMLOG2(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the base-2 logarithm.
-	 * @return	string
-	 */
-	public static function IMLOG2($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (($parsedComplex['real'] > 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return log($parsedComplex['real'],2);
-		}
-
-		return self::IMPRODUCT(log(EULER,2),self::IMLN($complexNumber));
-	}	//	function IMLOG2()
-
-
-	/**
-	 * IMEXP
-	 *
-	 * Returns the exponential of a complex number in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMEXP(complexNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number for which you want the exponential.
-	 * @return	string
-	 */
-	public static function IMEXP($complexNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
-			return '1';
-		}
-
-		$e = exp($parsedComplex['real']);
-		$eX = $e * cos($parsedComplex['imaginary']);
-		$eY = $e * sin($parsedComplex['imaginary']);
-
-		if ($parsedComplex['suffix'] == '') {
-			return self::COMPLEX($eX,$eY);
-		} else {
-			return self::COMPLEX($eX,$eY,$parsedComplex['suffix']);
-		}
-	}	//	function IMEXP()
-
-
-	/**
-	 * IMPOWER
-	 *
-	 * Returns a complex number in x + yi or x + yj text format raised to a power.
-	 *
-	 * Excel Function:
-	 *		IMPOWER(complexNumber,realNumber)
-	 *
-	 * @param	string		$complexNumber	The complex number you want to raise to a power.
-	 * @param	float		$realNumber		The power to which you want to raise the complex number.
-	 * @return	string
-	 */
-	public static function IMPOWER($complexNumber,$realNumber) {
-		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
-		$realNumber		= PHPExcel_Calculation_Functions::flattenSingleValue($realNumber);
-
-		if (!is_numeric($realNumber)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		$parsedComplex = self::_parseComplex($complexNumber);
-
-		$r = sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary']));
-		$rPower = pow($r,$realNumber);
-		$theta = self::IMARGUMENT($complexNumber) * $realNumber;
-		if ($theta == 0) {
-			return 1;
-		} elseif ($parsedComplex['imaginary'] == 0.0) {
-			return self::COMPLEX($rPower * cos($theta),$rPower * sin($theta),$parsedComplex['suffix']);
-		} else {
-			return self::COMPLEX($rPower * cos($theta),$rPower * sin($theta),$parsedComplex['suffix']);
-		}
-	}	//	function IMPOWER()
-
-
-	/**
-	 * IMDIV
-	 *
-	 * Returns the quotient of two complex numbers in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMDIV(complexDividend,complexDivisor)
-	 *
-	 * @param	string		$complexDividend	The complex numerator or dividend.
-	 * @param	string		$complexDivisor		The complex denominator or divisor.
-	 * @return	string
-	 */
-	public static function IMDIV($complexDividend,$complexDivisor) {
-		$complexDividend	= PHPExcel_Calculation_Functions::flattenSingleValue($complexDividend);
-		$complexDivisor	= PHPExcel_Calculation_Functions::flattenSingleValue($complexDivisor);
-
-		$parsedComplexDividend = self::_parseComplex($complexDividend);
-		$parsedComplexDivisor = self::_parseComplex($complexDivisor);
-
-		if (($parsedComplexDividend['suffix'] != '') && ($parsedComplexDivisor['suffix'] != '') &&
-			($parsedComplexDividend['suffix'] != $parsedComplexDivisor['suffix'])) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if (($parsedComplexDividend['suffix'] != '') && ($parsedComplexDivisor['suffix'] == '')) {
-			$parsedComplexDivisor['suffix'] = $parsedComplexDividend['suffix'];
-		}
-
-		$d1 = ($parsedComplexDividend['real'] * $parsedComplexDivisor['real']) + ($parsedComplexDividend['imaginary'] * $parsedComplexDivisor['imaginary']);
-		$d2 = ($parsedComplexDividend['imaginary'] * $parsedComplexDivisor['real']) - ($parsedComplexDividend['real'] * $parsedComplexDivisor['imaginary']);
-		$d3 = ($parsedComplexDivisor['real'] * $parsedComplexDivisor['real']) + ($parsedComplexDivisor['imaginary'] * $parsedComplexDivisor['imaginary']);
-
-		$r = $d1/$d3;
-		$i = $d2/$d3;
-
-		if ($i > 0.0) {
-			return self::_cleanComplex($r.'+'.$i.$parsedComplexDivisor['suffix']);
-		} elseif ($i < 0.0) {
-			return self::_cleanComplex($r.$i.$parsedComplexDivisor['suffix']);
-		} else {
-			return $r;
-		}
-	}	//	function IMDIV()
-
-
-	/**
-	 * IMSUB
-	 *
-	 * Returns the difference of two complex numbers in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMSUB(complexNumber1,complexNumber2)
-	 *
-	 * @param	string		$complexNumber1		The complex number from which to subtract complexNumber2.
-	 * @param	string		$complexNumber2		The complex number to subtract from complexNumber1.
-	 * @return	string
-	 */
-	public static function IMSUB($complexNumber1,$complexNumber2) {
-		$complexNumber1	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber1);
-		$complexNumber2	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber2);
-
-		$parsedComplex1 = self::_parseComplex($complexNumber1);
-		$parsedComplex2 = self::_parseComplex($complexNumber2);
-
-		if ((($parsedComplex1['suffix'] != '') && ($parsedComplex2['suffix'] != '')) &&
-			($parsedComplex1['suffix'] != $parsedComplex2['suffix'])) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif (($parsedComplex1['suffix'] == '') && ($parsedComplex2['suffix'] != '')) {
-			$parsedComplex1['suffix'] = $parsedComplex2['suffix'];
-		}
-
-		$d1 = $parsedComplex1['real'] - $parsedComplex2['real'];
-		$d2 = $parsedComplex1['imaginary'] - $parsedComplex2['imaginary'];
-
-		return self::COMPLEX($d1,$d2,$parsedComplex1['suffix']);
-	}	//	function IMSUB()
-
-
-	/**
-	 * IMSUM
-	 *
-	 * Returns the sum of two or more complex numbers in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMSUM(complexNumber[,complexNumber[,...]])
-	 *
-	 * @param	string		$complexNumber,...	Series of complex numbers to add
-	 * @return	string
-	 */
-	public static function IMSUM() {
-		// Return value
-		$returnValue = self::_parseComplex('0');
-		$activeSuffix = '';
-
-		// Loop through the arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			$parsedComplex = self::_parseComplex($arg);
-
-			if ($activeSuffix == '') {
-				$activeSuffix = $parsedComplex['suffix'];
-			} elseif (($parsedComplex['suffix'] != '') && ($activeSuffix != $parsedComplex['suffix'])) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-
-			$returnValue['real'] += $parsedComplex['real'];
-			$returnValue['imaginary'] += $parsedComplex['imaginary'];
-		}
-
-		if ($returnValue['imaginary'] == 0.0) { $activeSuffix = ''; }
-		return self::COMPLEX($returnValue['real'],$returnValue['imaginary'],$activeSuffix);
-	}	//	function IMSUM()
-
-
-	/**
-	 * IMPRODUCT
-	 *
-	 * Returns the product of two or more complex numbers in x + yi or x + yj text format.
-	 *
-	 * Excel Function:
-	 *		IMPRODUCT(complexNumber[,complexNumber[,...]])
-	 *
-	 * @param	string		$complexNumber,...	Series of complex numbers to multiply
-	 * @return	string
-	 */
-	public static function IMPRODUCT() {
-		// Return value
-		$returnValue = self::_parseComplex('1');
-		$activeSuffix = '';
-
-		// Loop through the arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			$parsedComplex = self::_parseComplex($arg);
-
-			$workValue = $returnValue;
-			if (($parsedComplex['suffix'] != '') && ($activeSuffix == '')) {
-				$activeSuffix = $parsedComplex['suffix'];
-			} elseif (($parsedComplex['suffix'] != '') && ($activeSuffix != $parsedComplex['suffix'])) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$returnValue['real'] = ($workValue['real'] * $parsedComplex['real']) - ($workValue['imaginary'] * $parsedComplex['imaginary']);
-			$returnValue['imaginary'] = ($workValue['real'] * $parsedComplex['imaginary']) + ($workValue['imaginary'] * $parsedComplex['real']);
-		}
-
-		if ($returnValue['imaginary'] == 0.0) { $activeSuffix = ''; }
-		return self::COMPLEX($returnValue['real'],$returnValue['imaginary'],$activeSuffix);
-	}	//	function IMPRODUCT()
-
-
-	/**
-	 *	DELTA
-	 *
-	 *	Tests whether two values are equal. Returns 1 if number1 = number2; returns 0 otherwise.
-	 *	Use this function to filter a set of values. For example, by summing several DELTA
-	 *	functions you calculate the count of equal pairs. This function is also known as the
-	 *	Kronecker Delta function.
-	 *
-	 *	Excel Function:
-	 *		DELTA(a[,b])
-	 *
-	 *	@param	float		$a	The first number.
-	 *	@param	float		$b	The second number. If omitted, b is assumed to be zero.
-	 *	@return	int
-	 */
-	public static function DELTA($a, $b=0) {
-		$a	= PHPExcel_Calculation_Functions::flattenSingleValue($a);
-		$b	= PHPExcel_Calculation_Functions::flattenSingleValue($b);
-
-		return (int) ($a == $b);
-	}	//	function DELTA()
-
-
-	/**
-	 *	GESTEP
-	 *
-	 *	Excel Function:
-	 *		GESTEP(number[,step])
-	 *
-	 *	Returns 1 if number >= step; returns 0 (zero) otherwise
-	 *	Use this function to filter a set of values. For example, by summing several GESTEP
-	 *	functions you calculate the count of values that exceed a threshold.
-	 *
-	 *	@param	float		$number		The value to test against step.
-	 *	@param	float		$step		The threshold value.
-	 *									If you omit a value for step, GESTEP uses zero.
-	 *	@return	int
-	 */
-	public static function GESTEP($number, $step=0) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$step	= PHPExcel_Calculation_Functions::flattenSingleValue($step);
-
-		return (int) ($number >= $step);
-	}	//	function GESTEP()
-
-
-	//
-	//	Private method to calculate the erf value
-	//
-	private static $_two_sqrtpi = 1.128379167095512574;
-
-	public static function _erfVal($x) {
-		if (abs($x) > 2.2) {
-			return 1 - self::_erfcVal($x);
-		}
-		$sum = $term = $x;
-		$xsqr = ($x * $x);
-		$j = 1;
-		do {
-			$term *= $xsqr / $j;
-			$sum -= $term / (2 * $j + 1);
-			++$j;
-			$term *= $xsqr / $j;
-			$sum += $term / (2 * $j + 1);
-			++$j;
-			if ($sum == 0.0) {
-				break;
-			}
-		} while (abs($term / $sum) > PRECISION);
-		return self::$_two_sqrtpi * $sum;
-	}	//	function _erfVal()
-
-
-	/**
-	 *	ERF
-	 *
-	 *	Returns the error function integrated between the lower and upper bound arguments.
-	 *
-	 *	Note: In Excel 2007 or earlier, if you input a negative value for the upper or lower bound arguments,
-	 *			the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
-	 *			improved, so that it can now calculate the function for both positive and negative ranges.
-	 *			PHPExcel follows Excel 2010 behaviour, and accepts nagative arguments.
-	 *
-	 *	Excel Function:
-	 *		ERF(lower[,upper])
-	 *
-	 *	@param	float		$lower	lower bound for integrating ERF
-	 *	@param	float		$upper	upper bound for integrating ERF.
-	 *								If omitted, ERF integrates between zero and lower_limit
-	 *	@return	float
-	 */
-	public static function ERF($lower, $upper = NULL) {
-		$lower	= PHPExcel_Calculation_Functions::flattenSingleValue($lower);
-		$upper	= PHPExcel_Calculation_Functions::flattenSingleValue($upper);
-
-		if (is_numeric($lower)) {
-			if (is_null($upper)) {
-				return self::_erfVal($lower);
-			}
-			if (is_numeric($upper)) {
-				return self::_erfVal($upper) - self::_erfVal($lower);
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ERF()
-
-
-	//
-	//	Private method to calculate the erfc value
-	//
-	private static $_one_sqrtpi = 0.564189583547756287;
-
-	private static function _erfcVal($x) {
-		if (abs($x) < 2.2) {
-			return 1 - self::_erfVal($x);
-		}
-		if ($x < 0) {
-			return 2 - self::ERFC(-$x);
-		}
-		$a = $n = 1;
-		$b = $c = $x;
-		$d = ($x * $x) + 0.5;
-		$q1 = $q2 = $b / $d;
-		$t = 0;
-		do {
-			$t = $a * $n + $b * $x;
-			$a = $b;
-			$b = $t;
-			$t = $c * $n + $d * $x;
-			$c = $d;
-			$d = $t;
-			$n += 0.5;
-			$q1 = $q2;
-			$q2 = $b / $d;
-		} while ((abs($q1 - $q2) / $q2) > PRECISION);
-		return self::$_one_sqrtpi * exp(-$x * $x) * $q2;
-	}	//	function _erfcVal()
-
-
-	/**
-	 *	ERFC
-	 *
-	 *	Returns the complementary ERF function integrated between x and infinity
-	 *
-	 *	Note: In Excel 2007 or earlier, if you input a negative value for the lower bound argument,
-	 *		the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
-	 *		improved, so that it can now calculate the function for both positive and negative x values.
-	 *			PHPExcel follows Excel 2010 behaviour, and accepts nagative arguments.
-	 *
-	 *	Excel Function:
-	 *		ERFC(x)
-	 *
-	 *	@param	float	$x	The lower bound for integrating ERFC
-	 *	@return	float
-	 */
-	public static function ERFC($x) {
-		$x = PHPExcel_Calculation_Functions::flattenSingleValue($x);
-
-		if (is_numeric($x)) {
-			return self::_erfcVal($x);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ERFC()
-
-
-	/**
-	 *	getConversionGroups
-	 *	Returns a list of the different conversion groups for UOM conversions
-	 *
-	 *	@return	array
-	 */
-	public static function getConversionGroups() {
-		$conversionGroups = array();
-		foreach(self::$_conversionUnits as $conversionUnit) {
-			$conversionGroups[] = $conversionUnit['Group'];
-		}
-		return array_merge(array_unique($conversionGroups));
-	}	//	function getConversionGroups()
-
-
-	/**
-	 *	getConversionGroupUnits
-	 *	Returns an array of units of measure, for a specified conversion group, or for all groups
-	 *
-	 *	@param	string	$group	The group whose units of measure you want to retrieve
-	 *
-	 *	@return	array
-	 */
-	public static function getConversionGroupUnits($group = NULL) {
-		$conversionGroups = array();
-		foreach(self::$_conversionUnits as $conversionUnit => $conversionGroup) {
-			if ((is_null($group)) || ($conversionGroup['Group'] == $group)) {
-				$conversionGroups[$conversionGroup['Group']][] = $conversionUnit;
-			}
-		}
-		return $conversionGroups;
-	}	//	function getConversionGroupUnits()
-
-
-	/**
-	 *	getConversionGroupUnitDetails
-	 *
-	 *	@return	array
-	 */
-	public static function getConversionGroupUnitDetails($group = NULL) {
-		$conversionGroups = array();
-		foreach(self::$_conversionUnits as $conversionUnit => $conversionGroup) {
-			if ((is_null($group)) || ($conversionGroup['Group'] == $group)) {
-				$conversionGroups[$conversionGroup['Group']][] = array(	'unit'			=> $conversionUnit,
-																		'description'	=> $conversionGroup['Unit Name']
-																	  );
-			}
-		}
-		return $conversionGroups;
-	}	//	function getConversionGroupUnitDetails()
-
-
-	/**
-	 *	getConversionMultipliers
-	 *	Returns an array of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM()
-	 *
-	 *	@return	array of mixed
-	 */
-	public static function getConversionMultipliers() {
-		return self::$_conversionMultipliers;
-	}	//	function getConversionGroups()
-
-
-	/**
-	 *	CONVERTUOM
-	 *
-	 *	Converts a number from one measurement system to another.
-	 *	For example, CONVERT can translate a table of distances in miles to a table of distances
-	 *	in kilometers.
-	 *
-	 *	Excel Function:
-	 *		CONVERT(value,fromUOM,toUOM)
-	 *
-	 *	@param	float		$value		The value in fromUOM to convert.
-	 *	@param	string		$fromUOM	The units for value.
-	 *	@param	string		$toUOM		The units for the result.
-	 *
-	 *	@return	float
-	 */
-	public static function CONVERTUOM($value, $fromUOM, $toUOM) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$fromUOM	= PHPExcel_Calculation_Functions::flattenSingleValue($fromUOM);
-		$toUOM		= PHPExcel_Calculation_Functions::flattenSingleValue($toUOM);
-
-		if (!is_numeric($value)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$fromMultiplier = 1.0;
-		if (isset(self::$_conversionUnits[$fromUOM])) {
-			$unitGroup1 = self::$_conversionUnits[$fromUOM]['Group'];
-		} else {
-			$fromMultiplier = substr($fromUOM,0,1);
-			$fromUOM = substr($fromUOM,1);
-			if (isset(self::$_conversionMultipliers[$fromMultiplier])) {
-				$fromMultiplier = self::$_conversionMultipliers[$fromMultiplier]['multiplier'];
-			} else {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			if ((isset(self::$_conversionUnits[$fromUOM])) && (self::$_conversionUnits[$fromUOM]['AllowPrefix'])) {
-				$unitGroup1 = self::$_conversionUnits[$fromUOM]['Group'];
-			} else {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-		}
-		$value *= $fromMultiplier;
-
-		$toMultiplier = 1.0;
-		if (isset(self::$_conversionUnits[$toUOM])) {
-			$unitGroup2 = self::$_conversionUnits[$toUOM]['Group'];
-		} else {
-			$toMultiplier = substr($toUOM,0,1);
-			$toUOM = substr($toUOM,1);
-			if (isset(self::$_conversionMultipliers[$toMultiplier])) {
-				$toMultiplier = self::$_conversionMultipliers[$toMultiplier]['multiplier'];
-			} else {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			if ((isset(self::$_conversionUnits[$toUOM])) && (self::$_conversionUnits[$toUOM]['AllowPrefix'])) {
-				$unitGroup2 = self::$_conversionUnits[$toUOM]['Group'];
-			} else {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-		}
-		if ($unitGroup1 != $unitGroup2) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		if (($fromUOM == $toUOM) && ($fromMultiplier == $toMultiplier)) {
-			//	We've already factored $fromMultiplier into the value, so we need
-			//		to reverse it again
-			return $value / $fromMultiplier;
-		} elseif ($unitGroup1 == 'Temperature') {
-			if (($fromUOM == 'F') || ($fromUOM == 'fah')) {
-				if (($toUOM == 'F') || ($toUOM == 'fah')) {
-					return $value;
-				} else {
-					$value = (($value - 32) / 1.8);
-					if (($toUOM == 'K') || ($toUOM == 'kel')) {
-						$value += 273.15;
-					}
-					return $value;
-				}
-			} elseif ((($fromUOM == 'K') || ($fromUOM == 'kel')) &&
-					  (($toUOM == 'K') || ($toUOM == 'kel'))) {
-						return $value;
-			} elseif ((($fromUOM == 'C') || ($fromUOM == 'cel')) &&
-					  (($toUOM == 'C') || ($toUOM == 'cel'))) {
-					return $value;
-			}
-			if (($toUOM == 'F') || ($toUOM == 'fah')) {
-				if (($fromUOM == 'K') || ($fromUOM == 'kel')) {
-					$value -= 273.15;
-				}
-				return ($value * 1.8) + 32;
-			}
-			if (($toUOM == 'C') || ($toUOM == 'cel')) {
-				return $value - 273.15;
-			}
-			return $value + 273.15;
-		}
-		return ($value * self::$_unitConversions[$unitGroup1][$fromUOM][$toUOM]) / $toMultiplier;
-	}	//	function CONVERTUOM()
-
-}	//	class PHPExcel_Calculation_Engineering
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/Exception.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/Exception.php
deleted file mode 100755
index 29ae85119..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/Exception.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Calculation_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Exception extends Exception {
-	/**
-	 * Error handler callback
-	 *
-	 * @param mixed $code
-	 * @param mixed $string
-	 * @param mixed $file
-	 * @param mixed $line
-	 * @param mixed $context
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/ExceptionHandler.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/ExceptionHandler.php
deleted file mode 100755
index 68c122410..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/ExceptionHandler.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Calculation_ExceptionHandler
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_ExceptionHandler {
-	/**
-	 * Register errorhandler
-	 */
-	public function __construct() {
-		set_error_handler(array('PHPExcel_Calculation_Exception', 'errorHandlerCallback'), E_ALL);
-	}
-
-	/**
-	 * Unregister errorhandler
-	 */
-	public function __destruct() {
-		restore_error_handler();
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/Financial.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/Financial.php
deleted file mode 100755
index e507f05f5..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/Financial.php
+++ /dev/null
@@ -1,2248 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/** FINANCIAL_MAX_ITERATIONS */
-define('FINANCIAL_MAX_ITERATIONS', 128);
-
-/** FINANCIAL_PRECISION */
-define('FINANCIAL_PRECISION', 1.0e-08);
-
-
-/**
- * PHPExcel_Calculation_Financial
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Financial {
-
-	/**
-	 * _lastDayOfMonth
-	 *
-	 * Returns a boolean TRUE/FALSE indicating if this date is the last date of the month
-	 *
-	 * @param	DateTime	$testDate	The date for testing
-	 * @return	boolean
-	 */
-	private static function _lastDayOfMonth($testDate)
-	{
-		return ($testDate->format('d') == $testDate->format('t'));
-	}	//	function _lastDayOfMonth()
-
-
-	/**
-	 * _firstDayOfMonth
-	 *
-	 * Returns a boolean TRUE/FALSE indicating if this date is the first date of the month
-	 *
-	 * @param	DateTime	$testDate	The date for testing
-	 * @return	boolean
-	 */
-	private static function _firstDayOfMonth($testDate)
-	{
-		return ($testDate->format('d') == 1);
-	}	//	function _firstDayOfMonth()
-
-
-	private static function _coupFirstPeriodDate($settlement, $maturity, $frequency, $next)
-	{
-		$months = 12 / $frequency;
-
-		$result = PHPExcel_Shared_Date::ExcelToPHPObject($maturity);
-		$eom = self::_lastDayOfMonth($result);
-
-		while ($settlement < PHPExcel_Shared_Date::PHPToExcel($result)) {
-			$result->modify('-'.$months.' months');
-		}
-		if ($next) {
-			$result->modify('+'.$months.' months');
-		}
-
-		if ($eom) {
-			$result->modify('-1 day');
-		}
-
-		return PHPExcel_Shared_Date::PHPToExcel($result);
-	}	//	function _coupFirstPeriodDate()
-
-
-	private static function _validFrequency($frequency)
-	{
-		if (($frequency == 1) || ($frequency == 2) || ($frequency == 4)) {
-			return true;
-		}
-		if ((PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) &&
-			(($frequency == 6) || ($frequency == 12))) {
-			return true;
-		}
-		return false;
-	}	//	function _validFrequency()
-
-
-	/**
-	 * _daysPerYear
-	 *
-	 * Returns the number of days in a specified year, as defined by the "basis" value
-	 *
-	 * @param	integer		$year	The year against which we're testing
-	 * @param   integer		$basis	The type of day count:
-	 *									0 or omitted US (NASD)	360
-	 *									1						Actual (365 or 366 in a leap year)
-	 *									2						360
-	 *									3						365
-	 *									4						European 360
-	 * @return	integer
-	 */
-	private static function _daysPerYear($year, $basis=0)
-	{
-		switch ($basis) {
-			case 0 :
-			case 2 :
-			case 4 :
-				$daysPerYear = 360;
-				break;
-			case 3 :
-				$daysPerYear = 365;
-				break;
-			case 1 :
-				$daysPerYear = (PHPExcel_Calculation_DateTime::_isLeapYear($year)) ? 366 : 365;
-				break;
-			default	:
-				return PHPExcel_Calculation_Functions::NaN();
-		}
-		return $daysPerYear;
-	}	//	function _daysPerYear()
-
-
-	private static function _interestAndPrincipal($rate=0, $per=0, $nper=0, $pv=0, $fv=0, $type=0)
-	{
-		$pmt = self::PMT($rate, $nper, $pv, $fv, $type);
-		$capital = $pv;
-		for ($i = 1; $i<= $per; ++$i) {
-			$interest = ($type && $i == 1) ? 0 : -$capital * $rate;
-			$principal = $pmt - $interest;
-			$capital += $principal;
-		}
-		return array($interest, $principal);
-	}	//	function _interestAndPrincipal()
-
-
-	/**
-	 * ACCRINT
-	 *
-	 * Returns the accrued interest for a security that pays periodic interest.
-	 *
-	 * Excel Function:
-	 *		ACCRINT(issue,firstinterest,settlement,rate,par,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	$issue			The security's issue date.
-	 * @param	mixed	$firstinterest	The security's first interest date.
-	 * @param	mixed	$settlement		The security's settlement date.
-	 *									The security settlement date is the date after the issue date
-	 *									when the security is traded to the buyer.
-	 * @param	float	$rate			The security's annual coupon rate.
-	 * @param	float	$par			The security's par value.
-	 *									If you omit par, ACCRINT uses $1,000.
-	 * @param	integer	$frequency		the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer	$basis			The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function ACCRINT($issue, $firstinterest, $settlement, $rate, $par=1000, $frequency=1, $basis=0)
-	{
-		$issue		= PHPExcel_Calculation_Functions::flattenSingleValue($issue);
-		$firstinterest	= PHPExcel_Calculation_Functions::flattenSingleValue($firstinterest);
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$rate		= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$par		= (is_null($par))		? 1000 :	PHPExcel_Calculation_Functions::flattenSingleValue($par);
-		$frequency	= (is_null($frequency))	? 1	: 		PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))		? 0	:		PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($rate)) && (is_numeric($par))) {
-			$rate	= (float) $rate;
-			$par	= (float) $par;
-			if (($rate <= 0) || ($par <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
-			if (!is_numeric($daysBetweenIssueAndSettlement)) {
-				//	return date error
-				return $daysBetweenIssueAndSettlement;
-			}
-
-			return $par * $rate * $daysBetweenIssueAndSettlement;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ACCRINT()
-
-
-	/**
-	 * ACCRINTM
-	 *
-	 * Returns the accrued interest for a security that pays interest at maturity.
-	 *
-	 * Excel Function:
-	 *		ACCRINTM(issue,settlement,rate[,par[,basis]])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	issue		The security's issue date.
-	 * @param	mixed	settlement	The security's settlement (or maturity) date.
-	 * @param	float	rate		The security's annual coupon rate.
-	 * @param	float	par			The security's par value.
-	 *									If you omit par, ACCRINT uses $1,000.
-	 * @param	integer	basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function ACCRINTM($issue, $settlement, $rate, $par=1000, $basis=0) {
-		$issue		= PHPExcel_Calculation_Functions::flattenSingleValue($issue);
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$rate		= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$par		= (is_null($par))	? 1000 :	PHPExcel_Calculation_Functions::flattenSingleValue($par);
-		$basis		= (is_null($basis))	? 0 :		PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($rate)) && (is_numeric($par))) {
-			$rate	= (float) $rate;
-			$par	= (float) $par;
-			if (($rate <= 0) || ($par <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
-			if (!is_numeric($daysBetweenIssueAndSettlement)) {
-				//	return date error
-				return $daysBetweenIssueAndSettlement;
-			}
-			return $par * $rate * $daysBetweenIssueAndSettlement;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ACCRINTM()
-
-
-	/**
-	 * AMORDEGRC
-	 *
-	 * Returns the depreciation for each accounting period.
-	 * This function is provided for the French accounting system. If an asset is purchased in
-	 * the middle of the accounting period, the prorated depreciation is taken into account.
-	 * The function is similar to AMORLINC, except that a depreciation coefficient is applied in
-	 * the calculation depending on the life of the assets.
-	 * This function will return the depreciation until the last period of the life of the assets
-	 * or until the cumulated value of depreciation is greater than the cost of the assets minus
-	 * the salvage value.
-	 *
-	 * Excel Function:
-	 *		AMORDEGRC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	cost		The cost of the asset.
-	 * @param	mixed	purchased	Date of the purchase of the asset.
-	 * @param	mixed	firstPeriod	Date of the end of the first period.
-	 * @param	mixed	salvage		The salvage value at the end of the life of the asset.
-	 * @param	float	period		The period.
-	 * @param	float	rate		Rate of depreciation.
-	 * @param	integer	basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function AMORDEGRC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis=0) {
-		$cost			= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$purchased		= PHPExcel_Calculation_Functions::flattenSingleValue($purchased);
-		$firstPeriod	= PHPExcel_Calculation_Functions::flattenSingleValue($firstPeriod);
-		$salvage		= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$period			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($period));
-		$rate			= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$basis			= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	The depreciation coefficients are:
-		//	Life of assets (1/rate)		Depreciation coefficient
-		//	Less than 3 years			1
-		//	Between 3 and 4 years		1.5
-		//	Between 5 and 6 years		2
-		//	More than 6 years			2.5
-		$fUsePer = 1.0 / $rate;
-		if ($fUsePer < 3.0) {
-			$amortiseCoeff = 1.0;
-		} elseif ($fUsePer < 5.0) {
-			$amortiseCoeff = 1.5;
-		} elseif ($fUsePer <= 6.0) {
-			$amortiseCoeff = 2.0;
-		} else {
-			$amortiseCoeff = 2.5;
-		}
-
-		$rate *= $amortiseCoeff;
-		$fNRate = round(PHPExcel_Calculation_DateTime::YEARFRAC($purchased, $firstPeriod, $basis) * $rate * $cost,0);
-		$cost -= $fNRate;
-		$fRest = $cost - $salvage;
-
-		for ($n = 0; $n < $period; ++$n) {
-			$fNRate = round($rate * $cost,0);
-			$fRest -= $fNRate;
-
-			if ($fRest < 0.0) {
-				switch ($period - $n) {
-					case 0	:
-					case 1	: return round($cost * 0.5, 0);
-							  break;
-					default	: return 0.0;
-							  break;
-				}
-			}
-			$cost -= $fNRate;
-		}
-		return $fNRate;
-	}	//	function AMORDEGRC()
-
-
-	/**
-	 * AMORLINC
-	 *
-	 * Returns the depreciation for each accounting period.
-	 * This function is provided for the French accounting system. If an asset is purchased in
-	 * the middle of the accounting period, the prorated depreciation is taken into account.
-	 *
-	 * Excel Function:
-	 *		AMORLINC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	cost		The cost of the asset.
-	 * @param	mixed	purchased	Date of the purchase of the asset.
-	 * @param	mixed	firstPeriod	Date of the end of the first period.
-	 * @param	mixed	salvage		The salvage value at the end of the life of the asset.
-	 * @param	float	period		The period.
-	 * @param	float	rate		Rate of depreciation.
-	 * @param	integer	basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function AMORLINC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis=0) {
-		$cost			= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$purchased		= PHPExcel_Calculation_Functions::flattenSingleValue($purchased);
-		$firstPeriod	= PHPExcel_Calculation_Functions::flattenSingleValue($firstPeriod);
-		$salvage		= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$period			= PHPExcel_Calculation_Functions::flattenSingleValue($period);
-		$rate			= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$basis			= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		$fOneRate = $cost * $rate;
-		$fCostDelta = $cost - $salvage;
-		//	Note, quirky variation for leap years on the YEARFRAC for this function
-		$purchasedYear = PHPExcel_Calculation_DateTime::YEAR($purchased);
-		$yearFrac = PHPExcel_Calculation_DateTime::YEARFRAC($purchased, $firstPeriod, $basis);
-
-		if (($basis == 1) && ($yearFrac < 1) && (PHPExcel_Calculation_DateTime::_isLeapYear($purchasedYear))) {
-			$yearFrac *= 365 / 366;
-		}
-
-		$f0Rate = $yearFrac * $rate * $cost;
-		$nNumOfFullPeriods = intval(($cost - $salvage - $f0Rate) / $fOneRate);
-
-		if ($period == 0) {
-			return $f0Rate;
-		} elseif ($period <= $nNumOfFullPeriods) {
-			return $fOneRate;
-		} elseif ($period == ($nNumOfFullPeriods + 1)) {
-            return ($fCostDelta - $fOneRate * $nNumOfFullPeriods - $f0Rate);
-		} else {
-			return 0.0;
-		}
-	}	//	function AMORLINC()
-
-
-	/**
-	 * COUPDAYBS
-	 *
-	 * Returns the number of days from the beginning of the coupon period to the settlement date.
-	 *
-	 * Excel Function:
-	 *		COUPDAYBS(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function COUPDAYBS($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement),$basis);
-		$prev = self::_coupFirstPeriodDate($settlement, $maturity, $frequency, False);
-
-		return PHPExcel_Calculation_DateTime::YEARFRAC($prev, $settlement, $basis) * $daysPerYear;
-	}	//	function COUPDAYBS()
-
-
-	/**
-	 * COUPDAYS
-	 *
-	 * Returns the number of days in the coupon period that contains the settlement date.
-	 *
-	 * Excel Function:
-	 *		COUPDAYS(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function COUPDAYS($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		switch ($basis) {
-			case 3: // Actual/365
-					return 365 / $frequency;
-			case 1: // Actual/actual
-					if ($frequency == 1) {
-						$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($maturity),$basis);
-						return ($daysPerYear / $frequency);
-					} else {
-						$prev = self::_coupFirstPeriodDate($settlement, $maturity, $frequency, False);
-						$next = self::_coupFirstPeriodDate($settlement, $maturity, $frequency, True);
-						return ($next - $prev);
-					}
-			default: // US (NASD) 30/360, Actual/360 or European 30/360
-					return 360 / $frequency;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function COUPDAYS()
-
-
-	/**
-	 * COUPDAYSNC
-	 *
-	 * Returns the number of days from the settlement date to the next coupon date.
-	 *
-	 * Excel Function:
-	 *		COUPDAYSNC(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function COUPDAYSNC($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement),$basis);
-		$next = self::_coupFirstPeriodDate($settlement, $maturity, $frequency, True);
-
-		return PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $next, $basis) * $daysPerYear;
-	}	//	function COUPDAYSNC()
-
-
-	/**
-	 * COUPNCD
-	 *
-	 * Returns the next coupon date after the settlement date.
-	 *
-	 * Excel Function:
-	 *		COUPNCD(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function COUPNCD($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return self::_coupFirstPeriodDate($settlement, $maturity, $frequency, True);
-	}	//	function COUPNCD()
-
-
-	/**
-	 * COUPNUM
-	 *
-	 * Returns the number of coupons payable between the settlement date and maturity date,
-	 * rounded up to the nearest whole coupon.
-	 *
-	 * Excel Function:
-	 *		COUPNUM(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	integer
-	 */
-	public static function COUPNUM($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$settlement = self::_coupFirstPeriodDate($settlement, $maturity, $frequency, True);
-		$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis) * 365;
-
-		switch ($frequency) {
-			case 1: // annual payments
-					return ceil($daysBetweenSettlementAndMaturity / 360);
-			case 2: // half-yearly
-					return ceil($daysBetweenSettlementAndMaturity / 180);
-			case 4: // quarterly
-					return ceil($daysBetweenSettlementAndMaturity / 90);
-			case 6: // bimonthly
-					return ceil($daysBetweenSettlementAndMaturity / 60);
-			case 12: // monthly
-					return ceil($daysBetweenSettlementAndMaturity / 30);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function COUPNUM()
-
-
-	/**
-	 * COUPPCD
-	 *
-	 * Returns the previous coupon date before the settlement date.
-	 *
-	 * Excel Function:
-	 *		COUPPCD(settlement,maturity,frequency[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	frequency	the number of coupon payments per year.
-	 *									Valid frequency values are:
-	 *										1	Annual
-	 *										2	Semi-Annual
-	 *										4	Quarterly
-	 *									If working in Gnumeric Mode, the following frequency options are
-	 *									also available
-	 *										6	Bimonthly
-	 *										12	Monthly
-	 * @param	integer		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
-	 *						depending on the value of the ReturnDateType flag
-	 */
-	public static function COUPPCD($settlement, $maturity, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return self::_coupFirstPeriodDate($settlement, $maturity, $frequency, False);
-	}	//	function COUPPCD()
-
-
-	/**
-	 * CUMIPMT
-	 *
-	 * Returns the cumulative interest paid on a loan between the start and end periods.
-	 *
-	 * Excel Function:
-	 *		CUMIPMT(rate,nper,pv,start,end[,type])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$rate	The Interest rate
-	 * @param	integer	$nper	The total number of payment periods
-	 * @param	float	$pv		Present Value
-	 * @param	integer	$start	The first period in the calculation.
-	 *							Payment periods are numbered beginning with 1.
-	 * @param	integer	$end	The last period in the calculation.
-	 * @param	integer	$type	A number 0 or 1 and indicates when payments are due:
-	 *								0 or omitted	At the end of the period.
-	 *								1				At the beginning of the period.
-	 * @return	float
-	 */
-	public static function CUMIPMT($rate, $nper, $pv, $start, $end, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$nper	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$start	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($start);
-		$end	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($end);
-		$type	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($start < 1 || $start > $end) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Calculate
-		$interest = 0;
-		for ($per = $start; $per <= $end; ++$per) {
-			$interest += self::IPMT($rate, $per, $nper, $pv, 0, $type);
-		}
-
-		return $interest;
-	}	//	function CUMIPMT()
-
-
-	/**
-	 * CUMPRINC
-	 *
-	 * Returns the cumulative principal paid on a loan between the start and end periods.
-	 *
-	 * Excel Function:
-	 *		CUMPRINC(rate,nper,pv,start,end[,type])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$rate	The Interest rate
-	 * @param	integer	$nper	The total number of payment periods
-	 * @param	float	$pv		Present Value
-	 * @param	integer	$start	The first period in the calculation.
-	 *							Payment periods are numbered beginning with 1.
-	 * @param	integer	$end	The last period in the calculation.
-	 * @param	integer	$type	A number 0 or 1 and indicates when payments are due:
-	 *								0 or omitted	At the end of the period.
-	 *								1				At the beginning of the period.
-	 * @return	float
-	 */
-	public static function CUMPRINC($rate, $nper, $pv, $start, $end, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$nper	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$start	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($start);
-		$end	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($end);
-		$type	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($start < 1 || $start > $end) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Calculate
-		$principal = 0;
-		for ($per = $start; $per <= $end; ++$per) {
-			$principal += self::PPMT($rate, $per, $nper, $pv, 0, $type);
-		}
-
-		return $principal;
-	}	//	function CUMPRINC()
-
-
-	/**
-	 * DB
-	 *
-	 * Returns the depreciation of an asset for a specified period using the
-	 * fixed-declining balance method.
-	 * This form of depreciation is used if you want to get a higher depreciation value
-	 * at the beginning of the depreciation (as opposed to linear depreciation). The
-	 * depreciation value is reduced with every depreciation period by the depreciation
-	 * already deducted from the initial cost.
-	 *
-	 * Excel Function:
-	 *		DB(cost,salvage,life,period[,month])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	cost		Initial cost of the asset.
-	 * @param	float	salvage		Value at the end of the depreciation.
-	 *								(Sometimes called the salvage value of the asset)
-	 * @param	integer	life		Number of periods over which the asset is depreciated.
-	 *								(Sometimes called the useful life of the asset)
-	 * @param	integer	period		The period for which you want to calculate the
-	 *								depreciation. Period must use the same units as life.
-	 * @param	integer	month		Number of months in the first year. If month is omitted,
-	 *								it defaults to 12.
-	 * @return	float
-	 */
-	public static function DB($cost, $salvage, $life, $period, $month=12) {
-		$cost		= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$salvage	= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$life		= PHPExcel_Calculation_Functions::flattenSingleValue($life);
-		$period		= PHPExcel_Calculation_Functions::flattenSingleValue($period);
-		$month		= PHPExcel_Calculation_Functions::flattenSingleValue($month);
-
-		//	Validate
-		if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($month))) {
-			$cost		= (float) $cost;
-			$salvage	= (float) $salvage;
-			$life		= (int) $life;
-			$period		= (int) $period;
-			$month		= (int) $month;
-			if ($cost == 0) {
-				return 0.0;
-			} elseif (($cost < 0) || (($salvage / $cost) < 0) || ($life <= 0) || ($period < 1) || ($month < 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			//	Set Fixed Depreciation Rate
-			$fixedDepreciationRate = 1 - pow(($salvage / $cost), (1 / $life));
-			$fixedDepreciationRate = round($fixedDepreciationRate, 3);
-
-			//	Loop through each period calculating the depreciation
-			$previousDepreciation = 0;
-			for ($per = 1; $per <= $period; ++$per) {
-				if ($per == 1) {
-					$depreciation = $cost * $fixedDepreciationRate * $month / 12;
-				} elseif ($per == ($life + 1)) {
-					$depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate * (12 - $month) / 12;
-				} else {
-					$depreciation = ($cost - $previousDepreciation) * $fixedDepreciationRate;
-				}
-				$previousDepreciation += $depreciation;
-			}
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				$depreciation = round($depreciation,2);
-			}
-			return $depreciation;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function DB()
-
-
-	/**
-	 * DDB
-	 *
-	 * Returns the depreciation of an asset for a specified period using the
-	 * double-declining balance method or some other method you specify.
-	 *
-	 * Excel Function:
-	 *		DDB(cost,salvage,life,period[,factor])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	cost		Initial cost of the asset.
-	 * @param	float	salvage		Value at the end of the depreciation.
-	 *								(Sometimes called the salvage value of the asset)
-	 * @param	integer	life		Number of periods over which the asset is depreciated.
-	 *								(Sometimes called the useful life of the asset)
-	 * @param	integer	period		The period for which you want to calculate the
-	 *								depreciation. Period must use the same units as life.
-	 * @param	float	factor		The rate at which the balance declines.
-	 *								If factor is omitted, it is assumed to be 2 (the
-	 *								double-declining balance method).
-	 * @return	float
-	 */
-	public static function DDB($cost, $salvage, $life, $period, $factor=2.0) {
-		$cost		= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$salvage	= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$life		= PHPExcel_Calculation_Functions::flattenSingleValue($life);
-		$period		= PHPExcel_Calculation_Functions::flattenSingleValue($period);
-		$factor		= PHPExcel_Calculation_Functions::flattenSingleValue($factor);
-
-		//	Validate
-		if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($factor))) {
-			$cost		= (float) $cost;
-			$salvage	= (float) $salvage;
-			$life		= (int) $life;
-			$period		= (int) $period;
-			$factor		= (float) $factor;
-			if (($cost <= 0) || (($salvage / $cost) < 0) || ($life <= 0) || ($period < 1) || ($factor <= 0.0) || ($period > $life)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			//	Set Fixed Depreciation Rate
-			$fixedDepreciationRate = 1 - pow(($salvage / $cost), (1 / $life));
-			$fixedDepreciationRate = round($fixedDepreciationRate, 3);
-
-			//	Loop through each period calculating the depreciation
-			$previousDepreciation = 0;
-			for ($per = 1; $per <= $period; ++$per) {
-				$depreciation = min( ($cost - $previousDepreciation) * ($factor / $life), ($cost - $salvage - $previousDepreciation) );
-				$previousDepreciation += $depreciation;
-			}
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				$depreciation = round($depreciation,2);
-			}
-			return $depreciation;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function DDB()
-
-
-	/**
-	 * DISC
-	 *
-	 * Returns the discount rate for a security.
-	 *
-	 * Excel Function:
-	 *		DISC(settlement,maturity,price,redemption[,basis])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue
-	 *								date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	integer	price		The security's price per $100 face value.
-	 * @param	integer	redemption	The security's redemption value per $100 face value.
-	 * @param	integer	basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function DISC($settlement, $maturity, $price, $redemption, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$price		= PHPExcel_Calculation_Functions::flattenSingleValue($price);
-		$redemption	= PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$basis		= PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($price)) && (is_numeric($redemption)) && (is_numeric($basis))) {
-			$price		= (float) $price;
-			$redemption	= (float) $redemption;
-			$basis		= (int) $basis;
-			if (($price <= 0) || ($redemption <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-
-			return ((1 - $price / $redemption) / $daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function DISC()
-
-
-	/**
-	 * DOLLARDE
-	 *
-	 * Converts a dollar price expressed as an integer part and a fraction
-	 *		part into a dollar price expressed as a decimal number.
-	 * Fractional dollar numbers are sometimes used for security prices.
-	 *
-	 * Excel Function:
-	 *		DOLLARDE(fractional_dollar,fraction)
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$fractional_dollar	Fractional Dollar
-	 * @param	integer	$fraction			Fraction
-	 * @return	float
-	 */
-	public static function DOLLARDE($fractional_dollar = Null, $fraction = 0) {
-		$fractional_dollar	= PHPExcel_Calculation_Functions::flattenSingleValue($fractional_dollar);
-		$fraction			= (int)PHPExcel_Calculation_Functions::flattenSingleValue($fraction);
-
-		// Validate parameters
-		if (is_null($fractional_dollar) || $fraction < 0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($fraction == 0) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$dollars = floor($fractional_dollar);
-		$cents = fmod($fractional_dollar,1);
-		$cents /= $fraction;
-		$cents *= pow(10,ceil(log10($fraction)));
-		return $dollars + $cents;
-	}	//	function DOLLARDE()
-
-
-	/**
-	 * DOLLARFR
-	 *
-	 * Converts a dollar price expressed as a decimal number into a dollar price
-	 *		expressed as a fraction.
-	 * Fractional dollar numbers are sometimes used for security prices.
-	 *
-	 * Excel Function:
-	 *		DOLLARFR(decimal_dollar,fraction)
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$decimal_dollar		Decimal Dollar
-	 * @param	integer	$fraction			Fraction
-	 * @return	float
-	 */
-	public static function DOLLARFR($decimal_dollar = Null, $fraction = 0) {
-		$decimal_dollar	= PHPExcel_Calculation_Functions::flattenSingleValue($decimal_dollar);
-		$fraction		= (int)PHPExcel_Calculation_Functions::flattenSingleValue($fraction);
-
-		// Validate parameters
-		if (is_null($decimal_dollar) || $fraction < 0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($fraction == 0) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$dollars = floor($decimal_dollar);
-		$cents = fmod($decimal_dollar,1);
-		$cents *= $fraction;
-		$cents *= pow(10,-ceil(log10($fraction)));
-		return $dollars + $cents;
-	}	//	function DOLLARFR()
-
-
-	/**
-	 * EFFECT
-	 *
-	 * Returns the effective interest rate given the nominal rate and the number of
-	 *		compounding payments per year.
-	 *
-	 * Excel Function:
-	 *		EFFECT(nominal_rate,npery)
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$nominal_rate		Nominal interest rate
-	 * @param	integer	$npery				Number of compounding payments per year
-	 * @return	float
-	 */
-	public static function EFFECT($nominal_rate = 0, $npery = 0) {
-		$nominal_rate	= PHPExcel_Calculation_Functions::flattenSingleValue($nominal_rate);
-		$npery			= (int)PHPExcel_Calculation_Functions::flattenSingleValue($npery);
-
-		// Validate parameters
-		if ($nominal_rate <= 0 || $npery < 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		return pow((1 + $nominal_rate / $npery), $npery) - 1;
-	}	//	function EFFECT()
-
-
-	/**
-	 * FV
-	 *
-	 * Returns the Future Value of a cash flow with constant payments and interest rate (annuities).
-	 *
-	 * Excel Function:
-	 *		FV(rate,nper,pmt[,pv[,type]])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	$rate	The interest rate per period
-	 * @param	int		$nper	Total number of payment periods in an annuity
-	 * @param	float	$pmt	The payment made each period: it cannot change over the
-	 *							life of the annuity. Typically, pmt contains principal
-	 *							and interest but no other fees or taxes.
-	 * @param	float	$pv		Present Value, or the lump-sum amount that a series of
-	 *							future payments is worth right now.
-	 * @param	integer	$type	A number 0 or 1 and indicates when payments are due:
-	 *								0 or omitted	At the end of the period.
-	 *								1				At the beginning of the period.
-	 * @return	float
-	 */
-	public static function FV($rate = 0, $nper = 0, $pmt = 0, $pv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$nper	= PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pmt	= PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$type	= PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Calculate
-		if (!is_null($rate) && $rate != 0) {
-			return -$pv * pow(1 + $rate, $nper) - $pmt * (1 + $rate * $type) * (pow(1 + $rate, $nper) - 1) / $rate;
-		} else {
-			return -$pv - $pmt * $nper;
-		}
-	}	//	function FV()
-
-
-	/**
-	 * FVSCHEDULE
-	 *
-	 */
-	public static function FVSCHEDULE($principal, $schedule) {
-		$principal	= PHPExcel_Calculation_Functions::flattenSingleValue($principal);
-		$schedule	= PHPExcel_Calculation_Functions::flattenArray($schedule);
-
-		foreach($schedule as $n) {
-			$principal *= 1 + $n;
-		}
-
-		return $principal;
-	}	//	function FVSCHEDULE()
-
-
-	/**
-	 * INTRATE
-	 *
-	 * Returns the interest rate for a fully invested security.
-	 *
-	 * Excel Function:
-	 *		INTRATE(settlement,maturity,investment,redemption[,basis])
-	 *
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	integer	investment	The amount invested in the security.
-	 * @param	integer	redemption	The amount to be received at maturity.
-	 * @param	integer	basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function INTRATE($settlement, $maturity, $investment, $redemption, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$investment	= PHPExcel_Calculation_Functions::flattenSingleValue($investment);
-		$redemption	= PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$basis		= PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($investment)) && (is_numeric($redemption)) && (is_numeric($basis))) {
-			$investment	= (float) $investment;
-			$redemption	= (float) $redemption;
-			$basis		= (int) $basis;
-			if (($investment <= 0) || ($redemption <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-
-			return (($redemption / $investment) - 1) / ($daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function INTRATE()
-
-
-	/**
-	 * IPMT
-	 *
-	 * Returns the interest payment for a given period for an investment based on periodic, constant payments and a constant interest rate.
-	 *
-	 * @param	float	$rate	Interest rate per period
-	 * @param	int		$per	Period for which we want to find the interest
-	 * @param	int		$nper	Number of periods
-	 * @param	float	$pv		Present Value
-	 * @param	float	$fv		Future Value
-	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 * @return	float
-	 */
-	public static function IPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$per	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($per);
-		$nper	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$fv		= PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($per <= 0 || $per > $nper) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Calculate
-		$interestAndPrincipal = self::_interestAndPrincipal($rate, $per, $nper, $pv, $fv, $type);
-		return $interestAndPrincipal[0];
-	}	//	function IPMT()
-
-
-	public static function IRR($values, $guess = 0.1) {
-		if (!is_array($values)) return PHPExcel_Calculation_Functions::VALUE();
-		$values = PHPExcel_Calculation_Functions::flattenArray($values);
-		$guess = PHPExcel_Calculation_Functions::flattenSingleValue($guess);
-
-		// create an initial range, with a root somewhere between 0 and guess
-		$x1 = 0.0;
-		$x2 = $guess;
-		$f1 = self::NPV($x1, $values);
-		$f2 = self::NPV($x2, $values);
-		for ($i = 0; $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
-			if (($f1 * $f2) < 0.0) break;
-			if (abs($f1) < abs($f2)) {
-				$f1 = self::NPV($x1 += 1.6 * ($x1 - $x2), $values);
-			} else {
-				$f2 = self::NPV($x2 += 1.6 * ($x2 - $x1), $values);
-			}
-		}
-		if (($f1 * $f2) > 0.0) return PHPExcel_Calculation_Functions::VALUE();
-
-		$f = self::NPV($x1, $values);
-		if ($f < 0.0) {
-			$rtb = $x1;
-			$dx = $x2 - $x1;
-		} else {
-			$rtb = $x2;
-			$dx = $x1 - $x2;
-		}
-
-		for ($i = 0;  $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
-			$dx *= 0.5;
-			$x_mid = $rtb + $dx;
-			$f_mid = self::NPV($x_mid, $values);
-			if ($f_mid <= 0.0) $rtb = $x_mid;
-			if ((abs($f_mid) < FINANCIAL_PRECISION) || (abs($dx) < FINANCIAL_PRECISION)) return $x_mid;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function IRR()
-
-
-	/**
-	 *      ISPMT
-	 *
-	 *      Returns the interest payment for an investment based on an interest rate and a constant payment schedule.
-	 *
-	 *      Excel Function:
-	 *          =ISPMT(interest_rate, period, number_payments, PV)
-	 *
-	 *      interest_rate is the interest rate for the investment
-	 *
-	 *      period is the period to calculate the interest rate.  It must be betweeen 1 and number_payments.
-	 *
-	 *      number_payments is the number of payments for the annuity
-	 *
-	 *      PV is the loan amount or present value of the payments
-	 */
-	public static function ISPMT() {
-		// Return value
-		$returnValue = 0;
-
-		// Get the parameters
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$interestRate = array_shift($aArgs);
-		$period = array_shift($aArgs);
-		$numberPeriods = array_shift($aArgs);
-		$principleRemaining = array_shift($aArgs);
-
-		// Calculate
-		$principlePayment = ($principleRemaining * 1.0) / ($numberPeriods * 1.0);
-		for($i=0; $i <= $period; ++$i) {
-			$returnValue = $interestRate * $principleRemaining * -1;
-			$principleRemaining -= $principlePayment;
-			// principle needs to be 0 after the last payment, don't let floating point screw it up
-			if($i == $numberPeriods) {
-				$returnValue = 0;
-			}
-		}
-		return($returnValue);
-	}	//	function ISPMT()
-
-
-	public static function MIRR($values, $finance_rate, $reinvestment_rate) {
-		if (!is_array($values)) return PHPExcel_Calculation_Functions::VALUE();
-		$values				= PHPExcel_Calculation_Functions::flattenArray($values);
-		$finance_rate		= PHPExcel_Calculation_Functions::flattenSingleValue($finance_rate);
-		$reinvestment_rate	= PHPExcel_Calculation_Functions::flattenSingleValue($reinvestment_rate);
-		$n = count($values);
-
-		$rr = 1.0 + $reinvestment_rate;
-		$fr = 1.0 + $finance_rate;
-
-		$npv_pos = $npv_neg = 0.0;
-		foreach($values as $i => $v) {
-			if ($v >= 0) {
-				$npv_pos += $v / pow($rr, $i);
-			} else {
-				$npv_neg += $v / pow($fr, $i);
-			}
-		}
-
-		if (($npv_neg == 0) || ($npv_pos == 0) || ($reinvestment_rate <= -1)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		$mirr = pow((-$npv_pos * pow($rr, $n))
-				/ ($npv_neg * ($rr)), (1.0 / ($n - 1))) - 1.0;
-
-		return (is_finite($mirr) ? $mirr : PHPExcel_Calculation_Functions::VALUE());
-	}	//	function MIRR()
-
-
-	/**
-	 * NOMINAL
-	 *
-	 * Returns the nominal interest rate given the effective rate and the number of compounding payments per year.
-	 *
-	 * @param	float	$effect_rate	Effective interest rate
-	 * @param	int		$npery			Number of compounding payments per year
-	 * @return	float
-	 */
-	public static function NOMINAL($effect_rate = 0, $npery = 0) {
-		$effect_rate	= PHPExcel_Calculation_Functions::flattenSingleValue($effect_rate);
-		$npery			= (int)PHPExcel_Calculation_Functions::flattenSingleValue($npery);
-
-		// Validate parameters
-		if ($effect_rate <= 0 || $npery < 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Calculate
-		return $npery * (pow($effect_rate + 1, 1 / $npery) - 1);
-	}	//	function NOMINAL()
-
-
-	/**
-	 * NPER
-	 *
-	 * Returns the number of periods for a cash flow with constant periodic payments (annuities), and interest rate.
-	 *
-	 * @param	float	$rate	Interest rate per period
-	 * @param	int		$pmt	Periodic payment (annuity)
-	 * @param	float	$pv		Present Value
-	 * @param	float	$fv		Future Value
-	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 * @return	float
-	 */
-	public static function NPER($rate = 0, $pmt = 0, $pv = 0, $fv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$pmt	= PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$fv		= PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Calculate
-		if (!is_null($rate) && $rate != 0) {
-			if ($pmt == 0 && $pv == 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return log(($pmt * (1 + $rate * $type) / $rate - $fv) / ($pv + $pmt * (1 + $rate * $type) / $rate)) / log(1 + $rate);
-		} else {
-			if ($pmt == 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return (-$pv -$fv) / $pmt;
-		}
-	}	//	function NPER()
-
-
-	/**
-	 * NPV
-	 *
-	 * Returns the Net Present Value of a cash flow series given a discount rate.
-	 *
-	 * @param	float	Discount interest rate
-	 * @param	array	Cash flow series
-	 * @return	float
-	 */
-	public static function NPV() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$rate = array_shift($aArgs);
-		for ($i = 1; $i <= count($aArgs); ++$i) {
-			// Is it a numeric value?
-			if (is_numeric($aArgs[$i - 1])) {
-				$returnValue += $aArgs[$i - 1] / pow(1 + $rate, $i);
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function NPV()
-
-
-	/**
-	 * PMT
-	 *
-	 * Returns the constant payment (annuity) for a cash flow with a constant interest rate.
-	 *
-	 * @param	float	$rate	Interest rate per period
-	 * @param	int		$nper	Number of periods
-	 * @param	float	$pv		Present Value
-	 * @param	float	$fv		Future Value
-	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 * @return	float
-	 */
-	public static function PMT($rate = 0, $nper = 0, $pv = 0, $fv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$nper	= PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$fv		= PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Calculate
-		if (!is_null($rate) && $rate != 0) {
-			return (-$fv - $pv * pow(1 + $rate, $nper)) / (1 + $rate * $type) / ((pow(1 + $rate, $nper) - 1) / $rate);
-		} else {
-			return (-$pv - $fv) / $nper;
-		}
-	}	//	function PMT()
-
-
-	/**
-	 * PPMT
-	 *
-	 * Returns the interest payment for a given period for an investment based on periodic, constant payments and a constant interest rate.
-	 *
-	 * @param	float	$rate	Interest rate per period
-	 * @param	int		$per	Period for which we want to find the interest
-	 * @param	int		$nper	Number of periods
-	 * @param	float	$pv		Present Value
-	 * @param	float	$fv		Future Value
-	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 * @return	float
-	 */
-	public static function PPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$per	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($per);
-		$nper	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$fv		= PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		if ($per <= 0 || $per > $nper) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// Calculate
-		$interestAndPrincipal = self::_interestAndPrincipal($rate, $per, $nper, $pv, $fv, $type);
-		return $interestAndPrincipal[1];
-	}	//	function PPMT()
-
-
-	public static function PRICE($settlement, $maturity, $rate, $yield, $redemption, $frequency, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$rate		= (float) PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$yield		= (float) PHPExcel_Calculation_Functions::flattenSingleValue($yield);
-		$redemption	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$frequency	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		if (is_string($settlement = PHPExcel_Calculation_DateTime::_getDateValue($settlement))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (($settlement > $maturity) ||
-			(!self::_validFrequency($frequency)) ||
-			(($basis < 0) || ($basis > 4))) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$dsc = self::COUPDAYSNC($settlement, $maturity, $frequency, $basis);
-		$e = self::COUPDAYS($settlement, $maturity, $frequency, $basis);
-		$n = self::COUPNUM($settlement, $maturity, $frequency, $basis);
-		$a = self::COUPDAYBS($settlement, $maturity, $frequency, $basis);
-
-		$baseYF	= 1.0 + ($yield / $frequency);
-		$rfp	= 100 * ($rate / $frequency);
-		$de	= $dsc / $e;
-
-		$result = $redemption / pow($baseYF, (--$n + $de));
-		for($k = 0; $k <= $n; ++$k) {
-			$result += $rfp / (pow($baseYF, ($k + $de)));
-		}
-		$result -= $rfp * ($a / $e);
-
-		return $result;
-	}	//	function PRICE()
-
-
-	/**
-	 * PRICEDISC
-	 *
-	 * Returns the price per $100 face value of a discounted security.
-	 *
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	int		discount	The security's discount rate.
-	 * @param	int		redemption	The security's redemption value per $100 face value.
-	 * @param	int		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function PRICEDISC($settlement, $maturity, $discount, $redemption, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$discount	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($discount);
-		$redemption	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($discount)) && (is_numeric($redemption)) && (is_numeric($basis))) {
-			if (($discount <= 0) || ($redemption <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-
-			return $redemption * (1 - $discount * $daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function PRICEDISC()
-
-
-	/**
-	 * PRICEMAT
-	 *
-	 * Returns the price per $100 face value of a security that pays interest at maturity.
-	 *
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security's settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	issue		The security's issue date.
-	 * @param	int		rate		The security's interest rate at date of issue.
-	 * @param	int		yield		The security's annual yield.
-	 * @param	int		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function PRICEMAT($settlement, $maturity, $issue, $rate, $yield, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$issue		= PHPExcel_Calculation_Functions::flattenSingleValue($issue);
-		$rate		= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$yield		= PHPExcel_Calculation_Functions::flattenSingleValue($yield);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if (is_numeric($rate) && is_numeric($yield)) {
-			if (($rate <= 0) || ($yield <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement),$basis);
-			if (!is_numeric($daysPerYear)) {
-				return $daysPerYear;
-			}
-			$daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
-			if (!is_numeric($daysBetweenIssueAndSettlement)) {
-				//	return date error
-				return $daysBetweenIssueAndSettlement;
-			}
-			$daysBetweenIssueAndSettlement *= $daysPerYear;
-			$daysBetweenIssueAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $maturity, $basis);
-			if (!is_numeric($daysBetweenIssueAndMaturity)) {
-				//	return date error
-				return $daysBetweenIssueAndMaturity;
-			}
-			$daysBetweenIssueAndMaturity *= $daysPerYear;
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-			$daysBetweenSettlementAndMaturity *= $daysPerYear;
-
-			return ((100 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate * 100)) /
-				   (1 + (($daysBetweenSettlementAndMaturity / $daysPerYear) * $yield)) -
-				   (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate * 100));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function PRICEMAT()
-
-
-	/**
-	 * PV
-	 *
-	 * Returns the Present Value of a cash flow with constant payments and interest rate (annuities).
-	 *
-	 * @param	float	$rate	Interest rate per period
-	 * @param	int		$nper	Number of periods
-	 * @param	float	$pmt	Periodic payment (annuity)
-	 * @param	float	$fv		Future Value
-	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 * @return	float
-	 */
-	public static function PV($rate = 0, $nper = 0, $pmt = 0, $fv = 0, $type = 0) {
-		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$nper	= PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pmt	= PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
-		$fv		= PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= PHPExcel_Calculation_Functions::flattenSingleValue($type);
-
-		// Validate parameters
-		if ($type != 0 && $type != 1) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		// Calculate
-		if (!is_null($rate) && $rate != 0) {
-			return (-$pmt * (1 + $rate * $type) * ((pow(1 + $rate, $nper) - 1) / $rate) - $fv) / pow(1 + $rate, $nper);
-		} else {
-			return -$fv - $pmt * $nper;
-		}
-	}	//	function PV()
-
-
-	/**
-	 * RATE
-	 *
-	 * Returns the interest rate per period of an annuity.
-	 * RATE is calculated by iteration and can have zero or more solutions.
-	 * If the successive results of RATE do not converge to within 0.0000001 after 20 iterations,
-	 * RATE returns the #NUM! error value.
-	 *
-	 * Excel Function:
-	 *		RATE(nper,pmt,pv[,fv[,type[,guess]]])
-	 *
-	 * @access	public
-	 * @category Financial Functions
-	 * @param	float	nper		The total number of payment periods in an annuity.
-	 * @param	float	pmt			The payment made each period and cannot change over the life
-	 *									of the annuity.
-	 *								Typically, pmt includes principal and interest but no other
-	 *									fees or taxes.
-	 * @param	float	pv			The present value - the total amount that a series of future
-	 *									payments is worth now.
-	 * @param	float	fv			The future value, or a cash balance you want to attain after
-	 *									the last payment is made. If fv is omitted, it is assumed
-	 *									to be 0 (the future value of a loan, for example, is 0).
-	 * @param	integer	type		A number 0 or 1 and indicates when payments are due:
-	 *										0 or omitted	At the end of the period.
-	 *										1				At the beginning of the period.
-	 * @param	float	guess		Your guess for what the rate will be.
-	 *									If you omit guess, it is assumed to be 10 percent.
-	 * @return	float
-	 **/
-	public static function RATE($nper, $pmt, $pv, $fv = 0.0, $type = 0, $guess = 0.1) {
-		$nper	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
-		$pmt	= PHPExcel_Calculation_Functions::flattenSingleValue($pmt);
-		$pv		= PHPExcel_Calculation_Functions::flattenSingleValue($pv);
-		$fv		= (is_null($fv))	? 0.0	:	PHPExcel_Calculation_Functions::flattenSingleValue($fv);
-		$type	= (is_null($type))	? 0		:	(int) PHPExcel_Calculation_Functions::flattenSingleValue($type);
-		$guess	= (is_null($guess))	? 0.1	:	PHPExcel_Calculation_Functions::flattenSingleValue($guess);
-
-		$rate = $guess;
-		if (abs($rate) < FINANCIAL_PRECISION) {
-			$y = $pv * (1 + $nper * $rate) + $pmt * (1 + $rate * $type) * $nper + $fv;
-		} else {
-			$f = exp($nper * log(1 + $rate));
-			$y = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
-		}
-		$y0 = $pv + $pmt * $nper + $fv;
-		$y1 = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
-
-		// find root by secant method
-		$i  = $x0 = 0.0;
-		$x1 = $rate;
-		while ((abs($y0 - $y1) > FINANCIAL_PRECISION) && ($i < FINANCIAL_MAX_ITERATIONS)) {
-			$rate = ($y1 * $x0 - $y0 * $x1) / ($y1 - $y0);
-			$x0 = $x1;
-			$x1 = $rate;
-			if (($nper * abs($pmt)) > ($pv - $fv))
-				$x1 = abs($x1);
-
-			if (abs($rate) < FINANCIAL_PRECISION) {
-				$y = $pv * (1 + $nper * $rate) + $pmt * (1 + $rate * $type) * $nper + $fv;
-			} else {
-				$f = exp($nper * log(1 + $rate));
-				$y = $pv * $f + $pmt * (1 / $rate + $type) * ($f - 1) + $fv;
-			}
-
-			$y0 = $y1;
-			$y1 = $y;
-			++$i;
-		}
-		return $rate;
-	}	//	function RATE()
-
-
-	/**
-	 * RECEIVED
-	 *
-	 * Returns the price per $100 face value of a discounted security.
-	 *
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	int		investment	The amount invested in the security.
-	 * @param	int		discount	The security's discount rate.
-	 * @param	int		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function RECEIVED($settlement, $maturity, $investment, $discount, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$investment	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($investment);
-		$discount	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($discount);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if ((is_numeric($investment)) && (is_numeric($discount)) && (is_numeric($basis))) {
-			if (($investment <= 0) || ($discount <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-
-			return $investment / ( 1 - ($discount * $daysBetweenSettlementAndMaturity));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function RECEIVED()
-
-
-	/**
-	 * SLN
-	 *
-	 * Returns the straight-line depreciation of an asset for one period
-	 *
-	 * @param	cost		Initial cost of the asset
-	 * @param	salvage		Value at the end of the depreciation
-	 * @param	life		Number of periods over which the asset is depreciated
-	 * @return	float
-	 */
-	public static function SLN($cost, $salvage, $life) {
-		$cost		= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$salvage	= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$life		= PHPExcel_Calculation_Functions::flattenSingleValue($life);
-
-		// Calculate
-		if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life))) {
-			if ($life < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return ($cost - $salvage) / $life;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SLN()
-
-
-	/**
-	 * SYD
-	 *
-	 * Returns the sum-of-years' digits depreciation of an asset for a specified period.
-	 *
-	 * @param	cost		Initial cost of the asset
-	 * @param	salvage		Value at the end of the depreciation
-	 * @param	life		Number of periods over which the asset is depreciated
-	 * @param	period		Period
-	 * @return	float
-	 */
-	public static function SYD($cost, $salvage, $life, $period) {
-		$cost		= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$salvage	= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$life		= PHPExcel_Calculation_Functions::flattenSingleValue($life);
-		$period		= PHPExcel_Calculation_Functions::flattenSingleValue($period);
-
-		// Calculate
-		if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period))) {
-			if (($life < 1) || ($period > $life)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return (($cost - $salvage) * ($life - $period + 1) * 2) / ($life * ($life + 1));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SYD()
-
-
-	/**
-	 * TBILLEQ
-	 *
-	 * Returns the bond-equivalent yield for a Treasury bill.
-	 *
-	 * @param	mixed	settlement	The Treasury bill's settlement date.
-	 *								The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
-	 * @param	mixed	maturity	The Treasury bill's maturity date.
-	 *								The maturity date is the date when the Treasury bill expires.
-	 * @param	int		discount	The Treasury bill's discount rate.
-	 * @return	float
-	 */
-	public static function TBILLEQ($settlement, $maturity, $discount) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$discount	= PHPExcel_Calculation_Functions::flattenSingleValue($discount);
-
-		//	Use TBILLPRICE for validation
-		$testValue = self::TBILLPRICE($settlement, $maturity, $discount);
-		if (is_string($testValue)) {
-			return $testValue;
-		}
-
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-			++$maturity;
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity) * 360;
-		} else {
-			$daysBetweenSettlementAndMaturity = (PHPExcel_Calculation_DateTime::_getDateValue($maturity) - PHPExcel_Calculation_DateTime::_getDateValue($settlement));
-		}
-
-		return (365 * $discount) / (360 - $discount * $daysBetweenSettlementAndMaturity);
-	}	//	function TBILLEQ()
-
-
-	/**
-	 * TBILLPRICE
-	 *
-	 * Returns the yield for a Treasury bill.
-	 *
-	 * @param	mixed	settlement	The Treasury bill's settlement date.
-	 *								The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
-	 * @param	mixed	maturity	The Treasury bill's maturity date.
-	 *								The maturity date is the date when the Treasury bill expires.
-	 * @param	int		discount	The Treasury bill's discount rate.
-	 * @return	float
-	 */
-	public static function TBILLPRICE($settlement, $maturity, $discount) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$discount	= PHPExcel_Calculation_Functions::flattenSingleValue($discount);
-
-		if (is_string($maturity = PHPExcel_Calculation_DateTime::_getDateValue($maturity))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		//	Validate
-		if (is_numeric($discount)) {
-			if ($discount <= 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				++$maturity;
-				$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity) * 360;
-				if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-					//	return date error
-					return $daysBetweenSettlementAndMaturity;
-				}
-			} else {
-				$daysBetweenSettlementAndMaturity = (PHPExcel_Calculation_DateTime::_getDateValue($maturity) - PHPExcel_Calculation_DateTime::_getDateValue($settlement));
-			}
-
-			if ($daysBetweenSettlementAndMaturity > 360) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			$price = 100 * (1 - (($discount * $daysBetweenSettlementAndMaturity) / 360));
-			if ($price <= 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return $price;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TBILLPRICE()
-
-
-	/**
-	 * TBILLYIELD
-	 *
-	 * Returns the yield for a Treasury bill.
-	 *
-	 * @param	mixed	settlement	The Treasury bill's settlement date.
-	 *								The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
-	 * @param	mixed	maturity	The Treasury bill's maturity date.
-	 *								The maturity date is the date when the Treasury bill expires.
-	 * @param	int		price		The Treasury bill's price per $100 face value.
-	 * @return	float
-	 */
-	public static function TBILLYIELD($settlement, $maturity, $price) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$price		= PHPExcel_Calculation_Functions::flattenSingleValue($price);
-
-		//	Validate
-		if (is_numeric($price)) {
-			if ($price <= 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				++$maturity;
-				$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity) * 360;
-				if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-					//	return date error
-					return $daysBetweenSettlementAndMaturity;
-				}
-			} else {
-				$daysBetweenSettlementAndMaturity = (PHPExcel_Calculation_DateTime::_getDateValue($maturity) - PHPExcel_Calculation_DateTime::_getDateValue($settlement));
-			}
-
-			if ($daysBetweenSettlementAndMaturity > 360) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			return ((100 - $price) / $price) * (360 / $daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TBILLYIELD()
-
-
-	public static function XIRR($values, $dates, $guess = 0.1) {
-		if ((!is_array($values)) && (!is_array($dates))) return PHPExcel_Calculation_Functions::VALUE();
-		$values	= PHPExcel_Calculation_Functions::flattenArray($values);
-		$dates	= PHPExcel_Calculation_Functions::flattenArray($dates);
-		$guess = PHPExcel_Calculation_Functions::flattenSingleValue($guess);
-		if (count($values) != count($dates)) return PHPExcel_Calculation_Functions::NaN();
-
-		// create an initial range, with a root somewhere between 0 and guess
-		$x1 = 0.0;
-		$x2 = $guess;
-		$f1 = self::XNPV($x1, $values, $dates);
-		$f2 = self::XNPV($x2, $values, $dates);
-		for ($i = 0; $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
-			if (($f1 * $f2) < 0.0) break;
-			if (abs($f1) < abs($f2)) {
-				$f1 = self::XNPV($x1 += 1.6 * ($x1 - $x2), $values, $dates);
-			} else {
-				$f2 = self::XNPV($x2 += 1.6 * ($x2 - $x1), $values, $dates);
-			}
-		}
-		if (($f1 * $f2) > 0.0) return PHPExcel_Calculation_Functions::VALUE();
-
-		$f = self::XNPV($x1, $values, $dates);
-		if ($f < 0.0) {
-			$rtb = $x1;
-			$dx = $x2 - $x1;
-		} else {
-			$rtb = $x2;
-			$dx = $x1 - $x2;
-		}
-
-		for ($i = 0;  $i < FINANCIAL_MAX_ITERATIONS; ++$i) {
-			$dx *= 0.5;
-			$x_mid = $rtb + $dx;
-			$f_mid = self::XNPV($x_mid, $values, $dates);
-			if ($f_mid <= 0.0) $rtb = $x_mid;
-			if ((abs($f_mid) < FINANCIAL_PRECISION) || (abs($dx) < FINANCIAL_PRECISION)) return $x_mid;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}
-
-
-	/**
-	 * XNPV
-	 *
-	 * Returns the net present value for a schedule of cash flows that is not necessarily periodic.
-	 * To calculate the net present value for a series of cash flows that is periodic, use the NPV function.
-	 *
-	 * Excel Function:
-	 *		=XNPV(rate,values,dates)
-	 *
-	 * @param	float			$rate		The discount rate to apply to the cash flows.
-	 * @param	array of float	$values		A series of cash flows that corresponds to a schedule of payments in dates. The first payment is optional and corresponds to a cost or payment that occurs at the beginning of the investment. If the first value is a cost or payment, it must be a negative value. All succeeding payments are discounted based on a 365-day year. The series of values must contain at least one positive value and one negative value.
-	 * @param	array of mixed	$dates		A schedule of payment dates that corresponds to the cash flow payments. The first payment date indicates the beginning of the schedule of payments. All other dates must be later than this date, but they may occur in any order.
-	 * @return	float
-	 */
-	public static function XNPV($rate, $values, $dates) {
-		$rate = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		if (!is_numeric($rate)) return PHPExcel_Calculation_Functions::VALUE();
-		if ((!is_array($values)) || (!is_array($dates))) return PHPExcel_Calculation_Functions::VALUE();
-		$values	= PHPExcel_Calculation_Functions::flattenArray($values);
-		$dates	= PHPExcel_Calculation_Functions::flattenArray($dates);
-		$valCount = count($values);
-		if ($valCount != count($dates)) return PHPExcel_Calculation_Functions::NaN();
-		if ((min($values) > 0) || (max($values) < 0)) return PHPExcel_Calculation_Functions::VALUE();
-
-		$xnpv = 0.0;
-		for ($i = 0; $i < $valCount; ++$i) {
-			if (!is_numeric($values[$i])) return PHPExcel_Calculation_Functions::VALUE();
-			$xnpv += $values[$i] / pow(1 + $rate, PHPExcel_Calculation_DateTime::DATEDIF($dates[0],$dates[$i],'d') / 365);
-		}
-		return (is_finite($xnpv)) ? $xnpv : PHPExcel_Calculation_Functions::VALUE();
-	}	//	function XNPV()
-
-
-	/**
-	 * YIELDDISC
-	 *
-	 * Returns the annual yield of a security that pays interest at maturity.
-	 *
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security's settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	int		price		The security's price per $100 face value.
-	 * @param	int		redemption	The security's redemption value per $100 face value.
-	 * @param	int		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function YIELDDISC($settlement, $maturity, $price, $redemption, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$price		= PHPExcel_Calculation_Functions::flattenSingleValue($price);
-		$redemption	= PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if (is_numeric($price) && is_numeric($redemption)) {
-			if (($price <= 0) || ($redemption <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement),$basis);
-			if (!is_numeric($daysPerYear)) {
-				return $daysPerYear;
-			}
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity,$basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-			$daysBetweenSettlementAndMaturity *= $daysPerYear;
-
-			return (($redemption - $price) / $price) * ($daysPerYear / $daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function YIELDDISC()
-
-
-	/**
-	 * YIELDMAT
-	 *
-	 * Returns the annual yield of a security that pays interest at maturity.
-	 *
-	 * @param	mixed	settlement	The security's settlement date.
-	 *								The security's settlement date is the date after the issue date when the security is traded to the buyer.
-	 * @param	mixed	maturity	The security's maturity date.
-	 *								The maturity date is the date when the security expires.
-	 * @param	mixed	issue		The security's issue date.
-	 * @param	int		rate		The security's interest rate at date of issue.
-	 * @param	int		price		The security's price per $100 face value.
-	 * @param	int		basis		The type of day count to use.
-	 *										0 or omitted	US (NASD) 30/360
-	 *										1				Actual/actual
-	 *										2				Actual/360
-	 *										3				Actual/365
-	 *										4				European 30/360
-	 * @return	float
-	 */
-	public static function YIELDMAT($settlement, $maturity, $issue, $rate, $price, $basis=0) {
-		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$issue		= PHPExcel_Calculation_Functions::flattenSingleValue($issue);
-		$rate		= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$price		= PHPExcel_Calculation_Functions::flattenSingleValue($price);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
-
-		//	Validate
-		if (is_numeric($rate) && is_numeric($price)) {
-			if (($rate <= 0) || ($price <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$daysPerYear = self::_daysPerYear(PHPExcel_Calculation_DateTime::YEAR($settlement),$basis);
-			if (!is_numeric($daysPerYear)) {
-				return $daysPerYear;
-			}
-			$daysBetweenIssueAndSettlement = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $settlement, $basis);
-			if (!is_numeric($daysBetweenIssueAndSettlement)) {
-				//	return date error
-				return $daysBetweenIssueAndSettlement;
-			}
-			$daysBetweenIssueAndSettlement *= $daysPerYear;
-			$daysBetweenIssueAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($issue, $maturity, $basis);
-			if (!is_numeric($daysBetweenIssueAndMaturity)) {
-				//	return date error
-				return $daysBetweenIssueAndMaturity;
-			}
-			$daysBetweenIssueAndMaturity *= $daysPerYear;
-			$daysBetweenSettlementAndMaturity = PHPExcel_Calculation_DateTime::YEARFRAC($settlement, $maturity, $basis);
-			if (!is_numeric($daysBetweenSettlementAndMaturity)) {
-				//	return date error
-				return $daysBetweenSettlementAndMaturity;
-			}
-			$daysBetweenSettlementAndMaturity *= $daysPerYear;
-
-			return ((1 + (($daysBetweenIssueAndMaturity / $daysPerYear) * $rate) - (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate))) /
-				   (($price / 100) + (($daysBetweenIssueAndSettlement / $daysPerYear) * $rate))) *
-				   ($daysPerYear / $daysBetweenSettlementAndMaturity);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function YIELDMAT()
-
-}	//	class PHPExcel_Calculation_Financial
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/FormulaParser.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/FormulaParser.php
deleted file mode 100755
index eabb87ea8..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/FormulaParser.php
+++ /dev/null
@@ -1,614 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/*
-PARTLY BASED ON:
-	Copyright (c) 2007 E. W. Bachtal, Inc.
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-	and associated documentation files (the "Software"), to deal in the Software without restriction,
-	including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-	and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-	subject to the following conditions:
-
-	  The above copyright notice and this permission notice shall be included in all copies or substantial
-	  portions of the Software.
-
-	The software is provided "as is", without warranty of any kind, express or implied, including but not
-	limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
-	no event shall the authors or copyright holders be liable for any claim, damages or other liability,
-	whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
-	software or the use or other dealings in the software.
-
-	http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
-	http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
-*/
-
-/**
- * PHPExcel_Calculation_FormulaParser
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_FormulaParser {
-	/* Character constants */
-	const QUOTE_DOUBLE  = '"';
-	const QUOTE_SINGLE  = '\'';
-	const BRACKET_CLOSE = ']';
-	const BRACKET_OPEN  = '[';
-	const BRACE_OPEN    = '{';
-	const BRACE_CLOSE   = '}';
-	const PAREN_OPEN    = '(';
-	const PAREN_CLOSE   = ')';
-	const SEMICOLON     = ';';
-	const WHITESPACE    = ' ';
-	const COMMA         = ',';
-	const ERROR_START   = '#';
-
-	const OPERATORS_SN 			= "+-";
-	const OPERATORS_INFIX 		= "+-*/^&=><";
-	const OPERATORS_POSTFIX 	= "%";
-
-	/**
-	 * Formula
-	 *
-	 * @var string
-	 */
-	private $_formula;
-
-	/**
-	 * Tokens
-	 *
-	 * @var PHPExcel_Calculation_FormulaToken[]
-	 */
-	private $_tokens = array();
-
-    /**
-     * Create a new PHPExcel_Calculation_FormulaParser
-     *
-     * @param 	string		$pFormula	Formula to parse
-     * @throws 	Exception
-     */
-    public function __construct($pFormula = '')
-    {
-    	// Check parameters
-    	if (is_null($pFormula)) {
-    		throw new Exception("Invalid parameter passed: formula");
-    	}
-
-    	// Initialise values
-    	$this->_formula = trim($pFormula);
-    	// Parse!
-    	$this->_parseToTokens();
-    }
-
-    /**
-     * Get Formula
-     *
-     * @return string
-     */
-    public function getFormula() {
-    	return $this->_formula;
-    }
-
-    /**
-     * Get Token
-     *
-     * @param 	int		$pId	Token id
-     * @return	string
-     * @throws  Exception
-     */
-    public function getToken($pId = 0) {
-    	if (isset($this->_tokens[$pId])) {
-    		return $this->_tokens[$pId];
-    	} else {
-    		throw new Exception("Token with id $pId does not exist.");
-    	}
-    }
-
-    /**
-     * Get Token count
-     *
-     * @return string
-     */
-    public function getTokenCount() {
-    	return count($this->_tokens);
-    }
-
-    /**
-     * Get Tokens
-     *
-     * @return PHPExcel_Calculation_FormulaToken[]
-     */
-    public function getTokens() {
-    	return $this->_tokens;
-    }
-
-    /**
-     * Parse to tokens
-     */
-    private function _parseToTokens() {
-		// No attempt is made to verify formulas; assumes formulas are derived from Excel, where
-		// they can only exist if valid; stack overflows/underflows sunk as nulls without exceptions.
-
-		// Check if the formula has a valid starting =
-		$formulaLength = strlen($this->_formula);
-		if ($formulaLength < 2 || $this->_formula{0} != '=') return;
-
-		// Helper variables
-		$tokens1	= $tokens2 	= $stack = array();
-		$inString	= $inPath 	= $inRange 	= $inError = false;
-		$token		= $previousToken	= $nextToken	= null;
-
-		$index	= 1;
-		$value	= '';
-
-		$ERRORS 			= array("#NULL!", "#DIV/0!", "#VALUE!", "#REF!", "#NAME?", "#NUM!", "#N/A");
-		$COMPARATORS_MULTI 	= array(">=", "<=", "<>");
-
-		while ($index < $formulaLength) {
-			// state-dependent character evaluation (order is important)
-
-			// double-quoted strings
-			// embeds are doubled
-			// end marks token
-			if ($inString) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
-					if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE)) {
-						$value .= PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE;
-						++$index;
-					} else {
-						$inString = false;
-						$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_TEXT);
-						$value = "";
-					}
-				} else {
-					$value .= $this->_formula{$index};
-				}
-				++$index;
-				continue;
-			}
-
-			// single-quoted strings (links)
-			// embeds are double
-			// end does not mark a token
-			if ($inPath) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
-					if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE)) {
-						$value .= PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE;
-						++$index;
-					} else {
-						$inPath = false;
-					}
-				} else {
-					$value .= $this->_formula{$index};
-				}
-				++$index;
-				continue;
-			}
-
-			// bracked strings (R1C1 range index or linked workbook name)
-			// no embeds (changed to "()" by Excel)
-			// end does not mark a token
-			if ($inRange) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_CLOSE) {
-					$inRange = false;
-				}
-				$value .= $this->_formula{$index};
-				++$index;
-				continue;
-			}
-
-			// error values
-			// end marks a token, determined from absolute list of values
-			if ($inError) {
-				$value .= $this->_formula{$index};
-				++$index;
-				if (in_array($value, $ERRORS)) {
-					$inError = false;
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_ERROR);
-					$value = "";
-				}
-				continue;
-			}
-
-			// scientific notation check
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_SN, $this->_formula{$index}) !== false) {
-				if (strlen($value) > 1) {
-					if (preg_match("/^[1-9]{1}(\.[0-9]+)?E{1}$/", $this->_formula{$index}) != 0) {
-						$value .= $this->_formula{$index};
-						++$index;
-						continue;
-					}
-				}
-			}
-
-			// independent character evaluation (order not important)
-
-			// establish state-dependent character evaluations
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
-				if (strlen($value > 0)) {  // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-				$inString = true;
-				++$index;
-				continue;
- 			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
-				if (strlen($value) > 0) { // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-				$inPath = true;
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_OPEN) {
-				$inRange = true;
-				$value .= PHPExcel_Calculation_FormulaParser::BRACKET_OPEN;
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::ERROR_START) {
-				if (strlen($value) > 0) { // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-				$inError = true;
-				$value .= PHPExcel_Calculation_FormulaParser::ERROR_START;
-				++$index;
-				continue;
-			}
-
-			// mark start and end of arrays and array rows
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_OPEN) {
-				if (strlen($value) > 0) { // unexpected
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
-					$value = "";
-				}
-
-				$tmp = new PHPExcel_Calculation_FormulaToken("ARRAY", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-				$tokens1[] = $tmp;
-				$stack[] = clone $tmp;
-
-				$tmp = new PHPExcel_Calculation_FormulaToken("ARRAYROW", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-				$tokens1[] = $tmp;
-				$stack[] = clone $tmp;
-
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::SEMICOLON) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				$tmp = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_ARGUMENT);
-				$tokens1[] = $tmp;
-
-				$tmp = new PHPExcel_Calculation_FormulaToken("ARRAYROW", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-				$tokens1[] = $tmp;
-				$stack[] = clone $tmp;
-
-				++$index;
-				continue;
-			}
-
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_CLOSE) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				++$index;
-				continue;
-			}
-
-			// trim white-space
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-				$tokens1[] = new PHPExcel_Calculation_FormulaToken("", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_WHITESPACE);
-				++$index;
-				while (($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) && ($index < $formulaLength)) {
-					++$index;
-				}
-				continue;
-			}
-
-			// multi-character comparators
-			if (($index + 2) <= $formulaLength) {
-				if (in_array(substr($this->_formula, $index, 2), $COMPARATORS_MULTI)) {
-					if (strlen($value) > 0) {
-						$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-						$value = "";
-					}
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken(substr($this->_formula, $index, 2), PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
-					$index += 2;
-					continue;
-				}
-			}
-
-			// standard infix operators
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_INFIX, $this->_formula{$index}) !== false) {
-				if (strlen($value) > 0) {
-					$tokens1[] =new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-				$tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX);
-				++$index;
-				continue;
-			}
-
-			// standard postfix operators (only one)
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_POSTFIX, $this->_formula{$index}) !== false) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-				$tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX);
-				++$index;
-				continue;
-			}
-
-			// start subexpression or function
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_OPEN) {
-				if (strlen($value) > 0) {
-					$tmp = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-					$tokens1[] = $tmp;
-					$stack[] = clone $tmp;
-					$value = "";
-				} else {
-					$tmp = new PHPExcel_Calculation_FormulaToken("", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
-					$tokens1[] = $tmp;
-					$stack[] = clone $tmp;
-				}
-				++$index;
-				continue;
-			}
-
-			// function, subexpression, or array parameters, or operand unions
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::COMMA) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$stack[] = $tmp;
-
-				if ($tmp->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_UNION);
-				} else {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken(",", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_ARGUMENT);
-				}
-				++$index;
-				continue;
-			}
-
-			// stop subexpression
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_CLOSE) {
-				if (strlen($value) > 0) {
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-					$value = "";
-				}
-
-				$tmp = array_pop($stack);
-				$tmp->setValue("");
-				$tmp->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP);
-				$tokens1[] = $tmp;
-
-				++$index;
-				continue;
-			}
-
-        	// token accumulation
-			$value .= $this->_formula{$index};
-			++$index;
-		}
-
-		// dump remaining accumulation
-		if (strlen($value) > 0) {
-			$tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
-		}
-
-		// move tokenList to new set, excluding unnecessary white-space tokens and converting necessary ones to intersections
-		$tokenCount = count($tokens1);
-		for ($i = 0; $i < $tokenCount; ++$i) {
-			$token = $tokens1[$i];
-			if (isset($tokens1[$i - 1])) {
-				$previousToken = $tokens1[$i - 1];
-			} else {
-				$previousToken = null;
-			}
-			if (isset($tokens1[$i + 1])) {
-				$nextToken = $tokens1[$i + 1];
-			} else {
-				$nextToken = null;
-			}
-
-			if (is_null($token)) {
-				continue;
-			}
-
-			if ($token->getTokenType() != PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_WHITESPACE) {
-				$tokens2[] = $token;
-				continue;
-			}
-
-			if (is_null($previousToken)) {
-				continue;
-			}
-
-			if (! (
-					(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-					(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-					($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-				  ) ) {
-				continue;
-			}
-
-			if (is_null($nextToken)) {
-				continue;
-			}
-
-			if (! (
-					(($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START)) ||
-					(($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START)) ||
-					($nextToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-				  ) ) {
-				continue;
-			}
-
-			$tokens2[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_INTERSECTION);
-		}
-
-		// move tokens to final list, switching infix "-" operators to prefix when appropriate, switching infix "+" operators
-		// to noop when appropriate, identifying operand and infix-operator subtypes, and pulling "@" from function names
-		$this->_tokens = array();
-
-		$tokenCount = count($tokens2);
-		for ($i = 0; $i < $tokenCount; ++$i) {
-			$token = $tokens2[$i];
-			if (isset($tokens2[$i - 1])) {
-				$previousToken = $tokens2[$i - 1];
-			} else {
-				$previousToken = null;
-			}
-			if (isset($tokens2[$i + 1])) {
-				$nextToken = $tokens2[$i + 1];
-			} else {
-				$nextToken = null;
-			}
-
-			if (is_null($token)) {
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == "-") {
-				if ($i == 0) {
-					$token->setTokenType(PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
-				} else if (
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-						) {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
-				} else {
-					$token->setTokenType(PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == "+") {
-				if ($i == 0) {
-					continue;
-				} else if (
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-						) {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
-				} else {
-					continue;
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
-				if (strpos("<>=", substr($token->getValue(), 0, 1)) !== false) {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
-				} else if ($token->getValue() == "&") {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_CONCATENATION);
-				} else {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND && $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
-				if (!is_numeric($token->getValue())) {
-					if (strtoupper($token->getValue()) == "TRUE" || strtoupper($token->getValue() == "FALSE")) {
-						$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
-					} else {
-						$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_RANGE);
-					}
-				} else {
-					$token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NUMBER);
-				}
-
-				$this->_tokens[] = $token;
-				continue;
-			}
-
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) {
-				if (strlen($token->getValue() > 0)) {
-					if (substr($token->getValue(), 0, 1) == "@") {
-						$token->setValue(substr($token->getValue(), 1));
-					}
-				}
-			}
-
-        	$this->_tokens[] = $token;
-		}
-    }
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/FormulaToken.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/FormulaToken.php
deleted file mode 100755
index a5acbd1bd..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/FormulaToken.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/*
-PARTLY BASED ON:
-	Copyright (c) 2007 E. W. Bachtal, Inc.
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-	and associated documentation files (the "Software"), to deal in the Software without restriction,
-	including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-	and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-	subject to the following conditions:
-
-	  The above copyright notice and this permission notice shall be included in all copies or substantial
-	  portions of the Software.
-
-	The software is provided "as is", without warranty of any kind, express or implied, including but not
-	limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
-	no event shall the authors or copyright holders be liable for any claim, damages or other liability,
-	whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
-	software or the use or other dealings in the software.
-
-	http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
-	http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
-*/
-
-
-/**
- * PHPExcel_Calculation_FormulaToken
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_FormulaToken {
-	/* Token types */
-	const TOKEN_TYPE_NOOP					= 'Noop';
-	const TOKEN_TYPE_OPERAND				= 'Operand';
-	const TOKEN_TYPE_FUNCTION				= 'Function';
-	const TOKEN_TYPE_SUBEXPRESSION			= 'Subexpression';
-	const TOKEN_TYPE_ARGUMENT				= 'Argument';
-	const TOKEN_TYPE_OPERATORPREFIX			= 'OperatorPrefix';
-	const TOKEN_TYPE_OPERATORINFIX			= 'OperatorInfix';
-	const TOKEN_TYPE_OPERATORPOSTFIX		= 'OperatorPostfix';
-	const TOKEN_TYPE_WHITESPACE				= 'Whitespace';
-	const TOKEN_TYPE_UNKNOWN				= 'Unknown';
-
-	/* Token subtypes */
-	const TOKEN_SUBTYPE_NOTHING				= 'Nothing';
-	const TOKEN_SUBTYPE_START				= 'Start';
-	const TOKEN_SUBTYPE_STOP				= 'Stop';
-	const TOKEN_SUBTYPE_TEXT				= 'Text';
-	const TOKEN_SUBTYPE_NUMBER				= 'Number';
-	const TOKEN_SUBTYPE_LOGICAL				= 'Logical';
-	const TOKEN_SUBTYPE_ERROR				= 'Error';
-	const TOKEN_SUBTYPE_RANGE				= 'Range';
-	const TOKEN_SUBTYPE_MATH				= 'Math';
-	const TOKEN_SUBTYPE_CONCATENATION		= 'Concatenation';
-	const TOKEN_SUBTYPE_INTERSECTION		= 'Intersection';
-	const TOKEN_SUBTYPE_UNION				= 'Union';
-
-	/**
-	 * Value
-	 *
-	 * @var string
-	 */
-	private $_value;
-
-	/**
-	 * Token Type (represented by TOKEN_TYPE_*)
-	 *
-	 * @var string
-	 */
-	private $_tokenType;
-
-	/**
-	 * Token SubType (represented by TOKEN_SUBTYPE_*)
-	 *
-	 * @var string
-	 */
-	private $_tokenSubType;
-
-    /**
-     * Create a new PHPExcel_Calculation_FormulaToken
-     *
-     * @param string	$pValue
-     * @param string	$pTokenType 	Token type (represented by TOKEN_TYPE_*)
-     * @param string	$pTokenSubType 	Token Subtype (represented by TOKEN_SUBTYPE_*)
-     */
-    public function __construct($pValue, $pTokenType = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN, $pTokenSubType = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
-    {
-    	// Initialise values
-    	$this->_value				= $pValue;
-    	$this->_tokenType			= $pTokenType;
-    	$this->_tokenSubType 		= $pTokenSubType;
-    }
-
-    /**
-     * Get Value
-     *
-     * @return string
-     */
-    public function getValue() {
-    	return $this->_value;
-    }
-
-    /**
-     * Set Value
-     *
-     * @param string	$value
-     */
-    public function setValue($value) {
-    	$this->_value = $value;
-    }
-
-    /**
-     * Get Token Type (represented by TOKEN_TYPE_*)
-     *
-     * @return string
-     */
-    public function getTokenType() {
-    	return $this->_tokenType;
-    }
-
-    /**
-     * Set Token Type
-     *
-     * @param string	$value
-     */
-    public function setTokenType($value = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN) {
-    	$this->_tokenType = $value;
-    }
-
-    /**
-     * Get Token SubType (represented by TOKEN_SUBTYPE_*)
-     *
-     * @return string
-     */
-    public function getTokenSubType() {
-    	return $this->_tokenSubType;
-    }
-
-    /**
-     * Set Token SubType
-     *
-     * @param string	$value
-     */
-    public function setTokenSubType($value = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
-    	$this->_tokenSubType = $value;
-    }
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/Function.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/Function.php
deleted file mode 100755
index 2b46c6088..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/Function.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Calculation_Function
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Function {
-	/* Function categories */
-	const CATEGORY_CUBE						= 'Cube';
-	const CATEGORY_DATABASE					= 'Database';
-	const CATEGORY_DATE_AND_TIME			= 'Date and Time';
-	const CATEGORY_ENGINEERING				= 'Engineering';
-	const CATEGORY_FINANCIAL				= 'Financial';
-	const CATEGORY_INFORMATION				= 'Information';
-	const CATEGORY_LOGICAL					= 'Logical';
-	const CATEGORY_LOOKUP_AND_REFERENCE		= 'Lookup and Reference';
-	const CATEGORY_MATH_AND_TRIG			= 'Math and Trig';
-	const CATEGORY_STATISTICAL				= 'Statistical';
-	const CATEGORY_TEXT_AND_DATA			= 'Text and Data';
-
-	/**
-	 * Category (represented by CATEGORY_*)
-	 *
-	 * @var string
-	 */
-	private $_category;
-
-	/**
-	 * Excel name
-	 *
-	 * @var string
-	 */
-	private $_excelName;
-
-	/**
-	 * PHPExcel name
-	 *
-	 * @var string
-	 */
-	private $_phpExcelName;
-
-    /**
-     * Create a new PHPExcel_Calculation_Function
-     *
-     * @param 	string		$pCategory 		Category (represented by CATEGORY_*)
-     * @param 	string		$pExcelName		Excel function name
-     * @param 	string		$pPHPExcelName	PHPExcel function mapping
-     * @throws 	Exception
-     */
-    public function __construct($pCategory = NULL, $pExcelName = NULL, $pPHPExcelName = NULL)
-    {
-    	if (($pCategory !== NULL) && ($pExcelName !== NULL) && ($pPHPExcelName !== NULL)) {
-    		// Initialise values
-    		$this->_category 		= $pCategory;
-    		$this->_excelName 		= $pExcelName;
-    		$this->_phpExcelName 	= $pPHPExcelName;
-    	} else {
-    		throw new Exception("Invalid parameters passed.");
-    	}
-    }
-
-    /**
-     * Get Category (represented by CATEGORY_*)
-     *
-     * @return string
-     */
-    public function getCategory() {
-    	return $this->_category;
-    }
-
-    /**
-     * Set Category (represented by CATEGORY_*)
-     *
-     * @param 	string		$value
-     * @throws 	Exception
-     */
-    public function setCategory($value = null) {
-    	if (!is_null($value)) {
-    		$this->_category = $value;
-    	} else {
-    		throw new Exception("Invalid parameter passed.");
-    	}
-    }
-
-    /**
-     * Get Excel name
-     *
-     * @return string
-     */
-    public function getExcelName() {
-    	return $this->_excelName;
-    }
-
-    /**
-     * Set Excel name
-     *
-     * @param string	$value
-     */
-    public function setExcelName($value) {
-    	$this->_excelName = $value;
-    }
-
-    /**
-     * Get PHPExcel name
-     *
-     * @return string
-     */
-    public function getPHPExcelName() {
-    	return $this->_phpExcelName;
-    }
-
-    /**
-     * Set PHPExcel name
-     *
-     * @param string	$value
-     */
-    public function setPHPExcelName($value) {
-    	$this->_phpExcelName = $value;
-    }
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/Functions.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/Functions.php
deleted file mode 100755
index f06dd6ef2..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/Functions.php
+++ /dev/null
@@ -1,813 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/** MAX_VALUE */
-define('MAX_VALUE', 1.2e308);
-
-/** 2 / PI */
-define('M_2DIVPI', 0.63661977236758134307553505349006);
-
-/** MAX_ITERATIONS */
-define('MAX_ITERATIONS', 256);
-
-/** PRECISION */
-define('PRECISION', 8.88E-016);
-
-
-/**
- * PHPExcel_Calculation_Functions
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Functions {
-
-	/** constants */
-	const COMPATIBILITY_EXCEL		= 'Excel';
-	const COMPATIBILITY_GNUMERIC	= 'Gnumeric';
-	const COMPATIBILITY_OPENOFFICE	= 'OpenOfficeCalc';
-
-	const RETURNDATE_PHP_NUMERIC	= 'P';
-	const RETURNDATE_PHP_OBJECT		= 'O';
-	const RETURNDATE_EXCEL			= 'E';
-
-
-	/**
-	 * Compatibility mode to use for error checking and responses
-	 *
-	 * @access	private
-	 * @var string
-	 */
-	protected static $compatibilityMode	= self::COMPATIBILITY_EXCEL;
-
-	/**
-	 * Data Type to use when returning date values
-	 *
-	 * @access	private
-	 * @var string
-	 */
-	protected static $ReturnDateType	= self::RETURNDATE_EXCEL;
-
-	/**
-	 * List of error codes
-	 *
-	 * @access	private
-	 * @var array
-	 */
-	protected static $_errorCodes	= array( 'null'				=> '#NULL!',
-											 'divisionbyzero'	=> '#DIV/0!',
-											 'value'			=> '#VALUE!',
-											 'reference'		=> '#REF!',
-											 'name'				=> '#NAME?',
-											 'num'				=> '#NUM!',
-											 'na'				=> '#N/A',
-											 'gettingdata'		=> '#GETTING_DATA'
-										   );
-
-
-	/**
-	 * Set the Compatibility Mode
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @param	 string		$compatibilityMode		Compatibility Mode
-	 *												Permitted values are:
-	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL			'Excel'
-	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC		'Gnumeric'
-	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE	'OpenOfficeCalc'
-	 * @return	 boolean	(Success or Failure)
-	 */
-	public static function setCompatibilityMode($compatibilityMode) {
-		if (($compatibilityMode == self::COMPATIBILITY_EXCEL) ||
-			($compatibilityMode == self::COMPATIBILITY_GNUMERIC) ||
-			($compatibilityMode == self::COMPATIBILITY_OPENOFFICE)) {
-			self::$compatibilityMode = $compatibilityMode;
-			return True;
-		}
-		return False;
-	}	//	function setCompatibilityMode()
-
-
-	/**
-	 * Return the current Compatibility Mode
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @return	 string		Compatibility Mode
-	 *							Possible Return values are:
-	 *								PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL			'Excel'
-	 *								PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC		'Gnumeric'
-	 *								PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE	'OpenOfficeCalc'
-	 */
-	public static function getCompatibilityMode() {
-		return self::$compatibilityMode;
-	}	//	function getCompatibilityMode()
-
-
-	/**
-	 * Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @param	 string	$returnDateType			Return Date Format
-	 *												Permitted values are:
-	 *													PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC		'P'
-	 *													PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT		'O'
-	 *													PHPExcel_Calculation_Functions::RETURNDATE_EXCEL			'E'
-	 * @return	 boolean							Success or failure
-	 */
-	public static function setReturnDateType($returnDateType) {
-		if (($returnDateType == self::RETURNDATE_PHP_NUMERIC) ||
-			($returnDateType == self::RETURNDATE_PHP_OBJECT) ||
-			($returnDateType == self::RETURNDATE_EXCEL)) {
-			self::$ReturnDateType = $returnDateType;
-			return True;
-		}
-		return False;
-	}	//	function setReturnDateType()
-
-
-	/**
-	 * Return the current Return Date Format for functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
-	 *
-	 * @access	public
-	 * @category Function Configuration
-	 * @return	 string		Return Date Format
-	 *							Possible Return values are:
-	 *								PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC		'P'
-	 *								PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT		'O'
-	 *								PHPExcel_Calculation_Functions::RETURNDATE_EXCEL			'E'
-	 */
-	public static function getReturnDateType() {
-		return self::$ReturnDateType;
-	}	//	function getReturnDateType()
-
-
-	/**
-	 * DUMMY
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#Not Yet Implemented
-	 */
-	public static function DUMMY() {
-		return '#Not Yet Implemented';
-	}	//	function DUMMY()
-
-
-	/**
-	 * DIV0
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#Not Yet Implemented
-	 */
-	public static function DIV0() {
-		return self::$_errorCodes['divisionbyzero'];
-	}	//	function DIV0()
-
-
-	/**
-	 * NA
-	 *
-	 * Excel Function:
-	 *		=NA()
-	 *
-	 * Returns the error value #N/A
-	 *		#N/A is the error value that means "no value is available."
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @return	string	#N/A!
-	 */
-	public static function NA() {
-		return self::$_errorCodes['na'];
-	}	//	function NA()
-
-
-	/**
-	 * NaN
-	 *
-	 * Returns the error value #NUM!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#NUM!
-	 */
-	public static function NaN() {
-		return self::$_errorCodes['num'];
-	}	//	function NaN()
-
-
-	/**
-	 * NAME
-	 *
-	 * Returns the error value #NAME?
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#NAME?
-	 */
-	public static function NAME() {
-		return self::$_errorCodes['name'];
-	}	//	function NAME()
-
-
-	/**
-	 * REF
-	 *
-	 * Returns the error value #REF!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#REF!
-	 */
-	public static function REF() {
-		return self::$_errorCodes['reference'];
-	}	//	function REF()
-
-
-	/**
-	 * NULL
-	 *
-	 * Returns the error value #NULL!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#REF!
-	 */
-	public static function NULL() {
-		return self::$_errorCodes['null'];
-	}	//	function NULL()
-
-
-	/**
-	 * VALUE
-	 *
-	 * Returns the error value #VALUE!
-	 *
-	 * @access	public
-	 * @category Error Returns
-	 * @return	string	#VALUE!
-	 */
-	public static function VALUE() {
-		return self::$_errorCodes['value'];
-	}	//	function VALUE()
-
-
-	public static function isMatrixValue($idx) {
-		return ((substr_count($idx,'.') <= 1) || (preg_match('/\.[A-Z]/',$idx) > 0));
-	}
-
-
-	public static function isValue($idx) {
-		return (substr_count($idx,'.') == 0);
-	}
-
-
-	public static function isCellValue($idx) {
-		return (substr_count($idx,'.') > 1);
-	}
-
-
-	public static function _ifCondition($condition) {
-		$condition	= PHPExcel_Calculation_Functions::flattenSingleValue($condition);
-		if (!in_array($condition{0},array('>', '<', '='))) {
-			if (!is_numeric($condition)) { $condition = PHPExcel_Calculation::_wrapResult(strtoupper($condition)); }
-			return '='.$condition;
-		} else {
-			preg_match('/([<>=]+)(.*)/',$condition,$matches);
-			list(,$operator,$operand) = $matches;
-			if (!is_numeric($operand)) { $operand = PHPExcel_Calculation::_wrapResult(strtoupper($operand)); }
-			return $operator.$operand;
-		}
-	}	//	function _ifCondition()
-
-
-	/**
-	 * ERROR_TYPE
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function ERROR_TYPE($value = '') {
-		$value	= self::flattenSingleValue($value);
-
-		$i = 1;
-		foreach(self::$_errorCodes as $errorCode) {
-			if ($value === $errorCode) {
-				return $i;
-			}
-			++$i;
-		}
-		return self::NA();
-	}	//	function ERROR_TYPE()
-
-
-	/**
-	 * IS_BLANK
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_BLANK($value = NULL) {
-		if (!is_null($value)) {
-			$value	= self::flattenSingleValue($value);
-		}
-
-		return is_null($value);
-	}	//	function IS_BLANK()
-
-
-	/**
-	 * IS_ERR
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_ERR($value = '') {
-		$value		= self::flattenSingleValue($value);
-
-		return self::IS_ERROR($value) && (!self::IS_NA($value));
-	}	//	function IS_ERR()
-
-
-	/**
-	 * IS_ERROR
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_ERROR($value = '') {
-		$value		= self::flattenSingleValue($value);
-
-		if (!is_string($value))
-			return false;
-		return in_array($value, array_values(self::$_errorCodes));
-	}	//	function IS_ERROR()
-
-
-	/**
-	 * IS_NA
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_NA($value = '') {
-		$value		= self::flattenSingleValue($value);
-
-		return ($value === self::NA());
-	}	//	function IS_NA()
-
-
-	/**
-	 * IS_EVEN
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_EVEN($value = NULL) {
-		$value = self::flattenSingleValue($value);
-
-		if ($value === NULL)
-			return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
-			return self::VALUE();
-		return ($value % 2 == 0);
-	}	//	function IS_EVEN()
-
-
-	/**
-	 * IS_ODD
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function IS_ODD($value = NULL) {
-		$value = self::flattenSingleValue($value);
-
-		if ($value === NULL)
-			return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
-			return self::VALUE();
-		return (abs($value) % 2 == 1);
-	}	//	function IS_ODD()
-
-
-	/**
-	 * IS_NUMBER
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_NUMBER($value = NULL) {
-		$value		= self::flattenSingleValue($value);
-
-		if (is_string($value)) {
-			return False;
-		}
-		return is_numeric($value);
-	}	//	function IS_NUMBER()
-
-
-	/**
-	 * IS_LOGICAL
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_LOGICAL($value = NULL) {
-		$value		= self::flattenSingleValue($value);
-
-		return is_bool($value);
-	}	//	function IS_LOGICAL()
-
-
-	/**
-	 * IS_TEXT
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_TEXT($value = NULL) {
-		$value		= self::flattenSingleValue($value);
-
-		return (is_string($value) && !self::IS_ERROR($value));
-	}	//	function IS_TEXT()
-
-
-	/**
-	 * IS_NONTEXT
-	 *
-	 * @param	mixed	$value		Value to check
-	 * @return	boolean
-	 */
-	public static function IS_NONTEXT($value = NULL) {
-		return !self::IS_TEXT($value);
-	}	//	function IS_NONTEXT()
-
-
-	/**
-	 * VERSION
-	 *
-	 * @return	string	Version information
-	 */
-	public static function VERSION() {
-		return 'PHPExcel ##VERSION##, ##DATE##';
-	}	//	function VERSION()
-
-
-	/**
-	 * N
-	 *
-	 * Returns a value converted to a number
-	 *
-	 * @param	value		The value you want converted
-	 * @return	number		N converts values listed in the following table
-	 *		If value is or refers to N returns
-	 *		A number			That number
-	 *		A date				The serial number of that date
-	 *		TRUE				1
-	 *		FALSE				0
-	 *		An error value		The error value
-	 *		Anything else		0
-	 */
-	public static function N($value = NULL) {
-		while (is_array($value)) {
-			$value = array_shift($value);
-		}
-
-		switch (gettype($value)) {
-			case 'double'	:
-			case 'float'	:
-			case 'integer'	:
-				return $value;
-				break;
-			case 'boolean'	:
-				return (integer) $value;
-				break;
-			case 'string'	:
-				//	Errors
-				if ((strlen($value) > 0) && ($value{0} == '#')) {
-					return $value;
-				}
-				break;
-		}
-		return 0;
-	}	//	function N()
-
-
-	/**
-	 * TYPE
-	 *
-	 * Returns a number that identifies the type of a value
-	 *
-	 * @param	value		The value you want tested
-	 * @return	number		N converts values listed in the following table
-	 *		If value is or refers to N returns
-	 *		A number			1
-	 *		Text				2
-	 *		Logical Value		4
-	 *		An error value		16
-	 *		Array or Matrix		64
-	 */
-	public static function TYPE($value = NULL) {
-		$value	= self::flattenArrayIndexed($value);
-		if (is_array($value) && (count($value) > 1)) {
-			$a = array_keys($value);
-			$a = array_pop($a);
-			//	Range of cells is an error
-			if (self::isCellValue($a)) {
-				return 16;
-			//	Test for Matrix
-			} elseif (self::isMatrixValue($a)) {
-				return 64;
-			}
-		} elseif(empty($value)) {
-			//	Empty Cell
-			return 1;
-		}
-		$value	= self::flattenSingleValue($value);
-
-		if (($value === NULL) || (is_float($value)) || (is_int($value))) {
-				return 1;
-		} elseif(is_bool($value)) {
-				return 4;
-		} elseif(is_array($value)) {
-				return 64;
-				break;
-		} elseif(is_string($value)) {
-			//	Errors
-			if ((strlen($value) > 0) && ($value{0} == '#')) {
-				return 16;
-			}
-			return 2;
-		}
-		return 0;
-	}	//	function TYPE()
-
-
-	/**
-	 * Convert a multi-dimensional array to a simple 1-dimensional array
-	 *
-	 * @param	array	$array	Array to be flattened
-	 * @return	array	Flattened array
-	 */
-	public static function flattenArray($array) {
-		if (!is_array($array)) {
-			return (array) $array;
-		}
-
-		$arrayValues = array();
-		foreach ($array as $value) {
-			if (is_array($value)) {
-				foreach ($value as $val) {
-					if (is_array($val)) {
-						foreach ($val as $v) {
-							$arrayValues[] = $v;
-						}
-					} else {
-						$arrayValues[] = $val;
-					}
-				}
-			} else {
-				$arrayValues[] = $value;
-			}
-		}
-
-		return $arrayValues;
-	}	//	function flattenArray()
-
-
-	/**
-	 * Convert a multi-dimensional array to a simple 1-dimensional array, but retain an element of indexing
-	 *
-	 * @param	array	$array	Array to be flattened
-	 * @return	array	Flattened array
-	 */
-	public static function flattenArrayIndexed($array) {
-		if (!is_array($array)) {
-			return (array) $array;
-		}
-
-		$arrayValues = array();
-		foreach ($array as $k1 => $value) {
-			if (is_array($value)) {
-				foreach ($value as $k2 => $val) {
-					if (is_array($val)) {
-						foreach ($val as $k3 => $v) {
-							$arrayValues[$k1.'.'.$k2.'.'.$k3] = $v;
-						}
-					} else {
-						$arrayValues[$k1.'.'.$k2] = $val;
-					}
-				}
-			} else {
-				$arrayValues[$k1] = $value;
-			}
-		}
-
-		return $arrayValues;
-	}	//	function flattenArrayIndexed()
-
-
-	/**
-	 * Convert an array to a single scalar value by extracting the first element
-	 *
-	 * @param	mixed		$value		Array or scalar value
-	 * @return	mixed
-	 */
-	public static function flattenSingleValue($value = '') {
-		while (is_array($value)) {
-			$value = array_pop($value);
-		}
-
-		return $value;
-	}	//	function flattenSingleValue()
-
-}	//	class PHPExcel_Calculation_Functions
-
-
-//
-//	There are a few mathematical functions that aren't available on all versions of PHP for all platforms
-//	These functions aren't available in Windows implementations of PHP prior to version 5.3.0
-//	So we test if they do exist for this version of PHP/operating platform; and if not we create them
-//
-if (!function_exists('acosh')) {
-	function acosh($x) {
-		return 2 * log(sqrt(($x + 1) / 2) + sqrt(($x - 1) / 2));
-	}	//	function acosh()
-}
-
-if (!function_exists('asinh')) {
-	function asinh($x) {
-		return log($x + sqrt(1 + $x * $x));
-	}	//	function asinh()
-}
-
-if (!function_exists('atanh')) {
-	function atanh($x) {
-		return (log(1 + $x) - log(1 - $x)) / 2;
-	}	//	function atanh()
-}
-
-if (!function_exists('money_format')) {
-	function money_format($format, $number) {
-		$regex = array( '/%((?:[\^!\-]|\+|\(|\=.)*)([0-9]+)?(?:#([0-9]+))?',
-						 '(?:\.([0-9]+))?([in%])/'
-					  );
-		$regex = implode('', $regex);
-		if (setlocale(LC_MONETARY, null) == '') {
-			setlocale(LC_MONETARY, '');
-		}
-		$locale = localeconv();
-		$number = floatval($number);
-		if (!preg_match($regex, $format, $fmatch)) {
-			trigger_error("No format specified or invalid format", E_USER_WARNING);
-			return $number;
-		}
-		$flags = array( 'fillchar'	=> preg_match('/\=(.)/', $fmatch[1], $match) ? $match[1] : ' ',
-						'nogroup'	=> preg_match('/\^/', $fmatch[1]) > 0,
-						'usesignal'	=> preg_match('/\+|\(/', $fmatch[1], $match) ? $match[0] : '+',
-						'nosimbol'	=> preg_match('/\!/', $fmatch[1]) > 0,
-						'isleft'	=> preg_match('/\-/', $fmatch[1]) > 0
-					  );
-		$width	= trim($fmatch[2]) ? (int)$fmatch[2] : 0;
-		$left	= trim($fmatch[3]) ? (int)$fmatch[3] : 0;
-		$right	= trim($fmatch[4]) ? (int)$fmatch[4] : $locale['int_frac_digits'];
-		$conversion = $fmatch[5];
-		$positive = true;
-		if ($number < 0) {
-			$positive = false;
-			$number *= -1;
-		}
-		$letter = $positive ? 'p' : 'n';
-		$prefix = $suffix = $cprefix = $csuffix = $signal = '';
-		if (!$positive) {
-			$signal = $locale['negative_sign'];
-			switch (true) {
-				case $locale['n_sign_posn'] == 0 || $flags['usesignal'] == '(':
-					$prefix = '(';
-					$suffix = ')';
-					break;
-				case $locale['n_sign_posn'] == 1:
-					$prefix = $signal;
-					break;
-				case $locale['n_sign_posn'] == 2:
-					$suffix = $signal;
-					break;
-				case $locale['n_sign_posn'] == 3:
-					$cprefix = $signal;
-					break;
-				case $locale['n_sign_posn'] == 4:
-					$csuffix = $signal;
-					break;
-			}
-		}
-		if (!$flags['nosimbol']) {
-			$currency = $cprefix;
-			$currency .= ($conversion == 'i' ? $locale['int_curr_symbol'] : $locale['currency_symbol']);
-			$currency .= $csuffix;
-			$currency = iconv('ISO-8859-1','UTF-8',$currency);
-		} else {
-			$currency = '';
-		}
-		$space = $locale["{$letter}_sep_by_space"] ? ' ' : '';
-
-		if (!isset($locale['mon_decimal_point']) || empty($locale['mon_decimal_point'])) {
-			$locale['mon_decimal_point'] = (!isset($locale['decimal_point']) || empty($locale['decimal_point'])) ?
-											$locale['decimal_point'] :
-											'.';
-		}
-
-		$number = number_format($number, $right, $locale['mon_decimal_point'], $flags['nogroup'] ? '' : $locale['mon_thousands_sep'] );
-		$number = explode($locale['mon_decimal_point'], $number);
-
-		$n = strlen($prefix) + strlen($currency);
-		if ($left > 0 && $left > $n) {
-			if ($flags['isleft']) {
-				$number[0] .= str_repeat($flags['fillchar'], $left - $n);
-			} else {
-				$number[0] = str_repeat($flags['fillchar'], $left - $n) . $number[0];
-			}
-		}
-		$number = implode($locale['mon_decimal_point'], $number);
-		if ($locale["{$letter}_cs_precedes"]) {
-			$number = $prefix . $currency . $space . $number . $suffix;
-		} else {
-			$number = $prefix . $number . $space . $currency . $suffix;
-		}
-		if ($width > 0) {
-			$number = str_pad($number, $width, $flags['fillchar'], $flags['isleft'] ? STR_PAD_RIGHT : STR_PAD_LEFT);
-		}
-		$format = str_replace($fmatch[0], $number, $format);
-		return $format;
-	}	//	function money_format()
-}
-
-
-//
-//	Strangely, PHP doesn't have a mb_str_replace multibyte function
-//	As we'll only ever use this function with UTF-8 characters, we can simply "hard-code" the character set
-//
-if ((!function_exists('mb_str_replace')) &&
-	(function_exists('mb_substr')) && (function_exists('mb_strlen')) && (function_exists('mb_strpos'))) {
-	function mb_str_replace($search, $replace, $subject) {
-		if(is_array($subject)) {
-			$ret = array();
-			foreach($subject as $key => $val) {
-				$ret[$key] = mb_str_replace($search, $replace, $val);
-			}
-			return $ret;
-		}
-
-		foreach((array) $search as $key => $s) {
-			if($s == '') {
-				continue;
-			}
-			$r = !is_array($replace) ? $replace : (array_key_exists($key, $replace) ? $replace[$key] : '');
-			$pos = mb_strpos($subject, $s, 0, 'UTF-8');
-			while($pos !== false) {
-				$subject = mb_substr($subject, 0, $pos, 'UTF-8') . $r . mb_substr($subject, $pos + mb_strlen($s, 'UTF-8'), 65535, 'UTF-8');
-				$pos = mb_strpos($subject, $s, $pos + mb_strlen($r, 'UTF-8'), 'UTF-8');
-			}
-		}
-		return $subject;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/Logical.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/Logical.php
deleted file mode 100755
index 5d6a31c8d..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/Logical.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_Logical
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Logical {
-
-	/**
-	 * TRUE
-	 *
-	 * Returns the boolean TRUE.
-	 *
-	 * Excel Function:
-	 *		=TRUE()
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @return	boolean		True
-	 */
-	public static function TRUE() {
-		return TRUE;
-	}	//	function TRUE()
-
-
-	/**
-	 * FALSE
-	 *
-	 * Returns the boolean FALSE.
-	 *
-	 * Excel Function:
-	 *		=FALSE()
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @return	boolean		False
-	 */
-	public static function FALSE() {
-		return FALSE;
-	}	//	function FALSE()
-
-
-	/**
-	 * LOGICAL_AND
-	 *
-	 * Returns boolean TRUE if all its arguments are TRUE; returns FALSE if one or more argument is FALSE.
-	 *
-	 * Excel Function:
-	 *		=AND(logical1[,logical2[, ...]])
-	 *
-	 *		The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
-	 *			or references that contain logical values.
-	 *
-	 *		Boolean arguments are treated as True or False as appropriate
-	 *		Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
-	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	boolean		The logical AND of the arguments.
-	 */
-	public static function LOGICAL_AND() {
-		// Return value
-		$returnValue = TRUE;
-
-		// Loop through the arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$argCount = -1;
-		foreach ($aArgs as $argCount => $arg) {
-			// Is it a boolean value?
-			if (is_bool($arg)) {
-				$returnValue = $returnValue && $arg;
-			} elseif ((is_numeric($arg)) && (!is_string($arg))) {
-				$returnValue = $returnValue && ($arg != 0);
-			} elseif (is_string($arg)) {
-				$arg = strtoupper($arg);
-				if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
-					$arg = TRUE;
-				} elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
-					$arg = FALSE;
-				} else {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$returnValue = $returnValue && ($arg != 0);
-			}
-		}
-
-		// Return
-		if ($argCount < 0) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		return $returnValue;
-	}	//	function LOGICAL_AND()
-
-
-	/**
-	 * LOGICAL_OR
-	 *
-	 * Returns boolean TRUE if any argument is TRUE; returns FALSE if all arguments are FALSE.
-	 *
-	 * Excel Function:
-	 *		=OR(logical1[,logical2[, ...]])
-	 *
-	 *		The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
-	 *			or references that contain logical values.
-	 *
-	 *		Boolean arguments are treated as True or False as appropriate
-	 *		Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
-	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	boolean		The logical OR of the arguments.
-	 */
-	public static function LOGICAL_OR() {
-		// Return value
-		$returnValue = FALSE;
-
-		// Loop through the arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$argCount = -1;
-		foreach ($aArgs as $argCount => $arg) {
-			// Is it a boolean value?
-			if (is_bool($arg)) {
-				$returnValue = $returnValue || $arg;
-			} elseif ((is_numeric($arg)) && (!is_string($arg))) {
-				$returnValue = $returnValue || ($arg != 0);
-			} elseif (is_string($arg)) {
-				$arg = strtoupper($arg);
-				if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
-					$arg = TRUE;
-				} elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
-					$arg = FALSE;
-				} else {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$returnValue = $returnValue || ($arg != 0);
-			}
-		}
-
-		// Return
-		if ($argCount < 0) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		return $returnValue;
-	}	//	function LOGICAL_OR()
-
-
-	/**
-	 * NOT
-	 *
-	 * Returns the boolean inverse of the argument.
-	 *
-	 * Excel Function:
-	 *		=NOT(logical)
-	 *
-	 *		The argument must evaluate to a logical value such as TRUE or FALSE
-	 *
-	 *		Boolean arguments are treated as True or False as appropriate
-	 *		Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
-	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed		$logical	A value or expression that can be evaluated to TRUE or FALSE
-	 * @return	boolean		The boolean inverse of the argument.
-	 */
-	public static function NOT($logical=FALSE) {
-		$logical = PHPExcel_Calculation_Functions::flattenSingleValue($logical);
-		if (is_string($logical)) {
-			$logical = strtoupper($logical);
-			if (($logical == 'TRUE') || ($logical == PHPExcel_Calculation::getTRUE())) {
-				return FALSE;
-			} elseif (($logical == 'FALSE') || ($logical == PHPExcel_Calculation::getFALSE())) {
-				return TRUE;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-
-		return !$logical;
-	}	//	function NOT()
-
-	/**
-	 * STATEMENT_IF
-	 *
-	 * Returns one value if a condition you specify evaluates to TRUE and another value if it evaluates to FALSE.
-	 *
-	 * Excel Function:
-	 *		=IF(condition[,returnIfTrue[,returnIfFalse]])
-	 *
-	 *		Condition is any value or expression that can be evaluated to TRUE or FALSE.
-	 *			For example, A10=100 is a logical expression; if the value in cell A10 is equal to 100,
-	 *			the expression evaluates to TRUE. Otherwise, the expression evaluates to FALSE.
-	 *			This argument can use any comparison calculation operator.
-	 *		ReturnIfTrue is the value that is returned if condition evaluates to TRUE.
-	 *			For example, if this argument is the text string "Within budget" and the condition argument evaluates to TRUE,
-	 *			then the IF function returns the text "Within budget"
-	 *			If condition is TRUE and ReturnIfTrue is blank, this argument returns 0 (zero). To display the word TRUE, use
-	 *			the logical value TRUE for this argument.
-	 *			ReturnIfTrue can be another formula.
-	 *		ReturnIfFalse is the value that is returned if condition evaluates to FALSE.
-	 *			For example, if this argument is the text string "Over budget" and the condition argument evaluates to FALSE,
-	 *			then the IF function returns the text "Over budget".
-	 *			If condition is FALSE and ReturnIfFalse is omitted, then the logical value FALSE is returned.
-	 *			If condition is FALSE and ReturnIfFalse is blank, then the value 0 (zero) is returned.
-	 *			ReturnIfFalse can be another formula.
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed	$condition		Condition to evaluate
-	 * @param	mixed	$returnIfTrue	Value to return when condition is true
-	 * @param	mixed	$returnIfFalse	Optional value to return when condition is false
-	 * @return	mixed	The value of returnIfTrue or returnIfFalse determined by condition
-	 */
-	public static function STATEMENT_IF($condition = TRUE, $returnIfTrue = 0, $returnIfFalse = FALSE) {
-		$condition		= (is_null($condition))		? TRUE :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($condition);
-		$returnIfTrue	= (is_null($returnIfTrue))	? 0 :		PHPExcel_Calculation_Functions::flattenSingleValue($returnIfTrue);
-		$returnIfFalse	= (is_null($returnIfFalse))	? FALSE :	PHPExcel_Calculation_Functions::flattenSingleValue($returnIfFalse);
-
-		return ($condition) ? $returnIfTrue : $returnIfFalse;
-	}	//	function STATEMENT_IF()
-
-
-	/**
-	 * IFERROR
-	 *
-	 * Excel Function:
-	 *		=IFERROR(testValue,errorpart)
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed	$testValue	Value to check, is also the value returned when no error
-	 * @param	mixed	$errorpart	Value to return when testValue is an error condition
-	 * @return	mixed	The value of errorpart or testValue determined by error condition
-	 */
-	public static function IFERROR($testValue = '', $errorpart = '') {
-		$testValue	= (is_null($testValue))	? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
-		$errorpart	= (is_null($errorpart))	? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($errorpart);
-
-		return self::STATEMENT_IF(PHPExcel_Calculation_Functions::IS_ERROR($testValue), $errorpart, $testValue);
-	}	//	function IFERROR()
-
-}	//	class PHPExcel_Calculation_Logical
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/LookupRef.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/LookupRef.php
deleted file mode 100755
index ba89a1147..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/LookupRef.php
+++ /dev/null
@@ -1,808 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_LookupRef
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_LookupRef {
-
-
-	/**
-	 * CELL_ADDRESS
-	 *
-	 * Creates a cell address as text, given specified row and column numbers.
-	 *
-	 * Excel Function:
-	 *		=ADDRESS(row, column, [relativity], [referenceStyle], [sheetText])
-	 *
-	 * @param	row				Row number to use in the cell reference
-	 * @param	column			Column number to use in the cell reference
-	 * @param	relativity		Flag indicating the type of reference to return
-	 *								1 or omitted	Absolute
-	 *								2				Absolute row; relative column
-	 *								3				Relative row; absolute column
-	 *								4				Relative
-	 * @param	referenceStyle	A logical value that specifies the A1 or R1C1 reference style.
-	 *								TRUE or omitted		CELL_ADDRESS returns an A1-style reference
-	 *								FALSE				CELL_ADDRESS returns an R1C1-style reference
-	 * @param	sheetText		Optional Name of worksheet to use
-	 * @return	string
-	 */
-	public static function CELL_ADDRESS($row, $column, $relativity=1, $referenceStyle=True, $sheetText='') {
-		$row		= PHPExcel_Calculation_Functions::flattenSingleValue($row);
-		$column		= PHPExcel_Calculation_Functions::flattenSingleValue($column);
-		$relativity	= PHPExcel_Calculation_Functions::flattenSingleValue($relativity);
-		$sheetText	= PHPExcel_Calculation_Functions::flattenSingleValue($sheetText);
-
-		if (($row < 1) || ($column < 1)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if ($sheetText > '') {
-			if (strpos($sheetText,' ') !== False) { $sheetText = "'".$sheetText."'"; }
-			$sheetText .='!';
-		}
-		if ((!is_bool($referenceStyle)) || $referenceStyle) {
-			$rowRelative = $columnRelative = '$';
-			$column = PHPExcel_Cell::stringFromColumnIndex($column-1);
-			if (($relativity == 2) || ($relativity == 4)) { $columnRelative = ''; }
-			if (($relativity == 3) || ($relativity == 4)) { $rowRelative = ''; }
-			return $sheetText.$columnRelative.$column.$rowRelative.$row;
-		} else {
-			if (($relativity == 2) || ($relativity == 4)) { $column = '['.$column.']'; }
-			if (($relativity == 3) || ($relativity == 4)) { $row = '['.$row.']'; }
-			return $sheetText.'R'.$row.'C'.$column;
-		}
-	}	//	function CELL_ADDRESS()
-
-
-	/**
-	 * COLUMN
-	 *
-	 * Returns the column number of the given cell reference
-	 * If the cell reference is a range of cells, COLUMN returns the column numbers of each column in the reference as a horizontal array.
-	 * If cell reference is omitted, and the function is being called through the calculation engine, then it is assumed to be the
-	 *		reference of the cell in which the COLUMN function appears; otherwise this function returns 0.
-	 *
-	 * Excel Function:
-	 *		=COLUMN([cellAddress])
-	 *
-	 * @param	cellAddress		A reference to a range of cells for which you want the column numbers
-	 * @return	integer or array of integer
-	 */
-	public static function COLUMN($cellAddress=Null) {
-		if (is_null($cellAddress) || trim($cellAddress) === '') { return 0; }
-
-		if (is_array($cellAddress)) {
-			foreach($cellAddress as $columnKey => $value) {
-				$columnKey = preg_replace('/[^a-z]/i','',$columnKey);
-				return (integer) PHPExcel_Cell::columnIndexFromString($columnKey);
-			}
-		} else {
-			if (strpos($cellAddress,'!') !== false) {
-				list($sheet,$cellAddress) = explode('!',$cellAddress);
-			}
-			if (strpos($cellAddress,':') !== false) {
-				list($startAddress,$endAddress) = explode(':',$cellAddress);
-				$startAddress = preg_replace('/[^a-z]/i','',$startAddress);
-				$endAddress = preg_replace('/[^a-z]/i','',$endAddress);
-				$returnValue = array();
-				do {
-					$returnValue[] = (integer) PHPExcel_Cell::columnIndexFromString($startAddress);
-				} while ($startAddress++ != $endAddress);
-				return $returnValue;
-			} else {
-				$cellAddress = preg_replace('/[^a-z]/i','',$cellAddress);
-				return (integer) PHPExcel_Cell::columnIndexFromString($cellAddress);
-			}
-		}
-	}	//	function COLUMN()
-
-
-	/**
-	 * COLUMNS
-	 *
-	 * Returns the number of columns in an array or reference.
-	 *
-	 * Excel Function:
-	 *		=COLUMNS(cellAddress)
-	 *
-	 * @param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of columns
-	 * @return	integer			The number of columns in cellAddress
-	 */
-	public static function COLUMNS($cellAddress=Null) {
-		if (is_null($cellAddress) || $cellAddress === '') {
-			return 1;
-		} elseif (!is_array($cellAddress)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		$x = array_keys($cellAddress);
-		$x = array_shift($x);
-		$isMatrix = (is_numeric($x));
-		list($columns,$rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
-
-		if ($isMatrix) {
-			return $rows;
-		} else {
-			return $columns;
-		}
-	}	//	function COLUMNS()
-
-
-	/**
-	 * ROW
-	 *
-	 * Returns the row number of the given cell reference
-	 * If the cell reference is a range of cells, ROW returns the row numbers of each row in the reference as a vertical array.
-	 * If cell reference is omitted, and the function is being called through the calculation engine, then it is assumed to be the
-	 *		reference of the cell in which the ROW function appears; otherwise this function returns 0.
-	 *
-	 * Excel Function:
-	 *		=ROW([cellAddress])
-	 *
-	 * @param	cellAddress		A reference to a range of cells for which you want the row numbers
-	 * @return	integer or array of integer
-	 */
-	public static function ROW($cellAddress=Null) {
-		if (is_null($cellAddress) || trim($cellAddress) === '') { return 0; }
-
-		if (is_array($cellAddress)) {
-			foreach($cellAddress as $columnKey => $rowValue) {
-				foreach($rowValue as $rowKey => $cellValue) {
-					return (integer) preg_replace('/[^0-9]/i','',$rowKey);
-				}
-			}
-		} else {
-			if (strpos($cellAddress,'!') !== false) {
-				list($sheet,$cellAddress) = explode('!',$cellAddress);
-			}
-			if (strpos($cellAddress,':') !== false) {
-				list($startAddress,$endAddress) = explode(':',$cellAddress);
-				$startAddress = preg_replace('/[^0-9]/','',$startAddress);
-				$endAddress = preg_replace('/[^0-9]/','',$endAddress);
-				$returnValue = array();
-				do {
-					$returnValue[][] = (integer) $startAddress;
-				} while ($startAddress++ != $endAddress);
-				return $returnValue;
-			} else {
-				list($cellAddress) = explode(':',$cellAddress);
-				return (integer) preg_replace('/[^0-9]/','',$cellAddress);
-			}
-		}
-	}	//	function ROW()
-
-
-	/**
-	 * ROWS
-	 *
-	 * Returns the number of rows in an array or reference.
-	 *
-	 * Excel Function:
-	 *		=ROWS(cellAddress)
-	 *
-	 * @param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of rows
-	 * @return	integer			The number of rows in cellAddress
-	 */
-	public static function ROWS($cellAddress=Null) {
-		if (is_null($cellAddress) || $cellAddress === '') {
-			return 1;
-		} elseif (!is_array($cellAddress)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		$i = array_keys($cellAddress);
-		$isMatrix = (is_numeric(array_shift($i)));
-		list($columns,$rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
-
-		if ($isMatrix) {
-			return $columns;
-		} else {
-			return $rows;
-		}
-	}	//	function ROWS()
-
-
-	/**
-	 * HYPERLINK
-	 *
-	 * Excel Function:
-	 *		=HYPERLINK(linkURL,displayName)
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	string	$linkURL		Value to check, is also the value returned when no error
-	 * @param	string	$displayName	Value to return when testValue is an error condition
-	 * @return	mixed	The value of $displayName (or $linkURL if $displayName was blank)
-	 */
-	public static function HYPERLINK($linkURL = '', $displayName = null, PHPExcel_Cell $pCell = null) {
-		$args = func_get_args();
-		$pCell = array_pop($args);
-
-		$linkURL		= (is_null($linkURL))		? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($linkURL);
-		$displayName	= (is_null($displayName))	? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($displayName);
-
-		if ((!is_object($pCell)) || (trim($linkURL) == '')) {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-
-		if ((is_object($displayName)) || trim($displayName) == '') {
-			$displayName = $linkURL;
-		}
-
-		$pCell->getHyperlink()->setUrl($linkURL);
-
-		return $displayName;
-	}	//	function HYPERLINK()
-
-
-	/**
-	 * INDIRECT
-	 *
-	 * Returns the reference specified by a text string.
-	 * References are immediately evaluated to display their contents.
-	 *
-	 * Excel Function:
-	 *		=INDIRECT(cellAddress)
-	 *
-	 * NOTE - INDIRECT() does not yet support the optional a1 parameter introduced in Excel 2010
-	 *
-	 * @param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of rows
-	 * @return	mixed			The cells referenced by cellAddress
-	 *
-	 * @todo	Support for the optional a1 parameter introduced in Excel 2010
-	 *
-	 */
-	public static function INDIRECT($cellAddress=Null, PHPExcel_Cell $pCell = null) {
-		$cellAddress	= PHPExcel_Calculation_Functions::flattenSingleValue($cellAddress);
-		if (is_null($cellAddress) || $cellAddress === '') {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-
-		$cellAddress1 = $cellAddress;
-		$cellAddress2 = NULL;
-		if (strpos($cellAddress,':') !== false) {
-			list($cellAddress1,$cellAddress2) = explode(':',$cellAddress);
-		}
-
-		if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress1, $matches)) ||
-			((!is_null($cellAddress2)) && (!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress2, $matches)))) {
-
-			if (!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $cellAddress1, $matches)) {
-				return PHPExcel_Calculation_Functions::REF();
-			}
-
-			if (strpos($cellAddress,'!') !== false) {
-				list($sheetName,$cellAddress) = explode('!',$cellAddress);
-				$pSheet = $pCell->getParent()->getParent()->getSheetByName($sheetName);
-			} else {
-				$pSheet = $pCell->getParent();
-			}
-
-			return PHPExcel_Calculation::getInstance()->extractNamedRange($cellAddress, $pSheet, False);
-		}
-
-		if (strpos($cellAddress,'!') !== false) {
-			list($sheetName,$cellAddress) = explode('!',$cellAddress);
-			$pSheet = $pCell->getParent()->getParent()->getSheetByName($sheetName);
-		} else {
-			$pSheet = $pCell->getParent();
-		}
-
-		return PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, False);
-	}	//	function INDIRECT()
-
-
-	/**
-	 * OFFSET
-	 *
-	 * Returns a reference to a range that is a specified number of rows and columns from a cell or range of cells.
-	 * The reference that is returned can be a single cell or a range of cells. You can specify the number of rows and
-	 * the number of columns to be returned.
-	 *
-	 * Excel Function:
-	 *		=OFFSET(cellAddress, rows, cols, [height], [width])
-	 *
-	 * @param	cellAddress		The reference from which you want to base the offset. Reference must refer to a cell or
-	 *								range of adjacent cells; otherwise, OFFSET returns the #VALUE! error value.
-	 * @param	rows			The number of rows, up or down, that you want the upper-left cell to refer to.
-	 *								Using 5 as the rows argument specifies that the upper-left cell in the reference is
-	 *								five rows below reference. Rows can be positive (which means below the starting reference)
-	 *								or negative (which means above the starting reference).
-	 * @param	cols			The number of columns, to the left or right, that you want the upper-left cell of the result
-	 *								to refer to. Using 5 as the cols argument specifies that the upper-left cell in the
-	 *								reference is five columns to the right of reference. Cols can be positive (which means
-	 *								to the right of the starting reference) or negative (which means to the left of the
-	 *								starting reference).
-	 * @param	height			The height, in number of rows, that you want the returned reference to be. Height must be a positive number.
-	 * @param	width			The width, in number of columns, that you want the returned reference to be. Width must be a positive number.
-	 * @return	string			A reference to a cell or range of cells
-	 */
-	public static function OFFSET($cellAddress=Null,$rows=0,$columns=0,$height=null,$width=null) {
-		$rows		= PHPExcel_Calculation_Functions::flattenSingleValue($rows);
-		$columns	= PHPExcel_Calculation_Functions::flattenSingleValue($columns);
-		$height		= PHPExcel_Calculation_Functions::flattenSingleValue($height);
-		$width		= PHPExcel_Calculation_Functions::flattenSingleValue($width);
-		if ($cellAddress == Null) {
-			return 0;
-		}
-
-		$args = func_get_args();
-		$pCell = array_pop($args);
-		if (!is_object($pCell)) {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-
-		$sheetName = null;
-		if (strpos($cellAddress,"!")) {
-			list($sheetName,$cellAddress) = explode("!",$cellAddress);
-		}
-		if (strpos($cellAddress,":")) {
-			list($startCell,$endCell) = explode(":",$cellAddress);
-		} else {
-			$startCell = $endCell = $cellAddress;
-		}
-		list($startCellColumn,$startCellRow) = PHPExcel_Cell::coordinateFromString($startCell);
-		list($endCellColumn,$endCellRow) = PHPExcel_Cell::coordinateFromString($endCell);
-
-		$startCellRow += $rows;
-		$startCellColumn = PHPExcel_Cell::columnIndexFromString($startCellColumn) - 1;
-		$startCellColumn += $columns;
-
-		if (($startCellRow <= 0) || ($startCellColumn < 0)) {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-		$endCellColumn = PHPExcel_Cell::columnIndexFromString($endCellColumn) - 1;
-		if (($width != null) && (!is_object($width))) {
-			$endCellColumn = $startCellColumn + $width - 1;
-		} else {
-			$endCellColumn += $columns;
-		}
-		$startCellColumn = PHPExcel_Cell::stringFromColumnIndex($startCellColumn);
-
-		if (($height != null) && (!is_object($height))) {
-			$endCellRow = $startCellRow + $height - 1;
-		} else {
-			$endCellRow += $rows;
-		}
-
-		if (($endCellRow <= 0) || ($endCellColumn < 0)) {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-		$endCellColumn = PHPExcel_Cell::stringFromColumnIndex($endCellColumn);
-
-		$cellAddress = $startCellColumn.$startCellRow;
-		if (($startCellColumn != $endCellColumn) || ($startCellRow != $endCellRow)) {
-			$cellAddress .= ':'.$endCellColumn.$endCellRow;
-		}
-
-		if ($sheetName !== null) {
-			$pSheet = $pCell->getParent()->getParent()->getSheetByName($sheetName);
-		} else {
-			$pSheet = $pCell->getParent();
-		}
-
-		return PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, False);
-	}	//	function OFFSET()
-
-
-	/**
-	 * CHOOSE
-	 *
-	 * Uses lookup_value to return a value from the list of value arguments.
-	 * Use CHOOSE to select one of up to 254 values based on the lookup_value.
-	 *
-	 * Excel Function:
-	 *		=CHOOSE(index_num, value1, [value2], ...)
-	 *
-	 * @param	index_num		Specifies which value argument is selected.
-	 *							Index_num must be a number between 1 and 254, or a formula or reference to a cell containing a number
-	 *								between 1 and 254.
-	 * @param	value1...		Value1 is required, subsequent values are optional.
-	 *							Between 1 to 254 value arguments from which CHOOSE selects a value or an action to perform based on
-	 *								index_num. The arguments can be numbers, cell references, defined names, formulas, functions, or
-	 *								text.
-	 * @return	mixed			The selected value
-	 */
-	public static function CHOOSE() {
-		$chooseArgs = func_get_args();
-		$chosenEntry = PHPExcel_Calculation_Functions::flattenArray(array_shift($chooseArgs));
-		$entryCount = count($chooseArgs) - 1;
-
-		if(is_array($chosenEntry)) {
-			$chosenEntry = array_shift($chosenEntry);
-		}
-		if ((is_numeric($chosenEntry)) && (!is_bool($chosenEntry))) {
-			--$chosenEntry;
-		} else {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$chosenEntry = floor($chosenEntry);
-		if (($chosenEntry <= 0) || ($chosenEntry > $entryCount)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (is_array($chooseArgs[$chosenEntry])) {
-			return PHPExcel_Calculation_Functions::flattenArray($chooseArgs[$chosenEntry]);
-		} else {
-			return $chooseArgs[$chosenEntry];
-		}
-	}	//	function CHOOSE()
-
-
-	/**
-	 * MATCH
-	 *
-	 * The MATCH function searches for a specified item in a range of cells
-	 *
-	 * Excel Function:
-	 *		=MATCH(lookup_value, lookup_array, [match_type])
-	 *
-	 * @param	lookup_value	The value that you want to match in lookup_array
-	 * @param	lookup_array	The range of cells being searched
-	 * @param	match_type		The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below. If match_type is 1 or -1, the list has to be ordered.
-	 * @return	integer			The relative position of the found item
-	 */
-	public static function MATCH($lookup_value, $lookup_array, $match_type=1) {
-		$lookup_array = PHPExcel_Calculation_Functions::flattenArray($lookup_array);
-		$lookup_value = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
-		$match_type	= (is_null($match_type)) ? 1 : (int) PHPExcel_Calculation_Functions::flattenSingleValue($match_type);
-		//	MATCH is not case sensitive
-		$lookup_value = strtolower($lookup_value);
-
-		//	lookup_value type has to be number, text, or logical values
-		if ((!is_numeric($lookup_value)) && (!is_string($lookup_value)) && (!is_bool($lookup_value))) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		//	match_type is 0, 1 or -1
-		if (($match_type !== 0) && ($match_type !== -1) && ($match_type !== 1)) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		//	lookup_array should not be empty
-		$lookupArraySize = count($lookup_array);
-		if ($lookupArraySize <= 0) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		//	lookup_array should contain only number, text, or logical values, or empty (null) cells
-		foreach($lookup_array as $i => $lookupArrayValue) {
-			//	check the type of the value
-			if ((!is_numeric($lookupArrayValue)) && (!is_string($lookupArrayValue)) &&
-				(!is_bool($lookupArrayValue)) && (!is_null($lookupArrayValue))) {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			//	convert strings to lowercase for case-insensitive testing
-			if (is_string($lookupArrayValue)) {
-				$lookup_array[$i] = strtolower($lookupArrayValue);
-			}
-			if ((is_null($lookupArrayValue)) && (($match_type == 1) || ($match_type == -1))) {
-				$lookup_array = array_slice($lookup_array,0,$i-1);
-			}
-		}
-
-		// if match_type is 1 or -1, the list has to be ordered
-		if ($match_type == 1) {
-			asort($lookup_array);
-			$keySet = array_keys($lookup_array);
-		} elseif($match_type == -1) {
-			arsort($lookup_array);
-			$keySet = array_keys($lookup_array);
-		}
-
-		// **
-		// find the match
-		// **
-		// loop on the cells
-//		var_dump($lookup_array);
-//		echo '<br />';
-		foreach($lookup_array as $i => $lookupArrayValue) {
-			if (($match_type == 0) && ($lookupArrayValue == $lookup_value)) {
-				//	exact match
-				return ++$i;
-			} elseif (($match_type == -1) && ($lookupArrayValue <= $lookup_value)) {
-//				echo '$i = '.$i.' => ';
-//				var_dump($lookupArrayValue);
-//				echo '<br />';
-//				echo 'Keyset = ';
-//				var_dump($keySet);
-//				echo '<br />';
-				$i = array_search($i,$keySet);
-//				echo '$i='.$i.'<br />';
-				// if match_type is -1 <=> find the smallest value that is greater than or equal to lookup_value
-				if ($i < 1){
-					// 1st cell was allready smaller than the lookup_value
-					break;
-				} else {
-					// the previous cell was the match
-					return $keySet[$i-1]+1;
-				}
-			} elseif (($match_type == 1) && ($lookupArrayValue >= $lookup_value)) {
-//				echo '$i = '.$i.' => ';
-//				var_dump($lookupArrayValue);
-//				echo '<br />';
-//				echo 'Keyset = ';
-//				var_dump($keySet);
-//				echo '<br />';
-				$i = array_search($i,$keySet);
-//				echo '$i='.$i.'<br />';
-				// if match_type is 1 <=> find the largest value that is less than or equal to lookup_value
-				if ($i < 1){
-					// 1st cell was allready bigger than the lookup_value
-					break;
-				} else {
-					// the previous cell was the match
-					return $keySet[$i-1]+1;
-				}
-			}
-		}
-
-		//	unsuccessful in finding a match, return #N/A error value
-		return PHPExcel_Calculation_Functions::NA();
-	}	//	function MATCH()
-
-
-	/**
-	 * INDEX
-	 *
-	 * Uses an index to choose a value from a reference or array
-	 *
-	 * Excel Function:
-	 *		=INDEX(range_array, row_num, [column_num])
-	 *
-	 * @param	range_array		A range of cells or an array constant
-	 * @param	row_num			The row in array from which to return a value. If row_num is omitted, column_num is required.
-	 * @param	column_num		The column in array from which to return a value. If column_num is omitted, row_num is required.
-	 * @return	mixed			the value of a specified cell or array of cells
-	 */
-	public static function INDEX($arrayValues,$rowNum = 0,$columnNum = 0) {
-
-		if (($rowNum < 0) || ($columnNum < 0)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (!is_array($arrayValues)) {
-			return PHPExcel_Calculation_Functions::REF();
-		}
-
-		$rowKeys = array_keys($arrayValues);
-		$columnKeys = @array_keys($arrayValues[$rowKeys[0]]);
-
-		if ($columnNum > count($columnKeys)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($columnNum == 0) {
-			if ($rowNum == 0) {
-				return $arrayValues;
-			}
-			$rowNum = $rowKeys[--$rowNum];
-			$returnArray = array();
-			foreach($arrayValues as $arrayColumn) {
-				if (is_array($arrayColumn)) {
-					if (isset($arrayColumn[$rowNum])) {
-						$returnArray[] = $arrayColumn[$rowNum];
-					} else {
-						return $arrayValues[$rowNum];
-					}
-				} else {
-					return $arrayValues[$rowNum];
-				}
-			}
-			return $returnArray;
-		}
-		$columnNum = $columnKeys[--$columnNum];
-		if ($rowNum > count($rowKeys)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		} elseif ($rowNum == 0) {
-			return $arrayValues[$columnNum];
-		}
-		$rowNum = $rowKeys[--$rowNum];
-
-		return $arrayValues[$rowNum][$columnNum];
-	}	//	function INDEX()
-
-
-	/**
-	 * TRANSPOSE
-	 *
-	 * @param	array	$matrixData	A matrix of values
-	 * @return	array
-	 *
-	 * Unlike the Excel TRANSPOSE function, which will only work on a single row or column, this function will transpose a full matrix.
-	 */
-	public static function TRANSPOSE($matrixData) {
-		$returnMatrix = array();
-		if (!is_array($matrixData)) { $matrixData = array(array($matrixData)); }
-
-		$column = 0;
-		foreach($matrixData as $matrixRow) {
-			$row = 0;
-			foreach($matrixRow as $matrixCell) {
-				$returnMatrix[$row][$column] = $matrixCell;
-				++$row;
-			}
-			++$column;
-		}
-		return $returnMatrix;
-	}	//	function TRANSPOSE()
-
-
-	private static function _vlookupSort($a,$b) {
-		$f = array_keys($a);
-		$firstColumn = array_shift($f);
-		if (strtolower($a[$firstColumn]) == strtolower($b[$firstColumn])) {
-			return 0;
-		}
-		return (strtolower($a[$firstColumn]) < strtolower($b[$firstColumn])) ? -1 : 1;
-	}	//	function _vlookupSort()
-
-
-	/**
-	* VLOOKUP
-	* The VLOOKUP function searches for value in the left-most column of lookup_array and returns the value in the same row based on the index_number.
-	* @param	lookup_value	The value that you want to match in lookup_array
-	* @param	lookup_array	The range of cells being searched
-	* @param	index_number	The column number in table_array from which the matching value must be returned. The first column is 1.
-	* @param	not_exact_match	Determines if you are looking for an exact match based on lookup_value.
-	* @return	mixed			The value of the found cell
-	*/
-	public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match=true) {
-		$lookup_value	= PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
-		$index_number	= PHPExcel_Calculation_Functions::flattenSingleValue($index_number);
-		$not_exact_match	= PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match);
-
-		// index_number must be greater than or equal to 1
-		if ($index_number < 1) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		// index_number must be less than or equal to the number of columns in lookup_array
-		if ((!is_array($lookup_array)) || (empty($lookup_array))) {
-			return PHPExcel_Calculation_Functions::REF();
-		} else {
-			$f = array_keys($lookup_array);
-			$firstRow = array_pop($f);
-			if ((!is_array($lookup_array[$firstRow])) || ($index_number > count($lookup_array[$firstRow]))) {
-				return PHPExcel_Calculation_Functions::REF();
-			} else {
-				$columnKeys = array_keys($lookup_array[$firstRow]);
-				$returnColumn = $columnKeys[--$index_number];
-				$firstColumn = array_shift($columnKeys);
-			}
-		}
-
-		if (!$not_exact_match) {
-			uasort($lookup_array,array('self','_vlookupSort'));
-		}
-
-		$rowNumber = $rowValue = False;
-		foreach($lookup_array as $rowKey => $rowData) {
-			if (strtolower($rowData[$firstColumn]) > strtolower($lookup_value)) {
-				break;
-			}
-			$rowNumber = $rowKey;
-			$rowValue = $rowData[$firstColumn];
-		}
-
-		if ($rowNumber !== false) {
-			if ((!$not_exact_match) && ($rowValue != $lookup_value)) {
-				//	if an exact match is required, we have what we need to return an appropriate response
-				return PHPExcel_Calculation_Functions::NA();
-			} else {
-				//	otherwise return the appropriate value
-				return $lookup_array[$rowNumber][$returnColumn];
-			}
-		}
-
-		return PHPExcel_Calculation_Functions::NA();
-	}	//	function VLOOKUP()
-
-
-	/**
-	 * LOOKUP
-	 * The LOOKUP function searches for value either from a one-row or one-column range or from an array.
-	 * @param	lookup_value	The value that you want to match in lookup_array
-	 * @param	lookup_vector	The range of cells being searched
-	 * @param	result_vector	The column from which the matching value must be returned
-	 * @return	mixed			The value of the found cell
-	 */
-	public static function LOOKUP($lookup_value, $lookup_vector, $result_vector=null) {
-		$lookup_value	= PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
-
-		if (!is_array($lookup_vector)) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-		$lookupRows = count($lookup_vector);
-		$l = array_keys($lookup_vector);
-		$l = array_shift($l);
-		$lookupColumns = count($lookup_vector[$l]);
-		if ((($lookupRows == 1) && ($lookupColumns > 1)) || (($lookupRows == 2) && ($lookupColumns != 2))) {
-			$lookup_vector = self::TRANSPOSE($lookup_vector);
-			$lookupRows = count($lookup_vector);
-			$l = array_keys($lookup_vector);
-			$lookupColumns = count($lookup_vector[array_shift($l)]);
-		}
-
-		if (is_null($result_vector)) {
-			$result_vector = $lookup_vector;
-		}
-		$resultRows = count($result_vector);
-		$l = array_keys($result_vector);
-		$l = array_shift($l);
-		$resultColumns = count($result_vector[$l]);
-		if ((($resultRows == 1) && ($resultColumns > 1)) || (($resultRows == 2) && ($resultColumns != 2))) {
-			$result_vector = self::TRANSPOSE($result_vector);
-			$resultRows = count($result_vector);
-			$r = array_keys($result_vector);
-			$resultColumns = count($result_vector[array_shift($r)]);
-		}
-
-		if ($lookupRows == 2) {
-			$result_vector = array_pop($lookup_vector);
-			$lookup_vector = array_shift($lookup_vector);
-		}
-		if ($lookupColumns != 2) {
-			foreach($lookup_vector as &$value) {
-				if (is_array($value)) {
-					$k = array_keys($value);
-					$key1 = $key2 = array_shift($k);
-					$key2++;
-					$dataValue1 = $value[$key1];
-				} else {
-					$key1 = 0;
-					$key2 = 1;
-					$dataValue1 = $value;
-				}
-				$dataValue2 = array_shift($result_vector);
-				if (is_array($dataValue2)) {
-					$dataValue2 = array_shift($dataValue2);
-				}
-				$value = array($key1 => $dataValue1, $key2 => $dataValue2);
-			}
-			unset($value);
-		}
-
-		return self::VLOOKUP($lookup_value,$lookup_vector,2);
- 	}	//	function LOOKUP()
-
-}	//	class PHPExcel_Calculation_LookupRef
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/MathTrig.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/MathTrig.php
deleted file mode 100755
index 80e8a2d1e..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/MathTrig.php
+++ /dev/null
@@ -1,1366 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_MathTrig
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_MathTrig {
-
-	//
-	//	Private method to return an array of the factors of the input value
-	//
-	private static function _factors($value) {
-		$startVal = floor(sqrt($value));
-
-		$factorArray = array();
-		for ($i = $startVal; $i > 1; --$i) {
-			if (($value % $i) == 0) {
-				$factorArray = array_merge($factorArray,self::_factors($value / $i));
-				$factorArray = array_merge($factorArray,self::_factors($i));
-				if ($i <= sqrt($value)) {
-					break;
-				}
-			}
-		}
-		if (!empty($factorArray)) {
-			rsort($factorArray);
-			return $factorArray;
-		} else {
-			return array((integer) $value);
-		}
-	}	//	function _factors()
-
-
-	private static function _romanCut($num, $n) {
-		return ($num - ($num % $n ) ) / $n;
-	}	//	function _romanCut()
-
-
-	/**
-	 * ATAN2
-	 *
-	 * This function calculates the arc tangent of the two variables x and y. It is similar to
-	 *		calculating the arc tangent of y � x, except that the signs of both arguments are used
-	 *		to determine the quadrant of the result.
-	 * The arctangent is the angle from the x-axis to a line containing the origin (0, 0) and a
-	 *		point with coordinates (xCoordinate, yCoordinate). The angle is given in radians between
-	 *		-pi and pi, excluding -pi.
-	 *
-	 * Note that the Excel ATAN2() function accepts its arguments in the reverse order to the standard
-	 *		PHP atan2() function, so we need to reverse them here before calling the PHP atan() function.
-	 *
-	 * Excel Function:
-	 *		ATAN2(xCoordinate,yCoordinate)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$xCoordinate		The x-coordinate of the point.
-	 * @param	float	$yCoordinate		The y-coordinate of the point.
-	 * @return	float	The inverse tangent of the specified x- and y-coordinates.
-	 */
-	public static function ATAN2($xCoordinate = NULL, $yCoordinate = NULL) {
-		$xCoordinate	= PHPExcel_Calculation_Functions::flattenSingleValue($xCoordinate);
-		$yCoordinate	= PHPExcel_Calculation_Functions::flattenSingleValue($yCoordinate);
-
-		$xCoordinate	= ($xCoordinate !== NULL)	? $xCoordinate : 0.0;
-		$yCoordinate	= ($yCoordinate !== NULL)	? $yCoordinate : 0.0;
-
-		if (((is_numeric($xCoordinate)) || (is_bool($xCoordinate))) &&
-			((is_numeric($yCoordinate)))  || (is_bool($yCoordinate))) {
-			$xCoordinate	= (float) $xCoordinate;
-			$yCoordinate	= (float) $yCoordinate;
-
-			if (($xCoordinate == 0) && ($yCoordinate == 0)) {
-				return PHPExcel_Calculation_Functions::DIV0();
-			}
-
-			return atan2($yCoordinate, $xCoordinate);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ATAN2()
-
-
-	/**
-	 * CEILING
-	 *
-	 * Returns number rounded up, away from zero, to the nearest multiple of significance.
-	 *		For example, if you want to avoid using pennies in your prices and your product is
-	 *		priced at $4.42, use the formula =CEILING(4.42,0.05) to round prices up to the
-	 *		nearest nickel.
-	 *
-	 * Excel Function:
-	 *		CEILING(number[,significance])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$number			The number you want to round.
-	 * @param	float	$significance	The multiple to which you want to round.
-	 * @return	float	Rounded Number
-	 */
-	public static function CEILING($number, $significance = NULL) {
-		$number			= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$significance	= PHPExcel_Calculation_Functions::flattenSingleValue($significance);
-
-		if ((is_null($significance)) &&
-			(PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
-			$significance = $number/abs($number);
-		}
-
-		if ((is_numeric($number)) && (is_numeric($significance))) {
-			if ($significance == 0.0) {
-				return 0.0;
-			} elseif (self::SIGN($number) == self::SIGN($significance)) {
-				return ceil($number / $significance) * $significance;
-			} else {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function CEILING()
-
-
-	/**
-	 * COMBIN
-	 *
-	 * Returns the number of combinations for a given number of items. Use COMBIN to
-	 *		determine the total possible number of groups for a given number of items.
-	 *
-	 * Excel Function:
-	 *		COMBIN(numObjs,numInSet)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	int		$numObjs	Number of different objects
-	 * @param	int		$numInSet	Number of objects in each combination
-	 * @return	int		Number of combinations
-	 */
-	public static function COMBIN($numObjs, $numInSet) {
-		$numObjs	= PHPExcel_Calculation_Functions::flattenSingleValue($numObjs);
-		$numInSet	= PHPExcel_Calculation_Functions::flattenSingleValue($numInSet);
-
-		if ((is_numeric($numObjs)) && (is_numeric($numInSet))) {
-			if ($numObjs < $numInSet) {
-				return PHPExcel_Calculation_Functions::NaN();
-			} elseif ($numInSet < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return round(self::FACT($numObjs) / self::FACT($numObjs - $numInSet)) / self::FACT($numInSet);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function COMBIN()
-
-
-	/**
-	 * EVEN
-	 *
-	 * Returns number rounded up to the nearest even integer.
-	 * You can use this function for processing items that come in twos. For example,
-	 *		a packing crate accepts rows of one or two items. The crate is full when
-	 *		the number of items, rounded up to the nearest two, matches the crate's
-	 *		capacity.
-	 *
-	 * Excel Function:
-	 *		EVEN(number)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$number			Number to round
-	 * @return	int		Rounded Number
-	 */
-	public static function EVEN($number) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-
-		if (is_null($number)) {
-			return 0;
-		} elseif (is_bool($number)) {
-			$number = (int) $number;
-		}
-
-		if (is_numeric($number)) {
-			$significance = 2 * self::SIGN($number);
-			return (int) self::CEILING($number,$significance);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function EVEN()
-
-
-	/**
-	 * FACT
-	 *
-	 * Returns the factorial of a number.
-	 * The factorial of a number is equal to 1*2*3*...* number.
-	 *
-	 * Excel Function:
-	 *		FACT(factVal)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$factVal	Factorial Value
-	 * @return	int		Factorial
-	 */
-	public static function FACT($factVal) {
-		$factVal	= PHPExcel_Calculation_Functions::flattenSingleValue($factVal);
-
-		if (is_numeric($factVal)) {
-			if ($factVal < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$factLoop = floor($factVal);
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				if ($factVal > $factLoop) {
-					return PHPExcel_Calculation_Functions::NaN();
-				}
-			}
-
-			$factorial = 1;
-			while ($factLoop > 1) {
-				$factorial *= $factLoop--;
-			}
-			return $factorial ;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function FACT()
-
-
-	/**
-	 * FACTDOUBLE
-	 *
-	 * Returns the double factorial of a number.
-	 *
-	 * Excel Function:
-	 *		FACTDOUBLE(factVal)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$factVal	Factorial Value
-	 * @return	int		Double Factorial
-	 */
-	public static function FACTDOUBLE($factVal) {
-		$factLoop	= PHPExcel_Calculation_Functions::flattenSingleValue($factVal);
-
-		if (is_numeric($factLoop)) {
-			$factLoop	= floor($factLoop);
-			if ($factVal < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$factorial = 1;
-			while ($factLoop > 1) {
-				$factorial *= $factLoop--;
-				--$factLoop;
-			}
-			return $factorial ;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function FACTDOUBLE()
-
-
-	/**
-	 * FLOOR
-	 *
-	 * Rounds number down, toward zero, to the nearest multiple of significance.
-	 *
-	 * Excel Function:
-	 *		FLOOR(number[,significance])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$number			Number to round
-	 * @param	float	$significance	Significance
-	 * @return	float	Rounded Number
-	 */
-	public static function FLOOR($number, $significance = NULL) {
-		$number			= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$significance	= PHPExcel_Calculation_Functions::flattenSingleValue($significance);
-
-		if ((is_null($significance)) && (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
-			$significance = $number/abs($number);
-		}
-
-		if ((is_numeric($number)) && (is_numeric($significance))) {
-			if ((float) $significance == 0.0) {
-				return PHPExcel_Calculation_Functions::DIV0();
-			}
-			if (self::SIGN($number) == self::SIGN($significance)) {
-				return floor($number / $significance) * $significance;
-			} else {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function FLOOR()
-
-
-	/**
-	 * GCD
-	 *
-	 * Returns the greatest common divisor of a series of numbers.
-	 * The greatest common divisor is the largest integer that divides both
-	 *		number1 and number2 without a remainder.
-	 *
-	 * Excel Function:
-	 *		GCD(number1[,number2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed	$arg,...		Data values
-	 * @return	integer					Greatest Common Divisor
-	 */
-	public static function GCD() {
-		$returnValue = 1;
-		$allValuesFactors = array();
-		// Loop through arguments
-		foreach(PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $value) {
-			if (!is_numeric($value)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			} elseif ($value == 0) {
-				continue;
-			} elseif($value < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$myFactors = self::_factors($value);
-			$myCountedFactors = array_count_values($myFactors);
-			$allValuesFactors[] = $myCountedFactors;
-		}
-		$allValuesCount = count($allValuesFactors);
-		if ($allValuesCount == 0) {
-			return 0;
-		}
-
-		$mergedArray = $allValuesFactors[0];
-		for ($i=1;$i < $allValuesCount; ++$i) {
-			$mergedArray = array_intersect_key($mergedArray,$allValuesFactors[$i]);
-		}
-		$mergedArrayValues = count($mergedArray);
-		if ($mergedArrayValues == 0) {
-			return $returnValue;
-		} elseif ($mergedArrayValues > 1) {
-			foreach($mergedArray as $mergedKey => $mergedValue) {
-				foreach($allValuesFactors as $highestPowerTest) {
-					foreach($highestPowerTest as $testKey => $testValue) {
-						if (($testKey == $mergedKey) && ($testValue < $mergedValue)) {
-							$mergedArray[$mergedKey] = $testValue;
-							$mergedValue = $testValue;
-						}
-					}
-				}
-			}
-
-			$returnValue = 1;
-			foreach($mergedArray as $key => $value) {
-				$returnValue *= pow($key,$value);
-			}
-			return $returnValue;
-		} else {
-			$keys = array_keys($mergedArray);
-			$key = $keys[0];
-			$value = $mergedArray[$key];
-			foreach($allValuesFactors as $testValue) {
-				foreach($testValue as $mergedKey => $mergedValue) {
-					if (($mergedKey == $key) && ($mergedValue < $value)) {
-						$value = $mergedValue;
-					}
-				}
-			}
-			return pow($key,$value);
-		}
-	}	//	function GCD()
-
-
-	/**
-	 * INT
-	 *
-	 * Casts a floating point value to an integer
-	 *
-	 * Excel Function:
-	 *		INT(number)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$number			Number to cast to an integer
-	 * @return	integer	Integer value
-	 */
-	public static function INT($number) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-
-		if (is_null($number)) {
-			return 0;
-		} elseif (is_bool($number)) {
-			return (int) $number;
-		}
-		if (is_numeric($number)) {
-			return (int) floor($number);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function INT()
-
-
-	/**
-	 * LCM
-	 *
-	 * Returns the lowest common multiplier of a series of numbers
-	 * The least common multiple is the smallest positive integer that is a multiple
-	 * of all integer arguments number1, number2, and so on. Use LCM to add fractions
-	 * with different denominators.
-	 *
-	 * Excel Function:
-	 *		LCM(number1[,number2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed	$arg,...		Data values
-	 * @return	int		Lowest Common Multiplier
-	 */
-	public static function LCM() {
-		$returnValue = 1;
-		$allPoweredFactors = array();
-		// Loop through arguments
-		foreach(PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $value) {
-			if (!is_numeric($value)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-			if ($value == 0) {
-				return 0;
-			} elseif ($value < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$myFactors = self::_factors(floor($value));
-			$myCountedFactors = array_count_values($myFactors);
-			$myPoweredFactors = array();
-			foreach($myCountedFactors as $myCountedFactor => $myCountedPower) {
-				$myPoweredFactors[$myCountedFactor] = pow($myCountedFactor,$myCountedPower);
-			}
-			foreach($myPoweredFactors as $myPoweredValue => $myPoweredFactor) {
-				if (array_key_exists($myPoweredValue,$allPoweredFactors)) {
-					if ($allPoweredFactors[$myPoweredValue] < $myPoweredFactor) {
-						$allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
-					}
-				} else {
-					$allPoweredFactors[$myPoweredValue] = $myPoweredFactor;
-				}
-			}
-		}
-		foreach($allPoweredFactors as $allPoweredFactor) {
-			$returnValue *= (integer) $allPoweredFactor;
-		}
-		return $returnValue;
-	}	//	function LCM()
-
-
-	/**
-	 * LOG_BASE
-	 *
-	 * Returns the logarithm of a number to a specified base. The default base is 10.
-	 *
-	 * Excel Function:
-	 *		LOG(number[,base])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	float	$value		The positive real number for which you want the logarithm
-	 * @param	float	$base		The base of the logarithm. If base is omitted, it is assumed to be 10.
-	 * @return	float
-	 */
-	public static function LOG_BASE($number = NULL, $base = 10) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$base	= (is_null($base))	? 10 :	(float) PHPExcel_Calculation_Functions::flattenSingleValue($base);
-
-		if ((!is_numeric($base)) || (!is_numeric($number)))
-			return PHPExcel_Calculation_Functions::VALUE();
-		if (($base <= 0) || ($number <= 0))
-			return PHPExcel_Calculation_Functions::NaN();
-		return log($number, $base);
-	}	//	function LOG_BASE()
-
-
-	/**
-	 * MDETERM
-	 *
-	 * Returns the matrix determinant of an array.
-	 *
-	 * Excel Function:
-	 *		MDETERM(array)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	array	$matrixValues	A matrix of values
-	 * @return	float
-	 */
-	public static function MDETERM($matrixValues) {
-		$matrixData = array();
-		if (!is_array($matrixValues)) { $matrixValues = array(array($matrixValues)); }
-
-		$row = $maxColumn = 0;
-		foreach($matrixValues as $matrixRow) {
-			if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
-			$column = 0;
-			foreach($matrixRow as $matrixCell) {
-				if ((is_string($matrixCell)) || ($matrixCell === null)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$matrixData[$column][$row] = $matrixCell;
-				++$column;
-			}
-			if ($column > $maxColumn) { $maxColumn = $column; }
-			++$row;
-		}
-		if ($row != $maxColumn) { return PHPExcel_Calculation_Functions::VALUE(); }
-
-		try {
-			$matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData);
-			return $matrix->det();
-		} catch (Exception $ex) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-	}	//	function MDETERM()
-
-
-	/**
-	 * MINVERSE
-	 *
-	 * Returns the inverse matrix for the matrix stored in an array.
-	 *
-	 * Excel Function:
-	 *		MINVERSE(array)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	array	$matrixValues	A matrix of values
-	 * @return	array
-	 */
-	public static function MINVERSE($matrixValues) {
-		$matrixData = array();
-		if (!is_array($matrixValues)) { $matrixValues = array(array($matrixValues)); }
-
-		$row = $maxColumn = 0;
-		foreach($matrixValues as $matrixRow) {
-			if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
-			$column = 0;
-			foreach($matrixRow as $matrixCell) {
-				if ((is_string($matrixCell)) || ($matrixCell === null)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$matrixData[$column][$row] = $matrixCell;
-				++$column;
-			}
-			if ($column > $maxColumn) { $maxColumn = $column; }
-			++$row;
-		}
-		if ($row != $maxColumn) { return PHPExcel_Calculation_Functions::VALUE(); }
-
-		try {
-			$matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData);
-			return $matrix->inverse()->getArray();
-		} catch (Exception $ex) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-	}	//	function MINVERSE()
-
-
-	/**
-	 * MMULT
-	 *
-	 * @param	array	$matrixData1	A matrix of values
-	 * @param	array	$matrixData2	A matrix of values
-	 * @return	array
-	 */
-	public static function MMULT($matrixData1,$matrixData2) {
-		$matrixAData = $matrixBData = array();
-		if (!is_array($matrixData1)) { $matrixData1 = array(array($matrixData1)); }
-		if (!is_array($matrixData2)) { $matrixData2 = array(array($matrixData2)); }
-
-		$rowA = 0;
-		foreach($matrixData1 as $matrixRow) {
-			if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
-			$columnA = 0;
-			foreach($matrixRow as $matrixCell) {
-				if ((is_string($matrixCell)) || ($matrixCell === null)) {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$matrixAData[$rowA][$columnA] = $matrixCell;
-				++$columnA;
-			}
-			++$rowA;
-		}
-		try {
-			$matrixA = new PHPExcel_Shared_JAMA_Matrix($matrixAData);
-			$rowB = 0;
-			foreach($matrixData2 as $matrixRow) {
-				if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
-				$columnB = 0;
-				foreach($matrixRow as $matrixCell) {
-					if ((is_string($matrixCell)) || ($matrixCell === null)) {
-						return PHPExcel_Calculation_Functions::VALUE();
-					}
-					$matrixBData[$rowB][$columnB] = $matrixCell;
-					++$columnB;
-				}
-				++$rowB;
-			}
-			$matrixB = new PHPExcel_Shared_JAMA_Matrix($matrixBData);
-
-			if (($rowA != $columnB) || ($rowB != $columnA)) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-
-			return $matrixA->times($matrixB)->getArray();
-		} catch (Exception $ex) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-	}	//	function MMULT()
-
-
-	/**
-	 * MOD
-	 *
-	 * @param	int		$a		Dividend
-	 * @param	int		$b		Divisor
-	 * @return	int		Remainder
-	 */
-	public static function MOD($a = 1, $b = 1) {
-		$a		= PHPExcel_Calculation_Functions::flattenSingleValue($a);
-		$b		= PHPExcel_Calculation_Functions::flattenSingleValue($b);
-
-		if ($b == 0.0) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		} elseif (($a < 0.0) && ($b > 0.0)) {
-			return $b - fmod(abs($a),$b);
-		} elseif (($a > 0.0) && ($b < 0.0)) {
-			return $b + fmod($a,abs($b));
-		}
-
-		return fmod($a,$b);
-	}	//	function MOD()
-
-
-	/**
-	 * MROUND
-	 *
-	 * Rounds a number to the nearest multiple of a specified value
-	 *
-	 * @param	float	$number			Number to round
-	 * @param	int		$multiple		Multiple to which you want to round $number
-	 * @return	float	Rounded Number
-	 */
-	public static function MROUND($number,$multiple) {
-		$number		= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$multiple	= PHPExcel_Calculation_Functions::flattenSingleValue($multiple);
-
-		if ((is_numeric($number)) && (is_numeric($multiple))) {
-			if ($multiple == 0) {
-				return 0;
-			}
-			if ((self::SIGN($number)) == (self::SIGN($multiple))) {
-				$multiplier = 1 / $multiple;
-				return round($number * $multiplier) / $multiplier;
-			}
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function MROUND()
-
-
-	/**
-	 * MULTINOMIAL
-	 *
-	 * Returns the ratio of the factorial of a sum of values to the product of factorials.
-	 *
-	 * @param	array of mixed		Data Series
-	 * @return	float
-	 */
-	public static function MULTINOMIAL() {
-		$summer = 0;
-		$divisor = 1;
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
-			// Is it a numeric value?
-			if (is_numeric($arg)) {
-				if ($arg < 1) {
-					return PHPExcel_Calculation_Functions::NaN();
-				}
-				$summer += floor($arg);
-				$divisor *= self::FACT($arg);
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-
-		// Return
-		if ($summer > 0) {
-			$summer = self::FACT($summer);
-			return $summer / $divisor;
-		}
-		return 0;
-	}	//	function MULTINOMIAL()
-
-
-	/**
-	 * ODD
-	 *
-	 * Returns number rounded up to the nearest odd integer.
-	 *
-	 * @param	float	$number			Number to round
-	 * @return	int		Rounded Number
-	 */
-	public static function ODD($number) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-
-		if (is_null($number)) {
-			return 1;
-		} elseif (is_bool($number)) {
-			$number = (int) $number;
-		}
-
-		if (is_numeric($number)) {
-			$significance = self::SIGN($number);
-			if ($significance == 0) {
-				return 1;
-			}
-
-			$result = self::CEILING($number,$significance);
-			if ($result == self::EVEN($result)) {
-				$result += $significance;
-			}
-
-			return (int) $result;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ODD()
-
-
-	/**
-	 * POWER
-	 *
-	 * Computes x raised to the power y.
-	 *
-	 * @param	float		$x
-	 * @param	float		$y
-	 * @return	float
-	 */
-	public static function POWER($x = 0, $y = 2) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$y	= PHPExcel_Calculation_Functions::flattenSingleValue($y);
-
-		// Validate parameters
-		if ($x == 0.0 && $y == 0.0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		} elseif ($x == 0.0 && $y < 0.0) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		// Return
-		$result = pow($x, $y);
-		return (!is_nan($result) && !is_infinite($result)) ? $result : PHPExcel_Calculation_Functions::NaN();
-	}	//	function POWER()
-
-
-	/**
-	 * PRODUCT
-	 *
-	 * PRODUCT returns the product of all the values and cells referenced in the argument list.
-	 *
-	 * Excel Function:
-	 *		PRODUCT(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function PRODUCT() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if (is_null($returnValue)) {
-					$returnValue = $arg;
-				} else {
-					$returnValue *= $arg;
-				}
-			}
-		}
-
-		// Return
-		if (is_null($returnValue)) {
-			return 0;
-		}
-		return $returnValue;
-	}	//	function PRODUCT()
-
-
-	/**
-	 * QUOTIENT
-	 *
-	 * QUOTIENT function returns the integer portion of a division. Numerator is the divided number
-	 *		and denominator is the divisor.
-	 *
-	 * Excel Function:
-	 *		QUOTIENT(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function QUOTIENT() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if (is_null($returnValue)) {
-					$returnValue = ($arg == 0) ? 0 : $arg;
-				} else {
-					if (($returnValue == 0) || ($arg == 0)) {
-						$returnValue = 0;
-					} else {
-						$returnValue /= $arg;
-					}
-				}
-			}
-		}
-
-		// Return
-		return intval($returnValue);
-	}	//	function QUOTIENT()
-
-
-	/**
-	 * RAND
-	 *
-	 * @param	int		$min	Minimal value
-	 * @param	int		$max	Maximal value
-	 * @return	int		Random number
-	 */
-	public static function RAND($min = 0, $max = 0) {
-		$min		= PHPExcel_Calculation_Functions::flattenSingleValue($min);
-		$max		= PHPExcel_Calculation_Functions::flattenSingleValue($max);
-
-		if ($min == 0 && $max == 0) {
-			return (rand(0,10000000)) / 10000000;
-		} else {
-			return rand($min, $max);
-		}
-	}	//	function RAND()
-
-
-	public static function ROMAN($aValue, $style=0) {
-		$aValue	= PHPExcel_Calculation_Functions::flattenSingleValue($aValue);
-		$style	= (is_null($style))	? 0 :	(integer) PHPExcel_Calculation_Functions::flattenSingleValue($style);
-		if ((!is_numeric($aValue)) || ($aValue < 0) || ($aValue >= 4000)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$aValue = (integer) $aValue;
-		if ($aValue == 0) {
-			return '';
-		}
-
-		$mill = Array('', 'M', 'MM', 'MMM', 'MMMM', 'MMMMM');
-		$cent = Array('', 'C', 'CC', 'CCC', 'CD', 'D', 'DC', 'DCC', 'DCCC', 'CM');
-		$tens = Array('', 'X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC');
-		$ones = Array('', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX');
-
-		$roman = '';
-		while ($aValue > 5999) {
-			$roman .= 'M';
-			$aValue -= 1000;
-		}
-		$m = self::_romanCut($aValue, 1000);	$aValue %= 1000;
-		$c = self::_romanCut($aValue, 100);		$aValue %= 100;
-		$t = self::_romanCut($aValue, 10);		$aValue %= 10;
-
-		return $roman.$mill[$m].$cent[$c].$tens[$t].$ones[$aValue];
-	}	//	function ROMAN()
-
-
-	/**
-	 * ROUNDUP
-	 *
-	 * Rounds a number up to a specified number of decimal places
-	 *
-	 * @param	float	$number			Number to round
-	 * @param	int		$digits			Number of digits to which you want to round $number
-	 * @return	float	Rounded Number
-	 */
-	public static function ROUNDUP($number,$digits) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$digits	= PHPExcel_Calculation_Functions::flattenSingleValue($digits);
-
-		if ((is_numeric($number)) && (is_numeric($digits))) {
-			$significance = pow(10,(int) $digits);
-			if ($number < 0.0) {
-				return floor($number * $significance) / $significance;
-			} else {
-				return ceil($number * $significance) / $significance;
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ROUNDUP()
-
-
-	/**
-	 * ROUNDDOWN
-	 *
-	 * Rounds a number down to a specified number of decimal places
-	 *
-	 * @param	float	$number			Number to round
-	 * @param	int		$digits			Number of digits to which you want to round $number
-	 * @return	float	Rounded Number
-	 */
-	public static function ROUNDDOWN($number,$digits) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-		$digits	= PHPExcel_Calculation_Functions::flattenSingleValue($digits);
-
-		if ((is_numeric($number)) && (is_numeric($digits))) {
-			$significance = pow(10,(int) $digits);
-			if ($number < 0.0) {
-				return ceil($number * $significance) / $significance;
-			} else {
-				return floor($number * $significance) / $significance;
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function ROUNDDOWN()
-
-
-	/**
-	 * SERIESSUM
-	 *
-	 * Returns the sum of a power series
-	 *
-	 * @param	float			$x	Input value to the power series
-	 * @param	float			$n	Initial power to which you want to raise $x
-	 * @param	float			$m	Step by which to increase $n for each term in the series
-	 * @param	array of mixed		Data Series
-	 * @return	float
-	 */
-	public static function SERIESSUM() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		$x = array_shift($aArgs);
-		$n = array_shift($aArgs);
-		$m = array_shift($aArgs);
-
-		if ((is_numeric($x)) && (is_numeric($n)) && (is_numeric($m))) {
-			// Calculate
-			$i = 0;
-			foreach($aArgs as $arg) {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$returnValue += $arg * pow($x,$n + ($m * $i++));
-				} else {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-			}
-			// Return
-			return $returnValue;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SERIESSUM()
-
-
-	/**
-	 * SIGN
-	 *
-	 * Determines the sign of a number. Returns 1 if the number is positive, zero (0)
-	 *		if the number is 0, and -1 if the number is negative.
-	 *
-	 * @param	float	$number			Number to round
-	 * @return	int		sign value
-	 */
-	public static function SIGN($number) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-
-		if (is_bool($number))
-			return (int) $number;
-		if (is_numeric($number)) {
-			if ($number == 0.0) {
-				return 0;
-			}
-			return $number / abs($number);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SIGN()
-
-
-	/**
-	 * SQRTPI
-	 *
-	 * Returns the square root of (number * pi).
-	 *
-	 * @param	float	$number		Number
-	 * @return	float	Square Root of Number * Pi
-	 */
-	public static function SQRTPI($number) {
-		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
-
-		if (is_numeric($number)) {
-			if ($number < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return sqrt($number * M_PI) ;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SQRTPI()
-
-
-	/**
-	 * SUBTOTAL
-	 *
-	 * Returns a subtotal in a list or database.
-	 *
-	 * @param	int		the number 1 to 11 that specifies which function to
-	 *					use in calculating subtotals within a list.
-	 * @param	array of mixed		Data Series
-	 * @return	float
-	 */
-	public static function SUBTOTAL() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$subtotal = array_shift($aArgs);
-
-		if ((is_numeric($subtotal)) && (!is_string($subtotal))) {
-			switch($subtotal) {
-				case 1	:
-					return PHPExcel_Calculation_Statistical::AVERAGE($aArgs);
-					break;
-				case 2	:
-					return PHPExcel_Calculation_Statistical::COUNT($aArgs);
-					break;
-				case 3	:
-					return PHPExcel_Calculation_Statistical::COUNTA($aArgs);
-					break;
-				case 4	:
-					return PHPExcel_Calculation_Statistical::MAX($aArgs);
-					break;
-				case 5	:
-					return PHPExcel_Calculation_Statistical::MIN($aArgs);
-					break;
-				case 6	:
-					return self::PRODUCT($aArgs);
-					break;
-				case 7	:
-					return PHPExcel_Calculation_Statistical::STDEV($aArgs);
-					break;
-				case 8	:
-					return PHPExcel_Calculation_Statistical::STDEVP($aArgs);
-					break;
-				case 9	:
-					return self::SUM($aArgs);
-					break;
-				case 10	:
-					return PHPExcel_Calculation_Statistical::VARFunc($aArgs);
-					break;
-				case 11	:
-					return PHPExcel_Calculation_Statistical::VARP($aArgs);
-					break;
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SUBTOTAL()
-
-
-	/**
-	 * SUM
-	 *
-	 * SUM computes the sum of all the values and cells referenced in the argument list.
-	 *
-	 * Excel Function:
-	 *		SUM(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function SUM() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through the arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$returnValue += $arg;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function SUM()
-
-
-	/**
-	 * SUMIF
-	 *
-	 * Counts the number of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		SUMIF(value1[,value2[, ...]],condition)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	string		$condition		The criteria that defines which cells will be summed.
-	 * @return	float
-	 */
-	public static function SUMIF($aArgs,$condition,$sumArgs = array()) {
-		// Return value
-		$returnValue = 0;
-
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
-		$sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
-		if (empty($sumArgs)) {
-			$sumArgs = $aArgs;
-		}
-		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
-		// Loop through arguments
-		foreach ($aArgs as $key => $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
-			$testCondition = '='.$arg.$condition;
-			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-				// Is it a value within our criteria
-				$returnValue += $sumArgs[$key];
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function SUMIF()
-
-
-	/**
-	 * SUMPRODUCT
-	 *
-	 * Excel Function:
-	 *		SUMPRODUCT(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function SUMPRODUCT() {
-		$arrayList = func_get_args();
-
-		$wrkArray = PHPExcel_Calculation_Functions::flattenArray(array_shift($arrayList));
-		$wrkCellCount = count($wrkArray);
-
-		for ($i=0; $i< $wrkCellCount; ++$i) {
-			if ((!is_numeric($wrkArray[$i])) || (is_string($wrkArray[$i]))) {
-				$wrkArray[$i] = 0;
-			}
-		}
-
-		foreach($arrayList as $matrixData) {
-			$array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData);
-			$count = count($array2);
-			if ($wrkCellCount != $count) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-
-			foreach ($array2 as $i => $val) {
-				if ((!is_numeric($val)) || (is_string($val))) {
-					$val = 0;
-				}
-				$wrkArray[$i] *= $val;
-			}
-		}
-
-		return array_sum($wrkArray);
-	}	//	function SUMPRODUCT()
-
-
-	/**
-	 * SUMSQ
-	 *
-	 * SUMSQ returns the sum of the squares of the arguments
-	 *
-	 * Excel Function:
-	 *		SUMSQ(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function SUMSQ() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$returnValue += ($arg * $arg);
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function SUMSQ()
-
-
-	/**
-	 * SUMX2MY2
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	float
-	 */
-	public static function SUMX2MY2($matrixData1,$matrixData2) {
-		$array1 = PHPExcel_Calculation_Functions::flattenArray($matrixData1);
-		$array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData2);
-		$count1 = count($array1);
-		$count2 = count($array2);
-		if ($count1 < $count2) {
-			$count = $count1;
-		} else {
-			$count = $count2;
-		}
-
-		$result = 0;
-		for ($i = 0; $i < $count; ++$i) {
-			if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-				((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
-				$result += ($array1[$i] * $array1[$i]) - ($array2[$i] * $array2[$i]);
-			}
-		}
-
-		return $result;
-	}	//	function SUMX2MY2()
-
-
-	/**
-	 * SUMX2PY2
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	float
-	 */
-	public static function SUMX2PY2($matrixData1,$matrixData2) {
-		$array1 = PHPExcel_Calculation_Functions::flattenArray($matrixData1);
-		$array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData2);
-		$count1 = count($array1);
-		$count2 = count($array2);
-		if ($count1 < $count2) {
-			$count = $count1;
-		} else {
-			$count = $count2;
-		}
-
-		$result = 0;
-		for ($i = 0; $i < $count; ++$i) {
-			if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-				((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
-				$result += ($array1[$i] * $array1[$i]) + ($array2[$i] * $array2[$i]);
-			}
-		}
-
-		return $result;
-	}	//	function SUMX2PY2()
-
-
-	/**
-	 * SUMXMY2
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	float
-	 */
-	public static function SUMXMY2($matrixData1,$matrixData2) {
-		$array1 = PHPExcel_Calculation_Functions::flattenArray($matrixData1);
-		$array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData2);
-		$count1 = count($array1);
-		$count2 = count($array2);
-		if ($count1 < $count2) {
-			$count = $count1;
-		} else {
-			$count = $count2;
-		}
-
-		$result = 0;
-		for ($i = 0; $i < $count; ++$i) {
-			if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-				((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
-				$result += ($array1[$i] - $array2[$i]) * ($array1[$i] - $array2[$i]);
-			}
-		}
-
-		return $result;
-	}	//	function SUMXMY2()
-
-
-	/**
-	 * TRUNC
-	 *
-	 * Truncates value to the number of fractional digits by number_digits.
-	 *
-	 * @param	float		$value
-	 * @param	int			$digits
-	 * @return	float		Truncated value
-	 */
-	public static function TRUNC($value = 0, $digits = 0) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$digits	= PHPExcel_Calculation_Functions::flattenSingleValue($digits);
-
-		// Validate parameters
-		if ((!is_numeric($value)) || (!is_numeric($digits)))
-			return PHPExcel_Calculation_Functions::VALUE();
-		$digits	= floor($digits);
-
-		// Truncate
-		$adjust = pow(10, $digits);
-
-		if (($digits > 0) && (rtrim(intval((abs($value) - abs(intval($value))) * $adjust),'0') < $adjust/10))
-			return $value;
-
-		return (intval($value * $adjust)) / $adjust;
-	}	//	function TRUNC()
-
-}	//	class PHPExcel_Calculation_MathTrig
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/Statistical.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/Statistical.php
deleted file mode 100755
index 05dae7be4..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/Statistical.php
+++ /dev/null
@@ -1,3644 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/trendClass.php';
-
-
-/** LOG_GAMMA_X_MAX_VALUE */
-define('LOG_GAMMA_X_MAX_VALUE', 2.55e305);
-
-/** XMININ */
-define('XMININ', 2.23e-308);
-
-/** EPS */
-define('EPS', 2.22e-16);
-
-/** SQRT2PI */
-define('SQRT2PI', 2.5066282746310005024157652848110452530069867406099);
-
-
-/**
- * PHPExcel_Calculation_Statistical
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Statistical {
-
-
-	private static function _checkTrendArrays(&$array1,&$array2) {
-		if (!is_array($array1)) { $array1 = array($array1); }
-		if (!is_array($array2)) { $array2 = array($array2); }
-
-		$array1 = PHPExcel_Calculation_Functions::flattenArray($array1);
-		$array2 = PHPExcel_Calculation_Functions::flattenArray($array2);
-		foreach($array1 as $key => $value) {
-			if ((is_bool($value)) || (is_string($value)) || (is_null($value))) {
-				unset($array1[$key]);
-				unset($array2[$key]);
-			}
-		}
-		foreach($array2 as $key => $value) {
-			if ((is_bool($value)) || (is_string($value)) || (is_null($value))) {
-				unset($array1[$key]);
-				unset($array2[$key]);
-			}
-		}
-		$array1 = array_merge($array1);
-		$array2 = array_merge($array2);
-
-		return True;
-	}	//	function _checkTrendArrays()
-
-
-	/**
-	 * Beta function.
-	 *
-	 * @author Jaco van Kooten
-	 *
-	 * @param p require p>0
-	 * @param q require q>0
-	 * @return 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
-	 */
-	private static function _beta($p, $q) {
-		if ($p <= 0.0 || $q <= 0.0 || ($p + $q) > LOG_GAMMA_X_MAX_VALUE) {
-			return 0.0;
-		} else {
-			return exp(self::_logBeta($p, $q));
-		}
-	}	//	function _beta()
-
-
-	/**
-	 * Incomplete beta function
-	 *
-	 * @author Jaco van Kooten
-	 * @author Paul Meagher
-	 *
-	 * The computation is based on formulas from Numerical Recipes, Chapter 6.4 (W.H. Press et al, 1992).
-	 * @param x require 0<=x<=1
-	 * @param p require p>0
-	 * @param q require q>0
-	 * @return 0 if x<0, p<=0, q<=0 or p+q>2.55E305 and 1 if x>1 to avoid errors and over/underflow
-	 */
-	private static function _incompleteBeta($x, $p, $q) {
-		if ($x <= 0.0) {
-			return 0.0;
-		} elseif ($x >= 1.0) {
-			return 1.0;
-		} elseif (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > LOG_GAMMA_X_MAX_VALUE)) {
-			return 0.0;
-		}
-		$beta_gam = exp((0 - self::_logBeta($p, $q)) + $p * log($x) + $q * log(1.0 - $x));
-		if ($x < ($p + 1.0) / ($p + $q + 2.0)) {
-			return $beta_gam * self::_betaFraction($x, $p, $q) / $p;
-		} else {
-			return 1.0 - ($beta_gam * self::_betaFraction(1 - $x, $q, $p) / $q);
-		}
-	}	//	function _incompleteBeta()
-
-
-	// Function cache for _logBeta function
-	private static $_logBetaCache_p			= 0.0;
-	private static $_logBetaCache_q			= 0.0;
-	private static $_logBetaCache_result	= 0.0;
-
-	/**
-	 * The natural logarithm of the beta function.
-	 *
-	 * @param p require p>0
-	 * @param q require q>0
-	 * @return 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
-	 * @author Jaco van Kooten
-	 */
-	private static function _logBeta($p, $q) {
-		if ($p != self::$_logBetaCache_p || $q != self::$_logBetaCache_q) {
-			self::$_logBetaCache_p = $p;
-			self::$_logBetaCache_q = $q;
-			if (($p <= 0.0) || ($q <= 0.0) || (($p + $q) > LOG_GAMMA_X_MAX_VALUE)) {
-				self::$_logBetaCache_result = 0.0;
-			} else {
-				self::$_logBetaCache_result = self::_logGamma($p) + self::_logGamma($q) - self::_logGamma($p + $q);
-			}
-		}
-		return self::$_logBetaCache_result;
-	}	//	function _logBeta()
-
-
-	/**
-	 * Evaluates of continued fraction part of incomplete beta function.
-	 * Based on an idea from Numerical Recipes (W.H. Press et al, 1992).
-	 * @author Jaco van Kooten
-	 */
-	private static function _betaFraction($x, $p, $q) {
-		$c = 1.0;
-		$sum_pq = $p + $q;
-		$p_plus = $p + 1.0;
-		$p_minus = $p - 1.0;
-		$h = 1.0 - $sum_pq * $x / $p_plus;
-		if (abs($h) < XMININ) {
-			$h = XMININ;
-		}
-		$h = 1.0 / $h;
-		$frac = $h;
-		$m	 = 1;
-		$delta = 0.0;
-		while ($m <= MAX_ITERATIONS && abs($delta-1.0) > PRECISION ) {
-			$m2 = 2 * $m;
-			// even index for d
-			$d = $m * ($q - $m) * $x / ( ($p_minus + $m2) * ($p + $m2));
-			$h = 1.0 + $d * $h;
-			if (abs($h) < XMININ) {
-				$h = XMININ;
-			}
-			$h = 1.0 / $h;
-			$c = 1.0 + $d / $c;
-			if (abs($c) < XMININ) {
-				$c = XMININ;
-			}
-			$frac *= $h * $c;
-			// odd index for d
-			$d = -($p + $m) * ($sum_pq + $m) * $x / (($p + $m2) * ($p_plus + $m2));
-			$h = 1.0 + $d * $h;
-			if (abs($h) < XMININ) {
-				$h = XMININ;
-			}
-			$h = 1.0 / $h;
-			$c = 1.0 + $d / $c;
-			if (abs($c) < XMININ) {
-				$c = XMININ;
-			}
-			$delta = $h * $c;
-			$frac *= $delta;
-			++$m;
-		}
-		return $frac;
-	}	//	function _betaFraction()
-
-
-	/**
-	 * logGamma function
-	 *
-	 * @version 1.1
-	 * @author Jaco van Kooten
-	 *
-	 * Original author was Jaco van Kooten. Ported to PHP by Paul Meagher.
-	 *
-	 * The natural logarithm of the gamma function. <br />
-	 * Based on public domain NETLIB (Fortran) code by W. J. Cody and L. Stoltz <br />
-	 * Applied Mathematics Division <br />
-	 * Argonne National Laboratory <br />
-	 * Argonne, IL 60439 <br />
-	 * <p>
-	 * References:
-	 * <ol>
-	 * <li>W. J. Cody and K. E. Hillstrom, 'Chebyshev Approximations for the Natural
-	 *	 Logarithm of the Gamma Function,' Math. Comp. 21, 1967, pp. 198-203.</li>
-	 * <li>K. E. Hillstrom, ANL/AMD Program ANLC366S, DGAMMA/DLGAMA, May, 1969.</li>
-	 * <li>Hart, Et. Al., Computer Approximations, Wiley and sons, New York, 1968.</li>
-	 * </ol>
-	 * </p>
-	 * <p>
-	 * From the original documentation:
-	 * </p>
-	 * <p>
-	 * This routine calculates the LOG(GAMMA) function for a positive real argument X.
-	 * Computation is based on an algorithm outlined in references 1 and 2.
-	 * The program uses rational functions that theoretically approximate LOG(GAMMA)
-	 * to at least 18 significant decimal digits. The approximation for X > 12 is from
-	 * reference 3, while approximations for X < 12.0 are similar to those in reference
-	 * 1, but are unpublished. The accuracy achieved depends on the arithmetic system,
-	 * the compiler, the intrinsic functions, and proper selection of the
-	 * machine-dependent constants.
-	 * </p>
-	 * <p>
-	 * Error returns: <br />
-	 * The program returns the value XINF for X .LE. 0.0 or when overflow would occur.
-	 * The computation is believed to be free of underflow and overflow.
-	 * </p>
-	 * @return MAX_VALUE for x < 0.0 or when overflow would occur, i.e. x > 2.55E305
-	 */
-
-	// Function cache for logGamma
-	private static $_logGammaCache_result	= 0.0;
-	private static $_logGammaCache_x		= 0.0;
-
-	private static function _logGamma($x) {
-		// Log Gamma related constants
-		static $lg_d1 = -0.5772156649015328605195174;
-		static $lg_d2 = 0.4227843350984671393993777;
-		static $lg_d4 = 1.791759469228055000094023;
-
-		static $lg_p1 = array(	4.945235359296727046734888,
-								201.8112620856775083915565,
-								2290.838373831346393026739,
-								11319.67205903380828685045,
-								28557.24635671635335736389,
-								38484.96228443793359990269,
-								26377.48787624195437963534,
-								7225.813979700288197698961 );
-		static $lg_p2 = array(	4.974607845568932035012064,
-								542.4138599891070494101986,
-								15506.93864978364947665077,
-								184793.2904445632425417223,
-								1088204.76946882876749847,
-								3338152.967987029735917223,
-								5106661.678927352456275255,
-								3074109.054850539556250927 );
-		static $lg_p4 = array(	14745.02166059939948905062,
-								2426813.369486704502836312,
-								121475557.4045093227939592,
-								2663432449.630976949898078,
-								29403789566.34553899906876,
-								170266573776.5398868392998,
-								492612579337.743088758812,
-								560625185622.3951465078242 );
-
-		static $lg_q1 = array(	67.48212550303777196073036,
-								1113.332393857199323513008,
-								7738.757056935398733233834,
-								27639.87074403340708898585,
-								54993.10206226157329794414,
-								61611.22180066002127833352,
-								36351.27591501940507276287,
-								8785.536302431013170870835 );
-		static $lg_q2 = array(	183.0328399370592604055942,
-								7765.049321445005871323047,
-								133190.3827966074194402448,
-								1136705.821321969608938755,
-								5267964.117437946917577538,
-								13467014.54311101692290052,
-								17827365.30353274213975932,
-								9533095.591844353613395747 );
-		static $lg_q4 = array(	2690.530175870899333379843,
-								639388.5654300092398984238,
-								41355999.30241388052042842,
-								1120872109.61614794137657,
-								14886137286.78813811542398,
-								101680358627.2438228077304,
-								341747634550.7377132798597,
-								446315818741.9713286462081 );
-
-		static $lg_c  = array(	-0.001910444077728,
-								8.4171387781295e-4,
-								-5.952379913043012e-4,
-								7.93650793500350248e-4,
-								-0.002777777777777681622553,
-								0.08333333333333333331554247,
-								0.0057083835261 );
-
-	// Rough estimate of the fourth root of logGamma_xBig
-	static $lg_frtbig = 2.25e76;
-	static $pnt68	 = 0.6796875;
-
-
-	if ($x == self::$_logGammaCache_x) {
-		return self::$_logGammaCache_result;
-	}
-	$y = $x;
-	if ($y > 0.0 && $y <= LOG_GAMMA_X_MAX_VALUE) {
-		if ($y <= EPS) {
-			$res = -log(y);
-		} elseif ($y <= 1.5) {
-			// ---------------------
-			//	EPS .LT. X .LE. 1.5
-			// ---------------------
-			if ($y < $pnt68) {
-				$corr = -log($y);
-				$xm1 = $y;
-			} else {
-				$corr = 0.0;
-				$xm1 = $y - 1.0;
-			}
-			if ($y <= 0.5 || $y >= $pnt68) {
-				$xden = 1.0;
-				$xnum = 0.0;
-				for ($i = 0; $i < 8; ++$i) {
-					$xnum = $xnum * $xm1 + $lg_p1[$i];
-					$xden = $xden * $xm1 + $lg_q1[$i];
-				}
-				$res = $corr + $xm1 * ($lg_d1 + $xm1 * ($xnum / $xden));
-			} else {
-				$xm2 = $y - 1.0;
-				$xden = 1.0;
-				$xnum = 0.0;
-				for ($i = 0; $i < 8; ++$i) {
-					$xnum = $xnum * $xm2 + $lg_p2[$i];
-					$xden = $xden * $xm2 + $lg_q2[$i];
-				}
-				$res = $corr + $xm2 * ($lg_d2 + $xm2 * ($xnum / $xden));
-			}
-		} elseif ($y <= 4.0) {
-			// ---------------------
-			//	1.5 .LT. X .LE. 4.0
-			// ---------------------
-			$xm2 = $y - 2.0;
-			$xden = 1.0;
-			$xnum = 0.0;
-			for ($i = 0; $i < 8; ++$i) {
-				$xnum = $xnum * $xm2 + $lg_p2[$i];
-				$xden = $xden * $xm2 + $lg_q2[$i];
-			}
-			$res = $xm2 * ($lg_d2 + $xm2 * ($xnum / $xden));
-		} elseif ($y <= 12.0) {
-			// ----------------------
-			//	4.0 .LT. X .LE. 12.0
-			// ----------------------
-			$xm4 = $y - 4.0;
-			$xden = -1.0;
-			$xnum = 0.0;
-			for ($i = 0; $i < 8; ++$i) {
-				$xnum = $xnum * $xm4 + $lg_p4[$i];
-				$xden = $xden * $xm4 + $lg_q4[$i];
-			}
-			$res = $lg_d4 + $xm4 * ($xnum / $xden);
-		} else {
-			// ---------------------------------
-			//	Evaluate for argument .GE. 12.0
-			// ---------------------------------
-			$res = 0.0;
-			if ($y <= $lg_frtbig) {
-				$res = $lg_c[6];
-				$ysq = $y * $y;
-				for ($i = 0; $i < 6; ++$i)
-					$res = $res / $ysq + $lg_c[$i];
-				}
-				$res /= $y;
-				$corr = log($y);
-				$res = $res + log(SQRT2PI) - 0.5 * $corr;
-				$res += $y * ($corr - 1.0);
-			}
-		} else {
-			// --------------------------
-			//	Return for bad arguments
-			// --------------------------
-			$res = MAX_VALUE;
-		}
-		// ------------------------------
-		//	Final adjustments and return
-		// ------------------------------
-		self::$_logGammaCache_x = $x;
-		self::$_logGammaCache_result = $res;
-		return $res;
-	}	//	function _logGamma()
-
-
-	//
-	//	Private implementation of the incomplete Gamma function
-	//
-	private static function _incompleteGamma($a,$x) {
-		static $max = 32;
-		$summer = 0;
-		for ($n=0; $n<=$max; ++$n) {
-			$divisor = $a;
-			for ($i=1; $i<=$n; ++$i) {
-				$divisor *= ($a + $i);
-			}
-			$summer += (pow($x,$n) / $divisor);
-		}
-		return pow($x,$a) * exp(0-$x) * $summer;
-	}	//	function _incompleteGamma()
-
-
-	//
-	//	Private implementation of the Gamma function
-	//
-	private static function _gamma($data) {
-		if ($data == 0.0) return 0;
-
-		static $p0 = 1.000000000190015;
-		static $p = array ( 1 => 76.18009172947146,
-							2 => -86.50532032941677,
-							3 => 24.01409824083091,
-							4 => -1.231739572450155,
-							5 => 1.208650973866179e-3,
-							6 => -5.395239384953e-6
-						  );
-
-		$y = $x = $data;
-		$tmp = $x + 5.5;
-		$tmp -= ($x + 0.5) * log($tmp);
-
-		$summer = $p0;
-		for ($j=1;$j<=6;++$j) {
-			$summer += ($p[$j] / ++$y);
-		}
-		return exp(0 - $tmp + log(SQRT2PI * $summer / $x));
-	}	//	function _gamma()
-
-
-	/***************************************************************************
-	 *								inverse_ncdf.php
-	 *							-------------------
-	 *	begin				: Friday, January 16, 2004
-	 *	copyright			: (C) 2004 Michael Nickerson
-	 *	email				: nickersonm@yahoo.com
-	 *
-	 ***************************************************************************/
-	private static function _inverse_ncdf($p) {
-		//	Inverse ncdf approximation by Peter J. Acklam, implementation adapted to
-		//	PHP by Michael Nickerson, using Dr. Thomas Ziegler's C implementation as
-		//	a guide. http://home.online.no/~pjacklam/notes/invnorm/index.html
-		//	I have not checked the accuracy of this implementation. Be aware that PHP
-		//	will truncate the coeficcients to 14 digits.
-
-		//	You have permission to use and distribute this function freely for
-		//	whatever purpose you want, but please show common courtesy and give credit
-		//	where credit is due.
-
-		//	Input paramater is $p - probability - where 0 < p < 1.
-
-		//	Coefficients in rational approximations
-		static $a = array(	1 => -3.969683028665376e+01,
-							2 => 2.209460984245205e+02,
-							3 => -2.759285104469687e+02,
-							4 => 1.383577518672690e+02,
-							5 => -3.066479806614716e+01,
-							6 => 2.506628277459239e+00
-						 );
-
-		static $b = array(	1 => -5.447609879822406e+01,
-							2 => 1.615858368580409e+02,
-							3 => -1.556989798598866e+02,
-							4 => 6.680131188771972e+01,
-							5 => -1.328068155288572e+01
-						 );
-
-		static $c = array(	1 => -7.784894002430293e-03,
-							2 => -3.223964580411365e-01,
-							3 => -2.400758277161838e+00,
-							4 => -2.549732539343734e+00,
-							5 => 4.374664141464968e+00,
-							6 => 2.938163982698783e+00
-						 );
-
-		static $d = array(	1 => 7.784695709041462e-03,
-							2 => 3.224671290700398e-01,
-							3 => 2.445134137142996e+00,
-							4 => 3.754408661907416e+00
-						 );
-
-		//	Define lower and upper region break-points.
-		$p_low = 0.02425;			//Use lower region approx. below this
-		$p_high = 1 - $p_low;		//Use upper region approx. above this
-
-		if (0 < $p && $p < $p_low) {
-			//	Rational approximation for lower region.
-			$q = sqrt(-2 * log($p));
-			return ((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6]) /
-					(((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
-		} elseif ($p_low <= $p && $p <= $p_high) {
-			//	Rational approximation for central region.
-			$q = $p - 0.5;
-			$r = $q * $q;
-			return ((((($a[1] * $r + $a[2]) * $r + $a[3]) * $r + $a[4]) * $r + $a[5]) * $r + $a[6]) * $q /
-				   ((((($b[1] * $r + $b[2]) * $r + $b[3]) * $r + $b[4]) * $r + $b[5]) * $r + 1);
-		} elseif ($p_high < $p && $p < 1) {
-			//	Rational approximation for upper region.
-			$q = sqrt(-2 * log(1 - $p));
-			return -((((($c[1] * $q + $c[2]) * $q + $c[3]) * $q + $c[4]) * $q + $c[5]) * $q + $c[6]) /
-					 (((($d[1] * $q + $d[2]) * $q + $d[3]) * $q + $d[4]) * $q + 1);
-		}
-		//	If 0 < p < 1, return a null value
-		return PHPExcel_Calculation_Functions::NULL();
-	}	//	function _inverse_ncdf()
-
-
-	private static function _inverse_ncdf2($prob) {
-		//	Approximation of inverse standard normal CDF developed by
-		//	B. Moro, "The Full Monte," Risk 8(2), Feb 1995, 57-58.
-
-		$a1 = 2.50662823884;
-		$a2 = -18.61500062529;
-		$a3 = 41.39119773534;
-		$a4 = -25.44106049637;
-
-		$b1 = -8.4735109309;
-		$b2 = 23.08336743743;
-		$b3 = -21.06224101826;
-		$b4 = 3.13082909833;
-
-		$c1 = 0.337475482272615;
-		$c2 = 0.976169019091719;
-		$c3 = 0.160797971491821;
-		$c4 = 2.76438810333863E-02;
-		$c5 = 3.8405729373609E-03;
-		$c6 = 3.951896511919E-04;
-		$c7 = 3.21767881768E-05;
-		$c8 = 2.888167364E-07;
-		$c9 = 3.960315187E-07;
-
-		$y = $prob - 0.5;
-		if (abs($y) < 0.42) {
-			$z = ($y * $y);
-			$z = $y * ((($a4 * $z + $a3) * $z + $a2) * $z + $a1) / (((($b4 * $z + $b3) * $z + $b2) * $z + $b1) * $z + 1);
-		} else {
-			if ($y > 0) {
-				$z = log(-log(1 - $prob));
-			} else {
-				$z = log(-log($prob));
-			}
-			$z = $c1 + $z * ($c2 + $z * ($c3 + $z * ($c4 + $z * ($c5 + $z * ($c6 + $z * ($c7 + $z * ($c8 + $z * $c9)))))));
-			if ($y < 0) {
-				$z = -$z;
-			}
-		}
-		return $z;
-	}	//	function _inverse_ncdf2()
-
-
-	private static function _inverse_ncdf3($p) {
-		//	ALGORITHM AS241 APPL. STATIST. (1988) VOL. 37, NO. 3.
-		//	Produces the normal deviate Z corresponding to a given lower
-		//	tail area of P; Z is accurate to about 1 part in 10**16.
-		//
-		//	This is a PHP version of the original FORTRAN code that can
-		//	be found at http://lib.stat.cmu.edu/apstat/
-		$split1 = 0.425;
-		$split2 = 5;
-		$const1 = 0.180625;
-		$const2 = 1.6;
-
-		//	coefficients for p close to 0.5
-		$a0 = 3.3871328727963666080;
-		$a1 = 1.3314166789178437745E+2;
-		$a2 = 1.9715909503065514427E+3;
-		$a3 = 1.3731693765509461125E+4;
-		$a4 = 4.5921953931549871457E+4;
-		$a5 = 6.7265770927008700853E+4;
-		$a6 = 3.3430575583588128105E+4;
-		$a7 = 2.5090809287301226727E+3;
-
-		$b1 = 4.2313330701600911252E+1;
-		$b2 = 6.8718700749205790830E+2;
-		$b3 = 5.3941960214247511077E+3;
-		$b4 = 2.1213794301586595867E+4;
-		$b5 = 3.9307895800092710610E+4;
-		$b6 = 2.8729085735721942674E+4;
-		$b7 = 5.2264952788528545610E+3;
-
-		//	coefficients for p not close to 0, 0.5 or 1.
-		$c0 = 1.42343711074968357734;
-		$c1 = 4.63033784615654529590;
-		$c2 = 5.76949722146069140550;
-		$c3 = 3.64784832476320460504;
-		$c4 = 1.27045825245236838258;
-		$c5 = 2.41780725177450611770E-1;
-		$c6 = 2.27238449892691845833E-2;
-		$c7 = 7.74545014278341407640E-4;
-
-		$d1 = 2.05319162663775882187;
-		$d2 = 1.67638483018380384940;
-		$d3 = 6.89767334985100004550E-1;
-		$d4 = 1.48103976427480074590E-1;
-		$d5 = 1.51986665636164571966E-2;
-		$d6 = 5.47593808499534494600E-4;
-		$d7 = 1.05075007164441684324E-9;
-
-		//	coefficients for p near 0 or 1.
-		$e0 = 6.65790464350110377720;
-		$e1 = 5.46378491116411436990;
-		$e2 = 1.78482653991729133580;
-		$e3 = 2.96560571828504891230E-1;
-		$e4 = 2.65321895265761230930E-2;
-		$e5 = 1.24266094738807843860E-3;
-		$e6 = 2.71155556874348757815E-5;
-		$e7 = 2.01033439929228813265E-7;
-
-		$f1 = 5.99832206555887937690E-1;
-		$f2 = 1.36929880922735805310E-1;
-		$f3 = 1.48753612908506148525E-2;
-		$f4 = 7.86869131145613259100E-4;
-		$f5 = 1.84631831751005468180E-5;
-		$f6 = 1.42151175831644588870E-7;
-		$f7 = 2.04426310338993978564E-15;
-
-		$q = $p - 0.5;
-
-		//	computation for p close to 0.5
-		if (abs($q) <= split1) {
-			$R = $const1 - $q * $q;
-			$z = $q * ((((((($a7 * $R + $a6) * $R + $a5) * $R + $a4) * $R + $a3) * $R + $a2) * $R + $a1) * $R + $a0) /
-					  ((((((($b7 * $R + $b6) * $R + $b5) * $R + $b4) * $R + $b3) * $R + $b2) * $R + $b1) * $R + 1);
-		} else {
-			if ($q < 0) {
-				$R = $p;
-			} else {
-				$R = 1 - $p;
-			}
-			$R = pow(-log($R),2);
-
-			//	computation for p not close to 0, 0.5 or 1.
-			If ($R <= $split2) {
-				$R = $R - $const2;
-				$z = ((((((($c7 * $R + $c6) * $R + $c5) * $R + $c4) * $R + $c3) * $R + $c2) * $R + $c1) * $R + $c0) /
-					 ((((((($d7 * $R + $d6) * $R + $d5) * $R + $d4) * $R + $d3) * $R + $d2) * $R + $d1) * $R + 1);
-			} else {
-			//	computation for p near 0 or 1.
-				$R = $R - $split2;
-				$z = ((((((($e7 * $R + $e6) * $R + $e5) * $R + $e4) * $R + $e3) * $R + $e2) * $R + $e1) * $R + $e0) /
-					 ((((((($f7 * $R + $f6) * $R + $f5) * $R + $f4) * $R + $f3) * $R + $f2) * $R + $f1) * $R + 1);
-			}
-			if ($q < 0) {
-				$z = -$z;
-			}
-		}
-		return $z;
-	}	//	function _inverse_ncdf3()
-
-
-	/**
-	 * AVEDEV
-	 *
-	 * Returns the average of the absolute deviations of data points from their mean.
-	 * AVEDEV is a measure of the variability in a data set.
-	 *
-	 * Excel Function:
-	 *		AVEDEV(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function AVEDEV() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGE($aArgs);
-		if ($aMean != PHPExcel_Calculation_Functions::DIV0()) {
-			$aCount = 0;
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-					$arg = (integer) $arg;
-				}
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					if (is_null($returnValue)) {
-						$returnValue = abs($arg - $aMean);
-					} else {
-						$returnValue += abs($arg - $aMean);
-					}
-					++$aCount;
-				}
-			}
-
-			// Return
-			if ($aCount == 0) {
-				return PHPExcel_Calculation_Functions::DIV0();
-			}
-			return $returnValue / $aCount;
-		}
-		return PHPExcel_Calculation_Functions::NaN();
-	}	//	function AVEDEV()
-
-
-	/**
-	 * AVERAGE
-	 *
-	 * Returns the average (arithmetic mean) of the arguments
-	 *
-	 * Excel Function:
-	 *		AVERAGE(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function AVERAGE() {
-		$returnValue = $aCount = 0;
-
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args()) as $k => $arg) {
-			if ((is_bool($arg)) &&
-				((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-				$arg = (integer) $arg;
-			}
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if (is_null($returnValue)) {
-					$returnValue = $arg;
-				} else {
-					$returnValue += $arg;
-				}
-				++$aCount;
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			return $returnValue / $aCount;
-		} else {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-	}	//	function AVERAGE()
-
-
-	/**
-	 * AVERAGEA
-	 *
-	 * Returns the average of its arguments, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		AVERAGEA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function AVERAGEA() {
-		// Return value
-		$returnValue = null;
-
-		$aCount = 0;
-		// Loop through arguments
-		foreach (PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args()) as $k => $arg) {
-			if ((is_bool($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-			} else {
-				if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
-					if (is_bool($arg)) {
-						$arg = (integer) $arg;
-					} elseif (is_string($arg)) {
-						$arg = 0;
-					}
-					if (is_null($returnValue)) {
-						$returnValue = $arg;
-					} else {
-						$returnValue += $arg;
-					}
-					++$aCount;
-				}
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			return $returnValue / $aCount;
-		} else {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-	}	//	function AVERAGEA()
-
-
-	/**
-	 * AVERAGEIF
-	 *
-	 * Returns the average value from a range of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		AVERAGEIF(value1[,value2[, ...]],condition)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	string		$condition		The criteria that defines which cells will be checked.
-	 * @return	float
-	 */
-	public static function AVERAGEIF($aArgs,$condition,$averageArgs = array()) {
-		// Return value
-		$returnValue = 0;
-
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
-		$averageArgs = PHPExcel_Calculation_Functions::flattenArray($averageArgs);
-		if (empty($averageArgs)) {
-			$averageArgs = $aArgs;
-		}
-		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
-		// Loop through arguments
-		$aCount = 0;
-		foreach ($aArgs as $key => $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
-			$testCondition = '='.$arg.$condition;
-			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-				if ((is_null($returnValue)) || ($arg > $returnValue)) {
-					$returnValue += $arg;
-					++$aCount;
-				}
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			return $returnValue / $aCount;
-		} else {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-	}	//	function AVERAGEIF()
-
-
-	/**
-	 * BETADIST
-	 *
-	 * Returns the beta distribution.
-	 *
-	 * @param	float		$value			Value at which you want to evaluate the distribution
-	 * @param	float		$alpha			Parameter to the distribution
-	 * @param	float		$beta			Parameter to the distribution
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function BETADIST($value,$alpha,$beta,$rMin=0,$rMax=1) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$alpha	= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$beta	= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
-		$rMin	= PHPExcel_Calculation_Functions::flattenSingleValue($rMin);
-		$rMax	= PHPExcel_Calculation_Functions::flattenSingleValue($rMax);
-
-		if ((is_numeric($value)) && (is_numeric($alpha)) && (is_numeric($beta)) && (is_numeric($rMin)) && (is_numeric($rMax))) {
-			if (($value < $rMin) || ($value > $rMax) || ($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ($rMin > $rMax) {
-				$tmp = $rMin;
-				$rMin = $rMax;
-				$rMax = $tmp;
-			}
-			$value -= $rMin;
-			$value /= ($rMax - $rMin);
-			return self::_incompleteBeta($value,$alpha,$beta);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BETADIST()
-
-
-	/**
-	 * BETAINV
-	 *
-	 * Returns the inverse of the beta distribution.
-	 *
-	 * @param	float		$probability	Probability at which you want to evaluate the distribution
-	 * @param	float		$alpha			Parameter to the distribution
-	 * @param	float		$beta			Parameter to the distribution
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function BETAINV($probability,$alpha,$beta,$rMin=0,$rMax=1) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$alpha			= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$beta			= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
-		$rMin			= PHPExcel_Calculation_Functions::flattenSingleValue($rMin);
-		$rMax			= PHPExcel_Calculation_Functions::flattenSingleValue($rMax);
-
-		if ((is_numeric($probability)) && (is_numeric($alpha)) && (is_numeric($beta)) && (is_numeric($rMin)) && (is_numeric($rMax))) {
-			if (($alpha <= 0) || ($beta <= 0) || ($rMin == $rMax) || ($probability <= 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ($rMin > $rMax) {
-				$tmp = $rMin;
-				$rMin = $rMax;
-				$rMax = $tmp;
-			}
-			$a = 0;
-			$b = 2;
-
-			$i = 0;
-			while ((($b - $a) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
-				$guess = ($a + $b) / 2;
-				$result = self::BETADIST($guess, $alpha, $beta);
-				if (($result == $probability) || ($result == 0)) {
-					$b = $a;
-				} elseif ($result > $probability) {
-					$b = $guess;
-				} else {
-					$a = $guess;
-				}
-			}
-			if ($i == MAX_ITERATIONS) {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			return round($rMin + $guess * ($rMax - $rMin),12);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BETAINV()
-
-
-	/**
-	 * BINOMDIST
-	 *
-	 * Returns the individual term binomial distribution probability. Use BINOMDIST in problems with
-	 *		a fixed number of tests or trials, when the outcomes of any trial are only success or failure,
-	 *		when trials are independent, and when the probability of success is constant throughout the
-	 *		experiment. For example, BINOMDIST can calculate the probability that two of the next three
-	 *		babies born are male.
-	 *
-	 * @param	float		$value			Number of successes in trials
-	 * @param	float		$trials			Number of trials
-	 * @param	float		$probability	Probability of success on each trial
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 * @todo	Cumulative distribution function
-	 *
-	 */
-	public static function BINOMDIST($value, $trials, $probability, $cumulative) {
-		$value			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($value));
-		$trials			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($trials));
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-
-		if ((is_numeric($value)) && (is_numeric($trials)) && (is_numeric($probability))) {
-			if (($value < 0) || ($value > $trials)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($probability < 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					$summer = 0;
-					for ($i = 0; $i <= $value; ++$i) {
-						$summer += PHPExcel_Calculation_MathTrig::COMBIN($trials,$i) * pow($probability,$i) * pow(1 - $probability,$trials - $i);
-					}
-					return $summer;
-				} else {
-					return PHPExcel_Calculation_MathTrig::COMBIN($trials,$value) * pow($probability,$value) * pow(1 - $probability,$trials - $value) ;
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function BINOMDIST()
-
-
-	/**
-	 * CHIDIST
-	 *
-	 * Returns the one-tailed probability of the chi-squared distribution.
-	 *
-	 * @param	float		$value			Value for the function
-	 * @param	float		$degrees		degrees of freedom
-	 * @return	float
-	 */
-	public static function CHIDIST($value, $degrees) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$degrees	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
-
-		if ((is_numeric($value)) && (is_numeric($degrees))) {
-			if ($degrees < 1) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ($value < 0) {
-				if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-					return 1;
-				}
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return 1 - (self::_incompleteGamma($degrees/2,$value/2) / self::_gamma($degrees/2));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function CHIDIST()
-
-
-	/**
-	 * CHIINV
-	 *
-	 * Returns the one-tailed probability of the chi-squared distribution.
-	 *
-	 * @param	float		$probability	Probability for the function
-	 * @param	float		$degrees		degrees of freedom
-	 * @return	float
-	 */
-	public static function CHIINV($probability, $degrees) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$degrees		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
-
-		if ((is_numeric($probability)) && (is_numeric($degrees))) {
-
-			$xLo = 100;
-			$xHi = 0;
-
-			$x = $xNew = 1;
-			$dx	= 1;
-			$i = 0;
-
-			while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
-				// Apply Newton-Raphson step
-				$result = self::CHIDIST($x, $degrees);
-				$error = $result - $probability;
-				if ($error == 0.0) {
-					$dx = 0;
-				} elseif ($error < 0.0) {
-					$xLo = $x;
-				} else {
-					$xHi = $x;
-				}
-				// Avoid division by zero
-				if ($result != 0.0) {
-					$dx = $error / $result;
-					$xNew = $x - $dx;
-				}
-				// If the NR fails to converge (which for example may be the
-				// case if the initial guess is too rough) we apply a bisection
-				// step to determine a more narrow interval around the root.
-				if (($xNew < $xLo) || ($xNew > $xHi) || ($result == 0.0)) {
-					$xNew = ($xLo + $xHi) / 2;
-					$dx = $xNew - $x;
-				}
-				$x = $xNew;
-			}
-			if ($i == MAX_ITERATIONS) {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			return round($x,12);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function CHIINV()
-
-
-	/**
-	 * CONFIDENCE
-	 *
-	 * Returns the confidence interval for a population mean
-	 *
-	 * @param	float		$alpha
-	 * @param	float		$stdDev		Standard Deviation
-	 * @param	float		$size
-	 * @return	float
-	 *
-	 */
-	public static function CONFIDENCE($alpha,$stdDev,$size) {
-		$alpha	= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-		$size	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($size));
-
-		if ((is_numeric($alpha)) && (is_numeric($stdDev)) && (is_numeric($size))) {
-			if (($alpha <= 0) || ($alpha >= 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($stdDev <= 0) || ($size < 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return self::NORMSINV(1 - $alpha / 2) * $stdDev / sqrt($size);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function CONFIDENCE()
-
-
-	/**
-	 * CORREL
-	 *
-	 * Returns covariance, the average of the products of deviations for each data point pair.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function CORREL($yValues,$xValues=null) {
-		if ((is_null($xValues)) || (!is_array($yValues)) || (!is_array($xValues))) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getCorrelation();
-	}	//	function CORREL()
-
-
-	/**
-	 * COUNT
-	 *
-	 * Counts the number of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		COUNT(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	int
-	 */
-	public static function COUNT() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-		foreach ($aArgs as $k => $arg) {
-			if ((is_bool($arg)) &&
-				((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-				$arg = (integer) $arg;
-			}
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				++$returnValue;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function COUNT()
-
-
-	/**
-	 * COUNTA
-	 *
-	 * Counts the number of cells that are not empty within the list of arguments
-	 *
-	 * Excel Function:
-	 *		COUNTA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	int
-	 */
-	public static function COUNTA() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric, boolean or string value?
-			if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
-				++$returnValue;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function COUNTA()
-
-
-	/**
-	 * COUNTBLANK
-	 *
-	 * Counts the number of empty cells within the list of arguments
-	 *
-	 * Excel Function:
-	 *		COUNTBLANK(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	int
-	 */
-	public static function COUNTBLANK() {
-		// Return value
-		$returnValue = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a blank cell?
-			if ((is_null($arg)) || ((is_string($arg)) && ($arg == ''))) {
-				++$returnValue;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function COUNTBLANK()
-
-
-	/**
-	 * COUNTIF
-	 *
-	 * Counts the number of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		COUNTIF(value1[,value2[, ...]],condition)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	string		$condition		The criteria that defines which cells will be counted.
-	 * @return	int
-	 */
-	public static function COUNTIF($aArgs,$condition) {
-		// Return value
-		$returnValue = 0;
-
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
-		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
-		// Loop through arguments
-		foreach ($aArgs as $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
-			$testCondition = '='.$arg.$condition;
-			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-				// Is it a value within our criteria
-				++$returnValue;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function COUNTIF()
-
-
-	/**
-	 * COVAR
-	 *
-	 * Returns covariance, the average of the products of deviations for each data point pair.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function COVAR($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getCovariance();
-	}	//	function COVAR()
-
-
-	/**
-	 * CRITBINOM
-	 *
-	 * Returns the smallest value for which the cumulative binomial distribution is greater
-	 *		than or equal to a criterion value
-	 *
-	 * See http://support.microsoft.com/kb/828117/ for details of the algorithm used
-	 *
-	 * @param	float		$trials			number of Bernoulli trials
-	 * @param	float		$probability	probability of a success on each trial
-	 * @param	float		$alpha			criterion value
-	 * @return	int
-	 *
-	 * @todo	Warning. This implementation differs from the algorithm detailed on the MS
-	 *			web site in that $CumPGuessMinus1 = $CumPGuess - 1 rather than $CumPGuess - $PGuess
-	 *			This eliminates a potential endless loop error, but may have an adverse affect on the
-	 *			accuracy of the function (although all my tests have so far returned correct results).
-	 *
-	 */
-	public static function CRITBINOM($trials, $probability, $alpha) {
-		$trials			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($trials));
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$alpha			= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-
-		if ((is_numeric($trials)) && (is_numeric($probability)) && (is_numeric($alpha))) {
-			if ($trials < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($probability < 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($alpha < 0) || ($alpha > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ($alpha <= 0.5) {
-				$t = sqrt(log(1 / ($alpha * $alpha)));
-				$trialsApprox = 0 - ($t + (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t));
-			} else {
-				$t = sqrt(log(1 / pow(1 - $alpha,2)));
-				$trialsApprox = $t - (2.515517 + 0.802853 * $t + 0.010328 * $t * $t) / (1 + 1.432788 * $t + 0.189269 * $t * $t + 0.001308 * $t * $t * $t);
-			}
-			$Guess = floor($trials * $probability + $trialsApprox * sqrt($trials * $probability * (1 - $probability)));
-			if ($Guess < 0) {
-				$Guess = 0;
-			} elseif ($Guess > $trials) {
-				$Guess = $trials;
-			}
-
-			$TotalUnscaledProbability = $UnscaledPGuess = $UnscaledCumPGuess = 0.0;
-			$EssentiallyZero = 10e-12;
-
-			$m = floor($trials * $probability);
-			++$TotalUnscaledProbability;
-			if ($m == $Guess) { ++$UnscaledPGuess; }
-			if ($m <= $Guess) { ++$UnscaledCumPGuess; }
-
-			$PreviousValue = 1;
-			$Done = False;
-			$k = $m + 1;
-			while ((!$Done) && ($k <= $trials)) {
-				$CurrentValue = $PreviousValue * ($trials - $k + 1) * $probability / ($k * (1 - $probability));
-				$TotalUnscaledProbability += $CurrentValue;
-				if ($k == $Guess) { $UnscaledPGuess += $CurrentValue; }
-				if ($k <= $Guess) { $UnscaledCumPGuess += $CurrentValue; }
-				if ($CurrentValue <= $EssentiallyZero) { $Done = True; }
-				$PreviousValue = $CurrentValue;
-				++$k;
-			}
-
-			$PreviousValue = 1;
-			$Done = False;
-			$k = $m - 1;
-			while ((!$Done) && ($k >= 0)) {
-				$CurrentValue = $PreviousValue * $k + 1 * (1 - $probability) / (($trials - $k) * $probability);
-				$TotalUnscaledProbability += $CurrentValue;
-				if ($k == $Guess) { $UnscaledPGuess += $CurrentValue; }
-				if ($k <= $Guess) { $UnscaledCumPGuess += $CurrentValue; }
-				if ($CurrentValue <= $EssentiallyZero) { $Done = True; }
-				$PreviousValue = $CurrentValue;
-				--$k;
-			}
-
-			$PGuess = $UnscaledPGuess / $TotalUnscaledProbability;
-			$CumPGuess = $UnscaledCumPGuess / $TotalUnscaledProbability;
-
-//			$CumPGuessMinus1 = $CumPGuess - $PGuess;
-			$CumPGuessMinus1 = $CumPGuess - 1;
-
-			while (True) {
-				if (($CumPGuessMinus1 < $alpha) && ($CumPGuess >= $alpha)) {
-					return $Guess;
-				} elseif (($CumPGuessMinus1 < $alpha) && ($CumPGuess < $alpha)) {
-					$PGuessPlus1 = $PGuess * ($trials - $Guess) * $probability / $Guess / (1 - $probability);
-					$CumPGuessMinus1 = $CumPGuess;
-					$CumPGuess = $CumPGuess + $PGuessPlus1;
-					$PGuess = $PGuessPlus1;
-					++$Guess;
-				} elseif (($CumPGuessMinus1 >= $alpha) && ($CumPGuess >= $alpha)) {
-					$PGuessMinus1 = $PGuess * $Guess * (1 - $probability) / ($trials - $Guess + 1) / $probability;
-					$CumPGuess = $CumPGuessMinus1;
-					$CumPGuessMinus1 = $CumPGuessMinus1 - $PGuess;
-					$PGuess = $PGuessMinus1;
-					--$Guess;
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function CRITBINOM()
-
-
-	/**
-	 * DEVSQ
-	 *
-	 * Returns the sum of squares of deviations of data points from their sample mean.
-	 *
-	 * Excel Function:
-	 *		DEVSQ(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function DEVSQ() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGE($aArgs);
-		if ($aMean != PHPExcel_Calculation_Functions::DIV0()) {
-			$aCount = -1;
-			foreach ($aArgs as $k => $arg) {
-				// Is it a numeric value?
-				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-					$arg = (integer) $arg;
-				}
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					if (is_null($returnValue)) {
-						$returnValue = pow(($arg - $aMean),2);
-					} else {
-						$returnValue += pow(($arg - $aMean),2);
-					}
-					++$aCount;
-				}
-			}
-
-			// Return
-			if (is_null($returnValue)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			} else {
-				return $returnValue;
-			}
-		}
-		return self::NA();
-	}	//	function DEVSQ()
-
-
-	/**
-	 * EXPONDIST
-	 *
-	 *	Returns the exponential distribution. Use EXPONDIST to model the time between events,
-	 *		such as how long an automated bank teller takes to deliver cash. For example, you can
-	 *		use EXPONDIST to determine the probability that the process takes at most 1 minute.
-	 *
-	 * @param	float		$value			Value of the function
-	 * @param	float		$lambda			The parameter value
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 */
-	public static function EXPONDIST($value, $lambda, $cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$lambda	= PHPExcel_Calculation_Functions::flattenSingleValue($lambda);
-		$cumulative	= PHPExcel_Calculation_Functions::flattenSingleValue($cumulative);
-
-		if ((is_numeric($value)) && (is_numeric($lambda))) {
-			if (($value < 0) || ($lambda < 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					return 1 - exp(0-$value*$lambda);
-				} else {
-					return $lambda * exp(0-$value*$lambda);
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function EXPONDIST()
-
-
-	/**
-	 * FISHER
-	 *
-	 * Returns the Fisher transformation at x. This transformation produces a function that
-	 *		is normally distributed rather than skewed. Use this function to perform hypothesis
-	 *		testing on the correlation coefficient.
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 */
-	public static function FISHER($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-
-		if (is_numeric($value)) {
-			if (($value <= -1) || ($value >= 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return 0.5 * log((1+$value)/(1-$value));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function FISHER()
-
-
-	/**
-	 * FISHERINV
-	 *
-	 * Returns the inverse of the Fisher transformation. Use this transformation when
-	 *		analyzing correlations between ranges or arrays of data. If y = FISHER(x), then
-	 *		FISHERINV(y) = x.
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 */
-	public static function FISHERINV($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-
-		if (is_numeric($value)) {
-			return (exp(2 * $value) - 1) / (exp(2 * $value) + 1);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function FISHERINV()
-
-
-	/**
-	 * FORECAST
-	 *
-	 * Calculates, or predicts, a future value by using existing values. The predicted value is a y-value for a given x-value.
-	 *
-	 * @param	float				Value of X for which we want to find Y
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function FORECAST($xValue,$yValues,$xValues) {
-		$xValue	= PHPExcel_Calculation_Functions::flattenSingleValue($xValue);
-		if (!is_numeric($xValue)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getValueOfYForX($xValue);
-	}	//	function FORECAST()
-
-
-	/**
-	 * GAMMADIST
-	 *
-	 * Returns the gamma distribution.
-	 *
-	 * @param	float		$value			Value at which you want to evaluate the distribution
-	 * @param	float		$a				Parameter to the distribution
-	 * @param	float		$b				Parameter to the distribution
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function GAMMADIST($value,$a,$b,$cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$a		= PHPExcel_Calculation_Functions::flattenSingleValue($a);
-		$b		= PHPExcel_Calculation_Functions::flattenSingleValue($b);
-
-		if ((is_numeric($value)) && (is_numeric($a)) && (is_numeric($b))) {
-			if (($value < 0) || ($a <= 0) || ($b <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					return self::_incompleteGamma($a,$value / $b) / self::_gamma($a);
-				} else {
-					return (1 / (pow($b,$a) * self::_gamma($a))) * pow($value,$a-1) * exp(0-($value / $b));
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function GAMMADIST()
-
-
-	/**
-	 * GAMMAINV
-	 *
-	 * Returns the inverse of the beta distribution.
-	 *
-	 * @param	float		$probability	Probability at which you want to evaluate the distribution
-	 * @param	float		$alpha			Parameter to the distribution
-	 * @param	float		$beta			Parameter to the distribution
-	 * @return	float
-	 *
-	 */
-	public static function GAMMAINV($probability,$alpha,$beta) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$alpha			= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$beta			= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
-
-		if ((is_numeric($probability)) && (is_numeric($alpha)) && (is_numeric($beta))) {
-			if (($alpha <= 0) || ($beta <= 0) || ($probability < 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-
-			$xLo = 0;
-			$xHi = $alpha * $beta * 5;
-
-			$x = $xNew = 1;
-			$error = $pdf = 0;
-			$dx	= 1024;
-			$i = 0;
-
-			while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
-				// Apply Newton-Raphson step
-				$error = self::GAMMADIST($x, $alpha, $beta, True) - $probability;
-				if ($error < 0.0) {
-					$xLo = $x;
-				} else {
-					$xHi = $x;
-				}
-				$pdf = self::GAMMADIST($x, $alpha, $beta, False);
-				// Avoid division by zero
-				if ($pdf != 0.0) {
-					$dx = $error / $pdf;
-					$xNew = $x - $dx;
-				}
-				// If the NR fails to converge (which for example may be the
-				// case if the initial guess is too rough) we apply a bisection
-				// step to determine a more narrow interval around the root.
-				if (($xNew < $xLo) || ($xNew > $xHi) || ($pdf == 0.0)) {
-					$xNew = ($xLo + $xHi) / 2;
-					$dx = $xNew - $x;
-				}
-				$x = $xNew;
-			}
-			if ($i == MAX_ITERATIONS) {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			return $x;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function GAMMAINV()
-
-
-	/**
-	 * GAMMALN
-	 *
-	 * Returns the natural logarithm of the gamma function.
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 */
-	public static function GAMMALN($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-
-		if (is_numeric($value)) {
-			if ($value <= 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return log(self::_gamma($value));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function GAMMALN()
-
-
-	/**
-	 * GEOMEAN
-	 *
-	 * Returns the geometric mean of an array or range of positive data. For example, you
-	 *		can use GEOMEAN to calculate average growth rate given compound interest with
-	 *		variable rates.
-	 *
-	 * Excel Function:
-	 *		GEOMEAN(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function GEOMEAN() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		$aMean = PHPExcel_Calculation_MathTrig::PRODUCT($aArgs);
-		if (is_numeric($aMean) && ($aMean > 0)) {
-			$aCount = self::COUNT($aArgs) ;
-			if (self::MIN($aArgs) > 0) {
-				return pow($aMean, (1 / $aCount));
-			}
-		}
-		return PHPExcel_Calculation_Functions::NaN();
-	}	//	GEOMEAN()
-
-
-	/**
-	 * GROWTH
-	 *
-	 * Returns values along a predicted emponential trend
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @param	array of mixed		Values of X for which we want to find Y
-	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 * @return	array of float
-	 */
-	public static function GROWTH($yValues,$xValues=array(),$newValues=array(),$const=True) {
-		$yValues = PHPExcel_Calculation_Functions::flattenArray($yValues);
-		$xValues = PHPExcel_Calculation_Functions::flattenArray($xValues);
-		$newValues = PHPExcel_Calculation_Functions::flattenArray($newValues);
-		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
-
-		$bestFitExponential = trendClass::calculate(trendClass::TREND_EXPONENTIAL,$yValues,$xValues,$const);
-		if (empty($newValues)) {
-			$newValues = $bestFitExponential->getXValues();
-		}
-
-		$returnArray = array();
-		foreach($newValues as $xValue) {
-			$returnArray[0][] = $bestFitExponential->getValueOfYForX($xValue);
-		}
-
-		return $returnArray;
-	}	//	function GROWTH()
-
-
-	/**
-	 * HARMEAN
-	 *
-	 * Returns the harmonic mean of a data set. The harmonic mean is the reciprocal of the
-	 *		arithmetic mean of reciprocals.
-	 *
-	 * Excel Function:
-	 *		HARMEAN(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function HARMEAN() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::NA();
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		if (self::MIN($aArgs) < 0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$aCount = 0;
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if ($arg <= 0) {
-					return PHPExcel_Calculation_Functions::NaN();
-				}
-				if (is_null($returnValue)) {
-					$returnValue = (1 / $arg);
-				} else {
-					$returnValue += (1 / $arg);
-				}
-				++$aCount;
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			return 1 / ($returnValue / $aCount);
-		} else {
-			return $returnValue;
-		}
-	}	//	function HARMEAN()
-
-
-	/**
-	 * HYPGEOMDIST
-	 *
-	 * Returns the hypergeometric distribution. HYPGEOMDIST returns the probability of a given number of
-	 * sample successes, given the sample size, population successes, and population size.
-	 *
-	 * @param	float		$sampleSuccesses		Number of successes in the sample
-	 * @param	float		$sampleNumber			Size of the sample
-	 * @param	float		$populationSuccesses	Number of successes in the population
-	 * @param	float		$populationNumber		Population size
-	 * @return	float
-	 *
-	 */
-	public static function HYPGEOMDIST($sampleSuccesses, $sampleNumber, $populationSuccesses, $populationNumber) {
-		$sampleSuccesses		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($sampleSuccesses));
-		$sampleNumber			= floor(PHPExcel_Calculation_Functions::flattenSingleValue($sampleNumber));
-		$populationSuccesses	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($populationSuccesses));
-		$populationNumber		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($populationNumber));
-
-		if ((is_numeric($sampleSuccesses)) && (is_numeric($sampleNumber)) && (is_numeric($populationSuccesses)) && (is_numeric($populationNumber))) {
-			if (($sampleSuccesses < 0) || ($sampleSuccesses > $sampleNumber) || ($sampleSuccesses > $populationSuccesses)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($sampleNumber <= 0) || ($sampleNumber > $populationNumber)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($populationSuccesses <= 0) || ($populationSuccesses > $populationNumber)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return PHPExcel_Calculation_MathTrig::COMBIN($populationSuccesses,$sampleSuccesses) *
-				   PHPExcel_Calculation_MathTrig::COMBIN($populationNumber - $populationSuccesses,$sampleNumber - $sampleSuccesses) /
-				   PHPExcel_Calculation_MathTrig::COMBIN($populationNumber,$sampleNumber);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function HYPGEOMDIST()
-
-
-	/**
-	 * INTERCEPT
-	 *
-	 * Calculates the point at which a line will intersect the y-axis by using existing x-values and y-values.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function INTERCEPT($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getIntersect();
-	}	//	function INTERCEPT()
-
-
-	/**
-	 * KURT
-	 *
-	 * Returns the kurtosis of a data set. Kurtosis characterizes the relative peakedness
-	 * or flatness of a distribution compared with the normal distribution. Positive
-	 * kurtosis indicates a relatively peaked distribution. Negative kurtosis indicates a
-	 * relatively flat distribution.
-	 *
-	 * @param	array	Data Series
-	 * @return	float
-	 */
-	public static function KURT() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-		$mean = self::AVERAGE($aArgs);
-		$stdDev = self::STDEV($aArgs);
-
-		if ($stdDev > 0) {
-			$count = $summer = 0;
-			// Loop through arguments
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-				} else {
-					// Is it a numeric value?
-					if ((is_numeric($arg)) && (!is_string($arg))) {
-						$summer += pow((($arg - $mean) / $stdDev),4) ;
-						++$count;
-					}
-				}
-			}
-
-			// Return
-			if ($count > 3) {
-				return $summer * ($count * ($count+1) / (($count-1) * ($count-2) * ($count-3))) - (3 * pow($count-1,2) / (($count-2) * ($count-3)));
-			}
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function KURT()
-
-
-	/**
-	 * LARGE
-	 *
-	 * Returns the nth largest value in a data set. You can use this function to
-	 *		select a value based on its relative standing.
-	 *
-	 * Excel Function:
-	 *		LARGE(value1[,value2[, ...]],entry)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	int			$entry			Position (ordered from the largest) in the array or range of data to return
-	 * @return	float
-	 *
-	 */
-	public static function LARGE() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$entry = floor(array_pop($aArgs));
-
-		if ((is_numeric($entry)) && (!is_string($entry))) {
-			$mArgs = array();
-			foreach ($aArgs as $arg) {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$mArgs[] = $arg;
-				}
-			}
-			$count = self::COUNT($mArgs);
-			$entry = floor(--$entry);
-			if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			rsort($mArgs);
-			return $mArgs[$entry];
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function LARGE()
-
-
-	/**
-	 * LINEST
-	 *
-	 * Calculates the statistics for a line by using the "least squares" method to calculate a straight line that best fits your data,
-	 *		and then returns an array that describes the line.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 * @param	boolean				A logical value specifying whether to return additional regression statistics.
-	 * @return	array
-	 */
-	public static function LINEST($yValues,$xValues=null,$const=True,$stats=False) {
-		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
-		$stats	= (is_null($stats))	? False :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
-		if (is_null($xValues)) $xValues = range(1,count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
-
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return 0;
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues,$const);
-		if ($stats) {
-			return array( array( $bestFitLinear->getSlope(),
-						 		 $bestFitLinear->getSlopeSE(),
-						 		 $bestFitLinear->getGoodnessOfFit(),
-						 		 $bestFitLinear->getF(),
-						 		 $bestFitLinear->getSSRegression(),
-							   ),
-						  array( $bestFitLinear->getIntersect(),
-								 $bestFitLinear->getIntersectSE(),
-								 $bestFitLinear->getStdevOfResiduals(),
-								 $bestFitLinear->getDFResiduals(),
-								 $bestFitLinear->getSSResiduals()
-							   )
-						);
-		} else {
-			return array( $bestFitLinear->getSlope(),
-						  $bestFitLinear->getIntersect()
-						);
-		}
-	}	//	function LINEST()
-
-
-	/**
-	 * LOGEST
-	 *
-	 * Calculates an exponential curve that best fits the X and Y data series,
-	 *		and then returns an array that describes the line.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 * @param	boolean				A logical value specifying whether to return additional regression statistics.
-	 * @return	array
-	 */
-	public static function LOGEST($yValues,$xValues=null,$const=True,$stats=False) {
-		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
-		$stats	= (is_null($stats))	? False :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($stats);
-		if (is_null($xValues)) $xValues = range(1,count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
-
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		foreach($yValues as $value) {
-			if ($value <= 0.0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-		}
-
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return 1;
-		}
-
-		$bestFitExponential = trendClass::calculate(trendClass::TREND_EXPONENTIAL,$yValues,$xValues,$const);
-		if ($stats) {
-			return array( array( $bestFitExponential->getSlope(),
-						 		 $bestFitExponential->getSlopeSE(),
-						 		 $bestFitExponential->getGoodnessOfFit(),
-						 		 $bestFitExponential->getF(),
-						 		 $bestFitExponential->getSSRegression(),
-							   ),
-						  array( $bestFitExponential->getIntersect(),
-								 $bestFitExponential->getIntersectSE(),
-								 $bestFitExponential->getStdevOfResiduals(),
-								 $bestFitExponential->getDFResiduals(),
-								 $bestFitExponential->getSSResiduals()
-							   )
-						);
-		} else {
-			return array( $bestFitExponential->getSlope(),
-						  $bestFitExponential->getIntersect()
-						);
-		}
-	}	//	function LOGEST()
-
-
-	/**
-	 * LOGINV
-	 *
-	 * Returns the inverse of the normal cumulative distribution
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 *
-	 * @todo	Try implementing P J Acklam's refinement algorithm for greater
-	 *			accuracy if I can get my head round the mathematics
-	 *			(as described at) http://home.online.no/~pjacklam/notes/invnorm/
-	 */
-	public static function LOGINV($probability, $mean, $stdDev) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$mean			= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev			= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-
-		if ((is_numeric($probability)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-			if (($probability < 0) || ($probability > 1) || ($stdDev <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return exp($mean + $stdDev * self::NORMSINV($probability));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function LOGINV()
-
-
-	/**
-	 * LOGNORMDIST
-	 *
-	 * Returns the cumulative lognormal distribution of x, where ln(x) is normally distributed
-	 * with parameters mean and standard_dev.
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 */
-	public static function LOGNORMDIST($value, $mean, $stdDev) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-
-		if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-			if (($value <= 0) || ($stdDev <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return self::NORMSDIST((log($value) - $mean) / $stdDev);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function LOGNORMDIST()
-
-
-	/**
-	 * MAX
-	 *
-	 * MAX returns the value of the element of the values passed that has the highest value,
-	 *		with negative numbers considered smaller than positive numbers.
-	 *
-	 * Excel Function:
-	 *		MAX(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MAX() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if ((is_null($returnValue)) || ($arg > $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		if(is_null($returnValue)) {
-			return 0;
-		}
-		return $returnValue;
-	}	//	function MAX()
-
-
-	/**
-	 * MAXA
-	 *
-	 * Returns the greatest value in a list of arguments, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		MAXA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MAXA() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
-				if (is_bool($arg)) {
-					$arg = (integer) $arg;
-				} elseif (is_string($arg)) {
-					$arg = 0;
-				}
-				if ((is_null($returnValue)) || ($arg > $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		if(is_null($returnValue)) {
-			return 0;
-		}
-		return $returnValue;
-	}	//	function MAXA()
-
-
-	/**
-	 * MAXIF
-	 *
-	 * Counts the maximum value within a range of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		MAXIF(value1[,value2[, ...]],condition)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	string		$condition		The criteria that defines which cells will be checked.
-	 * @return	float
-	 */
-	public static function MAXIF($aArgs,$condition,$sumArgs = array()) {
-		// Return value
-		$returnValue = null;
-
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
-		$sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
-		if (empty($sumArgs)) {
-			$sumArgs = $aArgs;
-		}
-		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
-		// Loop through arguments
-		foreach ($aArgs as $key => $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
-			$testCondition = '='.$arg.$condition;
-			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-				if ((is_null($returnValue)) || ($arg > $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function MAXIF()
-
-
-	/**
-	 * MEDIAN
-	 *
-	 * Returns the median of the given numbers. The median is the number in the middle of a set of numbers.
-	 *
-	 * Excel Function:
-	 *		MEDIAN(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MEDIAN() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::NaN();
-
-		$mArgs = array();
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$mArgs[] = $arg;
-			}
-		}
-
-		$mValueCount = count($mArgs);
-		if ($mValueCount > 0) {
-			sort($mArgs,SORT_NUMERIC);
-			$mValueCount = $mValueCount / 2;
-			if ($mValueCount == floor($mValueCount)) {
-				$returnValue = ($mArgs[$mValueCount--] + $mArgs[$mValueCount]) / 2;
-			} else {
-				$mValueCount == floor($mValueCount);
-				$returnValue = $mArgs[$mValueCount];
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function MEDIAN()
-
-
-	/**
-	 * MIN
-	 *
-	 * MIN returns the value of the element of the values passed that has the smallest value,
-	 *		with negative numbers considered smaller than positive numbers.
-	 *
-	 * Excel Function:
-	 *		MIN(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MIN() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				if ((is_null($returnValue)) || ($arg < $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		if(is_null($returnValue)) {
-			return 0;
-		}
-		return $returnValue;
-	}	//	function MIN()
-
-
-	/**
-	 * MINA
-	 *
-	 * Returns the smallest value in a list of arguments, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		MINA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MINA() {
-		// Return value
-		$returnValue = null;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
-				if (is_bool($arg)) {
-					$arg = (integer) $arg;
-				} elseif (is_string($arg)) {
-					$arg = 0;
-				}
-				if ((is_null($returnValue)) || ($arg < $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		if(is_null($returnValue)) {
-			return 0;
-		}
-		return $returnValue;
-	}	//	function MINA()
-
-
-	/**
-	 * MINIF
-	 *
-	 * Returns the minimum value within a range of cells that contain numbers within the list of arguments
-	 *
-	 * Excel Function:
-	 *		MINIF(value1[,value2[, ...]],condition)
-	 *
-	 * @access	public
-	 * @category Mathematical and Trigonometric Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	string		$condition		The criteria that defines which cells will be checked.
-	 * @return	float
-	 */
-	public static function MINIF($aArgs,$condition,$sumArgs = array()) {
-		// Return value
-		$returnValue = null;
-
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
-		$sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
-		if (empty($sumArgs)) {
-			$sumArgs = $aArgs;
-		}
-		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
-		// Loop through arguments
-		foreach ($aArgs as $key => $arg) {
-			if (!is_numeric($arg)) { $arg = PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
-			$testCondition = '='.$arg.$condition;
-			if (PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
-				if ((is_null($returnValue)) || ($arg < $returnValue)) {
-					$returnValue = $arg;
-				}
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function MINIF()
-
-
-	//
-	//	Special variant of array_count_values that isn't limited to strings and integers,
-	//		but can work with floating point numbers as values
-	//
-	private static function _modeCalc($data) {
-		$frequencyArray = array();
-		foreach($data as $datum) {
-			$found = False;
-			foreach($frequencyArray as $key => $value) {
-				if ((string) $value['value'] == (string) $datum) {
-					++$frequencyArray[$key]['frequency'];
-					$found = True;
-					break;
-				}
-			}
-			if (!$found) {
-				$frequencyArray[] = array('value'		=> $datum,
-										  'frequency'	=>	1 );
-			}
-		}
-
-		foreach($frequencyArray as $key => $value) {
-			$frequencyList[$key] = $value['frequency'];
-			$valueList[$key] = $value['value'];
-		}
-		array_multisort($frequencyList, SORT_DESC, $valueList, SORT_ASC, SORT_NUMERIC, $frequencyArray);
-
-		if ($frequencyArray[0]['frequency'] == 1) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-		return $frequencyArray[0]['value'];
-	}	//	function _modeCalc()
-
-
-	/**
-	 * MODE
-	 *
-	 * Returns the most frequently occurring, or repetitive, value in an array or range of data
-	 *
-	 * Excel Function:
-	 *		MODE(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function MODE() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::NA();
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		$mArgs = array();
-		foreach ($aArgs as $arg) {
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$mArgs[] = $arg;
-			}
-		}
-
-		if (!empty($mArgs)) {
-			return self::_modeCalc($mArgs);
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function MODE()
-
-
-	/**
-	 * NEGBINOMDIST
-	 *
-	 * Returns the negative binomial distribution. NEGBINOMDIST returns the probability that
-	 *		there will be number_f failures before the number_s-th success, when the constant
-	 *		probability of a success is probability_s. This function is similar to the binomial
-	 *		distribution, except that the number of successes is fixed, and the number of trials is
-	 *		variable. Like the binomial, trials are assumed to be independent.
-	 *
-	 * @param	float		$failures		Number of Failures
-	 * @param	float		$successes		Threshold number of Successes
-	 * @param	float		$probability	Probability of success on each trial
-	 * @return	float
-	 *
-	 */
-	public static function NEGBINOMDIST($failures, $successes, $probability) {
-		$failures		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($failures));
-		$successes		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($successes));
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-
-		if ((is_numeric($failures)) && (is_numeric($successes)) && (is_numeric($probability))) {
-			if (($failures < 0) || ($successes < 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (($probability < 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC) {
-				if (($failures + $successes - 1) <= 0) {
-					return PHPExcel_Calculation_Functions::NaN();
-				}
-			}
-			return (PHPExcel_Calculation_MathTrig::COMBIN($failures + $successes - 1,$successes - 1)) * (pow($probability,$successes)) * (pow(1 - $probability,$failures)) ;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function NEGBINOMDIST()
-
-
-	/**
-	 * NORMDIST
-	 *
-	 * Returns the normal distribution for the specified mean and standard deviation. This
-	 * function has a very wide range of applications in statistics, including hypothesis
-	 * testing.
-	 *
-	 * @param	float		$value
-	 * @param	float		$mean		Mean Value
-	 * @param	float		$stdDev		Standard Deviation
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function NORMDIST($value, $mean, $stdDev, $cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-
-		if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-			if ($stdDev < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					return 0.5 * (1 + PHPExcel_Calculation_Engineering::_erfVal(($value - $mean) / ($stdDev * sqrt(2))));
-				} else {
-					return (1 / (SQRT2PI * $stdDev)) * exp(0 - (pow($value - $mean,2) / (2 * ($stdDev * $stdDev))));
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function NORMDIST()
-
-
-	/**
-	 * NORMINV
-	 *
-	 * Returns the inverse of the normal cumulative distribution for the specified mean and standard deviation.
-	 *
-	 * @param	float		$value
-	 * @param	float		$mean		Mean Value
-	 * @param	float		$stdDev		Standard Deviation
-	 * @return	float
-	 *
-	 */
-	public static function NORMINV($probability,$mean,$stdDev) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$mean			= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev			= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-
-		if ((is_numeric($probability)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-			if (($probability < 0) || ($probability > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ($stdDev < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return (self::_inverse_ncdf($probability) * $stdDev) + $mean;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function NORMINV()
-
-
-	/**
-	 * NORMSDIST
-	 *
-	 * Returns the standard normal cumulative distribution function. The distribution has
-	 * a mean of 0 (zero) and a standard deviation of one. Use this function in place of a
-	 * table of standard normal curve areas.
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 */
-	public static function NORMSDIST($value) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-
-		return self::NORMDIST($value, 0, 1, True);
-	}	//	function NORMSDIST()
-
-
-	/**
-	 * NORMSINV
-	 *
-	 * Returns the inverse of the standard normal cumulative distribution
-	 *
-	 * @param	float		$value
-	 * @return	float
-	 */
-	public static function NORMSINV($value) {
-		return self::NORMINV($value, 0, 1);
-	}	//	function NORMSINV()
-
-
-	/**
-	 * PERCENTILE
-	 *
-	 * Returns the nth percentile of values in a range..
-	 *
-	 * Excel Function:
-	 *		PERCENTILE(value1[,value2[, ...]],entry)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	float		$entry			Percentile value in the range 0..1, inclusive.
-	 * @return	float
-	 */
-	public static function PERCENTILE() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$entry = array_pop($aArgs);
-
-		if ((is_numeric($entry)) && (!is_string($entry))) {
-			if (($entry < 0) || ($entry > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$mArgs = array();
-			foreach ($aArgs as $arg) {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$mArgs[] = $arg;
-				}
-			}
-			$mValueCount = count($mArgs);
-			if ($mValueCount > 0) {
-				sort($mArgs);
-				$count = self::COUNT($mArgs);
-				$index = $entry * ($count-1);
-				$iBase = floor($index);
-				if ($index == $iBase) {
-					return $mArgs[$index];
-				} else {
-					$iNext = $iBase + 1;
-					$iProportion = $index - $iBase;
-					return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion) ;
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function PERCENTILE()
-
-
-	/**
-	 * PERCENTRANK
-	 *
-	 * Returns the rank of a value in a data set as a percentage of the data set.
-	 *
-	 * @param	array of number		An array of, or a reference to, a list of numbers.
-	 * @param	number				The number whose rank you want to find.
-	 * @param	number				The number of significant digits for the returned percentage value.
-	 * @return	float
-	 */
-	public static function PERCENTRANK($valueSet,$value,$significance=3) {
-		$valueSet	= PHPExcel_Calculation_Functions::flattenArray($valueSet);
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$significance	= (is_null($significance))	? 3 :	(integer) PHPExcel_Calculation_Functions::flattenSingleValue($significance);
-
-		foreach($valueSet as $key => $valueEntry) {
-			if (!is_numeric($valueEntry)) {
-				unset($valueSet[$key]);
-			}
-		}
-		sort($valueSet,SORT_NUMERIC);
-		$valueCount = count($valueSet);
-		if ($valueCount == 0) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-
-		$valueAdjustor = $valueCount - 1;
-		if (($value < $valueSet[0]) || ($value > $valueSet[$valueAdjustor])) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		$pos = array_search($value,$valueSet);
-		if ($pos === False) {
-			$pos = 0;
-			$testValue = $valueSet[0];
-			while ($testValue < $value) {
-				$testValue = $valueSet[++$pos];
-			}
-			--$pos;
-			$pos += (($value - $valueSet[$pos]) / ($testValue - $valueSet[$pos]));
-		}
-
-		return round($pos / $valueAdjustor,$significance);
-	}	//	function PERCENTRANK()
-
-
-	/**
-	 * PERMUT
-	 *
-	 * Returns the number of permutations for a given number of objects that can be
-	 *		selected from number objects. A permutation is any set or subset of objects or
-	 *		events where internal order is significant. Permutations are different from
-	 *		combinations, for which the internal order is not significant. Use this function
-	 *		for lottery-style probability calculations.
-	 *
-	 * @param	int		$numObjs	Number of different objects
-	 * @param	int		$numInSet	Number of objects in each permutation
-	 * @return	int		Number of permutations
-	 */
-	public static function PERMUT($numObjs,$numInSet) {
-		$numObjs	= PHPExcel_Calculation_Functions::flattenSingleValue($numObjs);
-		$numInSet	= PHPExcel_Calculation_Functions::flattenSingleValue($numInSet);
-
-		if ((is_numeric($numObjs)) && (is_numeric($numInSet))) {
-			$numInSet = floor($numInSet);
-			if ($numObjs < $numInSet) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return round(PHPExcel_Calculation_MathTrig::FACT($numObjs) / PHPExcel_Calculation_MathTrig::FACT($numObjs - $numInSet));
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function PERMUT()
-
-
-	/**
-	 * POISSON
-	 *
-	 * Returns the Poisson distribution. A common application of the Poisson distribution
-	 * is predicting the number of events over a specific time, such as the number of
-	 * cars arriving at a toll plaza in 1 minute.
-	 *
-	 * @param	float		$value
-	 * @param	float		$mean		Mean Value
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function POISSON($value, $mean, $cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-
-		if ((is_numeric($value)) && (is_numeric($mean))) {
-			if (($value <= 0) || ($mean <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					$summer = 0;
-					for ($i = 0; $i <= floor($value); ++$i) {
-						$summer += pow($mean,$i) / PHPExcel_Calculation_MathTrig::FACT($i);
-					}
-					return exp(0-$mean) * $summer;
-				} else {
-					return (exp(0-$mean) * pow($mean,$value)) / PHPExcel_Calculation_MathTrig::FACT($value);
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function POISSON()
-
-
-	/**
-	 * QUARTILE
-	 *
-	 * Returns the quartile of a data set.
-	 *
-	 * Excel Function:
-	 *		QUARTILE(value1[,value2[, ...]],entry)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	int			$entry			Quartile value in the range 1..3, inclusive.
-	 * @return	float
-	 */
-	public static function QUARTILE() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$entry = floor(array_pop($aArgs));
-
-		if ((is_numeric($entry)) && (!is_string($entry))) {
-			$entry /= 4;
-			if (($entry < 0) || ($entry > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return self::PERCENTILE($aArgs,$entry);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function QUARTILE()
-
-
-	/**
-	 * RANK
-	 *
-	 * Returns the rank of a number in a list of numbers.
-	 *
-	 * @param	number				The number whose rank you want to find.
-	 * @param	array of number		An array of, or a reference to, a list of numbers.
-	 * @param	mixed				Order to sort the values in the value set
-	 * @return	float
-	 */
-	public static function RANK($value,$valueSet,$order=0) {
-		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$valueSet = PHPExcel_Calculation_Functions::flattenArray($valueSet);
-		$order	= (is_null($order))	? 0 :	(integer) PHPExcel_Calculation_Functions::flattenSingleValue($order);
-
-		foreach($valueSet as $key => $valueEntry) {
-			if (!is_numeric($valueEntry)) {
-				unset($valueSet[$key]);
-			}
-		}
-
-		if ($order == 0) {
-			rsort($valueSet,SORT_NUMERIC);
-		} else {
-			sort($valueSet,SORT_NUMERIC);
-		}
-		$pos = array_search($value,$valueSet);
-		if ($pos === False) {
-			return PHPExcel_Calculation_Functions::NA();
-		}
-
-		return ++$pos;
-	}	//	function RANK()
-
-
-	/**
-	 * RSQ
-	 *
-	 * Returns the square of the Pearson product moment correlation coefficient through data points in known_y's and known_x's.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function RSQ($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getGoodnessOfFit();
-	}	//	function RSQ()
-
-
-	/**
-	 * SKEW
-	 *
-	 * Returns the skewness of a distribution. Skewness characterizes the degree of asymmetry
-	 * of a distribution around its mean. Positive skewness indicates a distribution with an
-	 * asymmetric tail extending toward more positive values. Negative skewness indicates a
-	 * distribution with an asymmetric tail extending toward more negative values.
-	 *
-	 * @param	array	Data Series
-	 * @return	float
-	 */
-	public static function SKEW() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-		$mean = self::AVERAGE($aArgs);
-		$stdDev = self::STDEV($aArgs);
-
-		$count = $summer = 0;
-		// Loop through arguments
-		foreach ($aArgs as $k => $arg) {
-			if ((is_bool($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-			} else {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$summer += pow((($arg - $mean) / $stdDev),3) ;
-					++$count;
-				}
-			}
-		}
-
-		// Return
-		if ($count > 2) {
-			return $summer * ($count / (($count-1) * ($count-2)));
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function SKEW()
-
-
-	/**
-	 * SLOPE
-	 *
-	 * Returns the slope of the linear regression line through data points in known_y's and known_x's.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function SLOPE($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getSlope();
-	}	//	function SLOPE()
-
-
-	/**
-	 * SMALL
-	 *
-	 * Returns the nth smallest value in a data set. You can use this function to
-	 *		select a value based on its relative standing.
-	 *
-	 * Excel Function:
-	 *		SMALL(value1[,value2[, ...]],entry)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	int			$entry			Position (ordered from the smallest) in the array or range of data to return
-	 * @return	float
-	 */
-	public static function SMALL() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$entry = array_pop($aArgs);
-
-		if ((is_numeric($entry)) && (!is_string($entry))) {
-			$mArgs = array();
-			foreach ($aArgs as $arg) {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$mArgs[] = $arg;
-				}
-			}
-			$count = self::COUNT($mArgs);
-			$entry = floor(--$entry);
-			if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			sort($mArgs);
-			return $mArgs[$entry];
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SMALL()
-
-
-	/**
-	 * STANDARDIZE
-	 *
-	 * Returns a normalized value from a distribution characterized by mean and standard_dev.
-	 *
-	 * @param	float	$value		Value to normalize
-	 * @param	float	$mean		Mean Value
-	 * @param	float	$stdDev		Standard Deviation
-	 * @return	float	Standardized value
-	 */
-	public static function STANDARDIZE($value,$mean,$stdDev) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$mean	= PHPExcel_Calculation_Functions::flattenSingleValue($mean);
-		$stdDev	= PHPExcel_Calculation_Functions::flattenSingleValue($stdDev);
-
-		if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
-			if ($stdDev <= 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			return ($value - $mean) / $stdDev ;
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function STANDARDIZE()
-
-
-	/**
-	 * STDEV
-	 *
-	 * Estimates standard deviation based on a sample. The standard deviation is a measure of how
-	 *		widely values are dispersed from the average value (the mean).
-	 *
-	 * Excel Function:
-	 *		STDEV(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function STDEV() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGE($aArgs);
-		if (!is_null($aMean)) {
-			$aCount = -1;
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-					$arg = (integer) $arg;
-				}
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					if (is_null($returnValue)) {
-						$returnValue = pow(($arg - $aMean),2);
-					} else {
-						$returnValue += pow(($arg - $aMean),2);
-					}
-					++$aCount;
-				}
-			}
-
-			// Return
-			if (($aCount > 0) && ($returnValue >= 0)) {
-				return sqrt($returnValue / $aCount);
-			}
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function STDEV()
-
-
-	/**
-	 * STDEVA
-	 *
-	 * Estimates standard deviation based on a sample, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		STDEVA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function STDEVA() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGEA($aArgs);
-		if (!is_null($aMean)) {
-			$aCount = -1;
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-				} else {
-					// Is it a numeric value?
-					if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
-						if (is_bool($arg)) {
-							$arg = (integer) $arg;
-						} elseif (is_string($arg)) {
-							$arg = 0;
-						}
-						if (is_null($returnValue)) {
-							$returnValue = pow(($arg - $aMean),2);
-						} else {
-							$returnValue += pow(($arg - $aMean),2);
-						}
-						++$aCount;
-					}
-				}
-			}
-
-			// Return
-			if (($aCount > 0) && ($returnValue >= 0)) {
-				return sqrt($returnValue / $aCount);
-			}
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function STDEVA()
-
-
-	/**
-	 * STDEVP
-	 *
-	 * Calculates standard deviation based on the entire population
-	 *
-	 * Excel Function:
-	 *		STDEVP(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function STDEVP() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGE($aArgs);
-		if (!is_null($aMean)) {
-			$aCount = 0;
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					((!PHPExcel_Calculation_Functions::isCellValue($k)) || (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE))) {
-					$arg = (integer) $arg;
-				}
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					if (is_null($returnValue)) {
-						$returnValue = pow(($arg - $aMean),2);
-					} else {
-						$returnValue += pow(($arg - $aMean),2);
-					}
-					++$aCount;
-				}
-			}
-
-			// Return
-			if (($aCount > 0) && ($returnValue >= 0)) {
-				return sqrt($returnValue / $aCount);
-			}
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function STDEVP()
-
-
-	/**
-	 * STDEVPA
-	 *
-	 * Calculates standard deviation based on the entire population, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		STDEVPA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function STDEVPA() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-
-		// Return value
-		$returnValue = null;
-
-		$aMean = self::AVERAGEA($aArgs);
-		if (!is_null($aMean)) {
-			$aCount = 0;
-			foreach ($aArgs as $k => $arg) {
-				if ((is_bool($arg)) &&
-					(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-				} else {
-					// Is it a numeric value?
-					if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
-						if (is_bool($arg)) {
-							$arg = (integer) $arg;
-						} elseif (is_string($arg)) {
-							$arg = 0;
-						}
-						if (is_null($returnValue)) {
-							$returnValue = pow(($arg - $aMean),2);
-						} else {
-							$returnValue += pow(($arg - $aMean),2);
-						}
-						++$aCount;
-					}
-				}
-			}
-
-			// Return
-			if (($aCount > 0) && ($returnValue >= 0)) {
-				return sqrt($returnValue / $aCount);
-			}
-		}
-		return PHPExcel_Calculation_Functions::DIV0();
-	}	//	function STDEVPA()
-
-
-	/**
-	 * STEYX
-	 *
-	 * Returns the standard error of the predicted y-value for each x in the regression.
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @return	float
-	 */
-	public static function STEYX($yValues,$xValues) {
-		if (!self::_checkTrendArrays($yValues,$xValues)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		$yValueCount = count($yValues);
-		$xValueCount = count($xValues);
-
-		if (($yValueCount == 0) || ($yValueCount != $xValueCount)) {
-			return PHPExcel_Calculation_Functions::NA();
-		} elseif ($yValueCount == 1) {
-			return PHPExcel_Calculation_Functions::DIV0();
-		}
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues);
-		return $bestFitLinear->getStdevOfResiduals();
-	}	//	function STEYX()
-
-
-	/**
-	 * TDIST
-	 *
-	 * Returns the probability of Student's T distribution.
-	 *
-	 * @param	float		$value			Value for the function
-	 * @param	float		$degrees		degrees of freedom
-	 * @param	float		$tails			number of tails (1 or 2)
-	 * @return	float
-	 */
-	public static function TDIST($value, $degrees, $tails) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$degrees	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
-		$tails		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($tails));
-
-		if ((is_numeric($value)) && (is_numeric($degrees)) && (is_numeric($tails))) {
-			if (($value < 0) || ($degrees < 1) || ($tails < 1) || ($tails > 2)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			//	tdist, which finds the probability that corresponds to a given value
-			//	of t with k degrees of freedom. This algorithm is translated from a
-			//	pascal function on p81 of "Statistical Computing in Pascal" by D
-			//	Cooke, A H Craven & G M Clark (1985: Edward Arnold (Pubs.) Ltd:
-			//	London). The above Pascal algorithm is itself a translation of the
-			//	fortran algoritm "AS 3" by B E Cooper of the Atlas Computer
-			//	Laboratory as reported in (among other places) "Applied Statistics
-			//	Algorithms", editied by P Griffiths and I D Hill (1985; Ellis
-			//	Horwood Ltd.; W. Sussex, England).
-			$tterm = $degrees;
-			$ttheta = atan2($value,sqrt($tterm));
-			$tc = cos($ttheta);
-			$ts = sin($ttheta);
-			$tsum = 0;
-
-			if (($degrees % 2) == 1) {
-				$ti = 3;
-				$tterm = $tc;
-			} else {
-				$ti = 2;
-				$tterm = 1;
-			}
-
-			$tsum = $tterm;
-			while ($ti < $degrees) {
-				$tterm *= $tc * $tc * ($ti - 1) / $ti;
-				$tsum += $tterm;
-				$ti += 2;
-			}
-			$tsum *= $ts;
-			if (($degrees % 2) == 1) { $tsum = M_2DIVPI * ($tsum + $ttheta); }
-			$tValue = 0.5 * (1 + $tsum);
-			if ($tails == 1) {
-				return 1 - abs($tValue);
-			} else {
-				return 1 - abs((1 - $tValue) - $tValue);
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TDIST()
-
-
-	/**
-	 * TINV
-	 *
-	 * Returns the one-tailed probability of the chi-squared distribution.
-	 *
-	 * @param	float		$probability	Probability for the function
-	 * @param	float		$degrees		degrees of freedom
-	 * @return	float
-	 */
-	public static function TINV($probability, $degrees) {
-		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
-		$degrees		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($degrees));
-
-		if ((is_numeric($probability)) && (is_numeric($degrees))) {
-			$xLo = 100;
-			$xHi = 0;
-
-			$x = $xNew = 1;
-			$dx	= 1;
-			$i = 0;
-
-			while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
-				// Apply Newton-Raphson step
-				$result = self::TDIST($x, $degrees, 2);
-				$error = $result - $probability;
-				if ($error == 0.0) {
-					$dx = 0;
-				} elseif ($error < 0.0) {
-					$xLo = $x;
-				} else {
-					$xHi = $x;
-				}
-				// Avoid division by zero
-				if ($result != 0.0) {
-					$dx = $error / $result;
-					$xNew = $x - $dx;
-				}
-				// If the NR fails to converge (which for example may be the
-				// case if the initial guess is too rough) we apply a bisection
-				// step to determine a more narrow interval around the root.
-				if (($xNew < $xLo) || ($xNew > $xHi) || ($result == 0.0)) {
-					$xNew = ($xLo + $xHi) / 2;
-					$dx = $xNew - $x;
-				}
-				$x = $xNew;
-			}
-			if ($i == MAX_ITERATIONS) {
-				return PHPExcel_Calculation_Functions::NA();
-			}
-			return round($x,12);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TINV()
-
-
-	/**
-	 * TREND
-	 *
-	 * Returns values along a linear trend
-	 *
-	 * @param	array of mixed		Data Series Y
-	 * @param	array of mixed		Data Series X
-	 * @param	array of mixed		Values of X for which we want to find Y
-	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 * @return	array of float
-	 */
-	public static function TREND($yValues,$xValues=array(),$newValues=array(),$const=True) {
-		$yValues = PHPExcel_Calculation_Functions::flattenArray($yValues);
-		$xValues = PHPExcel_Calculation_Functions::flattenArray($xValues);
-		$newValues = PHPExcel_Calculation_Functions::flattenArray($newValues);
-		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
-
-		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues,$const);
-		if (empty($newValues)) {
-			$newValues = $bestFitLinear->getXValues();
-		}
-
-		$returnArray = array();
-		foreach($newValues as $xValue) {
-			$returnArray[0][] = $bestFitLinear->getValueOfYForX($xValue);
-		}
-
-		return $returnArray;
-	}	//	function TREND()
-
-
-	/**
-	 * TRIMMEAN
-	 *
-	 * Returns the mean of the interior of a data set. TRIMMEAN calculates the mean
-	 *		taken by excluding a percentage of data points from the top and bottom tails
-	 *		of a data set.
-	 *
-	 * Excel Function:
-	 *		TRIMEAN(value1[,value2[, ...]],$discard)
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @param	float		$discard		Percentage to discard
-	 * @return	float
-	 */
-	public static function TRIMMEAN() {
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-
-		// Calculate
-		$percent = array_pop($aArgs);
-
-		if ((is_numeric($percent)) && (!is_string($percent))) {
-			if (($percent < 0) || ($percent > 1)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			$mArgs = array();
-			foreach ($aArgs as $arg) {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) && (!is_string($arg))) {
-					$mArgs[] = $arg;
-				}
-			}
-			$discard = floor(self::COUNT($mArgs) * $percent / 2);
-			sort($mArgs);
-			for ($i=0; $i < $discard; ++$i) {
-				array_pop($mArgs);
-				array_shift($mArgs);
-			}
-			return self::AVERAGE($mArgs);
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TRIMMEAN()
-
-
-	/**
-	 * VARFunc
-	 *
-	 * Estimates variance based on a sample.
-	 *
-	 * Excel Function:
-	 *		VAR(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function VARFunc() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::DIV0();
-
-		$summerA = $summerB = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$aCount = 0;
-		foreach ($aArgs as $arg) {
-			if (is_bool($arg)) { $arg = (integer) $arg; }
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$summerA += ($arg * $arg);
-				$summerB += $arg;
-				++$aCount;
-			}
-		}
-
-		// Return
-		if ($aCount > 1) {
-			$summerA *= $aCount;
-			$summerB *= $summerB;
-			$returnValue = ($summerA - $summerB) / ($aCount * ($aCount - 1));
-		}
-		return $returnValue;
-	}	//	function VARFunc()
-
-
-	/**
-	 * VARA
-	 *
-	 * Estimates variance based on a sample, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		VARA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function VARA() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::DIV0();
-
-		$summerA = $summerB = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-		$aCount = 0;
-		foreach ($aArgs as $k => $arg) {
-			if ((is_string($arg)) &&
-				(PHPExcel_Calculation_Functions::isValue($k))) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			} elseif ((is_string($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-			} else {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
-					if (is_bool($arg)) {
-						$arg = (integer) $arg;
-					} elseif (is_string($arg)) {
-						$arg = 0;
-					}
-					$summerA += ($arg * $arg);
-					$summerB += $arg;
-					++$aCount;
-				}
-			}
-		}
-
-		// Return
-		if ($aCount > 1) {
-			$summerA *= $aCount;
-			$summerB *= $summerB;
-			$returnValue = ($summerA - $summerB) / ($aCount * ($aCount - 1));
-		}
-		return $returnValue;
-	}	//	function VARA()
-
-
-	/**
-	 * VARP
-	 *
-	 * Calculates variance based on the entire population
-	 *
-	 * Excel Function:
-	 *		VARP(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function VARP() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::DIV0();
-
-		$summerA = $summerB = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$aCount = 0;
-		foreach ($aArgs as $arg) {
-			if (is_bool($arg)) { $arg = (integer) $arg; }
-			// Is it a numeric value?
-			if ((is_numeric($arg)) && (!is_string($arg))) {
-				$summerA += ($arg * $arg);
-				$summerB += $arg;
-				++$aCount;
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			$summerA *= $aCount;
-			$summerB *= $summerB;
-			$returnValue = ($summerA - $summerB) / ($aCount * $aCount);
-		}
-		return $returnValue;
-	}	//	function VARP()
-
-
-	/**
-	 * VARPA
-	 *
-	 * Calculates variance based on the entire population, including numbers, text, and logical values
-	 *
-	 * Excel Function:
-	 *		VARPA(value1[,value2[, ...]])
-	 *
-	 * @access	public
-	 * @category Statistical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	float
-	 */
-	public static function VARPA() {
-		// Return value
-		$returnValue = PHPExcel_Calculation_Functions::DIV0();
-
-		$summerA = $summerB = 0;
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
-		$aCount = 0;
-		foreach ($aArgs as $k => $arg) {
-			if ((is_string($arg)) &&
-				(PHPExcel_Calculation_Functions::isValue($k))) {
-				return PHPExcel_Calculation_Functions::VALUE();
-			} elseif ((is_string($arg)) &&
-				(!PHPExcel_Calculation_Functions::isMatrixValue($k))) {
-			} else {
-				// Is it a numeric value?
-				if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
-					if (is_bool($arg)) {
-						$arg = (integer) $arg;
-					} elseif (is_string($arg)) {
-						$arg = 0;
-					}
-					$summerA += ($arg * $arg);
-					$summerB += $arg;
-					++$aCount;
-				}
-			}
-		}
-
-		// Return
-		if ($aCount > 0) {
-			$summerA *= $aCount;
-			$summerB *= $summerB;
-			$returnValue = ($summerA - $summerB) / ($aCount * $aCount);
-		}
-		return $returnValue;
-	}	//	function VARPA()
-
-
-	/**
-	 * WEIBULL
-	 *
-	 * Returns the Weibull distribution. Use this distribution in reliability
-	 * analysis, such as calculating a device's mean time to failure.
-	 *
-	 * @param	float		$value
-	 * @param	float		$alpha		Alpha Parameter
-	 * @param	float		$beta		Beta Parameter
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function WEIBULL($value, $alpha, $beta, $cumulative) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$alpha	= PHPExcel_Calculation_Functions::flattenSingleValue($alpha);
-		$beta	= PHPExcel_Calculation_Functions::flattenSingleValue($beta);
-
-		if ((is_numeric($value)) && (is_numeric($alpha)) && (is_numeric($beta))) {
-			if (($value < 0) || ($alpha <= 0) || ($beta <= 0)) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
-			if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
-				if ($cumulative) {
-					return 1 - exp(0 - pow($value / $beta,$alpha));
-				} else {
-					return ($alpha / pow($beta,$alpha)) * pow($value,$alpha - 1) * exp(0 - pow($value / $beta,$alpha));
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function WEIBULL()
-
-
-	/**
-	 * ZTEST
-	 *
-	 * Returns the Weibull distribution. Use this distribution in reliability
-	 * analysis, such as calculating a device's mean time to failure.
-	 *
-	 * @param	float		$value
-	 * @param	float		$alpha		Alpha Parameter
-	 * @param	float		$beta		Beta Parameter
-	 * @param	boolean		$cumulative
-	 * @return	float
-	 *
-	 */
-	public static function ZTEST($dataSet, $m0, $sigma=null) {
-		$dataSet	= PHPExcel_Calculation_Functions::flattenArrayIndexed($dataSet);
-		$m0			= PHPExcel_Calculation_Functions::flattenSingleValue($m0);
-		$sigma		= PHPExcel_Calculation_Functions::flattenSingleValue($sigma);
-
-		if (is_null($sigma)) {
-			$sigma = self::STDEV($dataSet);
-		}
-		$n = count($dataSet);
-
-		return 1 - self::NORMSDIST((self::AVERAGE($dataSet) - $m0)/($sigma/SQRT($n)));
-	}	//	function ZTEST()
-
-}	//	class PHPExcel_Calculation_Statistical
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/TextData.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/TextData.php
deleted file mode 100755
index 3c3ed22a7..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/TextData.php
+++ /dev/null
@@ -1,598 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_TextData
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_TextData {
-
-	private static $_invalidChars = Null;
-
-	private static function _uniord($c) {
-		if (ord($c{0}) >=0 && ord($c{0}) <= 127)
-			return ord($c{0});
-		if (ord($c{0}) >= 192 && ord($c{0}) <= 223)
-			return (ord($c{0})-192)*64 + (ord($c{1})-128);
-		if (ord($c{0}) >= 224 && ord($c{0}) <= 239)
-			return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128);
-		if (ord($c{0}) >= 240 && ord($c{0}) <= 247)
-			return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128);
-		if (ord($c{0}) >= 248 && ord($c{0}) <= 251)
-			return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128);
-		if (ord($c{0}) >= 252 && ord($c{0}) <= 253)
-			return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128);
-		if (ord($c{0}) >= 254 && ord($c{0}) <= 255) //error
-			return PHPExcel_Calculation_Functions::VALUE();
-		return 0;
-	}	//	function _uniord()
-
-	/**
-	 * CHARACTER
-	 *
-	 * @param	string	$character	Value
-	 * @return	int
-	 */
-	public static function CHARACTER($character) {
-		$character	= PHPExcel_Calculation_Functions::flattenSingleValue($character);
-
-		if ((!is_numeric($character)) || ($character < 0)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (function_exists('mb_convert_encoding')) {
-			return mb_convert_encoding('&#'.intval($character).';', 'UTF-8', 'HTML-ENTITIES');
-		} else {
-			return chr(intval($character));
-		}
-	}
-
-
-	/**
-	 * TRIMNONPRINTABLE
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	string
-	 */
-	public static function TRIMNONPRINTABLE($stringValue = '') {
-		$stringValue	= PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
-
-		if (is_bool($stringValue)) {
-			return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (self::$_invalidChars == Null) {
-			self::$_invalidChars = range(chr(0),chr(31));
-		}
-
-		if (is_string($stringValue) || is_numeric($stringValue)) {
-			return str_replace(self::$_invalidChars,'',trim($stringValue,"\x00..\x1F"));
-		}
-		return NULL;
-	}	//	function TRIMNONPRINTABLE()
-
-
-	/**
-	 * TRIMSPACES
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	string
-	 */
-	public static function TRIMSPACES($stringValue = '') {
-		$stringValue	= PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
-
-		if (is_bool($stringValue)) {
-			return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (is_string($stringValue) || is_numeric($stringValue)) {
-			return trim(preg_replace('/ +/',' ',trim($stringValue,' ')));
-		}
-		return NULL;
-	}	//	function TRIMSPACES()
-
-
-	/**
-	 * ASCIICODE
-	 *
-	 * @param	string	$character	Value
-	 * @return	int
-	 */
-	public static function ASCIICODE($characters) {
-		if (($characters === NULL) || ($characters === ''))
-			return PHPExcel_Calculation_Functions::VALUE();
-		$characters	= PHPExcel_Calculation_Functions::flattenSingleValue($characters);
-		if (is_bool($characters)) {
-			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$characters = (int) $characters;
-			} else {
-				$characters = ($characters) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-			}
-		}
-
-		$character = $characters;
-		if ((function_exists('mb_strlen')) && (function_exists('mb_substr'))) {
-			if (mb_strlen($characters, 'UTF-8') > 1) { $character = mb_substr($characters, 0, 1, 'UTF-8'); }
-			return self::_uniord($character);
-		} else {
-			if (strlen($characters) > 0) { $character = substr($characters, 0, 1); }
-			return ord($character);
-		}
-	}	//	function ASCIICODE()
-
-
-	/**
-	 * CONCATENATE
-	 *
-	 * @return	string
-	 */
-	public static function CONCATENATE() {
-		// Return value
-		$returnValue = '';
-
-		// Loop through arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		foreach ($aArgs as $arg) {
-			if (is_bool($arg)) {
-				if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-					$arg = (int) $arg;
-				} else {
-					$arg = ($arg) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-				}
-			}
-			$returnValue .= $arg;
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function CONCATENATE()
-
-
-	/**
-	 * DOLLAR
-	 *
-	 * This function converts a number to text using currency format, with the decimals rounded to the specified place.
-	 * The format used is $#,##0.00_);($#,##0.00)..
-	 *
-	 * @param	float	$value			The value to format
-	 * @param	int		$decimals		The number of digits to display to the right of the decimal point.
-	 *									If decimals is negative, number is rounded to the left of the decimal point.
-	 *									If you omit decimals, it is assumed to be 2
-	 * @return	string
-	 */
-	public static function DOLLAR($value = 0, $decimals = 2) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$decimals	= is_null($decimals) ? 0 : PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
-
-		// Validate parameters
-		if (!is_numeric($value) || !is_numeric($decimals)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$decimals = floor($decimals);
-
-		if ($decimals > 0) {
-			return money_format('%.'.$decimals.'n',$value);
-		} else {
-			$round = pow(10,abs($decimals));
-			if ($value < 0) { $round = 0-$round; }
-			$value = PHPExcel_Calculation_MathTrig::MROUND($value,$round);
-			//	The implementation of money_format used if the standard PHP function is not available can't handle decimal places of 0,
-			//		so we display to 1 dp and chop off that character and the decimal separator using substr
-			return substr(money_format('%.1n',$value),0,-2);
-		}
-	}	//	function DOLLAR()
-
-
-	/**
-	 * SEARCHSENSITIVE
-	 *
-	 * @param	string	$needle		The string to look for
-	 * @param	string	$haystack	The string in which to look
-	 * @param	int		$offset		Offset within $haystack
-	 * @return	string
-	 */
-	public static function SEARCHSENSITIVE($needle,$haystack,$offset=1) {
-		$needle		= PHPExcel_Calculation_Functions::flattenSingleValue($needle);
-		$haystack	= PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
-		$offset		= PHPExcel_Calculation_Functions::flattenSingleValue($offset);
-
-		if (!is_bool($needle)) {
-			if (is_bool($haystack)) {
-				$haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-			}
-
-			if (($offset > 0) && (PHPExcel_Shared_String::CountCharacters($haystack) > $offset)) {
-				if (PHPExcel_Shared_String::CountCharacters($needle) == 0) {
-					return $offset;
-				}
-				if (function_exists('mb_strpos')) {
-					$pos = mb_strpos($haystack, $needle, --$offset, 'UTF-8');
-				} else {
-					$pos = strpos($haystack, $needle, --$offset);
-				}
-				if ($pos !== false) {
-					return ++$pos;
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SEARCHSENSITIVE()
-
-
-	/**
-	 * SEARCHINSENSITIVE
-	 *
-	 * @param	string	$needle		The string to look for
-	 * @param	string	$haystack	The string in which to look
-	 * @param	int		$offset		Offset within $haystack
-	 * @return	string
-	 */
-	public static function SEARCHINSENSITIVE($needle,$haystack,$offset=1) {
-		$needle		= PHPExcel_Calculation_Functions::flattenSingleValue($needle);
-		$haystack	= PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
-		$offset		= PHPExcel_Calculation_Functions::flattenSingleValue($offset);
-
-		if (!is_bool($needle)) {
-			if (is_bool($haystack)) {
-				$haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-			}
-
-			if (($offset > 0) && (PHPExcel_Shared_String::CountCharacters($haystack) > $offset)) {
-				if (PHPExcel_Shared_String::CountCharacters($needle) == 0) {
-					return $offset;
-				}
-				if (function_exists('mb_stripos')) {
-					$pos = mb_stripos($haystack, $needle, --$offset,'UTF-8');
-				} else {
-					$pos = stripos($haystack, $needle, --$offset);
-				}
-				if ($pos !== false) {
-					return ++$pos;
-				}
-			}
-		}
-		return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SEARCHINSENSITIVE()
-
-
-	/**
-	 * FIXEDFORMAT
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function FIXEDFORMAT($value, $decimals = 2, $no_commas = FALSE) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$decimals	= PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
-		$no_commas	= PHPExcel_Calculation_Functions::flattenSingleValue($no_commas);
-
-		// Validate parameters
-		if (!is_numeric($value) || !is_numeric($decimals)) {
-			return PHPExcel_Calculation_Functions::NaN();
-		}
-		$decimals = floor($decimals);
-
-		$valueResult = round($value,$decimals);
-		if ($decimals < 0) { $decimals = 0; }
-		if (!$no_commas) {
-			$valueResult = number_format($valueResult,$decimals);
-		}
-
-		return (string) $valueResult;
-	}	//	function FIXEDFORMAT()
-
-
-	/**
-	 * LEFT
-	 *
-	 * @param	string	$value	Value
-	 * @param	int		$chars	Number of characters
-	 * @return	string
-	 */
-	public static function LEFT($value = '', $chars = 1) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$chars		= PHPExcel_Calculation_Functions::flattenSingleValue($chars);
-
-		if ($chars < 0) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (is_bool($value)) {
-			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (function_exists('mb_substr')) {
-			return mb_substr($value, 0, $chars, 'UTF-8');
-		} else {
-			return substr($value, 0, $chars);
-		}
-	}	//	function LEFT()
-
-
-	/**
-	 * MID
-	 *
-	 * @param	string	$value	Value
-	 * @param	int		$start	Start character
-	 * @param	int		$chars	Number of characters
-	 * @return	string
-	 */
-	public static function MID($value = '', $start = 1, $chars = null) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$start		= PHPExcel_Calculation_Functions::flattenSingleValue($start);
-		$chars		= PHPExcel_Calculation_Functions::flattenSingleValue($chars);
-
-		if (($start < 1) || ($chars < 0)) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (is_bool($value)) {
-			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (function_exists('mb_substr')) {
-			return mb_substr($value, --$start, $chars, 'UTF-8');
-		} else {
-			return substr($value, --$start, $chars);
-		}
-	}	//	function MID()
-
-
-	/**
-	 * RIGHT
-	 *
-	 * @param	string	$value	Value
-	 * @param	int		$chars	Number of characters
-	 * @return	string
-	 */
-	public static function RIGHT($value = '', $chars = 1) {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$chars		= PHPExcel_Calculation_Functions::flattenSingleValue($chars);
-
-		if ($chars < 0) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-
-		if (is_bool($value)) {
-			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if ((function_exists('mb_substr')) && (function_exists('mb_strlen'))) {
-			return mb_substr($value, mb_strlen($value, 'UTF-8') - $chars, $chars, 'UTF-8');
-		} else {
-			return substr($value, strlen($value) - $chars);
-		}
-	}	//	function RIGHT()
-
-
-	/**
-	 * STRINGLENGTH
-	 *
-	 * @param	string	$value	Value
-	 * @param	int		$chars	Number of characters
-	 * @return	string
-	 */
-	public static function STRINGLENGTH($value = '') {
-		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-
-		if (is_bool($value)) {
-			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (function_exists('mb_strlen')) {
-			return mb_strlen($value, 'UTF-8');
-		} else {
-			return strlen($value);
-		}
-	}	//	function STRINGLENGTH()
-
-
-	/**
-	 * LOWERCASE
-	 *
-	 * Converts a string value to upper case.
-	 *
-	 * @param	string		$mixedCaseString
-	 * @return	string
-	 */
-	public static function LOWERCASE($mixedCaseString) {
-		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
-
-		if (is_bool($mixedCaseString)) {
-			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (function_exists('mb_convert_case')) {
-			return mb_convert_case($mixedCaseString, MB_CASE_LOWER, 'UTF-8');
-		} else {
-			return strtoupper($mixedCaseString);
-		}
-	}	//	function LOWERCASE()
-
-
-	/**
-	 * UPPERCASE
-	 *
-	 * Converts a string value to upper case.
-	 *
-	 * @param	string		$mixedCaseString
-	 * @return	string
-	 */
-	public static function UPPERCASE($mixedCaseString) {
-		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
-
-		if (is_bool($mixedCaseString)) {
-			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (function_exists('mb_convert_case')) {
-			return mb_convert_case($mixedCaseString, MB_CASE_UPPER, 'UTF-8');
-		} else {
-			return strtoupper($mixedCaseString);
-		}
-	}	//	function UPPERCASE()
-
-
-	/**
-	 * PROPERCASE
-	 *
-	 * Converts a string value to upper case.
-	 *
-	 * @param	string		$mixedCaseString
-	 * @return	string
-	 */
-	public static function PROPERCASE($mixedCaseString) {
-		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
-
-		if (is_bool($mixedCaseString)) {
-			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
-		}
-
-		if (function_exists('mb_convert_case')) {
-			return mb_convert_case($mixedCaseString, MB_CASE_TITLE, 'UTF-8');
-		} else {
-			return ucwords($mixedCaseString);
-		}
-	}	//	function PROPERCASE()
-
-
-	/**
-	 * REPLACE
-	 *
-	 * @param	string	$value	Value
-	 * @param	int		$start	Start character
-	 * @param	int		$chars	Number of characters
-	 * @return	string
-	 */
-	public static function REPLACE($oldText = '', $start = 1, $chars = null, $newText) {
-		$oldText	= PHPExcel_Calculation_Functions::flattenSingleValue($oldText);
-		$start		= PHPExcel_Calculation_Functions::flattenSingleValue($start);
-		$chars		= PHPExcel_Calculation_Functions::flattenSingleValue($chars);
-		$newText	= PHPExcel_Calculation_Functions::flattenSingleValue($newText);
-
-		$left = self::LEFT($oldText,$start-1);
-		$right = self::RIGHT($oldText,self::STRINGLENGTH($oldText)-($start+$chars)+1);
-
-		return $left.$newText.$right;
-	}	//	function REPLACE()
-
-
-	/**
-	 * SUBSTITUTE
-	 *
-	 * @param	string	$text		Value
-	 * @param	string	$fromText	From Value
-	 * @param	string	$toText		To Value
-	 * @param	integer	$instance	Instance Number
-	 * @return	string
-	 */
-	public static function SUBSTITUTE($text = '', $fromText = '', $toText = '', $instance = 0) {
-		$text		= PHPExcel_Calculation_Functions::flattenSingleValue($text);
-		$fromText	= PHPExcel_Calculation_Functions::flattenSingleValue($fromText);
-		$toText		= PHPExcel_Calculation_Functions::flattenSingleValue($toText);
-		$instance	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($instance));
-
-		if ($instance == 0) {
-			if(function_exists('mb_str_replace')) {
-				return mb_str_replace($fromText,$toText,$text);
-			} else {
-				return str_replace($fromText,$toText,$text);
-			}
-		} else {
-			$pos = -1;
-			while($instance > 0) {
-				if (function_exists('mb_strpos')) {
-					$pos = mb_strpos($text, $fromText, $pos+1, 'UTF-8');
-				} else {
-					$pos = strpos($text, $fromText, $pos+1);
-				}
-				if ($pos === false) {
-					break;
-				}
-				--$instance;
-			}
-			if ($pos !== false) {
-				if (function_exists('mb_strlen')) {
-					return self::REPLACE($text,++$pos,mb_strlen($fromText, 'UTF-8'),$toText);
-				} else {
-					return self::REPLACE($text,++$pos,strlen($fromText),$toText);
-				}
-			}
-		}
-
-		return $text;
-	}	//	function SUBSTITUTE()
-
-
-	/**
-	 * RETURNSTRING
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function RETURNSTRING($testValue = '') {
-		$testValue	= PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
-
-		if (is_string($testValue)) {
-			return $testValue;
-		}
-		return Null;
-	}	//	function RETURNSTRING()
-
-
-	/**
-	 * TEXTFORMAT
-	 *
-	 * @param	mixed	$value	Value to check
-	 * @return	boolean
-	 */
-	public static function TEXTFORMAT($value,$format) {
-		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$format	= PHPExcel_Calculation_Functions::flattenSingleValue($format);
-
-		if ((is_string($value)) && (!is_numeric($value)) && PHPExcel_Shared_Date::isDateTimeFormatCode($format)) {
-			$value = PHPExcel_Calculation_DateTime::DATEVALUE($value);
-		}
-
-		return (string) PHPExcel_Style_NumberFormat::toFormattedString($value,$format);
-	}	//	function TEXTFORMAT()
-
-}	//	class PHPExcel_Calculation_TextData
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/Token/Stack.php b/plugins/exportTypes/Excel/PHPExcel/Calculation/Token/Stack.php
deleted file mode 100755
index 081a38dca..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/Token/Stack.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-class PHPExcel_Calculation_Token_Stack {
-
-	private $_stack = array();
-	private $_count = 0;
-
-
-	public function count() {
-		return $this->_count;
-	}	//	function count()
-
-
-	public function push($type,$value,$reference=null) {
-		$this->_stack[$this->_count++] = array('type'		=> $type,
-											   'value'		=> $value,
-											   'reference'	=> $reference
-											  );
-		if ($type == 'Function') {
-			$localeFunction = PHPExcel_Calculation::_localeFunc($value);
-			if ($localeFunction != $value) {
-				$this->_stack[($this->_count - 1)]['localeValue'] = $localeFunction;
-			}
-		}
-	}	//	function push()
-
-
-	public function pop() {
-		if ($this->_count > 0) {
-			return $this->_stack[--$this->_count];
-		}
-		return null;
-	}	//	function pop()
-
-
-	public function last($n=1) {
-		if ($this->_count-$n < 0) {
-			return null;
-		}
-		return $this->_stack[$this->_count-$n];
-	}	//	function last()
-
-
-	function __construct() {
-	}
-
-}	//	class PHPExcel_Calculation_Token_Stack
diff --git a/plugins/exportTypes/Excel/PHPExcel/Calculation/functionlist.txt b/plugins/exportTypes/Excel/PHPExcel/Calculation/functionlist.txt
deleted file mode 100755
index 67dbd49cf..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Calculation/functionlist.txt
+++ /dev/null
@@ -1,351 +0,0 @@
-ABS
-ACCRINT
-ACCRINTM
-ACOS
-ACOSH
-ADDRESS
-AMORDEGRC
-AMORLINC
-AND
-AREAS
-ASC
-ASIN
-ASINH
-ATAN
-ATAN2
-ATANH
-AVEDEV
-AVERAGE
-AVERAGEA
-AVERAGEIF
-AVERAGEIFS
-BAHTTEXT
-BESSELI
-BESSELJ
-BESSELK
-BESSELY
-BETADIST
-BETAINV
-BIN2DEC
-BIN2HEX
-BIN2OCT
-BINOMDIST
-CEILING
-CELL
-CHAR
-CHIDIST
-CHIINV
-CHITEST
-CHOOSE
-CLEAN
-CODE
-COLUMN
-COLUMNS
-COMBIN
-COMPLEX
-CONCATENATE
-CONFIDENCE
-CONVERT
-CORREL
-COS
-COSH
-COUNT
-COUNTA
-COUNTBLANK
-COUNTIF
-COUNTIFS
-COUPDAYBS
-COUPDAYBS
-COUPDAYSNC
-COUPNCD
-COUPNUM
-COUPPCD
-COVAR
-CRITBINOM
-CUBEKPIMEMBER
-CUBEMEMBER
-CUBEMEMBERPROPERTY
-CUBERANKEDMEMBER
-CUBESET
-CUBESETCOUNT
-CUBEVALUE
-CUMIPMT
-CUMPRINC
-DATE
-DATEDIF
-DATEVALUE
-DAVERAGE
-DAY
-DAYS360
-DB
-DCOUNT
-DCOUNTA
-DDB
-DEC2BIN
-DEC2HEX
-DEC2OCT
-DEGREES
-DELTA
-DEVSQ
-DGET
-DISC
-DMAX
-DMIN
-DOLLAR
-DOLLARDE
-DOLLARFR
-DPRODUCT
-DSTDEV
-DSTDEVP
-DSUM
-DURATION
-DVAR
-DVARP
-EDATE
-EFFECT
-EOMONTH
-ERF
-ERFC
-ERROR.TYPE
-EVEN
-EXACT
-EXP
-EXPONDIST
-FACT
-FACTDOUBLE
-FALSE
-FDIST
-FIND
-FINDB
-FINV
-FISHER
-FISHERINV
-FIXED
-FLOOR
-FORECAST
-FREQUENCY
-FTEST
-FV
-FVSCHEDULE
-GAMAMDIST
-GAMMAINV
-GAMMALN
-GCD
-GEOMEAN
-GESTEP
-GETPIVOTDATA
-GROWTH
-HARMEAN
-HEX2BIN
-HEX2OCT
-HLOOKUP
-HOUR
-HYPERLINK
-HYPGEOMDIST
-IF
-IFERROR
-IMABS
-IMAGINARY
-IMARGUMENT
-IMCONJUGATE
-IMCOS
-IMEXP
-IMLN
-IMLOG10
-IMLOG2
-IMPOWER
-IMPRODUCT
-IMREAL
-IMSIN
-IMSQRT
-IMSUB
-IMSUM
-INDEX
-INDIRECT
-INFO
-INT
-INTERCEPT
-INTRATE
-IPMT
-IRR
-ISBLANK
-ISERR
-ISERROR
-ISEVEN
-ISLOGICAL
-ISNA
-ISNONTEXT
-ISNUMBER
-ISODD
-ISPMT
-ISREF
-ISTEXT
-JIS
-KURT
-LARGE
-LCM
-LEFT
-LEFTB
-LEN
-LENB
-LINEST
-LN
-LOG
-LOG10
-LOGEST
-LOGINV
-LOGNORMDIST
-LOOKUP
-LOWER
-MATCH
-MAX
-MAXA
-MDETERM
-MDURATION
-MEDIAN
-MID
-MIDB
-MIN
-MINA
-MINUTE
-MINVERSE
-MIRR
-MMULT
-MOD
-MODE
-MONTH
-MROUND
-MULTINOMIAL
-N
-NA
-NEGBINOMDIST
-NETWORKDAYS
-NOMINAL
-NORMDIST
-NORMINV
-NORMSDIST
-NORMSINV
-NOT
-NOW
-NPER
-NPV
-OCT2BIN
-OCT2DEC
-OCT2HEX
-ODD
-ODDFPRICE
-ODDFYIELD
-ODDLPRICE
-ODDLYIELD
-OFFSET
-OR
-PEARSON
-PERCENTILE
-PERCENTRANK
-PERMUT
-PHONETIC
-PI
-PMT
-POISSON
-POWER
-PPMT
-PRICE
-PRICEDISC
-PRICEMAT
-PROB
-PRODUCT
-PROPER
-PV
-QUARTILE
-QUOTIENT
-RADIANS
-RAND
-RANDBETWEEN
-RANK
-RATE
-RECEIVED
-REPLACE
-REPLACEB
-REPT
-RIGHT
-RIGHTB
-ROMAN
-ROUND
-ROUNDDOWN
-ROUNDUP
-ROW
-ROWS
-RSQ
-RTD
-SEARCH
-SEARCHB
-SECOND
-SERIESSUM
-SIGN
-SIN
-SINH
-SKEW
-SLN
-SLOPE
-SMALL
-SQRT
-SQRTPI
-STANDARDIZE
-STDEV
-STDEVA
-STDEVP
-STDEVPA
-STEYX
-SUBSTITUTE
-SUBTOTAL
-SUM
-SUMIF
-SUMIFS
-SUMPRODUCT
-SUMSQ
-SUMX2MY2
-SUMX2PY2
-SUMXMY2
-SYD
-T
-TAN
-TANH
-TBILLEQ
-TBILLPRICE
-TBILLYIELD
-TDIST
-TEXT
-TIME
-TIMEVALUE
-TINV
-TODAY
-TRANSPOSE
-TREND
-TRIM
-TRIMMEAN
-TRUE
-TRUNC
-TTEST
-TYPE
-UPPER
-USDOLLAR
-VALUE
-VAR
-VARA
-VARP
-VARPA
-VDB
-VERSION
-VLOOKUP
-WEEKDAY
-WEEKNUM
-WEIBULL
-WORKDAY
-XIRR
-XNPV
-YEAR
-YEARFRAC
-YIELD
-YIELDDISC
-YIELDMAT
-ZTEST
diff --git a/plugins/exportTypes/Excel/PHPExcel/Cell.php b/plugins/exportTypes/Excel/PHPExcel/Cell.php
deleted file mode 100755
index d858c8a78..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Cell.php
+++ /dev/null
@@ -1,972 +0,0 @@
-<?php
-/**
- *	PHPExcel
- *
- *	Copyright (c) 2006 - 2012 PHPExcel
- *
- *	This library is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation; either
- *	version 2.1 of the License, or (at your option) any later version.
- *
- *	This library is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *	Lesser General Public License for more details.
- *
- *	You should have received a copy of the GNU Lesser General Public
- *	License along with this library; if not, write to the Free Software
- *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *	@category	PHPExcel
- *	@package	PHPExcel_Cell
- *	@copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- *	@license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- *	@version	##VERSION##, ##DATE##
- */
-
-
-/**
- *	PHPExcel_Cell
- *
- *	@category   PHPExcel
- *	@package	PHPExcel_Cell
- *	@copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell
-{
-
-	/**
-	 *  Default range variable constant
-	 *
-	 *  @var  string
-	 */
-	const DEFAULT_RANGE = 'A1:A1';
-
-	/**
-	 *	Value binder to use
-	 *
-	 *	@var	PHPExcel_Cell_IValueBinder
-	 */
-	private static $_valueBinder = NULL;
-
-	/**
-	 *	Column of the cell
-	 *
-	 *	@var	string
-	 */
-	private $_column;
-
-	/**
-	 *	Row of the cell
-	 *
-	 *	@var	int
-	 */
-	private $_row;
-
-	/**
-	 *	Value of the cell
-	 *
-	 *	@var	mixed
-	 */
-	private $_value;
-
-	/**
-	 *	Calculated value of the cell (used for caching)
-	 *	This returns the value last calculated by MS Excel or whichever spreadsheet program was used to
-	 *		create the original spreadsheet file.
-	 *	Note that this value is not guaranteed to reflect the actual calculated value because it is
-	 *		possible that auto-calculation was disabled in the original spreadsheet, and underlying data
-	 *		values used by the formula have changed since it was last calculated.
-	 *
-	 *	@var mixed
-	 */
-	private $_calculatedValue = NULL;
-
-	/**
-	 *	Type of the cell data
-	 *
-	 *	@var	string
-	 */
-	private $_dataType;
-
-	/**
-	 *	Parent worksheet
-	 *
-	 *	@var	PHPExcel_Worksheet
-	 */
-	private $_parent;
-
-	/**
-	 *	Index to cellXf
-	 *
-	 *	@var	int
-	 */
-	private $_xfIndex;
-
-	/**
-	 *	Attributes of the formula
-	 *
-	 */
-	private $_formulaAttributes;
-
-
-	/**
-	 *	Send notification to the cache controller
-	 *
-	 *	@return void
-	 **/
-	public function notifyCacheController() {
-		$this->_parent->getCellCacheController()->updateCacheData($this);
-		return $this;
-	}
-
-	public function detach() {
-		$this->_parent = NULL;
-	}
-
-	public function attach($parent) {
-		$this->_parent = $parent;
-	}
-
-
-	/**
-	 *	Create a new Cell
-	 *
-	 *	@param	string				$pColumn
-	 *	@param	int					$pRow
-	 *	@param	mixed				$pValue
-	 *	@param	string				$pDataType
-	 *	@param	PHPExcel_Worksheet	$pSheet
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function __construct($pColumn = 'A', $pRow = 1, $pValue = NULL, $pDataType = NULL, PHPExcel_Worksheet $pSheet = NULL)
-	{
-		// Initialise cell coordinate
-		$this->_column = strtoupper($pColumn);
-		$this->_row = $pRow;
-
-		// Initialise cell value
-		$this->_value = $pValue;
-
-		// Set worksheet
-		$this->_parent = $pSheet;
-
-		// Set datatype?
-		if ($pDataType !== NULL) {
-			if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2)
-				$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
-			$this->_dataType = $pDataType;
-		} else {
-			if (!self::getValueBinder()->bindValue($this, $pValue)) {
-				throw new PHPExcel_Exception("Value could not be bound to cell.");
-			}
-		}
-
-		// set default index to cellXf
-		$this->_xfIndex = 0;
-	}
-
-	/**
-	 *	Get cell coordinate column
-	 *
-	 *	@return	string
-	 */
-	public function getColumn()
-	{
-		return $this->_column;
-	}
-
-	/**
-	 *	Get cell coordinate row
-	 *
-	 *	@return	int
-	 */
-	public function getRow()
-	{
-		return $this->_row;
-	}
-
-	/**
-	 *	Get cell coordinate
-	 *
-	 *	@return	string
-	 */
-	public function getCoordinate()
-	{
-		return $this->_column . $this->_row;
-	}
-
-	/**
-	 *	Get cell value
-	 *
-	 *	@return	mixed
-	 */
-	public function getValue()
-	{
-		return $this->_value;
-	}
-
-	/**
-	 *	Get cell value with formatting
-	 *
-	 *	@return	string
-	 */
-	public function getFormattedValue()
-	{
-		return (string) PHPExcel_Style_NumberFormat::toFormattedString(
-				$this->getCalculatedValue(),
-				$this->_parent->getParent()->getCellXfByIndex($this->getXfIndex())
-					->getNumberFormat()->getFormatCode()
-			);
-	}
-
-	/**
-	 *	Set cell value
-	 *
-	 *	Sets the value for a cell, automatically determining the datatype using the value binder
-	 *
-	 *	@param	mixed	$pValue					Value
-	 *	@return	PHPExcel_Cell
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function setValue($pValue = NULL)
-	{
-		if (!self::getValueBinder()->bindValue($this, $pValue)) {
-			throw new PHPExcel_Exception("Value could not be bound to cell.");
-		}
-		return $this;
-	}
-
-	/**
-	 *	Set the value for a cell, with the explicit data type passed to the method (bypassing any use of the value binder)
-	 *
-	 *	@param	mixed	$pValue			Value
-	 *	@param	string	$pDataType		Explicit data type
-	 *	@return	PHPExcel_Cell
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function setValueExplicit($pValue = NULL, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
-	{
-		// set the value according to data type
-		switch ($pDataType) {
-			case PHPExcel_Cell_DataType::TYPE_STRING2:
-				$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
-			case PHPExcel_Cell_DataType::TYPE_STRING:
-			case PHPExcel_Cell_DataType::TYPE_NULL:
-			case PHPExcel_Cell_DataType::TYPE_INLINE:
-				$this->_value = PHPExcel_Cell_DataType::checkString($pValue);
-				break;
-			case PHPExcel_Cell_DataType::TYPE_NUMERIC:
-				$this->_value = (float)$pValue;
-				break;
-			case PHPExcel_Cell_DataType::TYPE_FORMULA:
-				$this->_value = (string)$pValue;
-				break;
-			case PHPExcel_Cell_DataType::TYPE_BOOL:
-				$this->_value = (bool)$pValue;
-				break;
-			case PHPExcel_Cell_DataType::TYPE_ERROR:
-				$this->_value = PHPExcel_Cell_DataType::checkErrorCode($pValue);
-				break;
-			default:
-				throw new PHPExcel_Exception('Invalid datatype: ' . $pDataType);
-				break;
-		}
-
-		// set the datatype
-		$this->_dataType = $pDataType;
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	Get calculated cell value
-	 *
-	 *	@deprecated		Since version 1.7.8 for planned changes to cell for array formula handling
-	 *
-	 *	@return	mixed
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function getCalculatedValue($resetLog = TRUE)
-	{
-//		echo 'Cell '.$this->getCoordinate().' value is a '.$this->_dataType.' with a value of '.$this->getValue().'<br />';
-		if ($this->_dataType == PHPExcel_Cell_DataType::TYPE_FORMULA) {
-			try {
-//				echo 'Cell value for '.$this->getCoordinate().' is a formula: Calculating value<br />';
-				$result = PHPExcel_Calculation::getInstance()->calculateCellValue($this,$resetLog);
-//				echo $this->getCoordinate().' calculation result is '.$result.'<br />';
-			} catch ( Exception $ex ) {
-				if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->_calculatedValue !== NULL)) {
-//					echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().'<br />';
-					return $this->_calculatedValue; // Fallback for calculations referencing external files.
-				}
-//				echo 'Calculation Exception: '.$ex->getMessage().'<br />';
-				$result = '#N/A';
-				throw(
-					new PHPExcel_Exception(
-						$this->getParent()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage()
-					)
-				);
-			}
-
-			if ($result === '#Not Yet Implemented') {
-//				echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().'<br />';
-				return $this->_calculatedValue; // Fallback if calculation engine does not support the formula.
-			}
-//			echo 'Returning calculated value of '.$result.' for cell '.$this->getCoordinate().'<br />';
-			return $result;
-		}
-
-//		if ($this->_value === NULL) {
-//			echo 'Cell '.$this->getCoordinate().' has no value, formula or otherwise<br />';
-//			return NULL;
-//		}
-//		echo 'Cell value for '.$this->getCoordinate().' is not a formula: Returning data value of '.$this->_value.'<br />';
-		return $this->_value;
-	}
-
-	/**
-	 *	Set old calculated value (cached)
-	 *
-	 *	@param	mixed $pValue	Value
-	 *	@return	PHPExcel_Cell
-	 */
-	public function setCalculatedValue($pValue = NULL)
-	{
-		if ($pValue !== NULL) {
-			$this->_calculatedValue = (is_numeric($pValue)) ? (float) $pValue : $pValue;
-		}
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	Get old calculated value (cached)
-	 *	This returns the value last calculated by MS Excel or whichever spreadsheet program was used to
-	 *		create the original spreadsheet file.
-	 *	Note that this value is not guaranteed to refelect the actual calculated value because it is
-	 *		possible that auto-calculation was disabled in the original spreadsheet, and underlying data
-	 *		values used by the formula have changed since it was last calculated.
-	 *
-	 *	@return	mixed
-	 */
-	public function getOldCalculatedValue()
-	{
-		return $this->_calculatedValue;
-	}
-
-	/**
-	 *	Get cell data type
-	 *
-	 *	@return string
-	 */
-	public function getDataType()
-	{
-		return $this->_dataType;
-	}
-
-	/**
-	 *	Set cell data type
-	 *
-	 *	@param	string $pDataType
-	 *	@return	PHPExcel_Cell
-	 */
-	public function setDataType($pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
-	{
-		if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2)
-			$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
-
-		$this->_dataType = $pDataType;
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	Does this cell contain Data validation rules?
-	 *
-	 *	@return	boolean
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function hasDataValidation()
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot check for data validation when cell is not bound to a worksheet');
-		}
-
-		return $this->_parent->dataValidationExists($this->getCoordinate());
-	}
-
-	/**
-	 *	Get Data validation rules
-	 *
-	 *	@return	PHPExcel_Cell_DataValidation
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function getDataValidation()
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot get data validation for cell that is not bound to a worksheet');
-		}
-
-		return $this->_parent->getDataValidation($this->getCoordinate());
-	}
-
-	/**
-	 *	Set Data validation rules
-	 *
-	 *	@param	PHPExcel_Cell_DataValidation	$pDataValidation
-	 *	@return	PHPExcel_Cell
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function setDataValidation(PHPExcel_Cell_DataValidation $pDataValidation = NULL)
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot set data validation for cell that is not bound to a worksheet');
-		}
-
-		$this->_parent->setDataValidation($this->getCoordinate(), $pDataValidation);
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	Does this cell contain a Hyperlink?
-	 *
-	 *	@return boolean
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function hasHyperlink()
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot check for hyperlink when cell is not bound to a worksheet');
-		}
-
-		return $this->_parent->hyperlinkExists($this->getCoordinate());
-	}
-
-	/**
-	 *	Get Hyperlink
-	 *
-	 *	@return	PHPExcel_Cell_Hyperlink
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function getHyperlink()
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot get hyperlink for cell that is not bound to a worksheet');
-		}
-
-		return $this->_parent->getHyperlink($this->getCoordinate());
-	}
-
-	/**
-	 *	Set Hyperlink
-	 *
-	 *	@param	PHPExcel_Cell_Hyperlink	$pHyperlink
-	 *	@return	PHPExcel_Cell
-	 *	@throws	PHPExcel_Exception
-	 */
-	public function setHyperlink(PHPExcel_Cell_Hyperlink $pHyperlink = NULL)
-	{
-		if (!isset($this->_parent)) {
-			throw new PHPExcel_Exception('Cannot set hyperlink for cell that is not bound to a worksheet');
-		}
-
-		$this->_parent->setHyperlink($this->getCoordinate(), $pHyperlink);
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	Get parent worksheet
-	 *
-	 *	@return PHPExcel_Worksheet
-	 */
-	public function getParent() {
-		return $this->_parent;
-	}
-
-	/**
-	 *	Re-bind parent
-	 *
-	 *	@param	PHPExcel_Worksheet $parent
-	 *	@return	PHPExcel_Cell
-	 */
-	public function rebindParent(PHPExcel_Worksheet $parent) {
-		$this->_parent = $parent;
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	Is cell in a specific range?
-	 *
-	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
-	 *	@return	boolean
-	 */
-	public function isInRange($pRange = 'A1:A1')
-	{
-		list($rangeStart,$rangeEnd) = self::rangeBoundaries($pRange);
-
-		// Translate properties
-		$myColumn	= self::columnIndexFromString($this->getColumn());
-		$myRow		= $this->getRow();
-
-		// Verify if cell is in range
-		return (($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn) &&
-				($rangeStart[1] <= $myRow) && ($rangeEnd[1] >= $myRow)
-			   );
-	}
-
-	/**
-	 *	Coordinate from string
-	 *
-	 *	@param	string	$pCoordinateString
-	 *	@return	array	Array containing column and row (indexes 0 and 1)
-	 *	@throws	PHPExcel_Exception
-	 */
-	public static function coordinateFromString($pCoordinateString = 'A1')
-	{
-		if (preg_match("/^([$]?[A-Z]{1,3})([$]?\d{1,7})$/", $pCoordinateString, $matches)) {
-			return array($matches[1],$matches[2]);
-		} elseif ((strpos($pCoordinateString,':') !== FALSE) || (strpos($pCoordinateString,',') !== FALSE)) {
-			throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
-		} elseif ($pCoordinateString == '') {
-			throw new PHPExcel_Exception('Cell coordinate can not be zero-length string');
-		}
-
-		throw new PHPExcel_Exception('Invalid cell coordinate '.$pCoordinateString);
-	}
-
-	/**
-	 *	Make string row, column or cell coordinate absolute
-	 *
-	 *	@param	string	$pCoordinateString		e.g. 'A' or '1' or 'A1'
-	 *					Note that this value can be a row or column reference as well as a cell reference
-	 *	@return	string	Absolute coordinate		e.g. '$A' or '$1' or '$A$1'
-	 *	@throws	PHPExcel_Exception
-	 */
-	public static function absoluteReference($pCoordinateString = 'A1')
-	{
-		if (strpos($pCoordinateString,':') === FALSE && strpos($pCoordinateString,',') === FALSE) {
-			// Split out any worksheet name from the reference
-			$worksheet = '';
-			$cellAddress = explode('!',$pCoordinateString);
-			if (count($cellAddress) > 1) {
-				list($worksheet,$pCoordinateString) = $cellAddress;
-			}
-			if ($worksheet > '')	$worksheet .= '!';
-
-			// Create absolute coordinate
-			if (ctype_digit($pCoordinateString)) {
-				return $worksheet . '$' . $pCoordinateString;
-			} elseif (ctype_alpha($pCoordinateString)) {
-				return $worksheet . '$' . strtoupper($pCoordinateString);
-			}
-			return $worksheet . self::absoluteCoordinate($pCoordinateString);
-		}
-
-		throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
-	}
-
-	/**
-	 *	Make string coordinate absolute
-	 *
-	 *	@param	string	$pCoordinateString		e.g. 'A1'
-	 *	@return	string	Absolute coordinate		e.g. '$A$1'
-	 *	@throws	PHPExcel_Exception
-	 */
-	public static function absoluteCoordinate($pCoordinateString = 'A1')
-	{
-		if (strpos($pCoordinateString,':') === FALSE && strpos($pCoordinateString,',') === FALSE) {
-			// Split out any worksheet name from the coordinate
-			$worksheet = '';
-			$cellAddress = explode('!',$pCoordinateString);
-			if (count($cellAddress) > 1) {
-				list($worksheet,$pCoordinateString) = $cellAddress;
-			}
-			if ($worksheet > '')	$worksheet .= '!';
-
-			// Create absolute coordinate
-			list($column, $row) = self::coordinateFromString($pCoordinateString);
-			$column = ltrim($column,'$');
-			$row = ltrim($row,'$');
-			return $worksheet . '$' . $column . '$' . $row;
-		}
-
-		throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
-	}
-
-	/**
-	 *	Split range into coordinate strings
-	 *
-	 *	@param	string	$pRange		e.g. 'B4:D9' or 'B4:D9,H2:O11' or 'B4'
-	 *	@return	array	Array containg one or more arrays containing one or two coordinate strings
-	 *								e.g. array('B4','D9') or array(array('B4','D9'),array('H2','O11'))
-	 *										or array('B4')
-	 */
-	public static function splitRange($pRange = 'A1:A1')
-	{
-		// Ensure $pRange is a valid range
-		if(empty($pRange)) {
-			$pRange = self::DEFAULT_RANGE;
-		}
-
-		$exploded = explode(',', $pRange);
-		$counter = count($exploded);
-		for ($i = 0; $i < $counter; ++$i) {
-			$exploded[$i] = explode(':', $exploded[$i]);
-		}
-		return $exploded;
-	}
-
-	/**
-	 *	Build range from coordinate strings
-	 *
-	 *	@param	array	$pRange	Array containg one or more arrays containing one or two coordinate strings
-	 *	@return	string	String representation of $pRange
-	 *	@throws	PHPExcel_Exception
-	 */
-	public static function buildRange($pRange)
-	{
-		// Verify range
-		if (!is_array($pRange) || empty($pRange) || !is_array($pRange[0])) {
-			throw new PHPExcel_Exception('Range does not contain any information');
-		}
-
-		// Build range
-		$imploded = array();
-		$counter = count($pRange);
-		for ($i = 0; $i < $counter; ++$i) {
-			$pRange[$i] = implode(':', $pRange[$i]);
-		}
-		$imploded = implode(',', $pRange);
-
-		return $imploded;
-	}
-
-	/**
-	 *	Calculate range boundaries
-	 *
-	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
-	 *	@return	array	Range coordinates array(Start Cell, End Cell)
-	 *					where Start Cell and End Cell are arrays (Column Number, Row Number)
-	 */
-	public static function rangeBoundaries($pRange = 'A1:A1')
-	{
-		// Ensure $pRange is a valid range
-		if(empty($pRange)) {
-			$pRange = self::DEFAULT_RANGE;
-		}
-
-		// Uppercase coordinate
-		$pRange = strtoupper($pRange);
-
-		// Extract range
-		if (strpos($pRange, ':') === FALSE) {
-			$rangeA = $rangeB = $pRange;
-		} else {
-			list($rangeA, $rangeB) = explode(':', $pRange);
-		}
-
-		// Calculate range outer borders
-		$rangeStart = self::coordinateFromString($rangeA);
-		$rangeEnd	= self::coordinateFromString($rangeB);
-
-		// Translate column into index
-		$rangeStart[0]	= self::columnIndexFromString($rangeStart[0]);
-		$rangeEnd[0]	= self::columnIndexFromString($rangeEnd[0]);
-
-		return array($rangeStart, $rangeEnd);
-	}
-
-	/**
-	 *	Calculate range dimension
-	 *
-	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
-	 *	@return	array	Range dimension (width, height)
-	 */
-	public static function rangeDimension($pRange = 'A1:A1')
-	{
-		// Calculate range outer borders
-		list($rangeStart,$rangeEnd) = self::rangeBoundaries($pRange);
-
-		return array( ($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1) );
-	}
-
-	/**
-	 *	Calculate range boundaries
-	 *
-	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
-	 *	@return	array	Range coordinates array(Start Cell, End Cell)
-	 *					where Start Cell and End Cell are arrays (Column ID, Row Number)
-	 */
-	public static function getRangeBoundaries($pRange = 'A1:A1')
-	{
-		// Ensure $pRange is a valid range
-		if(empty($pRange)) {
-			$pRange = self::DEFAULT_RANGE;
-		}
-
-		// Uppercase coordinate
-		$pRange = strtoupper($pRange);
-
-		// Extract range
-		if (strpos($pRange, ':') === FALSE) {
-			$rangeA = $rangeB = $pRange;
-		} else {
-			list($rangeA, $rangeB) = explode(':', $pRange);
-		}
-
-		return array( self::coordinateFromString($rangeA), self::coordinateFromString($rangeB));
-	}
-
-	/**
-	 *	Column index from string
-	 *
-	 *	@param	string $pString
-	 *	@return	int Column index (base 1 !!!)
-	 *	@throws	Exception
-	 */
-	public static function columnIndexFromString($pString = 'A')
-	{
-		//	Using a lookup cache adds a slight memory overhead, but boosts speed
-		//	caching using a static within the method is faster than a class static,
-		//		though it's additional memory overhead
-		static $_indexCache = array();
-
-		if (isset($_indexCache[$pString]))
-			return $_indexCache[$pString];
-
-		//	It's surprising how costly the strtoupper() and ord() calls actually are, so we use a lookup array rather than use ord()
-		//		and make it case insensitive to get rid of the strtoupper() as well. Because it's a static, there's no significant
-		//		memory overhead either
-		static $_columnLookup = array(
-			'A' => 1, 'B' => 2, 'C' => 3, 'D' => 4, 'E' => 5, 'F' => 6, 'G' => 7, 'H' => 8, 'I' => 9, 'J' => 10, 'K' => 11, 'L' => 12, 'M' => 13,
-			'N' => 14, 'O' => 15, 'P' => 16, 'Q' => 17, 'R' => 18, 'S' => 19, 'T' => 20, 'U' => 21, 'V' => 22, 'W' => 23, 'X' => 24, 'Y' => 25, 'Z' => 26,
-			'a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5, 'f' => 6, 'g' => 7, 'h' => 8, 'i' => 9, 'j' => 10, 'k' => 11, 'l' => 12, 'm' => 13,
-			'n' => 14, 'o' => 15, 'p' => 16, 'q' => 17, 'r' => 18, 's' => 19, 't' => 20, 'u' => 21, 'v' => 22, 'w' => 23, 'x' => 24, 'y' => 25, 'z' => 26
-		);
-
-		//	We also use the language construct isset() rather than the more costly strlen() function to match the length of $pString
-		//		for improved performance
-		if (isset($pString{0})) {
-			if (!isset($pString{1})) {
-				$_indexCache[$pString] = $_columnLookup[$pString];
-				return $_indexCache[$pString];
-			} elseif(!isset($pString{2})) {
-				$_indexCache[$pString] = $_columnLookup[$pString{0}] * 26 + $_columnLookup[$pString{1}];
-				return $_indexCache[$pString];
-			} elseif(!isset($pString{3})) {
-				$_indexCache[$pString] = $_columnLookup[$pString{0}] * 676 + $_columnLookup[$pString{1}] * 26 + $_columnLookup[$pString{2}];
-				return $_indexCache[$pString];
-			}
-		}
-		throw new PHPExcel_Exception("Column string index can not be " . ((isset($pString{0})) ? "longer than 3 characters" : "empty"));
-	}
-
-	/**
-	 *	String from columnindex
-	 *
-	 *	@param	int $pColumnIndex Column index (base 0 !!!)
-	 *	@return	string
-	 */
-	public static function stringFromColumnIndex($pColumnIndex = 0)
-	{
-		//	Using a lookup cache adds a slight memory overhead, but boosts speed
-		//	caching using a static within the method is faster than a class static,
-		//		though it's additional memory overhead
-		static $_indexCache = array();
-
-		if (!isset($_indexCache[$pColumnIndex])) {
-			// Determine column string
-			if ($pColumnIndex < 26) {
-				$_indexCache[$pColumnIndex] = chr(65 + $pColumnIndex);
-			} elseif ($pColumnIndex < 702) {
-				$_indexCache[$pColumnIndex] = chr(64 + ($pColumnIndex / 26)) .
-											  chr(65 + $pColumnIndex % 26);
-			} else {
-				$_indexCache[$pColumnIndex] = chr(64 + (($pColumnIndex - 26) / 676)) .
-											  chr(65 + ((($pColumnIndex - 26) % 676) / 26)) .
-											  chr(65 + $pColumnIndex % 26);
-			}
-		}
-		return $_indexCache[$pColumnIndex];
-	}
-
-	/**
-	 *	Extract all cell references in range
-	 *
-	 *	@param	string	$pRange		Range (e.g. A1 or A1:C10 or A1:E10 A20:E25)
-	 *	@return	array	Array containing single cell references
-	 */
-	public static function extractAllCellReferencesInRange($pRange = 'A1') {
-		// Returnvalue
-		$returnValue = array();
-
-		// Explode spaces
-		$cellBlocks = explode(' ', str_replace('$', '', strtoupper($pRange)));
-		foreach ($cellBlocks as $cellBlock) {
-			// Single cell?
-			if (strpos($cellBlock,':') === FALSE && strpos($cellBlock,',') === FALSE) {
-				$returnValue[] = $cellBlock;
-				continue;
-			}
-
-			// Range...
-			$ranges = self::splitRange($cellBlock);
-			foreach($ranges as $range) {
-				// Single cell?
-				if (!isset($range[1])) {
-					$returnValue[] = $range[0];
-					continue;
-				}
-
-				// Range...
-				list($rangeStart, $rangeEnd)	= $range;
-				list($startCol, $startRow)	= sscanf($rangeStart,'%[A-Z]%d');
-				list($endCol, $endRow)		= sscanf($rangeEnd,'%[A-Z]%d');
-				$endCol++;
-
-				// Current data
-				$currentCol	= $startCol;
-				$currentRow	= $startRow;
-
-				// Loop cells
-				while ($currentCol != $endCol) {
-					while ($currentRow <= $endRow) {
-						$returnValue[] = $currentCol.$currentRow;
-						++$currentRow;
-					}
-					++$currentCol;
-					$currentRow = $startRow;
-				}
-			}
-		}
-
-		//	Sort the result by column and row
-		$sortKeys = array();
-		foreach (array_unique($returnValue) as $coord) {
-			list($column,$row) = sscanf($coord,'%[A-Z]%d');
-			$sortKeys[sprintf('%3s%09d',$column,$row)] = $coord;
-		}
-		ksort($sortKeys);
-
-		// Return value
-		return array_values($sortKeys);
-	}
-
-	/**
-	 * Compare 2 cells
-	 *
-	 * @param	PHPExcel_Cell	$a	Cell a
-	 * @param	PHPExcel_Cell	$a	Cell b
-	 * @return	int		Result of comparison (always -1 or 1, never zero!)
-	 */
-	public static function compareCells(PHPExcel_Cell $a, PHPExcel_Cell $b)
-	{
-		if ($a->_row < $b->_row) {
-			return -1;
-		} elseif ($a->_row > $b->_row) {
-			return 1;
-		} elseif (self::columnIndexFromString($a->_column) < self::columnIndexFromString($b->_column)) {
-			return -1;
-		} else {
-			return 1;
-		}
-	}
-
-	/**
-	 * Get value binder to use
-	 *
-	 * @return PHPExcel_Cell_IValueBinder
-	 */
-	public static function getValueBinder() {
-		if (self::$_valueBinder === NULL) {
-			self::$_valueBinder = new PHPExcel_Cell_DefaultValueBinder();
-		}
-
-		return self::$_valueBinder;
-	}
-
-	/**
-	 * Set value binder to use
-	 *
-	 * @param PHPExcel_Cell_IValueBinder $binder
-	 * @throws Exception
-	 */
-	public static function setValueBinder(PHPExcel_Cell_IValueBinder $binder = NULL) {
-		if ($binder === NULL) {
-			throw new Exception("A PHPExcel_Cell_IValueBinder is required for PHPExcel to function correctly.");
-		}
-
-		self::$_valueBinder = $binder;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-	/**
-	 * Get index to cellXf
-	 *
-	 * @return int
-	 */
-	public function getXfIndex()
-	{
-		return $this->_xfIndex;
-	}
-
-	/**
-	 * Set index to cellXf
-	 *
-	 * @param int $pValue
-	 * @return PHPExcel_Cell
-	 */
-	public function setXfIndex($pValue = 0)
-	{
-		$this->_xfIndex = $pValue;
-
-		return $this->notifyCacheController();
-	}
-
-	/**
-	 *	@deprecated		Since version 1.7.8 for planned changes to cell for array formula handling
-	 */
-	public function setFormulaAttributes($pAttributes)
-	{
-		$this->_formulaAttributes = $pAttributes;
-		return $this;
-	}
-
-	/**
-	 *	@deprecated		Since version 1.7.8 for planned changes to cell for array formula handling
-	 */
-	public function getFormulaAttributes()
-	{
-		return $this->_formulaAttributes;
-	}
-
-    /**
-     * Convert to string
-     *
-     * @return string
-     */
-	public function __toString()
-	{
-		return (string) $this->getValue();
-	}
-
-}
-
diff --git a/plugins/exportTypes/Excel/PHPExcel/Cell/AdvancedValueBinder.php b/plugins/exportTypes/Excel/PHPExcel/Cell/AdvancedValueBinder.php
deleted file mode 100755
index 7e176aef3..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Cell/AdvancedValueBinder.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Cell_AdvancedValueBinder
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
-{
-	/**
-	 * Bind value to a cell
-	 *
-	 * @param PHPExcel_Cell $cell	Cell to bind value to
-	 * @param mixed $value			Value to bind in cell
-	 * @return boolean
-	 */
-	public function bindValue(PHPExcel_Cell $cell, $value = null)
-	{
-		// sanitize UTF-8 strings
-		if (is_string($value)) {
-			$value = PHPExcel_Shared_String::SanitizeUTF8($value);
-		}
-
-		// Find out data type
-		$dataType = parent::dataTypeForValue($value);
-
-		// Style logic - strings
-		if ($dataType === PHPExcel_Cell_DataType::TYPE_STRING && !$value instanceof PHPExcel_RichText) {
-			//	Test for booleans using locale-setting
-			if ($value == PHPExcel_Calculation::getTRUE()) {
-				$cell->setValueExplicit( TRUE, PHPExcel_Cell_DataType::TYPE_BOOL);
-				return true;
-			} elseif($value == PHPExcel_Calculation::getFALSE()) {
-				$cell->setValueExplicit( FALSE, PHPExcel_Cell_DataType::TYPE_BOOL);
-				return true;
-			}
-
-			// Check for number in scientific format
-			if (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NUMBER.'$/', $value)) {
-				$cell->setValueExplicit( (float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-				return true;
-			}
-
-			// Check for fraction
-			if (preg_match('/^([+-]?) *([0-9]*)\s?\/\s*([0-9]*)$/', $value, $matches)) {
-				// Convert value to number
-				$value = $matches[2] / $matches[3];
-				if ($matches[1] == '-') $value = 0 - $value;
-				$cell->setValueExplicit( (float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )
-					->getNumberFormat()->setFormatCode( '??/??' );
-				return true;
-			} elseif (preg_match('/^([+-]?)([0-9]*) +([0-9]*)\s?\/\s*([0-9]*)$/', $value, $matches)) {
-				// Convert value to number
-				$value = $matches[2] + ($matches[3] / $matches[4]);
-				if ($matches[1] == '-') $value = 0 - $value;
-				$cell->setValueExplicit( (float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )
-					->getNumberFormat()->setFormatCode( '# ??/??' );
-				return true;
-			}
-
-			// Check for percentage
-			if (preg_match('/^\-?[0-9]*\.?[0-9]*\s?\%$/', $value)) {
-				// Convert value to number
-				$value = (float) str_replace('%', '', $value) / 100;
-				$cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )
-					->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00 );
-				return true;
-			}
-
-			// Check for currency
-			$currencyCode = PHPExcel_Shared_String::getCurrencyCode();
-			if (preg_match('/^'.preg_quote($currencyCode).' *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) {
-				// Convert value to number
-				$value = (float) trim(str_replace(array($currencyCode,','), '', $value));
-				$cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )
-					->getNumberFormat()->setFormatCode(
-						str_replace('$', $currencyCode, PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE )
-					);
-				return true;
-			} elseif (preg_match('/^\$ *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) {
-				// Convert value to number
-				$value = (float) trim(str_replace(array('$',','), '', $value));
-				$cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )
-					->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE );
-				return true;
-			}
-
-			// Check for time without seconds e.g. '9:45', '09:45'
-			if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d$/', $value)) {
-				// Convert value to number
-				list($h, $m) = explode(':', $value);
-				$days = $h / 24 + $m / 1440;
-				$cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )
-					->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3 );
-				return true;
-			}
-
-			// Check for time with seconds '9:45:59', '09:45:59'
-			if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d:[0-5]\d$/', $value)) {
-				// Convert value to number
-				list($h, $m, $s) = explode(':', $value);
-				$days = $h / 24 + $m / 1440 + $s / 86400;
-				// Convert value to number
-				$cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )
-					->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4 );
-				return true;
-			}
-
-			// Check for datetime, e.g. '2008-12-31', '2008-12-31 15:59', '2008-12-31 15:59:10'
-			if (($d = PHPExcel_Shared_Date::stringToExcel($value)) !== false) {
-				// Convert value to number
-				$cell->setValueExplicit($d, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-				// Determine style. Either there is a time part or not. Look for ':'
-				if (strpos($value, ':') !== false) {
-					$formatCode = 'yyyy-mm-dd h:mm';
-				} else {
-					$formatCode = 'yyyy-mm-dd';
-				}
-				$cell->getParent()->getStyle( $cell->getCoordinate() )
-					->getNumberFormat()->setFormatCode($formatCode);
-				return true;
-			}
-
-			// Check for newline character "\n"
-			if (strpos($value, "\n") !== FALSE) {
-				$value = PHPExcel_Shared_String::SanitizeUTF8($value);
-				$cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING);
-				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )
-					->getAlignment()->setWrapText(TRUE);
-				return true;
-			}
-		}
-
-		// Not bound yet? Use parent...
-		return parent::bindValue($cell, $value);
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Cell/DataType.php b/plugins/exportTypes/Excel/PHPExcel/Cell/DataType.php
deleted file mode 100755
index 34f3cdc01..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Cell/DataType.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Cell_DataType
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell_DataType
-{
-	/* Data types */
-	const TYPE_STRING2		= 'str';
-	const TYPE_STRING		= 's';
-	const TYPE_FORMULA		= 'f';
-	const TYPE_NUMERIC		= 'n';
-	const TYPE_BOOL			= 'b';
-    const TYPE_NULL			= 'null';
-    const TYPE_INLINE		= 'inlineStr';
-	const TYPE_ERROR		= 'e';
-
-	/**
-	 * List of error codes
-	 *
-	 * @var array
-	 */
-	private static $_errorCodes	= array('#NULL!' => 0, '#DIV/0!' => 1, '#VALUE!' => 2, '#REF!' => 3, '#NAME?' => 4, '#NUM!' => 5, '#N/A' => 6);
-
-	/**
-	 * Get list of error codes
-	 *
-	 * @return array
-	 */
-	public static function getErrorCodes() {
-		return self::$_errorCodes;
-	}
-
-	/**
-	 * DataType for value
-	 *
-	 * @deprecated Replaced by PHPExcel_Cell_IValueBinder infrastructure
-	 * @param	mixed 	$pValue
-	 * @return 	int
-	 */
-	public static function dataTypeForValue($pValue = null) {
-		return PHPExcel_Cell_DefaultValueBinder::dataTypeForValue($pValue);
-	}
-
-	/**
-	 * Check a string that it satisfies Excel requirements
-	 *
-	 * @param mixed Value to sanitize to an Excel string
-	 * @return mixed Sanitized value
-	 */
-	public static function checkString($pValue = null)
-	{
-		if ($pValue instanceof PHPExcel_RichText) {
-			// TODO: Sanitize Rich-Text string (max. character count is 32,767)
-			return $pValue;
-		}
-
-		// string must never be longer than 32,767 characters, truncate if necessary
-		$pValue = PHPExcel_Shared_String::Substring($pValue, 0, 32767);
-
-		// we require that newline is represented as "\n" in core, not as "\r\n" or "\r"
-		$pValue = str_replace(array("\r\n", "\r"), "\n", $pValue);
-
-		return $pValue;
-	}
-
-	/**
-	 * Check a value that it is a valid error code
-	 *
-	 * @param mixed Value to sanitize to an Excel error code
-	 * @return string Sanitized value
-	 */
-	public static function checkErrorCode($pValue = null)
-	{
-		$pValue = (string)$pValue;
-
-		if ( !array_key_exists($pValue, self::$_errorCodes) ) {
-			$pValue = '#NULL!';
-		}
-
-		return $pValue;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Cell/DataValidation.php b/plugins/exportTypes/Excel/PHPExcel/Cell/DataValidation.php
deleted file mode 100755
index 902b079c4..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Cell/DataValidation.php
+++ /dev/null
@@ -1,474 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Cell_DataValidation
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell_DataValidation
-{
-	/* Data validation types */
-	const TYPE_NONE			= 'none';
-	const TYPE_CUSTOM		= 'custom';
-	const TYPE_DATE			= 'date';
-	const TYPE_DECIMAL		= 'decimal';
-	const TYPE_LIST			= 'list';
-	const TYPE_TEXTLENGTH	= 'textLength';
-	const TYPE_TIME			= 'time';
-	const TYPE_WHOLE		= 'whole';
-
-	/* Data validation error styles */
-	const STYLE_STOP		= 'stop';
-	const STYLE_WARNING		= 'warning';
-	const STYLE_INFORMATION	= 'information';
-
-	/* Data validation operators */
-	const OPERATOR_BETWEEN				= 'between';
-	const OPERATOR_EQUAL				= 'equal';
-	const OPERATOR_GREATERTHAN			= 'greaterThan';
-	const OPERATOR_GREATERTHANOREQUAL	= 'greaterThanOrEqual';
-	const OPERATOR_LESSTHAN				= 'lessThan';
-	const OPERATOR_LESSTHANOREQUAL		= 'lessThanOrEqual';
-	const OPERATOR_NOTBETWEEN			= 'notBetween';
-	const OPERATOR_NOTEQUAL				= 'notEqual';
-
-    /**
-     * Formula 1
-     *
-     * @var string
-     */
-    private $_formula1;
-
-    /**
-     * Formula 2
-     *
-     * @var string
-     */
-    private $_formula2;
-
-    /**
-     * Type
-     *
-     * @var string
-     */
-    private $_type = PHPExcel_Cell_DataValidation::TYPE_NONE;
-
-    /**
-     * Error style
-     *
-     * @var string
-     */
-    private $_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP;
-
-    /**
-     * Operator
-     *
-     * @var string
-     */
-    private $_operator;
-
-    /**
-     * Allow Blank
-     *
-     * @var boolean
-     */
-    private $_allowBlank;
-
-    /**
-     * Show DropDown
-     *
-     * @var boolean
-     */
-    private $_showDropDown;
-
-    /**
-     * Show InputMessage
-     *
-     * @var boolean
-     */
-    private $_showInputMessage;
-
-    /**
-     * Show ErrorMessage
-     *
-     * @var boolean
-     */
-    private $_showErrorMessage;
-
-    /**
-     * Error title
-     *
-     * @var string
-     */
-    private $_errorTitle;
-
-    /**
-     * Error
-     *
-     * @var string
-     */
-    private $_error;
-
-    /**
-     * Prompt title
-     *
-     * @var string
-     */
-    private $_promptTitle;
-
-    /**
-     * Prompt
-     *
-     * @var string
-     */
-    private $_prompt;
-
-    /**
-     * Create a new PHPExcel_Cell_DataValidation
-     *
-     * @throws	Exception
-     */
-    public function __construct()
-    {
-    	// Initialise member variables
-		$this->_formula1 			= '';
-		$this->_formula2 			= '';
-		$this->_type 				= PHPExcel_Cell_DataValidation::TYPE_NONE;
-		$this->_errorStyle 			= PHPExcel_Cell_DataValidation::STYLE_STOP;
-		$this->_operator 			= '';
-		$this->_allowBlank 			= false;
-		$this->_showDropDown 		= false;
-		$this->_showInputMessage 	= false;
-		$this->_showErrorMessage 	= false;
-		$this->_errorTitle 			= '';
-		$this->_error 				= '';
-		$this->_promptTitle 		= '';
-		$this->_prompt 				= '';
-    }
-
-	/**
-	 * Get Formula 1
-	 *
-	 * @return string
-	 */
-	public function getFormula1() {
-		return $this->_formula1;
-	}
-
-	/**
-	 * Set Formula 1
-	 *
-	 * @param	string	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setFormula1($value = '') {
-		$this->_formula1 = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Formula 2
-	 *
-	 * @return string
-	 */
-	public function getFormula2() {
-		return $this->_formula2;
-	}
-
-	/**
-	 * Set Formula 2
-	 *
-	 * @param	string	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setFormula2($value = '') {
-		$this->_formula2 = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Type
-	 *
-	 * @return string
-	 */
-	public function getType() {
-		return $this->_type;
-	}
-
-	/**
-	 * Set Type
-	 *
-	 * @param	string	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setType($value = PHPExcel_Cell_DataValidation::TYPE_NONE) {
-		$this->_type = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Error style
-	 *
-	 * @return string
-	 */
-	public function getErrorStyle() {
-		return $this->_errorStyle;
-	}
-
-	/**
-	 * Set Error style
-	 *
-	 * @param	string	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setErrorStyle($value = PHPExcel_Cell_DataValidation::STYLE_STOP) {
-		$this->_errorStyle = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Operator
-	 *
-	 * @return string
-	 */
-	public function getOperator() {
-		return $this->_operator;
-	}
-
-	/**
-	 * Set Operator
-	 *
-	 * @param	string	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setOperator($value = '') {
-		$this->_operator = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Allow Blank
-	 *
-	 * @return boolean
-	 */
-	public function getAllowBlank() {
-		return $this->_allowBlank;
-	}
-
-	/**
-	 * Set Allow Blank
-	 *
-	 * @param	boolean	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setAllowBlank($value = false) {
-		$this->_allowBlank = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Show DropDown
-	 *
-	 * @return boolean
-	 */
-	public function getShowDropDown() {
-		return $this->_showDropDown;
-	}
-
-	/**
-	 * Set Show DropDown
-	 *
-	 * @param	boolean	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setShowDropDown($value = false) {
-		$this->_showDropDown = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Show InputMessage
-	 *
-	 * @return boolean
-	 */
-	public function getShowInputMessage() {
-		return $this->_showInputMessage;
-	}
-
-	/**
-	 * Set Show InputMessage
-	 *
-	 * @param	boolean	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setShowInputMessage($value = false) {
-		$this->_showInputMessage = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Show ErrorMessage
-	 *
-	 * @return boolean
-	 */
-	public function getShowErrorMessage() {
-		return $this->_showErrorMessage;
-	}
-
-	/**
-	 * Set Show ErrorMessage
-	 *
-	 * @param	boolean	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setShowErrorMessage($value = false) {
-		$this->_showErrorMessage = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Error title
-	 *
-	 * @return string
-	 */
-	public function getErrorTitle() {
-		return $this->_errorTitle;
-	}
-
-	/**
-	 * Set Error title
-	 *
-	 * @param	string	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setErrorTitle($value = '') {
-		$this->_errorTitle = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Error
-	 *
-	 * @return string
-	 */
-	public function getError() {
-		return $this->_error;
-	}
-
-	/**
-	 * Set Error
-	 *
-	 * @param	string	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setError($value = '') {
-		$this->_error = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Prompt title
-	 *
-	 * @return string
-	 */
-	public function getPromptTitle() {
-		return $this->_promptTitle;
-	}
-
-	/**
-	 * Set Prompt title
-	 *
-	 * @param	string	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setPromptTitle($value = '') {
-		$this->_promptTitle = $value;
-		return $this;
-	}
-
-	/**
-	 * Get Prompt
-	 *
-	 * @return string
-	 */
-	public function getPrompt() {
-		return $this->_prompt;
-	}
-
-	/**
-	 * Set Prompt
-	 *
-	 * @param	string	$value
-	 * @return PHPExcel_Cell_DataValidation
-	 */
-	public function setPrompt($value = '') {
-		$this->_prompt = $value;
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_formula1
-    		. $this->_formula2
-    		. $this->_type = PHPExcel_Cell_DataValidation::TYPE_NONE
-    		. $this->_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP
-    		. $this->_operator
-    		. ($this->_allowBlank ? 't' : 'f')
-    		. ($this->_showDropDown ? 't' : 'f')
-    		. ($this->_showInputMessage ? 't' : 'f')
-    		. ($this->_showErrorMessage ? 't' : 'f')
-    		. $this->_errorTitle
-    		. $this->_error
-    		. $this->_promptTitle
-    		. $this->_prompt
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Cell/DefaultValueBinder.php b/plugins/exportTypes/Excel/PHPExcel/Cell/DefaultValueBinder.php
deleted file mode 100755
index f8f9309c9..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Cell/DefaultValueBinder.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Cell_DefaultValueBinder
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
-{
-	/**
-	 * Bind value to a cell
-	 *
-	 * @param PHPExcel_Cell $cell	Cell to bind value to
-	 * @param mixed $value			Value to bind in cell
-	 * @return boolean
-	 */
-	public function bindValue(PHPExcel_Cell $cell, $value = null)
-	{
-		// sanitize UTF-8 strings
-		if (is_string($value)) {
-			$value = PHPExcel_Shared_String::SanitizeUTF8($value);
-		}
-
-		// Set value explicit
-		$cell->setValueExplicit( $value, self::dataTypeForValue($value) );
-
-		// Done!
-		return true;
-	}
-
-	/**
-	 * DataType for value
-	 *
-	 * @param	mixed 	$pValue
-	 * @return 	int
-	 */
-	public static function dataTypeForValue($pValue = null) {
-		// Match the value against a few data types
-		if (is_null($pValue)) {
-			return PHPExcel_Cell_DataType::TYPE_NULL;
-
-		} elseif ($pValue === '') {
-			return PHPExcel_Cell_DataType::TYPE_STRING;
-
-		} elseif ($pValue instanceof PHPExcel_RichText) {
-			return PHPExcel_Cell_DataType::TYPE_INLINE;
-
-		} elseif ($pValue{0} === '=' && strlen($pValue) > 1) {
-			return PHPExcel_Cell_DataType::TYPE_FORMULA;
-
-		} elseif (is_bool($pValue)) {
-			return PHPExcel_Cell_DataType::TYPE_BOOL;
-
-		} elseif (is_float($pValue) || is_int($pValue)) {
-			return PHPExcel_Cell_DataType::TYPE_NUMERIC;
-
-		} elseif (preg_match('/^\-?([0-9]+\\.?[0-9]*|[0-9]*\\.?[0-9]+)$/', $pValue)) {
-			return PHPExcel_Cell_DataType::TYPE_NUMERIC;
-
-		} elseif (is_string($pValue) && array_key_exists($pValue, PHPExcel_Cell_DataType::getErrorCodes())) {
-			return PHPExcel_Cell_DataType::TYPE_ERROR;
-
-		} else {
-			return PHPExcel_Cell_DataType::TYPE_STRING;
-
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Cell/Hyperlink.php b/plugins/exportTypes/Excel/PHPExcel/Cell/Hyperlink.php
deleted file mode 100755
index 7478b22d5..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Cell/Hyperlink.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Cell_Hyperlink
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Cell_Hyperlink
-{
-	/**
-	 * URL to link the cell to
-	 *
-	 * @var string
-	 */
-	private $_url;
-
-	/**
-	 * Tooltip to display on the hyperlink
-	 *
-	 * @var string
-	 */
-	private $_tooltip;
-
-    /**
-     * Create a new PHPExcel_Cell_Hyperlink
-     *
-     * @param 	string				$pUrl		Url to link the cell to
-     * @param	string				$pTooltip	Tooltip to display on the hyperlink
-     * @throws	Exception
-     */
-    public function __construct($pUrl = '', $pTooltip = '')
-    {
-    	// Initialise member variables
-		$this->_url 		= $pUrl;
-		$this->_tooltip 	= $pTooltip;
-    }
-
-	/**
-	 * Get URL
-	 *
-	 * @return string
-	 */
-	public function getUrl() {
-		return $this->_url;
-	}
-
-	/**
-	 * Set URL
-	 *
-	 * @param	string	$value
-	 * @return PHPExcel_Cell_Hyperlink
-	 */
-	public function setUrl($value = '') {
-		$this->_url = $value;
-		return $this;
-	}
-
-	/**
-	 * Get tooltip
-	 *
-	 * @return string
-	 */
-	public function getTooltip() {
-		return $this->_tooltip;
-	}
-
-	/**
-	 * Set tooltip
-	 *
-	 * @param	string	$value
-	 * @return PHPExcel_Cell_Hyperlink
-	 */
-	public function setTooltip($value = '') {
-		$this->_tooltip = $value;
-		return $this;
-	}
-
-	/**
-	 * Is this hyperlink internal? (to another sheet)
-	 *
-	 * @return boolean
-	 */
-	public function isInternal() {
-		return strpos($this->_url, 'sheet://') !== false;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_url
-    		. $this->_tooltip
-    		. __CLASS__
-    	);
-    }
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Cell/IValueBinder.php b/plugins/exportTypes/Excel/PHPExcel/Cell/IValueBinder.php
deleted file mode 100755
index 96eaa057f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Cell/IValueBinder.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Cell_IValueBinder
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_Cell_IValueBinder
-{
-	/**
-	 * Bind value to a cell
-	 *
-	 * @param PHPExcel_Cell $cell	Cell to bind value to
-	 * @param mixed $value			Value to bind in cell
-	 * @return boolean
-	 */
-	public function bindValue(PHPExcel_Cell $cell, $value = null);
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Chart.php b/plugins/exportTypes/Excel/PHPExcel/Chart.php
deleted file mode 100755
index 0b11e5a9f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Chart.php
+++ /dev/null
@@ -1,527 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart
-{
-	/**
-	 * Chart Name
-	 *
-	 * @var string
-	 */
-	private $_name = '';
-
-	/**
-	 * Worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_worksheet = null;
-
-	/**
-	 * Chart Title
-	 *
-	 * @var PHPExcel_Chart_Title
-	 */
-	private $_title = null;
-
-	/**
-	 * Chart Legend
-	 *
-	 * @var PHPExcel_Chart_Legend
-	 */
-	private $_legend = null;
-
-	/**
-	 * X-Axis Label
-	 *
-	 * @var PHPExcel_Chart_Title
-	 */
-	private $_xAxisLabel = null;
-
-	/**
-	 * Y-Axis Label
-	 *
-	 * @var PHPExcel_Chart_Title
-	 */
-	private $_yAxisLabel = null;
-
-	/**
-	 * Chart Plot Area
-	 *
-	 * @var PHPExcel_Chart_PlotArea
-	 */
-	private $_plotArea = null;
-
-	/**
-	 * Plot Visible Only
-	 *
-	 * @var boolean
-	 */
-	private $_plotVisibleOnly = true;
-
-	/**
-	 * Display Blanks as
-	 *
-	 * @var string
-	 */
-	private $_displayBlanksAs = '0';
-
-
-	/**
-	 * Top-Left Cell Position
-	 *
-	 * @var string
-	 */
-	private $_topLeftCellRef = 'A1';
-
-
-	/**
-	 * Top-Left X-Offset
-	 *
-	 * @var integer
-	 */
-	private $_topLeftXOffset = 0;
-
-
-	/**
-	 * Top-Left Y-Offset
-	 *
-	 * @var integer
-	 */
-	private $_topLeftYOffset = 0;
-
-
-	/**
-	 * Bottom-Right Cell Position
-	 *
-	 * @var string
-	 */
-	private $_bottomRightCellRef = 'A1';
-
-
-	/**
-	 * Bottom-Right X-Offset
-	 *
-	 * @var integer
-	 */
-	private $_bottomRightXOffset = 10;
-
-
-	/**
-	 * Bottom-Right Y-Offset
-	 *
-	 * @var integer
-	 */
-	private $_bottomRightYOffset = 10;
-
-
-	/**
-	 * Create a new PHPExcel_Chart
-	 */
-	public function __construct($name, PHPExcel_Chart_Title $title = null, PHPExcel_Chart_Legend $legend = null, PHPExcel_Chart_PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = '0', PHPExcel_Chart_Title $xAxisLabel = null, PHPExcel_Chart_Title $yAxisLabel = null)
-	{
-		$this->_name = $name;
-		$this->_title = $title;
-		$this->_legend = $legend;
-		$this->_xAxisLabel = $xAxisLabel;
-		$this->_yAxisLabel = $yAxisLabel;
-		$this->_plotArea = $plotArea;
-		$this->_plotVisibleOnly = $plotVisibleOnly;
-		$this->_displayBlanksAs = $displayBlanksAs;
-	}
-
-	/**
-	 * Get Name
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->_name;
-	}
-
-	/**
-	 * Get Worksheet
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getWorksheet() {
-		return $this->_worksheet;
-	}
-
-	/**
-	 * Set Worksheet
-	 *
-	 * @param	PHPExcel_Worksheet	$pValue
-	 * @throws	Exception
-	 * @return PHPExcel_Chart
-	 */
-	public function setWorksheet(PHPExcel_Worksheet $pValue = null) {
-		$this->_worksheet = $pValue;
-
-		return $this;
-	}
-
-	/**
-	 * Get Title
-	 *
-	 * @return PHPExcel_Chart_Title
-	 */
-	public function getTitle() {
-		return $this->_title;
-	}
-
-	/**
-	 * Set Title
-	 *
-	 * @param	PHPExcel_Chart_Title $title
-	 * @return	PHPExcel_Chart
-	 */
-	public function setTitle(PHPExcel_Chart_Title $title) {
-		$this->_title = $title;
-
-		return $this;
-	}
-
-	/**
-	 * Get Legend
-	 *
-	 * @return PHPExcel_Chart_Legend
-	 */
-	public function getLegend() {
-		return $this->_legend;
-	}
-
-	/**
-	 * Set Legend
-	 *
-	 * @param	PHPExcel_Chart_Legend $legend
-	 * @return	PHPExcel_Chart
-	 */
-	public function setLegend(PHPExcel_Chart_Legend $legend) {
-		$this->_legend = $legend;
-
-		return $this;
-	}
-
-	/**
-	 * Get X-Axis Label
-	 *
-	 * @return PHPExcel_Chart_Title
-	 */
-	public function getXAxisLabel() {
-		return $this->_xAxisLabel;
-	}
-
-	/**
-	 * Set X-Axis Label
-	 *
-	 * @param	PHPExcel_Chart_Title $label
-	 * @return	PHPExcel_Chart
-	 */
-	public function setXAxisLabel(PHPExcel_Chart_Title $label) {
-		$this->_xAxisLabel = $label;
-
-		return $this;
-	}
-
-	/**
-	 * Get Y-Axis Label
-	 *
-	 * @return PHPExcel_Chart_Title
-	 */
-	public function getYAxisLabel() {
-		return $this->_yAxisLabel;
-	}
-
-	/**
-	 * Set Y-Axis Label
-	 *
-	 * @param	PHPExcel_Chart_Title $label
-	 * @return	PHPExcel_Chart
-	 */
-	public function setYAxisLabel(PHPExcel_Chart_Title $label) {
-		$this->_yAxisLabel = $label;
-
-		return $this;
-	}
-
-	/**
-	 * Get Plot Area
-	 *
-	 * @return PHPExcel_Chart_PlotArea
-	 */
-	public function getPlotArea() {
-		return $this->_plotArea;
-	}
-
-	/**
-	 * Get Plot Visible Only
-	 *
-	 * @return boolean
-	 */
-	public function getPlotVisibleOnly() {
-		return $this->_plotVisibleOnly;
-	}
-
-	/**
-	 * Set Plot Visible Only
-	 *
-	 * @param boolean $plotVisibleOnly
-	 * @return PHPExcel_Chart
-	 */
-	public function setPlotVisibleOnly($plotVisibleOnly = true) {
-		$this->_plotVisibleOnly = $plotVisibleOnly;
-
-		return $this;
-	}
-
-	/**
-	 * Get Display Blanks as
-	 *
-	 * @return string
-	 */
-	public function getDisplayBlanksAs() {
-		return $this->_displayBlanksAs;
-	}
-
-	/**
-	 * Set Display Blanks as
-	 *
-	 * @param string $displayBlanksAs
-	 * @return PHPExcel_Chart
-	 */
-	public function setDisplayBlanksAs($displayBlanksAs = '0') {
-		$this->_displayBlanksAs = $displayBlanksAs;
-	}
-
-
-	/**
-	 * Set the Top Left position for the chart
-	 *
-	 * @param	string	$cell
-	 * @param	integer	$xOffset
-	 * @param	integer	$yOffset
-	 * @return PHPExcel_Chart
-	 */
-	public function setTopLeftPosition($cell, $xOffset=null, $yOffset=null) {
-		$this->_topLeftCellRef = $cell;
-		if (!is_null($xOffset))
-			$this->setTopLeftXOffset($xOffset);
-		if (!is_null($yOffset))
-			$this->setTopLeftYOffset($yOffset);
-
-		return $this;
-	}
-
-	/**
-	 * Get the top left position of the chart
-	 *
-	 * @return array	an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
-	 */
-	public function getTopLeftPosition() {
-		return array( 'cell'	=> $this->_topLeftCellRef,
-					  'xOffset'	=> $this->_topLeftXOffset,
-					  'yOffset'	=> $this->_topLeftYOffset
-					);
-	}
-
-	/**
-	 * Get the cell address where the top left of the chart is fixed
-	 *
-	 * @return string
-	 */
-	public function getTopLeftCell() {
-		return $this->_topLeftCellRef;
-	}
-
-	/**
-	 * Set the Top Left cell position for the chart
-	 *
-	 * @param	string	$cell
-	 * @return PHPExcel_Chart
-	 */
-	public function setTopLeftCell($cell) {
-		$this->_topLeftCellRef = $cell;
-
-		return $this;
-	}
-
-	public function setTopLeftOffset($xOffset=null,$yOffset=null) {
-		if (!is_null($xOffset))
-			$this->setTopLeftXOffset($xOffset);
-		if (!is_null($yOffset))
-			$this->setTopLeftYOffset($yOffset);
-
-		return $this;
-	}
-
-	public function getTopLeftOffset() {
-		return array( 'X' => $this->_topLeftXOffset,
-					  'Y' => $this->_topLeftYOffset
-					);
-	}
-
-	public function setTopLeftXOffset($xOffset) {
-		$this->_topLeftXOffset = $xOffset;
-
-		return $this;
-	}
-
-	public function getTopLeftXOffset() {
-		return $this->_topLeftXOffset;
-	}
-
-	public function setTopLeftYOffset($yOffset) {
-		$this->_topLeftYOffset = $yOffset;
-
-		return $this;
-	}
-
-	public function getTopLeftYOffset() {
-		return $this->_topLeftYOffset;
-	}
-
-	/**
-	 * Set the Bottom Right position of the chart
-	 *
-	 * @param	string	$cell
-	 * @param	integer	$xOffset
-	 * @param	integer	$yOffset
-	 * @return PHPExcel_Chart
-	 */
-	public function setBottomRightPosition($cell, $xOffset=null, $yOffset=null) {
-		$this->_bottomRightCellRef = $cell;
-		if (!is_null($xOffset))
-			$this->setBottomRightXOffset($xOffset);
-		if (!is_null($yOffset))
-			$this->setBottomRightYOffset($yOffset);
-
-		return $this;
-	}
-
-	/**
-	 * Get the bottom right position of the chart
-	 *
-	 * @return array	an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
-	 */
-	public function getBottomRightPosition() {
-		return array( 'cell'	=> $this->_bottomRightCellRef,
-					  'xOffset'	=> $this->_bottomRightXOffset,
-					  'yOffset'	=> $this->_bottomRightYOffset
-					);
-	}
-
-	public function setBottomRightCell($cell) {
-		$this->_bottomRightCellRef = $cell;
-
-		return $this;
-	}
-
-	/**
-	 * Get the cell address where the bottom right of the chart is fixed
-	 *
-	 * @return string
-	 */
-	public function getBottomRightCell() {
-		return $this->_bottomRightCellRef;
-	}
-
-	public function setBottomRightOffset($xOffset=null,$yOffset=null) {
-		if (!is_null($xOffset))
-			$this->setBottomRightXOffset($xOffset);
-		if (!is_null($yOffset))
-			$this->setBottomRightYOffset($yOffset);
-
-		return $this;
-	}
-
-	public function getBottomRightOffset() {
-		return array( 'X' => $this->_bottomRightXOffset,
-					  'Y' => $this->_bottomRightYOffset
-					);
-	}
-
-	public function setBottomRightXOffset($xOffset) {
-		$this->_bottomRightXOffset = $xOffset;
-
-		return $this;
-	}
-
-	public function getBottomRightXOffset() {
-		return $this->_bottomRightXOffset;
-	}
-
-	public function setBottomRightYOffset($yOffset) {
-		$this->_bottomRightYOffset = $yOffset;
-
-		return $this;
-	}
-
-	public function getBottomRightYOffset() {
-		return $this->_bottomRightYOffset;
-	}
-
-
-	public function refresh() {
-		if ($this->_worksheet !== NULL) {
-			$this->_plotArea->refresh($this->_worksheet);
-		}
-	}
-
-	public function render($outputDestination = null) {
-		$libraryName = PHPExcel_Settings::getChartRendererName();
-		if (is_null($libraryName)) {
-			return false;
-		}
-		//	Ensure that data series values are up-to-date before we render
-		$this->refresh();
-
-		$libraryPath = PHPExcel_Settings::getChartRendererPath();
-		$includePath = str_replace('\\','/',get_include_path());
-		$rendererPath = str_replace('\\','/',$libraryPath);
-		if (strpos($rendererPath,$includePath) === false) {
-			set_include_path(get_include_path() . PATH_SEPARATOR . $libraryPath);
-		}
-
-		$rendererName = 'PHPExcel_Chart_Renderer_'.$libraryName;
-		$renderer = new $rendererName($this);
-
-		if ($outputDestination == 'php://output') {
-			$outputDestination = null;
-		}
-		return $renderer->render($outputDestination);
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Chart/DataSeries.php b/plugins/exportTypes/Excel/PHPExcel/Chart/DataSeries.php
deleted file mode 100755
index 68073fa61..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Chart/DataSeries.php
+++ /dev/null
@@ -1,354 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_DataSeries
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_DataSeries
-{
-
-	const TYPE_BARCHART			= 'barChart';
-	const TYPE_BARCHART_3D		= 'bar3DChart';
-	const TYPE_LINECHART		= 'lineChart';
-	const TYPE_LINECHART_3D		= 'line3DChart';
-	const TYPE_AREACHART		= 'areaChart';
-	const TYPE_AREACHART_3D		= 'area3DChart';
-	const TYPE_PIECHART			= 'pieChart';
-	const TYPE_PIECHART_3D		= 'pie3DChart';
-	const TYPE_DOUGHTNUTCHART	= 'doughnutChart';
-	const TYPE_DONUTCHART		= self::TYPE_DOUGHTNUTCHART;	//	Synonym
-	const TYPE_SCATTERCHART		= 'scatterChart';
-	const TYPE_SURFACECHART		= 'surfaceChart';
-	const TYPE_SURFACECHART_3D	= 'surface3DChart';
-	const TYPE_RADARCHART		= 'radarChart';
-	const TYPE_BUBBLECHART		= 'bubbleChart';
-	const TYPE_STOCKCHART		= 'stockChart';
-
-	const GROUPING_CLUSTERED			= 'clustered';
-	const GROUPING_STACKED				= 'stacked';
-	const GROUPING_PERCENT_STACKED		= 'percentStacked';
-	const GROUPING_STANDARD				= 'standard';
-
-	const DIRECTION_BAR			= 'bar';
-	const DIRECTION_HORIZONTAL	= self::DIRECTION_BAR;
-	const DIRECTION_COL			= 'col';
-	const DIRECTION_COLUMN		= self::DIRECTION_COL;
-	const DIRECTION_VERTICAL	= self::DIRECTION_COL;
-
-	const STYLE_LINEMARKER		= 'lineMarker';
-	const STYLE_SMOOTHMARKER	= 'smoothMarker';
-	const STYLE_MARKER			= 'marker';
-	const STYLE_FILLED			= 'filled';
-
-
-	/**
-	 * Series Plot Type
-	 *
-	 * @var string
-	 */
-	private $_plotType = null;
-
-	/**
-	 * Plot Grouping Type
-	 *
-	 * @var boolean
-	 */
-	private $_plotGrouping = null;
-
-	/**
-	 * Plot Direction
-	 *
-	 * @var boolean
-	 */
-	private $_plotDirection = null;
-
-	/**
-	 * Plot Style
-	 *
-	 * @var string
-	 */
-	private $_plotStyle = null;
-
-	/**
-	 * Order of plots in Series
-	 *
-	 * @var array of integer
-	 */
-	private $_plotOrder = array();
-
-	/**
-	 * Plot Label
-	 *
-	 * @var array of PHPExcel_Chart_DataSeriesValues
-	 */
-	private $_plotLabel = array();
-
-	/**
-	 * Plot Category
-	 *
-	 * @var array of PHPExcel_Chart_DataSeriesValues
-	 */
-	private $_plotCategory = array();
-
-	/**
-	 * Smooth Line
-	 *
-	 * @var string
-	 */
-	private $_smoothLine = null;
-
-	/**
-	 * Plot Values
-	 *
-	 * @var array of PHPExcel_Chart_DataSeriesValues
-	 */
-	private $_plotValues = array();
-
-	/**
-	 * Create a new PHPExcel_Chart_DataSeries
-	 */
-	public function __construct($plotType = null, $plotGrouping = null, $plotOrder = array(), $plotLabel = array(), $plotCategory = array(), $plotValues = array(), $smoothLine = null, $plotStyle = null)
-	{
-		$this->_plotType = $plotType;
-		$this->_plotGrouping = $plotGrouping;
-		$this->_plotOrder = $plotOrder;
-		$keys = array_keys($plotValues);
-		$this->_plotValues = $plotValues;
-		if ((count($plotLabel) == 0) || (is_null($plotLabel[$keys[0]]))) {
-			$plotLabel[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
-		}
-
-		$this->_plotLabel = $plotLabel;
-		if ((count($plotCategory) == 0) || (is_null($plotCategory[$keys[0]]))) {
-			$plotCategory[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
-		}
-		$this->_plotCategory = $plotCategory;
-		$this->_smoothLine = $smoothLine;
-		$this->_plotStyle = $plotStyle;
-	}
-
-	/**
-	 * Get Plot Type
-	 *
-	 * @return string
-	 */
-	public function getPlotType() {
-		return $this->_plotType;
-	}
-
-	/**
-	 * Set Plot Type
-	 *
-	 * @param string $plotType
-	 */
-	public function setPlotType($plotType = '') {
-		$this->_plotType = $plotType;
-	}
-
-	/**
-	 * Get Plot Grouping Type
-	 *
-	 * @return string
-	 */
-	public function getPlotGrouping() {
-		return $this->_plotGrouping;
-	}
-
-	/**
-	 * Set Plot Grouping Type
-	 *
-	 * @param string $groupingType
-	 */
-	public function setPlotGrouping($groupingType = null) {
-		$this->_plotGrouping = $groupingType;
-	}
-
-	/**
-	 * Get Plot Direction
-	 *
-	 * @return string
-	 */
-	public function getPlotDirection() {
-		return $this->_plotDirection;
-	}
-
-	/**
-	 * Set Plot Direction
-	 *
-	 * @param string $plotDirection
-	 */
-	public function setPlotDirection($plotDirection = null) {
-		$this->_plotDirection = $plotDirection;
-	}
-
-	/**
-	 * Get Plot Order
-	 *
-	 * @return string
-	 */
-	public function getPlotOrder() {
-		return $this->_plotOrder;
-	}
-
-	/**
-	 * Get Plot Labels
-	 *
-	 * @return array of PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotLabels() {
-		return $this->_plotLabel;
-	}
-
-	/**
-	 * Get Plot Label by Index
-	 *
-	 * @return PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotLabelByIndex($index) {
-		$keys = array_keys($this->_plotLabel);
-		if (in_array($index,$keys)) {
-			return $this->_plotLabel[$index];
-		} elseif(isset($keys[$index])) {
-			return $this->_plotLabel[$keys[$index]];
-		}
-		return false;
-	}
-
-	/**
-	 * Get Plot Categories
-	 *
-	 * @return array of PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotCategories() {
-		return $this->_plotCategory;
-	}
-
-	/**
-	 * Get Plot Category by Index
-	 *
-	 * @return PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotCategoryByIndex($index) {
-		$keys = array_keys($this->_plotCategory);
-		if (in_array($index,$keys)) {
-			return $this->_plotCategory[$index];
-		} elseif(isset($keys[$index])) {
-			return $this->_plotCategory[$keys[$index]];
-		}
-		return false;
-	}
-
-	/**
-	 * Get Plot Style
-	 *
-	 * @return string
-	 */
-	public function getPlotStyle() {
-		return $this->_plotStyle;
-	}
-
-	/**
-	 * Set Plot Style
-	 *
-	 * @param string $plotStyle
-	 */
-	public function setPlotStyle($plotStyle = null) {
-		$this->_plotStyle = $plotStyle;
-	}
-
-	/**
-	 * Get Plot Values
-	 *
-	 * @return array of PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotValues() {
-		return $this->_plotValues;
-	}
-
-	/**
-	 * Get Plot Values by Index
-	 *
-	 * @return PHPExcel_Chart_DataSeriesValues
-	 */
-	public function getPlotValuesByIndex($index) {
-		$keys = array_keys($this->_plotValues);
-		if (in_array($index,$keys)) {
-			return $this->_plotValues[$index];
-		} elseif(isset($keys[$index])) {
-			return $this->_plotValues[$keys[$index]];
-		}
-		return false;
-	}
-
-	/**
-	 * Get Number of Plot Series
-	 *
-	 * @return integer
-	 */
-	public function getPlotSeriesCount() {
-		return count($this->_plotValues);
-	}
-
-	/**
-	 * Get Smooth Line
-	 *
-	 * @return boolean
-	 */
-	public function getSmoothLine() {
-		return $this->_smoothLine;
-	}
-
-	/**
-	 * Set Smooth Line
-	 *
-	 * @param boolean $smoothLine
-	 */
-	public function setSmoothLine($smoothLine = TRUE) {
-		$this->_smoothLine = $smoothLine;
-	}
-
-	public function refresh(PHPExcel_Worksheet $worksheet) {
-	    foreach($this->_plotValues as $plotValues) {
-			if ($plotValues !== NULL)
-				$plotValues->refresh($worksheet, TRUE);
-		}
-		foreach($this->_plotLabel as $plotValues) {
-			if ($plotValues !== NULL)
-				$plotValues->refresh($worksheet, TRUE);
-		}
-		foreach($this->_plotCategory as $plotValues) {
-			if ($plotValues !== NULL)
-				$plotValues->refresh($worksheet, FALSE);
-		}
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Chart/DataSeriesValues.php b/plugins/exportTypes/Excel/PHPExcel/Chart/DataSeriesValues.php
deleted file mode 100755
index 3b135ba6c..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Chart/DataSeriesValues.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_DataSeriesValues
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_DataSeriesValues
-{
-
-	const DATASERIES_TYPE_STRING	= 'String';
-	const DATASERIES_TYPE_NUMBER	= 'Number';
-
-	private static $_dataTypeValues = array(
-		self::DATASERIES_TYPE_STRING,
-		self::DATASERIES_TYPE_NUMBER,
-	);
-
-	/**
-	 * Series Data Type
-	 *
-	 * @var	string
-	 */
-	private $_dataType = null;
-
-	/**
-	 * Series Data Source
-	 *
-	 * @var	string
-	 */
-	private $_dataSource = null;
-
-	/**
-	 * Format Code
-	 *
-	 * @var	string
-	 */
-	private $_formatCode = null;
-
-	/**
-	 * Series Point Marker
-	 *
-	 * @var	string
-	 */
-	private $_marker = null;
-
-	/**
-	 * Point Count (The number of datapoints in the dataseries)
-	 *
-	 * @var	integer
-	 */
-	private $_pointCount = 0;
-
-	/**
-	 * Data Values
-	 *
-	 * @var	array of mixed
-	 */
-	private $_dataValues = array();
-
-	/**
-	 * Create a new PHPExcel_Chart_DataSeriesValues object
-	 */
-	public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = array(), $marker = null)
-	{
-		$this->setDataType($dataType);
-		$this->_dataSource = $dataSource;
-		$this->_formatCode = $formatCode;
-		$this->_pointCount = $pointCount;
-		$this->_dataValues = $dataValues;
-		$this->_marker = $marker;
-	}
-
-	/**
-	 * Get Series Data Type
-	 *
-	 * @return	string
-	 */
-	public function getDataType() {
-		return $this->_dataType;
-	}
-
-	/**
-	 * Set Series Data Type
-	 *
-	 * @param	string	$dataType	Datatype of this data series
-	 *								Typical values are:
-	 *									PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_STRING
-	 *										Normally used for axis point values
-	 *									PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_NUMBER
-	 *										Normally used for chart data values
-	 * @return	PHPExcel_Chart_DataSeriesValues
-	 */
-	public function setDataType($dataType = self::DATASERIES_TYPE_NUMBER) {
-		if (!in_array($dataType, self::$_dataTypeValues)) {
-    		throw new PHPExcel_Chart_Exception('Invalid datatype for chart data series values');
-		}
-		$this->_dataType = $dataType;
-
-		return $this;
-	}
-
-	/**
-	 * Get Series Data Source (formula)
-	 *
-	 * @return	string
-	 */
-	public function getDataSource() {
-		return $this->_dataSource;
-	}
-
-	/**
-	 * Set Series Data Source (formula)
-	 *
-	 * @param	string	$dataSource
-	 * @return	PHPExcel_Chart_DataSeriesValues
-	 */
-	public function setDataSource($dataSource = null, $refreshDataValues = true) {
-		$this->_dataSource = $dataSource;
-
-		if ($refreshDataValues) {
-			//	TO DO
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get Point Marker
-	 *
-	 * @return string
-	 */
-	public function getPointMarker() {
-		return $this->_marker;
-	}
-
-	/**
-	 * Set Point Marker
-	 *
-	 * @param	string	$marker
-	 * @return	PHPExcel_Chart_DataSeriesValues
-	 */
-	public function setPointMarker($marker = null) {
-		$this->_marker = $marker;
-
-		return $this;
-	}
-
-	/**
-	 * Get Series Format Code
-	 *
-	 * @return	string
-	 */
-	public function getFormatCode() {
-		return $this->_formatCode;
-	}
-
-	/**
-	 * Set Series Format Code
-	 *
-	 * @param	string	$formatCode
-	 * @return	PHPExcel_Chart_DataSeriesValues
-	 */
-	public function setFormatCode($formatCode = null) {
-		$this->_formatCode = $formatCode;
-
-		return $this;
-	}
-
-	/**
-	 * Get Series Point Count
-	 *
-	 * @return	integer
-	 */
-	public function getPointCount() {
-		return $this->_pointCount;
-	}
-
-	/**
-	 * Identify if the Data Series is a multi-level or a simple series
-	 *
-	 * @return	boolean
-	 */
-	public function isMultiLevelSeries() {
-		if (count($this->_dataValues) > 0) {
-			return is_array($this->_dataValues[0]);
-		}
-		return null;
-	}
-
-	/**
-	 * Return the level count of a multi-level Data Series
-	 *
-	 * @return	boolean
-	 */
-	public function multiLevelCount() {
-		$levelCount = 0;
-		foreach($this->_dataValues as $dataValueSet) {
-			$levelCount = max($levelCount,count($dataValueSet));
-		}
-		return $levelCount;
-	}
-
-	/**
-	 * Get Series Data Values
-	 *
-	 * @return	array of mixed
-	 */
-	public function getDataValues() {
-		return $this->_dataValues;
-	}
-
-	/**
-	 * Get the first Series Data value
-	 *
-	 * @return	mixed
-	 */
-	public function getDataValue() {
-		$count = count($this->_dataValues);
-		if ($count == 0) {
-			return null;
-		} elseif ($count == 1) {
-			return $this->_dataValues[0];
-		}
-		return $this->_dataValues;
-	}
-
-	/**
-	 * Set Series Data Values
-	 *
-	 * @param	array	$dataValues
-	 * @param	boolean	$refreshDataSource
-	 *					TRUE - refresh the value of _dataSource based on the values of $dataValues
-	 *					FALSE - don't change the value of _dataSource
-	 * @return	PHPExcel_Chart_DataSeriesValues
-	 */
-	public function setDataValues($dataValues = array(), $refreshDataSource = TRUE) {
-		$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($dataValues);
-		$this->_pointCount = count($dataValues);
-
-		if ($refreshDataSource) {
-			//	TO DO
-		}
-
-		return $this;
-	}
-
-	private function _stripNulls($var) {
-		return $var !== NULL;
-	}
-
-	public function refresh(PHPExcel_Worksheet $worksheet, $flatten = TRUE) {
-        if ($this->_dataSource !== NULL) {
-        	$calcEngine = PHPExcel_Calculation::getInstance();
-			$newDataValues = PHPExcel_Calculation::_unwrapResult(
-			    $calcEngine->_calculateFormulaValue(
-			        '='.$this->_dataSource,
-			        NULL,
-			        $worksheet->getCell('A1')
-			    )
-			);
-			if ($flatten) {
-				$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
-			} else {
-				$newArray = array_values(array_shift($newDataValues));
-				foreach($newArray as $i => $newDataSet) {
-					$newArray[$i] = array($newDataSet);
-				}
-
-				foreach($newDataValues as $newDataSet) {
-					$i = 0;
-					foreach($newDataSet as $newDataVal) {
-						array_unshift($newArray[$i++],$newDataVal);
-					}
-				}
-				$this->_dataValues = $newArray;
-			}
-
-			$this->_pointCount = count($this->_dataValues);
-		}
-
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Chart/Exception.php b/plugins/exportTypes/Excel/PHPExcel/Chart/Exception.php
deleted file mode 100755
index 0c296ba18..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Chart/Exception.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Chart
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel_Chart
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_Exception extends Exception {
-	/**
-	 * Error handler callback
-	 *
-	 * @param mixed $code
-	 * @param mixed $string
-	 * @param mixed $file
-	 * @param mixed $line
-	 * @param mixed $context
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Chart/Layout.php b/plugins/exportTypes/Excel/PHPExcel/Chart/Layout.php
deleted file mode 100755
index f12cae60a..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Chart/Layout.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_Layout
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_Layout
-{
-	/**
-	 * layoutTarget
-	 *
-	 * @var string
-	 */
-	private $_layoutTarget = NULL;
-
-	/**
-	 * X Mode
-	 *
-	 * @var string
-	 */
-	private $_xMode		= NULL;
-
-	/**
-	 * Y Mode
-	 *
-	 * @var string
-	 */
-	private $_yMode		= NULL;
-
-	/**
-	 * X-Position
-	 *
-	 * @var float
-	 */
-	private $_xPos		= NULL;
-
-	/**
-	 * Y-Position
-	 *
-	 * @var float
-	 */
-	private $_yPos		= NULL;
-
-	/**
-	 * width
-	 *
-	 * @var float
-	 */
-	private $_width		= NULL;
-
-	/**
-	 * height
-	 *
-	 * @var float
-	 */
-	private $_height	= NULL;
-
-	/**
-	 * show legend key
-	 * Specifies that legend keys should be shown in data labels
-	 *
-	 * @var boolean
-	 */
-	private $_showLegendKey	= NULL;
-
-	/**
-	 * show value
-	 * Specifies that the value should be shown in a data label.
-	 *
-	 * @var boolean
-	 */
-	private $_showVal	= NULL;
-
-	/**
-	 * show category name
-	 * Specifies that the category name should be shown in the data label.
-	 *
-	 * @var boolean
-	 */
-	private $_showCatName	= NULL;
-
-	/**
-	 * show data series name
-	 * Specifies that the series name should be shown in the data label.
-	 *
-	 * @var boolean
-	 */
-	private $_showSerName	= NULL;
-
-	/**
-	 * show percentage
-	 * Specifies that the percentage should be shown in the data label.
-	 *
-	 * @var boolean
-	 */
-	private $_showPercent	= NULL;
-
-	/**
-	 * show bubble size
-	 *
-	 * @var boolean
-	 */
-	private $_showBubbleSize	= NULL;
-
-	/**
-	 * show leader lines
-	 * Specifies that leader lines should be shown for the data label.
-	 *
-	 * @var boolean
-	 */
-	private $_showLeaderLines	= NULL;
-
-
-	/**
-	 * Create a new PHPExcel_Chart_Layout
-	 */
-	public function __construct($layout=array())
-	{
-		if (isset($layout['layoutTarget']))	{ $this->_layoutTarget	= $layout['layoutTarget'];	}
-		if (isset($layout['xMode']))		{ $this->_xMode			= $layout['xMode'];			}
-		if (isset($layout['yMode']))		{ $this->_yMode			= $layout['yMode'];			}
-		if (isset($layout['x']))			{ $this->_xPos			= (float) $layout['x'];		}
-		if (isset($layout['y']))			{ $this->_yPos			= (float) $layout['y'];		}
-		if (isset($layout['w']))			{ $this->_width			= (float) $layout['w'];		}
-		if (isset($layout['h']))			{ $this->_height		= (float) $layout['h'];		}
-	}
-
-	/**
-	 * Get Layout Target
-	 *
-	 * @return string
-	 */
-	public function getLayoutTarget() {
-		return $this->_layoutTarget;
-	}
-
-	/**
-	 * Set Layout Target
-	 *
-	 * @param Layout Target $value
-	 */
-	public function setLayoutTarget($value) {
-		$this->_layoutTarget = $value;
-	}
-
-	/**
-	 * Get X-Mode
-	 *
-	 * @return string
-	 */
-	public function getXMode() {
-		return $this->_xMode;
-	}
-
-	/**
-	 * Set X-Mode
-	 *
-	 * @param X-Mode $value
-	 */
-	public function setXMode($value) {
-		$this->_xMode = $value;
-	}
-
-	/**
-	 * Get Y-Mode
-	 *
-	 * @return string
-	 */
-	public function getYMode() {
-		return $this->_xMode;
-	}
-
-	/**
-	 * Set Y-Mode
-	 *
-	 * @param Y-Mode $value
-	 */
-	public function setYMode($value) {
-		$this->_xMode = $value;
-	}
-
-	/**
-	 * Get X-Position
-	 *
-	 * @return number
-	 */
-	public function getXPosition() {
-		return $this->_xPos;
-	}
-
-	/**
-	 * Set X-Position
-	 *
-	 * @param X-Position $value
-	 */
-	public function setXPosition($value) {
-		$this->_xPos = $value;
-	}
-
-	/**
-	 * Get Y-Position
-	 *
-	 * @return number
-	 */
-	public function getYPosition() {
-		return $this->_yPos;
-	}
-
-	/**
-	 * Set Y-Position
-	 *
-	 * @param Y-Position $value
-	 */
-	public function setYPosition($value) {
-		$this->_yPos = $value;
-	}
-
-	/**
-	 * Get Width
-	 *
-	 * @return number
-	 */
-	public function getWidth() {
-		return $this->_width;
-	}
-
-	/**
-	 * Set Width
-	 *
-	 * @param Width $value
-	 */
-	public function setWidth($value) {
-		$this->_width = $value;
-	}
-
-	/**
-	 * Get Height
-	 *
-	 * @return number
-	 */
-	public function getHeight() {
-		return $this->_height;
-	}
-
-	/**
-	 * Set Height
-	 *
-	 * @param Height $value
-	 */
-	public function setHeight($value) {
-		$this->_height = $value;
-	}
-
-
-	/**
-	 * Get show legend key
-	 *
-	 * @return boolean
-	 */
-	public function getShowLegendKey() {
-		return $this->_showLegendKey;
-	}
-
-	/**
-	 * Set show legend key
-	 * Specifies that legend keys should be shown in data labels.
-	 *
-	 * @param boolean $value		Show legend key
-	 */
-	public function setShowLegendKey($value) {
-		$this->_showLegendKey = $value;
-	}
-
-	/**
-	 * Get show value
-	 *
-	 * @return boolean
-	 */
-	public function getShowVal() {
-		return $this->_showVal;
-	}
-
-	/**
-	 * Set show val
-	 * Specifies that the value should be shown in data labels.
-	 *
-	 * @param boolean $value		Show val
-	 */
-	public function setShowVal($value) {
-		$this->_showVal = $value;
-	}
-
-	/**
-	 * Get show category name
-	 *
-	 * @return boolean
-	 */
-	public function getShowCatName() {
-		return $this->_showCatName;
-	}
-
-	/**
-	 * Set show cat name
-	 * Specifies that the category name should be shown in data labels.
-	 *
-	 * @param boolean $value		Show cat name
-	 */
-	public function setShowCatName($value) {
-		$this->_showCatName = $value;
-	}
-
-	/**
-	 * Get show data series name
-	 *
-	 * @return boolean
-	 */
-	public function getShowSerName() {
-		return $this->_showSerName;
-	}
-
-	/**
-	 * Set show ser name
-	 * Specifies that the series name should be shown in data labels.
-	 *
-	 * @param boolean $value		Show ser name
-	 */
-	public function setShowSerName($value) {
-		$this->_showSerName = $value;
-	}
-
-	/**
-	 * Get show percentage
-	 *
-	 * @return boolean
-	 */
-	public function getShowPercent() {
-		return $this->_showPercent;
-	}
-
-	/**
-	 * Set show percentage
-	 * Specifies that the percentage should be shown in data labels.
-	 *
-	 * @param boolean $value		Show percentage
-	 */
-	public function setShowPercent($value) {
-		$this->_showPercent = $value;
-	}
-
-	/**
-	 * Get show bubble size
-	 *
-	 * @return boolean
-	 */
-	public function getShowBubbleSize() {
-		return $this->_showBubbleSize;
-	}
-
-	/**
-	 * Set show bubble size
-	 * Specifies that the bubble size should be shown in data labels.
-	 *
-	 * @param boolean $value		Show bubble size
-	 */
-	public function setShowBubbleSize($value) {
-		$this->_showBubbleSize = $value;
-	}
-
-	/**
-	 * Get show leader lines
-	 *
-	 * @return boolean
-	 */
-	public function getShowLeaderLines() {
-		return $this->_showLeaderLines;
-	}
-
-	/**
-	 * Set show leader lines
-	 * Specifies that leader lines should be shown in data labels.
-	 *
-	 * @param boolean $value		Show leader lines
-	 */
-	public function setShowLeaderLines($value) {
-		$this->_showLeaderLines = $value;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Chart/Legend.php b/plugins/exportTypes/Excel/PHPExcel/Chart/Legend.php
deleted file mode 100755
index 80b54ff8c..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Chart/Legend.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_Legend
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_Legend
-{
-	/** Legend positions */
-	const xlLegendPositionBottom	= -4107;	//	Below the chart.
-	const xlLegendPositionCorner	= 2;		//	In the upper right-hand corner of the chart border.
-	const xlLegendPositionCustom	= -4161;	//	A custom position.
-	const xlLegendPositionLeft		= -4131;	//	Left of the chart.
-	const xlLegendPositionRight		= -4152;	//	Right of the chart.
-	const xlLegendPositionTop		= -4160;	//	Above the chart.
-
-	const POSITION_RIGHT	= 'r';
-	const POSITION_LEFT		= 'l';
-	const POSITION_BOTTOM	= 'b';
-	const POSITION_TOP		= 't';
-	const POSITION_TOPRIGHT	= 'tr';
-
-	private static $_positionXLref = array( self::xlLegendPositionBottom	=> self::POSITION_BOTTOM,
-											self::xlLegendPositionCorner	=> self::POSITION_TOPRIGHT,
-											self::xlLegendPositionCustom	=> '??',
-											self::xlLegendPositionLeft		=> self::POSITION_LEFT,
-											self::xlLegendPositionRight		=> self::POSITION_RIGHT,
-											self::xlLegendPositionTop		=> self::POSITION_TOP
-										  );
-
-	/**
-	 * Legend position
-	 *
-	 * @var	string
-	 */
-	private $_position = self::POSITION_RIGHT;
-
-	/**
-	 * Allow overlay of other elements?
-	 *
-	 * @var	boolean
-	 */
-	private $_overlay = TRUE;
-
-	/**
-	 * Legend Layout
-	 *
-	 * @var	PHPExcel_Chart_Layout
-	 */
-	private $_layout = NULL;
-
-
-	/**
-	 *	Create a new PHPExcel_Chart_Legend
-	 */
-	public function __construct($position = self::POSITION_RIGHT, PHPExcel_Chart_Layout $layout = NULL, $overlay = FALSE)
-	{
-		$this->setPosition($position);
-		$this->_layout = $layout;
-		$this->setOverlay($overlay);
-	}
-
-	/**
-	 * Get legend position as an excel string value
-	 *
-	 * @return	string
-	 */
-	public function getPosition() {
-		return $this->_position;
-	}
-
-	/**
-	 * Get legend position using an excel string value
-	 *
-	 * @param	string	$position
-	 */
-	public function setPosition($position = self::POSITION_RIGHT) {
-		if (!in_array($position,self::$_positionXLref)) {
-			return false;
-		}
-
-		$this->_position = $position;
-		return true;
-	}
-
-	/**
-	 * Get legend position as an Excel internal numeric value
-	 *
-	 * @return	number
-	 */
-	public function getPositionXL() {
-		return array_search($this->_position,self::$_positionXLref);
-	}
-
-	/**
-	 * Set legend position using an Excel internal numeric value
-	 *
-	 * @param	number	$positionXL
-	 */
-	public function setPositionXL($positionXL = self::xlLegendPositionRight) {
-		if (!array_key_exists($positionXL,self::$_positionXLref)) {
-			return false;
-		}
-
-		$this->_position = self::$_positionXLref[$positionXL];
-		return true;
-	}
-
-	/**
-	 * Get allow overlay of other elements?
-	 *
-	 * @return	boolean
-	 */
-	public function getOverlay() {
-		return $this->_overlay;
-	}
-
-	/**
-	 * Set allow overlay of other elements?
-	 *
-	 * @param	boolean	$overlay
-	 * @return	boolean
-	 */
-	public function setOverlay($overlay = FALSE) {
-		if (!is_bool($overlay)) {
-			return false;
-		}
-
-		$this->_overlay = $overlay;
-		return true;
-	}
-
-	/**
-	 * Get Layout
-	 *
-	 * @return PHPExcel_Chart_Layout
-	 */
-	public function getLayout() {
-		return $this->_layout;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Chart/PlotArea.php b/plugins/exportTypes/Excel/PHPExcel/Chart/PlotArea.php
deleted file mode 100755
index ec9aee83e..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Chart/PlotArea.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_PlotArea
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_PlotArea
-{
-	/**
-	 * PlotArea Layout
-	 *
-	 * @var PHPExcel_Chart_Layout
-	 */
-	private $_layout = null;
-
-	/**
-	 * Plot Series
-	 *
-	 * @var array of PHPExcel_Chart_DataSeries
-	 */
-	private $_plotSeries = array();
-
-	/**
-	 * Create a new PHPExcel_Chart_PlotArea
-	 */
-	public function __construct(PHPExcel_Chart_Layout $layout = null, $plotSeries = array())
-	{
-		$this->_layout = $layout;
-		$this->_plotSeries = $plotSeries;
-	}
-
-	/**
-	 * Get Layout
-	 *
-	 * @return PHPExcel_Chart_Layout
-	 */
-	public function getLayout() {
-		return $this->_layout;
-	}
-
-	/**
-	 * Get Number of Plot Groups
-	 *
-	 * @return array of PHPExcel_Chart_DataSeries
-	 */
-	public function getPlotGroupCount() {
-		return count($this->_plotSeries);
-	}
-
-	/**
-	 * Get Number of Plot Series
-	 *
-	 * @return integer
-	 */
-	public function getPlotSeriesCount() {
-		$seriesCount = 0;
-		foreach($this->_plotSeries as $plot) {
-			$seriesCount += $plot->getPlotSeriesCount();
-		}
-		return $seriesCount;
-	}
-
-	/**
-	 * Get Plot Series
-	 *
-	 * @return array of PHPExcel_Chart_DataSeries
-	 */
-	public function getPlotGroup() {
-		return $this->_plotSeries;
-	}
-
-	/**
-	 * Get Plot Series by Index
-	 *
-	 * @return PHPExcel_Chart_DataSeries
-	 */
-	public function getPlotGroupByIndex($index) {
-		return $this->_plotSeries[$index];
-	}
-
-	/**
-	 * Set Plot Series
-	 *
-	 * @param array of PHPExcel_Chart_DataSeries
-	 */
-	public function setPlotSeries($plotSeries = array()) {
-		$this->_plotSeries = $plotSeries;
-	}
-
-	public function refresh(PHPExcel_Worksheet $worksheet) {
-	    foreach($this->_plotSeries as $plotSeries) {
-			$plotSeries->refresh($worksheet);
-		}
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt b/plugins/exportTypes/Excel/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
deleted file mode 100755
index 20a825885..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt	
+++ /dev/null
@@ -1,17 +0,0 @@
-ChartDirector
-	http://www.advsofteng.com/cdphp.html
-
-GraPHPite
-	http://graphpite.sourceforge.net/
-
-JpGraph
-	http://www.aditus.nu/jpgraph/
-
-LibChart
-	http://naku.dohcrew.com/libchart/pages/introduction/
-
-pChart
-	http://pchart.sourceforge.net/
-
-TeeChart
-	http://www.steema.com/products/teechart/overview.html
diff --git a/plugins/exportTypes/Excel/PHPExcel/Chart/Renderer/jpgraph.php b/plugins/exportTypes/Excel/PHPExcel/Chart/Renderer/jpgraph.php
deleted file mode 100755
index e03001e17..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Chart/Renderer/jpgraph.php
+++ /dev/null
@@ -1,839 +0,0 @@
-<?php
-
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-require_once(PHPExcel_Settings::getChartRendererPath().'/jpgraph.php');
-
-
-/**
- * PHPExcel_Chart_Renderer_jpgraph
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart_Renderer
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_Renderer_jpgraph
-{
-	private static $_width	= 640;
-
-	private static $_height	= 480;
-
-	private static $_colourSet = array( 'mediumpurple1',	'palegreen3',	'gold1',		'cadetblue1',
-										'darkmagenta',		'coral',		'dodgerblue3',	'eggplant',
-										'mediumblue',		'magenta',		'sandybrown',	'cyan',
-										'firebrick1',		'forestgreen',	'deeppink4',	'darkolivegreen',
-										'goldenrod2'
-									  );
-
-	private static $_markSet = array(	'diamond'	=> MARK_DIAMOND,
-										'square'	=> MARK_SQUARE,
-										'triangle'	=> MARK_UTRIANGLE,
-										'x'			=> MARK_X,
-										'star'		=> MARK_STAR,
-										'dot'		=> MARK_FILLEDCIRCLE,
-										'dash'		=> MARK_DTRIANGLE,
-										'circle'	=> MARK_CIRCLE,
-										'plus'		=> MARK_CROSS
-									);
-
-
-	private $_chart	= null;
-
-	private $_graph	= null;
-
-	private static $_plotColour	= 0;
-
-	private static $_plotMark	= 0;
-
-
-	private function _formatPointMarker($seriesPlot,$markerID) {
-		$plotMarkKeys = array_keys(self::$_markSet);
-		if (is_null($markerID)) {
-			//	Use default plot marker (next marker in the series)
-			self::$_plotMark %= count(self::$_markSet);
-			$seriesPlot->mark->SetType(self::$_markSet[$plotMarkKeys[self::$_plotMark++]]);
-		} elseif ($markerID !== 'none') {
-			//	Use specified plot marker (if it exists)
-			if (isset(self::$_markSet[$markerID])) {
-				$seriesPlot->mark->SetType(self::$_markSet[$markerID]);
-			} else {
-				//	If the specified plot marker doesn't exist, use default plot marker (next marker in the series)
-				self::$_plotMark %= count(self::$_markSet);
-				$seriesPlot->mark->SetType(self::$_markSet[$plotMarkKeys[self::$_plotMark++]]);
-			}
-		} else {
-			//	Hide plot marker
-			$seriesPlot->mark->Hide();
-		}
-		$seriesPlot->mark->SetColor(self::$_colourSet[self::$_plotColour]);
-		$seriesPlot->mark->SetFillColor(self::$_colourSet[self::$_plotColour]);
-		$seriesPlot->SetColor(self::$_colourSet[self::$_plotColour++]);
-
-		return $seriesPlot;
-	}	//	function _formatPointMarker()
-
-
-	private function _formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '') {
-		$datasetLabelFormatCode = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
-		if (!is_null($datasetLabelFormatCode)) {
-			//	Retrieve any label formatting code
-			$datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
-		}
-
-		$testCurrentIndex = 0;
-		foreach($datasetLabels as $i => $datasetLabel) {
-			array_reverse($datasetLabel);
-
-			if (is_array($datasetLabel)) {
-				if ($rotation == 'bar') {
-					$datasetLabel = array_reverse($datasetLabel);
-					$datasetLabels[$i] = implode(" ",$datasetLabel);
-				} else {
-					$datasetLabels[$i] = implode("\n",$datasetLabel);
-				}
-			} else {
-				//	Format labels according to any formatting code
-				if (!is_null($datasetLabelFormatCode)) {
-					$datasetLabels[$i] = PHPExcel_Style_NumberFormat::toFormattedString($datasetLabel,$datasetLabelFormatCode);
-				}
-			}
-			++$testCurrentIndex;
-		}
-
-		return $datasetLabels;
-	}	//	function _formatDataSetLabels()
-
-
-	private function _percentageSumCalculation($groupID,$seriesCount) {
-		//	Adjust our values to a percentage value across all series in the group
-		for($i = 0; $i < $seriesCount; ++$i) {
-			if ($i == 0) {
-				$sumValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-			} else {
-				$nextValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-				foreach($nextValues as $k => $value) {
-					if (isset($sumValues[$k])) {
-						$sumValues[$k] += $value;
-					} else {
-						$sumValues[$k] = $value;
-					}
-				}
-			}
-		}
-
-		return $sumValues;
-	}	//	function _percentageSumCalculation()
-
-
-	private function _percentageAdjustValues($dataValues,$sumValues) {
-		foreach($dataValues as $k => $dataValue) {
-			$dataValues[$k] = $dataValue / $sumValues[$k] * 100;
-		}
-
-		return $dataValues;
-	}	//	function _percentageAdjustValues()
-
-
-	private function _getCaption($captionElement) {
-		//	Read any caption
-		$caption = (!is_null($captionElement)) ? $captionElement->getCaption() : NULL;
-		//	Test if we have a title caption to display
-		if (!is_null($caption)) {
-			//	If we do, it could be a plain string or an array
-			if (is_array($caption)) {
-				//	Implode an array to a plain string
-				$caption = implode('',$caption);
-			}
-		}
-		return $caption;
-	}	//	function _getCaption()
-
-
-	private function _renderTitle() {
-		$title = $this->_getCaption($this->_chart->getTitle());
-		if (!is_null($title)) {
-			$this->_graph->title->Set($title);
-		}
-	}	//	function _renderTitle()
-
-
-	private function _renderLegend() {
-		$legend = $this->_chart->getLegend();
-		if (!is_null($legend)) {
-			$legendPosition = $legend->getPosition();
-			$legendOverlay = $legend->getOverlay();
-			switch ($legendPosition) {
-				case 'r'	:
-					$this->_graph->legend->SetPos(0.01,0.5,'right','center');	//	right
-					$this->_graph->legend->SetColumns(1);
-					break;
-				case 'l'	:
-					$this->_graph->legend->SetPos(0.01,0.5,'left','center');	//	left
-					$this->_graph->legend->SetColumns(1);
-					break;
-				case 't'	:
-					$this->_graph->legend->SetPos(0.5,0.01,'center','top');	//	top
-					break;
-				case 'b'	:
-					$this->_graph->legend->SetPos(0.5,0.99,'center','bottom');	//	bottom
-					break;
-				default		:
-					$this->_graph->legend->SetPos(0.01,0.01,'right','top');	//	top-right
-					$this->_graph->legend->SetColumns(1);
-					break;
-			}
-		} else {
-			$this->_graph->legend->Hide();
-		}
-	}	//	function _renderLegend()
-
-
-	private function _renderCartesianPlotArea($type='textlin') {
-		$this->_graph = new Graph(self::$_width,self::$_height);
-		$this->_graph->SetScale($type);
-
-		$this->_renderTitle();
-
-		//	Rotate for bar rather than column chart
-		$rotation = $this->_chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotDirection();
-		$reverse = ($rotation == 'bar') ? true : false;
-
-		$xAxisLabel = $this->_chart->getXAxisLabel();
-		if (!is_null($xAxisLabel)) {
-			$title = $this->_getCaption($xAxisLabel);
-			if (!is_null($title)) {
-				$this->_graph->xaxis->SetTitle($title,'center');
-				$this->_graph->xaxis->title->SetMargin(35);
-				if ($reverse) {
-					$this->_graph->xaxis->title->SetAngle(90);
-					$this->_graph->xaxis->title->SetMargin(90);
-				}
-			}
-		}
-
-		$yAxisLabel = $this->_chart->getYAxisLabel();
-		if (!is_null($yAxisLabel)) {
-			$title = $this->_getCaption($yAxisLabel);
-			if (!is_null($title)) {
-				$this->_graph->yaxis->SetTitle($title,'center');
-				if ($reverse) {
-					$this->_graph->yaxis->title->SetAngle(0);
-					$this->_graph->yaxis->title->SetMargin(-55);
-				}
-			}
-		}
-	}	//	function _renderCartesianPlotArea()
-
-
-	private function _renderPiePlotArea($doughnut = False) {
-		$this->_graph = new PieGraph(self::$_width,self::$_height);
-
-		$this->_renderTitle();
-	}	//	function _renderPiePlotArea()
-
-
-	private function _renderRadarPlotArea() {
-		$this->_graph = new RadarGraph(self::$_width,self::$_height);
-		$this->_graph->SetScale('lin');
-
-		$this->_renderTitle();
-	}	//	function _renderRadarPlotArea()
-
-
-	private function _renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d') {
-		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-
-        $labelCount = count($this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
-		if ($labelCount > 0) {
-			$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-			$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $labelCount);
-			$this->_graph->xaxis->SetTickLabels($datasetLabels);
-		}
-
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$seriesPlots = array();
-		if ($grouping == 'percentStacked') {
-			$sumValues = $this->_percentageSumCalculation($groupID,$seriesCount);
-		}
-
-		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
-			$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-			$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-
-			if ($grouping == 'percentStacked') {
-				$dataValues = $this->_percentageAdjustValues($dataValues,$sumValues);
-			}
-
-			//	Fill in any missing values in the $dataValues array
-			$testCurrentIndex = 0;
-			foreach($dataValues as $k => $dataValue) {
-				while($k != $testCurrentIndex) {
-					$dataValues[$testCurrentIndex] = null;
-					++$testCurrentIndex;
-				}
-				++$testCurrentIndex;
-			}
-
-			$seriesPlot = new LinePlot($dataValues);
-			if ($combination) {
-				$seriesPlot->SetBarCenter();
-			}
-
-			if ($filled) {
-				$seriesPlot->SetFilled(true);
-				$seriesPlot->SetColor('black');
-				$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour++]);
-			} else {
-				//	Set the appropriate plot marker
-				$this->_formatPointMarker($seriesPlot,$marker);
-			}
-			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-			$seriesPlot->SetLegend($dataLabel);
-
-			$seriesPlots[] = $seriesPlot;
-		}
-
-		if ($grouping == 'standard') {
-			$groupPlot = $seriesPlots;
-		} else {
-			$groupPlot = new AccLinePlot($seriesPlots);
-		}
-		$this->_graph->Add($groupPlot);
-	}	//	function _renderPlotLine()
-
-
-	private function _renderPlotBar($groupID, $dimensions = '2d') {
-		$rotation = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
-		//	Rotate for bar rather than column chart
-		if (($groupID == 0) && ($rotation == 'bar')) {
-			$this->_graph->Set90AndMargin();
-		}
-		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-
-        $labelCount = count($this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
-		if ($labelCount > 0) {
-			$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-			$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation);
-			//	Rotate for bar rather than column chart
-			if ($rotation == 'bar') {
-				$datasetLabels = array_reverse($datasetLabels);
-				$this->_graph->yaxis->SetPos('max');
-				$this->_graph->yaxis->SetLabelAlign('center','top');
-				$this->_graph->yaxis->SetLabelSide(SIDE_RIGHT);
-			}
-			$this->_graph->xaxis->SetTickLabels($datasetLabels);
-		}
-
-
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$seriesPlots = array();
-		if ($grouping == 'percentStacked') {
-			$sumValues = $this->_percentageSumCalculation($groupID,$seriesCount);
-		}
-
-		//	Loop through each data series in turn
-		for($j = 0; $j < $seriesCount; ++$j) {
-			$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
-			if ($grouping == 'percentStacked') {
-				$dataValues = $this->_percentageAdjustValues($dataValues,$sumValues);
-			}
-
-			//	Fill in any missing values in the $dataValues array
-			$testCurrentIndex = 0;
-			foreach($dataValues as $k => $dataValue) {
-				while($k != $testCurrentIndex) {
-					$dataValues[$testCurrentIndex] = null;
-					++$testCurrentIndex;
-				}
-				++$testCurrentIndex;
-			}
-
-			//	Reverse the $dataValues order for bar rather than column chart
-			if ($rotation == 'bar') {
-				$dataValues = array_reverse($dataValues);
-			}
-			$seriesPlot = new BarPlot($dataValues);
-			$seriesPlot->SetColor('black');
-			$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour++]);
-			if ($dimensions == '3d') {
-				$seriesPlot->SetShadow();
-			}
-			if (!$this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
-				$dataLabel = '';
-			} else {
-				$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)->getDataValue();
-			}
-			$seriesPlot->SetLegend($dataLabel);
-
-			$seriesPlots[] = $seriesPlot;
-		}
-		//	Reverse the plot order for bar rather than column chart
-		if (($rotation == 'bar') && (!($grouping == 'percentStacked'))) {
-			$seriesPlots = array_reverse($seriesPlots);
-		}
-
-		if ($grouping == 'clustered') {
-			$groupPlot = new GroupBarPlot($seriesPlots);
-		} elseif ($grouping == 'standard') {
-			$groupPlot = new GroupBarPlot($seriesPlots);
-		} else {
-			$groupPlot = new AccBarPlot($seriesPlots);
-			if ($dimensions == '3d') {
-				$groupPlot->SetShadow();
-			}
-		}
-
-		$this->_graph->Add($groupPlot);
-	}	//	function _renderPlotBar()
-
-
-	private function _renderPlotScatter($groupID,$bubble) {
-		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-		$scatterStyle = $bubbleSize = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$seriesPlots = array();
-
-		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
-			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-
-			foreach($dataValuesY as $k => $dataValueY) {
-				$dataValuesY[$k] = $k;
-			}
-
-			$seriesPlot = new ScatterPlot($dataValuesX,$dataValuesY);
-			if ($scatterStyle == 'lineMarker') {
-				$seriesPlot->SetLinkPoints();
-				$seriesPlot->link->SetColor(self::$_colourSet[self::$_plotColour]);
-			} elseif ($scatterStyle == 'smoothMarker') {
-				$spline = new Spline($dataValuesY,$dataValuesX);
-				list($splineDataY,$splineDataX) = $spline->Get(count($dataValuesX) * self::$_width / 20);
-				$lplot = new LinePlot($splineDataX,$splineDataY);
-				$lplot->SetColor(self::$_colourSet[self::$_plotColour]);
-
-				$this->_graph->Add($lplot);
-			}
-
-			if ($bubble) {
-				$this->_formatPointMarker($seriesPlot,'dot');
-				$seriesPlot->mark->SetColor('black');
-				$seriesPlot->mark->SetSize($bubbleSize);
-			} else {
-				$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-				$this->_formatPointMarker($seriesPlot,$marker);
-			}
-			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-			$seriesPlot->SetLegend($dataLabel);
-
-			$this->_graph->Add($seriesPlot);
-		}
-	}	//	function _renderPlotScatter()
-
-
-	private function _renderPlotRadar($groupID) {
-		$radarStyle = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$seriesPlots = array();
-
-		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
-			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-			$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-
-			$dataValues = array();
-			foreach($dataValuesY as $k => $dataValueY) {
-				$dataValues[$k] = implode(' ',array_reverse($dataValueY));
-			}
-			$tmp = array_shift($dataValues);
-			$dataValues[] = $tmp;
-			$tmp = array_shift($dataValuesX);
-			$dataValuesX[] = $tmp;
-
-			$this->_graph->SetTitles(array_reverse($dataValues));
-
-			$seriesPlot = new RadarPlot(array_reverse($dataValuesX));
-
-			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-			$seriesPlot->SetColor(self::$_colourSet[self::$_plotColour++]);
-			if ($radarStyle == 'filled') {
-				$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour]);
-			}
-			$this->_formatPointMarker($seriesPlot,$marker);
-			$seriesPlot->SetLegend($dataLabel);
-
-			$this->_graph->Add($seriesPlot);
-		}
-	}	//	function _renderPlotRadar()
-
-
-	private function _renderPlotContour($groupID) {
-		$contourStyle = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$seriesPlots = array();
-
-		$dataValues = array();
-		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
-			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-
-			$dataValues[$i] = $dataValuesX;
-		}
-		$seriesPlot = new ContourPlot($dataValues);
-
-		$this->_graph->Add($seriesPlot);
-	}	//	function _renderPlotContour()
-
-
-	private function _renderPlotStock($groupID) {
-		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-		$plotOrder = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
-		$seriesPlots = array();
-
-		$dataValues = array();
-		//	Loop through each data series in turn
-		for($i = 0; $i < $seriesCount; ++$i) {
-			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-
-			foreach($dataValuesX as $j => $dataValueX)
-			$dataValues[$j][$plotOrder[$i]] = $dataValueX;
-		}
-
-		$seriesPlot = new StockPlot($dataValues);
-
-		$this->_graph->Add($seriesPlot);
-	}	//	function _renderPlotStock()
-
-
-	private function _renderAreaChart($groupCount, $dimensions = '2d') {
-		require_once('jpgraph_line.php');
-
-		$this->_renderCartesianPlotArea();
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotLine($i,True,False,$dimensions);
-		}
-	}	//	function _renderAreaChart()
-
-
-	private function _renderLineChart($groupCount, $dimensions = '2d') {
-		require_once('jpgraph_line.php');
-
-		$this->_renderCartesianPlotArea();
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotLine($i,False,False,$dimensions);
-		}
-	}	//	function _renderLineChart()
-
-
-	private function _renderBarChart($groupCount, $dimensions = '2d') {
-		require_once('jpgraph_bar.php');
-
-		$this->_renderCartesianPlotArea();
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotBar($i,$dimensions);
-		}
-	}	//	function _renderBarChart()
-
-
-	private function _renderScatterChart($groupCount) {
-		require_once('jpgraph_scatter.php');
-		require_once('jpgraph_regstat.php');
-		require_once('jpgraph_line.php');
-
-		$this->_renderCartesianPlotArea('linlin');
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotScatter($i,false);
-		}
-	}	//	function _renderScatterChart()
-
-
-	private function _renderBubbleChart($groupCount) {
-		require_once('jpgraph_scatter.php');
-
-		$this->_renderCartesianPlotArea('linlin');
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotScatter($i,true);
-		}
-	}	//	function _renderBubbleChart()
-
-
-	private function _renderPieChart($groupCount, $dimensions = '2d', $doughnut = False, $multiplePlots = False) {
-		require_once('jpgraph_pie.php');
-		if ($dimensions == '3d') {
-			require_once('jpgraph_pie3d.php');
-		}
-
-		$this->_renderPiePlotArea($doughnut);
-
-		$iLimit = ($multiplePlots) ? $groupCount : 1;
-		for($groupID = 0; $groupID < $iLimit; ++$groupID) {
-			$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-			$exploded = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-			if ($groupID == 0) {
-		        $labelCount = count($this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
-				if ($labelCount > 0) {
-					$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-					$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $labelCount);
-				}
-			}
-
-			$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-			$seriesPlots = array();
-			//	For pie charts, we only display the first series: doughnut charts generally display all series
-			$jLimit = ($multiplePlots) ? $seriesCount : 1;
-			//	Loop through each data series in turn
-			for($j = 0; $j < $jLimit; ++$j) {
-				$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
-
-				//	Fill in any missing values in the $dataValues array
-				$testCurrentIndex = 0;
-				foreach($dataValues as $k => $dataValue) {
-					while($k != $testCurrentIndex) {
-						$dataValues[$testCurrentIndex] = null;
-						++$testCurrentIndex;
-					}
-					++$testCurrentIndex;
-				}
-
-				if ($dimensions == '3d') {
-					$seriesPlot = new PiePlot3D($dataValues);
-				} else {
-					if ($doughnut) {
-						$seriesPlot = new PiePlotC($dataValues);
-					} else {
-						$seriesPlot = new PiePlot($dataValues);
-					}
-				}
-
-				if ($multiplePlots) {
-					$seriesPlot->SetSize(($jLimit-$j) / ($jLimit * 4));
-				}
-
-				if ($doughnut) {
-					$seriesPlot->SetMidColor('white');
-				}
-
-				$seriesPlot->SetColor(self::$_colourSet[self::$_plotColour++]);
-				if (count($datasetLabels) > 0)
-					$seriesPlot->SetLabels(array_fill(0,count($datasetLabels),''));
-				if ($dimensions != '3d') {
-					$seriesPlot->SetGuideLines(false);
-				}
-				if ($j == 0) {
-					if ($exploded) {
-						$seriesPlot->ExplodeAll();
-					}
-					$seriesPlot->SetLegends($datasetLabels);
-				}
-
-				$this->_graph->Add($seriesPlot);
-			}
-		}
-	}	//	function _renderPieChart()
-
-
-	private function _renderRadarChart($groupCount) {
-		require_once('jpgraph_radar.php');
-
-		$this->_renderRadarPlotArea();
-
-		for($groupID = 0; $groupID < $groupCount; ++$groupID) {
-			$this->_renderPlotRadar($groupID);
-		}
-	}	//	function _renderRadarChart()
-
-
-	private function _renderStockChart($groupCount) {
-		require_once('jpgraph_stock.php');
-
-		$this->_renderCartesianPlotArea();
-
-		for($groupID = 0; $groupID < $groupCount; ++$i) {
-			$this->_renderPlotStock($groupID);
-		}
-	}	//	function _renderStockChart()
-
-
-	private function _renderContourChart($groupCount,$dimensions) {
-		require_once('jpgraph_contour.php');
-
-		$this->_renderCartesianPlotArea('intint');
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$this->_renderPlotContour($i);
-		}
-	}	//	function _renderContourChart()
-
-
-	private function _renderCombinationChart($groupCount,$dimensions,$outputDestination) {
-		require_once('jpgraph_line.php');
-		require_once('jpgraph_bar.php');
-		require_once('jpgraph_scatter.php');
-		require_once('jpgraph_regstat.php');
-		require_once('jpgraph_line.php');
-
-		$this->_renderCartesianPlotArea();
-
-		for($i = 0; $i < $groupCount; ++$i) {
-			$dimensions = null;
-			$chartType = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
-			switch ($chartType) {
-				case 'area3DChart' :
-					$dimensions = '3d';
-				case 'areaChart' :
-					$this->_renderPlotLine($i,True,True,$dimensions);
-					break;
-				case 'bar3DChart' :
-					$dimensions = '3d';
-				case 'barChart' :
-					$this->_renderPlotBar($i,$dimensions);
-					break;
-				case 'line3DChart' :
-					$dimensions = '3d';
-				case 'lineChart' :
-					$this->_renderPlotLine($i,False,True,$dimensions);
-					break;
-				case 'scatterChart' :
-					$this->_renderPlotScatter($i,false);
-					break;
-				case 'bubbleChart' :
-					$this->_renderPlotScatter($i,true);
-					break;
-				default	:
-					$this->_graph = null;
-					return false;
-			}
-		}
-
-		$this->_renderLegend();
-
-		$this->_graph->Stroke($outputDestination);
-		return true;
-	}	//	function _renderCombinationChart()
-
-
-	public function render($outputDestination) {
-        self::$_plotColour = 0;
-
-		$groupCount = $this->_chart->getPlotArea()->getPlotGroupCount();
-
-		$dimensions = null;
-		if ($groupCount == 1) {
-			$chartType = $this->_chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
-		} else {
-			$chartTypes = array();
-			for($i = 0; $i < $groupCount; ++$i) {
-				$chartTypes[] = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
-			}
-			$chartTypes = array_unique($chartTypes);
-			if (count($chartTypes) == 1) {
-				$chartType = array_pop($chartTypes);
-			} elseif (count($chartTypes) == 0) {
-				echo 'Chart is not yet implemented<br />';
-				return false;
-			} else {
-				return $this->_renderCombinationChart($groupCount,$dimensions,$outputDestination);
-			}
-		}
-
-		switch ($chartType) {
-			case 'area3DChart' :
-				$dimensions = '3d';
-			case 'areaChart' :
-				$this->_renderAreaChart($groupCount,$dimensions);
-				break;
-			case 'bar3DChart' :
-				$dimensions = '3d';
-			case 'barChart' :
-				$this->_renderBarChart($groupCount,$dimensions);
-				break;
-			case 'line3DChart' :
-				$dimensions = '3d';
-			case 'lineChart' :
-				$this->_renderLineChart($groupCount,$dimensions);
-				break;
-			case 'pie3DChart' :
-				$dimensions = '3d';
-			case 'pieChart' :
-				$this->_renderPieChart($groupCount,$dimensions,False,False);
-				break;
-			case 'doughnut3DChart' :
-				$dimensions = '3d';
-			case 'doughnutChart' :
-				$this->_renderPieChart($groupCount,$dimensions,True,True);
-				break;
-			case 'scatterChart' :
-				$this->_renderScatterChart($groupCount);
-				break;
-			case 'bubbleChart' :
-				$this->_renderBubbleChart($groupCount);
-				break;
-			case 'radarChart' :
-				$this->_renderRadarChart($groupCount);
-				break;
-			case 'surface3DChart' :
-				$dimensions = '3d';
-			case 'surfaceChart' :
-				$this->_renderContourChart($groupCount,$dimensions);
-				break;
-			case 'stockChart' :
-				$this->_renderStockChart($groupCount,$dimensions);
-				break;
-			default	:
-				echo $chartType.' is not yet implemented<br />';
-				return false;
-		}
-		$this->_renderLegend();
-
-		$this->_graph->Stroke($outputDestination);
-		return true;
-	}	//	function render()
-
-
-	/**
-	 * Create a new PHPExcel_Chart_Renderer_jpgraph
-	 */
-	public function __construct(PHPExcel_Chart $chart)
-	{
-		$this->_graph	= null;
-		$this->_chart	= $chart;
-	}	//	function __construct()
-
-}	//	PHPExcel_Chart_Renderer_jpgraph
diff --git a/plugins/exportTypes/Excel/PHPExcel/Chart/Title.php b/plugins/exportTypes/Excel/PHPExcel/Chart/Title.php
deleted file mode 100755
index 9382346f3..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Chart/Title.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Chart_Title
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_Title
-{
-
-	/**
-	 * Title Caption
-	 *
-	 * @var string
-	 */
-	private $_caption = null;
-
-	/**
-	 * Title Layout
-	 *
-	 * @var PHPExcel_Chart_Layout
-	 */
-	private $_layout = null;
-
-	/**
-	 * Create a new PHPExcel_Chart_Title
-	 */
-	public function __construct($caption = null, PHPExcel_Chart_Layout $layout = null)
-	{
-		$this->_caption = $caption;
-		$this->_layout = $layout;
-	}
-
-	/**
-	 * Get caption
-	 *
-	 * @return string
-	 */
-	public function getCaption() {
-		return $this->_caption;
-	}
-
-	/**
-	 * Set caption
-	 *
-	 * @param string $caption
-	 */
-	public function setCaption($caption = null) {
-		$this->_caption = $caption;
-	}
-
-	/**
-	 * Get Layout
-	 *
-	 * @return PHPExcel_Chart_Layout
-	 */
-	public function getLayout() {
-		return $this->_layout;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Comment.php b/plugins/exportTypes/Excel/PHPExcel/Comment.php
deleted file mode 100755
index c38088a2e..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Comment.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Comment
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Comment implements PHPExcel_IComparable
-{
-	/**
-	 * Author
-	 *
-	 * @var string
-	 */
-	private $_author;
-
-	/**
-	 * Rich text comment
-	 *
-	 * @var PHPExcel_RichText
-	 */
-	private $_text;
-
-	/**
-	 * Comment width (CSS style, i.e. XXpx or YYpt)
-	 *
-	 * @var string
-	 */
-	private $_width = '96pt';
-
-	/**
-	 * Left margin (CSS style, i.e. XXpx or YYpt)
-	 *
-	 * @var string
-	 */
-	private $_marginLeft = '59.25pt';
-
-	/**
-	 * Top margin (CSS style, i.e. XXpx or YYpt)
-	 *
-	 * @var string
-	 */
-	private $_marginTop = '1.5pt';
-
-	/**
-	 * Visible
-	 *
-	 * @var boolean
-	 */
-	private $_visible = false;
-
-	/**
-	 * Comment height (CSS style, i.e. XXpx or YYpt)
-	 *
-	 * @var string
-	 */
-	private $_height = '55.5pt';
-
-	/**
-	 * Comment fill color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	private $_fillColor;
-
-	/**
-	 * Alignment
-	 *
-	 * @var string
-	 */
-	private $_alignment;
-
-    /**
-     * Create a new PHPExcel_Comment
-     *
-     * @throws	Exception
-     */
-    public function __construct()
-    {
-    	// Initialise variables
-    	$this->_author		= 'Author';
-    	$this->_text		= new PHPExcel_RichText();
-    	$this->_fillColor	= new PHPExcel_Style_Color('FFFFFFE1');
-		$this->_alignment	= PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
-    }
-
-    /**
-     * Get Author
-     *
-     * @return string
-     */
-    public function getAuthor() {
-    	return $this->_author;
-    }
-
-    /**
-     * Set Author
-     *
-     * @param string $pValue
-     * @return PHPExcel_Comment
-     */
-	public function setAuthor($pValue = '') {
-		$this->_author = $pValue;
-		return $this;
-	}
-
-    /**
-     * Get Rich text comment
-     *
-     * @return PHPExcel_RichText
-     */
-    public function getText() {
-    	return $this->_text;
-    }
-
-    /**
-     * Set Rich text comment
-     *
-     * @param PHPExcel_RichText $pValue
-     * @return PHPExcel_Comment
-     */
-    public function setText(PHPExcel_RichText $pValue) {
-    	$this->_text = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get comment width (CSS style, i.e. XXpx or YYpt)
-     *
-     * @return string
-     */
-    public function getWidth() {
-        return $this->_width;
-    }
-
-    /**
-     * Set comment width (CSS style, i.e. XXpx or YYpt)
-     *
-     * @param string $value
-     * @return PHPExcel_Comment
-     */
-    public function setWidth($value = '96pt') {
-        $this->_width = $value;
-        return $this;
-    }
-
-    /**
-     * Get comment height (CSS style, i.e. XXpx or YYpt)
-     *
-     * @return string
-     */
-    public function getHeight() {
-        return $this->_height;
-    }
-
-    /**
-     * Set comment height (CSS style, i.e. XXpx or YYpt)
-     *
-     * @param string $value
-     * @return PHPExcel_Comment
-     */
-    public function setHeight($value = '55.5pt') {
-        $this->_height = $value;
-        return $this;
-    }
-
-    /**
-     * Get left margin (CSS style, i.e. XXpx or YYpt)
-     *
-     * @return string
-     */
-    public function getMarginLeft() {
-        return $this->_marginLeft;
-    }
-
-    /**
-     * Set left margin (CSS style, i.e. XXpx or YYpt)
-     *
-     * @param string $value
-     * @return PHPExcel_Comment
-     */
-    public function setMarginLeft($value = '59.25pt') {
-        $this->_marginLeft = $value;
-        return $this;
-    }
-
-    /**
-     * Get top margin (CSS style, i.e. XXpx or YYpt)
-     *
-     * @return string
-     */
-    public function getMarginTop() {
-        return $this->_marginTop;
-    }
-
-    /**
-     * Set top margin (CSS style, i.e. XXpx or YYpt)
-     *
-     * @param string $value
-     * @return PHPExcel_Comment
-     */
-    public function setMarginTop($value = '1.5pt') {
-        $this->_marginTop = $value;
-        return $this;
-    }
-
-    /**
-     * Is the comment visible by default?
-     *
-     * @return boolean
-     */
-    public function getVisible() {
-        return $this->_visible;
-    }
-
-    /**
-     * Set comment default visibility
-     *
-     * @param boolean $value
-     * @return PHPExcel_Comment
-     */
-    public function setVisible($value = false) {
-        $this->_visible = $value;
-        return $this;
-    }
-
-    /**
-     * Get fill color
-     *
-     * @return PHPExcel_Style_Color
-     */
-    public function getFillColor() {
-        return $this->_fillColor;
-    }
-
-    /**
-     * Set Alignment
-     *
-     * @param string $pValue
-     * @return PHPExcel_Comment
-     */
-    public function setAlignment($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL) {
-		$this->_alignment = $pValue;
-		return $this;
-    }
-
-    /**
-     * Get Alignment
-     *
-     * @return string
-     */
-    public function getAlignment() {
-		return $this->_alignment;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_author
-    		. $this->_text->getHashCode()
-    		. $this->_width
-    		. $this->_height
-    		. $this->_marginLeft
-    		. $this->_marginTop
-    		. ($this->_visible ? 1 : 0)
-    		. $this->_fillColor->getHashCode()
-    		. $this->_alignment
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/DocumentProperties.php b/plugins/exportTypes/Excel/PHPExcel/DocumentProperties.php
deleted file mode 100755
index 6bde10fca..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/DocumentProperties.php
+++ /dev/null
@@ -1,588 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package	PHPExcel
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_DocumentProperties
- *
- * @category	PHPExcel
- * @package		PHPExcel
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_DocumentProperties
-{
-	/** constants */
-	const PROPERTY_TYPE_BOOLEAN		= 'b';
-	const PROPERTY_TYPE_INTEGER		= 'i';
-	const PROPERTY_TYPE_FLOAT		= 'f';
-	const PROPERTY_TYPE_DATE		= 'd';
-	const PROPERTY_TYPE_STRING		= 's';
-	const PROPERTY_TYPE_UNKNOWN		= 'u';
-
-
-	/**
-	 * Creator
-	 *
-	 * @var	string
-	 */
-	private $_creator	= 'Unknown Creator';
-
-	/**
-	 * LastModifiedBy
-	 *
-	 * @var	string
-	 */
-	private $_lastModifiedBy;
-
-	/**
-	 * Created
-	 *
-	 * @var	datetime
-	 */
-	private $_created;
-
-	/**
-	 * Modified
-	 *
-	 * @var	datetime
-	 */
-	private $_modified;
-
-	/**
-	 * Title
-	 *
-	 * @var	string
-	 */
-	private $_title			= 'Untitled Spreadsheet';
-
-	/**
-	 * Description
-	 *
-	 * @var	string
-	 */
-	private $_description	= '';
-
-	/**
-	 * Subject
-	 *
-	 * @var	string
-	 */
-	private $_subject		= '';
-
-	/**
-	 * Keywords
-	 *
-	 * @var	string
-	 */
-	private $_keywords		= '';
-
-	/**
-	 * Category
-	 *
-	 * @var	string
-	 */
-	private $_category		= '';
-
-	/**
-	 * Manager
-	 *
-	 * @var	string
-	 */
-	private $_manager		= '';
-
-	/**
-	 * Company
-	 *
-	 * @var	string
-	 */
-	private $_company		= 'Microsoft Corporation';
-
-	/**
-	 * Custom Properties
-	 *
-	 * @var	string
-	 */
-	private $_customProperties	= array();
-
-
-	/**
-	 * Create a new PHPExcel_DocumentProperties
-	 */
-	public function __construct()
-	{
-		// Initialise values
-		$this->_lastModifiedBy	= $this->_creator;
-		$this->_created		= time();
-		$this->_modified	= time();
-	}
-
-	/**
-	 * Get Creator
-	 *
-	 * @return	string
-	 */
-	public function getCreator() {
-		return $this->_creator;
-	}
-
-	/**
-	 * Set Creator
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setCreator($pValue = '') {
-		$this->_creator = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Last Modified By
-	 *
-	 * @return	string
-	 */
-	public function getLastModifiedBy() {
-		return $this->_lastModifiedBy;
-	}
-
-	/**
-	 * Set Last Modified By
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setLastModifiedBy($pValue = '') {
-		$this->_lastModifiedBy = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Created
-	 *
-	 * @return	datetime
-	 */
-	public function getCreated() {
-		return $this->_created;
-	}
-
-	/**
-	 * Set Created
-	 *
-	 * @param	datetime	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setCreated($pValue = null) {
-		if ($pValue === NULL) {
-			$pValue = time();
-		} elseif (is_string($pValue)) {
-			if (is_numeric($pValue)) {
-				$pValue = intval($pValue);
-			} else {
-				$pValue = strtotime($pValue);
-			}
-		}
-
-		$this->_created = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Modified
-	 *
-	 * @return	datetime
-	 */
-	public function getModified() {
-		return $this->_modified;
-	}
-
-	/**
-	 * Set Modified
-	 *
-	 * @param	datetime	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setModified($pValue = null) {
-		if ($pValue === NULL) {
-			$pValue = time();
-		} elseif (is_string($pValue)) {
-			if (is_numeric($pValue)) {
-				$pValue = intval($pValue);
-			} else {
-				$pValue = strtotime($pValue);
-			}
-		}
-
-		$this->_modified = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Title
-	 *
-	 * @return	string
-	 */
-	public function getTitle() {
-		return $this->_title;
-	}
-
-	/**
-	 * Set Title
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setTitle($pValue = '') {
-		$this->_title = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Description
-	 *
-	 * @return	string
-	 */
-	public function getDescription() {
-		return $this->_description;
-	}
-
-	/**
-	 * Set Description
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setDescription($pValue = '') {
-		$this->_description = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Subject
-	 *
-	 * @return	string
-	 */
-	public function getSubject() {
-		return $this->_subject;
-	}
-
-	/**
-	 * Set Subject
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setSubject($pValue = '') {
-		$this->_subject = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Keywords
-	 *
-	 * @return	string
-	 */
-	public function getKeywords() {
-		return $this->_keywords;
-	}
-
-	/**
-	 * Set Keywords
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setKeywords($pValue = '') {
-		$this->_keywords = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Category
-	 *
-	 * @return	string
-	 */
-	public function getCategory() {
-		return $this->_category;
-	}
-
-	/**
-	 * Set Category
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setCategory($pValue = '') {
-		$this->_category = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Company
-	 *
-	 * @return	string
-	 */
-	public function getCompany() {
-		return $this->_company;
-	}
-
-	/**
-	 * Set Company
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setCompany($pValue = '') {
-		$this->_company = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Manager
-	 *
-	 * @return	string
-	 */
-	public function getManager() {
-		return $this->_manager;
-	}
-
-	/**
-	 * Set Manager
-	 *
-	 * @param	string	$pValue
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setManager($pValue = '') {
-		$this->_manager = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get a List of Custom Property Names
-	 *
-	 * @return	array of string
-	 */
-	public function getCustomProperties() {
-		return array_keys($this->_customProperties);
-	}
-
-	/**
-	 * Check if a Custom Property is defined
-	 *
-	 * @param	string	$propertyName
-	 * @return	boolean
-	 */
-	public function isCustomPropertySet($propertyName) {
-		return isset($this->_customProperties[$propertyName]);
-	}
-
-	/**
-	 * Get a Custom Property Value
-	 *
-	 * @param	string	$propertyName
-	 * @return	string
-	 */
-	public function getCustomPropertyValue($propertyName) {
-		if (isset($this->_customProperties[$propertyName])) {
-			return $this->_customProperties[$propertyName]['value'];
-		}
-
-	}
-
-	/**
-	 * Get a Custom Property Type
-	 *
-	 * @param	string	$propertyName
-	 * @return	string
-	 */
-	public function getCustomPropertyType($propertyName) {
-		if (isset($this->_customProperties[$propertyName])) {
-			return $this->_customProperties[$propertyName]['type'];
-		}
-
-	}
-
-	/**
-	 * Set a Custom Property
-	 *
-	 * @param	string	$propertyName
-	 * @param	mixed	$propertyValue
-	 * @param	string	$propertyType
-	 *						'i'	: Integer
-	 *						'f' : Floating Point
-	 *						's' : String
-	 *						'd' : Date/Time
-	 *						'b' : Boolean
-	 * @return	PHPExcel_DocumentProperties
-	 */
-	public function setCustomProperty($propertyName,$propertyValue='',$propertyType=NULL) {
-		if (($propertyType === NULL) || (!in_array($propertyType,array(self::PROPERTY_TYPE_INTEGER,
-																	   self::PROPERTY_TYPE_FLOAT,
-																	   self::PROPERTY_TYPE_STRING,
-																	   self::PROPERTY_TYPE_DATE,
-																	   self::PROPERTY_TYPE_BOOLEAN)))) {
-			if ($propertyValue === NULL) {
-				$propertyType = self::PROPERTY_TYPE_STRING;
-			} elseif (is_float($propertyValue)) {
-				$propertyType = self::PROPERTY_TYPE_FLOAT;
-			} elseif(is_int($propertyValue)) {
-				$propertyType = self::PROPERTY_TYPE_INTEGER;
-			} elseif (is_bool($propertyValue)) {
-				$propertyType = self::PROPERTY_TYPE_BOOLEAN;
-			} else {
-				$propertyType = self::PROPERTY_TYPE_STRING;
-			}
-		}
-
-		$this->_customProperties[$propertyName] = array('value' => $propertyValue, 'type' => $propertyType);
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-	public static function convertProperty($propertyValue,$propertyType) {
-		switch ($propertyType) {
-			case 'empty'	:	//	Empty
-				return '';
-				break;
-			case 'null'		:	//	Null
-				return NULL;
-				break;
-			case 'i1'		:	//	1-Byte Signed Integer
-			case 'i2'		:	//	2-Byte Signed Integer
-			case 'i4'		:	//	4-Byte Signed Integer
-			case 'i8'		:	//	8-Byte Signed Integer
-			case 'int'		:	//	Integer
-				return (int) $propertyValue;
-				break;
-			case 'ui1'		:	//	1-Byte Unsigned Integer
-			case 'ui2'		:	//	2-Byte Unsigned Integer
-			case 'ui4'		:	//	4-Byte Unsigned Integer
-			case 'ui8'		:	//	8-Byte Unsigned Integer
-			case 'uint'		:	//	Unsigned Integer
-				return abs((int) $propertyValue);
-				break;
-			case 'r4'		:	//	4-Byte Real Number
-			case 'r8'		:	//	8-Byte Real Number
-			case 'decimal'	:	//	Decimal
-				return (float) $propertyValue;
-				break;
-			case 'lpstr'	:	//	LPSTR
-			case 'lpwstr'	:	//	LPWSTR
-			case 'bstr'		:	//	Basic String
-				return $propertyValue;
-				break;
-			case 'date'		:	//	Date and Time
-			case 'filetime'	:	//	File Time
-				return strtotime($propertyValue);
-				break;
-			case 'bool'		:	//	Boolean
-				return ($propertyValue == 'true') ? True : False;
-				break;
-			case 'cy'		:	//	Currency
-			case 'error'	:	//	Error Status Code
-			case 'vector'	:	//	Vector
-			case 'array'	:	//	Array
-			case 'blob'		:	//	Binary Blob
-			case 'oblob'	:	//	Binary Blob Object
-			case 'stream'	:	//	Binary Stream
-			case 'ostream'	:	//	Binary Stream Object
-			case 'storage'	:	//	Binary Storage
-			case 'ostorage'	:	//	Binary Storage Object
-			case 'vstream'	:	//	Binary Versioned Stream
-			case 'clsid'	:	//	Class ID
-			case 'cf'		:	//	Clipboard Data
-				return $propertyValue;
-				break;
-		}
-		return $propertyValue;
-	}
-
-	public static function convertPropertyType($propertyType) {
-		switch ($propertyType) {
-			case 'i1'		:	//	1-Byte Signed Integer
-			case 'i2'		:	//	2-Byte Signed Integer
-			case 'i4'		:	//	4-Byte Signed Integer
-			case 'i8'		:	//	8-Byte Signed Integer
-			case 'int'		:	//	Integer
-			case 'ui1'		:	//	1-Byte Unsigned Integer
-			case 'ui2'		:	//	2-Byte Unsigned Integer
-			case 'ui4'		:	//	4-Byte Unsigned Integer
-			case 'ui8'		:	//	8-Byte Unsigned Integer
-			case 'uint'		:	//	Unsigned Integer
-				return self::PROPERTY_TYPE_INTEGER;
-				break;
-			case 'r4'		:	//	4-Byte Real Number
-			case 'r8'		:	//	8-Byte Real Number
-			case 'decimal'	:	//	Decimal
-				return self::PROPERTY_TYPE_FLOAT;
-				break;
-			case 'empty'	:	//	Empty
-			case 'null'		:	//	Null
-			case 'lpstr'	:	//	LPSTR
-			case 'lpwstr'	:	//	LPWSTR
-			case 'bstr'		:	//	Basic String
-				return self::PROPERTY_TYPE_STRING;
-				break;
-			case 'date'		:	//	Date and Time
-			case 'filetime'	:	//	File Time
-				return self::PROPERTY_TYPE_DATE;
-				break;
-			case 'bool'		:	//	Boolean
-				return self::PROPERTY_TYPE_BOOLEAN;
-				break;
-			case 'cy'		:	//	Currency
-			case 'error'	:	//	Error Status Code
-			case 'vector'	:	//	Vector
-			case 'array'	:	//	Array
-			case 'blob'		:	//	Binary Blob
-			case 'oblob'	:	//	Binary Blob Object
-			case 'stream'	:	//	Binary Stream
-			case 'ostream'	:	//	Binary Stream Object
-			case 'storage'	:	//	Binary Storage
-			case 'ostorage'	:	//	Binary Storage Object
-			case 'vstream'	:	//	Binary Versioned Stream
-			case 'clsid'	:	//	Class ID
-			case 'cf'		:	//	Clipboard Data
-				return self::PROPERTY_TYPE_UNKNOWN;
-				break;
-		}
-		return self::PROPERTY_TYPE_UNKNOWN;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/DocumentSecurity.php b/plugins/exportTypes/Excel/PHPExcel/DocumentSecurity.php
deleted file mode 100755
index 7f47cbaec..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/DocumentSecurity.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_DocumentSecurity
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_DocumentSecurity
-{
-	/**
-	 * LockRevision
-	 *
-	 * @var boolean
-	 */
-	private $_lockRevision;
-
-	/**
-	 * LockStructure
-	 *
-	 * @var boolean
-	 */
-	private $_lockStructure;
-
-	/**
-	 * LockWindows
-	 *
-	 * @var boolean
-	 */
-	private $_lockWindows;
-
-	/**
-	 * RevisionsPassword
-	 *
-	 * @var string
-	 */
-	private $_revisionsPassword;
-
-	/**
-	 * WorkbookPassword
-	 *
-	 * @var string
-	 */
-	private $_workbookPassword;
-
-    /**
-     * Create a new PHPExcel_DocumentSecurity
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_lockRevision		= false;
-    	$this->_lockStructure		= false;
-    	$this->_lockWindows			= false;
-    	$this->_revisionsPassword	= '';
-    	$this->_workbookPassword	= '';
-    }
-
-    /**
-     * Is some sort of dcument security enabled?
-     *
-     * @return boolean
-     */
-    function isSecurityEnabled() {
-    	return 	$this->_lockRevision ||
-		    	$this->_lockStructure ||
-		    	$this->_lockWindows;
-    }
-
-    /**
-     * Get LockRevision
-     *
-     * @return boolean
-     */
-    function getLockRevision() {
-    	return $this->_lockRevision;
-    }
-
-    /**
-     * Set LockRevision
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_DocumentSecurity
-     */
-    function setLockRevision($pValue = false) {
-    	$this->_lockRevision = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get LockStructure
-     *
-     * @return boolean
-     */
-    function getLockStructure() {
-    	return $this->_lockStructure;
-    }
-
-    /**
-     * Set LockStructure
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_DocumentSecurity
-     */
-    function setLockStructure($pValue = false) {
-		$this->_lockStructure = $pValue;
-		return $this;
-    }
-
-    /**
-     * Get LockWindows
-     *
-     * @return boolean
-     */
-    function getLockWindows() {
-    	return $this->_lockWindows;
-    }
-
-    /**
-     * Set LockWindows
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_DocumentSecurity
-     */
-    function setLockWindows($pValue = false) {
-    	$this->_lockWindows = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get RevisionsPassword (hashed)
-     *
-     * @return string
-     */
-    function getRevisionsPassword() {
-    	return $this->_revisionsPassword;
-    }
-
-    /**
-     * Set RevisionsPassword
-     *
-     * @param string 	$pValue
-     * @param boolean 	$pAlreadyHashed If the password has already been hashed, set this to true
-     * @return PHPExcel_DocumentSecurity
-     */
-    function setRevisionsPassword($pValue = '', $pAlreadyHashed = false) {
-    	if (!$pAlreadyHashed) {
-    		$pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
-    	}
-    	$this->_revisionsPassword = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get WorkbookPassword (hashed)
-     *
-     * @return string
-     */
-    function getWorkbookPassword() {
-    	return $this->_workbookPassword;
-    }
-
-    /**
-     * Set WorkbookPassword
-     *
-     * @param string 	$pValue
-     * @param boolean 	$pAlreadyHashed If the password has already been hashed, set this to true
-     * @return PHPExcel_DocumentSecurity
-     */
-    function setWorkbookPassword($pValue = '', $pAlreadyHashed = false) {
-    	if (!$pAlreadyHashed) {
-    		$pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
-    	}
-		$this->_workbookPassword = $pValue;
-		return $this;
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Exception.php b/plugins/exportTypes/Excel/PHPExcel/Exception.php
deleted file mode 100755
index a43545311..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Exception.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Exception extends Exception {
-	/**
-	 * Error handler callback
-	 *
-	 * @param mixed $code
-	 * @param mixed $string
-	 * @param mixed $file
-	 * @param mixed $line
-	 * @param mixed $context
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/HashTable.php b/plugins/exportTypes/Excel/PHPExcel/HashTable.php
deleted file mode 100755
index 0edc262e2..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/HashTable.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_HashTable
- *
- * @category   PHPExcel
- * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_HashTable
-{
-	/**
-	 * HashTable elements
-	 *
-	 * @var array
-	 */
-	public $_items = array();
-
-	/**
-	 * HashTable key map
-	 *
-	 * @var array
-	 */
-	public $_keyMap = array();
-
-	/**
-	 * Create a new PHPExcel_HashTable
-	 *
-	 * @param	PHPExcel_IComparable[] $pSource	Optional source array to create HashTable from
-	 * @throws	Exception
-	 */
-	public function __construct($pSource = null)
-	{
-		if ($pSource !== NULL) {
-			// Create HashTable
-			$this->addFromSource($pSource);
-		}
-	}
-
-	/**
-	 * Add HashTable items from source
-	 *
-	 * @param	PHPExcel_IComparable[] $pSource	Source array to create HashTable from
-	 * @throws	Exception
-	 */
-	public function addFromSource($pSource = null) {
-		// Check if an array was passed
-		if ($pSource == null) {
-			return;
-		} else if (!is_array($pSource)) {
-			throw new Exception('Invalid array parameter passed.');
-		}
-
-		foreach ($pSource as $item) {
-			$this->add($item);
-		}
-	}
-
-	/**
-	 * Add HashTable item
-	 *
-	 * @param	PHPExcel_IComparable $pSource	Item to add
-	 * @throws	Exception
-	 */
-	public function add(PHPExcel_IComparable $pSource = null) {
-		$hash = $pSource->getHashCode();
-		if (!isset($this->_items[$hash])) {
-			$this->_items[$hash] = $pSource;
-			$this->_keyMap[count($this->_items) - 1] = $hash;
-		}
-	}
-
-	/**
-	 * Remove HashTable item
-	 *
-	 * @param	PHPExcel_IComparable $pSource	Item to remove
-	 * @throws	Exception
-	 */
-	public function remove(PHPExcel_IComparable $pSource = null) {
-		$hash = $pSource->getHashCode();
-		if (isset($this->_items[$hash])) {
-			unset($this->_items[$hash]);
-
-			$deleteKey = -1;
-			foreach ($this->_keyMap as $key => $value) {
-				if ($deleteKey >= 0) {
-					$this->_keyMap[$key - 1] = $value;
-				}
-
-				if ($value == $hash) {
-					$deleteKey = $key;
-				}
-			}
-			unset($this->_keyMap[count($this->_keyMap) - 1]);
-		}
-	}
-
-	/**
-	 * Clear HashTable
-	 *
-	 */
-	public function clear() {
-		$this->_items = array();
-		$this->_keyMap = array();
-	}
-
-	/**
-	 * Count
-	 *
-	 * @return int
-	 */
-	public function count() {
-		return count($this->_items);
-	}
-
-	/**
-	 * Get index for hash code
-	 *
-	 * @param	string	$pHashCode
-	 * @return	int	Index
-	 */
-	public function getIndexForHashCode($pHashCode = '') {
-		return array_search($pHashCode, $this->_keyMap);
-	}
-
-	/**
-	 * Get by index
-	 *
-	 * @param	int	$pIndex
-	 * @return	PHPExcel_IComparable
-	 *
-	 */
-	public function getByIndex($pIndex = 0) {
-		if (isset($this->_keyMap[$pIndex])) {
-			return $this->getByHashCode( $this->_keyMap[$pIndex] );
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get by hashcode
-	 *
-	 * @param	string	$pHashCode
-	 * @return	PHPExcel_IComparable
-	 *
-	 */
-	public function getByHashCode($pHashCode = '') {
-		if (isset($this->_items[$pHashCode])) {
-			return $this->_items[$pHashCode];
-		}
-
-		return null;
-	}
-
-	/**
-	 * HashTable to array
-	 *
-	 * @return PHPExcel_IComparable[]
-	 */
-	public function toArray() {
-		return $this->_items;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/IComparable.php b/plugins/exportTypes/Excel/PHPExcel/IComparable.php
deleted file mode 100755
index b9d31b1bf..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/IComparable.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_IComparable
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_IComparable
-{
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode();
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/IOFactory.php b/plugins/exportTypes/Excel/PHPExcel/IOFactory.php
deleted file mode 100755
index cd7bbf912..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/IOFactory.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**	PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_IOFactory
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_IOFactory
-{
-	/**
-	 * Search locations
-	 *
-	 * @var	array
-	 * @access	private
-	 * @static
-	 */
-	private static $_searchLocations = array(
-		array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ),
-		array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}' )
-	);
-
-	/**
-	 * Autoresolve classes
-	 *
-	 * @var	array
-	 * @access	private
-	 * @static
-	 */
-	private static $_autoResolveClasses = array(
-		'Excel2007',
-		'Excel5',
-		'Excel2003XML',
-		'OOCalc',
-		'SYLK',
-		'Gnumeric',
-		'HTML',
-		'CSV',
-	);
-
-    /**
-     *	Private constructor for PHPExcel_IOFactory
-     */
-    private function __construct() { }
-
-    /**
-     * Get search locations
-     *
-	 * @static
-	 * @access	public
-     * @return	array
-     */
-	public static function getSearchLocations() {
-		return self::$_searchLocations;
-	}	//	function getSearchLocations()
-
-	/**
-	 * Set search locations
-	 *
-	 * @static
-	 * @access	public
-	 * @param	array $value
-	 * @throws	Exception
-	 */
-	public static function setSearchLocations($value) {
-		if (is_array($value)) {
-			self::$_searchLocations = $value;
-		} else {
-			throw new Exception('Invalid parameter passed.');
-		}
-	}	//	function setSearchLocations()
-
-	/**
-	 * Add search location
-	 *
-	 * @static
-	 * @access	public
-	 * @param	string $type		Example: IWriter
-	 * @param	string $location	Example: PHPExcel/Writer/{0}.php
-	 * @param	string $classname 	Example: PHPExcel_Writer_{0}
-	 */
-	public static function addSearchLocation($type = '', $location = '', $classname = '') {
-		self::$_searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname );
-	}	//	function addSearchLocation()
-
-	/**
-	 * Create PHPExcel_Writer_IWriter
-	 *
-	 * @static
-	 * @access	public
-	 * @param	PHPExcel $phpExcel
-	 * @param	string  $writerType	Example: Excel2007
-	 * @return	PHPExcel_Writer_IWriter
-	 * @throws	Exception
-	 */
-	public static function createWriter(PHPExcel $phpExcel, $writerType = '') {
-		// Search type
-		$searchType = 'IWriter';
-
-		// Include class
-		foreach (self::$_searchLocations as $searchLocation) {
-			if ($searchLocation['type'] == $searchType) {
-				$className = str_replace('{0}', $writerType, $searchLocation['class']);
-
-				$instance = new $className($phpExcel);
-				if ($instance !== NULL) {
-					return $instance;
-				}
-			}
-		}
-
-		// Nothing found...
-		throw new Exception("No $searchType found for type $writerType");
-	}	//	function createWriter()
-
-	/**
-	 * Create PHPExcel_Reader_IReader
-	 *
-	 * @static
-	 * @access	public
-	 * @param	string $readerType	Example: Excel2007
-	 * @return	PHPExcel_Reader_IReader
-	 * @throws	Exception
-	 */
-	public static function createReader($readerType = '') {
-		// Search type
-		$searchType = 'IReader';
-
-		// Include class
-		foreach (self::$_searchLocations as $searchLocation) {
-			if ($searchLocation['type'] == $searchType) {
-				$className = str_replace('{0}', $readerType, $searchLocation['class']);
-
-				$instance = new $className();
-				if ($instance !== NULL) {
-					return $instance;
-				}
-			}
-		}
-
-		// Nothing found...
-		throw new Exception("No $searchType found for type $readerType");
-	}	//	function createReader()
-
-	/**
-	 * Loads PHPExcel from file using automatic PHPExcel_Reader_IReader resolution
-	 *
-	 * @static
-	 * @access public
-	 * @param 	string 		$pFileName		The name of the spreadsheet file
-	 * @return	PHPExcel
-	 * @throws	Exception
-	 */
-	public static function load($pFilename) {
-		$reader = self::createReaderForFile($pFilename);
-		return $reader->load($pFilename);
-	}	//	function load()
-
-	/**
-	 * Identify file type using automatic PHPExcel_Reader_IReader resolution
-	 *
-	 * @static
-	 * @access public
-	 * @param 	string 		$pFileName		The name of the spreadsheet file to identify
-	 * @return	string
-	 * @throws	Exception
-	 */
-	public static function identify($pFilename) {
-		$reader = self::createReaderForFile($pFilename);
-		$className = get_class($reader);
-		$classType = explode('_',$className);
-		unset($reader);
-		return array_pop($classType);
-	}	//	function identify()
-
-	/**
-	 * Create PHPExcel_Reader_IReader for file using automatic PHPExcel_Reader_IReader resolution
-	 *
-	 * @static
-	 * @access	public
-	 * @param 	string 		$pFileName		The name of the spreadsheet file
-	 * @return	PHPExcel_Reader_IReader
-	 * @throws	Exception
-	 */
-	public static function createReaderForFile($pFilename) {
-
-		// First, lucky guess by inspecting file extension
-		$pathinfo = pathinfo($pFilename);
-
-		$extensionType = NULL;
-		if (isset($pathinfo['extension'])) {
-			switch (strtolower($pathinfo['extension'])) {
-				case 'xlsx':			//	Excel (OfficeOpenXML) Spreadsheet
-				case 'xlsm':			//	Excel (OfficeOpenXML) Macro Spreadsheet (macros will be discarded)
-				case 'xltx':			//	Excel (OfficeOpenXML) Template
-				case 'xltm':			//	Excel (OfficeOpenXML) Macro Template (macros will be discarded)
-					$extensionType = 'Excel2007';
-					break;
-				case 'xls':				//	Excel (BIFF) Spreadsheet
-				case 'xlt':				//	Excel (BIFF) Template
-					$extensionType = 'Excel5';
-					break;
-				case 'ods':				//	Open/Libre Offic Calc
-				case 'ots':				//	Open/Libre Offic Calc Template
-					$extensionType = 'OOCalc';
-					break;
-				case 'slk':
-					$extensionType = 'SYLK';
-					break;
-				case 'xml':				//	Excel 2003 SpreadSheetML
-					$extensionType = 'Excel2003XML';
-					break;
-				case 'gnumeric':
-					$extensionType = 'Gnumeric';
-					break;
-				case 'htm':
-				case 'html':
-					$extensionType = 'HTML';
-					break;
-				case 'csv':
-					// Do nothing
-					// We must not try to use CSV reader since it loads
-					// all files including Excel files etc.
-					break;
-				default:
-					break;
-			}
-
-			if ($extensionType !== NULL) {
-				$reader = self::createReader($extensionType);
-				// Let's see if we are lucky
-				if (isset($reader) && $reader->canRead($pFilename)) {
-					return $reader;
-				}
-			}
-		}
-
-		// If we reach here then "lucky guess" didn't give any result
-		// Try walking through all the options in self::$_autoResolveClasses
-		foreach (self::$_autoResolveClasses as $autoResolveClass) {
-			//	Ignore our original guess, we know that won't work
-			if ($autoResolveClass !== $extensionType) {
-				$reader = self::createReader($autoResolveClass);
-				if ($reader->canRead($pFilename)) {
-					return $reader;
-				}
-			}
-		}
-
-		throw new Exception('Unable to identify a reader for this file');
-	}	//	function createReaderForFile()
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/NamedRange.php b/plugins/exportTypes/Excel/PHPExcel/NamedRange.php
deleted file mode 100755
index 43a5fec9b..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/NamedRange.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_NamedRange
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_NamedRange
-{
-	/**
-	 * Range name
-	 *
-	 * @var string
-	 */
-	private $_name;
-
-	/**
-	 * Worksheet on which the named range can be resolved
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_worksheet;
-
-	/**
-	 * Range of the referenced cells
-	 *
-	 * @var string
-	 */
-	private $_range;
-
-	/**
-	 * Is the named range local? (i.e. can only be used on $this->_worksheet)
-	 *
-	 * @var bool
-	 */
-	private $_localOnly;
-
-	/**
-	 * Scope
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_scope;
-
-    /**
-     * Create a new NamedRange
-     *
-     * @param string $pName
-     * @param PHPExcel_Worksheet $pWorksheet
-     * @param string $pRange
-     * @param bool $pLocalOnly
-     * @param PHPExcel_Worksheet|null $pScope	Scope. Only applies when $pLocalOnly = true. Null for global scope.
-     */
-    public function __construct($pName = null, PHPExcel_Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null)
-    {
-    	// Validate data
-    	if (($pName === NULL) || ($pWorksheet === NULL) || ($pRange === NULL)) {
-    		throw new Exception('Parameters can not be null.');
-    	}
-
-    	// Set local members
-    	$this->_name 		= $pName;
-    	$this->_worksheet 	= $pWorksheet;
-    	$this->_range 		= $pRange;
-    	$this->_localOnly 	= $pLocalOnly;
-    	$this->_scope 		= ($pLocalOnly == true) ?
-								(($pScope == null) ? $pWorksheet : $pScope) : null;
-    }
-
-    /**
-     * Get name
-     *
-     * @return string
-     */
-    public function getName() {
-    	return $this->_name;
-    }
-
-    /**
-     * Set name
-     *
-     * @param string $value
-     * @return PHPExcel_NamedRange
-     */
-    public function setName($value = null) {
-    	if ($value !== NULL) {
-    		// Old title
-    		$oldTitle = $this->_name;
-
-    		// Re-attach
-    		if ($this->_worksheet !== NULL) {
-    			$this->_worksheet->getParent()->removeNamedRange($this->_name,$this->_worksheet);
-    		}
-    		$this->_name = $value;
-
-    		if ($this->_worksheet !== NULL) {
-    			$this->_worksheet->getParent()->addNamedRange($this);
-    		}
-
-	    	// New title
-	    	$newTitle = $this->_name;
-	    	PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->_worksheet->getParent(), $oldTitle, $newTitle);
-    	}
-    	return $this;
-    }
-
-    /**
-     * Get worksheet
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function getWorksheet() {
-    	return $this->_worksheet;
-    }
-
-    /**
-     * Set worksheet
-     *
-     * @param PHPExcel_Worksheet $value
-     * @return PHPExcel_NamedRange
-     */
-    public function setWorksheet(PHPExcel_Worksheet $value = null) {
-    	if ($value !== NULL) {
-    		$this->_worksheet = $value;
-    	}
-    	return $this;
-    }
-
-    /**
-     * Get range
-     *
-     * @return string
-     */
-    public function getRange() {
-    	return $this->_range;
-    }
-
-    /**
-     * Set range
-     *
-     * @param string $value
-     * @return PHPExcel_NamedRange
-     */
-    public function setRange($value = null) {
-    	if ($value !== NULL) {
-    		$this->_range = $value;
-    	}
-    	return $this;
-    }
-
-    /**
-     * Get localOnly
-     *
-     * @return bool
-     */
-    public function getLocalOnly() {
-    	return $this->_localOnly;
-    }
-
-    /**
-     * Set localOnly
-     *
-     * @param bool $value
-     * @return PHPExcel_NamedRange
-     */
-    public function setLocalOnly($value = false) {
-    	$this->_localOnly = $value;
-    	$this->_scope = $value ? $this->_worksheet : null;
-    	return $this;
-    }
-
-    /**
-     * Get scope
-     *
-     * @return PHPExcel_Worksheet|null
-     */
-    public function getScope() {
-    	return $this->_scope;
-    }
-
-    /**
-     * Set scope
-     *
-     * @param PHPExcel_Worksheet|null $value
-     * @return PHPExcel_NamedRange
-     */
-    public function setScope(PHPExcel_Worksheet $value = null) {
-    	$this->_scope = $value;
-    	$this->_localOnly = ($value == null) ? false : true;
-    	return $this;
-    }
-
-    /**
-     * Resolve a named range to a regular cell range
-     *
-     * @param string $pNamedRange Named range
-     * @param PHPExcel_Worksheet|null $pSheet Scope. Use null for global scope
-     * @return PHPExcel_NamedRange
-     */
-    public static function resolveRange($pNamedRange = '', PHPExcel_Worksheet $pSheet) {
-		return $pSheet->getParent()->getNamedRange($pNamedRange, $pSheet);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/CSV.php b/plugins/exportTypes/Excel/PHPExcel/Reader/CSV.php
deleted file mode 100755
index 8553a8b4f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/CSV.php
+++ /dev/null
@@ -1,505 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_CSV
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Input encoding
-	 *
-	 * @access	private
-	 * @var	string
-	 */
-	private $_inputEncoding	= 'UTF-8';
-
-	/**
-	 * Delimiter
-	 *
-	 * @access	private
-	 * @var string
-	 */
-	private $_delimiter		= ',';
-
-	/**
-	 * Enclosure
-	 *
-	 * @access	private
-	 * @var	string
-	 */
-	private $_enclosure		= '"';
-
-	/**
-	 * Line ending
-	 *
-	 * @access	private
-	 * @var	string
-	 */
-	private $_lineEnding	= PHP_EOL;
-
-	/**
-	 * Sheet index to read
-	 *
-	 * @access	private
-	 * @var	int
-	 */
-	private $_sheetIndex	= 0;
-
-	/**
-	 * Load rows contiguously
-	 *
-	 * @access	private
-	 * @var	int
-	 */
-	private $_contiguous	= false;
-
-
-	/**
-	 * Row counter for loading rows contiguously
-	 *
-	 * @access	private
-	 * @var	int
-	 */
-	private $_contiguousRow	= -1;
-
-	/**
-	 * PHPExcel_Reader_IReadFilter instance
-	 *
-	 * @access	private
-	 * @var	PHPExcel_Reader_IReadFilter
-	 */
-	private $_readFilter = null;
-
-
-	/**
-	 * Create a new PHPExcel_Reader_CSV
-	 */
-	public function __construct() {
-		$this->_readFilter		= new PHPExcel_Reader_DefaultReadFilter();
-	}	//	function __construct()
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @access	public
-	 * @param 	string 		$pFileName
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		return true;
-	}	//	function canRead()
-
-
-	/**
-	 * Read filter
-	 *
-	 * @access	public
-	 * @return PHPExcel_Reader_IReadFilter
-	 */
-	public function getReadFilter() {
-		return $this->_readFilter;
-	}	//	function getReadFilter()
-
-
-	/**
-	 * Set read filter
-	 *
-	 * @access	public
-	 * @param	PHPExcel_Reader_IReadFilter $pValue
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}	//	function setReadFilter()
-
-
-	/**
-	 * Set input encoding
-	 *
-	 * @access	public
-	 * @param string $pValue Input encoding
-	 */
-	public function setInputEncoding($pValue = 'UTF-8')
-	{
-		$this->_inputEncoding = $pValue;
-		return $this;
-	}	//	function setInputEncoding()
-
-
-	/**
-	 * Get input encoding
-	 *
-	 * @access	public
-	 * @return string
-	 */
-	public function getInputEncoding()
-	{
-		return $this->_inputEncoding;
-	}	//	function getInputEncoding()
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @access	public
-	 * @param 	string 		$pFilename
-	 * @throws	Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'r');
-		if ($fileHandle === false) {
-			throw new Exception("Could not open file " . $pFilename . " for reading.");
-		}
-
-		// Skip BOM, if any
-		switch ($this->_inputEncoding) {
-			case 'UTF-8':
-				fgets($fileHandle, 4) == "\xEF\xBB\xBF" ?
-				fseek($fileHandle, 3) : fseek($fileHandle, 0);
-				break;
-			case 'UTF-16LE':
-				fgets($fileHandle, 3) == "\xFF\xFE" ?
-				fseek($fileHandle, 2) : fseek($fileHandle, 0);
-				break;
-			case 'UTF-16BE':
-				fgets($fileHandle, 3) == "\xFE\xFF" ?
-				fseek($fileHandle, 2) : fseek($fileHandle, 0);
-				break;
-			case 'UTF-32LE':
-				fgets($fileHandle, 5) == "\xFF\xFE\x00\x00" ?
-				fseek($fileHandle, 4) : fseek($fileHandle, 0);
-				break;
-			case 'UTF-32BE':
-				fgets($fileHandle, 5) == "\x00\x00\xFE\xFF" ?
-				fseek($fileHandle, 4) : fseek($fileHandle, 0);
-				break;
-			default:
-				break;
-		}
-
-		$escapeEnclosures = array( "\\" . $this->_enclosure, $this->_enclosure . $this->_enclosure );
-
-		$worksheetInfo = array();
-		$worksheetInfo[0]['worksheetName'] = 'Worksheet';
-		$worksheetInfo[0]['lastColumnLetter'] = 'A';
-		$worksheetInfo[0]['lastColumnIndex'] = 0;
-		$worksheetInfo[0]['totalRows'] = 0;
-		$worksheetInfo[0]['totalColumns'] = 0;
-
-		// Loop through each line of the file in turn
-		while (($rowData = fgetcsv($fileHandle, 0, $this->_delimiter, $this->_enclosure)) !== FALSE) {
-			$worksheetInfo[0]['totalRows']++;
-			$worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], count($rowData) - 1);
-		}
-
-		$worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
-		$worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
-
-		// Close file
-		fclose($fileHandle);
-
-		return $worksheetInfo;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @access	public
-	 * @param 	string 		$pFilename
-	 * @return PHPExcel
-	 * @throws Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
-
-		// Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}	//	function load()
-
-
-	/**
-	 * Loads PHPExcel from file into PHPExcel instance
-	 *
-	 * @access	public
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Create new PHPExcel
-		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
-			$objPHPExcel->createSheet();
-		}
-		$sheet = $objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
-
-		$lineEnding = ini_get('auto_detect_line_endings');
-		ini_set('auto_detect_line_endings', true);
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'r');
-		if ($fileHandle === false) {
-			throw new Exception("Could not open file $pFilename for reading.");
-		}
-
-		// Skip BOM, if any
-		switch ($this->_inputEncoding) {
-			case 'UTF-8':
-				fgets($fileHandle, 4) == "\xEF\xBB\xBF" ?
-					fseek($fileHandle, 3) : fseek($fileHandle, 0);
-				break;
-			case 'UTF-16LE':
-				fgets($fileHandle, 3) == "\xFF\xFE" ?
-					fseek($fileHandle, 2) : fseek($fileHandle, 0);
-				break;
-			case 'UTF-16BE':
-				fgets($fileHandle, 3) == "\xFE\xFF" ?
-					fseek($fileHandle, 2) : fseek($fileHandle, 0);
-				break;
-			case 'UTF-32LE':
-				fgets($fileHandle, 5) == "\xFF\xFE\x00\x00" ?
-					fseek($fileHandle, 4) : fseek($fileHandle, 0);
-				break;
-			case 'UTF-32BE':
-				fgets($fileHandle, 5) == "\x00\x00\xFE\xFF" ?
-					fseek($fileHandle, 4) : fseek($fileHandle, 0);
-				break;
-			default:
-				break;
-		}
-
-		$escapeEnclosures = array( "\\" . $this->_enclosure,
-								   $this->_enclosure . $this->_enclosure
-								 );
-
-		// Set our starting row based on whether we're in contiguous mode or not
-		$currentRow = 1;
-		if ($this->_contiguous) {
-			$currentRow = ($this->_contiguousRow == -1) ? $sheet->getHighestRow(): $this->_contiguousRow;
-		}
-
-		// Loop through each line of the file in turn
-		while (($rowData = fgetcsv($fileHandle, 0, $this->_delimiter, $this->_enclosure)) !== FALSE) {
-			$columnLetter = 'A';
-			foreach($rowData as $rowDatum) {
-				if ($rowDatum != '' && $this->_readFilter->readCell($columnLetter, $currentRow)) {
-					// Unescape enclosures
-					$rowDatum = str_replace($escapeEnclosures, $this->_enclosure, $rowDatum);
-
-					// Convert encoding if necessary
-					if ($this->_inputEncoding !== 'UTF-8') {
-						$rowDatum = PHPExcel_Shared_String::ConvertEncoding($rowDatum, 'UTF-8', $this->_inputEncoding);
-					}
-
-					// Set cell value
-					$sheet->getCell($columnLetter . $currentRow)->setValue($rowDatum);
-				}
-				++$columnLetter;
-			}
-			++$currentRow;
-		}
-
-		// Close file
-		fclose($fileHandle);
-
-		if ($this->_contiguous) {
-			$this->_contiguousRow = $currentRow;
-		}
-
-		ini_set('auto_detect_line_endings', $lineEnding);
-
-		// Return
-		return $objPHPExcel;
-	}	//	function loadIntoExisting()
-
-
-	/**
-	 * Get delimiter
-	 *
-	 * @access	public
-	 * @return string
-	 */
-	public function getDelimiter() {
-		return $this->_delimiter;
-	}	//	function getDelimiter()
-
-
-	/**
-	 * Set delimiter
-	 *
-	 * @access	public
-	 * @param	string	$pValue		Delimiter, defaults to ,
-	 * @return	PHPExcel_Reader_CSV
-	 */
-	public function setDelimiter($pValue = ',') {
-		$this->_delimiter = $pValue;
-		return $this;
-	}	//	function setDelimiter()
-
-
-	/**
-	 * Get enclosure
-	 *
-	 * @access	public
-	 * @return string
-	 */
-	public function getEnclosure() {
-		return $this->_enclosure;
-	}	//	function getEnclosure()
-
-
-	/**
-	 * Set enclosure
-	 *
-	 * @access	public
-	 * @param	string	$pValue		Enclosure, defaults to "
-	 * @return PHPExcel_Reader_CSV
-	 */
-	public function setEnclosure($pValue = '"') {
-		if ($pValue == '') {
-			$pValue = '"';
-		}
-		$this->_enclosure = $pValue;
-		return $this;
-	}	//	function setEnclosure()
-
-
-	/**
-	 * Get line ending
-	 *
-	 * @access	public
-	 * @return string
-	 */
-	public function getLineEnding() {
-		return $this->_lineEnding;
-	}	//	function getLineEnding()
-
-
-	/**
-	 * Set line ending
-	 *
-	 * @access	public
-	 * @param	string	$pValue		Line ending, defaults to OS line ending (PHP_EOL)
-	 * @return PHPExcel_Reader_CSV
-	 */
-	public function setLineEnding($pValue = PHP_EOL) {
-		$this->_lineEnding = $pValue;
-		return $this;
-	}	//	function setLineEnding()
-
-
-	/**
-	 * Get sheet index
-	 *
-	 * @access	public
-	 * @return int
-	 */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
-	}	//	function getSheetIndex()
-
-
-	/**
-	 * Set sheet index
-	 *
-	 * @access	public
-	 * @param	int		$pValue		Sheet index
-	 * @return PHPExcel_Reader_CSV
-	 */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
-		return $this;
-	}	//	function setSheetIndex()
-
-
-	/**
-	 * Set Contiguous
-	 *
-	 * @access	public
-	 * @param string $pValue Input encoding
-	 */
-	public function setContiguous($contiguous = false)
-	{
-		$this->_contiguous = (bool)$contiguous;
-		if (!$contiguous) {
-			$this->_contiguousRow	= -1;
-		}
-
-		return $this;
-	}	//	function setInputEncoding()
-
-
-	/**
-	 * Get Contiguous
-	 *
-	 * @access	public
-	 * @return boolean
-	 */
-	public function getContiguous() {
-		return $this->_contiguous;
-	}	//	function getSheetIndex()
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/DefaultReadFilter.php b/plugins/exportTypes/Excel/PHPExcel/Reader/DefaultReadFilter.php
deleted file mode 100755
index e6863679d..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/DefaultReadFilter.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_DefaultReadFilter
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_DefaultReadFilter implements PHPExcel_Reader_IReadFilter
-{
-	/**
-	 * Should this cell be read?
-	 *
-	 * @param 	$column		String column index
-	 * @param 	$row			Row index
-	 * @param	$worksheetName	Optional worksheet name
-	 * @return	boolean
-	 */
-	public function readCell($column, $row, $worksheetName = '') {
-		return true;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2003XML.php b/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2003XML.php
deleted file mode 100755
index 4f6cfea59..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2003XML.php
+++ /dev/null
@@ -1,906 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_Excel2003XML
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Read data only?
-	 *
-	 * @var boolean
-	 */
-	private $_readDataOnly = false;
-
-	/**
-	 * Restict which sheets should be loaded?
-	 *
-	 * @var array
-	 */
-	private $_loadSheetsOnly = null;
-
-	/**
-	 * Formats
-	 *
-	 * @var array
-	 */
-	private $_styles = array();
-
-	/**
-	 * PHPExcel_Reader_IReadFilter instance
-	 *
-	 * @var PHPExcel_Reader_IReadFilter
-	 */
-	private $_readFilter = null;
-
-	/**
-	 * Character set used in the file
-	 *
-	 * @var string
-	 */
-	private $_charSet = 'UTF-8';
-
-
-	/**
-	 * Create a new PHPExcel_Reader_Excel2003XML
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-	}
-
-
-	/**
-	 * Read data only?
-	 *
-	 * @return boolean
-	 */
-	public function getReadDataOnly() {
-		return $this->_readDataOnly;
-	}
-
-
-	/**
-	 * Set read data only
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Reader_Excel2003XML
-	 */
-	public function setReadDataOnly($pValue = false) {
-		$this->_readDataOnly = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Get which sheets to load
-	 *
-	 * @return mixed
-	 */
-	public function getLoadSheetsOnly()
-	{
-		return $this->_loadSheetsOnly;
-	}
-
-
-	/**
-	 * Set which sheets to load
-	 *
-	 * @param mixed $value
-	 * @return PHPExcel_Reader_Excel2003XML
-	 */
-	public function setLoadSheetsOnly($value = null)
-	{
-		$this->_loadSheetsOnly = is_array($value) ?
-			$value : array($value);
-		return $this;
-	}
-
-
-	/**
-	 * Set all sheets to load
-	 *
-	 * @return PHPExcel_Reader_Excel2003XML
-	 */
-	public function setLoadAllSheets()
-	{
-		$this->_loadSheetsOnly = null;
-		return $this;
-	}
-
-
-	/**
-	 * Read filter
-	 *
-	 * @return PHPExcel_Reader_IReadFilter
-	 */
-	public function getReadFilter() {
-		return $this->_readFilter;
-	}
-
-
-	/**
-	 * Set read filter
-	 *
-	 * @param PHPExcel_Reader_IReadFilter $pValue
-	 * @return PHPExcel_Reader_Excel2003XML
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFileName
-	 * @return 	boolean
-	 * @throws Exception
-	 */
-	public function canRead($pFilename)
-	{
-
-		//	Office					xmlns:o="urn:schemas-microsoft-com:office:office"
-		//	Excel					xmlns:x="urn:schemas-microsoft-com:office:excel"
-		//	XML Spreadsheet			xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
-		//	Spreadsheet component	xmlns:c="urn:schemas-microsoft-com:office:component:spreadsheet"
-		//	XML schema 				xmlns:s="uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882"
-		//	XML data type			xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
-		//	MS-persist recordset	xmlns:rs="urn:schemas-microsoft-com:rowset"
-		//	Rowset					xmlns:z="#RowsetSchema"
-		//
-
-		$signature = array(
-				'<?xml version="1.0"',
-				'<?mso-application progid="Excel.Sheet"?>'
-			);
-
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Read sample data (first 2 KB will do)
-		$fh = fopen($pFilename, 'r');
-		$data = fread($fh, 2048);
-		fclose($fh);
-
-		$valid = true;
-		foreach($signature as $match) {
-			// every part of the signature must be present
-			if (strpos($data, $match) === false) {
-				$valid = false;
-				break;
-			}
-		}
-
-		//	Retrieve charset encoding
-		if(preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um',$data,$matches)) {
-			$this->_charSet = strtoupper($matches[1]);
-		}
-//		echo 'Character Set is ',$this->_charSet,'<br />';
-
-		return $valid;
-	}
-
-
-	/**
-	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	Exception
-	 */
-	public function listWorksheetNames($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-		if (!$this->canRead($pFilename)) {
-			throw new Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
-
-		$worksheetNames = array();
-
-		$xml = simplexml_load_file($pFilename);
-		$namespaces = $xml->getNamespaces(true);
-
-		$xml_ss = $xml->children($namespaces['ss']);
-		foreach($xml_ss->Worksheet as $worksheet) {
-			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
-			$worksheetNames[] = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
-		}
-
-		return $worksheetNames;
-	}
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetInfo = array();
-
-		$xml = simplexml_load_file($pFilename);
-		$namespaces = $xml->getNamespaces(true);
-
-		$worksheetID = 1;
-		$xml_ss = $xml->children($namespaces['ss']);
-		foreach($xml_ss->Worksheet as $worksheet) {
-			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
-
-			$tmpInfo = array();
-			$tmpInfo['worksheetName'] = '';
-			$tmpInfo['lastColumnLetter'] = 'A';
-			$tmpInfo['lastColumnIndex'] = 0;
-			$tmpInfo['totalRows'] = 0;
-			$tmpInfo['totalColumns'] = 0;
-
-			if (isset($worksheet_ss['Name'])) {
-				$tmpInfo['worksheetName'] = (string) $worksheet_ss['Name'];
-			} else {
-				$tmpInfo['worksheetName'] = "Worksheet_{$worksheetID}";
-			}
-
-			if (isset($worksheet->Table->Row)) {
-				$rowIndex = 0;
-
-				foreach($worksheet->Table->Row as $rowData) {
-					$columnIndex = 0;
-					$rowHasData = false;
-
-					foreach($rowData->Cell as $cell) {
-						if (isset($cell->Data)) {
-							$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
-							$rowHasData = true;
-						}
-
-						++$columnIndex;
-					}
-
-					++$rowIndex;
-
-					if ($rowHasData) {
-						$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
-					}
-				}
-			}
-
-			$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
-			$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
-
-			$worksheetInfo[] = $tmpInfo;
-			++$worksheetID;
-		}
-
-		return $worksheetInfo;
-	}
-
-
-    /**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
-
-		// Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}
-
-
-	private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
-		$styleAttributeValue = strtolower($styleAttributeValue);
-		foreach($styleList as $style) {
-			if ($styleAttributeValue == strtolower($style)) {
-				$styleAttributeValue = $style;
-				return true;
-			}
-		}
-		return false;
-	}
-
-
- 	/**
- 	 * pixel units to excel width units(units of 1/256th of a character width)
- 	 * @param pxs
- 	 * @return
- 	 */
- 	private static function _pixel2WidthUnits($pxs) {
-		$UNIT_OFFSET_MAP = array(0, 36, 73, 109, 146, 182, 219);
-
-		$widthUnits = 256 * ($pxs / 7);
-		$widthUnits += $UNIT_OFFSET_MAP[($pxs % 7)];
-		return $widthUnits;
-	}
-
-
-	/**
-	 * excel width units(units of 1/256th of a character width) to pixel units
-	 * @param widthUnits
-	 * @return
-	 */
-	private static function _widthUnits2Pixel($widthUnits) {
-		$pixels = ($widthUnits / 256) * 7;
-		$offsetWidthUnits = $widthUnits % 256;
-		$pixels += round($offsetWidthUnits / (256 / 7));
-		return $pixels;
-	}
-
-
-	private static function _hex2str($hex) {
-		return chr(hexdec($hex[1]));
-	}
-
-
-	/**
-	 * Loads PHPExcel from file into PHPExcel instance
-	 *
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		$fromFormats	= array('\-',	'\ ');
-		$toFormats		= array('-',	' ');
-
-		$underlineStyles = array (
-				PHPExcel_Style_Font::UNDERLINE_NONE,
-				PHPExcel_Style_Font::UNDERLINE_DOUBLE,
-				PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING,
-				PHPExcel_Style_Font::UNDERLINE_SINGLE,
-				PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING
-			);
-		$verticalAlignmentStyles = array (
-				PHPExcel_Style_Alignment::VERTICAL_BOTTOM,
-				PHPExcel_Style_Alignment::VERTICAL_TOP,
-				PHPExcel_Style_Alignment::VERTICAL_CENTER,
-				PHPExcel_Style_Alignment::VERTICAL_JUSTIFY
-			);
-		$horizontalAlignmentStyles = array (
-				PHPExcel_Style_Alignment::HORIZONTAL_GENERAL,
-				PHPExcel_Style_Alignment::HORIZONTAL_LEFT,
-				PHPExcel_Style_Alignment::HORIZONTAL_RIGHT,
-				PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
-				PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS,
-				PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY
-			);
-
-		$timezoneObj = new DateTimeZone('Europe/London');
-		$GMT = new DateTimeZone('UTC');
-
-
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		if (!$this->canRead($pFilename)) {
-			throw new Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
-
-		$xml = simplexml_load_file($pFilename);
-		$namespaces = $xml->getNamespaces(true);
-
-		$docProps = $objPHPExcel->getProperties();
-		if (isset($xml->DocumentProperties[0])) {
-			foreach($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
-				switch ($propertyName) {
-					case 'Title' :
-							$docProps->setTitle(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Subject' :
-							$docProps->setSubject(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Author' :
-							$docProps->setCreator(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Created' :
-							$creationDate = strtotime($propertyValue);
-							$docProps->setCreated($creationDate);
-							break;
-					case 'LastAuthor' :
-							$docProps->setLastModifiedBy(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'LastSaved' :
-							$lastSaveDate = strtotime($propertyValue);
-							$docProps->setModified($lastSaveDate);
-							break;
-					case 'Company' :
-							$docProps->setCompany(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Category' :
-							$docProps->setCategory(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Manager' :
-							$docProps->setManager(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Keywords' :
-							$docProps->setKeywords(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-					case 'Description' :
-							$docProps->setDescription(self::_convertStringEncoding($propertyValue,$this->_charSet));
-							break;
-				}
-			}
-		}
-		if (isset($xml->CustomDocumentProperties)) {
-			foreach($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
-				$propertyAttributes = $propertyValue->attributes($namespaces['dt']);
-				$propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/','PHPExcel_Reader_Excel2003XML::_hex2str',$propertyName);
-				$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_UNKNOWN;
-				switch((string) $propertyAttributes) {
-					case 'string' :
-						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
-						$propertyValue = trim($propertyValue);
-						break;
-					case 'boolean' :
-						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN;
-						$propertyValue = (bool) $propertyValue;
-						break;
-					case 'integer' :
-						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_INTEGER;
-						$propertyValue = intval($propertyValue);
-						break;
-					case 'float' :
-						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT;
-						$propertyValue = floatval($propertyValue);
-						break;
-					case 'dateTime.tz' :
-						$propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE;
-						$propertyValue = strtotime(trim($propertyValue));
-						break;
-				}
-				$docProps->setCustomProperty($propertyName,$propertyValue,$propertyType);
-			}
-		}
-
-		foreach($xml->Styles[0] as $style) {
-			$style_ss = $style->attributes($namespaces['ss']);
-			$styleID = (string) $style_ss['ID'];
-//			echo 'Style ID = '.$styleID.'<br />';
-			if ($styleID == 'Default') {
-				$this->_styles['Default'] = array();
-			} else {
-				$this->_styles[$styleID] = $this->_styles['Default'];
-			}
-			foreach ($style as $styleType => $styleData) {
-				$styleAttributes = $styleData->attributes($namespaces['ss']);
-//				echo $styleType.'<br />';
-				switch ($styleType) {
-					case 'Alignment' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-//								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-								$styleAttributeValue = (string) $styleAttributeValue;
-								switch ($styleAttributeKey) {
-									case 'Vertical' :
-											if (self::identifyFixedStyleValue($verticalAlignmentStyles,$styleAttributeValue)) {
-												$this->_styles[$styleID]['alignment']['vertical'] = $styleAttributeValue;
-											}
-											break;
-									case 'Horizontal' :
-											if (self::identifyFixedStyleValue($horizontalAlignmentStyles,$styleAttributeValue)) {
-												$this->_styles[$styleID]['alignment']['horizontal'] = $styleAttributeValue;
-											}
-											break;
-									case 'WrapText' :
-											$this->_styles[$styleID]['alignment']['wrap'] = true;
-											break;
-								}
-							}
-							break;
-					case 'Borders' :
-							foreach($styleData->Border as $borderStyle) {
-								$borderAttributes = $borderStyle->attributes($namespaces['ss']);
-								$thisBorder = array();
-								foreach($borderAttributes as $borderStyleKey => $borderStyleValue) {
-//									echo $borderStyleKey.' = '.$borderStyleValue.'<br />';
-									switch ($borderStyleKey) {
-										case 'LineStyle' :
-												$thisBorder['style'] = PHPExcel_Style_Border::BORDER_MEDIUM;
-//												$thisBorder['style'] = $borderStyleValue;
-												break;
-										case 'Weight' :
-//												$thisBorder['style'] = $borderStyleValue;
-												break;
-										case 'Position' :
-												$borderPosition = strtolower($borderStyleValue);
-												break;
-										case 'Color' :
-												$borderColour = substr($borderStyleValue,1);
-												$thisBorder['color']['rgb'] = $borderColour;
-												break;
-									}
-								}
-								if (!empty($thisBorder)) {
-									if (($borderPosition == 'left') || ($borderPosition == 'right') || ($borderPosition == 'top') || ($borderPosition == 'bottom')) {
-										$this->_styles[$styleID]['borders'][$borderPosition] = $thisBorder;
-									}
-								}
-							}
-							break;
-					case 'Font' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-//								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-								$styleAttributeValue = (string) $styleAttributeValue;
-								switch ($styleAttributeKey) {
-									case 'FontName' :
-											$this->_styles[$styleID]['font']['name'] = $styleAttributeValue;
-											break;
-									case 'Size' :
-											$this->_styles[$styleID]['font']['size'] = $styleAttributeValue;
-											break;
-									case 'Color' :
-											$this->_styles[$styleID]['font']['color']['rgb'] = substr($styleAttributeValue,1);
-											break;
-									case 'Bold' :
-											$this->_styles[$styleID]['font']['bold'] = true;
-											break;
-									case 'Italic' :
-											$this->_styles[$styleID]['font']['italic'] = true;
-											break;
-									case 'Underline' :
-											if (self::identifyFixedStyleValue($underlineStyles,$styleAttributeValue)) {
-												$this->_styles[$styleID]['font']['underline'] = $styleAttributeValue;
-											}
-											break;
-								}
-							}
-							break;
-					case 'Interior' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-//								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-								switch ($styleAttributeKey) {
-									case 'Color' :
-											$this->_styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue,1);
-											break;
-								}
-							}
-							break;
-					case 'NumberFormat' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-//								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-								$styleAttributeValue = str_replace($fromFormats,$toFormats,$styleAttributeValue);
-								switch ($styleAttributeValue) {
-									case 'Short Date' :
-											$styleAttributeValue = 'dd/mm/yyyy';
-											break;
-								}
-								if ($styleAttributeValue > '') {
-									$this->_styles[$styleID]['numberformat']['code'] = $styleAttributeValue;
-								}
-							}
-							break;
-					case 'Protection' :
-							foreach($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
-//								echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
-							}
-							break;
-				}
-			}
-//			print_r($this->_styles[$styleID]);
-//			echo '<hr />';
-		}
-//		echo '<hr />';
-
-		$worksheetID = 0;
-		$xml_ss = $xml->children($namespaces['ss']);
-
-		foreach($xml_ss->Worksheet as $worksheet) {
-			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
-
-			if ((isset($this->_loadSheetsOnly)) && (isset($worksheet_ss['Name'])) &&
-				(!in_array($worksheet_ss['Name'], $this->_loadSheetsOnly))) {
-				continue;
-			}
-
-//			echo '<h3>Worksheet: ',$worksheet_ss['Name'],'<h3>';
-//
-			// Create new Worksheet
-			$objPHPExcel->createSheet();
-			$objPHPExcel->setActiveSheetIndex($worksheetID);
-			if (isset($worksheet_ss['Name'])) {
-				$worksheetName = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
-				//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
-				//		formula cells... during the load, all formulae should be correct, and we're simply bringing
-				//		the worksheet name in line with the formula, not the reverse
-				$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
-			}
-
-			$columnID = 'A';
-			if (isset($worksheet->Table->Column)) {
-				foreach($worksheet->Table->Column as $columnData) {
-					$columnData_ss = $columnData->attributes($namespaces['ss']);
-					if (isset($columnData_ss['Index'])) {
-						$columnID = PHPExcel_Cell::stringFromColumnIndex($columnData_ss['Index']-1);
-					}
-					if (isset($columnData_ss['Width'])) {
-						$columnWidth = $columnData_ss['Width'];
-//						echo '<b>Setting column width for '.$columnID.' to '.$columnWidth.'</b><br />';
-						$objPHPExcel->getActiveSheet()->getColumnDimension($columnID)->setWidth($columnWidth / 5.4);
-					}
-					++$columnID;
-				}
-			}
-
-			$rowID = 1;
-			if (isset($worksheet->Table->Row)) {
-				foreach($worksheet->Table->Row as $rowData) {
-					$rowHasData = false;
-					$row_ss = $rowData->attributes($namespaces['ss']);
-					if (isset($row_ss['Index'])) {
-						$rowID = (integer) $row_ss['Index'];
-					}
-//					echo '<b>Row '.$rowID.'</b><br />';
-
-					$columnID = 'A';
-					foreach($rowData->Cell as $cell) {
-
-						$cell_ss = $cell->attributes($namespaces['ss']);
-						if (isset($cell_ss['Index'])) {
-							$columnID = PHPExcel_Cell::stringFromColumnIndex($cell_ss['Index']-1);
-						}
-						$cellRange = $columnID.$rowID;
-
-						if ($this->getReadFilter() !== NULL) {
-							if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
-								continue;
-							}
-						}
-
-						if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
-							$columnTo = $columnID;
-							if (isset($cell_ss['MergeAcross'])) {
-								$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] -1);
-							}
-							$rowTo = $rowID;
-							if (isset($cell_ss['MergeDown'])) {
-								$rowTo = $rowTo + $cell_ss['MergeDown'];
-							}
-							$cellRange .= ':'.$columnTo.$rowTo;
-							$objPHPExcel->getActiveSheet()->mergeCells($cellRange);
-						}
-
-						$cellIsSet = $hasCalculatedValue = false;
-						$cellDataFormula = '';
-						if (isset($cell_ss['Formula'])) {
-							$cellDataFormula = $cell_ss['Formula'];
-							// added this as a check for array formulas
-							if (isset($cell_ss['ArrayRange'])) {
-								$cellDataCSEFormula = $cell_ss['ArrayRange'];
-//								echo "found an array formula at ".$columnID.$rowID."<br />";
-							}
-							$hasCalculatedValue = true;
-						}
-						if (isset($cell->Data)) {
-							$cellValue = $cellData = $cell->Data;
-							$type = PHPExcel_Cell_DataType::TYPE_NULL;
-							$cellData_ss = $cellData->attributes($namespaces['ss']);
-							if (isset($cellData_ss['Type'])) {
-								$cellDataType = $cellData_ss['Type'];
-								switch ($cellDataType) {
-									/*
-									const TYPE_STRING		= 's';
-									const TYPE_FORMULA		= 'f';
-									const TYPE_NUMERIC		= 'n';
-									const TYPE_BOOL			= 'b';
-								    const TYPE_NULL			= 'null';
-								    const TYPE_INLINE		= 'inlineStr';
-									const TYPE_ERROR		= 'e';
-									*/
-									case 'String' :
-											$cellValue = self::_convertStringEncoding($cellValue,$this->_charSet);
-											$type = PHPExcel_Cell_DataType::TYPE_STRING;
-											break;
-									case 'Number' :
-											$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-											$cellValue = (float) $cellValue;
-											if (floor($cellValue) == $cellValue) {
-												$cellValue = (integer) $cellValue;
-											}
-											break;
-									case 'Boolean' :
-											$type = PHPExcel_Cell_DataType::TYPE_BOOL;
-											$cellValue = ($cellValue != 0);
-											break;
-									case 'DateTime' :
-											$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-											$cellValue = PHPExcel_Shared_Date::PHPToExcel(strtotime($cellValue));
-											break;
-									case 'Error' :
-											$type = PHPExcel_Cell_DataType::TYPE_ERROR;
-											break;
-								}
-							}
-
-							if ($hasCalculatedValue) {
-//								echo 'FORMULA<br />';
-								$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
-								$columnNumber = PHPExcel_Cell::columnIndexFromString($columnID);
-								if (substr($cellDataFormula,0,3) == 'of:') {
-									$cellDataFormula = substr($cellDataFormula,3);
-//									echo 'Before: ',$cellDataFormula,'<br />';
-									$temp = explode('"',$cellDataFormula);
-									$key = false;
-									foreach($temp as &$value) {
-										//	Only replace in alternate array entries (i.e. non-quoted blocks)
-										if ($key = !$key) {
-											$value = str_replace(array('[.','.',']'),'',$value);
-										}
-									}
-								} else {
-									//	Convert R1C1 style references to A1 style references (but only when not quoted)
-//									echo 'Before: ',$cellDataFormula,'<br />';
-									$temp = explode('"',$cellDataFormula);
-									$key = false;
-									foreach($temp as &$value) {
-										//	Only replace in alternate array entries (i.e. non-quoted blocks)
-										if ($key = !$key) {
-											preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/',$value, $cellReferences,PREG_SET_ORDER+PREG_OFFSET_CAPTURE);
-											//	Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
-											//		through the formula from left to right. Reversing means that we work right to left.through
-											//		the formula
-											$cellReferences = array_reverse($cellReferences);
-											//	Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
-											//		then modify the formula to use that new reference
-											foreach($cellReferences as $cellReference) {
-												$rowReference = $cellReference[2][0];
-												//	Empty R reference is the current row
-												if ($rowReference == '') $rowReference = $rowID;
-												//	Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference,'[]');
-												$columnReference = $cellReference[4][0];
-												//	Empty C reference is the current column
-												if ($columnReference == '') $columnReference = $columnNumber;
-												//	Bracketed C references are relative to the current column
-												if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference,'[]');
-												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
-													$value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0]));
-											}
-										}
-									}
-								}
-								unset($value);
-								//	Then rebuild the formula string
-								$cellDataFormula = implode('"',$temp);
-//								echo 'After: ',$cellDataFormula,'<br />';
-							}
-
-//							echo 'Cell '.$columnID.$rowID.' is a '.$type.' with a value of '.(($hasCalculatedValue) ? $cellDataFormula : $cellValue).'<br />';
-//
-							$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue),$type);
-							if ($hasCalculatedValue) {
-//								echo 'Formula result is '.$cellValue.'<br />';
-								$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setCalculatedValue($cellValue);
-							}
-							$cellIsSet = $rowHasData = true;
-						}
-
-						if (isset($cell->Comment)) {
-//							echo '<b>comment found</b><br />';
-							$commentAttributes = $cell->Comment->attributes($namespaces['ss']);
-							$author = 'unknown';
-							if (isset($commentAttributes->Author)) {
-								$author = (string)$commentAttributes->Author;
-//								echo 'Author: ',$author,'<br />';
-							}
-							$node = $cell->Comment->Data->asXML();
-//							$annotation = str_replace('html:','',substr($node,49,-10));
-//							echo $annotation,'<br />';
-							$annotation = strip_tags($node);
-//							echo 'Annotation: ',$annotation,'<br />';
-							$objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
-															->setAuthor(self::_convertStringEncoding($author ,$this->_charSet))
-															->setText($this->_parseRichText($annotation) );
-						}
-
-						if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
-							$style = (string) $cell_ss['StyleID'];
-//							echo 'Cell style for '.$columnID.$rowID.' is '.$style.'<br />';
-							if ((isset($this->_styles[$style])) && (!empty($this->_styles[$style]))) {
-//								echo 'Cell '.$columnID.$rowID.'<br />';
-//								print_r($this->_styles[$style]);
-//								echo '<br />';
-								if (!$objPHPExcel->getActiveSheet()->cellExists($columnID.$rowID)) {
-									$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValue(NULL);
-								}
-								$objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->_styles[$style]);
-							}
-						}
-						++$columnID;
-					}
-
-					if ($rowHasData) {
-						if (isset($row_ss['StyleID'])) {
-							$rowStyle = $row_ss['StyleID'];
-						}
-						if (isset($row_ss['Height'])) {
-							$rowHeight = $row_ss['Height'];
-//							echo '<b>Setting row height to '.$rowHeight.'</b><br />';
-							$objPHPExcel->getActiveSheet()->getRowDimension($rowID)->setRowHeight($rowHeight);
-						}
-					}
-
-					++$rowID;
-				}
-			}
-			++$worksheetID;
-		}
-
-		// Return
-		return $objPHPExcel;
-	}
-
-
-	private static function _convertStringEncoding($string,$charset) {
-		if ($charset != 'UTF-8') {
-			return PHPExcel_Shared_String::ConvertEncoding($string,'UTF-8',$charset);
-		}
-		return $string;
-	}
-
-
-	private function _parseRichText($is = '') {
-		$value = new PHPExcel_RichText();
-
-		$value->createText(self::_convertStringEncoding($is,$this->_charSet));
-
-		return $value;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2007.php b/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2007.php
deleted file mode 100755
index 8d45cc79a..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2007.php
+++ /dev/null
@@ -1,2112 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_Excel2007
- *
- * @category	PHPExcel
- * @package	PHPExcel_Reader
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Read data only?
-	 * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
-	 *		or whether it should read both data and formatting
-	 *
-	 * @var	boolean
-	 */
-	private $_readDataOnly = FALSE;
-
-	/**
-	 * Read charts that are defined in the workbook?
-	 * Identifies whether the Reader should read the definitions for any charts that exist in the workbook;
-	 *
-	 * @var	boolean
-	 */
-	private $_includeCharts = FALSE;
-
-	/**
-	 * Restrict which sheets should be loaded?
-	 * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
-	 *
-	 * @var array of string
-	 */
-	private $_loadSheetsOnly = NULL;
-
-	/**
-	 * PHPExcel_Reader_IReadFilter instance
-	 *
-	 * @var PHPExcel_Reader_IReadFilter
-	 */
-	private $_readFilter = NULL;
-
-	/**
-	 * PHPExcel_ReferenceHelper instance
-	 *
-	 * @var PHPExcel_ReferenceHelper
-	 */
-	private $_referenceHelper = NULL;
-
-	/**
-	 * PHPExcel_Reader_Excel2007_Theme instance
-	 *
-	 * @var PHPExcel_Reader_Excel2007_Theme
-	 */
-	private static $_theme = NULL;
-
-
-	/**
-	 * Create a new PHPExcel_Reader_Excel2007 instance
-	 */
-	public function __construct() {
-		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
-		$this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
-	}
-
-
-	/**
-	 * Read data only?
-	 *		If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
-	 *		If false (the default) it will read data and formatting.
-	 *
-	 * @return	boolean
-	 */
-	public function getReadDataOnly() {
-		return $this->_readDataOnly;
-	}
-
-
-	/**
-	 * Set read data only
-	 *		Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
-	 *		Set to false (the default) to advise the Reader to read both data and formatting for cells.
-	 *
-	 * @param	boolean	$pValue
-	 *
-	 * @return	PHPExcel_Reader_Excel2007
-	 */
-	public function setReadDataOnly($pValue = FALSE) {
-		$this->_readDataOnly = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Read charts in workbook?
-	 *		If this is true, then the Reader will include any charts that exist in the workbook.
-	 *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
-	 *		If false (the default) it will ignore any charts defined in the workbook file.
-	 *
-	 * @return	boolean
-	 */
-	public function getIncludeCharts() {
-		return $this->_includeCharts;
-	}
-
-
-	/**
-	 * Set read charts in workbook
-	 *		Set to true, to advise the Reader to include any charts that exist in the workbook.
-	 *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
-	 *		Set to false (the default) to discard charts.
-	 *
-	 * @param	boolean	$pValue
-	 *
-	 * @return	PHPExcel_Reader_Excel2007
-	 */
-	public function setIncludeCharts($pValue = FALSE) {
-		$this->_includeCharts = (boolean) $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Get which sheets to load
-	 * Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
-	 *		indicating that all worksheets in the workbook should be loaded.
-	 *
-	 * @return mixed
-	 */
-	public function getLoadSheetsOnly()
-	{
-		return $this->_loadSheetsOnly;
-	}
-
-
-	/**
-	 * Set which sheets to load
-	 *
-	 * @param mixed $value
-	 *		This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
-	 *		If NULL, then it tells the Reader to read all worksheets in the workbook
-	 *
-	 * @return PHPExcel_Reader_Excel2007
-	 */
-	public function setLoadSheetsOnly($value = NULL)
-	{
-		$this->_loadSheetsOnly = is_array($value) ?
-			$value : array($value);
-		return $this;
-	}
-
-
-	/**
-	 * Set all sheets to load
-	 *		Tells the Reader to load all worksheets from the workbook.
-	 *
-	 * @return PHPExcel_Reader_Excel2007
-	 */
-	public function setLoadAllSheets()
-	{
-		$this->_loadSheetsOnly = NULL;
-		return $this;
-	}
-
-
-	/**
-	 * Read filter
-	 *
-	 * @return PHPExcel_Reader_IReadFilter
-	 */
-	public function getReadFilter() {
-		return $this->_readFilter;
-	}
-
-
-	/**
-	 * Set read filter
-	 *
-	 * @param PHPExcel_Reader_IReadFilter $pValue
-	 * @return PHPExcel_Reader_Excel2007
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFileName
-	 * @return 	boolean
-	 * @throws Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Check if zip class exists
-		if (!class_exists('ZipArchive',FALSE)) {
-			throw new Exception("ZipArchive library is not enabled");
-		}
-
-		$xl = false;
-		// Load file
-		$zip = new ZipArchive;
-		if ($zip->open($pFilename) === true) {
-			// check if it is an OOXML archive
-			$rels = simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels"));
-			if ($rels !== false) {
-				foreach ($rels->Relationship as $rel) {
-					switch ($rel["Type"]) {
-						case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
-							if (basename($rel["Target"]) == 'workbook.xml') {
-								$xl = true;
-							}
-							break;
-
-					}
-				}
-			}
-			$zip->close();
-		}
-
-		return $xl;
-	}
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetInfo = array();
-
-		$zip = new ZipArchive;
-		$zip->open($pFilename);
-
-		$rels = simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-		foreach ($rels->Relationship as $rel) {
-			if ($rel["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument") {
-				$dir = dirname($rel["Target"]);
-				$relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels"));  //~ http://schemas.openxmlformats.org/package/2006/relationships");
-				$relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
-
-				$worksheets = array();
-				foreach ($relsWorkbook->Relationship as $ele) {
-					if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet") {
-						$worksheets[(string) $ele["Id"]] = $ele["Target"];
-					}
-				}
-
-				$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-				if ($xmlWorkbook->sheets) {
-					$dir = dirname($rel["Target"]);
-					foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
-						$tmpInfo = array();
-						$tmpInfo['worksheetName'] = (string) $eleSheet["name"];
-						$tmpInfo['lastColumnLetter'] = 'A';
-						$tmpInfo['lastColumnIndex'] = 0;
-						$tmpInfo['totalRows'] = 0;
-						$tmpInfo['totalColumns'] = 0;
-
-						$fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-						$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-						if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
-							foreach ($xmlSheet->sheetData->row as $row) {
-								foreach ($row->c as $c) {
-									$r = (string) $c["r"];
-									$coordinates = PHPExcel_Cell::coordinateFromString($r);
-
-									$rowIndex = $coordinates[1];
-									$columnIndex = PHPExcel_Cell::columnIndexFromString($coordinates[0]) - 1;
-
-									$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
-									$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
-								}
-							}
-						}
-
-						$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
-						$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
-
-						$worksheetInfo[] = $tmpInfo;
-					}
-				}
-			}
-		}
-
-		$zip->close();
-
-		return $worksheetInfo;
-	}
-
-
-	private static function _castToBool($c) {
-//		echo 'Initial Cast to Boolean<br />';
-		$value = isset($c->v) ? (string) $c->v : NULL;
-		if ($value == '0') {
-			return FALSE;
-		} elseif ($value == '1') {
-			return TRUE;
-		} else {
-			return (bool)$c->v;
-		}
-		return $value;
-	}	//	function _castToBool()
-
-
-	private static function _castToError($c) {
-//		echo 'Initial Cast to Error<br />';
-		return isset($c->v) ? (string) $c->v : NULL;
-	}	//	function _castToError()
-
-
-	private static function _castToString($c) {
-//		echo 'Initial Cast to String<br />';
-		return isset($c->v) ? (string) $c->v : NULL;
-	}	//	function _castToString()
-
-
-	private function _castToFormula($c,$r,&$cellDataType,&$value,&$calculatedValue,&$sharedFormulas,$castBaseType) {
-//		echo 'Formula<br />';
-//		echo '$c->f is '.$c->f.'<br />';
-		$cellDataType 		= 'f';
-		$value 				= "={$c->f}";
-		$calculatedValue 	= self::$castBaseType($c);
-
-		// Shared formula?
-		if (isset($c->f['t']) && strtolower((string)$c->f['t']) == 'shared') {
-//			echo 'SHARED FORMULA<br />';
-			$instance = (string)$c->f['si'];
-
-//			echo 'Instance ID = '.$instance.'<br />';
-//
-//			echo 'Shared Formula Array:<pre>';
-//			print_r($sharedFormulas);
-//			echo '</pre>';
-			if (!isset($sharedFormulas[(string)$c->f['si']])) {
-//				echo 'SETTING NEW SHARED FORMULA<br />';
-//				echo 'Master is '.$r.'<br />';
-//				echo 'Formula is '.$value.'<br />';
-				$sharedFormulas[$instance] = array(	'master' => $r,
-													'formula' => $value
-												  );
-//				echo 'New Shared Formula Array:<pre>';
-//				print_r($sharedFormulas);
-//				echo '</pre>';
-			} else {
-//				echo 'GETTING SHARED FORMULA<br />';
-//				echo 'Master is '.$sharedFormulas[$instance]['master'].'<br />';
-//				echo 'Formula is '.$sharedFormulas[$instance]['formula'].'<br />';
-				$master = PHPExcel_Cell::coordinateFromString($sharedFormulas[$instance]['master']);
-				$current = PHPExcel_Cell::coordinateFromString($r);
-
-				$difference = array(0, 0);
-				$difference[0] = PHPExcel_Cell::columnIndexFromString($current[0]) - PHPExcel_Cell::columnIndexFromString($master[0]);
-				$difference[1] = $current[1] - $master[1];
-
-				$value = $this->_referenceHelper->updateFormulaReferences(	$sharedFormulas[$instance]['formula'],
-																			'A1',
-																			$difference[0],
-																			$difference[1]
-																		 );
-//				echo 'Adjusted Formula is '.$value.'<br />';
-			}
-		}
-	}
-
-
-	public function _getFromZipArchive(ZipArchive $archive, $fileName = '')
-	{
-		// Root-relative paths
-		if (strpos($fileName, '//') !== false)
-		{
-			$fileName = substr($fileName, strpos($fileName, '//') + 1);
-		}
-		$fileName = PHPExcel_Shared_File::realpath($fileName);
-
-		// Apache POI fixes
-		$contents = $archive->getFromName($fileName);
-		if ($contents === false)
-		{
-			$contents = $archive->getFromName(substr($fileName, 1));
-		}
-
-		return $contents;
-	}
-
-
-	/**
-	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	Exception
-	 */
-	public function listWorksheetNames($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetNames = array();
-
-		$zip = new ZipArchive;
-		$zip->open($pFilename);
-
-		$rels = simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-		foreach ($rels->Relationship as $rel) {
-			switch ($rel["Type"]) {
-				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
-					$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-
-					if ($xmlWorkbook->sheets) {
-						foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
-							// Check if sheet should be skipped
-							$worksheetNames[] = (string) $eleSheet["name"];
-						}
-					}
-			}
-		}
-
-		$zip->close();
-
-		return $worksheetNames;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	Exception
-	 */
-	public function load($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Initialisations
-		$excel = new PHPExcel;
-		$excel->removeSheetByIndex(0);
-		if (!$this->_readDataOnly) {
-			$excel->removeCellStyleXfByIndex(0); // remove the default style
-			$excel->removeCellXfByIndex(0); // remove the default style
-		}
-		$zip = new ZipArchive;
-		$zip->open($pFilename);
-
-		//	Read the theme first, because we need the colour scheme when reading the styles
-		$wbRels = simplexml_load_string($this->_getFromZipArchive($zip, "xl/_rels/workbook.xml.rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-		foreach ($wbRels->Relationship as $rel) {
-			switch ($rel["Type"]) {
-				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme":
-					$themeOrderArray = array('lt1','dk1','lt2','dk2');
-					$themeOrderAdditional = count($themeOrderArray);
-
-					$xmlTheme = simplexml_load_string($this->_getFromZipArchive($zip, "xl/{$rel['Target']}"));
-					if (is_object($xmlTheme)) {
-						$xmlThemeName = $xmlTheme->attributes();
-						$xmlTheme = $xmlTheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
-						$themeName = (string)$xmlThemeName['name'];
-
-						$colourScheme = $xmlTheme->themeElements->clrScheme->attributes();
-						$colourSchemeName = (string)$colourScheme['name'];
-						$colourScheme = $xmlTheme->themeElements->clrScheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
-
-						$themeColours = array();
-						foreach ($colourScheme as $k => $xmlColour) {
-							$themePos = array_search($k,$themeOrderArray);
-							if ($themePos === false) {
-								$themePos = $themeOrderAdditional++;
-							}
-							if (isset($xmlColour->sysClr)) {
-								$xmlColourData = $xmlColour->sysClr->attributes();
-								$themeColours[$themePos] = $xmlColourData['lastClr'];
-							} elseif (isset($xmlColour->srgbClr)) {
-								$xmlColourData = $xmlColour->srgbClr->attributes();
-								$themeColours[$themePos] = $xmlColourData['val'];
-							}
-						}
-						self::$_theme = new PHPExcel_Reader_Excel2007_Theme($themeName,$colourSchemeName,$themeColours);
-					}
-					break;
-			}
-		}
-
-		$rels = simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-		foreach ($rels->Relationship as $rel) {
-			switch ($rel["Type"]) {
-				case "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties":
-					$xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
-					if (is_object($xmlCore)) {
-						$xmlCore->registerXPathNamespace("dc", "http://purl.org/dc/elements/1.1/");
-						$xmlCore->registerXPathNamespace("dcterms", "http://purl.org/dc/terms/");
-						$xmlCore->registerXPathNamespace("cp", "http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
-						$docProps = $excel->getProperties();
-						$docProps->setCreator((string) self::array_item($xmlCore->xpath("dc:creator")));
-						$docProps->setLastModifiedBy((string) self::array_item($xmlCore->xpath("cp:lastModifiedBy")));
-						$docProps->setCreated(strtotime(self::array_item($xmlCore->xpath("dcterms:created")))); //! respect xsi:type
-						$docProps->setModified(strtotime(self::array_item($xmlCore->xpath("dcterms:modified")))); //! respect xsi:type
-						$docProps->setTitle((string) self::array_item($xmlCore->xpath("dc:title")));
-						$docProps->setDescription((string) self::array_item($xmlCore->xpath("dc:description")));
-						$docProps->setSubject((string) self::array_item($xmlCore->xpath("dc:subject")));
-						$docProps->setKeywords((string) self::array_item($xmlCore->xpath("cp:keywords")));
-						$docProps->setCategory((string) self::array_item($xmlCore->xpath("cp:category")));
-					}
-				break;
-
-				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties":
-					$xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
-					if (is_object($xmlCore)) {
-						$docProps = $excel->getProperties();
-						if (isset($xmlCore->Company))
-							$docProps->setCompany((string) $xmlCore->Company);
-						if (isset($xmlCore->Manager))
-							$docProps->setManager((string) $xmlCore->Manager);
-					}
-				break;
-
-				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties":
-					$xmlCore = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
-					if (is_object($xmlCore)) {
-						$docProps = $excel->getProperties();
-						foreach ($xmlCore as $xmlProperty) {
-							$cellDataOfficeAttributes = $xmlProperty->attributes();
-							if (isset($cellDataOfficeAttributes['name'])) {
-								$propertyName = (string) $cellDataOfficeAttributes['name'];
-								$cellDataOfficeChildren = $xmlProperty->children('http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
-								$attributeType = $cellDataOfficeChildren->getName();
-								$attributeValue = (string) $cellDataOfficeChildren->{$attributeType};
-								$attributeValue = PHPExcel_DocumentProperties::convertProperty($attributeValue,$attributeType);
-								$attributeType = PHPExcel_DocumentProperties::convertPropertyType($attributeType);
-								$docProps->setCustomProperty($propertyName,$attributeValue,$attributeType);
-							}
-						}
-					}
-				break;
-
-				case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
-					$dir = dirname($rel["Target"]);
-					$relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels"));  //~ http://schemas.openxmlformats.org/package/2006/relationships");
-					$relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
-
-					$sharedStrings = array();
-					$xpath = self::array_item($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings']"));
-					$xmlStrings = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-					if (isset($xmlStrings) && isset($xmlStrings->si)) {
-						foreach ($xmlStrings->si as $val) {
-							if (isset($val->t)) {
-								$sharedStrings[] = PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $val->t );
-							} elseif (isset($val->r)) {
-								$sharedStrings[] = $this->_parseRichText($val);
-							}
-						}
-					}
-
-					$worksheets = array();
-					foreach ($relsWorkbook->Relationship as $ele) {
-						if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet") {
-							$worksheets[(string) $ele["Id"]] = $ele["Target"];
-						}
-					}
-
-					$styles 	= array();
-					$cellStyles = array();
-					$xpath = self::array_item($relsWorkbook->xpath("rel:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles']"));
-					$xmlStyles = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]")); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-					$numFmts = null;
-					if ($xmlStyles && $xmlStyles->numFmts[0]) {
-						$numFmts = $xmlStyles->numFmts[0];
-					}
-					if (isset($numFmts) && ($numFmts !== NULL)) {
-						$numFmts->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-					}
-					if (!$this->_readDataOnly && $xmlStyles) {
-						foreach ($xmlStyles->cellXfs->xf as $xf) {
-							$numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
-
-							if ($xf["numFmtId"]) {
-								if (isset($numFmts)) {
-									$tmpNumFmt = self::array_item($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
-
-									if (isset($tmpNumFmt["formatCode"])) {
-										$numFmt = (string) $tmpNumFmt["formatCode"];
-									}
-								}
-
-								if ((int)$xf["numFmtId"] < 164) {
-									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
-								}
-							}
-							//$numFmt = str_replace('mm', 'i', $numFmt);
-							//$numFmt = str_replace('h', 'H', $numFmt);
-
-							$style = (object) array(
-								"numFmt" => $numFmt,
-								"font" => $xmlStyles->fonts->font[intval($xf["fontId"])],
-								"fill" => $xmlStyles->fills->fill[intval($xf["fillId"])],
-								"border" => $xmlStyles->borders->border[intval($xf["borderId"])],
-								"alignment" => $xf->alignment,
-								"protection" => $xf->protection,
-							);
-							$styles[] = $style;
-
-							// add style to cellXf collection
-							$objStyle = new PHPExcel_Style;
-							self::_readStyle($objStyle, $style);
-							$excel->addCellXf($objStyle);
-						}
-
-						foreach ($xmlStyles->cellStyleXfs->xf as $xf) {
-							$numFmt = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
-							if ($numFmts && $xf["numFmtId"]) {
-								$tmpNumFmt = self::array_item($numFmts->xpath("sml:numFmt[@numFmtId=$xf[numFmtId]]"));
-								if (isset($tmpNumFmt["formatCode"])) {
-									$numFmt = (string) $tmpNumFmt["formatCode"];
-								} else if ((int)$xf["numFmtId"] < 165) {
-									$numFmt = PHPExcel_Style_NumberFormat::builtInFormatCode((int)$xf["numFmtId"]);
-								}
-							}
-
-							$cellStyle = (object) array(
-								"numFmt" => $numFmt,
-								"font" => $xmlStyles->fonts->font[intval($xf["fontId"])],
-								"fill" => $xmlStyles->fills->fill[intval($xf["fillId"])],
-								"border" => $xmlStyles->borders->border[intval($xf["borderId"])],
-								"alignment" => $xf->alignment,
-								"protection" => $xf->protection,
-							);
-							$cellStyles[] = $cellStyle;
-
-							// add style to cellStyleXf collection
-							$objStyle = new PHPExcel_Style;
-							self::_readStyle($objStyle, $cellStyle);
-							$excel->addCellStyleXf($objStyle);
-						}
-					}
-
-					$dxfs = array();
-					if (!$this->_readDataOnly && $xmlStyles) {
-						//	Conditional Styles
-						if ($xmlStyles->dxfs) {
-							foreach ($xmlStyles->dxfs->dxf as $dxf) {
-								$style = new PHPExcel_Style(FALSE, TRUE);
-								self::_readStyle($style, $dxf);
-								$dxfs[] = $style;
-							}
-						}
-						//	Cell Styles
-						if ($xmlStyles->cellStyles) {
-							foreach ($xmlStyles->cellStyles->cellStyle as $cellStyle) {
-								if (intval($cellStyle['builtinId']) == 0) {
-									if (isset($cellStyles[intval($cellStyle['xfId'])])) {
-										// Set default style
-										$style = new PHPExcel_Style;
-										self::_readStyle($style, $cellStyles[intval($cellStyle['xfId'])]);
-
-										// normal style, currently not using it for anything
-									}
-								}
-							}
-						}
-					}
-
-					$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-
-					// Set base date
-					if ($xmlWorkbook->workbookPr) {
-						PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900);
-						if (isset($xmlWorkbook->workbookPr['date1904'])) {
-							$date1904 = (string)$xmlWorkbook->workbookPr['date1904'];
-							if ($date1904 == "true" || $date1904 == "1") {
-								PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904);
-							}
-						}
-					}
-
-					$sheetId = 0; // keep track of new sheet id in final workbook
-					$oldSheetId = -1; // keep track of old sheet id in final workbook
-					$countSkippedSheets = 0; // keep track of number of skipped sheets
-					$mapSheetId = array(); // mapping of sheet ids from old to new
-
-
-					$charts = $chartDetails = array();
-
-					if ($xmlWorkbook->sheets) {
-						foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
-							++$oldSheetId;
-
-							// Check if sheet should be skipped
-							if (isset($this->_loadSheetsOnly) && !in_array((string) $eleSheet["name"], $this->_loadSheetsOnly)) {
-								++$countSkippedSheets;
-								$mapSheetId[$oldSheetId] = null;
-								continue;
-							}
-
-							// Map old sheet id in original workbook to new sheet id.
-							// They will differ if loadSheetsOnly() is being used
-							$mapSheetId[$oldSheetId] = $oldSheetId - $countSkippedSheets;
-
-							// Load sheet
-							$docSheet = $excel->createSheet();
-							//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet
-							//		references in formula cells... during the load, all formulae should be correct,
-							//		and we're simply bringing the worksheet name in line with the formula, not the
-							//		reverse
-							$docSheet->setTitle((string) $eleSheet["name"],false);
-							$fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-							$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-
-							$sharedFormulas = array();
-
-							if (isset($eleSheet["state"]) && (string) $eleSheet["state"] != '') {
-								$docSheet->setSheetState( (string) $eleSheet["state"] );
-							}
-
-							if (isset($xmlSheet->sheetViews) && isset($xmlSheet->sheetViews->sheetView)) {
-							    if (isset($xmlSheet->sheetViews->sheetView['zoomScale'])) {
-								    $docSheet->getSheetView()->setZoomScale( intval($xmlSheet->sheetViews->sheetView['zoomScale']) );
-								}
-
-							    if (isset($xmlSheet->sheetViews->sheetView['zoomScaleNormal'])) {
-								    $docSheet->getSheetView()->setZoomScaleNormal( intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']) );
-								}
-
-							    if (isset($xmlSheet->sheetViews->sheetView['view'])) {
-								    $docSheet->getSheetView()->setView((string) $xmlSheet->sheetViews->sheetView['view']);
-								}
-
-								if (isset($xmlSheet->sheetViews->sheetView['showGridLines'])) {
-									$docSheet->setShowGridLines((string)$xmlSheet->sheetViews->sheetView['showGridLines'] ? true : false);
-								}
-
-								if (isset($xmlSheet->sheetViews->sheetView['showRowColHeaders'])) {
-									$docSheet->setShowRowColHeaders((string)$xmlSheet->sheetViews->sheetView['showRowColHeaders'] ? true : false);
-								}
-
-								if (isset($xmlSheet->sheetViews->sheetView['rightToLeft'])) {
-									$docSheet->setRightToLeft((string)$xmlSheet->sheetViews->sheetView['rightToLeft'] ? true : false);
-								}
-
-								if (isset($xmlSheet->sheetViews->sheetView->pane)) {
-								    if (isset($xmlSheet->sheetViews->sheetView->pane['topLeftCell'])) {
-								        $docSheet->freezePane( (string)$xmlSheet->sheetViews->sheetView->pane['topLeftCell'] );
-								    } else {
-								        $xSplit = 0;
-								        $ySplit = 0;
-
-								        if (isset($xmlSheet->sheetViews->sheetView->pane['xSplit'])) {
-								            $xSplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['xSplit']);
-								        }
-
-								    	if (isset($xmlSheet->sheetViews->sheetView->pane['ySplit'])) {
-								            $ySplit = 1 + intval($xmlSheet->sheetViews->sheetView->pane['ySplit']);
-								        }
-
-								        $docSheet->freezePaneByColumnAndRow($xSplit, $ySplit);
-								    }
-								}
-
-								if (isset($xmlSheet->sheetViews->sheetView->selection)) {
-									if (isset($xmlSheet->sheetViews->sheetView->selection['sqref'])) {
-										$sqref = (string)$xmlSheet->sheetViews->sheetView->selection['sqref'];
-										$sqref = explode(' ', $sqref);
-										$sqref = $sqref[0];
-										$docSheet->setSelectedCells($sqref);
-									}
-								}
-
-							}
-
-							if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->tabColor)) {
-								if (isset($xmlSheet->sheetPr->tabColor['rgb'])) {
-									$docSheet->getTabColor()->setARGB( (string)$xmlSheet->sheetPr->tabColor['rgb'] );
-								}
-							}
-
-							if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->outlinePr)) {
-								if (isset($xmlSheet->sheetPr->outlinePr['summaryRight']) && $xmlSheet->sheetPr->outlinePr['summaryRight'] == false) {
-									$docSheet->setShowSummaryRight(false);
-								} else {
-									$docSheet->setShowSummaryRight(true);
-								}
-
-								if (isset($xmlSheet->sheetPr->outlinePr['summaryBelow']) && $xmlSheet->sheetPr->outlinePr['summaryBelow'] == false) {
-									$docSheet->setShowSummaryBelow(false);
-								} else {
-									$docSheet->setShowSummaryBelow(true);
-								}
-							}
-
-							if (isset($xmlSheet->sheetPr) && isset($xmlSheet->sheetPr->pageSetUpPr)) {
-								if (isset($xmlSheet->sheetPr->pageSetUpPr['fitToPage']) && $xmlSheet->sheetPr->pageSetUpPr['fitToPage'] == false) {
-									$docSheet->getPageSetup()->setFitToPage(false);
-								} else {
-									$docSheet->getPageSetup()->setFitToPage(true);
-								}
-							}
-
-							if (isset($xmlSheet->sheetFormatPr)) {
-								if (isset($xmlSheet->sheetFormatPr['customHeight']) && ((string)$xmlSheet->sheetFormatPr['customHeight'] == '1' || strtolower((string)$xmlSheet->sheetFormatPr['customHeight']) == 'true') && isset($xmlSheet->sheetFormatPr['defaultRowHeight'])) {
-									$docSheet->getDefaultRowDimension()->setRowHeight( (float)$xmlSheet->sheetFormatPr['defaultRowHeight'] );
-								}
-								if (isset($xmlSheet->sheetFormatPr['defaultColWidth'])) {
-									$docSheet->getDefaultColumnDimension()->setWidth( (float)$xmlSheet->sheetFormatPr['defaultColWidth'] );
-								}
-								if (isset($xmlSheet->sheetFormatPr['zeroHeight']) &&
-									((string)$xmlSheet->sheetFormatPr['zeroHeight'] == '1')) {
-									$docSheet->getDefaultRowDimension()->setzeroHeight(true);
-								}
-							}
-
-							if (isset($xmlSheet->cols) && !$this->_readDataOnly) {
-								foreach ($xmlSheet->cols->col as $col) {
-									for ($i = intval($col["min"]) - 1; $i < intval($col["max"]); ++$i) {
-										if ($col["style"] && !$this->_readDataOnly) {
-											$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setXfIndex(intval($col["style"]));
-										}
-										if ($col["bestFit"]) {
-											//$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setAutoSize(true);
-										}
-										if ($col["hidden"]) {
-											$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setVisible(false);
-										}
-										if ($col["collapsed"]) {
-											$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setCollapsed(true);
-										}
-										if ($col["outlineLevel"] > 0) {
-											$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setOutlineLevel(intval($col["outlineLevel"]));
-										}
-										$docSheet->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($i))->setWidth(floatval($col["width"]));
-
-										if (intval($col["max"]) == 16384) {
-											break;
-										}
-									}
-								}
-							}
-
-							if (isset($xmlSheet->printOptions) && !$this->_readDataOnly) {
-								if ($xmlSheet->printOptions['gridLinesSet'] == 'true' && $xmlSheet->printOptions['gridLinesSet'] == '1') {
-									$docSheet->setShowGridlines(true);
-								}
-
-								if ($xmlSheet->printOptions['gridLines'] == 'true' || $xmlSheet->printOptions['gridLines'] == '1') {
-									$docSheet->setPrintGridlines(true);
-								}
-
-								if ($xmlSheet->printOptions['horizontalCentered']) {
-									$docSheet->getPageSetup()->setHorizontalCentered(true);
-								}
-								if ($xmlSheet->printOptions['verticalCentered']) {
-									$docSheet->getPageSetup()->setVerticalCentered(true);
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
-								foreach ($xmlSheet->sheetData->row as $row) {
-									if ($row["ht"] && !$this->_readDataOnly) {
-										$docSheet->getRowDimension(intval($row["r"]))->setRowHeight(floatval($row["ht"]));
-									}
-									if ($row["hidden"] && !$this->_readDataOnly) {
-										$docSheet->getRowDimension(intval($row["r"]))->setVisible(false);
-									}
-									if ($row["collapsed"]) {
-										$docSheet->getRowDimension(intval($row["r"]))->setCollapsed(true);
-									}
-									if ($row["outlineLevel"] > 0) {
-										$docSheet->getRowDimension(intval($row["r"]))->setOutlineLevel(intval($row["outlineLevel"]));
-									}
-									if ($row["s"] && !$this->_readDataOnly) {
-										$docSheet->getRowDimension(intval($row["r"]))->setXfIndex(intval($row["s"]));
-									}
-
-									foreach ($row->c as $c) {
-										$r 					= (string) $c["r"];
-										$cellDataType 		= (string) $c["t"];
-										$value				= null;
-										$calculatedValue 	= null;
-
-										// Read cell?
-										if ($this->getReadFilter() !== NULL) {
-											$coordinates = PHPExcel_Cell::coordinateFromString($r);
-
-											if (!$this->getReadFilter()->readCell($coordinates[0], $coordinates[1], $docSheet->getTitle())) {
-												continue;
-											}
-										}
-
-	//									echo '<b>Reading cell '.$coordinates[0].$coordinates[1].'</b><br />';
-	//									print_r($c);
-	//									echo '<br />';
-	//									echo 'Cell Data Type is '.$cellDataType.': ';
-	//
-										// Read cell!
-										switch ($cellDataType) {
-											case "s":
-	//											echo 'String<br />';
-												if ((string)$c->v != '') {
-													$value = $sharedStrings[intval($c->v)];
-
-													if ($value instanceof PHPExcel_RichText) {
-														$value = clone $value;
-													}
-												} else {
-													$value = '';
-												}
-
-												break;
-											case "b":
-	//											echo 'Boolean<br />';
-												if (!isset($c->f)) {
-													$value = self::_castToBool($c);
-												} else {
-													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToBool');
-													if (isset($c->f['t'])) {
-														$att = array();
-														$att = $c->f;
-														$docSheet->getCell($r)->setFormulaAttributes($att);
-													}
-	//												echo '$calculatedValue = '.$calculatedValue.'<br />';
-												}
-												break;
-											case "inlineStr":
-	//											echo 'Inline String<br />';
-												$value = $this->_parseRichText($c->is);
-
-												break;
-											case "e":
-	//											echo 'Error<br />';
-												if (!isset($c->f)) {
-													$value = self::_castToError($c);
-												} else {
-													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToError');
-	//												echo '$calculatedValue = '.$calculatedValue.'<br />';
-												}
-
-												break;
-
-											default:
-	//											echo 'Default<br />';
-												if (!isset($c->f)) {
-	//												echo 'Not a Formula<br />';
-													$value = self::_castToString($c);
-												} else {
-	//												echo 'Treat as Formula<br />';
-													// Formula
-													$this->_castToFormula($c,$r,$cellDataType,$value,$calculatedValue,$sharedFormulas,'_castToString');
-	//												echo '$calculatedValue = '.$calculatedValue.'<br />';
-												}
-
-												break;
-										}
-	//									echo 'Value is '.$value.'<br />';
-
-										// Check for numeric values
-										if (is_numeric($value) && $cellDataType != 's') {
-											if ($value == (int)$value) $value = (int)$value;
-											elseif ($value == (float)$value) $value = (float)$value;
-											elseif ($value == (double)$value) $value = (double)$value;
-										}
-
-										// Rich text?
-										if ($value instanceof PHPExcel_RichText && $this->_readDataOnly) {
-											$value = $value->getPlainText();
-										}
-
-										$cell = $docSheet->getCell($r);
-										// Assign value
-										if ($cellDataType != '') {
-											$cell->setValueExplicit($value, $cellDataType);
-										} else {
-											$cell->setValue($value);
-										}
-										if ($calculatedValue !== NULL) {
-											$cell->setCalculatedValue($calculatedValue);
-										}
-
-										// Style information?
-										if ($c["s"] && !$this->_readDataOnly) {
-											// no style index means 0, it seems
-											$cell->setXfIndex(isset($styles[intval($c["s"])]) ?
-												intval($c["s"]) : 0);
-										}
-									}
-								}
-							}
-
-							$conditionals = array();
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->conditionalFormatting) {
-								foreach ($xmlSheet->conditionalFormatting as $conditional) {
-									foreach ($conditional->cfRule as $cfRule) {
-										if (
-											(
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_NONE ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CELLIS ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT ||
-												(string)$cfRule["type"] == PHPExcel_Style_Conditional::CONDITION_EXPRESSION
-											) && isset($dxfs[intval($cfRule["dxfId"])])
-										) {
-											$conditionals[(string) $conditional["sqref"]][intval($cfRule["priority"])] = $cfRule;
-										}
-									}
-								}
-
-								foreach ($conditionals as $ref => $cfRules) {
-									ksort($cfRules);
-									$conditionalStyles = array();
-									foreach ($cfRules as $cfRule) {
-										$objConditional = new PHPExcel_Style_Conditional();
-										$objConditional->setConditionType((string)$cfRule["type"]);
-										$objConditional->setOperatorType((string)$cfRule["operator"]);
-
-										if ((string)$cfRule["text"] != '') {
-											$objConditional->setText((string)$cfRule["text"]);
-										}
-
-										if (count($cfRule->formula) > 1) {
-											foreach ($cfRule->formula as $formula) {
-												$objConditional->addCondition((string)$formula);
-											}
-										} else {
-											$objConditional->addCondition((string)$cfRule->formula);
-										}
-										$objConditional->setStyle(clone $dxfs[intval($cfRule["dxfId"])]);
-										$conditionalStyles[] = $objConditional;
-									}
-
-									// Extract all cell references in $ref
-									$aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($ref);
-									foreach ($aReferences as $reference) {
-										$docSheet->getStyle($reference)->setConditionalStyles($conditionalStyles);
-									}
-								}
-							}
-
-							$aKeys = array("sheet", "objects", "scenarios", "formatCells", "formatColumns", "formatRows", "insertColumns", "insertRows", "insertHyperlinks", "deleteColumns", "deleteRows", "selectLockedCells", "sort", "autoFilter", "pivotTables", "selectUnlockedCells");
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
-								foreach ($aKeys as $key) {
-									$method = "set" . ucfirst($key);
-									$docSheet->getProtection()->$method($xmlSheet->sheetProtection[$key] == "true");
-								}
-							}
-
-							if (!$this->_readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
-								$docSheet->getProtection()->setPassword((string) $xmlSheet->sheetProtection["password"], true);
-								if ($xmlSheet->protectedRanges->protectedRange) {
-									foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
-										$docSheet->protectCells((string) $protectedRange["sqref"], (string) $protectedRange["password"], true);
-									}
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->autoFilter && !$this->_readDataOnly) {
-								$autoFilter = $docSheet->getAutoFilter();
-								$autoFilter->setRange((string) $xmlSheet->autoFilter["ref"]);
-								foreach ($xmlSheet->autoFilter->filterColumn as $filterColumn) {
-									$column = $autoFilter->getColumnByOffset((integer) $filterColumn["colId"]);
-									//	Check for standard filters
-									if ($filterColumn->filters) {
-										$column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER);
-										$filters = $filterColumn->filters;
-										if ((isset($filters["blank"])) && ($filters["blank"] == 1)) {
-											$column->createRule()->setRule(
-												NULL,	//	Operator is undefined, but always treated as EQUAL
-												''
-											)
-											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER);
-										}
-										//	Standard filters are always an OR join, so no join rule needs to be set
-										//	Entries can be either filter elements
-										foreach ($filters->filter as $filterRule) {
-											$column->createRule()->setRule(
-												NULL,	//	Operator is undefined, but always treated as EQUAL
-												(string) $filterRule["val"]
-											)
-											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER);
-										}
-										//	Or Date Group elements
-										foreach ($filters->dateGroupItem as $dateGroupItem) {
-											$column->createRule()->setRule(
-												NULL,	//	Operator is undefined, but always treated as EQUAL
-												array(
-													'year' => (string) $dateGroupItem["year"],
-													'month' => (string) $dateGroupItem["month"],
-													'day' => (string) $dateGroupItem["day"],
-													'hour' => (string) $dateGroupItem["hour"],
-													'minute' => (string) $dateGroupItem["minute"],
-													'second' => (string) $dateGroupItem["second"],
-												),
-												(string) $dateGroupItem["dateTimeGrouping"]
-											)
-											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP);
-										}
-									}
-									//	Check for custom filters
-									if ($filterColumn->customFilters) {
-										$column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER);
-										$customFilters = $filterColumn->customFilters;
-										//	Custom filters can an AND or an OR join;
-										//		and there should only ever be one or two entries
-										if ((isset($customFilters["and"])) && ($customFilters["and"] == 1)) {
-											$column->setJoin(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND);
-										}
-										foreach ($customFilters->customFilter as $filterRule) {
-											$column->createRule()->setRule(
-												(string) $filterRule["operator"],
-												(string) $filterRule["val"]
-											)
-											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
-										}
-									}
-									//	Check for dynamic filters
-									if ($filterColumn->dynamicFilter) {
-										$column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER);
-										//	We should only ever have one dynamic filter
-										foreach ($filterColumn->dynamicFilter as $filterRule) {
-											$column->createRule()->setRule(
-												NULL,	//	Operator is undefined, but always treated as EQUAL
-												(string) $filterRule["val"],
-												(string) $filterRule["type"]
-											)
-											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
-											if (isset($filterRule["val"])) {
-												$column->setAttribute('val',(string) $filterRule["val"]);
-											}
-											if (isset($filterRule["maxVal"])) {
-												$column->setAttribute('maxVal',(string) $filterRule["maxVal"]);
-											}
-										}
-									}
-									//	Check for dynamic filters
-									if ($filterColumn->top10) {
-										$column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER);
-										//	We should only ever have one top10 filter
-										foreach ($filterColumn->top10 as $filterRule) {
-											$column->createRule()->setRule(
-												(((isset($filterRule["percent"])) && ($filterRule["percent"] == 1))
-													? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT
-													: PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE
-												),
-												(string) $filterRule["val"],
-												(((isset($filterRule["top"])) && ($filterRule["top"] == 1))
-													? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP
-													: PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM
-												)
-											)
-											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_TOPTENFILTER);
-										}
-									}
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->mergeCells && $xmlSheet->mergeCells->mergeCell && !$this->_readDataOnly) {
-								foreach ($xmlSheet->mergeCells->mergeCell as $mergeCell) {
-									$mergeRef = (string) $mergeCell["ref"];
-									if (strpos($mergeRef,':') !== FALSE) {
-										$docSheet->mergeCells((string) $mergeCell["ref"]);
-									}
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->pageMargins && !$this->_readDataOnly) {
-								$docPageMargins = $docSheet->getPageMargins();
-								$docPageMargins->setLeft(floatval($xmlSheet->pageMargins["left"]));
-								$docPageMargins->setRight(floatval($xmlSheet->pageMargins["right"]));
-								$docPageMargins->setTop(floatval($xmlSheet->pageMargins["top"]));
-								$docPageMargins->setBottom(floatval($xmlSheet->pageMargins["bottom"]));
-								$docPageMargins->setHeader(floatval($xmlSheet->pageMargins["header"]));
-								$docPageMargins->setFooter(floatval($xmlSheet->pageMargins["footer"]));
-							}
-
-							if ($xmlSheet && $xmlSheet->pageSetup && !$this->_readDataOnly) {
-								$docPageSetup = $docSheet->getPageSetup();
-
-								if (isset($xmlSheet->pageSetup["orientation"])) {
-									$docPageSetup->setOrientation((string) $xmlSheet->pageSetup["orientation"]);
-								}
-								if (isset($xmlSheet->pageSetup["paperSize"])) {
-									$docPageSetup->setPaperSize(intval($xmlSheet->pageSetup["paperSize"]));
-								}
-								if (isset($xmlSheet->pageSetup["scale"])) {
-									$docPageSetup->setScale(intval($xmlSheet->pageSetup["scale"]), false);
-								}
-								if (isset($xmlSheet->pageSetup["fitToHeight"]) && intval($xmlSheet->pageSetup["fitToHeight"]) >= 0) {
-									$docPageSetup->setFitToHeight(intval($xmlSheet->pageSetup["fitToHeight"]), false);
-								}
-								if (isset($xmlSheet->pageSetup["fitToWidth"]) && intval($xmlSheet->pageSetup["fitToWidth"]) >= 0) {
-									$docPageSetup->setFitToWidth(intval($xmlSheet->pageSetup["fitToWidth"]), false);
-								}
-								if (isset($xmlSheet->pageSetup["firstPageNumber"]) && isset($xmlSheet->pageSetup["useFirstPageNumber"]) &&
-									((string)$xmlSheet->pageSetup["useFirstPageNumber"] == 'true' || (string)$xmlSheet->pageSetup["useFirstPageNumber"] == '1')) {
-									$docPageSetup->setFirstPageNumber(intval($xmlSheet->pageSetup["firstPageNumber"]));
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->headerFooter && !$this->_readDataOnly) {
-								$docHeaderFooter = $docSheet->getHeaderFooter();
-
-								if (isset($xmlSheet->headerFooter["differentOddEven"]) &&
-									((string)$xmlSheet->headerFooter["differentOddEven"] == 'true' || (string)$xmlSheet->headerFooter["differentOddEven"] == '1')) {
-									$docHeaderFooter->setDifferentOddEven(true);
-								} else {
-									$docHeaderFooter->setDifferentOddEven(false);
-								}
-								if (isset($xmlSheet->headerFooter["differentFirst"]) &&
-									((string)$xmlSheet->headerFooter["differentFirst"] == 'true' || (string)$xmlSheet->headerFooter["differentFirst"] == '1')) {
-									$docHeaderFooter->setDifferentFirst(true);
-								} else {
-									$docHeaderFooter->setDifferentFirst(false);
-								}
-								if (isset($xmlSheet->headerFooter["scaleWithDoc"]) &&
-									((string)$xmlSheet->headerFooter["scaleWithDoc"] == 'false' || (string)$xmlSheet->headerFooter["scaleWithDoc"] == '0')) {
-									$docHeaderFooter->setScaleWithDocument(false);
-								} else {
-									$docHeaderFooter->setScaleWithDocument(true);
-								}
-								if (isset($xmlSheet->headerFooter["alignWithMargins"]) &&
-									((string)$xmlSheet->headerFooter["alignWithMargins"] == 'false' || (string)$xmlSheet->headerFooter["alignWithMargins"] == '0')) {
-									$docHeaderFooter->setAlignWithMargins(false);
-								} else {
-									$docHeaderFooter->setAlignWithMargins(true);
-								}
-
-								$docHeaderFooter->setOddHeader((string) $xmlSheet->headerFooter->oddHeader);
-								$docHeaderFooter->setOddFooter((string) $xmlSheet->headerFooter->oddFooter);
-								$docHeaderFooter->setEvenHeader((string) $xmlSheet->headerFooter->evenHeader);
-								$docHeaderFooter->setEvenFooter((string) $xmlSheet->headerFooter->evenFooter);
-								$docHeaderFooter->setFirstHeader((string) $xmlSheet->headerFooter->firstHeader);
-								$docHeaderFooter->setFirstFooter((string) $xmlSheet->headerFooter->firstFooter);
-							}
-
-							if ($xmlSheet && $xmlSheet->rowBreaks && $xmlSheet->rowBreaks->brk && !$this->_readDataOnly) {
-								foreach ($xmlSheet->rowBreaks->brk as $brk) {
-									if ($brk["man"]) {
-										$docSheet->setBreak("A$brk[id]", PHPExcel_Worksheet::BREAK_ROW);
-									}
-								}
-							}
-							if ($xmlSheet && $xmlSheet->colBreaks && $xmlSheet->colBreaks->brk && !$this->_readDataOnly) {
-								foreach ($xmlSheet->colBreaks->brk as $brk) {
-									if ($brk["man"]) {
-										$docSheet->setBreak(PHPExcel_Cell::stringFromColumnIndex((string) $brk["id"]) . "1", PHPExcel_Worksheet::BREAK_COLUMN);
-									}
-								}
-							}
-
-							if ($xmlSheet && $xmlSheet->dataValidations && !$this->_readDataOnly) {
-								foreach ($xmlSheet->dataValidations->dataValidation as $dataValidation) {
-								    // Uppercase coordinate
-							    	$range = strtoupper($dataValidation["sqref"]);
-									$rangeSet = explode(' ',$range);
-									foreach($rangeSet as $range) {
-										$stRange = $docSheet->shrinkRangeToFit($range);
-
-										// Extract all cell references in $range
-										$aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($stRange);
-										foreach ($aReferences as $reference) {
-											// Create validation
-											$docValidation = $docSheet->getCell($reference)->getDataValidation();
-											$docValidation->setType((string) $dataValidation["type"]);
-											$docValidation->setErrorStyle((string) $dataValidation["errorStyle"]);
-											$docValidation->setOperator((string) $dataValidation["operator"]);
-											$docValidation->setAllowBlank($dataValidation["allowBlank"] != 0);
-											$docValidation->setShowDropDown($dataValidation["showDropDown"] == 0);
-											$docValidation->setShowInputMessage($dataValidation["showInputMessage"] != 0);
-											$docValidation->setShowErrorMessage($dataValidation["showErrorMessage"] != 0);
-											$docValidation->setErrorTitle((string) $dataValidation["errorTitle"]);
-											$docValidation->setError((string) $dataValidation["error"]);
-											$docValidation->setPromptTitle((string) $dataValidation["promptTitle"]);
-											$docValidation->setPrompt((string) $dataValidation["prompt"]);
-											$docValidation->setFormula1((string) $dataValidation->formula1);
-											$docValidation->setFormula2((string) $dataValidation->formula2);
-										}
-									}
-								}
-							}
-
-							// Add hyperlinks
-							$hyperlinks = array();
-							if (!$this->_readDataOnly) {
-								// Locate hyperlink relations
-								if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-									foreach ($relsWorksheet->Relationship as $ele) {
-										if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink") {
-											$hyperlinks[(string)$ele["Id"]] = (string)$ele["Target"];
-										}
-									}
-								}
-
-								// Loop through hyperlinks
-								if ($xmlSheet && $xmlSheet->hyperlinks) {
-									foreach ($xmlSheet->hyperlinks->hyperlink as $hyperlink) {
-										// Link url
-										$linkRel = $hyperlink->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-
-										foreach (PHPExcel_Cell::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) {
-											$cell = $docSheet->getCell( $cellReference );
-											if (isset($linkRel['id'])) {
-												$cell->getHyperlink()->setUrl( $hyperlinks[ (string)$linkRel['id'] ] );
-											}
-											if (isset($hyperlink['location'])) {
-												$cell->getHyperlink()->setUrl( 'sheet://' . (string)$hyperlink['location'] );
-											}
-
-											// Tooltip
-											if (isset($hyperlink['tooltip'])) {
-												$cell->getHyperlink()->setTooltip( (string)$hyperlink['tooltip'] );
-											}
-										}
-									}
-								}
-							}
-
-							// Add comments
-							$comments = array();
-							$vmlComments = array();
-							if (!$this->_readDataOnly) {
-								// Locate comment relations
-								if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-									$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-									foreach ($relsWorksheet->Relationship as $ele) {
-									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments") {
-											$comments[(string)$ele["Id"]] = (string)$ele["Target"];
-										}
-									    if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
-											$vmlComments[(string)$ele["Id"]] = (string)$ele["Target"];
-										}
-									}
-								}
-
-								// Loop through comments
-								foreach ($comments as $relName => $relPath) {
-									// Load comments file
-									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
-									$commentsFile = simplexml_load_string($this->_getFromZipArchive($zip, $relPath) );
-
-									// Utility variables
-									$authors = array();
-
-									// Loop through authors
-									foreach ($commentsFile->authors->author as $author) {
-										$authors[] = (string)$author;
-									}
-
-									// Loop through contents
-									foreach ($commentsFile->commentList->comment as $comment) {
-										$docSheet->getComment( (string)$comment['ref'] )->setAuthor( $authors[(string)$comment['authorId']] );
-										$docSheet->getComment( (string)$comment['ref'] )->setText( $this->_parseRichText($comment->text) );
-									}
-								}
-
-								// Loop through VML comments
-							    foreach ($vmlComments as $relName => $relPath) {
-									// Load VML comments file
-									$relPath = PHPExcel_Shared_File::realpath(dirname("$dir/$fileWorksheet") . "/" . $relPath);
-									$vmlCommentsFile = simplexml_load_string( $this->_getFromZipArchive($zip, $relPath) );
-									$vmlCommentsFile->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
-
-									$shapes = $vmlCommentsFile->xpath('//v:shape');
-									foreach ($shapes as $shape) {
-										$shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
-
-										if (isset($shape['style'])) {
-	    									$style        = (string)$shape['style'];
-	    									$fillColor    = strtoupper( substr( (string)$shape['fillcolor'], 1 ) );
-	    									$column       = null;
-	    									$row          = null;
-
-	    									$clientData   = $shape->xpath('.//x:ClientData');
-	    									if (is_array($clientData) && !empty($clientData)) {
-	        									$clientData   = $clientData[0];
-
-	        									if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
-	        									    $temp = $clientData->xpath('.//x:Row');
-	        									    if (is_array($temp)) $row = $temp[0];
-
-	        									    $temp = $clientData->xpath('.//x:Column');
-	        									    if (is_array($temp)) $column = $temp[0];
-	        									}
-	    									}
-
-	    									if (($column !== NULL) && ($row !== NULL)) {
-	    									    // Set comment properties
-	    									    $comment = $docSheet->getCommentByColumnAndRow((string) $column, $row + 1);
-	    									    $comment->getFillColor()->setRGB( $fillColor );
-
-	    									    // Parse style
-	    									    $styleArray = explode(';', str_replace(' ', '', $style));
-	    									    foreach ($styleArray as $stylePair) {
-	    									        $stylePair = explode(':', $stylePair);
-
-	    									        if ($stylePair[0] == 'margin-left')     $comment->setMarginLeft($stylePair[1]);
-	    									        if ($stylePair[0] == 'margin-top')      $comment->setMarginTop($stylePair[1]);
-	    									        if ($stylePair[0] == 'width')           $comment->setWidth($stylePair[1]);
-	    									        if ($stylePair[0] == 'height')          $comment->setHeight($stylePair[1]);
-	    									        if ($stylePair[0] == 'visibility')      $comment->setVisible( $stylePair[1] == 'visible' );
-
-	    									    }
-	    									}
-										}
-									}
-								}
-
-								// Header/footer images
-								if ($xmlSheet && $xmlSheet->legacyDrawingHF && !$this->_readDataOnly) {
-									if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-										$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-										$vmlRelationship = '';
-
-										foreach ($relsWorksheet->Relationship as $ele) {
-											if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing") {
-												$vmlRelationship = self::dir_add("$dir/$fileWorksheet", $ele["Target"]);
-											}
-										}
-
-										if ($vmlRelationship != '') {
-											// Fetch linked images
-											$relsVML = simplexml_load_string($this->_getFromZipArchive($zip,  dirname($vmlRelationship) . '/_rels/' . basename($vmlRelationship) . '.rels' )); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-											$drawings = array();
-											foreach ($relsVML->Relationship as $ele) {
-												if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image") {
-													$drawings[(string) $ele["Id"]] = self::dir_add($vmlRelationship, $ele["Target"]);
-												}
-											}
-
-											// Fetch VML document
-											$vmlDrawing = simplexml_load_string($this->_getFromZipArchive($zip, $vmlRelationship));
-											$vmlDrawing->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
-
-											$hfImages = array();
-
-											$shapes = $vmlDrawing->xpath('//v:shape');
-											foreach ($shapes as $shape) {
-												$shape->registerXPathNamespace('v', 'urn:schemas-microsoft-com:vml');
-												$imageData = $shape->xpath('//v:imagedata');
-												$imageData = $imageData[0];
-
-												$imageData = $imageData->attributes('urn:schemas-microsoft-com:office:office');
-												$style = self::toCSSArray( (string)$shape['style'] );
-
-												$hfImages[ (string)$shape['id'] ] = new PHPExcel_Worksheet_HeaderFooterDrawing();
-												if (isset($imageData['title'])) {
-													$hfImages[ (string)$shape['id'] ]->setName( (string)$imageData['title'] );
-												}
-
-												$hfImages[ (string)$shape['id'] ]->setPath("zip://$pFilename#" . $drawings[(string)$imageData['relid']], false);
-												$hfImages[ (string)$shape['id'] ]->setResizeProportional(false);
-												$hfImages[ (string)$shape['id'] ]->setWidth($style['width']);
-												$hfImages[ (string)$shape['id'] ]->setHeight($style['height']);
-												$hfImages[ (string)$shape['id'] ]->setOffsetX($style['margin-left']);
-												$hfImages[ (string)$shape['id'] ]->setOffsetY($style['margin-top']);
-												$hfImages[ (string)$shape['id'] ]->setResizeProportional(true);
-											}
-
-											$docSheet->getHeaderFooter()->setImages($hfImages);
-										}
-									}
-								}
-
-							}
-
-// TODO: Autoshapes from twoCellAnchors!
-							if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
-								$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-								$drawings = array();
-								foreach ($relsWorksheet->Relationship as $ele) {
-									if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing") {
-										$drawings[(string) $ele["Id"]] = self::dir_add("$dir/$fileWorksheet", $ele["Target"]);
-									}
-								}
-								if ($xmlSheet->drawing && !$this->_readDataOnly) {
-									foreach ($xmlSheet->drawing as $drawing) {
-										$fileDrawing = $drawings[(string) self::array_item($drawing->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
-										$relsDrawing = simplexml_load_string($this->_getFromZipArchive($zip,  dirname($fileDrawing) . "/_rels/" . basename($fileDrawing) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
-										$images = array();
-
-										if ($relsDrawing && $relsDrawing->Relationship) {
-											foreach ($relsDrawing->Relationship as $ele) {
-												if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image") {
-													$images[(string) $ele["Id"]] = self::dir_add($fileDrawing, $ele["Target"]);
-												} elseif ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart") {
-													if ($this->_includeCharts) {
-														$charts[self::dir_add($fileDrawing, $ele["Target"])] = array('id'		=> (string) $ele["Id"],
-																													 'sheet'	=> $docSheet->getTitle()
-																													);
-													}
-												}
-											}
-										}
-										$xmlDrawing = simplexml_load_string($this->_getFromZipArchive($zip, $fileDrawing))->children("http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing");
-
-										if ($xmlDrawing->oneCellAnchor) {
-											foreach ($xmlDrawing->oneCellAnchor as $oneCellAnchor) {
-												if ($oneCellAnchor->pic->blipFill) {
-													$blip = $oneCellAnchor->pic->blipFill->children("http://schemas.openxmlformats.org/drawingml/2006/main")->blip;
-													$xfrm = $oneCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->xfrm;
-													$outerShdw = $oneCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->effectLst->outerShdw;
-													$objDrawing = new PHPExcel_Worksheet_Drawing;
-													$objDrawing->setName((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
-													$objDrawing->setDescription((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
-													$objDrawing->setPath("zip://$pFilename#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
-													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1));
-													$objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff));
-													$objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
-													$objDrawing->setResizeProportional(false);
-													$objDrawing->setWidth(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cx")));
-													$objDrawing->setHeight(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cy")));
-													if ($xfrm) {
-														$objDrawing->setRotation(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($xfrm->attributes(), "rot")));
-													}
-													if ($outerShdw) {
-														$shadow = $objDrawing->getShadow();
-														$shadow->setVisible(true);
-														$shadow->setBlurRadius(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "blurRad")));
-														$shadow->setDistance(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "dist")));
-														$shadow->setDirection(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($outerShdw->attributes(), "dir")));
-														$shadow->setAlignment((string) self::array_item($outerShdw->attributes(), "algn"));
-														$shadow->getColor()->setRGB(self::array_item($outerShdw->srgbClr->attributes(), "val"));
-														$shadow->setAlpha(self::array_item($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
-													}
-													$objDrawing->setWorksheet($docSheet);
-												} else {
-													//	? Can charts be positioned with a oneCellAnchor ?
-													$coordinates	= PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1);
-													$offsetX		= PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff);
-													$offsetY		= PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff);
-													$width			= PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cx"));
-													$height			= PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cy"));
-												}
-											}
-										}
-										if ($xmlDrawing->twoCellAnchor) {
-											foreach ($xmlDrawing->twoCellAnchor as $twoCellAnchor) {
-												if ($twoCellAnchor->pic->blipFill) {
-													$blip = $twoCellAnchor->pic->blipFill->children("http://schemas.openxmlformats.org/drawingml/2006/main")->blip;
-													$xfrm = $twoCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->xfrm;
-													$outerShdw = $twoCellAnchor->pic->spPr->children("http://schemas.openxmlformats.org/drawingml/2006/main")->effectLst->outerShdw;
-													$objDrawing = new PHPExcel_Worksheet_Drawing;
-													$objDrawing->setName((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
-													$objDrawing->setDescription((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
-													$objDrawing->setPath("zip://$pFilename#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
-													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1));
-													$objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff));
-													$objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff));
-													$objDrawing->setResizeProportional(false);
-
-													$objDrawing->setWidth(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($xfrm->ext->attributes(), "cx")));
-													$objDrawing->setHeight(PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($xfrm->ext->attributes(), "cy")));
-
-													if ($xfrm) {
-														$objDrawing->setRotation(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($xfrm->attributes(), "rot")));
-													}
-													if ($outerShdw) {
-														$shadow = $objDrawing->getShadow();
-														$shadow->setVisible(true);
-														$shadow->setBlurRadius(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "blurRad")));
-														$shadow->setDistance(PHPExcel_Shared_Drawing::EMUTopixels(self::array_item($outerShdw->attributes(), "dist")));
-														$shadow->setDirection(PHPExcel_Shared_Drawing::angleToDegrees(self::array_item($outerShdw->attributes(), "dir")));
-														$shadow->setAlignment((string) self::array_item($outerShdw->attributes(), "algn"));
-														$shadow->getColor()->setRGB(self::array_item($outerShdw->srgbClr->attributes(), "val"));
-														$shadow->setAlpha(self::array_item($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
-													}
-													$objDrawing->setWorksheet($docSheet);
-												} elseif(($this->_includeCharts) && ($twoCellAnchor->graphicFrame)) {
-													$fromCoordinate	= PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1);
-													$fromOffsetX	= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff);
-													$fromOffsetY	= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff);
-													$toCoordinate	= PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->to->col) . ($twoCellAnchor->to->row + 1);
-													$toOffsetX		= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->colOff);
-													$toOffsetY		= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->rowOff);
-													$graphic		= $twoCellAnchor->graphicFrame->children("http://schemas.openxmlformats.org/drawingml/2006/main")->graphic;
-													$chartRef		= $graphic->graphicData->children("http://schemas.openxmlformats.org/drawingml/2006/chart")->chart;
-													$thisChart		= (string) $chartRef->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-
-													$chartDetails[$docSheet->getTitle().'!'.$thisChart] =
-															array(	'fromCoordinate'	=> $fromCoordinate,
-																	'fromOffsetX'		=> $fromOffsetX,
-																	'fromOffsetY'		=> $fromOffsetY,
-																	'toCoordinate'		=> $toCoordinate,
-																	'toOffsetX'			=> $toOffsetX,
-																	'toOffsetY'			=> $toOffsetY,
-																	'worksheetTitle'	=> $docSheet->getTitle()
-																 );
-												}
-											}
-										}
-
-									}
-								}
-							}
-
-							// Loop through definedNames
-							if ($xmlWorkbook->definedNames) {
-								foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
-									// Extract range
-									$extractedRange = (string)$definedName;
-									$extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
-									if (($spos = strpos($extractedRange,'!')) !== false) {
-										$extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
-									} else {
-										$extractedRange = str_replace('$', '', $extractedRange);
-									}
-
-									// Valid range?
-									if (stripos((string)$definedName, '#REF!') !== FALSE || $extractedRange == '') {
-										continue;
-									}
-
-									// Some definedNames are only applicable if we are on the same sheet...
-									if ((string)$definedName['localSheetId'] != '' && (string)$definedName['localSheetId'] == $sheetId) {
-										// Switch on type
-										switch ((string)$definedName['name']) {
-
-											case '_xlnm._FilterDatabase':
-												if ((string)$definedName['hidden'] !== '1') {
-													$docSheet->getAutoFilter()->setRange($extractedRange);
-												}
-												break;
-
-											case '_xlnm.Print_Titles':
-												// Split $extractedRange
-												$extractedRange = explode(',', $extractedRange);
-
-												// Set print titles
-												foreach ($extractedRange as $range) {
-													$matches = array();
-
-													// check for repeating columns, e g. 'A:A' or 'A:D'
-													if (preg_match('/^([A-Z]+)\:([A-Z]+)$/', $range, $matches)) {
-														$docSheet->getPageSetup()->setColumnsToRepeatAtLeft(array($matches[1], $matches[2]));
-													}
-													// check for repeating rows, e.g. '1:1' or '1:5'
-													elseif (preg_match('/^(\d+)\:(\d+)$/', $range, $matches)) {
-														$docSheet->getPageSetup()->setRowsToRepeatAtTop(array($matches[1], $matches[2]));
-													}
-												}
-												break;
-
-											case '_xlnm.Print_Area':
-												$rangeSets = explode(',', $extractedRange);		// FIXME: what if sheetname contains comma?
-												$newRangeSets = array();
-												foreach($rangeSets as $rangeSet) {
-													$range = explode('!', $rangeSet);	// FIXME: what if sheetname contains exclamation mark?
-													$rangeSet = isset($range[1]) ? $range[1] : $range[0];
-													$newRangeSets[] = str_replace('$', '', $rangeSet);
-												}
-												$docSheet->getPageSetup()->setPrintArea(implode(',',$newRangeSets));
-												break;
-
-											default:
-												break;
-										}
-									}
-								}
-							}
-
-							// Next sheet id
-							++$sheetId;
-						}
-
-						// Loop through definedNames
-						if ($xmlWorkbook->definedNames) {
-							foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
-								// Extract range
-								$extractedRange = (string)$definedName;
-								$extractedRange = preg_replace('/\'(\w+)\'\!/', '', $extractedRange);
-								if (($spos = strpos($extractedRange,'!')) !== false) {
-									$extractedRange = substr($extractedRange,0,$spos).str_replace('$', '', substr($extractedRange,$spos));
-								} else {
-									$extractedRange = str_replace('$', '', $extractedRange);
-								}
-
-								// Valid range?
-								if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
-									continue;
-								}
-
-								// Some definedNames are only applicable if we are on the same sheet...
-								if ((string)$definedName['localSheetId'] != '') {
-									// Local defined name
-									// Switch on type
-									switch ((string)$definedName['name']) {
-
-										case '_xlnm._FilterDatabase':
-										case '_xlnm.Print_Titles':
-										case '_xlnm.Print_Area':
-											break;
-
-										default:
-											$range = explode('!', (string)$definedName);
-											if (count($range) == 2) {
-												$range[0] = str_replace("''", "'", $range[0]);
-												$range[0] = str_replace("'", "", $range[0]);
-												if ($worksheet = $docSheet->getParent()->getSheetByName($range[0])) {
-													$extractedRange = str_replace('$', '', $range[1]);
-													$scope = $docSheet->getParent()->getSheet((string)$definedName['localSheetId']);
-
-													$excel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $worksheet, $extractedRange, true, $scope) );
-												}
-											}
-											break;
-									}
-								} else if (!isset($definedName['localSheetId'])) {
-									// "Global" definedNames
-									$locatedSheet = null;
-									$extractedSheetName = '';
-									if (strpos( (string)$definedName, '!' ) !== false) {
-										// Extract sheet name
-										$extractedSheetName = PHPExcel_Worksheet::extractSheetTitle( (string)$definedName, true );
-										$extractedSheetName = $extractedSheetName[0];
-
-										// Locate sheet
-										$locatedSheet = $excel->getSheetByName($extractedSheetName);
-
-										// Modify range
-										$range = explode('!', $extractedRange);
-										$extractedRange = isset($range[1]) ? $range[1] : $range[0];
-									}
-
-									if ($locatedSheet !== NULL) {
-										$excel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $locatedSheet, $extractedRange, false) );
-									}
-								}
-							}
-						}
-					}
-
-					if (!$this->_readDataOnly) {
-						// active sheet index
-						$activeTab = intval($xmlWorkbook->bookViews->workbookView["activeTab"]); // refers to old sheet index
-
-						// keep active sheet index if sheet is still loaded, else first sheet is set as the active
-						if (isset($mapSheetId[$activeTab]) && $mapSheetId[$activeTab] !== null) {
-							$excel->setActiveSheetIndex($mapSheetId[$activeTab]);
-						} else {
-							if ($excel->getSheetCount() == 0) {
-								$excel->createSheet();
-							}
-							$excel->setActiveSheetIndex(0);
-						}
-					}
-				break;
-			}
-
-		}
-
-
-		if (!$this->_readDataOnly) {
-			$contentTypes = simplexml_load_string($this->_getFromZipArchive($zip, "[Content_Types].xml"));
-			foreach ($contentTypes->Override as $contentType) {
-				switch ($contentType["ContentType"]) {
-					case "application/vnd.openxmlformats-officedocument.drawingml.chart+xml":
-						if ($this->_includeCharts) {
-							$chartEntryRef = ltrim($contentType['PartName'],'/');
-							$chartElements = simplexml_load_string($this->_getFromZipArchive($zip, $chartEntryRef));
-							$objChart = PHPExcel_Reader_Excel2007_Chart::readChart($chartElements,basename($chartEntryRef,'.xml'));
-
-//							echo 'Chart ',$chartEntryRef,'<br />';
-//							var_dump($charts[$chartEntryRef]);
-//
-							if (isset($charts[$chartEntryRef])) {
-								$chartPositionRef = $charts[$chartEntryRef]['sheet'].'!'.$charts[$chartEntryRef]['id'];
-//								echo 'Position Ref ',$chartPositionRef,'<br />';
-								if (isset($chartDetails[$chartPositionRef])) {
-//									var_dump($chartDetails[$chartPositionRef]);
-
-									$excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
-									$objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
-									$objChart->setTopLeftPosition( $chartDetails[$chartPositionRef]['fromCoordinate'],
-																   $chartDetails[$chartPositionRef]['fromOffsetX'],
-																   $chartDetails[$chartPositionRef]['fromOffsetY']
-																 );
-									$objChart->setBottomRightPosition( $chartDetails[$chartPositionRef]['toCoordinate'],
-																	   $chartDetails[$chartPositionRef]['toOffsetX'],
-																	   $chartDetails[$chartPositionRef]['toOffsetY']
-																	 );
-								}
-							}
-						}
-				}
-			}
-		}
-
-		$zip->close();
-
-		return $excel;
-	}
-
-
-	private static function _readColor($color, $background=FALSE) {
-		if (isset($color["rgb"])) {
-			return (string)$color["rgb"];
-		} else if (isset($color["indexed"])) {
-			return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
-		} else if (isset($color["theme"])) {
-			if (self::$_theme !== NULL) {
-				$returnColour = self::$_theme->getColourByIndex((int)$color["theme"]);
-				if (isset($color["tint"])) {
-					$tintAdjust = (float) $color["tint"];
-					$returnColour = PHPExcel_Style_Color::changeBrightness($returnColour, $tintAdjust);
-				}
-				return 'FF'.$returnColour;
-			}
-		}
-
-		if ($background) {
-			return 'FFFFFFFF';
-		}
-		return 'FF000000';
-	}
-
-
-	private static function _readStyle($docStyle, $style) {
-		// format code
-//		if (isset($style->numFmt)) {
-//			if (isset($style->numFmt['formatCode'])) {
-//				$docStyle->getNumberFormat()->setFormatCode((string) $style->numFmt['formatCode']);
-//			} else {
-				$docStyle->getNumberFormat()->setFormatCode($style->numFmt);
-//			}
-//		}
-
-		// font
-		if (isset($style->font)) {
-			$docStyle->getFont()->setName((string) $style->font->name["val"]);
-			$docStyle->getFont()->setSize((string) $style->font->sz["val"]);
-			if (isset($style->font->b)) {
-				$docStyle->getFont()->setBold(!isset($style->font->b["val"]) || $style->font->b["val"] == 'true' || $style->font->b["val"] == '1');
-			}
-			if (isset($style->font->i)) {
-				$docStyle->getFont()->setItalic(!isset($style->font->i["val"]) || $style->font->i["val"] == 'true' || $style->font->i["val"] == '1');
-			}
-			if (isset($style->font->strike)) {
-				$docStyle->getFont()->setStrikethrough(!isset($style->font->strike["val"]) || $style->font->strike["val"] == 'true' || $style->font->strike["val"] == '1');
-			}
-			$docStyle->getFont()->getColor()->setARGB(self::_readColor($style->font->color));
-
-			if (isset($style->font->u) && !isset($style->font->u["val"])) {
-				$docStyle->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-			} else if (isset($style->font->u) && isset($style->font->u["val"])) {
-				$docStyle->getFont()->setUnderline((string)$style->font->u["val"]);
-			}
-
-			if (isset($style->font->vertAlign) && isset($style->font->vertAlign["val"])) {
-				$vertAlign = strtolower((string)$style->font->vertAlign["val"]);
-				if ($vertAlign == 'superscript') {
-					$docStyle->getFont()->setSuperScript(true);
-				}
-				if ($vertAlign == 'subscript') {
-					$docStyle->getFont()->setSubScript(true);
-				}
-			}
-		}
-
-		// fill
-		if (isset($style->fill)) {
-			if ($style->fill->gradientFill) {
-				$gradientFill = $style->fill->gradientFill[0];
-				if(!empty($gradientFill["type"])) {
-					$docStyle->getFill()->setFillType((string) $gradientFill["type"]);
-				}
-				$docStyle->getFill()->setRotation(floatval($gradientFill["degree"]));
-				$gradientFill->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
-				$docStyle->getFill()->getStartColor()->setARGB(self::_readColor( self::array_item($gradientFill->xpath("sml:stop[@position=0]"))->color) );
-				$docStyle->getFill()->getEndColor()->setARGB(self::_readColor( self::array_item($gradientFill->xpath("sml:stop[@position=1]"))->color) );
-			} elseif ($style->fill->patternFill) {
-				$patternType = (string)$style->fill->patternFill["patternType"] != '' ? (string)$style->fill->patternFill["patternType"] : 'solid';
-				$docStyle->getFill()->setFillType($patternType);
-				if ($style->fill->patternFill->fgColor) {
-					$docStyle->getFill()->getStartColor()->setARGB(self::_readColor($style->fill->patternFill->fgColor,true));
-				} else {
-					$docStyle->getFill()->getStartColor()->setARGB('FF000000');
-				}
-				if ($style->fill->patternFill->bgColor) {
-					$docStyle->getFill()->getEndColor()->setARGB(self::_readColor($style->fill->patternFill->bgColor,true));
-				}
-			}
-		}
-
-		// border
-		if (isset($style->border)) {
-			$diagonalUp   = false;
-			$diagonalDown = false;
-			if ($style->border["diagonalUp"] == 'true' || $style->border["diagonalUp"] == 1) {
-				$diagonalUp = true;
-			}
-			if ($style->border["diagonalDown"] == 'true' || $style->border["diagonalDown"] == 1) {
-				$diagonalDown = true;
-			}
-			if ($diagonalUp == false && $diagonalDown == false) {
-				$docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_NONE);
-			} elseif ($diagonalUp == true && $diagonalDown == false) {
-				$docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_UP);
-			} elseif ($diagonalUp == false && $diagonalDown == true) {
-				$docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_DOWN);
-			} elseif ($diagonalUp == true && $diagonalDown == true) {
-				$docStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_BOTH);
-			}
-			self::_readBorder($docStyle->getBorders()->getLeft(), $style->border->left);
-			self::_readBorder($docStyle->getBorders()->getRight(), $style->border->right);
-			self::_readBorder($docStyle->getBorders()->getTop(), $style->border->top);
-			self::_readBorder($docStyle->getBorders()->getBottom(), $style->border->bottom);
-			self::_readBorder($docStyle->getBorders()->getDiagonal(), $style->border->diagonal);
-		}
-
-		// alignment
-		if (isset($style->alignment)) {
-			$docStyle->getAlignment()->setHorizontal((string) $style->alignment["horizontal"]);
-			$docStyle->getAlignment()->setVertical((string) $style->alignment["vertical"]);
-
-			$textRotation = 0;
-			if ((int)$style->alignment["textRotation"] <= 90) {
-				$textRotation = (int)$style->alignment["textRotation"];
-			} else if ((int)$style->alignment["textRotation"] > 90) {
-				$textRotation = 90 - (int)$style->alignment["textRotation"];
-			}
-
-			$docStyle->getAlignment()->setTextRotation(intval($textRotation));
-			$docStyle->getAlignment()->setWrapText( (string)$style->alignment["wrapText"] == "true" || (string)$style->alignment["wrapText"] == "1" );
-			$docStyle->getAlignment()->setShrinkToFit( (string)$style->alignment["shrinkToFit"] == "true" || (string)$style->alignment["shrinkToFit"] == "1" );
-			$docStyle->getAlignment()->setIndent( intval((string)$style->alignment["indent"]) > 0 ? intval((string)$style->alignment["indent"]) : 0 );
-		}
-
-		// protection
-		if (isset($style->protection)) {
-			if (isset($style->protection['locked'])) {
-				if ((string)$style->protection['locked'] == 'true') {
-					$docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
-				} else {
-					$docStyle->getProtection()->setLocked(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
-				}
-			}
-
-			if (isset($style->protection['hidden'])) {
-				if ((string)$style->protection['hidden'] == 'true') {
-					$docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_PROTECTED);
-				} else {
-					$docStyle->getProtection()->setHidden(PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
-				}
-			}
-		}
-	}
-
-
-	private static function _readBorder($docBorder, $eleBorder) {
-		if (isset($eleBorder["style"])) {
-			$docBorder->setBorderStyle((string) $eleBorder["style"]);
-		}
-		if (isset($eleBorder->color)) {
-			$docBorder->getColor()->setARGB(self::_readColor($eleBorder->color));
-		}
-	}
-
-
-	private function _parseRichText($is = null) {
-		$value = new PHPExcel_RichText();
-
-		if (isset($is->t)) {
-			$value->createText( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $is->t ) );
-		} else {
-			foreach ($is->r as $run) {
-				if (!isset($run->rPr)) {
-					$objText = $value->createText( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $run->t ) );
-
-				} else {
-					$objText = $value->createTextRun( PHPExcel_Shared_String::ControlCharacterOOXML2PHP( (string) $run->t ) );
-
-					if (isset($run->rPr->rFont["val"])) {
-						$objText->getFont()->setName((string) $run->rPr->rFont["val"]);
-					}
-
-					if (isset($run->rPr->sz["val"])) {
-						$objText->getFont()->setSize((string) $run->rPr->sz["val"]);
-					}
-
-					if (isset($run->rPr->color)) {
-						$objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($run->rPr->color) ) );
-					}
-
-					if ( (isset($run->rPr->b["val"]) && ((string) $run->rPr->b["val"] == 'true' || (string) $run->rPr->b["val"] == '1'))
-					     || (isset($run->rPr->b) && !isset($run->rPr->b["val"])) ) {
-						$objText->getFont()->setBold(true);
-					}
-
-					if ( (isset($run->rPr->i["val"]) && ((string) $run->rPr->i["val"] == 'true' || (string) $run->rPr->i["val"] == '1'))
-					     || (isset($run->rPr->i) && !isset($run->rPr->i["val"])) ) {
-						$objText->getFont()->setItalic(true);
-					}
-
-					if (isset($run->rPr->vertAlign) && isset($run->rPr->vertAlign["val"])) {
-						$vertAlign = strtolower((string)$run->rPr->vertAlign["val"]);
-						if ($vertAlign == 'superscript') {
-							$objText->getFont()->setSuperScript(true);
-						}
-						if ($vertAlign == 'subscript') {
-							$objText->getFont()->setSubScript(true);
-						}
-					}
-
-					if (isset($run->rPr->u) && !isset($run->rPr->u["val"])) {
-						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-					} else if (isset($run->rPr->u) && isset($run->rPr->u["val"])) {
-						$objText->getFont()->setUnderline((string)$run->rPr->u["val"]);
-					}
-
-					if ( (isset($run->rPr->strike["val"])  && ((string) $run->rPr->strike["val"] == 'true' || (string) $run->rPr->strike["val"] == '1'))
-					     || (isset($run->rPr->strike) && !isset($run->rPr->strike["val"])) ) {
-						$objText->getFont()->setStrikethrough(true);
-					}
-				}
-			}
-		}
-
-		return $value;
-	}
-
-
-	private static function array_item($array, $key = 0) {
-		return (isset($array[$key]) ? $array[$key] : null);
-	}
-
-
-	private static function dir_add($base, $add) {
-		return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
-	}
-
-
-	private static function toCSSArray($style) {
-		$style = str_replace(array("\r","\n"), "", $style);
-
-		$temp = explode(';', $style);
-		$style = array();
-		foreach ($temp as $item) {
-			$item = explode(':', $item);
-
-			if (strpos($item[1], 'px') !== false) {
-				$item[1] = str_replace('px', '', $item[1]);
-			}
-			if (strpos($item[1], 'pt') !== false) {
-				$item[1] = str_replace('pt', '', $item[1]);
-				$item[1] = PHPExcel_Shared_Font::fontSizeToPixels($item[1]);
-			}
-			if (strpos($item[1], 'in') !== false) {
-				$item[1] = str_replace('in', '', $item[1]);
-				$item[1] = PHPExcel_Shared_Font::inchSizeToPixels($item[1]);
-			}
-			if (strpos($item[1], 'cm') !== false) {
-				$item[1] = str_replace('cm', '', $item[1]);
-				$item[1] = PHPExcel_Shared_Font::centimeterSizeToPixels($item[1]);
-			}
-
-			$style[$item[0]] = $item[1];
-		}
-
-		return $style;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2007/Chart.php b/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2007/Chart.php
deleted file mode 100755
index 1f305db40..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2007/Chart.php
+++ /dev/null
@@ -1,513 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader_Excel5
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Reader_Excel2007_Chart
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader_Excel2007
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel2007_Chart
-{
-	private static function _getAttribute($component, $name, $format) {
-		$attributes = $component->attributes();
-		if (isset($attributes[$name])) {
-			if ($format == 'string') {
-				return (string) $attributes[$name];
-			} elseif ($format == 'integer') {
-				return (integer) $attributes[$name];
-			} elseif ($format == 'boolean') {
-				return (boolean) ($attributes[$name] == '0') ? false : true;
-			} else {
-				return (float) $attributes[$name];
-			}
-		}
-		return null;
-	}	//	function _getAttribute()
-
-
-	private static function _readColor($color,$background=false) {
-		if (isset($color["rgb"])) {
-			return (string)$color["rgb"];
-		} else if (isset($color["indexed"])) {
-			return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
-		}
-	}
-
-
-	public static function readChart($chartElements,$chartName) {
-		$namespacesChartMeta = $chartElements->getNamespaces(true);
-		$chartElementsC = $chartElements->children($namespacesChartMeta['c']);
-
-		$XaxisLabel = $YaxisLabel = $legend = $title = NULL;
-		$dispBlanksAs = $plotVisOnly = NULL;
-
-		foreach($chartElementsC as $chartElementKey => $chartElement) {
-			switch ($chartElementKey) {
-				case "chart":
-					foreach($chartElement as $chartDetailsKey => $chartDetails) {
-						$chartDetailsC = $chartDetails->children($namespacesChartMeta['c']);
-						switch ($chartDetailsKey) {
-							case "plotArea":
-									$plotAreaLayout = $XaxisLable = $YaxisLable = null;
-									$plotSeries = $plotAttributes = array();
-									foreach($chartDetails as $chartDetailKey => $chartDetail) {
-										switch ($chartDetailKey) {
-											case "layout":
-												$plotAreaLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'plotArea');
-												break;
-											case "catAx":
-												if (isset($chartDetail->title)) {
-													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
-												}
-												break;
-											case "dateAx":
-												if (isset($chartDetail->title)) {
-													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
-												}
-												break;
-											case "valAx":
-												if (isset($chartDetail->title)) {
-													$YaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
-												}
-												break;
-											case "barChart":
-											case "bar3DChart":
-												$barDirection = self::_getAttribute($chartDetail->barDir, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotDirection($barDirection);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "lineChart":
-											case "line3DChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "areaChart":
-											case "area3DChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "doughnutChart":
-											case "pieChart":
-											case "pie3DChart":
-												$explosion = isset($chartDetail->ser->explosion);
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($explosion);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "scatterChart":
-												$scatterStyle = self::_getAttribute($chartDetail->scatterStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($scatterStyle);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "bubbleChart":
-												$bubbleScale = self::_getAttribute($chartDetail->bubbleScale, 'val', 'integer');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($bubbleScale);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "radarChart":
-												$radarStyle = self::_getAttribute($chartDetail->radarStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($radarStyle);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "surfaceChart":
-											case "surface3DChart":
-												$wireFrame = self::_getAttribute($chartDetail->wireframe, 'val', 'boolean');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($wireFrame);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "stockChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotAttributes = self::_readChartAttributes($plotAreaLayout);
-												break;
-										}
-									}
-									if ($plotAreaLayout == NULL) {
-										$plotAreaLayout = new PHPExcel_Chart_Layout();
-									}
-									$plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout,$plotSeries);
-									self::_setChartAttributes($plotAreaLayout,$plotAttributes);
-									break;
-							case "plotVisOnly":
-									$plotVisOnly = self::_getAttribute($chartDetails, 'val', 'string');
-									break;
-							case "dispBlanksAs":
-									$dispBlanksAs = self::_getAttribute($chartDetails, 'val', 'string');
-									break;
-							case "title":
-									$title = self::_chartTitle($chartDetails,$namespacesChartMeta,'title');
-									break;
-							case "legend":
-									$legendPos = 'r';
-									$legendLayout = null;
-									$legendOverlay = false;
-									foreach($chartDetails as $chartDetailKey => $chartDetail) {
-										switch ($chartDetailKey) {
-											case "legendPos":
-												$legendPos = self::_getAttribute($chartDetail, 'val', 'string');
-												break;
-											case "overlay":
-												$legendOverlay = self::_getAttribute($chartDetail, 'val', 'boolean');
-												break;
-											case "layout":
-												$legendLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'legend');
-												break;
-										}
-									}
-									$legend = new PHPExcel_Chart_Legend($legendPos, $legendLayout, $legendOverlay);
-									break;
-						}
-					}
-			}
-		}
-		$chart = new PHPExcel_Chart($chartName,$title,$legend,$plotArea,$plotVisOnly,$dispBlanksAs,$XaxisLabel,$YaxisLabel);
-
-		return $chart;
-	}	//	function readChart()
-
-
-	private static function _chartTitle($titleDetails,$namespacesChartMeta,$type) {
-		$caption = array();
-		$titleLayout = null;
-		foreach($titleDetails as $titleDetailKey => $chartDetail) {
-			switch ($titleDetailKey) {
-				case "tx":
-					$titleDetails = $chartDetail->rich->children($namespacesChartMeta['a']);
-					foreach($titleDetails as $titleKey => $titleDetail) {
-						switch ($titleKey) {
-							case "p":
-								$titleDetailPart = $titleDetail->children($namespacesChartMeta['a']);
-								$caption[] = self::_parseRichText($titleDetailPart);
-						}
-					}
-					break;
-				case "layout":
-					$titleLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta);
-					break;
-			}
-		}
-
-		return new PHPExcel_Chart_Title($caption, $titleLayout);
-	}	//	function _chartTitle()
-
-
-	private static function _chartLayoutDetails($chartDetail,$namespacesChartMeta) {
-		if (!isset($chartDetail->manualLayout)) {
-			return null;
-		}
-		$details = $chartDetail->manualLayout->children($namespacesChartMeta['c']);
-		if (is_null($details)) {
-			return null;
-		}
-		$layout = array();
-		foreach($details as $detailKey => $detail) {
-//			echo $detailKey,' => ',self::_getAttribute($detail, 'val', 'string'),PHP_EOL;
-			$layout[$detailKey] = self::_getAttribute($detail, 'val', 'string');
-		}
-		return new PHPExcel_Chart_Layout($layout);
-	}	//	function _chartLayoutDetails()
-
-
-	private static function _chartDataSeries($chartDetail,$namespacesChartMeta,$plotType) {
-		$multiSeriesType = NULL;
-		$smoothLine = false;
-		$seriesLabel = $seriesCategory = $seriesValues = $plotOrder = array();
-
-		$seriesDetailSet = $chartDetail->children($namespacesChartMeta['c']);
-		foreach($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
-			switch ($seriesDetailKey) {
-				case "grouping":
-					$multiSeriesType = self::_getAttribute($chartDetail->grouping, 'val', 'string');
-					break;
-				case "ser":
-					$marker = NULL;
-					foreach($seriesDetails as $seriesKey => $seriesDetail) {
-						switch ($seriesKey) {
-							case "idx":
-								$seriesIndex = self::_getAttribute($seriesDetail, 'val', 'integer');
-								break;
-							case "order":
-								$seriesOrder = self::_getAttribute($seriesDetail, 'val', 'integer');
-								$plotOrder[$seriesIndex] = $seriesOrder;
-								break;
-							case "tx":
-								$seriesLabel[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
-								break;
-							case "marker":
-								$marker = self::_getAttribute($seriesDetail->symbol, 'val', 'string');
-								break;
-							case "smooth":
-								$smoothLine = self::_getAttribute($seriesDetail, 'val', 'boolean');
-								break;
-							case "cat":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
-								break;
-							case "val":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
-								break;
-							case "xVal":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
-								break;
-							case "yVal":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
-								break;
-						}
-					}
-			}
-		}
-		return new PHPExcel_Chart_DataSeries($plotType,$multiSeriesType,$plotOrder,$seriesLabel,$seriesCategory,$seriesValues,$smoothLine);
-	}	//	function _chartDataSeries()
-
-
-	private static function _chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null, $smoothLine = false) {
-		if (isset($seriesDetail->strRef)) {
-			$seriesSource = (string) $seriesDetail->strRef->f;
-			$seriesData = self::_chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']),'s');
-
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
-		} elseif (isset($seriesDetail->numRef)) {
-			$seriesSource = (string) $seriesDetail->numRef->f;
-			$seriesData = self::_chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
-
-			return new PHPExcel_Chart_DataSeriesValues('Number',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
-		} elseif (isset($seriesDetail->multiLvlStrRef)) {
-			$seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
-			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']),'s');
-			$seriesData['pointCount'] = count($seriesData['dataValues']);
-
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
-		} elseif (isset($seriesDetail->multiLvlNumRef)) {
-			$seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
-			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']),'s');
-			$seriesData['pointCount'] = count($seriesData['dataValues']);
-
-			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
-		}
-		return null;
-	}	//	function _chartDataSeriesValueSet()
-
-
-	private static function _chartDataSeriesValues($seriesValueSet,$dataType='n') {
-		$seriesVal = array();
-		$formatCode = '';
-		$pointCount = 0;
-
-		foreach($seriesValueSet as $seriesValueIdx => $seriesValue) {
-			switch ($seriesValueIdx) {
-				case 'ptCount':
-					$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
-					break;
-				case 'formatCode':
-					$formatCode = (string) $seriesValue;
-					break;
-				case 'pt':
-					$pointVal = self::_getAttribute($seriesValue, 'idx', 'integer');
-					if ($dataType == 's') {
-						$seriesVal[$pointVal] = (string) $seriesValue->v;
-					} else {
-						$seriesVal[$pointVal] = (float) $seriesValue->v;
-					}
-					break;
-			}
-		}
-
-		return array( 'formatCode'	=> $formatCode,
-					  'pointCount'	=> $pointCount,
-					  'dataValues'	=> $seriesVal
-					);
-	}	//	function _chartDataSeriesValues()
-
-
-	private static function _chartDataSeriesValuesMultiLevel($seriesValueSet,$dataType='n') {
-		$seriesVal = array();
-		$formatCode = '';
-		$pointCount = 0;
-
-		foreach($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
-			foreach($seriesLevel as $seriesValueIdx => $seriesValue) {
-				switch ($seriesValueIdx) {
-					case 'ptCount':
-						$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
-						break;
-					case 'formatCode':
-						$formatCode = (string) $seriesValue;
-						break;
-					case 'pt':
-						$pointVal = self::_getAttribute($seriesValue, 'idx', 'integer');
-						if ($dataType == 's') {
-							$seriesVal[$pointVal][] = (string) $seriesValue->v;
-						} else {
-							$seriesVal[$pointVal][] = (float) $seriesValue->v;
-						}
-						break;
-				}
-			}
-		}
-
-		return array( 'formatCode'	=> $formatCode,
-					  'pointCount'	=> $pointCount,
-					  'dataValues'	=> $seriesVal
-					);
-	}	//	function _chartDataSeriesValuesMultiLevel()
-
-	private static function _parseRichText($titleDetailPart = null) {
-		$value = new PHPExcel_RichText();
-
-		foreach($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
-			if (isset($titleDetailElement->t)) {
-				$objText = $value->createTextRun( (string) $titleDetailElement->t );
-			}
-			if (isset($titleDetailElement->rPr)) {
-				if (isset($titleDetailElement->rPr->rFont["val"])) {
-					$objText->getFont()->setName((string) $titleDetailElement->rPr->rFont["val"]);
-				}
-
-				$fontSize = (self::_getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
-				if (!is_null($fontSize)) {
-					$objText->getFont()->setSize(floor($fontSize / 100));
-				}
-
-				$fontColor = (self::_getAttribute($titleDetailElement->rPr, 'color', 'string'));
-				if (!is_null($fontColor)) {
-					$objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($fontColor) ) );
-				}
-
-				$bold = self::_getAttribute($titleDetailElement->rPr, 'b', 'boolean');
-				if (!is_null($bold)) {
-					$objText->getFont()->setBold($bold);
-				}
-
-				$italic = self::_getAttribute($titleDetailElement->rPr, 'i', 'boolean');
-				if (!is_null($italic)) {
-					$objText->getFont()->setItalic($italic);
-				}
-
-				$baseline = self::_getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
-				if (!is_null($baseline)) {
-					if ($baseline > 0) {
-						$objText->getFont()->setSuperScript(true);
-					} elseif($baseline < 0) {
-						$objText->getFont()->setSubScript(true);
-					}
-				}
-
-				$underscore = (self::_getAttribute($titleDetailElement->rPr, 'u', 'string'));
-				if (!is_null($underscore)) {
-					if ($underscore == 'sng') {
-						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-					} elseif($underscore == 'dbl') {
-						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE);
-					} else {
-						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_NONE);
-					}
-				}
-
-				$strikethrough = (self::_getAttribute($titleDetailElement->rPr, 's', 'string'));
-				if (!is_null($strikethrough)) {
-					if ($strikethrough == 'noStrike') {
-						$objText->getFont()->setStrikethrough(false);
-					} else {
-						$objText->getFont()->setStrikethrough(true);
-					}
-				}
-			}
-		}
-
-		return $value;
-	}
-
-	private static function _readChartAttributes($chartDetail) {
-		$plotAttributes = array();
-		if (isset($chartDetail->dLbls)) {
-			if (isset($chartDetail->dLbls->howLegendKey)) {
-				$plotAttributes['showLegendKey'] = self::_getAttribute($chartDetail->dLbls->showLegendKey, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showVal)) {
-				$plotAttributes['showVal'] = self::_getAttribute($chartDetail->dLbls->showVal, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showCatName)) {
-				$plotAttributes['showCatName'] = self::_getAttribute($chartDetail->dLbls->showCatName, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showSerName)) {
-				$plotAttributes['showSerName'] = self::_getAttribute($chartDetail->dLbls->showSerName, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showPercent)) {
-				$plotAttributes['showPercent'] = self::_getAttribute($chartDetail->dLbls->showPercent, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showBubbleSize)) {
-				$plotAttributes['showBubbleSize'] = self::_getAttribute($chartDetail->dLbls->showBubbleSize, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showLeaderLines)) {
-				$plotAttributes['showLeaderLines'] = self::_getAttribute($chartDetail->dLbls->showLeaderLines, 'val', 'string');
-			}
-		}
-
-		return $plotAttributes;
-	}
-
-	private static function _setChartAttributes($plotArea,$plotAttributes)
-	{
-		foreach($plotAttributes as $plotAttributeKey => $plotAttributeValue) {
-			switch($plotAttributeKey) {
-				case 'showLegendKey' :
-					$plotArea->setShowLegendKey($plotAttributeValue);
-					break;
-				case 'showVal' :
-					$plotArea->setShowVal($plotAttributeValue);
-					break;
-				case 'showCatName' :
-					$plotArea->setShowCatName($plotAttributeValue);
-					break;
-				case 'showSerName' :
-					$plotArea->setShowSerName($plotAttributeValue);
-					break;
-				case 'showPercent' :
-					$plotArea->setShowPercent($plotAttributeValue);
-					break;
-				case 'showBubbleSize' :
-					$plotArea->setShowBubbleSize($plotAttributeValue);
-					break;
-				case 'showLeaderLines' :
-					$plotArea->setShowLeaderLines($plotAttributeValue);
-					break;
-			}
-		}
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2007/Theme.php b/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2007/Theme.php
deleted file mode 100755
index eb3004321..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel2007/Theme.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Reader_Excel2007_Theme
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel2007_Theme
-{
-	/**
-	 * Theme Name
-	 *
-	 * @var string
-	 */
-	private $_themeName;
-
-	/**
-	 * Colour Scheme Name
-	 *
-	 * @var string
-	 */
-	private $_colourSchemeName;
-
-	/**
-	 * Colour Map indexed by position
-	 *
-	 * @var array of string
-	 */
-	private $_colourMapValues;
-
-
-	/**
-	 * Colour Map
-	 *
-	 * @var array of string
-	 */
-	private $_colourMap;
-
-
-    /**
-     * Create a new PHPExcel_Theme
-	 *
-     */
-    public function __construct($themeName,$colourSchemeName,$colourMap)
-    {
-		// Initialise values
-    	$this->_themeName			= $themeName;
-		$this->_colourSchemeName	= $colourSchemeName;
-		$this->_colourMap			= $colourMap;
-    }
-
-	/**
-	 * Get Theme Name
-	 *
-	 * @return string
-	 */
-	public function getThemeName()
-	{
-		return $this->_themeName;
-	}
-
-    /**
-     * Get colour Scheme Name
-     *
-     * @return string
-     */
-    public function getColourSchemeName() {
-		return $this->_colourSchemeName;
-    }
-
-    /**
-     * Get colour Map Value by Position
-     *
-     * @return string
-     */
-    public function getColourByIndex($index=0) {
-    	if (isset($this->_colourMap[$index])) {
-			return $this->_colourMap[$index];
-		}
-		return null;
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel5.php b/plugins/exportTypes/Excel/PHPExcel/Reader/Excel5.php
deleted file mode 100755
index 165eca2b1..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel5.php
+++ /dev/null
@@ -1,6890 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of ParseXL (used as the base for this class):
-// --------------------------------------------------------------------------------
-// Adapted from Excel_Spreadsheet_Reader developed by users bizon153,
-// trex005, and mmp11 (SourceForge.net)
-// http://sourceforge.net/projects/phpexcelreader/
-// Primary changes made by canyoncasa (dvc) for ParseXL 1.00 ...
-//	 Modelled moreso after Perl Excel Parse/Write modules
-//	 Added Parse_Excel_Spreadsheet object
-//		 Reads a whole worksheet or tab as row,column array or as
-//		 associated hash of indexed rows and named column fields
-//	 Added variables for worksheet (tab) indexes and names
-//	 Added an object call for loading individual woorksheets
-//	 Changed default indexing defaults to 0 based arrays
-//	 Fixed date/time and percent formats
-//	 Includes patches found at SourceForge...
-//		 unicode patch by nobody
-//		 unpack("d") machine depedency patch by matchy
-//		 boundsheet utf16 patch by bjaenichen
-//	 Renamed functions for shorter names
-//	 General code cleanup and rigor, including <80 column width
-//	 Included a testcase Excel file and PHP example calls
-//	 Code works for PHP 5.x
-
-// Primary changes made by canyoncasa (dvc) for ParseXL 1.10 ...
-// http://sourceforge.net/tracker/index.php?func=detail&aid=1466964&group_id=99160&atid=623334
-//	 Decoding of formula conditions, results, and tokens.
-//	 Support for user-defined named cells added as an array "namedcells"
-//		 Patch code for user-defined named cells supports single cells only.
-//		 NOTE: this patch only works for BIFF8 as BIFF5-7 use a different
-//		 external sheet reference structure
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_Excel5
- *
- * This class uses {@link http://sourceforge.net/projects/phpexcelreader/parseXL}
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader_Excel5
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
-{
-	// ParseXL definitions
-	const XLS_BIFF8						= 0x0600;
-	const XLS_BIFF7						= 0x0500;
-	const XLS_WorkbookGlobals			= 0x0005;
-	const XLS_Worksheet					= 0x0010;
-
-	// record identifiers
-	const XLS_Type_FORMULA				= 0x0006;
-	const XLS_Type_EOF					= 0x000a;
-	const XLS_Type_PROTECT				= 0x0012;
-	const XLS_Type_OBJECTPROTECT		= 0x0063;
-	const XLS_Type_SCENPROTECT			= 0x00dd;
-	const XLS_Type_PASSWORD				= 0x0013;
-	const XLS_Type_HEADER				= 0x0014;
-	const XLS_Type_FOOTER				= 0x0015;
-	const XLS_Type_EXTERNSHEET			= 0x0017;
-	const XLS_Type_DEFINEDNAME			= 0x0018;
-	const XLS_Type_VERTICALPAGEBREAKS	= 0x001a;
-	const XLS_Type_HORIZONTALPAGEBREAKS	= 0x001b;
-	const XLS_Type_NOTE					= 0x001c;
-	const XLS_Type_SELECTION			= 0x001d;
-	const XLS_Type_DATEMODE				= 0x0022;
-	const XLS_Type_EXTERNNAME			= 0x0023;
-	const XLS_Type_LEFTMARGIN			= 0x0026;
-	const XLS_Type_RIGHTMARGIN			= 0x0027;
-	const XLS_Type_TOPMARGIN			= 0x0028;
-	const XLS_Type_BOTTOMMARGIN			= 0x0029;
-	const XLS_Type_PRINTGRIDLINES		= 0x002b;
-	const XLS_Type_FILEPASS				= 0x002f;
-	const XLS_Type_FONT					= 0x0031;
-	const XLS_Type_CONTINUE				= 0x003c;
-	const XLS_Type_PANE					= 0x0041;
-	const XLS_Type_CODEPAGE				= 0x0042;
-	const XLS_Type_DEFCOLWIDTH 			= 0x0055;
-	const XLS_Type_OBJ					= 0x005d;
-	const XLS_Type_COLINFO				= 0x007d;
-	const XLS_Type_IMDATA				= 0x007f;
-	const XLS_Type_SHEETPR				= 0x0081;
-	const XLS_Type_HCENTER				= 0x0083;
-	const XLS_Type_VCENTER				= 0x0084;
-	const XLS_Type_SHEET				= 0x0085;
-	const XLS_Type_PALETTE				= 0x0092;
-	const XLS_Type_SCL					= 0x00a0;
-	const XLS_Type_PAGESETUP			= 0x00a1;
-	const XLS_Type_MULRK				= 0x00bd;
-	const XLS_Type_MULBLANK				= 0x00be;
-	const XLS_Type_DBCELL				= 0x00d7;
-	const XLS_Type_XF					= 0x00e0;
-	const XLS_Type_MERGEDCELLS			= 0x00e5;
-	const XLS_Type_MSODRAWINGGROUP		= 0x00eb;
-	const XLS_Type_MSODRAWING			= 0x00ec;
-	const XLS_Type_SST					= 0x00fc;
-	const XLS_Type_LABELSST				= 0x00fd;
-	const XLS_Type_EXTSST				= 0x00ff;
-	const XLS_Type_EXTERNALBOOK			= 0x01ae;
-	const XLS_Type_DATAVALIDATIONS		= 0x01b2;
-	const XLS_Type_TXO					= 0x01b6;
-	const XLS_Type_HYPERLINK			= 0x01b8;
-	const XLS_Type_DATAVALIDATION		= 0x01be;
-	const XLS_Type_DIMENSION			= 0x0200;
-	const XLS_Type_BLANK				= 0x0201;
-	const XLS_Type_NUMBER				= 0x0203;
-	const XLS_Type_LABEL				= 0x0204;
-	const XLS_Type_BOOLERR				= 0x0205;
-	const XLS_Type_STRING				= 0x0207;
-	const XLS_Type_ROW					= 0x0208;
-	const XLS_Type_INDEX				= 0x020b;
-	const XLS_Type_ARRAY				= 0x0221;
-	const XLS_Type_DEFAULTROWHEIGHT 	= 0x0225;
-	const XLS_Type_WINDOW2				= 0x023e;
-	const XLS_Type_RK					= 0x027e;
-	const XLS_Type_STYLE				= 0x0293;
-	const XLS_Type_FORMAT				= 0x041e;
-	const XLS_Type_SHAREDFMLA			= 0x04bc;
-	const XLS_Type_BOF					= 0x0809;
-	const XLS_Type_SHEETPROTECTION		= 0x0867;
-	const XLS_Type_RANGEPROTECTION		= 0x0868;
-	const XLS_Type_SHEETLAYOUT			= 0x0862;
-	const XLS_Type_XFEXT				= 0x087d;
-	const XLS_Type_UNKNOWN				= 0xffff;
-
-
-	/**
-	 * Read data only?
-	 * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
-	 *		or whether it should read both data and formatting
-	 *
-	 * @var	boolean
-	 */
-	private $_readDataOnly = false;
-
-	/**
-	 * Restrict which sheets should be loaded?
-	 * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
-	 *
-	 * @var	array of string
-	 */
-	private $_loadSheetsOnly = null;
-
-	/**
-	 * PHPExcel_Reader_IReadFilter instance
-	 *
-	 * @var PHPExcel_Reader_IReadFilter
-	 */
-	private $_readFilter = null;
-
-	/**
-	 * Summary Information stream data.
-	 *
-	 * @var string
-	 */
-	private $_summaryInformation;
-
-	/**
-	 * Extended Summary Information stream data.
-	 *
-	 * @var string
-	 */
-	private $_documentSummaryInformation;
-
-	/**
-	 * User-Defined Properties stream data.
-	 *
-	 * @var string
-	 */
-	private $_userDefinedProperties;
-
-	/**
-	 * Workbook stream data. (Includes workbook globals substream as well as sheet substreams)
-	 *
-	 * @var string
-	 */
-	private $_data;
-
-	/**
-	 * Size in bytes of $this->_data
-	 *
-	 * @var int
-	 */
-	private $_dataSize;
-
-	/**
-	 * Current position in stream
-	 *
-	 * @var integer
-	 */
-	private $_pos;
-
-	/**
-	 * Workbook to be returned by the reader.
-	 *
-	 * @var PHPExcel
-	 */
-	private $_phpExcel;
-
-	/**
-	 * Worksheet that is currently being built by the reader.
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_phpSheet;
-
-	/**
-	 * BIFF version
-	 *
-	 * @var int
-	 */
-	private $_version;
-
-	/**
-	 * Codepage set in the Excel file being read. Only important for BIFF5 (Excel 5.0 - Excel 95)
-	 * For BIFF8 (Excel 97 - Excel 2003) this will always have the value 'UTF-16LE'
-	 *
-	 * @var string
-	 */
-	private $_codepage;
-
-	/**
-	 * Shared formats
-	 *
-	 * @var array
-	 */
-	private $_formats;
-
-	/**
-	 * Shared fonts
-	 *
-	 * @var array
-	 */
-	private $_objFonts;
-
-	/**
-	 * Color palette
-	 *
-	 * @var array
-	 */
-	private $_palette;
-
-	/**
-	 * Worksheets
-	 *
-	 * @var array
-	 */
-	private $_sheets;
-
-	/**
-	 * External books
-	 *
-	 * @var array
-	 */
-	private $_externalBooks;
-
-	/**
-	 * REF structures. Only applies to BIFF8.
-	 *
-	 * @var array
-	 */
-	private $_ref;
-
-	/**
-	 * External names
-	 *
-	 * @var array
-	 */
-	private $_externalNames;
-
-	/**
-	 * Defined names
-	 *
-	 * @var array
-	 */
-	private $_definedname;
-
-	/**
-	 * Shared strings. Only applies to BIFF8.
-	 *
-	 * @var array
-	 */
-	private $_sst;
-
-	/**
-	 * Panes are frozen? (in sheet currently being read). See WINDOW2 record.
-	 *
-	 * @var boolean
-	 */
-	private $_frozen;
-
-	/**
-	 * Fit printout to number of pages? (in sheet currently being read). See SHEETPR record.
-	 *
-	 * @var boolean
-	 */
-	private $_isFitToPages;
-
-	/**
-	 * Objects. One OBJ record contributes with one entry.
-	 *
-	 * @var array
-	 */
-	private $_objs;
-
-	/**
-	 * Text Objects. One TXO record corresponds with one entry.
-	 *
-	 * @var array
-	 */
-	private $_textObjects;
-
-	/**
-	 * Cell Annotations (BIFF8)
-	 *
-	 * @var array
-	 */
-	private $_cellNotes;
-
-	/**
-	 * The combined MSODRAWINGGROUP data
-	 *
-	 * @var string
-	 */
-	private $_drawingGroupData;
-
-	/**
-	 * The combined MSODRAWING data (per sheet)
-	 *
-	 * @var string
-	 */
-	private $_drawingData;
-
-	/**
-	 * Keep track of XF index
-	 *
-	 * @var int
-	 */
-	private $_xfIndex;
-
-	/**
-	 * Mapping of XF index (that is a cell XF) to final index in cellXf collection
-	 *
-	 * @var array
-	 */
-	private $_mapCellXfIndex;
-
-	/**
-	 * Mapping of XF index (that is a style XF) to final index in cellStyleXf collection
-	 *
-	 * @var array
-	 */
-	private $_mapCellStyleXfIndex;
-
-	/**
-	 * The shared formulas in a sheet. One SHAREDFMLA record contributes with one value.
-	 *
-	 * @var array
-	 */
-	private $_sharedFormulas;
-
-	/**
-	 * The shared formula parts in a sheet. One FORMULA record contributes with one value if it
-	 * refers to a shared formula.
-	 *
-	 * @var array
-	 */
-	private $_sharedFormulaParts;
-
-
-	/**
-	 * Create a new PHPExcel_Reader_Excel5 instance
-	 */
-	public function __construct() {
-		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
-	}
-
-
-	/**
-	 * Read data only?
-	 *		If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
-	 *		If false (the default) it will read data and formatting.
-	 *
-	 * @return	boolean
-	 */
-	public function getReadDataOnly()
-	{
-		return $this->_readDataOnly;
-	}
-
-
-	/**
-	 * Set read data only
-	 *		Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
-	 *		Set to false (the default) to advise the Reader to read both data and formatting for cells.
-	 *
-	 * @param	boolean	$pValue
-	 *
-	 * @return	PHPExcel_Reader_Excel5
-	 */
-	public function setReadDataOnly($pValue = false)
-	{
-		$this->_readDataOnly = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Get which sheets to load
-	 *		Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
-	 *			indicating that all worksheets in the workbook should be loaded.
-	 *
-	 * @return mixed
-	 */
-	public function getLoadSheetsOnly()
-	{
-		return $this->_loadSheetsOnly;
-	}
-
-
-	/**
-	 * Set which sheets to load
-	 *
-	 * @param mixed $value
-	 *		This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
-	 *		If NULL, then it tells the Reader to read all worksheets in the workbook
-	 *
-	 * @return PHPExcel_Reader_Excel5
-	 */
-	public function setLoadSheetsOnly($value = null)
-	{
-		$this->_loadSheetsOnly = is_array($value) ?
-			$value : array($value);
-		return $this;
-	}
-
-
-	/**
-	 * Set all sheets to load
-	 *		Tells the Reader to load all worksheets from the workbook.
-	 *
-	 * @return	PHPExcel_Reader_Excel5
-	 */
-	public function setLoadAllSheets()
-	{
-		$this->_loadSheetsOnly = null;
-		return $this;
-	}
-
-
-	/**
-	 * Read filter
-	 *
-	 * @return PHPExcel_Reader_IReadFilter
-	 */
-	public function getReadFilter() {
-		return $this->_readFilter;
-	}
-
-
-	/**
-	 * Set read filter
-	 *
-	 * @param PHPExcel_Reader_IReadFilter $pValue
-	 * @return PHPExcel_Reader_Excel5
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFileName
-	 * @return 	boolean
-	 * @throws Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		try {
-			// Use ParseXL for the hard work.
-			$ole = new PHPExcel_Shared_OLERead();
-
-			// get excel data
-			$res = $ole->read($pFilename);
-			return true;
-
-		} catch (Exception $e) {
-			return false;
-		}
-	}
-
-
-	/**
-	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	Exception
-	 */
-	public function listWorksheetNames($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetNames = array();
-
-		// Read the OLE file
-		$this->_loadOLE($pFilename);
-
-		// total byte size of Excel data (workbook global substream + sheet substreams)
-		$this->_dataSize = strlen($this->_data);
-
-		$this->_pos		= 0;
-		$this->_sheets	= array();
-
-		// Parse Workbook Global Substream
-		while ($this->_pos < $this->_dataSize) {
-			$code = self::_GetInt2d($this->_data, $this->_pos);
-
-			switch ($code) {
-				case self::XLS_Type_BOF:	$this->_readBof();		break;
-				case self::XLS_Type_SHEET:	$this->_readSheet();	break;
-				case self::XLS_Type_EOF:	$this->_readDefault();	break 2;
-				default:					$this->_readDefault();	break;
-			}
-		}
-
-		foreach ($this->_sheets as $sheet) {
-			if ($sheet['sheetType'] != 0x00) {
-				// 0x00: Worksheet, 0x02: Chart, 0x06: Visual Basic module
-				continue;
-			}
-
-			$worksheetNames[] = $sheet['name'];
-		}
-
-		return $worksheetNames;
-	}
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetInfo = array();
-
-		// Read the OLE file
-		$this->_loadOLE($pFilename);
-
-		// total byte size of Excel data (workbook global substream + sheet substreams)
-		$this->_dataSize = strlen($this->_data);
-
-		// initialize
-		$this->_pos    = 0;
-		$this->_sheets = array();
-
-		// Parse Workbook Global Substream
-		while ($this->_pos < $this->_dataSize) {
-			$code = self::_GetInt2d($this->_data, $this->_pos);
-
-			switch ($code) {
-				case self::XLS_Type_BOF:        $this->_readBof();        break;
-				case self::XLS_Type_SHEET:      $this->_readSheet();      break;
-				case self::XLS_Type_EOF:        $this->_readDefault();    break 2;
-				default:                        $this->_readDefault();    break;
-			}
-		}
-
-		// Parse the individual sheets
-		foreach ($this->_sheets as $sheet) {
-
-			if ($sheet['sheetType'] != 0x00) {
-				// 0x00: Worksheet
-				// 0x02: Chart
-				// 0x06: Visual Basic module
-				continue;
-			}
-
-			$tmpInfo = array();
-			$tmpInfo['worksheetName'] = $sheet['name'];
-			$tmpInfo['lastColumnLetter'] = 'A';
-			$tmpInfo['lastColumnIndex'] = 0;
-			$tmpInfo['totalRows'] = 0;
-			$tmpInfo['totalColumns'] = 0;
-
-			$this->_pos = $sheet['offset'];
-
-			while ($this->_pos <= $this->_dataSize - 4) {
-				$code = self::_GetInt2d($this->_data, $this->_pos);
-
-				switch ($code) {
-					case self::XLS_Type_RK:
-					case self::XLS_Type_LABELSST:
-					case self::XLS_Type_NUMBER:
-					case self::XLS_Type_FORMULA:
-					case self::XLS_Type_BOOLERR:
-					case self::XLS_Type_LABEL:
-						$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-						$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-						// move stream pointer to next record
-						$this->_pos += 4 + $length;
-
-						$rowIndex = self::_GetInt2d($recordData, 0) + 1;
-						$columnIndex = self::_GetInt2d($recordData, 2);
-
-						$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
-						$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
-						break;
-					case self::XLS_Type_BOF:      $this->_readBof();          break;
-					case self::XLS_Type_EOF:      $this->_readDefault();      break 2;
-					default:                      $this->_readDefault();      break;
-				}
-			}
-
-			$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
-			$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
-
-			$worksheetInfo[] = $tmpInfo;
-		}
-
-		return $worksheetInfo;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function load($pFilename)
-	{
-		// Read the OLE file
-		$this->_loadOLE($pFilename);
-
-		// Initialisations
-		$this->_phpExcel = new PHPExcel;
-		$this->_phpExcel->removeSheetByIndex(0); // remove 1st sheet
-		if (!$this->_readDataOnly) {
-			$this->_phpExcel->removeCellStyleXfByIndex(0); // remove the default style
-			$this->_phpExcel->removeCellXfByIndex(0); // remove the default style
-		}
-
-		// Read the summary information stream (containing meta data)
-		$this->_readSummaryInformation();
-
-		// Read the Additional document summary information stream (containing application-specific meta data)
-		$this->_readDocumentSummaryInformation();
-
-		// total byte size of Excel data (workbook global substream + sheet substreams)
-		$this->_dataSize = strlen($this->_data);
-
-		// initialize
-		$this->_pos					= 0;
-		$this->_codepage			= 'CP1252';
-		$this->_formats				= array();
-		$this->_objFonts			= array();
-		$this->_palette				= array();
-		$this->_sheets				= array();
-		$this->_externalBooks		= array();
-		$this->_ref					= array();
-		$this->_definedname			= array();
-		$this->_sst					= array();
-		$this->_drawingGroupData	= '';
-		$this->_xfIndex				= '';
-		$this->_mapCellXfIndex		= array();
-		$this->_mapCellStyleXfIndex	= array();
-
-		// Parse Workbook Global Substream
-		while ($this->_pos < $this->_dataSize) {
-			$code = self::_GetInt2d($this->_data, $this->_pos);
-
-			switch ($code) {
-				case self::XLS_Type_BOF:			$this->_readBof();				break;
-				case self::XLS_Type_FILEPASS:		$this->_readFilepass();			break;
-				case self::XLS_Type_CODEPAGE:		$this->_readCodepage();			break;
-				case self::XLS_Type_DATEMODE:		$this->_readDateMode();			break;
-				case self::XLS_Type_FONT:			$this->_readFont();				break;
-				case self::XLS_Type_FORMAT:			$this->_readFormat();			break;
-				case self::XLS_Type_XF:				$this->_readXf();				break;
-				case self::XLS_Type_XFEXT:			$this->_readXfExt();			break;
-				case self::XLS_Type_STYLE:			$this->_readStyle();			break;
-				case self::XLS_Type_PALETTE:		$this->_readPalette();			break;
-				case self::XLS_Type_SHEET:			$this->_readSheet();			break;
-				case self::XLS_Type_EXTERNALBOOK:	$this->_readExternalBook();		break;
-				case self::XLS_Type_EXTERNNAME:		$this->_readExternName();		break;
-				case self::XLS_Type_EXTERNSHEET:	$this->_readExternSheet();		break;
-				case self::XLS_Type_DEFINEDNAME:	$this->_readDefinedName();		break;
-				case self::XLS_Type_MSODRAWINGGROUP:	$this->_readMsoDrawingGroup();	break;
-				case self::XLS_Type_SST:			$this->_readSst();				break;
-				case self::XLS_Type_EOF:			$this->_readDefault();			break 2;
-				default:							$this->_readDefault();			break;
-			}
-		}
-
-		// Resolve indexed colors for font, fill, and border colors
-		// Cannot be resolved already in XF record, because PALETTE record comes afterwards
-		if (!$this->_readDataOnly) {
-			foreach ($this->_objFonts as $objFont) {
-				if (isset($objFont->colorIndex)) {
-					$color = self::_readColor($objFont->colorIndex,$this->_palette,$this->_version);
-					$objFont->getColor()->setRGB($color['rgb']);
-				}
-			}
-
-			foreach ($this->_phpExcel->getCellXfCollection() as $objStyle) {
-				// fill start and end color
-				$fill = $objStyle->getFill();
-
-				if (isset($fill->startcolorIndex)) {
-					$startColor = self::_readColor($fill->startcolorIndex,$this->_palette,$this->_version);
-					$fill->getStartColor()->setRGB($startColor['rgb']);
-				}
-
-				if (isset($fill->endcolorIndex)) {
-					$endColor = self::_readColor($fill->endcolorIndex,$this->_palette,$this->_version);
-					$fill->getEndColor()->setRGB($endColor['rgb']);
-				}
-
-				// border colors
-				$top      = $objStyle->getBorders()->getTop();
-				$right    = $objStyle->getBorders()->getRight();
-				$bottom   = $objStyle->getBorders()->getBottom();
-				$left     = $objStyle->getBorders()->getLeft();
-				$diagonal = $objStyle->getBorders()->getDiagonal();
-
-				if (isset($top->colorIndex)) {
-					$borderTopColor = self::_readColor($top->colorIndex,$this->_palette,$this->_version);
-					$top->getColor()->setRGB($borderTopColor['rgb']);
-				}
-
-				if (isset($right->colorIndex)) {
-					$borderRightColor = self::_readColor($right->colorIndex,$this->_palette,$this->_version);
-					$right->getColor()->setRGB($borderRightColor['rgb']);
-				}
-
-				if (isset($bottom->colorIndex)) {
-					$borderBottomColor = self::_readColor($bottom->colorIndex,$this->_palette,$this->_version);
-					$bottom->getColor()->setRGB($borderBottomColor['rgb']);
-				}
-
-				if (isset($left->colorIndex)) {
-					$borderLeftColor = self::_readColor($left->colorIndex,$this->_palette,$this->_version);
-					$left->getColor()->setRGB($borderLeftColor['rgb']);
-				}
-
-				if (isset($diagonal->colorIndex)) {
-					$borderDiagonalColor = self::_readColor($diagonal->colorIndex,$this->_palette,$this->_version);
-					$diagonal->getColor()->setRGB($borderDiagonalColor['rgb']);
-				}
-			}
-		}
-
-		// treat MSODRAWINGGROUP records, workbook-level Escher
-		if (!$this->_readDataOnly && $this->_drawingGroupData) {
-			$escherWorkbook = new PHPExcel_Shared_Escher();
-			$reader = new PHPExcel_Reader_Excel5_Escher($escherWorkbook);
-			$escherWorkbook = $reader->load($this->_drawingGroupData);
-
-			// debug Escher stream
-			//$debug = new Debug_Escher(new PHPExcel_Shared_Escher());
-			//$debug->load($this->_drawingGroupData);
-		}
-
-		// Parse the individual sheets
-		foreach ($this->_sheets as $sheet) {
-
-			if ($sheet['sheetType'] != 0x00) {
-				// 0x00: Worksheet, 0x02: Chart, 0x06: Visual Basic module
-				continue;
-			}
-
-			// check if sheet should be skipped
-			if (isset($this->_loadSheetsOnly) && !in_array($sheet['name'], $this->_loadSheetsOnly)) {
-				continue;
-			}
-
-			// add sheet to PHPExcel object
-			$this->_phpSheet = $this->_phpExcel->createSheet();
-			//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
-			//		cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
-			//		name in line with the formula, not the reverse
-			$this->_phpSheet->setTitle($sheet['name'],false);
-			$this->_phpSheet->setSheetState($sheet['sheetState']);
-
-			$this->_pos = $sheet['offset'];
-
-			// Initialize isFitToPages. May change after reading SHEETPR record.
-			$this->_isFitToPages = false;
-
-			// Initialize drawingData
-			$this->_drawingData = '';
-
-			// Initialize objs
-			$this->_objs = array();
-
-			// Initialize shared formula parts
-			$this->_sharedFormulaParts = array();
-
-			// Initialize shared formulas
-			$this->_sharedFormulas = array();
-
-			// Initialize text objs
-			$this->_textObjects = array();
-
-			// Initialize cell annotations
-			$this->_cellNotes = array();
-			$this->textObjRef = -1;
-
-			while ($this->_pos <= $this->_dataSize - 4) {
-				$code = self::_GetInt2d($this->_data, $this->_pos);
-
-				switch ($code) {
-					case self::XLS_Type_BOF:					$this->_readBof();						break;
-					case self::XLS_Type_PRINTGRIDLINES:			$this->_readPrintGridlines();			break;
-					case self::XLS_Type_DEFAULTROWHEIGHT:		$this->_readDefaultRowHeight();			break;
-					case self::XLS_Type_SHEETPR:				$this->_readSheetPr();					break;
-					case self::XLS_Type_HORIZONTALPAGEBREAKS:	$this->_readHorizontalPageBreaks();		break;
-					case self::XLS_Type_VERTICALPAGEBREAKS:		$this->_readVerticalPageBreaks();		break;
-					case self::XLS_Type_HEADER:					$this->_readHeader();					break;
-					case self::XLS_Type_FOOTER:					$this->_readFooter();					break;
-					case self::XLS_Type_HCENTER:				$this->_readHcenter();					break;
-					case self::XLS_Type_VCENTER:				$this->_readVcenter();					break;
-					case self::XLS_Type_LEFTMARGIN:				$this->_readLeftMargin();				break;
-					case self::XLS_Type_RIGHTMARGIN:			$this->_readRightMargin();				break;
-					case self::XLS_Type_TOPMARGIN:				$this->_readTopMargin();				break;
-					case self::XLS_Type_BOTTOMMARGIN:			$this->_readBottomMargin();				break;
-					case self::XLS_Type_PAGESETUP:				$this->_readPageSetup();				break;
-					case self::XLS_Type_PROTECT:				$this->_readProtect();					break;
-					case self::XLS_Type_SCENPROTECT:			$this->_readScenProtect();				break;
-					case self::XLS_Type_OBJECTPROTECT:			$this->_readObjectProtect();			break;
-					case self::XLS_Type_PASSWORD:				$this->_readPassword();					break;
-					case self::XLS_Type_DEFCOLWIDTH:			$this->_readDefColWidth();				break;
-					case self::XLS_Type_COLINFO:				$this->_readColInfo();					break;
-					case self::XLS_Type_DIMENSION:				$this->_readDefault();					break;
-					case self::XLS_Type_ROW:					$this->_readRow();						break;
-					case self::XLS_Type_DBCELL:					$this->_readDefault();					break;
-					case self::XLS_Type_RK:						$this->_readRk();						break;
-					case self::XLS_Type_LABELSST:				$this->_readLabelSst();					break;
-					case self::XLS_Type_MULRK:					$this->_readMulRk();					break;
-					case self::XLS_Type_NUMBER:					$this->_readNumber();					break;
-					case self::XLS_Type_FORMULA:				$this->_readFormula();					break;
-					case self::XLS_Type_SHAREDFMLA:				$this->_readSharedFmla();				break;
-					case self::XLS_Type_BOOLERR:				$this->_readBoolErr();					break;
-					case self::XLS_Type_MULBLANK:				$this->_readMulBlank();					break;
-					case self::XLS_Type_LABEL:					$this->_readLabel();					break;
-					case self::XLS_Type_BLANK:					$this->_readBlank();					break;
-					case self::XLS_Type_MSODRAWING:				$this->_readMsoDrawing();				break;
-					case self::XLS_Type_OBJ:					$this->_readObj();						break;
-					case self::XLS_Type_WINDOW2:				$this->_readWindow2();					break;
-					case self::XLS_Type_SCL:					$this->_readScl();						break;
-					case self::XLS_Type_PANE:					$this->_readPane();						break;
-					case self::XLS_Type_SELECTION:				$this->_readSelection();				break;
-					case self::XLS_Type_MERGEDCELLS:			$this->_readMergedCells();				break;
-					case self::XLS_Type_HYPERLINK:				$this->_readHyperLink();				break;
-					case self::XLS_Type_DATAVALIDATIONS:		$this->_readDataValidations();			break;
-					case self::XLS_Type_DATAVALIDATION:			$this->_readDataValidation();			break;
-					case self::XLS_Type_SHEETLAYOUT:			$this->_readSheetLayout();				break;
-					case self::XLS_Type_SHEETPROTECTION:		$this->_readSheetProtection();			break;
-					case self::XLS_Type_RANGEPROTECTION:		$this->_readRangeProtection();			break;
-					case self::XLS_Type_NOTE:					$this->_readNote();						break;
-					//case self::XLS_Type_IMDATA:				$this->_readImData();					break;
-					case self::XLS_Type_TXO:					$this->_readTextObject();				break;
-					case self::XLS_Type_CONTINUE:				$this->_readContinue();					break;
-					case self::XLS_Type_EOF:					$this->_readDefault();					break 2;
-					default:									$this->_readDefault();					break;
-				}
-
-			}
-
-			// treat MSODRAWING records, sheet-level Escher
-			if (!$this->_readDataOnly && $this->_drawingData) {
-				$escherWorksheet = new PHPExcel_Shared_Escher();
-				$reader = new PHPExcel_Reader_Excel5_Escher($escherWorksheet);
-				$escherWorksheet = $reader->load($this->_drawingData);
-
-				// debug Escher stream
-				//$debug = new Debug_Escher(new PHPExcel_Shared_Escher());
-				//$debug->load($this->_drawingData);
-
-				// get all spContainers in one long array, so they can be mapped to OBJ records
-				$allSpContainers = $escherWorksheet->getDgContainer()->getSpgrContainer()->getAllSpContainers();
-			}
-
-			// treat OBJ records
-			foreach ($this->_objs as $n => $obj) {
-//				echo '<hr /><b>Object</b> reference is ',$n,'<br />';
-//				var_dump($obj);
-//				echo '<br />';
-
-				// the first shape container never has a corresponding OBJ record, hence $n + 1
-				if (isset($allSpContainers[$n + 1]) && is_object($allSpContainers[$n + 1])) {
-					$spContainer = $allSpContainers[$n + 1];
-
-					// we skip all spContainers that are a part of a group shape since we cannot yet handle those
-					if ($spContainer->getNestingLevel() > 1) {
-						continue;
-					}
-
-					// calculate the width and height of the shape
-					list($startColumn, $startRow) = PHPExcel_Cell::coordinateFromString($spContainer->getStartCoordinates());
-					list($endColumn, $endRow) = PHPExcel_Cell::coordinateFromString($spContainer->getEndCoordinates());
-
-					$startOffsetX = $spContainer->getStartOffsetX();
-					$startOffsetY = $spContainer->getStartOffsetY();
-					$endOffsetX = $spContainer->getEndOffsetX();
-					$endOffsetY = $spContainer->getEndOffsetY();
-
-					$width = PHPExcel_Shared_Excel5::getDistanceX($this->_phpSheet, $startColumn, $startOffsetX, $endColumn, $endOffsetX);
-					$height = PHPExcel_Shared_Excel5::getDistanceY($this->_phpSheet, $startRow, $startOffsetY, $endRow, $endOffsetY);
-
-					// calculate offsetX and offsetY of the shape
-					$offsetX = $startOffsetX * PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, $startColumn) / 1024;
-					$offsetY = $startOffsetY * PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $startRow) / 256;
-
-					switch ($obj['otObjType']) {
-						case 0x19:
-							// Note
-//							echo 'Cell Annotation Object<br />';
-//							echo 'Object ID is ',$obj['idObjID'],'<br />';
-//
-							if (isset($this->_cellNotes[$obj['idObjID']])) {
-								$cellNote = $this->_cellNotes[$obj['idObjID']];
-
-								if (isset($this->_textObjects[$obj['idObjID']])) {
-									$textObject = $this->_textObjects[$obj['idObjID']];
-									$this->_cellNotes[$obj['idObjID']]['objTextData'] = $textObject;
-								}
-							}
-							break;
-
-						case 0x08:
-//							echo 'Picture Object<br />';
-							// picture
-
-							// get index to BSE entry (1-based)
-							$BSEindex = $spContainer->getOPT(0x0104);
-							$BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
-							$BSE = $BSECollection[$BSEindex - 1];
-							$blipType = $BSE->getBlipType();
-
-							// need check because some blip types are not supported by Escher reader such as EMF
-							if ($blip = $BSE->getBlip()) {
-								$ih = imagecreatefromstring($blip->getData());
-								$drawing = new PHPExcel_Worksheet_MemoryDrawing();
-								$drawing->setImageResource($ih);
-
-								// width, height, offsetX, offsetY
-								$drawing->setResizeProportional(false);
-								$drawing->setWidth($width);
-								$drawing->setHeight($height);
-								$drawing->setOffsetX($offsetX);
-								$drawing->setOffsetY($offsetY);
-
-								switch ($blipType) {
-									case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
-										$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG);
-										$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_JPEG);
-										break;
-
-									case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
-										$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG);
-										$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_PNG);
-										break;
-								}
-
-								$drawing->setWorksheet($this->_phpSheet);
-								$drawing->setCoordinates($spContainer->getStartCoordinates());
-							}
-
-							break;
-
-						default:
-							// other object type
-							break;
-
-					}
-				}
-			}
-
-			// treat SHAREDFMLA records
-			if ($this->_version == self::XLS_BIFF8) {
-				foreach ($this->_sharedFormulaParts as $cell => $baseCell) {
-					list($column, $row) = PHPExcel_Cell::coordinateFromString($cell);
-					if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($column, $row, $this->_phpSheet->getTitle()) ) {
-						$formula = $this->_getFormulaFromStructure($this->_sharedFormulas[$baseCell], $cell);
-						$this->_phpSheet->getCell($cell)->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
-					}
-				}
-			}
-
-			if (!empty($this->_cellNotes)) {
-				foreach($this->_cellNotes as $note => $noteDetails) {
-					if (!isset($noteDetails['objTextData'])) {
-						if (isset($this->_textObjects[$note])) {
-							$textObject = $this->_textObjects[$note];
-							$noteDetails['objTextData'] = $textObject;
-						} else {
-							$noteDetails['objTextData']['text'] = '';
-						}
-					}
-//					echo '<b>Cell annotation ',$note,'</b><br />';
-//					var_dump($noteDetails);
-//					echo '<br />';
-					$cellAddress = str_replace('$','',$noteDetails['cellRef']);
-					$this->_phpSheet->getComment( $cellAddress )
-													->setAuthor( $noteDetails['author'] )
-													->setText($this->_parseRichText($noteDetails['objTextData']['text']) );
-				}
-			}
-		}
-
-		// add the named ranges (defined names)
-		foreach ($this->_definedname as $definedName) {
-			if ($definedName['isBuiltInName']) {
-				switch ($definedName['name']) {
-
-				case pack('C', 0x06):
-					// print area
-					//	in general, formula looks like this: Foo!$C$7:$J$66,Bar!$A$1:$IV$2
-
-					$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
-
-					$extractedRanges = array();
-					foreach ($ranges as $range) {
-						// $range should look like one of these
-						//		Foo!$C$7:$J$66
-						//		Bar!$A$1:$IV$2
-
-						$explodes = explode('!', $range);	// FIXME: what if sheetname contains exclamation mark?
-						$sheetName = $explodes[0];
-
-						if (count($explodes) == 2) {
-							$extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
-						}
-					}
-					if ($docSheet = $this->_phpExcel->getSheetByName($sheetName)) {
-						$docSheet->getPageSetup()->setPrintArea(implode(',', $extractedRanges)); // C7:J66,A1:IV2
-					}
-					break;
-
-				case pack('C', 0x07):
-					// print titles (repeating rows)
-					// Assuming BIFF8, there are 3 cases
-					// 1. repeating rows
-					//		formula looks like this: Sheet!$A$1:$IV$2
-					//		rows 1-2 repeat
-					// 2. repeating columns
-					//		formula looks like this: Sheet!$A$1:$B$65536
-					//		columns A-B repeat
-					// 3. both repeating rows and repeating columns
-					//		formula looks like this: Sheet!$A$1:$B$65536,Sheet!$A$1:$IV$2
-
-					$ranges = explode(',', $definedName['formula']); // FIXME: what if sheetname contains comma?
-
-					foreach ($ranges as $range) {
-						// $range should look like this one of these
-						//		Sheet!$A$1:$B$65536
-						//		Sheet!$A$1:$IV$2
-
-						$explodes = explode('!', $range);
-
-						if (count($explodes) == 2) {
-							if ($docSheet = $this->_phpExcel->getSheetByName($explodes[0])) {
-
-								$extractedRange = $explodes[1];
-								$extractedRange = str_replace('$', '', $extractedRange);
-
-								$coordinateStrings = explode(':', $extractedRange);
-								if (count($coordinateStrings) == 2) {
-									list($firstColumn, $firstRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[0]);
-									list($lastColumn, $lastRow) = PHPExcel_Cell::coordinateFromString($coordinateStrings[1]);
-
-									if ($firstColumn == 'A' and $lastColumn == 'IV') {
-										// then we have repeating rows
-										$docSheet->getPageSetup()->setRowsToRepeatAtTop(array($firstRow, $lastRow));
-									} elseif ($firstRow == 1 and $lastRow == 65536) {
-										// then we have repeating columns
-										$docSheet->getPageSetup()->setColumnsToRepeatAtLeft(array($firstColumn, $lastColumn));
-									}
-								}
-							}
-						}
-					}
-					break;
-
-				}
-			} else {
-				// Extract range
-				$explodes = explode('!', $definedName['formula']);
-
-				if (count($explodes) == 2) {
-					if (($docSheet = $this->_phpExcel->getSheetByName($explodes[0])) ||
-						($docSheet = $this->_phpExcel->getSheetByName(trim($explodes[0],"'")))) {
-						$extractedRange = $explodes[1];
-						$extractedRange = str_replace('$', '', $extractedRange);
-
-						$localOnly = ($definedName['scope'] == 0) ? false : true;
-
-						$scope = ($definedName['scope'] == 0) ?
-							null : $this->_phpExcel->getSheetByName($this->_sheets[$definedName['scope'] - 1]['name']);
-
-						$this->_phpExcel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $docSheet, $extractedRange, $localOnly, $scope) );
-					}
-				} else {
-					//	Named Value
-					//	TODO Provide support for named values
-				}
-			}
-		}
-
-		return $this->_phpExcel;
-	}
-
-
-	/**
-	 * Use OLE reader to extract the relevant data streams from the OLE file
-	 *
-	 * @param string $pFilename
-	 */
-	private function _loadOLE($pFilename)
-	{
-		// OLE reader
-		$ole = new PHPExcel_Shared_OLERead();
-
-		// get excel data,
-		$res = $ole->read($pFilename);
-		// Get workbook data: workbook stream + sheet streams
-		$this->_data = $ole->getStream($ole->wrkbook);
-
-		// Get summary information data
-		$this->_summaryInformation = $ole->getStream($ole->summaryInformation);
-
-		// Get additional document summary information data
-		$this->_documentSummaryInformation = $ole->getStream($ole->documentSummaryInformation);
-
-		// Get user-defined property data
-//		$this->_userDefinedProperties = $ole->getUserDefinedProperties();
-	}
-
-
-	/**
-	 * Read summary information
-	 */
-	private function _readSummaryInformation()
-	{
-		if (!isset($this->_summaryInformation)) {
-			return;
-		}
-
-		// offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
-		// offset: 2; size: 2;
-		// offset: 4; size: 2; OS version
-		// offset: 6; size: 2; OS indicator
-		// offset: 8; size: 16
-		// offset: 24; size: 4; section count
-		$secCount = self::_GetInt4d($this->_summaryInformation, 24);
-
-		// offset: 28; size: 16; first section's class id: e0 85 9f f2 f9 4f 68 10 ab 91 08 00 2b 27 b3 d9
-		// offset: 44; size: 4
-		$secOffset = self::_GetInt4d($this->_summaryInformation, 44);
-
-		// section header
-		// offset: $secOffset; size: 4; section length
-		$secLength = self::_GetInt4d($this->_summaryInformation, $secOffset);
-
-		// offset: $secOffset+4; size: 4; property count
-		$countProperties = self::_GetInt4d($this->_summaryInformation, $secOffset+4);
-
-		// initialize code page (used to resolve string values)
-		$codePage = 'CP1252';
-
-		// offset: ($secOffset+8); size: var
-		// loop through property decarations and properties
-		for ($i = 0; $i < $countProperties; ++$i) {
-
-			// offset: ($secOffset+8) + (8 * $i); size: 4; property ID
-			$id = self::_GetInt4d($this->_summaryInformation, ($secOffset+8) + (8 * $i));
-
-			// Use value of property id as appropriate
-			// offset: ($secOffset+12) + (8 * $i); size: 4; offset from beginning of section (48)
-			$offset = self::_GetInt4d($this->_summaryInformation, ($secOffset+12) + (8 * $i));
-
-			$type = self::_GetInt4d($this->_summaryInformation, $secOffset + $offset);
-
-			// initialize property value
-			$value = null;
-
-			// extract property value based on property type
-			switch ($type) {
-				case 0x02: // 2 byte signed integer
-					$value = self::_GetInt2d($this->_summaryInformation, $secOffset + 4 + $offset);
-					break;
-
-				case 0x03: // 4 byte signed integer
-					$value = self::_GetInt4d($this->_summaryInformation, $secOffset + 4 + $offset);
-					break;
-
-				case 0x13: // 4 byte unsigned integer
-					// not needed yet, fix later if necessary
-					break;
-
-				case 0x1E: // null-terminated string prepended by dword string length
-					$byteLength = self::_GetInt4d($this->_summaryInformation, $secOffset + 4 + $offset);
-					$value = substr($this->_summaryInformation, $secOffset + 8 + $offset, $byteLength);
-					$value = PHPExcel_Shared_String::ConvertEncoding($value, 'UTF-8', $codePage);
-					$value = rtrim($value);
-					break;
-
-				case 0x40: // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-					// PHP-time
-					$value = PHPExcel_Shared_OLE::OLE2LocalDate(substr($this->_summaryInformation, $secOffset + 4 + $offset, 8));
-					break;
-
-				case 0x47: // Clipboard format
-					// not needed yet, fix later if necessary
-					break;
-			}
-
-			switch ($id) {
-				case 0x01:	//	Code Page
-					$codePage = PHPExcel_Shared_CodePage::NumberToName($value);
-					break;
-
-				case 0x02:	//	Title
-					$this->_phpExcel->getProperties()->setTitle($value);
-					break;
-
-				case 0x03:	//	Subject
-					$this->_phpExcel->getProperties()->setSubject($value);
-					break;
-
-				case 0x04:	//	Author (Creator)
-					$this->_phpExcel->getProperties()->setCreator($value);
-					break;
-
-				case 0x05:	//	Keywords
-					$this->_phpExcel->getProperties()->setKeywords($value);
-					break;
-
-				case 0x06:	//	Comments (Description)
-					$this->_phpExcel->getProperties()->setDescription($value);
-					break;
-
-				case 0x07:	//	Template
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x08:	//	Last Saved By (LastModifiedBy)
-					$this->_phpExcel->getProperties()->setLastModifiedBy($value);
-					break;
-
-				case 0x09:	//	Revision
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0A:	//	Total Editing Time
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0B:	//	Last Printed
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0C:	//	Created Date/Time
-					$this->_phpExcel->getProperties()->setCreated($value);
-					break;
-
-				case 0x0D:	//	Modified Date/Time
-					$this->_phpExcel->getProperties()->setModified($value);
-					break;
-
-				case 0x0E:	//	Number of Pages
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0F:	//	Number of Words
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x10:	//	Number of Characters
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x11:	//	Thumbnail
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x12:	//	Name of creating application
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x13:	//	Security
-					//	Not supported by PHPExcel
-					break;
-
-			}
-		}
-	}
-
-
-	/**
-	 * Read additional document summary information
-	 */
-	private function _readDocumentSummaryInformation()
-	{
-		if (!isset($this->_documentSummaryInformation)) {
-			return;
-		}
-
-		//	offset: 0;	size: 2;	must be 0xFE 0xFF (UTF-16 LE byte order mark)
-		//	offset: 2;	size: 2;
-		//	offset: 4;	size: 2;	OS version
-		//	offset: 6;	size: 2;	OS indicator
-		//	offset: 8;	size: 16
-		//	offset: 24;	size: 4;	section count
-		$secCount = self::_GetInt4d($this->_documentSummaryInformation, 24);
-//		echo '$secCount = ',$secCount,'<br />';
-
-		// offset: 28;	size: 16;	first section's class id: 02 d5 cd d5 9c 2e 1b 10 93 97 08 00 2b 2c f9 ae
-		// offset: 44;	size: 4;	first section offset
-		$secOffset = self::_GetInt4d($this->_documentSummaryInformation, 44);
-//		echo '$secOffset = ',$secOffset,'<br />';
-
-		//	section header
-		//	offset: $secOffset;	size: 4;	section length
-		$secLength = self::_GetInt4d($this->_documentSummaryInformation, $secOffset);
-//		echo '$secLength = ',$secLength,'<br />';
-
-		//	offset: $secOffset+4;	size: 4;	property count
-		$countProperties = self::_GetInt4d($this->_documentSummaryInformation, $secOffset+4);
-//		echo '$countProperties = ',$countProperties,'<br />';
-
-		// initialize code page (used to resolve string values)
-		$codePage = 'CP1252';
-
-		//	offset: ($secOffset+8);	size: var
-		//	loop through property decarations and properties
-		for ($i = 0; $i < $countProperties; ++$i) {
-//			echo 'Property ',$i,'<br />';
-			//	offset: ($secOffset+8) + (8 * $i);	size: 4;	property ID
-			$id = self::_GetInt4d($this->_documentSummaryInformation, ($secOffset+8) + (8 * $i));
-//			echo 'ID is ',$id,'<br />';
-
-			// Use value of property id as appropriate
-			// offset: 60 + 8 * $i;	size: 4;	offset from beginning of section (48)
-			$offset = self::_GetInt4d($this->_documentSummaryInformation, ($secOffset+12) + (8 * $i));
-
-			$type = self::_GetInt4d($this->_documentSummaryInformation, $secOffset + $offset);
-//			echo 'Type is ',$type,', ';
-
-			// initialize property value
-			$value = null;
-
-			// extract property value based on property type
-			switch ($type) {
-				case 0x02:	//	2 byte signed integer
-					$value = self::_GetInt2d($this->_documentSummaryInformation, $secOffset + 4 + $offset);
-					break;
-
-				case 0x03:	//	4 byte signed integer
-					$value = self::_GetInt4d($this->_documentSummaryInformation, $secOffset + 4 + $offset);
-					break;
-
-				case 0x0B:  // Boolean
-					$value = self::_GetInt2d($this->_documentSummaryInformation, $secOffset + 4 + $offset);
-					$value = ($value == 0 ? false : true);
-					break;
-
-				case 0x13:	//	4 byte unsigned integer
-					// not needed yet, fix later if necessary
-					break;
-
-				case 0x1E:	//	null-terminated string prepended by dword string length
-					$byteLength = self::_GetInt4d($this->_documentSummaryInformation, $secOffset + 4 + $offset);
-					$value = substr($this->_documentSummaryInformation, $secOffset + 8 + $offset, $byteLength);
-					$value = PHPExcel_Shared_String::ConvertEncoding($value, 'UTF-8', $codePage);
-					$value = rtrim($value);
-					break;
-
-				case 0x40:	//	Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-					// PHP-Time
-					$value = PHPExcel_Shared_OLE::OLE2LocalDate(substr($this->_documentSummaryInformation, $secOffset + 4 + $offset, 8));
-					break;
-
-				case 0x47:	//	Clipboard format
-					// not needed yet, fix later if necessary
-					break;
-			}
-
-			switch ($id) {
-				case 0x01:	//	Code Page
-					$codePage = PHPExcel_Shared_CodePage::NumberToName($value);
-					break;
-
-				case 0x02:	//	Category
-					$this->_phpExcel->getProperties()->setCategory($value);
-					break;
-
-				case 0x03:	//	Presentation Target
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x04:	//	Bytes
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x05:	//	Lines
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x06:	//	Paragraphs
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x07:	//	Slides
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x08:	//	Notes
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x09:	//	Hidden Slides
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0A:	//	MM Clips
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0B:	//	Scale Crop
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0C:	//	Heading Pairs
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0D:	//	Titles of Parts
-					//	Not supported by PHPExcel
-					break;
-
-				case 0x0E:	//	Manager
-					$this->_phpExcel->getProperties()->setManager($value);
-					break;
-
-				case 0x0F:	//	Company
-					$this->_phpExcel->getProperties()->setCompany($value);
-					break;
-
-				case 0x10:	//	Links up-to-date
-					//	Not supported by PHPExcel
-					break;
-
-			}
-		}
-	}
-
-
-	/**
-	 * Reads a general type of BIFF record. Does nothing except for moving stream pointer forward to next record.
-	 */
-	private function _readDefault()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-//		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-	}
-
-
-	/**
-	 *	The NOTE record specifies a comment associated with a particular cell. In Excel 95 (BIFF7) and earlier versions,
-	 *		this record stores a note (cell note). This feature was significantly enhanced in Excel 97.
-	 */
-	private function _readNote()
-	{
-//		echo '<b>Read Cell Annotation</b><br />';
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		$cellAddress = $this->_readBIFF8CellAddress(substr($recordData, 0, 4));
-		if ($this->_version == self::XLS_BIFF8) {
-			$noteObjID = self::_GetInt2d($recordData, 6);
-			$noteAuthor = self::_readUnicodeStringLong(substr($recordData, 8));
-			$noteAuthor = $noteAuthor['value'];
-//			echo 'Note Address=',$cellAddress,'<br />';
-//			echo 'Note Object ID=',$noteObjID,'<br />';
-//			echo 'Note Author=',$noteAuthor,'<hr />';
-//
-			$this->_cellNotes[$noteObjID] = array('cellRef'		=> $cellAddress,
-												  'objectID'	=> $noteObjID,
-												  'author'		=> $noteAuthor
-												 );
-		} else {
-			$extension = false;
-			if ($cellAddress == '$B$65536') {
-				//	If the address row is -1 and the column is 0, (which translates as $B$65536) then this is a continuation
-				//		note from the previous cell annotation. We're not yet handling this, so annotations longer than the
-				//		max 2048 bytes will probably throw a wobbly.
-				$row = self::_GetInt2d($recordData, 0);
-				$extension = true;
-				$cellAddress = array_pop(array_keys($this->_phpSheet->getComments()));
-			}
-//			echo 'Note Address=',$cellAddress,'<br />';
-
-			$cellAddress = str_replace('$','',$cellAddress);
-			$noteLength = self::_GetInt2d($recordData, 4);
-			$noteText = trim(substr($recordData, 6));
-//			echo 'Note Length=',$noteLength,'<br />';
-//			echo 'Note Text=',$noteText,'<br />';
-
-			if ($extension) {
-				//	Concatenate this extension with the currently set comment for the cell
-				$comment = $this->_phpSheet->getComment( $cellAddress );
-				$commentText = $comment->getText()->getPlainText();
-				$comment->setText($this->_parseRichText($commentText.$noteText) );
-			} else {
-				//	Set comment for the cell
-				$this->_phpSheet->getComment( $cellAddress )
-//													->setAuthor( $author )
-													->setText($this->_parseRichText($noteText) );
-			}
-		}
-
-	}
-
-
-	/**
-	 *	The TEXT Object record contains the text associated with a cell annotation.
-	 */
-	private function _readTextObject()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// recordData consists of an array of subrecords looking like this:
-		//	grbit: 2 bytes; Option Flags
-		//	rot: 2 bytes; rotation
-		//	cchText: 2 bytes; length of the text (in the first continue record)
-		//	cbRuns: 2 bytes; length of the formatting (in the second continue record)
-		// followed by the continuation records containing the actual text and formatting
-		$grbitOpts	= self::_GetInt2d($recordData, 0);
-		$rot		= self::_GetInt2d($recordData, 2);
-		$cchText	= self::_GetInt2d($recordData, 10);
-		$cbRuns		= self::_GetInt2d($recordData, 12);
-		$text		= $this->_getSplicedRecordData();
-
-		$this->_textObjects[$this->textObjRef] = array(
-				'text'		=> substr($text["recordData"],$text["spliceOffsets"][0]+1,$cchText),
-				'format'	=> substr($text["recordData"],$text["spliceOffsets"][1],$cbRuns),
-				'alignment'	=> $grbitOpts,
-				'rotation'	=> $rot
-			 );
-
-//		echo '<b>_readTextObject()</b><br />';
-//		var_dump($this->_textObjects[$this->textObjRef]);
-//		echo '<br />';
-	}
-
-
-	/**
-	 * Read BOF
-	 */
-	private function _readBof()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 2; size: 2; type of the following data
-		$substreamType = self::_GetInt2d($recordData, 2);
-
-		switch ($substreamType) {
-			case self::XLS_WorkbookGlobals:
-				$version = self::_GetInt2d($recordData, 0);
-				if (($version != self::XLS_BIFF8) && ($version != self::XLS_BIFF7)) {
-					throw new Exception('Cannot read this Excel file. Version is too old.');
-				}
-				$this->_version = $version;
-				break;
-
-			case self::XLS_Worksheet:
-				// do not use this version information for anything
-				// it is unreliable (OpenOffice doc, 5.8), use only version information from the global stream
-				break;
-
-			default:
-				// substream, e.g. chart
-				// just skip the entire substream
-				do {
-					$code = self::_GetInt2d($this->_data, $this->_pos);
-					$this->_readDefault();
-				} while ($code != self::XLS_Type_EOF && $this->_pos < $this->_dataSize);
-				break;
-		}
-	}
-
-
-	/**
-	 * FILEPASS
-	 *
-	 * This record is part of the File Protection Block. It
-	 * contains information about the read/write password of the
-	 * file. All record contents following this record will be
-	 * encrypted.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readFilepass()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-//		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		throw new Exception('Cannot read encrypted file');
-	}
-
-
-	/**
-	 * CODEPAGE
-	 *
-	 * This record stores the text encoding used to write byte
-	 * strings, stored as MS Windows code page identifier.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readCodepage()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; code page identifier
-		$codepage = self::_GetInt2d($recordData, 0);
-
-		$this->_codepage = PHPExcel_Shared_CodePage::NumberToName($codepage);
-	}
-
-
-	/**
-	 * DATEMODE
-	 *
-	 * This record specifies the base date for displaying date
-	 * values. All dates are stored as count of days past this
-	 * base date. In BIFF2-BIFF4 this record is part of the
-	 * Calculation Settings Block. In BIFF5-BIFF8 it is
-	 * stored in the Workbook Globals Substream.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readDateMode()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; 0 = base 1900, 1 = base 1904
-		PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900);
-		if (ord($recordData{0}) == 1) {
-			PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904);
-		}
-	}
-
-
-	/**
-	 * Read a FONT record
-	 */
-	private function _readFont()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			$objFont = new PHPExcel_Style_Font();
-
-			// offset: 0; size: 2; height of the font (in twips = 1/20 of a point)
-			$size = self::_GetInt2d($recordData, 0);
-			$objFont->setSize($size / 20);
-
-			// offset: 2; size: 2; option flags
-				// bit: 0; mask 0x0001; bold (redundant in BIFF5-BIFF8)
-				// bit: 1; mask 0x0002; italic
-				$isItalic = (0x0002 & self::_GetInt2d($recordData, 2)) >> 1;
-				if ($isItalic) $objFont->setItalic(true);
-
-				// bit: 2; mask 0x0004; underlined (redundant in BIFF5-BIFF8)
-				// bit: 3; mask 0x0008; strike
-				$isStrike = (0x0008 & self::_GetInt2d($recordData, 2)) >> 3;
-				if ($isStrike) $objFont->setStrikethrough(true);
-
-			// offset: 4; size: 2; colour index
-			$colorIndex = self::_GetInt2d($recordData, 4);
-			$objFont->colorIndex = $colorIndex;
-
-			// offset: 6; size: 2; font weight
-			$weight = self::_GetInt2d($recordData, 6);
-			switch ($weight) {
-				case 0x02BC:
-					$objFont->setBold(true);
-					break;
-			}
-
-			// offset: 8; size: 2; escapement type
-			$escapement = self::_GetInt2d($recordData, 8);
-			switch ($escapement) {
-				case 0x0001:
-					$objFont->setSuperScript(true);
-					break;
-				case 0x0002:
-					$objFont->setSubScript(true);
-					break;
-			}
-
-			// offset: 10; size: 1; underline type
-			$underlineType = ord($recordData{10});
-			switch ($underlineType) {
-				case 0x00:
-					break; // no underline
-				case 0x01:
-					$objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-					break;
-				case 0x02:
-					$objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE);
-					break;
-				case 0x21:
-					$objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING);
-					break;
-				case 0x22:
-					$objFont->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING);
-					break;
-			}
-
-			// offset: 11; size: 1; font family
-			// offset: 12; size: 1; character set
-			// offset: 13; size: 1; not used
-			// offset: 14; size: var; font name
-			if ($this->_version == self::XLS_BIFF8) {
-				$string = self::_readUnicodeStringShort(substr($recordData, 14));
-			} else {
-				$string = $this->_readByteStringShort(substr($recordData, 14));
-			}
-			$objFont->setName($string['value']);
-
-			$this->_objFonts[] = $objFont;
-		}
-	}
-
-
-	/**
-	 * FORMAT
-	 *
-	 * This record contains information about a number format.
-	 * All FORMAT records occur together in a sequential list.
-	 *
-	 * In BIFF2-BIFF4 other records referencing a FORMAT record
-	 * contain a zero-based index into this list. From BIFF5 on
-	 * the FORMAT record contains the index itself that will be
-	 * used by other records.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readFormat()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			$indexCode = self::_GetInt2d($recordData, 0);
-
-			if ($this->_version == self::XLS_BIFF8) {
-				$string = self::_readUnicodeStringLong(substr($recordData, 2));
-			} else {
-				// BIFF7
-				$string = $this->_readByteStringShort(substr($recordData, 2));
-			}
-
-			$formatString = $string['value'];
-			$this->_formats[$indexCode] = $formatString;
-		}
-	}
-
-
-	/**
-	 * XF - Extended Format
-	 *
-	 * This record contains formatting information for cells, rows, columns or styles.
-	 * According to http://support.microsoft.com/kb/147732 there are always at least 15 cell style XF
-	 * and 1 cell XF.
-	 * Inspection of Excel files generated by MS Office Excel shows that XF records 0-14 are cell style XF
-	 * and XF record 15 is a cell XF
-	 * We only read the first cell style XF and skip the remaining cell style XF records
-	 * We read all cell XF records.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readXf()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		$objStyle = new PHPExcel_Style();
-
-		if (!$this->_readDataOnly) {
-			// offset:  0; size: 2; Index to FONT record
-			if (self::_GetInt2d($recordData, 0) < 4) {
-				$fontIndex = self::_GetInt2d($recordData, 0);
-			} else {
-				// this has to do with that index 4 is omitted in all BIFF versions for some strange reason
-				// check the OpenOffice documentation of the FONT record
-				$fontIndex = self::_GetInt2d($recordData, 0) - 1;
-			}
-			$objStyle->setFont($this->_objFonts[$fontIndex]);
-
-			// offset:  2; size: 2; Index to FORMAT record
-			$numberFormatIndex = self::_GetInt2d($recordData, 2);
-			if (isset($this->_formats[$numberFormatIndex])) {
-				// then we have user-defined format code
-				$numberformat = array('code' => $this->_formats[$numberFormatIndex]);
-			} elseif (($code = PHPExcel_Style_NumberFormat::builtInFormatCode($numberFormatIndex)) !== '') {
-				// then we have built-in format code
-				$numberformat = array('code' => $code);
-			} else {
-				// we set the general format code
-				$numberformat = array('code' => 'General');
-			}
-			$objStyle->getNumberFormat()->setFormatCode($numberformat['code']);
-
-			// offset:  4; size: 2; XF type, cell protection, and parent style XF
-			// bit 2-0; mask 0x0007; XF_TYPE_PROT
-			$xfTypeProt = self::_GetInt2d($recordData, 4);
-			// bit 0; mask 0x01; 1 = cell is locked
-			$isLocked = (0x01 & $xfTypeProt) >> 0;
-			$objStyle->getProtection()->setLocked($isLocked ?
-				PHPExcel_Style_Protection::PROTECTION_INHERIT : PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
-
-			// bit 1; mask 0x02; 1 = Formula is hidden
-			$isHidden = (0x02 & $xfTypeProt) >> 1;
-			$objStyle->getProtection()->setHidden($isHidden ?
-				PHPExcel_Style_Protection::PROTECTION_PROTECTED : PHPExcel_Style_Protection::PROTECTION_UNPROTECTED);
-
-			// bit 2; mask 0x04; 0 = Cell XF, 1 = Cell Style XF
-			$isCellStyleXf = (0x04 & $xfTypeProt) >> 2;
-
-			// offset:  6; size: 1; Alignment and text break
-			// bit 2-0, mask 0x07; horizontal alignment
-			$horAlign = (0x07 & ord($recordData{6})) >> 0;
-			switch ($horAlign) {
-				case 0:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_GENERAL);
-					break;
-				case 1:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-					break;
-				case 2:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
-					break;
-				case 3:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
-					break;
-				case 5:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY);
-					break;
-				case 6:
-					$objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS);
-					break;
-			}
-			// bit 3, mask 0x08; wrap text
-			$wrapText = (0x08 & ord($recordData{6})) >> 3;
-			switch ($wrapText) {
-				case 0:
-					$objStyle->getAlignment()->setWrapText(false);
-					break;
-				case 1:
-					$objStyle->getAlignment()->setWrapText(true);
-					break;
-			}
-			// bit 6-4, mask 0x70; vertical alignment
-			$vertAlign = (0x70 & ord($recordData{6})) >> 4;
-			switch ($vertAlign) {
-				case 0:
-					$objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_TOP);
-					break;
-				case 1:
-					$objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_CENTER);
-					break;
-				case 2:
-					$objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_BOTTOM);
-					break;
-				case 3:
-					$objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_JUSTIFY);
-					break;
-			}
-
-			if ($this->_version == self::XLS_BIFF8) {
-				// offset:  7; size: 1; XF_ROTATION: Text rotation angle
-					$angle = ord($recordData{7});
-					$rotation = 0;
-					if ($angle <= 90) {
-						$rotation = $angle;
-					} else if ($angle <= 180) {
-						$rotation = 90 - $angle;
-					} else if ($angle == 255) {
-						$rotation = -165;
-					}
-					$objStyle->getAlignment()->setTextRotation($rotation);
-
-				// offset:  8; size: 1; Indentation, shrink to cell size, and text direction
-					// bit: 3-0; mask: 0x0F; indent level
-					$indent = (0x0F & ord($recordData{8})) >> 0;
-					$objStyle->getAlignment()->setIndent($indent);
-
-					// bit: 4; mask: 0x10; 1 = shrink content to fit into cell
-					$shrinkToFit = (0x10 & ord($recordData{8})) >> 4;
-					switch ($shrinkToFit) {
-						case 0:
-							$objStyle->getAlignment()->setShrinkToFit(false);
-							break;
-						case 1:
-							$objStyle->getAlignment()->setShrinkToFit(true);
-							break;
-					}
-
-				// offset:  9; size: 1; Flags used for attribute groups
-
-				// offset: 10; size: 4; Cell border lines and background area
-					// bit: 3-0; mask: 0x0000000F; left style
-					if ($bordersLeftStyle = self::_mapBorderStyle((0x0000000F & self::_GetInt4d($recordData, 10)) >> 0)) {
-						$objStyle->getBorders()->getLeft()->setBorderStyle($bordersLeftStyle);
-					}
-					// bit: 7-4; mask: 0x000000F0; right style
-					if ($bordersRightStyle = self::_mapBorderStyle((0x000000F0 & self::_GetInt4d($recordData, 10)) >> 4)) {
-						$objStyle->getBorders()->getRight()->setBorderStyle($bordersRightStyle);
-					}
-					// bit: 11-8; mask: 0x00000F00; top style
-					if ($bordersTopStyle = self::_mapBorderStyle((0x00000F00 & self::_GetInt4d($recordData, 10)) >> 8)) {
-						$objStyle->getBorders()->getTop()->setBorderStyle($bordersTopStyle);
-					}
-					// bit: 15-12; mask: 0x0000F000; bottom style
-					if ($bordersBottomStyle = self::_mapBorderStyle((0x0000F000 & self::_GetInt4d($recordData, 10)) >> 12)) {
-						$objStyle->getBorders()->getBottom()->setBorderStyle($bordersBottomStyle);
-					}
-					// bit: 22-16; mask: 0x007F0000; left color
-					$objStyle->getBorders()->getLeft()->colorIndex = (0x007F0000 & self::_GetInt4d($recordData, 10)) >> 16;
-
-					// bit: 29-23; mask: 0x3F800000; right color
-					$objStyle->getBorders()->getRight()->colorIndex = (0x3F800000 & self::_GetInt4d($recordData, 10)) >> 23;
-
-					// bit: 30; mask: 0x40000000; 1 = diagonal line from top left to right bottom
-					$diagonalDown = (0x40000000 & self::_GetInt4d($recordData, 10)) >> 30 ?
-						true : false;
-
-					// bit: 31; mask: 0x80000000; 1 = diagonal line from bottom left to top right
-					$diagonalUp = (0x80000000 & self::_GetInt4d($recordData, 10)) >> 31 ?
-						true : false;
-
-					if ($diagonalUp == false && $diagonalDown == false) {
-						$objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_NONE);
-					} elseif ($diagonalUp == true && $diagonalDown == false) {
-						$objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_UP);
-					} elseif ($diagonalUp == false && $diagonalDown == true) {
-						$objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_DOWN);
-					} elseif ($diagonalUp == true && $diagonalDown == true) {
-						$objStyle->getBorders()->setDiagonalDirection(PHPExcel_Style_Borders::DIAGONAL_BOTH);
-					}
-
-				// offset: 14; size: 4;
-					// bit: 6-0; mask: 0x0000007F; top color
-					$objStyle->getBorders()->getTop()->colorIndex = (0x0000007F & self::_GetInt4d($recordData, 14)) >> 0;
-
-					// bit: 13-7; mask: 0x00003F80; bottom color
-					$objStyle->getBorders()->getBottom()->colorIndex = (0x00003F80 & self::_GetInt4d($recordData, 14)) >> 7;
-
-					// bit: 20-14; mask: 0x001FC000; diagonal color
-					$objStyle->getBorders()->getDiagonal()->colorIndex = (0x001FC000 & self::_GetInt4d($recordData, 14)) >> 14;
-
-					// bit: 24-21; mask: 0x01E00000; diagonal style
-					if ($bordersDiagonalStyle = self::_mapBorderStyle((0x01E00000 & self::_GetInt4d($recordData, 14)) >> 21)) {
-						$objStyle->getBorders()->getDiagonal()->setBorderStyle($bordersDiagonalStyle);
-					}
-
-					// bit: 31-26; mask: 0xFC000000 fill pattern
-					if ($fillType = self::_mapFillPattern((0xFC000000 & self::_GetInt4d($recordData, 14)) >> 26)) {
-						$objStyle->getFill()->setFillType($fillType);
-					}
-				// offset: 18; size: 2; pattern and background colour
-					// bit: 6-0; mask: 0x007F; color index for pattern color
-					$objStyle->getFill()->startcolorIndex = (0x007F & self::_GetInt2d($recordData, 18)) >> 0;
-
-					// bit: 13-7; mask: 0x3F80; color index for pattern background
-					$objStyle->getFill()->endcolorIndex = (0x3F80 & self::_GetInt2d($recordData, 18)) >> 7;
-			} else {
-				// BIFF5
-
-				// offset: 7; size: 1; Text orientation and flags
-				$orientationAndFlags = ord($recordData{7});
-
-				// bit: 1-0; mask: 0x03; XF_ORIENTATION: Text orientation
-				$xfOrientation = (0x03 & $orientationAndFlags) >> 0;
-				switch ($xfOrientation) {
-					case 0:
-						$objStyle->getAlignment()->setTextRotation(0);
-						break;
-					case 1:
-						$objStyle->getAlignment()->setTextRotation(-165);
-						break;
-					case 2:
-						$objStyle->getAlignment()->setTextRotation(90);
-						break;
-					case 3:
-						$objStyle->getAlignment()->setTextRotation(-90);
-						break;
-				}
-
-				// offset: 8; size: 4; cell border lines and background area
-				$borderAndBackground = self::_GetInt4d($recordData, 8);
-
-				// bit: 6-0; mask: 0x0000007F; color index for pattern color
-				$objStyle->getFill()->startcolorIndex = (0x0000007F & $borderAndBackground) >> 0;
-
-				// bit: 13-7; mask: 0x00003F80; color index for pattern background
-				$objStyle->getFill()->endcolorIndex = (0x00003F80 & $borderAndBackground) >> 7;
-
-				// bit: 21-16; mask: 0x003F0000; fill pattern
-				$objStyle->getFill()->setFillType(self::_mapFillPattern((0x003F0000 & $borderAndBackground) >> 16));
-
-				// bit: 24-22; mask: 0x01C00000; bottom line style
-				$objStyle->getBorders()->getBottom()->setBorderStyle(self::_mapBorderStyle((0x01C00000 & $borderAndBackground) >> 22));
-
-				// bit: 31-25; mask: 0xFE000000; bottom line color
-				$objStyle->getBorders()->getBottom()->colorIndex = (0xFE000000 & $borderAndBackground) >> 25;
-
-				// offset: 12; size: 4; cell border lines
-				$borderLines = self::_GetInt4d($recordData, 12);
-
-				// bit: 2-0; mask: 0x00000007; top line style
-				$objStyle->getBorders()->getTop()->setBorderStyle(self::_mapBorderStyle((0x00000007 & $borderLines) >> 0));
-
-				// bit: 5-3; mask: 0x00000038; left line style
-				$objStyle->getBorders()->getLeft()->setBorderStyle(self::_mapBorderStyle((0x00000038 & $borderLines) >> 3));
-
-				// bit: 8-6; mask: 0x000001C0; right line style
-				$objStyle->getBorders()->getRight()->setBorderStyle(self::_mapBorderStyle((0x000001C0 & $borderLines) >> 6));
-
-				// bit: 15-9; mask: 0x0000FE00; top line color index
-				$objStyle->getBorders()->getTop()->colorIndex = (0x0000FE00 & $borderLines) >> 9;
-
-				// bit: 22-16; mask: 0x007F0000; left line color index
-				$objStyle->getBorders()->getLeft()->colorIndex = (0x007F0000 & $borderLines) >> 16;
-
-				// bit: 29-23; mask: 0x3F800000; right line color index
-				$objStyle->getBorders()->getRight()->colorIndex = (0x3F800000 & $borderLines) >> 23;
-			}
-
-			// add cellStyleXf or cellXf and update mapping
-			if ($isCellStyleXf) {
-				// we only read one style XF record which is always the first
-				if ($this->_xfIndex == 0) {
-					$this->_phpExcel->addCellStyleXf($objStyle);
-					$this->_mapCellStyleXfIndex[$this->_xfIndex] = 0;
-				}
-			} else {
-				// we read all cell XF records
-				$this->_phpExcel->addCellXf($objStyle);
-				$this->_mapCellXfIndex[$this->_xfIndex] = count($this->_phpExcel->getCellXfCollection()) - 1;
-			}
-
-			// update XF index for when we read next record
-			++$this->_xfIndex;
-		}
-	}
-
-
-	/**
-	 *
-	 */
-	private function _readXfExt()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; 0x087D = repeated header
-
-			// offset: 2; size: 2
-
-			// offset: 4; size: 8; not used
-
-			// offset: 12; size: 2; record version
-
-			// offset: 14; size: 2; index to XF record which this record modifies
-			$ixfe = self::_GetInt2d($recordData, 14);
-
-			// offset: 16; size: 2; not used
-
-			// offset: 18; size: 2; number of extension properties that follow
-			$cexts = self::_GetInt2d($recordData, 18);
-
-			// start reading the actual extension data
-			$offset = 20;
-			while ($offset < $length) {
-				// extension type
-				$extType = self::_GetInt2d($recordData, $offset);
-
-				// extension length
-				$cb = self::_GetInt2d($recordData, $offset + 2);
-
-				// extension data
-				$extData = substr($recordData, $offset + 4, $cb);
-
-				switch ($extType) {
-					case 4:		// fill start color
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$fill = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getFill();
-								$fill->getStartColor()->setRGB($rgb);
-								unset($fill->startcolorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 5:		// fill end color
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$fill = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getFill();
-								$fill->getEndColor()->setRGB($rgb);
-								unset($fill->endcolorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 7:		// border color top
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$top = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getTop();
-								$top->getColor()->setRGB($rgb);
-								unset($top->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 8:		// border color bottom
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$bottom = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getBottom();
-								$bottom->getColor()->setRGB($rgb);
-								unset($bottom->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 9:		// border color left
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$left = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getLeft();
-								$left->getColor()->setRGB($rgb);
-								unset($left->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 10:		// border color right
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$right = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getRight();
-								$right->getColor()->setRGB($rgb);
-								unset($right->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 11:		// border color diagonal
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$diagonal = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getBorders()->getDiagonal();
-								$diagonal->getColor()->setRGB($rgb);
-								unset($diagonal->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-
-					case 13:	// font color
-						$xclfType  = self::_GetInt2d($extData, 0); // color type
-						$xclrValue = substr($extData, 4, 4); // color value (value based on color type)
-
-						if ($xclfType == 2) {
-							$rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2}));
-
-							// modify the relevant style property
-							if ( isset($this->_mapCellXfIndex[$ixfe]) ) {
-								$font = $this->_phpExcel->getCellXfByIndex($this->_mapCellXfIndex[$ixfe])->getFont();
-								$font->getColor()->setRGB($rgb);
-								unset($font->colorIndex); // normal color index does not apply, discard
-							}
-						}
-						break;
-				}
-
-				$offset += $cb;
-			}
-		}
-
-	}
-
-
-	/**
-	 * Read STYLE record
-	 */
-	private function _readStyle()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; index to XF record and flag for built-in style
-			$ixfe = self::_GetInt2d($recordData, 0);
-
-			// bit: 11-0; mask 0x0FFF; index to XF record
-			$xfIndex = (0x0FFF & $ixfe) >> 0;
-
-			// bit: 15; mask 0x8000; 0 = user-defined style, 1 = built-in style
-			$isBuiltIn = (bool) ((0x8000 & $ixfe) >> 15);
-
-			if ($isBuiltIn) {
-				// offset: 2; size: 1; identifier for built-in style
-				$builtInId = ord($recordData{2});
-
-				switch ($builtInId) {
-				case 0x00:
-					// currently, we are not using this for anything
-					break;
-
-				default:
-					break;
-				}
-
-			} else {
-				// user-defined; not supported by PHPExcel
-			}
-		}
-	}
-
-
-	/**
-	 * Read PALETTE record
-	 */
-	private function _readPalette()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; number of following colors
-			$nm = self::_GetInt2d($recordData, 0);
-
-			// list of RGB colors
-			for ($i = 0; $i < $nm; ++$i) {
-				$rgb = substr($recordData, 2 + 4 * $i, 4);
-				$this->_palette[] = self::_readRGB($rgb);
-			}
-		}
-	}
-
-
-	/**
-	 * SHEET
-	 *
-	 * This record is  located in the  Workbook Globals
-	 * Substream  and represents a sheet inside the workbook.
-	 * One SHEET record is written for each sheet. It stores the
-	 * sheet name and a stream offset to the BOF record of the
-	 * respective Sheet Substream within the Workbook Stream.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readSheet()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 4; absolute stream position of the BOF record of the sheet
-		$rec_offset = self::_GetInt4d($recordData, 0);
-
-		// offset: 4; size: 1; sheet state
-		switch (ord($recordData{4})) {
-			case 0x00: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE;    break;
-			case 0x01: $sheetState = PHPExcel_Worksheet::SHEETSTATE_HIDDEN;     break;
-			case 0x02: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VERYHIDDEN; break;
-			default: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE;      break;
-		}
-
-		// offset: 5; size: 1; sheet type
-		$sheetType = ord($recordData{5});
-
-		// offset: 6; size: var; sheet name
-		if ($this->_version == self::XLS_BIFF8) {
-			$string = self::_readUnicodeStringShort(substr($recordData, 6));
-			$rec_name = $string['value'];
-		} elseif ($this->_version == self::XLS_BIFF7) {
-			$string = $this->_readByteStringShort(substr($recordData, 6));
-			$rec_name = $string['value'];
-		}
-
-		$this->_sheets[] = array(
-			'name' => $rec_name,
-			'offset' => $rec_offset,
-			'sheetState' => $sheetState,
-			'sheetType' => $sheetType,
-		);
-	}
-
-
-	/**
-	 * Read EXTERNALBOOK record
-	 */
-	private function _readExternalBook()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset within record data
-		$offset = 0;
-
-		// there are 4 types of records
-		if (strlen($recordData) > 4) {
-			// external reference
-			// offset: 0; size: 2; number of sheet names ($nm)
-			$nm = self::_GetInt2d($recordData, 0);
-			$offset += 2;
-
-			// offset: 2; size: var; encoded URL without sheet name (Unicode string, 16-bit length)
-			$encodedUrlString = self::_readUnicodeStringLong(substr($recordData, 2));
-			$offset += $encodedUrlString['size'];
-
-			// offset: var; size: var; list of $nm sheet names (Unicode strings, 16-bit length)
-			$externalSheetNames = array();
-			for ($i = 0; $i < $nm; ++$i) {
-				$externalSheetNameString = self::_readUnicodeStringLong(substr($recordData, $offset));
-				$externalSheetNames[] = $externalSheetNameString['value'];
-				$offset += $externalSheetNameString['size'];
-			}
-
-			// store the record data
-			$this->_externalBooks[] = array(
-				'type' => 'external',
-				'encodedUrl' => $encodedUrlString['value'],
-				'externalSheetNames' => $externalSheetNames,
-			);
-
-		} elseif (substr($recordData, 2, 2) == pack('CC', 0x01, 0x04)) {
-			// internal reference
-			// offset: 0; size: 2; number of sheet in this document
-			// offset: 2; size: 2; 0x01 0x04
-			$this->_externalBooks[] = array(
-				'type' => 'internal',
-			);
-		} elseif (substr($recordData, 0, 4) == pack('vCC', 0x0001, 0x01, 0x3A)) {
-			// add-in function
-			// offset: 0; size: 2; 0x0001
-			$this->_externalBooks[] = array(
-				'type' => 'addInFunction',
-			);
-		} elseif (substr($recordData, 0, 2) == pack('v', 0x0000)) {
-			// DDE links, OLE links
-			// offset: 0; size: 2; 0x0000
-			// offset: 2; size: var; encoded source document name
-			$this->_externalBooks[] = array(
-				'type' => 'DDEorOLE',
-			);
-		}
-	}
-
-
-	/**
-	 * Read EXTERNNAME record.
-	 */
-	private function _readExternName()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// external sheet references provided for named cells
-		if ($this->_version == self::XLS_BIFF8) {
-			// offset: 0; size: 2; options
-			$options = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 2;
-
-			// offset: 4; size: 2; not used
-
-			// offset: 6; size: var
-			$nameString = self::_readUnicodeStringShort(substr($recordData, 6));
-
-			// offset: var; size: var; formula data
-			$offset = 6 + $nameString['size'];
-			$formula = $this->_getFormulaFromStructure(substr($recordData, $offset));
-
-			$this->_externalNames[] = array(
-				'name' => $nameString['value'],
-				'formula' => $formula,
-			);
-		}
-	}
-
-
-	/**
-	 * Read EXTERNSHEET record
-	 */
-	private function _readExternSheet()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// external sheet references provided for named cells
-		if ($this->_version == self::XLS_BIFF8) {
-			// offset: 0; size: 2; number of following ref structures
-			$nm = self::_GetInt2d($recordData, 0);
-			for ($i = 0; $i < $nm; ++$i) {
-				$this->_ref[] = array(
-					// offset: 2 + 6 * $i; index to EXTERNALBOOK record
-					'externalBookIndex' => self::_GetInt2d($recordData, 2 + 6 * $i),
-					// offset: 4 + 6 * $i; index to first sheet in EXTERNALBOOK record
-					'firstSheetIndex' => self::_GetInt2d($recordData, 4 + 6 * $i),
-					// offset: 6 + 6 * $i; index to last sheet in EXTERNALBOOK record
-					'lastSheetIndex' => self::_GetInt2d($recordData, 6 + 6 * $i),
-				);
-			}
-		}
-	}
-
-
-	/**
-	 * DEFINEDNAME
-	 *
-	 * This record is part of a Link Table. It contains the name
-	 * and the token array of an internal defined name. Token
-	 * arrays of defined names contain tokens with aberrant
-	 * token classes.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readDefinedName()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8) {
-			// retrieves named cells
-
-			// offset: 0; size: 2; option flags
-			$opts = self::_GetInt2d($recordData, 0);
-
-				// bit: 5; mask: 0x0020; 0 = user-defined name, 1 = built-in-name
-				$isBuiltInName = (0x0020 & $opts) >> 5;
-
-			// offset: 2; size: 1; keyboard shortcut
-
-			// offset: 3; size: 1; length of the name (character count)
-			$nlen = ord($recordData{3});
-
-			// offset: 4; size: 2; size of the formula data (it can happen that this is zero)
-			// note: there can also be additional data, this is not included in $flen
-			$flen = self::_GetInt2d($recordData, 4);
-
-			// offset: 8; size: 2; 0=Global name, otherwise index to sheet (1-based)
-			$scope = self::_GetInt2d($recordData, 8);
-
-			// offset: 14; size: var; Name (Unicode string without length field)
-			$string = self::_readUnicodeString(substr($recordData, 14), $nlen);
-
-			// offset: var; size: $flen; formula data
-			$offset = 14 + $string['size'];
-			$formulaStructure = pack('v', $flen) . substr($recordData, $offset);
-
-			try {
-				$formula = $this->_getFormulaFromStructure($formulaStructure);
-			} catch (Exception $e) {
-				$formula = '';
-			}
-
-			$this->_definedname[] = array(
-				'isBuiltInName' => $isBuiltInName,
-				'name' => $string['value'],
-				'formula' => $formula,
-				'scope' => $scope,
-			);
-		}
-	}
-
-
-	/**
-	 * Read MSODRAWINGGROUP record
-	 */
-	private function _readMsoDrawingGroup()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-
-		// get spliced record data
-		$splicedRecordData = $this->_getSplicedRecordData();
-		$recordData = $splicedRecordData['recordData'];
-
-		$this->_drawingGroupData .= $recordData;
-	}
-
-
-	/**
-	 * SST - Shared String Table
-	 *
-	 * This record contains a list of all strings used anywhere
-	 * in the workbook. Each string occurs only once. The
-	 * workbook uses indexes into the list to reference the
-	 * strings.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 **/
-	private function _readSst()
-	{
-		// offset within (spliced) record data
-		$pos = 0;
-
-		// get spliced record data
-		$splicedRecordData = $this->_getSplicedRecordData();
-
-		$recordData = $splicedRecordData['recordData'];
-		$spliceOffsets = $splicedRecordData['spliceOffsets'];
-
-		// offset: 0; size: 4; total number of strings in the workbook
-		$pos += 4;
-
-		// offset: 4; size: 4; number of following strings ($nm)
-		$nm = self::_GetInt4d($recordData, 4);
-		$pos += 4;
-
-		// loop through the Unicode strings (16-bit length)
-		for ($i = 0; $i < $nm; ++$i) {
-
-			// number of characters in the Unicode string
-			$numChars = self::_GetInt2d($recordData, $pos);
-			$pos += 2;
-
-			// option flags
-			$optionFlags = ord($recordData{$pos});
-			++$pos;
-
-			// bit: 0; mask: 0x01; 0 = compressed; 1 = uncompressed
-			$isCompressed = (($optionFlags & 0x01) == 0) ;
-
-			// bit: 2; mask: 0x02; 0 = ordinary; 1 = Asian phonetic
-			$hasAsian = (($optionFlags & 0x04) != 0);
-
-			// bit: 3; mask: 0x03; 0 = ordinary; 1 = Rich-Text
-			$hasRichText = (($optionFlags & 0x08) != 0);
-
-			if ($hasRichText) {
-				// number of Rich-Text formatting runs
-				$formattingRuns = self::_GetInt2d($recordData, $pos);
-				$pos += 2;
-			}
-
-			if ($hasAsian) {
-				// size of Asian phonetic setting
-				$extendedRunLength = self::_GetInt4d($recordData, $pos);
-				$pos += 4;
-			}
-
-			// expected byte length of character array if not split
-			$len = ($isCompressed) ? $numChars : $numChars * 2;
-
-			// look up limit position
-			foreach ($spliceOffsets as $spliceOffset) {
-				// it can happen that the string is empty, therefore we need
-				// <= and not just <
-				if ($pos <= $spliceOffset) {
-					$limitpos = $spliceOffset;
-					break;
-				}
-			}
-
-			if ($pos + $len <= $limitpos) {
-				// character array is not split between records
-
-				$retstr = substr($recordData, $pos, $len);
-				$pos += $len;
-
-			} else {
-				// character array is split between records
-
-				// first part of character array
-				$retstr = substr($recordData, $pos, $limitpos - $pos);
-
-				$bytesRead = $limitpos - $pos;
-
-				// remaining characters in Unicode string
-				$charsLeft = $numChars - (($isCompressed) ? $bytesRead : ($bytesRead / 2));
-
-				$pos = $limitpos;
-
-				// keep reading the characters
-				while ($charsLeft > 0) {
-
-					// look up next limit position, in case the string span more than one continue record
-					foreach ($spliceOffsets as $spliceOffset) {
-						if ($pos < $spliceOffset) {
-							$limitpos = $spliceOffset;
-							break;
-						}
-					}
-
-					// repeated option flags
-					// OpenOffice.org documentation 5.21
-					$option = ord($recordData{$pos});
-					++$pos;
-
-					if ($isCompressed && ($option == 0)) {
-						// 1st fragment compressed
-						// this fragment compressed
-						$len = min($charsLeft, $limitpos - $pos);
-						$retstr .= substr($recordData, $pos, $len);
-						$charsLeft -= $len;
-						$isCompressed = true;
-
-					} elseif (!$isCompressed && ($option != 0)) {
-						// 1st fragment uncompressed
-						// this fragment uncompressed
-						$len = min($charsLeft * 2, $limitpos - $pos);
-						$retstr .= substr($recordData, $pos, $len);
-						$charsLeft -= $len / 2;
-						$isCompressed = false;
-
-					} elseif (!$isCompressed && ($option == 0)) {
-						// 1st fragment uncompressed
-						// this fragment compressed
-						$len = min($charsLeft, $limitpos - $pos);
-						for ($j = 0; $j < $len; ++$j) {
-							$retstr .= $recordData{$pos + $j} . chr(0);
-						}
-						$charsLeft -= $len;
-						$isCompressed = false;
-
-					} else {
-						// 1st fragment compressed
-						// this fragment uncompressed
-						$newstr = '';
-						for ($j = 0; $j < strlen($retstr); ++$j) {
-							$newstr .= $retstr[$j] . chr(0);
-						}
-						$retstr = $newstr;
-						$len = min($charsLeft * 2, $limitpos - $pos);
-						$retstr .= substr($recordData, $pos, $len);
-						$charsLeft -= $len / 2;
-						$isCompressed = false;
-					}
-
-					$pos += $len;
-				}
-			}
-
-			// convert to UTF-8
-			$retstr = self::_encodeUTF16($retstr, $isCompressed);
-
-			// read additional Rich-Text information, if any
-			$fmtRuns = array();
-			if ($hasRichText) {
-				// list of formatting runs
-				for ($j = 0; $j < $formattingRuns; ++$j) {
-					// first formatted character; zero-based
-					$charPos = self::_GetInt2d($recordData, $pos + $j * 4);
-
-					// index to font record
-					$fontIndex = self::_GetInt2d($recordData, $pos + 2 + $j * 4);
-
-					$fmtRuns[] = array(
-						'charPos' => $charPos,
-						'fontIndex' => $fontIndex,
-					);
-				}
-				$pos += 4 * $formattingRuns;
-			}
-
-			// read additional Asian phonetics information, if any
-			if ($hasAsian) {
-				// For Asian phonetic settings, we skip the extended string data
-				$pos += $extendedRunLength;
-			}
-
-			// store the shared sting
-			$this->_sst[] = array(
-				'value' => $retstr,
-				'fmtRuns' => $fmtRuns,
-			);
-		}
-
-		// _getSplicedRecordData() takes care of moving current position in data stream
-	}
-
-
-	/**
-	 * Read PRINTGRIDLINES record
-	 */
-	private function _readPrintGridlines()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
-			// offset: 0; size: 2; 0 = do not print sheet grid lines; 1 = print sheet gridlines
-			$printGridlines = (bool) self::_GetInt2d($recordData, 0);
-			$this->_phpSheet->setPrintGridlines($printGridlines);
-		}
-	}
-
-
-	/**
-	 * Read DEFAULTROWHEIGHT record
-	 */
-	private function _readDefaultRowHeight()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; option flags
-		// offset: 2; size: 2; default height for unused rows, (twips 1/20 point)
-		$height = self::_GetInt2d($recordData, 2);
-		$this->_phpSheet->getDefaultRowDimension()->setRowHeight($height / 20);
-	}
-
-
-	/**
-	 * Read SHEETPR record
-	 */
-	private function _readSheetPr()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2
-
-		// bit: 6; mask: 0x0040; 0 = outline buttons above outline group
-		$isSummaryBelow = (0x0040 & self::_GetInt2d($recordData, 0)) >> 6;
-		$this->_phpSheet->setShowSummaryBelow($isSummaryBelow);
-
-		// bit: 7; mask: 0x0080; 0 = outline buttons left of outline group
-		$isSummaryRight = (0x0080 & self::_GetInt2d($recordData, 0)) >> 7;
-		$this->_phpSheet->setShowSummaryRight($isSummaryRight);
-
-		// bit: 8; mask: 0x100; 0 = scale printout in percent, 1 = fit printout to number of pages
-		// this corresponds to radio button setting in page setup dialog in Excel
-		$this->_isFitToPages = (bool) ((0x0100 & self::_GetInt2d($recordData, 0)) >> 8);
-	}
-
-
-	/**
-	 * Read HORIZONTALPAGEBREAKS record
-	 */
-	private function _readHorizontalPageBreaks()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
-
-			// offset: 0; size: 2; number of the following row index structures
-			$nm = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 6 * $nm; list of $nm row index structures
-			for ($i = 0; $i < $nm; ++$i) {
-				$r = self::_GetInt2d($recordData, 2 + 6 * $i);
-				$cf = self::_GetInt2d($recordData, 2 + 6 * $i + 2);
-				$cl = self::_GetInt2d($recordData, 2 + 6 * $i + 4);
-
-				// not sure why two column indexes are necessary?
-				$this->_phpSheet->setBreakByColumnAndRow($cf, $r, PHPExcel_Worksheet::BREAK_ROW);
-			}
-		}
-	}
-
-
-	/**
-	 * Read VERTICALPAGEBREAKS record
-	 */
-	private function _readVerticalPageBreaks()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
-			// offset: 0; size: 2; number of the following column index structures
-			$nm = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 6 * $nm; list of $nm row index structures
-			for ($i = 0; $i < $nm; ++$i) {
-				$c = self::_GetInt2d($recordData, 2 + 6 * $i);
-				$rf = self::_GetInt2d($recordData, 2 + 6 * $i + 2);
-				$rl = self::_GetInt2d($recordData, 2 + 6 * $i + 4);
-
-				// not sure why two row indexes are necessary?
-				$this->_phpSheet->setBreakByColumnAndRow($c, $rf, PHPExcel_Worksheet::BREAK_COLUMN);
-			}
-		}
-	}
-
-
-	/**
-	 * Read HEADER record
-	 */
-	private function _readHeader()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: var
-			// realized that $recordData can be empty even when record exists
-			if ($recordData) {
-				if ($this->_version == self::XLS_BIFF8) {
-					$string = self::_readUnicodeStringLong($recordData);
-				} else {
-					$string = $this->_readByteStringShort($recordData);
-				}
-
-				$this->_phpSheet->getHeaderFooter()->setOddHeader($string['value']);
-				$this->_phpSheet->getHeaderFooter()->setEvenHeader($string['value']);
-			}
-		}
-	}
-
-
-	/**
-	 * Read FOOTER record
-	 */
-	private function _readFooter()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: var
-			// realized that $recordData can be empty even when record exists
-			if ($recordData) {
-				if ($this->_version == self::XLS_BIFF8) {
-					$string = self::_readUnicodeStringLong($recordData);
-				} else {
-					$string = $this->_readByteStringShort($recordData);
-				}
-				$this->_phpSheet->getHeaderFooter()->setOddFooter($string['value']);
-				$this->_phpSheet->getHeaderFooter()->setEvenFooter($string['value']);
-			}
-		}
-	}
-
-
-	/**
-	 * Read HCENTER record
-	 */
-	private function _readHcenter()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; 0 = print sheet left aligned, 1 = print sheet centered horizontally
-			$isHorizontalCentered = (bool) self::_GetInt2d($recordData, 0);
-
-			$this->_phpSheet->getPageSetup()->setHorizontalCentered($isHorizontalCentered);
-		}
-	}
-
-
-	/**
-	 * Read VCENTER record
-	 */
-	private function _readVcenter()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; 0 = print sheet aligned at top page border, 1 = print sheet vertically centered
-			$isVerticalCentered = (bool) self::_GetInt2d($recordData, 0);
-
-			$this->_phpSheet->getPageSetup()->setVerticalCentered($isVerticalCentered);
-		}
-	}
-
-
-	/**
-	 * Read LEFTMARGIN record
-	 */
-	private function _readLeftMargin()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 8
-			$this->_phpSheet->getPageMargins()->setLeft(self::_extractNumber($recordData));
-		}
-	}
-
-
-	/**
-	 * Read RIGHTMARGIN record
-	 */
-	private function _readRightMargin()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 8
-			$this->_phpSheet->getPageMargins()->setRight(self::_extractNumber($recordData));
-		}
-	}
-
-
-	/**
-	 * Read TOPMARGIN record
-	 */
-	private function _readTopMargin()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 8
-			$this->_phpSheet->getPageMargins()->setTop(self::_extractNumber($recordData));
-		}
-	}
-
-
-	/**
-	 * Read BOTTOMMARGIN record
-	 */
-	private function _readBottomMargin()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 8
-			$this->_phpSheet->getPageMargins()->setBottom(self::_extractNumber($recordData));
-		}
-	}
-
-
-	/**
-	 * Read PAGESETUP record
-	 */
-	private function _readPageSetup()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; paper size
-			$paperSize = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 2; scaling factor
-			$scale = self::_GetInt2d($recordData, 2);
-
-			// offset: 6; size: 2; fit worksheet width to this number of pages, 0 = use as many as needed
-			$fitToWidth = self::_GetInt2d($recordData, 6);
-
-			// offset: 8; size: 2; fit worksheet height to this number of pages, 0 = use as many as needed
-			$fitToHeight = self::_GetInt2d($recordData, 8);
-
-			// offset: 10; size: 2; option flags
-
-				// bit: 1; mask: 0x0002; 0=landscape, 1=portrait
-				$isPortrait = (0x0002 & self::_GetInt2d($recordData, 10)) >> 1;
-
-				// bit: 2; mask: 0x0004; 1= paper size, scaling factor, paper orient. not init
-				// when this bit is set, do not use flags for those properties
-				$isNotInit = (0x0004 & self::_GetInt2d($recordData, 10)) >> 2;
-
-			if (!$isNotInit) {
-				$this->_phpSheet->getPageSetup()->setPaperSize($paperSize);
-				switch ($isPortrait) {
-				case 0: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE); break;
-				case 1: $this->_phpSheet->getPageSetup()->setOrientation(PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT); break;
-				}
-
-				$this->_phpSheet->getPageSetup()->setScale($scale, false);
-				$this->_phpSheet->getPageSetup()->setFitToPage((bool) $this->_isFitToPages);
-				$this->_phpSheet->getPageSetup()->setFitToWidth($fitToWidth, false);
-				$this->_phpSheet->getPageSetup()->setFitToHeight($fitToHeight, false);
-			}
-
-			// offset: 16; size: 8; header margin (IEEE 754 floating-point value)
-			$marginHeader = self::_extractNumber(substr($recordData, 16, 8));
-			$this->_phpSheet->getPageMargins()->setHeader($marginHeader);
-
-			// offset: 24; size: 8; footer margin (IEEE 754 floating-point value)
-			$marginFooter = self::_extractNumber(substr($recordData, 24, 8));
-			$this->_phpSheet->getPageMargins()->setFooter($marginFooter);
-		}
-	}
-
-
-	/**
-	 * PROTECT - Sheet protection (BIFF2 through BIFF8)
-	 *   if this record is omitted, then it also means no sheet protection
-	 */
-	private function _readProtect()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// offset: 0; size: 2;
-
-		// bit 0, mask 0x01; 1 = sheet is protected
-		$bool = (0x01 & self::_GetInt2d($recordData, 0)) >> 0;
-		$this->_phpSheet->getProtection()->setSheet((bool)$bool);
-	}
-
-
-	/**
-	 * SCENPROTECT
-	 */
-	private function _readScenProtect()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// offset: 0; size: 2;
-
-		// bit: 0, mask 0x01; 1 = scenarios are protected
-		$bool = (0x01 & self::_GetInt2d($recordData, 0)) >> 0;
-
-		$this->_phpSheet->getProtection()->setScenarios((bool)$bool);
-	}
-
-
-	/**
-	 * OBJECTPROTECT
-	 */
-	private function _readObjectProtect()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// offset: 0; size: 2;
-
-		// bit: 0, mask 0x01; 1 = objects are protected
-		$bool = (0x01 & self::_GetInt2d($recordData, 0)) >> 0;
-
-		$this->_phpSheet->getProtection()->setObjects((bool)$bool);
-	}
-
-
-	/**
-	 * PASSWORD - Sheet protection (hashed) password (BIFF2 through BIFF8)
-	 */
-	private function _readPassword()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; 16-bit hash value of password
-			$password = strtoupper(dechex(self::_GetInt2d($recordData, 0))); // the hashed password
-			$this->_phpSheet->getProtection()->setPassword($password, true);
-		}
-	}
-
-
-	/**
-	 * Read DEFCOLWIDTH record
-	 */
-	private function _readDefColWidth()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; default column width
-		$width = self::_GetInt2d($recordData, 0);
-		if ($width != 8) {
-			$this->_phpSheet->getDefaultColumnDimension()->setWidth($width);
-		}
-	}
-
-
-	/**
-	 * Read COLINFO record
-	 */
-	private function _readColInfo()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; index to first column in range
-			$fc = self::_GetInt2d($recordData, 0); // first column index
-
-			// offset: 2; size: 2; index to last column in range
-			$lc = self::_GetInt2d($recordData, 2); // first column index
-
-			// offset: 4; size: 2; width of the column in 1/256 of the width of the zero character
-			$width = self::_GetInt2d($recordData, 4);
-
-			// offset: 6; size: 2; index to XF record for default column formatting
-			$xfIndex = self::_GetInt2d($recordData, 6);
-
-			// offset: 8; size: 2; option flags
-
-				// bit: 0; mask: 0x0001; 1= columns are hidden
-				$isHidden = (0x0001 & self::_GetInt2d($recordData, 8)) >> 0;
-
-				// bit: 10-8; mask: 0x0700; outline level of the columns (0 = no outline)
-				$level = (0x0700 & self::_GetInt2d($recordData, 8)) >> 8;
-
-				// bit: 12; mask: 0x1000; 1 = collapsed
-				$isCollapsed = (0x1000 & self::_GetInt2d($recordData, 8)) >> 12;
-
-			// offset: 10; size: 2; not used
-
-			for ($i = $fc; $i <= $lc; ++$i) {
-				if ($lc == 255 || $lc == 256) {
-					$this->_phpSheet->getDefaultColumnDimension()->setWidth($width / 256);
-					break;
-				}
-				$this->_phpSheet->getColumnDimensionByColumn($i)->setWidth($width / 256);
-				$this->_phpSheet->getColumnDimensionByColumn($i)->setVisible(!$isHidden);
-				$this->_phpSheet->getColumnDimensionByColumn($i)->setOutlineLevel($level);
-				$this->_phpSheet->getColumnDimensionByColumn($i)->setCollapsed($isCollapsed);
-				$this->_phpSheet->getColumnDimensionByColumn($i)->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-	}
-
-
-	/**
-	 * ROW
-	 *
-	 * This record contains the properties of a single row in a
-	 * sheet. Rows and cells in a sheet are divided into blocks
-	 * of 32 rows.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readRow()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; index of this row
-			$r = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 2; index to column of the first cell which is described by a cell record
-
-			// offset: 4; size: 2; index to column of the last cell which is described by a cell record, increased by 1
-
-			// offset: 6; size: 2;
-
-			// bit: 14-0; mask: 0x7FFF; height of the row, in twips = 1/20 of a point
-			$height = (0x7FFF & self::_GetInt2d($recordData, 6)) >> 0;
-
-			// bit: 15: mask: 0x8000; 0 = row has custom height; 1= row has default height
-			$useDefaultHeight = (0x8000 & self::_GetInt2d($recordData, 6)) >> 15;
-
-			if (!$useDefaultHeight) {
-				$this->_phpSheet->getRowDimension($r + 1)->setRowHeight($height / 20);
-			}
-
-			// offset: 8; size: 2; not used
-
-			// offset: 10; size: 2; not used in BIFF5-BIFF8
-
-			// offset: 12; size: 4; option flags and default row formatting
-
-			// bit: 2-0: mask: 0x00000007; outline level of the row
-			$level = (0x00000007 & self::_GetInt4d($recordData, 12)) >> 0;
-			$this->_phpSheet->getRowDimension($r + 1)->setOutlineLevel($level);
-
-			// bit: 4; mask: 0x00000010; 1 = outline group start or ends here... and is collapsed
-			$isCollapsed = (0x00000010 & self::_GetInt4d($recordData, 12)) >> 4;
-			$this->_phpSheet->getRowDimension($r + 1)->setCollapsed($isCollapsed);
-
-			// bit: 5; mask: 0x00000020; 1 = row is hidden
-			$isHidden = (0x00000020 & self::_GetInt4d($recordData, 12)) >> 5;
-			$this->_phpSheet->getRowDimension($r + 1)->setVisible(!$isHidden);
-
-			// bit: 7; mask: 0x00000080; 1 = row has explicit format
-			$hasExplicitFormat = (0x00000080 & self::_GetInt4d($recordData, 12)) >> 7;
-
-			// bit: 27-16; mask: 0x0FFF0000; only applies when hasExplicitFormat = 1; index to XF record
-			$xfIndex = (0x0FFF0000 & self::_GetInt4d($recordData, 12)) >> 16;
-
-			if ($hasExplicitFormat) {
-				$this->_phpSheet->getRowDimension($r + 1)->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-	}
-
-
-	/**
-	 * Read RK record
-	 * This record represents a cell that contains an RK value
-	 * (encoded integer or floating-point value). If a
-	 * floating-point value cannot be encoded to an RK value,
-	 * a NUMBER record will be written. This record replaces the
-	 * record INTEGER written in BIFF2.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readRk()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; index to column
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset: 4; size: 2; index to XF record
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// offset: 6; size: 4; RK value
-			$rknum = self::_GetInt4d($recordData, 6);
-			$numValue = self::_GetIEEE754($rknum);
-
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			if (!$this->_readDataOnly) {
-				// add style information
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-
-			// add cell
-			$cell->setValueExplicit($numValue, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-		}
-	}
-
-
-	/**
-	 * Read LABELSST record
-	 * This record represents a cell that contains a string. It
-	 * replaces the LABEL record and RSTRING record used in
-	 * BIFF2-BIFF5.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readLabelSst()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; index to column
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset: 4; size: 2; index to XF record
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// offset: 6; size: 4; index to SST record
-			$index = self::_GetInt4d($recordData, 6);
-
-			// add cell
-			if (($fmtRuns = $this->_sst[$index]['fmtRuns']) && !$this->_readDataOnly) {
-				// then we should treat as rich text
-				$richText = new PHPExcel_RichText();
-				$charPos = 0;
-				$sstCount = count($this->_sst[$index]['fmtRuns']);
-				for ($i = 0; $i <= $sstCount; ++$i) {
-					if (isset($fmtRuns[$i])) {
-						$text = PHPExcel_Shared_String::Substring($this->_sst[$index]['value'], $charPos, $fmtRuns[$i]['charPos'] - $charPos);
-						$charPos = $fmtRuns[$i]['charPos'];
-					} else {
-						$text = PHPExcel_Shared_String::Substring($this->_sst[$index]['value'], $charPos, PHPExcel_Shared_String::CountCharacters($this->_sst[$index]['value']));
-					}
-
-					if (PHPExcel_Shared_String::CountCharacters($text) > 0) {
-						if ($i == 0) { // first text run, no style
-							$richText->createText($text);
-						} else {
-							$textRun = $richText->createTextRun($text);
-							if (isset($fmtRuns[$i - 1])) {
-								if ($fmtRuns[$i - 1]['fontIndex'] < 4) {
-									$fontIndex = $fmtRuns[$i - 1]['fontIndex'];
-								} else {
-									// this has to do with that index 4 is omitted in all BIFF versions for some strange reason
-									// check the OpenOffice documentation of the FONT record
-									$fontIndex = $fmtRuns[$i - 1]['fontIndex'] - 1;
-								}
-								$textRun->setFont(clone $this->_objFonts[$fontIndex]);
-							}
-						}
-					}
-				}
-				$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-				$cell->setValueExplicit($richText, PHPExcel_Cell_DataType::TYPE_STRING);
-			} else {
-				$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-				$cell->setValueExplicit($this->_sst[$index]['value'], PHPExcel_Cell_DataType::TYPE_STRING);
-			}
-
-			if (!$this->_readDataOnly) {
-				// add style information
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-	}
-
-
-	/**
-	 * Read MULRK record
-	 * This record represents a cell range containing RK value
-	 * cells. All cells are located in the same row.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readMulRk()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; index to first column
-		$colFirst = self::_GetInt2d($recordData, 2);
-
-		// offset: var; size: 2; index to last column
-		$colLast = self::_GetInt2d($recordData, $length - 2);
-		$columns = $colLast - $colFirst + 1;
-
-		// offset within record data
-		$offset = 4;
-
-		for ($i = 0; $i < $columns; ++$i) {
-			$columnString = PHPExcel_Cell::stringFromColumnIndex($colFirst + $i);
-
-			// Read cell?
-			if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-
-				// offset: var; size: 2; index to XF record
-				$xfIndex = self::_GetInt2d($recordData, $offset);
-
-				// offset: var; size: 4; RK value
-				$numValue = self::_GetIEEE754(self::_GetInt4d($recordData, $offset + 2));
-				$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-				if (!$this->_readDataOnly) {
-					// add style
-					$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-				}
-
-				// add cell value
-				$cell->setValueExplicit($numValue, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-			}
-
-			$offset += 6;
-		}
-	}
-
-
-	/**
-	 * Read NUMBER record
-	 * This record represents a cell that contains a
-	 * floating-point value.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readNumber()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size 2; index to column
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset 4; size: 2; index to XF record
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			$numValue = self::_extractNumber(substr($recordData, 6, 8));
-
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			if (!$this->_readDataOnly) {
-				// add cell style
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-
-			// add cell value
-			$cell->setValueExplicit($numValue, PHPExcel_Cell_DataType::TYPE_NUMERIC);
-		}
-	}
-
-
-	/**
-	 * Read FORMULA record + perhaps a following STRING record if formula result is a string
-	 * This record contains the token array and the result of a
-	 * formula cell.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readFormula()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; row index
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; col index
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// offset: 20: size: variable; formula structure
-		$formulaStructure = substr($recordData, 20);
-
-		// offset: 14: size: 2; option flags, recalculate always, recalculate on open etc.
-		$options = self::_GetInt2d($recordData, 14);
-
-		// bit: 0; mask: 0x0001; 1 = recalculate always
-		// bit: 1; mask: 0x0002; 1 = calculate on open
-		// bit: 2; mask: 0x0008; 1 = part of a shared formula
-		$isPartOfSharedFormula = (bool) (0x0008 & $options);
-
-		// WARNING:
-		// We can apparently not rely on $isPartOfSharedFormula. Even when $isPartOfSharedFormula = true
-		// the formula data may be ordinary formula data, therefore we need to check
-		// explicitly for the tExp token (0x01)
-		$isPartOfSharedFormula = $isPartOfSharedFormula && ord($formulaStructure{2}) == 0x01;
-
-		if ($isPartOfSharedFormula) {
-			// part of shared formula which means there will be a formula with a tExp token and nothing else
-			// get the base cell, grab tExp token
-			$baseRow = self::_GetInt2d($formulaStructure, 3);
-			$baseCol = self::_GetInt2d($formulaStructure, 5);
-			$this->_baseCell = PHPExcel_Cell::stringFromColumnIndex($baseCol). ($baseRow + 1);
-		}
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-
-			if ($isPartOfSharedFormula) {
-				// formula is added to this cell after the sheet has been read
-				$this->_sharedFormulaParts[$columnString . ($row + 1)] = $this->_baseCell;
-			}
-
-			// offset: 16: size: 4; not used
-
-			// offset: 4; size: 2; XF index
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// offset: 6; size: 8; result of the formula
-			if ( (ord($recordData{6}) == 0)
-				&& (ord($recordData{12}) == 255)
-				&& (ord($recordData{13}) == 255) ) {
-
-				// String formula. Result follows in appended STRING record
-				$dataType = PHPExcel_Cell_DataType::TYPE_STRING;
-
-				// read possible SHAREDFMLA record
-				$code = self::_GetInt2d($this->_data, $this->_pos);
-				if ($code == self::XLS_Type_SHAREDFMLA) {
-					$this->_readSharedFmla();
-				}
-
-				// read STRING record
-				$value = $this->_readString();
-
-			} elseif ((ord($recordData{6}) == 1)
-				&& (ord($recordData{12}) == 255)
-				&& (ord($recordData{13}) == 255)) {
-
-				// Boolean formula. Result is in +2; 0=false, 1=true
-				$dataType = PHPExcel_Cell_DataType::TYPE_BOOL;
-				$value = (bool) ord($recordData{8});
-
-			} elseif ((ord($recordData{6}) == 2)
-				&& (ord($recordData{12}) == 255)
-				&& (ord($recordData{13}) == 255)) {
-
-				// Error formula. Error code is in +2
-				$dataType = PHPExcel_Cell_DataType::TYPE_ERROR;
-				$value = self::_mapErrorCode(ord($recordData{8}));
-
-			} elseif ((ord($recordData{6}) == 3)
-				&& (ord($recordData{12}) == 255)
-				&& (ord($recordData{13}) == 255)) {
-
-				// Formula result is a null string
-				$dataType = PHPExcel_Cell_DataType::TYPE_NULL;
-				$value = '';
-
-			} else {
-
-				// forumla result is a number, first 14 bytes like _NUMBER record
-				$dataType = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-				$value = self::_extractNumber(substr($recordData, 6, 8));
-
-			}
-
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			if (!$this->_readDataOnly) {
-				// add cell style
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-
-			// store the formula
-			if (!$isPartOfSharedFormula) {
-				// not part of shared formula
-				// add cell value. If we can read formula, populate with formula, otherwise just used cached value
-				try {
-					if ($this->_version != self::XLS_BIFF8) {
-						throw new Exception('Not BIFF8. Can only read BIFF8 formulas');
-					}
-					$formula = $this->_getFormulaFromStructure($formulaStructure); // get formula in human language
-					$cell->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
-
-				} catch (Exception $e) {
-					$cell->setValueExplicit($value, $dataType);
-				}
-			} else {
-				if ($this->_version == self::XLS_BIFF8) {
-					// do nothing at this point, formula id added later in the code
-				} else {
-					$cell->setValueExplicit($value, $dataType);
-				}
-			}
-
-			// store the cached calculated value
-			$cell->setCalculatedValue($value);
-		}
-	}
-
-
-	/**
-	 * Read a SHAREDFMLA record. This function just stores the binary shared formula in the reader,
-	 * which usually contains relative references.
-	 * These will be used to construct the formula in each shared formula part after the sheet is read.
-	 */
-	private function _readSharedFmla()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0, size: 6; cell range address of the area used by the shared formula, not used for anything
-		$cellRange = substr($recordData, 0, 6);
-		$cellRange = $this->_readBIFF5CellRangeAddressFixed($cellRange); // note: even BIFF8 uses BIFF5 syntax
-
-		// offset: 6, size: 1; not used
-
-		// offset: 7, size: 1; number of existing FORMULA records for this shared formula
-		$no = ord($recordData{7});
-
-		// offset: 8, size: var; Binary token array of the shared formula
-		$formula = substr($recordData, 8);
-
-		// at this point we only store the shared formula for later use
-		$this->_sharedFormulas[$this->_baseCell] = $formula;
-
-	}
-
-
-	/**
-	 * Read a STRING record from current stream position and advance the stream pointer to next record
-	 * This record is used for storing result from FORMULA record when it is a string, and
-	 * it occurs directly after the FORMULA record
-	 *
-	 * @return string The string contents as UTF-8
-	 */
-	private function _readString()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8) {
-			$string = self::_readUnicodeStringLong($recordData);
-			$value = $string['value'];
-		} else {
-			$string = $this->_readByteStringLong($recordData);
-			$value = $string['value'];
-		}
-
-		return $value;
-	}
-
-
-	/**
-	 * Read BOOLERR record
-	 * This record represents a Boolean value or error value
-	 * cell.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readBoolErr()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; row index
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; column index
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset: 4; size: 2; index to XF record
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// offset: 6; size: 1; the boolean value or error value
-			$boolErr = ord($recordData{6});
-
-			// offset: 7; size: 1; 0=boolean; 1=error
-			$isError = ord($recordData{7});
-
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			switch ($isError) {
-				case 0: // boolean
-					$value = (bool) $boolErr;
-
-					// add cell value
-					$cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_BOOL);
-					break;
-
-				case 1: // error type
-					$value = self::_mapErrorCode($boolErr);
-
-					// add cell value
-					$cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_ERROR);
-					break;
-			}
-
-			if (!$this->_readDataOnly) {
-				// add cell style
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-	}
-
-
-	/**
-	 * Read MULBLANK record
-	 * This record represents a cell range of empty cells. All
-	 * cells are located in the same row
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readMulBlank()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; index to first column
-		$fc = self::_GetInt2d($recordData, 2);
-
-		// offset: 4; size: 2 x nc; list of indexes to XF records
-		// add style information
-		if (!$this->_readDataOnly) {
-			for ($i = 0; $i < $length / 2 - 3; ++$i) {
-				$columnString = PHPExcel_Cell::stringFromColumnIndex($fc + $i);
-
-				// Read cell?
-				if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-					$xfIndex = self::_GetInt2d($recordData, 4 + 2 * $i);
-					$this->_phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-				}
-			}
-		}
-
-		// offset: 6; size 2; index to last column (not needed)
-	}
-
-
-	/**
-	 * Read LABEL record
-	 * This record represents a cell that contains a string. In
-	 * BIFF8 it is usually replaced by the LABELSST record.
-	 * Excel still uses this record, if it copies unformatted
-	 * text cells to the clipboard.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readLabel()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; index to row
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; index to column
-		$column = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset: 4; size: 2; XF index
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// add cell value
-			// todo: what if string is very long? continue record
-			if ($this->_version == self::XLS_BIFF8) {
-				$string = self::_readUnicodeStringLong(substr($recordData, 6));
-				$value = $string['value'];
-			} else {
-				$string = $this->_readByteStringLong(substr($recordData, 6));
-				$value = $string['value'];
-			}
-			$cell = $this->_phpSheet->getCell($columnString . ($row + 1));
-			$cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING);
-
-			if (!$this->_readDataOnly) {
-				// add cell style
-				$cell->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-	}
-
-
-	/**
-	 * Read BLANK record
-	 */
-	private function _readBlank()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; row index
-		$row = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; col index
-		$col = self::_GetInt2d($recordData, 2);
-		$columnString = PHPExcel_Cell::stringFromColumnIndex($col);
-
-		// Read cell?
-		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
-			// offset: 4; size: 2; XF index
-			$xfIndex = self::_GetInt2d($recordData, 4);
-
-			// add style information
-			if (!$this->_readDataOnly) {
-				$this->_phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-			}
-		}
-
-	}
-
-
-	/**
-	 * Read MSODRAWING record
-	 */
-	private function _readMsoDrawing()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-
-		// get spliced record data
-		$splicedRecordData = $this->_getSplicedRecordData();
-		$recordData = $splicedRecordData['recordData'];
-
-		$this->_drawingData .= $recordData;
-	}
-
-
-	/**
-	 * Read OBJ record
-	 */
-	private function _readObj()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly || $this->_version != self::XLS_BIFF8) {
-			return;
-		}
-
-		// recordData consists of an array of subrecords looking like this:
-		//	ft: 2 bytes; ftCmo type (0x15)
-		//	cb: 2 bytes; size in bytes of ftCmo data
-		//	ot: 2 bytes; Object Type
-		//	id: 2 bytes; Object id number
-		//	grbit: 2 bytes; Option Flags
-		//	data: var; subrecord data
-
-		// for now, we are just interested in the second subrecord containing the object type
-		$ftCmoType	= self::_GetInt2d($recordData, 0);
-		$cbCmoSize	= self::_GetInt2d($recordData, 2);
-		$otObjType	= self::_GetInt2d($recordData, 4);
-		$idObjID	= self::_GetInt2d($recordData, 6);
-		$grbitOpts	= self::_GetInt2d($recordData, 6);
-
-		$this->_objs[] = array(
-			'ftCmoType'	=> $ftCmoType,
-			'cbCmoSize'	=> $cbCmoSize,
-			'otObjType'	=> $otObjType,
-			'idObjID'	=> $idObjID,
-			'grbitOpts'	=> $grbitOpts
-		);
-		$this->textObjRef = $idObjID;
-
-//		echo '<b>_readObj()</b><br />';
-//		var_dump(end($this->_objs));
-//		echo '<br />';
-	}
-
-
-	/**
-	 * Read WINDOW2 record
-	 */
-	private function _readWindow2()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; option flags
-		$options = self::_GetInt2d($recordData, 0);
-
-		// bit: 1; mask: 0x0002; 0 = do not show gridlines, 1 = show gridlines
-		$showGridlines = (bool) ((0x0002 & $options) >> 1);
-		$this->_phpSheet->setShowGridlines($showGridlines);
-
-		// bit: 2; mask: 0x0004; 0 = do not show headers, 1 = show headers
-		$showRowColHeaders = (bool) ((0x0004 & $options) >> 2);
-		$this->_phpSheet->setShowRowColHeaders($showRowColHeaders);
-
-		// bit: 3; mask: 0x0008; 0 = panes are not frozen, 1 = panes are frozen
-		$this->_frozen = (bool) ((0x0008 & $options) >> 3);
-
-		// bit: 6; mask: 0x0040; 0 = columns from left to right, 1 = columns from right to left
-		$this->_phpSheet->setRightToLeft((bool)((0x0040 & $options) >> 6));
-
-		// bit: 10; mask: 0x0400; 0 = sheet not active, 1 = sheet active
-		$isActive = (bool) ((0x0400 & $options) >> 10);
-		if ($isActive) {
-			$this->_phpExcel->setActiveSheetIndex($this->_phpExcel->getIndex($this->_phpSheet));
-		}
-	}
-
-
-	/**
-	 * Read SCL record
-	 */
-	private function _readScl()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// offset: 0; size: 2; numerator of the view magnification
-		$numerator = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; numerator of the view magnification
-		$denumerator = self::_GetInt2d($recordData, 2);
-
-		// set the zoom scale (in percent)
-		$this->_phpSheet->getSheetView()->setZoomScale($numerator * 100 / $denumerator);
-	}
-
-
-	/**
-	 * Read PANE record
-	 */
-	private function _readPane()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; position of vertical split
-			$px = self::_GetInt2d($recordData, 0);
-
-			// offset: 2; size: 2; position of horizontal split
-			$py = self::_GetInt2d($recordData, 2);
-
-			if ($this->_frozen) {
-				// frozen panes
-				$this->_phpSheet->freezePane(PHPExcel_Cell::stringFromColumnIndex($px) . ($py + 1));
-			} else {
-				// unfrozen panes; split windows; not supported by PHPExcel core
-			}
-		}
-	}
-
-
-	/**
-	 * Read SELECTION record. There is one such record for each pane in the sheet.
-	 */
-	private function _readSelection()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 1; pane identifier
-			$paneId = ord($recordData{0});
-
-			// offset: 1; size: 2; index to row of the active cell
-			$r = self::_GetInt2d($recordData, 1);
-
-			// offset: 3; size: 2; index to column of the active cell
-			$c = self::_GetInt2d($recordData, 3);
-
-			// offset: 5; size: 2; index into the following cell range list to the
-			//  entry that contains the active cell
-			$index = self::_GetInt2d($recordData, 5);
-
-			// offset: 7; size: var; cell range address list containing all selected cell ranges
-			$data = substr($recordData, 7);
-			$cellRangeAddressList = $this->_readBIFF5CellRangeAddressList($data); // note: also BIFF8 uses BIFF5 syntax
-
-			$selectedCells = $cellRangeAddressList['cellRangeAddresses'][0];
-
-			// first row '1' + last row '16384' indicates that full column is selected (apparently also in BIFF8!)
-			if (preg_match('/^([A-Z]+1\:[A-Z]+)16384$/', $selectedCells)) {
-				$selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)16384$/', '${1}1048576', $selectedCells);
-			}
-
-			// first row '1' + last row '65536' indicates that full column is selected
-			if (preg_match('/^([A-Z]+1\:[A-Z]+)65536$/', $selectedCells)) {
-				$selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)65536$/', '${1}1048576', $selectedCells);
-			}
-
-			// first column 'A' + last column 'IV' indicates that full row is selected
-			if (preg_match('/^(A[0-9]+\:)IV([0-9]+)$/', $selectedCells)) {
-				$selectedCells = preg_replace('/^(A[0-9]+\:)IV([0-9]+)$/', '${1}XFD${2}', $selectedCells);
-			}
-
-			$this->_phpSheet->setSelectedCells($selectedCells);
-		}
-	}
-
-
-	private function _includeCellRangeFiltered($cellRangeAddress)
-	{
-		$includeCellRange = true;
-		if ($this->getReadFilter() !== NULL) {
-			$includeCellRange = false;
-			$rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($cellRangeAddress);
-			$rangeBoundaries[1][0]++;
-			for ($row = $rangeBoundaries[0][1]; $row <= $rangeBoundaries[1][1]; $row++) {
-				for ($column = $rangeBoundaries[0][0]; $column != $rangeBoundaries[1][0]; $column++) {
-					if ($this->getReadFilter()->readCell($column, $row, $this->_phpSheet->getTitle())) {
-						$includeCellRange = true;
-						break 2;
-					}
-				}
-			}
-		}
-		return $includeCellRange;
-	}
-
-
-	/**
-	 * MERGEDCELLS
-	 *
-	 * This record contains the addresses of merged cell ranges
-	 * in the current sheet.
-	 *
-	 * --	"OpenOffice.org's Documentation of the Microsoft
-	 * 		Excel File Format"
-	 */
-	private function _readMergedCells()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
-			$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList($recordData);
-			foreach ($cellRangeAddressList['cellRangeAddresses'] as $cellRangeAddress) {
-				if ((strpos($cellRangeAddress,':') !== FALSE) &&
-					($this->_includeCellRangeFiltered($cellRangeAddress))) {
-					$this->_phpSheet->mergeCells($cellRangeAddress);
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * Read HYPERLINK record
-	 */
-	private function _readHyperLink()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer forward to next record
-		$this->_pos += 4 + $length;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 8; cell range address of all cells containing this hyperlink
-			try {
-				$cellRange = $this->_readBIFF8CellRangeAddressFixed($recordData, 0, 8);
-			} catch (Exception $e) {
-				return;
-			}
-
-			// offset: 8, size: 16; GUID of StdLink
-
-			// offset: 24, size: 4; unknown value
-
-			// offset: 28, size: 4; option flags
-
-				// bit: 0; mask: 0x00000001; 0 = no link or extant, 1 = file link or URL
-				$isFileLinkOrUrl = (0x00000001 & self::_GetInt2d($recordData, 28)) >> 0;
-
-				// bit: 1; mask: 0x00000002; 0 = relative path, 1 = absolute path or URL
-				$isAbsPathOrUrl = (0x00000001 & self::_GetInt2d($recordData, 28)) >> 1;
-
-				// bit: 2 (and 4); mask: 0x00000014; 0 = no description
-				$hasDesc = (0x00000014 & self::_GetInt2d($recordData, 28)) >> 2;
-
-				// bit: 3; mask: 0x00000008; 0 = no text, 1 = has text
-				$hasText = (0x00000008 & self::_GetInt2d($recordData, 28)) >> 3;
-
-				// bit: 7; mask: 0x00000080; 0 = no target frame, 1 = has target frame
-				$hasFrame = (0x00000080 & self::_GetInt2d($recordData, 28)) >> 7;
-
-				// bit: 8; mask: 0x00000100; 0 = file link or URL, 1 = UNC path (inc. server name)
-				$isUNC = (0x00000100 & self::_GetInt2d($recordData, 28)) >> 8;
-
-			// offset within record data
-			$offset = 32;
-
-			if ($hasDesc) {
-				// offset: 32; size: var; character count of description text
-				$dl = self::_GetInt4d($recordData, 32);
-				// offset: 36; size: var; character array of description text, no Unicode string header, always 16-bit characters, zero terminated
-				$desc = self::_encodeUTF16(substr($recordData, 36, 2 * ($dl - 1)), false);
-				$offset += 4 + 2 * $dl;
-			}
-			if ($hasFrame) {
-				$fl = self::_GetInt4d($recordData, $offset);
-				$offset += 4 + 2 * $fl;
-			}
-
-			// detect type of hyperlink (there are 4 types)
-			$hyperlinkType = null;
-
-			if ($isUNC) {
-				$hyperlinkType = 'UNC';
-			} else if (!$isFileLinkOrUrl) {
-				$hyperlinkType = 'workbook';
-			} else if (ord($recordData{$offset}) == 0x03) {
-				$hyperlinkType = 'local';
-			} else if (ord($recordData{$offset}) == 0xE0) {
-				$hyperlinkType = 'URL';
-			}
-
-			switch ($hyperlinkType) {
-			case 'URL':
-				// section 5.58.2: Hyperlink containing a URL
-				// e.g. http://example.org/index.php
-
-				// offset: var; size: 16; GUID of URL Moniker
-				$offset += 16;
-				// offset: var; size: 4; size (in bytes) of character array of the URL including trailing zero word
-				$us = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
-				// offset: var; size: $us; character array of the URL, no Unicode string header, always 16-bit characters, zero-terminated
-				$url = self::_encodeUTF16(substr($recordData, $offset, $us - 2), false);
-				$url .= $hasText ? '#' : '';
-				$offset += $us;
-				break;
-
-			case 'local':
-				// section 5.58.3: Hyperlink to local file
-				// examples:
-				//   mydoc.txt
-				//   ../../somedoc.xls#Sheet!A1
-
-				// offset: var; size: 16; GUI of File Moniker
-				$offset += 16;
-
-				// offset: var; size: 2; directory up-level count.
-				$upLevelCount = self::_GetInt2d($recordData, $offset);
-				$offset += 2;
-
-				// offset: var; size: 4; character count of the shortened file path and name, including trailing zero word
-				$sl = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
-
-				// offset: var; size: sl; character array of the shortened file path and name in 8.3-DOS-format (compressed Unicode string)
-				$shortenedFilePath = substr($recordData, $offset, $sl);
-				$shortenedFilePath = self::_encodeUTF16($shortenedFilePath, true);
-				$shortenedFilePath = substr($shortenedFilePath, 0, -1); // remove trailing zero
-
-				$offset += $sl;
-
-				// offset: var; size: 24; unknown sequence
-				$offset += 24;
-
-				// extended file path
-				// offset: var; size: 4; size of the following file link field including string lenth mark
-				$sz = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
-
-				// only present if $sz > 0
-				if ($sz > 0) {
-					// offset: var; size: 4; size of the character array of the extended file path and name
-					$xl = self::_GetInt4d($recordData, $offset);
-					$offset += 4;
-
-					// offset: var; size 2; unknown
-					$offset += 2;
-
-					// offset: var; size $xl; character array of the extended file path and name.
-					$extendedFilePath = substr($recordData, $offset, $xl);
-					$extendedFilePath = self::_encodeUTF16($extendedFilePath, false);
-					$offset += $xl;
-				}
-
-				// construct the path
-				$url = str_repeat('..\\', $upLevelCount);
-				$url .= ($sz > 0) ?
-					$extendedFilePath : $shortenedFilePath; // use extended path if available
-				$url .= $hasText ? '#' : '';
-
-				break;
-
-
-			case 'UNC':
-				// section 5.58.4: Hyperlink to a File with UNC (Universal Naming Convention) Path
-				// todo: implement
-				return;
-
-			case 'workbook':
-				// section 5.58.5: Hyperlink to the Current Workbook
-				// e.g. Sheet2!B1:C2, stored in text mark field
-				$url = 'sheet://';
-				break;
-
-			default:
-				return;
-
-			}
-
-			if ($hasText) {
-				// offset: var; size: 4; character count of text mark including trailing zero word
-				$tl = self::_GetInt4d($recordData, $offset);
-				$offset += 4;
-				// offset: var; size: var; character array of the text mark without the # sign, no Unicode header, always 16-bit characters, zero-terminated
-				$text = self::_encodeUTF16(substr($recordData, $offset, 2 * ($tl - 1)), false);
-				$url .= $text;
-			}
-
-			// apply the hyperlink to all the relevant cells
-			foreach (PHPExcel_Cell::extractAllCellReferencesInRange($cellRange) as $coordinate) {
-				$this->_phpSheet->getCell($coordinate)->getHyperLink()->setUrl($url);
-			}
-		}
-	}
-
-
-	/**
-	 * Read DATAVALIDATIONS record
-	 */
-	private function _readDataValidations()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer forward to next record
-		$this->_pos += 4 + $length;
-	}
-
-
-	/**
-	 * Read DATAVALIDATION record
-	 */
-	private function _readDataValidation()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer forward to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// offset: 0; size: 4; Options
-		$options = self::_GetInt4d($recordData, 0);
-
-		// bit: 0-3; mask: 0x0000000F; type
-		$type = (0x0000000F & $options) >> 0;
-		switch ($type) {
-			case 0x00:	$type = PHPExcel_Cell_DataValidation::TYPE_NONE;		break;
-			case 0x01:	$type = PHPExcel_Cell_DataValidation::TYPE_WHOLE;		break;
-			case 0x02:	$type = PHPExcel_Cell_DataValidation::TYPE_DECIMAL;		break;
-			case 0x03:	$type = PHPExcel_Cell_DataValidation::TYPE_LIST;		break;
-			case 0x04:	$type = PHPExcel_Cell_DataValidation::TYPE_DATE;		break;
-			case 0x05:	$type = PHPExcel_Cell_DataValidation::TYPE_TIME;		break;
-			case 0x06:	$type = PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH;	break;
-			case 0x07:	$type = PHPExcel_Cell_DataValidation::TYPE_CUSTOM;		break;
-		}
-
-		// bit: 4-6; mask: 0x00000070; error type
-		$errorStyle = (0x00000070 & $options) >> 4;
-		switch ($errorStyle) {
-			case 0x00:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP;			break;
-			case 0x01:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_WARNING;		break;
-			case 0x02:	$errorStyle = PHPExcel_Cell_DataValidation::STYLE_INFORMATION;	break;
-		}
-
-		// bit: 7; mask: 0x00000080; 1= formula is explicit (only applies to list)
-		// I have only seen cases where this is 1
-		$explicitFormula = (0x00000080 & $options) >> 7;
-
-		// bit: 8; mask: 0x00000100; 1= empty cells allowed
-		$allowBlank = (0x00000100 & $options) >> 8;
-
-		// bit: 9; mask: 0x00000200; 1= suppress drop down arrow in list type validity
-		$suppressDropDown = (0x00000200 & $options) >> 9;
-
-		// bit: 18; mask: 0x00040000; 1= show prompt box if cell selected
-		$showInputMessage = (0x00040000 & $options) >> 18;
-
-		// bit: 19; mask: 0x00080000; 1= show error box if invalid values entered
-		$showErrorMessage = (0x00080000 & $options) >> 19;
-
-		// bit: 20-23; mask: 0x00F00000; condition operator
-		$operator = (0x00F00000 & $options) >> 20;
-		switch ($operator) {
-			case 0x00: $operator = PHPExcel_Cell_DataValidation::OPERATOR_BETWEEN			;	break;
-			case 0x01: $operator = PHPExcel_Cell_DataValidation::OPERATOR_NOTBETWEEN		;	break;
-			case 0x02: $operator = PHPExcel_Cell_DataValidation::OPERATOR_EQUAL				;	break;
-			case 0x03: $operator = PHPExcel_Cell_DataValidation::OPERATOR_NOTEQUAL			;	break;
-			case 0x04: $operator = PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHAN		;	break;
-			case 0x05: $operator = PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN			;	break;
-			case 0x06: $operator = PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL;	break;
-			case 0x07: $operator = PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL	;	break;
-		}
-
-		// offset: 4; size: var; title of the prompt box
-		$offset = 4;
-		$string = self::_readUnicodeStringLong(substr($recordData, $offset));
-		$promptTitle = $string['value'] !== chr(0) ?
-			$string['value'] : '';
-		$offset += $string['size'];
-
-		// offset: var; size: var; title of the error box
-		$string = self::_readUnicodeStringLong(substr($recordData, $offset));
-		$errorTitle = $string['value'] !== chr(0) ?
-			$string['value'] : '';
-		$offset += $string['size'];
-
-		// offset: var; size: var; text of the prompt box
-		$string = self::_readUnicodeStringLong(substr($recordData, $offset));
-		$prompt = $string['value'] !== chr(0) ?
-			$string['value'] : '';
-		$offset += $string['size'];
-
-		// offset: var; size: var; text of the error box
-		$string = self::_readUnicodeStringLong(substr($recordData, $offset));
-		$error = $string['value'] !== chr(0) ?
-			$string['value'] : '';
-		$offset += $string['size'];
-
-		// offset: var; size: 2; size of the formula data for the first condition
-		$sz1 = self::_GetInt2d($recordData, $offset);
-		$offset += 2;
-
-		// offset: var; size: 2; not used
-		$offset += 2;
-
-		// offset: var; size: $sz1; formula data for first condition (without size field)
-		$formula1 = substr($recordData, $offset, $sz1);
-		$formula1 = pack('v', $sz1) . $formula1; // prepend the length
-		try {
-			$formula1 = $this->_getFormulaFromStructure($formula1);
-
-			// in list type validity, null characters are used as item separators
-			if ($type == PHPExcel_Cell_DataValidation::TYPE_LIST) {
-				$formula1 = str_replace(chr(0), ',', $formula1);
-			}
-		} catch (Exception $e) {
-			return;
-		}
-		$offset += $sz1;
-
-		// offset: var; size: 2; size of the formula data for the first condition
-		$sz2 = self::_GetInt2d($recordData, $offset);
-		$offset += 2;
-
-		// offset: var; size: 2; not used
-		$offset += 2;
-
-		// offset: var; size: $sz2; formula data for second condition (without size field)
-		$formula2 = substr($recordData, $offset, $sz2);
-		$formula2 = pack('v', $sz2) . $formula2; // prepend the length
-		try {
-			$formula2 = $this->_getFormulaFromStructure($formula2);
-		} catch (Exception $e) {
-			return;
-		}
-		$offset += $sz2;
-
-		// offset: var; size: var; cell range address list with
-		$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList(substr($recordData, $offset));
-		$cellRangeAddresses = $cellRangeAddressList['cellRangeAddresses'];
-
-		foreach ($cellRangeAddresses as $cellRange) {
-			$stRange = $this->_phpSheet->shrinkRangeToFit($cellRange);
-			$stRange = PHPExcel_Cell::extractAllCellReferencesInRange($stRange);
-			foreach ($stRange as $coordinate) {
-				$objValidation = $this->_phpSheet->getCell($coordinate)->getDataValidation();
-				$objValidation->setType($type);
-				$objValidation->setErrorStyle($errorStyle);
-				$objValidation->setAllowBlank((bool)$allowBlank);
-				$objValidation->setShowInputMessage((bool)$showInputMessage);
-				$objValidation->setShowErrorMessage((bool)$showErrorMessage);
-				$objValidation->setShowDropDown(!$suppressDropDown);
-				$objValidation->setOperator($operator);
-				$objValidation->setErrorTitle($errorTitle);
-				$objValidation->setError($error);
-				$objValidation->setPromptTitle($promptTitle);
-				$objValidation->setPrompt($prompt);
-				$objValidation->setFormula1($formula1);
-				$objValidation->setFormula2($formula2);
-			}
-		}
-
-	}
-
-
-	/**
-	 * Read SHEETLAYOUT record. Stores sheet tab color information.
-	 */
-	private function _readSheetLayout()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// local pointer in record data
-		$offset = 0;
-
-		if (!$this->_readDataOnly) {
-			// offset: 0; size: 2; repeated record identifier 0x0862
-
-			// offset: 2; size: 10; not used
-
-			// offset: 12; size: 4; size of record data
-			// Excel 2003 uses size of 0x14 (documented), Excel 2007 uses size of 0x28 (not documented?)
-			$sz = self::_GetInt4d($recordData, 12);
-
-			switch ($sz) {
-				case 0x14:
-					// offset: 16; size: 2; color index for sheet tab
-					$colorIndex = self::_GetInt2d($recordData, 16);
-					$color = self::_readColor($colorIndex,$this->_palette,$this->_version);
-					$this->_phpSheet->getTabColor()->setRGB($color['rgb']);
-					break;
-
-				case 0x28:
-					// TODO: Investigate structure for .xls SHEETLAYOUT record as saved by MS Office Excel 2007
-					return;
-					break;
-			}
-		}
-	}
-
-
-	/**
-	 * Read SHEETPROTECTION record (FEATHEADR)
-	 */
-	private function _readSheetProtection()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		if ($this->_readDataOnly) {
-			return;
-		}
-
-		// offset: 0; size: 2; repeated record header
-
-		// offset: 2; size: 2; FRT cell reference flag (=0 currently)
-
-		// offset: 4; size: 8; Currently not used and set to 0
-
-		// offset: 12; size: 2; Shared feature type index (2=Enhanced Protetion, 4=SmartTag)
-		$isf = self::_GetInt2d($recordData, 12);
-		if ($isf != 2) {
-			return;
-		}
-
-		// offset: 14; size: 1; =1 since this is a feat header
-
-		// offset: 15; size: 4; size of rgbHdrSData
-
-		// rgbHdrSData, assume "Enhanced Protection"
-		// offset: 19; size: 2; option flags
-		$options = self::_GetInt2d($recordData, 19);
-
-		// bit: 0; mask 0x0001; 1 = user may edit objects, 0 = users must not edit objects
-		$bool = (0x0001 & $options) >> 0;
-		$this->_phpSheet->getProtection()->setObjects(!$bool);
-
-		// bit: 1; mask 0x0002; edit scenarios
-		$bool = (0x0002 & $options) >> 1;
-		$this->_phpSheet->getProtection()->setScenarios(!$bool);
-
-		// bit: 2; mask 0x0004; format cells
-		$bool = (0x0004 & $options) >> 2;
-		$this->_phpSheet->getProtection()->setFormatCells(!$bool);
-
-		// bit: 3; mask 0x0008; format columns
-		$bool = (0x0008 & $options) >> 3;
-		$this->_phpSheet->getProtection()->setFormatColumns(!$bool);
-
-		// bit: 4; mask 0x0010; format rows
-		$bool = (0x0010 & $options) >> 4;
-		$this->_phpSheet->getProtection()->setFormatRows(!$bool);
-
-		// bit: 5; mask 0x0020; insert columns
-		$bool = (0x0020 & $options) >> 5;
-		$this->_phpSheet->getProtection()->setInsertColumns(!$bool);
-
-		// bit: 6; mask 0x0040; insert rows
-		$bool = (0x0040 & $options) >> 6;
-		$this->_phpSheet->getProtection()->setInsertRows(!$bool);
-
-		// bit: 7; mask 0x0080; insert hyperlinks
-		$bool = (0x0080 & $options) >> 7;
-		$this->_phpSheet->getProtection()->setInsertHyperlinks(!$bool);
-
-		// bit: 8; mask 0x0100; delete columns
-		$bool = (0x0100 & $options) >> 8;
-		$this->_phpSheet->getProtection()->setDeleteColumns(!$bool);
-
-		// bit: 9; mask 0x0200; delete rows
-		$bool = (0x0200 & $options) >> 9;
-		$this->_phpSheet->getProtection()->setDeleteRows(!$bool);
-
-		// bit: 10; mask 0x0400; select locked cells
-		$bool = (0x0400 & $options) >> 10;
-		$this->_phpSheet->getProtection()->setSelectLockedCells(!$bool);
-
-		// bit: 11; mask 0x0800; sort cell range
-		$bool = (0x0800 & $options) >> 11;
-		$this->_phpSheet->getProtection()->setSort(!$bool);
-
-		// bit: 12; mask 0x1000; auto filter
-		$bool = (0x1000 & $options) >> 12;
-		$this->_phpSheet->getProtection()->setAutoFilter(!$bool);
-
-		// bit: 13; mask 0x2000; pivot tables
-		$bool = (0x2000 & $options) >> 13;
-		$this->_phpSheet->getProtection()->setPivotTables(!$bool);
-
-		// bit: 14; mask 0x4000; select unlocked cells
-		$bool = (0x4000 & $options) >> 14;
-		$this->_phpSheet->getProtection()->setSelectUnlockedCells(!$bool);
-
-		// offset: 21; size: 2; not used
-	}
-
-
-	/**
-	 * Read RANGEPROTECTION record
-	 * Reading of this record is based on Microsoft Office Excel 97-2000 Binary File Format Specification,
-	 * where it is referred to as FEAT record
-	 */
-	private function _readRangeProtection()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-		// local pointer in record data
-		$offset = 0;
-
-		if (!$this->_readDataOnly) {
-			$offset += 12;
-
-			// offset: 12; size: 2; shared feature type, 2 = enhanced protection, 4 = smart tag
-			$isf = self::_GetInt2d($recordData, 12);
-			if ($isf != 2) {
-				// we only read FEAT records of type 2
-				return;
-			}
-			$offset += 2;
-
-			$offset += 5;
-
-			// offset: 19; size: 2; count of ref ranges this feature is on
-			$cref = self::_GetInt2d($recordData, 19);
-			$offset += 2;
-
-			$offset += 6;
-
-			// offset: 27; size: 8 * $cref; list of cell ranges (like in hyperlink record)
-			$cellRanges = array();
-			for ($i = 0; $i < $cref; ++$i) {
-				try {
-					$cellRange = $this->_readBIFF8CellRangeAddressFixed(substr($recordData, 27 + 8 * $i, 8));
-				} catch (Exception $e) {
-					return;
-				}
-				$cellRanges[] = $cellRange;
-				$offset += 8;
-			}
-
-			// offset: var; size: var; variable length of feature specific data
-			$rgbFeat = substr($recordData, $offset);
-			$offset += 4;
-
-			// offset: var; size: 4; the encrypted password (only 16-bit although field is 32-bit)
-			$wPassword = self::_GetInt4d($recordData, $offset);
-			$offset += 4;
-
-			// Apply range protection to sheet
-			if ($cellRanges) {
-				$this->_phpSheet->protectCells(implode(' ', $cellRanges), strtoupper(dechex($wPassword)), true);
-			}
-		}
-	}
-
-
-	/**
-	 * Read IMDATA record
-	 */
-	private function _readImData()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-
-		// get spliced record data
-		$splicedRecordData = $this->_getSplicedRecordData();
-		$recordData = $splicedRecordData['recordData'];
-
-		// UNDER CONSTRUCTION
-
-		// offset: 0; size: 2; image format
-		$cf = self::_GetInt2d($recordData, 0);
-
-		// offset: 2; size: 2; environment from which the file was written
-		$env = self::_GetInt2d($recordData, 2);
-
-		// offset: 4; size: 4; length of the image data
-		$lcb = self::_GetInt4d($recordData, 4);
-
-		// offset: 8; size: var; image data
-		$iData = substr($recordData, 8);
-
-		switch ($cf) {
-		case 0x09: // Windows bitmap format
-			// BITMAPCOREINFO
-			// 1. BITMAPCOREHEADER
-			// offset: 0; size: 4; bcSize, Specifies the number of bytes required by the structure
-			$bcSize = self::_GetInt4d($iData, 0);
-//			var_dump($bcSize);
-
-			// offset: 4; size: 2; bcWidth, specifies the width of the bitmap, in pixels
-			$bcWidth = self::_GetInt2d($iData, 4);
-//			var_dump($bcWidth);
-
-			// offset: 6; size: 2; bcHeight, specifies the height of the bitmap, in pixels.
-			$bcHeight = self::_GetInt2d($iData, 6);
-//			var_dump($bcHeight);
-			$ih = imagecreatetruecolor($bcWidth, $bcHeight);
-
-			// offset: 8; size: 2; bcPlanes, specifies the number of planes for the target device. This value must be 1
-
-			// offset: 10; size: 2; bcBitCount specifies the number of bits-per-pixel. This value must be 1, 4, 8, or 24
-			$bcBitCount = self::_GetInt2d($iData, 10);
-//			var_dump($bcBitCount);
-
-			$rgbString = substr($iData, 12);
-			$rgbTriples = array();
-			while (strlen($rgbString) > 0) {
-				$rgbTriples[] = unpack('Cb/Cg/Cr', $rgbString);
-				$rgbString = substr($rgbString, 3);
-			}
-			$x = 0;
-			$y = 0;
-			foreach ($rgbTriples as $i => $rgbTriple) {
-				$color = imagecolorallocate($ih, $rgbTriple['r'], $rgbTriple['g'], $rgbTriple['b']);
-				imagesetpixel($ih, $x, $bcHeight - 1 - $y, $color);
-				$x = ($x + 1) % $bcWidth;
-				$y = $y + floor(($x + 1) / $bcWidth);
-			}
-			//imagepng($ih, 'image.png');
-
-			$drawing = new PHPExcel_Worksheet_Drawing();
-			$drawing->setPath($filename);
-			$drawing->setWorksheet($this->_phpSheet);
-
-			break;
-
-		case 0x02: // Windows metafile or Macintosh PICT format
-		case 0x0e: // native format
-		default;
-			break;
-
-		}
-
-		// _getSplicedRecordData() takes care of moving current position in data stream
-	}
-
-
-	/**
-	 * Read a free CONTINUE record. Free CONTINUE record may be a camouflaged MSODRAWING record
-	 * When MSODRAWING data on a sheet exceeds 8224 bytes, CONTINUE records are used instead. Undocumented.
-	 * In this case, we must treat the CONTINUE record as a MSODRAWING record
-	 */
-	private function _readContinue()
-	{
-		$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-		$recordData = substr($this->_data, $this->_pos + 4, $length);
-
-		// check if we are reading drawing data
-		// this is in case a free CONTINUE record occurs in other circumstances we are unaware of
-		if ($this->_drawingData == '') {
-			// move stream pointer to next record
-			$this->_pos += 4 + $length;
-
-			return;
-		}
-
-		// check if record data is at least 4 bytes long, otherwise there is no chance this is MSODRAWING data
-		if ($length < 4) {
-			// move stream pointer to next record
-			$this->_pos += 4 + $length;
-
-			return;
-		}
-
-		// dirty check to see if CONTINUE record could be a camouflaged MSODRAWING record
-		// look inside CONTINUE record to see if it looks like a part of an Escher stream
-		// we know that Escher stream may be split at least at
-		//		0xF003 MsofbtSpgrContainer
-		//		0xF004 MsofbtSpContainer
-		//		0xF00D MsofbtClientTextbox
-		$validSplitPoints = array(0xF003, 0xF004, 0xF00D); // add identifiers if we find more
-
-		$splitPoint = self::_GetInt2d($recordData, 2);
-		if (in_array($splitPoint, $validSplitPoints)) {
-			// get spliced record data (and move pointer to next record)
-			$splicedRecordData = $this->_getSplicedRecordData();
-			$this->_drawingData .= $splicedRecordData['recordData'];
-
-			return;
-		}
-
-		// move stream pointer to next record
-		$this->_pos += 4 + $length;
-
-	}
-
-
-	/**
-	 * Reads a record from current position in data stream and continues reading data as long as CONTINUE
-	 * records are found. Splices the record data pieces and returns the combined string as if record data
-	 * is in one piece.
-	 * Moves to next current position in data stream to start of next record different from a CONtINUE record
-	 *
-	 * @return array
-	 */
-	private function _getSplicedRecordData()
-	{
-		$data = '';
-		$spliceOffsets = array();
-
-		$i = 0;
-		$spliceOffsets[0] = 0;
-
-		do {
-			++$i;
-
-			// offset: 0; size: 2; identifier
-			$identifier = self::_GetInt2d($this->_data, $this->_pos);
-			// offset: 2; size: 2; length
-			$length = self::_GetInt2d($this->_data, $this->_pos + 2);
-			$data .= substr($this->_data, $this->_pos + 4, $length);
-
-			$spliceOffsets[$i] = $spliceOffsets[$i - 1] + $length;
-
-			$this->_pos += 4 + $length;
-			$nextIdentifier = self::_GetInt2d($this->_data, $this->_pos);
-		}
-		while ($nextIdentifier == self::XLS_Type_CONTINUE);
-
-		$splicedData = array(
-			'recordData' => $data,
-			'spliceOffsets' => $spliceOffsets,
-		);
-
-		return $splicedData;
-
-	}
-
-
-	/**
-	 * Convert formula structure into human readable Excel formula like 'A3+A5*5'
-	 *
-	 * @param string $formulaStructure The complete binary data for the formula
-	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-	 * @return string Human readable formula
-	 */
-	private function _getFormulaFromStructure($formulaStructure, $baseCell = 'A1')
-	{
-		// offset: 0; size: 2; size of the following formula data
-		$sz = self::_GetInt2d($formulaStructure, 0);
-
-		// offset: 2; size: sz
-		$formulaData = substr($formulaStructure, 2, $sz);
-
-		// for debug: dump the formula data
-		//echo '<xmp>';
-		//echo 'size: ' . $sz . "\n";
-		//echo 'the entire formula data: ';
-		//Debug::dump($formulaData);
-		//echo "\n----\n";
-
-		// offset: 2 + sz; size: variable (optional)
-		if (strlen($formulaStructure) > 2 + $sz) {
-			$additionalData = substr($formulaStructure, 2 + $sz);
-
-			// for debug: dump the additional data
-			//echo 'the entire additional data: ';
-			//Debug::dump($additionalData);
-			//echo "\n----\n";
-
-		} else {
-			$additionalData = '';
-		}
-
-		return $this->_getFormulaFromData($formulaData, $additionalData, $baseCell);
-	}
-
-
-	/**
-	 * Take formula data and additional data for formula and return human readable formula
-	 *
-	 * @param string $formulaData The binary data for the formula itself
-	 * @param string $additionalData Additional binary data going with the formula
-	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-	 * @return string Human readable formula
-	 */
-	private function _getFormulaFromData($formulaData,  $additionalData = '', $baseCell = 'A1')
-	{
-		// start parsing the formula data
-		$tokens = array();
-
-		while (strlen($formulaData) > 0 and $token = $this->_getNextToken($formulaData, $baseCell)) {
-			$tokens[] = $token;
-			$formulaData = substr($formulaData, $token['size']);
-
-			// for debug: dump the token
-			//var_dump($token);
-		}
-
-		$formulaString = $this->_createFormulaFromTokens($tokens, $additionalData);
-
-		return $formulaString;
-	}
-
-
-	/**
-	 * Take array of tokens together with additional data for formula and return human readable formula
-	 *
-	 * @param array $tokens
-	 * @param array $additionalData Additional binary data going with the formula
-	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-	 * @return string Human readable formula
-	 */
-	private function _createFormulaFromTokens($tokens, $additionalData)
-	{
-		// empty formula?
-		if (empty($tokens)) {
-			return '';
-		}
-
-		$formulaStrings = array();
-		foreach ($tokens as $token) {
-			// initialize spaces
-			$space0 = isset($space0) ? $space0 : ''; // spaces before next token, not tParen
-			$space1 = isset($space1) ? $space1 : ''; // carriage returns before next token, not tParen
-			$space2 = isset($space2) ? $space2 : ''; // spaces before opening parenthesis
-			$space3 = isset($space3) ? $space3 : ''; // carriage returns before opening parenthesis
-			$space4 = isset($space4) ? $space4 : ''; // spaces before closing parenthesis
-			$space5 = isset($space5) ? $space5 : ''; // carriage returns before closing parenthesis
-
-			switch ($token['name']) {
-			case 'tAdd': // addition
-			case 'tConcat': // addition
-			case 'tDiv': // division
-			case 'tEQ': // equality
-			case 'tGE': // greater than or equal
-			case 'tGT': // greater than
-			case 'tIsect': // intersection
-			case 'tLE': // less than or equal
-			case 'tList': // less than or equal
-			case 'tLT': // less than
-			case 'tMul': // multiplication
-			case 'tNE': // multiplication
-			case 'tPower': // power
-			case 'tRange': // range
-			case 'tSub': // subtraction
-				$op2 = array_pop($formulaStrings);
-				$op1 = array_pop($formulaStrings);
-				$formulaStrings[] = "$op1$space1$space0{$token['data']}$op2";
-				unset($space0, $space1);
-				break;
-			case 'tUplus': // unary plus
-			case 'tUminus': // unary minus
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "$space1$space0{$token['data']}$op";
-				unset($space0, $space1);
-				break;
-			case 'tPercent': // percent sign
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "$op$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
-			case 'tAttrVolatile': // indicates volatile function
-			case 'tAttrIf':
-			case 'tAttrSkip':
-			case 'tAttrChoose':
-				// token is only important for Excel formula evaluator
-				// do nothing
-				break;
-			case 'tAttrSpace': // space / carriage return
-				// space will be used when next token arrives, do not alter formulaString stack
-				switch ($token['data']['spacetype']) {
-				case 'type0':
-					$space0 = str_repeat(' ', $token['data']['spacecount']);
-					break;
-				case 'type1':
-					$space1 = str_repeat("\n", $token['data']['spacecount']);
-					break;
-				case 'type2':
-					$space2 = str_repeat(' ', $token['data']['spacecount']);
-					break;
-				case 'type3':
-					$space3 = str_repeat("\n", $token['data']['spacecount']);
-					break;
-				case 'type4':
-					$space4 = str_repeat(' ', $token['data']['spacecount']);
-					break;
-				case 'type5':
-					$space5 = str_repeat("\n", $token['data']['spacecount']);
-					break;
-				}
-				break;
-			case 'tAttrSum': // SUM function with one parameter
-				$op = array_pop($formulaStrings);
-				$formulaStrings[] = "{$space1}{$space0}SUM($op)";
-				unset($space0, $space1);
-				break;
-			case 'tFunc': // function with fixed number of arguments
-			case 'tFuncV': // function with variable number of arguments
-				if ($token['data']['function'] != '') {
-					// normal function
-					$ops = array(); // array of operators
-					for ($i = 0; $i < $token['data']['args']; ++$i) {
-						$ops[] = array_pop($formulaStrings);
-					}
-					$ops = array_reverse($ops);
-					$formulaStrings[] = "$space1$space0{$token['data']['function']}(" . implode(',', $ops) . ")";
-					unset($space0, $space1);
-				} else {
-					// add-in function
-					$ops = array(); // array of operators
-					for ($i = 0; $i < $token['data']['args'] - 1; ++$i) {
-						$ops[] = array_pop($formulaStrings);
-					}
-					$ops = array_reverse($ops);
-					$function = array_pop($formulaStrings);
-					$formulaStrings[] = "$space1$space0$function(" . implode(',', $ops) . ")";
-					unset($space0, $space1);
-				}
-				break;
-			case 'tParen': // parenthesis
-				$expression = array_pop($formulaStrings);
-				$formulaStrings[] = "$space3$space2($expression$space5$space4)";
-				unset($space2, $space3, $space4, $space5);
-				break;
-			case 'tArray': // array constant
-				$constantArray = self::_readBIFF8ConstantArray($additionalData);
-				$formulaStrings[] = $space1 . $space0 . $constantArray['value'];
-				$additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
-				unset($space0, $space1);
-				break;
-			case 'tMemArea':
-				// bite off chunk of additional data
-				$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList($additionalData);
-				$additionalData = substr($additionalData, $cellRangeAddressList['size']);
-				$formulaStrings[] = "$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
-			case 'tArea': // cell range address
-			case 'tBool': // boolean
-			case 'tErr': // error code
-			case 'tInt': // integer
-			case 'tMemErr':
-			case 'tMemFunc':
-			case 'tMissArg':
-			case 'tName':
-			case 'tNameX':
-			case 'tNum': // number
-			case 'tRef': // single cell reference
-			case 'tRef3d': // 3d cell reference
-			case 'tArea3d': // 3d cell range reference
-			case 'tRefN':
-			case 'tAreaN':
-			case 'tStr': // string
-				$formulaStrings[] = "$space1$space0{$token['data']}";
-				unset($space0, $space1);
-				break;
-			}
-		}
-		$formulaString = $formulaStrings[0];
-
-		// for debug: dump the human readable formula
-		//echo '----' . "\n";
-		//echo 'Formula: ' . $formulaString;
-
-		return $formulaString;
-	}
-
-
-	/**
-	 * Fetch next token from binary formula data
-	 *
-	 * @param string Formula data
-	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-	 * @return array
-	 * @throws Exception
-	 */
-	private function _getNextToken($formulaData, $baseCell = 'A1')
-	{
-		// offset: 0; size: 1; token id
-		$id = ord($formulaData[0]); // token id
-		$name = false; // initialize token name
-
-		switch ($id) {
-		case 0x03: $name = 'tAdd';		$size = 1;	$data = '+';	break;
-		case 0x04: $name = 'tSub';		$size = 1;	$data = '-';	break;
-		case 0x05: $name = 'tMul';		$size = 1;	$data = '*';	break;
-		case 0x06: $name = 'tDiv';		$size = 1;	$data = '/';	break;
-		case 0x07: $name = 'tPower';	$size = 1;	$data = '^';	break;
-		case 0x08: $name = 'tConcat';	$size = 1;	$data = '&';	break;
-		case 0x09: $name = 'tLT';		$size = 1;	$data = '<';	break;
-		case 0x0A: $name = 'tLE';		$size = 1;	$data = '<=';	break;
-		case 0x0B: $name = 'tEQ';		$size = 1;	$data = '=';	break;
-		case 0x0C: $name = 'tGE';		$size = 1;	$data = '>=';	break;
-		case 0x0D: $name = 'tGT';		$size = 1;	$data = '>';	break;
-		case 0x0E: $name = 'tNE';		$size = 1;	$data = '<>';	break;
-		case 0x0F: $name = 'tIsect';	$size = 1;	$data = ' ';	break;
-		case 0x10: $name = 'tList';		$size = 1;	$data = ',';	break;
-		case 0x11: $name = 'tRange';	$size = 1;	$data = ':';	break;
-		case 0x12: $name = 'tUplus';	$size = 1;	$data = '+';	break;
-		case 0x13: $name = 'tUminus';	$size = 1;	$data = '-';	break;
-		case 0x14: $name = 'tPercent';	$size = 1;	$data = '%';	break;
-		case 0x15:	//	parenthesis
-			$name  = 'tParen';
-			$size  = 1;
-			$data = null;
-			break;
-		case 0x16:	//	missing argument
-			$name = 'tMissArg';
-			$size = 1;
-			$data = '';
-			break;
-		case 0x17:	//	string
-			$name = 'tStr';
-			// offset: 1; size: var; Unicode string, 8-bit string length
-			$string = self::_readUnicodeStringShort(substr($formulaData, 1));
-			$size = 1 + $string['size'];
-			$data = self::_UTF8toExcelDoubleQuoted($string['value']);
-			break;
-		case 0x19:	//	Special attribute
-			// offset: 1; size: 1; attribute type flags:
-			switch (ord($formulaData[1])) {
-			case 0x01:
-				$name = 'tAttrVolatile';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x02:
-				$name = 'tAttrIf';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x04:
-				$name = 'tAttrChoose';
-				// offset: 2; size: 2; number of choices in the CHOOSE function ($nc, number of parameters decreased by 1)
-				$nc = self::_GetInt2d($formulaData, 2);
-				// offset: 4; size: 2 * $nc
-				// offset: 4 + 2 * $nc; size: 2
-				$size = 2 * $nc + 6;
-				$data = null;
-				break;
-			case 0x08:
-				$name = 'tAttrSkip';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x10:
-				$name = 'tAttrSum';
-				$size = 4;
-				$data = null;
-				break;
-			case 0x40:
-			case 0x41:
-				$name = 'tAttrSpace';
-				$size = 4;
-				// offset: 2; size: 2; space type and position
-				switch (ord($formulaData[2])) {
-				case 0x00:
-					$spacetype = 'type0';
-					break;
-				case 0x01:
-					$spacetype = 'type1';
-					break;
-				case 0x02:
-					$spacetype = 'type2';
-					break;
-				case 0x03:
-					$spacetype = 'type3';
-					break;
-				case 0x04:
-					$spacetype = 'type4';
-					break;
-				case 0x05:
-					$spacetype = 'type5';
-					break;
-				default:
-					throw new Exception('Unrecognized space type in tAttrSpace token');
-					break;
-				}
-				// offset: 3; size: 1; number of inserted spaces/carriage returns
-				$spacecount = ord($formulaData[3]);
-
-				$data = array('spacetype' => $spacetype, 'spacecount' => $spacecount);
-				break;
-			default:
-				throw new Exception('Unrecognized attribute flag in tAttr token');
-				break;
-			}
-			break;
-		case 0x1C:	//	error code
-			// offset: 1; size: 1; error code
-			$name = 'tErr';
-			$size = 2;
-			$data = self::_mapErrorCode(ord($formulaData[1]));
-			break;
-		case 0x1D:	//	boolean
-			// offset: 1; size: 1; 0 = false, 1 = true;
-			$name = 'tBool';
-			$size = 2;
-			$data = ord($formulaData[1]) ? 'TRUE' : 'FALSE';
-			break;
-		case 0x1E:	//	integer
-			// offset: 1; size: 2; unsigned 16-bit integer
-			$name = 'tInt';
-			$size = 3;
-			$data = self::_GetInt2d($formulaData, 1);
-			break;
-		case 0x1F:	//	number
-			// offset: 1; size: 8;
-			$name = 'tNum';
-			$size = 9;
-			$data = self::_extractNumber(substr($formulaData, 1));
-			$data = str_replace(',', '.', (string)$data); // in case non-English locale
-			break;
-		case 0x20:	//	array constant
-		case 0x40:
-		case 0x60:
-			// offset: 1; size: 7; not used
-			$name = 'tArray';
-			$size = 8;
-			$data = null;
-			break;
-		case 0x21:	//	function with fixed number of arguments
-		case 0x41:
-		case 0x61:
-			$name = 'tFunc';
-			$size = 3;
-			// offset: 1; size: 2; index to built-in sheet function
-			switch (self::_GetInt2d($formulaData, 1)) {
-			case   2: $function = 'ISNA'; 			$args = 1; 	break;
-			case   3: $function = 'ISERROR'; 		$args = 1; 	break;
-			case  10: $function = 'NA'; 			$args = 0; 	break;
-			case  15: $function = 'SIN'; 			$args = 1; 	break;
-			case  16: $function = 'COS'; 			$args = 1; 	break;
-			case  17: $function = 'TAN'; 			$args = 1; 	break;
-			case  18: $function = 'ATAN'; 			$args = 1; 	break;
-			case  19: $function = 'PI'; 			$args = 0; 	break;
-			case  20: $function = 'SQRT'; 			$args = 1; 	break;
-			case  21: $function = 'EXP'; 			$args = 1; 	break;
-			case  22: $function = 'LN'; 			$args = 1; 	break;
-			case  23: $function = 'LOG10'; 			$args = 1; 	break;
-			case  24: $function = 'ABS'; 			$args = 1; 	break;
-			case  25: $function = 'INT'; 			$args = 1; 	break;
-			case  26: $function = 'SIGN'; 			$args = 1; 	break;
-			case  27: $function = 'ROUND'; 			$args = 2; 	break;
-			case  30: $function = 'REPT'; 			$args = 2; 	break;
-			case  31: $function = 'MID'; 			$args = 3; 	break;
-			case  32: $function = 'LEN'; 			$args = 1; 	break;
-			case  33: $function = 'VALUE'; 			$args = 1; 	break;
-			case  34: $function = 'TRUE'; 			$args = 0; 	break;
-			case  35: $function = 'FALSE'; 			$args = 0; 	break;
-			case  38: $function = 'NOT'; 			$args = 1; 	break;
-			case  39: $function = 'MOD'; 			$args = 2;	break;
-			case  40: $function = 'DCOUNT'; 		$args = 3;	break;
-			case  41: $function = 'DSUM'; 			$args = 3;	break;
-			case  42: $function = 'DAVERAGE'; 		$args = 3;	break;
-			case  43: $function = 'DMIN'; 			$args = 3;	break;
-			case  44: $function = 'DMAX'; 			$args = 3;	break;
-			case  45: $function = 'DSTDEV'; 		$args = 3;	break;
-			case  48: $function = 'TEXT'; 			$args = 2;	break;
-			case  61: $function = 'MIRR'; 			$args = 3;	break;
-			case  63: $function = 'RAND'; 			$args = 0;	break;
-			case  65: $function = 'DATE'; 			$args = 3;	break;
-			case  66: $function = 'TIME'; 			$args = 3;	break;
-			case  67: $function = 'DAY'; 			$args = 1;	break;
-			case  68: $function = 'MONTH'; 			$args = 1;	break;
-			case  69: $function = 'YEAR'; 			$args = 1;	break;
-			case  71: $function = 'HOUR'; 			$args = 1;	break;
-			case  72: $function = 'MINUTE'; 		$args = 1;	break;
-			case  73: $function = 'SECOND'; 		$args = 1;	break;
-			case  74: $function = 'NOW'; 			$args = 0;	break;
-			case  75: $function = 'AREAS'; 			$args = 1;	break;
-			case  76: $function = 'ROWS'; 			$args = 1;	break;
-			case  77: $function = 'COLUMNS'; 		$args = 1;	break;
-			case  83: $function = 'TRANSPOSE'; 		$args = 1;	break;
-			case  86: $function = 'TYPE'; 			$args = 1;	break;
-			case  97: $function = 'ATAN2'; 			$args = 2;	break;
-			case  98: $function = 'ASIN'; 			$args = 1;	break;
-			case  99: $function = 'ACOS'; 			$args = 1;	break;
-			case 105: $function = 'ISREF'; 			$args = 1;	break;
-			case 111: $function = 'CHAR'; 			$args = 1;	break;
-			case 112: $function = 'LOWER'; 			$args = 1;	break;
-			case 113: $function = 'UPPER'; 			$args = 1;	break;
-			case 114: $function = 'PROPER'; 		$args = 1;	break;
-			case 117: $function = 'EXACT'; 			$args = 2;	break;
-			case 118: $function = 'TRIM'; 			$args = 1;	break;
-			case 119: $function = 'REPLACE'; 		$args = 4;	break;
-			case 121: $function = 'CODE'; 			$args = 1;	break;
-			case 126: $function = 'ISERR'; 			$args = 1;	break;
-			case 127: $function = 'ISTEXT'; 		$args = 1;	break;
-			case 128: $function = 'ISNUMBER'; 		$args = 1;	break;
-			case 129: $function = 'ISBLANK'; 		$args = 1;	break;
-			case 130: $function = 'T'; 				$args = 1;	break;
-			case 131: $function = 'N'; 				$args = 1;	break;
-			case 140: $function = 'DATEVALUE'; 		$args = 1;	break;
-			case 141: $function = 'TIMEVALUE'; 		$args = 1;	break;
-			case 142: $function = 'SLN'; 			$args = 3;	break;
-			case 143: $function = 'SYD'; 			$args = 4;	break;
-			case 162: $function = 'CLEAN'; 			$args = 1;	break;
-			case 163: $function = 'MDETERM'; 		$args = 1;	break;
-			case 164: $function = 'MINVERSE'; 		$args = 1;	break;
-			case 165: $function = 'MMULT'; 			$args = 2;	break;
-			case 184: $function = 'FACT'; 			$args = 1;	break;
-			case 189: $function = 'DPRODUCT'; 		$args = 3;	break;
-			case 190: $function = 'ISNONTEXT'; 		$args = 1;	break;
-			case 195: $function = 'DSTDEVP'; 		$args = 3;	break;
-			case 196: $function = 'DVARP'; 			$args = 3;	break;
-			case 198: $function = 'ISLOGICAL'; 		$args = 1;	break;
-			case 199: $function = 'DCOUNTA'; 		$args = 3;	break;
-			case 207: $function = 'REPLACEB'; 		$args = 4;	break;
-			case 210: $function = 'MIDB'; 			$args = 3;	break;
-			case 211: $function = 'LENB'; 			$args = 1;	break;
-			case 212: $function = 'ROUNDUP'; 		$args = 2;	break;
-			case 213: $function = 'ROUNDDOWN'; 		$args = 2;	break;
-			case 214: $function = 'ASC'; 			$args = 1;	break;
-			case 215: $function = 'DBCS'; 			$args = 1;	break;
-			case 221: $function = 'TODAY'; 			$args = 0;	break;
-			case 229: $function = 'SINH'; 			$args = 1;	break;
-			case 230: $function = 'COSH'; 			$args = 1;	break;
-			case 231: $function = 'TANH'; 			$args = 1;	break;
-			case 232: $function = 'ASINH'; 			$args = 1;	break;
-			case 233: $function = 'ACOSH'; 			$args = 1;	break;
-			case 234: $function = 'ATANH'; 			$args = 1;	break;
-			case 235: $function = 'DGET'; 			$args = 3;	break;
-			case 244: $function = 'INFO'; 			$args = 1;	break;
-			case 252: $function = 'FREQUENCY'; 		$args = 2;	break;
-			case 261: $function = 'ERROR.TYPE'; 	$args = 1;	break;
-			case 271: $function = 'GAMMALN'; 		$args = 1;	break;
-			case 273: $function = 'BINOMDIST'; 		$args = 4;	break;
-			case 274: $function = 'CHIDIST'; 		$args = 2;	break;
-			case 275: $function = 'CHIINV'; 		$args = 2;	break;
-			case 276: $function = 'COMBIN'; 		$args = 2;	break;
-			case 277: $function = 'CONFIDENCE'; 	$args = 3;	break;
-			case 278: $function = 'CRITBINOM'; 		$args = 3;	break;
-			case 279: $function = 'EVEN'; 			$args = 1;	break;
-			case 280: $function = 'EXPONDIST'; 		$args = 3;	break;
-			case 281: $function = 'FDIST'; 			$args = 3;	break;
-			case 282: $function = 'FINV'; 			$args = 3;	break;
-			case 283: $function = 'FISHER'; 		$args = 1;	break;
-			case 284: $function = 'FISHERINV'; 		$args = 1;	break;
-			case 285: $function = 'FLOOR'; 			$args = 2;	break;
-			case 286: $function = 'GAMMADIST'; 		$args = 4;	break;
-			case 287: $function = 'GAMMAINV'; 		$args = 3;	break;
-			case 288: $function = 'CEILING'; 		$args = 2;	break;
-			case 289: $function = 'HYPGEOMDIST';	$args = 4;	break;
-			case 290: $function = 'LOGNORMDIST';	$args = 3;	break;
-			case 291: $function = 'LOGINV';			$args = 3;	break;
-			case 292: $function = 'NEGBINOMDIST';	$args = 3;	break;
-			case 293: $function = 'NORMDIST';		$args = 4;	break;
-			case 294: $function = 'NORMSDIST';		$args = 1;	break;
-			case 295: $function = 'NORMINV';		$args = 3;	break;
-			case 296: $function = 'NORMSINV';		$args = 1;	break;
-			case 297: $function = 'STANDARDIZE';	$args = 3;	break;
-			case 298: $function = 'ODD';			$args = 1;	break;
-			case 299: $function = 'PERMUT';			$args = 2;	break;
-			case 300: $function = 'POISSON';		$args = 3;	break;
-			case 301: $function = 'TDIST';			$args = 3;	break;
-			case 302: $function = 'WEIBULL';		$args = 4;	break;
-			case 303: $function = 'SUMXMY2';		$args = 2;	break;
-			case 304: $function = 'SUMX2MY2';		$args = 2;	break;
-			case 305: $function = 'SUMX2PY2';		$args = 2;	break;
-			case 306: $function = 'CHITEST';		$args = 2;	break;
-			case 307: $function = 'CORREL';			$args = 2;	break;
-			case 308: $function = 'COVAR';			$args = 2;	break;
-			case 309: $function = 'FORECAST';		$args = 3;	break;
-			case 310: $function = 'FTEST';			$args = 2;	break;
-			case 311: $function = 'INTERCEPT';		$args = 2;	break;
-			case 312: $function = 'PEARSON';		$args = 2;	break;
-			case 313: $function = 'RSQ';			$args = 2;	break;
-			case 314: $function = 'STEYX';			$args = 2;	break;
-			case 315: $function = 'SLOPE';			$args = 2;	break;
-			case 316: $function = 'TTEST';			$args = 4;	break;
-			case 325: $function = 'LARGE';			$args = 2;	break;
-			case 326: $function = 'SMALL';			$args = 2;	break;
-			case 327: $function = 'QUARTILE';		$args = 2;	break;
-			case 328: $function = 'PERCENTILE';		$args = 2;	break;
-			case 331: $function = 'TRIMMEAN';		$args = 2;	break;
-			case 332: $function = 'TINV';			$args = 2;	break;
-			case 337: $function = 'POWER';			$args = 2;	break;
-			case 342: $function = 'RADIANS';		$args = 1;	break;
-			case 343: $function = 'DEGREES';		$args = 1;	break;
-			case 346: $function = 'COUNTIF';		$args = 2;	break;
-			case 347: $function = 'COUNTBLANK';		$args = 1;	break;
-			case 350: $function = 'ISPMT';			$args = 4;	break;
-			case 351: $function = 'DATEDIF';		$args = 3;	break;
-			case 352: $function = 'DATESTRING';		$args = 1;	break;
-			case 353: $function = 'NUMBERSTRING';	$args = 2;	break;
-			case 360: $function = 'PHONETIC';		$args = 1;	break;
-			case 368: $function = 'BAHTTEXT';		$args = 1;	break;
-			default:
-				throw new Exception('Unrecognized function in formula');
-				break;
-			}
-			$data = array('function' => $function, 'args' => $args);
-			break;
-		case 0x22:	//	function with variable number of arguments
-		case 0x42:
-		case 0x62:
-			$name = 'tFuncV';
-			$size = 4;
-			// offset: 1; size: 1; number of arguments
-			$args = ord($formulaData[1]);
-			// offset: 2: size: 2; index to built-in sheet function
-			$index = self::_GetInt2d($formulaData, 2);
-			switch ($index) {
-			case   0: $function = 'COUNT';			break;
-			case   1: $function = 'IF';				break;
-			case   4: $function = 'SUM';			break;
-			case   5: $function = 'AVERAGE';		break;
-			case   6: $function = 'MIN';			break;
-			case   7: $function = 'MAX';			break;
-			case   8: $function = 'ROW';			break;
-			case   9: $function = 'COLUMN';			break;
-			case  11: $function = 'NPV';			break;
-			case  12: $function = 'STDEV';			break;
-			case  13: $function = 'DOLLAR';			break;
-			case  14: $function = 'FIXED';			break;
-			case  28: $function = 'LOOKUP';			break;
-			case  29: $function = 'INDEX';			break;
-			case  36: $function = 'AND';			break;
-			case  37: $function = 'OR';				break;
-			case  46: $function = 'VAR';			break;
-			case  49: $function = 'LINEST';			break;
-			case  50: $function = 'TREND';			break;
-			case  51: $function = 'LOGEST';			break;
-			case  52: $function = 'GROWTH';			break;
-			case  56: $function = 'PV';				break;
-			case  57: $function = 'FV';				break;
-			case  58: $function = 'NPER';			break;
-			case  59: $function = 'PMT';			break;
-			case  60: $function = 'RATE';			break;
-			case  62: $function = 'IRR';			break;
-			case  64: $function = 'MATCH';			break;
-			case  70: $function = 'WEEKDAY';		break;
-			case  78: $function = 'OFFSET';			break;
-			case  82: $function = 'SEARCH';			break;
-			case 100: $function = 'CHOOSE';			break;
-			case 101: $function = 'HLOOKUP';		break;
-			case 102: $function = 'VLOOKUP';		break;
-			case 109: $function = 'LOG';			break;
-			case 115: $function = 'LEFT';			break;
-			case 116: $function = 'RIGHT';			break;
-			case 120: $function = 'SUBSTITUTE';		break;
-			case 124: $function = 'FIND';			break;
-			case 125: $function = 'CELL';			break;
-			case 144: $function = 'DDB';			break;
-			case 148: $function = 'INDIRECT';		break;
-			case 167: $function = 'IPMT';			break;
-			case 168: $function = 'PPMT';			break;
-			case 169: $function = 'COUNTA';			break;
-			case 183: $function = 'PRODUCT';		break;
-			case 193: $function = 'STDEVP';			break;
-			case 194: $function = 'VARP';			break;
-			case 197: $function = 'TRUNC';			break;
-			case 204: $function = 'USDOLLAR';		break;
-			case 205: $function = 'FINDB';			break;
-			case 206: $function = 'SEARCHB';		break;
-			case 208: $function = 'LEFTB';			break;
-			case 209: $function = 'RIGHTB';			break;
-			case 216: $function = 'RANK';			break;
-			case 219: $function = 'ADDRESS';		break;
-			case 220: $function = 'DAYS360';		break;
-			case 222: $function = 'VDB';			break;
-			case 227: $function = 'MEDIAN';			break;
-			case 228: $function = 'SUMPRODUCT';		break;
-			case 247: $function = 'DB';				break;
-			case 255: $function = '';				break;
-			case 269: $function = 'AVEDEV';			break;
-			case 270: $function = 'BETADIST';		break;
-			case 272: $function = 'BETAINV';		break;
-			case 317: $function = 'PROB';			break;
-			case 318: $function = 'DEVSQ';			break;
-			case 319: $function = 'GEOMEAN';		break;
-			case 320: $function = 'HARMEAN';		break;
-			case 321: $function = 'SUMSQ';			break;
-			case 322: $function = 'KURT';			break;
-			case 323: $function = 'SKEW';			break;
-			case 324: $function = 'ZTEST';			break;
-			case 329: $function = 'PERCENTRANK';	break;
-			case 330: $function = 'MODE';			break;
-			case 336: $function = 'CONCATENATE';	break;
-			case 344: $function = 'SUBTOTAL';		break;
-			case 345: $function = 'SUMIF';			break;
-			case 354: $function = 'ROMAN';			break;
-			case 358: $function = 'GETPIVOTDATA';	break;
-			case 359: $function = 'HYPERLINK';		break;
-			case 361: $function = 'AVERAGEA';		break;
-			case 362: $function = 'MAXA';			break;
-			case 363: $function = 'MINA';			break;
-			case 364: $function = 'STDEVPA';		break;
-			case 365: $function = 'VARPA';			break;
-			case 366: $function = 'STDEVA';			break;
-			case 367: $function = 'VARA';			break;
-			default:
-				throw new Exception('Unrecognized function in formula');
-				break;
-			}
-			$data = array('function' => $function, 'args' => $args);
-			break;
-		case 0x23:	//	index to defined name
-		case 0x43:
-		case 0x63:
-			$name = 'tName';
-			$size = 5;
-			// offset: 1; size: 2; one-based index to definedname record
-			$definedNameIndex = self::_GetInt2d($formulaData, 1) - 1;
-			// offset: 2; size: 2; not used
-			$data = $this->_definedname[$definedNameIndex]['name'];
-			break;
-		case 0x24:	//	single cell reference e.g. A5
-		case 0x44:
-		case 0x64:
-			$name = 'tRef';
-			$size = 5;
-			$data = $this->_readBIFF8CellAddress(substr($formulaData, 1, 4));
-			break;
-		case 0x25:	//	cell range reference to cells in the same sheet (2d)
-		case 0x45:
-		case 0x65:
-			$name = 'tArea';
-			$size = 9;
-			$data = $this->_readBIFF8CellRangeAddress(substr($formulaData, 1, 8));
-			break;
-		case 0x26:	//	Constant reference sub-expression
-		case 0x46:
-		case 0x66:
-			$name = 'tMemArea';
-			// offset: 1; size: 4; not used
-			// offset: 5; size: 2; size of the following subexpression
-			$subSize = self::_GetInt2d($formulaData, 5);
-			$size = 7 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
-			break;
-		case 0x27:	//	Deleted constant reference sub-expression
-		case 0x47:
-		case 0x67:
-			$name = 'tMemErr';
-			// offset: 1; size: 4; not used
-			// offset: 5; size: 2; size of the following subexpression
-			$subSize = self::_GetInt2d($formulaData, 5);
-			$size = 7 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 7, $subSize));
-			break;
-		case 0x29:	//	Variable reference sub-expression
-		case 0x49:
-		case 0x69:
-			$name = 'tMemFunc';
-			// offset: 1; size: 2; size of the following sub-expression
-			$subSize = self::_GetInt2d($formulaData, 1);
-			$size = 3 + $subSize;
-			$data = $this->_getFormulaFromData(substr($formulaData, 3, $subSize));
-			break;
-
-		case 0x2C: // Relative 2d cell reference reference, used in shared formulas and some other places
-		case 0x4C:
-		case 0x6C:
-			$name = 'tRefN';
-			$size = 5;
-			$data = $this->_readBIFF8CellAddressB(substr($formulaData, 1, 4), $baseCell);
-			break;
-
-		case 0x2D:	//	Relative 2d range reference
-		case 0x4D:
-		case 0x6D:
-			$name = 'tAreaN';
-			$size = 9;
-			$data = $this->_readBIFF8CellRangeAddressB(substr($formulaData, 1, 8), $baseCell);
-			break;
-
-		case 0x39:	//	External name
-		case 0x59:
-		case 0x79:
-			$name = 'tNameX';
-			$size = 7;
-			// offset: 1; size: 2; index to REF entry in EXTERNSHEET record
-			// offset: 3; size: 2; one-based index to DEFINEDNAME or EXTERNNAME record
-			$index = self::_GetInt2d($formulaData, 3);
-			// assume index is to EXTERNNAME record
-			$data = $this->_externalNames[$index - 1]['name'];
-			// offset: 5; size: 2; not used
-			break;
-
-		case 0x3A:	//	3d reference to cell
-		case 0x5A:
-		case 0x7A:
-			$name = 'tRef3d';
-			$size = 7;
-
-			try {
-				// offset: 1; size: 2; index to REF entry
-				$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
-				// offset: 3; size: 4; cell address
-				$cellAddress = $this->_readBIFF8CellAddress(substr($formulaData, 3, 4));
-
-				$data = "$sheetRange!$cellAddress";
-			} catch (Exception $e) {
-				// deleted sheet reference
-				$data = '#REF!';
-			}
-
-			break;
-		case 0x3B:	//	3d reference to cell range
-		case 0x5B:
-		case 0x7B:
-			$name = 'tArea3d';
-			$size = 11;
-
-			try {
-				// offset: 1; size: 2; index to REF entry
-				$sheetRange = $this->_readSheetRangeByRefIndex(self::_GetInt2d($formulaData, 1));
-				// offset: 3; size: 8; cell address
-				$cellRangeAddress = $this->_readBIFF8CellRangeAddress(substr($formulaData, 3, 8));
-
-				$data = "$sheetRange!$cellRangeAddress";
-			} catch (Exception $e) {
-				// deleted sheet reference
-				$data = '#REF!';
-			}
-
-			break;
-		// Unknown cases	// don't know how to deal with
-		default:
-			throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
-			break;
-		}
-
-		return array(
-			'id' => $id,
-			'name' => $name,
-			'size' => $size,
-			'data' => $data,
-		);
-	}
-
-
-	/**
-	 * Reads a cell address in BIFF8 e.g. 'A2' or '$A$2'
-	 * section 3.3.4
-	 *
-	 * @param string $cellAddressStructure
-	 * @return string
-	 */
-	private function _readBIFF8CellAddress($cellAddressStructure)
-	{
-		// offset: 0; size: 2; index to row (0... 65535) (or offset (-32768... 32767))
-		$row = self::_GetInt2d($cellAddressStructure, 0) + 1;
-
-		// offset: 2; size: 2; index to column or column offset + relative flags
-
-			// bit: 7-0; mask 0x00FF; column index
-			$column = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($cellAddressStructure, 2));
-
-			// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-			if (!(0x4000 & self::_GetInt2d($cellAddressStructure, 2))) {
-				$column = '$' . $column;
-			}
-			// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-			if (!(0x8000 & self::_GetInt2d($cellAddressStructure, 2))) {
-				$row = '$' . $row;
-			}
-
-		return $column . $row;
-	}
-
-
-	/**
-	 * Reads a cell address in BIFF8 for shared formulas. Uses positive and negative values for row and column
-	 * to indicate offsets from a base cell
-	 * section 3.3.4
-	 *
-	 * @param string $cellAddressStructure
-	 * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-	 * @return string
-	 */
-	private function _readBIFF8CellAddressB($cellAddressStructure, $baseCell = 'A1')
-	{
-		list($baseCol, $baseRow) = PHPExcel_Cell::coordinateFromString($baseCell);
-		$baseCol = PHPExcel_Cell::columnIndexFromString($baseCol) - 1;
-
-		// offset: 0; size: 2; index to row (0... 65535) (or offset (-32768... 32767))
-			$rowIndex = self::_GetInt2d($cellAddressStructure, 0);
-			$row = self::_GetInt2d($cellAddressStructure, 0) + 1;
-
-		// offset: 2; size: 2; index to column or column offset + relative flags
-
-			// bit: 7-0; mask 0x00FF; column index
-			$colIndex = 0x00FF & self::_GetInt2d($cellAddressStructure, 2);
-
-			// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-			if (!(0x4000 & self::_GetInt2d($cellAddressStructure, 2))) {
-				$column = PHPExcel_Cell::stringFromColumnIndex($colIndex);
-				$column = '$' . $column;
-			} else {
-				$colIndex = ($colIndex <= 127) ? $colIndex : $colIndex - 256;
-				$column = PHPExcel_Cell::stringFromColumnIndex($baseCol + $colIndex);
-			}
-
-			// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-			if (!(0x8000 & self::_GetInt2d($cellAddressStructure, 2))) {
-				$row = '$' . $row;
-			} else {
-				$rowIndex = ($rowIndex <= 32767) ? $rowIndex : $rowIndex - 65536;
-				$row = $baseRow + $rowIndex;
-			}
-
-		return $column . $row;
-	}
-
-
-	/**
-	 * Reads a cell range address in BIFF5 e.g. 'A2:B6' or 'A1'
-	 * always fixed range
-	 * section 2.5.14
-	 *
-	 * @param string $subData
-	 * @return string
-	 * @throws Exception
-	 */
-	private function _readBIFF5CellRangeAddressFixed($subData)
-	{
-		// offset: 0; size: 2; index to first row
-		$fr = self::_GetInt2d($subData, 0) + 1;
-
-		// offset: 2; size: 2; index to last row
-		$lr = self::_GetInt2d($subData, 2) + 1;
-
-		// offset: 4; size: 1; index to first column
-		$fc = ord($subData{4});
-
-		// offset: 5; size: 1; index to last column
-		$lc = ord($subData{5});
-
-		// check values
-		if ($fr > $lr || $fc > $lc) {
-			throw new Exception('Not a cell range address');
-		}
-
-		// column index to letter
-		$fc = PHPExcel_Cell::stringFromColumnIndex($fc);
-		$lc = PHPExcel_Cell::stringFromColumnIndex($lc);
-
-		if ($fr == $lr and $fc == $lc) {
-			return "$fc$fr";
-		}
-		return "$fc$fr:$lc$lr";
-	}
-
-
-	/**
-	 * Reads a cell range address in BIFF8 e.g. 'A2:B6' or 'A1'
-	 * always fixed range
-	 * section 2.5.14
-	 *
-	 * @param string $subData
-	 * @return string
-	 * @throws Exception
-	 */
-	private function _readBIFF8CellRangeAddressFixed($subData)
-	{
-		// offset: 0; size: 2; index to first row
-		$fr = self::_GetInt2d($subData, 0) + 1;
-
-		// offset: 2; size: 2; index to last row
-		$lr = self::_GetInt2d($subData, 2) + 1;
-
-		// offset: 4; size: 2; index to first column
-		$fc = self::_GetInt2d($subData, 4);
-
-		// offset: 6; size: 2; index to last column
-		$lc = self::_GetInt2d($subData, 6);
-
-		// check values
-		if ($fr > $lr || $fc > $lc) {
-			throw new Exception('Not a cell range address');
-		}
-
-		// column index to letter
-		$fc = PHPExcel_Cell::stringFromColumnIndex($fc);
-		$lc = PHPExcel_Cell::stringFromColumnIndex($lc);
-
-		if ($fr == $lr and $fc == $lc) {
-			return "$fc$fr";
-		}
-		return "$fc$fr:$lc$lr";
-	}
-
-
-	/**
-	 * Reads a cell range address in BIFF8 e.g. 'A2:B6' or '$A$2:$B$6'
-	 * there are flags indicating whether column/row index is relative
-	 * section 3.3.4
-	 *
-	 * @param string $subData
-	 * @return string
-	 */
-	private function _readBIFF8CellRangeAddress($subData)
-	{
-		// todo: if cell range is just a single cell, should this funciton
-		// not just return e.g. 'A1' and not 'A1:A1' ?
-
-		// offset: 0; size: 2; index to first row (0... 65535) (or offset (-32768... 32767))
-			$fr = self::_GetInt2d($subData, 0) + 1;
-
-		// offset: 2; size: 2; index to last row (0... 65535) (or offset (-32768... 32767))
-			$lr = self::_GetInt2d($subData, 2) + 1;
-
-		// offset: 4; size: 2; index to first column or column offset + relative flags
-
-		// bit: 7-0; mask 0x00FF; column index
-		$fc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($subData, 4));
-
-		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 4))) {
-			$fc = '$' . $fc;
-		}
-
-		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 4))) {
-			$fr = '$' . $fr;
-		}
-
-		// offset: 6; size: 2; index to last column or column offset + relative flags
-
-		// bit: 7-0; mask 0x00FF; column index
-		$lc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($subData, 6));
-
-		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 6))) {
-			$lc = '$' . $lc;
-		}
-
-		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 6))) {
-			$lr = '$' . $lr;
-		}
-
-		return "$fc$fr:$lc$lr";
-	}
-
-
-	/**
-	 * Reads a cell range address in BIFF8 for shared formulas. Uses positive and negative values for row and column
-	 * to indicate offsets from a base cell
-	 * section 3.3.4
-	 *
-	 * @param string $subData
-	 * @param string $baseCell Base cell
-	 * @return string Cell range address
-	 */
-	private function _readBIFF8CellRangeAddressB($subData, $baseCell = 'A1')
-	{
-		list($baseCol, $baseRow) = PHPExcel_Cell::coordinateFromString($baseCell);
-		$baseCol = PHPExcel_Cell::columnIndexFromString($baseCol) - 1;
-
-		// TODO: if cell range is just a single cell, should this funciton
-		// not just return e.g. 'A1' and not 'A1:A1' ?
-
-		// offset: 0; size: 2; first row
-		$frIndex = self::_GetInt2d($subData, 0); // adjust below
-
-		// offset: 2; size: 2; relative index to first row (0... 65535) should be treated as offset (-32768... 32767)
-		$lrIndex = self::_GetInt2d($subData, 2); // adjust below
-
-		// offset: 4; size: 2; first column with relative/absolute flags
-
-		// bit: 7-0; mask 0x00FF; column index
-		$fcIndex = 0x00FF & self::_GetInt2d($subData, 4);
-
-		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 4))) {
-			// absolute column index
-			$fc = PHPExcel_Cell::stringFromColumnIndex($fcIndex);
-			$fc = '$' . $fc;
-		} else {
-			// column offset
-			$fcIndex = ($fcIndex <= 127) ? $fcIndex : $fcIndex - 256;
-			$fc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $fcIndex);
-		}
-
-		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 4))) {
-			// absolute row index
-			$fr = $frIndex + 1;
-			$fr = '$' . $fr;
-		} else {
-			// row offset
-			$frIndex = ($frIndex <= 32767) ? $frIndex : $frIndex - 65536;
-			$fr = $baseRow + $frIndex;
-		}
-
-		// offset: 6; size: 2; last column with relative/absolute flags
-
-		// bit: 7-0; mask 0x00FF; column index
-		$lcIndex = 0x00FF & self::_GetInt2d($subData, 6);
-		$lcIndex = ($lcIndex <= 127) ? $lcIndex : $lcIndex - 256;
-		$lc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $lcIndex);
-
-		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-		if (!(0x4000 & self::_GetInt2d($subData, 6))) {
-			// absolute column index
-			$lc = PHPExcel_Cell::stringFromColumnIndex($lcIndex);
-			$lc = '$' . $lc;
-		} else {
-			// column offset
-			$lcIndex = ($lcIndex <= 127) ? $lcIndex : $lcIndex - 256;
-			$lc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $lcIndex);
-		}
-
-		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-		if (!(0x8000 & self::_GetInt2d($subData, 6))) {
-			// absolute row index
-			$lr = $lrIndex + 1;
-			$lr = '$' . $lr;
-		} else {
-			// row offset
-			$lrIndex = ($lrIndex <= 32767) ? $lrIndex : $lrIndex - 65536;
-			$lr = $baseRow + $lrIndex;
-		}
-
-		return "$fc$fr:$lc$lr";
-	}
-
-
-	/**
-	 * Read BIFF8 cell range address list
-	 * section 2.5.15
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private function _readBIFF8CellRangeAddressList($subData)
-	{
-		$cellRangeAddresses = array();
-
-		// offset: 0; size: 2; number of the following cell range addresses
-		$nm = self::_GetInt2d($subData, 0);
-
-		$offset = 2;
-		// offset: 2; size: 8 * $nm; list of $nm (fixed) cell range addresses
-		for ($i = 0; $i < $nm; ++$i) {
-			$cellRangeAddresses[] = $this->_readBIFF8CellRangeAddressFixed(substr($subData, $offset, 8));
-			$offset += 8;
-		}
-
-		return array(
-			'size' => 2 + 8 * $nm,
-			'cellRangeAddresses' => $cellRangeAddresses,
-		);
-	}
-
-
-	/**
-	 * Read BIFF5 cell range address list
-	 * section 2.5.15
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private function _readBIFF5CellRangeAddressList($subData)
-	{
-		$cellRangeAddresses = array();
-
-		// offset: 0; size: 2; number of the following cell range addresses
-		$nm = self::_GetInt2d($subData, 0);
-
-		$offset = 2;
-		// offset: 2; size: 6 * $nm; list of $nm (fixed) cell range addresses
-		for ($i = 0; $i < $nm; ++$i) {
-			$cellRangeAddresses[] = $this->_readBIFF5CellRangeAddressFixed(substr($subData, $offset, 6));
-			$offset += 6;
-		}
-
-		return array(
-			'size' => 2 + 6 * $nm,
-			'cellRangeAddresses' => $cellRangeAddresses,
-		);
-	}
-
-
-	/**
-	 * Get a sheet range like Sheet1:Sheet3 from REF index
-	 * Note: If there is only one sheet in the range, one gets e.g Sheet1
-	 * It can also happen that the REF structure uses the -1 (FFFF) code to indicate deleted sheets,
-	 * in which case an exception is thrown
-	 *
-	 * @param int $index
-	 * @return string|false
-	 * @throws Exception
-	 */
-	private function _readSheetRangeByRefIndex($index)
-	{
-		if (isset($this->_ref[$index])) {
-
-			$type = $this->_externalBooks[$this->_ref[$index]['externalBookIndex']]['type'];
-
-			switch ($type) {
-				case 'internal':
-					// check if we have a deleted 3d reference
-					if ($this->_ref[$index]['firstSheetIndex'] == 0xFFFF or $this->_ref[$index]['lastSheetIndex'] == 0xFFFF) {
-						throw new Exception('Deleted sheet reference');
-					}
-
-					// we have normal sheet range (collapsed or uncollapsed)
-					$firstSheetName = $this->_sheets[$this->_ref[$index]['firstSheetIndex']]['name'];
-					$lastSheetName = $this->_sheets[$this->_ref[$index]['lastSheetIndex']]['name'];
-
-					if ($firstSheetName == $lastSheetName) {
-						// collapsed sheet range
-						$sheetRange = $firstSheetName;
-					} else {
-						$sheetRange = "$firstSheetName:$lastSheetName";
-					}
-
-					// escape the single-quotes
-					$sheetRange = str_replace("'", "''", $sheetRange);
-
-					// if there are special characters, we need to enclose the range in single-quotes
-					// todo: check if we have identified the whole set of special characters
-					// it seems that the following characters are not accepted for sheet names
-					// and we may assume that they are not present: []*/:\?
-					if (preg_match("/[ !\"@#£$%&{()}<>=+'|^,;-]/", $sheetRange)) {
-						$sheetRange = "'$sheetRange'";
-					}
-
-					return $sheetRange;
-					break;
-
-				default:
-					// TODO: external sheet support
-					throw new Exception('Excel5 reader only supports internal sheets in fomulas');
-					break;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * read BIFF8 constant value array from array data
-	 * returns e.g. array('value' => '{1,2;3,4}', 'size' => 40}
-	 * section 2.5.8
-	 *
-	 * @param string $arrayData
-	 * @return array
-	 */
-	private static function _readBIFF8ConstantArray($arrayData)
-	{
-		// offset: 0; size: 1; number of columns decreased by 1
-		$nc = ord($arrayData[0]);
-
-		// offset: 1; size: 2; number of rows decreased by 1
-		$nr = self::_GetInt2d($arrayData, 1);
-		$size = 3; // initialize
-		$arrayData = substr($arrayData, 3);
-
-		// offset: 3; size: var; list of ($nc + 1) * ($nr + 1) constant values
-		$matrixChunks = array();
-		for ($r = 1; $r <= $nr + 1; ++$r) {
-			$items = array();
-			for ($c = 1; $c <= $nc + 1; ++$c) {
-				$constant = self::_readBIFF8Constant($arrayData);
-				$items[] = $constant['value'];
-				$arrayData = substr($arrayData, $constant['size']);
-				$size += $constant['size'];
-			}
-			$matrixChunks[] = implode(',', $items); // looks like e.g. '1,"hello"'
-		}
-		$matrix = '{' . implode(';', $matrixChunks) . '}';
-
-		return array(
-			'value' => $matrix,
-			'size' => $size,
-		);
-	}
-
-
-	/**
-	 * read BIFF8 constant value which may be 'Empty Value', 'Number', 'String Value', 'Boolean Value', 'Error Value'
-	 * section 2.5.7
-	 * returns e.g. array('value' => '5', 'size' => 9)
-	 *
-	 * @param string $valueData
-	 * @return array
-	 */
-	private static function _readBIFF8Constant($valueData)
-	{
-		// offset: 0; size: 1; identifier for type of constant
-		$identifier = ord($valueData[0]);
-
-		switch ($identifier) {
-		case 0x00: // empty constant (what is this?)
-			$value = '';
-			$size = 9;
-			break;
-		case 0x01: // number
-			// offset: 1; size: 8; IEEE 754 floating-point value
-			$value = self::_extractNumber(substr($valueData, 1, 8));
-			$size = 9;
-			break;
-		case 0x02: // string value
-			// offset: 1; size: var; Unicode string, 16-bit string length
-			$string = self::_readUnicodeStringLong(substr($valueData, 1));
-			$value = '"' . $string['value'] . '"';
-			$size = 1 + $string['size'];
-			break;
-		case 0x04: // boolean
-			// offset: 1; size: 1; 0 = FALSE, 1 = TRUE
-			if (ord($valueData[1])) {
-				$value = 'TRUE';
-			} else {
-				$value = 'FALSE';
-			}
-			$size = 9;
-			break;
-		case 0x10: // error code
-			// offset: 1; size: 1; error code
-			$value = self::_mapErrorCode(ord($valueData[1]));
-			$size = 9;
-			break;
-		}
-		return array(
-			'value' => $value,
-			'size' => $size,
-		);
-	}
-
-
-	/**
-	 * Extract RGB color
-	 * OpenOffice.org's Documentation of the Microsoft Excel File Format, section 2.5.4
-	 *
-	 * @param string $rgb Encoded RGB value (4 bytes)
-	 * @return array
-	 */
-	private static function _readRGB($rgb)
-	{
-		// offset: 0; size 1; Red component
-		$r = ord($rgb{0});
-
-		// offset: 1; size: 1; Green component
-		$g = ord($rgb{1});
-
-		// offset: 2; size: 1; Blue component
-		$b = ord($rgb{2});
-
-		// HEX notation, e.g. 'FF00FC'
-		$rgb = sprintf('%02X%02X%02X', $r, $g, $b);
-
-		return array('rgb' => $rgb);
-	}
-
-
-	/**
-	 * Read byte string (8-bit string length)
-	 * OpenOffice documentation: 2.5.2
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private function _readByteStringShort($subData)
-	{
-		// offset: 0; size: 1; length of the string (character count)
-		$ln = ord($subData[0]);
-
-		// offset: 1: size: var; character array (8-bit characters)
-		$value = $this->_decodeCodepage(substr($subData, 1, $ln));
-
-		return array(
-			'value' => $value,
-			'size' => 1 + $ln, // size in bytes of data structure
-		);
-	}
-
-
-	/**
-	 * Read byte string (16-bit string length)
-	 * OpenOffice documentation: 2.5.2
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private function _readByteStringLong($subData)
-	{
-		// offset: 0; size: 2; length of the string (character count)
-		$ln = self::_GetInt2d($subData, 0);
-
-		// offset: 2: size: var; character array (8-bit characters)
-		$value = $this->_decodeCodepage(substr($subData, 2));
-
-		//return $string;
-		return array(
-			'value' => $value,
-			'size' => 2 + $ln, // size in bytes of data structure
-		);
-	}
-
-
-	/**
-	 * Extracts an Excel Unicode short string (8-bit string length)
-	 * OpenOffice documentation: 2.5.3
-	 * function will automatically find out where the Unicode string ends.
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private static function _readUnicodeStringShort($subData)
-	{
-		$value = '';
-
-		// offset: 0: size: 1; length of the string (character count)
-		$characterCount = ord($subData[0]);
-
-		$string = self::_readUnicodeString(substr($subData, 1), $characterCount);
-
-		// add 1 for the string length
-		$string['size'] += 1;
-
-		return $string;
-	}
-
-
-	/**
-	 * Extracts an Excel Unicode long string (16-bit string length)
-	 * OpenOffice documentation: 2.5.3
-	 * this function is under construction, needs to support rich text, and Asian phonetic settings
-	 *
-	 * @param string $subData
-	 * @return array
-	 */
-	private static function _readUnicodeStringLong($subData)
-	{
-		$value = '';
-
-		// offset: 0: size: 2; length of the string (character count)
-		$characterCount = self::_GetInt2d($subData, 0);
-
-		$string = self::_readUnicodeString(substr($subData, 2), $characterCount);
-
-		// add 2 for the string length
-		$string['size'] += 2;
-
-		return $string;
-	}
-
-
-	/**
-	 * Read Unicode string with no string length field, but with known character count
-	 * this function is under construction, needs to support rich text, and Asian phonetic settings
-	 * OpenOffice.org's Documentation of the Microsoft Excel File Format, section 2.5.3
-	 *
-	 * @param string $subData
-	 * @param int $characterCount
-	 * @return array
-	 */
-	private static function _readUnicodeString($subData, $characterCount)
-	{
-		$value = '';
-
-		// offset: 0: size: 1; option flags
-
-			// bit: 0; mask: 0x01; character compression (0 = compressed 8-bit, 1 = uncompressed 16-bit)
-			$isCompressed = !((0x01 & ord($subData[0])) >> 0);
-
-			// bit: 2; mask: 0x04; Asian phonetic settings
-			$hasAsian = (0x04) & ord($subData[0]) >> 2;
-
-			// bit: 3; mask: 0x08; Rich-Text settings
-			$hasRichText = (0x08) & ord($subData[0]) >> 3;
-
-		// offset: 1: size: var; character array
-		// this offset assumes richtext and Asian phonetic settings are off which is generally wrong
-		// needs to be fixed
-		$value = self::_encodeUTF16(substr($subData, 1, $isCompressed ? $characterCount : 2 * $characterCount), $isCompressed);
-
-		return array(
-			'value' => $value,
-			'size' => $isCompressed ? 1 + $characterCount : 1 + 2 * $characterCount, // the size in bytes including the option flags
-		);
-	}
-
-
-	/**
-	 * Convert UTF-8 string to string surounded by double quotes. Used for explicit string tokens in formulas.
-	 * Example:  hello"world  -->  "hello""world"
-	 *
-	 * @param string $value UTF-8 encoded string
-	 * @return string
-	 */
-	private static function _UTF8toExcelDoubleQuoted($value)
-	{
-		return '"' . str_replace('"', '""', $value) . '"';
-	}
-
-
-	/**
-	 * Reads first 8 bytes of a string and return IEEE 754 float
-	 *
-	 * @param string $data Binary string that is at least 8 bytes long
-	 * @return float
-	 */
-	private static function _extractNumber($data)
-	{
-		$rknumhigh = self::_GetInt4d($data, 4);
-		$rknumlow = self::_GetInt4d($data, 0);
-		$sign = ($rknumhigh & 0x80000000) >> 31;
-		$exp = (($rknumhigh & 0x7ff00000) >> 20) - 1023;
-		$mantissa = (0x100000 | ($rknumhigh & 0x000fffff));
-		$mantissalow1 = ($rknumlow & 0x80000000) >> 31;
-		$mantissalow2 = ($rknumlow & 0x7fffffff);
-		$value = $mantissa / pow( 2 , (20 - $exp));
-
-		if ($mantissalow1 != 0) {
-			$value += 1 / pow (2 , (21 - $exp));
-		}
-
-		$value += $mantissalow2 / pow (2 , (52 - $exp));
-		if ($sign) {
-			$value *= -1;
-		}
-
-		return $value;
-	}
-
-
-	private static function _GetIEEE754($rknum)
-	{
-		if (($rknum & 0x02) != 0) {
-			$value = $rknum >> 2;
-		} else {
-			// changes by mmp, info on IEEE754 encoding from
-			// research.microsoft.com/~hollasch/cgindex/coding/ieeefloat.html
-			// The RK format calls for using only the most significant 30 bits
-			// of the 64 bit floating point value. The other 34 bits are assumed
-			// to be 0 so we use the upper 30 bits of $rknum as follows...
-			$sign = ($rknum & 0x80000000) >> 31;
-			$exp = ($rknum & 0x7ff00000) >> 20;
-			$mantissa = (0x100000 | ($rknum & 0x000ffffc));
-			$value = $mantissa / pow( 2 , (20- ($exp - 1023)));
-			if ($sign) {
-				$value = -1 * $value;
-			}
-			//end of changes by mmp
-		}
-		if (($rknum & 0x01) != 0) {
-			$value /= 100;
-		}
-		return $value;
-	}
-
-
-	/**
-	 * Get UTF-8 string from (compressed or uncompressed) UTF-16 string
-	 *
-	 * @param string $string
-	 * @param bool $compressed
-	 * @return string
-	 */
-	private static function _encodeUTF16($string, $compressed = '')
-	{
-		if ($compressed) {
-			$string = self::_uncompressByteString($string);
- 		}
-
-		return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', 'UTF-16LE');
-	}
-
-
-	/**
-	 * Convert UTF-16 string in compressed notation to uncompressed form. Only used for BIFF8.
-	 *
-	 * @param string $string
-	 * @return string
-	 */
-	private static function _uncompressByteString($string)
-	{
-		$uncompressedString = '';
-		$strLen = strlen($string);
-		for ($i = 0; $i < $strLen; ++$i) {
-			$uncompressedString .= $string[$i] . "\0";
-		}
-
-		return $uncompressedString;
-	}
-
-
-	/**
-	 * Convert string to UTF-8. Only used for BIFF5.
-	 *
-	 * @param string $string
-	 * @return string
-	 */
-	private function _decodeCodepage($string)
-	{
-		return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', $this->_codepage);
-	}
-
-
-	/**
-	 * Read 16-bit unsigned integer
-	 *
-	 * @param string $data
-	 * @param int $pos
-	 * @return int
-	 */
-	public static function _GetInt2d($data, $pos)
-	{
-		return ord($data[$pos]) | (ord($data[$pos+1]) << 8);
-	}
-
-
-	/**
-	 * Read 32-bit signed integer
-	 *
-	 * @param string $data
-	 * @param int $pos
-	 * @return int
-	 */
-	public static function _GetInt4d($data, $pos)
-	{
-		// FIX: represent numbers correctly on 64-bit system
-		// http://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
-		// Hacked by Andreas Rehm 2006 to ensure correct result of the <<24 block on 32 and 64bit systems
-		$_or_24 = ord($data[$pos + 3]);
-		if ($_or_24 >= 128) {
-			// negative number
-			$_ord_24 = -abs((256 - $_or_24) << 24);
-		} else {
-			$_ord_24 = ($_or_24 & 127) << 24;
-		}
-		return ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | $_ord_24;
-	}
-
-
-	/**
-	 * Read color
-	 *
-	 * @param int $color Indexed color
-	 * @param array $palette Color palette
-	 * @return array RGB color value, example: array('rgb' => 'FF0000')
-	 */
-	private static function _readColor($color,$palette,$version)
-	{
-		if ($color <= 0x07 || $color >= 0x40) {
-			// special built-in color
-			return self::_mapBuiltInColor($color);
-		} elseif (isset($palette) && isset($palette[$color - 8])) {
-			// palette color, color index 0x08 maps to pallete index 0
-			return $palette[$color - 8];
-		} else {
-			// default color table
-			if ($version == self::XLS_BIFF8) {
-				return self::_mapColor($color);
-			} else {
-				// BIFF5
-				return self::_mapColorBIFF5($color);
-			}
-		}
-
-		return $color;
-	}
-
-
-	/**
-	 * Map border style
-	 * OpenOffice documentation: 2.5.11
-	 *
-	 * @param int $index
-	 * @return string
-	 */
-	private static function _mapBorderStyle($index)
-	{
-		switch ($index) {
-			case 0x00: return PHPExcel_Style_Border::BORDER_NONE;
-			case 0x01: return PHPExcel_Style_Border::BORDER_THIN;
-			case 0x02: return PHPExcel_Style_Border::BORDER_MEDIUM;
-			case 0x03: return PHPExcel_Style_Border::BORDER_DASHED;
-			case 0x04: return PHPExcel_Style_Border::BORDER_DOTTED;
-			case 0x05: return PHPExcel_Style_Border::BORDER_THICK;
-			case 0x06: return PHPExcel_Style_Border::BORDER_DOUBLE;
-			case 0x07: return PHPExcel_Style_Border::BORDER_HAIR;
-			case 0x08: return PHPExcel_Style_Border::BORDER_MEDIUMDASHED;
-			case 0x09: return PHPExcel_Style_Border::BORDER_DASHDOT;
-			case 0x0A: return PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT;
-			case 0x0B: return PHPExcel_Style_Border::BORDER_DASHDOTDOT;
-			case 0x0C: return PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
-			case 0x0D: return PHPExcel_Style_Border::BORDER_SLANTDASHDOT;
-			default:   return PHPExcel_Style_Border::BORDER_NONE;
-		}
-	}
-
-
-	/**
-	 * Get fill pattern from index
-	 * OpenOffice documentation: 2.5.12
-	 *
-	 * @param int $index
-	 * @return string
-	 */
-	private static function _mapFillPattern($index)
-	{
-		switch ($index) {
-			case 0x00: return PHPExcel_Style_Fill::FILL_NONE;
-			case 0x01: return PHPExcel_Style_Fill::FILL_SOLID;
-			case 0x02: return PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY;
-			case 0x03: return PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY;
-			case 0x04: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY;
-			case 0x05: return PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL;
-			case 0x06: return PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL;
-			case 0x07: return PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN;
-			case 0x08: return PHPExcel_Style_Fill::FILL_PATTERN_DARKUP;
-			case 0x09: return PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID;
-			case 0x0A: return PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS;
-			case 0x0B: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL;
-			case 0x0C: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL;
-			case 0x0D: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN;
-			case 0x0E: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP;
-			case 0x0F: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID;
-			case 0x10: return PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS;
-			case 0x11: return PHPExcel_Style_Fill::FILL_PATTERN_GRAY125;
-			case 0x12: return PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625;
-			default:   return PHPExcel_Style_Fill::FILL_NONE;
-		}
-	}
-
-
-	/**
-	 * Map error code, e.g. '#N/A'
-	 *
-	 * @param int $subData
-	 * @return string
-	 */
-	private static function _mapErrorCode($subData)
-	{
-		switch ($subData) {
-			case 0x00: return '#NULL!';		break;
-			case 0x07: return '#DIV/0!';	break;
-			case 0x0F: return '#VALUE!';	break;
-			case 0x17: return '#REF!';		break;
-			case 0x1D: return '#NAME?';		break;
-			case 0x24: return '#NUM!';		break;
-			case 0x2A: return '#N/A';		break;
-			default: return false;
-		}
-	}
-
-
-	/**
-	 * Map built-in color to RGB value
-	 *
-	 * @param int $color Indexed color
-	 * @return array
-	 */
-	private static function _mapBuiltInColor($color)
-	{
-		switch ($color) {
-			case 0x00: return array('rgb' => '000000');
-			case 0x01: return array('rgb' => 'FFFFFF');
-			case 0x02: return array('rgb' => 'FF0000');
-			case 0x03: return array('rgb' => '00FF00');
-			case 0x04: return array('rgb' => '0000FF');
-			case 0x05: return array('rgb' => 'FFFF00');
-			case 0x06: return array('rgb' => 'FF00FF');
-			case 0x07: return array('rgb' => '00FFFF');
-			case 0x40: return array('rgb' => '000000'); // system window text color
-			case 0x41: return array('rgb' => 'FFFFFF'); // system window background color
-			default:   return array('rgb' => '000000');
-		}
-	}
-
-
-	/**
-	 * Map color array from BIFF5 built-in color index
-	 *
-	 * @param int $subData
-	 * @return array
-	 */
-	private static function _mapColorBIFF5($subData)
-	{
-		switch ($subData) {
-			case 0x08: return array('rgb' => '000000');
-			case 0x09: return array('rgb' => 'FFFFFF');
-			case 0x0A: return array('rgb' => 'FF0000');
-			case 0x0B: return array('rgb' => '00FF00');
-			case 0x0C: return array('rgb' => '0000FF');
-			case 0x0D: return array('rgb' => 'FFFF00');
-			case 0x0E: return array('rgb' => 'FF00FF');
-			case 0x0F: return array('rgb' => '00FFFF');
-			case 0x10: return array('rgb' => '800000');
-			case 0x11: return array('rgb' => '008000');
-			case 0x12: return array('rgb' => '000080');
-			case 0x13: return array('rgb' => '808000');
-			case 0x14: return array('rgb' => '800080');
-			case 0x15: return array('rgb' => '008080');
-			case 0x16: return array('rgb' => 'C0C0C0');
-			case 0x17: return array('rgb' => '808080');
-			case 0x18: return array('rgb' => '8080FF');
-			case 0x19: return array('rgb' => '802060');
-			case 0x1A: return array('rgb' => 'FFFFC0');
-			case 0x1B: return array('rgb' => 'A0E0F0');
-			case 0x1C: return array('rgb' => '600080');
-			case 0x1D: return array('rgb' => 'FF8080');
-			case 0x1E: return array('rgb' => '0080C0');
-			case 0x1F: return array('rgb' => 'C0C0FF');
-			case 0x20: return array('rgb' => '000080');
-			case 0x21: return array('rgb' => 'FF00FF');
-			case 0x22: return array('rgb' => 'FFFF00');
-			case 0x23: return array('rgb' => '00FFFF');
-			case 0x24: return array('rgb' => '800080');
-			case 0x25: return array('rgb' => '800000');
-			case 0x26: return array('rgb' => '008080');
-			case 0x27: return array('rgb' => '0000FF');
-			case 0x28: return array('rgb' => '00CFFF');
-			case 0x29: return array('rgb' => '69FFFF');
-			case 0x2A: return array('rgb' => 'E0FFE0');
-			case 0x2B: return array('rgb' => 'FFFF80');
-			case 0x2C: return array('rgb' => 'A6CAF0');
-			case 0x2D: return array('rgb' => 'DD9CB3');
-			case 0x2E: return array('rgb' => 'B38FEE');
-			case 0x2F: return array('rgb' => 'E3E3E3');
-			case 0x30: return array('rgb' => '2A6FF9');
-			case 0x31: return array('rgb' => '3FB8CD');
-			case 0x32: return array('rgb' => '488436');
-			case 0x33: return array('rgb' => '958C41');
-			case 0x34: return array('rgb' => '8E5E42');
-			case 0x35: return array('rgb' => 'A0627A');
-			case 0x36: return array('rgb' => '624FAC');
-			case 0x37: return array('rgb' => '969696');
-			case 0x38: return array('rgb' => '1D2FBE');
-			case 0x39: return array('rgb' => '286676');
-			case 0x3A: return array('rgb' => '004500');
-			case 0x3B: return array('rgb' => '453E01');
-			case 0x3C: return array('rgb' => '6A2813');
-			case 0x3D: return array('rgb' => '85396A');
-			case 0x3E: return array('rgb' => '4A3285');
-			case 0x3F: return array('rgb' => '424242');
-			default:   return array('rgb' => '000000');
-		}
-	}
-
-
-	/**
-	 * Map color array from BIFF8 built-in color index
-	 *
-	 * @param int $subData
-	 * @return array
-	 */
-	private static function _mapColor($subData)
-	{
-		switch ($subData) {
-			case 0x08: return array('rgb' => '000000');
-			case 0x09: return array('rgb' => 'FFFFFF');
-			case 0x0A: return array('rgb' => 'FF0000');
-			case 0x0B: return array('rgb' => '00FF00');
-			case 0x0C: return array('rgb' => '0000FF');
-			case 0x0D: return array('rgb' => 'FFFF00');
-			case 0x0E: return array('rgb' => 'FF00FF');
-			case 0x0F: return array('rgb' => '00FFFF');
-			case 0x10: return array('rgb' => '800000');
-			case 0x11: return array('rgb' => '008000');
-			case 0x12: return array('rgb' => '000080');
-			case 0x13: return array('rgb' => '808000');
-			case 0x14: return array('rgb' => '800080');
-			case 0x15: return array('rgb' => '008080');
-			case 0x16: return array('rgb' => 'C0C0C0');
-			case 0x17: return array('rgb' => '808080');
-			case 0x18: return array('rgb' => '9999FF');
-			case 0x19: return array('rgb' => '993366');
-			case 0x1A: return array('rgb' => 'FFFFCC');
-			case 0x1B: return array('rgb' => 'CCFFFF');
-			case 0x1C: return array('rgb' => '660066');
-			case 0x1D: return array('rgb' => 'FF8080');
-			case 0x1E: return array('rgb' => '0066CC');
-			case 0x1F: return array('rgb' => 'CCCCFF');
-			case 0x20: return array('rgb' => '000080');
-			case 0x21: return array('rgb' => 'FF00FF');
-			case 0x22: return array('rgb' => 'FFFF00');
-			case 0x23: return array('rgb' => '00FFFF');
-			case 0x24: return array('rgb' => '800080');
-			case 0x25: return array('rgb' => '800000');
-			case 0x26: return array('rgb' => '008080');
-			case 0x27: return array('rgb' => '0000FF');
-			case 0x28: return array('rgb' => '00CCFF');
-			case 0x29: return array('rgb' => 'CCFFFF');
-			case 0x2A: return array('rgb' => 'CCFFCC');
-			case 0x2B: return array('rgb' => 'FFFF99');
-			case 0x2C: return array('rgb' => '99CCFF');
-			case 0x2D: return array('rgb' => 'FF99CC');
-			case 0x2E: return array('rgb' => 'CC99FF');
-			case 0x2F: return array('rgb' => 'FFCC99');
-			case 0x30: return array('rgb' => '3366FF');
-			case 0x31: return array('rgb' => '33CCCC');
-			case 0x32: return array('rgb' => '99CC00');
-			case 0x33: return array('rgb' => 'FFCC00');
-			case 0x34: return array('rgb' => 'FF9900');
-			case 0x35: return array('rgb' => 'FF6600');
-			case 0x36: return array('rgb' => '666699');
-			case 0x37: return array('rgb' => '969696');
-			case 0x38: return array('rgb' => '003366');
-			case 0x39: return array('rgb' => '339966');
-			case 0x3A: return array('rgb' => '003300');
-			case 0x3B: return array('rgb' => '333300');
-			case 0x3C: return array('rgb' => '993300');
-			case 0x3D: return array('rgb' => '993366');
-			case 0x3E: return array('rgb' => '333399');
-			case 0x3F: return array('rgb' => '333333');
-			default:   return array('rgb' => '000000');
-		}
-	}
-
-
-	private function _parseRichText($is = '') {
-		$value = new PHPExcel_RichText();
-
-		$value->createText($is);
-
-		return $value;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel5/Escher.php b/plugins/exportTypes/Excel/PHPExcel/Reader/Excel5/Escher.php
deleted file mode 100755
index 8c54aac7b..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/Excel5/Escher.php
+++ /dev/null
@@ -1,640 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Reader_Excel5_Escher
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Excel5_Escher
-{
-	const DGGCONTAINER		= 0xF000;
-	const BSTORECONTAINER	= 0xF001;
-	const DGCONTAINER		= 0xF002;
-	const SPGRCONTAINER		= 0xF003;
-	const SPCONTAINER		= 0xF004;
-	const DGG				= 0xF006;
-	const BSE				= 0xF007;
-	const DG				= 0xF008;
-	const SPGR				= 0xF009;
-	const SP				= 0xF00A;
-	const OPT				= 0xF00B;
-	const CLIENTTEXTBOX		= 0xF00D;
-	const CLIENTANCHOR		= 0xF010;
-	const CLIENTDATA		= 0xF011;
-	const BLIPJPEG			= 0xF01D;
-	const BLIPPNG			= 0xF01E;
-	const SPLITMENUCOLORS	= 0xF11E;
-	const TERTIARYOPT		= 0xF122;
-
-	/**
-	 * Escher stream data (binary)
-	 *
-	 * @var string
-	 */
-	private $_data;
-
-	/**
-	 * Size in bytes of the Escher stream data
-	 *
-	 * @var int
-	 */
-	private $_dataSize;
-
-	/**
-	 * Current position of stream pointer in Escher stream data
-	 *
-	 * @var int
-	 */
-	private $_pos;
-
-	/**
-	 * The object to be returned by the reader. Modified during load.
-	 *
-	 * @var mixed
-	 */
-	private $_object;
-
-	/**
-	 * Create a new PHPExcel_Reader_Excel5_Escher instance
-	 *
-	 * @param mixed $object
-	 */
-	public function __construct($object)
-	{
-		$this->_object = $object;
-	}
-
-	/**
-	 * Load Escher stream data. May be a partial Escher stream.
-	 *
-	 * @param string $data
-	 */
-	public function load($data)
-	{
-		$this->_data = $data;
-
-		// total byte size of Excel data (workbook global substream + sheet substreams)
-		$this->_dataSize = strlen($this->_data);
-
-		$this->_pos = 0;
-
-		// Parse Escher stream
-		while ($this->_pos < $this->_dataSize) {
-
-			// offset: 2; size: 2: Record Type
-			$fbt = PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos + 2);
-
-			switch ($fbt) {
-				case self::DGGCONTAINER:	$this->_readDggContainer();		break;
-				case self::DGG:				$this->_readDgg();				break;
-				case self::BSTORECONTAINER:	$this->_readBstoreContainer();	break;
-				case self::BSE:				$this->_readBSE();				break;
-				case self::BLIPJPEG:		$this->_readBlipJPEG();			break;
-				case self::BLIPPNG:			$this->_readBlipPNG();			break;
-				case self::OPT:				$this->_readOPT();				break;
-				case self::TERTIARYOPT:		$this->_readTertiaryOPT();		break;
-				case self::SPLITMENUCOLORS:	$this->_readSplitMenuColors();	break;
-				case self::DGCONTAINER:		$this->_readDgContainer();		break;
-				case self::DG:				$this->_readDg();				break;
-				case self::SPGRCONTAINER:	$this->_readSpgrContainer();	break;
-				case self::SPCONTAINER:		$this->_readSpContainer();		break;
-				case self::SPGR:			$this->_readSpgr();				break;
-				case self::SP:				$this->_readSp();				break;
-				case self::CLIENTTEXTBOX:	$this->_readClientTextbox();	break;
-				case self::CLIENTANCHOR:	$this->_readClientAnchor();		break;
-				case self::CLIENTDATA:		$this->_readClientData();		break;
-				default:					$this->_readDefault();			break;
-			}
-		}
-
-		return $this->_object;
-	}
-
-	/**
-	 * Read a generic record
-	 */
-	private function _readDefault()
-	{
-		// offset 0; size: 2; recVer and recInstance
-		$verInstance = PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos);
-
-		// offset: 2; size: 2: Record Type
-		$fbt = PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos + 2);
-
-		// bit: 0-3; mask: 0x000F; recVer
-		$recVer = (0x000F & $verInstance) >> 0;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read DggContainer record (Drawing Group Container)
-	 */
-	private function _readDggContainer()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// record is a container, read contents
-		$dggContainer = new PHPExcel_Shared_Escher_DggContainer();
-		$this->_object->setDggContainer($dggContainer);
-		$reader = new PHPExcel_Reader_Excel5_Escher($dggContainer);
-		$reader->load($recordData);
-	}
-
-	/**
-	 * Read Dgg record (Drawing Group)
-	 */
-	private function _readDgg()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read BstoreContainer record (Blip Store Container)
-	 */
-	private function _readBstoreContainer()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// record is a container, read contents
-		$bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer();
-		$this->_object->setBstoreContainer($bstoreContainer);
-		$reader = new PHPExcel_Reader_Excel5_Escher($bstoreContainer);
-		$reader->load($recordData);
-	}
-
-	/**
-	 * Read BSE record
-	 */
-	private function _readBSE()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// add BSE to BstoreContainer
-		$BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
-		$this->_object->addBSE($BSE);
-
-		$BSE->setBLIPType($recInstance);
-
-		// offset: 0; size: 1; btWin32 (MSOBLIPTYPE)
-		$btWin32 = ord($recordData[0]);
-
-		// offset: 1; size: 1; btWin32 (MSOBLIPTYPE)
-		$btMacOS = ord($recordData[1]);
-
-		// offset: 2; size: 16; MD4 digest
-		$rgbUid = substr($recordData, 2, 16);
-
-		// offset: 18; size: 2; tag
-		$tag = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 18);
-
-		// offset: 20; size: 4; size of BLIP in bytes
-		$size = PHPExcel_Reader_Excel5::_GetInt4d($recordData, 20);
-
-		// offset: 24; size: 4; number of references to this BLIP
-		$cRef = PHPExcel_Reader_Excel5::_GetInt4d($recordData, 24);
-
-		// offset: 28; size: 4; MSOFO file offset
-		$foDelay = PHPExcel_Reader_Excel5::_GetInt4d($recordData, 28);
-
-		// offset: 32; size: 1; unused1
-		$unused1 = ord($recordData{32});
-
-		// offset: 33; size: 1; size of nameData in bytes (including null terminator)
-		$cbName = ord($recordData{33});
-
-		// offset: 34; size: 1; unused2
-		$unused2 = ord($recordData{34});
-
-		// offset: 35; size: 1; unused3
-		$unused3 = ord($recordData{35});
-
-		// offset: 36; size: $cbName; nameData
-		$nameData = substr($recordData, 36, $cbName);
-
-		// offset: 36 + $cbName, size: var; the BLIP data
-		$blipData = substr($recordData, 36 + $cbName);
-
-		// record is a container, read contents
-		$reader = new PHPExcel_Reader_Excel5_Escher($BSE);
-		$reader->load($blipData);
-	}
-
-	/**
-	 * Read BlipJPEG record. Holds raw JPEG image data
-	 */
-	private function _readBlipJPEG()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		$pos = 0;
-
-		// offset: 0; size: 16; rgbUid1 (MD4 digest of)
-		$rgbUid1 = substr($recordData, 0, 16);
-		$pos += 16;
-
-		// offset: 16; size: 16; rgbUid2 (MD4 digest), only if $recInstance = 0x46B or 0x6E3
-		if (in_array($recInstance, array(0x046B, 0x06E3))) {
-			$rgbUid2 = substr($recordData, 16, 16);
-			$pos += 16;
-		}
-
-		// offset: var; size: 1; tag
-		$tag = ord($recordData{$pos});
-		$pos += 1;
-
-		// offset: var; size: var; the raw image data
-		$data = substr($recordData, $pos);
-
-		$blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
-		$blip->setData($data);
-
-		$this->_object->setBlip($blip);
-	}
-
-	/**
-	 * Read BlipPNG record. Holds raw PNG image data
-	 */
-	private function _readBlipPNG()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		$pos = 0;
-
-		// offset: 0; size: 16; rgbUid1 (MD4 digest of)
-		$rgbUid1 = substr($recordData, 0, 16);
-		$pos += 16;
-
-		// offset: 16; size: 16; rgbUid2 (MD4 digest), only if $recInstance = 0x46B or 0x6E3
-		if ($recInstance == 0x06E1) {
-			$rgbUid2 = substr($recordData, 16, 16);
-			$pos += 16;
-		}
-
-		// offset: var; size: 1; tag
-		$tag = ord($recordData{$pos});
-		$pos += 1;
-
-		// offset: var; size: var; the raw image data
-		$data = substr($recordData, $pos);
-
-		$blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
-		$blip->setData($data);
-
-		$this->_object->setBlip($blip);
-	}
-
-	/**
-	 * Read OPT record. This record may occur within DggContainer record or SpContainer
-	 */
-	private function _readOPT()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		$this->_readOfficeArtRGFOPTE($recordData, $recInstance);
-	}
-
-	/**
-	 * Read TertiaryOPT record
-	 */
-	private function _readTertiaryOPT()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read SplitMenuColors record
-	 */
-	private function _readSplitMenuColors()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read DgContainer record (Drawing Container)
-	 */
-	private function _readDgContainer()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// record is a container, read contents
-		$dgContainer = new PHPExcel_Shared_Escher_DgContainer();
-		$this->_object->setDgContainer($dgContainer);
-		$reader = new PHPExcel_Reader_Excel5_Escher($dgContainer);
-		$escher = $reader->load($recordData);
-	}
-
-	/**
-	 * Read Dg record (Drawing)
-	 */
-	private function _readDg()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read SpgrContainer record (Shape Group Container)
-	 */
-	private function _readSpgrContainer()
-	{
-		// context is either context DgContainer or SpgrContainer
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// record is a container, read contents
-		$spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer();
-
-		if ($this->_object instanceof PHPExcel_Shared_Escher_DgContainer) {
-			// DgContainer
-			$this->_object->setSpgrContainer($spgrContainer);
-		} else {
-			// SpgrContainer
-			$this->_object->addChild($spgrContainer);
-		}
-
-		$reader = new PHPExcel_Reader_Excel5_Escher($spgrContainer);
-		$escher = $reader->load($recordData);
-	}
-
-	/**
-	 * Read SpContainer record (Shape Container)
-	 */
-	private function _readSpContainer()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// add spContainer to spgrContainer
-		$spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
-		$this->_object->addChild($spContainer);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// record is a container, read contents
-		$reader = new PHPExcel_Reader_Excel5_Escher($spContainer);
-		$escher = $reader->load($recordData);
-	}
-
-	/**
-	 * Read Spgr record (Shape Group)
-	 */
-	private function _readSpgr()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read Sp record (Shape)
-	 */
-	private function _readSp()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read ClientTextbox record
-	 */
-	private function _readClientTextbox()
-	{
-		// offset: 0; size: 2; recVer and recInstance
-
-		// bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
-
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read ClientAnchor record. This record holds information about where the shape is anchored in worksheet
-	 */
-	private function _readClientAnchor()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-
-		// offset: 2; size: 2; upper-left corner column index (0-based)
-		$c1 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 2);
-
-		// offset: 4; size: 2; upper-left corner horizontal offset in 1/1024 of column width
-		$startOffsetX = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 4);
-
-		// offset: 6; size: 2; upper-left corner row index (0-based)
-		$r1 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 6);
-
-		// offset: 8; size: 2; upper-left corner vertical offset in 1/256 of row height
-		$startOffsetY = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 8);
-
-		// offset: 10; size: 2; bottom-right corner column index (0-based)
-		$c2 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 10);
-
-		// offset: 12; size: 2; bottom-right corner horizontal offset in 1/1024 of column width
-		$endOffsetX = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 12);
-
-		// offset: 14; size: 2; bottom-right corner row index (0-based)
-		$r2 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 14);
-
-		// offset: 16; size: 2; bottom-right corner vertical offset in 1/256 of row height
-		$endOffsetY = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 16);
-
-		// set the start coordinates
-		$this->_object->setStartCoordinates(PHPExcel_Cell::stringFromColumnIndex($c1) . ($r1 + 1));
-
-		// set the start offsetX
-		$this->_object->setStartOffsetX($startOffsetX);
-
-		// set the start offsetY
-		$this->_object->setStartOffsetY($startOffsetY);
-
-		// set the end coordinates
-		$this->_object->setEndCoordinates(PHPExcel_Cell::stringFromColumnIndex($c2) . ($r2 + 1));
-
-		// set the end offsetX
-		$this->_object->setEndOffsetX($endOffsetX);
-
-		// set the end offsetY
-		$this->_object->setEndOffsetY($endOffsetY);
-	}
-
-	/**
-	 * Read ClientData record
-	 */
-	private function _readClientData()
-	{
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
-
-		// move stream pointer to next record
-		$this->_pos += 8 + $length;
-	}
-
-	/**
-	 * Read OfficeArtRGFOPTE table of property-value pairs
-	 *
-	 * @param string $data Binary data
-	 * @param int $n Number of properties
-	 */
-	private function _readOfficeArtRGFOPTE($data, $n) {
-
-		$splicedComplexData = substr($data, 6 * $n);
-
-		// loop through property-value pairs
-		for ($i = 0; $i < $n; ++$i) {
-			// read 6 bytes at a time
-			$fopte = substr($data, 6 * $i, 6);
-
-			// offset: 0; size: 2; opid
-			$opid = PHPExcel_Reader_Excel5::_GetInt2d($fopte, 0);
-
-			// bit: 0-13; mask: 0x3FFF; opid.opid
-			$opidOpid = (0x3FFF & $opid) >> 0;
-
-			// bit: 14; mask 0x4000; 1 = value in op field is BLIP identifier
-			$opidFBid = (0x4000 & $opid) >> 14;
-
-			// bit: 15; mask 0x8000; 1 = this is a complex property, op field specifies size of complex data
-			$opidFComplex = (0x8000 & $opid) >> 15;
-
-			// offset: 2; size: 4; the value for this property
-			$op = PHPExcel_Reader_Excel5::_GetInt4d($fopte, 2);
-
-			if ($opidFComplex) {
-				$complexData = substr($splicedComplexData, 0, $op);
-				$splicedComplexData = substr($splicedComplexData, $op);
-
-				// we store string value with complex data
-				$value = $complexData;
-			} else {
-				// we store integer value
-				$value = $op;
-			}
-
-			$this->_object->setOPT($opidOpid, $value);
-		}
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/Gnumeric.php b/plugins/exportTypes/Excel/PHPExcel/Reader/Gnumeric.php
deleted file mode 100755
index 355e71cd3..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/Gnumeric.php
+++ /dev/null
@@ -1,982 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_Gnumeric
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Read data only?
-	 * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
-	 *		or whether it should read both data and formatting
-	 *
-	 * @var	boolean
-	 */
-	private $_readDataOnly = false;
-
-	/**
-	 * Restrict which sheets should be loaded?
-	 * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
-	 *
-	 * @var	array of string
-	 */
-	private $_loadSheetsOnly = null;
-
-	/**
-	 * Formats
-	 *
-	 * @var array
-	 */
-	private $_styles = array();
-
-	/**
-	 * Shared Expressions
-	 *
-	 * @var array
-	 */
-	private $_expressions = array();
-
-	private $_referenceHelper = null;
-
-	/**
-	 * PHPExcel_Reader_IReadFilter instance
-	 *
-	 * @var PHPExcel_Reader_IReadFilter
-	 */
-	private $_readFilter = null;
-
-
-	/**
-	 * Create a new PHPExcel_Reader_Gnumeric
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-		$this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
-	}
-
-
-	/**
-	 * Read data only?
-	 *		If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
-	 *		If false (the default) it will read data and formatting.
-	 *
-	 * @return	boolean
-	 */
-	public function getReadDataOnly() {
-		return $this->_readDataOnly;
-	}
-
-
-	/**
-	 * Set read data only
-	 *		Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
-	 *		Set to false (the default) to advise the Reader to read both data and formatting for cells.
-	 *
-	 * @param	boolean	$pValue
-	 *
-	 * @return	PHPExcel_Reader_Gnumeric
-	 */
-	public function setReadDataOnly($pValue = false) {
-		$this->_readDataOnly = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Get which sheets to load
-	 * Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
-	 *		indicating that all worksheets in the workbook should be loaded.
-	 *
-	 * @return mixed
-	 */
-	public function getLoadSheetsOnly()
-	{
-		return $this->_loadSheetsOnly;
-	}
-
-
-	/**
-	 * Set which sheets to load
-	 *
-	 * @param mixed $value
-	 *		This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
-	 *		If NULL, then it tells the Reader to read all worksheets in the workbook
-	 *
-	 * @return PHPExcel_Reader_Gnumeric
-	 */
-	public function setLoadSheetsOnly($value = null)
-	{
-		$this->_loadSheetsOnly = is_array($value) ?
-			$value : array($value);
-		return $this;
-	}
-
-
-	/**
-	 * Set all sheets to load
-	 *		Tells the Reader to load all worksheets from the workbook.
-	 *
-	 * @return PHPExcel_Reader_Gnumeric
-	 */
-	public function setLoadAllSheets()
-	{
-		$this->_loadSheetsOnly = null;
-		return $this;
-	}
-
-
-	/**
-	 * Read filter
-	 *
-	 * @return PHPExcel_Reader_IReadFilter
-	 */
-	public function getReadFilter() {
-		return $this->_readFilter;
-	}
-
-
-	/**
-	 * Set read filter
-	 *
-	 * @param PHPExcel_Reader_IReadFilter $pValue
-	 * @return PHPExcel_Reader_Gnumeric
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFileName
-	 * @return 	boolean
-	 * @throws Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Check if gzlib functions are available
-		if (!function_exists('gzread')) {
-			throw new Exception("gzlib library is not enabled");
-		}
-
-		// Read signature data (first 3 bytes)
-		$fh = fopen($pFilename, 'r');
-		$data = fread($fh, 2);
-		fclose($fh);
-
-		if ($data != chr(0x1F).chr(0x8B)) {
-			return false;
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$gFileData = $this->_gzfileGetContents($pFilename);
-
-		$xml = simplexml_load_string($gFileData);
-		$namespacesMeta = $xml->getNamespaces(true);
-
-		$gnmXML = $xml->children($namespacesMeta['gnm']);
-
-		$worksheetInfo = array();
-
-		foreach ($gnmXML->Sheets->Sheet as $sheet) {
-			$tmpInfo = array();
-			$tmpInfo['worksheetName'] = (string) $sheet->Name;
-			$tmpInfo['lastColumnLetter'] = 'A';
-			$tmpInfo['lastColumnIndex'] = 0;
-			$tmpInfo['totalRows'] = 0;
-			$tmpInfo['totalColumns'] = 0;
-
-			foreach ($sheet->Cells->Cell as $cell) {
-				$cellAttributes = $cell->attributes();
-
-				$rowIndex = (int) $cellAttributes->Row + 1;
-				$columnIndex = (int) $cellAttributes->Col;
-
-				$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
-				$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
-			}
-
-			$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
-			$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
-
-			$worksheetInfo[] = $tmpInfo;
-		}
-
-		return $worksheetInfo;
-	}
-
-
-	private function _gzfileGetContents($filename) {
-		$file = @gzopen($filename, 'rb');
-		if ($file !== false) {
-			$data = '';
-			while (!gzeof($file)) {
-				$data .= gzread($file, 1024);
-			}
-			gzclose($file);
-		}
-		return $data;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
-
-		// Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}
-
-
-	/**
-	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	Exception
-	 */
-	public function listWorksheetNames($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$gFileData = $this->_gzfileGetContents($pFilename);
-
-		$xml = simplexml_load_string($gFileData);
-		$namespacesMeta = $xml->getNamespaces(true);
-
-		$gnmXML = $xml->children($namespacesMeta['gnm']);
-
-		$worksheetNames = array();
-
-		foreach($gnmXML->Sheets->Sheet as $sheet) {
-			$worksheetNames[] = (string) $sheet->Name;
-		}
-
-		return $worksheetNames;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file into PHPExcel instance
-	 *
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$timezoneObj = new DateTimeZone('Europe/London');
-		$GMT = new DateTimeZone('UTC');
-
-		$gFileData = $this->_gzfileGetContents($pFilename);
-
-//		echo '<pre>';
-//		echo htmlentities($gFileData,ENT_QUOTES,'UTF-8');
-//		echo '</pre><hr />';
-//
-		$xml = simplexml_load_string($gFileData);
-		$namespacesMeta = $xml->getNamespaces(true);
-
-//		var_dump($namespacesMeta);
-//
-		$gnmXML = $xml->children($namespacesMeta['gnm']);
-
-		$docProps = $objPHPExcel->getProperties();
-		//	Document Properties are held differently, depending on the version of Gnumeric
-		if (isset($namespacesMeta['office'])) {
-			$officeXML = $xml->children($namespacesMeta['office']);
-		    $officeDocXML = $officeXML->{'document-meta'};
-			$officeDocMetaXML = $officeDocXML->meta;
-
-			foreach($officeDocMetaXML as $officePropertyData) {
-
-				$officePropertyDC = array();
-				if (isset($namespacesMeta['dc'])) {
-					$officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
-				}
-				foreach($officePropertyDC as $propertyName => $propertyValue) {
-					$propertyValue = (string) $propertyValue;
-					switch ($propertyName) {
-						case 'title' :
-								$docProps->setTitle(trim($propertyValue));
-								break;
-						case 'subject' :
-								$docProps->setSubject(trim($propertyValue));
-								break;
-						case 'creator' :
-								$docProps->setCreator(trim($propertyValue));
-								$docProps->setLastModifiedBy(trim($propertyValue));
-								break;
-						case 'date' :
-								$creationDate = strtotime(trim($propertyValue));
-								$docProps->setCreated($creationDate);
-								$docProps->setModified($creationDate);
-								break;
-						case 'description' :
-								$docProps->setDescription(trim($propertyValue));
-								break;
-					}
-				}
-				$officePropertyMeta = array();
-				if (isset($namespacesMeta['meta'])) {
-					$officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
-				}
-				foreach($officePropertyMeta as $propertyName => $propertyValue) {
-					$attributes = $propertyValue->attributes($namespacesMeta['meta']);
-					$propertyValue = (string) $propertyValue;
-					switch ($propertyName) {
-						case 'keyword' :
-								$docProps->setKeywords(trim($propertyValue));
-								break;
-						case 'initial-creator' :
-								$docProps->setCreator(trim($propertyValue));
-								$docProps->setLastModifiedBy(trim($propertyValue));
-								break;
-						case 'creation-date' :
-								$creationDate = strtotime(trim($propertyValue));
-								$docProps->setCreated($creationDate);
-								$docProps->setModified($creationDate);
-								break;
-						case 'user-defined' :
-								list(,$attrName) = explode(':',$attributes['name']);
-								switch ($attrName) {
-									case 'publisher' :
-											$docProps->setCompany(trim($propertyValue));
-											break;
-									case 'category' :
-											$docProps->setCategory(trim($propertyValue));
-											break;
-									case 'manager' :
-											$docProps->setManager(trim($propertyValue));
-											break;
-								}
-								break;
-					}
-				}
-			}
-		} elseif (isset($gnmXML->Summary)) {
-			foreach($gnmXML->Summary->Item as $summaryItem) {
-				$propertyName = $summaryItem->name;
-				$propertyValue = $summaryItem->{'val-string'};
-				switch ($propertyName) {
-					case 'title' :
-						$docProps->setTitle(trim($propertyValue));
-						break;
-					case 'comments' :
-						$docProps->setDescription(trim($propertyValue));
-						break;
-					case 'keywords' :
-						$docProps->setKeywords(trim($propertyValue));
-						break;
-					case 'category' :
-						$docProps->setCategory(trim($propertyValue));
-						break;
-					case 'manager' :
-						$docProps->setManager(trim($propertyValue));
-						break;
-					case 'author' :
-						$docProps->setCreator(trim($propertyValue));
-						$docProps->setLastModifiedBy(trim($propertyValue));
-						break;
-					case 'company' :
-						$docProps->setCompany(trim($propertyValue));
-						break;
-				}
-			}
-		}
-
-		$worksheetID = 0;
-		foreach($gnmXML->Sheets->Sheet as $sheet) {
-			$worksheetName = (string) $sheet->Name;
-//			echo '<b>Worksheet: ',$worksheetName,'</b><br />';
-			if ((isset($this->_loadSheetsOnly)) && (!in_array($worksheetName, $this->_loadSheetsOnly))) {
-				continue;
-			}
-
-			$maxRow = $maxCol = 0;
-
-			// Create new Worksheet
-			$objPHPExcel->createSheet();
-			$objPHPExcel->setActiveSheetIndex($worksheetID);
-			//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
-			//		cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
-			//		name in line with the formula, not the reverse
-			$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
-
-			if ((!$this->_readDataOnly) && (isset($sheet->PrintInformation))) {
-				if (isset($sheet->PrintInformation->Margins)) {
-					foreach($sheet->PrintInformation->Margins->children('gnm',TRUE) as $key => $margin) {
-						$marginAttributes = $margin->attributes();
-						$marginSize = 72 / 100;	//	Default
-						switch($marginAttributes['PrefUnit']) {
-							case 'mm' :
-								$marginSize = intval($marginAttributes['Points']) / 100;
-								break;
-						}
-						switch($key) {
-							case 'top' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setTop($marginSize);
-								break;
-							case 'bottom' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setBottom($marginSize);
-								break;
-							case 'left' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setLeft($marginSize);
-								break;
-							case 'right' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setRight($marginSize);
-								break;
-							case 'header' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setHeader($marginSize);
-								break;
-							case 'footer' :
-								$objPHPExcel->getActiveSheet()->getPageMargins()->setFooter($marginSize);
-								break;
-						}
-					}
-				}
-			}
-
-			foreach($sheet->Cells->Cell as $cell) {
-				$cellAttributes = $cell->attributes();
-				$row = (int) $cellAttributes->Row + 1;
-				$column = (int) $cellAttributes->Col;
-
-				if ($row > $maxRow) $maxRow = $row;
-				if ($column > $maxCol) $maxCol = $column;
-
-				$column = PHPExcel_Cell::stringFromColumnIndex($column);
-
-				// Read cell?
-				if ($this->getReadFilter() !== NULL) {
-					if (!$this->getReadFilter()->readCell($column, $row, $worksheetName)) {
-						continue;
-					}
-				}
-
-				$ValueType = $cellAttributes->ValueType;
-				$ExprID = (string) $cellAttributes->ExprID;
-//				echo 'Cell ',$column,$row,'<br />';
-//				echo 'Type is ',$ValueType,'<br />';
-//				echo 'Value is ',$cell,'<br />';
-				$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
-				if ($ExprID > '') {
-					if (((string) $cell) > '') {
-
-						$this->_expressions[$ExprID] = array( 'column'	=> $cellAttributes->Col,
-															  'row'		=> $cellAttributes->Row,
-															  'formula'	=> (string) $cell
-															);
-//						echo 'NEW EXPRESSION ',$ExprID,'<br />';
-					} else {
-						$expression = $this->_expressions[$ExprID];
-
-						$cell = $this->_referenceHelper->updateFormulaReferences( $expression['formula'],
-																				  'A1',
-																				  $cellAttributes->Col - $expression['column'],
-																				  $cellAttributes->Row - $expression['row'],
-																				  $worksheetName
-																				);
-//						echo 'SHARED EXPRESSION ',$ExprID,'<br />';
-//						echo 'New Value is ',$cell,'<br />';
-					}
-					$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
-				} else {
-					switch($ValueType) {
-						case '10' :		//	NULL
-							$type = PHPExcel_Cell_DataType::TYPE_NULL;
-							break;
-						case '20' :		//	Boolean
-							$type = PHPExcel_Cell_DataType::TYPE_BOOL;
-							$cell = ($cell == 'TRUE') ? True : False;
-							break;
-						case '30' :		//	Integer
-							$cell = intval($cell);
-						case '40' :		//	Float
-							$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-							break;
-						case '50' :		//	Error
-							$type = PHPExcel_Cell_DataType::TYPE_ERROR;
-							break;
-						case '60' :		//	String
-							$type = PHPExcel_Cell_DataType::TYPE_STRING;
-							break;
-						case '70' :		//	Cell Range
-						case '80' :		//	Array
-					}
-				}
-				$objPHPExcel->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell,$type);
-			}
-
-			if ((!$this->_readDataOnly) && (isset($sheet->Objects))) {
-				foreach($sheet->Objects->children('gnm',TRUE) as $key => $comment) {
-					$commentAttributes = $comment->attributes();
-					//	Only comment objects are handled at the moment
-					if ($commentAttributes->Text) {
-						$objPHPExcel->getActiveSheet()->getComment( (string)$commentAttributes->ObjectBound )
-															->setAuthor( (string)$commentAttributes->Author )
-															->setText($this->_parseRichText((string)$commentAttributes->Text) );
-					}
-				}
-			}
-//			echo '$maxCol=',$maxCol,'; $maxRow=',$maxRow,'<br />';
-//
-			foreach($sheet->Styles->StyleRegion as $styleRegion) {
-				$styleAttributes = $styleRegion->attributes();
-				if (($styleAttributes['startRow'] <= $maxRow) &&
-					($styleAttributes['startCol'] <= $maxCol)) {
-
-					$startColumn = PHPExcel_Cell::stringFromColumnIndex((int) $styleAttributes['startCol']);
-					$startRow = $styleAttributes['startRow'] + 1;
-
-					$endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : (int) $styleAttributes['endCol'];
-					$endColumn = PHPExcel_Cell::stringFromColumnIndex($endColumn);
-					$endRow = ($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow'];
-					$endRow += 1;
-					$cellRange = $startColumn.$startRow.':'.$endColumn.$endRow;
-//					echo $cellRange,'<br />';
-
-					$styleAttributes = $styleRegion->Style->attributes();
-//					var_dump($styleAttributes);
-//					echo '<br />';
-
-					//	We still set the number format mask for date/time values, even if _readDataOnly is true
-					if ((!$this->_readDataOnly) ||
-						(PHPExcel_Shared_Date::isDateTimeFormatCode($styleArray['numberformat']['code']))) {
-						$styleArray = array();
-						$styleArray['numberformat']['code'] = (string) $styleAttributes['Format'];
-						//	If _readDataOnly is false, we set all formatting information
-						if (!$this->_readDataOnly) {
-							switch($styleAttributes['HAlign']) {
-								case '1' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
-									break;
-								case '2' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_LEFT;
-									break;
-								case '4' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_RIGHT;
-									break;
-								case '8' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_CENTER;
-									break;
-								case '16' :
-								case '64' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS;
-									break;
-								case '32' :
-									$styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY;
-									break;
-							}
-
-							switch($styleAttributes['VAlign']) {
-								case '1' :
-									$styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_TOP;
-									break;
-								case '2' :
-									$styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
-									break;
-								case '4' :
-									$styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_CENTER;
-									break;
-								case '8' :
-									$styleArray['alignment']['vertical'] = PHPExcel_Style_Alignment::VERTICAL_JUSTIFY;
-									break;
-							}
-
-							$styleArray['alignment']['wrap'] = ($styleAttributes['WrapText'] == '1') ? True : False;
-							$styleArray['alignment']['shrinkToFit'] = ($styleAttributes['ShrinkToFit'] == '1') ? True : False;
-							$styleArray['alignment']['indent'] = (intval($styleAttributes["Indent"]) > 0) ? $styleAttributes["indent"] : 0;
-
-							$RGB = self::_parseGnumericColour($styleAttributes["Fore"]);
-							$styleArray['font']['color']['rgb'] = $RGB;
-							$RGB = self::_parseGnumericColour($styleAttributes["Back"]);
-							$shade = $styleAttributes["Shade"];
-							if (($RGB != '000000') || ($shade != '0')) {
-								$styleArray['fill']['color']['rgb'] = $styleArray['fill']['startcolor']['rgb'] = $RGB;
-								$RGB2 = self::_parseGnumericColour($styleAttributes["PatternColor"]);
-								$styleArray['fill']['endcolor']['rgb'] = $RGB2;
-								switch($shade) {
-									case '1' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_SOLID;
-										break;
-									case '2' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR;
-										break;
-									case '3' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_GRADIENT_PATH;
-										break;
-									case '4' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN;
-										break;
-									case '5' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY;
-										break;
-									case '6' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID;
-										break;
-									case '7' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL;
-										break;
-									case '8' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS;
-										break;
-									case '9' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKUP;
-										break;
-									case '10' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL;
-										break;
-									case '11' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625;
-										break;
-									case '12' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_GRAY125;
-										break;
-									case '13' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN;
-										break;
-									case '14' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY;
-										break;
-									case '15' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID;
-										break;
-									case '16' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL;
-										break;
-									case '17' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS;
-										break;
-									case '18' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP;
-										break;
-									case '19' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL;
-										break;
-									case '20' :
-										$styleArray['fill']['type'] = PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY;
-										break;
-								}
-							}
-
-							$fontAttributes = $styleRegion->Style->Font->attributes();
-//							var_dump($fontAttributes);
-//							echo '<br />';
-							$styleArray['font']['name'] = (string) $styleRegion->Style->Font;
-							$styleArray['font']['size'] = intval($fontAttributes['Unit']);
-							$styleArray['font']['bold'] = ($fontAttributes['Bold'] == '1') ? True : False;
-							$styleArray['font']['italic'] = ($fontAttributes['Italic'] == '1') ? True : False;
-							$styleArray['font']['strike'] = ($fontAttributes['StrikeThrough'] == '1') ? True : False;
-							switch($fontAttributes['Underline']) {
-								case '1' :
-									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_SINGLE;
-									break;
-								case '2' :
-									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_DOUBLE;
-									break;
-								case '3' :
-									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING;
-									break;
-								case '4' :
-									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING;
-									break;
-								default :
-									$styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_NONE;
-									break;
-							}
-							switch($fontAttributes['Script']) {
-								case '1' :
-									$styleArray['font']['superScript'] = True;
-									break;
-								case '-1' :
-									$styleArray['font']['subScript'] = True;
-									break;
-							}
-
-							if (isset($styleRegion->Style->StyleBorder)) {
-								if (isset($styleRegion->Style->StyleBorder->Top)) {
-									$styleArray['borders']['top'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Top->attributes());
-								}
-								if (isset($styleRegion->Style->StyleBorder->Bottom)) {
-									$styleArray['borders']['bottom'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Bottom->attributes());
-								}
-								if (isset($styleRegion->Style->StyleBorder->Left)) {
-									$styleArray['borders']['left'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Left->attributes());
-								}
-								if (isset($styleRegion->Style->StyleBorder->Right)) {
-									$styleArray['borders']['right'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Right->attributes());
-								}
-								if ((isset($styleRegion->Style->StyleBorder->Diagonal)) && (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}))) {
-									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
-									$styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_BOTH;
-								} elseif (isset($styleRegion->Style->StyleBorder->Diagonal)) {
-									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
-									$styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_UP;
-								} elseif (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'})) {
-									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}->attributes());
-									$styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_DOWN;
-								}
-							}
-							if (isset($styleRegion->Style->HyperLink)) {
-								//	TO DO
-								$hyperlink = $styleRegion->Style->HyperLink->attributes();
-							}
-						}
-//						var_dump($styleArray);
-//						echo '<br />';
-						$objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($styleArray);
-					}
-				}
-			}
-
-			if ((!$this->_readDataOnly) && (isset($sheet->Cols))) {
-				//	Column Widths
-				$columnAttributes = $sheet->Cols->attributes();
-				$defaultWidth = $columnAttributes['DefaultSizePts']  / 5.4;
-				$c = 0;
-				foreach($sheet->Cols->ColInfo as $columnOverride) {
-					$columnAttributes = $columnOverride->attributes();
-					$column = $columnAttributes['No'];
-					$columnWidth = $columnAttributes['Unit']  / 5.4;
-					$hidden = ((isset($columnAttributes['Hidden'])) && ($columnAttributes['Hidden'] == '1')) ? true : false;
-					$columnCount = (isset($columnAttributes['Count'])) ? $columnAttributes['Count'] : 1;
-					while ($c < $column) {
-						$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($defaultWidth);
-						++$c;
-					}
-					while (($c < ($column+$columnCount)) && ($c <= $maxCol)) {
-						$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($columnWidth);
-						if ($hidden) {
-							$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setVisible(false);
-						}
-						++$c;
-					}
-				}
-				while ($c <= $maxCol) {
-					$objPHPExcel->getActiveSheet()->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($c))->setWidth($defaultWidth);
-					++$c;
-				}
-			}
-
-			if ((!$this->_readDataOnly) && (isset($sheet->Rows))) {
-				//	Row Heights
-				$rowAttributes = $sheet->Rows->attributes();
-				$defaultHeight = $rowAttributes['DefaultSizePts'];
-				$r = 0;
-
-				foreach($sheet->Rows->RowInfo as $rowOverride) {
-					$rowAttributes = $rowOverride->attributes();
-					$row = $rowAttributes['No'];
-					$rowHeight = $rowAttributes['Unit'];
-					$hidden = ((isset($rowAttributes['Hidden'])) && ($rowAttributes['Hidden'] == '1')) ? true : false;
-					$rowCount = (isset($rowAttributes['Count'])) ? $rowAttributes['Count'] : 1;
-					while ($r < $row) {
-						++$r;
-						$objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
-					}
-					while (($r < ($row+$rowCount)) && ($r < $maxRow)) {
-						++$r;
-						$objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($rowHeight);
-						if ($hidden) {
-							$objPHPExcel->getActiveSheet()->getRowDimension($r)->setVisible(false);
-						}
-					}
-				}
-				while ($r < $maxRow) {
-					++$r;
-					$objPHPExcel->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
-				}
-			}
-
-			//	Handle Merged Cells in this worksheet
-			if (isset($sheet->MergedRegions)) {
-				foreach($sheet->MergedRegions->Merge as $mergeCells) {
-					if (strpos($mergeCells,':') !== FALSE) {
-						$objPHPExcel->getActiveSheet()->mergeCells($mergeCells);
-					}
-				}
-			}
-
-			$worksheetID++;
-		}
-
-		//	Loop through definedNames (global named ranges)
-		if (isset($gnmXML->Names)) {
-			foreach($gnmXML->Names->Name as $namedRange) {
-				$name = (string) $namedRange->name;
-				$range = (string) $namedRange->value;
-				if (stripos($range, '#REF!') !== false) {
-					continue;
-				}
-
-				$range = explode('!',$range);
-				$range[0] = trim($range[0],"'");;
-				if ($worksheet = $objPHPExcel->getSheetByName($range[0])) {
-					$extractedRange = str_replace('$', '', $range[1]);
-					$objPHPExcel->addNamedRange( new PHPExcel_NamedRange($name, $worksheet, $extractedRange) );
-				}
-			}
-		}
-
-
-		// Return
-		return $objPHPExcel;
-	}
-
-
-	private static function _parseBorderAttributes($borderAttributes)
-	{
-		$styleArray = array();
-
-		if (isset($borderAttributes["Color"])) {
-			$RGB = self::_parseGnumericColour($borderAttributes["Color"]);
-			$styleArray['color']['rgb'] = $RGB;
-		}
-
-		switch ($borderAttributes["Style"]) {
-			case '0' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_NONE;
-				break;
-			case '1' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_THIN;
-				break;
-			case '2' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUM;
-				break;
-			case '4' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHED;
-				break;
-			case '5' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_THICK;
-				break;
-			case '6' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DOUBLE;
-				break;
-			case '7' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DOTTED;
-				break;
-			case '9' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHDOT;
-				break;
-			case '10' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT;
-				break;
-			case '11' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHDOTDOT;
-				break;
-			case '12' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
-				break;
-			case '13' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
-				break;
-			case '3' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_SLANTDASHDOT;
-				break;
-			case '8' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHED;
-				break;
-		}
-		return $styleArray;
-	}
-
-
-	private function _parseRichText($is = '') {
-		$value = new PHPExcel_RichText();
-
-		$value->createText($is);
-
-		return $value;
-	}
-
-
-	private static function _parseGnumericColour($gnmColour) {
-		list($gnmR,$gnmG,$gnmB) = explode(':',$gnmColour);
-		$gnmR = substr(str_pad($gnmR,4,'0',STR_PAD_RIGHT),0,2);
-		$gnmG = substr(str_pad($gnmG,4,'0',STR_PAD_RIGHT),0,2);
-		$gnmB = substr(str_pad($gnmB,4,'0',STR_PAD_RIGHT),0,2);
-		$RGB = $gnmR.$gnmG.$gnmB;
-//		echo 'Excel Colour: ',$RGB,'<br />';
-		return $RGB;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/HTML.php b/plugins/exportTypes/Excel/PHPExcel/Reader/HTML.php
deleted file mode 100755
index 73a0fe5c9..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/HTML.php
+++ /dev/null
@@ -1,499 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_HTML
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_HTML implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Input encoding
-	 *
-	 * @var string
-	 */
-	private $_inputEncoding	= 'ANSI';
-
-	/**
-	 * Sheet index to read
-	 *
-	 * @var int
-	 */
-	private $_sheetIndex 	= 0;
-
-	/**
-	 * Formats
-	 *
-	 * @var array
-	 */
-	private $_formats = array( 'h1' => array( 'font' => array( 'bold' => true,
-															   'size' => 24,
-															 ),
-											),	//	Bold, 24pt
-							   'h2' => array( 'font' => array( 'bold' => true,
-															   'size' => 18,
-															 ),
-											),	//	Bold, 18pt
-							   'h3' => array( 'font' => array( 'bold' => true,
-															   'size' => 13.5,
-															 ),
-											),	//	Bold, 13.5pt
-							   'h4' => array( 'font' => array( 'bold' => true,
-															   'size' => 12,
-															 ),
-											),	//	Bold, 12pt
-							   'h5' => array( 'font' => array( 'bold' => true,
-															   'size' => 10,
-															 ),
-											),	//	Bold, 10pt
-							   'h6' => array( 'font' => array( 'bold' => true,
-															   'size' => 7.5,
-															 ),
-											),	//	Bold, 7.5pt
-							   'a'  => array( 'font' => array( 'underline' => true,
-															   'color' => array( 'argb' => PHPExcel_Style_Color::COLOR_BLUE,
-															                   ),
-															 ),
-											),	//	Blue underlined
-							   'hr' => array( 'borders' => array( 'bottom' => array( 'style' => PHPExcel_Style_Border::BORDER_THIN,
-																					 'color' => array( PHPExcel_Style_Color::COLOR_BLACK,
-																					                 ),
-																				   ),
-																),
-											),	//	Bottom border
-							 );
-
-	/**
-	 * PHPExcel_Reader_IReadFilter instance
-	 *
-	 * @var PHPExcel_Reader_IReadFilter
-	 */
-	private $_readFilter = null;
-
-
-	/**
-	 * Create a new PHPExcel_Reader_HTML
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-	}
-
-	/**
-	 *	Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 *	@param 	string 		$pFileName
-	 *	@return 	boolean
-	 *	@throws Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Read sample data (first 2 KB will do)
-		$fh = fopen($pFilename, 'r');
-		$data = fread($fh, 2048);
-		fclose($fh);
-
-		return true;
-	}
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
-
-		// Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}
-
-	/**
-	 * Read filter
-	 *
-	 * @return PHPExcel_Reader_IReadFilter
-	 */
-	public function getReadFilter() {
-		return $this->_readFilter;
-	}
-
-	/**
-	 * Set read filter
-	 *
-	 * @param PHPExcel_Reader_IReadFilter $pValue
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Set input encoding
-	 *
-	 * @param string $pValue Input encoding
-	 */
-	public function setInputEncoding($pValue = 'ANSI')
-	{
-		$this->_inputEncoding = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get input encoding
-	 *
-	 * @return string
-	 */
-	public function getInputEncoding()
-	{
-		return $this->_inputEncoding;
-	}
-
-	//	Data Array used for testing only, should write to PHPExcel object on completion of tests
-	private $_dataArray = array();
-
-	private $_tableLevel = 0;
-	private $_nestedColumn = array('A');
-
-	private function _setTableStartColumn($column) {
-		if ($this->_tableLevel == 0)
-			$column = 'A';
-		++$this->_tableLevel;
-		$this->_nestedColumn[$this->_tableLevel] = $column;
-
-		return $this->_nestedColumn[$this->_tableLevel];
-	}
-
-	private function _getTableStartColumn() {
-		return $this->_nestedColumn[$this->_tableLevel];
-	}
-
-	private function _releaseTableStartColumn() {
-		--$this->_tableLevel;
-		return array_pop($this->_nestedColumn);
-	}
-
-	private function _flushCell($sheet,$column,$row,&$cellContent) {
-		if (is_string($cellContent)) {
-			//	Simple String content
-			if (trim($cellContent) > '') {
-				//	Only actually write it if there's content in the string
-				echo 'FLUSH CELL: ' , $column , $row , ' => ' , $cellContent , '<br />';
-				//	Write to worksheet to be done here...
-				//	... we return the cell so we can mess about with styles more easily
-				$cell = $sheet->setCellValue($column.$row,$cellContent,true);
-				$this->_dataArray[$row][$column] = $cellContent;
-			}
-		} else {
-			//	We have a Rich Text run
-			//	TODO
-			$this->_dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
-		}
-		$cellContent = (string) '';
-	}
-
-	private function _processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent){
-		foreach($element->childNodes as $child){
-			if ($child instanceOf DOMText) {
-				$domText = preg_replace('/\s+/',' ',trim($child->nodeValue));
-				if (is_string($cellContent)) {
-					//	simply append the text if the cell content is a plain text string
-					$cellContent .= $domText;
-				} else {
-					//	but if we have a rich text run instead, we need to append it correctly
-					//	TODO
-				}
-			} elseif($child instanceOf DOMElement) {
-				echo '<b>DOM ELEMENT: </b>' , strtoupper($child->nodeName) , '<br />';
-
-				$attributeArray = array();
-				foreach($child->attributes as $attribute) {
-					echo '<b>ATTRIBUTE: </b>' , $attribute->name , ' => ' , $attribute->value , '<br />';
-					$attributeArray[$attribute->name] = $attribute->value;
-				}
-
-				switch($child->nodeName) {
-					case 'meta' :
-						foreach($attributeArray as $attributeName => $attributeValue) {
-							switch($attributeName) {
-								case 'content':
-									//	TODO
-									//	Extract character set, so we can convert to UTF-8 if required
-									break;
-							}
-						}
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-						break;
-					case 'title' :
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-						$sheet->setTitle($cellContent);
-						$cellContent = '';
-						break;
-					case 'span'  :
-					case 'div'   :
-					case 'font'  :
-					case 'i'     :
-					case 'em'    :
-					case 'strong':
-					case 'b'     :
-						echo 'STYLING, SPAN OR DIV<br />';
-						if ($cellContent > '')
-							$cellContent .= ' ';
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-						if ($cellContent > '')
-							$cellContent .= ' ';
-						echo 'END OF STYLING, SPAN OR DIV<br />';
-						break;
-					case 'hr' :
-						$this->_flushCell($sheet,$column,$row,$cellContent);
-						++$row;
-						if (isset($this->_formats[$child->nodeName])) {
-							$sheet->getStyle($column.$row)->applyFromArray($this->_formats[$child->nodeName]);
-						} else {
-							$cellContent = '----------';
-							$this->_flushCell($sheet,$column,$row,$cellContent);
-						}
-						++$row;
-					case 'br' :
-						if ($this->_tableLevel > 0) {
-							//	If we're inside a table, replace with a \n
-							$cellContent .= "\n";
-						} else {
-							//	Otherwise flush our existing content and move the row cursor on
-							$this->_flushCell($sheet,$column,$row,$cellContent);
-							++$row;
-						}
-						echo 'HARD LINE BREAK: ' , '<br />';
-						break;
-					case 'a'  :
-						echo 'START OF HYPERLINK: ' , '<br />';
-						foreach($attributeArray as $attributeName => $attributeValue) {
-							switch($attributeName) {
-								case 'href':
-									echo 'Link to ' , $attributeValue , '<br />';
-									$sheet->getCell($column.$row)->getHyperlink()->setUrl($attributeValue);
-									if (isset($this->_formats[$child->nodeName])) {
-										$sheet->getStyle($column.$row)->applyFromArray($this->_formats[$child->nodeName]);
-									}
-									break;
-							}
-						}
-						$cellContent .= ' ';
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-						echo 'END OF HYPERLINK:' , '<br />';
-						break;
-					case 'h1' :
-					case 'h2' :
-					case 'h3' :
-					case 'h4' :
-					case 'h5' :
-					case 'h6' :
-					case 'ol' :
-					case 'ul' :
-					case 'p'  :
-						if ($this->_tableLevel > 0) {
-							//	If we're inside a table, replace with a \n
-							$cellContent .= "\n";
-							echo 'LIST ENTRY: ' , '<br />';
-							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-							echo 'END OF LIST ENTRY:' , '<br />';
-						} else {
-							if ($cellContent > '') {
-								$this->_flushCell($sheet,$column,$row,$cellContent);
-								$row += 2;
-							}
-							echo 'START OF PARAGRAPH: ' , '<br />';
-							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-							echo 'END OF PARAGRAPH:' , '<br />';
-							$this->_flushCell($sheet,$column,$row,$cellContent);
-
-							if (isset($this->_formats[$child->nodeName])) {
-								$sheet->getStyle($column.$row)->applyFromArray($this->_formats[$child->nodeName]);
-							}
-
-							$row += 2;
-							$column = 'A';
-						}
-						break;
-					case 'li'  :
-						if ($this->_tableLevel > 0) {
-							//	If we're inside a table, replace with a \n
-							$cellContent .= "\n";
-							echo 'LIST ENTRY: ' , '<br />';
-							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-							echo 'END OF LIST ENTRY:' , '<br />';
-						} else {
-							if ($cellContent > '') {
-								$this->_flushCell($sheet,$column,$row,$cellContent);
-							}
-							++$row;
-							echo 'LIST ENTRY: ' , '<br />';
-							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-							echo 'END OF LIST ENTRY:' , '<br />';
-							$this->_flushCell($sheet,$column,$row,$cellContent);
-							$column = 'A';
-						}
-						break;
-					case 'table' :
-						$this->_flushCell($sheet,$column,$row,$cellContent);
-						$column = $this->_setTableStartColumn($column);
-						echo 'START OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
-						if ($this->_tableLevel > 1)
-							--$row;
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-						echo 'END OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
-						$column = $this->_releaseTableStartColumn();
-						if ($this->_tableLevel > 1) {
-							++$column;
-						} else {
-							++$row;
-						}
-						break;
-					case 'thead' :
-					case 'tbody' :
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-						break;
-					case 'tr' :
-						++$row;
-						$column = $this->_getTableStartColumn();
-						$cellContent = '';
-						echo 'START OF TABLE ' , $this->_tableLevel , ' ROW<br />';
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-						echo 'END OF TABLE ' , $this->_tableLevel , ' ROW<br />';
-						break;
-					case 'th' :
-					case 'td' :
-						echo 'START OF TABLE ' , $this->_tableLevel , ' CELL<br />';
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-						echo 'END OF TABLE ' , $this->_tableLevel , ' CELL<br />';
-						$this->_flushCell($sheet,$column,$row,$cellContent);
-						++$column;
-						break;
-					case 'body' :
-						$row = 1;
-						$column = 'A';
-						$content = '';
-						$this->_tableLevel = 0;
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-						break;
-					default:
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Loads PHPExcel from file into PHPExcel instance
-	 *
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		if (!is_file($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! The given file is not a regular file.");
-		}
-
-		// Create new PHPExcel
-		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
-			$objPHPExcel->createSheet();
-		}
-		$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
-
-		//	Create a new DOM object
-		$dom = new domDocument;
-		//	Load the HTML file into the DOM object
-		$loaded = $dom->loadHTMLFile($pFilename);
-		if ($loaded === false) {
-			throw new Exception('Failed to load ',$pFilename,' as a DOM Document');
-		}
-
-		//	Discard white space
-		$dom->preserveWhiteSpace = false;
-
-
-		$row = 0;
-		$column = 'A';
-		$content = '';
-		$this->_processDomElement($dom,$objPHPExcel->getActiveSheet(),$row,$column,$content);
-
-		echo '<hr />';
-		var_dump($this->_dataArray);
-
-		// Return
-		return $objPHPExcel;
-	}
-
-	/**
-	 * Get sheet index
-	 *
-	 * @return int
-	 */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
-	}
-
-	/**
-	 * Set sheet index
-	 *
-	 * @param	int		$pValue		Sheet index
-	 * @return PHPExcel_Reader_HTML
-	 */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
-		return $this;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/IReadFilter.php b/plugins/exportTypes/Excel/PHPExcel/Reader/IReadFilter.php
deleted file mode 100755
index 5f29cd502..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/IReadFilter.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Reader_IReadFilter
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_Reader_IReadFilter
-{
-	/**
-	 * Should this cell be read?
-	 *
-	 * @param 	$column		String column index
-	 * @param 	$row			Row index
-	 * @param	$worksheetName	Optional worksheet name
-	 * @return	boolean
-	 */
-	public function readCell($column, $row, $worksheetName = '');
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/IReader.php b/plugins/exportTypes/Excel/PHPExcel/Reader/IReader.php
deleted file mode 100755
index e36495e8f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/IReader.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Reader_IReader
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_Reader_IReader
-{
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFileName
-	 * @return 	boolean
-	 */
-	public function canRead($pFilename);
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFileName
-	 * @throws 	Exception
-	 */
-	public function load($pFilename);
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/OOCalc.php b/plugins/exportTypes/Excel/PHPExcel/Reader/OOCalc.php
deleted file mode 100755
index ab3023ed2..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/OOCalc.php
+++ /dev/null
@@ -1,733 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_OOCalc
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Read data only?
-	 * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
-	 *		or whether it should read both data and formatting
-	 *
-	 * @var	boolean
-	 */
-	private $_readDataOnly = false;
-
-	/**
-	 * Restrict which sheets should be loaded?
-	 * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
-	 *
-	 * @var	array of string
-	 */
-	private $_loadSheetsOnly = null;
-
-	/**
-	 * Formats
-	 *
-	 * @var array
-	 */
-	private $_styles = array();
-
-	/**
-	 * PHPExcel_Reader_IReadFilter instance
-	 *
-	 * @var PHPExcel_Reader_IReadFilter
-	 */
-	private $_readFilter = null;
-
-
-	/**
-	 * Create a new PHPExcel_Reader_OOCalc
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-	}
-
-
-	/**
-	 * Read data only?
-	 *		If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
-	 *		If false (the default) it will read data and formatting.
-	 *
-	 * @return	boolean
-	 */
-	public function getReadDataOnly() {
-		return $this->_readDataOnly;
-	}
-
-
-	/**
-	 * Set read data only
-	 *		Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
-	 *		Set to false (the default) to advise the Reader to read both data and formatting for cells.
-	 *
-	 * @param	boolean	$pValue
-	 * @return	PHPExcel_Reader_OOCalc
-	 */
-	public function setReadDataOnly($pValue = false) {
-		$this->_readDataOnly = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Get which sheets to load
-	 *		Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
-	 *			indicating that all worksheets in the workbook should be loaded.
-	 *
-	 * @return mixed
-	 */
-	public function getLoadSheetsOnly()
-	{
-		return $this->_loadSheetsOnly;
-	}
-
-
-	/**
-	 * Set which sheets to load
-	 *
-	 * @param mixed $value
-	 *		This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
-	 *		If NULL, then it tells the Reader to read all worksheets in the workbook
-	 *
-	 * @return PHPExcel_Reader_OOCalc
-	 */
-	public function setLoadSheetsOnly($value = null)
-	{
-		$this->_loadSheetsOnly = is_array($value) ?
-			$value : array($value);
-		return $this;
-	}
-
-
-	/**
-	 * Set all sheets to load
-	 *		Tells the Reader to load all worksheets from the workbook.
-	 *
-	 * @return PHPExcel_Reader_OOCalc
-	 */
-	public function setLoadAllSheets()
-	{
-		$this->_loadSheetsOnly = null;
-		return $this;
-	}
-
-
-	/**
-	 * Read filter
-	 *
-	 * @return PHPExcel_Reader_IReadFilter
-	 */
-	public function getReadFilter() {
-		return $this->_readFilter;
-	}
-
-
-	/**
-	 * Set read filter
-	 *
-	 * @param PHPExcel_Reader_IReadFilter $pValue
-	 * @return PHPExcel_Reader_OOCalc
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFileName
-	 * @return 	boolean
-	 * @throws Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Check if zip class exists
-		if (!class_exists('ZipArchive',FALSE)) {
-			throw new Exception("ZipArchive library is not enabled");
-		}
-
-		// Load file
-		$zip = new ZipArchive;
-		if ($zip->open($pFilename) === true) {
-			// check if it is an OOXML archive
-			$stat = $zip->statName('mimetype');
-			if ($stat && ($stat['size'] <= 255)) {
-				$mimeType = $zip->getFromName($stat['name']);
-			} else {
-				$zip->close();
-				return FALSE;
-			}
-
-			$zip->close();
-
-			return ($mimeType === 'application/vnd.oasis.opendocument.spreadsheet');
-		}
-
-		return FALSE;
-	}
-
-
-	/**
-	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	Exception
-	 */
-	public function listWorksheetNames($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetNames = array();
-
-		$zip = new ZipArchive;
-		if ($zip->open($pFilename) === true) {
-
-			$xml = simplexml_load_string($zip->getFromName("content.xml"));
-			$namespacesContent = $xml->getNamespaces(true);
-
-			$workbook = $xml->children($namespacesContent['office']);
-			foreach($workbook->body->spreadsheet as $workbookData) {
-				$workbookData = $workbookData->children($namespacesContent['table']);
-				foreach($workbookData->table as $worksheetDataSet) {
-					$worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
-
-					$worksheetNames[] = $worksheetDataAttributes['name'];
-				}
-			}
-		}
-
-		return $worksheetNames;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
-
-		// Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}
-
-
-	private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
-		$styleAttributeValue = strtolower($styleAttributeValue);
-		foreach($styleList as $style) {
-			if ($styleAttributeValue == strtolower($style)) {
-				$styleAttributeValue = $style;
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$worksheetInfo = array();
-
-		$zip = new ZipArchive;
-		if ($zip->open($pFilename) === true) {
-
-			$xml = simplexml_load_string($zip->getFromName("content.xml"));
-			$namespacesContent = $xml->getNamespaces(true);
-
-			$workbook = $xml->children($namespacesContent['office']);
-			foreach($workbook->body->spreadsheet as $workbookData) {
-				$workbookData = $workbookData->children($namespacesContent['table']);
-				foreach($workbookData->table as $worksheetDataSet) {
-					$worksheetData = $worksheetDataSet->children($namespacesContent['table']);
-					$worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
-
-					$tmpInfo = array();
-					$tmpInfo['worksheetName'] = (string) $worksheetDataAttributes['name'];
-					$tmpInfo['lastColumnLetter'] = 'A';
-					$tmpInfo['lastColumnIndex'] = 0;
-					$tmpInfo['totalRows'] = 0;
-					$tmpInfo['totalColumns'] = 0;
-
-					$rowIndex = 0;
-					foreach ($worksheetData as $key => $rowData) {
-						switch ($key) {
-							case 'table-row' :
-								$rowDataTableAttributes = $rowData->attributes($namespacesContent['table']);
-								$rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ?
-										$rowDataTableAttributes['number-rows-repeated'] : 1;
-								$columnIndex = 0;
-
-								foreach ($rowData as $key => $cellData) {
-									$cellDataTableAttributes = $cellData->attributes($namespacesContent['table']);
-									$colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ?
-										$cellDataTableAttributes['number-columns-repeated'] : 1;
-									$cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);
-									if (isset($cellDataOfficeAttributes['value-type'])) {
-										$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex + $colRepeats - 1);
-										$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex + $rowRepeats);
-									}
-									$columnIndex += $colRepeats;
-								}
-								$rowIndex += $rowRepeats;
-								break;
-						}
-					}
-
-					$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
-					$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
-
-					$worksheetInfo[] = $tmpInfo;
-				}
-			}
-		}
-
-		return $worksheetInfo;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file into PHPExcel instance
-	 *
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		$timezoneObj = new DateTimeZone('Europe/London');
-		$GMT = new DateTimeZone('UTC');
-
-		$zip = new ZipArchive;
-		if ($zip->open($pFilename) === true) {
-//			echo '<h1>Meta Information</h1>';
-			$xml = simplexml_load_string($zip->getFromName("meta.xml"));
-			$namespacesMeta = $xml->getNamespaces(true);
-//			echo '<pre>';
-//			print_r($namespacesMeta);
-//			echo '</pre><hr />';
-
-			$docProps = $objPHPExcel->getProperties();
-			$officeProperty = $xml->children($namespacesMeta['office']);
-			foreach($officeProperty as $officePropertyData) {
-				$officePropertyDC = array();
-				if (isset($namespacesMeta['dc'])) {
-					$officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
-				}
-				foreach($officePropertyDC as $propertyName => $propertyValue) {
-					switch ($propertyName) {
-						case 'title' :
-								$docProps->setTitle($propertyValue);
-								break;
-						case 'subject' :
-								$docProps->setSubject($propertyValue);
-								break;
-						case 'creator' :
-								$docProps->setCreator($propertyValue);
-								$docProps->setLastModifiedBy($propertyValue);
-								break;
-						case 'date' :
-								$creationDate = strtotime($propertyValue);
-								$docProps->setCreated($creationDate);
-								$docProps->setModified($creationDate);
-								break;
-						case 'description' :
-								$docProps->setDescription($propertyValue);
-								break;
-					}
-				}
-				$officePropertyMeta = array();
-				if (isset($namespacesMeta['dc'])) {
-					$officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
-				}
-				foreach($officePropertyMeta as $propertyName => $propertyValue) {
-					$propertyValueAttributes = $propertyValue->attributes($namespacesMeta['meta']);
-					switch ($propertyName) {
-						case 'initial-creator' :
-								$docProps->setCreator($propertyValue);
-								break;
-						case 'keyword' :
-								$docProps->setKeywords($propertyValue);
-								break;
-						case 'creation-date' :
-								$creationDate = strtotime($propertyValue);
-								$docProps->setCreated($creationDate);
-								break;
-						case 'user-defined' :
-								$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
-								foreach ($propertyValueAttributes as $key => $value) {
-									if ($key == 'name') {
-										$propertyValueName = (string) $value;
-									} elseif($key == 'value-type') {
-										switch ($value) {
-											case 'date'	:
-												$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'date');
-												$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE;
-												break;
-											case 'boolean'	:
-												$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'bool');
-												$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN;
-												break;
-											case 'float'	:
-												$propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue,'r4');
-												$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT;
-												break;
-											default :
-												$propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING;
-										}
-									}
-								}
-								$docProps->setCustomProperty($propertyValueName,$propertyValue,$propertyValueType);
-								break;
-					}
-				}
-			}
-
-
-//			echo '<h1>Workbook Content</h1>';
-			$xml = simplexml_load_string($zip->getFromName("content.xml"));
-			$namespacesContent = $xml->getNamespaces(true);
-//			echo '<pre>';
-//			print_r($namespacesContent);
-//			echo '</pre><hr />';
-
-			$workbook = $xml->children($namespacesContent['office']);
-			foreach($workbook->body->spreadsheet as $workbookData) {
-				$workbookData = $workbookData->children($namespacesContent['table']);
-				$worksheetID = 0;
-				foreach($workbookData->table as $worksheetDataSet) {
-					$worksheetData = $worksheetDataSet->children($namespacesContent['table']);
-//					print_r($worksheetData);
-//					echo '<br />';
-					$worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
-//					print_r($worksheetDataAttributes);
-//					echo '<br />';
-					if ((isset($this->_loadSheetsOnly)) && (isset($worksheetDataAttributes['name'])) &&
-						(!in_array($worksheetDataAttributes['name'], $this->_loadSheetsOnly))) {
-						continue;
-					}
-
-//					echo '<h2>Worksheet '.$worksheetDataAttributes['name'].'</h2>';
-					// Create new Worksheet
-					$objPHPExcel->createSheet();
-					$objPHPExcel->setActiveSheetIndex($worksheetID);
-					if (isset($worksheetDataAttributes['name'])) {
-						$worksheetName = (string) $worksheetDataAttributes['name'];
-						//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
-						//		formula cells... during the load, all formulae should be correct, and we're simply
-						//		bringing the worksheet name in line with the formula, not the reverse
-						$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
-					}
-
-					$rowID = 1;
-					foreach($worksheetData as $key => $rowData) {
-//						echo '<b>'.$key.'</b><br />';
-						switch ($key) {
-							case 'table-header-rows':
-								foreach ($rowData as $key=>$cellData) {
-									$rowData = $cellData;
-									break;
-								}
-							case 'table-row' :
-								$rowDataTableAttributes = $rowData->attributes($namespacesContent['table']);
-								$rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ?
-										$rowDataTableAttributes['number-rows-repeated'] : 1;
-								$columnID = 'A';
-								foreach($rowData as $key => $cellData) {
-									if ($this->getReadFilter() !== NULL) {
-										if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
-											continue;
-										}
-									}
-
-//									echo '<b>'.$columnID.$rowID.'</b><br />';
-									$cellDataText = (isset($namespacesContent['text'])) ?
-										$cellData->children($namespacesContent['text']) :
-										'';
-									$cellDataOffice = $cellData->children($namespacesContent['office']);
-									$cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);
-									$cellDataTableAttributes = $cellData->attributes($namespacesContent['table']);
-
-//									echo 'Office Attributes: ';
-//									print_r($cellDataOfficeAttributes);
-//									echo '<br />Table Attributes: ';
-//									print_r($cellDataTableAttributes);
-//									echo '<br />Cell Data Text';
-//									print_r($cellDataText);
-//									echo '<br />';
-//
-									$type = $formatting = $hyperlink = null;
-									$hasCalculatedValue = false;
-									$cellDataFormula = '';
-									if (isset($cellDataTableAttributes['formula'])) {
-										$cellDataFormula = $cellDataTableAttributes['formula'];
-										$hasCalculatedValue = true;
-									}
-
-									if (isset($cellDataOffice->annotation)) {
-//										echo 'Cell has comment<br />';
-										$annotationText = $cellDataOffice->annotation->children($namespacesContent['text']);
-										$textArray = array();
-										foreach($annotationText as $t) {
-											foreach($t->span as $text) {
-												$textArray[] = (string)$text;
-											}
-										}
-										$text = implode("\n",$textArray);
-//										echo $text,'<br />';
-										$objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
-//																		->setAuthor( $author )
-																		->setText($this->_parseRichText($text) );
-									}
-
-									if (isset($cellDataText->p)) {
-										// Consolidate if there are multiple p records (maybe with spans as well)
-										$dataArray = array();
-										// Text can have multiple text:p and within those, multiple text:span.
-										// text:p newlines, but text:span does not.
-										// Also, here we assume there is no text data is span fields are specified, since
-										// we have no way of knowing proper positioning anyway.
-										foreach ($cellDataText->p as $pData) {
-											if (isset($pData->span)) {
-												// span sections do not newline, so we just create one large string here
-												$spanSection = "";
-												foreach ($pData->span as $spanData) {
-													$spanSection .= $spanData;
-												}
-												array_push($dataArray, $spanSection);
-											} else {
-												array_push($dataArray, $pData);
-											}
-										}
-										$allCellDataText = implode($dataArray, "\n");
-
-//										echo 'Value Type is '.$cellDataOfficeAttributes['value-type'].'<br />';
-										switch ($cellDataOfficeAttributes['value-type']) {
- 											case 'string' :
-													$type = PHPExcel_Cell_DataType::TYPE_STRING;
-													$dataValue = $allCellDataText;
-													if (isset($dataValue->a)) {
-														$dataValue = $dataValue->a;
-														$cellXLinkAttributes = $dataValue->attributes($namespacesContent['xlink']);
-														$hyperlink = $cellXLinkAttributes['href'];
-													}
-													break;
-											case 'boolean' :
-													$type = PHPExcel_Cell_DataType::TYPE_BOOL;
-													$dataValue = ($allCellDataText == 'TRUE') ? True : False;
-													break;
-											case 'percentage' :
-													$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-													$dataValue = (float) $cellDataOfficeAttributes['value'];
-													if (floor($dataValue) == $dataValue) {
-														$dataValue = (integer) $dataValue;
-													}
-													$formatting = PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00;
-													break;
-											case 'currency' :
-													$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-													$dataValue = (float) $cellDataOfficeAttributes['value'];
-													if (floor($dataValue) == $dataValue) {
-														$dataValue = (integer) $dataValue;
-													}
-													$formatting = PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE;
-													break;
-											case 'float' :
-													$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-													$dataValue = (float) $cellDataOfficeAttributes['value'];
-													if (floor($dataValue) == $dataValue) {
-														if ($dataValue = (integer) $dataValue)
-															$dataValue = (integer) $dataValue;
-														else
-															$dataValue = (float) $dataValue;
-													}
-													break;
-											case 'date' :
-													$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-												    $dateObj = new DateTime($cellDataOfficeAttributes['date-value'], $GMT);
-													$dateObj->setTimeZone($timezoneObj);
-													list($year,$month,$day,$hour,$minute,$second) = explode(' ',$dateObj->format('Y m d H i s'));
-													$dataValue = PHPExcel_Shared_Date::FormattedPHPToExcel($year,$month,$day,$hour,$minute,$second);
-													if ($dataValue != floor($dataValue)) {
-														$formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15.' '.PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4;
-													} else {
-														$formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15;
-													}
-													break;
-											case 'time' :
-													$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
-													$dataValue = PHPExcel_Shared_Date::PHPToExcel(strtotime('01-01-1970 '.implode(':',sscanf($cellDataOfficeAttributes['time-value'],'PT%dH%dM%dS'))));
-													$formatting = PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4;
-													break;
-										}
-//										echo 'Data value is '.$dataValue.'<br />';
-//										if ($hyperlink !== NULL) {
-//											echo 'Hyperlink is '.$hyperlink.'<br />';
-//										}
-									} else {
-										$type = PHPExcel_Cell_DataType::TYPE_NULL;
-										$dataValue = NULL;
-									}
-
-									if ($hasCalculatedValue) {
-										$type = PHPExcel_Cell_DataType::TYPE_FORMULA;
-//										echo 'Formula: '.$cellDataFormula.'<br />';
-										$cellDataFormula = substr($cellDataFormula,strpos($cellDataFormula,':=')+1);
-										$temp = explode('"',$cellDataFormula);
-										$tKey = false;
-										foreach($temp as &$value) {
-											//	Only replace in alternate array entries (i.e. non-quoted blocks)
-											if ($tKey = !$tKey) {
-												$value = preg_replace('/\[\.(.*):\.(.*)\]/Ui','$1:$2',$value);
-												$value = preg_replace('/\[\.(.*)\]/Ui','$1',$value);
-												$value = PHPExcel_Calculation::_translateSeparator(';',',',$value,$inBraces);
-											}
-										}
-										unset($value);
-										//	Then rebuild the formula string
-										$cellDataFormula = implode('"',$temp);
-//										echo 'Adjusted Formula: '.$cellDataFormula.'<br />';
-									}
-
-									$colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ?
-										$cellDataTableAttributes['number-columns-repeated'] : 1;
-									if ($type !== NULL) {
-										for ($i = 0; $i < $colRepeats; ++$i) {
-											if ($i > 0) {
-												++$columnID;
-											}
-											if ($type !== PHPExcel_Cell_DataType::TYPE_NULL) {
-												for ($rowAdjust = 0; $rowAdjust < $rowRepeats; ++$rowAdjust) {
-													$rID = $rowID + $rowAdjust;
-													$objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $dataValue),$type);
-													if ($hasCalculatedValue) {
-//														echo 'Forumla result is '.$dataValue.'<br />';
-														$objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->setCalculatedValue($dataValue);
-													}
-													if ($formatting !== NULL) {
-														$objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode($formatting);
-													} else {
-														$objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_GENERAL);
-													}
-													if ($hyperlink !== NULL) {
-														$objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->getHyperlink()->setUrl($hyperlink);
-													}
-												}
-											}
-										}
-									}
-
-									//	Merged cells
-									if ((isset($cellDataTableAttributes['number-columns-spanned'])) || (isset($cellDataTableAttributes['number-rows-spanned']))) {
-										if (($type !== PHPExcel_Cell_DataType::TYPE_NULL) || (!$this->_readDataOnly)) {
-											$columnTo = $columnID;
-											if (isset($cellDataTableAttributes['number-columns-spanned'])) {
-												$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-spanned'] -2);
-											}
-											$rowTo = $rowID;
-											if (isset($cellDataTableAttributes['number-rows-spanned'])) {
-												$rowTo = $rowTo + $cellDataTableAttributes['number-rows-spanned'] - 1;
-											}
-											$cellRange = $columnID.$rowID.':'.$columnTo.$rowTo;
-											$objPHPExcel->getActiveSheet()->mergeCells($cellRange);
-										}
-									}
-
-									++$columnID;
-								}
-								$rowID += $rowRepeats;
-								break;
-						}
-					}
-					++$worksheetID;
-				}
-			}
-
-		}
-
-		// Return
-		return $objPHPExcel;
-	}
-
-
-	private function _parseRichText($is = '') {
-		$value = new PHPExcel_RichText();
-
-		$value->createText($is);
-
-		return $value;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Reader/SYLK.php b/plugins/exportTypes/Excel/PHPExcel/Reader/SYLK.php
deleted file mode 100755
index 6aae75285..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Reader/SYLK.php
+++ /dev/null
@@ -1,498 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_SYLK
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_SYLK implements PHPExcel_Reader_IReader
-{
-	/**
-	 * Input encoding
-	 *
-	 * @var string
-	 */
-	private $_inputEncoding	= 'ANSI';
-
-	/**
-	 * Sheet index to read
-	 *
-	 * @var int
-	 */
-	private $_sheetIndex 	= 0;
-
-	/**
-	 * Formats
-	 *
-	 * @var array
-	 */
-	private $_formats = array();
-
-	/**
-	 * Format Count
-	 *
-	 * @var int
-	 */
-	private $_format = 0;
-
-	/**
-	 * PHPExcel_Reader_IReadFilter instance
-	 *
-	 * @var PHPExcel_Reader_IReadFilter
-	 */
-	private $_readFilter = null;
-
-
-	/**
-	 * Create a new PHPExcel_Reader_SYLK
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-	}
-
-
-	/**
-	 * Can the current PHPExcel_Reader_IReader read the file?
-	 *
-	 * @param 	string 		$pFileName
-	 * @return 	boolean
-	 * @throws Exception
-	 */
-	public function canRead($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Read sample data (first 2 KB will do)
-		$fh = fopen($pFilename, 'r');
-		$data = fread($fh, 2048);
-		fclose($fh);
-
-		// Count delimiters in file
-		$delimiterCount = substr_count($data, ';');
-		if ($delimiterCount < 1) {
-			return false;
-		}
-
-		// Analyze first line looking for ID; signature
-		$lines = explode("\n", $data);
-		if (substr($lines[0],0,4) != 'ID;P') {
-			return false;
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Read filter
-	 *
-	 * @return PHPExcel_Reader_IReadFilter
-	 */
-	public function getReadFilter() {
-		return $this->_readFilter;
-	}
-
-
-	/**
-	 * Set read filter
-	 *
-	 * @param PHPExcel_Reader_IReadFilter $pValue
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Set input encoding
-	 *
-	 * @param string $pValue Input encoding
-	 */
-	public function setInputEncoding($pValue = 'ANSI')
-	{
-		$this->_inputEncoding = $pValue;
-		return $this;
-	}
-
-
-	/**
-	 * Get input encoding
-	 *
-	 * @return string
-	 */
-	public function getInputEncoding()
-	{
-		return $this->_inputEncoding;
-	}
-
-
-	/**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
-	 * @param   string     $pFilename
-	 * @throws   Exception
-	 */
-	public function listWorksheetInfo($pFilename)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'r');
-		if ($fileHandle === false) {
-			throw new Exception("Could not open file " . $pFilename . " for reading.");
-		}
-
-		$worksheetInfo = array();
-		$worksheetInfo[0]['worksheetName'] = 'Worksheet';
-		$worksheetInfo[0]['lastColumnLetter'] = 'A';
-		$worksheetInfo[0]['lastColumnIndex'] = 0;
-		$worksheetInfo[0]['totalRows'] = 0;
-		$worksheetInfo[0]['totalColumns'] = 0;
-
-		// Loop through file
-		$rowData = array();
-
-		// loop through one row (line) at a time in the file
-		$rowIndex = 0;
-		while (($rowData = fgets($fileHandle)) !== FALSE) {
-			$columnIndex = 0;
-
-			// convert SYLK encoded $rowData to UTF-8
-			$rowData = PHPExcel_Shared_String::SYLKtoUTF8($rowData);
-
-			// explode each row at semicolons while taking into account that literal semicolon (;)
-			// is escaped like this (;;)
-			$rowData = explode("\t",str_replace('?',';',str_replace(';',"\t",str_replace(';;','?',rtrim($rowData)))));
-
-			$dataType = array_shift($rowData);
-			if ($dataType == 'C') {
-				//  Read cell value data
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'C' :
-						case 'X' :
-							$columnIndex = substr($rowDatum,1) - 1;
-							break;
-						case 'R' :
-						case 'Y' :
-							$rowIndex = substr($rowDatum,1);
-							break;
-					}
-
-					$worksheetInfo[0]['totalRows'] = max($worksheetInfo[0]['totalRows'], $rowIndex);
-					$worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], $columnIndex);
-				}
-			}
-		}
-
-		$worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
-		$worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
-
-		// Close file
-		fclose($fileHandle);
-
-		return $worksheetInfo;
-	}
-
-
-	/**
-	 * Loads PHPExcel from file
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
-
-		// Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}
-
-
-	/**
-	 * Loads PHPExcel from file into PHPExcel instance
-	 *
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		// Check if file exists
-		if (!file_exists($pFilename)) {
-			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
-
-		// Create new PHPExcel
-		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
-			$objPHPExcel->createSheet();
-		}
-		$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
-
-		$fromFormats	= array('\-',	'\ ');
-		$toFormats		= array('-',	' ');
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'r');
-		if ($fileHandle === false) {
-			throw new Exception("Could not open file $pFilename for reading.");
-		}
-
-		// Loop through file
-		$rowData = array();
-		$column = $row = '';
-
-		// loop through one row (line) at a time in the file
-		while (($rowData = fgets($fileHandle)) !== FALSE) {
-
-			// convert SYLK encoded $rowData to UTF-8
-			$rowData = PHPExcel_Shared_String::SYLKtoUTF8($rowData);
-
-			// explode each row at semicolons while taking into account that literal semicolon (;)
-			// is escaped like this (;;)
-			$rowData = explode("\t",str_replace('¤',';',str_replace(';',"\t",str_replace(';;','¤',rtrim($rowData)))));
-
-			$dataType = array_shift($rowData);
-			//	Read shared styles
-			if ($dataType == 'P') {
-				$formatArray = array();
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'P' :	$formatArray['numberformat']['code'] = str_replace($fromFormats,$toFormats,substr($rowDatum,1));
-									break;
-						case 'E' :
-						case 'F' :	$formatArray['font']['name'] = substr($rowDatum,1);
-									break;
-						case 'L' :	$formatArray['font']['size'] = substr($rowDatum,1);
-									break;
-						case 'S' :	$styleSettings = substr($rowDatum,1);
-									for ($i=0;$i<strlen($styleSettings);++$i) {
-										switch ($styleSettings{$i}) {
-											case 'I' :	$formatArray['font']['italic'] = true;
-														break;
-											case 'D' :	$formatArray['font']['bold'] = true;
-														break;
-											case 'T' :	$formatArray['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'B' :	$formatArray['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'L' :	$formatArray['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'R' :	$formatArray['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-										}
-									}
-									break;
-					}
-				}
-				$this->_formats['P'.$this->_format++] = $formatArray;
-			//	Read cell value data
-			} elseif ($dataType == 'C') {
-				$hasCalculatedValue = false;
-				$cellData = $cellDataFormula = '';
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
-									break;
-						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
-									break;
-						case 'K' :	$cellData = substr($rowDatum,1);
-									break;
-						case 'E' :	$cellDataFormula = '='.substr($rowDatum,1);
-									//	Convert R1C1 style references to A1 style references (but only when not quoted)
-									$temp = explode('"',$cellDataFormula);
-									$key = false;
-									foreach($temp as &$value) {
-										//	Only count/replace in alternate array entries
-										if ($key = !$key) {
-											preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/',$value, $cellReferences,PREG_SET_ORDER+PREG_OFFSET_CAPTURE);
-											//	Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
-											//		through the formula from left to right. Reversing means that we work right to left.through
-											//		the formula
-											$cellReferences = array_reverse($cellReferences);
-											//	Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
-											//		then modify the formula to use that new reference
-											foreach($cellReferences as $cellReference) {
-												$rowReference = $cellReference[2][0];
-												//	Empty R reference is the current row
-												if ($rowReference == '') $rowReference = $row;
-												//	Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $row + trim($rowReference,'[]');
-												$columnReference = $cellReference[4][0];
-												//	Empty C reference is the current column
-												if ($columnReference == '') $columnReference = $column;
-												//	Bracketed C references are relative to the current column
-												if ($columnReference{0} == '[') $columnReference = $column + trim($columnReference,'[]');
-												$A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
-
-												$value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0]));
-											}
-										}
-									}
-									unset($value);
-									//	Then rebuild the formula string
-									$cellDataFormula = implode('"',$temp);
-									$hasCalculatedValue = true;
-									break;
-					}
-				}
-				$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
-				$cellData = PHPExcel_Calculation::_unwrapResult($cellData);
-
-				// Set cell value
-				$objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
-				if ($hasCalculatedValue) {
-					$cellData = PHPExcel_Calculation::_unwrapResult($cellData);
-					$objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setCalculatedValue($cellData);
-				}
-			//	Read cell formatting
-			} elseif ($dataType == 'F') {
-				$formatStyle = $columnWidth = $styleSettings = '';
-				$styleData = array();
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
-									break;
-						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
-									break;
-						case 'P' :	$formatStyle = $rowDatum;
-									break;
-						case 'W' :	list($startCol,$endCol,$columnWidth) = explode(' ',substr($rowDatum,1));
-									break;
-						case 'S' :	$styleSettings = substr($rowDatum,1);
-									for ($i=0;$i<strlen($styleSettings);++$i) {
-										switch ($styleSettings{$i}) {
-											case 'I' :	$styleData['font']['italic'] = true;
-														break;
-											case 'D' :	$styleData['font']['bold'] = true;
-														break;
-											case 'T' :	$styleData['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'B' :	$styleData['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'L' :	$styleData['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'R' :	$styleData['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-										}
-									}
-									break;
-					}
-				}
-				if (($formatStyle > '') && ($column > '') && ($row > '')) {
-					$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
-					$objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($this->_formats[$formatStyle]);
-				}
-				if ((!empty($styleData)) && ($column > '') && ($row > '')) {
-					$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
-					$objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($styleData);
-				}
-				if ($columnWidth > '') {
-					if ($startCol == $endCol) {
-						$startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
-						$objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
-					} else {
-						$startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
-						$endCol = PHPExcel_Cell::stringFromColumnIndex($endCol-1);
-						$objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
-						do {
-							$objPHPExcel->getActiveSheet()->getColumnDimension(++$startCol)->setWidth($columnWidth);
-						} while ($startCol != $endCol);
-					}
-				}
-			} else {
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
-									break;
-						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
-									break;
-					}
-				}
-			}
-		}
-
-		// Close file
-		fclose($fileHandle);
-
-		// Return
-		return $objPHPExcel;
-	}
-
-
-	/**
-	 * Get sheet index
-	 *
-	 * @return int
-	 */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
-	}
-
-
-	/**
-	 * Set sheet index
-	 *
-	 * @param	int		$pValue		Sheet index
-	 * @return PHPExcel_Reader_SYLK
-	 */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
-		return $this;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/ReferenceHelper.php b/plugins/exportTypes/Excel/PHPExcel/ReferenceHelper.php
deleted file mode 100755
index 411085120..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/ReferenceHelper.php
+++ /dev/null
@@ -1,685 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_ReferenceHelper (Singleton)
- *
- * @category   PHPExcel
- * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_ReferenceHelper
-{
-	/**	Constants				*/
-	/**	Regular Expressions		*/
-	const REFHELPER_REGEXP_CELLREF		= '((\w*|\'[^!]*\')!)?(?<![:a-z\$])(\$?[a-z]{1,3}\$?\d+)(?=[^:!\d\'])';
-	const REFHELPER_REGEXP_CELLRANGE	= '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}\$?\d+):(\$?[a-z]{1,3}\$?\d+)';
-	const REFHELPER_REGEXP_ROWRANGE		= '((\w*|\'[^!]*\')!)?(\$?\d+):(\$?\d+)';
-	const REFHELPER_REGEXP_COLRANGE		= '((\w*|\'[^!]*\')!)?(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
-
-	/**
-	 * Instance of this class
-	 *
-	 * @var PHPExcel_ReferenceHelper
-	 */
-	private static $_instance;
-
-	/**
-	 * Get an instance of this class
-	 *
-	 * @return PHPExcel_ReferenceHelper
-	 */
-	public static function getInstance() {
-		if (!isset(self::$_instance) || (self::$_instance === NULL)) {
-			self::$_instance = new PHPExcel_ReferenceHelper();
-		}
-
-		return self::$_instance;
-	}
-
-	/**
-	 * Create a new PHPExcel_ReferenceHelper
-	 */
-	protected function __construct() {
-	}
-
-	/**
-	 * Insert a new column, updating all possible related data
-	 *
-	 * @param	int	$pBefore	Insert before this one
-	 * @param	int	$pNumCols	Number of columns to insert
-	 * @param	int	$pNumRows	Number of rows to insert
-	 * @throws	Exception
-	 */
-	public function insertNewBefore($pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, PHPExcel_Worksheet $pSheet = null) {
-		$aCellCollection = $pSheet->getCellCollection();
-
-		// Get coordinates of $pBefore
-		$beforeColumn	= 'A';
-		$beforeRow		= 1;
-		list($beforeColumn, $beforeRow) = PHPExcel_Cell::coordinateFromString( $pBefore );
-
-
-		// Clear cells if we are removing columns or rows
-		$highestColumn	= $pSheet->getHighestColumn();
-		$highestRow	= $pSheet->getHighestRow();
-
-		// 1. Clear column strips if we are removing columns
-		if ($pNumCols < 0 && PHPExcel_Cell::columnIndexFromString($beforeColumn) - 2 + $pNumCols > 0) {
-			for ($i = 1; $i <= $highestRow - 1; ++$i) {
-				for ($j = PHPExcel_Cell::columnIndexFromString($beforeColumn) - 1 + $pNumCols; $j <= PHPExcel_Cell::columnIndexFromString($beforeColumn) - 2; ++$j) {
-					$coordinate = PHPExcel_Cell::stringFromColumnIndex($j) . $i;
-					$pSheet->removeConditionalStyles($coordinate);
-					if ($pSheet->cellExists($coordinate)) {
-						$pSheet->getCell($coordinate)->setValueExplicit('', PHPExcel_Cell_DataType::TYPE_NULL);
-						$pSheet->getCell($coordinate)->setXfIndex(0);
-					}
-				}
-			}
-		}
-
-		// 2. Clear row strips if we are removing rows
-		if ($pNumRows < 0 && $beforeRow - 1 + $pNumRows > 0) {
-			for ($i = PHPExcel_Cell::columnIndexFromString($beforeColumn) - 1; $i <= PHPExcel_Cell::columnIndexFromString($highestColumn) - 1; ++$i) {
-				for ($j = $beforeRow + $pNumRows; $j <= $beforeRow - 1; ++$j) {
-					$coordinate = PHPExcel_Cell::stringFromColumnIndex($i) . $j;
-					$pSheet->removeConditionalStyles($coordinate);
-					if ($pSheet->cellExists($coordinate)) {
-						$pSheet->getCell($coordinate)->setValueExplicit('', PHPExcel_Cell_DataType::TYPE_NULL);
-						$pSheet->getCell($coordinate)->setXfIndex(0);
-					}
-				}
-			}
-		}
-
-
-		// Loop through cells, bottom-up, and change cell coordinates
-		while (($cellID = ($pNumCols < 0 || $pNumRows < 0) ? array_shift($aCellCollection) : array_pop($aCellCollection))) {
-			$cell = $pSheet->getCell($cellID);
-
-			// New coordinates
-			$newCoordinates = PHPExcel_Cell::stringFromColumnIndex( PHPExcel_Cell::columnIndexFromString($cell->getColumn()) - 1 + $pNumCols ) . ($cell->getRow() + $pNumRows);
-
-			// Should the cell be updated? Move value and cellXf index from one cell to another.
-			if ((PHPExcel_Cell::columnIndexFromString( $cell->getColumn() ) >= PHPExcel_Cell::columnIndexFromString($beforeColumn)) &&
-				($cell->getRow() >= $beforeRow)) {
-
-				// Update cell styles
-				$pSheet->getCell($newCoordinates)->setXfIndex($cell->getXfIndex());
-				$cell->setXfIndex(0);
-
-				// Insert this cell at its new location
-				if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) {
-					// Formula should be adjusted
-					$pSheet->getCell($newCoordinates)
-						   ->setValue($this->updateFormulaReferences($cell->getValue(),
-						   					$pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
-				} else {
-					// Formula should not be adjusted
-					$pSheet->getCell($newCoordinates)->setValue($cell->getValue());
-				}
-
-				// Clear the original cell
-				$pSheet->getCell($cell->getCoordinate())->setValue('');
-
-			} else {
-				/*	We don't need to update styles for rows/columns before our insertion position,
-						but we do still need to adjust any formulae	in those cells					*/
-				if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) {
-					// Formula should be adjusted
-					$cell->setValue($this->updateFormulaReferences($cell->getValue(),
-										$pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
-				}
-
-			}
-		}
-
-
-		// Duplicate styles for the newly inserted cells
-		$highestColumn	= $pSheet->getHighestColumn();
-		$highestRow	= $pSheet->getHighestRow();
-
-		if ($pNumCols > 0 && PHPExcel_Cell::columnIndexFromString($beforeColumn) - 2 > 0) {
-			for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
-
-				// Style
-				$coordinate = PHPExcel_Cell::stringFromColumnIndex( PHPExcel_Cell::columnIndexFromString($beforeColumn) - 2 ) . $i;
-				if ($pSheet->cellExists($coordinate)) {
-					$xfIndex = $pSheet->getCell($coordinate)->getXfIndex();
-					$conditionalStyles = $pSheet->conditionalStylesExists($coordinate) ?
-						$pSheet->getConditionalStyles($coordinate) : false;
-					for ($j = PHPExcel_Cell::columnIndexFromString($beforeColumn) - 1; $j <= PHPExcel_Cell::columnIndexFromString($beforeColumn) - 2 + $pNumCols; ++$j) {
-						$pSheet->getCellByColumnAndRow($j, $i)->setXfIndex($xfIndex);
-						if ($conditionalStyles) {
-							$cloned = array();
-							foreach ($conditionalStyles as $conditionalStyle) {
-								$cloned[] = clone $conditionalStyle;
-							}
-							$pSheet->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($j) . $i, $cloned);
-						}
-					}
-				}
-
-			}
-		}
-
-		if ($pNumRows > 0 && $beforeRow - 1 > 0) {
-			for ($i = PHPExcel_Cell::columnIndexFromString($beforeColumn) - 1; $i <= PHPExcel_Cell::columnIndexFromString($highestColumn) - 1; ++$i) {
-
-				// Style
-				$coordinate = PHPExcel_Cell::stringFromColumnIndex($i) . ($beforeRow - 1);
-				if ($pSheet->cellExists($coordinate)) {
-					$xfIndex = $pSheet->getCell($coordinate)->getXfIndex();
-					$conditionalStyles = $pSheet->conditionalStylesExists($coordinate) ?
-						$pSheet->getConditionalStyles($coordinate) : false;
-					for ($j = $beforeRow; $j <= $beforeRow - 1 + $pNumRows; ++$j) {
-						$pSheet->getCell(PHPExcel_Cell::stringFromColumnIndex($i) . $j)->setXfIndex($xfIndex);
-						if ($conditionalStyles) {
-							$cloned = array();
-							foreach ($conditionalStyles as $conditionalStyle) {
-								$cloned[] = clone $conditionalStyle;
-							}
-							$pSheet->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($i) . $j, $cloned);
-						}
-					}
-				}
-			}
-		}
-
-
-		// Update worksheet: column dimensions
-		$aColumnDimensions = array_reverse($pSheet->getColumnDimensions(), true);
-		if (!empty($aColumnDimensions)) {
-			foreach ($aColumnDimensions as $objColumnDimension) {
-				$newReference = $this->updateCellReference($objColumnDimension->getColumnIndex() . '1', $pBefore, $pNumCols, $pNumRows);
-				list($newReference) = PHPExcel_Cell::coordinateFromString($newReference);
-				if ($objColumnDimension->getColumnIndex() != $newReference) {
-					$objColumnDimension->setColumnIndex($newReference);
-				}
-			}
-			$pSheet->refreshColumnDimensions();
-		}
-
-
-		// Update worksheet: row dimensions
-		$aRowDimensions = array_reverse($pSheet->getRowDimensions(), true);
-		if (!empty($aRowDimensions)) {
-			foreach ($aRowDimensions as $objRowDimension) {
-				$newReference = $this->updateCellReference('A' . $objRowDimension->getRowIndex(), $pBefore, $pNumCols, $pNumRows);
-				list(, $newReference) = PHPExcel_Cell::coordinateFromString($newReference);
-				if ($objRowDimension->getRowIndex() != $newReference) {
-					$objRowDimension->setRowIndex($newReference);
-				}
-			}
-			$pSheet->refreshRowDimensions();
-
-			$copyDimension = $pSheet->getRowDimension($beforeRow - 1);
-			for ($i = $beforeRow; $i <= $beforeRow - 1 + $pNumRows; ++$i) {
-				$newDimension = $pSheet->getRowDimension($i);
-				$newDimension->setRowHeight($copyDimension->getRowHeight());
-				$newDimension->setVisible($copyDimension->getVisible());
-				$newDimension->setOutlineLevel($copyDimension->getOutlineLevel());
-				$newDimension->setCollapsed($copyDimension->getCollapsed());
-			}
-		}
-
-
-		// Update worksheet: breaks
-		$aBreaks = array_reverse($pSheet->getBreaks(), true);
-		foreach ($aBreaks as $key => $value) {
-			$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-			if ($key != $newReference) {
-				$pSheet->setBreak( $newReference, $value );
-				$pSheet->setBreak( $key, PHPExcel_Worksheet::BREAK_NONE );
-			}
-		}
-
-		// Update worksheet: comments
-		$aComments = $pSheet->getComments();
-		$aNewComments = array(); // the new array of all comments
-		foreach ($aComments as $key => &$value) {
-			$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-			$aNewComments[$newReference] = $value;
-		}
-		$pSheet->setComments($aNewComments); // replace the comments array
-
-		// Update worksheet: hyperlinks
-		$aHyperlinkCollection = array_reverse($pSheet->getHyperlinkCollection(), true);
-		foreach ($aHyperlinkCollection as $key => $value) {
-			$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-			if ($key != $newReference) {
-				$pSheet->setHyperlink( $newReference, $value );
-				$pSheet->setHyperlink( $key, null );
-			}
-		}
-
-
-		// Update worksheet: data validations
-		$aDataValidationCollection = array_reverse($pSheet->getDataValidationCollection(), true);
-		foreach ($aDataValidationCollection as $key => $value) {
-			$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-			if ($key != $newReference) {
-				$pSheet->setDataValidation( $newReference, $value );
-				$pSheet->setDataValidation( $key, null );
-			}
-		}
-
-
-		// Update worksheet: merge cells
-		$aMergeCells = $pSheet->getMergeCells();
-		$aNewMergeCells = array(); // the new array of all merge cells
-		foreach ($aMergeCells as $key => &$value) {
-			$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-			$aNewMergeCells[$newReference] = $newReference;
-		}
-		$pSheet->setMergeCells($aNewMergeCells); // replace the merge cells array
-
-
-		// Update worksheet: protected cells
-		$aProtectedCells = array_reverse($pSheet->getProtectedCells(), true);
-		foreach ($aProtectedCells as $key => $value) {
-			$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
-			if ($key != $newReference) {
-				$pSheet->protectCells( $newReference, $value, true );
-				$pSheet->unprotectCells( $key );
-			}
-		}
-
-
-		// Update worksheet: autofilter
-		$autoFilter = $pSheet->getAutoFilter();
-		$autoFilterRange = $autoFilter->getRange();
-		if (!empty($autoFilterRange)) {
-			if ($pNumCols != 0) {
-				$autoFilterColumns = array_keys($autoFilter->getColumns());
-				if (count($autoFilterColumns) > 0) {
-					list($column,$row) = sscanf($pBefore,'%[A-Z]%d');
-					$columnIndex = PHPExcel_Cell::columnIndexFromString($column);
-					list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($autoFilterRange);
-					if ($columnIndex <= $rangeEnd[0]) {
-						if ($pNumCols < 0) {
-							//	If we're actually deleting any columns that fall within the autofilter range,
-							//		then we delete any rules for those columns
-							$deleteColumn = $columnIndex + $pNumCols - 1;
-							$deleteCount = abs($pNumCols);
-							for ($i = 1; $i <= $deleteCount; ++$i) {
-								if (in_array(PHPExcel_Cell::stringFromColumnIndex($deleteColumn),$autoFilterColumns)) {
-									$autoFilter->clearColumn(PHPExcel_Cell::stringFromColumnIndex($deleteColumn));
-								}
-								++$deleteColumn;
-							}
-						}
-						$startCol = ($columnIndex > $rangeStart[0]) ? $columnIndex : $rangeStart[0];
-
-						//	Shuffle columns in autofilter range
-						if ($pNumCols > 0) {
-							//	For insert, we shuffle from end to beginning to avoid overwriting
-							$startColID = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
-							$toColID = PHPExcel_Cell::stringFromColumnIndex($startCol+$pNumCols-1);
-							$endColID = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0]);
-
-							$startColRef = $startCol;
-							$endColRef = $rangeEnd[0];
-							$toColRef = $rangeEnd[0]+$pNumCols;
-
-							do {
-								$autoFilter->shiftColumn(PHPExcel_Cell::stringFromColumnIndex($endColRef-1),PHPExcel_Cell::stringFromColumnIndex($toColRef-1));
-								--$endColRef;
-								--$toColRef;
-							} while ($startColRef <= $endColRef);
-						} else {
-							//	For delete, we shuffle from beginning to end to avoid overwriting
-							$startColID = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
-							$toColID = PHPExcel_Cell::stringFromColumnIndex($startCol+$pNumCols-1);
-							$endColID = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0]);
-							do {
-								$autoFilter->shiftColumn($startColID,$toColID);
-								++$startColID;
-								++$toColID;
-							} while ($startColID != $endColID);
-						}
-					}
-				}
-			}
-			$pSheet->setAutoFilter( $this->updateCellReference($autoFilterRange, $pBefore, $pNumCols, $pNumRows) );
-		}
-
-
-		// Update worksheet: freeze pane
-		if ($pSheet->getFreezePane() != '') {
-			$pSheet->freezePane( $this->updateCellReference($pSheet->getFreezePane(), $pBefore, $pNumCols, $pNumRows) );
-		}
-
-
-		// Page setup
-		if ($pSheet->getPageSetup()->isPrintAreaSet()) {
-			$pSheet->getPageSetup()->setPrintArea( $this->updateCellReference($pSheet->getPageSetup()->getPrintArea(), $pBefore, $pNumCols, $pNumRows) );
-		}
-
-
-		// Update worksheet: drawings
-		$aDrawings = $pSheet->getDrawingCollection();
-		foreach ($aDrawings as $objDrawing) {
-			$newReference = $this->updateCellReference($objDrawing->getCoordinates(), $pBefore, $pNumCols, $pNumRows);
-			if ($objDrawing->getCoordinates() != $newReference) {
-				$objDrawing->setCoordinates($newReference);
-			}
-		}
-
-
-		// Update workbook: named ranges
-		if (count($pSheet->getParent()->getNamedRanges()) > 0) {
-			foreach ($pSheet->getParent()->getNamedRanges() as $namedRange) {
-				if ($namedRange->getWorksheet()->getHashCode() == $pSheet->getHashCode()) {
-					$namedRange->setRange(
-						$this->updateCellReference($namedRange->getRange(), $pBefore, $pNumCols, $pNumRows)
-					);
-				}
-			}
-		}
-
-		// Garbage collect
-		$pSheet->garbageCollect();
-	}
-
-	/**
-	 * Update references within formulas
-	 *
-	 * @param	string	$pFormula	Formula to update
-	 * @param	int		$pBefore	Insert before this one
-	 * @param	int		$pNumCols	Number of columns to insert
-	 * @param	int		$pNumRows	Number of rows to insert
-	 * @return	string	Updated formula
-	 * @throws	Exception
-	 */
-	public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, $sheetName = '') {
-		//	Update cell references in the formula
-		$formulaBlocks = explode('"',$pFormula);
-		$i = false;
-		foreach($formulaBlocks as &$formulaBlock) {
-			//	Ignore blocks that were enclosed in quotes (alternating entries in the $formulaBlocks array after the explode)
-			if ($i = !$i) {
-				$adjustCount = 0;
-				$newCellTokens = $cellTokens = array();
-				//	Search for row ranges (e.g. 'Sheet1'!3:5 or 3:5) with or without $ absolutes (e.g. $3:5)
-				$matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_ROWRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
-				if ($matchCount > 0) {
-					foreach($matches as $match) {
-						$fromString = ($match[2] > '') ? $match[2].'!' : '';
-						$fromString .= $match[3].':'.$match[4];
-						$modified3 = substr($this->updateCellReference('$A'.$match[3],$pBefore,$pNumCols,$pNumRows),2);
-						$modified4 = substr($this->updateCellReference('$A'.$match[4],$pBefore,$pNumCols,$pNumRows),2);
-
-						if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
-							if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
-								$toString = ($match[2] > '') ? $match[2].'!' : '';
-								$toString .= $modified3.':'.$modified4;
-								//	Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
-								$column = 100000;
-								$row = 10000000+trim($match[3],'$');
-								$cellIndex = $column.$row;
-
-								$newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<!\d)'.preg_quote($fromString).'(?!\d)/i';
-								++$adjustCount;
-							}
-						}
-					}
-				}
-				//	Search for column ranges (e.g. 'Sheet1'!C:E or C:E) with or without $ absolutes (e.g. $C:E)
-				$matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_COLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
-				if ($matchCount > 0) {
-					foreach($matches as $match) {
-						$fromString = ($match[2] > '') ? $match[2].'!' : '';
-						$fromString .= $match[3].':'.$match[4];
-						$modified3 = substr($this->updateCellReference($match[3].'$1',$pBefore,$pNumCols,$pNumRows),0,-2);
-						$modified4 = substr($this->updateCellReference($match[4].'$1',$pBefore,$pNumCols,$pNumRows),0,-2);
-
-						if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
-							if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
-								$toString = ($match[2] > '') ? $match[2].'!' : '';
-								$toString .= $modified3.':'.$modified4;
-								//	Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
-								$column = PHPExcel_Cell::columnIndexFromString(trim($match[3],'$')) + 100000;
-								$row = 10000000;
-								$cellIndex = $column.$row;
-
-								$newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?![A-Z])/i';
-								++$adjustCount;
-							}
-						}
-					}
-				}
-				//	Search for cell ranges (e.g. 'Sheet1'!A3:C5 or A3:C5) with or without $ absolutes (e.g. $A1:C$5)
-				$matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
-				if ($matchCount > 0) {
-					foreach($matches as $match) {
-						$fromString = ($match[2] > '') ? $match[2].'!' : '';
-						$fromString .= $match[3].':'.$match[4];
-						$modified3 = $this->updateCellReference($match[3],$pBefore,$pNumCols,$pNumRows);
-						$modified4 = $this->updateCellReference($match[4],$pBefore,$pNumCols,$pNumRows);
-
-						if ($match[3].$match[4] !== $modified3.$modified4) {
-							if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
-								$toString = ($match[2] > '') ? $match[2].'!' : '';
-								$toString .= $modified3.':'.$modified4;
-								list($column,$row) = PHPExcel_Cell::coordinateFromString($match[3]);
-								//	Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
-								$column = PHPExcel_Cell::columnIndexFromString(trim($column,'$')) + 100000;
-								$row = trim($row,'$') + 10000000;
-								$cellIndex = $column.$row;
-
-								$newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?!\d)/i';
-								++$adjustCount;
-							}
-						}
-					}
-				}
-				//	Search for cell references (e.g. 'Sheet1'!A3 or C5) with or without $ absolutes (e.g. $A1 or C$5)
-				$matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLREF.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
-				if ($matchCount > 0) {
-					foreach($matches as $match) {
-						$fromString = ($match[2] > '') ? $match[2].'!' : '';
-						$fromString .= $match[3];
-						$modified3 = $this->updateCellReference($match[3],$pBefore,$pNumCols,$pNumRows);
-
-						if ($match[3] !== $modified3) {
-							if (($match[2] == '') || (trim($match[2],"'") == $sheetName)) {
-								$toString = ($match[2] > '') ? $match[2].'!' : '';
-								$toString .= $modified3;
-								list($column,$row) = PHPExcel_Cell::coordinateFromString($match[3]);
-								//	Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
-								$column = PHPExcel_Cell::columnIndexFromString(trim($column,'$')) + 100000;
-								$row = trim($row,'$') + 10000000;
-								$cellIndex = $column.$row;
-
-								$newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?!\d)/i';
-								++$adjustCount;
-							}
-						}
-					}
-				}
-				if ($adjustCount > 0) {
-					krsort($cellTokens);
-					krsort($newCellTokens);
-					//	Update cell references in the formula
-					$formulaBlock = str_replace('\\','',preg_replace($cellTokens,$newCellTokens,$formulaBlock));
-				}
-			}
-		}
-		unset($formulaBlock);
-
-		//	Then rebuild the formula string
-		return implode('"',$formulaBlocks);
-	}
-
-	/**
-	 * Update cell reference
-	 *
-	 * @param	string	$pCellRange			Cell range
-	 * @param	int		$pBefore			Insert before this one
-	 * @param	int		$pNumCols			Number of columns to increment
-	 * @param	int		$pNumRows			Number of rows to increment
-	 * @return	string	Updated cell range
-	 * @throws	Exception
-	 */
-	public function updateCellReference($pCellRange = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
-		// Is it in another worksheet? Will not have to update anything.
-		if (strpos($pCellRange, "!") !== false) {
-			return $pCellRange;
-		// Is it a range or a single cell?
-		} elseif (strpos($pCellRange, ':') === false && strpos($pCellRange, ',') === false) {
-			// Single cell
-			return $this->_updateSingleCellReference($pCellRange, $pBefore, $pNumCols, $pNumRows);
-		} elseif (strpos($pCellRange, ':') !== false || strpos($pCellRange, ',') !== false) {
-			// Range
-			return $this->_updateCellRange($pCellRange, $pBefore, $pNumCols, $pNumRows);
-		} else {
-			// Return original
-			return $pCellRange;
-		}
-	}
-
-	/**
-	 * Update named formulas (i.e. containing worksheet references / named ranges)
-	 *
-	 * @param PHPExcel $pPhpExcel	Object to update
-	 * @param string $oldName		Old name (name to replace)
-	 * @param string $newName		New name
-	 */
-	public function updateNamedFormulas(PHPExcel $pPhpExcel, $oldName = '', $newName = '') {
-		if ($oldName == '') {
-			return;
-		}
-
-		foreach ($pPhpExcel->getWorksheetIterator() as $sheet) {
-			foreach ($sheet->getCellCollection(false) as $cellID) {
-				$cell = $sheet->getCell($cellID);
-				if (($cell !== NULL) && ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA)) {
-					$formula = $cell->getValue();
-					if (strpos($formula, $oldName) !== false) {
-						$formula = str_replace("'" . $oldName . "'!", "'" . $newName . "'!", $formula);
-						$formula = str_replace($oldName . "!", $newName . "!", $formula);
-						$cell->setValueExplicit($formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Update cell range
-	 *
-	 * @param	string	$pCellRange			Cell range	(e.g. 'B2:D4', 'B:C' or '2:3')
-	 * @param	int		$pBefore			Insert before this one
-	 * @param	int		$pNumCols			Number of columns to increment
-	 * @param	int		$pNumRows			Number of rows to increment
-	 * @return	string	Updated cell range
-	 * @throws	Exception
-	 */
-	private function _updateCellRange($pCellRange = 'A1:A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
-		if (strpos($pCellRange,':') !== false || strpos($pCellRange, ',') !== false) {
-			// Update range
-			$range = PHPExcel_Cell::splitRange($pCellRange);
-			$ic = count($range);
-			for ($i = 0; $i < $ic; ++$i) {
-				$jc = count($range[$i]);
-				for ($j = 0; $j < $jc; ++$j) {
-					if (ctype_alpha($range[$i][$j])) {
-						$r = PHPExcel_Cell::coordinateFromString($this->_updateSingleCellReference($range[$i][$j].'1', $pBefore, $pNumCols, $pNumRows));
-						$range[$i][$j] = $r[0];
-					} elseif(ctype_digit($range[$i][$j])) {
-						$r = PHPExcel_Cell::coordinateFromString($this->_updateSingleCellReference('A'.$range[$i][$j], $pBefore, $pNumCols, $pNumRows));
-						$range[$i][$j] = $r[1];
-					} else {
-						$range[$i][$j] = $this->_updateSingleCellReference($range[$i][$j], $pBefore, $pNumCols, $pNumRows);
-					}
-				}
-			}
-
-			// Recreate range string
-			return PHPExcel_Cell::buildRange($range);
-		} else {
-			throw new Exception("Only cell ranges may be passed to this method.");
-		}
-	}
-
-	/**
-	 * Update single cell reference
-	 *
-	 * @param	string	$pCellReference		Single cell reference
-	 * @param	int		$pBefore			Insert before this one
-	 * @param	int		$pNumCols			Number of columns to increment
-	 * @param	int		$pNumRows			Number of rows to increment
-	 * @return	string	Updated cell reference
-	 * @throws	Exception
-	 */
-	private function _updateSingleCellReference($pCellReference = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
-		if (strpos($pCellReference, ':') === false && strpos($pCellReference, ',') === false) {
-			// Get coordinates of $pBefore
-			list($beforeColumn, $beforeRow) = PHPExcel_Cell::coordinateFromString( $pBefore );
-
-			// Get coordinates of $pCellReference
-			list($newColumn, $newRow) = PHPExcel_Cell::coordinateFromString( $pCellReference );
-
-			// Verify which parts should be updated
-			$updateColumn = (($newColumn{0} != '$') && ($beforeColumn{0} != '$') &&
-							 PHPExcel_Cell::columnIndexFromString($newColumn) >= PHPExcel_Cell::columnIndexFromString($beforeColumn));
-
-			$updateRow = (($newRow{0} != '$') && ($beforeRow{0} != '$') &&
-						  $newRow >= $beforeRow);
-
-			// Create new column reference
-			if ($updateColumn) {
-				$newColumn	= PHPExcel_Cell::stringFromColumnIndex( PHPExcel_Cell::columnIndexFromString($newColumn) - 1 + $pNumCols );
-			}
-
-			// Create new row reference
-			if ($updateRow) {
-				$newRow	= $newRow + $pNumRows;
-			}
-
-			// Return new reference
-			return $newColumn . $newRow;
-		} else {
-			throw new Exception("Only single cell references may be passed to this method.");
-		}
-	}
-
-	/**
-	 * __clone implementation. Cloning should not be allowed in a Singleton!
-	 *
-	 * @throws	Exception
-	 */
-	public final function __clone() {
-		throw new Exception("Cloning a Singleton is not allowed!");
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/RichText.php b/plugins/exportTypes/Excel/PHPExcel/RichText.php
deleted file mode 100755
index 5121cad66..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/RichText.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_RichText
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_RichText implements PHPExcel_IComparable
-{
-	/**
-	 * Rich text elements
-	 *
-	 * @var PHPExcel_RichText_ITextElement[]
-	 */
-	private $_richTextElements;
-
-    /**
-     * Create a new PHPExcel_RichText instance
-     *
-     * @param 	PHPExcel_Cell	$pParent
-     * @throws	Exception
-     */
-    public function __construct(PHPExcel_Cell $pCell = null)
-    {
-    	// Initialise variables
-    	$this->_richTextElements = array();
-
-    	// Rich-Text string attached to cell?
-    	if ($pCell !== NULL) {
-	    	// Add cell text and style
-	    	if ($pCell->getValue() != "") {
-	    		$objRun = new PHPExcel_RichText_Run($pCell->getValue());
-	    		$objRun->setFont(clone $pCell->getParent()->getStyle($pCell->getCoordinate())->getFont());
-	    		$this->addText($objRun);
-	    	}
-
-	    	// Set parent value
-	    	$pCell->setValueExplicit($this, PHPExcel_Cell_DataType::TYPE_STRING);
-    	}
-    }
-
-    /**
-     * Add text
-     *
-     * @param 	PHPExcel_RichText_ITextElement		$pText		Rich text element
-     * @throws 	Exception
-     * @return PHPExcel_RichText
-     */
-    public function addText(PHPExcel_RichText_ITextElement $pText = null)
-    {
-    	$this->_richTextElements[] = $pText;
-    	return $this;
-    }
-
-    /**
-     * Create text
-     *
-     * @param 	string	$pText	Text
-     * @return	PHPExcel_RichText_TextElement
-     * @throws 	Exception
-     */
-    public function createText($pText = '')
-    {
-    	$objText = new PHPExcel_RichText_TextElement($pText);
-    	$this->addText($objText);
-    	return $objText;
-    }
-
-    /**
-     * Create text run
-     *
-     * @param 	string	$pText	Text
-     * @return	PHPExcel_RichText_Run
-     * @throws 	Exception
-     */
-    public function createTextRun($pText = '')
-    {
-    	$objText = new PHPExcel_RichText_Run($pText);
-    	$this->addText($objText);
-    	return $objText;
-    }
-
-    /**
-     * Get plain text
-     *
-     * @return string
-     */
-    public function getPlainText()
-    {
-    	// Return value
-    	$returnValue = '';
-
-    	// Loop through all PHPExcel_RichText_ITextElement
-    	foreach ($this->_richTextElements as $text) {
-    		$returnValue .= $text->getText();
-    	}
-
-    	// Return
-    	return $returnValue;
-    }
-
-    /**
-     * Convert to string
-     *
-     * @return string
-     */
-    public function __toString() {
-    	return $this->getPlainText();
-    }
-
-    /**
-     * Get Rich Text elements
-     *
-     * @return PHPExcel_RichText_ITextElement[]
-     */
-    public function getRichTextElements()
-    {
-    	return $this->_richTextElements;
-    }
-
-    /**
-     * Set Rich Text elements
-     *
-     * @param 	PHPExcel_RichText_ITextElement[]	$pElements		Array of elements
-     * @throws 	Exception
-     * @return PHPExcel_RichText
-     */
-    public function setRichTextElements($pElements = null)
-    {
-    	if (is_array($pElements)) {
-    		$this->_richTextElements = $pElements;
-    	} else {
-    		throw new Exception("Invalid PHPExcel_RichText_ITextElement[] array passed.");
-    	}
-    	return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		$hashElements = '';
-		foreach ($this->_richTextElements as $element) {
-			$hashElements .= $element->getHashCode();
-		}
-
-    	return md5(
-    		  $hashElements
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/RichText/ITextElement.php b/plugins/exportTypes/Excel/PHPExcel/RichText/ITextElement.php
deleted file mode 100755
index 27ca6246c..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/RichText/ITextElement.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_RichText_ITextElement
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_RichText_ITextElement
-{
-	/**
-	 * Get text
-	 *
-	 * @return string	Text
-	 */
-	public function getText();
-
-	/**
-	 * Set text
-	 *
-	 * @param 	$pText string	Text
-	 * @return PHPExcel_RichText_ITextElement
-	 */
-	public function setText($pText = '');
-
-	/**
-	 * Get font
-	 *
-	 * @return PHPExcel_Style_Font
-	 */
-	public function getFont();
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode();
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/RichText/Run.php b/plugins/exportTypes/Excel/PHPExcel/RichText/Run.php
deleted file mode 100755
index 700454ef8..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/RichText/Run.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_RichText_Run
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_RichText_Run extends PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
-{
-	/**
-	 * Font
-	 *
-	 * @var PHPExcel_Style_Font
-	 */
-	private $_font;
-
-    /**
-     * Create a new PHPExcel_RichText_Run instance
-     *
-     * @param 	string		$pText		Text
-     */
-    public function __construct($pText = '')
-    {
-    	// Initialise variables
-    	$this->setText($pText);
-    	$this->_font = new PHPExcel_Style_Font();
-    }
-
-	/**
-	 * Get font
-	 *
-	 * @return PHPExcel_Style_Font
-	 */
-	public function getFont() {
-		return $this->_font;
-	}
-
-	/**
-	 * Set font
-	 *
-	 * @param	PHPExcel_Style_Font		$pFont		Font
-	 * @throws 	Exception
-	 * @return PHPExcel_RichText_ITextElement
-	 */
-	public function setFont(PHPExcel_Style_Font $pFont = null) {
-		$this->_font = $pFont;
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->getText()
-    		. $this->_font->getHashCode()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/RichText/TextElement.php b/plugins/exportTypes/Excel/PHPExcel/RichText/TextElement.php
deleted file mode 100755
index ce37c066d..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/RichText/TextElement.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_RichText_TextElement
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
-{
-	/**
-	 * Text
-	 *
-	 * @var string
-	 */
-	private $_text;
-
-    /**
-     * Create a new PHPExcel_RichText_TextElement instance
-     *
-     * @param 	string		$pText		Text
-     */
-    public function __construct($pText = '')
-    {
-    	// Initialise variables
-    	$this->_text = $pText;
-    }
-
-	/**
-	 * Get text
-	 *
-	 * @return string	Text
-	 */
-	public function getText() {
-		return $this->_text;
-	}
-
-	/**
-	 * Set text
-	 *
-	 * @param 	$pText string	Text
-	 * @return PHPExcel_RichText_ITextElement
-	 */
-	public function setText($pText = '') {
-		$this->_text = $pText;
-		return $this;
-	}
-
-	/**
-	 * Get font
-	 *
-	 * @return PHPExcel_Style_Font
-	 */
-	public function getFont() {
-		return null;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_text
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/CodePage.php b/plugins/exportTypes/Excel/PHPExcel/Shared/CodePage.php
deleted file mode 100755
index 2389296ea..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/CodePage.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_CodePage
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_CodePage
-{
-	/**
-	 * Convert Microsoft Code Page Identifier to Code Page Name which iconv
-	 * and mbstring understands
-	 *
-	 * @param int $number Microsoft Code Page Indentifier
-	 * @return string Code Page Name
-	 * @throws Exception
-	 */
-	public static function NumberToName($codePage = '1252')
-	{
-		switch ($codePage) {
-			case 367:	return 'ASCII';				break;	//	ASCII
-			case 437:	return 'CP437';				break;	//	OEM US
-			case 720:	throw new Exception('Code page 720 not supported.');
-													break;	//	OEM Arabic
-			case 737:	return 'CP737';				break;	//	OEM Greek
-			case 775:	return 'CP775';				break;	//	OEM Baltic
-			case 850:	return 'CP850';				break;	//	OEM Latin I
-			case 852:	return 'CP852';				break;	//	OEM Latin II (Central European)
-			case 855:	return 'CP855';				break;	//	OEM Cyrillic
-			case 857:	return 'CP857';				break;	//	OEM Turkish
-			case 858:	return 'CP858';				break;	//	OEM Multilingual Latin I with Euro
-			case 860:	return 'CP860';				break;	//	OEM Portugese
-			case 861:	return 'CP861';				break;	//	OEM Icelandic
-			case 862:	return 'CP862';				break;	//	OEM Hebrew
-			case 863:	return 'CP863';				break;	//	OEM Canadian (French)
-			case 864:	return 'CP864';				break;	//	OEM Arabic
-			case 865:	return 'CP865';				break;	//	OEM Nordic
-			case 866:	return 'CP866';				break;	//	OEM Cyrillic (Russian)
-			case 869:	return 'CP869';				break;	//	OEM Greek (Modern)
-			case 874:	return 'CP874';				break;	//	ANSI Thai
-			case 932:	return 'CP932';				break;	//	ANSI Japanese Shift-JIS
-			case 936:	return 'CP936';				break;	//	ANSI Chinese Simplified GBK
-			case 949:	return 'CP949';				break;	//	ANSI Korean (Wansung)
-			case 950:	return 'CP950';				break;	//	ANSI Chinese Traditional BIG5
-			case 1200:	return 'UTF-16LE';			break;	//	UTF-16 (BIFF8)
-			case 1250:	return 'CP1250';			break;	//	ANSI Latin II (Central European)
-			case 1251:	return 'CP1251';			break;	//	ANSI Cyrillic
-			case 0:		//	CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
-			case 1252:	return 'CP1252';			break;	//	ANSI Latin I (BIFF4-BIFF7)
-			case 1253:	return 'CP1253';			break;	//	ANSI Greek
-			case 1254:	return 'CP1254';			break;	//	ANSI Turkish
-			case 1255:	return 'CP1255';			break;	//	ANSI Hebrew
-			case 1256:	return 'CP1256';			break;	//	ANSI Arabic
-			case 1257:	return 'CP1257';			break;	//	ANSI Baltic
-			case 1258:	return 'CP1258';			break;	//	ANSI Vietnamese
-			case 1361:	return 'CP1361';			break;	//	ANSI Korean (Johab)
-			case 10000:	return 'MAC';				break;	//	Apple Roman
-			case 10006:	return 'MACGREEK';			break;	//	Macintosh Greek
-			case 10007:	return 'MACCYRILLIC';		break;	//	Macintosh Cyrillic
-			case 10029:	return 'MACCENTRALEUROPE';	break;	//	Macintosh Central Europe
-			case 10079: return 'MACICELAND';		break;	//	Macintosh Icelandic
-			case 10081: return 'MACTURKISH';		break;	//	Macintosh Turkish
-			case 32768:	return 'MAC';				break;	//	Apple Roman
-			case 32769:	throw new Exception('Code page 32769 not supported.');
-													break;	//	ANSI Latin I (BIFF2-BIFF3)
-			case 65000:	return 'UTF-7';				break;	//	Unicode (UTF-7)
-			case 65001:	return 'UTF-8';				break;	//	Unicode (UTF-8)
-		}
-
-		throw new Exception('Unknown codepage: ' . $codePage);
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Date.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Date.php
deleted file mode 100755
index 1507d588c..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Date.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_Date
- *
- * @category   PHPExcel
- * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Date
-{
-	/** constants */
-	const CALENDAR_WINDOWS_1900 = 1900;		//	Base date of 1st Jan 1900 = 1.0
-	const CALENDAR_MAC_1904 = 1904;			//	Base date of 2nd Jan 1904 = 1.0
-
-	/*
-	 * Names of the months of the year, indexed by shortname
-	 * Planned usage for locale settings
-	 *
-	 * @public
-	 * @var	string[]
-	 */
-	public static $_monthNames = array(	'Jan' => 'January',
-										'Feb' => 'February',
-										'Mar' => 'March',
-										'Apr' => 'April',
-										'May' => 'May',
-										'Jun' => 'June',
-										'Jul' => 'July',
-										'Aug' => 'August',
-										'Sep' => 'September',
-										'Oct' => 'October',
-										'Nov' => 'November',
-										'Dec' => 'December'
-									  );
-
-	/*
-	 * Base calendar year to use for calculations
-	 *
-	 * @private
-	 * @var	int
-	 */
-	private static $ExcelBaseDate	= self::CALENDAR_WINDOWS_1900;
-
-	/*
-	 * Object type for PHP Date/Time values
-	 *
-	 * @private
-	 * @var	string
-	 */
-	public static $dateTimeObjectType	= 'DateTime';
-
-
-	/**
-	 * Set the Excel calendar (Windows 1900 or Mac 1904)
-	 *
-	 * @param	 integer	$baseDate			Excel base date
-	 * @return	 boolean						Success or failure
-	 */
-	public static function setExcelCalendar($baseDate) {
-		if (($baseDate == self::CALENDAR_WINDOWS_1900) ||
-			($baseDate == self::CALENDAR_MAC_1904)) {
-			self::$ExcelBaseDate = $baseDate;
-			return TRUE;
-		}
-		return FALSE;
-	}	//	function setExcelCalendar()
-
-
-	/**
-	 * Return the Excel calendar (Windows 1900 or Mac 1904)
-	 *
-	 * @return	 integer	$baseDate			Excel base date
-	 */
-	public static function getExcelCalendar() {
-		return self::$ExcelBaseDate;
-	}	//	function getExcelCalendar()
-
-
-	/**
-	 * Convert a date from Excel to PHP
-	 *
-	 * @param	 long	 $dateValue		Excel date/time value
-	 * @return	 long					PHP serialized date/time
-	 */
-	public static function ExcelToPHP($dateValue = 0) {
-		if (self::$ExcelBaseDate == self::CALENDAR_WINDOWS_1900) {
-			$myExcelBaseDate = 25569;
-			//	Adjust for the spurious 29-Feb-1900 (Day 60)
-			if ($dateValue < 60) {
-				--$myExcelBaseDate;
-			}
-		} else {
-			$myExcelBaseDate = 24107;
-		}
-
-		// Perform conversion
-		if ($dateValue >= 1) {
-			$utcDays = $dateValue - $myExcelBaseDate;
-			$returnValue = round($utcDays * 86400);
-			if (($returnValue <= PHP_INT_MAX) && ($returnValue >= -PHP_INT_MAX)) {
-				$returnValue = (integer) $returnValue;
-			}
-		} else {
-			$hours = round($dateValue * 24);
-			$mins = round($dateValue * 1440) - round($hours * 60);
-			$secs = round($dateValue * 86400) - round($hours * 3600) - round($mins * 60);
-			$returnValue = (integer) gmmktime($hours, $mins, $secs);
-		}
-
-		// Return
-		return $returnValue;
-	}	//	function ExcelToPHP()
-
-
-	/**
-	 * Convert a date from Excel to a PHP Date/Time object
-	 *
-	 * @param	 long	 $dateValue		Excel date/time value
-	 * @return	 long					PHP date/time object
-	 */
-	public static function ExcelToPHPObject($dateValue = 0) {
-		$dateTime = self::ExcelToPHP($dateValue);
-		$days = floor($dateTime / 86400);
-		$time = round((($dateTime / 86400) - $days) * 86400);
-		$hours = round($time / 3600);
-		$minutes = round($time / 60) - ($hours * 60);
-		$seconds = round($time) - ($hours * 3600) - ($minutes * 60);
-
-		$dateObj = date_create('1-Jan-1970+'.$days.' days');
-		$dateObj->setTime($hours,$minutes,$seconds);
-
-		return $dateObj;
-	}	//	function ExcelToPHPObject()
-
-
-	/**
-	 * Convert a date from PHP to Excel
-	 *
-	 * @param	 mixed		$dateValue	PHP serialized date/time or date object
-	 * @return	 mixed					Excel date/time value
-	 *										or boolean FALSE on failure
-	 */
-	public static function PHPToExcel($dateValue = 0) {
-		$saveTimeZone = date_default_timezone_get();
-		date_default_timezone_set('UTC');
-		$retValue = FALSE;
-		if ((is_object($dateValue)) && ($dateValue instanceof self::$dateTimeObjectType)) {
-			$retValue = self::FormattedPHPToExcel( $dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'),
-												   $dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s')
-												 );
-		} elseif (is_numeric($dateValue)) {
-			$retValue = self::FormattedPHPToExcel( date('Y',$dateValue), date('m',$dateValue), date('d',$dateValue),
-												   date('H',$dateValue), date('i',$dateValue), date('s',$dateValue)
-												 );
-		}
-		date_default_timezone_set($saveTimeZone);
-
-		return $retValue;
-	}	//	function PHPToExcel()
-
-
-	/**
-	 * FormattedPHPToExcel
-	 *
-	 * @param	long	$year
-	 * @param	long	$month
-	 * @param	long	$day
-	 * @param	long	$hours
-	 * @param	long	$minutes
-	 * @param	long	$seconds
-	 * @return  long				Excel date/time value
-	 */
-	public static function FormattedPHPToExcel($year, $month, $day, $hours=0, $minutes=0, $seconds=0) {
-		if (self::$ExcelBaseDate == self::CALENDAR_WINDOWS_1900) {
-			//
-			//	Fudge factor for the erroneous fact that the year 1900 is treated as a Leap Year in MS Excel
-			//	This affects every date following 28th February 1900
-			//
-			$excel1900isLeapYear = TRUE;
-			if (($year == 1900) && ($month <= 2)) { $excel1900isLeapYear = FALSE; }
-			$myExcelBaseDate = 2415020;
-		} else {
-			$myExcelBaseDate = 2416481;
-			$excel1900isLeapYear = FALSE;
-		}
-
-		//	Julian base date Adjustment
-		if ($month > 2) {
-			$month -= 3;
-		} else {
-			$month += 9;
-			--$year;
-		}
-
-		//	Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
-		$century = substr($year,0,2);
-		$decade = substr($year,2,2);
-		$excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $myExcelBaseDate + $excel1900isLeapYear;
-
-		$excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
-
-		return (float) $excelDate + $excelTime;
-	}	//	function FormattedPHPToExcel()
-
-
-	/**
-	 * Is a given cell a date/time?
-	 *
-	 * @param	 PHPExcel_Cell	$pCell
-	 * @return	 boolean
-	 */
-	public static function isDateTime(PHPExcel_Cell $pCell) {
-		return self::isDateTimeFormat(
-			$pCell->getParent()->getStyle(
-				$pCell->getCoordinate()
-			)->getNumberFormat()
-		);
-	}	//	function isDateTime()
-
-
-	/**
-	 * Is a given number format a date/time?
-	 *
-	 * @param	 PHPExcel_Style_NumberFormat	$pFormat
-	 * @return	 boolean
-	 */
-	public static function isDateTimeFormat(PHPExcel_Style_NumberFormat $pFormat) {
-		return self::isDateTimeFormatCode($pFormat->getFormatCode());
-	}	//	function isDateTimeFormat()
-
-
-	private static	$possibleDateFormatCharacters = 'eymdHs';
-
-	/**
-	 * Is a given number format code a date/time?
-	 *
-	 * @param	 string	$pFormatCode
-	 * @return	 boolean
-	 */
-	public static function isDateTimeFormatCode($pFormatCode = '') {
-		// Switch on formatcode
-		switch ($pFormatCode) {
-			//	General contains an epoch letter 'e', so we trap for it explicitly here
-			case PHPExcel_Style_NumberFormat::FORMAT_GENERAL:
-				return FALSE;
-			//	Explicitly defined date formats
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DDMMYYYY:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMYSLASH:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMYMINUS:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMMINUS:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_MYMINUS:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DATETIME:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME1:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME2:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME5:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME6:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME7:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME8:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDDSLASH:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX14:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX16:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX17:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22:
-				return TRUE;
-		}
-
-		//	Typically number, currency or accounting (or occasionally fraction) formats
-		if ((substr($pFormatCode,0,1) == '_') || (substr($pFormatCode,0,2) == '0 ')) {
-			return FALSE;
-		}
-		// Try checking for any of the date formatting characters that don't appear within square braces
-		if (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i',$pFormatCode)) {
-			//	We might also have a format mask containing quoted strings...
-			//		we don't want to test for any of our characters within the quoted blocks
-			if (strpos($pFormatCode,'"') !== FALSE) {
-				$i = FALSE;
-				foreach(explode('"',$pFormatCode) as $subVal) {
-					//	Only test in alternate array entries (the non-quoted blocks)
-					if (($i = !$i) && (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i',$subVal))) {
-						return TRUE;
-					}
-				}
-				return FALSE;
-			}
-			return TRUE;
-		}
-
-		// No date...
-		return FALSE;
-	}	//	function isDateTimeFormatCode()
-
-
-	/**
-	 * Convert a date/time string to Excel time
-	 *
-	 * @param	string	$dateValue		Examples: '2009-12-31', '2009-12-31 15:59', '2009-12-31 15:59:10'
-	 * @return	float|FALSE		Excel date/time serial value
-	 */
-	public static function stringToExcel($dateValue = '') {
-		if (strlen($dateValue) < 2)
-			return FALSE;
-		if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue))
-			return FALSE;
-
-		$dateValueNew = PHPExcel_Calculation_DateTime::DATEVALUE($dateValue);
-
-		if ($dateValueNew === PHPExcel_Calculation_Functions::VALUE()) {
-			return FALSE;
-		} else {
-			if (strpos($dateValue, ':') !== FALSE) {
-				$timeValue = PHPExcel_Calculation_DateTime::TIMEVALUE($dateValue);
-				if ($timeValue === PHPExcel_Calculation_Functions::VALUE()) {
-					return FALSE;
-				}
-				$dateValueNew += $timeValue;
-			}
-			return $dateValueNew;
-		}
-
-
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Drawing.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Drawing.php
deleted file mode 100755
index d1c33aa99..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Drawing.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_Drawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Drawing
-{
-	/**
-	 * Convert pixels to EMU
-	 *
-	 * @param 	int $pValue	Value in pixels
-	 * @return 	int			Value in EMU
-	 */
-	public static function pixelsToEMU($pValue = 0) {
-		return round($pValue * 9525);
-	}
-
-	/**
-	 * Convert EMU to pixels
-	 *
-	 * @param 	int $pValue	Value in EMU
-	 * @return 	int			Value in pixels
-	 */
-	public static function EMUToPixels($pValue = 0) {
-		if ($pValue != 0) {
-			return round($pValue / 9525);
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Convert pixels to column width. Exact algorithm not known.
-	 * By inspection of a real Excel file using Calibri 11, one finds 1000px ~ 142.85546875
-	 * This gives a conversion factor of 7. Also, we assume that pixels and font size are proportional.
-	 *
-	 * @param 	int $pValue	Value in pixels
-	 * @param 	PHPExcel_Style_Font $pDefaultFont	Default font of the workbook
-	 * @return 	int			Value in cell dimension
-	 */
-	public static function pixelsToCellDimension($pValue = 0, PHPExcel_Style_Font $pDefaultFont) {
-		// Font name and size
-		$name = $pDefaultFont->getName();
-		$size = $pDefaultFont->getSize();
-
-		if (isset(PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size])) {
-			// Exact width can be determined
-			$colWidth = $pValue
-				* PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['width']
-				/ PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['px'];
-		} else {
-			// We don't have data for this particular font and size, use approximation by
-			// extrapolating from Calibri 11
-			$colWidth = $pValue * 11
-				* PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['width']
-				/ PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['px'] / $size;
-		}
-
-		return $colWidth;
-	}
-
-	/**
-	 * Convert column width from (intrinsic) Excel units to pixels
-	 *
-	 * @param 	float	$pValue		Value in cell dimension
-	 * @param 	PHPExcel_Style_Font $pDefaultFont	Default font of the workbook
-	 * @return 	int		Value in pixels
-	 */
-	public static function cellDimensionToPixels($pValue = 0, PHPExcel_Style_Font $pDefaultFont) {
-		// Font name and size
-		$name = $pDefaultFont->getName();
-		$size = $pDefaultFont->getSize();
-
-		if (isset(PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size])) {
-			// Exact width can be determined
-			$colWidth = $pValue
-				* PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['px']
-				/ PHPExcel_Shared_Font::$defaultColumnWidths[$name][$size]['width'];
-
-		} else {
-			// We don't have data for this particular font and size, use approximation by
-			// extrapolating from Calibri 11
-			$colWidth = $pValue * $size
-				* PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['px']
-				/ PHPExcel_Shared_Font::$defaultColumnWidths['Calibri'][11]['width'] / 11;
-		}
-
-		// Round pixels to closest integer
-		$colWidth = (int) round($colWidth);
-
-		return $colWidth;
-	}
-
-	/**
-	 * Convert pixels to points
-	 *
-	 * @param 	int $pValue	Value in pixels
-	 * @return 	int			Value in points
-	 */
-	public static function pixelsToPoints($pValue = 0) {
-		return $pValue * 0.67777777;
-	}
-
-	/**
-	 * Convert points to pixels
-	 *
-	 * @param 	int $pValue	Value in points
-	 * @return 	int			Value in pixels
-	 */
-	public static function pointsToPixels($pValue = 0) {
-		if ($pValue != 0) {
-			return (int) ceil($pValue * 1.333333333);
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Convert degrees to angle
-	 *
-	 * @param 	int $pValue	Degrees
-	 * @return 	int			Angle
-	 */
-	public static function degreesToAngle($pValue = 0) {
-		return (int)round($pValue * 60000);
-	}
-
-	/**
-	 * Convert angle to degrees
-	 *
-	 * @param 	int $pValue	Angle
-	 * @return 	int			Degrees
-	 */
-	public static function angleToDegrees($pValue = 0) {
-		if ($pValue != 0) {
-			return round($pValue / 60000);
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * Create a new image from file. By alexander at alexauto dot nl
-	 *
-	 * @link http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
-	 * @param string $filename Path to Windows DIB (BMP) image
-	 * @return resource
-	 */
-	public static function imagecreatefrombmp($p_sFile)
-	{
-        //    Load the image into a string
-        $file    =    fopen($p_sFile,"rb");
-        $read    =    fread($file,10);
-        while(!feof($file)&&($read<>""))
-            $read    .=    fread($file,1024);
-
-        $temp    =    unpack("H*",$read);
-        $hex    =    $temp[1];
-        $header    =    substr($hex,0,108);
-
-        //    Process the header
-        //    Structure: http://www.fastgraph.com/help/bmp_header_format.html
-        if (substr($header,0,4)=="424d")
-        {
-            //    Cut it in parts of 2 bytes
-            $header_parts    =    str_split($header,2);
-
-            //    Get the width        4 bytes
-            $width            =    hexdec($header_parts[19].$header_parts[18]);
-
-            //    Get the height        4 bytes
-            $height            =    hexdec($header_parts[23].$header_parts[22]);
-
-            //    Unset the header params
-            unset($header_parts);
-        }
-
-        //    Define starting X and Y
-        $x                =    0;
-        $y                =    1;
-
-        //    Create newimage
-        $image            =    imagecreatetruecolor($width,$height);
-
-        //    Grab the body from the image
-        $body            =    substr($hex,108);
-
-        //    Calculate if padding at the end-line is needed
-        //    Divided by two to keep overview.
-        //    1 byte = 2 HEX-chars
-        $body_size        =    (strlen($body)/2);
-        $header_size    =    ($width*$height);
-
-        //    Use end-line padding? Only when needed
-        $usePadding        =    ($body_size>($header_size*3)+4);
-
-        //    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption
-        //    Calculate the next DWORD-position in the body
-        for ($i=0;$i<$body_size;$i+=3)
-        {
-            //    Calculate line-ending and padding
-            if ($x>=$width)
-            {
-                //    If padding needed, ignore image-padding
-                //    Shift i to the ending of the current 32-bit-block
-                if ($usePadding)
-                    $i    +=    $width%4;
-
-                //    Reset horizontal position
-                $x    =    0;
-
-                //    Raise the height-position (bottom-up)
-                $y++;
-
-                //    Reached the image-height? Break the for-loop
-                if ($y>$height)
-                    break;
-            }
-
-            //    Calculation of the RGB-pixel (defined as BGR in image-data)
-            //    Define $i_pos as absolute position in the body
-            $i_pos    =    $i*2;
-            $r        =    hexdec($body[$i_pos+4].$body[$i_pos+5]);
-            $g        =    hexdec($body[$i_pos+2].$body[$i_pos+3]);
-            $b        =    hexdec($body[$i_pos].$body[$i_pos+1]);
-
-            //    Calculate and draw the pixel
-            $color    =    imagecolorallocate($image,$r,$g,$b);
-            imagesetpixel($image,$x,$height-$y,$color);
-
-            //    Raise the horizontal position
-            $x++;
-        }
-
-        //    Unset the body / free the memory
-        unset($body);
-
-        //    Return image-object
-        return $image;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Escher.php
deleted file mode 100755
index bb695ec72..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher
-{
-	/**
-	 * Drawing Group Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DggContainer
-	 */
-	private $_dggContainer;
-
-	/**
-	 * Drawing Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DgContainer
-	 */
-	private $_dgContainer;
-
-	/**
-	 * Get Drawing Group Container
-	 *
-	 * @return PHPExcel_Shared_Escher_DgContainer
-	 */
-	public function getDggContainer()
-	{
-		return $this->_dggContainer;
-	}
-
-	/**
-	 * Set Drawing Group Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer $dggContainer
-	 */
-	public function setDggContainer($dggContainer)
-	{
-		return $this->_dggContainer = $dggContainer;
-	}
-
-	/**
-	 * Get Drawing Container
-	 *
-	 * @return PHPExcel_Shared_Escher_DgContainer
-	 */
-	public function getDgContainer()
-	{
-		return $this->_dgContainer;
-	}
-
-	/**
-	 * Set Drawing Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DgContainer $dgContainer
-	 */
-	public function setDgContainer($dgContainer)
-	{
-		return $this->_dgContainer = $dgContainer;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DgContainer.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DgContainer.php
deleted file mode 100755
index f0f9ba646..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DgContainer.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DgContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DgContainer
-{
-	/**
-	 * Drawing index, 1-based.
-	 *
-	 * @var int
-	 */
-	private $_dgId;
-
-	/**
-	 * Last shape index in this drawing
-	 *
-	 * @var int
-	 */
-	private $_lastSpId;
-
-	private $_spgrContainer = null;
-
-	public function getDgId()
-	{
-		return $this->_dgId;
-	}
-
-	public function setDgId($value)
-	{
-		$this->_dgId = $value;
-	}
-
-	public function getLastSpId()
-	{
-		return $this->_lastSpId;
-	}
-
-	public function setLastSpId($value)
-	{
-		$this->_lastSpId = $value;
-	}
-
-	public function getSpgrContainer()
-	{
-		return $this->_spgrContainer;
-	}
-
-	public function setSpgrContainer($spgrContainer)
-	{
-		return $this->_spgrContainer = $spgrContainer;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
deleted file mode 100755
index 9c13d3013..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DgContainer_SpgrContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DgContainer_SpgrContainer
-{
-	/**
-	 * Parent Shape Group Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DgContainer_SpgrContainer
-	 */
-	private $_parent;
-
-	/**
-	 * Shape Container collection
-	 *
-	 * @var array
-	 */
-	private $_children = array();
-
-	/**
-	 * Set parent Shape Group Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DgContainer_SpgrContainer $parent
-	 */
-	public function setParent($parent)
-	{
-		$this->_parent = $parent;
-	}
-
-	/**
-	 * Get the parent Shape Group Container if any
-	 *
-	 * @return PHPExcel_Shared_Escher_DgContainer_SpgrContainer|null
-	 */
-	public function getParent()
-	{
-		return $this->_parent;
-	}
-
-	/**
-	 * Add a child. This will be either spgrContainer or spContainer
-	 *
-	 * @param mixed $child
-	 */
-	public function addChild($child)
-	{
-		$this->_children[] = $child;
-		$child->setParent($this);
-	}
-
-	/**
-	 * Get collection of Shape Containers
-	 */
-	public function getChildren()
-	{
-		return $this->_children;
-	}
-
-	/**
-	 * Recursively get all spContainers within this spgrContainer
-	 *
-	 * @return PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer[]
-	 */
-	public function getAllSpContainers()
-	{
-		$allSpContainers = array();
-
-		foreach ($this->_children as $child) {
-			if ($child instanceof PHPExcel_Shared_Escher_DgContainer_SpgrContainer) {
-				$allSpContainers = array_merge($allSpContainers, $child->getAllSpContainers());
-			} else {
-				$allSpContainers[] = $child;
-			}
-		}
-
-		return $allSpContainers;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
deleted file mode 100755
index 0b362dca7..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer
-{
-	/**
-	 * Parent Shape Group Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DgContainer_SpgrContainer
-	 */
-	private $_parent;
-
-	/**
-	 * Is this a group shape?
-	 *
-	 * @var boolean
-	 */
-	private $_spgr = false;
-
-	/**
-	 * Shape type
-	 *
-	 * @var int
-	 */
-	private $_spType;
-
-	/**
-	 * Shape flag
-	 *
-	 * @var int
-	 */
-	private $_spFlag;
-
-	/**
-	 * Shape index (usually group shape has index 0, and the rest: 1,2,3...)
-	 *
-	 * @var boolean
-	 */
-	private $_spId;
-
-	/**
-	 * Array of options
-	 *
-	 * @var array
-	 */
-	private $_OPT;
-
-	/**
-	 * Cell coordinates of upper-left corner of shape, e.g. 'A1'
-	 *
-	 * @var string
-	 */
-	private $_startCoordinates;
-
-	/**
-	 * Horizontal offset of upper-left corner of shape measured in 1/1024 of column width
-	 *
-	 * @var int
-	 */
-	private $_startOffsetX;
-
-	/**
-	 * Vertical offset of upper-left corner of shape measured in 1/256 of row height
-	 *
-	 * @var int
-	 */
-	private $_startOffsetY;
-
-	/**
-	 * Cell coordinates of bottom-right corner of shape, e.g. 'B2'
-	 *
-	 * @var string
-	 */
-	private $_endCoordinates;
-
-	/**
-	 * Horizontal offset of bottom-right corner of shape measured in 1/1024 of column width
-	 *
-	 * @var int
-	 */
-	private $_endOffsetX;
-
-	/**
-	 * Vertical offset of bottom-right corner of shape measured in 1/256 of row height
-	 *
-	 * @var int
-	 */
-	private $_endOffsetY;
-
-	/**
-	 * Set parent Shape Group Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DgContainer_SpgrContainer $parent
-	 */
-	public function setParent($parent)
-	{
-		$this->_parent = $parent;
-	}
-
-	/**
-	 * Get the parent Shape Group Container
-	 *
-	 * @return PHPExcel_Shared_Escher_DgContainer_SpgrContainer
-	 */
-	public function getParent()
-	{
-		return $this->_parent;
-	}
-
-	/**
-	 * Set whether this is a group shape
-	 *
-	 * @param boolean $value
-	 */
-	public function setSpgr($value = false)
-	{
-		$this->_spgr = $value;
-	}
-
-	/**
-	 * Get whether this is a group shape
-	 *
-	 * @return boolean
-	 */
-	public function getSpgr()
-	{
-		return $this->_spgr;
-	}
-
-	/**
-	 * Set the shape type
-	 *
-	 * @param int $value
-	 */
-	public function setSpType($value)
-	{
-		$this->_spType = $value;
-	}
-
-	/**
-	 * Get the shape type
-	 *
-	 * @return int
-	 */
-	public function getSpType()
-	{
-		return $this->_spType;
-	}
-
-	/**
-	 * Set the shape flag
-	 *
-	 * @param int $value
-	 */
-	public function setSpFlag($value)
-	{
-		$this->_spFlag = $value;
-	}
-
-	/**
-	 * Get the shape flag
-	 *
-	 * @return int
-	 */
-	public function getSpFlag()
-	{
-		return $this->_spFlag;
-	}
-
-	/**
-	 * Set the shape index
-	 *
-	 * @param int $value
-	 */
-	public function setSpId($value)
-	{
-		$this->_spId = $value;
-	}
-
-	/**
-	 * Get the shape index
-	 *
-	 * @return int
-	 */
-	public function getSpId()
-	{
-		return $this->_spId;
-	}
-
-	/**
-	 * Set an option for the Shape Group Container
-	 *
-	 * @param int $property The number specifies the option
-	 * @param mixed $value
-	 */
-	public function setOPT($property, $value)
-	{
-		$this->_OPT[$property] = $value;
-	}
-
-	/**
-	 * Get an option for the Shape Group Container
-	 *
-	 * @param int $property The number specifies the option
-	 * @return mixed
-	 */
-	public function getOPT($property)
-	{
-		if (isset($this->_OPT[$property])) {
-			return $this->_OPT[$property];
-		}
-		return null;
-	}
-
-	/**
-	 * Get the collection of options
-	 *
-	 * @return array
-	 */
-	public function getOPTCollection()
-	{
-		return $this->_OPT;
-	}
-
-	/**
-	 * Set cell coordinates of upper-left corner of shape
-	 *
-	 * @param string $value
-	 */
-	public function setStartCoordinates($value = 'A1')
-	{
-		$this->_startCoordinates = $value;
-	}
-
-	/**
-	 * Get cell coordinates of upper-left corner of shape
-	 *
-	 * @return string
-	 */
-	public function getStartCoordinates()
-	{
-		return $this->_startCoordinates;
-	}
-
-	/**
-	 * Set offset in x-direction of upper-left corner of shape measured in 1/1024 of column width
-	 *
-	 * @param int $startOffsetX
-	 */
-	public function setStartOffsetX($startOffsetX = 0)
-	{
-		$this->_startOffsetX = $startOffsetX;
-	}
-
-	/**
-	 * Get offset in x-direction of upper-left corner of shape measured in 1/1024 of column width
-	 *
-	 * @return int
-	 */
-	public function getStartOffsetX()
-	{
-		return $this->_startOffsetX;
-	}
-
-	/**
-	 * Set offset in y-direction of upper-left corner of shape measured in 1/256 of row height
-	 *
-	 * @param int $startOffsetY
-	 */
-	public function setStartOffsetY($startOffsetY = 0)
-	{
-		$this->_startOffsetY = $startOffsetY;
-	}
-
-	/**
-	 * Get offset in y-direction of upper-left corner of shape measured in 1/256 of row height
-	 *
-	 * @return int
-	 */
-	public function getStartOffsetY()
-	{
-		return $this->_startOffsetY;
-	}
-
-	/**
-	 * Set cell coordinates of bottom-right corner of shape
-	 *
-	 * @param string $value
-	 */
-	public function setEndCoordinates($value = 'A1')
-	{
-		$this->_endCoordinates = $value;
-	}
-
-	/**
-	 * Get cell coordinates of bottom-right corner of shape
-	 *
-	 * @return string
-	 */
-	public function getEndCoordinates()
-	{
-		return $this->_endCoordinates;
-	}
-
-	/**
-	 * Set offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width
-	 *
-	 * @param int $startOffsetX
-	 */
-	public function setEndOffsetX($endOffsetX = 0)
-	{
-		$this->_endOffsetX = $endOffsetX;
-	}
-
-	/**
-	 * Get offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width
-	 *
-	 * @return int
-	 */
-	public function getEndOffsetX()
-	{
-		return $this->_endOffsetX;
-	}
-
-	/**
-	 * Set offset in y-direction of bottom-right corner of shape measured in 1/256 of row height
-	 *
-	 * @param int $endOffsetY
-	 */
-	public function setEndOffsetY($endOffsetY = 0)
-	{
-		$this->_endOffsetY = $endOffsetY;
-	}
-
-	/**
-	 * Get offset in y-direction of bottom-right corner of shape measured in 1/256 of row height
-	 *
-	 * @return int
-	 */
-	public function getEndOffsetY()
-	{
-		return $this->_endOffsetY;
-	}
-
-	/**
-	 * Get the nesting level of this spContainer. This is the number of spgrContainers between this spContainer and
-	 * the dgContainer. A value of 1 = immediately within first spgrContainer
-	 * Higher nesting level occurs if and only if spContainer is part of a shape group
-	 *
-	 * @return int Nesting level
-	 */
-	public function getNestingLevel()
-	{
-		$nestingLevel = 0;
-
-		$parent = $this->getParent();
-		while ($parent instanceof PHPExcel_Shared_Escher_DgContainer_SpgrContainer) {
-			++$nestingLevel;
-			$parent = $parent->getParent();
-		}
-
-		return $nestingLevel;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer.php
deleted file mode 100755
index 54af54b78..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DggContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DggContainer
-{
-	/**
-	 * Maximum shape index of all shapes in all drawings increased by one
-	 *
-	 * @var int
-	 */
-	private $_spIdMax;
-
-	/**
-	 * Total number of drawings saved
-	 *
-	 * @var int
-	 */
-	private $_cDgSaved;
-
-	/**
-	 * Total number of shapes saved (including group shapes)
-	 *
-	 * @var int
-	 */
-	private $_cSpSaved;
-
-	/**
-	 * BLIP Store Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer
-	 */
-	private $_bstoreContainer;
-
-	/**
-	 * Array of options for the drawing group
-	 *
-	 * @var array
-	 */
-	private $_OPT = array();
-
-	/**
-	 * Array of identifier clusters containg information about the maximum shape identifiers
-	 *
-	 * @var array
-	 */
-	private $_IDCLs = array();
-
-	/**
-	 * Get maximum shape index of all shapes in all drawings (plus one)
-	 *
-	 * @return int
-	 */
-	public function getSpIdMax()
-	{
-		return $this->_spIdMax;
-	}
-
-	/**
-	 * Set maximum shape index of all shapes in all drawings (plus one)
-	 *
-	 * @param int
-	 */
-	public function setSpIdMax($value)
-	{
-		$this->_spIdMax = $value;
-	}
-
-	/**
-	 * Get total number of drawings saved
-	 *
-	 * @return int
-	 */
-	public function getCDgSaved()
-	{
-		return $this->_cDgSaved;
-	}
-
-	/**
-	 * Set total number of drawings saved
-	 *
-	 * @param int
-	 */
-	public function setCDgSaved($value)
-	{
-		$this->_cDgSaved = $value;
-	}
-
-	/**
-	 * Get total number of shapes saved (including group shapes)
-	 *
-	 * @return int
-	 */
-	public function getCSpSaved()
-	{
-		return $this->_cSpSaved;
-	}
-
-	/**
-	 * Set total number of shapes saved (including group shapes)
-	 *
-	 * @param int
-	 */
-	public function setCSpSaved($value)
-	{
-		$this->_cSpSaved = $value;
-	}
-
-	/**
-	 * Get BLIP Store Container
-	 *
-	 * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer
-	 */
-	public function getBstoreContainer()
-	{
-		return $this->_bstoreContainer;
-	}
-
-	/**
-	 * Set BLIP Store Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer $bstoreContainer
-	 */
-	public function setBstoreContainer($bstoreContainer)
-	{
-		$this->_bstoreContainer = $bstoreContainer;
-	}
-
-	/**
-	 * Set an option for the drawing group
-	 *
-	 * @param int $property The number specifies the option
-	 * @param mixed $value
-	 */
-	public function setOPT($property, $value)
-	{
-		$this->_OPT[$property] = $value;
-	}
-
-	/**
-	 * Get an option for the drawing group
-	 *
-	 * @param int $property The number specifies the option
-	 * @return mixed
-	 */
-	public function getOPT($property)
-	{
-		if (isset($this->_OPT[$property])) {
-			return $this->_OPT[$property];
-		}
-		return null;
-	}
-
-	/**
-	 * Get identifier clusters
-	 *
-	 * @return array
-	 */
-	public function getIDCLs()
-	{
-		return $this->_IDCLs;
-	}
-
-	/**
-	 * Set identifier clusters. array(<drawingId> => <max shape id>, ...)
-	 *
-	 * @param array $pValue
-	 */
-	public function setIDCLs($pValue)
-	{
-		$this->_IDCLs = $pValue;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
deleted file mode 100755
index 2f8a8f4fc..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DggContainer_BstoreContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DggContainer_BstoreContainer
-{
-	/**
-	 * BLIP Store Entries. Each of them holds one BLIP (Big Large Image or Picture)
-	 *
-	 * @var array
-	 */
-	private $_BSECollection = array();
-
-	/**
-	 * Add a BLIP Store Entry
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE $BSE
-	 */
-	public function addBSE($BSE)
-	{
-		$this->_BSECollection[] = $BSE;
-		$BSE->setParent($this);
-	}
-
-	/**
-	 * Get the collection of BLIP Store Entries
-	 *
-	 * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE[]
-	 */
-	public function getBSECollection()
-	{
-		return $this->_BSECollection;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
deleted file mode 100755
index 639493598..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE
-{
-	const BLIPTYPE_ERROR	= 0x00;
-	const BLIPTYPE_UNKNOWN	= 0x01;
-	const BLIPTYPE_EMF		= 0x02;
-	const BLIPTYPE_WMF		= 0x03;
-	const BLIPTYPE_PICT		= 0x04;
-	const BLIPTYPE_JPEG		= 0x05;
-	const BLIPTYPE_PNG		= 0x06;
-	const BLIPTYPE_DIB		= 0x07;
-	const BLIPTYPE_TIFF		= 0x11;
-	const BLIPTYPE_CMYKJPEG	= 0x12;
-
-	/**
-	 * The parent BLIP Store Entry Container
-	 *
-	 * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer
-	 */
-	private $_parent;
-
-	/**
-	 * The BLIP (Big Large Image or Picture)
-	 *
-	 * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
-	 */
-	private $_blip;
-
-	/**
-	 * The BLIP type
-	 *
-	 * @var int
-	 */
-	private $_blipType;
-
-	/**
-	 * Set parent BLIP Store Entry Container
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer $parent
-	 */
-	public function setParent($parent)
-	{
-		$this->_parent = $parent;
-	}
-
-	/**
-	 * Get the BLIP
-	 *
-	 * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
-	 */
-	public function getBlip()
-	{
-		return $this->_blip;
-	}
-
-	/**
-	 * Set the BLIP
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip $blip
-	 */
-	public function setBlip($blip)
-	{
-		$this->_blip = $blip;
-		$blip->setParent($this);
-	}
-
-	/**
-	 * Get the BLIP type
-	 *
-	 * @return int
-	 */
-	public function getBlipType()
-	{
-		return $this->_blipType;
-	}
-
-	/**
-	 * Set the BLIP type
-	 *
-	 * @param int
-	 */
-	public function setBlipType($blipType)
-	{
-		$this->_blipType = $blipType;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
deleted file mode 100755
index 8c3b11963..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
-{
-	/**
-	 * The parent BSE
-	 *
-	 * @var PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE
-	 */
-	private $_parent;
-
-	/**
-	 * Raw image data
-	 *
-	 * @var string
-	 */
-	private $_data;
-
-	/**
-	 * Get the raw image data
-	 *
-	 * @return string
-	 */
-	public function getData()
-	{
-		return $this->_data;
-	}
-
-	/**
-	 * Set the raw image data
-	 *
-	 * @param string
-	 */
-	public function setData($data)
-	{
-		$this->_data = $data;
-	}
-
-	/**
-	 * Set parent BSE
-	 *
-	 * @param PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE $parent
-	 */
-	public function setParent($parent)
-	{
-		$this->_parent = $parent;
-	}
-
-	/**
-	 * Get parent BSE
-	 *
-	 * @return PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE $parent
-	 */
-	public function getParent()
-	{
-		return $this->_parent;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Excel5.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Excel5.php
deleted file mode 100755
index 676118965..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Excel5.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_Excel5
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Excel5
-{
-	/**
-	 * Get the width of a column in pixels. We use the relationship y = ceil(7x) where
-	 * x is the width in intrinsic Excel units (measuring width in number of normal characters)
-	 * This holds for Arial 10
-	 *
-	 * @param PHPExcel_Worksheet $sheet The sheet
-	 * @param integer $col The column
-	 * @return integer The width in pixels
-	*/
-	public static function sizeCol($sheet, $col = 'A')
-	{
-		// default font of the workbook
-		$font = $sheet->getParent()->getDefaultStyle()->getFont();
-
-		$columnDimensions = $sheet->getColumnDimensions();
-
-		// first find the true column width in pixels (uncollapsed and unhidden)
-		if ( isset($columnDimensions[$col]) and $columnDimensions[$col]->getWidth() != -1 ) {
-
-			// then we have column dimension with explicit width
-			$columnDimension = $columnDimensions[$col];
-			$width = $columnDimension->getWidth();
-			$pixelWidth = PHPExcel_Shared_Drawing::cellDimensionToPixels($width, $font);
-
-		} else if ($sheet->getDefaultColumnDimension()->getWidth() != -1) {
-
-			// then we have default column dimension with explicit width
-			$defaultColumnDimension = $sheet->getDefaultColumnDimension();
-			$width = $defaultColumnDimension->getWidth();
-			$pixelWidth = PHPExcel_Shared_Drawing::cellDimensionToPixels($width, $font);
-
-		} else {
-
-			// we don't even have any default column dimension. Width depends on default font
-			$pixelWidth = PHPExcel_Shared_Font::getDefaultColumnWidthByFont($font, true);
-		}
-
-		// now find the effective column width in pixels
-		if (isset($columnDimensions[$col]) and !$columnDimensions[$col]->getVisible()) {
-			$effectivePixelWidth = 0;
-		} else {
-			$effectivePixelWidth = $pixelWidth;
-		}
-
-		return $effectivePixelWidth;
-	}
-
-	/**
-	 * Convert the height of a cell from user's units to pixels. By interpolation
-	 * the relationship is: y = 4/3x. If the height hasn't been set by the user we
-	 * use the default value. If the row is hidden we use a value of zero.
-	 *
-	 * @param PHPExcel_Worksheet $sheet The sheet
-	 * @param integer $row The row index (1-based)
-	 * @return integer The width in pixels
-	 */
-	public static function sizeRow($sheet, $row = 1)
-	{
-		// default font of the workbook
-		$font = $sheet->getParent()->getDefaultStyle()->getFont();
-
-		$rowDimensions = $sheet->getRowDimensions();
-
-		// first find the true row height in pixels (uncollapsed and unhidden)
-		if ( isset($rowDimensions[$row]) and $rowDimensions[$row]->getRowHeight() != -1) {
-
-			// then we have a row dimension
-			$rowDimension = $rowDimensions[$row];
-			$rowHeight = $rowDimension->getRowHeight();
-			$pixelRowHeight = (int) ceil(4 * $rowHeight / 3); // here we assume Arial 10
-
-		} else if ($sheet->getDefaultRowDimension()->getRowHeight() != -1) {
-
-			// then we have a default row dimension with explicit height
-			$defaultRowDimension = $sheet->getDefaultRowDimension();
-			$rowHeight = $defaultRowDimension->getRowHeight();
-			$pixelRowHeight = PHPExcel_Shared_Drawing::pointsToPixels($rowHeight);
-
-		} else {
-
-			// we don't even have any default row dimension. Height depends on default font
-			$pointRowHeight = PHPExcel_Shared_Font::getDefaultRowHeightByFont($font);
-			$pixelRowHeight = PHPExcel_Shared_Font::fontSizeToPixels($pointRowHeight);
-
-		}
-
-		// now find the effective row height in pixels
-		if ( isset($rowDimensions[$row]) and !$rowDimensions[$row]->getVisible() ) {
-			$effectivePixelRowHeight = 0;
-		} else {
-			$effectivePixelRowHeight = $pixelRowHeight;
-		}
-
-		return $effectivePixelRowHeight;
-	}
-
-	/**
-	 * Get the horizontal distance in pixels between two anchors
-	 * The distanceX is found as sum of all the spanning columns widths minus correction for the two offsets
-	 *
-	 * @param PHPExcel_Worksheet $sheet
-	 * @param string $startColumn
-	 * @param integer $startOffset Offset within start cell measured in 1/1024 of the cell width
-	 * @param string $endColumn
-	 * @param integer $endOffset Offset within end cell measured in 1/1024 of the cell width
-	 * @return integer Horizontal measured in pixels
-	 */
-	public static function getDistanceX(PHPExcel_Worksheet $sheet, $startColumn = 'A', $startOffsetX = 0, $endColumn = 'A', $endOffsetX = 0)
-	{
-		$distanceX = 0;
-
-		// add the widths of the spanning columns
-		$startColumnIndex = PHPExcel_Cell::columnIndexFromString($startColumn) - 1; // 1-based
-		$endColumnIndex = PHPExcel_Cell::columnIndexFromString($endColumn) - 1; // 1-based
-		for ($i = $startColumnIndex; $i <= $endColumnIndex; ++$i) {
-			$distanceX += self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($i));
-		}
-
-		// correct for offsetX in startcell
-		$distanceX -= (int) floor(self::sizeCol($sheet, $startColumn) * $startOffsetX / 1024);
-
-		// correct for offsetX in endcell
-		$distanceX -= (int) floor(self::sizeCol($sheet, $endColumn) * (1 - $endOffsetX / 1024));
-
-		return $distanceX;
-	}
-
-	/**
-	 * Get the vertical distance in pixels between two anchors
-	 * The distanceY is found as sum of all the spanning rows minus two offsets
-	 *
-	 * @param PHPExcel_Worksheet $sheet
-	 * @param string $startRow (1-based)
-	 * @param integer $startOffset Offset within start cell measured in 1/256 of the cell height
-	 * @param string $endRow (1-based)
-	 * @param integer $endOffset Offset within end cell measured in 1/256 of the cell height
-	 * @return integer Vertical distance measured in pixels
-	 */
-	public static function getDistanceY(PHPExcel_Worksheet $sheet, $startRow = 1, $startOffsetY = 0, $endRow = 1, $endOffsetY = 0)
-	{
-		$distanceY = 0;
-
-		// add the widths of the spanning rows
-		for ($row = $startRow; $row <= $endRow; ++$row) {
-			$distanceY += self::sizeRow($sheet, $row);
-		}
-
-		// correct for offsetX in startcell
-		$distanceY -= (int) floor(self::sizeRow($sheet, $startRow) * $startOffsetY / 256);
-
-		// correct for offsetX in endcell
-		$distanceY -= (int) floor(self::sizeRow($sheet, $endRow) * (1 - $endOffsetY / 256));
-
-		return $distanceY;
-	}
-
-	/**
-	 * Convert 1-cell anchor coordinates to 2-cell anchor coordinates
-	 * This function is ported from PEAR Spreadsheet_Writer_Excel with small modifications
-	 *
-	 * Calculate the vertices that define the position of the image as required by
-	 * the OBJ record.
-	 *
-	 *		 +------------+------------+
-	 *		 |	 A	  |	  B	 |
-	 *   +-----+------------+------------+
-	 *   |	 |(x1,y1)	 |			|
-	 *   |  1  |(A1)._______|______	  |
-	 *   |	 |	|			  |	 |
-	 *   |	 |	|			  |	 |
-	 *   +-----+----|	BITMAP	|-----+
-	 *   |	 |	|			  |	 |
-	 *   |  2  |	|______________.	 |
-	 *   |	 |			|		(B2)|
-	 *   |	 |			|	 (x2,y2)|
-	 *   +---- +------------+------------+
-	 *
-	 * Example of a bitmap that covers some of the area from cell A1 to cell B2.
-	 *
-	 * Based on the width and height of the bitmap we need to calculate 8 vars:
-	 *	 $col_start, $row_start, $col_end, $row_end, $x1, $y1, $x2, $y2.
-	 * The width and height of the cells are also variable and have to be taken into
-	 * account.
-	 * The values of $col_start and $row_start are passed in from the calling
-	 * function. The values of $col_end and $row_end are calculated by subtracting
-	 * the width and height of the bitmap from the width and height of the
-	 * underlying cells.
-	 * The vertices are expressed as a percentage of the underlying cell width as
-	 * follows (rhs values are in pixels):
-	 *
-	 *	   x1 = X / W *1024
-	 *	   y1 = Y / H *256
-	 *	   x2 = (X-1) / W *1024
-	 *	   y2 = (Y-1) / H *256
-	 *
-	 *	   Where:  X is distance from the left side of the underlying cell
-	 *			   Y is distance from the top of the underlying cell
-	 *			   W is the width of the cell
-	 *			   H is the height of the cell
-	 *
-	 * @param PHPExcel_Worksheet $sheet
-	 * @param string $coordinates E.g. 'A1'
-	 * @param integer $offsetX Horizontal offset in pixels
-	 * @param integer $offsetY Vertical offset in pixels
-	 * @param integer $width Width in pixels
-	 * @param integer $height Height in pixels
-	 * @return array
-	 */
-	public static function oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height)
-	{
-		list($column, $row) = PHPExcel_Cell::coordinateFromString($coordinates);
-		$col_start = PHPExcel_Cell::columnIndexFromString($column) - 1;
-		$row_start = $row - 1;
-
-		$x1 = $offsetX;
-		$y1 = $offsetY;
-
-		// Initialise end cell to the same as the start cell
-		$col_end	= $col_start;  // Col containing lower right corner of object
-		$row_end	= $row_start;  // Row containing bottom right corner of object
-
-		// Zero the specified offset if greater than the cell dimensions
-		if ($x1 >= self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start))) {
-			$x1 = 0;
-		}
-		if ($y1 >= self::sizeRow($sheet, $row_start + 1)) {
-			$y1 = 0;
-		}
-
-		$width	  = $width  + $x1 -1;
-		$height	 = $height + $y1 -1;
-
-		// Subtract the underlying cell widths to find the end cell of the image
-		while ($width >= self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))) {
-			$width -= self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end));
-			++$col_end;
-		}
-
-		// Subtract the underlying cell heights to find the end cell of the image
-		while ($height >= self::sizeRow($sheet, $row_end + 1)) {
-			$height -= self::sizeRow($sheet, $row_end + 1);
-			++$row_end;
-		}
-
-		// Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
-		// with zero height or width.
-		if (self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) == 0) {
-			return;
-		}
-		if (self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))   == 0) {
-			return;
-		}
-		if (self::sizeRow($sheet, $row_start + 1) == 0) {
-			return;
-		}
-		if (self::sizeRow($sheet, $row_end + 1)   == 0) {
-			return;
-		}
-
-		// Convert the pixel values to the percentage value expected by Excel
-		$x1 = $x1	 / self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_start))   * 1024;
-		$y1 = $y1	 / self::sizeRow($sheet, $row_start + 1)   *  256;
-		$x2 = ($width + 1)  / self::sizeCol($sheet, PHPExcel_Cell::stringFromColumnIndex($col_end))	 * 1024; // Distance to right side of object
-		$y2 = ($height + 1) / self::sizeRow($sheet, $row_end + 1)	 *  256; // Distance to bottom of object
-
-		$startCoordinates = PHPExcel_Cell::stringFromColumnIndex($col_start) . ($row_start + 1);
-		$endCoordinates = PHPExcel_Cell::stringFromColumnIndex($col_end) . ($row_end + 1);
-
-		$twoAnchor = array(
-			'startCoordinates' => $startCoordinates,
-			'startOffsetX' => $x1,
-			'startOffsetY' => $y1,
-			'endCoordinates' => $endCoordinates,
-			'endOffsetX' => $x2,
-			'endOffsetY' => $y2,
-		);
-
-		return  $twoAnchor;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/File.php b/plugins/exportTypes/Excel/PHPExcel/Shared/File.php
deleted file mode 100755
index be0df9d4d..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/File.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_File
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_File
-{
-	/**
-	  * Verify if a file exists
-	  *
-	  * @param 	string	$pFilename	Filename
-	  * @return bool
-	  */
-	public static function file_exists($pFilename) {
-		// Sick construction, but it seems that
-		// file_exists returns strange values when
-		// doing the original file_exists on ZIP archives...
-		if ( strtolower(substr($pFilename, 0, 3)) == 'zip' ) {
-			// Open ZIP file and verify if the file exists
-			$zipFile 		= substr($pFilename, 6, strpos($pFilename, '#') - 6);
-			$archiveFile 	= substr($pFilename, strpos($pFilename, '#') + 1);
-
-			$zip = new ZipArchive();
-			if ($zip->open($zipFile) === true) {
-				$returnValue = ($zip->getFromName($archiveFile) !== false);
-				$zip->close();
-				return $returnValue;
-			} else {
-				return false;
-			}
-		} else {
-			// Regular file_exists
-			return file_exists($pFilename);
-		}
-	}
-
-	/**
-	 * Returns canonicalized absolute pathname, also for ZIP archives
-	 *
-	 * @param string $pFilename
-	 * @return string
-	 */
-	public static function realpath($pFilename) {
-		// Returnvalue
-		$returnValue = '';
-
-		// Try using realpath()
-		if (file_exists($pFilename)) {
-			$returnValue = realpath($pFilename);
-		}
-
-		// Found something?
-		if ($returnValue == '' || ($returnValue === NULL)) {
-			$pathArray = explode('/' , $pFilename);
-			while(in_array('..', $pathArray) && $pathArray[0] != '..') {
-				for ($i = 0; $i < count($pathArray); ++$i) {
-					if ($pathArray[$i] == '..' && $i > 0) {
-						unset($pathArray[$i]);
-						unset($pathArray[$i - 1]);
-						break;
-					}
-				}
-			}
-			$returnValue = implode('/', $pathArray);
-		}
-
-		// Return
-		return $returnValue;
-	}
-
-	/**
-	 * Get the systems temporary directory.
-	 *
-	 * @return string
-	 */
-	public static function sys_get_temp_dir()
-	{
-		// sys_get_temp_dir is only available since PHP 5.2.1
-		// http://php.net/manual/en/function.sys-get-temp-dir.php#94119
-
-		if ( !function_exists('sys_get_temp_dir')) {
-			if ($temp = getenv('TMP') ) {
-				if ((!empty($temp)) && (file_exists($temp))) { return realpath($temp); }
-			}
-			if ($temp = getenv('TEMP') ) {
-				if ((!empty($temp)) && (file_exists($temp))) { return realpath($temp); }
-			}
-			if ($temp = getenv('TMPDIR') ) {
-				if ((!empty($temp)) && (file_exists($temp))) { return realpath($temp); }
-			}
-
-			// trick for creating a file in system's temporary dir
-			// without knowing the path of the system's temporary dir
-			$temp = tempnam(__FILE__, '');
-			if (file_exists($temp)) {
-				unlink($temp);
-				return realpath(dirname($temp));
-			}
-
-			return null;
-		}
-
-		// use ordinary built-in PHP function
-		//	There should be no problem with the 5.2.4 Suhosin realpath() bug, because this line should only
-		//		be called if we're running 5.2.1 or earlier
-		return realpath(sys_get_temp_dir());
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/Font.php b/plugins/exportTypes/Excel/PHPExcel/Shared/Font.php
deleted file mode 100755
index 62260d8c4..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/Font.php
+++ /dev/null
@@ -1,775 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_Font
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_Font
-{
-	/* Methods for resolving autosize value */
-	const AUTOSIZE_METHOD_APPROX	= 'approx';
-	const AUTOSIZE_METHOD_EXACT		= 'exact';
-
-	private static $_autoSizeMethods = array(
-		self::AUTOSIZE_METHOD_APPROX,
-		self::AUTOSIZE_METHOD_EXACT,
-	);
-
-	/** Character set codes used by BIFF5-8 in Font records */
-	const CHARSET_ANSI_LATIN				= 0x00;
-	const CHARSET_SYSTEM_DEFAULT			= 0x01;
-	const CHARSET_SYMBOL					= 0x02;
-	const CHARSET_APPLE_ROMAN				= 0x4D;
-	const CHARSET_ANSI_JAPANESE_SHIFTJIS	= 0x80;
-	const CHARSET_ANSI_KOREAN_HANGUL		= 0x81;
-	const CHARSET_ANSI_KOREAN_JOHAB			= 0x82;
-	const CHARSET_ANSI_CHINESE_SIMIPLIFIED	= 0x86;		//	gb2312
-	const CHARSET_ANSI_CHINESE_TRADITIONAL	= 0x88;		//	big5
-	const CHARSET_ANSI_GREEK				= 0xA1;
-	const CHARSET_ANSI_TURKISH				= 0xA2;
-	const CHARSET_ANSI_VIETNAMESE			= 0xA3;
-	const CHARSET_ANSI_HEBREW				= 0xB1;
-	const CHARSET_ANSI_ARABIC				= 0xB2;
-	const CHARSET_ANSI_BALTIC				= 0xBA;
-	const CHARSET_ANSI_CYRILLIC				= 0xCC;
-	const CHARSET_ANSI_THAI					= 0xDD;
-	const CHARSET_ANSI_LATIN_II				= 0xEE;
-	const CHARSET_OEM_LATIN_I				= 0xFF;
-
-	//  XXX: Constants created!
-	/** Font filenames */
-	const ARIAL								= 'arial.ttf';
-	const ARIAL_BOLD						= 'arialbd.ttf';
-	const ARIAL_ITALIC						= 'ariali.ttf';
-	const ARIAL_BOLD_ITALIC					= 'arialbi.ttf';
-
-	const CALIBRI							= 'CALIBRI.TTF';
-	const CALIBRI_BOLD						= 'CALIBRIB.TTF';
-	const CALIBRI_ITALIC					= 'CALIBRII.TTF';
-	const CALIBRI_BOLD_ITALIC				= 'CALIBRIZ.TTF';
-
-	const COMIC_SANS_MS						= 'comic.ttf';
-	const COMIC_SANS_MS_BOLD				= 'comicbd.ttf';
-
-	const COURIER_NEW						= 'cour.ttf';
-	const COURIER_NEW_BOLD					= 'courbd.ttf';
-	const COURIER_NEW_ITALIC				= 'couri.ttf';
-	const COURIER_NEW_BOLD_ITALIC			= 'courbi.ttf';
-
-	const GEORGIA							= 'georgia.ttf';
-	const GEORGIA_BOLD						= 'georgiab.ttf';
-	const GEORGIA_ITALIC					= 'georgiai.ttf';
-	const GEORGIA_BOLD_ITALIC				= 'georgiaz.ttf';
-
-	const IMPACT							= 'impact.ttf';
-
-	const LIBERATION_SANS					= 'LiberationSans-Regular.ttf';
-	const LIBERATION_SANS_BOLD				= 'LiberationSans-Bold.ttf';
-	const LIBERATION_SANS_ITALIC			= 'LiberationSans-Italic.ttf';
-	const LIBERATION_SANS_BOLD_ITALIC		= 'LiberationSans-BoldItalic.ttf';
-
-	const LUCIDA_CONSOLE					= 'lucon.ttf';
-	const LUCIDA_SANS_UNICODE				= 'l_10646.ttf';
-
-	const MICROSOFT_SANS_SERIF				= 'micross.ttf';
-
-	const PALATINO_LINOTYPE					= 'pala.ttf';
-	const PALATINO_LINOTYPE_BOLD			= 'palab.ttf';
-	const PALATINO_LINOTYPE_ITALIC			= 'palai.ttf';
-	const PALATINO_LINOTYPE_BOLD_ITALIC		= 'palabi.ttf';
-
-	const SYMBOL							= 'symbol.ttf';
-
-	const TAHOMA							= 'tahoma.ttf';
-	const TAHOMA_BOLD						= 'tahomabd.ttf';
-
-	const TIMES_NEW_ROMAN					= 'times.ttf';
-	const TIMES_NEW_ROMAN_BOLD				= 'timesbd.ttf';
-	const TIMES_NEW_ROMAN_ITALIC			= 'timesi.ttf';
-	const TIMES_NEW_ROMAN_BOLD_ITALIC		= 'timesbi.ttf';
-
-	const TREBUCHET_MS						= 'trebuc.ttf';
-	const TREBUCHET_MS_BOLD					= 'trebucbd.ttf';
-	const TREBUCHET_MS_ITALIC				= 'trebucit.ttf';
-	const TREBUCHET_MS_BOLD_ITALIC			= 'trebucbi.ttf';
-
-	const VERDANA							= 'verdana.ttf';
-	const VERDANA_BOLD						= 'verdanab.ttf';
-	const VERDANA_ITALIC					= 'verdanai.ttf';
-	const VERDANA_BOLD_ITALIC				= 'verdanaz.ttf';
-
-	/**
-	 * AutoSize method
-	 *
-	 * @var string
-	 */
-	private static $autoSizeMethod = self::AUTOSIZE_METHOD_APPROX;
-
-	/**
-	 * Path to folder containing TrueType font .ttf files
-	 *
-	 * @var string
-	 */
-	private static $trueTypeFontPath = null;
-
-	/**
-	 * How wide is a default column for a given default font and size?
-	 * Empirical data found by inspecting real Excel files and reading off the pixel width
-	 * in Microsoft Office Excel 2007.
-	 *
-	 * @var array
-	 */
-	public static $defaultColumnWidths = array(
-		'Arial' => array(
-			 1 => array('px' => 24, 'width' => 12.00000000),
-			 2 => array('px' => 24, 'width' => 12.00000000),
-			 3 => array('px' => 32, 'width' => 10.66406250),
-			 4 => array('px' => 32, 'width' => 10.66406250),
-			 5 => array('px' => 40, 'width' => 10.00000000),
-			 6 => array('px' => 48, 'width' =>  9.59765625),
-			 7 => array('px' => 48, 'width' =>  9.59765625),
-			 8 => array('px' => 56, 'width' =>  9.33203125),
-			 9 => array('px' => 64, 'width' =>  9.14062500),
-			10 => array('px' => 64, 'width' =>  9.14062500),
-		),
-		'Calibri' => array(
-			 1 => array('px' => 24, 'width' => 12.00000000),
-			 2 => array('px' => 24, 'width' => 12.00000000),
-			 3 => array('px' => 32, 'width' => 10.66406250),
-			 4 => array('px' => 32, 'width' => 10.66406250),
-			 5 => array('px' => 40, 'width' => 10.00000000),
-			 6 => array('px' => 48, 'width' =>  9.59765625),
-			 7 => array('px' => 48, 'width' =>  9.59765625),
-			 8 => array('px' => 56, 'width' =>  9.33203125),
-			 9 => array('px' => 56, 'width' =>  9.33203125),
-			10 => array('px' => 64, 'width' =>  9.14062500),
-			11 => array('px' => 64, 'width' =>  9.14062500),
-		),
-		'Verdana' => array(
-			 1 => array('px' => 24, 'width' => 12.00000000),
-			 2 => array('px' => 24, 'width' => 12.00000000),
-			 3 => array('px' => 32, 'width' => 10.66406250),
-			 4 => array('px' => 32, 'width' => 10.66406250),
-			 5 => array('px' => 40, 'width' => 10.00000000),
-			 6 => array('px' => 48, 'width' =>  9.59765625),
-			 7 => array('px' => 48, 'width' =>  9.59765625),
-			 8 => array('px' => 64, 'width' =>  9.14062500),
-			 9 => array('px' => 72, 'width' =>  9.00000000),
-			10 => array('px' => 72, 'width' =>  9.00000000),
-		),
-	);
-
-	/**
-	 * Set autoSize method
-	 *
-	 * @param string $pValue
-	 * @return	 boolean					Success or failure
-	 */
-	public static function setAutoSizeMethod($pValue = self::AUTOSIZE_METHOD_APPROX)
-	{
-		if (!in_array($pValue,self::$_autoSizeMethods)) {
-			return FALSE;
-		}
-
-		self::$autoSizeMethod = $pValue;
-
-		return TRUE;
-	}
-
-	/**
-	 * Get autoSize method
-	 *
-	 * @return string
-	 */
-	public static function getAutoSizeMethod()
-	{
-		return self::$autoSizeMethod;
-	}
-
-	/**
-	 * Set the path to the folder containing .ttf files. There should be a trailing slash.
-	 * Typical locations on variout some platforms:
-	 *	<ul>
-	 *		<li>C:/Windows/Fonts/</li>
-	 *		<li>/usr/share/fonts/truetype/</li>
-	 *		<li>~/.fonts/</li>
-	 *	</ul>
-	 *
-	 * @param string $pValue
-	 */
-	public static function setTrueTypeFontPath($pValue = '')
-	{
-		self::$trueTypeFontPath = $pValue;
-	}
-
-	/**
-	 * Get the path to the folder containing .ttf files.
-	 *
-	 * @return string
-	 */
-	public static function getTrueTypeFontPath()
-	{
-		return self::$trueTypeFontPath;
-	}
-
-	/**
-	 * Calculate an (approximate) OpenXML column width, based on font size and text contained
-	 *
-	 * @param 	int		$fontSize			Font size (in pixels or points)
-	 * @param 	bool	$fontSizeInPixels	Is the font size specified in pixels (true) or in points (false) ?
-	 * @param 	string	$cellText			Text to calculate width
-	 * @param 	int		$rotation			Rotation angle
-	 * @return 	int		Column width
-	 */
-	public static function calculateColumnWidth(PHPExcel_Style_Font $font, $cellText = '', $rotation = 0, PHPExcel_Style_Font $defaultFont = null) {
-
-		// If it is rich text, use plain text
-		if ($cellText instanceof PHPExcel_RichText) {
-			$cellText = $cellText->getPlainText();
-		}
-
-		// Special case if there are one or more newline characters ("\n")
-		if (strpos($cellText, "\n") !== false) {
-			$lineTexts = explode("\n", $cellText);
-			$lineWitdhs = array();
-			foreach ($lineTexts as $lineText) {
-				$lineWidths[] = self::calculateColumnWidth($font, $lineText, $rotation = 0, $defaultFont);
-			}
-			return max($lineWidths); // width of longest line in cell
-		}
-
-		// Try to get the exact text width in pixels
-		try {
-			// If autosize method is set to 'approx', use approximation
-			if (self::$autoSizeMethod == self::AUTOSIZE_METHOD_APPROX) {
-				throw new Exception('AutoSize method is set to approx');
-			}
-
-			// Width of text in pixels excl. padding
-			$columnWidth = self::getTextWidthPixelsExact($cellText, $font, $rotation);
-
-			// Excel adds some padding, use 1.07 of the width of an 'n' glyph
-			$columnWidth += ceil(self::getTextWidthPixelsExact('0', $font, 0) * 1.07); // pixels incl. padding
-
-		} catch (Exception $e) {
-			// Width of text in pixels excl. padding, approximation
-			$columnWidth = self::getTextWidthPixelsApprox($cellText, $font, $rotation);
-
-			// Excel adds some padding, just use approx width of 'n' glyph
-			$columnWidth += self::getTextWidthPixelsApprox('n', $font, 0);
-		}
-
-		// Convert from pixel width to column width
-		$columnWidth = PHPExcel_Shared_Drawing::pixelsToCellDimension($columnWidth, $defaultFont);
-
-		// Return
-		return round($columnWidth, 6);
-	}
-
-	/**
-	 * Get GD text width in pixels for a string of text in a certain font at a certain rotation angle
-	 *
-	 * @param string $text
-	 * @param PHPExcel_Style_Font
-	 * @param int $rotation
-	 * @return int
-	 * @throws Exception
-	 */
-	public static function getTextWidthPixelsExact($text, PHPExcel_Style_Font $font, $rotation = 0) {
-		if (!function_exists('imagettfbbox')) {
-			throw new Exception('GD library needs to be enabled');
-		}
-
-		// font size should really be supplied in pixels in GD2,
-		// but since GD2 seems to assume 72dpi, pixels and points are the same
-		$fontFile = self::getTrueTypeFontFileFromFont($font);
-		$textBox = imagettfbbox($font->getSize(), $rotation, $fontFile, $text);
-
-		// Get corners positions
-		$lowerLeftCornerX  = $textBox[0];
-		$lowerLeftCornerY  = $textBox[1];
-		$lowerRightCornerX = $textBox[2];
-		$lowerRightCornerY = $textBox[3];
-		$upperRightCornerX = $textBox[4];
-		$upperRightCornerY = $textBox[5];
-		$upperLeftCornerX  = $textBox[6];
-		$upperLeftCornerY  = $textBox[7];
-
-		// Consider the rotation when calculating the width
-		$textWidth = max($lowerRightCornerX - $upperLeftCornerX, $upperRightCornerX - $lowerLeftCornerX);
-
-		return $textWidth;
-	}
-
-	/**
-	 * Get approximate width in pixels for a string of text in a certain font at a certain rotation angle
-	 *
-	 * @param string $columnText
-	 * @param PHPExcel_Style_Font $font
-	 * @param int $rotation
-	 * @return int Text width in pixels (no padding added)
-	 */
-	public static function getTextWidthPixelsApprox($columnText, PHPExcel_Style_Font $font = null, $rotation = 0)
-	{
-		$fontName = $font->getName();
-		$fontSize = $font->getSize();
-
-		// Calculate column width in pixels. We assume fixed glyph width. Result varies with font name and size.
-		switch ($fontName) {
-			case 'Calibri':
-				// value 8.26 was found via interpolation by inspecting real Excel files with Calibri 11 font.
-				$columnWidth = (int) (8.26 * PHPExcel_Shared_String::CountCharacters($columnText));
-				$columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
-				break;
-
-			case 'Arial':
-				// value 7 was found via interpolation by inspecting real Excel files with Arial 10 font.
-				$columnWidth = (int) (7 * PHPExcel_Shared_String::CountCharacters($columnText));
-				$columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
-				break;
-
-			case 'Verdana':
-				// value 8 was found via interpolation by inspecting real Excel files with Verdana 10 font.
-				$columnWidth = (int) (8 * PHPExcel_Shared_String::CountCharacters($columnText));
-				$columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
-				break;
-
-			default:
-				// just assume Calibri
-				$columnWidth = (int) (8.26 * PHPExcel_Shared_String::CountCharacters($columnText));
-				$columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
-				break;
-		}
-
-		// Calculate approximate rotated column width
-		if ($rotation !== 0) {
-			if ($rotation == -165) {
-				// stacked text
-				$columnWidth = 4; // approximation
-			} else {
-				// rotated text
-				$columnWidth = $columnWidth * cos(deg2rad($rotation))
-								+ $fontSize * abs(sin(deg2rad($rotation))) / 5; // approximation
-			}
-		}
-
-		// pixel width is an integer
-		$columnWidth = (int) $columnWidth;
-		return $columnWidth;
-	}
-
-	/**
-	 * Calculate an (approximate) pixel size, based on a font points size
-	 *
-	 * @param 	int		$fontSizeInPoints	Font size (in points)
-	 * @return 	int		Font size (in pixels)
-	 */
-	public static function fontSizeToPixels($fontSizeInPoints = 11) {
-		return (int) ((4 / 3) * $fontSizeInPoints);
-	}
-
-	/**
-	 * Calculate an (approximate) pixel size, based on inch size
-	 *
-	 * @param 	int		$sizeInInch	Font size (in inch)
-	 * @return 	int		Size (in pixels)
-	 */
-	public static function inchSizeToPixels($sizeInInch = 1) {
-		return ($sizeInInch * 96);
-	}
-
-	/**
-	 * Calculate an (approximate) pixel size, based on centimeter size
-	 *
-	 * @param 	int		$sizeInCm	Font size (in centimeters)
-	 * @return 	int		Size (in pixels)
-	 */
-	public static function centimeterSizeToPixels($sizeInCm = 1) {
-		return ($sizeInCm * 37.795275591);
-	}
-
-	/**
-	 * Returns the font path given the font
-	 *
-	 * @param PHPExcel_Style_Font
-	 * @return string Path to TrueType font file
-	 */
-	public static function getTrueTypeFontFileFromFont($font) {
-		if (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath)) {
-			throw new Exception('Valid directory to TrueType Font files not specified');
-		}
-
-		$name		= $font->getName();
-		$bold		= $font->getBold();
-		$italic		= $font->getItalic();
-
-		// Check if we can map font to true type font file
-		switch ($name) {
-			case 'Arial':
-				$fontFile = (
-					$bold ? ($italic ? self::ARIAL_BOLD_ITALIC : self::ARIAL_BOLD)
-						  : ($italic ? self::ARIAL_ITALIC : self::ARIAL)
-				);
-				break;
-
-			case 'Calibri':
-				$fontFile = (
-					$bold ? ($italic ? self::CALIBRI_BOLD_ITALIC : self::CALIBRI_BOLD)
-						  : ($italic ? self::CALIBRI_ITALIC : self::CALIBRI)
-				);
-				break;
-
-			case 'Courier New':
-				$fontFile = (
-					$bold ? ($italic ? self::COURIER_NEW_BOLD_ITALIC : self::COURIER_NEW_BOLD)
-						  : ($italic ? self::COURIER_NEW_ITALIC : self::COURIER_NEW)
-				);
-				break;
-
-			case 'Comic Sans MS':
-				$fontFile = (
-					$bold ? self::COMIC_SANS_MS_BOLD : self::COMIC_SANS_MS
-				);
-				break;
-
-			case 'Georgia':
-				$fontFile = (
-					$bold ? ($italic ? self::GEORGIA_BOLD_ITALIC : self::GEORGIA_BOLD)
-						  : ($italic ? self::GEORGIA_ITALIC : self::GEORGIA)
-				);
-				break;
-
-			case 'Impact':
-				$fontFile = self::IMPACT;
-				break;
-
-			case 'Liberation Sans':
-				$fontFile = (
-					$bold ? ($italic ? self::LIBERATION_SANS_BOLD_ITALIC : self::LIBERATION_SANS_BOLD)
-						  : ($italic ? self::LIBERATION_SANS_ITALIC : self::LIBERATION_SANS)
-				);
-				break;
-
-			case 'Lucida Console':
-				$fontFile = self::LUCIDA_CONSOLE;
-				break;
-
-			case 'Lucida Sans Unicode':
-				$fontFile = self::LUCIDA_SANS_UNICODE;
-				break;
-
-			case 'Microsoft Sans Serif':
-				$fontFile = self::MICROSOFT_SANS_SERIF;
-				break;
-
-			case 'Palatino Linotype':
-				$fontFile = (
-					$bold ? ($italic ? self::PALATINO_LINOTYPE_BOLD_ITALIC : self::PALATINO_LINOTYPE_BOLD)
-						  : ($italic ? self::PALATINO_LINOTYPE_ITALIC : self::PALATINO_LINOTYPE)
-				);
-				break;
-
-			case 'Symbol':
-				$fontFile = self::SYMBOL;
-				break;
-
-			case 'Tahoma':
-				$fontFile = (
-					$bold ? self::TAHOMA_BOLD : self::TAHOMA
-				);
-				break;
-
-			case 'Times New Roman':
-				$fontFile = (
-					$bold ? ($italic ? self::TIMES_NEW_ROMAN_BOLD_ITALIC : self::TIMES_NEW_ROMAN_BOLD)
-						  : ($italic ? self::TIMES_NEW_ROMAN_ITALIC : self::TIMES_NEW_ROMAN)
-				);
-				break;
-
-			case 'Trebuchet MS':
-				$fontFile = (
-					$bold ? ($italic ? self::TREBUCHET_MS_BOLD_ITALIC : self::TREBUCHET_MS_BOLD)
-						  : ($italic ? self::TREBUCHET_MS_ITALIC : self::TREBUCHET_MS)
-				);
-				break;
-
-			case 'Verdana':
-				$fontFile = (
-					$bold ? ($italic ? self::VERDANA_BOLD_ITALIC : self::VERDANA_BOLD)
-						  : ($italic ? self::VERDANA_ITALIC : self::VERDANA)
-				);
-				break;
-
-			default:
-				throw new Exception('Unknown font name "'. $name .'". Cannot map to TrueType font file');
-				break;
-		}
-
-		$fontFile = self::$trueTypeFontPath . $fontFile;
-
-		// Check if file actually exists
-		if (!file_exists($fontFile)) {
-			throw New Exception('TrueType Font file not found');
-		}
-
-		return $fontFile;
-	}
-
-	/**
-	 * Returns the associated charset for the font name.
-	 *
-	 * @param string $name Font name
-	 * @return int Character set code
-	 */
-	public static function getCharsetFromFontName($name)
-	{
-		switch ($name) {
-			// Add more cases. Check FONT records in real Excel files.
-			case 'EucrosiaUPC':		return self::CHARSET_ANSI_THAI;
-			case 'Wingdings':		return self::CHARSET_SYMBOL;
-			case 'Wingdings 2':		return self::CHARSET_SYMBOL;
-			case 'Wingdings 3':		return self::CHARSET_SYMBOL;
-			default:				return self::CHARSET_ANSI_LATIN;
-		}
-	}
-
-	/**
-	 * Get the effective column width for columns without a column dimension or column with width -1
-	 * For example, for Calibri 11 this is 9.140625 (64 px)
-	 *
-	 * @param PHPExcel_Style_Font $font The workbooks default font
-	 * @param boolean $pPixels true = return column width in pixels, false = return in OOXML units
-	 * @return mixed Column width
-	 */
-	public static function getDefaultColumnWidthByFont(PHPExcel_Style_Font $font, $pPixels = false)
-	{
-		if (isset(self::$defaultColumnWidths[$font->getName()][$font->getSize()])) {
-			// Exact width can be determined
-			$columnWidth = $pPixels ?
-				self::$defaultColumnWidths[$font->getName()][$font->getSize()]['px']
-					: self::$defaultColumnWidths[$font->getName()][$font->getSize()]['width'];
-
-		} else {
-			// We don't have data for this particular font and size, use approximation by
-			// extrapolating from Calibri 11
-			$columnWidth = $pPixels ?
-				self::$defaultColumnWidths['Calibri'][11]['px']
-					: self::$defaultColumnWidths['Calibri'][11]['width'];
-			$columnWidth = $columnWidth * $font->getSize() / 11;
-
-			// Round pixels to closest integer
-			if ($pPixels) {
-				$columnWidth = (int) round($columnWidth);
-			}
-		}
-
-		return $columnWidth;
-	}
-
-	/**
-	 * Get the effective row height for rows without a row dimension or rows with height -1
-	 * For example, for Calibri 11 this is 15 points
-	 *
-	 * @param PHPExcel_Style_Font $font The workbooks default font
-	 * @return float Row height in points
-	 */
-	public static function getDefaultRowHeightByFont(PHPExcel_Style_Font $font)
-	{
-		switch ($font->getName()) {
-			case 'Arial':
-				switch ($font->getSize()) {
-					case 10:
-						// inspection of Arial 10 workbook says 12.75pt ~17px
-						$rowHeight = 12.75;
-						break;
-
-					case 9:
-						// inspection of Arial 9 workbook says 12.00pt ~16px
-						$rowHeight = 12;
-						break;
-
-					case 8:
-						// inspection of Arial 8 workbook says 11.25pt ~15px
-						$rowHeight = 11.25;
-						break;
-
-					case 7:
-						// inspection of Arial 7 workbook says 9.00pt ~12px
-						$rowHeight = 9;
-						break;
-
-					case 6:
-					case 5:
-						// inspection of Arial 5,6 workbook says 8.25pt ~11px
-						$rowHeight = 8.25;
-						break;
-
-					case 4:
-						// inspection of Arial 4 workbook says 6.75pt ~9px
-						$rowHeight = 6.75;
-						break;
-
-					case 3:
-						// inspection of Arial 3 workbook says 6.00pt ~8px
-						$rowHeight = 6;
-						break;
-
-					case 2:
-					case 1:
-						// inspection of Arial 1,2 workbook says 5.25pt ~7px
-						$rowHeight = 5.25;
-						break;
-
-					default:
-						// use Arial 10 workbook as an approximation, extrapolation
-						$rowHeight = 12.75 * $font->getSize() / 10;
-						break;
-				}
-				break;
-
-			case 'Calibri':
-				switch ($font->getSize()) {
-					case 11:
-						// inspection of Calibri 11 workbook says 15.00pt ~20px
-						$rowHeight = 15;
-						break;
-
-					case 10:
-						// inspection of Calibri 10 workbook says 12.75pt ~17px
-						$rowHeight = 12.75;
-						break;
-
-					case 9:
-						// inspection of Calibri 9 workbook says 12.00pt ~16px
-						$rowHeight = 12;
-						break;
-
-					case 8:
-						// inspection of Calibri 8 workbook says 11.25pt ~15px
-						$rowHeight = 11.25;
-						break;
-
-					case 7:
-						// inspection of Calibri 7 workbook says 9.00pt ~12px
-						$rowHeight = 9;
-						break;
-
-					case 6:
-					case 5:
-						// inspection of Calibri 5,6 workbook says 8.25pt ~11px
-						$rowHeight = 8.25;
-						break;
-
-					case 4:
-						// inspection of Calibri 4 workbook says 6.75pt ~9px
-						$rowHeight = 6.75;
-						break;
-
-					case 3:
-						// inspection of Calibri 3 workbook says 6.00pt ~8px
-						$rowHeight = 6.00;
-						break;
-
-					case 2:
-					case 1:
-						// inspection of Calibri 1,2 workbook says 5.25pt ~7px
-						$rowHeight = 5.25;
-						break;
-
-					default:
-						// use Calibri 11 workbook as an approximation, extrapolation
-						$rowHeight = 15 * $font->getSize() / 11;
-						break;
-				}
-				break;
-
-			case 'Verdana':
-				switch ($font->getSize()) {
-					case 10:
-						// inspection of Verdana 10 workbook says 12.75pt ~17px
-						$rowHeight = 12.75;
-						break;
-
-					case 9:
-						// inspection of Verdana 9 workbook says 11.25pt ~15px
-						$rowHeight = 11.25;
-						break;
-
-					case 8:
-						// inspection of Verdana 8 workbook says 10.50pt ~14px
-						$rowHeight = 10.50;
-						break;
-
-					case 7:
-						// inspection of Verdana 7 workbook says 9.00pt ~12px
-						$rowHeight = 9.00;
-						break;
-
-					case 6:
-					case 5:
-						// inspection of Verdana 5,6 workbook says 8.25pt ~11px
-						$rowHeight = 8.25;
-						break;
-
-					case 4:
-						// inspection of Verdana 4 workbook says 6.75pt ~9px
-						$rowHeight = 6.75;
-						break;
-
-					case 3:
-						// inspection of Verdana 3 workbook says 6.00pt ~8px
-						$rowHeight = 6;
-						break;
-
-					case 2:
-					case 1:
-						// inspection of Verdana 1,2 workbook says 5.25pt ~7px
-						$rowHeight = 5.25;
-						break;
-
-					default:
-						// use Verdana 10 workbook as an approximation, extrapolation
-						$rowHeight = 12.75 * $font->getSize() / 10;
-						break;
-				}
-				break;
-
-			default:
-				// just use Calibri as an approximation
-				$rowHeight = 15 * $font->getSize() / 11;
-				break;
-		}
-
-		return $rowHeight;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/CHANGELOG.TXT b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/CHANGELOG.TXT
deleted file mode 100755
index 1c18a5da3..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/CHANGELOG.TXT
+++ /dev/null
@@ -1,16 +0,0 @@
-Mar 1, 2005 11:15 AST by PM
-
-+ For consistency, renamed Math.php to Maths.java, utils to util, 
-  tests to test, docs to doc - 
-
-+ Removed conditional logic from top of Matrix class.
-
-+ Switched to using hypo function in Maths.php for all php-hypot calls.
-  NOTE TO SELF: Need to make sure that all decompositions have been 
-  switched over to using the bundled hypo.
-
-Feb 25, 2005 at 10:00 AST by PM
-
-+ Recommend using simpler Error.php instead of JAMA_Error.php but 
-  can be persuaded otherwise.
-
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
deleted file mode 100755
index 9d064f9e6..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	Cholesky decomposition class
- *
- *	For a symmetric, positive definite matrix A, the Cholesky decomposition
- *	is an lower triangular matrix L so that A = L*L'.
- *
- *	If the matrix is not symmetric or positive definite, the constructor
- *	returns a partial decomposition and sets an internal flag that may
- *	be queried by the isSPD() method.
- *
- *	@author Paul Meagher
- *	@author Michael Bommarito
- *	@version 1.2
- */
-class CholeskyDecomposition {
-
-	/**
-	 *	Decomposition storage
-	 *	@var array
-	 *	@access private
-	 */
-	private $L = array();
-
-	/**
-	 *	Matrix row and column dimension
-	 *	@var int
-	 *	@access private
-	 */
-	private $m;
-
-	/**
-	 *	Symmetric positive definite flag
-	 *	@var boolean
-	 *	@access private
-	 */
-	private $isspd = true;
-
-
-	/**
-	 *	CholeskyDecomposition
-	 *
-	 *	Class constructor - decomposes symmetric positive definite matrix
-	 *	@param mixed Matrix square symmetric positive definite matrix
-	 */
-	public function __construct($A = null) {
-		if ($A instanceof Matrix) {
-			$this->L = $A->getArray();
-			$this->m = $A->getRowDimension();
-
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = $i; $j < $this->m; ++$j) {
-					for($sum = $this->L[$i][$j], $k = $i - 1; $k >= 0; --$k) {
-						$sum -= $this->L[$i][$k] * $this->L[$j][$k];
-					}
-					if ($i == $j) {
-						if ($sum >= 0) {
-							$this->L[$i][$i] = sqrt($sum);
-						} else {
-							$this->isspd = false;
-						}
-					} else {
-						if ($this->L[$i][$i] != 0) {
-							$this->L[$j][$i] = $sum / $this->L[$i][$i];
-						}
-					}
-				}
-
-				for ($k = $i+1; $k < $this->m; ++$k) {
-					$this->L[$i][$k] = 0.0;
-				}
-			}
-		} else {
-			throw new Exception(JAMAError(ArgumentTypeException));
-		}
-	}	//	function __construct()
-
-
-	/**
-	 *	Is the matrix symmetric and positive definite?
-	 *
-	 *	@return boolean
-	 */
-	public function isSPD() {
-		return $this->isspd;
-	}	//	function isSPD()
-
-
-	/**
-	 *	getL
-	 *
-	 *	Return triangular factor.
-	 *	@return Matrix Lower triangular matrix
-	 */
-	public function getL() {
-		return new Matrix($this->L);
-	}	//	function getL()
-
-
-	/**
-	 *	Solve A*X = B
-	 *
-	 *	@param $B Row-equal matrix
-	 *	@return Matrix L * L' * X = B
-	 */
-	public function solve($B = null) {
-		if ($B instanceof Matrix) {
-			if ($B->getRowDimension() == $this->m) {
-				if ($this->isspd) {
-					$X  = $B->getArrayCopy();
-					$nx = $B->getColumnDimension();
-
-					for ($k = 0; $k < $this->m; ++$k) {
-						for ($i = $k + 1; $i < $this->m; ++$i) {
-							for ($j = 0; $j < $nx; ++$j) {
-								$X[$i][$j] -= $X[$k][$j] * $this->L[$i][$k];
-							}
-						}
-						for ($j = 0; $j < $nx; ++$j) {
-							$X[$k][$j] /= $this->L[$k][$k];
-						}
-					}
-
-					for ($k = $this->m - 1; $k >= 0; --$k) {
-						for ($j = 0; $j < $nx; ++$j) {
-							$X[$k][$j] /= $this->L[$k][$k];
-						}
-						for ($i = 0; $i < $k; ++$i) {
-							for ($j = 0; $j < $nx; ++$j) {
-								$X[$i][$j] -= $X[$k][$j] * $this->L[$k][$i];
-							}
-						}
-					}
-
-					return new Matrix($X, $this->m, $nx);
-				} else {
-					throw new Exception(JAMAError(MatrixSPDException));
-				}
-			} else {
-				throw new Exception(JAMAError(MatrixDimensionException));
-			}
-		} else {
-			throw new Exception(JAMAError(ArgumentTypeException));
-		}
-	}	//	function solve()
-
-}	//	class CholeskyDecomposition
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
deleted file mode 100755
index 2a696d00f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
+++ /dev/null
@@ -1,862 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	Class to obtain eigenvalues and eigenvectors of a real matrix.
- *
- *	If A is symmetric, then A = V*D*V' where the eigenvalue matrix D
- *	is diagonal and the eigenvector matrix V is orthogonal (i.e.
- *	A = V.times(D.times(V.transpose())) and V.times(V.transpose())
- *	equals the identity matrix).
- *
- *	If A is not symmetric, then the eigenvalue matrix D is block diagonal
- *	with the real eigenvalues in 1-by-1 blocks and any complex eigenvalues,
- *	lambda + i*mu, in 2-by-2 blocks, [lambda, mu; -mu, lambda].  The
- *	columns of V represent the eigenvectors in the sense that A*V = V*D,
- *	i.e. A.times(V) equals V.times(D).  The matrix V may be badly
- *	conditioned, or even singular, so the validity of the equation
- *	A = V*D*inverse(V) depends upon V.cond().
- *
- *	@author  Paul Meagher
- *	@license PHP v3.0
- *	@version 1.1
- */
-class EigenvalueDecomposition {
-
-	/**
-	 *	Row and column dimension (square matrix).
-	 *	@var int
-	 */
-	private $n;
-
-	/**
-	 *	Internal symmetry flag.
-	 *	@var int
-	 */
-	private $issymmetric;
-
-	/**
-	 *	Arrays for internal storage of eigenvalues.
-	 *	@var array
-	 */
-	private $d = array();
-	private $e = array();
-
-	/**
-	 *	Array for internal storage of eigenvectors.
-	 *	@var array
-	 */
-	private $V = array();
-
-	/**
-	*	Array for internal storage of nonsymmetric Hessenberg form.
-	*	@var array
-	*/
-	private $H = array();
-
-	/**
-	*	Working storage for nonsymmetric algorithm.
-	*	@var array
-	*/
-	private $ort;
-
-	/**
-	*	Used for complex scalar division.
-	*	@var float
-	*/
-	private $cdivr;
-	private $cdivi;
-
-
-	/**
-	 *	Symmetric Householder reduction to tridiagonal form.
-	 *
-	 *	@access private
-	 */
-	private function tred2 () {
-		//  This is derived from the Algol procedures tred2 by
-		//  Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
-		//  Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
-		//  Fortran subroutine in EISPACK.
-		$this->d = $this->V[$this->n-1];
-		// Householder reduction to tridiagonal form.
-		for ($i = $this->n-1; $i > 0; --$i) {
-			$i_ = $i -1;
-			// Scale to avoid under/overflow.
-			$h = $scale = 0.0;
-			$scale += array_sum(array_map(abs, $this->d));
-			if ($scale == 0.0) {
-				$this->e[$i] = $this->d[$i_];
-				$this->d = array_slice($this->V[$i_], 0, $i_);
-				for ($j = 0; $j < $i; ++$j) {
-					$this->V[$j][$i] = $this->V[$i][$j] = 0.0;
-				}
-			} else {
-				// Generate Householder vector.
-				for ($k = 0; $k < $i; ++$k) {
-					$this->d[$k] /= $scale;
-					$h += pow($this->d[$k], 2);
-				}
-				$f = $this->d[$i_];
-				$g = sqrt($h);
-				if ($f > 0) {
-					$g = -$g;
-				}
-				$this->e[$i] = $scale * $g;
-				$h = $h - $f * $g;
-				$this->d[$i_] = $f - $g;
-				for ($j = 0; $j < $i; ++$j) {
-					$this->e[$j] = 0.0;
-				}
-				// Apply similarity transformation to remaining columns.
-				for ($j = 0; $j < $i; ++$j) {
-					$f = $this->d[$j];
-					$this->V[$j][$i] = $f;
-					$g = $this->e[$j] + $this->V[$j][$j] * $f;
-					for ($k = $j+1; $k <= $i_; ++$k) {
-						$g += $this->V[$k][$j] * $this->d[$k];
-						$this->e[$k] += $this->V[$k][$j] * $f;
-					}
-					$this->e[$j] = $g;
-				}
-				$f = 0.0;
-				for ($j = 0; $j < $i; ++$j) {
-					$this->e[$j] /= $h;
-					$f += $this->e[$j] * $this->d[$j];
-				}
-				$hh = $f / (2 * $h);
-				for ($j=0; $j < $i; ++$j) {
-					$this->e[$j] -= $hh * $this->d[$j];
-				}
-				for ($j = 0; $j < $i; ++$j) {
-					$f = $this->d[$j];
-					$g = $this->e[$j];
-					for ($k = $j; $k <= $i_; ++$k) {
-						$this->V[$k][$j] -= ($f * $this->e[$k] + $g * $this->d[$k]);
-					}
-					$this->d[$j] = $this->V[$i-1][$j];
-					$this->V[$i][$j] = 0.0;
-				}
-			}
-			$this->d[$i] = $h;
-		}
-
-		// Accumulate transformations.
-		for ($i = 0; $i < $this->n-1; ++$i) {
-			$this->V[$this->n-1][$i] = $this->V[$i][$i];
-			$this->V[$i][$i] = 1.0;
-			$h = $this->d[$i+1];
-			if ($h != 0.0) {
-				for ($k = 0; $k <= $i; ++$k) {
-					$this->d[$k] = $this->V[$k][$i+1] / $h;
-				}
-				for ($j = 0; $j <= $i; ++$j) {
-					$g = 0.0;
-					for ($k = 0; $k <= $i; ++$k) {
-						$g += $this->V[$k][$i+1] * $this->V[$k][$j];
-					}
-					for ($k = 0; $k <= $i; ++$k) {
-						$this->V[$k][$j] -= $g * $this->d[$k];
-					}
-				}
-			}
-			for ($k = 0; $k <= $i; ++$k) {
-				$this->V[$k][$i+1] = 0.0;
-			}
-		}
-
-		$this->d = $this->V[$this->n-1];
-		$this->V[$this->n-1] = array_fill(0, $j, 0.0);
-		$this->V[$this->n-1][$this->n-1] = 1.0;
-		$this->e[0] = 0.0;
-	}
-
-
-	/**
-	 *	Symmetric tridiagonal QL algorithm.
-	 *
-	 *	This is derived from the Algol procedures tql2, by
-	 *	Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
-	 *	Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
-	 *	Fortran subroutine in EISPACK.
-	 *
-	 *	@access private
-	 */
-	private function tql2() {
-		for ($i = 1; $i < $this->n; ++$i) {
-			$this->e[$i-1] = $this->e[$i];
-		}
-		$this->e[$this->n-1] = 0.0;
-		$f = 0.0;
-		$tst1 = 0.0;
-		$eps  = pow(2.0,-52.0);
-
-		for ($l = 0; $l < $this->n; ++$l) {
-			// Find small subdiagonal element
-			$tst1 = max($tst1, abs($this->d[$l]) + abs($this->e[$l]));
-			$m = $l;
-			while ($m < $this->n) {
-				if (abs($this->e[$m]) <= $eps * $tst1)
-					break;
-				++$m;
-			}
-			// If m == l, $this->d[l] is an eigenvalue,
-			// otherwise, iterate.
-			if ($m > $l) {
-				$iter = 0;
-				do {
-					// Could check iteration count here.
-					$iter += 1;
-					// Compute implicit shift
-					$g = $this->d[$l];
-					$p = ($this->d[$l+1] - $g) / (2.0 * $this->e[$l]);
-					$r = hypo($p, 1.0);
-					if ($p < 0)
-						$r *= -1;
-					$this->d[$l] = $this->e[$l] / ($p + $r);
-					$this->d[$l+1] = $this->e[$l] * ($p + $r);
-					$dl1 = $this->d[$l+1];
-					$h = $g - $this->d[$l];
-					for ($i = $l + 2; $i < $this->n; ++$i)
-						$this->d[$i] -= $h;
-					$f += $h;
-					// Implicit QL transformation.
-					$p = $this->d[$m];
-					$c = 1.0;
-					$c2 = $c3 = $c;
-					$el1 = $this->e[$l + 1];
-					$s = $s2 = 0.0;
-					for ($i = $m-1; $i >= $l; --$i) {
-						$c3 = $c2;
-						$c2 = $c;
-						$s2 = $s;
-						$g  = $c * $this->e[$i];
-						$h  = $c * $p;
-						$r  = hypo($p, $this->e[$i]);
-						$this->e[$i+1] = $s * $r;
-						$s = $this->e[$i] / $r;
-						$c = $p / $r;
-						$p = $c * $this->d[$i] - $s * $g;
-						$this->d[$i+1] = $h + $s * ($c * $g + $s * $this->d[$i]);
-						// Accumulate transformation.
-						for ($k = 0; $k < $this->n; ++$k) {
-							$h = $this->V[$k][$i+1];
-							$this->V[$k][$i+1] = $s * $this->V[$k][$i] + $c * $h;
-							$this->V[$k][$i] = $c * $this->V[$k][$i] - $s * $h;
-						}
-					}
-					$p = -$s * $s2 * $c3 * $el1 * $this->e[$l] / $dl1;
-					$this->e[$l] = $s * $p;
-					$this->d[$l] = $c * $p;
-				// Check for convergence.
-				} while (abs($this->e[$l]) > $eps * $tst1);
-			}
-			$this->d[$l] = $this->d[$l] + $f;
-			$this->e[$l] = 0.0;
-		}
-
-		// Sort eigenvalues and corresponding vectors.
-		for ($i = 0; $i < $this->n - 1; ++$i) {
-			$k = $i;
-			$p = $this->d[$i];
-			for ($j = $i+1; $j < $this->n; ++$j) {
-				if ($this->d[$j] < $p) {
-					$k = $j;
-					$p = $this->d[$j];
-				}
-			}
-			if ($k != $i) {
-				$this->d[$k] = $this->d[$i];
-				$this->d[$i] = $p;
-				for ($j = 0; $j < $this->n; ++$j) {
-					$p = $this->V[$j][$i];
-					$this->V[$j][$i] = $this->V[$j][$k];
-					$this->V[$j][$k] = $p;
-				}
-			}
-		}
-	}
-
-
-	/**
-	 *	Nonsymmetric reduction to Hessenberg form.
-	 *
-	 *	This is derived from the Algol procedures orthes and ortran,
-	 *	by Martin and Wilkinson, Handbook for Auto. Comp.,
-	 *	Vol.ii-Linear Algebra, and the corresponding
-	 *	Fortran subroutines in EISPACK.
-	 *
-	 *	@access private
-	 */
-	private function orthes () {
-		$low  = 0;
-		$high = $this->n-1;
-
-		for ($m = $low+1; $m <= $high-1; ++$m) {
-			// Scale column.
-			$scale = 0.0;
-			for ($i = $m; $i <= $high; ++$i) {
-				$scale = $scale + abs($this->H[$i][$m-1]);
-			}
-			if ($scale != 0.0) {
-				// Compute Householder transformation.
-				$h = 0.0;
-				for ($i = $high; $i >= $m; --$i) {
-					$this->ort[$i] = $this->H[$i][$m-1] / $scale;
-					$h += $this->ort[$i] * $this->ort[$i];
-				}
-				$g = sqrt($h);
-				if ($this->ort[$m] > 0) {
-					$g *= -1;
-				}
-				$h -= $this->ort[$m] * $g;
-				$this->ort[$m] -= $g;
-				// Apply Householder similarity transformation
-				// H = (I -u * u' / h) * H * (I -u * u') / h)
-				for ($j = $m; $j < $this->n; ++$j) {
-					$f = 0.0;
-					for ($i = $high; $i >= $m; --$i) {
-						$f += $this->ort[$i] * $this->H[$i][$j];
-					}
-					$f /= $h;
-					for ($i = $m; $i <= $high; ++$i) {
-						$this->H[$i][$j] -= $f * $this->ort[$i];
-					}
-				}
-				for ($i = 0; $i <= $high; ++$i) {
-					$f = 0.0;
-					for ($j = $high; $j >= $m; --$j) {
-						$f += $this->ort[$j] * $this->H[$i][$j];
-					}
-					$f = $f / $h;
-					for ($j = $m; $j <= $high; ++$j) {
-						$this->H[$i][$j] -= $f * $this->ort[$j];
-					}
-				}
-				$this->ort[$m] = $scale * $this->ort[$m];
-				$this->H[$m][$m-1] = $scale * $g;
-			}
-		}
-
-		// Accumulate transformations (Algol's ortran).
-		for ($i = 0; $i < $this->n; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				$this->V[$i][$j] = ($i == $j ? 1.0 : 0.0);
-			}
-		}
-		for ($m = $high-1; $m >= $low+1; --$m) {
-			if ($this->H[$m][$m-1] != 0.0) {
-				for ($i = $m+1; $i <= $high; ++$i) {
-					$this->ort[$i] = $this->H[$i][$m-1];
-				}
-				for ($j = $m; $j <= $high; ++$j) {
-					$g = 0.0;
-					for ($i = $m; $i <= $high; ++$i) {
-						$g += $this->ort[$i] * $this->V[$i][$j];
-					}
-					// Double division avoids possible underflow
-					$g = ($g / $this->ort[$m]) / $this->H[$m][$m-1];
-					for ($i = $m; $i <= $high; ++$i) {
-						$this->V[$i][$j] += $g * $this->ort[$i];
-					}
-				}
-			}
-		}
-	}
-
-
-	/**
-	 *	Performs complex division.
-	 *
-	 *	@access private
-	 */
-	private function cdiv($xr, $xi, $yr, $yi) {
-		if (abs($yr) > abs($yi)) {
-			$r = $yi / $yr;
-			$d = $yr + $r * $yi;
-			$this->cdivr = ($xr + $r * $xi) / $d;
-			$this->cdivi = ($xi - $r * $xr) / $d;
-		} else {
-			$r = $yr / $yi;
-			$d = $yi + $r * $yr;
-			$this->cdivr = ($r * $xr + $xi) / $d;
-			$this->cdivi = ($r * $xi - $xr) / $d;
-		}
-	}
-
-
-	/**
-	 *	Nonsymmetric reduction from Hessenberg to real Schur form.
-	 *
-	 *	Code is derived from the Algol procedure hqr2,
-	 *	by Martin and Wilkinson, Handbook for Auto. Comp.,
-	 *	Vol.ii-Linear Algebra, and the corresponding
-	 *	Fortran subroutine in EISPACK.
-	 *
-	 *	@access private
-	 */
-	private function hqr2 () {
-		//  Initialize
-		$nn = $this->n;
-		$n  = $nn - 1;
-		$low = 0;
-		$high = $nn - 1;
-		$eps = pow(2.0, -52.0);
-		$exshift = 0.0;
-		$p = $q = $r = $s = $z = 0;
-		// Store roots isolated by balanc and compute matrix norm
-		$norm = 0.0;
-
-		for ($i = 0; $i < $nn; ++$i) {
-			if (($i < $low) OR ($i > $high)) {
-				$this->d[$i] = $this->H[$i][$i];
-				$this->e[$i] = 0.0;
-			}
-			for ($j = max($i-1, 0); $j < $nn; ++$j) {
-				$norm = $norm + abs($this->H[$i][$j]);
-			}
-		}
-
-		// Outer loop over eigenvalue index
-		$iter = 0;
-		while ($n >= $low) {
-			// Look for single small sub-diagonal element
-			$l = $n;
-			while ($l > $low) {
-				$s = abs($this->H[$l-1][$l-1]) + abs($this->H[$l][$l]);
-				if ($s == 0.0) {
-					$s = $norm;
-				}
-				if (abs($this->H[$l][$l-1]) < $eps * $s) {
-					break;
-				}
-				--$l;
-			}
-			// Check for convergence
-			// One root found
-			if ($l == $n) {
-				$this->H[$n][$n] = $this->H[$n][$n] + $exshift;
-				$this->d[$n] = $this->H[$n][$n];
-				$this->e[$n] = 0.0;
-				--$n;
-				$iter = 0;
-			// Two roots found
-			} else if ($l == $n-1) {
-				$w = $this->H[$n][$n-1] * $this->H[$n-1][$n];
-				$p = ($this->H[$n-1][$n-1] - $this->H[$n][$n]) / 2.0;
-				$q = $p * $p + $w;
-				$z = sqrt(abs($q));
-				$this->H[$n][$n] = $this->H[$n][$n] + $exshift;
-				$this->H[$n-1][$n-1] = $this->H[$n-1][$n-1] + $exshift;
-				$x = $this->H[$n][$n];
-				// Real pair
-				if ($q >= 0) {
-					if ($p >= 0) {
-						$z = $p + $z;
-					} else {
-						$z = $p - $z;
-					}
-					$this->d[$n-1] = $x + $z;
-					$this->d[$n] = $this->d[$n-1];
-					if ($z != 0.0) {
-						$this->d[$n] = $x - $w / $z;
-					}
-					$this->e[$n-1] = 0.0;
-					$this->e[$n] = 0.0;
-					$x = $this->H[$n][$n-1];
-					$s = abs($x) + abs($z);
-					$p = $x / $s;
-					$q = $z / $s;
-					$r = sqrt($p * $p + $q * $q);
-					$p = $p / $r;
-					$q = $q / $r;
-					// Row modification
-					for ($j = $n-1; $j < $nn; ++$j) {
-						$z = $this->H[$n-1][$j];
-						$this->H[$n-1][$j] = $q * $z + $p * $this->H[$n][$j];
-						$this->H[$n][$j] = $q * $this->H[$n][$j] - $p * $z;
-					}
-					// Column modification
-					for ($i = 0; $i <= n; ++$i) {
-						$z = $this->H[$i][$n-1];
-						$this->H[$i][$n-1] = $q * $z + $p * $this->H[$i][$n];
-						$this->H[$i][$n] = $q * $this->H[$i][$n] - $p * $z;
-					}
-					// Accumulate transformations
-					for ($i = $low; $i <= $high; ++$i) {
-						$z = $this->V[$i][$n-1];
-						$this->V[$i][$n-1] = $q * $z + $p * $this->V[$i][$n];
-						$this->V[$i][$n] = $q * $this->V[$i][$n] - $p * $z;
-					}
-				// Complex pair
-				} else {
-					$this->d[$n-1] = $x + $p;
-					$this->d[$n] = $x + $p;
-					$this->e[$n-1] = $z;
-					$this->e[$n] = -$z;
-				}
-				$n = $n - 2;
-				$iter = 0;
-			// No convergence yet
-			} else {
-				// Form shift
-				$x = $this->H[$n][$n];
-				$y = 0.0;
-				$w = 0.0;
-				if ($l < $n) {
-					$y = $this->H[$n-1][$n-1];
-					$w = $this->H[$n][$n-1] * $this->H[$n-1][$n];
-				}
-				// Wilkinson's original ad hoc shift
-				if ($iter == 10) {
-					$exshift += $x;
-					for ($i = $low; $i <= $n; ++$i) {
-						$this->H[$i][$i] -= $x;
-					}
-					$s = abs($this->H[$n][$n-1]) + abs($this->H[$n-1][$n-2]);
-					$x = $y = 0.75 * $s;
-					$w = -0.4375 * $s * $s;
-				}
-				// MATLAB's new ad hoc shift
-				if ($iter == 30) {
-					$s = ($y - $x) / 2.0;
-					$s = $s * $s + $w;
-					if ($s > 0) {
-						$s = sqrt($s);
-						if ($y < $x) {
-							$s = -$s;
-						}
-						$s = $x - $w / (($y - $x) / 2.0 + $s);
-						for ($i = $low; $i <= $n; ++$i) {
-							$this->H[$i][$i] -= $s;
-						}
-						$exshift += $s;
-						$x = $y = $w = 0.964;
-					}
-				}
-				// Could check iteration count here.
-				$iter = $iter + 1;
-				// Look for two consecutive small sub-diagonal elements
-				$m = $n - 2;
-				while ($m >= $l) {
-					$z = $this->H[$m][$m];
-					$r = $x - $z;
-					$s = $y - $z;
-					$p = ($r * $s - $w) / $this->H[$m+1][$m] + $this->H[$m][$m+1];
-					$q = $this->H[$m+1][$m+1] - $z - $r - $s;
-					$r = $this->H[$m+2][$m+1];
-					$s = abs($p) + abs($q) + abs($r);
-					$p = $p / $s;
-					$q = $q / $s;
-					$r = $r / $s;
-					if ($m == $l) {
-						break;
-					}
-					if (abs($this->H[$m][$m-1]) * (abs($q) + abs($r)) <
-						$eps * (abs($p) * (abs($this->H[$m-1][$m-1]) + abs($z) + abs($this->H[$m+1][$m+1])))) {
-						break;
-					}
-					--$m;
-				}
-				for ($i = $m + 2; $i <= $n; ++$i) {
-					$this->H[$i][$i-2] = 0.0;
-					if ($i > $m+2) {
-						$this->H[$i][$i-3] = 0.0;
-					}
-				}
-				// Double QR step involving rows l:n and columns m:n
-				for ($k = $m; $k <= $n-1; ++$k) {
-					$notlast = ($k != $n-1);
-					if ($k != $m) {
-						$p = $this->H[$k][$k-1];
-						$q = $this->H[$k+1][$k-1];
-						$r = ($notlast ? $this->H[$k+2][$k-1] : 0.0);
-						$x = abs($p) + abs($q) + abs($r);
-						if ($x != 0.0) {
-							$p = $p / $x;
-							$q = $q / $x;
-							$r = $r / $x;
-						}
-					}
-					if ($x == 0.0) {
-						break;
-					}
-					$s = sqrt($p * $p + $q * $q + $r * $r);
-					if ($p < 0) {
-						$s = -$s;
-					}
-					if ($s != 0) {
-						if ($k != $m) {
-							$this->H[$k][$k-1] = -$s * $x;
-						} elseif ($l != $m) {
-							$this->H[$k][$k-1] = -$this->H[$k][$k-1];
-						}
-						$p = $p + $s;
-						$x = $p / $s;
-						$y = $q / $s;
-						$z = $r / $s;
-						$q = $q / $p;
-						$r = $r / $p;
-						// Row modification
-						for ($j = $k; $j < $nn; ++$j) {
-							$p = $this->H[$k][$j] + $q * $this->H[$k+1][$j];
-							if ($notlast) {
-								$p = $p + $r * $this->H[$k+2][$j];
-								$this->H[$k+2][$j] = $this->H[$k+2][$j] - $p * $z;
-							}
-							$this->H[$k][$j] = $this->H[$k][$j] - $p * $x;
-							$this->H[$k+1][$j] = $this->H[$k+1][$j] - $p * $y;
-						}
-						// Column modification
-						for ($i = 0; $i <= min($n, $k+3); ++$i) {
-							$p = $x * $this->H[$i][$k] + $y * $this->H[$i][$k+1];
-							if ($notlast) {
-								$p = $p + $z * $this->H[$i][$k+2];
-								$this->H[$i][$k+2] = $this->H[$i][$k+2] - $p * $r;
-							}
-							$this->H[$i][$k] = $this->H[$i][$k] - $p;
-							$this->H[$i][$k+1] = $this->H[$i][$k+1] - $p * $q;
-						}
-						// Accumulate transformations
-						for ($i = $low; $i <= $high; ++$i) {
-							$p = $x * $this->V[$i][$k] + $y * $this->V[$i][$k+1];
-							if ($notlast) {
-								$p = $p + $z * $this->V[$i][$k+2];
-								$this->V[$i][$k+2] = $this->V[$i][$k+2] - $p * $r;
-							}
-							$this->V[$i][$k] = $this->V[$i][$k] - $p;
-							$this->V[$i][$k+1] = $this->V[$i][$k+1] - $p * $q;
-						}
-					}  // ($s != 0)
-				}  // k loop
-			}  // check convergence
-		}  // while ($n >= $low)
-
-		// Backsubstitute to find vectors of upper triangular form
-		if ($norm == 0.0) {
-			return;
-		}
-
-		for ($n = $nn-1; $n >= 0; --$n) {
-			$p = $this->d[$n];
-			$q = $this->e[$n];
-			// Real vector
-			if ($q == 0) {
-				$l = $n;
-				$this->H[$n][$n] = 1.0;
-				for ($i = $n-1; $i >= 0; --$i) {
-					$w = $this->H[$i][$i] - $p;
-					$r = 0.0;
-					for ($j = $l; $j <= $n; ++$j) {
-						$r = $r + $this->H[$i][$j] * $this->H[$j][$n];
-					}
-					if ($this->e[$i] < 0.0) {
-						$z = $w;
-						$s = $r;
-					} else {
-						$l = $i;
-						if ($this->e[$i] == 0.0) {
-							if ($w != 0.0) {
-								$this->H[$i][$n] = -$r / $w;
-							} else {
-								$this->H[$i][$n] = -$r / ($eps * $norm);
-							}
-						// Solve real equations
-						} else {
-							$x = $this->H[$i][$i+1];
-							$y = $this->H[$i+1][$i];
-							$q = ($this->d[$i] - $p) * ($this->d[$i] - $p) + $this->e[$i] * $this->e[$i];
-							$t = ($x * $s - $z * $r) / $q;
-							$this->H[$i][$n] = $t;
-							if (abs($x) > abs($z)) {
-								$this->H[$i+1][$n] = (-$r - $w * $t) / $x;
-							} else {
-								$this->H[$i+1][$n] = (-$s - $y * $t) / $z;
-							}
-						}
-						// Overflow control
-						$t = abs($this->H[$i][$n]);
-						if (($eps * $t) * $t > 1) {
-							for ($j = $i; $j <= $n; ++$j) {
-								$this->H[$j][$n] = $this->H[$j][$n] / $t;
-							}
-						}
-					}
-				}
-			// Complex vector
-			} else if ($q < 0) {
-				$l = $n-1;
-				// Last vector component imaginary so matrix is triangular
-				if (abs($this->H[$n][$n-1]) > abs($this->H[$n-1][$n])) {
-					$this->H[$n-1][$n-1] = $q / $this->H[$n][$n-1];
-					$this->H[$n-1][$n] = -($this->H[$n][$n] - $p) / $this->H[$n][$n-1];
-				} else {
-					$this->cdiv(0.0, -$this->H[$n-1][$n], $this->H[$n-1][$n-1] - $p, $q);
-					$this->H[$n-1][$n-1] = $this->cdivr;
-					$this->H[$n-1][$n]   = $this->cdivi;
-				}
-				$this->H[$n][$n-1] = 0.0;
-				$this->H[$n][$n] = 1.0;
-				for ($i = $n-2; $i >= 0; --$i) {
-					// double ra,sa,vr,vi;
-					$ra = 0.0;
-					$sa = 0.0;
-					for ($j = $l; $j <= $n; ++$j) {
-						$ra = $ra + $this->H[$i][$j] * $this->H[$j][$n-1];
-						$sa = $sa + $this->H[$i][$j] * $this->H[$j][$n];
-					}
-					$w = $this->H[$i][$i] - $p;
-					if ($this->e[$i] < 0.0) {
-						$z = $w;
-						$r = $ra;
-						$s = $sa;
-					} else {
-						$l = $i;
-						if ($this->e[$i] == 0) {
-							$this->cdiv(-$ra, -$sa, $w, $q);
-							$this->H[$i][$n-1] = $this->cdivr;
-							$this->H[$i][$n]   = $this->cdivi;
-						} else {
-							// Solve complex equations
-							$x = $this->H[$i][$i+1];
-							$y = $this->H[$i+1][$i];
-							$vr = ($this->d[$i] - $p) * ($this->d[$i] - $p) + $this->e[$i] * $this->e[$i] - $q * $q;
-							$vi = ($this->d[$i] - $p) * 2.0 * $q;
-							if ($vr == 0.0 & $vi == 0.0) {
-								$vr = $eps * $norm * (abs($w) + abs($q) + abs($x) + abs($y) + abs($z));
-							}
-							$this->cdiv($x * $r - $z * $ra + $q * $sa, $x * $s - $z * $sa - $q * $ra, $vr, $vi);
-							$this->H[$i][$n-1] = $this->cdivr;
-							$this->H[$i][$n]   = $this->cdivi;
-							if (abs($x) > (abs($z) + abs($q))) {
-								$this->H[$i+1][$n-1] = (-$ra - $w * $this->H[$i][$n-1] + $q * $this->H[$i][$n]) / $x;
-								$this->H[$i+1][$n] = (-$sa - $w * $this->H[$i][$n] - $q * $this->H[$i][$n-1]) / $x;
-							} else {
-								$this->cdiv(-$r - $y * $this->H[$i][$n-1], -$s - $y * $this->H[$i][$n], $z, $q);
-								$this->H[$i+1][$n-1] = $this->cdivr;
-								$this->H[$i+1][$n]   = $this->cdivi;
-							}
-						}
-						// Overflow control
-						$t = max(abs($this->H[$i][$n-1]),abs($this->H[$i][$n]));
-						if (($eps * $t) * $t > 1) {
-							for ($j = $i; $j <= $n; ++$j) {
-								$this->H[$j][$n-1] = $this->H[$j][$n-1] / $t;
-								$this->H[$j][$n]   = $this->H[$j][$n] / $t;
-							}
-						}
-					} // end else
-				} // end for
-			} // end else for complex case
-		} // end for
-
-		// Vectors of isolated roots
-		for ($i = 0; $i < $nn; ++$i) {
-			if ($i < $low | $i > $high) {
-				for ($j = $i; $j < $nn; ++$j) {
-					$this->V[$i][$j] = $this->H[$i][$j];
-				}
-			}
-		}
-
-		// Back transformation to get eigenvectors of original matrix
-		for ($j = $nn-1; $j >= $low; --$j) {
-			for ($i = $low; $i <= $high; ++$i) {
-				$z = 0.0;
-				for ($k = $low; $k <= min($j,$high); ++$k) {
-					$z = $z + $this->V[$i][$k] * $this->H[$k][$j];
-				}
-				$this->V[$i][$j] = $z;
-			}
-		}
-	} // end hqr2
-
-
-	/**
-	 *	Constructor: Check for symmetry, then construct the eigenvalue decomposition
-	 *
-	 *	@access public
-	 *	@param A  Square matrix
-	 *	@return Structure to access D and V.
-	 */
-	public function __construct($Arg) {
-		$this->A = $Arg->getArray();
-		$this->n = $Arg->getColumnDimension();
-
-		$issymmetric = true;
-		for ($j = 0; ($j < $this->n) & $issymmetric; ++$j) {
-			for ($i = 0; ($i < $this->n) & $issymmetric; ++$i) {
-				$issymmetric = ($this->A[$i][$j] == $this->A[$j][$i]);
-			}
-		}
-
-		if ($issymmetric) {
-			$this->V = $this->A;
-			// Tridiagonalize.
-			$this->tred2();
-			// Diagonalize.
-			$this->tql2();
-		} else {
-			$this->H = $this->A;
-			$this->ort = array();
-			// Reduce to Hessenberg form.
-			$this->orthes();
-			// Reduce Hessenberg to real Schur form.
-			$this->hqr2();
-		}
-	}
-
-
-	/**
-	 *	Return the eigenvector matrix
-	 *
-	 *	@access public
-	 *	@return V
-	 */
-	public function getV() {
-		return new Matrix($this->V, $this->n, $this->n);
-	}
-
-
-	/**
-	 *	Return the real parts of the eigenvalues
-	 *
-	 *	@access public
-	 *	@return real(diag(D))
-	 */
-	public function getRealEigenvalues() {
-		return $this->d;
-	}
-
-
-	/**
-	 *	Return the imaginary parts of the eigenvalues
-	 *
-	 *	@access public
-	 *	@return imag(diag(D))
-	 */
-	public function getImagEigenvalues() {
-		return $this->e;
-	}
-
-
-	/**
-	 *	Return the block diagonal eigenvalue matrix
-	 *
-	 *	@access public
-	 *	@return D
-	 */
-	public function getD() {
-		for ($i = 0; $i < $this->n; ++$i) {
-			$D[$i] = array_fill(0, $this->n, 0.0);
-			$D[$i][$i] = $this->d[$i];
-			if ($this->e[$i] == 0) {
-				continue;
-			}
-			$o = ($this->e[$i] > 0) ? $i + 1 : $i - 1;
-			$D[$i][$o] = $this->e[$i];
-		}
-		return new Matrix($D);
-	}
-
-}	//	class EigenvalueDecomposition
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/LUDecomposition.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/LUDecomposition.php
deleted file mode 100755
index 6c797a6ce..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/LUDecomposition.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	For an m-by-n matrix A with m >= n, the LU decomposition is an m-by-n
- *	unit lower triangular matrix L, an n-by-n upper triangular matrix U,
- *	and a permutation vector piv of length m so that A(piv,:) = L*U.
- *	If m < n, then L is m-by-m and U is m-by-n.
- *
- *	The LU decompostion with pivoting always exists, even if the matrix is
- *	singular, so the constructor will never fail. The primary use of the
- *	LU decomposition is in the solution of square systems of simultaneous
- *	linear equations. This will fail if isNonsingular() returns false.
- *
- *	@author Paul Meagher
- *	@author Bartosz Matosiuk
- *	@author Michael Bommarito
- *	@version 1.1
- *	@license PHP v3.0
- */
-class PHPExcel_Shared_JAMA_LUDecomposition {
-
-	const MatrixSingularException	= "Can only perform operation on singular matrix.";
-	const MatrixSquareException		= "Mismatched Row dimension";
-
-	/**
-	 *	Decomposition storage
-	 *	@var array
-	 */
-	private $LU = array();
-
-	/**
-	 *	Row dimension.
-	 *	@var int
-	 */
-	private $m;
-
-	/**
-	 *	Column dimension.
-	 *	@var int
-	 */
-	private $n;
-
-	/**
-	 *	Pivot sign.
-	 *	@var int
-	 */
-	private $pivsign;
-
-	/**
-	 *	Internal storage of pivot vector.
-	 *	@var array
-	 */
-	private $piv = array();
-
-
-	/**
-	 *	LU Decomposition constructor.
-	 *
-	 *	@param $A Rectangular matrix
-	 *	@return Structure to access L, U and piv.
-	 */
-	public function __construct($A) {
-		if ($A instanceof PHPExcel_Shared_JAMA_Matrix) {
-			// Use a "left-looking", dot-product, Crout/Doolittle algorithm.
-			$this->LU = $A->getArray();
-			$this->m  = $A->getRowDimension();
-			$this->n  = $A->getColumnDimension();
-			for ($i = 0; $i < $this->m; ++$i) {
-				$this->piv[$i] = $i;
-			}
-			$this->pivsign = 1;
-			$LUrowi = $LUcolj = array();
-
-			// Outer loop.
-			for ($j = 0; $j < $this->n; ++$j) {
-				// Make a copy of the j-th column to localize references.
-				for ($i = 0; $i < $this->m; ++$i) {
-					$LUcolj[$i] = &$this->LU[$i][$j];
-				}
-				// Apply previous transformations.
-				for ($i = 0; $i < $this->m; ++$i) {
-					$LUrowi = $this->LU[$i];
-					// Most of the time is spent in the following dot product.
-					$kmax = min($i,$j);
-					$s = 0.0;
-					for ($k = 0; $k < $kmax; ++$k) {
-						$s += $LUrowi[$k] * $LUcolj[$k];
-					}
-					$LUrowi[$j] = $LUcolj[$i] -= $s;
-				}
-				// Find pivot and exchange if necessary.
-				$p = $j;
-				for ($i = $j+1; $i < $this->m; ++$i) {
-					if (abs($LUcolj[$i]) > abs($LUcolj[$p])) {
-						$p = $i;
-					}
-				}
-				if ($p != $j) {
-					for ($k = 0; $k < $this->n; ++$k) {
-						$t = $this->LU[$p][$k];
-						$this->LU[$p][$k] = $this->LU[$j][$k];
-						$this->LU[$j][$k] = $t;
-					}
-					$k = $this->piv[$p];
-					$this->piv[$p] = $this->piv[$j];
-					$this->piv[$j] = $k;
-					$this->pivsign = $this->pivsign * -1;
-				}
-				// Compute multipliers.
-				if (($j < $this->m) && ($this->LU[$j][$j] != 0.0)) {
-					for ($i = $j+1; $i < $this->m; ++$i) {
-						$this->LU[$i][$j] /= $this->LU[$j][$j];
-					}
-				}
-			}
-		} else {
-			throw new Exception(PHPExcel_Shared_JAMA_Matrix::ArgumentTypeException);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 *	Get lower triangular factor.
-	 *
-	 *	@return array Lower triangular factor
-	 */
-	public function getL() {
-		for ($i = 0; $i < $this->m; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				if ($i > $j) {
-					$L[$i][$j] = $this->LU[$i][$j];
-				} elseif ($i == $j) {
-					$L[$i][$j] = 1.0;
-				} else {
-					$L[$i][$j] = 0.0;
-				}
-			}
-		}
-		return new PHPExcel_Shared_JAMA_Matrix($L);
-	}	//	function getL()
-
-
-	/**
-	 *	Get upper triangular factor.
-	 *
-	 *	@return array Upper triangular factor
-	 */
-	public function getU() {
-		for ($i = 0; $i < $this->n; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				if ($i <= $j) {
-					$U[$i][$j] = $this->LU[$i][$j];
-				} else {
-					$U[$i][$j] = 0.0;
-				}
-			}
-		}
-		return new PHPExcel_Shared_JAMA_Matrix($U);
-	}	//	function getU()
-
-
-	/**
-	 *	Return pivot permutation vector.
-	 *
-	 *	@return array Pivot vector
-	 */
-	public function getPivot() {
-		return $this->piv;
-	}	//	function getPivot()
-
-
-	/**
-	 *	Alias for getPivot
-	 *
-	 *	@see getPivot
-	 */
-	public function getDoublePivot() {
-		return $this->getPivot();
-	}	//	function getDoublePivot()
-
-
-	/**
-	 *	Is the matrix nonsingular?
-	 *
-	 *	@return true if U, and hence A, is nonsingular.
-	 */
-	public function isNonsingular() {
-		for ($j = 0; $j < $this->n; ++$j) {
-			if ($this->LU[$j][$j] == 0) {
-				return false;
-			}
-		}
-		return true;
-	}	//	function isNonsingular()
-
-
-	/**
-	 *	Count determinants
-	 *
-	 *	@return array d matrix deterninat
-	 */
-	public function det() {
-		if ($this->m == $this->n) {
-			$d = $this->pivsign;
-			for ($j = 0; $j < $this->n; ++$j) {
-				$d *= $this->LU[$j][$j];
-			}
-			return $d;
-		} else {
-			throw new Exception(PHPExcel_Shared_JAMA_Matrix::MatrixDimensionException);
-		}
-	}	//	function det()
-
-
-	/**
-	 *	Solve A*X = B
-	 *
-	 *	@param  $B  A Matrix with as many rows as A and any number of columns.
-	 *	@return  X so that L*U*X = B(piv,:)
-	 *	@exception  IllegalArgumentException Matrix row dimensions must agree.
-	 *	@exception  RuntimeException  Matrix is singular.
-	 */
-	public function solve($B) {
-		if ($B->getRowDimension() == $this->m) {
-			if ($this->isNonsingular()) {
-				// Copy right hand side with pivoting
-				$nx = $B->getColumnDimension();
-				$X  = $B->getMatrix($this->piv, 0, $nx-1);
-				// Solve L*Y = B(piv,:)
-				for ($k = 0; $k < $this->n; ++$k) {
-					for ($i = $k+1; $i < $this->n; ++$i) {
-						for ($j = 0; $j < $nx; ++$j) {
-							$X->A[$i][$j] -= $X->A[$k][$j] * $this->LU[$i][$k];
-						}
-					}
-				}
-				// Solve U*X = Y;
-				for ($k = $this->n-1; $k >= 0; --$k) {
-					for ($j = 0; $j < $nx; ++$j) {
-						$X->A[$k][$j] /= $this->LU[$k][$k];
-					}
-					for ($i = 0; $i < $k; ++$i) {
-						for ($j = 0; $j < $nx; ++$j) {
-							$X->A[$i][$j] -= $X->A[$k][$j] * $this->LU[$i][$k];
-						}
-					}
-				}
-				return $X;
-			} else {
-				throw new Exception(self::MatrixSingularException);
-			}
-		} else {
-			throw new Exception(self::MatrixSquareException);
-		}
-	}	//	function solve()
-
-}	//	class PHPExcel_Shared_JAMA_LUDecomposition
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/Matrix.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/Matrix.php
deleted file mode 100755
index aae40e4c5..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/Matrix.php
+++ /dev/null
@@ -1,1059 +0,0 @@
-<?php
-/**
- * @package JAMA
- */
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/*
- *	Matrix class
- *
- *	@author Paul Meagher
- *	@author Michael Bommarito
- *	@author Lukasz Karapuda
- *	@author Bartek Matosiuk
- *	@version 1.8
- *	@license PHP v3.0
- *	@see http://math.nist.gov/javanumerics/jama/
- */
-class PHPExcel_Shared_JAMA_Matrix {
-
-
-	const PolymorphicArgumentException	= "Invalid argument pattern for polymorphic function.";
-	const ArgumentTypeException			= "Invalid argument type.";
-	const ArgumentBoundsException		= "Invalid argument range.";
-	const MatrixDimensionException		= "Matrix dimensions are not equal.";
-	const ArrayLengthException			= "Array length must be a multiple of m.";
-
-	/**
-	 *	Matrix storage
-	 *
-	 *	@var array
-	 *	@access public
-	 */
-	public $A = array();
-
-	/**
-	 *	Matrix row dimension
-	 *
-	 *	@var int
-	 *	@access private
-	 */
-	private $m;
-
-	/**
-	 *	Matrix column dimension
-	 *
-	 *	@var int
-	 *	@access private
-	 */
-	private $n;
-
-
-	/**
-	 *	Polymorphic constructor
-	 *
-	 *	As PHP has no support for polymorphic constructors, we hack our own sort of polymorphism using func_num_args, func_get_arg, and gettype. In essence, we're just implementing a simple RTTI filter and calling the appropriate constructor.
-	 */
-	public function __construct() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				//Rectangular matrix - m x n initialized from 2D array
-				case 'array':
-						$this->m = count($args[0]);
-						$this->n = count($args[0][0]);
-						$this->A = $args[0];
-						break;
-				//Square matrix - n x n
-				case 'integer':
-						$this->m = $args[0];
-						$this->n = $args[0];
-						$this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
-						break;
-				//Rectangular matrix - m x n
-				case 'integer,integer':
-						$this->m = $args[0];
-						$this->n = $args[1];
-						$this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
-						break;
-				//Rectangular matrix - m x n initialized from packed array
-				case 'array,integer':
-						$this->m = $args[1];
-						if ($this->m != 0) {
-							$this->n = count($args[0]) / $this->m;
-						} else {
-							$this->n = 0;
-						}
-						if (($this->m * $this->n) == count($args[0])) {
-							for($i = 0; $i < $this->m; ++$i) {
-								for($j = 0; $j < $this->n; ++$j) {
-									$this->A[$i][$j] = $args[0][$i + $j * $this->m];
-								}
-							}
-						} else {
-							throw new Exception(self::ArrayLengthException);
-						}
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 *	getArray
-	 *
-	 *	@return array Matrix array
-	 */
-	public function getArray() {
-		return $this->A;
-	}	//	function getArray()
-
-
-	/**
-	 *	getRowDimension
-	 *
-	 *	@return int Row dimension
-	 */
-	public function getRowDimension() {
-		return $this->m;
-	}	//	function getRowDimension()
-
-
-	/**
-	 *	getColumnDimension
-	 *
-	 *	@return int Column dimension
-	 */
-	public function getColumnDimension() {
-		return $this->n;
-	}	//	function getColumnDimension()
-
-
-	/**
-	 *	get
-	 *
-	 *	Get the i,j-th element of the matrix.
-	 *	@param int $i Row position
-	 *	@param int $j Column position
-	 *	@return mixed Element (int/float/double)
-	 */
-	public function get($i = null, $j = null) {
-		return $this->A[$i][$j];
-	}	//	function get()
-
-
-	/**
-	 *	getMatrix
-	 *
-	 *	Get a submatrix
-	 *	@param int $i0 Initial row index
-	 *	@param int $iF Final row index
-	 *	@param int $j0 Initial column index
-	 *	@param int $jF Final column index
-	 *	@return Matrix Submatrix
-	 */
-	public function getMatrix() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				//A($i0...; $j0...)
-				case 'integer,integer':
-						list($i0, $j0) = $args;
-						if ($i0 >= 0) { $m = $this->m - $i0; } else { throw new Exception(self::ArgumentBoundsException); }
-						if ($j0 >= 0) { $n = $this->n - $j0; } else { throw new Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
-						for($i = $i0; $i < $this->m; ++$i) {
-							for($j = $j0; $j < $this->n; ++$j) {
-								$R->set($i, $j, $this->A[$i][$j]);
-							}
-						}
-						return $R;
-						break;
-				//A($i0...$iF; $j0...$jF)
-				case 'integer,integer,integer,integer':
-						list($i0, $iF, $j0, $jF) = $args;
-						if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { throw new Exception(self::ArgumentBoundsException); }
-						if (($jF > $j0) && ($this->n >= $jF) && ($j0 >= 0)) { $n = $jF - $j0; } else { throw new Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m+1, $n+1);
-						for($i = $i0; $i <= $iF; ++$i) {
-							for($j = $j0; $j <= $jF; ++$j) {
-								$R->set($i - $i0, $j - $j0, $this->A[$i][$j]);
-							}
-						}
-						return $R;
-						break;
-				//$R = array of row indices; $C = array of column indices
-				case 'array,array':
-						list($RL, $CL) = $args;
-						if (count($RL) > 0) { $m = count($RL); } else { throw new Exception(self::ArgumentBoundsException); }
-						if (count($CL) > 0) { $n = count($CL); } else { throw new Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
-						for($i = 0; $i < $m; ++$i) {
-							for($j = 0; $j < $n; ++$j) {
-								$R->set($i - $i0, $j - $j0, $this->A[$RL[$i]][$CL[$j]]);
-							}
-						}
-						return $R;
-						break;
-				//$RL = array of row indices; $CL = array of column indices
-				case 'array,array':
-						list($RL, $CL) = $args;
-						if (count($RL) > 0) { $m = count($RL); } else { throw new Exception(self::ArgumentBoundsException); }
-						if (count($CL) > 0) { $n = count($CL); } else { throw new Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
-						for($i = 0; $i < $m; ++$i) {
-							for($j = 0; $j < $n; ++$j) {
-								$R->set($i, $j, $this->A[$RL[$i]][$CL[$j]]);
-							}
-						}
-						return $R;
-						break;
-				//A($i0...$iF); $CL = array of column indices
-				case 'integer,integer,array':
-						list($i0, $iF, $CL) = $args;
-						if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { $m = $iF - $i0; } else { throw new Exception(self::ArgumentBoundsException); }
-						if (count($CL) > 0) { $n = count($CL); } else { throw new Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
-						for($i = $i0; $i < $iF; ++$i) {
-							for($j = 0; $j < $n; ++$j) {
-								$R->set($i - $i0, $j, $this->A[$RL[$i]][$j]);
-							}
-						}
-						return $R;
-						break;
-				//$RL = array of row indices
-				case 'array,integer,integer':
-						list($RL, $j0, $jF) = $args;
-						if (count($RL) > 0) { $m = count($RL); } else { throw new Exception(self::ArgumentBoundsException); }
-						if (($jF >= $j0) && ($this->n >= $jF) && ($j0 >= 0)) { $n = $jF - $j0; } else { throw new Exception(self::ArgumentBoundsException); }
-						$R = new PHPExcel_Shared_JAMA_Matrix($m, $n+1);
-						for($i = 0; $i < $m; ++$i) {
-							for($j = $j0; $j <= $jF; ++$j) {
-								$R->set($i, $j - $j0, $this->A[$RL[$i]][$j]);
-							}
-						}
-						return $R;
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function getMatrix()
-
-
-	/**
-	 *	checkMatrixDimensions
-	 *
-	 *	Is matrix B the same size?
-	 *	@param Matrix $B Matrix B
-	 *	@return boolean
-	 */
-	public function checkMatrixDimensions($B = null) {
-		if ($B instanceof PHPExcel_Shared_JAMA_Matrix) {
-			if (($this->m == $B->getRowDimension()) && ($this->n == $B->getColumnDimension())) {
-				return true;
-			} else {
-				throw new Exception(self::MatrixDimensionException);
-			}
-		} else {
-			throw new Exception(self::ArgumentTypeException);
-		}
-	}	//	function checkMatrixDimensions()
-
-
-
-	/**
-	 *	set
-	 *
-	 *	Set the i,j-th element of the matrix.
-	 *	@param int $i Row position
-	 *	@param int $j Column position
-	 *	@param mixed $c Int/float/double value
-	 *	@return mixed Element (int/float/double)
-	 */
-	public function set($i = null, $j = null, $c = null) {
-		// Optimized set version just has this
-		$this->A[$i][$j] = $c;
-	}	//	function set()
-
-
-	/**
-	 *	identity
-	 *
-	 *	Generate an identity matrix.
-	 *	@param int $m Row dimension
-	 *	@param int $n Column dimension
-	 *	@return Matrix Identity matrix
-	 */
-	public function identity($m = null, $n = null) {
-		return $this->diagonal($m, $n, 1);
-	}	//	function identity()
-
-
-	/**
-	 *	diagonal
-	 *
-	 *	Generate a diagonal matrix
-	 *	@param int $m Row dimension
-	 *	@param int $n Column dimension
-	 *	@param mixed $c Diagonal value
-	 *	@return Matrix Diagonal matrix
-	 */
-	public function diagonal($m = null, $n = null, $c = 1) {
-		$R = new PHPExcel_Shared_JAMA_Matrix($m, $n);
-		for($i = 0; $i < $m; ++$i) {
-			$R->set($i, $i, $c);
-		}
-		return $R;
-	}	//	function diagonal()
-
-
-	/**
-	 *	getMatrixByRow
-	 *
-	 *	Get a submatrix by row index/range
-	 *	@param int $i0 Initial row index
-	 *	@param int $iF Final row index
-	 *	@return Matrix Submatrix
-	 */
-	public function getMatrixByRow($i0 = null, $iF = null) {
-		if (is_int($i0)) {
-			if (is_int($iF)) {
-				return $this->getMatrix($i0, 0, $iF + 1, $this->n);
-			} else {
-				return $this->getMatrix($i0, 0, $i0 + 1, $this->n);
-			}
-		} else {
-			throw new Exception(self::ArgumentTypeException);
-		}
-	}	//	function getMatrixByRow()
-
-
-	/**
-	 *	getMatrixByCol
-	 *
-	 *	Get a submatrix by column index/range
-	 *	@param int $i0 Initial column index
-	 *	@param int $iF Final column index
-	 *	@return Matrix Submatrix
-	 */
-	public function getMatrixByCol($j0 = null, $jF = null) {
-		if (is_int($j0)) {
-			if (is_int($jF)) {
-				return $this->getMatrix(0, $j0, $this->m, $jF + 1);
-			} else {
-				return $this->getMatrix(0, $j0, $this->m, $j0 + 1);
-			}
-		} else {
-			throw new Exception(self::ArgumentTypeException);
-		}
-	}	//	function getMatrixByCol()
-
-
-	/**
-	 *	transpose
-	 *
-	 *	Tranpose matrix
-	 *	@return Matrix Transposed matrix
-	 */
-	public function transpose() {
-		$R = new PHPExcel_Shared_JAMA_Matrix($this->n, $this->m);
-		for($i = 0; $i < $this->m; ++$i) {
-			for($j = 0; $j < $this->n; ++$j) {
-				$R->set($j, $i, $this->A[$i][$j]);
-			}
-		}
-		return $R;
-	}	//	function transpose()
-
-
-	/**
-	 *	trace
-	 *
-	 *	Sum of diagonal elements
-	 *	@return float Sum of diagonal elements
-	 */
-	public function trace() {
-		$s = 0;
-		$n = min($this->m, $this->n);
-		for($i = 0; $i < $n; ++$i) {
-			$s += $this->A[$i][$i];
-		}
-		return $s;
-	}	//	function trace()
-
-
-	/**
-	 *	uminus
-	 *
-	 *	Unary minus matrix -A
-	 *	@return Matrix Unary minus matrix
-	 */
-	public function uminus() {
-	}	//	function uminus()
-
-
-	/**
-	 *	plus
-	 *
-	 *	A + B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function plus() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$M->set($i, $j, $M->get($i, $j) + $this->A[$i][$j]);
-				}
-			}
-			return $M;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function plus()
-
-
-	/**
-	 *	plusEquals
-	 *
-	 *	A = A + B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function plusEquals() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$validValues = True;
-					$value = $M->get($i, $j);
-					if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-						$this->A[$i][$j] = trim($this->A[$i][$j],'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
-					}
-					if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-						$value = trim($value,'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
-					}
-					if ($validValues) {
-						$this->A[$i][$j] += $value;
-					} else {
-						$this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
-					}
-				}
-			}
-			return $this;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function plusEquals()
-
-
-	/**
-	 *	minus
-	 *
-	 *	A - B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function minus() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$M->set($i, $j, $M->get($i, $j) - $this->A[$i][$j]);
-				}
-			}
-			return $M;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function minus()
-
-
-	/**
-	 *	minusEquals
-	 *
-	 *	A = A - B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function minusEquals() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$validValues = True;
-					$value = $M->get($i, $j);
-					if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-						$this->A[$i][$j] = trim($this->A[$i][$j],'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
-					}
-					if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-						$value = trim($value,'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
-					}
-					if ($validValues) {
-						$this->A[$i][$j] -= $value;
-					} else {
-						$this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
-					}
-				}
-			}
-			return $this;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function minusEquals()
-
-
-	/**
-	 *	arrayTimes
-	 *
-	 *	Element-by-element multiplication
-	 *	Cij = Aij * Bij
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Matrix Cij
-	 */
-	public function arrayTimes() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$M->set($i, $j, $M->get($i, $j) * $this->A[$i][$j]);
-				}
-			}
-			return $M;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayTimes()
-
-
-	/**
-	 *	arrayTimesEquals
-	 *
-	 *	Element-by-element multiplication
-	 *	Aij = Aij * Bij
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Matrix Aij
-	 */
-	public function arrayTimesEquals() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$validValues = True;
-					$value = $M->get($i, $j);
-					if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-						$this->A[$i][$j] = trim($this->A[$i][$j],'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
-					}
-					if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-						$value = trim($value,'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
-					}
-					if ($validValues) {
-						$this->A[$i][$j] *= $value;
-					} else {
-						$this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
-					}
-				}
-			}
-			return $this;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayTimesEquals()
-
-
-	/**
-	 *	arrayRightDivide
-	 *
-	 *	Element-by-element right division
-	 *	A / B
-	 *	@param Matrix $B Matrix B
-	 *	@return Matrix Division result
-	 */
-	public function arrayRightDivide() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$validValues = True;
-					$value = $M->get($i, $j);
-					if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-						$this->A[$i][$j] = trim($this->A[$i][$j],'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
-					}
-					if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-						$value = trim($value,'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
-					}
-					if ($validValues) {
-						if ($value == 0) {
-							//	Trap for Divide by Zero error
-							$M->set($i, $j, '#DIV/0!');
-						} else {
-							$M->set($i, $j, $this->A[$i][$j] / $value);
-						}
-					} else {
-						$M->set($i, $j, PHPExcel_Calculation_Functions::NaN());
-					}
-				}
-			}
-			return $M;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayRightDivide()
-
-
-	/**
-	 *	arrayRightDivideEquals
-	 *
-	 *	Element-by-element right division
-	 *	Aij = Aij / Bij
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Matrix Aij
-	 */
-	public function arrayRightDivideEquals() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$this->A[$i][$j] = $this->A[$i][$j] / $M->get($i, $j);
-				}
-			}
-			return $M;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayRightDivideEquals()
-
-
-	/**
-	 *	arrayLeftDivide
-	 *
-	 *	Element-by-element Left division
-	 *	A / B
-	 *	@param Matrix $B Matrix B
-	 *	@return Matrix Division result
-	 */
-	public function arrayLeftDivide() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$M->set($i, $j, $M->get($i, $j) / $this->A[$i][$j]);
-				}
-			}
-			return $M;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayLeftDivide()
-
-
-	/**
-	 *	arrayLeftDivideEquals
-	 *
-	 *	Element-by-element Left division
-	 *	Aij = Aij / Bij
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Matrix Aij
-	 */
-	public function arrayLeftDivideEquals() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$this->A[$i][$j] = $M->get($i, $j) / $this->A[$i][$j];
-				}
-			}
-			return $M;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function arrayLeftDivideEquals()
-
-
-	/**
-	 *	times
-	 *
-	 *	Matrix multiplication
-	 *	@param mixed $n Matrix/Array/Scalar
-	 *	@return Matrix Product
-	 */
-	public function times() {
-		if (func_num_args() > 0) {
-			$args  = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $B = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						if ($this->n == $B->m) {
-							$C = new PHPExcel_Shared_JAMA_Matrix($this->m, $B->n);
-							for($j = 0; $j < $B->n; ++$j) {
-								for ($k = 0; $k < $this->n; ++$k) {
-									$Bcolj[$k] = $B->A[$k][$j];
-								}
-								for($i = 0; $i < $this->m; ++$i) {
-									$Arowi = $this->A[$i];
-									$s = 0;
-									for($k = 0; $k < $this->n; ++$k) {
-										$s += $Arowi[$k] * $Bcolj[$k];
-									}
-									$C->A[$i][$j] = $s;
-								}
-							}
-							return $C;
-						} else {
-							throw new Exception(JAMAError(MatrixDimensionMismatch));
-						}
-						break;
-				case 'array':
-						$B = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						if ($this->n == $B->m) {
-							$C = new PHPExcel_Shared_JAMA_Matrix($this->m, $B->n);
-							for($i = 0; $i < $C->m; ++$i) {
-								for($j = 0; $j < $C->n; ++$j) {
-									$s = "0";
-									for($k = 0; $k < $C->n; ++$k) {
-										$s += $this->A[$i][$k] * $B->A[$k][$j];
-									}
-									$C->A[$i][$j] = $s;
-								}
-							}
-							return $C;
-						} else {
-							throw new Exception(JAMAError(MatrixDimensionMismatch));
-						}
-						return $M;
-						break;
-				case 'integer':
-						$C = new PHPExcel_Shared_JAMA_Matrix($this->A);
-						for($i = 0; $i < $C->m; ++$i) {
-							for($j = 0; $j < $C->n; ++$j) {
-								$C->A[$i][$j] *= $args[0];
-							}
-						}
-						return $C;
-						break;
-				case 'double':
-						$C = new PHPExcel_Shared_JAMA_Matrix($this->m, $this->n);
-						for($i = 0; $i < $C->m; ++$i) {
-							for($j = 0; $j < $C->n; ++$j) {
-								$C->A[$i][$j] = $args[0] * $this->A[$i][$j];
-							}
-						}
-						return $C;
-						break;
-				case 'float':
-						$C = new PHPExcel_Shared_JAMA_Matrix($this->A);
-						for($i = 0; $i < $C->m; ++$i) {
-							for($j = 0; $j < $C->n; ++$j) {
-								$C->A[$i][$j] *= $args[0];
-							}
-						}
-						return $C;
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function times()
-
-
-	/**
-	 *	power
-	 *
-	 *	A = A ^ B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function power() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-						break;
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$validValues = True;
-					$value = $M->get($i, $j);
-					if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-						$this->A[$i][$j] = trim($this->A[$i][$j],'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($this->A[$i][$j]);
-					}
-					if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-						$value = trim($value,'"');
-						$validValues &= PHPExcel_Shared_String::convertToNumberIfFraction($value);
-					}
-					if ($validValues) {
-						$this->A[$i][$j] = pow($this->A[$i][$j],$value);
-					} else {
-						$this->A[$i][$j] = PHPExcel_Calculation_Functions::NaN();
-					}
-				}
-			}
-			return $this;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function power()
-
-
-	/**
-	 *	concat
-	 *
-	 *	A = A & B
-	 *	@param mixed $B Matrix/Array
-	 *	@return Matrix Sum
-	 */
-	public function concat() {
-		if (func_num_args() > 0) {
-			$args = func_get_args();
-			$match = implode(",", array_map('gettype', $args));
-
-			switch($match) {
-				case 'object':
-						if ($args[0] instanceof PHPExcel_Shared_JAMA_Matrix) { $M = $args[0]; } else { throw new Exception(self::ArgumentTypeException); }
-				case 'array':
-						$M = new PHPExcel_Shared_JAMA_Matrix($args[0]);
-						break;
-				default:
-						throw new Exception(self::PolymorphicArgumentException);
-						break;
-			}
-			$this->checkMatrixDimensions($M);
-			for($i = 0; $i < $this->m; ++$i) {
-				for($j = 0; $j < $this->n; ++$j) {
-					$this->A[$i][$j] = trim($this->A[$i][$j],'"').trim($M->get($i, $j),'"');
-				}
-			}
-			return $this;
-		} else {
-			throw new Exception(self::PolymorphicArgumentException);
-		}
-	}	//	function concat()
-
-
-	/**
-	 *	Solve A*X = B.
-	 *
-	 *	@param Matrix $B Right hand side
-	 *	@return Matrix ... Solution if A is square, least squares solution otherwise
-	 */
-	public function solve($B) {
-		if ($this->m == $this->n) {
-			$LU = new PHPExcel_Shared_JAMA_LUDecomposition($this);
-			return $LU->solve($B);
-		} else {
-			$QR = new QRDecomposition($this);
-			return $QR->solve($B);
-		}
-	}	//	function solve()
-
-
-	/**
-	 *	Matrix inverse or pseudoinverse.
-	 *
-	 *	@return Matrix ... Inverse(A) if A is square, pseudoinverse otherwise.
-	 */
-	public function inverse() {
-		return $this->solve($this->identity($this->m, $this->m));
-	}	//	function inverse()
-
-
-	/**
-	 *	det
-	 *
-	 *	Calculate determinant
-	 *	@return float Determinant
-	 */
-	public function det() {
-		$L = new PHPExcel_Shared_JAMA_LUDecomposition($this);
-		return $L->det();
-	}	//	function det()
-
-
-}	//	class PHPExcel_Shared_JAMA_Matrix
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/QRDecomposition.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/QRDecomposition.php
deleted file mode 100755
index 49293d7ec..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/QRDecomposition.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	For an m-by-n matrix A with m >= n, the QR decomposition is an m-by-n
- *	orthogonal matrix Q and an n-by-n upper triangular matrix R so that
- *	A = Q*R.
- *
- *	The QR decompostion always exists, even if the matrix does not have
- *	full rank, so the constructor will never fail.  The primary use of the
- *	QR decomposition is in the least squares solution of nonsquare systems
- *	of simultaneous linear equations.  This will fail if isFullRank()
- *	returns false.
- *
- *	@author  Paul Meagher
- *	@license PHP v3.0
- *	@version 1.1
- */
-class PHPExcel_Shared_JAMA_QRDecomposition {
-
-	const MatrixRankException	= "Can only perform operation on full-rank matrix.";
-
-	/**
-	 *	Array for internal storage of decomposition.
-	 *	@var array
-	 */
-	private $QR = array();
-
-	/**
-	 *	Row dimension.
-	 *	@var integer
-	 */
-	private $m;
-
-	/**
-	*	Column dimension.
-	*	@var integer
-	*/
-	private $n;
-
-	/**
-	 *	Array for internal storage of diagonal of R.
-	 *	@var  array
-	 */
-	private $Rdiag = array();
-
-
-	/**
-	 *	QR Decomposition computed by Householder reflections.
-	 *
-	 *	@param matrix $A Rectangular matrix
-	 *	@return Structure to access R and the Householder vectors and compute Q.
-	 */
-	public function __construct($A) {
-		if($A instanceof PHPExcel_Shared_JAMA_Matrix) {
-			// Initialize.
-			$this->QR = $A->getArrayCopy();
-			$this->m  = $A->getRowDimension();
-			$this->n  = $A->getColumnDimension();
-			// Main loop.
-			for ($k = 0; $k < $this->n; ++$k) {
-				// Compute 2-norm of k-th column without under/overflow.
-				$nrm = 0.0;
-				for ($i = $k; $i < $this->m; ++$i) {
-					$nrm = hypo($nrm, $this->QR[$i][$k]);
-				}
-				if ($nrm != 0.0) {
-					// Form k-th Householder vector.
-					if ($this->QR[$k][$k] < 0) {
-						$nrm = -$nrm;
-					}
-					for ($i = $k; $i < $this->m; ++$i) {
-						$this->QR[$i][$k] /= $nrm;
-					}
-					$this->QR[$k][$k] += 1.0;
-					// Apply transformation to remaining columns.
-					for ($j = $k+1; $j < $this->n; ++$j) {
-						$s = 0.0;
-						for ($i = $k; $i < $this->m; ++$i) {
-							$s += $this->QR[$i][$k] * $this->QR[$i][$j];
-						}
-						$s = -$s/$this->QR[$k][$k];
-						for ($i = $k; $i < $this->m; ++$i) {
-							$this->QR[$i][$j] += $s * $this->QR[$i][$k];
-						}
-					}
-				}
-				$this->Rdiag[$k] = -$nrm;
-			}
-		} else {
-			throw new Exception(PHPExcel_Shared_JAMA_Matrix::ArgumentTypeException);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 *	Is the matrix full rank?
-	 *
-	 *	@return boolean true if R, and hence A, has full rank, else false.
-	 */
-	public function isFullRank() {
-		for ($j = 0; $j < $this->n; ++$j) {
-			if ($this->Rdiag[$j] == 0) {
-				return false;
-			}
-		}
-		return true;
-	}	//	function isFullRank()
-
-
-	/**
-	 *	Return the Householder vectors
-	 *
-	 *	@return Matrix Lower trapezoidal matrix whose columns define the reflections
-	 */
-	public function getH() {
-		for ($i = 0; $i < $this->m; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				if ($i >= $j) {
-					$H[$i][$j] = $this->QR[$i][$j];
-				} else {
-					$H[$i][$j] = 0.0;
-				}
-			}
-		}
-		return new PHPExcel_Shared_JAMA_Matrix($H);
-	}	//	function getH()
-
-
-	/**
-	 *	Return the upper triangular factor
-	 *
-	 *	@return Matrix upper triangular factor
-	 */
-	public function getR() {
-		for ($i = 0; $i < $this->n; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				if ($i < $j) {
-					$R[$i][$j] = $this->QR[$i][$j];
-				} elseif ($i == $j) {
-					$R[$i][$j] = $this->Rdiag[$i];
-				} else {
-					$R[$i][$j] = 0.0;
-				}
-			}
-		}
-		return new PHPExcel_Shared_JAMA_Matrix($R);
-	}	//	function getR()
-
-
-	/**
-	 *	Generate and return the (economy-sized) orthogonal factor
-	 *
-	 *	@return Matrix orthogonal factor
-	 */
-	public function getQ() {
-		for ($k = $this->n-1; $k >= 0; --$k) {
-			for ($i = 0; $i < $this->m; ++$i) {
-				$Q[$i][$k] = 0.0;
-			}
-			$Q[$k][$k] = 1.0;
-			for ($j = $k; $j < $this->n; ++$j) {
-				if ($this->QR[$k][$k] != 0) {
-					$s = 0.0;
-					for ($i = $k; $i < $this->m; ++$i) {
-						$s += $this->QR[$i][$k] * $Q[$i][$j];
-					}
-					$s = -$s/$this->QR[$k][$k];
-					for ($i = $k; $i < $this->m; ++$i) {
-						$Q[$i][$j] += $s * $this->QR[$i][$k];
-					}
-				}
-			}
-		}
-		/*
-		for($i = 0; $i < count($Q); ++$i) {
-			for($j = 0; $j < count($Q); ++$j) {
-				if(! isset($Q[$i][$j]) ) {
-					$Q[$i][$j] = 0;
-				}
-			}
-		}
-		*/
-		return new PHPExcel_Shared_JAMA_Matrix($Q);
-	}	//	function getQ()
-
-
-	/**
-	 *	Least squares solution of A*X = B
-	 *
-	 *	@param Matrix $B A Matrix with as many rows as A and any number of columns.
-	 *	@return Matrix Matrix that minimizes the two norm of Q*R*X-B.
-	 */
-	public function solve($B) {
-		if ($B->getRowDimension() == $this->m) {
-			if ($this->isFullRank()) {
-				// Copy right hand side
-				$nx = $B->getColumnDimension();
-				$X  = $B->getArrayCopy();
-				// Compute Y = transpose(Q)*B
-				for ($k = 0; $k < $this->n; ++$k) {
-					for ($j = 0; $j < $nx; ++$j) {
-						$s = 0.0;
-						for ($i = $k; $i < $this->m; ++$i) {
-							$s += $this->QR[$i][$k] * $X[$i][$j];
-						}
-						$s = -$s/$this->QR[$k][$k];
-						for ($i = $k; $i < $this->m; ++$i) {
-							$X[$i][$j] += $s * $this->QR[$i][$k];
-						}
-					}
-				}
-				// Solve R*X = Y;
-				for ($k = $this->n-1; $k >= 0; --$k) {
-					for ($j = 0; $j < $nx; ++$j) {
-						$X[$k][$j] /= $this->Rdiag[$k];
-					}
-					for ($i = 0; $i < $k; ++$i) {
-						for ($j = 0; $j < $nx; ++$j) {
-							$X[$i][$j] -= $X[$k][$j]* $this->QR[$i][$k];
-						}
-					}
-				}
-				$X = new PHPExcel_Shared_JAMA_Matrix($X);
-				return ($X->getMatrix(0, $this->n-1, 0, $nx));
-			} else {
-				throw new Exception(self::MatrixRankException);
-			}
-		} else {
-			throw new Exception(PHPExcel_Shared_JAMA_Matrix::MatrixDimensionException);
-		}
-	}	//	function solve()
-
-}	//	PHPExcel_Shared_JAMA_class QRDecomposition
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
deleted file mode 100755
index a4b096c59..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
+++ /dev/null
@@ -1,526 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	For an m-by-n matrix A with m >= n, the singular value decomposition is
- *	an m-by-n orthogonal matrix U, an n-by-n diagonal matrix S, and
- *	an n-by-n orthogonal matrix V so that A = U*S*V'.
- *
- *	The singular values, sigma[$k] = S[$k][$k], are ordered so that
- *	sigma[0] >= sigma[1] >= ... >= sigma[n-1].
- *
- *	The singular value decompostion always exists, so the constructor will
- *	never fail.  The matrix condition number and the effective numerical
- *	rank can be computed from this decomposition.
- *
- *	@author  Paul Meagher
- *	@license PHP v3.0
- *	@version 1.1
- */
-class SingularValueDecomposition  {
-
-	/**
-	 *	Internal storage of U.
-	 *	@var array
-	 */
-	private $U = array();
-
-	/**
-	 *	Internal storage of V.
-	 *	@var array
-	 */
-	private $V = array();
-
-	/**
-	 *	Internal storage of singular values.
-	 *	@var array
-	 */
-	private $s = array();
-
-	/**
-	 *	Row dimension.
-	 *	@var int
-	 */
-	private $m;
-
-	/**
-	 *	Column dimension.
-	 *	@var int
-	 */
-	private $n;
-
-
-	/**
-	 *	Construct the singular value decomposition
-	 *
-	 *	Derived from LINPACK code.
-	 *
-	 *	@param $A Rectangular matrix
-	 *	@return Structure to access U, S and V.
-	 */
-	public function __construct($Arg) {
-
-		// Initialize.
-		$A = $Arg->getArrayCopy();
-		$this->m = $Arg->getRowDimension();
-		$this->n = $Arg->getColumnDimension();
-		$nu      = min($this->m, $this->n);
-		$e       = array();
-		$work    = array();
-		$wantu   = true;
-		$wantv   = true;
-		$nct = min($this->m - 1, $this->n);
-		$nrt = max(0, min($this->n - 2, $this->m));
-
-		// Reduce A to bidiagonal form, storing the diagonal elements
-		// in s and the super-diagonal elements in e.
-		for ($k = 0; $k < max($nct,$nrt); ++$k) {
-
-			if ($k < $nct) {
-				// Compute the transformation for the k-th column and
-				// place the k-th diagonal in s[$k].
-				// Compute 2-norm of k-th column without under/overflow.
-				$this->s[$k] = 0;
-				for ($i = $k; $i < $this->m; ++$i) {
-					$this->s[$k] = hypo($this->s[$k], $A[$i][$k]);
-				}
-				if ($this->s[$k] != 0.0) {
-					if ($A[$k][$k] < 0.0) {
-						$this->s[$k] = -$this->s[$k];
-					}
-					for ($i = $k; $i < $this->m; ++$i) {
-						$A[$i][$k] /= $this->s[$k];
-					}
-					$A[$k][$k] += 1.0;
-				}
-				$this->s[$k] = -$this->s[$k];
-			}
-
-			for ($j = $k + 1; $j < $this->n; ++$j) {
-				if (($k < $nct) & ($this->s[$k] != 0.0)) {
-					// Apply the transformation.
-					$t = 0;
-					for ($i = $k; $i < $this->m; ++$i) {
-						$t += $A[$i][$k] * $A[$i][$j];
-					}
-					$t = -$t / $A[$k][$k];
-					for ($i = $k; $i < $this->m; ++$i) {
-						$A[$i][$j] += $t * $A[$i][$k];
-					}
-					// Place the k-th row of A into e for the
-					// subsequent calculation of the row transformation.
-					$e[$j] = $A[$k][$j];
-				}
-			}
-
-			if ($wantu AND ($k < $nct)) {
-				// Place the transformation in U for subsequent back
-				// multiplication.
-				for ($i = $k; $i < $this->m; ++$i) {
-					$this->U[$i][$k] = $A[$i][$k];
-				}
-			}
-
-			if ($k < $nrt) {
-				// Compute the k-th row transformation and place the
-				// k-th super-diagonal in e[$k].
-				// Compute 2-norm without under/overflow.
-				$e[$k] = 0;
-				for ($i = $k + 1; $i < $this->n; ++$i) {
-					$e[$k] = hypo($e[$k], $e[$i]);
-				}
-				if ($e[$k] != 0.0) {
-					if ($e[$k+1] < 0.0) {
-						$e[$k] = -$e[$k];
-					}
-					for ($i = $k + 1; $i < $this->n; ++$i) {
-						$e[$i] /= $e[$k];
-					}
-					$e[$k+1] += 1.0;
-				}
-				$e[$k] = -$e[$k];
-				if (($k+1 < $this->m) AND ($e[$k] != 0.0)) {
-					// Apply the transformation.
-					for ($i = $k+1; $i < $this->m; ++$i) {
-						$work[$i] = 0.0;
-					}
-					for ($j = $k+1; $j < $this->n; ++$j) {
-						for ($i = $k+1; $i < $this->m; ++$i) {
-							$work[$i] += $e[$j] * $A[$i][$j];
-						}
-					}
-					for ($j = $k + 1; $j < $this->n; ++$j) {
-						$t = -$e[$j] / $e[$k+1];
-						for ($i = $k + 1; $i < $this->m; ++$i) {
-							$A[$i][$j] += $t * $work[$i];
-						}
-					}
-				}
-				if ($wantv) {
-					// Place the transformation in V for subsequent
-					// back multiplication.
-					for ($i = $k + 1; $i < $this->n; ++$i) {
-						$this->V[$i][$k] = $e[$i];
-					}
-				}
-			}
-		}
-
-		// Set up the final bidiagonal matrix or order p.
-		$p = min($this->n, $this->m + 1);
-		if ($nct < $this->n) {
-			$this->s[$nct] = $A[$nct][$nct];
-		}
-		if ($this->m < $p) {
-			$this->s[$p-1] = 0.0;
-		}
-		if ($nrt + 1 < $p) {
-			$e[$nrt] = $A[$nrt][$p-1];
-		}
-		$e[$p-1] = 0.0;
-		// If required, generate U.
-		if ($wantu) {
-			for ($j = $nct; $j < $nu; ++$j) {
-				for ($i = 0; $i < $this->m; ++$i) {
-					$this->U[$i][$j] = 0.0;
-				}
-				$this->U[$j][$j] = 1.0;
-			}
-			for ($k = $nct - 1; $k >= 0; --$k) {
-				if ($this->s[$k] != 0.0) {
-					for ($j = $k + 1; $j < $nu; ++$j) {
-						$t = 0;
-						for ($i = $k; $i < $this->m; ++$i) {
-							$t += $this->U[$i][$k] * $this->U[$i][$j];
-						}
-						$t = -$t / $this->U[$k][$k];
-						for ($i = $k; $i < $this->m; ++$i) {
-							$this->U[$i][$j] += $t * $this->U[$i][$k];
-						}
-					}
-					for ($i = $k; $i < $this->m; ++$i ) {
-						$this->U[$i][$k] = -$this->U[$i][$k];
-					}
-					$this->U[$k][$k] = 1.0 + $this->U[$k][$k];
-					for ($i = 0; $i < $k - 1; ++$i) {
-						$this->U[$i][$k] = 0.0;
-					}
-				} else {
-					for ($i = 0; $i < $this->m; ++$i) {
-						$this->U[$i][$k] = 0.0;
-					}
-					$this->U[$k][$k] = 1.0;
-				}
-			}
-		}
-
-		// If required, generate V.
-		if ($wantv) {
-			for ($k = $this->n - 1; $k >= 0; --$k) {
-				if (($k < $nrt) AND ($e[$k] != 0.0)) {
-					for ($j = $k + 1; $j < $nu; ++$j) {
-						$t = 0;
-						for ($i = $k + 1; $i < $this->n; ++$i) {
-							$t += $this->V[$i][$k]* $this->V[$i][$j];
-						}
-						$t = -$t / $this->V[$k+1][$k];
-						for ($i = $k + 1; $i < $this->n; ++$i) {
-							$this->V[$i][$j] += $t * $this->V[$i][$k];
-						}
-					}
-				}
-				for ($i = 0; $i < $this->n; ++$i) {
-					$this->V[$i][$k] = 0.0;
-				}
-				$this->V[$k][$k] = 1.0;
-			}
-		}
-
-		// Main iteration loop for the singular values.
-		$pp   = $p - 1;
-		$iter = 0;
-		$eps  = pow(2.0, -52.0);
-
-		while ($p > 0) {
-			// Here is where a test for too many iterations would go.
-			// This section of the program inspects for negligible
-			// elements in the s and e arrays.  On completion the
-			// variables kase and k are set as follows:
-			// kase = 1  if s(p) and e[k-1] are negligible and k<p
-			// kase = 2  if s(k) is negligible and k<p
-			// kase = 3  if e[k-1] is negligible, k<p, and
-			//           s(k), ..., s(p) are not negligible (qr step).
-			// kase = 4  if e(p-1) is negligible (convergence).
-			for ($k = $p - 2; $k >= -1; --$k) {
-				if ($k == -1) {
-					break;
-				}
-				if (abs($e[$k]) <= $eps * (abs($this->s[$k]) + abs($this->s[$k+1]))) {
-					$e[$k] = 0.0;
-					break;
-				}
-			}
-			if ($k == $p - 2) {
-				$kase = 4;
-			} else {
-				for ($ks = $p - 1; $ks >= $k; --$ks) {
-					if ($ks == $k) {
-						break;
-					}
-					$t = ($ks != $p ? abs($e[$ks]) : 0.) + ($ks != $k + 1 ? abs($e[$ks-1]) : 0.);
-					if (abs($this->s[$ks]) <= $eps * $t)  {
-						$this->s[$ks] = 0.0;
-						break;
-					}
-				}
-				if ($ks == $k) {
-					$kase = 3;
-				} else if ($ks == $p-1) {
-					$kase = 1;
-				} else {
-					$kase = 2;
-					$k = $ks;
-				}
-			}
-			++$k;
-
-			// Perform the task indicated by kase.
-			switch ($kase) {
-				// Deflate negligible s(p).
-				case 1:
-						$f = $e[$p-2];
-						$e[$p-2] = 0.0;
-						for ($j = $p - 2; $j >= $k; --$j) {
-							$t  = hypo($this->s[$j],$f);
-							$cs = $this->s[$j] / $t;
-							$sn = $f / $t;
-							$this->s[$j] = $t;
-							if ($j != $k) {
-								$f = -$sn * $e[$j-1];
-								$e[$j-1] = $cs * $e[$j-1];
-							}
-							if ($wantv) {
-								for ($i = 0; $i < $this->n; ++$i) {
-									$t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$p-1];
-									$this->V[$i][$p-1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$p-1];
-									$this->V[$i][$j] = $t;
-								}
-							}
-						}
-						break;
-				// Split at negligible s(k).
-				case 2:
-						$f = $e[$k-1];
-						$e[$k-1] = 0.0;
-						for ($j = $k; $j < $p; ++$j) {
-							$t = hypo($this->s[$j], $f);
-							$cs = $this->s[$j] / $t;
-							$sn = $f / $t;
-							$this->s[$j] = $t;
-							$f = -$sn * $e[$j];
-							$e[$j] = $cs * $e[$j];
-							if ($wantu) {
-								for ($i = 0; $i < $this->m; ++$i) {
-									$t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$k-1];
-									$this->U[$i][$k-1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$k-1];
-									$this->U[$i][$j] = $t;
-								}
-							}
-						}
-						break;
-				// Perform one qr step.
-				case 3:
-						// Calculate the shift.
-						$scale = max(max(max(max(
-									abs($this->s[$p-1]),abs($this->s[$p-2])),abs($e[$p-2])),
-									abs($this->s[$k])), abs($e[$k]));
-						$sp   = $this->s[$p-1] / $scale;
-						$spm1 = $this->s[$p-2] / $scale;
-						$epm1 = $e[$p-2] / $scale;
-						$sk   = $this->s[$k] / $scale;
-						$ek   = $e[$k] / $scale;
-						$b    = (($spm1 + $sp) * ($spm1 - $sp) + $epm1 * $epm1) / 2.0;
-						$c    = ($sp * $epm1) * ($sp * $epm1);
-						$shift = 0.0;
-						if (($b != 0.0) || ($c != 0.0)) {
-							$shift = sqrt($b * $b + $c);
-							if ($b < 0.0) {
-								$shift = -$shift;
-							}
-							$shift = $c / ($b + $shift);
-						}
-						$f = ($sk + $sp) * ($sk - $sp) + $shift;
-						$g = $sk * $ek;
-						// Chase zeros.
-						for ($j = $k; $j < $p-1; ++$j) {
-							$t  = hypo($f,$g);
-							$cs = $f/$t;
-							$sn = $g/$t;
-							if ($j != $k) {
-								$e[$j-1] = $t;
-							}
-							$f = $cs * $this->s[$j] + $sn * $e[$j];
-							$e[$j] = $cs * $e[$j] - $sn * $this->s[$j];
-							$g = $sn * $this->s[$j+1];
-							$this->s[$j+1] = $cs * $this->s[$j+1];
-							if ($wantv) {
-								for ($i = 0; $i < $this->n; ++$i) {
-									$t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$j+1];
-									$this->V[$i][$j+1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$j+1];
-									$this->V[$i][$j] = $t;
-								}
-							}
-							$t = hypo($f,$g);
-							$cs = $f/$t;
-							$sn = $g/$t;
-							$this->s[$j] = $t;
-							$f = $cs * $e[$j] + $sn * $this->s[$j+1];
-							$this->s[$j+1] = -$sn * $e[$j] + $cs * $this->s[$j+1];
-							$g = $sn * $e[$j+1];
-							$e[$j+1] = $cs * $e[$j+1];
-							if ($wantu && ($j < $this->m - 1)) {
-								for ($i = 0; $i < $this->m; ++$i) {
-									$t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$j+1];
-									$this->U[$i][$j+1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$j+1];
-									$this->U[$i][$j] = $t;
-								}
-							}
-						}
-						$e[$p-2] = $f;
-						$iter = $iter + 1;
-						break;
-				// Convergence.
-				case 4:
-						// Make the singular values positive.
-						if ($this->s[$k] <= 0.0) {
-							$this->s[$k] = ($this->s[$k] < 0.0 ? -$this->s[$k] : 0.0);
-							if ($wantv) {
-								for ($i = 0; $i <= $pp; ++$i) {
-									$this->V[$i][$k] = -$this->V[$i][$k];
-								}
-							}
-						}
-						// Order the singular values.
-						while ($k < $pp) {
-							if ($this->s[$k] >= $this->s[$k+1]) {
-								break;
-							}
-							$t = $this->s[$k];
-							$this->s[$k] = $this->s[$k+1];
-							$this->s[$k+1] = $t;
-							if ($wantv AND ($k < $this->n - 1)) {
-								for ($i = 0; $i < $this->n; ++$i) {
-									$t = $this->V[$i][$k+1];
-									$this->V[$i][$k+1] = $this->V[$i][$k];
-									$this->V[$i][$k] = $t;
-								}
-							}
-							if ($wantu AND ($k < $this->m-1)) {
-								for ($i = 0; $i < $this->m; ++$i) {
-									$t = $this->U[$i][$k+1];
-									$this->U[$i][$k+1] = $this->U[$i][$k];
-									$this->U[$i][$k] = $t;
-								}
-							}
-							++$k;
-						}
-						$iter = 0;
-						--$p;
-						break;
-			} // end switch
-		} // end while
-
-	} // end constructor
-
-
-	/**
-	 *	Return the left singular vectors
-	 *
-	 *	@access public
-	 *	@return U
-	 */
-	public function getU() {
-		return new Matrix($this->U, $this->m, min($this->m + 1, $this->n));
-	}
-
-
-	/**
-	 *	Return the right singular vectors
-	 *
-	 *	@access public
-	 *	@return V
-	 */
-	public function getV() {
-		return new Matrix($this->V);
-	}
-
-
-	/**
-	 *	Return the one-dimensional array of singular values
-	 *
-	 *	@access public
-	 *	@return diagonal of S.
-	 */
-	public function getSingularValues() {
-		return $this->s;
-	}
-
-
-	/**
-	 *	Return the diagonal matrix of singular values
-	 *
-	 *	@access public
-	 *	@return S
-	 */
-	public function getS() {
-		for ($i = 0; $i < $this->n; ++$i) {
-			for ($j = 0; $j < $this->n; ++$j) {
-				$S[$i][$j] = 0.0;
-			}
-			$S[$i][$i] = $this->s[$i];
-		}
-		return new Matrix($S);
-	}
-
-
-	/**
-	 *	Two norm
-	 *
-	 *	@access public
-	 *	@return max(S)
-	 */
-	public function norm2() {
-		return $this->s[0];
-	}
-
-
-	/**
-	 *	Two norm condition number
-	 *
-	 *	@access public
-	 *	@return max(S)/min(S)
-	 */
-	public function cond() {
-		return $this->s[0] / $this->s[min($this->m, $this->n) - 1];
-	}
-
-
-	/**
-	 *	Effective numerical matrix rank
-	 *
-	 *	@access public
-	 *	@return Number of nonnegligible singular values.
-	 */
-	public function rank() {
-		$eps = pow(2.0, -52.0);
-		$tol = max($this->m, $this->n) * $this->s[0] * $eps;
-		$r = 0;
-		for ($i = 0; $i < count($this->s); ++$i) {
-			if ($this->s[$i] > $tol) {
-				++$r;
-			}
-		}
-		return $r;
-	}
-
-}	//	class SingularValueDecomposition
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LMQuadTest.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LMQuadTest.php
deleted file mode 100755
index 2f316de97..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LMQuadTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * quadratic (p-o)'S'S(p-o)
- * solve for o, S
- * S is a single scale factor
- */
-class LMQuadTest {
-
-	/**
-	 * @param array[] $x
-	 * @param array[] $a
-	 */
-	function val($x, $a) {
-		if (count($a) != 3) die ("Wrong number of elements in array a");
-		if (count($x) != 2) die ("Wrong number of elements in array x");
-
-		$ox = $a[0];
-		$oy = $a[1];
-		$s  = $a[2];
-
-		$sdx = $s * ($x[0] - $ox);
-		$sdy = $s * ($x[1] - $oy);
-
-		return ($sdx * $sdx) + ($sdy * $sdy);
-   }	//	function val()
-
-
-	/**
-	 * z = (p-o)'S'S(p-o)
-	 * dz/dp = 2S'S(p-o)
-	 *
-	 * z = (s*(px-ox))^2 + (s*(py-oy))^2
-	 * dz/dox = -2(s*(px-ox))*s
-	 * dz/ds = 2*s*[(px-ox)^2 + (py-oy)^2]
-	 *
-	 * z = (s*dx)^2 + (s*dy)^2
-	 * dz/ds = 2(s*dx)*dx + 2(s*dy)*dy
-	 *
-	 * @param array[] $x
-	 * @param array[] $a
-	 * @param int $a_k
-	 * @param array[] $a
-	 */
-	function grad($x, $a, $a_k) {
-		if (count($a) != 3) die ("Wrong number of elements in array a");
-		if (count($x) != 2) die ("Wrong number of elements in array x");
-		if ($a_k < 3) die ("a_k=".$a_k);
-
-		$ox = $a[0];
-		$oy = $a[1];
-		$s  = $a[2];
-
-		$dx = ($x[0] - $ox);
-		$dy = ($x[1] - $oy);
-
-		if ($a_k == 0)
-			return -2.*$s*$s*$dx;
-		elseif ($a_k == 1)
-			return -2.*$s*$s*$dy;
-		else
-			return 2.*$s*($dx*$dx + $dy*$dy);
-	}	//	function grad()
-
-
-	/**
-	 * @return array[] $a
-	 */
-	function initial() {
-		$a[0] = 0.05;
-		$a[1] = 0.1;
-		$a[2] = 1.0;
-
-		return $a;
-	}	//	function initial()
-
-
-	/**
-	 * @return Object[] $a
-	 */
-	function testdata() {
-		$npts = 25;
-
-		$a[0] = 0.;
-		$a[1] = 0.;
-		$a[2] = 0.9;
-
-		$i = 0;
-
-		for ($r = -2; $r <= 2; ++$r) {
-			for ($c = -2; $c <= 2; ++$c) {
-				$x[$i][0] = $c;
-				$x[$i][1] = $r;
-				$y[$i] = $this->val($x[$i], $a);
-				print("Quad ".$c.",".$r." -> ".$y[$i]."<br />");
-				$s[$i] = 1.;
-				++$i;
-			}
-		}
-		print("quad x= ");
-
-		$qx = new Matrix($x);
-		$qx->print(10, 2);
-
-		print("quad y= ");
-		$qy = new Matrix($y, $npts);
-		$qy->print(10, 2);
-
-		$o[0] = $x;
-		$o[1] = $a;
-		$o[2] = $y;
-		$o[3] = $s;
-
-		return $o;
-	}	//	function testdata()
-
-}	//	class LMQuadTest
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LagrangeInterpolation.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LagrangeInterpolation.php
deleted file mode 100755
index 5b7428613..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LagrangeInterpolation.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-require_once "../Matrix.php";
-
-/**
- * Given n points (x0,y0)...(xn-1,yn-1), the following methid computes
- * the polynomial factors of the n-1't degree polynomial passing through
- * the n points.
- *
- * Example: Passing in three points (2,3) (1,4) and (3,7) will produce
- * the results [2.5, -8.5, 10] which means that the points are on the
- * curve y = 2.5x² - 8.5x + 10.
- *
- * @see http://geosoft.no/software/lagrange/LagrangeInterpolation.java.html
- * @author Jacob Dreyer
- * @author Paul Meagher (port to PHP and minor changes)
- *
- * @param x[] float
- * @param y[] float
- */
-class LagrangeInterpolation {
-
-	public function findPolynomialFactors($x, $y) {
-		$n = count($x);
-
-		$data = array();  // double[n][n];
-		$rhs  = array();  // double[n];
-
-		for ($i = 0; $i < $n; ++$i) {
-			$v = 1;
-			for ($j = 0; $j < $n; ++$j) {
-				$data[$i][$n-$j-1] = $v;
-				$v *= $x[$i];
-			}
-			$rhs[$i] = $y[$i];
-		}
-
-		// Solve m * s = b
-		$m = new Matrix($data);
-		$b = new Matrix($rhs, $n);
-
-		$s = $m->solve($b);
-
-		return $s->getRowPackedCopy();
-	}	//	function findPolynomialFactors()
-
-}	//	class LagrangeInterpolation
-
-
-$x = array(2.0, 1.0, 3.0);
-$y = array(3.0, 4.0, 7.0);
-
-$li = new LagrangeInterpolation;
-$f = $li->findPolynomialFactors($x, $y);
-
-
-for ($i = 0; $i < 3; ++$i) {
-	echo $f[$i]."<br />";
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LagrangeInterpolation2.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LagrangeInterpolation2.php
deleted file mode 100755
index e7529c5f1..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LagrangeInterpolation2.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-require_once "../Matrix.php";
-
-/**
- * Given n points (x0,y0)...(xn-1,yn-1), the following method computes
- * the polynomial factors of the n-1't degree polynomial passing through
- * the n points.
- *
- * Example: Passing in three points (2,3) (1,4) and (3,7) will produce
- * the results [2.5, -8.5, 10] which means that the points are on the
- * curve y = 2.5x² - 8.5x + 10.
- *
- * @see http://geosoft.no/software/lagrange/LagrangeInterpolation.java.html
- * @see http://source.freehep.org/jcvsweb/ilc/LCSIM/wdview/lcsim/src/org/lcsim/fit/polynomial/PolynomialFitter.java
- * @author Jacob Dreyer
- * @author Paul Meagher (port to PHP and minor changes)
- *
- * @param x[] float
- * @param y[] float
- */
-class LagrangeInterpolation {
-
-	public function findPolynomialFactors($x, $y) {
-		$n = count($x);
-
-		$data = array();  // double[n][n];
-		$rhs  = array();  // double[n];
-
-		for ($i = 0; $i < $n; ++$i) {
-			$v = 1;
-			for ($j = 0; $j < $n; ++$j) {
-				$data[$i][$n-$j-1] = $v;
-				$v *= $x[$i];
-			}
-			$rhs[$i] = $y[$i];
-		}
-
-		// Solve m * s = b
-		$m = new Matrix($data);
-		$b = new Matrix($rhs, $n);
-
-		$s = $m->solve($b);
-
-		return $s->getRowPackedCopy();
-	}	//	function findPolynomialFactors()
-
-}	//	class LagrangeInterpolation
-
-
-$x = array(2.0, 1.0, 3.0);
-$y = array(3.0, 4.0, 7.0);
-
-$li = new LagrangeInterpolation;
-$f = $li->findPolynomialFactors($x, $y);
-
-for ($i = 0; $i < 3; ++$i) {
-	echo $f[$i]."<br />";
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LevenbergMarquardt.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LevenbergMarquardt.php
deleted file mode 100755
index 7cfd5f899..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/LevenbergMarquardt.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-// Levenberg-Marquardt in PHP
-
-// http://www.idiom.com/~zilla/Computer/Javanumeric/LM.java
-
-class LevenbergMarquardt {
-
-	/**
-	 * Calculate the current sum-squared-error
-	 *
-	 * Chi-squared is the distribution of squared Gaussian errors,
-	 * thus the name.
-	 *
-	 * @param double[][] $x
-	 * @param double[] $a
-	 * @param double[] $y,
-	 * @param double[] $s,
-	 * @param object $f
-	 */
-	function chiSquared($x, $a, $y, $s, $f) {
-		$npts = count($y);
-		$sum = 0.0;
-
-		for ($i = 0; $i < $npts; ++$i) {
-			$d = $y[$i] - $f->val($x[$i], $a);
-			$d = $d / $s[$i];
-			$sum = $sum + ($d*$d);
-		}
-
-		return $sum;
-	}	//	function chiSquared()
-
-
-	/**
-	 * Minimize E = sum {(y[k] - f(x[k],a)) / s[k]}^2
-	 * The individual errors are optionally scaled by s[k].
-	 * Note that LMfunc implements the value and gradient of f(x,a),
-	 * NOT the value and gradient of E with respect to a!
-	 *
-	 * @param x array of domain points, each may be multidimensional
-	 * @param y corresponding array of values
-	 * @param a the parameters/state of the model
-	 * @param vary false to indicate the corresponding a[k] is to be held fixed
-	 * @param s2 sigma^2 for point i
-	 * @param lambda blend between steepest descent (lambda high) and
-	 *	jump to bottom of quadratic (lambda zero).
-	 * 	Start with 0.001.
-	 * @param termepsilon termination accuracy (0.01)
-	 * @param maxiter	stop and return after this many iterations if not done
-	 * @param verbose	set to zero (no prints), 1, 2
-	 *
-	 * @return the new lambda for future iterations.
-	 *  Can use this and maxiter to interleave the LM descent with some other
-	 *  task, setting maxiter to something small.
-	 */
-	function solve($x, $a, $y, $s, $vary, $f, $lambda, $termepsilon, $maxiter, $verbose) {
-		$npts = count($y);
-		$nparm = count($a);
-
-		if ($verbose > 0) {
-			print("solve x[".count($x)."][".count($x[0])."]");
-			print(" a[".count($a)."]");
-			println(" y[".count(length)."]");
-		}
-
-		$e0 = $this->chiSquared($x, $a, $y, $s, $f);
-
-		//double lambda = 0.001;
-		$done = false;
-
-		// g = gradient, H = hessian, d = step to minimum
-		// H d = -g, solve for d
-		$H = array();
-		$g = array();
-
-		//double[] d = new double[nparm];
-
-		$oos2 = array();
-
-		for($i = 0; $i < $npts; ++$i) {
-			$oos2[$i] = 1./($s[$i]*$s[$i]);
-		}
-		$iter = 0;
-		$term = 0;	// termination count test
-
-		do {
-			++$iter;
-
-			// hessian approximation
-			for( $r = 0; $r < $nparm; ++$r) {
-				for( $c = 0; $c < $nparm; ++$c) {
-					for( $i = 0; $i < $npts; ++$i) {
-						if ($i == 0) $H[$r][$c] = 0.;
-						$xi = $x[$i];
-						$H[$r][$c] += ($oos2[$i] * $f->grad($xi, $a, $r) * $f->grad($xi, $a, $c));
-					}  //npts
-				} //c
-			} //r
-
-			// boost diagonal towards gradient descent
-			for( $r = 0; $r < $nparm; ++$r)
-				$H[$r][$r] *= (1. + $lambda);
-
-			// gradient
-			for( $r = 0; $r < $nparm; ++$r) {
-				for( $i = 0; $i < $npts; ++$i) {
-					if ($i == 0) $g[$r] = 0.;
-					$xi = $x[$i];
-					$g[$r] += ($oos2[$i] * ($y[$i]-$f->val($xi,$a)) * $f->grad($xi, $a, $r));
-				}
-			} //npts
-
-			// scale (for consistency with NR, not necessary)
-			if ($false) {
-				for( $r = 0; $r < $nparm; ++$r) {
-					$g[$r] = -0.5 * $g[$r];
-					for( $c = 0; $c < $nparm; ++$c) {
-						$H[$r][$c] *= 0.5;
-					}
-				}
-			}
-
-			// solve H d = -g, evaluate error at new location
-			//double[] d = DoubleMatrix.solve(H, g);
-//			double[] d = (new Matrix(H)).lu().solve(new Matrix(g, nparm)).getRowPackedCopy();
-			//double[] na = DoubleVector.add(a, d);
-//			double[] na = (new Matrix(a, nparm)).plus(new Matrix(d, nparm)).getRowPackedCopy();
-//			double e1 = chiSquared(x, na, y, s, f);
-
-//			if (verbose > 0) {
-//				System.out.println("\n\niteration "+iter+" lambda = "+lambda);
-//				System.out.print("a = ");
-//				(new Matrix(a, nparm)).print(10, 2);
-//				if (verbose > 1) {
-//					System.out.print("H = ");
-//					(new Matrix(H)).print(10, 2);
-//					System.out.print("g = ");
-//					(new Matrix(g, nparm)).print(10, 2);
-//					System.out.print("d = ");
-//					(new Matrix(d, nparm)).print(10, 2);
-//				}
-//				System.out.print("e0 = " + e0 + ": ");
-//				System.out.print("moved from ");
-//				(new Matrix(a, nparm)).print(10, 2);
-//				System.out.print("e1 = " + e1 + ": ");
-//				if (e1 < e0) {
-//					System.out.print("to ");
-//					(new Matrix(na, nparm)).print(10, 2);
-//				} else {
-//					System.out.println("move rejected");
-//				}
-//			}
-
-			// termination test (slightly different than NR)
-//			if (Math.abs(e1-e0) > termepsilon) {
-//				term = 0;
-//			} else {
-//				term++;
-//				if (term == 4) {
-//					System.out.println("terminating after " + iter + " iterations");
-//					done = true;
-//				}
-//			}
-//			if (iter >= maxiter) done = true;
-
-			// in the C++ version, found that changing this to e1 >= e0
-			// was not a good idea.  See comment there.
-			//
-//			if (e1 > e0 || Double.isNaN(e1)) { // new location worse than before
-//				lambda *= 10.;
-//			} else {		// new location better, accept new parameters
-//				lambda *= 0.1;
-//				e0 = e1;
-//				// simply assigning a = na will not get results copied back to caller
-//				for( int i = 0; i < nparm; i++ ) {
-//					if (vary[i]) a[i] = na[i];
-//				}
-//			}
-		} while(!$done);
-
-		return $lambda;
-	}	//	function solve()
-
-}	//	class LevenbergMarquardt
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/MagicSquareExample.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/MagicSquareExample.php
deleted file mode 100755
index e6c93d05b..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/MagicSquareExample.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
-* @package JAMA
-*/
-
-require_once "../Matrix.php";
-
-/**
-* Example of use of Matrix Class, featuring magic squares.
-*/
-class MagicSquareExample {
-
-  /**
-  * Generate magic square test matrix.
-  * @param int n dimension of matrix
-  */
-  function magic($n) {
-
-    // Odd order
-
-    if (($n % 2) == 1) {
-      $a = ($n+1)/2;
-      $b = ($n+1);
-      for ($j = 0; $j < $n; ++$j)
-        for ($i = 0; $i < $n; ++$i)
-          $M[$i][$j] = $n*(($i+$j+$a) % $n) + (($i+2*$j+$b) % $n) + 1;
-
-    // Doubly Even Order
-
-    } else if (($n % 4) == 0) {
-      for ($j = 0; $j < $n; ++$j) {
-        for ($i = 0; $i < $n; ++$i) {
-          if ((($i+1)/2)%2 == (($j+1)/2)%2)
-            $M[$i][$j] = $n*$n-$n*$i-$j;
-          else
-            $M[$i][$j] = $n*$i+$j+1;
-        }
-      }
-
-    // Singly Even Order
-
-    } else {
-
-      $p = $n/2;
-      $k = ($n-2)/4;
-      $A = $this->magic($p);
-      $M = array();
-      for ($j = 0; $j < $p; ++$j) {
-        for ($i = 0; $i < $p; ++$i) {
-          $aij = $A->get($i,$j);
-          $M[$i][$j]       = $aij;
-          $M[$i][$j+$p]    = $aij + 2*$p*$p;
-          $M[$i+$p][$j]    = $aij + 3*$p*$p;
-          $M[$i+$p][$j+$p] = $aij + $p*$p;
-        }
-      }
-
-      for ($i = 0; $i < $p; ++$i) {
-        for ($j = 0; $j < $k; ++$j) {
-          $t = $M[$i][$j];
-          $M[$i][$j] = $M[$i+$p][$j];
-          $M[$i+$p][$j] = $t;
-        }
-        for ($j = $n-$k+1; $j < $n; ++$j) {
-          $t = $M[$i][$j];
-          $M[$i][$j] = $M[$i+$p][$j];
-          $M[$i+$p][$j] = $t;
-        }
-      }
-
-      $t = $M[$k][0];  $M[$k][0]  = $M[$k+$p][0];  $M[$k+$p][0]  = $t;
-      $t = $M[$k][$k]; $M[$k][$k] = $M[$k+$p][$k]; $M[$k+$p][$k] = $t;
-
-    }
-
-    return new Matrix($M);
-
-  }
-
-  /**
-  * Simple function to replicate PHP 5 behaviour
-  */
-  function microtime_float() {
-    list($usec, $sec) = explode(" ", microtime());
-    return ((float)$usec + (float)$sec);
-  }
-
-  /**
-  * Tests LU, QR, SVD and symmetric Eig decompositions.
-  *
-  *   n       = order of magic square.
-  *   trace   = diagonal sum, should be the magic sum, (n^3 + n)/2.
-  *   max_eig = maximum eigenvalue of (A + A')/2, should equal trace.
-  *   rank    = linear algebraic rank, should equal n if n is odd,
-  *             be less than n if n is even.
-  *   cond    = L_2 condition number, ratio of singular values.
-  *   lu_res  = test of LU factorization, norm1(L*U-A(p,:))/(n*eps).
-  *   qr_res  = test of QR factorization, norm1(Q*R-A)/(n*eps).
-  */
-  function main() {
-    ?>
-    <p>Test of Matrix Class, using magic squares.</p>
-    <p>See MagicSquareExample.main() for an explanation.</p>
-    <table border='1' cellspacing='0' cellpadding='4'>
-      <tr>
-        <th>n</th>
-        <th>trace</th>
-        <th>max_eig</th>
-        <th>rank</th>
-        <th>cond</th>
-        <th>lu_res</th>
-        <th>qr_res</th>
-      </tr>
-      <?php
-      $start_time = $this->microtime_float();
-      $eps = pow(2.0,-52.0);
-      for ($n = 3; $n <= 6; ++$n) {
-        echo "<tr>";
-
-        echo "<td align='right'>$n</td>";
-
-        $M = $this->magic($n);
-        $t = (int) $M->trace();
-
-        echo "<td align='right'>$t</td>";
-
-        $O = $M->plus($M->transpose());
-        $E = new EigenvalueDecomposition($O->times(0.5));
-        $d = $E->getRealEigenvalues();
-
-        echo "<td align='right'>".$d[$n-1]."</td>";
-
-        $r = $M->rank();
-
-        echo "<td align='right'>".$r."</td>";
-
-        $c = $M->cond();
-
-        if ($c < 1/$eps)
-          echo "<td align='right'>".sprintf("%.3f",$c)."</td>";
-        else
-          echo "<td align='right'>Inf</td>";
-
-        $LU = new LUDecomposition($M);
-        $L = $LU->getL();
-        $U = $LU->getU();
-        $p = $LU->getPivot();
-        // Java version: R = L.times(U).minus(M.getMatrix(p,0,n-1));
-        $S = $L->times($U);
-        $R = $S->minus($M->getMatrix($p,0,$n-1));
-        $res = $R->norm1()/($n*$eps);
-
-        echo "<td align='right'>".sprintf("%.3f",$res)."</td>";
-
-        $QR = new QRDecomposition($M);
-        $Q = $QR->getQ();
-        $R = $QR->getR();
-        $S = $Q->times($R);
-        $R = $S->minus($M);
-        $res = $R->norm1()/($n*$eps);
-
-        echo "<td align='right'>".sprintf("%.3f",$res)."</td>";
-
-        echo "</tr>";
-
-     }
-     echo "<table>";
-     echo "<br />";
-
-     $stop_time = $this->microtime_float();
-     $etime = $stop_time - $start_time;
-
-     echo "<p>Elapsed time is ". sprintf("%.4f",$etime) ." seconds.</p>";
-
-  }
-
-}
-
-$magic = new MagicSquareExample();
-$magic->main();
-
-?>
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/Stats.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/Stats.php
deleted file mode 100755
index 38bc4b7d8..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/Stats.php
+++ /dev/null
@@ -1,1605 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Jesus M. Castagnetto <jmcastagnetto@php.net>                |
-// +----------------------------------------------------------------------+
-//
-// $Id: Stats.php,v 1.15 2003/06/01 11:40:30 jmcastagnetto Exp $
-//
-
-include_once 'PEAR.php';
-
-/**
-* @package Math_Stats
-*/
-
-// Constants for defining the statistics to calculate /*{{{*/
-/**
-* STATS_BASIC to generate the basic descriptive statistics
-*/
-define('STATS_BASIC', 1);
-/**
-* STATS_FULL to generate also higher moments, mode, median, etc.
-*/
-define('STATS_FULL', 2);
-/*}}}*/
-
-// Constants describing the data set format /*{{{*/
-/**
-* STATS_DATA_SIMPLE for an array of numeric values. This is the default.
-* e.g. $data = array(2,3,4,5,1,1,6);
-*/
-define('STATS_DATA_SIMPLE', 0);
-/**
-* STATS_DATA_CUMMULATIVE for an associative array of frequency values,
-* where in each array entry, the index is the data point and the
-* value the count (frequency):
-* e.g. $data = array(3=>4, 2.3=>5, 1.25=>6, 0.5=>3)
-*/
-define('STATS_DATA_CUMMULATIVE', 1);
-/*}}}*/
-
-// Constants defining how to handle nulls /*{{{*/
-/**
-* STATS_REJECT_NULL, reject data sets with null values. This is the default.
-* Any non-numeric value is considered a null in this context.
-*/
-define('STATS_REJECT_NULL', -1);
-/**
-* STATS_IGNORE_NULL, ignore null values and prune them from the data.
-* Any non-numeric value is considered a null in this context.
-*/
-define('STATS_IGNORE_NULL', -2);
-/**
-* STATS_USE_NULL_AS_ZERO, assign the value of 0 (zero) to null values.
-* Any non-numeric value is considered a null in this context.
-*/
-define('STATS_USE_NULL_AS_ZERO', -3);
-/*}}}*/
-
-/**
-* A class to calculate descriptive statistics from a data set.
-* Data sets can be simple arrays of data, or a cummulative hash.
-* The second form is useful when passing large data set,
-* for example the data set:
-*
-* <pre>
-* $data1 = array (1,2,1,1,1,1,3,3,4.1,3,2,2,4.1,1,1,2,3,3,2,2,1,1,2,2);
-* </pre>
-*
-* can be epxressed more compactly as:
-*
-* <pre>
-* $data2 = array('1'=>9, '2'=>8, '3'=>5, '4.1'=>2);
-* </pre>
-*
-* Example of use:
-*
-* <pre>
-* include_once 'Math/Stats.php';
-* $s = new Math_Stats();
-* $s->setData($data1);
-* // or
-* // $s->setData($data2, STATS_DATA_CUMMULATIVE);
-* $stats = $s->calcBasic();
-* echo 'Mean: '.$stats['mean'].' StDev: '.$stats['stdev'].' <br />\n';
-*
-* // using data with nulls
-* // first ignoring them:
-* $data3 = array(1.2, 'foo', 2.4, 3.1, 4.2, 3.2, null, 5.1, 6.2);
-* $s->setNullOption(STATS_IGNORE_NULL);
-* $s->setData($data3);
-* $stats3 = $s->calcFull();
-*
-* // and then assuming nulls == 0
-* $s->setNullOption(STATS_USE_NULL_AS_ZERO);
-* $s->setData($data3);
-* $stats3 = $s->calcFull();
-* </pre>
-*
-* Originally this class was part of NumPHP (Numeric PHP package)
-*
-* @author  Jesus M. Castagnetto <jmcastagnetto@php.net>
-* @version 0.8
-* @access  public
-* @package Math_Stats
-*/
-class Base {/*{{{*/
-    // properties /*{{{*/
-
-    /**
-     * The simple or cummulative data set.
-     * Null by default.
-     *
-     * @access  private
-     * @var array
-     */
-    public $_data = null;
-
-    /**
-     * Expanded data set. Only set when cummulative data
-     * is being used. Null by default.
-     *
-     * @access  private
-     * @var array
-     */
-    public $_dataExpanded = null;
-
-    /**
-     * Flag for data type, one of STATS_DATA_SIMPLE or
-     * STATS_DATA_CUMMULATIVE. Null by default.
-     *
-     * @access  private
-     * @var int
-     */
-    public $_dataOption = null;
-
-    /**
-     * Flag for null handling options. One of STATS_REJECT_NULL,
-     * STATS_IGNORE_NULL or STATS_USE_NULL_AS_ZERO
-     *
-     * @access  private
-     * @var int
-     */
-    public $_nullOption;
-
-    /**
-     * Array for caching result values, should be reset
-     * when using setData()
-     *
-     * @access private
-     * @var array
-     */
-    public $_calculatedValues = array();
-
-    /*}}}*/
-
-    /**
-     * Constructor for the class
-     *
-     * @access  public
-     * @param   optional    int $nullOption how to handle null values
-     * @return  object  Math_Stats
-     */
-    function Math_Stats($nullOption=STATS_REJECT_NULL) {/*{{{*/
-        $this->_nullOption = $nullOption;
-    }/*}}}*/
-
-    /**
-     * Sets and verifies the data, checking for nulls and using
-     * the current null handling option
-     *
-     * @access public
-     * @param   array   $arr    the data set
-     * @param   optional    int $opt    data format: STATS_DATA_CUMMULATIVE or STATS_DATA_SIMPLE (default)
-     * @return  mixed   true on success, a PEAR_Error object otherwise
-     */
-    function setData($arr, $opt=STATS_DATA_SIMPLE) {/*{{{*/
-        if (!is_array($arr)) {
-            return PEAR::raiseError('invalid data, an array of numeric data was expected');
-        }
-        $this->_data = null;
-        $this->_dataExpanded = null;
-        $this->_dataOption = null;
-        $this->_calculatedValues = array();
-        if ($opt == STATS_DATA_SIMPLE) {
-            $this->_dataOption = $opt;
-            $this->_data = array_values($arr);
-        } else if ($opt == STATS_DATA_CUMMULATIVE) {
-            $this->_dataOption = $opt;
-            $this->_data = $arr;
-            $this->_dataExpanded = array();
-        }
-        return $this->_validate();
-    }/*}}}*/
-
-    /**
-     * Returns the data which might have been modified
-     * according to the current null handling options.
-     *
-     * @access  public
-     * @param boolean $expanded whether to return a expanded list, default is false
-     * @return  mixed   array of data on success, a PEAR_Error object otherwise
-     * @see _validate()
-     */
-    function getData($expanded=false) {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        if ($this->_dataOption == STATS_DATA_CUMMULATIVE && $expanded) {
-            return $this->_dataExpanded;
-        } else {
-            return $this->_data;
-        }
-    }/*}}}*/
-
-    /**
-     * Sets the null handling option.
-     * Must be called before assigning a new data set containing null values
-     *
-     * @access  public
-     * @return  mixed   true on success, a PEAR_Error object otherwise
-     * @see _validate()
-     */
-    function setNullOption($nullOption) {/*{{{*/
-        if ($nullOption == STATS_REJECT_NULL
-            || $nullOption == STATS_IGNORE_NULL
-            || $nullOption == STATS_USE_NULL_AS_ZERO) {
-            $this->_nullOption = $nullOption;
-            return true;
-        } else {
-            return PEAR::raiseError('invalid null handling option expecting: '.
-                        'STATS_REJECT_NULL, STATS_IGNORE_NULL or STATS_USE_NULL_AS_ZERO');
-        }
-    }/*}}}*/
-
-    /**
-     * Transforms the data by substracting each entry from the mean and
-     * dividing by its standard deviation. This will reset all pre-calculated
-     * values to their original (unset) defaults.
-     *
-     * @access public
-     * @return mixed true on success, a PEAR_Error object otherwise
-     * @see mean()
-     * @see stDev()
-     * @see setData()
-     */
-    function studentize() {/*{{{*/
-        $mean = $this->mean();
-        if (PEAR::isError($mean)) {
-            return $mean;
-        }
-        $std = $this->stDev();
-        if (PEAR::isError($std)) {
-            return $std;
-        }
-        if ($std == 0) {
-            return PEAR::raiseError('cannot studentize data, standard deviation is zero.');
-        }
-        $arr  = array();
-        if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-            foreach ($this->_data as $val=>$freq) {
-                $newval = ($val - $mean) / $std;
-                $arr["$newval"] = $freq;
-            }
-        } else {
-            foreach ($this->_data as $val) {
-                $newval = ($val - $mean) / $std;
-                $arr[] = $newval;
-            }
-        }
-        return $this->setData($arr, $this->_dataOption);
-    }/*}}}*/
-
-    /**
-     * Transforms the data by substracting each entry from the mean.
-     * This will reset all pre-calculated values to their original (unset) defaults.
-     *
-     * @access public
-     * @return mixed true on success, a PEAR_Error object otherwise
-     * @see mean()
-     * @see setData()
-     */
-    function center() {/*{{{*/
-        $mean = $this->mean();
-        if (PEAR::isError($mean)) {
-            return $mean;
-        }
-        $arr  = array();
-        if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-            foreach ($this->_data as $val=>$freq) {
-                $newval = $val - $mean;
-                $arr["$newval"] = $freq;
-            }
-        } else {
-            foreach ($this->_data as $val) {
-                $newval = $val - $mean;
-                $arr[] = $newval;
-            }
-        }
-        return $this->setData($arr, $this->_dataOption);
-    }/*}}}*/
-
-    /**
-     * Calculates the basic or full statistics for the data set
-     *
-     * @access  public
-     * @param   int $mode   one of STATS_BASIC or STATS_FULL
-     * @param boolean $returnErrorObject whether the raw PEAR_Error (when true, default),
-     *                  or only the error message will be returned (when false), if an error happens.
-     * @return  mixed   an associative array of statistics on success, a PEAR_Error object otherwise
-     * @see calcBasic()
-     * @see calcFull()
-     */
-    function calc($mode, $returnErrorObject=true) {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        if ($mode == STATS_BASIC) {
-            return $this->calcBasic($returnErrorObject);
-        } elseif ($mode == STATS_FULL) {
-            return $this->calcFull($returnErrorObject);
-        } else {
-            return PEAR::raiseError('incorrect mode, expected STATS_BASIC or STATS_FULL');
-        }
-    }/*}}}*/
-
-    /**
-     * Calculates a basic set of statistics
-     *
-     * @access  public
-     * @param boolean $returnErrorObject whether the raw PEAR_Error (when true, default),
-     *                  or only the error message will be returned (when false), if an error happens.
-     * @return  mixed   an associative array of statistics on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see calcFull()
-     */
-    function calcBasic($returnErrorObject=true) {/*{{{*/
-            return array (
-                'min' => $this->__format($this->min(), $returnErrorObject),
-                'max' => $this->__format($this->max(), $returnErrorObject),
-                'sum' => $this->__format($this->sum(), $returnErrorObject),
-                'sum2' => $this->__format($this->sum2(), $returnErrorObject),
-                'count' => $this->__format($this->count(), $returnErrorObject),
-                'mean' => $this->__format($this->mean(), $returnErrorObject),
-                'stdev' => $this->__format($this->stDev(), $returnErrorObject),
-                'variance' => $this->__format($this->variance(), $returnErrorObject),
-                'range' => $this->__format($this->range(), $returnErrorObject)
-            );
-    }/*}}}*/
-
-    /**
-     * Calculates a full set of statistics
-     *
-     * @access  public
-     * @param boolean $returnErrorObject whether the raw PEAR_Error (when true, default),
-     *                  or only the error message will be returned (when false), if an error happens.
-     * @return  mixed   an associative array of statistics on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see calcBasic()
-     */
-    function calcFull($returnErrorObject=true) {/*{{{*/
-            return array (
-                'min' => $this->__format($this->min(), $returnErrorObject),
-                'max' => $this->__format($this->max(), $returnErrorObject),
-                'sum' => $this->__format($this->sum(), $returnErrorObject),
-                'sum2' => $this->__format($this->sum2(), $returnErrorObject),
-                'count' => $this->__format($this->count(), $returnErrorObject),
-                'mean' => $this->__format($this->mean(), $returnErrorObject),
-                'median' => $this->__format($this->median(), $returnErrorObject),
-                'mode' => $this->__format($this->mode(), $returnErrorObject),
-                'midrange' => $this->__format($this->midrange(), $returnErrorObject),
-                'geometric_mean' => $this->__format($this->geometricMean(), $returnErrorObject),
-                'harmonic_mean' => $this->__format($this->harmonicMean(), $returnErrorObject),
-                'stdev' => $this->__format($this->stDev(), $returnErrorObject),
-                'absdev' => $this->__format($this->absDev(), $returnErrorObject),
-                'variance' => $this->__format($this->variance(), $returnErrorObject),
-                'range' => $this->__format($this->range(), $returnErrorObject),
-                'std_error_of_mean' => $this->__format($this->stdErrorOfMean(), $returnErrorObject),
-                'skewness' => $this->__format($this->skewness(), $returnErrorObject),
-                'kurtosis' => $this->__format($this->kurtosis(), $returnErrorObject),
-                'coeff_of_variation' => $this->__format($this->coeffOfVariation(), $returnErrorObject),
-                'sample_central_moments' => array (
-                            1 => $this->__format($this->sampleCentralMoment(1), $returnErrorObject),
-                            2 => $this->__format($this->sampleCentralMoment(2), $returnErrorObject),
-                            3 => $this->__format($this->sampleCentralMoment(3), $returnErrorObject),
-                            4 => $this->__format($this->sampleCentralMoment(4), $returnErrorObject),
-                            5 => $this->__format($this->sampleCentralMoment(5), $returnErrorObject)
-                            ),
-                'sample_raw_moments' => array (
-                            1 => $this->__format($this->sampleRawMoment(1), $returnErrorObject),
-                            2 => $this->__format($this->sampleRawMoment(2), $returnErrorObject),
-                            3 => $this->__format($this->sampleRawMoment(3), $returnErrorObject),
-                            4 => $this->__format($this->sampleRawMoment(4), $returnErrorObject),
-                            5 => $this->__format($this->sampleRawMoment(5), $returnErrorObject)
-                            ),
-                'frequency' => $this->__format($this->frequency(), $returnErrorObject),
-                'quartiles' => $this->__format($this->quartiles(), $returnErrorObject),
-                'interquartile_range' => $this->__format($this->interquartileRange(), $returnErrorObject),
-                'interquartile_mean' => $this->__format($this->interquartileMean(), $returnErrorObject),
-                'quartile_deviation' => $this->__format($this->quartileDeviation(), $returnErrorObject),
-                'quartile_variation_coefficient' => $this->__format($this->quartileVariationCoefficient(), $returnErrorObject),
-                'quartile_skewness_coefficient' => $this->__format($this->quartileSkewnessCoefficient(), $returnErrorObject)
-            );
-    }/*}}}*/
-
-    /**
-     * Calculates the minimum of a data set.
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the minimum value on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see max()
-     */
-    function min() {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        if (!array_key_exists('min', $this->_calculatedValues)) {
-            if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-                $min = min(array_keys($this->_data));
-            } else {
-                $min = min($this->_data);
-            }
-            $this->_calculatedValues['min'] = $min;
-        }
-        return $this->_calculatedValues['min'];
-    }/*}}}*/
-
-    /**
-     * Calculates the maximum of a data set.
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the maximum value on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see min()
-     */
-    function max() {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        if (!array_key_exists('max', $this->_calculatedValues)) {
-            if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-                $max = max(array_keys($this->_data));
-            } else {
-                $max = max($this->_data);
-            }
-            $this->_calculatedValues['max'] = $max;
-        }
-        return $this->_calculatedValues['max'];
-    }/*}}}*/
-
-    /**
-     * Calculates SUM { xi }
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the sum on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see sum2()
-     * @see sumN()
-     */
-    function sum() {/*{{{*/
-        if (!array_key_exists('sum', $this->_calculatedValues)) {
-            $sum = $this->sumN(1);
-            if (PEAR::isError($sum)) {
-                return $sum;
-            } else {
-                $this->_calculatedValues['sum'] = $sum;
-            }
-        }
-        return $this->_calculatedValues['sum'];
-    }/*}}}*/
-
-    /**
-     * Calculates SUM { (xi)^2 }
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the sum on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see sum()
-     * @see sumN()
-     */
-    function sum2() {/*{{{*/
-        if (!array_key_exists('sum2', $this->_calculatedValues)) {
-            $sum2 = $this->sumN(2);
-            if (PEAR::isError($sum2)) {
-                return $sum2;
-            } else {
-                $this->_calculatedValues['sum2'] = $sum2;
-            }
-        }
-        return $this->_calculatedValues['sum2'];
-    }/*}}}*/
-
-    /**
-     * Calculates SUM { (xi)^n }
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @param   numeric $n  the exponent
-     * @return  mixed   the sum on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see sum()
-     * @see sum2()
-     */
-    function sumN($n) {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        $sumN = 0;
-        if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-            foreach($this->_data as $val=>$freq) {
-                $sumN += $freq * pow((double)$val, (double)$n);
-            }
-        } else {
-            foreach($this->_data as $val) {
-                $sumN += pow((double)$val, (double)$n);
-            }
-        }
-        return $sumN;
-    }/*}}}*/
-
-    /**
-     * Calculates PROD { (xi) }, (the product of all observations)
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the product on success, a PEAR_Error object otherwise
-     * @see productN()
-     */
-    function product() {/*{{{*/
-        if (!array_key_exists('product', $this->_calculatedValues)) {
-            $product = $this->productN(1);
-            if (PEAR::isError($product)) {
-                return $product;
-            } else {
-                $this->_calculatedValues['product'] = $product;
-            }
-        }
-        return $this->_calculatedValues['product'];
-    }/*}}}*/
-
-    /**
-     * Calculates PROD { (xi)^n }, which is the product of all observations
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @param   numeric $n  the exponent
-     * @return  mixed   the product on success, a PEAR_Error object otherwise
-     * @see product()
-     */
-    function productN($n) {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        $prodN = 1.0;
-        if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-            foreach($this->_data as $val=>$freq) {
-                if ($val == 0) {
-                    return 0.0;
-                }
-                $prodN *= $freq * pow((double)$val, (double)$n);
-            }
-        } else {
-            foreach($this->_data as $val) {
-                if ($val == 0) {
-                    return 0.0;
-                }
-                $prodN *= pow((double)$val, (double)$n);
-            }
-        }
-        return $prodN;
-
-    }/*}}}*/
-
-    /**
-     * Calculates the number of data points in the set
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the count on success, a PEAR_Error object otherwise
-     * @see calc()
-     */
-    function count() {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        if (!array_key_exists('count', $this->_calculatedValues)) {
-            if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-                $count = count($this->_dataExpanded);
-            } else {
-                $count = count($this->_data);
-            }
-            $this->_calculatedValues['count'] = $count;
-        }
-        return $this->_calculatedValues['count'];
-    }/*}}}*/
-
-    /**
-     * Calculates the mean (average) of the data points in the set
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the mean value on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see sum()
-     * @see count()
-     */
-    function mean() {/*{{{*/
-        if (!array_key_exists('mean', $this->_calculatedValues)) {
-            $sum = $this->sum();
-            if (PEAR::isError($sum)) {
-                return $sum;
-            }
-            $count = $this->count();
-            if (PEAR::isError($count)) {
-                return $count;
-            }
-            $this->_calculatedValues['mean'] = $sum / $count;
-        }
-        return $this->_calculatedValues['mean'];
-    }/*}}}*/
-
-    /**
-     * Calculates the range of the data set = max - min
-     *
-     * @access public
-     * @return mixed the value of the range on success, a PEAR_Error object otherwise.
-     */
-    function range() {/*{{{*/
-        if (!array_key_exists('range', $this->_calculatedValues)) {
-            $min = $this->min();
-            if (PEAR::isError($min)) {
-                return $min;
-            }
-            $max = $this->max();
-            if (PEAR::isError($max)) {
-                return $max;
-            }
-            $this->_calculatedValues['range'] = $max - $min;
-        }
-        return $this->_calculatedValues['range'];
-
-    }/*}}}*/
-
-    /**
-     * Calculates the variance (unbiased) of the data points in the set
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the variance value on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see __sumdiff()
-     * @see count()
-     */
-    function variance() {/*{{{*/
-        if (!array_key_exists('variance', $this->_calculatedValues)) {
-            $variance = $this->__calcVariance();
-            if (PEAR::isError($variance)) {
-                return $variance;
-            }
-            $this->_calculatedValues['variance'] = $variance;
-        }
-        return $this->_calculatedValues['variance'];
-    }/*}}}*/
-
-    /**
-     * Calculates the standard deviation (unbiased) of the data points in the set
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the standard deviation on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see variance()
-     */
-    function stDev() {/*{{{*/
-        if (!array_key_exists('stDev', $this->_calculatedValues)) {
-            $variance = $this->variance();
-            if (PEAR::isError($variance)) {
-                return $variance;
-            }
-            $this->_calculatedValues['stDev'] = sqrt($variance);
-        }
-        return $this->_calculatedValues['stDev'];
-    }/*}}}*/
-
-    /**
-     * Calculates the variance (unbiased) of the data points in the set
-     * given a fixed mean (average) value. Not used in calcBasic(), calcFull()
-     * or calc().
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @param   numeric $mean   the fixed mean value
-     * @return  mixed   the variance on success, a PEAR_Error object otherwise
-     * @see __sumdiff()
-     * @see count()
-     * @see variance()
-     */
-    function varianceWithMean($mean) {/*{{{*/
-        return $this->__calcVariance($mean);
-    }/*}}}*/
-
-    /**
-     * Calculates the standard deviation (unbiased) of the data points in the set
-     * given a fixed mean (average) value. Not used in calcBasic(), calcFull()
-     * or calc().
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @param   numeric $mean   the fixed mean value
-     * @return  mixed   the standard deviation on success, a PEAR_Error object otherwise
-     * @see varianceWithMean()
-     * @see stDev()
-     */
-    function stDevWithMean($mean) {/*{{{*/
-        $varianceWM = $this->varianceWithMean($mean);
-        if (PEAR::isError($varianceWM)) {
-            return $varianceWM;
-        }
-        return sqrt($varianceWM);
-    }/*}}}*/
-
-    /**
-     * Calculates the absolute deviation of the data points in the set
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the absolute deviation on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see __sumabsdev()
-     * @see count()
-     * @see absDevWithMean()
-     */
-    function absDev() {/*{{{*/
-        if (!array_key_exists('absDev', $this->_calculatedValues)) {
-            $absDev = $this->__calcAbsoluteDeviation();
-            if (PEAR::isError($absdev)) {
-                return $absdev;
-            }
-            $this->_calculatedValues['absDev'] = $absDev;
-        }
-        return $this->_calculatedValues['absDev'];
-    }/*}}}*/
-
-    /**
-     * Calculates the absolute deviation of the data points in the set
-     * given a fixed mean (average) value. Not used in calcBasic(), calcFull()
-     * or calc().
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @param   numeric $mean   the fixed mean value
-     * @return  mixed   the absolute deviation on success, a PEAR_Error object otherwise
-     * @see __sumabsdev()
-     * @see absDev()
-     */
-    function absDevWithMean($mean) {/*{{{*/
-        return $this->__calcAbsoluteDeviation($mean);
-    }/*}}}*/
-
-    /**
-     * Calculates the skewness of the data distribution in the set
-     * The skewness measures the degree of asymmetry of a distribution,
-     * and is related to the third central moment of a distribution.
-     * A normal distribution has a skewness = 0
-     * A distribution with a tail off towards the high end of the scale
-     * (positive skew) has a skewness > 0
-     * A distribution with a tail off towards the low end of the scale
-     * (negative skew) has a skewness < 0
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the skewness value on success, a PEAR_Error object otherwise
-     * @see __sumdiff()
-     * @see count()
-     * @see stDev()
-     * @see calc()
-     */
-    function skewness() {/*{{{*/
-        if (!array_key_exists('skewness', $this->_calculatedValues)) {
-            $count = $this->count();
-            if (PEAR::isError($count)) {
-                return $count;
-            }
-            $stDev = $this->stDev();
-            if (PEAR::isError($stDev)) {
-                return $stDev;
-            }
-            $sumdiff3 = $this->__sumdiff(3);
-            if (PEAR::isError($sumdiff3)) {
-                return $sumdiff3;
-            }
-            $this->_calculatedValues['skewness'] = ($sumdiff3 / ($count * pow($stDev, 3)));
-        }
-        return $this->_calculatedValues['skewness'];
-    }/*}}}*/
-
-    /**
-     * Calculates the kurtosis of the data distribution in the set
-     * The kurtosis measures the degrees of peakedness of a distribution.
-     * It is also called the "excess" or "excess coefficient", and is
-     * a normalized form of the fourth central moment of a distribution.
-     * A normal distributions has kurtosis = 0
-     * A narrow and peaked (leptokurtic) distribution has a
-     * kurtosis > 0
-     * A flat and wide (platykurtic) distribution has a kurtosis < 0
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the kurtosis value on success, a PEAR_Error object otherwise
-     * @see __sumdiff()
-     * @see count()
-     * @see stDev()
-     * @see calc()
-     */
-    function kurtosis() {/*{{{*/
-        if (!array_key_exists('kurtosis', $this->_calculatedValues)) {
-            $count = $this->count();
-            if (PEAR::isError($count)) {
-                return $count;
-            }
-            $stDev = $this->stDev();
-            if (PEAR::isError($stDev)) {
-                return $stDev;
-            }
-            $sumdiff4 = $this->__sumdiff(4);
-            if (PEAR::isError($sumdiff4)) {
-                return $sumdiff4;
-            }
-            $this->_calculatedValues['kurtosis'] = ($sumdiff4 / ($count * pow($stDev, 4))) - 3;
-        }
-        return $this->_calculatedValues['kurtosis'];
-    }/*}}}*/
-
-    /**
-     * Calculates the median of a data set.
-     * The median is the value such that half of the points are below it
-     * in a sorted data set.
-     * If the number of values is odd, it is the middle item.
-     * If the number of values is even, is the average of the two middle items.
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the median value on success, a PEAR_Error object otherwise
-     * @see count()
-     * @see calc()
-     */
-    function median() {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        if (!array_key_exists('median', $this->_calculatedValues)) {
-            if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-                $arr =& $this->_dataExpanded;
-            } else {
-                $arr =& $this->_data;
-            }
-            $n = $this->count();
-            if (PEAR::isError($n)) {
-                return $n;
-            }
-            $h = intval($n / 2);
-            if ($n % 2 == 0) {
-                $median = ($arr[$h] + $arr[$h - 1]) / 2;
-            } else {
-                $median = $arr[$h + 1];
-            }
-            $this->_calculatedValues['median'] = $median;
-        }
-        return $this->_calculatedValues['median'];
-    }/*}}}*/
-
-    /**
-     * Calculates the mode of a data set.
-     * The mode is the value with the highest frequency in the data set.
-     * There can be more than one mode.
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   an array of mode value on success, a PEAR_Error object otherwise
-     * @see frequency()
-     * @see calc()
-     */
-    function mode() {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        if (!array_key_exists('mode', $this->_calculatedValues)) {
-            if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-                $arr = $this->_data;
-            } else {
-                $arr = $this->frequency();
-            }
-            arsort($arr);
-            $mcount = 1;
-            foreach ($arr as $val=>$freq) {
-                if ($mcount == 1) {
-                    $mode = array($val);
-                    $mfreq = $freq;
-                    ++$mcount;
-                    continue;
-                }
-                if ($mfreq == $freq)
-                    $mode[] = $val;
-                if ($mfreq > $freq)
-                    break;
-            }
-            $this->_calculatedValues['mode'] = $mode;
-        }
-        return $this->_calculatedValues['mode'];
-    }/*}}}*/
-
-    /**
-     * Calculates the midrange of a data set.
-     * The midrange is the average of the minimum and maximum of the data set.
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the midrange value on success, a PEAR_Error object otherwise
-     * @see min()
-     * @see max()
-     * @see calc()
-     */
-    function midrange() {/*{{{*/
-        if (!array_key_exists('midrange', $this->_calculatedValues)) {
-            $min = $this->min();
-            if (PEAR::isError($min)) {
-                return $min;
-            }
-            $max = $this->max();
-            if (PEAR::isError($max)) {
-                return $max;
-            }
-            $this->_calculatedValues['midrange'] = (($max + $min) / 2);
-        }
-        return $this->_calculatedValues['midrange'];
-    }/*}}}*/
-
-    /**
-     * Calculates the geometrical mean of the data points in the set
-     * Handles cummulative data sets correctly
-     *
-     * @access public
-     * @return mixed the geometrical mean value on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see product()
-     * @see count()
-     */
-    function geometricMean() {/*{{{*/
-        if (!array_key_exists('geometricMean', $this->_calculatedValues)) {
-            $count = $this->count();
-            if (PEAR::isError($count)) {
-                return $count;
-            }
-            $prod = $this->product();
-            if (PEAR::isError($prod)) {
-                return $prod;
-            }
-            if ($prod == 0.0) {
-                return 0.0;
-            }
-            if ($prod < 0) {
-                return PEAR::raiseError('The product of the data set is negative, geometric mean undefined.');
-            }
-            $this->_calculatedValues['geometricMean'] = pow($prod , 1 / $count);
-        }
-        return $this->_calculatedValues['geometricMean'];
-    }/*}}}*/
-
-    /**
-     * Calculates the harmonic mean of the data points in the set
-     * Handles cummulative data sets correctly
-     *
-     * @access public
-     * @return mixed the harmonic mean value on success, a PEAR_Error object otherwise
-     * @see calc()
-     * @see count()
-     */
-    function harmonicMean() {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        if (!array_key_exists('harmonicMean', $this->_calculatedValues)) {
-            $count = $this->count();
-            if (PEAR::isError($count)) {
-                return $count;
-            }
-            $invsum = 0.0;
-            if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-                foreach($this->_data as $val=>$freq) {
-                    if ($val == 0) {
-                        return PEAR::raiseError('cannot calculate a '.
-                                'harmonic mean with data values of zero.');
-                    }
-                    $invsum += $freq / $val;
-                }
-            } else {
-                foreach($this->_data as $val) {
-                    if ($val == 0) {
-                        return PEAR::raiseError('cannot calculate a '.
-                                'harmonic mean with data values of zero.');
-                    }
-                    $invsum += 1 / $val;
-                }
-            }
-            $this->_calculatedValues['harmonicMean'] = $count / $invsum;
-        }
-        return $this->_calculatedValues['harmonicMean'];
-    }/*}}}*/
-
-    /**
-     * Calculates the nth central moment (m{n}) of a data set.
-     *
-     * The definition of a sample central moment is:
-     *
-     *     m{n} = 1/N * SUM { (xi - avg)^n }
-     *
-     * where: N = sample size, avg = sample mean.
-     *
-     * @access public
-     * @param integer $n moment to calculate
-     * @return mixed the numeric value of the moment on success, PEAR_Error otherwise
-     */
-    function sampleCentralMoment($n) {/*{{{*/
-        if (!is_int($n) || $n < 1) {
-            return PEAR::isError('moment must be a positive integer >= 1.');
-        }
-
-        if ($n == 1) {
-            return 0;
-        }
-        $count = $this->count();
-        if (PEAR::isError($count)) {
-            return $count;
-        }
-        if ($count == 0) {
-            return PEAR::raiseError("Cannot calculate {$n}th sample moment, ".
-                    'there are zero data entries');
-        }
-        $sum = $this->__sumdiff($n);
-        if (PEAR::isError($sum)) {
-            return $sum;
-        }
-        return ($sum / $count);
-    }/*}}}*/
-
-    /**
-     * Calculates the nth raw moment (m{n}) of a data set.
-     *
-     * The definition of a sample central moment is:
-     *
-     *     m{n} = 1/N * SUM { xi^n }
-     *
-     * where: N = sample size, avg = sample mean.
-     *
-     * @access public
-     * @param integer $n moment to calculate
-     * @return mixed the numeric value of the moment on success, PEAR_Error otherwise
-     */
-    function sampleRawMoment($n) {/*{{{*/
-        if (!is_int($n) || $n < 1) {
-            return PEAR::isError('moment must be a positive integer >= 1.');
-        }
-
-        $count = $this->count();
-        if (PEAR::isError($count)) {
-            return $count;
-        }
-        if ($count == 0) {
-            return PEAR::raiseError("Cannot calculate {$n}th raw moment, ".
-                    'there are zero data entries.');
-        }
-        $sum = $this->sumN($n);
-        if (PEAR::isError($sum)) {
-            return $sum;
-        }
-        return ($sum / $count);
-    }/*}}}*/
-
-
-    /**
-     * Calculates the coefficient of variation of a data set.
-     * The coefficient of variation measures the spread of a set of data
-     * as a proportion of its mean. It is often expressed as a percentage.
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   the coefficient of variation on success, a PEAR_Error object otherwise
-     * @see stDev()
-     * @see mean()
-     * @see calc()
-     */
-    function coeffOfVariation() {/*{{{*/
-        if (!array_key_exists('coeffOfVariation', $this->_calculatedValues)) {
-            $mean = $this->mean();
-            if (PEAR::isError($mean)) {
-                return $mean;
-            }
-            if ($mean == 0.0) {
-                return PEAR::raiseError('cannot calculate the coefficient '.
-                        'of variation, mean of sample is zero');
-            }
-            $stDev = $this->stDev();
-            if (PEAR::isError($stDev)) {
-                return $stDev;
-            }
-
-            $this->_calculatedValues['coeffOfVariation'] = $stDev / $mean;
-        }
-        return $this->_calculatedValues['coeffOfVariation'];
-    }/*}}}*/
-
-    /**
-     * Calculates the standard error of the mean.
-     * It is the standard deviation of the sampling distribution of
-     * the mean. The formula is:
-     *
-     * S.E. Mean = SD / (N)^(1/2)
-     *
-     * This formula does not assume a normal distribution, and shows
-     * that the size of the standard error of the mean is inversely
-     * proportional to the square root of the sample size.
-     *
-     * @access  public
-     * @return  mixed   the standard error of the mean on success, a PEAR_Error object otherwise
-     * @see stDev()
-     * @see count()
-     * @see calc()
-     */
-    function stdErrorOfMean() {/*{{{*/
-        if (!array_key_exists('stdErrorOfMean', $this->_calculatedValues)) {
-            $count = $this->count();
-            if (PEAR::isError($count)) {
-                return $count;
-            }
-            $stDev = $this->stDev();
-            if (PEAR::isError($stDev)) {
-                return $stDev;
-            }
-            $this->_calculatedValues['stdErrorOfMean'] = $stDev / sqrt($count);
-        }
-        return $this->_calculatedValues['stdErrorOfMean'];
-    }/*}}}*/
-
-    /**
-     * Calculates the value frequency table of a data set.
-     * Handles cummulative data sets correctly
-     *
-     * @access  public
-     * @return  mixed   an associative array of value=>frequency items on success, a PEAR_Error object otherwise
-     * @see min()
-     * @see max()
-     * @see calc()
-     */
-    function frequency() {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        if (!array_key_exists('frequency', $this->_calculatedValues)) {
-            if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-                $freq = $this->_data;
-            } else {
-                $freq = array();
-                foreach ($this->_data as $val) {
-                    $freq["$val"]++;
-                }
-                ksort($freq);
-            }
-            $this->_calculatedValues['frequency'] = $freq;
-        }
-        return $this->_calculatedValues['frequency'];
-    }/*}}}*/
-
-    /**
-     * The quartiles are defined as the values that divide a sorted
-     * data set into four equal-sized subsets, and correspond to the
-     * 25th, 50th, and 75th percentiles.
-     *
-     * @access public
-     * @return mixed an associative array of quartiles on success, a PEAR_Error otherwise
-     * @see percentile()
-     */
-    function quartiles() {/*{{{*/
-        if (!array_key_exists('quartiles', $this->_calculatedValues)) {
-            $q1 = $this->percentile(25);
-            if (PEAR::isError($q1)) {
-                return $q1;
-            }
-            $q2 = $this->percentile(50);
-            if (PEAR::isError($q2)) {
-                return $q2;
-            }
-            $q3 = $this->percentile(75);
-            if (PEAR::isError($q3)) {
-                return $q3;
-            }
-            $this->_calculatedValues['quartiles'] = array (
-                                        '25' => $q1,
-                                        '50' => $q2,
-                                        '75' => $q3
-                                        );
-        }
-        return $this->_calculatedValues['quartiles'];
-    }/*}}}*/
-
-    /**
-     * The interquartile mean is defined as the mean of the values left
-     * after discarding the lower 25% and top 25% ranked values, i.e.:
-     *
-     *  interquart mean = mean(<P(25),P(75)>)
-     *
-     *  where: P = percentile
-     *
-     * @todo need to double check the equation
-     * @access public
-     * @return mixed a numeric value on success, a PEAR_Error otherwise
-     * @see quartiles()
-     */
-    function interquartileMean() {/*{{{*/
-        if (!array_key_exists('interquartileMean', $this->_calculatedValues)) {
-            $quart = $this->quartiles();
-            if (PEAR::isError($quart)) {
-                return $quart;
-            }
-            $q3 = $quart['75'];
-            $q1 = $quart['25'];
-            $sum = 0;
-            $n = 0;
-            foreach ($this->getData(true) as $val) {
-                if ($val >= $q1 && $val <= $q3) {
-                    $sum += $val;
-                    ++$n;
-                }
-            }
-            if ($n == 0) {
-                return PEAR::raiseError('error calculating interquartile mean, '.
-                                        'empty interquartile range of values.');
-            }
-            $this->_calculatedValues['interquartileMean'] = $sum / $n;
-        }
-        return $this->_calculatedValues['interquartileMean'];
-    }/*}}}*/
-
-    /**
-     * The interquartile range is the distance between the 75th and 25th
-     * percentiles. Basically the range of the middle 50% of the data set,
-     * and thus is not affected by outliers or extreme values.
-     *
-     *  interquart range = P(75) - P(25)
-     *
-     *  where: P = percentile
-     *
-     * @access public
-     * @return mixed a numeric value on success, a PEAR_Error otherwise
-     * @see quartiles()
-     */
-    function interquartileRange() {/*{{{*/
-        if (!array_key_exists('interquartileRange', $this->_calculatedValues)) {
-            $quart = $this->quartiles();
-            if (PEAR::isError($quart)) {
-                return $quart;
-            }
-            $q3 = $quart['75'];
-            $q1 = $quart['25'];
-            $this->_calculatedValues['interquartileRange'] = $q3 - $q1;
-        }
-        return $this->_calculatedValues['interquartileRange'];
-    }/*}}}*/
-
-    /**
-     * The quartile deviation is half of the interquartile range value
-     *
-     *  quart dev = (P(75) - P(25)) / 2
-     *
-     *  where: P = percentile
-     *
-     * @access public
-     * @return mixed a numeric value on success, a PEAR_Error otherwise
-     * @see quartiles()
-     * @see interquartileRange()
-     */
-    function quartileDeviation() {/*{{{*/
-        if (!array_key_exists('quartileDeviation', $this->_calculatedValues)) {
-            $iqr = $this->interquartileRange();
-            if (PEAR::isError($iqr)) {
-                return $iqr;
-            }
-            $this->_calculatedValues['quartileDeviation'] = $iqr / 2;
-        }
-        return $this->_calculatedValues['quartileDeviation'];
-    }/*}}}*/
-
-    /**
-     * The quartile variation coefficient is defines as follows:
-     *
-     *  quart var coeff = 100 * (P(75) - P(25)) / (P(75) + P(25))
-     *
-     *  where: P = percentile
-     *
-     * @todo need to double check the equation
-     * @access public
-     * @return mixed a numeric value on success, a PEAR_Error otherwise
-     * @see quartiles()
-     */
-    function quartileVariationCoefficient() {/*{{{*/
-        if (!array_key_exists('quartileVariationCoefficient', $this->_calculatedValues)) {
-            $quart = $this->quartiles();
-            if (PEAR::isError($quart)) {
-                return $quart;
-            }
-            $q3 = $quart['75'];
-            $q1 = $quart['25'];
-            $d = $q3 - $q1;
-            $s = $q3 + $q1;
-            $this->_calculatedValues['quartileVariationCoefficient'] = 100 * $d / $s;
-        }
-        return $this->_calculatedValues['quartileVariationCoefficient'];
-    }/*}}}*/
-
-    /**
-     * The quartile skewness coefficient (also known as Bowley Skewness),
-     * is defined as follows:
-     *
-     *  quart skewness coeff = (P(25) - 2*P(50) + P(75)) / (P(75) - P(25))
-     *
-     *  where: P = percentile
-     *
-     * @todo need to double check the equation
-     * @access public
-     * @return mixed a numeric value on success, a PEAR_Error otherwise
-     * @see quartiles()
-     */
-    function quartileSkewnessCoefficient() {/*{{{*/
-        if (!array_key_exists('quartileSkewnessCoefficient', $this->_calculatedValues)) {
-            $quart = $this->quartiles();
-            if (PEAR::isError($quart)) {
-                return $quart;
-            }
-            $q3 = $quart['75'];
-            $q2 = $quart['50'];
-            $q1 = $quart['25'];
-            $d = $q3 - 2*$q2 + $q1;
-            $s = $q3 - $q1;
-            $this->_calculatedValues['quartileSkewnessCoefficient'] = $d / $s;
-        }
-        return $this->_calculatedValues['quartileSkewnessCoefficient'];
-    }/*}}}*/
-
-    /**
-     * The pth percentile is the value such that p% of the a sorted data set
-     * is smaller than it, and (100 - p)% of the data is larger.
-     *
-     * A quick algorithm to pick the appropriate value from a sorted data
-     * set is as follows:
-     *
-     * - Count the number of values: n
-     * - Calculate the position of the value in the data list: i = p * (n + 1)
-     * - if i is an integer, return the data at that position
-     * - if i < 1, return the minimum of the data set
-     * - if i > n, return the maximum of the data set
-     * - otherwise, average the entries at adjacent positions to i
-     *
-     * The median is the 50th percentile value.
-     *
-     * @todo need to double check generality of the algorithm
-     *
-     * @access public
-     * @param numeric $p the percentile to estimate, e.g. 25 for 25th percentile
-     * @return mixed a numeric value on success, a PEAR_Error otherwise
-     * @see quartiles()
-     * @see median()
-     */
-    function percentile($p) {/*{{{*/
-        $count = $this->count();
-        if (PEAR::isError($count)) {
-            return $count;
-        }
-        if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-            $data =& $this->_dataExpanded;
-        } else {
-            $data =& $this->_data;
-        }
-        $obsidx = $p * ($count + 1) / 100;
-        if (intval($obsidx) == $obsidx) {
-            return $data[($obsidx - 1)];
-        } elseif ($obsidx < 1) {
-            return $data[0];
-        } elseif ($obsidx > $count) {
-            return $data[($count - 1)];
-        } else {
-            $left = floor($obsidx - 1);
-            $right = ceil($obsidx - 1);
-            return ($data[$left] + $data[$right]) / 2;
-        }
-    }/*}}}*/
-
-    // private methods
-
-    /**
-     * Utility function to calculate: SUM { (xi - mean)^n }
-     *
-     * @access private
-     * @param   numeric $power  the exponent
-     * @param   optional    double   $mean   the data set mean value
-     * @return  mixed   the sum on success, a PEAR_Error object otherwise
-     *
-     * @see stDev()
-     * @see variaceWithMean();
-     * @see skewness();
-     * @see kurtosis();
-     */
-    function __sumdiff($power, $mean=null) {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        if (is_null($mean)) {
-            $mean = $this->mean();
-            if (PEAR::isError($mean)) {
-                return $mean;
-            }
-        }
-        $sdiff = 0;
-        if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-            foreach ($this->_data as $val=>$freq) {
-                $sdiff += $freq * pow((double)($val - $mean), (double)$power);
-            }
-        } else {
-            foreach ($this->_data as $val)
-                $sdiff += pow((double)($val - $mean), (double)$power);
-        }
-        return $sdiff;
-    }/*}}}*/
-
-    /**
-     * Utility function to calculate the variance with or without
-     * a fixed mean
-     *
-     * @access private
-     * @param $mean the fixed mean to use, null as default
-     * @return mixed a numeric value on success, a PEAR_Error otherwise
-     * @see variance()
-     * @see varianceWithMean()
-     */
-    function __calcVariance($mean = null) {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        $sumdiff2 = $this->__sumdiff(2, $mean);
-        if (PEAR::isError($sumdiff2)) {
-            return $sumdiff2;
-        }
-        $count = $this->count();
-        if (PEAR::isError($count)) {
-            return $count;
-        }
-        if ($count == 1) {
-            return PEAR::raiseError('cannot calculate variance of a singe data point');
-        }
-        return  ($sumdiff2 / ($count - 1));
-    }/*}}}*/
-
-    /**
-     * Utility function to calculate the absolute deviation with or without
-     * a fixed mean
-     *
-     * @access private
-     * @param $mean the fixed mean to use, null as default
-     * @return mixed a numeric value on success, a PEAR_Error otherwise
-     * @see absDev()
-     * @see absDevWithMean()
-     */
-    function __calcAbsoluteDeviation($mean = null) {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        $count = $this->count();
-        if (PEAR::isError($count)) {
-            return $count;
-        }
-        $sumabsdev = $this->__sumabsdev($mean);
-        if (PEAR::isError($sumabsdev)) {
-            return $sumabsdev;
-        }
-        return $sumabsdev / $count;
-    }/*}}}*/
-
-    /**
-     * Utility function to calculate: SUM { | xi - mean | }
-     *
-     * @access  private
-     * @param   optional    double   $mean   the mean value for the set or population
-     * @return  mixed   the sum on success, a PEAR_Error object otherwise
-     *
-     * @see absDev()
-     * @see absDevWithMean()
-     */
-    function __sumabsdev($mean=null) {/*{{{*/
-        if ($this->_data == null) {
-            return PEAR::raiseError('data has not been set');
-        }
-        if (is_null($mean)) {
-            $mean = $this->mean();
-        }
-        $sdev = 0;
-        if ($this->_dataOption == STATS_DATA_CUMMULATIVE) {
-            foreach ($this->_data as $val=>$freq) {
-                $sdev += $freq * abs($val - $mean);
-            }
-        } else {
-            foreach ($this->_data as $val) {
-                $sdev += abs($val - $mean);
-            }
-        }
-        return $sdev;
-    }/*}}}*/
-
-    /**
-     * Utility function to format a PEAR_Error to be used by calc(),
-     * calcBasic() and calcFull()
-     *
-     * @access private
-     * @param mixed $v value to be formatted
-     * @param boolean $returnErrorObject whether the raw PEAR_Error (when true, default),
-     *                  or only the error message will be returned (when false)
-     * @return mixed if the value is a PEAR_Error object, and $useErrorObject
-     *              is false, then a string with the error message will be returned,
-     *              otherwise the value will not be modified and returned as passed.
-     */
-    function __format($v, $useErrorObject=true) {/*{{{*/
-        if (PEAR::isError($v) && $useErrorObject == false) {
-            return $v->getMessage();
-        } else {
-            return $v;
-        }
-    }/*}}}*/
-
-    /**
-     * Utility function to validate the data and modify it
-     * according to the current null handling option
-     *
-     * @access  private
-     * @return  mixed true on success, a PEAR_Error object otherwise
-     *
-     * @see setData()
-     */
-    function _validate() {/*{{{*/
-        $flag = ($this->_dataOption == STATS_DATA_CUMMULATIVE);
-        foreach ($this->_data as $key=>$value) {
-            $d = ($flag) ? $key : $value;
-            $v = ($flag) ? $value : $key;
-            if (!is_numeric($d)) {
-                switch ($this->_nullOption) {
-                    case STATS_IGNORE_NULL :
-                        unset($this->_data["$key"]);
-                        break;
-                    case STATS_USE_NULL_AS_ZERO:
-                        if ($flag) {
-                            unset($this->_data["$key"]);
-                            $this->_data[0] += $v;
-                        } else {
-                            $this->_data[$key] = 0;
-                        }
-                        break;
-                    case STATS_REJECT_NULL :
-                    default:
-                        return PEAR::raiseError('data rejected, contains NULL values');
-                        break;
-                }
-            }
-        }
-        if ($flag) {
-            ksort($this->_data);
-            $this->_dataExpanded = array();
-            foreach ($this->_data as $val=>$freq) {
-                $this->_dataExpanded = array_pad($this->_dataExpanded, count($this->_dataExpanded) + $freq, $val);
-            }
-            sort($this->_dataExpanded);
-        } else {
-            sort($this->_data);
-        }
-        return true;
-    }/*}}}*/
-
-}/*}}}*/
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1: fdm=marker:
-
-?>
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/benchmark.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/benchmark.php
deleted file mode 100755
index 1b963b46b..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/benchmark.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-
-error_reporting(E_ALL);
-
-/**
- * @package JAMA
- */
-
-require_once '../Matrix.php';
-require_once 'Stats.php';
-
-
-/**
- * Example of use of Matrix Class, featuring magic squares.
- */
-class Benchmark {
-	public $stat;
-
-
-	/**
-	 * Simple function to replicate PHP 5 behaviour
-	 */
-	function microtime_float() {
-		list($usec, $sec) = explode(" ", microtime());
-
-		return ((float)$usec + (float)$sec);
-	}	//	function microtime_float()
-
-
-	function displayStats($times = null) {
-		$this->stat->setData($times);
-		$stats = $this->stat->calcFull();
-
-		echo '<table style="margin-left:32px;">';
-		echo '<tr><td style="text-align:right;"><b>n:</b><td style="text-align:right;">' . $stats['count'] . ' </td></tr>';
-		echo '<tr><td style="text-align:right;"><b>Mean:</b><td style="text-align:right;">' . $stats['mean'] . ' </td></tr>';
-		echo '<tr><td style="text-align:right;"><b>Min.:</b><td style="text-align:right;">' . $stats['min'] . ' </td></tr>';
-		echo '<tr><td style="text-align:right;"><b>Max.:</b><td style="text-align:right;">' . $stats['max'] . ' </td></tr>';
-		echo '<tr><td style="text-align:right;"><b>&sigma;:</b><td style="text-align:right;">' . $stats['stdev'] . ' </td></tr>';
-		echo '<tr><td style="text-align:right;"><b>Variance:</b><td style="text-align:right;">' . $stats['variance'] . ' </td></tr>';
-		echo '<tr><td style="text-align:right;"><b>Range:</b><td style="text-align:right;">' . $stats['range'] . ' </td></tr>';
-		echo '</table>';
-
-		return $stats;
-	}	//	function displayStats()
-
-
-	function runEig($n = 4, $t = 100) {
-		$times = array();
-
-		for ($i = 0; $i < $t; ++$i) {
-			$M = Matrix::random($n, $n);
-			$start_time = $this->microtime_float();
-			$E = new EigenvalueDecomposition($M);
-			$stop_time = $this->microtime_float();
-			$times[] = $stop_time - $start_time;
-		}
-
-		return $times;
-	}	//	function runEig()
-
-
-	function runLU($n = 4, $t = 100) {
-		$times = array();
-
-		for ($i = 0; $i < $t; ++$i) {
-			$M = Matrix::random($n, $n);
-			$start_time = $this->microtime_float();
-			$E = new LUDecomposition($M);
-			$stop_time = $this->microtime_float();
-			$times[] = $stop_time - $start_time;
-		}
-
-		return $times;
-	}	//	function runLU()
-
-
-	function runQR($n = 4, $t = 100) {
-		$times = array();
-
-		for ($i = 0; $i < $t; ++$i) {
-			$M = Matrix::random($n, $n);
-			$start_time = $this->microtime_float();
-			$E = new QRDecomposition($M);
-			$stop_time = $this->microtime_float();
-			$times[] = $stop_time - $start_time;
-		}
-
-		return $times;
-	}	//	function runQR()
-
-
-	function runCholesky($n = 4, $t = 100) {
-		$times = array();
-
-		for ($i = 0; $i < $t; ++$i) {
-			$M = Matrix::random($n, $n);
-			$start_time = $this->microtime_float();
-			$E = new CholeskyDecomposition($M);
-			$stop_time = $this->microtime_float();
-			$times[] = $stop_time - $start_time;
-		}
-
-		return $times;
-	}	//	function runCholesky()
-
-
-	function runSVD($n = 4, $t = 100) {
-		$times = array();
-
-		for ($i = 0; $i < $t; ++$i) {
-			$M = Matrix::random($n, $n);
-			$start_time = $this->microtime_float();
-			$E = new SingularValueDecomposition($M);
-			$stop_time = $this->microtime_float();
-			$times[] = $stop_time - $start_time;
-		}
-
-		return $times;
-	}	//	function runSVD()
-
-
-	function run() {
-		$n = 8;
-		$t = 16;
-		$sum = 0;
-		echo "<b>Cholesky decomposition: $t random {$n}x{$n} matrices</b><br />";
-		$r = $this->displayStats($this->runCholesky($n, $t));
-		$sum += $r['mean'] * $n;
-
-		echo '<hr />';
-
-		echo "<b>Eigenvalue decomposition: $t random {$n}x{$n} matrices</b><br />";
-		$r = $this->displayStats($this->runEig($n, $t));
-		$sum += $r['mean'] * $n;
-
-		echo '<hr />';
-
-		echo "<b>LU decomposition: $t random {$n}x{$n} matrices</b><br />";
-		$r = $this->displayStats($this->runLU($n, $t));
-		$sum += $r['mean'] * $n;
-
-		echo '<hr />';
-
-		echo "<b>QR decomposition: $t random {$n}x{$n} matrices</b><br />";
-		$r = $this->displayStats($this->runQR($n, $t));
-		$sum += $r['mean'] * $n;
-
-		echo '<hr />';
-
-		echo "<b>Singular Value decomposition: $t random {$n}x{$n} matrices</b><br />";
-		$r = $this->displayStats($this->runSVD($n, $t));
-		$sum += $r['mean'] * $n;
-
-		return $sum;
-	}	//	function run()
-
-
-	public function __construct() {
-		$this->stat = new Base();
-	}	//	function Benchmark()
-
-}  // class Benchmark		(end MagicSquareExample)
-
-
-$benchmark = new Benchmark();
-
-switch($_REQUEST['decomposition']) {
-	case 'cholesky':
-		$m = array();
-		for ($i = 2; $i <= 8; $i *= 2) {
-			$t = 32 / $i;
-			echo "<b>Cholesky decomposition: $t random {$i}x{$i} matrices</b><br />";
-			$s = $benchmark->displayStats($benchmark->runCholesky($i, $t));
-			$m[$i] = $s['mean'];
-			echo "<br />";
-		}
-		echo '<pre>';
-		foreach($m as $x => $y) {
-			echo "$x\t" . 1000*$y . "\n";
-		}
-		echo '</pre>';
-		break;
-	case 'eigenvalue':
-		$m = array();
-		for ($i = 2; $i <= 8; $i *= 2) {
-			$t = 32 / $i;
-			echo "<b>Eigenvalue decomposition: $t random {$i}x{$i} matrices</b><br />";
-			$s = $benchmark->displayStats($benchmark->runEig($i, $t));
-			$m[$i] = $s['mean'];
-			echo "<br />";
-		}
-		echo '<pre>';
-		foreach($m as $x => $y) {
-			echo "$x\t" . 1000*$y . "\n";
-		}
-		echo '</pre>';
-		break;
-	case 'lu':
-		$m = array();
-		for ($i = 2; $i <= 8; $i *= 2) {
-			$t = 32 / $i;
-			echo "<b>LU decomposition: $t random {$i}x{$i} matrices</b><br />";
-			$s = $benchmark->displayStats($benchmark->runLU($i, $t));
-			$m[$i] = $s['mean'];
-			echo "<br />";
-		}
-		echo '<pre>';
-		foreach($m as $x => $y) {
-			echo "$x\t" . 1000*$y . "\n";
-		}
-		echo '</pre>';
-		break;
-	case 'qr':
-		$m = array();
-		for ($i = 2; $i <= 8; $i *= 2) {
-			$t = 32 / $i;
-			echo "<b>QR decomposition: $t random {$i}x{$i} matrices</b><br />";
-			$s = $benchmark->displayStats($benchmark->runQR($i, $t));
-			$m[$i] = $s['mean'];
-			echo "<br />";
-		}
-		echo '<pre>';
-		foreach($m as $x => $y) {
-			echo "$x\t" . 1000*$y . "\n";
-		}
-		echo '</pre>';
-		break;
-	case 'svd':
-		$m = array();
-		for($i = 2; $i <= 8; $i *= 2) {
-			$t = 32 / $i;
-			echo "<b>Singular value decomposition: $t random {$i}x{$i} matrices</b><br />";
-			$s = $benchmark->displayStats($benchmark->runSVD($i, $t));
-			$m[$i] = $s['mean'];
-			echo "<br />";
-		}
-		echo '<pre>';
-		foreach($m as $x => $y) {
-			echo "$x\t" . 1000*$y . "\n";
-		}
-		echo '</pre>';
-		break;
-	case 'all':
-		$s = $benchmark->run();
-		print("<br /><b>Total<b>: {$s}s<br />");
-		break;
-	default:
-		?>
-		<ul>
-			<li><a href="benchmark.php?decomposition=all">Complete Benchmark</a>
-				<ul>
-					<li><a href="benchmark.php?decomposition=cholesky">Cholesky</a></li>
-					<li><a href="benchmark.php?decomposition=eigenvalue">Eigenvalue</a></li>
-					<li><a href="benchmark.php?decomposition=lu">LU</a></li>
-					<li><a href="benchmark.php?decomposition=qr">QR</a></li>
-					<li><a href="benchmark.php?decomposition=svd">Singular Value</a></li>
-				</ul>
-			</li>
-		</ul>
-		<?php
-		break;
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/polyfit.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/polyfit.php
deleted file mode 100755
index bc02fd62e..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/polyfit.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-require_once "../Matrix.php";
-/*
-* @package JAMA
-* @author Michael Bommarito
-* @author Paul Meagher
-* @version 0.1
-*
-* Function to fit an order n polynomial function through
-* a series of x-y data points using least squares.
-*
-* @param $X array x values
-* @param $Y array y values
-* @param $n int order of polynomial to be used for fitting
-* @returns array $coeffs of polynomial coefficients
-* Pre-Conditions: the system is not underdetermined: sizeof($X) > $n+1
-*/
-function polyfit($X, $Y, $n) {
-	for ($i = 0; $i < sizeof($X); ++$i)
-		for ($j = 0; $j <= $n; ++$j)
-			$A[$i][$j] = pow($X[$i], $j);
-	for ($i=0; $i < sizeof($Y); ++$i)
-		$B[$i] = array($Y[$i]);
-	$matrixA = new Matrix($A);
-	$matrixB = new Matrix($B);
-	$C = $matrixA->solve($matrixB);
-	return $C->getMatrix(0, $n, 0, 1);
-}
-
-function printpoly( $C = null ) {
-	for($i = $C->m - 1; $i >= 0; --$i) {
-		$r = $C->get($i, 0);
-		if ( abs($r) <= pow(10, -9) )
-			$r = 0;
-		if ($i == $C->m - 1)
-			echo $r . "x<sup>$i</sup>";
-		else if ($i < $C->m - 1)
-			echo " + " . $r . "x<sup>$i</sup>";
-		else if ($i == 0)
-			echo " + " . $r;
-	}
-}
-
-$X = array(0,1,2,3,4,5);
-$Y = array(4,3,12,67,228, 579);
-$points = new Matrix(array($X, $Y));
-$points->toHTML();
-printpoly(polyfit($X, $Y, 4));
-
-echo '<hr />';
-
-$X = array(0,1,2,3,4,5);
-$Y = array(1,2,5,10,17, 26);
-$points = new Matrix(array($X, $Y));
-$points->toHTML();
-printpoly(polyfit($X, $Y, 2));
-
-echo '<hr />';
-
-$X = array(0,1,2,3,4,5,6);
-$Y = array(-90,-104,-178,-252,-26, 1160, 4446);
-$points = new Matrix(array($X, $Y));
-$points->toHTML();
-printpoly(polyfit($X, $Y, 5));
-
-echo '<hr />';
-
-$X = array(0,1,2,3,4);
-$Y = array(mt_rand(0, 10), mt_rand(40, 80), mt_rand(240, 400), mt_rand(1800, 2215), mt_rand(8000, 9000));
-$points = new Matrix(array($X, $Y));
-$points->toHTML();
-printpoly(polyfit($X, $Y, 3));
-?>
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/tile.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/tile.php
deleted file mode 100755
index 7a47ea57b..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/examples/tile.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-include "../Matrix.php";
-
-/**
-* Tiling of matrix X in [rowWise by colWise] dimension. Tiling
-* creates a larger matrix than the original data X. Example, if
-* X is to be tiled in a [3 x 4] manner, then:
-*
-*     /            \
-*     | X  X  X  X |
-* C = | X  X  X  X |
-*     | X  X  X  X |
-*     \           /
-*
-* @param X Matrix
-* @param rowWise int
-* @param colWise int
-* @return Matrix
-*/
-
-function tile(&$X, $rowWise, $colWise){
-
-  $xArray = $X->getArray();
-  print_r($xArray);
-
-  $countRow    = 0;
-  $countColumn = 0;
-
-  $m = $X->getRowDimension();
-  $n = $X->getColumnDimension();
-
-  if( $rowWise<1 || $colWise<1 ){
-    die("tile : Array index is out-of-bound.");
-  }
-
-  $newRowDim = $m*$rowWise;
-  $newColDim = $n*$colWise;
-
-  $result = array();
-
-  for($i=0 ; $i<$newRowDim; ++$i) {
-
-    $holder = array();
-
-    for($j=0 ; $j<$newColDim ; ++$j) {
-
-      $holder[$j] = $xArray[$countRow][$countColumn++];
-
-      // reset the column-index to zero to avoid reference to out-of-bound index in xArray[][]
-
-      if($countColumn == $n) { $countColumn = 0; }
-
-    } // end for
-
-    ++$countRow;
-
-    // reset the row-index to zero to avoid reference to out-of-bound index in xArray[][]
-
-    if($countRow == $m) { $countRow = 0; }
-
-    $result[$i] = $holder;
-
-  } // end for
-
-  return new Matrix($result);
-
-}
-
-
-$X =array(1,2,3,4,5,6,7,8,9);
-$nRow = 3;
-$nCol = 3;
-$tiled_matrix = tile(new Matrix($X), $nRow, $nCol);
-echo "<pre>";
-print_r($tiled_matrix);
-echo "</pre>";
-?>
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/tests/TestMatrix.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/tests/TestMatrix.php
deleted file mode 100755
index 5290ceb5a..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/tests/TestMatrix.php
+++ /dev/null
@@ -1,415 +0,0 @@
-<?php
-
-require_once "../Matrix.php";
-
-class TestMatrix {
-
-  function TestMatrix() {
-
-    // define test variables
-
-    $errorCount   = 0;
-    $warningCount = 0;
-    $columnwise   = array(1.,2.,3.,4.,5.,6.,7.,8.,9.,10.,11.,12.);
-    $rowwise      = array(1.,4.,7.,10.,2.,5.,8.,11.,3.,6.,9.,12.);
-    $avals        = array(array(1.,4.,7.,10.),array(2.,5.,8.,11.),array(3.,6.,9.,12.));
-    $rankdef      = $avals;
-    $tvals        = array(array(1.,2.,3.),array(4.,5.,6.),array(7.,8.,9.),array(10.,11.,12.));
-    $subavals     = array(array(5.,8.,11.),array(6.,9.,12.));
-    $rvals        = array(array(1.,4.,7.),array(2.,5.,8.,11.),array(3.,6.,9.,12.));
-    $pvals        = array(array(1.,1.,1.),array(1.,2.,3.),array(1.,3.,6.));
-    $ivals        = array(array(1.,0.,0.,0.),array(0.,1.,0.,0.),array(0.,0.,1.,0.));
-    $evals        = array(array(0.,1.,0.,0.),array(1.,0.,2.e-7,0.),array(0.,-2.e-7,0.,1.),array(0.,0.,1.,0.));
-    $square       = array(array(166.,188.,210.),array(188.,214.,240.),array(210.,240.,270.));
-    $sqSolution   = array(array(13.),array(15.));
-    $condmat      = array(array(1.,3.),array(7.,9.));
-    $rows         = 3;
-    $cols         = 4;
-    $invalidID    = 5; /* should trigger bad shape for construction with val        */
-    $raggedr      = 0; /* (raggedr,raggedc) should be out of bounds in ragged array */
-    $raggedc      = 4;
-    $validID      = 3; /* leading dimension of intended test Matrices               */
-    $nonconformld = 4; /* leading dimension which is valid, but nonconforming       */
-    $ib           = 1; /* index ranges for sub Matrix                               */
-    $ie           = 2;
-    $jb           = 1;
-    $je           = 3;
-    $rowindexset       = array(1,2);
-    $badrowindexset    = array(1,3);
-    $columnindexset    = array(1,2,3);
-    $badcolumnindexset = array(1,2,4);
-    $columnsummax      = 33.;
-    $rowsummax         = 30.;
-    $sumofdiagonals    = 15;
-    $sumofsquares      = 650;
-
-    /**
-    * Test matrix methods
-    */
-
-    /**
-    * Constructors and constructor-like methods:
-    *
-    *   Matrix(double[], int)
-    *   Matrix(double[][])
-    *   Matrix(int, int)
-    *   Matrix(int, int, double)
-    *   Matrix(int, int, double[][])
-    *   constructWithCopy(double[][])
-    *   random(int,int)
-    *   identity(int)
-    */
-    echo "<p>Testing constructors and constructor-like methods...</p>";
-
-    $A = new Matrix($columnwise, 3);
-    if($A instanceof Matrix) {
-      $this->try_success("Column-packed constructor...");
-    } else
-      $errorCount = $this->try_failure($errorCount, "Column-packed constructor...", "Unable to construct Matrix");
-
-    $T = new Matrix($tvals);
-    if($T instanceof Matrix)
-      $this->try_success("2D array constructor...");
-    else
-      $errorCount = $this->try_failure($errorCount, "2D array constructor...", "Unable to construct Matrix");
-
-    $A = new Matrix($columnwise, $validID);
-    $B = new Matrix($avals);
-    $tmp = $B->get(0,0);
-    $avals[0][0] = 0.0;
-    $C = $B->minus($A);
-    $avals[0][0] = $tmp;
-    $B = Matrix::constructWithCopy($avals);
-    $tmp = $B->get(0,0);
-    $avals[0][0] = 0.0;
-    /** check that constructWithCopy behaves properly **/
-    if ( ( $tmp - $B->get(0,0) ) != 0.0 )
-      $errorCount = $this->try_failure($errorCount,"constructWithCopy... ","copy not effected... data visible outside");
-    else
-      $this->try_success("constructWithCopy... ","");
-
-    $I = new Matrix($ivals);
-    if ( $this->checkMatrices($I,Matrix::identity(3,4)) )
-      $this->try_success("identity... ","");
-    else
-      $errorCount = $this->try_failure($errorCount,"identity... ","identity Matrix not successfully created");
-
-    /**
-    * Access Methods:
-    *
-    *   getColumnDimension()
-    *   getRowDimension()
-    *   getArray()
-    *   getArrayCopy()
-    *   getColumnPackedCopy()
-    *   getRowPackedCopy()
-    *   get(int,int)
-    *   getMatrix(int,int,int,int)
-    *   getMatrix(int,int,int[])
-    *   getMatrix(int[],int,int)
-    *   getMatrix(int[],int[])
-    *   set(int,int,double)
-    *   setMatrix(int,int,int,int,Matrix)
-    *   setMatrix(int,int,int[],Matrix)
-    *   setMatrix(int[],int,int,Matrix)
-    *   setMatrix(int[],int[],Matrix)
-    */
-    print "<p>Testing access methods...</p>";
-
-	$B = new Matrix($avals);
-	if($B->getRowDimension() == $rows)
-	  $this->try_success("getRowDimension...");
-	else
-	  $errorCount = $this->try_failure($errorCount, "getRowDimension...");
-
-	if($B->getColumnDimension() == $cols)
-	  $this->try_success("getColumnDimension...");
-	else
-	  $errorCount = $this->try_failure($errorCount, "getColumnDimension...");
-
-	$barray = $B->getArray();
-	if($this->checkArrays($barray, $avals))
-	  $this->try_success("getArray...");
-	else
-	  $errorCount = $this->try_failure($errorCount, "getArray...");
-
-	$bpacked = $B->getColumnPackedCopy();
-	if($this->checkArrays($bpacked, $columnwise))
-	  $this->try_success("getColumnPackedCopy...");
-	else
-	  $errorCount = $this->try_failure($errorCount, "getColumnPackedCopy...");
-
-	$bpacked = $B->getRowPackedCopy();
-	if($this->checkArrays($bpacked, $rowwise))
-	  $this->try_success("getRowPackedCopy...");
-	else
-	  $errorCount = $this->try_failure($errorCount, "getRowPackedCopy...");
-
-    /**
-    * Array-like methods:
-    *   minus
-    *   minusEquals
-    *   plus
-    *   plusEquals
-    *   arrayLeftDivide
-    *   arrayLeftDivideEquals
-    *   arrayRightDivide
-    *   arrayRightDivideEquals
-    *   arrayTimes
-    *   arrayTimesEquals
-    *   uminus
-    */
-    print "<p>Testing array-like methods...</p>";
-
-    /**
-    * I/O methods:
-    *   read
-    *   print
-    *   serializable:
-    *   writeObject
-    *   readObject
-    */
-    print "<p>Testing I/O methods...</p>";
-
-    /**
-    * Test linear algebra methods
-    */
-    echo "<p>Testing linear algebra methods...<p>";
-
-    $A = new Matrix($columnwise, 3);
-    if( $this->checkMatrices($A->transpose(), $T) )
-      $this->try_success("Transpose check...");
-    else
-      $errorCount = $this->try_failure($errorCount, "Transpose check...", "Matrices are not equal");
-
-    if($this->checkScalars($A->norm1(), $columnsummax))
-      $this->try_success("Maximum column sum...");
-    else
-      $errorCount = $this->try_failure($errorCount, "Maximum column sum...", "Incorrect: " . $A->norm1() . " != " . $columnsummax);
-
-    if($this->checkScalars($A->normInf(), $rowsummax))
-      $this->try_success("Maximum row sum...");
-    else
-      $errorCount = $this->try_failure($errorCount, "Maximum row sum...", "Incorrect: " . $A->normInf() . " != " . $rowsummax );
-
-    if($this->checkScalars($A->normF(), sqrt($sumofsquares)))
-      $this->try_success("Frobenius norm...");
-    else
-      $errorCount = $this->try_failure($errorCount, "Frobenius norm...", "Incorrect:" . $A->normF() . " != " . sqrt($sumofsquares));
-
-    if($this->checkScalars($A->trace(), $sumofdiagonals))
-      $this->try_success("Matrix trace...");
-    else
-      $errorCount = $this->try_failure($errorCount, "Matrix trace...", "Incorrect: " . $A->trace() . " != " . $sumofdiagonals);
-
-    $B = $A->getMatrix(0, $A->getRowDimension(), 0, $A->getRowDimension());
-    if( $B->det() == 0 )
-      $this->try_success("Matrix determinant...");
-    else
-      $errorCount = $this->try_failure($errorCount, "Matrix determinant...", "Incorrect: " . $B->det() . " != " . 0);
-
-    $A = new Matrix($columnwise,3);
-    $SQ = new Matrix($square);
-    if ($this->checkMatrices($SQ, $A->times($A->transpose())))
-      $this->try_success("times(Matrix)...");
-    else {
-      $errorCount = $this->try_failure($errorCount, "times(Matrix)...", "Unable to multiply matrices");
-      $SQ->toHTML();
-      $AT->toHTML();
-    }
-
-    $A = new Matrix($columnwise, 4);
-
-    $QR = $A->qr();
-    $R = $QR->getR();
-    $Q = $QR->getQ();
-    if($this->checkMatrices($A, $Q->times($R)))
-      $this->try_success("QRDecomposition...","");
-    else
-      $errorCount = $this->try_failure($errorCount,"QRDecomposition...","incorrect qr decomposition calculation");
-
-    $A = new Matrix($columnwise, 4);
-    $SVD = $A->svd();
-    $U = $SVD->getU();
-    $S = $SVD->getS();
-    $V = $SVD->getV();
-    if ($this->checkMatrices($A, $U->times($S->times($V->transpose()))))
-      $this->try_success("SingularValueDecomposition...","");
-    else
-      $errorCount = $this->try_failure($errorCount,"SingularValueDecomposition...","incorrect singular value decomposition calculation");
-
-    $n = $A->getColumnDimension();
-    $A = $A->getMatrix(0,$n-1,0,$n-1);
-    $A->set(0,0,0.);
-
-    $LU = $A->lu();
-    $L  = $LU->getL();
-    if ( $this->checkMatrices($A->getMatrix($LU->getPivot(),0,$n-1), $L->times($LU->getU())) )
-      $this->try_success("LUDecomposition...","");
-    else
-      $errorCount = $this->try_failure($errorCount,"LUDecomposition...","incorrect LU decomposition calculation");
-
-    $X = $A->inverse();
-    if ( $this->checkMatrices($A->times($X),Matrix::identity(3,3)) )
-       $this->try_success("inverse()...","");
-     else
-       $errorCount = $this->try_failure($errorCount, "inverse()...","incorrect inverse calculation");
-
-    $DEF = new Matrix($rankdef);
-    if($this->checkScalars($DEF->rank(), min($DEF->getRowDimension(), $DEF->getColumnDimension())-1))
-      $this->try_success("Rank...");
-    else
-      $this->try_failure("Rank...", "incorrect rank calculation");
-
-    $B = new Matrix($condmat);
-    $SVD = $B->svd();
-    $singularvalues = $SVD->getSingularValues();
-    if($this->checkScalars($B->cond(), $singularvalues[0]/$singularvalues[min($B->getRowDimension(), $B->getColumnDimension())-1]))
-      $this->try_success("Condition number...");
-    else
-      $this->try_failure("Condition number...", "incorrect condition number calculation");
-
-    $SUB = new Matrix($subavals);
-    $O   = new Matrix($SUB->getRowDimension(),1,1.0);
-    $SOL = new Matrix($sqSolution);
-    $SQ = $SUB->getMatrix(0,$SUB->getRowDimension()-1,0,$SUB->getRowDimension()-1);
-    if ( $this->checkMatrices($SQ->solve($SOL),$O) )
-      $this->try_success("solve()...","");
-    else
-     $errorCount = $this->try_failure($errorCount,"solve()...","incorrect lu solve calculation");
-
-    $A = new Matrix($pvals);
-    $Chol = $A->chol();
-    $L = $Chol->getL();
-    if ( $this->checkMatrices($A, $L->times($L->transpose())) )
-      $this->try_success("CholeskyDecomposition...","");
-    else
-      $errorCount = $this->try_failure($errorCount,"CholeskyDecomposition...","incorrect Cholesky decomposition calculation");
-
-    $X = $Chol->solve(Matrix::identity(3,3));
-    if ( $this->checkMatrices($A->times($X), Matrix::identity(3,3)) )
-      $this->try_success("CholeskyDecomposition solve()...","");
-    else
-      $errorCount = $this->try_failure($errorCount,"CholeskyDecomposition solve()...","incorrect Choleskydecomposition solve calculation");
-
-    $Eig = $A->eig();
-    $D = $Eig->getD();
-    $V = $Eig->getV();
-    if( $this->checkMatrices($A->times($V),$V->times($D)) )
-      $this->try_success("EigenvalueDecomposition (symmetric)...","");
-    else
-      $errorCount = $this->try_failure($errorCount,"EigenvalueDecomposition (symmetric)...","incorrect symmetric Eigenvalue decomposition calculation");
-
-    $A = new Matrix($evals);
-    $Eig = $A->eig();
-    $D = $Eig->getD();
-    $V = $Eig->getV();
-    if ( $this->checkMatrices($A->times($V),$V->times($D)) )
-      $this->try_success("EigenvalueDecomposition (nonsymmetric)...","");
-    else
-      $errorCount = $this->try_failure($errorCount,"EigenvalueDecomposition (nonsymmetric)...","incorrect nonsymmetric Eigenvalue decomposition calculation");
-
-	print("<b>{$errorCount} total errors</b>.");
-  }
-
-  /**
-  * Print appropriate messages for successful outcome try
-  * @param string $s
-  * @param string $e
-  */
-  function try_success($s, $e = "") {
-    print "> ". $s ."success<br />";
-    if ($e != "")
-      print "> Message: ". $e ."<br />";
-  }
-
-  /**
-  * Print appropriate messages for unsuccessful outcome try
-  * @param int $count
-  * @param string $s
-  * @param string $e
-  * @return int incremented counter
-  */
-  function try_failure($count, $s, $e="") {
-    print "> ". $s ."*** failure ***<br />> Message: ". $e ."<br />";
-    return ++$count;
-  }
-
-  /**
-  * Print appropriate messages for unsuccessful outcome try
-  * @param int $count
-  * @param string $s
-  * @param string $e
-  * @return int incremented counter
-  */
-  function try_warning($count, $s, $e="") {
-    print "> ". $s ."*** warning ***<br />> Message: ". $e ."<br />";
-    return ++$count;
-  }
-
-  /**
-  * Check magnitude of difference of "scalars".
-  * @param float $x
-  * @param float $y
-  */
-  function checkScalars($x, $y) {
-    $eps = pow(2.0,-52.0);
-    if ($x == 0 & abs($y) < 10*$eps) return;
-    if ($y == 0 & abs($x) < 10*$eps) return;
-    if (abs($x-$y) > 10 * $eps * max(abs($x),abs($y)))
-      return false;
-    else
-      return true;
-  }
-
-  /**
-  * Check norm of difference of "vectors".
-  * @param float $x[]
-  * @param float $y[]
-  */
-  function checkVectors($x, $y) {
-    $nx = count($x);
-    $ny = count($y);
-    if ($nx == $ny)
-      for($i=0; $i < $nx; ++$i)
-        $this->checkScalars($x[$i],$y[$i]);
-    else
-      die("Attempt to compare vectors of different lengths");
-  }
-
-  /**
-  * Check norm of difference of "arrays".
-  * @param float $x[][]
-  * @param float $y[][]
-  */
-  function checkArrays($x, $y) {
-    $A = new Matrix($x);
-    $B = new Matrix($y);
-    return $this->checkMatrices($A,$B);
-  }
-
-  /**
-  * Check norm of difference of "matrices".
-  * @param matrix $X
-  * @param matrix $Y
-  */
-  function checkMatrices($X = null, $Y = null) {
-    if( $X == null || $Y == null )
-      return false;
-
-    $eps = pow(2.0,-52.0);
-    if ($X->norm1() == 0. & $Y->norm1() < 10*$eps) return true;
-    if ($Y->norm1() == 0. & $X->norm1() < 10*$eps) return true;
-
-    $A = $X->minus($Y);
-
-    if ($A->norm1() > 1000 * $eps * max($X->norm1(),$Y->norm1()))
-      die("The norm of (X-Y) is too large: ".$A->norm1());
-    else
-      return true;
-  }
-
-}
-
-$test = new TestMatrix;
-?>
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/utils/Error.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/utils/Error.php
deleted file mode 100755
index e73252b3d..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/utils/Error.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	Error handling
- *	@author Michael Bommarito
- *	@version 01292005
- */
-
-//Language constant
-define('JAMALANG', 'EN');
-
-
-//All errors may be defined by the following format:
-//define('ExceptionName', N);
-//$error['lang'][ExceptionName] = 'Error message';
-$error = array();
-
-/*
-I've used Babelfish and a little poor knowledge of Romance/Germanic languages for the translations here.
-Feel free to correct anything that looks amiss to you.
-*/
-
-define('PolymorphicArgumentException', -1);
-$error['EN'][PolymorphicArgumentException] = "Invalid argument pattern for polymorphic function.";
-$error['FR'][PolymorphicArgumentException] = "Modèle inadmissible d'argument pour la fonction polymorphe.".
-$error['DE'][PolymorphicArgumentException] = "Unzulässiges Argumentmuster für polymorphe Funktion.";
-
-define('ArgumentTypeException', -2);
-$error['EN'][ArgumentTypeException] = "Invalid argument type.";
-$error['FR'][ArgumentTypeException] = "Type inadmissible d'argument.";
-$error['DE'][ArgumentTypeException] = "Unzulässige Argumentart.";
-
-define('ArgumentBoundsException', -3);
-$error['EN'][ArgumentBoundsException] = "Invalid argument range.";
-$error['FR'][ArgumentBoundsException] = "Gamme inadmissible d'argument.";
-$error['DE'][ArgumentBoundsException] = "Unzulässige Argumentstrecke.";
-
-define('MatrixDimensionException', -4);
-$error['EN'][MatrixDimensionException] = "Matrix dimensions are not equal.";
-$error['FR'][MatrixDimensionException] = "Les dimensions de Matrix ne sont pas égales.";
-$error['DE'][MatrixDimensionException] = "Matrixmaße sind nicht gleich.";
-
-define('PrecisionLossException', -5);
-$error['EN'][PrecisionLossException] = "Significant precision loss detected.";
-$error['FR'][PrecisionLossException] = "Perte significative de précision détectée.";
-$error['DE'][PrecisionLossException] = "Bedeutender Präzision Verlust ermittelte.";
-
-define('MatrixSPDException', -6);
-$error['EN'][MatrixSPDException] = "Can only perform operation on symmetric positive definite matrix.";
-$error['FR'][MatrixSPDException] = "Perte significative de précision détectée.";
-$error['DE'][MatrixSPDException] = "Bedeutender Präzision Verlust ermittelte.";
-
-define('MatrixSingularException', -7);
-$error['EN'][MatrixSingularException] = "Can only perform operation on singular matrix.";
-
-define('MatrixRankException', -8);
-$error['EN'][MatrixRankException] = "Can only perform operation on full-rank matrix.";
-
-define('ArrayLengthException', -9);
-$error['EN'][ArrayLengthException] = "Array length must be a multiple of m.";
-
-define('RowLengthException', -10);
-$error['EN'][RowLengthException] = "All rows must have the same length.";
-
-/**
- *	Custom error handler
- *	@param int $num Error number
- */
-function JAMAError($errorNumber = null) {
-	global $error;
-
-	if (isset($errorNumber)) {
-		if (isset($error[JAMALANG][$errorNumber])) {
-			return $error[JAMALANG][$errorNumber];
-		} else {
-			return $error['EN'][$errorNumber];
-		}
-	} else {
-		return ("Invalid argument to JAMAError()");
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/utils/Maths.php b/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/utils/Maths.php
deleted file mode 100755
index f5e2a3721..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/JAMA/utils/Maths.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- *	@package JAMA
- *
- *	Pythagorean Theorem:
- *
- *	a = 3
- *	b = 4
- *	r = sqrt(square(a) + square(b))
- *	r = 5
- *
- *	r = sqrt(a^2 + b^2) without under/overflow.
- */
-function hypo($a, $b) {
-	if (abs($a) > abs($b)) {
-		$r = $b / $a;
-		$r = abs($a) * sqrt(1 + $r * $r);
-	} elseif ($b != 0) {
-		$r = $a / $b;
-		$r = abs($b) * sqrt(1 + $r * $r);
-	} else {
-		$r = 0.0;
-	}
-	return $r;
-}	//	function hypo()
-
-
-/**
- *	Mike Bommarito's version.
- *	Compute n-dimensional hyotheneuse.
- *
-function hypot() {
-	$s = 0;
-	foreach (func_get_args() as $d) {
-		if (is_numeric($d)) {
-			$s += pow($d, 2);
-		} else {
-			throw new Exception(JAMAError(ArgumentTypeException));
-		}
-	}
-	return sqrt($s);
-}
-*/
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/OLE.php b/plugins/exportTypes/Excel/PHPExcel/Shared/OLE.php
deleted file mode 100755
index a5c8dd1d0..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/OLE.php
+++ /dev/null
@@ -1,531 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Xavier Noguer <xnoguer@php.net>                              |
-// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
-// +----------------------------------------------------------------------+
-//
-// $Id: OLE.php,v 1.13 2007/03/07 14:38:25 schmidt Exp $
-
-
-/**
-* Array for storing OLE instances that are accessed from
-* OLE_ChainedBlockStream::stream_open().
-* @var  array
-*/
-$GLOBALS['_OLE_INSTANCES'] = array();
-
-/**
-* OLE package base class.
-*
-* @author   Xavier Noguer <xnoguer@php.net>
-* @author   Christian Schmidt <schmidt@php.net>
-* @category   PHPExcel
-* @package    PHPExcel_Shared_OLE
-*/
-class PHPExcel_Shared_OLE
-{
-	const OLE_PPS_TYPE_ROOT   =      5;
-	const OLE_PPS_TYPE_DIR    =      1;
-	const OLE_PPS_TYPE_FILE   =      2;
-	const OLE_DATA_SIZE_SMALL = 0x1000;
-	const OLE_LONG_INT_SIZE   =      4;
-	const OLE_PPS_SIZE        =   0x80;
-
-	/**
-	 * The file handle for reading an OLE container
-	 * @var resource
-	*/
-	public $_file_handle;
-
-	/**
-	* Array of PPS's found on the OLE container
-	* @var array
-	*/
-	public $_list = array();
-
-	/**
-	 * Root directory of OLE container
-	 * @var OLE_PPS_Root
-	*/
-	public $root;
-
-	/**
-	 * Big Block Allocation Table
-	 * @var array  (blockId => nextBlockId)
-	*/
-	public $bbat;
-
-	/**
-	 * Short Block Allocation Table
-	 * @var array  (blockId => nextBlockId)
-	*/
-	public $sbat;
-
-	/**
-	 * Size of big blocks. This is usually 512.
-	 * @var  int  number of octets per block.
-	*/
-	public $bigBlockSize;
-
-	/**
-	 * Size of small blocks. This is usually 64.
-	 * @var  int  number of octets per block
-	*/
-	public $smallBlockSize;
-
-	/**
-	 * Reads an OLE container from the contents of the file given.
-	 *
-	 * @acces public
-	 * @param string $file
-	 * @return mixed true on success, PEAR_Error on failure
-	*/
-	public function read($file)
-	{
-		$fh = fopen($file, "r");
-		if (!$fh) {
-			throw new Exception("Can't open file $file");
-		}
-		$this->_file_handle = $fh;
-
-		$signature = fread($fh, 8);
-		if ("\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1" != $signature) {
-			throw new Exception("File doesn't seem to be an OLE container.");
-		}
-		fseek($fh, 28);
-		if (fread($fh, 2) != "\xFE\xFF") {
-			// This shouldn't be a problem in practice
-			throw new Exception("Only Little-Endian encoding is supported.");
-		}
-		// Size of blocks and short blocks in bytes
-		$this->bigBlockSize = pow(2, self::_readInt2($fh));
-		$this->smallBlockSize  = pow(2, self::_readInt2($fh));
-
-		// Skip UID, revision number and version number
-		fseek($fh, 44);
-		// Number of blocks in Big Block Allocation Table
-		$bbatBlockCount = self::_readInt4($fh);
-
-		// Root chain 1st block
-		$directoryFirstBlockId = self::_readInt4($fh);
-
-		// Skip unused bytes
-		fseek($fh, 56);
-		// Streams shorter than this are stored using small blocks
-		$this->bigBlockThreshold = self::_readInt4($fh);
-		// Block id of first sector in Short Block Allocation Table
-		$sbatFirstBlockId = self::_readInt4($fh);
-		// Number of blocks in Short Block Allocation Table
-		$sbbatBlockCount = self::_readInt4($fh);
-		// Block id of first sector in Master Block Allocation Table
-		$mbatFirstBlockId = self::_readInt4($fh);
-		// Number of blocks in Master Block Allocation Table
-		$mbbatBlockCount = self::_readInt4($fh);
-		$this->bbat = array();
-
-		// Remaining 4 * 109 bytes of current block is beginning of Master
-		// Block Allocation Table
-		$mbatBlocks = array();
-		for ($i = 0; $i < 109; ++$i) {
-			$mbatBlocks[] = self::_readInt4($fh);
-		}
-
-		// Read rest of Master Block Allocation Table (if any is left)
-		$pos = $this->_getBlockOffset($mbatFirstBlockId);
-		for ($i = 0; $i < $mbbatBlockCount; ++$i) {
-			fseek($fh, $pos);
-			for ($j = 0; $j < $this->bigBlockSize / 4 - 1; ++$j) {
-				$mbatBlocks[] = self::_readInt4($fh);
-			}
-			// Last block id in each block points to next block
-			$pos = $this->_getBlockOffset(self::_readInt4($fh));
-		}
-
-		// Read Big Block Allocation Table according to chain specified by
-		// $mbatBlocks
-		for ($i = 0; $i < $bbatBlockCount; ++$i) {
-			$pos = $this->_getBlockOffset($mbatBlocks[$i]);
-			fseek($fh, $pos);
-			for ($j = 0 ; $j < $this->bigBlockSize / 4; ++$j) {
-				$this->bbat[] = self::_readInt4($fh);
-			}
-		}
-
-		// Read short block allocation table (SBAT)
-		$this->sbat = array();
-		$shortBlockCount = $sbbatBlockCount * $this->bigBlockSize / 4;
-		$sbatFh = $this->getStream($sbatFirstBlockId);
-		for ($blockId = 0; $blockId < $shortBlockCount; ++$blockId) {
-			$this->sbat[$blockId] = self::_readInt4($sbatFh);
-		}
-		fclose($sbatFh);
-
-		$this->_readPpsWks($directoryFirstBlockId);
-
-		return true;
-	}
-
-	/**
-	 * @param  int  block id
-	 * @param  int  byte offset from beginning of file
-	 * @access public
-	 */
-	public function _getBlockOffset($blockId)
-	{
-		return 512 + $blockId * $this->bigBlockSize;
-	}
-
-	/**
-	* Returns a stream for use with fread() etc. External callers should
-	* use PHPExcel_Shared_OLE_PPS_File::getStream().
-	* @param   int|PPS   block id or PPS
-	* @return  resource  read-only stream
-	*/
-	public function getStream($blockIdOrPps)
-	{
-		static $isRegistered = false;
-		if (!$isRegistered) {
-			stream_wrapper_register('ole-chainedblockstream',
-				'PHPExcel_Shared_OLE_ChainedBlockStream');
-			$isRegistered = true;
-		}
-
-		// Store current instance in global array, so that it can be accessed
-		// in OLE_ChainedBlockStream::stream_open().
-		// Object is removed from self::$instances in OLE_Stream::close().
-		$GLOBALS['_OLE_INSTANCES'][] = $this;
-		$instanceId = end(array_keys($GLOBALS['_OLE_INSTANCES']));
-
-		$path = 'ole-chainedblockstream://oleInstanceId=' . $instanceId;
-		if ($blockIdOrPps instanceof PHPExcel_Shared_OLE_PPS) {
-			$path .= '&blockId=' . $blockIdOrPps->_StartBlock;
-			$path .= '&size=' . $blockIdOrPps->Size;
-		} else {
-			$path .= '&blockId=' . $blockIdOrPps;
-		}
-		return fopen($path, 'r');
-	}
-
-	/**
-	 * Reads a signed char.
-	 * @param   resource  file handle
-	 * @return  int
-	 * @access public
-	 */
-	private static function _readInt1($fh)
-	{
-		list(, $tmp) = unpack("c", fread($fh, 1));
-		return $tmp;
-	}
-
-	/**
-	 * Reads an unsigned short (2 octets).
-	 * @param   resource  file handle
-	 * @return  int
-	 * @access public
-	 */
-	private static function _readInt2($fh)
-	{
-		list(, $tmp) = unpack("v", fread($fh, 2));
-		return $tmp;
-	}
-
-	/**
-	 * Reads an unsigned long (4 octets).
-	 * @param   resource  file handle
-	 * @return  int
-	 * @access public
-	 */
-	private static function _readInt4($fh)
-	{
-		list(, $tmp) = unpack("V", fread($fh, 4));
-		return $tmp;
-	}
-
-	/**
-	* Gets information about all PPS's on the OLE container from the PPS WK's
-	* creates an OLE_PPS object for each one.
-	*
-	* @access public
-	* @param  integer  the block id of the first block
-	* @return mixed true on success, PEAR_Error on failure
-	*/
-	public function _readPpsWks($blockId)
-	{
-		$fh = $this->getStream($blockId);
-		for ($pos = 0; ; $pos += 128) {
-			fseek($fh, $pos, SEEK_SET);
-			$nameUtf16 = fread($fh, 64);
-			$nameLength = self::_readInt2($fh);
-			$nameUtf16 = substr($nameUtf16, 0, $nameLength - 2);
-			// Simple conversion from UTF-16LE to ISO-8859-1
-			$name = str_replace("\x00", "", $nameUtf16);
-			$type = self::_readInt1($fh);
-			switch ($type) {
-			case self::OLE_PPS_TYPE_ROOT:
-				$pps = new PHPExcel_Shared_OLE_PPS_Root(null, null, array());
-				$this->root = $pps;
-				break;
-			case self::OLE_PPS_TYPE_DIR:
-				$pps = new PHPExcel_Shared_OLE_PPS(null, null, null, null, null,
-								   null, null, null, null, array());
-				break;
-			case self::OLE_PPS_TYPE_FILE:
-				$pps = new PHPExcel_Shared_OLE_PPS_File($name);
-				break;
-			default:
-				continue;
-			}
-			fseek($fh, 1, SEEK_CUR);
-			$pps->Type    = $type;
-			$pps->Name    = $name;
-			$pps->PrevPps = self::_readInt4($fh);
-			$pps->NextPps = self::_readInt4($fh);
-			$pps->DirPps  = self::_readInt4($fh);
-			fseek($fh, 20, SEEK_CUR);
-			$pps->Time1st = self::OLE2LocalDate(fread($fh, 8));
-			$pps->Time2nd = self::OLE2LocalDate(fread($fh, 8));
-			$pps->_StartBlock = self::_readInt4($fh);
-			$pps->Size = self::_readInt4($fh);
-			$pps->No = count($this->_list);
-			$this->_list[] = $pps;
-
-			// check if the PPS tree (starting from root) is complete
-			if (isset($this->root) &&
-				$this->_ppsTreeComplete($this->root->No)) {
-
-				break;
-			}
-		}
-		fclose($fh);
-
-		// Initialize $pps->children on directories
-		foreach ($this->_list as $pps) {
-			if ($pps->Type == self::OLE_PPS_TYPE_DIR || $pps->Type == self::OLE_PPS_TYPE_ROOT) {
-				$nos = array($pps->DirPps);
-				$pps->children = array();
-				while ($nos) {
-					$no = array_pop($nos);
-					if ($no != -1) {
-						$childPps = $this->_list[$no];
-						$nos[] = $childPps->PrevPps;
-						$nos[] = $childPps->NextPps;
-						$pps->children[] = $childPps;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	* It checks whether the PPS tree is complete (all PPS's read)
-	* starting with the given PPS (not necessarily root)
-	*
-	* @access public
-	* @param integer $index The index of the PPS from which we are checking
-	* @return boolean Whether the PPS tree for the given PPS is complete
-	*/
-	public function _ppsTreeComplete($index)
-	{
-		return isset($this->_list[$index]) &&
-			   ($pps = $this->_list[$index]) &&
-			   ($pps->PrevPps == -1 ||
-				$this->_ppsTreeComplete($pps->PrevPps)) &&
-			   ($pps->NextPps == -1 ||
-				$this->_ppsTreeComplete($pps->NextPps)) &&
-			   ($pps->DirPps == -1 ||
-				$this->_ppsTreeComplete($pps->DirPps));
-	}
-
-	/**
-	* Checks whether a PPS is a File PPS or not.
-	* If there is no PPS for the index given, it will return false.
-	*
-	* @access public
-	* @param integer $index The index for the PPS
-	* @return bool true if it's a File PPS, false otherwise
-	*/
-	public function isFile($index)
-	{
-		if (isset($this->_list[$index])) {
-			return ($this->_list[$index]->Type == self::OLE_PPS_TYPE_FILE);
-		}
-		return false;
-	}
-
-	/**
-	* Checks whether a PPS is a Root PPS or not.
-	* If there is no PPS for the index given, it will return false.
-	*
-	* @access public
-	* @param integer $index The index for the PPS.
-	* @return bool true if it's a Root PPS, false otherwise
-	*/
-	public function isRoot($index)
-	{
-		if (isset($this->_list[$index])) {
-			return ($this->_list[$index]->Type == self::OLE_PPS_TYPE_ROOT);
-		}
-		return false;
-	}
-
-	/**
-	* Gives the total number of PPS's found in the OLE container.
-	*
-	* @access public
-	* @return integer The total number of PPS's found in the OLE container
-	*/
-	public function ppsTotal()
-	{
-		return count($this->_list);
-	}
-
-	/**
-	* Gets data from a PPS
-	* If there is no PPS for the index given, it will return an empty string.
-	*
-	* @access public
-	* @param integer $index    The index for the PPS
-	* @param integer $position The position from which to start reading
-	*                          (relative to the PPS)
-	* @param integer $length   The amount of bytes to read (at most)
-	* @return string The binary string containing the data requested
-	* @see OLE_PPS_File::getStream()
-	*/
-	public function getData($index, $position, $length)
-	{
-		// if position is not valid return empty string
-		if (!isset($this->_list[$index]) || ($position >= $this->_list[$index]->Size) || ($position < 0)) {
-			return '';
-		}
-		$fh = $this->getStream($this->_list[$index]);
-		$data = stream_get_contents($fh, $length, $position);
-		fclose($fh);
-		return $data;
-	}
-
-	/**
-	* Gets the data length from a PPS
-	* If there is no PPS for the index given, it will return 0.
-	*
-	* @access public
-	* @param integer $index    The index for the PPS
-	* @return integer The amount of bytes in data the PPS has
-	*/
-	public function getDataLength($index)
-	{
-		if (isset($this->_list[$index])) {
-			return $this->_list[$index]->Size;
-		}
-		return 0;
-	}
-
-	/**
-	* Utility function to transform ASCII text to Unicode
-	*
-	* @access public
-	* @static
-	* @param string $ascii The ASCII string to transform
-	* @return string The string in Unicode
-	*/
-	public static function Asc2Ucs($ascii)
-	{
-		$rawname = '';
-		for ($i = 0; $i < strlen($ascii); ++$i) {
-			$rawname .= $ascii{$i} . "\x00";
-		}
-		return $rawname;
-	}
-
-	/**
-	* Utility function
-	* Returns a string for the OLE container with the date given
-	*
-	* @access public
-	* @static
-	* @param integer $date A timestamp
-	* @return string The string for the OLE container
-	*/
-	public static function LocalDate2OLE($date = null)
-	{
-		if (!isset($date)) {
-			return "\x00\x00\x00\x00\x00\x00\x00\x00";
-		}
-
-		// factor used for separating numbers into 4 bytes parts
-		$factor = pow(2, 32);
-
-		// days from 1-1-1601 until the beggining of UNIX era
-		$days = 134774;
-		// calculate seconds
-		$big_date = $days*24*3600 + gmmktime(date("H",$date),date("i",$date),date("s",$date),
-											 date("m",$date),date("d",$date),date("Y",$date));
-		// multiply just to make MS happy
-		$big_date *= 10000000;
-
-		$high_part = floor($big_date / $factor);
-		// lower 4 bytes
-		$low_part = floor((($big_date / $factor) - $high_part) * $factor);
-
-		// Make HEX string
-		$res = '';
-
-		for ($i = 0; $i < 4; ++$i) {
-			$hex = $low_part % 0x100;
-			$res .= pack('c', $hex);
-			$low_part /= 0x100;
-		}
-		for ($i = 0; $i < 4; ++$i) {
-			$hex = $high_part % 0x100;
-			$res .= pack('c', $hex);
-			$high_part /= 0x100;
-		}
-		return $res;
-	}
-
-	/**
-	* Returns a timestamp from an OLE container's date
-	*
-	* @access public
-	* @static
-	* @param integer $string A binary string with the encoded date
-	* @return string The timestamp corresponding to the string
-	*/
-	public static function OLE2LocalDate($string)
-	{
-		if (strlen($string) != 8) {
-			return new PEAR_Error("Expecting 8 byte string");
-		}
-
-		// factor used for separating numbers into 4 bytes parts
-		$factor = pow(2,32);
-		list(, $high_part) = unpack('V', substr($string, 4, 4));
-		list(, $low_part) = unpack('V', substr($string, 0, 4));
-
-		$big_date = ($high_part * $factor) + $low_part;
-		// translate to seconds
-		$big_date /= 10000000;
-
-		// days from 1-1-1601 until the beggining of UNIX era
-		$days = 134774;
-
-		// translate to seconds from beggining of UNIX era
-		$big_date -= $days * 24 * 3600;
-		return floor($big_date);
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/ChainedBlockStream.php b/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/ChainedBlockStream.php
deleted file mode 100755
index 77b8ff8a2..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/ChainedBlockStream.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (C) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_OLE
- * @copyright  Copyright (c) 2006 - 2007 Christian Schmidt
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version ##VERSION##, ##DATE##
- */
-
-/**
- * PHPExcel_Shared_OLE_ChainedBlockStream
- *
- * Stream wrapper for reading data stored in an OLE file. Implements methods
- * for PHP's stream_wrapper_register(). For creating streams using this
- * wrapper, use PHPExcel_Shared_OLE_PPS_File::getStream().
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_OLE
- */
-class PHPExcel_Shared_OLE_ChainedBlockStream
-{
-	/**
-	 * The OLE container of the file that is being read.
-	 * @var OLE
-	 */
-	public $ole;
-
-	/**
-	 * Parameters specified by fopen().
-	 * @var array
-	 */
-	public $params;
-
-	/**
-	 * The binary data of the file.
-	 * @var  string
-	 */
-	public $data;
-
-	/**
-	 * The file pointer.
-	 * @var  int  byte offset
-	 */
-	public $pos;
-
-	/**
-	 * Implements support for fopen().
-	 * For creating streams using this wrapper, use OLE_PPS_File::getStream().
-	 *
-	 * @param	string	$path			resource name including scheme, e.g.
-	 *									ole-chainedblockstream://oleInstanceId=1
-	 * @param	string	$mode			only "r" is supported
-	 * @param	int		$options		mask of STREAM_REPORT_ERRORS and STREAM_USE_PATH
-	 * @param	string  &$openedPath	absolute path of the opened stream (out parameter)
-	 * @return	bool    true on success
-	 */
-	public function stream_open($path, $mode, $options, &$openedPath)
-	{
-		if ($mode != 'r') {
-			if ($options & STREAM_REPORT_ERRORS) {
-				trigger_error('Only reading is supported', E_USER_WARNING);
-			}
-			return false;
-		}
-
-		// 25 is length of "ole-chainedblockstream://"
-		parse_str(substr($path, 25), $this->params);
-		if (!isset($this->params['oleInstanceId'],
-				   $this->params['blockId'],
-				   $GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']])) {
-
-			if ($options & STREAM_REPORT_ERRORS) {
-				trigger_error('OLE stream not found', E_USER_WARNING);
-			}
-			return false;
-		}
-		$this->ole = $GLOBALS['_OLE_INSTANCES'][$this->params['oleInstanceId']];
-
-		$blockId = $this->params['blockId'];
-		$this->data = '';
-		if (isset($this->params['size']) &&
-			$this->params['size'] < $this->ole->bigBlockThreshold &&
-			$blockId != $this->ole->root->_StartBlock) {
-
-			// Block id refers to small blocks
-			$rootPos = $this->ole->_getBlockOffset($this->ole->root->_StartBlock);
-			while ($blockId != -2) {
-				$pos = $rootPos + $blockId * $this->ole->bigBlockSize;
-				$blockId = $this->ole->sbat[$blockId];
-				fseek($this->ole->_file_handle, $pos);
-				$this->data .= fread($this->ole->_file_handle, $this->ole->bigBlockSize);
-			}
-		} else {
-			// Block id refers to big blocks
-			while ($blockId != -2) {
-				$pos = $this->ole->_getBlockOffset($blockId);
-				fseek($this->ole->_file_handle, $pos);
-				$this->data .= fread($this->ole->_file_handle, $this->ole->bigBlockSize);
-				$blockId = $this->ole->bbat[$blockId];
-			}
-		}
-		if (isset($this->params['size'])) {
-			$this->data = substr($this->data, 0, $this->params['size']);
-		}
-
-		if ($options & STREAM_USE_PATH) {
-			$openedPath = $path;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Implements support for fclose().
-	 *
-	 */
-	public function stream_close()
-	{
-		$this->ole = null;
-		unset($GLOBALS['_OLE_INSTANCES']);
-	}
-
-	/**
-	 * Implements support for fread(), fgets() etc.
-	 *
-	 * @param   int		$count	maximum number of bytes to read
-	 * @return  string
-	 */
-	public function stream_read($count)
-	{
-		if ($this->stream_eof()) {
-			return false;
-		}
-		$s = substr($this->data, $this->pos, $count);
-		$this->pos += $count;
-		return $s;
-	}
-
-	/**
-	 * Implements support for feof().
-	 *
-	 * @return  bool  TRUE if the file pointer is at EOF; otherwise FALSE
-	 */
-	public function stream_eof()
-	{
-		$eof = $this->pos >= strlen($this->data);
-		// Workaround for bug in PHP 5.0.x: http://bugs.php.net/27508
-		if (version_compare(PHP_VERSION, '5.0', '>=') &&
-			version_compare(PHP_VERSION, '5.1', '<')) {
-
-		   $eof = !$eof;
-		}
-		return $eof;
-	}
-
-	/**
-	 * Returns the position of the file pointer, i.e. its offset into the file
-	 * stream. Implements support for ftell().
-	 *
-	 * @return  int
-	 */
-	public function stream_tell()
-	{
-		return $this->pos;
-	}
-
-	/**
-	 * Implements support for fseek().
-	 *
-	 * @param	int		$offset	byte offset
-	 * @param	int		$whence	SEEK_SET, SEEK_CUR or SEEK_END
-	 * @return	bool
-	 */
-	public function stream_seek($offset, $whence)
-	{
-		if ($whence == SEEK_SET && $offset >= 0) {
-			$this->pos = $offset;
-		} elseif ($whence == SEEK_CUR && -$offset <= $this->pos) {
-			$this->pos += $offset;
-		} elseif ($whence == SEEK_END && -$offset <= sizeof($this->data)) {
-			$this->pos = strlen($this->data) + $offset;
-		} else {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Implements support for fstat(). Currently the only supported field is
-	 * "size".
-	 * @return  array
-	 */
-	public function stream_stat()
-	{
-		return array(
-			'size' => strlen($this->data),
-			);
-	}
-
-	// Methods used by stream_wrapper_register() that are not implemented:
-	// bool stream_flush ( void )
-	// int stream_write ( string data )
-	// bool rename ( string path_from, string path_to )
-	// bool mkdir ( string path, int mode, int options )
-	// bool rmdir ( string path, int options )
-	// bool dir_opendir ( string path, int options )
-	// array url_stat ( string path, int flags )
-	// string dir_readdir ( void )
-	// bool dir_rewinddir ( void )
-	// bool dir_closedir ( void )
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/PPS.php b/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/PPS.php
deleted file mode 100755
index 4db0ae4e2..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/PPS.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Xavier Noguer <xnoguer@php.net>                              |
-// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
-// +----------------------------------------------------------------------+
-//
-// $Id: PPS.php,v 1.7 2007/02/13 21:00:42 schmidt Exp $
-
-
-/**
-* Class for creating PPS's for OLE containers
-*
-* @author   Xavier Noguer <xnoguer@php.net>
-* @category PHPExcel
-* @package  PHPExcel_Shared_OLE
-*/
-class PHPExcel_Shared_OLE_PPS
-{
-	/**
-	* The PPS index
-	* @var integer
-	*/
-	public $No;
-
-	/**
-	* The PPS name (in Unicode)
-	* @var string
-	*/
-	public $Name;
-
-	/**
-	* The PPS type. Dir, Root or File
-	* @var integer
-	*/
-	public $Type;
-
-	/**
-	* The index of the previous PPS
-	* @var integer
-	*/
-	public $PrevPps;
-
-	/**
-	* The index of the next PPS
-	* @var integer
-	*/
-	public $NextPps;
-
-	/**
-	* The index of it's first child if this is a Dir or Root PPS
-	* @var integer
-	*/
-	public $DirPps;
-
-	/**
-	* A timestamp
-	* @var integer
-	*/
-	public $Time1st;
-
-	/**
-	* A timestamp
-	* @var integer
-	*/
-	public $Time2nd;
-
-	/**
-	* Starting block (small or big) for this PPS's data  inside the container
-	* @var integer
-	*/
-	public $_StartBlock;
-
-	/**
-	* The size of the PPS's data (in bytes)
-	* @var integer
-	*/
-	public $Size;
-
-	/**
-	* The PPS's data (only used if it's not using a temporary file)
-	* @var string
-	*/
-	public $_data;
-
-	/**
-	* Array of child PPS's (only used by Root and Dir PPS's)
-	* @var array
-	*/
-	public $children = array();
-
-	/**
-	* Pointer to OLE container
-	* @var OLE
-	*/
-	public $ole;
-
-	/**
-	* The constructor
-	*
-	* @access public
-	* @param integer $No   The PPS index
-	* @param string  $name The PPS name
-	* @param integer $type The PPS type. Dir, Root or File
-	* @param integer $prev The index of the previous PPS
-	* @param integer $next The index of the next PPS
-	* @param integer $dir  The index of it's first child if this is a Dir or Root PPS
-	* @param integer $time_1st A timestamp
-	* @param integer $time_2nd A timestamp
-	* @param string  $data  The (usually binary) source data of the PPS
-	* @param array   $children Array containing children PPS for this PPS
-	*/
-	public function __construct($No, $name, $type, $prev, $next, $dir, $time_1st, $time_2nd, $data, $children)
-	{
-		$this->No      = $No;
-		$this->Name    = $name;
-		$this->Type    = $type;
-		$this->PrevPps = $prev;
-		$this->NextPps = $next;
-		$this->DirPps  = $dir;
-		$this->Time1st = $time_1st;
-		$this->Time2nd = $time_2nd;
-		$this->_data      = $data;
-		$this->children   = $children;
-		if ($data != '') {
-			$this->Size = strlen($data);
-		} else {
-			$this->Size = 0;
-		}
-	}
-
-	/**
-	* Returns the amount of data saved for this PPS
-	*
-	* @access public
-	* @return integer The amount of data (in bytes)
-	*/
-	public function _DataLen()
-	{
-		if (!isset($this->_data)) {
-			return 0;
-		}
-		//if (isset($this->_PPS_FILE)) {
-		//	fseek($this->_PPS_FILE, 0);
-		//	$stats = fstat($this->_PPS_FILE);
-		//	return $stats[7];
-		//} else {
-			return strlen($this->_data);
-		//}
-	}
-
-	/**
-	* Returns a string with the PPS's WK (What is a WK?)
-	*
-	* @access public
-	* @return string The binary string
-	*/
-	public function _getPpsWk()
-	{
-		$ret = str_pad($this->Name,64,"\x00");
-
-		$ret .= pack("v", strlen($this->Name) + 2)  // 66
-			  . pack("c", $this->Type)              // 67
-			  . pack("c", 0x00) //UK                // 68
-			  . pack("V", $this->PrevPps) //Prev    // 72
-			  . pack("V", $this->NextPps) //Next    // 76
-			  . pack("V", $this->DirPps)  //Dir     // 80
-			  . "\x00\x09\x02\x00"                  // 84
-			  . "\x00\x00\x00\x00"                  // 88
-			  . "\xc0\x00\x00\x00"                  // 92
-			  . "\x00\x00\x00\x46"                  // 96 // Seems to be ok only for Root
-			  . "\x00\x00\x00\x00"                  // 100
-			  . PHPExcel_Shared_OLE::LocalDate2OLE($this->Time1st)       // 108
-			  . PHPExcel_Shared_OLE::LocalDate2OLE($this->Time2nd)       // 116
-			  . pack("V", isset($this->_StartBlock)?
-						$this->_StartBlock:0)        // 120
-			  . pack("V", $this->Size)               // 124
-			  . pack("V", 0);                        // 128
-		return $ret;
-	}
-
-	/**
-	* Updates index and pointers to previous, next and children PPS's for this
-	* PPS. I don't think it'll work with Dir PPS's.
-	*
-	* @access public
-	* @param array &$raList Reference to the array of PPS's for the whole OLE
-	*                          container
-	* @return integer          The index for this PPS
-	*/
-	public static function _savePpsSetPnt(&$raList, $to_save, $depth = 0)
-	{
-		if ( !is_array($to_save) || (empty($to_save)) ) {
-			return 0xFFFFFFFF;
-		} elseif( count($to_save) == 1 ) {
-			$cnt = count($raList);
-			// If the first entry, it's the root... Don't clone it!
-			$raList[$cnt] = ( $depth == 0 ) ? $to_save[0] : clone $to_save[0];
-			$raList[$cnt]->No = $cnt;
-			$raList[$cnt]->PrevPps = 0xFFFFFFFF;
-			$raList[$cnt]->NextPps = 0xFFFFFFFF;
-			$raList[$cnt]->DirPps  = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
-		} else {
-			$iPos  = floor(count($to_save) / 2);
-			$aPrev = array_slice($to_save, 0, $iPos);
-			$aNext = array_slice($to_save, $iPos + 1);
-			$cnt   = count($raList);
-			// If the first entry, it's the root... Don't clone it!
-			$raList[$cnt] = ( $depth == 0 ) ? $to_save[$iPos] : clone $to_save[$iPos];
-			$raList[$cnt]->No = $cnt;
-			$raList[$cnt]->PrevPps = self::_savePpsSetPnt($raList, $aPrev, $depth++);
-			$raList[$cnt]->NextPps = self::_savePpsSetPnt($raList, $aNext, $depth++);
-			$raList[$cnt]->DirPps  = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
-
-		}
-		return $cnt;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/PPS/File.php b/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/PPS/File.php
deleted file mode 100755
index f061f568c..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/PPS/File.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Xavier Noguer <xnoguer@php.net>                              |
-// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
-// +----------------------------------------------------------------------+
-//
-// $Id: File.php,v 1.11 2007/02/13 21:00:42 schmidt Exp $
-
-
-/**
-* Class for creating File PPS's for OLE containers
-*
-* @author   Xavier Noguer <xnoguer@php.net>
-* @category PHPExcel
-* @package  PHPExcel_Shared_OLE
-*/
-class PHPExcel_Shared_OLE_PPS_File extends PHPExcel_Shared_OLE_PPS
-	{
-	/**
-	* The constructor
-	*
-	* @access public
-	* @param string $name The name of the file (in Unicode)
-	* @see OLE::Asc2Ucs()
-	*/
-	public function __construct($name)
-	{
-		parent::__construct(
-			null,
-			$name,
-			PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE,
-			null,
-			null,
-			null,
-			null,
-			null,
-			'',
-			array());
-	}
-
-	/**
-	* Initialization method. Has to be called right after OLE_PPS_File().
-	*
-	* @access public
-	* @return mixed true on success
-	*/
-	public function init()
-	{
-		return true;
-	}
-
-	/**
-	* Append data to PPS
-	*
-	* @access public
-	* @param string $data The data to append
-	*/
-	public function append($data)
-	{
-		$this->_data .= $data;
-	}
-
-	/**
-	 * Returns a stream for reading this file using fread() etc.
-	 * @return  resource  a read-only stream
-	 */
-	public function getStream()
-	{
-		$this->ole->getStream($this);
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/PPS/Root.php b/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/PPS/Root.php
deleted file mode 100755
index 9a2141672..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/OLE/PPS/Root.php
+++ /dev/null
@@ -1,467 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Xavier Noguer <xnoguer@php.net>                              |
-// | Based on OLE::Storage_Lite by Kawai, Takanori                        |
-// +----------------------------------------------------------------------+
-//
-// $Id: Root.php,v 1.9 2005/04/23 21:53:49 dufuz Exp $
-
-
-/**
-* Class for creating Root PPS's for OLE containers
-*
-* @author   Xavier Noguer <xnoguer@php.net>
-* @category PHPExcel
-* @package  PHPExcel_Shared_OLE
-*/
-class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
-	{
-
-	/**
-	 * Directory for temporary files
-	 * @var string
-	 */
-	protected $_tmp_dir		= NULL;
-
-	/**
-	 * @param integer $time_1st A timestamp
-	 * @param integer $time_2nd A timestamp
-	 */
-	public function __construct($time_1st, $time_2nd, $raChild)
-	{
-		$this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
-
-		parent::__construct(
-		   null,
-		   PHPExcel_Shared_OLE::Asc2Ucs('Root Entry'),
-		   PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT,
-		   null,
-		   null,
-		   null,
-		   $time_1st,
-		   $time_2nd,
-		   null,
-		   $raChild);
-	}
-
-	/**
-	* Method for saving the whole OLE container (including files).
-	* In fact, if called with an empty argument (or '-'), it saves to a
-	* temporary file and then outputs it's contents to stdout.
-	* If a resource pointer to a stream created by fopen() is passed
-	* it will be used, but you have to close such stream by yourself.
-	*
-	* @param string|resource $filename The name of the file or stream where to save the OLE container.
-	* @access public
-	* @return mixed true on success
-	*/
-	public function save($filename)
-	{
-		// Initial Setting for saving
-		$this->_BIG_BLOCK_SIZE  = pow(2,
-					  ((isset($this->_BIG_BLOCK_SIZE))? self::_adjust2($this->_BIG_BLOCK_SIZE)  : 9));
-		$this->_SMALL_BLOCK_SIZE= pow(2,
-					  ((isset($this->_SMALL_BLOCK_SIZE))?  self::_adjust2($this->_SMALL_BLOCK_SIZE): 6));
-
-		if (is_resource($filename)) {
-		    $this->_FILEH_ = $filename;
-		} else if ($filename == '-' || $filename == '') {
-			if ($this->_tmp_dir === NULL)
-				$this->_tmp_dir = PHPExcel_Shared_File::sys_get_temp_dir();
-			$this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_Root");
-			$this->_FILEH_ = fopen($this->_tmp_filename,"w+b");
-			if ($this->_FILEH_ == false) {
-				throw new Exception("Can't create temporary file.");
-			}
-		} else {
-			$this->_FILEH_ = fopen($filename, "wb");
-		}
-		if ($this->_FILEH_ == false) {
-			throw new Exception("Can't open $filename. It may be in use or protected.");
-		}
-		// Make an array of PPS's (for Save)
-		$aList = array();
-		PHPExcel_Shared_OLE_PPS::_savePpsSetPnt($aList, array($this));
-		// calculate values for header
-		list($iSBDcnt, $iBBcnt, $iPPScnt) = $this->_calcSize($aList); //, $rhInfo);
-		// Save Header
-		$this->_saveHeader($iSBDcnt, $iBBcnt, $iPPScnt);
-
-		// Make Small Data string (write SBD)
-		$this->_data = $this->_makeSmallData($aList);
-
-		// Write BB
-		$this->_saveBigData($iSBDcnt, $aList);
-		// Write PPS
-		$this->_savePps($aList);
-		// Write Big Block Depot and BDList and Adding Header informations
-		$this->_saveBbd($iSBDcnt, $iBBcnt, $iPPScnt);
-
-		if (!is_resource($filename)) {
- 			fclose($this->_FILEH_);
- 		}
-
-		return true;
-	}
-
-	/**
-	* Calculate some numbers
-	*
-	* @access public
-	* @param array $raList Reference to an array of PPS's
-	* @return array The array of numbers
-	*/
-	public function _calcSize(&$raList)
-	{
-		// Calculate Basic Setting
-		list($iSBDcnt, $iBBcnt, $iPPScnt) = array(0,0,0);
-		$iSmallLen = 0;
-		$iSBcnt = 0;
-		$iCount = count($raList);
-		for ($i = 0; $i < $iCount; ++$i) {
-			if ($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE) {
-				$raList[$i]->Size = $raList[$i]->_DataLen();
-				if ($raList[$i]->Size < PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) {
-					$iSBcnt += floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
-								  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
-				} else {
-					$iBBcnt += (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
-						(($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
-				}
-			}
-		}
-		$iSmallLen = $iSBcnt * $this->_SMALL_BLOCK_SIZE;
-		$iSlCnt = floor($this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE);
-		$iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt)? 1:0);
-		$iBBcnt +=  (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) +
-					  (( $iSmallLen % $this->_BIG_BLOCK_SIZE)? 1: 0));
-		$iCnt = count($raList);
-		$iBdCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_PPS_SIZE;
-		$iPPScnt = (floor($iCnt/$iBdCnt) + (($iCnt % $iBdCnt)? 1: 0));
-
-		return array($iSBDcnt, $iBBcnt, $iPPScnt);
-	}
-
-	/**
-	* Helper function for caculating a magic value for block sizes
-	*
-	* @access public
-	* @param integer $i2 The argument
-	* @see save()
-	* @return integer
-	*/
-	private static function _adjust2($i2)
-	{
-		$iWk = log($i2)/log(2);
-		return ($iWk > floor($iWk))? floor($iWk)+1:$iWk;
-	}
-
-	/**
-	* Save OLE header
-	*
-	* @access public
-	* @param integer $iSBDcnt
-	* @param integer $iBBcnt
-	* @param integer $iPPScnt
-	*/
-	public function _saveHeader($iSBDcnt, $iBBcnt, $iPPScnt)
-	{
-		$FILE = $this->_FILEH_;
-
-		// Calculate Basic Setting
-		$iBlCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
-		$i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
-
-		$iBdExL = 0;
-		$iAll = $iBBcnt + $iPPScnt + $iSBDcnt;
-		$iAllW = $iAll;
-		$iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
-		$iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0);
-
-		// Calculate BD count
-		if ($iBdCnt > $i1stBdL) {
-			while (1) {
-				++$iBdExL;
-				++$iAllW;
-				$iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0);
-				$iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW+$iBdCntW) % $iBlCnt)? 1: 0);
-				if ($iBdCnt <= ($iBdExL*$iBlCnt+ $i1stBdL)) {
-					break;
-				}
-			}
-		}
-
-		// Save Header
-		fwrite($FILE,
-				"\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1"
-				. "\x00\x00\x00\x00"
-				. "\x00\x00\x00\x00"
-				. "\x00\x00\x00\x00"
-				. "\x00\x00\x00\x00"
-				. pack("v", 0x3b)
-				. pack("v", 0x03)
-				. pack("v", -2)
-				. pack("v", 9)
-				. pack("v", 6)
-				. pack("v", 0)
-				. "\x00\x00\x00\x00"
-				. "\x00\x00\x00\x00"
-				. pack("V", $iBdCnt)
-				. pack("V", $iBBcnt+$iSBDcnt) //ROOT START
-				. pack("V", 0)
-				. pack("V", 0x1000)
-				. pack("V", $iSBDcnt ? 0 : -2)                  //Small Block Depot
-				. pack("V", $iSBDcnt)
-		  );
-		// Extra BDList Start, Count
-		if ($iBdCnt < $i1stBdL) {
-			fwrite($FILE,
-					pack("V", -2)      // Extra BDList Start
-					. pack("V", 0)        // Extra BDList Count
-				  );
-		} else {
-			fwrite($FILE, pack("V", $iAll+$iBdCnt) . pack("V", $iBdExL));
-		}
-
-		// BDList
-		for ($i = 0; $i < $i1stBdL && $i < $iBdCnt; ++$i) {
-			fwrite($FILE, pack("V", $iAll+$i));
-		}
-		if ($i < $i1stBdL) {
-			$jB = $i1stBdL - $i;
-			for ($j = 0; $j < $jB; ++$j) {
-				fwrite($FILE, (pack("V", -1)));
-			}
-		}
-	}
-
-	/**
-	* Saving big data (PPS's with data bigger than PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL)
-	*
-	* @access public
-	* @param integer $iStBlk
-	* @param array &$raList Reference to array of PPS's
-	*/
-	public function _saveBigData($iStBlk, &$raList)
-	{
-		$FILE = $this->_FILEH_;
-
-		// cycle through PPS's
-		$iCount = count($raList);
-		for ($i = 0; $i < $iCount; ++$i) {
-			if ($raList[$i]->Type != PHPExcel_Shared_OLE::OLE_PPS_TYPE_DIR) {
-				$raList[$i]->Size = $raList[$i]->_DataLen();
-				if (($raList[$i]->Size >= PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) ||
-					(($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_ROOT) && isset($raList[$i]->_data)))
-				{
-					// Write Data
-					//if (isset($raList[$i]->_PPS_FILE)) {
-					//	$iLen = 0;
-					//	fseek($raList[$i]->_PPS_FILE, 0); // To The Top
-					//	while($sBuff = fread($raList[$i]->_PPS_FILE, 4096)) {
-					//		$iLen += strlen($sBuff);
-					//		fwrite($FILE, $sBuff);
-					//	}
-					//} else {
-						fwrite($FILE, $raList[$i]->_data);
-					//}
-
-					if ($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) {
-						fwrite($FILE, str_repeat("\x00", $this->_BIG_BLOCK_SIZE - ($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)));
-					}
-					// Set For PPS
-					$raList[$i]->_StartBlock = $iStBlk;
-					$iStBlk +=
-							(floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
-								(($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0));
-				}
-				// Close file for each PPS, and unlink it
-				//if (isset($raList[$i]->_PPS_FILE)) {
-				//	fclose($raList[$i]->_PPS_FILE);
-				//	$raList[$i]->_PPS_FILE = null;
-				//	unlink($raList[$i]->_tmp_filename);
-				//}
-			}
-		}
-	}
-
-	/**
-	* get small data (PPS's with data smaller than PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL)
-	*
-	* @access public
-	* @param array &$raList Reference to array of PPS's
-	*/
-	public function _makeSmallData(&$raList)
-	{
-		$sRes = '';
-		$FILE = $this->_FILEH_;
-		$iSmBlk = 0;
-
-		$iCount = count($raList);
-		for ($i = 0; $i < $iCount; ++$i) {
-			// Make SBD, small data string
-			if ($raList[$i]->Type == PHPExcel_Shared_OLE::OLE_PPS_TYPE_FILE) {
-				if ($raList[$i]->Size <= 0) {
-					continue;
-				}
-				if ($raList[$i]->Size < PHPExcel_Shared_OLE::OLE_DATA_SIZE_SMALL) {
-					$iSmbCnt = floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
-								  + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0);
-					// Add to SBD
-					$jB = $iSmbCnt - 1;
-					for ($j = 0; $j < $jB; ++$j) {
-						fwrite($FILE, pack("V", $j+$iSmBlk+1));
-					}
-					fwrite($FILE, pack("V", -2));
-
-					//// Add to Data String(this will be written for RootEntry)
-					//if ($raList[$i]->_PPS_FILE) {
-					//	fseek($raList[$i]->_PPS_FILE, 0); // To The Top
-					//	while ($sBuff = fread($raList[$i]->_PPS_FILE, 4096)) {
-					//		$sRes .= $sBuff;
-					//	}
-					//} else {
-						$sRes .= $raList[$i]->_data;
-					//}
-					if ($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) {
-						$sRes .= str_repeat("\x00",$this->_SMALL_BLOCK_SIZE - ($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE));
-					}
-					// Set for PPS
-					$raList[$i]->_StartBlock = $iSmBlk;
-					$iSmBlk += $iSmbCnt;
-				}
-			}
-		}
-		$iSbCnt = floor($this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE);
-		if ($iSmBlk % $iSbCnt) {
-			$iB = $iSbCnt - ($iSmBlk % $iSbCnt);
-			for ($i = 0; $i < $iB; ++$i) {
-				fwrite($FILE, pack("V", -1));
-			}
-		}
-		return $sRes;
-	}
-
-	/**
-	* Saves all the PPS's WKs
-	*
-	* @access public
-	* @param array $raList Reference to an array with all PPS's
-	*/
-	public function _savePps(&$raList)
-	{
-		// Save each PPS WK
-		$iC = count($raList);
-		for ($i = 0; $i < $iC; ++$i) {
-			fwrite($this->_FILEH_, $raList[$i]->_getPpsWk());
-		}
-		// Adjust for Block
-		$iCnt = count($raList);
-		$iBCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_PPS_SIZE;
-		if ($iCnt % $iBCnt) {
-			fwrite($this->_FILEH_, str_repeat("\x00",($iBCnt - ($iCnt % $iBCnt)) * PHPExcel_Shared_OLE::OLE_PPS_SIZE));
-		}
-	}
-
-	/**
-	* Saving Big Block Depot
-	*
-	* @access public
-	* @param integer $iSbdSize
-	* @param integer $iBsize
-	* @param integer $iPpsCnt
-	*/
-	public function _saveBbd($iSbdSize, $iBsize, $iPpsCnt)
-	{
-		$FILE = $this->_FILEH_;
-		// Calculate Basic Setting
-		$iBbCnt = $this->_BIG_BLOCK_SIZE / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
-		$i1stBdL = ($this->_BIG_BLOCK_SIZE - 0x4C) / PHPExcel_Shared_OLE::OLE_LONG_INT_SIZE;
-
-		$iBdExL = 0;
-		$iAll = $iBsize + $iPpsCnt + $iSbdSize;
-		$iAllW = $iAll;
-		$iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
-		$iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0);
-		// Calculate BD count
-		if ($iBdCnt >$i1stBdL) {
-			while (1) {
-				++$iBdExL;
-				++$iAllW;
-				$iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0);
-				$iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW+$iBdCntW) % $iBbCnt)? 1: 0);
-				if ($iBdCnt <= ($iBdExL*$iBbCnt+ $i1stBdL)) {
-					break;
-				}
-			}
-		}
-
-		// Making BD
-		// Set for SBD
-		if ($iSbdSize > 0) {
-			for ($i = 0; $i < ($iSbdSize - 1); ++$i) {
-				fwrite($FILE, pack("V", $i+1));
-			}
-			fwrite($FILE, pack("V", -2));
-		}
-		// Set for B
-		for ($i = 0; $i < ($iBsize - 1); ++$i) {
-			fwrite($FILE, pack("V", $i+$iSbdSize+1));
-		}
-		fwrite($FILE, pack("V", -2));
-
-		// Set for PPS
-		for ($i = 0; $i < ($iPpsCnt - 1); ++$i) {
-			fwrite($FILE, pack("V", $i+$iSbdSize+$iBsize+1));
-		}
-		fwrite($FILE, pack("V", -2));
-		// Set for BBD itself ( 0xFFFFFFFD : BBD)
-		for ($i = 0; $i < $iBdCnt; ++$i) {
-			fwrite($FILE, pack("V", 0xFFFFFFFD));
-		}
-		// Set for ExtraBDList
-		for ($i = 0; $i < $iBdExL; ++$i) {
-			fwrite($FILE, pack("V", 0xFFFFFFFC));
-		}
-		// Adjust for Block
-		if (($iAllW + $iBdCnt) % $iBbCnt) {
-			$iBlock = ($iBbCnt - (($iAllW + $iBdCnt) % $iBbCnt));
-			for ($i = 0; $i < $iBlock; ++$i) {
-				fwrite($FILE, pack("V", -1));
-			}
-		}
-		// Extra BDList
-		if ($iBdCnt > $i1stBdL) {
-			$iN=0;
-			$iNb=0;
-			for ($i = $i1stBdL;$i < $iBdCnt; $i++, ++$iN) {
-				if ($iN >= ($iBbCnt - 1)) {
-					$iN = 0;
-					++$iNb;
-					fwrite($FILE, pack("V", $iAll+$iBdCnt+$iNb));
-				}
-				fwrite($FILE, pack("V", $iBsize+$iSbdSize+$iPpsCnt+$i));
-			}
-			if (($iBdCnt-$i1stBdL) % ($iBbCnt-1)) {
-				$iB = ($iBbCnt - 1) - (($iBdCnt - $i1stBdL) % ($iBbCnt - 1));
-				for ($i = 0; $i < $iB; ++$i) {
-					fwrite($FILE, pack("V", -1));
-				}
-			}
-			fwrite($FILE, pack("V", -2));
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/OLERead.php b/plugins/exportTypes/Excel/PHPExcel/Shared/OLERead.php
deleted file mode 100755
index 5e72ccfb5..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/OLERead.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-define('IDENTIFIER_OLE', pack('CCCCCCCC', 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1));
-
-class PHPExcel_Shared_OLERead {
-	private $data = '';
-
-	// OLE identifier
-	const IDENTIFIER_OLE = IDENTIFIER_OLE;
-
-	// Size of a sector = 512 bytes
-	const BIG_BLOCK_SIZE					= 0x200;
-
-	// Size of a short sector = 64 bytes
-	const SMALL_BLOCK_SIZE					= 0x40;
-
-	// Size of a directory entry always = 128 bytes
-	const PROPERTY_STORAGE_BLOCK_SIZE		= 0x80;
-
-	// Minimum size of a standard stream = 4096 bytes, streams smaller than this are stored as short streams
-	const SMALL_BLOCK_THRESHOLD				= 0x1000;
-
-	// header offsets
-	const NUM_BIG_BLOCK_DEPOT_BLOCKS_POS	= 0x2c;
-	const ROOT_START_BLOCK_POS				= 0x30;
-	const SMALL_BLOCK_DEPOT_BLOCK_POS		= 0x3c;
-	const EXTENSION_BLOCK_POS				= 0x44;
-	const NUM_EXTENSION_BLOCK_POS			= 0x48;
-	const BIG_BLOCK_DEPOT_BLOCKS_POS		= 0x4c;
-
-	// property storage offsets (directory offsets)
-	const SIZE_OF_NAME_POS					= 0x40;
-	const TYPE_POS							= 0x42;
-	const START_BLOCK_POS					= 0x74;
-	const SIZE_POS							= 0x78;
-
-
-
-	public $wrkbook						= null;
-	public $summaryInformation			= null;
-	public $documentSummaryInformation	= null;
-
-
-	/**
-	 * Read the file
-	 *
-	 * @param $sFileName string Filename
-	 * @throws Exception
-	 */
-	public function read($sFileName)
-	{
-		// Check if file exists and is readable
-		if(!is_readable($sFileName)) {
-			throw new Exception("Could not open " . $sFileName . " for reading! File does not exist, or it is not readable.");
-		}
-
-		// Get the file data
-		$this->data = file_get_contents($sFileName);
-
-		// Check OLE identifier
-		if (substr($this->data, 0, 8) != self::IDENTIFIER_OLE) {
-			throw new Exception('The filename ' . $sFileName . ' is not recognised as an OLE file');
-		}
-
-		// Total number of sectors used for the SAT
-		$this->numBigBlockDepotBlocks = self::_GetInt4d($this->data, self::NUM_BIG_BLOCK_DEPOT_BLOCKS_POS);
-
-		// SecID of the first sector of the directory stream
-		$this->rootStartBlock = self::_GetInt4d($this->data, self::ROOT_START_BLOCK_POS);
-
-		// SecID of the first sector of the SSAT (or -2 if not extant)
-		$this->sbdStartBlock = self::_GetInt4d($this->data, self::SMALL_BLOCK_DEPOT_BLOCK_POS);
-
-		// SecID of the first sector of the MSAT (or -2 if no additional sectors are used)
-		$this->extensionBlock = self::_GetInt4d($this->data, self::EXTENSION_BLOCK_POS);
-
-		// Total number of sectors used by MSAT
-		$this->numExtensionBlocks = self::_GetInt4d($this->data, self::NUM_EXTENSION_BLOCK_POS);
-
-		$bigBlockDepotBlocks = array();
-		$pos = self::BIG_BLOCK_DEPOT_BLOCKS_POS;
-
-		$bbdBlocks = $this->numBigBlockDepotBlocks;
-
-		if ($this->numExtensionBlocks != 0) {
-			$bbdBlocks = (self::BIG_BLOCK_SIZE - self::BIG_BLOCK_DEPOT_BLOCKS_POS)/4;
-		}
-
-		for ($i = 0; $i < $bbdBlocks; ++$i) {
-			  $bigBlockDepotBlocks[$i] = self::_GetInt4d($this->data, $pos);
-			  $pos += 4;
-		}
-
-		for ($j = 0; $j < $this->numExtensionBlocks; ++$j) {
-			$pos = ($this->extensionBlock + 1) * self::BIG_BLOCK_SIZE;
-			$blocksToRead = min($this->numBigBlockDepotBlocks - $bbdBlocks, self::BIG_BLOCK_SIZE / 4 - 1);
-
-			for ($i = $bbdBlocks; $i < $bbdBlocks + $blocksToRead; ++$i) {
-				$bigBlockDepotBlocks[$i] = self::_GetInt4d($this->data, $pos);
-				$pos += 4;
-			}
-
-			$bbdBlocks += $blocksToRead;
-			if ($bbdBlocks < $this->numBigBlockDepotBlocks) {
-				$this->extensionBlock = self::_GetInt4d($this->data, $pos);
-			}
-		}
-
-		$pos = $index = 0;
-		$this->bigBlockChain = array();
-
-		$bbs = self::BIG_BLOCK_SIZE / 4;
-		for ($i = 0; $i < $this->numBigBlockDepotBlocks; ++$i) {
-			$pos = ($bigBlockDepotBlocks[$i] + 1) * self::BIG_BLOCK_SIZE;
-
-			for ($j = 0 ; $j < $bbs; ++$j) {
-				$this->bigBlockChain[$index] = self::_GetInt4d($this->data, $pos);
-				$pos += 4 ;
-				++$index;
-			}
-		}
-
-		$pos = $index = 0;
-		$sbdBlock = $this->sbdStartBlock;
-		$this->smallBlockChain = array();
-
-		while ($sbdBlock != -2) {
-			$pos = ($sbdBlock + 1) * self::BIG_BLOCK_SIZE;
-
-			for ($j = 0; $j < $bbs; ++$j) {
-				$this->smallBlockChain[$index] = self::_GetInt4d($this->data, $pos);
-				$pos += 4;
-				++$index;
-			}
-
-			$sbdBlock = $this->bigBlockChain[$sbdBlock];
-		}
-
-		// read the directory stream
-		$block = $this->rootStartBlock;
-		$this->entry = $this->_readData($block);
-
-		$this->_readPropertySets();
-	}
-
-	/**
-	 * Extract binary stream data
-	 *
-	 * @return string
-	 */
-	public function getStream($stream)
-	{
-		if ($stream === NULL) {
-			return null;
-		}
-
-		$streamData = '';
-
-		if ($this->props[$stream]['size'] < self::SMALL_BLOCK_THRESHOLD) {
-			$rootdata = $this->_readData($this->props[$this->rootentry]['startBlock']);
-
-			$block = $this->props[$stream]['startBlock'];
-
-			while ($block != -2) {
-	  			$pos = $block * self::SMALL_BLOCK_SIZE;
-				$streamData .= substr($rootdata, $pos, self::SMALL_BLOCK_SIZE);
-
-				$block = $this->smallBlockChain[$block];
-			}
-
-			return $streamData;
-		} else {
-			$numBlocks = $this->props[$stream]['size'] / self::BIG_BLOCK_SIZE;
-			if ($this->props[$stream]['size'] % self::BIG_BLOCK_SIZE != 0) {
-				++$numBlocks;
-			}
-
-			if ($numBlocks == 0) return '';
-
-			$block = $this->props[$stream]['startBlock'];
-
-			while ($block != -2) {
-				$pos = ($block + 1) * self::BIG_BLOCK_SIZE;
-				$streamData .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
-				$block = $this->bigBlockChain[$block];
-			}
-
-			return $streamData;
-		}
-	}
-
-	/**
-	 * Read a standard stream (by joining sectors using information from SAT)
-	 *
-	 * @param int $bl Sector ID where the stream starts
-	 * @return string Data for standard stream
-	 */
-	private function _readData($bl)
-	{
-		$block = $bl;
-		$data = '';
-
-		while ($block != -2)  {
-			$pos = ($block + 1) * self::BIG_BLOCK_SIZE;
-			$data .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
-			$block = $this->bigBlockChain[$block];
-		}
-		return $data;
-	 }
-
-	/**
-	 * Read entries in the directory stream.
-	 */
-	private function _readPropertySets() {
-		$offset = 0;
-
-		// loop through entires, each entry is 128 bytes
-		$entryLen = strlen($this->entry);
-		while ($offset < $entryLen) {
-			// entry data (128 bytes)
-			$d = substr($this->entry, $offset, self::PROPERTY_STORAGE_BLOCK_SIZE);
-
-			// size in bytes of name
-			$nameSize = ord($d[self::SIZE_OF_NAME_POS]) | (ord($d[self::SIZE_OF_NAME_POS+1]) << 8);
-
-			// type of entry
-			$type = ord($d[self::TYPE_POS]);
-
-			// sectorID of first sector or short sector, if this entry refers to a stream (the case with workbook)
-			// sectorID of first sector of the short-stream container stream, if this entry is root entry
-			$startBlock = self::_GetInt4d($d, self::START_BLOCK_POS);
-
-			$size = self::_GetInt4d($d, self::SIZE_POS);
-
-			$name = str_replace("\x00", "", substr($d,0,$nameSize));
-
-			$this->props[] = array (
-				'name' => $name,
-				'type' => $type,
-				'startBlock' => $startBlock,
-				'size' => $size);
-
-			// Workbook directory entry (BIFF5 uses Book, BIFF8 uses Workbook)
-			if (($name == 'Workbook') || ($name == 'Book') || ($name == 'WORKBOOK') || ($name == 'BOOK')) {
-				$this->wrkbook = count($this->props) - 1;
-			}
-
-			// Root entry
-			if ($name == 'Root Entry' || $name == 'ROOT ENTRY' || $name == 'R') {
-				$this->rootentry = count($this->props) - 1;
-			}
-
-			// Summary information
-			if ($name == chr(5) . 'SummaryInformation') {
-//				echo 'Summary Information<br />';
-				$this->summaryInformation = count($this->props) - 1;
-			}
-
-			// Additional Document Summary information
-			if ($name == chr(5) . 'DocumentSummaryInformation') {
-//				echo 'Document Summary Information<br />';
-				$this->documentSummaryInformation = count($this->props) - 1;
-			}
-
-			$offset += self::PROPERTY_STORAGE_BLOCK_SIZE;
-		}
-
-	}
-
-	/**
-	 * Read 4 bytes of data at specified position
-	 *
-	 * @param string $data
-	 * @param int $pos
-	 * @return int
-	 */
-	private static function _GetInt4d($data, $pos)
-	{
-		// FIX: represent numbers correctly on 64-bit system
-		// http://sourceforge.net/tracker/index.php?func=detail&aid=1487372&group_id=99160&atid=623334
-		// Hacked by Andreas Rehm 2006 to ensure correct result of the <<24 block on 32 and 64bit systems
-		$_or_24 = ord($data[$pos + 3]);
-		if ($_or_24 >= 128) {
-			// negative number
-			$_ord_24 = -abs((256 - $_or_24) << 24);
-		} else {
-			$_ord_24 = ($_or_24 & 127) << 24;
-		}
-		return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/PCLZip/gnu-lgpl.txt b/plugins/exportTypes/Excel/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
deleted file mode 100755
index cbee875ba..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/PCLZip/pclzip.lib.php b/plugins/exportTypes/Excel/PHPExcel/Shared/PCLZip/pclzip.lib.php
deleted file mode 100755
index 4bf05a523..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/PCLZip/pclzip.lib.php
+++ /dev/null
@@ -1,5694 +0,0 @@
-<?php
-// --------------------------------------------------------------------------------
-// PhpConcept Library - Zip Module 2.8.2
-// --------------------------------------------------------------------------------
-// License GNU/LGPL - Vincent Blavet - August 2009
-// http://www.phpconcept.net
-// --------------------------------------------------------------------------------
-//
-// Presentation :
-//   PclZip is a PHP library that manage ZIP archives.
-//   So far tests show that archives generated by PclZip are readable by
-//   WinZip application and other tools.
-//
-// Description :
-//   See readme.txt and http://www.phpconcept.net
-//
-// Warning :
-//   This library and the associated files are non commercial, non professional
-//   work.
-//   It should not have unexpected results. However if any damage is caused by
-//   this software the author can not be responsible.
-//   The use of this software is at the risk of the user.
-//
-// --------------------------------------------------------------------------------
-// $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
-// --------------------------------------------------------------------------------
-
-  // ----- Constants
-  if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
-  }
-  
-  // ----- File list separator
-  // In version 1.x of PclZip, the separator for file list is a space
-  // (which is not a very smart choice, specifically for windows paths !).
-  // A better separator should be a comma (,). This constant gives you the
-  // abilty to change that.
-  // However notice that changing this value, may have impact on existing
-  // scripts, using space separated filenames.
-  // Recommanded values for compatibility with older versions :
-  //define( 'PCLZIP_SEPARATOR', ' ' );
-  // Recommanded values for smart separation of filenames.
-  if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
-  }
-
-  // ----- Error configuration
-  // 0 : PclZip Class integrated error handling
-  // 1 : PclError external library error handling. By enabling this
-  //     you must ensure that you have included PclError library.
-  // [2,...] : reserved for futur use
-  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
-  }
-
-  // ----- Optional static temporary directory
-  //       By default temporary files are generated in the script current
-  //       path.
-  //       If defined :
-  //       - MUST BE terminated by a '/'.
-  //       - MUST be a valid, already created directory
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
-  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
-  }
-
-  // ----- Optional threshold ratio for use of temporary files
-  //       Pclzip sense the size of the file to add/extract and decide to
-  //       use or not temporary file. The algorythm is looking for 
-  //       memory_limit of PHP and apply a ratio.
-  //       threshold = memory_limit * ratio.
-  //       Recommended values are under 0.5. Default 0.47.
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
-  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
-  }
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
-// --------------------------------------------------------------------------------
-
-  // ----- Global variables
-  $g_pclzip_version = "2.8.2";
-
-  // ----- Error codes
-  //   -1 : Unable to open file in binary write mode
-  //   -2 : Unable to open file in binary read mode
-  //   -3 : Invalid parameters
-  //   -4 : File does not exist
-  //   -5 : Filename is too long (max. 255)
-  //   -6 : Not a valid zip file
-  //   -7 : Invalid extracted file size
-  //   -8 : Unable to create directory
-  //   -9 : Invalid archive extension
-  //  -10 : Invalid archive format
-  //  -11 : Unable to delete file (unlink)
-  //  -12 : Unable to rename file (rename)
-  //  -13 : Invalid header checksum
-  //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
-
-  // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
-  // Having big trouble with crypt. Need to multiply 2 long int
-  // which is not correctly supported by PHP ...
-  //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
-  
-  // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
-
-  // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
-  /* For futur use
-  define( 'PCLZIP_CB_PRE_LIST', 78005 );
-  define( 'PCLZIP_CB_POST_LIST', 78006 );
-  define( 'PCLZIP_CB_PRE_DELETE', 78007 );
-  define( 'PCLZIP_CB_POST_DELETE', 78008 );
-  */
-
-  // --------------------------------------------------------------------------------
-  // Class : PclZip
-  // Description :
-  //   PclZip is the class that represent a Zip archive.
-  //   The public methods allow the manipulation of the archive.
-  // Attributes :
-  //   Attributes must not be accessed directly.
-  // Methods :
-  //   PclZip() : Object creator
-  //   create() : Creates the Zip archive
-  //   listContent() : List the content of the Zip archive
-  //   extract() : Extract the content of the archive
-  //   properties() : List the properties of the archive
-  // --------------------------------------------------------------------------------
-  class PclZip
-  {
-    // ----- Filename of the zip file
-    var $zipname = '';
-
-    // ----- File descriptor of the zip file
-    var $zip_fd = 0;
-
-    // ----- Internal error handling
-    var $error_code = 1;
-    var $error_string = '';
-    
-    // ----- Current status of the magic_quotes_runtime
-    // This value store the php configuration for magic_quotes
-    // The class can then disable the magic_quotes and reset it after
-    var $magic_quotes_status;
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZip()
-  // Description :
-  //   Creates a PclZip object and set the name of the associated Zip archive
-  //   filename.
-  //   Note that no real action is taken, if the archive does not exist it is not
-  //   created. Use create() for that.
-  // --------------------------------------------------------------------------------
-  function PclZip($p_zipname)
-  {
-
-    // ----- Tests the zlib
-    if (!function_exists('gzopen'))
-    {
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
-    }
-
-    // ----- Set the attributes
-    $this->zipname = $p_zipname;
-    $this->zip_fd = 0;
-    $this->magic_quotes_status = -1;
-
-    // ----- Return
-    return;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   create($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two different synopsis. The first one is historical.
-  //   This method creates a Zip Archive. The Zip file is created in the
-  //   filesystem. The files and directories indicated in $p_filelist
-  //   are added in the archive. See the parameters description for the
-  //   supported format of $p_filelist.
-  //   When a directory is in the list, the directory and its content is added
-  //   in the archive.
-  //   In this synopsis, the function takes an optional variable list of
-  //   options. See bellow the supported options.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function create($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove from the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                             ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Invalid number / type of arguments");
-          return 0;
-        }
-      }
-    }
-    
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-    
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-    
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-      
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-      return 0;
-    }
-    
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        if ($v_string != '') {
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
-        }
-      }
-    }
-    
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   add($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This methods add the list of files in an existing archive.
-  //   If a file with the same name already exists, it is added at the end of the
-  //   archive, the first one is still present.
-  //   If the archive does not exist, it is created.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_OPT_ADD_COMMENT :
-  //   PCLZIP_OPT_PREPEND_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function add($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-    
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-    
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-      
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
-      return 0;
-    }
-    
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-      }
-    }
-    
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : listContent()
-  // Description :
-  //   This public method, gives the list of the files and directories, with their
-  //   properties.
-  //   The properties of each entries in the list are (used also in other functions) :
-  //     filename : Name of the file. For a create or add action it is the filename
-  //                given by the user. For an extract function it is the filename
-  //                of the extracted file.
-  //     stored_filename : Name of the file / directory stored in the archive.
-  //     size : Size of the stored file.
-  //     compressed_size : Size of the file's data compressed in the archive
-  //                       (without the headers overhead)
-  //     mtime : Last known modification date of the file (UNIX timestamp)
-  //     comment : Comment associated with the file
-  //     folder : true | false
-  //     index : index of the file in the archive
-  //     status : status of the action (depending of the action) :
-  //              Values are :
-  //                ok : OK !
-  //                filtered : the file / dir is not extracted (filtered by user)
-  //                already_a_directory : the file can not be extracted because a
-  //                                      directory with the same name already exists
-  //                write_protected : the file can not be extracted because a file
-  //                                  with the same name already exists and is
-  //                                  write protected
-  //                newer_exist : the file was not extracted because a newer file exists
-  //                path_creation_fail : the file is not extracted because the folder
-  //                                     does not exist and can not be created
-  //                write_error : the file was not extracted because there was a
-  //                              error while writing the file
-  //                read_error : the file was not extracted because there was a error
-  //                             while reading the file
-  //                invalid_header : the file was not extracted because of an archive
-  //                                 format error (bad file header)
-  //   Note that each time a method can continue operating when there
-  //   is an action error on a file, the error is only logged in the file status.
-  // Return Values :
-  //   0 on an unrecoverable failure,
-  //   The list of the files in the archive.
-  // --------------------------------------------------------------------------------
-  function listContent()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    if (($v_result = $this->privList($p_list)) != 1)
-    {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extract($p_path="./", $p_remove_path="")
-  //   extract([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method extract all the files / directories from the archive to the
-  //   folder indicated in $p_path.
-  //   If you want to ignore the 'root' part of path of the memorized files
-  //   you can indicate this in the optional $p_remove_path parameter.
-  //   By default, if a newer file with the same name already exists, the
-  //   file is not extracted.
-  //
-  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
-  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
-  //   at the end of the path value of PCLZIP_OPT_PATH.
-  // Parameters :
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 or a negative value on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function extract()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												    ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Trace
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
-	                                     $v_remove_all_path, $v_options);
-    if ($v_result < 1) {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
-  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method is doing a partial extract of the archive.
-  //   The extracted files or folders are identified by their index in the
-  //   archive (from 0 to n).
-  //   Note that if the index identify a folder, only the folder entry is
-  //   extracted, not all the files included in the archive.
-  // Parameters :
-  //   $p_index : A single index (integer) or a string of indexes of files to
-  //              extract. The form of the string is "0,4-6,8-12" with only numbers
-  //              and '-' for range or ',' to separate ranges. No spaces or ';'
-  //              are allowed.
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
-  //     not as files.
-  //     The resulting content is in a new field 'content' in the file
-  //     structure.
-  //     This option must be used alone (any other options are ignored).
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  //function extractByIndex($p_index, options...)
-  function extractByIndex($p_index)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Trace
-
-    // ----- Trick
-    // Here I want to reuse extractByRule(), so I need to parse the $p_index
-    // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
-    $v_options_trick = array();
-    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
-    if ($v_result != 1) {
-        return 0;
-    }
-    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Call the extracting fct
-    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-        return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   delete([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method removes files from the archive.
-  //   If no parameters are given, then all the archive is emptied.
-  // Parameters :
-  //   None or optional arguments.
-  // Options :
-  //   PCLZIP_OPT_BY_INDEX :
-  //   PCLZIP_OPT_BY_NAME :
-  //   PCLZIP_OPT_BY_EREG : 
-  //   PCLZIP_OPT_BY_PREG :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the files which are still present in the archive.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function delete()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Parse the options
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
-                                               PCLZIP_OPT_BY_EREG => 'optional',
-                                               PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
-      if ($v_result != 1) {
-          return 0;
-      }
-    }
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Call the delete fct
-    $v_list = array();
-    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-      $this->privSwapBackMagicQuotes();
-      unset($v_list);
-      return(0);
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : deleteByIndex()
-  // Description :
-  //   ***** Deprecated *****
-  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
-  // --------------------------------------------------------------------------------
-  function deleteByIndex($p_index)
-  {
-    
-    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : properties()
-  // Description :
-  //   This method gives the properties of the archive.
-  //   The properties are :
-  //     nb : Number of files in the archive
-  //     comment : Comment associated with the archive file
-  //     status : not_exist, ok
-  // Parameters :
-  //   None
-  // Return Values :
-  //   0 on failure,
-  //   An array with the archive properties.
-  // --------------------------------------------------------------------------------
-  function properties()
-  {
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      return(0);
-    }
-
-    // ----- Default properties
-    $v_prop = array();
-    $v_prop['comment'] = '';
-    $v_prop['nb'] = 0;
-    $v_prop['status'] = 'not_exist';
-
-    // ----- Look if file exists
-    if (@is_file($this->zipname))
-    {
-      // ----- Open the zip file
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-      {
-        $this->privSwapBackMagicQuotes();
-        
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-        // ----- Return
-        return 0;
-      }
-
-      // ----- Read the central directory informations
-      $v_central_dir = array();
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return 0;
-      }
-
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Set the user attributes
-      $v_prop['comment'] = $v_central_dir['comment'];
-      $v_prop['nb'] = $v_central_dir['entries'];
-      $v_prop['status'] = 'ok';
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_prop;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : duplicate()
-  // Description :
-  //   This method creates an archive by copying the content of an other one. If
-  //   the archive already exist, it is replaced by the new one without any warning.
-  // Parameters :
-  //   $p_archive : The filename of a valid archive, or
-  //                a valid PclZip object.
-  // Return Values :
-  //   1 on success.
-  //   0 or a negative value on error (error code).
-  // --------------------------------------------------------------------------------
-  function duplicate($p_archive)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the $p_archive is a PclZip object
-    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
-    {
-
-      // ----- Duplicate the archive
-      $v_result = $this->privDuplicate($p_archive->zipname);
-    }
-
-    // ----- Look if the $p_archive is a string (so a filename)
-    else if (is_string($p_archive))
-    {
-
-      // ----- Check that $p_archive is a valid zip file
-      // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
-        $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
-        // ----- Duplicate the archive
-        $v_result = $this->privDuplicate($p_archive);
-      }
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : merge()
-  // Description :
-  //   This method merge the $p_archive_to_add archive at the end of the current
-  //   one ($this).
-  //   If the archive ($this) does not exist, the merge becomes a duplicate.
-  //   If the $p_archive_to_add archive does not exist, the merge is a success.
-  // Parameters :
-  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
-  //                       or a PclZip object archive.
-  // Return Values :
-  //   1 on success,
-  //   0 or negative values on error (see below).
-  // --------------------------------------------------------------------------------
-  function merge($p_archive_to_add)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
-    {
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($p_archive_to_add);
-    }
-
-    // ----- Look if the $p_archive_to_add is a string (so a filename)
-    else if (is_string($p_archive_to_add))
-    {
-
-      // ----- Create a temporary archive
-      $v_object_archive = new PclZip($p_archive_to_add);
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($v_object_archive);
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : errorCode()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorCode()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorCode());
-    }
-    else {
-      return($this->error_code);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorName()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
-  {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-                    );
-
-    if (isset($v_name[$this->error_code])) {
-      $v_value = $v_name[$this->error_code];
-    }
-    else {
-      $v_value = 'NoName';
-    }
-
-    if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
-    }
-    else {
-      return($v_value);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorInfo()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorString());
-    }
-    else {
-      if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
-        return($this->error_string." [code ".$this->error_code."]");
-      }
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
-// *****                                                        *****
-// *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
-// --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFormat()
-  // Description :
-  //   This method check that the archive exists and is a valid zip archive.
-  //   Several level of check exists. (futur)
-  // Parameters :
-  //   $p_level : Level of check. Default 0.
-  //              0 : Check the first bytes (magic codes) (default value))
-  //              1 : 0 + Check the central directory (futur)
-  //              2 : 1 + Check each file header (futur)
-  // Return Values :
-  //   true on success,
-  //   false on error, the error code is set.
-  // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
-  {
-    $v_result = true;
-
-	// ----- Reset the file system cache
-    clearstatcache();
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check the magic code
-    // TBC
-
-    // ----- Check the central header
-    // TBC
-
-    // ----- Check each file header
-    // TBC
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privParseOptions()
-  // Description :
-  //   This internal methods reads the variable list of arguments ($p_options_list,
-  //   $p_size) and generate an array with the options and values ($v_result_list).
-  //   $v_requested_options contains the options that can be present and those that
-  //   must be present.
-  //   $v_requested_options is an array, with the option value as key, and 'optional',
-  //   or 'mandatory' as value.
-  // Parameters :
-  //   See above.
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
-  {
-    $v_result=1;
-    
-    // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
-
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for next option
-      switch ($p_options_list[$i]) {
-        // ----- Look for options that request a path value
-        case PCLZIP_OPT_PATH :
-        case PCLZIP_OPT_REMOVE_PATH :
-        case PCLZIP_OPT_ADD_PATH :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-          
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-          
-          // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_ON :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-          
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_OFF :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
-            return PclZip::errorCode();
-          }
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
-            return PclZip::errorCode();
-          }
-          
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-            $i++;
-          }
-          else {
-          }
-        break;
-
-        // ----- Look for options that request an array of string for value
-        case PCLZIP_OPT_BY_NAME :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an EREG or PREG expression
-        case PCLZIP_OPT_BY_EREG :
-          // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
-          // to PCLZIP_OPT_BY_PREG
-          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
-        case PCLZIP_OPT_BY_PREG :
-        //case PCLZIP_OPT_CRYPT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_OPT_COMMENT :
-        case PCLZIP_OPT_ADD_COMMENT :
-        case PCLZIP_OPT_PREPEND_COMMENT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
-			                     "Missing parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
-			                     "Wrong parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an array of index
-        case PCLZIP_OPT_BY_INDEX :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
-
-              // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
-
-              // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          
-          // ----- Reduce the index list
-          // each index item in the list must be a couple with a start and
-          // an end value : [0,3], [5-5], [8-10], ...
-          // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
-              // ----- Explode the item
-              $v_item_list = explode("-", $v_work_list[$j]);
-              $v_size_item_list = sizeof($v_item_list);
-              
-              // ----- TBC : Here we might check that each item is a
-              // real integer ...
-              
-              // ----- Look for single value
-              if ($v_size_item_list == 1) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-
-
-              // ----- Look for list sort
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
-
-                  // ----- TBC : An automatic sort should be writen ...
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-          }
-          
-          // ----- Sort the items
-          if ($v_sort_flag) {
-              // TBC : To Be Completed
-          }
-
-          // ----- Next option
-          $i++;
-        break;
-
-        // ----- Look for options that request no value
-        case PCLZIP_OPT_REMOVE_ALL_PATH :
-        case PCLZIP_OPT_EXTRACT_AS_STRING :
-        case PCLZIP_OPT_NO_COMPRESSION :
-        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
-        case PCLZIP_OPT_REPLACE_NEWER :
-        case PCLZIP_OPT_STOP_ON_ERROR :
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        // ----- Look for options that request an octal value
-        case PCLZIP_OPT_SET_CHMOD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          $i++;
-        break;
-
-        // ----- Look for options that request a call-back
-        case PCLZIP_CB_PRE_EXTRACT :
-        case PCLZIP_CB_POST_EXTRACT :
-        case PCLZIP_CB_PRE_ADD :
-        case PCLZIP_CB_POST_ADD :
-        /* for futur use
-        case PCLZIP_CB_PRE_DELETE :
-        case PCLZIP_CB_POST_DELETE :
-        case PCLZIP_CB_PRE_LIST :
-        case PCLZIP_CB_POST_LIST :
-        */
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
-
-          // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Set the attribute
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
-          $i++;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Unknown parameter '"
-							   .$p_options_list[$i]."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Next options
-      $i++;
-    }
-
-    // ----- Look for mandatory options
-    if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-        // ----- Look for mandatory option
-        if ($v_requested_options[$key] == 'mandatory') {
-          // ----- Look if present
-          if (!isset($v_result_list[$key])) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-        }
-      }
-    }
-    
-    // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-      
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOptionDefaultThreshold()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privOptionDefaultThreshold(&$p_options)
-  {
-    $v_result=1;
-    
-    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
-      return $v_result;
-    }
-    
-    // ----- Get 'memory_limit' configuration value
-    $v_memory_limit = ini_get('memory_limit');
-    $v_memory_limit = trim($v_memory_limit);
-    $last = strtolower(substr($v_memory_limit, -1));
- 
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
-            
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
-    
-
-    // ----- Sanity check : No threshold if value lower than 1M
-    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
-    }
-          
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrParseAtt()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
-  {
-    $v_result=1;
-    
-    // ----- For each file in the list check the attributes
-    foreach ($p_file_list as $v_key => $v_value) {
-    
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for attribute
-      switch ($v_key) {
-        case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
-          
-          if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['comment'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['mtime'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_CONTENT :
-          $p_filedescr['content'] = $v_value;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                           "Unknown parameter '".$v_key."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Look for mandatory options
-      if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-          // ----- Look for mandatory option
-          if ($v_requested_options[$key] == 'mandatory') {
-            // ----- Look if present
-            if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              return PclZip::errorCode();
-            }
-          }
-        }
-      }
-    
-    // end foreach
-    }
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrExpand()
-  // Description :
-  //   This method look for each item of the list to see if its a file, a folder
-  //   or a string to be added as file. For any other type of files (link, other)
-  //   just ignore the item.
-  //   Then prepare the information that will be stored for that file.
-  //   When its a folder, expand the folder with all the files that are in that 
-  //   folder (recursively).
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrExpand(&$p_filedescr_list, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Create a result list
-    $v_result_list = array();
-    
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
-      
-      // ----- Get filedescr
-      $v_descr = $p_filedescr_list[$i];
-      
-      // ----- Reduce the filename
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-      
-      // ----- Look for real file or folder
-      if (file_exists($v_descr['filename'])) {
-        if (@is_file($v_descr['filename'])) {
-          $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
-          $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
-          // skip
-          continue;
-        }
-        else {
-          // skip
-          continue;
-        }
-      }
-      
-      // ----- Look for string added as file
-      else if (isset($v_descr['content'])) {
-        $v_descr['type'] = 'virtual_file';
-      }
-      
-      // ----- Missing file
-      else {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-      
-      // ----- Calculate the stored filename
-      $this->privCalculateStoredFilename($v_descr, $p_options);
-      
-      // ----- Add the descriptor in result list
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
-      
-      // ----- Look for folder
-      if ($v_descr['type'] == 'folder') {
-        // ----- List of items in folder
-        $v_dirlist_descr = array();
-        $v_dirlist_nb = 0;
-        if ($v_folder_handler = @opendir($v_descr['filename'])) {
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-
-            // ----- Skip '.' and '..'
-            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                continue;
-            }
-            
-            // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
-            
-            // ----- Look for different stored filename
-            // Because the name of the folder was changed, the name of the
-            // files/sub-folders also change
-            if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-              if ($v_descr['stored_filename'] != '') {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
-              }
-            }
-      
-            $v_dirlist_nb++;
-          }
-          
-          @closedir($v_folder_handler);
-        }
-        else {
-          // TBC : unable to open folder in read mode
-        }
-        
-        // ----- Expand each element of the list
-        if ($v_dirlist_nb != 0) {
-          // ----- Expand
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-            return $v_result;
-          }
-          
-          // ----- Concat the resulting list
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
-        }
-          
-        // ----- Free local array
-        unset($v_dirlist_descr);
-      }
-    }
-    
-    // ----- Get the result list
-    $p_filedescr_list = $v_result_list;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCreate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-    
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Add the list of files
-    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAdd()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
-    {
-
-      // ----- Do a create
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
-
-      // ----- Return
-      return $v_result;
-    }
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->privCloseFd();
-      @unlink($v_zip_temp_name);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->privCloseFd();
-          @unlink($v_zip_temp_name);
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = $v_central_dir['comment'];
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOpenFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privOpenFd($p_mode)
-  {
-    $v_result=1;
-
-    // ----- Look if already open
-    if ($this->zip_fd != 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCloseFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privCloseFd()
-  {
-    $v_result=1;
-
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
-    $this->zip_fd = 0;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to have PclTar
-  //   running in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // --------------------------------------------------------------------------------
-//  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
-  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->zip_fd);
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = '';
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileList()
-  // Description :
-  // Parameters :
-  //   $p_filedescr_list : An array containing the file description 
-  //                      or directory names to add in the zip
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_header = array();
-
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
-
-    // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
-      // ----- Format the filename
-      $p_filedescr_list[$j]['filename']
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
-      
-
-      // ----- Skip empty file names
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
-      if ($p_filedescr_list[$j]['filename'] == "") {
-        continue;
-      }
-
-      // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
-        return PclZip::errorCode();
-      }
-
-      // ----- Look if it is a file or a dir with no all path remove option
-      // or a dir with all its path removed
-//      if (   (is_file($p_filedescr_list[$j]['filename']))
-//          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
-          || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-          ) {
-
-        // ----- Add the file
-        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
-                                       $p_options);
-        if ($v_result != 1) {
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-    // TBC : Already done in the fileAtt check ... ?
-    if ($p_filename == "") {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-  
-    // ----- Look for a stored different filename 
-    /* TBC : Removed
-    if (isset($p_filedescr['stored_filename'])) {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    else {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    */
-
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
-// TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['stored_filename'] = $p_filedescr['stored_filename'];
-    $p_header['extra'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = filesize($p_filename);
-    }
-    
-    // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
-      $p_header['external'] = 0x00000010;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['size'] = filesize($p_filename);
-    }
-    
-    // ----- Look for virtual file
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = strlen($p_filedescr['content']);
-    }
-    
-
-    // ----- Look for filetime
-    if (isset($p_filedescr['mtime'])) {
-      $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['mtime'] = time();
-    }
-    else {
-      $p_header['mtime'] = filemtime($p_filename);
-    }
-
-    // ------ Look for file comment
-    if (isset($p_filedescr['comment'])) {
-      $p_header['comment_len'] = strlen($p_filedescr['comment']);
-      $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
-      $p_header['comment_len'] = 0;
-      $p_header['comment'] = '';
-    }
-
-    // ----- Look for pre-add callback
-    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-      }
-    }
-
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
-    
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
-
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
-
-      // ----- Look for a file
-      if ($p_filedescr['type'] == 'file') {
-        // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-            && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
-          if ($v_result < PCLZIP_ERR_NO_ERROR) {
-            return $v_result;
-          }
-        }
-        
-        // ----- Use "in memory" zip algo
-        else {
-
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          return PclZip::errorCode();
-        }
-
-        // ----- Read the file content
-        $v_content = @fread($v_file, $p_header['size']);
-
-        // ----- Close the file
-        @fclose($v_file);
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-        
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-        
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-        
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
-
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-
-        }
-
-      }
-
-      // ----- Look for a virtual file (a file from string)
-      else if ($p_filedescr['type'] == 'virtual_file') {
-          
-        $v_content = $p_filedescr['content'];
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-        
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-        
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-        
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
-
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-      }
-
-      // ----- Look for a directory
-      else if ($p_filedescr['type'] == 'folder') {
-        // ----- Look for directory last '/'
-        if (@substr($p_header['stored_filename'], -1) != '/') {
-          $p_header['stored_filename'] .= '/';
-        }
-
-        // ----- Set the file properties
-        $p_header['size'] = 0;
-        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Look for post-add callback
-    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Nothing can be modified
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=PCLZIP_ERR_NO_ERROR;
-    
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-
-    // ----- Open the source file
-    if (($v_file = @fopen($p_filename, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-      return PclZip::errorCode();
-    }
-
-    // ----- Creates a compressed temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = filesize($p_filename);
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file);
-    @gzclose($v_file_compressed);
-
-    // ----- Check the minimum file size
-    if (filesize($v_gzip_temp_name) < 18) {
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the compressed attributes
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the gzip file header
-    $v_binary_data = @fread($v_file_compressed, 10);
-    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
-
-    // ----- Check some parameters
-    $v_data_header['os'] = bin2hex($v_data_header['os']);
-
-    // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
-    $v_binary_data = @fread($v_file_compressed, 8);
-    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
-
-    // ----- Set the attributes
-    $p_header['compression'] = ord($v_data_header['cm']);
-    //$p_header['mtime'] = $v_data_header['mtime'];
-    $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Call the header generation
-    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-      return $v_result;
-    }
-
-    // ----- Add the compressed data
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
-    {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    fseek($v_file_compressed, 10);
-    $v_size = $p_header['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file_compressed, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Unlink the temporary file
-    @unlink($v_gzip_temp_name);
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCalculateStoredFilename()
-  // Description :
-  //   Based on file descriptor properties and global options, this method
-  //   calculate the filename that will be stored in the archive.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCalculateStoredFilename(&$p_filedescr, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Working variables
-    $p_filename = $p_filedescr['filename'];
-    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
-      $p_add_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
-      $p_remove_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
-      $p_remove_all_dir = 0;
-    }
-
-
-    // ----- Look for full name change
-    if (isset($p_filedescr['new_full_name'])) {
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
-    }
-    
-    // ----- Look for path and/or short name change
-    else {
-
-      // ----- Look for short name change
-      // Its when we cahnge just the filename but not the path
-      if (isset($p_filedescr['new_short_name'])) {
-        $v_path_info = pathinfo($p_filename);
-        $v_dir = '';
-        if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
-        }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
-        // ----- Calculate the stored filename
-        $v_stored_filename = $p_filename;
-      }
-
-      // ----- Look for all path to remove
-      if ($p_remove_all_dir) {
-        $v_stored_filename = basename($p_filename);
-      }
-      // ----- Look for partial path remove
-      else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
-
-        if (   (substr($p_filename, 0, 2) == "./")
-            || (substr($p_remove_dir, 0, 2) == "./")) {
-            
-          if (   (substr($p_filename, 0, 2) == "./")
-              && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
-          }
-          if (   (substr($p_filename, 0, 2) != "./")
-              && (substr($p_remove_dir, 0, 2) == "./")) {
-            $p_remove_dir = substr($p_remove_dir, 2);
-          }
-        }
-
-        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
-                                             $v_stored_filename);
-        if ($v_compare > 0) {
-          if ($v_compare == 2) {
-            $v_stored_filename = "";
-          }
-          else {
-            $v_stored_filename = substr($v_stored_filename,
-                                        strlen($p_remove_dir));
-          }
-        }
-      }
-      
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
-      
-      // ----- Look for path to add
-      if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
-      }
-    }
-
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
-    $p_filedescr['stored_filename'] = $v_stored_filename;
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Store the offset position of the file
-    $p_header['offset'] = ftell($this->zip_fd);
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
-	                      $p_header['version_extracted'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'],
-						  $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len']);
-
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->zip_fd, $v_binary_data, 30);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
-	                      $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'],
-						  $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'],
-						  $p_header['external'], $p_header['offset']);
-
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 46);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-  {
-    $v_result=1;
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
-	                      $p_nb_entries, $p_size,
-						  $p_offset, strlen($p_comment));
-
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 22);
-
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privList()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privList(&$p_list)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-      
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of Central Dir
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_central_dir['offset']))
-    {
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return $v_result;
-      }
-      $v_header['index'] = $i;
-
-      // ----- Get the only interesting attributes
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privConvertHeader2FileInfo()
-  // Description :
-  //   This function takes the file informations from the central directory
-  //   entries and extract the interesting parameters that will be given back.
-  //   The resulting file infos are set in the array $p_info
-  //     $p_info['filename'] : Filename with full path. Given by user (add),
-  //                           extracted in the filesystem (extract).
-  //     $p_info['stored_filename'] : Stored filename in the archive.
-  //     $p_info['size'] = Size of the file.
-  //     $p_info['compressed_size'] = Compressed size of the file.
-  //     $p_info['mtime'] = Last modification date of the file.
-  //     $p_info['comment'] = Comment associated with the file.
-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
-  //     $p_info['status'] = status of the action on the file.
-  //     $p_info['crc'] = CRC of the file content.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privConvertHeader2FileInfo($p_header, &$p_info)
-  {
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
-    $p_info['filename'] = $v_temp_path;
-    $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
-    $p_info['stored_filename'] = $v_temp_path;
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-    $p_info['crc'] = $p_header['crc'];
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractByRule()
-  // Description :
-  //   Extract a file or directory depending of rules (by index, by name, ...)
-  // Parameters :
-  //   $p_file_list : An array where will be placed the properties of each
-  //                  extracted file
-  //   $p_path : Path to add while writing the extracted files
-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
-  //                    extracted files. If the path does not match the file path,
-  //                    the file is extracted with its memorized path.
-  //                    $p_remove_path does not apply to 'list' mode.
-  //                    $p_path and $p_remove_path are commulative.
-  // Return Values :
-  //   1 on success,0 or less on error (see error code list)
-  // --------------------------------------------------------------------------------
-  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
-		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/"))
-    {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/")
-      {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
-    }
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
-    {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
-
-    // ----- Open the zip file
-    if (($v_result = $this->privOpenFd('rb')) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      return $v_result;
-    }
-
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read next Central dir entry
-      @rewind($this->zip_fd);
-      if (@fseek($this->zip_fd, $v_pos_entry))
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        return $v_result;
-      }
-
-      // ----- Store the index
-      $v_header['index'] = $i;
-
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->zip_fd);
-
-      // ----- Look for the specific extract rules
-      $v_extract = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /* 
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-          
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
-
-	  // ----- Check compression method
-	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
-		      && ($v_header['compression'] != 0))) {
-          $v_header['status'] = 'unsupported_compression';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-              
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-			                       "Filename '".$v_header['stored_filename']."' is "
-				  	    	  	   ."compressed by an unsupported compression "
-				  	    	  	   ."method (".$v_header['compression'].") ");
-
-              return PclZip::errorCode();
-		  }
-	  }
-	  
-	  // ----- Check encrypted files
-	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          $v_header['status'] = 'unsupported_encryption';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
-			                       "Unsupported encryption for "
-				  	    	  	   ." filename '".$v_header['stored_filename']
-								   ."'");
-
-              return PclZip::errorCode();
-		  }
-    }
-
-      // ----- Look for real extraction
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
-		                                        $p_file_list[$v_nb_extracted++]);
-          if ($v_result != 1) {
-              $this->privCloseFd();
-              $this->privSwapBackMagicQuotes();
-              return $v_result;
-          }
-
-          $v_extract = false;
-      }
-      
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
-
-        // ----- Go to the file position
-        @rewind($this->zip_fd);
-        if (@fseek($this->zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->privCloseFd();
-
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-          // ----- Return
-          return PclZip::errorCode();
-        }
-
-        // ----- Look for extraction as string
-        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
-
-          $v_string = '';
-
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
-
-          // ----- Next extracted file
-          $v_nb_extracted++;
-          
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-          // ----- Extracting the file in standard output
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for normal extraction
-        else {
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFile($v_header,
-		                                      $p_path, $p_remove_path,
-											  $p_remove_all_path,
-											  $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-      }
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //
-  // 1 : ... ?
-  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
-  // --------------------------------------------------------------------------------
-  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
-
-            $p_entry['status'] = "filtered";
-
-            return $v_result;
-        }
-
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
-
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
-
-        // ----- Return
-        return $v_result;
-      }
-
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
-
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
-
-      }
-    }
-
-    // ----- Add the path
-    if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
-    
-    // ----- Check a base_dir_restriction
-    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      $v_inclusion
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']); 
-      if ($v_inclusion == 0) {
-
-        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
-
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-      
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
-    {
-
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
-        
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."already used by an existing directory");
-
-            return PclZip::errorCode();
-		    }
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
-
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			                     "Filename '".$p_entry['filename']."' exists "
-								 ."and is write protected");
-
-            return PclZip::errorCode();
-		    }
-      }
-
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-        // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-	  	  }
-		    else {
-            $p_entry['status'] = "newer_exist";
-
-            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-            // For historical reason first PclZip implementation does not stop
-            // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			             "Newer version of '".$p_entry['filename']."' exists "
-					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                return PclZip::errorCode();
-		      }
-		    }
-      }
-      else {
-      }
-    }
-
-    // ----- Check the directory availability and create it if necessary
-    else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
-
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-  
-          // ----- Change the file status
-          $p_entry['status'] = "path_creation_fail";
-  
-          // ----- Return
-          //return $v_result;
-          $v_result = 1;
-        }
-      }
-    }
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
-
-    		  // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
-
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
-
-            // ----- Return
-            return $v_result;
-          }
-
-
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer = @fread($this->zip_fd, $v_read_size);
-            /* Try to speed up the code
-            $v_binary_data = pack('a'.$v_read_size, $v_buffer);
-            @fwrite($v_dest_file, $v_binary_data, $v_read_size);
-            */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);            
-            $v_size -= $v_read_size;
-          }
-
-          // ----- Closing the destination file
-          fclose($v_dest_file);
-
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
-          
-
-        }
-        else {
-          // ----- TBC
-          // Need to be finished
-          if (($p_entry['flag'] & 1) == 1) {
-            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
-            return PclZip::errorCode();
-          }
-
-
-          // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-              && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
-            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
-            if ($v_result < PCLZIP_ERR_NO_ERROR) {
-              return $v_result;
-            }
-          }
-          
-          // ----- Look for extract in memory
-          else {
-
-          
-            // ----- Read the compressed file in a buffer (one shot)
-            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-            
-            // ----- Decompress the file
-            $v_file_content = @gzinflate($v_buffer);
-            unset($v_buffer);
-            if ($v_file_content === FALSE) {
-  
-              // ----- Change the file status
-              // TBC
-              $p_entry['status'] = "error";
-              
-              return $v_result;
-            }
-            
-            // ----- Opening destination file
-            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-  
-              // ----- Change the file status
-              $p_entry['status'] = "write_error";
-  
-              return $v_result;
-            }
-  
-            // ----- Write the uncompressed data
-            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-            unset($v_file_content);
-  
-            // ----- Closing the destination file
-            @fclose($v_dest_file);
-            
-          }
-
-          // ----- Change the file mtime
-          @touch($p_entry['filename'], $p_entry['mtime']);
-        }
-
-        // ----- Look for chmod option
-        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
-
-          // ----- Change the mode of the file
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-        }
-
-      }
-    }
-
-  	// ----- Change abort status
-  	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-  	}
-	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileUsingTempFile(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-        
-    // ----- Creates a temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Write gz file format header
-    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
-    @fwrite($v_dest_file, $v_binary_data, 10);
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['compressed_size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Write gz file format footer
-    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
-    @fwrite($v_dest_file, $v_binary_data, 8);
-
-    // ----- Close the temporary file
-    @fclose($v_dest_file);
-
-    // ----- Opening destination file
-    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-      $p_entry['status'] = "write_error";
-      return $v_result;
-    }
-
-    // ----- Open the temporary gz file
-    if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {
-      @fclose($v_dest_file);
-      $p_entry['status'] = "read_error";
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @gzread($v_src_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-    @fclose($v_dest_file);
-    @gzclose($v_src_file);
-
-    // ----- Delete the temporary file
-    @unlink($v_gzip_temp_name);
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileInOutput()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileInOutput(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-    // ----- Trace
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size']) {
-
-          // ----- Read the file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-
-          // ----- Send the file to the output
-          echo $v_buffer;
-          unset($v_buffer);
-        }
-        else {
-
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-          
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
-
-          // ----- Send the file to the output
-          echo $v_file_content;
-          unset($v_file_content);
-        }
-      }
-    }
-
-	// ----- Change abort status
-	if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
-	}
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileAsString()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-      
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-  //      if ($p_entry['compressed_size'] == $p_entry['size'])
-        if ($p_entry['compression'] == 0) {
-  
-          // ----- Reading the file
-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-        }
-        else {
-  
-          // ----- Reading the file
-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
-          
-          // ----- Decompress the file
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
-              // TBC
-          }
-        }
-  
-        // ----- Trace
-      }
-      else {
-          // TBC : error : can not extract a folder in a string
-      }
-      
-    }
-
-  	// ----- Change abort status
-  	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-  	}
-	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-      
-      // ----- Swap the content to header
-      $v_local_header['content'] = $p_string;
-      $p_string = '';
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Swap back the content to header
-      $p_string = $v_local_header['content'];
-      unset($v_local_header['content']);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 26);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
-
-    // ----- Get filename
-    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
-
-    // ----- Get extra_fields
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
-      $p_header['extra'] = '';
-    }
-
-    // ----- Extract properties
-    $p_header['version_extracted'] = $v_data['version'];
-    $p_header['compression'] = $v_data['compression'];
-    $p_header['size'] = $v_data['size'];
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    $p_header['crc'] = $v_data['crc'];
-    $p_header['flag'] = $v_data['flag'];
-    $p_header['filename_len'] = $v_data['filename_len'];
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //}
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set the status field
-    $p_header['status'] = "ok";
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 42);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-    // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
-
-    // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
-
-    // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
-
-    // ----- Extract properties
-
-    // ----- Recuperate date in UNIX format
-    //if ($p_header['mdate'] && $p_header['mtime'])
-    // TBC : bug : this was ignoring time with 0/0/0
-    if (1)
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
-
-    // ----- Look if it is a directory
-    if (substr($p_header['filename'], -1) == '/') {
-      //$p_header['external'] = 0x41FF0010;
-      $p_header['external'] = 0x00000010;
-    }
-
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFileHeaders()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success,
-  //   0 on error;
-  // --------------------------------------------------------------------------------
-  function privCheckFileHeaders(&$p_local_header, &$p_central_header)
-  {
-    $v_result=1;
-
-  	// ----- Check the static values
-  	// TBC
-  	if ($p_local_header['filename'] != $p_central_header['filename']) {
-  	}
-  	if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
-  	}
-  	if ($p_local_header['flag'] != $p_central_header['flag']) {
-  	}
-  	if ($p_local_header['compression'] != $p_central_header['compression']) {
-  	}
-  	if ($p_local_header['mtime'] != $p_central_header['mtime']) {
-  	}
-  	if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
-  	}
-  
-  	// ----- Look for flag bit 3
-  	if (($p_local_header['flag'] & 8) == 8) {
-          $p_local_header['size'] = $p_central_header['size'];
-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-          $p_local_header['crc'] = $p_central_header['crc'];
-  	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadEndCentralDir()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadEndCentralDir(&$p_central_dir)
-  {
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->zipname);
-    @fseek($this->zip_fd, $v_size);
-    if (@ftell($this->zip_fd) != $v_size)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- First try : look if this is an archive with no commentaries (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      @fseek($this->zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->zip_fd, 4);
-      $v_data = @unpack('Vid', $v_binary_data);
-
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        $v_found = 1;
-      }
-
-      $v_pos = ftell($this->zip_fd);
-    }
-
-    // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
-      $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
-      @fseek($this->zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->zip_fd);
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size)
-      {
-        // ----- Read a byte
-        $v_byte = @fread($this->zip_fd, 1);
-
-        // -----  Add the byte
-        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506)
-        {
-          $v_pos++;
-          break;
-        }
-
-        $v_pos++;
-      }
-
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size)
-      {
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 18);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
-
-    // ----- Check the global size
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
-
-	  // ----- Removed in release 2.2 see readme file
-	  // The check of the file size is a little too strict.
-	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
-	  // While decrypted, zip has training 0 bytes
-	  if (0) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
-	                       'The central dir is not at the end of the archive.'
-						   .' Some trailing bytes exists after the archive.');
-
-      // ----- Return
-      return PclZip::errorCode();
-	  }
-    }
-
-    // ----- Get comment
-    if ($v_data['comment_size'] != 0) {
-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
-    }
-    else
-      $p_central_dir['comment'] = '';
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    $p_central_dir['offset'] = $v_data['offset'];
-    $p_central_dir['size'] = $v_data['size'];
-    $p_central_dir['disk'] = $v_data['disk'];
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-
-    // TBC
-    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-    //}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDeleteByRule()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDeleteByRule(&$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    @rewind($this->zip_fd);
-    if (@fseek($this->zip_fd, $v_pos_entry))
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-
-        return $v_result;
-      }
-
-
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-      else {
-      	$v_found = true;
-      }
-
-      // ----- Look for deletion
-      if ($v_found)
-      {
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else
-      {
-        $v_nb_extracted++;
-      }
-    }
-
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new PclZip($v_zip_temp_name);
-
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-
-            // ----- Calculate the position of the header
-            @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-
-            // ----- Read the file header
-            $v_local_header = array();
-            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-            
-            // ----- Check that local file header is same as central file header
-            if ($this->privCheckFileHeaders($v_local_header,
-			                                $v_header_list[$i]) != 1) {
-                // TBC
-            }
-            unset($v_local_header);
-
-            // ----- Write the file header
-            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Read/write the data block
-            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-        }
-
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_temp_zip->zip_fd);
-
-        // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Transform the header to a 'usable' info
-            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-        }
-
-
-        // ----- Zip file comment
-        $v_comment = '';
-        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-        }
-
-        // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
-
-        // ----- Create the central dir footer
-        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
-            // ----- Reset the file list
-            unset($v_header_list);
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Close
-        $v_temp_zip->privCloseFd();
-        $this->privCloseFd();
-
-        // ----- Delete the zip file
-        // TBC : I should test the result ...
-        @unlink($this->zipname);
-
-        // ----- Rename the temporary file
-        // TBC : I should test the result ...
-        //@rename($v_zip_temp_name, $this->zipname);
-        PclZipUtilRename($v_zip_temp_name, $this->zipname);
-    
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
-    }
-    
-    // ----- Remove every files : reset the file
-    else if ($v_central_dir['entries'] != 0) {
-        $this->privCloseFd();
-
-        if (($v_result = $this->privOpenFd('wb')) != 1) {
-          return $v_result;
-        }
-
-        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          return $v_result;
-        }
-
-        $this->privCloseFd();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDirCheck()
-  // Description :
-  //   Check if a directory exists, if not it creates it and all the parents directory
-  //   which may be useful.
-  // Parameters :
-  //   $p_dir : Directory path to check.
-  // Return Values :
-  //    1 : OK
-  //   -1 : Unable to create directory
-  // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
-  {
-    $v_result = 1;
-
-
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
-    {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
-
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == ""))
-    {
-      return 1;
-    }
-
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir)
-    {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "")
-      {
-        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privMerge()
-  // Description :
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privMerge(&$p_archive_to_add)
-  {
-    $v_result=1;
-
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
-    {
-
-      // ----- Nothing to merge, so merge is a success
-      $v_result = 1;
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Look if the archive exists
-    if (!is_file($this->zipname))
-    {
-
-      // ----- Do a duplicate
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-
-    // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
-    {
-      $this->privCloseFd();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($p_archive_to_add->zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($v_zip_temp_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
-
-    // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-      @fclose($v_zip_temp_fd);
-      $this->zip_fd = null;
-
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->privCloseFd();
-    $p_archive_to_add->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDuplicate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDuplicate($p_archive_filename)
-  {
-    $v_result=1;
-
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
-    {
-
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
-    {
-      $this->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = filesize($p_archive_filename);
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorLog()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclError($p_error_code, $p_error_string);
-    }
-    else {
-      $this->error_code = $p_error_code;
-      $this->error_string = $p_error_string;
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorReset()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorReset()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclErrorReset();
-    }
-    else {
-      $this->error_code = 0;
-      $this->error_string = '';
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDisableMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDisableMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-	}
-
-    // ----- Look if already done
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-	}
-
-	// ----- Get and memorize the magic_quote value
-	$this->magic_quotes_status = @get_magic_quotes_runtime();
-
-	// ----- Disable magic_quotes
-	if ($this->magic_quotes_status == 1) {
-	  @set_magic_quotes_runtime(0);
-	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privSwapBackMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privSwapBackMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-	}
-
-    // ----- Look if something to do
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-	}
-
-	// ----- Swap back magic_quotes
-	if ($this->magic_quotes_status == 1) {
-  	  @set_magic_quotes_runtime($this->magic_quotes_status);
-	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  }
-  // End of class
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathReduction()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathReduction($p_dir)
-  {
-    $v_result = "";
-
-    // ----- Look for not empty path
-    if ($p_dir != "") {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
-
-      // ----- Study directories from last to first
-      $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-        // ----- Look for current path
-        if ($v_list[$i] == ".") {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
-		  $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
-		  // ----- First '/' i.e. root slash
-		  if ($i == 0) {
-            $v_result = "/".$v_result;
-		    if ($v_skip > 0) {
-		        // ----- It is an invalid path, so the path is not modified
-		        // TBC
-		        $v_result = $p_dir;
-                $v_skip = 0;
-		    }
-		  }
-		  // ----- Last '/' i.e. indicates a directory
-		  else if ($i == (sizeof($v_list)-1)) {
-            $v_result = $v_list[$i];
-		  }
-		  // ----- Double '/' inside the path
-		  else {
-            // ----- Ignore only the double '//' in path,
-            // but not the first and last '/'
-		  }
-        }
-        else {
-		  // ----- Look for item to skip
-		  if ($v_skip > 0) {
-		    $v_skip--;
-		  }
-		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
-		  }
-        }
-      }
-      
-      // ----- Look for skip
-      if ($v_skip > 0) {
-        while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
-            $v_skip--;
-        }
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathInclusion()
-  // Description :
-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
-  //   said in an other way, if the file or sub-dir $p_path is inside the dir
-  //   $p_dir.
-  //   The function indicates also if the path is exactly the same as the dir.
-  //   This function supports path with duplicated '/' like '//', but does not
-  //   support '.' or '..' statements.
-  // Parameters :
-  // Return Values :
-  //   0 if $p_path is not inside directory $p_dir
-  //   1 if $p_path is inside directory $p_dir
-  //   2 if $p_path is exactly the same as $p_dir
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathInclusion($p_dir, $p_path)
-  {
-    $v_result = 1;
-    
-    // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
-    }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
-    }
-
-    // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
-    $v_list_path_size = sizeof($v_list_path);
-
-    // ----- Study directories paths
-    $i = 0;
-    $j = 0;
-    while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
-
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
-        $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
-        $j++;
-        continue;
-      }
-
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
-        $v_result = 0;
-      }
-
-      // ----- Next items
-      $i++;
-      $j++;
-    }
-
-    // ----- Look if everything seems to be the same
-    if ($v_result) {
-      // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
-
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-        // ----- There are exactly the same
-        $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilCopyBlock()
-  // Description :
-  // Parameters :
-  //   $p_mode : read/write compression mode
-  //             0 : src & dest normal
-  //             1 : src gzip, dest normal
-  //             2 : src normal, dest gzip
-  //             3 : src & dest gzip
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
-  {
-    $v_result = 1;
-
-    if ($p_mode==0)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilRename()
-  // Description :
-  //   This function tries to do a simple rename() function. If it fails, it
-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
-  //   first one.
-  // Parameters :
-  //   $p_src : Old filename
-  //   $p_dest : New filename
-  // Return Values :
-  //   1 on success, 0 on failure.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilRename($p_src, $p_dest)
-  {
-    $v_result = 1;
-
-    // ----- Try to rename the files
-    if (!@rename($p_src, $p_dest)) {
-
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        $v_result = 0;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilOptionText()
-  // Description :
-  //   Translate option value in text. Mainly for debug purpose.
-  // Parameters :
-  //   $p_option : the option value.
-  // Return Values :
-  //   The option text value.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilOptionText($p_option)
-  {
-    
-    $v_list = get_defined_constants();
-    for (reset($v_list); $v_key = key($v_list); next($v_list)) {
-	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
-           || ($v_prefix == 'PCLZIP_CB_')
-           || ($v_prefix == 'PCLZIP_ATT'))
-	        && ($v_list[$v_key] == $p_option)) {
-        return $v_key;
-	    }
-    }
-    
-    $v_result = 'Unknown';
-
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilTranslateWinPath()
-  // Description :
-  //   Translate windows path by replacing '\' by '/' and optionally removing
-  //   drive letter.
-  // Parameters :
-  //   $p_path : path to translate.
-  //   $p_remove_disk_letter : true | false
-  // Return Values :
-  //   The path translated.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
-  {
-    if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
-    }
-    return $p_path;
-  }
-  // --------------------------------------------------------------------------------
-
-
-?>
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/PCLZip/readme.txt b/plugins/exportTypes/Excel/PHPExcel/Shared/PCLZip/readme.txt
deleted file mode 100755
index 6ed883947..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/PCLZip/readme.txt
+++ /dev/null
@@ -1,421 +0,0 @@
-// --------------------------------------------------------------------------------
-// PclZip 2.8.2 - readme.txt
-// --------------------------------------------------------------------------------
-// License GNU/LGPL - August 2009
-// Vincent Blavet - vincent@phpconcept.net
-// http://www.phpconcept.net
-// --------------------------------------------------------------------------------
-// $Id: readme.txt,v 1.60 2009/09/30 20:35:21 vblavet Exp $
-// --------------------------------------------------------------------------------
-
-
-
-0 - Sommaire
-============
-    1 - Introduction
-    2 - What's new
-    3 - Corrected bugs
-    4 - Known bugs or limitations
-    5 - License
-    6 - Warning
-    7 - Documentation
-    8 - Author
-    9 - Contribute
-
-1 - Introduction
-================
-
-  PclZip is a library that allow you to manage a Zip archive.
-
-  Full documentation about PclZip can be found here : http://www.phpconcept.net/pclzip
-
-2 - What's new
-==============
-
-  Version 2.8.2 :
-    - PCLZIP_CB_PRE_EXTRACT and PCLZIP_CB_POST_EXTRACT are now supported with 
-      extraction as a string (PCLZIP_OPT_EXTRACT_AS_STRING). The string
-      can also be modified in the post-extract call back.
-    **Bugs correction :
-    - PCLZIP_OPT_REMOVE_ALL_PATH was not working correctly    
-    - Remove use of eval() and do direct call to callback functions
-    - Correct support of 64bits systems (Thanks to WordPress team)
-
-  Version 2.8.1 :
-    - Move option PCLZIP_OPT_BY_EREG to PCLZIP_OPT_BY_PREG because ereg() is
-      deprecated in PHP 5.3. When using option PCLZIP_OPT_BY_EREG, PclZip will
-      automatically replace it by PCLZIP_OPT_BY_PREG.
-  
-  Version 2.8 :
-    - Improve extraction of zip archive for large files by using temporary files
-      This feature is working like the one defined in r2.7.
-      Options are renamed : PCLZIP_OPT_TEMP_FILE_ON, PCLZIP_OPT_TEMP_FILE_OFF,
-      PCLZIP_OPT_TEMP_FILE_THRESHOLD
-    - Add a ratio constant PCLZIP_TEMPORARY_FILE_RATIO to configure the auto
-      sense of temporary file use.
-    - Bug correction : Reduce filepath in returned file list to remove ennoying
-      './/' preambule in file path.
-
-  Version 2.7 :
-    - Improve creation of zip archive for large files :
-      PclZip will now autosense the configured memory and use temporary files
-      when large file is suspected.
-      This feature can also ne triggered by manual options in create() and add()
-      methods. 'PCLZIP_OPT_ADD_TEMP_FILE_ON' force the use of temporary files,
-      'PCLZIP_OPT_ADD_TEMP_FILE_OFF' disable the autosense technic, 
-      'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD' allow for configuration of a size
-      threshold to use temporary files.
-      Using "temporary files" rather than "memory" might take more time, but
-      might give the ability to zip very large files :
-      Tested on my win laptop with a 88Mo file :
-        Zip "in-memory" : 18sec (max_execution_time=30, memory_limit=180Mo)
-        Zip "tmporary-files" : 23sec (max_execution_time=30, memory_limit=30Mo)
-    - Replace use of mktime() by time() to limit the E_STRICT error messages.
-    - Bug correction : When adding files with full windows path (drive letter)
-      PclZip is now working. Before, if the drive letter is not the default
-      path, PclZip was not able to add the file.
-
-  Version 2.6 :
-    - Code optimisation
-    - New attributes PCLZIP_ATT_FILE_COMMENT gives the ability to
-      add a comment for a specific file. (Don't really know if this is usefull)
-    - New attribute PCLZIP_ATT_FILE_CONTENT gives the ability to add a string 
-      as a file.
-    - New attribute PCLZIP_ATT_FILE_MTIME modify the timestamp associated with
-      a file.
-    - Correct a bug. Files archived with a timestamp with 0h0m0s were extracted
-      with current time
-    - Add CRC value in the informations returned back for each file after an
-      action.
-    - Add missing closedir() statement.
-    - When adding a folder, and removing the path of this folder, files were
-      incorrectly added with a '/' at the beginning. Which means files are 
-      related to root in unix systems. Corrected.
-    - Add conditional if before constant definition. This will allow users
-      to redefine constants without changing the file, and then improve
-      upgrade of pclzip code for new versions.
-  
-  Version 2.5 :
-    - Introduce the ability to add file/folder with individual properties (file descriptor).
-      This gives for example the ability to change the filename of a zipped file.
-      . Able to add files individually
-      . Able to change full name
-      . Able to change short name
-      . Compatible with global options
-    - New attributes : PCLZIP_ATT_FILE_NAME, PCLZIP_ATT_FILE_NEW_SHORT_NAME, PCLZIP_ATT_FILE_NEW_FULL_NAME
-    - New error code : PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE
-    - Add a security control feature. PclZip can extract any file in any folder
-      of a system. People may use this to upload a zip file and try to override
-      a system file. The PCLZIP_OPT_EXTRACT_DIR_RESTRICTION will give the
-      ability to forgive any directory transversal behavior.
-    - New PCLZIP_OPT_EXTRACT_DIR_RESTRICTION : check extraction path
-    - New error code : PCLZIP_ERR_DIRECTORY_RESTRICTION
-    - Modification in PclZipUtilPathInclusion() : dir and path beginning with ./ will be prepend
-      by current path (getcwd())
-  
-  Version 2.4 :
-    - Code improvment : try to speed up the code by removing unusefull call to pack()
-    - Correct bug in delete() : delete() should be called with no argument. This was not
-      the case in 2.3. This is corrected in 2.4.
-    - Correct a bug in path_inclusion function. When the path has several '../../', the
-      result was bad.
-    - Add a check for magic_quotes_runtime configuration. If enabled, PclZip will 
-      disable it while working and det it back to its original value.
-      This resolve a lots of bad formated archive errors.
-    - Bug correction : PclZip now correctly unzip file in some specific situation,
-      when compressed content has same size as uncompressed content.
-    - Bug correction : When selecting option 'PCLZIP_OPT_REMOVE_ALL_PATH', 
-      directories are not any more created.
-    - Code improvment : correct unclosed opendir(), better handling of . and .. in
-      loops.
-
-
-  Version 2.3 :
-    - Correct a bug with PHP5 : affecting the value 0xFE49FFE0 to a variable does not
-      give the same result in PHP4 and PHP5 ....
-
-  Version 2.2 :
-    - Try development of PCLZIP_OPT_CRYPT .....
-      However this becomes to a stop. To crypt/decrypt I need to multiply 2 long integers,
-      the result (greater than a long) is not supported by PHP. Even the use of bcmath
-      functions does not help. I did not find yet a solution ...;
-    - Add missing '/' at end of directory entries
-    - Check is a file is encrypted or not. Returns status 'unsupported_encryption' and/or
-      error code PCLZIP_ERR_UNSUPPORTED_ENCRYPTION.
-    - Corrected : Bad "version need to extract" field in local file header
-    - Add private method privCheckFileHeaders() in order to check local and central
-      file headers. PclZip is now supporting purpose bit flag bit 3. Purpose bit flag bit 3 gives
-      the ability to have a local file header without size, compressed size and crc filled.
-    - Add a generic status 'error' for file status
-    - Add control of compression type. PclZip only support deflate compression method.
-      Before v2.2, PclZip does not check the compression method used in an archive while
-      extracting. With v2.2 PclZip returns a new error status for a file using an unsupported
-      compression method. New status is "unsupported_compression". New error code is
-      PCLZIP_ERR_UNSUPPORTED_COMPRESSION.
-    - Add optional attribute PCLZIP_OPT_STOP_ON_ERROR. This will stop the extract of files
-      when errors like 'a folder with same name exists' or 'a newer file exists' or
-      'a write protected file' exists, rather than set a status for the concerning file
-      and resume the extract of the zip.
-    - Add optional attribute PCLZIP_OPT_REPLACE_NEWER. This will force, during an extract' the
-      replacement of the file, even if a  newer version of the file exists.
-      Note that today if a file with the same name already exists but is older it will be
-      replaced by the extracted one.
-    - Improve PclZipUtilOption()
-    - Support of zip archive with trailing bytes. Before 2.2, PclZip checks that the central
-      directory structure is the last data in the archive. Crypt encryption/decryption of
-      zip archive put trailing 0 bytes after decryption. PclZip is now supporting this.
-
-  Version 2.1 :
-    - Add the ability to abort the extraction by using a user callback function.
-      The user can now return the value '2' in its callback which indicates to stop the
-      extraction. For a pre call-back extract is stopped before the extration of the current
-      file. For a post call back, the extraction is stopped after.
-    - Add the ability to extract a file (or several files) directly in the standard output.
-      This is done by the new parameter PCLZIP_OPT_EXTRACT_IN_OUTPUT with method extract().
-    - Add support for parameters PCLZIP_OPT_COMMENT, PCLZIP_OPT_ADD_COMMENT,
-      PCLZIP_OPT_PREPEND_COMMENT. This will create, replace, add, or prepend comments
-      in the zip archive.
-    - When merging two archives, the comments are not any more lost, but merged, with a 
-      blank space separator.
-    - Corrected bug : Files are not deleted when all files are asked to be deleted.
-    - Corrected bug : Folders with name '0' made PclZip to abort the create or add feature.
-
-
-  Version 2.0 :
-    ***** Warning : Some new features may break the backward compatibility for your scripts.
-                    Please carefully read the readme file.
-    - Add the ability to delete by Index, name and regular expression. This feature is 
-      performed by the method delete(), which uses the optional parameters
-      PCLZIP_OPT_BY_INDEX, PCLZIP_OPT_BY_NAME, PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG.
-    - Add the ability to extract by regular expression. To extract by regexp you must use the method
-      extract(), with the option PCLZIP_OPT_BY_EREG or PCLZIP_OPT_BY_PREG 
-      (depending if you want to use ereg() or preg_match() syntax) followed by the 
-      regular expression pattern.
-    - Add the ability to extract by index, directly with the extract() method. This is a
-      code improvment of the extractByIndex() method.
-    - Add the ability to extract by name. To extract by name you must use the method
-      extract(), with the option PCLZIP_OPT_BY_NAME followed by the filename to
-      extract or an array of filenames to extract. To extract all a folder, use the folder
-      name rather than the filename with a '/' at the end.
-    - Add the ability to add files without compression. This is done with a new attribute
-      which is PCLZIP_OPT_NO_COMPRESSION.
-    - Add the attribute PCLZIP_OPT_EXTRACT_AS_STRING, which allow to extract a file directly
-      in a string without using any file (or temporary file).
-    - Add constant PCLZIP_SEPARATOR for static configuration of filename separators in a single string.
-      The default separator is now a comma (,) and not any more a blank space.
-      THIS BREAK THE BACKWARD COMPATIBILITY : Please check if this may have an impact with
-      your script.
-    - Improve algorythm performance by removing the use of temporary files when adding or 
-      extracting files in an archive.
-    - Add (correct) detection of empty filename zipping. This can occurs when the removed
-      path is the same
-      as a zipped dir. The dir is not zipped (['status'] = filtered), only its content.
-    - Add better support for windows paths (thanks for help from manus@manusfreedom.com).
-    - Corrected bug : When the archive file already exists with size=0, the add() method
-      fails. Corrected in 2.0.
-    - Remove the use of OS_WINDOWS constant. Use php_uname() function rather.
-    - Control the order of index ranges in extract by index feature.
-    - Change the internal management of folders (better handling of internal flag).
-
-
-  Version 1.3 :
-    - Removing the double include check. This is now done by include_once() and require_once()
-      PHP directives.
-    - Changing the error handling mecanism : Remove the use of an external error library.
-      The former PclError...() functions are replaced by internal equivalent methods.
-      By changing the environment variable PCLZIP_ERROR_EXTERNAL you can still use the former library.
-      Introducing the use of constants for error codes rather than integer values. This will help
-      in futur improvment.
-      Introduction of error handling functions like errorCode(), errorName() and errorInfo().
-    - Remove the deprecated use of calling function with arguments passed by reference.
-    - Add the calling of extract(), extractByIndex(), create() and add() functions
-      with variable options rather than fixed arguments.
-    - Add the ability to remove all the file path while extracting or adding,
-      without any need to specify the path to remove.
-      This is available for extract(), extractByIndex(), create() and add() functionS by using
-      the new variable options parameters :
-      - PCLZIP_OPT_REMOVE_ALL_PATH : by indicating this option while calling the fct.
-    - Ability to change the mode of a file after the extraction (chmod()).
-      This is available for extract() and extractByIndex() functionS by using
-      the new variable options parameters.
-      - PCLZIP_OPT_SET_CHMOD : by setting the value of this option.
-    - Ability to definition call-back options. These call-back will be called during the adding,
-      or the extracting of file (extract(), extractByIndex(), create() and add() functions) :
-      - PCLZIP_CB_PRE_EXTRACT : will be called before each extraction of a file. The user
-        can trigerred the change the filename of the extracted file. The user can triggered the
-        skip of the extraction. This is adding a 'skipped' status in the file list result value.
-      - PCLZIP_CB_POST_EXTRACT : will be called after each extraction of a file.
-        Nothing can be triggered from that point.
-      - PCLZIP_CB_PRE_ADD : will be called before each add of a file. The user
-        can trigerred the change the stored filename of the added file. The user can triggered the
-        skip of the add. This is adding a 'skipped' status in the file list result value.
-      - PCLZIP_CB_POST_ADD : will be called after each add of a file.
-        Nothing can be triggered from that point.
-    - Two status are added in the file list returned as function result : skipped & filename_too_long
-      'skipped' is used when a call-back function ask for skipping the file.
-      'filename_too_long' is used while adding a file with a too long filename to archive (the file is
-      not added)
-    - Adding the function PclZipUtilPathInclusion(), that check the inclusion of a path into
-      a directory.
-    - Add a check of the presence of the archive file before some actions (like list, ...)
-    - Add the initialisation of field "index" in header array. This means that by
-      default index will be -1 when not explicitly set by the methods.
-
-  Version 1.2 :
-    - Adding a duplicate function.
-    - Adding a merge function. The merge function is a "quick merge" function,
-      it just append the content of an archive at the end of the first one. There
-      is no check for duplicate files or more recent files.
-    - Improve the search of the central directory end.
-
-  Version 1.1.2 :
-
-    - Changing the license of PclZip. PclZip is now released under the GNU / LGPL license
-      (see License section).
-    - Adding the optional support of a static temporary directory. You will need to configure
-      the constant PCLZIP_TEMPORARY_DIR if you want to use this feature.
-    - Improving the rename() function. In some cases rename() does not work (different
-      Filesystems), so it will be replaced by a copy() + unlink() functions.
-
-  Version 1.1.1 :
-
-    - Maintenance release, no new feature.
-
-  Version 1.1 :
-
-    - New method Add() : adding files in the archive
-    - New method ExtractByIndex() : partial extract of the archive, files are identified by
-      their index in the archive
-    - New method DeleteByIndex() : delete some files/folder entries from the archive,
-      files are identified by their index in the archive.
-    - Adding a test of the zlib extension presence. If not present abort the script.
-
-  Version 1.0.1 :
-
-    - No new feature
-
-
-3 - Corrected bugs
-==================
-
-  Corrected in Version 2.0 :
-    - Corrected : During an extraction, if a call-back fucntion is used and try to skip
-                  a file, all the extraction process is stopped. 
-
-  Corrected in Version 1.3 :
-    - Corrected : Support of static synopsis for method extract() is broken.
-    - Corrected : invalid size of archive content field (0xFF) should be (0xFFFF).
-    - Corrected : When an extract is done with a remove_path parameter, the entry for
-      the directory with exactly the same path is not skipped/filtered.
-    - Corrected : extractByIndex() and deleteByIndex() were not managing index in the
-      right way. For example indexes '1,3-5,11' will only extract files 1 and 11. This
-      is due to a sort of the index resulting table that puts 11 before 3-5 (sort on
-      string and not interger). The sort is temporarilly removed, this means that
-      you must provide a sorted list of index ranges.
-
-  Corrected in Version 1.2 :
-
-    - Nothing.
-
-  Corrected in Version 1.1.2 :
-
-    - Corrected : Winzip is unable to delete or add new files in a PclZip created archives.
-
-  Corrected in Version 1.1.1 :
-
-    - Corrected : When archived file is not compressed (0% compression), the
-      extract method fails.
-
-  Corrected in Version 1.1 :
-
-    - Corrected : Adding a complete tree of folder may result in a bad archive
-      creation.
-
-  Corrected in Version 1.0.1 :
-
-    - Corrected : Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024).
-
-
-4 - Known bugs or limitations
-=============================
-
-  Please publish bugs reports in SourceForge :
-    http://sourceforge.net/tracker/?group_id=40254&atid=427564
-
-  In Version 2.x :
-    - PclZip does only support file uncompressed or compressed with deflate (compression method 8)
-    - PclZip does not support password protected zip archive
-    - Some concern were seen when changing mtime of a file while archiving. 
-      Seems to be linked to Daylight Saving Time (PclTest_changing_mtime).
-
-  In Version 1.2 :
-
-    - merge() methods does not check for duplicate files or last date of modifications.
-
-  In Version 1.1 :
-
-    - Limitation : Using 'extract' fields in the file header in the zip archive is not supported.
-    - WinZip is unable to delete a single file in a PclZip created archive. It is also unable to
-      add a file in a PclZip created archive. (Corrected in v.1.2)
-
-  In Version 1.0.1 :
-
-    - Adding a complete tree of folder may result in a bad archive
-      creation. (Corrected in V.1.1).
-    - Path given to methods must be in the unix format (/) and not the Windows format (\).
-      Workaround : Use only / directory separators.
-    - PclZip is using temporary files that are sometime the name of the file with a .tmp or .gz
-      added suffix. Files with these names may already exist and may be overwritten.
-      Workaround : none.
-    - PclZip does not check if the zlib extension is present. If it is absent, the zip
-      file is not created and the lib abort without warning.
-      Workaround : enable the zlib extension on the php install
-
-  In Version 1.0 :
-
-    - Error while compressing files greater than PCLZIP_READ_BLOCK_SIZE (default=1024).
-      (Corrected in v.1.0.1)
-    - Limitation : Multi-disk zip archive are not supported.
-
-
-5 - License
-===========
-
-  Since version 1.1.2, PclZip Library is released under GNU/LGPL license.
-  This library is free, so you can use it at no cost.
-
-  HOWEVER, if you release a script, an application, a library or any kind of
-  code using PclZip library (or a part of it), YOU MUST :
-  - Indicate in the documentation (or a readme file), that your work
-    uses PclZip Library, and make a reference to the author and the web site
-    http://www.phpconcept.net
-  - Gives the ability to the final user to update the PclZip libary.
-
-  I will also appreciate that you send me a mail (vincent@phpconcept.net), just to
-  be aware that someone is using PclZip.
-
-  For more information about GNU/LGPL license : http://www.gnu.org
-
-6 - Warning
-=================
-
-  This library and the associated files are non commercial, non professional work.
-  It should not have unexpected results. However if any damage is caused by this software
-  the author can not be responsible.
-  The use of this software is at the risk of the user.
-
-7 - Documentation
-=================
-  PclZip User Manuel is available in English on PhpConcept : http://www.phpconcept.net/pclzip/man/en/index.php
-  A Russian translation was done by Feskov Kuzma : http://php.russofile.ru/ru/authors/unsort/zip/
-
-8 - Author
-==========
-
-  This software was written by Vincent Blavet (vincent@phpconcept.net) on its leasure time.
-
-9 - Contribute
-==============
-  If you want to contribute to the development of PclZip, please contact vincent@phpconcept.net.
-  If you can help in financing PhpConcept hosting service, please go to
-  http://www.phpconcept.net/soutien.php
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/PasswordHasher.php b/plugins/exportTypes/Excel/PHPExcel/Shared/PasswordHasher.php
deleted file mode 100755
index f4a773a11..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/PasswordHasher.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_PasswordHasher
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_PasswordHasher
-{
-	/**
-	 * Create a password hash from a given string.
-	 *
-	 * This method is based on the algorithm provided by
-	 * Daniel Rentz of OpenOffice and the PEAR package
-	 * Spreadsheet_Excel_Writer by Xavier Noguer <xnoguer@rezebra.com>.
-	 *
-	 * @param 	string	$pPassword	Password to hash
-	 * @return 	string				Hashed password
-	 */
-	public static function hashPassword($pPassword = '') {
-        $password = 0x0000;
-        $i        = 1;       // char position
-
-        // split the plain text password in its component characters
-        $chars = preg_split('//', $pPassword, -1, PREG_SPLIT_NO_EMPTY);
-        foreach ($chars as $char) {
-            $value        = ord($char) << $i;   // shifted ASCII value
-            $rotated_bits = $value >> 15;       // rotated bits beyond bit 15
-            $value       &= 0x7fff;             // first 15 bits
-            $password    ^= ($value | $rotated_bits);
-            ++$i;
-        }
-
-        $password ^= strlen($pPassword);
-        $password ^= 0xCE4B;
-
-        return(strtoupper(dechex($password)));
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/String.php b/plugins/exportTypes/Excel/PHPExcel/Shared/String.php
deleted file mode 100755
index cee3ea4ed..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/String.php
+++ /dev/null
@@ -1,730 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_String
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_String
-{
-	/**	Constants				*/
-	/**	Regular Expressions		*/
-	//	Fraction
-	const STRING_REGEXP_FRACTION	= '(-?)(\d+)\s+(\d+\/\d+)';
-
-
-	/**
-	 * Control characters array
-	 *
-	 * @var string[]
-	 */
-	private static $_controlCharacters = array();
-
-	/**
-	 * SYLK Characters array
-	 *
-	 * $var array
-	 */
-	private static $_SYLKCharacters = array();
-
-	/**
-	 * Decimal separator
-	 *
-	 * @var string
-	 */
-	private static $_decimalSeparator;
-
-	/**
-	 * Thousands separator
-	 *
-	 * @var string
-	 */
-	private static $_thousandsSeparator;
-
-	/**
-	 * Currency code
-	 *
-	 * @var string
-	 */
-	private static $_currencyCode;
-
-	/**
-	 * Is mbstring extension avalable?
-	 *
-	 * @var boolean
-	 */
-	private static $_isMbstringEnabled;
-
-	/**
-	 * Is iconv extension avalable?
-	 *
-	 * @var boolean
-	 */
-	private static $_isIconvEnabled;
-
-	/**
-	 * Build control characters array
-	 */
-	private static function _buildControlCharacters() {
-		for ($i = 0; $i <= 31; ++$i) {
-			if ($i != 9 && $i != 10 && $i != 13) {
-				$find = '_x' . sprintf('%04s' , strtoupper(dechex($i))) . '_';
-				$replace = chr($i);
-				self::$_controlCharacters[$find] = $replace;
-			}
-		}
-	}
-
-	/**
-	 * Build SYLK characters array
-	 */
-	private static function _buildSYLKCharacters()
-	{
-		self::$_SYLKCharacters = array(
-			"\x1B 0"  => chr(0),
-			"\x1B 1"  => chr(1),
-			"\x1B 2"  => chr(2),
-			"\x1B 3"  => chr(3),
-			"\x1B 4"  => chr(4),
-			"\x1B 5"  => chr(5),
-			"\x1B 6"  => chr(6),
-			"\x1B 7"  => chr(7),
-			"\x1B 8"  => chr(8),
-			"\x1B 9"  => chr(9),
-			"\x1B :"  => chr(10),
-			"\x1B ;"  => chr(11),
-			"\x1B <"  => chr(12),
-			"\x1B :"  => chr(13),
-			"\x1B >"  => chr(14),
-			"\x1B ?"  => chr(15),
-			"\x1B!0"  => chr(16),
-			"\x1B!1"  => chr(17),
-			"\x1B!2"  => chr(18),
-			"\x1B!3"  => chr(19),
-			"\x1B!4"  => chr(20),
-			"\x1B!5"  => chr(21),
-			"\x1B!6"  => chr(22),
-			"\x1B!7"  => chr(23),
-			"\x1B!8"  => chr(24),
-			"\x1B!9"  => chr(25),
-			"\x1B!:"  => chr(26),
-			"\x1B!;"  => chr(27),
-			"\x1B!<"  => chr(28),
-			"\x1B!="  => chr(29),
-			"\x1B!>"  => chr(30),
-			"\x1B!?"  => chr(31),
-			"\x1B'?"  => chr(127),
-			"\x1B(0"  => '€', // 128 in CP1252
-			"\x1B(2"  => '‚', // 130 in CP1252
-			"\x1B(3"  => 'ƒ', // 131 in CP1252
-			"\x1B(4"  => '„', // 132 in CP1252
-			"\x1B(5"  => '…', // 133 in CP1252
-			"\x1B(6"  => '†', // 134 in CP1252
-			"\x1B(7"  => '‡', // 135 in CP1252
-			"\x1B(8"  => 'ˆ', // 136 in CP1252
-			"\x1B(9"  => '‰', // 137 in CP1252
-			"\x1B(:"  => 'Š', // 138 in CP1252
-			"\x1B(;"  => '‹', // 139 in CP1252
-			"\x1BNj"  => 'Œ', // 140 in CP1252
-			"\x1B(>"  => 'Ž', // 142 in CP1252
-			"\x1B)1"  => '‘', // 145 in CP1252
-			"\x1B)2"  => '’', // 146 in CP1252
-			"\x1B)3"  => '“', // 147 in CP1252
-			"\x1B)4"  => '”', // 148 in CP1252
-			"\x1B)5"  => '•', // 149 in CP1252
-			"\x1B)6"  => '–', // 150 in CP1252
-			"\x1B)7"  => '—', // 151 in CP1252
-			"\x1B)8"  => '˜', // 152 in CP1252
-			"\x1B)9"  => '™', // 153 in CP1252
-			"\x1B):"  => 'š', // 154 in CP1252
-			"\x1B);"  => '›', // 155 in CP1252
-			"\x1BNz"  => 'œ', // 156 in CP1252
-			"\x1B)>"  => 'ž', // 158 in CP1252
-			"\x1B)?"  => 'Ÿ', // 159 in CP1252
-			"\x1B*0"  => ' ', // 160 in CP1252
-			"\x1BN!"  => '¡', // 161 in CP1252
-			"\x1BN\"" => '¢', // 162 in CP1252
-			"\x1BN#"  => '£', // 163 in CP1252
-			"\x1BN("  => '¤', // 164 in CP1252
-			"\x1BN%"  => '¥', // 165 in CP1252
-			"\x1B*6"  => '¦', // 166 in CP1252
-			"\x1BN'"  => '§', // 167 in CP1252
-			"\x1BNH " => '¨', // 168 in CP1252
-			"\x1BNS"  => '©', // 169 in CP1252
-			"\x1BNc"  => 'ª', // 170 in CP1252
-			"\x1BN+"  => '«', // 171 in CP1252
-			"\x1B*<"  => '¬', // 172 in CP1252
-			"\x1B*="  => '­', // 173 in CP1252
-			"\x1BNR"  => '®', // 174 in CP1252
-			"\x1B*?"  => '¯', // 175 in CP1252
-			"\x1BN0"  => '°', // 176 in CP1252
-			"\x1BN1"  => '±', // 177 in CP1252
-			"\x1BN2"  => '²', // 178 in CP1252
-			"\x1BN3"  => '³', // 179 in CP1252
-			"\x1BNB " => '´', // 180 in CP1252
-			"\x1BN5"  => 'µ', // 181 in CP1252
-			"\x1BN6"  => '¶', // 182 in CP1252
-			"\x1BN7"  => '·', // 183 in CP1252
-			"\x1B+8"  => '¸', // 184 in CP1252
-			"\x1BNQ"  => '¹', // 185 in CP1252
-			"\x1BNk"  => 'º', // 186 in CP1252
-			"\x1BN;"  => '»', // 187 in CP1252
-			"\x1BN<"  => '¼', // 188 in CP1252
-			"\x1BN="  => '½', // 189 in CP1252
-			"\x1BN>"  => '¾', // 190 in CP1252
-			"\x1BN?"  => '¿', // 191 in CP1252
-			"\x1BNAA" => 'À', // 192 in CP1252
-			"\x1BNBA" => 'Á', // 193 in CP1252
-			"\x1BNCA" => 'Â', // 194 in CP1252
-			"\x1BNDA" => 'Ã', // 195 in CP1252
-			"\x1BNHA" => 'Ä', // 196 in CP1252
-			"\x1BNJA" => 'Å', // 197 in CP1252
-			"\x1BNa"  => 'Æ', // 198 in CP1252
-			"\x1BNKC" => 'Ç', // 199 in CP1252
-			"\x1BNAE" => 'È', // 200 in CP1252
-			"\x1BNBE" => 'É', // 201 in CP1252
-			"\x1BNCE" => 'Ê', // 202 in CP1252
-			"\x1BNHE" => 'Ë', // 203 in CP1252
-			"\x1BNAI" => 'Ì', // 204 in CP1252
-			"\x1BNBI" => 'Í', // 205 in CP1252
-			"\x1BNCI" => 'Î', // 206 in CP1252
-			"\x1BNHI" => 'Ï', // 207 in CP1252
-			"\x1BNb"  => 'Ð', // 208 in CP1252
-			"\x1BNDN" => 'Ñ', // 209 in CP1252
-			"\x1BNAO" => 'Ò', // 210 in CP1252
-			"\x1BNBO" => 'Ó', // 211 in CP1252
-			"\x1BNCO" => 'Ô', // 212 in CP1252
-			"\x1BNDO" => 'Õ', // 213 in CP1252
-			"\x1BNHO" => 'Ö', // 214 in CP1252
-			"\x1B-7"  => '×', // 215 in CP1252
-			"\x1BNi"  => 'Ø', // 216 in CP1252
-			"\x1BNAU" => 'Ù', // 217 in CP1252
-			"\x1BNBU" => 'Ú', // 218 in CP1252
-			"\x1BNCU" => 'Û', // 219 in CP1252
-			"\x1BNHU" => 'Ü', // 220 in CP1252
-			"\x1B-="  => 'Ý', // 221 in CP1252
-			"\x1BNl"  => 'Þ', // 222 in CP1252
-			"\x1BN{"  => 'ß', // 223 in CP1252
-			"\x1BNAa" => 'à', // 224 in CP1252
-			"\x1BNBa" => 'á', // 225 in CP1252
-			"\x1BNCa" => 'â', // 226 in CP1252
-			"\x1BNDa" => 'ã', // 227 in CP1252
-			"\x1BNHa" => 'ä', // 228 in CP1252
-			"\x1BNJa" => 'å', // 229 in CP1252
-			"\x1BNq"  => 'æ', // 230 in CP1252
-			"\x1BNKc" => 'ç', // 231 in CP1252
-			"\x1BNAe" => 'è', // 232 in CP1252
-			"\x1BNBe" => 'é', // 233 in CP1252
-			"\x1BNCe" => 'ê', // 234 in CP1252
-			"\x1BNHe" => 'ë', // 235 in CP1252
-			"\x1BNAi" => 'ì', // 236 in CP1252
-			"\x1BNBi" => 'í', // 237 in CP1252
-			"\x1BNCi" => 'î', // 238 in CP1252
-			"\x1BNHi" => 'ï', // 239 in CP1252
-			"\x1BNs"  => 'ð', // 240 in CP1252
-			"\x1BNDn" => 'ñ', // 241 in CP1252
-			"\x1BNAo" => 'ò', // 242 in CP1252
-			"\x1BNBo" => 'ó', // 243 in CP1252
-			"\x1BNCo" => 'ô', // 244 in CP1252
-			"\x1BNDo" => 'õ', // 245 in CP1252
-			"\x1BNHo" => 'ö', // 246 in CP1252
-			"\x1B/7"  => '÷', // 247 in CP1252
-			"\x1BNy"  => 'ø', // 248 in CP1252
-			"\x1BNAu" => 'ù', // 249 in CP1252
-			"\x1BNBu" => 'ú', // 250 in CP1252
-			"\x1BNCu" => 'û', // 251 in CP1252
-			"\x1BNHu" => 'ü', // 252 in CP1252
-			"\x1B/="  => 'ý', // 253 in CP1252
-			"\x1BN|"  => 'þ', // 254 in CP1252
-			"\x1BNHy" => 'ÿ', // 255 in CP1252
-		);
-	}
-
-	/**
-	 * Get whether mbstring extension is available
-	 *
-	 * @return boolean
-	 */
-	public static function getIsMbstringEnabled()
-	{
-		if (isset(self::$_isMbstringEnabled)) {
-			return self::$_isMbstringEnabled;
-		}
-
-		self::$_isMbstringEnabled = function_exists('mb_convert_encoding') ?
-			true : false;
-
-		return self::$_isMbstringEnabled;
-	}
-
-	/**
-	 * Get whether iconv extension is available
-	 *
-	 * @return boolean
-	 */
-	public static function getIsIconvEnabled()
-	{
-		if (isset(self::$_isIconvEnabled)) {
-			return self::$_isIconvEnabled;
-		}
-
-		// Fail if iconv doesn't exist
-		if (!function_exists('iconv')) {
-			self::$_isIconvEnabled = false;
-			return false;
-		}
-
-		// Sometimes iconv is not working, and e.g. iconv('UTF-8', 'UTF-16LE', 'x') just returns false,
-		if (!@iconv('UTF-8', 'UTF-16LE', 'x')) {
-			self::$_isIconvEnabled = false;
-			return false;
-		}
-
-		// Sometimes iconv_substr('A', 0, 1, 'UTF-8') just returns false in PHP 5.2.0
-		// we cannot use iconv in that case either (http://bugs.php.net/bug.php?id=37773)
-		if (!@iconv_substr('A', 0, 1, 'UTF-8')) {
-			self::$_isIconvEnabled = false;
-			return false;
-		}
-
-		// CUSTOM: IBM AIX iconv() does not work
-		if ( defined('PHP_OS') && @stristr(PHP_OS, 'AIX')
-				&& defined('ICONV_IMPL') && (@strcasecmp(ICONV_IMPL, 'unknown') == 0)
-				&& defined('ICONV_VERSION') && (@strcasecmp(ICONV_VERSION, 'unknown') == 0) )
-		{
-			self::$_isIconvEnabled = false;
-			return false;
-		}
-
-		// If we reach here no problems were detected with iconv
-		self::$_isIconvEnabled = true;
-		return true;
-	}
-
-	public static function buildCharacterSets() {
-		if(empty(self::$_controlCharacters)) {
-			self::_buildControlCharacters();
-		}
-		if(empty(self::$_SYLKCharacters)) {
-			self::_buildSYLKCharacters();
-		}
-	}
-
-	/**
-	 * Convert from OpenXML escaped control character to PHP control character
-	 *
-	 * Excel 2007 team:
-	 * ----------------
-	 * That's correct, control characters are stored directly in the shared-strings table.
-	 * We do encode characters that cannot be represented in XML using the following escape sequence:
-	 * _xHHHH_ where H represents a hexadecimal character in the character's value...
-	 * So you could end up with something like _x0008_ in a string (either in a cell value (<v>)
-	 * element or in the shared string <t> element.
-	 *
-	 * @param 	string	$value	Value to unescape
-	 * @return 	string
-	 */
-	public static function ControlCharacterOOXML2PHP($value = '') {
-		return str_replace( array_keys(self::$_controlCharacters), array_values(self::$_controlCharacters), $value );
-	}
-
-	/**
-	 * Convert from PHP control character to OpenXML escaped control character
-	 *
-	 * Excel 2007 team:
-	 * ----------------
-	 * That's correct, control characters are stored directly in the shared-strings table.
-	 * We do encode characters that cannot be represented in XML using the following escape sequence:
-	 * _xHHHH_ where H represents a hexadecimal character in the character's value...
-	 * So you could end up with something like _x0008_ in a string (either in a cell value (<v>)
-	 * element or in the shared string <t> element.
-	 *
-	 * @param 	string	$value	Value to escape
-	 * @return 	string
-	 */
-	public static function ControlCharacterPHP2OOXML($value = '') {
-		return str_replace( array_values(self::$_controlCharacters), array_keys(self::$_controlCharacters), $value );
-	}
-
-	/**
-	 * Try to sanitize UTF8, stripping invalid byte sequences. Not perfect. Does not surrogate characters.
-	 *
-	 * @param string $value
-	 * @return string
-	 */
-	public static function SanitizeUTF8($value)
-	{
-		if (self::getIsIconvEnabled()) {
-			$value = @iconv('UTF-8', 'UTF-8', $value);
-			return $value;
-		}
-
-		if (self::getIsMbstringEnabled()) {
-			$value = mb_convert_encoding($value, 'UTF-8', 'UTF-8');
-			return $value;
-		}
-
-		// else, no conversion
-		return $value;
-	}
-
-	/**
-	 * Check if a string contains UTF8 data
-	 *
-	 * @param string $value
-	 * @return boolean
-	 */
-	public static function IsUTF8($value = '') {
-		return utf8_encode(utf8_decode($value)) === $value;
-	}
-
-	/**
-	 * Formats a numeric value as a string for output in various output writers forcing
-	 * point as decimal separator in case locale is other than English.
-	 *
-	 * @param mixed $value
-	 * @return string
-	 */
-	public static function FormatNumber($value) {
-		if (is_float($value)) {
-			return str_replace(',', '.', $value);
-		}
-		return (string) $value;
-	}
-
-	/**
-	 * Converts a UTF-8 string into BIFF8 Unicode string data (8-bit string length)
-	 * Writes the string using uncompressed notation, no rich text, no Asian phonetics
-	 * If mbstring extension is not available, ASCII is assumed, and compressed notation is used
-	 * although this will give wrong results for non-ASCII strings
-	 * see OpenOffice.org's Documentation of the Microsoft Excel File Format, sect. 2.5.3
-	 *
-	 * @param string $value UTF-8 encoded string
-	 * @return string
-	 */
-	public static function UTF8toBIFF8UnicodeShort($value, $arrcRuns = array())
-	{
-		// character count
-		$ln = self::CountCharacters($value, 'UTF-8');
-
-		// option flags
-		if(empty($arrcRuns)){
-			$opt = (self::getIsIconvEnabled() || self::getIsMbstringEnabled()) ?
-				0x0001 : 0x0000;
-			$data = pack('CC', $ln, $opt);
-			// characters
-			$data .= self::ConvertEncoding($value, 'UTF-16LE', 'UTF-8');
-		}
-		else {
-			$data = pack('vC', $ln, 0x08);
-			$data .= pack('v', count($arrcRuns));
-			// characters
-			$data .= $value;
-			foreach ($arrcRuns as $cRun){
-				$data .= pack('v', $cRun['strlen']);
-				$data .= pack('v', $cRun['fontidx']);
-			}
-		}
-		return $data;
-	}
-
-	/**
-	 * Converts a UTF-8 string into BIFF8 Unicode string data (16-bit string length)
-	 * Writes the string using uncompressed notation, no rich text, no Asian phonetics
-	 * If mbstring extension is not available, ASCII is assumed, and compressed notation is used
-	 * although this will give wrong results for non-ASCII strings
-	 * see OpenOffice.org's Documentation of the Microsoft Excel File Format, sect. 2.5.3
-	 *
-	 * @param string $value UTF-8 encoded string
-	 * @return string
-	 */
-	public static function UTF8toBIFF8UnicodeLong($value)
-	{
-		// character count
-		$ln = self::CountCharacters($value, 'UTF-8');
-
-		// option flags
-		$opt = (self::getIsIconvEnabled() || self::getIsMbstringEnabled()) ?
-			0x0001 : 0x0000;
-
-		// characters
-		$chars = self::ConvertEncoding($value, 'UTF-16LE', 'UTF-8');
-
-		$data = pack('vC', $ln, $opt) . $chars;
-		return $data;
-	}
-
-	/**
-	 * Convert string from one encoding to another. First try iconv, then mbstring, or no convertion
-	 *
-	 * @param string $value
-	 * @param string $to Encoding to convert to, e.g. 'UTF-8'
-	 * @param string $from Encoding to convert from, e.g. 'UTF-16LE'
-	 * @return string
-	 */
-	public static function ConvertEncoding($value, $to, $from)
-	{
-		if (self::getIsIconvEnabled()) {
-			$value = iconv($from, $to, $value);
-			return $value;
-		}
-
-		if (self::getIsMbstringEnabled()) {
-			$value = mb_convert_encoding($value, $to, $from);
-			return $value;
-		}
-		if($from == 'UTF-16LE'){
-			return self::utf16_decode($value, false);
-		}else if($from == 'UTF-16BE'){
-			return self::utf16_decode($value);
-		}
-		// else, no conversion
-		return $value;
-	}
-
-	/**
-	 * Decode UTF-16 encoded strings.
-	 *
-	 * Can handle both BOM'ed data and un-BOM'ed data.
-	 * Assumes Big-Endian byte order if no BOM is available.
-	 * This function was taken from http://php.net/manual/en/function.utf8-decode.php
-	 * and $bom_be parameter added.
-	 *
-	 * @param   string  $str  UTF-16 encoded data to decode.
-	 * @return  string  UTF-8 / ISO encoded data.
-	 * @access  public
-	 * @version 0.2 / 2010-05-13
-	 * @author  Rasmus Andersson {@link http://rasmusandersson.se/}
-	 * @author vadik56
-	 */
-	public static function utf16_decode( $str, $bom_be=true ) {
-		if( strlen($str) < 2 ) return $str;
-		$c0 = ord($str{0});
-		$c1 = ord($str{1});
-		if( $c0 == 0xfe && $c1 == 0xff ) { $str = substr($str,2); }
-		elseif( $c0 == 0xff && $c1 == 0xfe ) { $str = substr($str,2); $bom_be = false; }
-		$len = strlen($str);
-		$newstr = '';
-		for($i=0;$i<$len;$i+=2) {
-			if( $bom_be ) { $val = ord($str{$i})   << 4; $val += ord($str{$i+1}); }
-			else {        $val = ord($str{$i+1}) << 4; $val += ord($str{$i}); }
-			$newstr .= ($val == 0x228) ? "\n" : chr($val);
-		}
-		return $newstr;
-	}
-
-	/**
-	 * Get character count. First try mbstring, then iconv, finally strlen
-	 *
-	 * @param string $value
-	 * @param string $enc Encoding
-	 * @return int Character count
-	 */
-	public static function CountCharacters($value, $enc = 'UTF-8')
-	{
-		if (self::getIsIconvEnabled()) {
-			return iconv_strlen($value, $enc);
-		}
-
-		if (self::getIsMbstringEnabled()) {
-			return mb_strlen($value, $enc);
-		}
-
-		// else strlen
-		return strlen($value);
-	}
-
-	/**
-	 * Get a substring of a UTF-8 encoded string
-	 *
-	 * @param string $pValue UTF-8 encoded string
-	 * @param int $start Start offset
-	 * @param int $length Maximum number of characters in substring
-	 * @return string
-	 */
-	public static function Substring($pValue = '', $pStart = 0, $pLength = 0)
-	{
-		if (self::getIsIconvEnabled()) {
-			return iconv_substr($pValue, $pStart, $pLength, 'UTF-8');
-		}
-
-		if (self::getIsMbstringEnabled()) {
-			return mb_substr($pValue, $pStart, $pLength, 'UTF-8');
-		}
-
-		// else substr
-		return substr($pValue, $pStart, $pLength);
-	}
-
-
-	/**
-	 * Identify whether a string contains a fractional numeric value,
-	 *    and convert it to a numeric if it is
-	 *
-	 * @param string &$operand string value to test
-	 * @return boolean
-	 */
-	public static function convertToNumberIfFraction(&$operand) {
-		if (preg_match('/^'.self::STRING_REGEXP_FRACTION.'$/i', $operand, $match)) {
-			$sign = ($match[1] == '-') ? '-' : '+';
-			$fractionFormula = '='.$sign.$match[2].$sign.$match[3];
-			$operand = PHPExcel_Calculation::getInstance()->_calculateFormulaValue($fractionFormula);
-			return true;
-		}
-		return false;
-	}	//	function convertToNumberIfFraction()
-
-	/**
-	 * Get the decimal separator. If it has not yet been set explicitly, try to obtain number
-	 * formatting information from locale.
-	 *
-	 * @return string
-	 */
-	public static function getDecimalSeparator()
-	{
-		if (!isset(self::$_decimalSeparator)) {
-			$localeconv = localeconv();
-			self::$_decimalSeparator = ($localeconv['decimal_point'] != '')
-				? $localeconv['decimal_point'] : $localeconv['mon_decimal_point'];
-
-			if (self::$_decimalSeparator == '') {
-				// Default to .
-				self::$_decimalSeparator = '.';
-			}
-		}
-		return self::$_decimalSeparator;
-	}
-
-	/**
-	 * Set the decimal separator. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
-	 * to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
-	 *
-	 * @param string $pValue Character for decimal separator
-	 */
-	public static function setDecimalSeparator($pValue = '.')
-	{
-		self::$_decimalSeparator = $pValue;
-	}
-
-	/**
-	 * Get the thousands separator. If it has not yet been set explicitly, try to obtain number
-	 * formatting information from locale.
-	 *
-	 * @return string
-	 */
-	public static function getThousandsSeparator()
-	{
-		if (!isset(self::$_thousandsSeparator)) {
-			$localeconv = localeconv();
-			self::$_thousandsSeparator = ($localeconv['thousands_sep'] != '')
-				? $localeconv['thousands_sep'] : $localeconv['mon_thousands_sep'];
-		}
-		return self::$_thousandsSeparator;
-	}
-
-	/**
-	 * Set the thousands separator. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
-	 * to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
-	 *
-	 * @param string $pValue Character for thousands separator
-	 */
-	public static function setThousandsSeparator($pValue = ',')
-	{
-		self::$_thousandsSeparator = $pValue;
-	}
-
-	/**
-	 *	Get the currency code. If it has not yet been set explicitly, try to obtain the
-	 *		symbol information from locale.
-	 *
-	 * @return string
-	 */
-	public static function getCurrencyCode()
-	{
-		if (!isset(self::$_currencyCode)) {
-			$localeconv = localeconv();
-			self::$_currencyCode = ($localeconv['currency_symbol'] != '')
-				? $localeconv['currency_symbol'] : $localeconv['int_curr_symbol'];
-
-			if (self::$_currencyCode == '') {
-				// Default to $
-				self::$_currencyCode = '$';
-			}
-		}
-		return self::$_currencyCode;
-	}
-
-	/**
-	 * Set the currency code. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
-	 *		to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
-	 *
-	 * @param string $pValue Character for currency code
-	 */
-	public static function setCurrencyCode($pValue = '$')
-	{
-		self::$_currencyCode = $pValue;
-	}
-
-	/**
-	 * Convert SYLK encoded string to UTF-8
-	 *
-	 * @param string $pValue
-	 * @return string UTF-8 encoded string
-	 */
-	public static function SYLKtoUTF8($pValue = '')
-	{
-		// If there is no escape character in the string there is nothing to do
-		if (strpos($pValue, '') === false) {
-			return $pValue;
-		}
-
-		foreach (self::$_SYLKCharacters as $k => $v) {
-			$pValue = str_replace($k, $v, $pValue);
-		}
-
-		return $pValue;
-	}
-
-	/**
-	 * Retrieve any leading numeric part of a string, or return the full string if no leading numeric
-	 *	(handles basic integer or float, but not exponent or non decimal)
-	 *
-	 * @param	string	$value
-	 * @return	mixed	string or only the leading numeric part of the string
-	 */
-	public static function testStringAsNumeric($value)
-	{
-		if (is_numeric($value))
-			return $value;
-		$v = floatval($value);
-		return (is_numeric(substr($value,0,strlen($v)))) ? $v : $value;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/XMLWriter.php b/plugins/exportTypes/Excel/PHPExcel/Shared/XMLWriter.php
deleted file mode 100755
index 2abf451a2..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/XMLWriter.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-if (!defined('DATE_W3C')) {
-  define('DATE_W3C', 'Y-m-d\TH:i:sP');
-}
-
-if (!defined('DEBUGMODE_ENABLED')) {
-  define('DEBUGMODE_ENABLED', false);
-}
-
-
-/**
- * PHPExcel_Shared_XMLWriter
- *
- * @category   PHPExcel
- * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_XMLWriter extends XMLWriter {
-	/** Temporary storage method */
-	const STORAGE_MEMORY	= 1;
-	const STORAGE_DISK		= 2;
-
-	/**
-	 * Temporary filename
-	 *
-	 * @var string
-	 */
-	private $_tempFileName = '';
-
-	/**
-	 * Create a new PHPExcel_Shared_XMLWriter instance
-	 *
-	 * @param int		$pTemporaryStorage			Temporary storage location
-	 * @param string	$pTemporaryStorageFolder	Temporary storage folder
-	 */
-	public function __construct($pTemporaryStorage = self::STORAGE_MEMORY, $pTemporaryStorageFolder = NULL) {
-		// Open temporary storage
-		if ($pTemporaryStorage == self::STORAGE_MEMORY) {
-			$this->openMemory();
-		} else {
-			// Create temporary filename
-			if ($pTemporaryStorageFolder === NULL)
-				$pTemporaryStorageFolder = PHPExcel_Shared_File::sys_get_temp_dir();
-			$this->_tempFileName = @tempnam($pTemporaryStorageFolder, 'xml');
-
-			// Open storage
-			if ($this->openUri($this->_tempFileName) === false) {
-				// Fallback to memory...
-				$this->openMemory();
-			}
-		}
-
-		// Set default values
-		if (DEBUGMODE_ENABLED) {
-			$this->setIndent(true);
-		}
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		// Unlink temporary files
-		if ($this->_tempFileName != '') {
-			@unlink($this->_tempFileName);
-		}
-	}
-
-	/**
-	 * Get written data
-	 *
-	 * @return $data
-	 */
-	public function getData() {
-		if ($this->_tempFileName == '') {
-			return $this->outputMemory(true);
-		} else {
-			$this->flush();
-			return file_get_contents($this->_tempFileName);
-		}
-	}
-
-	/**
-	 * Fallback method for writeRaw, introduced in PHP 5.2
-	 *
-	 * @param string $text
-	 * @return string
-	 */
-	public function writeRawData($text)
-	{
-		if (is_array($text)) {
-			$text = implode("\n",$text);
-		}
-
-		if (method_exists($this, 'writeRaw')) {
-			return $this->writeRaw(htmlspecialchars($text));
-		}
-
-		return $this->text($text);
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/ZipArchive.php b/plugins/exportTypes/Excel/PHPExcel/Shared/ZipArchive.php
deleted file mode 100755
index cebd32b64..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/ZipArchive.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_ZipArchive
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-if (!defined('PCLZIP_TEMPORARY_DIR')) {
-	define('PCLZIP_TEMPORARY_DIR', PHPExcel_Shared_File::sys_get_temp_dir());
-}
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/PCLZip/pclzip.lib.php';
-
-
-/**
- * PHPExcel_Shared_ZipArchive
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_ZipArchive
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_ZipArchive
-{
-
-	/**	constants */
-	const OVERWRITE		= 'OVERWRITE';
-	const CREATE		= 'CREATE';
-
-
-	/**
-	 * Temporary storage directory
-	 *
-	 * @var string
-	 */
-	private $_tempDir;
-
-	/**
-	 * Zip Archive Stream Handle
-	 *
-	 * @var string
-	 */
-	private $_zip;
-
-
-    /**
-	 * Open a new zip archive
-	 *
-	 * @param	string	$fileName	Filename for the zip archive
-	 * @return	boolean
-     */
-	public function open($fileName)
-	{
-		$this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
-
-		$this->_zip = new PclZip($fileName);
-
-		return true;
-	}
-
-
-    /**
-	 * Close this zip archive
-	 *
-     */
-	public function close()
-	{
-	}
-
-
-    /**
-	 * Add a new file to the zip archive from a string of raw data.
-	 *
-	 * @param	string	$localname		Directory/Name of the file to add to the zip archive
-	 * @param	string	$contents		String of data to add to the zip archive
-     */
-	public function addFromString($localname, $contents)
-	{
-		$filenameParts = pathinfo($localname);
-
-		$handle = fopen($this->_tempDir.'/'.$filenameParts["basename"], "wb");
-		fwrite($handle, $contents);
-		fclose($handle);
-
-		$res = $this->_zip->add($this->_tempDir.'/'.$filenameParts["basename"],
-								PCLZIP_OPT_REMOVE_PATH, $this->_tempDir,
-								PCLZIP_OPT_ADD_PATH, $filenameParts["dirname"]
-							   );
-		if ($res == 0) {
-			throw new Exception("Error zipping files : " . $this->_zip->errorInfo(true));
-		}
-
-		unlink($this->_tempDir.'/'.$filenameParts["basename"]);
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/ZipStreamWrapper.php b/plugins/exportTypes/Excel/PHPExcel/Shared/ZipStreamWrapper.php
deleted file mode 100755
index dee93335e..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/ZipStreamWrapper.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_ZipStreamWrapper
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Shared_ZipStreamWrapper {
-	/**
-	 * Internal ZipAcrhive
-	 *
-	 * @var ZipAcrhive
-	 */
-    private $_archive;
-
-    /**
-     * Filename in ZipAcrhive
-     *
-     * @var string
-     */
-    private $_fileNameInArchive = '';
-
-    /**
-     * Position in file
-     *
-     * @var int
-     */
-    private $_position = 0;
-
-    /**
-     * Data
-     *
-     * @var mixed
-     */
-    private $_data = '';
-
-    /**
-     * Register wrapper
-     */
-    public static function register() {
-		@stream_wrapper_unregister("zip");
-		@stream_wrapper_register("zip", __CLASS__);
-    }
-
-    /**
-	 * Implements support for fopen().
-	 *
-	 * @param	string	$path			resource name including scheme, e.g.
-	 * @param	string	$mode			only "r" is supported
-	 * @param	int		$options		mask of STREAM_REPORT_ERRORS and STREAM_USE_PATH
-	 * @param	string  &$openedPath	absolute path of the opened stream (out parameter)
-	 * @return	bool    true on success
-     */
-    public function stream_open($path, $mode, $options, &$opened_path) {
-        // Check for mode
-        if ($mode{0} != 'r') {
-            throw new Exception('Mode ' . $mode . ' is not supported. Only read mode is supported.');
-        }
-
-		$pos = strrpos($path, '#');
-		$url['host'] = substr($path, 6, $pos - 6); // 6: strlen('zip://')
-		$url['fragment'] = substr($path, $pos + 1);
-
-        // Open archive
-        $this->_archive = new ZipArchive();
-        $this->_archive->open($url['host']);
-
-        $this->_fileNameInArchive = $url['fragment'];
-        $this->_position = 0;
-        $this->_data = $this->_archive->getFromName( $this->_fileNameInArchive );
-
-        return true;
-    }
-
-    /**
-	 * Implements support for fstat().
-	 *
-	 * @return  boolean
-     */
-    public function stream_stat() {
-        return $this->_archive->statName( $this->_fileNameInArchive );
-    }
-
-    /**
-	 * Implements support for fread(), fgets() etc.
-	 *
-	 * @param   int		$count	maximum number of bytes to read
-	 * @return  string
-     */
-    function stream_read($count) {
-        $ret = substr($this->_data, $this->_position, $count);
-        $this->_position += strlen($ret);
-        return $ret;
-    }
-
-    /**
-	 * Returns the position of the file pointer, i.e. its offset into the file
-	 * stream. Implements support for ftell().
-	 *
-	 * @return  int
-     */
-    public function stream_tell() {
-        return $this->_position;
-    }
-
-    /**
-     * EOF stream
-	 *
-	 * @return	bool
-     */
-    public function stream_eof() {
-        return $this->_position >= strlen($this->_data);
-    }
-
-    /**
-     * Seek stream
-	 *
-	 * @param	int		$offset	byte offset
-	 * @param	int		$whence	SEEK_SET, SEEK_CUR or SEEK_END
-	 * @return	bool
-     */
-    public function stream_seek($offset, $whence) {
-        switch ($whence) {
-            case SEEK_SET:
-                if ($offset < strlen($this->_data) && $offset >= 0) {
-                     $this->_position = $offset;
-                     return true;
-                } else {
-                     return false;
-                }
-                break;
-
-            case SEEK_CUR:
-                if ($offset >= 0) {
-                     $this->_position += $offset;
-                     return true;
-                } else {
-                     return false;
-                }
-                break;
-
-            case SEEK_END:
-                if (strlen($this->_data) + $offset >= 0) {
-                     $this->_position = strlen($this->_data) + $offset;
-                     return true;
-                } else {
-                     return false;
-                }
-                break;
-
-            default:
-                return false;
-        }
-    }
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/bestFitClass.php b/plugins/exportTypes/Excel/PHPExcel/Shared/trend/bestFitClass.php
deleted file mode 100755
index fa7ecbed8..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/bestFitClass.php
+++ /dev/null
@@ -1,432 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Best_Fit
-{
-	/**
-	 * Indicator flag for a calculation error
-	 *
-	 * @var	boolean
-	 **/
-	protected $_error				= False;
-
-	/**
-	 * Algorithm type to use for best-fit
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType			= 'undetermined';
-
-	/**
-	 * Number of entries in the sets of x- and y-value arrays
-	 *
-	 * @var	int
-	 **/
-	protected $_valueCount			= 0;
-
-	/**
-	 * X-value dataseries of values
-	 *
-	 * @var	float[]
-	 **/
-	protected $_xValues				= array();
-
-	/**
-	 * Y-value dataseries of values
-	 *
-	 * @var	float[]
-	 **/
-	protected $_yValues				= array();
-
-	/**
-	 * Flag indicating whether values should be adjusted to Y=0
-	 *
-	 * @var	boolean
-	 **/
-	protected $_adjustToZero		= False;
-
-	/**
-	 * Y-value series of best-fit values
-	 *
-	 * @var	float[]
-	 **/
-	protected $_yBestFitValues		= array();
-
-	protected $_goodnessOfFit 		= 1;
-
-	protected $_stdevOfResiduals	= 0;
-
-	protected $_covariance			= 0;
-
-	protected $_correlation			= 0;
-
-	protected $_SSRegression		= 0;
-
-	protected $_SSResiduals			= 0;
-
-	protected $_DFResiduals			= 0;
-
-	protected $_F					= 0;
-
-	protected $_slope				= 0;
-
-	protected $_slopeSE				= 0;
-
-	protected $_intersect			= 0;
-
-	protected $_intersectSE			= 0;
-
-	protected $_Xoffset				= 0;
-
-	protected $_Yoffset				= 0;
-
-
-	public function getError() {
-		return $this->_error;
-	}	//	function getBestFitType()
-
-
-	public function getBestFitType() {
-		return $this->_bestFitType;
-	}	//	function getBestFitType()
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 */
-	public function getValueOfYForX($xValue) {
-		return False;
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 */
-	public function getValueOfXForY($yValue) {
-		return False;
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the original set of X-Values
-	 *
-	 * @return	 float[]				X-Values
-	 */
-	public function getXValues() {
-		return $this->_xValues;
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 */
-	public function getEquation($dp=0) {
-		return False;
-	}	//	function getEquation()
-
-
-	/**
-	 * Return the Slope of the line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 */
-	public function getSlope($dp=0) {
-		if ($dp != 0) {
-			return round($this->_slope,$dp);
-		}
-		return $this->_slope;
-	}	//	function getSlope()
-
-
-	/**
-	 * Return the standard error of the Slope
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 */
-	public function getSlopeSE($dp=0) {
-		if ($dp != 0) {
-			return round($this->_slopeSE,$dp);
-		}
-		return $this->_slopeSE;
-	}	//	function getSlopeSE()
-
-
-	/**
-	 * Return the Value of X where it intersects Y = 0
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 */
-	public function getIntersect($dp=0) {
-		if ($dp != 0) {
-			return round($this->_intersect,$dp);
-		}
-		return $this->_intersect;
-	}	//	function getIntersect()
-
-
-	/**
-	 * Return the standard error of the Intersect
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 */
-	public function getIntersectSE($dp=0) {
-		if ($dp != 0) {
-			return round($this->_intersectSE,$dp);
-		}
-		return $this->_intersectSE;
-	}	//	function getIntersectSE()
-
-
-	/**
-	 * Return the goodness of fit for this regression
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to return
-	 * @return	 float
-	 */
-	public function getGoodnessOfFit($dp=0) {
-		if ($dp != 0) {
-			return round($this->_goodnessOfFit,$dp);
-		}
-		return $this->_goodnessOfFit;
-	}	//	function getGoodnessOfFit()
-
-
-	public function getGoodnessOfFitPercent($dp=0) {
-		if ($dp != 0) {
-			return round($this->_goodnessOfFit * 100,$dp);
-		}
-		return $this->_goodnessOfFit * 100;
-	}	//	function getGoodnessOfFitPercent()
-
-
-	/**
-	 * Return the standard deviation of the residuals for this regression
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to return
-	 * @return	 float
-	 */
-	public function getStdevOfResiduals($dp=0) {
-		if ($dp != 0) {
-			return round($this->_stdevOfResiduals,$dp);
-		}
-		return $this->_stdevOfResiduals;
-	}	//	function getStdevOfResiduals()
-
-
-	public function getSSRegression($dp=0) {
-		if ($dp != 0) {
-			return round($this->_SSRegression,$dp);
-		}
-		return $this->_SSRegression;
-	}	//	function getSSRegression()
-
-
-	public function getSSResiduals($dp=0) {
-		if ($dp != 0) {
-			return round($this->_SSResiduals,$dp);
-		}
-		return $this->_SSResiduals;
-	}	//	function getSSResiduals()
-
-
-	public function getDFResiduals($dp=0) {
-		if ($dp != 0) {
-			return round($this->_DFResiduals,$dp);
-		}
-		return $this->_DFResiduals;
-	}	//	function getDFResiduals()
-
-
-	public function getF($dp=0) {
-		if ($dp != 0) {
-			return round($this->_F,$dp);
-		}
-		return $this->_F;
-	}	//	function getF()
-
-
-	public function getCovariance($dp=0) {
-		if ($dp != 0) {
-			return round($this->_covariance,$dp);
-		}
-		return $this->_covariance;
-	}	//	function getCovariance()
-
-
-	public function getCorrelation($dp=0) {
-		if ($dp != 0) {
-			return round($this->_correlation,$dp);
-		}
-		return $this->_correlation;
-	}	//	function getCorrelation()
-
-
-	public function getYBestFitValues() {
-		return $this->_yBestFitValues;
-	}	//	function getYBestFitValues()
-
-
-	protected function _calculateGoodnessOfFit($sumX,$sumY,$sumX2,$sumY2,$sumXY,$meanX,$meanY, $const) {
-		$SSres = $SScov = $SScor = $SStot = $SSsex = 0.0;
-		foreach($this->_xValues as $xKey => $xValue) {
-			$bestFitY = $this->_yBestFitValues[$xKey] = $this->getValueOfYForX($xValue);
-
-			$SSres += ($this->_yValues[$xKey] - $bestFitY) * ($this->_yValues[$xKey] - $bestFitY);
-			if ($const) {
-				$SStot += ($this->_yValues[$xKey] - $meanY) * ($this->_yValues[$xKey] - $meanY);
-			} else {
-				$SStot += $this->_yValues[$xKey] * $this->_yValues[$xKey];
-			}
-			$SScov += ($this->_xValues[$xKey] - $meanX) * ($this->_yValues[$xKey] - $meanY);
-			if ($const) {
-				$SSsex += ($this->_xValues[$xKey] - $meanX) * ($this->_xValues[$xKey] - $meanX);
-			} else {
-				$SSsex += $this->_xValues[$xKey] * $this->_xValues[$xKey];
-			}
-		}
-
-		$this->_SSResiduals = $SSres;
-		$this->_DFResiduals = $this->_valueCount - 1 - $const;
-
-		if ($this->_DFResiduals == 0.0) {
-			$this->_stdevOfResiduals = 0.0;
-		} else {
-			$this->_stdevOfResiduals = sqrt($SSres / $this->_DFResiduals);
-		}
-		if (($SStot == 0.0) || ($SSres == $SStot)) {
-			$this->_goodnessOfFit = 1;
-		} else {
-			$this->_goodnessOfFit = 1 - ($SSres / $SStot);
-		}
-
-		$this->_SSRegression = $this->_goodnessOfFit * $SStot;
-		$this->_covariance = $SScov / $this->_valueCount;
-		$this->_correlation = ($this->_valueCount * $sumXY - $sumX * $sumY) / sqrt(($this->_valueCount * $sumX2 - pow($sumX,2)) * ($this->_valueCount * $sumY2 - pow($sumY,2)));
-		$this->_slopeSE = $this->_stdevOfResiduals / sqrt($SSsex);
-		$this->_intersectSE = $this->_stdevOfResiduals * sqrt(1 / ($this->_valueCount - ($sumX * $sumX) / $sumX2));
-		if ($this->_SSResiduals != 0.0) {
-			if ($this->_DFResiduals == 0.0) {
-				$this->_F = 0.0;
-			} else {
-				$this->_F = $this->_SSRegression / ($this->_SSResiduals / $this->_DFResiduals);
-			}
-		} else {
-			if ($this->_DFResiduals == 0.0) {
-				$this->_F = 0.0;
-			} else {
-				$this->_F = $this->_SSRegression / $this->_DFResiduals;
-			}
-		}
-	}	//	function _calculateGoodnessOfFit()
-
-
-	protected function _leastSquareFit($yValues, $xValues, $const) {
-		// calculate sums
-		$x_sum = array_sum($xValues);
-		$y_sum = array_sum($yValues);
-		$meanX = $x_sum / $this->_valueCount;
-		$meanY = $y_sum / $this->_valueCount;
-		$mBase = $mDivisor = $xx_sum = $xy_sum = $yy_sum = 0.0;
-		for($i = 0; $i < $this->_valueCount; ++$i) {
-			$xy_sum += $xValues[$i] * $yValues[$i];
-			$xx_sum += $xValues[$i] * $xValues[$i];
-			$yy_sum += $yValues[$i] * $yValues[$i];
-
-			if ($const) {
-				$mBase += ($xValues[$i] - $meanX) * ($yValues[$i] - $meanY);
-				$mDivisor += ($xValues[$i] - $meanX) * ($xValues[$i] - $meanX);
-			} else {
-				$mBase += $xValues[$i] * $yValues[$i];
-				$mDivisor += $xValues[$i] * $xValues[$i];
-			}
-		}
-
-		// calculate slope
-//		$this->_slope = (($this->_valueCount * $xy_sum) - ($x_sum * $y_sum)) / (($this->_valueCount * $xx_sum) - ($x_sum * $x_sum));
-		$this->_slope = $mBase / $mDivisor;
-
-		// calculate intersect
-//		$this->_intersect = ($y_sum - ($this->_slope * $x_sum)) / $this->_valueCount;
-		if ($const) {
-			$this->_intersect = $meanY - ($this->_slope * $meanX);
-		} else {
-			$this->_intersect = 0;
-		}
-
-		$this->_calculateGoodnessOfFit($x_sum,$y_sum,$xx_sum,$yy_sum,$xy_sum,$meanX,$meanY,$const);
-	}	//	function _leastSquareFit()
-
-
-	/**
-	 * Define the regression
-	 *
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	function __construct($yValues, $xValues=array(), $const=True) {
-		//	Calculate number of points
-		$nY = count($yValues);
-		$nX = count($xValues);
-
-		//	Define X Values if necessary
-		if ($nX == 0) {
-			$xValues = range(1,$nY);
-			$nX = $nY;
-		} elseif ($nY != $nX) {
-			//	Ensure both arrays of points are the same size
-			$this->_error = True;
-			return False;
-		}
-
-		$this->_valueCount = $nY;
-		$this->_xValues = $xValues;
-		$this->_yValues = $yValues;
-	}	//	function __construct()
-
-}	//	class bestFit
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/exponentialBestFitClass.php b/plugins/exportTypes/Excel/PHPExcel/Shared/trend/exponentialBestFitClass.php
deleted file mode 100755
index 37f3c339c..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/exponentialBestFitClass.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
-
-
-/**
- * PHPExcel_Exponential_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
-{
-	/**
-	 * Algorithm type to use for best-fit
-	 * (Name of this trend class)
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType		= 'exponential';
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 **/
-	public function getValueOfYForX($xValue) {
-		return $this->getIntersect() * pow($this->getSlope(),($xValue - $this->_Xoffset));
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 **/
-	public function getValueOfXForY($yValue) {
-		return log(($yValue + $this->_Yoffset) / $this->getIntersect()) / log($this->getSlope());
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getEquation($dp=0) {
-		$slope = $this->getSlope($dp);
-		$intersect = $this->getIntersect($dp);
-
-		return 'Y = '.$intersect.' * '.$slope.'^X';
-	}	//	function getEquation()
-
-
-	/**
-	 * Return the Slope of the line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getSlope($dp=0) {
-		if ($dp != 0) {
-			return round(exp($this->_slope),$dp);
-		}
-		return exp($this->_slope);
-	}	//	function getSlope()
-
-
-	/**
-	 * Return the Value of X where it intersects Y = 0
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getIntersect($dp=0) {
-		if ($dp != 0) {
-			return round(exp($this->_intersect),$dp);
-		}
-		return exp($this->_intersect);
-	}	//	function getIntersect()
-
-
-	/**
-	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	 float[]	$yValues	The set of Y-values for this regression
-	 * @param	 float[]	$xValues	The set of X-values for this regression
-	 * @param	 boolean	$const
-	 */
-	private function _exponential_regression($yValues, $xValues, $const) {
-		foreach($yValues as &$value) {
-			if ($value < 0.0) {
-				$value = 0 - log(abs($value));
-			} elseif ($value > 0.0) {
-				$value = log($value);
-			}
-		}
-		unset($value);
-
-		$this->_leastSquareFit($yValues, $xValues, $const);
-	}	//	function _exponential_regression()
-
-
-	/**
-	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	function __construct($yValues, $xValues=array(), $const=True) {
-		if (parent::__construct($yValues, $xValues) !== False) {
-			$this->_exponential_regression($yValues, $xValues, $const);
-		}
-	}	//	function __construct()
-
-}	//	class exponentialBestFit
\ No newline at end of file
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/linearBestFitClass.php b/plugins/exportTypes/Excel/PHPExcel/Shared/trend/linearBestFitClass.php
deleted file mode 100755
index f9d990397..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/linearBestFitClass.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
-
-
-/**
- * PHPExcel_Linear_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Linear_Best_Fit extends PHPExcel_Best_Fit
-{
-	/**
-	 * Algorithm type to use for best-fit
-	 * (Name of this trend class)
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType		= 'linear';
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 **/
-	public function getValueOfYForX($xValue) {
-		return $this->getIntersect() + $this->getSlope() * $xValue;
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 **/
-	public function getValueOfXForY($yValue) {
-		return ($yValue - $this->getIntersect()) / $this->getSlope();
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getEquation($dp=0) {
-		$slope = $this->getSlope($dp);
-		$intersect = $this->getIntersect($dp);
-
-		return 'Y = '.$intersect.' + '.$slope.' * X';
-	}	//	function getEquation()
-
-
-	/**
-	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	 float[]	$yValues	The set of Y-values for this regression
-	 * @param	 float[]	$xValues	The set of X-values for this regression
-	 * @param	 boolean	$const
-	 */
-	private function _linear_regression($yValues, $xValues, $const) {
-		$this->_leastSquareFit($yValues, $xValues,$const);
-	}	//	function _linear_regression()
-
-
-	/**
-	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	function __construct($yValues, $xValues=array(), $const=True) {
-		if (parent::__construct($yValues, $xValues) !== False) {
-			$this->_linear_regression($yValues, $xValues, $const);
-		}
-	}	//	function __construct()
-
-}	//	class linearBestFit
\ No newline at end of file
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/plugins/exportTypes/Excel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
deleted file mode 100755
index 4121cfb97..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
-
-
-/**
- * PHPExcel_Logarithmic_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Logarithmic_Best_Fit extends PHPExcel_Best_Fit
-{
-	/**
-	 * Algorithm type to use for best-fit
-	 * (Name of this trend class)
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType		= 'logarithmic';
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 **/
-	public function getValueOfYForX($xValue) {
-		return $this->getIntersect() + $this->getSlope() * log($xValue - $this->_Xoffset);
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 **/
-	public function getValueOfXForY($yValue) {
-		return exp(($yValue - $this->getIntersect()) / $this->getSlope());
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getEquation($dp=0) {
-		$slope = $this->getSlope($dp);
-		$intersect = $this->getIntersect($dp);
-
-		return 'Y = '.$intersect.' + '.$slope.' * log(X)';
-	}	//	function getEquation()
-
-
-	/**
-	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	 float[]	$yValues	The set of Y-values for this regression
-	 * @param	 float[]	$xValues	The set of X-values for this regression
-	 * @param	 boolean	$const
-	 */
-	private function _logarithmic_regression($yValues, $xValues, $const) {
-		foreach($xValues as &$value) {
-			if ($value < 0.0) {
-				$value = 0 - log(abs($value));
-			} elseif ($value > 0.0) {
-				$value = log($value);
-			}
-		}
-		unset($value);
-
-		$this->_leastSquareFit($yValues, $xValues, $const);
-	}	//	function _logarithmic_regression()
-
-
-	/**
-	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	function __construct($yValues, $xValues=array(), $const=True) {
-		if (parent::__construct($yValues, $xValues) !== False) {
-			$this->_logarithmic_regression($yValues, $xValues, $const);
-		}
-	}	//	function __construct()
-
-}	//	class logarithmicBestFit
\ No newline at end of file
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/polynomialBestFitClass.php b/plugins/exportTypes/Excel/PHPExcel/Shared/trend/polynomialBestFitClass.php
deleted file mode 100755
index 21c5d582b..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/polynomialBestFitClass.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/JAMA/Matrix.php';
-
-
-/**
- * PHPExcel_Polynomial_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
-{
-	/**
-	 * Algorithm type to use for best-fit
-	 * (Name of this trend class)
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType		= 'polynomial';
-
-	/**
-	 * Polynomial order
-	 *
-	 * @protected
-	 * @var	int
-	 **/
-	protected $_order			= 0;
-
-
-	/**
-	 * Return the order of this polynomial
-	 *
-	 * @return	 int
-	 **/
-	public function getOrder() {
-		return $this->_order;
-	}	//	function getOrder()
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 **/
-	public function getValueOfYForX($xValue) {
-		$retVal = $this->getIntersect();
-		$slope = $this->getSlope();
-		foreach($slope as $key => $value) {
-			if ($value != 0.0) {
-				$retVal += $value * pow($xValue, $key + 1);
-			}
-		}
-		return $retVal;
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 **/
-	public function getValueOfXForY($yValue) {
-		return ($yValue - $this->getIntersect()) / $this->getSlope();
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getEquation($dp=0) {
-		$slope = $this->getSlope($dp);
-		$intersect = $this->getIntersect($dp);
-
-		$equation = 'Y = '.$intersect;
-		foreach($slope as $key => $value) {
-			if ($value != 0.0) {
-				$equation .= ' + '.$value.' * X';
-				if ($key > 0) {
-					$equation .= '^'.($key + 1);
-				}
-			}
-		}
-		return $equation;
-	}	//	function getEquation()
-
-
-	/**
-	 * Return the Slope of the line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getSlope($dp=0) {
-		if ($dp != 0) {
-			$coefficients = array();
-			foreach($this->_slope as $coefficient) {
-				$coefficients[] = round($coefficient,$dp);
-			}
-			return $coefficients;
-		}
-		return $this->_slope;
-	}	//	function getSlope()
-
-
-	public function getCoefficients($dp=0) {
-		return array_merge(array($this->getIntersect($dp)),$this->getSlope($dp));
-	}	//	function getCoefficients()
-
-
-	/**
-	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	int			$order		Order of Polynomial for this regression
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	private function _polynomial_regression($order, $yValues, $xValues, $const) {
-		// calculate sums
-		$x_sum = array_sum($xValues);
-		$y_sum = array_sum($yValues);
-		$xx_sum = $xy_sum = 0;
-		for($i = 0; $i < $this->_valueCount; ++$i) {
-			$xy_sum += $xValues[$i] * $yValues[$i];
-			$xx_sum += $xValues[$i] * $xValues[$i];
-			$yy_sum += $yValues[$i] * $yValues[$i];
-		}
-		/*
-		 *	This routine uses logic from the PHP port of polyfit version 0.1
-		 *	written by Michael Bommarito and Paul Meagher
-		 *
-		 *	The function fits a polynomial function of order $order through
-		 *	a series of x-y data points using least squares.
-		 *
-		 */
-		for ($i = 0; $i < $this->_valueCount; ++$i) {
-			for ($j = 0; $j <= $order; ++$j) {
-				$A[$i][$j] = pow($xValues[$i], $j);
-			}
-		}
-		for ($i=0; $i < $this->_valueCount; ++$i) {
-			$B[$i] = array($yValues[$i]);
-		}
-		$matrixA = new Matrix($A);
-		$matrixB = new Matrix($B);
-		$C = $matrixA->solve($matrixB);
-
-		$coefficients = array();
-		for($i = 0; $i < $C->m; ++$i) {
-			$r = $C->get($i, 0);
-			if (abs($r) <= pow(10, -9)) {
-				$r = 0;
-			}
-			$coefficients[] = $r;
-		}
-
-		$this->_intersect = array_shift($coefficients);
-		$this->_slope = $coefficients;
-
-		$this->_calculateGoodnessOfFit($x_sum,$y_sum,$xx_sum,$yy_sum,$xy_sum);
-		foreach($this->_xValues as $xKey => $xValue) {
-			$this->_yBestFitValues[$xKey] = $this->getValueOfYForX($xValue);
-		}
-	}	//	function _polynomial_regression()
-
-
-	/**
-	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	int			$order		Order of Polynomial for this regression
-	 * @param	float[]		$yValues	The set of Y-values for this regression
-	 * @param	float[]		$xValues	The set of X-values for this regression
-	 * @param	boolean		$const
-	 */
-	function __construct($order, $yValues, $xValues=array(), $const=True) {
-		if (parent::__construct($yValues, $xValues) !== False) {
-			if ($order < $this->_valueCount) {
-				$this->_bestFitType .= '_'.$order;
-				$this->_order = $order;
-				$this->_polynomial_regression($order, $yValues, $xValues, $const);
-				if (($this->getGoodnessOfFit() < 0.0) || ($this->getGoodnessOfFit() > 1.0)) {
-					$this->_error = True;
-				}
-			} else {
-				$this->_error = True;
-			}
-		}
-	}	//	function __construct()
-
-}	//	class polynomialBestFit
\ No newline at end of file
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/powerBestFitClass.php b/plugins/exportTypes/Excel/PHPExcel/Shared/trend/powerBestFitClass.php
deleted file mode 100755
index d9525a230..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/powerBestFitClass.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php';
-
-
-/**
- * PHPExcel_Power_Best_Fit
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
-{
-	/**
-	 * Algorithm type to use for best-fit
-	 * (Name of this trend class)
-	 *
-	 * @var	string
-	 **/
-	protected $_bestFitType		= 'power';
-
-
-	/**
-	 * Return the Y-Value for a specified value of X
-	 *
-	 * @param	 float		$xValue			X-Value
-	 * @return	 float						Y-Value
-	 **/
-	public function getValueOfYForX($xValue) {
-		return $this->getIntersect() * pow(($xValue - $this->_Xoffset),$this->getSlope());
-	}	//	function getValueOfYForX()
-
-
-	/**
-	 * Return the X-Value for a specified value of Y
-	 *
-	 * @param	 float		$yValue			Y-Value
-	 * @return	 float						X-Value
-	 **/
-	public function getValueOfXForY($yValue) {
-		return pow((($yValue + $this->_Yoffset) / $this->getIntersect()),(1 / $this->getSlope()));
-	}	//	function getValueOfXForY()
-
-
-	/**
-	 * Return the Equation of the best-fit line
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getEquation($dp=0) {
-		$slope = $this->getSlope($dp);
-		$intersect = $this->getIntersect($dp);
-
-		return 'Y = '.$intersect.' * X^'.$slope;
-	}	//	function getEquation()
-
-
-	/**
-	 * Return the Value of X where it intersects Y = 0
-	 *
-	 * @param	 int		$dp		Number of places of decimal precision to display
-	 * @return	 string
-	 **/
-	public function getIntersect($dp=0) {
-		if ($dp != 0) {
-			return round(exp($this->_intersect),$dp);
-		}
-		return exp($this->_intersect);
-	}	//	function getIntersect()
-
-
-	/**
-	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	 float[]	$yValues	The set of Y-values for this regression
-	 * @param	 float[]	$xValues	The set of X-values for this regression
-	 * @param	 boolean	$const
-	 */
-	private function _power_regression($yValues, $xValues, $const) {
-		foreach($xValues as &$value) {
-			if ($value < 0.0) {
-				$value = 0 - log(abs($value));
-			} elseif ($value > 0.0) {
-				$value = log($value);
-			}
-		}
-		unset($value);
-		foreach($yValues as &$value) {
-			if ($value < 0.0) {
-				$value = 0 - log(abs($value));
-			} elseif ($value > 0.0) {
-				$value = log($value);
-			}
-		}
-		unset($value);
-
-		$this->_leastSquareFit($yValues, $xValues, $const);
-	}	//	function _power_regression()
-
-
-	/**
-	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
-	 *
-	 * @param	 float[]	$yValues	The set of Y-values for this regression
-	 * @param	 float[]	$xValues	The set of X-values for this regression
-	 * @param	 boolean	$const
-	 */
-	function __construct($yValues, $xValues=array(), $const=True) {
-		if (parent::__construct($yValues, $xValues) !== False) {
-			$this->_power_regression($yValues, $xValues, $const);
-		}
-	}	//	function __construct()
-
-}	//	class powerBestFit
\ No newline at end of file
diff --git a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/trendClass.php b/plugins/exportTypes/Excel/PHPExcel/Shared/trend/trendClass.php
deleted file mode 100755
index 6c68beaf4..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Shared/trend/trendClass.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/linearBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/logarithmicBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/exponentialBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/powerBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/polynomialBestFitClass.php';
-
-
-/**
- * PHPExcel_trendClass
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared_Trend
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class trendClass
-{
-	const TREND_LINEAR				= 'Linear';
-	const TREND_LOGARITHMIC			= 'Logarithmic';
-	const TREND_EXPONENTIAL			= 'Exponential';
-	const TREND_POWER				= 'Power';
-	const TREND_POLYNOMIAL_2		= 'Polynomial_2';
-	const TREND_POLYNOMIAL_3		= 'Polynomial_3';
-	const TREND_POLYNOMIAL_4		= 'Polynomial_4';
-	const TREND_POLYNOMIAL_5		= 'Polynomial_5';
-	const TREND_POLYNOMIAL_6		= 'Polynomial_6';
-	const TREND_BEST_FIT			= 'Bestfit';
-	const TREND_BEST_FIT_NO_POLY	= 'Bestfit_no_Polynomials';
-
-	/**
-	 * Names of the best-fit trend analysis methods
-	 *
-	 * @var string[]
-	 **/
-	private static $_trendTypes = array( self::TREND_LINEAR,
-										 self::TREND_LOGARITHMIC,
-										 self::TREND_EXPONENTIAL,
-										 self::TREND_POWER
-									   );
-	/**
-	 * Names of the best-fit trend polynomial orders
-	 *
-	 * @var string[]
-	 **/
-	private static $_trendTypePolyOrders = array( self::TREND_POLYNOMIAL_2,
-												  self::TREND_POLYNOMIAL_3,
-												  self::TREND_POLYNOMIAL_4,
-												  self::TREND_POLYNOMIAL_5,
-												  self::TREND_POLYNOMIAL_6
-											    );
-
-	/**
-	 * Cached results for each method when trying to identify which provides the best fit
-	 *
-	 * @var PHPExcel_Best_Fit[]
-	 **/
-	private static $_trendCache = array();
-
-
-	public static function calculate($trendType=self::TREND_BEST_FIT, $yValues, $xValues=array(), $const=True) {
-		//	Calculate number of points in each dataset
-		$nY = count($yValues);
-		$nX = count($xValues);
-
-		//	Define X Values if necessary
-		if ($nX == 0) {
-			$xValues = range(1,$nY);
-			$nX = $nY;
-		} elseif ($nY != $nX) {
-			//	Ensure both arrays of points are the same size
-			trigger_error("trend(): Number of elements in coordinate arrays do not match.", E_USER_ERROR);
-		}
-
-		$key = md5($trendType.$const.serialize($yValues).serialize($xValues));
-		//	Determine which trend method has been requested
-		switch ($trendType) {
-			//	Instantiate and return the class for the requested trend method
-			case self::TREND_LINEAR :
-			case self::TREND_LOGARITHMIC :
-			case self::TREND_EXPONENTIAL :
-			case self::TREND_POWER :
-				if (!isset(self::$_trendCache[$key])) {
-					$className = 'PHPExcel_'.$trendType.'_Best_Fit';
-					self::$_trendCache[$key] = new $className($yValues,$xValues,$const);
-				}
-				return self::$_trendCache[$key];
-				break;
-			case self::TREND_POLYNOMIAL_2	:
-			case self::TREND_POLYNOMIAL_3	:
-			case self::TREND_POLYNOMIAL_4	:
-			case self::TREND_POLYNOMIAL_5	:
-			case self::TREND_POLYNOMIAL_6	:
-				if (!isset(self::$_trendCache[$key])) {
-					$order = substr($trendType,-1);
-					self::$_trendCache[$key] = new PHPExcel_Polynomial_Best_Fit($order,$yValues,$xValues,$const);
-				}
-				return self::$_trendCache[$key];
-				break;
-			case self::TREND_BEST_FIT			:
-			case self::TREND_BEST_FIT_NO_POLY	:
-				//	If the request is to determine the best fit regression, then we test each trend line in turn
-				//	Start by generating an instance of each available trend method
-				foreach(self::$_trendTypes as $trendMethod) {
-					$className = 'PHPExcel_'.$trendMethod.'BestFit';
-					$bestFit[$trendMethod] = new $className($yValues,$xValues,$const);
-					$bestFitValue[$trendMethod] = $bestFit[$trendMethod]->getGoodnessOfFit();
-				}
-				if ($trendType != self::TREND_BEST_FIT_NO_POLY) {
-					foreach(self::$_trendTypePolyOrders as $trendMethod) {
-						$order = substr($trendMethod,-1);
-						$bestFit[$trendMethod] = new PHPExcel_Polynomial_Best_Fit($order,$yValues,$xValues,$const);
-						if ($bestFit[$trendMethod]->getError()) {
-							unset($bestFit[$trendMethod]);
-						} else {
-							$bestFitValue[$trendMethod] = $bestFit[$trendMethod]->getGoodnessOfFit();
-						}
-					}
-				}
-				//	Determine which of our trend lines is the best fit, and then we return the instance of that trend class
-				arsort($bestFitValue);
-				$bestFitType = key($bestFitValue);
-				return $bestFit[$bestFitType];
-				break;
-			default	:
-				return false;
-		}
-	}	//	function calculate()
-
-}	//	class trendClass
\ No newline at end of file
diff --git a/plugins/exportTypes/Excel/PHPExcel/Style.php b/plugins/exportTypes/Excel/PHPExcel/Style.php
deleted file mode 100755
index 6afd15772..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Style.php
+++ /dev/null
@@ -1,684 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style implements PHPExcel_IComparable
-{
-	/**
-	 * Font
-	 *
-	 * @var PHPExcel_Style_Font
-	 */
-	private $_font;
-
-	/**
-	 * Fill
-	 *
-	 * @var PHPExcel_Style_Fill
-	 */
-	private $_fill;
-
-	/**
-	 * Borders
-	 *
-	 * @var PHPExcel_Style_Borders
-	 */
-	private $_borders;
-
-	/**
-	 * Alignment
-	 *
-	 * @var PHPExcel_Style_Alignment
-	 */
-	private $_alignment;
-
-	/**
-	 * Number Format
-	 *
-	 * @var PHPExcel_Style_NumberFormat
-	 */
-	private $_numberFormat;
-
-	/**
-	 * Conditional styles
-	 *
-	 * @var PHPExcel_Style_Conditional[]
-	 */
-	private $_conditionalStyles;
-
-	/**
-	 * Protection
-	 *
-	 * @var PHPExcel_Style_Protection
-	 */
-	private $_protection;
-
-	/**
-	 * Style supervisor?
-	 *
-	 * @var boolean
-	 */
-	private $_isSupervisor;
-
-	/**
-	 * Parent. Only used for style supervisor
-	 *
-	 * @var PHPExcel
-	 */
-	private $_parent;
-
-	/**
-	 * Index of style in collection. Only used for real style.
-	 *
-	 * @var int
-	 */
-	private $_index;
-
-    /**
-     * Create a new PHPExcel_Style
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-     */
-    public function __construct($isSupervisor = false, $isConditional = false)
-    {
-    	// Supervisor?
-		$this->_isSupervisor = $isSupervisor;
-
-		// Initialise values
-    	$this->_conditionalStyles 	= array();
-		$this->_font				= new PHPExcel_Style_Font($isSupervisor, $isConditional);
-		$this->_fill				= new PHPExcel_Style_Fill($isSupervisor, $isConditional);
-		$this->_borders				= new PHPExcel_Style_Borders($isSupervisor, $isConditional);
-		$this->_alignment			= new PHPExcel_Style_Alignment($isSupervisor, $isConditional);
-		$this->_numberFormat		= new PHPExcel_Style_NumberFormat($isSupervisor, $isConditional);
-		$this->_protection			= new PHPExcel_Style_Protection($isSupervisor, $isConditional);
-
-		// bind parent if we are a supervisor
-		if ($isSupervisor) {
-			$this->_font->bindParent($this);
-			$this->_fill->bindParent($this);
-			$this->_borders->bindParent($this);
-			$this->_alignment->bindParent($this);
-			$this->_numberFormat->bindParent($this);
-			$this->_protection->bindParent($this);
-		}
-    }
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param PHPExcel $parent
-	 * @return PHPExcel_Style
-	 */
-	public function bindParent($parent)
-	{
-		$this->_parent = $parent;
-		return $this;
-	}
-
-	/**
-	 * Is this a supervisor or a real style component?
-	 *
-	 * @return boolean
-	 */
-	public function getIsSupervisor()
-	{
-		return $this->_isSupervisor;
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style
-	 */
-	public function getSharedComponent()
-	{
-		$activeSheet = $this->getActiveSheet();
-		$selectedCell = $this->getActiveCell(); // e.g. 'A1'
-
-		if ($activeSheet->cellExists($selectedCell)) {
-			$xfIndex = $activeSheet->getCell($selectedCell)->getXfIndex();
-		} else {
-			$xfIndex = 0;
-		}
-
-		return $this->_parent->getCellXfByIndex($xfIndex);
-	}
-
-	/**
-	 * Get the currently active sheet. Only used for supervisor
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getActiveSheet()
-	{
-		return $this->_parent->getActiveSheet();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getSelectedCells()
-	{
-		return $this->_parent->getActiveSheet()->getSelectedCells();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getActiveCell()
-	{
-		return $this->_parent->getActiveSheet()->getActiveCell();
-	}
-
-	/**
-	 * Get parent. Only used for style supervisor
-	 *
-	 * @return PHPExcel
-	 */
-	public function getParent()
-	{
-		return $this->_parent;
-	}
-
-    /**
-     * Apply styles from array
-     *
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->applyFromArray(
-     * 		array(
-     * 			'font'    => array(
-     * 				'name'      => 'Arial',
-     * 				'bold'      => true,
-     * 				'italic'    => false,
-     * 				'underline' => PHPExcel_Style_Font::UNDERLINE_DOUBLE,
-     * 				'strike'    => false,
-     * 				'color'     => array(
-     * 					'rgb' => '808080'
-     * 				)
-     * 			),
-     * 			'borders' => array(
-     * 				'bottom'     => array(
-     * 					'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 					'color' => array(
-     * 						'rgb' => '808080'
-     * 					)
-     * 				),
-     * 				'top'     => array(
-     * 					'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 					'color' => array(
-     * 						'rgb' => '808080'
-     * 					)
-     * 				)
-     * 			)
-     * 		)
-     * );
-     * </code>
-     *
-     * @param	array	$pStyles	Array containing style information
-     * @param 	boolean		$pAdvanced	Advanced mode for setting borders.
-     * @throws	Exception
-     * @return PHPExcel_Style
-     */
-	public function applyFromArray($pStyles = null, $pAdvanced = true) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-
-				$pRange = $this->getSelectedCells();
-
-				// Uppercase coordinate
-				$pRange = strtoupper($pRange);
-
-				// Is it a cell range or a single cell?
-				if (strpos($pRange, ':') === false) {
-					$rangeA = $pRange;
-					$rangeB = $pRange;
-				} else {
-					list($rangeA, $rangeB) = explode(':', $pRange);
-				}
-
-				// Calculate range outer borders
-				$rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
-				$rangeEnd 	= PHPExcel_Cell::coordinateFromString($rangeB);
-
-				// Translate column into index
-				$rangeStart[0]	= PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
-				$rangeEnd[0]	= PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
-
-				// Make sure we can loop upwards on rows and columns
-				if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
-					$tmp = $rangeStart;
-					$rangeStart = $rangeEnd;
-					$rangeEnd = $tmp;
-				}
-
-				// ADVANCED MODE:
-
-				if ($pAdvanced && isset($pStyles['borders'])) {
-
-					// 'allborders' is a shorthand property for 'outline' and 'inside' and
-					//		it applies to components that have not been set explicitly
-					if (isset($pStyles['borders']['allborders'])) {
-						foreach (array('outline', 'inside') as $component) {
-							if (!isset($pStyles['borders'][$component])) {
-								$pStyles['borders'][$component] = $pStyles['borders']['allborders'];
-							}
-						}
-						unset($pStyles['borders']['allborders']); // not needed any more
-					}
-
-					// 'outline' is a shorthand property for 'top', 'right', 'bottom', 'left'
-					//		it applies to components that have not been set explicitly
-					if (isset($pStyles['borders']['outline'])) {
-						foreach (array('top', 'right', 'bottom', 'left') as $component) {
-							if (!isset($pStyles['borders'][$component])) {
-								$pStyles['borders'][$component] = $pStyles['borders']['outline'];
-							}
-						}
-						unset($pStyles['borders']['outline']); // not needed any more
-					}
-
-					// 'inside' is a shorthand property for 'vertical' and 'horizontal'
-					//		it applies to components that have not been set explicitly
-					if (isset($pStyles['borders']['inside'])) {
-						foreach (array('vertical', 'horizontal') as $component) {
-							if (!isset($pStyles['borders'][$component])) {
-								$pStyles['borders'][$component] = $pStyles['borders']['inside'];
-							}
-						}
-						unset($pStyles['borders']['inside']); // not needed any more
-					}
-
-					// width and height characteristics of selection, 1, 2, or 3 (for 3 or more)
-					$xMax = min($rangeEnd[0] - $rangeStart[0] + 1, 3);
-					$yMax = min($rangeEnd[1] - $rangeStart[1] + 1, 3);
-
-					// loop through up to 3 x 3 = 9 regions
-					for ($x = 1; $x <= $xMax; ++$x) {
-						// start column index for region
-						$colStart = ($x == 3) ?
-							PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0])
-								: PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] + $x - 1);
-
-						// end column index for region
-						$colEnd = ($x == 1) ?
-							PHPExcel_Cell::stringFromColumnIndex($rangeStart[0])
-								: PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] - $xMax + $x);
-
-						for ($y = 1; $y <= $yMax; ++$y) {
-
-							// which edges are touching the region
-							$edges = array();
-
-							// are we at left edge
-							if ($x == 1) {
-								$edges[] = 'left';
-							}
-
-							// are we at right edge
-							if ($x == $xMax) {
-								$edges[] = 'right';
-							}
-
-							// are we at top edge?
-							if ($y == 1) {
-								$edges[] = 'top';
-							}
-
-							// are we at bottom edge?
-							if ($y == $yMax) {
-								$edges[] = 'bottom';
-							}
-
-							// start row index for region
-							$rowStart = ($y == 3) ?
-								$rangeEnd[1] : $rangeStart[1] + $y - 1;
-
-							// end row index for region
-							$rowEnd = ($y == 1) ?
-								$rangeStart[1] : $rangeEnd[1] - $yMax + $y;
-
-							// build range for region
-							$range = $colStart . $rowStart . ':' . $colEnd . $rowEnd;
-
-							// retrieve relevant style array for region
-							$regionStyles = $pStyles;
-							unset($regionStyles['borders']['inside']);
-
-							// what are the inner edges of the region when looking at the selection
-							$innerEdges = array_diff( array('top', 'right', 'bottom', 'left'), $edges );
-
-							// inner edges that are not touching the region should take the 'inside' border properties if they have been set
-							foreach ($innerEdges as $innerEdge) {
-								switch ($innerEdge) {
-									case 'top':
-									case 'bottom':
-										// should pick up 'horizontal' border property if set
-										if (isset($pStyles['borders']['horizontal'])) {
-											$regionStyles['borders'][$innerEdge] = $pStyles['borders']['horizontal'];
-										} else {
-											unset($regionStyles['borders'][$innerEdge]);
-										}
-										break;
-									case 'left':
-									case 'right':
-										// should pick up 'vertical' border property if set
-										if (isset($pStyles['borders']['vertical'])) {
-											$regionStyles['borders'][$innerEdge] = $pStyles['borders']['vertical'];
-										} else {
-											unset($regionStyles['borders'][$innerEdge]);
-										}
-										break;
-								}
-							}
-
-							// apply region style to region by calling applyFromArray() in simple mode
-							$this->getActiveSheet()->getStyle($range)->applyFromArray($regionStyles, false);
-						}
-					}
-					return $this;
-				}
-
-				// SIMPLE MODE:
-
-				// Selection type, inspect
-				if (preg_match('/^[A-Z]+1:[A-Z]+1048576$/', $pRange)) {
-					$selectionType = 'COLUMN';
-				} else if (preg_match('/^A[0-9]+:XFD[0-9]+$/', $pRange)) {
-					$selectionType = 'ROW';
-				} else {
-					$selectionType = 'CELL';
-				}
-
-				// First loop through columns, rows, or cells to find out which styles are affected by this operation
-				switch ($selectionType) {
-					case 'COLUMN':
-						$oldXfIndexes = array();
-						for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-							$oldXfIndexes[$this->getActiveSheet()->getColumnDimensionByColumn($col)->getXfIndex()] = true;
-						}
-						break;
-
-					case 'ROW':
-						$oldXfIndexes = array();
-						for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-							if ($this->getActiveSheet()->getRowDimension($row)->getXfIndex() == null) {
-								$oldXfIndexes[0] = true; // row without explicit style should be formatted based on default style
-							} else {
-								$oldXfIndexes[$this->getActiveSheet()->getRowDimension($row)->getXfIndex()] = true;
-							}
-						}
-						break;
-
-					case 'CELL':
-						$oldXfIndexes = array();
-						for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-							for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-								$oldXfIndexes[$this->getActiveSheet()->getCellByColumnAndRow($col, $row)->getXfIndex()] = true;
-							}
-						}
-						break;
-				}
-
-				// clone each of the affected styles, apply the style arrray, and add the new styles to the workbook
-				$workbook = $this->getActiveSheet()->getParent();
-				foreach ($oldXfIndexes as $oldXfIndex => $dummy) {
-					$style = $workbook->getCellXfByIndex($oldXfIndex);
-					$newStyle = clone $style;
-					$newStyle->applyFromArray($pStyles);
-
-					if ($existingStyle = $workbook->getCellXfByHashCode($newStyle->getHashCode())) {
-						// there is already such cell Xf in our collection
-						$newXfIndexes[$oldXfIndex] = $existingStyle->getIndex();
-					} else {
-						// we don't have such a cell Xf, need to add
-						$workbook->addCellXf($newStyle);
-						$newXfIndexes[$oldXfIndex] = $newStyle->getIndex();
-					}
-				}
-
-				// Loop through columns, rows, or cells again and update the XF index
-				switch ($selectionType) {
-					case 'COLUMN':
-						for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-							$columnDimension = $this->getActiveSheet()->getColumnDimensionByColumn($col);
-							$oldXfIndex = $columnDimension->getXfIndex();
-							$columnDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
-						}
-						break;
-
-					case 'ROW':
-						for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-							$rowDimension = $this->getActiveSheet()->getRowDimension($row);
-							$oldXfIndex = $rowDimension->getXfIndex() === null ?
-								0 : $rowDimension->getXfIndex(); // row without explicit style should be formatted based on default style
-							$rowDimension->setXfIndex($newXfIndexes[$oldXfIndex]);
-						}
-						break;
-
-					case 'CELL':
-						for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-							for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-								$cell = $this->getActiveSheet()->getCellByColumnAndRow($col, $row);
-								$oldXfIndex = $cell->getXfIndex();
-								$cell->setXfIndex($newXfIndexes[$oldXfIndex]);
-							}
-						}
-						break;
-				}
-
-			} else {
-				// not a supervisor, just apply the style array directly on style object
-				if (array_key_exists('fill', $pStyles)) {
-					$this->getFill()->applyFromArray($pStyles['fill']);
-				}
-				if (array_key_exists('font', $pStyles)) {
-					$this->getFont()->applyFromArray($pStyles['font']);
-				}
-				if (array_key_exists('borders', $pStyles)) {
-					$this->getBorders()->applyFromArray($pStyles['borders']);
-				}
-				if (array_key_exists('alignment', $pStyles)) {
-					$this->getAlignment()->applyFromArray($pStyles['alignment']);
-				}
-				if (array_key_exists('numberformat', $pStyles)) {
-					$this->getNumberFormat()->applyFromArray($pStyles['numberformat']);
-				}
-				if (array_key_exists('protection', $pStyles)) {
-					$this->getProtection()->applyFromArray($pStyles['protection']);
-				}
-			}
-		} else {
-			throw new Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-    /**
-     * Get Fill
-     *
-     * @return PHPExcel_Style_Fill
-     */
-    public function getFill() {
-		return $this->_fill;
-    }
-
-    /**
-     * Get Font
-     *
-     * @return PHPExcel_Style_Font
-     */
-    public function getFont() {
-		return $this->_font;
-    }
-
-	/**
-	 * Set font
-	 *
-	 * @param PHPExcel_Style_Font $font
-	 * @return PHPExcel_Style
-	 */
-	public function setFont(PHPExcel_Style_Font $font)
-	{
-		$this->_font = $font;
-		return $this;
-	}
-
-    /**
-     * Get Borders
-     *
-     * @return PHPExcel_Style_Borders
-     */
-    public function getBorders() {
-		return $this->_borders;
-    }
-
-    /**
-     * Get Alignment
-     *
-     * @return PHPExcel_Style_Alignment
-     */
-    public function getAlignment() {
-		return $this->_alignment;
-    }
-
-    /**
-     * Get Number Format
-     *
-     * @return PHPExcel_Style_NumberFormat
-     */
-    public function getNumberFormat() {
-		return $this->_numberFormat;
-    }
-
-    /**
-     * Get Conditional Styles. Only used on supervisor.
-     *
-     * @return PHPExcel_Style_Conditional[]
-     */
-    public function getConditionalStyles() {
-		return $this->getActiveSheet()->getConditionalStyles($this->getActiveCell());
-    }
-
-    /**
-     * Set Conditional Styles. Only used on supervisor.
-     *
-     * @param PHPExcel_Style_Conditional[]	$pValue	Array of condtional styles
-     * @return PHPExcel_Style
-     */
-    public function setConditionalStyles($pValue = null) {
-		if (is_array($pValue)) {
-			$this->getActiveSheet()->setConditionalStyles($this->getSelectedCells(), $pValue);
-		}
-		return $this;
-    }
-
-    /**
-     * Get Protection
-     *
-     * @return PHPExcel_Style_Protection
-     */
-    public function getProtection() {
-		return $this->_protection;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		$hashConditionals = '';
-		foreach ($this->_conditionalStyles as $conditional) {
-			$hashConditionals .= $conditional->getHashCode();
-		}
-
-    	return md5(
-    		  $this->_fill->getHashCode()
-    		. $this->_font->getHashCode()
-    		. $this->_borders->getHashCode()
-    		. $this->_alignment->getHashCode()
-    		. $this->_numberFormat->getHashCode()
-    		. $hashConditionals
-    		. $this->_protection->getHashCode()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Get own index in style collection
-	 *
-	 * @return int
-	 */
-	public function getIndex()
-	{
-		return $this->_index;
-	}
-
-	/**
-	 * Set own index in style collection
-	 *
-	 * @param int $pValue
-	 */
-	public function setIndex($pValue)
-	{
-		$this->_index = $pValue;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Style/Alignment.php b/plugins/exportTypes/Excel/PHPExcel/Style/Alignment.php
deleted file mode 100755
index fe85cb8b5..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Style/Alignment.php
+++ /dev/null
@@ -1,494 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Alignment
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Alignment implements PHPExcel_IComparable
-{
-	/* Horizontal alignment styles */
-	const HORIZONTAL_GENERAL				= 'general';
-	const HORIZONTAL_LEFT					= 'left';
-	const HORIZONTAL_RIGHT					= 'right';
-	const HORIZONTAL_CENTER					= 'center';
-	const HORIZONTAL_CENTER_CONTINUOUS		= 'centerContinuous';
-	const HORIZONTAL_JUSTIFY				= 'justify';
-
-	/* Vertical alignment styles */
-	const VERTICAL_BOTTOM					= 'bottom';
-	const VERTICAL_TOP						= 'top';
-	const VERTICAL_CENTER					= 'center';
-	const VERTICAL_JUSTIFY					= 'justify';
-
-	/**
-	 * Horizontal
-	 *
-	 * @var string
-	 */
-	private $_horizontal	= PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
-
-	/**
-	 * Vertical
-	 *
-	 * @var string
-	 */
-	private $_vertical		= PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
-
-	/**
-	 * Text rotation
-	 *
-	 * @var int
-	 */
-	private $_textRotation	= 0;
-
-	/**
-	 * Wrap text
-	 *
-	 * @var boolean
-	 */
-	private $_wrapText		= false;
-
-	/**
-	 * Shrink to fit
-	 *
-	 * @var boolean
-	 */
-	private $_shrinkToFit	= false;
-
-	/**
-	 * Indent - only possible with horizontal alignment left and right
-	 *
-	 * @var int
-	 */
-	private $_indent		= 0;
-
-	/**
-	 * Parent Borders
-	 *
-	 * @var _parentPropertyName string
-	 */
-	private $_parentPropertyName;
-
-	/**
-	 * Supervisor?
-	 *
-	 * @var boolean
-	 */
-	private $_isSupervisor;
-
-	/**
-	 * Parent. Only used for supervisor
-	 *
-	 * @var PHPExcel_Style
-	 */
-	private $_parent;
-
-	/**
-	 * Create a new PHPExcel_Style_Alignment
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($isSupervisor = false, $isConditional = false)
-	{
-		// Supervisor?
-		$this->_isSupervisor = $isSupervisor;
-
-		if ($isConditional) {
-			$this->_horizontal		= NULL;
-			$this->_vertical		= NULL;
-			$this->_textRotation	= NULL;
-		}
-	}
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param PHPExcel $parent
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function bindParent($parent)
-	{
-		$this->_parent = $parent;
-		return $this;
-	}
-
-	/**
-	 * Is this a supervisor or a real style component?
-	 *
-	 * @return boolean
-	 */
-	public function getIsSupervisor()
-	{
-		return $this->_isSupervisor;
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getAlignment();
-	}
-
-	/**
-	 * Get the currently active sheet. Only used for supervisor
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getActiveSheet()
-	{
-		return $this->_parent->getActiveSheet();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getSelectedCells()
-	{
-		return $this->getActiveSheet()->getSelectedCells();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getActiveCell()
-	{
-		return $this->getActiveSheet()->getActiveCell();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('alignment' => $array);
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getAlignment()->applyFromArray(
-	 *		array(
-	 *			'horizontal' => PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
-	 *			'vertical'   => PHPExcel_Style_Alignment::VERTICAL_CENTER,
-	 *			'rotation'   => 0,
-	 *			'wrap'	   => true
-	 *		)
-	 * );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	Exception
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function applyFromArray($pStyles = null) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('horizontal', $pStyles)) {
-					$this->setHorizontal($pStyles['horizontal']);
-				}
-				if (array_key_exists('vertical', $pStyles)) {
-					$this->setVertical($pStyles['vertical']);
-				}
-				if (array_key_exists('rotation', $pStyles)) {
-					$this->setTextRotation($pStyles['rotation']);
-				}
-				if (array_key_exists('wrap', $pStyles)) {
-					$this->setWrapText($pStyles['wrap']);
-				}
-				if (array_key_exists('shrinkToFit', $pStyles)) {
-					$this->setShrinkToFit($pStyles['shrinkToFit']);
-				}
-				if (array_key_exists('indent', $pStyles)) {
-					$this->setIndent($pStyles['indent']);
-				}
-			}
-		} else {
-			throw new Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Horizontal
-	 *
-	 * @return string
-	 */
-	public function getHorizontal() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHorizontal();
-		}
-		return $this->_horizontal;
-	}
-
-	/**
-	 * Set Horizontal
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setHorizontal($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL) {
-		if ($pValue == '') {
-			$pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
-		}
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('horizontal' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		}
-		else {
-			$this->_horizontal = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Vertical
-	 *
-	 * @return string
-	 */
-	public function getVertical() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getVertical();
-		}
-		return $this->_vertical;
-	}
-
-	/**
-	 * Set Vertical
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setVertical($pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM) {
-		if ($pValue == '') {
-			$pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
-		}
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('vertical' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_vertical = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get TextRotation
-	 *
-	 * @return int
-	 */
-	public function getTextRotation() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getTextRotation();
-		}
-		return $this->_textRotation;
-	}
-
-	/**
-	 * Set TextRotation
-	 *
-	 * @param int $pValue
-	 * @throws Exception
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setTextRotation($pValue = 0) {
-		// Excel2007 value 255 => PHPExcel value -165
-		if ($pValue == 255) {
-			$pValue = -165;
-		}
-
-		// Set rotation
-		if ( ($pValue >= -90 && $pValue <= 90) || $pValue == -165 ) {
-			if ($this->_isSupervisor) {
-				$styleArray = $this->getStyleArray(array('rotation' => $pValue));
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-			} else {
-				$this->_textRotation = $pValue;
-			}
-		} else {
-			throw new Exception("Text rotation should be a value between -90 and 90.");
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get Wrap Text
-	 *
-	 * @return boolean
-	 */
-	public function getWrapText() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getWrapText();
-		}
-		return $this->_wrapText;
-	}
-
-	/**
-	 * Set Wrap Text
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setWrapText($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('wrap' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_wrapText = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Shrink to fit
-	 *
-	 * @return boolean
-	 */
-	public function getShrinkToFit() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getShrinkToFit();
-		}
-		return $this->_shrinkToFit;
-	}
-
-	/**
-	 * Set Shrink to fit
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setShrinkToFit($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('shrinkToFit' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_shrinkToFit = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get indent
-	 *
-	 * @return int
-	 */
-	public function getIndent() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getIndent();
-		}
-		return $this->_indent;
-	}
-
-	/**
-	 * Set indent
-	 *
-	 * @param int $pValue
-	 * @return PHPExcel_Style_Alignment
-	 */
-	public function setIndent($pValue = 0) {
-		if ($pValue > 0) {
-			if ($this->getHorizontal() != self::HORIZONTAL_GENERAL && $this->getHorizontal() != self::HORIZONTAL_LEFT && $this->getHorizontal() != self::HORIZONTAL_RIGHT) {
-				$pValue = 0; // indent not supported
-			}
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('indent' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_indent = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->_horizontal
-			. $this->_vertical
-			. $this->_textRotation
-			. ($this->_wrapText ? 't' : 'f')
-			. ($this->_shrinkToFit ? 't' : 'f')
-			. $this->_indent
-			. __CLASS__
-		);
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Style/Border.php b/plugins/exportTypes/Excel/PHPExcel/Style/Border.php
deleted file mode 100755
index a409e1c75..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Style/Border.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Border
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Border implements PHPExcel_IComparable
-{
-	/* Border style */
-	const BORDER_NONE				= 'none';
-	const BORDER_DASHDOT			= 'dashDot';
-	const BORDER_DASHDOTDOT			= 'dashDotDot';
-	const BORDER_DASHED				= 'dashed';
-	const BORDER_DOTTED				= 'dotted';
-	const BORDER_DOUBLE				= 'double';
-	const BORDER_HAIR				= 'hair';
-	const BORDER_MEDIUM				= 'medium';
-	const BORDER_MEDIUMDASHDOT		= 'mediumDashDot';
-	const BORDER_MEDIUMDASHDOTDOT	= 'mediumDashDotDot';
-	const BORDER_MEDIUMDASHED		= 'mediumDashed';
-	const BORDER_SLANTDASHDOT		= 'slantDashDot';
-	const BORDER_THICK				= 'thick';
-	const BORDER_THIN				= 'thin';
-
-	/**
-	 * Border style
-	 *
-	 * @var string
-	 */
-	private $_borderStyle	= PHPExcel_Style_Border::BORDER_NONE;
-
-	/**
-	 * Border color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	private $_color;
-
-	/**
-	 * Supervisor?
-	 *
-	 * @var boolean
-	 */
-	private $_isSupervisor;
-
-	/**
-	 * Parent. Only used for supervisor
-	 *
-	 * @var PHPExcel_Style_Borders
-	 */
-	private $_parent;
-
-	/**
-	 * Parent property name
-	 *
-	 * @var string
-	 */
-	private $_parentPropertyName;
-
-	/**
-	 * Create a new PHPExcel_Style_Border
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($isSupervisor = false, $isConditional = false)
-	{
-		// Supervisor?
-		$this->_isSupervisor = $isSupervisor;
-
-		// Initialise values
-		$this->_color	= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
-
-		// bind parent if we are a supervisor
-		if ($isSupervisor) {
-			$this->_color->bindParent($this, '_color');
-		}
-	}
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param PHPExcel_Style_Borders $parent
-	 * @param string $parentPropertyName
-	 * @return PHPExcel_Style_Border
-	 */
-	public function bindParent($parent, $parentPropertyName)
-	{
-		$this->_parent = $parent;
-		$this->_parentPropertyName = $parentPropertyName;
-		return $this;
-	}
-
-	/**
-	 * Is this a supervisor or a real style component?
-	 *
-	 * @return boolean
-	 */
-	public function getIsSupervisor()
-	{
-		return $this->_isSupervisor;
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Border
-	 * @throws Exception
-	 */
-	public function getSharedComponent()
-	{
-		switch ($this->_parentPropertyName) {
-			case '_allBorders':
-			case '_horizontal':
-			case '_inside':
-			case '_outline':
-			case '_vertical':
-				throw new Exception('Cannot get shared component for a pseudo-border.');
-				break;
-
-			case '_bottom':
-				return $this->_parent->getSharedComponent()->getBottom();
-				break;
-
-			case '_diagonal':
-				return $this->_parent->getSharedComponent()->getDiagonal();
-				break;
-
-			case '_left':
-				return $this->_parent->getSharedComponent()->getLeft();
-				break;
-
-			case '_right':
-				return $this->_parent->getSharedComponent()->getRight();
-				break;
-
-			case '_top':
-				return $this->_parent->getSharedComponent()->getTop();
-				break;
-
-		}
-	}
-
-	/**
-	 * Get the currently active sheet. Only used for supervisor
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getActiveSheet()
-	{
-		return $this->_parent->getActiveSheet();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getSelectedCells()
-	{
-		return $this->getActiveSheet()->getSelectedCells();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getActiveCell()
-	{
-		return $this->getActiveSheet()->getActiveCell();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		switch ($this->_parentPropertyName) {
-		case '_allBorders':
-			$key = 'allborders';
-			break;
-
-		case '_bottom':
-			$key = 'bottom';
-			break;
-
-		case '_diagonal':
-			$key = 'diagonal';
-			break;
-
-		case '_horizontal':
-			$key = 'horizontal';
-			break;
-
-		case '_inside':
-			$key = 'inside';
-			break;
-
-		case '_left':
-			$key = 'left';
-			break;
-
-		case '_outline':
-			$key = 'outline';
-			break;
-
-		case '_right':
-			$key = 'right';
-			break;
-
-		case '_top':
-			$key = 'top';
-			break;
-
-		case '_vertical':
-			$key = 'vertical';
-			break;
-		}
-		return $this->_parent->getStyleArray(array($key => $array));
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->getTop()->applyFromArray(
-	 *		array(
-	 *			'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-	 *			'color' => array(
-	 *				'rgb' => '808080'
-	 *			)
-	 *		)
-	 * );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	Exception
-	 * @return PHPExcel_Style_Border
-	 */
-	public function applyFromArray($pStyles = null) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('style', $pStyles)) {
-					$this->setBorderStyle($pStyles['style']);
-				}
-				if (array_key_exists('color', $pStyles)) {
-					$this->getColor()->applyFromArray($pStyles['color']);
-				}
-			}
-		} else {
-			throw new Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Border style
-	 *
-	 * @return string
-	 */
-	public function getBorderStyle() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getBorderStyle();
-		}
-		return $this->_borderStyle;
-	}
-
-	/**
-	 * Set Border style
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style_Border
-	 */
-	public function setBorderStyle($pValue = PHPExcel_Style_Border::BORDER_NONE) {
-
-		if ($pValue == '') {
-			$pValue = PHPExcel_Style_Border::BORDER_NONE;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('style' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_borderStyle = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Border Color
-	 *
-	 * @return PHPExcel_Style_Color
-	 */
-	public function getColor() {
-		return $this->_color;
-	}
-
-	/**
-	 * Set Border Color
-	 *
-	 * @param	PHPExcel_Style_Color $pValue
-	 * @throws	Exception
-	 * @return PHPExcel_Style_Border
-	 */
-	public function setColor(PHPExcel_Style_Color $pValue = null) {
-		// make sure parameter is a real color and not a supervisor
-		$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getColor()->getStyleArray(array('argb' => $color->getARGB()));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_color = $color;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->_borderStyle
-			. $this->_color->getHashCode()
-			. __CLASS__
-		);
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Style/Borders.php b/plugins/exportTypes/Excel/PHPExcel/Style/Borders.php
deleted file mode 100755
index 295daa218..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Style/Borders.php
+++ /dev/null
@@ -1,512 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Borders
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Borders implements PHPExcel_IComparable
-{
-	/* Diagonal directions */
-	const DIAGONAL_NONE		= 0;
-	const DIAGONAL_UP		= 1;
-	const DIAGONAL_DOWN		= 2;
-	const DIAGONAL_BOTH		= 3;
-
-	/**
-	 * Left
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	private $_left;
-
-	/**
-	 * Right
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	private $_right;
-
-	/**
-	 * Top
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	private $_top;
-
-	/**
-	 * Bottom
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	private $_bottom;
-
-	/**
-	 * Diagonal
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	private $_diagonal;
-
-	/**
-	 * DiagonalDirection
-	 *
-	 * @var int
-	 */
-	private $_diagonalDirection;
-
-	/**
-	 * All borders psedo-border. Only applies to supervisor.
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	private $_allBorders;
-
-	/**
-	 * Outline psedo-border. Only applies to supervisor.
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	private $_outline;
-
-	/**
-	 * Inside psedo-border. Only applies to supervisor.
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	private $_inside;
-
-	/**
-	 * Vertical pseudo-border. Only applies to supervisor.
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	private $_vertical;
-
-	/**
-	 * Horizontal pseudo-border. Only applies to supervisor.
-	 *
-	 * @var PHPExcel_Style_Border
-	 */
-	private $_horizontal;
-
-	/**
-	 * Parent Borders
-	 *
-	 * @var _parentPropertyName string
-	 */
-	private $_parentPropertyName;
-
-	/**
-	 * Supervisor?
-	 *
-	 * @var boolean
-	 */
-	private $_isSupervisor;
-
-	/**
-	 * Parent. Only used for supervisor
-	 *
-	 * @var PHPExcel_Style
-	 */
-	private $_parent;
-
-	/**
-     * Create a new PHPExcel_Style_Borders
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-     */
-    public function __construct($isSupervisor = false, $isConditional = false)
-    {
-    	// Supervisor?
-		$this->_isSupervisor = $isSupervisor;
-
-    	// Initialise values
-    	$this->_left				= new PHPExcel_Style_Border($isSupervisor, $isConditional);
-    	$this->_right				= new PHPExcel_Style_Border($isSupervisor, $isConditional);
-    	$this->_top					= new PHPExcel_Style_Border($isSupervisor, $isConditional);
-    	$this->_bottom				= new PHPExcel_Style_Border($isSupervisor, $isConditional);
-    	$this->_diagonal			= new PHPExcel_Style_Border($isSupervisor, $isConditional);
-		$this->_diagonalDirection	= PHPExcel_Style_Borders::DIAGONAL_NONE;
-
-		// Specially for supervisor
-		if ($isSupervisor) {
-			// Initialize pseudo-borders
-			$this->_allBorders			= new PHPExcel_Style_Border(true);
-			$this->_outline				= new PHPExcel_Style_Border(true);
-			$this->_inside				= new PHPExcel_Style_Border(true);
-			$this->_vertical			= new PHPExcel_Style_Border(true);
-			$this->_horizontal			= new PHPExcel_Style_Border(true);
-
-			// bind parent if we are a supervisor
-			$this->_left->bindParent($this, '_left');
-			$this->_right->bindParent($this, '_right');
-			$this->_top->bindParent($this, '_top');
-			$this->_bottom->bindParent($this, '_bottom');
-			$this->_diagonal->bindParent($this, '_diagonal');
-			$this->_allBorders->bindParent($this, '_allBorders');
-			$this->_outline->bindParent($this, '_outline');
-			$this->_inside->bindParent($this, '_inside');
-			$this->_vertical->bindParent($this, '_vertical');
-			$this->_horizontal->bindParent($this, '_horizontal');
-		}
-    }
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param PHPExcel_Style $parent
-	 * @return PHPExcel_Style_Borders
-	 */
-	public function bindParent($parent)
-	{
-		$this->_parent = $parent;
-		return $this;
-	}
-
-	/**
-	 * Is this a supervisor or a real style component?
-	 *
-	 * @return boolean
-	 */
-	public function getIsSupervisor()
-	{
-		return $this->_isSupervisor;
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Borders
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getBorders();
-	}
-
-	/**
-	 * Get the currently active sheet. Only used for supervisor
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getActiveSheet()
-	{
-		return $this->_parent->getActiveSheet();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getSelectedCells()
-	{
-		return $this->getActiveSheet()->getSelectedCells();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getActiveCell()
-	{
-		return $this->getActiveSheet()->getActiveCell();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('borders' => $array);
-	}
-
-	/**
-     * Apply styles from array
-     *
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
-     * 		array(
-     * 			'bottom'     => array(
-     * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 				'color' => array(
-     * 					'rgb' => '808080'
-     * 				)
-     * 			),
-     * 			'top'     => array(
-     * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 				'color' => array(
-     * 					'rgb' => '808080'
-     * 				)
-     * 			)
-     * 		)
-     * );
-     * </code>
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
-     * 		array(
-     * 			'allborders' => array(
-     * 				'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
-     * 				'color' => array(
-     * 					'rgb' => '808080'
-     * 				)
-     * 			)
-     * 		)
-     * );
-     * </code>
-     *
-     * @param	array	$pStyles	Array containing style information
-     * @throws	Exception
-     * @return PHPExcel_Style_Borders
-     */
-	public function applyFromArray($pStyles = null) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('left', $pStyles)) {
-					$this->getLeft()->applyFromArray($pStyles['left']);
-				}
-				if (array_key_exists('right', $pStyles)) {
-					$this->getRight()->applyFromArray($pStyles['right']);
-				}
-				if (array_key_exists('top', $pStyles)) {
-					$this->getTop()->applyFromArray($pStyles['top']);
-				}
-				if (array_key_exists('bottom', $pStyles)) {
-					$this->getBottom()->applyFromArray($pStyles['bottom']);
-				}
-				if (array_key_exists('diagonal', $pStyles)) {
-					$this->getDiagonal()->applyFromArray($pStyles['diagonal']);
-				}
-				if (array_key_exists('diagonaldirection', $pStyles)) {
-					$this->setDiagonalDirection($pStyles['diagonaldirection']);
-				}
-				if (array_key_exists('allborders', $pStyles)) {
-					$this->getLeft()->applyFromArray($pStyles['allborders']);
-					$this->getRight()->applyFromArray($pStyles['allborders']);
-					$this->getTop()->applyFromArray($pStyles['allborders']);
-					$this->getBottom()->applyFromArray($pStyles['allborders']);
-				}
-			}
-		} else {
-			throw new Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-    /**
-     * Get Left
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getLeft() {
-		return $this->_left;
-    }
-
-    /**
-     * Get Right
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getRight() {
-		return $this->_right;
-    }
-
-    /**
-     * Get Top
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getTop() {
-		return $this->_top;
-    }
-
-    /**
-     * Get Bottom
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getBottom() {
-		return $this->_bottom;
-    }
-
-    /**
-     * Get Diagonal
-     *
-     * @return PHPExcel_Style_Border
-     */
-    public function getDiagonal() {
-		return $this->_diagonal;
-    }
-
-    /**
-     * Get AllBorders (pseudo-border). Only applies to supervisor.
-     *
-     * @return PHPExcel_Style_Border
-     * @throws Exception
-     */
-    public function getAllBorders() {
-		if (!$this->_isSupervisor) {
-			throw new Exception('Can only get pseudo-border for supervisor.');
-		}
-		return $this->_allBorders;
-    }
-
-    /**
-     * Get Outline (pseudo-border). Only applies to supervisor.
-     *
-     * @return boolean
-     * @throws Exception
-     */
-    public function getOutline() {
-		if (!$this->_isSupervisor) {
-			throw new Exception('Can only get pseudo-border for supervisor.');
-		}
-    	return $this->_outline;
-    }
-
-    /**
-     * Get Inside (pseudo-border). Only applies to supervisor.
-     *
-     * @return boolean
-     * @throws Exception
-     */
-    public function getInside() {
-		if (!$this->_isSupervisor) {
-			throw new Exception('Can only get pseudo-border for supervisor.');
-		}
-    	return $this->_inside;
-    }
-
-    /**
-     * Get Vertical (pseudo-border). Only applies to supervisor.
-     *
-     * @return PHPExcel_Style_Border
-     * @throws Exception
-     */
-    public function getVertical() {
-		if (!$this->_isSupervisor) {
-			throw new Exception('Can only get pseudo-border for supervisor.');
-		}
-		return $this->_vertical;
-    }
-
-    /**
-     * Get Horizontal (pseudo-border). Only applies to supervisor.
-     *
-     * @return PHPExcel_Style_Border
-     * @throws Exception
-     */
-    public function getHorizontal() {
-		if (!$this->_isSupervisor) {
-			throw new Exception('Can only get pseudo-border for supervisor.');
-		}
-		return $this->_horizontal;
-    }
-
-    /**
-     * Get DiagonalDirection
-     *
-     * @return int
-     */
-    public function getDiagonalDirection() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getDiagonalDirection();
-		}
-    	return $this->_diagonalDirection;
-    }
-
-    /**
-     * Set DiagonalDirection
-     *
-     * @param int $pValue
-     * @return PHPExcel_Style_Borders
-     */
-    public function setDiagonalDirection($pValue = PHPExcel_Style_Borders::DIAGONAL_NONE) {
-        if ($pValue == '') {
-    		$pValue = PHPExcel_Style_Borders::DIAGONAL_NONE;
-    	}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('diagonaldirection' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_diagonalDirection = $pValue;
-		}
-		return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashcode();
-		}
-    	return md5(
-    		  $this->getLeft()->getHashCode()
-    		. $this->getRight()->getHashCode()
-    		. $this->getTop()->getHashCode()
-    		. $this->getBottom()->getHashCode()
-    		. $this->getDiagonal()->getHashCode()
-    		. $this->getDiagonalDirection()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Style/Color.php b/plugins/exportTypes/Excel/PHPExcel/Style/Color.php
deleted file mode 100755
index 89c919b65..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Style/Color.php
+++ /dev/null
@@ -1,510 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Color
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Color implements PHPExcel_IComparable
-{
-	/* Colors */
-	const COLOR_BLACK						= 'FF000000';
-	const COLOR_WHITE						= 'FFFFFFFF';
-	const COLOR_RED							= 'FFFF0000';
-	const COLOR_DARKRED						= 'FF800000';
-	const COLOR_BLUE						= 'FF0000FF';
-	const COLOR_DARKBLUE					= 'FF000080';
-	const COLOR_GREEN						= 'FF00FF00';
-	const COLOR_DARKGREEN					= 'FF008000';
-	const COLOR_YELLOW						= 'FFFFFF00';
-	const COLOR_DARKYELLOW					= 'FF808000';
-
-	/**
-	 * Indexed colors array
-	 *
-	 * @var array
-	 */
-	private static $_indexedColors;
-
-	/**
-	 * ARGB - Alpha RGB
-	 *
-	 * @var string
-	 */
-	private $_argb	= NULL;
-
-	/**
-	 * Supervisor?
-	 *
-	 * @var boolean
-	 */
-	private $_isSupervisor;
-
-	/**
-	 * Parent. Only used for supervisor
-	 *
-	 * @var mixed
-	 */
-	private $_parent;
-
-	/**
-	 * Parent property name
-	 *
-	 * @var string
-	 */
-	private $_parentPropertyName;
-
-
-	/**
-	 * Create a new PHPExcel_Style_Color
-	 *
-	 * @param	string	$pARGB			ARGB value for the colour
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($pARGB = PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor = false, $isConditional = false)
-	{
-		//	Supervisor?
-		$this->_isSupervisor = $isSupervisor;
-
-		//	Initialise values
-		if (!$isConditional) {
-			$this->_argb = $pARGB;
-		}
-	}
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param mixed $parent
-	 * @param string $parentPropertyName
-	 * @return PHPExcel_Style_Color
-	 */
-	public function bindParent($parent, $parentPropertyName)
-	{
-		$this->_parent = $parent;
-		$this->_parentPropertyName = $parentPropertyName;
-		return $this;
-	}
-
-	/**
-	 * Is this a supervisor or a real style component?
-	 *
-	 * @return boolean
-	 */
-	public function getIsSupervisor()
-	{
-		return $this->_isSupervisor;
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Color
-	 */
-	public function getSharedComponent()
-	{
-		switch ($this->_parentPropertyName) {
-			case '_endColor':
-				return $this->_parent->getSharedComponent()->getEndColor();		break;
-			case '_color':
-				return $this->_parent->getSharedComponent()->getColor();		break;
-			case '_startColor':
-				return $this->_parent->getSharedComponent()->getStartColor();	break;
-		}
-	}
-
-	/**
-	 * Get the currently active sheet. Only used for supervisor
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getActiveSheet()
-	{
-		return $this->_parent->getActiveSheet();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getSelectedCells()
-	{
-		return $this->getActiveSheet()->getSelectedCells();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getActiveCell()
-	{
-		return $this->getActiveSheet()->getActiveCell();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		switch ($this->_parentPropertyName) {
-			case '_endColor':
-				$key = 'endcolor';
-				break;
-			case '_color':
-				$key = 'color';
-				break;
-			case '_startColor':
-				$key = 'startcolor';
-				break;
-
-		}
-		return $this->_parent->getStyleArray(array($key => $array));
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->getColor()->applyFromArray( array('rgb' => '808080') );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	Exception
-	 * @return PHPExcel_Style_Color
-	 */
-	public function applyFromArray($pStyles = NULL) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('rgb', $pStyles)) {
-					$this->setRGB($pStyles['rgb']);
-				}
-				if (array_key_exists('argb', $pStyles)) {
-					$this->setARGB($pStyles['argb']);
-				}
-			}
-		} else {
-			throw new Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get ARGB
-	 *
-	 * @return string
-	 */
-	public function getARGB() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getARGB();
-		}
-		return $this->_argb;
-	}
-
-	/**
-	 * Set ARGB
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style_Color
-	 */
-	public function setARGB($pValue = PHPExcel_Style_Color::COLOR_BLACK) {
-		if ($pValue == '') {
-			$pValue = PHPExcel_Style_Color::COLOR_BLACK;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('argb' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_argb = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get RGB
-	 *
-	 * @return string
-	 */
-	public function getRGB() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getRGB();
-		}
-		return substr($this->_argb, 2);
-	}
-
-	/**
-	 * Set RGB
-	 *
-	 * @param	string	$pValue	RGB value
-	 * @return PHPExcel_Style_Color
-	 */
-	public function setRGB($pValue = '000000') {
-		if ($pValue == '') {
-			$pValue = '000000';
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('argb' => 'FF' . $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_argb = 'FF' . $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get a specified colour component of an RGB value
-	 *
-	 * @private
-	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
-	 * @param	int			$offset		Position within the RGB value to extract
-	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
-	 *									decimal value
-	 * @return	string		The extracted colour component
-	 */
-	private static function _getColourComponent($RGB,$offset,$hex=TRUE) {
-		$colour = substr($RGB, $offset, 2);
-		if (!$hex)
-			$colour = hexdec($colour);
-		return $colour;
-	}
-
-	/**
-	 * Get the red colour component of an RGB value
-	 *
-	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
-	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
-	 *									decimal value
-	 * @return	string		The red colour component
-	 */
-	public static function getRed($RGB,$hex=TRUE) {
-		if (strlen($RGB) == 8) {
-			return self::_getColourComponent($RGB, 2, $hex);
-		} elseif (strlen($RGB) == 6) {
-			return self::_getColourComponent($RGB, 0, $hex);
-		}
-	}
-
-	/**
-	 * Get the green colour component of an RGB value
-	 *
-	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
-	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
-	 *									decimal value
-	 * @return	string		The green colour component
-	 */
-	public static function getGreen($RGB,$hex=TRUE) {
-		if (strlen($RGB) == 8) {
-			return self::_getColourComponent($RGB, 4, $hex);
-		} elseif (strlen($RGB) == 6) {
-			return self::_getColourComponent($RGB, 2, $hex);
-		}
-	}
-
-	/**
-	 * Get the blue colour component of an RGB value
-	 *
-	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
-	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
-	 *									decimal value
-	 * @return	string		The blue colour component
-	 */
-	public static function getBlue($RGB,$hex=TRUE) {
-		if (strlen($RGB) == 8) {
-			return self::_getColourComponent($RGB, 6, $hex);
-		} elseif (strlen($RGB) == 6) {
-			return self::_getColourComponent($RGB, 4, $hex);
-		}
-	}
-
-	/**
-	 * Adjust the brightness of a color
-	 *
-	 * @param	string		$hex	The colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
-	 * @param	float		$adjustPercentage	The percentage by which to adjust the colour as a float from -1 to 1
-	 * @return	string		The adjusted colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
-	 */
-	public static function changeBrightness($hex, $adjustPercentage) {
-		$rgba = (strlen($hex) == 8);
-
-		$red	= self::getRed($hex, FALSE);
-		$green	= self::getGreen($hex, FALSE);
-		$blue	= self::getBlue($hex, FALSE);
-		if ($adjustPercentage > 0) {
-			$red	+= (255 - $red) * $adjustPercentage;
-			$green	+= (255 - $green) * $adjustPercentage;
-			$blue	+= (255 - $blue) * $adjustPercentage;
-		} else {
-			$red	+= $red * $adjustPercentage;
-			$green	+= $green * $adjustPercentage;
-			$blue	+= $blue * $adjustPercentage;
-		}
-
-		if ($red < 0) $red = 0;
-		elseif ($red > 255) $red = 255;
-		if ($green < 0) $green = 0;
-		elseif ($green > 255) $green = 255;
-		if ($blue < 0) $blue = 0;
-		elseif ($blue > 255) $blue = 255;
-
-		$rgb = strtoupper(	str_pad(dechex($red), 2, '0', 0) .
-							str_pad(dechex($green), 2, '0', 0) .
-							str_pad(dechex($blue), 2, '0', 0)
-						 );
-		return (($rgba) ? 'FF' : '') . $rgb;
-	}
-
-	/**
-	 * Get indexed color
-	 *
-	 * @param	int			$pIndex			Index entry point into the colour array
-	 * @param	boolean		$background		Flag to indicate whether default background or foreground colour
-	 *											should be returned if the indexed colour doesn't exist
-	 * @return	PHPExcel_Style_Color
-	 */
-	public static function indexedColor($pIndex, $background=FALSE) {
-		// Clean parameter
-		$pIndex = intval($pIndex);
-
-		// Indexed colors
-		if (is_null(self::$_indexedColors)) {
-			self::$_indexedColors = array(
-					1	=> 'FF000000',	//	System Colour #1 - Black
-					2	=> 'FFFFFFFF',	//	System Colour #2 - White
-					3	=> 'FFFF0000',	//	System Colour #3 - Red
-					4	=> 'FF00FF00',	//	System Colour #4 - Green
-					5	=> 'FF0000FF',	//	System Colour #5 - Blue
-					6	=> 'FFFFFF00',	//	System Colour #6 - Yellow
-					7	=> 'FFFF00FF',	//	System Colour #7- Magenta
-					8	=> 'FF00FFFF',	//	System Colour #8- Cyan
-					9	=> 'FF800000',	//	Standard Colour #9
-					10	=> 'FF008000',	//	Standard Colour #10
-					11	=> 'FF000080',	//	Standard Colour #11
-					12	=> 'FF808000',	//	Standard Colour #12
-					13	=> 'FF800080',	//	Standard Colour #13
-					14	=> 'FF008080',	//	Standard Colour #14
-					15	=> 'FFC0C0C0',	//	Standard Colour #15
-					16	=> 'FF808080',	//	Standard Colour #16
-					17	=> 'FF9999FF',	//	Chart Fill Colour #17
-					18	=> 'FF993366',	//	Chart Fill Colour #18
-					19	=> 'FFFFFFCC',	//	Chart Fill Colour #19
-					20	=> 'FFCCFFFF',	//	Chart Fill Colour #20
-					21	=> 'FF660066',	//	Chart Fill Colour #21
-					22	=> 'FFFF8080',	//	Chart Fill Colour #22
-					23	=> 'FF0066CC',	//	Chart Fill Colour #23
-					24	=> 'FFCCCCFF',	//	Chart Fill Colour #24
-					25	=> 'FF000080',	//	Chart Line Colour #25
-					26	=> 'FFFF00FF',	//	Chart Line Colour #26
-					27	=> 'FFFFFF00',	//	Chart Line Colour #27
-					28	=> 'FF00FFFF',	//	Chart Line Colour #28
-					29	=> 'FF800080',	//	Chart Line Colour #29
-					30	=> 'FF800000',	//	Chart Line Colour #30
-					31	=> 'FF008080',	//	Chart Line Colour #31
-					32	=> 'FF0000FF',	//	Chart Line Colour #32
-					33	=> 'FF00CCFF',	//	Standard Colour #33
-					34	=> 'FFCCFFFF',	//	Standard Colour #34
-					35	=> 'FFCCFFCC',	//	Standard Colour #35
-					36	=> 'FFFFFF99',	//	Standard Colour #36
-					37	=> 'FF99CCFF',	//	Standard Colour #37
-					38	=> 'FFFF99CC',	//	Standard Colour #38
-					39	=> 'FFCC99FF',	//	Standard Colour #39
-					40	=> 'FFFFCC99',	//	Standard Colour #40
-					41	=> 'FF3366FF',	//	Standard Colour #41
-					42	=> 'FF33CCCC',	//	Standard Colour #42
-					43	=> 'FF99CC00',	//	Standard Colour #43
-					44	=> 'FFFFCC00',	//	Standard Colour #44
-					45	=> 'FFFF9900',	//	Standard Colour #45
-					46	=> 'FFFF6600',	//	Standard Colour #46
-					47	=> 'FF666699',	//	Standard Colour #47
-					48	=> 'FF969696',	//	Standard Colour #48
-					49	=> 'FF003366',	//	Standard Colour #49
-					50	=> 'FF339966',	//	Standard Colour #50
-					51	=> 'FF003300',	//	Standard Colour #51
-					52	=> 'FF333300',	//	Standard Colour #52
-					53	=> 'FF993300',	//	Standard Colour #53
-					54	=> 'FF993366',	//	Standard Colour #54
-					55	=> 'FF333399',	//	Standard Colour #55
-					56	=> 'FF333333'	//	Standard Colour #56
-				);
-		}
-
-		if (array_key_exists($pIndex, self::$_indexedColors)) {
-			return new PHPExcel_Style_Color(self::$_indexedColors[$pIndex]);
-		}
-
-		if ($background) {
-			return new PHPExcel_Style_Color('FFFFFFFF');
-		}
-		return new PHPExcel_Style_Color('FF000000');
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->_argb
-			. __CLASS__
-		);
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Style/Conditional.php b/plugins/exportTypes/Excel/PHPExcel/Style/Conditional.php
deleted file mode 100755
index ff365d1b2..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Style/Conditional.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Conditional
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Conditional implements PHPExcel_IComparable
-{
-	/* Condition types */
-	const CONDITION_NONE					= 'none';
-	const CONDITION_CELLIS					= 'cellIs';
-	const CONDITION_CONTAINSTEXT			= 'containsText';
-	const CONDITION_EXPRESSION 				= 'expression';
-
-	/* Operator types */
-	const OPERATOR_NONE						= '';
-	const OPERATOR_BEGINSWITH				= 'beginsWith';
-	const OPERATOR_ENDSWITH					= 'endsWith';
-	const OPERATOR_EQUAL					= 'equal';
-	const OPERATOR_GREATERTHAN				= 'greaterThan';
-	const OPERATOR_GREATERTHANOREQUAL		= 'greaterThanOrEqual';
-	const OPERATOR_LESSTHAN					= 'lessThan';
-	const OPERATOR_LESSTHANOREQUAL			= 'lessThanOrEqual';
-	const OPERATOR_NOTEQUAL					= 'notEqual';
-	const OPERATOR_CONTAINSTEXT				= 'containsText';
-	const OPERATOR_NOTCONTAINS				= 'notContains';
-	const OPERATOR_BETWEEN					= 'between';
-
-	/**
-	 * Condition type
-	 *
-	 * @var int
-	 */
-	private $_conditionType;
-
-	/**
-	 * Operator type
-	 *
-	 * @var int
-	 */
-	private $_operatorType;
-
-	/**
-	 * Text
-	 *
-	 * @var string
-	 */
-	private $_text;
-
-	/**
-	 * Condition
-	 *
-	 * @var string[]
-	 */
-	private $_condition = array();
-
-	/**
-	 * Style
-	 *
-	 * @var PHPExcel_Style
-	 */
-	private $_style;
-
-    /**
-     * Create a new PHPExcel_Style_Conditional
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_conditionType		= PHPExcel_Style_Conditional::CONDITION_NONE;
-    	$this->_operatorType		= PHPExcel_Style_Conditional::OPERATOR_NONE;
-    	$this->_text    			= null;
-    	$this->_condition			= array();
-    	$this->_style				= new PHPExcel_Style(FALSE, TRUE);
-    }
-
-    /**
-     * Get Condition type
-     *
-     * @return string
-     */
-    public function getConditionType() {
-    	return $this->_conditionType;
-    }
-
-    /**
-     * Set Condition type
-     *
-     * @param string $pValue	PHPExcel_Style_Conditional condition type
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setConditionType($pValue = PHPExcel_Style_Conditional::CONDITION_NONE) {
-    	$this->_conditionType = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Operator type
-     *
-     * @return string
-     */
-    public function getOperatorType() {
-    	return $this->_operatorType;
-    }
-
-    /**
-     * Set Operator type
-     *
-     * @param string $pValue	PHPExcel_Style_Conditional operator type
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setOperatorType($pValue = PHPExcel_Style_Conditional::OPERATOR_NONE) {
-    	$this->_operatorType = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get text
-     *
-     * @return string
-     */
-    public function getText() {
-        return $this->_text;
-    }
-
-    /**
-     * Set text
-     *
-     * @param string $value
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setText($value = null) {
-           $this->_text = $value;
-           return $this;
-    }
-
-    /**
-     * Get Condition
-     *
-     * @deprecated Deprecated, use getConditions instead
-     * @return string
-     */
-    public function getCondition() {
-    	if (isset($this->_condition[0])) {
-    		return $this->_condition[0];
-    	}
-
-    	return '';
-    }
-
-    /**
-     * Set Condition
-     *
-     * @deprecated Deprecated, use setConditions instead
-     * @param string $pValue	Condition
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setCondition($pValue = '') {
-    	if (!is_array($pValue))
-    		$pValue = array($pValue);
-
-    	return $this->setConditions($pValue);
-    }
-
-    /**
-     * Get Conditions
-     *
-     * @return string[]
-     */
-    public function getConditions() {
-    	return $this->_condition;
-    }
-
-    /**
-     * Set Conditions
-     *
-     * @param string[] $pValue	Condition
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setConditions($pValue) {
-    	if (!is_array($pValue))
-    		$pValue = array($pValue);
-
-    	$this->_condition = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Add Condition
-     *
-     * @param string $pValue	Condition
-     * @return PHPExcel_Style_Conditional
-     */
-    public function addCondition($pValue = '') {
-    	$this->_condition[] = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Style
-     *
-     * @return PHPExcel_Style
-     */
-    public function getStyle() {
-    	return $this->_style;
-    }
-
-    /**
-     * Set Style
-     *
-     * @param 	PHPExcel_Style $pValue
-     * @throws 	Exception
-     * @return PHPExcel_Style_Conditional
-     */
-    public function setStyle(PHPExcel_Style $pValue = null) {
-   		$this->_style = $pValue;
-   		return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_conditionType
-    		. $this->_operatorType
-    		. implode(';', $this->_condition)
-    		. $this->_style->getHashCode()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Style/Fill.php b/plugins/exportTypes/Excel/PHPExcel/Style/Fill.php
deleted file mode 100755
index 5817a43a4..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Style/Fill.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Fill
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Fill implements PHPExcel_IComparable
-{
-	/* Fill types */
-	const FILL_NONE							= 'none';
-	const FILL_SOLID						= 'solid';
-	const FILL_GRADIENT_LINEAR				= 'linear';
-	const FILL_GRADIENT_PATH				= 'path';
-	const FILL_PATTERN_DARKDOWN				= 'darkDown';
-	const FILL_PATTERN_DARKGRAY				= 'darkGray';
-	const FILL_PATTERN_DARKGRID				= 'darkGrid';
-	const FILL_PATTERN_DARKHORIZONTAL		= 'darkHorizontal';
-	const FILL_PATTERN_DARKTRELLIS			= 'darkTrellis';
-	const FILL_PATTERN_DARKUP				= 'darkUp';
-	const FILL_PATTERN_DARKVERTICAL			= 'darkVertical';
-	const FILL_PATTERN_GRAY0625				= 'gray0625';
-	const FILL_PATTERN_GRAY125				= 'gray125';
-	const FILL_PATTERN_LIGHTDOWN			= 'lightDown';
-	const FILL_PATTERN_LIGHTGRAY			= 'lightGray';
-	const FILL_PATTERN_LIGHTGRID			= 'lightGrid';
-	const FILL_PATTERN_LIGHTHORIZONTAL		= 'lightHorizontal';
-	const FILL_PATTERN_LIGHTTRELLIS			= 'lightTrellis';
-	const FILL_PATTERN_LIGHTUP				= 'lightUp';
-	const FILL_PATTERN_LIGHTVERTICAL		= 'lightVertical';
-	const FILL_PATTERN_MEDIUMGRAY			= 'mediumGray';
-
-	/**
-	 * Fill type
-	 *
-	 * @var string
-	 */
-	private $_fillType	= PHPExcel_Style_Fill::FILL_NONE;
-
-	/**
-	 * Rotation
-	 *
-	 * @var double
-	 */
-	private $_rotation	= 0;
-
-	/**
-	 * Start color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	private $_startColor;
-
-	/**
-	 * End color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	private $_endColor;
-
-	/**
-	 * Parent Borders
-	 *
-	 * @var _parentPropertyName string
-	 */
-	private $_parentPropertyName;
-
-	/**
-	 * Supervisor?
-	 *
-	 * @var boolean
-	 */
-	private $_isSupervisor;
-
-	/**
-	 * Parent. Only used for supervisor
-	 *
-	 * @var PHPExcel_Style
-	 */
-	private $_parent;
-
-	/**
-	 * Create a new PHPExcel_Style_Fill
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($isSupervisor = false, $isConditional = false)
-	{
-		// Supervisor?
-		$this->_isSupervisor = $isSupervisor;
-
-		// Initialise values
-		if ($isConditional) {
-			$this->_fillType = NULL;
-		}
-		$this->_startColor			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_WHITE, $isSupervisor, $isConditional);
-		$this->_endColor			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
-
-		// bind parent if we are a supervisor
-		if ($isSupervisor) {
-			$this->_startColor->bindParent($this, '_startColor');
-			$this->_endColor->bindParent($this, '_endColor');
-		}
-	}
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param PHPExcel_Style $parent
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function bindParent($parent)
-	{
-		$this->_parent = $parent;
-		return $this;
-	}
-
-	/**
-	 * Is this a supervisor or a real style component?
-	 *
-	 * @return boolean
-	 */
-	public function getIsSupervisor()
-	{
-		return $this->_isSupervisor;
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getFill();
-	}
-
-	/**
-	 * Get the currently active sheet. Only used for supervisor
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getActiveSheet()
-	{
-		return $this->_parent->getActiveSheet();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getSelectedCells()
-	{
-		return $this->getActiveSheet()->getSelectedCells();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getActiveCell()
-	{
-		return $this->getActiveSheet()->getActiveCell();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('fill' => $array);
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFill()->applyFromArray(
-	 *		array(
-	 *			'type'	   => PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR,
-	 *			'rotation'   => 0,
-	 *			'startcolor' => array(
-	 *				'rgb' => '000000'
-	 *			),
-	 *			'endcolor'   => array(
-	 *				'argb' => 'FFFFFFFF'
-	 *			)
-	 *		)
-	 * );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	Exception
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function applyFromArray($pStyles = null) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('type', $pStyles)) {
-					$this->setFillType($pStyles['type']);
-				}
-				if (array_key_exists('rotation', $pStyles)) {
-					$this->setRotation($pStyles['rotation']);
-				}
-				if (array_key_exists('startcolor', $pStyles)) {
-					$this->getStartColor()->applyFromArray($pStyles['startcolor']);
-				}
-				if (array_key_exists('endcolor', $pStyles)) {
-					$this->getEndColor()->applyFromArray($pStyles['endcolor']);
-				}
-				if (array_key_exists('color', $pStyles)) {
-					$this->getStartColor()->applyFromArray($pStyles['color']);
-				}
-			}
-		} else {
-			throw new Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Fill Type
-	 *
-	 * @return string
-	 */
-	public function getFillType() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getFillType();
-		}
-		return $this->_fillType;
-	}
-
-	/**
-	 * Set Fill Type
-	 *
-	 * @param string $pValue	PHPExcel_Style_Fill fill type
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function setFillType($pValue = PHPExcel_Style_Fill::FILL_NONE) {
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('type' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_fillType = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Rotation
-	 *
-	 * @return double
-	 */
-	public function getRotation() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getRotation();
-		}
-		return $this->_rotation;
-	}
-
-	/**
-	 * Set Rotation
-	 *
-	 * @param double $pValue
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function setRotation($pValue = 0) {
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('rotation' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_rotation = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Start Color
-	 *
-	 * @return PHPExcel_Style_Color
-	 */
-	public function getStartColor() {
-		return $this->_startColor;
-	}
-
-	/**
-	 * Set Start Color
-	 *
-	 * @param	PHPExcel_Style_Color $pValue
-	 * @throws	Exception
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function setStartColor(PHPExcel_Style_Color $pValue = null) {
-		// make sure parameter is a real color and not a supervisor
-		$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStartColor()->getStyleArray(array('argb' => $color->getARGB()));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_startColor = $color;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get End Color
-	 *
-	 * @return PHPExcel_Style_Color
-	 */
-	public function getEndColor() {
-		return $this->_endColor;
-	}
-
-	/**
-	 * Set End Color
-	 *
-	 * @param	PHPExcel_Style_Color $pValue
-	 * @throws	Exception
-	 * @return PHPExcel_Style_Fill
-	 */
-	public function setEndColor(PHPExcel_Style_Color $pValue = null) {
-		// make sure parameter is a real color and not a supervisor
-		$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getEndColor()->getStyleArray(array('argb' => $color->getARGB()));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_endColor = $color;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->getFillType()
-			. $this->getRotation()
-			. $this->getStartColor()->getHashCode()
-			. $this->getEndColor()->getHashCode()
-			. __CLASS__
-		);
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Style/Font.php b/plugins/exportTypes/Excel/PHPExcel/Style/Font.php
deleted file mode 100755
index c80e08d62..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Style/Font.php
+++ /dev/null
@@ -1,640 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_Font
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Font implements PHPExcel_IComparable
-{
-	/* Underline types */
-	const UNDERLINE_NONE					= 'none';
-	const UNDERLINE_DOUBLE					= 'double';
-	const UNDERLINE_DOUBLEACCOUNTING		= 'doubleAccounting';
-	const UNDERLINE_SINGLE					= 'single';
-	const UNDERLINE_SINGLEACCOUNTING		= 'singleAccounting';
-
-	/**
-	 * Font Name
-	 *
-	 * @var string
-	 */
-	private $_name			= 'Calibri';
-
-	/**
-	 * Font Size
-	 *
-	 * @var float
-	 */
-	private $_size			= 11;
-
-	/**
-	 * Bold
-	 *
-	 * @var boolean
-	 */
-	private $_bold			= false;
-
-	/**
-	 * Italic
-	 *
-	 * @var boolean
-	 */
-	private $_italic		= false;
-
-	/**
-	 * Superscript
-	 *
-	 * @var boolean
-	 */
-	private $_superScript	= false;
-
-	/**
-	 * Subscript
-	 *
-	 * @var boolean
-	 */
-	private $_subScript		= false;
-
-	/**
-	 * Underline
-	 *
-	 * @var string
-	 */
-	private $_underline		= self::UNDERLINE_NONE;
-
-	/**
-	 * Strikethrough
-	 *
-	 * @var boolean
-	 */
-	private $_strikethrough	= false;
-
-	/**
-	 * Foreground color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	private $_color;
-
-	/**
-	 * Parent Borders
-	 *
-	 * @var _parentPropertyName string
-	 */
-	private $_parentPropertyName;
-
-	/**
-	 * Supervisor?
-	 *
-	 * @var boolean
-	 */
-	private $_isSupervisor;
-
-	/**
-	 * Parent. Only used for supervisor
-	 *
-	 * @var PHPExcel_Style
-	 */
-	private $_parent;
-
-	/**
-	 * Create a new PHPExcel_Style_Font
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($isSupervisor = false, $isConditional = false)
-	{
-		// Supervisor?
-		$this->_isSupervisor = $isSupervisor;
-
-		// Initialise values
-		if ($isConditional) {
-			$this->_name			= NULL;
-			$this->_size			= NULL;
-			$this->_bold			= NULL;
-			$this->_italic			= NULL;
-			$this->_superScript		= NULL;
-			$this->_subScript		= NULL;
-			$this->_underline		= NULL;
-			$this->_strikethrough	= NULL;
-			$this->_color			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
-		} else {
-			$this->_color	= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
-		}
-		// bind parent if we are a supervisor
-		if ($isSupervisor) {
-			$this->_color->bindParent($this, '_color');
-		}
-	}
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param PHPExcel_Style $parent
-	 * @return PHPExcel_Style_Font
-	 */
-	public function bindParent($parent)
-	{
-		$this->_parent = $parent;
-	}
-
-	/**
-	 * Is this a supervisor or a real style component?
-	 *
-	 * @return boolean
-	 */
-	public function getIsSupervisor()
-	{
-		return $this->_isSupervisor;
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Font
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getFont();
-	}
-
-	/**
-	 * Get the currently active sheet. Only used for supervisor
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getActiveSheet()
-	{
-		return $this->_parent->getActiveSheet();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getSelectedCells()
-	{
-		return $this->getActiveSheet()->getSelectedCells();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getActiveCell()
-	{
-		return $this->getActiveSheet()->getActiveCell();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('font' => $array);
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->applyFromArray(
-	 *		array(
-	 *			'name'	  => 'Arial',
-	 *			'bold'	  => true,
-	 *			'italic'	=> false,
-	 *			'underline' => PHPExcel_Style_Font::UNDERLINE_DOUBLE,
-	 *			'strike'	=> false,
-	 *			'color'	 => array(
-	 *				'rgb' => '808080'
-	 *			)
-	 *		)
-	 * );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	Exception
-	 * @return PHPExcel_Style_Font
-	 */
-	public function applyFromArray($pStyles = null) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('name', $pStyles)) {
-					$this->setName($pStyles['name']);
-				}
-				if (array_key_exists('bold', $pStyles)) {
-					$this->setBold($pStyles['bold']);
-				}
-				if (array_key_exists('italic', $pStyles)) {
-					$this->setItalic($pStyles['italic']);
-				}
-				if (array_key_exists('superScript', $pStyles)) {
-					$this->setSuperScript($pStyles['superScript']);
-				}
-				if (array_key_exists('subScript', $pStyles)) {
-					$this->setSubScript($pStyles['subScript']);
-				}
-				if (array_key_exists('underline', $pStyles)) {
-					$this->setUnderline($pStyles['underline']);
-				}
-				if (array_key_exists('strike', $pStyles)) {
-					$this->setStrikethrough($pStyles['strike']);
-				}
-				if (array_key_exists('color', $pStyles)) {
-					$this->getColor()->applyFromArray($pStyles['color']);
-				}
-				if (array_key_exists('size', $pStyles)) {
-					$this->setSize($pStyles['size']);
-				}
-			}
-		} else {
-			throw new Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Name
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getName();
-		}
-		return $this->_name;
-	}
-
-	/**
-	 * Set Name
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setName($pValue = 'Calibri') {
-  		if ($pValue == '') {
-			$pValue = 'Calibri';
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('name' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_name = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Size
-	 *
-	 * @return double
-	 */
-	public function getSize() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getSize();
-		}
-		return $this->_size;
-	}
-
-	/**
-	 * Set Size
-	 *
-	 * @param double $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setSize($pValue = 10) {
-		if ($pValue == '') {
-			$pValue = 10;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('size' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_size = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Bold
-	 *
-	 * @return boolean
-	 */
-	public function getBold() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getBold();
-		}
-		return $this->_bold;
-	}
-
-	/**
-	 * Set Bold
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setBold($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('bold' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_bold = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Italic
-	 *
-	 * @return boolean
-	 */
-	public function getItalic() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getItalic();
-		}
-		return $this->_italic;
-	}
-
-	/**
-	 * Set Italic
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setItalic($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('italic' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_italic = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get SuperScript
-	 *
-	 * @return boolean
-	 */
-	public function getSuperScript() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getSuperScript();
-		}
-		return $this->_superScript;
-	}
-
-	/**
-	 * Set SuperScript
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setSuperScript($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('superScript' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_superScript = $pValue;
-			$this->_subScript = !$pValue;
-		}
-		return $this;
-	}
-
-		/**
-	 * Get SubScript
-	 *
-	 * @return boolean
-	 */
-	public function getSubScript() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getSubScript();
-		}
-		return $this->_subScript;
-	}
-
-	/**
-	 * Set SubScript
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setSubScript($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('subScript' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_subScript = $pValue;
-			$this->_superScript = !$pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Underline
-	 *
-	 * @return string
-	 */
-	public function getUnderline() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getUnderline();
-		}
-		return $this->_underline;
-	}
-
-	/**
-	 * Set Underline
-	 *
-	 * @param string|boolean $pValue	PHPExcel_Style_Font underline type
-	 *									If a boolean is passed, then true equates to UNDERLINE_SINGLE,
-	 *										false equates to UNDERLINE_NONE
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setUnderline($pValue = self::UNDERLINE_NONE) {
-		if (is_bool($pValue)) {
-			$pValue = ($pValue) ? self::UNDERLINE_SINGLE : self::UNDERLINE_NONE;
-		} elseif ($pValue == '') {
-			$pValue = self::UNDERLINE_NONE;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('underline' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_underline = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Striketrough
-	 *
-	 * @deprecated Use getStrikethrough() instead.
-	 * @return boolean
-	 */
-	public function getStriketrough() {
-		return $this->getStrikethrough();
-	}
-
-	/**
-	 * Set Striketrough
-	 *
-	 * @deprecated Use setStrikethrough() instead.
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setStriketrough($pValue = false) {
-		return $this->setStrikethrough($pValue);
-	}
-
-	/**
-	 * Get Strikethrough
-	 *
-	 * @return boolean
-	 */
-	public function getStrikethrough() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getStrikethrough();
-		}
-		return $this->_strikethrough;
-	}
-
-	/**
-	 * Set Strikethrough
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setStrikethrough($pValue = false) {
-		if ($pValue == '') {
-			$pValue = false;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('strike' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_strikethrough = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Color
-	 *
-	 * @return PHPExcel_Style_Color
-	 */
-	public function getColor() {
-		return $this->_color;
-	}
-
-	/**
-	 * Set Color
-	 *
-	 * @param	PHPExcel_Style_Color $pValue
-	 * @throws	Exception
-	 * @return PHPExcel_Style_Font
-	 */
-	public function setColor(PHPExcel_Style_Color $pValue = null) {
-		// make sure parameter is a real color and not a supervisor
-		$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getColor()->getStyleArray(array('argb' => $color->getARGB()));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_color = $color;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->_name
-			. $this->_size
-			. ($this->_bold ? 't' : 'f')
-			. ($this->_italic ? 't' : 'f')
-			. ($this->_superScript ? 't' : 'f')
-			. ($this->_subScript ? 't' : 'f')
-			. $this->_underline
-			. ($this->_strikethrough ? 't' : 'f')
-			. $this->_color->getHashCode()
-			. __CLASS__
-		);
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Style/NumberFormat.php b/plugins/exportTypes/Excel/PHPExcel/Style/NumberFormat.php
deleted file mode 100755
index 613dcae13..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Style/NumberFormat.php
+++ /dev/null
@@ -1,741 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Style_NumberFormat
- *
- * @category   PHPExcel
- * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_NumberFormat implements PHPExcel_IComparable
-{
-	/* Pre-defined formats */
-	const FORMAT_GENERAL					= 'General';
-
-	const FORMAT_TEXT						= '@';
-
-	const FORMAT_NUMBER						= '0';
-	const FORMAT_NUMBER_00					= '0.00';
-	const FORMAT_NUMBER_COMMA_SEPARATED1	= '#,##0.00';
-	const FORMAT_NUMBER_COMMA_SEPARATED2	= '#,##0.00_-';
-
-	const FORMAT_PERCENTAGE					= '0%';
-	const FORMAT_PERCENTAGE_00				= '0.00%';
-
-	const FORMAT_DATE_YYYYMMDD2				= 'yyyy-mm-dd';
-	const FORMAT_DATE_YYYYMMDD				= 'yy-mm-dd';
-	const FORMAT_DATE_DDMMYYYY				= 'dd/mm/yy';
-	const FORMAT_DATE_DMYSLASH				= 'd/m/y';
-	const FORMAT_DATE_DMYMINUS				= 'd-m-y';
-	const FORMAT_DATE_DMMINUS				= 'd-m';
-	const FORMAT_DATE_MYMINUS				= 'm-y';
-	const FORMAT_DATE_XLSX14				= 'mm-dd-yy';
-	const FORMAT_DATE_XLSX15				= 'd-mmm-yy';
-	const FORMAT_DATE_XLSX16				= 'd-mmm';
-	const FORMAT_DATE_XLSX17				= 'mmm-yy';
-	const FORMAT_DATE_XLSX22				= 'm/d/yy h:mm';
-	const FORMAT_DATE_DATETIME				= 'd/m/y h:mm';
-	const FORMAT_DATE_TIME1					= 'h:mm AM/PM';
-	const FORMAT_DATE_TIME2					= 'h:mm:ss AM/PM';
-	const FORMAT_DATE_TIME3					= 'h:mm';
-	const FORMAT_DATE_TIME4					= 'h:mm:ss';
-	const FORMAT_DATE_TIME5					= 'mm:ss';
-	const FORMAT_DATE_TIME6					= 'h:mm:ss';
-	const FORMAT_DATE_TIME7					= 'i:s.S';
-	const FORMAT_DATE_TIME8					= 'h:mm:ss;@';
-	const FORMAT_DATE_YYYYMMDDSLASH			= 'yy/mm/dd;@';
-
-	const FORMAT_CURRENCY_USD_SIMPLE		= '"$"#,##0.00_-';
-	const FORMAT_CURRENCY_USD				= '$#,##0_-';
-	const FORMAT_CURRENCY_EUR_SIMPLE		= '[$EUR ]#,##0.00_-';
-
-	/**
-	 * Excel built-in number formats
-	 *
-	 * @var array
-	 */
-	private static $_builtInFormats;
-
-	/**
-	 * Excel built-in number formats (flipped, for faster lookups)
-	 *
-	 * @var array
-	 */
-	private static $_flippedBuiltInFormats;
-
-	/**
-	 * Format Code
-	 *
-	 * @var string
-	 */
-	private $_formatCode	=	PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
-
-	/**
-	 * Built-in format Code
-	 *
-	 * @var string
-	 */
-	private $_builtInFormatCode	= 0;
-
-	/**
-	 * Parent Borders
-	 *
-	 * @var _parentPropertyName string
-	 */
-	private $_parentPropertyName;
-
-	/**
-	 * Supervisor?
-	 *
-	 * @var boolean
-	 */
-	private $_isSupervisor;
-
-	/**
-	 * Parent. Only used for supervisor
-	 *
-	 * @var PHPExcel_Style
-	 */
-	private $_parent;
-
-	/**
-	 * Create a new PHPExcel_Style_NumberFormat
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 */
-	public function __construct($isSupervisor = false, $isConditional = false)
-	{
-		// Supervisor?
-		$this->_isSupervisor = $isSupervisor;
-
-		if ($isConditional) {
-			$this->_formatCode = NULL;
-		}
-	}
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param PHPExcel_Style $parent
-	 * @return PHPExcel_Style_NumberFormat
-	 */
-	public function bindParent($parent)
-	{
-		$this->_parent = $parent;
-	}
-
-	/**
-	 * Is this a supervisor or a real style component?
-	 *
-	 * @return boolean
-	 */
-	public function getIsSupervisor()
-	{
-		return $this->_isSupervisor;
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_NumberFormat
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getNumberFormat();
-	}
-
-	/**
-	 * Get the currently active sheet. Only used for supervisor
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getActiveSheet()
-	{
-		return $this->_parent->getActiveSheet();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getSelectedCells()
-	{
-		return $this->getActiveSheet()->getSelectedCells();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getActiveCell()
-	{
-		return $this->getActiveSheet()->getActiveCell();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('numberformat' => $array);
-	}
-
-	/**
-	 * Apply styles from array
-	 *
-	 * <code>
-	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getNumberFormat()->applyFromArray(
-	 *		array(
-	 *			'code' => PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE
-	 *		)
-	 * );
-	 * </code>
-	 *
-	 * @param	array	$pStyles	Array containing style information
-	 * @throws	Exception
-	 * @return PHPExcel_Style_NumberFormat
-	 */
-	public function applyFromArray($pStyles = null)
-	{
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('code', $pStyles)) {
-					$this->setFormatCode($pStyles['code']);
-				}
-			}
-		} else {
-			throw new Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Format Code
-	 *
-	 * @return string
-	 */
-	public function getFormatCode()
-	{
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getFormatCode();
-		}
-		if ($this->_builtInFormatCode !== false)
-		{
-			return self::builtInFormatCode($this->_builtInFormatCode);
-		}
-		return $this->_formatCode;
-	}
-
-	/**
-	 * Set Format Code
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Style_NumberFormat
-	 */
-	public function setFormatCode($pValue = PHPExcel_Style_NumberFormat::FORMAT_GENERAL)
-	{
-		if ($pValue == '') {
-			$pValue = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
-		}
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('code' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_formatCode = $pValue;
-			$this->_builtInFormatCode = self::builtInFormatCodeIndex($pValue);
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Built-In Format Code
-	 *
-	 * @return int
-	 */
-	public function getBuiltInFormatCode()
-	{
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getBuiltInFormatCode();
-		}
-		return $this->_builtInFormatCode;
-	}
-
-	/**
-	 * Set Built-In Format Code
-	 *
-	 * @param int $pValue
-	 * @return PHPExcel_Style_NumberFormat
-	 */
-	public function setBuiltInFormatCode($pValue = 0)
-	{
-
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('code' => self::builtInFormatCode($pValue)));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_builtInFormatCode = $pValue;
-			$this->_formatCode = self::builtInFormatCode($pValue);
-		}
-		return $this;
-	}
-
-	/**
-	 * Fill built-in format codes
-	 */
-	private static function fillBuiltInFormatCodes()
-	{
-		// Built-in format codes
-		if (is_null(self::$_builtInFormats)) {
-			self::$_builtInFormats = array();
-
-			// General
-			self::$_builtInFormats[0] = PHPExcel_Style_NumberFormat::FORMAT_GENERAL;
-			self::$_builtInFormats[1] = '0';
-			self::$_builtInFormats[2] = '0.00';
-			self::$_builtInFormats[3] = '#,##0';
-			self::$_builtInFormats[4] = '#,##0.00';
-
-			self::$_builtInFormats[9] = '0%';
-			self::$_builtInFormats[10] = '0.00%';
-			self::$_builtInFormats[11] = '0.00E+00';
-			self::$_builtInFormats[12] = '# ?/?';
-			self::$_builtInFormats[13] = '# ??/??';
-			self::$_builtInFormats[14] = 'mm-dd-yy';
-			self::$_builtInFormats[15] = 'd-mmm-yy';
-			self::$_builtInFormats[16] = 'd-mmm';
-			self::$_builtInFormats[17] = 'mmm-yy';
-			self::$_builtInFormats[18] = 'h:mm AM/PM';
-			self::$_builtInFormats[19] = 'h:mm:ss AM/PM';
-			self::$_builtInFormats[20] = 'h:mm';
-			self::$_builtInFormats[21] = 'h:mm:ss';
-			self::$_builtInFormats[22] = 'm/d/yy h:mm';
-
-			self::$_builtInFormats[37] = '#,##0 ;(#,##0)';
-			self::$_builtInFormats[38] = '#,##0 ;[Red](#,##0)';
-			self::$_builtInFormats[39] = '#,##0.00;(#,##0.00)';
-			self::$_builtInFormats[40] = '#,##0.00;[Red](#,##0.00)';
-
-			self::$_builtInFormats[44] = '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)';
-			self::$_builtInFormats[45] = 'mm:ss';
-			self::$_builtInFormats[46] = '[h]:mm:ss';
-			self::$_builtInFormats[47] = 'mmss.0';
-			self::$_builtInFormats[48] = '##0.0E+0';
-			self::$_builtInFormats[49] = '@';
-
-			// CHT
-			self::$_builtInFormats[27] = '[$-404]e/m/d';
-			self::$_builtInFormats[30] = 'm/d/yy';
-			self::$_builtInFormats[36] = '[$-404]e/m/d';
-			self::$_builtInFormats[50] = '[$-404]e/m/d';
-			self::$_builtInFormats[57] = '[$-404]e/m/d';
-
-			// THA
-			self::$_builtInFormats[59] = 't0';
-			self::$_builtInFormats[60] = 't0.00';
-			self::$_builtInFormats[61] = 't#,##0';
-			self::$_builtInFormats[62] = 't#,##0.00';
-			self::$_builtInFormats[67] = 't0%';
-			self::$_builtInFormats[68] = 't0.00%';
-			self::$_builtInFormats[69] = 't# ?/?';
-			self::$_builtInFormats[70] = 't# ??/??';
-
-			// Flip array (for faster lookups)
-			self::$_flippedBuiltInFormats = array_flip(self::$_builtInFormats);
-		}
-	}
-
-	/**
-	 * Get built-in format code
-	 *
-	 * @param	int		$pIndex
-	 * @return	string
-	 */
-	public static function builtInFormatCode($pIndex)
-	{
-		// Clean parameter
-		$pIndex = intval($pIndex);
-
-		// Ensure built-in format codes are available
-		self::fillBuiltInFormatCodes();
-
-		// Lookup format code
-		if (isset(self::$_builtInFormats[$pIndex])) {
-			return self::$_builtInFormats[$pIndex];
-		}
-
-		return '';
-	}
-
-	/**
-	 * Get built-in format code index
-	 *
-	 * @param	string		$formatCode
-	 * @return	int|boolean
-	 */
-	public static function builtInFormatCodeIndex($formatCode)
-	{
-		// Ensure built-in format codes are available
-		self::fillBuiltInFormatCodes();
-
-		// Lookup format code
-		if (isset(self::$_flippedBuiltInFormats[$formatCode])) {
-			return self::$_flippedBuiltInFormats[$formatCode];
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode()
-	{
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-		return md5(
-			  $this->_formatCode
-			. $this->_builtInFormatCode
-			. __CLASS__
-		);
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone()
-	{
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-	/**
-	 * Search/replace values to convert Excel date/time format masks to PHP format masks
-	 *
-	 * @var array
-	 */
-	private static $_dateFormatReplacements = array(
-			// first remove escapes related to non-format characters
-			'\\'	=> '',
-			//	12-hour suffix
-			'am/pm'	=> 'A',
-			//	4-digit year
-			'e'	=> 'Y',
-			'yyyy'	=> 'Y',
-			//	2-digit year
-			'yy'	=> 'y',
-			//	first letter of month - no php equivalent
-			'mmmmm'	=> 'M',
-			//	full month name
-			'mmmm'	=> 'F',
-			//	short month name
-			'mmm'	=> 'M',
-			//	mm is minutes if time or month w/leading zero
-			':mm'	=> ':i',
-			//	month leading zero
-			'mm'	=> 'm',
-			//	month no leading zero
-			'm'		=> 'n',
-			//	full day of week name
-			'dddd'	=> 'l',
-			//	short day of week name
-			'ddd'	=> 'D',
-			//	days leading zero
-			'dd'	=> 'd',
-			//	days no leading zero
-			'd'		=> 'j',
-			//	seconds
-			'ss'	=> 's',
-			//	fractional seconds - no php equivalent
-			'.s'	=> ''
-		);
-	/**
-	 * Search/replace values to convert Excel date/time format masks hours to PHP format masks (24 hr clock)
-	 *
-	 * @var array
-	 */
-	private static $_dateFormatReplacements24 = array(
-			'hh'	=> 'H',
-			'h'		=> 'G'
-		);
-	/**
-	 * Search/replace values to convert Excel date/time format masks hours to PHP format masks (12 hr clock)
-	 *
-	 * @var array
-	 */
-	private static $_dateFormatReplacements12 = array(
-			'hh'	=> 'h',
-			'h'		=> 'g'
-		);
-
-	/**
-	 * Convert a value in a pre-defined format to a PHP string
-	 *
-	 * @param mixed	$value		Value to format
-	 * @param string	$format		Format code
-	 * @param array		$callBack	Callback function for additional formatting of string
-	 * @return string	Formatted string
-	 */
-	public static function toFormattedString($value = '', $format = '', $callBack = null)
-	{
-		// For now we do not treat strings although section 4 of a format code affects strings
-		if (!is_numeric($value)) return $value;
-
-		// For 'General' format code, we just pass the value although this is not entirely the way Excel does it,
-		// it seems to round numbers to a total of 10 digits.
-		if (($format === PHPExcel_Style_NumberFormat::FORMAT_GENERAL) || ($format === PHPExcel_Style_NumberFormat::FORMAT_TEXT)) {
-			return $value;
-		}
-
-		// Get the sections, there can be up to four sections
-		$sections = explode(';', $format);
-
-		// Fetch the relevant section depending on whether number is positive, negative, or zero?
-		// Text not supported yet.
-		// Here is how the sections apply to various values in Excel:
-		//   1 section:   [POSITIVE/NEGATIVE/ZERO/TEXT]
-		//   2 sections:  [POSITIVE/ZERO/TEXT] [NEGATIVE]
-		//   3 sections:  [POSITIVE/TEXT] [NEGATIVE] [ZERO]
-		//   4 sections:  [POSITIVE] [NEGATIVE] [ZERO] [TEXT]
-		switch (count($sections)) {
-			case 1:
-				$format = $sections[0];
-				break;
-
-			case 2:
-				$format = ($value >= 0) ? $sections[0] : $sections[1];
-				$value = abs($value); // Use the absolute value
-				break;
-
-			case 3:
-				$format = ($value > 0) ?
-					$sections[0] : ( ($value < 0) ?
-						$sections[1] : $sections[2]);
-				$value = abs($value); // Use the absolute value
-				break;
-
-			case 4:
-				$format = ($value > 0) ?
-					$sections[0] : ( ($value < 0) ?
-						$sections[1] : $sections[2]);
-				$value = abs($value); // Use the absolute value
-				break;
-
-			default:
-				// something is wrong, just use first section
-				$format = $sections[0];
-				break;
-		}
-
-		// Save format with color information for later use below
-		$formatColor = $format;
-
-		// Strip color information
-		$color_regex = '/^\\[[a-zA-Z]+\\]/';
-		$format = preg_replace($color_regex, '', $format);
-
-		// Let's begin inspecting the format and converting the value to a formatted string
-		if (preg_match('/^(\[\$[A-Z]*-[0-9A-F]*\])*[hmsdy]/i', $format)) { // datetime format
-			// dvc: convert Excel formats to PHP date formats
-
-			// strip off first part containing e.g. [$-F800] or [$USD-409]
-			// general syntax: [$<Currency string>-<language info>]
-			// language info is in hexadecimal
-			$format = preg_replace('/^(\[\$[A-Z]*-[0-9A-F]*\])/i', '', $format);
-
-			// OpenOffice.org uses upper-case number formats, e.g. 'YYYY', convert to lower-case
-			$format = strtolower($format);
-
-			$format = strtr($format,self::$_dateFormatReplacements);
-			if (!strpos($format,'A')) {	// 24-hour time format
-				$format = strtr($format,self::$_dateFormatReplacements24);
-			} else {					// 12-hour time format
-				$format = strtr($format,self::$_dateFormatReplacements12);
-			}
-
-			$dateObj = PHPExcel_Shared_Date::ExcelToPHPObject($value);
-			$value = $dateObj->format($format);
-
-		} else if (preg_match('/%$/', $format)) { // % number format
-			if ($format === self::FORMAT_PERCENTAGE) {
-				$value = round( (100 * $value), 0) . '%';
-			} else {
-				if (preg_match('/\.[#0]+/i', $format, $m)) {
-					$s = substr($m[0], 0, 1) . (strlen($m[0]) - 1);
-					$format = str_replace($m[0], $s, $format);
-				}
-				if (preg_match('/^[#0]+/', $format, $m)) {
-					$format = str_replace($m[0], strlen($m[0]), $format);
-				}
-				$format = '%' . str_replace('%', 'f%%', $format);
-
-				$value = sprintf($format, 100 * $value);
-			}
-
-		} else {
-			if ($format === self::FORMAT_CURRENCY_EUR_SIMPLE) {
-				$value = 'EUR ' . sprintf('%1.2f', $value);
-
-			} else {
-				// In Excel formats, "_" is used to add spacing, which we can't do in HTML
-				$format = preg_replace('/_./', '', $format);
-
-				// Some non-number characters are escaped with \, which we don't need
-				$format = preg_replace("/\\\\/", '', $format);
-
-				// Some non-number strings are quoted, so we'll get rid of the quotes, likewise any positional * symbols
-				$format = str_replace(array('"','*'), '', $format);
-
-				// Find out if we need thousands separator
-				// This is indicated by a comma enclosed by a digit placeholder:
-				//		#,#   or   0,0
-				$useThousands = preg_match('/(#,#|0,0)/', $format);
-				if ($useThousands) {
-					$format = preg_replace('/0,0/', '00', $format);
-					$format = preg_replace('/#,#/', '##', $format);
-				}
-
-				// Scale thousands, millions,...
-				// This is indicated by a number of commas after a digit placeholder:
-				//		#,   or	0.0,,
-				$scale = 1; // same as no scale
-				$matches = array();
-				if (preg_match('/(#|0)(,+)/', $format, $matches)) {
-					$scale = pow(1000, strlen($matches[2]));
-
-					// strip the commas
-					$format = preg_replace('/0,+/', '0', $format);
-					$format = preg_replace('/#,+/', '#', $format);
-				}
-
-				if (preg_match('/#?.*\?\/\?/', $format, $m)) {
-					//echo 'Format mask is fractional '.$format.' <br />';
-					if ($value != (int)$value) {
-						$sign = ($value < 0) ? '-' : '';
-
-						$integerPart = floor(abs($value));
-						$decimalPart = trim(fmod(abs($value),1),'0.');
-						$decimalLength = strlen($decimalPart);
-						$decimalDivisor = pow(10,$decimalLength);
-
-						$GCD = PHPExcel_Calculation_MathTrig::GCD($decimalPart,$decimalDivisor);
-
-						$adjustedDecimalPart = $decimalPart/$GCD;
-						$adjustedDecimalDivisor = $decimalDivisor/$GCD;
-
-						if ((strpos($format,'0') !== false) || (strpos($format,'#') !== false) || (substr($format,0,3) == '? ?')) {
-							if ($integerPart == 0) { $integerPart = ''; }
-							$value = "$sign$integerPart $adjustedDecimalPart/$adjustedDecimalDivisor";
-						} else {
-							$adjustedDecimalPart += $integerPart * $adjustedDecimalDivisor;
-							$value = "$sign$adjustedDecimalPart/$adjustedDecimalDivisor";
-						}
-					}
-
-				} else {
-					// Handle the number itself
-
-					// scale number
-					$value = $value / $scale;
-
-					// Strip #
-					$format = preg_replace('/\\#/', '', $format);
-
-					$n = "/\[[^\]]+\]/";
-					$m = preg_replace($n, '', $format);
-					$number_regex = "/(0+)(\.?)(0*)/";
-					if (preg_match($number_regex, $m, $matches)) {
-						$left = $matches[1];
-						$dec = $matches[2];
-						$right = $matches[3];
-
-						// minimun width of formatted number (including dot)
-						$minWidth = strlen($left) + strlen($dec) + strlen($right);
-
-						if ($useThousands) {
-							$value = number_format(
-										$value
-										, strlen($right)
-										, PHPExcel_Shared_String::getDecimalSeparator()
-										, PHPExcel_Shared_String::getThousandsSeparator()
-									);
-						} else {
-							$sprintf_pattern = "%0$minWidth." . strlen($right) . "f";
-							$value = sprintf($sprintf_pattern, $value);
-						}
-
-						$value = preg_replace($number_regex, $value, $format);
-					}
-				}
-				if (preg_match('/\[\$(.*)\]/u', $format, $m)) {
-					//	Currency or Accounting
-					$currencyFormat = $m[0];
-					$currencyCode = $m[1];
-					list($currencyCode) = explode('-',$currencyCode);
-					if ($currencyCode == '') {
-						$currencyCode = PHPExcel_Shared_String::getCurrencyCode();
-					}
-					$value = preg_replace('/\[\$([^\]]*)\]/u',$currencyCode,$value);
-				}
-			}
-		}
-
-		// Additional formatting provided by callback function
-		if ($callBack !== null) {
-			list($writerInstance, $function) = $callBack;
-			$value = $writerInstance->$function($value, $formatColor);
-		}
-
-		return $value;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Style/Protection.php b/plugins/exportTypes/Excel/PHPExcel/Style/Protection.php
deleted file mode 100755
index 477742bd3..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Style/Protection.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.4.5, 2007-08-23
- */
-
-
-/**
- * PHPExcel_Style_Protection
- *
- * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Style_Protection implements PHPExcel_IComparable
-{
-	/** Protection styles */
-	const PROTECTION_INHERIT		= 'inherit';
-	const PROTECTION_PROTECTED		= 'protected';
-	const PROTECTION_UNPROTECTED	= 'unprotected';
-
-	/**
-	 * Locked
-	 *
-	 * @var string
-	 */
-	private $_locked;
-
-	/**
-	 * Hidden
-	 *
-	 * @var string
-	 */
-	private $_hidden;
-
-	/**
-	 * Parent Borders
-	 *
-	 * @var _parentPropertyName string
-	 */
-	private $_parentPropertyName;
-
-	/**
-	 * Supervisor?
-	 *
-	 * @var boolean
-	 */
-	private $_isSupervisor;
-
-	/**
-	 * Parent. Only used for supervisor
-	 *
-	 * @var PHPExcel_Style
-	 */
-	private $_parent;
-
-    /**
-     * Create a new PHPExcel_Style_Protection
-	 *
-	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
-	 *									Leave this value at default unless you understand exactly what
-	 *										its ramifications are
-     */
-    public function __construct($isSupervisor = false, $isConditional = false)
-    {
-    	// Supervisor?
-		$this->_isSupervisor = $isSupervisor;
-
-    	// Initialise values
-		if (!$isConditional) {
-	    	$this->_locked			= self::PROTECTION_INHERIT;
-	    	$this->_hidden			= self::PROTECTION_INHERIT;
-		}
-    }
-
-	/**
-	 * Bind parent. Only used for supervisor
-	 *
-	 * @param PHPExcel_Style $parent
-	 * @return PHPExcel_Style_Protection
-	 */
-	public function bindParent($parent)
-	{
-		$this->_parent = $parent;
-		return $this;
-	}
-
-	/**
-	 * Is this a supervisor or a real style component?
-	 *
-	 * @return boolean
-	 */
-	public function getIsSupervisor()
-	{
-		return $this->_isSupervisor;
-	}
-
-	/**
-	 * Get the shared style component for the currently active cell in currently active sheet.
-	 * Only used for style supervisor
-	 *
-	 * @return PHPExcel_Style_Protection
-	 */
-	public function getSharedComponent()
-	{
-		return $this->_parent->getSharedComponent()->getProtection();
-	}
-
-	/**
-	 * Get the currently active sheet. Only used for supervisor
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getActiveSheet()
-	{
-		return $this->_parent->getActiveSheet();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getSelectedCells()
-	{
-		return $this->getActiveSheet()->getSelectedCells();
-	}
-
-	/**
-	 * Get the currently active cell coordinate in currently active sheet.
-	 * Only used for supervisor
-	 *
-	 * @return string E.g. 'A1'
-	 */
-	public function getActiveCell()
-	{
-		return $this->getActiveSheet()->getActiveCell();
-	}
-
-	/**
-	 * Build style array from subcomponents
-	 *
-	 * @param array $array
-	 * @return array
-	 */
-	public function getStyleArray($array)
-	{
-		return array('protection' => $array);
-	}
-
-    /**
-     * Apply styles from array
-     *
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getLocked()->applyFromArray( array('locked' => true, 'hidden' => false) );
-     * </code>
-     *
-     * @param	array	$pStyles	Array containing style information
-     * @throws	Exception
-     * @return PHPExcel_Style_Protection
-     */
-	public function applyFromArray($pStyles = null) {
-		if (is_array($pStyles)) {
-			if ($this->_isSupervisor) {
-				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
-			} else {
-				if (array_key_exists('locked', $pStyles)) {
-					$this->setLocked($pStyles['locked']);
-				}
-				if (array_key_exists('hidden', $pStyles)) {
-					$this->setHidden($pStyles['hidden']);
-				}
-			}
-		} else {
-			throw new Exception("Invalid style array passed.");
-		}
-		return $this;
-	}
-
-    /**
-     * Get locked
-     *
-     * @return string
-     */
-    public function getLocked() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getLocked();
-		}
-    	return $this->_locked;
-    }
-
-    /**
-     * Set locked
-     *
-     * @param string $pValue
-     * @return PHPExcel_Style_Protection
-     */
-    public function setLocked($pValue = self::PROTECTION_INHERIT) {
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('locked' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_locked = $pValue;
-		}
-		return $this;
-    }
-
-    /**
-     * Get hidden
-     *
-     * @return string
-     */
-    public function getHidden() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHidden();
-		}
-    	return $this->_hidden;
-    }
-
-    /**
-     * Set hidden
-     *
-     * @param string $pValue
-     * @return PHPExcel_Style_Protection
-     */
-    public function setHidden($pValue = self::PROTECTION_INHERIT) {
-		if ($this->_isSupervisor) {
-			$styleArray = $this->getStyleArray(array('hidden' => $pValue));
-			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
-		} else {
-			$this->_hidden = $pValue;
-		}
-		return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_isSupervisor) {
-			return $this->getSharedComponent()->getHashCode();
-		}
-    	return md5(
-    		  $this->_locked
-    		. $this->_hidden
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet.php
deleted file mode 100755
index fff57cd56..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet.php
+++ /dev/null
@@ -1,2795 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet implements PHPExcel_IComparable
-{
-	/* Break types */
-	const BREAK_NONE	= 0;
-	const BREAK_ROW		= 1;
-	const BREAK_COLUMN	= 2;
-
-	/* Sheet state */
-	const SHEETSTATE_VISIBLE	= 'visible';
-	const SHEETSTATE_HIDDEN	= 'hidden';
-	const SHEETSTATE_VERYHIDDEN = 'veryHidden';
-
-	/**
-	 * Invalid characters in sheet title
-	 *
-	 * @var array
-	 */
-	private static $_invalidCharacters = array('*', ':', '/', '\\', '?', '[', ']');
-
-	/**
-	 * Parent spreadsheet
-	 *
-	 * @var PHPExcel
-	 */
-	private $_parent;
-
-	/**
-	 * Cacheable collection of cells
-	 *
-	 * @var PHPExcel_CachedObjectStorage_xxx
-	 */
-	private $_cellCollection = null;
-
-	/**
-	 * Collection of row dimensions
-	 *
-	 * @var PHPExcel_Worksheet_RowDimension[]
-	 */
-	private $_rowDimensions = array();
-
-	/**
-	 * Default row dimension
-	 *
-	 * @var PHPExcel_Worksheet_RowDimension
-	 */
-	private $_defaultRowDimension = null;
-
-	/**
-	 * Collection of column dimensions
-	 *
-	 * @var PHPExcel_Worksheet_ColumnDimension[]
-	 */
-	private $_columnDimensions = array();
-
-	/**
-	 * Default column dimension
-	 *
-	 * @var PHPExcel_Worksheet_ColumnDimension
-	 */
-	private $_defaultColumnDimension = null;
-
-	/**
-	 * Collection of drawings
-	 *
-	 * @var PHPExcel_Worksheet_BaseDrawing[]
-	 */
-	private $_drawingCollection = null;
-
-	/**
-	 * Collection of Chart objects
-	 *
-	 * @var PHPExcel_Chart[]
-	 */
-	private $_chartCollection = array();
-
-	/**
-	 * Worksheet title
-	 *
-	 * @var string
-	 */
-	private $_title;
-
-	/**
-	 * Sheet state
-	 *
-	 * @var string
-	 */
-	private $_sheetState;
-
-	/**
-	 * Page setup
-	 *
-	 * @var PHPExcel_Worksheet_PageSetup
-	 */
-	private $_pageSetup;
-
-	/**
-	 * Page margins
-	 *
-	 * @var PHPExcel_Worksheet_PageMargins
-	 */
-	private $_pageMargins;
-
-	/**
-	 * Page header/footer
-	 *
-	 * @var PHPExcel_Worksheet_HeaderFooter
-	 */
-	private $_headerFooter;
-
-	/**
-	 * Sheet view
-	 *
-	 * @var PHPExcel_Worksheet_SheetView
-	 */
-	private $_sheetView;
-
-	/**
-	 * Protection
-	 *
-	 * @var PHPExcel_Worksheet_Protection
-	 */
-	private $_protection;
-
-	/**
-	 * Collection of styles
-	 *
-	 * @var PHPExcel_Style[]
-	 */
-	private $_styles = array();
-
-	/**
-	 * Conditional styles. Indexed by cell coordinate, e.g. 'A1'
-	 *
-	 * @var array
-	 */
-	private $_conditionalStylesCollection = array();
-
-	/**
-	 * Is the current cell collection sorted already?
-	 *
-	 * @var boolean
-	 */
-	private $_cellCollectionIsSorted = false;
-
-	/**
-	 * Collection of breaks
-	 *
-	 * @var array
-	 */
-	private $_breaks = array();
-
-	/**
-	 * Collection of merged cell ranges
-	 *
-	 * @var array
-	 */
-	private $_mergeCells = array();
-
-	/**
-	 * Collection of protected cell ranges
-	 *
-	 * @var array
-	 */
-	private $_protectedCells = array();
-
-	/**
-	 * Autofilter Range and selection
-	 *
-	 * @var PHPExcel_Worksheet_AutoFilter
-	 */
-	private $_autoFilter = NULL;
-
-	/**
-	 * Freeze pane
-	 *
-	 * @var string
-	 */
-	private $_freezePane = '';
-
-	/**
-	 * Show gridlines?
-	 *
-	 * @var boolean
-	 */
-	private $_showGridlines = true;
-
-	/**
-	* Print gridlines?
-	*
-	* @var boolean
-	*/
-	private $_printGridlines = false;
-
-	/**
-	* Show row and column headers?
-	*
-	* @var boolean
-	*/
-	private $_showRowColHeaders = true;
-
-	/**
-	 * Show summary below? (Row/Column outline)
-	 *
-	 * @var boolean
-	 */
-	private $_showSummaryBelow = true;
-
-	/**
-	 * Show summary right? (Row/Column outline)
-	 *
-	 * @var boolean
-	 */
-	private $_showSummaryRight = true;
-
-	/**
-	 * Collection of comments
-	 *
-	 * @var PHPExcel_Comment[]
-	 */
-	private $_comments = array();
-
-	/**
-	 * Active cell. (Only one!)
-	 *
-	 * @var string
-	 */
-	private $_activeCell = 'A1';
-
-	/**
-	 * Selected cells
-	 *
-	 * @var string
-	 */
-	private $_selectedCells = 'A1';
-
-	/**
-	 * Cached highest column
-	 *
-	 * @var string
-	 */
-	private $_cachedHighestColumn = 'A';
-
-	/**
-	 * Cached highest row
-	 *
-	 * @var int
-	 */
-	private $_cachedHighestRow = 1;
-
-	/**
-	 * Right-to-left?
-	 *
-	 * @var boolean
-	 */
-	private $_rightToLeft = false;
-
-	/**
-	 * Hyperlinks. Indexed by cell coordinate, e.g. 'A1'
-	 *
-	 * @var array
-	 */
-	private $_hyperlinkCollection = array();
-
-	/**
-	 * Data validation objects. Indexed by cell coordinate, e.g. 'A1'
-	 *
-	 * @var array
-	 */
-	private $_dataValidationCollection = array();
-
-	/**
-	 * Tab color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	private $_tabColor;
-
-	/**
-	 * Dirty flag
-	 *
-	 * @var boolean
-	 */
-	private $_dirty	= true;
-
-	/**
-	 * Hash
-	 *
-	 * @var string
-	 */
-	private $_hash	= null;
-
-	/**
-	 * Create a new worksheet
-	 *
-	 * @param PHPExcel		$pParent
-	 * @param string		$pTitle
-	 */
-	public function __construct(PHPExcel $pParent = null, $pTitle = 'Worksheet')
-	{
-		// Set parent and title
-		$this->_parent = $pParent;
-		$this->setTitle($pTitle, FALSE);
-		$this->setSheetState(PHPExcel_Worksheet::SHEETSTATE_VISIBLE);
-
-		$this->_cellCollection		= PHPExcel_CachedObjectStorageFactory::getInstance($this);
-
-		// Set page setup
-		$this->_pageSetup			= new PHPExcel_Worksheet_PageSetup();
-
-		// Set page margins
-		$this->_pageMargins			= new PHPExcel_Worksheet_PageMargins();
-
-		// Set page header/footer
-		$this->_headerFooter		= new PHPExcel_Worksheet_HeaderFooter();
-
-		// Set sheet view
-		$this->_sheetView			= new PHPExcel_Worksheet_SheetView();
-
-		// Drawing collection
-		$this->_drawingCollection	= new ArrayObject();
-
-    	// Chart collection
-    	$this->_chartCollection 	= new ArrayObject();
-
-		// Protection
-		$this->_protection			= new PHPExcel_Worksheet_Protection();
-
-		// Default row dimension
-		$this->_defaultRowDimension = new PHPExcel_Worksheet_RowDimension(NULL);
-
-		// Default column dimension
-		$this->_defaultColumnDimension	= new PHPExcel_Worksheet_ColumnDimension(NULL);
-
-		$this->_autoFilter			= new PHPExcel_Worksheet_AutoFilter(NULL, $this);
-	}
-
-
-	/**
-	 * Disconnect all cells from this PHPExcel_Worksheet object,
-	 *    typically so that the worksheet object can be unset
-	 *
-	 */
-	public function disconnectCells() {
-		$this->_cellCollection->unsetWorksheetCells();
-		$this->_cellCollection = null;
-
-		//	detach ourself from the workbook, so that it can then delete this worksheet successfully
-		$this->_parent = null;
-	}
-
-	/**
-	 * Return the cache controller for the cell collection
-	 *
-	 * @return PHPExcel_CachedObjectStorage_xxx
-	 */
-	public function getCellCacheController() {
-		return $this->_cellCollection;
-	}	//	function getCellCacheController()
-
-
-	/**
-	 * Get array of invalid characters for sheet title
-	 *
-	 * @return array
-	 */
-	public static function getInvalidCharacters()
-	{
-		return self::$_invalidCharacters;
-	}
-
-	/**
-	 * Check sheet title for valid Excel syntax
-	 *
-	 * @param string $pValue The string to check
-	 * @return string The valid string
-	 * @throws Exception
-	 */
-	private static function _checkSheetTitle($pValue)
-	{
-		// Some of the printable ASCII characters are invalid:  * : / \ ? [ ]
-		if (str_replace(self::$_invalidCharacters, '', $pValue) !== $pValue) {
-			throw new Exception('Invalid character found in sheet title');
-		}
-
-		// Maximum 31 characters allowed for sheet title
-		if (PHPExcel_Shared_String::CountCharacters($pValue) > 31) {
-			throw new Exception('Maximum 31 characters allowed in sheet title.');
-		}
-
-		return $pValue;
-	}
-
-	/**
-	 * Get collection of cells
-	 *
-	 * @param boolean $pSorted Also sort the cell collection?
-	 * @return PHPExcel_Cell[]
-	 */
-	public function getCellCollection($pSorted = true)
-	{
-		if ($pSorted) {
-			// Re-order cell collection
-			return $this->sortCellCollection();
-		}
-		if ($this->_cellCollection !== NULL) {
-			return $this->_cellCollection->getCellList();
-		}
-		return array();
-	}
-
-	/**
-	 * Sort collection of cells
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function sortCellCollection()
-	{
-		if ($this->_cellCollection !== NULL) {
-			return $this->_cellCollection->getSortedCellList();
-		}
-		return array();
-	}
-
-	/**
-	 * Get collection of row dimensions
-	 *
-	 * @return PHPExcel_Worksheet_RowDimension[]
-	 */
-	public function getRowDimensions()
-	{
-		return $this->_rowDimensions;
-	}
-
-	/**
-	 * Get default row dimension
-	 *
-	 * @return PHPExcel_Worksheet_RowDimension
-	 */
-	public function getDefaultRowDimension()
-	{
-		return $this->_defaultRowDimension;
-	}
-
-	/**
-	 * Get collection of column dimensions
-	 *
-	 * @return PHPExcel_Worksheet_ColumnDimension[]
-	 */
-	public function getColumnDimensions()
-	{
-		return $this->_columnDimensions;
-	}
-
-	/**
-	 * Get default column dimension
-	 *
-	 * @return PHPExcel_Worksheet_ColumnDimension
-	 */
-	public function getDefaultColumnDimension()
-	{
-		return $this->_defaultColumnDimension;
-	}
-
-	/**
-	 * Get collection of drawings
-	 *
-	 * @return PHPExcel_Worksheet_BaseDrawing[]
-	 */
-	public function getDrawingCollection()
-	{
-		return $this->_drawingCollection;
-	}
-
-	/**
-	 * Get collection of charts
-	 *
-	 * @return PHPExcel_Chart[]
-	 */
-	public function getChartCollection()
-	{
-		return $this->_chartCollection;
-	}
-
-	/**
-	 * Add chart
-	 *
-	 * @param PHPExcel_Chart $pChart
-	 * @param int|null $iChartIndex Index where chart should go (0,1,..., or null for last)
-	 * @return PHPExcel_Chart
-	 * @throws Exception
-	 */
-	public function addChart(PHPExcel_Chart $pChart = null, $iChartIndex = null)
-	{
-		$pChart->setWorksheet($this);
-		if (is_null($iChartIndex)) {
-			$this->_chartCollection[] = $pChart;
-		} else {
-			// Insert the chart at the requested index
-			array_splice($this->_chartCollection, $iChartIndex, 0, array($pChart));
-		}
-
-		return $pChart;
-	}
-
-	/**
-	 * Return the count of charts on this worksheet
-	 *
-	 * @return int		The number of charts
-	 * @throws Exception
-	 */
-	public function getChartCount()
-	{
-		return count($this->_chartCollection);
-	}
-
-	/**
-	 * Get a chart by its index position
-	 *
-	 * @param	string	$index			Chart index position
-	 * @return	false|PHPExcel_Chart
-	 * @throws Exception
-	 */
-	public function getChartByIndex($index = null)
-	{
-		$chartCount = count($this->_chartCollection);
-		if ($chartCount == 0) {
-			return false;
-		}
-		if (is_null($index)) {
-			$index = --$chartCount;
-		}
-		if (!isset($this->_chartCollection[$index])) {
-			return false;
-		}
-
-		return $this->_chartCollection[$index];
-	}
-
-	/**
-	 * Return an array of the names of charts on this worksheet
-	 *
-	 * @return string[]		The names of charts
-	 * @throws Exception
-	 */
-	public function getChartNames()
-	{
-		$chartNames = array();
-		foreach($this->_chartCollection as $chart) {
-			$chartNames[] = $chart->getName();
-		}
-		return $chartNames;
-	}
-
-	/**
-	 * Get a chart by name
-	 *
-	 * @param	string	$chartName		Chart name
-	 * @return	false|PHPExcel_Chart
-	 * @throws Exception
-	 */
-	public function getChartByName($chartName = '')
-	{
-		$chartCount = count($this->_chartCollection);
-		if ($chartCount == 0) {
-			return false;
-		}
-		foreach($this->_chartCollection as $index => $chart) {
-			if ($chart->getName() == $chartName) {
-				return $this->_chartCollection[$index];
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Refresh column dimensions
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function refreshColumnDimensions()
-	{
-		$currentColumnDimensions = $this->getColumnDimensions();
-		$newColumnDimensions = array();
-
-		foreach ($currentColumnDimensions as $objColumnDimension) {
-			$newColumnDimensions[$objColumnDimension->getColumnIndex()] = $objColumnDimension;
-		}
-
-		$this->_columnDimensions = $newColumnDimensions;
-
-		return $this;
-	}
-
-	/**
-	 * Refresh row dimensions
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function refreshRowDimensions()
-	{
-		$currentRowDimensions = $this->getRowDimensions();
-		$newRowDimensions = array();
-
-		foreach ($currentRowDimensions as $objRowDimension) {
-			$newRowDimensions[$objRowDimension->getRowIndex()] = $objRowDimension;
-		}
-
-		$this->_rowDimensions = $newRowDimensions;
-
-		return $this;
-	}
-
-	/**
-	 * Calculate worksheet dimension
-	 *
-	 * @return string  String containing the dimension of this worksheet
-	 */
-	public function calculateWorksheetDimension()
-	{
-		// Return
-		return 'A1' . ':' .  $this->getHighestColumn() . $this->getHighestRow();
-	}
-
-	/**
-	 * Calculate worksheet data dimension
-	 *
-	 * @return string  String containing the dimension of this worksheet that actually contain data
-	 */
-	public function calculateWorksheetDataDimension()
-	{
-		// Return
-		return 'A1' . ':' .  $this->getHighestDataColumn() . $this->getHighestDataRow();
-	}
-
-	/**
-	 * Calculate widths for auto-size columns
-	 *
-	 * @param  boolean  $calculateMergeCells  Calculate merge cell width
-	 * @return PHPExcel_Worksheet;
-	 */
-	public function calculateColumnWidths($calculateMergeCells = false)
-	{
-		// initialize $autoSizes array
-		$autoSizes = array();
-		foreach ($this->getColumnDimensions() as $colDimension) {
-			if ($colDimension->getAutoSize()) {
-				$autoSizes[$colDimension->getColumnIndex()] = -1;
-			}
-		}
-
-		// There is only something to do if there are some auto-size columns
-		if (!empty($autoSizes)) {
-
-			// build list of cells references that participate in a merge
-			$isMergeCell = array();
-			foreach ($this->getMergeCells() as $cells) {
-				foreach (PHPExcel_Cell::extractAllCellReferencesInRange($cells) as $cellReference) {
-					$isMergeCell[$cellReference] = true;
-				}
-			}
-
-			// loop through all cells in the worksheet
-			foreach ($this->getCellCollection(false) as $cellID) {
-				$cell = $this->getCell($cellID);
-				if (isset($autoSizes[$cell->getColumn()])) {
-					// Determine width if cell does not participate in a merge
-					if (!isset($isMergeCell[$cell->getCoordinate()])) {
-						// Calculated value
-						$cellValue = $cell->getCalculatedValue();
-
-						// To formatted string
-						$cellValue = PHPExcel_Style_NumberFormat::toFormattedString($cellValue, $this->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode());
-
-						$autoSizes[$cell->getColumn()] = max(
-							(float)$autoSizes[$cell->getColumn()],
-							(float)PHPExcel_Shared_Font::calculateColumnWidth(
-								$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont(),
-								$cellValue,
-								$this->getParent()->getCellXfByIndex($cell->getXfIndex())->getAlignment()->getTextRotation(),
-								$this->getDefaultStyle()->getFont()
-							)
-						);
-					}
-				}
-			}
-
-			// adjust column widths
-			foreach ($autoSizes as $columnIndex => $width) {
-				if ($width == -1) $width = $this->getDefaultColumnDimension()->getWidth();
-				$this->getColumnDimension($columnIndex)->setWidth($width);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get parent
-	 *
-	 * @return PHPExcel
-	 */
-	public function getParent() {
-		return $this->_parent;
-	}
-
-	/**
-	 * Re-bind parent
-	 *
-	 * @param PHPExcel $parent
-	 * @return PHPExcel_Worksheet
-	 */
-	public function rebindParent(PHPExcel $parent) {
-		$namedRanges = $this->_parent->getNamedRanges();
-		foreach ($namedRanges as $namedRange) {
-			$parent->addNamedRange($namedRange);
-		}
-
-		$this->_parent->removeSheetByIndex(
-			$this->_parent->getIndex($this)
-		);
-		$this->_parent = $parent;
-
-		return $this;
-	}
-
-	/**
-	 * Get title
-	 *
-	 * @return string
-	 */
-	public function getTitle()
-	{
-		return $this->_title;
-	}
-
-	/**
-	 * Set title
-	 *
-	 * @param string $pValue String containing the dimension of this worksheet
-	 * @param string $updateFormulaCellReferences boolean Flag indicating whether cell references in formulae should
-	 *                                                    be updated to reflect the new sheet name.
-	 *                                                    This should be left as the default true, unless you are
-	 *                                                    certain that no formula cells on any worksheet contain
-	 *                                                    references to this worksheet
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setTitle($pValue = 'Worksheet', $updateFormulaCellReferences = true)
-	{
-		// Is this a 'rename' or not?
-		if ($this->getTitle() == $pValue) {
-			return $this;
-		}
-
-		// Syntax check
-		self::_checkSheetTitle($pValue);
-
-		// Old title
-		$oldTitle = $this->getTitle();
-
-        if ($this->getParent()) {
-			// Is there already such sheet name?
-			if ($this->getParent()->sheetNameExists($pValue)) {
-				// Use name, but append with lowest possible integer
-
-				if (PHPExcel_Shared_String::CountCharacters($pValue) > 29) {
-					$pValue = PHPExcel_Shared_String::Substring($pValue,0,29);
-				}
-				$i = 1;
-				while ($this->getParent()->sheetNameExists($pValue . ' ' . $i)) {
-					++$i;
-					if ($i == 10) {
-						if (PHPExcel_Shared_String::CountCharacters($pValue) > 28) {
-							$pValue = PHPExcel_Shared_String::Substring($pValue,0,28);
-						}
-					} elseif ($i == 100) {
-						if (PHPExcel_Shared_String::CountCharacters($pValue) > 27) {
-							$pValue = PHPExcel_Shared_String::Substring($pValue,0,27);
-						}
-					}
-				}
-
-				$altTitle = $pValue . ' ' . $i;
-				return $this->setTitle($altTitle,$updateFormulaCellReferences);
-			}
-		}
-
-		// Set title
-		$this->_title = $pValue;
-		$this->_dirty = true;
-
-        if ($this->getParent()) {
-			// New title
-			$newTitle = $this->getTitle();
-			if ($updateFormulaCellReferences)
-				PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->getParent(), $oldTitle, $newTitle);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get sheet state
-	 *
-	 * @return string Sheet state (visible, hidden, veryHidden)
-	 */
-	public function getSheetState() {
-		return $this->_sheetState;
-	}
-
-	/**
-	 * Set sheet state
-	 *
-	 * @param string $value Sheet state (visible, hidden, veryHidden)
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setSheetState($value = PHPExcel_Worksheet::SHEETSTATE_VISIBLE) {
-		$this->_sheetState = $value;
-		return $this;
-	}
-
-	/**
-	 * Get page setup
-	 *
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function getPageSetup()
-	{
-		return $this->_pageSetup;
-	}
-
-	/**
-	 * Set page setup
-	 *
-	 * @param PHPExcel_Worksheet_PageSetup	$pValue
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setPageSetup(PHPExcel_Worksheet_PageSetup $pValue)
-	{
-		$this->_pageSetup = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get page margins
-	 *
-	 * @return PHPExcel_Worksheet_PageMargins
-	 */
-	public function getPageMargins()
-	{
-		return $this->_pageMargins;
-	}
-
-	/**
-	 * Set page margins
-	 *
-	 * @param PHPExcel_Worksheet_PageMargins	$pValue
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setPageMargins(PHPExcel_Worksheet_PageMargins $pValue)
-	{
-		$this->_pageMargins = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get page header/footer
-	 *
-	 * @return PHPExcel_Worksheet_HeaderFooter
-	 */
-	public function getHeaderFooter()
-	{
-		return $this->_headerFooter;
-	}
-
-	/**
-	 * Set page header/footer
-	 *
-	 * @param PHPExcel_Worksheet_HeaderFooter	$pValue
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setHeaderFooter(PHPExcel_Worksheet_HeaderFooter $pValue)
-	{
-		$this->_headerFooter = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get sheet view
-	 *
-	 * @return PHPExcel_Worksheet_HeaderFooter
-	 */
-	public function getSheetView()
-	{
-		return $this->_sheetView;
-	}
-
-	/**
-	 * Set sheet view
-	 *
-	 * @param PHPExcel_Worksheet_SheetView	$pValue
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setSheetView(PHPExcel_Worksheet_SheetView $pValue)
-	{
-		$this->_sheetView = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Protection
-	 *
-	 * @return PHPExcel_Worksheet_Protection
-	 */
-	public function getProtection()
-	{
-		return $this->_protection;
-	}
-
-	/**
-	 * Set Protection
-	 *
-	 * @param PHPExcel_Worksheet_Protection	$pValue
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setProtection(PHPExcel_Worksheet_Protection $pValue)
-	{
-		$this->_protection = $pValue;
-		$this->_dirty = true;
-
-		return $this;
-	}
-
-	/**
-	 * Get highest worksheet column
-	 *
-	 * @return string Highest column name
-	 */
-	public function getHighestColumn()
-	{
-		return $this->_cachedHighestColumn;
-	}
-
-	/**
-	 * Get highest worksheet column that contains data
-	 *
-	 * @return string Highest column name that contains data
-	 */
-	public function getHighestDataColumn()
-	{
-		return $this->_cellCollection->getHighestColumn();
-	}
-
-	/**
-	 * Get highest worksheet row
-	 *
-	 * @return int Highest row number
-	 */
-	public function getHighestRow()
-	{
-		return $this->_cachedHighestRow;
-	}
-
-	/**
-	 * Get highest worksheet row that contains data
-	 *
-	 * @return string Highest row number that contains data
-	 */
-	public function getHighestDataRow()
-	{
-		return $this->_cellCollection->getHighestRow();
-	}
-
-	/**
-	 * Get highest worksheet column and highest row that have cell records
-	 *
-	 * @return array Highest column name and highest row number
-	 */
-	public function getHighestRowAndColumn()
-	{
-		return $this->_cellCollection->getHighestRowAndColumn();
-	}
-
-	/**
-	 * Set a cell value
-	 *
-	 * @param string	$pCoordinate	Coordinate of the cell
-	 * @param mixed	$pValue			Value of the cell
-	 * @param bool		$returnCell		Return the worksheet (false, default) or the cell (true)
-	 * @return PHPExcel_Worksheet|PHPExcel_Cell	Depending on the last parameter being specified
-	 */
-	public function setCellValue($pCoordinate = 'A1', $pValue = null, $returnCell = false)
-	{
-		$cell = $this->getCell($pCoordinate)->setValue($pValue);
-		return ($returnCell) ? $cell : $this;
-	}
-
-	/**
-	 * Set a cell value by using numeric cell coordinates
-	 *
-	 * @param string	$pColumn		Numeric column coordinate of the cell
-	 * @param string	$pRow			Numeric row coordinate of the cell
-	 * @param mixed		$pValue			Value of the cell
-	 * @param bool		$returnCell		Return the worksheet (false, default) or the cell (true)
-	 * @return PHPExcel_Worksheet|PHPExcel_Cell	Depending on the last parameter being specified
-	 */
-	public function setCellValueByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $returnCell = false)
-	{
-		$cell = $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow)->setValue($pValue);
-		return ($returnCell) ? $cell : $this;
-	}
-
-	/**
-	 * Set a cell value
-	 *
-	 * @param string	$pCoordinate	Coordinate of the cell
-	 * @param mixed	$pValue			Value of the cell
-	 * @param string	$pDataType		Explicit data type
-	 * @param bool		$returnCell		Return the worksheet (false, default) or the cell (true)
-	 * @return PHPExcel_Worksheet|PHPExcel_Cell	Depending on the last parameter being specified
-	 */
-	public function setCellValueExplicit($pCoordinate = 'A1', $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING, $returnCell = false)
-	{
-		// Set value
-		$cell = $this->getCell($pCoordinate)->setValueExplicit($pValue, $pDataType);
-		return ($returnCell) ? $cell : $this;
-	}
-
-	/**
-	 * Set a cell value by using numeric cell coordinates
-	 *
-	 * @param string	$pColumn		Numeric column coordinate of the cell
-	 * @param string	$pRow			Numeric row coordinate of the cell
-	 * @param mixed		$pValue			Value of the cell
-	 * @param string	$pDataType		Explicit data type
-	 * @param bool		$returnCell		Return the worksheet (false, default) or the cell (true)
-	 * @return PHPExcel_Worksheet|PHPExcel_Cell	Depending on the last parameter being specified
-	 */
-	public function setCellValueExplicitByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING, $returnCell = false)
-	{
-		$cell = $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow)->setValueExplicit($pValue, $pDataType);
-		return ($returnCell) ? $cell : $this;
-	}
-
-	/**
-	 * Get cell at a specific coordinate
-	 *
-	 * @param	string			$pCoordinate	Coordinate of the cell
-	 * @throws	Exception
-	 * @return	PHPExcel_Cell	Cell that was found
-	 */
-	public function getCell($pCoordinate = 'A1')
-	{
-		// Check cell collection
-		if ($this->_cellCollection->isDataSet($pCoordinate)) {
-			return $this->_cellCollection->getCacheData($pCoordinate);
-		}
-
-		// Worksheet reference?
-		if (strpos($pCoordinate, '!') !== false) {
-			$worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pCoordinate, true);
-			return $this->getParent()->getSheetByName($worksheetReference[0])->getCell($worksheetReference[1]);
-		}
-
-		// Named range?
-		if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
-			(preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
-			$namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
-			if ($namedRange !== NULL) {
-				$pCoordinate = $namedRange->getRange();
-				return $namedRange->getWorksheet()->getCell($pCoordinate);
-			}
-		}
-
-		// Uppercase coordinate
-		$pCoordinate = strtoupper($pCoordinate);
-
-		if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
-			throw new Exception('Cell coordinate can not be a range of cells.');
-		} elseif (strpos($pCoordinate,'$') !== false) {
-			throw new Exception('Cell coordinate must not be absolute.');
-		} else {
-			// Create new cell object
-
-			// Coordinates
-			$aCoordinates = PHPExcel_Cell::coordinateFromString($pCoordinate);
-
-			$cell = $this->_cellCollection->addCacheData($pCoordinate,new PHPExcel_Cell($aCoordinates[0], $aCoordinates[1], null, PHPExcel_Cell_DataType::TYPE_NULL, $this));
-			$this->_cellCollectionIsSorted = false;
-
-			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($aCoordinates[0]))
-				$this->_cachedHighestColumn = $aCoordinates[0];
-
-			$this->_cachedHighestRow = max($this->_cachedHighestRow,$aCoordinates[1]);
-
-			// Cell needs appropriate xfIndex
-			$rowDimensions	= $this->getRowDimensions();
-			$columnDimensions = $this->getColumnDimensions();
-
-			if ( isset($rowDimensions[$aCoordinates[1]]) && $rowDimensions[$aCoordinates[1]]->getXfIndex() !== null ) {
-				// then there is a row dimension with explicit style, assign it to the cell
-				$cell->setXfIndex($rowDimensions[$aCoordinates[1]]->getXfIndex());
-			} else if ( isset($columnDimensions[$aCoordinates[0]]) ) {
-				// then there is a column dimension, assign it to the cell
-				$cell->setXfIndex($columnDimensions[$aCoordinates[0]]->getXfIndex());
-			} else {
-				// set to default index
-				$cell->setXfIndex(0);
-			}
-
-			return $cell;
-		}
-	}
-
-	/**
-	 * Get cell at a specific coordinate by using numeric cell coordinates
-	 *
-	 * @param	string $pColumn		Numeric column coordinate of the cell
-	 * @param	string $pRow		Numeric row coordinate of the cell
-	 * @return	PHPExcel_Cell		Cell that was found
-	 */
-	public function getCellByColumnAndRow($pColumn = 0, $pRow = 1)
-	{
-		$columnLetter = PHPExcel_Cell::stringFromColumnIndex($pColumn);
-		$coordinate = $columnLetter . $pRow;
-
-		if (!$this->_cellCollection->isDataSet($coordinate)) {
-			$cell = $this->_cellCollection->addCacheData($coordinate, new PHPExcel_Cell($columnLetter, $pRow, null, PHPExcel_Cell_DataType::TYPE_NULL, $this));
-			$this->_cellCollectionIsSorted = false;
-
-			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < $pColumn)
-				$this->_cachedHighestColumn = $columnLetter;
-
-			$this->_cachedHighestRow = max($this->_cachedHighestRow,$pRow);
-
-			return $cell;
-		}
-
-		return $this->_cellCollection->getCacheData($coordinate);
-	}
-
-	/**
-	 * Cell at a specific coordinate exists?
-	 *
-	 * @param	string			$pCoordinate	Coordinate of the cell
-	 * @throws	Exception
-	 * @return	boolean
-	 */
-	public function cellExists($pCoordinate = 'A1')
-	{
-		// Worksheet reference?
-		if (strpos($pCoordinate, '!') !== false) {
-			$worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pCoordinate, true);
-			return $this->getParent()->getSheetByName($worksheetReference[0])->cellExists($worksheetReference[1]);
-		}
-
-		// Named range?
-		if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
-			(preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
-			$namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
-			if ($namedRange !== NULL) {
-				$pCoordinate = $namedRange->getRange();
-				if ($this->getHashCode() != $namedRange->getWorksheet()->getHashCode()) {
-					if (!$namedRange->getLocalOnly()) {
-						return $namedRange->getWorksheet()->cellExists($pCoordinate);
-					} else {
-						throw new Exception('Named range ' . $namedRange->getName() . ' is not accessible from within sheet ' . $this->getTitle());
-					}
-				}
-			}
-		}
-
-		// Uppercase coordinate
-		$pCoordinate = strtoupper($pCoordinate);
-
-		if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
-			throw new Exception('Cell coordinate can not be a range of cells.');
-		} elseif (strpos($pCoordinate,'$') !== false) {
-			throw new Exception('Cell coordinate must not be absolute.');
-		} else {
-			// Coordinates
-			$aCoordinates = PHPExcel_Cell::coordinateFromString($pCoordinate);
-
-			// Cell exists?
-			return $this->_cellCollection->isDataSet($pCoordinate);
-		}
-	}
-
-	/**
-	 * Cell at a specific coordinate by using numeric cell coordinates exists?
-	 *
-	 * @param	string $pColumn		Numeric column coordinate of the cell
-	 * @param	string $pRow		Numeric row coordinate of the cell
-	 * @return	boolean
-	 */
-	public function cellExistsByColumnAndRow($pColumn = 0, $pRow = 1)
-	{
-		return $this->cellExists(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
-	}
-
-	/**
-	 * Get row dimension at a specific row
-	 *
-	 * @param int $pRow	Numeric index of the row
-	 * @return PHPExcel_Worksheet_RowDimension
-	 */
-	public function getRowDimension($pRow = 1)
-	{
-		// Found
-		$found = null;
-
-		// Get row dimension
-		if (!isset($this->_rowDimensions[$pRow])) {
-			$this->_rowDimensions[$pRow] = new PHPExcel_Worksheet_RowDimension($pRow);
-
-			$this->_cachedHighestRow = max($this->_cachedHighestRow,$pRow);
-		}
-		return $this->_rowDimensions[$pRow];
-	}
-
-	/**
-	 * Get column dimension at a specific column
-	 *
-	 * @param string $pColumn	String index of the column
-	 * @return PHPExcel_Worksheet_ColumnDimension
-	 */
-	public function getColumnDimension($pColumn = 'A')
-	{
-		// Uppercase coordinate
-		$pColumn = strtoupper($pColumn);
-
-		// Fetch dimensions
-		if (!isset($this->_columnDimensions[$pColumn])) {
-			$this->_columnDimensions[$pColumn] = new PHPExcel_Worksheet_ColumnDimension($pColumn);
-
-			if (PHPExcel_Cell::columnIndexFromString($this->_cachedHighestColumn) < PHPExcel_Cell::columnIndexFromString($pColumn))
-				$this->_cachedHighestColumn = $pColumn;
-		}
-		return $this->_columnDimensions[$pColumn];
-	}
-
-	/**
-	 * Get column dimension at a specific column by using numeric cell coordinates
-	 *
-	 * @param	string $pColumn		Numeric column coordinate of the cell
-	 * @return	PHPExcel_Worksheet_ColumnDimension
-	 */
-	public function getColumnDimensionByColumn($pColumn = 0)
-	{
-		return $this->getColumnDimension(PHPExcel_Cell::stringFromColumnIndex($pColumn));
-	}
-
-	/**
-	 * Get styles
-	 *
-	 * @return PHPExcel_Style[]
-	 */
-	public function getStyles()
-	{
-		return $this->_styles;
-	}
-
-	/**
-	 * Get default style of workbork.
-	 *
-	 * @deprecated
-	 * @return	PHPExcel_Style
-	 * @throws	Exception
-	 */
-	public function getDefaultStyle()
-	{
-		return $this->_parent->getDefaultStyle();
-	}
-
-	/**
-	 * Set default style - should only be used by PHPExcel_IReader implementations!
-	 *
-	 * @deprecated
-	 * @param	PHPExcel_Style	$pValue
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setDefaultStyle(PHPExcel_Style $pValue)
-	{
-		$this->_parent->getDefaultStyle()->applyFromArray(array(
-			'font' => array(
-				'name' => $pValue->getFont()->getName(),
-				'size' => $pValue->getFont()->getSize(),
-			),
-		));
-		return $this;
-	}
-
-	/**
-	 * Get style for cell
-	 *
-	 * @param	string	$pCellCoordinate	Cell coordinate to get style for
-	 * @return	PHPExcel_Style
-	 * @throws	Exception
-	 */
-	public function getStyle($pCellCoordinate = 'A1')
-	{
-		// set this sheet as active
-		$this->_parent->setActiveSheetIndex($this->_parent->getIndex($this));
-
-		// set cell coordinate as active
-		$this->setSelectedCells($pCellCoordinate);
-
-		return $this->_parent->getCellXfSupervisor();
-	}
-
-	/**
-	 * Get conditional styles for a cell
-	 *
-	 * @param string $pCoordinate
-	 * @return PHPExcel_Style_Conditional[]
-	 */
-	public function getConditionalStyles($pCoordinate = 'A1')
-	{
-		if (!isset($this->_conditionalStylesCollection[$pCoordinate])) {
-			$this->_conditionalStylesCollection[$pCoordinate] = array();
-		}
-		return $this->_conditionalStylesCollection[$pCoordinate];
-	}
-
-	/**
-	 * Do conditional styles exist for this cell?
-	 *
-	 * @param string $pCoordinate
-	 * @return boolean
-	 */
-	public function conditionalStylesExists($pCoordinate = 'A1')
-	{
-		if (isset($this->_conditionalStylesCollection[$pCoordinate])) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Removes conditional styles for a cell
-	 *
-	 * @param string $pCoordinate
-	 * @return PHPExcel_Worksheet
-	 */
-	public function removeConditionalStyles($pCoordinate = 'A1')
-	{
-		unset($this->_conditionalStylesCollection[$pCoordinate]);
-		return $this;
-	}
-
-	/**
-	 * Get collection of conditional styles
-	 *
-	 * @return array
-	 */
-	public function getConditionalStylesCollection()
-	{
-		return $this->_conditionalStylesCollection;
-	}
-
-	/**
-	 * Set conditional styles
-	 *
-	 * @param $pCoordinate string E.g. 'A1'
-	 * @param $pValue PHPExcel_Style_Conditional[]
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setConditionalStyles($pCoordinate = 'A1', $pValue)
-	{
-		$this->_conditionalStylesCollection[$pCoordinate] = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get style for cell by using numeric cell coordinates
-	 *
-	 * @param	int $pColumn	Numeric column coordinate of the cell
-	 * @param	int $pRow		Numeric row coordinate of the cell
-	 * @return	PHPExcel_Style
-	 */
-	public function getStyleByColumnAndRow($pColumn = 0, $pRow = 1)
-	{
-		return $this->getStyle(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
-	}
-
-	/**
-	 * Set shared cell style to a range of cells
-	 *
-	 * Please note that this will overwrite existing cell styles for cells in range!
-	 *
-	 * @deprecated
-	 * @param	PHPExcel_Style	$pSharedCellStyle	Cell style to share
-	 * @param	string			$pRange				Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setSharedStyle(PHPExcel_Style $pSharedCellStyle = null, $pRange = '')
-	{
-		$this->duplicateStyle($pSharedCellStyle, $pRange);
-		return $this;
-	}
-
-	/**
-	 * Duplicate cell style to a range of cells
-	 *
-	 * Please note that this will overwrite existing cell styles for cells in range!
-	 *
-	 * @param	PHPExcel_Style	$pCellStyle	Cell style to duplicate
-	 * @param	string			$pRange		Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function duplicateStyle(PHPExcel_Style $pCellStyle = null, $pRange = '')
-	{
-		// make sure we have a real style and not supervisor
-		$style = $pCellStyle->getIsSupervisor() ? $pCellStyle->getSharedComponent() : $pCellStyle;
-
-		// Add the style to the workbook if necessary
-		$workbook = $this->_parent;
-		if ($existingStyle = $this->_parent->getCellXfByHashCode($pCellStyle->getHashCode())) {
-			// there is already such cell Xf in our collection
-			$xfIndex = $existingStyle->getIndex();
-		} else {
-			// we don't have such a cell Xf, need to add
-			$workbook->addCellXf($pCellStyle);
-			$xfIndex = $pCellStyle->getIndex();
-		}
-
-		// Uppercase coordinate
-		$pRange = strtoupper($pRange);
-
-		// Is it a cell range or a single cell?
-		$rangeA	= '';
-		$rangeB	= '';
-		if (strpos($pRange, ':') === false) {
-			$rangeA = $pRange;
-			$rangeB = $pRange;
-		} else {
-			list($rangeA, $rangeB) = explode(':', $pRange);
-		}
-
-		// Calculate range outer borders
-		$rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
-		$rangeEnd	= PHPExcel_Cell::coordinateFromString($rangeB);
-
-		// Translate column into index
-		$rangeStart[0]	= PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
-		$rangeEnd[0]	= PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
-
-		// Make sure we can loop upwards on rows and columns
-		if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
-			$tmp = $rangeStart;
-			$rangeStart = $rangeEnd;
-			$rangeEnd = $tmp;
-		}
-
-		// Loop through cells and apply styles
-		for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-			for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-				$this->getCell(PHPExcel_Cell::stringFromColumnIndex($col) . $row)->setXfIndex($xfIndex);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Duplicate conditional style to a range of cells
-	 *
-	 * Please note that this will overwrite existing cell styles for cells in range!
-	 *
-	 * @param	array of PHPExcel_Style_Conditional	$pCellStyle	Cell style to duplicate
-	 * @param	string								$pRange		Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function duplicateConditionalStyle(array $pCellStyle = null, $pRange = '')
-	{
-		foreach($pCellStyle as $cellStyle) {
-			if (!is_a($cellStyle,'PHPExcel_Style_Conditional')) {
-				throw new Exception('Style is not a conditional style');
-			}
-		}
-
-		// Uppercase coordinate
-		$pRange = strtoupper($pRange);
-
-		// Is it a cell range or a single cell?
-		$rangeA	= '';
-		$rangeB	= '';
-		if (strpos($pRange, ':') === false) {
-			$rangeA = $pRange;
-			$rangeB = $pRange;
-		} else {
-			list($rangeA, $rangeB) = explode(':', $pRange);
-		}
-
-		// Calculate range outer borders
-		$rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
-		$rangeEnd	= PHPExcel_Cell::coordinateFromString($rangeB);
-
-		// Translate column into index
-		$rangeStart[0]	= PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
-		$rangeEnd[0]	= PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
-
-		// Make sure we can loop upwards on rows and columns
-		if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
-			$tmp = $rangeStart;
-			$rangeStart = $rangeEnd;
-			$rangeEnd = $tmp;
-		}
-
-		// Loop through cells and apply styles
-		for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
-			for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
-				$this->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($col) . $row, $pCellStyle);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Duplicate cell style array to a range of cells
-	 *
-	 * Please note that this will overwrite existing cell styles for cells in range,
-	 * if they are in the styles array. For example, if you decide to set a range of
-	 * cells to font bold, only include font bold in the styles array.
-	 *
-	 * @deprecated
-	 * @param	array			$pStyles	Array containing style information
-	 * @param	string			$pRange		Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
-	 * @param	boolean			$pAdvanced	Advanced mode for setting borders.
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function duplicateStyleArray($pStyles = null, $pRange = '', $pAdvanced = true)
-	{
-		$this->getStyle($pRange)->applyFromArray($pStyles, $pAdvanced);
-		return $this;
-	}
-
-	/**
-	 * Set break on a cell
-	 *
-	 * @param	string			$pCell		Cell coordinate (e.g. A1)
-	 * @param	int				$pBreak		Break type (type of PHPExcel_Worksheet::BREAK_*)
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setBreak($pCell = 'A1', $pBreak = PHPExcel_Worksheet::BREAK_NONE)
-	{
-		// Uppercase coordinate
-		$pCell = strtoupper($pCell);
-
-		if ($pCell != '') {
-			$this->_breaks[$pCell] = $pBreak;
-		} else {
-			throw new Exception('No cell coordinate specified.');
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Set break on a cell by using numeric cell coordinates
-	 *
-	 * @param	integer	$pColumn	Numeric column coordinate of the cell
-	 * @param	integer	$pRow		Numeric row coordinate of the cell
-	 * @param	integer	$pBreak		Break type (type of PHPExcel_Worksheet::BREAK_*)
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setBreakByColumnAndRow($pColumn = 0, $pRow = 1, $pBreak = PHPExcel_Worksheet::BREAK_NONE)
-	{
-		return $this->setBreak(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow, $pBreak);
-	}
-
-	/**
-	 * Get breaks
-	 *
-	 * @return array[]
-	 */
-	public function getBreaks()
-	{
-		return $this->_breaks;
-	}
-
-	/**
-	 * Set merge on a cell range
-	 *
-	 * @param	string			$pRange		Cell range (e.g. A1:E1)
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function mergeCells($pRange = 'A1:A1')
-	{
-		// Uppercase coordinate
-		$pRange = strtoupper($pRange);
-
-		if (strpos($pRange,':') !== false) {
-			$this->_mergeCells[$pRange] = $pRange;
-
-			// make sure cells are created
-
-			// get the cells in the range
-			$aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
-
-			// create upper left cell if it does not already exist
-			$upperLeft = $aReferences[0];
-			if (!$this->cellExists($upperLeft)) {
-				$this->getCell($upperLeft)->setValueExplicit(null, PHPExcel_Cell_DataType::TYPE_NULL);
-			}
-
-			// create or blank out the rest of the cells in the range
-			$count = count($aReferences);
-			for ($i = 1; $i < $count; $i++) {
-				$this->getCell($aReferences[$i])->setValueExplicit(null, PHPExcel_Cell_DataType::TYPE_NULL);
-			}
-
-		} else {
-			throw new Exception('Merge must be set on a range of cells.');
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Set merge on a cell range by using numeric cell coordinates
-	 *
-	 * @param	int $pColumn1	Numeric column coordinate of the first cell
-	 * @param	int $pRow1		Numeric row coordinate of the first cell
-	 * @param	int $pColumn2	Numeric column coordinate of the last cell
-	 * @param	int $pRow2		Numeric row coordinate of the last cell
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function mergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
-	{
-		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
-		return $this->mergeCells($cellRange);
-	}
-
-	/**
-	 * Remove merge on a cell range
-	 *
-	 * @param	string			$pRange		Cell range (e.g. A1:E1)
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function unmergeCells($pRange = 'A1:A1')
-	{
-		// Uppercase coordinate
-		$pRange = strtoupper($pRange);
-
-		if (strpos($pRange,':') !== false) {
-			if (isset($this->_mergeCells[$pRange])) {
-				unset($this->_mergeCells[$pRange]);
-			} else {
-				throw new Exception('Cell range ' . $pRange . ' not known as merged.');
-			}
-		} else {
-			throw new Exception('Merge can only be removed from a range of cells.');
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Remove merge on a cell range by using numeric cell coordinates
-	 *
-	 * @param	int $pColumn1	Numeric column coordinate of the first cell
-	 * @param	int $pRow1		Numeric row coordinate of the first cell
-	 * @param	int $pColumn2	Numeric column coordinate of the last cell
-	 * @param	int $pRow2		Numeric row coordinate of the last cell
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function unmergeCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
-	{
-		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
-		return $this->unmergeCells($cellRange);
-	}
-
-	/**
-	 * Get merge cells array.
-	 *
-	 * @return array[]
-	 */
-	public function getMergeCells()
-	{
-		return $this->_mergeCells;
-	}
-
-	/**
-	 * Set merge cells array for the entire sheet. Use instead mergeCells() to merge
-	 * a single cell range.
-	 *
-	 * @param array
-	 */
-	public function setMergeCells($pValue = array())
-	{
-		$this->_mergeCells = $pValue;
-
-		return $this;
-	}
-
-	/**
-	 * Set protection on a cell range
-	 *
-	 * @param	string			$pRange				Cell (e.g. A1) or cell range (e.g. A1:E1)
-	 * @param	string			$pPassword			Password to unlock the protection
-	 * @param	boolean		$pAlreadyHashed	If the password has already been hashed, set this to true
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function protectCells($pRange = 'A1', $pPassword = '', $pAlreadyHashed = false)
-	{
-		// Uppercase coordinate
-		$pRange = strtoupper($pRange);
-
-		if (!$pAlreadyHashed) {
-			$pPassword = PHPExcel_Shared_PasswordHasher::hashPassword($pPassword);
-		}
-		$this->_protectedCells[$pRange] = $pPassword;
-
-		return $this;
-	}
-
-	/**
-	 * Set protection on a cell range by using numeric cell coordinates
-	 *
-	 * @param	int	$pColumn1			Numeric column coordinate of the first cell
-	 * @param	int	$pRow1				Numeric row coordinate of the first cell
-	 * @param	int	$pColumn2			Numeric column coordinate of the last cell
-	 * @param	int	$pRow2				Numeric row coordinate of the last cell
-	 * @param	string	$pPassword			Password to unlock the protection
-	 * @param	boolean $pAlreadyHashed	If the password has already been hashed, set this to true
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function protectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
-	{
-		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
-		return $this->protectCells($cellRange, $pPassword, $pAlreadyHashed);
-	}
-
-	/**
-	 * Remove protection on a cell range
-	 *
-	 * @param	string			$pRange		Cell (e.g. A1) or cell range (e.g. A1:E1)
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function unprotectCells($pRange = 'A1')
-	{
-		// Uppercase coordinate
-		$pRange = strtoupper($pRange);
-
-		if (isset($this->_protectedCells[$pRange])) {
-			unset($this->_protectedCells[$pRange]);
-		} else {
-			throw new Exception('Cell range ' . $pRange . ' not known as protected.');
-		}
-		return $this;
-	}
-
-	/**
-	 * Remove protection on a cell range by using numeric cell coordinates
-	 *
-	 * @param	int	$pColumn1			Numeric column coordinate of the first cell
-	 * @param	int	$pRow1				Numeric row coordinate of the first cell
-	 * @param	int	$pColumn2			Numeric column coordinate of the last cell
-	 * @param	int	$pRow2				Numeric row coordinate of the last cell
-	 * @param	string	$pPassword			Password to unlock the protection
-	 * @param	boolean $pAlreadyHashed	If the password has already been hashed, set this to true
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function unprotectCellsByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1, $pPassword = '', $pAlreadyHashed = false)
-	{
-		$cellRange = PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2;
-		return $this->unprotectCells($cellRange, $pPassword, $pAlreadyHashed);
-	}
-
-	/**
-	 * Get protected cells
-	 *
-	 * @return array[]
-	 */
-	public function getProtectedCells()
-	{
-		return $this->_protectedCells;
-	}
-
-	/**
-	 *	Get Autofilter
-	 *
-	 *	@return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function getAutoFilter()
-	{
-		return $this->_autoFilter;
-	}
-
-	/**
-	 *	Set AutoFilter
-	 *
-	 *	@param	PHPExcel_Worksheet_AutoFilter|string	$pValue
-	 *			A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet
-	 */
-	public function setAutoFilter($pValue)
-	{
-		if (is_string($pValue)) {
-			$this->_autoFilter->setRange($pValue);
-		} elseif(is_object($pValue) && ($pValue instanceof PHPExcel_Worksheet_AutoFilter)) {
-			$this->_autoFilter = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 *	Set Autofilter Range by using numeric cell coordinates
-	 *
-	 *	@param	int	$pColumn1	Numeric column coordinate of the first cell
-	 *	@param	int	$pRow1		Numeric row coordinate of the first cell
-	 *	@param	int	$pColumn2	Numeric column coordinate of the second cell
-	 *	@param	int	$pRow2		Numeric row coordinate of the second cell
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet
-	 */
-	public function setAutoFilterByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
-	{
-		return $this->setAutoFilter(
-			PHPExcel_Cell::stringFromColumnIndex($pColumn1) . $pRow1
-			. ':' .
-			PHPExcel_Cell::stringFromColumnIndex($pColumn2) . $pRow2
-		);
-	}
-
-    /**
-     * Remove autofilter
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function removeAutoFilter()
-    {
-    	$this->_autoFilter->setRange(NULL);
-    	return $this;
-    }
-
-	/**
-	 * Get Freeze Pane
-	 *
-	 * @return string
-	 */
-	public function getFreezePane()
-	{
-		return $this->_freezePane;
-	}
-
-	/**
-	 * Freeze Pane
-	 *
-	 * @param	string		$pCell		Cell (i.e. A2)
-	 *									Examples:
-	 *										A2 will freeze the rows above cell A2 (i.e row 1)
-	 *										B1 will freeze the columns to the left of cell B1 (i.e column A)
-	 *										B2 will freeze the rows above and to the left of cell A2
-	 *											(i.e row 1 and column A)
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function freezePane($pCell = '')
-	{
-		// Uppercase coordinate
-		$pCell = strtoupper($pCell);
-
-		if (strpos($pCell,':') === false && strpos($pCell,',') === false) {
-			$this->_freezePane = $pCell;
-		} else {
-			throw new Exception('Freeze pane can not be set on a range of cells.');
-		}
-		return $this;
-	}
-
-	/**
-	 * Freeze Pane by using numeric cell coordinates
-	 *
-	 * @param	int	$pColumn	Numeric column coordinate of the cell
-	 * @param	int	$pRow		Numeric row coordinate of the cell
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function freezePaneByColumnAndRow($pColumn = 0, $pRow = 1)
-	{
-		return $this->freezePane(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
-	}
-
-	/**
-	 * Unfreeze Pane
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function unfreezePane()
-	{
-		return $this->freezePane('');
-	}
-
-	/**
-	 * Insert a new row, updating all possible related data
-	 *
-	 * @param	int	$pBefore	Insert before this one
-	 * @param	int	$pNumRows	Number of rows to insert
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function insertNewRowBefore($pBefore = 1, $pNumRows = 1) {
-		if ($pBefore >= 1) {
-			$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-			$objReferenceHelper->insertNewBefore('A' . $pBefore, 0, $pNumRows, $this);
-		} else {
-			throw new Exception("Rows can only be inserted before at least row 1.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Insert a new column, updating all possible related data
-	 *
-	 * @param	int	$pBefore	Insert before this one
-	 * @param	int	$pNumCols	Number of columns to insert
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function insertNewColumnBefore($pBefore = 'A', $pNumCols = 1) {
-		if (!is_numeric($pBefore)) {
-			$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-			$objReferenceHelper->insertNewBefore($pBefore . '1', $pNumCols, 0, $this);
-		} else {
-			throw new Exception("Column references should not be numeric.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Insert a new column, updating all possible related data
-	 *
-	 * @param	int	$pBefore	Insert before this one (numeric column coordinate of the cell)
-	 * @param	int	$pNumCols	Number of columns to insert
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function insertNewColumnBeforeByIndex($pBefore = 0, $pNumCols = 1) {
-		if ($pBefore >= 0) {
-			return $this->insertNewColumnBefore(PHPExcel_Cell::stringFromColumnIndex($pBefore), $pNumCols);
-		} else {
-			throw new Exception("Columns can only be inserted before at least column A (0).");
-		}
-	}
-
-	/**
-	 * Delete a row, updating all possible related data
-	 *
-	 * @param	int	$pRow		Remove starting with this one
-	 * @param	int	$pNumRows	Number of rows to remove
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function removeRow($pRow = 1, $pNumRows = 1) {
-		if ($pRow >= 1) {
-			$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-			$objReferenceHelper->insertNewBefore('A' . ($pRow + $pNumRows), 0, -$pNumRows, $this);
-		} else {
-			throw new Exception("Rows to be deleted should at least start from row 1.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Remove a column, updating all possible related data
-	 *
-	 * @param	int	$pColumn	Remove starting with this one
-	 * @param	int	$pNumCols	Number of columns to remove
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function removeColumn($pColumn = 'A', $pNumCols = 1) {
-		if (!is_numeric($pColumn)) {
-			$pColumn = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($pColumn) - 1 + $pNumCols);
-			$objReferenceHelper = PHPExcel_ReferenceHelper::getInstance();
-			$objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this);
-		} else {
-			throw new Exception("Column references should not be numeric.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Remove a column, updating all possible related data
-	 *
-	 * @param	int	$pColumn	Remove starting with this one (numeric column coordinate of the cell)
-	 * @param	int	$pNumCols	Number of columns to remove
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function removeColumnByIndex($pColumn = 0, $pNumCols = 1) {
-		if ($pColumn >= 0) {
-			return $this->removeColumn(PHPExcel_Cell::stringFromColumnIndex($pColumn), $pNumCols);
-		} else {
-			throw new Exception("Columns to be deleted should at least start from column 0");
-		}
-	}
-
-	/**
-	 * Show gridlines?
-	 *
-	 * @return boolean
-	 */
-	public function getShowGridlines() {
-		return $this->_showGridlines;
-	}
-
-	/**
-	 * Set show gridlines
-	 *
-	 * @param boolean $pValue	Show gridlines (true/false)
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setShowGridlines($pValue = false) {
-		$this->_showGridlines = $pValue;
-		return $this;
-	}
-
-	/**
-	* Print gridlines?
-	*
-	* @return boolean
-	*/
-	public function getPrintGridlines() {
-		return $this->_printGridlines;
-	}
-
-	/**
-	* Set print gridlines
-	*
-	* @param boolean $pValue Print gridlines (true/false)
-	* @return PHPExcel_Worksheet
-	*/
-	public function setPrintGridlines($pValue = false) {
-		$this->_printGridlines = $pValue;
-		return $this;
-	}
-
-	/**
-	* Show row and column headers?
-	*
-	* @return boolean
-	*/
-	public function getShowRowColHeaders() {
-		return $this->_showRowColHeaders;
-	}
-
-	/**
-	* Set show row and column headers
-	*
-	* @param boolean $pValue Show row and column headers (true/false)
-	* @return PHPExcel_Worksheet
-	*/
-	public function setShowRowColHeaders($pValue = false) {
-		$this->_showRowColHeaders = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Show summary below? (Row/Column outlining)
-	 *
-	 * @return boolean
-	 */
-	public function getShowSummaryBelow() {
-		return $this->_showSummaryBelow;
-	}
-
-	/**
-	 * Set show summary below
-	 *
-	 * @param boolean $pValue	Show summary below (true/false)
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setShowSummaryBelow($pValue = true) {
-		$this->_showSummaryBelow = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Show summary right? (Row/Column outlining)
-	 *
-	 * @return boolean
-	 */
-	public function getShowSummaryRight() {
-		return $this->_showSummaryRight;
-	}
-
-	/**
-	 * Set show summary right
-	 *
-	 * @param boolean $pValue	Show summary right (true/false)
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setShowSummaryRight($pValue = true) {
-		$this->_showSummaryRight = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get comments
-	 *
-	 * @return PHPExcel_Comment[]
-	 */
-	public function getComments()
-	{
-		return $this->_comments;
-	}
-
-	/**
-	 * Set comments array for the entire sheet.
-	 *
-	 * @param array of PHPExcel_Comment
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setComments($pValue = array())
-	{
-		$this->_comments = $pValue;
-
-		return $this;
-	}
-
-	/**
-	 * Get comment for cell
-	 *
-	 * @param	string	$pCellCoordinate	Cell coordinate to get comment for
-	 * @return	PHPExcel_Comment
-	 * @throws	Exception
-	 */
-	public function getComment($pCellCoordinate = 'A1')
-	{
-		// Uppercase coordinate
-		$pCellCoordinate = strtoupper($pCellCoordinate);
-
-		if (strpos($pCellCoordinate,':') !== false || strpos($pCellCoordinate,',') !== false) {
-			throw new Exception('Cell coordinate string can not be a range of cells.');
-		} else if (strpos($pCellCoordinate,'$') !== false) {
-			throw new Exception('Cell coordinate string must not be absolute.');
-		} else if ($pCellCoordinate == '') {
-			throw new Exception('Cell coordinate can not be zero-length string.');
-		} else {
-			// Check if we already have a comment for this cell.
-			// If not, create a new comment.
-			if (isset($this->_comments[$pCellCoordinate])) {
-				return $this->_comments[$pCellCoordinate];
-			} else {
-				$newComment = new PHPExcel_Comment();
-				$this->_comments[$pCellCoordinate] = $newComment;
-				return $newComment;
-			}
-		}
-	}
-
-	/**
-	 * Get comment for cell by using numeric cell coordinates
-	 *
-	 * @param	int $pColumn	Numeric column coordinate of the cell
-	 * @param	int $pRow		Numeric row coordinate of the cell
-	 * @return	PHPExcel_Comment
-	 */
-	public function getCommentByColumnAndRow($pColumn = 0, $pRow = 1)
-	{
-		return $this->getComment(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
-	}
-
-	/**
-	 * Get selected cell
-	 *
-	 * @deprecated
-	 * @return string
-	 */
-	public function getSelectedCell()
-	{
-		return $this->getSelectedCells();
-	}
-
-	/**
-	 * Get active cell
-	 *
-	 * @return string Example: 'A1'
-	 */
-	public function getActiveCell()
-	{
-		return $this->_activeCell;
-	}
-
-	/**
-	 * Get selected cells
-	 *
-	 * @return string
-	 */
-	public function getSelectedCells()
-	{
-		return $this->_selectedCells;
-	}
-
-	/**
-	 * Selected cell
-	 *
-	 * @param	string		$pCoordinate	Cell (i.e. A1)
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setSelectedCell($pCoordinate = 'A1')
-	{
-		return $this->setSelectedCells($pCoordinate);
-	}
-
-	/**
-	 * Select a range of cells.
-	 *
-	 * @param	string		$pCoordinate	Cell range, examples: 'A1', 'B2:G5', 'A:C', '3:6'
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setSelectedCells($pCoordinate = 'A1')
-	{
-		// Uppercase coordinate
-		$pCoordinate = strtoupper($pCoordinate);
-
-		// Convert 'A' to 'A:A'
-		$pCoordinate = preg_replace('/^([A-Z]+)$/', '${1}:${1}', $pCoordinate);
-
-		// Convert '1' to '1:1'
-		$pCoordinate = preg_replace('/^([0-9]+)$/', '${1}:${1}', $pCoordinate);
-
-		// Convert 'A:C' to 'A1:C1048576'
-		$pCoordinate = preg_replace('/^([A-Z]+):([A-Z]+)$/', '${1}1:${2}1048576', $pCoordinate);
-
-		// Convert '1:3' to 'A1:XFD3'
-		$pCoordinate = preg_replace('/^([0-9]+):([0-9]+)$/', 'A${1}:XFD${2}', $pCoordinate);
-
-		if (strpos($pCoordinate,':') !== false || strpos($pCoordinate,',') !== false) {
-			list($first, ) = PHPExcel_Cell::splitRange($pCoordinate);
-			$this->_activeCell = $first[0];
-		} else {
-			$this->_activeCell = $pCoordinate;
-		}
-		$this->_selectedCells = $pCoordinate;
-		return $this;
-	}
-
-	/**
-	 * Selected cell by using numeric cell coordinates
-	 *
-	 * @param	int	$pColumn	Numeric column coordinate of the cell
-	 * @param	int	$pRow		Numeric row coordinate of the cell
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setSelectedCellByColumnAndRow($pColumn = 0, $pRow = 1)
-	{
-		return $this->setSelectedCells(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
-	}
-
-	/**
-	 * Get right-to-left
-	 *
-	 * @return boolean
-	 */
-	public function getRightToLeft() {
-		return $this->_rightToLeft;
-	}
-
-	/**
-	 * Set right-to-left
-	 *
-	 * @param	boolean	$value	Right-to-left true/false
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setRightToLeft($value = false) {
-		$this->_rightToLeft = $value;
-		return $this;
-	}
-
-	/**
-	 * Fill worksheet from values in array
-	 *
-	 * @param	array	$source					Source array
-	 * @param	mixed	$nullValue				Value in source array that stands for blank cell
-	 * @param	string	$startCell				Insert array starting from this cell address as the top left coordinate
-	 * @param	boolean	$strictNullComparison	Apply strict comparison when testing for null values in the array
-	 * @throws Exception
-	 * @return PHPExcel_Worksheet
-	 */
-	public function fromArray($source = null, $nullValue = null, $startCell = 'A1', $strictNullComparison = false) {
-		if (is_array($source)) {
-			//	Convert a 1-D array to 2-D (for ease of looping)
-			if (!is_array(end($source))) {
-				$source = array($source);
-			}
-
-			// start coordinate
-			list ($startColumn, $startRow) = PHPExcel_Cell::coordinateFromString($startCell);
-
-			// Loop through $source
-			foreach ($source as $rowData) {
-				$currentColumn = $startColumn;
-				foreach($rowData as $cellValue) {
-					if ($strictNullComparison) {
-						if ($cellValue !== $nullValue) {
-							// Set cell value
-							$this->getCell($currentColumn . $startRow)->setValue($cellValue);
-						}
-					} else {
-						if ($cellValue != $nullValue) {
-							// Set cell value
-							$this->getCell($currentColumn . $startRow)->setValue($cellValue);
-						}
-					}
-					++$currentColumn;
-				}
-				++$startRow;
-			}
-		} else {
-			throw new Exception("Parameter \$source should be an array.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Create array from a range of cells
-	 *
-	 * @param	string	$pRange					Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
-	 * @param	mixed	$nullValue				Value returned in the array entry if a cell doesn't exist
-	 * @param	boolean	$calculateFormulas		Should formulas be calculated?
-	 * @param	boolean	$formatData				Should formatting be applied to cell values?
-	 * @param	boolean	$returnCellRef			False - Return a simple array of rows and columns indexed by number counting from zero
-	 *											True - Return rows and columns indexed by their actual row and column IDs
-	 * @return array
-	 */
-	public function rangeToArray($pRange = 'A1', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
-		// Returnvalue
-		$returnValue = array();
-
-		//	Identify the range that we need to extract from the worksheet
-		list($rangeStart, $rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
-		$minCol = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] -1);
-		$minRow = $rangeStart[1];
-		$maxCol = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] -1);
-		$maxRow = $rangeEnd[1];
-
-		$maxCol++;
-
-		// Loop through rows
-		$r = -1;
-		for ($row = $minRow; $row <= $maxRow; ++$row) {
-			$rRef = ($returnCellRef) ? $row : ++$r;
-			$c = -1;
-			// Loop through columns in the current row
-			for ($col = $minCol; $col != $maxCol; ++$col) {
-				$cRef = ($returnCellRef) ? $col : ++$c;
-				//	Using getCell() will create a new cell if it doesn't already exist. We don't want that to happen
-				//		so we test and retrieve directly against _cellCollection
-				if ($this->_cellCollection->isDataSet($col.$row)) {
-					// Cell exists
-					$cell = $this->_cellCollection->getCacheData($col.$row);
-					if ($cell->getValue() !== null) {
-						if ($cell->getValue() instanceof PHPExcel_RichText) {
-							$returnValue[$rRef][$cRef] = $cell->getValue()->getPlainText();
-						} else {
-							if ($calculateFormulas) {
-								$returnValue[$rRef][$cRef] = $cell->getCalculatedValue();
-							} else {
-								$returnValue[$rRef][$cRef] = $cell->getValue();
-							}
-						}
-
-						if ($formatData) {
-							$style = $this->_parent->getCellXfByIndex($cell->getXfIndex());
-							$returnValue[$rRef][$cRef] = PHPExcel_Style_NumberFormat::toFormattedString($returnValue[$rRef][$cRef], $style->getNumberFormat()->getFormatCode());
-						}
-					} else {
-						// Cell holds a NULL
-						$returnValue[$rRef][$cRef] = $nullValue;
-					}
-				} else {
-					// Cell doesn't exist
-					$returnValue[$rRef][$cRef] = $nullValue;
-				}
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}
-
-
-	/**
-	 * Create array from a range of cells
-	 *
-	 * @param	string	$pNamedRange			Name of the Named Range
-	 * @param	mixed	$nullValue				Value returned in the array entry if a cell doesn't exist
-	 * @param	boolean	$calculateFormulas		Should formulas be calculated?
-	 * @param	boolean	$formatData				Should formatting be applied to cell values?
-	 * @param	boolean	$returnCellRef			False - Return a simple array of rows and columns indexed by number counting from zero
-	 *											True - Return rows and columns indexed by their actual row and column IDs
-	 * @return array
-	 * @throws Exception
-	 */
-	public function namedRangeToArray($pNamedRange = '', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
-		$namedRange = PHPExcel_NamedRange::resolveRange($pNamedRange, $this);
-		if ($namedRange !== NULL) {
-			$pWorkSheet = $namedRange->getWorksheet();
-			$pCellRange = $namedRange->getRange();
-
-			return $pWorkSheet->rangeToArray(	$pCellRange,
-												$nullValue, $calculateFormulas, $formatData, $returnCellRef);
-		}
-
-		throw new Exception('Named Range '.$pNamedRange.' does not exist.');
-	}
-
-
-	/**
-	 * Create array from worksheet
-	 *
-	 * @param	mixed	$nullValue				Value returned in the array entry if a cell doesn't exist
-	 * @param	boolean	$calculateFormulas		Should formulas be calculated?
-	 * @param	boolean	$formatData				Should formatting be applied to cell values?
-	 * @param	boolean	$returnCellRef			False - Return a simple array of rows and columns indexed by number counting from zero
-	 *											True - Return rows and columns indexed by their actual row and column IDs
-	 * @return array
-	 */
-	public function toArray($nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
-		// Garbage collect...
-		$this->garbageCollect();
-
-		//	Identify the range that we need to extract from the worksheet
-		$maxCol = $this->getHighestColumn();
-		$maxRow = $this->getHighestRow();
-		// Return
-		return $this->rangeToArray(	'A1:'.$maxCol.$maxRow,
-									$nullValue, $calculateFormulas, $formatData, $returnCellRef);
-	}
-
-	/**
-	 * Get row iterator
-	 *
-     * @param  integer                           $startRow    The row number at which to start iterating
-	 * @return PHPExcel_Worksheet_RowIterator
-	 */
-	public function getRowIterator($startRow = 1) {
-		return new PHPExcel_Worksheet_RowIterator($this,$startRow);
-	}
-
-	/**
-	 * Run PHPExcel garabage collector.
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function garbageCollect() {
-		// Build a reference table from images
-//		$imageCoordinates = array();
-//		$iterator = $this->getDrawingCollection()->getIterator();
-//		while ($iterator->valid()) {
-//			$imageCoordinates[$iterator->current()->getCoordinates()] = true;
-//
-//			$iterator->next();
-//		}
-//
-		// Lookup highest column and highest row if cells are cleaned
-		$colRow = $this->_cellCollection->getHighestRowAndColumn();
-		$highestRow = $colRow['row'];
-		$highestColumn = PHPExcel_Cell::columnIndexFromString($colRow['column']);
-
-		// Loop through column dimensions
-		foreach ($this->_columnDimensions as $dimension) {
-			$highestColumn = max($highestColumn,PHPExcel_Cell::columnIndexFromString($dimension->getColumnIndex()));
-		}
-
-		// Loop through row dimensions
-		foreach ($this->_rowDimensions as $dimension) {
-			$highestRow = max($highestRow,$dimension->getRowIndex());
-		}
-
-		// Cache values
-		if ($highestColumn < 0) {
-			$this->_cachedHighestColumn = 'A';
-		} else {
-			$this->_cachedHighestColumn = PHPExcel_Cell::stringFromColumnIndex(--$highestColumn);
-		}
-		$this->_cachedHighestRow = $highestRow;
-
-		// Return
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-		if ($this->_dirty) {
-			$this->_hash = md5( $this->_title .
-								$this->_autoFilter .
-								($this->_protection->isProtectionEnabled() ? 't' : 'f') .
-								__CLASS__
-							  );
-			$this->_dirty = false;
-		}
-		return $this->_hash;
-	}
-
-	/**
-	 * Extract worksheet title from range.
-	 *
-	 * Example: extractSheetTitle("testSheet!A1") ==> 'A1'
-	 * Example: extractSheetTitle("'testSheet 1'!A1", true) ==> array('testSheet 1', 'A1');
-	 *
-	 * @param string $pRange	Range to extract title from
-	 * @param bool $returnRange	Return range? (see example)
-	 * @return mixed
-	 */
-	public static function extractSheetTitle($pRange, $returnRange = false) {
-		// Sheet title included?
-		if (($sep = strpos($pRange, '!')) === false) {
-			return '';
-		}
-
-		if ($returnRange) {
-			return array( trim(substr($pRange, 0, $sep),"'"),
-						  substr($pRange, $sep + 1)
-						);
-		}
-
-		return substr($pRange, $sep + 1);
-	}
-
-	/**
-	 * Get hyperlink
-	 *
-	 * @param string $pCellCoordinate	Cell coordinate to get hyperlink for
-	 */
-	public function getHyperlink($pCellCoordinate = 'A1')
-	{
-		// return hyperlink if we already have one
-		if (isset($this->_hyperlinkCollection[$pCellCoordinate])) {
-			return $this->_hyperlinkCollection[$pCellCoordinate];
-		}
-
-		// else create hyperlink
-		$this->_hyperlinkCollection[$pCellCoordinate] = new PHPExcel_Cell_Hyperlink();
-		return $this->_hyperlinkCollection[$pCellCoordinate];
-	}
-
-	/**
-	 * Set hyperlnk
-	 *
-	 * @param string $pCellCoordinate	Cell coordinate to insert hyperlink
-	 * @param	PHPExcel_Cell_Hyperlink	$pHyperlink
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setHyperlink($pCellCoordinate = 'A1', PHPExcel_Cell_Hyperlink $pHyperlink = null)
-	{
-		if ($pHyperlink === null) {
-			unset($this->_hyperlinkCollection[$pCellCoordinate]);
-		} else {
-			$this->_hyperlinkCollection[$pCellCoordinate] = $pHyperlink;
-		}
-		return $this;
-	}
-
-	/**
-	 * Hyperlink at a specific coordinate exists?
-	 *
-	 * @param string $pCoordinate
-	 * @return boolean
-	 */
-	public function hyperlinkExists($pCoordinate = 'A1')
-	{
-		return isset($this->_hyperlinkCollection[$pCoordinate]);
-	}
-
-	/**
-	 * Get collection of hyperlinks
-	 *
-	 * @return PHPExcel_Cell_Hyperlink[]
-	 */
-	public function getHyperlinkCollection()
-	{
-		return $this->_hyperlinkCollection;
-	}
-
-	/**
-	 * Get data validation
-	 *
-	 * @param string $pCellCoordinate	Cell coordinate to get data validation for
-	 */
-	public function getDataValidation($pCellCoordinate = 'A1')
-	{
-		// return data validation if we already have one
-		if (isset($this->_dataValidationCollection[$pCellCoordinate])) {
-			return $this->_dataValidationCollection[$pCellCoordinate];
-		}
-
-		// else create data validation
-		$this->_dataValidationCollection[$pCellCoordinate] = new PHPExcel_Cell_DataValidation();
-		return $this->_dataValidationCollection[$pCellCoordinate];
-	}
-
-	/**
-	 * Set data validation
-	 *
-	 * @param string $pCellCoordinate	Cell coordinate to insert data validation
-	 * @param	PHPExcel_Cell_DataValidation	$pDataValidation
-	 * @return PHPExcel_Worksheet
-	 */
-	public function setDataValidation($pCellCoordinate = 'A1', PHPExcel_Cell_DataValidation $pDataValidation = null)
-	{
-		if ($pDataValidation === null) {
-			unset($this->_dataValidationCollection[$pCellCoordinate]);
-		} else {
-			$this->_dataValidationCollection[$pCellCoordinate] = $pDataValidation;
-		}
-		return $this;
-	}
-
-	/**
-	 * Data validation at a specific coordinate exists?
-	 *
-	 * @param string $pCoordinate
-	 * @return boolean
-	 */
-	public function dataValidationExists($pCoordinate = 'A1')
-	{
-		return isset($this->_dataValidationCollection[$pCoordinate]);
-	}
-
-	/**
-	 * Get collection of data validations
-	 *
-	 * @return PHPExcel_Cell_DataValidation[]
-	 */
-	public function getDataValidationCollection()
-	{
-		return $this->_dataValidationCollection;
-	}
-
-	/**
-	 * Accepts a range, returning it as a range that falls within the current highest row and column of the worksheet
-	 *
-	 * @param	string	$range
-	 * @return	string	Adjusted range value
-	 */
-	public function shrinkRangeToFit($range) {
-		$maxCol = $this->getHighestColumn();
-		$maxRow = $this->getHighestRow();
-		$maxCol = PHPExcel_Cell::columnIndexFromString($maxCol);
-
-		$rangeBlocks = explode(' ',$range);
-		foreach ($rangeBlocks as &$rangeSet) {
-			$rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($rangeSet);
-
-			if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[0][0]) > $maxCol) { $rangeBoundaries[0][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol); }
-			if ($rangeBoundaries[0][1] > $maxRow) { $rangeBoundaries[0][1] = $maxRow; }
-			if (PHPExcel_Cell::columnIndexFromString($rangeBoundaries[1][0]) > $maxCol) { $rangeBoundaries[1][0] = PHPExcel_Cell::stringFromColumnIndex($maxCol); }
-			if ($rangeBoundaries[1][1] > $maxRow) { $rangeBoundaries[1][1] = $maxRow; }
-			$rangeSet = $rangeBoundaries[0][0].$rangeBoundaries[0][1].':'.$rangeBoundaries[1][0].$rangeBoundaries[1][1];
-		}
-		unset($rangeSet);
-		$stRange = implode(' ',$rangeBlocks);
-
-		return $stRange;
-	}
-
-
-	/**
-	 * Get tab color
-	 *
-	 * @return PHPExcel_Style_Color
-	 */
-	public function getTabColor()
-	{
-		if ($this->_tabColor === NULL)
-			$this->_tabColor = new PHPExcel_Style_Color();
-
-		return $this->_tabColor;
-	}
-
-	/**
-	 * Reset tab color
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function resetTabColor()
-	{
-		$this->_tabColor = null;
-		unset($this->_tabColor);
-
-		return $this;
-	}
-
-	/**
-	 * Tab color set?
-	 *
-	 * @return boolean
-	 */
-	public function isTabColorSet()
-	{
-		return ($this->_tabColor !== NULL);
-	}
-
-	/**
-	 * Copy worksheet (!= clone!)
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function copy() {
-		$copied = clone $this;
-
-		return $copied;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		foreach ($this as $key => $val) {
-			if ($key == '_parent') {
-				continue;
-			}
-
-			if (is_object($val) || (is_array($val))) {
-				if ($key == '_cellCollection') {
-					$newCollection = clone $this->_cellCollection;
-					$newCollection->copyCellCollection($this);
-					$this->_cellCollection = $newCollection;
-				} elseif ($key == '_drawingCollection') {
-					$newCollection = clone $this->_drawingCollection;
-					$this->_drawingCollection = $newCollection;
-				} elseif (($key == '_autoFilter') && (is_a($this->_autoFilter,'PHPExcel_Worksheet_AutoFilter'))) {
-					$newAutoFilter = clone $this->_autoFilter;
-					$this->_autoFilter = $newAutoFilter;
-					$this->_autoFilter->setParent($this);
-				} else {
-					$this->{$key} = unserialize(serialize($val));
-				}
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/AutoFilter.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/AutoFilter.php
deleted file mode 100755
index 2448d35de..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/AutoFilter.php
+++ /dev/null
@@ -1,855 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_AutoFilter
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_AutoFilter
-{
-	/**
-	 * Autofilter Worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_workSheet = NULL;
-
-
-	/**
-	 * Autofilter Range
-	 *
-	 * @var string
-	 */
-	private $_range = '';
-
-
-	/**
-	 * Autofilter Column Ruleset
-	 *
-	 * @var array of PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	private $_columns = array();
-
-
-    /**
-     * Create a new PHPExcel_Worksheet_AutoFilter
-     */
-    public function __construct($pRange = '', PHPExcel_Worksheet $pSheet = NULL)
-    {
-		$this->_range = $pRange;
-		$this->_workSheet = $pSheet;
-    }
-
-	/**
-	 * Get AutoFilter Parent Worksheet
-	 *
-	 * @return PHPExcel_Worksheet
-	 */
-	public function getParent() {
-		return $this->_workSheet;
-	}
-
-	/**
-	 * Set AutoFilter Parent Worksheet
-	 *
-	 * @param PHPExcel_Worksheet
-	 * @return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function setParent(PHPExcel_Worksheet $pSheet = NULL) {
-		$this->_workSheet = $pSheet;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Range
-	 *
-	 * @return string
-	 */
-	public function getRange() {
-		return $this->_range;
-	}
-
-	/**
-	 *	Set AutoFilter Range
-	 *
-	 *	@param	string		$pRange		Cell range (i.e. A1:E10)
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function setRange($pRange = '') {
-		// Uppercase coordinate
-		$cellAddress = explode('!',strtoupper($pRange));
-		if (count($cellAddress) > 1) {
-			list($worksheet,$pRange) = $cellAddress;
-		}
-
-		if (strpos($pRange,':') !== FALSE) {
-			$this->_range = $pRange;
-		} elseif(empty($pRange)) {
-			$this->_range = '';
-		} else {
-			throw new PHPExcel_Exception('Autofilter must be set on a range of cells.');
-		}
-
-		if (empty($pRange)) {
-			//	Discard all column rules
-			$this->_columns = array();
-		} else {
-			//	Discard any column rules that are no longer valid within this range
-			list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
-			foreach($this->_columns as $key => $value) {
-				$colIndex = PHPExcel_Cell::columnIndexFromString($key);
-				if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) {
-					unset($this->_columns[$key]);
-				}
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get all AutoFilter Columns
-	 *
-	 * @throws	PHPExcel_Exception
-	 * @return array of PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function getColumns() {
-		return $this->_columns;
-	}
-
-	/**
-	 * Validate that the specified column is in the AutoFilter range
-	 *
-	 * @param	string	$column			Column name (e.g. A)
-	 * @throws	PHPExcel_Exception
-	 * @return	integer	The column offset within the autofilter range
-	 */
-	public function testColumnInRange($column) {
-		if (empty($this->_range)) {
-			throw new PHPExcel_Exception("No autofilter range is defined.");
-		}
-
-		$columnIndex = PHPExcel_Cell::columnIndexFromString($column);
-		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
-		if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) {
-			throw new PHPExcel_Exception("Column is outside of current autofilter range.");
-		}
-
-		return $columnIndex - $rangeStart[0];
-	}
-
-	/**
-	 * Get a specified AutoFilter Column Offset within the defined AutoFilter range
-	 *
-	 * @param	string	$pColumn		Column name (e.g. A)
-	 * @throws	PHPExcel_Exception
-	 * @return integer	The offset of the specified column within the autofilter range
-	 */
-	public function getColumnOffset($pColumn) {
-		return $this->testColumnInRange($pColumn);
-	}
-
-	/**
-	 * Get a specified AutoFilter Column
-	 *
-	 * @param	string	$pColumn		Column name (e.g. A)
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function getColumn($pColumn) {
-		$this->testColumnInRange($pColumn);
-
-		if (!isset($this->_columns[$pColumn])) {
-			$this->_columns[$pColumn] = new PHPExcel_Worksheet_AutoFilter_Column($pColumn, $this);
-		}
-
-		return $this->_columns[$pColumn];
-	}
-
-	/**
-	 * Get a specified AutoFilter Column by it's offset
-	 *
-	 * @param	integer	$pColumnOffset		Column offset within range (starting from 0)
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function getColumnByOffset($pColumnOffset = 0) {
-		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
-		$pColumn = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] + $pColumnOffset - 1);
-
-		return $this->getColumn($pColumn);
-	}
-
-	/**
-	 *	Set AutoFilter
-	 *
-	 *	@param	PHPExcel_Worksheet_AutoFilter_Column|string		$pColumn
-	 *			A simple string containing a Column ID like 'A' is permitted
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function setColumn($pColumn)
-	{
-		if ((is_string($pColumn)) && (!empty($pColumn))) {
-			$column = $pColumn;
-		} elseif(is_object($pColumn) && ($pColumn instanceof PHPExcel_Worksheet_AutoFilter_Column)) {
-			$column = $pColumn->getColumnIndex();
-		} else {
-			throw new PHPExcel_Exception("Column is not within the autofilter range.");
-		}
-		$this->testColumnInRange($column);
-
-		if (is_string($pColumn)) {
-			$this->_columns[$pColumn] = new PHPExcel_Worksheet_AutoFilter_Column($pColumn, $this);
-		} elseif(is_object($pColumn) && ($pColumn instanceof PHPExcel_Worksheet_AutoFilter_Column)) {
-			$pColumn->setParent($this);
-			$this->_columns[$column] = $pColumn;
-		}
-		ksort($this->_columns);
-
-		return $this;
-	}
-
-	/**
-	 * Clear a specified AutoFilter Column
-	 *
-	 * @param	string	$pColumn		Column name (e.g. A)
-	 * @throws	PHPExcel_Exception
-	 * @return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function clearColumn($pColumn) {
-		$this->testColumnInRange($pColumn);
-
-		if (isset($this->_columns[$pColumn])) {
-			unset($this->_columns[$pColumn]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 *	Shift an AutoFilter Column Rule to a different column
-	 *
-	 *	Note: This method bypasses validation of the destination column to ensure it is within this AutoFilter range.
-	 *		Nor does it verify whether any column rule already exists at $toColumn, but will simply overrideany existing value.
-	 *		Use with caution.
-	 *
-	 *	@param	string	$fromColumn		Column name (e.g. A)
-	 *	@param	string	$toColumn		Column name (e.g. B)
-	 *	@return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function shiftColumn($fromColumn=NULL,$toColumn=NULL) {
-		$fromColumn = strtoupper($fromColumn);
-		$toColumn = strtoupper($toColumn);
-
-		if (($fromColumn !== NULL) && (isset($this->_columns[$fromColumn])) && ($toColumn !== NULL)) {
-			$this->_columns[$fromColumn]->setParent();
-			$this->_columns[$fromColumn]->setColumnIndex($toColumn);
-			$this->_columns[$toColumn] = $this->_columns[$fromColumn];
-			$this->_columns[$toColumn]->setParent($this);
-			unset($this->_columns[$fromColumn]);
-
-			ksort($this->_columns);
-		}
-
-		return $this;
-	}
-
-
-	/**
-	 *	Test if cell value is in the defined set of values
-	 *
-	 *	@param	mixed		$cellValue
-	 *	@param	mixed[]		$dataSet
-	 *	@return boolean
-	 */
-	private static function _filterTestInSimpleDataSet($cellValue,$dataSet)
-	{
-		$dataSetValues = $dataSet['filterValues'];
-		$blanks = $dataSet['blanks'];
-		if (($cellValue == '') || ($cellValue === NULL)) {
-			return $blanks;
-		}
-		return in_array($cellValue,$dataSetValues);
-	}
-
-	/**
-	 *	Test if cell value is in the defined set of Excel date values
-	 *
-	 *	@param	mixed		$cellValue
-	 *	@param	mixed[]		$dataSet
-	 *	@return boolean
-	 */
-	private static function _filterTestInDateGroupSet($cellValue,$dataSet)
-	{
-		$dateSet = $dataSet['filterValues'];
-		$blanks = $dataSet['blanks'];
-		if (($cellValue == '') || ($cellValue === NULL)) {
-			return $blanks;
-		}
-
-		if (is_numeric($cellValue)) {
-			$dateValue = PHPExcel_Shared_Date::ExcelToPHP($cellValue);
-			if ($cellValue < 1) {
-				//	Just the time part
-				$dtVal = date('His',$dateValue);
-				$dateSet = $dateSet['time'];
-			} elseif($cellValue == floor($cellValue)) {
-				//	Just the date part
-				$dtVal = date('Ymd',$dateValue);
-				$dateSet = $dateSet['date'];
-			} else {
-				//	date and time parts
-				$dtVal = date('YmdHis',$dateValue);
-				$dateSet = $dateSet['dateTime'];
-			}
-			foreach($dateSet as $dateValue) {
-				//	Use of substr to extract value at the appropriate group level
-				if (substr($dtVal,0,strlen($dateValue)) == $dateValue)
-					return TRUE;
-			}
-		}
-
-		return FALSE;
-	}
-
-	/**
-	 *	Test if cell value is within a set of values defined by a ruleset
-	 *
-	 *	@param	mixed		$cellValue
-	 *	@param	mixed[]		$dataSet
-	 *	@return boolean
-	 */
-	private static function _filterTestInCustomDataSet($cellValue,$ruleSet)
-	{
-		$dataSet = $ruleSet['filterRules'];
-		$join = $ruleSet['join'];
-		$customRuleForBlanks = isset($ruleSet['customRuleForBlanks']) ? $ruleSet['customRuleForBlanks'] : FALSE;
-
-		if (!$customRuleForBlanks) {
-			//	Blank cells are always ignored, so return a FALSE
-			if (($cellValue == '') || ($cellValue === NULL)) {
-				return FALSE;
-			}
-		}
-		$returnVal = ($join == PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND);
-		foreach($dataSet as $rule) {
-			if (is_numeric($rule['value'])) {
-				//	Numeric values are tested using the appropriate operator
-				switch ($rule['operator']) {
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
-						$retVal	= ($cellValue == $rule['value']);
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
-						$retVal	= ($cellValue != $rule['value']);
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN :
-						$retVal	= ($cellValue > $rule['value']);
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL :
-						$retVal	= ($cellValue >= $rule['value']);
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN :
-						$retVal	= ($cellValue < $rule['value']);
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL :
-						$retVal	= ($cellValue <= $rule['value']);
-						break;
-				}
-			} elseif($rule['value'] == '') {
-				switch ($rule['operator']) {
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
-						$retVal	= (($cellValue == '') || ($cellValue === NULL));
-						break;
-					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
-						$retVal	= (($cellValue != '') && ($cellValue !== NULL));
-						break;
-					default :
-						$retVal	= TRUE;
-						break;
-				}
-			} else {
-				//	String values are always tested for equality, factoring in for wildcards (hence a regexp test)
-				$retVal	= preg_match('/^'.$rule['value'].'$/i',$cellValue);
-			}
-			//	If there are multiple conditions, then we need to test both using the appropriate join operator
-			switch ($join) {
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR :
-					$returnVal = $returnVal || $retVal;
-					//	Break as soon as we have a TRUE match for OR joins,
-					//		to avoid unnecessary additional code execution
-					if ($returnVal)
-						return $returnVal;
-					break;
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND :
-					$returnVal = $returnVal && $retVal;
-					break;
-			}
-		}
-
-		return $returnVal;
-	}
-
-	/**
-	 *	Test if cell date value is matches a set of values defined by a set of months
-	 *
-	 *	@param	mixed		$cellValue
-	 *	@param	mixed[]		$dataSet
-	 *	@return boolean
-	 */
-	private static function _filterTestInPeriodDateSet($cellValue,$monthSet)
-	{
-		//	Blank cells are always ignored, so return a FALSE
-		if (($cellValue == '') || ($cellValue === NULL)) {
-			return FALSE;
-		}
-
-		if (is_numeric($cellValue)) {
-			$dateValue = date('m',PHPExcel_Shared_Date::ExcelToPHP($cellValue));
-			if (in_array($dateValue,$monthSet)) {
-				return TRUE;
-			}
-		}
-
-		return FALSE;
-	}
-
-	/**
-	 *	Search/Replace arrays to convert Excel wildcard syntax to a regexp syntax for preg_matching
-	 *
-	 *	@var	array
-	 */
-	private static $_fromReplace = array('\*', '\?', '~~', '~.*', '~.?');
-	private static $_toReplace   = array('.*', '.',  '~',  '\*',  '\?');
-
-
-	/**
-	 *	Convert a dynamic rule daterange to a custom filter range expression for ease of calculation
-	 *
-	 *	@param	string										$dynamicRuleType
-	 *	@param	PHPExcel_Worksheet_AutoFilter_Column		$filterColumn
-	 *	@return mixed[]
-	 */
-	private function _dynamicFilterDateRange($dynamicRuleType, &$filterColumn)
-	{
-		$rDateType = PHPExcel_Calculation_Functions::getReturnDateType();
-		PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC);
-		$val = $maxVal = NULL;
-
-		$ruleValues = array();
-		$baseDate = PHPExcel_Calculation_DateTime::DATENOW();
-		//	Calculate start/end dates for the required date range based on current date
-		switch ($dynamicRuleType) {
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
-				$baseDate = strtotime('-7 days',$baseDate);
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
-				$baseDate = strtotime('-7 days',$baseDate);
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
-				$baseDate = strtotime('-1 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
-				$baseDate = strtotime('+1 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
-				$baseDate = strtotime('-3 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
-				$baseDate = strtotime('+3 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
-				$baseDate = strtotime('-1 year',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
-				$baseDate = strtotime('+1 year',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-		}
-
-		switch ($dynamicRuleType) {
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TODAY :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
-				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day',$baseDate));
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate);
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE :
-				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day',$baseDate));
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1,date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
-				$maxVal = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,31,12,date('Y',$baseDate)));
-				++$maxVal;
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1,date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
-				$thisMonth = date('m',$baseDate);
-				$thisQuarter = floor(--$thisMonth / 3);
-				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0,0,0,date('t',$baseDate),(1+$thisQuarter)*3,date('Y',$baseDate)));
-				++$maxVal;
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1+$thisQuarter*3,date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
-				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0,0,0,date('t',$baseDate),date('m',$baseDate),date('Y',$baseDate)));
-				++$maxVal;
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
-				$dayOfWeek = date('w',$baseDate);
-				$val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate) - $dayOfWeek;
-				$maxVal = $val + 7;
-				break;
-		}
-
-		switch ($dynamicRuleType) {
-			//	Adjust Today dates for Yesterday and Tomorrow
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
-				--$maxVal;
-				--$val;
-				break;
-			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
-				++$maxVal;
-				++$val;
-				break;
-		}
-
-		//	Set the filter column rule attributes ready for writing
-		$filterColumn->setAttributes(array(	'val' => $val,
-											'maxVal' => $maxVal
-										  )
-									);
-
-		//	Set the rules for identifying rows for hide/show
-		$ruleValues[] = array( 'operator' => PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
-							   'value' => $val
-							 );
-		$ruleValues[] = array( 'operator' => PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN,
-							   'value' => $maxVal
-							 );
-		PHPExcel_Calculation_Functions::setReturnDateType($rDateType);
-
-		return array(
-			'method' => '_filterTestInCustomDataSet',
-			'arguments' => array( 'filterRules' => $ruleValues,
-								  'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND
-								)
-		);
-	}
-
-	private function _calculateTopTenValue($columnID,$startRow,$endRow,$ruleType,$ruleValue) {
-		$range = $columnID.$startRow.':'.$columnID.$endRow;
-		$dataValues = PHPExcel_Calculation_Functions::flattenArray(
-			$this->_workSheet->rangeToArray($range,NULL,TRUE,FALSE)
-		);
-
-		$dataValues = array_filter($dataValues);
-		if ($ruleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) {
-			rsort($dataValues);
-		} else {
-			sort($dataValues);
-		}
-
-		return array_pop(array_slice($dataValues,0,$ruleValue));
-	}
-
-	/**
-	 *	Apply the AutoFilter rules to the AutoFilter Range
-	 *
-	 *	@throws	PHPExcel_Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function showHideRows()
-	{
-		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
-
-		//	The heading row should always be visible
-//		echo 'AutoFilter Heading Row ',$rangeStart[1],' is always SHOWN',PHP_EOL;
-		$this->_workSheet->getRowDimension($rangeStart[1])->setVisible(TRUE);
-
-		$columnFilterTests = array();
-		foreach($this->_columns as $columnID => $filterColumn) {
-			$rules = $filterColumn->getRules();
-			switch ($filterColumn->getFilterType()) {
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER :
-					$ruleValues = array();
-					//	Build a list of the filter value selections
-					foreach($rules as $rule) {
-						$ruleType = $rule->getRuleType();
-						$ruleValues[] = $rule->getValue();
-					}
-					//	Test if we want to include blanks in our filter criteria
-					$blanks = FALSE;
-					$ruleDataSet = array_filter($ruleValues);
-					if (count($ruleValues) != count($ruleDataSet))
-						$blanks = TRUE;
-					if ($ruleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER) {
-						//	Filter on absolute values
-						$columnFilterTests[$columnID] = array(
-							'method' => '_filterTestInSimpleDataSet',
-							'arguments' => array( 'filterValues' => $ruleDataSet,
-												  'blanks' => $blanks
-												)
-						);
-					} else {
-						//	Filter on date group values
-						$arguments = array();
-						foreach($ruleDataSet as $ruleValue) {
-							$date = $time = '';
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== ''))
-								$date .= sprintf('%04d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != ''))
-								$date .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== ''))
-								$date .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== ''))
-								$time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== ''))
-								$time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
-							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND])) &&
-								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== ''))
-								$time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
-							$dateTime = $date . $time;
-							$arguments['date'][] = $date;
-							$arguments['time'][] = $time;
-							$arguments['dateTime'][] = $dateTime;
-						}
-						//	Remove empty elements
-						$arguments['date'] = array_filter($arguments['date']);
-						$arguments['time'] = array_filter($arguments['time']);
-						$arguments['dateTime'] = array_filter($arguments['dateTime']);
-						$columnFilterTests[$columnID] = array(
-							'method' => '_filterTestInDateGroupSet',
-							'arguments' => array( 'filterValues' => $arguments,
-												  'blanks' => $blanks
-												)
-						);
-					}
-					break;
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER :
-					$customRuleForBlanks = FALSE;
-					$ruleValues = array();
-					//	Build a list of the filter value selections
-					foreach($rules as $rule) {
-						$ruleType = $rule->getRuleType();
-						$ruleValue = $rule->getValue();
-						if (!is_numeric($ruleValue)) {
-							//	Convert to a regexp allowing for regexp reserved characters, wildcards and escaped wildcards
-							$ruleValue = preg_quote($ruleValue);
-							$ruleValue = str_replace(self::$_fromReplace,self::$_toReplace,$ruleValue);
-							if (trim($ruleValue) == '') {
-								$customRuleForBlanks = TRUE;
-								$ruleValue = trim($ruleValue);
-							}
-						}
-						$ruleValues[] = array( 'operator' => $rule->getOperator(),
-											   'value' => $ruleValue
-											 );
-					}
-					$join = $filterColumn->getJoin();
-					$columnFilterTests[$columnID] = array(
-						'method' => '_filterTestInCustomDataSet',
-						'arguments' => array( 'filterRules' => $ruleValues,
-											  'join' => $join,
-											  'customRuleForBlanks' => $customRuleForBlanks
-											)
-					);
-					break;
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER :
-					$ruleValues = array();
-					foreach($rules as $rule) {
-						//	We should only ever have one Dynamic Filter Rule anyway
-						$dynamicRuleType = $rule->getGrouping();
-						if (($dynamicRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE) ||
-							($dynamicRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)) {
-							//	Number (Average) based
-							//	Calculate the average
-							$averageFormula = '=AVERAGE('.$columnID.($rangeStart[1]+1).':'.$columnID.$rangeEnd[1].')';
-							$average = PHPExcel_Calculation::getInstance()->calculateFormula($averageFormula,NULL,$this->_workSheet->getCell('A1'));
-							//	Set above/below rule based on greaterThan or LessTan
-							$operator = ($dynamicRuleType === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
-								? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN
-								: PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN;
-							$ruleValues[] = array( 'operator' => $operator,
-												   'value' => $average
-												 );
-							$columnFilterTests[$columnID] = array(
-								'method' => '_filterTestInCustomDataSet',
-								'arguments' => array( 'filterRules' => $ruleValues,
-													  'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR
-													)
-							);
-						} else {
-							//	Date based
-							if ($dynamicRuleType{0} == 'M' || $dynamicRuleType{0} == 'Q') {
-								//	Month or Quarter
-								list($periodType,$period) = sscanf($dynamicRuleType,'%[A-Z]%d');
-								if ($periodType == 'M') {
-									$ruleValues = array($period);
-								} else {
-									--$period;
-									$periodEnd = (1+$period)*3;
-									$periodStart = 1+$period*3;
-									$ruleValues = range($periodStart,periodEnd);
-								}
-								$columnFilterTests[$columnID] = array(
-									'method' => '_filterTestInPeriodDateSet',
-									'arguments' => $ruleValues
-								);
-								$filterColumn->setAttributes(array());
-							} else {
-								//	Date Range
-								$columnFilterTests[$columnID] = $this->_dynamicFilterDateRange($dynamicRuleType, $filterColumn);
-								break;
-							}
-						}
-					}
-					break;
-				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER :
-					$ruleValues = array();
-					$dataRowCount = $rangeEnd[1] - $rangeStart[1];
-					foreach($rules as $rule) {
-						//	We should only ever have one Dynamic Filter Rule anyway
-						$toptenRuleType = $rule->getGrouping();
-						$ruleValue = $rule->getValue();
-						$ruleOperator = $rule->getOperator();
-					}
-					if ($ruleOperator === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) {
-						$ruleValue = floor($ruleValue * ($dataRowCount / 100));
-					}
-					if ($ruleValue < 1) $ruleValue = 1;
-					if ($ruleValue > 500) $ruleValue = 500;
-
-					$maxVal = $this->_calculateTopTenValue($columnID,$rangeStart[1]+1,$rangeEnd[1],$toptenRuleType,$ruleValue);
-
-					$operator = ($toptenRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP)
-						? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL
-						: PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL;
-					$ruleValues[] = array( 'operator' => $operator,
-										   'value' => $maxVal
-										 );
-					$columnFilterTests[$columnID] = array(
-						'method' => '_filterTestInCustomDataSet',
-						'arguments' => array( 'filterRules' => $ruleValues,
-											  'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR
-											)
-					);
-					$filterColumn->setAttributes(
-						array('maxVal' => $maxVal)
-					);
-					break;
-			}
-		}
-
-//		echo 'Column Filter Test CRITERIA',PHP_EOL;
-//		var_dump($columnFilterTests);
-//
-		//	Execute the column tests for each row in the autoFilter range to determine show/hide,
-		for ($row = $rangeStart[1]+1; $row <= $rangeEnd[1]; ++$row) {
-//			echo 'Testing Row = ',$row,PHP_EOL;
-			$result = TRUE;
-			foreach($columnFilterTests as $columnID => $columnFilterTest) {
-//				echo 'Testing cell ',$columnID.$row,PHP_EOL;
-				$cellValue = $this->_workSheet->getCell($columnID.$row)->getCalculatedValue();
-//				echo 'Value is ',$cellValue,PHP_EOL;
-				//	Execute the filter test
-				$result = $result &&
-					call_user_func_array(
-						array('PHPExcel_Worksheet_AutoFilter',$columnFilterTest['method']),
-						array(
-							$cellValue,
-							$columnFilterTest['arguments']
-						)
-					);
-//				echo (($result) ? 'VALID' : 'INVALID'),PHP_EOL;
-				//	If filter test has resulted in FALSE, exit the loop straightaway rather than running any more tests
-				if (!$result)
-					break;
-			}
-			//	Set show/hide for the row based on the result of the autoFilter result
-//			echo (($result) ? 'SHOW' : 'HIDE'),PHP_EOL;
-			$this->_workSheet->getRowDimension($row)->setVisible($result);
-		}
-
-		return $this;
-	}
-
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				if ($key == '_workSheet') {
-					//	Detach from worksheet
-					$this->$key = NULL;
-				} else {
-					$this->$key = clone $value;
-				}
-			} elseif ((is_array($value)) && ($key == '_columns')) {
-				//	The columns array of PHPExcel_Worksheet_AutoFilter objects
-				$this->$key = array();
-				foreach ($value as $k => $v) {
-					$this->$key[$k] = clone $v;
-					// attach the new cloned Column to this new cloned Autofilter object
-					$this->$key[$k]->setParent($this);
-				}
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-	/**
-	 * toString method replicates previous behavior by returning the range if object is
-	 *    referenced as a property of its parent.
-	 */
-	public function __toString() {
-		return (string) $this->_range;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/AutoFilter/Column.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/AutoFilter/Column.php
deleted file mode 100755
index d41c3ed59..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/AutoFilter/Column.php
+++ /dev/null
@@ -1,381 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Worksheet
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_AutoFilter_Column
- *
- * @category	PHPExcel
- * @package		PHPExcel_Worksheet
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_AutoFilter_Column
-{
-	const AUTOFILTER_FILTERTYPE_FILTER			= 'filters';
-	const AUTOFILTER_FILTERTYPE_CUSTOMFILTER	= 'customFilters';
-	//	Supports no more than 2 rules, with an And/Or join criteria
-	//		if more than 1 rule is defined
-	const AUTOFILTER_FILTERTYPE_DYNAMICFILTER	= 'dynamicFilter';
-	//	Even though the filter rule is constant, the filtered data can vary
-	//		e.g. filtered by date = TODAY
-	const AUTOFILTER_FILTERTYPE_TOPTENFILTER	= 'top10';
-
-	private static $_filterTypes = array(
-		//	Currently we're not handling
-		//		colorFilter
-		//		extLst
-		//		iconFilter
-		self::AUTOFILTER_FILTERTYPE_FILTER,
-		self::AUTOFILTER_FILTERTYPE_CUSTOMFILTER,
-		self::AUTOFILTER_FILTERTYPE_DYNAMICFILTER,
-		self::AUTOFILTER_FILTERTYPE_TOPTENFILTER,
-	);
-
-	/* Multiple Rule Connections */
-	const AUTOFILTER_COLUMN_JOIN_AND	= 'and';
-	const AUTOFILTER_COLUMN_JOIN_OR		= 'or';
-
-	private static $_ruleJoins = array(
-		self::AUTOFILTER_COLUMN_JOIN_AND,
-		self::AUTOFILTER_COLUMN_JOIN_OR,
-	);
-
-	/**
-	 * Autofilter
-	 *
-	 * @var PHPExcel_Worksheet_AutoFilter
-	 */
-	private $_parent = NULL;
-
-
-	/**
-	 * Autofilter Column Index
-	 *
-	 * @var string
-	 */
-	private $_columnIndex = '';
-
-
-	/**
-	 * Autofilter Column Filter Type
-	 *
-	 * @var string
-	 */
-	private $_filterType = self::AUTOFILTER_FILTERTYPE_FILTER;
-
-
-	/**
-	 * Autofilter Multiple Rules And/Or
-	 *
-	 * @var string
-	 */
-	private $_join = self::AUTOFILTER_COLUMN_JOIN_OR;
-
-
-	/**
-	 * Autofilter Column Rules
-	 *
-	 * @var array of PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	private $_ruleset = array();
-
-
-	/**
-	 * Autofilter Column Dynamic Attributes
-	 *
-	 * @var array of mixed
-	 */
-	private $_attributes = array();
-
-
-	/**
-	 * Create a new PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function __construct($pColumn, PHPExcel_Worksheet_AutoFilter $pParent = NULL)
-	{
-		$this->_columnIndex = $pColumn;
-		$this->_parent = $pParent;
-	}
-
-	/**
-	 * Get AutoFilter Column Index
-	 *
-	 * @return string
-	 */
-	public function getColumnIndex() {
-		return $this->_columnIndex;
-	}
-
-	/**
-	 *	Set AutoFilter Column Index
-	 *
-	 *	@param	string		$pColumn		Column (e.g. A)
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setColumnIndex($pColumn) {
-		// Uppercase coordinate
-		$pColumn = strtoupper($pColumn);
-		if ($this->_parent !== NULL) {
-			$this->_parent->testColumnInRange($pColumn);
-		}
-
-		$this->_columnIndex = $pColumn;
-
-		return $this;
-	}
-
-	/**
-	 * Get this Column's AutoFilter Parent
-	 *
-	 * @return PHPExcel_Worksheet_AutoFilter
-	 */
-	public function getParent() {
-		return $this->_parent;
-	}
-
-	/**
-	 * Set this Column's AutoFilter Parent
-	 *
-	 * @param PHPExcel_Worksheet_AutoFilter
-	 * @return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setParent(PHPExcel_Worksheet_AutoFilter $pParent = NULL) {
-		$this->_parent = $pParent;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Type
-	 *
-	 * @return string
-	 */
-	public function getFilterType() {
-		return $this->_filterType;
-	}
-
-	/**
-	 *	Set AutoFilter Type
-	 *
-	 *	@param	string		$pFilterType
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setFilterType($pFilterType = self::AUTOFILTER_FILTERTYPE_FILTER) {
-		if (!in_array($pFilterType,self::$_filterTypes)) {
-			throw new PHPExcel_Exception('Invalid filter type for column AutoFilter.');
-		}
-
-		$this->_filterType = $pFilterType;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Multiple Rules And/Or Join
-	 *
-	 * @return string
-	 */
-	public function getJoin() {
-		return $this->_join;
-	}
-
-	/**
-	 *	Set AutoFilter Multiple Rules And/Or
-	 *
-	 *	@param	string		$pJoin		And/Or
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setJoin($pJoin = self::AUTOFILTER_COLUMN_JOIN_OR) {
-		// Lowercase And/Or
-		$pJoin = strtolower($pJoin);
-		if (!in_array($pJoin,self::$_ruleJoins)) {
-			throw new PHPExcel_Exception('Invalid rule connection for column AutoFilter.');
-		}
-
-		$this->_join = $pJoin;
-
-		return $this;
-	}
-
-	/**
-	 *	Set AutoFilter Attributes
-	 *
-	 *	@param	string[]		$pAttributes
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setAttributes($pAttributes = array()) {
-		$this->_attributes = $pAttributes;
-
-		return $this;
-	}
-
-	/**
-	 *	Set An AutoFilter Attribute
-	 *
-	 *	@param	string		$pName		Attribute Name
-	 *	@param	string		$pValue		Attribute Value
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setAttribute($pName, $pValue) {
-		$this->_attributes[$pName] = $pValue;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Column Attributes
-	 *
-	 * @return string
-	 */
-	public function getAttributes() {
-		return $this->_attributes;
-	}
-
-	/**
-	 * Get specific AutoFilter Column Attribute
-	 *
-	 *	@param	string		$pName		Attribute Name
-	 * @return string
-	 */
-	public function getAttribute($pName) {
-		if (isset($this->_attributes[$pName]))
-			return $this->_attributes[$pName];
-		return NULL;
-	}
-
-	/**
-	 * Get all AutoFilter Column Rules
-	 *
-	 * @throws	PHPExcel_Exception
-	 * @return array of PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function getRules() {
-		return $this->_ruleset;
-	}
-
-	/**
-	 * Get a specified AutoFilter Column Rule
-	 *
-	 * @param	integer	$pIndex		Rule index in the ruleset array
-	 * @return	PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function getRule($pIndex) {
-		if (!isset($this->_ruleset[$pIndex])) {
-			$this->_ruleset[$pIndex] = new PHPExcel_Worksheet_AutoFilter_Column_Rule($this);
-		}
-		return $this->_ruleset[$pIndex];
-	}
-
-	/**
-	 * Create a new AutoFilter Column Rule in the ruleset
-	 *
-	 * @return	PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function createRule() {
-		$this->_ruleset[] = new PHPExcel_Worksheet_AutoFilter_Column_Rule($this);
-
-		return end($this->_ruleset);
-	}
-
-	/**
-	 * Add a new AutoFilter Column Rule to the ruleset
-	 *
-	 * @param	PHPExcel_Worksheet_AutoFilter_Column_Rule	$pRule
-	 * @param	boolean	$returnRule 	Flag indicating whether the rule object or the column object should be returned
-	 * @return	PHPExcel_Worksheet_AutoFilter_Column|PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function addRule(PHPExcel_Worksheet_AutoFilter_Column_Rule $pRule, $returnRule=TRUE) {
-		$pRule->setParent($this);
-		$this->_ruleset[] = $pRule;
-
-		return ($returnRule) ? $pRule : $this;
-	}
-
-	/**
-	 * Delete a specified AutoFilter Column Rule
-	 *	If the number of rules is reduced to 1, then we reset And/Or logic to Or
-	 *
-	 * @param	integer	$pIndex		Rule index in the ruleset array
-	 * @return	PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function deleteRule($pIndex) {
-		if (isset($this->_ruleset[$pIndex])) {
-			unset($this->_ruleset[$pIndex]);
-			//	If we've just deleted down to a single rule, then reset And/Or joining to Or
-			if (count($this->_ruleset) <= 1) {
-				$this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Delete all AutoFilter Column Rules
-	 *
-	 * @return	PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function clearRules() {
-		$this->_ruleset = array();
-		$this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
-
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				if ($key == '_parent') {
-					//	Detach from autofilter parent
-					$this->$key = NULL;
-				} else {
-					$this->$key = clone $value;
-				}
-			} elseif ((is_array($value)) && ($key == '_ruleset')) {
-				//	The columns array of PHPExcel_Worksheet_AutoFilter objects
-				$this->$key = array();
-				foreach ($value as $k => $v) {
-					$this->$key[$k] = clone $v;
-					// attach the new cloned Rule to this new cloned Autofilter Cloned object
-					$this->$key[$k]->setParent($this);
-				}
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
deleted file mode 100755
index 67f01259a..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
+++ /dev/null
@@ -1,462 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Worksheet
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_AutoFilter_Column_Rule
- *
- * @category	PHPExcel
- * @package		PHPExcel_Worksheet
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_AutoFilter_Column_Rule
-{
-	const AUTOFILTER_RULETYPE_FILTER		= 'filter';
-	const AUTOFILTER_RULETYPE_DATEGROUP		= 'dateGroupItem';
-	const AUTOFILTER_RULETYPE_CUSTOMFILTER	= 'customFilter';
-	const AUTOFILTER_RULETYPE_DYNAMICFILTER	= 'dynamicFilter';
-	const AUTOFILTER_RULETYPE_TOPTENFILTER	= 'top10Filter';
-
-	private static $_ruleTypes = array(
-		//	Currently we're not handling
-		//		colorFilter
-		//		extLst
-		//		iconFilter
-		self::AUTOFILTER_RULETYPE_FILTER,
-		self::AUTOFILTER_RULETYPE_DATEGROUP,
-		self::AUTOFILTER_RULETYPE_CUSTOMFILTER,
-		self::AUTOFILTER_RULETYPE_DYNAMICFILTER,
-		self::AUTOFILTER_RULETYPE_TOPTENFILTER,
-	);
-
-	const AUTOFILTER_RULETYPE_DATEGROUP_YEAR	= 'year';
-	const AUTOFILTER_RULETYPE_DATEGROUP_MONTH	= 'month';
-	const AUTOFILTER_RULETYPE_DATEGROUP_DAY		= 'day';
-	const AUTOFILTER_RULETYPE_DATEGROUP_HOUR	= 'hour';
-	const AUTOFILTER_RULETYPE_DATEGROUP_MINUTE	= 'minute';
-	const AUTOFILTER_RULETYPE_DATEGROUP_SECOND	= 'second';
-
-	private static $_dateTimeGroups = array(
-		self::AUTOFILTER_RULETYPE_DATEGROUP_YEAR,
-		self::AUTOFILTER_RULETYPE_DATEGROUP_MONTH,
-		self::AUTOFILTER_RULETYPE_DATEGROUP_DAY,
-		self::AUTOFILTER_RULETYPE_DATEGROUP_HOUR,
-		self::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE,
-		self::AUTOFILTER_RULETYPE_DATEGROUP_SECOND,
-	);
-
-	const AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY		= 'yesterday';
-	const AUTOFILTER_RULETYPE_DYNAMIC_TODAY			= 'today';
-	const AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW		= 'tomorrow';
-	const AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE	= 'yearToDate';
-	const AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR		= 'thisYear';
-	const AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER	= 'thisQuarter';
-	const AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH		= 'thisMonth';
-	const AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK		= 'thisWeek';
-	const AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR		= 'lastYear';
-	const AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER	= 'lastQuarter';
-	const AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH		= 'lastMonth';
-	const AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK		= 'lastWeek';
-	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR		= 'nextYear';
-	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER	= 'nextQuarter';
-	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH		= 'nextMonth';
-	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK		= 'nextWeek';
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1		= 'M1';
-	const AUTOFILTER_RULETYPE_DYNAMIC_JANUARY		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2		= 'M2';
-	const AUTOFILTER_RULETYPE_DYNAMIC_FEBRUARY		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3		= 'M3';
-	const AUTOFILTER_RULETYPE_DYNAMIC_MARCH			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4		= 'M4';
-	const AUTOFILTER_RULETYPE_DYNAMIC_APRIL			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5		= 'M5';
-	const AUTOFILTER_RULETYPE_DYNAMIC_MAY			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6		= 'M6';
-	const AUTOFILTER_RULETYPE_DYNAMIC_JUNE			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7		= 'M7';
-	const AUTOFILTER_RULETYPE_DYNAMIC_JULY			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8		= 'M8';
-	const AUTOFILTER_RULETYPE_DYNAMIC_AUGUST		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9		= 'M9';
-	const AUTOFILTER_RULETYPE_DYNAMIC_SEPTEMBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10		= 'M10';
-	const AUTOFILTER_RULETYPE_DYNAMIC_OCTOBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11		= 'M11';
-	const AUTOFILTER_RULETYPE_DYNAMIC_NOVEMBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11;
-	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12		= 'M12';
-	const AUTOFILTER_RULETYPE_DYNAMIC_DECEMBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12;
-	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1		= 'Q1';
-	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2		= 'Q2';
-	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3		= 'Q3';
-	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4		= 'Q4';
-	const AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE	= 'aboveAverage';
-	const AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE	= 'belowAverage';
-
-	private static $_dynamicTypes = array(
-		self::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_TODAY,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE,
-		self::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE,
-	);
-
-	/*
-	 *	The only valid filter rule operators for filter and customFilter types are:
-	 *		<xsd:enumeration value="equal"/>
-	 *		<xsd:enumeration value="lessThan"/>
-	 *		<xsd:enumeration value="lessThanOrEqual"/>
-	 *		<xsd:enumeration value="notEqual"/>
-	 *		<xsd:enumeration value="greaterThanOrEqual"/>
-	 *		<xsd:enumeration value="greaterThan"/>
-	 */
-	const AUTOFILTER_COLUMN_RULE_EQUAL				= 'equal';
-	const AUTOFILTER_COLUMN_RULE_NOTEQUAL			= 'notEqual';
-	const AUTOFILTER_COLUMN_RULE_GREATERTHAN		= 'greaterThan';
-	const AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL	= 'greaterThanOrEqual';
-	const AUTOFILTER_COLUMN_RULE_LESSTHAN			= 'lessThan';
-	const AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL	= 'lessThanOrEqual';
-
-	private static $_operators = array(
-		self::AUTOFILTER_COLUMN_RULE_EQUAL,
-		self::AUTOFILTER_COLUMN_RULE_NOTEQUAL,
-		self::AUTOFILTER_COLUMN_RULE_GREATERTHAN,
-		self::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
-		self::AUTOFILTER_COLUMN_RULE_LESSTHAN,
-		self::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL,
-	);
-
-	const AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE	= 'byValue';
-	const AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT		= 'byPercent';
-
-	private static $_topTenValue = array(
-		self::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE,
-		self::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT,
-	);
-
-	const AUTOFILTER_COLUMN_RULE_TOPTEN_TOP			= 'top';
-	const AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM		= 'bottom';
-
-	private static $_topTenType = array(
-		self::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP,
-		self::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM,
-	);
-
-
-	/* Rule Operators (Numeric, Boolean etc) */
-//	const AUTOFILTER_COLUMN_RULE_BETWEEN			= 'between';		//	greaterThanOrEqual 1 && lessThanOrEqual 2
-	/* Rule Operators (Numeric Special) which are translated to standard numeric operators with calculated values */
-//	const AUTOFILTER_COLUMN_RULE_TOPTEN				= 'topTen';			//	greaterThan calculated value
-//	const AUTOFILTER_COLUMN_RULE_TOPTENPERCENT		= 'topTenPercent';	//	greaterThan calculated value
-//	const AUTOFILTER_COLUMN_RULE_ABOVEAVERAGE		= 'aboveAverage';	//	Value is calculated as the average
-//	const AUTOFILTER_COLUMN_RULE_BELOWAVERAGE		= 'belowAverage';	//	Value is calculated as the average
-	/* Rule Operators (String) which are set as wild-carded values */
-//	const AUTOFILTER_COLUMN_RULE_BEGINSWITH			= 'beginsWith';			// A*
-//	const AUTOFILTER_COLUMN_RULE_ENDSWITH			= 'endsWith';			// *Z
-//	const AUTOFILTER_COLUMN_RULE_CONTAINS			= 'contains';			// *B*
-//	const AUTOFILTER_COLUMN_RULE_DOESNTCONTAIN		= 'notEqual';			//	notEqual *B*
-	/* Rule Operators (Date Special) which are translated to standard numeric operators with calculated values */
-//	const AUTOFILTER_COLUMN_RULE_BEFORE				= 'lessThan';
-//	const AUTOFILTER_COLUMN_RULE_AFTER				= 'greaterThan';
-//	const AUTOFILTER_COLUMN_RULE_YESTERDAY			= 'yesterday';
-//	const AUTOFILTER_COLUMN_RULE_TODAY				= 'today';
-//	const AUTOFILTER_COLUMN_RULE_TOMORROW			= 'tomorrow';
-//	const AUTOFILTER_COLUMN_RULE_LASTWEEK			= 'lastWeek';
-//	const AUTOFILTER_COLUMN_RULE_THISWEEK			= 'thisWeek';
-//	const AUTOFILTER_COLUMN_RULE_NEXTWEEK			= 'nextWeek';
-//	const AUTOFILTER_COLUMN_RULE_LASTMONTH			= 'lastMonth';
-//	const AUTOFILTER_COLUMN_RULE_THISMONTH			= 'thisMonth';
-//	const AUTOFILTER_COLUMN_RULE_NEXTMONTH			= 'nextMonth';
-//	const AUTOFILTER_COLUMN_RULE_LASTQUARTER		= 'lastQuarter';
-//	const AUTOFILTER_COLUMN_RULE_THISQUARTER		= 'thisQuarter';
-//	const AUTOFILTER_COLUMN_RULE_NEXTQUARTER		= 'nextQuarter';
-//	const AUTOFILTER_COLUMN_RULE_LASTYEAR			= 'lastYear';
-//	const AUTOFILTER_COLUMN_RULE_THISYEAR			= 'thisYear';
-//	const AUTOFILTER_COLUMN_RULE_NEXTYEAR			= 'nextYear';
-//	const AUTOFILTER_COLUMN_RULE_YEARTODATE			= 'yearToDate';			//	<dynamicFilter val="40909" type="yearToDate" maxVal="41113"/>
-//	const AUTOFILTER_COLUMN_RULE_ALLDATESINMONTH	= 'allDatesInMonth';	//	<dynamicFilter type="M2"/> for Month/February
-//	const AUTOFILTER_COLUMN_RULE_ALLDATESINQUARTER	= 'allDatesInQuarter';	//	<dynamicFilter type="Q2"/> for Quarter 2
-
-	/**
-	 * Autofilter Column
-	 *
-	 * @var PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	private $_parent = NULL;
-
-
-	/**
-	 * Autofilter Rule Type
-	 *
-	 * @var string
-	 */
-	private $_ruleType = self::AUTOFILTER_RULETYPE_FILTER;
-
-
-	/**
-	 * Autofilter Rule Value
-	 *
-	 * @var string
-	 */
-	private $_value = '';
-
-	/**
-	 * Autofilter Rule Operator
-	 *
-	 * @var string
-	 */
-	private $_operator = '';
-
-	/**
-	 * DateTimeGrouping Group Value
-	 *
-	 * @var string
-	 */
-	private $_grouping = '';
-
-
-	/**
-	 * Create a new PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function __construct(PHPExcel_Worksheet_AutoFilter_Column $pParent = NULL)
-	{
-		$this->_parent = $pParent;
-	}
-
-	/**
-	 * Get AutoFilter Rule Type
-	 *
-	 * @return string
-	 */
-	public function getRuleType() {
-		return $this->_ruleType;
-	}
-
-	/**
-	 *	Set AutoFilter Rule Type
-	 *
-	 *	@param	string		$pRuleType
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function setRuleType($pRuleType = self::AUTOFILTER_RULETYPE_FILTER) {
-		if (!in_array($pRuleType,self::$_ruleTypes)) {
-			throw new PHPExcel_Exception('Invalid rule type for column AutoFilter Rule.');
-		}
-
-		$this->_ruleType = $pRuleType;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Rule Value
-	 *
-	 * @return string
-	 */
-	public function getValue() {
-		return $this->_value;
-	}
-
-	/**
-	 *	Set AutoFilter Rule Value
-	 *
-	 *	@param	string|string[]		$pValue
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function setValue($pValue = '') {
-		if (is_array($pValue)) {
-			$grouping = -1;
-			foreach($pValue as $key => $value) {
-				//	Validate array entries
-				if (!in_array($key,self::$_dateTimeGroups)) {
-					//	Remove any invalid entries from the value array
-					unset($pValue[$key]);
-				} else {
-					//	Work out what the dateTime grouping will be
-					$grouping = max($grouping,array_search($key,self::$_dateTimeGroups));
-				}
-			}
-			if (count($pValue) == 0) {
-				throw new PHPExcel_Exception('Invalid rule value for column AutoFilter Rule.');
-			}
-			//	Set the dateTime grouping that we've anticipated
-			$this->setGrouping(self::$_dateTimeGroups[$grouping]);
-		}
-		$this->_value = $pValue;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Rule Operator
-	 *
-	 * @return string
-	 */
-	public function getOperator() {
-		return $this->_operator;
-	}
-
-	/**
-	 *	Set AutoFilter Rule Operator
-	 *
-	 *	@param	string		$pOperator
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function setOperator($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL) {
-		if (empty($pOperator))
-			$pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
-		if ((!in_array($pOperator,self::$_operators)) &&
-			(!in_array($pOperator,self::$_topTenValue))) {
-			throw new PHPExcel_Exception('Invalid operator for column AutoFilter Rule.');
-		}
-		$this->_operator = $pOperator;
-
-		return $this;
-	}
-
-	/**
-	 * Get AutoFilter Rule Grouping
-	 *
-	 * @return string
-	 */
-	public function getGrouping() {
-		return $this->_grouping;
-	}
-
-	/**
-	 *	Set AutoFilter Rule Grouping
-	 *
-	 *	@param	string		$pGrouping
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function setGrouping($pGrouping = NULL) {
-		if (($pGrouping !== NULL) &&
-			(!in_array($pGrouping,self::$_dateTimeGroups)) &&
-			(!in_array($pGrouping,self::$_dynamicTypes)) &&
-			(!in_array($pGrouping,self::$_topTenType))) {
-			throw new PHPExcel_Exception('Invalid rule type for column AutoFilter Rule.');
-		}
-
-		$this->_grouping = $pGrouping;
-
-		return $this;
-	}
-
-	/**
-	 *	Set AutoFilter Rule
-	 *
-	 *	@param	string				$pOperator
-	 *	@param	string|string[]		$pValue
-	 *	@param	string				$pGrouping
-	 *	@throws	Exception
-	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function setRule($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL, $pValue = '', $pGrouping = NULL) {
-		$this->setOperator($pOperator);
-		$this->setValue($pValue);
-		//	Only set grouping if it's been passed in as a user-supplied argument,
-		//		otherwise we're calculating it when we setValue() and don't want to overwrite that
-		//		If the user supplies an argumnet for grouping, then on their own head be it
-		if ($pGrouping !== NULL)
-			$this->setGrouping($pGrouping);
-
-		return $this;
-	}
-
-	/**
-	 * Get this Rule's AutoFilter Column Parent
-	 *
-	 * @return PHPExcel_Worksheet_AutoFilter_Column
-	 */
-	public function getParent() {
-		return $this->_parent;
-	}
-
-	/**
-	 * Set this Rule's AutoFilter Column Parent
-	 *
-	 * @param PHPExcel_Worksheet_AutoFilter_Column
-	 * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
-	 */
-	public function setParent(PHPExcel_Worksheet_AutoFilter_Column $pParent = NULL) {
-		$this->_parent = $pParent;
-
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				if ($key == '_parent') {
-					//	Detach from autofilter column parent
-					$this->$key = NULL;
-				} else {
-					$this->$key = clone $value;
-				}
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/BaseDrawing.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/BaseDrawing.php
deleted file mode 100755
index df7433415..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/BaseDrawing.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_BaseDrawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
-{
-	/**
-	 * Image counter
-	 *
-	 * @var int
-	 */
-	private static $_imageCounter = 0;
-
-	/**
-	 * Image index
-	 *
-	 * @var int
-	 */
-	private $_imageIndex = 0;
-
-	/**
-	 * Name
-	 *
-	 * @var string
-	 */
-	protected $_name;
-
-	/**
-	 * Description
-	 *
-	 * @var string
-	 */
-	protected $_description;
-
-	/**
-	 * Worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	protected $_worksheet;
-
-	/**
-	 * Coordinates
-	 *
-	 * @var string
-	 */
-	protected $_coordinates;
-
-	/**
-	 * Offset X
-	 *
-	 * @var int
-	 */
-	protected $_offsetX;
-
-	/**
-	 * Offset Y
-	 *
-	 * @var int
-	 */
-	protected $_offsetY;
-
-	/**
-	 * Width
-	 *
-	 * @var int
-	 */
-	protected $_width;
-
-	/**
-	 * Height
-	 *
-	 * @var int
-	 */
-	protected $_height;
-
-	/**
-	 * Proportional resize
-	 *
-	 * @var boolean
-	 */
-	protected $_resizeProportional;
-
-	/**
-	 * Rotation
-	 *
-	 * @var int
-	 */
-	protected $_rotation;
-
-	/**
-	 * Shadow
-	 *
-	 * @var PHPExcel_Worksheet_Drawing_Shadow
-	 */
-	protected $_shadow;
-
-    /**
-     * Create a new PHPExcel_Worksheet_BaseDrawing
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_name				= '';
-    	$this->_description			= '';
-    	$this->_worksheet			= null;
-    	$this->_coordinates			= 'A1';
-    	$this->_offsetX				= 0;
-    	$this->_offsetY				= 0;
-    	$this->_width				= 0;
-    	$this->_height				= 0;
-    	$this->_resizeProportional	= true;
-    	$this->_rotation			= 0;
-    	$this->_shadow				= new PHPExcel_Worksheet_Drawing_Shadow();
-
-		// Set image index
-		self::$_imageCounter++;
-		$this->_imageIndex 			= self::$_imageCounter;
-    }
-
-    /**
-     * Get image index
-     *
-     * @return int
-     */
-    public function getImageIndex() {
-    	return $this->_imageIndex;
-    }
-
-    /**
-     * Get Name
-     *
-     * @return string
-     */
-    public function getName() {
-    	return $this->_name;
-    }
-
-    /**
-     * Set Name
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setName($pValue = '') {
-    	$this->_name = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Description
-     *
-     * @return string
-     */
-    public function getDescription() {
-    	return $this->_description;
-    }
-
-    /**
-     * Set Description
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setDescription($pValue = '') {
-    	$this->_description = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Worksheet
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function getWorksheet() {
-    	return $this->_worksheet;
-    }
-
-    /**
-     * Set Worksheet
-     *
-     * @param 	PHPExcel_Worksheet 	$pValue
-     * @param 	bool				$pOverrideOld	If a Worksheet has already been assigned, overwrite it and remove image from old Worksheet?
-     * @throws 	Exception
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setWorksheet(PHPExcel_Worksheet $pValue = null, $pOverrideOld = false) {
-    	if (is_null($this->_worksheet)) {
-    		// Add drawing to PHPExcel_Worksheet
-	    	$this->_worksheet = $pValue;
-	    	$this->_worksheet->getCell($this->_coordinates);
-	    	$this->_worksheet->getDrawingCollection()->append($this);
-    	} else {
-    		if ($pOverrideOld) {
-    			// Remove drawing from old PHPExcel_Worksheet
-    			$iterator = $this->_worksheet->getDrawingCollection()->getIterator();
-
-    			while ($iterator->valid()) {
-    				if ($iterator->current()->getHashCode() == $this->getHashCode()) {
-    					$this->_worksheet->getDrawingCollection()->offsetUnset( $iterator->key() );
-    					$this->_worksheet = null;
-    					break;
-    				}
-    			}
-
-    			// Set new PHPExcel_Worksheet
-    			$this->setWorksheet($pValue);
-    		} else {
-    			throw new Exception("A PHPExcel_Worksheet has already been assigned. Drawings can only exist on one PHPExcel_Worksheet.");
-    		}
-    	}
-    	return $this;
-    }
-
-    /**
-     * Get Coordinates
-     *
-     * @return string
-     */
-    public function getCoordinates() {
-    	return $this->_coordinates;
-    }
-
-    /**
-     * Set Coordinates
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setCoordinates($pValue = 'A1') {
-    	$this->_coordinates = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OffsetX
-     *
-     * @return int
-     */
-    public function getOffsetX() {
-    	return $this->_offsetX;
-    }
-
-    /**
-     * Set OffsetX
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setOffsetX($pValue = 0) {
-    	$this->_offsetX = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OffsetY
-     *
-     * @return int
-     */
-    public function getOffsetY() {
-    	return $this->_offsetY;
-    }
-
-    /**
-     * Set OffsetY
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setOffsetY($pValue = 0) {
-    	$this->_offsetY = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Width
-     *
-     * @return int
-     */
-    public function getWidth() {
-    	return $this->_width;
-    }
-
-    /**
-     * Set Width
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setWidth($pValue = 0) {
-    	// Resize proportional?
-    	if ($this->_resizeProportional && $pValue != 0) {
-    		$ratio = $this->_height / $this->_width;
-    		$this->_height = round($ratio * $pValue);
-    	}
-
-    	// Set width
-    	$this->_width = $pValue;
-
-    	return $this;
-    }
-
-    /**
-     * Get Height
-     *
-     * @return int
-     */
-    public function getHeight() {
-    	return $this->_height;
-    }
-
-    /**
-     * Set Height
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setHeight($pValue = 0) {
-    	// Resize proportional?
-    	if ($this->_resizeProportional && $pValue != 0) {
-    		$ratio = $this->_width / $this->_height;
-    		$this->_width = round($ratio * $pValue);
-    	}
-
-    	// Set height
-    	$this->_height = $pValue;
-
-    	return $this;
-    }
-
-    /**
-     * Set width and height with proportional resize
-	 * Example:
-	 * <code>
-	 * $objDrawing->setResizeProportional(true);
-	 * $objDrawing->setWidthAndHeight(160,120);
-	 * </code>
-	 *
-     * @author Vincent@luo MSN:kele_100@hotmail.com
-     * @param int $width
-     * @param int $height
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-	public function setWidthAndHeight($width = 0, $height = 0) {
-		$xratio = $width / $this->_width;
-		$yratio = $height / $this->_height;
-		if ($this->_resizeProportional && !($width == 0 || $height == 0)) {
-			if (($xratio * $this->_height) < $height) {
-				$this->_height = ceil($xratio * $this->_height);
-				$this->_width  = $width;
-			} else {
-				$this->_width	= ceil($yratio * $this->_width);
-				$this->_height	= $height;
-			}
-		}
-		return $this;
-	}
-
-    /**
-     * Get ResizeProportional
-     *
-     * @return boolean
-     */
-    public function getResizeProportional() {
-    	return $this->_resizeProportional;
-    }
-
-    /**
-     * Set ResizeProportional
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setResizeProportional($pValue = true) {
-    	$this->_resizeProportional = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Rotation
-     *
-     * @return int
-     */
-    public function getRotation() {
-    	return $this->_rotation;
-    }
-
-    /**
-     * Set Rotation
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setRotation($pValue = 0) {
-    	$this->_rotation = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Shadow
-     *
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function getShadow() {
-    	return $this->_shadow;
-    }
-
-    /**
-     * Set Shadow
-     *
-     * @param 	PHPExcel_Worksheet_Drawing_Shadow $pValue
-     * @throws 	Exception
-     * @return PHPExcel_Worksheet_BaseDrawing
-     */
-    public function setShadow(PHPExcel_Worksheet_Drawing_Shadow $pValue = null) {
-   		$this->_shadow = $pValue;
-   		return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_name
-    		. $this->_description
-    		. $this->_worksheet->getHashCode()
-    		. $this->_coordinates
-    		. $this->_offsetX
-    		. $this->_offsetY
-    		. $this->_width
-    		. $this->_height
-    		. $this->_rotation
-    		. $this->_shadow->getHashCode()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/CellIterator.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/CellIterator.php
deleted file mode 100755
index 2378340d8..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/CellIterator.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_CellIterator
- *
- * Used to iterate rows in a PHPExcel_Worksheet
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_CellIterator implements Iterator
-{
-	/**
-	 * PHPExcel_Worksheet to iterate
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_subject;
-
-	/**
-	 * Row index
-	 *
-	 * @var int
-	 */
-	private $_rowIndex;
-
-	/**
-	 * Current iterator position
-	 *
-	 * @var int
-	 */
-	private $_position = 0;
-
-	/**
-	 * Loop only existing cells
-	 *
-	 * @var boolean
-	 */
-	private $_onlyExistingCells = true;
-
-	/**
-	 * Create a new cell iterator
-	 *
-	 * @param PHPExcel_Worksheet 		$subject
-	 * @param int						$rowIndex
-	 */
-	public function __construct(PHPExcel_Worksheet $subject = null, $rowIndex = 1) {
-		// Set subject and row index
-		$this->_subject 	= $subject;
-		$this->_rowIndex 	= $rowIndex;
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		unset($this->_subject);
-	}
-
-	/**
-	 * Rewind iterator
-	 */
-    public function rewind() {
-        $this->_position = 0;
-    }
-
-    /**
-     * Current PHPExcel_Cell
-     *
-     * @return PHPExcel_Cell
-     */
-    public function current() {
-		return $this->_subject->getCellByColumnAndRow($this->_position, $this->_rowIndex);
-    }
-
-    /**
-     * Current key
-     *
-     * @return int
-     */
-    public function key() {
-        return $this->_position;
-    }
-
-    /**
-     * Next value
-     */
-    public function next() {
-        ++$this->_position;
-    }
-
-    /**
-     * Are there any more PHPExcel_Cell instances available?
-     *
-     * @return boolean
-     */
-    public function valid() {
-        // columnIndexFromString() returns an index based at one,
-        // treat it as a count when comparing it to the base zero
-        // position.
-        $columnCount = PHPExcel_Cell::columnIndexFromString($this->_subject->getHighestColumn());
-
-        if ($this->_onlyExistingCells) {
-            // If we aren't looking at an existing cell, either
-            // because the first column doesn't exist or next() has
-            // been called onto a nonexistent cell, then loop until we
-            // find one, or pass the last column.
-            while ($this->_position < $columnCount &&
-                   !$this->_subject->cellExistsByColumnAndRow($this->_position, $this->_rowIndex)) {
-                ++$this->_position;
-            }
-        }
-
-        return $this->_position < $columnCount;
-    }
-
-	/**
-	 * Get loop only existing cells
-	 *
-	 * @return boolean
-	 */
-    public function getIterateOnlyExistingCells() {
-    	return $this->_onlyExistingCells;
-    }
-
-	/**
-	 * Set the iterator to loop only existing cells
-	 *
-	 * @param	boolean		$value
-	 */
-    public function setIterateOnlyExistingCells($value = true) {
-    	$this->_onlyExistingCells = $value;
-    }
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/ColumnDimension.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/ColumnDimension.php
deleted file mode 100755
index 6f2cc578b..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/ColumnDimension.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_ColumnDimension
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_ColumnDimension
-{
-	/**
-	 * Column index
-	 *
-	 * @var int
-	 */
-	private $_columnIndex;
-
-	/**
-	 * Column width
-	 *
-	 * When this is set to a negative value, the column width should be ignored by IWriter
-	 *
-	 * @var double
-	 */
-	private $_width			= -1;
-
-	/**
-	 * Auto size?
-	 *
-	 * @var bool
-	 */
-	private $_autoSize		= false;
-
-	/**
-	 * Visible?
-	 *
-	 * @var bool
-	 */
-	private $_visible		= true;
-
-	/**
-	 * Outline level
-	 *
-	 * @var int
-	 */
-	private $_outlineLevel	= 0;
-
-	/**
-	 * Collapsed
-	 *
-	 * @var bool
-	 */
-	private $_collapsed		= false;
-
-	/**
-	 * Index to cellXf
-	 *
-	 * @var int
-	 */
-	private $_xfIndex;
-
-    /**
-     * Create a new PHPExcel_Worksheet_ColumnDimension
-     *
-     * @param string $pIndex Character column index
-     */
-    public function __construct($pIndex = 'A')
-    {
-    	// Initialise values
-    	$this->_columnIndex		= $pIndex;
-
-		// set default index to cellXf
-		$this->_xfIndex = 0;
-    }
-
-    /**
-     * Get ColumnIndex
-     *
-     * @return string
-     */
-    public function getColumnIndex() {
-    	return $this->_columnIndex;
-    }
-
-    /**
-     * Set ColumnIndex
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setColumnIndex($pValue) {
-    	$this->_columnIndex = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Width
-     *
-     * @return double
-     */
-    public function getWidth() {
-    	return $this->_width;
-    }
-
-    /**
-     * Set Width
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setWidth($pValue = -1) {
-    	$this->_width = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Auto Size
-     *
-     * @return bool
-     */
-    public function getAutoSize() {
-    	return $this->_autoSize;
-    }
-
-    /**
-     * Set Auto Size
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setAutoSize($pValue = false) {
-    	$this->_autoSize = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Visible
-     *
-     * @return bool
-     */
-    public function getVisible() {
-    	return $this->_visible;
-    }
-
-    /**
-     * Set Visible
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setVisible($pValue = true) {
-    	$this->_visible = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Outline Level
-     *
-     * @return int
-     */
-    public function getOutlineLevel() {
-    	return $this->_outlineLevel;
-    }
-
-    /**
-     * Set Outline Level
-     *
-     * Value must be between 0 and 7
-     *
-     * @param int $pValue
-     * @throws Exception
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setOutlineLevel($pValue) {
-    	if ($pValue < 0 || $pValue > 7) {
-    		throw new Exception("Outline level must range between 0 and 7.");
-    	}
-
-    	$this->_outlineLevel = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Collapsed
-     *
-     * @return bool
-     */
-    public function getCollapsed() {
-    	return $this->_collapsed;
-    }
-
-    /**
-     * Set Collapsed
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_ColumnDimension
-     */
-    public function setCollapsed($pValue = true) {
-    	$this->_collapsed = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get index to cellXf
-	 *
-	 * @return int
-	 */
-	public function getXfIndex()
-	{
-		return $this->_xfIndex;
-	}
-
-	/**
-	 * Set index to cellXf
-	 *
-	 * @param int $pValue
-	 * @return PHPExcel_Worksheet_ColumnDimension
-	 */
-	public function setXfIndex($pValue = 0)
-	{
-		$this->_xfIndex = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/Drawing.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/Drawing.php
deleted file mode 100755
index 1c5f434a8..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/Drawing.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_Drawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_Drawing extends PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
-{
-	/**
-	 * Path
-	 *
-	 * @var string
-	 */
-	private $_path;
-
-    /**
-     * Create a new PHPExcel_Worksheet_Drawing
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_path				= '';
-
-    	// Initialize parent
-    	parent::__construct();
-    }
-
-    /**
-     * Get Filename
-     *
-     * @return string
-     */
-    public function getFilename() {
-    	return basename($this->_path);
-    }
-
-    /**
-     * Get indexed filename (using image index)
-     *
-     * @return string
-     */
-    public function getIndexedFilename() {
-    	$fileName = $this->getFilename();
-    	$fileName = str_replace(' ', '_', $fileName);
-    	return str_replace('.' . $this->getExtension(), '', $fileName) . $this->getImageIndex() . '.' . $this->getExtension();
-    }
-
-    /**
-     * Get Extension
-     *
-     * @return string
-     */
-    public function getExtension() {
-    	$exploded = explode(".", basename($this->_path));
-    	return $exploded[count($exploded) - 1];
-    }
-
-    /**
-     * Get Path
-     *
-     * @return string
-     */
-    public function getPath() {
-    	return $this->_path;
-    }
-
-    /**
-     * Set Path
-     *
-     * @param 	string 		$pValue			File path
-     * @param 	boolean		$pVerifyFile	Verify file
-     * @throws 	Exception
-     * @return PHPExcel_Worksheet_Drawing
-     */
-    public function setPath($pValue = '', $pVerifyFile = true) {
-    	if ($pVerifyFile) {
-	    	if (file_exists($pValue)) {
-	    		$this->_path = $pValue;
-
-	    		if ($this->_width == 0 && $this->_height == 0) {
-	    			// Get width/height
-	    			list($this->_width, $this->_height) = getimagesize($pValue);
-	    		}
-	    	} else {
-	    		throw new Exception("File $pValue not found!");
-	    	}
-    	} else {
-    		$this->_path = $pValue;
-    	}
-    	return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_path
-    		. parent::getHashCode()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/Drawing/Shadow.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/Drawing/Shadow.php
deleted file mode 100755
index 644fc652b..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/Drawing/Shadow.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_Drawing_Shadow
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
-{
-	/* Shadow alignment */
-	const SHADOW_BOTTOM							= 'b';
-	const SHADOW_BOTTOM_LEFT					= 'bl';
-	const SHADOW_BOTTOM_RIGHT					= 'br';
-	const SHADOW_CENTER							= 'ctr';
-	const SHADOW_LEFT							= 'l';
-	const SHADOW_TOP							= 't';
-	const SHADOW_TOP_LEFT						= 'tl';
-	const SHADOW_TOP_RIGHT						= 'tr';
-
-	/**
-	 * Visible
-	 *
-	 * @var boolean
-	 */
-	private $_visible;
-
-	/**
-	 * Blur radius
-	 *
-	 * Defaults to 6
-	 *
-	 * @var int
-	 */
-	private $_blurRadius;
-
-	/**
-	 * Shadow distance
-	 *
-	 * Defaults to 2
-	 *
-	 * @var int
-	 */
-	private $_distance;
-
-	/**
-	 * Shadow direction (in degrees)
-	 *
-	 * @var int
-	 */
-	private $_direction;
-
-	/**
-	 * Shadow alignment
-	 *
-	 * @var int
-	 */
-	private $_alignment;
-
-	/**
-	 * Color
-	 *
-	 * @var PHPExcel_Style_Color
-	 */
-	private $_color;
-
-	/**
-	 * Alpha
-	 *
-	 * @var int
-	 */
-	private $_alpha;
-
-    /**
-     * Create a new PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_visible				= false;
-    	$this->_blurRadius			= 6;
-    	$this->_distance			= 2;
-    	$this->_direction			= 0;
-    	$this->_alignment			= PHPExcel_Worksheet_Drawing_Shadow::SHADOW_BOTTOM_RIGHT;
-    	$this->_color				= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK);
-    	$this->_alpha				= 50;
-    }
-
-    /**
-     * Get Visible
-     *
-     * @return boolean
-     */
-    public function getVisible() {
-    	return $this->_visible;
-    }
-
-    /**
-     * Set Visible
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setVisible($pValue = false) {
-    	$this->_visible = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Blur radius
-     *
-     * @return int
-     */
-    public function getBlurRadius() {
-    	return $this->_blurRadius;
-    }
-
-    /**
-     * Set Blur radius
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setBlurRadius($pValue = 6) {
-    	$this->_blurRadius = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Shadow distance
-     *
-     * @return int
-     */
-    public function getDistance() {
-    	return $this->_distance;
-    }
-
-    /**
-     * Set Shadow distance
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setDistance($pValue = 2) {
-    	$this->_distance = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Shadow direction (in degrees)
-     *
-     * @return int
-     */
-    public function getDirection() {
-    	return $this->_direction;
-    }
-
-    /**
-     * Set Shadow direction (in degrees)
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setDirection($pValue = 0) {
-    	$this->_direction = $pValue;
-    	return $this;
-    }
-
-   /**
-     * Get Shadow alignment
-     *
-     * @return int
-     */
-    public function getAlignment() {
-    	return $this->_alignment;
-    }
-
-    /**
-     * Set Shadow alignment
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setAlignment($pValue = 0) {
-    	$this->_alignment = $pValue;
-    	return $this;
-    }
-
-   /**
-     * Get Color
-     *
-     * @return PHPExcel_Style_Color
-     */
-    public function getColor() {
-    	return $this->_color;
-    }
-
-    /**
-     * Set Color
-     *
-     * @param 	PHPExcel_Style_Color $pValue
-     * @throws 	Exception
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setColor(PHPExcel_Style_Color $pValue = null) {
-   		$this->_color = $pValue;
-   		return $this;
-    }
-
-   /**
-     * Get Alpha
-     *
-     * @return int
-     */
-    public function getAlpha() {
-    	return $this->_alpha;
-    }
-
-    /**
-     * Set Alpha
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_Drawing_Shadow
-     */
-    public function setAlpha($pValue = 0) {
-    	$this->_alpha = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  ($this->_visible ? 't' : 'f')
-    		. $this->_blurRadius
-    		. $this->_distance
-    		. $this->_direction
-    		. $this->_alignment
-    		. $this->_color->getHashCode()
-    		. $this->_alpha
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/HeaderFooter.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/HeaderFooter.php
deleted file mode 100755
index 48e2d694d..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/HeaderFooter.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_HeaderFooter
- *
- * <code>
- * Header/Footer Formatting Syntax taken from Office Open XML Part 4 - Markup Language Reference, page 1970:
- *
- * There are a number of formatting codes that can be written inline with the actual header / footer text, which
- * affect the formatting in the header or footer.
- *
- * Example: This example shows the text "Center Bold Header" on the first line (center section), and the date on
- * the second line (center section).
- * 		&CCenter &"-,Bold"Bold&"-,Regular"Header_x000A_&D
- *
- * General Rules:
- * There is no required order in which these codes must appear.
- *
- * The first occurrence of the following codes turns the formatting ON, the second occurrence turns it OFF again:
- * - strikethrough
- * - superscript
- * - subscript
- * Superscript and subscript cannot both be ON at same time. Whichever comes first wins and the other is ignored,
- * while the first is ON.
- * &L - code for "left section" (there are three header / footer locations, "left", "center", and "right"). When
- * two or more occurrences of this section marker exist, the contents from all markers are concatenated, in the
- * order of appearance, and placed into the left section.
- * &P - code for "current page #"
- * &N - code for "total pages"
- * &font size - code for "text font size", where font size is a font size in points.
- * &K - code for "text font color"
- * RGB Color is specified as RRGGBB
- * Theme Color is specifed as TTSNN where TT is the theme color Id, S is either "+" or "-" of the tint/shade
- * value, NN is the tint/shade value.
- * &S - code for "text strikethrough" on / off
- * &X - code for "text super script" on / off
- * &Y - code for "text subscript" on / off
- * &C - code for "center section". When two or more occurrences of this section marker exist, the contents
- * from all markers are concatenated, in the order of appearance, and placed into the center section.
- *
- * &D - code for "date"
- * &T - code for "time"
- * &G - code for "picture as background"
- * &U - code for "text single underline"
- * &E - code for "double underline"
- * &R - code for "right section". When two or more occurrences of this section marker exist, the contents
- * from all markers are concatenated, in the order of appearance, and placed into the right section.
- * &Z - code for "this workbook's file path"
- * &F - code for "this workbook's file name"
- * &A - code for "sheet tab name"
- * &+ - code for add to page #.
- * &- - code for subtract from page #.
- * &"font name,font type" - code for "text font name" and "text font type", where font name and font type
- * are strings specifying the name and type of the font, separated by a comma. When a hyphen appears in font
- * name, it means "none specified". Both of font name and font type can be localized values.
- * &"-,Bold" - code for "bold font style"
- * &B - also means "bold font style".
- * &"-,Regular" - code for "regular font style"
- * &"-,Italic" - code for "italic font style"
- * &I - also means "italic font style"
- * &"-,Bold Italic" code for "bold italic font style"
- * &O - code for "outline style"
- * &H - code for "shadow style"
- * </code>
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_HeaderFooter
-{
-	/* Header/footer image location */
-	const IMAGE_HEADER_LEFT							= 'LH';
-	const IMAGE_HEADER_CENTER						= 'CH';
-	const IMAGE_HEADER_RIGHT						= 'RH';
-	const IMAGE_FOOTER_LEFT							= 'LF';
-	const IMAGE_FOOTER_CENTER						= 'CF';
-	const IMAGE_FOOTER_RIGHT						= 'RF';
-
-	/**
-	 * OddHeader
-	 *
-	 * @var string
-	 */
-	private $_oddHeader			= '';
-
-	/**
-	 * OddFooter
-	 *
-	 * @var string
-	 */
-	private $_oddFooter			= '';
-
-	/**
-	 * EvenHeader
-	 *
-	 * @var string
-	 */
-	private $_evenHeader		= '';
-
-	/**
-	 * EvenFooter
-	 *
-	 * @var string
-	 */
-	private $_evenFooter		= '';
-
-	/**
-	 * FirstHeader
-	 *
-	 * @var string
-	 */
-	private $_firstHeader		= '';
-
-	/**
-	 * FirstFooter
-	 *
-	 * @var string
-	 */
-	private $_firstFooter		= '';
-
-	/**
-	 * Different header for Odd/Even, defaults to false
-	 *
-	 * @var boolean
-	 */
-	private $_differentOddEven	= false;
-
-	/**
-	 * Different header for first page, defaults to false
-	 *
-	 * @var boolean
-	 */
-	private $_differentFirst	= false;
-
-	/**
-	 * Scale with document, defaults to true
-	 *
-	 * @var boolean
-	 */
-	private $_scaleWithDocument	= true;
-
-	/**
-	 * Align with margins, defaults to true
-	 *
-	 * @var boolean
-	 */
-	private $_alignWithMargins	= true;
-
-	/**
-	 * Header/footer images
-	 *
-	 * @var PHPExcel_Worksheet_HeaderFooterDrawing[]
-	 */
-	private $_headerFooterImages = array();
-
-    /**
-     * Create a new PHPExcel_Worksheet_HeaderFooter
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Get OddHeader
-     *
-     * @return string
-     */
-    public function getOddHeader() {
-    	return $this->_oddHeader;
-    }
-
-    /**
-     * Set OddHeader
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setOddHeader($pValue) {
-    	$this->_oddHeader = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OddFooter
-     *
-     * @return string
-     */
-    public function getOddFooter() {
-    	return $this->_oddFooter;
-    }
-
-    /**
-     * Set OddFooter
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setOddFooter($pValue) {
-    	$this->_oddFooter = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get EvenHeader
-     *
-     * @return string
-     */
-    public function getEvenHeader() {
-    	return $this->_evenHeader;
-    }
-
-    /**
-     * Set EvenHeader
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setEvenHeader($pValue) {
-    	$this->_evenHeader = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get EvenFooter
-     *
-     * @return string
-     */
-    public function getEvenFooter() {
-    	return $this->_evenFooter;
-    }
-
-    /**
-     * Set EvenFooter
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setEvenFooter($pValue) {
-    	$this->_evenFooter = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get FirstHeader
-     *
-     * @return string
-     */
-    public function getFirstHeader() {
-    	return $this->_firstHeader;
-    }
-
-    /**
-     * Set FirstHeader
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setFirstHeader($pValue) {
-    	$this->_firstHeader = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get FirstFooter
-     *
-     * @return string
-     */
-    public function getFirstFooter() {
-    	return $this->_firstFooter;
-    }
-
-    /**
-     * Set FirstFooter
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setFirstFooter($pValue) {
-    	$this->_firstFooter = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get DifferentOddEven
-     *
-     * @return boolean
-     */
-    public function getDifferentOddEven() {
-    	return $this->_differentOddEven;
-    }
-
-    /**
-     * Set DifferentOddEven
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setDifferentOddEven($pValue = false) {
-    	$this->_differentOddEven = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get DifferentFirst
-     *
-     * @return boolean
-     */
-    public function getDifferentFirst() {
-    	return $this->_differentFirst;
-    }
-
-    /**
-     * Set DifferentFirst
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setDifferentFirst($pValue = false) {
-    	$this->_differentFirst = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get ScaleWithDocument
-     *
-     * @return boolean
-     */
-    public function getScaleWithDocument() {
-    	return $this->_scaleWithDocument;
-    }
-
-    /**
-     * Set ScaleWithDocument
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setScaleWithDocument($pValue = true) {
-    	$this->_scaleWithDocument = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get AlignWithMargins
-     *
-     * @return boolean
-     */
-    public function getAlignWithMargins() {
-    	return $this->_alignWithMargins;
-    }
-
-    /**
-     * Set AlignWithMargins
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setAlignWithMargins($pValue = true) {
-    	$this->_alignWithMargins = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Add header/footer image
-     *
-     * @param PHPExcel_Worksheet_HeaderFooterDrawing $image
-     * @param string $location
-     * @throws Exception
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function addImage(PHPExcel_Worksheet_HeaderFooterDrawing $image = null, $location = self::IMAGE_HEADER_LEFT) {
-    	$this->_headerFooterImages[$location] = $image;
-    	return $this;
-    }
-
-    /**
-     * Remove header/footer image
-     *
-     * @param string $location
-     * @throws Exception
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function removeImage($location = self::IMAGE_HEADER_LEFT) {
-    	if (isset($this->_headerFooterImages[$location])) {
-    		unset($this->_headerFooterImages[$location]);
-    	}
-    	return $this;
-    }
-
-    /**
-     * Set header/footer images
-     *
-     * @param PHPExcel_Worksheet_HeaderFooterDrawing[] $images
-     * @throws Exception
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setImages($images) {
-    	if (!is_array($images)) {
-    		throw new Exception('Invalid parameter!');
-    	}
-
-    	$this->_headerFooterImages = $images;
-    	return $this;
-    }
-
-    /**
-     * Get header/footer images
-     *
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing[]
-     */
-    public function getImages() {
-    	// Sort array
-    	$images = array();
-    	if (isset($this->_headerFooterImages[self::IMAGE_HEADER_LEFT])) 	$images[self::IMAGE_HEADER_LEFT] = 		$this->_headerFooterImages[self::IMAGE_HEADER_LEFT];
-    	if (isset($this->_headerFooterImages[self::IMAGE_HEADER_CENTER])) 	$images[self::IMAGE_HEADER_CENTER] = 	$this->_headerFooterImages[self::IMAGE_HEADER_CENTER];
-    	if (isset($this->_headerFooterImages[self::IMAGE_HEADER_RIGHT])) 	$images[self::IMAGE_HEADER_RIGHT] = 	$this->_headerFooterImages[self::IMAGE_HEADER_RIGHT];
-    	if (isset($this->_headerFooterImages[self::IMAGE_FOOTER_LEFT])) 	$images[self::IMAGE_FOOTER_LEFT] = 		$this->_headerFooterImages[self::IMAGE_FOOTER_LEFT];
-    	if (isset($this->_headerFooterImages[self::IMAGE_FOOTER_CENTER])) 	$images[self::IMAGE_FOOTER_CENTER] = 	$this->_headerFooterImages[self::IMAGE_FOOTER_CENTER];
-    	if (isset($this->_headerFooterImages[self::IMAGE_FOOTER_RIGHT])) 	$images[self::IMAGE_FOOTER_RIGHT] = 	$this->_headerFooterImages[self::IMAGE_FOOTER_RIGHT];
-    	$this->_headerFooterImages = $images;
-
-    	return $this->_headerFooterImages;
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/HeaderFooterDrawing.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/HeaderFooterDrawing.php
deleted file mode 100755
index 3fd1e35ee..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/HeaderFooterDrawing.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_HeaderFooterDrawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing implements PHPExcel_IComparable
-{
-	/**
-	 * Path
-	 *
-	 * @var string
-	 */
-	private $_path;
-
-	/**
-	 * Name
-	 *
-	 * @var string
-	 */
-	protected $_name;
-
-	/**
-	 * Offset X
-	 *
-	 * @var int
-	 */
-	protected $_offsetX;
-
-	/**
-	 * Offset Y
-	 *
-	 * @var int
-	 */
-	protected $_offsetY;
-
-	/**
-	 * Width
-	 *
-	 * @var int
-	 */
-	protected $_width;
-
-	/**
-	 * Height
-	 *
-	 * @var int
-	 */
-	protected $_height;
-
-	/**
-	 * Proportional resize
-	 *
-	 * @var boolean
-	 */
-	protected $_resizeProportional;
-
-    /**
-     * Create a new PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_path				= '';
-    	$this->_name				= '';
-    	$this->_offsetX				= 0;
-    	$this->_offsetY				= 0;
-    	$this->_width				= 0;
-    	$this->_height				= 0;
-    	$this->_resizeProportional	= true;
-    }
-
-    /**
-     * Get Name
-     *
-     * @return string
-     */
-    public function getName() {
-    	return $this->_name;
-    }
-
-    /**
-     * Set Name
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setName($pValue = '') {
-    	$this->_name = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OffsetX
-     *
-     * @return int
-     */
-    public function getOffsetX() {
-    	return $this->_offsetX;
-    }
-
-    /**
-     * Set OffsetX
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setOffsetX($pValue = 0) {
-    	$this->_offsetX = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get OffsetY
-     *
-     * @return int
-     */
-    public function getOffsetY() {
-    	return $this->_offsetY;
-    }
-
-    /**
-     * Set OffsetY
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setOffsetY($pValue = 0) {
-    	$this->_offsetY = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Width
-     *
-     * @return int
-     */
-    public function getWidth() {
-    	return $this->_width;
-    }
-
-    /**
-     * Set Width
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setWidth($pValue = 0) {
-    	// Resize proportional?
-    	if ($this->_resizeProportional && $pValue != 0) {
-    		$ratio = $this->_width / $this->_height;
-    		$this->_height = round($ratio * $pValue);
-    	}
-
-    	// Set width
-    	$this->_width = $pValue;
-
-    	return $this;
-    }
-
-    /**
-     * Get Height
-     *
-     * @return int
-     */
-    public function getHeight() {
-    	return $this->_height;
-    }
-
-    /**
-     * Set Height
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setHeight($pValue = 0) {
-    	// Resize proportional?
-    	if ($this->_resizeProportional && $pValue != 0) {
-    		$ratio = $this->_width / $this->_height;
-    		$this->_width = round($ratio * $pValue);
-    	}
-
-    	// Set height
-    	$this->_height = $pValue;
-
-    	return $this;
-    }
-
-    /**
-     * Set width and height with proportional resize
-	 * Example:
-	 * <code>
-     * $objDrawing->setResizeProportional(true);
-     * $objDrawing->setWidthAndHeight(160,120);
-	 * </code>
-	 *
-     * @author Vincent@luo MSN:kele_100@hotmail.com
-     * @param int $width
-     * @param int $height
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-	public function setWidthAndHeight($width = 0, $height = 0) {
-		$xratio = $width / $this->_width;
-		$yratio = $height / $this->_height;
-		if ($this->_resizeProportional && !($width == 0 || $height == 0)) {
-			if (($xratio * $this->_height) < $height) {
-				$this->_height = ceil($xratio * $this->_height);
-				$this->_width  = $width;
-			} else {
-				$this->_width	= ceil($yratio * $this->_width);
-				$this->_height	= $height;
-			}
-		}
-		return $this;
-	}
-
-    /**
-     * Get ResizeProportional
-     *
-     * @return boolean
-     */
-    public function getResizeProportional() {
-    	return $this->_resizeProportional;
-    }
-
-    /**
-     * Set ResizeProportional
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setResizeProportional($pValue = true) {
-    	$this->_resizeProportional = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Filename
-     *
-     * @return string
-     */
-    public function getFilename() {
-    	return basename($this->_path);
-    }
-
-    /**
-     * Get Extension
-     *
-     * @return string
-     */
-    public function getExtension() {
-        $parts = explode(".", basename($this->_path));
-        return end($parts);
-    }
-
-    /**
-     * Get Path
-     *
-     * @return string
-     */
-    public function getPath() {
-    	return $this->_path;
-    }
-
-    /**
-     * Set Path
-     *
-     * @param 	string 		$pValue			File path
-     * @param 	boolean		$pVerifyFile	Verify file
-     * @throws 	Exception
-     * @return PHPExcel_Worksheet_HeaderFooterDrawing
-     */
-    public function setPath($pValue = '', $pVerifyFile = true) {
-    	if ($pVerifyFile) {
-	    	if (file_exists($pValue)) {
-	    		$this->_path = $pValue;
-
-	    		if ($this->_width == 0 && $this->_height == 0) {
-	    			// Get width/height
-	    			list($this->_width, $this->_height) = getimagesize($pValue);
-	    		}
-	    	} else {
-	    		throw new Exception("File $pValue not found!");
-	    	}
-    	} else {
-    		$this->_path = $pValue;
-    	}
-    	return $this;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_path
-    		. $this->_name
-    		. $this->_offsetX
-    		. $this->_offsetY
-    		. $this->_width
-    		. $this->_height
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/MemoryDrawing.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/MemoryDrawing.php
deleted file mode 100755
index c3a5b3bc7..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/MemoryDrawing.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_MemoryDrawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_MemoryDrawing extends PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
-{
-	/* Rendering functions */
-	const RENDERING_DEFAULT					= 'imagepng';
-	const RENDERING_PNG						= 'imagepng';
-	const RENDERING_GIF						= 'imagegif';
-	const RENDERING_JPEG					= 'imagejpeg';
-
-	/* MIME types */
-	const MIMETYPE_DEFAULT					= 'image/png';
-	const MIMETYPE_PNG						= 'image/png';
-	const MIMETYPE_GIF						= 'image/gif';
-	const MIMETYPE_JPEG						= 'image/jpeg';
-
-	/**
-	 * Image resource
-	 *
-	 * @var resource
-	 */
-	private $_imageResource;
-
-	/**
-	 * Rendering function
-	 *
-	 * @var string
-	 */
-	private $_renderingFunction;
-
-	/**
-	 * Mime type
-	 *
-	 * @var string
-	 */
-	private $_mimeType;
-
-	/**
-	 * Unique name
-	 *
-	 * @var string
-	 */
-	private $_uniqueName;
-
-    /**
-     * Create a new PHPExcel_Worksheet_MemoryDrawing
-     */
-    public function __construct()
-    {
-    	// Initialise values
-    	$this->_imageResource		= null;
-    	$this->_renderingFunction 	= self::RENDERING_DEFAULT;
-    	$this->_mimeType			= self::MIMETYPE_DEFAULT;
-    	$this->_uniqueName			= md5(rand(0, 9999). time() . rand(0, 9999));
-
-    	// Initialize parent
-    	parent::__construct();
-    }
-
-    /**
-     * Get image resource
-     *
-     * @return resource
-     */
-    public function getImageResource() {
-    	return $this->_imageResource;
-    }
-
-    /**
-     * Set image resource
-     *
-     * @param	$value resource
-     * @return PHPExcel_Worksheet_MemoryDrawing
-     */
-    public function setImageResource($value = null) {
-    	$this->_imageResource = $value;
-
-    	if (!is_null($this->_imageResource)) {
-	    	// Get width/height
-	    	$this->_width	= imagesx($this->_imageResource);
-	    	$this->_height	= imagesy($this->_imageResource);
-    	}
-    	return $this;
-    }
-
-    /**
-     * Get rendering function
-     *
-     * @return string
-     */
-    public function getRenderingFunction() {
-    	return $this->_renderingFunction;
-    }
-
-    /**
-     * Set rendering function
-     *
-     * @param string $value
-     * @return PHPExcel_Worksheet_MemoryDrawing
-     */
-    public function setRenderingFunction($value = PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT) {
-    	$this->_renderingFunction = $value;
-    	return $this;
-    }
-
-    /**
-     * Get mime type
-     *
-     * @return string
-     */
-    public function getMimeType() {
-    	return $this->_mimeType;
-    }
-
-    /**
-     * Set mime type
-     *
-     * @param string $value
-     * @return PHPExcel_Worksheet_MemoryDrawing
-     */
-    public function setMimeType($value = PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_DEFAULT) {
-    	$this->_mimeType = $value;
-    	return $this;
-    }
-
-    /**
-     * Get indexed filename (using image index)
-     *
-     * @return string
-     */
-    public function getIndexedFilename() {
-		$extension 	= strtolower($this->getMimeType());
-		$extension 	= explode('/', $extension);
-		$extension 	= $extension[1];
-
-    	return $this->_uniqueName . $this->getImageIndex() . '.' . $extension;
-    }
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_renderingFunction
-    		. $this->_mimeType
-    		. $this->_uniqueName
-    		. parent::getHashCode()
-    		. __CLASS__
-    	);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/PageMargins.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/PageMargins.php
deleted file mode 100755
index 4221efd44..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/PageMargins.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_PageMargins
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_PageMargins
-{
-	/**
-	 * Left
-	 *
-	 * @var double
-	 */
-	private $_left		= 0.7;
-
-	/**
-	 * Right
-	 *
-	 * @var double
-	 */
-	private $_right		= 0.7;
-
-	/**
-	 * Top
-	 *
-	 * @var double
-	 */
-	private $_top		= 0.75;
-
-	/**
-	 * Bottom
-	 *
-	 * @var double
-	 */
-	private $_bottom	= 0.75;
-
-	/**
-	 * Header
-	 *
-	 * @var double
-	 */
-	private $_header 	= 0.3;
-
-	/**
-	 * Footer
-	 *
-	 * @var double
-	 */
-	private $_footer 	= 0.3;
-
-    /**
-     * Create a new PHPExcel_Worksheet_PageMargins
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Get Left
-     *
-     * @return double
-     */
-    public function getLeft() {
-    	return $this->_left;
-    }
-
-    /**
-     * Set Left
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setLeft($pValue) {
-    	$this->_left = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Right
-     *
-     * @return double
-     */
-    public function getRight() {
-    	return $this->_right;
-    }
-
-    /**
-     * Set Right
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setRight($pValue) {
-    	$this->_right = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Top
-     *
-     * @return double
-     */
-    public function getTop() {
-    	return $this->_top;
-    }
-
-    /**
-     * Set Top
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setTop($pValue) {
-    	$this->_top = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Bottom
-     *
-     * @return double
-     */
-    public function getBottom() {
-    	return $this->_bottom;
-    }
-
-    /**
-     * Set Bottom
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setBottom($pValue) {
-    	$this->_bottom = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Header
-     *
-     * @return double
-     */
-    public function getHeader() {
-    	return $this->_header;
-    }
-
-    /**
-     * Set Header
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setHeader($pValue) {
-    	$this->_header = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Footer
-     *
-     * @return double
-     */
-    public function getFooter() {
-    	return $this->_footer;
-    }
-
-    /**
-     * Set Footer
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_PageMargins
-     */
-    public function setFooter($pValue) {
-    	$this->_footer = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/PageSetup.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/PageSetup.php
deleted file mode 100755
index 458b73f5e..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/PageSetup.php
+++ /dev/null
@@ -1,798 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_PageSetup
- *
- * <code>
- * Paper size taken from Office Open XML Part 4 - Markup Language Reference, page 1988:
- *
- * 1 = Letter paper (8.5 in. by 11 in.)
- * 2 = Letter small paper (8.5 in. by 11 in.)
- * 3 = Tabloid paper (11 in. by 17 in.)
- * 4 = Ledger paper (17 in. by 11 in.)
- * 5 = Legal paper (8.5 in. by 14 in.)
- * 6 = Statement paper (5.5 in. by 8.5 in.)
- * 7 = Executive paper (7.25 in. by 10.5 in.)
- * 8 = A3 paper (297 mm by 420 mm)
- * 9 = A4 paper (210 mm by 297 mm)
- * 10 = A4 small paper (210 mm by 297 mm)
- * 11 = A5 paper (148 mm by 210 mm)
- * 12 = B4 paper (250 mm by 353 mm)
- * 13 = B5 paper (176 mm by 250 mm)
- * 14 = Folio paper (8.5 in. by 13 in.)
- * 15 = Quarto paper (215 mm by 275 mm)
- * 16 = Standard paper (10 in. by 14 in.)
- * 17 = Standard paper (11 in. by 17 in.)
- * 18 = Note paper (8.5 in. by 11 in.)
- * 19 = #9 envelope (3.875 in. by 8.875 in.)
- * 20 = #10 envelope (4.125 in. by 9.5 in.)
- * 21 = #11 envelope (4.5 in. by 10.375 in.)
- * 22 = #12 envelope (4.75 in. by 11 in.)
- * 23 = #14 envelope (5 in. by 11.5 in.)
- * 24 = C paper (17 in. by 22 in.)
- * 25 = D paper (22 in. by 34 in.)
- * 26 = E paper (34 in. by 44 in.)
- * 27 = DL envelope (110 mm by 220 mm)
- * 28 = C5 envelope (162 mm by 229 mm)
- * 29 = C3 envelope (324 mm by 458 mm)
- * 30 = C4 envelope (229 mm by 324 mm)
- * 31 = C6 envelope (114 mm by 162 mm)
- * 32 = C65 envelope (114 mm by 229 mm)
- * 33 = B4 envelope (250 mm by 353 mm)
- * 34 = B5 envelope (176 mm by 250 mm)
- * 35 = B6 envelope (176 mm by 125 mm)
- * 36 = Italy envelope (110 mm by 230 mm)
- * 37 = Monarch envelope (3.875 in. by 7.5 in.).
- * 38 = 6 3/4 envelope (3.625 in. by 6.5 in.)
- * 39 = US standard fanfold (14.875 in. by 11 in.)
- * 40 = German standard fanfold (8.5 in. by 12 in.)
- * 41 = German legal fanfold (8.5 in. by 13 in.)
- * 42 = ISO B4 (250 mm by 353 mm)
- * 43 = Japanese double postcard (200 mm by 148 mm)
- * 44 = Standard paper (9 in. by 11 in.)
- * 45 = Standard paper (10 in. by 11 in.)
- * 46 = Standard paper (15 in. by 11 in.)
- * 47 = Invite envelope (220 mm by 220 mm)
- * 50 = Letter extra paper (9.275 in. by 12 in.)
- * 51 = Legal extra paper (9.275 in. by 15 in.)
- * 52 = Tabloid extra paper (11.69 in. by 18 in.)
- * 53 = A4 extra paper (236 mm by 322 mm)
- * 54 = Letter transverse paper (8.275 in. by 11 in.)
- * 55 = A4 transverse paper (210 mm by 297 mm)
- * 56 = Letter extra transverse paper (9.275 in. by 12 in.)
- * 57 = SuperA/SuperA/A4 paper (227 mm by 356 mm)
- * 58 = SuperB/SuperB/A3 paper (305 mm by 487 mm)
- * 59 = Letter plus paper (8.5 in. by 12.69 in.)
- * 60 = A4 plus paper (210 mm by 330 mm)
- * 61 = A5 transverse paper (148 mm by 210 mm)
- * 62 = JIS B5 transverse paper (182 mm by 257 mm)
- * 63 = A3 extra paper (322 mm by 445 mm)
- * 64 = A5 extra paper (174 mm by 235 mm)
- * 65 = ISO B5 extra paper (201 mm by 276 mm)
- * 66 = A2 paper (420 mm by 594 mm)
- * 67 = A3 transverse paper (297 mm by 420 mm)
- * 68 = A3 extra transverse paper (322 mm by 445 mm)
- * </code>
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_PageSetup
-{
-	/* Paper size */
-	const PAPERSIZE_LETTER							= 1;
-	const PAPERSIZE_LETTER_SMALL					= 2;
-	const PAPERSIZE_TABLOID							= 3;
-	const PAPERSIZE_LEDGER							= 4;
-	const PAPERSIZE_LEGAL							= 5;
-	const PAPERSIZE_STATEMENT						= 6;
-	const PAPERSIZE_EXECUTIVE						= 7;
-	const PAPERSIZE_A3								= 8;
-	const PAPERSIZE_A4								= 9;
-	const PAPERSIZE_A4_SMALL						= 10;
-	const PAPERSIZE_A5								= 11;
-	const PAPERSIZE_B4								= 12;
-	const PAPERSIZE_B5								= 13;
-	const PAPERSIZE_FOLIO							= 14;
-	const PAPERSIZE_QUARTO							= 15;
-	const PAPERSIZE_STANDARD_1						= 16;
-	const PAPERSIZE_STANDARD_2						= 17;
-	const PAPERSIZE_NOTE							= 18;
-	const PAPERSIZE_NO9_ENVELOPE					= 19;
-	const PAPERSIZE_NO10_ENVELOPE					= 20;
-	const PAPERSIZE_NO11_ENVELOPE					= 21;
-	const PAPERSIZE_NO12_ENVELOPE					= 22;
-	const PAPERSIZE_NO14_ENVELOPE					= 23;
-	const PAPERSIZE_C								= 24;
-	const PAPERSIZE_D								= 25;
-	const PAPERSIZE_E								= 26;
-	const PAPERSIZE_DL_ENVELOPE						= 27;
-	const PAPERSIZE_C5_ENVELOPE						= 28;
-	const PAPERSIZE_C3_ENVELOPE						= 29;
-	const PAPERSIZE_C4_ENVELOPE						= 30;
-	const PAPERSIZE_C6_ENVELOPE						= 31;
-	const PAPERSIZE_C65_ENVELOPE					= 32;
-	const PAPERSIZE_B4_ENVELOPE						= 33;
-	const PAPERSIZE_B5_ENVELOPE						= 34;
-	const PAPERSIZE_B6_ENVELOPE						= 35;
-	const PAPERSIZE_ITALY_ENVELOPE					= 36;
-	const PAPERSIZE_MONARCH_ENVELOPE				= 37;
-	const PAPERSIZE_6_3_4_ENVELOPE					= 38;
-	const PAPERSIZE_US_STANDARD_FANFOLD				= 39;
-	const PAPERSIZE_GERMAN_STANDARD_FANFOLD			= 40;
-	const PAPERSIZE_GERMAN_LEGAL_FANFOLD			= 41;
-	const PAPERSIZE_ISO_B4							= 42;
-	const PAPERSIZE_JAPANESE_DOUBLE_POSTCARD		= 43;
-	const PAPERSIZE_STANDARD_PAPER_1				= 44;
-	const PAPERSIZE_STANDARD_PAPER_2				= 45;
-	const PAPERSIZE_STANDARD_PAPER_3				= 46;
-	const PAPERSIZE_INVITE_ENVELOPE					= 47;
-	const PAPERSIZE_LETTER_EXTRA_PAPER				= 48;
-	const PAPERSIZE_LEGAL_EXTRA_PAPER				= 49;
-	const PAPERSIZE_TABLOID_EXTRA_PAPER				= 50;
-	const PAPERSIZE_A4_EXTRA_PAPER					= 51;
-	const PAPERSIZE_LETTER_TRANSVERSE_PAPER			= 52;
-	const PAPERSIZE_A4_TRANSVERSE_PAPER				= 53;
-	const PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER	= 54;
-	const PAPERSIZE_SUPERA_SUPERA_A4_PAPER			= 55;
-	const PAPERSIZE_SUPERB_SUPERB_A3_PAPER			= 56;
-	const PAPERSIZE_LETTER_PLUS_PAPER				= 57;
-	const PAPERSIZE_A4_PLUS_PAPER					= 58;
-	const PAPERSIZE_A5_TRANSVERSE_PAPER				= 59;
-	const PAPERSIZE_JIS_B5_TRANSVERSE_PAPER			= 60;
-	const PAPERSIZE_A3_EXTRA_PAPER					= 61;
-	const PAPERSIZE_A5_EXTRA_PAPER					= 62;
-	const PAPERSIZE_ISO_B5_EXTRA_PAPER				= 63;
-	const PAPERSIZE_A2_PAPER						= 64;
-	const PAPERSIZE_A3_TRANSVERSE_PAPER				= 65;
-	const PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER		= 66;
-
-	/* Page orientation */
-	const ORIENTATION_DEFAULT	= 'default';
-	const ORIENTATION_LANDSCAPE	= 'landscape';
-	const ORIENTATION_PORTRAIT	= 'portrait';
-
-	/* Print Range Set Method */
-	const SETPRINTRANGE_OVERWRITE	= 'O';
-	const SETPRINTRANGE_INSERT		= 'I';
-
-
-	/**
-	 * Paper size
-	 *
-	 * @var int
-	 */
-	private $_paperSize		= PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER;
-
-	/**
-	 * Orientation
-	 *
-	 * @var string
-	 */
-	private $_orientation	= PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT;
-
-	/**
-	 * Scale (Print Scale)
-	 *
-	 * Print scaling. Valid values range from 10 to 400
-	 * This setting is overridden when fitToWidth and/or fitToHeight are in use
-	 *
-	 * @var int?
-	 */
-	private $_scale			= 100;
-
-	/**
-	  * Fit To Page
-	  * Whether scale or fitToWith / fitToHeight applies
-	  *
-	  * @var boolean
-	  */
-	private $_fitToPage		= FALSE;
-
-	/**
-	  * Fit To Height
-	  * Number of vertical pages to fit on
-	  *
-	  * @var int?
-	  */
-	private $_fitToHeight	= 1;
-
-	/**
-	  * Fit To Width
-	  * Number of horizontal pages to fit on
-	  *
-	  * @var int?
-	  */
-	private $_fitToWidth	= 1;
-
-	/**
-	 * Columns to repeat at left
-	 *
-	 * @var array Containing start column and end column, empty array if option unset
-	 */
-	private $_columnsToRepeatAtLeft = array('', '');
-
-	/**
-	 * Rows to repeat at top
-	 *
-	 * @var array Containing start row number and end row number, empty array if option unset
-	 */
-	private $_rowsToRepeatAtTop = array(0, 0);
-
-	/**
-	 * Center page horizontally
-	 *
-	 * @var boolean
-	 */
-	private $_horizontalCentered = FALSE;
-
-	/**
-	 * Center page vertically
-	 *
-	 * @var boolean
-	 */
-	private $_verticalCentered = FALSE;
-
-	/**
-	 * Print area
-	 *
-	 * @var string
-	 */
-	private $_printArea = NULL;
-
-	/**
-	 * First page number
-	 *
-	 * @var int
-	 */
-	private $_firstPageNumber = NULL;
-
-    /**
-     * Create a new PHPExcel_Worksheet_PageSetup
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Get Paper Size
-     *
-     * @return int
-     */
-    public function getPaperSize() {
-    	return $this->_paperSize;
-    }
-
-    /**
-     * Set Paper Size
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_PageSetup
-     */
-    public function setPaperSize($pValue = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER) {
-    	$this->_paperSize = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Orientation
-     *
-     * @return string
-     */
-    public function getOrientation() {
-    	return $this->_orientation;
-    }
-
-    /**
-     * Set Orientation
-     *
-     * @param string $pValue
-     * @return PHPExcel_Worksheet_PageSetup
-     */
-    public function setOrientation($pValue = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) {
-    	$this->_orientation = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get Scale
-	 *
-	 * @return int?
-	 */
-	public function getScale() {
-		return $this->_scale;
-	}
-
-	/**
-	 * Set Scale
-	 *
-	 * Print scaling. Valid values range from 10 to 400
-	 * This setting is overridden when fitToWidth and/or fitToHeight are in use
-	 *
-	 * @param 	int?	$pValue
-	 * @param boolean	$pUpdate	Update fitToPage so scaling applies rather than fitToHeight / fitToWidth
-	 * @return PHPExcel_Worksheet_PageSetup
-	 * @throws 	Exception
-	 */
-	public function setScale($pValue = 100, $pUpdate = true) {
-		// Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
-		// but it is apparently still able to handle any scale >= 0, where 0 results in 100
-		if (($pValue >= 0) || is_null($pValue)) {
-			$this->_scale = $pValue;
-			if ($pUpdate) {
-				$this->_fitToPage = false;
-			}
-		} else {
-			throw new Exception("Scale must not be negative");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Fit To Page
-	 *
-	 * @return boolean
-	 */
-	public function getFitToPage() {
-		return $this->_fitToPage;
-	}
-
-	/**
-	 * Set Fit To Page
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setFitToPage($pValue = TRUE) {
-		$this->_fitToPage = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get Fit To Height
-	 *
-	 * @return int?
-	 */
-	public function getFitToHeight() {
-		return $this->_fitToHeight;
-	}
-
-	/**
-	 * Set Fit To Height
-	 *
-	 * @param int? $pValue
-	 * @param boolean $pUpdate Update fitToPage so it applies rather than scaling
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setFitToHeight($pValue = 1, $pUpdate = TRUE) {
-		$this->_fitToHeight = $pValue;
-		if ($pUpdate) {
-			$this->_fitToPage = TRUE;
-		}
-		return $this;
-	}
-
-	/**
-	 * Get Fit To Width
-	 *
-	 * @return int?
-	 */
-	public function getFitToWidth() {
-		return $this->_fitToWidth;
-	}
-
-	/**
-	 * Set Fit To Width
-	 *
-	 * @param int? $pValue
-	 * @param boolean $pUpdate Update fitToPage so it applies rather than scaling
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setFitToWidth($pValue = 1, $pUpdate = TRUE) {
-		$this->_fitToWidth = $pValue;
-		if ($pUpdate) {
-			$this->_fitToPage = TRUE;
-		}
-		return $this;
-	}
-
-	/**
-	 * Is Columns to repeat at left set?
-	 *
-	 * @return boolean
-	 */
-	public function isColumnsToRepeatAtLeftSet() {
-		if (is_array($this->_columnsToRepeatAtLeft)) {
-			if ($this->_columnsToRepeatAtLeft[0] != '' && $this->_columnsToRepeatAtLeft[1] != '') {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get Columns to repeat at left
-	 *
-	 * @return array Containing start column and end column, empty array if option unset
-	 */
-	public function getColumnsToRepeatAtLeft() {
-		return $this->_columnsToRepeatAtLeft;
-	}
-
-	/**
-	 * Set Columns to repeat at left
-	 *
-	 * @param array $pValue Containing start column and end column, empty array if option unset
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setColumnsToRepeatAtLeft($pValue = null) {
-		if (is_array($pValue)) {
-			$this->_columnsToRepeatAtLeft = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Set Columns to repeat at left by start and end
-	 *
-	 * @param string $pStart
-	 * @param string $pEnd
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setColumnsToRepeatAtLeftByStartAndEnd($pStart = 'A', $pEnd = 'A') {
-		$this->_columnsToRepeatAtLeft = array($pStart, $pEnd);
-		return $this;
-	}
-
-	/**
-	 * Is Rows to repeat at top set?
-	 *
-	 * @return boolean
-	 */
-	public function isRowsToRepeatAtTopSet() {
-		if (is_array($this->_rowsToRepeatAtTop)) {
-			if ($this->_rowsToRepeatAtTop[0] != 0 && $this->_rowsToRepeatAtTop[1] != 0) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get Rows to repeat at top
-	 *
-	 * @return array Containing start column and end column, empty array if option unset
-	 */
-	public function getRowsToRepeatAtTop() {
-		return $this->_rowsToRepeatAtTop;
-	}
-
-	/**
-	 * Set Rows to repeat at top
-	 *
-	 * @param array	$pValue	Containing start column and end column, empty array if option unset
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setRowsToRepeatAtTop($pValue = null) {
-		if (is_array($pValue)) {
-			$this->_rowsToRepeatAtTop = $pValue;
-		}
-		return $this;
-	}
-
-	/**
-	 * Set Rows to repeat at top by start and end
-	 *
-	 * @param int $pStart
-	 * @param int $pEnd
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setRowsToRepeatAtTopByStartAndEnd($pStart = 1, $pEnd = 1) {
-		$this->_rowsToRepeatAtTop = array($pStart, $pEnd);
-		return $this;
-	}
-
-	/**
-	 * Get center page horizontally
-	 *
-	 * @return bool
-	 */
-	public function getHorizontalCentered() {
-		return $this->_horizontalCentered;
-	}
-
-	/**
-	 * Set center page horizontally
-	 *
-	 * @param bool $value
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setHorizontalCentered($value = false) {
-		$this->_horizontalCentered = $value;
-		return $this;
-	}
-
-	/**
-	 * Get center page vertically
-	 *
-	 * @return bool
-	 */
-	public function getVerticalCentered() {
-		return $this->_verticalCentered;
-	}
-
-	/**
-	 * Set center page vertically
-	 *
-	 * @param bool $value
-	 * @return PHPExcel_Worksheet_PageSetup
-	 */
-	public function setVerticalCentered($value = false) {
-		$this->_verticalCentered = $value;
-		return $this;
-	}
-
-	/**
-	 *	Get print area
-	 *
-	 * @param	int		$index	Identifier for a specific print area range if several ranges have been set
-	 *							Default behaviour, or a index value of 0, will return all ranges as a comma-separated string
-	 *							Otherwise, the specific range identified by the value of $index will be returned
-	 *							Print areas are numbered from 1
-	 * @throws	Exception
-	 * @return	string
-	 */
-	public function getPrintArea($index = 0) {
-		if ($index == 0) {
-			return $this->_printArea;
-		}
-		$printAreas = explode(',',$this->_printArea);
-		if (isset($printAreas[$index-1])) {
-			return $printAreas[$index-1];
-		}
-		throw new Exception("Requested Print Area does not exist");
-	}
-
-	/**
-	 * Is print area set?
-	 *
-	 * @param	int		$index	Identifier for a specific print area range if several ranges have been set
-	 *							Default behaviour, or an index value of 0, will identify whether any print range is set
-	 *							Otherwise, existence of the range identified by the value of $index will be returned
-	 *							Print areas are numbered from 1
-	 * @return	boolean
-	 */
-	public function isPrintAreaSet($index = 0) {
-		if ($index == 0) {
-			return !is_null($this->_printArea);
-		}
-		$printAreas = explode(',',$this->_printArea);
-		return isset($printAreas[$index-1]);
-	}
-
-	/**
-	 * Clear a print area
-	 *
-	 * @param	int		$index	Identifier for a specific print area range if several ranges have been set
-	 *							Default behaviour, or an index value of 0, will clear all print ranges that are set
-	 *							Otherwise, the range identified by the value of $index will be removed from the series
-	 *							Print areas are numbered from 1
-	 * @return	PHPExcel_Worksheet_PageSetup
-	 */
-	public function clearPrintArea($index = 0) {
-		if ($index == 0) {
-			$this->_printArea = NULL;
-		} else {
-			$printAreas = explode(',',$this->_printArea);
-			if (isset($printAreas[$index-1])) {
-				unset($printAreas[$index-1]);
-				$this->_printArea = implode(',',$printAreas);
-			}
-		}
-
-    	return $this;
-	}
-
-	/**
-	 * Set print area. e.g. 'A1:D10' or 'A1:D10,G5:M20'
-	 *
-	 * @param	string	$value
-	 * @param	int		$index	Identifier for a specific print area range allowing several ranges to be set
-	 *							When the method is "O"verwrite, then a positive integer index will overwrite that indexed
-	 *								entry in the print areas list; a negative index value will identify which entry to
-	 *								overwrite working bacward through the print area to the list, with the last entry as -1.
-	 *								Specifying an index value of 0, will overwrite <b>all</b> existing print ranges.
-	 *							When the method is "I"nsert, then a positive index will insert after that indexed entry in
-	 *								the print areas list, while a negative index will insert before the indexed entry.
-	 *								Specifying an index value of 0, will always append the new print range at the end of the
-	 *								list.
-	 *							Print areas are numbered from 1
-	 * @param	string	$method	Determines the method used when setting multiple print areas
-	 *							Default behaviour, or the "O" method, overwrites existing print area
-	 *							The "I" method, inserts the new print area before any specified index, or at the end of the list
-	 * @return	PHPExcel_Worksheet_PageSetup
-	 * @throws	Exception
-	 */
-	public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) {
-		if (strpos($value,'!') !== false) {
-			throw new Exception('Cell coordinate must not specify a worksheet.');
-		} elseif (strpos($value,':') === false) {
-			throw new Exception('Cell coordinate must be a range of cells.');
-		} elseif (strpos($value,'$') !== false) {
-			throw new Exception('Cell coordinate must not be absolute.');
-		}
-		$value = strtoupper($value);
-
-		if ($method == self::SETPRINTRANGE_OVERWRITE) {
-			if ($index == 0) {
-				$this->_printArea = $value;
-			} else {
-				$printAreas = explode(',',$this->_printArea);
-				if($index < 0) {
-					$index = count($printAreas) - abs($index) + 1;
-				}
-				if (($index <= 0) || ($index > count($printAreas))) {
-		    		throw new Exception('Invalid index for setting print range.');
-				}
-				$printAreas[$index-1] = $value;
-				$this->_printArea = implode(',',$printAreas);
-			}
-		} elseif($method == self::SETPRINTRANGE_INSERT) {
-			if ($index == 0) {
-				$this->_printArea .= ($this->_printArea == '') ? $value : ','.$value;
-			} else {
-				$printAreas = explode(',',$this->_printArea);
-				if($index < 0) {
-					$index = abs($index) - 1;
-				}
-				if ($index > count($printAreas)) {
-		    		throw new Exception('Invalid index for setting print range.');
-				}
-				$printAreas = array_merge(array_slice($printAreas,0,$index),array($value),array_slice($printAreas,$index));
-				$this->_printArea = implode(',',$printAreas);
-			}
-		} else {
-    		throw new Exception('Invalid method for setting print range.');
-		}
-
-    	return $this;
-	}
-
-	/**
-	 * Add a new print area (e.g. 'A1:D10' or 'A1:D10,G5:M20') to the list of print areas
-	 *
-	 * @param	string	$value
-	 * @param	int		$index	Identifier for a specific print area range allowing several ranges to be set
-	 *							A positive index will insert after that indexed entry in the print areas list, while a
-	 *								negative index will insert before the indexed entry.
-	 *								Specifying an index value of 0, will always append the new print range at the end of the
-	 *								list.
-	 *							Print areas are numbered from 1
-	 * @return	PHPExcel_Worksheet_PageSetup
-	 * @throws	Exception
-	 */
-	public function addPrintArea($value, $index = -1) {
-		return $this->setPrintArea($value, $index, self::SETPRINTRANGE_INSERT);
-	}
-
-	/**
-	 * Set print area
-	 *
-	 * @param	int		$column1	Column 1
-	 * @param	int		$row1		Row 1
-	 * @param	int		$column2	Column 2
-	 * @param	int		$row2		Row 2
-	 * @param	int		$index		Identifier for a specific print area range allowing several ranges to be set
-	 *								When the method is "O"verwrite, then a positive integer index will overwrite that indexed
-	 *									entry in the print areas list; a negative index value will identify which entry to
-	 *									overwrite working bacward through the print area to the list, with the last entry as -1.
-	 *									Specifying an index value of 0, will overwrite <b>all</b> existing print ranges.
-	 *								When the method is "I"nsert, then a positive index will insert after that indexed entry in
-	 *									the print areas list, while a negative index will insert before the indexed entry.
-	 *									Specifying an index value of 0, will always append the new print range at the end of the
-	 *									list.
-	 *								Print areas are numbered from 1
-	 * @param	string	$method		Determines the method used when setting multiple print areas
-	 *								Default behaviour, or the "O" method, overwrites existing print area
-	 *								The "I" method, inserts the new print area before any specified index, or at the end of the list
-	 * @return	PHPExcel_Worksheet_PageSetup
-	 * @throws	Exception
-	 */
-    public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
-    {
-    	return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, $method);
-    }
-
-	/**
-	 * Add a new print area to the list of print areas
-	 *
-	 * @param	int		$column1	Start Column for the print area
-	 * @param	int		$row1		Start Row for the print area
-	 * @param	int		$column2	End Column for the print area
-	 * @param	int		$row2		End Row for the print area
-	 * @param	int		$index		Identifier for a specific print area range allowing several ranges to be set
-	 *								A positive index will insert after that indexed entry in the print areas list, while a
-	 *									negative index will insert before the indexed entry.
-	 *									Specifying an index value of 0, will always append the new print range at the end of the
-	 *									list.
-	 *								Print areas are numbered from 1
-	 * @return	PHPExcel_Worksheet_PageSetup
-	 * @throws	Exception
-	 */
-    public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1)
-    {
-    	return $this->setPrintArea(PHPExcel_Cell::stringFromColumnIndex($column1) . $row1 . ':' . PHPExcel_Cell::stringFromColumnIndex($column2) . $row2, $index, self::SETPRINTRANGE_INSERT);
-	}
-
-	/**
-	 * Get first page number
-	 *
-	 * @return int
-	 */
-    public function getFirstPageNumber() {
-		return $this->_firstPageNumber;
-    }
-
-    /**
-     * Set first page number
-     *
-     * @param int $value
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function setFirstPageNumber($value = null) {
-		$this->_firstPageNumber = $value;
-		return $this;
-    }
-
-    /**
-     * Reset first page number
-     *
-     * @return PHPExcel_Worksheet_HeaderFooter
-     */
-    public function resetFirstPageNumber() {
-		return $this->setFirstPageNumber(null);
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/Protection.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/Protection.php
deleted file mode 100755
index f4222fc71..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/Protection.php
+++ /dev/null
@@ -1,545 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_Protection
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_Protection
-{
-	/**
-	 * Sheet
-	 *
-	 * @var boolean
-	 */
-	private $_sheet					= false;
-
-	/**
-	 * Objects
-	 *
-	 * @var boolean
-	 */
-	private $_objects				= false;
-
-	/**
-	 * Scenarios
-	 *
-	 * @var boolean
-	 */
-	private $_scenarios				= false;
-
-	/**
-	 * Format cells
-	 *
-	 * @var boolean
-	 */
-	private $_formatCells			= false;
-
-	/**
-	 * Format columns
-	 *
-	 * @var boolean
-	 */
-	private $_formatColumns			= false;
-
-	/**
-	 * Format rows
-	 *
-	 * @var boolean
-	 */
-	private $_formatRows			= false;
-
-	/**
-	 * Insert columns
-	 *
-	 * @var boolean
-	 */
-	private $_insertColumns			= false;
-
-	/**
-	 * Insert rows
-	 *
-	 * @var boolean
-	 */
-	private $_insertRows			= false;
-
-	/**
-	 * Insert hyperlinks
-	 *
-	 * @var boolean
-	 */
-	private $_insertHyperlinks		= false;
-
-	/**
-	 * Delete columns
-	 *
-	 * @var boolean
-	 */
-	private $_deleteColumns			= false;
-
-	/**
-	 * Delete rows
-	 *
-	 * @var boolean
-	 */
-	private $_deleteRows			= false;
-
-	/**
-	 * Select locked cells
-	 *
-	 * @var boolean
-	 */
-	private $_selectLockedCells		= false;
-
-	/**
-	 * Sort
-	 *
-	 * @var boolean
-	 */
-	private $_sort					= false;
-
-	/**
-	 * AutoFilter
-	 *
-	 * @var boolean
-	 */
-	private $_autoFilter			= false;
-
-	/**
-	 * Pivot tables
-	 *
-	 * @var boolean
-	 */
-	private $_pivotTables			= false;
-
-	/**
-	 * Select unlocked cells
-	 *
-	 * @var boolean
-	 */
-	private $_selectUnlockedCells	= false;
-
-	/**
-	 * Password
-	 *
-	 * @var string
-	 */
-	private $_password				= '';
-
-    /**
-     * Create a new PHPExcel_Worksheet_Protection
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Is some sort of protection enabled?
-     *
-     * @return boolean
-     */
-    function isProtectionEnabled() {
-    	return 	$this->_sheet ||
-				$this->_objects ||
-				$this->_scenarios ||
-				$this->_formatCells ||
-				$this->_formatColumns ||
-				$this->_formatRows ||
-				$this->_insertColumns ||
-				$this->_insertRows ||
-				$this->_insertHyperlinks ||
-				$this->_deleteColumns ||
-				$this->_deleteRows ||
-				$this->_selectLockedCells ||
-				$this->_sort ||
-				$this->_autoFilter ||
-				$this->_pivotTables ||
-				$this->_selectUnlockedCells;
-    }
-
-    /**
-     * Get Sheet
-     *
-     * @return boolean
-     */
-    function getSheet() {
-    	return $this->_sheet;
-    }
-
-    /**
-     * Set Sheet
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setSheet($pValue = false) {
-    	$this->_sheet = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Objects
-     *
-     * @return boolean
-     */
-    function getObjects() {
-    	return $this->_objects;
-    }
-
-    /**
-     * Set Objects
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setObjects($pValue = false) {
-    	$this->_objects = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Scenarios
-     *
-     * @return boolean
-     */
-    function getScenarios() {
-    	return $this->_scenarios;
-    }
-
-    /**
-     * Set Scenarios
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setScenarios($pValue = false) {
-    	$this->_scenarios = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get FormatCells
-     *
-     * @return boolean
-     */
-    function getFormatCells() {
-    	return $this->_formatCells;
-    }
-
-    /**
-     * Set FormatCells
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setFormatCells($pValue = false) {
-    	$this->_formatCells = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get FormatColumns
-     *
-     * @return boolean
-     */
-    function getFormatColumns() {
-    	return $this->_formatColumns;
-    }
-
-    /**
-     * Set FormatColumns
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setFormatColumns($pValue = false) {
-    	$this->_formatColumns = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get FormatRows
-     *
-     * @return boolean
-     */
-    function getFormatRows() {
-    	return $this->_formatRows;
-    }
-
-    /**
-     * Set FormatRows
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setFormatRows($pValue = false) {
-    	$this->_formatRows = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get InsertColumns
-     *
-     * @return boolean
-     */
-    function getInsertColumns() {
-    	return $this->_insertColumns;
-    }
-
-    /**
-     * Set InsertColumns
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setInsertColumns($pValue = false) {
-    	$this->_insertColumns = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get InsertRows
-     *
-     * @return boolean
-     */
-    function getInsertRows() {
-    	return $this->_insertRows;
-    }
-
-    /**
-     * Set InsertRows
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setInsertRows($pValue = false) {
-    	$this->_insertRows = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get InsertHyperlinks
-     *
-     * @return boolean
-     */
-    function getInsertHyperlinks() {
-    	return $this->_insertHyperlinks;
-    }
-
-    /**
-     * Set InsertHyperlinks
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setInsertHyperlinks($pValue = false) {
-    	$this->_insertHyperlinks = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get DeleteColumns
-     *
-     * @return boolean
-     */
-    function getDeleteColumns() {
-    	return $this->_deleteColumns;
-    }
-
-    /**
-     * Set DeleteColumns
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setDeleteColumns($pValue = false) {
-    	$this->_deleteColumns = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get DeleteRows
-     *
-     * @return boolean
-     */
-    function getDeleteRows() {
-    	return $this->_deleteRows;
-    }
-
-    /**
-     * Set DeleteRows
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setDeleteRows($pValue = false) {
-    	$this->_deleteRows = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get SelectLockedCells
-     *
-     * @return boolean
-     */
-    function getSelectLockedCells() {
-    	return $this->_selectLockedCells;
-    }
-
-    /**
-     * Set SelectLockedCells
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setSelectLockedCells($pValue = false) {
-    	$this->_selectLockedCells = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Sort
-     *
-     * @return boolean
-     */
-    function getSort() {
-    	return $this->_sort;
-    }
-
-    /**
-     * Set Sort
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setSort($pValue = false) {
-    	$this->_sort = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get AutoFilter
-     *
-     * @return boolean
-     */
-    function getAutoFilter() {
-    	return $this->_autoFilter;
-    }
-
-    /**
-     * Set AutoFilter
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setAutoFilter($pValue = false) {
-    	$this->_autoFilter = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get PivotTables
-     *
-     * @return boolean
-     */
-    function getPivotTables() {
-    	return $this->_pivotTables;
-    }
-
-    /**
-     * Set PivotTables
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setPivotTables($pValue = false) {
-    	$this->_pivotTables = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get SelectUnlockedCells
-     *
-     * @return boolean
-     */
-    function getSelectUnlockedCells() {
-    	return $this->_selectUnlockedCells;
-    }
-
-    /**
-     * Set SelectUnlockedCells
-     *
-     * @param boolean $pValue
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setSelectUnlockedCells($pValue = false) {
-    	$this->_selectUnlockedCells = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Password (hashed)
-     *
-     * @return string
-     */
-    function getPassword() {
-    	return $this->_password;
-    }
-
-    /**
-     * Set Password
-     *
-     * @param string 	$pValue
-     * @param boolean 	$pAlreadyHashed If the password has already been hashed, set this to true
-     * @return PHPExcel_Worksheet_Protection
-     */
-    function setPassword($pValue = '', $pAlreadyHashed = false) {
-    	if (!$pAlreadyHashed) {
-    		$pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
-    	}
-		$this->_password = $pValue;
-		return $this;
-    }
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/Row.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/Row.php
deleted file mode 100755
index 0a4d1db01..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/Row.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_Row
- *
- * Represents a row in PHPExcel_Worksheet, used by PHPExcel_Worksheet_RowIterator
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_Row
-{
-	/**
-	 * PHPExcel_Worksheet
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_parent;
-
-	/**
-	 * Row index
-	 *
-	 * @var int
-	 */
-	private $_rowIndex = 0;
-
-	/**
-	 * Create a new row
-	 *
-	 * @param PHPExcel_Worksheet 		$parent
-	 * @param int						$rowIndex
-	 */
-	public function __construct(PHPExcel_Worksheet $parent = null, $rowIndex = 1) {
-		// Set parent and row index
-		$this->_parent 		= $parent;
-		$this->_rowIndex 	= $rowIndex;
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		unset($this->_parent);
-	}
-
-	/**
-	 * Get row index
-	 *
-	 * @return int
-	 */
-	public function getRowIndex() {
-		return $this->_rowIndex;
-	}
-
-	/**
-	 * Get cell iterator
-	 *
-	 * @return PHPExcel_Worksheet_CellIterator
-	 */
-	public function getCellIterator() {
-		return new PHPExcel_Worksheet_CellIterator($this->_parent, $this->_rowIndex);
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/RowDimension.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/RowDimension.php
deleted file mode 100755
index 0cc778f5a..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/RowDimension.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_RowDimension
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_RowDimension
-{
-	/**
-	 * Row index
-	 *
-	 * @var int
-	 */
-	private $_rowIndex;
-
-	/**
-	 * Row height (in pt)
-	 *
-	 * When this is set to a negative value, the row height should be ignored by IWriter
-	 *
-	 * @var double
-	 */
-	private $_rowHeight		= -1;
-
- 	/**
-	 * ZeroHeight for Row?
-	 *
-	 * @var bool
-	 */
-	private $_zeroHeight	= false;
-
-	/**
-	 * Visible?
-	 *
-	 * @var bool
-	 */
-	private $_visible		= true;
-
-	/**
-	 * Outline level
-	 *
-	 * @var int
-	 */
-	private $_outlineLevel	= 0;
-
-	/**
-	 * Collapsed
-	 *
-	 * @var bool
-	 */
-	private $_collapsed		= false;
-
-	/**
-	 * Index to cellXf. Null value means row has no explicit cellXf format.
-	 *
-	 * @var int|null
-	 */
-	private $_xfIndex;
-
-    /**
-     * Create a new PHPExcel_Worksheet_RowDimension
-     *
-     * @param int $pIndex Numeric row index
-     */
-    public function __construct($pIndex = 0)
-    {
-    	// Initialise values
-    	$this->_rowIndex		= $pIndex;
-
-		// set row dimension as unformatted by default
-		$this->_xfIndex = null;
-    }
-
-    /**
-     * Get Row Index
-     *
-     * @return int
-     */
-    public function getRowIndex() {
-    	return $this->_rowIndex;
-    }
-
-    /**
-     * Set Row Index
-     *
-     * @param int $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setRowIndex($pValue) {
-    	$this->_rowIndex = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Row Height
-     *
-     * @return double
-     */
-    public function getRowHeight() {
-    	return $this->_rowHeight;
-    }
-
-    /**
-     * Set Row Height
-     *
-     * @param double $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setRowHeight($pValue = -1) {
-    	$this->_rowHeight = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get ZeroHeight
-	 *
-	 * @return bool
-	 */
-	public function getzeroHeight() {
-		return $this->_zeroHeight;
-	}
-
-	/**
-	 * Set ZeroHeight
-	 *
-	 * @param bool $pValue
-	 * @return PHPExcel_Worksheet_RowDimension
-	 */
-	public function setzeroHeight($pValue = false) {
-		$this->_zeroHeight = $pValue;
-		return $this;
-	}
-
-    /**
-     * Get Visible
-     *
-     * @return bool
-     */
-    public function getVisible() {
-    	return $this->_visible;
-    }
-
-    /**
-     * Set Visible
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setVisible($pValue = true) {
-    	$this->_visible = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Outline Level
-     *
-     * @return int
-     */
-    public function getOutlineLevel() {
-    	return $this->_outlineLevel;
-    }
-
-    /**
-     * Set Outline Level
-     *
-     * Value must be between 0 and 7
-     *
-     * @param int $pValue
-     * @throws Exception
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setOutlineLevel($pValue) {
-    	if ($pValue < 0 || $pValue > 7) {
-    		throw new Exception("Outline level must range between 0 and 7.");
-    	}
-
-    	$this->_outlineLevel = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Collapsed
-     *
-     * @return bool
-     */
-    public function getCollapsed() {
-    	return $this->_collapsed;
-    }
-
-    /**
-     * Set Collapsed
-     *
-     * @param bool $pValue
-     * @return PHPExcel_Worksheet_RowDimension
-     */
-    public function setCollapsed($pValue = true) {
-    	$this->_collapsed = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get index to cellXf
-	 *
-	 * @return int
-	 */
-	public function getXfIndex()
-	{
-		return $this->_xfIndex;
-	}
-
-	/**
-	 * Set index to cellXf
-	 *
-	 * @param int $pValue
-	 * @return PHPExcel_Worksheet_RowDimension
-	 */
-	public function setXfIndex($pValue = 0)
-	{
-		$this->_xfIndex = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/RowIterator.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/RowIterator.php
deleted file mode 100755
index c03038c40..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/RowIterator.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_RowIterator
- *
- * Used to iterate rows in a PHPExcel_Worksheet
- *
- * @category   PHPExcel
- * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_RowIterator implements Iterator
-{
-	/**
-	 * PHPExcel_Worksheet to iterate
-	 *
-	 * @var PHPExcel_Worksheet
-	 */
-	private $_subject;
-
-	/**
-	 * Current iterator position
-	 *
-	 * @var int
-	 */
-	private $_position = 1;
-
-	/**
-	 * Start position
-	 *
-	 * @var int
-	 */
-	private $_startRow = 1;
-
-
-	/**
-	 * Create a new row iterator
-	 *
-	 * @param	PHPExcel_Worksheet	$subject	The worksheet to iterate over
-	 * @param	integer				$startRow	The row number at which to start iterating
-	 */
-	public function __construct(PHPExcel_Worksheet $subject = null, $startRow = 1) {
-		// Set subject
-		$this->_subject = $subject;
-		$this->resetStart($startRow);
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		unset($this->_subject);
-	}
-
-	/**
-	 * (Re)Set the start row and the current row pointer
-	 *
-	 * @param integer	$startRow	The row number at which to start iterating
-	 */
-	public function resetStart($startRow = 1) {
-		$this->_startRow = $startRow;
-		$this->seek($startRow);
-	}
-
-	/**
-	 * Set the row pointer to the selected row
-	 *
-	 * @param integer	$row	The row number to set the current pointer at
-	 */
-	public function seek($row = 1) {
-		$this->_position = $row;
-	}
-
-	/**
-	 * Rewind the iterator to the starting row
-	 */
-	public function rewind() {
-		$this->_position = $this->_startRow;
-	}
-
-	/**
-	 * Return the current row in this worksheet
-	 *
-	 * @return PHPExcel_Worksheet_Row
-	 */
-	public function current() {
-		return new PHPExcel_Worksheet_Row($this->_subject, $this->_position);
-	}
-
-	/**
-	 * Return the current iterator key
-	 *
-	 * @return int
-	 */
-	public function key() {
-		return $this->_position;
-	}
-
-	/**
-	 * Set the iterator to its next value
-	 */
-	public function next() {
-		++$this->_position;
-	}
-
-	/**
-	 * Set the iterator to its previous value
-	 */
-	public function prev() {
-		if ($this->_position > 1)
-			--$this->_position;
-	}
-
-	/**
-	 * Indicate if more rows exist in the worksheet
-	 *
-	 * @return boolean
-	 */
-	public function valid() {
-		return $this->_position <= $this->_subject->getHighestRow();
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Worksheet/SheetView.php b/plugins/exportTypes/Excel/PHPExcel/Worksheet/SheetView.php
deleted file mode 100755
index 9ae4bf064..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Worksheet/SheetView.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Worksheet_SheetView
- *
- * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Worksheet_SheetView
-{
-
-	/* Sheet View types */
-	const SHEETVIEW_NORMAL				= 'normal';
-	const SHEETVIEW_PAGE_LAYOUT			= 'pageLayout';
-	const SHEETVIEW_PAGE_BREAK_PREVIEW	= 'pageBreakPreview';
-
-	private static $_sheetViewTypes = array(
-		self::SHEETVIEW_NORMAL,
-		self::SHEETVIEW_PAGE_LAYOUT,
-		self::SHEETVIEW_PAGE_BREAK_PREVIEW,
-	);
-
-	/**
-	 * ZoomScale
-	 *
-	 * Valid values range from 10 to 400.
-	 *
-	 * @var int
-	 */
-	private $_zoomScale			= 100;
-
-	/**
-	 * ZoomScaleNormal
-	 *
-	 * Valid values range from 10 to 400.
-	 *
-	 * @var int
-	 */
-	private $_zoomScaleNormal	= 100;
-
-	/**
-	 * View
-	 *
-	 * Valid values range from 10 to 400.
-	 *
-	 * @var string
-	 */
-	private $_sheetviewType		= self::SHEETVIEW_NORMAL;
-
-    /**
-     * Create a new PHPExcel_Worksheet_SheetView
-     */
-    public function __construct()
-    {
-    }
-
-	/**
-	 * Get ZoomScale
-	 *
-	 * @return int
-	 */
-	public function getZoomScale() {
-		return $this->_zoomScale;
-	}
-
-	/**
-	 * Set ZoomScale
-	 *
-	 * Valid values range from 10 to 400.
-	 *
-	 * @param 	int 	$pValue
-	 * @throws 	Exception
-	 * @return PHPExcel_Worksheet_SheetView
-	 */
-	public function setZoomScale($pValue = 100) {
-		// Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
-		// but it is apparently still able to handle any scale >= 1
-		if (($pValue >= 1) || is_null($pValue)) {
-			$this->_zoomScale = $pValue;
-		} else {
-			throw new Exception("Scale must be greater than or equal to 1.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get ZoomScaleNormal
-	 *
-	 * @return int
-	 */
-	public function getZoomScaleNormal() {
-		return $this->_zoomScaleNormal;
-	}
-
-	/**
-	 * Set ZoomScale
-	 *
-	 * Valid values range from 10 to 400.
-	 *
-	 * @param 	int 	$pValue
-	 * @throws 	Exception
-	 * @return PHPExcel_Worksheet_SheetView
-	 */
-	public function setZoomScaleNormal($pValue = 100) {
-		if (($pValue >= 1) || is_null($pValue)) {
-			$this->_zoomScaleNormal = $pValue;
-		} else {
-			throw new Exception("Scale must be greater than or equal to 1.");
-		}
-		return $this;
-	}
-
-	/**
-	 * Get View
-	 *
-	 * @return string
-	 */
-	public function getView() {
-		return $this->_sheetviewType;
-	}
-
-	/**
-	 * Set View
-	 *
-	 * Valid values are
-	 *		'normal'			self::SHEETVIEW_NORMAL
-	 *		'pageLayout'		self::SHEETVIEW_PAGE_LAYOUT
-	 *		'pageBreakPreview'	self::SHEETVIEW_PAGE_BREAK_PREVIEW
-	 *
-	 * @param 	string 	$pValue
-	 * @throws 	Exception
-	 * @return PHPExcel_Worksheet_SheetView
-	 */
-	public function setView($pValue = NULL) {
-		//	MS Excel 2007 allows setting the view to 'normal', 'pageLayout' or 'pageBreakPreview'
-		//		via the user interface
-		if ($pValue === NULL)
-			$pValue = self::SHEETVIEW_NORMAL;
-		if (in_array($pValue, self::$_sheetViewTypes)) {
-			$this->_sheetviewType = $pValue;
-		} else {
-			throw new Exception("Invalid sheetview layout type.");
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
-	 */
-	public function __clone() {
-		$vars = get_object_vars($this);
-		foreach ($vars as $key => $value) {
-			if (is_object($value)) {
-				$this->$key = clone $value;
-			} else {
-				$this->$key = $value;
-			}
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/WorksheetIterator.php b/plugins/exportTypes/Excel/PHPExcel/WorksheetIterator.php
deleted file mode 100755
index b7180f61b..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/WorksheetIterator.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_WorksheetIterator
- *
- * Used to iterate worksheets in PHPExcel
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_WorksheetIterator implements Iterator
-{
-	/**
-	 * Spreadsheet to iterate
-	 *
-	 * @var PHPExcel
-	 */
-	private $_subject;
-
-	/**
-	 * Current iterator position
-	 *
-	 * @var int
-	 */
-	private $_position = 0;
-
-	/**
-	 * Create a new worksheet iterator
-	 *
-	 * @param PHPExcel 		$subject
-	 */
-	public function __construct(PHPExcel $subject = null) {
-		// Set subject
-		$this->_subject = $subject;
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct() {
-		unset($this->_subject);
-	}
-
-	/**
-	 * Rewind iterator
-	 */
-    public function rewind() {
-        $this->_position = 0;
-    }
-
-    /**
-     * Current PHPExcel_Worksheet
-     *
-     * @return PHPExcel_Worksheet
-     */
-    public function current() {
-    	return $this->_subject->getSheet($this->_position);
-    }
-
-    /**
-     * Current key
-     *
-     * @return int
-     */
-    public function key() {
-        return $this->_position;
-    }
-
-    /**
-     * Next value
-     */
-    public function next() {
-        ++$this->_position;
-    }
-
-    /**
-     * More PHPExcel_Worksheet instances available?
-     *
-     * @return boolean
-     */
-    public function valid() {
-        return $this->_position < $this->_subject->getSheetCount();
-    }
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/CSV.php b/plugins/exportTypes/Excel/PHPExcel/Writer/CSV.php
deleted file mode 100755
index 212676cf2..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/CSV.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_CSV
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter {
-	/**
-	 * PHPExcel object
-	 *
-	 * @var PHPExcel
-	 */
-	private $_phpExcel;
-
-	/**
-	 * Delimiter
-	 *
-	 * @var string
-	 */
-	private $_delimiter	= ',';
-
-	/**
-	 * Enclosure
-	 *
-	 * @var string
-	 */
-	private $_enclosure	= '"';
-
-	/**
-	 * Line ending
-	 *
-	 * @var string
-	 */
-	private $_lineEnding	= PHP_EOL;
-
-	/**
-	 * Sheet index to write
-	 *
-	 * @var int
-	 */
-	private $_sheetIndex	= 0;
-
-	/**
-	 * Pre-calculate formulas
-	 *
-	 * @var boolean
-	 */
-	private $_preCalculateFormulas = true;
-
-	/**
-	 * Whether to write a BOM (for UTF8).
-	 *
-	 * @var boolean
-	 */
-	private $_useBOM = false;
-
-	/**
-	 * Whether to write a fully Excel compatible CSV file.
-	 *
-	 * @var boolean
-	 */
-	private $_excelCompatibility = false;
-
-	/**
-	 * Create a new PHPExcel_Writer_CSV
-	 *
-	 * @param	PHPExcel	$phpExcel	PHPExcel object
-	 */
-	public function __construct(PHPExcel $phpExcel) {
-		$this->_phpExcel	= $phpExcel;
-	}
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param	string		$pFilename
-	 * @throws	Exception
-	 */
-	public function save($pFilename = null) {
-		// Fetch sheet
-		$sheet = $this->_phpExcel->getSheet($this->_sheetIndex);
-
-		$saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog;
-		PHPExcel_Calculation::getInstance()->writeDebugLog = false;
-		$saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
-		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'wb+');
-		if ($fileHandle === false) {
-			throw new Exception("Could not open file $pFilename for writing.");
-		}
-
-		if ($this->_excelCompatibility) {
-			// Write the UTF-16LE BOM code
-			fwrite($fileHandle, "\xFF\xFE");	//	Excel uses UTF-16LE encoding
-			$this->setEnclosure();				//	Default enclosure is "
-			$this->setDelimiter("\t");			//	Excel delimiter is a TAB
-		} elseif ($this->_useBOM) {
-			// Write the UTF-8 BOM code
-			fwrite($fileHandle, "\xEF\xBB\xBF");
-		}
-
-		//	Identify the range that we need to extract from the worksheet
-		$maxCol = $sheet->getHighestColumn();
-		$maxRow = $sheet->getHighestRow();
-
-		// Write rows to file
-		for($row = 1; $row <= $maxRow; ++$row) {
-			// Convert the row to an array...
-			$cellsArray = $sheet->rangeToArray('A'.$row.':'.$maxCol.$row,'', $this->_preCalculateFormulas);
-			// ... and write to the file
-			$this->_writeLine($fileHandle, $cellsArray[0]);
-		}
-
-		// Close file
-		fclose($fileHandle);
-
-		PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
-		PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog;
-	}
-
-	/**
-	 * Get delimiter
-	 *
-	 * @return string
-	 */
-	public function getDelimiter() {
-		return $this->_delimiter;
-	}
-
-	/**
-	 * Set delimiter
-	 *
-	 * @param	string	$pValue		Delimiter, defaults to ,
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setDelimiter($pValue = ',') {
-		$this->_delimiter = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get enclosure
-	 *
-	 * @return string
-	 */
-	public function getEnclosure() {
-		return $this->_enclosure;
-	}
-
-	/**
-	 * Set enclosure
-	 *
-	 * @param	string	$pValue		Enclosure, defaults to "
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setEnclosure($pValue = '"') {
-		if ($pValue == '') {
-			$pValue = null;
-		}
-		$this->_enclosure = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get line ending
-	 *
-	 * @return string
-	 */
-	public function getLineEnding() {
-		return $this->_lineEnding;
-	}
-
-	/**
-	 * Set line ending
-	 *
-	 * @param	string	$pValue		Line ending, defaults to OS line ending (PHP_EOL)
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setLineEnding($pValue = PHP_EOL) {
-		$this->_lineEnding = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get whether BOM should be used
-	 *
-	 * @return boolean
-	 */
-	public function getUseBOM() {
-		return $this->_useBOM;
-	}
-
-	/**
-	 * Set whether BOM should be used
-	 *
-	 * @param	boolean	$pValue		Use UTF-8 byte-order mark? Defaults to false
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setUseBOM($pValue = false) {
-		$this->_useBOM = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get whether the file should be saved with full Excel Compatibility
-	 *
-	 * @return boolean
-	 */
-	public function getExcelCompatibility() {
-		return $this->_excelCompatibility;
-	}
-
-	/**
-	 * Set whether the file should be saved with full Excel Compatibility
-	 *
-	 * @param	boolean	$pValue		Set the file to be written as a fully Excel compatible csv file
-	 *								Note that this overrides other settings such as useBOM, enclosure and delimiter
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setExcelCompatibility($pValue = false) {
-		$this->_excelCompatibility = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get sheet index
-	 *
-	 * @return int
-	 */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
-	}
-
-	/**
-	 * Set sheet index
-	 *
-	 * @param	int		$pValue		Sheet index
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Write line to CSV file
-	 *
-	 * @param	mixed	$pFileHandle	PHP filehandle
-	 * @param	array	$pValues		Array containing values in a row
-	 * @throws	Exception
-	 */
-	private function _writeLine($pFileHandle = null, $pValues = null) {
-		if (is_array($pValues)) {
-			// No leading delimiter
-			$writeDelimiter = false;
-
-			// Build the line
-			$line = '';
-
-			foreach ($pValues as $element) {
-				// Escape enclosures
-				$element = str_replace($this->_enclosure, $this->_enclosure . $this->_enclosure, $element);
-
-				// Add delimiter
-				if ($writeDelimiter) {
-					$line .= $this->_delimiter;
-				} else {
-					$writeDelimiter = true;
-				}
-
-				// Add enclosed string
-				$line .= $this->_enclosure . $element . $this->_enclosure;
-			}
-
-			// Add line ending
-			$line .= $this->_lineEnding;
-
-			// Write to file
-			if ($this->_excelCompatibility) {
-				fwrite($pFileHandle, mb_convert_encoding($line,"UTF-16LE","UTF-8"));
-			} else {
-				fwrite($pFileHandle, $line);
-			}
-		} else {
-			throw new Exception("Invalid data row passed to CSV writer.");
-		}
-	}
-
-	/**
-	 * Get Pre-Calculate Formulas
-	 *
-	 * @return boolean
-	 */
-	public function getPreCalculateFormulas() {
-		return $this->_preCalculateFormulas;
-	}
-
-	/**
-	 * Set Pre-Calculate Formulas
-	 *
-	 * @param boolean $pValue	Pre-Calculate Formulas?
-	 * @return PHPExcel_Writer_CSV
-	 */
-	public function setPreCalculateFormulas($pValue = true) {
-		$this->_preCalculateFormulas = $pValue;
-		return $this;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007.php
deleted file mode 100755
index acf6072f8..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007.php
+++ /dev/null
@@ -1,583 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter
-{
-	/**
-	 * Write charts that are defined in the workbook?
-	 * Identifies whether the Writer should write definitions for any charts that exist in the PHPExcel object;
-	 *
-	 * @var	boolean
-	 */
-	private $_includeCharts = false;
-
-	/**
-	 * Pre-calculate formulas
-	 *
-	 * @var boolean
-	 */
-	private $_preCalculateFormulas = true;
-
-	/**
-	 * Office2003 compatibility
-	 *
-	 * @var boolean
-	 */
-	private $_office2003compatibility = false;
-
-	/**
-	 * Private writer parts
-	 *
-	 * @var PHPExcel_Writer_Excel2007_WriterPart[]
-	 */
-	private $_writerParts	= array();
-
-	/**
-	 * Private PHPExcel
-	 *
-	 * @var PHPExcel
-	 */
-	private $_spreadSheet;
-
-	/**
-	 * Private string table
-	 *
-	 * @var string[]
-	 */
-	private $_stringTable	= array();
-
-	/**
-	 * Private unique PHPExcel_Style_Conditional HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_stylesConditionalHashTable;
-
-	/**
-	 * Private unique PHPExcel_Style_Fill HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_fillHashTable;
-
-	/**
-	 * Private unique PHPExcel_Style_Font HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_fontHashTable;
-
-	/**
-	 * Private unique PHPExcel_Style_Borders HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_bordersHashTable ;
-
-	/**
-	 * Private unique PHPExcel_Style_NumberFormat HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_numFmtHashTable;
-
-	/**
-	 * Private unique PHPExcel_Worksheet_BaseDrawing HashTable
-	 *
-	 * @var PHPExcel_HashTable
-	 */
-	private $_drawingHashTable;
-
-	/**
-	 * Use disk caching where possible?
-	 *
-	 * @var boolean
-	 */
-	private $_useDiskCaching = false;
-
-	/**
-	 * Disk caching directory
-	 *
-	 * @var string
-	 */
-	private $_diskCachingDirectory	= './';
-
-    /**
-     * Create a new PHPExcel_Writer_Excel2007
-     *
-	 * @param 	PHPExcel	$pPHPExcel
-     */
-    public function __construct(PHPExcel $pPHPExcel = null)
-    {
-    	// Assign PHPExcel
-		$this->setPHPExcel($pPHPExcel);
-
-    	$writerPartsArray = array(	'stringtable'	=> 'PHPExcel_Writer_Excel2007_StringTable',
-									'contenttypes'	=> 'PHPExcel_Writer_Excel2007_ContentTypes',
-									'docprops' 		=> 'PHPExcel_Writer_Excel2007_DocProps',
-									'rels'			=> 'PHPExcel_Writer_Excel2007_Rels',
-									'theme' 		=> 'PHPExcel_Writer_Excel2007_Theme',
-									'style' 		=> 'PHPExcel_Writer_Excel2007_Style',
-									'workbook' 		=> 'PHPExcel_Writer_Excel2007_Workbook',
-									'worksheet' 	=> 'PHPExcel_Writer_Excel2007_Worksheet',
-									'drawing' 		=> 'PHPExcel_Writer_Excel2007_Drawing',
-									'comments' 		=> 'PHPExcel_Writer_Excel2007_Comments',
-									'chart'			=> 'PHPExcel_Writer_Excel2007_Chart',
-								 );
-
-    	//	Initialise writer parts
-		//		and Assign their parent IWriters
-		foreach ($writerPartsArray as $writer => $class) {
-			$this->_writerParts[$writer] = new $class($this);
-		}
-
-    	$hashTablesArray = array( '_stylesConditionalHashTable',	'_fillHashTable',		'_fontHashTable',
-								  '_bordersHashTable',				'_numFmtHashTable',		'_drawingHashTable'
-							    );
-
-		// Set HashTable variables
-		foreach ($hashTablesArray as $tableName) {
-			$this->$tableName 	= new PHPExcel_HashTable();
-		}
-    }
-
-	/**
-	 * Get writer part
-	 *
-	 * @param 	string 	$pPartName		Writer part name
-	 * @return 	PHPExcel_Writer_Excel2007_WriterPart
-	 */
-	public function getWriterPart($pPartName = '') {
-		if ($pPartName != '' && isset($this->_writerParts[strtolower($pPartName)])) {
-			return $this->_writerParts[strtolower($pPartName)];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	Exception
-	 */
-	public function save($pFilename = null)
-	{
-		if ($this->_spreadSheet !== NULL) {
-			// garbage collect
-			$this->_spreadSheet->garbageCollect();
-
-			// If $pFilename is php://output or php://stdout, make it a temporary file...
-			$originalFilename = $pFilename;
-			if (strtolower($pFilename) == 'php://output' || strtolower($pFilename) == 'php://stdout') {
-				$pFilename = @tempnam(PHPExcel_Shared_File::sys_get_temp_dir(), 'phpxltmp');
-				if ($pFilename == '') {
-					$pFilename = $originalFilename;
-				}
-			}
-
-			$saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog;
-			PHPExcel_Calculation::getInstance()->writeDebugLog = false;
-			$saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType();
-			PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
-
-			// Create string lookup table
-			$this->_stringTable = array();
-			for ($i = 0; $i < $this->_spreadSheet->getSheetCount(); ++$i) {
-				$this->_stringTable = $this->getWriterPart('StringTable')->createStringTable($this->_spreadSheet->getSheet($i), $this->_stringTable);
-			}
-
-			// Create styles dictionaries
-			$this->_stylesConditionalHashTable->addFromSource( 	$this->getWriterPart('Style')->allConditionalStyles($this->_spreadSheet) 			);
-			$this->_fillHashTable->addFromSource( 				$this->getWriterPart('Style')->allFills($this->_spreadSheet) 			);
-			$this->_fontHashTable->addFromSource( 				$this->getWriterPart('Style')->allFonts($this->_spreadSheet) 			);
-			$this->_bordersHashTable->addFromSource( 			$this->getWriterPart('Style')->allBorders($this->_spreadSheet) 			);
-			$this->_numFmtHashTable->addFromSource( 			$this->getWriterPart('Style')->allNumberFormats($this->_spreadSheet) 	);
-
-			// Create drawing dictionary
-			$this->_drawingHashTable->addFromSource( 			$this->getWriterPart('Drawing')->allDrawings($this->_spreadSheet) 		);
-
-			// Create new ZIP file and open it for writing
-			$zipClass = PHPExcel_Settings::getZipClass();
-			$objZip = new $zipClass();
-
-			//	Retrieve OVERWRITE and CREATE constants from the instantiated zip class
-			//	This method of accessing constant values from a dynamic class should work with all appropriate versions of PHP
-			$ro = new ReflectionObject($objZip);
-			$zipOverWrite = $ro->getConstant('OVERWRITE');
-			$zipCreate = $ro->getConstant('CREATE');
-
-			if (file_exists($pFilename)) {
-				unlink($pFilename);
-			}
-			// Try opening the ZIP file
-			if ($objZip->open($pFilename, $zipOverWrite) !== true) {
-				if ($objZip->open($pFilename, $zipCreate) !== true) {
-					throw new Exception("Could not open " . $pFilename . " for writing.");
-				}
-			}
-
-			// Add [Content_Types].xml to ZIP file
-			$objZip->addFromString('[Content_Types].xml', 			$this->getWriterPart('ContentTypes')->writeContentTypes($this->_spreadSheet, $this->_includeCharts));
-
-			// Add relationships to ZIP file
-			$objZip->addFromString('_rels/.rels', 					$this->getWriterPart('Rels')->writeRelationships($this->_spreadSheet));
-			$objZip->addFromString('xl/_rels/workbook.xml.rels', 	$this->getWriterPart('Rels')->writeWorkbookRelationships($this->_spreadSheet));
-
-			// Add document properties to ZIP file
-			$objZip->addFromString('docProps/app.xml', 				$this->getWriterPart('DocProps')->writeDocPropsApp($this->_spreadSheet));
-			$objZip->addFromString('docProps/core.xml', 			$this->getWriterPart('DocProps')->writeDocPropsCore($this->_spreadSheet));
-			$customPropertiesPart = $this->getWriterPart('DocProps')->writeDocPropsCustom($this->_spreadSheet);
-			if ($customPropertiesPart !== NULL) {
-				$objZip->addFromString('docProps/custom.xml', 		$customPropertiesPart);
-			}
-
-			// Add theme to ZIP file
-			$objZip->addFromString('xl/theme/theme1.xml', 			$this->getWriterPart('Theme')->writeTheme($this->_spreadSheet));
-
-			// Add string table to ZIP file
-			$objZip->addFromString('xl/sharedStrings.xml', 			$this->getWriterPart('StringTable')->writeStringTable($this->_stringTable));
-
-			// Add styles to ZIP file
-			$objZip->addFromString('xl/styles.xml', 				$this->getWriterPart('Style')->writeStyles($this->_spreadSheet));
-
-			// Add workbook to ZIP file
-			$objZip->addFromString('xl/workbook.xml', 				$this->getWriterPart('Workbook')->writeWorkbook($this->_spreadSheet, $this->_preCalculateFormulas));
-
-			$chartCount = 0;
-			// Add worksheets
-			for ($i = 0; $i < $this->_spreadSheet->getSheetCount(); ++$i) {
-				$objZip->addFromString('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->_spreadSheet->getSheet($i), $this->_stringTable, $this->_includeCharts));
-				if ($this->_includeCharts) {
-					$charts = $this->_spreadSheet->getSheet($i)->getChartCollection();
-					if (count($charts) > 0) {
-						foreach($charts as $chart) {
-							$objZip->addFromString('xl/charts/chart' . ($chartCount + 1) . '.xml', $this->getWriterPart('Chart')->writeChart($chart));
-							$chartCount++;
-						}
-					}
-				}
-			}
-
-			$chartRef1 = $chartRef2 = 0;
-			// Add worksheet relationships (drawings, ...)
-			for ($i = 0; $i < $this->_spreadSheet->getSheetCount(); ++$i) {
-
-				// Add relationships
-				$objZip->addFromString('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', 	$this->getWriterPart('Rels')->writeWorksheetRelationships($this->_spreadSheet->getSheet($i), ($i + 1), $this->_includeCharts));
-
-				$drawings = $this->_spreadSheet->getSheet($i)->getDrawingCollection();
-				$drawingCount = count($drawings);
-				if ($this->_includeCharts) {
-					$chartCount = $this->_spreadSheet->getSheet($i)->getChartCount();
-				}
-
-				// Add drawing and image relationship parts
-				if (($drawingCount > 0) || ($chartCount > 0)) {
-					// Drawing relationships
-					$objZip->addFromString('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->_spreadSheet->getSheet($i),$chartRef1, $this->_includeCharts));
-
-					// Drawings
-					$objZip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->_spreadSheet->getSheet($i),$chartRef2,$this->_includeCharts));
-				}
-
-				// Add comment relationship parts
-				if (count($this->_spreadSheet->getSheet($i)->getComments()) > 0) {
-					// VML Comments
-					$objZip->addFromString('xl/drawings/vmlDrawing' . ($i + 1) . '.vml', $this->getWriterPart('Comments')->writeVMLComments($this->_spreadSheet->getSheet($i)));
-
-					// Comments
-					$objZip->addFromString('xl/comments' . ($i + 1) . '.xml', $this->getWriterPart('Comments')->writeComments($this->_spreadSheet->getSheet($i)));
-				}
-
-				// Add header/footer relationship parts
-				if (count($this->_spreadSheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
-					// VML Drawings
-					$objZip->addFromString('xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->_spreadSheet->getSheet($i)));
-
-					// VML Drawing relationships
-					$objZip->addFromString('xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->_spreadSheet->getSheet($i)));
-
-					// Media
-					foreach ($this->_spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
-						$objZip->addFromString('xl/media/' . $image->getIndexedFilename(), file_get_contents($image->getPath()));
-					}
-				}
-			}
-
-			// Add media
-			for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
-				if ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_Drawing) {
-					$imageContents = null;
-					$imagePath = $this->getDrawingHashTable()->getByIndex($i)->getPath();
-
-					if (strpos($imagePath, 'zip://') !== false) {
-						$imagePath = substr($imagePath, 6);
-						$imagePathSplitted = explode('#', $imagePath);
-
-						$imageZip = new ZipArchive();
-						$imageZip->open($imagePathSplitted[0]);
-						$imageContents = $imageZip->getFromName($imagePathSplitted[1]);
-						$imageZip->close();
-						unset($imageZip);
-					} else {
-						$imageContents = file_get_contents($imagePath);
-					}
-
-					$objZip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
-				} else if ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_MemoryDrawing) {
-					ob_start();
-					call_user_func(
-						$this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction(),
-						$this->getDrawingHashTable()->getByIndex($i)->getImageResource()
-					);
-					$imageContents = ob_get_contents();
-					ob_end_clean();
-
-					$objZip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
-				}
-			}
-
-			PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType);
-			PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog;
-
-			// Close file
-			if ($objZip->close() === false) {
-				throw new Exception("Could not close zip file $pFilename.");
-			}
-
-			// If a temporary file was used, copy it to the correct file stream
-			if ($originalFilename != $pFilename) {
-				if (copy($pFilename, $originalFilename) === false) {
-					throw new Exception("Could not copy temporary zip file $pFilename to $originalFilename.");
-				}
-				@unlink($pFilename);
-			}
-		} else {
-			throw new Exception("PHPExcel object unassigned.");
-		}
-	}
-
-	/**
-	 * Get PHPExcel object
-	 *
-	 * @return PHPExcel
-	 * @throws Exception
-	 */
-	public function getPHPExcel() {
-		if ($this->_spreadSheet !== null) {
-			return $this->_spreadSheet;
-		} else {
-			throw new Exception("No PHPExcel assigned.");
-		}
-	}
-
-	/**
-	 * Set PHPExcel object
-	 *
-	 * @param 	PHPExcel 	$pPHPExcel	PHPExcel object
-	 * @throws	Exception
-	 * @return PHPExcel_Writer_Excel2007
-	 */
-	public function setPHPExcel(PHPExcel $pPHPExcel = null) {
-		$this->_spreadSheet = $pPHPExcel;
-		return $this;
-	}
-
-    /**
-     * Get string table
-     *
-     * @return string[]
-     */
-    public function getStringTable() {
-    	return $this->_stringTable;
-    }
-
-    /**
-     * Get PHPExcel_Style_Conditional HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getStylesConditionalHashTable() {
-    	return $this->_stylesConditionalHashTable;
-    }
-
-    /**
-     * Get PHPExcel_Style_Fill HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getFillHashTable() {
-    	return $this->_fillHashTable;
-    }
-
-    /**
-     * Get PHPExcel_Style_Font HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getFontHashTable() {
-    	return $this->_fontHashTable;
-    }
-
-    /**
-     * Get PHPExcel_Style_Borders HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getBordersHashTable() {
-    	return $this->_bordersHashTable;
-    }
-
-    /**
-     * Get PHPExcel_Style_NumberFormat HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getNumFmtHashTable() {
-    	return $this->_numFmtHashTable;
-    }
-
-    /**
-     * Get PHPExcel_Worksheet_BaseDrawing HashTable
-     *
-     * @return PHPExcel_HashTable
-     */
-    public function getDrawingHashTable() {
-    	return $this->_drawingHashTable;
-    }
-
-	/**
-	 * Write charts in workbook?
-	 *		If this is true, then the Writer will write definitions for any charts that exist in the PHPExcel object.
-	 *		If false (the default) it will ignore any charts defined in the PHPExcel object.
-	 *
-	 * @return	boolean
-	 */
-	public function getIncludeCharts() {
-		return $this->_includeCharts;
-	}
-
-	/**
-	 * Set write charts in workbook
-	 *		Set to true, to advise the Writer to include any charts that exist in the PHPExcel object.
-	 *		Set to false (the default) to ignore charts.
-	 *
-	 * @param	boolean	$pValue
-	 *
-	 * @return	PHPExcel_Writer_Excel2007
-	 */
-	public function setIncludeCharts($pValue = false) {
-		$this->_includeCharts = (boolean) $pValue;
-		return $this;
-	}
-
-    /**
-     * Get Pre-Calculate Formulas
-     *
-     * @return boolean
-     */
-    public function getPreCalculateFormulas() {
-    	return $this->_preCalculateFormulas;
-    }
-
-    /**
-     * Set Pre-Calculate Formulas
-     *
-     * @param boolean $pValue	Pre-Calculate Formulas?
-     */
-    public function setPreCalculateFormulas($pValue = true) {
-    	$this->_preCalculateFormulas = $pValue;
-    }
-
-    /**
-     * Get Office2003 compatibility
-     *
-     * @return boolean
-     */
-    public function getOffice2003Compatibility() {
-    	return $this->_office2003compatibility;
-    }
-
-    /**
-     * Set Pre-Calculate Formulas
-     *
-     * @param boolean $pValue	Office2003 compatibility?
-     * @return PHPExcel_Writer_Excel2007
-     */
-    public function setOffice2003Compatibility($pValue = false) {
-    	$this->_office2003compatibility = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get use disk caching where possible?
-	 *
-	 * @return boolean
-	 */
-	public function getUseDiskCaching() {
-		return $this->_useDiskCaching;
-	}
-
-	/**
-	 * Set use disk caching where possible?
-	 *
-	 * @param 	boolean 	$pValue
-	 * @param	string		$pDirectory		Disk caching directory
-	 * @throws	Exception	Exception when directory does not exist
-	 * @return PHPExcel_Writer_Excel2007
-	 */
-	public function setUseDiskCaching($pValue = false, $pDirectory = null) {
-		$this->_useDiskCaching = $pValue;
-
-		if ($pDirectory !== NULL) {
-    		if (is_dir($pDirectory)) {
-    			$this->_diskCachingDirectory = $pDirectory;
-    		} else {
-    			throw new Exception("Directory does not exist: $pDirectory");
-    		}
-		}
-		return $this;
-	}
-
-	/**
-	 * Get disk caching directory
-	 *
-	 * @return string
-	 */
-	public function getDiskCachingDirectory() {
-		return $this->_diskCachingDirectory;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Chart.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Chart.php
deleted file mode 100755
index 003277280..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Chart.php
+++ /dev/null
@@ -1,1181 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Chart
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write charts to XML format
-	 *
-	 * @param 	PHPExcel_Chart				$pChart
-	 * @return 	string 						XML Output
-	 * @throws 	Exception
-	 */
-	public function writeChart(PHPExcel_Chart $pChart = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-		//	Ensure that data series values are up-to-date before we save
-		$pChart->refresh();
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// c:chartSpace
-		$objWriter->startElement('c:chartSpace');
-			$objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
-			$objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
-			$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-
-			$objWriter->startElement('c:date1904');
-				$objWriter->writeAttribute('val', 0);
-			$objWriter->endElement();
-			$objWriter->startElement('c:lang');
-				$objWriter->writeAttribute('val', "en-GB");
-			$objWriter->endElement();
-			$objWriter->startElement('c:roundedCorners');
-				$objWriter->writeAttribute('val', 0);
-			$objWriter->endElement();
-
-			$this->_writeAlternateContent($objWriter);
-
-			$objWriter->startElement('c:chart');
-
-				$this->_writeTitle($pChart->getTitle(), $objWriter);
-
-				$objWriter->startElement('c:autoTitleDeleted');
-					$objWriter->writeAttribute('val', 0);
-				$objWriter->endElement();
-
-				$this->_writePlotArea($pChart->getPlotArea(),
-									  $pChart->getXAxisLabel(),
-									  $pChart->getYAxisLabel(),
-									  $objWriter,
-									  $pChart->getWorksheet()
-									 );
-
-				$this->_writeLegend($pChart->getLegend(), $objWriter);
-
-
-				$objWriter->startElement('c:plotVisOnly');
-					$objWriter->writeAttribute('val', 1);
-				$objWriter->endElement();
-
-				$objWriter->startElement('c:dispBlanksAs');
-					$objWriter->writeAttribute('val', "gap");
-				$objWriter->endElement();
-
-				$objWriter->startElement('c:showDLblsOverMax');
-					$objWriter->writeAttribute('val', 0);
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			$this->_writePrintSettings($objWriter);
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write Chart Title
-	 *
-	 * @param	PHPExcel_Chart_Title		$title
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @throws 	Exception
-	 */
-	private function _writeTitle(PHPExcel_Chart_Title $title = null, $objWriter)
-	{
-		if (is_null($title)) {
-			return;
-		}
-
-		$objWriter->startElement('c:title');
-			$objWriter->startElement('c:tx');
-				$objWriter->startElement('c:rich');
-
-					$objWriter->startElement('a:bodyPr');
-					$objWriter->endElement();
-
-					$objWriter->startElement('a:lstStyle');
-					$objWriter->endElement();
-
-					$objWriter->startElement('a:p');
-
-						$caption = $title->getCaption();
-						if ((is_array($caption)) && (count($caption) > 0))
-							$caption = $caption[0];
-						$this->getParentWriter()->getWriterPart('stringtable')->writeRichTextForCharts($objWriter, $caption, 'a');
-
-					$objWriter->endElement();
-				$objWriter->endElement();
-			$objWriter->endElement();
-
-			$layout = $title->getLayout();
-			$this->_writeLayout($layout, $objWriter);
-
-			$objWriter->startElement('c:overlay');
-				$objWriter->writeAttribute('val', 0);
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Chart Legend
-	 *
-	 * @param	PHPExcel_Chart_Legend		$legend
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @throws 	Exception
-	 */
-	private function _writeLegend(PHPExcel_Chart_Legend $legend = null, $objWriter)
-	{
-		if (is_null($legend)) {
-			return;
-		}
-
-		$objWriter->startElement('c:legend');
-
-			$objWriter->startElement('c:legendPos');
-				$objWriter->writeAttribute('val', $legend->getPosition());
-			$objWriter->endElement();
-
-			$layout = $legend->getLayout();
-			$this->_writeLayout($layout, $objWriter);
-
-			$objWriter->startElement('c:overlay');
-				$objWriter->writeAttribute('val', ($legend->getOverlay()) ? '1' : '0');
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:txPr');
-				$objWriter->startElement('a:bodyPr');
-				$objWriter->endElement();
-
-				$objWriter->startElement('a:lstStyle');
-				$objWriter->endElement();
-
-				$objWriter->startElement('a:p');
-					$objWriter->startElement('a:pPr');
-						$objWriter->writeAttribute('rtl', 0);
-
-						$objWriter->startElement('a:defRPr');
-						$objWriter->endElement();
-					$objWriter->endElement();
-
-					$objWriter->startElement('a:endParaRPr');
-						$objWriter->writeAttribute('lang', "en-US");
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Chart Plot Area
-	 *
-	 * @param	PHPExcel_Chart_PlotArea		$plotArea
-	 * @param	PHPExcel_Chart_Title		$xAxisLabel
-	 * @param	PHPExcel_Chart_Title		$yAxisLabel
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @throws 	Exception
-	 */
-	private function _writePlotArea(PHPExcel_Chart_PlotArea $plotArea,
-									PHPExcel_Chart_Title $xAxisLabel = NULL,
-									PHPExcel_Chart_Title $yAxisLabel = NULL,
-									$objWriter,
-									PHPExcel_Worksheet $pSheet)
-	{
-		if (is_null($plotArea)) {
-			return;
-		}
-
-		$id1 = $id2 = 0;
-		$objWriter->startElement('c:plotArea');
-
-			$layout = $plotArea->getLayout();
-
-			$this->_writeLayout($layout, $objWriter);
-
-			$chartTypes = self::_getChartType($plotArea);
-			$catIsMultiLevelSeries = $valIsMultiLevelSeries = FALSE;
-			$plotGroupingType = '';
-			foreach($chartTypes as $chartType) {
-				$objWriter->startElement('c:'.$chartType);
-
-					$groupCount = $plotArea->getPlotGroupCount();
-					for($i = 0; $i < $groupCount; ++$i) {
-						$plotGroup = $plotArea->getPlotGroupByIndex($i);
-						$groupType = $plotGroup->getPlotType();
-						if ($groupType == $chartType) {
-
-							$plotStyle = $plotGroup->getPlotStyle();
-							if ($groupType === PHPExcel_Chart_DataSeries::TYPE_RADARCHART) {
-								$objWriter->startElement('c:radarStyle');
-									$objWriter->writeAttribute('val', $plotStyle );
-								$objWriter->endElement();
-							} elseif ($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART) {
-								$objWriter->startElement('c:scatterStyle');
-									$objWriter->writeAttribute('val', $plotStyle );
-								$objWriter->endElement();
-							}
-
-							$this->_writePlotGroup($plotGroup, $chartType, $objWriter, $catIsMultiLevelSeries, $valIsMultiLevelSeries, $plotGroupingType, $pSheet);
-						}
-					}
-
-					$this->_writeDataLbls($objWriter, $layout);
-
-					if ($chartType === PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
-						//	Line only, Line3D can't be smoothed
-
-						$objWriter->startElement('c:smooth');
-							$objWriter->writeAttribute('val', (integer) $plotGroup->getSmoothLine() );
-						$objWriter->endElement();
-					} elseif (($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
-						($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)) {
-
-						$objWriter->startElement('c:gapWidth');
-							$objWriter->writeAttribute('val', 150 );
-						$objWriter->endElement();
-
-						if ($plotGroupingType == 'percentStacked' ||
-							$plotGroupingType == 'stacked') {
-
-							$objWriter->startElement('c:overlap');
-								$objWriter->writeAttribute('val', 100 );
-							$objWriter->endElement();
-						}
-					} elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
-
-							$objWriter->startElement('c:bubbleScale');
-								$objWriter->writeAttribute('val', 25 );
-							$objWriter->endElement();
-
-							$objWriter->startElement('c:showNegBubbles');
-								$objWriter->writeAttribute('val', 0 );
-							$objWriter->endElement();
-					} elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_STOCKCHART) {
-
-							$objWriter->startElement('c:hiLowLines');
-							$objWriter->endElement();
-					}
-
-					//	Generate 2 unique numbers to use for axId values
-//					$id1 = $id2 = rand(10000000,99999999);
-//					do {
-//						$id2 = rand(10000000,99999999);
-//					} while ($id1 == $id2);
-					$id1 = '75091328';
-					$id2 = '75089408';
-
-					if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
-						($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
-						($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
-
-						$objWriter->startElement('c:axId');
-							$objWriter->writeAttribute('val', $id1 );
-						$objWriter->endElement();
-						$objWriter->startElement('c:axId');
-							$objWriter->writeAttribute('val', $id2 );
-						$objWriter->endElement();
-					} else {
-						$objWriter->startElement('c:firstSliceAng');
-							$objWriter->writeAttribute('val', 0);
-						$objWriter->endElement();
-
-						if ($chartType === PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) {
-
-							$objWriter->startElement('c:holeSize');
-								$objWriter->writeAttribute('val', 50);
-							$objWriter->endElement();
-						}
-					}
-
-				$objWriter->endElement();
-			}
-
-			if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
-				($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
-				($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
-
-				if ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
-					$this->_writeValAx($objWriter,$plotArea,$xAxisLabel,$chartType,$id1,$id2,$catIsMultiLevelSeries);
-				} else {
-					$this->_writeCatAx($objWriter,$plotArea,$xAxisLabel,$chartType,$id1,$id2,$catIsMultiLevelSeries);
-				}
-
-				$this->_writeValAx($objWriter,$plotArea,$yAxisLabel,$chartType,$id1,$id2,$valIsMultiLevelSeries);
-			}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Data Labels
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Chart_Layout		$chartLayout	Chart layout
-	 * @throws 	Exception
-	 */
-	private function _writeDataLbls($objWriter, $chartLayout)
-	{
-		$objWriter->startElement('c:dLbls');
-
-			$objWriter->startElement('c:showLegendKey');
-				$showLegendKey = (empty($chartLayout)) ? 0 : $chartLayout->getShowLegendKey();
-				$objWriter->writeAttribute('val', ((empty($showLegendKey)) ? 0 : 1) );
-			$objWriter->endElement();
-
-
-			$objWriter->startElement('c:showVal');
-				$showVal = (empty($chartLayout)) ? 0 : $chartLayout->getShowVal();
-				$objWriter->writeAttribute('val', ((empty($showVal)) ? 0 : 1) );
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:showCatName');
-				$showCatName = (empty($chartLayout)) ? 0 : $chartLayout->getShowCatName();
-				$objWriter->writeAttribute('val', ((empty($showCatName)) ? 0 : 1) );
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:showSerName');
-				$showSerName = (empty($chartLayout)) ? 0 : $chartLayout->getShowSerName();
-				$objWriter->writeAttribute('val', ((empty($showSerName)) ? 0 : 1) );
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:showPercent');
-				$showPercent = (empty($chartLayout)) ? 0 : $chartLayout->getShowPercent();
-				$objWriter->writeAttribute('val', ((empty($showPercent)) ? 0 : 1) );
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:showBubbleSize');
-				$showBubbleSize = (empty($chartLayout)) ? 0 : $chartLayout->getShowBubbleSize();
-				$objWriter->writeAttribute('val', ((empty($showBubbleSize)) ? 0 : 1) );
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:showLeaderLines');
-				$showLeaderLines = (empty($chartLayout)) ? 1 : $chartLayout->getShowLeaderLines();
-				$objWriter->writeAttribute('val', ((empty($showLeaderLines)) ? 0 : 1) );
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Category Axis
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Chart_PlotArea		$plotArea
-	 * @param 	PHPExcel_Chart_Title		$xAxisLabel
-	 * @param 	string						$groupType		Chart type
-	 * @param 	string						$id1
-	 * @param 	string						$id2
-	 * @param 	boolean						$isMultiLevelSeries
-	 * @throws 	Exception
-	 */
-	private function _writeCatAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $xAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries)
-	{
-		$objWriter->startElement('c:catAx');
-
-			if ($id1 > 0) {
-				$objWriter->startElement('c:axId');
-					$objWriter->writeAttribute('val', $id1);
-				$objWriter->endElement();
-			}
-
-			$objWriter->startElement('c:scaling');
-				$objWriter->startElement('c:orientation');
-					$objWriter->writeAttribute('val', "minMax");
-				$objWriter->endElement();
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:delete');
-				$objWriter->writeAttribute('val', 0);
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:axPos');
-				$objWriter->writeAttribute('val', "b");
-			$objWriter->endElement();
-
-			if (!is_null($xAxisLabel)) {
-				$objWriter->startElement('c:title');
-					$objWriter->startElement('c:tx');
-						$objWriter->startElement('c:rich');
-
-							$objWriter->startElement('a:bodyPr');
-							$objWriter->endElement();
-
-							$objWriter->startElement('a:lstStyle');
-							$objWriter->endElement();
-
-							$objWriter->startElement('a:p');
-								$objWriter->startElement('a:r');
-
-									$caption = $xAxisLabel->getCaption();
-									if (is_array($caption))
-										$caption = $caption[0];
-									$objWriter->startElement('a:t');
-//										$objWriter->writeAttribute('xml:space', 'preserve');
-										$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption ));
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-							$objWriter->endElement();
-						$objWriter->endElement();
-					$objWriter->endElement();
-
-					$objWriter->startElement('c:overlay');
-						$objWriter->writeAttribute('val', 0);
-					$objWriter->endElement();
-
-					$layout = $xAxisLabel->getLayout();
-					$this->_writeLayout($layout, $objWriter);
-
-				$objWriter->endElement();
-
-			}
-
-			$objWriter->startElement('c:numFmt');
-				$objWriter->writeAttribute('formatCode', "General");
-				$objWriter->writeAttribute('sourceLinked', 1);
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:majorTickMark');
-				$objWriter->writeAttribute('val', "out");
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:minorTickMark');
-				$objWriter->writeAttribute('val', "none");
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:tickLblPos');
-				$objWriter->writeAttribute('val', "nextTo");
-			$objWriter->endElement();
-
-			if ($id2 > 0) {
-					$objWriter->startElement('c:crossAx');
-						$objWriter->writeAttribute('val', $id2);
-					$objWriter->endElement();
-
-					$objWriter->startElement('c:crosses');
-						$objWriter->writeAttribute('val', "autoZero");
-					$objWriter->endElement();
-			}
-
-			$objWriter->startElement('c:auto');
-				$objWriter->writeAttribute('val', 1);
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:lblAlgn');
-				$objWriter->writeAttribute('val', "ctr");
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:lblOffset');
-				$objWriter->writeAttribute('val', 100);
-			$objWriter->endElement();
-
-			if ($isMultiLevelSeries) {
-				$objWriter->startElement('c:noMultiLvlLbl');
-					$objWriter->writeAttribute('val', 0);
-				$objWriter->endElement();
-			}
-		$objWriter->endElement();
-
-	}
-
-
-	/**
-	 * Write Value Axis
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Chart_PlotArea		$plotArea
-	 * @param 	PHPExcel_Chart_Title		$yAxisLabel
-	 * @param 	string						$groupType		Chart type
-	 * @param 	string						$id1
-	 * @param 	string						$id2
-	 * @param 	boolean						$isMultiLevelSeries
-	 * @throws 	Exception
-	 */
-	private function _writeValAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $yAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries)
-	{
-		$objWriter->startElement('c:valAx');
-
-			if ($id2 > 0) {
-				$objWriter->startElement('c:axId');
-					$objWriter->writeAttribute('val', $id2);
-				$objWriter->endElement();
-			}
-
-			$objWriter->startElement('c:scaling');
-				$objWriter->startElement('c:orientation');
-					$objWriter->writeAttribute('val', "minMax");
-				$objWriter->endElement();
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:delete');
-				$objWriter->writeAttribute('val', 0);
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:axPos');
-				$objWriter->writeAttribute('val', "l");
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:majorGridlines');
-			$objWriter->endElement();
-
-			if (!is_null($yAxisLabel)) {
-				$objWriter->startElement('c:title');
-					$objWriter->startElement('c:tx');
-						$objWriter->startElement('c:rich');
-
-							$objWriter->startElement('a:bodyPr');
-							$objWriter->endElement();
-
-							$objWriter->startElement('a:lstStyle');
-							$objWriter->endElement();
-
-							$objWriter->startElement('a:p');
-								$objWriter->startElement('a:r');
-
-									$caption = $yAxisLabel->getCaption();
-									if (is_array($caption))
-										$caption = $caption[0];
-									$objWriter->startElement('a:t');
-//										$objWriter->writeAttribute('xml:space', 'preserve');
-										$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption ));
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-							$objWriter->endElement();
-						$objWriter->endElement();
-					$objWriter->endElement();
-
-					$objWriter->startElement('c:overlay');
-						$objWriter->writeAttribute('val', 0);
-					$objWriter->endElement();
-
-					if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
-						$layout = $yAxisLabel->getLayout();
-						$this->_writeLayout($layout, $objWriter);
-					}
-
-				$objWriter->endElement();
-			}
-
-			$objWriter->startElement('c:numFmt');
-				$objWriter->writeAttribute('formatCode', "General");
-				$objWriter->writeAttribute('sourceLinked', 1);
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:majorTickMark');
-				$objWriter->writeAttribute('val', "out");
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:minorTickMark');
-				$objWriter->writeAttribute('val', "none");
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:tickLblPos');
-				$objWriter->writeAttribute('val', "nextTo");
-			$objWriter->endElement();
-
-			if ($id1 > 0) {
-					$objWriter->startElement('c:crossAx');
-						$objWriter->writeAttribute('val', $id2);
-					$objWriter->endElement();
-
-					$objWriter->startElement('c:crosses');
-						$objWriter->writeAttribute('val', "autoZero");
-					$objWriter->endElement();
-
-					$objWriter->startElement('c:crossBetween');
-						$objWriter->writeAttribute('val', "midCat");
-					$objWriter->endElement();
-			}
-
-			if ($isMultiLevelSeries) {
-				if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
-					$objWriter->startElement('c:noMultiLvlLbl');
-						$objWriter->writeAttribute('val', 0);
-					$objWriter->endElement();
-				}
-			}
-		$objWriter->endElement();
-
-	}
-
-
-	/**
-	 * Get the data series type(s) for a chart plot series
-	 *
-	 * @param 	PHPExcel_Chart_PlotArea		$plotArea
-	 * @return	string|array
-	 * @throws 	Exception
-	 */
-	private static function _getChartType($plotArea)
-	{
-		$groupCount = $plotArea->getPlotGroupCount();
-
-		if ($groupCount == 1) {
-			$chartType = array($plotArea->getPlotGroupByIndex(0)->getPlotType());
-		} else {
-			$chartTypes = array();
-			for($i = 0; $i < $groupCount; ++$i) {
-				$chartTypes[] = $plotArea->getPlotGroupByIndex($i)->getPlotType();
-			}
-			$chartType = array_unique($chartTypes);
-			if (count($chartTypes) == 0) {
-				throw new Exception('Chart is not yet implemented');
-			}
-		}
-
-		return $chartType;
-	}
-
-	/**
-	 * Write Plot Group (series of related plots)
-	 *
-	 * @param	PHPExcel_Chart_DataSeries		$plotGroup
-	 * @param	string							$groupType				Type of plot for dataseries
-	 * @param 	PHPExcel_Shared_XMLWriter 		$objWriter 				XML Writer
-	 * @param	boolean							&$catIsMultiLevelSeries	Is category a multi-series category
-	 * @param	boolean							&$valIsMultiLevelSeries	Is value set a multi-series set
-	 * @param	string							&$plotGroupingType		Type of grouping for multi-series values
-	 * @param	PHPExcel_Worksheet 				$pSheet
-	 * @throws 	Exception
-	 */
-	private function _writePlotGroup( $plotGroup,
-									  $groupType,
-									  $objWriter,
-									  &$catIsMultiLevelSeries,
-									  &$valIsMultiLevelSeries,
-									  &$plotGroupingType,
-									  PHPExcel_Worksheet $pSheet
-									)
-	{
-		if (is_null($plotGroup)) {
-			return;
-		}
-
-		if (($groupType == PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
-			($groupType == PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)) {
-			$objWriter->startElement('c:barDir');
-				$objWriter->writeAttribute('val', $plotGroup->getPlotDirection());
-			$objWriter->endElement();
-		}
-
-		if (!is_null($plotGroup->getPlotGrouping())) {
-			$plotGroupingType = $plotGroup->getPlotGrouping();
-			$objWriter->startElement('c:grouping');
-				$objWriter->writeAttribute('val', $plotGroupingType);
-			$objWriter->endElement();
-		}
-
-		//	Get these details before the loop, because we can use the count to check for varyColors
-		$plotSeriesOrder = $plotGroup->getPlotOrder();
-		$plotSeriesCount = count($plotSeriesOrder);
-
-		if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_RADARCHART) &&
-			($groupType !== PHPExcel_Chart_DataSeries::TYPE_STOCKCHART)) {
-
-			if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
-				if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
-					($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
-					($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) ||
-					($plotSeriesCount > 1)) {
-					$objWriter->startElement('c:varyColors');
-						$objWriter->writeAttribute('val', 1);
-					$objWriter->endElement();
-				} else {
-					$objWriter->startElement('c:varyColors');
-						$objWriter->writeAttribute('val', 0);
-					$objWriter->endElement();
-				}
-			}
-		}
-
-		foreach($plotSeriesOrder as $plotSeriesIdx => $plotSeriesRef) {
-			$objWriter->startElement('c:ser');
-
-				$objWriter->startElement('c:idx');
-					$objWriter->writeAttribute('val', $plotSeriesIdx);
-				$objWriter->endElement();
-
-				$objWriter->startElement('c:order');
-					$objWriter->writeAttribute('val', $plotSeriesRef);
-				$objWriter->endElement();
-
-				if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
-					($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
-					($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
-
-					$objWriter->startElement('c:dPt');
-						$objWriter->startElement('c:idx');
-							$objWriter->writeAttribute('val', 3);
-						$objWriter->endElement();
-
-						$objWriter->startElement('c:bubble3D');
-							$objWriter->writeAttribute('val', 0);
-						$objWriter->endElement();
-
-						$objWriter->startElement('c:spPr');
-							$objWriter->startElement('a:solidFill');
-								$objWriter->startElement('a:srgbClr');
-									$objWriter->writeAttribute('val', 'FF9900');
-								$objWriter->endElement();
-							$objWriter->endElement();
-						$objWriter->endElement();
-					$objWriter->endElement();
-				}
-
-				//	Labels
-				$plotSeriesLabel = $plotGroup->getPlotLabelByIndex($plotSeriesRef);
-				if ($plotSeriesLabel && ($plotSeriesLabel->getPointCount() > 0)) {
-					$objWriter->startElement('c:tx');
-						$objWriter->startElement('c:strRef');
-							$this->_writePlotSeriesLabel($plotSeriesLabel, $objWriter);
-						$objWriter->endElement();
-					$objWriter->endElement();
-				}
-
-				//	Formatting for the points
-				if ($groupType == PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
-					$objWriter->startElement('c:spPr');
-						$objWriter->startElement('a:ln');
-							$objWriter->writeAttribute('w', 12700);
-						$objWriter->endElement();
-					$objWriter->endElement();
-				}
-
-				$plotSeriesValues = $plotGroup->getPlotValuesByIndex($plotSeriesRef);
-				if ($plotSeriesValues) {
-					$plotSeriesMarker = $plotSeriesValues->getPointMarker();
-					if ($plotSeriesMarker) {
-						$objWriter->startElement('c:marker');
-							$objWriter->startElement('c:symbol');
-								$objWriter->writeAttribute('val', $plotSeriesMarker);
-							$objWriter->endElement();
-
-							if ($plotSeriesMarker !== 'none') {
-								$objWriter->startElement('c:size');
-									$objWriter->writeAttribute('val', 3);
-								$objWriter->endElement();
-							}
-						$objWriter->endElement();
-					}
-				}
-
-				if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
-					($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D) ||
-					($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART)) {
-
-					$objWriter->startElement('c:invertIfNegative');
-						$objWriter->writeAttribute('val', 0);
-					$objWriter->endElement();
-				}
-
-				//	Category Labels
-				$plotSeriesCategory = $plotGroup->getPlotCategoryByIndex($plotSeriesRef);
-				if ($plotSeriesCategory && ($plotSeriesCategory->getPointCount() > 0)) {
-					$catIsMultiLevelSeries = $catIsMultiLevelSeries || $plotSeriesCategory->isMultiLevelSeries();
-
-					if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
-						($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
-						($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
-
-						if (!is_null($plotGroup->getPlotStyle())) {
-							$plotStyle = $plotGroup->getPlotStyle();
-							if ($plotStyle) {
-								$objWriter->startElement('c:explosion');
-									$objWriter->writeAttribute('val', 25);
-								$objWriter->endElement();
-							}
-						}
-					}
-
-					if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) ||
-						($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)) {
-						$objWriter->startElement('c:xVal');
-					} else {
-						$objWriter->startElement('c:cat');
-					}
-
-						$this->_writePlotSeriesValues($plotSeriesCategory, $objWriter, $groupType, 'str', $pSheet);
-					$objWriter->endElement();
-				}
-
-				//	Values
-				if ($plotSeriesValues) {
-					$valIsMultiLevelSeries = $valIsMultiLevelSeries || $plotSeriesValues->isMultiLevelSeries();
-
-					if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) ||
-						($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)) {
-						$objWriter->startElement('c:yVal');
-					} else {
-						$objWriter->startElement('c:val');
-					}
-
-						$this->_writePlotSeriesValues($plotSeriesValues, $objWriter, $groupType, 'num', $pSheet);
-					$objWriter->endElement();
-				}
-
-				if ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
-					$this->_writeBubbles($plotSeriesValues, $objWriter, $pSheet);
-				}
-
-			$objWriter->endElement();
-
-		}
-	}
-
-	/**
-	 * Write Plot Series Label
-	 *
-	 * @param	PHPExcel_Chart_DataSeriesValues		$plotSeriesLabel
-	 * @param 	PHPExcel_Shared_XMLWriter 			$objWriter 			XML Writer
-	 * @throws 	Exception
-	 */
-	private function _writePlotSeriesLabel($plotSeriesLabel, $objWriter)
-	{
-		if (is_null($plotSeriesLabel)) {
-			return;
-		}
-
-		$objWriter->startElement('c:f');
-			$objWriter->writeRawData($plotSeriesLabel->getDataSource());
-		$objWriter->endElement();
-
-		$objWriter->startElement('c:strCache');
-			$objWriter->startElement('c:ptCount');
-				$objWriter->writeAttribute('val', $plotSeriesLabel->getPointCount() );
-			$objWriter->endElement();
-
-			foreach($plotSeriesLabel->getDataValues() as $plotLabelKey => $plotLabelValue) {
-				$objWriter->startElement('c:pt');
-					$objWriter->writeAttribute('idx', $plotLabelKey );
-
-					$objWriter->startElement('c:v');
-						$objWriter->writeRawData( $plotLabelValue );
-					$objWriter->endElement();
-				$objWriter->endElement();
-			}
-		$objWriter->endElement();
-
-	}
-
-	/**
-	 * Write Plot Series Values
-	 *
-	 * @param	PHPExcel_Chart_DataSeriesValues		$plotSeriesValues
-	 * @param 	PHPExcel_Shared_XMLWriter 			$objWriter 			XML Writer
-	 * @param	string								$groupType			Type of plot for dataseries
-	 * @param	string								$dataType			Datatype of series values
-	 * @param	PHPExcel_Worksheet 					$pSheet
-	 * @throws 	Exception
-	 */
-	private function _writePlotSeriesValues( $plotSeriesValues,
-											 $objWriter,
-											 $groupType,
-											 $dataType='str',
-											 PHPExcel_Worksheet $pSheet
-										   )
-	{
-		if (is_null($plotSeriesValues)) {
-			return;
-		}
-
-		if ($plotSeriesValues->isMultiLevelSeries()) {
-			$levelCount = $plotSeriesValues->multiLevelCount();
-
-			$objWriter->startElement('c:multiLvlStrRef');
-
-				$objWriter->startElement('c:f');
-					$objWriter->writeRawData( $plotSeriesValues->getDataSource() );
-				$objWriter->endElement();
-
-				$objWriter->startElement('c:multiLvlStrCache');
-
-					$objWriter->startElement('c:ptCount');
-						$objWriter->writeAttribute('val', $plotSeriesValues->getPointCount() );
-					$objWriter->endElement();
-
-					for ($level = 0; $level < $levelCount; ++$level) {
-						$objWriter->startElement('c:lvl');
-
-						foreach($plotSeriesValues->getDataValues() as $plotSeriesKey => $plotSeriesValue) {
-							if (isset($plotSeriesValue[$level])) {
-								$objWriter->startElement('c:pt');
-									$objWriter->writeAttribute('idx', $plotSeriesKey );
-
-									$objWriter->startElement('c:v');
-										$objWriter->writeRawData( $plotSeriesValue[$level] );
-									$objWriter->endElement();
-								$objWriter->endElement();
-							}
-						}
-
-						$objWriter->endElement();
-					}
-
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-		} else {
-			$objWriter->startElement('c:'.$dataType.'Ref');
-
-				$objWriter->startElement('c:f');
-					$objWriter->writeRawData( $plotSeriesValues->getDataSource() );
-				$objWriter->endElement();
-
-				$objWriter->startElement('c:'.$dataType.'Cache');
-
-					if (($groupType != PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
-						($groupType != PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
-						($groupType != PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
-
-						if (($plotSeriesValues->getFormatCode() !== NULL) &&
-							($plotSeriesValues->getFormatCode() !== '')) {
-							$objWriter->startElement('c:formatCode');
-								$objWriter->writeRawData( $plotSeriesValues->getFormatCode() );
-							$objWriter->endElement();
-						}
-					}
-
-					$objWriter->startElement('c:ptCount');
-						$objWriter->writeAttribute('val', $plotSeriesValues->getPointCount() );
-					$objWriter->endElement();
-
-					$dataValues = $plotSeriesValues->getDataValues();
-					if (!empty($dataValues)) {
-						if (is_array($dataValues)) {
-							foreach($dataValues as $plotSeriesKey => $plotSeriesValue) {
-								$objWriter->startElement('c:pt');
-									$objWriter->writeAttribute('idx', $plotSeriesKey );
-
-									$objWriter->startElement('c:v');
-										$objWriter->writeRawData( $plotSeriesValue );
-									$objWriter->endElement();
-								$objWriter->endElement();
-							}
-						}
-					}
-
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write Bubble Chart Details
-	 *
-	 * @param	PHPExcel_Chart_DataSeriesValues		$plotSeriesValues
-	 * @param 	PHPExcel_Shared_XMLWriter 			$objWriter 			XML Writer
-	 * @throws 	Exception
-	 */
-	private function _writeBubbles($plotSeriesValues, $objWriter, PHPExcel_Worksheet $pSheet)
-	{
-		if (is_null($plotSeriesValues)) {
-			return;
-		}
-
-		$objWriter->startElement('c:bubbleSize');
-			$objWriter->startElement('c:numLit');
-
-				$objWriter->startElement('c:formatCode');
-					$objWriter->writeRawData( 'General' );
-				$objWriter->endElement();
-
-				$objWriter->startElement('c:ptCount');
-					$objWriter->writeAttribute('val', $plotSeriesValues->getPointCount() );
-				$objWriter->endElement();
-
-				$dataValues = $plotSeriesValues->getDataValues();
-				if (!empty($dataValues)) {
-					if (is_array($dataValues)) {
-						foreach($dataValues as $plotSeriesKey => $plotSeriesValue) {
-							$objWriter->startElement('c:pt');
-								$objWriter->writeAttribute('idx', $plotSeriesKey );
-								$objWriter->startElement('c:v');
-									$objWriter->writeRawData( 1 );
-								$objWriter->endElement();
-							$objWriter->endElement();
-						}
-					}
-				}
-
-			$objWriter->endElement();
-		$objWriter->endElement();
-
-		$objWriter->startElement('c:bubble3D');
-			$objWriter->writeAttribute('val', 0 );
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Layout
-	 *
-	 * @param	PHPExcel_Chart_Layout		$layout
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @throws 	Exception
-	 */
-	private function _writeLayout(PHPExcel_Chart_Layout $layout = NULL, $objWriter)
-	{
-		$objWriter->startElement('c:layout');
-
-			if (!is_null($layout)) {
-				$objWriter->startElement('c:manualLayout');
-
-					$layoutTarget = $layout->getLayoutTarget();
-					if (!is_null($layoutTarget)) {
-						$objWriter->startElement('c:layoutTarget');
-							$objWriter->writeAttribute('val', $layoutTarget);
-						$objWriter->endElement();
-					}
-
-					$xMode = $layout->getXMode();
-					if (!is_null($xMode)) {
-						$objWriter->startElement('c:xMode');
-							$objWriter->writeAttribute('val', $xMode);
-						$objWriter->endElement();
-					}
-
-					$yMode = $layout->getYMode();
-					if (!is_null($yMode)) {
-						$objWriter->startElement('c:yMode');
-							$objWriter->writeAttribute('val', $yMode);
-						$objWriter->endElement();
-					}
-
-					$x = $layout->getXPosition();
-					if (!is_null($x)) {
-						$objWriter->startElement('c:x');
-							$objWriter->writeAttribute('val', $x);
-						$objWriter->endElement();
-					}
-
-					$y = $layout->getYPosition();
-					if (!is_null($y)) {
-						$objWriter->startElement('c:y');
-							$objWriter->writeAttribute('val', $y);
-						$objWriter->endElement();
-					}
-
-					$w = $layout->getWidth();
-					if (!is_null($w)) {
-						$objWriter->startElement('c:w');
-							$objWriter->writeAttribute('val', $w);
-						$objWriter->endElement();
-					}
-
-					$h = $layout->getHeight();
-					if (!is_null($h)) {
-						$objWriter->startElement('c:h');
-							$objWriter->writeAttribute('val', $h);
-						$objWriter->endElement();
-					}
-
-				$objWriter->endElement();
-			}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Alternate Content block
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @throws 	Exception
-	 */
-	private function _writeAlternateContent($objWriter)
-	{
-		$objWriter->startElement('mc:AlternateContent');
-			$objWriter->writeAttribute('xmlns:mc', 'http://schemas.openxmlformats.org/markup-compatibility/2006');
-
-			$objWriter->startElement('mc:Choice');
-				$objWriter->writeAttribute('xmlns:c14', 'http://schemas.microsoft.com/office/drawing/2007/8/2/chart');
-				$objWriter->writeAttribute('Requires', 'c14');
-
-				$objWriter->startElement('c14:style');
-					$objWriter->writeAttribute('val', '102');
-				$objWriter->endElement();
-			$objWriter->endElement();
-
-			$objWriter->startElement('mc:Fallback');
-				$objWriter->startElement('c:style');
-					$objWriter->writeAttribute('val', '2');
-				$objWriter->endElement();
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Printer Settings
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @throws 	Exception
-	 */
-	private function _writePrintSettings($objWriter)
-	{
-		$objWriter->startElement('c:printSettings');
-
-			$objWriter->startElement('c:headerFooter');
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:pageMargins');
-				$objWriter->writeAttribute('footer', 0.3);
-				$objWriter->writeAttribute('header', 0.3);
-				$objWriter->writeAttribute('r', 0.7);
-				$objWriter->writeAttribute('l', 0.7);
-				$objWriter->writeAttribute('t', 0.75);
-				$objWriter->writeAttribute('b', 0.75);
-			$objWriter->endElement();
-
-			$objWriter->startElement('c:pageSetup');
-				$objWriter->writeAttribute('orientation', "portrait");
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Comments.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Comments.php
deleted file mode 100755
index 4c6a9f7a7..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Comments.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Comments
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Comments extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write comments to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet				$pWorksheet
-	 * @return 	string 								XML Output
-	 * @throws 	Exception
-	 */
-	public function writeComments(PHPExcel_Worksheet $pWorksheet = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-  		// Comments cache
-  		$comments	= $pWorksheet->getComments();
-
-  		// Authors cache
-  		$authors	= array();
-  		$authorId	= 0;
-		foreach ($comments as $comment) {
-			if (!isset($authors[$comment->getAuthor()])) {
-				$authors[$comment->getAuthor()] = $authorId++;
-			}
-		}
-
-		// comments
-		$objWriter->startElement('comments');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-
-			// Loop through authors
-			$objWriter->startElement('authors');
-			foreach ($authors as $author => $index) {
-				$objWriter->writeElement('author', $author);
-			}
-			$objWriter->endElement();
-
-			// Loop through comments
-			$objWriter->startElement('commentList');
-			foreach ($comments as $key => $value) {
-				$this->_writeComment($objWriter, $key, $value, $authors);
-			}
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write comment to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter		$objWriter 			XML Writer
-	 * @param	string							$pCellReference		Cell reference
-	 * @param 	PHPExcel_Comment				$pComment			Comment
-	 * @param	array							$pAuthors			Array of authors
-	 * @throws 	Exception
-	 */
-	public function _writeComment(PHPExcel_Shared_XMLWriter $objWriter = null, $pCellReference = 'A1', PHPExcel_Comment $pComment = null, $pAuthors = null)
-	{
-		// comment
-		$objWriter->startElement('comment');
-		$objWriter->writeAttribute('ref', 		$pCellReference);
-		$objWriter->writeAttribute('authorId', 	$pAuthors[$pComment->getAuthor()]);
-
-			// text
-			$objWriter->startElement('text');
-			$this->getParentWriter()->getWriterPart('stringtable')->writeRichText($objWriter, $pComment->getText());
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write VML comments to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet				$pWorksheet
-	 * @return 	string 								XML Output
-	 * @throws 	Exception
-	 */
-	public function writeVMLComments(PHPExcel_Worksheet $pWorksheet = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-  		// Comments cache
-  		$comments	= $pWorksheet->getComments();
-
-		// xml
-		$objWriter->startElement('xml');
-		$objWriter->writeAttribute('xmlns:v', 'urn:schemas-microsoft-com:vml');
-		$objWriter->writeAttribute('xmlns:o', 'urn:schemas-microsoft-com:office:office');
-		$objWriter->writeAttribute('xmlns:x', 'urn:schemas-microsoft-com:office:excel');
-
-			// o:shapelayout
-			$objWriter->startElement('o:shapelayout');
-			$objWriter->writeAttribute('v:ext', 		'edit');
-
-				// o:idmap
-				$objWriter->startElement('o:idmap');
-				$objWriter->writeAttribute('v:ext', 	'edit');
-				$objWriter->writeAttribute('data', 		'1');
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// v:shapetype
-			$objWriter->startElement('v:shapetype');
-			$objWriter->writeAttribute('id', 		'_x0000_t202');
-			$objWriter->writeAttribute('coordsize', '21600,21600');
-			$objWriter->writeAttribute('o:spt', 	'202');
-			$objWriter->writeAttribute('path', 		'm,l,21600r21600,l21600,xe');
-
-				// v:stroke
-				$objWriter->startElement('v:stroke');
-				$objWriter->writeAttribute('joinstyle', 	'miter');
-				$objWriter->endElement();
-
-				// v:path
-				$objWriter->startElement('v:path');
-				$objWriter->writeAttribute('gradientshapeok', 	't');
-				$objWriter->writeAttribute('o:connecttype', 	'rect');
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// Loop through comments
-			foreach ($comments as $key => $value) {
-				$this->_writeVMLComment($objWriter, $key, $value);
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write VML comment to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter		$objWriter 			XML Writer
-	 * @param	string							$pCellReference		Cell reference
-	 * @param 	PHPExcel_Comment				$pComment			Comment
-	 * @throws 	Exception
-	 */
-	public function _writeVMLComment(PHPExcel_Shared_XMLWriter $objWriter = null, $pCellReference = 'A1', PHPExcel_Comment $pComment = null)
-	{
- 		// Metadata
- 		list($column, $row) = PHPExcel_Cell::coordinateFromString($pCellReference);
- 		$column = PHPExcel_Cell::columnIndexFromString($column);
- 		$id = 1024 + $column + $row;
- 		$id = substr($id, 0, 4);
-
-		// v:shape
-		$objWriter->startElement('v:shape');
-		$objWriter->writeAttribute('id', 			'_x0000_s' . $id);
-		$objWriter->writeAttribute('type', 			'#_x0000_t202');
-		$objWriter->writeAttribute('style', 		'position:absolute;margin-left:' . $pComment->getMarginLeft() . ';margin-top:' . $pComment->getMarginTop() . ';width:' . $pComment->getWidth() . ';height:' . $pComment->getHeight() . ';z-index:1;visibility:' . ($pComment->getVisible() ? 'visible' : 'hidden'));
-		$objWriter->writeAttribute('fillcolor', 	'#' . $pComment->getFillColor()->getRGB());
-		$objWriter->writeAttribute('o:insetmode', 	'auto');
-
-			// v:fill
-			$objWriter->startElement('v:fill');
-			$objWriter->writeAttribute('color2', 		'#' . $pComment->getFillColor()->getRGB());
-			$objWriter->endElement();
-
-			// v:shadow
-			$objWriter->startElement('v:shadow');
-			$objWriter->writeAttribute('on', 			't');
-			$objWriter->writeAttribute('color', 		'black');
-			$objWriter->writeAttribute('obscured', 		't');
-			$objWriter->endElement();
-
-			// v:path
-			$objWriter->startElement('v:path');
-			$objWriter->writeAttribute('o:connecttype', 'none');
-			$objWriter->endElement();
-
-			// v:textbox
-			$objWriter->startElement('v:textbox');
-			$objWriter->writeAttribute('style', 'mso-direction-alt:auto');
-
-				// div
-				$objWriter->startElement('div');
-				$objWriter->writeAttribute('style', 'text-align:left');
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// x:ClientData
-			$objWriter->startElement('x:ClientData');
-			$objWriter->writeAttribute('ObjectType', 'Note');
-
-				// x:MoveWithCells
-				$objWriter->writeElement('x:MoveWithCells', '');
-
-				// x:SizeWithCells
-				$objWriter->writeElement('x:SizeWithCells', '');
-
-				// x:Anchor
-				//$objWriter->writeElement('x:Anchor', $column . ', 15, ' . ($row - 2) . ', 10, ' . ($column + 4) . ', 15, ' . ($row + 5) . ', 18');
-
-				// x:AutoFill
-				$objWriter->writeElement('x:AutoFill', 'False');
-
-				// x:Row
-				$objWriter->writeElement('x:Row', ($row - 1));
-
-				// x:Column
-				$objWriter->writeElement('x:Column', ($column - 1));
-
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/ContentTypes.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/ContentTypes.php
deleted file mode 100755
index d701a76c8..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/ContentTypes.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_ContentTypes
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write content types to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @param	boolean		$includeCharts	Flag indicating if we should include drawing details for charts
-	 * @return 	string 						XML Output
-	 * @throws 	Exception
-	 */
-	public function writeContentTypes(PHPExcel $pPHPExcel = null, $includeCharts = FALSE)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Types
-		$objWriter->startElement('Types');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/content-types');
-
-			// Theme
-			$this->_writeOverrideContentType(
-				$objWriter, '/xl/theme/theme1.xml', 'application/vnd.openxmlformats-officedocument.theme+xml'
-			);
-
-			// Styles
-			$this->_writeOverrideContentType(
-				$objWriter, '/xl/styles.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml'
-			);
-
-			// Rels
-			$this->_writeDefaultContentType(
-				$objWriter, 'rels', 'application/vnd.openxmlformats-package.relationships+xml'
-			);
-
-			// XML
-			$this->_writeDefaultContentType(
-				$objWriter, 'xml', 'application/xml'
-			);
-
-			// VML
-			$this->_writeDefaultContentType(
-				$objWriter, 'vml', 'application/vnd.openxmlformats-officedocument.vmlDrawing'
-			);
-
-			// Workbook
-			$this->_writeOverrideContentType(
-				$objWriter, '/xl/workbook.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml'
-			);
-
-			// DocProps
-			$this->_writeOverrideContentType(
-				$objWriter, '/docProps/app.xml', 'application/vnd.openxmlformats-officedocument.extended-properties+xml'
-			);
-
-			$this->_writeOverrideContentType(
-				$objWriter, '/docProps/core.xml', 'application/vnd.openxmlformats-package.core-properties+xml'
-			);
-
-			$customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
-			if (!empty($customPropertyList)) {
-				$this->_writeOverrideContentType(
-					$objWriter, '/docProps/custom.xml', 'application/vnd.openxmlformats-officedocument.custom-properties+xml'
-				);
-			}
-
-			// Worksheets
-			$sheetCount = $pPHPExcel->getSheetCount();
-			for ($i = 0; $i < $sheetCount; ++$i) {
-				$this->_writeOverrideContentType(
-					$objWriter, '/xl/worksheets/sheet' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml'
-				);
-			}
-
-			// Shared strings
-			$this->_writeOverrideContentType(
-				$objWriter, '/xl/sharedStrings.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'
-			);
-
-			// Add worksheet relationship content types
-			$chart = 1;
-			for ($i = 0; $i < $sheetCount; ++$i) {
-				$drawings = $pPHPExcel->getSheet($i)->getDrawingCollection();
-				$drawingCount = count($drawings);
-				$chartCount = ($includeCharts) ? $pPHPExcel->getSheet($i)->getChartCount() : 0;
-
-				//	We need a drawing relationship for the worksheet if we have either drawings or charts
-				if (($drawingCount > 0) || ($chartCount > 0)) {
-					$this->_writeOverrideContentType(
-						$objWriter, '/xl/drawings/drawing' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.drawing+xml'
-					);
-				}
-
-				//	If we have charts, then we need a chart relationship for every individual chart
-				if ($chartCount > 0) {
-					for ($c = 0; $c < $chartCount; ++$c) {
-						$this->_writeOverrideContentType(
-							$objWriter, '/xl/charts/chart' . $chart++ . '.xml', 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
-						);
-					}
-				}
-			}
-
-			// Comments
-			for ($i = 0; $i < $sheetCount; ++$i) {
-				if (count($pPHPExcel->getSheet($i)->getComments()) > 0) {
-					$this->_writeOverrideContentType(
-						$objWriter, '/xl/comments' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml'
-					);
-				}
-			}
-
-			// Add media content-types
-			$aMediaContentTypes = array();
-			$mediaCount = $this->getParentWriter()->getDrawingHashTable()->count();
-			for ($i = 0; $i < $mediaCount; ++$i) {
-				$extension 	= '';
-				$mimeType 	= '';
-
-				if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_Drawing) {
-					$extension 	= strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getExtension());
-					$mimeType 	= $this->_getImageMimeType( $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getPath() );
-				} else if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof PHPExcel_Worksheet_MemoryDrawing) {
-					$extension 	= strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType());
-					$extension 	= explode('/', $extension);
-					$extension 	= $extension[1];
-
-					$mimeType 	= $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType();
-				}
-
-				if (!isset( $aMediaContentTypes[$extension]) ) {
-						$aMediaContentTypes[$extension] = $mimeType;
-
-						$this->_writeDefaultContentType(
-							$objWriter, $extension, $mimeType
-						);
-				}
-			}
-
-			$sheetCount = $pPHPExcel->getSheetCount();
-			for ($i = 0; $i < $sheetCount; ++$i) {
-				if (count($pPHPExcel->getSheet()->getHeaderFooter()->getImages()) > 0) {
-					foreach ($pPHPExcel->getSheet()->getHeaderFooter()->getImages() as $image) {
-						if (!isset( $aMediaContentTypes[strtolower($image->getExtension())]) ) {
-							$aMediaContentTypes[strtolower($image->getExtension())] = $this->_getImageMimeType( $image->getPath() );
-
-							$this->_writeDefaultContentType(
-								$objWriter, strtolower($image->getExtension()), $aMediaContentTypes[strtolower($image->getExtension())]
-							);
-						}
-					}
-				}
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Get image mime type
-	 *
-	 * @param 	string	$pFile	Filename
-	 * @return 	string	Mime Type
-	 * @throws 	Exception
-	 */
-	private function _getImageMimeType($pFile = '')
-	{
-		if (PHPExcel_Shared_File::file_exists($pFile)) {
-			$image = getimagesize($pFile);
-			return image_type_to_mime_type($image[2]);
-		} else {
-			throw new Exception("File $pFile does not exist");
-		}
-	}
-
-	/**
-	 * Write Default content type
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	string 						$pPartname 		Part name
-	 * @param 	string 						$pContentType 	Content type
-	 * @throws 	Exception
-	 */
-	private function _writeDefaultContentType(PHPExcel_Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
-	{
-		if ($pPartname != '' && $pContentType != '') {
-			// Write content type
-			$objWriter->startElement('Default');
-			$objWriter->writeAttribute('Extension', 	$pPartname);
-			$objWriter->writeAttribute('ContentType', 	$pContentType);
-			$objWriter->endElement();
-		} else {
-			throw new Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Write Override content type
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	string 						$pPartname 		Part name
-	 * @param 	string 						$pContentType 	Content type
-	 * @throws 	Exception
-	 */
-	private function _writeOverrideContentType(PHPExcel_Shared_XMLWriter $objWriter = null, $pPartname = '', $pContentType = '')
-	{
-		if ($pPartname != '' && $pContentType != '') {
-			// Write content type
-			$objWriter->startElement('Override');
-			$objWriter->writeAttribute('PartName', 		$pPartname);
-			$objWriter->writeAttribute('ContentType', 	$pContentType);
-			$objWriter->endElement();
-		} else {
-			throw new Exception("Invalid parameters passed.");
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/DocProps.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/DocProps.php
deleted file mode 100755
index ee0fa7483..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/DocProps.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_DocProps
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_DocProps extends PHPExcel_Writer_Excel2007_WriterPart
-{
-/**
-	 * Write docProps/app.xml to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	Exception
-	 */
-	public function writeDocPropsApp(PHPExcel $pPHPExcel = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Properties
-		$objWriter->startElement('Properties');
-			$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/officeDocument/2006/extended-properties');
-			$objWriter->writeAttribute('xmlns:vt', 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
-
-			// Application
-			$objWriter->writeElement('Application', 	'Microsoft Excel');
-
-			// DocSecurity
-			$objWriter->writeElement('DocSecurity', 	'0');
-
-			// ScaleCrop
-			$objWriter->writeElement('ScaleCrop', 		'false');
-
-			// HeadingPairs
-			$objWriter->startElement('HeadingPairs');
-
-				// Vector
-				$objWriter->startElement('vt:vector');
-					$objWriter->writeAttribute('size', 		'2');
-					$objWriter->writeAttribute('baseType', 	'variant');
-
-					// Variant
-					$objWriter->startElement('vt:variant');
-						$objWriter->writeElement('vt:lpstr', 	'Worksheets');
-					$objWriter->endElement();
-
-					// Variant
-					$objWriter->startElement('vt:variant');
-						$objWriter->writeElement('vt:i4', 		$pPHPExcel->getSheetCount());
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// TitlesOfParts
-			$objWriter->startElement('TitlesOfParts');
-
-				// Vector
-				$objWriter->startElement('vt:vector');
-					$objWriter->writeAttribute('size', 		$pPHPExcel->getSheetCount());
-					$objWriter->writeAttribute('baseType',	'lpstr');
-
-					$sheetCount = $pPHPExcel->getSheetCount();
-					for ($i = 0; $i < $sheetCount; ++$i) {
-						$objWriter->writeElement('vt:lpstr', $pPHPExcel->getSheet($i)->getTitle());
-					}
-
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// Company
-			$objWriter->writeElement('Company', 			$pPHPExcel->getProperties()->getCompany());
-
-			// Company
-			$objWriter->writeElement('Manager', 			$pPHPExcel->getProperties()->getManager());
-
-			// LinksUpToDate
-			$objWriter->writeElement('LinksUpToDate', 		'false');
-
-			// SharedDoc
-			$objWriter->writeElement('SharedDoc', 			'false');
-
-			// HyperlinksChanged
-			$objWriter->writeElement('HyperlinksChanged', 	'false');
-
-			// AppVersion
-			$objWriter->writeElement('AppVersion', 			'12.0000');
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write docProps/core.xml to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	Exception
-	 */
-	public function writeDocPropsCore(PHPExcel $pPHPExcel = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// cp:coreProperties
-		$objWriter->startElement('cp:coreProperties');
-			$objWriter->writeAttribute('xmlns:cp', 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties');
-			$objWriter->writeAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');
-			$objWriter->writeAttribute('xmlns:dcterms', 'http://purl.org/dc/terms/');
-			$objWriter->writeAttribute('xmlns:dcmitype', 'http://purl.org/dc/dcmitype/');
-			$objWriter->writeAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-
-			// dc:creator
-			$objWriter->writeElement('dc:creator',			$pPHPExcel->getProperties()->getCreator());
-
-			// cp:lastModifiedBy
-			$objWriter->writeElement('cp:lastModifiedBy', 	$pPHPExcel->getProperties()->getLastModifiedBy());
-
-			// dcterms:created
-			$objWriter->startElement('dcterms:created');
-				$objWriter->writeAttribute('xsi:type', 'dcterms:W3CDTF');
-				$objWriter->writeRawData(date(DATE_W3C, 	$pPHPExcel->getProperties()->getCreated()));
-			$objWriter->endElement();
-
-			// dcterms:modified
-			$objWriter->startElement('dcterms:modified');
-				$objWriter->writeAttribute('xsi:type', 'dcterms:W3CDTF');
-				$objWriter->writeRawData(date(DATE_W3C, 	$pPHPExcel->getProperties()->getModified()));
-			$objWriter->endElement();
-
-			// dc:title
-			$objWriter->writeElement('dc:title', 			$pPHPExcel->getProperties()->getTitle());
-
-			// dc:description
-			$objWriter->writeElement('dc:description', 		$pPHPExcel->getProperties()->getDescription());
-
-			// dc:subject
-			$objWriter->writeElement('dc:subject', 			$pPHPExcel->getProperties()->getSubject());
-
-			// cp:keywords
-			$objWriter->writeElement('cp:keywords', 		$pPHPExcel->getProperties()->getKeywords());
-
-			// cp:category
-			$objWriter->writeElement('cp:category', 		$pPHPExcel->getProperties()->getCategory());
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write docProps/custom.xml to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	Exception
-	 */
-	public function writeDocPropsCustom(PHPExcel $pPHPExcel = null)
-	{
-		$customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
-		if (empty($customPropertyList)) {
-			return;
-		}
-
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// cp:coreProperties
-		$objWriter->startElement('Properties');
-			$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/officeDocument/2006/custom-properties');
-			$objWriter->writeAttribute('xmlns:vt', 'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes');
-
-
-			foreach($customPropertyList as $key => $customProperty) {
-				$propertyValue = $pPHPExcel->getProperties()->getCustomPropertyValue($customProperty);
-				$propertyType = $pPHPExcel->getProperties()->getCustomPropertyType($customProperty);
-
-				$objWriter->startElement('property');
-					$objWriter->writeAttribute('fmtid', 	'{D5CDD505-2E9C-101B-9397-08002B2CF9AE}');
-					$objWriter->writeAttribute('pid', 		$key+2);
-					$objWriter->writeAttribute('name', 		$customProperty);
-
-					switch($propertyType) {
-						case 'i' :
-							$objWriter->writeElement('vt:i4', 		$propertyValue);
-							break;
-						case 'f' :
-							$objWriter->writeElement('vt:r8', 		$propertyValue);
-							break;
-						case 'b' :
-							$objWriter->writeElement('vt:bool', 	($propertyValue) ? 'true' : 'false');
-							break;
-						case 'd' :
-							$objWriter->startElement('vt:filetime');
-								$objWriter->writeRawData(date(DATE_W3C, $propertyValue));
-							$objWriter->endElement();
-							break;
-						default :
-							$objWriter->writeElement('vt:lpwstr', 	$propertyValue);
-							break;
-					}
-
-				$objWriter->endElement();
-			}
-
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Drawing.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Drawing.php
deleted file mode 100755
index 71d6561e6..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Drawing.php
+++ /dev/null
@@ -1,598 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Drawing
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write drawings to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet	$pWorksheet
-	 * @param	int					&$chartRef		Chart ID
-	 * @param	boolean				$includeCharts	Flag indicating if we should include drawing details for charts
-	 * @return 	string 				XML Output
-	 * @throws 	Exception
-	 */
-	public function writeDrawings(PHPExcel_Worksheet $pWorksheet = null, &$chartRef, $includeCharts = FALSE)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// xdr:wsDr
-		$objWriter->startElement('xdr:wsDr');
-		$objWriter->writeAttribute('xmlns:xdr', 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing');
-		$objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
-
-			// Loop through images and write drawings
-			$i = 1;
-			$iterator = $pWorksheet->getDrawingCollection()->getIterator();
-			while ($iterator->valid()) {
-				$this->_writeDrawing($objWriter, $iterator->current(), $i);
-
-				$iterator->next();
-				++$i;
-			}
-
-			if ($includeCharts) {
-				$chartCount = $pWorksheet->getChartCount();
-				// Loop through charts and write the chart position
-				if ($chartCount > 0) {
-					for ($c = 0; $c < $chartCount; ++$c) {
-						$this->_writeChart($objWriter, $pWorksheet->getChartByIndex($c), $c+$i);
-					}
-				}
-			}
-
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write drawings to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Chart				$pChart
-	 * @param 	int							$pRelationId
-	 * @throws 	Exception
-	 */
-	public function _writeChart(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Chart $pChart = null, $pRelationId = -1)
-	{
-		$tl = $pChart->getTopLeftPosition();
-		$tl['colRow'] = PHPExcel_Cell::coordinateFromString($tl['cell']);
-		$br = $pChart->getBottomRightPosition();
-		$br['colRow'] = PHPExcel_Cell::coordinateFromString($br['cell']);
-
-		$objWriter->startElement('xdr:twoCellAnchor');
-
-			$objWriter->startElement('xdr:from');
-				$objWriter->writeElement('xdr:col', PHPExcel_Cell::columnIndexFromString($tl['colRow'][0]) - 1);
-				$objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($tl['xOffset']));
-				$objWriter->writeElement('xdr:row', $tl['colRow'][1] - 1);
-				$objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($tl['yOffset']));
-			$objWriter->endElement();
-			$objWriter->startElement('xdr:to');
-				$objWriter->writeElement('xdr:col', PHPExcel_Cell::columnIndexFromString($br['colRow'][0]) - 1);
-				$objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($br['xOffset']));
-				$objWriter->writeElement('xdr:row', $br['colRow'][1] - 1);
-				$objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($br['yOffset']));
-			$objWriter->endElement();
-
-			$objWriter->startElement('xdr:graphicFrame');
-				$objWriter->writeAttribute('macro', '');
-				$objWriter->startElement('xdr:nvGraphicFramePr');
-					$objWriter->startElement('xdr:cNvPr');
-						$objWriter->writeAttribute('name', 'Chart '.$pRelationId);
-						$objWriter->writeAttribute('id', 1025 * $pRelationId);
-					$objWriter->endElement();
-					$objWriter->startElement('xdr:cNvGraphicFramePr');
-						$objWriter->startElement('a:graphicFrameLocks');
-						$objWriter->endElement();
-					$objWriter->endElement();
-				$objWriter->endElement();
-
-				$objWriter->startElement('xdr:xfrm');
-					$objWriter->startElement('a:off');
-						$objWriter->writeAttribute('x', '0');
-						$objWriter->writeAttribute('y', '0');
-					$objWriter->endElement();
-					$objWriter->startElement('a:ext');
-						$objWriter->writeAttribute('cx', '0');
-						$objWriter->writeAttribute('cy', '0');
-					$objWriter->endElement();
-				$objWriter->endElement();
-
-				$objWriter->startElement('a:graphic');
-					$objWriter->startElement('a:graphicData');
-						$objWriter->writeAttribute('uri', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
-						$objWriter->startElement('c:chart');
-							$objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
-							$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-							$objWriter->writeAttribute('r:id', 'rId'.$pRelationId);
-						$objWriter->endElement();
-					$objWriter->endElement();
-				$objWriter->endElement();
-			$objWriter->endElement();
-
-			$objWriter->startElement('xdr:clientData');
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write drawings to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter			$objWriter 		XML Writer
-	 * @param 	PHPExcel_Worksheet_BaseDrawing		$pDrawing
-	 * @param 	int									$pRelationId
-	 * @throws 	Exception
-	 */
-	public function _writeDrawing(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet_BaseDrawing $pDrawing = null, $pRelationId = -1)
-	{
-		if ($pRelationId >= 0) {
-			// xdr:oneCellAnchor
-			$objWriter->startElement('xdr:oneCellAnchor');
-				// Image location
-				$aCoordinates 		= PHPExcel_Cell::coordinateFromString($pDrawing->getCoordinates());
-				$aCoordinates[0] 	= PHPExcel_Cell::columnIndexFromString($aCoordinates[0]);
-
-				// xdr:from
-				$objWriter->startElement('xdr:from');
-					$objWriter->writeElement('xdr:col', $aCoordinates[0] - 1);
-					$objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getOffsetX()));
-					$objWriter->writeElement('xdr:row', $aCoordinates[1] - 1);
-					$objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getOffsetY()));
-				$objWriter->endElement();
-
-				// xdr:ext
-				$objWriter->startElement('xdr:ext');
-					$objWriter->writeAttribute('cx', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getWidth()));
-					$objWriter->writeAttribute('cy', PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getHeight()));
-				$objWriter->endElement();
-
-				// xdr:pic
-				$objWriter->startElement('xdr:pic');
-
-					// xdr:nvPicPr
-					$objWriter->startElement('xdr:nvPicPr');
-
-						// xdr:cNvPr
-						$objWriter->startElement('xdr:cNvPr');
-						$objWriter->writeAttribute('id', $pRelationId);
-						$objWriter->writeAttribute('name', $pDrawing->getName());
-						$objWriter->writeAttribute('descr', $pDrawing->getDescription());
-						$objWriter->endElement();
-
-						// xdr:cNvPicPr
-						$objWriter->startElement('xdr:cNvPicPr');
-
-							// a:picLocks
-							$objWriter->startElement('a:picLocks');
-							$objWriter->writeAttribute('noChangeAspect', '1');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-
-					// xdr:blipFill
-					$objWriter->startElement('xdr:blipFill');
-
-						// a:blip
-						$objWriter->startElement('a:blip');
-						$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-						$objWriter->writeAttribute('r:embed', 'rId' . $pRelationId);
-						$objWriter->endElement();
-
-						// a:stretch
-						$objWriter->startElement('a:stretch');
-							$objWriter->writeElement('a:fillRect', null);
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-
-					// xdr:spPr
-					$objWriter->startElement('xdr:spPr');
-
-						// a:xfrm
-						$objWriter->startElement('a:xfrm');
-						$objWriter->writeAttribute('rot', PHPExcel_Shared_Drawing::degreesToAngle($pDrawing->getRotation()));
-						$objWriter->endElement();
-
-						// a:prstGeom
-						$objWriter->startElement('a:prstGeom');
-						$objWriter->writeAttribute('prst', 'rect');
-
-							// a:avLst
-							$objWriter->writeElement('a:avLst', null);
-
-						$objWriter->endElement();
-
-//						// a:solidFill
-//						$objWriter->startElement('a:solidFill');
-
-//							// a:srgbClr
-//							$objWriter->startElement('a:srgbClr');
-//							$objWriter->writeAttribute('val', 'FFFFFF');
-
-///* SHADE
-//								// a:shade
-//								$objWriter->startElement('a:shade');
-//								$objWriter->writeAttribute('val', '85000');
-//								$objWriter->endElement();
-//*/
-
-//							$objWriter->endElement();
-
-//						$objWriter->endElement();
-/*
-						// a:ln
-						$objWriter->startElement('a:ln');
-						$objWriter->writeAttribute('w', '88900');
-						$objWriter->writeAttribute('cap', 'sq');
-
-							// a:solidFill
-							$objWriter->startElement('a:solidFill');
-
-								// a:srgbClr
-								$objWriter->startElement('a:srgbClr');
-								$objWriter->writeAttribute('val', 'FFFFFF');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:miter
-							$objWriter->startElement('a:miter');
-							$objWriter->writeAttribute('lim', '800000');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-*/
-
-						if ($pDrawing->getShadow()->getVisible()) {
-							// a:effectLst
-							$objWriter->startElement('a:effectLst');
-
-								// a:outerShdw
-								$objWriter->startElement('a:outerShdw');
-								$objWriter->writeAttribute('blurRad', 		PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getShadow()->getBlurRadius()));
-								$objWriter->writeAttribute('dist',			PHPExcel_Shared_Drawing::pixelsToEMU($pDrawing->getShadow()->getDistance()));
-								$objWriter->writeAttribute('dir',			PHPExcel_Shared_Drawing::degreesToAngle($pDrawing->getShadow()->getDirection()));
-								$objWriter->writeAttribute('algn',			$pDrawing->getShadow()->getAlignment());
-								$objWriter->writeAttribute('rotWithShape', 	'0');
-
-									// a:srgbClr
-									$objWriter->startElement('a:srgbClr');
-									$objWriter->writeAttribute('val',		$pDrawing->getShadow()->getColor()->getRGB());
-
-										// a:alpha
-										$objWriter->startElement('a:alpha');
-										$objWriter->writeAttribute('val', 	$pDrawing->getShadow()->getAlpha() * 1000);
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-						}
-/*
-
-						// a:scene3d
-						$objWriter->startElement('a:scene3d');
-
-							// a:camera
-							$objWriter->startElement('a:camera');
-							$objWriter->writeAttribute('prst', 'orthographicFront');
-							$objWriter->endElement();
-
-							// a:lightRig
-							$objWriter->startElement('a:lightRig');
-							$objWriter->writeAttribute('rig', 'twoPt');
-							$objWriter->writeAttribute('dir', 't');
-
-								// a:rot
-								$objWriter->startElement('a:rot');
-								$objWriter->writeAttribute('lat', '0');
-								$objWriter->writeAttribute('lon', '0');
-								$objWriter->writeAttribute('rev', '0');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-*/
-/*
-						// a:sp3d
-						$objWriter->startElement('a:sp3d');
-
-							// a:bevelT
-							$objWriter->startElement('a:bevelT');
-							$objWriter->writeAttribute('w', '25400');
-							$objWriter->writeAttribute('h', '19050');
-							$objWriter->endElement();
-
-							// a:contourClr
-							$objWriter->startElement('a:contourClr');
-
-								// a:srgbClr
-								$objWriter->startElement('a:srgbClr');
-								$objWriter->writeAttribute('val', 'FFFFFF');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-*/
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-				// xdr:clientData
-				$objWriter->writeElement('xdr:clientData', null);
-
-			$objWriter->endElement();
-		} else {
-			throw new Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Write VML header/footer images to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet				$pWorksheet
-	 * @return 	string 								XML Output
-	 * @throws 	Exception
-	 */
-	public function writeVMLHeaderFooterImages(PHPExcel_Worksheet $pWorksheet = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-  		// Header/footer images
-  		$images = $pWorksheet->getHeaderFooter()->getImages();
-
-		// xml
-		$objWriter->startElement('xml');
-		$objWriter->writeAttribute('xmlns:v', 'urn:schemas-microsoft-com:vml');
-		$objWriter->writeAttribute('xmlns:o', 'urn:schemas-microsoft-com:office:office');
-		$objWriter->writeAttribute('xmlns:x', 'urn:schemas-microsoft-com:office:excel');
-
-			// o:shapelayout
-			$objWriter->startElement('o:shapelayout');
-			$objWriter->writeAttribute('v:ext', 		'edit');
-
-				// o:idmap
-				$objWriter->startElement('o:idmap');
-				$objWriter->writeAttribute('v:ext', 	'edit');
-				$objWriter->writeAttribute('data', 		'1');
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// v:shapetype
-			$objWriter->startElement('v:shapetype');
-			$objWriter->writeAttribute('id', 					'_x0000_t75');
-			$objWriter->writeAttribute('coordsize', 			'21600,21600');
-			$objWriter->writeAttribute('o:spt', 				'75');
-			$objWriter->writeAttribute('o:preferrelative', 		't');
-			$objWriter->writeAttribute('path', 					'm@4@5l@4@11@9@11@9@5xe');
-			$objWriter->writeAttribute('filled',		 		'f');
-			$objWriter->writeAttribute('stroked',		 		'f');
-
-				// v:stroke
-				$objWriter->startElement('v:stroke');
-				$objWriter->writeAttribute('joinstyle', 		'miter');
-				$objWriter->endElement();
-
-				// v:formulas
-				$objWriter->startElement('v:formulas');
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'if lineDrawn pixelLineWidth 0');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'sum @0 1 0');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'sum 0 0 @1');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @2 1 2');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @3 21600 pixelWidth');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @3 21600 pixelHeight');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'sum @0 0 1');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @6 1 2');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @7 21600 pixelWidth');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'sum @8 21600 0');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'prod @7 21600 pixelHeight');
-					$objWriter->endElement();
-
-					// v:f
-					$objWriter->startElement('v:f');
-					$objWriter->writeAttribute('eqn', 		'sum @10 21600 0');
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-				// v:path
-				$objWriter->startElement('v:path');
-				$objWriter->writeAttribute('o:extrusionok', 	'f');
-				$objWriter->writeAttribute('gradientshapeok', 	't');
-				$objWriter->writeAttribute('o:connecttype', 	'rect');
-				$objWriter->endElement();
-
-				// o:lock
-				$objWriter->startElement('o:lock');
-				$objWriter->writeAttribute('v:ext', 			'edit');
-				$objWriter->writeAttribute('aspectratio', 		't');
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// Loop through images
-			foreach ($images as $key => $value) {
-				$this->_writeVMLHeaderFooterImage($objWriter, $key, $value);
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write VML comment to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter		$objWriter 			XML Writer
-	 * @param	string							$pReference			Reference
-	 * @param 	PHPExcel_Worksheet_HeaderFooterDrawing	$pImage		Image
-	 * @throws 	Exception
-	 */
-	public function _writeVMLHeaderFooterImage(PHPExcel_Shared_XMLWriter $objWriter = null, $pReference = '', PHPExcel_Worksheet_HeaderFooterDrawing $pImage = null)
-	{
-		// Calculate object id
-		preg_match('{(\d+)}', md5($pReference), $m);
-		$id = 1500 + (substr($m[1], 0, 2) * 1);
-
-		// Calculate offset
-		$width = $pImage->getWidth();
-		$height = $pImage->getHeight();
-		$marginLeft = $pImage->getOffsetX();
-		$marginTop = $pImage->getOffsetY();
-
-		// v:shape
-		$objWriter->startElement('v:shape');
-		$objWriter->writeAttribute('id', 			$pReference);
-		$objWriter->writeAttribute('o:spid', 		'_x0000_s' . $id);
-		$objWriter->writeAttribute('type', 			'#_x0000_t75');
-		$objWriter->writeAttribute('style', 		"position:absolute;margin-left:{$marginLeft}px;margin-top:{$marginTop}px;width:{$width}px;height:{$height}px;z-index:1");
-
-			// v:imagedata
-			$objWriter->startElement('v:imagedata');
-			$objWriter->writeAttribute('o:relid', 		'rId' . $pReference);
-			$objWriter->writeAttribute('o:title', 		$pImage->getName());
-			$objWriter->endElement();
-
-			// o:lock
-			$objWriter->startElement('o:lock');
-			$objWriter->writeAttribute('v:ext', 		'edit');
-			$objWriter->writeAttribute('rotation', 		't');
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-
-	/**
-	 * Get an array of all drawings
-	 *
-	 * @param 	PHPExcel							$pPHPExcel
-	 * @return 	PHPExcel_Worksheet_Drawing[]		All drawings in PHPExcel
-	 * @throws 	Exception
-	 */
-	public function allDrawings(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of all drawings
-		$aDrawings	= array();
-
-		// Loop through PHPExcel
-		$sheetCount = $pPHPExcel->getSheetCount();
-		for ($i = 0; $i < $sheetCount; ++$i) {
-			// Loop through images and add to array
-			$iterator = $pPHPExcel->getSheet($i)->getDrawingCollection()->getIterator();
-			while ($iterator->valid()) {
-				$aDrawings[] = $iterator->current();
-
-  				$iterator->next();
-			}
-		}
-
-		return $aDrawings;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Rels.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Rels.php
deleted file mode 100755
index 5a1271c05..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Rels.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Rels
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write relationships to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	Exception
-	 */
-	public function writeRelationships(PHPExcel $pPHPExcel = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-
-			$customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
-			if (!empty($customPropertyList)) {
-				// Relationship docProps/app.xml
-				$this->_writeRelationship(
-					$objWriter,
-					4,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties',
-					'docProps/custom.xml'
-				);
-
-			}
-
-			// Relationship docProps/app.xml
-			$this->_writeRelationship(
-				$objWriter,
-				3,
-				'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties',
-				'docProps/app.xml'
-			);
-
-			// Relationship docProps/core.xml
-			$this->_writeRelationship(
-				$objWriter,
-				2,
-				'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties',
-				'docProps/core.xml'
-			);
-
-			// Relationship xl/workbook.xml
-			$this->_writeRelationship(
-				$objWriter,
-				1,
-				'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument',
-				'xl/workbook.xml'
-			);
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write workbook relationships to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	Exception
-	 */
-	public function writeWorkbookRelationships(PHPExcel $pPHPExcel = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-
-			// Relationship styles.xml
-			$this->_writeRelationship(
-				$objWriter,
-				1,
-				'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles',
-				'styles.xml'
-			);
-
-			// Relationship theme/theme1.xml
-			$this->_writeRelationship(
-				$objWriter,
-				2,
-				'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme',
-				'theme/theme1.xml'
-			);
-
-			// Relationship sharedStrings.xml
-			$this->_writeRelationship(
-				$objWriter,
-				3,
-				'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings',
-				'sharedStrings.xml'
-			);
-
-			// Relationships with sheets
-			$sheetCount = $pPHPExcel->getSheetCount();
-			for ($i = 0; $i < $sheetCount; ++$i) {
-				$this->_writeRelationship(
-					$objWriter,
-					($i + 1 + 3),
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet',
-					'worksheets/sheet' . ($i + 1) . '.xml'
-				);
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write worksheet relationships to XML format
-	 *
-	 * Numbering is as follows:
-	 * 	rId1 				- Drawings
-	 *  rId_hyperlink_x 	- Hyperlinks
-	 *
-	 * @param 	PHPExcel_Worksheet	$pWorksheet
-	 * @param 	int					$pWorksheetId
-	 * @param	boolean				$includeCharts	Flag indicating if we should write charts
-	 * @return 	string 				XML Output
-	 * @throws 	Exception
-	 */
-	public function writeWorksheetRelationships(PHPExcel_Worksheet $pWorksheet = null, $pWorksheetId = 1, $includeCharts = FALSE)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-
-			// Write drawing relationships?
-			$d = 0;
-			if ($includeCharts) {
-				$charts = $pWorksheet->getChartCollection();
-			} else {
-				$charts = array();
-			}
-			if (($pWorksheet->getDrawingCollection()->count() > 0) ||
-				(count($charts) > 0)) {
-				$this->_writeRelationship(
-					$objWriter,
-					++$d,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
-					'../drawings/drawing' . $pWorksheetId . '.xml'
-				);
-			}
-
-			// Write chart relationships?
-//			$chartCount = 0;
-//			$charts = $pWorksheet->getChartCollection();
-//			echo 'Chart Rels: ' , count($charts) , '<br />';
-//			if (count($charts) > 0) {
-//				foreach($charts as $chart) {
-//					$this->_writeRelationship(
-//						$objWriter,
-//						++$d,
-//						'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
-//						'../charts/chart' . ++$chartCount . '.xml'
-//					);
-//				}
-//			}
-//
-			// Write hyperlink relationships?
-			$i = 1;
-			foreach ($pWorksheet->getHyperlinkCollection() as $hyperlink) {
-				if (!$hyperlink->isInternal()) {
-					$this->_writeRelationship(
-						$objWriter,
-						'_hyperlink_' . $i,
-						'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
-						$hyperlink->getUrl(),
-						'External'
-					);
-
-					++$i;
-				}
-			}
-
-			// Write comments relationship?
-			$i = 1;
-			if (count($pWorksheet->getComments()) > 0) {
-				$this->_writeRelationship(
-					$objWriter,
-					'_comments_vml' . $i,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
-					'../drawings/vmlDrawing' . $pWorksheetId . '.vml'
-				);
-
-				$this->_writeRelationship(
-					$objWriter,
-					'_comments' . $i,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments',
-					'../comments' . $pWorksheetId . '.xml'
-				);
-			}
-
-			// Write header/footer relationship?
-			$i = 1;
-			if (count($pWorksheet->getHeaderFooter()->getImages()) > 0) {
-				$this->_writeRelationship(
-					$objWriter,
-					'_headerfooter_vml' . $i,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
-					'../drawings/vmlDrawingHF' . $pWorksheetId . '.vml'
-				);
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write drawing relationships to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet	$pWorksheet
-	 * @param	int					&$chartRef		Chart ID
-	 * @param	boolean				$includeCharts	Flag indicating if we should write charts
-	 * @return 	string 				XML Output
-	 * @throws 	Exception
-	 */
-	public function writeDrawingRelationships(PHPExcel_Worksheet $pWorksheet = null, &$chartRef, $includeCharts = FALSE)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-
-			// Loop through images and write relationships
-			$i = 1;
-			$iterator = $pWorksheet->getDrawingCollection()->getIterator();
-			while ($iterator->valid()) {
-				if ($iterator->current() instanceof PHPExcel_Worksheet_Drawing
-					|| $iterator->current() instanceof PHPExcel_Worksheet_MemoryDrawing) {
-					// Write relationship for image drawing
-					$this->_writeRelationship(
-						$objWriter,
-						$i,
-						'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
-						'../media/' . str_replace(' ', '', $iterator->current()->getIndexedFilename())
-					);
-				}
-
-				$iterator->next();
-				++$i;
-			}
-
-			if ($includeCharts) {
-				// Loop through charts and write relationships
-				$chartCount = $pWorksheet->getChartCount();
-				if ($chartCount > 0) {
-					for ($c = 0; $c < $chartCount; ++$c) {
-						$this->_writeRelationship(
-							$objWriter,
-							$i++,
-							'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
-							'../charts/chart' . ++$chartRef . '.xml'
-						);
-					}
-				}
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write header/footer drawing relationships to XML format
-	 *
-	 * @param 	PHPExcel_Worksheet			$pWorksheet
-	 * @return 	string 						XML Output
-	 * @throws 	Exception
-	 */
-	public function writeHeaderFooterDrawingRelationships(PHPExcel_Worksheet $pWorksheet = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// Relationships
-		$objWriter->startElement('Relationships');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
-
-			// Loop through images and write relationships
-			foreach ($pWorksheet->getHeaderFooter()->getImages() as $key => $value) {
-				// Write relationship for image drawing
-				$this->_writeRelationship(
-					$objWriter,
-					$key,
-					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
-					'../media/' . $value->getIndexedFilename()
-				);
-			}
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write Override content type
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	int							$pId			Relationship ID. rId will be prepended!
-	 * @param 	string						$pType			Relationship type
-	 * @param 	string 						$pTarget		Relationship target
-	 * @param 	string 						$pTargetMode	Relationship target mode
-	 * @throws 	Exception
-	 */
-	private function _writeRelationship(PHPExcel_Shared_XMLWriter $objWriter = null, $pId = 1, $pType = '', $pTarget = '', $pTargetMode = '')
-	{
-		if ($pType != '' && $pTarget != '') {
-			// Write relationship
-			$objWriter->startElement('Relationship');
-			$objWriter->writeAttribute('Id', 		'rId' . $pId);
-			$objWriter->writeAttribute('Type', 		$pType);
-			$objWriter->writeAttribute('Target',	$pTarget);
-
-			if ($pTargetMode != '') {
-				$objWriter->writeAttribute('TargetMode',	$pTargetMode);
-			}
-
-			$objWriter->endElement();
-		} else {
-			throw new Exception("Invalid parameters passed.");
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/StringTable.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/StringTable.php
deleted file mode 100755
index ee77be4f3..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/StringTable.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_StringTable
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Create worksheet stringtable
-	 *
-	 * @param 	PHPExcel_Worksheet 	$pSheet				Worksheet
-	 * @param 	string[] 				$pExistingTable 	Existing table to eventually merge with
-	 * @return 	string[] 				String table for worksheet
-	 * @throws 	Exception
-	 */
-	public function createStringTable($pSheet = null, $pExistingTable = null)
-	{
-		if ($pSheet !== NULL) {
-			// Create string lookup table
-			$aStringTable = array();
-			$cellCollection = null;
-			$aFlippedStringTable = null;	// For faster lookup
-
-			// Is an existing table given?
-			if (($pExistingTable !== NULL) && is_array($pExistingTable)) {
-				$aStringTable = $pExistingTable;
-			}
-
-			// Fill index array
-			$aFlippedStringTable = $this->flipStringTable($aStringTable);
-
-			// Loop through cells
-			foreach ($pSheet->getCellCollection() as $cellID) {
-				$cell = $pSheet->getCell($cellID);
-				$cellValue = $cell->getValue();
-				if (!is_object($cellValue) &&
-					($cellValue !== NULL) &&
-					$cellValue !== '' &&
-					!isset($aFlippedStringTable[$cellValue]) &&
-					($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_STRING || $cell->getDataType() == PHPExcel_Cell_DataType::TYPE_STRING2 || $cell->getDataType() == PHPExcel_Cell_DataType::TYPE_NULL)) {
-						$aStringTable[] = $cellValue;
-						$aFlippedStringTable[$cellValue] = true;
-				} elseif ($cellValue instanceof PHPExcel_RichText &&
-						  ($cellValue !== NULL) &&
-						  !isset($aFlippedStringTable[$cellValue->getHashCode()])) {
-								$aStringTable[] = $cellValue;
-								$aFlippedStringTable[$cellValue->getHashCode()] = true;
-	        	}
-	        }
-
-	        // Return
-	        return $aStringTable;
-		} else {
-			throw new Exception("Invalid PHPExcel_Worksheet object passed.");
-		}
-	}
-
-	/**
-	 * Write string table to XML format
-	 *
-	 * @param 	string[] 	$pStringTable
-	 * @return 	string 		XML Output
-	 * @throws 	Exception
-	 */
-	public function writeStringTable($pStringTable = null)
-	{
-		if ($pStringTable !== NULL) {
-			// Create XML writer
-			$objWriter = null;
-			if ($this->getParentWriter()->getUseDiskCaching()) {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-			} else {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-			}
-
-			// XML header
-			$objWriter->startDocument('1.0','UTF-8','yes');
-
-			// String table
-			$objWriter->startElement('sst');
-			$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-			$objWriter->writeAttribute('uniqueCount', count($pStringTable));
-
-				// Loop through string table
-				foreach ($pStringTable as $textElement) {
-					$objWriter->startElement('si');
-
-						if (! $textElement instanceof PHPExcel_RichText) {
-							$textToWrite = PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $textElement );
-							$objWriter->startElement('t');
-							if ($textToWrite !== trim($textToWrite)) {
-								$objWriter->writeAttribute('xml:space', 'preserve');
-							}
-							$objWriter->writeRawData($textToWrite);
-							$objWriter->endElement();
-						} else if ($textElement instanceof PHPExcel_RichText) {
-							$this->writeRichText($objWriter, $textElement);
-						}
-
-                    $objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-
-			// Return
-			return $objWriter->getData();
-		} else {
-			throw new Exception("Invalid string table array passed.");
-		}
-	}
-
-	/**
-	 * Write Rich Text
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_RichText			$pRichText		Rich text
-	 * @param 	string						$prefix			Optional Namespace prefix
-	 * @throws 	Exception
-	 */
-	public function writeRichText(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_RichText $pRichText = null, $prefix=NULL)
-	{
-		if ($prefix !== NULL)
-			$prefix .= ':';
-		// Loop through rich text elements
-		$elements = $pRichText->getRichTextElements();
-		foreach ($elements as $element) {
-			// r
-			$objWriter->startElement($prefix.'r');
-
-				// rPr
-				if ($element instanceof PHPExcel_RichText_Run) {
-					// rPr
-					$objWriter->startElement($prefix.'rPr');
-
-						// rFont
-						$objWriter->startElement($prefix.'rFont');
-						$objWriter->writeAttribute('val', $element->getFont()->getName());
-						$objWriter->endElement();
-
-						// Bold
-						$objWriter->startElement($prefix.'b');
-						$objWriter->writeAttribute('val', ($element->getFont()->getBold() ? 'true' : 'false'));
-						$objWriter->endElement();
-
-						// Italic
-						$objWriter->startElement($prefix.'i');
-						$objWriter->writeAttribute('val', ($element->getFont()->getItalic() ? 'true' : 'false'));
-						$objWriter->endElement();
-
-						// Superscript / subscript
-						if ($element->getFont()->getSuperScript() || $element->getFont()->getSubScript()) {
-							$objWriter->startElement($prefix.'vertAlign');
-							if ($element->getFont()->getSuperScript()) {
-								$objWriter->writeAttribute('val', 'superscript');
-							} else if ($element->getFont()->getSubScript()) {
-								$objWriter->writeAttribute('val', 'subscript');
-							}
-							$objWriter->endElement();
-						}
-
-						// Strikethrough
-						$objWriter->startElement($prefix.'strike');
-						$objWriter->writeAttribute('val', ($element->getFont()->getStrikethrough() ? 'true' : 'false'));
-						$objWriter->endElement();
-
-						// Color
-						$objWriter->startElement($prefix.'color');
-						$objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB());
-						$objWriter->endElement();
-
-						// Size
-						$objWriter->startElement($prefix.'sz');
-						$objWriter->writeAttribute('val', $element->getFont()->getSize());
-						$objWriter->endElement();
-
-						// Underline
-						$objWriter->startElement($prefix.'u');
-						$objWriter->writeAttribute('val', $element->getFont()->getUnderline());
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-				}
-
-				// t
-				$objWriter->startElement($prefix.'t');
-				$objWriter->writeAttribute('xml:space', 'preserve');
-				$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $element->getText() ));
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write Rich Text
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	string|PHPExcel_RichText	$pRichText		text string or Rich text
-	 * @param 	string						$prefix			Optional Namespace prefix
-	 * @throws 	Exception
-	 */
-	public function writeRichTextForCharts(PHPExcel_Shared_XMLWriter $objWriter = null, $pRichText = null, $prefix=NULL)
-	{
-		if (!$pRichText instanceof PHPExcel_RichText) {
-			$textRun = $pRichText;
-			$pRichText = new PHPExcel_RichText();
-			$pRichText->createTextRun($textRun);
-		}
-
-		if ($prefix !== NULL)
-			$prefix .= ':';
-		// Loop through rich text elements
-		$elements = $pRichText->getRichTextElements();
-		foreach ($elements as $element) {
-			// r
-			$objWriter->startElement($prefix.'r');
-
-				// rPr
-				$objWriter->startElement($prefix.'rPr');
-
-					// Bold
-					$objWriter->writeAttribute('b', ($element->getFont()->getBold() ? 1 : 0));
-					// Italic
-					$objWriter->writeAttribute('i', ($element->getFont()->getItalic() ? 1 : 0));
-					// Underline
-					$underlineType = $element->getFont()->getUnderline();
-					switch($underlineType) {
-						case 'single' :
-							$underlineType = 'sng';
-							break;
-						case 'double' :
-							$underlineType = 'dbl';
-							break;
-					}
-					$objWriter->writeAttribute('u', $underlineType);
-					// Strikethrough
-					$objWriter->writeAttribute('strike', ($element->getFont()->getStrikethrough() ? 'sngStrike' : 'noStrike'));
-
-					// rFont
-					$objWriter->startElement($prefix.'latin');
-						$objWriter->writeAttribute('typeface', $element->getFont()->getName());
-					$objWriter->endElement();
-
-					// Superscript / subscript
-//					if ($element->getFont()->getSuperScript() || $element->getFont()->getSubScript()) {
-//						$objWriter->startElement($prefix.'vertAlign');
-//						if ($element->getFont()->getSuperScript()) {
-//							$objWriter->writeAttribute('val', 'superscript');
-//						} else if ($element->getFont()->getSubScript()) {
-//							$objWriter->writeAttribute('val', 'subscript');
-//						}
-//						$objWriter->endElement();
-//					}
-//
-				$objWriter->endElement();
-
-				// t
-				$objWriter->startElement($prefix.'t');
-//					$objWriter->writeAttribute('xml:space', 'preserve');	//	Excel2010 accepts, Excel2007 complains
-					$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $element->getText() ));
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Flip string table (for index searching)
-	 *
-	 * @param 	array	$stringTable	Stringtable
-	 * @return 	array
-	 */
-	public function flipStringTable($stringTable = array()) {
-		// Return value
-		$returnValue = array();
-
-		// Loop through stringtable and add flipped items to $returnValue
-		foreach ($stringTable as $key => $value) {
-			if (! $value instanceof PHPExcel_RichText) {
-				$returnValue[$value] = $key;
-			} else if ($value instanceof PHPExcel_RichText) {
-				$returnValue[$value->getHashCode()] = $key;
-			}
-		}
-
-		// Return
-		return $returnValue;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Style.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Style.php
deleted file mode 100755
index b980a1672..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Style.php
+++ /dev/null
@@ -1,701 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Style
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write styles to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	Exception
-	 */
-	public function writeStyles(PHPExcel $pPHPExcel = null)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// styleSheet
-		$objWriter->startElement('styleSheet');
-		$objWriter->writeAttribute('xml:space', 'preserve');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-
-			// numFmts
-			$objWriter->startElement('numFmts');
-			$objWriter->writeAttribute('count', $this->getParentWriter()->getNumFmtHashTable()->count());
-
-				// numFmt
-				for ($i = 0; $i < $this->getParentWriter()->getNumFmtHashTable()->count(); ++$i) {
-					$this->_writeNumFmt($objWriter, $this->getParentWriter()->getNumFmtHashTable()->getByIndex($i), $i);
-				}
-
-			$objWriter->endElement();
-
-			// fonts
-			$objWriter->startElement('fonts');
-			$objWriter->writeAttribute('count', $this->getParentWriter()->getFontHashTable()->count());
-
-				// font
-				for ($i = 0; $i < $this->getParentWriter()->getFontHashTable()->count(); ++$i) {
-					$this->_writeFont($objWriter, $this->getParentWriter()->getFontHashTable()->getByIndex($i));
-				}
-
-			$objWriter->endElement();
-
-			// fills
-			$objWriter->startElement('fills');
-			$objWriter->writeAttribute('count', $this->getParentWriter()->getFillHashTable()->count());
-
-				// fill
-				for ($i = 0; $i < $this->getParentWriter()->getFillHashTable()->count(); ++$i) {
-					$this->_writeFill($objWriter, $this->getParentWriter()->getFillHashTable()->getByIndex($i));
-				}
-
-			$objWriter->endElement();
-
-			// borders
-			$objWriter->startElement('borders');
-			$objWriter->writeAttribute('count', $this->getParentWriter()->getBordersHashTable()->count());
-
-				// border
-				for ($i = 0; $i < $this->getParentWriter()->getBordersHashTable()->count(); ++$i) {
-					$this->_writeBorder($objWriter, $this->getParentWriter()->getBordersHashTable()->getByIndex($i));
-				}
-
-			$objWriter->endElement();
-
-			// cellStyleXfs
-			$objWriter->startElement('cellStyleXfs');
-			$objWriter->writeAttribute('count', 1);
-
-				// xf
-				$objWriter->startElement('xf');
-					$objWriter->writeAttribute('numFmtId', 	0);
-					$objWriter->writeAttribute('fontId', 	0);
-					$objWriter->writeAttribute('fillId', 	0);
-					$objWriter->writeAttribute('borderId',	0);
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// cellXfs
-			$objWriter->startElement('cellXfs');
-			$objWriter->writeAttribute('count', count($pPHPExcel->getCellXfCollection()));
-
-				// xf
-				foreach ($pPHPExcel->getCellXfCollection() as $cellXf) {
-					$this->_writeCellStyleXf($objWriter, $cellXf, $pPHPExcel);
-				}
-
-			$objWriter->endElement();
-
-			// cellStyles
-			$objWriter->startElement('cellStyles');
-			$objWriter->writeAttribute('count', 1);
-
-				// cellStyle
-				$objWriter->startElement('cellStyle');
-					$objWriter->writeAttribute('name', 		'Normal');
-					$objWriter->writeAttribute('xfId', 		0);
-					$objWriter->writeAttribute('builtinId',	0);
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-			// dxfs
-			$objWriter->startElement('dxfs');
-			$objWriter->writeAttribute('count', $this->getParentWriter()->getStylesConditionalHashTable()->count());
-
-				// dxf
-				for ($i = 0; $i < $this->getParentWriter()->getStylesConditionalHashTable()->count(); ++$i) {
-					$this->_writeCellStyleDxf($objWriter, $this->getParentWriter()->getStylesConditionalHashTable()->getByIndex($i)->getStyle());
-				}
-
-			$objWriter->endElement();
-
-			// tableStyles
-			$objWriter->startElement('tableStyles');
-			$objWriter->writeAttribute('defaultTableStyle', 'TableStyleMedium9');
-			$objWriter->writeAttribute('defaultPivotStyle', 'PivotTableStyle1');
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write Fill
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_Fill			$pFill			Fill style
-	 * @throws 	Exception
-	 */
-	private function _writeFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
-	{
-		// Check if this is a pattern type or gradient type
-		if ($pFill->getFillType() === PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR ||
-			$pFill->getFillType() === PHPExcel_Style_Fill::FILL_GRADIENT_PATH) {
-			// Gradient fill
-			$this->_writeGradientFill($objWriter, $pFill);
-		} elseif($pFill->getFillType() !== NULL) {
-			// Pattern fill
-			$this->_writePatternFill($objWriter, $pFill);
-		}
-	}
-
-	/**
-	 * Write Gradient Fill
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_Fill			$pFill			Fill style
-	 * @throws 	Exception
-	 */
-	private function _writeGradientFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
-	{
-		// fill
-		$objWriter->startElement('fill');
-
-			// gradientFill
-			$objWriter->startElement('gradientFill');
-				$objWriter->writeAttribute('type', 		$pFill->getFillType());
-				$objWriter->writeAttribute('degree', 	$pFill->getRotation());
-
-				// stop
-				$objWriter->startElement('stop');
-				$objWriter->writeAttribute('position', '0');
-
-					// color
-					$objWriter->startElement('color');
-					$objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB());
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-				// stop
-				$objWriter->startElement('stop');
-				$objWriter->writeAttribute('position', '1');
-
-					// color
-					$objWriter->startElement('color');
-					$objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB());
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Pattern Fill
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter			$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_Fill					$pFill			Fill style
-	 * @throws 	Exception
-	 */
-	private function _writePatternFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
-	{
-		// fill
-		$objWriter->startElement('fill');
-
-			// patternFill
-			$objWriter->startElement('patternFill');
-				$objWriter->writeAttribute('patternType', $pFill->getFillType());
-
-				if ($pFill->getFillType() !== PHPExcel_Style_Fill::FILL_NONE) {
-					// fgColor
-					if ($pFill->getStartColor()->getARGB()) {
-						$objWriter->startElement('fgColor');
-						$objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB());
-						$objWriter->endElement();
-					}
-				}
-				if ($pFill->getFillType() !== PHPExcel_Style_Fill::FILL_NONE) {
-					// bgColor
-					if ($pFill->getEndColor()->getARGB()) {
-						$objWriter->startElement('bgColor');
-						$objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB());
-						$objWriter->endElement();
-					}
-				}
-
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Font
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter		$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_Font				$pFont			Font style
-	 * @throws 	Exception
-	 */
-	private function _writeFont(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Font $pFont = null)
-	{
-		// font
-		$objWriter->startElement('font');
-			//	Weird! The order of these elements actually makes a difference when opening Excel2007
-			//		files in Excel2003 with the compatibility pack. It's not documented behaviour,
-			//		and makes for a real WTF!
-
-			// Bold. We explicitly write this element also when false (like MS Office Excel 2007 does
-			// for conditional formatting). Otherwise it will apparently not be picked up in conditional
-			// formatting style dialog
-			if ($pFont->getBold() !== NULL) {
-				$objWriter->startElement('b');
-					$objWriter->writeAttribute('val', $pFont->getBold() ? '1' : '0');
-				$objWriter->endElement();
-			}
-
-			// Italic
-			if ($pFont->getItalic() !== NULL) {
-				$objWriter->startElement('i');
-					$objWriter->writeAttribute('val', $pFont->getItalic() ? '1' : '0');
-				$objWriter->endElement();
-			}
-
-			// Strikethrough
-			if ($pFont->getStrikethrough() !== NULL) {
-				$objWriter->startElement('strike');
-				$objWriter->writeAttribute('val', $pFont->getStrikethrough() ? '1' : '0');
-				$objWriter->endElement();
-			}
-
-			// Underline
-			if ($pFont->getUnderline() !== NULL) {
-				$objWriter->startElement('u');
-				$objWriter->writeAttribute('val', $pFont->getUnderline());
-				$objWriter->endElement();
-			}
-
-			// Superscript / subscript
-			if ($pFont->getSuperScript() === TRUE || $pFont->getSubScript() === TRUE) {
-				$objWriter->startElement('vertAlign');
-				if ($pFont->getSuperScript() === TRUE) {
-					$objWriter->writeAttribute('val', 'superscript');
-				} else if ($pFont->getSubScript() === TRUE) {
-					$objWriter->writeAttribute('val', 'subscript');
-				}
-				$objWriter->endElement();
-			}
-
-			// Size
-			if ($pFont->getSize() !== NULL) {
-				$objWriter->startElement('sz');
-					$objWriter->writeAttribute('val', $pFont->getSize());
-				$objWriter->endElement();
-			}
-
-			// Foreground color
-			if ($pFont->getColor()->getARGB() !== NULL) {
-				$objWriter->startElement('color');
-				$objWriter->writeAttribute('rgb', $pFont->getColor()->getARGB());
-				$objWriter->endElement();
-			}
-
-			// Name
-			if ($pFont->getName() !== NULL) {
-				$objWriter->startElement('name');
-					$objWriter->writeAttribute('val', $pFont->getName());
-				$objWriter->endElement();
-			}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Border
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter			$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_Borders				$pBorders		Borders style
-	 * @throws 	Exception
-	 */
-	private function _writeBorder(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Borders $pBorders = null)
-	{
-		// Write border
-		$objWriter->startElement('border');
-			// Diagonal?
-			switch ($pBorders->getDiagonalDirection()) {
-				case PHPExcel_Style_Borders::DIAGONAL_UP:
-					$objWriter->writeAttribute('diagonalUp', 	'true');
-					$objWriter->writeAttribute('diagonalDown', 	'false');
-					break;
-				case PHPExcel_Style_Borders::DIAGONAL_DOWN:
-					$objWriter->writeAttribute('diagonalUp', 	'false');
-					$objWriter->writeAttribute('diagonalDown', 	'true');
-					break;
-				case PHPExcel_Style_Borders::DIAGONAL_BOTH:
-					$objWriter->writeAttribute('diagonalUp', 	'true');
-					$objWriter->writeAttribute('diagonalDown', 	'true');
-					break;
-			}
-
-			// BorderPr
-			$this->_writeBorderPr($objWriter, 'left',		$pBorders->getLeft());
-			$this->_writeBorderPr($objWriter, 'right',		$pBorders->getRight());
-			$this->_writeBorderPr($objWriter, 'top',		$pBorders->getTop());
-			$this->_writeBorderPr($objWriter, 'bottom',		$pBorders->getBottom());
-			$this->_writeBorderPr($objWriter, 'diagonal',	$pBorders->getDiagonal());
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Cell Style Xf
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter			$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style						$pStyle			Style
-	 * @param 	PHPExcel							$pPHPExcel		Workbook
-	 * @throws 	Exception
-	 */
-	private function _writeCellStyleXf(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style $pStyle = null, PHPExcel $pPHPExcel = null)
-	{
-		// xf
-		$objWriter->startElement('xf');
-			$objWriter->writeAttribute('xfId', 0);
-			$objWriter->writeAttribute('fontId', 			(int)$this->getParentWriter()->getFontHashTable()->getIndexForHashCode($pStyle->getFont()->getHashCode()));
-
-			if ($pStyle->getNumberFormat()->getBuiltInFormatCode() === false) {
-				$objWriter->writeAttribute('numFmtId', 			(int)($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($pStyle->getNumberFormat()->getHashCode()) + 164)   );
-			} else {
-				$objWriter->writeAttribute('numFmtId', 			(int)$pStyle->getNumberFormat()->getBuiltInFormatCode());
-			}
-
-			$objWriter->writeAttribute('fillId', 			(int)$this->getParentWriter()->getFillHashTable()->getIndexForHashCode($pStyle->getFill()->getHashCode()));
-			$objWriter->writeAttribute('borderId', 			(int)$this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($pStyle->getBorders()->getHashCode()));
-
-			// Apply styles?
-			$objWriter->writeAttribute('applyFont', 		($pPHPExcel->getDefaultStyle()->getFont()->getHashCode() != $pStyle->getFont()->getHashCode()) ? '1' : '0');
-			$objWriter->writeAttribute('applyNumberFormat', ($pPHPExcel->getDefaultStyle()->getNumberFormat()->getHashCode() != $pStyle->getNumberFormat()->getHashCode()) ? '1' : '0');
-			$objWriter->writeAttribute('applyFill', 		($pPHPExcel->getDefaultStyle()->getFill()->getHashCode() != $pStyle->getFill()->getHashCode()) ? '1' : '0');
-			$objWriter->writeAttribute('applyBorder', 		($pPHPExcel->getDefaultStyle()->getBorders()->getHashCode() != $pStyle->getBorders()->getHashCode()) ? '1' : '0');
-			$objWriter->writeAttribute('applyAlignment',	($pPHPExcel->getDefaultStyle()->getAlignment()->getHashCode() != $pStyle->getAlignment()->getHashCode()) ? '1' : '0');
-			if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-				$objWriter->writeAttribute('applyProtection', 'true');
-			}
-
-			// alignment
-			$objWriter->startElement('alignment');
-				$objWriter->writeAttribute('horizontal', 	$pStyle->getAlignment()->getHorizontal());
-				$objWriter->writeAttribute('vertical', 		$pStyle->getAlignment()->getVertical());
-
-				$textRotation = 0;
-				if ($pStyle->getAlignment()->getTextRotation() >= 0) {
-					$textRotation = $pStyle->getAlignment()->getTextRotation();
-				} else if ($pStyle->getAlignment()->getTextRotation() < 0) {
-					$textRotation = 90 - $pStyle->getAlignment()->getTextRotation();
-				}
-				$objWriter->writeAttribute('textRotation', 	$textRotation);
-
-				$objWriter->writeAttribute('wrapText', 		($pStyle->getAlignment()->getWrapText() ? 'true' : 'false'));
-				$objWriter->writeAttribute('shrinkToFit', 	($pStyle->getAlignment()->getShrinkToFit() ? 'true' : 'false'));
-
-				if ($pStyle->getAlignment()->getIndent() > 0) {
-					$objWriter->writeAttribute('indent', 	$pStyle->getAlignment()->getIndent());
-				}
-			$objWriter->endElement();
-
-			// protection
-			if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-				$objWriter->startElement('protection');
-					if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-						$objWriter->writeAttribute('locked', 		($pStyle->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-					}
-					if ($pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-						$objWriter->writeAttribute('hidden', 		($pStyle->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-					}
-				$objWriter->endElement();
-			}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Cell Style Dxf
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 		$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style					$pStyle			Style
-	 * @throws 	Exception
-	 */
-	private function _writeCellStyleDxf(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style $pStyle = null)
-	{
-		// dxf
-		$objWriter->startElement('dxf');
-
-			// font
-			$this->_writeFont($objWriter, $pStyle->getFont());
-
-			// numFmt
-			$this->_writeNumFmt($objWriter, $pStyle->getNumberFormat());
-
-			// fill
-			$this->_writeFill($objWriter, $pStyle->getFill());
-
-			// alignment
-			$objWriter->startElement('alignment');
-				if ($pStyle->getAlignment()->getHorizontal() !== NULL) {
-					$objWriter->writeAttribute('horizontal', $pStyle->getAlignment()->getHorizontal());
-				}
-				if ($pStyle->getAlignment()->getVertical() !== NULL) {
-					$objWriter->writeAttribute('vertical', $pStyle->getAlignment()->getVertical());
-				}
-
-				if ($pStyle->getAlignment()->getTextRotation() !== NULL) {
-					$textRotation = 0;
-					if ($pStyle->getAlignment()->getTextRotation() >= 0) {
-						$textRotation = $pStyle->getAlignment()->getTextRotation();
-					} else if ($pStyle->getAlignment()->getTextRotation() < 0) {
-						$textRotation = 90 - $pStyle->getAlignment()->getTextRotation();
-					}
-					$objWriter->writeAttribute('textRotation', 	$textRotation);
-				}
-			$objWriter->endElement();
-
-			// border
-			$this->_writeBorder($objWriter, $pStyle->getBorders());
-
-			// protection
-			if (($pStyle->getProtection()->getLocked() !== NULL) ||
-				($pStyle->getProtection()->getHidden() !== NULL)) {
-				if ($pStyle->getProtection()->getLocked() !== PHPExcel_Style_Protection::PROTECTION_INHERIT ||
-					$pStyle->getProtection()->getHidden() !== PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-					$objWriter->startElement('protection');
-						if (($pStyle->getProtection()->getLocked() !== NULL) &&
-							($pStyle->getProtection()->getLocked() !== PHPExcel_Style_Protection::PROTECTION_INHERIT)) {
-							$objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-						}
-						if (($pStyle->getProtection()->getHidden() !== NULL) &&
-							($pStyle->getProtection()->getHidden() !== PHPExcel_Style_Protection::PROTECTION_INHERIT)) {
-							$objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-						}
-					$objWriter->endElement();
-				}
-			}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write BorderPr
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter		$objWriter 		XML Writer
-	 * @param 	string							$pName			Element name
-	 * @param 	PHPExcel_Style_Border			$pBorder		Border style
-	 * @throws 	Exception
-	 */
-	private function _writeBorderPr(PHPExcel_Shared_XMLWriter $objWriter = null, $pName = 'left', PHPExcel_Style_Border $pBorder = null)
-	{
-		// Write BorderPr
-		if ($pBorder->getBorderStyle() != PHPExcel_Style_Border::BORDER_NONE) {
-			$objWriter->startElement($pName);
-			$objWriter->writeAttribute('style', 	$pBorder->getBorderStyle());
-
-				// color
-				$objWriter->startElement('color');
-				$objWriter->writeAttribute('rgb', 	$pBorder->getColor()->getARGB());
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write NumberFormat
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter			$objWriter 		XML Writer
-	 * @param 	PHPExcel_Style_NumberFormat			$pNumberFormat	Number Format
-	 * @param 	int									$pId			Number Format identifier
-	 * @throws 	Exception
-	 */
-	private function _writeNumFmt(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_NumberFormat $pNumberFormat = null, $pId = 0)
-	{
-		// Translate formatcode
-		$formatCode = $pNumberFormat->getFormatCode();
-
-		// numFmt
-		if ($formatCode !== NULL) {
-			$objWriter->startElement('numFmt');
-				$objWriter->writeAttribute('numFmtId', ($pId + 164));
-				$objWriter->writeAttribute('formatCode', $formatCode);
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Get an array of all styles
-	 *
-	 * @param 	PHPExcel				$pPHPExcel
-	 * @return 	PHPExcel_Style[]		All styles in PHPExcel
-	 * @throws 	Exception
-	 */
-	public function allStyles(PHPExcel $pPHPExcel = null)
-	{
-		$aStyles = $pPHPExcel->getCellXfCollection();
-
-		return $aStyles;
-	}
-
-	/**
-	 * Get an array of all conditional styles
-	 *
-	 * @param 	PHPExcel							$pPHPExcel
-	 * @return 	PHPExcel_Style_Conditional[]		All conditional styles in PHPExcel
-	 * @throws 	Exception
-	 */
-	public function allConditionalStyles(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of all styles
-		$aStyles		= array();
-
-		$sheetCount = $pPHPExcel->getSheetCount();
-		for ($i = 0; $i < $sheetCount; ++$i) {
-			foreach ($pPHPExcel->getSheet($i)->getConditionalStylesCollection() as $conditionalStyles) {
-				foreach ($conditionalStyles as $conditionalStyle) {
-					$aStyles[] = $conditionalStyle;
-				}
-			}
-		}
-
-		return $aStyles;
-	}
-
-	/**
-	 * Get an array of all fills
-	 *
-	 * @param 	PHPExcel						$pPHPExcel
-	 * @return 	PHPExcel_Style_Fill[]		All fills in PHPExcel
-	 * @throws 	Exception
-	 */
-	public function allFills(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of unique fills
-		$aFills 	= array();
-
-		// Two first fills are predefined
-		$fill0 = new PHPExcel_Style_Fill();
-		$fill0->setFillType(PHPExcel_Style_Fill::FILL_NONE);
-		$aFills[] = $fill0;
-
-		$fill1 = new PHPExcel_Style_Fill();
-		$fill1->setFillType(PHPExcel_Style_Fill::FILL_PATTERN_GRAY125);
-		$aFills[] = $fill1;
-		// The remaining fills
-		$aStyles 	= $this->allStyles($pPHPExcel);
-		foreach ($aStyles as $style) {
-			if (!array_key_exists($style->getFill()->getHashCode(), $aFills)) {
-				$aFills[ $style->getFill()->getHashCode() ] = $style->getFill();
-			}
-		}
-
-		return $aFills;
-	}
-
-	/**
-	 * Get an array of all fonts
-	 *
-	 * @param 	PHPExcel						$pPHPExcel
-	 * @return 	PHPExcel_Style_Font[]		All fonts in PHPExcel
-	 * @throws 	Exception
-	 */
-	public function allFonts(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of unique fonts
-		$aFonts 	= array();
-		$aStyles 	= $this->allStyles($pPHPExcel);
-
-		foreach ($aStyles as $style) {
-			if (!array_key_exists($style->getFont()->getHashCode(), $aFonts)) {
-				$aFonts[ $style->getFont()->getHashCode() ] = $style->getFont();
-			}
-		}
-
-		return $aFonts;
-	}
-
-	/**
-	 * Get an array of all borders
-	 *
-	 * @param 	PHPExcel						$pPHPExcel
-	 * @return 	PHPExcel_Style_Borders[]		All borders in PHPExcel
-	 * @throws 	Exception
-	 */
-	public function allBorders(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of unique borders
-		$aBorders 	= array();
-		$aStyles 	= $this->allStyles($pPHPExcel);
-
-		foreach ($aStyles as $style) {
-			if (!array_key_exists($style->getBorders()->getHashCode(), $aBorders)) {
-				$aBorders[ $style->getBorders()->getHashCode() ] = $style->getBorders();
-			}
-		}
-
-		return $aBorders;
-	}
-
-	/**
-	 * Get an array of all number formats
-	 *
-	 * @param 	PHPExcel								$pPHPExcel
-	 * @return 	PHPExcel_Style_NumberFormat[]		All number formats in PHPExcel
-	 * @throws 	Exception
-	 */
-	public function allNumberFormats(PHPExcel $pPHPExcel = null)
-	{
-		// Get an array of unique number formats
-		$aNumFmts 	= array();
-		$aStyles 	= $this->allStyles($pPHPExcel);
-
-		foreach ($aStyles as $style) {
-			if ($style->getNumberFormat()->getBuiltInFormatCode() === false && !array_key_exists($style->getNumberFormat()->getHashCode(), $aNumFmts)) {
-				$aNumFmts[ $style->getNumberFormat()->getHashCode() ] = $style->getNumberFormat();
-			}
-		}
-
-		return $aNumFmts;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Theme.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Theme.php
deleted file mode 100755
index 2ebdf5753..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Theme.php
+++ /dev/null
@@ -1,871 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_DocProps
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Map of Major fonts to write
-	 * @static	array of string
-	 *
-	 */
-	private static $_majorFonts = array(
-					'Jpan' => 'ＭＳ Ｐゴシック',
-					'Hang' => '맑은 고딕',
-					'Hans' => '宋体',
-					'Hant' => '新細明體',
-					'Arab' => 'Times New Roman',
-					'Hebr' => 'Times New Roman',
-					'Thai' => 'Tahoma',
-					'Ethi' => 'Nyala',
-					'Beng' => 'Vrinda',
-					'Gujr' => 'Shruti',
-					'Khmr' => 'MoolBoran',
-					'Knda' => 'Tunga',
-					'Guru' => 'Raavi',
-					'Cans' => 'Euphemia',
-					'Cher' => 'Plantagenet Cherokee',
-					'Yiii' => 'Microsoft Yi Baiti',
-					'Tibt' => 'Microsoft Himalaya',
-					'Thaa' => 'MV Boli',
-					'Deva' => 'Mangal',
-					'Telu' => 'Gautami',
-					'Taml' => 'Latha',
-					'Syrc' => 'Estrangelo Edessa',
-					'Orya' => 'Kalinga',
-					'Mlym' => 'Kartika',
-					'Laoo' => 'DokChampa',
-					'Sinh' => 'Iskoola Pota',
-					'Mong' => 'Mongolian Baiti',
-					'Viet' => 'Times New Roman',
-					'Uigh' => 'Microsoft Uighur',
-					'Geor' => 'Sylfaen',
-			);
-
-	/**
-	 * Map of Minor fonts to write
-	 * @static	array of string
-	 *
-	 */
-	private static $_minorFonts = array(
-					'Jpan' => 'ＭＳ Ｐゴシック',
-					'Hang' => '맑은 고딕',
-					'Hans' => '宋体',
-					'Hant' => '新細明體',
-					'Arab' => 'Arial',
-					'Hebr' => 'Arial',
-					'Thai' => 'Tahoma',
-					'Ethi' => 'Nyala',
-					'Beng' => 'Vrinda',
-					'Gujr' => 'Shruti',
-					'Khmr' => 'DaunPenh',
-					'Knda' => 'Tunga',
-					'Guru' => 'Raavi',
-					'Cans' => 'Euphemia',
-					'Cher' => 'Plantagenet Cherokee',
-					'Yiii' => 'Microsoft Yi Baiti',
-					'Tibt' => 'Microsoft Himalaya',
-					'Thaa' => 'MV Boli',
-					'Deva' => 'Mangal',
-					'Telu' => 'Gautami',
-					'Taml' => 'Latha',
-					'Syrc' => 'Estrangelo Edessa',
-					'Orya' => 'Kalinga',
-					'Mlym' => 'Kartika',
-					'Laoo' => 'DokChampa',
-					'Sinh' => 'Iskoola Pota',
-					'Mong' => 'Mongolian Baiti',
-					'Viet' => 'Arial',
-					'Uigh' => 'Microsoft Uighur',
-					'Geor' => 'Sylfaen',
-			);
-
-	/**
-	 * Map of core colours
-	 * @static	array of string
-	 *
-	 */
-		private static $_colourScheme = array(
-					'dk2'		=> '1F497D',
-					'lt2'		=> 'EEECE1',
-					'accent1'	=> '4F81BD',
-					'accent2'	=> 'C0504D',
-					'accent3'	=> '9BBB59',
-					'accent4'	=> '8064A2',
-					'accent5'	=> '4BACC6',
-					'accent6'	=> 'F79646',
-					'hlink'		=> '0000FF',
-					'folHlink'	=> '800080',
-			);
-			
-	/**
-	 * Write theme to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @return 	string 		XML Output
-	 * @throws 	Exception
-	 */
-	public function writeTheme(PHPExcel $pPHPExcel = null)
-	{
-			// Create XML writer
-			$objWriter = null;
-			if ($this->getParentWriter()->getUseDiskCaching()) {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-			} else {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-			}
-
-			// XML header
-			$objWriter->startDocument('1.0','UTF-8','yes');
-
-			// a:theme
-			$objWriter->startElement('a:theme');
-			$objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
-			$objWriter->writeAttribute('name', 'Office Theme');
-
-				// a:themeElements
-				$objWriter->startElement('a:themeElements');
-
-					// a:clrScheme
-					$objWriter->startElement('a:clrScheme');
-					$objWriter->writeAttribute('name', 'Office');
-
-						// a:dk1
-						$objWriter->startElement('a:dk1');
-
-							// a:sysClr
-							$objWriter->startElement('a:sysClr');
-							$objWriter->writeAttribute('val', 'windowText');
-							$objWriter->writeAttribute('lastClr', '000000');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:lt1
-						$objWriter->startElement('a:lt1');
-
-							// a:sysClr
-							$objWriter->startElement('a:sysClr');
-							$objWriter->writeAttribute('val', 'window');
-							$objWriter->writeAttribute('lastClr', 'FFFFFF');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:dk2
-						$this->_writeColourScheme($objWriter);
-
-					$objWriter->endElement();
-
-					// a:fontScheme
-					$objWriter->startElement('a:fontScheme');
-					$objWriter->writeAttribute('name', 'Office');
-
-						// a:majorFont
-						$objWriter->startElement('a:majorFont');
-							$this->_writeFonts($objWriter, 'Cambria', self::$_majorFonts);
-						$objWriter->endElement();
-
-						// a:minorFont
-						$objWriter->startElement('a:minorFont');
-							$this->_writeFonts($objWriter, 'Calibri', self::$_minorFonts);
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-
-					// a:fmtScheme
-					$objWriter->startElement('a:fmtScheme');
-					$objWriter->writeAttribute('name', 'Office');
-
-						// a:fillStyleLst
-						$objWriter->startElement('a:fillStyleLst');
-
-							// a:solidFill
-							$objWriter->startElement('a:solidFill');
-
-								// a:schemeClr
-								$objWriter->startElement('a:schemeClr');
-								$objWriter->writeAttribute('val', 'phClr');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:gradFill
-							$objWriter->startElement('a:gradFill');
-							$objWriter->writeAttribute('rotWithShape', '1');
-
-								// a:gsLst
-								$objWriter->startElement('a:gsLst');
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '0');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '50000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '300000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '35000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '37000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '300000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '100000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '15000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '350000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:lin
-								$objWriter->startElement('a:lin');
-								$objWriter->writeAttribute('ang', '16200000');
-								$objWriter->writeAttribute('scaled', '1');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:gradFill
-							$objWriter->startElement('a:gradFill');
-							$objWriter->writeAttribute('rotWithShape', '1');
-
-								// a:gsLst
-								$objWriter->startElement('a:gsLst');
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '0');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '51000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '130000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '80000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '93000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '130000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '100000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '94000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '135000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:lin
-								$objWriter->startElement('a:lin');
-								$objWriter->writeAttribute('ang', '16200000');
-								$objWriter->writeAttribute('scaled', '0');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:lnStyleLst
-						$objWriter->startElement('a:lnStyleLst');
-
-							// a:ln
-							$objWriter->startElement('a:ln');
-							$objWriter->writeAttribute('w', '9525');
-							$objWriter->writeAttribute('cap', 'flat');
-							$objWriter->writeAttribute('cmpd', 'sng');
-							$objWriter->writeAttribute('algn', 'ctr');
-
-								// a:solidFill
-								$objWriter->startElement('a:solidFill');
-
-									// a:schemeClr
-									$objWriter->startElement('a:schemeClr');
-									$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '95000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '105000');
-											$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:prstDash
-								$objWriter->startElement('a:prstDash');
-								$objWriter->writeAttribute('val', 'solid');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:ln
-							$objWriter->startElement('a:ln');
-							$objWriter->writeAttribute('w', '25400');
-							$objWriter->writeAttribute('cap', 'flat');
-							$objWriter->writeAttribute('cmpd', 'sng');
-							$objWriter->writeAttribute('algn', 'ctr');
-
-								// a:solidFill
-								$objWriter->startElement('a:solidFill');
-
-									// a:schemeClr
-									$objWriter->startElement('a:schemeClr');
-									$objWriter->writeAttribute('val', 'phClr');
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:prstDash
-								$objWriter->startElement('a:prstDash');
-								$objWriter->writeAttribute('val', 'solid');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:ln
-							$objWriter->startElement('a:ln');
-							$objWriter->writeAttribute('w', '38100');
-							$objWriter->writeAttribute('cap', 'flat');
-							$objWriter->writeAttribute('cmpd', 'sng');
-							$objWriter->writeAttribute('algn', 'ctr');
-
-								// a:solidFill
-								$objWriter->startElement('a:solidFill');
-
-									// a:schemeClr
-									$objWriter->startElement('a:schemeClr');
-									$objWriter->writeAttribute('val', 'phClr');
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:prstDash
-								$objWriter->startElement('a:prstDash');
-								$objWriter->writeAttribute('val', 'solid');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-
-
-						// a:effectStyleLst
-						$objWriter->startElement('a:effectStyleLst');
-
-							// a:effectStyle
-							$objWriter->startElement('a:effectStyle');
-
-								// a:effectLst
-								$objWriter->startElement('a:effectLst');
-
-									// a:outerShdw
-									$objWriter->startElement('a:outerShdw');
-									$objWriter->writeAttribute('blurRad', '40000');
-									$objWriter->writeAttribute('dist', '20000');
-									$objWriter->writeAttribute('dir', '5400000');
-									$objWriter->writeAttribute('rotWithShape', '0');
-
-										// a:srgbClr
-										$objWriter->startElement('a:srgbClr');
-										$objWriter->writeAttribute('val', '000000');
-
-											// a:alpha
-											$objWriter->startElement('a:alpha');
-											$objWriter->writeAttribute('val', '38000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:effectStyle
-							$objWriter->startElement('a:effectStyle');
-
-								// a:effectLst
-								$objWriter->startElement('a:effectLst');
-
-									// a:outerShdw
-									$objWriter->startElement('a:outerShdw');
-									$objWriter->writeAttribute('blurRad', '40000');
-									$objWriter->writeAttribute('dist', '23000');
-									$objWriter->writeAttribute('dir', '5400000');
-									$objWriter->writeAttribute('rotWithShape', '0');
-
-										// a:srgbClr
-										$objWriter->startElement('a:srgbClr');
-										$objWriter->writeAttribute('val', '000000');
-
-											// a:alpha
-											$objWriter->startElement('a:alpha');
-											$objWriter->writeAttribute('val', '35000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:effectStyle
-							$objWriter->startElement('a:effectStyle');
-
-								// a:effectLst
-								$objWriter->startElement('a:effectLst');
-
-									// a:outerShdw
-									$objWriter->startElement('a:outerShdw');
-									$objWriter->writeAttribute('blurRad', '40000');
-									$objWriter->writeAttribute('dist', '23000');
-									$objWriter->writeAttribute('dir', '5400000');
-									$objWriter->writeAttribute('rotWithShape', '0');
-
-										// a:srgbClr
-										$objWriter->startElement('a:srgbClr');
-										$objWriter->writeAttribute('val', '000000');
-
-											// a:alpha
-											$objWriter->startElement('a:alpha');
-											$objWriter->writeAttribute('val', '35000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:scene3d
-								$objWriter->startElement('a:scene3d');
-
-									// a:camera
-									$objWriter->startElement('a:camera');
-									$objWriter->writeAttribute('prst', 'orthographicFront');
-
-										// a:rot
-										$objWriter->startElement('a:rot');
-										$objWriter->writeAttribute('lat', '0');
-										$objWriter->writeAttribute('lon', '0');
-										$objWriter->writeAttribute('rev', '0');
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:lightRig
-									$objWriter->startElement('a:lightRig');
-									$objWriter->writeAttribute('rig', 'threePt');
-									$objWriter->writeAttribute('dir', 't');
-
-										// a:rot
-										$objWriter->startElement('a:rot');
-										$objWriter->writeAttribute('lat', '0');
-										$objWriter->writeAttribute('lon', '0');
-										$objWriter->writeAttribute('rev', '1200000');
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:sp3d
-								$objWriter->startElement('a:sp3d');
-
-									// a:bevelT
-									$objWriter->startElement('a:bevelT');
-									$objWriter->writeAttribute('w', '63500');
-									$objWriter->writeAttribute('h', '25400');
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:bgFillStyleLst
-						$objWriter->startElement('a:bgFillStyleLst');
-
-							// a:solidFill
-							$objWriter->startElement('a:solidFill');
-
-								// a:schemeClr
-								$objWriter->startElement('a:schemeClr');
-								$objWriter->writeAttribute('val', 'phClr');
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:gradFill
-							$objWriter->startElement('a:gradFill');
-							$objWriter->writeAttribute('rotWithShape', '1');
-
-								// a:gsLst
-								$objWriter->startElement('a:gsLst');
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '0');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '40000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '350000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '40000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '45000');
-											$objWriter->endElement();
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '99000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '350000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '100000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '20000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '255000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:path
-								$objWriter->startElement('a:path');
-								$objWriter->writeAttribute('path', 'circle');
-
-									// a:fillToRect
-									$objWriter->startElement('a:fillToRect');
-									$objWriter->writeAttribute('l', '50000');
-									$objWriter->writeAttribute('t', '-80000');
-									$objWriter->writeAttribute('r', '50000');
-									$objWriter->writeAttribute('b', '180000');
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-							// a:gradFill
-							$objWriter->startElement('a:gradFill');
-							$objWriter->writeAttribute('rotWithShape', '1');
-
-								// a:gsLst
-								$objWriter->startElement('a:gsLst');
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '0');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:tint
-											$objWriter->startElement('a:tint');
-											$objWriter->writeAttribute('val', '80000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '300000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-									// a:gs
-									$objWriter->startElement('a:gs');
-									$objWriter->writeAttribute('pos', '100000');
-
-										// a:schemeClr
-										$objWriter->startElement('a:schemeClr');
-										$objWriter->writeAttribute('val', 'phClr');
-
-											// a:shade
-											$objWriter->startElement('a:shade');
-											$objWriter->writeAttribute('val', '30000');
-											$objWriter->endElement();
-
-											// a:satMod
-											$objWriter->startElement('a:satMod');
-											$objWriter->writeAttribute('val', '200000');
-											$objWriter->endElement();
-
-										$objWriter->endElement();
-
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-								// a:path
-								$objWriter->startElement('a:path');
-								$objWriter->writeAttribute('path', 'circle');
-
-									// a:fillToRect
-									$objWriter->startElement('a:fillToRect');
-									$objWriter->writeAttribute('l', '50000');
-									$objWriter->writeAttribute('t', '50000');
-									$objWriter->writeAttribute('r', '50000');
-									$objWriter->writeAttribute('b', '50000');
-									$objWriter->endElement();
-
-								$objWriter->endElement();
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-
-				$objWriter->endElement();
-
-				// a:objectDefaults
-				$objWriter->writeElement('a:objectDefaults', null);
-
-				// a:extraClrSchemeLst
-				$objWriter->writeElement('a:extraClrSchemeLst', null);
-
-			$objWriter->endElement();
-
-			// Return
-			return $objWriter->getData();
-	}
-
-	/**
-	 * Write fonts to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter
-	 * @param 	string						$latinFont
-	 * @param 	array of string				$fontSet
-	 * @return 	string 						XML Output
-	 * @throws 	Exception
-	 */
-	private function _writeFonts($objWriter, $latinFont, $fontSet)
-	{
-		// a:latin
-		$objWriter->startElement('a:latin');
-		$objWriter->writeAttribute('typeface', $latinFont);
-		$objWriter->endElement();
-
-		// a:ea
-		$objWriter->startElement('a:ea');
-		$objWriter->writeAttribute('typeface', '');
-		$objWriter->endElement();
-
-		// a:cs
-		$objWriter->startElement('a:cs');
-		$objWriter->writeAttribute('typeface', '');
-		$objWriter->endElement();
-
-		foreach($fontSet as $fontScript => $typeface) {
-			$objWriter->startElement('a:font');
-				$objWriter->writeAttribute('script', $fontScript);
-				$objWriter->writeAttribute('typeface', $typeface);
-			$objWriter->endElement();
-		}
-
-	}
-
-	/**
-	 * Write colour scheme to XML format
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter
-	 * @return 	string 						XML Output
-	 * @throws 	Exception
-	 */
-	private function _writeColourScheme($objWriter)
-	{
-		foreach(self::$_colourScheme as $colourName => $colourValue) {
-			$objWriter->startElement('a:'.$colourName);
-
-				$objWriter->startElement('a:srgbClr');
-					$objWriter->writeAttribute('val', $colourValue);
-				$objWriter->endElement();
-
-			$objWriter->endElement();
-		}
-						
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Workbook.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Workbook.php
deleted file mode 100755
index eefe7f10f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Workbook.php
+++ /dev/null
@@ -1,452 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Workbook
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write workbook to XML format
-	 *
-	 * @param 	PHPExcel	$pPHPExcel
-	 * @param	boolean		$recalcRequired	Indicate whether formulas should be recalculated before writing
-	 * @return 	string 		XML Output
-	 * @throws 	Exception
-	 */
-	public function writeWorkbook(PHPExcel $pPHPExcel = null, $recalcRequired = FALSE)
-	{
-		// Create XML writer
-		$objWriter = null;
-		if ($this->getParentWriter()->getUseDiskCaching()) {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-		} else {
-			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-		}
-
-		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
-
-		// workbook
-		$objWriter->startElement('workbook');
-		$objWriter->writeAttribute('xml:space', 'preserve');
-		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-		$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-
-			// fileVersion
-			$this->_writeFileVersion($objWriter);
-
-			// workbookPr
-			$this->_writeWorkbookPr($objWriter);
-
-			// workbookProtection
-			$this->_writeWorkbookProtection($objWriter, $pPHPExcel);
-
-			// bookViews
-			if ($this->getParentWriter()->getOffice2003Compatibility() === false) {
-				$this->_writeBookViews($objWriter, $pPHPExcel);
-			}
-
-			// sheets
-			$this->_writeSheets($objWriter, $pPHPExcel);
-
-			// definedNames
-			$this->_writeDefinedNames($objWriter, $pPHPExcel);
-
-			// calcPr
-			$this->_writeCalcPr($objWriter,$recalcRequired);
-
-		$objWriter->endElement();
-
-		// Return
-		return $objWriter->getData();
-	}
-
-	/**
-	 * Write file version
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter $objWriter 		XML Writer
-	 * @throws 	Exception
-	 */
-	private function _writeFileVersion(PHPExcel_Shared_XMLWriter $objWriter = null)
-	{
-		$objWriter->startElement('fileVersion');
-		$objWriter->writeAttribute('appName', 'xl');
-		$objWriter->writeAttribute('lastEdited', '4');
-		$objWriter->writeAttribute('lowestEdited', '4');
-		$objWriter->writeAttribute('rupBuild', '4505');
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write WorkbookPr
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter $objWriter 		XML Writer
-	 * @throws 	Exception
-	 */
-	private function _writeWorkbookPr(PHPExcel_Shared_XMLWriter $objWriter = null)
-	{
-		$objWriter->startElement('workbookPr');
-
-		if (PHPExcel_Shared_Date::getExcelCalendar() == PHPExcel_Shared_Date::CALENDAR_MAC_1904) {
-			$objWriter->writeAttribute('date1904', '1');
-		}
-
-		$objWriter->writeAttribute('codeName', 'ThisWorkbook');
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write BookViews
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel					$pPHPExcel
-	 * @throws 	Exception
-	 */
-	private function _writeBookViews(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
-	{
-		// bookViews
-		$objWriter->startElement('bookViews');
-
-			// workbookView
-			$objWriter->startElement('workbookView');
-
-			$objWriter->writeAttribute('activeTab', $pPHPExcel->getActiveSheetIndex());
-			$objWriter->writeAttribute('autoFilterDateGrouping', '1');
-			$objWriter->writeAttribute('firstSheet', '0');
-			$objWriter->writeAttribute('minimized', '0');
-			$objWriter->writeAttribute('showHorizontalScroll', '1');
-			$objWriter->writeAttribute('showSheetTabs', '1');
-			$objWriter->writeAttribute('showVerticalScroll', '1');
-			$objWriter->writeAttribute('tabRatio', '600');
-			$objWriter->writeAttribute('visibility', 'visible');
-
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write WorkbookProtection
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel					$pPHPExcel
-	 * @throws 	Exception
-	 */
-	private function _writeWorkbookProtection(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
-	{
-		if ($pPHPExcel->getSecurity()->isSecurityEnabled()) {
-			$objWriter->startElement('workbookProtection');
-			$objWriter->writeAttribute('lockRevision',		($pPHPExcel->getSecurity()->getLockRevision() ? 'true' : 'false'));
-			$objWriter->writeAttribute('lockStructure', 	($pPHPExcel->getSecurity()->getLockStructure() ? 'true' : 'false'));
-			$objWriter->writeAttribute('lockWindows', 		($pPHPExcel->getSecurity()->getLockWindows() ? 'true' : 'false'));
-
-			if ($pPHPExcel->getSecurity()->getRevisionsPassword() != '') {
-				$objWriter->writeAttribute('revisionsPassword',	$pPHPExcel->getSecurity()->getRevisionsPassword());
-			}
-
-			if ($pPHPExcel->getSecurity()->getWorkbookPassword() != '') {
-				$objWriter->writeAttribute('workbookPassword',	$pPHPExcel->getSecurity()->getWorkbookPassword());
-			}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write calcPr
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter		XML Writer
-	 * @param	boolean						$recalcRequired	Indicate whether formulas should be recalculated before writing
-	 * @throws 	Exception
-	 */
-	private function _writeCalcPr(PHPExcel_Shared_XMLWriter $objWriter = null, $recalcRequired = TRUE)
-	{
-		$objWriter->startElement('calcPr');
-
-		$objWriter->writeAttribute('calcId', 			'124519');
-		$objWriter->writeAttribute('calcMode', 			'auto');
-		//	fullCalcOnLoad isn't needed if we've recalculating for the save
-		$objWriter->writeAttribute('fullCalcOnLoad', 	($recalcRequired) ? '0' : '1');
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write sheets
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	PHPExcel					$pPHPExcel
-	 * @throws 	Exception
-	 */
-	private function _writeSheets(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
-	{
-		// Write sheets
-		$objWriter->startElement('sheets');
-		$sheetCount = $pPHPExcel->getSheetCount();
-		for ($i = 0; $i < $sheetCount; ++$i) {
-			// sheet
-			$this->_writeSheet(
-				$objWriter,
-				$pPHPExcel->getSheet($i)->getTitle(),
-				($i + 1),
-				($i + 1 + 3),
-				$pPHPExcel->getSheet($i)->getSheetState()
-			);
-		}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write sheet
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
-	 * @param 	string 						$pSheetname 		Sheet name
-	 * @param 	int							$pSheetId	 		Sheet id
-	 * @param 	int							$pRelId				Relationship ID
-	 * @param   string                      $sheetState         Sheet state (visible, hidden, veryHidden)
-	 * @throws 	Exception
-	 */
-	private function _writeSheet(PHPExcel_Shared_XMLWriter $objWriter = null, $pSheetname = '', $pSheetId = 1, $pRelId = 1, $sheetState = 'visible')
-	{
-		if ($pSheetname != '') {
-			// Write sheet
-			$objWriter->startElement('sheet');
-			$objWriter->writeAttribute('name', 		$pSheetname);
-			$objWriter->writeAttribute('sheetId', 	$pSheetId);
-			if ($sheetState != 'visible' && $sheetState != '') {
-				$objWriter->writeAttribute('state', $sheetState);
-			}
-			$objWriter->writeAttribute('r:id', 		'rId' . $pRelId);
-			$objWriter->endElement();
-		} else {
-			throw new Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Write Defined Names
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel					$pPHPExcel
-	 * @throws 	Exception
-	 */
-	private function _writeDefinedNames(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel = null)
-	{
-		// Write defined names
-		$objWriter->startElement('definedNames');
-
-		// Named ranges
-		if (count($pPHPExcel->getNamedRanges()) > 0) {
-			// Named ranges
-			$this->_writeNamedRanges($objWriter, $pPHPExcel);
-		}
-
-		// Other defined names
-		$sheetCount = $pPHPExcel->getSheetCount();
-		for ($i = 0; $i < $sheetCount; ++$i) {
-			// definedName for autoFilter
-			$this->_writeDefinedNameForAutofilter($objWriter, $pPHPExcel->getSheet($i), $i);
-
-			// definedName for Print_Titles
-			$this->_writeDefinedNameForPrintTitles($objWriter, $pPHPExcel->getSheet($i), $i);
-
-			// definedName for Print_Area
-			$this->_writeDefinedNameForPrintArea($objWriter, $pPHPExcel->getSheet($i), $i);
-		}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write named ranges
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel					$pPHPExcel
-	 * @throws 	Exception
-	 */
-	private function _writeNamedRanges(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel $pPHPExcel)
-	{
-		// Loop named ranges
-		$namedRanges = $pPHPExcel->getNamedRanges();
-		foreach ($namedRanges as $namedRange) {
-			$this->_writeDefinedNameForNamedRange($objWriter, $namedRange);
-		}
-	}
-
-	/**
-	 * Write Defined Name for named range
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_NamedRange			$pNamedRange
-	 * @throws 	Exception
-	 */
-	private function _writeDefinedNameForNamedRange(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_NamedRange $pNamedRange)
-	{
-		// definedName for named range
-		$objWriter->startElement('definedName');
-		$objWriter->writeAttribute('name',			$pNamedRange->getName());
-		if ($pNamedRange->getLocalOnly()) {
-			$objWriter->writeAttribute('localSheetId',	$pNamedRange->getScope()->getParent()->getIndex($pNamedRange->getScope()));
-		}
-
-		// Create absolute coordinate and write as raw text
-		$range = PHPExcel_Cell::splitRange($pNamedRange->getRange());
-		for ($i = 0; $i < count($range); $i++) {
-			$range[$i][0] = '\'' . str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()) . '\'!' . PHPExcel_Cell::absoluteReference($range[$i][0]);
-			if (isset($range[$i][1])) {
-				$range[$i][1] = PHPExcel_Cell::absoluteReference($range[$i][1]);
-			}
-		}
-		$range = PHPExcel_Cell::buildRange($range);
-
-		$objWriter->writeRawData($range);
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Defined Name for autoFilter
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Worksheet			$pSheet
-	 * @param 	int							$pSheetId
-	 * @throws 	Exception
-	 */
-	private function _writeDefinedNameForAutofilter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
-	{
-		// definedName for autoFilter
-		$autoFilterRange = $pSheet->getAutoFilter()->getRange();
-		if (!empty($autoFilterRange)) {
-			$objWriter->startElement('definedName');
-			$objWriter->writeAttribute('name',			'_xlnm._FilterDatabase');
-			$objWriter->writeAttribute('localSheetId',	$pSheetId);
-			$objWriter->writeAttribute('hidden',		'1');
-
-			// Create absolute coordinate and write as raw text
-			$range = PHPExcel_Cell::splitRange($autoFilterRange);
-			$range = $range[0];
-			//	Strip any worksheet ref so we can make the cell ref absolute
-			if (strpos($range[0],'!') !== false) {
-				list($ws,$range[0]) = explode('!',$range[0]);
-			}
-
-			$range[0] = PHPExcel_Cell::absoluteCoordinate($range[0]);
-			$range[1] = PHPExcel_Cell::absoluteCoordinate($range[1]);
-			$range = implode(':', $range);
-
-			$objWriter->writeRawData('\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . $range);
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write Defined Name for PrintTitles
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Worksheet			$pSheet
-	 * @param 	int							$pSheetId
-	 * @throws 	Exception
-	 */
-	private function _writeDefinedNameForPrintTitles(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
-	{
-		// definedName for PrintTitles
-		if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-			$objWriter->startElement('definedName');
-			$objWriter->writeAttribute('name',			'_xlnm.Print_Titles');
-			$objWriter->writeAttribute('localSheetId',	$pSheetId);
-
-			// Setting string
-			$settingString = '';
-
-			// Columns to repeat
-			if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
-				$repeat = $pSheet->getPageSetup()->getColumnsToRepeatAtLeft();
-
-				$settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
-			}
-
-			// Rows to repeat
-			if ($pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-				if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
-					$settingString .= ',';
-				}
-
-				$repeat = $pSheet->getPageSetup()->getRowsToRepeatAtTop();
-
-				$settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
-			}
-
-			$objWriter->writeRawData($settingString);
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write Defined Name for PrintTitles
-	 *
-	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
-	 * @param 	PHPExcel_Worksheet			$pSheet
-	 * @param 	int							$pSheetId
-	 * @throws 	Exception
-	 */
-	private function _writeDefinedNameForPrintArea(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
-	{
-		// definedName for PrintArea
-		if ($pSheet->getPageSetup()->isPrintAreaSet()) {
-			$objWriter->startElement('definedName');
-			$objWriter->writeAttribute('name',			'_xlnm.Print_Area');
-			$objWriter->writeAttribute('localSheetId',	$pSheetId);
-
-			// Setting string
-			$settingString = '';
-
-			// Print area
-			$printArea = PHPExcel_Cell::splitRange($pSheet->getPageSetup()->getPrintArea());
-
-			$chunks = array();
-			foreach ($printArea as $printAreaRect) {
-				$printAreaRect[0] = PHPExcel_Cell::absoluteReference($printAreaRect[0]);
-				$printAreaRect[1] = PHPExcel_Cell::absoluteReference($printAreaRect[1]);
-				$chunks[] = '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
-			}
-
-			$objWriter->writeRawData(implode(',', $chunks));
-
-			$objWriter->endElement();
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Worksheet.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Worksheet.php
deleted file mode 100755
index e5a7679a4..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/Worksheet.php
+++ /dev/null
@@ -1,1215 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_Worksheet
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Write worksheet to XML format
-	 *
-	 * @param	PHPExcel_Worksheet		$pSheet
-	 * @param	string[]				$pStringTable
-	 * @param	boolean					$includeCharts	Flag indicating if we should write charts
-	 * @return	string					XML Output
-	 * @throws	Exception
-	 */
-	public function writeWorksheet($pSheet = null, $pStringTable = null, $includeCharts = FALSE)
-	{
-		if (!is_null($pSheet)) {
-			// Create XML writer
-			$objWriter = null;
-			if ($this->getParentWriter()->getUseDiskCaching()) {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
-			} else {
-				$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
-			}
-
-			// XML header
-			$objWriter->startDocument('1.0','UTF-8','yes');
-
-			// Worksheet
-			$objWriter->startElement('worksheet');
-			$objWriter->writeAttribute('xml:space', 'preserve');
-			$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-			$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
-
-				// sheetPr
-				$this->_writeSheetPr($objWriter, $pSheet);
-
-				// Dimension
-				$this->_writeDimension($objWriter, $pSheet);
-
-				// sheetViews
-				$this->_writeSheetViews($objWriter, $pSheet);
-
-				// sheetFormatPr
-				$this->_writeSheetFormatPr($objWriter, $pSheet);
-
-				// cols
-				$this->_writeCols($objWriter, $pSheet);
-
-				// sheetData
-				$this->_writeSheetData($objWriter, $pSheet, $pStringTable);
-
-				// sheetProtection
-				$this->_writeSheetProtection($objWriter, $pSheet);
-
-				// protectedRanges
-				$this->_writeProtectedRanges($objWriter, $pSheet);
-
-				// autoFilter
-				$this->_writeAutoFilter($objWriter, $pSheet);
-
-				// mergeCells
-				$this->_writeMergeCells($objWriter, $pSheet);
-
-				// conditionalFormatting
-				$this->_writeConditionalFormatting($objWriter, $pSheet);
-
-				// dataValidations
-				$this->_writeDataValidations($objWriter, $pSheet);
-
-				// hyperlinks
-				$this->_writeHyperlinks($objWriter, $pSheet);
-
-				// Print options
-				$this->_writePrintOptions($objWriter, $pSheet);
-
-				// Page margins
-				$this->_writePageMargins($objWriter, $pSheet);
-
-				// Page setup
-				$this->_writePageSetup($objWriter, $pSheet);
-
-				// Header / footer
-				$this->_writeHeaderFooter($objWriter, $pSheet);
-
-				// Breaks
-				$this->_writeBreaks($objWriter, $pSheet);
-
-				// Drawings and/or Charts
-				$this->_writeDrawings($objWriter, $pSheet, $includeCharts);
-
-				// LegacyDrawing
-				$this->_writeLegacyDrawing($objWriter, $pSheet);
-
-				// LegacyDrawingHF
-				$this->_writeLegacyDrawingHF($objWriter, $pSheet);
-
-			$objWriter->endElement();
-
-			// Return
-			return $objWriter->getData();
-		} else {
-			throw new Exception("Invalid PHPExcel_Worksheet object passed.");
-		}
-	}
-
-	/**
-	 * Write SheetPr
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeSheetPr(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// sheetPr
-		$objWriter->startElement('sheetPr');
-		//$objWriter->writeAttribute('codeName',		$pSheet->getTitle());
-			$autoFilterRange = $pSheet->getAutoFilter()->getRange();
-			if (!empty($autoFilterRange)) {
-				$objWriter->writeAttribute('filterMode', 1);
-				$pSheet->getAutoFilter()->showHideRows();
-			}
-
-			// tabColor
-			if ($pSheet->isTabColorSet()) {
-				$objWriter->startElement('tabColor');
-				$objWriter->writeAttribute('rgb',	$pSheet->getTabColor()->getARGB());
-				$objWriter->endElement();
-			}
-
-			// outlinePr
-			$objWriter->startElement('outlinePr');
-			$objWriter->writeAttribute('summaryBelow',	($pSheet->getShowSummaryBelow() ? '1' : '0'));
-			$objWriter->writeAttribute('summaryRight',	($pSheet->getShowSummaryRight() ? '1' : '0'));
-			$objWriter->endElement();
-
-			// pageSetUpPr
-			if ($pSheet->getPageSetup()->getFitToPage()) {
-				$objWriter->startElement('pageSetUpPr');
-				$objWriter->writeAttribute('fitToPage',	'1');
-				$objWriter->endElement();
-			}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Dimension
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter	$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet			$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeDimension(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// dimension
-		$objWriter->startElement('dimension');
-		$objWriter->writeAttribute('ref', $pSheet->calculateWorksheetDimension());
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write SheetViews
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeSheetViews(PHPExcel_Shared_XMLWriter $objWriter = NULL, PHPExcel_Worksheet $pSheet = NULL)
-	{
-		// sheetViews
-		$objWriter->startElement('sheetViews');
-
-			// Sheet selected?
-			$sheetSelected = false;
-			if ($this->getParentWriter()->getPHPExcel()->getIndex($pSheet) == $this->getParentWriter()->getPHPExcel()->getActiveSheetIndex())
-				$sheetSelected = true;
-
-
-			// sheetView
-			$objWriter->startElement('sheetView');
-			$objWriter->writeAttribute('tabSelected',		$sheetSelected ? '1' : '0');
-			$objWriter->writeAttribute('workbookViewId',	'0');
-
-				// Zoom scales
-				if ($pSheet->getSheetView()->getZoomScale() != 100) {
-					$objWriter->writeAttribute('zoomScale',	$pSheet->getSheetView()->getZoomScale());
-				}
-				if ($pSheet->getSheetView()->getZoomScaleNormal() != 100) {
-					$objWriter->writeAttribute('zoomScaleNormal',	$pSheet->getSheetView()->getZoomScaleNormal());
-				}
-
-				// View Layout Type
-				if ($pSheet->getSheetView()->getView() !== PHPExcel_Worksheet_SheetView::SHEETVIEW_NORMAL) {
-					$objWriter->writeAttribute('view',	$pSheet->getSheetView()->getView());
-				}
-
-				// Gridlines
-				if ($pSheet->getShowGridlines()) {
-					$objWriter->writeAttribute('showGridLines',	'true');
-				} else {
-					$objWriter->writeAttribute('showGridLines',	'false');
-				}
-
-				// Row and column headers
-				if ($pSheet->getShowRowColHeaders()) {
-					$objWriter->writeAttribute('showRowColHeaders', '1');
-				} else {
-					$objWriter->writeAttribute('showRowColHeaders', '0');
-				}
-
-				// Right-to-left
-				if ($pSheet->getRightToLeft()) {
-					$objWriter->writeAttribute('rightToLeft',	'true');
-				}
-
-				$activeCell = $pSheet->getActiveCell();
-
-				// Pane
-				$pane = '';
-				$topLeftCell = $pSheet->getFreezePane();
-				if (($topLeftCell != '') && ($topLeftCell != 'A1')) {
-					$activeCell = $topLeftCell;
-					// Calculate freeze coordinates
-					$xSplit = $ySplit = 0;
-
-					list($xSplit, $ySplit) = PHPExcel_Cell::coordinateFromString($topLeftCell);
-					$xSplit = PHPExcel_Cell::columnIndexFromString($xSplit);
-
-					// pane
-					$pane = 'topRight';
-					$objWriter->startElement('pane');
-					if ($xSplit > 1)
-						$objWriter->writeAttribute('xSplit',	$xSplit - 1);
-					if ($ySplit > 1) {
-						$objWriter->writeAttribute('ySplit',	$ySplit - 1);
-						$pane = ($xSplit > 1) ? 'bottomRight' : 'bottomLeft';
-					}
-					$objWriter->writeAttribute('topLeftCell',	$topLeftCell);
-					$objWriter->writeAttribute('activePane',	$pane);
-					$objWriter->writeAttribute('state',		'frozen');
-					$objWriter->endElement();
-
-					if (($xSplit > 1) && ($ySplit > 1)) {
-						//	Write additional selections if more than two panes (ie both an X and a Y split)
-						$objWriter->startElement('selection');	$objWriter->writeAttribute('pane', 'topRight');		$objWriter->endElement();
-						$objWriter->startElement('selection');	$objWriter->writeAttribute('pane', 'bottomLeft');	$objWriter->endElement();
-					}
-				}
-
-				// Selection
-//				if ($pane != '') {
-					//	Only need to write selection element if we have a split pane
-					//		We cheat a little by over-riding the active cell selection, setting it to the split cell
-					$objWriter->startElement('selection');
-					if ($pane != '') {
-						$objWriter->writeAttribute('pane', $pane);
-					}
-					$objWriter->writeAttribute('activeCell', $activeCell);
-					$objWriter->writeAttribute('sqref', $activeCell);
-					$objWriter->endElement();
-//				}
-
-			$objWriter->endElement();
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write SheetFormatPr
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter $objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet		  $pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeSheetFormatPr(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// sheetFormatPr
-		$objWriter->startElement('sheetFormatPr');
-
-			// Default row height
-			if ($pSheet->getDefaultRowDimension()->getRowHeight() >= 0) {
-				$objWriter->writeAttribute('customHeight',		'true');
-				$objWriter->writeAttribute('defaultRowHeight',	PHPExcel_Shared_String::FormatNumber($pSheet->getDefaultRowDimension()->getRowHeight()));
-			} else {
-				$objWriter->writeAttribute('defaultRowHeight', '14.4');
-			}
-
-			// Set Zero Height row
-			if ((string)$pSheet->getDefaultRowDimension()->getzeroHeight()  == '1' ||
-				strtolower((string)$pSheet->getDefaultRowDimension()->getzeroHeight()) == 'true' ) {
-				$objWriter->writeAttribute('zeroHeight', '1');
-			}
-
-			// Default column width
-			if ($pSheet->getDefaultColumnDimension()->getWidth() >= 0) {
-				$objWriter->writeAttribute('defaultColWidth', PHPExcel_Shared_String::FormatNumber($pSheet->getDefaultColumnDimension()->getWidth()));
-			}
-
-			// Outline level - row
-			$outlineLevelRow = 0;
-			foreach ($pSheet->getRowDimensions() as $dimension) {
-				if ($dimension->getOutlineLevel() > $outlineLevelRow) {
-					$outlineLevelRow = $dimension->getOutlineLevel();
-				}
-			}
-			$objWriter->writeAttribute('outlineLevelRow',	(int)$outlineLevelRow);
-
-			// Outline level - column
-			$outlineLevelCol = 0;
-			foreach ($pSheet->getColumnDimensions() as $dimension) {
-				if ($dimension->getOutlineLevel() > $outlineLevelCol) {
-					$outlineLevelCol = $dimension->getOutlineLevel();
-				}
-			}
-			$objWriter->writeAttribute('outlineLevelCol',	(int)$outlineLevelCol);
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Cols
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeCols(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// cols
-		if (count($pSheet->getColumnDimensions()) > 0)  {
-			$objWriter->startElement('cols');
-
-				$pSheet->calculateColumnWidths();
-
-				// Loop through column dimensions
-				foreach ($pSheet->getColumnDimensions() as $colDimension) {
-					// col
-					$objWriter->startElement('col');
-					$objWriter->writeAttribute('min',	PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
-					$objWriter->writeAttribute('max',	PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
-
-					if ($colDimension->getWidth() < 0) {
-						// No width set, apply default of 10
-						$objWriter->writeAttribute('width',		'9.10');
-					} else {
-						// Width set
-						$objWriter->writeAttribute('width',		PHPExcel_Shared_String::FormatNumber($colDimension->getWidth()));
-					}
-
-					// Column visibility
-					if ($colDimension->getVisible() == false) {
-						$objWriter->writeAttribute('hidden',		'true');
-					}
-
-					// Auto size?
-					if ($colDimension->getAutoSize()) {
-						$objWriter->writeAttribute('bestFit',		'true');
-					}
-
-					// Custom width?
-					if ($colDimension->getWidth() != $pSheet->getDefaultColumnDimension()->getWidth()) {
-						$objWriter->writeAttribute('customWidth',	'true');
-					}
-
-					// Collapsed
-					if ($colDimension->getCollapsed() == true) {
-						$objWriter->writeAttribute('collapsed',		'true');
-					}
-
-					// Outline level
-					if ($colDimension->getOutlineLevel() > 0) {
-						$objWriter->writeAttribute('outlineLevel',	$colDimension->getOutlineLevel());
-					}
-
-					// Style
-					$objWriter->writeAttribute('style', $colDimension->getXfIndex());
-
-					$objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write SheetProtection
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeSheetProtection(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// sheetProtection
-		$objWriter->startElement('sheetProtection');
-
-		if ($pSheet->getProtection()->getPassword() != '') {
-			$objWriter->writeAttribute('password',				$pSheet->getProtection()->getPassword());
-		}
-
-		$objWriter->writeAttribute('sheet',					($pSheet->getProtection()->getSheet()				? 'true' : 'false'));
-		$objWriter->writeAttribute('objects',				($pSheet->getProtection()->getObjects()				? 'true' : 'false'));
-		$objWriter->writeAttribute('scenarios',				($pSheet->getProtection()->getScenarios()			? 'true' : 'false'));
-		$objWriter->writeAttribute('formatCells',			($pSheet->getProtection()->getFormatCells()			? 'true' : 'false'));
-		$objWriter->writeAttribute('formatColumns',			($pSheet->getProtection()->getFormatColumns()		? 'true' : 'false'));
-		$objWriter->writeAttribute('formatRows',			($pSheet->getProtection()->getFormatRows()			? 'true' : 'false'));
-		$objWriter->writeAttribute('insertColumns',			($pSheet->getProtection()->getInsertColumns()		? 'true' : 'false'));
-		$objWriter->writeAttribute('insertRows',			($pSheet->getProtection()->getInsertRows()			? 'true' : 'false'));
-		$objWriter->writeAttribute('insertHyperlinks',		($pSheet->getProtection()->getInsertHyperlinks()	? 'true' : 'false'));
-		$objWriter->writeAttribute('deleteColumns',			($pSheet->getProtection()->getDeleteColumns()		? 'true' : 'false'));
-		$objWriter->writeAttribute('deleteRows',			($pSheet->getProtection()->getDeleteRows()			? 'true' : 'false'));
-		$objWriter->writeAttribute('selectLockedCells',		($pSheet->getProtection()->getSelectLockedCells()	? 'true' : 'false'));
-		$objWriter->writeAttribute('sort',					($pSheet->getProtection()->getSort()				? 'true' : 'false'));
-		$objWriter->writeAttribute('autoFilter',			($pSheet->getProtection()->getAutoFilter()			? 'true' : 'false'));
-		$objWriter->writeAttribute('pivotTables',			($pSheet->getProtection()->getPivotTables()			? 'true' : 'false'));
-		$objWriter->writeAttribute('selectUnlockedCells',	($pSheet->getProtection()->getSelectUnlockedCells()	? 'true' : 'false'));
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write ConditionalFormatting
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeConditionalFormatting(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// Conditional id
-		$id = 1;
-
-		// Loop through styles in the current worksheet
-		foreach ($pSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
-			foreach ($conditionalStyles as $conditional) {
-				// WHY was this again?
-				// if ($this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode( $conditional->getHashCode() ) == '') {
-				//	continue;
-				// }
-				if ($conditional->getConditionType() != PHPExcel_Style_Conditional::CONDITION_NONE) {
-					// conditionalFormatting
-					$objWriter->startElement('conditionalFormatting');
-					$objWriter->writeAttribute('sqref',	$cellCoordinate);
-
-						// cfRule
-						$objWriter->startElement('cfRule');
-						$objWriter->writeAttribute('type',		$conditional->getConditionType());
-						$objWriter->writeAttribute('dxfId',		$this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode( $conditional->getHashCode() ));
-						$objWriter->writeAttribute('priority',	$id++);
-
-						if (($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS
-								||
-							 $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT)
-							&& $conditional->getOperatorType() != PHPExcel_Style_Conditional::OPERATOR_NONE) {
-							$objWriter->writeAttribute('operator',	$conditional->getOperatorType());
-						}
-
-						if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeAttribute('text',	$conditional->getText());
-						}
-
-						if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_CONTAINSTEXT
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'NOT(ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . ')))');
-						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_BEGINSWITH
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'LEFT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
-						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_ENDSWITH
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'RIGHT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
-						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_NOTCONTAINS
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . '))');
-						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS
-							|| $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							|| $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION) {
-							foreach ($conditional->getConditions() as $formula) {
-								// Formula
-								$objWriter->writeElement('formula',	$formula);
-							}
-						}
-
-						$objWriter->endElement();
-
-					$objWriter->endElement();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Write DataValidations
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeDataValidations(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// Datavalidation collection
-		$dataValidationCollection = $pSheet->getDataValidationCollection();
-
-		// Write data validations?
-		if (!empty($dataValidationCollection)) {
-			$objWriter->startElement('dataValidations');
-			$objWriter->writeAttribute('count', count($dataValidationCollection));
-
-			foreach ($dataValidationCollection as $coordinate => $dv) {
-				$objWriter->startElement('dataValidation');
-
-				if ($dv->getType() != '') {
-					$objWriter->writeAttribute('type', $dv->getType());
-				}
-
-				if ($dv->getErrorStyle() != '') {
-					$objWriter->writeAttribute('errorStyle', $dv->getErrorStyle());
-				}
-
-				if ($dv->getOperator() != '') {
-					$objWriter->writeAttribute('operator', $dv->getOperator());
-				}
-
-				$objWriter->writeAttribute('allowBlank',		($dv->getAllowBlank()		? '1'  : '0'));
-				$objWriter->writeAttribute('showDropDown',		(!$dv->getShowDropDown()	? '1'  : '0'));
-				$objWriter->writeAttribute('showInputMessage',	($dv->getShowInputMessage()	? '1'  : '0'));
-				$objWriter->writeAttribute('showErrorMessage',	($dv->getShowErrorMessage()	? '1'  : '0'));
-
-				if ($dv->getErrorTitle() !== '') {
-					$objWriter->writeAttribute('errorTitle', $dv->getErrorTitle());
-				}
-				if ($dv->getError() !== '') {
-					$objWriter->writeAttribute('error', $dv->getError());
-				}
-				if ($dv->getPromptTitle() !== '') {
-					$objWriter->writeAttribute('promptTitle', $dv->getPromptTitle());
-				}
-				if ($dv->getPrompt() !== '') {
-					$objWriter->writeAttribute('prompt', $dv->getPrompt());
-				}
-
-				$objWriter->writeAttribute('sqref', $coordinate);
-
-				if ($dv->getFormula1() !== '') {
-					$objWriter->writeElement('formula1', $dv->getFormula1());
-				}
-				if ($dv->getFormula2() !== '') {
-					$objWriter->writeElement('formula2', $dv->getFormula2());
-				}
-
-				$objWriter->endElement();
-			}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write Hyperlinks
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeHyperlinks(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// Hyperlink collection
-		$hyperlinkCollection = $pSheet->getHyperlinkCollection();
-
-		// Relation ID
-		$relationId = 1;
-
-		// Write hyperlinks?
-		if (!empty($hyperlinkCollection)) {
-			$objWriter->startElement('hyperlinks');
-
-			foreach ($hyperlinkCollection as $coordinate => $hyperlink) {
-				$objWriter->startElement('hyperlink');
-
-				$objWriter->writeAttribute('ref', $coordinate);
-				if (!$hyperlink->isInternal()) {
-					$objWriter->writeAttribute('r:id',	'rId_hyperlink_' . $relationId);
-					++$relationId;
-				} else {
-					$objWriter->writeAttribute('location',	str_replace('sheet://', '', $hyperlink->getUrl()));
-				}
-
-				if ($hyperlink->getTooltip() != '') {
-					$objWriter->writeAttribute('tooltip', $hyperlink->getTooltip());
-				}
-
-				$objWriter->endElement();
-			}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write ProtectedRanges
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeProtectedRanges(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		if (count($pSheet->getProtectedCells()) > 0) {
-			// protectedRanges
-			$objWriter->startElement('protectedRanges');
-
-				// Loop protectedRanges
-				foreach ($pSheet->getProtectedCells() as $protectedCell => $passwordHash) {
-					// protectedRange
-					$objWriter->startElement('protectedRange');
-					$objWriter->writeAttribute('name',		'p' . md5($protectedCell));
-					$objWriter->writeAttribute('sqref',	$protectedCell);
-					$objWriter->writeAttribute('password',	$passwordHash);
-					$objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write MergeCells
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeMergeCells(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		if (count($pSheet->getMergeCells()) > 0) {
-			// mergeCells
-			$objWriter->startElement('mergeCells');
-
-				// Loop mergeCells
-				foreach ($pSheet->getMergeCells() as $mergeCell) {
-					// mergeCell
-					$objWriter->startElement('mergeCell');
-					$objWriter->writeAttribute('ref', $mergeCell);
-					$objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write PrintOptions
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writePrintOptions(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// printOptions
-		$objWriter->startElement('printOptions');
-
-		$objWriter->writeAttribute('gridLines',	($pSheet->getPrintGridlines() ? 'true': 'false'));
-		$objWriter->writeAttribute('gridLinesSet',	'true');
-
-		if ($pSheet->getPageSetup()->getHorizontalCentered()) {
-			$objWriter->writeAttribute('horizontalCentered', 'true');
-		}
-
-		if ($pSheet->getPageSetup()->getVerticalCentered()) {
-			$objWriter->writeAttribute('verticalCentered', 'true');
-		}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write PageMargins
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter				$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet						$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writePageMargins(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// pageMargins
-		$objWriter->startElement('pageMargins');
-		$objWriter->writeAttribute('left',		PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getLeft()));
-		$objWriter->writeAttribute('right',		PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getRight()));
-		$objWriter->writeAttribute('top',		PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getTop()));
-		$objWriter->writeAttribute('bottom',	PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getBottom()));
-		$objWriter->writeAttribute('header',	PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getHeader()));
-		$objWriter->writeAttribute('footer',	PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getFooter()));
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write AutoFilter
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter				$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet						$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeAutoFilter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		$autoFilterRange = $pSheet->getAutoFilter()->getRange();
-		if (!empty($autoFilterRange)) {
-			// autoFilter
-			$objWriter->startElement('autoFilter');
-
-			// Strip any worksheet reference from the filter coordinates
-			$range = PHPExcel_Cell::splitRange($autoFilterRange);
-			$range = $range[0];
-			//	Strip any worksheet ref
-			if (strpos($range[0],'!') !== false) {
-				list($ws,$range[0]) = explode('!',$range[0]);
-			}
-			$range = implode(':', $range);
-
-			$objWriter->writeAttribute('ref',	str_replace('$','',$range));
-
-			$columns = $pSheet->getAutoFilter()->getColumns();
-			if (count($columns > 0)) {
-				foreach($columns as $columnID => $column) {
-					$rules = $column->getRules();
-					if (count($rules > 0)) {
-						$objWriter->startElement('filterColumn');
-							$objWriter->writeAttribute('colId',	$pSheet->getAutoFilter()->getColumnOffset($columnID));
-
-							$objWriter->startElement( $column->getFilterType());
-								if ($column->getJoin() == PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND) {
-									$objWriter->writeAttribute('and',	1);
-								}
-
-								foreach ($rules as $rule) {
-									if (($column->getFilterType() === PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER) &&
-										($rule->getOperator() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) &&
-										($rule->getValue() === '')) {
-										//	Filter rule for Blanks
-										$objWriter->writeAttribute('blank',	1);
-									} elseif($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER) {
-										//	Dynamic Filter Rule
-										$objWriter->writeAttribute('type', $rule->getGrouping());
-										$val = $column->getAttribute('val');
-										if ($val !== NULL) {
-											$objWriter->writeAttribute('val', $val);
-										}
-										$maxVal = $column->getAttribute('maxVal');
-										if ($maxVal !== NULL) {
-											$objWriter->writeAttribute('maxVal', $maxVal);
-										}
-									} elseif($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_TOPTENFILTER) {
-										//	Top 10 Filter Rule
-										$objWriter->writeAttribute('val',	$rule->getValue());
-										$objWriter->writeAttribute('percent',	(($rule->getOperator() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0'));
-										$objWriter->writeAttribute('top',	(($rule->getGrouping() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1': '0'));
-									} else {
-										//	Filter, DateGroupItem or CustomFilter
-										$objWriter->startElement($rule->getRuleType());
-
-											if ($rule->getOperator() !== PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) {
-												$objWriter->writeAttribute('operator',	$rule->getOperator());
-											}
-											if ($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP) {
-												// Date Group filters
-												foreach($rule->getValue() as $key => $value) {
-													if ($value > '') $objWriter->writeAttribute($key,	$value);
-												}
-												$objWriter->writeAttribute('dateTimeGrouping',	$rule->getGrouping());
-											} else {
-												$objWriter->writeAttribute('val',	$rule->getValue());
-											}
-
-										$objWriter->endElement();
-									}
-								}
-
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-					}
-				}
-			}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write PageSetup
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter			$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writePageSetup(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// pageSetup
-		$objWriter->startElement('pageSetup');
-		$objWriter->writeAttribute('paperSize',		$pSheet->getPageSetup()->getPaperSize());
-		$objWriter->writeAttribute('orientation',	$pSheet->getPageSetup()->getOrientation());
-
-		if (!is_null($pSheet->getPageSetup()->getScale())) {
-			$objWriter->writeAttribute('scale',				 $pSheet->getPageSetup()->getScale());
-		}
-		if (!is_null($pSheet->getPageSetup()->getFitToHeight())) {
-			$objWriter->writeAttribute('fitToHeight',		 $pSheet->getPageSetup()->getFitToHeight());
-		} else {
-			$objWriter->writeAttribute('fitToHeight',		 '0');
-		}
-		if (!is_null($pSheet->getPageSetup()->getFitToWidth())) {
-			$objWriter->writeAttribute('fitToWidth',		 $pSheet->getPageSetup()->getFitToWidth());
-		} else {
-			$objWriter->writeAttribute('fitToWidth',		 '0');
-		}
-		if (!is_null($pSheet->getPageSetup()->getFirstPageNumber())) {
-			$objWriter->writeAttribute('firstPageNumber',	$pSheet->getPageSetup()->getFirstPageNumber());
-			$objWriter->writeAttribute('useFirstPageNumber', '1');
-		}
-
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Header / Footer
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeHeaderFooter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// headerFooter
-		$objWriter->startElement('headerFooter');
-		$objWriter->writeAttribute('differentOddEven',	($pSheet->getHeaderFooter()->getDifferentOddEven() ? 'true' : 'false'));
-		$objWriter->writeAttribute('differentFirst',	($pSheet->getHeaderFooter()->getDifferentFirst() ? 'true' : 'false'));
-		$objWriter->writeAttribute('scaleWithDoc',		($pSheet->getHeaderFooter()->getScaleWithDocument() ? 'true' : 'false'));
-		$objWriter->writeAttribute('alignWithMargins',	($pSheet->getHeaderFooter()->getAlignWithMargins() ? 'true' : 'false'));
-
-			$objWriter->writeElement('oddHeader',		$pSheet->getHeaderFooter()->getOddHeader());
-			$objWriter->writeElement('oddFooter',		$pSheet->getHeaderFooter()->getOddFooter());
-			$objWriter->writeElement('evenHeader',		$pSheet->getHeaderFooter()->getEvenHeader());
-			$objWriter->writeElement('evenFooter',		$pSheet->getHeaderFooter()->getEvenFooter());
-			$objWriter->writeElement('firstHeader',	$pSheet->getHeaderFooter()->getFirstHeader());
-			$objWriter->writeElement('firstFooter',	$pSheet->getHeaderFooter()->getFirstFooter());
-		$objWriter->endElement();
-	}
-
-	/**
-	 * Write Breaks
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeBreaks(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// Get row and column breaks
-		$aRowBreaks = array();
-		$aColumnBreaks = array();
-		foreach ($pSheet->getBreaks() as $cell => $breakType) {
-			if ($breakType == PHPExcel_Worksheet::BREAK_ROW) {
-				$aRowBreaks[] = $cell;
-			} else if ($breakType == PHPExcel_Worksheet::BREAK_COLUMN) {
-				$aColumnBreaks[] = $cell;
-			}
-		}
-
-		// rowBreaks
-		if (!empty($aRowBreaks)) {
-			$objWriter->startElement('rowBreaks');
-			$objWriter->writeAttribute('count',			count($aRowBreaks));
-			$objWriter->writeAttribute('manualBreakCount',	count($aRowBreaks));
-
-				foreach ($aRowBreaks as $cell) {
-					$coords = PHPExcel_Cell::coordinateFromString($cell);
-
-					$objWriter->startElement('brk');
-					$objWriter->writeAttribute('id',	$coords[1]);
-					$objWriter->writeAttribute('man',	'1');
-					$objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-		}
-
-		// Second, write column breaks
-		if (!empty($aColumnBreaks)) {
-			$objWriter->startElement('colBreaks');
-			$objWriter->writeAttribute('count',			count($aColumnBreaks));
-			$objWriter->writeAttribute('manualBreakCount',	count($aColumnBreaks));
-
-				foreach ($aColumnBreaks as $cell) {
-					$coords = PHPExcel_Cell::coordinateFromString($cell);
-
-					$objWriter->startElement('brk');
-					$objWriter->writeAttribute('id',	PHPExcel_Cell::columnIndexFromString($coords[0]) - 1);
-					$objWriter->writeAttribute('man',	'1');
-					$objWriter->endElement();
-				}
-
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write SheetData
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @param	string[]						$pStringTable	String table
-	 * @throws	Exception
-	 */
-	private function _writeSheetData(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pStringTable = null)
-	{
-		if (is_array($pStringTable)) {
-			// Flipped stringtable, for faster index searching
-			$aFlippedStringTable = $this->getParentWriter()->getWriterPart('stringtable')->flipStringTable($pStringTable);
-
-			// sheetData
-			$objWriter->startElement('sheetData');
-
-				// Get column count
-				$colCount = PHPExcel_Cell::columnIndexFromString($pSheet->getHighestColumn());
-
-				// Highest row number
-				$highestRow = $pSheet->getHighestRow();
-
-				// Loop through cells
-				$cellsByRow = array();
-				foreach ($pSheet->getCellCollection() as $cellID) {
-					$cellAddress = PHPExcel_Cell::coordinateFromString($cellID);
-					$cellsByRow[$cellAddress[1]][] = $cellID;
-				}
-
-				$currentRow = 0;
-				while($currentRow++ < $highestRow) {
-					// Get row dimension
-					$rowDimension = $pSheet->getRowDimension($currentRow);
-
-					// Write current row?
-					$writeCurrentRow =	isset($cellsByRow[$currentRow]) ||
-										$rowDimension->getRowHeight() >= 0 ||
-										$rowDimension->getVisible() == false ||
-										$rowDimension->getCollapsed() == true ||
-										$rowDimension->getOutlineLevel() > 0 ||
-										$rowDimension->getXfIndex() !== null;
-
-					if ($writeCurrentRow) {
-						// Start a new row
-						$objWriter->startElement('row');
-						$objWriter->writeAttribute('r',	$currentRow);
-						$objWriter->writeAttribute('spans',	'1:' . $colCount);
-
-						// Row dimensions
-						if ($rowDimension->getRowHeight() >= 0) {
-							$objWriter->writeAttribute('customHeight',	'1');
-							$objWriter->writeAttribute('ht',			PHPExcel_Shared_String::FormatNumber($rowDimension->getRowHeight()));
-						}
-
-						// Row visibility
-						if ($rowDimension->getVisible() == false) {
-							$objWriter->writeAttribute('hidden',		'true');
-						}
-
-						// Collapsed
-						if ($rowDimension->getCollapsed() == true) {
-							$objWriter->writeAttribute('collapsed',		'true');
-						}
-
-						// Outline level
-						if ($rowDimension->getOutlineLevel() > 0) {
-							$objWriter->writeAttribute('outlineLevel',	$rowDimension->getOutlineLevel());
-						}
-
-						// Style
-						if ($rowDimension->getXfIndex() !== null) {
-							$objWriter->writeAttribute('s',	$rowDimension->getXfIndex());
-							$objWriter->writeAttribute('customFormat', '1');
-						}
-
-						// Write cells
-						if (isset($cellsByRow[$currentRow])) {
-							foreach($cellsByRow[$currentRow] as $cellAddress) {
-								// Write cell
-								$this->_writeCell($objWriter, $pSheet, $cellAddress, $pStringTable, $aFlippedStringTable);
-							}
-						}
-
-						// End row
-						$objWriter->endElement();
-					}
-				}
-
-			$objWriter->endElement();
-		} else {
-			throw new Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Write Cell
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter	$objWriter				XML Writer
-	 * @param	PHPExcel_Worksheet			$pSheet					Worksheet
-	 * @param	PHPExcel_Cell				$pCellAddress			Cell Address
-	 * @param	string[]					$pStringTable			String table
-	 * @param	string[]					$pFlippedStringTable	String table (flipped), for faster index searching
-	 * @throws	Exception
-	 */
-	private function _writeCell(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pCellAddress = null, $pStringTable = null, $pFlippedStringTable = null)
-	{
-		if (is_array($pStringTable) && is_array($pFlippedStringTable)) {
-			// Cell
-			$pCell = $pSheet->getCell($pCellAddress);
-			$objWriter->startElement('c');
-			$objWriter->writeAttribute('r', $pCellAddress);
-
-			// Sheet styles
-			if ($pCell->getXfIndex() != '') {
-				$objWriter->writeAttribute('s', $pCell->getXfIndex());
-			}
-
-			// If cell value is supplied, write cell value
-			$cellValue = $pCell->getValue();
-			if (is_object($cellValue) || $cellValue !== '') {
-				// Map type
-				$mappedType = $pCell->getDataType();
-
-				// Write data type depending on its type
-				switch (strtolower($mappedType)) {
-					case 'inlinestr':	// Inline string
-					case 's':			// String
-					case 'b':			// Boolean
-						$objWriter->writeAttribute('t', $mappedType);
-						break;
-					case 'f':			// Formula
-						$calculatedValue = null;
-						if ($this->getParentWriter()->getPreCalculateFormulas()) {
-							$calculatedValue = $pCell->getCalculatedValue();
-						} else {
-							$calculatedValue = $cellValue;
-						}
-						if (is_string($calculatedValue)) {
-							$objWriter->writeAttribute('t', 'str');
-						}
-						break;
-					case 'e':			// Error
-						$objWriter->writeAttribute('t', $mappedType);
-				}
-
-				// Write data depending on its type
-				switch (strtolower($mappedType)) {
-					case 'inlinestr':	// Inline string
-						if (! $cellValue instanceof PHPExcel_RichText) {
-							$objWriter->writeElement('t', PHPExcel_Shared_String::ControlCharacterPHP2OOXML( htmlspecialchars($cellValue) ) );
-						} else if ($cellValue instanceof PHPExcel_RichText) {
-							$objWriter->startElement('is');
-							$this->getParentWriter()->getWriterPart('stringtable')->writeRichText($objWriter, $cellValue);
-							$objWriter->endElement();
-						}
-
-						break;
-					case 's':			// String
-						if (! $cellValue instanceof PHPExcel_RichText) {
-							if (isset($pFlippedStringTable[$cellValue])) {
-								$objWriter->writeElement('v', $pFlippedStringTable[$cellValue]);
-							}
-						} else if ($cellValue instanceof PHPExcel_RichText) {
-							$objWriter->writeElement('v', $pFlippedStringTable[$cellValue->getHashCode()]);
-						}
-
-						break;
-					case 'f':			// Formula
-						$attributes = $pCell->getFormulaAttributes();
-						if($attributes['t'] == 'array') {
-							$objWriter->startElement('f');
-							$objWriter->writeAttribute('t', 'array');
-							$objWriter->writeAttribute('ref', $pCellAddress);
-							$objWriter->writeAttribute('aca', '1');
-							$objWriter->writeAttribute('ca', '1');
-							$objWriter->text(substr($cellValue, 1));
-							$objWriter->endElement();
-						} else {
-							$objWriter->writeElement('f', substr($cellValue, 1));
-						}
-						if ($this->getParentWriter()->getOffice2003Compatibility() === false) {
-							if ($this->getParentWriter()->getPreCalculateFormulas()) {
-								$calculatedValue = $pCell->getCalculatedValue();
-								if (!is_array($calculatedValue) && substr($calculatedValue, 0, 1) != '#') {
-									$objWriter->writeElement('v', PHPExcel_Shared_String::FormatNumber($calculatedValue));
-								} else {
-									$objWriter->writeElement('v', '0');
-								}
-							} else {
-								$objWriter->writeElement('v', '0');
-							}
-						}
-						break;
-					case 'n':			// Numeric
-						// force point as decimal separator in case current locale uses comma
-						$objWriter->writeElement('v', str_replace(',', '.', $cellValue));
-						break;
-					case 'b':			// Boolean
-						$objWriter->writeElement('v', ($cellValue ? '1' : '0'));
-						break;
-					case 'e':			// Error
-						if (substr($cellValue, 0, 1) == '=') {
-							$objWriter->writeElement('f', substr($cellValue, 1));
-							$objWriter->writeElement('v', substr($cellValue, 1));
-						} else {
-							$objWriter->writeElement('v', $cellValue);
-						}
-
-						break;
-				}
-			}
-
-			$objWriter->endElement();
-		} else {
-			throw new Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Write Drawings
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter	$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet			$pSheet			Worksheet
-	 * @param	boolean						$includeCharts	Flag indicating if we should include drawing details for charts
-	 * @throws	Exception
-	 */
-	private function _writeDrawings(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $includeCharts = FALSE)
-	{
-		$chartCount = ($includeCharts) ? $pSheet->getChartCollection()->count() : 0;
-		// If sheet contains drawings, add the relationships
-		if (($pSheet->getDrawingCollection()->count() > 0) ||
-			($chartCount > 0)) {
-			$objWriter->startElement('drawing');
-			$objWriter->writeAttribute('r:id', 'rId1');
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write LegacyDrawing
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeLegacyDrawing(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// If sheet contains comments, add the relationships
-		if (count($pSheet->getComments()) > 0) {
-			$objWriter->startElement('legacyDrawing');
-			$objWriter->writeAttribute('r:id', 'rId_comments_vml1');
-			$objWriter->endElement();
-		}
-	}
-
-	/**
-	 * Write LegacyDrawingHF
-	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
-	 * @throws	Exception
-	 */
-	private function _writeLegacyDrawingHF(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
-	{
-		// If sheet contains images, add the relationships
-		if (count($pSheet->getHeaderFooter()->getImages()) > 0) {
-			$objWriter->startElement('legacyDrawingHF');
-			$objWriter->writeAttribute('r:id', 'rId_headerfooter_vml1');
-			$objWriter->endElement();
-		}
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/WriterPart.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/WriterPart.php
deleted file mode 100755
index 20c375a15..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel2007/WriterPart.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel2007_WriterPart
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_Writer_Excel2007_WriterPart
-{
-	/**
-	 * Parent IWriter object
-	 *
-	 * @var PHPExcel_Writer_IWriter
-	 */
-	private $_parentWriter;
-
-	/**
-	 * Set parent IWriter object
-	 *
-	 * @param PHPExcel_Writer_IWriter	$pWriter
-	 * @throws Exception
-	 */
-	public function setParentWriter(PHPExcel_Writer_IWriter $pWriter = null) {
-		$this->_parentWriter = $pWriter;
-	}
-
-	/**
-	 * Get parent IWriter object
-	 *
-	 * @return PHPExcel_Writer_IWriter
-	 * @throws Exception
-	 */
-	public function getParentWriter() {
-		if (!is_null($this->_parentWriter)) {
-			return $this->_parentWriter;
-		} else {
-			throw new Exception("No parent PHPExcel_Writer_IWriter assigned.");
-		}
-	}
-
-	/**
-	 * Set parent IWriter object
-	 *
-	 * @param PHPExcel_Writer_IWriter	$pWriter
-	 * @throws Exception
-	 */
-	public function __construct(PHPExcel_Writer_IWriter $pWriter = null) {
-		if (!is_null($pWriter)) {
-			$this->_parentWriter = $pWriter;
-		}
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5.php
deleted file mode 100755
index c2f78cc6b..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5.php
+++ /dev/null
@@ -1,961 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel5
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
-{
-	/**
-	 * Pre-calculate formulas
-	 *
-	 * @var boolean
-	 */
-	private $_preCalculateFormulas	= true;
-
-	/**
-	 * PHPExcel object
-	 *
-	 * @var PHPExcel
-	 */
-	private $_phpExcel;
-
-	/**
-	 * Total number of shared strings in workbook
-	 *
-	 * @var int
-	 */
-	private $_str_total		= 0;
-
-	/**
-	 * Number of unique shared strings in workbook
-	 *
-	 * @var int
-	 */
-	private $_str_unique	= 0;
-
-	/**
-	 * Array of unique shared strings in workbook
-	 *
-	 * @var array
-	 */
-	private $_str_table		= array();
-
-	/**
-	 * Color cache. Mapping between RGB value and color index.
-	 *
-	 * @var array
-	 */
-	private $_colors;
-
-	/**
-	 * Formula parser
-	 *
-	 * @var PHPExcel_Writer_Excel5_Parser
-	 */
-	private $_parser;
-
-	/**
-	 * Identifier clusters for drawings. Used in MSODRAWINGGROUP record.
-	 *
-	 * @var array
-	 */
-	private $_IDCLs;
-
-	/**
-	 * Basic OLE object summary information
-	 *
-	 * @var array
-	 */
-	private $_summaryInformation;
-
-	/**
-	 * Extended OLE object document summary information
-	 *
-	 * @var array
-	 */
-	private $_documentSummaryInformation;
-
-	/**
-	 * Create a new PHPExcel_Writer_Excel5
-	 *
-	 * @param	PHPExcel	$phpExcel	PHPExcel object
-	 */
-	public function __construct(PHPExcel $phpExcel) {
-		$this->_phpExcel	= $phpExcel;
-
-		$this->_parser		= new PHPExcel_Writer_Excel5_Parser();
-	}
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param	string		$pFilename
-	 * @throws	Exception
-	 */
-	public function save($pFilename = null) {
-
-		// garbage collect
-		$this->_phpExcel->garbageCollect();
-
-		$saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog;
-		PHPExcel_Calculation::getInstance()->writeDebugLog = false;
-		$saveDateReturnType = PHPExcel_Calculation_Functions::getReturnDateType();
-		PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
-
-		// initialize colors array
-		$this->_colors          = array();
-
-		// Initialise workbook writer
-		$this->_writerWorkbook = new PHPExcel_Writer_Excel5_Workbook($this->_phpExcel,
-																	 $this->_str_total, $this->_str_unique, $this->_str_table,
-																	 $this->_colors, $this->_parser);
-
-		// Initialise worksheet writers
-		$countSheets = $this->_phpExcel->getSheetCount();
-		for ($i = 0; $i < $countSheets; ++$i) {
-			$this->_writerWorksheets[$i] = new PHPExcel_Writer_Excel5_Worksheet($this->_str_total, $this->_str_unique,
-																			   $this->_str_table, $this->_colors,
-																			   $this->_parser,
-																			   $this->_preCalculateFormulas,
-																			   $this->_phpExcel->getSheet($i));
-		}
-
-		// build Escher objects. Escher objects for workbooks needs to be build before Escher object for workbook.
-		$this->_buildWorksheetEschers();
-		$this->_buildWorkbookEscher();
-
-		// add 15 identical cell style Xfs
-		// for now, we use the first cellXf instead of cellStyleXf
-		$cellXfCollection = $this->_phpExcel->getCellXfCollection();
-		for ($i = 0; $i < 15; ++$i) {
-			$this->_writerWorkbook->addXfWriter($cellXfCollection[0], true);
-		}
-
-		// add all the cell Xfs
-		foreach ($this->_phpExcel->getCellXfCollection() as $style) {
-			$this->_writerWorkbook->addXfWriter($style, false);
-		}
-
-		// add fonts from rich text eleemnts
-		for ($i = 0; $i < $countSheets; ++$i) {
-			foreach ($this->_writerWorksheets[$i]->_phpSheet->getCellCollection() as $cellID) {
-				$cell = $this->_writerWorksheets[$i]->_phpSheet->getCell($cellID);
-				$cVal = $cell->getValue();
-				if ($cVal instanceof PHPExcel_RichText) {
-					$elements = $cVal->getRichTextElements();
-					foreach ($elements as $element) {
-						if ($element instanceof PHPExcel_RichText_Run) {
-							$font = $element->getFont();
-							$this->_writerWorksheets[$i]->_fntHashIndex[$font->getHashCode()] = $this->_writerWorkbook->_addFont($font);
-						}
-					}
-				}
-			}
-		}
-
-		// initialize OLE file
-		$workbookStreamName = 'Workbook';
-		$OLE = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs($workbookStreamName));
-
-		// Write the worksheet streams before the global workbook stream,
-		// because the byte sizes of these are needed in the global workbook stream
-		$worksheetSizes = array();
-		for ($i = 0; $i < $countSheets; ++$i) {
-			$this->_writerWorksheets[$i]->close();
-			$worksheetSizes[] = $this->_writerWorksheets[$i]->_datasize;
-		}
-
-		// add binary data for global workbook stream
-		$OLE->append( $this->_writerWorkbook->writeWorkbook($worksheetSizes) );
-
-		// add binary data for sheet streams
-		for ($i = 0; $i < $countSheets; ++$i) {
-			$OLE->append($this->_writerWorksheets[$i]->getData());
-		}
-
-		$this->_documentSummaryInformation = $this->_writeDocumentSummaryInformation();
-		// initialize OLE Document Summary Information
-		if(isset($this->_documentSummaryInformation) && !empty($this->_documentSummaryInformation)){
-			$OLE_DocumentSummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'DocumentSummaryInformation'));
-			$OLE_DocumentSummaryInformation->append($this->_documentSummaryInformation);
-		}
-
-		$this->_summaryInformation = $this->_writeSummaryInformation();
-		// initialize OLE Summary Information
-		if(isset($this->_summaryInformation) && !empty($this->_summaryInformation)){
-		  $OLE_SummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'SummaryInformation'));
-		  $OLE_SummaryInformation->append($this->_summaryInformation);
-		}
-
-		// define OLE Parts
-		$arrRootData = array($OLE);
-		// initialize OLE Properties file
-		if(isset($OLE_SummaryInformation)){
-			$arrRootData[] = $OLE_SummaryInformation;
-		}
-		// initialize OLE Extended Properties file
-		if(isset($OLE_DocumentSummaryInformation)){
-			$arrRootData[] = $OLE_DocumentSummaryInformation;
-		}
-
-		$root = new PHPExcel_Shared_OLE_PPS_Root(time(), time(), $arrRootData);
-		// save the OLE file
-		$res = $root->save($pFilename);
-
-		PHPExcel_Calculation_Functions::setReturnDateType($saveDateReturnType);
-		PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog;
-	}
-
-	/**
-	 * Set temporary storage directory
-	 *
-	 * @deprecated
-	 * @param	string	$pValue		Temporary storage directory
-	 * @throws	Exception	Exception when directory does not exist
-	 * @return PHPExcel_Writer_Excel5
-	 */
-	public function setTempDir($pValue = '') {
-		return $this;
-	}
-
-	/**
-	 * Get Pre-Calculate Formulas
-	 *
-	 * @return boolean
-	 */
-	public function getPreCalculateFormulas() {
-		return $this->_preCalculateFormulas;
-	}
-
-	/**
-	 * Set Pre-Calculate Formulas
-	 *
-	 * @param boolean $pValue	Pre-Calculate Formulas?
-	 */
-	public function setPreCalculateFormulas($pValue = true) {
-		$this->_preCalculateFormulas = $pValue;
-	}
-
-	/**
-	 * Build the Worksheet Escher objects
-	 *
-	 */
-	private function _buildWorksheetEschers()
-	{
-		// 1-based index to BstoreContainer
-		$blipIndex = 0;
-		$lastReducedSpId = 0;
-		$lastSpId = 0;
-
-		foreach ($this->_phpExcel->getAllsheets() as $sheet) {
-			// sheet index
-			$sheetIndex = $sheet->getParent()->getIndex($sheet);
-
-			$escher = null;
-
-			// check if there are any shapes for this sheet
-			$filterRange = $sheet->getAutoFilter()->getRange();
-			if (count($sheet->getDrawingCollection()) == 0 && empty($filterRange)) {
-				continue;
-			}
-
-			// create intermediate Escher object
-			$escher = new PHPExcel_Shared_Escher();
-
-			// dgContainer
-			$dgContainer = new PHPExcel_Shared_Escher_DgContainer();
-
-			// set the drawing index (we use sheet index + 1)
-			$dgId = $sheet->getParent()->getIndex($sheet) + 1;
-			$dgContainer->setDgId($dgId);
-			$escher->setDgContainer($dgContainer);
-
-			// spgrContainer
-			$spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer();
-			$dgContainer->setSpgrContainer($spgrContainer);
-
-			// add one shape which is the group shape
-			$spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
-			$spContainer->setSpgr(true);
-			$spContainer->setSpType(0);
-			$spContainer->setSpId(($sheet->getParent()->getIndex($sheet) + 1) << 10);
-			$spgrContainer->addChild($spContainer);
-
-			// add the shapes
-
-			$countShapes[$sheetIndex] = 0; // count number of shapes (minus group shape), in sheet
-
-			foreach ($sheet->getDrawingCollection() as $drawing) {
-				++$blipIndex;
-
-				++$countShapes[$sheetIndex];
-
-				// add the shape
-				$spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
-
-				// set the shape type
-				$spContainer->setSpType(0x004B);
-				// set the shape flag
-				$spContainer->setSpFlag(0x02);
-
-				// set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
-				$reducedSpId = $countShapes[$sheetIndex];
-				$spId = $reducedSpId
-					| ($sheet->getParent()->getIndex($sheet) + 1) << 10;
-				$spContainer->setSpId($spId);
-
-				// keep track of last reducedSpId
-				$lastReducedSpId = $reducedSpId;
-
-				// keep track of last spId
-				$lastSpId = $spId;
-
-				// set the BLIP index
-				$spContainer->setOPT(0x4104, $blipIndex);
-
-				// set coordinates and offsets, client anchor
-				$coordinates = $drawing->getCoordinates();
-				$offsetX = $drawing->getOffsetX();
-				$offsetY = $drawing->getOffsetY();
-				$width = $drawing->getWidth();
-				$height = $drawing->getHeight();
-
-				$twoAnchor = PHPExcel_Shared_Excel5::oneAnchor2twoAnchor($sheet, $coordinates, $offsetX, $offsetY, $width, $height);
-
-				$spContainer->setStartCoordinates($twoAnchor['startCoordinates']);
-				$spContainer->setStartOffsetX($twoAnchor['startOffsetX']);
-				$spContainer->setStartOffsetY($twoAnchor['startOffsetY']);
-				$spContainer->setEndCoordinates($twoAnchor['endCoordinates']);
-				$spContainer->setEndOffsetX($twoAnchor['endOffsetX']);
-				$spContainer->setEndOffsetY($twoAnchor['endOffsetY']);
-
-				$spgrContainer->addChild($spContainer);
-			}
-
-			// AutoFilters
-			if(!empty($filterRange)){
-				$rangeBounds = PHPExcel_Cell::rangeBoundaries($filterRange);
-				$iNumColStart = $rangeBounds[0][0];
-				$iNumColEnd = $rangeBounds[1][0];
-
-				$iInc = $iNumColStart;
-				while($iInc <= $iNumColEnd){
-					++$countShapes[$sheetIndex];
-
-					// create an Drawing Object for the dropdown
-					$oDrawing  = new PHPExcel_Worksheet_BaseDrawing();
-					// get the coordinates of drawing
-					$cDrawing   = PHPExcel_Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
-					$oDrawing->setCoordinates($cDrawing);
-					$oDrawing->setWorksheet($sheet);
-
-					// add the shape
-					$spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
-					// set the shape type
-					$spContainer->setSpType(0x00C9);
-					// set the shape flag
-					$spContainer->setSpFlag(0x01);
-
-					// set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
-					$reducedSpId = $countShapes[$sheetIndex];
-					$spId = $reducedSpId
-						| ($sheet->getParent()->getIndex($sheet) + 1) << 10;
-					$spContainer->setSpId($spId);
-
-					// keep track of last reducedSpId
-					$lastReducedSpId = $reducedSpId;
-
-					// keep track of last spId
-					$lastSpId = $spId;
-
-					$spContainer->setOPT(0x007F, 0x01040104); // Protection -> fLockAgainstGrouping
-					$spContainer->setOPT(0x00BF, 0x00080008); // Text -> fFitTextToShape
-					$spContainer->setOPT(0x01BF, 0x00010000); // Fill Style -> fNoFillHitTest
-					$spContainer->setOPT(0x01FF, 0x00080000); // Line Style -> fNoLineDrawDash
-					$spContainer->setOPT(0x03BF, 0x000A0000); // Group Shape -> fPrint
-
-					// set coordinates and offsets, client anchor
-					$endCoordinates = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::stringFromColumnIndex($iInc - 1));
-					$endCoordinates .= $rangeBounds[0][1] + 1;
-
-					$spContainer->setStartCoordinates($cDrawing);
-					$spContainer->setStartOffsetX(0);
-					$spContainer->setStartOffsetY(0);
-					$spContainer->setEndCoordinates($endCoordinates);
-					$spContainer->setEndOffsetX(0);
-					$spContainer->setEndOffsetY(0);
-
-					$spgrContainer->addChild($spContainer);
-					$iInc++;
-				}
-			}
-
-			// identifier clusters, used for workbook Escher object
-			$this->_IDCLs[$dgId] = $lastReducedSpId;
-
-			// set last shape index
-			$dgContainer->setLastSpId($lastSpId);
-
-			// set the Escher object
-			$this->_writerWorksheets[$sheetIndex]->setEscher($escher);
-		}
-	}
-
-	/**
-	 * Build the Escher object corresponding to the MSODRAWINGGROUP record
-	 */
-	private function _buildWorkbookEscher()
-	{
-		$escher = null;
-
-		// any drawings in this workbook?
-		$found = false;
-		foreach ($this->_phpExcel->getAllSheets() as $sheet) {
-			if (count($sheet->getDrawingCollection()) > 0) {
-				$found = true;
-				break;
-			}
-		}
-
-		// nothing to do if there are no drawings
-		if (!$found) {
-			return;
-		}
-
-		// if we reach here, then there are drawings in the workbook
-		$escher = new PHPExcel_Shared_Escher();
-
-		// dggContainer
-		$dggContainer = new PHPExcel_Shared_Escher_DggContainer();
-		$escher->setDggContainer($dggContainer);
-
-		// set IDCLs (identifier clusters)
-		$dggContainer->setIDCLs($this->_IDCLs);
-
-		// this loop is for determining maximum shape identifier of all drawing
-		$spIdMax = 0;
-		$totalCountShapes = 0;
-		$countDrawings = 0;
-
-		foreach ($this->_phpExcel->getAllsheets() as $sheet) {
-			$sheetCountShapes = 0; // count number of shapes (minus group shape), in sheet
-
-			if (count($sheet->getDrawingCollection()) > 0) {
-				++$countDrawings;
-
-				foreach ($sheet->getDrawingCollection() as $drawing) {
-					++$sheetCountShapes;
-					++$totalCountShapes;
-
-					$spId = $sheetCountShapes
-						| ($this->_phpExcel->getIndex($sheet) + 1) << 10;
-					$spIdMax = max($spId, $spIdMax);
-				}
-			}
-		}
-
-		$dggContainer->setSpIdMax($spIdMax + 1);
-		$dggContainer->setCDgSaved($countDrawings);
-		$dggContainer->setCSpSaved($totalCountShapes + $countDrawings); // total number of shapes incl. one group shapes per drawing
-
-		// bstoreContainer
-		$bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer();
-		$dggContainer->setBstoreContainer($bstoreContainer);
-
-		// the BSE's (all the images)
-		foreach ($this->_phpExcel->getAllsheets() as $sheet) {
-			foreach ($sheet->getDrawingCollection() as $drawing) {
-				if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
-
-					$filename = $drawing->getPath();
-
-					list($imagesx, $imagesy, $imageFormat) = getimagesize($filename);
-
-					switch ($imageFormat) {
-
-					case 1: // GIF, not supported by BIFF8, we convert to PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						ob_start();
-						imagepng(imagecreatefromgif($filename));
-						$blipData = ob_get_contents();
-						ob_end_clean();
-						break;
-
-					case 2: // JPEG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
-						$blipData = file_get_contents($filename);
-						break;
-
-					case 3: // PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						$blipData = file_get_contents($filename);
-						break;
-
-					case 6: // Windows DIB (BMP), we convert to PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						ob_start();
-						imagepng(PHPExcel_Shared_Drawing::imagecreatefrombmp($filename));
-						$blipData = ob_get_contents();
-						ob_end_clean();
-						break;
-
-					default: continue 2;
-
-					}
-
-					$blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
-					$blip->setData($blipData);
-
-					$BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
-					$BSE->setBlipType($blipType);
-					$BSE->setBlip($blip);
-
-					$bstoreContainer->addBSE($BSE);
-
-				} else if ($drawing instanceof PHPExcel_Worksheet_MemoryDrawing) {
-
-					switch ($drawing->getRenderingFunction()) {
-
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG:
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
-						$renderingFunction = 'imagejpeg';
-						break;
-
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF:
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG:
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT:
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						$renderingFunction = 'imagepng';
-						break;
-
-					}
-
-					ob_start();
-					call_user_func($renderingFunction, $drawing->getImageResource());
-					$blipData = ob_get_contents();
-					ob_end_clean();
-
-					$blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
-					$blip->setData($blipData);
-
-					$BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
-					$BSE->setBlipType($blipType);
-					$BSE->setBlip($blip);
-
-					$bstoreContainer->addBSE($BSE);
-				}
-			}
-		}
-
-		// Set the Escher object
-		$this->_writerWorkbook->setEscher($escher);
-	}
-
-	/**
-	 * Build the OLE Part for DocumentSummary Information
-	 * @return string
-	 */
-	private function _writeDocumentSummaryInformation(){
-
-		// offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
-		$data = pack('v', 0xFFFE);
-		// offset: 2; size: 2;
-		$data .= pack('v', 0x0000);
-		// offset: 4; size: 2; OS version
-		$data .= pack('v', 0x0106);
-		// offset: 6; size: 2; OS indicator
-		$data .= pack('v', 0x0002);
-		// offset: 8; size: 16
-		$data .= pack('VVVV', 0x00, 0x00, 0x00, 0x00);
-		// offset: 24; size: 4; section count
-		$data .= pack('V', 0x0001);
-
-		// offset: 28; size: 16; first section's class id: 02 d5 cd d5 9c 2e 1b 10 93 97 08 00 2b 2c f9 ae
-		$data .= pack('vvvvvvvv', 0xD502, 0xD5CD, 0x2E9C, 0x101B, 0x9793, 0x0008, 0x2C2B, 0xAEF9);
-		// offset: 44; size: 4; offset of the start
-		$data .= pack('V', 0x30);
-
-		// SECTION
-		$dataSection = array();
-		$dataSection_NumProps = 0;
-		$dataSection_Summary = '';
-		$dataSection_Content = '';
-
-		// GKPIDDSI_CODEPAGE: CodePage
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
-							   'data'	=> array('data' => 1252));
-		$dataSection_NumProps++;
-
-		// GKPIDDSI_CATEGORY : Category
-		if($this->_phpExcel->getProperties()->getCategory()){
-			$dataProp = $this->_phpExcel->getProperties()->getCategory();
-			$dataProp = 'Test result file';
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E),
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		// GKPIDDSI_VERSION :Version of the application that wrote the property storage
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x17),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x03),
-							   'data'	=> array('pack' => 'V', 'data' => 0x000C0000));
-		$dataSection_NumProps++;
-		// GKPIDDSI_SCALE : FALSE
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0B),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
-							   'data'	=> array('data' => false));
-		$dataSection_NumProps++;
-		// GKPIDDSI_LINKSDIRTY : True if any of the values for the linked properties have changed outside of the application
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x10),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
-							   'data'	=> array('data' => false));
-		$dataSection_NumProps++;
-		// GKPIDDSI_SHAREDOC : FALSE
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
-							   'data'	=> array('data' => false));
-		$dataSection_NumProps++;
-		// GKPIDDSI_HYPERLINKSCHANGED : True if any of the values for the _PID_LINKS (hyperlink text) have changed outside of the application
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x16),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
-							   'data'	=> array('data' => false));
-		$dataSection_NumProps++;
-
-		// GKPIDDSI_DOCSPARTS
-		// MS-OSHARED p75 (2.3.3.2.2.1)
-		// Structure is VtVecUnalignedLpstrValue (2.3.3.1.9)
-		// cElements
-		$dataProp = pack('v', 0x0001);
-		$dataProp .= pack('v', 0x0000);
-		// array of UnalignedLpstr
-		  // cch
-		  $dataProp .= pack('v', 0x000A);
-		  $dataProp .= pack('v', 0x0000);
-		  // value
-		  $dataProp .= 'Worksheet'.chr(0);
-
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x101E),
-							   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-		$dataSection_NumProps++;
-
-		// GKPIDDSI_HEADINGPAIR
-		// VtVecHeadingPairValue
-		  // cElements
-		  $dataProp = pack('v', 0x0002);
-		  $dataProp .= pack('v', 0x0000);
-		  // Array of vtHeadingPair
-		    // vtUnalignedString - headingString
-		      // stringType
-		      $dataProp .= pack('v', 0x001E);
-		      // padding
-		      $dataProp .= pack('v', 0x0000);
-		      // UnalignedLpstr
-		        // cch
-		        $dataProp .= pack('v', 0x0013);
-		        $dataProp .= pack('v', 0x0000);
-		        // value
-		        $dataProp .= 'Feuilles de calcul';
-		    // vtUnalignedString - headingParts
-		      // wType : 0x0003 = 32 bit signed integer
-		      $dataProp .= pack('v', 0x0300);
-		      // padding
-		      $dataProp .= pack('v', 0x0000);
-		      // value
-		      $dataProp .= pack('v', 0x0100);
-		      $dataProp .= pack('v', 0x0000);
-			  $dataProp .= pack('v', 0x0000);
-		      $dataProp .= pack('v', 0x0000);
-
-        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
-        					   'offset' => array('pack' => 'V'),
-        					   'type' 	=> array('pack' => 'V', 'data' => 0x100C),
-        					   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-        $dataSection_NumProps++;
-
-		// 		4 	Section Length
-		//		4 	Property count
-		//		8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
-		$dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
-		foreach ($dataSection as $dataProp){
-			// Summary
-			$dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
-			// Offset
-			$dataSection_Summary .= pack($dataProp['offset']['pack'], $dataSection_Content_Offset);
-			// DataType
-			$dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
-			// Data
-			if($dataProp['type']['data'] == 0x02){ // 2 byte signed integer
-				$dataSection_Content .= pack('V', $dataProp['data']['data']);
-
-				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
-				$dataSection_Content .= pack('V', $dataProp['data']['data']);
-
-				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x0B){ // Boolean
-				if($dataProp['data']['data'] == false){
-					$dataSection_Content .= pack('V', 0x0000);
-				} else {
-					$dataSection_Content .= pack('V', 0x0001);
-				}
-				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
-				// Null-terminated string
-				$dataProp['data']['data'] .= chr(0);
-				$dataProp['data']['length'] += 1;
-				// Complete the string with null string for being a %4
-				$dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
-				$dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
-
-				$dataSection_Content .= pack('V', $dataProp['data']['length']);
-				$dataSection_Content .= $dataProp['data']['data'];
-
-				$dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
-			}
-			elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-				$dataSection_Content .= $dataProp['data']['data'];
-
-				$dataSection_Content_Offset += 4 + 8;
-			}
-			else {
-				// Data Type Not Used at the moment
-				$dataSection_Content .= $dataProp['data']['data'];
-
-				$dataSection_Content_Offset += 4 + $dataProp['data']['length'];
-			}
-		}
-		// Now $dataSection_Content_Offset contains the size of the content
-
-		// section header
-		// offset: $secOffset; size: 4; section length
-		// 		+ x  Size of the content (summary + content)
-		$data .= pack('V', $dataSection_Content_Offset);
-		// offset: $secOffset+4; size: 4; property count
-		$data .= pack('V', $dataSection_NumProps);
-		// Section Summary
-		$data .= $dataSection_Summary;
-		// Section Content
-		$data .= $dataSection_Content;
-
-		return $data;
-	}
-
-	/**
-	 * Build the OLE Part for Summary Information
-	 * @return string
-	 */
-	private function _writeSummaryInformation(){
-		// offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
-		$data = pack('v', 0xFFFE);
-		// offset: 2; size: 2;
-		$data .= pack('v', 0x0000);
-		// offset: 4; size: 2; OS version
-		$data .= pack('v', 0x0106);
-		// offset: 6; size: 2; OS indicator
-		$data .= pack('v', 0x0002);
-		// offset: 8; size: 16
-		$data .= pack('VVVV', 0x00, 0x00, 0x00, 0x00);
-		// offset: 24; size: 4; section count
-		$data .= pack('V', 0x0001);
-
-		// offset: 28; size: 16; first section's class id: e0 85 9f f2 f9 4f 68 10 ab 91 08 00 2b 27 b3 d9
-		$data .= pack('vvvvvvvv', 0x85E0, 0xF29F, 0x4FF9, 0x1068, 0x91AB, 0x0008, 0x272B, 0xD9B3);
-		// offset: 44; size: 4; offset of the start
-		$data .= pack('V', 0x30);
-
-		// SECTION
-		$dataSection = array();
-		$dataSection_NumProps = 0;
-		$dataSection_Summary = '';
-		$dataSection_Content = '';
-
-		// CodePage : CP-1252
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
-							   'data'	=> array('data' => 1252));
-		$dataSection_NumProps++;
-
-		//	Title
-		if($this->_phpExcel->getProperties()->getTitle()){
-			$dataProp = $this->_phpExcel->getProperties()->getTitle();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Subject
-		if($this->_phpExcel->getProperties()->getSubject()){
-			$dataProp = $this->_phpExcel->getProperties()->getSubject();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x03),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Author (Creator)
-		if($this->_phpExcel->getProperties()->getCreator()){
-			$dataProp = $this->_phpExcel->getProperties()->getCreator();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x04),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Keywords
-		if($this->_phpExcel->getProperties()->getKeywords()){
-			$dataProp = $this->_phpExcel->getProperties()->getKeywords();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x05),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Comments (Description)
-		if($this->_phpExcel->getProperties()->getDescription()){
-			$dataProp = $this->_phpExcel->getProperties()->getDescription();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x06),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Last Saved By (LastModifiedBy)
-		if($this->_phpExcel->getProperties()->getLastModifiedBy()){
-			$dataProp = $this->_phpExcel->getProperties()->getLastModifiedBy();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x08),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
-								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Created Date/Time
-		if($this->_phpExcel->getProperties()->getCreated()){
-			$dataProp = $this->_phpExcel->getProperties()->getCreated();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-								   'data'	=> array('data' => PHPExcel_Shared_OLE::LocalDate2OLE($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Modified Date/Time
-		if($this->_phpExcel->getProperties()->getModified()){
-			$dataProp = $this->_phpExcel->getProperties()->getModified();
-			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
-								   'offset' => array('pack' => 'V'),
-								   'type' 	=> array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-								   'data'	=> array('data' => PHPExcel_Shared_OLE::LocalDate2OLE($dataProp)));
-			$dataSection_NumProps++;
-		}
-		//	Security
-		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
-							   'offset' => array('pack' => 'V'),
-							   'type' 	=> array('pack' => 'V', 'data' => 0x03), // 4 byte signed integer
-							   'data'	=> array('data' => 0x00));
-		$dataSection_NumProps++;
-
-
-		// 		4 	Section Length
-		//		4 	Property count
-		//		8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
-		$dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
-		foreach ($dataSection as $dataProp){
-			// Summary
-			$dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
-			// Offset
-			$dataSection_Summary .= pack($dataProp['offset']['pack'], $dataSection_Content_Offset);
-			// DataType
-			$dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
-			// Data
-			if($dataProp['type']['data'] == 0x02){ // 2 byte signed integer
-				$dataSection_Content .= pack('V', $dataProp['data']['data']);
-
-				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
-				$dataSection_Content .= pack('V', $dataProp['data']['data']);
-
-				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
-				// Null-terminated string
-				$dataProp['data']['data'] .= chr(0);
-				$dataProp['data']['length'] += 1;
-				// Complete the string with null string for being a %4
-				$dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
-				$dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
-
-				$dataSection_Content .= pack('V', $dataProp['data']['length']);
-				$dataSection_Content .= $dataProp['data']['data'];
-
-				$dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
-			}
-			elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-				$dataSection_Content .= $dataProp['data']['data'];
-
-				$dataSection_Content_Offset += 4 + 8;
-			}
-			else {
-				// Data Type Not Used at the moment
-			}
-		}
-		// Now $dataSection_Content_Offset contains the size of the content
-
-		// section header
-		// offset: $secOffset; size: 4; section length
-		// 		+ x  Size of the content (summary + content)
-		$data .= pack('V', $dataSection_Content_Offset);
-		// offset: $secOffset+4; size: 4; property count
-		$data .= pack('V', $dataSection_NumProps);
-		// Section Summary
-		$data .= $dataSection_Summary;
-		// Section Content
-		$data .= $dataSection_Content;
-
-		return $data;
-	}
-}
\ No newline at end of file
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/BIFFwriter.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/BIFFwriter.php
deleted file mode 100755
index 332060827..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/BIFFwriter.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of PEAR::Spreadsheet_Excel_Writer_BIFFwriter (used as the base for this class):
-// -----------------------------------------------------------------------------------------
-// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-// *
-// *  The majority of this is _NOT_ my code.  I simply ported it from the
-// *  PERL Spreadsheet::WriteExcel module.
-// *
-// *  The author of the Spreadsheet::WriteExcel module is John McNamara
-// *  <jmcnamara@cpan.org>
-// *
-// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
-// *  porting of this code to PHP.  Any questions directly related to this
-// *  class library should be directed to me.
-// *
-// *  License Information:
-// *
-// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
-// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
-// *
-// *    This library is free software; you can redistribute it and/or
-// *    modify it under the terms of the GNU Lesser General Public
-// *    License as published by the Free Software Foundation; either
-// *    version 2.1 of the License, or (at your option) any later version.
-// *
-// *    This library is distributed in the hope that it will be useful,
-// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// *    Lesser General Public License for more details.
-// *
-// *    You should have received a copy of the GNU Lesser General Public
-// *    License along with this library; if not, write to the Free Software
-// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// */
-
-
-/**
- * PHPExcel_Writer_Excel5_BIFFwriter
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_BIFFwriter
-{
-	/**
-	 * The byte order of this architecture. 0 => little endian, 1 => big endian
-	 * @var integer
-	 */
-	private static $_byte_order;
-
-	/**
-	 * The string containing the data of the BIFF stream
-	 * @var string
-	 */
-	public $_data;
-
-	/**
-	 * The size of the data in bytes. Should be the same as strlen($this->_data)
-	 * @var integer
-	 */
-	public $_datasize;
-
-	/**
-	 * The maximum length for a BIFF record (excluding record header and length field). See _addContinue()
-	 * @var integer
-	 * @see _addContinue()
-	 */
-	public $_limit	= 8224;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		$this->_data       = '';
-		$this->_datasize   = 0;
-//		$this->_limit      = 8224;
-	}
-
-	/**
-	 * Determine the byte order and store it as class data to avoid
-	 * recalculating it for each call to new().
-	 *
-	 * @return int
-	 */
-	public static function getByteOrder()
-	{
-		if (!isset(self::$_byte_order)) {
-			// Check if "pack" gives the required IEEE 64bit float
-			$teststr = pack("d", 1.2345);
-			$number  = pack("C8", 0x8D, 0x97, 0x6E, 0x12, 0x83, 0xC0, 0xF3, 0x3F);
-			if ($number == $teststr) {
-				$byte_order = 0;    // Little Endian
-			} elseif ($number == strrev($teststr)){
-				$byte_order = 1;    // Big Endian
-			} else {
-				// Give up. I'll fix this in a later version.
-				throw new Exception("Required floating point format not supported on this platform.");
-			}
-			self::$_byte_order = $byte_order;
-		}
-
-		return self::$_byte_order;
-	}
-
-	/**
-	 * General storage function
-	 *
-	 * @param string $data binary data to append
-	 * @access private
-	 */
-	function _append($data)
-	{
-		if (strlen($data) - 4 > $this->_limit) {
-			$data = $this->_addContinue($data);
-		}
-		$this->_data		.= $data;
-		$this->_datasize	+= strlen($data);
-	}
-
-	/**
-	 * General storage function like _append, but returns string instead of modifying $this->_data
-	 *
-	 * @param string $data binary data to write
-	 * @return string
-	 */
-	public function writeData($data)
-	{
-		if (strlen($data) - 4 > $this->_limit) {
-			$data = $this->_addContinue($data);
-		}
-		$this->_datasize += strlen($data);
-
-		return $data;
-	}
-
-	/**
-	 * Writes Excel BOF record to indicate the beginning of a stream or
-	 * sub-stream in the BIFF file.
-	 *
-	 * @param  integer $type Type of BIFF file to write: 0x0005 Workbook,
-	 *                       0x0010 Worksheet.
-	 * @access private
-	 */
-	function _storeBof($type)
-	{
-		$record  = 0x0809;			// Record identifier	(BIFF5-BIFF8)
-		$length  = 0x0010;
-
-		// by inspection of real files, MS Office Excel 2007 writes the following
-		$unknown = pack("VV", 0x000100D1, 0x00000406);
-
-		$build   = 0x0DBB;			//	Excel 97
-		$year    = 0x07CC;			//	Excel 97
-
-		$version = 0x0600;			//	BIFF8
-
-		$header  = pack("vv",   $record, $length);
-		$data    = pack("vvvv", $version, $type, $build, $year);
-		$this->_append($header . $data . $unknown);
-	}
-
-	/**
-	 * Writes Excel EOF record to indicate the end of a BIFF stream.
-	 *
-	 * @access private
-	 */
-	function _storeEof()
-	{
-		$record    = 0x000A;   // Record identifier
-		$length    = 0x0000;   // Number of bytes to follow
-
-		$header    = pack("vv", $record, $length);
-		$this->_append($header);
-	}
-
-	/**
-	 * Writes Excel EOF record to indicate the end of a BIFF stream.
-	 *
-	 * @access private
-	 */
-	public function writeEof()
-	{
-		$record    = 0x000A;   // Record identifier
-		$length    = 0x0000;   // Number of bytes to follow
-		$header    = pack("vv", $record, $length);
-		return $this->writeData($header);
-	}
-
-	/**
-	 * Excel limits the size of BIFF records. In Excel 5 the limit is 2084 bytes. In
-	 * Excel 97 the limit is 8228 bytes. Records that are longer than these limits
-	 * must be split up into CONTINUE blocks.
-	 *
-	 * This function takes a long BIFF record and inserts CONTINUE records as
-	 * necessary.
-	 *
-	 * @param  string  $data The original binary data to be written
-	 * @return string        A very convenient string of continue blocks
-	 * @access private
-	 */
-	function _addContinue($data)
-	{
-		$limit  = $this->_limit;
-		$record = 0x003C;         // Record identifier
-
-		// The first 2080/8224 bytes remain intact. However, we have to change
-		// the length field of the record.
-		$tmp = substr($data, 0, 2) . pack("v", $limit) . substr($data, 4, $limit);
-
-		$header = pack("vv", $record, $limit);  // Headers for continue records
-
-		// Retrieve chunks of 2080/8224 bytes +4 for the header.
-		$data_length = strlen($data);
-		for ($i = $limit + 4; $i < ($data_length - $limit); $i += $limit) {
-			$tmp .= $header;
-			$tmp .= substr($data, $i, $limit);
-		}
-
-		// Retrieve the last chunk of data
-		$header  = pack("vv", $record, strlen($data) - $i);
-		$tmp    .= $header;
-		$tmp    .= substr($data, $i, strlen($data) - $i);
-
-		return $tmp;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Escher.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Escher.php
deleted file mode 100755
index 91fc27b05..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Escher.php
+++ /dev/null
@@ -1,537 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Shared_Escher_DggContainer_BstoreContainer
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Escher
-{
-	/**
-	 * The object we are writing
-	 */
-	private $_object;
-
-	/**
-	 * The written binary data
-	 */
-	private $_data;
-
-	/**
-	 * Shape offsets. Positions in binary stream where a new shape record begins
-	 *
-	 * @var array
-	 */
-	private $_spOffsets;
-
-	/**
-	 * Shape types.
-	 *
-	 * @var array
-	 */
-	private $_spTypes;
-	
-	/**
-	 * Constructor
-	 *
-	 * @param mixed
-	 */
-	public function __construct($object)
-	{
-		$this->_object = $object;
-	}
-
-	/**
-	 * Process the object to be written
-	 */
-	public function close()
-	{
-		// initialize
-		$this->_data = '';
-
-		switch (get_class($this->_object)) {
-
-		case 'PHPExcel_Shared_Escher':
-			if ($dggContainer = $this->_object->getDggContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($dggContainer);
-				$this->_data = $writer->close();
-			} else if ($dgContainer = $this->_object->getDgContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($dgContainer);
-				$this->_data = $writer->close();
-				$this->_spOffsets = $writer->getSpOffsets();
-				$this->_spTypes = $writer->getSpTypes();
-			}
-			break;
-
-		case 'PHPExcel_Shared_Escher_DggContainer':
-			// this is a container record
-
-			// initialize
-			$innerData = '';
-
-			// write the dgg
-			$recVer			= 0x0;
-			$recInstance	= 0x0000;
-			$recType		= 0xF006;
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			// dgg data
-			$dggData =
-				pack('VVVV'
-					, $this->_object->getSpIdMax() // maximum shape identifier increased by one
-					, $this->_object->getCDgSaved() + 1 // number of file identifier clusters increased by one
-					, $this->_object->getCSpSaved()
-					, $this->_object->getCDgSaved() // count total number of drawings saved
-				);
-
-			// add file identifier clusters (one per drawing)
-			$IDCLs = $this->_object->getIDCLs();
-
-			foreach ($IDCLs as $dgId => $maxReducedSpId) {
-				$dggData .= pack('VV', $dgId, $maxReducedSpId + 1);
-			}
-
-			$header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
-			$innerData .= $header . $dggData;
-
-			// write the bstoreContainer
-			if ($bstoreContainer = $this->_object->getBstoreContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($bstoreContainer);
-				$innerData .= $writer->close();
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF000;
-			$length			= strlen($innerData);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $innerData;
-			break;
-
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer':
-			// this is a container record
-
-			// initialize
-			$innerData = '';
-
-			// treat the inner data
-			if ($BSECollection = $this->_object->getBSECollection()) {
-				foreach ($BSECollection as $BSE) {
-					$writer = new PHPExcel_Writer_Excel5_Escher($BSE);
-					$innerData .= $writer->close();
-				}
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= count($this->_object->getBSECollection());
-			$recType		= 0xF001;
-			$length			= strlen($innerData);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $innerData;
-			break;
-
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE':
-			// this is a semi-container record
-
-			// initialize
-			$innerData = '';
-
-			// here we treat the inner data
-			if ($blip = $this->_object->getBlip()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($blip);
-				$innerData .= $writer->close();
-			}
-
-			// initialize
-			$data = '';
-
-			$btWin32 = $this->_object->getBlipType();
-			$btMacOS = $this->_object->getBlipType();
-			$data .= pack('CC', $btWin32, $btMacOS);
-
-			$rgbUid = pack('VVVV', 0,0,0,0); // todo
-			$data .= $rgbUid;
-
-			$tag = 0;
-			$size = strlen($innerData);
-			$cRef = 1;
-			$foDelay = 0; //todo
-			$unused1 = 0x0;
-			$cbName = 0x0;
-			$unused2 = 0x0;
-			$unused3 = 0x0;
-			$data .= pack('vVVVCCCC', $tag, $size, $cRef, $foDelay, $unused1, $cbName, $unused2, $unused3);
-
-			$data .= $innerData;
-
-			// write the record
-			$recVer			= 0x2;
-			$recInstance	= $this->_object->getBlipType();
-			$recType		= 0xF007;
-			$length			= strlen($data);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |=	$recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header;
-
-			$this->_data .= $data;
-			break;
-
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
-			// this is an atom record
-
-			// write the record
-			switch ($this->_object->getParent()->getBlipType()) {
-
-			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
-				// initialize
-				$innerData = '';
-
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
-				$innerData .= $rgbUid1;
-
-				$tag = 0xFF; // todo
-				$innerData .= pack('C', $tag);
-
-				$innerData .= $this->_object->getData();
-
-				$recVer			= 0x0;
-				$recInstance	= 0x46A;
-				$recType		= 0xF01D;
-				$length			= strlen($innerData);
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-
-				$this->_data = $header;
-
-				$this->_data .= $innerData;
-				break;
-
-			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
-				// initialize
-				$innerData = '';
-
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
-				$innerData .= $rgbUid1;
-
-				$tag = 0xFF; // todo
-				$innerData .= pack('C', $tag);
-
-				$innerData .= $this->_object->getData();
-
-				$recVer			= 0x0;
-				$recInstance	= 0x6E0;
-				$recType		= 0xF01E;
-				$length			= strlen($innerData);
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-
-				$this->_data = $header;
-
-				$this->_data .= $innerData;
-				break;
-
-			}
-			break;
-
-		case 'PHPExcel_Shared_Escher_DgContainer':
-			// this is a container record
-
-			// initialize
-			$innerData = '';
-
-			// write the dg
-			$recVer			= 0x0;
-			$recInstance	= $this->_object->getDgId();
-			$recType		= 0xF008;
-			$length			= 8;
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			// number of shapes in this drawing (including group shape)
-			$countShapes = count($this->_object->getSpgrContainer()->getChildren());
-			$innerData .= $header . pack('VV', $countShapes, $this->_object->getLastSpId());
-			//$innerData .= $header . pack('VV', 0, 0);
-
-			// write the spgrContainer
-			if ($spgrContainer = $this->_object->getSpgrContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($spgrContainer);
-				$innerData .= $writer->close();
-
-				// get the shape offsets relative to the spgrContainer record
-				$spOffsets = $writer->getSpOffsets();
-				$spTypes   = $writer->getSpTypes();
-				
-				// save the shape offsets relative to dgContainer
-				foreach ($spOffsets as & $spOffset) {
-					$spOffset += 24; // add length of dgContainer header data (8 bytes) plus dg data (16 bytes)
-				}
-
-				$this->_spOffsets = $spOffsets;
-				$this->_spTypes = $spTypes;
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF002;
-			$length			= strlen($innerData);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $innerData;
-			break;
-
-		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer':
-			// this is a container record
-
-			// initialize
-			$innerData = '';
-
-			// initialize spape offsets
-			$totalSize = 8;
-			$spOffsets = array();
-			$spTypes   = array();
-
-			// treat the inner data
-			foreach ($this->_object->getChildren() as $spContainer) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($spContainer);
-				$spData = $writer->close();
-				$innerData .= $spData;
-
-				// save the shape offsets (where new shape records begin)
-				$totalSize += strlen($spData);
-				$spOffsets[] = $totalSize;
-				
-				$spTypes = array_merge($spTypes, $writer->getSpTypes());
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF003;
-			$length			= strlen($innerData);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $innerData;
-			$this->_spOffsets = $spOffsets;
-			$this->_spTypes = $spTypes;
-			break;
-
-		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer':
-			// initialize
-			$data = '';
-
-			// build the data
-
-			// write group shape record, if necessary?
-			if ($this->_object->getSpgr()) {
-				$recVer			= 0x1;
-				$recInstance	= 0x0000;
-				$recType		= 0xF009;
-				$length			= 0x00000010;
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-
-				$data .= $header . pack('VVVV', 0,0,0,0);
-			}
-			$this->_spTypes[] = ($this->_object->getSpType());
-
-			// write the shape record
-			$recVer			= 0x2;
-			$recInstance	= $this->_object->getSpType(); // shape type
-			$recType		= 0xF00A;
-			$length			= 0x00000008;
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$data .= $header . pack('VV', $this->_object->getSpId(), $this->_object->getSpgr() ? 0x0005 : 0x0A00);
-
-
-			// the options
-			if ($this->_object->getOPTCollection()) {
-				$optData = '';
-
-				$recVer			= 0x3;
-				$recInstance	= count($this->_object->getOPTCollection());
-				$recType		= 0xF00B;
-				foreach ($this->_object->getOPTCollection() as $property => $value) {
-					$optData .= pack('vV', $property, $value);
-				}
-				$length			= strlen($optData);
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $optData;
-			}
-
-			// the client anchor
-			if ($this->_object->getStartCoordinates()) {
-				$clientAnchorData = '';
-
-				$recVer			= 0x0;
-				$recInstance	= 0x0;
-				$recType		= 0xF010;
-
-				// start coordinates
-				list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getStartCoordinates());
-				$c1 = PHPExcel_Cell::columnIndexFromString($column) - 1;
-				$r1 = $row - 1;
-
-				// start offsetX
-				$startOffsetX = $this->_object->getStartOffsetX();
-
-				// start offsetY
-				$startOffsetY = $this->_object->getStartOffsetY();
-
-				// end coordinates
-				list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getEndCoordinates());
-				$c2 = PHPExcel_Cell::columnIndexFromString($column) - 1;
-				$r2 = $row - 1;
-
-				// end offsetX
-				$endOffsetX = $this->_object->getEndOffsetX();
-
-				// end offsetY
-				$endOffsetY = $this->_object->getEndOffsetY();
-
-				$clientAnchorData = pack('vvvvvvvvv', $this->_object->getSpFlag(),
-					$c1, $startOffsetX, $r1, $startOffsetY,
-					$c2, $endOffsetX, $r2, $endOffsetY);
-				
-				$length			= strlen($clientAnchorData);
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientAnchorData;
-			}
-
-			// the client data, just empty for now
-			if (!$this->_object->getSpgr()) {
-				$clientDataData = '';
-
-				$recVer			= 0x0;
-				$recInstance	= 0x0;
-				$recType		= 0xF011;
-
-				$length = strlen($clientDataData);
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientDataData;
-			}
-
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF004;
-			$length			= strlen($data);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header . $data;
-			break;
-
-		}
-
-		return $this->_data;
-	}
-
-	/**
-	 * Gets the shape offsets
-	 *
-	 * @return array
-	 */
-	public function getSpOffsets()
-	{
-		return $this->_spOffsets;
-	}
-
-	/**
-	 * Gets the shape types
-	 *
-	 * @return array
-	 */
-	public function getSpTypes()
-	{
-		return $this->_spTypes;
-	}
-	
-	
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Font.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Font.php
deleted file mode 100755
index f59cce66e..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Font.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_Excel5_Font
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Font
-{
-	/**
-	 * Color index
-	 *
-	 * @var int
-	 */
-	private $_colorIndex;
-
-	/**
-	 * Font
-	 *
-	 * @var PHPExcel_Style_Font
-	 */
-	private $_font;
-
-	/**
-	 * Constructor
-	 *
-	 * @param PHPExcel_Style_Font $font
-	 */
-	public function __construct(PHPExcel_Style_Font $font = null)
-	{
-		$this->_colorIndex = 0x7FFF;
-		$this->_font = $font;
-	}
-
-	/**
-	 * Set the color index
-	 *
-	 * @param int $colorIndex
-	 */
-	public function setColorIndex($colorIndex)
-	{
-		$this->_colorIndex = $colorIndex;
-	}
-
-	/**
-	 * Get font record data
-	 *
-	 * @return string
-	 */
-	public function writeFont()
-	{
-		$font_outline = 0;
-		$font_shadow = 0;
-
-		$icv = $this->_colorIndex; // Index to color palette
-		if ($this->_font->getSuperScript()) {
-			$sss = 1;
-		} else if ($this->_font->getSubScript()) {
-			$sss = 2;
-		} else {
-			$sss = 0;
-		}
-		$bFamily = 0; // Font family
-		$bCharSet = PHPExcel_Shared_Font::getCharsetFromFontName($this->_font->getName()); // Character set
-
-		$record = 0x31;		// Record identifier
-		$reserved = 0x00;	// Reserved
-		$grbit = 0x00;		// Font attributes
-		if ($this->_font->getItalic()) {
-			$grbit |= 0x02;
-		}
-		if ($this->_font->getStrikethrough()) {
-			$grbit |= 0x08;
-		}
-		if ($font_outline) {
-			$grbit |= 0x10;
-		}
-		if ($font_shadow) {
-			$grbit |= 0x20;
-		}
-
-		$data = pack("vvvvvCCCC",
-			$this->_font->getSize() * 20,						//	Fontsize (in twips)
-			$grbit,
-			$icv,												//	Colour
-			self::_mapBold($this->_font->getBold()),			//	Font weight
-			$sss,												//	Superscript/Subscript
-			self::_mapUnderline($this->_font->getUnderline()),
-			$bFamily,
-			$bCharSet,
-			$reserved
-		);
-		$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($this->_font->getName());
-
-		$length = strlen($data);
-		$header = pack("vv", $record, $length);
-
-		return($header . $data);
-	}
-
-	/**
-	 * Map to BIFF5-BIFF8 codes for bold
-	 *
-	 * @param boolean $bold
-	 * @return int
-	 */
-	private static function _mapBold($bold) {
-		if ($bold) {
-			return 0x2BC;	//	700 = Bold font weight
-		}
-		return 0x190;		//	400 = Normal font weight
-	}
-
-	/**
-	 * Map of BIFF2-BIFF8 codes for underline styles
-	 * @static	array of int
-	 *
-	 */
-	private static $_mapUnderline = array(	PHPExcel_Style_Font::UNDERLINE_NONE					=> 0x00,
-											PHPExcel_Style_Font::UNDERLINE_SINGLE				=> 0x01,
-											PHPExcel_Style_Font::UNDERLINE_DOUBLE				=> 0x02,
-											PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING		=> 0x21,
-											PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING		=> 0x22,
-										 );
-	/**
-	 * Map underline
-	 *
-	 * @param string
-	 * @return int
-	 */
-	private static function _mapUnderline($underline) {
-		if (isset(self::$_mapUnderline[$underline]))
-			return self::$_mapUnderline[$underline];
-		return 0x00;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Parser.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Parser.php
deleted file mode 100755
index 2210db4e3..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Parser.php
+++ /dev/null
@@ -1,1583 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of PEAR::Spreadsheet_Excel_Writer_Parser (used as the base for this class):
-// -----------------------------------------------------------------------------------------
-// *  Class for parsing Excel formulas
-// *
-// *  License Information:
-// *
-// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
-// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
-// *
-// *    This library is free software; you can redistribute it and/or
-// *    modify it under the terms of the GNU Lesser General Public
-// *    License as published by the Free Software Foundation; either
-// *    version 2.1 of the License, or (at your option) any later version.
-// *
-// *    This library is distributed in the hope that it will be useful,
-// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// *    Lesser General Public License for more details.
-// *
-// *    You should have received a copy of the GNU Lesser General Public
-// *    License along with this library; if not, write to the Free Software
-// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// */
-
-
-/**
- * PHPExcel_Writer_Excel5_Parser
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Parser
-{
-	/**	Constants				*/
-	// Sheet title in unquoted form
-	// Invalid sheet title characters cannot occur in the sheet title:
-	// 		*:/\?[]
-	// Moreover, there are valid sheet title characters that cannot occur in unquoted form (there may be more?)
-	// +-% '^&<>=,;#()"{}
-	const REGEX_SHEET_TITLE_UNQUOTED = '[^\*\:\/\\\\\?\[\]\+\-\% \\\'\^\&\<\>\=\,\;\#\(\)\"\{\}]+';
-
-	// Sheet title in quoted form (without surrounding quotes)
-	// Invalid sheet title characters cannot occur in the sheet title:
-	// *:/\?[]					(usual invalid sheet title characters)
-	// Single quote is represented as a pair ''
-	const REGEX_SHEET_TITLE_QUOTED = '(([^\*\:\/\\\\\?\[\]\\\'])+|(\\\'\\\')+)+';
-
-	/**
-	 * The index of the character we are currently looking at
-	 * @var integer
-	 */
-	public $_current_char;
-
-	/**
-	 * The token we are working on.
-	 * @var string
-	 */
-	public $_current_token;
-
-	/**
-	 * The formula to parse
-	 * @var string
-	 */
-	public $_formula;
-
-	/**
-	 * The character ahead of the current char
-	 * @var string
-	 */
-	public $_lookahead;
-
-	/**
-	 * The parse tree to be generated
-	 * @var string
-	 */
-	public $_parse_tree;
-
-	/**
-	 * Array of external sheets
-	 * @var array
-	 */
-	public $_ext_sheets;
-
-	/**
-	 * Array of sheet references in the form of REF structures
-	 * @var array
-	 */
-	public $_references;
-
-	/**
-	 * The class constructor
-	 *
-	 */
-	public function __construct()
-	{
-		$this->_current_char  = 0;
-		$this->_current_token = '';       // The token we are working on.
-		$this->_formula       = '';       // The formula to parse.
-		$this->_lookahead     = '';       // The character ahead of the current char.
-		$this->_parse_tree    = '';       // The parse tree to be generated.
-		$this->_initializeHashes();      // Initialize the hashes: ptg's and function's ptg's
-		$this->_ext_sheets = array();
-		$this->_references = array();
-	}
-
-	/**
-	 * Initialize the ptg and function hashes.
-	 *
-	 * @access private
-	 */
-	function _initializeHashes()
-	{
-		// The Excel ptg indices
-		$this->ptg = array(
-			'ptgExp'       => 0x01,
-			'ptgTbl'       => 0x02,
-			'ptgAdd'       => 0x03,
-			'ptgSub'       => 0x04,
-			'ptgMul'       => 0x05,
-			'ptgDiv'       => 0x06,
-			'ptgPower'     => 0x07,
-			'ptgConcat'    => 0x08,
-			'ptgLT'        => 0x09,
-			'ptgLE'        => 0x0A,
-			'ptgEQ'        => 0x0B,
-			'ptgGE'        => 0x0C,
-			'ptgGT'        => 0x0D,
-			'ptgNE'        => 0x0E,
-			'ptgIsect'     => 0x0F,
-			'ptgUnion'     => 0x10,
-			'ptgRange'     => 0x11,
-			'ptgUplus'     => 0x12,
-			'ptgUminus'    => 0x13,
-			'ptgPercent'   => 0x14,
-			'ptgParen'     => 0x15,
-			'ptgMissArg'   => 0x16,
-			'ptgStr'       => 0x17,
-			'ptgAttr'      => 0x19,
-			'ptgSheet'     => 0x1A,
-			'ptgEndSheet'  => 0x1B,
-			'ptgErr'       => 0x1C,
-			'ptgBool'      => 0x1D,
-			'ptgInt'       => 0x1E,
-			'ptgNum'       => 0x1F,
-			'ptgArray'     => 0x20,
-			'ptgFunc'      => 0x21,
-			'ptgFuncVar'   => 0x22,
-			'ptgName'      => 0x23,
-			'ptgRef'       => 0x24,
-			'ptgArea'      => 0x25,
-			'ptgMemArea'   => 0x26,
-			'ptgMemErr'    => 0x27,
-			'ptgMemNoMem'  => 0x28,
-			'ptgMemFunc'   => 0x29,
-			'ptgRefErr'    => 0x2A,
-			'ptgAreaErr'   => 0x2B,
-			'ptgRefN'      => 0x2C,
-			'ptgAreaN'     => 0x2D,
-			'ptgMemAreaN'  => 0x2E,
-			'ptgMemNoMemN' => 0x2F,
-			'ptgNameX'     => 0x39,
-			'ptgRef3d'     => 0x3A,
-			'ptgArea3d'    => 0x3B,
-			'ptgRefErr3d'  => 0x3C,
-			'ptgAreaErr3d' => 0x3D,
-			'ptgArrayV'    => 0x40,
-			'ptgFuncV'     => 0x41,
-			'ptgFuncVarV'  => 0x42,
-			'ptgNameV'     => 0x43,
-			'ptgRefV'      => 0x44,
-			'ptgAreaV'     => 0x45,
-			'ptgMemAreaV'  => 0x46,
-			'ptgMemErrV'   => 0x47,
-			'ptgMemNoMemV' => 0x48,
-			'ptgMemFuncV'  => 0x49,
-			'ptgRefErrV'   => 0x4A,
-			'ptgAreaErrV'  => 0x4B,
-			'ptgRefNV'     => 0x4C,
-			'ptgAreaNV'    => 0x4D,
-			'ptgMemAreaNV' => 0x4E,
-			'ptgMemNoMemN' => 0x4F,
-			'ptgFuncCEV'   => 0x58,
-			'ptgNameXV'    => 0x59,
-			'ptgRef3dV'    => 0x5A,
-			'ptgArea3dV'   => 0x5B,
-			'ptgRefErr3dV' => 0x5C,
-			'ptgAreaErr3d' => 0x5D,
-			'ptgArrayA'    => 0x60,
-			'ptgFuncA'     => 0x61,
-			'ptgFuncVarA'  => 0x62,
-			'ptgNameA'     => 0x63,
-			'ptgRefA'      => 0x64,
-			'ptgAreaA'     => 0x65,
-			'ptgMemAreaA'  => 0x66,
-			'ptgMemErrA'   => 0x67,
-			'ptgMemNoMemA' => 0x68,
-			'ptgMemFuncA'  => 0x69,
-			'ptgRefErrA'   => 0x6A,
-			'ptgAreaErrA'  => 0x6B,
-			'ptgRefNA'     => 0x6C,
-			'ptgAreaNA'    => 0x6D,
-			'ptgMemAreaNA' => 0x6E,
-			'ptgMemNoMemN' => 0x6F,
-			'ptgFuncCEA'   => 0x78,
-			'ptgNameXA'    => 0x79,
-			'ptgRef3dA'    => 0x7A,
-			'ptgArea3dA'   => 0x7B,
-			'ptgRefErr3dA' => 0x7C,
-			'ptgAreaErr3d' => 0x7D
-			);
-
-		// Thanks to Michael Meeks and Gnumeric for the initial arg values.
-		//
-		// The following hash was generated by "function_locale.pl" in the distro.
-		// Refer to function_locale.pl for non-English function names.
-		//
-		// The array elements are as follow:
-		// ptg:   The Excel function ptg code.
-		// args:  The number of arguments that the function takes:
-		//           >=0 is a fixed number of arguments.
-		//           -1  is a variable  number of arguments.
-		// class: The reference, value or array class of the function args.
-		// vol:   The function is volatile.
-		//
-		$this->_functions = array(
-			  // function                  ptg  args  class  vol
-			  'COUNT'           => array(   0,   -1,    0,    0 ),
-			  'IF'              => array(   1,   -1,    1,    0 ),
-			  'ISNA'            => array(   2,    1,    1,    0 ),
-			  'ISERROR'         => array(   3,    1,    1,    0 ),
-			  'SUM'             => array(   4,   -1,    0,    0 ),
-			  'AVERAGE'         => array(   5,   -1,    0,    0 ),
-			  'MIN'             => array(   6,   -1,    0,    0 ),
-			  'MAX'             => array(   7,   -1,    0,    0 ),
-			  'ROW'             => array(   8,   -1,    0,    0 ),
-			  'COLUMN'          => array(   9,   -1,    0,    0 ),
-			  'NA'              => array(  10,    0,    0,    0 ),
-			  'NPV'             => array(  11,   -1,    1,    0 ),
-			  'STDEV'           => array(  12,   -1,    0,    0 ),
-			  'DOLLAR'          => array(  13,   -1,    1,    0 ),
-			  'FIXED'           => array(  14,   -1,    1,    0 ),
-			  'SIN'             => array(  15,    1,    1,    0 ),
-			  'COS'             => array(  16,    1,    1,    0 ),
-			  'TAN'             => array(  17,    1,    1,    0 ),
-			  'ATAN'            => array(  18,    1,    1,    0 ),
-			  'PI'              => array(  19,    0,    1,    0 ),
-			  'SQRT'            => array(  20,    1,    1,    0 ),
-			  'EXP'             => array(  21,    1,    1,    0 ),
-			  'LN'              => array(  22,    1,    1,    0 ),
-			  'LOG10'           => array(  23,    1,    1,    0 ),
-			  'ABS'             => array(  24,    1,    1,    0 ),
-			  'INT'             => array(  25,    1,    1,    0 ),
-			  'SIGN'            => array(  26,    1,    1,    0 ),
-			  'ROUND'           => array(  27,    2,    1,    0 ),
-			  'LOOKUP'          => array(  28,   -1,    0,    0 ),
-			  'INDEX'           => array(  29,   -1,    0,    1 ),
-			  'REPT'            => array(  30,    2,    1,    0 ),
-			  'MID'             => array(  31,    3,    1,    0 ),
-			  'LEN'             => array(  32,    1,    1,    0 ),
-			  'VALUE'           => array(  33,    1,    1,    0 ),
-			  'TRUE'            => array(  34,    0,    1,    0 ),
-			  'FALSE'           => array(  35,    0,    1,    0 ),
-			  'AND'             => array(  36,   -1,    0,    0 ),
-			  'OR'              => array(  37,   -1,    0,    0 ),
-			  'NOT'             => array(  38,    1,    1,    0 ),
-			  'MOD'             => array(  39,    2,    1,    0 ),
-			  'DCOUNT'          => array(  40,    3,    0,    0 ),
-			  'DSUM'            => array(  41,    3,    0,    0 ),
-			  'DAVERAGE'        => array(  42,    3,    0,    0 ),
-			  'DMIN'            => array(  43,    3,    0,    0 ),
-			  'DMAX'            => array(  44,    3,    0,    0 ),
-			  'DSTDEV'          => array(  45,    3,    0,    0 ),
-			  'VAR'             => array(  46,   -1,    0,    0 ),
-			  'DVAR'            => array(  47,    3,    0,    0 ),
-			  'TEXT'            => array(  48,    2,    1,    0 ),
-			  'LINEST'          => array(  49,   -1,    0,    0 ),
-			  'TREND'           => array(  50,   -1,    0,    0 ),
-			  'LOGEST'          => array(  51,   -1,    0,    0 ),
-			  'GROWTH'          => array(  52,   -1,    0,    0 ),
-			  'PV'              => array(  56,   -1,    1,    0 ),
-			  'FV'              => array(  57,   -1,    1,    0 ),
-			  'NPER'            => array(  58,   -1,    1,    0 ),
-			  'PMT'             => array(  59,   -1,    1,    0 ),
-			  'RATE'            => array(  60,   -1,    1,    0 ),
-			  'MIRR'            => array(  61,    3,    0,    0 ),
-			  'IRR'             => array(  62,   -1,    0,    0 ),
-			  'RAND'            => array(  63,    0,    1,    1 ),
-			  'MATCH'           => array(  64,   -1,    0,    0 ),
-			  'DATE'            => array(  65,    3,    1,    0 ),
-			  'TIME'            => array(  66,    3,    1,    0 ),
-			  'DAY'             => array(  67,    1,    1,    0 ),
-			  'MONTH'           => array(  68,    1,    1,    0 ),
-			  'YEAR'            => array(  69,    1,    1,    0 ),
-			  'WEEKDAY'         => array(  70,   -1,    1,    0 ),
-			  'HOUR'            => array(  71,    1,    1,    0 ),
-			  'MINUTE'          => array(  72,    1,    1,    0 ),
-			  'SECOND'          => array(  73,    1,    1,    0 ),
-			  'NOW'             => array(  74,    0,    1,    1 ),
-			  'AREAS'           => array(  75,    1,    0,    1 ),
-			  'ROWS'            => array(  76,    1,    0,    1 ),
-			  'COLUMNS'         => array(  77,    1,    0,    1 ),
-			  'OFFSET'          => array(  78,   -1,    0,    1 ),
-			  'SEARCH'          => array(  82,   -1,    1,    0 ),
-			  'TRANSPOSE'       => array(  83,    1,    1,    0 ),
-			  'TYPE'            => array(  86,    1,    1,    0 ),
-			  'ATAN2'           => array(  97,    2,    1,    0 ),
-			  'ASIN'            => array(  98,    1,    1,    0 ),
-			  'ACOS'            => array(  99,    1,    1,    0 ),
-			  'CHOOSE'          => array( 100,   -1,    1,    0 ),
-			  'HLOOKUP'         => array( 101,   -1,    0,    0 ),
-			  'VLOOKUP'         => array( 102,   -1,    0,    0 ),
-			  'ISREF'           => array( 105,    1,    0,    0 ),
-			  'LOG'             => array( 109,   -1,    1,    0 ),
-			  'CHAR'            => array( 111,    1,    1,    0 ),
-			  'LOWER'           => array( 112,    1,    1,    0 ),
-			  'UPPER'           => array( 113,    1,    1,    0 ),
-			  'PROPER'          => array( 114,    1,    1,    0 ),
-			  'LEFT'            => array( 115,   -1,    1,    0 ),
-			  'RIGHT'           => array( 116,   -1,    1,    0 ),
-			  'EXACT'           => array( 117,    2,    1,    0 ),
-			  'TRIM'            => array( 118,    1,    1,    0 ),
-			  'REPLACE'         => array( 119,    4,    1,    0 ),
-			  'SUBSTITUTE'      => array( 120,   -1,    1,    0 ),
-			  'CODE'            => array( 121,    1,    1,    0 ),
-			  'FIND'            => array( 124,   -1,    1,    0 ),
-			  'CELL'            => array( 125,   -1,    0,    1 ),
-			  'ISERR'           => array( 126,    1,    1,    0 ),
-			  'ISTEXT'          => array( 127,    1,    1,    0 ),
-			  'ISNUMBER'        => array( 128,    1,    1,    0 ),
-			  'ISBLANK'         => array( 129,    1,    1,    0 ),
-			  'T'               => array( 130,    1,    0,    0 ),
-			  'N'               => array( 131,    1,    0,    0 ),
-			  'DATEVALUE'       => array( 140,    1,    1,    0 ),
-			  'TIMEVALUE'       => array( 141,    1,    1,    0 ),
-			  'SLN'             => array( 142,    3,    1,    0 ),
-			  'SYD'             => array( 143,    4,    1,    0 ),
-			  'DDB'             => array( 144,   -1,    1,    0 ),
-			  'INDIRECT'        => array( 148,   -1,    1,    1 ),
-			  'CALL'            => array( 150,   -1,    1,    0 ),
-			  'CLEAN'           => array( 162,    1,    1,    0 ),
-			  'MDETERM'         => array( 163,    1,    2,    0 ),
-			  'MINVERSE'        => array( 164,    1,    2,    0 ),
-			  'MMULT'           => array( 165,    2,    2,    0 ),
-			  'IPMT'            => array( 167,   -1,    1,    0 ),
-			  'PPMT'            => array( 168,   -1,    1,    0 ),
-			  'COUNTA'          => array( 169,   -1,    0,    0 ),
-			  'PRODUCT'         => array( 183,   -1,    0,    0 ),
-			  'FACT'            => array( 184,    1,    1,    0 ),
-			  'DPRODUCT'        => array( 189,    3,    0,    0 ),
-			  'ISNONTEXT'       => array( 190,    1,    1,    0 ),
-			  'STDEVP'          => array( 193,   -1,    0,    0 ),
-			  'VARP'            => array( 194,   -1,    0,    0 ),
-			  'DSTDEVP'         => array( 195,    3,    0,    0 ),
-			  'DVARP'           => array( 196,    3,    0,    0 ),
-			  'TRUNC'           => array( 197,   -1,    1,    0 ),
-			  'ISLOGICAL'       => array( 198,    1,    1,    0 ),
-			  'DCOUNTA'         => array( 199,    3,    0,    0 ),
-			  'USDOLLAR'        => array( 204,   -1,    1,    0 ),
-			  'FINDB'           => array( 205,   -1,    1,    0 ),
-			  'SEARCHB'         => array( 206,   -1,    1,    0 ),
-			  'REPLACEB'        => array( 207,    4,    1,    0 ),
-			  'LEFTB'           => array( 208,   -1,    1,    0 ),
-			  'RIGHTB'          => array( 209,   -1,    1,    0 ),
-			  'MIDB'            => array( 210,    3,    1,    0 ),
-			  'LENB'            => array( 211,    1,    1,    0 ),
-			  'ROUNDUP'         => array( 212,    2,    1,    0 ),
-			  'ROUNDDOWN'       => array( 213,    2,    1,    0 ),
-			  'ASC'             => array( 214,    1,    1,    0 ),
-			  'DBCS'            => array( 215,    1,    1,    0 ),
-			  'RANK'            => array( 216,   -1,    0,    0 ),
-			  'ADDRESS'         => array( 219,   -1,    1,    0 ),
-			  'DAYS360'         => array( 220,   -1,    1,    0 ),
-			  'TODAY'           => array( 221,    0,    1,    1 ),
-			  'VDB'             => array( 222,   -1,    1,    0 ),
-			  'MEDIAN'          => array( 227,   -1,    0,    0 ),
-			  'SUMPRODUCT'      => array( 228,   -1,    2,    0 ),
-			  'SINH'            => array( 229,    1,    1,    0 ),
-			  'COSH'            => array( 230,    1,    1,    0 ),
-			  'TANH'            => array( 231,    1,    1,    0 ),
-			  'ASINH'           => array( 232,    1,    1,    0 ),
-			  'ACOSH'           => array( 233,    1,    1,    0 ),
-			  'ATANH'           => array( 234,    1,    1,    0 ),
-			  'DGET'            => array( 235,    3,    0,    0 ),
-			  'INFO'            => array( 244,    1,    1,    1 ),
-			  'DB'              => array( 247,   -1,    1,    0 ),
-			  'FREQUENCY'       => array( 252,    2,    0,    0 ),
-			  'ERROR.TYPE'      => array( 261,    1,    1,    0 ),
-			  'REGISTER.ID'     => array( 267,   -1,    1,    0 ),
-			  'AVEDEV'          => array( 269,   -1,    0,    0 ),
-			  'BETADIST'        => array( 270,   -1,    1,    0 ),
-			  'GAMMALN'         => array( 271,    1,    1,    0 ),
-			  'BETAINV'         => array( 272,   -1,    1,    0 ),
-			  'BINOMDIST'       => array( 273,    4,    1,    0 ),
-			  'CHIDIST'         => array( 274,    2,    1,    0 ),
-			  'CHIINV'          => array( 275,    2,    1,    0 ),
-			  'COMBIN'          => array( 276,    2,    1,    0 ),
-			  'CONFIDENCE'      => array( 277,    3,    1,    0 ),
-			  'CRITBINOM'       => array( 278,    3,    1,    0 ),
-			  'EVEN'            => array( 279,    1,    1,    0 ),
-			  'EXPONDIST'       => array( 280,    3,    1,    0 ),
-			  'FDIST'           => array( 281,    3,    1,    0 ),
-			  'FINV'            => array( 282,    3,    1,    0 ),
-			  'FISHER'          => array( 283,    1,    1,    0 ),
-			  'FISHERINV'       => array( 284,    1,    1,    0 ),
-			  'FLOOR'           => array( 285,    2,    1,    0 ),
-			  'GAMMADIST'       => array( 286,    4,    1,    0 ),
-			  'GAMMAINV'        => array( 287,    3,    1,    0 ),
-			  'CEILING'         => array( 288,    2,    1,    0 ),
-			  'HYPGEOMDIST'     => array( 289,    4,    1,    0 ),
-			  'LOGNORMDIST'     => array( 290,    3,    1,    0 ),
-			  'LOGINV'          => array( 291,    3,    1,    0 ),
-			  'NEGBINOMDIST'    => array( 292,    3,    1,    0 ),
-			  'NORMDIST'        => array( 293,    4,    1,    0 ),
-			  'NORMSDIST'       => array( 294,    1,    1,    0 ),
-			  'NORMINV'         => array( 295,    3,    1,    0 ),
-			  'NORMSINV'        => array( 296,    1,    1,    0 ),
-			  'STANDARDIZE'     => array( 297,    3,    1,    0 ),
-			  'ODD'             => array( 298,    1,    1,    0 ),
-			  'PERMUT'          => array( 299,    2,    1,    0 ),
-			  'POISSON'         => array( 300,    3,    1,    0 ),
-			  'TDIST'           => array( 301,    3,    1,    0 ),
-			  'WEIBULL'         => array( 302,    4,    1,    0 ),
-			  'SUMXMY2'         => array( 303,    2,    2,    0 ),
-			  'SUMX2MY2'        => array( 304,    2,    2,    0 ),
-			  'SUMX2PY2'        => array( 305,    2,    2,    0 ),
-			  'CHITEST'         => array( 306,    2,    2,    0 ),
-			  'CORREL'          => array( 307,    2,    2,    0 ),
-			  'COVAR'           => array( 308,    2,    2,    0 ),
-			  'FORECAST'        => array( 309,    3,    2,    0 ),
-			  'FTEST'           => array( 310,    2,    2,    0 ),
-			  'INTERCEPT'       => array( 311,    2,    2,    0 ),
-			  'PEARSON'         => array( 312,    2,    2,    0 ),
-			  'RSQ'             => array( 313,    2,    2,    0 ),
-			  'STEYX'           => array( 314,    2,    2,    0 ),
-			  'SLOPE'           => array( 315,    2,    2,    0 ),
-			  'TTEST'           => array( 316,    4,    2,    0 ),
-			  'PROB'            => array( 317,   -1,    2,    0 ),
-			  'DEVSQ'           => array( 318,   -1,    0,    0 ),
-			  'GEOMEAN'         => array( 319,   -1,    0,    0 ),
-			  'HARMEAN'         => array( 320,   -1,    0,    0 ),
-			  'SUMSQ'           => array( 321,   -1,    0,    0 ),
-			  'KURT'            => array( 322,   -1,    0,    0 ),
-			  'SKEW'            => array( 323,   -1,    0,    0 ),
-			  'ZTEST'           => array( 324,   -1,    0,    0 ),
-			  'LARGE'           => array( 325,    2,    0,    0 ),
-			  'SMALL'           => array( 326,    2,    0,    0 ),
-			  'QUARTILE'        => array( 327,    2,    0,    0 ),
-			  'PERCENTILE'      => array( 328,    2,    0,    0 ),
-			  'PERCENTRANK'     => array( 329,   -1,    0,    0 ),
-			  'MODE'            => array( 330,   -1,    2,    0 ),
-			  'TRIMMEAN'        => array( 331,    2,    0,    0 ),
-			  'TINV'            => array( 332,    2,    1,    0 ),
-			  'CONCATENATE'     => array( 336,   -1,    1,    0 ),
-			  'POWER'           => array( 337,    2,    1,    0 ),
-			  'RADIANS'         => array( 342,    1,    1,    0 ),
-			  'DEGREES'         => array( 343,    1,    1,    0 ),
-			  'SUBTOTAL'        => array( 344,   -1,    0,    0 ),
-			  'SUMIF'           => array( 345,   -1,    0,    0 ),
-			  'COUNTIF'         => array( 346,    2,    0,    0 ),
-			  'COUNTBLANK'      => array( 347,    1,    0,    0 ),
-			  'ISPMT'           => array( 350,    4,    1,    0 ),
-			  'DATEDIF'         => array( 351,    3,    1,    0 ),
-			  'DATESTRING'      => array( 352,    1,    1,    0 ),
-			  'NUMBERSTRING'    => array( 353,    2,    1,    0 ),
-			  'ROMAN'           => array( 354,   -1,    1,    0 ),
-			  'GETPIVOTDATA'    => array( 358,   -1,    0,    0 ),
-			  'HYPERLINK'       => array( 359,   -1,    1,    0 ),
-			  'PHONETIC'        => array( 360,    1,    0,    0 ),
-			  'AVERAGEA'        => array( 361,   -1,    0,    0 ),
-			  'MAXA'            => array( 362,   -1,    0,    0 ),
-			  'MINA'            => array( 363,   -1,    0,    0 ),
-			  'STDEVPA'         => array( 364,   -1,    0,    0 ),
-			  'VARPA'           => array( 365,   -1,    0,    0 ),
-			  'STDEVA'          => array( 366,   -1,    0,    0 ),
-			  'VARA'            => array( 367,   -1,    0,    0 ),
-			  'BAHTTEXT'        => array( 368,    1,    0,    0 ),
-			  );
-	}
-
-	/**
-	 * Convert a token to the proper ptg value.
-	 *
-	 * @access private
-	 * @param mixed $token The token to convert.
-	 * @return mixed the converted token on success
-	 */
-	function _convert($token)
-	{
-		if (preg_match("/\"([^\"]|\"\"){0,255}\"/", $token)) {
-			return $this->_convertString($token);
-
-		} elseif (is_numeric($token)) {
-			return $this->_convertNumber($token);
-
-		// match references like A1 or $A$1
-		} elseif (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/',$token)) {
-			return $this->_convertRef2d($token);
-
-		// match external references like Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1
-		} elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u",$token)) {
-			return $this->_convertRef3d($token);
-
-		// match external references like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1
-		} elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?(\d+)$/u",$token)) {
-			return $this->_convertRef3d($token);
-
-		// match ranges like A1:B2 or $A$1:$B$2
-		} elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/', $token)) {
-			return $this->_convertRange2d($token);
-
-		// match external ranges like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
-		} elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u",$token)) {
-			return $this->_convertRange3d($token);
-
-		// match external ranges like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
-		} elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)\:\\$?([A-Ia-i]?[A-Za-z])?\\$?(\d+)$/u",$token)) {
-			return $this->_convertRange3d($token);
-
-		// operators (including parentheses)
-		} elseif (isset($this->ptg[$token])) {
-			return pack("C", $this->ptg[$token]);
-
-        // match error codes
-		} elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A') {
-		    return $this->_convertError($token);
-
-		// commented so argument number can be processed correctly. See toReversePolish().
-		/*elseif (preg_match("/[A-Z0-9\xc0-\xdc\.]+/",$token))
-		{
-			return($this->_convertFunction($token,$this->_func_args));
-		}*/
-
-		// if it's an argument, ignore the token (the argument remains)
-		} elseif ($token == 'arg') {
-			return '';
-		}
-
-		// TODO: use real error codes
-		throw new Exception("Unknown token $token");
-	}
-
-	/**
-	 * Convert a number token to ptgInt or ptgNum
-	 *
-	 * @access private
-	 * @param mixed $num an integer or double for conversion to its ptg value
-	 */
-	function _convertNumber($num)
-	{
-		// Integer in the range 0..2**16-1
-		if ((preg_match("/^\d+$/", $num)) and ($num <= 65535)) {
-			return pack("Cv", $this->ptg['ptgInt'], $num);
-		} else { // A float
-			if (PHPExcel_Writer_Excel5_BIFFwriter::getByteOrder()) { // if it's Big Endian
-				$num = strrev($num);
-			}
-			return pack("Cd", $this->ptg['ptgNum'], $num);
-		}
-	}
-
-	/**
-	 * Convert a string token to ptgStr
-	 *
-	 * @access private
-	 * @param string $string A string for conversion to its ptg value.
-	 * @return mixed the converted token on success
-	 */
-	function _convertString($string)
-	{
-		// chop away beggining and ending quotes
-		$string = substr($string, 1, strlen($string) - 2);
-		if (strlen($string) > 255) {
-			throw new Exception("String is too long");
-		}
-
-		return pack('C', $this->ptg['ptgStr']) . PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($string);
-	}
-
-	/**
-	 * Convert a function to a ptgFunc or ptgFuncVarV depending on the number of
-	 * args that it takes.
-	 *
-	 * @access private
-	 * @param string  $token    The name of the function for convertion to ptg value.
-	 * @param integer $num_args The number of arguments the function receives.
-	 * @return string The packed ptg for the function
-	 */
-	function _convertFunction($token, $num_args)
-	{
-		$args     = $this->_functions[$token][1];
-//		$volatile = $this->_functions[$token][3];
-
-		// Fixed number of args eg. TIME($i,$j,$k).
-		if ($args >= 0) {
-			return pack("Cv", $this->ptg['ptgFuncV'], $this->_functions[$token][0]);
-		}
-		// Variable number of args eg. SUM($i,$j,$k, ..).
-		if ($args == -1) {
-			return pack("CCv", $this->ptg['ptgFuncVarV'], $num_args, $this->_functions[$token][0]);
-		}
-	}
-
-	/**
-	 * Convert an Excel range such as A1:D4 to a ptgRefV.
-	 *
-	 * @access private
-	 * @param string	$range	An Excel range in the A1:A2
-	 * @param int		$class
-	 */
-	function _convertRange2d($range, $class=0)
-	{
-
-		// TODO: possible class value 0,1,2 check Formula.pm
-		// Split the range into 2 cell refs
-		if (preg_match('/^(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)\:(\$)?([A-Ia-i]?[A-Za-z])(\$)?(\d+)$/', $range)) {
-			list($cell1, $cell2) = explode(':', $range);
-		} else {
-			// TODO: use real error codes
-			throw new Exception("Unknown range separator");
-		}
-
-		// Convert the cell references
-		list($row1, $col1) = $this->_cellToPackedRowcol($cell1);
-		list($row2, $col2) = $this->_cellToPackedRowcol($cell2);
-
-		// The ptg value depends on the class of the ptg.
-		if ($class == 0) {
-			$ptgArea = pack("C", $this->ptg['ptgArea']);
-		} elseif ($class == 1) {
-			$ptgArea = pack("C", $this->ptg['ptgAreaV']);
-		} elseif ($class == 2) {
-			$ptgArea = pack("C", $this->ptg['ptgAreaA']);
-		} else {
-			// TODO: use real error codes
-			throw new Exception("Unknown class $class");
-		}
-		return $ptgArea . $row1 . $row2 . $col1. $col2;
-	}
-
-	/**
-	 * Convert an Excel 3d range such as "Sheet1!A1:D4" or "Sheet1:Sheet2!A1:D4" to
-	 * a ptgArea3d.
-	 *
-	 * @access private
-	 * @param string $token An Excel range in the Sheet1!A1:A2 format.
-	 * @return mixed The packed ptgArea3d token on success.
-	 */
-	function _convertRange3d($token)
-	{
-//		$class = 0; // formulas like Sheet1!$A$1:$A$2 in list type data validation need this class (0x3B)
-
-		// Split the ref at the ! symbol
-		list($ext_ref, $range) = explode('!', $token);
-
-		// Convert the external reference part (different for BIFF8)
-		$ext_ref = $this->_getRefIndex($ext_ref);
-
-		// Split the range into 2 cell refs
-		list($cell1, $cell2) = explode(':', $range);
-
-		// Convert the cell references
-		if (preg_match("/^(\\$)?[A-Ia-i]?[A-Za-z](\\$)?(\d+)$/", $cell1)) {
-			list($row1, $col1) = $this->_cellToPackedRowcol($cell1);
-			list($row2, $col2) = $this->_cellToPackedRowcol($cell2);
-		} else { // It's a rows range (like 26:27)
-			 list($row1, $col1, $row2, $col2) = $this->_rangeToPackedRange($cell1.':'.$cell2);
-		}
-
-		// The ptg value depends on the class of the ptg.
-//		if ($class == 0) {
-			$ptgArea = pack("C", $this->ptg['ptgArea3d']);
-//		} elseif ($class == 1) {
-//			$ptgArea = pack("C", $this->ptg['ptgArea3dV']);
-//		} elseif ($class == 2) {
-//			$ptgArea = pack("C", $this->ptg['ptgArea3dA']);
-//		} else {
-//			throw new Exception("Unknown class $class");
-//		}
-
-		return $ptgArea . $ext_ref . $row1 . $row2 . $col1. $col2;
-	}
-
-	/**
-	 * Convert an Excel reference such as A1, $B2, C$3 or $D$4 to a ptgRefV.
-	 *
-	 * @access private
-	 * @param string $cell An Excel cell reference
-	 * @return string The cell in packed() format with the corresponding ptg
-	 */
-	function _convertRef2d($cell)
-	{
-//		$class = 2; // as far as I know, this is magick.
-
-		// Convert the cell reference
-		$cell_array = $this->_cellToPackedRowcol($cell);
-		list($row, $col) = $cell_array;
-
-		// The ptg value depends on the class of the ptg.
-//		if ($class == 0) {
-//			$ptgRef = pack("C", $this->ptg['ptgRef']);
-//		} elseif ($class == 1) {
-//			$ptgRef = pack("C", $this->ptg['ptgRefV']);
-//		} elseif ($class == 2) {
-			$ptgRef = pack("C", $this->ptg['ptgRefA']);
-//		} else {
-//			// TODO: use real error codes
-//			throw new Exception("Unknown class $class");
-//		}
-		return $ptgRef.$row.$col;
-	}
-
-	/**
-	 * Convert an Excel 3d reference such as "Sheet1!A1" or "Sheet1:Sheet2!A1" to a
-	 * ptgRef3d.
-	 *
-	 * @access private
-	 * @param string $cell An Excel cell reference
-	 * @return mixed The packed ptgRef3d token on success.
-	 */
-	function _convertRef3d($cell)
-	{
-//		$class = 2; // as far as I know, this is magick.
-
-		// Split the ref at the ! symbol
-		list($ext_ref, $cell) = explode('!', $cell);
-
-		// Convert the external reference part (different for BIFF8)
-		$ext_ref = $this->_getRefIndex($ext_ref);
-
-		// Convert the cell reference part
-		list($row, $col) = $this->_cellToPackedRowcol($cell);
-
-		// The ptg value depends on the class of the ptg.
-//		if ($class == 0) {
-//			$ptgRef = pack("C", $this->ptg['ptgRef3d']);
-//		} elseif ($class == 1) {
-//			$ptgRef = pack("C", $this->ptg['ptgRef3dV']);
-//		} elseif ($class == 2) {
-			$ptgRef = pack("C", $this->ptg['ptgRef3dA']);
-//		} else {
-//			throw new Exception("Unknown class $class");
-//		}
-
-		return $ptgRef . $ext_ref. $row . $col;
-	}
-
-    /**
-     * Convert an error code to a ptgErr
-     *
-     * @access	private
-	 * @param	string	$errorCode	The error code for conversion to its ptg value
-     * @return	string				The error code ptgErr
-     */
-    function _convertError($errorCode)
-    {
-		switch ($errorCode) {
-			case '#NULL!':	return pack("C", 0x00);
-			case '#DIV/0!':	return pack("C", 0x07);
-			case '#VALUE!':	return pack("C", 0x0F);
-			case '#REF!':	return pack("C", 0x17);
-			case '#NAME?':	return pack("C", 0x1D);
-			case '#NUM!':	return pack("C", 0x24);
-			case '#N/A':	return pack("C", 0x2A);
-		}
-		return pack("C", 0xFF);
-    }
-
-	/**
-	 * Convert the sheet name part of an external reference, for example "Sheet1" or
-	 * "Sheet1:Sheet2", to a packed structure.
-	 *
-	 * @access	private
-	 * @param	string	$ext_ref	The name of the external reference
-	 * @return	string				The reference index in packed() format
-	 */
-	function _packExtRef($ext_ref)
-	{
-		$ext_ref = preg_replace("/^'/", '', $ext_ref); // Remove leading  ' if any.
-		$ext_ref = preg_replace("/'$/", '', $ext_ref); // Remove trailing ' if any.
-
-		// Check if there is a sheet range eg., Sheet1:Sheet2.
-		if (preg_match("/:/", $ext_ref)) {
-			list($sheet_name1, $sheet_name2) = explode(':', $ext_ref);
-
-			$sheet1 = $this->_getSheetIndex($sheet_name1);
-			if ($sheet1 == -1) {
-				throw new Exception("Unknown sheet name $sheet_name1 in formula");
-			}
-			$sheet2 = $this->_getSheetIndex($sheet_name2);
-			if ($sheet2 == -1) {
-				throw new Exception("Unknown sheet name $sheet_name2 in formula");
-			}
-
-			// Reverse max and min sheet numbers if necessary
-			if ($sheet1 > $sheet2) {
-				list($sheet1, $sheet2) = array($sheet2, $sheet1);
-			}
-		} else { // Single sheet name only.
-			$sheet1 = $this->_getSheetIndex($ext_ref);
-			if ($sheet1 == -1) {
-				throw new Exception("Unknown sheet name $ext_ref in formula");
-			}
-			$sheet2 = $sheet1;
-		}
-
-		// References are stored relative to 0xFFFF.
-		$offset = -1 - $sheet1;
-
-		return pack('vdvv', $offset, 0x00, $sheet1, $sheet2);
-	}
-
-	/**
-	 * Look up the REF index that corresponds to an external sheet name
-	 * (or range). If it doesn't exist yet add it to the workbook's references
-	 * array. It assumes all sheet names given must exist.
-	 *
-	 * @access private
-	 * @param string $ext_ref The name of the external reference
-	 * @return mixed The reference index in packed() format on success
-	 */
-	function _getRefIndex($ext_ref)
-	{
-		$ext_ref = preg_replace("/^'/", '', $ext_ref); // Remove leading  ' if any.
-		$ext_ref = preg_replace("/'$/", '', $ext_ref); // Remove trailing ' if any.
-		$ext_ref = str_replace('\'\'', '\'', $ext_ref); // Replace escaped '' with '
-
-		// Check if there is a sheet range eg., Sheet1:Sheet2.
-		if (preg_match("/:/", $ext_ref)) {
-			list($sheet_name1, $sheet_name2) = explode(':', $ext_ref);
-
-			$sheet1 = $this->_getSheetIndex($sheet_name1);
-			if ($sheet1 == -1) {
-				throw new Exception("Unknown sheet name $sheet_name1 in formula");
-			}
-			$sheet2 = $this->_getSheetIndex($sheet_name2);
-			if ($sheet2 == -1) {
-				throw new Exception("Unknown sheet name $sheet_name2 in formula");
-			}
-
-			// Reverse max and min sheet numbers if necessary
-			if ($sheet1 > $sheet2) {
-				list($sheet1, $sheet2) = array($sheet2, $sheet1);
-			}
-		} else { // Single sheet name only.
-			$sheet1 = $this->_getSheetIndex($ext_ref);
-			if ($sheet1 == -1) {
-				throw new Exception("Unknown sheet name $ext_ref in formula");
-			}
-			$sheet2 = $sheet1;
-		}
-
-		// assume all references belong to this document
-		$supbook_index = 0x00;
-		$ref = pack('vvv', $supbook_index, $sheet1, $sheet2);
-		$total_references = count($this->_references);
-		$index = -1;
-		for ($i = 0; $i < $total_references; ++$i) {
-			if ($ref == $this->_references[$i]) {
-				$index = $i;
-				break;
-			}
-		}
-		// if REF was not found add it to references array
-		if ($index == -1) {
-			$this->_references[$total_references] = $ref;
-			$index = $total_references;
-		}
-
-		return pack('v', $index);
-	}
-
-	/**
-	 * Look up the index that corresponds to an external sheet name. The hash of
-	 * sheet names is updated by the addworksheet() method of the
-	 * PHPExcel_Writer_Excel5_Workbook class.
-	 *
-	 * @access	private
-	 * @param	string	$sheet_name		Sheet name
-	 * @return	integer					The sheet index, -1 if the sheet was not found
-	 */
-	function _getSheetIndex($sheet_name)
-	{
-		if (!isset($this->_ext_sheets[$sheet_name])) {
-			return -1;
-		} else {
-			return $this->_ext_sheets[$sheet_name];
-		}
-	}
-
-	/**
-	 * This method is used to update the array of sheet names. It is
-	 * called by the addWorksheet() method of the
-	 * PHPExcel_Writer_Excel5_Workbook class.
-	 *
-	 * @access public
-	 * @see PHPExcel_Writer_Excel5_Workbook::addWorksheet()
-	 * @param string  $name  The name of the worksheet being added
-	 * @param integer $index The index of the worksheet being added
-	 */
-	function setExtSheet($name, $index)
-	{
-		$this->_ext_sheets[$name] = $index;
-	}
-
-	/**
-	 * pack() row and column into the required 3 or 4 byte format.
-	 *
-	 * @access private
-	 * @param string $cell The Excel cell reference to be packed
-	 * @return array Array containing the row and column in packed() format
-	 */
-	function _cellToPackedRowcol($cell)
-	{
-		$cell = strtoupper($cell);
-		list($row, $col, $row_rel, $col_rel) = $this->_cellToRowcol($cell);
-		if ($col >= 256) {
-			throw new Exception("Column in: $cell greater than 255");
-		}
-		// FIXME: change for BIFF8
-		if ($row >= 16384) {
-			throw new Exception("Row in: $cell greater than 16384 ");
-		}
-
-		// Set the high bits to indicate if row or col are relative.
-		$col |= $col_rel << 14;
-		$col |= $row_rel << 15;
-		$col = pack('v', $col);
-
-		$row = pack('v', $row);
-
-		return array($row, $col);
-	}
-
-	/**
-	 * pack() row range into the required 3 or 4 byte format.
-	 * Just using maximum col/rows, which is probably not the correct solution
-	 *
-	 * @access private
-	 * @param string $range The Excel range to be packed
-	 * @return array Array containing (row1,col1,row2,col2) in packed() format
-	 */
-	function _rangeToPackedRange($range)
-	{
-		preg_match('/(\$)?(\d+)\:(\$)?(\d+)/', $range, $match);
-		// return absolute rows if there is a $ in the ref
-		$row1_rel = empty($match[1]) ? 1 : 0;
-		$row1     = $match[2];
-		$row2_rel = empty($match[3]) ? 1 : 0;
-		$row2     = $match[4];
-		// Convert 1-index to zero-index
-		--$row1;
-		--$row2;
-		// Trick poor inocent Excel
-		$col1 = 0;
-		$col2 = 16383; // FIXME: maximum possible value for Excel 5 (change this!!!)
-
-		// FIXME: this changes for BIFF8
-		if (($row1 >= 16384) or ($row2 >= 16384)) {
-			throw new Exception("Row in: $range greater than 16384 ");
-		}
-
-		// Set the high bits to indicate if rows are relative.
-		$col1 |= $row1_rel << 15;
-		$col2 |= $row2_rel << 15;
-		$col1 = pack('v', $col1);
-		$col2 = pack('v', $col2);
-
-		$row1 = pack('v', $row1);
-		$row2 = pack('v', $row2);
-
-		return array($row1, $col1, $row2, $col2);
-	}
-
-	/**
-	 * Convert an Excel cell reference such as A1 or $B2 or C$3 or $D$4 to a zero
-	 * indexed row and column number. Also returns two (0,1) values to indicate
-	 * whether the row or column are relative references.
-	 *
-	 * @access private
-	 * @param string $cell The Excel cell reference in A1 format.
-	 * @return array
-	 */
-	function _cellToRowcol($cell)
-	{
-		preg_match('/(\$)?([A-I]?[A-Z])(\$)?(\d+)/',$cell,$match);
-		// return absolute column if there is a $ in the ref
-		$col_rel = empty($match[1]) ? 1 : 0;
-		$col_ref = $match[2];
-		$row_rel = empty($match[3]) ? 1 : 0;
-		$row     = $match[4];
-
-		// Convert base26 column string to a number.
-		$expn   = strlen($col_ref) - 1;
-		$col    = 0;
-		$col_ref_length = strlen($col_ref);
-		for ($i = 0; $i < $col_ref_length; ++$i) {
-			$col += (ord($col_ref{$i}) - 64) * pow(26, $expn);
-			--$expn;
-		}
-
-		// Convert 1-index to zero-index
-		--$row;
-		--$col;
-
-		return array($row, $col, $row_rel, $col_rel);
-	}
-
-	/**
-	 * Advance to the next valid token.
-	 *
-	 * @access private
-	 */
-	function _advance()
-	{
-		$i = $this->_current_char;
-		$formula_length = strlen($this->_formula);
-		// eat up white spaces
-		if ($i < $formula_length) {
-			while ($this->_formula{$i} == " ") {
-				++$i;
-			}
-
-			if ($i < ($formula_length - 1)) {
-				$this->_lookahead = $this->_formula{$i+1};
-			}
-			$token = '';
-		}
-
-		while ($i < $formula_length) {
-			$token .= $this->_formula{$i};
-
-			if ($i < ($formula_length - 1)) {
-				$this->_lookahead = $this->_formula{$i+1};
-			} else {
-				$this->_lookahead = '';
-			}
-
-			if ($this->_match($token) != '') {
-				//if ($i < strlen($this->_formula) - 1) {
-				//    $this->_lookahead = $this->_formula{$i+1};
-				//}
-				$this->_current_char = $i + 1;
-				$this->_current_token = $token;
-				return 1;
-			}
-
-			if ($i < ($formula_length - 2)) {
-				$this->_lookahead = $this->_formula{$i+2};
-			} else { // if we run out of characters _lookahead becomes empty
-				$this->_lookahead = '';
-			}
-			++$i;
-		}
-		//die("Lexical error ".$this->_current_char);
-	}
-
-	/**
-	 * Checks if it's a valid token.
-	 *
-	 * @access private
-	 * @param mixed $token The token to check.
-	 * @return mixed       The checked token or false on failure
-	 */
-	function _match($token)
-	{
-		switch($token) {
-			case "+":
-			case "-":
-			case "*":
-			case "/":
-			case "(":
-			case ")":
-			case ",":
-			case ";":
-			case ">=":
-			case "<=":
-			case "=":
-			case "<>":
-			case "^":
-			case "&":
-			case "%":
-				return $token;
-				break;
-			case ">":
-				if ($this->_lookahead == '=') { // it's a GE token
-					break;
-				}
-				return $token;
-				break;
-			case "<":
-				// it's a LE or a NE token
-				if (($this->_lookahead == '=') or ($this->_lookahead == '>')) {
-					break;
-				}
-				return $token;
-				break;
-			default:
-				// if it's a reference A1 or $A$1 or $A1 or A$1
-				if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$token) and
-				   !preg_match("/[0-9]/",$this->_lookahead) and
-				   ($this->_lookahead != ':') and ($this->_lookahead != '.') and
-				   ($this->_lookahead != '!'))
-				{
-					return $token;
-				}
-				// If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
-				elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead) and
-					   ($this->_lookahead != ':') and ($this->_lookahead != '.'))
-				{
-					return $token;
-				}
-				// If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
-				elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead) and
-					   ($this->_lookahead != ':') and ($this->_lookahead != '.'))
-				{
-					return $token;
-				}
-				// if it's a range A1:A2 or $A$1:$A$2
-				elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/', $token) and
-					   !preg_match("/[0-9]/",$this->_lookahead))
-				{
-					return $token;
-				}
-				// If it's an external range like Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2
-				elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead))
-				{
-					return $token;
-				}
-				// If it's an external range like 'Sheet1'!A1:B2 or 'Sheet1:Sheet2'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1:Sheet2'!$A$1:$B$2
-				elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$token) and
-					   !preg_match("/[0-9]/",$this->_lookahead))
-				{
-					return $token;
-				}
-				// If it's a number (check that it's not a sheet name or range)
-				elseif (is_numeric($token) and
-						(!is_numeric($token.$this->_lookahead) or ($this->_lookahead == '')) and
-						($this->_lookahead != '!') and ($this->_lookahead != ':'))
-				{
-					return $token;
-				}
-				// If it's a string (of maximum 255 characters)
-				elseif (preg_match("/\"([^\"]|\"\"){0,255}\"/",$token) and $this->_lookahead != '"' and (substr_count($token, '"')%2 == 0))
-				{
-					return $token;
-				}
-			    // If it's an error code
-			    elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A')
-			    {
-			        return $token;
-			    }
-				// if it's a function call
-				elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$token) and ($this->_lookahead == "("))
-				{
-					return $token;
-				}
-				//	It's an argument of some description (e.g. a named range),
-				//		precise nature yet to be determined
-				elseif(substr($token,-1) == ')') {
-					return $token;
-				}
-				return '';
-		}
-	}
-
-	/**
-	 * The parsing method. It parses a formula.
-	 *
-	 * @access public
-	 * @param string $formula The formula to parse, without the initial equal
-	 *                        sign (=).
-	 * @return mixed true on success
-	 */
-	function parse($formula)
-	{
-		$this->_current_char = 0;
-		$this->_formula      = $formula;
-		$this->_lookahead    = isset($formula{1}) ? $formula{1} : '';
-		$this->_advance();
-		$this->_parse_tree   = $this->_condition();
-		return true;
-	}
-
-	/**
-	 * It parses a condition. It assumes the following rule:
-	 * Cond -> Expr [(">" | "<") Expr]
-	 *
-	 * @access private
-	 * @return mixed The parsed ptg'd tree on success
-	 */
-	function _condition()
-	{
-		$result = $this->_expression();
-		if ($this->_current_token == "<") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgLT', $result, $result2);
-		} elseif ($this->_current_token == ">") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgGT', $result, $result2);
-		} elseif ($this->_current_token == "<=") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgLE', $result, $result2);
-		} elseif ($this->_current_token == ">=") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgGE', $result, $result2);
-		} elseif ($this->_current_token == "=") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgEQ', $result, $result2);
-		} elseif ($this->_current_token == "<>") {
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgNE', $result, $result2);
-		} elseif ($this->_current_token == "&") {
-		    $this->_advance();
-		    $result2 = $this->_expression();
-		    $result = $this->_createTree('ptgConcat', $result, $result2);
-		}
-		return $result;
-	}
-
-	/**
-	 * It parses a expression. It assumes the following rule:
-	 * Expr -> Term [("+" | "-") Term]
-	 *      -> "string"
-	 *      -> "-" Term : Negative value
-	 *      -> "+" Term : Positive value
-	 *      -> Error code
-	 *
-	 * @access private
-	 * @return mixed The parsed ptg'd tree on success
-	 */
-	function _expression()
-	{
-		// If it's a string return a string node
-		if (preg_match("/\"([^\"]|\"\"){0,255}\"/", $this->_current_token)) {
-			$tmp = str_replace('""', '"', $this->_current_token);
-			if (($tmp == '"') || ($tmp == '')) $tmp = '""';	//	Trap for "" that has been used for an empty string
-			$result = $this->_createTree($tmp, '', '');
-			$this->_advance();
-			return $result;
-        // If it's an error code
-        } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $this->_current_token) or $this->_current_token == '#N/A'){
-		    $result = $this->_createTree($this->_current_token, 'ptgErr', '');
-		    $this->_advance();
-		    return $result;
-		// If it's a negative value
-        } elseif ($this->_current_token == "-") {
-			// catch "-" Term
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgUminus', $result2, '');
-			return $result;
-        // If it's a positive value
-		} elseif ($this->_current_token == "+") {
-			// catch "+" Term
-			$this->_advance();
-			$result2 = $this->_expression();
-			$result = $this->_createTree('ptgUplus', $result2, '');
-			return $result;
-		}
-		$result = $this->_term();
-		while (($this->_current_token == "+") or
-			   ($this->_current_token == "-") or
-			   ($this->_current_token == "^")) {
-		/**/
-			if ($this->_current_token == "+") {
-				$this->_advance();
-				$result2 = $this->_term();
-				$result = $this->_createTree('ptgAdd', $result, $result2);
-			} elseif ($this->_current_token == "-") {
-				$this->_advance();
-				$result2 = $this->_term();
-				$result = $this->_createTree('ptgSub', $result, $result2);
-			} else {
-				$this->_advance();
-				$result2 = $this->_term();
-				$result = $this->_createTree('ptgPower', $result, $result2);
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * This function just introduces a ptgParen element in the tree, so that Excel
-	 * doesn't get confused when working with a parenthesized formula afterwards.
-	 *
-	 * @access private
-	 * @see _fact()
-	 * @return array The parsed ptg'd tree
-	 */
-	function _parenthesizedExpression()
-	{
-		$result = $this->_createTree('ptgParen', $this->_expression(), '');
-		return $result;
-	}
-
-	/**
-	 * It parses a term. It assumes the following rule:
-	 * Term -> Fact [("*" | "/") Fact]
-	 *
-	 * @access private
-	 * @return mixed The parsed ptg'd tree on success
-	 */
-	function _term()
-	{
-		$result = $this->_fact();
-		while (($this->_current_token == "*") or
-			   ($this->_current_token == "/")) {
-		/**/
-			if ($this->_current_token == "*") {
-				$this->_advance();
-				$result2 = $this->_fact();
-				$result = $this->_createTree('ptgMul', $result, $result2);
-			} else {
-				$this->_advance();
-				$result2 = $this->_fact();
-				$result = $this->_createTree('ptgDiv', $result, $result2);
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * It parses a factor. It assumes the following rule:
-	 * Fact -> ( Expr )
-	 *       | CellRef
-	 *       | CellRange
-	 *       | Number
-	 *       | Function
-	 *
-	 * @access private
-	 * @return mixed The parsed ptg'd tree on success
-	 */
-	function _fact()
-	{
-		if ($this->_current_token == "(") {
-			$this->_advance();         // eat the "("
-			$result = $this->_parenthesizedExpression();
-			if ($this->_current_token != ")") {
-				throw new Exception("')' token expected.");
-			}
-			$this->_advance();         // eat the ")"
-			return $result;
-		}
-		// if it's a reference
-		if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$this->_current_token))
-		{
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1 or Sheet1!$A$1 or Sheet1:Sheet2!$A$1)
-		elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$this->_current_token))
-		{
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1 or 'Sheet1'!$A$1 or 'Sheet1:Sheet2'!$A$1)
-		elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?[A-Ia-i]?[A-Za-z]\\$?[0-9]+$/u",$this->_current_token))
-		{
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// if it's a range A1:B2 or $A$1:$B$2
-		elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/',$this->_current_token) or
-				preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/',$this->_current_token))
-		{
-			// must be an error?
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// If it's an external range (Sheet1!A1:B2 or Sheet1:Sheet2!A1:B2 or Sheet1!$A$1:$B$2 or Sheet1:Sheet2!$A$1:$B$2)
-		elseif (preg_match("/^" . self::REGEX_SHEET_TITLE_UNQUOTED . "(\:" . self::REGEX_SHEET_TITLE_UNQUOTED . ")?\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$this->_current_token))
-		{
-			// must be an error?
-			//$result = $this->_current_token;
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// If it's an external range ('Sheet1'!A1:B2 or 'Sheet1'!A1:B2 or 'Sheet1'!$A$1:$B$2 or 'Sheet1'!$A$1:$B$2)
-		elseif (preg_match("/^'" . self::REGEX_SHEET_TITLE_QUOTED . "(\:" . self::REGEX_SHEET_TITLE_QUOTED . ")?'\!\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+:\\$?([A-Ia-i]?[A-Za-z])?\\$?[0-9]+$/u",$this->_current_token))
-		{
-			// must be an error?
-			//$result = $this->_current_token;
-			$result = $this->_createTree($this->_current_token, '', '');
-			$this->_advance();
-			return $result;
-		}
-		// If it's a number or a percent
-		elseif (is_numeric($this->_current_token))
-		{
-		    if($this->_lookahead == '%'){
-		        $result = $this->_createTree('ptgPercent', $this->_current_token, '');
-		    } else {
-		        $result = $this->_createTree($this->_current_token, '', '');
-		    }
-		    $this->_advance();
-		    return $result;
-		}
-		// if it's a function call
-		elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$this->_current_token))
-		{
-			$result = $this->_func();
-			return $result;
-		}
-		throw new Exception("Syntax error: ".$this->_current_token.
-								 ", lookahead: ".$this->_lookahead.
-								 ", current char: ".$this->_current_char);
-	}
-
-	/**
-	 * It parses a function call. It assumes the following rule:
-	 * Func -> ( Expr [,Expr]* )
-	 *
-	 * @access private
-	 * @return mixed The parsed ptg'd tree on success
-	 */
-	function _func()
-	{
-		$num_args = 0; // number of arguments received
-		$function = strtoupper($this->_current_token);
-		$result   = ''; // initialize result
-		$this->_advance();
-		$this->_advance();         // eat the "("
-		while ($this->_current_token != ')') {
-		/**/
-			if ($num_args > 0) {
-				if ($this->_current_token == "," or
-					$this->_current_token == ";")
-				{
-					$this->_advance();  // eat the "," or ";"
-				} else {
-					throw new Exception("Syntax error: comma expected in ".
-									  "function $function, arg #{$num_args}");
-				}
-				$result2 = $this->_condition();
-				$result = $this->_createTree('arg', $result, $result2);
-			} else { // first argument
-				$result2 = $this->_condition();
-				$result = $this->_createTree('arg', '', $result2);
-			}
-			++$num_args;
-		}
-		if (!isset($this->_functions[$function])) {
-			throw new Exception("Function $function() doesn't exist");
-		}
-		$args = $this->_functions[$function][1];
-		// If fixed number of args eg. TIME($i,$j,$k). Check that the number of args is valid.
-		if (($args >= 0) and ($args != $num_args)) {
-			throw new Exception("Incorrect number of arguments in function $function() ");
-		}
-
-		$result = $this->_createTree($function, $result, $num_args);
-		$this->_advance();         // eat the ")"
-		return $result;
-	}
-
-	/**
-	 * Creates a tree. In fact an array which may have one or two arrays (sub-trees)
-	 * as elements.
-	 *
-	 * @access private
-	 * @param mixed $value The value of this node.
-	 * @param mixed $left  The left array (sub-tree) or a final node.
-	 * @param mixed $right The right array (sub-tree) or a final node.
-	 * @return array A tree
-	 */
-	function _createTree($value, $left, $right)
-	{
-		return array('value' => $value, 'left' => $left, 'right' => $right);
-	}
-
-	/**
-	 * Builds a string containing the tree in reverse polish notation (What you
-	 * would use in a HP calculator stack).
-	 * The following tree:
-	 *
-	 *    +
-	 *   / \
-	 *  2   3
-	 *
-	 * produces: "23+"
-	 *
-	 * The following tree:
-	 *
-	 *    +
-	 *   / \
-	 *  3   *
-	 *     / \
-	 *    6   A1
-	 *
-	 * produces: "36A1*+"
-	 *
-	 * In fact all operands, functions, references, etc... are written as ptg's
-	 *
-	 * @access public
-	 * @param array $tree The optional tree to convert.
-	 * @return string The tree in reverse polish notation
-	 */
-	function toReversePolish($tree = array())
-	{
-		$polish = ""; // the string we are going to return
-		if (empty($tree)) { // If it's the first call use _parse_tree
-			$tree = $this->_parse_tree;
-		}
-
-		if (is_array($tree['left'])) {
-			$converted_tree = $this->toReversePolish($tree['left']);
-			$polish .= $converted_tree;
-		} elseif ($tree['left'] != '') { // It's a final node
-			$converted_tree = $this->_convert($tree['left']);
-			$polish .= $converted_tree;
-		}
-		if (is_array($tree['right'])) {
-			$converted_tree = $this->toReversePolish($tree['right']);
-			$polish .= $converted_tree;
-		} elseif ($tree['right'] != '') { // It's a final node
-			$converted_tree = $this->_convert($tree['right']);
-			$polish .= $converted_tree;
-		}
-		// if it's a function convert it here (so we can set it's arguments)
-		if (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/",$tree['value']) and
-			!preg_match('/^([A-Ia-i]?[A-Za-z])(\d+)$/',$tree['value']) and
-			!preg_match("/^[A-Ia-i]?[A-Za-z](\d+)\.\.[A-Ia-i]?[A-Za-z](\d+)$/",$tree['value']) and
-			!is_numeric($tree['value']) and
-			!isset($this->ptg[$tree['value']]))
-		{
-			// left subtree for a function is always an array.
-			if ($tree['left'] != '') {
-				$left_tree = $this->toReversePolish($tree['left']);
-			} else {
-				$left_tree = '';
-			}
-			// add it's left subtree and return.
-			return $left_tree.$this->_convertFunction($tree['value'], $tree['right']);
-		} else {
-			$converted_tree = $this->_convert($tree['value']);
-		}
-		$polish .= $converted_tree;
-		return $polish;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Workbook.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Workbook.php
deleted file mode 100755
index fb0a67c46..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Workbook.php
+++ /dev/null
@@ -1,1450 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of PEAR::Spreadsheet_Excel_Writer_Workbook (used as the base for this class):
-// -----------------------------------------------------------------------------------------
-// /*
-// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-// *
-// *  The majority of this is _NOT_ my code.  I simply ported it from the
-// *  PERL Spreadsheet::WriteExcel module.
-// *
-// *  The author of the Spreadsheet::WriteExcel module is John McNamara
-// *  <jmcnamara@cpan.org>
-// *
-// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
-// *  porting of this code to PHP.  Any questions directly related to this
-// *  class library should be directed to me.
-// *
-// *  License Information:
-// *
-// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
-// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
-// *
-// *    This library is free software; you can redistribute it and/or
-// *    modify it under the terms of the GNU Lesser General Public
-// *    License as published by the Free Software Foundation; either
-// *    version 2.1 of the License, or (at your option) any later version.
-// *
-// *    This library is distributed in the hope that it will be useful,
-// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// *    Lesser General Public License for more details.
-// *
-// *    You should have received a copy of the GNU Lesser General Public
-// *    License along with this library; if not, write to the Free Software
-// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// */
-
-
-/**
- * PHPExcel_Writer_Excel5_Workbook
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
-{
-	/**
-	 * Formula parser
-	 *
-	 * @var PHPExcel_Writer_Excel5_Parser
-	 */
-	private $_parser;
-
-	/**
-	 * The BIFF file size for the workbook.
-	 * @var integer
-	 * @see _calcSheetOffsets()
-	 */
-	public $_biffsize;
-
-	/**
-	 * XF Writers
-	 * @var PHPExcel_Writer_Excel5_Xf[]
-	 */
-	private $_xfWriters = array();
-
-	/**
-	 * Array containing the colour palette
-	 * @var array
-	 */
-	public $_palette;
-
-	/**
-	 * The codepage indicates the text encoding used for strings
-	 * @var integer
-	 */
-	public $_codepage;
-
-	/**
-	 * The country code used for localization
-	 * @var integer
-	 */
-	public $_country_code;
-
-	/**
-	 * Workbook
-	 * @var PHPExcel
-	 */
-	private $_phpExcel;
-
-	/**
-	 * Fonts writers
-	 *
-	 * @var PHPExcel_Writer_Excel5_Font[]
-	 */
-	private $_fontWriters = array();
-
-	/**
-	 * Added fonts. Maps from font's hash => index in workbook
-	 *
-	 * @var array
-	 */
-	private $_addedFonts = array();
-
-	/**
-	 * Shared number formats
-	 *
-	 * @var array
-	 */
-	private $_numberFormats = array();
-
-	/**
-	 * Added number formats. Maps from numberFormat's hash => index in workbook
-	 *
-	 * @var array
-	 */
-	private $_addedNumberFormats = array();
-
-	/**
-	 * Sizes of the binary worksheet streams
-	 *
-	 * @var array
-	 */
-	private $_worksheetSizes = array();
-
-	/**
-	 * Offsets of the binary worksheet streams relative to the start of the global workbook stream
-	 *
-	 * @var array
-	 */
-	private $_worksheetOffsets = array();
-
-	/**
-	 * Total number of shared strings in workbook
-	 *
-	 * @var int
-	 */
-	private $_str_total;
-
-	/**
-	 * Number of unique shared strings in workbook
-	 *
-	 * @var int
-	 */
-	private $_str_unique;
-
-	/**
-	 * Array of unique shared strings in workbook
-	 *
-	 * @var array
-	 */
-	private $_str_table;
-
-	/**
-	 * Color cache
-	 */
-	private $_colors;
-
-	/**
-	 * Escher object corresponding to MSODRAWINGGROUP
-	 *
-	 * @var PHPExcel_Shared_Escher
-	 */
-	private $_escher;
-
-
-	/**
-	 * Class constructor
-	 *
-	 * @param PHPExcel	$phpExcel		The Workbook
-	 * @param int		&$str_total		Total number of strings
-	 * @param int		&$str_unique	Total number of unique strings
-	 * @param array		&$str_table		String Table
-	 * @param array		&$colors		Colour Table
-	 * @param mixed		$parser			The formula parser created for the Workbook
-	 */
-	public function __construct(PHPExcel $phpExcel = null,
-								&$str_total, &$str_unique, &$str_table, &$colors,
-								$parser )
-	{
-		// It needs to call its parent's constructor explicitly
-		parent::__construct();
-
-		$this->_parser           = $parser;
-		$this->_biffsize         = 0;
-		$this->_palette          = array();
-		$this->_country_code     = -1;
-
-		$this->_str_total       = &$str_total;
-		$this->_str_unique      = &$str_unique;
-		$this->_str_table       = &$str_table;
-		$this->_colors          = &$colors;
-		$this->_setPaletteXl97();
-
-		$this->_phpExcel = $phpExcel;
-
-		// set BIFFwriter limit for CONTINUE records
-		//		$this->_limit = 8224;
-		$this->_codepage = 0x04B0;
-
-		// Add empty sheets and Build color cache
-		$countSheets = $phpExcel->getSheetCount();
-		for ($i = 0; $i < $countSheets; ++$i) {
-			$phpSheet = $phpExcel->getSheet($i);
-
-			$this->_parser->setExtSheet($phpSheet->getTitle(), $i);  // Register worksheet name with parser
-
-			$supbook_index = 0x00;
-			$ref = pack('vvv', $supbook_index, $i, $i);
-			$this->_parser->_references[] = $ref;  // Register reference with parser
-
-			// Sheet tab colors?
-			if ($phpSheet->isTabColorSet()) {
-				$this->_addColor($phpSheet->getTabColor()->getRGB());
-			}
-		}
-
-	}
-
-	/**
-	 * Add a new XF writer
-	 *
-	 * @param PHPExcel_Style
-	 * @param boolean Is it a style XF?
-	 * @return int Index to XF record
-	 */
-	public function addXfWriter($style, $isStyleXf = false)
-	{
-		$xfWriter = new PHPExcel_Writer_Excel5_Xf($style);
-		$xfWriter->setIsStyleXf($isStyleXf);
-
-		// Add the font if not already added
-		$fontIndex = $this->_addFont($style->getFont());
-
-		// Assign the font index to the xf record
-		$xfWriter->setFontIndex($fontIndex);
-
-		// Background colors, best to treat these after the font so black will come after white in custom palette
-		$xfWriter->setFgColor($this->_addColor($style->getFill()->getStartColor()->getRGB()));
-		$xfWriter->setBgColor($this->_addColor($style->getFill()->getEndColor()->getRGB()));
-		$xfWriter->setBottomColor($this->_addColor($style->getBorders()->getBottom()->getColor()->getRGB()));
-		$xfWriter->setTopColor($this->_addColor($style->getBorders()->getTop()->getColor()->getRGB()));
-		$xfWriter->setRightColor($this->_addColor($style->getBorders()->getRight()->getColor()->getRGB()));
-		$xfWriter->setLeftColor($this->_addColor($style->getBorders()->getLeft()->getColor()->getRGB()));
-		$xfWriter->setDiagColor($this->_addColor($style->getBorders()->getDiagonal()->getColor()->getRGB()));
-
-		// Add the number format if it is not a built-in one and not already added
-		if ($style->getNumberFormat()->getBuiltInFormatCode() === false) {
-			$numberFormatHashCode = $style->getNumberFormat()->getHashCode();
-
-			if (isset($this->_addedNumberFormats[$numberFormatHashCode])) {
-				$numberFormatIndex = $this->_addedNumberFormats[$numberFormatHashCode];
-			} else {
-				$numberFormatIndex = 164 + count($this->_numberFormats);
-				$this->_numberFormats[$numberFormatIndex] = $style->getNumberFormat();
-				$this->_addedNumberFormats[$numberFormatHashCode] = $numberFormatIndex;
-			}
-		} else {
-			$numberFormatIndex = (int) $style->getNumberFormat()->getBuiltInFormatCode();
-		}
-
-		// Assign the number format index to xf record
-		$xfWriter->setNumberFormatIndex($numberFormatIndex);
-
-		$this->_xfWriters[] = $xfWriter;
-
-		$xfIndex = count($this->_xfWriters) - 1;
-		return $xfIndex;
-	}
-
-	/**
-	 * Add a font to added fonts
-	 *
-	 * @param PHPExcel_Style_Font $font
-	 * @return int Index to FONT record
-	 */
-	public function _addFont(PHPExcel_Style_Font $font)
-	{
-		$fontHashCode = $font->getHashCode();
-		if(isset($this->_addedFonts[$fontHashCode])){
-			$fontIndex = $this->_addedFonts[$fontHashCode];
-		} else {
-			$countFonts = count($this->_fontWriters);
-			$fontIndex = ($countFonts < 4) ? $countFonts : $countFonts + 1;
-
-			$fontWriter = new PHPExcel_Writer_Excel5_Font($font);
-			$fontWriter->setColorIndex($this->_addColor($font->getColor()->getRGB()));
-			$this->_fontWriters[] = $fontWriter;
-
-			$this->_addedFonts[$fontHashCode] = $fontIndex;
-		}
-		return $fontIndex;
-	}
-	/**
-	 * Alter color palette adding a custom color
-	 *
-	 * @param string $rgb E.g. 'FF00AA'
-	 * @return int Color index
-	 */
-	private function _addColor($rgb) {
-		if (!isset($this->_colors[$rgb])) {
-			if (count($this->_colors) < 57) {
-				// then we add a custom color altering the palette
-				$colorIndex = 8 + count($this->_colors);
-				$this->_palette[$colorIndex] =
-					array(
-						hexdec(substr($rgb, 0, 2)),
-						hexdec(substr($rgb, 2, 2)),
-						hexdec(substr($rgb, 4)),
-						0
-					);
-				$this->_colors[$rgb] = $colorIndex;
-			} else {
-				// no room for more custom colors, just map to black
-				$colorIndex = 0;
-			}
-		} else {
-			// fetch already added custom color
-			$colorIndex = $this->_colors[$rgb];
-		}
-
-		return $colorIndex;
-	}
-
-	/**
-	 * Sets the colour palette to the Excel 97+ default.
-	 *
-	 * @access private
-	 */
-	function _setPaletteXl97()
-	{
-		$this->_palette = array(
-			0x08 => array(0x00, 0x00, 0x00, 0x00),
-			0x09 => array(0xff, 0xff, 0xff, 0x00),
-			0x0A => array(0xff, 0x00, 0x00, 0x00),
-			0x0B => array(0x00, 0xff, 0x00, 0x00),
-			0x0C => array(0x00, 0x00, 0xff, 0x00),
-			0x0D => array(0xff, 0xff, 0x00, 0x00),
-			0x0E => array(0xff, 0x00, 0xff, 0x00),
-			0x0F => array(0x00, 0xff, 0xff, 0x00),
-			0x10 => array(0x80, 0x00, 0x00, 0x00),
-			0x11 => array(0x00, 0x80, 0x00, 0x00),
-			0x12 => array(0x00, 0x00, 0x80, 0x00),
-			0x13 => array(0x80, 0x80, 0x00, 0x00),
-			0x14 => array(0x80, 0x00, 0x80, 0x00),
-			0x15 => array(0x00, 0x80, 0x80, 0x00),
-			0x16 => array(0xc0, 0xc0, 0xc0, 0x00),
-			0x17 => array(0x80, 0x80, 0x80, 0x00),
-			0x18 => array(0x99, 0x99, 0xff, 0x00),
-			0x19 => array(0x99, 0x33, 0x66, 0x00),
-			0x1A => array(0xff, 0xff, 0xcc, 0x00),
-			0x1B => array(0xcc, 0xff, 0xff, 0x00),
-			0x1C => array(0x66, 0x00, 0x66, 0x00),
-			0x1D => array(0xff, 0x80, 0x80, 0x00),
-			0x1E => array(0x00, 0x66, 0xcc, 0x00),
-			0x1F => array(0xcc, 0xcc, 0xff, 0x00),
-			0x20 => array(0x00, 0x00, 0x80, 0x00),
-			0x21 => array(0xff, 0x00, 0xff, 0x00),
-			0x22 => array(0xff, 0xff, 0x00, 0x00),
-			0x23 => array(0x00, 0xff, 0xff, 0x00),
-			0x24 => array(0x80, 0x00, 0x80, 0x00),
-			0x25 => array(0x80, 0x00, 0x00, 0x00),
-			0x26 => array(0x00, 0x80, 0x80, 0x00),
-			0x27 => array(0x00, 0x00, 0xff, 0x00),
-			0x28 => array(0x00, 0xcc, 0xff, 0x00),
-			0x29 => array(0xcc, 0xff, 0xff, 0x00),
-			0x2A => array(0xcc, 0xff, 0xcc, 0x00),
-			0x2B => array(0xff, 0xff, 0x99, 0x00),
-			0x2C => array(0x99, 0xcc, 0xff, 0x00),
-			0x2D => array(0xff, 0x99, 0xcc, 0x00),
-			0x2E => array(0xcc, 0x99, 0xff, 0x00),
-			0x2F => array(0xff, 0xcc, 0x99, 0x00),
-			0x30 => array(0x33, 0x66, 0xff, 0x00),
-			0x31 => array(0x33, 0xcc, 0xcc, 0x00),
-			0x32 => array(0x99, 0xcc, 0x00, 0x00),
-			0x33 => array(0xff, 0xcc, 0x00, 0x00),
-			0x34 => array(0xff, 0x99, 0x00, 0x00),
-			0x35 => array(0xff, 0x66, 0x00, 0x00),
-			0x36 => array(0x66, 0x66, 0x99, 0x00),
-			0x37 => array(0x96, 0x96, 0x96, 0x00),
-			0x38 => array(0x00, 0x33, 0x66, 0x00),
-			0x39 => array(0x33, 0x99, 0x66, 0x00),
-			0x3A => array(0x00, 0x33, 0x00, 0x00),
-			0x3B => array(0x33, 0x33, 0x00, 0x00),
-			0x3C => array(0x99, 0x33, 0x00, 0x00),
-			0x3D => array(0x99, 0x33, 0x66, 0x00),
-			0x3E => array(0x33, 0x33, 0x99, 0x00),
-			0x3F => array(0x33, 0x33, 0x33, 0x00),
-		);
-	}
-
-	/**
-	 * Assemble worksheets into a workbook and send the BIFF data to an OLE
-	 * storage.
-	 *
-	 * @param	array	$pWorksheetSizes	The sizes in bytes of the binary worksheet streams
-	 * @return	string	Binary data for workbook stream
-	 */
-	public function writeWorkbook($pWorksheetSizes = null)
-	{
-		$this->_worksheetSizes = $pWorksheetSizes;
-
-		// Calculate the number of selected worksheet tabs and call the finalization
-		// methods for each worksheet
-		$total_worksheets = $this->_phpExcel->getSheetCount();
-
-		// Add part 1 of the Workbook globals, what goes before the SHEET records
-		$this->_storeBof(0x0005);
-		$this->_writeCodepage();
-		$this->_writeWindow1();
-
-		$this->_writeDatemode();
-		$this->_writeAllFonts();
-		$this->_writeAllNumFormats();
-		$this->_writeAllXfs();
-		$this->_writeAllStyles();
-		$this->_writePalette();
-
-		// Prepare part 3 of the workbook global stream, what goes after the SHEET records
-		$part3 = '';
-		if ($this->_country_code != -1) {
-			$part3 .= $this->_writeCountry();
-		}
-		$part3 .= $this->_writeRecalcId();
-
-		$part3 .= $this->_writeSupbookInternal();
-		/* TODO: store external SUPBOOK records and XCT and CRN records
-		in case of external references for BIFF8 */
-		$part3 .= $this->_writeExternsheetBiff8();
-		$part3 .= $this->_writeAllDefinedNamesBiff8();
-		$part3 .= $this->_writeMsoDrawingGroup();
-		$part3 .= $this->_writeSharedStringsTable();
-
-		$part3 .= $this->writeEof();
-
-		// Add part 2 of the Workbook globals, the SHEET records
-		$this->_calcSheetOffsets();
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$this->_writeBoundsheet($this->_phpExcel->getSheet($i), $this->_worksheetOffsets[$i]);
-		}
-
-		// Add part 3 of the Workbook globals
-		$this->_data .= $part3;
-
-		return $this->_data;
-	}
-
-	/**
-	 * Calculate offsets for Worksheet BOF records.
-	 *
-	 * @access private
-	 */
-	function _calcSheetOffsets()
-	{
-		$boundsheet_length = 10;  // fixed length for a BOUNDSHEET record
-
-		// size of Workbook globals part 1 + 3
-		$offset            = $this->_datasize;
-
-		// add size of Workbook globals part 2, the length of the SHEET records
-		$total_worksheets = count($this->_phpExcel->getAllSheets());
-		foreach ($this->_phpExcel->getWorksheetIterator() as $sheet) {
-			$offset += $boundsheet_length + strlen(PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheet->getTitle()));
-		}
-
-		// add the sizes of each of the Sheet substreams, respectively
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$this->_worksheetOffsets[$i] = $offset;
-			$offset += $this->_worksheetSizes[$i];
-		}
-		$this->_biffsize = $offset;
-	}
-
-	/**
-	 * Store the Excel FONT records.
-	 */
-	private function _writeAllFonts()
-	{
-		foreach ($this->_fontWriters as $fontWriter) {
-			$this->_append($fontWriter->writeFont());
-		}
-	}
-
-	/**
-	 * Store user defined numerical formats i.e. FORMAT records
-	 */
-	private function _writeAllNumFormats()
-	{
-		foreach ($this->_numberFormats as $numberFormatIndex => $numberFormat) {
-			$this->_writeNumFormat($numberFormat->getFormatCode(), $numberFormatIndex);
-		}
-	}
-
-	/**
-	 * Write all XF records.
-	 */
-	private function _writeAllXfs()
-	{
-		foreach ($this->_xfWriters as $xfWriter) {
-			$this->_append($xfWriter->writeXf());
-		}
-	}
-
-	/**
-	 * Write all STYLE records.
-	 */
-	private function _writeAllStyles()
-	{
-		$this->_writeStyle();
-	}
-
-	/**
-	 * Write the EXTERNCOUNT and EXTERNSHEET records. These are used as indexes for
-	 * the NAME records.
-	 */
-	private function _writeExterns()
-	{
-		$countSheets = $this->_phpExcel->getSheetCount();
-		// Create EXTERNCOUNT with number of worksheets
-		$this->_writeExterncount($countSheets);
-
-		// Create EXTERNSHEET for each worksheet
-		for ($i = 0; $i < $countSheets; ++$i) {
-			$this->_writeExternsheet($this->_phpExcel->getSheet($i)->getTitle());
-		}
-	}
-
-	/**
-	 * Write the NAME record to define the print area and the repeat rows and cols.
-	 */
-	private function _writeNames()
-	{
-		// total number of sheets
-		$total_worksheets = $this->_phpExcel->getSheetCount();
-
-		// Create the print area NAME records
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$sheetSetup = $this->_phpExcel->getSheet($i)->getPageSetup();
-			// Write a Name record if the print area has been defined
-			if ($sheetSetup->isPrintAreaSet()) {
-				// Print area
-				$printArea = PHPExcel_Cell::splitRange($sheetSetup->getPrintArea());
-				$printArea = $printArea[0];
-				$printArea[0] = PHPExcel_Cell::coordinateFromString($printArea[0]);
-				$printArea[1] = PHPExcel_Cell::coordinateFromString($printArea[1]);
-
-				$print_rowmin = $printArea[0][1] - 1;
-				$print_rowmax = $printArea[1][1] - 1;
-				$print_colmin = PHPExcel_Cell::columnIndexFromString($printArea[0][0]) - 1;
-				$print_colmax = PHPExcel_Cell::columnIndexFromString($printArea[1][0]) - 1;
-
-				$this->_writeNameShort(
-					$i, // sheet index
-					0x06, // NAME type
-					$print_rowmin,
-					$print_rowmax,
-					$print_colmin,
-					$print_colmax
-					);
-			}
-		}
-
-		// Create the print title NAME records
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$sheetSetup = $this->_phpExcel->getSheet($i)->getPageSetup();
-
-			// simultaneous repeatColumns repeatRows
-			if ($sheetSetup->isColumnsToRepeatAtLeftSet() && $sheetSetup->isRowsToRepeatAtTopSet()) {
-				$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
-				$colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
-				$colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
-
-				$repeat = $sheetSetup->getRowsToRepeatAtTop();
-				$rowmin = $repeat[0] - 1;
-				$rowmax = $repeat[1] - 1;
-
-				$this->_writeNameLong(
-					$i, // sheet index
-					0x07, // NAME type
-					$rowmin,
-					$rowmax,
-					$colmin,
-					$colmax
-					);
-
-			// (exclusive) either repeatColumns or repeatRows
-			} else if ($sheetSetup->isColumnsToRepeatAtLeftSet() || $sheetSetup->isRowsToRepeatAtTopSet()) {
-
-				// Columns to repeat
-				if ($sheetSetup->isColumnsToRepeatAtLeftSet()) {
-					$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
-					$colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
-					$colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
-				} else {
-					$colmin = 0;
-					$colmax = 255;
-				}
-
-				// Rows to repeat
-				if ($sheetSetup->isRowsToRepeatAtTopSet()) {
-					$repeat = $sheetSetup->getRowsToRepeatAtTop();
-					$rowmin = $repeat[0] - 1;
-					$rowmax = $repeat[1] - 1;
-				} else {
-					$rowmin = 0;
-					$rowmax = 16383;
-				}
-
-				$this->_writeNameShort(
-					$i, // sheet index
-					0x07, // NAME type
-					$rowmin,
-					$rowmax,
-					$colmin,
-					$colmax
-					);
-			}
-		}
-	}
-
-	/**
-	 * Writes all the DEFINEDNAME records (BIFF8).
-	 * So far this is only used for repeating rows/columns (print titles) and print areas
-	 */
-	private function _writeAllDefinedNamesBiff8()
-	{
-		$chunk = '';
-
-		// Named ranges
-		if (count($this->_phpExcel->getNamedRanges()) > 0) {
-			// Loop named ranges
-			$namedRanges = $this->_phpExcel->getNamedRanges();
-			foreach ($namedRanges as $namedRange) {
-
-				// Create absolute coordinate
-				$range = PHPExcel_Cell::splitRange($namedRange->getRange());
-				for ($i = 0; $i < count($range); $i++) {
-					$range[$i][0] = '\'' . str_replace("'", "''", $namedRange->getWorksheet()->getTitle()) . '\'!' . PHPExcel_Cell::absoluteCoordinate($range[$i][0]);
-					if (isset($range[$i][1])) {
-						$range[$i][1] = PHPExcel_Cell::absoluteCoordinate($range[$i][1]);
-					}
-				}
-				$range = PHPExcel_Cell::buildRange($range); // e.g. Sheet1!$A$1:$B$2
-
-				// parse formula
-				try {
-					$error = $this->_parser->parse($range);
-					$formulaData = $this->_parser->toReversePolish();
-
-					// make sure tRef3d is of type tRef3dR (0x3A)
-					if (isset($formulaData{0}) and ($formulaData{0} == "\x7A" or $formulaData{0} == "\x5A")) {
-						$formulaData = "\x3A" . substr($formulaData, 1);
-					}
-
-					if ($namedRange->getLocalOnly()) {
-						// local scope
-						$scope = $this->_phpExcel->getIndex($namedRange->getScope()) + 1;
-					} else {
-						// global scope
-						$scope = 0;
-					}
-					$chunk .= $this->writeData($this->_writeDefinedNameBiff8($namedRange->getName(), $formulaData, $scope, false));
-
-				} catch(Exception $e) {
-					// do nothing
-				}
-			}
-		}
-
-		// total number of sheets
-		$total_worksheets = $this->_phpExcel->getSheetCount();
-
-		// write the print titles (repeating rows, columns), if any
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$sheetSetup = $this->_phpExcel->getSheet($i)->getPageSetup();
-			// simultaneous repeatColumns repeatRows
-			if ($sheetSetup->isColumnsToRepeatAtLeftSet() && $sheetSetup->isRowsToRepeatAtTopSet()) {
-				$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
-				$colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
-				$colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
-
-				$repeat = $sheetSetup->getRowsToRepeatAtTop();
-				$rowmin = $repeat[0] - 1;
-				$rowmax = $repeat[1] - 1;
-
-				// construct formula data manually
-				$formulaData = pack('Cv', 0x29, 0x17); // tMemFunc
-				$formulaData .= pack('Cvvvvv', 0x3B, $i, 0, 65535, $colmin, $colmax); // tArea3d
-				$formulaData .= pack('Cvvvvv', 0x3B, $i, $rowmin, $rowmax, 0, 255); // tArea3d
-				$formulaData .= pack('C', 0x10); // tList
-
-				// store the DEFINEDNAME record
-				$chunk .= $this->writeData($this->_writeDefinedNameBiff8(pack('C', 0x07), $formulaData, $i + 1, true));
-
-			// (exclusive) either repeatColumns or repeatRows
-			} else if ($sheetSetup->isColumnsToRepeatAtLeftSet() || $sheetSetup->isRowsToRepeatAtTopSet()) {
-
-				// Columns to repeat
-				if ($sheetSetup->isColumnsToRepeatAtLeftSet()) {
-					$repeat = $sheetSetup->getColumnsToRepeatAtLeft();
-					$colmin = PHPExcel_Cell::columnIndexFromString($repeat[0]) - 1;
-					$colmax = PHPExcel_Cell::columnIndexFromString($repeat[1]) - 1;
-				} else {
-					$colmin = 0;
-					$colmax = 255;
-				}
-				// Rows to repeat
-				if ($sheetSetup->isRowsToRepeatAtTopSet()) {
-					$repeat = $sheetSetup->getRowsToRepeatAtTop();
-					$rowmin = $repeat[0] - 1;
-					$rowmax = $repeat[1] - 1;
-				} else {
-					$rowmin = 0;
-					$rowmax = 65535;
-				}
-
-				// construct formula data manually because parser does not recognize absolute 3d cell references
-				$formulaData = pack('Cvvvvv', 0x3B, $i, $rowmin, $rowmax, $colmin, $colmax);
-
-				// store the DEFINEDNAME record
-				$chunk .= $this->writeData($this->_writeDefinedNameBiff8(pack('C', 0x07), $formulaData, $i + 1, true));
-			}
-		}
-
-		// write the print areas, if any
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$sheetSetup = $this->_phpExcel->getSheet($i)->getPageSetup();
-			if ($sheetSetup->isPrintAreaSet()) {
-				// Print area, e.g. A3:J6,H1:X20
-				$printArea = PHPExcel_Cell::splitRange($sheetSetup->getPrintArea());
-				$countPrintArea = count($printArea);
-
-				$formulaData = '';
-				for ($j = 0; $j < $countPrintArea; ++$j) {
-					$printAreaRect = $printArea[$j]; // e.g. A3:J6
-					$printAreaRect[0] = PHPExcel_Cell::coordinateFromString($printAreaRect[0]);
-					$printAreaRect[1] = PHPExcel_Cell::coordinateFromString($printAreaRect[1]);
-
-					$print_rowmin = $printAreaRect[0][1] - 1;
-					$print_rowmax = $printAreaRect[1][1] - 1;
-					$print_colmin = PHPExcel_Cell::columnIndexFromString($printAreaRect[0][0]) - 1;
-					$print_colmax = PHPExcel_Cell::columnIndexFromString($printAreaRect[1][0]) - 1;
-
-					// construct formula data manually because parser does not recognize absolute 3d cell references
-					$formulaData .= pack('Cvvvvv', 0x3B, $i, $print_rowmin, $print_rowmax, $print_colmin, $print_colmax);
-
-					if ($j > 0) {
-						$formulaData .= pack('C', 0x10); // list operator token ','
-					}
-				}
-
-				// store the DEFINEDNAME record
-				$chunk .= $this->writeData($this->_writeDefinedNameBiff8(pack('C', 0x06), $formulaData, $i + 1, true));
-			}
-		}
-
-		// write autofilters, if any
-		for ($i = 0; $i < $total_worksheets; ++$i) {
-			$sheetAutoFilter = $this->_phpExcel->getSheet($i)->getAutoFilter();
-			$autoFilterRange = $sheetAutoFilter->getRange();
-			if(!empty($autoFilterRange)) {
-				$rangeBounds = PHPExcel_Cell::rangeBoundaries($autoFilterRange);
-
-				//Autofilter built in name
-				$name = pack('C', 0x0D);
-
-				$chunk .= $this->writeData($this->_writeShortNameBiff8($name, $i + 1, $rangeBounds, true));
-			}
-		}
-
-		return $chunk;
-	}
-
-	/**
-	 * Write a DEFINEDNAME record for BIFF8 using explicit binary formula data
-	 *
-	 * @param	string		$name			The name in UTF-8
-	 * @param	string		$formulaData	The binary formula data
-	 * @param	string		$sheetIndex		1-based sheet index the defined name applies to. 0 = global
-	 * @param	boolean		$isBuiltIn		Built-in name?
-	 * @return	string	Complete binary record data
-	 */
-	private function _writeDefinedNameBiff8($name, $formulaData, $sheetIndex = 0, $isBuiltIn = false)
-	{
-		$record = 0x0018;
-
-		// option flags
-		$options = $isBuiltIn ? 0x20 : 0x00;
-
-		// length of the name, character count
-		$nlen = PHPExcel_Shared_String::CountCharacters($name);
-
-		// name with stripped length field
-		$name = substr(PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($name), 2);
-
-		// size of the formula (in bytes)
-		$sz = strlen($formulaData);
-
-		// combine the parts
-		$data = pack('vCCvvvCCCC', $options, 0, $nlen, $sz, 0, $sheetIndex, 0, 0, 0, 0)
-			. $name . $formulaData;
-		$length = strlen($data);
-
-		$header = pack('vv', $record, $length);
-
-		return $header . $data;
-	}
-
-	/**
-	 * Write a short NAME record
-	 *
-	 * @param	string		$name
-	 * @param	string		$sheetIndex		1-based sheet index the defined name applies to. 0 = global
-	 * @param	int[][]     $range          rangeboundaries
-	 * @param	bool        $isHidden
-	 * @return	string	Complete binary record data
-	 * */
-	private function _writeShortNameBiff8($name, $sheetIndex = 0, $rangeBounds, $isHidden = false){
-		$record = 0x0018;
-
-		// option flags
-		$options = ($isHidden  ? 0x21 : 0x00);
-
-		$extra  = pack('Cvvvvv',
-				0x3B,
-				$sheetIndex - 1,
-				$rangeBounds[0][1] - 1,
-				$rangeBounds[1][1] - 1,
-				$rangeBounds[0][0] - 1,
-				$rangeBounds[1][0] - 1);
-
-		// size of the formula (in bytes)
-		$sz = strlen($extra);
-
-		// combine the parts
-		$data = pack('vCCvvvCCCCC', $options, 0, 1, $sz, 0, $sheetIndex, 0, 0, 0, 0, 0)
-			. $name . $extra;
-		$length = strlen($data);
-
-		$header = pack('vv', $record, $length);
-
-		return $header . $data;
-	}
-
-	/**
-	 * Stores the CODEPAGE biff record.
-	 */
-	private function _writeCodepage()
-	{
-		$record          = 0x0042;             // Record identifier
-		$length          = 0x0002;             // Number of bytes to follow
-		$cv              = $this->_codepage;   // The code page
-
-		$header          = pack('vv', $record, $length);
-		$data            = pack('v',  $cv);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write Excel BIFF WINDOW1 record.
-	 */
-	private function _writeWindow1()
-	{
-		$record    = 0x003D;                 // Record identifier
-		$length    = 0x0012;                 // Number of bytes to follow
-
-		$xWn       = 0x0000;                 // Horizontal position of window
-		$yWn       = 0x0000;                 // Vertical position of window
-		$dxWn      = 0x25BC;                 // Width of window
-		$dyWn      = 0x1572;                 // Height of window
-
-		$grbit     = 0x0038;                 // Option flags
-
-		// not supported by PHPExcel, so there is only one selected sheet, the active
-		$ctabsel   = 1;       // Number of workbook tabs selected
-
-		$wTabRatio = 0x0258;                 // Tab to scrollbar ratio
-
-		// not supported by PHPExcel, set to 0
-		$itabFirst = 0;     // 1st displayed worksheet
-		$itabCur   = $this->_phpExcel->getActiveSheetIndex();    // Active worksheet
-
-		$header    = pack("vv",        $record, $length);
-		$data      = pack("vvvvvvvvv", $xWn, $yWn, $dxWn, $dyWn,
-									   $grbit,
-									   $itabCur, $itabFirst,
-									   $ctabsel, $wTabRatio);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Writes Excel BIFF BOUNDSHEET record.
-	 *
-	 * @param PHPExcel_Worksheet  $sheet Worksheet name
-	 * @param integer $offset    Location of worksheet BOF
-	 */
-	private function _writeBoundsheet($sheet, $offset)
-	{
-		$sheetname = $sheet->getTitle();
-		$record    = 0x0085;                    // Record identifier
-
-		// sheet state
-		switch ($sheet->getSheetState()) {
-			case PHPExcel_Worksheet::SHEETSTATE_VISIBLE:	$ss = 0x00; break;
-			case PHPExcel_Worksheet::SHEETSTATE_HIDDEN:		$ss = 0x01; break;
-			case PHPExcel_Worksheet::SHEETSTATE_VERYHIDDEN:	$ss = 0x02; break;
-			default: $ss = 0x00; break;
-		}
-
-		// sheet type
-		$st = 0x00;
-
-		$grbit     = 0x0000;                    // Visibility and sheet type
-
-		$data      = pack("VCC", $offset, $ss, $st);
-		$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheetname);
-
-		$length = strlen($data);
-		$header = pack("vv",  $record, $length);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write Internal SUPBOOK record
-	 */
-	private function _writeSupbookInternal()
-	{
-		$record    = 0x01AE;   // Record identifier
-		$length    = 0x0004;   // Bytes to follow
-
-		$header    = pack("vv", $record, $length);
-		$data      = pack("vv", $this->_phpExcel->getSheetCount(), 0x0401);
-		return $this->writeData($header . $data);
-	}
-
-	/**
-	 * Writes the Excel BIFF EXTERNSHEET record. These references are used by
-	 * formulas.
-	 *
-	 */
-	private function _writeExternsheetBiff8()
-	{
-		$total_references = count($this->_parser->_references);
-		$record   = 0x0017;                     // Record identifier
-		$length   = 2 + 6 * $total_references;  // Number of bytes to follow
-
-		$supbook_index = 0;           // FIXME: only using internal SUPBOOK record
-		$header           = pack("vv",  $record, $length);
-		$data             = pack('v', $total_references);
-		for ($i = 0; $i < $total_references; ++$i) {
-			$data .= $this->_parser->_references[$i];
-		}
-		return $this->writeData($header . $data);
-	}
-
-	/**
-	 * Write Excel BIFF STYLE records.
-	 */
-	private function _writeStyle()
-	{
-		$record    = 0x0293;   // Record identifier
-		$length    = 0x0004;   // Bytes to follow
-
-		$ixfe      = 0x8000;  // Index to cell style XF
-		$BuiltIn   = 0x00;     // Built-in style
-		$iLevel    = 0xff;     // Outline style level
-
-		$header    = pack("vv",  $record, $length);
-		$data      = pack("vCC", $ixfe, $BuiltIn, $iLevel);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Writes Excel FORMAT record for non "built-in" numerical formats.
-	 *
-	 * @param string  $format Custom format string
-	 * @param integer $ifmt   Format index code
-	 */
-	private function _writeNumFormat($format, $ifmt)
-	{
-		$record    = 0x041E;                      // Record identifier
-
-		$numberFormatString = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($format);
-		$length    = 2 + strlen($numberFormatString);      // Number of bytes to follow
-
-
-		$header    = pack("vv", $record, $length);
-		$data      = pack("v", $ifmt) .  $numberFormatString;
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write DATEMODE record to indicate the date system in use (1904 or 1900).
-	 */
-	private function _writeDatemode()
-	{
-		$record    = 0x0022;         // Record identifier
-		$length    = 0x0002;         // Bytes to follow
-
-		$f1904     = (PHPExcel_Shared_Date::getExcelCalendar() == PHPExcel_Shared_Date::CALENDAR_MAC_1904) ?
-			1 : 0;   // Flag for 1904 date system
-
-		$header    = pack("vv", $record, $length);
-		$data      = pack("v", $f1904);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write BIFF record EXTERNCOUNT to indicate the number of external sheet
-	 * references in the workbook.
-	 *
-	 * Excel only stores references to external sheets that are used in NAME.
-	 * The workbook NAME record is required to define the print area and the repeat
-	 * rows and columns.
-	 *
-	 * A similar method is used in Worksheet.php for a slightly different purpose.
-	 *
-	 * @param integer $cxals Number of external references
-	 */
-	private function _writeExterncount($cxals)
-	{
-		$record   = 0x0016;          // Record identifier
-		$length   = 0x0002;          // Number of bytes to follow
-
-		$header   = pack("vv", $record, $length);
-		$data     = pack("v",  $cxals);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Writes the Excel BIFF EXTERNSHEET record. These references are used by
-	 * formulas. NAME record is required to define the print area and the repeat
-	 * rows and columns.
-	 *
-	 * A similar method is used in Worksheet.php for a slightly different purpose.
-	 *
-	 * @param string $sheetname Worksheet name
-	 */
-	private function _writeExternsheet($sheetname)
-	{
-		$record      = 0x0017;                     // Record identifier
-		$length      = 0x02 + strlen($sheetname);  // Number of bytes to follow
-
-		$cch         = strlen($sheetname);         // Length of sheet name
-		$rgch        = 0x03;                       // Filename encoding
-
-		$header      = pack("vv",  $record, $length);
-		$data        = pack("CC", $cch, $rgch);
-		$this->_append($header . $data . $sheetname);
-	}
-
-	/**
-	 * Store the NAME record in the short format that is used for storing the print
-	 * area, repeat rows only and repeat columns only.
-	 *
-	 * @param integer $index  Sheet index
-	 * @param integer $type   Built-in name type
-	 * @param integer $rowmin Start row
-	 * @param integer $rowmax End row
-	 * @param integer $colmin Start colum
-	 * @param integer $colmax End column
-	 */
-	private function _writeNameShort($index, $type, $rowmin, $rowmax, $colmin, $colmax)
-	{
-		$record          = 0x0018;       // Record identifier
-		$length          = 0x0024;       // Number of bytes to follow
-
-		$grbit           = 0x0020;       // Option flags
-		$chKey           = 0x00;         // Keyboard shortcut
-		$cch             = 0x01;         // Length of text name
-		$cce             = 0x0015;       // Length of text definition
-		$ixals           = $index + 1;   // Sheet index
-		$itab            = $ixals;       // Equal to ixals
-		$cchCustMenu     = 0x00;         // Length of cust menu text
-		$cchDescription  = 0x00;         // Length of description text
-		$cchHelptopic    = 0x00;         // Length of help topic text
-		$cchStatustext   = 0x00;         // Length of status bar text
-		$rgch            = $type;        // Built-in name type
-
-		$unknown03       = 0x3b;
-		$unknown04       = 0xffff-$index;
-		$unknown05       = 0x0000;
-		$unknown06       = 0x0000;
-		$unknown07       = 0x1087;
-		$unknown08       = 0x8005;
-
-		$header             = pack("vv", $record, $length);
-		$data               = pack("v", $grbit);
-		$data              .= pack("C", $chKey);
-		$data              .= pack("C", $cch);
-		$data              .= pack("v", $cce);
-		$data              .= pack("v", $ixals);
-		$data              .= pack("v", $itab);
-		$data              .= pack("C", $cchCustMenu);
-		$data              .= pack("C", $cchDescription);
-		$data              .= pack("C", $cchHelptopic);
-		$data              .= pack("C", $cchStatustext);
-		$data              .= pack("C", $rgch);
-		$data              .= pack("C", $unknown03);
-		$data              .= pack("v", $unknown04);
-		$data              .= pack("v", $unknown05);
-		$data              .= pack("v", $unknown06);
-		$data              .= pack("v", $unknown07);
-		$data              .= pack("v", $unknown08);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", $rowmin);
-		$data              .= pack("v", $rowmax);
-		$data              .= pack("C", $colmin);
-		$data              .= pack("C", $colmax);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the NAME record in the long format that is used for storing the repeat
-	 * rows and columns when both are specified. This shares a lot of code with
-	 * _writeNameShort() but we use a separate method to keep the code clean.
-	 * Code abstraction for reuse can be carried too far, and I should know. ;-)
-	 *
-	 * @param integer $index Sheet index
-	 * @param integer $type  Built-in name type
-	 * @param integer $rowmin Start row
-	 * @param integer $rowmax End row
-	 * @param integer $colmin Start colum
-	 * @param integer $colmax End column
-	 */
-	private function _writeNameLong($index, $type, $rowmin, $rowmax, $colmin, $colmax)
-	{
-		$record          = 0x0018;       // Record identifier
-		$length          = 0x003d;       // Number of bytes to follow
-		$grbit           = 0x0020;       // Option flags
-		$chKey           = 0x00;         // Keyboard shortcut
-		$cch             = 0x01;         // Length of text name
-		$cce             = 0x002e;       // Length of text definition
-		$ixals           = $index + 1;   // Sheet index
-		$itab            = $ixals;       // Equal to ixals
-		$cchCustMenu     = 0x00;         // Length of cust menu text
-		$cchDescription  = 0x00;         // Length of description text
-		$cchHelptopic    = 0x00;         // Length of help topic text
-		$cchStatustext   = 0x00;         // Length of status bar text
-		$rgch            = $type;        // Built-in name type
-
-		$unknown01       = 0x29;
-		$unknown02       = 0x002b;
-		$unknown03       = 0x3b;
-		$unknown04       = 0xffff-$index;
-		$unknown05       = 0x0000;
-		$unknown06       = 0x0000;
-		$unknown07       = 0x1087;
-		$unknown08       = 0x8008;
-
-		$header             = pack("vv",  $record, $length);
-		$data               = pack("v", $grbit);
-		$data              .= pack("C", $chKey);
-		$data              .= pack("C", $cch);
-		$data              .= pack("v", $cce);
-		$data              .= pack("v", $ixals);
-		$data              .= pack("v", $itab);
-		$data              .= pack("C", $cchCustMenu);
-		$data              .= pack("C", $cchDescription);
-		$data              .= pack("C", $cchHelptopic);
-		$data              .= pack("C", $cchStatustext);
-		$data              .= pack("C", $rgch);
-		$data              .= pack("C", $unknown01);
-		$data              .= pack("v", $unknown02);
-		// Column definition
-		$data              .= pack("C", $unknown03);
-		$data              .= pack("v", $unknown04);
-		$data              .= pack("v", $unknown05);
-		$data              .= pack("v", $unknown06);
-		$data              .= pack("v", $unknown07);
-		$data              .= pack("v", $unknown08);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", 0x0000);
-		$data              .= pack("v", 0x3fff);
-		$data              .= pack("C", $colmin);
-		$data              .= pack("C", $colmax);
-		// Row definition
-		$data              .= pack("C", $unknown03);
-		$data              .= pack("v", $unknown04);
-		$data              .= pack("v", $unknown05);
-		$data              .= pack("v", $unknown06);
-		$data              .= pack("v", $unknown07);
-		$data              .= pack("v", $unknown08);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", $index);
-		$data              .= pack("v", $rowmin);
-		$data              .= pack("v", $rowmax);
-		$data              .= pack("C", 0x00);
-		$data              .= pack("C", 0xff);
-		// End of data
-		$data              .= pack("C", 0x10);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Stores the COUNTRY record for localization
-	 *
-	 * @return string
-	 */
-	private function _writeCountry()
-	{
-		$record          = 0x008C;    // Record identifier
-		$length          = 4;         // Number of bytes to follow
-
-		$header = pack('vv',  $record, $length);
-		/* using the same country code always for simplicity */
-		$data = pack('vv', $this->_country_code, $this->_country_code);
-		//$this->_append($header . $data);
-		return $this->writeData($header . $data);
-	}
-
-	/**
-	 * Write the RECALCID record
-	 *
-	 * @return string
-	 */
-	private function _writeRecalcId()
-	{
-		$record = 0x01C1;    // Record identifier
-		$length = 8;         // Number of bytes to follow
-
-		$header = pack('vv',  $record, $length);
-
-		// by inspection of real Excel files, MS Office Excel 2007 writes this
-		$data = pack('VV', 0x000001C1, 0x00001E667);
-
-		return $this->writeData($header . $data);
-	}
-
-	/**
-	 * Stores the PALETTE biff record.
-	 */
-	private function _writePalette()
-	{
-		$aref            = $this->_palette;
-
-		$record          = 0x0092;                 // Record identifier
-		$length          = 2 + 4 * count($aref);   // Number of bytes to follow
-		$ccv             =         count($aref);   // Number of RGB values to follow
-		$data = '';                                // The RGB data
-
-		// Pack the RGB data
-		foreach ($aref as $color) {
-			foreach ($color as $byte) {
-				$data .= pack("C",$byte);
-			}
-		}
-
-		$header = pack("vvv",  $record, $length, $ccv);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Handling of the SST continue blocks is complicated by the need to include an
-	 * additional continuation byte depending on whether the string is split between
-	 * blocks or whether it starts at the beginning of the block. (There are also
-	 * additional complications that will arise later when/if Rich Strings are
-	 * supported).
-	 *
-	 * The Excel documentation says that the SST record should be followed by an
-	 * EXTSST record. The EXTSST record is a hash table that is used to optimise
-	 * access to SST. However, despite the documentation it doesn't seem to be
-	 * required so we will ignore it.
-	 *
-	 * @return string Binary data
-	 */
-	private function _writeSharedStringsTable()
-	{
-		// maximum size of record data (excluding record header)
-		$continue_limit = 8224;
-
-		// initialize array of record data blocks
-		$recordDatas = array();
-
-		// start SST record data block with total number of strings, total number of unique strings
-		$recordData = pack("VV", $this->_str_total, $this->_str_unique);
-
-		// loop through all (unique) strings in shared strings table
-		foreach (array_keys($this->_str_table) as $string) {
-
-			// here $string is a BIFF8 encoded string
-
-			// length = character count
-			$headerinfo = unpack("vlength/Cencoding", $string);
-
-			// currently, this is always 1 = uncompressed
-			$encoding = $headerinfo["encoding"];
-
-			// initialize finished writing current $string
-			$finished = false;
-
-			while ($finished === false) {
-
-				// normally, there will be only one cycle, but if string cannot immediately be written as is
-				// there will be need for more than one cylcle, if string longer than one record data block, there
-				// may be need for even more cycles
-
-				if (strlen($recordData) + strlen($string) <= $continue_limit) {
-					// then we can write the string (or remainder of string) without any problems
-					$recordData .= $string;
-
-					if (strlen($recordData) + strlen($string) == $continue_limit) {
-						// we close the record data block, and initialize a new one
-						$recordDatas[] = $recordData;
-						$recordData = '';
-					}
-
-					// we are finished writing this string
-					$finished = true;
-				} else {
-					// special treatment writing the string (or remainder of the string)
-					// If the string is very long it may need to be written in more than one CONTINUE record.
-
-					// check how many bytes more there is room for in the current record
-					$space_remaining = $continue_limit - strlen($recordData);
-
-					// minimum space needed
-					// uncompressed: 2 byte string length length field + 1 byte option flags + 2 byte character
-					// compressed:   2 byte string length length field + 1 byte option flags + 1 byte character
-					$min_space_needed = ($encoding == 1) ? 5 : 4;
-
-					// We have two cases
-					// 1. space remaining is less than minimum space needed
-					//		here we must waste the space remaining and move to next record data block
-					// 2. space remaining is greater than or equal to minimum space needed
-					//		here we write as much as we can in the current block, then move to next record data block
-
-					// 1. space remaining is less than minimum space needed
-					if ($space_remaining < $min_space_needed) {
-						// we close the block, store the block data
-						$recordDatas[] = $recordData;
-
-						// and start new record data block where we start writing the string
-						$recordData = '';
-
-					// 2. space remaining is greater than or equal to minimum space needed
-					} else {
-						// initialize effective remaining space, for Unicode strings this may need to be reduced by 1, see below
-						$effective_space_remaining = $space_remaining;
-
-						// for uncompressed strings, sometimes effective space remaining is reduced by 1
-						if ( $encoding == 1 && (strlen($string) - $space_remaining) % 2 == 1 ) {
-							--$effective_space_remaining;
-						}
-
-						// one block fininshed, store the block data
-						$recordData .= substr($string, 0, $effective_space_remaining);
-
-						$string = substr($string, $effective_space_remaining); // for next cycle in while loop
-						$recordDatas[] = $recordData;
-
-						// start new record data block with the repeated option flags
-						$recordData = pack('C', $encoding);
-					}
-				}
-			}
-		}
-
-		// Store the last record data block unless it is empty
-		// if there was no need for any continue records, this will be the for SST record data block itself
-		if (strlen($recordData) > 0) {
-			$recordDatas[] = $recordData;
-		}
-
-		// combine into one chunk with all the blocks SST, CONTINUE,...
-		$chunk = '';
-		foreach ($recordDatas as $i => $recordData) {
-			// first block should have the SST record header, remaing should have CONTINUE header
-			$record = ($i == 0) ? 0x00FC : 0x003C;
-
-			$header = pack("vv", $record, strlen($recordData));
-			$data = $header . $recordData;
-
-			$chunk .= $this->writeData($data);
-		}
-
-		return $chunk;
-	}
-
-	/**
-	 * Writes the MSODRAWINGGROUP record if needed. Possibly split using CONTINUE records.
-	 */
-	private function _writeMsoDrawingGroup()
-	{
-		// write the Escher stream if necessary
-		if (isset($this->_escher)) {
-			$writer = new PHPExcel_Writer_Excel5_Escher($this->_escher);
-			$data = $writer->close();
-
-			$record = 0x00EB;
-			$length = strlen($data);
-			$header = pack("vv",  $record, $length);
-
-			return $this->writeData($header . $data);
-
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Get Escher object
-	 *
-	 * @return PHPExcel_Shared_Escher
-	 */
-	public function getEscher()
-	{
-		return $this->_escher;
-	}
-
-	/**
-	 * Set Escher object
-	 *
-	 * @param PHPExcel_Shared_Escher $pValue
-	 */
-	public function setEscher(PHPExcel_Shared_Escher $pValue = null)
-	{
-		$this->_escher = $pValue;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Worksheet.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Worksheet.php
deleted file mode 100755
index d6d6c2144..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Worksheet.php
+++ /dev/null
@@ -1,2954 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of PEAR::Spreadsheet_Excel_Writer_Worksheet (used as the base for this class):
-// -----------------------------------------------------------------------------------------
-// /*
-// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-// *
-// *  The majority of this is _NOT_ my code.  I simply ported it from the
-// *  PERL Spreadsheet::WriteExcel module.
-// *
-// *  The author of the Spreadsheet::WriteExcel module is John McNamara
-// *  <jmcnamara@cpan.org>
-// *
-// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
-// *  porting of this code to PHP.  Any questions directly related to this
-// *  class library should be directed to me.
-// *
-// *  License Information:
-// *
-// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
-// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
-// *
-// *    This library is free software; you can redistribute it and/or
-// *    modify it under the terms of the GNU Lesser General Public
-// *    License as published by the Free Software Foundation; either
-// *    version 2.1 of the License, or (at your option) any later version.
-// *
-// *    This library is distributed in the hope that it will be useful,
-// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// *    Lesser General Public License for more details.
-// *
-// *    You should have received a copy of the GNU Lesser General Public
-// *    License along with this library; if not, write to the Free Software
-// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// */
-
-
-/**
- * PHPExcel_Writer_Excel5_Worksheet
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
-{
-	/**
-	 * Formula parser
-	 *
-	 * @var PHPExcel_Writer_Excel5_Parser
-	 */
-	private $_parser;
-
-	/**
-	 * Maximum number of characters for a string (LABEL record in BIFF5)
-	 * @var integer
-	 */
-	public $_xls_strmax;
-
-	/**
-	 * Array containing format information for columns
-	 * @var array
-	 */
-	public $_colinfo;
-
-	/**
-	 * Array containing the selected area for the worksheet
-	 * @var array
-	 */
-	public $_selection;
-
-	/**
-	 * The active pane for the worksheet
-	 * @var integer
-	 */
-	public $_active_pane;
-
-	/**
-	 * Whether to use outline.
-	 * @var integer
-	 */
-	public $_outline_on;
-
-	/**
-	 * Auto outline styles.
-	 * @var bool
-	 */
-	public $_outline_style;
-
-	/**
-	 * Whether to have outline summary below.
-	 * @var bool
-	 */
-	public $_outline_below;
-
-	/**
-	 * Whether to have outline summary at the right.
-	 * @var bool
-	 */
-	public $_outline_right;
-
-	/**
-	 * Reference to the total number of strings in the workbook
-	 * @var integer
-	 */
-	public $_str_total;
-
-	/**
-	 * Reference to the number of unique strings in the workbook
-	 * @var integer
-	 */
-	public $_str_unique;
-
-	/**
-	 * Reference to the array containing all the unique strings in the workbook
-	 * @var array
-	 */
-	public $_str_table;
-
-	/**
-	 * Color cache
-	 */
-	private $_colors;
-
-	/**
-	 * Index of first used row (at least 0)
-	 * @var int
-	 */
-	private $_firstRowIndex;
-
-	/**
-	 * Index of last used row. (no used rows means -1)
-	 * @var int
-	 */
-	private $_lastRowIndex;
-
-	/**
-	 * Index of first used column (at least 0)
-	 * @var int
-	 */
-	private $_firstColumnIndex;
-
-	/**
-	 * Index of last used column (no used columns means -1)
-	 * @var int
-	 */
-	private $_lastColumnIndex;
-
-	/**
-	 * Sheet object
-	 * @var PHPExcel_Worksheet
-	 */
-	public $_phpSheet;
-
-	/**
-	 * Count cell style Xfs
-	 *
-	 * @var int
-	 */
-	private $_countCellStyleXfs;
-
-	/**
-	 * Escher object corresponding to MSODRAWING
-	 *
-	 * @var PHPExcel_Shared_Escher
-	 */
-	private $_escher;
-
-	/**
-	 * Array of font hashes associated to FONT records index
-	 *
-	 * @var array
-	 */
-	public $_fntHashIndex;
-
-	/**
-	 * Constructor
-	 *
-	 * @param int		&$str_total		Total number of strings
-	 * @param int		&$str_unique	Total number of unique strings
-	 * @param array		&$str_table		String Table
-	 * @param array		&$colors		Colour Table
-	 * @param mixed		$parser			The formula parser created for the Workbook
-	 * @param boolean	$preCalculateFormulas	Flag indicating whether formulas should be calculated or just written
-	 * @param string	$phpSheet		The worksheet to write
-	 * @param PHPExcel_Worksheet $phpSheet
-	 */
-	public function __construct(&$str_total, &$str_unique, &$str_table, &$colors,
-								$parser, $preCalculateFormulas, $phpSheet)
-	{
-		// It needs to call its parent's constructor explicitly
-		parent::__construct();
-
-		// change BIFFwriter limit for CONTINUE records
-//		$this->_limit = 8224;
-
-
-		$this->_preCalculateFormulas = $preCalculateFormulas;
-		$this->_str_total		= &$str_total;
-		$this->_str_unique		= &$str_unique;
-		$this->_str_table		= &$str_table;
-		$this->_colors			= &$colors;
-		$this->_parser			= $parser;
-
-		$this->_phpSheet = $phpSheet;
-
-		//$this->ext_sheets		= array();
-		//$this->offset			= 0;
-		$this->_xls_strmax		= 255;
-		$this->_colinfo			= array();
-		$this->_selection		= array(0,0,0,0);
-		$this->_active_pane		= 3;
-
-		$this->_print_headers		= 0;
-
-		$this->_outline_style		= 0;
-		$this->_outline_below		= 1;
-		$this->_outline_right		= 1;
-		$this->_outline_on			= 1;
-
-		$this->_fntHashIndex	= array();
-
-		// calculate values for DIMENSIONS record
-		$minR = 1;
-		$minC = 'A';
-
-		$maxR  = $this->_phpSheet->getHighestRow();
-		$maxC = $this->_phpSheet->getHighestColumn();
-
-		// Determine lowest and highest column and row
-//		$this->_firstRowIndex = ($minR > 65535) ? 65535 : $minR;
-		$this->_lastRowIndex = ($maxR > 65535) ? 65535 : $maxR ;
-
-		$this->_firstColumnIndex	= PHPExcel_Cell::columnIndexFromString($minC);
-		$this->_lastColumnIndex		= PHPExcel_Cell::columnIndexFromString($maxC);
-
-//		if ($this->_firstColumnIndex > 255) $this->_firstColumnIndex = 255;
-		if ($this->_lastColumnIndex > 255) $this->_lastColumnIndex = 255;
-
-		$this->_countCellStyleXfs = count($phpSheet->getParent()->getCellStyleXfCollection());
-	}
-
-	/**
-	 * Add data to the beginning of the workbook (note the reverse order)
-	 * and to the end of the workbook.
-	 *
-	 * @access public
-	 * @see PHPExcel_Writer_Excel5_Workbook::storeWorkbook()
-	 */
-	function close()
-	{
-		$_phpSheet = $this->_phpSheet;
-
-		$num_sheets = $_phpSheet->getParent()->getSheetCount();
-
-		// Write BOF record
-		$this->_storeBof(0x0010);
-
-		// Write PRINTHEADERS
-		$this->_writePrintHeaders();
-
-		// Write PRINTGRIDLINES
-		$this->_writePrintGridlines();
-
-		// Write GRIDSET
-		$this->_writeGridset();
-
-		// Calculate column widths
-		$_phpSheet->calculateColumnWidths();
-
-		// Column dimensions
-		if (($defaultWidth = $_phpSheet->getDefaultColumnDimension()->getWidth()) < 0) {
-			$defaultWidth = PHPExcel_Shared_Font::getDefaultColumnWidthByFont($_phpSheet->getParent()->getDefaultStyle()->getFont());
-		}
-
-		$columnDimensions = $_phpSheet->getColumnDimensions();
-		$maxCol = $this->_lastColumnIndex -1;
-		for ($i = 0; $i <= $maxCol; ++$i) {
-			$hidden = 0;
-			$level = 0;
-			$xfIndex = 15; // there are 15 cell style Xfs
-
-			$width = $defaultWidth;
-
-			$columnLetter = PHPExcel_Cell::stringFromColumnIndex($i);
-			if (isset($columnDimensions[$columnLetter])) {
-				$columnDimension = $columnDimensions[$columnLetter];
-				if ($columnDimension->getWidth() >= 0) {
-					$width = $columnDimension->getWidth();
-				}
-				$hidden = $columnDimension->getVisible() ? 0 : 1;
-				$level = $columnDimension->getOutlineLevel();
-				$xfIndex = $columnDimension->getXfIndex() + 15; // there are 15 cell style Xfs
-			}
-
-			// Components of _colinfo:
-			// $firstcol first column on the range
-			// $lastcol  last column on the range
-			// $width	width to set
-			// $xfIndex  The optional cell style Xf index to apply to the columns
-			// $hidden   The optional hidden atribute
-			// $level	The optional outline level
-			$this->_colinfo[] = array($i, $i, $width, $xfIndex, $hidden, $level);
-		}
-
-		// Write GUTS
-		$this->_writeGuts();
-
-		// Write DEFAULTROWHEIGHT
-		$this->_writeDefaultRowHeight();
-
-		// Write WSBOOL
-		$this->_writeWsbool();
-
-		// Write horizontal and vertical page breaks
-		$this->_writeBreaks();
-
-		// Write page header
-		$this->_writeHeader();
-
-		// Write page footer
-		$this->_writeFooter();
-
-		// Write page horizontal centering
-		$this->_writeHcenter();
-
-		// Write page vertical centering
-		$this->_writeVcenter();
-
-		// Write left margin
-		$this->_writeMarginLeft();
-
-		// Write right margin
-		$this->_writeMarginRight();
-
-		// Write top margin
-		$this->_writeMarginTop();
-
-		// Write bottom margin
-		$this->_writeMarginBottom();
-
-		// Write page setup
-		$this->_writeSetup();
-
-		// Write sheet protection
-		$this->_writeProtect();
-
-		// Write SCENPROTECT
-		$this->_writeScenProtect();
-
-		// Write OBJECTPROTECT
-		$this->_writeObjectProtect();
-
-		// Write sheet password
-		$this->_writePassword();
-
-		// Write DEFCOLWIDTH record
-		$this->_writeDefcol();
-
-		// Write the COLINFO records if they exist
-		if (!empty($this->_colinfo)) {
-			$colcount = count($this->_colinfo);
-			for ($i = 0; $i < $colcount; ++$i) {
-				$this->_writeColinfo($this->_colinfo[$i]);
-			}
-		}
-		$autoFilterRange = $_phpSheet->getAutoFilter()->getRange();
-		if (!empty($autoFilterRange)) {
-			// Write AUTOFILTERINFO
-			$this->_writeAutoFilterInfo();
-		}
-
-		// Write sheet dimensions
-		$this->_writeDimensions();
-
-		// Row dimensions
-		foreach ($_phpSheet->getRowDimensions() as $rowDimension) {
-			$xfIndex = $rowDimension->getXfIndex() + 15; // there are 15 cellXfs
-			$this->_writeRow( $rowDimension->getRowIndex() - 1, $rowDimension->getRowHeight(), $xfIndex, ($rowDimension->getVisible() ? '0' : '1'), $rowDimension->getOutlineLevel() );
-		}
-
-		// Write Cells
-		foreach ($_phpSheet->getCellCollection() as $cellID) {
-			$cell = $_phpSheet->getCell($cellID);
-			$row = $cell->getRow() - 1;
-			$column = PHPExcel_Cell::columnIndexFromString($cell->getColumn()) - 1;
-
-			// Don't break Excel!
-//			if ($row + 1 > 65536 or $column + 1 > 256) {
-			if ($row > 65535 || $column > 255) {
-				break;
-			}
-
-			// Write cell value
-			$xfIndex = $cell->getXfIndex() + 15; // there are 15 cell style Xfs
-
-			$cVal = $cell->getValue();
-			if ($cVal instanceof PHPExcel_RichText) {
-				// $this->_writeString($row, $column, $cVal->getPlainText(), $xfIndex);
-				$arrcRun = array();
-				$str_len = strlen($cVal->getPlainText());
-				$str_pos = 0;
-				$elements = $cVal->getRichTextElements();
-				foreach ($elements as $element) {
-					// FONT Index
-					if ($element instanceof PHPExcel_RichText_Run) {
-						$str_fontidx = $this->_fntHashIndex[$element->getFont()->getHashCode()];
-					}
-					else {
-						$str_fontidx = 0;
-					}
-					$arrcRun[] = array('strlen' => $str_pos, 'fontidx' => $str_fontidx);
-					// Position FROM
-					$str_pos += strlen($element->getText());
-				}
-				$this->_writeRichTextString($row, $column, $cVal->getPlainText(), $xfIndex, $arrcRun);
-			} else {
-				switch ($cell->getDatatype()) {
-					case PHPExcel_Cell_DataType::TYPE_STRING:
-					case PHPExcel_Cell_DataType::TYPE_NULL:
-						if ($cVal === '' || $cVal === null) {
-							$this->_writeBlank($row, $column, $xfIndex);
-						} else {
-							$this->_writeString($row, $column, $cVal, $xfIndex);
-						}
-						break;
-
-					case PHPExcel_Cell_DataType::TYPE_NUMERIC:
-						$this->_writeNumber($row, $column, $cVal, $xfIndex);
-						break;
-
-					case PHPExcel_Cell_DataType::TYPE_FORMULA:
-						$calculatedValue = $this->_preCalculateFormulas ?
-							$cell->getCalculatedValue() : null;
-						$this->_writeFormula($row, $column, $cVal, $xfIndex, $calculatedValue);
-						break;
-
-					case PHPExcel_Cell_DataType::TYPE_BOOL:
-						$this->_writeBoolErr($row, $column, $cVal, 0, $xfIndex);
-						break;
-
-					case PHPExcel_Cell_DataType::TYPE_ERROR:
-						$this->_writeBoolErr($row, $column, self::_mapErrorCode($cVal), 1, $xfIndex);
-						break;
-
-				}
-			}
-		}
-
-		// Append
-		$this->_writeMsoDrawing();
-
-		$this->_writeWindow2();
-		$this->_writeZoom();
-		if ($_phpSheet->getFreezePane()) {
-			$this->_writePanes();
-		}
-		$this->_writeSelection();
-		$this->_writeMergedCells();
-
-		// Hyperlinks
-		foreach ($_phpSheet->getHyperLinkCollection() as $coordinate => $hyperlink) {
-			list($column, $row) = PHPExcel_Cell::coordinateFromString($coordinate);
-
-			$url = $hyperlink->getUrl();
-
-			if ( strpos($url, 'sheet://') !== false ) {
-				// internal to current workbook
-				$url = str_replace('sheet://', 'internal:', $url);
-
-			} else if ( preg_match('/^(http:|https:|ftp:|mailto:)/', $url) ) {
-				// URL
-				// $url = $url;
-
-			} else {
-				// external (local file)
-				$url = 'external:' . $url;
-			}
-
-			$this->_writeUrl($row - 1, PHPExcel_Cell::columnIndexFromString($column) - 1, $url);
-		}
-
-		$this->_writeDataValidity();
-		$this->_writeSheetLayout();
-		$this->_writeSheetProtection();
-		$this->_writeRangeProtection();
-
-		$this->_storeEof();
-	}
-
-	/**
-	 * Write a cell range address in BIFF8
-	 * always fixed range
-	 * See section 2.5.14 in OpenOffice.org's Documentation of the Microsoft Excel File Format
-	 *
-	 * @param string $range E.g. 'A1' or 'A1:B6'
-	 * @return string Binary data
-	 */
-	private function _writeBIFF8CellRangeAddressFixed($range = 'A1')
-	{
-		$explodes = explode(':', $range);
-
-		// extract first cell, e.g. 'A1'
-		$firstCell = $explodes[0];
-
-		// extract last cell, e.g. 'B6'
-		if (count($explodes) == 1) {
-			$lastCell = $firstCell;
-		} else {
-			$lastCell = $explodes[1];
-		}
-
-		$firstCellCoordinates = PHPExcel_Cell::coordinateFromString($firstCell); // e.g. array(0, 1)
-		$lastCellCoordinates  = PHPExcel_Cell::coordinateFromString($lastCell);  // e.g. array(1, 6)
-
-		return(pack('vvvv',
-			$firstCellCoordinates[1] - 1,
-			$lastCellCoordinates[1] - 1,
-			PHPExcel_Cell::columnIndexFromString($firstCellCoordinates[0]) - 1,
-			PHPExcel_Cell::columnIndexFromString($lastCellCoordinates[0]) - 1
-		));
-	}
-
-	/**
-	 * Retrieves data from memory in one chunk, or from disk in $buffer
-	 * sized chunks.
-	 *
-	 * @return string The data
-	 */
-	function getData()
-	{
-		$buffer = 4096;
-
-		// Return data stored in memory
-		if (isset($this->_data)) {
-			$tmp   = $this->_data;
-			unset($this->_data);
-			return $tmp;
-		}
-		// No data to return
-		return false;
-	}
-
-	/**
-	 * Set the option to print the row and column headers on the printed page.
-	 *
-	 * @access public
-	 * @param integer $print Whether to print the headers or not. Defaults to 1 (print).
-	 */
-	function printRowColHeaders($print = 1)
-	{
-		$this->_print_headers = $print;
-	}
-
-	/**
-	 * This method sets the properties for outlining and grouping. The defaults
-	 * correspond to Excel's defaults.
-	 *
-	 * @param bool $visible
-	 * @param bool $symbols_below
-	 * @param bool $symbols_right
-	 * @param bool $auto_style
-	 */
-	function setOutline($visible = true, $symbols_below = true, $symbols_right = true, $auto_style = false)
-	{
-		$this->_outline_on	= $visible;
-		$this->_outline_below = $symbols_below;
-		$this->_outline_right = $symbols_right;
-		$this->_outline_style = $auto_style;
-
-		// Ensure this is a boolean vale for Window2
-		if ($this->_outline_on) {
-			$this->_outline_on = 1;
-		}
-	 }
-
-	/**
-	 * Write a double to the specified row and column (zero indexed).
-	 * An integer can be written as a double. Excel will display an
-	 * integer. $format is optional.
-	 *
-	 * Returns  0 : normal termination
-	 *		 -2 : row or column out of range
-	 *
-	 * @param integer $row	Zero indexed row
-	 * @param integer $col	Zero indexed column
-	 * @param float   $num	The number to write
-	 * @param mixed   $xfIndex The optional XF format
-	 * @return integer
-	 */
-	private function _writeNumber($row, $col, $num, $xfIndex)
-	{
-		$record	= 0x0203;				 // Record identifier
-		$length	= 0x000E;				 // Number of bytes to follow
-
-		$header		= pack("vv",  $record, $length);
-		$data		= pack("vvv", $row, $col, $xfIndex);
-		$xl_double	= pack("d",   $num);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$xl_double = strrev($xl_double);
-		}
-
-		$this->_append($header.$data.$xl_double);
-		return(0);
-	}
-
-	/**
-	 * Write a LABELSST record or a LABEL record. Which one depends on BIFF version
-	 *
-	 * @param int $row Row index (0-based)
-	 * @param int $col Column index (0-based)
-	 * @param string $str The string
-	 * @param int $xfIndex Index to XF record
-	 */
-	private function _writeString($row, $col, $str, $xfIndex)
-	{
-		$this->_writeLabelSst($row, $col, $str, $xfIndex);
-	}
-	/**
-	 * Write a LABELSST record or a LABEL record. Which one depends on BIFF version
-	 * It differs from _writeString by the writing of rich text strings.
-	 * @param int $row Row index (0-based)
-	 * @param int $col Column index (0-based)
-	 * @param string $str The string
-	 * @param mixed   $xfIndex The XF format index for the cell
-	 * @param array $arrcRun Index to Font record and characters beginning
-	 */
-	private function _writeRichTextString($row, $col, $str, $xfIndex, $arrcRun){
-		$record	= 0x00FD;				   // Record identifier
-		$length	= 0x000A;				   // Bytes to follow
-
-		$str = PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($str, $arrcRun);
-
-		/* check if string is already present */
-		if (!isset($this->_str_table[$str])) {
-			$this->_str_table[$str] = $this->_str_unique++;
-		}
-		$this->_str_total++;
-
-		$header	= pack('vv',   $record, $length);
-		$data	= pack('vvvV', $row, $col, $xfIndex, $this->_str_table[$str]);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write a string to the specified row and column (zero indexed).
-	 * NOTE: there is an Excel 5 defined limit of 255 characters.
-	 * $format is optional.
-	 * Returns  0 : normal termination
-	 *		 -2 : row or column out of range
-	 *		 -3 : long string truncated to 255 chars
-	 *
-	 * @access public
-	 * @param integer $row	Zero indexed row
-	 * @param integer $col	Zero indexed column
-	 * @param string  $str	The string to write
-	 * @param mixed   $xfIndex The XF format index for the cell
-	 * @return integer
-	 */
-	private function _writeLabel($row, $col, $str, $xfIndex)
-	{
-		$strlen	= strlen($str);
-		$record	= 0x0204;				   // Record identifier
-		$length	= 0x0008 + $strlen;		 // Bytes to follow
-
-		$str_error = 0;
-
-		if ($strlen > $this->_xls_strmax) { // LABEL must be < 255 chars
-			$str	= substr($str, 0, $this->_xls_strmax);
-			$length	= 0x0008 + $this->_xls_strmax;
-			$strlen	= $this->_xls_strmax;
-			$str_error = -3;
-		}
-
-		$header	= pack("vv",   $record, $length);
-		$data	= pack("vvvv", $row, $col, $xfIndex, $strlen);
-		$this->_append($header . $data . $str);
-		return($str_error);
-	}
-
-	/**
-	 * Write a string to the specified row and column (zero indexed).
-	 * This is the BIFF8 version (no 255 chars limit).
-	 * $format is optional.
-	 * Returns  0 : normal termination
-	 *		 -2 : row or column out of range
-	 *		 -3 : long string truncated to 255 chars
-	 *
-	 * @access public
-	 * @param integer $row	Zero indexed row
-	 * @param integer $col	Zero indexed column
-	 * @param string  $str	The string to write
-	 * @param mixed   $xfIndex The XF format index for the cell
-	 * @return integer
-	 */
-	private function _writeLabelSst($row, $col, $str, $xfIndex)
-	{
-		$record	= 0x00FD;				   // Record identifier
-		$length	= 0x000A;				   // Bytes to follow
-
-		$str = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($str);
-
-		/* check if string is already present */
-		if (!isset($this->_str_table[$str])) {
-			$this->_str_table[$str] = $this->_str_unique++;
-		}
-		$this->_str_total++;
-
-		$header	= pack('vv',   $record, $length);
-		$data	= pack('vvvV', $row, $col, $xfIndex, $this->_str_table[$str]);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Writes a note associated with the cell given by the row and column.
-	 * NOTE records don't have a length limit.
-	 *
-	 * @param integer $row	Zero indexed row
-	 * @param integer $col	Zero indexed column
-	 * @param string  $note   The note to write
-	 */
-	private function _writeNote($row, $col, $note)
-	{
-		$note_length	= strlen($note);
-		$record			= 0x001C;			// Record identifier
-		$max_length		= 2048;				// Maximun length for a NOTE record
-
-		// Length for this record is no more than 2048 + 6
-		$length	= 0x0006 + min($note_length, 2048);
-		$header	= pack("vv",   $record, $length);
-		$data	= pack("vvv", $row, $col, $note_length);
-		$this->_append($header . $data . substr($note, 0, 2048));
-
-		for ($i = $max_length; $i < $note_length; $i += $max_length) {
-			$chunk  = substr($note, $i, $max_length);
-			$length = 0x0006 + strlen($chunk);
-			$header = pack("vv",   $record, $length);
-			$data   = pack("vvv", -1, 0, strlen($chunk));
-			$this->_append($header.$data.$chunk);
-		}
-		return(0);
-	}
-
-	/**
-	 * Write a blank cell to the specified row and column (zero indexed).
-	 * A blank cell is used to specify formatting without adding a string
-	 * or a number.
-	 *
-	 * A blank cell without a format serves no purpose. Therefore, we don't write
-	 * a BLANK record unless a format is specified.
-	 *
-	 * Returns  0 : normal termination (including no format)
-	 *		 -1 : insufficient number of arguments
-	 *		 -2 : row or column out of range
-	 *
-	 * @param integer $row	Zero indexed row
-	 * @param integer $col	Zero indexed column
-	 * @param mixed   $xfIndex The XF format index
-	 */
-	function _writeBlank($row, $col, $xfIndex)
-	{
-		$record	= 0x0201;				 // Record identifier
-		$length	= 0x0006;				 // Number of bytes to follow
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("vvv", $row, $col, $xfIndex);
-		$this->_append($header . $data);
-		return 0;
-	}
-
-	/**
-	 * Write a boolean or an error type to the specified row and column (zero indexed)
-	 *
-	 * @param int $row Row index (0-based)
-	 * @param int $col Column index (0-based)
-	 * @param int $value
-	 * @param boolean $isError Error or Boolean?
-	 * @param int $xfIndex
-	 */
-	private function _writeBoolErr($row, $col, $value, $isError, $xfIndex)
-	{
-		$record = 0x0205;
-		$length = 8;
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("vvvCC", $row, $col, $xfIndex, $value, $isError);
-		$this->_append($header . $data);
-		return 0;
-	}
-
-	/**
-	 * Write a formula to the specified row and column (zero indexed).
-	 * The textual representation of the formula is passed to the parser in
-	 * Parser.php which returns a packed binary string.
-	 *
-	 * Returns  0 : normal termination
-	 *		 -1 : formula errors (bad formula)
-	 *		 -2 : row or column out of range
-	 *
-	 * @param integer $row	 Zero indexed row
-	 * @param integer $col	 Zero indexed column
-	 * @param string  $formula The formula text string
-	 * @param mixed   $xfIndex  The XF format index
-	 * @param mixed   $calculatedValue  Calculated value
-	 * @return integer
-	 */
-	private function _writeFormula($row, $col, $formula, $xfIndex, $calculatedValue)
-	{
-		$record	= 0x0006;	 // Record identifier
-
-		// Initialize possible additional value for STRING record that should be written after the FORMULA record?
-		$stringValue = null;
-
-		// calculated value
-		if (isset($calculatedValue)) {
-			// Since we can't yet get the data type of the calculated value,
-			// we use best effort to determine data type
-			if (is_bool($calculatedValue)) {
-				// Boolean value
-				$num = pack('CCCvCv', 0x01, 0x00, (int)$calculatedValue, 0x00, 0x00, 0xFFFF);
-			} elseif (is_int($calculatedValue) || is_float($calculatedValue)) {
-				// Numeric value
-				$num = pack('d', $calculatedValue);
-			} elseif (is_string($calculatedValue)) {
-				if (array_key_exists($calculatedValue, PHPExcel_Cell_DataType::getErrorCodes())) {
-					// Error value
-					$num = pack('CCCvCv', 0x02, 0x00, self::_mapErrorCode($calculatedValue), 0x00, 0x00, 0xFFFF);
-				} elseif ($calculatedValue === '') {
-					// Empty string (and BIFF8)
-					$num = pack('CCCvCv', 0x03, 0x00, 0x00, 0x00, 0x00, 0xFFFF);
-				} else {
-					// Non-empty string value (or empty string BIFF5)
-					$stringValue = $calculatedValue;
-					$num = pack('CCCvCv', 0x00, 0x00, 0x00, 0x00, 0x00, 0xFFFF);
-				}
-			} else {
-				// We are really not supposed to reach here
-				$num = pack('d', 0x00);
-			}
-		} else {
-			$num = pack('d', 0x00);
-		}
-
-		$grbit		= 0x03;				// Option flags
-		$unknown	= 0x0000;			// Must be zero
-
-		// Strip the '=' or '@' sign at the beginning of the formula string
-		if ($formula{0} == '=') {
-			$formula = substr($formula,1);
-		} else {
-			// Error handling
-			$this->_writeString($row, $col, 'Unrecognised character for formula');
-			return -1;
-		}
-
-		// Parse the formula using the parser in Parser.php
-		try {
-			$error = $this->_parser->parse($formula);
-			$formula = $this->_parser->toReversePolish();
-
-			$formlen	= strlen($formula);	// Length of the binary string
-			$length	 = 0x16 + $formlen;	 // Length of the record data
-
-			$header	= pack("vv",	  $record, $length);
-
-			$data	  = pack("vvv", $row, $col, $xfIndex)
-						. $num
-						. pack("vVv", $grbit, $unknown, $formlen);
-			$this->_append($header . $data . $formula);
-
-			// Append also a STRING record if necessary
-			if ($stringValue !== null) {
-				$this->_writeStringRecord($stringValue);
-			}
-
-			return 0;
-
-		} catch (Exception $e) {
-			// do nothing
-		}
-
-	}
-
-	/**
-	 * Write a STRING record. This
-	 *
-	 * @param string $stringValue
-	 */
-	private function _writeStringRecord($stringValue)
-	{
-		$record = 0x0207;	 // Record identifier
-		$data = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($stringValue);
-
-		$length = strlen($data);
-		$header = pack('vv', $record, $length);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write a hyperlink.
-	 * This is comprised of two elements: the visible label and
-	 * the invisible link. The visible label is the same as the link unless an
-	 * alternative string is specified. The label is written using the
-	 * _writeString() method. Therefore the 255 characters string limit applies.
-	 * $string and $format are optional.
-	 *
-	 * The hyperlink can be to a http, ftp, mail, internal sheet (not yet), or external
-	 * directory url.
-	 *
-	 * Returns  0 : normal termination
-	 *		 -2 : row or column out of range
-	 *		 -3 : long string truncated to 255 chars
-	 *
-	 * @param integer $row	Row
-	 * @param integer $col	Column
-	 * @param string  $url	URL string
-	 * @return integer
-	 */
-	private function _writeUrl($row, $col, $url)
-	{
-		// Add start row and col to arg list
-		return($this->_writeUrlRange($row, $col, $row, $col, $url));
-	}
-
-	/**
-	 * This is the more general form of _writeUrl(). It allows a hyperlink to be
-	 * written to a range of cells. This function also decides the type of hyperlink
-	 * to be written. These are either, Web (http, ftp, mailto), Internal
-	 * (Sheet1!A1) or external ('c:\temp\foo.xls#Sheet1!A1').
-	 *
-	 * @access private
-	 * @see _writeUrl()
-	 * @param integer $row1   Start row
-	 * @param integer $col1   Start column
-	 * @param integer $row2   End row
-	 * @param integer $col2   End column
-	 * @param string  $url	URL string
-	 * @return integer
-	 */
-	function _writeUrlRange($row1, $col1, $row2, $col2, $url)
-	{
-		// Check for internal/external sheet links or default to web link
-		if (preg_match('[^internal:]', $url)) {
-			return($this->_writeUrlInternal($row1, $col1, $row2, $col2, $url));
-		}
-		if (preg_match('[^external:]', $url)) {
-			return($this->_writeUrlExternal($row1, $col1, $row2, $col2, $url));
-		}
-		return($this->_writeUrlWeb($row1, $col1, $row2, $col2, $url));
-	}
-
-	/**
-	 * Used to write http, ftp and mailto hyperlinks.
-	 * The link type ($options) is 0x03 is the same as absolute dir ref without
-	 * sheet. However it is differentiated by the $unknown2 data stream.
-	 *
-	 * @access private
-	 * @see _writeUrl()
-	 * @param integer $row1   Start row
-	 * @param integer $col1   Start column
-	 * @param integer $row2   End row
-	 * @param integer $col2   End column
-	 * @param string  $url	URL string
-	 * @return integer
-	 */
-	function _writeUrlWeb($row1, $col1, $row2, $col2, $url)
-	{
-		$record	  = 0x01B8;					   // Record identifier
-		$length	  = 0x00000;					  // Bytes to follow
-
-		// Pack the undocumented parts of the hyperlink stream
-		$unknown1	= pack("H*", "D0C9EA79F9BACE118C8200AA004BA90B02000000");
-		$unknown2	= pack("H*", "E0C9EA79F9BACE118C8200AA004BA90B");
-
-		// Pack the option flags
-		$options	 = pack("V", 0x03);
-
-		// Convert URL to a null terminated wchar string
-		$url		 = join("\0", preg_split("''", $url, -1, PREG_SPLIT_NO_EMPTY));
-		$url		 = $url . "\0\0\0";
-
-		// Pack the length of the URL
-		$url_len	 = pack("V", strlen($url));
-
-		// Calculate the data length
-		$length	  = 0x34 + strlen($url);
-
-		// Pack the header data
-		$header	  = pack("vv",   $record, $length);
-		$data		= pack("vvvv", $row1, $row2, $col1, $col2);
-
-		// Write the packed data
-		$this->_append($header . $data .
-					   $unknown1 . $options .
-					   $unknown2 . $url_len . $url);
-		return 0;
-	}
-
-	/**
-	 * Used to write internal reference hyperlinks such as "Sheet1!A1".
-	 *
-	 * @access private
-	 * @see _writeUrl()
-	 * @param integer $row1   Start row
-	 * @param integer $col1   Start column
-	 * @param integer $row2   End row
-	 * @param integer $col2   End column
-	 * @param string  $url	URL string
-	 * @return integer
-	 */
-	function _writeUrlInternal($row1, $col1, $row2, $col2, $url)
-	{
-		$record	  = 0x01B8;					   // Record identifier
-		$length	  = 0x00000;					  // Bytes to follow
-
-		// Strip URL type
-		$url = preg_replace('/^internal:/', '', $url);
-
-		// Pack the undocumented parts of the hyperlink stream
-		$unknown1	= pack("H*", "D0C9EA79F9BACE118C8200AA004BA90B02000000");
-
-		// Pack the option flags
-		$options	 = pack("V", 0x08);
-
-		// Convert the URL type and to a null terminated wchar string
-		$url .= "\0";
-
-		// character count
-		$url_len = PHPExcel_Shared_String::CountCharacters($url);
-		$url_len = pack('V', $url_len);
-
-		$url = PHPExcel_Shared_String::ConvertEncoding($url, 'UTF-16LE', 'UTF-8');
-
-		// Calculate the data length
-		$length	  = 0x24 + strlen($url);
-
-		// Pack the header data
-		$header	  = pack("vv",   $record, $length);
-		$data		= pack("vvvv", $row1, $row2, $col1, $col2);
-
-		// Write the packed data
-		$this->_append($header . $data .
-					   $unknown1 . $options .
-					   $url_len . $url);
-		return 0;
-	}
-
-	/**
-	 * Write links to external directory names such as 'c:\foo.xls',
-	 * c:\foo.xls#Sheet1!A1', '../../foo.xls'. and '../../foo.xls#Sheet1!A1'.
-	 *
-	 * Note: Excel writes some relative links with the $dir_long string. We ignore
-	 * these cases for the sake of simpler code.
-	 *
-	 * @access private
-	 * @see _writeUrl()
-	 * @param integer $row1   Start row
-	 * @param integer $col1   Start column
-	 * @param integer $row2   End row
-	 * @param integer $col2   End column
-	 * @param string  $url	URL string
-	 * @return integer
-	 */
-	function _writeUrlExternal($row1, $col1, $row2, $col2, $url)
-	{
-		// Network drives are different. We will handle them separately
-		// MS/Novell network drives and shares start with \\
-		if (preg_match('[^external:\\\\]', $url)) {
-			return; //($this->_writeUrlExternal_net($row1, $col1, $row2, $col2, $url, $str, $format));
-		}
-
-		$record	  = 0x01B8;					   // Record identifier
-		$length	  = 0x00000;					  // Bytes to follow
-
-		// Strip URL type and change Unix dir separator to Dos style (if needed)
-		//
-		$url = preg_replace('/^external:/', '', $url);
-		$url = preg_replace('/\//', "\\", $url);
-
-		// Determine if the link is relative or absolute:
-		//   relative if link contains no dir separator, "somefile.xls"
-		//   relative if link starts with up-dir, "..\..\somefile.xls"
-		//   otherwise, absolute
-
-		$absolute = 0x00; // relative path
-		if ( preg_match('/^[A-Z]:/', $url) ) {
-			$absolute = 0x02; // absolute path on Windows, e.g. C:\...
-		}
-		$link_type			   = 0x01 | $absolute;
-
-		// Determine if the link contains a sheet reference and change some of the
-		// parameters accordingly.
-		// Split the dir name and sheet name (if it exists)
-		$dir_long = $url;
-		if (preg_match("/\#/", $url)) {
-			$link_type |= 0x08;
-		}
-
-
-		// Pack the link type
-		$link_type   = pack("V", $link_type);
-
-		// Calculate the up-level dir count e.g.. (..\..\..\ == 3)
-		$up_count	= preg_match_all("/\.\.\\\/", $dir_long, $useless);
-		$up_count	= pack("v", $up_count);
-
-		// Store the short dos dir name (null terminated)
-		$dir_short   = preg_replace("/\.\.\\\/", '', $dir_long) . "\0";
-
-		// Store the long dir name as a wchar string (non-null terminated)
-		$dir_long	   = $dir_long . "\0";
-
-		// Pack the lengths of the dir strings
-		$dir_short_len = pack("V", strlen($dir_short)	  );
-		$dir_long_len  = pack("V", strlen($dir_long)	   );
-		$stream_len	= pack("V", 0);//strlen($dir_long) + 0x06);
-
-		// Pack the undocumented parts of the hyperlink stream
-		$unknown1 = pack("H*",'D0C9EA79F9BACE118C8200AA004BA90B02000000'	   );
-		$unknown2 = pack("H*",'0303000000000000C000000000000046'			   );
-		$unknown3 = pack("H*",'FFFFADDE000000000000000000000000000000000000000');
-		$unknown4 = pack("v",  0x03											);
-
-		// Pack the main data stream
-		$data		= pack("vvvv", $row1, $row2, $col1, $col2) .
-						  $unknown1	 .
-						  $link_type	.
-						  $unknown2	 .
-						  $up_count	 .
-						  $dir_short_len.
-						  $dir_short	.
-						  $unknown3	 .
-						  $stream_len   ;/*.
-						  $dir_long_len .
-						  $unknown4	 .
-						  $dir_long	 .
-						  $sheet_len	.
-						  $sheet		;*/
-
-		// Pack the header data
-		$length   = strlen($data);
-		$header   = pack("vv", $record, $length);
-
-		// Write the packed data
-		$this->_append($header. $data);
-		return 0;
-	}
-
-	/**
-	 * This method is used to set the height and format for a row.
-	 *
-	 * @param integer $row	The row to set
-	 * @param integer $height Height we are giving to the row.
-	 *						Use null to set XF without setting height
-	 * @param integer $xfIndex  The optional cell style Xf index to apply to the columns
-	 * @param bool	$hidden The optional hidden attribute
-	 * @param integer $level  The optional outline level for row, in range [0,7]
-	 */
-	private function _writeRow($row, $height, $xfIndex, $hidden = false, $level = 0)
-	{
-		$record	  = 0x0208;			   // Record identifier
-		$length	  = 0x0010;			   // Number of bytes to follow
-
-		$colMic	  = 0x0000;			   // First defined column
-		$colMac	  = 0x0000;			   // Last defined column
-		$irwMac	  = 0x0000;			   // Used by Excel to optimise loading
-		$reserved	= 0x0000;			   // Reserved
-		$grbit	   = 0x0000;			   // Option flags
-		$ixfe		= $xfIndex;
-
-		if ( $height < 0 ){
-			$height = null;
-		}
-
-		// Use _writeRow($row, null, $XF) to set XF format without setting height
-		if ($height != null) {
-			$miyRw = $height * 20;  // row height
-		} else {
-			$miyRw = 0xff;		  // default row height is 256
-		}
-
-		// Set the options flags. fUnsynced is used to show that the font and row
-		// heights are not compatible. This is usually the case for WriteExcel.
-		// The collapsed flag 0x10 doesn't seem to be used to indicate that a row
-		// is collapsed. Instead it is used to indicate that the previous row is
-		// collapsed. The zero height flag, 0x20, is used to collapse a row.
-
-		$grbit |= $level;
-		if ($hidden) {
-			$grbit |= 0x0020;
-		}
-		if ($height !== null) {
-			$grbit |= 0x0040; // fUnsynced
-		}
-		if ($xfIndex !== 0xF) {
-			$grbit |= 0x0080;
-		}
-		$grbit |= 0x0100;
-
-		$header   = pack("vv",	   $record, $length);
-		$data	 = pack("vvvvvvvv", $row, $colMic, $colMac, $miyRw,
-									 $irwMac,$reserved, $grbit, $ixfe);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Writes Excel DIMENSIONS to define the area in which there is data.
-	 */
-	private function _writeDimensions()
-	{
-		$record = 0x0200; // Record identifier
-
-		$length = 0x000E;
-		$data = pack('VVvvv'
-				, $this->_firstRowIndex
-				, $this->_lastRowIndex + 1
-				, $this->_firstColumnIndex
-				, $this->_lastColumnIndex + 1
-				, 0x0000 // reserved
-			);
-
-		$header = pack("vv", $record, $length);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write BIFF record Window2.
-	 */
-	private function _writeWindow2()
-	{
-		$record		 = 0x023E;	 // Record identifier
-		$length		 = 0x0012;
-
-		$grbit		  = 0x00B6;	 // Option flags
-		$rwTop		  = 0x0000;	 // Top row visible in window
-		$colLeft		= 0x0000;	 // Leftmost column visible in window
-
-
-		// The options flags that comprise $grbit
-		$fDspFmla	   = 0;					 // 0 - bit
-		$fDspGrid	   = $this->_phpSheet->getShowGridlines() ? 1 : 0; // 1
-		$fDspRwCol	  = $this->_phpSheet->getShowRowColHeaders() ? 1 : 0; // 2
-		$fFrozen		= $this->_phpSheet->getFreezePane() ? 1 : 0;		// 3
-		$fDspZeros	  = 1;					 // 4
-		$fDefaultHdr	= 1;					 // 5
-		$fArabic		= $this->_phpSheet->getRightToLeft() ? 1 : 0; // 6
-		$fDspGuts	   = $this->_outline_on;	// 7
-		$fFrozenNoSplit = 0;					 // 0 - bit
-		// no support in PHPExcel for selected sheet, therefore sheet is only selected if it is the active sheet
-		$fSelected	  = ($this->_phpSheet === $this->_phpSheet->getParent()->getActiveSheet()) ? 1 : 0;
-		$fPaged		 = 1;					 // 2
-
-		$grbit			 = $fDspFmla;
-		$grbit			|= $fDspGrid	   << 1;
-		$grbit			|= $fDspRwCol	  << 2;
-		$grbit			|= $fFrozen		<< 3;
-		$grbit			|= $fDspZeros	  << 4;
-		$grbit			|= $fDefaultHdr	<< 5;
-		$grbit			|= $fArabic		<< 6;
-		$grbit			|= $fDspGuts	   << 7;
-		$grbit			|= $fFrozenNoSplit << 8;
-		$grbit			|= $fSelected	  << 9;
-		$grbit			|= $fPaged		 << 10;
-
-		$header  = pack("vv",   $record, $length);
-		$data	= pack("vvv", $grbit, $rwTop, $colLeft);
-
-		// FIXME !!!
-		$rgbHdr	   = 0x0040; // Row/column heading and gridline color index
-		$zoom_factor_page_break = 0x0000;
-		$zoom_factor_normal	 = 0x0000;
-		$data .= pack("vvvvV", $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
-
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write BIFF record DEFAULTROWHEIGHT.
-	 */
-	private function _writeDefaultRowHeight()
-	{
-		$defaultRowHeight = $this->_phpSheet->getDefaultRowDimension()->getRowHeight();
-
-		if ($defaultRowHeight < 0) {
-			return;
-		}
-
-		// convert to twips
-		$defaultRowHeight = (int) 20 * $defaultRowHeight;
-
-		$record   = 0x0225;	  // Record identifier
-		$length   = 0x0004;	  // Number of bytes to follow
-
-		$header   = pack("vv", $record, $length);
-		$data	 = pack("vv",  1, $defaultRowHeight);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write BIFF record DEFCOLWIDTH if COLINFO records are in use.
-	 */
-	private function _writeDefcol()
-	{
-		$defaultColWidth = 8;
-
-		$record   = 0x0055;	  // Record identifier
-		$length   = 0x0002;	  // Number of bytes to follow
-
-		$header = pack("vv", $record, $length);
-		$data = pack("v", $defaultColWidth);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write BIFF record COLINFO to define column widths
-	 *
-	 * Note: The SDK says the record length is 0x0B but Excel writes a 0x0C
-	 * length record.
-	 *
-	 * @param array $col_array This is the only parameter received and is composed of the following:
-	 *				0 => First formatted column,
-	 *				1 => Last formatted column,
-	 *				2 => Col width (8.43 is Excel default),
-	 *				3 => The optional XF format of the column,
-	 *				4 => Option flags.
-	 *				5 => Optional outline level
-	 */
-	private function _writeColinfo($col_array)
-	{
-		if (isset($col_array[0])) {
-			$colFirst = $col_array[0];
-		}
-		if (isset($col_array[1])) {
-			$colLast = $col_array[1];
-		}
-		if (isset($col_array[2])) {
-			$coldx = $col_array[2];
-		} else {
-			$coldx = 8.43;
-		}
-		if (isset($col_array[3])) {
-			$xfIndex = $col_array[3];
-		} else {
-			$xfIndex = 15;
-		}
-		if (isset($col_array[4])) {
-			$grbit = $col_array[4];
-		} else {
-			$grbit = 0;
-		}
-		if (isset($col_array[5])) {
-			$level = $col_array[5];
-		} else {
-			$level = 0;
-		}
-		$record   = 0x007D;		  // Record identifier
-		$length   = 0x000C;		  // Number of bytes to follow
-
-		$coldx   *= 256;			 // Convert to units of 1/256 of a char
-
-		$ixfe	 = $xfIndex;
-		$reserved = 0x0000;			// Reserved
-
-		$level = max(0, min($level, 7));
-		$grbit |= $level << 8;
-
-		$header   = pack("vv",	 $record, $length);
-		$data	 = pack("vvvvvv", $colFirst, $colLast, $coldx,
-								   $ixfe, $grbit, $reserved);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write BIFF record SELECTION.
-	 */
-	private function _writeSelection()
-	{
-		// look up the selected cell range
-		$selectedCells = $this->_phpSheet->getSelectedCells();
-		$selectedCells = PHPExcel_Cell::splitRange($this->_phpSheet->getSelectedCells());
-		$selectedCells = $selectedCells[0];
-		if (count($selectedCells) == 2) {
-			list($first, $last) = $selectedCells;
-		} else {
-			$first = $selectedCells[0];
-			$last  = $selectedCells[0];
-		}
-
-		list($colFirst, $rwFirst) = PHPExcel_Cell::coordinateFromString($first);
-		$colFirst = PHPExcel_Cell::columnIndexFromString($colFirst) - 1; // base 0 column index
-		--$rwFirst; // base 0 row index
-
-		list($colLast, $rwLast) = PHPExcel_Cell::coordinateFromString($last);
-		$colLast = PHPExcel_Cell::columnIndexFromString($colLast) - 1; // base 0 column index
-		--$rwLast; // base 0 row index
-
-		// make sure we are not out of bounds
-		$colFirst = min($colFirst, 255);
-		$colLast  = min($colLast,  255);
-
-		$rwFirst = min($rwFirst, 65535);
-		$rwLast  = min($rwLast,  65535);
-
-		$record   = 0x001D;				  // Record identifier
-		$length   = 0x000F;				  // Number of bytes to follow
-
-		$pnn	  = $this->_active_pane;	 // Pane position
-		$rwAct	= $rwFirst;				// Active row
-		$colAct   = $colFirst;			   // Active column
-		$irefAct  = 0;					   // Active cell ref
-		$cref	 = 1;					   // Number of refs
-
-		if (!isset($rwLast)) {
-			$rwLast   = $rwFirst;	   // Last  row in reference
-		}
-		if (!isset($colLast)) {
-			$colLast  = $colFirst;	  // Last  col in reference
-		}
-
-		// Swap last row/col for first row/col as necessary
-		if ($rwFirst > $rwLast) {
-			list($rwFirst, $rwLast) = array($rwLast, $rwFirst);
-		}
-
-		if ($colFirst > $colLast) {
-			list($colFirst, $colLast) = array($colLast, $colFirst);
-		}
-
-		$header   = pack("vv",		 $record, $length);
-		$data	 = pack("CvvvvvvCC",  $pnn, $rwAct, $colAct,
-									   $irefAct, $cref,
-									   $rwFirst, $rwLast,
-									   $colFirst, $colLast);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the MERGEDCELLS records for all ranges of merged cells
-	 */
-	private function _writeMergedCells()
-	{
-		$mergeCells = $this->_phpSheet->getMergeCells();
-		$countMergeCells = count($mergeCells);
-
-		if ($countMergeCells == 0) {
-			return;
-		}
-
-		// maximum allowed number of merged cells per record
-		$maxCountMergeCellsPerRecord = 1027;
-
-		// record identifier
-		$record = 0x00E5;
-
-		// counter for total number of merged cells treated so far by the writer
-		$i = 0;
-
-		// counter for number of merged cells written in record currently being written
-		$j = 0;
-
-		// initialize record data
-		$recordData = '';
-
-		// loop through the merged cells
-		foreach ($mergeCells as $mergeCell) {
-			++$i;
-			++$j;
-
-			// extract the row and column indexes
-			$range = PHPExcel_Cell::splitRange($mergeCell);
-			list($first, $last) = $range[0];
-			list($firstColumn, $firstRow) = PHPExcel_Cell::coordinateFromString($first);
-			list($lastColumn, $lastRow) = PHPExcel_Cell::coordinateFromString($last);
-
-			$recordData .= pack('vvvv', $firstRow - 1, $lastRow - 1, PHPExcel_Cell::columnIndexFromString($firstColumn) - 1, PHPExcel_Cell::columnIndexFromString($lastColumn) - 1);
-
-			// flush record if we have reached limit for number of merged cells, or reached final merged cell
-			if ($j == $maxCountMergeCellsPerRecord or $i == $countMergeCells) {
-				$recordData = pack('v', $j) . $recordData;
-				$length = strlen($recordData);
-				$header = pack('vv', $record, $length);
-				$this->_append($header . $recordData);
-
-				// initialize for next record, if any
-				$recordData = '';
-				$j = 0;
-			}
-		}
-	}
-
-	/**
-	 * Write SHEETLAYOUT record
-	 */
-	private function _writeSheetLayout()
-	{
-		if (!$this->_phpSheet->isTabColorSet()) {
-			return;
-		}
-
-		$recordData = pack(
-			'vvVVVvv'
-			, 0x0862
-			, 0x0000		// unused
-			, 0x00000000	// unused
-			, 0x00000000	// unused
-			, 0x00000014	// size of record data
-			, $this->_colors[$this->_phpSheet->getTabColor()->getRGB()]	// color index
-			, 0x0000		// unused
-		);
-
-		$length = strlen($recordData);
-
-		$record = 0x0862; // Record identifier
-		$header = pack('vv', $record, $length);
-		$this->_append($header . $recordData);
-	}
-
-	/**
-	 * Write SHEETPROTECTION
-	 */
-	private function _writeSheetProtection()
-	{
-		// record identifier
-		$record = 0x0867;
-
-		// prepare options
-		$options  =   (int) !$this->_phpSheet->getProtection()->getObjects()
-					| (int) !$this->_phpSheet->getProtection()->getScenarios()           << 1
-					| (int) !$this->_phpSheet->getProtection()->getFormatCells()         << 2
-					| (int) !$this->_phpSheet->getProtection()->getFormatColumns()       << 3
-					| (int) !$this->_phpSheet->getProtection()->getFormatRows()          << 4
-					| (int) !$this->_phpSheet->getProtection()->getInsertColumns()       << 5
-					| (int) !$this->_phpSheet->getProtection()->getInsertRows()          << 6
-					| (int) !$this->_phpSheet->getProtection()->getInsertHyperlinks()    << 7
-					| (int) !$this->_phpSheet->getProtection()->getDeleteColumns()       << 8
-					| (int) !$this->_phpSheet->getProtection()->getDeleteRows()          << 9
-					| (int) !$this->_phpSheet->getProtection()->getSelectLockedCells()   << 10
-					| (int) !$this->_phpSheet->getProtection()->getSort()                << 11
-					| (int) !$this->_phpSheet->getProtection()->getAutoFilter()          << 12
-					| (int) !$this->_phpSheet->getProtection()->getPivotTables()         << 13
-					| (int) !$this->_phpSheet->getProtection()->getSelectUnlockedCells() << 14 ;
-
-		// record data
-		$recordData = pack(
-			'vVVCVVvv'
-			, 0x0867		// repeated record identifier
-			, 0x0000		// not used
-			, 0x0000		// not used
-			, 0x00			// not used
-			, 0x01000200	// unknown data
-			, 0xFFFFFFFF	// unknown data
-			, $options		// options
-			, 0x0000		// not used
-		);
-
-		$length = strlen($recordData);
-		$header = pack('vv', $record, $length);
-
-		$this->_append($header . $recordData);
-	}
-
-	/**
-	 * Write BIFF record RANGEPROTECTION
-	 *
-	 * Openoffice.org's Documentaion of the Microsoft Excel File Format uses term RANGEPROTECTION for these records
-	 * Microsoft Office Excel 97-2007 Binary File Format Specification uses term FEAT for these records
-	 */
-	private function _writeRangeProtection()
-	{
-		foreach ($this->_phpSheet->getProtectedCells() as $range => $password) {
-			// number of ranges, e.g. 'A1:B3 C20:D25'
-			$cellRanges = explode(' ', $range);
-			$cref = count($cellRanges);
-
-			$recordData = pack(
-				'vvVVvCVvVv',
-				0x0868,
-				0x00,
-				0x0000,
-				0x0000,
-				0x02,
-				0x0,
-				0x0000,
-				$cref,
-				0x0000,
-				0x00
-			);
-
-			foreach ($cellRanges as $cellRange) {
-				$recordData .= $this->_writeBIFF8CellRangeAddressFixed($cellRange);
-			}
-
-			// the rgbFeat structure
-			$recordData .= pack(
-				'VV',
-				0x0000,
-				hexdec($password)
-			);
-
-			$recordData .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong('p' . md5($recordData));
-
-			$length = strlen($recordData);
-
-			$record = 0x0868;		// Record identifier
-			$header = pack("vv", $record, $length);
-			$this->_append($header . $recordData);
-		}
-	}
-
-	/**
-	 * Write BIFF record EXTERNCOUNT to indicate the number of external sheet
-	 * references in a worksheet.
-	 *
-	 * Excel only stores references to external sheets that are used in formulas.
-	 * For simplicity we store references to all the sheets in the workbook
-	 * regardless of whether they are used or not. This reduces the overall
-	 * complexity and eliminates the need for a two way dialogue between the formula
-	 * parser the worksheet objects.
-	 *
-	 * @param integer $count The number of external sheet references in this worksheet
-	 */
-	private function _writeExterncount($count)
-	{
-		$record = 0x0016;		  // Record identifier
-		$length = 0x0002;		  // Number of bytes to follow
-
-		$header = pack("vv", $record, $length);
-		$data   = pack("v",  $count);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Writes the Excel BIFF EXTERNSHEET record. These references are used by
-	 * formulas. A formula references a sheet name via an index. Since we store a
-	 * reference to all of the external worksheets the EXTERNSHEET index is the same
-	 * as the worksheet index.
-	 *
-	 * @param string $sheetname The name of a external worksheet
-	 */
-	private function _writeExternsheet($sheetname)
-	{
-		$record	= 0x0017;		 // Record identifier
-
-		// References to the current sheet are encoded differently to references to
-		// external sheets.
-		//
-		if ($this->_phpSheet->getTitle() == $sheetname) {
-			$sheetname = '';
-			$length	= 0x02;  // The following 2 bytes
-			$cch	   = 1;	 // The following byte
-			$rgch	  = 0x02;  // Self reference
-		} else {
-			$length	= 0x02 + strlen($sheetname);
-			$cch	   = strlen($sheetname);
-			$rgch	  = 0x03;  // Reference to a sheet in the current workbook
-		}
-
-		$header = pack("vv",  $record, $length);
-		$data   = pack("CC", $cch, $rgch);
-		$this->_append($header . $data . $sheetname);
-	}
-
-	/**
-	 * Writes the Excel BIFF PANE record.
-	 * The panes can either be frozen or thawed (unfrozen).
-	 * Frozen panes are specified in terms of an integer number of rows and columns.
-	 * Thawed panes are specified in terms of Excel's units for rows and columns.
-	 */
-	private function _writePanes()
-	{
-		$panes = array();
-		if ($freezePane = $this->_phpSheet->getFreezePane()) {
-			list($column, $row) = PHPExcel_Cell::coordinateFromString($freezePane);
-			$panes[0] = $row - 1;
-			$panes[1] = PHPExcel_Cell::columnIndexFromString($column) - 1;
-		} else {
-			// thaw panes
-			return;
-		}
-
-		$y	   = isset($panes[0]) ? $panes[0] : null;
-		$x	   = isset($panes[1]) ? $panes[1] : null;
-		$rwTop   = isset($panes[2]) ? $panes[2] : null;
-		$colLeft = isset($panes[3]) ? $panes[3] : null;
-		if (count($panes) > 4) { // if Active pane was received
-			$pnnAct = $panes[4];
-		} else {
-			$pnnAct = null;
-		}
-		$record  = 0x0041;	   // Record identifier
-		$length  = 0x000A;	   // Number of bytes to follow
-
-		// Code specific to frozen or thawed panes.
-		if ($this->_phpSheet->getFreezePane()) {
-			// Set default values for $rwTop and $colLeft
-			if (!isset($rwTop)) {
-				$rwTop   = $y;
-			}
-			if (!isset($colLeft)) {
-				$colLeft = $x;
-			}
-		} else {
-			// Set default values for $rwTop and $colLeft
-			if (!isset($rwTop)) {
-				$rwTop   = 0;
-			}
-			if (!isset($colLeft)) {
-				$colLeft = 0;
-			}
-
-			// Convert Excel's row and column units to the internal units.
-			// The default row height is 12.75
-			// The default column width is 8.43
-			// The following slope and intersection values were interpolated.
-			//
-			$y = 20*$y + 255;
-			$x = 113.879*$x + 390;
-		}
-
-
-		// Determine which pane should be active. There is also the undocumented
-		// option to override this should it be necessary: may be removed later.
-		//
-		if (!isset($pnnAct)) {
-			if ($x != 0 && $y != 0) {
-				$pnnAct = 0; // Bottom right
-			}
-			if ($x != 0 && $y == 0) {
-				$pnnAct = 1; // Top right
-			}
-			if ($x == 0 && $y != 0) {
-				$pnnAct = 2; // Bottom left
-			}
-			if ($x == 0 && $y == 0) {
-				$pnnAct = 3; // Top left
-			}
-		}
-
-		$this->_active_pane = $pnnAct; // Used in _writeSelection
-
-		$header	 = pack("vv",	$record, $length);
-		$data	   = pack("vvvvv", $x, $y, $rwTop, $colLeft, $pnnAct);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the page setup SETUP BIFF record.
-	 */
-	private function _writeSetup()
-	{
-		$record	   = 0x00A1;				  // Record identifier
-		$length	   = 0x0022;				  // Number of bytes to follow
-
-		$iPaperSize   = $this->_phpSheet->getPageSetup()->getPaperSize();	// Paper size
-
-		$iScale = $this->_phpSheet->getPageSetup()->getScale() ?
-			$this->_phpSheet->getPageSetup()->getScale() : 100;   // Print scaling factor
-
-		$iPageStart   = 0x01;				 // Starting page number
-		$iFitWidth	= (int) $this->_phpSheet->getPageSetup()->getFitToWidth();	// Fit to number of pages wide
-		$iFitHeight	= (int) $this->_phpSheet->getPageSetup()->getFitToHeight();	// Fit to number of pages high
-		$grbit		= 0x00;				 // Option flags
-		$iRes		 = 0x0258;			   // Print resolution
-		$iVRes		= 0x0258;			   // Vertical print resolution
-
-		$numHdr	   = $this->_phpSheet->getPageMargins()->getHeader();  // Header Margin
-
-		$numFtr	   = $this->_phpSheet->getPageMargins()->getFooter();   // Footer Margin
-		$iCopies	  = 0x01;				 // Number of copies
-
-		$fLeftToRight = 0x0;					 // Print over then down
-
-		// Page orientation
-		$fLandscape = ($this->_phpSheet->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ?
-			0x0 : 0x1;
-
-		$fNoPls	   = 0x0;					 // Setup not read from printer
-		$fNoColor	 = 0x0;					 // Print black and white
-		$fDraft	   = 0x0;					 // Print draft quality
-		$fNotes	   = 0x0;					 // Print notes
-		$fNoOrient	= 0x0;					 // Orientation not set
-		$fUsePage	 = 0x0;					 // Use custom starting page
-
-		$grbit		   = $fLeftToRight;
-		$grbit		  |= $fLandscape	<< 1;
-		$grbit		  |= $fNoPls		<< 2;
-		$grbit		  |= $fNoColor	  << 3;
-		$grbit		  |= $fDraft		<< 4;
-		$grbit		  |= $fNotes		<< 5;
-		$grbit		  |= $fNoOrient	 << 6;
-		$grbit		  |= $fUsePage	  << 7;
-
-		$numHdr = pack("d", $numHdr);
-		$numFtr = pack("d", $numFtr);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$numHdr = strrev($numHdr);
-			$numFtr = strrev($numFtr);
-		}
-
-		$header = pack("vv", $record, $length);
-		$data1  = pack("vvvvvvvv", $iPaperSize,
-								   $iScale,
-								   $iPageStart,
-								   $iFitWidth,
-								   $iFitHeight,
-								   $grbit,
-								   $iRes,
-								   $iVRes);
-		$data2  = $numHdr.$numFtr;
-		$data3  = pack("v", $iCopies);
-		$this->_append($header . $data1 . $data2 . $data3);
-	}
-
-	/**
-	 * Store the header caption BIFF record.
-	 */
-	private function _writeHeader()
-	{
-		$record  = 0x0014;			   // Record identifier
-
-		/* removing for now
-		// need to fix character count (multibyte!)
-		if (strlen($this->_phpSheet->getHeaderFooter()->getOddHeader()) <= 255) {
-			$str	  = $this->_phpSheet->getHeaderFooter()->getOddHeader();	   // header string
-		} else {
-			$str = '';
-		}
-		*/
-
-		$recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddHeader());
-		$length = strlen($recordData);
-
-		$header   = pack("vv", $record, $length);
-
-		$this->_append($header . $recordData);
-	}
-
-	/**
-	 * Store the footer caption BIFF record.
-	 */
-	private function _writeFooter()
-	{
-		$record  = 0x0015;			   // Record identifier
-
-		/* removing for now
-		// need to fix character count (multibyte!)
-		if (strlen($this->_phpSheet->getHeaderFooter()->getOddFooter()) <= 255) {
-			$str = $this->_phpSheet->getHeaderFooter()->getOddFooter();
-		} else {
-			$str = '';
-		}
-		*/
-
-		$recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddFooter());
-		$length = strlen($recordData);
-
-		$header	= pack("vv", $record, $length);
-
-		$this->_append($header . $recordData);
-	}
-
-	/**
-	 * Store the horizontal centering HCENTER BIFF record.
-	 *
-	 * @access private
-	 */
-	private function _writeHcenter()
-	{
-		$record   = 0x0083;			  // Record identifier
-		$length   = 0x0002;			  // Bytes to follow
-
-		$fHCenter = $this->_phpSheet->getPageSetup()->getHorizontalCentered() ? 1 : 0;	 // Horizontal centering
-
-		$header	= pack("vv", $record, $length);
-		$data	  = pack("v",  $fHCenter);
-
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Store the vertical centering VCENTER BIFF record.
-	 */
-	private function _writeVcenter()
-	{
-		$record   = 0x0084;			  // Record identifier
-		$length   = 0x0002;			  // Bytes to follow
-
-		$fVCenter = $this->_phpSheet->getPageSetup()->getVerticalCentered() ? 1 : 0;	 // Horizontal centering
-
-		$header	= pack("vv", $record, $length);
-		$data	  = pack("v",  $fVCenter);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the LEFTMARGIN BIFF record.
-	 */
-	private function _writeMarginLeft()
-	{
-		$record  = 0x0026;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
-
-		$margin  = $this->_phpSheet->getPageMargins()->getLeft();	 // Margin in inches
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$data = strrev($data);
-		}
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the RIGHTMARGIN BIFF record.
-	 */
-	private function _writeMarginRight()
-	{
-		$record  = 0x0027;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
-
-		$margin  = $this->_phpSheet->getPageMargins()->getRight();	 // Margin in inches
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$data = strrev($data);
-		}
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the TOPMARGIN BIFF record.
-	 */
-	private function _writeMarginTop()
-	{
-		$record  = 0x0028;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
-
-		$margin  = $this->_phpSheet->getPageMargins()->getTop();	 // Margin in inches
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$data = strrev($data);
-		}
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Store the BOTTOMMARGIN BIFF record.
-	 */
-	private function _writeMarginBottom()
-	{
-		$record  = 0x0029;				   // Record identifier
-		$length  = 0x0008;				   // Bytes to follow
-
-		$margin  = $this->_phpSheet->getPageMargins()->getBottom();	 // Margin in inches
-
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("d",   $margin);
-		if (self::getByteOrder()) { // if it's Big Endian
-			$data = strrev($data);
-		}
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the PRINTHEADERS BIFF record.
-	 */
-	private function _writePrintHeaders()
-	{
-		$record	  = 0x002a;				   // Record identifier
-		$length	  = 0x0002;				   // Bytes to follow
-
-		$fPrintRwCol = $this->_print_headers;	 // Boolean flag
-
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("v", $fPrintRwCol);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the PRINTGRIDLINES BIFF record. Must be used in conjunction with the
-	 * GRIDSET record.
-	 */
-	private function _writePrintGridlines()
-	{
-		$record	  = 0x002b;					// Record identifier
-		$length	  = 0x0002;					// Bytes to follow
-
-		$fPrintGrid  = $this->_phpSheet->getPrintGridlines() ? 1 : 0;	// Boolean flag
-
-		$header	  = pack("vv", $record, $length);
-		$data	  = pack("v", $fPrintGrid);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the GRIDSET BIFF record. Must be used in conjunction with the
-	 * PRINTGRIDLINES record.
-	 */
-	private function _writeGridset()
-	{
-		$record	  = 0x0082;						// Record identifier
-		$length	  = 0x0002;						// Bytes to follow
-
-		$fGridSet	= !$this->_phpSheet->getPrintGridlines();	 // Boolean flag
-
-		$header	  = pack("vv",  $record, $length);
-		$data		= pack("v",   $fGridSet);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the AUTOFILTERINFO BIFF record. This is used to configure the number of autofilter select used in the sheet.
-	 */
-	private function _writeAutoFilterInfo(){
-		$record	  = 0x009D;						// Record identifier
-		$length	  = 0x0002;						// Bytes to follow
-
-		$rangeBounds = PHPExcel_Cell::rangeBoundaries($this->_phpSheet->getAutoFilter()->getRange());
-		$iNumFilters = 1 + $rangeBounds[1][0] - $rangeBounds[0][0];
-
-		$header   = pack("vv", $record, $length);
-		$data     = pack("v",  $iNumFilters);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the GUTS BIFF record. This is used to configure the gutter margins
-	 * where Excel outline symbols are displayed. The visibility of the gutters is
-	 * controlled by a flag in WSBOOL.
-	 *
-	 * @see _writeWsbool()
-	 */
-	private  function _writeGuts()
-	{
-		$record	  = 0x0080;   // Record identifier
-		$length	  = 0x0008;   // Bytes to follow
-
-		$dxRwGut	 = 0x0000;   // Size of row gutter
-		$dxColGut	= 0x0000;   // Size of col gutter
-
-		// determine maximum row outline level
-		$maxRowOutlineLevel = 0;
-		foreach ($this->_phpSheet->getRowDimensions() as $rowDimension) {
-			$maxRowOutlineLevel = max($maxRowOutlineLevel, $rowDimension->getOutlineLevel());
-		}
-
-		$col_level   = 0;
-
-		// Calculate the maximum column outline level. The equivalent calculation
-		// for the row outline level is carried out in _writeRow().
-		$colcount = count($this->_colinfo);
-		for ($i = 0; $i < $colcount; ++$i) {
-			$col_level = max($this->_colinfo[$i][5], $col_level);
-		}
-
-		// Set the limits for the outline levels (0 <= x <= 7).
-		$col_level = max(0, min($col_level, 7));
-
-		// The displayed level is one greater than the max outline levels
-		if ($maxRowOutlineLevel) {
-			++$maxRowOutlineLevel;
-		}
-		if ($col_level) {
-			++$col_level;
-		}
-
-		$header	  = pack("vv",   $record, $length);
-		$data		= pack("vvvv", $dxRwGut, $dxColGut, $maxRowOutlineLevel, $col_level);
-
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write the WSBOOL BIFF record, mainly for fit-to-page. Used in conjunction
-	 * with the SETUP record.
-	 */
-	private function _writeWsbool()
-	{
-		$record	  = 0x0081;   // Record identifier
-		$length	  = 0x0002;   // Bytes to follow
-		$grbit	   = 0x0000;
-
-		// The only option that is of interest is the flag for fit to page. So we
-		// set all the options in one go.
-		//
-		// Set the option flags
-		$grbit |= 0x0001;						   // Auto page breaks visible
-		if ($this->_outline_style) {
-			$grbit |= 0x0020; // Auto outline styles
-		}
-		if ($this->_phpSheet->getShowSummaryBelow()) {
-			$grbit |= 0x0040; // Outline summary below
-		}
-		if ($this->_phpSheet->getShowSummaryRight()) {
-			$grbit |= 0x0080; // Outline summary right
-		}
-		if ($this->_phpSheet->getPageSetup()->getFitToPage()) {
-			$grbit |= 0x0100; // Page setup fit to page
-		}
-		if ($this->_outline_on) {
-			$grbit |= 0x0400; // Outline symbols displayed
-		}
-
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("v",  $grbit);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the HORIZONTALPAGEBREAKS and VERTICALPAGEBREAKS BIFF records.
-	 */
-	private function _writeBreaks()
-	{
-		// initialize
-		$vbreaks = array();
-		$hbreaks = array();
-
-		foreach ($this->_phpSheet->getBreaks() as $cell => $breakType) {
-			// Fetch coordinates
-			$coordinates = PHPExcel_Cell::coordinateFromString($cell);
-
-			// Decide what to do by the type of break
-			switch ($breakType) {
-				case PHPExcel_Worksheet::BREAK_COLUMN:
-					// Add to list of vertical breaks
-					$vbreaks[] = PHPExcel_Cell::columnIndexFromString($coordinates[0]) - 1;
-					break;
-
-				case PHPExcel_Worksheet::BREAK_ROW:
-					// Add to list of horizontal breaks
-					$hbreaks[] = $coordinates[1];
-					break;
-
-				case PHPExcel_Worksheet::BREAK_NONE:
-				default:
-					// Nothing to do
-					break;
-			}
-		}
-
-		//horizontal page breaks
-		if (!empty($hbreaks)) {
-
-			// Sort and filter array of page breaks
-			sort($hbreaks, SORT_NUMERIC);
-			if ($hbreaks[0] == 0) { // don't use first break if it's 0
-				array_shift($hbreaks);
-			}
-
-			$record  = 0x001b;			   // Record identifier
-			$cbrk	= count($hbreaks);	   // Number of page breaks
-			$length  = 2 + 6 * $cbrk;	  // Bytes to follow
-
-			$header  = pack("vv", $record, $length);
-			$data	= pack("v",  $cbrk);
-
-			// Append each page break
-			foreach ($hbreaks as $hbreak) {
-				$data .= pack("vvv", $hbreak, 0x0000, 0x00ff);
-			}
-
-			$this->_append($header . $data);
-		}
-
-		// vertical page breaks
-		if (!empty($vbreaks)) {
-
-			// 1000 vertical pagebreaks appears to be an internal Excel 5 limit.
-			// It is slightly higher in Excel 97/200, approx. 1026
-			$vbreaks = array_slice($vbreaks, 0, 1000);
-
-			// Sort and filter array of page breaks
-			sort($vbreaks, SORT_NUMERIC);
-			if ($vbreaks[0] == 0) { // don't use first break if it's 0
-				array_shift($vbreaks);
-			}
-
-			$record  = 0x001a;			   // Record identifier
-			$cbrk	= count($vbreaks);	   // Number of page breaks
-			$length  = 2 + 6 * $cbrk;	  // Bytes to follow
-
-			$header  = pack("vv",  $record, $length);
-			$data	= pack("v",   $cbrk);
-
-			// Append each page break
-			foreach ($vbreaks as $vbreak) {
-				$data .= pack("vvv", $vbreak, 0x0000, 0xffff);
-			}
-
-			$this->_append($header . $data);
-		}
-	}
-
-	/**
-	 * Set the Biff PROTECT record to indicate that the worksheet is protected.
-	 */
-	private function _writeProtect()
-	{
-		// Exit unless sheet protection has been specified
-		if (!$this->_phpSheet->getProtection()->getSheet()) {
-			return;
-		}
-
-		$record	  = 0x0012;			 // Record identifier
-		$length	  = 0x0002;			 // Bytes to follow
-
-		$fLock	   = 1;	// Worksheet is protected
-
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("v",  $fLock);
-
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Write SCENPROTECT
-	 */
-	private function _writeScenProtect()
-	{
-		// Exit if sheet protection is not active
-		if (!$this->_phpSheet->getProtection()->getSheet()) {
-			return;
-		}
-
-		// Exit if scenarios are not protected
-		if (!$this->_phpSheet->getProtection()->getScenarios()) {
-			return;
-		}
-
-		$record = 0x00DD; // Record identifier
-		$length = 0x0002; // Bytes to follow
-
-		$header = pack('vv', $record, $length);
-		$data = pack('v', 1);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write OBJECTPROTECT
-	 */
-	private function _writeObjectProtect()
-	{
-		// Exit if sheet protection is not active
-		if (!$this->_phpSheet->getProtection()->getSheet()) {
-			return;
-		}
-
-		// Exit if objects are not protected
-		if (!$this->_phpSheet->getProtection()->getObjects()) {
-			return;
-		}
-
-		$record = 0x0063; // Record identifier
-		$length = 0x0002; // Bytes to follow
-
-		$header = pack('vv', $record, $length);
-		$data = pack('v', 1);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Write the worksheet PASSWORD record.
-	 */
-	private function _writePassword()
-	{
-		// Exit unless sheet protection and password have been specified
-		if (!$this->_phpSheet->getProtection()->getSheet() || !$this->_phpSheet->getProtection()->getPassword()) {
-			return;
-		}
-
-		$record	  = 0x0013;			   // Record identifier
-		$length	  = 0x0002;			   // Bytes to follow
-
-		$wPassword   = hexdec($this->_phpSheet->getProtection()->getPassword());	 // Encoded password
-
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("v",  $wPassword);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Insert a 24bit bitmap image in a worksheet.
-	 *
-	 * @access public
-	 * @param integer $row	 The row we are going to insert the bitmap into
-	 * @param integer $col	 The column we are going to insert the bitmap into
-	 * @param mixed   $bitmap  The bitmap filename or GD-image resource
-	 * @param integer $x	   The horizontal position (offset) of the image inside the cell.
-	 * @param integer $y	   The vertical position (offset) of the image inside the cell.
-	 * @param float   $scale_x The horizontal scale
-	 * @param float   $scale_y The vertical scale
-	 */
-	function insertBitmap($row, $col, $bitmap, $x = 0, $y = 0, $scale_x = 1, $scale_y = 1)
-	{
-		$bitmap_array = (is_resource($bitmap) ? $this->_processBitmapGd($bitmap) : $this->_processBitmap($bitmap));
-		list($width, $height, $size, $data) = $bitmap_array; //$this->_processBitmap($bitmap);
-
-		// Scale the frame of the image.
-		$width  *= $scale_x;
-		$height *= $scale_y;
-
-		// Calculate the vertices of the image and write the OBJ record
-		$this->_positionImage($col, $row, $x, $y, $width, $height);
-
-		// Write the IMDATA record to store the bitmap data
-		$record	  = 0x007f;
-		$length	  = 8 + $size;
-		$cf		  = 0x09;
-		$env		 = 0x01;
-		$lcb		 = $size;
-
-		$header	  = pack("vvvvV", $record, $length, $cf, $env, $lcb);
-		$this->_append($header.$data);
-	}
-
-	/**
-	 * Calculate the vertices that define the position of the image as required by
-	 * the OBJ record.
-	 *
-	 *		 +------------+------------+
-	 *		 |	 A	  |	  B	 |
-	 *   +-----+------------+------------+
-	 *   |	 |(x1,y1)	 |			|
-	 *   |  1  |(A1)._______|______	  |
-	 *   |	 |	|			  |	 |
-	 *   |	 |	|			  |	 |
-	 *   +-----+----|	BITMAP	|-----+
-	 *   |	 |	|			  |	 |
-	 *   |  2  |	|______________.	 |
-	 *   |	 |			|		(B2)|
-	 *   |	 |			|	 (x2,y2)|
-	 *   +---- +------------+------------+
-	 *
-	 * Example of a bitmap that covers some of the area from cell A1 to cell B2.
-	 *
-	 * Based on the width and height of the bitmap we need to calculate 8 vars:
-	 *	 $col_start, $row_start, $col_end, $row_end, $x1, $y1, $x2, $y2.
-	 * The width and height of the cells are also variable and have to be taken into
-	 * account.
-	 * The values of $col_start and $row_start are passed in from the calling
-	 * function. The values of $col_end and $row_end are calculated by subtracting
-	 * the width and height of the bitmap from the width and height of the
-	 * underlying cells.
-	 * The vertices are expressed as a percentage of the underlying cell width as
-	 * follows (rhs values are in pixels):
-	 *
-	 *	   x1 = X / W *1024
-	 *	   y1 = Y / H *256
-	 *	   x2 = (X-1) / W *1024
-	 *	   y2 = (Y-1) / H *256
-	 *
-	 *	   Where:  X is distance from the left side of the underlying cell
-	 *			   Y is distance from the top of the underlying cell
-	 *			   W is the width of the cell
-	 *			   H is the height of the cell
-	 * The SDK incorrectly states that the height should be expressed as a
-	 *		percentage of 1024.
-	 *
-	 * @access private
-	 * @param integer $col_start Col containing upper left corner of object
-	 * @param integer $row_start Row containing top left corner of object
-	 * @param integer $x1		Distance to left side of object
-	 * @param integer $y1		Distance to top of object
-	 * @param integer $width	 Width of image frame
-	 * @param integer $height	Height of image frame
-	 */
-	function _positionImage($col_start, $row_start, $x1, $y1, $width, $height)
-	{
-		// Initialise end cell to the same as the start cell
-		$col_end	= $col_start;  // Col containing lower right corner of object
-		$row_end	= $row_start;  // Row containing bottom right corner of object
-
-		// Zero the specified offset if greater than the cell dimensions
-		if ($x1 >= PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start))) {
-			$x1 = 0;
-		}
-		if ($y1 >= PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1)) {
-			$y1 = 0;
-		}
-
-		$width	  = $width  + $x1 -1;
-		$height	 = $height + $y1 -1;
-
-		// Subtract the underlying cell widths to find the end cell of the image
-		while ($width >= PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))) {
-			$width -= PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end));
-			++$col_end;
-		}
-
-		// Subtract the underlying cell heights to find the end cell of the image
-		while ($height >= PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1)) {
-			$height -= PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1);
-			++$row_end;
-		}
-
-		// Bitmap isn't allowed to start or finish in a hidden cell, i.e. a cell
-		// with zero eight or width.
-		//
-		if (PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start)) == 0) {
-			return;
-		}
-		if (PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))   == 0) {
-			return;
-		}
-		if (PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1) == 0) {
-			return;
-		}
-		if (PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1)   == 0) {
-			return;
-		}
-
-		// Convert the pixel values to the percentage value expected by Excel
-		$x1 = $x1	 / PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_start))   * 1024;
-		$y1 = $y1	 / PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_start + 1)   *  256;
-		$x2 = $width  / PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, PHPExcel_Cell::stringFromColumnIndex($col_end))	 * 1024; // Distance to right side of object
-		$y2 = $height / PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $row_end + 1)	 *  256; // Distance to bottom of object
-
-		$this->_writeObjPicture($col_start, $x1,
-								 $row_start, $y1,
-								 $col_end, $x2,
-								 $row_end, $y2);
-	}
-
-	/**
-	 * Store the OBJ record that precedes an IMDATA record. This could be generalise
-	 * to support other Excel objects.
-	 *
-	 * @param integer $colL Column containing upper left corner of object
-	 * @param integer $dxL  Distance from left side of cell
-	 * @param integer $rwT  Row containing top left corner of object
-	 * @param integer $dyT  Distance from top of cell
-	 * @param integer $colR Column containing lower right corner of object
-	 * @param integer $dxR  Distance from right of cell
-	 * @param integer $rwB  Row containing bottom right corner of object
-	 * @param integer $dyB  Distance from bottom of cell
-	 */
-	private function _writeObjPicture($colL,$dxL,$rwT,$dyT,$colR,$dxR,$rwB,$dyB)
-	{
-		$record	  = 0x005d;   // Record identifier
-		$length	  = 0x003c;   // Bytes to follow
-
-		$cObj		= 0x0001;   // Count of objects in file (set to 1)
-		$OT		  = 0x0008;   // Object type. 8 = Picture
-		$id		  = 0x0001;   // Object ID
-		$grbit	   = 0x0614;   // Option flags
-
-		$cbMacro	 = 0x0000;   // Length of FMLA structure
-		$Reserved1   = 0x0000;   // Reserved
-		$Reserved2   = 0x0000;   // Reserved
-
-		$icvBack	 = 0x09;	 // Background colour
-		$icvFore	 = 0x09;	 // Foreground colour
-		$fls		 = 0x00;	 // Fill pattern
-		$fAuto	   = 0x00;	 // Automatic fill
-		$icv		 = 0x08;	 // Line colour
-		$lns		 = 0xff;	 // Line style
-		$lnw		 = 0x01;	 // Line weight
-		$fAutoB	  = 0x00;	 // Automatic border
-		$frs		 = 0x0000;   // Frame style
-		$cf		  = 0x0009;   // Image format, 9 = bitmap
-		$Reserved3   = 0x0000;   // Reserved
-		$cbPictFmla  = 0x0000;   // Length of FMLA structure
-		$Reserved4   = 0x0000;   // Reserved
-		$grbit2	  = 0x0001;   // Option flags
-		$Reserved5   = 0x0000;   // Reserved
-
-
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("V", $cObj);
-		$data	   .= pack("v", $OT);
-		$data	   .= pack("v", $id);
-		$data	   .= pack("v", $grbit);
-		$data	   .= pack("v", $colL);
-		$data	   .= pack("v", $dxL);
-		$data	   .= pack("v", $rwT);
-		$data	   .= pack("v", $dyT);
-		$data	   .= pack("v", $colR);
-		$data	   .= pack("v", $dxR);
-		$data	   .= pack("v", $rwB);
-		$data	   .= pack("v", $dyB);
-		$data	   .= pack("v", $cbMacro);
-		$data	   .= pack("V", $Reserved1);
-		$data	   .= pack("v", $Reserved2);
-		$data	   .= pack("C", $icvBack);
-		$data	   .= pack("C", $icvFore);
-		$data	   .= pack("C", $fls);
-		$data	   .= pack("C", $fAuto);
-		$data	   .= pack("C", $icv);
-		$data	   .= pack("C", $lns);
-		$data	   .= pack("C", $lnw);
-		$data	   .= pack("C", $fAutoB);
-		$data	   .= pack("v", $frs);
-		$data	   .= pack("V", $cf);
-		$data	   .= pack("v", $Reserved3);
-		$data	   .= pack("v", $cbPictFmla);
-		$data	   .= pack("v", $Reserved4);
-		$data	   .= pack("v", $grbit2);
-		$data	   .= pack("V", $Reserved5);
-
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Convert a GD-image into the internal format.
-	 *
-	 * @access private
-	 * @param resource $image The image to process
-	 * @return array Array with data and properties of the bitmap
-	 */
-	function _processBitmapGd($image) {
-		$width = imagesx($image);
-		$height = imagesy($image);
-
-		$data = pack("Vvvvv", 0x000c, $width, $height, 0x01, 0x18);
-		for ($j=$height; $j--; ) {
-			for ($i=0; $i < $width; ++$i) {
-				$color = imagecolorsforindex($image, imagecolorat($image, $i, $j));
-				foreach (array("red", "green", "blue") as $key) {
-					$color[$key] = $color[$key] + round((255 - $color[$key]) * $color["alpha"] / 127);
-				}
-				$data .= chr($color["blue"]) . chr($color["green"]) . chr($color["red"]);
-			}
-			if (3*$width % 4) {
-				$data .= str_repeat("\x00", 4 - 3*$width % 4);
-			}
-		}
-
-		return array($width, $height, strlen($data), $data);
-	}
-
-	/**
-	 * Convert a 24 bit bitmap into the modified internal format used by Windows.
-	 * This is described in BITMAPCOREHEADER and BITMAPCOREINFO structures in the
-	 * MSDN library.
-	 *
-	 * @access private
-	 * @param string $bitmap The bitmap to process
-	 * @return array Array with data and properties of the bitmap
-	 */
-	function _processBitmap($bitmap)
-	{
-		// Open file.
-		$bmp_fd = @fopen($bitmap,"rb");
-		if (!$bmp_fd) {
-			throw new Exception("Couldn't import $bitmap");
-		}
-
-		// Slurp the file into a string.
-		$data = fread($bmp_fd, filesize($bitmap));
-
-		// Check that the file is big enough to be a bitmap.
-		if (strlen($data) <= 0x36) {
-			throw new Exception("$bitmap doesn't contain enough data.\n");
-		}
-
-		// The first 2 bytes are used to identify the bitmap.
-		$identity = unpack("A2ident", $data);
-		if ($identity['ident'] != "BM") {
-			throw new Exception("$bitmap doesn't appear to be a valid bitmap image.\n");
-		}
-
-		// Remove bitmap data: ID.
-		$data = substr($data, 2);
-
-		// Read and remove the bitmap size. This is more reliable than reading
-		// the data size at offset 0x22.
-		//
-		$size_array   = unpack("Vsa", substr($data, 0, 4));
-		$size   = $size_array['sa'];
-		$data   = substr($data, 4);
-		$size  -= 0x36; // Subtract size of bitmap header.
-		$size  += 0x0C; // Add size of BIFF header.
-
-		// Remove bitmap data: reserved, offset, header length.
-		$data = substr($data, 12);
-
-		// Read and remove the bitmap width and height. Verify the sizes.
-		$width_and_height = unpack("V2", substr($data, 0, 8));
-		$width  = $width_and_height[1];
-		$height = $width_and_height[2];
-		$data   = substr($data, 8);
-		if ($width > 0xFFFF) {
-			throw new Exception("$bitmap: largest image width supported is 65k.\n");
-		}
-		if ($height > 0xFFFF) {
-			throw new Exception("$bitmap: largest image height supported is 65k.\n");
-		}
-
-		// Read and remove the bitmap planes and bpp data. Verify them.
-		$planes_and_bitcount = unpack("v2", substr($data, 0, 4));
-		$data = substr($data, 4);
-		if ($planes_and_bitcount[2] != 24) { // Bitcount
-			throw new Exception("$bitmap isn't a 24bit true color bitmap.\n");
-		}
-		if ($planes_and_bitcount[1] != 1) {
-			throw new Exception("$bitmap: only 1 plane supported in bitmap image.\n");
-		}
-
-		// Read and remove the bitmap compression. Verify compression.
-		$compression = unpack("Vcomp", substr($data, 0, 4));
-		$data = substr($data, 4);
-
-		//$compression = 0;
-		if ($compression['comp'] != 0) {
-			throw new Exception("$bitmap: compression not supported in bitmap image.\n");
-		}
-
-		// Remove bitmap data: data size, hres, vres, colours, imp. colours.
-		$data = substr($data, 20);
-
-		// Add the BITMAPCOREHEADER data
-		$header  = pack("Vvvvv", 0x000c, $width, $height, 0x01, 0x18);
-		$data	= $header . $data;
-
-		return (array($width, $height, $size, $data));
-	}
-
-	/**
-	 * Store the window zoom factor. This should be a reduced fraction but for
-	 * simplicity we will store all fractions with a numerator of 100.
-	 */
-	private function _writeZoom()
-	{
-		// If scale is 100 we don't need to write a record
-		if ($this->_phpSheet->getSheetView()->getZoomScale() == 100) {
-			return;
-		}
-
-		$record	  = 0x00A0;			   // Record identifier
-		$length	  = 0x0004;			   // Bytes to follow
-
-		$header	  = pack("vv", $record, $length);
-		$data		= pack("vv", $this->_phpSheet->getSheetView()->getZoomScale(), 100);
-		$this->_append($header . $data);
-	}
-
-	/**
-	 * Get Escher object
-	 *
-	 * @return PHPExcel_Shared_Escher
-	 */
-	public function getEscher()
-	{
-		return $this->_escher;
-	}
-
-	/**
-	 * Set Escher object
-	 *
-	 * @param PHPExcel_Shared_Escher $pValue
-	 */
-	public function setEscher(PHPExcel_Shared_Escher $pValue = null)
-	{
-		$this->_escher = $pValue;
-	}
-
-	/**
-	 * Write MSODRAWING record
-	 */
-	private function _writeMsoDrawing()
-	{
-		// write the Escher stream if necessary
-		if (isset($this->_escher)) {
-			$writer = new PHPExcel_Writer_Excel5_Escher($this->_escher);
-			$data = $writer->close();
-			$spOffsets = $writer->getSpOffsets();
-			$spTypes = $writer->getSpTypes();
-			// write the neccesary MSODRAWING, OBJ records
-
-			// split the Escher stream
-			$spOffsets[0] = 0;
-			$nm = count($spOffsets) - 1; // number of shapes excluding first shape
-			for ($i = 1; $i <= $nm; ++$i) {
-				// MSODRAWING record
-				$record = 0x00EC;			// Record identifier
-
-				// chunk of Escher stream for one shape
-				$dataChunk = substr($data, $spOffsets[$i -1], $spOffsets[$i] - $spOffsets[$i - 1]);
-
-				$length = strlen($dataChunk);
-				$header = pack("vv", $record, $length);
-
-				$this->_append($header . $dataChunk);
-
-				// OBJ record
-				$record = 0x005D; // record identifier
-				$objData = '';
-
-				// ftCmo
-				if($spTypes[$i] == 0x00C9){
-					// Add ftCmo (common object data) subobject
-					$objData .=
-						pack('vvvvvVVV'
-								, 0x0015	// 0x0015 = ftCmo
-								, 0x0012	// length of ftCmo data
-								, 0x0014	// object type, 0x0014 = filter
-								, $i		// object id number, Excel seems to use 1-based index, local for the sheet
-								, 0x2101	// option flags, 0x2001 is what OpenOffice.org uses
-								, 0			// reserved
-								, 0			// reserved
-								, 0			// reserved
-						);
-
-					// Add ftSbs Scroll bar subobject
-					$objData .= pack('vv', 0x00C, 0x0014);
-					$objData .= pack('H*', '0000000000000000640001000A00000010000100');
-					// Add ftLbsData (List box data) subobject
-					$objData .= pack('vv', 0x0013, 0x1FEE);
-					$objData .= pack('H*', '00000000010001030000020008005700');
-				}
-				else {
-					// Add ftCmo (common object data) subobject
-					$objData .=
-						pack('vvvvvVVV'
-							, 0x0015	// 0x0015 = ftCmo
-							, 0x0012	// length of ftCmo data
-							, 0x0008	// object type, 0x0008 = picture
-							, $i		// object id number, Excel seems to use 1-based index, local for the sheet
-							, 0x6011	// option flags, 0x6011 is what OpenOffice.org uses
-							, 0			// reserved
-							, 0			// reserved
-							, 0			// reserved
-						);
-				}
-
-				// ftEnd
-				$objData .=
-					pack('vv'
-						, 0x0000	// 0x0000 = ftEnd
-						, 0x0000	// length of ftEnd data
-					);
-
-				$length = strlen($objData);
-				$header = pack('vv', $record, $length);
-				$this->_append($header . $objData);
-			}
-		}
-	}
-
-	/**
-	 * Store the DATAVALIDATIONS and DATAVALIDATION records.
-	 */
-	private function _writeDataValidity()
-	{
-		// Datavalidation collection
-		$dataValidationCollection = $this->_phpSheet->getDataValidationCollection();
-
-		// Write data validations?
-		if (!empty($dataValidationCollection)) {
-
-			// DATAVALIDATIONS record
-			$record = 0x01B2;	  // Record identifier
-			$length	  = 0x0012;	  // Bytes to follow
-
-			$grbit  = 0x0000;	   // Prompt box at cell, no cached validity data at DV records
-			$horPos	  = 0x00000000;  // Horizontal position of prompt box, if fixed position
-			$verPos	  = 0x00000000;  // Vertical position of prompt box, if fixed position
-			$objId  = 0xFFFFFFFF;  // Object identifier of drop down arrow object, or -1 if not visible
-
-			$header	  = pack('vv', $record, $length);
-			$data		= pack('vVVVV', $grbit, $horPos, $verPos, $objId,
-										 count($dataValidationCollection));
-			$this->_append($header.$data);
-
-			// DATAVALIDATION records
-			$record = 0x01BE;			  // Record identifier
-
-			foreach ($dataValidationCollection as $cellCoordinate => $dataValidation) {
-				// initialize record data
-				$data = '';
-
-				// options
-				$options = 0x00000000;
-
-				// data type
-				$type = $dataValidation->getType();
-				switch ($type) {
-					case PHPExcel_Cell_DataValidation::TYPE_NONE:		$type = 0x00;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_WHOLE:		$type = 0x01;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_DECIMAL:	$type = 0x02;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_LIST:		$type = 0x03;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_DATE:		$type = 0x04;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_TIME:		$type = 0x05;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_TEXTLENGTH:	$type = 0x06;	break;
-					case PHPExcel_Cell_DataValidation::TYPE_CUSTOM:		$type = 0x07;	break;
-				}
-				$options |= $type << 0;
-
-				// error style
-				$errorStyle = $dataValidation->getType();
-				switch ($errorStyle) {
-					case PHPExcel_Cell_DataValidation::STYLE_STOP:			$errorStyle = 0x00;		break;
-					case PHPExcel_Cell_DataValidation::STYLE_WARNING:		$errorStyle = 0x01;		break;
-					case PHPExcel_Cell_DataValidation::STYLE_INFORMATION:	$errorStyle = 0x02;		break;
-				}
-				$options |= $errorStyle << 4;
-
-				// explicit formula?
-				if ($type == 0x03 && preg_match('/^\".*\"$/', $dataValidation->getFormula1())) {
-					$options |= 0x01				<< 7;
-				}
-
-				// empty cells allowed
-				$options |= $dataValidation->getAllowBlank() << 8;
-
-				// show drop down
-				$options |= (!$dataValidation->getShowDropDown()) << 9;
-
-				// show input message
-				$options |= $dataValidation->getShowInputMessage() << 18;
-
-				// show error message
-				$options |= $dataValidation->getShowErrorMessage() << 19;
-
-				// condition operator
-				$operator = $dataValidation->getOperator();
-				switch ($operator) {
-					case PHPExcel_Cell_DataValidation::OPERATOR_BETWEEN: $operator = 0x00			;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_NOTBETWEEN: $operator = 0x01		;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_EQUAL: $operator = 0x02				;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_NOTEQUAL: $operator = 0x03			;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHAN: $operator = 0x04		;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHAN: $operator = 0x05			;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_GREATERTHANOREQUAL: $operator = 0x06;	break;
-					case PHPExcel_Cell_DataValidation::OPERATOR_LESSTHANOREQUAL: $operator = 0x07	;	break;
-				}
-				$options |= $operator << 20;
-
-				$data		= pack('V', $options);
-
-				// prompt title
-				$promptTitle = $dataValidation->getPromptTitle() !== '' ?
-					$dataValidation->getPromptTitle() : chr(0);
-				$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($promptTitle);
-
-				// error title
-				$errorTitle = $dataValidation->getErrorTitle() !== '' ?
-					$dataValidation->getErrorTitle() : chr(0);
-				$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($errorTitle);
-
-				// prompt text
-				$prompt = $dataValidation->getPrompt() !== '' ?
-					$dataValidation->getPrompt() : chr(0);
-				$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($prompt);
-
-				// error text
-				$error = $dataValidation->getError() !== '' ?
-					$dataValidation->getError() : chr(0);
-				$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($error);
-
-				// formula 1
-				try {
-					$formula1 = $dataValidation->getFormula1();
-					if ($type == 0x03) { // list type
-						$formula1 = str_replace(',', chr(0), $formula1);
-					}
-					$this->_parser->parse($formula1);
-					$formula1 = $this->_parser->toReversePolish();
-					$sz1 = strlen($formula1);
-
-				} catch(Exception $e) {
-					$sz1 = 0;
-					$formula1 = '';
-				}
-				$data .= pack('vv', $sz1, 0x0000);
-				$data .= $formula1;
-
-				// formula 2
-				try {
-					$formula2 = $dataValidation->getFormula2();
-					if ($formula2 === '') {
-						throw new Exception('No formula2');
-					}
-					$this->_parser->parse($formula2);
-					$formula2 = $this->_parser->toReversePolish();
-					$sz2 = strlen($formula2);
-
-				} catch(Exception $e) {
-					$sz2 = 0;
-					$formula2 = '';
-				}
-				$data .= pack('vv', $sz2, 0x0000);
-				$data .= $formula2;
-
-				// cell range address list
-				$data .= pack('v', 0x0001);
-				$data .= $this->_writeBIFF8CellRangeAddressFixed($cellCoordinate);
-
-				$length = strlen($data);
-			$header = pack("vv", $record, $length);
-
-				$this->_append($header . $data);
-			}
-		}
-	}
-
-	/**
-	 * Map Error code
-	 *
-	 * @param string $errorCode
-	 * @return int
-	 */
-	private static function _mapErrorCode($errorCode) {
-		switch ($errorCode) {
-			case '#NULL!':	return 0x00;
-			case '#DIV/0!':	return 0x07;
-			case '#VALUE!':	return 0x0F;
-			case '#REF!':	return 0x17;
-			case '#NAME?':	return 0x1D;
-			case '#NUM!':	return 0x24;
-			case '#N/A':	return 0x2A;
-		}
-
-		return 0;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Xf.php b/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Xf.php
deleted file mode 100755
index 1653c7fc4..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/Excel5/Xf.php
+++ /dev/null
@@ -1,546 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-// Original file header of PEAR::Spreadsheet_Excel_Writer_Format (used as the base for this class):
-// -----------------------------------------------------------------------------------------
-// /*
-// *  Module written/ported by Xavier Noguer <xnoguer@rezebra.com>
-// *
-// *  The majority of this is _NOT_ my code.  I simply ported it from the
-// *  PERL Spreadsheet::WriteExcel module.
-// *
-// *  The author of the Spreadsheet::WriteExcel module is John McNamara
-// *  <jmcnamara@cpan.org>
-// *
-// *  I _DO_ maintain this code, and John McNamara has nothing to do with the
-// *  porting of this code to PHP.  Any questions directly related to this
-// *  class library should be directed to me.
-// *
-// *  License Information:
-// *
-// *    Spreadsheet_Excel_Writer:  A library for generating Excel Spreadsheets
-// *    Copyright (c) 2002-2003 Xavier Noguer xnoguer@rezebra.com
-// *
-// *    This library is free software; you can redistribute it and/or
-// *    modify it under the terms of the GNU Lesser General Public
-// *    License as published by the Free Software Foundation; either
-// *    version 2.1 of the License, or (at your option) any later version.
-// *
-// *    This library is distributed in the hope that it will be useful,
-// *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-// *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// *    Lesser General Public License for more details.
-// *
-// *    You should have received a copy of the GNU Lesser General Public
-// *    License along with this library; if not, write to the Free Software
-// *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-// */
-
-
-/**
- * PHPExcel_Writer_Excel5_Xf
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_Excel5_Xf
-{
-    /**
-	 * Style XF or a cell XF ?
-	 *
-	 * @var boolean
-	 */
-	private $_isStyleXf;
-
-	/**
-	 * Index to the FONT record. Index 4 does not exist
-	 * @var integer
-	 */
-	private $_fontIndex;
-
-	/**
-	 * An index (2 bytes) to a FORMAT record (number format).
-	 * @var integer
-	 */
-	public $_numberFormatIndex;
-
-	/**
-	 * 1 bit, apparently not used.
-	 * @var integer
-	 */
-	public $_text_justlast;
-
-	/**
-	 * The cell's foreground color.
-	 * @var integer
-	 */
-	public $_fg_color;
-
-	/**
-	 * The cell's background color.
-	 * @var integer
-	 */
-	public $_bg_color;
-
-	/**
-	 * Color of the bottom border of the cell.
-	 * @var integer
-	 */
-	public $_bottom_color;
-
-	/**
-	 * Color of the top border of the cell.
-	 * @var integer
-	 */
-	public $_top_color;
-
-	/**
-	* Color of the left border of the cell.
-	* @var integer
-	*/
-	public $_left_color;
-
-	/**
-	 * Color of the right border of the cell.
-	 * @var integer
-	 */
-	public $_right_color;
-
-	/**
-	 * Constructor
-	 *
-	 * @access public
-	 * @param PHPExcel_Style	The XF format
-	 */
-	public function __construct(PHPExcel_Style $style = null)
-	{
-		$this->_isStyleXf =     false;
-		$this->_fontIndex      = 0;
-
-		$this->_numberFormatIndex     = 0;
-
-		$this->_text_justlast  = 0;
-
-		$this->_fg_color       = 0x40;
-		$this->_bg_color       = 0x41;
-
-		$this->_diag           = 0;
-
-		$this->_bottom_color   = 0x40;
-		$this->_top_color      = 0x40;
-		$this->_left_color     = 0x40;
-		$this->_right_color    = 0x40;
-		$this->_diag_color     = 0x40;
-		$this->_style = $style;
-
-	}
-
-
-	/**
-	 * Generate an Excel BIFF XF record (style or cell).
-	 *
-	 * @return string The XF record
-	 */
-	function writeXf()
-	{
-		// Set the type of the XF record and some of the attributes.
-		if ($this->_isStyleXf) {
-			$style = 0xFFF5;
-		} else {
-			$style   = self::_mapLocked($this->_style->getProtection()->getLocked());
-			$style  |= self::_mapHidden($this->_style->getProtection()->getHidden()) << 1;
-		}
-
-		// Flags to indicate if attributes have been set.
-		$atr_num     = ($this->_numberFormatIndex != 0)?1:0;
-		$atr_fnt     = ($this->_fontIndex != 0)?1:0;
-		$atr_alc     = ((int) $this->_style->getAlignment()->getWrapText())?1:0;
-		$atr_bdr     = (self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())   ||
-						self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())      ||
-						self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle())     ||
-						self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()))?1:0;
-		$atr_pat     = (($this->_fg_color != 0x40) ||
-						($this->_bg_color != 0x41) ||
-						self::_mapFillType($this->_style->getFill()->getFillType()))?1:0;
-		$atr_prot    = self::_mapLocked($this->_style->getProtection()->getLocked())
-						| self::_mapHidden($this->_style->getProtection()->getHidden());
-
-		// Zero the default border colour if the border has not been set.
-		if (self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) == 0) {
-			$this->_bottom_color = 0;
-		}
-		if (self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())  == 0) {
-			$this->_top_color = 0;
-		}
-		if (self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) == 0) {
-			$this->_right_color = 0;
-		}
-		if (self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) == 0) {
-			$this->_left_color = 0;
-		}
-		if (self::_mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle()) == 0) {
-			$this->_diag_color = 0;
-		}
-
-		$record         = 0x00E0;              // Record identifier
-		$length         = 0x0014;              // Number of bytes to follow
-
-		$ifnt           = $this->_fontIndex;   // Index to FONT record
-		$ifmt           = $this->_numberFormatIndex;  // Index to FORMAT record
-
-		$align          = $this->_mapHAlign($this->_style->getAlignment()->getHorizontal());       // Alignment
-		$align         |= (int) $this->_style->getAlignment()->getWrapText()     << 3;
-		$align         |= self::_mapVAlign($this->_style->getAlignment()->getVertical())  << 4;
-		$align         |= $this->_text_justlast << 7;
-
-		$used_attrib    = $atr_num              << 2;
-		$used_attrib   |= $atr_fnt              << 3;
-		$used_attrib   |= $atr_alc              << 4;
-		$used_attrib   |= $atr_bdr              << 5;
-		$used_attrib   |= $atr_pat              << 6;
-		$used_attrib   |= $atr_prot             << 7;
-
-		$icv            = $this->_fg_color;      // fg and bg pattern colors
-		$icv           |= $this->_bg_color      << 7;
-
-		$border1        = self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle());          // Border line style and color
-		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())         << 4;
-		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())           << 8;
-		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())        << 12;
-		$border1       |= $this->_left_color    << 16;
-		$border1       |= $this->_right_color   << 23;
-
-		$diagonalDirection = $this->_style->getBorders()->getDiagonalDirection();
-		$diag_tl_to_rb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
-							|| $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_DOWN;
-		$diag_tr_to_lb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
-							|| $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_UP;
-		$border1       |= $diag_tl_to_rb        << 30;
-		$border1       |= $diag_tr_to_lb        << 31;
-
-		$border2        = $this->_top_color;    // Border color
-		$border2       |= $this->_bottom_color   << 7;
-		$border2       |= $this->_diag_color     << 14;
-		$border2       |= self::_mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle())           << 21;
-		$border2       |= self::_mapFillType($this->_style->getFill()->getFillType())        << 26;
-
-		$header      = pack("vv",       $record, $length);
-
-		//BIFF8 options: identation, shrinkToFit and  text direction
-		$biff8_options  = $this->_style->getAlignment()->getIndent();
-		$biff8_options |= (int) $this->_style->getAlignment()->getShrinkToFit() << 4;
-
-		$data  = pack("vvvC", $ifnt, $ifmt, $style, $align);
-		$data .= pack("CCC"
-			, self::_mapTextRotation($this->_style->getAlignment()->getTextRotation())
-			, $biff8_options
-			, $used_attrib
-			);
-		$data .= pack("VVv", $border1, $border2, $icv);
-
-		return($header . $data);
-	}
-
-	/**
-	 * Is this a style XF ?
-	 *
-	 * @param boolean $value
-	 */
-	public function setIsStyleXf($value)
-	{
-		$this->_isStyleXf = $value;
-	}
-
-	/**
-	 * Sets the cell's bottom border color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setBottomColor($colorIndex)
-	{
-		$this->_bottom_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the cell's top border color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setTopColor($colorIndex)
-	{
-		$this->_top_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the cell's left border color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setLeftColor($colorIndex)
-	{
-		$this->_left_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the cell's right border color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setRightColor($colorIndex)
-	{
-		$this->_right_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the cell's diagonal border color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setDiagColor($colorIndex)
-	{
-		$this->_diag_color = $colorIndex;
-	}
-
-
-	/**
-	 * Sets the cell's foreground color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setFgColor($colorIndex)
-	{
-		$this->_fg_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the cell's background color
-	 *
-	 * @access public
-	 * @param int $colorIndex Color index
-	 */
-	function setBgColor($colorIndex)
-	{
-		$this->_bg_color = $colorIndex;
-	}
-
-	/**
-	 * Sets the index to the number format record
-	 * It can be date, time, currency, etc...
-	 *
-	 * @access public
-	 * @param integer $numberFormatIndex Index to format record
-	 */
-	function setNumberFormatIndex($numberFormatIndex)
-	{
-		$this->_numberFormatIndex = $numberFormatIndex;
-	}
-
-	/**
-	 * Set the font index.
-	 *
-	 * @param int $value Font index, note that value 4 does not exist
-	 */
-	public function setFontIndex($value)
-	{
-		$this->_fontIndex = $value;
-	}
-
-	/**
-	 * Map of BIFF2-BIFF8 codes for border styles
-	 * @static	array of int
-	 *
-	 */
-	private static $_mapBorderStyle = array	( PHPExcel_Style_Border::BORDER_NONE				=> 0x00,
-											  PHPExcel_Style_Border::BORDER_THIN				=> 0x01,
-											  PHPExcel_Style_Border::BORDER_MEDIUM				=> 0x02,
-											  PHPExcel_Style_Border::BORDER_DASHED				=> 0x03,
-											  PHPExcel_Style_Border::BORDER_DOTTED				=> 0x04,
-											  PHPExcel_Style_Border::BORDER_THICK				=> 0x05,
-											  PHPExcel_Style_Border::BORDER_DOUBLE				=> 0x06,
-											  PHPExcel_Style_Border::BORDER_HAIR				=> 0x07,
-											  PHPExcel_Style_Border::BORDER_MEDIUMDASHED		=> 0x08,
-											  PHPExcel_Style_Border::BORDER_DASHDOT				=> 0x09,
-											  PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT		=> 0x0A,
-											  PHPExcel_Style_Border::BORDER_DASHDOTDOT			=> 0x0B,
-											  PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT	=> 0x0C,
-											  PHPExcel_Style_Border::BORDER_SLANTDASHDOT		=> 0x0D,
-											);
-
-	/**
-	 * Map border style
-	 *
-	 * @param string $borderStyle
-	 * @return int
-	 */
-	private static function _mapBorderStyle($borderStyle) {
-		if (isset(self::$_mapBorderStyle[$borderStyle]))
-			return self::$_mapBorderStyle[$borderStyle];
-		return 0x00;
-	}
-
-	/**
-	 * Map of BIFF2-BIFF8 codes for fill types
-	 * @static	array of int
-	 *
-	 */
-	private static $_mapFillType = array( PHPExcel_Style_Fill::FILL_NONE					=> 0x00,
-										  PHPExcel_Style_Fill::FILL_SOLID					=> 0x01,
-										  PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY		=> 0x02,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY		=> 0x03,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY		=> 0x04,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL	=> 0x05,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL	=> 0x06,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN		=> 0x07,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKUP			=> 0x08,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID		=> 0x09,
-										  PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS		=> 0x0A,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL	=> 0x0B,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL	=> 0x0C,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN		=> 0x0D,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP			=> 0x0E,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID		=> 0x0F,
-										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS	=> 0x10,
-										  PHPExcel_Style_Fill::FILL_PATTERN_GRAY125			=> 0x11,
-										  PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625		=> 0x12,
-										  PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR			=> 0x00,	// does not exist in BIFF8
-										  PHPExcel_Style_Fill::FILL_GRADIENT_PATH			=> 0x00,	// does not exist in BIFF8
-										);
-	/**
-	 * Map fill type
-	 *
-	 * @param string $fillType
-	 * @return int
-	 */
-	private static function _mapFillType($fillType) {
-		if (isset(self::$_mapFillType[$fillType]))
-			return self::$_mapFillType[$fillType];
-		return 0x00;
-	}
-
-	/**
-	 * Map of BIFF2-BIFF8 codes for horizontal alignment
-	 * @static	array of int
-	 *
-	 */
-	private static $_mapHAlign = array( PHPExcel_Style_Alignment::HORIZONTAL_GENERAL			=> 0,
-										PHPExcel_Style_Alignment::HORIZONTAL_LEFT				=> 1,
-										PHPExcel_Style_Alignment::HORIZONTAL_CENTER				=> 2,
-										PHPExcel_Style_Alignment::HORIZONTAL_RIGHT				=> 3,
-										PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY			=> 5,
-										PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS	=> 6,
-									  );
-	/**
-	 * Map to BIFF2-BIFF8 codes for horizontal alignment
-	 *
-	 * @param string $hAlign
-	 * @return int
-	 */
-	private function _mapHAlign($hAlign)
-	{
-		if (isset(self::$_mapHAlign[$hAlign]))
-			return self::$_mapHAlign[$hAlign];
-		return 0;
-	}
-
-	/**
-	 * Map of BIFF2-BIFF8 codes for vertical alignment
-	 * @static	array of int
-	 *
-	 */
-	private static $_mapVAlign = array( PHPExcel_Style_Alignment::VERTICAL_TOP		=> 0,
-										PHPExcel_Style_Alignment::VERTICAL_CENTER	=> 1,
-										PHPExcel_Style_Alignment::VERTICAL_BOTTOM	=> 2,
-										PHPExcel_Style_Alignment::VERTICAL_JUSTIFY	=> 3,
-									  );
-	/**
-	 * Map to BIFF2-BIFF8 codes for vertical alignment
-	 *
-	 * @param string $vAlign
-	 * @return int
-	 */
-	private static function _mapVAlign($vAlign) {
-		if (isset(self::$_mapVAlign[$vAlign]))
-			return self::$_mapVAlign[$vAlign];
-		return 2;
-	}
-
-	/**
-	 * Map to BIFF8 codes for text rotation angle
-	 *
-	 * @param int $textRotation
-	 * @return int
-	 */
-	private static function _mapTextRotation($textRotation) {
-		if ($textRotation >= 0) {
-			return $textRotation;
-		}
-		if ($textRotation == -165) {
-			return 255;
-		}
-		if ($textRotation < 0) {
-			return 90 - $textRotation;
-		}
-	}
-
-	/**
-	 * Map locked
-	 *
-	 * @param string
-	 * @return int
-	 */
-	private static function _mapLocked($locked) {
-		switch ($locked) {
-			case PHPExcel_Style_Protection::PROTECTION_INHERIT:		return 1;
-			case PHPExcel_Style_Protection::PROTECTION_PROTECTED:	return 1;
-			case PHPExcel_Style_Protection::PROTECTION_UNPROTECTED:	return 0;
-			default:												return 1;
-		}
-	}
-
-	/**
-	 * Map hidden
-	 *
-	 * @param string
-	 * @return int
-	 */
-	private static function _mapHidden($hidden) {
-		switch ($hidden) {
-			case PHPExcel_Style_Protection::PROTECTION_INHERIT:		return 0;
-			case PHPExcel_Style_Protection::PROTECTION_PROTECTED:	return 1;
-			case PHPExcel_Style_Protection::PROTECTION_UNPROTECTED:	return 0;
-			default:												return 0;
-		}
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/HTML.php b/plugins/exportTypes/Excel/PHPExcel/Writer/HTML.php
deleted file mode 100755
index 52af1727f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/HTML.php
+++ /dev/null
@@ -1,1377 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_HTML
- *
- * @category   PHPExcel
- * @package	PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
-	/**
-	 * PHPExcel object
-	 *
-	 * @var PHPExcel
-	 */
-	protected $_phpExcel;
-
-	/**
-	 * Sheet index to write
-	 *
-	 * @var int
-	 */
-	private $_sheetIndex	= 0;
-
-	/**
-	 * Pre-calculate formulas
-	 *
-	 * @var boolean
-	 */
-	private $_preCalculateFormulas = true;
-
-	/**
-	 * Images root
-	 *
-	 * @var string
-	 */
-	private $_imagesRoot	= '.';
-
-	/**
-	 * Use inline CSS?
-	 *
-	 * @var boolean
-	 */
-	private $_useInlineCss = false;
-
-	/**
-	 * Array of CSS styles
-	 *
-	 * @var array
-	 */
-	private $_cssStyles = null;
-
-	/**
-	 * Array of column widths in points
-	 *
-	 * @var array
-	 */
-	private $_columnWidths = null;
-
-	/**
-	 * Default font
-	 *
-	 * @var PHPExcel_Style_Font
-	 */
-	private $_defaultFont;
-
-	/**
-	 * Flag whether spans have been calculated
-	 *
-	 * @var boolean
-	 */
-	private $_spansAreCalculated	= false;
-
-	/**
-	 * Excel cells that should not be written as HTML cells
-	 *
-	 * @var array
-	 */
-	private $_isSpannedCell	= array();
-
-	/**
-	 * Excel cells that are upper-left corner in a cell merge
-	 *
-	 * @var array
-	 */
-	private $_isBaseCell	= array();
-
-	/**
-	 * Excel rows that should not be written as HTML rows
-	 *
-	 * @var array
-	 */
-	private $_isSpannedRow	= array();
-
-	/**
-	 * Is the current writer creating PDF?
-	 *
-	 * @var boolean
-	 */
-	protected $_isPdf = false;
-
-	/**
-	 * Generate the Navigation block
-	 *
-	 * @var boolean
-	 */
-	private $_generateSheetNavigationBlock = true;
-
-	/**
-	 * Create a new PHPExcel_Writer_HTML
-	 *
-	 * @param	PHPExcel	$phpExcel	PHPExcel object
-	 */
-	public function __construct(PHPExcel $phpExcel) {
-		$this->_phpExcel = $phpExcel;
-		$this->_defaultFont = $this->_phpExcel->getDefaultStyle()->getFont();
-	}
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param	string		$pFilename
-	 * @throws	Exception
-	 */
-	public function save($pFilename = null) {
-		// garbage collect
-		$this->_phpExcel->garbageCollect();
-
-		$saveDebugLog = PHPExcel_Calculation::getInstance()->writeDebugLog;
-		PHPExcel_Calculation::getInstance()->writeDebugLog = false;
-		$saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
-		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
-
-		// Build CSS
-		$this->buildCSS(!$this->_useInlineCss);
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'wb+');
-		if ($fileHandle === false) {
-			throw new Exception("Could not open file $pFilename for writing.");
-		}
-
-		// Write headers
-		fwrite($fileHandle, $this->generateHTMLHeader(!$this->_useInlineCss));
-
-		// Write navigation (tabs)
-		if ((!$this->_isPdf) && ($this->_generateSheetNavigationBlock)) {
-			fwrite($fileHandle, $this->generateNavigation());
-		}
-
-		// Write data
-		fwrite($fileHandle, $this->generateSheetData());
-
-		// Write footer
-		fwrite($fileHandle, $this->generateHTMLFooter());
-
-		// Close file
-		fclose($fileHandle);
-
-		PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
-		PHPExcel_Calculation::getInstance()->writeDebugLog = $saveDebugLog;
-	}
-
-	/**
-	 * Map VAlign
-	 *
-	 * @param	string		$vAlign		Vertical alignment
-	 * @return string
-	 */
-	private function _mapVAlign($vAlign) {
-		switch ($vAlign) {
-			case PHPExcel_Style_Alignment::VERTICAL_BOTTOM:		return 'bottom';
-			case PHPExcel_Style_Alignment::VERTICAL_TOP:		return 'top';
-			case PHPExcel_Style_Alignment::VERTICAL_CENTER:
-			case PHPExcel_Style_Alignment::VERTICAL_JUSTIFY:	return 'middle';
-			default: return 'baseline';
-		}
-	}
-
-	/**
-	 * Map HAlign
-	 *
-	 * @param	string		$hAlign		Horizontal alignment
-	 * @return string|false
-	 */
-	private function _mapHAlign($hAlign) {
-		switch ($hAlign) {
-			case PHPExcel_Style_Alignment::HORIZONTAL_GENERAL:				return false;
-			case PHPExcel_Style_Alignment::HORIZONTAL_LEFT:					return 'left';
-			case PHPExcel_Style_Alignment::HORIZONTAL_RIGHT:				return 'right';
-			case PHPExcel_Style_Alignment::HORIZONTAL_CENTER:
-			case PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS:	return 'center';
-			case PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY:				return 'justify';
-			default: return false;
-		}
-	}
-
-	/**
-	 * Map border style
-	 *
-	 * @param	int		$borderStyle		Sheet index
-	 * @return	string
-	 */
-	private function _mapBorderStyle($borderStyle) {
-		switch ($borderStyle) {
-			case PHPExcel_Style_Border::BORDER_NONE:				return 'none';
-			case PHPExcel_Style_Border::BORDER_DASHDOT:				return '1px dashed';
-			case PHPExcel_Style_Border::BORDER_DASHDOTDOT:			return '1px dotted';
-			case PHPExcel_Style_Border::BORDER_DASHED:				return '1px dashed';
-			case PHPExcel_Style_Border::BORDER_DOTTED:				return '1px dotted';
-			case PHPExcel_Style_Border::BORDER_DOUBLE:				return '3px double';
-			case PHPExcel_Style_Border::BORDER_HAIR:				return '1px solid';
-			case PHPExcel_Style_Border::BORDER_MEDIUM:				return '2px solid';
-			case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT:		return '2px dashed';
-			case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT:	return '2px dotted';
-			case PHPExcel_Style_Border::BORDER_MEDIUMDASHED:		return '2px dashed';
-			case PHPExcel_Style_Border::BORDER_SLANTDASHDOT:		return '2px dashed';
-			case PHPExcel_Style_Border::BORDER_THICK:				return '3px solid';
-			case PHPExcel_Style_Border::BORDER_THIN:				return '1px solid';
-			default: return '1px solid'; // map others to thin
-		}
-	}
-
-	/**
-	 * Get sheet index
-	 *
-	 * @return int
-	 */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
-	}
-
-	/**
-	 * Set sheet index
-	 *
-	 * @param	int		$pValue		Sheet index
-	 * @return PHPExcel_Writer_HTML
-	 */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get sheet index
-	 *
-	 * @return boolean
-	 */
-	public function getGenerateSheetNavigationBlock() {
-		return $this->_generateSheetNavigationBlock;
-	}
-
-	/**
-	 * Set sheet index
-	 *
-	 * @param	boolean		$pValue		Flag indicating whether the sheet navigation block should be generated or not
-	 * @return PHPExcel_Writer_HTML
-	 */
-	public function setGenerateSheetNavigationBlock($pValue = true) {
-		$this->_generateSheetNavigationBlock = (bool) $pValue;
-		return $this;
-	}
-
-	/**
-	 * Write all sheets (resets sheetIndex to NULL)
-	 */
-	public function writeAllSheets() {
-		$this->_sheetIndex = null;
-		return $this;
-	}
-
-	/**
-	 * Generate HTML header
-	 *
-	 * @param	boolean		$pIncludeStyles		Include styles?
-	 * @return	string
-	 * @throws Exception
-	 */
-	public function generateHTMLHeader($pIncludeStyles = false) {
-		// PHPExcel object known?
-		if (is_null($this->_phpExcel)) {
-			throw new Exception('Internal PHPExcel object not set to an instance of an object.');
-		}
-
-		// Construct HTML
-		$properties = $this->_phpExcel->getProperties();
-		$html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . PHP_EOL;
-		$html .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->' . PHP_EOL;
-		$html .= '<html>' . PHP_EOL;
-		$html .= '  <head>' . PHP_EOL;
-		$html .= '	  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">' . PHP_EOL;
-		if ($properties->getTitle() > '')
-			$html .= '	  <title>' . htmlspecialchars($properties->getTitle()) . '</title>' . PHP_EOL;
-
-		if ($properties->getCreator() > '')
-			$html .= '	  <meta name="author" content="' . htmlspecialchars($properties->getCreator()) . '" />' . PHP_EOL;
-		if ($properties->getTitle() > '')
-			$html .= '	  <meta name="title" content="' . htmlspecialchars($properties->getTitle()) . '" />' . PHP_EOL;
-		if ($properties->getDescription() > '')
-			$html .= '	  <meta name="description" content="' . htmlspecialchars($properties->getDescription()) . '" />' . PHP_EOL;
-		if ($properties->getSubject() > '')
-			$html .= '	  <meta name="subject" content="' . htmlspecialchars($properties->getSubject()) . '" />' . PHP_EOL;
-		if ($properties->getKeywords() > '')
-			$html .= '	  <meta name="keywords" content="' . htmlspecialchars($properties->getKeywords()) . '" />' . PHP_EOL;
-		if ($properties->getCategory() > '')
-			$html .= '	  <meta name="category" content="' . htmlspecialchars($properties->getCategory()) . '" />' . PHP_EOL;
-		if ($properties->getCompany() > '')
-			$html .= '	  <meta name="company" content="' . htmlspecialchars($properties->getCompany()) . '" />' . PHP_EOL;
-		if ($properties->getManager() > '')
-			$html .= '	  <meta name="manager" content="' . htmlspecialchars($properties->getManager()) . '" />' . PHP_EOL;
-
-		if ($pIncludeStyles) {
-			$html .= $this->generateStyles(true);
-		}
-
-		$html .= '  </head>' . PHP_EOL;
-		$html .= '' . PHP_EOL;
-		$html .= '  <body>' . PHP_EOL;
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate sheet data
-	 *
-	 * @return	string
-	 * @throws Exception
-	 */
-	public function generateSheetData() {
-		// PHPExcel object known?
-		if (is_null($this->_phpExcel)) {
-			throw new Exception('Internal PHPExcel object not set to an instance of an object.');
-		}
-
-		// Ensure that Spans have been calculated?
-		if (!$this->_spansAreCalculated) {
-			$this->_calculateSpans();
-		}
-
-		// Fetch sheets
-		$sheets = array();
-		if (is_null($this->_sheetIndex)) {
-			$sheets = $this->_phpExcel->getAllSheets();
-		} else {
-			$sheets[] = $this->_phpExcel->getSheet($this->_sheetIndex);
-		}
-
-		// Construct HTML
-		$html = '';
-
-		// Loop all sheets
-		$sheetId = 0;
-		foreach ($sheets as $sheet) {
-			// Write table header
-			$html .= $this->_generateTableHeader($sheet);
-
-			// Get worksheet dimension
-			$dimension = explode(':', $sheet->calculateWorksheetDimension());
-			$dimension[0] = PHPExcel_Cell::coordinateFromString($dimension[0]);
-			$dimension[0][0] = PHPExcel_Cell::columnIndexFromString($dimension[0][0]) - 1;
-			$dimension[1] = PHPExcel_Cell::coordinateFromString($dimension[1]);
-			$dimension[1][0] = PHPExcel_Cell::columnIndexFromString($dimension[1][0]) - 1;
-
-			// row min,max
-			$rowMin = $dimension[0][1];
-			$rowMax = $dimension[1][1];
-
-			// calculate start of <tbody>, <thead>
-			$tbodyStart = $rowMin;
-			$tbodyEnd   = $rowMax;
-			$theadStart = $theadEnd   = 0; // default: no <thead>	no </thead>
-			if ($sheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-				$rowsToRepeatAtTop = $sheet->getPageSetup()->getRowsToRepeatAtTop();
-
-				// we can only support repeating rows that start at top row
-				if ($rowsToRepeatAtTop[0] == 1) {
-					$theadStart = $rowsToRepeatAtTop[0];
-					$theadEnd   = $rowsToRepeatAtTop[1];
-					$tbodyStart = $rowsToRepeatAtTop[1] + 1;
-				}
-			}
-
-			// Loop through cells
-			$row = $rowMin-1;
-			while($row++ < $rowMax) {
-				// <thead> ?
-				if ($row == $theadStart) {
-					$html .= '		<thead>' . PHP_EOL;
-				}
-
-				// <tbody> ?
-				if ($row == $tbodyStart) {
-					$html .= '		<tbody>' . PHP_EOL;
-				}
-
-				// Write row if there are HTML table cells in it
-				if ( !isset($this->_isSpannedRow[$sheet->getParent()->getIndex($sheet)][$row]) ) {
-					// Start a new rowData
-					$rowData = array();
-					// Loop through columns
-					$column = $dimension[0][0] - 1;
-					while($column++ < $dimension[1][0]) {
-						// Cell exists?
-						if ($sheet->cellExistsByColumnAndRow($column, $row)) {
-							$rowData[$column] = $sheet->getCellByColumnAndRow($column, $row);
-						} else {
-							$rowData[$column] = '';
-						}
-					}
-					$html .= $this->_generateRow($sheet, $rowData, $row - 1);
-				}
-
-				// </thead> ?
-				if ($row == $theadEnd) {
-					$html .= '		</thead>' . PHP_EOL;
-				}
-
-				// </tbody> ?
-				if ($row == $tbodyEnd) {
-					$html .= '		</tbody>' . PHP_EOL;
-				}
-			}
-
-			// Write table footer
-			$html .= $this->_generateTableFooter();
-
-			// Writing PDF?
-			if ($this->_isPdf) {
-				if (is_null($this->_sheetIndex) && $sheetId + 1 < $this->_phpExcel->getSheetCount()) {
-					$html .= '<div style="page-break-before:always" />';
-				}
-			}
-
-			// Next sheet
-			++$sheetId;
-		}
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate sheet tabs
-	 *
-	 * @return	string
-	 * @throws Exception
-	 */
-	public function generateNavigation()
-	{
-		// PHPExcel object known?
-		if (is_null($this->_phpExcel)) {
-			throw new Exception('Internal PHPExcel object not set to an instance of an object.');
-		}
-
-		// Fetch sheets
-		$sheets = array();
-		if (is_null($this->_sheetIndex)) {
-			$sheets = $this->_phpExcel->getAllSheets();
-		} else {
-			$sheets[] = $this->_phpExcel->getSheet($this->_sheetIndex);
-		}
-
-		// Construct HTML
-		$html = '';
-
-		// Only if there are more than 1 sheets
-		if (count($sheets) > 1) {
-			// Loop all sheets
-			$sheetId = 0;
-
-			$html .= '<ul class="navigation">' . PHP_EOL;
-
-			foreach ($sheets as $sheet) {
-				$html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
-				++$sheetId;
-			}
-
-			$html .= '</ul>' . PHP_EOL;
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Generate image tag in cell
-	 *
-	 * @param	PHPExcel_Worksheet	$pSheet			PHPExcel_Worksheet
-	 * @param	string				$coordinates	Cell coordinates
-	 * @return	string
-	 * @throws	Exception
-	 */
-	private function _writeImageTagInCell(PHPExcel_Worksheet $pSheet, $coordinates) {
-		// Construct HTML
-		$html = '';
-
-		// Write images
-		foreach ($pSheet->getDrawingCollection() as $drawing) {
-			if ($drawing instanceof PHPExcel_Worksheet_Drawing) {
-				if ($drawing->getCoordinates() == $coordinates) {
-					$filename = $drawing->getPath();
-
-					// Strip off eventual '.'
-					if (substr($filename, 0, 1) == '.') {
-						$filename = substr($filename, 1);
-					}
-
-					// Prepend images root
-					$filename = $this->getImagesRoot() . $filename;
-
-					// Strip off eventual '.'
-					if (substr($filename, 0, 1) == '.' && substr($filename, 0, 2) != './') {
-						$filename = substr($filename, 1);
-					}
-
-					// Convert UTF8 data to PCDATA
-					$filename = htmlspecialchars($filename);
-
-					$html .= PHP_EOL;
-					$html .= '		<img style="position: relative; left: ' . $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' . $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' . $filename . '" border="0" width="' . $drawing->getWidth() . '" height="' . $drawing->getHeight() . '" />' . PHP_EOL;
-				}
-			}
-		}
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate CSS styles
-	 *
-	 * @param	boolean	$generateSurroundingHTML	Generate surrounding HTML tags? (<style> and </style>)
-	 * @return	string
-	 * @throws	Exception
-	 */
-	public function generateStyles($generateSurroundingHTML = true) {
-		// PHPExcel object known?
-		if (is_null($this->_phpExcel)) {
-			throw new Exception('Internal PHPExcel object not set to an instance of an object.');
-		}
-
-		// Build CSS
-		$css = $this->buildCSS($generateSurroundingHTML);
-
-		// Construct HTML
-		$html = '';
-
-		// Start styles
-		if ($generateSurroundingHTML) {
-			$html .= '	<style type="text/css">' . PHP_EOL;
-			$html .= '	  html { ' . $this->_assembleCSS($css['html']) . ' }' . PHP_EOL;
-		}
-
-		// Write all other styles
-		foreach ($css as $styleName => $styleDefinition) {
-			if ($styleName != 'html') {
-				$html .= '	  ' . $styleName . ' { ' . $this->_assembleCSS($styleDefinition) . ' }' . PHP_EOL;
-			}
-		}
-
-		// End styles
-		if ($generateSurroundingHTML) {
-			$html .= '	</style>' . PHP_EOL;
-		}
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Build CSS styles
-	 *
-	 * @param	boolean	$generateSurroundingHTML	Generate surrounding HTML style? (html { })
-	 * @return	array
-	 * @throws	Exception
-	 */
-	public function buildCSS($generateSurroundingHTML = true) {
-		// PHPExcel object known?
-		if (is_null($this->_phpExcel)) {
-			throw new Exception('Internal PHPExcel object not set to an instance of an object.');
-		}
-
-		// Cached?
-		if (!is_null($this->_cssStyles)) {
-			return $this->_cssStyles;
-		}
-
-		// Ensure that spans have been calculated
-		if (!$this->_spansAreCalculated) {
-			$this->_calculateSpans();
-		}
-
-		// Construct CSS
-		$css = array();
-
-		// Start styles
-		if ($generateSurroundingHTML) {
-			// html { }
-			$css['html']['font-family']	  = 'Calibri, Arial, Helvetica, sans-serif';
-			$css['html']['font-size']		= '11pt';
-			$css['html']['background-color'] = 'white';
-		}
-
-
-		// table { }
-		$css['table']['border-collapse']  = 'collapse';
-	    if (!$this->_isPdf) {
-			$css['table']['page-break-after'] = 'always';
-		}
-
-		// .gridlines td { }
-		$css['.gridlines td']['border'] = '1px dotted black';
-
-		// .b {}
-		$css['.b']['text-align'] = 'center'; // BOOL
-
-		// .e {}
-		$css['.e']['text-align'] = 'center'; // ERROR
-
-		// .f {}
-		$css['.f']['text-align'] = 'right'; // FORMULA
-
-		// .inlineStr {}
-		$css['.inlineStr']['text-align'] = 'left'; // INLINE
-
-		// .n {}
-		$css['.n']['text-align'] = 'right'; // NUMERIC
-
-		// .s {}
-		$css['.s']['text-align'] = 'left'; // STRING
-
-		// Calculate cell style hashes
-		foreach ($this->_phpExcel->getCellXfCollection() as $index => $style) {
-			$css['td.style' . $index] = $this->_createCSSStyle( $style );
-		}
-
-		// Fetch sheets
-		$sheets = array();
-		if (is_null($this->_sheetIndex)) {
-			$sheets = $this->_phpExcel->getAllSheets();
-		} else {
-			$sheets[] = $this->_phpExcel->getSheet($this->_sheetIndex);
-		}
-
-		// Build styles per sheet
-		foreach ($sheets as $sheet) {
-			// Calculate hash code
-			$sheetIndex = $sheet->getParent()->getIndex($sheet);
-
-			// Build styles
-			// Calculate column widths
-			$sheet->calculateColumnWidths();
-
-			// col elements, initialize
-			$highestColumnIndex = PHPExcel_Cell::columnIndexFromString($sheet->getHighestColumn()) - 1;
-			$column = -1;
-			while($column++ < $highestColumnIndex) {
-				$this->_columnWidths[$sheetIndex][$column] = 42; // approximation
-				$css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = '42pt';
-			}
-
-			// col elements, loop through columnDimensions and set width
-			foreach ($sheet->getColumnDimensions() as $columnDimension) {
-				if (($width = PHPExcel_Shared_Drawing::cellDimensionToPixels($columnDimension->getWidth(), $this->_defaultFont)) >= 0) {
-					$width = PHPExcel_Shared_Drawing::pixelsToPoints($width);
-					$column = PHPExcel_Cell::columnIndexFromString($columnDimension->getColumnIndex()) - 1;
-					$this->_columnWidths[$sheetIndex][$column] = $width;
-					$css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = $width . 'pt';
-
-					if ($columnDimension->getVisible() === false) {
-						$css['table.sheet' . $sheetIndex . ' col.col' . $column]['visibility'] = 'collapse';
-						$css['table.sheet' . $sheetIndex . ' col.col' . $column]['*display'] = 'none'; // target IE6+7
-					}
-				}
-			}
-
-			// Default row height
-			$rowDimension = $sheet->getDefaultRowDimension();
-
-			// table.sheetN tr { }
-			$css['table.sheet' . $sheetIndex . ' tr'] = array();
-
-			if ($rowDimension->getRowHeight() == -1) {
-				$pt_height = PHPExcel_Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
-			} else {
-				$pt_height = $rowDimension->getRowHeight();
-			}
-			$css['table.sheet' . $sheetIndex . ' tr']['height'] = $pt_height . 'pt';
-			if ($rowDimension->getVisible() === false) {
-				$css['table.sheet' . $sheetIndex . ' tr']['display']	= 'none';
-				$css['table.sheet' . $sheetIndex . ' tr']['visibility'] = 'hidden';
-			}
-
-			// Calculate row heights
-			foreach ($sheet->getRowDimensions() as $rowDimension) {
-				$row = $rowDimension->getRowIndex() - 1;
-
-				// table.sheetN tr.rowYYYYYY { }
-				$css['table.sheet' . $sheetIndex . ' tr.row' . $row] = array();
-
-				if ($rowDimension->getRowHeight() == -1) {
-					$pt_height = PHPExcel_Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
-				} else {
-					$pt_height = $rowDimension->getRowHeight();
-				}
-				$css['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'] = $pt_height . 'pt';
-				if ($rowDimension->getVisible() === false) {
-					$css['table.sheet' . $sheetIndex . ' tr.row' . $row]['display'] = 'none';
-					$css['table.sheet' . $sheetIndex . ' tr.row' . $row]['visibility'] = 'hidden';
-				}
-			}
-		}
-
-		// Cache
-		if (is_null($this->_cssStyles)) {
-			$this->_cssStyles = $css;
-		}
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style
-	 *
-	 * @param	PHPExcel_Style		$pStyle			PHPExcel_Style
-	 * @return	array
-	 */
-	private function _createCSSStyle(PHPExcel_Style $pStyle) {
-		// Construct CSS
-		$css = '';
-
-		// Create CSS
-		$css = array_merge(
-			$this->_createCSSStyleAlignment($pStyle->getAlignment())
-			, $this->_createCSSStyleBorders($pStyle->getBorders())
-			, $this->_createCSSStyleFont($pStyle->getFont())
-			, $this->_createCSSStyleFill($pStyle->getFill())
-		);
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style (PHPExcel_Style_Alignment)
-	 *
-	 * @param	PHPExcel_Style_Alignment		$pStyle			PHPExcel_Style_Alignment
-	 * @return	array
-	 */
-	private function _createCSSStyleAlignment(PHPExcel_Style_Alignment $pStyle) {
-		// Construct CSS
-		$css = array();
-
-		// Create CSS
-		$css['vertical-align'] = $this->_mapVAlign($pStyle->getVertical());
-		if ($textAlign = $this->_mapHAlign($pStyle->getHorizontal())) {
-			$css['text-align'] = $textAlign;
-			if(in_array($textAlign,array('left','right')))
-				$css['padding-'.$textAlign] = (string)((int)$pStyle->getIndent() * 9).'px';
-		}
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style (PHPExcel_Style_Font)
-	 *
-	 * @param	PHPExcel_Style_Font		$pStyle			PHPExcel_Style_Font
-	 * @return	array
-	 */
-	private function _createCSSStyleFont(PHPExcel_Style_Font $pStyle) {
-		// Construct CSS
-		$css = array();
-
-		// Create CSS
-		if ($pStyle->getBold()) {
-			$css['font-weight'] = 'bold';
-		}
-		if ($pStyle->getUnderline() != PHPExcel_Style_Font::UNDERLINE_NONE && $pStyle->getStrikethrough()) {
-			$css['text-decoration'] = 'underline line-through';
-		} else if ($pStyle->getUnderline() != PHPExcel_Style_Font::UNDERLINE_NONE) {
-			$css['text-decoration'] = 'underline';
-		} else if ($pStyle->getStrikethrough()) {
-			$css['text-decoration'] = 'line-through';
-		}
-		if ($pStyle->getItalic()) {
-			$css['font-style'] = 'italic';
-		}
-
-		$css['color']		= '#' . $pStyle->getColor()->getRGB();
-		$css['font-family']	= '\'' . $pStyle->getName() . '\'';
-		$css['font-size']	= $pStyle->getSize() . 'pt';
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style (PHPExcel_Style_Borders)
-	 *
-	 * @param	PHPExcel_Style_Borders		$pStyle			PHPExcel_Style_Borders
-	 * @return	array
-	 */
-	private function _createCSSStyleBorders(PHPExcel_Style_Borders $pStyle) {
-		// Construct CSS
-		$css = array();
-
-		// Create CSS
-		$css['border-bottom']	= $this->_createCSSStyleBorder($pStyle->getBottom());
-		$css['border-top']		= $this->_createCSSStyleBorder($pStyle->getTop());
-		$css['border-left']		= $this->_createCSSStyleBorder($pStyle->getLeft());
-		$css['border-right']	= $this->_createCSSStyleBorder($pStyle->getRight());
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style (PHPExcel_Style_Border)
-	 *
-	 * @param	PHPExcel_Style_Border		$pStyle			PHPExcel_Style_Border
-	 * @return	string
-	 */
-	private function _createCSSStyleBorder(PHPExcel_Style_Border $pStyle) {
-		// Create CSS
-		$css = $this->_mapBorderStyle($pStyle->getBorderStyle()) . ' #' . $pStyle->getColor()->getRGB();
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Create CSS style (PHPExcel_Style_Fill)
-	 *
-	 * @param	PHPExcel_Style_Fill		$pStyle			PHPExcel_Style_Fill
-	 * @return	array
-	 */
-	private function _createCSSStyleFill(PHPExcel_Style_Fill $pStyle) {
-		// Construct HTML
-		$css = array();
-
-		// Create CSS
-		$value = $pStyle->getFillType() == PHPExcel_Style_Fill::FILL_NONE ?
-			'white' : '#' . $pStyle->getStartColor()->getRGB();
-		$css['background-color'] = $value;
-
-		// Return
-		return $css;
-	}
-
-	/**
-	 * Generate HTML footer
-	 */
-	public function generateHTMLFooter() {
-		// Construct HTML
-		$html = '';
-		$html .= '  </body>' . PHP_EOL;
-		$html .= '</html>' . PHP_EOL;
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate table header
-	 *
-	 * @param	PHPExcel_Worksheet	$pSheet		The worksheet for the table we are writing
-	 * @return	string
-	 * @throws	Exception
-	 */
-	private function _generateTableHeader($pSheet) {
-		$sheetIndex = $pSheet->getParent()->getIndex($pSheet);
-
-		// Construct HTML
-		$html = '';
-
-		if (!$this->_useInlineCss) {
-			$gridlines = $pSheet->getShowGridLines() ? ' gridlines' : '';
-			$html .= '	<table border="0" cellpadding="0" cellspacing="0" id="sheet' . $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL;
-		} else {
-			$style = isset($this->_cssStyles['table']) ?
-				$this->_assembleCSS($this->_cssStyles['table']) : '';
-
-			if ($this->_isPdf && $pSheet->getShowGridLines()) {
-				$html .= '	<table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
-			} else {
-				$html .= '	<table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
-			}
-		}
-
-		// Write <col> elements
-		$highestColumnIndex = PHPExcel_Cell::columnIndexFromString($pSheet->getHighestColumn()) - 1;
-		$i = -1;
-		while($i++ < $highestColumnIndex) {
-		    if (!$this->_isPdf) {
-				if (!$this->_useInlineCss) {
-					$html .= '		<col class="col' . $i . '">' . PHP_EOL;
-				} else {
-					$style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ?
-						$this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
-					$html .= '		<col style="' . $style . '">' . PHP_EOL;
-				}
-			}
-		}
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate table footer
-	 *
-	 * @throws	Exception
-	 */
-	private function _generateTableFooter() {
-		// Construct HTML
-		$html = '';
-		$html .= '	</table>' . PHP_EOL;
-
-		// Return
-		return $html;
-	}
-
-	/**
-	 * Generate row
-	 *
-	 * @param	PHPExcel_Worksheet	$pSheet			PHPExcel_Worksheet
-	 * @param	array				$pValues		Array containing cells in a row
-	 * @param	int					$pRow			Row number (0-based)
-	 * @return	string
-	 * @throws	Exception
-	 */
-	private function _generateRow(PHPExcel_Worksheet $pSheet, $pValues = null, $pRow = 0) {
-		if (is_array($pValues)) {
-			// Construct HTML
-			$html = '';
-
-			// Sheet index
-			$sheetIndex = $pSheet->getParent()->getIndex($pSheet);
-
-			// DomPDF and breaks
-			if ($this->_isPdf && count($pSheet->getBreaks()) > 0) {
-				$breaks = $pSheet->getBreaks();
-
-				// check if a break is needed before this row
-				if (isset($breaks['A' . $pRow])) {
-					// close table: </table>
-					$html .= $this->_generateTableFooter();
-
-					// insert page break
-					$html .= '<div style="page-break-before:always" />';
-
-					// open table again: <table> + <col> etc.
-					$html .= $this->_generateTableHeader($pSheet);
-				}
-			}
-
-			// Write row start
-			if (!$this->_useInlineCss) {
-				$html .= '		  <tr class="row' . $pRow . '">' . PHP_EOL;
-			} else {
-				$style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow])
-					? $this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) : '';
-
-				$html .= '		  <tr style="' . $style . '">' . PHP_EOL;
-			}
-
-			// Write cells
-			$colNum = 0;
-			foreach ($pValues as $cell) {
-				$coordinate = PHPExcel_Cell::stringFromColumnIndex($colNum) . ($pRow + 1);
-
-				if (!$this->_useInlineCss) {
-					$cssClass = '';
-					$cssClass = 'column' . $colNum;
-				} else {
-					$cssClass = array();
-					if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) {
-						$this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum];
-					}
-				}
-				$colSpan = 1;
-				$rowSpan = 1;
-
-				// initialize
-				$cellData = '';
-
-				// PHPExcel_Cell
-				if ($cell instanceof PHPExcel_Cell) {
-					if (is_null($cell->getParent())) {
-						$cell->attach($pSheet);
-					}
-					// Value
-					if ($cell->getValue() instanceof PHPExcel_RichText) {
-						// Loop through rich text elements
-						$elements = $cell->getValue()->getRichTextElements();
-						foreach ($elements as $element) {
-							// Rich text start?
-							if ($element instanceof PHPExcel_RichText_Run) {
-								$cellData .= '<span style="' . $this->_assembleCSS($this->_createCSSStyleFont($element->getFont())) . '">';
-
-								if ($element->getFont()->getSuperScript()) {
-									$cellData .= '<sup>';
-								} else if ($element->getFont()->getSubScript()) {
-									$cellData .= '<sub>';
-								}
-							}
-
-							// Convert UTF8 data to PCDATA
-							$cellText = $element->getText();
-							$cellData .= htmlspecialchars($cellText);
-
-							if ($element instanceof PHPExcel_RichText_Run) {
-								if ($element->getFont()->getSuperScript()) {
-									$cellData .= '</sup>';
-								} else if ($element->getFont()->getSubScript()) {
-									$cellData .= '</sub>';
-								}
-
-								$cellData .= '</span>';
-							}
-						}
-					} else {
-						if ($this->_preCalculateFormulas) {
-							$cellData = PHPExcel_Style_NumberFormat::toFormattedString(
-								$cell->getCalculatedValue(),
-								$pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getNumberFormat()->getFormatCode(),
-								array($this, 'formatColor')
-							);
-						} else {
-							$cellData = PHPExcel_Style_NumberFormat::ToFormattedString(
-								$cell->getValue(),
-								$pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getNumberFormat()->getFormatCode(),
-								array($this, 'formatColor')
-							);
-						}
-						$cellData = htmlspecialchars($cellData);
-						if ($pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getFont()->getSuperScript()) {
-							$cellData = '<sup>'.$cellData.'</sup>';
-						} elseif ($pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getFont()->getSubScript()) {
-							$cellData = '<sub>'.$cellData.'</sub>';
-						}
-					}
-
-					// Converts the cell content so that spaces occuring at beginning of each new line are replaced by &nbsp;
-					// Example: "  Hello\n to the world" is converted to "&nbsp;&nbsp;Hello\n&nbsp;to the world"
-					$cellData = preg_replace("/(?m)(?:^|\\G) /", '&nbsp;', $cellData);
-
-					// convert newline "\n" to '<br>'
-					$cellData = nl2br($cellData);
-
-					// Extend CSS class?
-					if (!$this->_useInlineCss) {
-						$cssClass .= ' style' . $cell->getXfIndex();
-						$cssClass .= ' ' . $cell->getDataType();
-					} else {
-						if (isset($this->_cssStyles['td.style' . $cell->getXfIndex()])) {
-							$cssClass = array_merge($cssClass, $this->_cssStyles['td.style' . $cell->getXfIndex()]);
-						}
-
-						// General horizontal alignment: Actual horizontal alignment depends on dataType
-						$sharedStyle = $pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() );
-						if ($sharedStyle->getAlignment()->getHorizontal() == PHPExcel_Style_Alignment::HORIZONTAL_GENERAL
-							&& isset($this->_cssStyles['.' . $cell->getDataType()]['text-align']))
-						{
-							$cssClass['text-align'] = $this->_cssStyles['.' . $cell->getDataType()]['text-align'];
-						}
-					}
-				}
-
-				// Hyperlink?
-				if ($pSheet->hyperlinkExists($coordinate) && !$pSheet->getHyperlink($coordinate)->isInternal()) {
-					$cellData = '<a href="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getUrl()) . '" title="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getTooltip()) . '">' . $cellData . '</a>';
-				}
-
-				// Should the cell be written or is it swallowed by a rowspan or colspan?
-				$writeCell = ! ( isset($this->_isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])
-							&& $this->_isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum] );
-
-				// Colspan and Rowspan
-				$colspan = 1;
-				$rowspan = 1;
-				if (isset($this->_isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])) {
-					$spans = $this->_isBaseCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum];
-					$rowSpan = $spans['rowspan'];
-					$colSpan = $spans['colspan'];
-				}
-
-				// Write
-				if ($writeCell) {
-					// Column start
-					$html .= '			<td';
-						if (!$this->_useInlineCss) {
-							$html .= ' class="' . $cssClass . '"';
-						} else {
-							//** Necessary redundant code for the sake of PHPExcel_Writer_PDF **
-							// We must explicitly write the width of the <td> element because TCPDF
-							// does not recognize e.g. <col style="width:42pt">
-							$width = 0;
-							$i = $colNum - 1;
-							$e = $colNum + $colSpan - 1;
-							while($i++ < $e) {
-								if (isset($this->_columnWidths[$sheetIndex][$i])) {
-									$width += $this->_columnWidths[$sheetIndex][$i];
-								}
-							}
-							$cssClass['width'] = $width . 'pt';
-
-							// We must also explicitly write the height of the <td> element because TCPDF
-							// does not recognize e.g. <tr style="height:50pt">
-							if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'])) {
-								$height = $this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'];
-								$cssClass['height'] = $height;
-							}
-							//** end of redundant code **
-
-							$html .= ' style="' . $this->_assembleCSS($cssClass) . '"';
-						}
-						if ($colSpan > 1) {
-							$html .= ' colspan="' . $colSpan . '"';
-						}
-						if ($rowSpan > 1) {
-							$html .= ' rowspan="' . $rowSpan . '"';
-						}
-					$html .= '>';
-
-					// Image?
-					$html .= $this->_writeImageTagInCell($pSheet, $coordinate);
-
-					// Cell data
-					$html .= $cellData;
-
-					// Column end
-					$html .= '</td>' . PHP_EOL;
-				}
-
-				// Next column
-				++$colNum;
-			}
-
-			// Write row end
-			$html .= '		  </tr>' . PHP_EOL;
-
-			// Return
-			return $html;
-		} else {
-			throw new Exception("Invalid parameters passed.");
-		}
-	}
-
-	/**
-	 * Takes array where of CSS properties / values and converts to CSS string
-	 *
-	 * @param array
-	 * @return string
-	 */
-	private function _assembleCSS($pValue = array())
-	{
-		$pairs = array();
-		foreach ($pValue as $property => $value) {
-			$pairs[] = $property . ':' . $value;
-		}
-		$string = implode('; ', $pairs);
-
-		return $string;
-	}
-
-	/**
-	 * Get Pre-Calculate Formulas
-	 *
-	 * @return boolean
-	 */
-	public function getPreCalculateFormulas() {
-		return $this->_preCalculateFormulas;
-	}
-
-	/**
-	 * Set Pre-Calculate Formulas
-	 *
-	 * @param boolean $pValue	Pre-Calculate Formulas?
-	 * @return PHPExcel_Writer_HTML
-	 */
-	public function setPreCalculateFormulas($pValue = true) {
-		$this->_preCalculateFormulas = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get images root
-	 *
-	 * @return string
-	 */
-	public function getImagesRoot() {
-		return $this->_imagesRoot;
-	}
-
-	/**
-	 * Set images root
-	 *
-	 * @param string $pValue
-	 * @return PHPExcel_Writer_HTML
-	 */
-	public function setImagesRoot($pValue = '.') {
-		$this->_imagesRoot = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get use inline CSS?
-	 *
-	 * @return boolean
-	 */
-	public function getUseInlineCss() {
-		return $this->_useInlineCss;
-	}
-
-	/**
-	 * Set use inline CSS?
-	 *
-	 * @param boolean $pValue
-	 * @return PHPExcel_Writer_HTML
-	 */
-	public function setUseInlineCss($pValue = false) {
-		$this->_useInlineCss = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Add color to formatted string as inline style
-	 *
-	 * @param string $pValue Plain formatted value without color
-	 * @param string $pFormat Format code
-	 * @return string
-	 */
-	public function formatColor($pValue, $pFormat)
-	{
-		// Color information, e.g. [Red] is always at the beginning
-		$color = null; // initialize
-		$matches = array();
-
-		$color_regex = '/^\\[[a-zA-Z]+\\]/';
-		if (preg_match($color_regex, $pFormat, $matches)) {
-			$color = str_replace('[', '', $matches[0]);
-			$color = str_replace(']', '', $color);
-			$color = strtolower($color);
-		}
-
-		// convert to PCDATA
-		$value = htmlspecialchars($pValue);
-
-		// color span tag
-		if ($color !== null) {
-			$value = '<span style="color:' . $color . '">' . $value . '</span>';
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Calculate information about HTML colspan and rowspan which is not always the same as Excel's
-	 */
-	private function _calculateSpans()
-	{
-		// Identify all cells that should be omitted in HTML due to cell merge.
-		// In HTML only the upper-left cell should be written and it should have
-		//   appropriate rowspan / colspan attribute
-		$sheetIndexes = $this->_sheetIndex !== null ?
-			array($this->_sheetIndex) : range(0, $this->_phpExcel->getSheetCount() - 1);
-
-		foreach ($sheetIndexes as $sheetIndex) {
-			$sheet = $this->_phpExcel->getSheet($sheetIndex);
-
-			$candidateSpannedRow  = array();
-
-			// loop through all Excel merged cells
-			foreach ($sheet->getMergeCells() as $cells) {
-				list($cells, ) = PHPExcel_Cell::splitRange($cells);
-				$first = $cells[0];
-				$last  = $cells[1];
-
-				list($fc, $fr) = PHPExcel_Cell::coordinateFromString($first);
-				$fc = PHPExcel_Cell::columnIndexFromString($fc) - 1;
-
-				list($lc, $lr) = PHPExcel_Cell::coordinateFromString($last);
-				$lc = PHPExcel_Cell::columnIndexFromString($lc) - 1;
-
-				// loop through the individual cells in the individual merge
-				$r = $fr - 1;
-				while($r++ < $lr) {
-					// also, flag this row as a HTML row that is candidate to be omitted
-					$candidateSpannedRow[$r] = $r;
-
-					$c = $fc - 1;
-					while($c++ < $lc) {
-						if ( !($c == $fc && $r == $fr) ) {
-							// not the upper-left cell (should not be written in HTML)
-							$this->_isSpannedCell[$sheetIndex][$r][$c] = array(
-								'baseCell' => array($fr, $fc),
-							);
-						} else {
-							// upper-left is the base cell that should hold the colspan/rowspan attribute
-							$this->_isBaseCell[$sheetIndex][$r][$c] = array(
-								'xlrowspan' => $lr - $fr + 1, // Excel rowspan
-								'rowspan'   => $lr - $fr + 1, // HTML rowspan, value may change
-								'xlcolspan' => $lc - $fc + 1, // Excel colspan
-								'colspan'   => $lc - $fc + 1, // HTML colspan, value may change
-							);
-						}
-					}
-				}
-			}
-
-			// Identify which rows should be omitted in HTML. These are the rows where all the cells
-			//   participate in a merge and the where base cells are somewhere above.
-			$countColumns = PHPExcel_Cell::columnIndexFromString($sheet->getHighestColumn());
-			foreach ($candidateSpannedRow as $rowIndex) {
-				if (isset($this->_isSpannedCell[$sheetIndex][$rowIndex])) {
-					if (count($this->_isSpannedCell[$sheetIndex][$rowIndex]) == $countColumns) {
-						$this->_isSpannedRow[$sheetIndex][$rowIndex] = $rowIndex;
-					};
-				}
-			}
-
-			// For each of the omitted rows we found above, the affected rowspans should be subtracted by 1
-			if ( isset($this->_isSpannedRow[$sheetIndex]) ) {
-				foreach ($this->_isSpannedRow[$sheetIndex] as $rowIndex) {
-					$adjustedBaseCells = array();
-					$c = -1;
-					$e = $countColumns - 1;
-					while($c++ < $e) {
-						$baseCell = $this->_isSpannedCell[$sheetIndex][$rowIndex][$c]['baseCell'];
-
-						if ( !in_array($baseCell, $adjustedBaseCells) ) {
-							// subtract rowspan by 1
-							--$this->_isBaseCell[$sheetIndex][ $baseCell[0] ][ $baseCell[1] ]['rowspan'];
-							$adjustedBaseCells[] = $baseCell;
-						}
-					}
-				}
-			}
-
-			// TODO: Same for columns
-		}
-
-		// We have calculated the spans
-		$this->_spansAreCalculated = true;
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/IWriter.php b/plugins/exportTypes/Excel/PHPExcel/Writer/IWriter.php
deleted file mode 100755
index 28ab41981..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/IWriter.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_IWriter
- *
- * @category   PHPExcel
- * @package    PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-interface PHPExcel_Writer_IWriter
-{
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param 	string 		$pFilename
-	 * @throws 	Exception
-	 */
-	public function save($pFilename = null);
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/PDF.php b/plugins/exportTypes/Excel/PHPExcel/Writer/PDF.php
deleted file mode 100755
index 966364a14..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/PDF.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_PDF
- *
- * @category	PHPExcel
- * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_PDF {
-
-    private $_renderer = NULL;
-
-	/**
-	 * Create a new PHPExcel_Writer_PDF
-	 *
-	 * @param 	PHPExcel	$phpExcel	PHPExcel object
-	 */
-	public function __construct(PHPExcel $phpExcel) {
-
-		$pdfLibraryName = PHPExcel_Settings::getPdfRendererName();
-		if (is_null($pdfLibraryName)) {
-			throw new Exception("PDF Rendering library has not been defined.");
-		}
-
-		$pdfLibraryPath = PHPExcel_Settings::getPdfRendererPath();
-		if (is_null($pdfLibraryName)) {
-			throw new Exception("PDF Rendering library path has not been defined.");
-		}
-		$includePath = str_replace('\\','/',get_include_path());
-		$rendererPath = str_replace('\\','/',$pdfLibraryPath);
-		if (strpos($rendererPath,$includePath) === false) {
-			set_include_path(get_include_path() . PATH_SEPARATOR . $pdfLibraryPath);
-		}
-
-		$rendererName = 'PHPExcel_Writer_PDF_'.$pdfLibraryName;
-		$this->_renderer = new $rendererName($phpExcel);
-	}
-
-
-    public function __call($name, $arguments)
-    {
-        if ($this->_renderer === NULL) {
-			throw new Exception("PDF Renderer has not been defined.");
-        }
-
-        return call_user_func_array(array($this->_renderer,$name),$arguments);
-    }
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/Core.php b/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/Core.php
deleted file mode 100755
index f82be0f0f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/Core.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_Writer_PDF_Core
- *
- * @category	PHPExcel
- * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML {
-	/**
-	 * Temporary storage directory
-	 *
-	 * @var string
-	 */
-	private $_tempDir = '';
-
-	/**
-	 * Font
-	 *
-	 * @var string
-	 */
-	private $_font = 'freesans';
-
-	/**
-	 * Orientation (Over-ride)
-	 *
-	 * @var string
-	 */
-	private $_orientation	= null;
-
-	/**
-	 * Paper size (Over-ride)
-	 *
-	 * @var int
-	 */
-	private $_paperSize	= null;
-
-
-	/**
-	 * Paper Sizes xRef List
-	 *
-	 * @var array
-	 */
-	protected static $_paperSizes = array(
-		//	Excel Paper Size													TCPDF Paper Size
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER							=> 'LETTER',				//	(8.5 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_SMALL					=> 'LETTER',				//	(8.5 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID							=> array(792.00,1224.00),	//	(11 in. by 17 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEDGER							=> array(1224.00,792.00),	//	(17 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL							=> 'LEGAL',					//	(8.5 in. by 14 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STATEMENT						=> array(396.00,612.00),	//	(5.5 in. by 8.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_EXECUTIVE						=> 'EXECUTIVE',				//	(7.25 in. by 10.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3								=> 'A3',					//	(297 mm by 420 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4								=> 'A4',					//	(210 mm by 297 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_SMALL						=> 'A4',					//	(210 mm by 297 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5								=> 'A5',					//	(148 mm by 210 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4								=> 'B4',					//	(250 mm by 353 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5								=> 'B5',					//	(176 mm by 250 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_FOLIO							=> 'FOLIO',					//	(8.5 in. by 13 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_QUARTO							=> array(609.45,779.53),	//	(215 mm by 275 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_1						=> array(720.00,1008.00),	//	(10 in. by 14 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_2						=> array(792.00,1224.00),	//	(11 in. by 17 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NOTE							=> 'LETTER',				//	(8.5 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO9_ENVELOPE					=> array(279.00,639.00),	//	(3.875 in. by 8.875 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO10_ENVELOPE					=> array(297.00,684.00),	//	(4.125 in. by 9.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO11_ENVELOPE					=> array(324.00,747.00),	//	(4.5 in. by 10.375 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO12_ENVELOPE					=> array(342.00,792.00),	//	(4.75 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO14_ENVELOPE					=> array(360.00,828.00),	//	(5 in. by 11.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C								=> array(1224.00,1584.00),	//	(17 in. by 22 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_D								=> array(1584.00,2448.00),	//	(22 in. by 34 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_E								=> array(2448.00,3168.00),	//	(34 in. by 44 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_DL_ENVELOPE						=> array(311.81,623.62),	//	(110 mm by 220 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C5_ENVELOPE						=> 'C5',					//	(162 mm by 229 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C3_ENVELOPE						=> 'C3',					//	(324 mm by 458 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C4_ENVELOPE						=> 'C4',					//	(229 mm by 324 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C6_ENVELOPE						=> 'C6',					//	(114 mm by 162 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C65_ENVELOPE					=> array(323.15,649.13),	//	(114 mm by 229 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4_ENVELOPE						=> 'B4',					//	(250 mm by 353 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5_ENVELOPE						=> 'B5',					//	(176 mm by 250 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B6_ENVELOPE						=> array(498.90,354.33),	//	(176 mm by 125 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_ITALY_ENVELOPE					=> array(311.81,651.97),	//	(110 mm by 230 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_MONARCH_ENVELOPE				=> array(279.00,540.00),	//	(3.875 in. by 7.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_6_3_4_ENVELOPE					=> array(261.00,468.00),	//	(3.625 in. by 6.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_US_STANDARD_FANFOLD				=> array(1071.00,792.00),	//	(14.875 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD			=> array(612.00,864.00),	//	(8.5 in. by 12 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD			=> 'FOLIO',					//	(8.5 in. by 13 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B4							=> 'B4',					//	(250 mm by 353 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD		=> array(566.93,419.53),	//	(200 mm by 148 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_1				=> array(648.00,792.00),	//	(9 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_2				=> array(720.00,792.00),	//	(10 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_3				=> array(1080.00,792.00),	//	(15 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_INVITE_ENVELOPE					=> array(623.62,623.62),	//	(220 mm by 220 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER				=> array(667.80,864.00),	//	(9.275 in. by 12 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER				=> array(667.80,1080.00),	//	(9.275 in. by 15 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER				=> array(841.68,1296.00),	//	(11.69 in. by 18 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_EXTRA_PAPER					=> array(668.98,912.76),	//	(236 mm by 322 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER			=> array(595.80,792.00),	//	(8.275 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER				=> 'A4',					//	(210 mm by 297 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER	=> array(667.80,864.00),	//	(9.275 in. by 12 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER			=> array(643.46,1009.13),	//	(227 mm by 356 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER			=> array(864.57,1380.47),	//	(305 mm by 487 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_PLUS_PAPER				=> array(612.00,913.68),	//	(8.5 in. by 12.69 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_PLUS_PAPER					=> array(595.28,935.43),	//	(210 mm by 330 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER				=> 'A5',					//	(148 mm by 210 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER			=> array(515.91,728.50),	//	(182 mm by 257 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_PAPER					=> array(912.76,1261.42),	//	(322 mm by 445 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_EXTRA_PAPER					=> array(493.23,666.14),	//	(174 mm by 235 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER				=> array(569.76,782.36),	//	(201 mm by 276 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A2_PAPER						=> 'A2',					//	(420 mm by 594 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER				=> 'A3',					//	(297 mm by 420 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER		=> array(912.76,1261.42)	//	(322 mm by 445 mm)
-	);
-
-	/**
-	 * Create a new PHPExcel_Writer_PDF
-	 *
-	 * @param 	PHPExcel	$phpExcel	PHPExcel object
-	 */
-	public function __construct(PHPExcel $phpExcel) {
-		parent::__construct($phpExcel);
-		$this->setUseInlineCss(true);
-		$this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
-	}
-
-    /**
-     * Get Font
-     *
-     * @return string
-     */
-    public function getFont() {
-    	return $this->_font;
-    }
-
-	/**
-	 * Set font. Examples:
-	 *   'arialunicid0-chinese-simplified'
-	 *   'arialunicid0-chinese-traditional'
-	 *   'arialunicid0-korean'
-	 *   'arialunicid0-japanese'
-	 *
-	 * @param	string	$fontName
-	 */
-	public function setFont($fontName) {
-		$this->_font = $fontName;
-		return $this;
-	}
-
-    /**
-     * Get Paper Size
-     *
-     * @return int
-     */
-    public function getPaperSize() {
-    	return $this->_paperSize;
-    }
-
-    /**
-     * Set Paper Size
-     *
-     * @param int $pValue
-     * @return PHPExcel_Writer_PDF
-     */
-    public function setPaperSize($pValue = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER) {
-    	$this->_paperSize = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Orientation
-     *
-     * @return string
-     */
-    public function getOrientation() {
-    	return $this->_orientation;
-    }
-
-    /**
-     * Set Orientation
-     *
-     * @param string $pValue
-     * @return PHPExcel_Writer_PDF
-     */
-    public function setOrientation($pValue = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) {
-    	$this->_orientation = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Get temporary storage directory
-	 *
-	 * @return string
-	 */
-	public function getTempDir() {
-		return $this->_tempDir;
-	}
-
-	/**
-	 * Set temporary storage directory
-	 *
-	 * @param 	string	$pValue		Temporary storage directory
-	 * @throws 	Exception	Exception when directory does not exist
-	 * @return PHPExcel_Writer_PDF
-	 */
-	public function setTempDir($pValue = '') {
-		if (is_dir($pValue)) {
-			$this->_tempDir = $pValue;
-		} else {
-			throw new Exception("Directory does not exist: $pValue");
-		}
-		return $this;
-	}
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/DomPDF.php b/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/DomPDF.php
deleted file mode 100755
index 7522b27ce..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/DomPDF.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** Require DomPDF library */
-$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/dompdf_config.inc.php';
-if (file_exists($pdfRendererClassFile)) {
-	require_once $pdfRendererClassFile;
-} else {
-	throw new Exception('Unable to load PDF Rendering library');
-}
-
-/**
- * PHPExcel_Writer_PDF_DomPDF
- *
- * @category	PHPExcel
- * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_PDF_DomPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter {
-	/**
-	 * Create a new PHPExcel_Writer_PDF
-	 *
-	 * @param 	PHPExcel	$phpExcel	PHPExcel object
-	 */
-	public function __construct(PHPExcel $phpExcel) {
-		parent::__construct($phpExcel);
-	}
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param 	string 		$pFileName
-	 * @throws 	Exception
-	 */
-	public function save($pFilename = null) {
-		// garbage collect
-		$this->_phpExcel->garbageCollect();
-
-		$saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
-		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'w');
-		if ($fileHandle === false) {
-			throw new Exception("Could not open file $pFilename for writing.");
-		}
-
-		// Set PDF
-		$this->_isPdf = true;
-		// Build CSS
-		$this->buildCSS(true);
-
-		// Default PDF paper size
-		$paperSize = 'LETTER';	//	Letter	(8.5 in. by 11 in.)
-
-		// Check for paper size and page orientation
-		if (is_null($this->getSheetIndex())) {
-			$orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-			$printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
-			$printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
-		} else {
-			$orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-			$printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
-			$printMargins = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
-		}
-
-		//	Override Page Orientation
-		if (!is_null($this->getOrientation())) {
-			$orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) ?
-				PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT : $this->getOrientation();
-		}
-		//	Override Paper Size
-		if (!is_null($this->getPaperSize())) {
-			$printPaperSize = $this->getPaperSize();
-		}
-
-		if (isset(self::$_paperSizes[$printPaperSize])) {
-			$paperSize = self::$_paperSizes[$printPaperSize];
-		}
-
-		$orientation = ($orientation == 'L') ? 'landscape' : 'portrait';
-
-		// Create PDF
-		$pdf = new DOMPDF();
-		$pdf->set_paper(strtolower($paperSize), $orientation);
-
-		$pdf->load_html(
-			$this->generateHTMLHeader(false) .
-			$this->generateSheetData() .
-			$this->generateHTMLFooter()
-		);
-		$pdf->render();
-
-		// Write to file
-		fwrite($fileHandle, $pdf->output());
-
-		// Close file
-		fclose($fileHandle);
-
-		PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/mPDF.php b/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/mPDF.php
deleted file mode 100755
index 5ecf609e1..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/mPDF.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** Require mPDF library */
-$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/mpdf.php';
-if (file_exists($pdfRendererClassFile)) {
-	require_once $pdfRendererClassFile;
-} else {
-	throw new Exception('Unable to load PDF Rendering library');
-}
-
-/**
- * PHPExcel_Writer_PDF_mPDF
- *
- * @category	PHPExcel
- * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_PDF_mPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter {
-	/**
-	 * Create a new PHPExcel_Writer_PDF
-	 *
-	 * @param 	PHPExcel	$phpExcel	PHPExcel object
-	 */
-	public function __construct(PHPExcel $phpExcel) {
-		parent::__construct($phpExcel);
-	}
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param 	string 		$pFileName
-	 * @throws 	Exception
-	 */
-	public function save($pFilename = null) {
-		// garbage collect
-		$this->_phpExcel->garbageCollect();
-
-		$saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
-		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'w');
-		if ($fileHandle === false) {
-			throw new Exception("Could not open file $pFilename for writing.");
-		}
-
-		// Set PDF
-		$this->_isPdf = true;
-		// Build CSS
-		$this->buildCSS(true);
-
-		// Default PDF paper size
-		$paperSize = 'LETTER';	//	Letter	(8.5 in. by 11 in.)
-
-		// Check for paper size and page orientation
-		if (is_null($this->getSheetIndex())) {
-			$orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-			$printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
-			$printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
-		} else {
-			$orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-			$printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
-			$printMargins = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
-		}
-		$this->setOrientation($orientation);
-
-		//	Override Page Orientation
-		if (!is_null($this->getOrientation())) {
-			$orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) ?
-				PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT : $this->getOrientation();
-		}
-		$orientation = strtoupper($orientation);
-
-		//	Override Paper Size
-		if (!is_null($this->getPaperSize())) {
-			$printPaperSize = $this->getPaperSize();
-		}
-
-		if (isset(self::$_paperSizes[$printPaperSize])) {
-			$paperSize = self::$_paperSizes[$printPaperSize];
-		}
-
-		// Create PDF
-		$pdf = new mpdf();
-		$pdf->_setPageSize(strtoupper($paperSize), $orientation);
-        $pdf->DefOrientation = $orientation;
-		// Document info
-		$pdf->SetTitle($this->_phpExcel->getProperties()->getTitle());
-		$pdf->SetAuthor($this->_phpExcel->getProperties()->getCreator());
-		$pdf->SetSubject($this->_phpExcel->getProperties()->getSubject());
-		$pdf->SetKeywords($this->_phpExcel->getProperties()->getKeywords());
-		$pdf->SetCreator($this->_phpExcel->getProperties()->getCreator());
-
-		$pdf->WriteHTML(
-			$this->generateHTMLHeader(false) .
-			$this->generateSheetData() .
-			$this->generateHTMLFooter()
-		);
-
-		// Write to file
-		fwrite($fileHandle, $pdf->Output('','S'));
-
-		// Close file
-		fclose($fileHandle);
-
-		PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/tcPDF.php b/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/tcPDF.php
deleted file mode 100755
index 08e7ca78e..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/Writer/PDF/tcPDF.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
-
-/** Require tcPDF library */
-$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/tcpdf.php';
-if (file_exists($pdfRendererClassFile)) {
-	$k_path_url = PHPExcel_Settings::getPdfRendererPath();
-	require_once $pdfRendererClassFile;
-} else {
-	throw new Exception('Unable to load PDF Rendering library');
-}
-
-/**
- * PHPExcel_Writer_PDF_tcPDF
- *
- * @category	PHPExcel
- * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Writer_PDF_tcPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter {
-	/**
-	 * Create a new PHPExcel_Writer_PDF
-	 *
-	 * @param 	PHPExcel	$phpExcel	PHPExcel object
-	 */
-	public function __construct(PHPExcel $phpExcel) {
-		parent::__construct($phpExcel);
-	}
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param 	string 		$pFileName
-	 * @throws 	Exception
-	 */
-	public function save($pFilename = null) {
-		// garbage collect
-		$this->_phpExcel->garbageCollect();
-
-		$saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
-		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'w');
-		if ($fileHandle === false) {
-			throw new Exception("Could not open file $pFilename for writing.");
-		}
-
-		// Set PDF
-		$this->_isPdf = true;
-		// Build CSS
-		$this->buildCSS(true);
-
-		// Default PDF paper size
-		$paperSize = 'LETTER';	//	Letter	(8.5 in. by 11 in.)
-
-		// Check for paper size and page orientation
-		if (is_null($this->getSheetIndex())) {
-			$orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-			$printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
-			$printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
-		} else {
-			$orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-			$printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
-			$printMargins = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
-		}
-
-		//	Override Page Orientation
-		if (!is_null($this->getOrientation())) {
-			$orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ?
-				'L' : 'P';
-		}
-		//	Override Paper Size
-		if (!is_null($this->getPaperSize())) {
-			$printPaperSize = $this->getPaperSize();
-		}
-
-
-		if (isset(self::$_paperSizes[$printPaperSize])) {
-			$paperSize = self::$_paperSizes[$printPaperSize];
-		}
-
-
-		// Create PDF
-		$pdf = new TCPDF($orientation, 'pt', $paperSize);
-		$pdf->setFontSubsetting(false);
-		//	Set margins, converting inches to points (using 72 dpi)
-		$pdf->SetMargins($printMargins->getLeft() * 72,$printMargins->getTop() * 72,$printMargins->getRight() * 72);
-		$pdf->SetAutoPageBreak(true,$printMargins->getBottom() * 72);
-//		$pdf->setHeaderMargin($printMargins->getHeader() * 72);
-//		$pdf->setFooterMargin($printMargins->getFooter() * 72);
-
-		$pdf->setPrintHeader(false);
-		$pdf->setPrintFooter(false);
-
-		$pdf->AddPage();
-
-		// Set the appropriate font
-		$pdf->SetFont($this->getFont());
-		$pdf->writeHTML(
-			$this->generateHTMLHeader(false) .
-			$this->generateSheetData() .
-			$this->generateHTMLFooter()
-		);
-
-		// Document info
-		$pdf->SetTitle($this->_phpExcel->getProperties()->getTitle());
-		$pdf->SetAuthor($this->_phpExcel->getProperties()->getCreator());
-		$pdf->SetSubject($this->_phpExcel->getProperties()->getSubject());
-		$pdf->SetKeywords($this->_phpExcel->getProperties()->getKeywords());
-		$pdf->SetCreator($this->_phpExcel->getProperties()->getCreator());
-
-		// Write to file
-		fwrite($fileHandle, $pdf->output($pFilename, 'S'));
-
-		// Close file
-		fclose($fileHandle);
-
-		PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
-	}
-
-}
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/cs/config b/plugins/exportTypes/Excel/PHPExcel/locale/cs/config
deleted file mode 100755
index 6d2a5dc81..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/cs/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= Kč
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NULL!
-DIV0	= #DIV/0!
-VALUE	= #HODNOTA!
-REF	= #REF!
-NAME	= #NÁZEV?
-NUM	= #NUM!
-NA	= #N/A
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/cs/functions b/plugins/exportTypes/Excel/PHPExcel/locale/cs/functions
deleted file mode 100755
index d4afddfd1..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/cs/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions		Funkce doplňků a automatizace
-##
-GETPIVOTDATA		= ZÍSKATKONTDATA	##	Vrátí data uložená v kontingenční tabulce. Pomocí funkce ZÍSKATKONTDATA můžete načíst souhrnná data z kontingenční tabulky, pokud jsou tato data v kontingenční sestavě zobrazena.
-
-
-##
-##	Cube functions				Funkce pro práci s krychlemi
-##
-CUBEKPIMEMBER		= CUBEKPIMEMBER		##	Vrátí název, vlastnost a velikost klíčového ukazatele výkonu (KUV) a zobrazí v buňce název a vlastnost. Klíčový ukazatel výkonu je kvantifikovatelná veličina, například hrubý měsíční zisk nebo čtvrtletní obrat na zaměstnance, která se používá pro sledování výkonnosti organizace.
-CUBEMEMBER		= CUBEMEMBER		##	Vrátí člen nebo n-tici v hierarchii krychle. Slouží k ověření, zda v krychli existuje člen nebo n-tice.
-CUBEMEMBERPROPERTY	= CUBEMEMBERPROPERTY	##	Vrátí hodnotu vlastnosti člena v krychli. Slouží k ověření, zda v krychli existuje člen s daným názvem, a k vrácení konkrétní vlastnosti tohoto člena.
-CUBERANKEDMEMBER	= CUBERANKEDMEMBER	##	Vrátí n-tý nebo pořadový člen sady. Použijte ji pro vrácení jednoho nebo více prvků sady, například obchodníka s nejvyšším obratem nebo deseti nejlepších studentů.
-CUBESET			= CUBESET		##	Definuje vypočtenou sadu členů nebo n-tic odesláním výrazu sady do krychle na serveru, který vytvoří sadu a potom ji vrátí do aplikace Microsoft Office Excel.
-CUBESETCOUNT		= CUBESETCOUNT		##	Vrátí počet položek v množině
-CUBEVALUE		= CUBEVALUE		##	Vrátí úhrnnou hodnotu z krychle.
-
-
-##
-##	Database functions			Funkce databáze
-##
-DAVERAGE		= DPRŮMĚR		##	Vrátí průměr vybraných položek databáze.
-DCOUNT			= DPOČET		##	Spočítá buňky databáze obsahující čísla.
-DCOUNTA			= DPOČET2		##	Spočítá buňky databáze, které nejsou prázdné.
-DGET			= DZÍSKAT		##	Extrahuje z databáze jeden záznam splňující zadaná kritéria.
-DMAX			= DMAX			##	Vrátí maximální hodnotu z vybraných položek databáze.
-DMIN			= DMIN			##	Vrátí minimální hodnotu z vybraných položek databáze.
-DPRODUCT		= DSOUČIN		##	Vynásobí hodnoty určitého pole záznamů v databázi, které splňují daná kritéria.
-DSTDEV			= DSMODCH.VÝBĚR		##	Odhadne směrodatnou odchylku výběru vybraných položek databáze.
-DSTDEVP			= DSMODCH		##	Vypočte směrodatnou odchylku základního souboru vybraných položek databáze.
-DSUM			= DSUMA			##	Sečte čísla ve sloupcovém poli záznamů databáze, která splňují daná kritéria.
-DVAR			= DVAR.VÝBĚR		##	Odhadne rozptyl výběru vybraných položek databáze.
-DVARP			= DVAR			##	Vypočte rozptyl základního souboru vybraných položek databáze.
-
-
-##
-##	Date and time functions			Funkce data a času
-##
-DATE			= DATUM			##	Vrátí pořadové číslo určitého data.
-DATEVALUE		= DATUMHODN		##	Převede datum ve formě textu na pořadové číslo.
-DAY			= DEN			##	Převede pořadové číslo na den v měsíci.
-DAYS360			= ROK360		##	Vrátí počet dní mezi dvěma daty na základě roku s 360 dny.
-EDATE			= EDATE			##	Vrátí pořadové číslo data, které označuje určený počet měsíců před nebo po počátečním datu.
-EOMONTH			= EOMONTH		##	Vrátí pořadové číslo posledního dne měsíce před nebo po zadaném počtu měsíců.
-HOUR			= HODINA		##	Převede pořadové číslo na hodinu.
-MINUTE			= MINUTA		##	Převede pořadové číslo na minutu.
-MONTH			= MĚSÍC			##	Převede pořadové číslo na měsíc.
-NETWORKDAYS		= NETWORKDAYS		##	Vrátí počet celých pracovních dní mezi dvěma daty.
-NOW			= NYNÍ			##	Vrátí pořadové číslo aktuálního data a času.
-SECOND			= SEKUNDA		##	Převede pořadové číslo na sekundu.
-TIME			= ČAS			##	Vrátí pořadové číslo určitého času.
-TIMEVALUE		= ČASHODN		##	Převede čas ve formě textu na pořadové číslo.
-TODAY			= DNES			##	Vrátí pořadové číslo dnešního data.
-WEEKDAY			= DENTÝDNE		##	Převede pořadové číslo na den v týdnu.
-WEEKNUM			= WEEKNUM		##	Převede pořadové číslo na číslo představující číselnou pozici týdne v roce.
-WORKDAY			= WORKDAY		##	Vrátí pořadové číslo data před nebo po zadaném počtu pracovních dní.
-YEAR			= ROK			##	Převede pořadové číslo na rok.
-YEARFRAC		= YEARFRAC		##	Vrátí část roku vyjádřenou zlomkem a představující počet celých dní mezi počátečním a koncovým datem.
-
-
-##
-##	Engineering functions			Inženýrské funkce (Technické funkce)
-##
-BESSELI			= BESSELI		##	Vrátí modifikovanou Besselovu funkci In(x).
-BESSELJ			= BESSELJ		##	Vrátí modifikovanou Besselovu funkci Jn(x).
-BESSELK			= BESSELK		##	Vrátí modifikovanou Besselovu funkci Kn(x).
-BESSELY			= BESSELY		##	Vrátí Besselovu funkci Yn(x).
-BIN2DEC			= BIN2DEC		##	Převede binární číslo na desítkové.
-BIN2HEX			= BIN2HEX		##	Převede binární číslo na šestnáctkové.
-BIN2OCT			= BIN2OCT		##	Převede binární číslo na osmičkové.
-COMPLEX			= COMPLEX		##	Převede reálnou a imaginární část na komplexní číslo.
-CONVERT			= CONVERT		##	Převede číslo do jiného jednotkového měrného systému.
-DEC2BIN			= DEC2BIN		##	Převede desítkového čísla na dvojkové
-DEC2HEX			= DEC2HEX		##	Převede desítkové číslo na šestnáctkové.
-DEC2OCT			= DEC2OCT		##	Převede desítkové číslo na osmičkové.
-DELTA			= DELTA			##	Testuje rovnost dvou hodnot.
-ERF			= ERF			##	Vrátí chybovou funkci.
-ERFC			= ERFC			##	Vrátí doplňkovou chybovou funkci.
-GESTEP			= GESTEP		##	Testuje, zda je číslo větší než mezní hodnota.
-HEX2BIN			= HEX2BIN		##	Převede šestnáctkové číslo na binární.
-HEX2DEC			= HEX2DEC		##	Převede šestnáctkové číslo na desítkové.
-HEX2OCT			= HEX2OCT		##	Převede šestnáctkové číslo na osmičkové.
-IMABS			= IMABS			##	Vrátí absolutní hodnotu (modul) komplexního čísla.
-IMAGINARY		= IMAGINARY		##	Vrátí imaginární část komplexního čísla.
-IMARGUMENT		= IMARGUMENT		##	Vrátí argument théta, úhel vyjádřený v radiánech.
-IMCONJUGATE		= IMCONJUGATE		##	Vrátí komplexně sdružené číslo ke komplexnímu číslu.
-IMCOS			= IMCOS			##	Vrátí kosinus komplexního čísla.
-IMDIV			= IMDIV			##	Vrátí podíl dvou komplexních čísel.
-IMEXP			= IMEXP			##	Vrátí exponenciální tvar komplexního čísla.
-IMLN			= IMLN			##	Vrátí přirozený logaritmus komplexního čísla.
-IMLOG10			= IMLOG10		##	Vrátí dekadický logaritmus komplexního čísla.
-IMLOG2			= IMLOG2		##	Vrátí logaritmus komplexního čísla při základu 2.
-IMPOWER			= IMPOWER		##	Vrátí komplexní číslo umocněné na celé číslo.
-IMPRODUCT		= IMPRODUCT		##	Vrátí součin komplexních čísel.
-IMREAL			= IMREAL		##	Vrátí reálnou část komplexního čísla.
-IMSIN			= IMSIN			##	Vrátí sinus komplexního čísla.
-IMSQRT			= IMSQRT		##	Vrátí druhou odmocninu komplexního čísla.
-IMSUB			= IMSUB			##	Vrátí rozdíl mezi dvěma komplexními čísly.
-IMSUM			= IMSUM			##	Vrátí součet dvou komplexních čísel.
-OCT2BIN			= OCT2BIN		##	Převede osmičkové číslo na binární.
-OCT2DEC			= OCT2DEC		##	Převede osmičkové číslo na desítkové.
-OCT2HEX			= OCT2HEX		##	Převede osmičkové číslo na šestnáctkové.
-
-
-##
-##	Financial functions			Finanční funkce
-##
-ACCRINT			= ACCRINT		##	Vrátí nahromaděný úrok z cenného papíru, ze kterého je úrok placen v pravidelných termínech.
-ACCRINTM		= ACCRINTM		##	Vrátí nahromaděný úrok z cenného papíru, ze kterého je úrok placen k datu splatnosti.
-AMORDEGRC		= AMORDEGRC		##	Vrátí lineární amortizaci v každém účetním období pomocí koeficientu amortizace.
-AMORLINC		= AMORLINC		##	Vrátí lineární amortizaci v každém účetním období.
-COUPDAYBS		= COUPDAYBS		##	Vrátí počet dnů od začátku období placení kupónů do data splatnosti.
-COUPDAYS		= COUPDAYS		##	Vrátí počet dnů v období placení kupónů, které obsahuje den zúčtování.
-COUPDAYSNC		= COUPDAYSNC		##	Vrátí počet dnů od data zúčtování do následujícího data placení kupónu.
-COUPNCD			= COUPNCD		##	Vrátí následující datum placení kupónu po datu zúčtování.
-COUPNUM			= COUPNUM		##	Vrátí počet kupónů splatných mezi datem zúčtování a datem splatnosti.
-COUPPCD			= COUPPCD		##	Vrátí předchozí datum placení kupónu před datem zúčtování.
-CUMIPMT			= CUMIPMT		##	Vrátí kumulativní úrok splacený mezi dvěma obdobími.
-CUMPRINC		= CUMPRINC		##	Vrátí kumulativní jistinu splacenou mezi dvěma obdobími půjčky.
-DB			= ODPIS.ZRYCH		##	Vrátí odpis aktiva za určité období pomocí degresivní metody odpisu s pevným zůstatkem.
-DDB			= ODPIS.ZRYCH2		##	Vrátí odpis aktiva za určité období pomocí dvojité degresivní metody odpisu nebo jiné metody, kterou zadáte.
-DISC			= DISC			##	Vrátí diskontní sazbu cenného papíru.
-DOLLARDE		= DOLLARDE		##	Převede částku v korunách vyjádřenou zlomkem na částku v korunách vyjádřenou desetinným číslem.
-DOLLARFR		= DOLLARFR		##	Převede částku v korunách vyjádřenou desetinným číslem na částku v korunách vyjádřenou zlomkem.
-DURATION		= DURATION		##	Vrátí roční dobu cenného papíru s pravidelnými úrokovými sazbami.
-EFFECT			= EFFECT		##	Vrátí efektivní roční úrokovou sazbu.
-FV			= BUDHODNOTA		##	Vrátí budoucí hodnotu investice.
-FVSCHEDULE		= FVSCHEDULE		##	Vrátí budoucí hodnotu počáteční jistiny po použití série sazeb složitého úroku.
-INTRATE			= INTRATE		##	Vrátí úrokovou sazbu plně investovaného cenného papíru.
-IPMT			= PLATBA.ÚROK		##	Vrátí výšku úroku investice za dané období.
-IRR			= MÍRA.VÝNOSNOSTI	##	Vrátí vnitřní výnosové procento série peněžních toků.
-ISPMT			= ISPMT			##	Vypočte výši úroku z investice zaplaceného během určitého období.
-MDURATION		= MDURATION		##	Vrátí Macauleyho modifikovanou dobu cenného papíru o nominální hodnotě 100 Kč.
-MIRR			= MOD.MÍRA.VÝNOSNOSTI	##	Vrátí vnitřní sazbu výnosu, přičemž kladné a záporné hodnoty peněžních prostředků jsou financovány podle různých sazeb.
-NOMINAL			= NOMINAL		##	Vrátí nominální roční úrokovou sazbu.
-NPER			= POČET.OBDOBÍ		##	Vrátí počet období pro investici.
-NPV			= ČISTÁ.SOUČHODNOTA	##	Vrátí čistou současnou hodnotu investice vypočítanou na základě série pravidelných peněžních toků a diskontní sazby.
-ODDFPRICE		= ODDFPRICE		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč s odlišným prvním obdobím.
-ODDFYIELD		= ODDFYIELD		##	Vrátí výnos cenného papíru s odlišným prvním obdobím.
-ODDLPRICE		= ODDLPRICE		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč s odlišným posledním obdobím.
-ODDLYIELD		= ODDLYIELD		##	Vrátí výnos cenného papíru s odlišným posledním obdobím.
-PMT			= PLATBA		##	Vrátí hodnotu pravidelné splátky anuity.
-PPMT			= PLATBA.ZÁKLAD		##	Vrátí hodnotu splátky jistiny pro zadanou investici za dané období.
-PRICE			= PRICE			##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč, ze kterého je úrok placen v pravidelných termínech.
-PRICEDISC		= PRICEDISC		##	Vrátí cenu diskontního cenného papíru o nominální hodnotě 100 Kč.
-PRICEMAT		= PRICEMAT		##	Vrátí cenu cenného papíru o nominální hodnotě 100 Kč, ze kterého je úrok placen k datu splatnosti.
-PV			= SOUČHODNOTA		##	Vrátí současnou hodnotu investice.
-RATE			= ÚROKOVÁ.MÍRA		##	Vrátí úrokovou sazbu vztaženou na období anuity.
-RECEIVED		= RECEIVED		##	Vrátí částku obdrženou k datu splatnosti plně investovaného cenného papíru.
-SLN			= ODPIS.LIN		##	Vrátí přímé odpisy aktiva pro jedno období.
-SYD			= ODPIS.NELIN		##	Vrátí směrné číslo ročních odpisů aktiva pro zadané období.
-TBILLEQ			= TBILLEQ		##	Vrátí výnos směnky státní pokladny ekvivalentní výnosu obligace.
-TBILLPRICE		= TBILLPRICE		##	Vrátí cenu směnky státní pokladny o nominální hodnotě 100 Kč.
-TBILLYIELD		= TBILLYIELD		##	Vrátí výnos směnky státní pokladny.
-VDB			= ODPIS.ZA.INT		##	Vrátí odpis aktiva pro určité období nebo část období pomocí degresivní metody odpisu.
-XIRR			= XIRR			##	Vrátí vnitřní výnosnost pro harmonogram peněžních toků, který nemusí být nutně periodický.
-XNPV			= XNPV			##	Vrátí čistou současnou hodnotu pro harmonogram peněžních toků, který nemusí být nutně periodický.
-YIELD			= YIELD			##	Vrátí výnos cenného papíru, ze kterého je úrok placen v pravidelných termínech.
-YIELDDISC		= YIELDDISC		##	Vrátí roční výnos diskontního cenného papíru, například směnky státní pokladny.
-YIELDMAT		= YIELDMAT		##	Vrátí roční výnos cenného papíru, ze kterého je úrok placen k datu splatnosti.
-
-
-##
-##	Information functions			Informační funkce
-##
-CELL			= POLÍČKO		##	Vrátí informace o formátování, umístění nebo obsahu buňky.
-ERROR.TYPE		= CHYBA.TYP		##	Vrátí číslo odpovídající typu chyby.
-INFO			= O.PROSTŘEDÍ		##	Vrátí informace o aktuálním pracovním prostředí.
-ISBLANK			= JE.PRÁZDNÉ		##	Vrátí hodnotu PRAVDA, pokud se argument hodnota odkazuje na prázdnou buňku.
-ISERR			= JE.CHYBA		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota libovolná chybová hodnota (kromě #N/A).
-ISERROR			= JE.CHYBHODN		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota libovolná chybová hodnota.
-ISEVEN			= ISEVEN		##	Vrátí hodnotu PRAVDA, pokud je číslo sudé.
-ISLOGICAL		= JE.LOGHODN		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota logická hodnota.
-ISNA			= JE.NEDEF		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota chybová hodnota #N/A.
-ISNONTEXT		= JE.NETEXT		##	Vrátí hodnotu PRAVDA, pokud argument hodnota není text.
-ISNUMBER		= JE.ČÍSLO		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota číslo.
-ISODD			= ISODD			##	Vrátí hodnotu PRAVDA, pokud je číslo liché.
-ISREF			= JE.ODKAZ		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota odkaz.
-ISTEXT			= JE.TEXT		##	Vrátí hodnotu PRAVDA, pokud je argument hodnota text.
-N			= N			##	Vrátí hodnotu převedenou na číslo.
-NA			= NEDEF			##	Vrátí chybovou hodnotu #N/A.
-TYPE			= TYP			##	Vrátí číslo označující datový typ hodnoty.
-
-
-##
-##	Logical functions			Logické funkce
-##
-AND			= A			##	Vrátí hodnotu PRAVDA, mají-li všechny argumenty hodnotu PRAVDA.
-FALSE			= NEPRAVDA		##	Vrátí logickou hodnotu NEPRAVDA.
-IF			= KDYŽ			##	Určí, který logický test má proběhnout.
-IFERROR			= IFERROR		##	Pokud je vzorec vyhodnocen jako chyba, vrátí zadanou hodnotu. V opačném případě vrátí výsledek vzorce.
-NOT			= NE			##	Provede logickou negaci argumentu funkce.
-OR			= NEBO			##	Vrátí hodnotu PRAVDA, je-li alespoň jeden argument roven hodnotě PRAVDA.
-TRUE			= PRAVDA		##	Vrátí logickou hodnotu PRAVDA.
-
-
-##
-##	Lookup and reference functions		Vyhledávací funkce
-##
-ADDRESS			= ODKAZ			##	Vrátí textový odkaz na jednu buňku listu.
-AREAS			= POČET.BLOKŮ		##	Vrátí počet oblastí v odkazu.
-CHOOSE			= ZVOLIT		##	Zvolí hodnotu ze seznamu hodnot.
-COLUMN			= SLOUPEC		##	Vrátí číslo sloupce odkazu.
-COLUMNS			= SLOUPCE		##	Vrátí počet sloupců v odkazu.
-HLOOKUP			= VVYHLEDAT		##	Prohledá horní řádek matice a vrátí hodnotu určené buňky.
-HYPERLINK		= HYPERTEXTOVÝ.ODKAZ	##	Vytvoří zástupce nebo odkaz, který otevře dokument uložený na síťovém serveru, v síti intranet nebo Internet.
-INDEX			= INDEX			##	Pomocí rejstříku zvolí hodnotu z odkazu nebo matice.
-INDIRECT		= NEPŘÍMÝ.ODKAZ		##	Vrátí odkaz určený textovou hodnotou.
-LOOKUP			= VYHLEDAT		##	Vyhledá hodnoty ve vektoru nebo matici.
-MATCH			= POZVYHLEDAT		##	Vyhledá hodnoty v odkazu nebo matici.
-OFFSET			= POSUN			##	Vrátí posun odkazu od zadaného odkazu.
-ROW			= ŘÁDEK			##	Vrátí číslo řádku odkazu.
-ROWS			= ŘÁDKY			##	Vrátí počet řádků v odkazu.
-RTD			= RTD			##	Načte data reálného času z programu, který podporuje automatizaci modelu COM (Automatizace: Způsob práce s objekty určité aplikace z jiné aplikace nebo nástroje pro vývoj. Automatizace (dříve nazývaná automatizace OLE) je počítačovým standardem a je funkcí modelu COM (Component Object Model).).
-TRANSPOSE		= TRANSPOZICE		##	Vrátí transponovanou matici.
-VLOOKUP			= SVYHLEDAT		##	Prohledá první sloupec matice, přesune kurzor v řádku a vrátí hodnotu buňky.
-
-
-##
-##	Math and trigonometry functions		Matematické a trigonometrické funkce
-##
-ABS			= ABS			##	Vrátí absolutní hodnotu čísla.
-ACOS			= ARCCOS		##	Vrátí arkuskosinus čísla.
-ACOSH			= ARCCOSH		##	Vrátí hyperbolický arkuskosinus čísla.
-ASIN			= ARCSIN		##	Vrátí arkussinus čísla.
-ASINH			= ARCSINH		##	Vrátí hyperbolický arkussinus čísla.
-ATAN			= ARCTG			##	Vrátí arkustangens čísla.
-ATAN2			= ARCTG2		##	Vrátí arkustangens x-ové a y-ové souřadnice.
-ATANH			= ARCTGH		##	Vrátí hyperbolický arkustangens čísla.
-CEILING			= ZAOKR.NAHORU		##	Zaokrouhlí číslo na nejbližší celé číslo nebo na nejbližší násobek zadané hodnoty.
-COMBIN			= KOMBINACE		##	Vrátí počet kombinací pro daný počet položek.
-COS			= COS			##	Vrátí kosinus čísla.
-COSH			= COSH			##	Vrátí hyperbolický kosinus čísla.
-DEGREES			= DEGREES		##	Převede radiány na stupně.
-EVEN			= ZAOKROUHLIT.NA.SUDÉ	##	Zaokrouhlí číslo nahoru na nejbližší celé sudé číslo.
-EXP			= EXP			##	Vrátí základ přirozeného logaritmu e umocněný na zadané číslo.
-FACT			= FAKTORIÁL		##	Vrátí faktoriál čísla.
-FACTDOUBLE		= FACTDOUBLE		##	Vrátí dvojitý faktoriál čísla.
-FLOOR			= ZAOKR.DOLŮ		##	Zaokrouhlí číslo dolů, směrem k nule.
-GCD			= GCD			##	Vrátí největší společný dělitel.
-INT			= CELÁ.ČÁST		##	Zaokrouhlí číslo dolů na nejbližší celé číslo.
-LCM			= LCM			##	Vrátí nejmenší společný násobek.
-LN			= LN			##	Vrátí přirozený logaritmus čísla.
-LOG			= LOGZ			##	Vrátí logaritmus čísla při zadaném základu.
-LOG10			= LOG			##	Vrátí dekadický logaritmus čísla.
-MDETERM			= DETERMINANT		##	Vrátí determinant matice.
-MINVERSE		= INVERZE		##	Vrátí inverzní matici.
-MMULT			= SOUČIN.MATIC		##	Vrátí součin dvou matic.
-MOD			= MOD			##	Vrátí zbytek po dělení.
-MROUND			= MROUND		##	Vrátí číslo zaokrouhlené na požadovaný násobek.
-MULTINOMIAL		= MULTINOMIAL		##	Vrátí mnohočlen z množiny čísel.
-ODD			= ZAOKROUHLIT.NA.LICHÉ	##	Zaokrouhlí číslo nahoru na nejbližší celé liché číslo.
-PI			= PI			##	Vrátí hodnotu čísla pí.
-POWER			= POWER			##	Umocní číslo na zadanou mocninu.
-PRODUCT			= SOUČIN		##	Vynásobí argumenty funkce.
-QUOTIENT		= QUOTIENT		##	Vrátí celou část dělení.
-RADIANS			= RADIANS		##	Převede stupně na radiány.
-RAND			= NÁHČÍSLO		##	Vrátí náhodné číslo mezi 0 a 1.
-RANDBETWEEN		= RANDBETWEEN		##	Vrátí náhodné číslo mezi zadanými čísly.
-ROMAN			= ROMAN			##	Převede arabskou číslici na římskou ve formátu textu.
-ROUND			= ZAOKROUHLIT		##	Zaokrouhlí číslo na zadaný počet číslic.
-ROUNDDOWN		= ROUNDDOWN		##	Zaokrouhlí číslo dolů, směrem k nule.
-ROUNDUP			= ROUNDUP		##	Zaokrouhlí číslo nahoru, směrem od nuly.
-SERIESSUM		= SERIESSUM		##	Vrátí součet mocninné řady určené podle vzorce.
-SIGN			= SIGN			##	Vrátí znaménko čísla.
-SIN			= SIN			##	Vrátí sinus daného úhlu.
-SINH			= SINH			##	Vrátí hyperbolický sinus čísla.
-SQRT			= ODMOCNINA		##	Vrátí kladnou druhou odmocninu.
-SQRTPI			= SQRTPI		##	Vrátí druhou odmocninu výrazu (číslo * pí).
-SUBTOTAL		= SUBTOTAL		##	Vrátí souhrn v seznamu nebo databázi.
-SUM			= SUMA			##	Sečte argumenty funkce.
-SUMIF			= SUMIF			##	Sečte buňky vybrané podle zadaných kritérií.
-SUMIFS			= SUMIFS		##	Sečte buňky určené více zadanými podmínkami.
-SUMPRODUCT		= SOUČIN.SKALÁRNÍ	##	Vrátí součet součinů odpovídajících prvků matic.
-SUMSQ			= SUMA.ČTVERCŮ		##	Vrátí součet čtverců argumentů.
-SUMX2MY2		= SUMX2MY2		##	Vrátí součet rozdílu čtverců odpovídajících hodnot ve dvou maticích.
-SUMX2PY2		= SUMX2PY2		##	Vrátí součet součtu čtverců odpovídajících hodnot ve dvou maticích.
-SUMXMY2			= SUMXMY2		##	Vrátí součet čtverců rozdílů odpovídajících hodnot ve dvou maticích.
-TAN			= TGTG			##	Vrátí tangens čísla.
-TANH			= TGH			##	Vrátí hyperbolický tangens čísla.
-TRUNC			= USEKNOUT		##	Zkrátí číslo na celé číslo.
-
-
-##
-##	Statistical functions			Statistické funkce
-##
-AVEDEV			= PRŮMODCHYLKA		##	Vrátí průměrnou hodnotu absolutních odchylek datových bodů od jejich střední hodnoty.
-AVERAGE			= PRŮMĚR		##	Vrátí průměrnou hodnotu argumentů.
-AVERAGEA		= AVERAGEA		##	Vrátí průměrnou hodnotu argumentů včetně čísel, textu a logických hodnot.
-AVERAGEIF		= AVERAGEIF		##	Vrátí průměrnou hodnotu (aritmetický průměr) všech buněk v oblasti, které vyhovují příslušné podmínce.
-AVERAGEIFS		= AVERAGEIFS		##	Vrátí průměrnou hodnotu (aritmetický průměr) všech buněk vyhovujících několika podmínkám.
-BETADIST		= BETADIST		##	Vrátí hodnotu součtového rozdělení beta.
-BETAINV			= BETAINV		##	Vrátí inverzní hodnotu součtového rozdělení pro zadané rozdělení beta.
-BINOMDIST		= BINOMDIST		##	Vrátí hodnotu binomického rozdělení pravděpodobnosti jednotlivých veličin.
-CHIDIST			= CHIDIST		##	Vrátí jednostrannou pravděpodobnost rozdělení chí-kvadrát.
-CHIINV			= CHIINV		##	Vrátí hodnotu funkce inverzní k distribuční funkci jednostranné pravděpodobnosti rozdělení chí-kvadrát.
-CHITEST			= CHITEST		##	Vrátí test nezávislosti.
-CONFIDENCE		= CONFIDENCE		##	Vrátí interval spolehlivosti pro střední hodnotu základního souboru.
-CORREL			= CORREL		##	Vrátí korelační koeficient mezi dvěma množinami dat.
-COUNT			= POČET			##	Vrátí počet čísel v seznamu argumentů.
-COUNTA			= POČET2		##	Vrátí počet hodnot v seznamu argumentů.
-COUNTBLANK		= COUNTBLANK		##	Spočítá počet prázdných buněk v oblasti.
-COUNTIF			= COUNTIF		##	Spočítá buňky v oblasti, které odpovídají zadaným kritériím.
-COUNTIFS		= COUNTIFS		##	Spočítá buňky v oblasti, které odpovídají více kritériím.
-COVAR			= COVAR			##	Vrátí hodnotu kovariance, průměrnou hodnotu součinů párových odchylek
-CRITBINOM		= CRITBINOM		##	Vrátí nejmenší hodnotu, pro kterou má součtové binomické rozdělení hodnotu větší nebo rovnu hodnotě kritéria.
-DEVSQ			= DEVSQ			##	Vrátí součet čtverců odchylek.
-EXPONDIST		= EXPONDIST		##	Vrátí hodnotu exponenciálního rozdělení.
-FDIST			= FDIST			##	Vrátí hodnotu rozdělení pravděpodobnosti F.
-FINV			= FINV			##	Vrátí hodnotu inverzní funkce k distribuční funkci rozdělení F.
-FISHER			= FISHER		##	Vrátí hodnotu Fisherovy transformace.
-FISHERINV		= FISHERINV		##	Vrátí hodnotu inverzní funkce k Fisherově transformaci.
-FORECAST		= FORECAST		##	Vrátí hodnotu lineárního trendu.
-FREQUENCY		= ČETNOSTI		##	Vrátí četnost rozdělení jako svislou matici.
-FTEST			= FTEST			##	Vrátí výsledek F-testu.
-GAMMADIST		= GAMMADIST		##	Vrátí hodnotu rozdělení gama.
-GAMMAINV		= GAMMAINV		##	Vrátí hodnotu inverzní funkce k distribuční funkci součtového rozdělení gama.
-GAMMALN			= GAMMALN		##	Vrátí přirozený logaritmus funkce gama, Γ(x).
-GEOMEAN			= GEOMEAN		##	Vrátí geometrický průměr.
-GROWTH			= LOGLINTREND		##	Vrátí hodnoty exponenciálního trendu.
-HARMEAN			= HARMEAN		##	Vrátí harmonický průměr.
-HYPGEOMDIST		= HYPGEOMDIST		##	Vrátí hodnotu hypergeometrického rozdělení.
-INTERCEPT		= INTERCEPT		##	Vrátí úsek lineární regresní čáry.
-KURT			= KURT			##	Vrátí hodnotu excesu množiny dat.
-LARGE			= LARGE			##	Vrátí k-tou největší hodnotu množiny dat.
-LINEST			= LINREGRESE		##	Vrátí parametry lineárního trendu.
-LOGEST			= LOGLINREGRESE		##	Vrátí parametry exponenciálního trendu.
-LOGINV			= LOGINV		##	Vrátí inverzní funkci k distribuční funkci logaritmicko-normálního rozdělení.
-LOGNORMDIST		= LOGNORMDIST		##	Vrátí hodnotu součtového logaritmicko-normálního rozdělení.
-MAX			= MAX			##	Vrátí maximální hodnotu seznamu argumentů.
-MAXA			= MAXA			##	Vrátí maximální hodnotu seznamu argumentů včetně čísel, textu a logických hodnot.
-MEDIAN			= MEDIAN		##	Vrátí střední hodnotu zadaných čísel.
-MIN			= MIN			##	Vrátí minimální hodnotu seznamu argumentů.
-MINA			= MINA			##	Vrátí nejmenší hodnotu v seznamu argumentů včetně čísel, textu a logických hodnot.
-MODE			= MODE			##	Vrátí hodnotu, která se v množině dat vyskytuje nejčastěji.
-NEGBINOMDIST		= NEGBINOMDIST		##	Vrátí hodnotu negativního binomického rozdělení.
-NORMDIST		= NORMDIST		##	Vrátí hodnotu normálního součtového rozdělení.
-NORMINV			= NORMINV		##	Vrátí inverzní funkci k funkci normálního součtového rozdělení.
-NORMSDIST		= NORMSDIST		##	Vrátí hodnotu standardního normálního součtového rozdělení.
-NORMSINV		= NORMSINV		##	Vrátí inverzní funkci k funkci standardního normálního součtového rozdělení.
-PEARSON			= PEARSON		##	Vrátí Pearsonův výsledný momentový korelační koeficient.
-PERCENTILE		= PERCENTIL		##	Vrátí hodnotu k-tého percentilu hodnot v oblasti.
-PERCENTRANK		= PERCENTRANK		##	Vrátí pořadí hodnoty v množině dat vyjádřené procentuální částí množiny dat.
-PERMUT			= PERMUTACE		##	Vrátí počet permutací pro zadaný počet objektů.
-POISSON			= POISSON		##	Vrátí hodnotu distribuční funkce Poissonova rozdělení.
-PROB			= PROB			##	Vrátí pravděpodobnost výskytu hodnot v oblasti mezi dvěma mezními hodnotami.
-QUARTILE		= QUARTIL		##	Vrátí hodnotu kvartilu množiny dat.
-RANK			= RANK			##	Vrátí pořadí čísla v seznamu čísel.
-RSQ			= RKQ			##	Vrátí druhou mocninu Pearsonova výsledného momentového korelačního koeficientu.
-SKEW			= SKEW			##	Vrátí zešikmení rozdělení.
-SLOPE			= SLOPE			##	Vrátí směrnici lineární regresní čáry.
-SMALL			= SMALL			##	Vrátí k-tou nejmenší hodnotu množiny dat.
-STANDARDIZE		= STANDARDIZE		##	Vrátí normalizovanou hodnotu.
-STDEV			= SMODCH.VÝBĚR		##	Vypočte směrodatnou odchylku výběru.
-STDEVA			= STDEVA		##	Vypočte směrodatnou odchylku výběru včetně čísel, textu a logických hodnot.
-STDEVP			= SMODCH		##	Vypočte směrodatnou odchylku základního souboru.
-STDEVPA			= STDEVPA		##	Vypočte směrodatnou odchylku základního souboru včetně čísel, textu a logických hodnot.
-STEYX			= STEYX			##	Vrátí standardní chybu předpovězené hodnoty y pro každou hodnotu x v regresi.
-TDIST			= TDIST			##	Vrátí hodnotu Studentova t-rozdělení.
-TINV			= TINV			##	Vrátí inverzní funkci k distribuční funkci Studentova t-rozdělení.
-TREND			= LINTREND		##	Vrátí hodnoty lineárního trendu.
-TRIMMEAN		= TRIMMEAN		##	Vrátí střední hodnotu vnitřní části množiny dat.
-TTEST			= TTEST			##	Vrátí pravděpodobnost spojenou se Studentovým t-testem.
-VAR			= VAR.VÝBĚR		##	Vypočte rozptyl výběru.
-VARA			= VARA			##	Vypočte rozptyl výběru včetně čísel, textu a logických hodnot.
-VARP			= VAR			##	Vypočte rozptyl základního souboru.
-VARPA			= VARPA			##	Vypočte rozptyl základního souboru včetně čísel, textu a logických hodnot.
-WEIBULL			= WEIBULL		##	Vrátí hodnotu Weibullova rozdělení.
-ZTEST			= ZTEST			##	Vrátí jednostrannou P-hodnotu z-testu.
-
-
-##
-##	Text functions				Textové funkce
-##
-ASC			= ASC			##	Změní znaky s plnou šířkou (dvoubajtové)v řetězci znaků na znaky s poloviční šířkou (jednobajtové).
-BAHTTEXT		= BAHTTEXT		##	Převede číslo na text ve formátu, měny ß (baht).
-CHAR			= ZNAK			##	Vrátí znak určený číslem kódu.
-CLEAN			= VYČISTIT		##	Odebere z textu všechny netisknutelné znaky.
-CODE			= KÓD			##	Vrátí číselný kód prvního znaku zadaného textového řetězce.
-CONCATENATE		= CONCATENATE		##	Spojí několik textových položek do jedné.
-DOLLAR			= KČ			##	Převede číslo na text ve formátu měny Kč (česká koruna).
-EXACT			= STEJNÉ		##	Zkontroluje, zda jsou dvě textové hodnoty shodné.
-FIND			= NAJÍT			##	Nalezne textovou hodnotu uvnitř jiné (rozlišuje malá a velká písmena).
-FINDB			= FINDB			##	Nalezne textovou hodnotu uvnitř jiné (rozlišuje malá a velká písmena).
-FIXED			= ZAOKROUHLIT.NA.TEXT	##	Zformátuje číslo jako text s pevným počtem desetinných míst.
-JIS			= JIS			##	Změní znaky s poloviční šířkou (jednobajtové) v řetězci znaků na znaky s plnou šířkou (dvoubajtové).
-LEFT			= ZLEVA			##	Vrátí první znaky textové hodnoty umístěné nejvíce vlevo.
-LEFTB			= LEFTB			##	Vrátí první znaky textové hodnoty umístěné nejvíce vlevo.
-LEN			= DÉLKA			##	Vrátí počet znaků textového řetězce.
-LENB			= LENB			##	Vrátí počet znaků textového řetězce.
-LOWER			= MALÁ			##	Převede text na malá písmena.
-MID			= ČÁST			##	Vrátí určitý počet znaků textového řetězce počínaje zadaným místem.
-MIDB			= MIDB			##	Vrátí určitý počet znaků textového řetězce počínaje zadaným místem.
-PHONETIC		= ZVUKOVÉ		##	Extrahuje fonetické znaky (furigana) z textového řetězce.
-PROPER			= VELKÁ2		##	Převede první písmeno každého slova textové hodnoty na velké.
-REPLACE			= NAHRADIT		##	Nahradí znaky uvnitř textu.
-REPLACEB		= NAHRADITB		##	Nahradí znaky uvnitř textu.
-REPT			= OPAKOVAT		##	Zopakuje text podle zadaného počtu opakování.
-RIGHT			= ZPRAVA		##	Vrátí první znaky textové hodnoty umístěné nejvíce vpravo.
-RIGHTB			= RIGHTB		##	Vrátí první znaky textové hodnoty umístěné nejvíce vpravo.
-SEARCH			= HLEDAT		##	Nalezne textovou hodnotu uvnitř jiné (malá a velká písmena nejsou rozlišována).
-SEARCHB			= SEARCHB		##	Nalezne textovou hodnotu uvnitř jiné (malá a velká písmena nejsou rozlišována).
-SUBSTITUTE		= DOSADIT		##	V textovém řetězci nahradí starý text novým.
-T			= T			##	Převede argumenty na text.
-TEXT			= HODNOTA.NA.TEXT	##	Zformátuje číslo a převede ho na text.
-TRIM			= PROČISTIT		##	Odstraní z textu mezery.
-UPPER			= VELKÁ			##	Převede text na velká písmena.
-VALUE			= HODNOTA		##	Převede textový argument na číslo.
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/da/config b/plugins/exportTypes/Excel/PHPExcel/locale/da/config
deleted file mode 100755
index c3dd201d2..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/da/config
+++ /dev/null
@@ -1,48 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= kr
-
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #NUL!
-DIV0	= #DIVISION/0!
-VALUE	= #VÆRDI!
-REF	= #REFERENCE!
-NAME	= #NAVN?
-NUM	= #NUM!
-NA	= #I/T
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/da/functions b/plugins/exportTypes/Excel/PHPExcel/locale/da/functions
deleted file mode 100755
index e6b9d919d..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/da/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Tilføjelsesprogram- og automatiseringsfunktioner
-##
-GETPIVOTDATA		= HENTPIVOTDATA			##	Returnerer data, der er lagret i en pivottabelrapport
-
-
-##
-##	Cube functions					Kubefunktioner
-##
-CUBEKPIMEMBER		= KUBE.KPI.MEDLEM		##	Returnerer navn, egenskab og mål for en KPI-indikator og viser navnet og egenskaben i cellen. En KPI-indikator er en målbar størrelse, f.eks. bruttooverskud pr. måned eller personaleudskiftning pr. kvartal, der bruges til at overvåge en organisations præstationer.
-CUBEMEMBER		= KUBE.MEDLEM			##	Returnerer et medlem eller en tupel fra kubehierarkiet. Bruges til at validere, om et medlem eller en tupel findes i kuben.
-CUBEMEMBERPROPERTY	= KUBEMEDLEM.EGENSKAB		##	Returnerer værdien af en egenskab for et medlem i kuben. Bruges til at validere, om et medlemsnavn findes i kuben, og returnere den angivne egenskab for medlemmet.
-CUBERANKEDMEMBER	= KUBEMEDLEM.RANG		##	Returnerer det n'te eller rangordnede medlem i et sæt. Bruges til at returnere et eller flere elementer i et sæt, f.eks. topsælgere eller de 10 bedste elever.
-CUBESET			= KUBESÆT			##	Definerer et beregnet sæt medlemmer eller tupler ved at sende et sætudtryk til kuben på serveren, som opretter sættet og returnerer det til Microsoft Office Excel.
-CUBESETCOUNT		= KUBESÆT.TÆL			##	Returnerer antallet af elementer i et sæt.
-CUBEVALUE		= KUBEVÆRDI			##	Returnerer en sammenlagt (aggregeret) værdi fra en kube.
-
-
-##
-##	Database functions				Databasefunktioner
-##
-DAVERAGE		= DMIDDEL			##	Returnerer gennemsnittet af markerede databaseposter
-DCOUNT			= DTÆL				##	Tæller de celler, der indeholder tal, i en database
-DCOUNTA			= DTÆLV				##	Tæller udfyldte celler i en database
-DGET			= DHENT				##	Uddrager en enkelt post, der opfylder de angivne kriterier, fra en database
-DMAX			= DMAKS				##	Returnerer den største værdi blandt markerede databaseposter
-DMIN			= DMIN				##	Returnerer den mindste værdi blandt markerede databaseposter
-DPRODUCT		= DPRODUKT			##	Ganger værdierne i et bestemt felt med poster, der opfylder kriterierne i en database
-DSTDEV			= DSTDAFV			##	Beregner et skøn over standardafvigelsen baseret på en stikprøve af markerede databaseposter
-DSTDEVP			= DSTDAFVP			##	Beregner standardafvigelsen baseret på hele populationen af markerede databaseposter
-DSUM			= DSUM				##	Sammenlægger de tal i feltkolonnen i databasen, der opfylder kriterierne
-DVAR			= DVARIANS			##	Beregner varians baseret på en stikprøve af markerede databaseposter
-DVARP			= DVARIANSP			##	Beregner varians baseret på hele populationen af markerede databaseposter
-
-
-##
-##	Date and time functions				Dato- og klokkeslætsfunktioner
-##
-DATE			= DATO				##	Returnerer serienummeret for en bestemt dato
-DATEVALUE		= DATOVÆRDI			##	Konverterer en dato i form af tekst til et serienummer
-DAY			= DAG				##	Konverterer et serienummer til en dag i måneden
-DAYS360			= DAGE360			##	Beregner antallet af dage mellem to datoer på grundlag af et år med 360 dage
-EDATE			= EDATO				##	Returnerer serienummeret for den dato, der ligger det angivne antal måneder før eller efter startdatoen
-EOMONTH			= SLUT.PÅ.MÅNED			##	Returnerer serienummeret på den sidste dag i måneden før eller efter et angivet antal måneder
-HOUR			= TIME				##	Konverterer et serienummer til en time
-MINUTE			= MINUT				##	Konverterer et serienummer til et minut
-MONTH			= MÅNED				##	Konverterer et serienummer til en måned
-NETWORKDAYS		= ANTAL.ARBEJDSDAGE		##	Returnerer antallet af hele arbejdsdage mellem to datoer
-NOW			= NU				##	Returnerer serienummeret for den aktuelle dato eller det aktuelle klokkeslæt
-SECOND			= SEKUND			##	Konverterer et serienummer til et sekund
-TIME			= KLOKKESLÆT			##	Returnerer serienummeret for et bestemt klokkeslæt
-TIMEVALUE		= TIDSVÆRDI			##	Konverterer et klokkeslæt i form af tekst til et serienummer
-TODAY			= IDAG				##	Returnerer serienummeret for dags dato
-WEEKDAY			= UGEDAG			##	Konverterer et serienummer til en ugedag
-WEEKNUM			= UGE.NR			##	Konverterer et serienummer til et tal, der angiver ugenummeret i året
-WORKDAY			= ARBEJDSDAG			##	Returnerer serienummeret for dagen før eller efter det angivne antal arbejdsdage
-YEAR			= ÅR				##	Konverterer et serienummer til et år
-YEARFRAC		= ÅR.BRØK			##	Returnerer årsbrøken, der repræsenterer antallet af hele dage mellem startdato og slutdato
-
-
-##
-##	Engineering functions				Tekniske funktioner
-##
-BESSELI			= BESSELI			##	Returnerer den modificerede Bessel-funktion In(x)
-BESSELJ			= BESSELJ			##	Returnerer Bessel-funktionen Jn(x)
-BESSELK			= BESSELK			##	Returnerer den modificerede Bessel-funktion Kn(x)
-BESSELY			= BESSELY			##	Returnerer Bessel-funktionen Yn(x)
-BIN2DEC			= BIN.TIL.DEC			##	Konverterer et binært tal til et decimaltal
-BIN2HEX			= BIN.TIL.HEX			##	Konverterer et binært tal til et heksadecimalt tal
-BIN2OCT			= BIN.TIL.OKT			##	Konverterer et binært tal til et oktaltal.
-COMPLEX			= KOMPLEKS			##	Konverterer reelle og imaginære koefficienter til et komplekst tal
-CONVERT			= KONVERTER			##	Konverterer et tal fra én måleenhed til en anden
-DEC2BIN			= DEC.TIL.BIN			##	Konverterer et decimaltal til et binært tal
-DEC2HEX			= DEC.TIL.HEX			##	Konverterer et decimaltal til et heksadecimalt tal
-DEC2OCT			= DEC.TIL.OKT			##	Konverterer et decimaltal til et oktaltal
-DELTA			= DELTA				##	Tester, om to værdier er ens
-ERF			= FEJLFUNK			##	Returner fejlfunktionen
-ERFC			= FEJLFUNK.KOMP			##	Returnerer den komplementære fejlfunktion
-GESTEP			= GETRIN			##	Tester, om et tal er større end en grænseværdi
-HEX2BIN			= HEX.TIL.BIN			##	Konverterer et heksadecimalt tal til et binært tal
-HEX2DEC			= HEX.TIL.DEC			##	Konverterer et decimaltal til et heksadecimalt tal
-HEX2OCT			= HEX.TIL.OKT			##	Konverterer et heksadecimalt tal til et oktaltal
-IMABS			= IMAGABS			##	Returnerer den absolutte værdi (modulus) for et komplekst tal
-IMAGINARY		= IMAGINÆR			##	Returnerer den imaginære koefficient for et komplekst tal
-IMARGUMENT		= IMAGARGUMENT			##	Returnerer argumentet theta, en vinkel udtrykt i radianer
-IMCONJUGATE		= IMAGKONJUGERE			##	Returnerer den komplekse konjugation af et komplekst tal
-IMCOS			= IMAGCOS			##	Returnerer et komplekst tals cosinus
-IMDIV			= IMAGDIV			##	Returnerer kvotienten for to komplekse tal
-IMEXP			= IMAGEKSP			##	Returnerer et komplekst tals eksponentialfunktion
-IMLN			= IMAGLN			##	Returnerer et komplekst tals naturlige logaritme
-IMLOG10			= IMAGLOG10			##	Returnerer et komplekst tals sædvanlige logaritme (titalslogaritme)
-IMLOG2			= IMAGLOG2			##	Returnerer et komplekst tals sædvanlige logaritme (totalslogaritme)
-IMPOWER			= IMAGPOTENS			##	Returnerer et komplekst tal opløftet i en heltalspotens
-IMPRODUCT		= IMAGPRODUKT			##	Returnerer produktet af komplekse tal
-IMREAL			= IMAGREELT			##	Returnerer den reelle koefficient for et komplekst tal
-IMSIN			= IMAGSIN			##	Returnerer et komplekst tals sinus
-IMSQRT			= IMAGKVROD			##	Returnerer et komplekst tals kvadratrod
-IMSUB			= IMAGSUB			##	Returnerer forskellen mellem to komplekse tal
-IMSUM			= IMAGSUM			##	Returnerer summen af komplekse tal
-OCT2BIN			= OKT.TIL.BIN			##	Konverterer et oktaltal til et binært tal
-OCT2DEC			= OKT.TIL.DEC			##	Konverterer et oktaltal til et decimaltal
-OCT2HEX			= OKT.TIL.HEX			##	Konverterer et oktaltal til et heksadecimalt tal
-
-
-##
-##	Financial functions				Finansielle funktioner
-##
-ACCRINT			= PÅLØBRENTE			##	Returnerer den påløbne rente for et værdipapir med periodiske renteudbetalinger
-ACCRINTM		= PÅLØBRENTE.UDLØB		##	Returnerer den påløbne rente for et værdipapir, hvor renteudbetalingen finder sted ved papirets udløb
-AMORDEGRC		= AMORDEGRC			##	Returnerer afskrivningsbeløbet for hver regnskabsperiode ved hjælp af en afskrivningskoefficient
-AMORLINC		= AMORLINC			##	Returnerer afskrivningsbeløbet for hver regnskabsperiode
-COUPDAYBS		= KUPONDAGE.SA			##	Returnerer antallet af dage fra starten af kuponperioden til afregningsdatoen
-COUPDAYS		= KUPONDAGE.A			##	Returnerer antallet af dage fra begyndelsen af kuponperioden til afregningsdatoen
-COUPDAYSNC		= KUPONDAGE.ANK			##	Returnerer antallet af dage i den kuponperiode, der indeholder afregningsdatoen
-COUPNCD			= KUPONDAG.NÆSTE		##	Returnerer den næste kupondato efter afregningsdatoen
-COUPNUM			= KUPONBETALINGER		##	Returnerer antallet af kuponudbetalinger mellem afregnings- og udløbsdatoen
-COUPPCD			= KUPONDAG.FORRIGE		##	Returnerer den forrige kupondato før afregningsdatoen
-CUMIPMT			= AKKUM.RENTE			##	Returnerer den akkumulerede rente, der betales på et lån mellem to perioder
-CUMPRINC		= AKKUM.HOVEDSTOL		##	Returnerer den akkumulerede nedbringelse af hovedstol mellem to perioder
-DB			= DB				##	Returnerer afskrivningen på et aktiv i en angivet periode ved anvendelse af saldometoden
-DDB			= DSA				##	Returnerer afskrivningsbeløbet for et aktiv over en bestemt periode ved anvendelse af dobbeltsaldometoden eller en anden afskrivningsmetode, som du angiver
-DISC			= DISKONTO			##	Returnerer et værdipapirs diskonto
-DOLLARDE		= KR.DECIMAL			##	Konverterer en kronepris udtrykt som brøk til en kronepris udtrykt som decimaltal
-DOLLARFR		= KR.BRØK			##	Konverterer en kronepris udtrykt som decimaltal til en kronepris udtrykt som brøk
-DURATION		= VARIGHED			##	Returnerer den årlige løbetid for et værdipapir med periodiske renteudbetalinger
-EFFECT			= EFFEKTIV.RENTE		##	Returnerer den årlige effektive rente
-FV			= FV				##	Returnerer fremtidsværdien af en investering
-FVSCHEDULE		= FVTABEL			##	Returnerer den fremtidige værdi af en hovedstol, når der er tilskrevet rente og rentes rente efter forskellige rentesatser
-INTRATE			= RENTEFOD			##	Returnerer renten på et fuldt ud investeret værdipapir
-IPMT			= R.YDELSE			##	Returnerer renten fra en investering for en given periode
-IRR			= IA				##	Returnerer den interne rente for en række pengestrømme
-ISPMT			= ISPMT				##	Beregner den betalte rente i løbet af en bestemt investeringsperiode
-MDURATION		= MVARIGHED			##	Returnerer Macauleys modificerede løbetid for et værdipapir med en formodet pari på kr. 100
-MIRR			= MIA				##	Returnerer den interne forrentning, hvor positive og negative pengestrømme finansieres til forskellig rente
-NOMINAL			= NOMINEL			##	Returnerer den årlige nominelle rente
-NPER			= NPER				##	Returnerer antallet af perioder for en investering
-NPV			= NUTIDSVÆRDI			##	Returnerer nettonutidsværdien for en investering baseret på en række periodiske pengestrømme og en diskonteringssats
-ODDFPRICE		= ULIGE.KURS.PÅLYDENDE		##	Returnerer kursen pr. kr. 100 nominel værdi for et værdipapir med en ulige (kort eller lang) første periode
-ODDFYIELD		= ULIGE.FØRSTE.AFKAST		##	Returnerer afkastet for et værdipapir med ulige første periode
-ODDLPRICE		= ULIGE.SIDSTE.KURS		##	Returnerer kursen pr. kr. 100 nominel værdi for et værdipapir med ulige sidste periode
-ODDLYIELD		= ULIGE.SIDSTE.AFKAST		##	Returnerer afkastet for et værdipapir med ulige sidste periode
-PMT			= YDELSE			##	Returnerer renten fra en investering for en given periode
-PPMT			= H.YDELSE			##	Returnerer ydelsen på hovedstolen for en investering i en given periode
-PRICE			= KURS				##	Returnerer kursen pr. kr 100 nominel værdi for et værdipapir med periodiske renteudbetalinger
-PRICEDISC		= KURS.DISKONTO			##	Returnerer kursen pr. kr 100 nominel værdi for et diskonteret værdipapir
-PRICEMAT		= KURS.UDLØB			##	Returnerer kursen pr. kr 100 nominel værdi for et værdipapir, hvor renten udbetales ved papirets udløb
-PV			= NV				##	Returnerer den nuværende værdi af en investering
-RATE			= RENTE				##	Returnerer renten i hver periode for en annuitet
-RECEIVED		= MODTAGET.VED.UDLØB		##	Returnerer det beløb, der modtages ved udløbet af et fuldt ud investeret værdipapir
-SLN			= LA				##	Returnerer den lineære afskrivning for et aktiv i en enkelt periode
-SYD			= ÅRSAFSKRIVNING		##	Returnerer den årlige afskrivning på et aktiv i en bestemt periode
-TBILLEQ			= STATSOBLIGATION		##	Returnerer det obligationsækvivalente afkast for en statsobligation
-TBILLPRICE		= STATSOBLIGATION.KURS		##	Returnerer kursen pr. kr 100 nominel værdi for en statsobligation
-TBILLYIELD		= STATSOBLIGATION.AFKAST	##	Returnerer en afkastet på en statsobligation
-VDB			= VSA				##	Returnerer afskrivningen på et aktiv i en angivet periode, herunder delperioder, ved brug af dobbeltsaldometoden
-XIRR			= INTERN.RENTE			##	Returnerer den interne rente for en plan over pengestrømme, der ikke behøver at være periodiske
-XNPV			= NETTO.NUTIDSVÆRDI		##	Returnerer nutidsværdien for en plan over pengestrømme, der ikke behøver at være periodiske
-YIELD			= AFKAST			##	Returnerer afkastet for et værdipapir med periodiske renteudbetalinger
-YIELDDISC		= AFKAST.DISKONTO		##	Returnerer det årlige afkast for et diskonteret værdipapir, f.eks. en statsobligation
-YIELDMAT		= AFKAST.UDLØBSDATO		##	Returnerer det årlige afkast for et værdipapir, hvor renten udbetales ved papirets udløb
-
-
-##
-##	Information functions				Informationsfunktioner
-##
-CELL			= CELLE				##	Returnerer oplysninger om formatering, placering eller indhold af en celle
-ERROR.TYPE		= FEJLTYPE			##	Returnerer et tal, der svarer til en fejltype
-INFO			= INFO				##	Returnerer oplysninger om det aktuelle operativmiljø
-ISBLANK			= ER.TOM			##	Returnerer SAND, hvis værdien er tom
-ISERR			= ER.FJL			##	Returnerer SAND, hvis værdien er en fejlværdi undtagen #I/T
-ISERROR			= ER.FEJL			##	Returnerer SAND, hvis værdien er en fejlværdi
-ISEVEN			= ER.LIGE			##	Returnerer SAND, hvis tallet er lige
-ISLOGICAL		= ER.LOGISK			##	Returnerer SAND, hvis værdien er en logisk værdi
-ISNA			= ER.IKKE.TILGÆNGELIG		##	Returnerer SAND, hvis værdien er fejlværdien #I/T
-ISNONTEXT		= ER.IKKE.TEKST			##	Returnerer SAND, hvis værdien ikke er tekst
-ISNUMBER		= ER.TAL			##	Returnerer SAND, hvis værdien er et tal
-ISODD			= ER.ULIGE			##	Returnerer SAND, hvis tallet er ulige
-ISREF			= ER.REFERENCE			##	Returnerer SAND, hvis værdien er en reference
-ISTEXT			= ER.TEKST			##	Returnerer SAND, hvis værdien er tekst
-N			= TAL				##	Returnerer en værdi konverteret til et tal
-NA			= IKKE.TILGÆNGELIG		##	Returnerer fejlværdien #I/T
-TYPE			= VÆRDITYPE			##	Returnerer et tal, der angiver datatypen for en værdi
-
-
-##
-##	Logical functions				Logiske funktioner
-##
-AND			= OG				##	Returnerer SAND, hvis alle argumenterne er sande
-FALSE			= FALSK				##	Returnerer den logiske værdi FALSK
-IF			= HVIS				##	Angiver en logisk test, der skal udføres
-IFERROR			= HVIS.FEJL			##	Returnerer en værdi, du angiver, hvis en formel evauleres som en fejl. Returnerer i modsat fald resultatet af formlen
-NOT			= IKKE				##	Vender argumentets logik om
-OR			= ELLER				##	Returneret værdien SAND, hvis mindst ét argument er sandt
-TRUE			= SAND				##	Returnerer den logiske værdi SAND
-
-
-##
-##	Lookup and reference functions			Opslags- og referencefunktioner
-##
-ADDRESS			= ADRESSE			##	Returnerer en reference som tekst til en enkelt celle i et regneark
-AREAS			= OMRÅDER			##	Returnerer antallet af områder i en reference
-CHOOSE			= VÆLG				##	Vælger en værdi på en liste med værdier
-COLUMN			= KOLONNE			##	Returnerer kolonnenummeret i en reference
-COLUMNS			= KOLONNER			##	Returnerer antallet af kolonner i en reference
-HLOOKUP			= VOPSLAG			##	Søger i den øverste række af en matrix og returnerer værdien af den angivne celle
-HYPERLINK		= HYPERLINK			##	Opretter en genvej kaldet et hyperlink, der åbner et dokument, som er lagret på en netværksserver, på et intranet eller på internettet
-INDEX			= INDEKS			##	Anvender et indeks til at vælge en værdi fra en reference eller en matrix
-INDIRECT		= INDIREKTE			##	Returnerer en reference, der er angivet af en tekstværdi
-LOOKUP			= SLÅ.OP			##	Søger værdier i en vektor eller en matrix
-MATCH			= SAMMENLIGN			##	Søger værdier i en reference eller en matrix
-OFFSET			= FORSKYDNING			##	Returnerer en reference forskudt i forhold til en given reference
-ROW			= RÆKKE				##	Returnerer rækkenummeret for en reference
-ROWS			= RÆKKER			##	Returnerer antallet af rækker i en reference
-RTD			= RTD				##	Henter realtidsdata fra et program, der understøtter COM-automatisering (Automation: En metode til at arbejde med objekter fra et andet program eller udviklingsværktøj. Automation, som tidligere blev kaldt OLE Automation, er en industristandard og en funktion i COM (Component Object Model).)
-TRANSPOSE		= TRANSPONER			##	Returnerer en transponeret matrix
-VLOOKUP			= LOPSLAG			##	Søger i øverste række af en matrix og flytter på tværs af rækken for at returnere en celleværdi
-
-
-##
-##	Math and trigonometry functions			Matematiske og trigonometriske funktioner
-##
-ABS			= ABS				##	Returnerer den absolutte værdi af et tal
-ACOS			= ARCCOS			##	Returnerer et tals arcus cosinus
-ACOSH			= ARCCOSH			##	Returnerer den inverse hyperbolske cosinus af tal
-ASIN			= ARCSIN			##	Returnerer et tals arcus sinus
-ASINH			= ARCSINH			##	Returnerer den inverse hyperbolske sinus for tal
-ATAN			= ARCTAN			##	Returnerer et tals arcus tangens
-ATAN2			= ARCTAN2			##	Returnerer de angivne x- og y-koordinaters arcus tangens
-ATANH			= ARCTANH			##	Returnerer et tals inverse hyperbolske tangens
-CEILING			= AFRUND.LOFT			##	Afrunder et tal til nærmeste heltal eller til nærmeste multiplum af betydning
-COMBIN			= KOMBIN			##	Returnerer antallet af kombinationer for et givet antal objekter
-COS			= COS				##	Returnerer et tals cosinus
-COSH			= COSH				##	Returnerer den inverse hyperbolske cosinus af et tal
-DEGREES			= GRADER			##	Konverterer radianer til grader
-EVEN			= LIGE				##	Runder et tal op til nærmeste lige heltal
-EXP			= EKSP				##	Returnerer e opløftet til en potens af et angivet tal
-FACT			= FAKULTET			##	Returnerer et tals fakultet
-FACTDOUBLE		= DOBBELT.FAKULTET		##	Returnerer et tals dobbelte fakultet
-FLOOR			= AFRUND.GULV			##	Runder et tal ned mod nul
-GCD			= STØRSTE.FÆLLES.DIVISOR	##	Returnerer den største fælles divisor
-INT			= HELTAL			##	Nedrunder et tal til det nærmeste heltal
-LCM			= MINDSTE.FÆLLES.MULTIPLUM	##	Returnerer det mindste fælles multiplum
-LN			= LN				##	Returnerer et tals naturlige logaritme
-LOG			= LOG				##	Returnerer logaritmen for et tal på grundlag af et angivet grundtal
-LOG10			= LOG10				##	Returnerer titalslogaritmen af et tal
-MDETERM			= MDETERM			##	Returnerer determinanten for en matrix
-MINVERSE		= MINVERT			##	Returnerer den inverse matrix for en matrix
-MMULT			= MPRODUKT			##	Returnerer matrixproduktet af to matrixer
-MOD			= REST				##	Returnerer restværdien fra division
-MROUND			= MAFRUND			##	Returnerer et tal afrundet til det ønskede multiplum
-MULTINOMIAL		= MULTINOMIAL			##	Returnerer et multinomialt talsæt
-ODD			= ULIGE				##	Runder et tal op til nærmeste ulige heltal
-PI			= PI				##	Returnerer værdien af pi
-POWER			= POTENS			##	Returnerer resultatet af et tal opløftet til en potens
-PRODUCT			= PRODUKT			##	Multiplicerer argumenterne
-QUOTIENT		= KVOTIENT			##	Returnerer heltalsdelen ved division
-RADIANS			= RADIANER			##	Konverterer grader til radianer
-RAND			= SLUMP				##	Returnerer et tilfældigt tal mellem 0 og 1
-RANDBETWEEN		= SLUMP.MELLEM			##	Returnerer et tilfældigt tal mellem de tal, der angives
-ROMAN			= ROMERTAL			##	Konverterer et arabertal til romertal som tekst
-ROUND			= AFRUND			##	Afrunder et tal til et angivet antal decimaler
-ROUNDDOWN		= RUND.NED			##	Runder et tal ned mod nul
-ROUNDUP			= RUND.OP			##	Runder et tal op, væk fra 0 (nul)
-SERIESSUM		= SERIESUM			##	Returnerer summen af en potensserie baseret på en formel
-SIGN			= FORTEGN			##	Returnerer et tals fortegn
-SIN			= SIN				##	Returnerer en given vinkels sinusværdi
-SINH			= SINH				##	Returnerer den hyperbolske sinus af et tal
-SQRT			= KVROD				##	Returnerer en positiv kvadratrod
-SQRTPI			= KVRODPI			##	Returnerer kvadratroden af (tal * pi;)
-SUBTOTAL		= SUBTOTAL			##	Returnerer en subtotal på en liste eller i en database
-SUM			= SUM				##	Lægger argumenterne sammen
-SUMIF			= SUM.HVIS			##	Lægger de celler sammen, der er specificeret af et givet kriterium.
-SUMIFS			= SUM.HVISER			##	Lægger de celler i et område sammen, der opfylder flere kriterier.
-SUMPRODUCT		= SUMPRODUKT			##	Returnerer summen af produkter af ens matrixkomponenter
-SUMSQ			= SUMKV				##	Returnerer summen af argumenternes kvadrater
-SUMX2MY2		= SUMX2MY2			##	Returnerer summen af differensen mellem kvadrater af ens værdier i to matrixer
-SUMX2PY2		= SUMX2PY2			##	Returnerer summen af summen af kvadrater af tilsvarende værdier i to matrixer
-SUMXMY2			= SUMXMY2			##	Returnerer summen af kvadrater af differenser mellem ens værdier i to matrixer
-TAN			= TAN				##	Returnerer et tals tangens
-TANH			= TANH				##	Returnerer et tals hyperbolske tangens
-TRUNC			= AFKORT			##	Afkorter et tal til et heltal
-
-
-##
-##	Statistical functions				Statistiske funktioner
-##
-AVEDEV			= MAD				##	Returnerer den gennemsnitlige numeriske afvigelse fra stikprøvens middelværdi
-AVERAGE			= MIDDEL			##	Returnerer middelværdien af argumenterne
-AVERAGEA		= MIDDELV			##	Returnerer middelværdien af argumenterne og medtager tal, tekst og logiske værdier
-AVERAGEIF		= MIDDEL.HVIS			##	Returnerer gennemsnittet (den aritmetiske middelværdi) af alle de celler, der opfylder et givet kriterium, i et område
-AVERAGEIFS		= MIDDEL.HVISER			##	Returnerer gennemsnittet (den aritmetiske middelværdi) af alle de celler, der opfylder flere kriterier.
-BETADIST		= BETAFORDELING			##	Returnerer den kumulative betafordelingsfunktion
-BETAINV			= BETAINV			##	Returnerer den inverse kumulative fordelingsfunktion for en angivet betafordeling
-BINOMDIST		= BINOMIALFORDELING		##	Returnerer punktsandsynligheden for binomialfordelingen
-CHIDIST			= CHIFORDELING			##	Returnerer fraktilsandsynligheden for en chi2-fordeling
-CHIINV			= CHIINV			##	Returnerer den inverse fraktilsandsynlighed for en chi2-fordeling
-CHITEST			= CHITEST			##	Foretager en test for uafhængighed
-CONFIDENCE		= KONFIDENSINTERVAL		##	Returnerer et konfidensinterval for en population
-CORREL			= KORRELATION			##	Returnerer korrelationskoefficienten mellem to datasæt
-COUNT			= TÆL				##	Tæller antallet af tal på en liste med argumenter
-COUNTA			= TÆLV				##	Tæller antallet af værdier på en liste med argumenter
-COUNTBLANK		= ANTAL.BLANKE			##	Tæller antallet af tomme celler i et område
-COUNTIF			= TÆLHVIS			##	Tæller antallet af celler, som opfylder de givne kriterier, i et område
-COUNTIFS		= TÆL.HVISER			##	Tæller antallet af de celler, som opfylder flere kriterier, i et område
-COVAR			= KOVARIANS			##	Beregner kovariansen mellem to stokastiske variabler
-CRITBINOM		= KRITBINOM			##	Returnerer den mindste værdi for x, for hvilken det gælder, at fordelingsfunktionen er mindre end eller lig med kriterieværdien.
-DEVSQ			= SAK				##	Returnerer summen af de kvadrerede afvigelser fra middelværdien
-EXPONDIST		= EKSPFORDELING			##	Returnerer eksponentialfordelingen
-FDIST			= FFORDELING			##	Returnerer fraktilsandsynligheden for F-fordelingen
-FINV			= FINV				##	Returnerer den inverse fraktilsandsynlighed for F-fordelingen
-FISHER			= FISHER			##	Returnerer Fisher-transformationen
-FISHERINV		= FISHERINV			##	Returnerer den inverse Fisher-transformation
-FORECAST		= PROGNOSE			##	Returnerer en prognoseværdi baseret på lineær tendens
-FREQUENCY		= FREKVENS			##	Returnerer en frekvensfordeling i en søjlevektor
-FTEST			= FTEST				##	Returnerer resultatet af en F-test til sammenligning af varians
-GAMMADIST		= GAMMAFORDELING		##	Returnerer fordelingsfunktionen for gammafordelingen
-GAMMAINV		= GAMMAINV			##	Returnerer den inverse fordelingsfunktion for gammafordelingen
-GAMMALN			= GAMMALN			##	Returnerer den naturlige logaritme til gammafordelingen, G(x)
-GEOMEAN			= GEOMIDDELVÆRDI		##	Returnerer det geometriske gennemsnit
-GROWTH			= FORØGELSE			##	Returnerer værdier langs en eksponentiel tendens
-HARMEAN			= HARMIDDELVÆRDI		##	Returnerer det harmoniske gennemsnit
-HYPGEOMDIST		= HYPGEOFORDELING		##	Returnerer punktsandsynligheden i en hypergeometrisk fordeling
-INTERCEPT		= SKÆRING			##	Returnerer afskæringsværdien på y-aksen i en lineær regression
-KURT			= TOPSTEJL			##	Returnerer kurtosisværdien for en stokastisk variabel
-LARGE			= STOR				##	Returnerer den k'te største værdi i et datasæt
-LINEST			= LINREGR			##	Returnerer parameterestimaterne for en lineær tendens
-LOGEST			= LOGREGR			##	Returnerer parameterestimaterne for en eksponentiel tendens
-LOGINV			= LOGINV			##	Returnerer den inverse fordelingsfunktion for lognormalfordelingen
-LOGNORMDIST		= LOGNORMFORDELING		##	Returnerer fordelingsfunktionen for lognormalfordelingen
-MAX			= MAKS				##	Returnerer den maksimale værdi på en liste med argumenter.
-MAXA			= MAKSV				##	Returnerer den maksimale værdi på en liste med argumenter og medtager tal, tekst og logiske værdier
-MEDIAN			= MEDIAN			##	Returnerer medianen for de angivne tal
-MIN			= MIN				##	Returnerer den mindste værdi på en liste med argumenter.
-MINA			= MINV				##	Returnerer den mindste værdi på en liste med argumenter og medtager tal, tekst og logiske værdier
-MODE			= HYPPIGST			##	Returnerer den hyppigste værdi i et datasæt
-NEGBINOMDIST		= NEGBINOMFORDELING		##	Returnerer den negative binomialfordeling
-NORMDIST		= NORMFORDELING			##	Returnerer fordelingsfunktionen for normalfordelingen
-NORMINV			= NORMINV			##	Returnerer den inverse fordelingsfunktion for normalfordelingen
-NORMSDIST		= STANDARDNORMFORDELING		##	Returnerer fordelingsfunktionen for standardnormalfordelingen
-NORMSINV		= STANDARDNORMINV		##	Returnerer den inverse fordelingsfunktion for standardnormalfordelingen
-PEARSON			= PEARSON			##	Returnerer Pearsons korrelationskoefficient
-PERCENTILE		= FRAKTIL			##	Returnerer den k'te fraktil for datasættet
-PERCENTRANK		= PROCENTPLADS			##	Returnerer den procentuelle rang for en given værdi i et datasæt
-PERMUT			= PERMUT			##	Returnerer antallet af permutationer for et givet sæt objekter
-POISSON			= POISSON			##	Returnerer fordelingsfunktionen for en Poisson-fordeling
-PROB			= SANDSYNLIGHED			##	Returnerer intervalsandsynligheden
-QUARTILE		= KVARTIL			##	Returnerer kvartilen i et givet datasæt
-RANK			= PLADS				##	Returnerer rangen for et tal på en liste med tal
-RSQ			= FORKLARINGSGRAD		##	Returnerer R2-værdien fra en simpel lineær regression
-SKEW			= SKÆVHED			##	Returnerer skævheden for en stokastisk variabel
-SLOPE			= HÆLDNING			##	Returnerer estimatet på hældningen fra en simpel lineær regression
-SMALL			= MINDSTE			##	Returnerer den k'te mindste værdi i datasættet
-STANDARDIZE		= STANDARDISER			##	Returnerer en standardiseret værdi
-STDEV			= STDAFV			##	Estimerer standardafvigelsen på basis af en stikprøve
-STDEVA			= STDAFVV			##	Beregner standardafvigelsen på basis af en prøve og medtager tal, tekst og logiske værdier
-STDEVP			= STDAFVP			##	Beregner standardafvigelsen på basis af en hel population
-STDEVPA			= STDAFVPV			##	Beregner standardafvigelsen på basis af en hel population og medtager tal, tekst og logiske værdier
-STEYX			= STFYX				##	Returnerer standardafvigelsen for de estimerede y-værdier i den simple lineære regression
-TDIST			= TFORDELING			##	Returnerer fordelingsfunktionen for Student's t-fordeling
-TINV			= TINV				##	Returnerer den inverse fordelingsfunktion for Student's t-fordeling
-TREND			= TENDENS			##	Returnerer værdi under antagelse af en lineær tendens
-TRIMMEAN		= TRIMMIDDELVÆRDI		##	Returnerer den trimmede middelværdi for datasættet
-TTEST			= TTEST				##	Returnerer den sandsynlighed, der er forbundet med Student's t-test
-VAR			= VARIANS			##	Beregner variansen på basis af en prøve
-VARA			= VARIANSV			##	Beregner variansen på basis af en prøve og medtager tal, tekst og logiske værdier
-VARP			= VARIANSP			##	Beregner variansen på basis af hele populationen
-VARPA			= VARIANSPV			##	Beregner variansen på basis af hele populationen og medtager tal, tekst og logiske værdier
-WEIBULL			= WEIBULL			##	Returnerer fordelingsfunktionen for Weibull-fordelingen
-ZTEST			= ZTEST				##	Returnerer sandsynlighedsværdien ved en en-sidet z-test
-
-
-##
-##	Text functions					Tekstfunktioner
-##
-ASC			= ASC				##	Ændrer engelske tegn i fuld bredde (dobbelt-byte) eller katakana i en tegnstreng til tegn i halv bredde (enkelt-byte)
-BAHTTEXT		= BAHTTEKST			##	Konverterer et tal til tekst ved hjælp af valutaformatet ß (baht)
-CHAR			= TEGN				##	Returnerer det tegn, der svarer til kodenummeret
-CLEAN			= RENS				##	Fjerner alle tegn, der ikke kan udskrives, fra tekst
-CODE			= KODE				##	Returnerer en numerisk kode for det første tegn i en tekststreng
-CONCATENATE		= SAMMENKÆDNING			##	Sammenkæder adskillige tekstelementer til ét tekstelement
-DOLLAR			= KR				##	Konverterer et tal til tekst ved hjælp af valutaformatet kr. (kroner)
-EXACT			= EKSAKT			##	Kontrollerer, om to tekstværdier er identiske
-FIND			= FIND				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes mellem store og små bogstaver)
-FINDB			= FINDB				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes mellem store og små bogstaver)
-FIXED			= FAST				##	Formaterer et tal som tekst med et fast antal decimaler
-JIS			= JIS				##	Ændrer engelske tegn i halv bredde (enkelt-byte) eller katakana i en tegnstreng til tegn i fuld bredde (dobbelt-byte)
-LEFT			= VENSTRE			##	Returnerer tegnet længst til venstre i en tekstværdi
-LEFTB			= VENSTREB			##	Returnerer tegnet længst til venstre i en tekstværdi
-LEN			= LÆNGDE			##	Returnerer antallet af tegn i en tekststreng
-LENB			= LÆNGDEB			##	Returnerer antallet af tegn i en tekststreng
-LOWER			= SMÅ.BOGSTAVER			##	Konverterer tekst til små bogstaver
-MID			= MIDT				##	Returnerer et bestemt antal tegn fra en tekststreng fra og med den angivne startposition
-MIDB			= MIDTB				##	Returnerer et bestemt antal tegn fra en tekststreng fra og med den angivne startposition
-PHONETIC		= FONETISK			##	Uddrager de fonetiske (furigana) tegn fra en tekststreng
-PROPER			= STORT.FORBOGSTAV		##	Konverterer første bogstav i hvert ord i teksten til stort bogstav
-REPLACE			= ERSTAT			##	Erstatter tegn i tekst
-REPLACEB		= ERSTATB			##	Erstatter tegn i tekst
-REPT			= GENTAG			##	Gentager tekst et givet antal gange
-RIGHT			= HØJRE				##	Returnerer tegnet længste til højre i en tekstværdi
-RIGHTB			= HØJREB			##	Returnerer tegnet længste til højre i en tekstværdi
-SEARCH			= SØG				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes ikke mellem store og små bogstaver)
-SEARCHB			= SØGB				##	Søger efter en tekstværdi i en anden tekstværdi (der skelnes ikke mellem store og små bogstaver)
-SUBSTITUTE		= UDSKIFT			##	Udskifter gammel tekst med ny tekst i en tekststreng
-T			= T				##	Konverterer argumenterne til tekst
-TEXT			= TEKST				##	Formaterer et tal og konverterer det til tekst
-TRIM			= FJERN.OVERFLØDIGE.BLANKE	##	Fjerner mellemrum fra tekst
-UPPER			= STORE.BOGSTAVER		##	Konverterer tekst til store bogstaver
-VALUE			= VÆRDI				##	Konverterer et tekstargument til et tal
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/de/config b/plugins/exportTypes/Excel/PHPExcel/locale/de/config
deleted file mode 100755
index ff3e756df..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/de/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #NULL!
-DIV0	= #DIV/0!
-VALUE	= #WERT!
-REF	= #BEZUG!
-NAME	= #NAME?
-NUM	= #ZAHL!
-NA	= #NV
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/de/functions b/plugins/exportTypes/Excel/PHPExcel/locale/de/functions
deleted file mode 100755
index 60c3392d8..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/de/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Add-In- und Automatisierungsfunktionen
-##
-GETPIVOTDATA	= PIVOTDATENZUORDNEN			##	In einem PivotTable-Bericht gespeicherte Daten werden zurückgegeben.
-
-
-##
-##	Cube functions					Cubefunktionen
-##
-CUBEKPIMEMBER		= CUBEKPIELEMENT		##	Gibt Name, Eigenschaft und Measure eines Key Performance Indicators (KPI) zurück und zeigt den Namen und die Eigenschaft in der Zelle an. Ein KPI ist ein quantifizierbares Maß, wie z. B. der monatliche Bruttogewinn oder die vierteljährliche Mitarbeiterfluktuation, mit dessen Hilfe das Leistungsverhalten eines Unternehmens überwacht werden kann.
-CUBEMEMBER		= CUBEELEMENT			##	Gibt ein Element oder ein Tuple in einer Cubehierarchie zurück. Wird verwendet, um zu überprüfen, ob das Element oder Tuple im Cube vorhanden ist.
-CUBEMEMBERPROPERTY	= CUBEELEMENTEIGENSCHAFT	##	Gibt den Wert einer Elementeigenschaft im Cube zurück. Wird verwendet, um zu überprüfen, ob ein Elementname im Cube vorhanden ist, und um die für dieses Element angegebene Eigenschaft zurückzugeben.
-CUBERANKEDMEMBER	= CUBERANGELEMENT		##	Gibt das n-te oder n-rangige Element in einer Menge zurück. Wird verwendet, um mindestens ein Element in einer Menge zurückzugeben, wie z. B. bester Vertriebsmitarbeiter oder 10 beste Kursteilnehmer.
-CUBESET			= CUBEMENGE			##	Definiert eine berechnete Menge Elemente oder Tuples durch Senden eines Mengenausdrucks an den Cube auf dem Server, der die Menge erstellt und an Microsoft Office Excel zurückgibt.
-CUBESETCOUNT		= CUBEMENGENANZAHL		##	Gibt die Anzahl der Elemente in einer Menge zurück.
-CUBEVALUE		= CUBEWERT			##	Gibt einen Aggregatwert aus einem Cube zurück.
-
-
-##
-##	Database functions				Datenbankfunktionen
-##
-DAVERAGE		= DBMITTELWERT			##	Gibt den Mittelwert der ausgewählten Datenbankeinträge zurück
-DCOUNT			= DBANZAHL			##	Zählt die Zellen mit Zahlen in einer Datenbank
-DCOUNTA			= DBANZAHL2			##	Zählt nicht leere Zellen in einer Datenbank
-DGET			= DBAUSZUG			##	Extrahiert aus einer Datenbank einen einzelnen Datensatz, der den angegebenen Kriterien entspricht
-DMAX			= DBMAX				##	Gibt den größten Wert aus ausgewählten Datenbankeinträgen zurück
-DMIN			= DBMIN				##	Gibt den kleinsten Wert aus ausgewählten Datenbankeinträgen zurück
-DPRODUCT		= DBPRODUKT			##	Multipliziert die Werte in einem bestimmten Feld mit Datensätzen, die den Kriterien in einer Datenbank entsprechen
-DSTDEV			= DBSTDABW			##	Schätzt die Standardabweichung auf der Grundlage einer Stichprobe aus ausgewählten Datenbankeinträgen
-DSTDEVP			= DBSTDABWN			##	Berechnet die Standardabweichung auf der Grundlage der Grundgesamtheit ausgewählter Datenbankeinträge
-DSUM			= DBSUMME			##	Addiert die Zahlen in der Feldspalte mit Datensätzen in der Datenbank, die den Kriterien entsprechen
-DVAR			= DBVARIANZ			##	Schätzt die Varianz auf der Grundlage ausgewählter Datenbankeinträge
-DVARP			= DBVARIANZEN			##	Berechnet die Varianz auf der Grundlage der Grundgesamtheit ausgewählter Datenbankeinträge
-
-
-##
-##	Date and time functions				Datums- und Zeitfunktionen
-##
-DATE			= DATUM				##	Gibt die fortlaufende Zahl eines bestimmten Datums zurück
-DATEVALUE		= DATWERT			##	Wandelt ein Datum in Form von Text in eine fortlaufende Zahl um
-DAY			= TAG				##	Wandelt eine fortlaufende Zahl in den Tag des Monats um
-DAYS360			= TAGE360			##	Berechnet die Anzahl der Tage zwischen zwei Datumsangaben ausgehend von einem Jahr, das 360 Tage hat
-EDATE			= EDATUM			##	Gibt die fortlaufende Zahl des Datums zurück, bei dem es sich um die angegebene Anzahl von Monaten vor oder nach dem Anfangstermin handelt
-EOMONTH			= MONATSENDE			##	Gibt die fortlaufende Zahl des letzten Tags des Monats vor oder nach einer festgelegten Anzahl von Monaten zurück
-HOUR			= STUNDE			##	Wandelt eine fortlaufende Zahl in eine Stunde um
-MINUTE			= MINUTE			##	Wandelt eine fortlaufende Zahl in eine Minute um
-MONTH			= MONAT				##	Wandelt eine fortlaufende Zahl in einen Monat um
-NETWORKDAYS		= NETTOARBEITSTAGE		##	Gibt die Anzahl von ganzen Arbeitstagen zwischen zwei Datumswerten zurück
-NOW			= JETZT				##	Gibt die fortlaufende Zahl des aktuellen Datums und der aktuellen Uhrzeit zurück
-SECOND			= SEKUNDE			##	Wandelt eine fortlaufende Zahl in eine Sekunde um
-TIME			= ZEIT				##	Gibt die fortlaufende Zahl einer bestimmten Uhrzeit zurück
-TIMEVALUE		= ZEITWERT			##	Wandelt eine Uhrzeit in Form von Text in eine fortlaufende Zahl um
-TODAY			= HEUTE				##	Gibt die fortlaufende Zahl des heutigen Datums zurück
-WEEKDAY			= WOCHENTAG			##	Wandelt eine fortlaufende Zahl in den Wochentag um
-WEEKNUM			= KALENDERWOCHE			##	Wandelt eine fortlaufende Zahl in eine Zahl um, die angibt, in welche Woche eines Jahres das angegebene Datum fällt
-WORKDAY			= ARBEITSTAG			##	Gibt die fortlaufende Zahl des Datums vor oder nach einer bestimmten Anzahl von Arbeitstagen zurück
-YEAR			= JAHR				##	Wandelt eine fortlaufende Zahl in ein Jahr um
-YEARFRAC		= BRTEILJAHRE			##	Gibt die Anzahl der ganzen Tage zwischen Ausgangsdatum und Enddatum in Bruchteilen von Jahren zurück
-
-
-##
-##	Engineering functions				Konstruktionsfunktionen
-##
-BESSELI			= BESSELI			##	Gibt die geänderte Besselfunktion In(x) zurück
-BESSELJ			= BESSELJ			##	Gibt die Besselfunktion Jn(x) zurück
-BESSELK			= BESSELK			##	Gibt die geänderte Besselfunktion Kn(x) zurück
-BESSELY			= BESSELY			##	Gibt die Besselfunktion Yn(x) zurück
-BIN2DEC			= BININDEZ			##	Wandelt eine binäre Zahl (Dualzahl) in eine dezimale Zahl um
-BIN2HEX			= BININHEX			##	Wandelt eine binäre Zahl (Dualzahl) in eine hexadezimale Zahl um
-BIN2OCT			= BININOKT			##	Wandelt eine binäre Zahl (Dualzahl) in eine oktale Zahl um
-COMPLEX			= KOMPLEXE			##	Wandelt den Real- und Imaginärteil in eine komplexe Zahl um
-CONVERT			= UMWANDELN			##	Wandelt eine Zahl von einem Maßsystem in ein anderes um
-DEC2BIN			= DEZINBIN			##	Wandelt eine dezimale Zahl in eine binäre Zahl (Dualzahl) um
-DEC2HEX			= DEZINHEX			##	Wandelt eine dezimale Zahl in eine hexadezimale Zahl um
-DEC2OCT			= DEZINOKT			##	Wandelt eine dezimale Zahl in eine oktale Zahl um
-DELTA			= DELTA				##	Überprüft, ob zwei Werte gleich sind
-ERF			= GAUSSFEHLER			##	Gibt die Gauss'sche Fehlerfunktion zurück
-ERFC			= GAUSSFKOMPL			##	Gibt das Komplement zur Gauss'schen Fehlerfunktion zurück
-GESTEP			= GGANZZAHL			##	Überprüft, ob eine Zahl größer als ein gegebener Schwellenwert ist
-HEX2BIN			= HEXINBIN			##	Wandelt eine hexadezimale Zahl in eine Binärzahl um
-HEX2DEC			= HEXINDEZ			##	Wandelt eine hexadezimale Zahl in eine dezimale Zahl um
-HEX2OCT			= HEXINOKT			##	Wandelt eine hexadezimale Zahl in eine Oktalzahl um
-IMABS			= IMABS				##	Gibt den Absolutbetrag (Modulo) einer komplexen Zahl zurück
-IMAGINARY		= IMAGINÄRTEIL			##	Gibt den Imaginärteil einer komplexen Zahl zurück
-IMARGUMENT		= IMARGUMENT			##	Gibt das Argument Theta zurück, einen Winkel, der als Bogenmaß ausgedrückt wird
-IMCONJUGATE		= IMKONJUGIERTE			##	Gibt die konjugierte komplexe Zahl zu einer komplexen Zahl zurück
-IMCOS			= IMCOS				##	Gibt den Kosinus einer komplexen Zahl zurück
-IMDIV			= IMDIV				##	Gibt den Quotienten zweier komplexer Zahlen zurück
-IMEXP			= IMEXP				##	Gibt die algebraische Form einer in exponentieller Schreibweise vorliegenden komplexen Zahl zurück
-IMLN			= IMLN				##	Gibt den natürlichen Logarithmus einer komplexen Zahl zurück
-IMLOG10			= IMLOG10			##	Gibt den Logarithmus einer komplexen Zahl zur Basis 10 zurück
-IMLOG2			= IMLOG2			##	Gibt den Logarithmus einer komplexen Zahl zur Basis 2 zurück
-IMPOWER			= IMAPOTENZ			##	Potenziert eine komplexe Zahl mit einer ganzen Zahl
-IMPRODUCT		= IMPRODUKT			##	Gibt das Produkt von komplexen Zahlen zurück
-IMREAL			= IMREALTEIL			##	Gibt den Realteil einer komplexen Zahl zurück
-IMSIN			= IMSIN				##	Gibt den Sinus einer komplexen Zahl zurück
-IMSQRT			= IMWURZEL			##	Gibt die Quadratwurzel einer komplexen Zahl zurück
-IMSUB			= IMSUB				##	Gibt die Differenz zwischen zwei komplexen Zahlen zurück
-IMSUM			= IMSUMME			##	Gibt die Summe von komplexen Zahlen zurück
-OCT2BIN			= OKTINBIN			##	Wandelt eine oktale Zahl in eine binäre Zahl (Dualzahl) um
-OCT2DEC			= OKTINDEZ			##	Wandelt eine oktale Zahl in eine dezimale Zahl um
-OCT2HEX			= OKTINHEX			##	Wandelt eine oktale Zahl in eine hexadezimale Zahl um
-
-
-##
-##	Financial functions				Finanzmathematische Funktionen
-##
-ACCRINT			= AUFGELZINS			##	Gibt die aufgelaufenen Zinsen (Stückzinsen) eines Wertpapiers mit periodischen Zinszahlungen zurück
-ACCRINTM		= AUFGELZINSF			##	Gibt die aufgelaufenen Zinsen (Stückzinsen) eines Wertpapiers zurück, die bei Fälligkeit ausgezahlt werden
-AMORDEGRC		= AMORDEGRK			##	Gibt die Abschreibung für die einzelnen Abschreibungszeiträume mithilfe eines Abschreibungskoeffizienten zurück
-AMORLINC		= AMORLINEARK			##	Gibt die Abschreibung für die einzelnen Abschreibungszeiträume zurück
-COUPDAYBS		= ZINSTERMTAGVA			##	Gibt die Anzahl der Tage vom Anfang des Zinstermins bis zum Abrechnungstermin zurück
-COUPDAYS		= ZINSTERMTAGE			##	Gibt die Anzahl der Tage der Zinsperiode zurück, die den Abrechnungstermin einschließt
-COUPDAYSNC		= ZINSTERMTAGNZ			##	Gibt die Anzahl der Tage vom Abrechnungstermin bis zum nächsten Zinstermin zurück
-COUPNCD			= ZINSTERMNZ			##	Gibt das Datum des ersten Zinstermins nach dem Abrechnungstermin zurück
-COUPNUM			= ZINSTERMZAHL			##	Gibt die Anzahl der Zinstermine zwischen Abrechnungs- und Fälligkeitsdatum zurück
-COUPPCD			= ZINSTERMVZ			##	Gibt das Datum des letzten Zinstermins vor dem Abrechnungstermin zurück
-CUMIPMT			= KUMZINSZ			##	Berechnet die kumulierten Zinsen, die zwischen zwei Perioden zu zahlen sind
-CUMPRINC		= KUMKAPITAL			##	Berechnet die aufgelaufene Tilgung eines Darlehens, die zwischen zwei Perioden zu zahlen ist
-DB			= GDA2				##	Gibt die geometrisch-degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode zurück
-DDB			= GDA				##	Gibt die Abschreibung eines Anlageguts für einen angegebenen Zeitraum unter Verwendung der degressiven Doppelraten-Abschreibung oder eines anderen von Ihnen angegebenen Abschreibungsverfahrens zurück
-DISC			= DISAGIO			##	Gibt den in Prozent ausgedrückten Abzinsungssatz eines Wertpapiers zurück
-DOLLARDE		= NOTIERUNGDEZ			##	Wandelt eine Notierung, die als Dezimalbruch ausgedrückt wurde, in eine Dezimalzahl um
-DOLLARFR		= NOTIERUNGBRU			##	Wandelt eine Notierung, die als Dezimalzahl ausgedrückt wurde, in einen Dezimalbruch um
-DURATION		= DURATION			##	Gibt die jährliche Duration eines Wertpapiers mit periodischen Zinszahlungen zurück
-EFFECT			= EFFEKTIV			##	Gibt die jährliche Effektivverzinsung zurück
-FV			= ZW				##	Gibt den zukünftigen Wert (Endwert) einer Investition zurück
-FVSCHEDULE		= ZW2				##	Gibt den aufgezinsten Wert des Anfangskapitals für eine Reihe periodisch unterschiedlicher Zinssätze zurück
-INTRATE			= ZINSSATZ			##	Gibt den Zinssatz eines voll investierten Wertpapiers zurück
-IPMT			= ZINSZ				##	Gibt die Zinszahlung einer Investition für die angegebene Periode zurück
-IRR			= IKV				##	Gibt den internen Zinsfuß einer Investition ohne Finanzierungskosten oder Reinvestitionsgewinne zurück
-ISPMT			= ISPMT				##	Berechnet die während eines bestimmten Zeitraums für eine Investition gezahlten Zinsen
-MDURATION		= MDURATION			##	Gibt die geänderte Dauer für ein Wertpapier mit einem angenommenen Nennwert von 100 € zurück
-MIRR			= QIKV				##	Gibt den internen Zinsfuß zurück, wobei positive und negative Zahlungen zu unterschiedlichen Sätzen finanziert werden
-NOMINAL			= NOMINAL			##	Gibt die jährliche Nominalverzinsung zurück
-NPER			= ZZR				##	Gibt die Anzahl der Zahlungsperioden einer Investition zurück
-NPV			= NBW				##	Gibt den Nettobarwert einer Investition auf Basis periodisch anfallender Zahlungen und eines Abzinsungsfaktors zurück
-ODDFPRICE		= UNREGER.KURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers mit einem unregelmäßigen ersten Zinstermin zurück
-ODDFYIELD		= UNREGER.REND			##	Gibt die Rendite eines Wertpapiers mit einem unregelmäßigen ersten Zinstermin zurück
-ODDLPRICE		= UNREGLE.KURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers mit einem unregelmäßigen letzten Zinstermin zurück
-ODDLYIELD		= UNREGLE.REND			##	Gibt die Rendite eines Wertpapiers mit einem unregelmäßigen letzten Zinstermin zurück
-PMT			= RMZ				##	Gibt die periodische Zahlung für eine Annuität zurück
-PPMT			= KAPZ				##	Gibt die Kapitalrückzahlung einer Investition für eine angegebene Periode zurück
-PRICE			= KURS				##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück, das periodisch Zinsen auszahlt
-PRICEDISC		= KURSDISAGIO			##	Gibt den Kurs pro 100 € Nennwert eines unverzinslichen Wertpapiers zurück
-PRICEMAT		= KURSFÄLLIG			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück, das Zinsen am Fälligkeitsdatum auszahlt
-PV			= BW				##	Gibt den Barwert einer Investition zurück
-RATE			= ZINS				##	Gibt den Zinssatz pro Zeitraum einer Annuität zurück
-RECEIVED		= AUSZAHLUNG			##	Gibt den Auszahlungsbetrag eines voll investierten Wertpapiers am Fälligkeitstermin zurück
-SLN			= LIA				##	Gibt die lineare Abschreibung eines Wirtschaftsguts pro Periode zurück
-SYD			= DIA				##	Gibt die arithmetisch-degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode zurück
-TBILLEQ			= TBILLÄQUIV			##	Gibt die Rendite für ein Wertpapier zurück
-TBILLPRICE		= TBILLKURS			##	Gibt den Kurs pro 100 € Nennwert eines Wertpapiers zurück
-TBILLYIELD		= TBILLRENDITE			##	Gibt die Rendite für ein Wertpapier zurück
-VDB			= VDB				##	Gibt die degressive Abschreibung eines Wirtschaftsguts für eine bestimmte Periode oder Teilperiode zurück
-XIRR			= XINTZINSFUSS			##	Gibt den internen Zinsfuß einer Reihe nicht periodisch anfallender Zahlungen zurück
-XNPV			= XKAPITALWERT			##	Gibt den Nettobarwert (Kapitalwert) einer Reihe nicht periodisch anfallender Zahlungen zurück
-YIELD			= RENDITE			##	Gibt die Rendite eines Wertpapiers zurück, das periodisch Zinsen auszahlt
-YIELDDISC		= RENDITEDIS			##	Gibt die jährliche Rendite eines unverzinslichen Wertpapiers zurück
-YIELDMAT		= RENDITEFÄLL			##	Gibt die jährliche Rendite eines Wertpapiers zurück, das Zinsen am Fälligkeitsdatum auszahlt
-
-
-##
-##	Information functions				Informationsfunktionen
-##
-CELL			= ZELLE				##	Gibt Informationen zu Formatierung, Position oder Inhalt einer Zelle zurück
-ERROR.TYPE		= FEHLER.TYP			##	Gibt eine Zahl zurück, die einem Fehlertyp entspricht
-INFO			= INFO				##	Gibt Informationen zur aktuellen Betriebssystemumgebung zurück
-ISBLANK			= ISTLEER			##	Gibt WAHR zurück, wenn der Wert leer ist
-ISERR			= ISTFEHL			##	Gibt WAHR zurück, wenn der Wert ein beliebiger Fehlerwert außer #N/V ist
-ISERROR			= ISTFEHLER			##	Gibt WAHR zurück, wenn der Wert ein beliebiger Fehlerwert ist
-ISEVEN			= ISTGERADE			##	Gibt WAHR zurück, wenn es sich um eine gerade Zahl handelt
-ISLOGICAL		= ISTLOG			##	Gibt WAHR zurück, wenn der Wert ein Wahrheitswert ist
-ISNA			= ISTNV				##	Gibt WAHR zurück, wenn der Wert der Fehlerwert #N/V ist
-ISNONTEXT		= ISTKTEXT			##	Gibt WAHR zurück, wenn der Wert ein Element ist, das keinen Text enthält
-ISNUMBER		= ISTZAHL			##	Gibt WAHR zurück, wenn der Wert eine Zahl ist
-ISODD			= ISTUNGERADE			##	Gibt WAHR zurück, wenn es sich um eine ungerade Zahl handelt
-ISREF			= ISTBEZUG			##	Gibt WAHR zurück, wenn der Wert ein Bezug ist
-ISTEXT			= ISTTEXT			##	Gibt WAHR zurück, wenn der Wert ein Element ist, das Text enthält
-N			= N				##	Gibt den in eine Zahl umgewandelten Wert zurück
-NA			= NV				##	Gibt den Fehlerwert #NV zurück
-TYPE			= TYP				##	Gibt eine Zahl zurück, die den Datentyp des angegebenen Werts anzeigt
-
-
-##
-##	Logical functions				Logische Funktionen
-##
-AND			= UND				##	Gibt WAHR zurück, wenn alle zugehörigen Argumente WAHR sind
-FALSE			= FALSCH			##	Gibt den Wahrheitswert FALSCH zurück
-IF			= WENN				##	Gibt einen logischen Test zum Ausführen an
-IFERROR			= WENNFEHLER			##	Gibt einen von Ihnen festgelegten Wert zurück, wenn die Auswertung der Formel zu einem Fehler führt; andernfalls wird das Ergebnis der Formel zurückgegeben
-NOT			= NICHT				##	Kehrt den Wahrheitswert der zugehörigen Argumente um
-OR			= ODER				##	Gibt WAHR zurück, wenn ein Argument WAHR ist
-TRUE			= WAHR				##	Gibt den Wahrheitswert WAHR zurück
-
-
-##
-##	Lookup and reference functions			Nachschlage- und Verweisfunktionen
-##
-ADDRESS			= ADRESSE			##	Gibt einen Bezug auf eine einzelne Zelle in einem Tabellenblatt als Text zurück
-AREAS			= BEREICHE			##	Gibt die Anzahl der innerhalb eines Bezugs aufgeführten Bereiche zurück
-CHOOSE			= WAHL				##	Wählt einen Wert aus eine Liste mit Werten aus
-COLUMN			= SPALTE			##	Gibt die Spaltennummer eines Bezugs zurück
-COLUMNS			= SPALTEN			##	Gibt die Anzahl der Spalten in einem Bezug zurück
-HLOOKUP			= HVERWEIS			##	Sucht in der obersten Zeile einer Matrix und gibt den Wert der angegebenen Zelle zurück
-HYPERLINK		= HYPERLINK			##	Erstellt eine Verknüpfung, über die ein auf einem Netzwerkserver, in einem Intranet oder im Internet gespeichertes Dokument geöffnet wird
-INDEX			= INDEX				##	Verwendet einen Index, um einen Wert aus einem Bezug oder einer Matrix auszuwählen
-INDIRECT		= INDIREKT			##	Gibt einen Bezug zurück, der von einem Textwert angegeben wird
-LOOKUP			= LOOKUP			##	Sucht Werte in einem Vektor oder einer Matrix
-MATCH			= VERGLEICH			##	Sucht Werte in einem Bezug oder einer Matrix
-OFFSET			= BEREICH.VERSCHIEBEN		##	Gibt einen Bezugoffset aus einem gegebenen Bezug zurück
-ROW			= ZEILE				##	Gibt die Zeilennummer eines Bezugs zurück
-ROWS			= ZEILEN			##	Gibt die Anzahl der Zeilen in einem Bezug zurück
-RTD			= RTD				##	Ruft Echtzeitdaten von einem Programm ab, das die COM-Automatisierung (Automatisierung: Ein Verfahren, bei dem aus einer Anwendung oder einem Entwicklungstool heraus mit den Objekten einer anderen Anwendung gearbeitet wird. Die früher als OLE-Automatisierung bezeichnete Automatisierung ist ein Industriestandard und eine Funktion von COM (Component Object Model).) unterstützt
-TRANSPOSE		= MTRANS			##	Gibt die transponierte Matrix einer Matrix zurück
-VLOOKUP			= SVERWEIS			##	Sucht in der ersten Spalte einer Matrix und arbeitet sich durch die Zeile, um den Wert einer Zelle zurückzugeben
-
-
-##
-##	Math and trigonometry functions			Mathematische und trigonometrische Funktionen
-##
-ABS			= ABS				##	Gibt den Absolutwert einer Zahl zurück
-ACOS			= ARCCOS			##	Gibt den Arkuskosinus einer Zahl zurück
-ACOSH			= ARCCOSHYP			##	Gibt den umgekehrten hyperbolischen Kosinus einer Zahl zurück
-ASIN			= ARCSIN			##	Gibt den Arkussinus einer Zahl zurück
-ASINH			= ARCSINHYP			##	Gibt den umgekehrten hyperbolischen Sinus einer Zahl zurück
-ATAN			= ARCTAN			##	Gibt den Arkustangens einer Zahl zurück
-ATAN2			= ARCTAN2			##	Gibt den Arkustangens einer x- und einer y-Koordinate zurück
-ATANH			= ARCTANHYP			##	Gibt den umgekehrten hyperbolischen Tangens einer Zahl zurück
-CEILING			= OBERGRENZE			##	Rundet eine Zahl auf die nächste ganze Zahl oder das nächste Vielfache von Schritt
-COMBIN			= KOMBINATIONEN			##	Gibt die Anzahl der Kombinationen für eine bestimmte Anzahl von Objekten zurück
-COS			= COS				##	Gibt den Kosinus einer Zahl zurück
-COSH			= COSHYP			##	Gibt den hyperbolischen Kosinus einer Zahl zurück
-DEGREES			= GRAD				##	Wandelt Bogenmaß (Radiant) in Grad um
-EVEN			= GERADE			##	Rundet eine Zahl auf die nächste gerade ganze Zahl auf
-EXP			= EXP				##	Potenziert die Basis e mit der als Argument angegebenen Zahl
-FACT			= FAKULTÄT			##	Gibt die Fakultät einer Zahl zurück
-FACTDOUBLE		= ZWEIFAKULTÄT			##	Gibt die Fakultät zu Zahl mit Schrittlänge 2 zurück
-FLOOR			= UNTERGRENZE			##	Rundet die Zahl auf Anzahl_Stellen ab
-GCD			= GGT				##	Gibt den größten gemeinsamen Teiler zurück
-INT			= GANZZAHL			##	Rundet eine Zahl auf die nächstkleinere ganze Zahl ab
-LCM			= KGV				##	Gibt das kleinste gemeinsame Vielfache zurück
-LN			= LN				##	Gibt den natürlichen Logarithmus einer Zahl zurück
-LOG			= LOG				##	Gibt den Logarithmus einer Zahl zu der angegebenen Basis zurück
-LOG10			= LOG10				##	Gibt den Logarithmus einer Zahl zur Basis 10 zurück
-MDETERM			= MDET				##	Gibt die Determinante einer Matrix zurück
-MINVERSE		= MINV				##	Gibt die inverse Matrix einer Matrix zurück
-MMULT			= MMULT				##	Gibt das Produkt zweier Matrizen zurück
-MOD			= REST				##	Gibt den Rest einer Division zurück
-MROUND			= VRUNDEN			##	Gibt eine auf das gewünschte Vielfache gerundete Zahl zurück
-MULTINOMIAL		= POLYNOMIAL			##	Gibt den Polynomialkoeffizienten einer Gruppe von Zahlen zurück
-ODD			= UNGERADE			##	Rundet eine Zahl auf die nächste ungerade ganze Zahl auf
-PI			= PI				##	Gibt den Wert Pi zurück
-POWER			= POTENZ			##	Gibt als Ergebnis eine potenzierte Zahl zurück
-PRODUCT			= PRODUKT			##	Multipliziert die zugehörigen Argumente
-QUOTIENT		= QUOTIENT			##	Gibt den ganzzahligen Anteil einer Division zurück
-RADIANS			= BOGENMASS			##	Wandelt Grad in Bogenmaß (Radiant) um
-RAND			= ZUFALLSZAHL			##	Gibt eine Zufallszahl zwischen 0 und 1 zurück
-RANDBETWEEN		= ZUFALLSBEREICH		##	Gibt eine Zufallszahl aus dem festgelegten Bereich zurück
-ROMAN			= RÖMISCH			##	Wandelt eine arabische Zahl in eine römische Zahl als Text um
-ROUND			= RUNDEN			##	Rundet eine Zahl auf eine bestimmte Anzahl von Dezimalstellen
-ROUNDDOWN		= ABRUNDEN			##	Rundet die Zahl auf Anzahl_Stellen ab
-ROUNDUP			= AUFRUNDEN			##	Rundet die Zahl auf Anzahl_Stellen auf
-SERIESSUM		= POTENZREIHE			##	Gibt die Summe von Potenzen (zur Berechnung von Potenzreihen und dichotomen Wahrscheinlichkeiten) zurück
-SIGN			= VORZEICHEN			##	Gibt das Vorzeichen einer Zahl zurück
-SIN			= SIN				##	Gibt den Sinus einer Zahl zurück
-SINH			= SINHYP			##	Gibt den hyperbolischen Sinus einer Zahl zurück
-SQRT			= WURZEL			##	Gibt die Quadratwurzel einer Zahl zurück
-SQRTPI			= WURZELPI			##	Gibt die Wurzel aus der mit Pi (pi) multiplizierten Zahl zurück
-SUBTOTAL		= TEILERGEBNIS			##	Gibt ein Teilergebnis in einer Liste oder Datenbank zurück
-SUM			= SUMME				##	Addiert die zugehörigen Argumente
-SUMIF			= SUMMEWENN			##	Addiert Zahlen, die mit den Suchkriterien übereinstimmen
-SUMIFS			= SUMMEWENNS			##	Die Zellen, die mehrere Kriterien erfüllen, werden in einem Bereich hinzugefügt
-SUMPRODUCT		= SUMMENPRODUKT			##	Gibt die Summe der Produkte zusammengehöriger Matrixkomponenten zurück
-SUMSQ			= QUADRATESUMME			##	Gibt die Summe der quadrierten Argumente zurück
-SUMX2MY2		= SUMMEX2MY2			##	Gibt die Summe der Differenzen der Quadrate für zusammengehörige Komponenten zweier Matrizen zurück
-SUMX2PY2		= SUMMEX2PY2			##	Gibt die Summe der Quadrate für zusammengehörige Komponenten zweier Matrizen zurück
-SUMXMY2			= SUMMEXMY2			##	Gibt die Summe der quadrierten Differenzen für zusammengehörige Komponenten zweier Matrizen zurück
-TAN			= TAN				##	Gibt den Tangens einer Zahl zurück
-TANH			= TANHYP			##	Gibt den hyperbolischen Tangens einer Zahl zurück
-TRUNC			= KÜRZEN			##	Schneidet die Kommastellen einer Zahl ab und gibt als Ergebnis eine ganze Zahl zurück
-
-
-##
-##	Statistical functions				Statistische Funktionen
-##
-AVEDEV			= MITTELABW			##	Gibt die durchschnittliche absolute Abweichung einer Reihe von Merkmalsausprägungen und ihrem Mittelwert zurück
-AVERAGE			= MITTELWERT			##	Gibt den Mittelwert der zugehörigen Argumente zurück
-AVERAGEA		= MITTELWERTA			##	Gibt den Mittelwert der zugehörigen Argumente, die Zahlen, Text und Wahrheitswerte enthalten, zurück
-AVERAGEIF		= MITTELWERTWENN		##	Der Durchschnittswert (arithmetisches Mittel) für alle Zellen in einem Bereich, die einem angegebenen Kriterium entsprechen, wird zurückgegeben
-AVERAGEIFS		= MITTELWERTWENNS		##	Gibt den Durchschnittswert (arithmetisches Mittel) aller Zellen zurück, die mehreren Kriterien entsprechen
-BETADIST		= BETAVERT			##	Gibt die Werte der kumulierten Betaverteilungsfunktion zurück
-BETAINV			= BETAINV			##	Gibt das Quantil der angegebenen Betaverteilung zurück
-BINOMDIST		= BINOMVERT			##	Gibt Wahrscheinlichkeiten einer binomialverteilten Zufallsvariablen zurück
-CHIDIST			= CHIVERT			##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer Chi-Quadrat-verteilten Zufallsgröße zurück
-CHIINV			= CHIINV			##	Gibt Quantile der Verteilungsfunktion (1-Alpha) der Chi-Quadrat-Verteilung zurück
-CHITEST			= CHITEST			##	Gibt die Teststatistik eines Unabhängigkeitstests zurück
-CONFIDENCE		= KONFIDENZ			##	Ermöglicht die Berechnung des 1-Alpha Konfidenzintervalls für den Erwartungswert einer Zufallsvariablen
-CORREL			= KORREL			##	Gibt den Korrelationskoeffizienten zweier Reihen von Merkmalsausprägungen zurück
-COUNT			= ANZAHL			##	Gibt die Anzahl der Zahlen in der Liste mit Argumenten an
-COUNTA			= ANZAHL2			##	Gibt die Anzahl der Werte in der Liste mit Argumenten an
-COUNTBLANK		= ANZAHLLEEREZELLEN		##	Gibt die Anzahl der leeren Zellen in einem Bereich an
-COUNTIF			= ZÄHLENWENN			##	Gibt die Anzahl der Zellen in einem Bereich an, deren Inhalte mit den Suchkriterien übereinstimmen
-COUNTIFS		= ZÄHLENWENNS			##	Gibt die Anzahl der Zellen in einem Bereich an, deren Inhalte mit mehreren Suchkriterien übereinstimmen
-COVAR			= KOVAR				##	Gibt die Kovarianz zurück, den Mittelwert der für alle Datenpunktpaare gebildeten Produkte der Abweichungen
-CRITBINOM		= KRITBINOM			##	Gibt den kleinsten Wert zurück, für den die kumulierten Wahrscheinlichkeiten der Binomialverteilung kleiner oder gleich einer Grenzwahrscheinlichkeit sind
-DEVSQ			= SUMQUADABW			##	Gibt die Summe der quadrierten Abweichungen der Datenpunkte von ihrem Stichprobenmittelwert zurück
-EXPONDIST		= EXPONVERT			##	Gibt Wahrscheinlichkeiten einer exponential verteilten Zufallsvariablen zurück
-FDIST			= FVERT				##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer F-verteilten Zufallsvariablen zurück
-FINV			= FINV				##	Gibt Quantile der F-Verteilung zurück
-FISHER			= FISHER			##	Gibt die Fisher-Transformation zurück
-FISHERINV		= FISHERINV			##	Gibt die Umkehrung der Fisher-Transformation zurück
-FORECAST		= PROGNOSE			##	Gibt einen Wert zurück, der sich aus einem linearen Trend ergibt
-FREQUENCY		= HÄUFIGKEIT			##	Gibt eine Häufigkeitsverteilung als vertikale Matrix zurück
-FTEST			= FTEST				##	Gibt die Teststatistik eines F-Tests zurück
-GAMMADIST		= GAMMAVERT			##	Gibt Wahrscheinlichkeiten einer gammaverteilten Zufallsvariablen zurück
-GAMMAINV		= GAMMAINV			##	Gibt Quantile der Gammaverteilung zurück
-GAMMALN			= GAMMALN			##	Gibt den natürlichen Logarithmus der Gammafunktion zurück, Γ(x)
-GEOMEAN			= GEOMITTEL			##	Gibt das geometrische Mittel zurück
-GROWTH			= VARIATION			##	Gibt Werte zurück, die sich aus einem exponentiellen Trend ergeben
-HARMEAN			= HARMITTEL			##	Gibt das harmonische Mittel zurück
-HYPGEOMDIST		= HYPGEOMVERT			##	Gibt Wahrscheinlichkeiten einer hypergeometrisch-verteilten Zufallsvariablen zurück
-INTERCEPT		= ACHSENABSCHNITT		##	Gibt den Schnittpunkt der Regressionsgeraden zurück
-KURT			= KURT				##	Gibt die Kurtosis (Exzess) einer Datengruppe zurück
-LARGE			= KGRÖSSTE			##	Gibt den k-größten Wert einer Datengruppe zurück
-LINEST			= RGP				##	Gibt die Parameter eines linearen Trends zurück
-LOGEST			= RKP				##	Gibt die Parameter eines exponentiellen Trends zurück
-LOGINV			= LOGINV			##	Gibt Quantile der Lognormalverteilung zurück
-LOGNORMDIST		= LOGNORMVERT			##	Gibt Werte der Verteilungsfunktion einer lognormalverteilten Zufallsvariablen zurück
-MAX			= MAX				##	Gibt den Maximalwert einer Liste mit Argumenten zurück
-MAXA			= MAXA				##	Gibt den Maximalwert einer Liste mit Argumenten zurück, die Zahlen, Text und Wahrheitswerte enthalten
-MEDIAN			= MEDIAN			##	Gibt den Median der angegebenen Zahlen zurück
-MIN			= MIN				##	Gibt den Minimalwert einer Liste mit Argumenten zurück
-MINA			= MINA				##	Gibt den kleinsten Wert einer Liste mit Argumenten zurück, die Zahlen, Text und Wahrheitswerte enthalten
-MODE			= MODALWERT			##	Gibt den am häufigsten vorkommenden Wert in einer Datengruppe zurück
-NEGBINOMDIST		= NEGBINOMVERT			##	Gibt Wahrscheinlichkeiten einer negativen, binominal verteilten Zufallsvariablen zurück
-NORMDIST		= NORMVERT			##	Gibt Wahrscheinlichkeiten einer normal verteilten Zufallsvariablen zurück
-NORMINV			= NORMINV			##	Gibt Quantile der Normalverteilung zurück
-NORMSDIST		= STANDNORMVERT			##	Gibt Werte der Verteilungsfunktion einer standardnormalverteilten Zufallsvariablen zurück
-NORMSINV		= STANDNORMINV			##	Gibt Quantile der Standardnormalverteilung zurück
-PEARSON			= PEARSON			##	Gibt den Pearsonschen Korrelationskoeffizienten zurück
-PERCENTILE		= QUANTIL			##	Gibt das Alpha-Quantil einer Gruppe von Daten zurück
-PERCENTRANK		= QUANTILSRANG			##	Gibt den prozentualen Rang (Alpha) eines Werts in einer Datengruppe zurück
-PERMUT			= VARIATIONEN			##	Gibt die Anzahl der Möglichkeiten zurück, um k Elemente aus einer Menge von n Elementen ohne Zurücklegen zu ziehen
-POISSON			= POISSON			##	Gibt Wahrscheinlichkeiten einer poissonverteilten Zufallsvariablen zurück
-PROB			= WAHRSCHBEREICH		##	Gibt die Wahrscheinlichkeit für ein von zwei Werten eingeschlossenes Intervall zurück
-QUARTILE		= QUARTILE			##	Gibt die Quartile der Datengruppe zurück
-RANK			= RANG				##	Gibt den Rang zurück, den eine Zahl innerhalb einer Liste von Zahlen einnimmt
-RSQ			= BESTIMMTHEITSMASS		##	Gibt das Quadrat des Pearsonschen Korrelationskoeffizienten zurück
-SKEW			= SCHIEFE			##	Gibt die Schiefe einer Verteilung zurück
-SLOPE			= STEIGUNG			##	Gibt die Steigung der Regressionsgeraden zurück
-SMALL			= KKLEINSTE			##	Gibt den k-kleinsten Wert einer Datengruppe zurück
-STANDARDIZE		= STANDARDISIERUNG		##	Gibt den standardisierten Wert zurück
-STDEV			= STABW				##	Schätzt die Standardabweichung ausgehend von einer Stichprobe
-STDEVA			= STABWA			##	Schätzt die Standardabweichung ausgehend von einer Stichprobe, die Zahlen, Text und Wahrheitswerte enthält
-STDEVP			= STABWN			##	Berechnet die Standardabweichung ausgehend von der Grundgesamtheit
-STDEVPA			= STABWNA			##	Berechnet die Standardabweichung ausgehend von der Grundgesamtheit, die Zahlen, Text und Wahrheitswerte enthält
-STEYX			= STFEHLERYX			##	Gibt den Standardfehler der geschätzten y-Werte für alle x-Werte der Regression zurück
-TDIST			= TVERT				##	Gibt Werte der Verteilungsfunktion (1-Alpha) einer (Student) t-verteilten Zufallsvariablen zurück
-TINV			= TINV				##	Gibt Quantile der t-Verteilung zurück
-TREND			= TREND				##	Gibt Werte zurück, die sich aus einem linearen Trend ergeben
-TRIMMEAN		= GESTUTZTMITTEL		##	Gibt den Mittelwert einer Datengruppe zurück, ohne die Randwerte zu berücksichtigen
-TTEST			= TTEST				##	Gibt die Teststatistik eines Student'schen t-Tests zurück
-VAR			= VARIANZ			##	Schätzt die Varianz ausgehend von einer Stichprobe
-VARA			= VARIANZA			##	Schätzt die Varianz ausgehend von einer Stichprobe, die Zahlen, Text und Wahrheitswerte enthält
-VARP			= VARIANZEN			##	Berechnet die Varianz ausgehend von der Grundgesamtheit
-VARPA			= VARIANZENA			##	Berechnet die Varianz ausgehend von der Grundgesamtheit, die Zahlen, Text und Wahrheitswerte enthält
-WEIBULL			= WEIBULL			##	Gibt Wahrscheinlichkeiten einer weibullverteilten Zufallsvariablen zurück
-ZTEST			= GTEST				##	Gibt den einseitigen Wahrscheinlichkeitswert für einen Gausstest (Normalverteilung) zurück
-
-
-##
-##	Text functions					Textfunktionen
-##
-ASC			= ASC				##	Konvertiert DB-Text in einer Zeichenfolge (lateinische Buchstaben oder Katakana) in SB-Text
-BAHTTEXT		= BAHTTEXT			##	Wandelt eine Zahl in Text im Währungsformat ß (Baht) um
-CHAR			= ZEICHEN			##	Gibt das der Codezahl entsprechende Zeichen zurück
-CLEAN			= SÄUBERN			##	Löscht alle nicht druckbaren Zeichen aus einem Text
-CODE			= CODE				##	Gibt die Codezahl des ersten Zeichens in einem Text zurück
-CONCATENATE		= VERKETTEN			##	Verknüpft mehrere Textelemente zu einem Textelement
-DOLLAR			= DM				##	Wandelt eine Zahl in Text im Währungsformat € (Euro) um
-EXACT			= IDENTISCH			##	Prüft, ob zwei Textwerte identisch sind
-FIND			= FINDEN			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird unterschieden)
-FINDB			= FINDENB			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird unterschieden)
-FIXED			= FEST				##	Formatiert eine Zahl als Text mit einer festen Anzahl von Dezimalstellen
-JIS			= JIS				##	Konvertiert SB-Text in einer Zeichenfolge (lateinische Buchstaben oder Katakana) in DB-Text
-LEFT			= LINKS				##	Gibt die Zeichen ganz links in einem Textwert zurück
-LEFTB			= LINKSB			##	Gibt die Zeichen ganz links in einem Textwert zurück
-LEN			= LÄNGE				##	Gibt die Anzahl der Zeichen in einer Zeichenfolge zurück
-LENB			= LÄNGEB			##	Gibt die Anzahl der Zeichen in einer Zeichenfolge zurück
-LOWER			= KLEIN				##	Wandelt Text in Kleinbuchstaben um
-MID			= TEIL				##	Gibt eine bestimmte Anzahl Zeichen aus einer Zeichenfolge ab der von Ihnen angegebenen Stelle zurück
-MIDB			= TEILB				##	Gibt eine bestimmte Anzahl Zeichen aus einer Zeichenfolge ab der von Ihnen angegebenen Stelle zurück
-PHONETIC		= PHONETIC			##	Extrahiert die phonetischen (Furigana-)Zeichen aus einer Textzeichenfolge
-PROPER			= GROSS2			##	Wandelt den ersten Buchstaben aller Wörter eines Textwerts in Großbuchstaben um
-REPLACE			= ERSETZEN			##	Ersetzt Zeichen in Text
-REPLACEB		= ERSETZENB			##	Ersetzt Zeichen in Text
-REPT			= WIEDERHOLEN			##	Wiederholt einen Text so oft wie angegeben
-RIGHT			= RECHTS			##	Gibt die Zeichen ganz rechts in einem Textwert zurück
-RIGHTB			= RECHTSB			##	Gibt die Zeichen ganz rechts in einem Textwert zurück
-SEARCH			= SUCHEN			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird nicht unterschieden)
-SEARCHB			= SUCHENB			##	Sucht nach einem Textwert, der in einem anderen Textwert enthalten ist (Groß-/Kleinschreibung wird nicht unterschieden)
-SUBSTITUTE		= WECHSELN			##	Ersetzt in einer Zeichenfolge neuen Text gegen alten
-T			= T				##	Wandelt die zugehörigen Argumente in Text um
-TEXT			= TEXT				##	Formatiert eine Zahl und wandelt sie in Text um
-TRIM			= GLÄTTEN			##	Entfernt Leerzeichen aus Text
-UPPER			= GROSS				##	Wandelt Text in Großbuchstaben um
-VALUE			= WERT				##	Wandelt ein Textargument in eine Zahl um
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/en/uk/config b/plugins/exportTypes/Excel/PHPExcel/locale/en/uk/config
deleted file mode 100755
index 551580e1c..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/en/uk/config
+++ /dev/null
@@ -1,32 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-##
-##	(For future use)
-##
-currencySymbol	= £
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/es/config b/plugins/exportTypes/Excel/PHPExcel/locale/es/config
deleted file mode 100755
index 6b2b4005c..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/es/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= $	##	I'm surprised that the Excel Documentation suggests $ rather than €
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #¡NULO!
-DIV0	= #¡DIV/0!
-VALUE	= #¡VALOR!
-REF	= #¡REF!
-NAME	= #¿NOMBRE?
-NUM	= #¡NÚM!
-NA	= #N/A
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/es/functions b/plugins/exportTypes/Excel/PHPExcel/locale/es/functions
deleted file mode 100755
index a0fa35a12..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/es/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions				Funciones de complementos y automatización
-##
-GETPIVOTDATA		= IMPORTARDATOSDINAMICOS		##	Devuelve los datos almacenados en un informe de tabla dinámica.
-
-
-##
-##	Cube functions						Funciones de cubo
-##
-CUBEKPIMEMBER		= MIEMBROKPICUBO			##	Devuelve un nombre, propiedad y medida de indicador de rendimiento clave (KPI) y muestra el nombre y la propiedad en la celda. Un KPI es una medida cuantificable, como los beneficios brutos mensuales o la facturación trimestral por empleado, que se usa para supervisar el rendimiento de una organización.
-CUBEMEMBER		= MIEMBROCUBO				##	Devuelve un miembro o tupla en una jerarquía de cubo. Se usa para validar la existencia del miembro o la tupla en el cubo.
-CUBEMEMBERPROPERTY	= PROPIEDADMIEMBROCUBO			##	Devuelve el valor de una propiedad de miembro del cubo Se usa para validar la existencia de un nombre de miembro en el cubo y para devolver la propiedad especificada para este miembro.
-CUBERANKEDMEMBER	= MIEMBRORANGOCUBO			##	Devuelve el miembro n, o clasificado, de un conjunto. Se usa para devolver uno o más elementos de un conjunto, por ejemplo, el representante con mejores ventas o los diez mejores alumnos.
-CUBESET			= CONJUNTOCUBO				##	Define un conjunto calculado de miembros o tuplas mediante el envío de una expresión de conjunto al cubo en el servidor, lo que crea el conjunto y, después, devuelve dicho conjunto a Microsoft Office Excel.
-CUBESETCOUNT		= RECUENTOCONJUNTOCUBO			##	Devuelve el número de elementos de un conjunto.
-CUBEVALUE		= VALORCUBO				##	Devuelve un valor agregado de un cubo.
-
-
-##
-##	Database functions					Funciones de base de datos
-##
-DAVERAGE		= BDPROMEDIO				##	Devuelve el promedio de las entradas seleccionadas en la base de datos.
-DCOUNT			= BDCONTAR				##	Cuenta el número de celdas que contienen números en una base de datos.
-DCOUNTA			= BDCONTARA				##	Cuenta el número de celdas no vacías en una base de datos.
-DGET			= BDEXTRAER				##	Extrae de una base de datos un único registro que cumple los criterios especificados.
-DMAX			= BDMAX					##	Devuelve el valor máximo de las entradas seleccionadas de la base de datos.
-DMIN			= BDMIN					##	Devuelve el valor mínimo de las entradas seleccionadas de la base de datos.
-DPRODUCT		= BDPRODUCTO				##	Multiplica los valores de un campo concreto de registros de una base de datos que cumplen los criterios especificados.
-DSTDEV			= BDDESVEST				##	Calcula la desviación estándar a partir de una muestra de entradas seleccionadas en la base de datos.
-DSTDEVP			= BDDESVESTP				##	Calcula la desviación estándar en función de la población total de las entradas seleccionadas de la base de datos.
-DSUM			= BDSUMA				##	Suma los números de la columna de campo de los registros de la base de datos que cumplen los criterios.
-DVAR			= BDVAR					##	Calcula la varianza a partir de una muestra de entradas seleccionadas de la base de datos.
-DVARP			= BDVARP				##	Calcula la varianza a partir de la población total de entradas seleccionadas de la base de datos.
-
-
-##
-##	Date and time functions					Funciones de fecha y hora
-##
-DATE			= FECHA					##	Devuelve el número de serie correspondiente a una fecha determinada.
-DATEVALUE		= FECHANUMERO				##	Convierte una fecha con formato de texto en un valor de número de serie.
-DAY			= DIA					##	Convierte un número de serie en un valor de día del mes.
-DAYS360			= DIAS360				##	Calcula el número de días entre dos fechas a partir de un año de 360 días.
-EDATE			= FECHA.MES				##	Devuelve el número de serie de la fecha equivalente al número indicado de meses anteriores o posteriores a la fecha inicial.
-EOMONTH			= FIN.MES				##	Devuelve el número de serie correspondiente al último día del mes anterior o posterior a un número de meses especificado.
-HOUR			= HORA					##	Convierte un número de serie en un valor de hora.
-MINUTE			= MINUTO				##	Convierte un número de serie en un valor de minuto.
-MONTH			= MES					##	Convierte un número de serie en un valor de mes.
-NETWORKDAYS		= DIAS.LAB				##	Devuelve el número de todos los días laborables existentes entre dos fechas.
-NOW			= AHORA					##	Devuelve el número de serie correspondiente a la fecha y hora actuales.
-SECOND			= SEGUNDO				##	Convierte un número de serie en un valor de segundo.
-TIME			= HORA					##	Devuelve el número de serie correspondiente a una hora determinada.
-TIMEVALUE		= HORANUMERO				##	Convierte una hora con formato de texto en un valor de número de serie.
-TODAY			= HOY					##	Devuelve el número de serie correspondiente al día actual.
-WEEKDAY			= DIASEM				##	Convierte un número de serie en un valor de día de la semana.
-WEEKNUM			= NUM.DE.SEMANA				##	Convierte un número de serie en un número que representa el lugar numérico correspondiente a una semana de un año.
-WORKDAY			= DIA.LAB				##	Devuelve el número de serie de la fecha que tiene lugar antes o después de un número determinado de días laborables.
-YEAR			= AÑO					##	Convierte un número de serie en un valor de año.
-YEARFRAC		= FRAC.AÑO				##	Devuelve la fracción de año que representa el número total de días existentes entre el valor de fecha_inicial y el de fecha_final.
-
-
-##
-##	Engineering functions					Funciones de ingeniería
-##
-BESSELI			= BESSELI				##	Devuelve la función Bessel In(x) modificada.
-BESSELJ			= BESSELJ				##	Devuelve la función Bessel Jn(x).
-BESSELK			= BESSELK				##	Devuelve la función Bessel Kn(x) modificada.
-BESSELY			= BESSELY				##	Devuelve la función Bessel Yn(x).
-BIN2DEC			= BIN.A.DEC				##	Convierte un número binario en decimal.
-BIN2HEX			= BIN.A.HEX				##	Convierte un número binario en hexadecimal.
-BIN2OCT			= BIN.A.OCT				##	Convierte un número binario en octal.
-COMPLEX			= COMPLEJO				##	Convierte coeficientes reales e imaginarios en un número complejo.
-CONVERT			= CONVERTIR				##	Convierte un número de un sistema de medida a otro.
-DEC2BIN			= DEC.A.BIN				##	Convierte un número decimal en binario.
-DEC2HEX			= DEC.A.HEX				##	Convierte un número decimal en hexadecimal.
-DEC2OCT			= DEC.A.OCT				##	Convierte un número decimal en octal.
-DELTA			= DELTA					##	Comprueba si dos valores son iguales.
-ERF			= FUN.ERROR				##	Devuelve la función de error.
-ERFC			= FUN.ERROR.COMPL			##	Devuelve la función de error complementario.
-GESTEP			= MAYOR.O.IGUAL				##	Comprueba si un número es mayor que un valor de umbral.
-HEX2BIN			= HEX.A.BIN				##	Convierte un número hexadecimal en binario.
-HEX2DEC			= HEX.A.DEC				##	Convierte un número hexadecimal en decimal.
-HEX2OCT			= HEX.A.OCT				##	Convierte un número hexadecimal en octal.
-IMABS			= IM.ABS				##	Devuelve el valor absoluto (módulo) de un número complejo.
-IMAGINARY		= IMAGINARIO				##	Devuelve el coeficiente imaginario de un número complejo.
-IMARGUMENT		= IM.ANGULO				##	Devuelve el argumento theta, un ángulo expresado en radianes.
-IMCONJUGATE		= IM.CONJUGADA				##	Devuelve la conjugada compleja de un número complejo.
-IMCOS			= IM.COS				##	Devuelve el coseno de un número complejo.
-IMDIV			= IM.DIV				##	Devuelve el cociente de dos números complejos.
-IMEXP			= IM.EXP				##	Devuelve el valor exponencial de un número complejo.
-IMLN			= IM.LN					##	Devuelve el logaritmo natural (neperiano) de un número complejo.
-IMLOG10			= IM.LOG10				##	Devuelve el logaritmo en base 10 de un número complejo.
-IMLOG2			= IM.LOG2				##	Devuelve el logaritmo en base 2 de un número complejo.
-IMPOWER			= IM.POT				##	Devuelve un número complejo elevado a una potencia entera.
-IMPRODUCT		= IM.PRODUCT				##	Devuelve el producto de números complejos.
-IMREAL			= IM.REAL				##	Devuelve el coeficiente real de un número complejo.
-IMSIN			= IM.SENO				##	Devuelve el seno de un número complejo.
-IMSQRT			= IM.RAIZ2				##	Devuelve la raíz cuadrada de un número complejo.
-IMSUB			= IM.SUSTR				##	Devuelve la diferencia entre dos números complejos.
-IMSUM			= IM.SUM				##	Devuelve la suma de números complejos.
-OCT2BIN			= OCT.A.BIN				##	Convierte un número octal en binario.
-OCT2DEC			= OCT.A.DEC				##	Convierte un número octal en decimal.
-OCT2HEX			= OCT.A.HEX				##	Convierte un número octal en hexadecimal.
-
-
-##
-##	Financial functions					Funciones financieras
-##
-ACCRINT			= INT.ACUM				##	Devuelve el interés acumulado de un valor bursátil con pagos de interés periódicos.
-ACCRINTM		= INT.ACUM.V				##	Devuelve el interés acumulado de un valor bursátil con pagos de interés al vencimiento.
-AMORDEGRC		= AMORTIZ.PROGRE			##	Devuelve la amortización de cada período contable mediante el uso de un coeficiente de amortización.
-AMORLINC		= AMORTIZ.LIN				##	Devuelve la amortización de cada uno de los períodos contables.
-COUPDAYBS		= CUPON.DIAS.L1				##	Devuelve el número de días desde el principio del período de un cupón hasta la fecha de liquidación.
-COUPDAYS		= CUPON.DIAS				##	Devuelve el número de días del período (entre dos cupones) donde se encuentra la fecha de liquidación.
-COUPDAYSNC		= CUPON.DIAS.L2				##	Devuelve el número de días desde la fecha de liquidación hasta la fecha del próximo cupón.
-COUPNCD			= CUPON.FECHA.L2			##	Devuelve la fecha del próximo cupón después de la fecha de liquidación.
-COUPNUM			= CUPON.NUM				##	Devuelve el número de pagos de cupón entre la fecha de liquidación y la fecha de vencimiento.
-COUPPCD			= CUPON.FECHA.L1			##	Devuelve la fecha de cupón anterior a la fecha de liquidación.
-CUMIPMT			= PAGO.INT.ENTRE			##	Devuelve el interés acumulado pagado entre dos períodos.
-CUMPRINC		= PAGO.PRINC.ENTRE			##	Devuelve el capital acumulado pagado de un préstamo entre dos períodos.
-DB			= DB					##	Devuelve la amortización de un bien durante un período específico a través del método de amortización de saldo fijo.
-DDB			= DDB					##	Devuelve la amortización de un bien durante un período específico a través del método de amortización por doble disminución de saldo u otro método que se especifique.
-DISC			= TASA.DESC				##	Devuelve la tasa de descuento de un valor bursátil.
-DOLLARDE		= MONEDA.DEC				##	Convierte una cotización de un valor bursátil expresada en forma fraccionaria en una cotización de un valor bursátil expresada en forma decimal.
-DOLLARFR		= MONEDA.FRAC				##	Convierte una cotización de un valor bursátil expresada en forma decimal en una cotización de un valor bursátil expresada en forma fraccionaria.
-DURATION		= DURACION				##	Devuelve la duración anual de un valor bursátil con pagos de interés periódico.
-EFFECT			= INT.EFECTIVO				##	Devuelve la tasa de interés anual efectiva.
-FV			= VF					##	Devuelve el valor futuro de una inversión.
-FVSCHEDULE		= VF.PLAN				##	Devuelve el valor futuro de un capital inicial después de aplicar una serie de tasas de interés compuesto.
-INTRATE			= TASA.INT				##	Devuelve la tasa de interés para la inversión total de un valor bursátil.
-IPMT			= PAGOINT				##	Devuelve el pago de intereses de una inversión durante un período determinado.
-IRR			= TIR					##	Devuelve la tasa interna de retorno para una serie de flujos de efectivo periódicos.
-ISPMT			= INT.PAGO.DIR				##	Calcula el interés pagado durante un período específico de una inversión.
-MDURATION		= DURACION.MODIF			##	Devuelve la duración de Macauley modificada de un valor bursátil con un valor nominal supuesto de 100 $.
-MIRR			= TIRM					##	Devuelve la tasa interna de retorno donde se financian flujos de efectivo positivos y negativos a tasas diferentes.
-NOMINAL			= TASA.NOMINAL				##	Devuelve la tasa nominal de interés anual.
-NPER			= NPER					##	Devuelve el número de períodos de una inversión.
-NPV			= VNA					##	Devuelve el valor neto actual de una inversión en función de una serie de flujos periódicos de efectivo y una tasa de descuento.
-ODDFPRICE		= PRECIO.PER.IRREGULAR.1		##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con un primer período impar.
-ODDFYIELD		= RENDTO.PER.IRREGULAR.1		##	Devuelve el rendimiento de un valor bursátil con un primer período impar.
-ODDLPRICE		= PRECIO.PER.IRREGULAR.2		##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con un último período impar.
-ODDLYIELD		= RENDTO.PER.IRREGULAR.2		##	Devuelve el rendimiento de un valor bursátil con un último período impar.
-PMT			= PAGO					##	Devuelve el pago periódico de una anualidad.
-PPMT			= PAGOPRIN				##	Devuelve el pago de capital de una inversión durante un período determinado.
-PRICE			= PRECIO				##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil que paga una tasa de interés periódico.
-PRICEDISC		= PRECIO.DESCUENTO			##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil con descuento.
-PRICEMAT		= PRECIO.VENCIMIENTO			##	Devuelve el precio por un valor nominal de 100 $ de un valor bursátil que paga interés a su vencimiento.
-PV			= VALACT				##	Devuelve el valor actual de una inversión.
-RATE			= TASA					##	Devuelve la tasa de interés por período de una anualidad.
-RECEIVED		= CANTIDAD.RECIBIDA			##	Devuelve la cantidad recibida al vencimiento de un valor bursátil completamente invertido.
-SLN			= SLN					##	Devuelve la amortización por método directo de un bien en un período dado.
-SYD			= SYD					##	Devuelve la amortización por suma de dígitos de los años de un bien durante un período especificado.
-TBILLEQ			= LETRA.DE.TES.EQV.A.BONO		##	Devuelve el rendimiento de un bono equivalente a una letra del Tesoro (de EE.UU.)
-TBILLPRICE		= LETRA.DE.TES.PRECIO			##	Devuelve el precio por un valor nominal de 100 $ de una letra del Tesoro (de EE.UU.)
-TBILLYIELD		= LETRA.DE.TES.RENDTO			##	Devuelve el rendimiento de una letra del Tesoro (de EE.UU.)
-VDB			= DVS					##	Devuelve la amortización de un bien durante un período específico o parcial a través del método de cálculo del saldo en disminución.
-XIRR			= TIR.NO.PER				##	Devuelve la tasa interna de retorno para un flujo de efectivo que no es necesariamente periódico.
-XNPV			= VNA.NO.PER				##	Devuelve el valor neto actual para un flujo de efectivo que no es necesariamente periódico.
-YIELD			= RENDTO				##	Devuelve el rendimiento de un valor bursátil que paga intereses periódicos.
-YIELDDISC		= RENDTO.DESC				##	Devuelve el rendimiento anual de un valor bursátil con descuento; por ejemplo, una letra del Tesoro (de EE.UU.)
-YIELDMAT		= RENDTO.VENCTO				##	Devuelve el rendimiento anual de un valor bursátil que paga intereses al vencimiento.
-
-
-##
-##	Information functions					Funciones de información
-##
-CELL			= CELDA					##	Devuelve información acerca del formato, la ubicación o el contenido de una celda.
-ERROR.TYPE		= TIPO.DE.ERROR				##	Devuelve un número que corresponde a un tipo de error.
-INFO			= INFO					##	Devuelve información acerca del entorno operativo en uso.
-ISBLANK			= ESBLANCO				##	Devuelve VERDADERO si el valor está en blanco.
-ISERR			= ESERR					##	Devuelve VERDADERO si el valor es cualquier valor de error excepto #N/A.
-ISERROR			= ESERROR				##	Devuelve VERDADERO si el valor es cualquier valor de error.
-ISEVEN			= ES.PAR				##	Devuelve VERDADERO si el número es par.
-ISLOGICAL		= ESLOGICO				##	Devuelve VERDADERO si el valor es un valor lógico.
-ISNA			= ESNOD					##	Devuelve VERDADERO si el valor es el valor de error #N/A.
-ISNONTEXT		= ESNOTEXTO				##	Devuelve VERDADERO si el valor no es texto.
-ISNUMBER		= ESNUMERO				##	Devuelve VERDADERO si el valor es un número.
-ISODD			= ES.IMPAR				##	Devuelve VERDADERO si el número es impar.
-ISREF			= ESREF					##	Devuelve VERDADERO si el valor es una referencia.
-ISTEXT			= ESTEXTO				##	Devuelve VERDADERO si el valor es texto.
-N			= N					##	Devuelve un valor convertido en un número.
-NA			= ND					##	Devuelve el valor de error #N/A.
-TYPE			= TIPO					##	Devuelve un número que indica el tipo de datos de un valor.
-
-
-##
-##	Logical functions					Funciones lógicas
-##
-AND			= Y					##	Devuelve VERDADERO si todos sus argumentos son VERDADERO.
-FALSE			= FALSO					##	Devuelve el valor lógico FALSO.
-IF			= SI					##	Especifica una prueba lógica que realizar.
-IFERROR			= SI.ERROR				##	Devuelve un valor que se especifica si una fórmula lo evalúa como un error; de lo contrario, devuelve el resultado de la fórmula.
-NOT			= NO					##	Invierte el valor lógico del argumento.
-OR			= O					##	Devuelve VERDADERO si cualquier argumento es VERDADERO.
-TRUE			= VERDADERO				##	Devuelve el valor lógico VERDADERO.
-
-
-##
-##	Lookup and reference functions				Funciones de búsqueda y referencia
-##
-ADDRESS			= DIRECCION				##	Devuelve una referencia como texto a una sola celda de una hoja de cálculo.
-AREAS			= AREAS					##	Devuelve el número de áreas de una referencia.
-CHOOSE			= ELEGIR				##	Elige un valor de una lista de valores.
-COLUMN			= COLUMNA				##	Devuelve el número de columna de una referencia.
-COLUMNS			= COLUMNAS				##	Devuelve el número de columnas de una referencia.
-HLOOKUP			= BUSCARH				##	Busca en la fila superior de una matriz y devuelve el valor de la celda indicada.
-HYPERLINK		= HIPERVINCULO				##	Crea un acceso directo o un salto que abre un documento almacenado en un servidor de red, en una intranet o en Internet.
-INDEX			= INDICE				##	Usa un índice para elegir un valor de una referencia o matriz.
-INDIRECT		= INDIRECTO				##	Devuelve una referencia indicada por un valor de texto.
-LOOKUP			= BUSCAR				##	Busca valores de un vector o una matriz.
-MATCH			= COINCIDIR				##	Busca valores de una referencia o matriz.
-OFFSET			= DESREF				##	Devuelve un desplazamiento de referencia respecto a una referencia dada.
-ROW			= FILA					##	Devuelve el número de fila de una referencia.
-ROWS			= FILAS					##	Devuelve el número de filas de una referencia.
-RTD			= RDTR					##	Recupera datos en tiempo real desde un programa compatible con la automatización COM (automatización: modo de trabajar con los objetos de una aplicación desde otra aplicación o herramienta de entorno. La automatización, antes denominada automatización OLE, es un estándar de la industria y una función del Modelo de objetos componentes (COM).).
-TRANSPOSE		= TRANSPONER				##	Devuelve la transposición de una matriz.
-VLOOKUP			= BUSCARV				##	Busca en la primera columna de una matriz y se mueve en horizontal por la fila para devolver el valor de una celda.
-
-
-##
-##	Math and trigonometry functions				Funciones matemáticas y trigonométricas
-##
-ABS			= ABS					##	Devuelve el valor absoluto de un número.
-ACOS			= ACOS					##	Devuelve el arcocoseno de un número.
-ACOSH			= ACOSH					##	Devuelve el coseno hiperbólico inverso de un número.
-ASIN			= ASENO					##	Devuelve el arcoseno de un número.
-ASINH			= ASENOH				##	Devuelve el seno hiperbólico inverso de un número.
-ATAN			= ATAN					##	Devuelve la arcotangente de un número.
-ATAN2			= ATAN2					##	Devuelve la arcotangente de las coordenadas "x" e "y".
-ATANH			= ATANH					##	Devuelve la tangente hiperbólica inversa de un número.
-CEILING			= MULTIPLO.SUPERIOR			##	Redondea un número al entero más próximo o al múltiplo significativo más cercano.
-COMBIN			= COMBINAT				##	Devuelve el número de combinaciones para un número determinado de objetos.
-COS			= COS					##	Devuelve el coseno de un número.
-COSH			= COSH					##	Devuelve el coseno hiperbólico de un número.
-DEGREES			= GRADOS				##	Convierte radianes en grados.
-EVEN			= REDONDEA.PAR				##	Redondea un número hasta el entero par más próximo.
-EXP			= EXP					##	Devuelve e elevado a la potencia de un número dado.
-FACT			= FACT					##	Devuelve el factorial de un número.
-FACTDOUBLE		= FACT.DOBLE				##	Devuelve el factorial doble de un número.
-FLOOR			= MULTIPLO.INFERIOR			##	Redondea un número hacia abajo, en dirección hacia cero.
-GCD			= M.C.D					##	Devuelve el máximo común divisor.
-INT			= ENTERO				##	Redondea un número hacia abajo hasta el entero más próximo.
-LCM			= M.C.M					##	Devuelve el mínimo común múltiplo.
-LN			= LN					##	Devuelve el logaritmo natural (neperiano) de un número.
-LOG			= LOG					##	Devuelve el logaritmo de un número en una base especificada.
-LOG10			= LOG10					##	Devuelve el logaritmo en base 10 de un número.
-MDETERM			= MDETERM				##	Devuelve la determinante matricial de una matriz.
-MINVERSE		= MINVERSA				##	Devuelve la matriz inversa de una matriz.
-MMULT			= MMULT					##	Devuelve el producto de matriz de dos matrices.
-MOD			= RESIDUO				##	Devuelve el resto de la división.
-MROUND			= REDOND.MULT				##	Devuelve un número redondeado al múltiplo deseado.
-MULTINOMIAL		= MULTINOMIAL				##	Devuelve el polinomio de un conjunto de números.
-ODD			= REDONDEA.IMPAR			##	Redondea un número hacia arriba hasta el entero impar más próximo.
-PI			= PI					##	Devuelve el valor de pi.
-POWER			= POTENCIA				##	Devuelve el resultado de elevar un número a una potencia.
-PRODUCT			= PRODUCTO				##	Multiplica sus argumentos.
-QUOTIENT		= COCIENTE				##	Devuelve la parte entera de una división.
-RADIANS			= RADIANES				##	Convierte grados en radianes.
-RAND			= ALEATORIO				##	Devuelve un número aleatorio entre 0 y 1.
-RANDBETWEEN		= ALEATORIO.ENTRE			##	Devuelve un número aleatorio entre los números que especifique.
-ROMAN			= NUMERO.ROMANO				##	Convierte un número arábigo en número romano, con formato de texto.
-ROUND			= REDONDEAR				##	Redondea un número al número de decimales especificado.
-ROUNDDOWN		= REDONDEAR.MENOS			##	Redondea un número hacia abajo, en dirección hacia cero.
-ROUNDUP			= REDONDEAR.MAS				##	Redondea un número hacia arriba, en dirección contraria a cero.
-SERIESSUM		= SUMA.SERIES				##	Devuelve la suma de una serie de potencias en función de la fórmula.
-SIGN			= SIGNO					##	Devuelve el signo de un número.
-SIN			= SENO					##	Devuelve el seno de un ángulo determinado.
-SINH			= SENOH					##	Devuelve el seno hiperbólico de un número.
-SQRT			= RAIZ					##	Devuelve la raíz cuadrada positiva de un número.
-SQRTPI			= RAIZ2PI				##	Devuelve la raíz cuadrada de un número multiplicado por PI (número * pi).
-SUBTOTAL		= SUBTOTALES				##	Devuelve un subtotal en una lista o base de datos.
-SUM			= SUMA					##	Suma sus argumentos.
-SUMIF			= SUMAR.SI				##	Suma las celdas especificadas que cumplen unos criterios determinados.
-SUMIFS			= SUMAR.SI.CONJUNTO			##	Suma las celdas de un rango que cumplen varios criterios.
-SUMPRODUCT		= SUMAPRODUCTO				##	Devuelve la suma de los productos de los correspondientes componentes de matriz.
-SUMSQ			= SUMA.CUADRADOS			##	Devuelve la suma de los cuadrados de los argumentos.
-SUMX2MY2		= SUMAX2MENOSY2				##	Devuelve la suma de la diferencia de los cuadrados de los valores correspondientes de dos matrices.
-SUMX2PY2		= SUMAX2MASY2				##	Devuelve la suma de la suma de los cuadrados de los valores correspondientes de dos matrices.
-SUMXMY2			= SUMAXMENOSY2				##	Devuelve la suma de los cuadrados de las diferencias de los valores correspondientes de dos matrices.
-TAN			= TAN					##	Devuelve la tangente de un número.
-TANH			= TANH					##	Devuelve la tangente hiperbólica de un número.
-TRUNC			= TRUNCAR				##	Trunca un número a un entero.
-
-
-##
-##	Statistical functions					Funciones estadísticas
-##
-AVEDEV			= DESVPROM				##	Devuelve el promedio de las desviaciones absolutas de la media de los puntos de datos.
-AVERAGE			= PROMEDIO				##	Devuelve el promedio de sus argumentos.
-AVERAGEA		= PROMEDIOA				##	Devuelve el promedio de sus argumentos, incluidos números, texto y valores lógicos.
-AVERAGEIF		= PROMEDIO.SI				##	Devuelve el promedio (media aritmética) de todas las celdas de un rango que cumplen unos criterios determinados.
-AVERAGEIFS		= PROMEDIO.SI.CONJUNTO			##	Devuelve el promedio (media aritmética) de todas las celdas que cumplen múltiples criterios.
-BETADIST		= DISTR.BETA				##	Devuelve la función de distribución beta acumulativa.
-BETAINV			= DISTR.BETA.INV			##	Devuelve la función inversa de la función de distribución acumulativa de una distribución beta especificada.
-BINOMDIST		= DISTR.BINOM				##	Devuelve la probabilidad de una variable aleatoria discreta siguiendo una distribución binomial.
-CHIDIST			= DISTR.CHI				##	Devuelve la probabilidad de una variable aleatoria continua siguiendo una distribución chi cuadrado de una sola cola.
-CHIINV			= PRUEBA.CHI.INV			##	Devuelve la función inversa de la probabilidad de una variable aleatoria continua siguiendo una distribución chi cuadrado de una sola cola.
-CHITEST			= PRUEBA.CHI				##	Devuelve la prueba de independencia.
-CONFIDENCE		= INTERVALO.CONFIANZA			##	Devuelve el intervalo de confianza de la media de una población.
-CORREL			= COEF.DE.CORREL			##	Devuelve el coeficiente de correlación entre dos conjuntos de datos.
-COUNT			= CONTAR				##	Cuenta cuántos números hay en la lista de argumentos.
-COUNTA			= CONTARA				##	Cuenta cuántos valores hay en la lista de argumentos.
-COUNTBLANK		= CONTAR.BLANCO				##	Cuenta el número de celdas en blanco de un rango.
-COUNTIF			= CONTAR.SI				##	Cuenta el número de celdas, dentro del rango, que cumplen el criterio especificado.
-COUNTIFS		= CONTAR.SI.CONJUNTO			##	Cuenta el número de celdas, dentro del rango, que cumplen varios criterios.
-COVAR			= COVAR					##	Devuelve la covarianza, que es el promedio de los productos de las desviaciones para cada pareja de puntos de datos.
-CRITBINOM		= BINOM.CRIT				##	Devuelve el menor valor cuya distribución binomial acumulativa es menor o igual a un valor de criterio.
-DEVSQ			= DESVIA2				##	Devuelve la suma de los cuadrados de las desviaciones.
-EXPONDIST		= DISTR.EXP				##	Devuelve la distribución exponencial.
-FDIST			= DISTR.F				##	Devuelve la distribución de probabilidad F.
-FINV			= DISTR.F.INV				##	Devuelve la función inversa de la distribución de probabilidad F.
-FISHER			= FISHER				##	Devuelve la transformación Fisher.
-FISHERINV		= PRUEBA.FISHER.INV			##	Devuelve la función inversa de la transformación Fisher.
-FORECAST		= PRONOSTICO				##	Devuelve un valor en una tendencia lineal.
-FREQUENCY		= FRECUENCIA				##	Devuelve una distribución de frecuencia como una matriz vertical.
-FTEST			= PRUEBA.F				##	Devuelve el resultado de una prueba F.
-GAMMADIST		= DISTR.GAMMA				##	Devuelve la distribución gamma.
-GAMMAINV		= DISTR.GAMMA.INV			##	Devuelve la función inversa de la distribución gamma acumulativa.
-GAMMALN			= GAMMA.LN				##	Devuelve el logaritmo natural de la función gamma, G(x).
-GEOMEAN			= MEDIA.GEOM				##	Devuelve la media geométrica.
-GROWTH			= CRECIMIENTO				##	Devuelve valores en una tendencia exponencial.
-HARMEAN			= MEDIA.ARMO				##	Devuelve la media armónica.
-HYPGEOMDIST		= DISTR.HIPERGEOM			##	Devuelve la distribución hipergeométrica.
-INTERCEPT		= INTERSECCION.EJE			##	Devuelve la intersección de la línea de regresión lineal.
-KURT			= CURTOSIS				##	Devuelve la curtosis de un conjunto de datos.
-LARGE			= K.ESIMO.MAYOR				##	Devuelve el k-ésimo mayor valor de un conjunto de datos.
-LINEST			= ESTIMACION.LINEAL			##	Devuelve los parámetros de una tendencia lineal.
-LOGEST			= ESTIMACION.LOGARITMICA		##	Devuelve los parámetros de una tendencia exponencial.
-LOGINV			= DISTR.LOG.INV				##	Devuelve la función inversa de la distribución logarítmico-normal.
-LOGNORMDIST		= DISTR.LOG.NORM			##	Devuelve la distribución logarítmico-normal acumulativa.
-MAX			= MAX					##	Devuelve el valor máximo de una lista de argumentos.
-MAXA			= MAXA					##	Devuelve el valor máximo de una lista de argumentos, incluidos números, texto y valores lógicos.
-MEDIAN			= MEDIANA				##	Devuelve la mediana de los números dados.
-MIN			= MIN					##	Devuelve el valor mínimo de una lista de argumentos.
-MINA			= MINA					##	Devuelve el valor mínimo de una lista de argumentos, incluidos números, texto y valores lógicos.
-MODE			= MODA					##	Devuelve el valor más común de un conjunto de datos.
-NEGBINOMDIST		= NEGBINOMDIST				##	Devuelve la distribución binomial negativa.
-NORMDIST		= DISTR.NORM				##	Devuelve la distribución normal acumulativa.
-NORMINV			= DISTR.NORM.INV			##	Devuelve la función inversa de la distribución normal acumulativa.
-NORMSDIST		= DISTR.NORM.ESTAND			##	Devuelve la distribución normal estándar acumulativa.
-NORMSINV		= DISTR.NORM.ESTAND.INV			##	Devuelve la función inversa de la distribución normal estándar acumulativa.
-PEARSON			= PEARSON				##	Devuelve el coeficiente de momento de correlación de producto Pearson.
-PERCENTILE		= PERCENTIL				##	Devuelve el k-ésimo percentil de los valores de un rango.
-PERCENTRANK		= RANGO.PERCENTIL			##	Devuelve el rango porcentual de un valor de un conjunto de datos.
-PERMUT			= PERMUTACIONES				##	Devuelve el número de permutaciones de un número determinado de objetos.
-POISSON			= POISSON				##	Devuelve la distribución de Poisson.
-PROB			= PROBABILIDAD				##	Devuelve la probabilidad de que los valores de un rango se encuentren entre dos límites.
-QUARTILE		= CUARTIL				##	Devuelve el cuartil de un conjunto de datos.
-RANK			= JERARQUIA				##	Devuelve la jerarquía de un número en una lista de números.
-RSQ			= COEFICIENTE.R2			##	Devuelve el cuadrado del coeficiente de momento de correlación de producto Pearson.
-SKEW			= COEFICIENTE.ASIMETRIA			##	Devuelve la asimetría de una distribución.
-SLOPE			= PENDIENTE				##	Devuelve la pendiente de la línea de regresión lineal.
-SMALL			= K.ESIMO.MENOR				##	Devuelve el k-ésimo menor valor de un conjunto de datos.
-STANDARDIZE		= NORMALIZACION				##	Devuelve un valor normalizado.
-STDEV			= DESVEST				##	Calcula la desviación estándar a partir de una muestra.
-STDEVA			= DESVESTA				##	Calcula la desviación estándar a partir de una muestra, incluidos números, texto y valores lógicos.
-STDEVP			= DESVESTP				##	Calcula la desviación estándar en función de toda la población.
-STDEVPA			= DESVESTPA				##	Calcula la desviación estándar en función de toda la población, incluidos números, texto y valores lógicos.
-STEYX			= ERROR.TIPICO.XY			##	Devuelve el error estándar del valor de "y" previsto para cada "x" de la regresión.
-TDIST			= DISTR.T				##	Devuelve la distribución de t de Student.
-TINV			= DISTR.T.INV				##	Devuelve la función inversa de la distribución de t de Student.
-TREND			= TENDENCIA				##	Devuelve valores en una tendencia lineal.
-TRIMMEAN		= MEDIA.ACOTADA				##	Devuelve la media del interior de un conjunto de datos.
-TTEST			= PRUEBA.T				##	Devuelve la probabilidad asociada a una prueba t de Student.
-VAR			= VAR					##	Calcula la varianza en función de una muestra.
-VARA			= VARA					##	Calcula la varianza en función de una muestra, incluidos números, texto y valores lógicos.
-VARP			= VARP					##	Calcula la varianza en función de toda la población.
-VARPA			= VARPA					##	Calcula la varianza en función de toda la población, incluidos números, texto y valores lógicos.
-WEIBULL			= DIST.WEIBULL				##	Devuelve la distribución de Weibull.
-ZTEST			= PRUEBA.Z				##	Devuelve el valor de una probabilidad de una cola de una prueba z.
-
-
-##
-##	Text functions						Funciones de texto
-##
-ASC			= ASC					##	Convierte las letras inglesas o katakana de ancho completo (de dos bytes) dentro de una cadena de caracteres en caracteres de ancho medio (de un byte).
-BAHTTEXT		= TEXTOBAHT				##	Convierte un número en texto, con el formato de moneda ß (Baht).
-CHAR			= CARACTER				##	Devuelve el carácter especificado por el número de código.
-CLEAN			= LIMPIAR				##	Quita del texto todos los caracteres no imprimibles.
-CODE			= CODIGO				##	Devuelve un código numérico del primer carácter de una cadena de texto.
-CONCATENATE		= CONCATENAR				##	Concatena varios elementos de texto en uno solo.
-DOLLAR			= MONEDA				##	Convierte un número en texto, con el formato de moneda $ (dólar).
-EXACT			= IGUAL					##	Comprueba si dos valores de texto son idénticos.
-FIND			= ENCONTRAR				##	Busca un valor de texto dentro de otro (distingue mayúsculas de minúsculas).
-FINDB			= ENCONTRARB				##	Busca un valor de texto dentro de otro (distingue mayúsculas de minúsculas).
-FIXED			= DECIMAL				##	Da formato a un número como texto con un número fijo de decimales.
-JIS			= JIS					##	Convierte las letras inglesas o katakana de ancho medio (de un byte) dentro de una cadena de caracteres en caracteres de ancho completo (de dos bytes).
-LEFT			= IZQUIERDA				##	Devuelve los caracteres del lado izquierdo de un valor de texto.
-LEFTB			= IZQUIERDAB				##	Devuelve los caracteres del lado izquierdo de un valor de texto.
-LEN			= LARGO					##	Devuelve el número de caracteres de una cadena de texto.
-LENB			= LARGOB				##	Devuelve el número de caracteres de una cadena de texto.
-LOWER			= MINUSC				##	Pone el texto en minúsculas.
-MID			= EXTRAE				##	Devuelve un número específico de caracteres de una cadena de texto que comienza en la posición que se especifique.
-MIDB			= EXTRAEB				##	Devuelve un número específico de caracteres de una cadena de texto que comienza en la posición que se especifique.
-PHONETIC		= FONETICO				##	Extrae los caracteres fonéticos (furigana) de una cadena de texto.
-PROPER			= NOMPROPIO				##	Pone en mayúscula la primera letra de cada palabra de un valor de texto.
-REPLACE			= REEMPLAZAR				##	Reemplaza caracteres de texto.
-REPLACEB		= REEMPLAZARB				##	Reemplaza caracteres de texto.
-REPT			= REPETIR				##	Repite el texto un número determinado de veces.
-RIGHT			= DERECHA				##	Devuelve los caracteres del lado derecho de un valor de texto.
-RIGHTB			= DERECHAB				##	Devuelve los caracteres del lado derecho de un valor de texto.
-SEARCH			= HALLAR				##	Busca un valor de texto dentro de otro (no distingue mayúsculas de minúsculas).
-SEARCHB			= HALLARB				##	Busca un valor de texto dentro de otro (no distingue mayúsculas de minúsculas).
-SUBSTITUTE		= SUSTITUIR				##	Sustituye texto nuevo por texto antiguo en una cadena de texto.
-T			= T					##	Convierte sus argumentos a texto.
-TEXT			= TEXTO					##	Da formato a un número y lo convierte en texto.
-TRIM			= ESPACIOS				##	Quita los espacios del texto.
-UPPER			= MAYUSC				##	Pone el texto en mayúsculas.
-VALUE			= VALOR					##	Convierte un argumento de texto en un número.
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/fi/config b/plugins/exportTypes/Excel/PHPExcel/locale/fi/config
deleted file mode 100755
index 04dc422de..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/fi/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= $	#	Symbol not known, should it be a € (Euro)?
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #TYHJÄ!
-DIV0	= #JAKO/0!
-VALUE	= #ARVO!
-REF	= #VIITTAUS!
-NAME	= #NIMI?
-NUM	= #LUKU!
-NA	= #PUUTTUU
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/fi/functions b/plugins/exportTypes/Excel/PHPExcel/locale/fi/functions
deleted file mode 100755
index 606f63d89..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/fi/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Apuohjelma- ja automaatiofunktiot
-##
-GETPIVOTDATA		= NOUDA.PIVOT.TIEDOT		##	Palauttaa pivot-taulukkoraporttiin tallennettuja tietoja.
-
-
-##
-##	Cube functions					Kuutiofunktiot
-##
-CUBEKPIMEMBER		= KUUTIOKPIJÄSEN		##	Palauttaa suorituskykyilmaisimen (KPI) nimen, ominaisuuden sekä mitan ja näyttää nimen sekä ominaisuuden solussa. KPI on mitattavissa oleva suure, kuten kuukauden bruttotuotto tai vuosineljänneksen työntekijäkohtainen liikevaihto, joiden avulla tarkkaillaan organisaation suorituskykyä.
-CUBEMEMBER		= KUUTIONJÄSEN			##	Palauttaa kuutiohierarkian jäsenen tai monikon. Tällä funktiolla voit tarkistaa, että jäsen tai monikko on olemassa kuutiossa.
-CUBEMEMBERPROPERTY	= KUUTIONJÄSENENOMINAISUUS	##	Palauttaa kuution jäsenominaisuuden arvon. Tällä funktiolla voit tarkistaa, että nimi on olemassa kuutiossa, ja palauttaa tämän jäsenen määritetyn ominaisuuden.
-CUBERANKEDMEMBER	= KUUTIONLUOKITELTUJÄSEN	##	Palauttaa joukon n:nnen jäsenen. Tällä funktiolla voit palauttaa joukosta elementtejä, kuten parhaan myyjän tai 10 parasta opiskelijaa.
-CUBESET			= KUUTIOJOUKKO			##	Määrittää lasketun jäsen- tai monikkojoukon lähettämällä joukon lausekkeita palvelimessa olevalle kuutiolle. Palvelin luo joukon ja palauttaa sen Microsoft Office Excelille.
-CUBESETCOUNT		= KUUTIOJOUKKOJENMÄÄRÄ		##	Palauttaa joukon kohteiden määrän.
-CUBEVALUE		= KUUTIONARVO			##	Palauttaa koostetun arvon kuutiosta.
-
-
-##
-##	Database functions				Tietokantafunktiot
-##
-DAVERAGE		= TKESKIARVO			##	Palauttaa valittujen tietokantamerkintöjen keskiarvon.
-DCOUNT			= TLASKE			##	Laskee tietokannan lukuja sisältävien solujen määrän.
-DCOUNTA			= TLASKEA			##	Laskee tietokannan tietoja sisältävien solujen määrän.
-DGET			= TNOUDA			##	Hakee määritettyjä ehtoja vastaavan tietueen tietokannasta.
-DMAX			= TMAKS				##	Palauttaa suurimman arvon tietokannasta valittujen arvojen joukosta.
-DMIN			= TMIN				##	Palauttaa pienimmän arvon tietokannasta valittujen arvojen joukosta.
-DPRODUCT		= TTULO				##	Kertoo määritetyn ehdon täyttävien tietokannan tietueiden tietyssä kentässä olevat arvot.
-DSTDEV			= TKESKIHAJONTA			##	Laskee keskihajonnan tietokannasta valituista arvoista muodostuvan otoksen perusteella.
-DSTDEVP			= TKESKIHAJONTAP		##	Laskee keskihajonnan tietokannasta valittujen arvojen koko populaation perusteella.
-DSUM			= TSUMMA			##	Lisää luvut määritetyn ehdon täyttävien tietokannan tietueiden kenttäsarakkeeseen.
-DVAR			= TVARIANSSI			##	Laskee varianssin tietokannasta valittujen arvojen otoksen perusteella.
-DVARP			= TVARIANSSIP			##	Laskee varianssin tietokannasta valittujen arvojen koko populaation perusteella.
-
-
-##
-##	Date and time functions				Päivämäärä- ja aikafunktiot
-##
-DATE			= PÄIVÄYS			##	Palauttaa annetun päivämäärän järjestysluvun.
-DATEVALUE		= PÄIVÄYSARVO			##	Muuntaa tekstimuodossa olevan päivämäärän järjestysluvuksi.
-DAY			= PÄIVÄ				##	Muuntaa järjestysluvun kuukauden päiväksi.
-DAYS360			= PÄIVÄT360			##	Laskee kahden päivämäärän välisten päivien määrän käyttäen perustana 360-päiväistä vuotta.
-EDATE			= PÄIVÄ.KUUKAUSI		##	Palauttaa järjestyslukuna päivämäärän, joka poikkeaa aloituspäivän päivämäärästä annetun kuukausimäärän verran joko eteen- tai taaksepäin.
-EOMONTH			= KUUKAUSI.LOPPU		##	Palauttaa järjestyslukuna sen kuukauden viimeisen päivämäärän, joka poikkeaa annetun kuukausimäärän verran eteen- tai taaksepäin.
-HOUR			= TUNNIT			##	Muuntaa järjestysluvun tunneiksi.
-MINUTE			= MINUUTIT			##	Muuntaa järjestysluvun minuuteiksi.
-MONTH			= KUUKAUSI			##	Muuntaa järjestysluvun kuukausiksi.
-NETWORKDAYS		= TYÖPÄIVÄT			##	Palauttaa kahden päivämäärän välissä olevien täysien työpäivien määrän.
-NOW			= NYT				##	Palauttaa kuluvan päivämäärän ja ajan järjestysnumeron.
-SECOND			= SEKUNNIT			##	Muuntaa järjestysluvun sekunneiksi.
-TIME			= AIKA				##	Palauttaa annetun kellonajan järjestysluvun.
-TIMEVALUE		= AIKA_ARVO			##	Muuntaa tekstimuodossa olevan kellonajan järjestysluvuksi.
-TODAY			= TÄMÄ.PÄIVÄ			##	Palauttaa kuluvan päivän päivämäärän järjestysluvun.
-WEEKDAY			= VIIKONPÄIVÄ			##	Muuntaa järjestysluvun viikonpäiväksi.
-WEEKNUM			= VIIKKO.NRO			##	Muuntaa järjestysluvun luvuksi, joka ilmaisee viikon järjestysluvun vuoden alusta laskettuna.
-WORKDAY			= TYÖPÄIVÄ			##	Palauttaa järjestysluvun päivämäärälle, joka sijaitsee annettujen työpäivien verran eteen tai taaksepäin.
-YEAR			= VUOSI				##	Muuntaa järjestysluvun vuosiksi.
-YEARFRAC		= VUOSI.OSA			##	Palauttaa määritettyjen päivämäärien (aloituspäivä ja lopetuspäivä) välisen osan vuodesta.
-
-
-##
-##	Engineering functions				Tekniset funktiot
-##
-BESSELI			= BESSELI			##	Palauttaa muunnetun Bessel-funktion In(x).
-BESSELJ			= BESSELJ			##	Palauttaa Bessel-funktion Jn(x).
-BESSELK			= BESSELK			##	Palauttaa muunnetun Bessel-funktion Kn(x).
-BESSELY			= BESSELY			##	Palauttaa Bessel-funktion Yn(x).
-BIN2DEC			= BINDES			##	Muuntaa binaariluvun desimaaliluvuksi.
-BIN2HEX			= BINHEKSA			##	Muuntaa binaariluvun heksadesimaaliluvuksi.
-BIN2OCT			= BINOKT			##	Muuntaa binaariluvun oktaaliluvuksi.
-COMPLEX			= KOMPLEKSI			##	Muuntaa reaali- ja imaginaariosien kertoimet kompleksiluvuksi.
-CONVERT			= MUUNNA			##	Muuntaa luvun toisen mittajärjestelmän mukaiseksi.
-DEC2BIN			= DESBIN			##	Muuntaa desimaaliluvun binaariluvuksi.
-DEC2HEX			= DESHEKSA			##	Muuntaa kymmenjärjestelmän luvun heksadesimaaliluvuksi.
-DEC2OCT			= DESOKT			##	Muuntaa kymmenjärjestelmän luvun oktaaliluvuksi.
-DELTA			= SAMA.ARVO			##	Tarkistaa, ovatko kaksi arvoa yhtä suuria.
-ERF			= VIRHEFUNKTIO			##	Palauttaa virhefunktion.
-ERFC			= VIRHEFUNKTIO.KOMPLEMENTTI	##	Palauttaa komplementtivirhefunktion.
-GESTEP			= RAJA				##	Testaa, onko luku suurempi kuin kynnysarvo.
-HEX2BIN			= HEKSABIN			##	Muuntaa heksadesimaaliluvun binaariluvuksi.
-HEX2DEC			= HEKSADES			##	Muuntaa heksadesimaaliluvun desimaaliluvuksi.
-HEX2OCT			= HEKSAOKT			##	Muuntaa heksadesimaaliluvun oktaaliluvuksi.
-IMABS			= KOMPLEKSI.ITSEISARVO		##	Palauttaa kompleksiluvun itseisarvon (moduluksen).
-IMAGINARY		= KOMPLEKSI.IMAG		##	Palauttaa kompleksiluvun imaginaariosan kertoimen.
-IMARGUMENT		= KOMPLEKSI.ARG			##	Palauttaa theeta-argumentin, joka on radiaaneina annettu kulma.
-IMCONJUGATE		= KOMPLEKSI.KONJ		##	Palauttaa kompleksiluvun konjugaattiluvun.
-IMCOS			= KOMPLEKSI.COS			##	Palauttaa kompleksiluvun kosinin.
-IMDIV			= KOMPLEKSI.OSAM		##	Palauttaa kahden kompleksiluvun osamäärän.
-IMEXP			= KOMPLEKSI.EKSP		##	Palauttaa kompleksiluvun eksponentin.
-IMLN			= KOMPLEKSI.LN			##	Palauttaa kompleksiluvun luonnollisen logaritmin.
-IMLOG10			= KOMPLEKSI.LOG10		##	Palauttaa kompleksiluvun kymmenkantaisen logaritmin.
-IMLOG2			= KOMPLEKSI.LOG2		##	Palauttaa kompleksiluvun kaksikantaisen logaritmin.
-IMPOWER			= KOMPLEKSI.POT			##	Palauttaa kokonaislukupotenssiin korotetun kompleksiluvun.
-IMPRODUCT		= KOMPLEKSI.TULO		##	Palauttaa kompleksilukujen tulon.
-IMREAL			= KOMPLEKSI.REAALI		##	Palauttaa kompleksiluvun reaaliosan kertoimen.
-IMSIN			= KOMPLEKSI.SIN			##	Palauttaa kompleksiluvun sinin.
-IMSQRT			= KOMPLEKSI.NELIÖJ		##	Palauttaa kompleksiluvun neliöjuuren.
-IMSUB			= KOMPLEKSI.EROTUS		##	Palauttaa kahden kompleksiluvun erotuksen.
-IMSUM			= KOMPLEKSI.SUM			##	Palauttaa kompleksilukujen summan.
-OCT2BIN			= OKTBIN			##	Muuntaa oktaaliluvun binaariluvuksi.
-OCT2DEC			= OKTDES			##	Muuntaa oktaaliluvun desimaaliluvuksi.
-OCT2HEX			= OKTHEKSA			##	Muuntaa oktaaliluvun heksadesimaaliluvuksi.
-
-
-##
-##	Financial functions				Rahoitusfunktiot   
-##
-ACCRINT			= KERTYNYT.KORKO		##	Laskee arvopaperille kertyneen koron, kun korko kertyy säännöllisin väliajoin.
-ACCRINTM		= KERTYNYT.KORKO.LOPUSSA	##	Laskee arvopaperille kertyneen koron, kun korko maksetaan eräpäivänä.
-AMORDEGRC		= AMORDEGRC			##	Laskee kunkin laskentakauden poiston poistokerrointa käyttämällä.
-AMORLINC		= AMORLINC			##	Palauttaa kunkin laskentakauden poiston.
-COUPDAYBS		= KORKOPÄIVÄT.ALUSTA		##	Palauttaa koronmaksukauden aloituspäivän ja tilityspäivän välisen ajanjakson päivien määrän.
-COUPDAYS		= KORKOPÄIVÄT			##	Palauttaa päivien määrän koronmaksukaudelta, johon tilityspäivä kuuluu.
-COUPDAYSNC		= KORKOPÄIVÄT.SEURAAVA		##	Palauttaa tilityspäivän ja seuraavan koronmaksupäivän välisen ajanjakson päivien määrän.
-COUPNCD			= KORKOMAKSU.SEURAAVA		##	Palauttaa tilityspäivän jälkeisen seuraavan koronmaksupäivän.
-COUPNUM			= KORKOPÄIVÄJAKSOT		##	Palauttaa arvopaperin ostopäivän ja erääntymispäivän välisten koronmaksupäivien määrän.
-COUPPCD			= KORKOPÄIVÄ.EDELLINEN		##	Palauttaa tilityspäivää edeltävän koronmaksupäivän.
-CUMIPMT			= MAKSETTU.KORKO		##	Palauttaa kahden jakson välisenä aikana kertyneen koron.
-CUMPRINC		= MAKSETTU.LYHENNYS		##	Palauttaa lainalle kahden jakson välisenä aikana kertyneen lyhennyksen.
-DB			= DB				##	Palauttaa kauden kirjanpidollisen poiston amerikkalaisen DB-menetelmän (Fixed-declining balance) mukaan.
-DDB			= DDB				##	Palauttaa kauden kirjanpidollisen poiston amerikkalaisen DDB-menetelmän (Double-Declining Balance) tai jonkin muun määrittämäsi menetelmän mukaan.
-DISC			= DISKONTTOKORKO		##	Palauttaa arvopaperin diskonttokoron.
-DOLLARDE		= VALUUTTA.DES			##	Muuntaa murtolukuna ilmoitetun valuuttamäärän desimaaliluvuksi.
-DOLLARFR		= VALUUTTA.MURTO		##	Muuntaa desimaalilukuna ilmaistun valuuttamäärän murtoluvuksi.
-DURATION		= KESTO				##	Palauttaa keston arvopaperille, jonka koronmaksu tapahtuu säännöllisesti.
-EFFECT			= KORKO.EFEKT			##	Palauttaa todellisen vuosikoron.
-FV			= TULEVA.ARVO			##	Palauttaa sijoituksen tulevan arvon.
-FVSCHEDULE		= TULEVA.ARVO.ERIKORKO		##	Palauttaa pääoman tulevan arvon, kun pääomalle on kertynyt korkoa vaihtelevasti.
-INTRATE			= KORKO.ARVOPAPERI		##	Palauttaa arvopaperin korkokannan täysin sijoitetulle arvopaperille.
-IPMT			= IPMT				##	Laskee sijoitukselle tai lainalle tiettynä ajanjaksona kertyvän koron.
-IRR			= SISÄINEN.KORKO		##	Laskee sisäisen korkokannan kassavirrasta muodostuvalle sarjalle.
-ISPMT			= ONMAKSU			##	Laskee sijoituksen maksetun koron tietyllä jaksolla.
-MDURATION		= KESTO.MUUNN			##	Palauttaa muunnetun Macauley-keston arvopaperille, jonka oletettu nimellisarvo on 100 euroa.
-MIRR			= MSISÄINEN			##	Palauttaa sisäisen korkokannan, kun positiivisten ja negatiivisten kassavirtojen rahoituskorko on erilainen.
-NOMINAL			= KORKO.VUOSI			##	Palauttaa vuosittaisen nimelliskoron.
-NPER			= NJAKSO			##	Palauttaa sijoituksen jaksojen määrän.
-NPV			= NNA				##	Palauttaa sijoituksen nykyarvon toistuvista kassavirroista muodostuvan sarjan ja diskonttokoron perusteella.
-ODDFPRICE		= PARITON.ENS.NIMELLISARVO	##	Palauttaa arvopaperin hinnan tilanteessa, jossa ensimmäinen jakso on pariton.
-ODDFYIELD		= PARITON.ENS.TUOTTO		##	Palauttaa arvopaperin tuoton tilanteessa, jossa ensimmäinen jakso on pariton.
-ODDLPRICE		= PARITON.VIIM.NIMELLISARVO	##	Palauttaa arvopaperin hinnan tilanteessa, jossa viimeinen jakso on pariton.
-ODDLYIELD		= PARITON.VIIM.TUOTTO		##	Palauttaa arvopaperin tuoton tilanteessa, jossa viimeinen jakso on pariton.
-PMT			= MAKSU				##	Palauttaa annuiteetin kausittaisen maksuerän.
-PPMT			= PPMT				##	Laskee sijoitukselle tai lainalle tiettynä ajanjaksona maksettavan lyhennyksen.
-PRICE			= HINTA				##	Palauttaa hinnan 100 euron nimellisarvoa kohden arvopaperille, jonka korko maksetaan säännöllisin väliajoin.
-PRICEDISC		= HINTA.DISK			##	Palauttaa diskontatun arvopaperin hinnan 100 euron nimellisarvoa kohden.
-PRICEMAT		= HINTA.LUNASTUS		##	Palauttaa hinnan 100 euron nimellisarvoa kohden arvopaperille, jonka korko maksetaan erääntymispäivänä.
-PV			= NA				##	Palauttaa sijoituksen nykyarvon.
-RATE			= KORKO				##	Palauttaa annuiteetin kausittaisen korkokannan.
-RECEIVED		= SAATU.HINTA			##	Palauttaa arvopaperin tuoton erääntymispäivänä kokonaan maksetulle sijoitukselle.
-SLN			= STP				##	Palauttaa sijoituksen tasapoiston yhdeltä jaksolta.
-SYD			= VUOSIPOISTO			##	Palauttaa sijoituksen vuosipoiston annettuna kautena amerikkalaisen SYD-menetelmän (Sum-of-Year's Digits) avulla.
-TBILLEQ			= OBLIG.TUOTTOPROS		##	Palauttaa valtion obligaation tuoton vastaavana joukkovelkakirjan tuottona.
-TBILLPRICE		= OBLIG.HINTA			##	Palauttaa obligaation hinnan 100 euron nimellisarvoa kohden.
-TBILLYIELD		= OBLIG.TUOTTO			##	Palauttaa obligaation tuoton.
-VDB			= VDB				##	Palauttaa annetun kauden tai kauden osan kirjanpidollisen poiston amerikkalaisen DB-menetelmän (Fixed-declining balance) mukaan.
-XIRR			= SISÄINEN.KORKO.JAKSOTON	##	Palauttaa sisäisen korkokannan kassavirtojen sarjoille, jotka eivät välttämättä ole säännöllisiä.
-XNPV			= NNA.JAKSOTON			##	Palauttaa nettonykyarvon kassavirtasarjalle, joka ei välttämättä ole kausittainen.
-YIELD			= TUOTTO			##	Palauttaa tuoton arvopaperille, jonka korko maksetaan säännöllisin väliajoin.
-YIELDDISC		= TUOTTO.DISK			##	Palauttaa diskontatun arvopaperin, kuten obligaation, vuosittaisen tuoton.
-YIELDMAT		= TUOTTO.ERÄP			##	Palauttaa erääntymispäivänään korkoa tuottavan arvopaperin vuosittaisen tuoton.
-
-
-##
-##	Information functions				Erikoisfunktiot
-##
-CELL			= SOLU				##	Palauttaa tietoja solun muotoilusta, sijainnista ja sisällöstä.
-ERROR.TYPE		= VIRHEEN.LAJI			##	Palauttaa virhetyyppiä vastaavan luvun.
-INFO			= KUVAUS			##	Palauttaa tietoja nykyisestä käyttöympäristöstä.
-ISBLANK			= ONTYHJÄ			##	Palauttaa arvon TOSI, jos arvo on tyhjä.
-ISERR			= ONVIRH			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa virhearvo paitsi arvo #PUUTTUU!.
-ISERROR			= ONVIRHE			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa virhearvo.
-ISEVEN			= ONPARILLINEN			##	Palauttaa arvon TOSI, jos arvo on parillinen.
-ISLOGICAL		= ONTOTUUS			##	Palauttaa arvon TOSI, jos arvo on mikä tahansa looginen arvo.
-ISNA			= ONPUUTTUU			##	Palauttaa arvon TOSI, jos virhearvo on #PUUTTUU!.
-ISNONTEXT		= ONEI_TEKSTI			##	Palauttaa arvon TOSI, jos arvo ei ole teksti.
-ISNUMBER		= ONLUKU			##	Palauttaa arvon TOSI, jos arvo on luku.
-ISODD			= ONPARITON			##	Palauttaa arvon TOSI, jos arvo on pariton.
-ISREF			= ONVIITT			##	Palauttaa arvon TOSI, jos arvo on viittaus.
-ISTEXT			= ONTEKSTI			##	Palauttaa arvon TOSI, jos arvo on teksti.
-N			= N				##	Palauttaa arvon luvuksi muunnettuna.
-NA			= PUUTTUU			##	Palauttaa virhearvon #PUUTTUU!.
-TYPE			= TYYPPI			##	Palauttaa luvun, joka ilmaisee arvon tietotyypin.
-
-
-##
-##	Logical functions				Loogiset funktiot
-##
-AND			= JA				##	Palauttaa arvon TOSI, jos kaikkien argumenttien arvo on TOSI.
-FALSE			= EPÄTOSI			##	Palauttaa totuusarvon EPÄTOSI.
-IF			= JOS				##	Määrittää suoritettavan loogisen testin.
-IFERROR			= JOSVIRHE			##	Palauttaa määrittämäsi arvon, jos kaavan tulos on virhe; muussa tapauksessa palauttaa kaavan tuloksen.
-NOT			= EI				##	Kääntää argumentin loogisen arvon.
-OR			= TAI				##	Palauttaa arvon TOSI, jos minkä tahansa argumentin arvo on TOSI.
-TRUE			= TOSI				##	Palauttaa totuusarvon TOSI.
-
-
-##
-##	Lookup and reference functions			Haku- ja viitefunktiot
-##
-ADDRESS			= OSOITE			##	Palauttaa laskentataulukon soluun osoittavan viittauksen tekstinä.
-AREAS			= ALUEET			##	Palauttaa viittauksessa olevien alueiden määrän.
-CHOOSE			= VALITSE.INDEKSI		##	Valitsee arvon arvoluettelosta.
-COLUMN			= SARAKE			##	Palauttaa viittauksen sarakenumeron.
-COLUMNS			= SARAKKEET			##	Palauttaa viittauksessa olevien sarakkeiden määrän.
-HLOOKUP			= VHAKU				##	Suorittaa haun matriisin ylimmältä riviltä ja palauttaa määritetyn solun arvon.
-HYPERLINK		= HYPERLINKKI			##	Luo pikakuvakkeen tai tekstin, joka avaa verkkopalvelimeen, intranetiin tai Internetiin tallennetun tiedoston.
-INDEX			= INDEKSI			##	Valitsee arvon viittauksesta tai matriisista indeksin mukaan.
-INDIRECT		= EPÄSUORA			##	Palauttaa tekstiarvona ilmaistun viittauksen.
-LOOKUP			= HAKU				##	Etsii arvoja vektorista tai matriisista.
-MATCH			= VASTINE			##	Etsii arvoja viittauksesta tai matriisista.
-OFFSET			= SIIRTYMÄ			##	Palauttaa annetun viittauksen siirtymän.
-ROW			= RIVI				##	Palauttaa viittauksen rivinumeron.
-ROWS			= RIVIT				##	Palauttaa viittauksessa olevien rivien määrän.
-RTD			= RTD				##	Noutaa COM-automaatiota (automaatio: Tapa käsitellä sovelluksen objekteja toisesta sovelluksesta tai kehitystyökalusta. Automaatio, jota aiemmin kutsuttiin OLE-automaatioksi, on teollisuusstandardi ja COM-mallin (Component Object Model) ominaisuus.) tukevasta ohjelmasta reaaliaikaisia tietoja.
-TRANSPOSE		= TRANSPONOI			##	Palauttaa matriisin käänteismatriisin.
-VLOOKUP			= PHAKU				##	Suorittaa haun matriisin ensimmäisestä sarakkeesta ja palauttaa rivillä olevan solun arvon.
-
-
-##
-##	Math and trigonometry functions			Matemaattiset ja trigonometriset funktiot
-##
-ABS			= ITSEISARVO			##	Palauttaa luvun itseisarvon.
-ACOS			= ACOS				##	Palauttaa luvun arkuskosinin.
-ACOSH			= ACOSH				##	Palauttaa luvun käänteisen hyperbolisen kosinin.
-ASIN			= ASIN				##	Palauttaa luvun arkussinin.
-ASINH			= ASINH				##	Palauttaa luvun käänteisen hyperbolisen sinin.
-ATAN			= ATAN				##	Palauttaa luvun arkustangentin.
-ATAN2			= ATAN2				##	Palauttaa arkustangentin x- ja y-koordinaatin perusteella.
-ATANH			= ATANH				##	Palauttaa luvun käänteisen hyperbolisen tangentin.
-CEILING			= PYÖRISTÄ.KERR.YLÖS		##	Pyöristää luvun lähimpään kokonaislukuun tai tarkkuusargumentin lähimpään kerrannaiseen.
-COMBIN			= KOMBINAATIO			##	Palauttaa mahdollisten kombinaatioiden määrän annetulle objektien määrälle.
-COS			= COS				##	Palauttaa luvun kosinin.
-COSH			= COSH				##	Palauttaa luvun hyperbolisen kosinin.
-DEGREES			= ASTEET			##	Muuntaa radiaanit asteiksi.
-EVEN			= PARILLINEN			##	Pyöristää luvun ylöspäin lähimpään parilliseen kokonaislukuun.
-EXP			= EKSPONENTTI			##	Palauttaa e:n korotettuna annetun luvun osoittamaan potenssiin.
-FACT			= KERTOMA			##	Palauttaa luvun kertoman.
-FACTDOUBLE		= KERTOMA.OSA			##	Palauttaa luvun osakertoman.
-FLOOR			= PYÖRISTÄ.KERR.ALAS		##	Pyöristää luvun alaspäin (nollaa kohti).
-GCD			= SUURIN.YHT.TEKIJÄ		##	Palauttaa suurimman yhteisen tekijän.
-INT			= KOKONAISLUKU			##	Pyöristää luvun alaspäin lähimpään kokonaislukuun.
-LCM			= PIENIN.YHT.JAETTAVA		##	Palauttaa pienimmän yhteisen tekijän.
-LN			= LUONNLOG			##	Palauttaa luvun luonnollisen logaritmin.
-LOG			= LOG				##	Laskee luvun logaritmin käyttämällä annettua kantalukua.
-LOG10			= LOG10				##	Palauttaa luvun kymmenkantaisen logaritmin.
-MDETERM			= MDETERM			##	Palauttaa matriisin matriisideterminantin.
-MINVERSE		= MKÄÄNTEINEN			##	Palauttaa matriisin käänteismatriisin.
-MMULT			= MKERRO			##	Palauttaa kahden matriisin tulon.
-MOD			= JAKOJ				##	Palauttaa jakolaskun jäännöksen.
-MROUND			= PYÖRISTÄ.KERR			##	Palauttaa luvun pyöristettynä annetun luvun kerrannaiseen.
-MULTINOMIAL		= MULTINOMI			##	Palauttaa lukujoukon multinomin.
-ODD			= PARITON			##	Pyöristää luvun ylöspäin lähimpään parittomaan kokonaislukuun.
-PI			= PII				##	Palauttaa piin arvon.
-POWER			= POTENSSI			##	Palauttaa luvun korotettuna haluttuun potenssiin.
-PRODUCT			= TULO				##	Kertoo annetut argumentit.
-QUOTIENT		= OSAMÄÄRÄ			##	Palauttaa osamäärän kokonaislukuosan.
-RADIANS			= RADIAANIT			##	Muuntaa asteet radiaaneiksi.
-RAND			= SATUNNAISLUKU			##	Palauttaa satunnaisluvun väliltä 0–1.
-RANDBETWEEN		= SATUNNAISLUKU.VÄLILTÄ		##	Palauttaa satunnaisluvun määritettyjen lukujen väliltä.
-ROMAN			= ROMAN				##	Muuntaa arabialaisen numeron tekstimuotoiseksi roomalaiseksi numeroksi.
-ROUND			= PYÖRISTÄ			##	Pyöristää luvun annettuun määrään desimaaleja.
-ROUNDDOWN		= PYÖRISTÄ.DES.ALAS		##	Pyöristää luvun alaspäin (nollaa kohti).
-ROUNDUP			= PYÖRISTÄ.DES.YLÖS		##	Pyöristää luvun ylöspäin (poispäin nollasta).
-SERIESSUM		= SARJA.SUMMA			##	Palauttaa kaavaan perustuvan potenssisarjan arvon.
-SIGN			= ETUMERKKI			##	Palauttaa luvun etumerkin.
-SIN			= SIN				##	Palauttaa annetun kulman sinin.
-SINH			= SINH				##	Palauttaa luvun hyperbolisen sinin.
-SQRT			= NELIÖJUURI			##	Palauttaa positiivisen neliöjuuren.
-SQRTPI			= NELIÖJUURI.PII		##	Palauttaa tulon (luku * pii) neliöjuuren.
-SUBTOTAL		= VÄLISUMMA			##	Palauttaa luettelon tai tietokannan välisumman.
-SUM			= SUMMA				##	Laskee yhteen annetut argumentit.
-SUMIF			= SUMMA.JOS			##	Laskee ehdot täyttävien solujen summan.
-SUMIFS			= SUMMA.JOS.JOUKKO		##	Laskee yhteen solualueen useita ehtoja vastaavat solut.
-SUMPRODUCT		= TULOJEN.SUMMA			##	Palauttaa matriisin toisiaan vastaavien osien tulojen summan.
-SUMSQ			= NELIÖSUMMA			##	Palauttaa argumenttien neliöiden summan.
-SUMX2MY2		= NELIÖSUMMIEN.EROTUS		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen laskettujen neliösummien erotuksen.
-SUMX2PY2		= NELIÖSUMMIEN.SUMMA		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen neliösummien summan.
-SUMXMY2			= EROTUSTEN.NELIÖSUMMA		##	Palauttaa kahden matriisin toisiaan vastaavien arvojen erotusten neliösumman.
-TAN			= TAN				##	Palauttaa luvun tangentin.
-TANH			= TANH				##	Palauttaa luvun hyperbolisen tangentin.
-TRUNC			= KATKAISE			##	Katkaisee luvun kokonaisluvuksi.
-
-
-##
-##	Statistical functions				Tilastolliset funktiot
-##
-AVEDEV			= KESKIPOIKKEAMA		##	Palauttaa hajontojen itseisarvojen keskiarvon.
-AVERAGE			= KESKIARVO			##	Palauttaa argumenttien keskiarvon.
-AVERAGEA		= KESKIARVOA			##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, keskiarvon.
-AVERAGEIF		= KESKIARVO.JOS			##	Palauttaa alueen niiden solujen keskiarvon (aritmeettisen keskiarvon), jotka täyttävät annetut ehdot.
-AVERAGEIFS		= KESKIARVO.JOS.JOUKKO		##	Palauttaa niiden solujen keskiarvon (aritmeettisen keskiarvon), jotka vastaavat useita ehtoja.
-BETADIST		= BEETAJAKAUMA			##	Palauttaa kumulatiivisen beetajakaumafunktion arvon.
-BETAINV			= BEETAJAKAUMA.KÄÄNT		##	Palauttaa määritetyn beetajakauman käänteisen kumulatiivisen jakaumafunktion arvon.
-BINOMDIST		= BINOMIJAKAUMA			##	Palauttaa yksittäisen termin binomijakaumatodennäköisyyden.
-CHIDIST			= CHIJAKAUMA			##	Palauttaa yksisuuntaisen chi-neliön jakauman todennäköisyyden.
-CHIINV			= CHIJAKAUMA.KÄÄNT		##	Palauttaa yksisuuntaisen chi-neliön jakauman todennäköisyyden käänteisarvon.
-CHITEST			= CHITESTI			##	Palauttaa riippumattomuustestin tuloksen.
-CONFIDENCE		= LUOTTAMUSVÄLI			##	Palauttaa luottamusvälin populaation keskiarvolle.
-CORREL			= KORRELAATIO			##	Palauttaa kahden arvojoukon korrelaatiokertoimen.
-COUNT			= LASKE				##	Laskee argumenttiluettelossa olevien lukujen määrän.
-COUNTA			= LASKE.A			##	Laskee argumenttiluettelossa olevien arvojen määrän.
-COUNTBLANK		= LASKE.TYHJÄT			##	Laskee alueella olevien tyhjien solujen määrän.
-COUNTIF			= LASKE.JOS			##	Laskee alueella olevien sellaisten solujen määrän, joiden sisältö vastaa annettuja ehtoja.
-COUNTIFS		= LASKE.JOS.JOUKKO		##	Laskee alueella olevien sellaisten solujen määrän, joiden sisältö vastaa useita ehtoja.
-COVAR			= KOVARIANSSI			##	Palauttaa kovarianssin, joka on keskiarvo havaintoaineiston kunkin pisteparin poikkeamien tuloista.
-CRITBINOM		= BINOMIJAKAUMA.KRIT		##	Palauttaa pienimmän arvon, jossa binomijakauman kertymäfunktion arvo on pienempi tai yhtä suuri kuin vertailuarvo.
-DEVSQ			= OIKAISTU.NELIÖSUMMA		##	Palauttaa keskipoikkeamien neliösumman.
-EXPONDIST		= EKSPONENTIAALIJAKAUMA		##	Palauttaa eksponentiaalijakauman.
-FDIST			= FJAKAUMA			##	Palauttaa F-todennäköisyysjakauman.
-FINV			= FJAKAUMA.KÄÄNT		##	Palauttaa F-todennäköisyysjakauman käänteisfunktion.
-FISHER			= FISHER			##	Palauttaa Fisher-muunnoksen.
-FISHERINV		= FISHER.KÄÄNT			##	Palauttaa käänteisen Fisher-muunnoksen.
-FORECAST		= ENNUSTE			##	Palauttaa lineaarisen trendin arvon.
-FREQUENCY		= TAAJUUS			##	Palauttaa frekvenssijakautuman pystysuuntaisena matriisina.
-FTEST			= FTESTI			##	Palauttaa F-testin tuloksen.
-GAMMADIST		= GAMMAJAKAUMA			##	Palauttaa gammajakauman.
-GAMMAINV		= GAMMAJAKAUMA.KÄÄNT		##	Palauttaa käänteisen gammajakauman kertymäfunktion.
-GAMMALN			= GAMMALN			##	Palauttaa gammafunktion luonnollisen logaritmin G(x).
-GEOMEAN			= KESKIARVO.GEOM		##	Palauttaa geometrisen keskiarvon.
-GROWTH			= KASVU				##	Palauttaa eksponentiaalisen trendin arvon.
-HARMEAN			= KESKIARVO.HARM		##	Palauttaa harmonisen keskiarvon.
-HYPGEOMDIST		= HYPERGEOM.JAKAUMA		##	Palauttaa hypergeometrisen jakauman.
-INTERCEPT		= LEIKKAUSPISTE			##	Palauttaa lineaarisen regressiosuoran leikkauspisteen.
-KURT			= KURT				##	Palauttaa tietoalueen vinous-arvon eli huipukkuuden.
-LARGE			= SUURI				##	Palauttaa tietojoukon k:nneksi suurimman arvon.
-LINEST			= LINREGR			##	Palauttaa lineaarisen trendin parametrit.
-LOGEST			= LOGREGR			##	Palauttaa eksponentiaalisen trendin parametrit.
-LOGINV			= LOGNORM.JAKAUMA.KÄÄNT		##	Palauttaa lognormeeratun jakauman käänteisfunktion.
-LOGNORMDIST		= LOGNORM.JAKAUMA		##	Palauttaa lognormaalisen jakauman kertymäfunktion.
-MAX			= MAKS				##	Palauttaa suurimman arvon argumenttiluettelosta.
-MAXA			= MAKSA				##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, suurimman arvon.
-MEDIAN			= MEDIAANI			##	Palauttaa annettujen lukujen mediaanin.
-MIN			= MIN				##	Palauttaa pienimmän arvon argumenttiluettelosta.
-MINA			= MINA				##	Palauttaa argumenttien, mukaan lukien lukujen, tekstin ja loogisten arvojen, pienimmän arvon.
-MODE			= MOODI				##	Palauttaa tietojoukossa useimmin esiintyvän arvon.
-NEGBINOMDIST		= BINOMIJAKAUMA.NEG		##	Palauttaa negatiivisen binomijakauman.
-NORMDIST		= NORM.JAKAUMA			##	Palauttaa normaalijakauman kertymäfunktion.
-NORMINV			= NORM.JAKAUMA.KÄÄNT		##	Palauttaa käänteisen normaalijakauman kertymäfunktion.
-NORMSDIST		= NORM.JAKAUMA.NORMIT		##	Palauttaa normitetun normaalijakauman kertymäfunktion.
-NORMSINV		= NORM.JAKAUMA.NORMIT.KÄÄNT	##	Palauttaa normitetun normaalijakauman kertymäfunktion käänteisarvon.
-PEARSON			= PEARSON			##	Palauttaa Pearsonin tulomomenttikorrelaatiokertoimen.
-PERCENTILE		= PROSENTTIPISTE		##	Palauttaa alueen arvojen k:nnen prosenttipisteen.
-PERCENTRANK		= PROSENTTIJÄRJESTYS		##	Palauttaa tietojoukon arvon prosentuaalisen järjestysluvun.
-PERMUT			= PERMUTAATIO			##	Palauttaa mahdollisten permutaatioiden määrän annetulle objektien määrälle.
-POISSON			= POISSON			##	Palauttaa Poissonin todennäköisyysjakauman.
-PROB			= TODENNÄKÖISYYS		##	Palauttaa todennäköisyyden sille, että arvot ovat tietyltä väliltä.
-QUARTILE		= NELJÄNNES			##	Palauttaa tietoalueen neljänneksen.
-RANK			= ARVON.MUKAAN			##	Palauttaa luvun paikan lukuarvoluettelossa.
-RSQ			= PEARSON.NELIÖ			##	Palauttaa Pearsonin tulomomenttikorrelaatiokertoimen neliön.
-SKEW			= JAKAUMAN.VINOUS		##	Palauttaa jakauman vinouden.
-SLOPE			= KULMAKERROIN			##	Palauttaa lineaarisen regressiosuoran kulmakertoimen.
-SMALL			= PIENI				##	Palauttaa tietojoukon k:nneksi pienimmän arvon.
-STANDARDIZE		= NORMITA			##	Palauttaa normitetun arvon.
-STDEV			= KESKIHAJONTA			##	Laskee populaation keskihajonnan otoksen perusteella.
-STDEVA			= KESKIHAJONTAA			##	Laskee populaation keskihajonnan otoksen perusteella, mukaan lukien luvut, tekstin ja loogiset arvot.
-STDEVP			= KESKIHAJONTAP			##	Laskee normaalijakautuman koko populaation perusteella.
-STDEVPA			= KESKIHAJONTAPA		##	Laskee populaation keskihajonnan koko populaation perusteella, mukaan lukien luvut, tekstin ja totuusarvot.
-STEYX			= KESKIVIRHE			##	Palauttaa regression kutakin x-arvoa vastaavan ennustetun y-arvon keskivirheen.
-TDIST			= TJAKAUMA			##	Palauttaa t-jakautuman.
-TINV			= TJAKAUMA.KÄÄNT		##	Palauttaa käänteisen t-jakauman.
-TREND			= SUUNTAUS			##	Palauttaa lineaarisen trendin arvoja.
-TRIMMEAN		= KESKIARVO.TASATTU		##	Palauttaa tietojoukon tasatun keskiarvon.
-TTEST			= TTESTI			##	Palauttaa t-testiin liittyvän todennäköisyyden.
-VAR			= VAR				##	Arvioi populaation varianssia otoksen perusteella.
-VARA			= VARA				##	Laskee populaation varianssin otoksen perusteella, mukaan lukien luvut, tekstin ja loogiset arvot.
-VARP			= VARP				##	Laskee varianssin koko populaation perusteella.
-VARPA			= VARPA				##	Laskee populaation varianssin koko populaation perusteella, mukaan lukien luvut, tekstin ja totuusarvot.
-WEIBULL			= WEIBULL			##	Palauttaa Weibullin jakauman.
-ZTEST			= ZTESTI			##	Palauttaa z-testin yksisuuntaisen todennäköisyysarvon.
-
-
-##
-##	Text functions					Tekstifunktiot
-##
-ASC			= ASC				##	Muuntaa merkkijonossa olevat englanninkieliset DBCS- tai katakana-merkit SBCS-merkeiksi.
-BAHTTEXT		= BAHTTEKSTI			##	Muuntaa luvun tekstiksi ß (baht) -valuuttamuotoa käyttämällä.
-CHAR			= MERKKI			##	Palauttaa koodin lukua vastaavan merkin.
-CLEAN			= SIIVOA			##	Poistaa tekstistä kaikki tulostumattomat merkit.
-CODE			= KOODI				##	Palauttaa tekstimerkkijonon ensimmäisen merkin numerokoodin.
-CONCATENATE		= KETJUTA			##	Yhdistää useat merkkijonot yhdeksi merkkijonoksi.
-DOLLAR			= VALUUTTA			##	Muuntaa luvun tekstiksi $ (dollari) -valuuttamuotoa käyttämällä.
-EXACT			= VERTAA			##	Tarkistaa, ovatko kaksi tekstiarvoa samanlaiset.
-FIND			= ETSI				##	Etsii tekstiarvon toisen tekstin sisältä (tunnistaa isot ja pienet kirjaimet).
-FINDB			= ETSIB				##	Etsii tekstiarvon toisen tekstin sisältä (tunnistaa isot ja pienet kirjaimet).
-FIXED			= KIINTEÄ			##	Muotoilee luvun tekstiksi, jossa on kiinteä määrä desimaaleja.
-JIS			= JIS				##	Muuntaa merkkijonossa olevat englanninkieliset SBCS- tai katakana-merkit DBCS-merkeiksi.
-LEFT			= VASEN				##	Palauttaa tekstiarvon vasemmanpuoliset merkit.
-LEFTB			= VASENB			##	Palauttaa tekstiarvon vasemmanpuoliset merkit.
-LEN			= PITUUS			##	Palauttaa tekstimerkkijonon merkkien määrän.
-LENB			= PITUUSB			##	Palauttaa tekstimerkkijonon merkkien määrän.
-LOWER			= PIENET			##	Muuntaa tekstin pieniksi kirjaimiksi.
-MID			= POIMI.TEKSTI			##	Palauttaa määritetyn määrän merkkejä merkkijonosta alkaen annetusta kohdasta.
-MIDB			= POIMI.TEKSTIB			##	Palauttaa määritetyn määrän merkkejä merkkijonosta alkaen annetusta kohdasta.
-PHONETIC		= FONEETTINEN			##	Hakee foneettiset (furigana) merkit merkkijonosta.
-PROPER			= ERISNIMI			##	Muuttaa merkkijonon kunkin sanan ensimmäisen kirjaimen isoksi.
-REPLACE			= KORVAA			##	Korvaa tekstissä olevat merkit.
-REPLACEB		= KORVAAB			##	Korvaa tekstissä olevat merkit.
-REPT			= TOISTA			##	Toistaa tekstin annetun määrän kertoja.
-RIGHT			= OIKEA				##	Palauttaa tekstiarvon oikeanpuoliset merkit.
-RIGHTB			= OIKEAB			##	Palauttaa tekstiarvon oikeanpuoliset merkit.
-SEARCH			= KÄY.LÄPI			##	Etsii tekstiarvon toisen tekstin sisältä (isot ja pienet kirjaimet tulkitaan samoiksi merkeiksi).
-SEARCHB			= KÄY.LÄPIB			##	Etsii tekstiarvon toisen tekstin sisältä (isot ja pienet kirjaimet tulkitaan samoiksi merkeiksi).
-SUBSTITUTE		= VAIHDA			##	Korvaa merkkijonossa olevan tekstin toisella.
-T			= T				##	Muuntaa argumentit tekstiksi.
-TEXT			= TEKSTI			##	Muotoilee luvun ja muuntaa sen tekstiksi.
-TRIM			= POISTA.VÄLIT			##	Poistaa välilyönnit tekstistä.
-UPPER			= ISOT				##	Muuntaa tekstin isoiksi kirjaimiksi.
-VALUE			= ARVO				##	Muuntaa tekstiargumentin luvuksi.
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/fr/config b/plugins/exportTypes/Excel/PHPExcel/locale/fr/config
deleted file mode 100755
index 16fa3c59a..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/fr/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #NUL!
-DIV0	= #DIV/0!
-VALUE	= #VALEUR!
-REF	= #REF!
-NAME	= #NOM?
-NUM	= #NOMBRE!
-NA	= #N/A
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/fr/functions b/plugins/exportTypes/Excel/PHPExcel/locale/fr/functions
deleted file mode 100755
index e8f11a585..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/fr/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Fonctions de complément et d’automatisation
-##
-GETPIVOTDATA		= LIREDONNEESTABCROISDYNAMIQUE	##	Renvoie les données stockées dans un rapport de tableau croisé dynamique.
-
-
-##
-##	Cube functions					Fonctions Cube
-##
-CUBEKPIMEMBER		= MEMBREKPICUBE			##	Renvoie un nom, une propriété et une mesure d’indicateur de performance clé et affiche le nom et la propriété dans la cellule. Un indicateur de performance clé est une mesure quantifiable, telle que la marge bénéficiaire brute mensuelle ou la rotation trimestrielle du personnel, utilisée pour évaluer les performances d’une entreprise.
-CUBEMEMBER		= MEMBRECUBE			##	Renvoie un membre ou un uplet dans une hiérarchie de cubes. Utilisez cette fonction pour valider l’existence du membre ou de l’uplet dans le cube.
-CUBEMEMBERPROPERTY	= PROPRIETEMEMBRECUBE		##	Renvoie la valeur d’une propriété de membre du cube. Utilisez cette fonction pour valider l’existence d’un nom de membre dans le cube et pour renvoyer la propriété spécifiée pour ce membre.
-CUBERANKEDMEMBER	= RANGMEMBRECUBE		##	Renvoie le nième membre ou le membre placé à un certain rang dans un ensemble. Utilisez cette fonction pour renvoyer un ou plusieurs éléments d’un ensemble, tels que les meilleurs vendeurs ou les 10 meilleurs étudiants.
-CUBESET			= JEUCUBE			##	Définit un ensemble calculé de membres ou d’uplets en envoyant une expression définie au cube sur le serveur qui crée l’ensemble et le renvoie à Microsoft Office Excel.
-CUBESETCOUNT		= NBJEUCUBE			##	Renvoie le nombre d’éléments dans un jeu.
-CUBEVALUE		= VALEURCUBE			##	Renvoie une valeur d’agrégation issue d’un cube.
-
-
-##
-##	Database functions				Fonctions de base de données
-##
-DAVERAGE		= BDMOYENNE			##	Renvoie la moyenne des entrées de base de données sélectionnées.
-DCOUNT			= BCOMPTE			##	Compte le nombre de cellules d’une base de données qui contiennent des nombres.
-DCOUNTA			= BDNBVAL			##	Compte les cellules non vides d’une base de données.
-DGET			= BDLIRE			##	Extrait d’une base de données un enregistrement unique répondant aux critères spécifiés.
-DMAX			= BDMAX				##	Renvoie la valeur maximale des entrées de base de données sélectionnées.
-DMIN			= BDMIN				##	Renvoie la valeur minimale des entrées de base de données sélectionnées.
-DPRODUCT		= BDPRODUIT			##	Multiplie les valeurs d’un champ particulier des enregistrements d’une base de données, qui répondent aux critères spécifiés.
-DSTDEV			= BDECARTYPE			##	Calcule l’écart type pour un échantillon d’entrées de base de données sélectionnées.
-DSTDEVP			= BDECARTYPEP			##	Calcule l’écart type pour l’ensemble d’une population d’entrées de base de données sélectionnées.
-DSUM			= BDSOMME			##	Ajoute les nombres dans la colonne de champ des enregistrements de la base de données, qui répondent aux critères.
-DVAR			= BDVAR				##	Calcule la variance pour un échantillon d’entrées de base de données sélectionnées.
-DVARP			= BDVARP			##	Calcule la variance pour l’ensemble d’une population d’entrées de base de données sélectionnées.
-
-
-##
-##	Date and time functions				Fonctions de date et d’heure
-##
-DATE			= DATE				##	Renvoie le numéro de série d’une date précise.
-DATEVALUE		= DATEVAL			##	Convertit une date représentée sous forme de texte en numéro de série.
-DAY			= JOUR				##	Convertit un numéro de série en jour du mois.
-DAYS360			= JOURS360			##	Calcule le nombre de jours qui séparent deux dates sur la base d’une année de 360 jours.
-EDATE			= MOIS.DECALER			##	Renvoie le numéro séquentiel de la date qui représente une date spécifiée (l’argument date_départ), corrigée en plus ou en moins du nombre de mois indiqué.
-EOMONTH			= FIN.MOIS			##	Renvoie le numéro séquentiel de la date du dernier jour du mois précédant ou suivant la date_départ du nombre de mois indiqué.
-HOUR			= HEURE				##	Convertit un numéro de série en heure.
-MINUTE			= MINUTE			##	Convertit un numéro de série en minute.
-MONTH			= MOIS				##	Convertit un numéro de série en mois.
-NETWORKDAYS		= NB.JOURS.OUVRES		##	Renvoie le nombre de jours ouvrés entiers compris entre deux dates.
-NOW			= MAINTENANT			##	Renvoie le numéro de série de la date et de l’heure du jour.
-SECOND			= SECONDE			##	Convertit un numéro de série en seconde.
-TIME			= TEMPS				##	Renvoie le numéro de série d’une heure précise.
-TIMEVALUE		= TEMPSVAL			##	Convertit une date représentée sous forme de texte en numéro de série.
-TODAY			= AUJOURDHUI			##	Renvoie le numéro de série de la date du jour.
-WEEKDAY			= JOURSEM			##	Convertit un numéro de série en jour de la semaine.
-WEEKNUM			= NO.SEMAINE			##	Convertit un numéro de série en un numéro représentant l’ordre de la semaine dans l’année.
-WORKDAY			= SERIE.JOUR.OUVRE		##	Renvoie le numéro de série de la date avant ou après le nombre de jours ouvrés spécifiés.
-YEAR			= ANNEE				##	Convertit un numéro de série en année.
-YEARFRAC		= FRACTION.ANNEE		##	Renvoie la fraction de l’année représentant le nombre de jours entre la date de début et la date de fin.
-
-
-##
-##	Engineering functions				Fonctions d’ingénierie
-##
-BESSELI			= BESSELI			##	Renvoie la fonction Bessel modifiée In(x).
-BESSELJ			= BESSELJ			##	Renvoie la fonction Bessel Jn(x).
-BESSELK			= BESSELK			##	Renvoie la fonction Bessel modifiée Kn(x).
-BESSELY			= BESSELY			##	Renvoie la fonction Bessel Yn(x).
-BIN2DEC			= BINDEC			##	Convertit un nombre binaire en nombre décimal.
-BIN2HEX			= BINHEX			##	Convertit un nombre binaire en nombre hexadécimal.
-BIN2OCT			= BINOCT			##	Convertit un nombre binaire en nombre octal.
-COMPLEX			= COMPLEXE			##	Convertit des coefficients réel et imaginaire en un nombre complexe.
-CONVERT			= CONVERT			##	Convertit un nombre d’une unité de mesure à une autre.
-DEC2BIN			= DECBIN			##	Convertit un nombre décimal en nombre binaire.
-DEC2HEX			= DECHEX			##	Convertit un nombre décimal en nombre hexadécimal.
-DEC2OCT			= DECOCT			##	Convertit un nombre décimal en nombre octal.
-DELTA			= DELTA				##	Teste l’égalité de deux nombres.
-ERF			= ERF				##	Renvoie la valeur de la fonction d’erreur.
-ERFC			= ERFC				##	Renvoie la valeur de la fonction d’erreur complémentaire.
-GESTEP			= SUP.SEUIL			##	Teste si un nombre est supérieur à une valeur de seuil.
-HEX2BIN			= HEXBIN			##	Convertit un nombre hexadécimal en nombre binaire.
-HEX2DEC			= HEXDEC			##	Convertit un nombre hexadécimal en nombre décimal.
-HEX2OCT			= HEXOCT			##	Convertit un nombre hexadécimal en nombre octal.
-IMABS			= COMPLEXE.MODULE		##	Renvoie la valeur absolue (module) d’un nombre complexe.
-IMAGINARY		= COMPLEXE.IMAGINAIRE		##	Renvoie le coefficient imaginaire d’un nombre complexe.
-IMARGUMENT		= COMPLEXE.ARGUMENT		##	Renvoie l’argument thêta, un angle exprimé en radians.
-IMCONJUGATE		= COMPLEXE.CONJUGUE		##	Renvoie le nombre complexe conjugué d’un nombre complexe.
-IMCOS			= IMCOS				##	Renvoie le cosinus d’un nombre complexe.
-IMDIV			= COMPLEXE.DIV			##	Renvoie le quotient de deux nombres complexes.
-IMEXP			= COMPLEXE.EXP			##	Renvoie la fonction exponentielle d’un nombre complexe.
-IMLN			= COMPLEXE.LN			##	Renvoie le logarithme népérien d’un nombre complexe.
-IMLOG10			= COMPLEXE.LOG10		##	Calcule le logarithme en base 10 d’un nombre complexe.
-IMLOG2			= COMPLEXE.LOG2			##	Calcule le logarithme en base 2 d’un nombre complexe.
-IMPOWER			= COMPLEXE.PUISSANCE		##	Renvoie un nombre complexe élevé à une puissance entière.
-IMPRODUCT		= COMPLEXE.PRODUIT		##	Renvoie le produit de plusieurs nombres complexes.
-IMREAL			= COMPLEXE.REEL			##	Renvoie le coefficient réel d’un nombre complexe.
-IMSIN			= COMPLEXE.SIN			##	Renvoie le sinus d’un nombre complexe.
-IMSQRT			= COMPLEXE.RACINE		##	Renvoie la racine carrée d’un nombre complexe.
-IMSUB			= COMPLEXE.DIFFERENCE		##	Renvoie la différence entre deux nombres complexes.
-IMSUM			= COMPLEXE.SOMME		##	Renvoie la somme de plusieurs nombres complexes.
-OCT2BIN			= OCTBIN			##	Convertit un nombre octal en nombre binaire.
-OCT2DEC			= OCTDEC			##	Convertit un nombre octal en nombre décimal.
-OCT2HEX			= OCTHEX			##	Convertit un nombre octal en nombre hexadécimal.
-
-
-##
-##	Financial functions				Fonctions financières
-##
-ACCRINT			= INTERET.ACC			##	Renvoie l’intérêt couru non échu d’un titre dont l’intérêt est perçu périodiquement.
-ACCRINTM		= INTERET.ACC.MAT		##	Renvoie l’intérêt couru non échu d’un titre dont l’intérêt est perçu à l’échéance.
-AMORDEGRC		= AMORDEGRC			##	Renvoie l’amortissement correspondant à chaque période comptable en utilisant un coefficient d’amortissement.
-AMORLINC		= AMORLINC			##	Renvoie l’amortissement d’un bien à la fin d’une période fiscale donnée.
-COUPDAYBS		= NB.JOURS.COUPON.PREC		##	Renvoie le nombre de jours entre le début de la période de coupon et la date de liquidation.
-COUPDAYS		= NB.JOURS.COUPONS		##	Renvoie le nombre de jours pour la période du coupon contenant la date de liquidation.
-COUPDAYSNC		= NB.JOURS.COUPON.SUIV		##	Renvoie le nombre de jours entre la date de liquidation et la date du coupon suivant la date de liquidation.
-COUPNCD			= DATE.COUPON.SUIV		##	Renvoie la première date de coupon ultérieure à la date de règlement.
-COUPNUM			= NB.COUPONS			##	Renvoie le nombre de coupons dus entre la date de règlement et la date d’échéance.
-COUPPCD			= DATE.COUPON.PREC		##	Renvoie la date de coupon précédant la date de règlement.
-CUMIPMT			= CUMUL.INTER			##	Renvoie l’intérêt cumulé payé sur un emprunt entre deux périodes.
-CUMPRINC		= CUMUL.PRINCPER		##	Renvoie le montant cumulé des remboursements du capital d’un emprunt effectués entre deux périodes.
-DB			= DB				##	Renvoie l’amortissement d’un bien pour une période spécifiée en utilisant la méthode de l’amortissement dégressif à taux fixe.
-DDB			= DDB				##	Renvoie l’amortissement d’un bien pour toute période spécifiée, en utilisant la méthode de l’amortissement dégressif à taux double ou selon un coefficient à spécifier.
-DISC			= TAUX.ESCOMPTE			##	Calcule le taux d’escompte d’une transaction.
-DOLLARDE		= PRIX.DEC			##	Convertit un prix en euros, exprimé sous forme de fraction, en un prix en euros exprimé sous forme de nombre décimal.
-DOLLARFR		= PRIX.FRAC			##	Convertit un prix en euros, exprimé sous forme de nombre décimal, en un prix en euros exprimé sous forme de fraction.
-DURATION		= DUREE				##	Renvoie la durée, en années, d’un titre dont l’intérêt est perçu périodiquement.
-EFFECT			= TAUX.EFFECTIF			##	Renvoie le taux d’intérêt annuel effectif.
-FV			= VC				##	Renvoie la valeur future d’un investissement.
-FVSCHEDULE		= VC.PAIEMENTS			##	Calcule la valeur future d’un investissement en appliquant une série de taux d’intérêt composites.
-INTRATE			= TAUX.INTERET			##	Affiche le taux d’intérêt d’un titre totalement investi.
-IPMT			= INTPER			##	Calcule le montant des intérêts d’un investissement pour une période donnée.
-IRR			= TRI				##	Calcule le taux de rentabilité interne d’un investissement pour une succession de trésoreries.
-ISPMT			= ISPMT				##	Calcule le montant des intérêts d’un investissement pour une période donnée.
-MDURATION		= DUREE.MODIFIEE		##	Renvoie la durée de Macauley modifiée pour un titre ayant une valeur nominale hypothétique de 100_euros.
-MIRR			= TRIM				##	Calcule le taux de rentabilité interne lorsque les paiements positifs et négatifs sont financés à des taux différents.
-NOMINAL			= TAUX.NOMINAL			##	Calcule le taux d’intérêt nominal annuel.
-NPER			= NPM				##	Renvoie le nombre de versements nécessaires pour rembourser un emprunt.
-NPV			= VAN				##	Calcule la valeur actuelle nette d’un investissement basé sur une série de décaissements et un taux d’escompte.
-ODDFPRICE		= PRIX.PCOUPON.IRREG		##	Renvoie le prix par tranche de valeur nominale de 100 euros d’un titre dont la première période de coupon est irrégulière.
-ODDFYIELD		= REND.PCOUPON.IRREG		##	Renvoie le taux de rendement d’un titre dont la première période de coupon est irrégulière.
-ODDLPRICE		= PRIX.DCOUPON.IRREG		##	Renvoie le prix par tranche de valeur nominale de 100 euros d’un titre dont la première période de coupon est irrégulière.
-ODDLYIELD		= REND.DCOUPON.IRREG		##	Renvoie le taux de rendement d’un titre dont la dernière période de coupon est irrégulière.
-PMT			= VPM				##	Calcule le paiement périodique d’un investissement donné.
-PPMT			= PRINCPER			##	Calcule, pour une période donnée, la part de remboursement du principal d’un investissement.
-PRICE			= PRIX.TITRE			##	Renvoie le prix d’un titre rapportant des intérêts périodiques, pour une valeur nominale de 100 euros.
-PRICEDISC		= VALEUR.ENCAISSEMENT		##	Renvoie la valeur d’encaissement d’un escompte commercial, pour une valeur nominale de 100 euros.
-PRICEMAT		= PRIX.TITRE.ECHEANCE		##	Renvoie le prix d’un titre dont la valeur nominale est 100 euros et qui rapporte des intérêts à l’échéance.
-PV			= PV				##	Calcule la valeur actuelle d’un investissement.
-RATE			= TAUX				##	Calcule le taux d’intérêt par période pour une annuité.
-RECEIVED		= VALEUR.NOMINALE		##	Renvoie la valeur nominale à échéance d’un effet de commerce.
-SLN			= AMORLIN			##	Calcule l’amortissement linéaire d’un bien pour une période donnée.
-SYD			= SYD				##	Calcule l’amortissement d’un bien pour une période donnée sur la base de la méthode américaine Sum-of-Years Digits (amortissement dégressif à taux décroissant appliqué à une valeur constante).
-TBILLEQ			= TAUX.ESCOMPTE.R		##	Renvoie le taux d’escompte rationnel d’un bon du Trésor.
-TBILLPRICE		= PRIX.BON.TRESOR		##	Renvoie le prix d’un bon du Trésor d’une valeur nominale de 100 euros.
-TBILLYIELD		= RENDEMENT.BON.TRESOR		##	Calcule le taux de rendement d’un bon du Trésor.
-VDB			= VDB				##	Renvoie l’amortissement d’un bien pour une période spécifiée ou partielle en utilisant une méthode de l’amortissement dégressif à taux fixe.
-XIRR			= TRI.PAIEMENTS			##	Calcule le taux de rentabilité interne d’un ensemble de paiements non périodiques.
-XNPV			= VAN.PAIEMENTS			##	Renvoie la valeur actuelle nette d’un ensemble de paiements non périodiques.
-YIELD			= RENDEMENT.TITRE		##	Calcule le rendement d’un titre rapportant des intérêts périodiquement.
-YIELDDISC		= RENDEMENT.SIMPLE		##	Calcule le taux de rendement d’un emprunt à intérêt simple (par exemple, un bon du Trésor).
-YIELDMAT		= RENDEMENT.TITRE.ECHEANCE	##	Renvoie le rendement annuel d’un titre qui rapporte des intérêts à l’échéance.
-
-
-##
-##	Information functions				Fonctions d’information
-##
-CELL			= CELLULE			##	Renvoie des informations sur la mise en forme, l’emplacement et le contenu d’une cellule.
-ERROR.TYPE		= TYPE.ERREUR			##	Renvoie un nombre correspondant à un type d’erreur.
-INFO			= INFORMATIONS			##	Renvoie des informations sur l’environnement d’exploitation actuel.
-ISBLANK			= ESTVIDE			##	Renvoie VRAI si l’argument valeur est vide.
-ISERR			= ESTERR			##	Renvoie VRAI si l’argument valeur fait référence à une valeur d’erreur, sauf #N/A.
-ISERROR			= ESTERREUR			##	Renvoie VRAI si l’argument valeur fait référence à une valeur d’erreur.
-ISEVEN			= EST.PAIR			##	Renvoie VRAI si le chiffre est pair.
-ISLOGICAL		= ESTLOGIQUE			##	Renvoie VRAI si l’argument valeur fait référence à une valeur logique.
-ISNA			= ESTNA				##	Renvoie VRAI si l’argument valeur fait référence à la valeur d’erreur #N/A.
-ISNONTEXT		= ESTNONTEXTE			##	Renvoie VRAI si l’argument valeur ne se présente pas sous forme de texte.
-ISNUMBER		= ESTNUM			##	Renvoie VRAI si l’argument valeur représente un nombre.
-ISODD			= EST.IMPAIR			##	Renvoie VRAI si le chiffre est impair.
-ISREF			= ESTREF			##	Renvoie VRAI si l’argument valeur est une référence.
-ISTEXT			= ESTTEXTE			##	Renvoie VRAI si l’argument valeur se présente sous forme de texte.
-N			= N				##	Renvoie une valeur convertie en nombre.
-NA			= NA				##	Renvoie la valeur d’erreur #N/A.
-TYPE			= TYPE				##	Renvoie un nombre indiquant le type de données d’une valeur.
-
-
-##
-##	Logical functions				Fonctions logiques
-##
-AND			= ET				##	Renvoie VRAI si tous ses arguments sont VRAI.
-FALSE			= FAUX				##	Renvoie la valeur logique FAUX.
-IF			= SI				##	Spécifie un test logique à effectuer.
-IFERROR			= SIERREUR			##	Renvoie une valeur que vous spécifiez si une formule génère une erreur ; sinon, elle renvoie le résultat de la formule.
-NOT			= NON				##	Inverse la logique de cet argument.
-OR			= OU				##	Renvoie VRAI si un des arguments est VRAI.
-TRUE			= VRAI				##	Renvoie la valeur logique VRAI.
-
-
-##
-##	Lookup and reference functions			Fonctions de recherche et de référence
-##
-ADDRESS			= ADRESSE			##	Renvoie une référence sous forme de texte à une seule cellule d’une feuille de calcul.
-AREAS			= ZONES				##	Renvoie le nombre de zones dans une référence.
-CHOOSE			= CHOISIR			##	Choisit une valeur dans une liste.
-COLUMN			= COLONNE			##	Renvoie le numéro de colonne d’une référence.
-COLUMNS			= COLONNES			##	Renvoie le nombre de colonnes dans une référence.
-HLOOKUP			= RECHERCHEH			##	Effectue une recherche dans la première ligne d’une matrice et renvoie la valeur de la cellule indiquée.
-HYPERLINK		= LIEN_HYPERTEXTE		##	Crée un raccourci ou un renvoi qui ouvre un document stocké sur un serveur réseau, sur un réseau Intranet ou sur Internet.
-INDEX			= INDEX				##	Utilise un index pour choisir une valeur provenant d’une référence ou d’une matrice.
-INDIRECT		= INDIRECT			##	Renvoie une référence indiquée par une valeur de texte.
-LOOKUP			= RECHERCHE			##	Recherche des valeurs dans un vecteur ou une matrice.
-MATCH			= EQUIV				##	Recherche des valeurs dans une référence ou une matrice.
-OFFSET			= DECALER			##	Renvoie une référence décalée par rapport à une référence donnée.
-ROW			= LIGNE				##	Renvoie le numéro de ligne d’une référence.
-ROWS			= LIGNES			##	Renvoie le nombre de lignes dans une référence.
-RTD			= RTD				##	Extrait les données en temps réel à partir d’un programme prenant en charge l’automation COM (Automation : utilisation des objets d'une application à partir d'une autre application ou d'un autre outil de développement. Autrefois appelée OLE Automation, Automation est une norme industrielle et une fonctionnalité du modèle d'objet COM (Component Object Model).).
-TRANSPOSE		= TRANSPOSE			##	Renvoie la transposition d’une matrice.
-VLOOKUP			= RECHERCHEV			##	Effectue une recherche dans la première colonne d’une matrice et se déplace sur la ligne pour renvoyer la valeur d’une cellule.
-
-
-##
-##	Math and trigonometry functions			Fonctions mathématiques et trigonométriques
-##
-ABS			= ABS				##	Renvoie la valeur absolue d’un nombre.
-ACOS			= ACOS				##	Renvoie l’arccosinus d’un nombre.
-ACOSH			= ACOSH				##	Renvoie le cosinus hyperbolique inverse d’un nombre.
-ASIN			= ASIN				##	Renvoie l’arcsinus d’un nombre.
-ASINH			= ASINH				##	Renvoie le sinus hyperbolique inverse d’un nombre.
-ATAN			= ATAN				##	Renvoie l’arctangente d’un nombre.
-ATAN2			= ATAN2				##	Renvoie l’arctangente des coordonnées x et y.
-ATANH			= ATANH				##	Renvoie la tangente hyperbolique inverse d’un nombre.
-CEILING			= PLAFOND			##	Arrondit un nombre au nombre entier le plus proche ou au multiple le plus proche de l’argument précision en s’éloignant de zéro.
-COMBIN			= COMBIN			##	Renvoie le nombre de combinaisons que l’on peut former avec un nombre donné d’objets.
-COS			= COS				##	Renvoie le cosinus d’un nombre.
-COSH			= COSH				##	Renvoie le cosinus hyperbolique d’un nombre.
-DEGREES			= DEGRES			##	Convertit des radians en degrés.
-EVEN			= PAIR				##	Arrondit un nombre au nombre entier pair le plus proche en s’éloignant de zéro.
-EXP			= EXP				##	Renvoie e élevé à la puissance d’un nombre donné.
-FACT			= FACT				##	Renvoie la factorielle d’un nombre.
-FACTDOUBLE		= FACTDOUBLE			##	Renvoie la factorielle double d’un nombre.
-FLOOR			= PLANCHER			##	Arrondit un nombre en tendant vers 0 (zéro).
-GCD			= PGCD				##	Renvoie le plus grand commun diviseur.
-INT			= ENT				##	Arrondit un nombre à l’entier immédiatement inférieur.
-LCM			= PPCM				##	Renvoie le plus petit commun multiple.
-LN			= LN				##	Renvoie le logarithme népérien d’un nombre.
-LOG			= LOG				##	Renvoie le logarithme d’un nombre dans la base spécifiée.
-LOG10			= LOG10				##	Calcule le logarithme en base 10 d’un nombre.
-MDETERM			= DETERMAT			##	Renvoie le déterminant d’une matrice.
-MINVERSE		= INVERSEMAT			##	Renvoie la matrice inverse d’une matrice.
-MMULT			= PRODUITMAT			##	Renvoie le produit de deux matrices.
-MOD			= MOD				##	Renvoie le reste d’une division.
-MROUND			= ARRONDI.AU.MULTIPLE		##	Donne l’arrondi d’un nombre au multiple spécifié.
-MULTINOMIAL		= MULTINOMIALE			##	Calcule la multinomiale d’un ensemble de nombres.
-ODD			= IMPAIR			##	Renvoie le nombre, arrondi à la valeur du nombre entier impair le plus proche en s’éloignant de zéro.
-PI			= PI				##	Renvoie la valeur de pi.
-POWER			= PUISSANCE			##	Renvoie la valeur du nombre élevé à une puissance.
-PRODUCT			= PRODUIT			##	Multiplie ses arguments.
-QUOTIENT		= QUOTIENT			##	Renvoie la partie entière du résultat d’une division.
-RADIANS			= RADIANS			##	Convertit des degrés en radians.
-RAND			= ALEA				##	Renvoie un nombre aléatoire compris entre 0 et 1.
-RANDBETWEEN		= ALEA.ENTRE.BORNES		##	Renvoie un nombre aléatoire entre les nombres que vous spécifiez.
-ROMAN			= ROMAIN			##	Convertit des chiffres arabes en chiffres romains, sous forme de texte.
-ROUND			= ARRONDI			##	Arrondit un nombre au nombre de chiffres indiqué.
-ROUNDDOWN		= ARRONDI.INF			##	Arrondit un nombre en tendant vers 0 (zéro).
-ROUNDUP			= ARRONDI.SUP			##	Arrondit un nombre à l’entier supérieur, en s’éloignant de zéro.
-SERIESSUM		= SOMME.SERIES			##	Renvoie la somme d’une série géométrique en s’appuyant sur la formule suivante :
-SIGN			= SIGNE				##	Renvoie le signe d’un nombre.
-SIN			= SIN				##	Renvoie le sinus d’un angle donné.
-SINH			= SINH				##	Renvoie le sinus hyperbolique d’un nombre.
-SQRT			= RACINE			##	Renvoie la racine carrée d’un nombre.
-SQRTPI			= RACINE.PI			##	Renvoie la racine carrée de (nombre * pi).
-SUBTOTAL		= SOUS.TOTAL			##	Renvoie un sous-total dans une liste ou une base de données.
-SUM			= SOMME				##	Calcule la somme de ses arguments.
-SUMIF			= SOMME.SI			##	Additionne les cellules spécifiées si elles répondent à un critère donné.
-SUMIFS			= SOMME.SI.ENS			##	Ajoute les cellules d’une plage qui répondent à plusieurs critères.
-SUMPRODUCT		= SOMMEPROD			##	Multiplie les valeurs correspondantes des matrices spécifiées et calcule la somme de ces produits.
-SUMSQ			= SOMME.CARRES			##	Renvoie la somme des carrés des arguments.
-SUMX2MY2		= SOMME.X2MY2			##	Renvoie la somme de la différence des carrés des valeurs correspondantes de deux matrices.
-SUMX2PY2		= SOMME.X2PY2			##	Renvoie la somme de la somme des carrés des valeurs correspondantes de deux matrices.
-SUMXMY2			= SOMME.XMY2			##	Renvoie la somme des carrés des différences entre les valeurs correspondantes de deux matrices.
-TAN			= TAN				##	Renvoie la tangente d’un nombre.
-TANH			= TANH				##	Renvoie la tangente hyperbolique d’un nombre.
-TRUNC			= TRONQUE			##	Renvoie la partie entière d’un nombre.
-
-
-##
-##	Statistical functions				Fonctions statistiques
-##
-AVEDEV			= ECART.MOYEN			##	Renvoie la moyenne des écarts absolus observés dans la moyenne des points de données.
-AVERAGE			= MOYENNE			##	Renvoie la moyenne de ses arguments.
-AVERAGEA		= AVERAGEA			##	Renvoie la moyenne de ses arguments, nombres, texte et valeurs logiques inclus.
-AVERAGEIF		= MOYENNE.SI			##	Renvoie la moyenne (arithmétique) de toutes les cellules d’une plage qui répondent à des critères donnés.
-AVERAGEIFS		= MOYENNE.SI.ENS		##	Renvoie la moyenne (arithmétique) de toutes les cellules qui répondent à plusieurs critères.
-BETADIST		= LOI.BETA			##	Renvoie la fonction de distribution cumulée.
-BETAINV			= BETA.INVERSE			##	Renvoie l’inverse de la fonction de distribution cumulée pour une distribution bêta spécifiée.
-BINOMDIST		= LOI.BINOMIALE			##	Renvoie la probabilité d’une variable aléatoire discrète suivant la loi binomiale.
-CHIDIST			= LOI.KHIDEUX			##	Renvoie la probabilité unilatérale de la distribution khi-deux.
-CHIINV			= KHIDEUX.INVERSE		##	Renvoie l’inverse de la probabilité unilatérale de la distribution khi-deux.
-CHITEST			= TEST.KHIDEUX			##	Renvoie le test d’indépendance.
-CONFIDENCE		= INTERVALLE.CONFIANCE		##	Renvoie l’intervalle de confiance pour une moyenne de population.
-CORREL			= COEFFICIENT.CORRELATION	##	Renvoie le coefficient de corrélation entre deux séries de données.
-COUNT			= NB				##	Détermine les nombres compris dans la liste des arguments.
-COUNTA			= NBVAL				##	Détermine le nombre de valeurs comprises dans la liste des arguments.
-COUNTBLANK		= NB.VIDE			##	Compte le nombre de cellules vides dans une plage.
-COUNTIF			= NB.SI				##	Compte le nombre de cellules qui répondent à un critère donné dans une plage.
-COUNTIFS		= NB.SI.ENS			##	Compte le nombre de cellules à l’intérieur d’une plage qui répondent à plusieurs critères.
-COVAR			= COVARIANCE			##	Renvoie la covariance, moyenne des produits des écarts pour chaque série d’observations.
-CRITBINOM		= CRITERE.LOI.BINOMIALE		##	Renvoie la plus petite valeur pour laquelle la distribution binomiale cumulée est inférieure ou égale à une valeur de critère.
-DEVSQ			= SOMME.CARRES.ECARTS		##	Renvoie la somme des carrés des écarts.
-EXPONDIST		= LOI.EXPONENTIELLE		##	Renvoie la distribution exponentielle.
-FDIST			= LOI.F				##	Renvoie la distribution de probabilité F.
-FINV			= INVERSE.LOI.F			##	Renvoie l’inverse de la distribution de probabilité F.
-FISHER			= FISHER			##	Renvoie la transformation de Fisher.
-FISHERINV		= FISHER.INVERSE		##	Renvoie l’inverse de la transformation de Fisher.
-FORECAST		= PREVISION			##	Calcule une valeur par rapport à une tendance linéaire.
-FREQUENCY		= FREQUENCE			##	Calcule la fréquence d’apparition des valeurs dans une plage de valeurs, puis renvoie des nombres sous forme de matrice verticale.
-FTEST			= TEST.F			##	Renvoie le résultat d’un test F.
-GAMMADIST		= LOI.GAMMA			##	Renvoie la probabilité d’une variable aléatoire suivant une loi Gamma.
-GAMMAINV		= LOI.GAMMA.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi Gamma.
-GAMMALN			= LNGAMMA			##	Renvoie le logarithme népérien de la fonction Gamma, G(x)
-GEOMEAN			= MOYENNE.GEOMETRIQUE		##	Renvoie la moyenne géométrique.
-GROWTH			= CROISSANCE			##	Calcule des valeurs par rapport à une tendance exponentielle.
-HARMEAN			= MOYENNE.HARMONIQUE		##	Renvoie la moyenne harmonique.
-HYPGEOMDIST		= LOI.HYPERGEOMETRIQUE		##	Renvoie la probabilité d’une variable aléatoire discrète suivant une loi hypergéométrique.
-INTERCEPT		= ORDONNEE.ORIGINE		##	Renvoie l’ordonnée à l’origine d’une droite de régression linéaire.
-KURT			= KURTOSIS			##	Renvoie le kurtosis d’une série de données.
-LARGE			= GRANDE.VALEUR			##	Renvoie la k-ième plus grande valeur d’une série de données.
-LINEST			= DROITEREG			##	Renvoie les paramètres d’une tendance linéaire.
-LOGEST			= LOGREG			##	Renvoie les paramètres d’une tendance exponentielle.
-LOGINV			= LOI.LOGNORMALE.INVERSE	##	Renvoie l’inverse de la probabilité pour une variable aléatoire suivant la loi lognormale.
-LOGNORMDIST		= LOI.LOGNORMALE		##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi lognormale.
-MAX			= MAX				##	Renvoie la valeur maximale contenue dans une liste d’arguments.
-MAXA			= MAXA				##	Renvoie la valeur maximale d’une liste d’arguments, nombres, texte et valeurs logiques inclus.
-MEDIAN			= MEDIANE			##	Renvoie la valeur médiane des nombres donnés.
-MIN			= MIN				##	Renvoie la valeur minimale contenue dans une liste d’arguments.
-MINA			= MINA				##	Renvoie la plus petite valeur d’une liste d’arguments, nombres, texte et valeurs logiques inclus.
-MODE			= MODE				##	Renvoie la valeur la plus courante d’une série de données.
-NEGBINOMDIST		= LOI.BINOMIALE.NEG		##	Renvoie la probabilité d’une variable aléatoire discrète suivant une loi binomiale négative.
-NORMDIST		= LOI.NORMALE			##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi normale.
-NORMINV			= LOI.NORMALE.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi normale standard.
-NORMSDIST		= LOI.NORMALE.STANDARD		##	Renvoie la probabilité d’une variable aléatoire continue suivant une loi normale standard.
-NORMSINV		= LOI.NORMALE.STANDARD.INVERSE	##	Renvoie l’inverse de la distribution cumulée normale standard.
-PEARSON			= PEARSON			##	Renvoie le coefficient de corrélation d’échantillonnage de Pearson.
-PERCENTILE		= CENTILE			##	Renvoie le k-ième centile des valeurs d’une plage.
-PERCENTRANK		= RANG.POURCENTAGE		##	Renvoie le rang en pourcentage d’une valeur d’une série de données.
-PERMUT			= PERMUTATION			##	Renvoie le nombre de permutations pour un nombre donné d’objets.
-POISSON			= LOI.POISSON			##	Renvoie la probabilité d’une variable aléatoire suivant une loi de Poisson.
-PROB			= PROBABILITE			##	Renvoie la probabilité que des valeurs d’une plage soient comprises entre deux limites.
-QUARTILE		= QUARTILE			##	Renvoie le quartile d’une série de données.
-RANK			= RANG				##	Renvoie le rang d’un nombre contenu dans une liste.
-RSQ			= COEFFICIENT.DETERMINATION	##	Renvoie la valeur du coefficient de détermination R^2 d’une régression linéaire.
-SKEW			= COEFFICIENT.ASYMETRIE		##	Renvoie l’asymétrie d’une distribution.
-SLOPE			= PENTE				##	Renvoie la pente d’une droite de régression linéaire.
-SMALL			= PETITE.VALEUR			##	Renvoie la k-ième plus petite valeur d’une série de données.
-STANDARDIZE		= CENTREE.REDUITE		##	Renvoie une valeur centrée réduite.
-STDEV			= ECARTYPE			##	Évalue l’écart type d’une population en se basant sur un échantillon de cette population.
-STDEVA			= STDEVA			##	Évalue l’écart type d’une population en se basant sur un échantillon de cette population, nombres, texte et valeurs logiques inclus.
-STDEVP			= ECARTYPEP			##	Calcule l’écart type d’une population à partir de la population entière.
-STDEVPA			= STDEVPA			##	Calcule l’écart type d’une population à partir de l’ensemble de la population, nombres, texte et valeurs logiques inclus.
-STEYX			= ERREUR.TYPE.XY		##	Renvoie l’erreur type de la valeur y prévue pour chaque x de la régression.
-TDIST			= LOI.STUDENT			##	Renvoie la probabilité d’une variable aléatoire suivant une loi T de Student.
-TINV			= LOI.STUDENT.INVERSE		##	Renvoie, pour une probabilité donnée, la valeur d’une variable aléatoire suivant une loi T de Student.
-TREND			= TENDANCE			##	Renvoie des valeurs par rapport à une tendance linéaire.
-TRIMMEAN		= MOYENNE.REDUITE		##	Renvoie la moyenne de l’intérieur d’une série de données.
-TTEST			= TEST.STUDENT			##	Renvoie la probabilité associée à un test T de Student.
-VAR			= VAR				##	Calcule la variance sur la base d’un échantillon.
-VARA			= VARA				##	Estime la variance d’une population en se basant sur un échantillon de cette population, nombres, texte et valeurs logiques incluses.
-VARP			= VAR.P				##	Calcule la variance sur la base de l’ensemble de la population.
-VARPA			= VARPA				##	Calcule la variance d’une population en se basant sur la population entière, nombres, texte et valeurs logiques inclus.
-WEIBULL			= LOI.WEIBULL			##	Renvoie la probabilité d’une variable aléatoire suivant une loi de Weibull.
-ZTEST			= TEST.Z			##	Renvoie la valeur de probabilité unilatérale d’un test z.
-
-
-##
-##	Text functions					Fonctions de texte
-##
-ASC			= ASC				##	Change les caractères anglais ou katakana à pleine chasse (codés sur deux octets) à l’intérieur d’une chaîne de caractères en caractères à demi-chasse (codés sur un octet).
-BAHTTEXT		= BAHTTEXT			##	Convertit un nombre en texte en utilisant le format monétaire ß (baht).
-CHAR			= CAR				##	Renvoie le caractère spécifié par le code numérique.
-CLEAN			= EPURAGE			##	Supprime tous les caractères de contrôle du texte.
-CODE			= CODE				##	Renvoie le numéro de code du premier caractère du texte.
-CONCATENATE		= CONCATENER			##	Assemble plusieurs éléments textuels de façon à n’en former qu’un seul.
-DOLLAR			= EURO				##	Convertit un nombre en texte en utilisant le format monétaire € (euro).
-EXACT			= EXACT				##	Vérifie si deux valeurs de texte sont identiques.
-FIND			= TROUVE			##	Trouve un valeur textuelle dans une autre, en respectant la casse.
-FINDB			= TROUVERB			##	Trouve un valeur textuelle dans une autre, en respectant la casse.
-FIXED			= CTXT				##	Convertit un nombre au format texte avec un nombre de décimales spécifié.
-JIS			= JIS				##	Change les caractères anglais ou katakana à demi-chasse (codés sur un octet) à l’intérieur d’une chaîne de caractères en caractères à à pleine chasse (codés sur deux octets).
-LEFT			= GAUCHE			##	Renvoie des caractères situés à l’extrême gauche d’une chaîne de caractères.
-LEFTB			= GAUCHEB			##	Renvoie des caractères situés à l’extrême gauche d’une chaîne de caractères.
-LEN			= NBCAR				##	Renvoie le nombre de caractères contenus dans une chaîne de texte.
-LENB			= LENB				##	Renvoie le nombre de caractères contenus dans une chaîne de texte.
-LOWER			= MINUSCULE			##	Convertit le texte en minuscules.
-MID			= STXT				##	Renvoie un nombre déterminé de caractères d’une chaîne de texte à partir de la position que vous indiquez.
-MIDB			= STXTB				##	Renvoie un nombre déterminé de caractères d’une chaîne de texte à partir de la position que vous indiquez.
-PHONETIC		= PHONETIQUE			##	Extrait les caractères phonétiques (furigana) d’une chaîne de texte.
-PROPER			= NOMPROPRE			##	Met en majuscules la première lettre de chaque mot dans une chaîne textuelle.
-REPLACE			= REMPLACER			##	Remplace des caractères dans un texte.
-REPLACEB		= REMPLACERB			##	Remplace des caractères dans un texte.
-REPT			= REPT				##	Répète un texte un certain nombre de fois.
-RIGHT			= DROITE			##	Renvoie des caractères situés à l’extrême droite d’une chaîne de caractères.
-RIGHTB			= DROITEB			##	Renvoie des caractères situés à l’extrême droite d’une chaîne de caractères.
-SEARCH			= CHERCHE			##	Trouve un texte dans un autre texte (sans respecter la casse).
-SEARCHB			= CHERCHERB			##	Trouve un texte dans un autre texte (sans respecter la casse).
-SUBSTITUTE		= SUBSTITUE			##	Remplace l’ancien texte d’une chaîne de caractères par un nouveau.
-T			= T				##	Convertit ses arguments en texte.
-TEXT			= TEXTE				##	Convertit un nombre au format texte.
-TRIM			= SUPPRESPACE			##	Supprime les espaces du texte.
-UPPER			= MAJUSCULE			##	Convertit le texte en majuscules.
-VALUE			= CNUM				##	Convertit un argument textuel en nombre
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/hu/config b/plugins/exportTypes/Excel/PHPExcel/locale/hu/config
deleted file mode 100755
index 16ee661fb..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/hu/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= Ft
-
-
-##
-##	Excel Error Codes	(For future use)
-##
-NULL	= #NULLA!
-DIV0	= #ZÉRÓOSZTÓ!
-VALUE	= #ÉRTÉK!
-REF	= #HIV!
-NAME	= #NÉV?
-NUM	= #SZÁM!
-NA	= #HIÁNYZIK
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/hu/functions b/plugins/exportTypes/Excel/PHPExcel/locale/hu/functions
deleted file mode 100755
index 48ff96b88..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/hu/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Bővítmények és automatizálási függvények
-##
-GETPIVOTDATA		= KIMUTATÁSADATOT.VESZ		##	A kimutatásokban tárolt adatok visszaadására használható.
-
-
-##
-##	Cube functions Kockafüggvények   
-##
-CUBEKPIMEMBER		= KOCKA.FŐTELJMUT		##	Egy fő teljesítménymutató (KPI) nevét, tulajdonságát és mértékegységét adja eredményül, a nevet és a tulajdonságot megjeleníti a cellában. A KPI-k számszerűsíthető mérési lehetőséget jelentenek – ilyen mutató például a havi bruttó nyereség vagy az egy alkalmazottra jutó negyedéves forgalom –, egy szervezet teljesítményének nyomonkövetésére használhatók.
-CUBEMEMBER		= KOCKA.TAG			##	Kockahierachia tagját vagy rekordját adja eredményül. Ellenőrizhető vele, hogy szerepel-e a kockában az adott tag vagy rekord.
-CUBEMEMBERPROPERTY	= KOCKA.TAG.TUL			##	A kocka egyik tagtulajdonságának értékét adja eredményül. Használatával ellenőrizhető, hogy szerepel-e egy tagnév a kockában, eredménye pedig az erre a tagra vonatkozó, megadott tulajdonság.
-CUBERANKEDMEMBER	= KOCKA.HALM.ELEM		##	Egy halmaz rangsor szerinti n-edik tagját adja eredményül. Használatával egy halmaz egy vagy több elemét kaphatja meg, például a legnagyobb teljesítményű üzletkötőt vagy a 10 legjobb tanulót.
-CUBESET			= KOCKA.HALM			##	Számított tagok vagy rekordok halmazát adja eredményül, ehhez egy beállított kifejezést elküld a kiszolgálón található kockának, majd ezt a halmazt adja vissza a Microsoft Office Excel alkalmazásnak.
-CUBESETCOUNT		= KOCKA.HALM.DB			##	Egy halmaz elemszámát adja eredményül.
-CUBEVALUE		= KOCKA.ÉRTÉK			##	Kockából összesített értéket ad eredményül.
-
-
-##
-##	Database functions				Adatbázis-kezelő függvények
-##
-DAVERAGE		= AB.ÁTLAG			##	A kijelölt adatbáziselemek átlagát számítja ki.
-DCOUNT			= AB.DARAB			##	Megszámolja, hogy az adatbázisban hány cella tartalmaz számokat.
-DCOUNTA			= AB.DARAB2			##	Megszámolja az adatbázisban lévő nem üres cellákat.
-DGET			= AB.MEZŐ			##	Egy adatbázisból egyetlen olyan rekordot ad vissza, amely megfelel a megadott feltételeknek.
-DMAX			= AB.MAX			##	A kiválasztott adatbáziselemek közül a legnagyobb értéket adja eredményül.
-DMIN			= AB.MIN			##	A kijelölt adatbáziselemek közül a legkisebb értéket adja eredményül.
-DPRODUCT		= AB.SZORZAT			##	Az adatbázis megadott feltételeknek eleget tevő rekordjaira összeszorozza a megadott mezőben található számértékeket, és eredményül ezt a szorzatot adja.
-DSTDEV			= AB.SZÓRÁS			##	A kijelölt adatbáziselemek egy mintája alapján megbecsüli a szórást.
-DSTDEVP			= AB.SZÓRÁS2			##	A kijelölt adatbáziselemek teljes sokasága alapján kiszámítja a szórást.
-DSUM			= AB.SZUM			##	Összeadja a feltételnek megfelelő adatbázisrekordok mezőoszlopában a számokat.
-DVAR			= AB.VAR			##	A kijelölt adatbáziselemek mintája alapján becslést ad a szórásnégyzetre.
-DVARP			= AB.VAR2			##	A kijelölt adatbáziselemek teljes sokasága alapján kiszámítja a szórásnégyzetet.
-
-
-##
-##	Date and time functions				Dátumfüggvények
-##
-DATE			= DÁTUM				##	Adott dátum dátumértékét adja eredményül.
-DATEVALUE		= DÁTUMÉRTÉK			##	Szövegként megadott dátumot dátumértékké alakít át.
-DAY			= NAP				##	Dátumértéket a hónap egy napjává (0-31) alakít.
-DAYS360			= NAP360			##	Két dátum közé eső napok számát számítja ki a 360 napos év alapján.
-EDATE			= EDATE				##	Adott dátumnál adott számú hónappal korábbi vagy későbbi dátum dátumértékét adja eredményül.
-EOMONTH			= EOMONTH			##	Adott dátumnál adott számú hónappal korábbi vagy későbbi hónap utolsó napjának dátumértékét adja eredményül.
-HOUR			= ÓRA				##	Időértéket órákká alakít.
-MINUTE			= PERC				##	Időértéket percekké alakít.
-MONTH			= HÓNAP				##	Időértéket hónapokká alakít.
-NETWORKDAYS		= NETWORKDAYS			##	Két dátum között a teljes munkanapok számát adja meg.
-NOW			= MOST				##	A napi dátum dátumértékét és a pontos idő időértékét adja eredményül.
-SECOND			= MPERC				##	Időértéket másodpercekké alakít át.
-TIME			= IDŐ				##	Adott időpont időértékét adja meg.
-TIMEVALUE		= IDŐÉRTÉK			##	Szövegként megadott időpontot időértékké alakít át.
-TODAY			= MA				##	A napi dátum dátumértékét adja eredményül.
-WEEKDAY			= HÉT.NAPJA			##	Dátumértéket a hét napjává alakítja át.
-WEEKNUM			= WEEKNUM			##	Visszatérési értéke egy szám, amely azt mutatja meg, hogy a megadott dátum az év hányadik hetére esik.
-WORKDAY			= WORKDAY			##	Adott dátumnál adott munkanappal korábbi vagy későbbi dátum dátumértékét adja eredményül.
-YEAR			= ÉV				##	Sorszámot évvé alakít át.
-YEARFRAC		= YEARFRAC			##	Az adott dátumok közötti teljes napok számát törtévként adja meg.
-
-
-##
-##	Engineering functions				Mérnöki függvények
-##
-BESSELI			= BESSELI			##	Az In(x) módosított Bessel-függvény értékét adja eredményül.
-BESSELJ			= BESSELJ			##	A Jn(x) Bessel-függvény értékét adja eredményül.
-BESSELK			= BESSELK			##	A Kn(x) módosított Bessel-függvény értékét adja eredményül.
-BESSELY			= BESSELY			##	Az Yn(x) módosított Bessel-függvény értékét adja eredményül.
-BIN2DEC			= BIN2DEC			##	Bináris számot decimálissá alakít át.
-BIN2HEX			= BIN2HEX			##	Bináris számot hexadecimálissá alakít át.
-BIN2OCT			= BIN2OCT			##	Bináris számot oktálissá alakít át.
-COMPLEX			= COMPLEX			##	Valós és képzetes részből komplex számot képez.
-CONVERT			= CONVERT			##	Mértékegységeket vált át.
-DEC2BIN			= DEC2BIN			##	Decimális számot binárissá alakít át.
-DEC2HEX			= DEC2HEX			##	Decimális számot hexadecimálissá alakít át.
-DEC2OCT			= DEC2OCT			##	Decimális számot oktálissá alakít át.
-DELTA			= DELTA				##	Azt vizsgálja, hogy két érték egyenlő-e.
-ERF			= ERF				##	A hibafüggvény értékét adja eredményül.
-ERFC			= ERFC				##	A kiegészített hibafüggvény értékét adja eredményül.
-GESTEP			= GESTEP			##	Azt vizsgálja, hogy egy szám nagyobb-e adott küszöbértéknél.
-HEX2BIN			= HEX2BIN			##	Hexadecimális számot binárissá alakít át.
-HEX2DEC			= HEX2DEC			##	Hexadecimális számot decimálissá alakít át.
-HEX2OCT			= HEX2OCT			##	Hexadecimális számot oktálissá alakít át.
-IMABS			= IMABS				##	Komplex szám abszolút értékét (modulusát) adja eredményül.
-IMAGINARY		= IMAGINARY			##	Komplex szám képzetes részét adja eredményül.
-IMARGUMENT		= IMARGUMENT			##	A komplex szám radiánban kifejezett théta argumentumát adja eredményül.
-IMCONJUGATE		= IMCONJUGATE			##	Komplex szám komplex konjugáltját adja eredményül.
-IMCOS			= IMCOS				##	Komplex szám koszinuszát adja eredményül.
-IMDIV			= IMDIV				##	Két komplex szám hányadosát adja eredményül.
-IMEXP			= IMEXP				##	Az e szám komplex kitevőjű hatványát adja eredményül.
-IMLN			= IMLN				##	Komplex szám természetes logaritmusát adja eredményül.
-IMLOG10			= IMLOG10			##	Komplex szám tízes alapú logaritmusát adja eredményül.
-IMLOG2			= IMLOG2			##	Komplex szám kettes alapú logaritmusát adja eredményül.
-IMPOWER			= IMPOWER			##	Komplex szám hatványát adja eredményül.
-IMPRODUCT		= IMPRODUCT			##	Komplex számok szorzatát adja eredményül.
-IMREAL			= IMREAL			##	Komplex szám valós részét adja eredményül.
-IMSIN			= IMSIN				##	Komplex szám szinuszát adja eredményül.
-IMSQRT			= IMSQRT			##	Komplex szám négyzetgyökét adja eredményül.
-IMSUB			= IMSUB				##	Két komplex szám különbségét adja eredményül.
-IMSUM			= IMSUM				##	Komplex számok összegét adja eredményül.
-OCT2BIN			= OCT2BIN			##	Oktális számot binárissá alakít át.
-OCT2DEC			= OCT2DEC			##	Oktális számot decimálissá alakít át.
-OCT2HEX			= OCT2HEX			##	Oktális számot hexadecimálissá alakít át.
-
-
-##
-##	Financial functions				Pénzügyi függvények
-##
-ACCRINT			= ACCRINT			##	Periodikusan kamatozó értékpapír felszaporodott kamatát adja eredményül.
-ACCRINTM		= ACCRINTM			##	Lejáratkor kamatozó értékpapír felszaporodott kamatát adja eredményül.
-AMORDEGRC		= AMORDEGRC			##	Állóeszköz lineáris értékcsökkenését adja meg az egyes könyvelési időszakokra vonatkozóan.
-AMORLINC		= AMORLINC			##	Az egyes könyvelési időszakokban az értékcsökkenést adja meg.
-COUPDAYBS		= COUPDAYBS			##	A szelvényidőszak kezdetétől a kifizetés időpontjáig eltelt napokat adja vissza.
-COUPDAYS		= COUPDAYS			##	A kifizetés időpontját magában foglaló szelvényperiódus hosszát adja meg napokban.
-COUPDAYSNC		= COUPDAYSNC			##	A kifizetés időpontja és a legközelebbi szelvénydátum közötti napok számát adja meg.
-COUPNCD			= COUPNCD			##	A kifizetést követő legelső szelvénydátumot adja eredményül.
-COUPNUM			= COUPNUM			##	A kifizetés és a lejárat időpontja között kifizetendő szelvények számát adja eredményül.
-COUPPCD			= COUPPCD			##	A kifizetés előtti utolsó szelvénydátumot adja eredményül.
-CUMIPMT			= CUMIPMT			##	Két fizetési időszak között kifizetett kamat halmozott értékét adja eredményül.
-CUMPRINC		= CUMPRINC			##	Két fizetési időszak között kifizetett részletek halmozott (kamatot nem tartalmazó) értékét adja eredményül.
-DB			= KCS2				##	Eszköz adott időszak alatti értékcsökkenését számítja ki a lineáris leírási modell alkalmazásával.
-DDB			= KCSA				##	Eszköz értékcsökkenését számítja ki adott időszakra vonatkozóan a progresszív vagy egyéb megadott leírási modell alkalmazásával.
-DISC			= DISC				##	Értékpapír leszámítolási kamatlábát adja eredményül.
-DOLLARDE		= DOLLARDE			##	Egy közönséges törtként megadott számot tizedes törtté alakít át.
-DOLLARFR		= DOLLARFR			##	Tizedes törtként megadott számot közönséges törtté alakít át.
-DURATION		= DURATION			##	Periodikus kamatfizetésű értékpapír éves kamatérzékenységét adja eredményül.
-EFFECT			= EFFECT			##	Az éves tényleges kamatláb értékét adja eredményül.
-FV			= JBÉ				##	Befektetés jövőbeli értékét számítja ki.
-FVSCHEDULE		= FVSCHEDULE			##	A kezdőtőke adott kamatlábak szerint megnövelt jövőbeli értékét adja eredményül.
-INTRATE			= INTRATE			##	A lejáratig teljesen lekötött értékpapír kamatrátáját adja eredményül.
-IPMT			= RRÉSZLET			##	Hiteltörlesztésen belül a tőketörlesztés nagyságát számítja ki adott időszakra.
-IRR			= BMR				##	A befektetés belső megtérülési rátáját számítja ki pénzáramláshoz.
-ISPMT			= LRÉSZLETKAMAT			##	A befektetés adott időszakára fizetett kamatot számítja ki.
-MDURATION		= MDURATION			##	Egy 100 Ft névértékű értékpapír Macauley-féle módosított kamatérzékenységét adja eredményül.
-MIRR			= MEGTÉRÜLÉS			##	A befektetés belső megtérülési rátáját számítja ki a költségek és a bevételek különböző kamatlába mellett.
-NOMINAL			= NOMINAL			##	Az éves névleges kamatláb értékét adja eredményül.
-NPER			= PER.SZÁM			##	A törlesztési időszakok számát adja meg.
-NPV			= NMÉ				##	Befektetéshez kapcsolódó pénzáramlás nettó jelenértékét számítja ki ismert pénzáramlás és kamatláb mellett.
-ODDFPRICE		= ODDFPRICE			##	Egy 100 Ft névértékű, a futamidő elején töredék-időszakos értékpapír árát adja eredményül.
-ODDFYIELD		= ODDFYIELD			##	A futamidő elején töredék-időszakos értékpapír hozamát adja eredményül.
-ODDLPRICE		= ODDLPRICE			##	Egy 100 Ft névértékű, a futamidő végén töredék-időszakos értékpapír árát adja eredményül.
-ODDLYIELD		= ODDLYIELD			##	A futamidő végén töredék-időszakos értékpapír hozamát adja eredményül.
-PMT			= RÉSZLET			##	A törlesztési időszakra vonatkozó törlesztési összeget számítja ki.
-PPMT			= PRÉSZLET			##	Hiteltörlesztésen belül a tőketörlesztés nagyságát számítja ki adott időszakra.
-PRICE			= PRICE				##	Egy 100 Ft névértékű, periodikusan kamatozó értékpapír árát adja eredményül.
-PRICEDISC		= PRICEDISC			##	Egy 100 Ft névértékű leszámítolt értékpapír árát adja eredményül.
-PRICEMAT		= PRICEMAT			##	Egy 100 Ft névértékű, a lejáratkor kamatozó értékpapír árát adja eredményül.
-PV			= MÉ				##	Befektetés jelenlegi értékét számítja ki.
-RATE			= RÁTA				##	Egy törlesztési időszakban az egy időszakra eső kamatláb nagyságát számítja ki.
-RECEIVED		= RECEIVED			##	A lejáratig teljesen lekötött értékpapír lejáratakor kapott összegét adja eredményül.
-SLN			= LCSA				##	Tárgyi eszköz egy időszakra eső amortizációját adja meg bruttó érték szerinti lineáris leírási kulcsot alkalmazva.
-SYD			= SYD				##	Tárgyi eszköz értékcsökkenését számítja ki adott időszakra az évek számjegyösszegével dolgozó módszer alapján.
-TBILLEQ			= TBILLEQ			##	Kincstárjegy kötvény-egyenértékű hozamát adja eredményül.
-TBILLPRICE		= TBILLPRICE			##	Egy 100 Ft névértékű kincstárjegy árát adja eredményül.
-TBILLYIELD		= TBILLYIELD			##	Kincstárjegy hozamát adja eredményül.
-VDB			= ÉCSRI				##	Tárgyi eszköz amortizációját számítja ki megadott vagy részidőszakra a csökkenő egyenleg módszerének alkalmazásával.
-XIRR			= XIRR				##	Ütemezett készpénzforgalom (cash flow) belső megtérülési kamatrátáját adja eredményül.
-XNPV			= XNPV				##	Ütemezett készpénzforgalom (cash flow) nettó jelenlegi értékét adja eredményül.
-YIELD			= YIELD				##	Periodikusan kamatozó értékpapír hozamát adja eredményül.
-YIELDDISC		= YIELDDISC			##	Leszámítolt értékpapír (például kincstárjegy) éves hozamát adja eredményül.
-YIELDMAT		= YIELDMAT			##	Lejáratkor kamatozó értékpapír éves hozamát adja eredményül.
-
-
-##
-##	Information functions				Információs függvények
-##
-CELL			= CELLA				##	Egy cella formátumára, elhelyezkedésére vagy tartalmára vonatkozó adatokat ad eredményül.
-ERROR.TYPE		= HIBA.TÍPUS			##	Egy hibatípushoz tartozó számot ad eredményül.
-INFO			= INFÓ				##	A rendszer- és munkakörnyezet pillanatnyi állapotáról ad felvilágosítást.
-ISBLANK			= ÜRES				##	Eredménye IGAZ, ha az érték üres.
-ISERR			= HIBA				##	Eredménye IGAZ, ha az érték valamelyik hibaérték a #HIÁNYZIK kivételével.
-ISERROR			= HIBÁS				##	Eredménye IGAZ, ha az érték valamelyik hibaérték.
-ISEVEN			= ISEVEN			##	Eredménye IGAZ, ha argumentuma páros szám.
-ISLOGICAL		= LOGIKAI			##	Eredménye IGAZ, ha az érték logikai érték.
-ISNA			= NINCS				##	Eredménye IGAZ, ha az érték a #HIÁNYZIK hibaérték.
-ISNONTEXT		= NEM.SZÖVEG			##	Eredménye IGAZ, ha az érték nem szöveg.
-ISNUMBER		= SZÁM				##	Eredménye IGAZ, ha az érték szám.
-ISODD			= ISODD				##	Eredménye IGAZ, ha argumentuma páratlan szám.
-ISREF			= HIVATKOZÁS			##	Eredménye IGAZ, ha az érték hivatkozás.
-ISTEXT			= SZÖVEG.E			##	Eredménye IGAZ, ha az érték szöveg.
-N			= N				##	Argumentumának értékét számmá alakítja.
-NA			= HIÁNYZIK			##	Eredménye a #HIÁNYZIK hibaérték.
-TYPE			= TÍPUS				##	Érték adattípusának azonosítószámát adja eredményül.
-
-
-##
-##	Logical functions				Logikai függvények
-##
-AND			= ÉS				##	Eredménye IGAZ, ha minden argumentuma IGAZ.
-FALSE			= HAMIS				##	A HAMIS logikai értéket adja eredményül.
-IF			= HA				##	Logikai vizsgálatot hajt végre.
-IFERROR			= HAHIBA			##	A megadott értéket adja vissza, ha egy képlet hibához vezet; más esetben a képlet értékét adja eredményül.
-NOT			= NEM				##	Argumentuma értékének ellentettjét adja eredményül.
-OR			= VAGY				##	Eredménye IGAZ, ha bármely argumentuma IGAZ.
-TRUE			= IGAZ				##	Az IGAZ logikai értéket adja eredményül.
-
-
-##
-##	Lookup and reference functions			Keresési és hivatkozási függvények
-##
-ADDRESS			= CÍM				##	A munkalap egy cellájára való hivatkozást adja szövegként eredményül.
-AREAS			= TERÜLET			##	Hivatkozásban a területek számát adja eredményül.
-CHOOSE			= VÁLASZT			##	Értékek listájából választ ki egy elemet.
-COLUMN			= OSZLOP			##	Egy hivatkozás oszlopszámát adja eredményül.
-COLUMNS			= OSZLOPOK			##	A hivatkozásban található oszlopok számát adja eredményül.
-HLOOKUP			= VKERES			##	A megadott tömb felső sorában adott értékű elemet keres, és a megtalált elem oszlopából adott sorban elhelyezkedő értékkel tér vissza.
-HYPERLINK		= HIPERHIVATKOZÁS		##	Hálózati kiszolgálón, intraneten vagy az interneten tárolt dokumentumot megnyitó parancsikont vagy hivatkozást hoz létre.
-INDEX			= INDEX				##	Tömb- vagy hivatkozás indexszel megadott értékét adja vissza.
-INDIRECT		= INDIREKT			##	Szöveg megadott hivatkozást ad eredményül.
-LOOKUP			= KERES				##	Vektorban vagy tömbben keres meg értékeket.
-MATCH			= HOL.VAN			##	Hivatkozásban vagy tömbben értékeket keres.
-OFFSET			= OFSZET			##	Hivatkozás egy másik hivatkozástól számított távolságát adja meg.
-ROW			= SOR				##	Egy hivatkozás sorának számát adja meg.
-ROWS			= SOROK				##	Egy hivatkozás sorainak számát adja meg.
-RTD			= RTD				##	Valós idejű adatokat keres vissza a COM automatizmust (automatizálás: Egy alkalmazás objektumaival való munka másik alkalmazásból vagy fejlesztőeszközből. A korábban OLE automatizmusnak nevezett automatizálás iparági szabvány, a Component Object Model (COM) szolgáltatása.) támogató programból.
-TRANSPOSE		= TRANSZPONÁLÁS			##	Egy tömb transzponáltját adja eredményül.
-VLOOKUP			= FKERES			##	A megadott tömb bal szélső oszlopában megkeres egy értéket, majd annak sora és a megadott oszlop metszéspontjában levő értéked adja eredményül.
-
-
-##
-##	Math and trigonometry functions			Matematikai és trigonometrikus függvények
-##
-ABS			= ABS				##	Egy szám abszolút értékét adja eredményül.
-ACOS			= ARCCOS			##	Egy szám arkusz koszinuszát számítja ki.
-ACOSH			= ACOSH				##	Egy szám inverz koszinusz hiperbolikuszát számítja ki.
-ASIN			= ARCSIN			##	Egy szám arkusz szinuszát számítja ki.
-ASINH			= ASINH				##	Egy szám inverz szinusz hiperbolikuszát számítja ki.
-ATAN			= ARCTAN			##	Egy szám arkusz tangensét számítja ki.
-ATAN2			= ARCTAN2			##	X és y koordináták alapján számítja ki az arkusz tangens értéket.
-ATANH			= ATANH				##	A szám inverz tangens hiperbolikuszát számítja ki.
-CEILING			= PLAFON			##	Egy számot a legközelebbi egészre vagy a pontosságként megadott érték legközelebb eső többszörösére kerekít.
-COMBIN			= KOMBINÁCIÓK			##	Adott számú objektum összes lehetséges kombinációinak számát számítja ki.
-COS			= COS				##	Egy szám koszinuszát számítja ki.
-COSH			= COSH				##	Egy szám koszinusz hiperbolikuszát számítja ki.
-DEGREES			= FOK				##	Radiánt fokká alakít át.
-EVEN			= PÁROS				##	Egy számot a legközelebbi páros egész számra kerekít.
-EXP			= KITEVŐ			##	Az e adott kitevőjű hatványát adja eredményül.
-FACT			= FAKT				##	Egy szám faktoriálisát számítja ki.
-FACTDOUBLE		= FACTDOUBLE			##	Egy szám dupla faktoriálisát adja eredményül.
-FLOOR			= PADLÓ				##	Egy számot lefelé, a nulla felé kerekít.
-GCD			= GCD				##	A legnagyobb közös osztót adja eredményül.
-INT			= INT				##	Egy számot lefelé kerekít a legközelebbi egészre.
-LCM			= LCM				##	A legkisebb közös többszöröst adja eredményül.
-LN			= LN				##	Egy szám természetes logaritmusát számítja ki.
-LOG			= LOG				##	Egy szám adott alapú logaritmusát számítja ki.
-LOG10			= LOG10				##	Egy szám 10-es alapú logaritmusát számítja ki.
-MDETERM			= MDETERM			##	Egy tömb mátrix-determinánsát számítja ki.
-MINVERSE		= INVERZ.MÁTRIX			##	Egy tömb mátrix inverzét adja eredményül.
-MMULT			= MSZORZAT			##	Két tömb mátrix-szorzatát adja meg.
-MOD			= MARADÉK			##	Egy szám osztási maradékát adja eredményül.
-MROUND			= MROUND			##	A kívánt többszörösére kerekített értéket ad eredményül.
-MULTINOMIAL		= MULTINOMIAL			##	Számhalmaz multinomiálisát adja eredményül.
-ODD			= PÁRATLAN			##	Egy számot a legközelebbi páratlan számra kerekít.
-PI			= PI				##	A pi matematikai állandót adja vissza.
-POWER			= HATVÁNY			##	Egy szám adott kitevőjű hatványát számítja ki.
-PRODUCT			= SZORZAT			##	Argumentumai szorzatát számítja ki.
-QUOTIENT		= QUOTIENT			##	Egy hányados egész részét adja eredményül.
-RADIANS			= RADIÁN			##	Fokot radiánná alakít át.
-RAND			= VÉL				##	Egy 0 és 1 közötti véletlen számot ad eredményül.
-RANDBETWEEN		= RANDBETWEEN			##	Megadott számok közé eső véletlen számot állít elő.
-ROMAN			= RÓMAI				##	Egy számot római számokkal kifejezve szövegként ad eredményül.
-ROUND			= KEREKÍTÉS			##	Egy számot adott számú számjegyre kerekít.
-ROUNDDOWN		= KEREKÍTÉS.LE			##	Egy számot lefelé, a nulla felé kerekít.
-ROUNDUP			= KEREKÍTÉS.FEL			##	Egy számot felfelé, a nullától távolabbra kerekít.
-SERIESSUM		= SERIESSUM			##	Hatványsor összegét adja eredményül.
-SIGN			= ELŐJEL			##	Egy szám előjelét adja meg.
-SIN			= SIN				##	Egy szög szinuszát számítja ki.
-SINH			= SINH				##	Egy szám szinusz hiperbolikuszát számítja ki.
-SQRT			= GYÖK				##	Egy szám pozitív négyzetgyökét számítja ki.
-SQRTPI			= SQRTPI			##	A (szám*pi) négyzetgyökét adja eredményül.
-SUBTOTAL		= RÉSZÖSSZEG			##	Lista vagy adatbázis részösszegét adja eredményül.
-SUM			= SZUM				##	Összeadja az argumentumlistájában lévő számokat.
-SUMIF			= SZUMHA			##	A megadott feltételeknek eleget tevő cellákban található értékeket adja össze.
-SUMIFS			= SZUMHATÖBB			##	Több megadott feltételnek eleget tévő tartománycellák összegét adja eredményül.
-SUMPRODUCT		= SZORZATÖSSZEG			##	A megfelelő tömbelemek szorzatának összegét számítja ki.
-SUMSQ			= NÉGYZETÖSSZEG			##	Argumentumai négyzetének összegét számítja ki.
-SUMX2MY2		= SZUMX2BŐLY2			##	Két tömb megfelelő elemei négyzetének különbségét összegzi.
-SUMX2PY2		= SZUMX2MEGY2			##	Két tömb megfelelő elemei négyzetének összegét összegzi.
-SUMXMY2			= SZUMXBŐLY2			##	Két tömb megfelelő elemei különbségének négyzetösszegét számítja ki.
-TAN			= TAN				##	Egy szám tangensét számítja ki.
-TANH			= TANH				##	Egy szám tangens hiperbolikuszát számítja ki.
-TRUNC			= CSONK				##	Egy számot egésszé csonkít.
-
-
-##
-##	Statistical functions				Statisztikai függvények
-##
-AVEDEV			= ÁTL.ELTÉRÉS			##	Az adatpontoknak átlaguktól való átlagos abszolút eltérését számítja ki.
-AVERAGE			= ÁTLAG				##	Argumentumai átlagát számítja ki.
-AVERAGEA		= ÁTLAGA			##	Argumentumai átlagát számítja ki (beleértve a számokat, szöveget és logikai értékeket).
-AVERAGEIF		= ÁTLAGHA			##	A megadott feltételnek eleget tévő tartomány celláinak átlagát (számtani közepét) adja eredményül.
-AVERAGEIFS		= ÁTLAGHATÖBB			##	A megadott feltételeknek eleget tévő cellák átlagát (számtani közepét) adja eredményül.
-BETADIST		= BÉTA.ELOSZLÁS			##	A béta-eloszlás függvényt számítja ki.
-BETAINV			= INVERZ.BÉTA			##	Adott béta-eloszláshoz kiszámítja a béta eloszlásfüggvény inverzét.
-BINOMDIST		= BINOM.ELOSZLÁS		##	A diszkrét binomiális eloszlás valószínűségértékét számítja ki.
-CHIDIST			= KHI.ELOSZLÁS			##	A khi-négyzet-eloszlás egyszélű valószínűségértékét számítja ki.
-CHIINV			= INVERZ.KHI			##	A khi-négyzet-eloszlás egyszélű valószínűségértékének inverzét számítja ki.
-CHITEST			= KHI.PRÓBA			##	Függetlenségvizsgálatot hajt végre.
-CONFIDENCE		= MEGBÍZHATÓSÁG			##	Egy statisztikai sokaság várható értékének megbízhatósági intervallumát adja eredményül.
-CORREL			= KORREL			##	Két adathalmaz korrelációs együtthatóját számítja ki.
-COUNT			= DARAB				##	Megszámolja, hogy argumentumlistájában hány szám található.
-COUNTA			= DARAB2			##	Megszámolja, hogy argumentumlistájában hány érték található.
-COUNTBLANK		= DARABÜRES			##	Egy tartományban összeszámolja az üres cellákat.
-COUNTIF			= DARABTELI			##	Egy tartományban összeszámolja azokat a cellákat, amelyek eleget tesznek a megadott feltételnek.
-COUNTIFS		= DARABHATÖBB			##	Egy tartományban összeszámolja azokat a cellákat, amelyek eleget tesznek több feltételnek.
-COVAR			= KOVAR				##	A kovarianciát, azaz a páronkénti eltérések szorzatának átlagát számítja ki.
-CRITBINOM		= KRITBINOM			##	Azt a legkisebb számot adja eredményül, amelyre a binomiális eloszlásfüggvény értéke nem kisebb egy adott határértéknél.
-DEVSQ			= SQ				##	Az átlagtól való eltérések négyzetének összegét számítja ki.
-EXPONDIST		= EXP.ELOSZLÁS			##	Az exponenciális eloszlás értékét számítja ki.
-FDIST			= F.ELOSZLÁS			##	Az F-eloszlás értékét számítja ki.
-FINV			= INVERZ.F			##	Az F-eloszlás inverzének értékét számítja ki.
-FISHER			= FISHER			##	Fisher-transzformációt hajt végre.
-FISHERINV		= INVERZ.FISHER			##	A Fisher-transzformáció inverzét hajtja végre.
-FORECAST		= ELŐREJELZÉS			##	Az ismert értékek alapján lineáris regresszióval becsült értéket ad eredményül.
-FREQUENCY		= GYAKORISÁG			##	A gyakorisági vagy empirikus eloszlás értékét függőleges tömbként adja eredményül.
-FTEST			= F.PRÓBA			##	Az F-próba értékét adja eredményül.
-GAMMADIST		= GAMMA.ELOSZLÁS		##	A gamma-eloszlás értékét számítja ki.
-GAMMAINV		= INVERZ.GAMMA			##	A gamma-eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
-GAMMALN			= GAMMALN			##	A gamma-függvény természetes logaritmusát számítja ki.
-GEOMEAN			= MÉRTANI.KÖZÉP			##	Argumentumai mértani középértékét számítja ki.
-GROWTH			= NÖV				##	Exponenciális regresszió alapján ad becslést.
-HARMEAN			= HARM.KÖZÉP			##	Argumentumai harmonikus átlagát számítja ki.
-HYPGEOMDIST		= HIPERGEOM.ELOSZLÁS		##	A hipergeometriai eloszlás értékét számítja ki.
-INTERCEPT		= METSZ				##	A regressziós egyenes y tengellyel való metszéspontját határozza meg.
-KURT			= CSÚCSOSSÁG			##	Egy adathalmaz csúcsosságát számítja ki.
-LARGE			= NAGY				##	Egy adathalmaz k-adik legnagyobb elemét adja eredményül.
-LINEST			= LIN.ILL			##	A legkisebb négyzetek módszerével az adatokra illesztett egyenes paramétereit határozza meg.
-LOGEST			= LOG.ILL			##	Az adatokra illesztett exponenciális görbe paramétereit határozza meg.
-LOGINV			= INVERZ.LOG.ELOSZLÁS		##	A lognormális eloszlás inverzét számítja ki.
-LOGNORMDIST		= LOG.ELOSZLÁS			##	A lognormális eloszlásfüggvény értékét számítja ki.
-MAX			= MAX				##	Az argumentumai között szereplő legnagyobb számot adja meg.
-MAXA			= MAX2				##	Az argumentumai között szereplő legnagyobb számot adja meg (beleértve a számokat, szöveget és logikai értékeket).
-MEDIAN			= MEDIÁN			##	Adott számhalmaz mediánját számítja ki.
-MIN			= MIN				##	Az argumentumai között szereplő legkisebb számot adja meg.
-MINA			= MIN2				##	Az argumentumai között szereplő legkisebb számot adja meg, beleértve a számokat, szöveget és logikai értékeket.
-MODE			= MÓDUSZ			##	Egy adathalmazból kiválasztja a leggyakrabban előforduló számot.
-NEGBINOMDIST		= NEGBINOM.ELOSZL		##	A negatív binomiális eloszlás értékét számítja ki.
-NORMDIST		= NORM.ELOSZL			##	A normális eloszlás értékét számítja ki.
-NORMINV			= INVERZ.NORM			##	A normális eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
-NORMSDIST		= STNORMELOSZL			##	A standard normális eloszlás eloszlásfüggvényének értékét számítja ki.
-NORMSINV		= INVERZ.STNORM			##	A standard normális eloszlás eloszlásfüggvénye inverzének értékét számítja ki.
-PEARSON			= PEARSON			##	A Pearson-féle korrelációs együtthatót számítja ki.
-PERCENTILE		= PERCENTILIS			##	Egy tartományban található értékek k-adik percentilisét, azaz százalékosztályát adja eredményül.
-PERCENTRANK		= SZÁZALÉKRANG			##	Egy értéknek egy adathalmazon belül vett százalékos rangját (elhelyezkedését) számítja ki.
-PERMUT			= VARIÁCIÓK			##	Adott számú objektum k-ad osztályú ismétlés nélküli variációinak számát számítja ki.
-POISSON			= POISSON			##	A Poisson-eloszlás értékét számítja ki.
-PROB			= VALÓSZÍNŰSÉG			##	Annak valószínűségét számítja ki, hogy adott értékek két határérték közé esnek.
-QUARTILE		= KVARTILIS			##	Egy adathalmaz kvartilisét (negyedszintjét) számítja ki.
-RANK			= SORSZÁM			##	Kiszámítja, hogy egy szám hányadik egy számsorozatban.
-RSQ			= RNÉGYZET			##	Kiszámítja a Pearson-féle szorzatmomentum korrelációs együtthatójának négyzetét.
-SKEW			= FERDESÉG			##	Egy eloszlás ferdeségét határozza meg.
-SLOPE			= MEREDEKSÉG			##	Egy lineáris regressziós egyenes meredekségét számítja ki.
-SMALL			= KICSI				##	Egy adathalmaz k-adik legkisebb elemét adja meg.
-STANDARDIZE		= NORMALIZÁLÁS			##	Normalizált értéket ad eredményül.
-STDEV			= SZÓRÁS			##	Egy statisztikai sokaság mintájából kiszámítja annak szórását.
-STDEVA			= SZÓRÁSA			##	Egy statisztikai sokaság mintájából kiszámítja annak szórását (beleértve a számokat, szöveget és logikai értékeket).
-STDEVP			= SZÓRÁSP			##	Egy statisztikai sokaság egészéből kiszámítja annak szórását.
-STDEVPA			= SZÓRÁSPA			##	Egy statisztikai sokaság egészéből kiszámítja annak szórását (beleértve számokat, szöveget és logikai értékeket).
-STEYX			= STHIBAYX			##	Egy regresszió esetén az egyes x-értékek alapján meghatározott y-értékek standard hibáját számítja ki.
-TDIST			= T.ELOSZLÁS			##	A Student-féle t-eloszlás értékét számítja ki.
-TINV			= INVERZ.T			##	A Student-féle t-eloszlás inverzét számítja ki.
-TREND			= TREND				##	Lineáris trend értékeit számítja ki.
-TRIMMEAN		= RÉSZÁTLAG			##	Egy adathalmaz középső részének átlagát számítja ki.
-TTEST			= T.PRÓBA			##	A Student-féle t-próbához tartozó valószínűséget számítja ki.
-VAR			= VAR				##	Minta alapján becslést ad a varianciára.
-VARA			= VARA				##	Minta alapján becslést ad a varianciára (beleértve számokat, szöveget és logikai értékeket).
-VARP			= VARP				##	Egy statisztikai sokaság varianciáját számítja ki.
-VARPA			= VARPA				##	Egy statisztikai sokaság varianciáját számítja ki (beleértve számokat, szöveget és logikai értékeket).
-WEIBULL			= WEIBULL			##	A Weibull-féle eloszlás értékét számítja ki.
-ZTEST			= Z.PRÓBA			##	Az egyszélű z-próbával kapott valószínűségértéket számítja ki.
-
-
-##
-##	Text functions					Szövegműveletekhez használható függvények
-##
-ASC			= ASC				##	Szöveg teljes szélességű (kétbájtos) latin és katakana karaktereit félszélességű (egybájtos) karakterekké alakítja.
-BAHTTEXT		= BAHTSZÖVEG			##	Számot szöveggé alakít a ß (baht) pénznemformátum használatával.
-CHAR			= KARAKTER			##	A kódszámmal meghatározott karaktert adja eredményül.
-CLEAN			= TISZTÍT			##	A szövegből eltávolítja az összes nem nyomtatható karaktert.
-CODE			= KÓD				##	Karaktersorozat első karakterének numerikus kódját adja eredményül.
-CONCATENATE		= ÖSSZEFŰZ			##	Több szövegelemet egyetlen szöveges elemmé fűz össze.
-DOLLAR			= FORINT			##	Számot pénznem formátumú szöveggé alakít át.
-EXACT			= AZONOS			##	Megvizsgálja, hogy két érték azonos-e.
-FIND			= SZÖVEG.TALÁL			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk megkülönböztetésével).
-FINDB			= SZÖVEG.TALÁL2			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk megkülönböztetésével).
-FIXED			= FIX				##	Számot szöveges formátumúra alakít adott számú tizedesjegyre kerekítve.
-JIS			= JIS				##	A félszélességű (egybájtos) latin és a katakana karaktereket teljes szélességű (kétbájtos) karakterekké alakítja.
-LEFT			= BAL				##	Szöveg bal szélső karaktereit adja eredményül.
-LEFTB			= BAL2				##	Szöveg bal szélső karaktereit adja eredményül.
-LEN			= HOSSZ				##	Szöveg karakterekben mért hosszát adja eredményül.
-LENB			= HOSSZ2			##	Szöveg karakterekben mért hosszát adja eredményül.
-LOWER			= KISBETŰ			##	Szöveget kisbetűssé alakít át.
-MID			= KÖZÉP				##	A szöveg adott pozíciójától kezdve megadott számú karaktert ad vissza eredményként.
-MIDB			= KÖZÉP2			##	A szöveg adott pozíciójától kezdve megadott számú karaktert ad vissza eredményként.
-PHONETIC		= PHONETIC			##	Szöveg furigana (fonetikus) karaktereit adja vissza.
-PROPER			= TNÉV				##	Szöveg minden szavának kezdőbetűjét nagybetűsre cseréli.
-REPLACE			= CSERE				##	A szövegen belül karaktereket cserél.
-REPLACEB		= CSERE2			##	A szövegen belül karaktereket cserél.
-REPT			= SOKSZOR			##	Megadott számú alkalommal megismétel egy szövegrészt.
-RIGHT			= JOBB				##	Szövegrész jobb szélső karaktereit adja eredményül.
-RIGHTB			= JOBB2				##	Szövegrész jobb szélső karaktereit adja eredményül.
-SEARCH			= SZÖVEG.KERES			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk között nem tesz különbséget).
-SEARCHB			= SZÖVEG.KERES2			##	Karaktersorozatot keres egy másikban (a kis- és nagybetűk között nem tesz különbséget).
-SUBSTITUTE		= HELYETTE			##	Szövegben adott karaktereket másikra cserél.
-T			= T				##	Argumentumát szöveggé alakítja át.
-TEXT			= SZÖVEG			##	Számértéket alakít át adott számformátumú szöveggé.
-TRIM			= TRIM				##	A szövegből eltávolítja a szóközöket.
-UPPER			= NAGYBETŰS			##	Szöveget nagybetűssé alakít át.
-VALUE			= ÉRTÉK				##	Szöveget számmá alakít át.
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/it/config b/plugins/exportTypes/Excel/PHPExcel/locale/it/config
deleted file mode 100755
index 9dd67738d..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/it/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #NULLO!
-DIV0	= #DIV/0!
-VALUE	= #VALORE!
-REF	= #RIF!
-NAME	= #NOME?
-NUM	= #NUM!
-NA	= #N/D
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/it/functions b/plugins/exportTypes/Excel/PHPExcel/locale/it/functions
deleted file mode 100755
index abaee0de3..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/it/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Funzioni di automazione e dei componenti aggiuntivi
-##
-GETPIVOTDATA		= INFO.DATI.TAB.PIVOT		##	Restituisce i dati memorizzati in un rapporto di tabella pivot
-
-
-##
-##	Cube functions					Funzioni cubo
-##
-CUBEKPIMEMBER		= MEMBRO.KPI.CUBO		##	Restituisce il nome, la proprietà e la misura di un indicatore di prestazioni chiave (KPI) e visualizza il nome e la proprietà nella cella. Un KPI è una misura quantificabile, ad esempio l'utile lordo mensile o il fatturato trimestrale dei dipendenti, utilizzata per il monitoraggio delle prestazioni di un'organizzazione.
-CUBEMEMBER		= MEMBRO.CUBO			##	Restituisce un membro o una tupla in una gerarchia di cubi. Consente di verificare l'esistenza del membro o della tupla nel cubo.
-CUBEMEMBERPROPERTY	= PROPRIETÀ.MEMBRO.CUBO		##	Restituisce il valore di una proprietà di un membro del cubo. Consente di verificare l'esistenza di un nome di membro all'interno del cubo e di restituire la proprietà specificata per tale membro.
-CUBERANKEDMEMBER	= MEMBRO.CUBO.CON.RANGO		##	Restituisce l'n-esimo membro o il membro ordinato di un insieme. Consente di restituire uno o più elementi in un insieme, ad esempio l'agente di vendita migliore o i primi 10 studenti.
-CUBESET			= SET.CUBO			##	Definisce un insieme di tuple o membri calcolati mediante l'invio di un'espressione di insieme al cubo sul server. In questo modo l'insieme viene creato e restituito a Microsoft Office Excel.
-CUBESETCOUNT		= CONTA.SET.CUBO		##	Restituisce il numero di elementi di un insieme.
-CUBEVALUE		= VALORE.CUBO			##	Restituisce un valore aggregato da un cubo.
-
-
-##
-##	Database functions				Funzioni di database
-##
-DAVERAGE		= DB.MEDIA			##	Restituisce la media di voci del database selezionate
-DCOUNT			= DB.CONTA.NUMERI		##	Conta le celle di un database contenenti numeri
-DCOUNTA			= DB.CONTA.VALORI		##	Conta le celle non vuote in un database
-DGET			= DB.VALORI			##	Estrae da un database un singolo record che soddisfa i criteri specificati
-DMAX			= DB.MAX			##	Restituisce il valore massimo dalle voci selezionate in un database
-DMIN			= DB.MIN			##	Restituisce il valore minimo dalle voci di un database selezionate
-DPRODUCT		= DB.PRODOTTO			##	Moltiplica i valori in un determinato campo di record che soddisfano i criteri del database
-DSTDEV			= DB.DEV.ST			##	Restituisce una stima della deviazione standard sulla base di un campione di voci di un database selezionate
-DSTDEVP			= DB.DEV.ST.POP			##	Calcola la deviazione standard sulla base di tutte le voci di un database selezionate
-DSUM			= DB.SOMMA			##	Aggiunge i numeri nel campo colonna di record del database che soddisfa determinati criteri
-DVAR			= DB.VAR			##	Restituisce una stima della varianza sulla base di un campione da voci di un database selezionate
-DVARP			= DB.VAR.POP			##	Calcola la varianza sulla base di tutte le voci di un database selezionate
-
-
-##
-##	Date and time functions				Funzioni data e ora
-##
-DATE			= DATA				##	Restituisce il numero seriale di una determinata data
-DATEVALUE		= DATA.VALORE			##	Converte una data sotto forma di testo in un numero seriale
-DAY			= GIORNO			##	Converte un numero seriale in un giorno del mese
-DAYS360			= GIORNO360			##	Calcola il numero di giorni compreso tra due date basandosi su un anno di 360 giorni
-EDATE			= DATA.MESE			##	Restituisce il numero seriale della data che rappresenta il numero di mesi prima o dopo la data di inizio
-EOMONTH			= FINE.MESE			##	Restituisce il numero seriale dell'ultimo giorno del mese, prima o dopo un determinato numero di mesi
-HOUR			= ORA				##	Converte un numero seriale in un'ora
-MINUTE			= MINUTO			##	Converte un numero seriale in un minuto
-MONTH			= MESE				##	Converte un numero seriale in un mese
-NETWORKDAYS		= GIORNI.LAVORATIVI.TOT		##	Restituisce il numero di tutti i giorni lavorativi compresi fra due date
-NOW			= ADESSO			##	Restituisce il numero seriale della data e dell'ora corrente
-SECOND			= SECONDO			##	Converte un numero seriale in un secondo
-TIME			= ORARIO			##	Restituisce il numero seriale di una determinata ora
-TIMEVALUE		= ORARIO.VALORE			##	Converte un orario in forma di testo in un numero seriale
-TODAY			= OGGI				##	Restituisce il numero seriale relativo alla data odierna
-WEEKDAY			= GIORNO.SETTIMANA		##	Converte un numero seriale in un giorno della settimana
-WEEKNUM			= NUM.SETTIMANA			##	Converte un numero seriale in un numero che rappresenta la posizione numerica di una settimana nell'anno
-WORKDAY			= GIORNO.LAVORATIVO		##	Restituisce il numero della data prima o dopo un determinato numero di giorni lavorativi
-YEAR			= ANNO				##	Converte un numero seriale in un anno
-YEARFRAC		= FRAZIONE.ANNO			##	Restituisce la frazione dell'anno che rappresenta il numero dei giorni compresi tra una data_ iniziale e una data_finale
-
-
-##
-##	Engineering functions				Funzioni ingegneristiche
-##
-BESSELI			= BESSEL.I			##	Restituisce la funzione di Bessel modificata In(x)
-BESSELJ			= BESSEL.J			##	Restituisce la funzione di Bessel Jn(x)
-BESSELK			= BESSEL.K			##	Restituisce la funzione di Bessel modificata Kn(x)
-BESSELY			= BESSEL.Y			##	Restituisce la funzione di Bessel Yn(x)
-BIN2DEC			= BINARIO.DECIMALE		##	Converte un numero binario in decimale
-BIN2HEX			= BINARIO.HEX			##	Converte un numero binario in esadecimale
-BIN2OCT			= BINARIO.OCT			##	Converte un numero binario in ottale
-COMPLEX			= COMPLESSO			##	Converte i coefficienti reali e immaginari in numeri complessi
-CONVERT			= CONVERTI			##	Converte un numero da un sistema di misura in un altro
-DEC2BIN			= DECIMALE.BINARIO		##	Converte un numero decimale in binario
-DEC2HEX			= DECIMALE.HEX			##	Converte un numero decimale in esadecimale
-DEC2OCT			= DECIMALE.OCT			##	Converte un numero decimale in ottale
-DELTA			= DELTA				##	Verifica se due valori sono uguali
-ERF			= FUNZ.ERRORE			##	Restituisce la funzione di errore
-ERFC			= FUNZ.ERRORE.COMP		##	Restituisce la funzione di errore complementare
-GESTEP			= SOGLIA			##	Verifica se un numero è maggiore del valore di soglia
-HEX2BIN			= HEX.BINARIO			##	Converte un numero esadecimale in binario
-HEX2DEC			= HEX.DECIMALE			##	Converte un numero esadecimale in decimale
-HEX2OCT			= HEX.OCT			##	Converte un numero esadecimale in ottale
-IMABS			= COMP.MODULO			##	Restituisce il valore assoluto (modulo) di un numero complesso
-IMAGINARY		= COMP.IMMAGINARIO		##	Restituisce il coefficiente immaginario di un numero complesso
-IMARGUMENT		= COMP.ARGOMENTO		##	Restituisce l'argomento theta, un angolo espresso in radianti
-IMCONJUGATE		= COMP.CONIUGATO		##	Restituisce il complesso coniugato del numero complesso
-IMCOS			= COMP.COS			##	Restituisce il coseno di un numero complesso
-IMDIV			= COMP.DIV			##	Restituisce il quoziente di due numeri complessi
-IMEXP			= COMP.EXP			##	Restituisce il valore esponenziale di un numero complesso
-IMLN			= COMP.LN			##	Restituisce il logaritmo naturale di un numero complesso
-IMLOG10			= COMP.LOG10			##	Restituisce il logaritmo in base 10 di un numero complesso
-IMLOG2			= COMP.LOG2			##	Restituisce un logaritmo in base 2 di un numero complesso
-IMPOWER			= COMP.POTENZA			##	Restituisce il numero complesso elevato a una potenza intera
-IMPRODUCT		= COMP.PRODOTTO			##	Restituisce il prodotto di numeri complessi compresi tra 2 e 29
-IMREAL			= COMP.PARTE.REALE		##	Restituisce il coefficiente reale di un numero complesso
-IMSIN			= COMP.SEN			##	Restituisce il seno di un numero complesso
-IMSQRT			= COMP.RADQ			##	Restituisce la radice quadrata di un numero complesso
-IMSUB			= COMP.DIFF			##	Restituisce la differenza fra due numeri complessi
-IMSUM			= COMP.SOMMA			##	Restituisce la somma di numeri complessi
-OCT2BIN			= OCT.BINARIO			##	Converte un numero ottale in binario
-OCT2DEC			= OCT.DECIMALE			##	Converte un numero ottale in decimale
-OCT2HEX			= OCT.HEX			##	Converte un numero ottale in esadecimale
-
-
-##
-##	Financial functions				Funzioni finanziarie
-##
-ACCRINT			= INT.MATURATO.PER		##	Restituisce l'interesse maturato di un titolo che paga interessi periodici
-ACCRINTM		= INT.MATURATO.SCAD		##	Restituisce l'interesse maturato di un titolo che paga interessi alla scadenza
-AMORDEGRC		= AMMORT.DEGR			##	Restituisce l'ammortamento per ogni periodo contabile utilizzando un coefficiente di ammortamento
-AMORLINC		= AMMORT.PER			##	Restituisce l'ammortamento per ogni periodo contabile
-COUPDAYBS		= GIORNI.CED.INIZ.LIQ		##	Restituisce il numero dei giorni che vanno dall'inizio del periodo di durata della cedola alla data di liquidazione
-COUPDAYS		= GIORNI.CED			##	Restituisce il numero dei giorni relativi al periodo della cedola che contiene la data di liquidazione
-COUPDAYSNC		= GIORNI.CED.NUOVA		##	Restituisce il numero di giorni che vanno dalla data di liquidazione alla data della cedola successiva
-COUPNCD			= DATA.CED.SUCC			##	Restituisce un numero che rappresenta la data della cedola successiva alla data di liquidazione
-COUPNUM			= NUM.CED			##	Restituisce il numero di cedole pagabili fra la data di liquidazione e la data di scadenza
-COUPPCD			= DATA.CED.PREC			##	Restituisce un numero che rappresenta la data della cedola precedente alla data di liquidazione
-CUMIPMT			= INT.CUMUL			##	Restituisce l'interesse cumulativo pagato fra due periodi
-CUMPRINC		= CAP.CUM			##	Restituisce il capitale cumulativo pagato per estinguere un debito fra due periodi
-DB			= DB				##	Restituisce l'ammortamento di un bene per un periodo specificato utilizzando il metodo di ammortamento a quote fisse decrescenti
-DDB			= AMMORT			##	Restituisce l'ammortamento di un bene per un periodo specificato utilizzando il metodo di ammortamento a doppie quote decrescenti o altri metodi specificati
-DISC			= TASSO.SCONTO			##	Restituisce il tasso di sconto per un titolo
-DOLLARDE		= VALUTA.DEC			##	Converte un prezzo valuta, espresso come frazione, in prezzo valuta, espresso come numero decimale
-DOLLARFR		= VALUTA.FRAZ			##	Converte un prezzo valuta, espresso come numero decimale, in prezzo valuta, espresso come frazione
-DURATION		= DURATA			##	Restituisce la durata annuale di un titolo con i pagamenti di interesse periodico
-EFFECT			= EFFETTIVO			##	Restituisce l'effettivo tasso di interesse annuo
-FV			= VAL.FUT			##	Restituisce il valore futuro di un investimento
-FVSCHEDULE		= VAL.FUT.CAPITALE		##	Restituisce il valore futuro di un capitale iniziale dopo aver applicato una serie di tassi di interesse composti
-INTRATE			= TASSO.INT			##	Restituisce il tasso di interesse per un titolo interamente investito
-IPMT			= INTERESSI			##	Restituisce il valore degli interessi per un investimento relativo a un periodo specifico
-IRR			= TIR.COST			##	Restituisce il tasso di rendimento interno per una serie di flussi di cassa
-ISPMT			= INTERESSE.RATA		##	Calcola l'interesse di un investimento pagato durante un periodo specifico
-MDURATION		= DURATA.M			##	Restituisce la durata Macauley modificata per un titolo con un valore presunto di € 100
-MIRR			= TIR.VAR			##	Restituisce il tasso di rendimento interno in cui i flussi di cassa positivi e negativi sono finanziati a tassi differenti
-NOMINAL			= NOMINALE			##	Restituisce il tasso di interesse nominale annuale
-NPER			= NUM.RATE			##	Restituisce un numero di periodi relativi a un investimento
-NPV			= VAN				##	Restituisce il valore attuale netto di un investimento basato su una serie di flussi di cassa periodici e sul tasso di sconto
-ODDFPRICE		= PREZZO.PRIMO.IRR		##	Restituisce il prezzo di un titolo dal valore nominale di € 100 avente il primo periodo di durata irregolare
-ODDFYIELD		= REND.PRIMO.IRR		##	Restituisce il rendimento di un titolo avente il primo periodo di durata irregolare
-ODDLPRICE		= PREZZO.ULTIMO.IRR		##	Restituisce il prezzo di un titolo dal valore nominale di € 100 avente l'ultimo periodo di durata irregolare
-ODDLYIELD		= REND.ULTIMO.IRR		##	Restituisce il rendimento di un titolo avente l'ultimo periodo di durata irregolare
-PMT			= RATA				##	Restituisce il pagamento periodico di una rendita annua
-PPMT			= P.RATA			##	Restituisce il pagamento sul capitale di un investimento per un dato periodo
-PRICE			= PREZZO			##	Restituisce il prezzo di un titolo dal valore nominale di € 100 che paga interessi periodici
-PRICEDISC		= PREZZO.SCONT			##	Restituisce il prezzo di un titolo scontato dal valore nominale di € 100
-PRICEMAT		= PREZZO.SCAD			##	Restituisce il prezzo di un titolo dal valore nominale di € 100 che paga gli interessi alla scadenza
-PV			= VA				##	Restituisce il valore attuale di un investimento
-RATE			= TASSO				##	Restituisce il tasso di interesse per un periodo di un'annualità
-RECEIVED		= RICEV.SCAD			##	Restituisce l'ammontare ricevuto alla scadenza di un titolo interamente investito
-SLN			= AMMORT.COST			##	Restituisce l'ammortamento a quote costanti di un bene per un singolo periodo
-SYD			= AMMORT.ANNUO			##	Restituisce l'ammortamento a somma degli anni di un bene per un periodo specificato
-TBILLEQ			= BOT.EQUIV			##	Restituisce il rendimento equivalente ad un'obbligazione per un Buono ordinario del Tesoro
-TBILLPRICE		= BOT.PREZZO			##	Restituisce il prezzo di un Buono del Tesoro dal valore nominale di € 100
-TBILLYIELD		= BOT.REND			##	Restituisce il rendimento di un Buono del Tesoro
-VDB			= AMMORT.VAR			##	Restituisce l'ammortamento di un bene per un periodo specificato o parziale utilizzando il metodo a doppie quote proporzionali ai valori residui
-XIRR			= TIR.X				##	Restituisce il tasso di rendimento interno di un impiego di flussi di cassa
-XNPV			= VAN.X				##	Restituisce il valore attuale netto di un impiego di flussi di cassa non necessariamente periodici
-YIELD			= REND				##	Restituisce il rendimento di un titolo che frutta interessi periodici
-YIELDDISC		= REND.TITOLI.SCONT		##	Restituisce il rendimento annuale di un titolo scontato, ad esempio un Buono del Tesoro
-YIELDMAT		= REND.SCAD			##	Restituisce il rendimento annuo di un titolo che paga interessi alla scadenza
-
-
-##
-##	Information functions				Funzioni relative alle informazioni
-##
-CELL			= CELLA				##	Restituisce le informazioni sulla formattazione, la posizione o i contenuti di una cella
-ERROR.TYPE		= ERRORE.TIPO			##	Restituisce un numero che corrisponde a un tipo di errore
-INFO			= INFO				##	Restituisce le informazioni sull'ambiente operativo corrente
-ISBLANK			= VAL.VUOTO			##	Restituisce VERO se il valore è vuoto
-ISERR			= VAL.ERR			##	Restituisce VERO se il valore è un valore di errore qualsiasi tranne #N/D
-ISERROR			= VAL.ERRORE			##	Restituisce VERO se il valore è un valore di errore qualsiasi
-ISEVEN			= VAL.PARI			##	Restituisce VERO se il numero è pari
-ISLOGICAL		= VAL.LOGICO			##	Restituisce VERO se il valore è un valore logico
-ISNA			= VAL.NON.DISP			##	Restituisce VERO se il valore è un valore di errore #N/D
-ISNONTEXT		= VAL.NON.TESTO			##	Restituisce VERO se il valore non è in formato testo
-ISNUMBER		= VAL.NUMERO			##	Restituisce VERO se il valore è un numero
-ISODD			= VAL.DISPARI			##	Restituisce VERO se il numero è dispari
-ISREF			= VAL.RIF			##	Restituisce VERO se il valore è un riferimento
-ISTEXT			= VAL.TESTO			##	Restituisce VERO se il valore è in formato testo
-N			= NUM				##	Restituisce un valore convertito in numero
-NA			= NON.DISP			##	Restituisce il valore di errore #N/D
-TYPE			= TIPO				##	Restituisce un numero che indica il tipo di dati relativi a un valore
-
-
-##
-##	Logical functions				Funzioni logiche
-##
-AND			= E				##	Restituisce VERO se tutti gli argomenti sono VERO
-FALSE			= FALSO				##	Restituisce il valore logico FALSO
-IF			= SE				##	Specifica un test logico da eseguire
-IFERROR			= SE.ERRORE			##	Restituisce un valore specificato se una formula fornisce un errore come risultato; in caso contrario, restituisce il risultato della formula
-NOT			= NON				##	Inverte la logica degli argomenti
-OR			= O				##	Restituisce VERO se un argomento qualsiasi è VERO
-TRUE			= VERO				##	Restituisce il valore logico VERO
-
-
-##
-##	Lookup and reference functions			Funzioni di ricerca e di riferimento
-##
-ADDRESS			= INDIRIZZO			##	Restituisce un riferimento come testo in una singola cella di un foglio di lavoro
-AREAS			= AREE				##	Restituisce il numero di aree in un riferimento
-CHOOSE			= SCEGLI			##	Sceglie un valore da un elenco di valori
-COLUMN			= RIF.COLONNA			##	Restituisce il numero di colonna di un riferimento
-COLUMNS			= COLONNE			##	Restituisce il numero di colonne in un riferimento
-HLOOKUP			= CERCA.ORIZZ			##	Effettua una ricerca nella riga superiore di una matrice e restituisce il valore della cella specificata
-HYPERLINK		= COLLEG.IPERTESTUALE		##	Crea un collegamento che apre un documento memorizzato in un server di rete, una rete Intranet o Internet
-INDEX			= INDICE			##	Utilizza un indice per scegliere un valore da un riferimento o da una matrice
-INDIRECT		= INDIRETTO			##	Restituisce un riferimento specificato da un valore testo
-LOOKUP			= CERCA				##	Ricerca i valori in un vettore o in una matrice
-MATCH			= CONFRONTA			##	Ricerca i valori in un riferimento o in una matrice
-OFFSET			= SCARTO			##	Restituisce uno scarto di riferimento da un riferimento dato
-ROW			= RIF.RIGA			##	Restituisce il numero di riga di un riferimento
-ROWS			= RIGHE				##	Restituisce il numero delle righe in un riferimento
-RTD			= DATITEMPOREALE		##	Recupera dati in tempo reale da un programma che supporta l'automazione COM (automazione: Metodo per utilizzare gli oggetti di un'applicazione da un'altra applicazione o da un altro strumento di sviluppo. Precedentemente nota come automazione OLE, l'automazione è uno standard del settore e una caratteristica del modello COM (Component Object Model).)
-TRANSPOSE		= MATR.TRASPOSTA		##	Restituisce la trasposizione di una matrice
-VLOOKUP			= CERCA.VERT			##	Effettua una ricerca nella prima colonna di una matrice e si sposta attraverso la riga per restituire il valore di una cella
-
-
-##
-##	Math and trigonometry functions			Funzioni matematiche e trigonometriche
-##
-ABS			= ASS				##	Restituisce il valore assoluto di un numero.
-ACOS			= ARCCOS			##	Restituisce l'arcocoseno di un numero
-ACOSH			= ARCCOSH			##	Restituisce l'inverso del coseno iperbolico di un numero
-ASIN			= ARCSEN			##	Restituisce l'arcoseno di un numero
-ASINH			= ARCSENH			##	Restituisce l'inverso del seno iperbolico di un numero
-ATAN			= ARCTAN			##	Restituisce l'arcotangente di un numero
-ATAN2			= ARCTAN.2			##	Restituisce l'arcotangente delle coordinate x e y specificate
-ATANH			= ARCTANH			##	Restituisce l'inverso della tangente iperbolica di un numero
-CEILING			= ARROTONDA.ECCESSO		##	Arrotonda un numero per eccesso all'intero più vicino o al multiplo più vicino a peso
-COMBIN			= COMBINAZIONE			##	Restituisce il numero di combinazioni possibili per un numero assegnato di elementi
-COS			= COS				##	Restituisce il coseno dell'angolo specificato
-COSH			= COSH				##	Restituisce il coseno iperbolico di un numero
-DEGREES			= GRADI				##	Converte i radianti in gradi
-EVEN			= PARI				##	Arrotonda il valore assoluto di un numero per eccesso al più vicino intero pari
-EXP			= ESP				##	Restituisce il numero e elevato alla potenza di num
-FACT			= FATTORIALE			##	Restituisce il fattoriale di un numero
-FACTDOUBLE		= FATT.DOPPIO			##	Restituisce il fattoriale doppio di un numero
-FLOOR			= ARROTONDA.DIFETTO		##	Arrotonda un numero per difetto al multiplo più vicino a zero
-GCD			= MCD				##	Restituisce il massimo comune divisore
-INT			= INT				##	Arrotonda un numero per difetto al numero intero più vicino
-LCM			= MCM				##	Restituisce il minimo comune multiplo
-LN			= LN				##	Restituisce il logaritmo naturale di un numero
-LOG			= LOG				##	Restituisce il logaritmo di un numero in una specificata base
-LOG10			= LOG10				##	Restituisce il logaritmo in base 10 di un numero
-MDETERM			= MATR.DETERM			##	Restituisce il determinante di una matrice
-MINVERSE		= MATR.INVERSA			##	Restituisce l'inverso di una matrice
-MMULT			= MATR.PRODOTTO			##	Restituisce il prodotto di due matrici
-MOD			= RESTO				##	Restituisce il resto della divisione
-MROUND			= ARROTONDA.MULTIPLO		##	Restituisce un numero arrotondato al multiplo desiderato
-MULTINOMIAL		= MULTINOMIALE			##	Restituisce il multinomiale di un insieme di numeri
-ODD			= DISPARI			##	Arrotonda un numero per eccesso al più vicino intero dispari
-PI			= PI.GRECO			##	Restituisce il valore di pi greco
-POWER			= POTENZA			##	Restituisce il risultato di un numero elevato a potenza
-PRODUCT			= PRODOTTO			##	Moltiplica i suoi argomenti
-QUOTIENT		= QUOZIENTE			##	Restituisce la parte intera di una divisione
-RADIANS			= RADIANTI			##	Converte i gradi in radianti
-RAND			= CASUALE			##	Restituisce un numero casuale compreso tra 0 e 1
-RANDBETWEEN		= CASUALE.TRA			##	Restituisce un numero casuale compreso tra i numeri specificati
-ROMAN			= ROMANO			##	Restituisce il numero come numero romano sotto forma di testo
-ROUND			= ARROTONDA			##	Arrotonda il numero al numero di cifre specificato
-ROUNDDOWN		= ARROTONDA.PER.DIF		##	Arrotonda il valore assoluto di un numero per difetto
-ROUNDUP			= ARROTONDA.PER.ECC		##	Arrotonda il valore assoluto di un numero per eccesso
-SERIESSUM		= SOMMA.SERIE			##	Restituisce la somma di una serie di potenze in base alla formula
-SIGN			= SEGNO				##	Restituisce il segno di un numero
-SIN			= SEN				##	Restituisce il seno di un dato angolo
-SINH			= SENH				##	Restituisce il seno iperbolico di un numero
-SQRT			= RADQ				##	Restituisce una radice quadrata
-SQRTPI			= RADQ.PI.GRECO			##	Restituisce la radice quadrata di un numero (numero * pi greco)
-SUBTOTAL		= SUBTOTALE			##	Restituisce un subtotale in un elenco o in un database
-SUM			= SOMMA				##	Somma i suoi argomenti
-SUMIF			= SOMMA.SE			##	Somma le celle specificate da un dato criterio
-SUMIFS			= SOMMA.PIÙ.SE			##	Somma le celle in un intervallo che soddisfano più criteri
-SUMPRODUCT		= MATR.SOMMA.PRODOTTO		##	Restituisce la somma dei prodotti dei componenti corrispondenti della matrice
-SUMSQ			= SOMMA.Q			##	Restituisce la somma dei quadrati degli argomenti
-SUMX2MY2		= SOMMA.DIFF.Q			##	Restituisce la somma della differenza dei quadrati dei corrispondenti elementi in due matrici
-SUMX2PY2		= SOMMA.SOMMA.Q			##	Restituisce la somma della somma dei quadrati dei corrispondenti elementi in due matrici
-SUMXMY2			= SOMMA.Q.DIFF			##	Restituisce la somma dei quadrati delle differenze dei corrispondenti elementi in due matrici
-TAN			= TAN				##	Restituisce la tangente di un numero
-TANH			= TANH				##	Restituisce la tangente iperbolica di un numero
-TRUNC			= TRONCA			##	Tronca la parte decimale di un numero
-
-
-##
-##	Statistical functions				Funzioni statistiche
-##
-AVEDEV			= MEDIA.DEV			##	Restituisce la media delle deviazioni assolute delle coordinate rispetto alla loro media
-AVERAGE			= MEDIA				##	Restituisce la media degli argomenti
-AVERAGEA		= MEDIA.VALORI			##	Restituisce la media degli argomenti, inclusi i numeri, il testo e i valori logici
-AVERAGEIF		= MEDIA.SE			##	Restituisce la media aritmetica di tutte le celle in un intervallo che soddisfano un determinato criterio
-AVERAGEIFS		= MEDIA.PIÙ.SE			##	Restituisce la media aritmetica di tutte le celle che soddisfano più criteri
-BETADIST		= DISTRIB.BETA			##	Restituisce la funzione di distribuzione cumulativa beta
-BETAINV			= INV.BETA			##	Restituisce l'inverso della funzione di distribuzione cumulativa per una distribuzione beta specificata
-BINOMDIST		= DISTRIB.BINOM			##	Restituisce la distribuzione binomiale per il termine individuale
-CHIDIST			= DISTRIB.CHI			##	Restituisce la probabilità a una coda per la distribuzione del chi quadrato
-CHIINV			= INV.CHI			##	Restituisce l'inverso della probabilità ad una coda per la distribuzione del chi quadrato
-CHITEST			= TEST.CHI			##	Restituisce il test per l'indipendenza
-CONFIDENCE		= CONFIDENZA			##	Restituisce l'intervallo di confidenza per una popolazione
-CORREL			= CORRELAZIONE			##	Restituisce il coefficiente di correlazione tra due insiemi di dati
-COUNT			= CONTA.NUMERI			##	Conta la quantità di numeri nell'elenco di argomenti
-COUNTA			= CONTA.VALORI			##	Conta il numero di valori nell'elenco di argomenti
-COUNTBLANK		= CONTA.VUOTE			##	Conta il numero di celle vuote all'interno di un intervallo
-COUNTIF			= CONTA.SE			##	Conta il numero di celle all'interno di un intervallo che soddisfa i criteri specificati
-COUNTIFS		= CONTA.PIÙ.SE			##	Conta il numero di celle in un intervallo che soddisfano più criteri.
-COVAR			= COVARIANZA			##	Calcola la covarianza, la media dei prodotti delle deviazioni accoppiate
-CRITBINOM		= CRIT.BINOM			##	Restituisce il più piccolo valore per il quale la distribuzione cumulativa binomiale risulta maggiore o uguale ad un valore di criterio
-DEVSQ			= DEV.Q				##	Restituisce la somma dei quadrati delle deviazioni
-EXPONDIST		= DISTRIB.EXP			##	Restituisce la distribuzione esponenziale
-FDIST			= DISTRIB.F			##	Restituisce la distribuzione di probabilità F
-FINV			= INV.F				##	Restituisce l'inverso della distribuzione della probabilità F
-FISHER			= FISHER			##	Restituisce la trasformazione di Fisher
-FISHERINV		= INV.FISHER			##	Restituisce l'inverso della trasformazione di Fisher
-FORECAST		= PREVISIONE			##	Restituisce i valori lungo una tendenza lineare
-FREQUENCY		= FREQUENZA			##	Restituisce la distribuzione di frequenza come matrice verticale
-FTEST			= TEST.F			##	Restituisce il risultato di un test F
-GAMMADIST		= DISTRIB.GAMMA			##	Restituisce la distribuzione gamma
-GAMMAINV		= INV.GAMMA			##	Restituisce l'inverso della distribuzione cumulativa gamma
-GAMMALN			= LN.GAMMA			##	Restituisce il logaritmo naturale della funzione gamma, G(x)
-GEOMEAN			= MEDIA.GEOMETRICA		##	Restituisce la media geometrica
-GROWTH			= CRESCITA			##	Restituisce i valori lungo una linea di tendenza esponenziale
-HARMEAN			= MEDIA.ARMONICA		##	Restituisce la media armonica
-HYPGEOMDIST		= DISTRIB.IPERGEOM		##	Restituisce la distribuzione ipergeometrica
-INTERCEPT		= INTERCETTA			##	Restituisce l'intercetta della retta di regressione lineare
-KURT			= CURTOSI			##	Restituisce la curtosi di un insieme di dati
-LARGE			= GRANDE			##	Restituisce il k-esimo valore più grande in un insieme di dati
-LINEST			= REGR.LIN			##	Restituisce i parametri di una tendenza lineare
-LOGEST			= REGR.LOG			##	Restituisce i parametri di una linea di tendenza esponenziale
-LOGINV			= INV.LOGNORM			##	Restituisce l'inverso di una distribuzione lognormale
-LOGNORMDIST		= DISTRIB.LOGNORM		##	Restituisce la distribuzione lognormale cumulativa
-MAX			= MAX				##	Restituisce il valore massimo in un elenco di argomenti
-MAXA			= MAX.VALORI			##	Restituisce il valore massimo in un elenco di argomenti, inclusi i numeri, il testo e i valori logici
-MEDIAN			= MEDIANA			##	Restituisce la mediana dei numeri specificati
-MIN			= MIN				##	Restituisce il valore minimo in un elenco di argomenti
-MINA			= MIN.VALORI			##	Restituisce il più piccolo valore in un elenco di argomenti, inclusi i numeri, il testo e i valori logici
-MODE			= MODA				##	Restituisce il valore più comune in un insieme di dati
-NEGBINOMDIST		= DISTRIB.BINOM.NEG		##	Restituisce la distribuzione binomiale negativa
-NORMDIST		= DISTRIB.NORM			##	Restituisce la distribuzione cumulativa normale
-NORMINV			= INV.NORM			##	Restituisce l'inverso della distribuzione cumulativa normale standard
-NORMSDIST		= DISTRIB.NORM.ST		##	Restituisce la distribuzione cumulativa normale standard
-NORMSINV		= INV.NORM.ST			##	Restituisce l'inverso della distribuzione cumulativa normale
-PEARSON			= PEARSON			##	Restituisce il coefficiente del momento di correlazione di Pearson
-PERCENTILE		= PERCENTILE			##	Restituisce il k-esimo dato percentile di valori in un intervallo
-PERCENTRANK		= PERCENT.RANGO			##	Restituisce il rango di un valore in un insieme di dati come percentuale
-PERMUT			= PERMUTAZIONE			##	Restituisce il numero delle permutazioni per un determinato numero di oggetti
-POISSON			= POISSON			##	Restituisce la distribuzione di Poisson
-PROB			= PROBABILITÀ			##	Calcola la probabilità che dei valori in un intervallo siano compresi tra due limiti
-QUARTILE		= QUARTILE			##	Restituisce il quartile di un insieme di dati
-RANK			= RANGO				##	Restituisce il rango di un numero in un elenco di numeri
-RSQ			= RQ				##	Restituisce la radice quadrata del coefficiente di momento di correlazione di Pearson
-SKEW			= ASIMMETRIA			##	Restituisce il grado di asimmetria di una distribuzione
-SLOPE			= PENDENZA			##	Restituisce la pendenza di una retta di regressione lineare
-SMALL			= PICCOLO			##	Restituisce il k-esimo valore più piccolo in un insieme di dati
-STANDARDIZE		= NORMALIZZA			##	Restituisce un valore normalizzato
-STDEV			= DEV.ST			##	Restituisce una stima della deviazione standard sulla base di un campione
-STDEVA			= DEV.ST.VALORI			##	Restituisce una stima della deviazione standard sulla base di un campione, inclusi i numeri, il testo e i valori logici
-STDEVP			= DEV.ST.POP			##	Calcola la deviazione standard sulla base di un'intera popolazione
-STDEVPA			= DEV.ST.POP.VALORI		##	Calcola la deviazione standard sulla base sull'intera popolazione, inclusi i numeri, il testo e i valori logici
-STEYX			= ERR.STD.YX			##	Restituisce l'errore standard del valore previsto per y per ogni valore x nella regressione
-TDIST			= DISTRIB.T			##	Restituisce la distribuzione t di Student
-TINV			= INV.T				##	Restituisce l'inversa della distribuzione t di Student
-TREND			= TENDENZA			##	Restituisce i valori lungo una linea di tendenza lineare
-TRIMMEAN		= MEDIA.TRONCATA		##	Restituisce la media della parte interna di un insieme di dati
-TTEST			= TEST.T			##	Restituisce la probabilità associata ad un test t di Student
-VAR			= VAR				##	Stima la varianza sulla base di un campione
-VARA			= VAR.VALORI			##	Stima la varianza sulla base di un campione, inclusi i numeri, il testo e i valori logici
-VARP			= VAR.POP			##	Calcola la varianza sulla base dell'intera popolazione
-VARPA			= VAR.POP.VALORI		##	Calcola la deviazione standard sulla base sull'intera popolazione, inclusi i numeri, il testo e i valori logici
-WEIBULL			= WEIBULL			##	Restituisce la distribuzione di Weibull
-ZTEST			= TEST.Z			##	Restituisce il valore di probabilità a una coda per un test z
-
-
-##
-##	Text functions					Funzioni di testo
-##
-ASC			= ASC				##	Modifica le lettere inglesi o il katakana a doppio byte all'interno di una stringa di caratteri in caratteri a singolo byte
-BAHTTEXT		= BAHTTESTO			##	Converte un numero in testo, utilizzando il formato valuta ß (baht)
-CHAR			= CODICE.CARATT			##	Restituisce il carattere specificato dal numero di codice
-CLEAN			= LIBERA			##	Elimina dal testo tutti i caratteri che non è possibile stampare
-CODE			= CODICE			##	Restituisce il codice numerico del primo carattere di una stringa di testo
-CONCATENATE		= CONCATENA			##	Unisce diversi elementi di testo in un unico elemento di testo
-DOLLAR			= VALUTA			##	Converte un numero in testo, utilizzando il formato valuta € (euro)
-EXACT			= IDENTICO			##	Verifica se due valori di testo sono uguali
-FIND			= TROVA				##	Rileva un valore di testo all'interno di un altro (distinzione tra maiuscole e minuscole)
-FINDB			= TROVA.B			##	Rileva un valore di testo all'interno di un altro (distinzione tra maiuscole e minuscole)
-FIXED			= FISSO				##	Formatta un numero come testo con un numero fisso di decimali
-JIS			= ORDINAMENTO.JIS		##	Modifica le lettere inglesi o i caratteri katakana a byte singolo all'interno di una stringa di caratteri in caratteri a byte doppio.
-LEFT			= SINISTRA			##	Restituisce il carattere più a sinistra di un valore di testo
-LEFTB			= SINISTRA.B			##	Restituisce il carattere più a sinistra di un valore di testo
-LEN			= LUNGHEZZA			##	Restituisce il numero di caratteri di una stringa di testo
-LENB			= LUNB				##	Restituisce il numero di caratteri di una stringa di testo
-LOWER			= MINUSC			##	Converte il testo in lettere minuscole
-MID			= MEDIA				##	Restituisce un numero specifico di caratteri di una stringa di testo a partire dalla posizione specificata
-MIDB			= MEDIA.B			##	Restituisce un numero specifico di caratteri di una stringa di testo a partire dalla posizione specificata
-PHONETIC		= FURIGANA			##	Estrae i caratteri fonetici (furigana) da una stringa di testo.
-PROPER			= MAIUSC.INIZ			##	Converte in maiuscolo la prima lettera di ogni parola di un valore di testo
-REPLACE			= RIMPIAZZA			##	Sostituisce i caratteri all'interno di un testo
-REPLACEB		= SOSTITUISCI.B			##	Sostituisce i caratteri all'interno di un testo
-REPT			= RIPETI			##	Ripete un testo per un dato numero di volte
-RIGHT			= DESTRA			##	Restituisce il carattere più a destra di un valore di testo
-RIGHTB			= DESTRA.B			##	Restituisce il carattere più a destra di un valore di testo
-SEARCH			= RICERCA			##	Rileva un valore di testo all'interno di un altro (non è sensibile alle maiuscole e minuscole)
-SEARCHB			= CERCA.B			##	Rileva un valore di testo all'interno di un altro (non è sensibile alle maiuscole e minuscole)
-SUBSTITUTE		= SOSTITUISCI			##	Sostituisce il nuovo testo al testo contenuto in una stringa
-T			= T				##	Converte gli argomenti in testo
-TEXT			= TESTO				##	Formatta un numero e lo converte in testo
-TRIM			= ANNULLA.SPAZI			##	Elimina gli spazi dal testo
-UPPER			= MAIUSC			##	Converte il testo in lettere maiuscole
-VALUE			= VALORE			##	Converte un argomento di testo in numero
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/nl/config b/plugins/exportTypes/Excel/PHPExcel/locale/nl/config
deleted file mode 100755
index a363e50aa..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/nl/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #LEEG!
-DIV0	= #DEEL/0!
-VALUE	= #WAARDE!
-REF	= #VERW!
-NAME	= #NAAM?
-NUM	= #GETAL!
-NA	= #N/B
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/nl/functions b/plugins/exportTypes/Excel/PHPExcel/locale/nl/functions
deleted file mode 100755
index f7b5071ae..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/nl/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Automatiseringsfuncties en functies in invoegtoepassingen
-##
-GETPIVOTDATA		= DRAAITABEL.OPHALEN		##	Geeft gegevens uit een draaitabelrapport als resultaat
-
-
-##
-##	Cube functions					Kubusfuncties
-##
-CUBEKPIMEMBER		= KUBUSKPILID			##	Retourneert de naam, eigenschap en waarde van een KPI (prestatie-indicator) en geeft de naam en de eigenschap in de cel weer. Een KPI is een meetbare waarde, zoals de maandelijkse brutowinst of de omzet per kwartaal per werknemer, die wordt gebruikt om de prestaties van een organisatie te bewaken
-CUBEMEMBER		= KUBUSLID			##	Retourneert een lid of tupel in een kubushiërarchie. Wordt gebruikt om te controleren of het lid of de tupel in de kubus aanwezig is
-CUBEMEMBERPROPERTY	= KUBUSLIDEIGENSCHAP		##	Retourneert de waarde van een lideigenschap in de kubus. Wordt gebruikt om te controleren of de lidnaam in de kubus bestaat en retourneert de opgegeven eigenschap voor dit lid
-CUBERANKEDMEMBER	= KUBUSGERANGCHIKTLID		##	Retourneert het zoveelste, gerangschikte lid in een set. Wordt gebruikt om een of meer elementen in een set te retourneren, zoals de tien beste verkopers of de tien beste studenten
-CUBESET			= KUBUSSET			##	Definieert een berekende set leden of tupels door een ingestelde expressie naar de kubus op de server te sturen, alwaar de set wordt gemaakt en vervolgens wordt geretourneerd naar Microsoft Office Excel
-CUBESETCOUNT		= KUBUSSETAANTAL		##	Retourneert het aantal onderdelen in een set
-CUBEVALUE		= KUBUSWAARDE			##	Retourneert een samengestelde waarde van een kubus
-
-
-##
-##	Database functions				Databasefuncties
-##
-DAVERAGE		= DBGEMIDDELDE			##	Berekent de gemiddelde waarde in geselecteerde databasegegevens
-DCOUNT			= DBAANTAL			##	Telt de cellen met getallen in een database
-DCOUNTA			= DBAANTALC			##	Telt de niet-lege cellen in een database
-DGET			= DBLEZEN			##	Retourneert één record dat voldoet aan de opgegeven criteria uit een database
-DMAX			= DBMAX				##	Retourneert de maximumwaarde in de geselecteerde databasegegevens
-DMIN			= DBMIN				##	Retourneert de minimumwaarde in de geselecteerde databasegegevens
-DPRODUCT		= DBPRODUCT			##	Vermenigvuldigt de waarden in een bepaald veld van de records die voldoen aan de criteria in een database
-DSTDEV			= DBSTDEV			##	Maakt een schatting van de standaarddeviatie op basis van een steekproef uit geselecteerde databasegegevens
-DSTDEVP			= DBSTDEVP			##	Berekent de standaarddeviatie op basis van de volledige populatie van geselecteerde databasegegevens
-DSUM			= DBSOM				##	Telt de getallen uit een kolom records in de database op die voldoen aan de criteria
-DVAR			= DBVAR				##	Maakt een schatting van de variantie op basis van een steekproef uit geselecteerde databasegegevens
-DVARP			= DBVARP			##	Berekent de variantie op basis van de volledige populatie van geselecteerde databasegegevens
-
-
-##
-##	Date and time functions				Datum- en tijdfuncties
-##
-DATE			= DATUM				##	Geeft als resultaat het seriële getal van een opgegeven datum
-DATEVALUE		= DATUMWAARDE			##	Converteert een datum in de vorm van tekst naar een serieel getal
-DAY			= DAG				##	Converteert een serieel getal naar een dag van de maand
-DAYS360			= DAGEN360			##	Berekent het aantal dagen tussen twee datums op basis van een jaar met 360 dagen
-EDATE			= ZELFDE.DAG			##	Geeft als resultaat het seriële getal van een datum die het opgegeven aantal maanden voor of na de begindatum ligt
-EOMONTH			= LAATSTE.DAG			##	Geeft als resultaat het seriële getal van de laatste dag van de maand voor of na het opgegeven aantal maanden
-HOUR			= UUR				##	Converteert een serieel getal naar uren
-MINUTE			= MINUUT			##	Converteert een serieel naar getal minuten
-MONTH			= MAAND				##	Converteert een serieel getal naar een maand
-NETWORKDAYS		= NETTO.WERKDAGEN		##	Geeft als resultaat het aantal hele werkdagen tussen twee datums
-NOW			= NU				##	Geeft als resultaat het seriële getal van de huidige datum en tijd
-SECOND			= SECONDE			##	Converteert een serieel getal naar seconden
-TIME			= TIJD				##	Geeft als resultaat het seriële getal van een bepaald tijdstip
-TIMEVALUE		= TIJDWAARDE			##	Converteert de tijd in de vorm van tekst naar een serieel getal
-TODAY			= VANDAAG			##	Geeft als resultaat het seriële getal van de huidige datum
-WEEKDAY			= WEEKDAG			##	Converteert een serieel getal naar een weekdag
-WEEKNUM			= WEEKNUMMER			##	Converteert een serieel getal naar een weeknummer
-WORKDAY			= WERKDAG			##	Geeft als resultaat het seriële getal van de datum voor of na een bepaald aantal werkdagen
-YEAR			= JAAR				##	Converteert een serieel getal naar een jaar
-YEARFRAC		= JAAR.DEEL			##	Geeft als resultaat het gedeelte van het jaar, uitgedrukt in het aantal hele dagen tussen begindatum en einddatum
-
-
-##
-##	Engineering functions				Technische functies
-##
-BESSELI			= BESSEL.Y			##	Geeft als resultaat de gewijzigde Bessel-functie In(x)
-BESSELJ			= BESSEL.J			##	Geeft als resultaat de Bessel-functie Jn(x)
-BESSELK			= BESSEL.K			##	Geeft als resultaat de gewijzigde Bessel-functie Kn(x)
-BESSELY			= BESSEL.Y			##	Geeft als resultaat de gewijzigde Bessel-functie Yn(x)
-BIN2DEC			= BIN.N.DEC			##	Converteert een binair getal naar een decimaal getal
-BIN2HEX			= BIN.N.HEX			##	Converteert een binair getal naar een hexadecimaal getal
-BIN2OCT			= BIN.N.OCT			##	Converteert een binair getal naar een octaal getal
-COMPLEX			= COMPLEX			##	Converteert reële en imaginaire coëfficiënten naar een complex getal
-CONVERT			= CONVERTEREN			##	Converteert een getal in de ene maateenheid naar een getal in een andere maateenheid
-DEC2BIN			= DEC.N.BIN			##	Converteert een decimaal getal naar een binair getal
-DEC2HEX			= DEC.N.HEX			##	Converteert een decimaal getal naar een hexadecimaal getal
-DEC2OCT			= DEC.N.OCT			##	Converteert een decimaal getal naar een octaal getal
-DELTA			= DELTA				##	Test of twee waarden gelijk zijn
-ERF			= FOUTFUNCTIE			##	Geeft als resultaat de foutfunctie
-ERFC			= FOUT.COMPLEMENT		##	Geeft als resultaat de complementaire foutfunctie
-GESTEP			= GROTER.DAN			##	Test of een getal groter is dan de drempelwaarde
-HEX2BIN			= HEX.N.BIN			##	Converteert een hexadecimaal getal naar een binair getal
-HEX2DEC			= HEX.N.DEC			##	Converteert een hexadecimaal getal naar een decimaal getal
-HEX2OCT			= HEX.N.OCT			##	Converteert een hexadecimaal getal naar een octaal getal
-IMABS			= C.ABS				##	Geeft als resultaat de absolute waarde (modulus) van een complex getal
-IMAGINARY		= C.IM.DEEL			##	Geeft als resultaat de imaginaire coëfficiënt van een complex getal
-IMARGUMENT		= C.ARGUMENT			##	Geeft als resultaat het argument thèta, een hoek uitgedrukt in radialen
-IMCONJUGATE		= C.TOEGEVOEGD			##	Geeft als resultaat het complexe toegevoegde getal van een complex getal
-IMCOS			= C.COS				##	Geeft als resultaat de cosinus van een complex getal
-IMDIV			= C.QUOTIENT			##	Geeft als resultaat het quotiënt van twee complexe getallen
-IMEXP			= C.EXP				##	Geeft als resultaat de exponent van een complex getal
-IMLN			= C.LN				##	Geeft als resultaat de natuurlijke logaritme van een complex getal
-IMLOG10			= C.LOG10			##	Geeft als resultaat de logaritme met grondtal 10 van een complex getal
-IMLOG2			= C.LOG2			##	Geeft als resultaat de logaritme met grondtal 2 van een complex getal
-IMPOWER			= C.MACHT			##	Geeft als resultaat een complex getal dat is verheven tot de macht van een geheel getal
-IMPRODUCT		= C.PRODUCT			##	Geeft als resultaat het product van complexe getallen
-IMREAL			= C.REEEL.DEEL			##	Geeft als resultaat de reële coëfficiënt van een complex getal
-IMSIN			= C.SIN				##	Geeft als resultaat de sinus van een complex getal
-IMSQRT			= C.WORTEL			##	Geeft als resultaat de vierkantswortel van een complex getal
-IMSUB			= C.VERSCHIL			##	Geeft als resultaat het verschil tussen twee complexe getallen
-IMSUM			= C.SOM				##	Geeft als resultaat de som van complexe getallen
-OCT2BIN			= OCT.N.BIN			##	Converteert een octaal getal naar een binair getal
-OCT2DEC			= OCT.N.DEC			##	Converteert een octaal getal naar een decimaal getal
-OCT2HEX			= OCT.N.HEX			##	Converteert een octaal getal naar een hexadecimaal getal
-
-
-##
-##	Financial functions				Financiële functies
-##
-ACCRINT			= SAMENG.RENTE			##	Berekent de opgelopen rente voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
-ACCRINTM		= SAMENG.RENTE.V		##	Berekent de opgelopen rente voor een waardepapier waarvan de rente op de vervaldatum wordt uitgekeerd
-AMORDEGRC		= AMORDEGRC			##	Geeft als resultaat de afschrijving voor elke boekingsperiode door een afschrijvingscoëfficiënt toe te passen
-AMORLINC		= AMORLINC			##	Berekent de afschrijving voor elke boekingsperiode
-COUPDAYBS		= COUP.DAGEN.BB			##	Berekent het aantal dagen vanaf het begin van de coupontermijn tot de stortingsdatum
-COUPDAYS		= COUP.DAGEN			##	Geeft als resultaat het aantal dagen in de coupontermijn waarin de stortingsdatum valt
-COUPDAYSNC		= COUP.DAGEN.VV			##	Geeft als resultaat het aantal dagen vanaf de stortingsdatum tot de volgende couponvervaldatum
-COUPNCD			= COUP.DATUM.NB			##	Geeft als resultaat de volgende coupondatum na de stortingsdatum
-COUPNUM			= COUP.AANTAL			##	Geeft als resultaat het aantal coupons dat nog moet worden uitbetaald tussen de stortingsdatum en de vervaldatum
-COUPPCD			= COUP.DATUM.VB			##	Geeft als resultaat de vorige couponvervaldatum vóór de stortingsdatum
-CUMIPMT			= CUM.RENTE			##	Geeft als resultaat de cumulatieve rente die tussen twee termijnen is uitgekeerd
-CUMPRINC		= CUM.HOOFDSOM			##	Geeft als resultaat de cumulatieve hoofdsom van een lening die tussen twee termijnen is terugbetaald
-DB			= DB				##	Geeft als resultaat de afschrijving van activa voor een bepaalde periode met behulp van de 'fixed declining balance'-methode
-DDB			= DDB				##	Geeft als resultaat de afschrijving van activa over een bepaalde termijn met behulp van de 'double declining balance'-methode of een andere methode die u opgeeft
-DISC			= DISCONTO			##	Geeft als resultaat het discontopercentage voor een waardepapier
-DOLLARDE		= EURO.DE			##	Converteert een prijs in euro's, uitgedrukt in een breuk, naar een prijs in euro's, uitgedrukt in een decimaal getal
-DOLLARFR		= EURO.BR			##	Converteert een prijs in euro's, uitgedrukt in een decimaal getal, naar een prijs in euro's, uitgedrukt in een breuk
-DURATION		= DUUR				##	Geeft als resultaat de gewogen gemiddelde looptijd voor een waardepapier met periodieke rentebetalingen
-EFFECT			= EFFECT.RENTE			##	Geeft als resultaat het effectieve jaarlijkse rentepercentage
-FV			= TW				##	Geeft als resultaat de toekomstige waarde van een investering
-FVSCHEDULE		= TOEK.WAARDE2			##	Geeft als resultaat de toekomstige waarde van een bepaalde hoofdsom na het toepassen van een reeks samengestelde rentepercentages
-INTRATE			= RENTEPERCENTAGE		##	Geeft als resultaat het rentepercentage voor een volgestort waardepapier
-IPMT			= IBET				##	Geeft als resultaat de te betalen rente voor een investering over een bepaalde termijn
-IRR			= IR				##	Geeft als resultaat de interne rentabiliteit voor een reeks cashflows
-ISPMT			= ISBET				##	Geeft als resultaat de rente die is betaald tijdens een bepaalde termijn van een investering
-MDURATION		= AANG.DUUR			##	Geeft als resultaat de aangepaste Macauley-looptijd voor een waardepapier, aangenomen dat de nominale waarde € 100 bedraagt
-MIRR			= GIR				##	Geeft als resultaat de interne rentabiliteit voor een serie cashflows, waarbij voor betalingen een ander rentepercentage geldt dan voor inkomsten
-NOMINAL			= NOMINALE.RENTE		##	Geeft als resultaat het nominale jaarlijkse rentepercentage
-NPER			= NPER				##	Geeft als resultaat het aantal termijnen van een investering
-NPV			= NHW				##	Geeft als resultaat de netto huidige waarde van een investering op basis van een reeks periodieke cashflows en een discontopercentage
-ODDFPRICE		= AFW.ET.PRIJS			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier met een afwijkende eerste termijn
-ODDFYIELD		= AFW.ET.REND			##	Geeft als resultaat het rendement voor een waardepapier met een afwijkende eerste termijn
-ODDLPRICE		= AFW.LT.PRIJS			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier met een afwijkende laatste termijn
-ODDLYIELD		= AFW.LT.REND			##	Geeft als resultaat het rendement voor een waardepapier met een afwijkende laatste termijn
-PMT			= BET				##	Geeft als resultaat de periodieke betaling voor een annuïteit
-PPMT			= PBET				##	Geeft als resultaat de afbetaling op de hoofdsom voor een bepaalde termijn
-PRICE			= PRIJS.NOM			##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
-PRICEDISC		= PRIJS.DISCONTO		##	Geeft als resultaat de prijs per € 100 nominale waarde voor een verdisconteerd waardepapier
-PRICEMAT		= PRIJS.VERVALDAG		##	Geeft als resultaat de prijs per € 100 nominale waarde voor een waardepapier waarvan de rente wordt uitgekeerd op de vervaldatum
-PV			= HW				##	Geeft als resultaat de huidige waarde van een investering
-RATE			= RENTE				##	Geeft als resultaat het periodieke rentepercentage voor een annuïteit
-RECEIVED		= OPBRENGST			##	Geeft als resultaat het bedrag dat op de vervaldatum wordt uitgekeerd voor een volgestort waardepapier
-SLN			= LIN.AFSCHR			##	Geeft als resultaat de lineaire afschrijving van activa over één termijn
-SYD			= SYD				##	Geeft als resultaat de afschrijving van activa over een bepaalde termijn met behulp van de 'Sum-Of-Years-Digits'-methode
-TBILLEQ			= SCHATK.OBL			##	Geeft als resultaat het rendement op schatkistpapier, dat op dezelfde manier wordt berekend als het rendement op obligaties
-TBILLPRICE		= SCHATK.PRIJS			##	Bepaalt de prijs per € 100 nominale waarde voor schatkistpapier
-TBILLYIELD		= SCHATK.REND			##	Berekent het rendement voor schatkistpapier
-VDB			= VDB				##	Geeft als resultaat de afschrijving van activa over een gehele of gedeeltelijke termijn met behulp van de 'declining balance'-methode
-XIRR			= IR.SCHEMA			##	Berekent de interne rentabiliteit voor een betalingsschema van cashflows
-XNPV			= NHW2				##	Berekent de huidige nettowaarde voor een betalingsschema van cashflows
-YIELD			= RENDEMENT			##	Geeft als resultaat het rendement voor een waardepapier waarvan de rente periodiek wordt uitgekeerd
-YIELDDISC		= REND.DISCONTO			##	Geeft als resultaat het jaarlijkse rendement voor een verdisconteerd waardepapier, bijvoorbeeld schatkistpapier
-YIELDMAT		= REND.VERVAL			##	Geeft als resultaat het jaarlijkse rendement voor een waardepapier waarvan de rente wordt uitgekeerd op de vervaldatum
-
-
-##
-##	Information functions				Informatiefuncties
-##
-CELL			= CEL				##	Geeft als resultaat informatie over de opmaak, locatie of inhoud van een cel
-ERROR.TYPE		= TYPE.FOUT			##	Geeft als resultaat een getal dat overeenkomt met een van de foutwaarden van Microsoft Excel
-INFO			= INFO				##	Geeft als resultaat informatie over de huidige besturingsomgeving
-ISBLANK			= ISLEEG			##	Geeft als resultaat WAAR als de waarde leeg is
-ISERR			= ISFOUT2			##	Geeft als resultaat WAAR als de waarde een foutwaarde is, met uitzondering van #N/B
-ISERROR			= ISFOUT			##	Geeft als resultaat WAAR als de waarde een foutwaarde is
-ISEVEN			= IS.EVEN			##	Geeft als resultaat WAAR als het getal even is
-ISLOGICAL		= ISLOGISCH			##	Geeft als resultaat WAAR als de waarde een logische waarde is
-ISNA			= ISNB				##	Geeft als resultaat WAAR als de waarde de foutwaarde #N/B is
-ISNONTEXT		= ISGEENTEKST			##	Geeft als resultaat WAAR als de waarde geen tekst is
-ISNUMBER		= ISGETAL			##	Geeft als resultaat WAAR als de waarde een getal is
-ISODD			= IS.ONEVEN			##	Geeft als resultaat WAAR als het getal oneven is
-ISREF			= ISVERWIJZING			##	Geeft als resultaat WAAR als de waarde een verwijzing is
-ISTEXT			= ISTEKST			##	Geeft als resultaat WAAR als de waarde tekst is
-N			= N				##	Geeft als resultaat een waarde die is geconverteerd naar een getal
-NA			= NB				##	Geeft als resultaat de foutwaarde #N/B
-TYPE			= TYPE				##	Geeft als resultaat een getal dat het gegevenstype van een waarde aangeeft
-
-
-##
-##	Logical functions				Logische functies
-##
-AND			= EN				##	Geeft als resultaat WAAR als alle argumenten WAAR zijn
-FALSE			= ONWAAR			##	Geeft als resultaat de logische waarde ONWAAR
-IF			= ALS				##	Geeft een logische test aan
-IFERROR			= ALS.FOUT			##	Retourneert een waarde die u opgeeft als een formule een fout oplevert, anders wordt het resultaat van de formule geretourneerd
-NOT			= NIET				##	Keert de logische waarde van het argument om
-OR			= OF				##	Geeft als resultaat WAAR als minimaal een van de argumenten WAAR is
-TRUE			= WAAR				##	Geeft als resultaat de logische waarde WAAR
-
-
-##
-##	Lookup and reference functions			Zoek- en verwijzingsfuncties
-##
-ADDRESS			= ADRES				##	Geeft als resultaat een verwijzing, in de vorm van tekst, naar één bepaalde cel in een werkblad
-AREAS			= BEREIKEN			##	Geeft als resultaat het aantal bereiken in een verwijzing
-CHOOSE			= KIEZEN			##	Kiest een waarde uit een lijst met waarden
-COLUMN			= KOLOM				##	Geeft als resultaat het kolomnummer van een verwijzing
-COLUMNS			= KOLOMMEN			##	Geeft als resultaat het aantal kolommen in een verwijzing
-HLOOKUP			= HORIZ.ZOEKEN			##	Zoekt in de bovenste rij van een matrix naar een bepaalde waarde en geeft als resultaat de gevonden waarde in de opgegeven cel
-HYPERLINK		= HYPERLINK			##	Maakt een snelkoppeling of een sprong waarmee een document wordt geopend dat is opgeslagen op een netwerkserver, een intranet of op internet
-INDEX			= INDEX				##	Kiest met een index een waarde uit een verwijzing of een matrix
-INDIRECT		= INDIRECT			##	Geeft als resultaat een verwijzing die wordt aangegeven met een tekstwaarde
-LOOKUP			= ZOEKEN			##	Zoekt naar bepaalde waarden in een vector of een matrix
-MATCH			= VERGELIJKEN			##	Zoekt naar bepaalde waarden in een verwijzing of een matrix
-OFFSET			= VERSCHUIVING			##	Geeft als resultaat een nieuwe verwijzing die is verschoven ten opzichte van een bepaalde verwijzing
-ROW			= RIJ				##	Geeft als resultaat het rijnummer van een verwijzing
-ROWS			= RIJEN				##	Geeft als resultaat het aantal rijen in een verwijzing
-RTD			= RTG				##	Haalt realtimegegevens op uit een programma dat COM-automatisering (automatisering: een methode waarmee de ene toepassing objecten van een andere toepassing of ontwikkelprogramma kan besturen. Automatisering werd vroeger OLE-automatisering genoemd. Automatisering is een industrienorm die deel uitmaakt van het Component Object Model (COM).) ondersteunt
-TRANSPOSE		= TRANSPONEREN			##	Geeft als resultaat de getransponeerde van een matrix
-VLOOKUP			= VERT.ZOEKEN			##	Zoekt in de meest linkse kolom van een matrix naar een bepaalde waarde en geeft als resultaat de waarde in de opgegeven cel
-
-
-##
-##	Math and trigonometry functions			Wiskundige en trigonometrische functies
-##
-ABS			= ABS				##	Geeft als resultaat de absolute waarde van een getal
-ACOS			= BOOGCOS			##	Geeft als resultaat de boogcosinus van een getal
-ACOSH			= BOOGCOSH			##	Geeft als resultaat de inverse cosinus hyperbolicus van een getal
-ASIN			= BOOGSIN			##	Geeft als resultaat de boogsinus van een getal
-ASINH			= BOOGSINH			##	Geeft als resultaat de inverse sinus hyperbolicus van een getal
-ATAN			= BOOGTAN			##	Geeft als resultaat de boogtangens van een getal
-ATAN2			= BOOGTAN2			##	Geeft als resultaat de boogtangens van de x- en y-coördinaten
-ATANH			= BOOGTANH			##	Geeft als resultaat de inverse tangens hyperbolicus van een getal
-CEILING			= AFRONDEN.BOVEN		##	Rondt de absolute waarde van een getal naar boven af op het dichtstbijzijnde gehele getal of het dichtstbijzijnde significante veelvoud
-COMBIN			= COMBINATIES			##	Geeft als resultaat het aantal combinaties voor een bepaald aantal objecten
-COS			= COS				##	Geeft als resultaat de cosinus van een getal
-COSH			= COSH				##	Geeft als resultaat de cosinus hyperbolicus van een getal
-DEGREES			= GRADEN			##	Converteert radialen naar graden
-EVEN			= EVEN				##	Rondt het getal af op het dichtstbijzijnde gehele even getal
-EXP			= EXP				##	Verheft e tot de macht van een bepaald getal
-FACT			= FACULTEIT			##	Geeft als resultaat de faculteit van een getal
-FACTDOUBLE		= DUBBELE.FACULTEIT		##	Geeft als resultaat de dubbele faculteit van een getal
-FLOOR			= AFRONDEN.BENEDEN		##	Rondt de absolute waarde van een getal naar beneden af
-GCD			= GGD				##	Geeft als resultaat de grootste gemene deler
-INT			= INTEGER			##	Rondt een getal naar beneden af op het dichtstbijzijnde gehele getal
-LCM			= KGV				##	Geeft als resultaat het kleinste gemene veelvoud
-LN			= LN				##	Geeft als resultaat de natuurlijke logaritme van een getal
-LOG			= LOG				##	Geeft als resultaat de logaritme met het opgegeven grondtal van een getal
-LOG10			= LOG10				##	Geeft als resultaat de logaritme met grondtal 10 van een getal
-MDETERM			= DETERMINANTMAT		##	Geeft als resultaat de determinant van een matrix
-MINVERSE		= INVERSEMAT			##	Geeft als resultaat de inverse van een matrix
-MMULT			= PRODUCTMAT			##	Geeft als resultaat het product van twee matrices
-MOD			= REST				##	Geeft als resultaat het restgetal van een deling
-MROUND			= AFRONDEN.N.VEELVOUD		##	Geeft als resultaat een getal afgerond op het gewenste veelvoud
-MULTINOMIAL		= MULTINOMIAAL			##	Geeft als resultaat de multinomiaalcoëfficiënt van een reeks getallen
-ODD			= ONEVEN			##	Rondt de absolute waarde van het getal naar boven af op het dichtstbijzijnde gehele oneven getal
-PI			= PI				##	Geeft als resultaat de waarde van pi
-POWER			= MACHT				##	Verheft een getal tot een macht
-PRODUCT			= PRODUCT			##	Vermenigvuldigt de argumenten met elkaar
-QUOTIENT		= QUOTIENT			##	Geeft als resultaat de uitkomst van een deling als geheel getal
-RADIANS			= RADIALEN			##	Converteert graden naar radialen
-RAND			= ASELECT			##	Geeft als resultaat een willekeurig getal tussen 0 en 1
-RANDBETWEEN		= ASELECTTUSSEN			##	Geeft een willekeurig getal tussen de getallen die u hebt opgegeven
-ROMAN			= ROMEINS			##	Converteert een Arabisch getal naar een Romeins getal en geeft het resultaat weer in de vorm van tekst
-ROUND			= AFRONDEN			##	Rondt een getal af op het opgegeven aantal decimalen
-ROUNDDOWN		= AFRONDEN.NAAR.BENEDEN		##	Rondt de absolute waarde van een getal naar beneden af
-ROUNDUP			= AFRONDEN.NAAR.BOVEN		##	Rondt de absolute waarde van een getal naar boven af
-SERIESSUM		= SOM.MACHTREEKS		##	Geeft als resultaat de som van een machtreeks die is gebaseerd op de formule
-SIGN			= POS.NEG			##	Geeft als resultaat het teken van een getal
-SIN			= SIN				##	Geeft als resultaat de sinus van de opgegeven hoek
-SINH			= SINH				##	Geeft als resultaat de sinus hyperbolicus van een getal
-SQRT			= WORTEL			##	Geeft als resultaat de positieve vierkantswortel van een getal
-SQRTPI			= WORTEL.PI			##	Geeft als resultaat de vierkantswortel van (getal * pi)
-SUBTOTAL		= SUBTOTAAL			##	Geeft als resultaat een subtotaal voor een bereik
-SUM			= SOM				##	Telt de argumenten op
-SUMIF			= SOM.ALS			##	Telt de getallen bij elkaar op die voldoen aan een bepaald criterium
-SUMIFS			= SOMMEN.ALS			##	Telt de cellen in een bereik op die aan meerdere criteria voldoen
-SUMPRODUCT		= SOMPRODUCT			##	Geeft als resultaat de som van de producten van de corresponderende matrixelementen
-SUMSQ			= KWADRATENSOM			##	Geeft als resultaat de som van de kwadraten van de argumenten
-SUMX2MY2		= SOM.X2MINY2			##	Geeft als resultaat de som van het verschil tussen de kwadraten van corresponderende waarden in twee matrices
-SUMX2PY2		= SOM.X2PLUSY2			##	Geeft als resultaat de som van de kwadratensom van corresponderende waarden in twee matrices
-SUMXMY2			= SOM.XMINY.2			##	Geeft als resultaat de som van de kwadraten van de verschillen tussen de corresponderende waarden in twee matrices
-TAN			= TAN				##	Geeft als resultaat de tangens van een getal
-TANH			= TANH				##	Geeft als resultaat de tangens hyperbolicus van een getal
-TRUNC			= GEHEEL			##	Kapt een getal af tot een geheel getal
-
-
-##
-##	Statistical functions				Statistische functies
-##
-AVEDEV			= GEM.DEVIATIE			##	Geeft als resultaat het gemiddelde van de absolute deviaties van gegevenspunten ten opzichte van hun gemiddelde waarde
-AVERAGE			= GEMIDDELDE			##	Geeft als resultaat het gemiddelde van de argumenten
-AVERAGEA		= GEMIDDELDEA			##	Geeft als resultaat het gemiddelde van de argumenten, inclusief getallen, tekst en logische waarden
-AVERAGEIF		= GEMIDDELDE.ALS		##	Geeft het gemiddelde (rekenkundig gemiddelde) als resultaat van alle cellen in een bereik die voldoen aan de opgegeven criteria
-AVERAGEIFS		= GEMIDDELDEN.ALS		##	Geeft het gemiddelde (rekenkundig gemiddelde) als resultaat van alle cellen die aan meerdere criteria voldoen
-BETADIST		= BETA.VERD			##	Geeft als resultaat de cumulatieve bèta-verdelingsfunctie
-BETAINV			= BETA.INV			##	Geeft als resultaat de inverse van de cumulatieve verdelingsfunctie voor een gegeven bèta-verdeling
-BINOMDIST		= BINOMIALE.VERD		##	Geeft als resultaat de binomiale verdeling
-CHIDIST			= CHI.KWADRAAT			##	Geeft als resultaat de eenzijdige kans van de chi-kwadraatverdeling
-CHIINV			= CHI.KWADRAAT.INV		##	Geeft als resultaat de inverse van een eenzijdige kans van de chi-kwadraatverdeling
-CHITEST			= CHI.TOETS			##	Geeft als resultaat de onafhankelijkheidstoets
-CONFIDENCE		= BETROUWBAARHEID		##	Geeft als resultaat het betrouwbaarheidsinterval van een gemiddelde waarde voor de elementen van een populatie
-CORREL			= CORRELATIE			##	Geeft als resultaat de correlatiecoëfficiënt van twee gegevensverzamelingen
-COUNT			= AANTAL			##	Telt het aantal getallen in de argumentenlijst
-COUNTA			= AANTALARG			##	Telt het aantal waarden in de argumentenlijst
-COUNTBLANK		= AANTAL.LEGE.CELLEN		##	Telt het aantal lege cellen in een bereik
-COUNTIF			= AANTAL.ALS			##	Telt in een bereik het aantal cellen die voldoen aan een bepaald criterium
-COUNTIFS		= AANTALLEN.ALS			##	Telt in een bereik het aantal cellen die voldoen aan meerdere criteria
-COVAR			= COVARIANTIE			##	Geeft als resultaat de covariantie, het gemiddelde van de producten van de gepaarde deviaties
-CRITBINOM		= CRIT.BINOM			##	Geeft als resultaat de kleinste waarde waarvoor de binomiale verdeling kleiner is dan of gelijk is aan het criterium
-DEVSQ			= DEV.KWAD			##	Geeft als resultaat de som van de deviaties in het kwadraat
-EXPONDIST		= EXPON.VERD			##	Geeft als resultaat de exponentiële verdeling
-FDIST			= F.VERDELING			##	Geeft als resultaat de F-verdeling
-FINV			= F.INVERSE			##	Geeft als resultaat de inverse van de F-verdeling
-FISHER			= FISHER			##	Geeft als resultaat de Fisher-transformatie
-FISHERINV		= FISHER.INV			##	Geeft als resultaat de inverse van de Fisher-transformatie
-FORECAST		= VOORSPELLEN			##	Geeft als resultaat een waarde op basis van een lineaire trend
-FREQUENCY		= FREQUENTIE			##	Geeft als resultaat een frequentieverdeling in de vorm van een verticale matrix
-FTEST			= F.TOETS			##	Geeft als resultaat een F-toets
-GAMMADIST		= GAMMA.VERD			##	Geeft als resultaat de gamma-verdeling
-GAMMAINV		= GAMMA.INV			##	Geeft als resultaat de inverse van de cumulatieve gamma-verdeling
-GAMMALN			= GAMMA.LN			##	Geeft als resultaat de natuurlijke logaritme van de gamma-functie, G(x)
-GEOMEAN			= MEETK.GEM			##	Geeft als resultaat het meetkundige gemiddelde
-GROWTH			= GROEI				##	Geeft als resultaat de waarden voor een exponentiële trend
-HARMEAN			= HARM.GEM			##	Geeft als resultaat het harmonische gemiddelde
-HYPGEOMDIST		= HYPERGEO.VERD			##	Geeft als resultaat de hypergeometrische verdeling
-INTERCEPT		= SNIJPUNT			##	Geeft als resultaat het snijpunt van de lineaire regressielijn met de y-as
-KURT			= KURTOSIS			##	Geeft als resultaat de kurtosis van een gegevensverzameling
-LARGE			= GROOTSTE			##	Geeft als resultaat de op k-1 na grootste waarde in een gegevensverzameling
-LINEST			= LIJNSCH			##	Geeft als resultaat de parameters van een lineaire trend
-LOGEST			= LOGSCH			##	Geeft als resultaat de parameters van een exponentiële trend
-LOGINV			= LOG.NORM.INV			##	Geeft als resultaat de inverse van de logaritmische normale verdeling
-LOGNORMDIST		= LOG.NORM.VERD			##	Geeft als resultaat de cumulatieve logaritmische normale verdeling
-MAX			= MAX				##	Geeft als resultaat de maximumwaarde in een lijst met argumenten
-MAXA			= MAXA				##	Geeft als resultaat de maximumwaarde in een lijst met argumenten, inclusief getallen, tekst en logische waarden
-MEDIAN			= MEDIAAN			##	Geeft als resultaat de mediaan van de opgegeven getallen
-MIN			= MIN				##	Geeft als resultaat de minimumwaarde in een lijst met argumenten
-MINA			= MINA				##	Geeft als resultaat de minimumwaarde in een lijst met argumenten, inclusief getallen, tekst en logische waarden
-MODE			= MODUS				##	Geeft als resultaat de meest voorkomende waarde in een gegevensverzameling
-NEGBINOMDIST		= NEG.BINOM.VERD		##	Geeft als resultaat de negatieve binomiaalverdeling
-NORMDIST		= NORM.VERD			##	Geeft als resultaat de cumulatieve normale verdeling
-NORMINV			= NORM.INV			##	Geeft als resultaat de inverse van de cumulatieve standaardnormale verdeling
-NORMSDIST		= STAND.NORM.VERD		##	Geeft als resultaat de cumulatieve standaardnormale verdeling
-NORMSINV		= STAND.NORM.INV		##	Geeft als resultaat de inverse van de cumulatieve normale verdeling
-PEARSON			= PEARSON			##	Geeft als resultaat de correlatiecoëfficiënt van Pearson
-PERCENTILE		= PERCENTIEL			##	Geeft als resultaat het k-de percentiel van waarden in een bereik
-PERCENTRANK		= PERCENT.RANG			##	Geeft als resultaat de positie, in procenten uitgedrukt, van een waarde in de rangorde van een gegevensverzameling
-PERMUT			= PERMUTATIES			##	Geeft als resultaat het aantal permutaties voor een gegeven aantal objecten
-POISSON			= POISSON			##	Geeft als resultaat de Poisson-verdeling
-PROB			= KANS				##	Geeft als resultaat de kans dat waarden zich tussen twee grenzen bevinden
-QUARTILE		= KWARTIEL			##	Geeft als resultaat het kwartiel van een gegevensverzameling
-RANK			= RANG				##	Geeft als resultaat het rangnummer van een getal in een lijst getallen
-RSQ			= R.KWADRAAT			##	Geeft als resultaat het kwadraat van de Pearson-correlatiecoëfficiënt
-SKEW			= SCHEEFHEID			##	Geeft als resultaat de mate van asymmetrie van een verdeling
-SLOPE			= RICHTING			##	Geeft als resultaat de richtingscoëfficiënt van een lineaire regressielijn
-SMALL			= KLEINSTE			##	Geeft als resultaat de op k-1 na kleinste waarde in een gegevensverzameling
-STANDARDIZE		= NORMALISEREN			##	Geeft als resultaat een genormaliseerde waarde
-STDEV			= STDEV				##	Maakt een schatting van de standaarddeviatie op basis van een steekproef
-STDEVA			= STDEVA			##	Maakt een schatting van de standaarddeviatie op basis van een steekproef, inclusief getallen, tekst en logische waarden
-STDEVP			= STDEVP			##	Berekent de standaarddeviatie op basis van de volledige populatie
-STDEVPA			= STDEVPA			##	Berekent de standaarddeviatie op basis van de volledige populatie, inclusief getallen, tekst en logische waarden
-STEYX			= STAND.FOUT.YX			##	Geeft als resultaat de standaardfout in de voorspelde y-waarde voor elke x in een regressie
-TDIST			= T.VERD			##	Geeft als resultaat de Student T-verdeling
-TINV			= T.INV				##	Geeft als resultaat de inverse van de Student T-verdeling
-TREND			= TREND				##	Geeft als resultaat de waarden voor een lineaire trend
-TRIMMEAN		= GETRIMD.GEM			##	Geeft als resultaat het gemiddelde van waarden in een gegevensverzameling
-TTEST			= T.TOETS			##	Geeft als resultaat de kans met behulp van de Student T-toets
-VAR			= VAR				##	Maakt een schatting van de variantie op basis van een steekproef
-VARA			= VARA				##	Maakt een schatting van de variantie op basis van een steekproef, inclusief getallen, tekst en logische waarden
-VARP			= VARP				##	Berekent de variantie op basis van de volledige populatie
-VARPA			= VARPA				##	Berekent de standaarddeviatie op basis van de volledige populatie, inclusief getallen, tekst en logische waarden
-WEIBULL			= WEIBULL			##	Geeft als resultaat de Weibull-verdeling
-ZTEST			= Z.TOETS			##	Geeft als resultaat de eenzijdige kanswaarde van een Z-toets
-
-
-##
-##	Text functions					Tekstfuncties
-##
-ASC			= ASC				##	Wijzigt Nederlandse letters of katakanatekens over de volle breedte (dubbel-bytetekens) binnen een tekenreeks in tekens over de halve breedte (enkel-bytetekens)
-BAHTTEXT		= BAHT.TEKST			##	Converteert een getal naar tekst met de valutanotatie ß (baht)
-CHAR			= TEKEN				##	Geeft als resultaat het teken dat hoort bij de opgegeven code
-CLEAN			= WISSEN.CONTROL		##	Verwijdert alle niet-afdrukbare tekens uit een tekst
-CODE			= CODE				##	Geeft als resultaat de numerieke code voor het eerste teken in een tekenreeks
-CONCATENATE		= TEKST.SAMENVOEGEN		##	Voegt verschillende tekstfragmenten samen tot één tekstfragment
-DOLLAR			= EURO				##	Converteert een getal naar tekst met de valutanotatie € (euro)
-EXACT			= GELIJK			##	Controleert of twee tekenreeksen identiek zijn
-FIND			= VIND.ALLES			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-FINDB			= VIND.ALLES.B			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-FIXED			= VAST				##	Maakt een getal als tekst met een vast aantal decimalen op
-JIS			= JIS				##	Wijzigt Nederlandse letters of katakanatekens over de halve breedte (enkel-bytetekens) binnen een tekenreeks in tekens over de volle breedte (dubbel-bytetekens)
-LEFT			= LINKS				##	Geeft als resultaat de meest linkse tekens in een tekenreeks
-LEFTB			= LINKSB			##	Geeft als resultaat de meest linkse tekens in een tekenreeks
-LEN			= LENGTE			##	Geeft als resultaat het aantal tekens in een tekenreeks
-LENB			= LENGTEB			##	Geeft als resultaat het aantal tekens in een tekenreeks
-LOWER			= KLEINE.LETTERS		##	Zet tekst om in kleine letters
-MID			= MIDDEN			##	Geeft als resultaat een bepaald aantal tekens van een tekenreeks vanaf de positie die u opgeeft
-MIDB			= DEELB				##	Geeft als resultaat een bepaald aantal tekens van een tekenreeks vanaf de positie die u opgeeft
-PHONETIC		= FONETISCH			##	Haalt de fonetische tekens (furigana) uit een tekenreeks op
-PROPER			= BEGINLETTERS			##	Zet de eerste letter van elk woord in een tekst om in een hoofdletter
-REPLACE			= VERVANG			##	Vervangt tekens binnen een tekst
-REPLACEB		= VERVANGENB			##	Vervangt tekens binnen een tekst
-REPT			= HERHALING			##	Herhaalt een tekst een aantal malen
-RIGHT			= RECHTS			##	Geeft als resultaat de meest rechtse tekens in een tekenreeks
-RIGHTB			= RECHTSB			##	Geeft als resultaat de meest rechtse tekens in een tekenreeks
-SEARCH			= VIND.SPEC			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij geen onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-SEARCHB			= VIND.SPEC.B			##	Zoekt een bepaalde tekenreeks in een tekst (waarbij geen onderscheid wordt gemaakt tussen hoofdletters en kleine letters)
-SUBSTITUTE		= SUBSTITUEREN			##	Vervangt oude tekst door nieuwe tekst in een tekenreeks
-T			= T				##	Converteert de argumenten naar tekst
-TEXT			= TEKST				##	Maakt een getal op en converteert het getal naar tekst
-TRIM			= SPATIES.WISSEN		##	Verwijdert de spaties uit een tekst
-UPPER			= HOOFDLETTERS			##	Zet tekst om in hoofdletters
-VALUE			= WAARDE			##	Converteert tekst naar een getal
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/no/config b/plugins/exportTypes/Excel/PHPExcel/locale/no/config
deleted file mode 100755
index 73dd08c86..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/no/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= kr
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #NULL!
-DIV0	= #DIV/0!
-VALUE	= #VERDI!
-REF	= #REF!
-NAME	= #NAVN?
-NUM	= #NUM!
-NA	= #I/T
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/no/functions b/plugins/exportTypes/Excel/PHPExcel/locale/no/functions
deleted file mode 100755
index bc915207f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/no/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions				Funksjonene Tillegg og Automatisering
-##
-GETPIVOTDATA		= HENTPIVOTDATA				##	Returnerer data som er lagret i en pivottabellrapport
-
-
-##
-##	Cube functions						Kubefunksjoner
-##
-CUBEKPIMEMBER		= KUBEKPIMEDLEM				##	Returnerer navnet, egenskapen og målet for en viktig ytelsesindikator (KPI), og viser navnet og egenskapen i cellen. En KPI er en målbar enhet, for eksempel månedlig bruttoinntjening eller kvartalsvis inntjening per ansatt, og brukes til å overvåke ytelsen i en organisasjon.
-CUBEMEMBER		= KUBEMEDLEM				##	Returnerer et medlem eller en tuppel i et kubehierarki. Brukes til å validere at medlemmet eller tuppelen finnes i kuben.
-CUBEMEMBERPROPERTY	= KUBEMEDLEMEGENSKAP			##	Returnerer verdien til en medlemsegenskap i kuben. Brukes til å validere at et medlemsnavn finnes i kuben, og til å returnere den angitte egenskapen for dette medlemmet.
-CUBERANKEDMEMBER	= KUBERANGERTMEDLEM			##	Returnerer det n-te, eller rangerte, medlemmet i et sett. Brukes til å returnere ett eller flere elementer i et sett, for eksempel de 10 beste studentene.
-CUBESET			= KUBESETT				##	Definerer et beregnet sett av medlemmer eller tuppeler ved å sende et settuttrykk til kuben på serveren, noe som oppretter settet og deretter returnerer dette settet til Microsoft Office Excel.
-CUBESETCOUNT		= KUBESETTANTALL			##	Returnerer antallet elementer i et sett.
-CUBEVALUE		= KUBEVERDI				##	Returnerer en aggregert verdi fra en kube.
-
-
-##
-##	Database functions					Databasefunksjoner
-##
-DAVERAGE		= DGJENNOMSNITT				##	Returnerer gjennomsnittet av merkede databaseposter
-DCOUNT			= DANTALL				##	Teller celler som inneholder tall i en database
-DCOUNTA			= DANTALLA				##	Teller celler som ikke er tomme i en database
-DGET			= DHENT					##	Trekker ut fra en database en post som oppfyller angitte vilkår
-DMAX			= DMAKS					##	Returnerer maksimumsverdien fra merkede databaseposter
-DMIN			= DMIN					##	Returnerer minimumsverdien fra merkede databaseposter
-DPRODUCT		= DPRODUKT				##	Multipliserer verdiene i et bestemt felt med poster som oppfyller vilkårene i en database
-DSTDEV			= DSTDAV				##	Estimerer standardavviket basert på et utvalg av merkede databaseposter
-DSTDEVP			= DSTAVP				##	Beregner standardavviket basert på at merkede databaseposter utgjør hele populasjonen
-DSUM			= DSUMMER				##	Legger til tallene i feltkolonnen med poster, i databasen som oppfyller vilkårene
-DVAR			= DVARIANS				##	Estimerer variansen basert på et utvalg av merkede databaseposter
-DVARP			= DVARIANSP				##	Beregner variansen basert på at merkede databaseposter utgjør hele populasjonen
-
-
-##
-##	Date and time functions					Dato- og tidsfunksjoner
-##
-DATE			= DATO					##	Returnerer serienummeret som svarer til en bestemt dato
-DATEVALUE		= DATOVERDI				##	Konverterer en dato med tekstformat til et serienummer
-DAY			= DAG					##	Konverterer et serienummer til en dag i måneden
-DAYS360			= DAGER360				##	Beregner antall dager mellom to datoer basert på et år med 360 dager
-EDATE			= DAG.ETTER				##	Returnerer serienummeret som svarer til datoen som er det indikerte antall måneder før eller etter startdatoen
-EOMONTH			= MÅNEDSSLUTT				##	Returnerer serienummeret som svarer til siste dag i måneden, før eller etter et angitt antall måneder
-HOUR			= TIME					##	Konverterer et serienummer til en time
-MINUTE			= MINUTT				##	Konverterer et serienummer til et minutt
-MONTH			= MÅNED					##	Konverterer et serienummer til en måned
-NETWORKDAYS		= NETT.ARBEIDSDAGER			##	Returnerer antall hele arbeidsdager mellom to datoer
-NOW			= NÅ					##	Returnerer serienummeret som svarer til gjeldende dato og klokkeslett
-SECOND			= SEKUND				##	Konverterer et serienummer til et sekund
-TIME			= TID					##	Returnerer serienummeret som svarer til et bestemt klokkeslett
-TIMEVALUE		= TIDSVERDI				##	Konverterer et klokkeslett i tekstformat til et serienummer
-TODAY			= IDAG					##	Returnerer serienummeret som svarer til dagens dato
-WEEKDAY			= UKEDAG				##	Konverterer et serienummer til en ukedag
-WEEKNUM			= UKENR					##	Konverterer et serienummer til et tall som representerer hvilket nummer uken har i et år
-WORKDAY			= ARBEIDSDAG				##	Returnerer serienummeret som svarer til datoen før eller etter et angitt antall arbeidsdager
-YEAR			= ÅR					##	Konverterer et serienummer til et år
-YEARFRAC		= ÅRDEL					##	Returnerer brøkdelen for året, som svarer til antall hele dager mellom startdato og sluttdato
-
-
-##
-##	Engineering functions					Tekniske funksjoner
-##
-BESSELI			= BESSELI				##	Returnerer den endrede Bessel-funksjonen In(x)
-BESSELJ			= BESSELJ				##	Returnerer Bessel-funksjonen Jn(x)
-BESSELK			= BESSELK				##	Returnerer den endrede Bessel-funksjonen Kn(x)
-BESSELY			= BESSELY				##	Returnerer Bessel-funksjonen Yn(x)
-BIN2DEC			= BINTILDES				##	Konverterer et binært tall til et desimaltall
-BIN2HEX			= BINTILHEKS				##	Konverterer et binært tall til et heksadesimaltall
-BIN2OCT			= BINTILOKT				##	Konverterer et binært tall til et oktaltall
-COMPLEX			= KOMPLEKS				##	Konverterer reelle og imaginære koeffisienter til et komplekst tall
-CONVERT			= KONVERTER				##	Konverterer et tall fra ett målsystem til et annet
-DEC2BIN			= DESTILBIN				##	Konverterer et desimaltall til et binærtall
-DEC2HEX			= DESTILHEKS				##	Konverterer et heltall i 10-tallsystemet til et heksadesimalt tall
-DEC2OCT			= DESTILOKT				##	Konverterer et heltall i 10-tallsystemet til et oktaltall
-DELTA			= DELTA					##	Undersøker om to verdier er like
-ERF			= FEILF					##	Returnerer feilfunksjonen
-ERFC			= FEILFK				##	Returnerer den komplementære feilfunksjonen
-GESTEP			= GRENSEVERDI				##	Tester om et tall er større enn en terskelverdi
-HEX2BIN			= HEKSTILBIN				##	Konverterer et heksadesimaltall til et binært tall
-HEX2DEC			= HEKSTILDES				##	Konverterer et heksadesimalt tall til et heltall i 10-tallsystemet
-HEX2OCT			= HEKSTILOKT				##	Konverterer et heksadesimalt tall til et oktaltall
-IMABS			= IMABS					##	Returnerer absoluttverdien (koeffisienten) til et komplekst tall
-IMAGINARY		= IMAGINÆR				##	Returnerer den imaginære koeffisienten til et komplekst tall
-IMARGUMENT		= IMARGUMENT				##	Returnerer argumentet theta, som er en vinkel uttrykt i radianer
-IMCONJUGATE		= IMKONJUGERT				##	Returnerer den komplekse konjugaten til et komplekst tall
-IMCOS			= IMCOS					##	Returnerer cosinus til et komplekst tall
-IMDIV			= IMDIV					##	Returnerer kvotienten til to komplekse tall
-IMEXP			= IMEKSP				##	Returnerer eksponenten til et komplekst tall
-IMLN			= IMLN					##	Returnerer den naturlige logaritmen for et komplekst tall
-IMLOG10			= IMLOG10				##	Returnerer logaritmen med grunntall 10 for et komplekst tall
-IMLOG2			= IMLOG2				##	Returnerer logaritmen med grunntall 2 for et komplekst tall
-IMPOWER			= IMOPPHØY				##	Returnerer et komplekst tall opphøyd til en heltallspotens
-IMPRODUCT		= IMPRODUKT				##	Returnerer produktet av komplekse tall
-IMREAL			= IMREELL				##	Returnerer den reelle koeffisienten til et komplekst tall
-IMSIN			= IMSIN					##	Returnerer sinus til et komplekst tall
-IMSQRT			= IMROT					##	Returnerer kvadratroten av et komplekst tall
-IMSUB			= IMSUB					##	Returnerer differansen mellom to komplekse tall
-IMSUM			= IMSUMMER				##	Returnerer summen av komplekse tall
-OCT2BIN			= OKTTILBIN				##	Konverterer et oktaltall til et binært tall
-OCT2DEC			= OKTTILDES				##	Konverterer et oktaltall til et desimaltall
-OCT2HEX			= OKTTILHEKS				##	Konverterer et oktaltall til et heksadesimaltall
-
-
-##
-##	Financial functions					Økonomiske funksjoner
-##
-ACCRINT			= PÅLØPT.PERIODISK.RENTE		##	Returnerer påløpte renter for et verdipapir som betaler periodisk rente
-ACCRINTM		= PÅLØPT.FORFALLSRENTE			##	Returnerer den påløpte renten for et verdipapir som betaler rente ved forfall
-AMORDEGRC		= AMORDEGRC				##	Returnerer avskrivningen for hver regnskapsperiode ved hjelp av en avskrivingskoeffisient
-AMORLINC		= AMORLINC				##	Returnerer avskrivingen for hver regnskapsperiode
-COUPDAYBS		= OBLIG.DAGER.FF			##	Returnerer antall dager fra begynnelsen av den rentebærende perioden til innløsningsdatoen
-COUPDAYS		= OBLIG.DAGER				##	Returnerer antall dager i den rentebærende perioden som inneholder innløsningsdatoen
-COUPDAYSNC		= OBLIG.DAGER.NF			##	Returnerer antall dager fra betalingsdato til neste renteinnbetalingsdato
-COUPNCD			= OBLIG.DAGER.EF			##	Returnerer obligasjonsdatoen som kommer etter oppgjørsdatoen
-COUPNUM			= OBLIG.ANTALL				##	Returnerer antall obligasjoner som skal betales mellom oppgjørsdatoen og forfallsdatoen
-COUPPCD			= OBLIG.DAG.FORRIGE			##	Returnerer obligasjonsdatoen som kommer før oppgjørsdatoen
-CUMIPMT			= SAMLET.RENTE				##	Returnerer den kumulative renten som er betalt mellom to perioder
-CUMPRINC		= SAMLET.HOVEDSTOL			##	Returnerer den kumulative hovedstolen som er betalt for et lån mellom to perioder
-DB			= DAVSKR				##	Returnerer avskrivningen for et aktivum i en angitt periode, foretatt med fast degressiv avskrivning
-DDB			= DEGRAVS				##	Returnerer avskrivningen for et aktivum for en gitt periode, ved hjelp av dobbel degressiv avskrivning eller en metode som du selv angir
-DISC			= DISKONTERT				##	Returnerer diskonteringsraten for et verdipapir
-DOLLARDE		= DOLLARDE				##	Konverterer en valutapris uttrykt som en brøk, til en valutapris uttrykt som et desimaltall
-DOLLARFR		= DOLLARBR				##	Konverterer en valutapris uttrykt som et desimaltall, til en valutapris uttrykt som en brøk
-DURATION		= VARIGHET				##	Returnerer årlig varighet for et verdipapir med renter som betales periodisk
-EFFECT			= EFFEKTIV.RENTE			##	Returnerer den effektive årlige rentesatsen
-FV			= SLUTTVERDI				##	Returnerer fremtidig verdi for en investering
-FVSCHEDULE		= SVPLAN				##	Returnerer den fremtidige verdien av en inngående hovedstol etter å ha anvendt en serie med sammensatte rentesatser
-INTRATE			= RENTESATS				##	Returnerer rentefoten av et fullfinansiert verdipapir
-IPMT			= RAVDRAG				##	Returnerer betalte renter på en investering for en gitt periode
-IRR			= IR					##	Returnerer internrenten for en serie kontantstrømmer
-ISPMT			= ER.AVDRAG				##	Beregner renten som er betalt for en investering i løpet av en bestemt periode
-MDURATION		= MVARIGHET				##	Returnerer Macauleys modifiserte varighet for et verdipapir med en antatt pålydende verdi på kr 100,00
-MIRR			= MODIR					##	Returnerer internrenten der positive og negative kontantstrømmer finansieres med forskjellige satser
-NOMINAL			= NOMINELL				##	Returnerer årlig nominell rentesats
-NPER			= PERIODER				##	Returnerer antall perioder for en investering
-NPV			= NNV					##	Returnerer netto nåverdi for en investering, basert på en serie periodiske kontantstrømmer og en rentesats
-ODDFPRICE		= AVVIKFP.PRIS				##	Returnerer pris pålydende kr 100 for et verdipapir med en odde første periode
-ODDFYIELD		= AVVIKFP.AVKASTNING			##	Returnerer avkastingen for et verdipapir med en odde første periode
-ODDLPRICE		= AVVIKSP.PRIS				##	Returnerer pris pålydende kr 100 for et verdipapir med en odde siste periode
-ODDLYIELD		= AVVIKSP.AVKASTNING			##	Returnerer avkastingen for et verdipapir med en odde siste periode
-PMT			= AVDRAG				##	Returnerer periodisk betaling for en annuitet
-PPMT			= AMORT					##	Returnerer betalingen på hovedstolen for en investering i en gitt periode
-PRICE			= PRIS					##	Returnerer prisen per pålydende kr 100 for et verdipapir som gir periodisk avkastning
-PRICEDISC		= PRIS.DISKONTERT			##	Returnerer prisen per pålydende kr 100 for et diskontert verdipapir
-PRICEMAT		= PRIS.FORFALL				##	Returnerer prisen per pålydende kr 100 av et verdipapir som betaler rente ved forfall
-PV			= NÅVERDI				##	Returnerer nåverdien av en investering
-RATE			= RENTE					##	Returnerer rentesatsen per periode for en annuitet
-RECEIVED		= MOTTATT.AVKAST			##	Returnerer summen som mottas ved forfallsdato for et fullinvestert verdipapir
-SLN			= LINAVS				##	Returnerer den lineære avskrivningen for et aktivum i én periode
-SYD			= ÅRSAVS				##	Returnerer årsavskrivningen for et aktivum i en angitt periode
-TBILLEQ			= TBILLEKV				##	Returnerer den obligasjonsekvivalente avkastningen for en statsobligasjon
-TBILLPRICE		= TBILLPRIS				##	Returnerer prisen per pålydende kr 100 for en statsobligasjon
-TBILLYIELD		= TBILLAVKASTNING			##	Returnerer avkastningen til en statsobligasjon
-VDB			= VERDIAVS				##	Returnerer avskrivningen for et aktivum i en angitt periode eller delperiode, ved hjelp av degressiv avskrivning
-XIRR			= XIR					##	Returnerer internrenten for en serie kontantstrømmer som ikke nødvendigvis er periodiske
-XNPV			= XNNV					##	Returnerer netto nåverdi for en serie kontantstrømmer som ikke nødvendigvis er periodiske
-YIELD			= AVKAST				##	Returnerer avkastningen på et verdipapir som betaler periodisk rente
-YIELDDISC		= AVKAST.DISKONTERT			##	Returnerer årlig avkastning for et diskontert verdipapir, for eksempel en statskasseveksel
-YIELDMAT		= AVKAST.FORFALL			##	Returnerer den årlige avkastningen for et verdipapir som betaler rente ved forfallsdato
-
-
-##
-##	Information functions					Informasjonsfunksjoner
-##
-CELL			= CELLE					##	Returnerer informasjon om formatering, plassering eller innholdet til en celle
-ERROR.TYPE		= FEIL.TYPE				##	Returnerer et tall som svarer til en feiltype
-INFO			= INFO					##	Returnerer informasjon om gjeldende operativmiljø
-ISBLANK			= ERTOM					##	Returnerer SANN hvis verdien er tom
-ISERR			= ERFEIL				##	Returnerer SANN hvis verdien er en hvilken som helst annen feilverdi enn #I/T
-ISERROR			= ERFEIL				##	Returnerer SANN hvis verdien er en hvilken som helst feilverdi
-ISEVEN			= ERPARTALL				##	Returnerer SANN hvis tallet er et partall
-ISLOGICAL		= ERLOGISK				##	Returnerer SANN hvis verdien er en logisk verdi
-ISNA			= ERIT					##	Returnerer SANN hvis verdien er feilverdien #I/T
-ISNONTEXT		= ERIKKETEKST				##	Returnerer SANN hvis verdien ikke er tekst
-ISNUMBER		= ERTALL				##	Returnerer SANN hvis verdien er et tall
-ISODD			= ERODDETALL				##	Returnerer SANN hvis tallet er et oddetall
-ISREF			= ERREF					##	Returnerer SANN hvis verdien er en referanse
-ISTEXT			= ERTEKST				##	Returnerer SANN hvis verdien er tekst
-N			= N					##	Returnerer en verdi som er konvertert til et tall
-NA			= IT					##	Returnerer feilverdien #I/T
-TYPE			= VERDITYPE				##	Returnerer et tall som indikerer datatypen til en verdi
-
-
-##
-##	Logical functions					Logiske funksjoner
-##
-AND			= OG					##	Returnerer SANN hvis alle argumentene er lik SANN
-FALSE			= USANN					##	Returnerer den logiske verdien USANN
-IF			= HVIS					##	Angir en logisk test som skal utføres
-IFERROR			= HVISFEIL				##	Returnerer en verdi du angir hvis en formel evaluerer til en feil. Ellers returnerer den resultatet av formelen.
-NOT			= IKKE					##	Reverserer logikken til argumentet
-OR			= ELLER					##	Returnerer SANN hvis ett eller flere argumenter er lik SANN
-TRUE			= SANN					##	Returnerer den logiske verdien SANN
-
-
-##
-##	Lookup and reference functions				Oppslag- og referansefunksjoner
-##
-ADDRESS			= ADRESSE				##	Returnerer en referanse som tekst til en enkelt celle i et regneark
-AREAS			= OMRÅDER				##	Returnerer antall områder i en referanse
-CHOOSE			= VELG					##	Velger en verdi fra en liste med verdier
-COLUMN			= KOLONNE				##	Returnerer kolonnenummeret for en referanse
-COLUMNS			= KOLONNER				##	Returnerer antall kolonner i en referanse
-HLOOKUP			= FINN.KOLONNE				##	Leter i den øverste raden i en matrise og returnerer verdien for den angitte cellen
-HYPERLINK		= HYPERKOBLING				##	Oppretter en snarvei eller et hopp som åpner et dokument som er lagret på en nettverksserver, et intranett eller Internett
-INDEX			= INDEKS				##	Bruker en indeks til å velge en verdi fra en referanse eller matrise
-INDIRECT		= INDIREKTE				##	Returnerer en referanse angitt av en tekstverdi
-LOOKUP			= SLÅ.OPP				##	Slår opp verdier i en vektor eller matrise
-MATCH			= SAMMENLIGNE				##	Slår opp verdier i en referanse eller matrise
-OFFSET			= FORSKYVNING				##	Returnerer en referanseforskyvning fra en gitt referanse
-ROW			= RAD					##	Returnerer radnummeret for en referanse
-ROWS			= RADER					##	Returnerer antall rader i en referanse
-RTD			= RTD					##	Henter sanntidsdata fra et program som støtter COM-automatisering (automatisering: En måte å arbeide på med programobjekter fra et annet program- eller utviklingsverktøy. Tidligere kalt OLE-automatisering. Automatisering er en bransjestandard og en funksjon i Component Object Model (COM).)
-TRANSPOSE		= TRANSPONER				##	Returnerer transponeringen av en matrise
-VLOOKUP			= FINN.RAD				##	Leter i den første kolonnen i en matrise og flytter bortover raden for å returnere verdien til en celle
-
-
-##
-##	Math and trigonometry functions				Matematikk- og trigonometrifunksjoner
-##
-ABS			= ABS					##	Returnerer absoluttverdien til et tall
-ACOS			= ARCCOS				##	Returnerer arcus cosinus til et tall
-ACOSH			= ARCCOSH				##	Returnerer den inverse hyperbolske cosinus til et tall
-ASIN			= ARCSIN				##	Returnerer arcus sinus til et tall
-ASINH			= ARCSINH				##	Returnerer den inverse hyperbolske sinus til et tall
-ATAN			= ARCTAN				##	Returnerer arcus tangens til et tall
-ATAN2			= ARCTAN2				##	Returnerer arcus tangens fra x- og y-koordinater
-ATANH			= ARCTANH				##	Returnerer den inverse hyperbolske tangens til et tall
-CEILING			= AVRUND.GJELDENDE.MULTIPLUM		##	Runder av et tall til nærmeste heltall eller til nærmeste signifikante multiplum
-COMBIN			= KOMBINASJON				##	Returnerer antall kombinasjoner for ett gitt antall objekter
-COS			= COS					##	Returnerer cosinus til et tall
-COSH			= COSH					##	Returnerer den hyperbolske cosinus til et tall
-DEGREES			= GRADER				##	Konverterer radianer til grader
-EVEN			= AVRUND.TIL.PARTALL			##	Runder av et tall oppover til nærmeste heltall som er et partall
-EXP			= EKSP					##	Returnerer e opphøyd i en angitt potens
-FACT			= FAKULTET				##	Returnerer fakultet til et tall
-FACTDOUBLE		= DOBBELFAKT				##	Returnerer et talls doble fakultet
-FLOOR			= AVRUND.GJELDENDE.MULTIPLUM.NED	##	Avrunder et tall nedover, mot null
-GCD			= SFF					##	Returnerer høyeste felles divisor
-INT			= HELTALL				##	Avrunder et tall nedover til nærmeste heltall
-LCM			= MFM					##	Returnerer minste felles multiplum
-LN			= LN					##	Returnerer den naturlige logaritmen til et tall
-LOG			= LOG					##	Returnerer logaritmen for et tall til et angitt grunntall
-LOG10			= LOG10					##	Returnerer logaritmen med grunntall 10 for et tall
-MDETERM			= MDETERM				##	Returnerer matrisedeterminanten til en matrise
-MINVERSE		= MINVERS				##	Returnerer den inverse matrisen til en matrise
-MMULT			= MMULT					##	Returnerer matriseproduktet av to matriser
-MOD			= REST					##	Returnerer resten fra en divisjon
-MROUND			= MRUND					##	Returnerer et tall avrundet til det ønskede multiplum
-MULTINOMIAL		= MULTINOMINELL				##	Returnerer det multinominelle for et sett med tall
-ODD			= AVRUND.TIL.ODDETALL			##	Runder av et tall oppover til nærmeste heltall som er et oddetall
-PI			= PI					##	Returnerer verdien av pi
-POWER			= OPPHØYD.I				##	Returnerer resultatet av et tall opphøyd i en potens
-PRODUCT			= PRODUKT				##	Multipliserer argumentene
-QUOTIENT		= KVOTIENT				##	Returnerer heltallsdelen av en divisjon
-RADIANS			= RADIANER				##	Konverterer grader til radianer
-RAND			= TILFELDIG				##	Returnerer et tilfeldig tall mellom 0 og 1
-RANDBETWEEN		= TILFELDIGMELLOM			##	Returnerer et tilfeldig tall innenfor et angitt område
-ROMAN			= ROMERTALL				##	Konverterer vanlige tall til romertall, som tekst
-ROUND			= AVRUND				##	Avrunder et tall til et angitt antall sifre
-ROUNDDOWN		= AVRUND.NED				##	Avrunder et tall nedover, mot null
-ROUNDUP			= AVRUND.OPP				##	Runder av et tall oppover, bort fra null
-SERIESSUM		= SUMMER.REKKE				##	Returnerer summen av en geometrisk rekke, basert på formelen
-SIGN			= FORTEGN				##	Returnerer fortegnet for et tall
-SIN			= SIN					##	Returnerer sinus til en gitt vinkel
-SINH			= SINH					##	Returnerer den hyperbolske sinus til et tall
-SQRT			= ROT					##	Returnerer en positiv kvadratrot
-SQRTPI			= ROTPI					##	Returnerer kvadratroten av (tall * pi)
-SUBTOTAL		= DELSUM				##	Returnerer en delsum i en liste eller database
-SUM			= SUMMER				##	Legger sammen argumentene
-SUMIF			= SUMMERHVIS				##	Legger sammen cellene angitt ved et gitt vilkår
-SUMIFS			= SUMMER.HVIS.SETT			##	Legger sammen cellene i et område som oppfyller flere vilkår
-SUMPRODUCT		= SUMMERPRODUKT				##	Returnerer summen av produktene av tilsvarende matrisekomponenter
-SUMSQ			= SUMMERKVADRAT				##	Returnerer kvadratsummen av argumentene
-SUMX2MY2		= SUMMERX2MY2				##	Returnerer summen av differansen av kvadratene for tilsvarende verdier i to matriser
-SUMX2PY2		= SUMMERX2PY2				##	Returnerer summen av kvadratsummene for tilsvarende verdier i to matriser
-SUMXMY2			= SUMMERXMY2				##	Returnerer summen av kvadratene av differansen for tilsvarende verdier i to matriser
-TAN			= TAN					##	Returnerer tangens for et tall
-TANH			= TANH					##	Returnerer den hyperbolske tangens for et tall
-TRUNC			= AVKORT				##	Korter av et tall til et heltall
-
-
-##
-##	Statistical functions					Statistiske funksjoner
-##
-AVEDEV			= GJENNOMSNITTSAVVIK			##	Returnerer datapunktenes gjennomsnittlige absoluttavvik fra middelverdien
-AVERAGE			= GJENNOMSNITT				##	Returnerer gjennomsnittet for argumentene
-AVERAGEA		= GJENNOMSNITTA				##	Returnerer gjennomsnittet for argumentene, inkludert tall, tekst og logiske verdier
-AVERAGEIF		= GJENNOMSNITTHVIS			##	Returnerer gjennomsnittet (aritmetisk gjennomsnitt) av alle cellene i et område som oppfyller et bestemt vilkår
-AVERAGEIFS		= GJENNOMSNITT.HVIS.SETT		##	Returnerer gjennomsnittet (aritmetisk middelverdi) av alle celler som oppfyller flere vilkår.
-BETADIST		= BETA.FORDELING			##	Returnerer den kumulative betafordelingsfunksjonen
-BETAINV			= INVERS.BETA.FORDELING			##	Returnerer den inverse verdien til fordelingsfunksjonen for en angitt betafordeling
-BINOMDIST		= BINOM.FORDELING			##	Returnerer den individuelle binomiske sannsynlighetsfordelingen
-CHIDIST			= KJI.FORDELING				##	Returnerer den ensidige sannsynligheten for en kjikvadrert fordeling
-CHIINV			= INVERS.KJI.FORDELING			##	Returnerer den inverse av den ensidige sannsynligheten for den kjikvadrerte fordelingen
-CHITEST			= KJI.TEST				##	Utfører testen for uavhengighet
-CONFIDENCE		= KONFIDENS				##	Returnerer konfidensintervallet til gjennomsnittet for en populasjon
-CORREL			= KORRELASJON				##	Returnerer korrelasjonskoeffisienten mellom to datasett
-COUNT			= ANTALL				##	Teller hvor mange tall som er i argumentlisten
-COUNTA			= ANTALLA				##	Teller hvor mange verdier som er i argumentlisten
-COUNTBLANK		= TELLBLANKE				##	Teller antall tomme celler i et område.
-COUNTIF			= ANTALL.HVIS				##	Teller antall celler i et område som oppfyller gitte vilkår
-COUNTIFS		= ANTALL.HVIS.SETT			##	Teller antallet ikke-tomme celler i et område som oppfyller flere vilkår
-COVAR			= KOVARIANS				##	Returnerer kovariansen, gjennomsnittet av produktene av parvise avvik
-CRITBINOM		= GRENSE.BINOM				##	Returnerer den minste verdien der den kumulative binomiske fordelingen er mindre enn eller lik en vilkårsverdi
-DEVSQ			= AVVIK.KVADRERT			##	Returnerer summen av kvadrerte avvik
-EXPONDIST		= EKSP.FORDELING			##	Returnerer eksponentialfordelingen
-FDIST			= FFORDELING				##	Returnerer F-sannsynlighetsfordelingen
-FINV			= FFORDELING.INVERS			##	Returnerer den inverse av den sannsynlige F-fordelingen
-FISHER			= FISHER				##	Returnerer Fisher-transformasjonen
-FISHERINV		= FISHERINV				##	Returnerer den inverse av Fisher-transformasjonen
-FORECAST		= PROGNOSE				##	Returnerer en verdi langs en lineær trend
-FREQUENCY		= FREKVENS				##	Returnerer en frekvensdistribusjon som en loddrett matrise
-FTEST			= FTEST					##	Returnerer resultatet av en F-test
-GAMMADIST		= GAMMAFORDELING			##	Returnerer gammafordelingen
-GAMMAINV		= GAMMAINV				##	Returnerer den inverse av den gammakumulative fordelingen
-GAMMALN			= GAMMALN				##	Returnerer den naturlige logaritmen til gammafunksjonen G(x)
-GEOMEAN			= GJENNOMSNITT.GEOMETRISK		##	Returnerer den geometriske middelverdien
-GROWTH			= VEKST					##	Returnerer verdier langs en eksponentiell trend
-HARMEAN			= GJENNOMSNITT.HARMONISK		##	Returnerer den harmoniske middelverdien
-HYPGEOMDIST		= HYPGEOM.FORDELING			##	Returnerer den hypergeometriske fordelingen
-INTERCEPT		= SKJÆRINGSPUNKT			##	Returnerer skjæringspunktet til den lineære regresjonslinjen
-KURT			= KURT					##	Returnerer kurtosen til et datasett
-LARGE			= N.STØRST				##	Returnerer den n-te største verdien i et datasett
-LINEST			= RETTLINJE				##	Returnerer parameterne til en lineær trend
-LOGEST			= KURVE					##	Returnerer parameterne til en eksponentiell trend
-LOGINV			= LOGINV				##	Returnerer den inverse lognormale fordelingen
-LOGNORMDIST		= LOGNORMFORD				##	Returnerer den kumulative lognormale fordelingen
-MAX			= STØRST				##	Returnerer maksimumsverdien i en argumentliste
-MAXA			= MAKSA					##	Returnerer maksimumsverdien i en argumentliste, inkludert tall, tekst og logiske verdier
-MEDIAN			= MEDIAN				##	Returnerer medianen til tallene som er gitt
-MIN			= MIN					##	Returnerer minimumsverdien i en argumentliste
-MINA			= MINA					##	Returnerer den minste verdien i en argumentliste, inkludert tall, tekst og logiske verdier
-MODE			= MODUS					##	Returnerer den vanligste verdien i et datasett
-NEGBINOMDIST		= NEGBINOM.FORDELING			##	Returnerer den negative binomiske fordelingen
-NORMDIST		= NORMALFORDELING			##	Returnerer den kumulative normalfordelingen
-NORMINV			= NORMINV				##	Returnerer den inverse kumulative normalfordelingen
-NORMSDIST		= NORMSFORDELING			##	Returnerer standard kumulativ normalfordeling
-NORMSINV		= NORMSINV				##	Returnerer den inverse av den den kumulative standard normalfordelingen
-PEARSON			= PEARSON				##	Returnerer produktmomentkorrelasjonskoeffisienten, Pearson
-PERCENTILE		= PERSENTIL				##	Returnerer den n-te persentil av verdiene i et område
-PERCENTRANK		= PROSENTDEL				##	Returnerer prosentrangeringen av en verdi i et datasett
-PERMUT			= PERMUTER				##	Returnerer antall permutasjoner for et gitt antall objekter
-POISSON			= POISSON				##	Returnerer Poissons sannsynlighetsfordeling
-PROB			= SANNSYNLIG				##	Returnerer sannsynligheten for at verdier i et område ligger mellom to grenser
-QUARTILE		= KVARTIL				##	Returnerer kvartilen til et datasett
-RANK			= RANG					##	Returnerer rangeringen av et tall, eller plassen tallet har i en rekke
-RSQ			= RKVADRAT				##	Returnerer kvadratet av produktmomentkorrelasjonskoeffisienten (Pearsons r)
-SKEW			= SKJEVFORDELING			##	Returnerer skjevheten i en fordeling
-SLOPE			= STIGNINGSTALL				##	Returnerer stigningtallet for den lineære regresjonslinjen
-SMALL			= N.MINST				##	Returnerer den n-te minste verdien i et datasett
-STANDARDIZE		= NORMALISER				##	Returnerer en normalisert verdi
-STDEV			= STDAV					##	Estimere standardavvik på grunnlag av et utvalg
-STDEVA			= STDAVVIKA				##	Estimerer standardavvik basert på et utvalg, inkludert tall, tekst og logiske verdier
-STDEVP			= STDAVP				##	Beregner standardavvik basert på hele populasjonen
-STDEVPA			= STDAVVIKPA				##	Beregner standardavvik basert på hele populasjonen, inkludert tall, tekst og logiske verdier
-STEYX			= STANDARDFEIL				##	Returnerer standardfeilen for den predikerte y-verdien for hver x i regresjonen
-TDIST			= TFORDELING				##	Returnerer en Student t-fordeling
-TINV			= TINV					##	Returnerer den inverse Student t-fordelingen
-TREND			= TREND					##	Returnerer verdier langs en lineær trend
-TRIMMEAN		= TRIMMET.GJENNOMSNITT			##	Returnerer den interne middelverdien til et datasett
-TTEST			= TTEST					##	Returnerer sannsynligheten assosiert med en Student t-test
-VAR			= VARIANS				##	Estimerer varians basert på et utvalg
-VARA			= VARIANSA				##	Estimerer varians basert på et utvalg, inkludert tall, tekst og logiske verdier
-VARP			= VARIANSP				##	Beregner varians basert på hele populasjonen
-VARPA			= VARIANSPA				##	Beregner varians basert på hele populasjonen, inkludert tall, tekst og logiske verdier
-WEIBULL			= WEIBULL.FORDELING			##	Returnerer Weibull-fordelingen
-ZTEST			= ZTEST					##	Returnerer den ensidige sannsynlighetsverdien for en z-test
-
-
-##
-##	Text functions						Tekstfunksjoner
-##
-ASC			= STIGENDE				##	Endrer fullbreddes (dobbeltbyte) engelske bokstaver eller katakana i en tegnstreng, til halvbreddes (enkeltbyte) tegn
-BAHTTEXT		= BAHTTEKST				##	Konverterer et tall til tekst, og bruker valutaformatet ß (baht)
-CHAR			= TEGNKODE				##	Returnerer tegnet som svarer til kodenummeret
-CLEAN			= RENSK					##	Fjerner alle tegn som ikke kan skrives ut, fra teksten
-CODE			= KODE					##	Returnerer en numerisk kode for det første tegnet i en tekststreng
-CONCATENATE		= KJEDE.SAMMEN				##	Slår sammen flere tekstelementer til ett tekstelement
-DOLLAR			= VALUTA				##	Konverterer et tall til tekst, og bruker valutaformatet $ (dollar)
-EXACT			= EKSAKT				##	Kontrollerer om to tekstverdier er like
-FIND			= FINN					##	Finner en tekstverdi inne i en annen (skiller mellom store og små bokstaver)
-FINDB			= FINNB					##	Finner en tekstverdi inne i en annen (skiller mellom store og små bokstaver)
-FIXED			= FASTSATT				##	Formaterer et tall som tekst med et bestemt antall desimaler
-JIS			= JIS					##	Endrer halvbreddes (enkeltbyte) engelske bokstaver eller katakana i en tegnstreng, til fullbreddes (dobbeltbyte) tegn
-LEFT			= VENSTRE				##	Returnerer tegnene lengst til venstre i en tekstverdi
-LEFTB			= VENSTREB				##	Returnerer tegnene lengst til venstre i en tekstverdi
-LEN			= LENGDE				##	Returnerer antall tegn i en tekststreng
-LENB			= LENGDEB				##	Returnerer antall tegn i en tekststreng
-LOWER			= SMÅ					##	Konverterer tekst til små bokstaver
-MID			= DELTEKST				##	Returnerer et angitt antall tegn fra en tekststreng, og begynner fra posisjonen du angir
-MIDB			= DELTEKSTB				##	Returnerer et angitt antall tegn fra en tekststreng, og begynner fra posisjonen du angir
-PHONETIC		= FURIGANA				##	Trekker ut fonetiske tegn (furigana) fra en tekststreng
-PROPER			= STOR.FORBOKSTAV			##	Gir den første bokstaven i hvert ord i en tekstverdi stor forbokstav
-REPLACE			= ERSTATT				##	Erstatter tegn i en tekst
-REPLACEB		= ERSTATTB				##	Erstatter tegn i en tekst
-REPT			= GJENTA				##	Gjentar tekst et gitt antall ganger
-RIGHT			= HØYRE					##	Returnerer tegnene lengst til høyre i en tekstverdi
-RIGHTB			= HØYREB				##	Returnerer tegnene lengst til høyre i en tekstverdi
-SEARCH			= SØK					##	Finner en tekstverdi inne i en annen (skiller ikke mellom store og små bokstaver)
-SEARCHB			= SØKB					##	Finner en tekstverdi inne i en annen (skiller ikke mellom store og små bokstaver)
-SUBSTITUTE		= BYTT.UT				##	Bytter ut gammel tekst med ny tekst i en tekststreng
-T			= T					##	Konverterer argumentene til tekst
-TEXT			= TEKST					##	Formaterer et tall og konverterer det til tekst
-TRIM			= TRIMME				##	Fjerner mellomrom fra tekst
-UPPER			= STORE					##	Konverterer tekst til store bokstaver
-VALUE			= VERDI					##	Konverterer et tekstargument til et tall
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/pl/config b/plugins/exportTypes/Excel/PHPExcel/locale/pl/config
deleted file mode 100755
index 320a580de..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/pl/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= zł
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #ZERO!
-DIV0	= #DZIEL/0!
-VALUE	= #ARG!
-REF	= #ADR!
-NAME	= #NAZWA?
-NUM	= #LICZBA!
-NA	= #N/D!
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/pl/functions b/plugins/exportTypes/Excel/PHPExcel/locale/pl/functions
deleted file mode 100755
index d8d2e53ff..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/pl/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Funkcje dodatków i automatyzacji
-##
-GETPIVOTDATA		= WEŹDANETABELI			##	Zwraca dane przechowywane w raporcie tabeli przestawnej.
-
-
-##
-##	Cube functions					Funkcje modułów
-##
-CUBEKPIMEMBER		= ELEMENT.KPI.MODUŁU		##	Zwraca nazwę, właściwość i miarę kluczowego wskaźnika wydajności (KPI) oraz wyświetla nazwę i właściwość w komórce. Wskaźnik KPI jest miarą ilościową, taką jak miesięczny zysk brutto lub kwartalna fluktuacja pracowników, używaną do monitorowania wydajności organizacji.
-CUBEMEMBER		= ELEMENT.MODUŁU		##	Zwraca element lub krotkę z hierarchii modułu. Służy do sprawdzania, czy element lub krotka istnieje w module.
-CUBEMEMBERPROPERTY	= WŁAŚCIWOŚĆ.ELEMENTU.MODUŁU	##	Zwraca wartość właściwości elementu w module. Służy do sprawdzania, czy nazwa elementu istnieje w module, i zwracania określonej właściwości dla tego elementu.
-CUBERANKEDMEMBER	= USZEREGOWANY.ELEMENT.MODUŁU	##	Zwraca n-ty (albo uszeregowany) element zestawu. Służy do zwracania elementu lub elementów zestawu, na przykład najlepszego sprzedawcy lub 10 najlepszych studentów.
-CUBESET			= ZESTAW.MODUŁÓW		##	Definiuje obliczony zestaw elementów lub krotek, wysyłając wyrażenie zestawu do serwera modułu, który tworzy zestaw i zwraca go do programu Microsoft Office Excel.
-CUBESETCOUNT		= LICZNIK.MODUŁÓW.ZESTAWU	##	Zwraca liczbę elementów zestawu.
-CUBEVALUE		= WARTOŚĆ.MODUŁU		##	Zwraca zagregowaną wartość z modułu.
-
-
-##
-##	Database functions				Funkcje baz danych
-##
-DAVERAGE		= BD.ŚREDNIA			##	Zwraca wartość średniej wybranych wpisów bazy danych.
-DCOUNT			= BD.ILE.REKORDÓW		##	Zlicza komórki zawierające liczby w bazie danych.
-DCOUNTA			= BD.ILE.REKORDÓW.A		##	Zlicza niepuste komórki w bazie danych.
-DGET			= BD.POLE			##	Wyodrębnia z bazy danych jeden rekord spełniający określone kryteria.
-DMAX			= BD.MAX			##	Zwraca wartość maksymalną z wybranych wpisów bazy danych.
-DMIN			= BD.MIN			##	Zwraca wartość minimalną z wybranych wpisów bazy danych.
-DPRODUCT		= BD.ILOCZYN			##	Mnoży wartości w konkretnym, spełniającym kryteria polu rekordów bazy danych.
-DSTDEV			= BD.ODCH.STANDARD		##	Szacuje odchylenie standardowe na podstawie próbki z wybranych wpisów bazy danych.
-DSTDEVP			= BD.ODCH.STANDARD.POPUL	##	Oblicza odchylenie standardowe na podstawie całej populacji wybranych wpisów bazy danych.
-DSUM			= BD.SUMA			##	Dodaje liczby w kolumnie pól rekordów bazy danych, które spełniają kryteria.
-DVAR			= BD.WARIANCJA			##	Szacuje wariancję na podstawie próbki z wybranych wpisów bazy danych.
-DVARP			= BD.WARIANCJA.POPUL		##	Oblicza wariancję na podstawie całej populacji wybranych wpisów bazy danych.
-
-
-##
-##	Date and time functions				Funkcje dat, godzin i czasu
-##
-DATE			= DATA				##	Zwraca liczbę seryjną dla wybranej daty.
-DATEVALUE		= DATA.WARTOŚĆ			##	Konwertuje datę w formie tekstu na liczbę seryjną.
-DAY			= DZIEŃ				##	Konwertuje liczbę seryjną na dzień miesiąca.
-DAYS360			= DNI.360			##	Oblicza liczbę dni między dwiema datami na podstawie roku 360-dniowego.
-EDATE			= UPŁDNI			##	Zwraca liczbę seryjną daty jako wskazaną liczbę miesięcy przed określoną datą początkową lub po niej.
-EOMONTH			= EOMONTH			##	Zwraca liczbę seryjną ostatniego dnia miesiąca przed określoną liczbą miesięcy lub po niej.
-HOUR			= GODZINA			##	Konwertuje liczbę seryjną na godzinę.
-MINUTE			= MINUTA			##	Konwertuje liczbę seryjną na minutę.
-MONTH			= MIESIĄC			##	Konwertuje liczbę seryjną na miesiąc.
-NETWORKDAYS		= NETWORKDAYS			##	Zwraca liczbę pełnych dni roboczych między dwiema datami.
-NOW			= TERAZ				##	Zwraca liczbę seryjną bieżącej daty i godziny.
-SECOND			= SEKUNDA			##	Konwertuje liczbę seryjną na sekundę.
-TIME			= CZAS				##	Zwraca liczbę seryjną określonego czasu.
-TIMEVALUE		= CZAS.WARTOŚĆ			##	Konwertuje czas w formie tekstu na liczbę seryjną.
-TODAY			= DZIŚ				##	Zwraca liczbę seryjną dla daty bieżącej.
-WEEKDAY			= DZIEŃ.TYG			##	Konwertuje liczbę seryjną na dzień tygodnia.
-WEEKNUM			= WEEKNUM			##	Konwertuje liczbę seryjną na liczbę reprezentującą numer tygodnia w roku.
-WORKDAY			= WORKDAY			##	Zwraca liczbę seryjną dla daty przed określoną liczbą dni roboczych lub po niej.
-YEAR			= ROK				##	Konwertuje liczbę seryjną na rok.
-YEARFRAC		= YEARFRAC			##	Zwraca część roku reprezentowaną przez pełną liczbę dni między datą początkową a datą końcową.
-
-
-##
-##	Engineering functions				Funkcje inżynierskie
-##
-BESSELI			= BESSELI			##	Zwraca wartość zmodyfikowanej funkcji Bessela In(x).
-BESSELJ			= BESSELJ			##	Zwraca wartość funkcji Bessela Jn(x).
-BESSELK			= BESSELK			##	Zwraca wartość zmodyfikowanej funkcji Bessela Kn(x).
-BESSELY			= BESSELY			##	Zwraca wartość funkcji Bessela Yn(x).
-BIN2DEC			= BIN2DEC			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci dziesiętnej.
-BIN2HEX			= BIN2HEX			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci szesnastkowej.
-BIN2OCT			= BIN2OCT			##	Konwertuje liczbę w postaci dwójkowej na liczbę w postaci ósemkowej.
-COMPLEX			= COMPLEX			##	Konwertuje część rzeczywistą i urojoną na liczbę zespoloną.
-CONVERT			= CONVERT			##	Konwertuje liczbę z jednego systemu miar na inny.
-DEC2BIN			= DEC2BIN			##	Konwertuje liczbę w postaci dziesiętnej na postać dwójkową.
-DEC2HEX			= DEC2HEX			##	Konwertuje liczbę w postaci dziesiętnej na liczbę w postaci szesnastkowej.
-DEC2OCT			= DEC2OCT			##	Konwertuje liczbę w postaci dziesiętnej na liczbę w postaci ósemkowej.
-DELTA			= DELTA				##	Sprawdza, czy dwie wartości są równe.
-ERF			= ERF				##	Zwraca wartość funkcji błędu.
-ERFC			= ERFC				##	Zwraca wartość komplementarnej funkcji błędu.
-GESTEP			= GESTEP			##	Sprawdza, czy liczba jest większa niż wartość progowa.
-HEX2BIN			= HEX2BIN			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci dwójkowej.
-HEX2DEC			= HEX2DEC			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci dziesiętnej.
-HEX2OCT			= HEX2OCT			##	Konwertuje liczbę w postaci szesnastkowej na liczbę w postaci ósemkowej.
-IMABS			= IMABS				##	Zwraca wartość bezwzględną (moduł) liczby zespolonej.
-IMAGINARY		= IMAGINARY			##	Zwraca wartość części urojonej liczby zespolonej.
-IMARGUMENT		= IMARGUMENT			##	Zwraca wartość argumentu liczby zespolonej, przy czym kąt wyrażony jest w radianach.
-IMCONJUGATE		= IMCONJUGATE			##	Zwraca wartość liczby sprzężonej danej liczby zespolonej.
-IMCOS			= IMCOS				##	Zwraca wartość cosinusa liczby zespolonej.
-IMDIV			= IMDIV				##	Zwraca wartość ilorazu dwóch liczb zespolonych.
-IMEXP			= IMEXP				##	Zwraca postać wykładniczą liczby zespolonej.
-IMLN			= IMLN				##	Zwraca wartość logarytmu naturalnego liczby zespolonej.
-IMLOG10			= IMLOG10			##	Zwraca wartość logarytmu dziesiętnego liczby zespolonej.
-IMLOG2			= IMLOG2			##	Zwraca wartość logarytmu liczby zespolonej przy podstawie 2.
-IMPOWER			= IMPOWER			##	Zwraca wartość liczby zespolonej podniesionej do potęgi całkowitej.
-IMPRODUCT		= IMPRODUCT			##	Zwraca wartość iloczynu liczb zespolonych.
-IMREAL			= IMREAL			##	Zwraca wartość części rzeczywistej liczby zespolonej.
-IMSIN			= IMSIN				##	Zwraca wartość sinusa liczby zespolonej.
-IMSQRT			= IMSQRT			##	Zwraca wartość pierwiastka kwadratowego z liczby zespolonej.
-IMSUB			= IMSUB				##	Zwraca wartość różnicy dwóch liczb zespolonych.
-IMSUM			= IMSUM				##	Zwraca wartość sumy liczb zespolonych.
-OCT2BIN			= OCT2BIN			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci dwójkowej.
-OCT2DEC			= OCT2DEC			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci dziesiętnej.
-OCT2HEX			= OCT2HEX			##	Konwertuje liczbę w postaci ósemkowej na liczbę w postaci szesnastkowej.
-
-
-##
-##	Financial functions				Funkcje finansowe
-##
-ACCRINT			= ACCRINT			##	Zwraca narosłe odsetki dla papieru wartościowego z oprocentowaniem okresowym.
-ACCRINTM		= ACCRINTM			##	Zwraca narosłe odsetki dla papieru wartościowego z oprocentowaniem w terminie wykupu.
-AMORDEGRC		= AMORDEGRC			##	Zwraca amortyzację dla każdego okresu rozliczeniowego z wykorzystaniem współczynnika amortyzacji.
-AMORLINC		= AMORLINC			##	Zwraca amortyzację dla każdego okresu rozliczeniowego.
-COUPDAYBS		= COUPDAYBS			##	Zwraca liczbę dni od początku okresu dywidendy do dnia rozliczeniowego.
-COUPDAYS		= COUPDAYS			##	Zwraca liczbę dni w okresie dywidendy, z uwzględnieniem dnia rozliczeniowego.
-COUPDAYSNC		= COUPDAYSNC			##	Zwraca liczbę dni od dnia rozliczeniowego do daty następnego dnia dywidendy.
-COUPNCD			= COUPNCD			##	Zwraca dzień następnej dywidendy po dniu rozliczeniowym.
-COUPNUM			= COUPNUM			##	Zwraca liczbę dywidend płatnych między dniem rozliczeniowym a dniem wykupu.
-COUPPCD			= COUPPCD			##	Zwraca dzień poprzedniej dywidendy przed dniem rozliczeniowym.
-CUMIPMT			= CUMIPMT			##	Zwraca wartość procentu składanego płatnego między dwoma okresami.
-CUMPRINC		= CUMPRINC			##	Zwraca wartość kapitału skumulowanego spłaty pożyczki między dwoma okresami.
-DB			= DB				##	Zwraca amortyzację środka trwałego w danym okresie metodą degresywną z zastosowaniem stałej bazowej.
-DDB			= DDB				##	Zwraca amortyzację środka trwałego za podany okres metodą degresywną z zastosowaniem podwójnej bazowej lub metodą określoną przez użytkownika.
-DISC			= DISC				##	Zwraca wartość stopy dyskontowej papieru wartościowego.
-DOLLARDE		= DOLLARDE			##	Konwertuje cenę w postaci ułamkowej na cenę wyrażoną w postaci dziesiętnej.
-DOLLARFR		= DOLLARFR			##	Konwertuje cenę wyrażoną w postaci dziesiętnej na cenę wyrażoną w postaci ułamkowej.
-DURATION		= DURATION			##	Zwraca wartość rocznego przychodu z papieru wartościowego o okresowych wypłatach oprocentowania.
-EFFECT			= EFFECT			##	Zwraca wartość efektywnej rocznej stopy procentowej.
-FV			= FV				##	Zwraca przyszłą wartość lokaty.
-FVSCHEDULE		= FVSCHEDULE			##	Zwraca przyszłą wartość kapitału początkowego wraz z szeregiem procentów składanych.
-INTRATE			= INTRATE			##	Zwraca wartość stopy procentowej papieru wartościowego całkowicie ulokowanego.
-IPMT			= IPMT				##	Zwraca wysokość spłaty oprocentowania lokaty za dany okres.
-IRR			= IRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla serii przepływów gotówkowych.
-ISPMT			= ISPMT				##	Oblicza wysokość spłaty oprocentowania za dany okres lokaty.
-MDURATION		= MDURATION			##	Zwraca wartość zmodyfikowanego okresu Macauleya dla papieru wartościowego o założonej wartości nominalnej 100 zł.
-MIRR			= MIRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla przypadku, gdy dodatnie i ujemne przepływy gotówkowe mają różne stopy.
-NOMINAL			= NOMINAL			##	Zwraca wysokość nominalnej rocznej stopy procentowej.
-NPER			= NPER				##	Zwraca liczbę okresów dla lokaty.
-NPV			= NPV				##	Zwraca wartość bieżącą netto lokaty na podstawie szeregu okresowych przepływów gotówkowych i stopy dyskontowej.
-ODDFPRICE		= ODDFPRICE			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z nietypowym pierwszym okresem.
-ODDFYIELD		= ODDFYIELD			##	Zwraca rentowność papieru wartościowego z nietypowym pierwszym okresem.
-ODDLPRICE		= ODDLPRICE			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z nietypowym ostatnim okresem.
-ODDLYIELD		= ODDLYIELD			##	Zwraca rentowność papieru wartościowego z nietypowym ostatnim okresem.
-PMT			= PMT				##	Zwraca wartość okresowej płatności raty rocznej.
-PPMT			= PPMT				##	Zwraca wysokość spłaty kapitału w przypadku lokaty dla danego okresu.
-PRICE			= PRICE				##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z oprocentowaniem okresowym.
-PRICEDISC		= PRICEDISC			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego zdyskontowanego.
-PRICEMAT		= PRICEMAT			##	Zwraca cenę za 100 zł wartości nominalnej papieru wartościowego z oprocentowaniem w terminie wykupu.
-PV			= PV				##	Zwraca wartość bieżącą lokaty.
-RATE			= RATE				##	Zwraca wysokość stopy procentowej w okresie raty rocznej.
-RECEIVED		= RECEIVED			##	Zwraca wartość kapitału otrzymanego przy wykupie papieru wartościowego całkowicie ulokowanego.
-SLN			= SLN				##	Zwraca amortyzację środka trwałego za jeden okres metodą liniową.
-SYD			= SYD				##	Zwraca amortyzację środka trwałego za dany okres metodą sumy cyfr lat amortyzacji.
-TBILLEQ			= TBILLEQ			##	Zwraca rentowność ekwiwalentu obligacji dla bonu skarbowego.
-TBILLPRICE		= TBILLPRICE			##	Zwraca cenę za 100 zł wartości nominalnej bonu skarbowego.
-TBILLYIELD		= TBILLYIELD			##	Zwraca rentowność bonu skarbowego.
-VDB			= VDB				##	Oblicza amortyzację środka trwałego w danym okresie lub jego części metodą degresywną.
-XIRR			= XIRR				##	Zwraca wartość wewnętrznej stopy zwrotu dla serii rozłożonych w czasie przepływów gotówkowych, niekoniecznie okresowych.
-XNPV			= XNPV				##	Zwraca wartość bieżącą netto dla serii rozłożonych w czasie przepływów gotówkowych, niekoniecznie okresowych.
-YIELD			= YIELD				##	Zwraca rentowność papieru wartościowego z oprocentowaniem okresowym.
-YIELDDISC		= YIELDDISC			##	Zwraca roczną rentowność zdyskontowanego papieru wartościowego, na przykład bonu skarbowego.
-YIELDMAT		= YIELDMAT			##	Zwraca roczną rentowność papieru wartościowego oprocentowanego przy wykupie.
-
-
-##
-##	Information functions				Funkcje informacyjne
-##
-CELL			= KOMÓRKA			##	Zwraca informacje o formacie, położeniu lub zawartości komórki.
-ERROR.TYPE		= NR.BŁĘDU			##	Zwraca liczbę odpowiadającą typowi błędu.
-INFO			= INFO				##	Zwraca informację o aktualnym środowisku pracy.
-ISBLANK			= CZY.PUSTA			##	Zwraca wartość PRAWDA, jeśli wartość jest pusta.
-ISERR			= CZY.BŁ			##	Zwraca wartość PRAWDA, jeśli wartość jest dowolną wartością błędu, z wyjątkiem #N/D!.
-ISERROR			= CZY.BŁĄD			##	Zwraca wartość PRAWDA, jeśli wartość jest dowolną wartością błędu.
-ISEVEN			= ISEVEN			##	Zwraca wartość PRAWDA, jeśli liczba jest parzysta.
-ISLOGICAL		= CZY.LOGICZNA			##	Zwraca wartość PRAWDA, jeśli wartość jest wartością logiczną.
-ISNA			= CZY.BRAK			##	Zwraca wartość PRAWDA, jeśli wartość jest wartością błędu #N/D!.
-ISNONTEXT		= CZY.NIE.TEKST			##	Zwraca wartość PRAWDA, jeśli wartość nie jest tekstem.
-ISNUMBER		= CZY.LICZBA			##	Zwraca wartość PRAWDA, jeśli wartość jest liczbą.
-ISODD			= ISODD				##	Zwraca wartość PRAWDA, jeśli liczba jest nieparzysta.
-ISREF			= CZY.ADR			##	Zwraca wartość PRAWDA, jeśli wartość jest odwołaniem.
-ISTEXT			= CZY.TEKST			##	Zwraca wartość PRAWDA, jeśli wartość jest tekstem.
-N			= L				##	Zwraca wartość przekonwertowaną na postać liczbową.
-NA			= BRAK				##	Zwraca wartość błędu #N/D!.
-TYPE			= TYP				##	Zwraca liczbę wskazującą typ danych wartości.
-
-
-##
-##	Logical functions				Funkcje logiczne
-##
-AND			= ORAZ				##	Zwraca wartość PRAWDA, jeśli wszystkie argumenty mają wartość PRAWDA.
-FALSE			= FAŁSZ				##	Zwraca wartość logiczną FAŁSZ.
-IF			= JEŻELI			##	Określa warunek logiczny do sprawdzenia.
-IFERROR			= JEŻELI.BŁĄD			##	Zwraca określoną wartość, jeśli wynikiem obliczenia formuły jest błąd; w przeciwnym przypadku zwraca wynik formuły.
-NOT			= NIE				##	Odwraca wartość logiczną argumentu.
-OR			= LUB				##	Zwraca wartość PRAWDA, jeśli co najmniej jeden z argumentów ma wartość PRAWDA.
-TRUE			= PRAWDA			##	Zwraca wartość logiczną PRAWDA.
-
-
-##
-##	Lookup and reference functions			Funkcje wyszukiwania i odwołań
-##
-ADDRESS			= ADRES				##	Zwraca odwołanie do jednej komórki w arkuszu jako wartość tekstową.
-AREAS			= OBSZARY			##	Zwraca liczbę obszarów występujących w odwołaniu.
-CHOOSE			= WYBIERZ			##	Wybiera wartość z listy wartości.
-COLUMN			= NR.KOLUMNY			##	Zwraca numer kolumny z odwołania.
-COLUMNS			= LICZBA.KOLUMN			##	Zwraca liczbę kolumn dla danego odwołania.
-HLOOKUP			= WYSZUKAJ.POZIOMO		##	Przegląda górny wiersz tablicy i zwraca wartość wskazanej komórki.
-HYPERLINK		= HIPERŁĄCZE			##	Tworzy skrót lub skok, który pozwala otwierać dokument przechowywany na serwerze sieciowym, w sieci intranet lub w Internecie.
-INDEX			= INDEKS			##	Używa indeksu do wybierania wartości z odwołania lub tablicy.
-INDIRECT		= ADR.POŚR			##	Zwraca odwołanie określone przez wartość tekstową.
-LOOKUP			= WYSZUKAJ			##	Wyszukuje wartości w wektorze lub tablicy.
-MATCH			= PODAJ.POZYCJĘ			##	Wyszukuje wartości w odwołaniu lub w tablicy.
-OFFSET			= PRZESUNIĘCIE			##	Zwraca adres przesunięty od danego odwołania.
-ROW			= WIERSZ			##	Zwraca numer wiersza odwołania.
-ROWS			= ILE.WIERSZY			##	Zwraca liczbę wierszy dla danego odwołania.
-RTD			= RTD				##	Pobiera dane w czasie rzeczywistym z programu obsługującego automatyzację COM (Automatyzacja: Sposób pracy z obiektami aplikacji pochodzącymi z innej aplikacji lub narzędzia projektowania. Nazywana wcześniej Automatyzacją OLE, Automatyzacja jest standardem przemysłowym i funkcją obiektowego modelu składników (COM, Component Object Model).).
-TRANSPOSE		= TRANSPONUJ			##	Zwraca transponowaną tablicę.
-VLOOKUP			= WYSZUKAJ.PIONOWO		##	Przeszukuje pierwszą kolumnę tablicy i przechodzi wzdłuż wiersza, aby zwrócić wartość komórki.
-
-
-##
-##	Math and trigonometry functions			Funkcje matematyczne i trygonometryczne
-##
-ABS			= MODUŁ.LICZBY			##	Zwraca wartość absolutną liczby.
-ACOS			= ACOS				##	Zwraca arcus cosinus liczby.
-ACOSH			= ACOSH				##	Zwraca arcus cosinus hiperboliczny liczby.
-ASIN			= ASIN				##	Zwraca arcus sinus liczby.
-ASINH			= ASINH				##	Zwraca arcus sinus hiperboliczny liczby.
-ATAN			= ATAN				##	Zwraca arcus tangens liczby.
-ATAN2			= ATAN2				##	Zwraca arcus tangens liczby na podstawie współrzędnych x i y.
-ATANH			= ATANH				##	Zwraca arcus tangens hiperboliczny liczby.
-CEILING			= ZAOKR.W.GÓRĘ			##	Zaokrągla liczbę do najbliższej liczby całkowitej lub do najbliższej wielokrotności dokładności.
-COMBIN			= KOMBINACJE			##	Zwraca liczbę kombinacji dla danej liczby obiektów.
-COS			= COS				##	Zwraca cosinus liczby.
-COSH			= COSH				##	Zwraca cosinus hiperboliczny liczby.
-DEGREES			= STOPNIE			##	Konwertuje radiany na stopnie.
-EVEN			= ZAOKR.DO.PARZ			##	Zaokrągla liczbę w górę do najbliższej liczby parzystej.
-EXP			= EXP				##	Zwraca wartość liczby e podniesionej do potęgi określonej przez podaną liczbę.
-FACT			= SILNIA			##	Zwraca silnię liczby.
-FACTDOUBLE		= FACTDOUBLE			##	Zwraca podwójną silnię liczby.
-FLOOR			= ZAOKR.W.DÓŁ			##	Zaokrągla liczbę w dół, w kierunku zera.
-GCD			= GCD				##	Zwraca największy wspólny dzielnik.
-INT			= ZAOKR.DO.CAŁK			##	Zaokrągla liczbę w dół do najbliższej liczby całkowitej.
-LCM			= LCM				##	Zwraca najmniejszą wspólną wielokrotność.
-LN			= LN				##	Zwraca logarytm naturalny podanej liczby.
-LOG			= LOG				##	Zwraca logarytm danej liczby przy zadanej podstawie.
-LOG10			= LOG10				##	Zwraca logarytm dziesiętny liczby.
-MDETERM			= WYZNACZNIK.MACIERZY		##	Zwraca wyznacznik macierzy tablicy.
-MINVERSE		= MACIERZ.ODW			##	Zwraca odwrotność macierzy tablicy.
-MMULT			= MACIERZ.ILOCZYN		##	Zwraca iloczyn macierzy dwóch tablic.
-MOD			= MOD				##	Zwraca resztę z dzielenia.
-MROUND			= MROUND			##	Zwraca liczbę zaokrągloną do żądanej wielokrotności.
-MULTINOMIAL		= MULTINOMIAL			##	Zwraca wielomian dla zbioru liczb.
-ODD			= ZAOKR.DO.NPARZ		##	Zaokrągla liczbę w górę do najbliższej liczby nieparzystej.
-PI			= PI				##	Zwraca wartość liczby Pi.
-POWER			= POTĘGA			##	Zwraca liczbę podniesioną do potęgi.
-PRODUCT			= ILOCZYN			##	Mnoży argumenty.
-QUOTIENT		= QUOTIENT			##	Zwraca iloraz (całkowity).
-RADIANS			= RADIANY			##	Konwertuje stopnie na radiany.
-RAND			= LOS				##	Zwraca liczbę pseudolosową z zakresu od 0 do 1.
-RANDBETWEEN		= RANDBETWEEN			##	Zwraca liczbę pseudolosową z zakresu określonego przez podane argumenty.
-ROMAN			= RZYMSKIE			##	Konwertuje liczbę arabską na rzymską jako tekst.
-ROUND			= ZAOKR				##	Zaokrągla liczbę do określonej liczby cyfr.
-ROUNDDOWN		= ZAOKR.DÓŁ			##	Zaokrągla liczbę w dół, w kierunku zera.
-ROUNDUP			= ZAOKR.GÓRA			##	Zaokrągla liczbę w górę, w kierunku od zera.
-SERIESSUM		= SERIESSUM			##	Zwraca sumę szeregu potęgowego na podstawie wzoru.
-SIGN			= ZNAK.LICZBY			##	Zwraca znak liczby.
-SIN			= SIN				##	Zwraca sinus danego kąta.
-SINH			= SINH				##	Zwraca sinus hiperboliczny liczby.
-SQRT			= PIERWIASTEK			##	Zwraca dodatni pierwiastek kwadratowy.
-SQRTPI			= SQRTPI			##	Zwraca pierwiastek kwadratowy iloczynu (liczba * Pi).
-SUBTOTAL		= SUMY.POŚREDNIE		##	Zwraca sumę częściową listy lub bazy danych.
-SUM			= SUMA				##	Dodaje argumenty.
-SUMIF			= SUMA.JEŻELI			##	Dodaje komórki określone przez podane kryterium.
-SUMIFS			= SUMA.WARUNKÓW			##	Dodaje komórki w zakresie, które spełniają wiele kryteriów.
-SUMPRODUCT		= SUMA.ILOCZYNÓW		##	Zwraca sumę iloczynów odpowiednich elementów tablicy.
-SUMSQ			= SUMA.KWADRATÓW		##	Zwraca sumę kwadratów argumentów.
-SUMX2MY2		= SUMA.X2.M.Y2			##	Zwraca sumę różnic kwadratów odpowiednich wartości w dwóch tablicach.
-SUMX2PY2		= SUMA.X2.P.Y2			##	Zwraca sumę sum kwadratów odpowiednich wartości w dwóch tablicach.
-SUMXMY2			= SUMA.XMY.2			##	Zwraca sumę kwadratów różnic odpowiednich wartości w dwóch tablicach.
-TAN			= TAN				##	Zwraca tangens liczby.
-TANH			= TANH				##	Zwraca tangens hiperboliczny liczby.
-TRUNC			= LICZBA.CAŁK			##	Przycina liczbę do wartości całkowitej.
-
-
-##
-##	Statistical functions				Funkcje statystyczne
-##
-AVEDEV			= ODCH.ŚREDNIE			##	Zwraca średnią wartość odchyleń absolutnych punktów danych od ich wartości średniej.
-AVERAGE			= ŚREDNIA			##	Zwraca wartość średnią argumentów.
-AVERAGEA		= ŚREDNIA.A			##	Zwraca wartość średnią argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
-AVERAGEIF		= ŚREDNIA.JEŻELI		##	Zwraca średnią (średnią arytmetyczną) wszystkich komórek w zakresie, które spełniają podane kryteria.
-AVERAGEIFS		= ŚREDNIA.WARUNKÓW		##	Zwraca średnią (średnią arytmetyczną) wszystkich komórek, które spełniają jedno lub więcej kryteriów.
-BETADIST		= ROZKŁAD.BETA			##	Zwraca skumulowaną funkcję gęstości prawdopodobieństwa beta.
-BETAINV			= ROZKŁAD.BETA.ODW		##	Zwraca odwrotność skumulowanej funkcji gęstości prawdopodobieństwa beta.
-BINOMDIST		= ROZKŁAD.DWUM			##	Zwraca pojedynczy składnik dwumianowego rozkładu prawdopodobieństwa.
-CHIDIST			= ROZKŁAD.CHI			##	Zwraca wartość jednostronnego prawdopodobieństwa rozkładu chi-kwadrat.
-CHIINV			= ROZKŁAD.CHI.ODW		##	Zwraca odwrotność wartości jednostronnego prawdopodobieństwa rozkładu chi-kwadrat.
-CHITEST			= TEST.CHI			##	Zwraca test niezależności.
-CONFIDENCE		= UFNOŚĆ			##	Zwraca interwał ufności dla średniej populacji.
-CORREL			= WSP.KORELACJI			##	Zwraca współczynnik korelacji dwóch zbiorów danych.
-COUNT			= ILE.LICZB			##	Zlicza liczby znajdujące się na liście argumentów.
-COUNTA			= ILE.NIEPUSTYCH		##	Zlicza wartości znajdujące się na liście argumentów.
-COUNTBLANK		= LICZ.PUSTE			##	Zwraca liczbę pustych komórek w pewnym zakresie.
-COUNTIF			= LICZ.JEŻELI			##	Zlicza komórki wewnątrz zakresu, które spełniają podane kryteria.
-COUNTIFS		= LICZ.WARUNKI			##	Zlicza komórki wewnątrz zakresu, które spełniają wiele kryteriów.
-COVAR			= KOWARIANCJA			##	Zwraca kowariancję, czyli średnią wartość iloczynów odpowiednich odchyleń.
-CRITBINOM		= PRÓG.ROZKŁAD.DWUM		##	Zwraca najmniejszą wartość, dla której skumulowany rozkład dwumianowy jest mniejszy niż wartość kryterium lub równy jej.
-DEVSQ			= ODCH.KWADRATOWE		##	Zwraca sumę kwadratów odchyleń.
-EXPONDIST		= ROZKŁAD.EXP			##	Zwraca rozkład wykładniczy.
-FDIST			= ROZKŁAD.F			##	Zwraca rozkład prawdopodobieństwa F.
-FINV			= ROZKŁAD.F.ODW			##	Zwraca odwrotność rozkładu prawdopodobieństwa F.
-FISHER			= ROZKŁAD.FISHER		##	Zwraca transformację Fishera.
-FISHERINV		= ROZKŁAD.FISHER.ODW		##	Zwraca odwrotność transformacji Fishera.
-FORECAST		= REGLINX			##	Zwraca wartość trendu liniowego.
-FREQUENCY		= CZĘSTOŚĆ			##	Zwraca rozkład częstotliwości jako tablicę pionową.
-FTEST			= TEST.F			##	Zwraca wynik testu F.
-GAMMADIST		= ROZKŁAD.GAMMA			##	Zwraca rozkład gamma.
-GAMMAINV		= ROZKŁAD.GAMMA.ODW		##	Zwraca odwrotność skumulowanego rozkładu gamma.
-GAMMALN			= ROZKŁAD.LIN.GAMMA		##	Zwraca logarytm naturalny funkcji gamma, Γ(x).
-GEOMEAN			= ŚREDNIA.GEOMETRYCZNA		##	Zwraca średnią geometryczną.
-GROWTH			= REGEXPW			##	Zwraca wartości trendu wykładniczego.
-HARMEAN			= ŚREDNIA.HARMONICZNA		##	Zwraca średnią harmoniczną.
-HYPGEOMDIST		= ROZKŁAD.HIPERGEOM		##	Zwraca rozkład hipergeometryczny.
-INTERCEPT		= ODCIĘTA			##	Zwraca punkt przecięcia osi pionowej z linią regresji liniowej.
-KURT			= KURTOZA			##	Zwraca kurtozę zbioru danych.
-LARGE			= MAX.K				##	Zwraca k-tą największą wartość ze zbioru danych.
-LINEST			= REGLINP			##	Zwraca parametry trendu liniowego.
-LOGEST			= REGEXPP			##	Zwraca parametry trendu wykładniczego.
-LOGINV			= ROZKŁAD.LOG.ODW		##	Zwraca odwrotność rozkładu logarytmu naturalnego.
-LOGNORMDIST		= ROZKŁAD.LOG			##	Zwraca skumulowany rozkład logarytmu naturalnego.
-MAX			= MAX				##	Zwraca maksymalną wartość listy argumentów.
-MAXA			= MAX.A				##	Zwraca maksymalną wartość listy argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
-MEDIAN			= MEDIANA			##	Zwraca medianę podanych liczb.
-MIN			= MIN				##	Zwraca minimalną wartość listy argumentów.
-MINA			= MIN.A				##	Zwraca najmniejszą wartość listy argumentów, z uwzględnieniem liczb, tekstów i wartości logicznych.
-MODE			= WYST.NAJCZĘŚCIEJ		##	Zwraca wartość najczęściej występującą w zbiorze danych.
-NEGBINOMDIST		= ROZKŁAD.DWUM.PRZEC		##	Zwraca ujemny rozkład dwumianowy.
-NORMDIST		= ROZKŁAD.NORMALNY		##	Zwraca rozkład normalny skumulowany.
-NORMINV			= ROZKŁAD.NORMALNY.ODW		##	Zwraca odwrotność rozkładu normalnego skumulowanego.
-NORMSDIST		= ROZKŁAD.NORMALNY.S		##	Zwraca standardowy rozkład normalny skumulowany.
-NORMSINV		= ROZKŁAD.NORMALNY.S.ODW	##	Zwraca odwrotność standardowego rozkładu normalnego skumulowanego.
-PEARSON			= PEARSON			##	Zwraca współczynnik korelacji momentu iloczynu Pearsona.
-PERCENTILE		= PERCENTYL			##	Wyznacza k-ty percentyl wartości w zakresie.
-PERCENTRANK		= PROCENT.POZYCJA		##	Zwraca procentową pozycję wartości w zbiorze danych.
-PERMUT			= PERMUTACJE			##	Zwraca liczbę permutacji dla danej liczby obiektów.
-POISSON			= ROZKŁAD.POISSON		##	Zwraca rozkład Poissona.
-PROB			= PRAWDPD			##	Zwraca prawdopodobieństwo, że wartości w zakresie leżą pomiędzy dwiema granicami.
-QUARTILE		= KWARTYL			##	Wyznacza kwartyl zbioru danych.
-RANK			= POZYCJA			##	Zwraca pozycję liczby na liście liczb.
-RSQ			= R.KWADRAT			##	Zwraca kwadrat współczynnika korelacji momentu iloczynu Pearsona.
-SKEW			= SKOŚNOŚĆ			##	Zwraca skośność rozkładu.
-SLOPE			= NACHYLENIE			##	Zwraca nachylenie linii regresji liniowej.
-SMALL			= MIN.K				##	Zwraca k-tą najmniejszą wartość ze zbioru danych.
-STANDARDIZE		= NORMALIZUJ			##	Zwraca wartość znormalizowaną.
-STDEV			= ODCH.STANDARDOWE		##	Szacuje odchylenie standardowe na podstawie próbki.
-STDEVA			= ODCH.STANDARDOWE.A		##	Szacuje odchylenie standardowe na podstawie próbki, z uwzględnieniem liczb, tekstów i wartości logicznych.
-STDEVP			= ODCH.STANDARD.POPUL		##	Oblicza odchylenie standardowe na podstawie całej populacji.
-STDEVPA			= ODCH.STANDARD.POPUL.A		##	Oblicza odchylenie standardowe na podstawie całej populacji, z uwzględnieniem liczb, teksów i wartości logicznych.
-STEYX			= REGBŁSTD			##	Zwraca błąd standardowy przewidzianej wartości y dla każdej wartości x w regresji.
-TDIST			= ROZKŁAD.T			##	Zwraca rozkład t-Studenta.
-TINV			= ROZKŁAD.T.ODW			##	Zwraca odwrotność rozkładu t-Studenta.
-TREND			= REGLINW			##	Zwraca wartości trendu liniowego.
-TRIMMEAN		= ŚREDNIA.WEWN			##	Zwraca średnią wartość dla wnętrza zbioru danych.
-TTEST			= TEST.T			##	Zwraca prawdopodobieństwo związane z testem t-Studenta.
-VAR			= WARIANCJA			##	Szacuje wariancję na podstawie próbki.
-VARA			= WARIANCJA.A			##	Szacuje wariancję na podstawie próbki, z uwzględnieniem liczb, tekstów i wartości logicznych.
-VARP			= WARIANCJA.POPUL		##	Oblicza wariancję na podstawie całej populacji.
-VARPA			= WARIANCJA.POPUL.A		##	Oblicza wariancję na podstawie całej populacji, z uwzględnieniem liczb, tekstów i wartości logicznych.
-WEIBULL			= ROZKŁAD.WEIBULL		##	Zwraca rozkład Weibulla.
-ZTEST			= TEST.Z			##	Zwraca wartość jednostronnego prawdopodobieństwa testu z.
-
-
-##
-##	Text functions					Funkcje tekstowe
-##
-ASC			= ASC				##	Zamienia litery angielskie lub katakana o pełnej szerokości (dwubajtowe) w ciągu znaków na znaki o szerokości połówkowej (jednobajtowe).
-BAHTTEXT		= BAHTTEXT			##	Konwertuje liczbę na tekst, stosując format walutowy ß (baht).
-CHAR			= ZNAK				##	Zwraca znak o podanym numerze kodu.
-CLEAN			= OCZYŚĆ			##	Usuwa z tekstu wszystkie znaki, które nie mogą być drukowane.
-CODE			= KOD				##	Zwraca kod numeryczny pierwszego znaku w ciągu tekstowym.
-CONCATENATE		= ZŁĄCZ.TEKSTY			##	Łączy kilka oddzielnych tekstów w jeden tekst.
-DOLLAR			= KWOTA				##	Konwertuje liczbę na tekst, stosując format walutowy $ (dolar).
-EXACT			= PORÓWNAJ			##	Sprawdza identyczność dwóch wartości tekstowych.
-FIND			= ZNAJDŹ			##	Znajduje jedną wartość tekstową wewnątrz innej (z uwzględnieniem wielkich i małych liter).
-FINDB			= ZNAJDŹB			##	Znajduje jedną wartość tekstową wewnątrz innej (z uwzględnieniem wielkich i małych liter).
-FIXED			= ZAOKR.DO.TEKST		##	Formatuje liczbę jako tekst przy stałej liczbie miejsc dziesiętnych.
-JIS			= JIS				##	Zmienia litery angielskie lub katakana o szerokości połówkowej (jednobajtowe) w ciągu znaków na znaki o pełnej szerokości (dwubajtowe).
-LEFT			= LEWY				##	Zwraca skrajne lewe znaki z wartości tekstowej.
-LEFTB			= LEWYB				##	Zwraca skrajne lewe znaki z wartości tekstowej.
-LEN			= DŁ				##	Zwraca liczbę znaków ciągu tekstowego.
-LENB			= DŁ.B				##	Zwraca liczbę znaków ciągu tekstowego.
-LOWER			= LITERY.MAŁE			##	Konwertuje wielkie litery tekstu na małe litery.
-MID			= FRAGMENT.TEKSTU		##	Zwraca określoną liczbę znaków z ciągu tekstowego, zaczynając od zadanej pozycji.
-MIDB			= FRAGMENT.TEKSTU.B		##	Zwraca określoną liczbę znaków z ciągu tekstowego, zaczynając od zadanej pozycji.
-PHONETIC		= PHONETIC			##	Wybiera znaki fonetyczne (furigana) z ciągu tekstowego.
-PROPER			= Z.WIELKIEJ.LITERY		##	Zastępuje pierwszą literę każdego wyrazu tekstu wielką literą.
-REPLACE			= ZASTĄP			##	Zastępuje znaki w tekście.
-REPLACEB		= ZASTĄP.B			##	Zastępuje znaki w tekście.
-REPT			= POWT				##	Powiela tekst daną liczbę razy.
-RIGHT			= PRAWY				##	Zwraca skrajne prawe znaki z wartości tekstowej.
-RIGHTB			= PRAWYB			##	Zwraca skrajne prawe znaki z wartości tekstowej.
-SEARCH			= SZUKAJ.TEKST			##	Wyszukuje jedną wartość tekstową wewnątrz innej (bez uwzględniania wielkości liter).
-SEARCHB			= SZUKAJ.TEKST.B		##	Wyszukuje jedną wartość tekstową wewnątrz innej (bez uwzględniania wielkości liter).
-SUBSTITUTE		= PODSTAW			##	Podstawia nowy tekst w miejsce poprzedniego tekstu w ciągu tekstowym.
-T			= T				##	Konwertuje argumenty na tekst.
-TEXT			= TEKST				##	Formatuje liczbę i konwertuje ją na tekst.
-TRIM			= USUŃ.ZBĘDNE.ODSTĘPY		##	Usuwa spacje z tekstu.
-UPPER			= LITERY.WIELKIE		##	Konwertuje znaki tekstu na wielkie litery.
-VALUE			= WARTOŚĆ			##	Konwertuje argument tekstowy na liczbę.
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/pt/br/config b/plugins/exportTypes/Excel/PHPExcel/locale/pt/br/config
deleted file mode 100755
index bf599dcfe..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/pt/br/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= R$
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #NULO!
-DIV0	= #DIV/0!
-VALUE	= #VALOR!
-REF	= #REF!
-NAME	= #NOME?
-NUM	= #NÚM!
-NA	= #N/D
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/pt/br/functions b/plugins/exportTypes/Excel/PHPExcel/locale/pt/br/functions
deleted file mode 100755
index c53e4c9a6..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/pt/br/functions
+++ /dev/null
@@ -1,408 +0,0 @@
-##
-##	Add-in and Automation functions			Funções Suplemento e Automação
-##
-GETPIVOTDATA		= INFODADOSTABELADINÂMICA	##	Retorna os dados armazenados em um relatório de tabela dinâmica
-
-
-##
-##	Cube functions					Funções de Cubo
-##
-CUBEKPIMEMBER		= MEMBROKPICUBO			##	Retorna o nome de um KPI (indicador de desempenho-chave), uma propriedade e uma medida e exibe o nome e a propriedade na célula. Um KPI é uma medida quantificável, como o lucro bruto mensal ou a rotatividade trimestral dos funcionários, usada para monitorar o desempenho de uma organização.
-CUBEMEMBER		= MEMBROCUBO			##	Retorna um membro ou tupla em uma hierarquia de cubo. Use para validar se o membro ou tupla existe no cubo.
-CUBEMEMBERPROPERTY	= PROPRIEDADEMEMBROCUBO		##	Retorna o valor da propriedade de um membro no cubo. Usada para validar a existência do nome do membro no cubo e para retornar a propriedade especificada para esse membro.
-CUBERANKEDMEMBER	= MEMBROCLASSIFICADOCUBO	##	Retorna o enésimo membro, ou o membro ordenado, em um conjunto. Use para retornar um ou mais elementos em um conjunto, assim como o melhor vendedor ou os dez melhores alunos.
-CUBESET			= CONJUNTOCUBO			##	Define um conjunto calculado de membros ou tuplas enviando uma expressão do conjunto para o cubo no servidor, que cria o conjunto e o retorna para o Microsoft Office Excel.
-CUBESETCOUNT		= CONTAGEMCONJUNTOCUBO		##	Retorna o número de itens em um conjunto.
-CUBEVALUE		= VALORCUBO			##	Retorna um valor agregado de um cubo.
-
-
-##
-##	Database functions				Funções de banco de dados
-##
-DAVERAGE		= BDMÉDIA			##	Retorna a média das entradas selecionadas de um banco de dados
-DCOUNT			= BDCONTAR			##	Conta as células que contêm números em um banco de dados
-DCOUNTA			= BDCONTARA			##	Conta células não vazias em um banco de dados
-DGET			= BDEXTRAIR			##	Extrai de um banco de dados um único registro que corresponde a um critério específico
-DMAX			= BDMÁX				##	Retorna o valor máximo de entradas selecionadas de um banco de dados
-DMIN			= BDMÍN				##	Retorna o valor mínimo de entradas selecionadas de um banco de dados
-DPRODUCT		= BDMULTIPL			##	Multiplica os valores em um campo específico de registros que correspondem ao critério em um banco de dados
-DSTDEV			= BDEST				##	Estima o desvio padrão com base em uma amostra de entradas selecionadas de um banco de dados
-DSTDEVP			= BDDESVPA			##	Calcula o desvio padrão com base na população inteira de entradas selecionadas de um banco de dados
-DSUM			= BDSOMA			##	Adiciona os números à coluna de campos de registros do banco de dados que correspondem ao critério
-DVAR			= BDVAREST			##	Estima a variância com base em uma amostra de entradas selecionadas de um banco de dados
-DVARP			= BDVARP			##	Calcula a variância com base na população inteira de entradas selecionadas de um banco de dados
-
-
-##
-##	Date and time functions				Funções de data e hora
-##
-DATE			= DATA				##	Retorna o número de série de uma data específica
-DATEVALUE		= DATA.VALOR			##	Converte uma data na forma de texto para um número de série
-DAY			= DIA				##	Converte um número de série em um dia do mês
-DAYS360			= DIAS360			##	Calcula o número de dias entre duas datas com base em um ano de 360 dias
-EDATE			= DATAM				##	Retorna o número de série da data que é o número indicado de meses antes ou depois da data inicial
-EOMONTH			= FIMMÊS			##	Retorna o número de série do último dia do mês antes ou depois de um número especificado de meses
-HOUR			= HORA				##	Converte um número de série em uma hora
-MINUTE			= MINUTO			##	Converte um número de série em um minuto
-MONTH			= MÊS				##	Converte um número de série em um mês
-NETWORKDAYS		= DIATRABALHOTOTAL		##	Retorna o número de dias úteis inteiros entre duas datas
-NOW			= AGORA				##	Retorna o número de série seqüencial da data e hora atuais
-SECOND			= SEGUNDO			##	Converte um número de série em um segundo
-TIME			= HORA				##	Retorna o número de série de uma hora específica
-TIMEVALUE		= VALOR.TEMPO			##	Converte um horário na forma de texto para um número de série
-TODAY			= HOJE				##	Retorna o número de série da data de hoje
-WEEKDAY			= DIA.DA.SEMANA			##	Converte um número de série em um dia da semana
-WEEKNUM			= NÚMSEMANA			##	Converte um número de série em um número que representa onde a semana cai numericamente em um ano
-WORKDAY			= DIATRABALHO			##	Retorna o número de série da data antes ou depois de um número específico de dias úteis
-YEAR			= ANO				##	Converte um número de série em um ano
-YEARFRAC		= FRAÇÃOANO			##	Retorna a fração do ano que representa o número de dias entre data_inicial e data_final
-
-
-##
-##	Engineering functions				Funções de engenharia
-##
-BESSELI			= BESSELI			##	Retorna a função de Bessel In(x) modificada
-BESSELJ			= BESSELJ			##	Retorna a função de Bessel Jn(x)
-BESSELK			= BESSELK			##	Retorna a função de Bessel Kn(x) modificada
-BESSELY			= BESSELY			##	Retorna a função de Bessel Yn(x)
-BIN2DEC			= BIN2DEC			##	Converte um número binário em decimal
-BIN2HEX			= BIN2HEX			##	Converte um número binário em hexadecimal
-BIN2OCT			= BIN2OCT			##	Converte um número binário em octal
-COMPLEX			= COMPLEX			##	Converte coeficientes reais e imaginários e um número complexo
-CONVERT			= CONVERTER			##	Converte um número de um sistema de medida para outro
-DEC2BIN			= DECABIN			##	Converte um número decimal em binário
-DEC2HEX			= DECAHEX			##	Converte um número decimal em hexadecimal
-DEC2OCT			= DECAOCT			##	Converte um número decimal em octal
-DELTA			= DELTA				##	Testa se dois valores são iguais
-ERF			= FUNERRO			##	Retorna a função de erro
-ERFC			= FUNERROCOMPL			##	Retorna a função de erro complementar
-GESTEP			= DEGRAU			##	Testa se um número é maior do que um valor limite
-HEX2BIN			= HEXABIN			##	Converte um número hexadecimal em binário
-HEX2DEC			= HEXADEC			##	Converte um número hexadecimal em decimal
-HEX2OCT			= HEXAOCT			##	Converte um número hexadecimal em octal
-IMABS			= IMABS				##	Retorna o valor absoluto (módulo) de um número complexo
-IMAGINARY		= IMAGINÁRIO			##	Retorna o coeficiente imaginário de um número complexo
-IMARGUMENT		= IMARG				##	Retorna o argumento teta, um ângulo expresso em radianos
-IMCONJUGATE		= IMCONJ			##	Retorna o conjugado complexo de um número complexo
-IMCOS			= IMCOS				##	Retorna o cosseno de um número complexo
-IMDIV			= IMDIV				##	Retorna o quociente de dois números complexos
-IMEXP			= IMEXP				##	Retorna o exponencial de um número complexo
-IMLN			= IMLN				##	Retorna o logaritmo natural de um número complexo
-IMLOG10			= IMLOG10			##	Retorna o logaritmo de base 10 de um número complexo
-IMLOG2			= IMLOG2			##	Retorna o logaritmo de base 2 de um número complexo
-IMPOWER			= IMPOT				##	Retorna um número complexo elevado a uma potência inteira
-IMPRODUCT		= IMPROD			##	Retorna o produto de números complexos
-IMREAL			= IMREAL			##	Retorna o coeficiente real de um número complexo
-IMSIN			= IMSENO			##	Retorna o seno de um número complexo
-IMSQRT			= IMRAIZ			##	Retorna a raiz quadrada de um número complexo
-IMSUB			= IMSUBTR			##	Retorna a diferença entre dois números complexos
-IMSUM			= IMSOMA			##	Retorna a soma de números complexos
-OCT2BIN			= OCTABIN			##	Converte um número octal em binário
-OCT2DEC			= OCTADEC			##	Converte um número octal em decimal
-OCT2HEX			= OCTAHEX			##	Converte um número octal em hexadecimal
-
-
-##
-##	Financial functions				Funções financeiras
-##
-ACCRINT			= JUROSACUM			##	Retorna a taxa de juros acumulados de um título que paga uma taxa periódica de juros
-ACCRINTM		= JUROSACUMV			##	Retorna os juros acumulados de um título que paga juros no vencimento
-AMORDEGRC		= AMORDEGRC			##	Retorna a depreciação para cada período contábil usando o coeficiente de depreciação
-AMORLINC		= AMORLINC			##	Retorna a depreciação para cada período contábil
-COUPDAYBS		= CUPDIASINLIQ			##	Retorna o número de dias do início do período de cupom até a data de liquidação
-COUPDAYS		= CUPDIAS			##	Retorna o número de dias no período de cupom que contém a data de quitação
-COUPDAYSNC		= CUPDIASPRÓX			##	Retorna o número de dias da data de liquidação até a data do próximo cupom
-COUPNCD			= CUPDATAPRÓX			##	Retorna a próxima data de cupom após a data de quitação
-COUPNUM			= CUPNÚM			##	Retorna o número de cupons pagáveis entre as datas de quitação e vencimento
-COUPPCD			= CUPDATAANT			##	Retorna a data de cupom anterior à data de quitação
-CUMIPMT			= PGTOJURACUM			##	Retorna os juros acumulados pagos entre dois períodos
-CUMPRINC		= PGTOCAPACUM			##	Retorna o capital acumulado pago sobre um empréstimo entre dois períodos
-DB			= BD				##	Retorna a depreciação de um ativo para um período especificado, usando o método de balanço de declínio fixo
-DDB			= BDD				##	Retorna a depreciação de um ativo com relação a um período especificado usando o método de saldos decrescentes duplos ou qualquer outro método especificado por você
-DISC			= DESC				##	Retorna a taxa de desconto de um título
-DOLLARDE		= MOEDADEC			##	Converte um preço em formato de moeda, na forma fracionária, em um preço na forma decimal
-DOLLARFR		= MOEDAFRA			##	Converte um preço, apresentado na forma decimal, em um preço apresentado na forma fracionária
-DURATION		= DURAÇÃO			##	Retorna a duração anual de um título com pagamentos de juros periódicos
-EFFECT			= EFETIVA			##	Retorna a taxa de juros anual efetiva
-FV			= VF				##	Retorna o valor futuro de um investimento
-FVSCHEDULE		= VFPLANO			##	Retorna o valor futuro de um capital inicial após a aplicação de uma série de taxas de juros compostas
-INTRATE			= TAXAJUROS			##	Retorna a taxa de juros de um título totalmente investido
-IPMT			= IPGTO				##	Retorna o pagamento de juros para um investimento em um determinado período
-IRR			= TIR				##	Retorna a taxa interna de retorno de uma série de fluxos de caixa
-ISPMT			= ÉPGTO				##	Calcula os juros pagos durante um período específico de um investimento
-MDURATION		= MDURAÇÃO			##	Retorna a duração de Macauley modificada para um título com um valor de paridade equivalente a R$ 100
-MIRR			= MTIR				##	Calcula a taxa interna de retorno em que fluxos de caixa positivos e negativos são financiados com diferentes taxas
-NOMINAL			= NOMINAL			##	Retorna a taxa de juros nominal anual
-NPER			= NPER				##	Retorna o número de períodos de um investimento
-NPV			= VPL				##	Retorna o valor líquido atual de um investimento com base em uma série de fluxos de caixa periódicos e em uma taxa de desconto
-ODDFPRICE		= PREÇOPRIMINC			##	Retorna o preço por R$ 100 de valor nominal de um título com um primeiro período indefinido
-ODDFYIELD		= LUCROPRIMINC			##	Retorna o rendimento de um título com um primeiro período indefinido
-ODDLPRICE		= PREÇOÚLTINC			##	Retorna o preço por R$ 100 de valor nominal de um título com um último período de cupom indefinido
-ODDLYIELD		= LUCROÚLTINC			##	Retorna o rendimento de um título com um último período indefinido
-PMT			= PGTO				##	Retorna o pagamento periódico de uma anuidade
-PPMT			= PPGTO				##	Retorna o pagamento de capital para determinado período de investimento
-PRICE			= PREÇO				##	Retorna a preço por R$ 100,00 de valor nominal de um título que paga juros periódicos
-PRICEDISC		= PREÇODESC			##	Retorna o preço por R$ 100,00 de valor nominal de um título descontado
-PRICEMAT		= PREÇOVENC			##	Retorna o preço por R$ 100,00 de valor nominal de um título que paga juros no vencimento
-PV			= VP				##	Retorna o valor presente de um investimento
-RATE			= TAXA				##	Retorna a taxa de juros por período de uma anuidade
-RECEIVED		= RECEBER			##	Retorna a quantia recebida no vencimento de um título totalmente investido
-SLN			= DPD				##	Retorna a depreciação em linha reta de um ativo durante um período
-SYD			= SDA				##	Retorna a depreciação dos dígitos da soma dos anos de um ativo para um período especificado
-TBILLEQ			= OTN				##	Retorna o rendimento de um título equivalente a uma obrigação do Tesouro
-TBILLPRICE		= OTNVALOR			##	Retorna o preço por R$ 100,00 de valor nominal de uma obrigação do Tesouro
-TBILLYIELD		= OTNLUCRO			##	Retorna o rendimento de uma obrigação do Tesouro
-VDB			= BDV				##	Retorna a depreciação de um ativo para um período especificado ou parcial usando um método de balanço declinante
-XIRR			= XTIR				##	Fornece a taxa interna de retorno para um programa de fluxos de caixa que não é necessariamente periódico
-XNPV			= XVPL				##	Retorna o valor presente líquido de um programa de fluxos de caixa que não é necessariamente periódico
-YIELD			= LUCRO				##	Retorna o lucro de um título que paga juros periódicos
-YIELDDISC		= LUCRODESC			##	Retorna o rendimento anual de um título descontado. Por exemplo, uma obrigação do Tesouro
-YIELDMAT		= LUCROVENC			##	Retorna o lucro anual de um título que paga juros no vencimento
-
-
-##
-##	Information functions				Funções de informação
-##
-CELL			= CÉL				##	Retorna informações sobre formatação, localização ou conteúdo de uma célula
-ERROR.TYPE		= TIPO.ERRO			##	Retorna um número correspondente a um tipo de erro
-INFO			= INFORMAÇÃO			##	Retorna informações sobre o ambiente operacional atual
-ISBLANK			= ÉCÉL.VAZIA			##	Retorna VERDADEIRO se o valor for vazio
-ISERR			= ÉERRO				##	Retorna VERDADEIRO se o valor for um valor de erro diferente de #N/D
-ISERROR			= ÉERROS			##	Retorna VERDADEIRO se o valor for um valor de erro
-ISEVEN			= ÉPAR				##	Retorna VERDADEIRO se o número for par
-ISLOGICAL		= ÉLÓGICO			##	Retorna VERDADEIRO se o valor for um valor lógico
-ISNA			= É.NÃO.DISP			##	Retorna VERDADEIRO se o valor for o valor de erro #N/D
-ISNONTEXT		= É.NÃO.TEXTO			##	Retorna VERDADEIRO se o valor for diferente de texto
-ISNUMBER		= ÉNÚM				##	Retorna VERDADEIRO se o valor for um número
-ISODD			= ÉIMPAR			##	Retorna VERDADEIRO se o número for ímpar
-ISREF			= ÉREF				##	Retorna VERDADEIRO se o valor for uma referência
-ISTEXT			= ÉTEXTO			##	Retorna VERDADEIRO se o valor for texto
-N			= N				##	Retorna um valor convertido em um número
-NA			= NÃO.DISP			##	Retorna o valor de erro #N/D
-TYPE			= TIPO				##	Retorna um número indicando o tipo de dados de um valor
-
-
-##
-##	Logical functions				Funções lógicas
-##
-AND			= E				##	Retorna VERDADEIRO se todos os seus argumentos forem VERDADEIROS
-FALSE			= FALSO				##	Retorna o valor lógico FALSO
-IF			= SE				##	Especifica um teste lógico a ser executado
-IFERROR			= SEERRO			##	Retornará um valor que você especifica se uma fórmula for avaliada para um erro; do contrário, retornará o resultado da fórmula
-NOT			= NÃO				##	Inverte o valor lógico do argumento
-OR			= OU				##	Retorna VERDADEIRO se um dos argumentos for VERDADEIRO
-TRUE			= VERDADEIRO			##	Retorna o valor lógico VERDADEIRO
-
-
-##
-##	Lookup and reference functions			Funções de pesquisa e referência
-##
-ADDRESS			= ENDEREÇO			##	Retorna uma referência como texto para uma única célula em uma planilha
-AREAS			= ÁREAS				##	Retorna o número de áreas em uma referência
-CHOOSE			= ESCOLHER			##	Escolhe um valor a partir de uma lista de valores
-COLUMN			= COL				##	Retorna o número da coluna de uma referência
-COLUMNS			= COLS				##	Retorna o número de colunas em uma referência
-HLOOKUP			= PROCH				##	Procura na linha superior de uma matriz e retorna o valor da célula especificada
-HYPERLINK		= HYPERLINK			##	Cria um atalho ou salto que abre um documento armazenado em um servidor de rede, uma intranet ou na Internet
-INDEX			= ÍNDICE			##	Usa um índice para escolher um valor de uma referência ou matriz
-INDIRECT		= INDIRETO			##	Retorna uma referência indicada por um valor de texto
-LOOKUP			= PROC				##	Procura valores em um vetor ou em uma matriz
-MATCH			= CORRESP			##	Procura valores em uma referência ou em uma matriz
-OFFSET			= DESLOC			##	Retorna um deslocamento de referência com base em uma determinada referência
-ROW			= LIN				##	Retorna o número da linha de uma referência
-ROWS			= LINS				##	Retorna o número de linhas em uma referência
-RTD			= RTD				##	Recupera dados em tempo real de um programa que ofereça suporte a automação COM (automação: uma forma de trabalhar com objetos de um aplicativo a partir de outro aplicativo ou ferramenta de desenvolvimento. Chamada inicialmente de automação OLE, a automação é um padrão industrial e um recurso do modelo de objeto componente (COM).)
-TRANSPOSE		= TRANSPOR			##	Retorna a transposição de uma matriz
-VLOOKUP			= PROCV				##	Procura na primeira coluna de uma matriz e move ao longo da linha para retornar o valor de uma célula
-
-
-##
-##	Math and trigonometry functions			Funções matemáticas e trigonométricas
-##
-ABS			= ABS				##	Retorna o valor absoluto de um número
-ACOS			= ACOS				##	Retorna o arco cosseno de um número
-ACOSH			= ACOSH				##	Retorna o cosseno hiperbólico inverso de um número
-ASIN			= ASEN				##	Retorna o arco seno de um número
-ASINH			= ASENH				##	Retorna o seno hiperbólico inverso de um número
-ATAN			= ATAN				##	Retorna o arco tangente de um número
-ATAN2			= ATAN2				##	Retorna o arco tangente das coordenadas x e y especificadas
-ATANH			= ATANH				##	Retorna a tangente hiperbólica inversa de um número
-CEILING			= TETO				##	Arredonda um número para o inteiro mais próximo ou para o múltiplo mais próximo de significância
-COMBIN			= COMBIN			##	Retorna o número de combinações de um determinado número de objetos
-COS			= COS				##	Retorna o cosseno de um número
-COSH			= COSH				##	Retorna o cosseno hiperbólico de um número
-DEGREES			= GRAUS				##	Converte radianos em graus
-EVEN			= PAR				##	Arredonda um número para cima até o inteiro par mais próximo
-EXP			= EXP				##	Retorna e elevado à potência de um número especificado
-FACT			= FATORIAL			##	Retorna o fatorial de um número
-FACTDOUBLE		= FATDUPLO			##	Retorna o fatorial duplo de um número
-FLOOR			= ARREDMULTB			##	Arredonda um número para baixo até zero
-GCD			= MDC				##	Retorna o máximo divisor comum
-INT			= INT				##	Arredonda um número para baixo até o número inteiro mais próximo
-LCM			= MMC				##	Retorna o mínimo múltiplo comum
-LN			= LN				##	Retorna o logaritmo natural de um número
-LOG			= LOG				##	Retorna o logaritmo de um número de uma base especificada
-LOG10			= LOG10				##	Retorna o logaritmo de base 10 de um número
-MDETERM			= MATRIZ.DETERM			##	Retorna o determinante de uma matriz de uma variável do tipo matriz
-MINVERSE		= MATRIZ.INVERSO		##	Retorna a matriz inversa de uma matriz
-MMULT			= MATRIZ.MULT			##	Retorna o produto de duas matrizes
-MOD			= RESTO				##	Retorna o resto da divisão
-MROUND			= MARRED			##	Retorna um número arredondado ao múltiplo desejado
-MULTINOMIAL		= MULTINOMIAL			##	Retorna o multinomial de um conjunto de números
-ODD			= ÍMPAR				##	Arredonda um número para cima até o inteiro ímpar mais próximo
-PI			= PI				##	Retorna o valor de Pi
-POWER			= POTÊNCIA			##	Fornece o resultado de um número elevado a uma potência
-PRODUCT			= MULT				##	Multiplica seus argumentos
-QUOTIENT		= QUOCIENTE			##	Retorna a parte inteira de uma divisão
-RADIANS			= RADIANOS			##	Converte graus em radianos
-RAND			= ALEATÓRIO			##	Retorna um número aleatório entre 0 e 1
-RANDBETWEEN		= ALEATÓRIOENTRE		##	Retorna um número aleatório entre os números especificados
-ROMAN			= ROMANO			##	Converte um algarismo arábico em romano, como texto
-ROUND			= ARRED				##	Arredonda um número até uma quantidade especificada de dígitos
-ROUNDDOWN		= ARREDONDAR.PARA.BAIXO		##	Arredonda um número para baixo até zero
-ROUNDUP			= ARREDONDAR.PARA.CIMA		##	Arredonda um número para cima, afastando-o de zero
-SERIESSUM		= SOMASEQÜÊNCIA			##	Retorna a soma de uma série polinomial baseada na fórmula
-SIGN			= SINAL				##	Retorna o sinal de um número
-SIN			= SEN				##	Retorna o seno de um ângulo dado
-SINH			= SENH				##	Retorna o seno hiperbólico de um número
-SQRT			= RAIZ				##	Retorna uma raiz quadrada positiva
-SQRTPI			= RAIZPI			##	Retorna a raiz quadrada de (núm* pi)
-SUBTOTAL		= SUBTOTAL			##	Retorna um subtotal em uma lista ou em um banco de dados
-SUM			= SOMA				##	Soma seus argumentos
-SUMIF			= SOMASE			##	Adiciona as células especificadas por um determinado critério
-SUMIFS			= SOMASE			##	Adiciona as células em um intervalo que atende a vários critérios
-SUMPRODUCT		= SOMARPRODUTO			##	Retorna a soma dos produtos de componentes correspondentes de matrizes
-SUMSQ			= SOMAQUAD			##	Retorna a soma dos quadrados dos argumentos
-SUMX2MY2		= SOMAX2DY2			##	Retorna a soma da diferença dos quadrados dos valores correspondentes em duas matrizes
-SUMX2PY2		= SOMAX2SY2			##	Retorna a soma da soma dos quadrados dos valores correspondentes em duas matrizes
-SUMXMY2			= SOMAXMY2			##	Retorna a soma dos quadrados das diferenças dos valores correspondentes em duas matrizes
-TAN			= TAN				##	Retorna a tangente de um número
-TANH			= TANH				##	Retorna a tangente hiperbólica de um número
-TRUNC			= TRUNCAR			##	Trunca um número para um inteiro
-
-
-##
-##	Statistical functions				Funções estatísticas
-##
-AVEDEV			= DESV.MÉDIO			##	Retorna a média aritmética dos desvios médios dos pontos de dados a partir de sua média
-AVERAGE			= MÉDIA				##	Retorna a média dos argumentos
-AVERAGEA		= MÉDIAA			##	Retorna a média dos argumentos, inclusive números, texto e valores lógicos
-AVERAGEIF		= MÉDIASE			##	Retorna a média (média aritmética) de todas as células em um intervalo que atendem a um determinado critério
-AVERAGEIFS		= MÉDIASES			##	Retorna a média (média aritmética) de todas as células que atendem a múltiplos critérios.
-BETADIST		= DISTBETA			##	Retorna a função de distribuição cumulativa beta
-BETAINV			= BETA.ACUM.INV			##	Retorna o inverso da função de distribuição cumulativa para uma distribuição beta especificada
-BINOMDIST		= DISTRBINOM			##	Retorna a probabilidade de distribuição binomial do termo individual
-CHIDIST			= DIST.QUI			##	Retorna a probabilidade unicaudal da distribuição qui-quadrada
-CHIINV			= INV.QUI			##	Retorna o inverso da probabilidade uni-caudal da distribuição qui-quadrada
-CHITEST			= TESTE.QUI			##	Retorna o teste para independência
-CONFIDENCE		= INT.CONFIANÇA			##	Retorna o intervalo de confiança para uma média da população
-CORREL			= CORREL			##	Retorna o coeficiente de correlação entre dois conjuntos de dados
-COUNT			= CONT.NÚM			##	Calcula quantos números há na lista de argumentos
-COUNTA			= CONT.VALORES			##	Calcula quantos valores há na lista de argumentos
-COUNTBLANK		= CONTAR.VAZIO			##	Conta o número de células vazias no intervalo especificado
-COUNTIF			= CONT.SE			##	Calcula o número de células não vazias em um intervalo que corresponde a determinados critérios
-COUNTIFS		= CONT.SES			##	Conta o número de células dentro de um intervalo que atende a múltiplos critérios
-COVAR			= COVAR				##	Retorna a covariância, a média dos produtos dos desvios pares
-CRITBINOM		= CRIT.BINOM			##	Retorna o menor valor para o qual a distribuição binomial cumulativa é menor ou igual ao valor padrão
-DEVSQ			= DESVQ				##	Retorna a soma dos quadrados dos desvios
-EXPONDIST		= DISTEXPON			##	Retorna a distribuição exponencial
-FDIST			= DISTF				##	Retorna a distribuição de probabilidade F
-FINV			= INVF				##	Retorna o inverso da distribuição de probabilidades F
-FISHER			= FISHER			##	Retorna a transformação Fisher
-FISHERINV		= FISHERINV			##	Retorna o inverso da transformação Fisher
-FORECAST		= PREVISÃO			##	Retorna um valor ao longo de uma linha reta
-FREQUENCY		= FREQÜÊNCIA			##	Retorna uma distribuição de freqüência como uma matriz vertical
-FTEST			= TESTEF			##	Retorna o resultado de um teste F
-GAMMADIST		= DISTGAMA			##	Retorna a distribuição gama
-GAMMAINV		= INVGAMA			##	Retorna o inverso da distribuição cumulativa gama
-GAMMALN			= LNGAMA			##	Retorna o logaritmo natural da função gama, G(x)
-GEOMEAN			= MÉDIA.GEOMÉTRICA		##	Retorna a média geométrica
-GROWTH			= CRESCIMENTO			##	Retorna valores ao longo de uma tendência exponencial
-HARMEAN			= MÉDIA.HARMÔNICA		##	Retorna a média harmônica
-HYPGEOMDIST		= DIST.HIPERGEOM		##	Retorna a distribuição hipergeométrica
-INTERCEPT		= INTERCEPÇÃO			##	Retorna a intercepção da linha de regressão linear
-KURT			= CURT				##	Retorna a curtose de um conjunto de dados
-LARGE			= MAIOR				##	Retorna o maior valor k-ésimo de um conjunto de dados
-LINEST			= PROJ.LIN			##	Retorna os parâmetros de uma tendência linear
-LOGEST			= PROJ.LOG			##	Retorna os parâmetros de uma tendência exponencial
-LOGINV			= INVLOG			##	Retorna o inverso da distribuição lognormal
-LOGNORMDIST		= DIST.LOGNORMAL		##	Retorna a distribuição lognormal cumulativa
-MAX			= MÁXIMO			##	Retorna o valor máximo em uma lista de argumentos
-MAXA			= MÁXIMOA			##	Retorna o maior valor em uma lista de argumentos, inclusive números, texto e valores lógicos
-MEDIAN			= MED				##	Retorna a mediana dos números indicados
-MIN			= MÍNIMO			##	Retorna o valor mínimo em uma lista de argumentos
-MINA			= MÍNIMOA			##	Retorna o menor valor em uma lista de argumentos, inclusive números, texto e valores lógicos
-MODE			= MODO				##	Retorna o valor mais comum em um conjunto de dados
-NEGBINOMDIST		= DIST.BIN.NEG			##	Retorna a distribuição binomial negativa
-NORMDIST		= DIST.NORM			##	Retorna a distribuição cumulativa normal
-NORMINV			= INV.NORM			##	Retorna o inverso da distribuição cumulativa normal
-NORMSDIST		= DIST.NORMP			##	Retorna a distribuição cumulativa normal padrão
-NORMSINV		= INV.NORMP			##	Retorna o inverso da distribuição cumulativa normal padrão
-PEARSON			= PEARSON			##	Retorna o coeficiente de correlação do momento do produto Pearson
-PERCENTILE		= PERCENTIL			##	Retorna o k-ésimo percentil de valores em um intervalo
-PERCENTRANK		= ORDEM.PORCENTUAL		##	Retorna a ordem percentual de um valor em um conjunto de dados
-PERMUT			= PERMUT			##	Retorna o número de permutações de um determinado número de objetos
-POISSON			= POISSON			##	Retorna a distribuição Poisson
-PROB			= PROB				##	Retorna a probabilidade de valores em um intervalo estarem entre dois limites
-QUARTILE		= QUARTIL			##	Retorna o quartil do conjunto de dados
-RANK			= ORDEM				##	Retorna a posição de um número em uma lista de números
-RSQ			= RQUAD				##	Retorna o quadrado do coeficiente de correlação do momento do produto de Pearson
-SKEW			= DISTORÇÃO			##	Retorna a distorção de uma distribuição
-SLOPE			= INCLINAÇÃO			##	Retorna a inclinação da linha de regressão linear
-SMALL			= MENOR				##	Retorna o menor valor k-ésimo do conjunto de dados
-STANDARDIZE		= PADRONIZAR			##	Retorna um valor normalizado
-STDEV			= DESVPAD			##	Estima o desvio padrão com base em uma amostra
-STDEVA			= DESVPADA			##	Estima o desvio padrão com base em uma amostra, inclusive números, texto e valores lógicos
-STDEVP			= DESVPADP			##	Calcula o desvio padrão com base na população total
-STDEVPA			= DESVPADPA			##	Calcula o desvio padrão com base na população total, inclusive números, texto e valores lógicos
-STEYX			= EPADYX			##	Retorna o erro padrão do valor-y previsto para cada x da regressão
-TDIST			= DISTT				##	Retorna a distribuição t de Student
-TINV			= INVT				##	Retorna o inverso da distribuição t de Student
-TREND			= TENDÊNCIA			##	Retorna valores ao longo de uma tendência linear
-TRIMMEAN		= MÉDIA.INTERNA			##	Retorna a média do interior de um conjunto de dados
-TTEST			= TESTET			##	Retorna a probabilidade associada ao teste t de Student
-VAR			= VAR				##	Estima a variância com base em uma amostra
-VARA			= VARA				##	Estima a variância com base em uma amostra, inclusive números, texto e valores lógicos
-VARP			= VARP				##	Calcula a variância com base na população inteira
-VARPA			= VARPA				##	Calcula a variância com base na população total, inclusive números, texto e valores lógicos
-WEIBULL			= WEIBULL			##	Retorna a distribuição Weibull
-ZTEST			= TESTEZ			##	Retorna o valor de probabilidade uni-caudal de um teste-z
-
-
-##
-##	Text functions			Funções de texto
-##
-ASC			= ASC				##	Altera letras do inglês ou katakana de largura total (bytes duplos) dentro de uma seqüência de caracteres para caracteres de meia largura (byte único)
-BAHTTEXT		= BAHTTEXT			##	Converte um número em um texto, usando o formato de moeda ß (baht)
-CHAR			= CARACT			##	Retorna o caractere especificado pelo número de código
-CLEAN			= TIRAR				##	Remove todos os caracteres do texto que não podem ser impressos
-CODE			= CÓDIGO			##	Retorna um código numérico para o primeiro caractere de uma seqüência de caracteres de texto
-CONCATENATE		= CONCATENAR			##	Agrupa vários itens de texto em um único item de texto
-DOLLAR			= MOEDA				##	Converte um número em texto, usando o formato de moeda $ (dólar)
-EXACT			= EXATO				##	Verifica se dois valores de texto são idênticos
-FIND			= PROCURAR			##	Procura um valor de texto dentro de outro (diferencia maiúsculas de minúsculas)
-FINDB			= PROCURARB			##	Procura um valor de texto dentro de outro (diferencia maiúsculas de minúsculas)
-FIXED			= DEF.NÚM.DEC			##	Formata um número como texto com um número fixo de decimais
-JIS			= JIS				##	Altera letras do inglês ou katakana de meia largura (byte único) dentro de uma seqüência de caracteres para caracteres de largura total (bytes duplos)
-LEFT			= ESQUERDA			##	Retorna os caracteres mais à esquerda de um valor de texto
-LEFTB			= ESQUERDAB			##	Retorna os caracteres mais à esquerda de um valor de texto
-LEN			= NÚM.CARACT			##	Retorna o número de caracteres em uma seqüência de texto
-LENB			= NÚM.CARACTB			##	Retorna o número de caracteres em uma seqüência de texto
-LOWER			= MINÚSCULA			##	Converte texto para minúsculas
-MID			= EXT.TEXTO			##	Retorna um número específico de caracteres de uma seqüência de texto começando na posição especificada
-MIDB			= EXT.TEXTOB			##	Retorna um número específico de caracteres de uma seqüência de texto começando na posição especificada
-PHONETIC		= FONÉTICA			##	Extrai os caracteres fonéticos (furigana) de uma seqüência de caracteres de texto
-PROPER			= PRI.MAIÚSCULA			##	Coloca a primeira letra de cada palavra em maiúscula em um valor de texto
-REPLACE			= MUDAR				##	Muda os caracteres dentro do texto
-REPLACEB		= MUDARB			##	Muda os caracteres dentro do texto
-REPT			= REPT				##	Repete o texto um determinado número de vezes
-RIGHT			= DIREITA			##	Retorna os caracteres mais à direita de um valor de texto
-RIGHTB			= DIREITAB			##	Retorna os caracteres mais à direita de um valor de texto
-SEARCH			= LOCALIZAR			##	Localiza um valor de texto dentro de outro (não diferencia maiúsculas de minúsculas)
-SEARCHB			= LOCALIZARB			##	Localiza um valor de texto dentro de outro (não diferencia maiúsculas de minúsculas)
-SUBSTITUTE		= SUBSTITUIR			##	Substitui um novo texto por um texto antigo em uma seqüência de texto
-T			= T				##	Converte os argumentos em texto
-TEXT			= TEXTO				##	Formata um número e o converte em texto
-TRIM			= ARRUMAR			##	Remove espaços do texto
-UPPER			= MAIÚSCULA			##	Converte o texto em maiúsculas
-VALUE			= VALOR				##	Converte um argumento de texto em um número
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/pt/config b/plugins/exportTypes/Excel/PHPExcel/locale/pt/config
deleted file mode 100755
index 72440fc0f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/pt/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= €
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #NULO!
-DIV0	= #DIV/0!
-VALUE	= #VALOR!
-REF	= #REF!
-NAME	= #NOME?
-NUM	= #NÚM!
-NA	= #N/D
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/pt/functions b/plugins/exportTypes/Excel/PHPExcel/locale/pt/functions
deleted file mode 100755
index d8e9082f5..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/pt/functions
+++ /dev/null
@@ -1,408 +0,0 @@
-##
-##	Add-in and Automation functions			Funções de Suplemento e Automatização
-##
-GETPIVOTDATA		= OBTERDADOSDIN			##	Devolve dados armazenados num relatório de Tabela Dinâmica
-
-
-##
-##	Cube functions					Funções de cubo
-##
-CUBEKPIMEMBER		= MEMBROKPICUBO			##	Devolve o nome, propriedade e medição de um KPI (key performance indicator) e apresenta o nome e a propriedade na célula. Um KPI é uma medida quantificável, como, por exemplo, o lucro mensal bruto ou a rotatividade trimestral de pessoal, utilizada para monitorizar o desempenho de uma organização.
-CUBEMEMBER		= MEMBROCUBO			##	Devolve um membro ou cadeia de identificação numa hierarquia de cubo. Utilizada para validar a existência do membro ou cadeia de identificação no cubo.
-CUBEMEMBERPROPERTY	= PROPRIEDADEMEMBROCUBO		##	Devolve o valor de uma propriedade de membro no cubo. Utilizada para validar a existência de um nome de membro no cubo e para devolver a propriedade especificada para esse membro.
-CUBERANKEDMEMBER	= MEMBROCLASSIFICADOCUBO	##	Devolve o enésimo ou a classificação mais alta num conjunto. Utilizada para devolver um ou mais elementos num conjunto, tal como o melhor vendedor ou os 10 melhores alunos.
-CUBESET			= CONJUNTOCUBO			##	Define um conjunto calculado de membros ou cadeias de identificação enviando uma expressão de conjunto para o cubo no servidor, que cria o conjunto e, em seguida, devolve o conjunto ao Microsoft Office Excel.
-CUBESETCOUNT		= CONTARCONJUNTOCUBO		##	Devolve o número de itens num conjunto.
-CUBEVALUE		= VALORCUBO			##	Devolve um valor agregado do cubo.
-
-
-##
-##	Database functions				Funções de base de dados
-##
-DAVERAGE		= BDMÉDIA			##	Devolve a média das entradas da base de dados seleccionadas
-DCOUNT			= BDCONTAR			##	Conta as células que contêm números numa base de dados
-DCOUNTA			= BDCONTAR.VAL			##	Conta as células que não estejam em branco numa base de dados
-DGET			= BDOBTER			##	Extrai de uma base de dados um único registo que corresponde aos critérios especificados
-DMAX			= BDMÁX				##	Devolve o valor máximo das entradas da base de dados seleccionadas
-DMIN			= BDMÍN				##	Devolve o valor mínimo das entradas da base de dados seleccionadas
-DPRODUCT		= BDMULTIPL			##	Multiplica os valores de um determinado campo de registos que correspondem aos critérios numa base de dados
-DSTDEV			= BDDESVPAD			##	Calcula o desvio-padrão com base numa amostra de entradas da base de dados seleccionadas
-DSTDEVP			= BDDESVPADP			##	Calcula o desvio-padrão com base na população total das entradas da base de dados seleccionadas
-DSUM			= BDSOMA			##	Adiciona os números na coluna de campo dos registos de base de dados que correspondem aos critérios
-DVAR			= BDVAR				##	Calcula a variância com base numa amostra das entradas de base de dados seleccionadas
-DVARP			= BDVARP			##	Calcula a variância com base na população total das entradas de base de dados seleccionadas
-
-
-##
-##	Date and time functions				Funções de data e hora
-##
-DATE			= DATA				##	Devolve o número de série de uma determinada data
-DATEVALUE		= DATA.VALOR			##	Converte uma data em forma de texto num número de série
-DAY			= DIA				##	Converte um número de série num dia do mês
-DAYS360			= DIAS360			##	Calcula o número de dias entre duas datas com base num ano com 360 dias
-EDATE			= DATAM				##	Devolve um número de série de data que corresponde ao número de meses indicado antes ou depois da data de início
-EOMONTH			= FIMMÊS			##	Devolve o número de série do último dia do mês antes ou depois de um número de meses especificado
-HOUR			= HORA				##	Converte um número de série numa hora
-MINUTE			= MINUTO			##	Converte um número de série num minuto
-MONTH			= MÊS				##	Converte um número de série num mês
-NETWORKDAYS		= DIATRABALHOTOTAL		##	Devolve o número total de dias úteis entre duas datas
-NOW			= AGORA				##	Devolve o número de série da data e hora actuais
-SECOND			= SEGUNDO			##	Converte um número de série num segundo
-TIME			= TEMPO				##	Devolve o número de série de um determinado tempo
-TIMEVALUE		= VALOR.TEMPO			##	Converte um tempo em forma de texto num número de série
-TODAY			= HOJE				##	Devolve o número de série da data actual
-WEEKDAY			= DIA.SEMANA			##	Converte um número de série num dia da semana
-WEEKNUM			= NÚMSEMANA			##	Converte um número de série num número que representa o número da semana num determinado ano
-WORKDAY			= DIA.TRABALHO			##	Devolve o número de série da data antes ou depois de um número de dias úteis especificado
-YEAR			= ANO				##	Converte um número de série num ano
-YEARFRAC		= FRACÇÃOANO			##	Devolve a fracção de ano que representa o número de dias inteiros entre a data_de_início e a data_de_fim
-
-
-##
-##	Engineering functions				Funções de engenharia
-##
-BESSELI			= BESSELI			##	Devolve a função de Bessel modificada In(x)
-BESSELJ			= BESSELJ			##	Devolve a função de Bessel Jn(x)
-BESSELK			= BESSELK			##	Devolve a função de Bessel modificada Kn(x)
-BESSELY			= BESSELY			##	Devolve a função de Bessel Yn(x)
-BIN2DEC			= BINADEC			##	Converte um número binário em decimal
-BIN2HEX			= BINAHEX			##	Converte um número binário em hexadecimal
-BIN2OCT			= BINAOCT			##	Converte um número binário em octal
-COMPLEX			= COMPLEXO			##	Converte coeficientes reais e imaginários num número complexo
-CONVERT			= CONVERTER			##	Converte um número de um sistema de medida noutro
-DEC2BIN			= DECABIN			##	Converte um número decimal em binário
-DEC2HEX			= DECAHEX			##	Converte um número decimal em hexadecimal
-DEC2OCT			= DECAOCT			##	Converte um número decimal em octal
-DELTA			= DELTA				##	Testa se dois valores são iguais
-ERF			= FUNCERRO			##	Devolve a função de erro
-ERFC			= FUNCERROCOMPL			##	Devolve a função de erro complementar
-GESTEP			= DEGRAU			##	Testa se um número é maior do que um valor limite
-HEX2BIN			= HEXABIN			##	Converte um número hexadecimal em binário
-HEX2DEC			= HEXADEC			##	Converte um número hexadecimal em decimal
-HEX2OCT			= HEXAOCT			##	Converte um número hexadecimal em octal
-IMABS			= IMABS				##	Devolve o valor absoluto (módulo) de um número complexo
-IMAGINARY		= IMAGINÁRIO			##	Devolve o coeficiente imaginário de um número complexo
-IMARGUMENT		= IMARG				##	Devolve o argumento Teta, um ângulo expresso em radianos
-IMCONJUGATE		= IMCONJ			##	Devolve o conjugado complexo de um número complexo
-IMCOS			= IMCOS				##	Devolve o co-seno de um número complexo
-IMDIV			= IMDIV				##	Devolve o quociente de dois números complexos
-IMEXP			= IMEXP				##	Devolve o exponencial de um número complexo
-IMLN			= IMLN				##	Devolve o logaritmo natural de um número complexo
-IMLOG10			= IMLOG10			##	Devolve o logaritmo de base 10 de um número complexo
-IMLOG2			= IMLOG2			##	Devolve o logaritmo de base 2 de um número complexo
-IMPOWER			= IMPOT				##	Devolve um número complexo elevado a uma potência inteira
-IMPRODUCT		= IMPROD			##	Devolve o produto de números complexos
-IMREAL			= IMREAL			##	Devolve o coeficiente real de um número complexo
-IMSIN			= IMSENO			##	Devolve o seno de um número complexo
-IMSQRT			= IMRAIZ			##	Devolve a raiz quadrada de um número complexo
-IMSUB			= IMSUBTR			##	Devolve a diferença entre dois números complexos
-IMSUM			= IMSOMA			##	Devolve a soma de números complexos
-OCT2BIN			= OCTABIN			##	Converte um número octal em binário
-OCT2DEC			= OCTADEC			##	Converte um número octal em decimal
-OCT2HEX			= OCTAHEX			##	Converte um número octal em hexadecimal
-
-
-##
-##	Financial functions				Funções financeiras
-##
-ACCRINT			= JUROSACUM			##	Devolve os juros acumulados de um título que paga juros periódicos
-ACCRINTM		= JUROSACUMV			##	Devolve os juros acumulados de um título que paga juros no vencimento
-AMORDEGRC		= AMORDEGRC			##	Devolve a depreciação correspondente a cada período contabilístico utilizando um coeficiente de depreciação
-AMORLINC		= AMORLINC			##	Devolve a depreciação correspondente a cada período contabilístico
-COUPDAYBS		= CUPDIASINLIQ			##	Devolve o número de dias entre o início do período do cupão e a data de regularização
-COUPDAYS		= CUPDIAS			##	Devolve o número de dias no período do cupão que contém a data de regularização
-COUPDAYSNC		= CUPDIASPRÓX			##	Devolve o número de dias entre a data de regularização e a data do cupão seguinte
-COUPNCD			= CUPDATAPRÓX			##	Devolve a data do cupão seguinte após a data de regularização
-COUPNUM			= CUPNÚM			##	Devolve o número de cupões a serem pagos entre a data de regularização e a data de vencimento
-COUPPCD			= CUPDATAANT			##	Devolve a data do cupão anterior antes da data de regularização
-CUMIPMT			= PGTOJURACUM			##	Devolve os juros cumulativos pagos entre dois períodos
-CUMPRINC		= PGTOCAPACUM			##	Devolve o capital cumulativo pago a título de empréstimo entre dois períodos
-DB			= BD				##	Devolve a depreciação de um activo relativo a um período especificado utilizando o método das quotas degressivas fixas
-DDB			= BDD				##	Devolve a depreciação de um activo relativo a um período especificado utilizando o método das quotas degressivas duplas ou qualquer outro método especificado
-DISC			= DESC				##	Devolve a taxa de desconto de um título
-DOLLARDE		= MOEDADEC			##	Converte um preço em unidade monetária, expresso como uma fracção, num preço em unidade monetária, expresso como um número decimal
-DOLLARFR		= MOEDAFRA			##	Converte um preço em unidade monetária, expresso como um número decimal, num preço em unidade monetária, expresso como uma fracção
-DURATION		= DURAÇÃO			##	Devolve a duração anual de um título com pagamentos de juros periódicos
-EFFECT			= EFECTIVA			##	Devolve a taxa de juros anual efectiva
-FV			= VF				##	Devolve o valor futuro de um investimento
-FVSCHEDULE		= VFPLANO			##	Devolve o valor futuro de um capital inicial após a aplicação de uma série de taxas de juro compostas
-INTRATE			= TAXAJUROS			##	Devolve a taxa de juros de um título investido na totalidade
-IPMT			= IPGTO				##	Devolve o pagamento dos juros de um investimento durante um determinado período
-IRR			= TIR				##	Devolve a taxa de rentabilidade interna para uma série de fluxos monetários
-ISPMT			= É.PGTO			##	Calcula os juros pagos durante um período específico de um investimento
-MDURATION		= MDURAÇÃO			##	Devolve a duração modificada de Macauley de um título com um valor de paridade equivalente a € 100
-MIRR			= MTIR				##	Devolve a taxa interna de rentabilidade em que os fluxos monetários positivos e negativos são financiados com taxas diferentes
-NOMINAL			= NOMINAL			##	Devolve a taxa de juros nominal anual
-NPER			= NPER				##	Devolve o número de períodos de um investimento
-NPV			= VAL				##	Devolve o valor actual líquido de um investimento com base numa série de fluxos monetários periódicos e numa taxa de desconto
-ODDFPRICE		= PREÇOPRIMINC			##	Devolve o preço por € 100 do valor nominal de um título com um período inicial incompleto
-ODDFYIELD		= LUCROPRIMINC			##	Devolve o lucro de um título com um período inicial incompleto
-ODDLPRICE		= PREÇOÚLTINC			##	Devolve o preço por € 100 do valor nominal de um título com um período final incompleto
-ODDLYIELD		= LUCROÚLTINC			##	Devolve o lucro de um título com um período final incompleto
-PMT			= PGTO				##	Devolve o pagamento periódico de uma anuidade
-PPMT			= PPGTO				##	Devolve o pagamento sobre o capital de um investimento num determinado período
-PRICE			= PREÇO				##	Devolve o preço por € 100 do valor nominal de um título que paga juros periódicos
-PRICEDISC		= PREÇODESC			##	Devolve o preço por € 100 do valor nominal de um título descontado
-PRICEMAT		= PREÇOVENC			##	Devolve o preço por € 100 do valor nominal de um título que paga juros no vencimento
-PV			= VA				##	Devolve o valor actual de um investimento
-RATE			= TAXA				##	Devolve a taxa de juros por período de uma anuidade
-RECEIVED		= RECEBER			##	Devolve o montante recebido no vencimento de um título investido na totalidade
-SLN			= AMORT				##	Devolve uma depreciação linear de um activo durante um período
-SYD			= AMORTD			##	Devolve a depreciação por algarismos da soma dos anos de um activo durante um período especificado
-TBILLEQ			= OTN				##	Devolve o lucro de um título equivalente a uma Obrigação do Tesouro
-TBILLPRICE		= OTNVALOR			##	Devolve o preço por € 100 de valor nominal de uma Obrigação do Tesouro
-TBILLYIELD		= OTNLUCRO			##	Devolve o lucro de uma Obrigação do Tesouro
-VDB			= BDV				##	Devolve a depreciação de um activo relativo a um período específico ou parcial utilizando um método de quotas degressivas
-XIRR			= XTIR				##	Devolve a taxa interna de rentabilidade de um plano de fluxos monetários que não seja necessariamente periódica
-XNPV			= XVAL				##	Devolve o valor actual líquido de um plano de fluxos monetários que não seja necessariamente periódico
-YIELD			= LUCRO				##	Devolve o lucro de um título que paga juros periódicos
-YIELDDISC		= LUCRODESC			##	Devolve o lucro anual de um título emitido abaixo do valor nominal, por exemplo, uma Obrigação do Tesouro
-YIELDMAT		= LUCROVENC			##	Devolve o lucro anual de um título que paga juros na data de vencimento
-
-
-##
-##	Information functions				Funções de informação
-##
-CELL			= CÉL				##	Devolve informações sobre a formatação, localização ou conteúdo de uma célula
-ERROR.TYPE		= TIPO.ERRO			##	Devolve um número correspondente a um tipo de erro
-INFO			= INFORMAÇÃO			##	Devolve informações sobre o ambiente de funcionamento actual
-ISBLANK			= É.CÉL.VAZIA			##	Devolve VERDADEIRO se o valor estiver em branco
-ISERR			= É.ERROS			##	Devolve VERDADEIRO se o valor for um valor de erro diferente de #N/D
-ISERROR			= É.ERRO			##	Devolve VERDADEIRO se o valor for um valor de erro
-ISEVEN			= ÉPAR				##	Devolve VERDADEIRO se o número for par
-ISLOGICAL		= É.LÓGICO			##	Devolve VERDADEIRO se o valor for lógico
-ISNA			= É.NÃO.DISP			##	Devolve VERDADEIRO se o valor for o valor de erro #N/D
-ISNONTEXT		= É.NÃO.TEXTO			##	Devolve VERDADEIRO se o valor não for texto
-ISNUMBER		= É.NÚM				##	Devolve VERDADEIRO se o valor for um número
-ISODD			= ÉÍMPAR			##	Devolve VERDADEIRO se o número for ímpar
-ISREF			= É.REF				##	Devolve VERDADEIRO se o valor for uma referência
-ISTEXT			= É.TEXTO			##	Devolve VERDADEIRO se o valor for texto
-N			= N				##	Devolve um valor convertido num número
-NA			= NÃO.DISP			##	Devolve o valor de erro #N/D
-TYPE			= TIPO				##	Devolve um número que indica o tipo de dados de um valor
-
-
-##
-##	Logical functions				Funções lógicas
-##
-AND			= E				##	Devolve VERDADEIRO se todos os respectivos argumentos corresponderem a VERDADEIRO
-FALSE			= FALSO				##	Devolve o valor lógico FALSO
-IF			= SE				##	Especifica um teste lógico a ser executado
-IFERROR			= SE.ERRO			##	Devolve um valor definido pelo utilizador se ocorrer um erro na fórmula, e devolve o resultado da fórmula se não ocorrer nenhum erro
-NOT			= NÃO				##	Inverte a lógica do respectivo argumento
-OR			= OU				##	Devolve VERDADEIRO se qualquer argumento for VERDADEIRO
-TRUE			= VERDADEIRO			##	Devolve o valor lógico VERDADEIRO
-
-
-##
-##	Lookup and reference functions			Funções de pesquisa e referência
-##
-ADDRESS			= ENDEREÇO			##	Devolve uma referência a uma única célula numa folha de cálculo como texto
-AREAS			= ÁREAS				##	Devolve o número de áreas numa referência
-CHOOSE			= SELECCIONAR			##	Selecciona um valor a partir de uma lista de valores
-COLUMN			= COL				##	Devolve o número da coluna de uma referência
-COLUMNS			= COLS				##	Devolve o número de colunas numa referência
-HLOOKUP			= PROCH				##	Procura na linha superior de uma matriz e devolve o valor da célula indicada
-HYPERLINK		= HIPERLIGAÇÃO			##	Cria um atalho ou hiperligação que abre um documento armazenado num servidor de rede, numa intranet ou na Internet
-INDEX			= ÍNDICE			##	Utiliza um índice para escolher um valor de uma referência ou de uma matriz
-INDIRECT		= INDIRECTO			##	Devolve uma referência indicada por um valor de texto
-LOOKUP			= PROC				##	Procura valores num vector ou numa matriz
-MATCH			= CORRESP			##	Procura valores numa referência ou numa matriz
-OFFSET			= DESLOCAMENTO			##	Devolve o deslocamento de referência de uma determinada referência
-ROW			= LIN				##	Devolve o número da linha de uma referência
-ROWS			= LINS				##	Devolve o número de linhas numa referência
-RTD			= RTD				##	Obtém dados em tempo real a partir de um programa que suporte automatização COM (automatização: modo de trabalhar com objectos de uma aplicação a partir de outra aplicação ou ferramenta de desenvolvimento. Anteriormente conhecida como automatização OLE, a automatização é uma norma da indústria de software e uma funcionalidade COM (Component Object Model).)
-TRANSPOSE		= TRANSPOR			##	Devolve a transposição de uma matriz
-VLOOKUP			= PROCV				##	Procura na primeira coluna de uma matriz e percorre a linha para devolver o valor de uma célula
-
-
-##
-##	Math and trigonometry functions			Funções matemáticas e trigonométricas
-##
-ABS			= ABS				##	Devolve o valor absoluto de um número
-ACOS			= ACOS				##	Devolve o arco de co-seno de um número
-ACOSH			= ACOSH				##	Devolve o co-seno hiperbólico inverso de um número
-ASIN			= ASEN				##	Devolve o arco de seno de um número
-ASINH			= ASENH				##	Devolve o seno hiperbólico inverso de um número
-ATAN			= ATAN				##	Devolve o arco de tangente de um número
-ATAN2			= ATAN2				##	Devolve o arco de tangente das coordenadas x e y
-ATANH			= ATANH				##	Devolve a tangente hiperbólica inversa de um número
-CEILING			= ARRED.EXCESSO			##	Arredonda um número para o número inteiro mais próximo ou para o múltiplo de significância mais próximo
-COMBIN			= COMBIN			##	Devolve o número de combinações de um determinado número de objectos
-COS			= COS				##	Devolve o co-seno de um número
-COSH			= COSH				##	Devolve o co-seno hiperbólico de um número
-DEGREES			= GRAUS				##	Converte radianos em graus
-EVEN			= PAR				##	Arredonda um número por excesso para o número inteiro mais próximo
-EXP			= EXP				##	Devolve e elevado à potência de um determinado número
-FACT			= FACTORIAL			##	Devolve o factorial de um número
-FACTDOUBLE		= FACTDUPLO			##	Devolve o factorial duplo de um número
-FLOOR			= ARRED.DEFEITO			##	Arredonda um número por defeito até zero
-GCD			= MDC				##	Devolve o maior divisor comum
-INT			= INT				##	Arredonda um número por defeito para o número inteiro mais próximo
-LCM			= MMC				##	Devolve o mínimo múltiplo comum
-LN			= LN				##	Devolve o logaritmo natural de um número
-LOG			= LOG				##	Devolve o logaritmo de um número com uma base especificada
-LOG10			= LOG10				##	Devolve o logaritmo de base 10 de um número
-MDETERM			= MATRIZ.DETERM			##	Devolve o determinante matricial de uma matriz
-MINVERSE		= MATRIZ.INVERSA		##	Devolve o inverso matricial de uma matriz
-MMULT			= MATRIZ.MULT			##	Devolve o produto matricial de duas matrizes
-MOD			= RESTO				##	Devolve o resto da divisão
-MROUND			= MARRED			##	Devolve um número arredondado para o múltiplo pretendido
-MULTINOMIAL		= POLINOMIAL			##	Devolve o polinomial de um conjunto de números
-ODD			= ÍMPAR				##	Arredonda por excesso um número para o número inteiro ímpar mais próximo
-PI			= PI				##	Devolve o valor de pi
-POWER			= POTÊNCIA			##	Devolve o resultado de um número elevado a uma potência
-PRODUCT			= PRODUTO			##	Multiplica os respectivos argumentos
-QUOTIENT		= QUOCIENTE			##	Devolve a parte inteira de uma divisão
-RADIANS			= RADIANOS			##	Converte graus em radianos
-RAND			= ALEATÓRIO			##	Devolve um número aleatório entre 0 e 1
-RANDBETWEEN		= ALEATÓRIOENTRE		##	Devolve um número aleatório entre os números especificados
-ROMAN			= ROMANO			##	Converte um número árabe em romano, como texto
-ROUND			= ARRED				##	Arredonda um número para um número de dígitos especificado
-ROUNDDOWN		= ARRED.PARA.BAIXO		##	Arredonda um número por defeito até zero
-ROUNDUP			= ARRED.PARA.CIMA		##	Arredonda um número por excesso, afastando-o de zero
-SERIESSUM		= SOMASÉRIE			##	Devolve a soma de uma série de potências baseada na fórmula
-SIGN			= SINAL				##	Devolve o sinal de um número
-SIN			= SEN				##	Devolve o seno de um determinado ângulo
-SINH			= SENH				##	Devolve o seno hiperbólico de um número
-SQRT			= RAIZQ				##	Devolve uma raiz quadrada positiva
-SQRTPI			= RAIZPI			##	Devolve a raiz quadrada de (núm * pi)
-SUBTOTAL		= SUBTOTAL			##	Devolve um subtotal numa lista ou base de dados
-SUM			= SOMA				##	Adiciona os respectivos argumentos
-SUMIF			= SOMA.SE			##	Adiciona as células especificadas por um determinado critério
-SUMIFS			= SOMA.SE.S			##	Adiciona as células num intervalo que cumpre vários critérios
-SUMPRODUCT		= SOMARPRODUTO			##	Devolve a soma dos produtos de componentes de matrizes correspondentes
-SUMSQ			= SOMARQUAD			##	Devolve a soma dos quadrados dos argumentos
-SUMX2MY2		= SOMAX2DY2			##	Devolve a soma da diferença dos quadrados dos valores correspondentes em duas matrizes
-SUMX2PY2		= SOMAX2SY2			##	Devolve a soma da soma dos quadrados dos valores correspondentes em duas matrizes
-SUMXMY2			= SOMAXMY2			##	Devolve a soma dos quadrados da diferença dos valores correspondentes em duas matrizes
-TAN			= TAN				##	Devolve a tangente de um número
-TANH			= TANH				##	Devolve a tangente hiperbólica de um número
-TRUNC			= TRUNCAR			##	Trunca um número para um número inteiro
-
-
-##
-##	Statistical functions				Funções estatísticas
-##
-AVEDEV			= DESV.MÉDIO			##	Devolve a média aritmética dos desvios absolutos à média dos pontos de dados
-AVERAGE			= MÉDIA				##	Devolve a média dos respectivos argumentos
-AVERAGEA		= MÉDIAA			##	Devolve uma média dos respectivos argumentos, incluindo números, texto e valores lógicos
-AVERAGEIF		= MÉDIA.SE			##	Devolve a média aritmética de todas as células num intervalo que cumprem determinado critério
-AVERAGEIFS		= MÉDIA.SE.S			##	Devolve a média aritmética de todas as células que cumprem múltiplos critérios
-BETADIST		= DISTBETA			##	Devolve a função de distribuição cumulativa beta
-BETAINV			= BETA.ACUM.INV			##	Devolve o inverso da função de distribuição cumulativa relativamente a uma distribuição beta específica
-BINOMDIST		= DISTRBINOM			##	Devolve a probabilidade de distribuição binomial de termo individual
-CHIDIST			= DIST.CHI			##	Devolve a probabilidade unicaudal da distribuição qui-quadrada
-CHIINV			= INV.CHI			##	Devolve o inverso da probabilidade unicaudal da distribuição qui-quadrada
-CHITEST			= TESTE.CHI			##	Devolve o teste para independência
-CONFIDENCE		= INT.CONFIANÇA			##	Devolve o intervalo de confiança correspondente a uma média de população
-CORREL			= CORREL			##	Devolve o coeficiente de correlação entre dois conjuntos de dados
-COUNT			= CONTAR			##	Conta os números que existem na lista de argumentos
-COUNTA			= CONTAR.VAL			##	Conta os valores que existem na lista de argumentos
-COUNTBLANK		= CONTAR.VAZIO			##	Conta o número de células em branco num intervalo
-COUNTIF			= CONTAR.SE			##	Calcula o número de células num intervalo que corresponde aos critérios determinados
-COUNTIFS		= CONTAR.SE.S			##	Conta o número de células num intervalo que cumprem múltiplos critérios
-COVAR			= COVAR				##	Devolve a covariância, que é a média dos produtos de desvios de pares
-CRITBINOM		= CRIT.BINOM			##	Devolve o menor valor em que a distribuição binomial cumulativa é inferior ou igual a um valor de critério
-DEVSQ			= DESVQ				##	Devolve a soma dos quadrados dos desvios
-EXPONDIST		= DISTEXPON			##	Devolve a distribuição exponencial
-FDIST			= DISTF				##	Devolve a distribuição da probabilidade F
-FINV			= INVF				##	Devolve o inverso da distribuição da probabilidade F
-FISHER			= FISHER			##	Devolve a transformação Fisher
-FISHERINV		= FISHERINV			##	Devolve o inverso da transformação Fisher
-FORECAST		= PREVISÃO			##	Devolve um valor ao longo de uma tendência linear
-FREQUENCY		= FREQUÊNCIA			##	Devolve uma distribuição de frequência como uma matriz vertical
-FTEST			= TESTEF			##	Devolve o resultado de um teste F
-GAMMADIST		= DISTGAMA			##	Devolve a distribuição gama
-GAMMAINV		= INVGAMA			##	Devolve o inverso da distribuição gama cumulativa
-GAMMALN			= LNGAMA			##	Devolve o logaritmo natural da função gama, Γ(x)
-GEOMEAN			= MÉDIA.GEOMÉTRICA		##	Devolve a média geométrica
-GROWTH			= CRESCIMENTO			##	Devolve valores ao longo de uma tendência exponencial
-HARMEAN			= MÉDIA.HARMÓNICA		##	Devolve a média harmónica
-HYPGEOMDIST		= DIST.HIPERGEOM		##	Devolve a distribuição hipergeométrica
-INTERCEPT		= INTERCEPTAR			##	Devolve a intercepção da linha de regressão linear
-KURT			= CURT				##	Devolve a curtose de um conjunto de dados
-LARGE			= MAIOR				##	Devolve o maior valor k-ésimo de um conjunto de dados
-LINEST			= PROJ.LIN			##	Devolve os parâmetros de uma tendência linear
-LOGEST			= PROJ.LOG			##	Devolve os parâmetros de uma tendência exponencial
-LOGINV			= INVLOG			##	Devolve o inverso da distribuição normal logarítmica
-LOGNORMDIST		= DIST.NORMALLOG		##	Devolve a distribuição normal logarítmica cumulativa
-MAX			= MÁXIMO			##	Devolve o valor máximo numa lista de argumentos
-MAXA			= MÁXIMOA			##	Devolve o valor máximo numa lista de argumentos, incluindo números, texto e valores lógicos
-MEDIAN			= MED				##	Devolve a mediana dos números indicados
-MIN			= MÍNIMO			##	Devolve o valor mínimo numa lista de argumentos
-MINA			= MÍNIMOA			##	Devolve o valor mínimo numa lista de argumentos, incluindo números, texto e valores lógicos
-MODE			= MODA				##	Devolve o valor mais comum num conjunto de dados
-NEGBINOMDIST		= DIST.BIN.NEG			##	Devolve a distribuição binominal negativa
-NORMDIST		= DIST.NORM			##	Devolve a distribuição cumulativa normal
-NORMINV			= INV.NORM			##	Devolve o inverso da distribuição cumulativa normal
-NORMSDIST		= DIST.NORMP			##	Devolve a distribuição cumulativa normal padrão
-NORMSINV		= INV.NORMP			##	Devolve o inverso da distribuição cumulativa normal padrão
-PEARSON			= PEARSON			##	Devolve o coeficiente de correlação momento/produto de Pearson
-PERCENTILE		= PERCENTIL			##	Devolve o k-ésimo percentil de valores num intervalo
-PERCENTRANK		= ORDEM.PERCENTUAL		##	Devolve a ordem percentual de um valor num conjunto de dados
-PERMUT			= PERMUTAR			##	Devolve o número de permutações de um determinado número de objectos
-POISSON			= POISSON			##	Devolve a distribuição de Poisson
-PROB			= PROB				##	Devolve a probabilidade dos valores num intervalo se encontrarem entre dois limites
-QUARTILE		= QUARTIL			##	Devolve o quartil de um conjunto de dados
-RANK			= ORDEM				##	Devolve a ordem de um número numa lista numérica
-RSQ			= RQUAD				##	Devolve o quadrado do coeficiente de correlação momento/produto de Pearson
-SKEW			= DISTORÇÃO			##	Devolve a distorção de uma distribuição
-SLOPE			= DECLIVE			##	Devolve o declive da linha de regressão linear
-SMALL			= MENOR				##	Devolve o menor valor de k-ésimo de um conjunto de dados
-STANDARDIZE		= NORMALIZAR			##	Devolve um valor normalizado
-STDEV			= DESVPAD			##	Calcula o desvio-padrão com base numa amostra
-STDEVA			= DESVPADA			##	Calcula o desvio-padrão com base numa amostra, incluindo números, texto e valores lógicos
-STDEVP			= DESVPADP			##	Calcula o desvio-padrão com base na população total
-STDEVPA			= DESVPADPA			##	Calcula o desvio-padrão com base na população total, incluindo números, texto e valores lógicos
-STEYX			= EPADYX			##	Devolve o erro-padrão do valor de y previsto para cada x na regressão
-TDIST			= DISTT				##	Devolve a distribuição t de Student
-TINV			= INVT				##	Devolve o inverso da distribuição t de Student
-TREND			= TENDÊNCIA			##	Devolve valores ao longo de uma tendência linear
-TRIMMEAN		= MÉDIA.INTERNA			##	Devolve a média do interior de um conjunto de dados
-TTEST			= TESTET			##	Devolve a probabilidade associada ao teste t de Student
-VAR			= VAR				##	Calcula a variância com base numa amostra
-VARA			= VARA				##	Calcula a variância com base numa amostra, incluindo números, texto e valores lógicos
-VARP			= VARP				##	Calcula a variância com base na população total
-VARPA			= VARPA				##	Calcula a variância com base na população total, incluindo números, texto e valores lógicos
-WEIBULL			= WEIBULL			##	Devolve a distribuição Weibull
-ZTEST			= TESTEZ			##	Devolve o valor de probabilidade unicaudal de um teste-z
-
-
-##
-##	Text functions					Funções de texto
-##
-ASC			= ASC				##	Altera letras ou katakana de largura total (byte duplo) numa cadeia de caracteres para caracteres de largura média (byte único)
-BAHTTEXT		= TEXTO.BAHT			##	Converte um número em texto, utilizando o formato monetário ß (baht)
-CHAR			= CARÁCT			##	Devolve o carácter especificado pelo número de código
-CLEAN			= LIMPAR			##	Remove do texto todos os caracteres não imprimíveis
-CODE			= CÓDIGO			##	Devolve um código numérico correspondente ao primeiro carácter numa cadeia de texto
-CONCATENATE		= CONCATENAR			##	Agrupa vários itens de texto num único item de texto
-DOLLAR			= MOEDA				##	Converte um número em texto, utilizando o formato monetário € (Euro)
-EXACT			= EXACTO			##	Verifica se dois valores de texto são idênticos
-FIND			= LOCALIZAR			##	Localiza um valor de texto dentro de outro (sensível às maiúsculas e minúsculas)
-FINDB			= LOCALIZARB			##	Localiza um valor de texto dentro de outro (sensível às maiúsculas e minúsculas)
-FIXED			= FIXA				##	Formata um número como texto com um número fixo de decimais
-JIS			= JIS				##	Altera letras ou katakana de largura média (byte único) numa cadeia de caracteres para caracteres de largura total (byte duplo)
-LEFT			= ESQUERDA			##	Devolve os caracteres mais à esquerda de um valor de texto
-LEFTB			= ESQUERDAB			##	Devolve os caracteres mais à esquerda de um valor de texto
-LEN			= NÚM.CARACT			##	Devolve o número de caracteres de uma cadeia de texto
-LENB			= NÚM.CARACTB			##	Devolve o número de caracteres de uma cadeia de texto
-LOWER			= MINÚSCULAS			##	Converte o texto em minúsculas
-MID			= SEG.TEXTO			##	Devolve um número específico de caracteres de uma cadeia de texto, a partir da posição especificada
-MIDB			= SEG.TEXTOB			##	Devolve um número específico de caracteres de uma cadeia de texto, a partir da posição especificada
-PHONETIC		= FONÉTICA			##	Retira os caracteres fonéticos (furigana) de uma cadeia de texto
-PROPER			= INICIAL.MAIÚSCULA		##	Coloca em maiúsculas a primeira letra de cada palavra de um valor de texto
-REPLACE			= SUBSTITUIR			##	Substitui caracteres no texto
-REPLACEB		= SUBSTITUIRB			##	Substitui caracteres no texto
-REPT			= REPETIR			##	Repete texto um determinado número de vezes
-RIGHT			= DIREITA			##	Devolve os caracteres mais à direita de um valor de texto
-RIGHTB			= DIREITAB			##	Devolve os caracteres mais à direita de um valor de texto
-SEARCH			= PROCURAR			##	Localiza um valor de texto dentro de outro (não sensível a maiúsculas e minúsculas)
-SEARCHB			= PROCURARB			##	Localiza um valor de texto dentro de outro (não sensível a maiúsculas e minúsculas)
-SUBSTITUTE		= SUBST				##	Substitui texto novo por texto antigo numa cadeia de texto
-T			= T				##	Converte os respectivos argumentos em texto
-TEXT			= TEXTO				##	Formata um número e converte-o em texto
-TRIM			= COMPACTAR			##	Remove espaços do texto
-UPPER			= MAIÚSCULAS			##	Converte texto em maiúsculas
-VALUE			= VALOR				##	Converte um argumento de texto num número
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/ru/config b/plugins/exportTypes/Excel/PHPExcel/locale/ru/config
deleted file mode 100755
index 34b7c86a4..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/ru/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= р
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #ПУСТО!
-DIV0	= #ДЕЛ/0!
-VALUE	= #ЗНАЧ!
-REF	= #ССЫЛ!
-NAME	= #ИМЯ?
-NUM	= #ЧИСЛО!
-NA	= #Н/Д
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/ru/functions b/plugins/exportTypes/Excel/PHPExcel/locale/ru/functions
deleted file mode 100755
index 0958b05c1..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/ru/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from information provided by web-junior (http://www.web-junior.net/)
-##
-##
-
-
-##
-##	Add-in and Automation functions				Функции надстроек и автоматизации
-##
-GETPIVOTDATA		= ПОЛУЧИТЬ.ДАННЫЕ.СВОДНОЙ.ТАБЛИЦЫ	##	Возвращает данные, хранящиеся в отчете сводной таблицы.
-
-
-##
-##	Cube functions						Функции Куб
-##
-CUBEKPIMEMBER		= КУБЭЛЕМЕНТКИП				##	Возвращает свойство ключевого индикатора производительности «(КИП)» и отображает имя «КИП» в ячейке. «КИП» представляет собой количественную величину, такую как ежемесячная валовая прибыль или ежеквартальная текучесть кадров, используемой для контроля эффективности работы организации.
-CUBEMEMBER		= КУБЭЛЕМЕНТ				##	Возвращает элемент или кортеж из куба. Используется для проверки существования элемента или кортежа в кубе.
-CUBEMEMBERPROPERTY	= КУБСВОЙСТВОЭЛЕМЕНТА			##	Возвращает значение свойства элемента из куба. Используется для проверки существования имени элемента в кубе и возвращает указанное свойство для этого элемента.
-CUBERANKEDMEMBER	= КУБПОРЭЛЕМЕНТ				##	Возвращает n-ый или ранжированный элемент в множество. Используется для возвращения одного или нескольких элементов в множество, например, лучшего продавца или 10 лучших студентов.
-CUBESET			= КУБМНОЖ				##	Определяет вычислительное множество элементов или кортежей, отправляя на сервер выражение, которое создает множество, а затем возвращает его в Microsoft Office Excel.
-CUBESETCOUNT		= КУБЧИСЛОЭЛМНОЖ			##	Возвращает число элементов множества.
-CUBEVALUE		= КУБЗНАЧЕНИЕ				##	Возвращает обобщенное значение из куба.
-
-
-##
-##	Database functions					Функции для работы с базами данных
-##
-DAVERAGE		= ДСРЗНАЧ				##	Возвращает среднее значение выбранных записей базы данных.
-DCOUNT			= БСЧЁТ					##	Подсчитывает количество числовых ячеек в базе данных.
-DCOUNTA			= БСЧЁТА				##	Подсчитывает количество непустых ячеек в базе данных.
-DGET			= БИЗВЛЕЧЬ				##	Извлекает из базы данных одну запись, удовлетворяющую заданному условию.
-DMAX			= ДМАКС					##	Возвращает максимальное значение среди выделенных записей базы данных.
-DMIN			= ДМИН					##	Возвращает минимальное значение среди выделенных записей базы данных.
-DPRODUCT		= БДПРОИЗВЕД				##	Перемножает значения определенного поля в записях базы данных, удовлетворяющих условию.
-DSTDEV			= ДСТАНДОТКЛ				##	Оценивает стандартное отклонение по выборке для выделенных записей базы данных.
-DSTDEVP			= ДСТАНДОТКЛП				##	Вычисляет стандартное отклонение по генеральной совокупности для выделенных записей базы данных
-DSUM			= БДСУММ				##	Суммирует числа в поле для записей базы данных, удовлетворяющих условию.
-DVAR			= БДДИСП				##	Оценивает дисперсию по выборке из выделенных записей базы данных
-DVARP			= БДДИСПП				##	Вычисляет дисперсию по генеральной совокупности для выделенных записей базы данных
-
-
-##
-##	Date and time functions					Функции даты и времени
-##
-DATE			= ДАТА					##	Возвращает заданную дату в числовом формате.
-DATEVALUE		= ДАТАЗНАЧ				##	Преобразует дату из текстового формата в числовой формат.
-DAY			= ДЕНЬ					##	Преобразует дату в числовом формате в день месяца.
-DAYS360			= ДНЕЙ360				##	Вычисляет количество дней между двумя датами на основе 360-дневного года.
-EDATE			= ДАТАМЕС				##	Возвращает дату в числовом формате, отстоящую на заданное число месяцев вперед или назад от начальной даты.
-EOMONTH			= КОНМЕСЯЦА				##	Возвращает дату в числовом формате для последнего дня месяца, отстоящего вперед или назад на заданное число месяцев.
-HOUR			= ЧАС					##	Преобразует дату в числовом формате в часы.
-MINUTE			= МИНУТЫ				##	Преобразует дату в числовом формате в минуты.
-MONTH			= МЕСЯЦ					##	Преобразует дату в числовом формате в месяцы.
-NETWORKDAYS		= ЧИСТРАБДНИ				##	Возвращает количество рабочих дней между двумя датами.
-NOW			= ТДАТА					##	Возвращает текущую дату и время в числовом формате.
-SECOND			= СЕКУНДЫ				##	Преобразует дату в числовом формате в секунды.
-TIME			= ВРЕМЯ					##	Возвращает заданное время в числовом формате.
-TIMEVALUE		= ВРЕМЗНАЧ				##	Преобразует время из текстового формата в числовой формат.
-TODAY			= СЕГОДНЯ				##	Возвращает текущую дату в числовом формате.
-WEEKDAY			= ДЕНЬНЕД				##	Преобразует дату в числовом формате в день недели.
-WEEKNUM			= НОМНЕДЕЛИ				##	Преобразует числовое представление в число, которое указывает, на какую неделю года приходится указанная дата.
-WORKDAY			= РАБДЕНЬ				##	Возвращает дату в числовом формате, отстоящую вперед или назад на заданное количество рабочих дней.
-YEAR			= ГОД					##	Преобразует дату в числовом формате в год.
-YEARFRAC		= ДОЛЯГОДА				##	Возвращает долю года, которую составляет количество дней между начальной и конечной датами.
-
-
-##
-##	Engineering functions					Инженерные функции
-##
-BESSELI			= БЕССЕЛЬ.I	 			##	Возвращает модифицированную функцию Бесселя In(x).
-BESSELJ			= БЕССЕЛЬ.J				##	Возвращает функцию Бесселя Jn(x).
-BESSELK			= БЕССЕЛЬ.K				##	Возвращает модифицированную функцию Бесселя Kn(x).
-BESSELY			= БЕССЕЛЬ.Y				##	Возвращает функцию Бесселя Yn(x).
-BIN2DEC			= ДВ.В.ДЕС				##	Преобразует двоичное число в десятичное.
-BIN2HEX			= ДВ.В.ШЕСТН				##	Преобразует двоичное число в шестнадцатеричное.
-BIN2OCT			= ДВ.В.ВОСЬМ				##	Преобразует двоичное число в восьмеричное.
-COMPLEX			= КОМПЛЕКСН				##	Преобразует коэффициенты при вещественной и мнимой частях комплексного числа в комплексное число.
-CONVERT			= ПРЕОБР				##	Преобразует число из одной системы единиц измерения в другую.
-DEC2BIN			= ДЕС.В.ДВ				##	Преобразует десятичное число в двоичное.
-DEC2HEX			= ДЕС.В.ШЕСТН				##	Преобразует десятичное число в шестнадцатеричное.
-DEC2OCT			= ДЕС.В.ВОСЬМ				##	Преобразует десятичное число в восьмеричное.
-DELTA			= ДЕЛЬТА				##	Проверяет равенство двух значений.
-ERF			= ФОШ					##	Возвращает функцию ошибки.
-ERFC			= ДФОШ					##	Возвращает дополнительную функцию ошибки.
-GESTEP			= ПОРОГ					##	Проверяет, не превышает ли данное число порогового значения.
-HEX2BIN			= ШЕСТН.В.ДВ				##	Преобразует шестнадцатеричное число в двоичное.
-HEX2DEC			= ШЕСТН.В.ДЕС				##	Преобразует шестнадцатеричное число в десятичное.
-HEX2OCT			= ШЕСТН.В.ВОСЬМ				##	Преобразует шестнадцатеричное число в восьмеричное.
-IMABS			= МНИМ.ABS				##	Возвращает абсолютную величину (модуль) комплексного числа.
-IMAGINARY		= МНИМ.ЧАСТЬ				##	Возвращает коэффициент при мнимой части комплексного числа.
-IMARGUMENT		= МНИМ.АРГУМЕНТ				##	Возвращает значение аргумента комплексного числа (тета) — угол, выраженный в радианах.
-IMCONJUGATE		= МНИМ.СОПРЯЖ				##	Возвращает комплексно-сопряженное комплексное число.
-IMCOS			= МНИМ.COS				##	Возвращает косинус комплексного числа.
-IMDIV			= МНИМ.ДЕЛ				##	Возвращает частное от деления двух комплексных чисел.
-IMEXP			= МНИМ.EXP				##	Возвращает экспоненту комплексного числа.
-IMLN			= МНИМ.LN				##	Возвращает натуральный логарифм комплексного числа.
-IMLOG10			= МНИМ.LOG10				##	Возвращает обычный (десятичный) логарифм комплексного числа.
-IMLOG2			= МНИМ.LOG2				##	Возвращает двоичный логарифм комплексного числа.
-IMPOWER			= МНИМ.СТЕПЕНЬ				##	Возвращает комплексное число, возведенное в целую степень.
-IMPRODUCT		= МНИМ.ПРОИЗВЕД				##	Возвращает произведение от 2 до 29 комплексных чисел.
-IMREAL			= МНИМ.ВЕЩ				##	Возвращает коэффициент при вещественной части комплексного числа.
-IMSIN			= МНИМ.SIN				##	Возвращает синус комплексного числа.
-IMSQRT			= МНИМ.КОРЕНЬ				##	Возвращает значение квадратного корня из комплексного числа.
-IMSUB			= МНИМ.РАЗН				##	Возвращает разность двух комплексных чисел.
-IMSUM			= МНИМ.СУММ				##	Возвращает сумму комплексных чисел.
-OCT2BIN			= ВОСЬМ.В.ДВ				##	Преобразует восьмеричное число в двоичное.
-OCT2DEC			= ВОСЬМ.В.ДЕС				##	Преобразует восьмеричное число в десятичное.
-OCT2HEX			= ВОСЬМ.В.ШЕСТН				##	Преобразует восьмеричное число в шестнадцатеричное.
-
-
-##
-##	Financial functions					Финансовые функции
-##
-ACCRINT			= НАКОПДОХОД				##	Возвращает накопленный процент по ценным бумагам с периодической выплатой процентов.
-ACCRINTM		= НАКОПДОХОДПОГАШ			##	Возвращает накопленный процент по ценным бумагам, проценты по которым выплачиваются в срок погашения.
-AMORDEGRC		= АМОРУМ				##	Возвращает величину амортизации для каждого периода, используя коэффициент амортизации.
-AMORLINC		= АМОРУВ				##	Возвращает величину амортизации для каждого периода.
-COUPDAYBS		= ДНЕЙКУПОНДО				##	Возвращает количество дней от начала действия купона до даты соглашения.
-COUPDAYS		= ДНЕЙКУПОН				##	Возвращает число дней в периоде купона, содержащем дату соглашения.
-COUPDAYSNC		= ДНЕЙКУПОНПОСЛЕ			##	Возвращает число дней от даты соглашения до срока следующего купона.
-COUPNCD			= ДАТАКУПОНПОСЛЕ			##	Возвращает следующую дату купона после даты соглашения.
-COUPNUM			= ЧИСЛКУПОН				##	Возвращает количество купонов, которые могут быть оплачены между датой соглашения и сроком вступления в силу.
-COUPPCD			= ДАТАКУПОНДО				##	Возвращает предыдущую дату купона перед датой соглашения.
-CUMIPMT			= ОБЩПЛАТ				##	Возвращает общую выплату, произведенную между двумя периодическими выплатами.
-CUMPRINC		= ОБЩДОХОД				##	Возвращает общую выплату по займу между двумя периодами.
-DB			= ФУО					##	Возвращает величину амортизации актива для заданного периода, рассчитанную методом фиксированного уменьшения остатка.
-DDB			= ДДОБ					##	Возвращает величину амортизации актива за данный период, используя метод двойного уменьшения остатка или иной явно указанный метод.
-DISC			= СКИДКА				##	Возвращает норму скидки для ценных бумаг.
-DOLLARDE		= РУБЛЬ.ДЕС				##	Преобразует цену в рублях, выраженную в виде дроби, в цену в рублях, выраженную десятичным числом.
-DOLLARFR		= РУБЛЬ.ДРОБЬ				##	Преобразует цену в рублях, выраженную десятичным числом, в цену в рублях, выраженную в виде дроби.
-DURATION		= ДЛИТ					##	Возвращает ежегодную продолжительность действия ценных бумаг с периодическими выплатами по процентам.
-EFFECT			= ЭФФЕКТ				##	Возвращает действующие ежегодные процентные ставки.
-FV			= БС					##	Возвращает будущую стоимость инвестиции.
-FVSCHEDULE		= БЗРАСПИС				##	Возвращает будущую стоимость первоначальной основной суммы после начисления ряда сложных процентов.
-INTRATE			= ИНОРМА				##	Возвращает процентную ставку для полностью инвестированных ценных бумаг.
-IPMT			= ПРПЛТ					##	Возвращает величину выплаты прибыли на вложения за данный период.
-IRR			= ВСД					##	Возвращает внутреннюю ставку доходности для ряда потоков денежных средств.
-ISPMT			= ПРОЦПЛАТ				##	Вычисляет выплаты за указанный период инвестиции.
-MDURATION		= МДЛИТ					##	Возвращает модифицированную длительность Маколея для ценных бумаг с предполагаемой номинальной стоимостью 100 рублей.
-MIRR			= МВСД					##	Возвращает внутреннюю ставку доходности, при которой положительные и отрицательные денежные потоки имеют разные значения ставки.
-NOMINAL			= НОМИНАЛ				##	Возвращает номинальную годовую процентную ставку.
-NPER			= КПЕР					##	Возвращает общее количество периодов выплаты для данного вклада.
-NPV			= ЧПС					##	Возвращает чистую приведенную стоимость инвестиции, основанной на серии периодических денежных потоков и ставке дисконтирования.
-ODDFPRICE		= ЦЕНАПЕРВНЕРЕГ				##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг с нерегулярным первым периодом.
-ODDFYIELD		= ДОХОДПЕРВНЕРЕГ			##	Возвращает доход по ценным бумагам с нерегулярным первым периодом.
-ODDLPRICE		= ЦЕНАПОСЛНЕРЕГ				##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг с нерегулярным последним периодом.
-ODDLYIELD		= ДОХОДПОСЛНЕРЕГ			##	Возвращает доход по ценным бумагам с нерегулярным последним периодом.
-PMT			= ПЛТ					##	Возвращает величину выплаты за один период аннуитета.
-PPMT			= ОСПЛТ					##	Возвращает величину выплат в погашение основной суммы по инвестиции за заданный период.
-PRICE			= ЦЕНА					##	Возвращает цену за 100 рублей нарицательной стоимости ценных бумаг, по которым производится периодическая выплата процентов.
-PRICEDISC		= ЦЕНАСКИДКА				##	Возвращает цену за 100 рублей номинальной стоимости ценных бумаг, на которые сделана скидка.
-PRICEMAT		= ЦЕНАПОГАШ				##	Возвращает цену за 100 рублей номинальной стоимости ценных бумаг, проценты по которым выплачиваются в срок погашения.
-PV			= ПС					##	Возвращает приведенную (к текущему моменту) стоимость инвестиции.
-RATE			= СТАВКА				##	Возвращает процентную ставку по аннуитету за один период.
-RECEIVED		= ПОЛУЧЕНО				##	Возвращает сумму, полученную к сроку погашения полностью обеспеченных ценных бумаг.
-SLN			= АПЛ					##	Возвращает величину линейной амортизации актива за один период.
-SYD			= АСЧ					##	Возвращает величину амортизации актива за данный период, рассчитанную методом суммы годовых чисел.
-TBILLEQ			= РАВНОКЧЕК				##	Возвращает эквивалентный облигации доход по казначейскому чеку.
-TBILLPRICE		= ЦЕНАКЧЕК				##	Возвращает цену за 100 рублей нарицательной стоимости для казначейского чека.
-TBILLYIELD		= ДОХОДКЧЕК				##	Возвращает доход по казначейскому чеку.
-VDB			= ПУО					##	Возвращает величину амортизации актива для указанного или частичного периода при использовании метода сокращающегося баланса.
-XIRR			= ЧИСТВНДОХ				##	Возвращает внутреннюю ставку доходности для графика денежных потоков, которые не обязательно носят периодический характер.
-XNPV			= ЧИСТНЗ				##	Возвращает чистую приведенную стоимость для денежных потоков, которые не обязательно являются периодическими.
-YIELD			= ДОХОД					##	Возвращает доход от ценных бумаг, по которым производятся периодические выплаты процентов.
-YIELDDISC		= ДОХОДСКИДКА				##	Возвращает годовой доход по ценным бумагам, на которые сделана скидка (пример — казначейские чеки).
-YIELDMAT		= ДОХОДПОГАШ				##	Возвращает годовой доход от ценных бумаг, проценты по которым выплачиваются в срок погашения.
-
-
-##
-##	Information functions					Информационные функции
-##
-CELL			= ЯЧЕЙКА				##	Возвращает информацию о формате, расположении или содержимом ячейки.
-ERROR.TYPE		= ТИП.ОШИБКИ				##	Возвращает числовой код, соответствующий типу ошибки.
-INFO			= ИНФОРМ				##	Возвращает информацию о текущей операционной среде.
-ISBLANK			= ЕПУСТО				##	Возвращает значение ИСТИНА, если аргумент является ссылкой на пустую ячейку.
-ISERR			= ЕОШ					##	Возвращает значение ИСТИНА, если аргумент ссылается на любое значение ошибки, кроме #Н/Д.
-ISERROR			= ЕОШИБКА				##	Возвращает значение ИСТИНА, если аргумент ссылается на любое значение ошибки.
-ISEVEN			= ЕЧЁТН					##	Возвращает значение ИСТИНА, если значение аргумента является четным числом.
-ISLOGICAL		= ЕЛОГИЧ				##	Возвращает значение ИСТИНА, если аргумент ссылается на логическое значение.
-ISNA			= ЕНД					##	Возвращает значение ИСТИНА, если аргумент ссылается на значение ошибки #Н/Д.
-ISNONTEXT		= ЕНЕТЕКСТ				##	Возвращает значение ИСТИНА, если значение аргумента не является текстом.
-ISNUMBER		= ЕЧИСЛО				##	Возвращает значение ИСТИНА, если аргумент ссылается на число.
-ISODD			= ЕНЕЧЁТ				##	Возвращает значение ИСТИНА, если значение аргумента является нечетным числом.
-ISREF			= ЕССЫЛКА				##	Возвращает значение ИСТИНА, если значение аргумента является ссылкой.
-ISTEXT			= ЕТЕКСТ				##	Возвращает значение ИСТИНА, если значение аргумента является текстом.
-N			= Ч					##	Возвращает значение, преобразованное в число.
-NA			= НД					##	Возвращает значение ошибки #Н/Д.
-TYPE			= ТИП					##	Возвращает число, обозначающее тип данных значения.
-
-
-##
-##	Logical functions					Логические функции
-##
-AND			= И					##	Renvoie VRAI si tous ses arguments sont VRAI.
-FALSE			= ЛОЖЬ					##	Возвращает логическое значение ЛОЖЬ.
-IF			= ЕСЛИ					##	Выполняет проверку условия.
-IFERROR			= ЕСЛИОШИБКА				##	Возвращает введённое значение, если вычисление по формуле вызывает ошибку; в противном случае функция возвращает результат вычисления.
-NOT			= НЕ					##	Меняет логическое значение своего аргумента на противоположное.
-OR			= ИЛИ					##	Возвращает значение ИСТИНА, если хотя бы один аргумент имеет значение ИСТИНА.
-TRUE			= ИСТИНА				##	Возвращает логическое значение ИСТИНА.
-
-
-##
-##	Lookup and reference functions				Функции ссылки и поиска
-##
-ADDRESS			= АДРЕС					##	Возвращает ссылку на отдельную ячейку листа в виде текста.
-AREAS			= ОБЛАСТИ				##	Возвращает количество областей в ссылке.
-CHOOSE			= ВЫБОР					##	Выбирает значение из списка значений по индексу.
-COLUMN			= СТОЛБЕЦ				##	Возвращает номер столбца, на который указывает ссылка.
-COLUMNS			= ЧИСЛСТОЛБ				##	Возвращает количество столбцов в ссылке.
-HLOOKUP			= ГПР					##	Ищет в первой строке массива и возвращает значение отмеченной ячейки
-HYPERLINK		= ГИПЕРССЫЛКА				##	Создает ссылку, открывающую документ, который находится на сервере сети, в интрасети или в Интернете.
-INDEX			= ИНДЕКС				##	Использует индекс для выбора значения из ссылки или массива.
-INDIRECT		= ДВССЫЛ				##	Возвращает ссылку, заданную текстовым значением.
-LOOKUP			= ПРОСМОТР				##	Ищет значения в векторе или массиве.
-MATCH			= ПОИСКПОЗ				##	Ищет значения в ссылке или массиве.
-OFFSET			= СМЕЩ					##	Возвращает смещение ссылки относительно заданной ссылки.
-ROW			= СТРОКА				##	Возвращает номер строки, определяемой ссылкой.
-ROWS			= ЧСТРОК				##	Возвращает количество строк в ссылке.
-RTD			= ДРВ					##	Извлекает данные реального времени из программ, поддерживающих автоматизацию COM (Программирование объектов. Стандартное средство для работы с объектами некоторого приложения из другого приложения или средства разработки. Программирование объектов (ранее называемое программированием OLE) является функцией модели COM (Component Object Model, модель компонентных объектов).).
-TRANSPOSE		= ТРАНСП				##	Возвращает транспонированный массив.
-VLOOKUP			= ВПР					##	Ищет значение в первом столбце массива и возвращает значение из ячейки в найденной строке и указанном столбце.
-
-
-##
-##	Math and trigonometry functions				Математические и тригонометрические функции
-##
-ABS			= ABS					##	Возвращает модуль (абсолютную величину) числа.
-ACOS			= ACOS					##	Возвращает арккосинус числа.
-ACOSH			= ACOSH					##	Возвращает гиперболический арккосинус числа.
-ASIN			= ASIN					##	Возвращает арксинус числа.
-ASINH			= ASINH					##	Возвращает гиперболический арксинус числа.
-ATAN			= ATAN					##	Возвращает арктангенс числа.
-ATAN2			= ATAN2					##	Возвращает арктангенс для заданных координат x и y.
-ATANH			= ATANH					##	Возвращает гиперболический арктангенс числа.
-CEILING			= ОКРВВЕРХ				##	Округляет число до ближайшего целого или до ближайшего кратного указанному значению.
-COMBIN			= ЧИСЛКОМБ				##	Возвращает количество комбинаций для заданного числа объектов.
-COS			= COS					##	Возвращает косинус числа.
-COSH			= COSH					##	Возвращает гиперболический косинус числа.
-DEGREES			= ГРАДУСЫ				##	Преобразует радианы в градусы.
-EVEN			= ЧЁТН					##	Округляет число до ближайшего четного целого.
-EXP			= EXP					##	Возвращает число e, возведенное в указанную степень.
-FACT			= ФАКТР					##	Возвращает факториал числа.
-FACTDOUBLE		= ДВФАКТР				##	Возвращает двойной факториал числа.
-FLOOR			= ОКРВНИЗ				##	Округляет число до ближайшего меньшего по модулю значения.
-GCD			= НОД					##	Возвращает наибольший общий делитель.
-INT			= ЦЕЛОЕ					##	Округляет число до ближайшего меньшего целого.
-LCM			= НОК					##	Возвращает наименьшее общее кратное.
-LN			= LN					##	Возвращает натуральный логарифм числа.
-LOG			= LOG					##	Возвращает логарифм числа по заданному основанию.
-LOG10			= LOG10					##	Возвращает десятичный логарифм числа.
-MDETERM			= МОПРЕД				##	Возвращает определитель матрицы массива.
-MINVERSE		= МОБР					##	Возвращает обратную матрицу массива.
-MMULT			= МУМНОЖ				##	Возвращает произведение матриц двух массивов.
-MOD			= ОСТАТ					##	Возвращает остаток от деления.
-MROUND			= ОКРУГЛТ				##	Возвращает число, округленное с требуемой точностью.
-MULTINOMIAL		= МУЛЬТИНОМ				##	Возвращает мультиномиальный коэффициент множества чисел.
-ODD			= НЕЧЁТ					##	Округляет число до ближайшего нечетного целого.
-PI			= ПИ					##	Возвращает число пи.
-POWER			= СТЕПЕНЬ				##	Возвращает результат возведения числа в степень.
-PRODUCT			= ПРОИЗВЕД				##	Возвращает произведение аргументов.
-QUOTIENT		= ЧАСТНОЕ				##	Возвращает целую часть частного при делении.
-RADIANS			= РАДИАНЫ				##	Преобразует градусы в радианы.
-RAND			= СЛЧИС					##	Возвращает случайное число в интервале от 0 до 1.
-RANDBETWEEN		= СЛУЧМЕЖДУ				##	Возвращает случайное число в интервале между двумя заданными числами.
-ROMAN			= РИМСКОЕ				##	Преобразует арабские цифры в римские в виде текста.
-ROUND			= ОКРУГЛ				##	Округляет число до указанного количества десятичных разрядов.
-ROUNDDOWN		= ОКРУГЛВНИЗ				##	Округляет число до ближайшего меньшего по модулю значения.
-ROUNDUP			= ОКРУГЛВВЕРХ				##	Округляет число до ближайшего большего по модулю значения.
-SERIESSUM		= РЯД.СУММ				##	Возвращает сумму степенного ряда, вычисленную по формуле.
-SIGN			= ЗНАК					##	Возвращает знак числа.
-SIN			= SIN					##	Возвращает синус заданного угла.
-SINH			= SINH					##	Возвращает гиперболический синус числа.
-SQRT			= КОРЕНЬ				##	Возвращает положительное значение квадратного корня.
-SQRTPI			= КОРЕНЬПИ				##	Возвращает квадратный корень из значения выражения (число * ПИ).
-SUBTOTAL		= ПРОМЕЖУТОЧНЫЕ.ИТОГИ			##	Возвращает промежуточный итог в списке или базе данных.
-SUM			= СУММ					##	Суммирует аргументы.
-SUMIF			= СУММЕСЛИ				##	Суммирует ячейки, удовлетворяющие заданному условию.
-SUMIFS			= СУММЕСЛИМН				##	Суммирует диапазон ячеек, удовлетворяющих нескольким условиям. 
-SUMPRODUCT		= СУММПРОИЗВ				##	Возвращает сумму произведений соответствующих элементов массивов.
-SUMSQ			= СУММКВ				##	Возвращает сумму квадратов аргументов.
-SUMX2MY2		= СУММРАЗНКВ				##	Возвращает сумму разностей квадратов соответствующих значений в двух массивах.
-SUMX2PY2		= СУММСУММКВ				##	Возвращает сумму сумм квадратов соответствующих элементов двух массивов.
-SUMXMY2			= СУММКВРАЗН				##	Возвращает сумму квадратов разностей соответствующих значений в двух массивах.
-TAN			= TAN					##	Возвращает тангенс числа.
-TANH			= TANH					##	Возвращает гиперболический тангенс числа.
-TRUNC			= ОТБР					##	Отбрасывает дробную часть числа.
-
-
-##
-##	Statistical functions					Статистические функции
-##
-AVEDEV			= СРОТКЛ				##	Возвращает среднее арифметическое абсолютных значений отклонений точек данных от среднего.
-AVERAGE			= СРЗНАЧ				##	Возвращает среднее арифметическое аргументов.
-AVERAGEA		= СРЗНАЧА				##	Возвращает среднее арифметическое аргументов, включая числа, текст и логические значения.
-AVERAGEIF		= СРЗНАЧЕСЛИ 				##	Возвращает среднее значение (среднее арифметическое) всех ячеек в диапазоне, которые удовлетворяют данному условию.
-AVERAGEIFS		= СРЗНАЧЕСЛИМН 				##	Возвращает среднее значение (среднее арифметическое) всех ячеек, которые удовлетворяют нескольким условиям. 
-BETADIST		= БЕТАРАСП				##	Возвращает интегральную функцию бета-распределения.
-BETAINV			= БЕТАОБР				##	Возвращает обратную интегральную функцию указанного бета-распределения.
-BINOMDIST		= БИНОМРАСП				##	Возвращает отдельное значение биномиального распределения.
-CHIDIST			= ХИ2РАСП				##	Возвращает одностороннюю вероятность распределения хи-квадрат.
-CHIINV			= ХИ2ОБР				##	Возвращает обратное значение односторонней вероятности распределения хи-квадрат.
-CHITEST			= ХИ2ТЕСТ				##	Возвращает тест на независимость.
-CONFIDENCE		= ДОВЕРИТ				##	Возвращает доверительный интервал для среднего значения по генеральной совокупности.
-CORREL			= КОРРЕЛ				##	Возвращает коэффициент корреляции между двумя множествами данных.
-COUNT			= СЧЁТ					##	Подсчитывает количество чисел в списке аргументов.
-COUNTA			= СЧЁТЗ					##	Подсчитывает количество значений в списке аргументов.
-COUNTBLANK		= СЧИТАТЬПУСТОТЫ			##	Подсчитывает количество пустых ячеек в диапазоне
-COUNTIF			= СЧЁТЕСЛИ 				##	Подсчитывает количество ячеек в диапазоне, удовлетворяющих заданному условию
-COUNTIFS		= СЧЁТЕСЛИМН				##	Подсчитывает количество ячеек внутри диапазона, удовлетворяющих нескольким условиям.
-COVAR			= КОВАР					##	Возвращает ковариацию, среднее произведений парных отклонений
-CRITBINOM		= КРИТБИНОМ				##	Возвращает наименьшее значение, для которого интегральное биномиальное распределение меньше или равно заданному критерию.
-DEVSQ			= КВАДРОТКЛ				##	Возвращает сумму квадратов отклонений.
-EXPONDIST		= ЭКСПРАСП				##	Возвращает экспоненциальное распределение.
-FDIST			= FРАСП					##	Возвращает F-распределение вероятности.
-FINV			= FРАСПОБР				##	Возвращает обратное значение для F-распределения вероятности.
-FISHER			= ФИШЕР					##	Возвращает преобразование Фишера.
-FISHERINV		= ФИШЕРОБР				##	Возвращает обратное преобразование Фишера.
-FORECAST		= ПРЕДСКАЗ				##	Возвращает значение линейного тренда.
-FREQUENCY		= ЧАСТОТА				##	Возвращает распределение частот в виде вертикального массива.
-FTEST			= ФТЕСТ					##	Возвращает результат F-теста.
-GAMMADIST		= ГАММАРАСП				##	Возвращает гамма-распределение.
-GAMMAINV		= ГАММАОБР				##	Возвращает обратное гамма-распределение.
-GAMMALN			= ГАММАНЛОГ				##	Возвращает натуральный логарифм гамма функции, Γ(x).
-GEOMEAN			= СРГЕОМ				##	Возвращает среднее геометрическое.
-GROWTH			= РОСТ					##	Возвращает значения в соответствии с экспоненциальным трендом.
-HARMEAN			= СРГАРМ				##	Возвращает среднее гармоническое.
-HYPGEOMDIST		= ГИПЕРГЕОМЕТ				##	Возвращает гипергеометрическое распределение.
-INTERCEPT		= ОТРЕЗОК				##	Возвращает отрезок, отсекаемый на оси линией линейной регрессии.
-KURT			= ЭКСЦЕСС				##	Возвращает эксцесс множества данных.
-LARGE			= НАИБОЛЬШИЙ				##	Возвращает k-ое наибольшее значение в множестве данных.
-LINEST			= ЛИНЕЙН				##	Возвращает параметры линейного тренда.
-LOGEST			= ЛГРФПРИБЛ				##	Возвращает параметры экспоненциального тренда.
-LOGINV			= ЛОГНОРМОБР				##	Возвращает обратное логарифмическое нормальное распределение.
-LOGNORMDIST		= ЛОГНОРМРАСП				##	Возвращает интегральное логарифмическое нормальное распределение.
-MAX			= МАКС					##	Возвращает наибольшее значение в списке аргументов.
-MAXA			= МАКСА					##	Возвращает наибольшее значение в списке аргументов, включая числа, текст и логические значения.
-MEDIAN			= МЕДИАНА				##	Возвращает медиану заданных чисел.
-MIN			= МИН					##	Возвращает наименьшее значение в списке аргументов.
-MINA			= МИНА					##	Возвращает наименьшее значение в списке аргументов, включая числа, текст и логические значения.
-MODE			= МОДА					##	Возвращает значение моды множества данных.
-NEGBINOMDIST		= ОТРБИНОМРАСП				##	Возвращает отрицательное биномиальное распределение.
-NORMDIST		= НОРМРАСП				##	Возвращает нормальную функцию распределения.
-NORMINV			= НОРМОБР				##	Возвращает обратное нормальное распределение.
-NORMSDIST		= НОРМСТРАСП				##	Возвращает стандартное нормальное интегральное распределение.
-NORMSINV		= НОРМСТОБР				##	Возвращает обратное значение стандартного нормального распределения.
-PEARSON			= ПИРСОН				##	Возвращает коэффициент корреляции Пирсона.
-PERCENTILE		= ПЕРСЕНТИЛЬ				##	Возвращает k-ую персентиль для значений диапазона.
-PERCENTRANK		= ПРОЦЕНТРАНГ				##	Возвращает процентную норму значения в множестве данных.
-PERMUT			= ПЕРЕСТ				##	Возвращает количество перестановок для заданного числа объектов.
-POISSON			= ПУАССОН				##	Возвращает распределение Пуассона.
-PROB			= ВЕРОЯТНОСТЬ				##	Возвращает вероятность того, что значение из диапазона находится внутри заданных пределов.
-QUARTILE		= КВАРТИЛЬ				##	Возвращает квартиль множества данных.
-RANK			= РАНГ					##	Возвращает ранг числа в списке чисел.
-RSQ			= КВПИРСОН				##	Возвращает квадрат коэффициента корреляции Пирсона.
-SKEW			= СКОС					##	Возвращает асимметрию распределения.
-SLOPE			= НАКЛОН				##	Возвращает наклон линии линейной регрессии.
-SMALL			= НАИМЕНЬШИЙ				##	Возвращает k-ое наименьшее значение в множестве данных.
-STANDARDIZE		= НОРМАЛИЗАЦИЯ				##	Возвращает нормализованное значение.
-STDEV			= СТАНДОТКЛОН				##	Оценивает стандартное отклонение по выборке.
-STDEVA			= СТАНДОТКЛОНА				##	Оценивает стандартное отклонение по выборке, включая числа, текст и логические значения.
-STDEVP			= СТАНДОТКЛОНП				##	Вычисляет стандартное отклонение по генеральной совокупности.
-STDEVPA			= СТАНДОТКЛОНПА				##	Вычисляет стандартное отклонение по генеральной совокупности, включая числа, текст и логические значения.
-STEYX			= СТОШYX				##	Возвращает стандартную ошибку предсказанных значений y для каждого значения x в регрессии.
-TDIST			= СТЬЮДРАСП				##	Возвращает t-распределение Стьюдента.
-TINV			= СТЬЮДРАСПОБР				##	Возвращает обратное t-распределение Стьюдента.
-TREND			= ТЕНДЕНЦИЯ				##	Возвращает значения в соответствии с линейным трендом.
-TRIMMEAN		= УРЕЗСРЕДНЕЕ				##	Возвращает среднее внутренности множества данных.
-TTEST			= ТТЕСТ					##	Возвращает вероятность, соответствующую критерию Стьюдента.
-VAR			= ДИСП					##	Оценивает дисперсию по выборке.
-VARA			= ДИСПА					##	Оценивает дисперсию по выборке, включая числа, текст и логические значения.
-VARP			= ДИСПР					##	Вычисляет дисперсию для генеральной совокупности.
-VARPA			= ДИСПРА				##	Вычисляет дисперсию для генеральной совокупности, включая числа, текст и логические значения.
-WEIBULL			= ВЕЙБУЛЛ				##	Возвращает распределение Вейбулла.
-ZTEST			= ZТЕСТ					##	Возвращает двустороннее P-значение z-теста.
-
-
-##
-##	Text functions						Текстовые функции
-##
-ASC			= ASC					##	Для языков с двухбайтовыми наборами знаков (например, катакана) преобразует полноширинные (двухбайтовые) знаки в полуширинные (однобайтовые).
-BAHTTEXT		= БАТТЕКСТ				##	Преобразует число в текст, используя денежный формат ß (БАТ).
-CHAR			= СИМВОЛ				##	Возвращает знак с заданным кодом.
-CLEAN			= ПЕЧСИМВ				##	Удаляет все непечатаемые знаки из текста.
-CODE			= КОДСИМВ				##	Возвращает числовой код первого знака в текстовой строке.
-CONCATENATE		= СЦЕПИТЬ				##	Объединяет несколько текстовых элементов в один.
-DOLLAR			= РУБЛЬ					##	Преобразует число в текст, используя денежный формат.
-EXACT			= СОВПАД				##	Проверяет идентичность двух текстовых значений.
-FIND			= НАЙТИ					##	Ищет вхождения одного текстового значения в другом (с учетом регистра).
-FINDB			= НАЙТИБ				##	Ищет вхождения одного текстового значения в другом (с учетом регистра).
-FIXED			= ФИКСИРОВАННЫЙ				##	Форматирует число и преобразует его в текст с заданным числом десятичных знаков.
-JIS			= JIS					##	Для языков с двухбайтовыми наборами знаков (например, катакана) преобразует полуширинные (однобайтовые) знаки в текстовой строке в полноширинные (двухбайтовые).
-LEFT			= ЛЕВСИМВ				##	Возвращает крайние слева знаки текстового значения.
-LEFTB			= ЛЕВБ					##	Возвращает крайние слева знаки текстового значения.
-LEN			= ДЛСТР					##	Возвращает количество знаков в текстовой строке.
-LENB			= ДЛИНБ					##	Возвращает количество знаков в текстовой строке.
-LOWER			= СТРОЧН				##	Преобразует все буквы текста в строчные.
-MID			= ПСТР					##	Возвращает заданное число знаков из строки текста, начиная с указанной позиции.
-MIDB			= ПСТРБ					##	Возвращает заданное число знаков из строки текста, начиная с указанной позиции.
-PHONETIC		= PHONETIC				##	Извлекает фонетические (фуригана) знаки из текстовой строки.
-PROPER			= ПРОПНАЧ				##	Преобразует первую букву в каждом слове текста в прописную.
-REPLACE			= ЗАМЕНИТЬ				##	Заменяет знаки в тексте.
-REPLACEB		= ЗАМЕНИТЬБ				##	Заменяет знаки в тексте.
-REPT			= ПОВТОР				##	Повторяет текст заданное число раз.
-RIGHT			= ПРАВСИМВ				##	Возвращает крайние справа знаки текстовой строки.
-RIGHTB			= ПРАВБ					##	Возвращает крайние справа знаки текстовой строки.
-SEARCH			= ПОИСК					##	Ищет вхождения одного текстового значения в другом (без учета регистра).
-SEARCHB			= ПОИСКБ				##	Ищет вхождения одного текстового значения в другом (без учета регистра).
-SUBSTITUTE		= ПОДСТАВИТЬ				##	Заменяет в текстовой строке старый текст новым.
-T			= Т					##	Преобразует аргументы в текст.
-TEXT			= ТЕКСТ					##	Форматирует число и преобразует его в текст.
-TRIM			= СЖПРОБЕЛЫ				##	Удаляет из текста пробелы.
-UPPER			= ПРОПИСН				##	Преобразует все буквы текста в прописные.
-VALUE			= ЗНАЧЕН				##	Преобразует текстовый аргумент в число.
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/sv/config b/plugins/exportTypes/Excel/PHPExcel/locale/sv/config
deleted file mode 100755
index f328a7619..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/sv/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= kr
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #Skärning!
-DIV0	= #Division/0!
-VALUE	= #Värdefel!
-REF	= #Referens!
-NAME	= #Namn?
-NUM	= #Ogiltigt!
-NA	= #Saknas!
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/sv/functions b/plugins/exportTypes/Excel/PHPExcel/locale/sv/functions
deleted file mode 100755
index b1dd99522..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/sv/functions
+++ /dev/null
@@ -1,408 +0,0 @@
-##
-##	Add-in and Automation functions			Tilläggs- och automatiseringsfunktioner
-##
-GETPIVOTDATA		= HÄMTA.PIVOTDATA		##	Returnerar data som lagrats i en pivottabellrapport
-
-
-##
-##	Cube functions					Kubfunktioner
-##
-CUBEKPIMEMBER		= KUBKPIMEDLEM			##	Returnerar namn, egenskap och mått för en KPI och visar namnet och egenskapen i cellen. En KPI, eller prestandaindikator, är ett kvantifierbart mått, t.ex. månatlig bruttovinst eller personalomsättning per kvartal, som används för att analysera ett företags resultat.
-CUBEMEMBER		= KUBMEDLEM			##	Returnerar en medlem eller ett par i en kubhierarki. Används för att verifiera att medlemmen eller paret finns i kuben.
-CUBEMEMBERPROPERTY	= KUBMEDLEMSEGENSKAP		##	Returnerar värdet för en medlemsegenskap i kuben. Används för att verifiera att ett medlemsnamn finns i kuben, samt för att returnera den angivna egenskapen för medlemmen.
-CUBERANKEDMEMBER	= KUBRANGORDNADMEDLEM		##	Returnerar den n:te, eller rangordnade, medlemmen i en uppsättning. Används för att returnera ett eller flera element i en uppsättning, till exempelvis den bästa försäljaren eller de tio bästa eleverna.
-CUBESET			= KUBINSTÄLLNING		##	Definierar en beräknad uppsättning medlemmar eller par genom att skicka ett bestämt uttryck till kuben på servern, som skapar uppsättningen och sedan returnerar den till Microsoft Office Excel.
-CUBESETCOUNT		= KUBINSTÄLLNINGANTAL		##	Returnerar antalet objekt i en uppsättning.
-CUBEVALUE		= KUBVÄRDE			##	Returnerar ett mängdvärde från en kub.
-
-
-##
-##	Database functions				Databasfunktioner
-##
-DAVERAGE		= DMEDEL			##	Returnerar medelvärdet av databasposterna
-DCOUNT			= DANTAL			##	Räknar antalet celler som innehåller tal i en databas
-DCOUNTA			= DANTALV			##	Räknar ifyllda celler i en databas
-DGET			= DHÄMTA			##	Hämtar en enstaka post från en databas som uppfyller de angivna villkoren
-DMAX			= DMAX				##	Returnerar det största värdet från databasposterna
-DMIN			= DMIN				##	Returnerar det minsta värdet från databasposterna
-DPRODUCT		= DPRODUKT			##	Multiplicerar värdena i ett visst fält i poster som uppfyller villkoret
-DSTDEV			= DSTDAV			##	Uppskattar standardavvikelsen baserat på ett urval av databasposterna
-DSTDEVP			= DSTDAVP			##	Beräknar standardavvikelsen utifrån hela populationen av valda databasposter
-DSUM			= DSUMMA			##	Summerar talen i kolumnfält i databasposter som uppfyller villkoret
-DVAR			= DVARIANS			##	Uppskattar variansen baserat på ett urval av databasposterna
-DVARP			= DVARIANSP			##	Beräknar variansen utifrån hela populationen av valda databasposter
-
-
-##
-##	Date and time functions				Tid- och datumfunktioner
-##
-DATE			= DATUM				##	Returnerar ett serienummer för ett visst datum
-DATEVALUE		= DATUMVÄRDE			##	Konverterar ett datum i textformat till ett serienummer
-DAY			= DAG				##	Konverterar ett serienummer till dag i månaden
-DAYS360			= DAGAR360			##	Beräknar antalet dagar mellan två datum baserat på ett 360-dagarsår
-EDATE			= EDATUM			##	Returnerar serienumret för ett datum som infaller ett visst antal månader före eller efter startdatumet
-EOMONTH			= SLUTMÅNAD			##	Returnerar serienumret för sista dagen i månaden ett visst antal månader tidigare eller senare
-HOUR			= TIMME				##	Konverterar ett serienummer till en timme
-MINUTE			= MINUT				##	Konverterar ett serienummer till en minut
-MONTH			= MÅNAD				##	Konverterar ett serienummer till en månad
-NETWORKDAYS		= NETTOARBETSDAGAR		##	Returnerar antalet hela arbetsdagar mellan två datum
-NOW			= NU				##	Returnerar serienumret för dagens datum och aktuell tid
-SECOND			= SEKUND			##	Konverterar ett serienummer till en sekund
-TIME			= KLOCKSLAG			##	Returnerar serienumret för en viss tid
-TIMEVALUE		= TIDVÄRDE			##	Konverterar en tid i textformat till ett serienummer
-TODAY			= IDAG				##	Returnerar serienumret för dagens datum
-WEEKDAY			= VECKODAG			##	Konverterar ett serienummer till en dag i veckan
-WEEKNUM			= VECKONR			##	Konverterar ett serienummer till ett veckonummer
-WORKDAY			= ARBETSDAGAR			##	Returnerar serienumret för ett datum ett visst antal arbetsdagar tidigare eller senare
-YEAR			= ÅR				##	Konverterar ett serienummer till ett år
-YEARFRAC		= ÅRDEL				##	Returnerar en del av ett år som representerar antalet hela dagar mellan start- och slutdatum
-
-
-##
-##	Engineering functions				Tekniska funktioner
-##
-BESSELI			= BESSELI			##	Returnerar den modifierade Bessel-funktionen In(x)
-BESSELJ			= BESSELJ			##	Returnerar Bessel-funktionen Jn(x)
-BESSELK			= BESSELK			##	Returnerar den modifierade Bessel-funktionen Kn(x)
-BESSELY			= BESSELY			##	Returnerar Bessel-funktionen Yn(x)
-BIN2DEC			= BIN.TILL.DEC			##	Omvandlar ett binärt tal till decimalt
-BIN2HEX			= BIN.TILL.HEX			##	Omvandlar ett binärt tal till hexadecimalt
-BIN2OCT			= BIN.TILL.OKT			##	Omvandlar ett binärt tal till oktalt
-COMPLEX			= KOMPLEX			##	Omvandlar reella och imaginära koefficienter till ett komplext tal
-CONVERT			= KONVERTERA			##	Omvandlar ett tal från ett måttsystem till ett annat
-DEC2BIN			= DEC.TILL.BIN			##	Omvandlar ett decimalt tal till binärt
-DEC2HEX			= DEC.TILL.HEX			##	Omvandlar ett decimalt tal till hexadecimalt
-DEC2OCT			= DEC.TILL.OKT			##	Omvandlar ett decimalt tal till oktalt
-DELTA			= DELTA				##	Testar om två värden är lika
-ERF			= FELF				##	Returnerar felfunktionen
-ERFC			= FELFK				##	Returnerar den komplementära felfunktionen
-GESTEP			= SLSTEG			##	Testar om ett tal är större än ett tröskelvärde
-HEX2BIN			= HEX.TILL.BIN			##	Omvandlar ett hexadecimalt tal till binärt
-HEX2DEC			= HEX.TILL.DEC			##	Omvandlar ett hexadecimalt tal till decimalt
-HEX2OCT			= HEX.TILL.OKT			##	Omvandlar ett hexadecimalt tal till oktalt
-IMABS			= IMABS				##	Returnerar absolutvärdet (modulus) för ett komplext tal
-IMAGINARY		= IMAGINÄR			##	Returnerar den imaginära koefficienten för ett komplext tal
-IMARGUMENT		= IMARGUMENT			##	Returnerar det komplexa talets argument, en vinkel uttryckt i radianer
-IMCONJUGATE		= IMKONJUGAT			##	Returnerar det komplexa talets konjugat
-IMCOS			= IMCOS				##	Returnerar cosinus för ett komplext tal
-IMDIV			= IMDIV				##	Returnerar kvoten för två komplexa tal
-IMEXP			= IMEUPPHÖJT			##	Returnerar exponenten för ett komplext tal
-IMLN			= IMLN				##	Returnerar den naturliga logaritmen för ett komplext tal
-IMLOG10			= IMLOG10			##	Returnerar 10-logaritmen för ett komplext tal
-IMLOG2			= IMLOG2			##	Returnerar 2-logaritmen för ett komplext tal
-IMPOWER			= IMUPPHÖJT			##	Returnerar ett komplext tal upphöjt till en exponent
-IMPRODUCT		= IMPRODUKT			##	Returnerar produkten av komplexa tal
-IMREAL			= IMREAL			##	Returnerar den reella koefficienten för ett komplext tal
-IMSIN			= IMSIN				##	Returnerar sinus för ett komplext tal
-IMSQRT			= IMROT				##	Returnerar kvadratroten av ett komplext tal
-IMSUB			= IMDIFF			##	Returnerar differensen mellan två komplexa tal
-IMSUM			= IMSUM				##	Returnerar summan av komplexa tal
-OCT2BIN			= OKT.TILL.BIN			##	Omvandlar ett oktalt tal till binärt
-OCT2DEC			= OKT.TILL.DEC			##	Omvandlar ett oktalt tal till decimalt
-OCT2HEX			= OKT.TILL.HEX			##	Omvandlar ett oktalt tal till hexadecimalt
-
-
-##
-##	Financial functions				Finansiella funktioner
-##
-ACCRINT			= UPPLRÄNTA			##	Returnerar den upplupna räntan för värdepapper med periodisk ränta
-ACCRINTM		= UPPLOBLRÄNTA			##	Returnerar den upplupna räntan för ett värdepapper som ger avkastning på förfallodagen
-AMORDEGRC		= AMORDEGRC			##	Returnerar avskrivningen för varje redovisningsperiod med hjälp av en avskrivningskoefficient
-AMORLINC		= AMORLINC			##	Returnerar avskrivningen för varje redovisningsperiod
-COUPDAYBS		= KUPDAGBB			##	Returnerar antal dagar från början av kupongperioden till likviddagen
-COUPDAYS		= KUPDAGARS			##	Returnerar antalet dagar i kupongperioden som innehåller betalningsdatumet
-COUPDAYSNC		= KUPDAGNK			##	Returnerar antalet dagar från betalningsdatumet till nästa kupongdatum
-COUPNCD			= KUPNKD			##	Returnerar nästa kupongdatum efter likviddagen
-COUPNUM			= KUPANT			##	Returnerar kuponger som förfaller till betalning mellan likviddagen och förfallodagen
-COUPPCD			= KUPFKD			##	Returnerar föregående kupongdatum före likviddagen
-CUMIPMT			= KUMRÄNTA			##	Returnerar den ackumulerade räntan som betalats mellan två perioder
-CUMPRINC		= KUMPRIS			##	Returnerar det ackumulerade kapitalbeloppet som betalats på ett lån mellan två perioder
-DB			= DB				##	Returnerar avskrivningen för en tillgång under en angiven tid enligt metoden för fast degressiv avskrivning
-DDB			= DEGAVSKR			##	Returnerar en tillgångs värdeminskning under en viss period med hjälp av dubbel degressiv avskrivning eller någon annan metod som du anger
-DISC			= DISK				##	Returnerar diskonteringsräntan för ett värdepapper
-DOLLARDE		= DECTAL			##	Omvandlar ett pris uttryckt som ett bråk till ett decimaltal
-DOLLARFR		= BRÅK				##	Omvandlar ett pris i kronor uttryckt som ett decimaltal till ett bråk
-DURATION		= LÖPTID			##	Returnerar den årliga löptiden för en säkerhet med periodiska räntebetalningar
-EFFECT			= EFFRÄNTA			##	Returnerar den årliga effektiva räntesatsen
-FV			= SLUTVÄRDE			##	Returnerar det framtida värdet på en investering
-FVSCHEDULE		= FÖRRÄNTNING			##	Returnerar det framtida värdet av ett begynnelsekapital beräknat på olika räntenivåer
-INTRATE			= ÅRSRÄNTA			##	Returnerar räntesatsen för ett betalt värdepapper
-IPMT			= RBETALNING			##	Returnerar räntedelen av en betalning för en given period
-IRR			= IR				##	Returnerar internräntan för en serie betalningar
-ISPMT			= RALÅN				##	Beräknar räntan som har betalats under en specifik betalningsperiod
-MDURATION		= MLÖPTID			##	Returnerar den modifierade Macauley-löptiden för ett värdepapper med det antagna nominella värdet 100 kr
-MIRR			= MODIR				##	Returnerar internräntan där positiva och negativa betalningar finansieras med olika räntor
-NOMINAL			= NOMRÄNTA			##	Returnerar den årliga nominella räntesatsen
-NPER			= PERIODER			##	Returnerar antalet perioder för en investering
-NPV			= NETNUVÄRDE			##	Returnerar nuvärdet av en serie periodiska betalningar vid en given diskonteringsränta
-ODDFPRICE		= UDDAFPRIS			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper med en udda första period
-ODDFYIELD		= UDDAFAVKASTNING		##	Returnerar avkastningen för en säkerhet med en udda första period
-ODDLPRICE		= UDDASPRIS			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper med en udda sista period
-ODDLYIELD		= UDDASAVKASTNING		##	Returnerar avkastningen för en säkerhet med en udda sista period
-PMT			= BETALNING			##	Returnerar den periodiska betalningen för en annuitet
-PPMT			= AMORT				##	Returnerar amorteringsdelen av en annuitetsbetalning för en given period
-PRICE			= PRIS				##	Returnerar priset per 100 kr nominellt värde för ett värdepapper som ger periodisk ränta
-PRICEDISC		= PRISDISK			##	Returnerar priset per 100 kr nominellt värde för ett diskonterat värdepapper
-PRICEMAT		= PRISFÖRF			##	Returnerar priset per 100 kr nominellt värde för ett värdepapper som ger ränta på förfallodagen
-PV			= PV				##	Returnerar nuvärdet av en serie lika stora periodiska betalningar
-RATE			= RÄNTA				##	Returnerar räntesatsen per period i en annuitet
-RECEIVED		= BELOPP			##	Returnerar beloppet som utdelas på förfallodagen för ett betalat värdepapper
-SLN			= LINAVSKR			##	Returnerar den linjära avskrivningen för en tillgång under en period
-SYD			= ÅRSAVSKR			##	Returnerar den årliga avskrivningssumman för en tillgång under en angiven period
-TBILLEQ			= SSVXEKV			##	Returnerar avkastningen motsvarande en obligation för en statsskuldväxel
-TBILLPRICE		= SSVXPRIS			##	Returnerar priset per 100 kr nominellt värde för en statsskuldväxel
-TBILLYIELD		= SSVXRÄNTA			##	Returnerar avkastningen för en statsskuldväxel
-VDB			= VDEGRAVSKR			##	Returnerar avskrivningen för en tillgång under en angiven period (med degressiv avskrivning)
-XIRR			= XIRR				##	Returnerar internräntan för en serie betalningar som inte nödvändigtvis är periodiska
-XNPV			= XNUVÄRDE			##	Returnerar det nuvarande nettovärdet för en serie betalningar som inte nödvändigtvis är periodiska
-YIELD			= NOMAVK			##	Returnerar avkastningen för ett värdepapper som ger periodisk ränta
-YIELDDISC		= NOMAVKDISK			##	Returnerar den årliga avkastningen för diskonterade värdepapper, exempelvis en statsskuldväxel
-YIELDMAT		= NOMAVKFÖRF			##	Returnerar den årliga avkastningen för ett värdepapper som ger ränta på förfallodagen
-
-
-##
-##	Information functions				Informationsfunktioner
-##
-CELL			= CELL				##	Returnerar information om formatering, plats och innehåll i en cell
-ERROR.TYPE		= FEL.TYP			##	Returnerar ett tal som motsvarar ett felvärde
-INFO			= INFO				##	Returnerar information om operativsystemet
-ISBLANK			= ÄRREF				##	Returnerar SANT om värdet är tomt
-ISERR			= Ä				##	Returnerar SANT om värdet är ett felvärde annat än #SAKNAS!
-ISERROR			= ÄRFEL				##	Returnerar SANT om värdet är ett felvärde
-ISEVEN			= ÄRJÄMN			##	Returnerar SANT om talet är jämnt
-ISLOGICAL		= ÄREJTEXT			##	Returnerar SANT om värdet är ett logiskt värde
-ISNA			= ÄRLOGISK			##	Returnerar SANT om värdet är felvärdet #SAKNAS!
-ISNONTEXT		= ÄRSAKNAD			##	Returnerar SANT om värdet inte är text
-ISNUMBER		= ÄRTAL				##	Returnerar SANT om värdet är ett tal
-ISODD			= ÄRUDDA			##	Returnerar SANT om talet är udda
-ISREF			= ÄRTOM				##	Returnerar SANT om värdet är en referens
-ISTEXT			= ÄRTEXT			##	Returnerar SANT om värdet är text
-N			= N				##	Returnerar ett värde omvandlat till ett tal
-NA			= SAKNAS			##	Returnerar felvärdet #SAKNAS!
-TYPE			= VÄRDETYP			##	Returnerar ett tal som anger värdets datatyp
-
-
-##
-##	Logical functions				Logiska funktioner
-##
-AND			= OCH				##	Returnerar SANT om alla argument är sanna
-FALSE			= FALSKT			##	Returnerar det logiska värdet FALSKT
-IF			= OM				##	Anger vilket logiskt test som ska utföras
-IFERROR			= OMFEL				##	Returnerar ett värde som du anger om en formel utvärderar till ett fel; annars returneras resultatet av formeln
-NOT			= ICKE				##	Inverterar logiken för argumenten
-OR			= ELLER				##	Returnerar SANT om något argument är SANT
-TRUE			= SANT				##	Returnerar det logiska värdet SANT
-
-
-##
-##	Lookup and reference functions			Sök- och referensfunktioner
-##
-ADDRESS			= ADRESS			##	Returnerar en referens som text till en enstaka cell i ett kalkylblad
-AREAS			= OMRÅDEN			##	Returnerar antalet områden i en referens
-CHOOSE			= VÄLJ				##	Väljer ett värde i en lista över värden
-COLUMN			= KOLUMN			##	Returnerar kolumnnumret för en referens
-COLUMNS			= KOLUMNER			##	Returnerar antalet kolumner i en referens
-HLOOKUP			= LETAKOLUMN			##	Söker i den översta raden i en matris och returnerar värdet för angiven cell
-HYPERLINK		= HYPERLÄNK			##	Skapar en genväg eller ett hopp till ett dokument i nätverket, i ett intranät eller på Internet
-INDEX			= INDEX				##	Använder ett index för ett välja ett värde i en referens eller matris
-INDIRECT		= INDIREKT			##	Returnerar en referens som anges av ett textvärde
-LOOKUP			= LETAUPP			##	Letar upp värden i en vektor eller matris
-MATCH			= PASSA				##	Letar upp värden i en referens eller matris
-OFFSET			= FÖRSKJUTNING			##	Returnerar en referens förskjuten i förhållande till en given referens
-ROW			= RAD				##	Returnerar radnumret för en referens
-ROWS			= RADER				##	Returnerar antalet rader i en referens
-RTD			= RTD				##	Hämtar realtidsdata från ett program som stöder COM-automation (Automation: Ett sätt att arbeta med ett programs objekt från ett annat program eller utvecklingsverktyg. Detta kallades tidigare för OLE Automation, och är en branschstandard och ingår i Component Object Model (COM).)
-TRANSPOSE		= TRANSPONERA			##	Transponerar en matris
-VLOOKUP			= LETARAD			##	Letar i den första kolumnen i en matris och flyttar över raden för att returnera värdet för en cell
-
-
-##
-##	Math and trigonometry functions			Matematiska och trigonometriska funktioner
-##
-ABS			= ABS				##	Returnerar absolutvärdet av ett tal
-ACOS			= ARCCOS			##	Returnerar arcus cosinus för ett tal
-ACOSH			= ARCCOSH			##	Returnerar inverterad hyperbolisk cosinus för ett tal
-ASIN			= ARCSIN			##	Returnerar arcus cosinus för ett tal
-ASINH			= ARCSINH			##	Returnerar hyperbolisk arcus sinus för ett tal
-ATAN			= ARCTAN			##	Returnerar arcus tangens för ett tal
-ATAN2			= ARCTAN2			##	Returnerar arcus tangens för en x- och en y- koordinat
-ATANH			= ARCTANH			##	Returnerar hyperbolisk arcus tangens för ett tal
-CEILING			= RUNDA.UPP			##	Avrundar ett tal till närmaste heltal eller närmaste signifikanta multipel
-COMBIN			= KOMBIN			##	Returnerar antalet kombinationer för ett givet antal objekt
-COS			= COS				##	Returnerar cosinus för ett tal
-COSH			= COSH				##	Returnerar hyperboliskt cosinus för ett tal
-DEGREES			= GRADER			##	Omvandlar radianer till grader
-EVEN			= JÄMN				##	Avrundar ett tal uppåt till närmaste heltal
-EXP			= EXP				##	Returnerar e upphöjt till ett givet tal
-FACT			= FAKULTET			##	Returnerar fakulteten för ett tal
-FACTDOUBLE		= DUBBELFAKULTET		##	Returnerar dubbelfakulteten för ett tal
-FLOOR			= RUNDA.NED			##	Avrundar ett tal nedåt mot noll
-GCD			= SGD				##	Returnerar den största gemensamma nämnaren
-INT			= HELTAL			##	Avrundar ett tal nedåt till närmaste heltal
-LCM			= MGM				##	Returnerar den minsta gemensamma multipeln
-LN			= LN				##	Returnerar den naturliga logaritmen för ett tal
-LOG			= LOG				##	Returnerar logaritmen för ett tal för en given bas
-LOG10			= LOG10				##	Returnerar 10-logaritmen för ett tal
-MDETERM			= MDETERM			##	Returnerar matrisen som är avgörandet av en matris
-MINVERSE		= MINVERT			##	Returnerar matrisinversen av en matris
-MMULT			= MMULT				##	Returnerar matrisprodukten av två matriser
-MOD			= REST				##	Returnerar resten vid en division
-MROUND			= MAVRUNDA			##	Returnerar ett tal avrundat till en given multipel
-MULTINOMIAL		= MULTINOMIAL			##	Returnerar multinomialen för en uppsättning tal
-ODD			= UDDA				##	Avrundar ett tal uppåt till närmaste udda heltal
-PI			= PI				##	Returnerar värdet pi
-POWER			= UPPHÖJT.TILL			##	Returnerar resultatet av ett tal upphöjt till en exponent
-PRODUCT			= PRODUKT			##	Multiplicerar argumenten
-QUOTIENT		= KVOT				##	Returnerar heltalsdelen av en division
-RADIANS			= RADIANER			##	Omvandlar grader till radianer
-RAND			= SLUMP				##	Returnerar ett slumptal mellan 0 och 1
-RANDBETWEEN		= SLUMP.MELLAN			##	Returnerar ett slumptal mellan de tal som du anger
-ROMAN			= ROMERSK			##	Omvandlar vanliga (arabiska) siffror till romerska som text
-ROUND			= AVRUNDA			##	Avrundar ett tal till ett angivet antal siffror
-ROUNDDOWN		= AVRUNDA.NEDÅT			##	Avrundar ett tal nedåt mot noll
-ROUNDUP			= AVRUNDA.UPPÅT			##	Avrundar ett tal uppåt, från noll
-SERIESSUM		= SERIESUMMA			##	Returnerar summan av en potensserie baserat på formeln
-SIGN			= TECKEN			##	Returnerar tecknet för ett tal
-SIN			= SIN				##	Returnerar sinus för en given vinkel
-SINH			= SINH				##	Returnerar hyperbolisk sinus för ett tal
-SQRT			= ROT				##	Returnerar den positiva kvadratroten
-SQRTPI			= ROTPI				##	Returnerar kvadratroten för (tal * pi)
-SUBTOTAL		= DELSUMMA			##	Returnerar en delsumma i en lista eller databas
-SUM			= SUMMA				##	Summerar argumenten
-SUMIF			= SUMMA.OM			##	Summerar celler enligt ett angivet villkor
-SUMIFS			= SUMMA.OMF			##	Lägger till cellerna i ett område som uppfyller flera kriterier
-SUMPRODUCT		= PRODUKTSUMMA			##	Returnerar summan av produkterna i motsvarande matriskomponenter
-SUMSQ			= KVADRATSUMMA			##	Returnerar summan av argumentens kvadrater
-SUMX2MY2		= SUMMAX2MY2			##	Returnerar summan av differensen mellan kvadraterna för motsvarande värden i två matriser
-SUMX2PY2		= SUMMAX2PY2			##	Returnerar summan av summan av kvadraterna av motsvarande värden i två matriser
-SUMXMY2			= SUMMAXMY2			##	Returnerar summan av kvadraten av skillnaden mellan motsvarande värden i två matriser
-TAN			= TAN				##	Returnerar tangens för ett tal
-TANH			= TANH				##	Returnerar hyperbolisk tangens för ett tal
-TRUNC			= AVKORTA			##	Avkortar ett tal till ett heltal
-
-
-##
-##	Statistical functions				Statistiska funktioner
-##
-AVEDEV			= MEDELAVV			##	Returnerar medelvärdet för datapunkters absoluta avvikelse från deras medelvärde
-AVERAGE			= MEDEL				##	Returnerar medelvärdet av argumenten
-AVERAGEA		= AVERAGEA			##	Returnerar medelvärdet av argumenten, inklusive tal, text och logiska värden
-AVERAGEIF		= MEDELOM			##	Returnerar medelvärdet (aritmetiskt medelvärde) för alla celler i ett område som uppfyller ett givet kriterium
-AVERAGEIFS		= MEDELOMF			##	Returnerar medelvärdet (det aritmetiska medelvärdet) för alla celler som uppfyller flera villkor.
-BETADIST		= BETAFÖRD			##	Returnerar den kumulativa betafördelningsfunktionen
-BETAINV			= BETAINV			##	Returnerar inversen till den kumulativa fördelningsfunktionen för en viss betafördelning
-BINOMDIST		= BINOMFÖRD			##	Returnerar den individuella binomialfördelningen
-CHIDIST			= CHI2FÖRD			##	Returnerar den ensidiga sannolikheten av c2-fördelningen
-CHIINV			= CHI2INV			##	Returnerar inversen av chi2-fördelningen
-CHITEST			= CHI2TEST			##	Returnerar oberoendetesten
-CONFIDENCE		= KONFIDENS			##	Returnerar konfidensintervallet för en populations medelvärde
-CORREL			= KORREL			##	Returnerar korrelationskoefficienten mellan två datamängder
-COUNT			= ANTAL				##	Räknar hur många tal som finns bland argumenten
-COUNTA			= ANTALV			##	Räknar hur många värden som finns bland argumenten
-COUNTBLANK		= ANTAL.TOMMA			##	Räknar antalet tomma celler i ett område
-COUNTIF			= ANTAL.OM			##	Räknar antalet celler i ett område som uppfyller angivna villkor.
-COUNTIFS		= ANTAL.OMF			##	Räknar antalet celler i ett område som uppfyller flera villkor.
-COVAR			= KOVAR				##	Returnerar kovariansen, d.v.s. medelvärdet av produkterna för parade avvikelser
-CRITBINOM		= KRITBINOM			##	Returnerar det minsta värdet för vilket den kumulativa binomialfördelningen är mindre än eller lika med ett villkorsvärde
-DEVSQ			= KVADAVV			##	Returnerar summan av kvadrater på avvikelser
-EXPONDIST		= EXPONFÖRD			##	Returnerar exponentialfördelningen
-FDIST			= FFÖRD				##	Returnerar F-sannolikhetsfördelningen
-FINV			= FINV				##	Returnerar inversen till F-sannolikhetsfördelningen
-FISHER			= FISHER			##	Returnerar Fisher-transformationen
-FISHERINV		= FISHERINV			##	Returnerar inversen till Fisher-transformationen
-FORECAST		= PREDIKTION			##	Returnerar ett värde längs en linjär trendlinje
-FREQUENCY		= FREKVENS			##	Returnerar en frekvensfördelning som en lodrät matris
-FTEST			= FTEST				##	Returnerar resultatet av en F-test
-GAMMADIST		= GAMMAFÖRD			##	Returnerar gammafördelningen
-GAMMAINV		= GAMMAINV			##	Returnerar inversen till den kumulativa gammafördelningen
-GAMMALN			= GAMMALN			##	Returnerar den naturliga logaritmen för gammafunktionen, G(x)
-GEOMEAN			= GEOMEDEL			##	Returnerar det geometriska medelvärdet
-GROWTH			= EXPTREND			##	Returnerar värden längs en exponentiell trend
-HARMEAN			= HARMMEDEL			##	Returnerar det harmoniska medelvärdet
-HYPGEOMDIST		= HYPGEOMFÖRD			##	Returnerar den hypergeometriska fördelningen
-INTERCEPT		= SKÄRNINGSPUNKT		##	Returnerar skärningspunkten för en linjär regressionslinje
-KURT			= TOPPIGHET			##	Returnerar toppigheten av en mängd data
-LARGE			= STÖRSTA			##	Returnerar det n:te största värdet i en mängd data
-LINEST			= REGR				##	Returnerar parametrar till en linjär trendlinje
-LOGEST			= EXPREGR			##	Returnerar parametrarna i en exponentiell trend
-LOGINV			= LOGINV			##	Returnerar inversen till den lognormala fördelningen
-LOGNORMDIST		= LOGNORMFÖRD			##	Returnerar den kumulativa lognormala fördelningen
-MAX			= MAX				##	Returnerar det största värdet i en lista av argument
-MAXA			= MAXA				##	Returnerar det största värdet i en lista av argument, inklusive tal, text och logiska värden
-MEDIAN			= MEDIAN			##	Returnerar medianen för angivna tal
-MIN			= MIN				##	Returnerar det minsta värdet i en lista med argument
-MINA			= MINA				##	Returnerar det minsta värdet i en lista över argument, inklusive tal, text och logiska värden
-MODE			= TYPVÄRDE			##	Returnerar det vanligaste värdet i en datamängd
-NEGBINOMDIST		= NEGBINOMFÖRD			##	Returnerar den negativa binomialfördelningen
-NORMDIST		= NORMFÖRD			##	Returnerar den kumulativa normalfördelningen
-NORMINV			= NORMINV			##	Returnerar inversen till den kumulativa normalfördelningen
-NORMSDIST		= NORMSFÖRD			##	Returnerar den kumulativa standardnormalfördelningen
-NORMSINV		= NORMSINV			##	Returnerar inversen till den kumulativa standardnormalfördelningen
-PEARSON			= PEARSON			##	Returnerar korrelationskoefficienten till Pearsons momentprodukt
-PERCENTILE		= PERCENTIL			##	Returnerar den n:te percentilen av värden i ett område
-PERCENTRANK		= PROCENTRANG			##	Returnerar procentrangen för ett värde i en datamängd
-PERMUT			= PERMUT			##	Returnerar antal permutationer för ett givet antal objekt
-POISSON			= POISSON			##	Returnerar Poisson-fördelningen
-PROB			= SANNOLIKHET			##	Returnerar sannolikheten att värden i ett område ligger mellan två gränser
-QUARTILE		= KVARTIL			##	Returnerar kvartilen av en mängd data
-RANK			= RANG				##	Returnerar rangordningen för ett tal i en lista med tal
-RSQ			= RKV				##	Returnerar kvadraten av Pearsons produktmomentkorrelationskoefficient
-SKEW			= SNEDHET			##	Returnerar snedheten för en fördelning
-SLOPE			= LUTNING			##	Returnerar lutningen på en linjär regressionslinje
-SMALL			= MINSTA			##	Returnerar det n:te minsta värdet i en mängd data
-STANDARDIZE		= STANDARDISERA			##	Returnerar ett normaliserat värde
-STDEV			= STDAV				##	Uppskattar standardavvikelsen baserat på ett urval
-STDEVA			= STDEVA			##	Uppskattar standardavvikelsen baserat på ett urval, inklusive tal, text och logiska värden
-STDEVP			= STDAVP			##	Beräknar standardavvikelsen baserat på hela populationen
-STDEVPA			= STDEVPA			##	Beräknar standardavvikelsen baserat på hela populationen, inklusive tal, text och logiska värden
-STEYX			= STDFELYX			##	Returnerar standardfelet för ett förutspått y-värde för varje x-värde i regressionen
-TDIST			= TFÖRD				##	Returnerar Students t-fördelning
-TINV			= TINV				##	Returnerar inversen till Students t-fördelning
-TREND			= TREND				##	Returnerar värden längs en linjär trend
-TRIMMEAN		= TRIMMEDEL			##	Returnerar medelvärdet av mittpunkterna i en datamängd
-TTEST			= TTEST				##	Returnerar sannolikheten beräknad ur Students t-test
-VAR			= VARIANS			##	Uppskattar variansen baserat på ett urval
-VARA			= VARA				##	Uppskattar variansen baserat på ett urval, inklusive tal, text och logiska värden
-VARP			= VARIANSP			##	Beräknar variansen baserat på hela populationen
-VARPA			= VARPA				##	Beräknar variansen baserat på hela populationen, inklusive tal, text och logiska värden
-WEIBULL			= WEIBULL			##	Returnerar Weibull-fördelningen
-ZTEST			= ZTEST				##	Returnerar det ensidiga sannolikhetsvärdet av ett z-test
-
-
-##
-##	Text functions					Textfunktioner
-##
-ASC			= ASC				##	Ändrar helbredds (dubbel byte) engelska bokstäver eller katakana inom en teckensträng till tecken med halvt breddsteg (enkel byte)
-BAHTTEXT		= BAHTTEXT			##	Omvandlar ett tal till text med valutaformatet ß (baht)
-CHAR			= TECKENKOD			##	Returnerar tecknet som anges av kod
-CLEAN			= STÄDA				##	Tar bort alla icke utskrivbara tecken i en text
-CODE			= KOD				##	Returnerar en numerisk kod för det första tecknet i en textsträng
-CONCATENATE		= SAMMANFOGA			##	Sammanfogar flera textdelar till en textsträng
-DOLLAR			= VALUTA			##	Omvandlar ett tal till text med valutaformat
-EXACT			= EXAKT				##	Kontrollerar om två textvärden är identiska
-FIND			= HITTA				##	Hittar en text i en annan (skiljer på gemener och versaler)
-FINDB			= HITTAB			##	Hittar en text i en annan (skiljer på gemener och versaler)
-FIXED			= FASTTAL			##	Formaterar ett tal som text med ett fast antal decimaler
-JIS			= JIS				##	Ändrar halvbredds (enkel byte) engelska bokstäver eller katakana inom en teckensträng till tecken med helt breddsteg (dubbel byte)
-LEFT			= VÄNSTER			##	Returnerar tecken längst till vänster i en sträng
-LEFTB			= VÄNSTERB			##	Returnerar tecken längst till vänster i en sträng
-LEN			= LÄNGD				##	Returnerar antalet tecken i en textsträng
-LENB			= LÄNGDB			##	Returnerar antalet tecken i en textsträng
-LOWER			= GEMENER			##	Omvandlar text till gemener
-MID			= EXTEXT			##	Returnerar angivet antal tecken från en text med början vid den position som du anger
-MIDB			= EXTEXTB			##	Returnerar angivet antal tecken från en text med början vid den position som du anger
-PHONETIC		= PHONETIC			##	Returnerar de fonetiska (furigana) tecknen i en textsträng
-PROPER			= INITIAL			##	Ändrar första bokstaven i varje ord i ett textvärde till versal
-REPLACE			= ERSÄTT			##	Ersätter tecken i text
-REPLACEB		= ERSÄTTB			##	Ersätter tecken i text
-REPT			= REP				##	Upprepar en text ett bestämt antal gånger
-RIGHT			= HÖGER				##	Returnerar tecken längst till höger i en sträng
-RIGHTB			= HÖGERB			##	Returnerar tecken längst till höger i en sträng
-SEARCH			= SÖK				##	Hittar ett textvärde i ett annat (skiljer inte på gemener och versaler)
-SEARCHB			= SÖKB				##	Hittar ett textvärde i ett annat (skiljer inte på gemener och versaler)
-SUBSTITUTE		= BYT.UT			##	Ersätter gammal text med ny text i en textsträng
-T			= T				##	Omvandlar argumenten till text
-TEXT			= TEXT				##	Formaterar ett tal och omvandlar det till text
-TRIM			= RENSA				##	Tar bort blanksteg från text
-UPPER			= VERSALER			##	Omvandlar text till versaler
-VALUE			= TEXTNUM			##	Omvandlar ett textargument till ett tal
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/tr/config b/plugins/exportTypes/Excel/PHPExcel/locale/tr/config
deleted file mode 100755
index eaeb8542f..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/tr/config
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Settings
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-##
-
-
-ArgumentSeparator	= ;
-
-
-##
-##	(For future use)
-##
-currencySymbol	= YTL
-
-
-##
-##	Excel Error Codes	(For future use)

-##
-NULL	= #BOŞ!
-DIV0	= #SAYI/0!
-VALUE	= #DEĞER!
-REF	= #BAŞV!
-NAME	= #AD?
-NUM	= #SAYI!
-NA	= #YOK
diff --git a/plugins/exportTypes/Excel/PHPExcel/locale/tr/functions b/plugins/exportTypes/Excel/PHPExcel/locale/tr/functions
deleted file mode 100755
index 97f3f4d2d..000000000
--- a/plugins/exportTypes/Excel/PHPExcel/locale/tr/functions
+++ /dev/null
@@ -1,438 +0,0 @@
-##
-## PHPExcel
-##

-## Copyright (c) 2006 - 2011 PHPExcel
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## @category   PHPExcel
-## @package    PHPExcel_Calculation
-## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
-## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    ##VERSION##, ##DATE##
-##
-## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
-##
-##
-
-
-##
-##	Add-in and Automation functions			Eklenti ve Otomasyon fonksiyonları
-##
-GETPIVOTDATA		= ÖZETVERİAL	##	Bir Özet Tablo raporunda saklanan verileri verir.
-
-
-##
-##	Cube functions					Küp işlevleri
-##
-CUBEKPIMEMBER		= KÜPKPIÜYE			##	Kilit performans göstergesi (KPI-Key Performance Indicator) adını, özelliğini ve ölçüsünü verir ve hücredeki ad ve özelliği gösterir. KPI, bir kurumun performansını izlemek için kullanılan aylık brüt kâr ya da üç aylık çalışan giriş çıkışları gibi ölçülebilen bir birimdir.
-CUBEMEMBER			= KÜPÜYE			##	Bir küp hiyerarşisinde bir üyeyi veya kaydı verir. Üye veya kaydın küpte varolduğunu doğrulamak için kullanılır.
-CUBEMEMBERPROPERTY	= KÜPÜYEÖZELLİĞİ	##	Bir küpte bir üyenin özelliğinin değerini verir. Küp içinde üye adının varlığını doğrulamak ve bu üyenin belli özelliklerini getirmek için kullanılır.
-CUBERANKEDMEMBER	= KÜPÜYESIRASI 		##	Bir küme içindeki üyenin derecesini veya kaçıncı olduğunu verir. En iyi satış elemanı, veya en iyi on öğrenci gibi bir kümedeki bir veya daha fazla öğeyi getirmek için kullanılır.
-CUBESET				= KÜPKÜME			##	Kümeyi oluşturan ve ardından bu kümeyi Microsoft Office Excel'e getiren sunucudaki küpe küme ifadelerini göndererek hesaplanan üye veya kayıt kümesini tanımlar.
-CUBESETCOUNT		= KÜPKÜMESAY		##	Bir kümedeki öğelerin sayısını getirir.
-CUBEVALUE			= KÜPDEĞER 			##	Bir küpten toplam değeri getirir.
-
-
-##
-##	Database functions				Veritabanı işlevleri
-##
-DAVERAGE		= VSEÇORT			##	Seçili veritabanı girdilerinin ortalamasını verir.
-DCOUNT			= VSEÇSAY			##	Veritabanında sayı içeren hücre sayısını hesaplar.
-DCOUNTA			= VSEÇSAYDOLU		##	Veritabanındaki boş olmayan hücreleri sayar.
-DGET			= VAL				##	Veritabanından, belirtilen ölçütlerle eşleşen tek bir rapor çıkarır.
-DMAX			= VSEÇMAK			##	Seçili veritabanı girişlerinin en yüksek değerini verir.
-DMIN			= VSEÇMİN			##	Seçili veritabanı girişlerinin en düşük değerini verir.
-DPRODUCT		= VSEÇÇARP			##	Kayıtların belli bir alanında bulunan, bir veritabanındaki ölçütlerle eşleşen değerleri çarpar.
-DSTDEV			= VSEÇSTDSAPMA		##	Seçili veritabanı girişlerinden oluşan bir örneğe dayanarak, standart sapmayı tahmin eder.
-DSTDEVP			= VSEÇSTDSAPMAS		##	Standart sapmayı, seçili veritabanı girişlerinin tüm popülasyonunu esas alarak hesaplar.
-DSUM			= VSEÇTOPLA			##	Kayıtların alan sütununda bulunan, ölçütle eşleşen sayıları toplar.
-DVAR			= VSEÇVAR			##	Seçili veritabanı girişlerinden oluşan bir örneği esas alarak farkı tahmin eder.
-DVARP			= VSEÇVARS			##	Seçili veritabanı girişlerinin tüm popülasyonunu esas alarak farkı hesaplar.
-
-
-##
-##	Date and time functions				Tarih ve saat işlevleri
-##
-DATE			= TARİH				##	Belirli bir tarihin seri numarasını verir.
-DATEVALUE		= TARİHSAYISI		##	Metin biçimindeki bir tarihi seri numarasına dönüştürür.
-DAY				= GÜN				##	Seri numarasını, ayın bir gününe dönüştürür.
-DAYS360			= GÜN360			##	İki tarih arasındaki gün sayısını, 360 günlük yılı esas alarak hesaplar.
-EDATE			= SERİTARİH			##	Başlangıç tarihinden itibaren, belirtilen ay sayısından önce veya sonraki tarihin seri numarasını verir.
-EOMONTH			= SERİAY			##	Belirtilen sayıda ay önce veya sonraki ayın son gününün seri numarasını verir.
-HOUR			= SAAT				##	Bir seri numarasını saate dönüştürür.
-MINUTE			= DAKİKA			##	Bir seri numarasını dakikaya dönüştürür.
-MONTH			= AY				##	Bir seri numarasını aya dönüştürür.
-NETWORKDAYS		= TAMİŞGÜNÜ			##	İki tarih arasındaki tam çalışma günlerinin sayısını verir.
-NOW				= ŞİMDİ				##	Geçerli tarihin ve saatin seri numarasını verir.
-SECOND			= SANİYE			##	Bir seri numarasını saniyeye dönüştürür.
-TIME			= ZAMAN				##	Belirli bir zamanın seri numarasını verir.
-TIMEVALUE		= ZAMANSAYISI		##	Metin biçimindeki zamanı seri numarasına dönüştürür.
-TODAY			= BUGÜN				##	Bugünün tarihini seri numarasına dönüştürür.
-WEEKDAY			= HAFTANINGÜNÜ		##	Bir seri numarasını, haftanın gününe dönüştürür.
-WEEKNUM			= HAFTASAY			##	Dizisel değerini, haftanın yıl içinde bulunduğu konumu sayısal olarak gösteren sayıya dönüştürür.
-WORKDAY			= İŞGÜNÜ			##	Belirtilen sayıda çalışma günü öncesinin ya da sonrasının tarihinin seri numarasını verir.
-YEAR			= YIL				##	Bir seri numarasını yıla dönüştürür.
-YEARFRAC		= YILORAN			##	Başlangıç_tarihi ve bitiş_tarihi arasındaki tam günleri gösteren yıl kesrini verir.
-
-
-##
-##	Engineering functions				Mühendislik işlevleri
-##
-BESSELI			= BESSELI			##	Değiştirilmiş Bessel fonksiyonu In(x)'i verir.
-BESSELJ			= BESSELJ			##	Bessel fonksiyonu Jn(x)'i verir.
-BESSELK			= BESSELK			##	Değiştirilmiş Bessel fonksiyonu Kn(x)'i verir.
-BESSELY			= BESSELY			##	Bessel fonksiyonu Yn(x)'i verir.
-BIN2DEC			= BIN2DEC			##	İkili bir sayıyı, ondalık sayıya dönüştürür.
-BIN2HEX			= BIN2HEX			##	İkili bir sayıyı, onaltılıya dönüştürür.
-BIN2OCT			= BIN2OCT			##	İkili bir sayıyı, sekizliye dönüştürür.
-COMPLEX			= KARMAŞIK			##	Gerçek ve sanal katsayıları, karmaşık sayıya dönüştürür.
-CONVERT			= ÇEVİR				##	Bir sayıyı, bir ölçüm sisteminden bir başka ölçüm sistemine dönüştürür.
-DEC2BIN			= DEC2BIN			##	Ondalık bir sayıyı, ikiliye dönüştürür.
-DEC2HEX			= DEC2HEX			##	Ondalık bir sayıyı, onaltılıya dönüştürür.
-DEC2OCT			= DEC2OCT			##	Ondalık bir sayıyı sekizliğe dönüştürür.
-DELTA			= DELTA				##	İki değerin eşit olup olmadığını sınar.
-ERF				= HATAİŞLEV			##	Hata işlevini verir.
-ERFC			= TÜMHATAİŞLEV		##	Tümleyici hata işlevini verir.
-GESTEP			= BESINIR			##	Bir sayının eşik değerinden büyük olup olmadığını sınar.
-HEX2BIN			= HEX2BIN			##	Onaltılı bir sayıyı ikiliye dönüştürür.
-HEX2DEC			= HEX2DEC			##	Onaltılı bir sayıyı ondalığa dönüştürür.
-HEX2OCT			= HEX2OCT			##	Onaltılı bir sayıyı sekizliğe dönüştürür.
-IMABS			= SANMUTLAK			##	Karmaşık bir sayının mutlak değerini (modül) verir.
-IMAGINARY		= SANAL				##	Karmaşık bir sayının sanal katsayısını verir.
-IMARGUMENT		= SANBAĞ_DEĞİŞKEN	##	Radyanlarla belirtilen bir açı olan teta bağımsız değişkenini verir.
-IMCONJUGATE		= SANEŞLENEK		##	Karmaşık bir sayının karmaşık eşleniğini verir.
-IMCOS			= SANCOS			##	Karmaşık bir sayının kosinüsünü verir.
-IMDIV			= SANBÖL			##	İki karmaşık sayının bölümünü verir.
-IMEXP			= SANÜS				##	Karmaşık bir sayının üssünü verir.
-IMLN			= SANLN				##	Karmaşık bir sayının doğal logaritmasını verir.
-IMLOG10			= SANLOG10			##	Karmaşık bir sayının, 10 tabanında logaritmasını verir.
-IMLOG2			= SANLOG2			##	Karmaşık bir sayının 2 tabanında logaritmasını verir.
-IMPOWER			= SANÜSSÜ			##	Karmaşık bir sayıyı, bir tamsayı üssüne yükseltilmiş olarak verir.
-IMPRODUCT		= SANÇARP			##	Karmaşık sayıların çarpımını verir.
-IMREAL			= SANGERÇEK			##	Karmaşık bir sayının, gerçek katsayısını verir.
-IMSIN			= SANSIN			##	Karmaşık bir sayının sinüsünü verir.
-IMSQRT			= SANKAREKÖK		##	Karmaşık bir sayının karekökünü verir.
-IMSUB			= SANÇIKAR			##	İki karmaşık sayının farkını verir.
-IMSUM			= SANTOPLA			##	Karmaşık sayıların toplamını verir.
-OCT2BIN			= OCT2BIN			##	Sekizli bir sayıyı ikiliye dönüştürür.
-OCT2DEC			= OCT2DEC			##	Sekizli bir sayıyı ondalığa dönüştürür.
-OCT2HEX			= OCT2HEX			##	Sekizli bir sayıyı onaltılıya dönüştürür.
-
-
-##
-##	Financial functions				Finansal fonksiyonlar
-##
-ACCRINT			= GERÇEKFAİZ		##	Dönemsel faiz ödeyen hisse senedine ilişkin tahakkuk eden faizi getirir.
-ACCRINTM		= GERÇEKFAİZV		##	Vadesinde ödeme yapan bir tahvilin tahakkuk etmiş faizini verir.
-AMORDEGRC		= AMORDEGRC			##	Yıpranma katsayısı kullanarak her hesap döneminin değer kaybını verir.
-AMORLINC		= AMORLINC			##	Her hesap dönemi içindeki yıpranmayı verir.
-COUPDAYBS		= KUPONGÜNBD		##	Kupon süresinin başlangıcından alış tarihine kadar olan süredeki gün sayısını verir.
-COUPDAYS		= KUPONGÜN			##	Kupon süresindeki, gün sayısını, alış tarihini de içermek üzere, verir.
-COUPDAYSNC		= KUPONGÜNDSK		##	Alış tarihinden bir sonraki kupon tarihine kadar olan gün sayısını verir.
-COUPNCD			= KUPONGÜNSKT		##	Alış tarihinden bir sonraki kupon tarihini verir.
-COUPNUM			= KUPONSAYI			##	Alış tarihiyle vade tarihi arasında ödenecek kuponların sayısını verir.
-COUPPCD			= KUPONGÜNÖKT		##	Alış tarihinden bir önceki kupon tarihini verir.
-CUMIPMT			= AİÇVERİMORANI		##	İki dönem arasında ödenen kümülatif faizi verir.
-CUMPRINC		= ANA_PARA_ÖDEMESİ	##	İki dönem arasında bir borç üzerine ödenen birikimli temeli verir.
-DB				= AZALANBAKİYE		##	Bir malın belirtilen bir süre içindeki yıpranmasını, sabit azalan bakiye yöntemini kullanarak verir.
-DDB				= ÇİFTAZALANBAKİYE	##	Bir malın belirtilen bir süre içindeki yıpranmasını, çift azalan bakiye yöntemi ya da sizin belirttiğiniz başka bir yöntemi kullanarak verir.
-DISC			= İNDİRİM			##	Bir tahvilin indirim oranını verir.
-DOLLARDE		= LİRAON			##	Kesir olarak tanımlanmış lira fiyatını, ondalık sayı olarak tanımlanmış lira fiyatına dönüştürür.
-DOLLARFR		= LİRAKES			##	Ondalık sayı olarak tanımlanmış lira fiyatını, kesir olarak tanımlanmış lira fiyatına dönüştürür.
-DURATION		= SÜRE				##	Belli aralıklarla faiz ödemesi yapan bir tahvilin yıllık süresini verir.
-EFFECT			= ETKİN				##	Efektif yıllık faiz oranını verir.
-FV				= ANBD				##	Bir yatırımın gelecekteki değerini verir.
-FVSCHEDULE		= GDPROGRAM			##	Bir seri birleşik faiz oranı uyguladıktan sonra, bir başlangıçtaki anaparanın gelecekteki değerini verir.
-INTRATE			= FAİZORANI			##	Tam olarak yatırım yapılmış bir tahvilin faiz oranını verir.
-IPMT			= FAİZTUTARI		##	Bir yatırımın verilen bir süre için faiz ödemesini verir.
-IRR				= İÇ_VERİM_ORANI	##	Bir para akışı serisi için, iç verim oranını verir.
-ISPMT			= ISPMT				##	Yatırımın belirli bir dönemi boyunca ödenen faizi hesaplar.
-MDURATION		= MSÜRE				##	Varsayılan par değeri 10.000.000 lira olan bir tahvil için Macauley değiştirilmiş süreyi verir.
-MIRR			= D_İÇ_VERİM_ORANI	##	Pozitif ve negatif para akışlarının farklı oranlarda finanse edildiği durumlarda, iç verim oranını verir.
-NOMINAL			= NOMİNAL			##	Yıllık nominal faiz oranını verir.
-NPER			= DÖNEM_SAYISI		##	Bir yatırımın dönem sayısını verir.
-NPV				= NBD				##	Bir yatırımın bugünkü net değerini, bir dönemsel para akışları serisine ve bir indirim oranına bağlı olarak verir.
-ODDFPRICE		= TEKYDEĞER			##	Tek bir ilk dönemi olan bir tahvilin değerini, her 100.000.000 lirada bir verir.
-ODDFYIELD		= TEKYÖDEME			##	Tek bir ilk dönemi olan bir tahvilin ödemesini verir.
-ODDLPRICE		= TEKSDEĞER			##	Tek bir son dönemi olan bir tahvilin fiyatını her 10.000.000 lirada bir verir.
-ODDLYIELD		= TEKSÖDEME			##	Tek bir son dönemi olan bir tahvilin ödemesini verir.
-PMT				= DEVRESEL_ÖDEME	##	Bir yıllık dönemsel ödemeyi verir.
-PPMT			= ANA_PARA_ÖDEMESİ	##	Verilen bir süre için, bir yatırımın anaparasına dayanan ödemeyi verir.
-PRICE			= DEĞER				##	Dönemsel faiz ödeyen bir tahvilin fiyatını 10.000.00 liralık değer başına verir.
-PRICEDISC		= DEĞERİND			##	İndirimli bir tahvilin fiyatını 10.000.000 liralık nominal değer başına verir.
-PRICEMAT		= DEĞERVADE			##	Faizini vade sonunda ödeyen bir tahvilin fiyatını 10.000.000 nominal değer başına verir.
-PV				= BD				##	Bir yatırımın bugünkü değerini verir.
-RATE			= FAİZ_ORANI		##	Bir yıllık dönem başına düşen faiz oranını verir.
-RECEIVED		= GETİRİ			##	Tam olarak yatırılmış bir tahvilin vadesinin bitiminde alınan miktarı verir.
-SLN				= DA				##	Bir malın bir dönem içindeki doğrusal yıpranmasını verir.
-SYD				= YAT				##	Bir malın belirli bir dönem için olan amortismanını verir.
-TBILLEQ			= HTAHEŞ			##	Bir Hazine bonosunun bono eşdeğeri ödemesini verir.
-TBILLPRICE		= HTAHDEĞER			##	Bir Hazine bonosunun değerini, 10.000.000 liralık nominal değer başına verir.
-TBILLYIELD		= HTAHÖDEME			##	Bir Hazine bonosunun ödemesini verir.
-VDB				= DAB				##	Bir malın amortismanını, belirlenmiş ya da kısmi bir dönem için, bir azalan bakiye yöntemi kullanarak verir.
-XIRR			= AİÇVERİMORANI		##	Dönemsel olması gerekmeyen bir para akışları programı için, iç verim oranını verir.
-XNPV			= ANBD				##	Dönemsel olması gerekmeyen bir para akışları programı için, bugünkü net değeri verir.
-YIELD			= ÖDEME				##	Belirli aralıklarla faiz ödeyen bir tahvilin ödemesini verir.
-YIELDDISC		= ÖDEMEİND			##	İndirimli bir tahvilin yıllık ödemesini verir; örneğin, bir Hazine bonosunun.
-YIELDMAT		= ÖDEMEVADE			##	Vadesinin bitiminde faiz ödeyen bir tahvilin yıllık ödemesini verir.
-
-
-##
-##	Information functions				Bilgi fonksiyonları
-##
-CELL			= HÜCRE			##	Bir hücrenin biçimlendirmesi, konumu ya da içeriği hakkında bilgi verir.
-ERROR.TYPE		= HATA.TİPİ		##	Bir hata türüne ilişkin sayıları verir.
-INFO			= BİLGİ			##	Geçerli işletim ortamı hakkında bilgi verir.
-ISBLANK			= EBOŞSA		##	Değer boşsa, DOĞRU verir.
-ISERR			= EHATA			##	Değer, #YOK dışındaki bir hata değeriyse, DOĞRU verir.
-ISERROR			= EHATALIYSA	##	Değer, herhangi bir hata değeriyse, DOĞRU verir.
-ISEVEN			= ÇİFTTİR		##	Sayı çiftse, DOĞRU verir.
-ISLOGICAL		= EMANTIKSALSA	##	Değer, mantıksal bir değerse, DOĞRU verir.
-ISNA			= EYOKSA		##	Değer, #YOK hata değeriyse, DOĞRU verir.
-ISNONTEXT		= EMETİNDEĞİLSE	##	Değer, metin değilse, DOĞRU verir.
-ISNUMBER		= ESAYIYSA		##	Değer, bir sayıysa, DOĞRU verir.
-ISODD			= TEKTİR		##	Sayı tekse, DOĞRU verir.
-ISREF			= EREFSE		##	Değer bir başvuruysa, DOĞRU verir.
-ISTEXT			= EMETİNSE		##	Değer bir metinse DOĞRU verir.
-N				= N				##	Sayıya dönüştürülmüş bir değer verir.
-NA				= YOKSAY		##	#YOK hata değerini verir.
-TYPE			= TİP			##	Bir değerin veri türünü belirten bir sayı verir.
-
-
-##
-##	Logical functions				Mantıksal fonksiyonlar
-##
-AND				= VE			##	Bütün bağımsız değişkenleri DOĞRU ise, DOĞRU verir.
-FALSE			= YANLIŞ		##	YANLIŞ mantıksal değerini verir.
-IF				= EĞER			##	Gerçekleştirilecek bir mantıksal sınama belirtir.
-IFERROR			= EĞERHATA		##	Formül hatalıysa belirttiğiniz değeri verir; bunun dışındaki durumlarda formülün sonucunu verir.
-NOT				= DEĞİL			##	Bağımsız değişkeninin mantığını tersine çevirir.
-OR				= YADA			##	Bağımsız değişkenlerden herhangi birisi DOĞRU ise, DOĞRU verir.
-TRUE			= DOĞRU			##	DOĞRU mantıksal değerini verir.
-
-
-##
-##	Lookup and reference functions			Arama ve Başvuru fonksiyonları
-##
-ADDRESS			= ADRES				##	Bir başvuruyu, çalışma sayfasındaki tek bir hücreye metin olarak verir.
-AREAS			= ALANSAY			##	Renvoie le nombre de zones dans une référence.
-CHOOSE			= ELEMAN			##	Değerler listesinden bir değer seçer.
-COLUMN			= SÜTUN				##	Bir başvurunun sütun sayısını verir.
-COLUMNS			= SÜTUNSAY			##	Bir başvurudaki sütunların sayısını verir.
-HLOOKUP			= YATAYARA			##	Bir dizinin en üst satırına bakar ve belirtilen hücrenin değerini verir.
-HYPERLINK		= KÖPRÜ				##	Bir ağ sunucusunda, bir intranette ya da Internet'te depolanan bir belgeyi açan bir kısayol ya da atlama oluşturur.
-INDEX			= İNDİS				##	Başvurudan veya diziden bir değer seçmek için, bir dizin kullanır.
-INDIRECT		= DOLAYLI			##	Metin değeriyle belirtilen bir başvuru verir.
-LOOKUP			= ARA				##	Bir vektördeki veya dizideki değerleri arar.
-MATCH			= KAÇINCI			##	Bir başvurudaki veya dizideki değerleri arar.
-OFFSET			= KAYDIR			##	Verilen bir başvurudan, bir başvuru kaydırmayı verir.
-ROW				= SATIR				##	Bir başvurunun satır sayısını verir.
-ROWS			= SATIRSAY			##	Bir başvurudaki satırların sayısını verir.
-RTD				= RTD				##	COM otomasyonunu destekleyen programdan gerçek zaman verileri alır.
-TRANSPOSE		= DEVRİK_DÖNÜŞÜM	##	Bir dizinin devrik dönüşümünü verir.
-VLOOKUP			= DÜŞEYARA			##	Bir dizinin ilk sütununa bakar ve bir hücrenin değerini vermek için satır boyunca hareket eder.
-
-
-##
-##	Math and trigonometry functions			Matematik ve trigonometri fonksiyonları
-##
-ABS				= MUTLAK			##	Bir sayının mutlak değerini verir.
-ACOS			= ACOS				##	Bir sayının ark kosinüsünü verir.
-ACOSH			= ACOSH				##	Bir sayının ters hiperbolik kosinüsünü verir.
-ASIN			= ASİN				##	Bir sayının ark sinüsünü verir.
-ASINH			= ASİNH				##	Bir sayının ters hiperbolik sinüsünü verir.
-ATAN			= ATAN				##	Bir sayının ark tanjantını verir.
-ATAN2			= ATAN2				##	Ark tanjantı, x- ve y- koordinatlarından verir.
-ATANH			= ATANH				##	Bir sayının ters hiperbolik tanjantını verir.
-CEILING			= TAVANAYUVARLA		##	Bir sayıyı, en yakın tamsayıya ya da en yakın katına yuvarlar.
-COMBIN			= KOMBİNASYON		##	Verilen sayıda öğenin kombinasyon sayısını verir.
-COS				= COS				##	Bir sayının kosinüsünü verir.
-COSH			= COSH				##	Bir sayının hiperbolik kosinüsünü verir.
-DEGREES			= DERECE			##	Radyanları dereceye dönüştürür.
-EVEN			= ÇİFT				##	Bir sayıyı, en yakın daha büyük çift tamsayıya yuvarlar.
-EXP				= ÜS				##	e'yi, verilen bir sayının üssüne yükseltilmiş olarak verir.
-FACT			= ÇARPINIM			##	Bir sayının faktörünü verir.
-FACTDOUBLE		= ÇİFTFAKTÖR		##	Bir sayının çift çarpınımını verir.
-FLOOR			= TABANAYUVARLA		##	Bir sayıyı, daha küçük sayıya, sıfıra yakınsayarak yuvarlar.
-GCD				= OBEB				##	En büyük ortak böleni verir.
-INT				= TAMSAYI			##	Bir sayıyı aşağıya doğru en yakın tamsayıya yuvarlar.
-LCM				= OKEK				##	En küçük ortak katı verir.
-LN				= LN				##	Bir sayının doğal logaritmasını verir.
-LOG				= LOG				##	Bir sayının, belirtilen bir tabandaki logaritmasını verir.
-LOG10			= LOG10				##	Bir sayının 10 tabanında logaritmasını verir.
-MDETERM			= DETERMİNANT		##	Bir dizinin dizey determinantını verir.
-MINVERSE		= DİZEY_TERS		##	Bir dizinin dizey tersini verir.
-MMULT			= DÇARP				##	İki dizinin dizey çarpımını verir.
-MOD				= MODÜLO			##	Bölmeden kalanı verir.
-MROUND			= KYUVARLA			##	İstenen kata yuvarlanmış bir sayı verir.
-MULTINOMIAL		= ÇOKTERİMLİ		##	Bir sayılar kümesinin çok terimlisini verir.
-ODD				= TEK				##	Bir sayıyı en yakın daha büyük tek sayıya yuvarlar.
-PI				= Pİ				##	Pi değerini verir.
-POWER			= KUVVET			##	Bir üsse yükseltilmiş sayının sonucunu verir.
-PRODUCT			= ÇARPIM			##	Bağımsız değişkenlerini çarpar.
-QUOTIENT		= BÖLÜM				##	Bir bölme işleminin tamsayı kısmını verir.
-RADIANS			= RADYAN			##	Dereceleri radyanlara dönüştürür.
-RAND			= S_SAYI_ÜRET		##	0 ile 1 arasında rastgele bir sayı verir.
-RANDBETWEEN		= RASTGELEARALIK	##	Belirttiğiniz sayılar arasında rastgele bir sayı verir.
-ROMAN			= ROMEN				##	Bir normal rakamı, metin olarak, romen rakamına çevirir.
-ROUND			= YUVARLA			##	Bir sayıyı, belirtilen basamak sayısına yuvarlar.
-ROUNDDOWN		= AŞAĞIYUVARLA		##	Bir sayıyı, daha küçük sayıya, sıfıra yakınsayarak yuvarlar.
-ROUNDUP			= YUKARIYUVARLA		##	Bir sayıyı daha büyük sayıya, sıfırdan ıraksayarak yuvarlar.
-SERIESSUM		= SERİTOPLA			##	Bir üs serisinin toplamını, formüle bağlı olarak verir.
-SIGN			= İŞARET			##	Bir sayının işaretini verir.
-SIN				= SİN				##	Verilen bir açının sinüsünü verir.
-SINH			= SİNH				##	Bir sayının hiperbolik sinüsünü verir.
-SQRT			= KAREKÖK			##	Pozitif bir karekök verir.
-SQRTPI			= KAREKÖKPİ			##	(* Pi sayısının) kare kökünü verir.
-SUBTOTAL		= ALTTOPLAM			##	Bir listedeki ya da veritabanındaki bir alt toplamı verir.
-SUM				= TOPLA				##	Bağımsız değişkenlerini toplar.
-SUMIF			= ETOPLA			##	Verilen ölçütle belirlenen hücreleri toplar.
-SUMIFS			= SUMIFS			##	Bir aralıktaki, birden fazla ölçüte uyan hücreleri ekler.
-SUMPRODUCT		= TOPLA.ÇARPIM		##	İlişkili dizi bileşenlerinin çarpımlarının toplamını verir.
-SUMSQ			= TOPKARE			##	Bağımsız değişkenlerin karelerinin toplamını verir.
-SUMX2MY2		= TOPX2EY2			##	İki dizideki ilişkili değerlerin farkının toplamını verir.
-SUMX2PY2		= TOPX2AY2			##	İki dizideki ilişkili değerlerin karelerinin toplamının toplamını verir.
-SUMXMY2			= TOPXEY2			##	İki dizideki ilişkili değerlerin farklarının karelerinin toplamını verir.
-TAN				= TAN				##	Bir sayının tanjantını verir.
-TANH			= TANH				##	Bir sayının hiperbolik tanjantını verir.
-TRUNC			= NSAT				##	Bir sayının, tamsayı durumuna gelecek şekilde, fazlalıklarını atar.
-
-
-##
-##	Statistical functions				İstatistiksel fonksiyonlar
-##
-AVEDEV			= ORTSAP			##	Veri noktalarının ortalamalarından mutlak sapmalarının ortalamasını verir.
-AVERAGE			= ORTALAMA			##	Bağımsız değişkenlerinin ortalamasını verir.
-AVERAGEA		= ORTALAMAA			##	Bağımsız değişkenlerinin, sayılar, metin ve mantıksal değerleri içermek üzere ortalamasını verir.
-AVERAGEIF		= EĞERORTALAMA 		##	Verili ölçütü karşılayan bir aralıktaki bütün hücrelerin ortalamasını (aritmetik ortalama) hesaplar.
-AVERAGEIFS		= EĞERLERORTALAMA 	##	Birden çok ölçüte uyan tüm hücrelerin ortalamasını (aritmetik ortalama) hesaplar.
-BETADIST		= BETADAĞ			##	Beta birikimli dağılım fonksiyonunu verir.
-BETAINV			= BETATERS			##	Belirli bir beta dağılımı için birikimli dağılım fonksiyonunun tersini verir.
-BINOMDIST		= BİNOMDAĞ			##	Tek terimli binom dağılımı olasılığını verir.
-CHIDIST			= KİKAREDAĞ			##	Kikare dağılımın tek kuyruklu olasılığını verir.
-CHIINV			= KİKARETERS		##	Kikare dağılımın kuyruklu olasılığının tersini verir.
-CHITEST			= KİKARETEST		##	Bağımsızlık sınamalarını verir.
-CONFIDENCE		= GÜVENİRLİK		##	Bir popülasyon ortalaması için güvenirlik aralığını verir.
-CORREL			= KORELASYON		##	İki veri kümesi arasındaki bağlantı katsayısını verir.
-COUNT			= BAĞ_DEĞ_SAY		##	Bağımsız değişkenler listesinde kaç tane sayı bulunduğunu sayar.
-COUNTA			= BAĞ_DEĞ_DOLU_SAY	##	Bağımsız değişkenler listesinde kaç tane değer bulunduğunu sayar.
-COUNTBLANK		= BOŞLUKSAY 		##	Aralıktaki boş hücre sayısını hesaplar.
-COUNTIF			= EĞERSAY 			##	Verilen ölçütlere uyan bir aralık içindeki hücreleri sayar.
-COUNTIFS		= ÇOKEĞERSAY 		##	Birden çok ölçüte uyan bir aralık içindeki hücreleri sayar.
-COVAR			= KOVARYANS 		##	Eşleştirilmiş sapmaların ortalaması olan kovaryansı verir.
-CRITBINOM		= KRİTİKBİNOM		##	Birikimli binom dağılımının bir ölçüt değerinden küçük veya ölçüt değerine eşit olduğu en küçük değeri verir.
-DEVSQ			= SAPKARE			##	Sapmaların karelerinin toplamını verir.
-EXPONDIST		= ÜSTELDAĞ			##	Üstel dağılımı verir.
-FDIST			= FDAĞ				##	F olasılık dağılımını verir.
-FINV			= FTERS				##	F olasılık dağılımının tersini verir.
-FISHER			= FISHER			##	Fisher dönüşümünü verir.
-FISHERINV		= FISHERTERS		##	Fisher dönüşümünün tersini verir.
-FORECAST		= TAHMİN			##	Bir doğrusal eğilim boyunca bir değer verir.
-FREQUENCY		= SIKLIK			##	Bir sıklık dağılımını, dikey bir dizi olarak verir.
-FTEST			= FTEST				##	Bir F-test'in sonucunu verir.
-GAMMADIST		= GAMADAĞ			##	Gama dağılımını verir.
-GAMMAINV		= GAMATERS			##	Gama kümülatif dağılımının tersini verir.
-GAMMALN			= GAMALN			##	Gama fonksiyonunun (?(x)) doğal logaritmasını verir.
-GEOMEAN			= GEOORT			##	Geometrik ortayı verir.
-GROWTH			= BÜYÜME			##	Üstel bir eğilim boyunca değerler verir.
-HARMEAN			= HARORT			##	Harmonik ortayı verir.
-HYPGEOMDIST		= HİPERGEOMDAĞ		##	Hipergeometrik dağılımı verir.
-INTERCEPT		= KESMENOKTASI		##	Doğrusal çakıştırma çizgisinin kesişme noktasını verir.
-KURT			= BASIKLIK			##	Bir veri kümesinin basıklığını verir.
-LARGE			= BÜYÜK				##	Bir veri kümesinde k. en büyük değeri verir.
-LINEST			= DOT				##	Doğrusal bir eğilimin parametrelerini verir.
-LOGEST			= LOT				##	Üstel bir eğilimin parametrelerini verir.
-LOGINV			= LOGTERS			##	Bir lognormal dağılımının tersini verir.
-LOGNORMDIST		= LOGNORMDAĞ		##	Birikimli lognormal dağılımını verir.
-MAX				= MAK				##	Bir bağımsız değişkenler listesindeki en büyük değeri verir.
-MAXA			= MAKA				##	Bir bağımsız değişkenler listesindeki, sayılar, metin ve mantıksal değerleri içermek üzere, en büyük değeri verir.
-MEDIAN			= ORTANCA			##	Belirtilen sayıların orta değerini verir.
-MIN				= MİN				##	Bir bağımsız değişkenler listesindeki en küçük değeri verir.
-MINA			= MİNA				##	Bir bağımsız değişkenler listesindeki, sayılar, metin ve mantıksal değerleri de içermek üzere, en küçük değeri verir.
-MODE			= ENÇOK_OLAN		##	Bir veri kümesindeki en sık rastlanan değeri verir.
-NEGBINOMDIST	= NEGBİNOMDAĞ		##	Negatif binom dağılımını verir.
-NORMDIST		= NORMDAĞ			##	Normal birikimli dağılımı verir.
-NORMINV			= NORMTERS			##	Normal kümülatif dağılımın tersini verir.
-NORMSDIST		= NORMSDAĞ			##	Standart normal birikimli dağılımı verir.
-NORMSINV		= NORMSTERS			##	Standart normal birikimli dağılımın tersini verir.
-PEARSON			= PEARSON			##	Pearson çarpım moment korelasyon katsayısını verir.
-PERCENTILE		= YÜZDEBİRLİK		##	Bir aralık içerisinde bulunan değerlerin k. frekans toplamını verir.
-PERCENTRANK		= YÜZDERANK			##	Bir veri kümesindeki bir değerin yüzde mertebesini verir.
-PERMUT			= PERMÜTASYON		##	Verilen sayıda nesne için permütasyon sayısını verir.
-POISSON			= POISSON			##	Poisson dağılımını verir.
-PROB			= OLASILIK			##	Bir aralıktaki değerlerin iki sınır arasında olması olasılığını verir.
-QUARTILE		= DÖRTTEBİRLİK		##	Bir veri kümesinin dörtte birliğini verir.
-RANK			= RANK				##	Bir sayılar listesinde bir sayının mertebesini verir.
-RSQ				= RKARE				##	Pearson çarpım moment korelasyon katsayısının karesini verir.
-SKEW			= ÇARPIKLIK			##	Bir dağılımın çarpıklığını verir.
-SLOPE			= EĞİM				##	Doğrusal çakışma çizgisinin eğimini verir.
-SMALL			= KÜÇÜK				##	Bir veri kümesinde k. en küçük değeri verir.
-STANDARDIZE		= STANDARTLAŞTIRMA	##	Normalleştirilmiş bir değer verir.
-STDEV			= STDSAPMA			##	Bir örneğe dayanarak standart sapmayı tahmin eder.
-STDEVA			= STDSAPMAA			##	Standart sapmayı, sayılar, metin ve mantıksal değerleri içermek üzere, bir örneğe bağlı olarak tahmin eder.
-STDEVP			= STDSAPMAS			##	Standart sapmayı, tüm popülasyona bağlı olarak hesaplar.
-STDEVPA			= STDSAPMASA		##	Standart sapmayı, sayılar, metin ve mantıksal değerleri içermek üzere, tüm popülasyona bağlı olarak hesaplar.
-STEYX			= STHYX				##	Regresyondaki her x için tahmini y değerinin standart hatasını verir.
-TDIST			= TDAĞ				##	T-dağılımını verir.
-TINV			= TTERS				##	T-dağılımının tersini verir.
-TREND			= EĞİLİM			##	Doğrusal bir eğilim boyunca değerler verir.
-TRIMMEAN		= KIRPORTALAMA		##	Bir veri kümesinin içinin ortalamasını verir.
-TTEST			= TTEST				##	T-test'le ilişkilendirilmiş olasılığı verir.
-VAR				= VAR				##	Varyansı, bir örneğe bağlı olarak tahmin eder.
-VARA			= VARA				##	Varyansı, sayılar, metin ve mantıksal değerleri içermek üzere, bir örneğe bağlı olarak tahmin eder.
-VARP			= VARS				##	Varyansı, tüm popülasyona dayanarak hesaplar.
-VARPA			= VARSA				##	Varyansı, sayılar, metin ve mantıksal değerleri içermek üzere, tüm popülasyona bağlı olarak hesaplar.
-WEIBULL			= WEIBULL			##	Weibull dağılımını hesaplar.
-ZTEST			= ZTEST				##	Z-testinin tek kuyruklu olasılık değerini hesaplar.
-
-
-##
-##	Text functions					Metin fonksiyonları
-##
-ASC				= ASC 				##	Bir karakter dizesindeki çift enli (iki bayt) İngilizce harfleri veya katakanayı yarım enli (tek bayt) karakterlerle değiştirir.
-BAHTTEXT		= BAHTTEXT 			##	Sayıyı, ß (baht) para birimi biçimini kullanarak metne dönüştürür.
-CHAR			= DAMGA 			##	Kod sayısıyla belirtilen karakteri verir.
-CLEAN			= TEMİZ				##	Metindeki bütün yazdırılamaz karakterleri kaldırır.
-CODE			= KOD				##	Bir metin dizesindeki ilk karakter için sayısal bir kod verir.
-CONCATENATE		= BİRLEŞTİR			##	Pek çok metin öğesini bir metin öğesi olarak birleştirir.
-DOLLAR			= LİRA				##	Bir sayıyı YTL (yeni Türk lirası) para birimi biçimini kullanarak metne dönüştürür.
-EXACT			= ÖZDEŞ				##	İki metin değerinin özdeş olup olmadığını anlamak için, değerleri denetler.
-FIND			= BUL				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlıdır).
-FINDB			= BULB				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlıdır).
-FIXED			= SAYIDÜZENLE		##	Bir sayıyı, sabit sayıda ondalıkla, metin olarak biçimlendirir.
-JIS				= JIS				##	Bir karakter dizesindeki tek enli (tek bayt) İngilizce harfleri veya katakanayı çift enli (iki bayt) karakterlerle değiştirir.
-LEFT			= SOL				##	Bir metin değerinden en soldaki karakterleri verir.
-LEFTB			= SOLB				##	Bir metin değerinden en soldaki karakterleri verir.
-LEN				= UZUNLUK			##	Bir metin dizesindeki karakter sayısını verir.
-LENB			= UZUNLUKB			##	Bir metin dizesindeki karakter sayısını verir.
-LOWER			= KÜÇÜKHARF			##	Metni küçük harfe çevirir.
-MID				= ORTA				##	Bir metin dizesinden belirli sayıda karakteri, belirttiğiniz konumdan başlamak üzere verir.
-MIDB			= ORTAB				##	Bir metin dizesinden belirli sayıda karakteri, belirttiğiniz konumdan başlamak üzere verir.
-PHONETIC		= SES				##	Metin dizesinden ses (furigana) karakterlerini ayıklar.
-PROPER			= YAZIM.DÜZENİ		##	Bir metin değerinin her bir sözcüğünün ilk harfini büyük harfe çevirir.
-REPLACE			= DEĞİŞTİR			##	Metnin içindeki karakterleri değiştirir.
-REPLACEB		= DEĞİŞTİRB			##	Metnin içindeki karakterleri değiştirir.
-REPT			= YİNELE			##	Metni belirtilen sayıda yineler.
-RIGHT			= SAĞ				##	Bir metin değerinden en sağdaki karakterleri verir.
-RIGHTB			= SAĞB				##	Bir metin değerinden en sağdaki karakterleri verir.
-SEARCH			= BUL				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlı değildir).
-SEARCHB			= BULB				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlı değildir).
-SUBSTITUTE		= YERİNEKOY			##	Bir metin dizesinde, eski metnin yerine yeni metin koyar.
-T				= M					##	Bağımsız değerlerini metne dönüştürür.
-TEXT			= METNEÇEVİR		##	Bir sayıyı biçimlendirir ve metne dönüştürür.
-TRIM			= KIRP				##	Metindeki boşlukları kaldırır.
-UPPER			= BÜYÜKHARF			##	Metni büyük harfe çevirir.
-VALUE			= SAYIYAÇEVİR		##	Bir metin bağımsız değişkenini sayıya dönüştürür.
diff --git a/plugins/exportTypes/Excel/lang/en.php b/plugins/exportTypes/Excel/lang/en.php
deleted file mode 100644
index 72558bf4d..000000000
--- a/plugins/exportTypes/Excel/lang/en.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$L = array();
diff --git a/plugins/exportTypes/Excel/output.php b/plugins/exportTypes/Excel/output.php
deleted file mode 100755
index 11538ce26..000000000
--- a/plugins/exportTypes/Excel/output.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <style type="text/css">
-  body { margin: 10px; }
-  table, th, td { font-family: arial; font-size: 8pt; }
-  #resultTable { background-color: #efefef; border: 2px solid #dddddd; width: 100%; }
-  #resultTable th { background-color: #efefef; }
-  #resultTable td { background-color: #ffffff; }
-  </style>
-</head>
-<body>
-
-<table cellpadding="1" cellspacing="1">
-<tr>
-  <?php
-  $sorted_cols = gd_sort_by_col_order($g_template);
-  foreach ($sorted_cols as $col)
-  {
-    echo "<th>{$col["title"]}</th>";
-  }
-  ?>
-</tr>
-<?php
-ksort($g_template, SORT_NUMERIC);
-for ($row=1; $row<=$g_numResults; $row++)
-{
-  $row_data = array();
-  while (list($order, $data_types) = each($g_template))
-  {
-    foreach ($data_types as $data_type)
-    {
-      $order = $data_type["column_num"];
-      $data_type_folder = $data_type["data_type_folder"];
-      $data_type_func = "{$data_type_folder}_generate_item";
-      $data_type["random_data"] = $data_type_func($row, $data_type["options"], $row_data);
-      $row_data["$order"] = $data_type;
-    }
-  }
-  reset($g_template);
-  ksort($row_data);
-
-  echo "<tr>";
-  foreach ($row_data as $data)
-  {
-    $val = (is_array($data["random_data"])) ? $data["random_data"]["display"] : $data["random_data"];
-    echo "<td>$val</td>";
-  }
-  echo "</tr>";
-}
-?>
-</table>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/exportTypes/HTML/HTML.class.php b/plugins/exportTypes/HTML/HTML.class.php
deleted file mode 100644
index c6984c987..000000000
--- a/plugins/exportTypes/HTML/HTML.class.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package ExportTypes
- */
-class HTML extends ExportTypePlugin {
-	protected $isEnabled = true;
-	protected $exportTypeName = "HTML";
-	protected $jsModules = array("HTML.js");
-	protected $cssFiles = array("HTML.css");
-	protected $contentTypeHeader = "text/html";
-	protected $codeMirrorModes = array("xml", "smarty", "smartymixed", "htmlmixed", "css");
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			$this->smarty = new SecureSmarty();
-			$this->smarty->template_dir = realpath(dirname(__FILE__) . "/../../../resources/libs/smarty");
-			$this->smarty->compile_dir  = realpath(dirname(__FILE__) . "/../../../cache");
-		}
-	}
-
-	/**
-	 * @see ExportTypePlugin::generate()
-	 */
-	public function generate($generator) {
-		$exportTarget = $generator->getExportTarget();
-		$postData     = $generator->getPostData();
-		$data         = $generator->generateExportData();
-
-		$content = "";
-		$htmlFormat = (isset($postData["etHTMLExportFormat"])) ? $postData["etHTMLExportFormat"] : "custom";
-
-		if ($htmlFormat == "custom") {
-			$smartyTemplate = (get_magic_quotes_gpc()) ? stripslashes($postData["etHTMLCustomHTMLSource"]) : $postData["etHTMLCustomHTMLSource"];
-			$content .= $this->genFormatCustom($data, $smartyTemplate);
-		} else {
-
-			// if we're generating the data in the context of a new window/tab, include the additional
-			// necessary HTML & styles to prettify it a bit
-			if ($exportTarget == "newTab" || $exportTarget == "promptDownload") {
-				$content .= $this->generateExportHeader();
-			}
-
-			switch ($htmlFormat) {
-				case "table":
-					$content .= $this->genFormatTable($data);
-					break;
-				case "ul":
-					$content .= $this->genFormatUl($data);
-					break;
-				case "dl":
-					$content .= $this->genFormatDl($data);
-					break;
-			}
-
-			if ($exportTarget == "newTab" || $exportTarget == "promptDownload") {
-				$content .= $this->generateExportFooter();
-			}
-		}
-
-		return array(
-			"success" => true,
-			"content" => $content
-		);
-	}
-
-
-	/**
-	 * Used for constructing the filename of the filename when downloading.
-	 * @see ExportTypePlugin::getDownloadFilename()
-	 * @param Generator $generator
-	 * @return string
-	 */
-	public function getDownloadFilename($generator) {
-		$time = date("U");
-		return "randomdata-{$time}.html";
-	}
-
-	public function getAdditionalSettingsHTML() {
-		$html =<<< END
-<table cellspacing="0" cellpadding="0" width="100%">
-<tr>
-	<td width="15%" valign="top" class="etHTMLDefaultFormatLabels">{$this->L["data_format"]}</td>
-	<td width="35%" valign="top" class="etHTMLDefaultFormatLabels">
-		<input type="radio" name="etHTMLExportFormat" id="etHTMLExportFormat1" class="etHTMLDefaultFormats" value="table" checked="checked" />
-			<label for="etHTMLExportFormat1">&lt;table&gt;</label>
-		<input type="radio" name="etHTMLExportFormat" id="etHTMLExportFormat2" class="etHTMLDefaultFormats" value="ul" />
-			<label for="etHTMLExportFormat2">&lt;ul&gt;</label>
-		<input type="radio" name="etHTMLExportFormat" id="etHTMLExportFormat3" class="etHTMLDefaultFormats" value="dl" />
-			<label for="etHTMLExportFormat3">&lt;dl&gt;</label>
-	</td>
-	<td width="50%" valign="top">
-		<input type="checkbox" name="etHTMLUseCustomExportFormat" id="etHTMLUseCustomExportFormat" />
-			<label for="etHTMLUseCustomExportFormat">{$this->L["use_custom_html_format"]}</label>
-			<input type="button" id="etHTMLEditCustomFormat" value="edit" disabled="disabled" />
-	</td>
-</tr>
-</table>
-<input type="hidden" name="etHTMLCustomHTMLSource" id="etHTMLCustomHTMLSource" />
-
-<div id="etHTMLCustomFormatDialog" style="display:none">
-	<div style="width: 300px; float: left;">
-		<h4>{$this->L["available_smarty_vars"]}</h4>
-
-<pre>{\$isFirstBatch}, {\$isLastBatch}</pre>
-{$this->L["batch_vars"]}
-
-<pre>{\$colData}</pre>
-{$this->L["col_names_array"]}
-
-<pre>{\$rowData}</pre>
-{$this->L["row_data_array"]}
-
-		<button class="gdPrimaryButton" id="etHTML_ResetCustomHTML">{$this->L["reset_custom_html"]}</button>
-	</div>
-	<div id="etHTMLCustomContent">
-		<textarea name="etHTMLCustomSmarty" id="etHTMLCustomSmarty"></textarea>
-<script type="text/template" id="etHTMLCustomSmarty_Template">{if \$isFirstBatch}
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<style type="text/css">
-	body { margin: 10px; }
-	table, th, td, li, dl { font-family: "lucida grande", arial; font-size: 8pt; }
-	dt { font-weight: bold; }
-	table { background-color: #efefef; border: 2px solid #dddddd; width: 100%; }
-	th { background-color: #efefef; }
-	td { background-color: #ffffff; }
-	</style>
-</head>
-<body>
-
-<table cellspacing="0" cellpadding="1">
-<tr>
-{foreach \$colData as \$col}
-	<th>{\$col}</th>
-{/foreach}
-</tr>
-{/if}
-{foreach \$rowData as \$row}
-<tr>
-{foreach \$row as \$r}	<td>{\$r}</td>
-{/foreach}
-</tr>
-{/foreach}
-
-{if \$isLastBatch}
-</table>
-
-</body>
-</html>
-{/if}</script>
-
-	</div>
-</div>
-END;
-		return $html;
-	}
-
-
-	/**
-	 * Generates the data in <table> format. Technically we should probably pass this and the other markup generation
-	 * logic to Smarty, but this is faster.
-	 * @param array $data
-	 * @return string
-	 */
-	private function genFormatTable($data) {
-		$content = "";
-		if ($data["isFirstBatch"]) {
-			$content .= "<table cellpadding=\"1\" cellspacing=\"1\">\n<tr>\n";
-			foreach ($data["colData"] as $colName) {
-				$content .= "\t<th>$colName</th>\n";
-			}
-			$content .= "</tr>\n";
-		}
-		foreach ($data["rowData"] as $row) {
-			$content .= "<tr>\n";
-			foreach ($row as $col) {
-				$content .= "\t<td>$col</td>\n";
-			}
-			$content .= "</tr>\n";
-		}
-		if ($data["isLastBatch"]) {
-			$content .= "</table>";
-		}
-
-		return $content;
-	}
-
-	/**
-	 * Generates the data in <ul> format.
-	 * @param array $data
-	 * @return string
-	 */
-	private function genFormatUl($data) {
-		$content = "";
-		if ($data["isFirstBatch"]) {
-			$content .= "<ul>\n";
-			foreach ($data["colData"] as $colName) {
-				$content .= "\t<li>$colName</li>\n";
-			}
-			$content .= "</ul>\n";
-		}
-		foreach ($data["rowData"] as $row) {
-			$content .= "<ul>\n";
-			foreach ($row as $col) {
-				$content .= "\t<li>$col</li>\n";
-			}
-			$content .= "</ul>\n";
-		}
-		return $content;
-	}
-
-	/**
-	 * Generates the data in <dl> format.
-	 * @param array $data
-	 * @return string
-	 */
-	private function genFormatDl($data) {
-		$numCols = count($data["colData"]);
-		$content = "";
-		foreach ($data["rowData"] as $row) {
-			$content .= "<dl>\n";
-			for ($i=0; $i<$numCols; $i++) {
-				$content .= "\t<dt>{$data["colData"][$i]}</dt>\n";
-				$content .= "\t\t<dd>{$row[$i]}</dd>\n";
-			}
-			$content .= "</dl>\n";
-		}
-		return $content;
-	}
-
-	/**
-	 * Generates the data in whatever Smarty content the user entered.
-	 * @param array $data
-	 * @param string $template
-	 */
-	private function genFormatCustom($data, $template) {
-		return Templates::evalSmartyString($template, $data);
-	}
-
-	private function generateExportHeader() {
-		$html =<<< END
-<!DOCTYPE html>
-<html>
-<head>
-	<title></title>
-	<meta charset="utf-8">
-	<style type="text/css">
-	body { margin: 10px; }
-	table, th, td, li, dl { font-family: "lucida grande", arial; font-size: 8pt; }
-	dt { font-weight: bold; }
-	table { background-color: #efefef; border: 2px solid #dddddd; width: 100%; }
-	th { background-color: #efefef; }
-	td { background-color: #ffffff; }
-	</style>
-</head>
-<body>
-END;
-		return $html;
-	}
-
-	private function generateExportFooter() {
-		return "</body></html>";
-	}
-}
diff --git a/plugins/exportTypes/HTML/HTML.css b/plugins/exportTypes/HTML/HTML.css
deleted file mode 100644
index 2ead54de0..000000000
--- a/plugins/exportTypes/HTML/HTML.css
+++ /dev/null
@@ -1,16 +0,0 @@
-#etHTMLCustomFormatDialog pre {
-	margin-bottom: 0px;
-}
-#etHTMLCustomFormatDialog h4 {
-	margin: 0px 0px 4px;
-}
-#etHTMLCustomContent {
-	float:left;
-	border-left: 1px solid #efefef;
-	padding-left: 12px;
-	margin-left: 12px;
-}
-#etHTMLCustomSmarty {
-	width: 100%;
-	height: 100%;
-}
\ No newline at end of file
diff --git a/plugins/exportTypes/HTML/HTML.js b/plugins/exportTypes/HTML/HTML.js
deleted file mode 100644
index 5dcad553e..000000000
--- a/plugins/exportTypes/HTML/HTML.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/*global $:false,CodeMirror:false*/
- define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name HTML
-	 * @see ExportType
-	 * @description Client-side code for the HTML Export Type.
-	 * @namespace
-	 */
-
-	var MODULE_ID = "export-type-HTML";
-	var LANG = L.exportTypePlugins.HTML;
-	var _dialog = null;
-	var _codeMirror = null;
-
-	var _init = function() {
-		$(window).resize(_updateDialogDimensions);
-		$("#etHTMLEditCustomFormat").bind("click", function() { _openEditCustomFormatDialog(); return false; });
-		$("#etHTMLUseCustomExportFormat").bind("click", function() {
-			if (this.checked) {
-				$("#etHTMLEditCustomFormat").removeAttr("disabled");
-				$(".etHTMLDefaultFormats").attr("disabled", "disabled");
-				$(".etHTMLDefaultFormatLabels").addClass("gdDisabledText");
-			} else {
-				$("#etHTMLEditCustomFormat").attr("disabled", "disabled");
-				$(".etHTMLDefaultFormats").removeAttr("disabled");
-				$(".etHTMLDefaultFormatLabels").removeClass("gdDisabledText");
-			}
-		});
-
-		var subscriptions = {};
-		subscriptions[C.EVENT.GENERATE] = _onGenerate;
-		manager.subscribe(MODULE_ID, subscriptions);
-
-		$("#etHTMLCustomContent .CodeMirror").addClass("CodeMirror_medium");
-		_codeMirror = CodeMirror.fromTextArea($("#etHTMLCustomSmarty")[0], {
-			mode: "smartymixed",
-			lineNumbers: true
-		});
-		_codeMirror.setValue($("#etHTMLCustomSmarty_Template").html());
-		$("#etHTML_ResetCustomHTML").on("click", _resetCustomHTML);
-	};
-
-	var _updateDialogDimensions = function() {
-		var dimensions = _getDialogDimensions();
-		$("#etHTMLCustomFormatDialog").dialog("option", "width", dimensions.dialogWidth);
-		$("#etHTMLCustomFormatDialog").dialog("option", "height", dimensions.dialogHeight);
-	};
-
-	var _openEditCustomFormatDialog = function() {
-		var dimensions = _getDialogDimensions();
-
-		// calculate size of main content area
-		$("#etHTMLCustomFormatDialog").dialog({
-			title: LANG.custom_html_format,
-			modal: true,
-			width: dimensions.dialogWidth,
-			height: dimensions.dialogHeight,
-			resizable: false,
-			open: function() {
-				$("#etHTMLCustomContent .CodeMirror, #etHTMLCustomContent .CodeMirror-scroll").css({
-					width: dimensions.contentWidth,
-					height: dimensions.contentHeight
-				});
-				_codeMirror.refresh();
-			},
-			buttons: [
-				{
-					text: L.close,
-					click: function() {
-						$(this).dialog("close");
-					}
-				}
-			]
-		});
-		return false;
-	};
-
-	var _getDialogDimensions = function() {
-		var dialogHeight  = ($(window).height() / 100) * 90;
-		var dialogWidth   = ($(window).width() / 100) * 90;
-		var contentHeight = dialogHeight - 110;
-		var contentWidth  = dialogWidth - 370;
-
-		return {
-			dialogHeight: dialogHeight,
-			dialogWidth: dialogWidth,
-			contentHeight: contentHeight,
-			contentWidth: contentWidth
-		};
-	};
-
-	/**
-	 * If the user is generating in-page data with this Export Type, enable the XML
-	 * mode for the in-page editor.
-	 */
-	var _onGenerate = function(msg) {
-		$("#etHTMLCustomHTMLSource").val(_codeMirror.getValue());
-		if (msg.exportTarget != "inPage" || msg.exportType != "HTML") {
-			return;
-		}
-		msg.editor.setOption("mode", "xml");
-	};
-
-	var _loadSettings = function(settings) {
-		$("input[name=etHTMLExportFormat][value=" + settings.dataFormat + "]").attr("checked", "checked");
-		if (settings.useCustomExportFormat == "1") {
-			$("#etHTMLUseCustomExportFormat").attr("checked", "checked");
-		} else {
-			$("#etHTMLUseCustomExportFormat").removeAttr("checked");
-		}
-		$("#etHTMLCustomSmarty").val(settings.customExportSmartyContent);
-	};
-
-	var _saveSettings = function() {
-		return {
-			dataFormat: $("input[name=etHTMLExportFormat]:checked").val(),
-			useCustomExportFormat: $("#etHTMLUseCustomExportFormat")[0].checked ? 1 : 0,
-			customExportSmartyContent: _codeMirror.getValue()
-		};
-	};
-
-	var _resetSettings = function() {
-		$("input[name=etHTMLExportFormat][value=table]").attr("checked", "checked");
-		$("#etHTMLUseCustomExportFormat").removeAttr("disabled").trigger("click");
-		_codeMirror.setValue($("#etHTMLCustomSmarty_Template").html());
-	};
-
-	var _resetCustomHTML = function() {
-		_codeMirror.setValue($("#etHTMLCustomSmarty_Template").html());
-	};
-
-
-	manager.registerExportType(MODULE_ID, {
-		init: _init,
-		loadSettings: _loadSettings,
-		saveSettings: _saveSettings,
-		resetSettings: _resetSettings
-	});
-});
diff --git a/plugins/exportTypes/HTML/lang/de.php b/plugins/exportTypes/HTML/lang/de.php
deleted file mode 100644
index 276784e59..000000000
--- a/plugins/exportTypes/HTML/lang/de.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "HTML";
-
-$L["data_format"] = "Datenformat";
-$L["custom_html_format"] = "Custom HTML-Format";
-$L["available_smarty_vars"] = "Verfügbare Smarty Vars";
-$L["batch_vars"] = "Boolsche ob die aktuelle Charge der Ergebnisse erzeugt ist die erste oder letzte. Dies wird immer nur für Benutzer Erzeugen der Daten in-Seite, die die Ergebnisse in Blöcken generiert verwendet. In allen anderen Situationen, beide sind immer wahr.";
-$L["col_names_array"] = "Ein geordnetes Array von Strings mit den Spaltennamen.";
-$L["reset_custom_html"] = "Zurücksetzen Custom HTML";
-$L["row_data_array"] = "Ein geordnetes Array von Arrays. Jeder Top-Level-Array enthält den Inhalt der Zeile, jedes Kind Array enthält eine geordnete Array von Werten für jedes Element von Daten.";
-$L["use_custom_html_format"] = "Verwenden Sie benutzerdefinierte HTML-Format";
\ No newline at end of file
diff --git a/plugins/exportTypes/HTML/lang/en.php b/plugins/exportTypes/HTML/lang/en.php
deleted file mode 100644
index 10dc01aaa..000000000
--- a/plugins/exportTypes/HTML/lang/en.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-$L["data_format"] = "Data format";
-$L["custom_html_format"] = "Custom HTML Format";
-$L["use_custom_html_format"] = "Use custom HTML format";
-$L["batch_vars"] = "Booleans for whether or not the current batch of results being generated is the first or last. This is only ever used for users generating the data in-page, which generates the results in chunks. For all other situations, both are always true.";
-$L["col_names_array"] = "An ordered array of strings containing the column names.";
-$L["row_data_array"] = "An ordered array of arrays. Each top level array contains the contents of the row; each child array contains an ordered array of values for each item of data.";
-$L["available_smarty_vars"] = "Available Smarty Vars";
-$L["reset_custom_html"] = "Reset Custom HTML";
\ No newline at end of file
diff --git a/plugins/exportTypes/HTML/lang/es.php b/plugins/exportTypes/HTML/lang/es.php
deleted file mode 100644
index 9b8456f7a..000000000
--- a/plugins/exportTypes/HTML/lang/es.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$L = array();
-$L["data_format"] = "Formato de datos";
-$L["custom_html_format"] = "Formato HTML personalizado";
-$L["use_custom_html_format"] = "Usar formato HTML personalizado";
-$L["batch_vars"] = "Indica si el lote actual de resultados que será generado será el primero o el último. Esto sólo se usa para datos generado en la misma página, lo que genera los resultados por lotes. En el resto de situaciones, ambos son verdaderos.";
-$L["col_names_array"] = "Un array ordenado de cadenas conteniendo los nombres de columnas.";
-$L["row_data_array"] = "Un array ordenado de arrays. Cada array de nivel superior almacena los contenidos de la fila; cada array hijo contiene un array ordenado de valores para cada ítem de datos.";
-$L["available_smarty_vars"] = "Variables Smarty disponibles";
-$L["reset_custom_html"] = "Restablecer HTML personalizado";
diff --git a/plugins/exportTypes/HTML/lang/fr.php b/plugins/exportTypes/HTML/lang/fr.php
deleted file mode 100644
index de60e9053..000000000
--- a/plugins/exportTypes/HTML/lang/fr.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-$L = array();
-$L["data_format"] = "Format des données";
-$L["custom_html_format"] = "Format HTML personnalisé";
-
-// Category: HTML
-$L["available_smarty_vars"] = "Variables Smarty disponibles";
-$L["batch_vars"] = "Booléen permettant de savoir si le lot courant des résultats générés est le premier ou le dernier. N'est utilisé que dans le cas d'une génération des données dans la page, ce qui génère des résultats en morceaux. Pour tous les autres cas, les deux valeurs sont toujours vrai.";
-$L["col_names_array"] = "Tableau de chaînes contenant les noms de colonnes.";
-$L["reset_custom_html"] = "Réinitialiser le HTML personnalisé";
-$L["row_data_array"] = "Tableau ordonné des lignes. Chaque tableau parent contient le contenu de la ligne et chaque tableau enfant contient un tableau de valeurs correspondant aux colonnes. Voir l'exemple pour plus d'informations.";
-$L["use_custom_html_format"] = "Utiliser un format HTML personnalisé";
diff --git a/plugins/exportTypes/HTML/lang/nl.php b/plugins/exportTypes/HTML/lang/nl.php
deleted file mode 100644
index c31590c13..000000000
--- a/plugins/exportTypes/HTML/lang/nl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-$L = array();
-
-$L["available_smarty_vars"] = "Beschikbare Smarty Vars";
-$L["batch_vars"] = "Booleans voor het al dan niet de huidige batch van de resultaten die worden gegenereerd is de eerste of de laatste. Dit is alleen maar gebruikt voor gebruikers genereren van de data in-page, waarvan de resultaten in blokken genereert. Voor alle andere gevallen beide altijd waar.";
-$L["col_names_array"] = "Een geordende array van tekenreeksen die de kolomnamen.";
-$L["custom_html_format"] = "Aangepaste HTML-indeling";
-$L["data_format"] = "Data Format";
-$L["reset_custom_html"] = "Reset Aangepaste HTML";
-$L["row_data_array"] = "Een geordende array van arrays. Elke topniveau array bevat de inhoud van de rij; elk kind array bevat een geordende array van waarden voor elk gegeven.";
-$L["use_custom_html_format"] = "Aangepaste HTML-formaat";
\ No newline at end of file
diff --git a/plugins/exportTypes/JSON/JSON.class.php b/plugins/exportTypes/JSON/JSON.class.php
deleted file mode 100644
index af9e1212f..000000000
--- a/plugins/exportTypes/JSON/JSON.class.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package ExportTypes
- */
-class JSON extends ExportTypePlugin {
-	protected $isEnabled = true;
-	protected $exportTypeName = "JSON";
-	protected $jsModules = array("JSON.js");
-	protected $codeMirrorModes = array("javascript");
-	protected $contentTypeHeader = "text/json";
-	public $L = array();
-
-	private $numericFields;
-
-
-	public function generate($generator) {
-		$postData     = $generator->getPostData();
-		$data         = $generator->generateExportData();
-		$template     = $generator->getTemplateByDisplayOrder();
-		$stripWhitespace     = isset($postData["etJSON_stripWhitespace"]);
-		$dataStructureFormat = isset($postData["etJSON_dataStructureFormat"]) ? $postData["etJSON_dataStructureFormat"] : "complex";
-
-		// figure out which fields are strictly numeric. We don't wrap those values in double quotes
-		foreach ($template as $item) {
-			$this->numericFields[] = isset($item["columnMetadata"]["type"]) && $item["columnMetadata"]["type"] == "numeric";
-		}
-
-		$content = "";
-		if ($dataStructureFormat == "complex") {
-			$content = $this->generateComplex($generator, $data, $stripWhitespace);
-		} else {
-			$content = $this->generateSimple($generator, $data, $stripWhitespace);
-		}
-
-		return array(
-			"success" => true,
-			"content" => $content
-		);
-	}
-
-	private function generateSimple($generator, $data, $stripWhitespace) {
-		$newline = ($stripWhitespace) ? "" : "\n";
-		$tab     = ($stripWhitespace) ? "" : "\t";
-		$space   = ($stripWhitespace) ? "" : " ";
-
-		$content = "";
-		if ($generator->isFirstBatch()) {
-			$content .= "[$newline";
-		}
-		$numCols = count($data["colData"]);
-		$numRows = count($data["rowData"]);
-
-		for ($i=0; $i<$numRows; $i++) {
-			$content .= "{$tab}{{$newline}";
-
-			$pairs = array();
-			for ($j=0; $j<$numCols; $j++) {
-				$varName = preg_replace('/"/', '\"', $data["colData"][$j]);
-				if ($this->numericFields[$j]) {
-					$pairs[] = "{$tab}{$tab}\"$varName\":{$space}{$data["rowData"][$i][$j]}";
-				} else {
-					$pairs[] = "{$tab}{$tab}\"$varName\":{$space}\"{$data["rowData"][$i][$j]}\"";
-				}
-			}
-			$content .= implode(",$newline", $pairs);
-
-			if ($data["isLastBatch"] && $i == $numRows - 1) {
-				$content .= "{$newline}{$tab}}$newline";
-			} else {
-				$content .= "{$newline}{$tab}},$newline";
-			}
-		}
-
-		if ($generator->isLastBatch()) {
-			$content .= "]";
-		}
-
-		return $content;
-	}
-
-
-	private function generateComplex($generator, $data, $stripWhitespace) {
-		$content = "";
-		if ($generator->isFirstBatch()) {
-			$quotedCols = Utils::enquoteArray($data["colData"]);
-			if ($stripWhitespace) {
-				$cols = implode(",", $quotedCols);
-				$content .= "{\"cols\":[$cols],\"data\":[";
-			} else {
-				$cols = implode(",\n\t\t", $quotedCols);
-				$content .= "{\n\t\"cols\": [\n\t\t$cols\n\t],\n\t\"data\": [\n";
-			}
-		}
-
-		$numCols = count($data["colData"]);
-		$numRows = count($data["rowData"]);
-		for ($i=0; $i<$numRows; $i++) {
-			$rowValsArr = array();
-			for ($j=0; $j<$numCols; $j++) {
-				if ($this->numericFields[$j]) {
-					$rowValsArr[] = $data["rowData"][$i][$j];
-				} else {
-					$rowValsArr[] = "\"" . $data["rowData"][$i][$j] . "\"";
-				}
-			}
-
-			if ($stripWhitespace) {
-				$rowVals = implode(",", $rowValsArr);
-				$content .= "[$rowVals]";
-				if ($i < $numRows - 1) {
-					$content .= ",";
-				}
-			} else {
-				$rowVals = implode(",\n\t\t\t", $rowValsArr);
-				$content .= "\t\t[\n\t\t\t$rowVals\n\t\t]";
-				if ($i < $numRows - 1) {
-					$content .= ",\n";
-				}
-			}
-		}
-
-		if ($generator->isLastBatch()) {
-			if ($stripWhitespace) {
-				$content .= "]}";
-			} else {
-				$content .= "\n\t]\n}";
-			}
-		}
-		return $content;
-	}
-
-	/**
-	 * Used for constructing the filename of the filename when downloading.
-	 * @see ExportTypePlugin::getDownloadFilename()
-	 * @param Generator $generator
-	 * @return string
-	 */
-	public function getDownloadFilename($generator) {
-		$time = date("M-j-Y");
-		return "data{$time}.json";
-	}
-
-	public function getAdditionalSettingsHTML() {
-		$html =<<< END
-	<input type="checkbox" name="etJSON_stripWhitespace" id="etJSON_stripWhitespace" value="1" />
-		<label for="etJSON_stripWhitespace">{$this->L["strip_whitespace"]}</label><br />
-	{$this->L["data_structure_format"]}
-		<input type="radio" name="etJSON_dataStructureFormat" value="complex" id="stJSON_dataStructureFormat1" checked="checked" />
-			<label for="stJSON_dataStructureFormat1">{$this->L["complex"]}</label>
-		<input type="radio" name="etJSON_dataStructureFormat" value="simple" id="stJSON_dataStructureFormat2" />
-			<label for="stJSON_dataStructureFormat2">{$this->L["simple"]}</label>
-END;
-		return $html;
-	}
-}
diff --git a/plugins/exportTypes/JSON/JSON.js b/plugins/exportTypes/JSON/JSON.js
deleted file mode 100644
index 3659ec05b..000000000
--- a/plugins/exportTypes/JSON/JSON.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name JSON
-	 * @see ExportType
-	 * @description Client-side code for the JSON Export Type.
-	 * @namespace
-	 */
-
-	var MODULE_ID = "export-type-JSON";
-	var LANG = L.exportTypePlugins.JSON;
-
-	/**
-	 * If the user is generating in-page data with this Export Type, enable the javascript
-	 * mode for the in-page editor.
-	 */
-	var _onGenerate = function(msg) {
-		if (msg.exportTarget !== "inPage" || msg.exportType !== "JSON") {
-			return;
-		}
-		msg.editor.setOption("mode", "javascript");
-
-		var wrapLines = ($("#etJSON_stripWhitespace")[0].checked);
-		msg.editor.setOption("lineWrapping", wrapLines);
-	};
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.GENERATE] = _onGenerate;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _loadSettings = function(settings) {
-		if (settings.stripWhitespace === "1") {
-			$("#etJSON_stripWhitespace").attr("checked", "checked");
-		} else {
-			$("#etJSON_stripWhitespace").removeAttr("checked");
-		}
-
-		// for backward compatibility with early alpha versions
-		if (settings.hasOwnProperty("dataStructureFormat")) {
-			$("input[name=etJSON_dataStructure][value=" + settings.dataStructureFormat + "]").attr("checked", "checked");
-		}
-	};
-
-	var _saveSettings = function() {
-		return {
-			stripWhitespace: ($("#etJSON_stripWhitespace")[0].checked) ? 1 : 0,
-			dataStructureFormat: $("#etJSON_dataStructureFormat").val()
-		};
-	};
-
-	var _resetSettings = function() {
-		$("#etJSON_stripWhitespace").removeAttr("checked");
-	};
-
-	manager.registerExportType(MODULE_ID, {
-		init: _init,
-		loadSettings: _loadSettings,
-		saveSettings: _saveSettings,
-		resetSettings: _resetSettings
-	});
-});
\ No newline at end of file
diff --git a/plugins/exportTypes/JSON/lang/de.php b/plugins/exportTypes/JSON/lang/de.php
deleted file mode 100644
index 10130a4df..000000000
--- a/plugins/exportTypes/JSON/lang/de.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "JSON";
-
-$L["complex"] = "Komplex";
-$L["data_structure_format"] = "Datenstruktur-Format";
-$L["simple"] = "Einfach";
-$L["strip_whitespace"] = "Isolieren Sie Leerzeichen aus generierten Ergebnisse";
diff --git a/plugins/exportTypes/JSON/lang/en.php b/plugins/exportTypes/JSON/lang/en.php
deleted file mode 100644
index 29364d82a..000000000
--- a/plugins/exportTypes/JSON/lang/en.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$L = array();
-$L["strip_whitespace"] = "Strip whitespace from generated results";
-$L["complex"] = "Complex";
-$L["simple"] = "Simple";
-$L["data_structure_format"] = "Data structure format";
\ No newline at end of file
diff --git a/plugins/exportTypes/JSON/lang/es.php b/plugins/exportTypes/JSON/lang/es.php
deleted file mode 100644
index f5e82363d..000000000
--- a/plugins/exportTypes/JSON/lang/es.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$L = array();
-$L["strip_whitespace"] = "Eliminar espacios en blanco de los resultados generados";
-$L["complex"] = "Complejo";
-$L["simple"] = "Simple";
-$L["data_structure_format"] = "Formato de estructura de datos";
diff --git a/plugins/exportTypes/JSON/lang/fr.php b/plugins/exportTypes/JSON/lang/fr.php
deleted file mode 100644
index f7ed8c98c..000000000
--- a/plugins/exportTypes/JSON/lang/fr.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$L = array();
-
-// Category: JSON
-$L["complex"] = "Complexe";
-$L["data_structure_format"] = "Format de la structure des données";
-$L["simple"] = "Simple";
-$L["strip_whitespace"] = "Enlever les espaces dans les résultats générés";
diff --git a/plugins/exportTypes/JSON/lang/nl.php b/plugins/exportTypes/JSON/lang/nl.php
deleted file mode 100644
index c045ca9c4..000000000
--- a/plugins/exportTypes/JSON/lang/nl.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$L = array();
-$L["complex"] = "Complex";
-$L["data_structure_format"] = "Datastructuur format";
-$L["simple"] = "Eenvoudig";
-$L["strip_whitespace"] = "Strip witruimte van gegenereerde resultaten";
diff --git a/plugins/exportTypes/LDIF/LDIF.class.php b/plugins/exportTypes/LDIF/LDIF.class.php
deleted file mode 100644
index af747924d..000000000
--- a/plugins/exportTypes/LDIF/LDIF.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * @author Marco Corona <coronam@allegheny.edu>
- * @package ExportTypes
- */
-class LDIF extends ExportTypePlugin {
-
-    protected $isEnabled = true;
-    protected $exportTypeName = "LDIF";
-    protected $jsModules = array("LDIF.js");
-
-    public function generate($generator) {
-        $postData = $generator->getPostData();
-        $content  = $this->generateLDIF($generator, $postData);
-
-		return array(
-			"success" => true,
-			"content" => $content
-		);
-    }
-
-    public function getDownloadFilename($generator) {
-        $time = date("M-j-Y");
-		return "data{$time}.ldif";
-    }
-    
-	private function generateLDIF($generator, $postData) {
-		$data = $generator->generateExportData();
-		$numCols = count($data["colData"]);
-		$content = "";
-		foreach ($data["rowData"] as $row) {
-			for ($i=0; $i<$numCols; $i++) {
-				$content .= "{$data["colData"][$i]}:{$row[$i]}\n";
-			}
-			$content .= "\n";
-		}
-		return $content;
-	}
-}
\ No newline at end of file
diff --git a/plugins/exportTypes/LDIF/LDIF.js b/plugins/exportTypes/LDIF/LDIF.js
deleted file mode 100644
index 21037b64b..000000000
--- a/plugins/exportTypes/LDIF/LDIF.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*global $:false,CodeMirror:false*/
- define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name LDIF
-	 * @see ExportType
-	 * @description Client-side code for the LDIF Export Type.
-	 * @namespace
-	 */
-
-	var MODULE_ID = "export-type-LDIF";
-	var LANG = L.exportTypePlugins.LDIF;
-
-
-	manager.registerExportType(MODULE_ID, {
-
-	});
-});
-
diff --git a/plugins/exportTypes/LDIF/lang/en.php b/plugins/exportTypes/LDIF/lang/en.php
deleted file mode 100644
index ba1d4a3eb..000000000
--- a/plugins/exportTypes/LDIF/lang/en.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$L = array();
\ No newline at end of file
diff --git a/plugins/exportTypes/ProgrammingLanguage/ProgrammingLanguage.class.php b/plugins/exportTypes/ProgrammingLanguage/ProgrammingLanguage.class.php
deleted file mode 100644
index cd339a0b2..000000000
--- a/plugins/exportTypes/ProgrammingLanguage/ProgrammingLanguage.class.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package ExportTypes
- */
-class ProgrammingLanguage extends ExportTypePlugin {
-	protected $isEnabled = true;
-	protected $exportTypeName = "Programming Language";
-	protected $jsModules = array("ProgrammingLanguage.js");
-	protected $codeMirrorModes = array("php", "perl", "htmlmixed", "xml", "javascript", "css", "clike", "ruby");
-
-	public $L = array();
-
-	private $numericFields;
-
-
-	public function generate($generator) {
-		$postData     = $generator->getPostData();
-		$data         = $generator->generateExportData();
-		$template     = $generator->getTemplateByDisplayOrder();
-		$language = $postData["etProgrammingLanguage_language"];
-
-		foreach ($template as $item) {
-			$this->numericFields[] = isset($item["columnMetadata"]["type"]) && $item["columnMetadata"]["type"] == "numeric";
-		}
-
-		$content = "";
-		switch ($language) {
-			case "JavaScript":
-				$content .= $this->generateJS($data);
-				break;
-			case "Perl":
-				$content .= $this->generatePerl($data);
-				break;
-			case "PHP":
-				$content .= $this->generatePHP($data);
-				break;
-			case "Ruby":
-				$content .= $this->generateRuby($data);
-				break;
-		}
-
-		return array(
-			"success" => true,
-			"content" => $content
-		);
-	}
-
-	/**
-	 * Used for constructing the filename of the filename when downloading.
-	 * @see ExportTypePlugin::getDownloadFilename()
-	 * @param Generator $generator
-	 * @return string
-	 */
-	public function getDownloadFilename($generator) {
-		$time = date("M-j-Y");
-		return "data{$time}.";
-	}
-
-	public function getAdditionalSettingsHTML() {
-		$html =<<< END
-	{$this->L["language"]}:
-	<select name="etProgrammingLanguage_language" id="etProgrammingLanguage_language">
-		<option value="JavaScript">JavaScript</option>
-		<option value="Perl">Perl</option>
-		<option value="PHP">PHP</option>
-		<option value="Ruby">Ruby</option>
-	</select>
-END;
-		return $html;
-	}
-
-
-	private function generatePerl($data) {
-		$content = "";
-		if ($data["isFirstBatch"]) {
-			$content .= "@data = (\n";
-		}
-
-		$numCols = count($data["colData"]);
-		$numRows = count($data["rowData"]);
-
-		for ($i=0; $i<$numRows; $i++) {
-			$content .= "\t{";
-
-			$pairs = array();
-			for ($j=0; $j<$numCols; $j++) {
-				$varName = preg_replace('/"/', '\"', $data["colData"][$j]);
-				if ($this->numericFields[$j]) {
-					$pairs[] = "\"$varName\" => {$data["rowData"][$i][$j]}";
-				} else {
-					$pairs[] = "\"$varName\" => \"{$data["rowData"][$i][$j]}\"";
-				}
-			}
-			$content .= implode(",", $pairs);
-
-			if ($data["isLastBatch"] && $i == $numRows - 1) {
-				$content .= "}\n";
-			} else {
-				$content .= "},\n";
-			}
-		}
-
-		if ($data["isLastBatch"]) {
-			$content .= ");";
-		}
-		return $content;
-	}
-
-
-	private function generatePHP($data) {
-		$content = "";
-		if ($data["isFirstBatch"]) {
-			$content .= "<?" . "php\n\n\$data = array(\n";
-		}
-
-		$numCols = count($data["colData"]);
-		$numRows = count($data["rowData"]);
-
-		for ($i=0; $i<$numRows; $i++) {
-			$content .= "\tarray(";
-
-			$pairs = array();
-			for ($j=0; $j<$numCols; $j++) {
-				if ($this->numericFields[$j]) {
-					$pairs[] = "\"{$data["colData"][$j]}\"=>{$data["rowData"][$i][$j]}";
-				} else {
-					$pairs[] = "\"{$data["colData"][$j]}\"=>\"{$data["rowData"][$i][$j]}\"";
-				}
-			}
-			$content .= implode(",", $pairs);
-
-			if ($data["isLastBatch"] && $i == $numRows - 1) {
-				$content .= ")\n";
-			} else {
-				$content .= "),\n";
-			}
-		}
-
-		if ($data["isLastBatch"]) {
-			$content .= ");\n\n?>";
-		}
-		return $content;
-	}
-
-
-	private function generateJS($data) {
-		$content = "";
-		if ($data["isFirstBatch"]) {
-			$content .= "var data = [\n";
-		}
-
-		$numCols = count($data["colData"]);
-		$numRows = count($data["rowData"]);
-
-		for ($i=0; $i<$numRows; $i++) {
-			$content .= "\t{";
-
-			$pairs = array();
-			for ($j=0; $j<$numCols; $j++) {
-				if ($this->numericFields[$j]) {
-					$pairs[] = "\"{$data["colData"][$j]}\": {$data["rowData"][$i][$j]}";
-				} else {
-					$pairs[] = "\"{$data["colData"][$j]}\": \"{$data["rowData"][$i][$j]}\"";
-				}
-			}
-			$content .= implode(", ", $pairs);
-
-			if ($data["isLastBatch"] && $i == $numRows - 1) {
-				$content .= "}\n";
-			} else {
-				$content .= "},\n";
-			}
-		}
-
-		if ($data["isLastBatch"]) {
-			$content .= "];\n";
-		}
-		return $content;
-	}
-
-
-	private function generateRuby($data) {
-		$content = "";
-		if ($data["isFirstBatch"]) {
-			$content .= "data = [\n";
-		}
-
-		$numCols = count($data["colData"]);
-		$numRows = count($data["rowData"]);
-
-		for ($i=0; $i<$numRows; $i++) {
-			$content .= "\t{";
-
-			$pairs = array();
-			for ($j=0; $j<$numCols; $j++) {
-				if ($this->numericFields[$j]) {
-					$pairs[] = "'{$data["colData"][$j]}': {$data["rowData"][$i][$j]}";
-				} else {
-					$pairs[] = "'{$data["colData"][$j]}': '{$data["rowData"][$i][$j]}'";
-				}
-			}
-			$content .= implode(", ", $pairs);
-
-			if ($data["isLastBatch"] && $i == $numRows - 1) {
-				$content .= "}\n";
-			} else {
-				$content .= "},\n";
-			}
-		}
-
-		if ($data["isLastBatch"]) {
-			$content .= "];\n";
-		}
-		return $content;
-	}
-
-}
-
diff --git a/plugins/exportTypes/ProgrammingLanguage/ProgrammingLanguage.js b/plugins/exportTypes/ProgrammingLanguage/ProgrammingLanguage.js
deleted file mode 100644
index cce04f899..000000000
--- a/plugins/exportTypes/ProgrammingLanguage/ProgrammingLanguage.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"constants",
-	"lang",
-	"generator"
-], function(manager, C, L, generator) {
-
-	"use strict";
-
-	/**
-	 * @name ProgrammingLanguage
-	 * @see ExportType
-	 * @description Client-side code for the Programming Language Export Type.
-	 * @namespace
-	 */
-
-	var MODULE_ID = "export-type-ProgrammingLanguage";
-	var LANG = L.exportTypePlugins.ProgrammingLanguage;
-
-
-	/**
-	 * If the user is generating in-page data with this Export Type, enable the javascript
-	 * mode for the in-page editor.
-	 */
-	var _onGenerate = function(msg) {
-		if (msg.exportTarget != "inPage" || msg.exportType != "ProgrammingLanguage") {
-			return;
-		}
-
-		switch ($("#etProgrammingLanguage_language")[0].value) {
-			case "JavaScript":
-				msg.editor.setOption("mode", "javascript");
-				break;
-			case "Perl":
-				msg.editor.setOption("mode", "perl");
-				break;
-			case "PHP":
-				msg.editor.setOption("mode", "php");
-				break;
-			case "Ruby":
-				msg.editor.setOption("mode", "ruby");
-				break;
-		}
-	};
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.GENERATE] = _onGenerate;
-		subscriptions[C.EVENT.RESULT_TYPE.CHANGE] = _resultTypeChanged;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _loadSettings = function(settings) {
-		$("#etProgrammingLanguage_language").val(settings.language);
-	};
-
-	var _saveSettings = function() {
-		return {
-			language: $("#etProgrammingLanguage_language").val()
-		};
-	};
-
-	var _resetSettings = function() {
-		$("#etProgrammingLanguage_language").val("JavaScript");
-	};
-
-	/**
-	 * Called when the user changes the result type
-	 */
-	var _resultTypeChanged = function(msg) {
-		if (msg.newExportType == "ProgrammingLanguage") {
-			$("#gdColTitleTop,#gdColTitleBottom").html(LANG.row_label);
-		}
-	};
-
-	manager.registerExportType(MODULE_ID, {
-		init: _init,
-		loadSettings: _loadSettings,
-		saveSettings: _saveSettings,
-		resetSettings: _resetSettings
-	});
-
-});
\ No newline at end of file
diff --git a/plugins/exportTypes/ProgrammingLanguage/lang/de.php b/plugins/exportTypes/ProgrammingLanguage/lang/de.php
deleted file mode 100644
index 16d599a94..000000000
--- a/plugins/exportTypes/ProgrammingLanguage/lang/de.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "Programmiersprache";
-$L["row_label"] = "Var/Prop Name";
-$L["language"] = "Sprache";
\ No newline at end of file
diff --git a/plugins/exportTypes/ProgrammingLanguage/lang/en.php b/plugins/exportTypes/ProgrammingLanguage/lang/en.php
deleted file mode 100644
index b2e7c4eb2..000000000
--- a/plugins/exportTypes/ProgrammingLanguage/lang/en.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "Programming Language";
-$L["row_label"] = "Var/Prop Name";
-$L["language"] = "Language";
\ No newline at end of file
diff --git a/plugins/exportTypes/ProgrammingLanguage/lang/es.php b/plugins/exportTypes/ProgrammingLanguage/lang/es.php
deleted file mode 100644
index 4c87010a4..000000000
--- a/plugins/exportTypes/ProgrammingLanguage/lang/es.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "Lenguaje de programación";
-$L["row_label"] = "Nombre de var/prop";
-$L["language"] = "Lenguaje";
diff --git a/plugins/exportTypes/ProgrammingLanguage/lang/fr.php b/plugins/exportTypes/ProgrammingLanguage/lang/fr.php
deleted file mode 100644
index ba82ecb52..000000000
--- a/plugins/exportTypes/ProgrammingLanguage/lang/fr.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "Langage de Programmation";
-$L["row_label"] = "Nom de la variable ou de la propriété";
-$L["language"] = "Langage";
\ No newline at end of file
diff --git a/plugins/exportTypes/ProgrammingLanguage/lang/nl.php b/plugins/exportTypes/ProgrammingLanguage/lang/nl.php
deleted file mode 100644
index c76c6c48f..000000000
--- a/plugins/exportTypes/ProgrammingLanguage/lang/nl.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$L = array();
-
-$L["EXPORT_TYPE_NAME"] = "Programming Language";
-$L["language"] = "Taal";
-$L["row_label"] = "Var / Prop Naam";
\ No newline at end of file
diff --git a/plugins/exportTypes/SQL/SQL.class.php b/plugins/exportTypes/SQL/SQL.class.php
deleted file mode 100644
index 89593ffe2..000000000
--- a/plugins/exportTypes/SQL/SQL.class.php
+++ /dev/null
@@ -1,646 +0,0 @@
-<?php
-
-/**
- * For Data Types to properly integrate with the SQL Export Type, they should return additional metadata
- * that lets this module know about the database column type. That value is used in the initial CREATE TABLE
- * statement.
- *
- * 		"sqlField"          This is used for all SQL database types.
- * 		"sqlField_Oracle"   Used for Oracle only
- * 		"sqlField_MySQL"    Used for MySQL only
- * 		"sqlField_SQLite"   Used for SQLite only
- *		"sqlField_MSSQL"	Used for MSSQL only
- *
- * @author Ben Keen <ben.keen@gmail.com>
- * @package ExportTypes
- */
-class SQL extends ExportTypePlugin {
-	protected $isEnabled = true;
-	protected $exportTypeName = "SQL";
-	protected $jsModules = array("SQL.js");
-	protected $codeMirrorModes = array("sql");
-	public $L = array();
-
-	// stores various info about the current generation set
-	private $template;
-	private $numericFields;
-	private $postData;
-	private $exportTarget;
-	private $isFirstBatch;
-	private $isLastBatch;
-	private $includeDropTable;
-	private $createTable;
-	private $databaseType;
-	private $tableName; 
-	private $backquote;
-	private $sqlStatementType;
-	private $primaryKey;
-
-
-	function generate($generator) {
-		$this->template     = $generator->getTemplateByDisplayOrder();
-		$this->postData     = $generator->getPostData();
-		$this->exportTarget = $generator->getExportTarget();
-		$this->isFirstBatch = $generator->isFirstBatch();
-		$this->isLastBatch  = $generator->isLastBatch();
-		$this->data         = $generator->generateExportData();
-		$this->currentBatchFirstRow = $generator->getCurrentBatchFirstRow();
-
-		// grab whatever settings where chosen by the user
-		$this->includeDropTable = isset($this->postData["etSQL_dropTable"]);
-		$this->createTable      = isset($this->postData["etSQL_createTable"]);
-		$this->databaseType     = $this->postData["etSQL_databaseType"];
-		$this->tableName        = $this->postData["etSQL_tableName"];
-		$this->backquote        = isset($this->postData["etSQL_encloseWithBackquotes"]) ? "`" : "";
-		$this->sqlStatementType = isset($this->postData["etSQL_statementType"]) ? $this->postData["etSQL_statementType"] : "insert";
-		$this->primaryKey       = (isset($this->postData["etSQL_primaryKey"])) ? $this->postData["etSQL_primaryKey"] : "default";
-
-		foreach ($this->template as $item) {
-			$this->numericFields[] = isset($item["columnMetadata"]["type"]) && $item["columnMetadata"]["type"] == "numeric";
-		}
-
-		$content = "";
-		switch ($this->databaseType) {
-			case "MySQL":
-				$content .= $this->generateCreateTableSQL_MySQL();
-				break;
-			case "Postgres":
-				$content .= $this->generateCreateTableSQL_Postgres();
-				break;
-			case "Oracle":
-				$content .= $this->generateCreateTableSQL_Oracle();
-				break;
-			case "SQLite":
-				$content .= $this->generateCreateTableSQL_SQLite();
-				break;
-			case "MSSQL":
-				$content .= $this->generateCreateTableSQL_MSSQL();
-				break;
-		}
-
-		if ($this->exportTarget == "newTab") {
-			$content = $this->wrapGeneratedContent($content);
-		}
-
-		return array(
-			"success" => true,
-			"content" => $content
-		);
-	}
-
-	/**
-	 * Used for constructing the filename of the filename when downloading.
-	 * @see ExportTypePlugin::getDownloadFilename()
-	 * @param Generator $generator
-	 * @return string
-	 */
-	function getDownloadFilename($generator) {
-		$time = date("M-j-Y");
-		return "data{$time}.sql";
-	}
-
-	function getAdditionalSettingsHTML() {
-		$LANG = Core::$language->getCurrentLanguageStrings();
-
-		$html =<<< END
-<table cellspacing="0" cellpadding="0" width="100%">
-<tr>
-	<td width="50%">
-
-		<table cellspacing="2" cellpadding="0" width="100%">
-		<tr>
-			<td width="150"><label for="etSQL_tableName">{$this->L["db_table_name"]}</label></td>
-			<td valign="top"><input type="text" size="40" name="etSQL_tableName" id="etSQL_tableName" value="myTable" /></td>
-		</tr>
-		<tr>
-			<td><label for="etSQL_databaseType">{$this->L["db_type"]}</label></td>
-			<td>
-				<select name="etSQL_databaseType" id="etSQL_databaseType">
-					<option value="MySQL">MySQL</option>
-					<option value="Postgres">Postgres</option>
-					<option value="SQLite">SQLite</option>
-					<option value="Oracle">Oracle</option>
-					<option value="MSSQL">SQL Server</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td valign="top"><label>{$this->L["misc_options"]}</label></td>
-			<td>
-				<div>
-					<input type="checkbox" name="etSQL_createTable" id="etSQL_createTable" checked="checked" />
-					<label for="etSQL_createTable">{$this->L["include_create_table_query"]}</label>
-				</div>
-				<div>
-					<input type="checkbox" name="etSQL_dropTable" id="etSQL_dropTable" checked="checked" />
-					<label for="etSQL_dropTable">{$this->L["include_drop_table_query"]}</label>
-				</div>
-				<div id="etSQL_encloseWithBackquotes_group">
-					<input type="checkbox" name="etSQL_encloseWithBackquotes" id="etSQL_encloseWithBackquotes" checked="checked" />
-					<label for="etSQL_encloseWithBackquotes">{$this->L["enclose_table_backquotes"]}</label>
-				</div>
-			</td>
-		</tr>
-		</table>
-
-	</td>
-	<td width="50%" valign="top">
-
-		<table cellspacing="0" cellpadding="0" width="100%">
-		<tr>
-			<td valign="top"><label>{$this->L["statement_type"]}</label></td>
-			<td>
-				<div>
-					<input type="radio" name="etSQL_statementType" id="etSQL_statementType1" value="insert" checked="checked" />
-					<label for="etSQL_statementType1">INSERT</label>
-				</div>
-				<div id="etSQL_insertIgnore">
-					<input type="radio" name="etSQL_statementType" id="etSQL_statementType2" value="insertignore" />
-					<label for="etSQL_statementType2">INSERT IGNORE</label>
-				</div>
-				<div>
-					<input type="radio" name="etSQL_statementType" id="etSQL_statementType3" value="update" />
-					<label for="etSQL_statementType3">UPDATE</label>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td valign="top"><label>{$this->L["primary_key"]}</label></td>
-			<td>
-				<div>
-					<input type="radio" name="etSQL_primaryKey" id="etSQL_primaryKey1" value="none" />
-					<label for="etSQL_primaryKey1">{$LANG["none"]}</label>
-				</div>
-				<div>
-					<input type="radio" name="etSQL_primaryKey" id="etSQL_primaryKey2" value="default" checked="checked" />
-					<label for="etSQL_primaryKey2">{$this->L["add_default_auto_increment_col"]}</label>
-				</div>
-			</td>
-		</tr>
-		</table>
-
-	</td>
-</tr>
-</table>
-END;
-		return $html;
-	}
-
-
-	/**
-	 * Generates a MySQL table with all the data.
-	 * @return string
-	 */
-	private function generateCreateTableSQL_MySQL() {
-		$content = "";
-		$endLineChar = ($this->exportTarget == "newTab") ? "<br />\n" : "\n";
-		$prefix      = ($this->exportTarget == "newTab") ? "&nbsp;&nbsp;" : "  ";
-
-
-		if ($this->isFirstBatch) {
-			if ($this->includeDropTable) {
-				$dropTableEndLine = ($this->exportTarget == "newTab") ? "<br /><br /><hr size=\"1\" />\n" : "\n\n";
-				$content .= "DROP TABLE {$this->backquote}{$this->tableName}{$this->backquote};{$dropTableEndLine}";
-			}
-
-			if ($this->createTable) {
-				$content .= "CREATE TABLE {$this->backquote}{$this->tableName}{$this->backquote} ($endLineChar";
-				if ($this->primaryKey == "default") {
-					$content .= "{$prefix}{$this->backquote}id{$this->backquote} mediumint(8) unsigned NOT NULL auto_increment,$endLineChar";
-				}
-
-				$cols = array();
-				foreach ($this->template as $dataType) {
-					// figure out the content type. Default to MEDIUMTEXT, then use the specific SQLField_MySQL, then the SQLField
-					$columnTypeInfo = "MEDIUMTEXT";
-					if (isset($dataType["columnMetadata"]["SQLField_MySQL"])) {
-						$columnTypeInfo = $dataType["columnMetadata"]["SQLField_MySQL"];
-					} else if (isset($dataType["columnMetadata"]["SQLField"])) {
-						$columnTypeInfo = $dataType["columnMetadata"]["SQLField"];
-					}
-					$cols[] = "{$prefix}{$this->backquote}{$dataType["title"]}{$this->backquote} $columnTypeInfo";
-				}
-
-				$content .= implode(",$endLineChar", $cols);
-
-				if ($this->primaryKey == "default") {
-					$content .= ",$endLineChar{$prefix}PRIMARY KEY ({$this->backquote}id{$this->backquote})$endLineChar) AUTO_INCREMENT=1;{$endLineChar}{$endLineChar}";
-				} else if ($this->primaryKey == "none") {
-					$content .= "$endLineChar);{$endLineChar}{$endLineChar}";
-				}
-			}
-		}
-
-		$colNamesStr = "";
-		if ($this->backquote) {
-			$quoted = Utils::enquoteArray($this->data["colData"], "`");
-			$colNamesStr = implode(",", $quoted);
-		} else {
-			$colNamesStr = implode(",", $this->data["colData"]);
-		}
-
-		$numRows = count($this->data["rowData"]);
-		$numCols = count($this->data["colData"]);
-		for ($i=0; $i<$numRows; $i++) {
-			if ($this->sqlStatementType == "insert") {
-				$displayVals = array();
-				for ($j=0; $j<$numCols; $j++) {
-					if ($this->numericFields[$j]) {
-						$displayVals[] = $this->data["rowData"][$i][$j];
-					} else {
-						$displayVals[] = "\"" . $this->data["rowData"][$i][$j] . "\"";
-					}
-				}
-				$rowDataStr = implode(",", $displayVals);
-				$content .= "INSERT INTO {$this->backquote}{$this->tableName}{$this->backquote} ($colNamesStr) VALUES ($rowDataStr);$endLineChar";
-			} elseif ($this->sqlStatementType == "insertignore") {
-				$displayVals = array();
-				for ($j=0; $j<$numCols; $j++) {
-					if ($this->numericFields[$j]) {
-						$displayVals[] = $this->data["rowData"][$i][$j];
-					} else {
-						$displayVals[] = "\"" . $this->data["rowData"][$i][$j] . "\"";
-					}
-				}
-				$rowDataStr = implode(",", $displayVals);
-				$content .= "INSERT IGNORE INTO {$this->backquote}{$this->tableName}{$this->backquote} ($colNamesStr) VALUES ($rowDataStr);$endLineChar";
-			} else {
-				$pairs = array();
-				for ($j=0; $j<$numCols; $j++) {
-					$colName  = $this->data["colData"][$j];
-					if ($this->numericFields[$j]) {
-						$colValue = $this->data["rowData"][$i][$j];
-					} else {
-						$colValue = "\"" . $this->data["rowData"][$i][$j] . "\"";
-					}
-					$pairs[]  = "{$this->backquote}{$colName}{$this->backquote} = $colValue";
-				}
-
-				$pairsStr = implode(", ", $pairs);
-				$rowNum = $this->currentBatchFirstRow + $i;
-				$content .= "UPDATE {$this->backquote}{$this->tableName}{$this->backquote} SET $pairsStr WHERE {$this->backquote}id{$this->backquote} = $rowNum;$endLineChar";
-			}
-		}
-
-		return $content;
-	}
-
-
-	/**
-	 * Generates a MySQL table with all the data.
-	 * @return string
-	 */
-	private function generateCreateTableSQL_Postgres() {
-		$content = "";
-		$endLineChar = ($this->exportTarget == "newTab") ? "<br />\n" : "\n";
-		$prefix      = ($this->exportTarget == "newTab") ? "&nbsp;&nbsp;" : "  ";
-
-		if ($this->isFirstBatch) {
-			if ($this->includeDropTable) {
-				$dropTableEndLine = ($this->exportTarget == "newTab") ? "<br /><br /><hr size=\"1\" />\n" : "\n\n";
-				$content .= "DROP TABLE IF EXISTS \"{$this->tableName}\";{$dropTableEndLine}";
-			}
-
-			if ($this->createTable) {
-				$content .= "CREATE TABLE \"{$this->tableName}\" ($endLineChar";
-				if ($this->primaryKey == "default") {
-					$content .= "{$prefix}id SERIAL PRIMARY KEY,$endLineChar";
-				}
-
-				$cols = array();
-				foreach ($this->template as $dataType) {
-					// figure out the content type. Default to MEDIUMTEXT, then use the specific SQLField_MySQL, then the SQLField
-					$columnTypeInfo = "MEDIUMTEXT";
-					if (isset($dataType["columnMetadata"]["SQLField_Postgres"])) {
-						$columnTypeInfo = $dataType["columnMetadata"]["SQLField_Postgres"];
-					} else if (isset($dataType["columnMetadata"]["SQLField"])) {
-						$columnTypeInfo = $dataType["columnMetadata"]["SQLField"];
-					}
-					$cols[] = "{$prefix}{$dataType["title"]} $columnTypeInfo";
-				}
-
-				$content .= implode(",$endLineChar", $cols);
-				$content .= "$endLineChar);{$endLineChar}{$endLineChar}";
-			}
-		}
-
-		$colNamesStr = implode(",", $this->data["colData"]);
-
-		$numRows = count($this->data["rowData"]);
-		$numCols = count($this->data["colData"]);
-		for ($i=0; $i<$numRows; $i++) {
-			if ($this->sqlStatementType == "insert") {
-				$displayVals = array();
-				for ($j=0; $j<$numCols; $j++) {
-					if ($this->numericFields[$j]) {
-						$displayVals[] = $this->data["rowData"][$i][$j];
-					} else {
-						$displayVals[] = "'" . preg_replace("/'/", "''", $this->data["rowData"][$i][$j]) . "'";
-					}
-				}
-				$rowDataStr = implode(",", $displayVals);
-				$content .= "INSERT INTO \"{$this->tableName}\" ($colNamesStr) VALUES ($rowDataStr);$endLineChar";
-			} else {
-				$pairs = array();
-				for ($j=0; $j<$numCols; $j++) {
-					$colName  = $this->data["colData"][$j];
-					if ($this->numericFields[$j]) {
-						$colValue = $this->data["rowData"][$i][$j];
-					} else {
-						$colValue = "'" . preg_replace("/'/", "''", $this->data["rowData"][$i][$j]) . "'";
-					}
-					$pairs[]  = "{$colName} = $colValue";
-				}
-
-				$pairsStr = implode(", ", $pairs);
-				$rowNum = $this->currentBatchFirstRow + $i;
-				$content .= "UPDATE \"{$this->tableName}\" SET $pairsStr WHERE id = $rowNum;$endLineChar";
-			}
-		}
-
-		return $content;
-	}
-
-
-	/**
-	 * Generates an Oracle table with all the data.
-	 * @return string
-	 */
-	private function generateCreateTableSQL_Oracle() {
-		$content = "";
-		$endLineChar = ($this->exportTarget == "newTab") ? "<br />\n" : "\n";
-		$prefix      = ($this->exportTarget == "newTab") ? "&nbsp;&nbsp;" : "  ";
-
-		if ($this->isFirstBatch) {
-			if ($this->includeDropTable) {
-				$dropTableEndLine = ($this->exportTarget == "newTab") ? "<br /><br /><hr size=\"1\" />\n" : "\n\n";
-				$content .= "DROP TABLE {$this->backquote}{$this->tableName}{$this->backquote};{$dropTableEndLine}";
-			}
-
-			if ($this->createTable) {
-				$content .= "CREATE TABLE {$this->backquote}{$this->tableName}{$this->backquote} ($endLineChar";
-				if ($this->primaryKey == "default") {
-					$content .= "{$prefix}{$this->backquote}id{$this->backquote} number primary key,$endLineChar";
-				}
-
-				$cols = array();
-				foreach ($this->template as $dataType) {
-					// figure out the content type. Default to MEDIUMTEXT, then use the specific SQLField_MySQL, then the SQLField
-					$columnTypeInfo = "MEDIUMTEXT";
-					if (isset($dataType["columnMetadata"]["SQLField_Oracle"])) {
-						$columnTypeInfo = $dataType["columnMetadata"]["SQLField_Oracle"];
-					} else if (isset($dataType["columnMetadata"]["SQLField"])) {
-						$columnTypeInfo = $dataType["columnMetadata"]["SQLField"];
-					}
-					$cols[] = "{$prefix}{$this->backquote}{$dataType["title"]}{$this->backquote} $columnTypeInfo";
-				}
-
-				$content .= implode(",$endLineChar", $cols);
-
-				if ($this->primaryKey == "default") {
-					$content .= ",$endLineChar{$prefix}PRIMARY KEY ({$this->backquote}id{$this->backquote})$endLineChar) AUTO_INCREMENT=1;{$endLineChar}{$endLineChar}";
-				} else if ($this->primaryKey == "none") {
-					$content .= "$endLineChar);{$endLineChar}{$endLineChar}";
-				}
-			}
-		}
-
-		$colNamesStr = "";
-		if ($this->backquote) {
-			$quoted = Utils::enquoteArray($this->data["colData"], "`");
-			$colNamesStr = implode(",", $quoted);
-		} else {
-			$colNamesStr = implode(",", $this->data["colData"]);
-		}
-
-		$numRows = count($this->data["rowData"]);
-		$numCols = count($this->data["colData"]);
-		for ($i=0; $i<$numRows; $i++) {
-			if ($this->sqlStatementType == "insert") {
-				$displayVals = array();
-				for ($j=0; $j<$numCols; $j++) {
-					if ($this->numericFields[$j]) {
-						$displayVals[] = $this->data["rowData"][$i][$j];
-					} else {
-						$displayVals[] = "'" . preg_replace("/'/", "''", $this->data["rowData"][$i][$j]) . "'";
-					}
-				}
-				$rowDataStr = implode(",", $displayVals);
-				$content .= "INSERT INTO {$this->backquote}{$this->tableName}{$this->backquote} ($colNamesStr) VALUES ($rowDataStr);$endLineChar";
-			} else {
-				$pairs = array();
-				for ($j=0; $j<$numCols; $j++) {
-					$colName  = $this->data["colData"][$j];
-					if ($this->numericFields[$j]) {
-						$colValue = $this->data["rowData"][$i][$j];
-					} else {
-						$colValue = "'" . preg_replace("/'/", "''", $this->data["rowData"][$i][$j]) . "'";
-					}
-					$pairs[]  = "{$this->backquote}{$colName}{$this->backquote} = $colValue";
-				}
-
-				$pairsStr = implode(", ", $pairs);
-				$rowNum = $this->currentBatchFirstRow + $i;
-				$content .= "UPDATE {$this->backquote}{$this->tableName}{$this->backquote} SET $pairsStr WHERE {$this->backquote}id{$this->backquote} = $rowNum;$endLineChar";
-			}
-		}
-
-		return $content;
-	}
-
-
-	private function generateCreateTableSQL_SQLite() {
-		$content = "";
-		$endLineChar = ($this->exportTarget == "newTab") ? "<br />\n" : "\n";
-		$prefix      = ($this->exportTarget == "newTab") ? "&nbsp;&nbsp;" : "  ";
-
-		if ($this->isFirstBatch) {
-			if ($this->includeDropTable) {
-				$dropTableEndLine = ($this->exportTarget == "newTab") ? "<br /><br /><hr size=\"1\" />\n" : "\n\n" ;
-				$content .= "DROP TABLE {$this->backquote}{$this->tableName}{$this->backquote};{$dropTableEndLine}";
-			}
-
-			if ($this->createTable) {
-				$content .= "CREATE TABLE {$this->backquote}{$this->tableName}{$this->backquote} ($endLineChar";
-				if ($this->primaryKey == "default") {
-					$content .= "{$prefix}{$this->backquote}id{$this->backquote} INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,$endLineChar";
-				}
-
-				$cols = array();
-				foreach ($this->template as $dataType) {
-					// figure out the content type. Default to MEDIUMTEXT, then use the specific SQLField_MySQL, then the SQLField
-					$columnTypeInfo = "MEDIUMTEXT";
-					if (isset($dataType["columnMetadata"]["SQLField_SQLite"])) {
-						$columnTypeInfo = $dataType["columnMetadata"]["SQLField_SQLite"];
-					} else if (isset($dataType["columnMetadata"]["SQLField"])) {
-						$columnTypeInfo = $dataType["columnMetadata"]["SQLField"];
-					}
-					$cols[] = "{$prefix}{$this->backquote}{$dataType["title"]}{$this->backquote} $columnTypeInfo";
-				}
-
-				$content .= implode(",$endLineChar", $cols);
-
-				if ($this->primaryKey == "default") {
-					$content .= ",$endLineChar{$prefix}PRIMARY KEY ({$this->backquote}id{$this->backquote})$endLineChar) AUTO_INCREMENT=1;{$endLineChar}{$endLineChar}";
-				} else if ($this->primaryKey == "none") {
-					$content .= "$endLineChar);{$endLineChar}{$endLineChar}";
-				}
-			}
-		}
-
-		$colNamesStr = "";
-		if ($this->backquote) {
-			$quoted = Utils::enquoteArray($this->data["colData"], "`");
-			$colNamesStr = implode(",", $quoted);
-		} else {
-			$colNamesStr = implode(",", $this->data["colData"]);
-		}
-
-		$numRows = count($this->data["rowData"]);
-		$numCols = count($this->data["colData"]);
-		for ($i=0; $i<$numRows; $i++) {
-			if ($this->sqlStatementType == "insert") {
-				$displayVals = array();
-				for ($j=0; $j<$numCols; $j++) {
-					if ($this->numericFields[$j]) {
-						$displayVals[] = $this->data["rowData"][$i][$j];
-					} else {
-						$displayVals[] = "\"" . $this->data["rowData"][$i][$j] . "\"";
-					}
-				}
-				$rowDataStr = implode(",", $displayVals);
-				$content .= "INSERT INTO {$this->backquote}{$this->tableName}{$this->backquote} ($colNamesStr) VALUES ($rowDataStr);$endLineChar";
-			} else {
-				$pairs = array();
-				for ($j=0; $j<$numCols; $j++) {
-					$colName  = $this->data["colData"][$j];
-					if ($this->numericFields[$j]) {
-						$colValue = $this->data["rowData"][$i][$j];
-					} else {
-						$colValue = "\"" . $this->data["rowData"][$i][$j] . "\"";
-					}
-					$pairs[]  = "{$this->backquote}{$colName}{$this->backquote} = $colValue";
-				}
-
-				$pairsStr = implode(", ", $pairs);
-				$rowNum = $this->currentBatchFirstRow + $i;
-				$content .= "UPDATE {$this->backquote}{$this->tableName}{$this->backquote} SET $pairsStr WHERE {$this->backquote}id{$this->backquote} = $rowNum;$endLineChar";
-			}
-		}
-
-		return $content;
-	}
-
-	private function generateCreateTableSQL_MSSQL() {
-		$content = "";
-		$endLineChar = ($this->exportTarget == "newTab") ? "<br />\n" : "\n";
-		$prefix      = ($this->exportTarget == "newTab") ? "&nbsp;&nbsp;&nbsp;&nbsp;" : "    ";
-
-		if ($this->isFirstBatch) {
-			if ($this->includeDropTable) {
-				$dropTableEndLine = ($this->exportTarget == "newTab") ? "<br /><br /><hr size=\"1\" />\n" : "\n\n" ;
-				$content .= "IF EXISTS(SELECT 1 FROM sys.tables WHERE object_id = OBJECT_ID('{$this->tableName}'))$endLineChar";
-				$content .= "BEGIN;$endLineChar";
-				$content .= "{$prefix}DROP TABLE {$this->tableName};$endLineChar";
-				$content .= "END;$endLineChar";
-				$content .= "GO{$dropTableEndLine}";
-			}
-
-			if ($this->createTable) {
-				$content .= "CREATE TABLE {$this->tableName} ($endLineChar";
-				if ($this->primaryKey == "default") {
-					$content .= "{$prefix}{$this->tableName}ID INTEGER NOT NULL IDENTITY(1, 1),$endLineChar";
-				}
-
-				$cols = array();
-				foreach ($this->template as $dataType) {
-					// figure out the content type. Default to MEDIUMTEXT, then use the specific SQLField_MySQL, then the SQLField
-					$columnTypeInfo = "MEDIUMTEXT";
-					if (isset($dataType["columnMetadata"]["SQLField_MSSQL"])) {
-						$columnTypeInfo = $dataType["columnMetadata"]["SQLField_MSSQL"];
-					} else if (isset($dataType["columnMetadata"]["SQLField"])) {
-						$columnTypeInfo = $dataType["columnMetadata"]["SQLField"];
-					}
-					$cols[] = "{$prefix}{$dataType["title"]} $columnTypeInfo";
-				}
-
-				$content .= implode(",$endLineChar", $cols);
-
-				if ($this->primaryKey == "default") {
-					$content .= ",$endLineChar{$prefix}PRIMARY KEY ({$this->tableName}ID)$endLineChar);{$endLineChar}GO{$endLineChar}{$endLineChar}";
-				} else if ($this->primaryKey == "none") {
-					$content .= "$endLineChar);{$endLineChar}GO{$endLineChar}{$endLineChar}";
-				}
-			}
-		}
-
-		$colNamesStr = implode(",", $this->data["colData"]);
-		$numRows = count($this->data["rowData"]);
-		$numCols = count($this->data["colData"]);
-		for ($i=0; $i<$numRows; $i++) {
-			$currentRow = $i + 1;
-			if ($this->sqlStatementType == "insert") {
-				$displayVals = array();
-				for ($j=0; $j<$numCols; $j++) {
-					if ($this->numericFields[$j]) {
-						$displayVals[] = $this->data["rowData"][$i][$j];
-					} else {
-						$displayVals[] = "'" . preg_replace("/'/", "\'", $this->data["rowData"][$i][$j]) . "'";
-					}
-				}
-				$rowDataStr = implode(",", $displayVals);
-				$content .= "INSERT INTO {$this->tableName}($colNamesStr) VALUES($rowDataStr);$endLineChar";
-				
-				if (($currentRow % 1000) == 0) {
-					$content .= $endLineChar;
-					$content .= "PRINT 'Row {$currentRow} inserted';$endLineChar";
-					$content .= "GO";
-					$content .= $endLineChar;
-				}
-			} else {
-				$pairs = array();
-				for ($j=0; $j<$numCols; $j++) {
-					$colName  = $this->data["colData"][$j];
-					if ($this->numericFields[$j]) {
-						$colValue = $this->data["rowData"][$i][$j];
-					} else {
-						$colValue = "'" . preg_replace("/'/", "\'", $this->data["rowData"][$i][$j]) . "'";
-					}
-					$pairs[]  = "{$colName} = $colValue";
-				}
-
-				$pairsStr = implode(", ", $pairs);
-				$rowNum = $this->currentBatchFirstRow + $i;
-				$content .= "UPDATE {$this->tableName} SET $pairsStr WHERE {$this->tableName}ID = $rowNum;$endLineChar";
-				
-				if (($currentRow % 1000) == 0) {
-					$content .= $endLineChar;
-					$content .= "PRINT 'Row {$currentRow} updated';$endLineChar";
-					$content .= "GO";
-					$content .= $endLineChar;
-				}
-			}
-		}
-
-		return $content;
-	}
-
-	
-	function wrapGeneratedContent($generatedContent) {
-		$html =<<< END
-<!DOCTYPE html>
-<html>
-<head>
-	<style type="text/css">
-	body { margin: 10px; font-family: "lucida grande", arial; font-size: 9pt; }
-	</style>
-</head>
-<body>
-$generatedContent
-</body>
-</html>
-END;
-		return $html;
-	}
-
-}
diff --git a/plugins/exportTypes/SQL/SQL.js b/plugins/exportTypes/SQL/SQL.js
deleted file mode 100644
index 165efd42b..000000000
--- a/plugins/exportTypes/SQL/SQL.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/*global $:false*/
-define([
-	"manager",
-	"generator",
-	"constants",
-	"lang"
-], function(manager, generator, C, L) {
-
-	"use strict";
-
-	/**
-	 * @name SQL
-	 * @see ExportType
-	 * @description Client-side code for the SQL Export Type.
-	 * @namespace
-	 */
-	var MODULE_ID = "export-type-SQL";
-	var LANG = L.exportTypePlugins.SQL;
-
-
-	var _init = function() {
-		$("#etSQL_databaseType").on("change", _onChangeDatabaseType);
-
-		var subscriptions = {};
-		subscriptions[C.EVENT.APP_START] = _onChangeSettings;
-		subscriptions[C.EVENT.IO.LOAD] = _onChangeSettings;
-		subscriptions[C.EVENT.RESULT_TYPE.CHANGE] = _resultTypeChanged;
-		subscriptions[C.EVENT.GENERATE] = _onGenerate;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _onChangeDatabaseType = function(e) {
-		_updateAvailableSettings(e.target.value);
-	};
-
-	var _onChangeSettings = function() {
-		var dbType = $("#etSQL_databaseType").val();
-		_updateAvailableSettings(dbType);
-	};
-
-	var _updateAvailableSettings = function(dbType) {
-		if (dbType === "Postgres") {
-			$("#etSQL_encloseWithBackquotes").prop("disabled", true).prop("checked", false);
-			$("#etSQL_encloseWithBackquotes_group label").css("color", "#cccccc");
-		} else {
-			$("#etSQL_encloseWithBackquotes").prop("disabled", false);
-			$("#etSQL_encloseWithBackquotes_group label").css("color", "");
-		}
-
-		if (dbType === "MySQL") {
-			$("#etSQL_statementType2").prop("disabled", false);
-			$("#etSQL_insertIgnore label").css("color", "");
-		} else {
-			$("#etSQL_statementType2").prop("disabled", true).prop("checked", false);
-			$("#etSQL_insertIgnore label").css("color", "#cccccc");
-		}
-	};
-
-	/**
-	 * Called when the user changes the result type.
-	 */
-	var _resultTypeChanged = function(msg) {
-		if (msg.newExportType === "SQL") {
-			$("#gdColTitleTop,#gdColTitleBottom").html(LANG.row_label);
-		}
-	};
-
-	/**
-	 * If the user is generating in-page data with this Export Type, enable the XML
-	 * mode for the in-page editor. Since Oracle and SQLite don't have their own CodeMirror modes yet,
-	 * we just re-use MySQL for all of them: they're pretty similar, anyway.
-	 */
-	var _onGenerate = function(msg) {
-		if (msg.exportTarget !== "inPage" || msg.exportType !== "SQL") {
-			return;
-		}
-
-		// the default mode is a simple x-sql mime type. But if there's a specific one available for the
-		// chosen database type, use that instead
-		var selectedSQLMode = $("#etSQL_databaseType").val();
-		var mode = "text/x-sql";
-		switch (selectedSQLMode) {
-			case "MySQL":
-				mode = "text/x-mysql";
-				break;
-			case "MSSQL":
-				mode = "text/x-mssql";
-				break;
-		}
-
-		msg.editor.setOption("mode", mode);
-	};
-
-	var _validate = function(rowNums) {
-		var errors = [];
-
-		// first, check the Table Column names that have been entered are valid
-		var errorFields = [];
-		var errorFieldVisibleRowNums = [];
-		var validTableCol = new RegExp("^[a-zA-Z][0-9a-zA-Z_$]*$");
-		for (var i=0; i<rowNums.length; i++) {
-			var tableColField = $("#gdTitle_" + rowNums[i]);
-			var tableColFieldVal = tableColField.val();
-
-			// we don't bother throwing an error if the field is empty, because that's caught by the Core script
-			if (tableColFieldVal !== "" && !validTableCol.test(tableColFieldVal)) {
-				errorFields.push(tableColField);
-				errorFieldVisibleRowNums.push(generator.getVisibleRowOrderByRowNum(rowNums[i]));
-			}
-		}
-
-		if (errorFields.length) {
-			errors.push({
-				els: errorFields,
-				error: LANG.validation_invalid_col_name + "<b>" + errorFieldVisibleRowNums.join(", ") + "</b>"
-			});
-		}
-
-		// secondly, check the SQL fields have all been entered properly
-		var tableNameField = $("#etSQL_tableName");
-		var tableNameFieldVal = $.trim(tableNameField.val());
-		var validTableName = new RegExp("^[a-zA-Z_][0-9a-zA-Z_$]*$");
-		if (tableNameFieldVal === "" || !validTableName.test(tableNameFieldVal)) {
-			errors.push({
-				els: tableNameField,
-				error: LANG.validation_invalid_table_name
-			});
-		}
-
-		return errors;
-	};
-
-	var _loadSettings = function(settings) {
-		$("#etSQL_tableName").val(settings.tableName);
-		$("#etSQL_databaseType").val(settings.databaseType);
-		if (settings.createTable == "1") {
-			$("#etSQL_createTable").attr("checked", "checked");
-		} else {
-			$("#etSQL_createTable").removeAttr("checked");
-		}
-		if (settings.dropTable == "1") {
-			$("#etSQL_dropTable").attr("checked", "checked");
-		} else {
-			$("#etSQL_dropTable").removeAttr("checked");
-		}
-		if (settings.encloseWithBackquotes == "1") {
-			$("#etSQL_encloseWithBackquotes").attr("checked", "checked");
-		} else {
-			$("#etSQL_encloseWithBackquotes").removeAttr("checked");
-		}
-
-		$("input[name=etSQL_statementType]:eq(" + settings.statementType + ")").attr("checked", "checked");
-		$("input[name=etSQL_primaryKey]:eq(" + settings.primaryKey + ")").attr("checked", "checked");
-	};
-
-	var _saveSettings = function() {
-		return {
-			tableName:    $("#etSQL_tableName").val(),
-			databaseType: $("#etSQL_databaseType").val(),
-			createTable:  $("#etSQL_createTable").attr("checked") ? 1 : 0,
-			dropTable:    $("#etSQL_dropTable").attr("checked") ? 1 : 0,
-			encloseWithBackquotes: $("#etSQL_encloseWithBackquotes").attr("checked") ? 1 : 0,
-			statementType: $("input[name=etSQL_statementType]:checked").val(),
-			primaryKey:    $("input[name=etSQL_primaryKey]:checked").val()
-		};
-	};
-
-	var _resetSettings = function() {
-		$("#etSQL_tableName").val("myTable");
-		$("#etSQL_databaseType").val("MySQL");
-		$("#etSQL_createTable").attr("checked", "checked");
-		$("#etSQL_dropTable").attr("checked", "checked");
-		$("#etSQL_encloseWithBackquotes").attr("checked", "checked");
-		$("input[name=etSQL_statementType][value=insert]").attr("checked", "checked");
-		$("input[name=etSQL_primaryKey][value=default]").attr("checked", "checked");
-	};
-
-	manager.registerExportType(MODULE_ID, {
-
-		/*
-		 * @function
-		 * @name SQL#init
-		 */
-		init: _init,
-
-		/**
-		 * The SQL validation function checks that all table columns are a-Z, 0-9 and that all custom SQL
-		 * settings are filled in properly. For simplicity, this function doesn't do anything terribly smart
-		 * in terms of the table name and column name validation: it doesn't do custom validation against the
-		 * selected database type or against reserved words. Would be good to add...!
-		 * @function
-		 * @name SQL#validate
-		 */
-		validate: _validate,
-		loadSettings: _loadSettings,
-		saveSettings: _saveSettings,
-		resetSettings: _resetSettings
-	});
-
-});
\ No newline at end of file
diff --git a/plugins/exportTypes/SQL/lang/de.php b/plugins/exportTypes/SQL/lang/de.php
deleted file mode 100644
index 8643eb6b1..000000000
--- a/plugins/exportTypes/SQL/lang/de.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "SQL";
-
-// Category: Lang Strings
-$L["add_default_auto_increment_col"] = "Fügen Sie Standard-Auto-Increment-Spalte";
-$L["db_table_name"] = "Database Name der Tabelle";
-$L["db_type"] = "Database Type";
-$L["enclose_table_backquotes"] = "Schließen Sie Tabellen-und Feldnamen mit Backquotes";
-$L["include_create_table_query"] = "Fügen Sie CREATE TABLE-Abfrage";
-$L["include_drop_table_query"] = "Fügen Sie DROP TABLE-Abfrage";
-$L["misc_options"] = "Verschiedene Optionen";
-$L["primary_key"] = "Primary Key";
-$L["row_label"] = "Tabellenspalte";
-$L["row_label_plural"] = "Table Columns";
-$L["statement_type"] = "Statement Type";
-$L["validation_invalid_col_name"] = "Bitte geben Sie eine gültige Datenbank Spaltennamen für jede Zeile (aZ und Unterstrich). Bitte beheben Sie die folgenden Zeilen:";
-$L["validation_invalid_table_name"] = "Bitte geben Sie eine gültige Datenbank-Tabelle Name (AZ und Unterstrichen).";
diff --git a/plugins/exportTypes/SQL/lang/en.php b/plugins/exportTypes/SQL/lang/en.php
deleted file mode 100644
index 8be279e13..000000000
--- a/plugins/exportTypes/SQL/lang/en.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$L = array();
-$L["row_label"] = "Table Column";
-$L["row_label_plural"] = "Table Columns";
-$L["validation_invalid_col_name"] = "Please enter valid database column names for each row (a-Z and underscore characters). Please fix the following rows: ";
-$L["validation_invalid_table_name"] = "Please enter a valid database table name (a-Z and underscores only).";
-
-$L["db_table_name"] = "Database table name";
-$L["db_type"] = "Database Type";
-$L["misc_options"] = "Misc Options";
-$L["include_create_table_query"] = "Include CREATE TABLE query";
-$L["include_drop_table_query"] = "Include DROP TABLE query";
-$L["enclose_table_backquotes"] = "Enclose table and field names with backquotes";
-$L["statement_type"] = "Statement Type";
-$L["primary_key"] = "Primary Key";
-$L["add_default_auto_increment_col"] = "Add default auto-increment column";
diff --git a/plugins/exportTypes/SQL/lang/es.php b/plugins/exportTypes/SQL/lang/es.php
deleted file mode 100644
index be323b2f3..000000000
--- a/plugins/exportTypes/SQL/lang/es.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$L = array();
-$L["row_label"] = "Columna de la tabla";
-$L["row_label_plural"] = "Columnas de la tabla";
-$L["validation_invalid_col_name"] = "Por favor, introduce nombres válidos de columnas de la base de datos para cada fila (a-Z y guión bajo). Por favor, corrige las siguientes filas:";
-$L["validation_invalid_table_name"] = "Por favor, introduce un nombre válido de tabla de base de datos (a-Z y guión bajo).";
-
-$L["db_table_name"] = "Nombre de tabla";
-$L["db_type"] = "Tipo de base de datos";
-$L["misc_options"] = "Opciones varias";
-$L["include_create_table_query"] = "Incluir sentencia CREATE TABLE";
-$L["include_drop_table_query"] = "Incluir sentencia DROP TABLE";
-$L["enclose_table_backquotes"] = "Entrecomillar nombres (tablas, columnas)";
-$L["statement_type"] = "Tipo de sentencia";
-$L["primary_key"] = "Clave primaria";
-$L["add_default_auto_increment_col"] = "Añadir columna auto-incrementada por defecto";
diff --git a/plugins/exportTypes/SQL/lang/fr.php b/plugins/exportTypes/SQL/lang/fr.php
deleted file mode 100644
index 024f6e113..000000000
--- a/plugins/exportTypes/SQL/lang/fr.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-
-$L = array();
-
-// Category: Lang Strings
-$L["add_default_auto_increment_col"] = "Ajouter une colonne d'auto-incrémentation";
-$L["db_table_name"] = "Nom de la table";
-$L["db_type"] = "Type de base de données";
-$L["enclose_table_backquotes"] = "Protéger les noms des tables et des champs avec des `backquotes`";
-$L["include_create_table_query"] = "Inclure une requête CREATE TABLE";
-$L["include_drop_table_query"] = "Inclure une requête DROP TABLE";
-$L["misc_options"] = "Options diverses";
-$L["primary_key"] = "Clé primaire";
-$L["row_label"] = "Colonne";
-$L["row_label_plural"] = "Colonnes";
-$L["statement_type"] = "Type de requêtes";
-$L["validation_invalid_col_name"] = "Entrez des noms valides pours les noms de colonnes pour chaque ligne (aZ et _). Corrigez les lignes suivantes:";
-$L["validation_invalid_table_name"] = "Entrer un nom de table de base de données valide (aZ et _).";
diff --git a/plugins/exportTypes/SQL/lang/nl.php b/plugins/exportTypes/SQL/lang/nl.php
deleted file mode 100644
index d49a1a65f..000000000
--- a/plugins/exportTypes/SQL/lang/nl.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$L = array();
-
-$L["add_default_auto_increment_col"] = "Voeg standaard auto-increment kolom";
-$L["db_table_name"] = "Database tabel naam";
-$L["db_type"] = "Database Type";
-$L["enclose_table_backquotes"] = "Omsluiten tabel-en veldnamen met aanhalingstekens openen";
-$L["include_create_table_query"] = "Inclusief query CREATE TABLE";
-$L["include_drop_table_query"] = "Inclusief DROP TABLE query-";
-$L["misc_options"] = "Misc Opties";
-$L["primary_key"] = "Primaire sleutel";
-$L["row_label"] = "Tabelkolom";
-$L["row_label_plural"] = "Tabel Kolommen";
-$L["statement_type"] = "Verklaring Type";
-$L["validation_invalid_col_name"] = "Voer een geldige databank kolomnamen voor elke rij (aZ en onderstrepingstekens). Please fix de volgende rijen:";
-$L["validation_invalid_table_name"] = "Vul een geldige database tabel naam (az en onderstrepingstekens alleen).";
\ No newline at end of file
diff --git a/plugins/exportTypes/XML/XML.class.php b/plugins/exportTypes/XML/XML.class.php
deleted file mode 100644
index 3b0a7a22f..000000000
--- a/plugins/exportTypes/XML/XML.class.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package ExportTypes
- */
-class XML extends ExportTypePlugin {
-	protected $isEnabled = true;
-	protected $exportTypeName = "XML";
-	protected $jsModules = array("XML.js");
-	protected $codeMirrorModes = array("xml", "smarty", "smartymixed");
-	public $L = array();
-
-
-	public function __construct($runtimeContext) {
-		parent::__construct($runtimeContext);
-		if ($runtimeContext == "generation") {
-			$this->smarty = new SecureSmarty();
-			$this->smarty->template_dir = realpath(dirname(__FILE__) . "/../../../resources/libs/smarty");
-			$this->smarty->compile_dir  = realpath(dirname(__FILE__) . "/../../../cache");
-		}
-	}
-
-	/**
-	 * Generates the XML data.
-	 * @see ExportTypePlugin::generate()
-	 * @return array
-	 */
-	function generate($generator) {
-		$exportTarget = $generator->getExportTarget();
-		$postData     = $generator->getPostData();
-		$useCustomXMLFormat = isset($postData["etXMLUseCustomExportFormat"]);
-
-		$content = "";
-		if ($useCustomXMLFormat) {
-			$smartyTemplate = (get_magic_quotes_gpc()) ? stripslashes($postData["etXMLCustomHTMLSource"]) : $postData["etXMLCustomHTMLSource"];
-			$content = $this->generateCustomXML($generator, $smartyTemplate);
-		} else {
-			$content = $this->generateXML($generator, $postData);
-		}
-
-		return array(
-			"success" => true,
-			"content" => $content
-		);
-	}
-
-	/**
-	 * Used for constructing the filename of the filename when downloading.
-	 * @see ExportTypePlugin::getDownloadFilename()
-	 * @param Generator $generator
-	 * @return string
-	 */
-	public function getDownloadFilename($generator) {
-		$time = date("M-j-Y");
-		return "data{$time}.xml";
-	}
-
-	public function getAdditionalSettingsHTML() {
-		$html =<<< END
-<table cellspacing="0" cellpadding="0" width="100%">
-<tr>
-	<td width="40%" valign="top">
-		<table cellspacing="0" cellpadding="0">
-		<tr>
-			<td width="160" class="etXMLDefaultFormatLabels"><label for="etXMLRootNodeName">{$this->L["root_node_name"]}</label></td>
-			<td>
-				<input type="text" size="15" name="etXMLRootNodeName" id="etXMLRootNodeName" value="records" />
-			</td>
-		</tr>
-		<tr>
-			<td class="etXMLDefaultFormatLabels"><label for="etXMLRecordNodeName">{$this->L["record_node_name"]}</label></td>
-			<td>
-				<input type="text" size="15" name="etXMLRecordNodeName" id="etXMLRecordNodeName" value="record" />
-			</td>
-		</tr>
-		</table>
-	</td>
-	<td width="60%" valign="top">
-		<input type="checkbox" name="etXMLUseCustomExportFormat" id="etXMLUseCustomExportFormat" />
-			<label for="etXMLUseCustomExportFormat">{$this->L["use_custom_xml_format"]}</label>
-			<input type="button" id="etXMLEditCustomFormat" value="edit" disabled="disabled" />
-	</td>
-</tr>
-</table>
-<input type="hidden" name="etXMLCustomHTMLSource" id="etXMLCustomHTMLSource" />
-
-<div id="etXMLCustomFormatDialog" style="display:none">
-	<div style="width: 300px; float: left;">
-		<h4>{$this->L["available_smarty_vars"]}</h4>
-
-<pre>{\$isFirstBatch}, {\$isLastBatch}</pre>
-{$this->L["batch_vars"]}
-
-<pre>{\$colData}</pre>
-{$this->L["col_names_array"]}
-
-<pre>{\$rowData}</pre>
-{$this->L["row_data_array"]}
-
-		<button class="gdPrimaryButton" id="etXML_ResetCustomHTML">{$this->L["reset_custom_html"]}</button>
-	</div>
-	<div id="etXMLCustomContent">
-		<textarea name="etXMLCustomSmarty" id="etXMLCustomSmarty"></textarea>
-	</div>
-</div>
-END;
-		return $html;
-	}
-
-
-	/**
-	 * Generates the XML data based on the two settings available: Root Node Name and Record Node Name, which
-	 * default to "records" and "<record>" respectively.
-	 *
-	 * @param object $generator the Generator object
-	 * @param array $postData
-	 */
-	private function generateXML($generator, $postData) {
-		$data = $generator->generateExportData();
-		$rootNodeName   = $postData["etXMLRootNodeName"];
-		$recordNodeName = $postData["etXMLRecordNodeName"];
-
-		$content = "";
-		if ($generator->isFirstBatch()) {
-			$content .= '<?xml version="1.0" encoding="UTF-8" ?>';
-			$content .= "<{$rootNodeName}>\n";
-		}
-
-		$numCols = count($data["colData"]);
-		foreach ($data["rowData"] as $row) {
-			$content .= "\t<{$recordNodeName}>\n";
-			for ($i=0; $i<$numCols; $i++) {
-				$content .= "\t\t<{$data["colData"][$i]}>{$row[$i]}</{$data["colData"][$i]}>\n";
-			}
-			$content .= "\t</{$recordNodeName}>\n";
-		}
-
-		if ($generator->isLastBatch()) {
-			$content .= "</{$rootNodeName}>";
-		}
-		return $content;
-	}
-
-
-	/**
-	 * This is used to generate custom XML formats.
-	 *
-	 * @param object $generator the Generator object
-	 * @param string $smartyTemplate the Smarty content entered by
-	 */
-	private function generateCustomXML($generator, $smartyTemplate) {
-		$data = $generator->generateExportData();
-		return Templates::evalSmartyString($smartyTemplate, $data);
-	}
-
-}
diff --git a/plugins/exportTypes/XML/XML.js b/plugins/exportTypes/XML/XML.js
deleted file mode 100644
index f1cc70d3b..000000000
--- a/plugins/exportTypes/XML/XML.js
+++ /dev/null
@@ -1,263 +0,0 @@
-/*global $:false,CodeMirror:false*/
-define([
-	"manager",
-	"generator",
-	"constants",
-	"lang"
-], function(manager, generator, C, L) {
-
-	"use strict";
-
-	/**
-	 * @name XML
-	 * @see ExportType
-	 * @description Client-side code for the XML Export Type.
-	 * @namespace
-	 */
-
-	var MODULE_ID = "export-type-XML";
-	var LANG = L.exportTypePlugins.XML;
-	var _codeMirror = null;
-
-	// sucks to include this in the JS, but the <? .. ?> of the XML tag gets screwed up when embedding
-	// this in a hidden HTML element
-	var _defaultCustomXML = "{if $isFirstBatch}\n<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" +
-		"<records>\n" +
-		"{/if}\n" +
-		"{foreach $rowData as $row}\n" +
-		"\t<record>\n" +
-		"{foreach from=$colData item=col name=c}\n" +
-		"\t\t<{$col}>{$row[$smarty.foreach.c.index]}</{$col}>\n" +
-		"{/foreach}\n" +
-		"\t</record>\n" +
-		"{/foreach}\n" +
-		"{if $isLastBatch}\n" +
-		"</records>\n" +
-		"{/if}";
-
-
-	var _init = function() {
-		var subscriptions = {};
-		subscriptions[C.EVENT.RESULT_TYPE.CHANGE] = _resultTypeChanged;
-		subscriptions[C.EVENT.GENERATE] = _onGenerate;
-		manager.subscribe(MODULE_ID, subscriptions);
-
-		$(window).resize(_updateDialogDimensions);
-		$("#etXMLEditCustomFormat").bind("click", function() { _openEditCustomFormatDialog(); return false; });
-
-		// assign event handlers for the custom sections option
-		$("#etXMLUseCustomExportFormat").bind("click", function() {
-			if (this.checked) {
-				$("#etXMLEditCustomFormat").removeAttr("disabled");
-				$("#etXMLRootNodeName,#etXMLRecordNodeName").attr("disabled", "disabled");
-				$(".etXMLDefaultFormatLabels").addClass("gdDisabledText");
-			} else {
-				$("#etXMLEditCustomFormat").attr("disabled", "disabled");
-				$("#etXMLRootNodeName,#etXMLRecordNodeName").removeAttr("disabled");
-				$(".etXMLDefaultFormatLabels").removeClass("gdDisabledText");
-			}
-		});
-
-		// for onload
-		if ($("#etXML_useCustomExportFormat").attr("checked")) {
-			$("#etXML_customFormat").removeAttr("disabled").removeClass("gdDisabled");
-		}
-
-		// initialize the CodeMirror field
-		_codeMirror = CodeMirror.fromTextArea($("#etXMLCustomSmarty")[0], {
-			mode: "smartymixed",
-			lineNumbers: true
-		});
-		$("#etXMLCustomContent .CodeMirror").addClass("CodeMirror_medium");
-
-		// initialize CodeMirror to contain the default content
-		_codeMirror.setValue(_defaultCustomXML);
-
-		$("#etXML_ResetCustomHTML").on("click", _resetCustomHTML);
-	};
-
-
-	var _validate = function(rowNums) {
-		var errors = [];
-		var invalidNodeNames  = [];
-		for (var i=0; i<rowNums.length; i++) {
-			var rowNum = rowNums[i];
-			var nodeName = $("#gdTitle_" + rowNum);
-			var nodeNameVal = nodeName.val();
-
-			if (nodeNameVal.match(/\W/) || nodeNameVal.match(/^[^a-zA-Z]/)) {
-				invalidNodeNames.push({
-					field: $("#gdTitle_" + rowNum),
-					visibleRowNum: generator.getVisibleRowOrderByRowNum(rowNum)
-				});
-			}
-		}
-
-		if (invalidNodeNames.length) {
-			var problemFields = [];
-			var rowNumbers    = [];
-			for (var j=0; j<invalidNodeNames.length; j++) {
-				problemFields.push(invalidNodeNames[j].field);
-				rowNumbers.push(invalidNodeNames[j].visibleRowNum);
-			}
-			errors.push({ els: problemFields, error: LANG.invalid_node_names + " <b>" + rowNumbers.join(", ") + "</b>" });
-		}
-
-		var rootNode        = $("#etXMLRootNodeName");
-		var rootNodeValue   = $.trim(rootNode.val());
-		var recordNode      = $("#etXMLRecordNodeName");
-		var recordNodeValue = $.trim(recordNode.val());
-
-		if (rootNodeValue === "") {
-			errors.push({ els: [rootNode], error: LANG.missing_xml_root_node_name });
-		} else if (rootNodeValue.match(/\W/)) {
-			errors.push({ els: [rootNode], error: LANG.invalid_xml_root_node_name });
-		} else if (recordNodeValue === "") {
-			errors.push({ els: [recordNode], error: LANG.missing_xml_record_node_name });
-		} else if (recordNodeValue.match(/\W/)) {
-			errors.push({ els: [recordNode], error: LANG.invalid_xml_record_node_name });
-		}
-
-		return errors;
-	};
-
-
-	var _loadSettings = function(settings) {
-		$("#etXMLRootNodeName").val(settings.rootNodeName);
-		$("#etXMLRecordNodeName").val(settings.recordNodeName);
-		if (settings.useCustomExportFormat == "1") {
-			$("#etXMLUseCustomExportFormat").attr("checked", "checked");
-		} else {
-			$("#etXMLUseCustomExportFormat").removeAttr("checked");
-		}
-		$("#etXMLUseCustomExportFormat").trigger("click");
-		_codeMirror.setValue(settings.customFormat);
-	};
-
-	var _saveSettings = function() {
-		return {
-			rootNodeName: $("#etXMLRootNodeName").val(),
-			recordNodeName: $("#etXMLRecordNodeName").val(),
-			useCustomExportFormat: $("#etXMLUseCustomExportFormat").attr("checked") ? 1 : 0,
-			customFormat: _codeMirror.getValue()
-		};
-	};
-
-	var _resetSettings = function() {
-		$("#etXMLRootNodeName").val("records");
-		$("#etXMLRecordNodeName").val("record");
-		$("#etXMLUseCustomExportFormat").removeAttr("checked").trigger("click");
-		_codeMirror.setValue(_defaultCustomXML);
-	};
-
-	/**
-	 * Called when the user changes the result type. This just changes the 2nd column heading to be
-	 * "Node Name" rather than the default "Column Title".
-	 */
-	var _resultTypeChanged = function(msg) {
-		if (msg.newExportType === "XML") {
-			$("#gdColTitleTop,#gdColTitleBottom").html(LANG.row_label);
-		}
-	};
-
-	var _openEditCustomFormatDialog = function() {
-		var dimensions = _getDialogDimensions();
-
-		// calculate size of main content area
-		$("#etXMLCustomFormatDialog").dialog({
-			title: "Custom XML Format",
-			modal: true,
-			width: dimensions.dialogWidth,
-			height: dimensions.dialogHeight,
-			open: function() {
-				$("#etXMLCustomContent .CodeMirror, #etXMLCustomContent .CodeMirror-scroll").css({
-					width: dimensions.contentWidth,
-					height: dimensions.contentHeight
-				});
-				_codeMirror.refresh();
-			},
-			buttons: [
-				{
-					text: "Close",
-					click: function() {
-						$(this).dialog("close");
-					}
-				}
-			]
-		});
-
-		return false;
-	};
-
-	var _getDialogDimensions = function() {
-		var dialogHeight  = ($(window).height() / 100) * 90;
-		var dialogWidth   = ($(window).width() / 100) * 90;
-		var contentHeight = dialogHeight - 110;
-		var contentWidth  = dialogWidth - 370;
-
-		return {
-			dialogHeight: dialogHeight,
-			dialogWidth: dialogWidth,
-			contentHeight: contentHeight,
-			contentWidth: contentWidth
-		};
-	};
-
-	var _updateDialogDimensions = function() {
-		var dimensions = _getDialogDimensions();
-		$("#etHTMLCustomFormatDialog").dialog("option", "width", dimensions.dialogWidth);
-		$("#etHTMLCustomFormatDialog").dialog("option", "height", dimensions.dialogHeight);
-	};
-
-	var _resetCustomHTML = function() {
-		_codeMirror.setValue(_defaultCustomXML);
-	};
-
-	/**
-	 * If the user is generating in-page data with this Export Type, enable the XML
-	 * mode for the in-page editor.
-	 */
-	var _onGenerate = function(msg) {
-		$("#etXMLCustomHTMLSource").val(_codeMirror.getValue());
-		if (msg.exportTarget != "inPage" || msg.exportType != "XML") {
-			return;
-		}
-		msg.editor.setOption("mode", "xml");
-	};
-
-
-	manager.registerExportType(MODULE_ID, {
-		/**
-		 * @function
-		 * @name XML#init
-		 */
-		init: _init,
-
-		/**
-		 * Our validation function performed when the user clicks the main Generate button. This ensures the
-		 * XML additional settings are filled in properly and all rows have a valid node name.
-		 * @function
-		 * @name XML#validate
-		 */
-		validate: _validate,
-
-		/**
-		 * @function
-		 * @name XML#loadSettings
-		 */
-		loadSettings: _loadSettings,
-
-		/**
-		 * @function
-		 * @name XML#saveSettings
-		 */
-		saveSettings: _saveSettings,
-
-		/**
-		 * @function
-		 * @name XML#resetSettings
-		 */
-		resetSettings: _resetSettings
-	});
-
-});
\ No newline at end of file
diff --git a/plugins/exportTypes/XML/lang/de.php b/plugins/exportTypes/XML/lang/de.php
deleted file mode 100644
index 9bfc1dbf3..000000000
--- a/plugins/exportTypes/XML/lang/de.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-$L = array();
-$L["EXPORT_TYPE_NAME"] = "XML";
-
-$L["available_smarty_vars"] = "Verfügbare Smarty Vars";
-$L["batch_vars"] = "Boolsche ob die aktuelle Charge der Ergebnisse erzeugt ist die erste oder letzte. Dies wird immer nur für Benutzer Erzeugen der Daten in-Seite, die die Ergebnisse in Blöcken generiert verwendet. In allen anderen Situationen, beide sind immer wahr.";
-$L["col_names_array"] = "Ein geordnetes Array von Strings mit den Spaltennamen.";
-$L["invalid_node_names"] = "XML-Knoten-Namen können dürfen nur alphanumerische Zeichen enthalten und muss mit einem Buchstaben beginnen. Bitte beheben Sie die folgenden Zeilen:";
-$L["invalid_xml_record_node_name"] = "Bitte geben Sie eine gültige XML-Datensatz Knoten-Wert.";
-$L["invalid_xml_root_node_name"] = "Bitte geben Sie eine gültige XML-Wurzelknoten Wert.";
-$L["missing_xml_record_node_name"] = "Bitte geben Sie einen Wert für die XML-Datensatz-Knoten.";
-$L["missing_xml_root_node_name"] = "Bitte geben Sie einen Wert für die XML-Root-Knoten.";
-$L["record_node_name"] = "Rekord Knotennamen";
-$L["reset_custom_html"] = "Zurücksetzen Custom HTML";
-$L["root_node_name"] = "Wurzelknoten Namen";
-$L["row_data_array"] = "Ein geordnetes Array von Arrays. Jeder Top-Level-Array enthält den Inhalt der Zeile, jedes Kind Array enthält eine geordnete Array von Werten für jedes Element von Daten.";
-$L["row_label"] = "Node Name";
-$L["row_label_plural"] = "Node Names";
-$L["use_custom_xml_format"] = "Verwenden Sie benutzerdefinierte XML-Format";
diff --git a/plugins/exportTypes/XML/lang/en.php b/plugins/exportTypes/XML/lang/en.php
deleted file mode 100644
index af3d6328e..000000000
--- a/plugins/exportTypes/XML/lang/en.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$L = array();
-$L["use_custom_xml_format"] = "Use custom XML format";
-$L["row_label"] = "Node Name";
-$L["row_label_plural"] = "Node Names";
-$L["invalid_node_names"] = "XML node names can must only contain alphanumeric characters and must begin with a letter. Please fix the following rows:";
-$L["missing_xml_record_node_name"] = "Please enter a value for the XML record node.";
-$L["missing_xml_root_node_name"] = "Please enter a value for the XML root node.";
-$L["invalid_xml_record_node_name"] = "Please enter a valid XML record node value.";
-$L["invalid_xml_root_node_name"] = "Please enter a valid XML root node value.";
-$L["root_node_name"] = "Root node name";
-$L["record_node_name"] = "Record node name";
-$L["available_smarty_vars"] = "Available Smarty Vars";
-$L["batch_vars"] = "Booleans for whether or not the current batch of results being generated is the first or last. This is only ever used for users generating the data in-page, which generates the results in chunks. For all other situations, both are always true.";
-$L["col_names_array"] = "An ordered array of strings containing the column names.";
-$L["row_data_array"] = "An ordered array of arrays. Each top level array contains the contents of the row; each child array contains an ordered array of values for each item of data.";
-$L["reset_custom_html"] = "Reset Custom HTML";
\ No newline at end of file
diff --git a/plugins/exportTypes/XML/lang/es.php b/plugins/exportTypes/XML/lang/es.php
deleted file mode 100644
index b9daa652c..000000000
--- a/plugins/exportTypes/XML/lang/es.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$L = array();
-$L["use_custom_xml_format"] = "Usar formato XML personalizado";
-$L["row_label"] = "Nombre de nodo";
-$L["row_label_plural"] = "Nombres de nodo";
-$L["invalid_node_names"] = "Los nombres de nodo XML sólo pueden contener caracteres alfanuméricos y deben empezar con una letra. Por favor, corrige las filas siguientes:";
-$L["missing_xml_record_node_name"] = "Por favor, introduce un valor para el nodo registro de XML.";
-$L["missing_xml_root_node_name"] = "Por favor, introduce un valor para el nodo raíz XML.";
-$L["invalid_xml_record_node_name"] = "Por favor, introduce un valor de nodo de registro XML válido.";
-$L["invalid_xml_root_node_name"] = "Por favor, introduce un valor de nodo raíz de XML válido.";
-$L["root_node_name"] = "Nombre de nodo raíz";
-$L["record_node_name"] = "Nombre de nodo registro";
-$L["available_smarty_vars"] = "Variables Smarty disponibles";
-$L["batch_vars"] = "Indica si el lote actual de resultados que será generado será el primero o el último. Esto sólo se usa para datos generado en la misma página, lo que genera los resultados por lotes. En el resto de situaciones, ambos son verdaderos.";
-$L["col_names_array"] = "Un array ordenado de cadenas conteniendo los nombres de columnas.";
-$L["row_data_array"] = "Un array ordenado de arrays. Cada array de nivel superior almacena los contenidos de la fila; cada array hijo contiene un array ordenado de valores para cada ítem de datos.";
-$L["reset_custom_html"] = "Restablecer XML personalizado";
diff --git a/plugins/exportTypes/XML/lang/fr.php b/plugins/exportTypes/XML/lang/fr.php
deleted file mode 100644
index e055dc189..000000000
--- a/plugins/exportTypes/XML/lang/fr.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-$L = array();
-
-// Category: XML
-$L["available_smarty_vars"] = "Variables Smarty disponibles";
-$L["batch_vars"] = "Booléen permettant de savoir si le lot courant des résultats générés est le premier ou le dernier. N'est utilisé que dans le cas d'une génération des données dans la page, ce qui génère des résultats en morceaux. Pour tous les autres cas, les deux valeurs sont toujours vrai.";
-$L["col_names_array"] = "Un tableau chaînes contenant les noms de colonnes.";
-$L["invalid_node_names"] = "Le noms de noeuds XML ne peuvent contenir que des caractères alphanumériques et doivent commencer par une lettre. Corrigez les lignes suivantes:";
-$L["invalid_xml_record_node_name"] = "Entrez un identifiant valide pour la valeur noeud XML des enregistrements.";
-$L["invalid_xml_root_node_name"] = "Entrez un identifiant valide pour la valeur du noeud XML racine.";
-$L["missing_xml_record_node_name"] = "Entrez une valeur pour le noeud XML des enregistrements.";
-$L["missing_xml_root_node_name"] = "Entrez une valeur pour le noeud XML racine.";
-$L["record_node_name"] = "Nom du noeud des enregistrements";
-$L["reset_custom_html"] = "Réinitialiser le HTML personnalisé";
-$L["root_node_name"] = "Nom du noeud racine";
-$L["row_data_array"] = "Tableau ordonné des lignes. Chaque tableau parent contient le contenu de la ligne et chaque tableau enfant contient un tableau de valeurs correspondant aux colonnes. Voir l'exemple pour plus d'informations.";
-$L["row_label"] = "Nom du noeud";
-$L["row_label_plural"] = "Noms des noeuds";
-$L["use_custom_xml_format"] = "Utilisez un format XML personnalisé";
diff --git a/plugins/exportTypes/XML/lang/nl.php b/plugins/exportTypes/XML/lang/nl.php
deleted file mode 100644
index 1535ca7e2..000000000
--- a/plugins/exportTypes/XML/lang/nl.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-$L = array();
-
-$L["available_smarty_vars"] = "Beschikbare Smarty Vars";
-$L["batch_vars"] = "Booleans voor het al dan niet de huidige batch van de resultaten die worden gegenereerd is de eerste of de laatste. Dit is alleen maar gebruikt voor gebruikers genereren van de data in-page, waarvan de resultaten in blokken genereert. Voor alle andere gevallen beide altijd waar.";
-$L["col_names_array"] = "Een geordende array van tekenreeksen die de kolomnamen.";
-$L["invalid_node_names"] = "XML-node namen kunnen mag alleen bestaan ​​uit alfanumerieke tekens en moet beginnen met een letter. Please fix de volgende rijen:";
-$L["invalid_xml_record_node_name"] = "Vul een geldig XML-document knooppunt waarde.";
-$L["invalid_xml_root_node_name"] = "Vul een geldig XML root node waarde.";
-$L["missing_xml_record_node_name"] = "Gelieve een waarde in voor de XML opnemen knooppunt.";
-$L["missing_xml_root_node_name"] = "Gelieve een waarde in voor de XML root node.";
-$L["record_node_name"] = "Record knooppuntnaam";
-$L["reset_custom_html"] = "Reset Aangepaste HTML";
-$L["root_node_name"] = "Root knooppuntnaam";
-$L["row_data_array"] = "Een geordende array van arrays. Elke topniveau array bevat de inhoud van de rij; elk kind array bevat een geordende array van waarden voor elk gegeven.";
-$L["row_label"] = "Knooppunt naam";
-$L["row_label_plural"] = "Node Namen";
-$L["use_custom_xml_format"] = "Aangepaste XML-formaat";
diff --git a/plugins/exportTypes/index.html b/plugins/exportTypes/index.html
deleted file mode 100644
index aa7b9c934..000000000
--- a/plugins/exportTypes/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/index.html b/plugins/index.html
deleted file mode 100644
index aa7b9c934..000000000
--- a/plugins/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-</body>
-</html>
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
new file mode 100644
index 000000000..4178e3697
--- /dev/null
+++ b/pnpm-lock.yaml
@@ -0,0 +1,19377 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      turbo:
+        specifier: ^2.3.3
+        version: 2.4.2
+
+  apps/client:
+    dependencies:
+      '@apollo/client':
+        specifier: ^4.0.0
+        version: 4.0.0(graphql@16.11.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.9.19(graphql@16.11.0))
+      '@date-io/date-fns':
+        specifier: ^1.3.13
+        version: 1.3.13(date-fns@2.30.0)
+      '@mui/icons-material':
+        specifier: ^7.3.1
+        version: 7.3.1(@mui/material@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(@types/react@19.1.11)(react@19.1.1)
+      '@mui/material':
+        specifier: ^7.3.1
+        version: 7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      '@mui/x-date-pickers':
+        specifier: ^8.10.2
+        version: 8.10.2(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@mui/material@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(@mui/system@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(date-fns@2.30.0)(dayjs@1.11.13)(moment@2.30.1)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      '@react-hook/throttle':
+        specifier: ^2.2.0
+        version: 2.2.0(react@19.1.1)
+      '@reduxjs/toolkit':
+        specifier: ^2.8.2
+        version: 2.8.2(react-redux@9.2.0(@types/react@19.1.11)(react@19.1.1)(redux@5.0.1))(react@19.1.1)
+      '@types/randomcolor':
+        specifier: ^0.5.9
+        version: 0.5.9
+      '@uidotdev/usehooks':
+        specifier: ^2.4.1
+        version: 2.4.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      codemirror:
+        specifier: ^5.58.2
+        version: 5.65.18
+      date-fns:
+        specifier: ^2.17.0
+        version: 2.30.0
+      dotenv:
+        specifier: ^8.2.0
+        version: 8.6.0
+      googleapis:
+        specifier: ^65.0.0
+        version: 65.0.0
+      graphql:
+        specifier: ^16.11.0
+        version: 16.11.0
+      immer:
+        specifier: ^10.1.1
+        version: 10.1.1
+      js-cookie:
+        specifier: ^3.0.5
+        version: 3.0.5
+      nanoid:
+        specifier: ^5.1.5
+        version: 5.1.5
+      pretty-bytes:
+        specifier: ^7.0.1
+        version: 7.0.1
+      randomcolor:
+        specifier: ^0.6.2
+        version: 0.6.2
+      react:
+        specifier: ^19.1.1
+        version: 19.1.1
+      react-beautiful-dnd:
+        specifier: ^13.1.1
+        version: 13.1.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      react-codemirror2:
+        specifier: ^8.0.1
+        version: 8.0.1(codemirror@5.65.18)(react@19.1.1)
+      react-copy-to-clipboard:
+        specifier: ^5.1.0
+        version: 5.1.0(react@19.1.1)
+      react-countup:
+        specifier: ^6.5.3
+        version: 6.5.3(react@19.1.1)
+      react-dom:
+        specifier: ^19.1.1
+        version: 19.1.1(react@19.1.1)
+      react-hooks-window-size:
+        specifier: ^0.3.0
+        version: 0.3.0(react@19.1.1)
+      react-input-autosize:
+        specifier: ^3.0.0
+        version: 3.0.0(react@19.1.1)
+      react-number-format:
+        specifier: 5.4.4
+        version: 5.4.4(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      react-redux:
+        specifier: ^9.2.0
+        version: 9.2.0(@types/react@19.1.11)(react@19.1.1)(redux@5.0.1)
+      react-router:
+        specifier: ^7.8.2
+        version: 7.8.2(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      react-router-dom:
+        specifier: ^7.8.2
+        version: 7.8.2(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      react-select:
+        specifier: ^5.10.2
+        version: 5.10.2(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      react-sortable-hoc:
+        specifier: ^1.11.0
+        version: 1.11.0(prop-types@15.8.1)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      react-split-pane:
+        specifier: ^0.1.89
+        version: 0.1.92(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      reactour:
+        specifier: ^1.18.0
+        version: 1.19.4(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react-is@19.1.1)(react@19.1.1)(styled-components@4.4.1(@babel/core@7.26.9)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))
+      recharts:
+        specifier: ^3.1.2
+        version: 3.1.2(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react-is@19.1.1)(react@19.1.1)(redux@5.0.1)
+      redux:
+        specifier: ^5.0.1
+        version: 5.0.1
+      redux-persist:
+        specifier: ^6.0.0
+        version: 6.0.0(react@19.1.1)(redux@5.0.1)
+      rollup:
+        specifier: ^2.31.0
+        version: 2.79.2
+      rxjs:
+        specifier: ^7.3.0
+        version: 7.8.2
+      sass:
+        specifier: ^1.49.9
+        version: 1.85.0
+      styled-components:
+        specifier: ^4.0.0
+        version: 4.4.1(@babel/core@7.26.9)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      terser-webpack-plugin:
+        specifier: ^3.0.3
+        version: 3.1.0(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      underscore:
+        specifier: ^1.13.7
+        version: 1.13.7
+    devDependencies:
+      '@babel/core':
+        specifier: ^7.7.4
+        version: 7.26.9
+      '@babel/plugin-proposal-class-properties':
+        specifier: ^7.10.4
+        version: 7.18.6(@babel/core@7.26.9)
+      '@babel/plugin-syntax-dynamic-import':
+        specifier: ^7.8.3
+        version: 7.8.3(@babel/core@7.26.9)
+      '@babel/preset-env':
+        specifier: ^7.7.4
+        version: 7.26.9(@babel/core@7.26.9)
+      '@babel/preset-react':
+        specifier: ^7.7.4
+        version: 7.26.3(@babel/core@7.26.9)
+      '@esbuild-plugins/tsconfig-paths':
+        specifier: ^0.0.4
+        version: 0.0.4(esbuild@0.25.0)(typescript@4.9.5)
+      '@generatedata/config':
+        specifier: workspace:*
+        version: link:../../packages/config
+      '@generatedata/plugins':
+        specifier: workspace:*
+        version: link:../../packages/plugins
+      '@generatedata/types':
+        specifier: workspace:*
+        version: link:../../packages/types
+      '@generatedata/utils':
+        specifier: workspace:*
+        version: link:../../packages/utils
+      '@rollup/plugin-commonjs':
+        specifier: ^15.1.0
+        version: 15.1.0(rollup@2.79.2)
+      '@rollup/plugin-node-resolve':
+        specifier: ^8.4.0
+        version: 8.4.0(rollup@2.79.2)
+      '@stylistic/eslint-plugin-js':
+        specifier: ^3.1.0
+        version: 3.1.0(eslint@8.57.1)
+      '@teamsupercell/typings-for-css-modules-loader':
+        specifier: ^2.5.2
+        version: 2.5.2
+      '@testing-library/react':
+        specifier: ^16.3.0
+        version: 16.3.0(@testing-library/dom@7.31.2)(@types/react-dom@19.0.4(@types/react@19.1.11))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      '@types/codemirror':
+        specifier: ^0.0.99
+        version: 0.0.99
+      '@types/jest':
+        specifier: ^26.0.15
+        version: 26.0.24
+      '@types/js-cookie':
+        specifier: ^3.0.5
+        version: 3.0.6
+      '@types/loadable__component':
+        specifier: ^5.13.8
+        version: 5.13.9
+      '@types/node':
+        specifier: ^20.19.4
+        version: 20.19.11
+      '@types/react':
+        specifier: ^19.1.11
+        version: 19.1.11
+      '@types/react-beautiful-dnd':
+        specifier: ^13.1.1
+        version: 13.1.8
+      '@types/react-copy-to-clipboard':
+        specifier: ^5.0.7
+        version: 5.0.7
+      '@types/react-input-autosize':
+        specifier: ^2.2.4
+        version: 2.2.4
+      '@types/reactour':
+        specifier: ^1.18.5
+        version: 1.18.5
+      '@types/redux-testkit':
+        specifier: ^1.0.8
+        version: 1.0.8
+      '@types/sinon':
+        specifier: ^7.5.1
+        version: 7.5.2
+      '@typescript-eslint/eslint-plugin':
+        specifier: ^5.54.0
+        version: 5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)(typescript@4.9.5)
+      '@typescript-eslint/parser':
+        specifier: ^5.54.0
+        version: 5.62.0(eslint@8.57.1)(typescript@4.9.5)
+      autoprefixer:
+        specifier: 6.7.2
+        version: 6.7.2
+      babel-eslint:
+        specifier: ^10.0.3
+        version: 10.1.0(eslint@8.57.1)
+      babel-loader:
+        specifier: ^8.0.6
+        version: 8.4.1(@babel/core@7.26.9)(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      babel-preset-airbnb:
+        specifier: ^4.4.0
+        version: 4.5.0(@babel/core@7.26.9)(@babel/runtime@7.28.3)
+      browser-env:
+        specifier: 3.3.0
+        version: 3.3.0
+      case-sensitive-paths-webpack-plugin:
+        specifier: ^2.3.0
+        version: 2.4.0
+      concurrently:
+        specifier: ^5.2.0
+        version: 5.3.0
+      coveralls:
+        specifier: ^3.0.9
+        version: 3.1.1
+      cross-fetch:
+        specifier: ^3.1.5
+        version: 3.2.0
+      css-loader:
+        specifier: ^3.4.0
+        version: 3.6.0(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      cypress:
+        specifier: ^6.0.1
+        version: 6.9.1
+      dotenv-webpack:
+        specifier: ^6.0.0
+        version: 6.0.4(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      eslint:
+        specifier: ^8.52.0
+        version: 8.57.1
+      eslint-config-airbnb:
+        specifier: ^19.0.4
+        version: 19.0.4(eslint-plugin-import@2.31.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.4(eslint@8.57.1))(eslint@8.57.1)
+      eslint-config-airbnb-base:
+        specifier: ^15.0.0
+        version: 15.0.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import:
+        specifier: ^2.27.5
+        version: 2.31.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)
+      eslint-plugin-jsx-a11y:
+        specifier: ^6.7.1
+        version: 6.10.2(eslint@8.57.1)
+      eslint-plugin-react:
+        specifier: ^7.32.0
+        version: 7.37.4(eslint@8.57.1)
+      eslint-webpack-plugin:
+        specifier: ^4.0.1
+        version: 4.2.0(eslint@8.57.1)(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      extract-text-webpack-plugin:
+        specifier: 1.0.1
+        version: 1.0.1(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      grunt:
+        specifier: ^1.6.1
+        version: 1.6.1
+      grunt-cli:
+        specifier: ^1.3.2
+        version: 1.5.0
+      grunt-contrib-clean:
+        specifier: ^2.0.0
+        version: 2.0.1(grunt@1.6.1)
+      grunt-contrib-copy:
+        specifier: ^1.0.0
+        version: 1.0.0
+      grunt-contrib-cssmin:
+        specifier: ^5.0.0
+        version: 5.0.0
+      grunt-contrib-uglify:
+        specifier: ^5.2.2
+        version: 5.2.2
+      grunt-contrib-watch:
+        specifier: ^1.1.0
+        version: 1.1.0
+      grunt-md5:
+        specifier: ^0.1.12
+        version: 0.1.12(grunt@1.6.1)
+      grunt-shell:
+        specifier: ^4.0.0
+        version: 4.0.0(grunt@1.6.1)
+      history:
+        specifier: ^5.3.0
+        version: 5.3.0
+      html-webpack-plugin:
+        specifier: ^5.5.0
+        version: 5.6.3(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      jest:
+        specifier: ^29.4.3
+        version: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5))
+      jest-cli:
+        specifier: ^29.4.3
+        version: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5))
+      jest-css-modules:
+        specifier: ^2.1.0
+        version: 2.1.0
+      jest-environment-jsdom:
+        specifier: ^29.4.3
+        version: 29.7.0
+      json-loader:
+        specifier: 0.5.4
+        version: 0.5.4
+      md5-file:
+        specifier: ^5.0.0
+        version: 5.0.0
+      mini-css-extract-plugin:
+        specifier: ^0.8.0
+        version: 0.8.2(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      postcss-loader:
+        specifier: 1.2.2
+        version: 1.2.2
+      prettier:
+        specifier: ^3.4.2
+        version: 3.5.1
+      prettier-eslint:
+        specifier: ^16.3.0
+        version: 16.3.0
+      promise:
+        specifier: 7.1.1
+        version: 7.1.1
+      redux-testkit:
+        specifier: ^1.0.6
+        version: 1.0.6
+      reselect:
+        specifier: ^4.0.0
+        version: 4.1.8
+      rimraf:
+        specifier: ^6.0.1
+        version: 6.0.1
+      rollup-plugin-multi-entry:
+        specifier: ^2.1.0
+        version: 2.1.0
+      rollup-plugin-strip-exports:
+        specifier: ^2.0.6
+        version: 2.0.7
+      rollup-plugin-terser:
+        specifier: ^6.1.0
+        version: 6.1.0(rollup@2.79.2)
+      rollup-plugin-typescript2:
+        specifier: ^0.27.1
+        version: 0.27.3(rollup@2.79.2)(typescript@4.9.5)
+      sass-loader:
+        specifier: ^16.0.5
+        version: 16.0.5(sass@1.85.0)(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      sinon:
+        specifier: ^8.0.4
+        version: 8.1.1
+      style-loader:
+        specifier: ^1.0.0
+        version: 1.3.0(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      ts-jest:
+        specifier: ^29.2.5
+        version: 29.2.5(@babel/core@7.26.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.9))(esbuild@0.25.0)(jest@29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5)))(typescript@4.9.5)
+      ts-loader:
+        specifier: ^9.4.2
+        version: 9.5.2(typescript@4.9.5)(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      ts-node:
+        specifier: ^10.9.2
+        version: 10.9.2(@types/node@20.19.11)(typescript@4.9.5)
+      tsconfig-paths:
+        specifier: 4.1.1
+        version: 4.1.1
+      typescript:
+        specifier: ^4.9.3
+        version: 4.9.5
+      use-onclickoutside:
+        specifier: ^0.3.1
+        version: 0.3.2(@types/react@19.1.11)(react@19.1.1)
+      webpack:
+        specifier: ^5.94.0
+        version: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+      webpack-bundle-analyzer:
+        specifier: ^4.8.0
+        version: 4.10.2
+      webpack-cli:
+        specifier: ^5.0.1
+        version: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0)
+      webpack-dev-middleware:
+        specifier: ^6.1.2
+        version: 6.1.3(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      webpack-dev-server:
+        specifier: ^4.11.0
+        version: 4.15.2(webpack-cli@5.1.4)(webpack@5.98.0)
+      webpack-hot-middleware:
+        specifier: ^2.25.3
+        version: 2.26.1
+      webpack-manifest-plugin:
+        specifier: 5.0.0
+        version: 5.0.0(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+
+  apps/server:
+    dependencies:
+      '@types/nanoid':
+        specifier: 3.0.0
+        version: 3.0.0
+      apollo-server-express:
+        specifier: ^2.19.0
+        version: 2.26.2(graphql@16.11.0)
+      bcrypt:
+        specifier: ^5.0.0
+        version: 5.1.1
+      codemirror:
+        specifier: ^5.58.2
+        version: 5.65.18
+      cookie-parser:
+        specifier: ^1.4.5
+        version: 1.4.7
+      date-fns:
+        specifier: ^2.17.0
+        version: 2.30.0
+      express:
+        specifier: ^4.20.2
+        version: 4.21.2
+      google-auth-library:
+        specifier: ^6.1.3
+        version: 6.1.6
+      jsonwebtoken:
+        specifier: ^9.0.2
+        version: 9.0.2
+      mysql2:
+        specifier: ^2.2.5
+        version: 2.3.3
+      nanoid:
+        specifier: ^3.3.4
+        version: 3.3.8
+      nodemailer:
+        specifier: ^6.9.9
+        version: 6.10.0
+      nodemon:
+        specifier: ^2.0.6
+        version: 2.0.22
+      sequelize:
+        specifier: ^6.29.0
+        version: 6.37.5(mysql2@2.3.3)
+    devDependencies:
+      '@generatedata/config':
+        specifier: workspace:*
+        version: link:../../packages/config
+      '@generatedata/utils':
+        specifier: workspace:*
+        version: link:../../packages/utils
+      dotenv:
+        specifier: ^8.2.0
+        version: 8.6.0
+
+  packages/cli:
+    dependencies:
+      ansi-colors:
+        specifier: ^4.1.3
+        version: 4.1.3
+      cli-progress:
+        specifier: ^3.11.2
+        version: 3.12.0
+      yargs:
+        specifier: ^17.6.2
+        version: 17.7.2
+    devDependencies:
+      '@generatedata/plugins':
+        specifier: workspace:*
+        version: link:../plugins
+      '@types/jest':
+        specifier: ^26.0.15
+        version: 26.0.24
+      grunt:
+        specifier: ^1.6.1
+        version: 1.6.1
+      grunt-cli:
+        specifier: ^1.3.2
+        version: 1.5.0
+      jest:
+        specifier: ^26.6.3
+        version: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-cli:
+        specifier: ^26.6.3
+        version: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-css-modules:
+        specifier: ^2.1.0
+        version: 2.1.0
+      typescript:
+        specifier: ^5.7.3
+        version: 5.7.3
+
+  packages/cli-test: {}
+
+  packages/config:
+    devDependencies:
+      '@types/node':
+        specifier: ^20.19.11
+        version: 20.19.11
+      npm-run-all:
+        specifier: ^4.1.5
+        version: 4.1.5
+      typescript:
+        specifier: 5.9.2
+        version: 5.9.2
+
+  packages/plugins:
+    dependencies:
+      '@mui/icons-material':
+        specifier: ^7.3.1
+        version: 7.3.1(@mui/material@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(@types/react@19.1.11)(react@19.1.1)
+      '@mui/lab':
+        specifier: ^7.0.0-beta.16
+        version: 7.0.0-beta.16(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@mui/material@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      '@mui/material':
+        specifier: ^7.3.1
+        version: 7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      date-fns:
+        specifier: ^2.17.0
+        version: 2.30.0
+      react:
+        specifier: ^19.1.1
+        version: 19.1.1
+    devDependencies:
+      '@generatedata/config':
+        specifier: workspace:*
+        version: link:../config
+      '@generatedata/types':
+        specifier: workspace:*
+        version: link:../types
+      '@generatedata/utils':
+        specifier: workspace:*
+        version: link:../utils
+      '@testing-library/react':
+        specifier: ^10.4.7
+        version: 10.4.9(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      copyfiles:
+        specifier: 2.4.1
+        version: 2.4.1
+      jest:
+        specifier: ^29.4.3
+        version: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      npm-run-all:
+        specifier: ^4.1.5
+        version: 4.1.5
+      typescript:
+        specifier: ^5.7.3
+        version: 5.7.3
+
+  packages/types:
+    devDependencies:
+      '@generatedata/config':
+        specifier: workspace:*
+        version: link:../config
+
+  packages/utils:
+    dependencies:
+      '@mui/lab':
+        specifier: ^7.0.0-beta.16
+        version: 7.0.0-beta.16(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@mui/material@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      '@mui/material':
+        specifier: ^7.3.1
+        version: 7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      bcrypt:
+        specifier: ^5.0.0
+        version: 5.1.1
+      date-fns:
+        specifier: ^2.17.0
+        version: 2.30.0
+      nanoid:
+        specifier: ^3.3.4
+        version: 3.3.8
+    devDependencies:
+      '@date-io/date-fns':
+        specifier: ^1.3.13
+        version: 1.3.13(date-fns@2.30.0)
+      '@generatedata/config':
+        specifier: workspace:*
+        version: link:../config
+      '@generatedata/types':
+        specifier: workspace:*
+        version: link:../types
+      '@testing-library/react':
+        specifier: ^10.4.7
+        version: 10.4.9(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      '@types/jest':
+        specifier: ^29
+        version: 29.5.14
+      '@types/sinon':
+        specifier: ^7.5.1
+        version: 7.5.2
+      jest:
+        specifier: ^29.4.3
+        version: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      sinon:
+        specifier: ^8.0.4
+        version: 8.1.1
+      typescript:
+        specifier: ^5.7.3
+        version: 5.7.3
+
+packages:
+
+  '@ampproject/remapping@2.3.0':
+    resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
+    engines: {node: '>=6.0.0'}
+
+  '@apollo/client@4.0.0':
+    resolution: {integrity: sha512-VMJXFLAro7ZF8ckEyeP8Wvtez7G+7LAq/SHfk3JpyZbuODtBujaqFwMFlFOdXKC8eejzuS6DfvoaiUquAFWUZw==}
+    peerDependencies:
+      graphql: ^16.0.0
+      graphql-ws: ^5.5.5 || ^6.0.3
+      react: ^17.0.0 || ^18.0.0 || >=19.0.0-rc
+      react-dom: ^17.0.0 || ^18.0.0 || >=19.0.0-rc
+      rxjs: ^7.3.0
+      subscriptions-transport-ws: ^0.9.0 || ^0.11.0
+    peerDependenciesMeta:
+      graphql-ws:
+        optional: true
+      react:
+        optional: true
+      react-dom:
+        optional: true
+      subscriptions-transport-ws:
+        optional: true
+
+  '@apollo/protobufjs@1.2.2':
+    resolution: {integrity: sha512-vF+zxhPiLtkwxONs6YanSt1EpwpGilThpneExUN5K3tCymuxNnVq2yojTvnpRjv2QfsEIt/n7ozPIIzBLwGIDQ==}
+    hasBin: true
+
+  '@apollographql/apollo-tools@0.5.4':
+    resolution: {integrity: sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw==}
+    engines: {node: '>=8', npm: '>=6'}
+    peerDependencies:
+      graphql: ^14.2.1 || ^15.0.0 || ^16.0.0
+
+  '@apollographql/graphql-playground-html@1.6.27':
+    resolution: {integrity: sha512-tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw==}
+
+  '@apollographql/graphql-upload-8-fork@8.1.4':
+    resolution: {integrity: sha512-lHAj/PUegYu02zza9Pg0bQQYH5I0ah1nyIzu2YIqOv41P0vu3GCBISAmQCfFHThK7N3dy7dLFPhoKcXlXRLPoQ==}
+    engines: {node: '>=8.5'}
+    peerDependencies:
+      graphql: 0.13.1 - 15
+
+  '@babel/code-frame@7.26.2':
+    resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/compat-data@7.26.8':
+    resolution: {integrity: sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/core@7.26.9':
+    resolution: {integrity: sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/generator@7.26.9':
+    resolution: {integrity: sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-annotate-as-pure@7.25.9':
+    resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-compilation-targets@7.26.5':
+    resolution: {integrity: sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-create-class-features-plugin@7.26.9':
+    resolution: {integrity: sha512-ubbUqCofvxPRurw5L8WTsCLSkQiVpov4Qx0WMA+jUN+nXBK8ADPlJO1grkFw5CWKC5+sZSOfuGMdX1aI1iT9Sg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-create-regexp-features-plugin@7.26.3':
+    resolution: {integrity: sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-define-polyfill-provider@0.6.3':
+    resolution: {integrity: sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  '@babel/helper-member-expression-to-functions@7.25.9':
+    resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-imports@7.25.9':
+    resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-transforms@7.26.0':
+    resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-optimise-call-expression@7.25.9':
+    resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-plugin-utils@7.26.5':
+    resolution: {integrity: sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-remap-async-to-generator@7.25.9':
+    resolution: {integrity: sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-replace-supers@7.26.5':
+    resolution: {integrity: sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
+    resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-string-parser@7.25.9':
+    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-identifier@7.25.9':
+    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-option@7.25.9':
+    resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-wrap-function@7.25.9':
+    resolution: {integrity: sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helpers@7.26.9':
+    resolution: {integrity: sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/parser@7.26.9':
+    resolution: {integrity: sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9':
+    resolution: {integrity: sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9':
+    resolution: {integrity: sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9':
+    resolution: {integrity: sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9':
+    resolution: {integrity: sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.13.0
+
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9':
+    resolution: {integrity: sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-proposal-class-properties@7.18.6':
+    resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
+    engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-proposal-nullish-coalescing-operator@7.18.6':
+    resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
+    engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-proposal-numeric-separator@7.18.6':
+    resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==}
+    engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-proposal-object-rest-spread@7.20.7':
+    resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
+    engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-proposal-optional-catch-binding@7.18.6':
+    resolution: {integrity: sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==}
+    engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-catch-binding instead.
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-proposal-optional-chaining@7.21.0':
+    resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==}
+    engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2':
+    resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-async-generators@7.8.4':
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-bigint@7.8.3':
+    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-class-properties@7.12.13':
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-class-static-block@7.14.5':
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-dynamic-import@7.8.3':
+    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-assertions@7.26.0':
+    resolution: {integrity: sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-attributes@7.26.0':
+    resolution: {integrity: sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-meta@7.10.4':
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-json-strings@7.8.3':
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-jsx@7.25.9':
+    resolution: {integrity: sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4':
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3':
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-numeric-separator@7.10.4':
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-object-rest-spread@7.8.3':
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3':
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-optional-chaining@7.8.3':
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-private-property-in-object@7.14.5':
+    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-top-level-await@7.14.5':
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-typescript@7.25.9':
+    resolution: {integrity: sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6':
+    resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-arrow-functions@7.25.9':
+    resolution: {integrity: sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-async-generator-functions@7.26.8':
+    resolution: {integrity: sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-async-to-generator@7.25.9':
+    resolution: {integrity: sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-block-scoped-functions@7.26.5':
+    resolution: {integrity: sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-block-scoping@7.25.9':
+    resolution: {integrity: sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-class-properties@7.25.9':
+    resolution: {integrity: sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-class-static-block@7.26.0':
+    resolution: {integrity: sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
+
+  '@babel/plugin-transform-classes@7.25.9':
+    resolution: {integrity: sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-computed-properties@7.25.9':
+    resolution: {integrity: sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-destructuring@7.25.9':
+    resolution: {integrity: sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-dotall-regex@7.25.9':
+    resolution: {integrity: sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-duplicate-keys@7.25.9':
+    resolution: {integrity: sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9':
+    resolution: {integrity: sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-dynamic-import@7.25.9':
+    resolution: {integrity: sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-exponentiation-operator@7.26.3':
+    resolution: {integrity: sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-export-namespace-from@7.25.9':
+    resolution: {integrity: sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-for-of@7.26.9':
+    resolution: {integrity: sha512-Hry8AusVm8LW5BVFgiyUReuoGzPUpdHQQqJY5bZnbbf+ngOHWuCuYFKw/BqaaWlvEUrF91HMhDtEaI1hZzNbLg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-function-name@7.25.9':
+    resolution: {integrity: sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-jscript@7.25.9':
+    resolution: {integrity: sha512-ZMrhV6AlHwcioQU9egLUX46QEH0Vf2NFhFKfU/eplzryoZFxWTKRx97J/xAlW8DyvcLwbxlz2dN5tpT3Duq+tQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-json-strings@7.25.9':
+    resolution: {integrity: sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-literals@7.25.9':
+    resolution: {integrity: sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-logical-assignment-operators@7.25.9':
+    resolution: {integrity: sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-member-expression-literals@7.25.9':
+    resolution: {integrity: sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-amd@7.25.9':
+    resolution: {integrity: sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-commonjs@7.26.3':
+    resolution: {integrity: sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-systemjs@7.25.9':
+    resolution: {integrity: sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-umd@7.25.9':
+    resolution: {integrity: sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9':
+    resolution: {integrity: sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-new-target@7.25.9':
+    resolution: {integrity: sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-nullish-coalescing-operator@7.26.6':
+    resolution: {integrity: sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-numeric-separator@7.25.9':
+    resolution: {integrity: sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-rest-spread@7.25.9':
+    resolution: {integrity: sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-super@7.25.9':
+    resolution: {integrity: sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-catch-binding@7.25.9':
+    resolution: {integrity: sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-chaining@7.25.9':
+    resolution: {integrity: sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-parameters@7.25.9':
+    resolution: {integrity: sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-methods@7.25.9':
+    resolution: {integrity: sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-property-in-object@7.25.9':
+    resolution: {integrity: sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-property-literals@7.25.9':
+    resolution: {integrity: sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-property-mutators@7.25.9':
+    resolution: {integrity: sha512-PSFqCW743UXxScHjpepF2NdovT6FdRQo+diFXVxfNd8zt3S0W4zhYR5IyT31uzD75qax/itfqm2bENRq74Mjhw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-display-name@7.25.9':
+    resolution: {integrity: sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx-development@7.25.9':
+    resolution: {integrity: sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx@7.25.9':
+    resolution: {integrity: sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-pure-annotations@7.25.9':
+    resolution: {integrity: sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regenerator@7.25.9':
+    resolution: {integrity: sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regexp-modifiers@7.26.0':
+    resolution: {integrity: sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-reserved-words@7.25.9':
+    resolution: {integrity: sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-runtime@7.26.9':
+    resolution: {integrity: sha512-Jf+8y9wXQbbxvVYTM8gO5oEF2POdNji0NMltEkG7FtmzD9PVz7/lxpqSdTvwsjTMU5HIHuDVNf2SOxLkWi+wPQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-shorthand-properties@7.25.9':
+    resolution: {integrity: sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-spread@7.25.9':
+    resolution: {integrity: sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-sticky-regex@7.25.9':
+    resolution: {integrity: sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-template-literals@7.26.8':
+    resolution: {integrity: sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-typeof-symbol@7.26.7':
+    resolution: {integrity: sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-escapes@7.25.9':
+    resolution: {integrity: sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-property-regex@7.25.9':
+    resolution: {integrity: sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-regex@7.25.9':
+    resolution: {integrity: sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-sets-regex@7.25.9':
+    resolution: {integrity: sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/preset-env@7.26.9':
+    resolution: {integrity: sha512-vX3qPGE8sEKEAZCWk05k3cpTAE3/nOYca++JA+Rd0z2NCNzabmYvEiSShKzm10zdquOIAVXsy2Ei/DTW34KlKQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/preset-modules@0.1.6-no-external-plugins':
+    resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
+
+  '@babel/preset-react@7.26.3':
+    resolution: {integrity: sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/runtime-corejs3@7.26.9':
+    resolution: {integrity: sha512-5EVjbTegqN7RSJle6hMWYxO4voo4rI+9krITk+DWR+diJgGrjZjrIBnJhjrHYYQsFgI7j1w1QnrvV7YSKBfYGg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/runtime@7.26.9':
+    resolution: {integrity: sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/runtime@7.28.3':
+    resolution: {integrity: sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/template@7.26.9':
+    resolution: {integrity: sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/traverse@7.26.9':
+    resolution: {integrity: sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.26.9':
+    resolution: {integrity: sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==}
+    engines: {node: '>=6.9.0'}
+
+  '@bcoe/v8-coverage@0.2.3':
+    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
+
+  '@cnakazawa/watch@1.0.4':
+    resolution: {integrity: sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==}
+    engines: {node: '>=0.1.95'}
+    hasBin: true
+
+  '@colors/colors@1.5.0':
+    resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
+    engines: {node: '>=0.1.90'}
+
+  '@cspotcode/source-map-support@0.8.1':
+    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
+    engines: {node: '>=12'}
+
+  '@cypress/listr-verbose-renderer@0.4.1':
+    resolution: {integrity: sha512-EDiBsVPWC27DDLEJCo+dpl9ODHhdrwU57ccr9tspwCdG2ni0QVkf6LF0FGbhfujcjPxnXLIwsaks4sOrwrA4Qw==}
+    engines: {node: '>=4'}
+
+  '@cypress/request@2.88.12':
+    resolution: {integrity: sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==}
+    engines: {node: '>= 6'}
+
+  '@cypress/xvfb@1.2.4':
+    resolution: {integrity: sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==}
+
+  '@date-io/core@1.3.13':
+    resolution: {integrity: sha512-AlEKV7TxjeK+jxWVKcCFrfYAk8spX9aCyiToFIiLPtfQbsjmRGLIhb5VZgptQcJdHtLXo7+m0DuurwFgUToQuA==}
+
+  '@date-io/date-fns@1.3.13':
+    resolution: {integrity: sha512-yXxGzcRUPcogiMj58wVgFjc9qUYrCnnU9eLcyNbsQCmae4jPuZCDoIBR21j8ZURsM7GRtU62VOw5yNd4dDHunA==}
+    peerDependencies:
+      date-fns: ^2.0.0
+
+  '@discoveryjs/json-ext@0.5.7':
+    resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==}
+    engines: {node: '>=10.0.0'}
+
+  '@emotion/babel-plugin@11.13.5':
+    resolution: {integrity: sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==}
+
+  '@emotion/cache@11.14.0':
+    resolution: {integrity: sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==}
+
+  '@emotion/hash@0.9.2':
+    resolution: {integrity: sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==}
+
+  '@emotion/is-prop-valid@0.8.8':
+    resolution: {integrity: sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==}
+
+  '@emotion/memoize@0.7.4':
+    resolution: {integrity: sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==}
+
+  '@emotion/memoize@0.9.0':
+    resolution: {integrity: sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==}
+
+  '@emotion/react@11.14.0':
+    resolution: {integrity: sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: '>=16.8.0'
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@emotion/serialize@1.3.3':
+    resolution: {integrity: sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==}
+
+  '@emotion/sheet@1.4.0':
+    resolution: {integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==}
+
+  '@emotion/unitless@0.10.0':
+    resolution: {integrity: sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==}
+
+  '@emotion/unitless@0.7.5':
+    resolution: {integrity: sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==}
+
+  '@emotion/use-insertion-effect-with-fallbacks@1.2.0':
+    resolution: {integrity: sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==}
+    peerDependencies:
+      react: '>=16.8.0'
+
+  '@emotion/utils@1.4.2':
+    resolution: {integrity: sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==}
+
+  '@emotion/weak-memoize@0.4.0':
+    resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==}
+
+  '@esbuild-plugins/tsconfig-paths@0.0.4':
+    resolution: {integrity: sha512-/86k8BmhfJOFoFLR2oKtoxUVUpIYBtJy29QSM5TXzZP8vdjuMPtXSUeCL+8Aa2GZ3to2k6VD9WLBE9OU+j1yQQ==}
+    peerDependencies:
+      esbuild: '*'
+      typescript: '*'
+
+  '@esbuild/aix-ppc64@0.25.0':
+    resolution: {integrity: sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/android-arm64@0.25.0':
+    resolution: {integrity: sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm@0.25.0':
+    resolution: {integrity: sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-x64@0.25.0':
+    resolution: {integrity: sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/darwin-arm64@0.25.0':
+    resolution: {integrity: sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.25.0':
+    resolution: {integrity: sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/freebsd-arm64@0.25.0':
+    resolution: {integrity: sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.25.0':
+    resolution: {integrity: sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/linux-arm64@0.25.0':
+    resolution: {integrity: sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.25.0':
+    resolution: {integrity: sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.25.0':
+    resolution: {integrity: sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.25.0':
+    resolution: {integrity: sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.25.0':
+    resolution: {integrity: sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.25.0':
+    resolution: {integrity: sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.25.0':
+    resolution: {integrity: sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.25.0':
+    resolution: {integrity: sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.25.0':
+    resolution: {integrity: sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-arm64@0.25.0':
+    resolution: {integrity: sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.25.0':
+    resolution: {integrity: sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-arm64@0.25.0':
+    resolution: {integrity: sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.25.0':
+    resolution: {integrity: sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/sunos-x64@0.25.0':
+    resolution: {integrity: sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/win32-arm64@0.25.0':
+    resolution: {integrity: sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.25.0':
+    resolution: {integrity: sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.25.0':
+    resolution: {integrity: sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
+  '@eslint-community/eslint-utils@4.4.1':
+    resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
+  '@eslint-community/regexpp@4.12.1':
+    resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+  '@eslint/eslintrc@2.1.4':
+    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@eslint/js@8.57.1':
+    resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@floating-ui/core@1.7.3':
+    resolution: {integrity: sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==}
+
+  '@floating-ui/dom@1.7.4':
+    resolution: {integrity: sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==}
+
+  '@floating-ui/utils@0.2.10':
+    resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==}
+
+  '@gar/promisify@1.1.3':
+    resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
+
+  '@graphql-typed-document-node/core@3.2.0':
+    resolution: {integrity: sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@humanwhocodes/config-array@0.13.0':
+    resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==}
+    engines: {node: '>=10.10.0'}
+    deprecated: Use @eslint/config-array instead
+
+  '@humanwhocodes/module-importer@1.0.1':
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
+
+  '@humanwhocodes/object-schema@2.0.3':
+    resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
+    deprecated: Use @eslint/object-schema instead
+
+  '@isaacs/cliui@8.0.2':
+    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
+    engines: {node: '>=12'}
+
+  '@istanbuljs/load-nyc-config@1.1.0':
+    resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
+    engines: {node: '>=8'}
+
+  '@istanbuljs/schema@0.1.3':
+    resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
+    engines: {node: '>=8'}
+
+  '@jest/console@26.6.2':
+    resolution: {integrity: sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==}
+    engines: {node: '>= 10.14.2'}
+
+  '@jest/console@29.7.0':
+    resolution: {integrity: sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/core@26.6.3':
+    resolution: {integrity: sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==}
+    engines: {node: '>= 10.14.2'}
+
+  '@jest/core@29.7.0':
+    resolution: {integrity: sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  '@jest/environment@26.6.2':
+    resolution: {integrity: sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==}
+    engines: {node: '>= 10.14.2'}
+
+  '@jest/environment@29.7.0':
+    resolution: {integrity: sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/expect-utils@29.7.0':
+    resolution: {integrity: sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/expect@29.7.0':
+    resolution: {integrity: sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/fake-timers@26.6.2':
+    resolution: {integrity: sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==}
+    engines: {node: '>= 10.14.2'}
+
+  '@jest/fake-timers@29.7.0':
+    resolution: {integrity: sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/globals@26.6.2':
+    resolution: {integrity: sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==}
+    engines: {node: '>= 10.14.2'}
+
+  '@jest/globals@29.7.0':
+    resolution: {integrity: sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/reporters@26.6.2':
+    resolution: {integrity: sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==}
+    engines: {node: '>= 10.14.2'}
+
+  '@jest/reporters@29.7.0':
+    resolution: {integrity: sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  '@jest/schemas@29.6.3':
+    resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/source-map@26.6.2':
+    resolution: {integrity: sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==}
+    engines: {node: '>= 10.14.2'}
+
+  '@jest/source-map@29.6.3':
+    resolution: {integrity: sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/test-result@26.6.2':
+    resolution: {integrity: sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==}
+    engines: {node: '>= 10.14.2'}
+
+  '@jest/test-result@29.7.0':
+    resolution: {integrity: sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/test-sequencer@26.6.3':
+    resolution: {integrity: sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==}
+    engines: {node: '>= 10.14.2'}
+
+  '@jest/test-sequencer@29.7.0':
+    resolution: {integrity: sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/transform@26.6.2':
+    resolution: {integrity: sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==}
+    engines: {node: '>= 10.14.2'}
+
+  '@jest/transform@29.7.0':
+    resolution: {integrity: sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@jest/types@26.6.2':
+    resolution: {integrity: sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==}
+    engines: {node: '>= 10.14.2'}
+
+  '@jest/types@29.6.3':
+    resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  '@josephg/resolvable@1.0.1':
+    resolution: {integrity: sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg==}
+
+  '@jridgewell/gen-mapping@0.3.8':
+    resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/set-array@1.2.1':
+    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/source-map@0.3.6':
+    resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
+
+  '@jridgewell/sourcemap-codec@1.5.0':
+    resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
+
+  '@jridgewell/trace-mapping@0.3.25':
+    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
+
+  '@jridgewell/trace-mapping@0.3.9':
+    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
+
+  '@leichtgewicht/ip-codec@2.0.5':
+    resolution: {integrity: sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==}
+
+  '@mapbox/node-pre-gyp@1.0.11':
+    resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==}
+    hasBin: true
+
+  '@mui/core-downloads-tracker@7.3.1':
+    resolution: {integrity: sha512-+mIK1Z0BhOaQ0vCgOkT1mSrIpEHLo338h4/duuL4TBLXPvUMit732mnwJY3W40Avy30HdeSfwUAAGRkKmwRaEQ==}
+
+  '@mui/icons-material@7.3.1':
+    resolution: {integrity: sha512-upzCtG6awpL6noEZlJ5Z01khZ9VnLNLaj7tb6iPbN6G97eYfUTs8e9OyPKy3rEms3VQWmVBfri7jzeaRxdFIzA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@mui/material': ^7.3.1
+      '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@mui/lab@7.0.0-beta.16':
+    resolution: {integrity: sha512-YiyDU84F6ujjaa5xuItuXa40KN1aPC+8PBkP2OAOJGO2MMvdEicuvkEfVSnikH6uLHtKOwGzOeqEqrfaYxcOxw==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@emotion/react': ^11.5.0
+      '@emotion/styled': ^11.3.0
+      '@mui/material': ^7.3.1
+      '@mui/material-pigment-css': ^7.3.1
+      '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@emotion/react':
+        optional: true
+      '@emotion/styled':
+        optional: true
+      '@mui/material-pigment-css':
+        optional: true
+      '@types/react':
+        optional: true
+
+  '@mui/material@7.3.1':
+    resolution: {integrity: sha512-Xf6Shbo03YmcBedZMwSpEFOwpYDtU7tC+rhAHTrA9FHk0FpsDqiQ9jUa1j/9s3HLs7KWb5mDcGnlwdh9Q9KAag==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@emotion/react': ^11.5.0
+      '@emotion/styled': ^11.3.0
+      '@mui/material-pigment-css': ^7.3.1
+      '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@emotion/react':
+        optional: true
+      '@emotion/styled':
+        optional: true
+      '@mui/material-pigment-css':
+        optional: true
+      '@types/react':
+        optional: true
+
+  '@mui/private-theming@7.3.1':
+    resolution: {integrity: sha512-WU3YLkKXii/x8ZEKnrLKsPwplCVE11yZxUvlaaZSIzCcI3x2OdFC8eMlNy74hVeUsYQvzzX1Es/k4ARPlFvpPQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@mui/styled-engine@7.3.1':
+    resolution: {integrity: sha512-Nqo6OHjvJpXJ1+9TekTE//+8RybgPQUKwns2Lh0sq+8rJOUSUKS3KALv4InSOdHhIM9Mdi8/L7LTF1/Ky6D6TQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@emotion/react': ^11.4.1
+      '@emotion/styled': ^11.3.0
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@emotion/react':
+        optional: true
+      '@emotion/styled':
+        optional: true
+
+  '@mui/system@7.3.1':
+    resolution: {integrity: sha512-mIidecvcNVpNJMdPDmCeoSL5zshKBbYPcphjuh6ZMjhybhqhZ4mX6k9zmIWh6XOXcqRQMg5KrcjnO0QstrNj3w==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@emotion/react': ^11.5.0
+      '@emotion/styled': ^11.3.0
+      '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@emotion/react':
+        optional: true
+      '@emotion/styled':
+        optional: true
+      '@types/react':
+        optional: true
+
+  '@mui/types@7.4.5':
+    resolution: {integrity: sha512-ZPwlAOE3e8C0piCKbaabwrqZbW4QvWz0uapVPWya7fYj6PeDkl5sSJmomT7wjOcZGPB48G/a6Ubidqreptxz4g==}
+    peerDependencies:
+      '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@mui/utils@7.3.1':
+    resolution: {integrity: sha512-/31y4wZqVWa0jzMnzo6JPjxwP6xXy4P3+iLbosFg/mJQowL1KIou0LC+lquWW60FKVbKz5ZUWBg2H3jausa0pw==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@mui/x-date-pickers@8.10.2':
+    resolution: {integrity: sha512-eS5t1jUojN/jL2FeJ8gtpCBxIEswUp9kLjM64aJ5LUKrNgM7X9dwsEHyplS+x07kWLiEAhO3nX3mepnS3Z43qg==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@emotion/react': ^11.9.0
+      '@emotion/styled': ^11.8.1
+      '@mui/material': ^5.15.14 || ^6.0.0 || ^7.0.0
+      '@mui/system': ^5.15.14 || ^6.0.0 || ^7.0.0
+      date-fns: ^2.25.0 || ^3.2.0 || ^4.0.0
+      date-fns-jalali: ^2.13.0-0 || ^3.2.0-0 || ^4.0.0-0
+      dayjs: ^1.10.7
+      luxon: ^3.0.2
+      moment: ^2.29.4
+      moment-hijri: ^2.1.2 || ^3.0.0
+      moment-jalaali: ^0.7.4 || ^0.8.0 || ^0.9.0 || ^0.10.0
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@emotion/react':
+        optional: true
+      '@emotion/styled':
+        optional: true
+      date-fns:
+        optional: true
+      date-fns-jalali:
+        optional: true
+      dayjs:
+        optional: true
+      luxon:
+        optional: true
+      moment:
+        optional: true
+      moment-hijri:
+        optional: true
+      moment-jalaali:
+        optional: true
+
+  '@mui/x-internals@8.10.2':
+    resolution: {integrity: sha512-dlC0BQRRBdiWtqn1yDppaHYRUjU3OuPWTxy0UtqxDaJjJf4pfR8ALr243nbxgJAFqvQyWPWyO4A6p9x9eJMJEQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  '@nodelib/fs.scandir@2.1.5':
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.stat@2.0.5':
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.walk@1.2.8':
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+    engines: {node: '>= 8'}
+
+  '@npmcli/fs@1.1.1':
+    resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==}
+
+  '@npmcli/move-file@1.1.2':
+    resolution: {integrity: sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==}
+    engines: {node: '>=10'}
+    deprecated: This functionality has been moved to @npmcli/fs
+
+  '@parcel/watcher-android-arm64@2.5.1':
+    resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    resolution: {integrity: sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    resolution: {integrity: sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    resolution: {integrity: sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  '@parcel/watcher@2.5.1':
+    resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==}
+    engines: {node: '>= 10.0.0'}
+
+  '@polka/url@1.0.0-next.28':
+    resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
+
+  '@popperjs/core@2.11.8':
+    resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
+
+  '@protobufjs/aspromise@1.1.2':
+    resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
+
+  '@protobufjs/base64@1.1.2':
+    resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==}
+
+  '@protobufjs/codegen@2.0.4':
+    resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
+
+  '@protobufjs/eventemitter@1.1.0':
+    resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
+
+  '@protobufjs/fetch@1.1.0':
+    resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==}
+
+  '@protobufjs/float@1.0.2':
+    resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==}
+
+  '@protobufjs/inquire@1.1.0':
+    resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
+
+  '@protobufjs/path@1.1.2':
+    resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==}
+
+  '@protobufjs/pool@1.1.0':
+    resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==}
+
+  '@protobufjs/utf8@1.1.0':
+    resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
+
+  '@react-hook/latest@1.0.3':
+    resolution: {integrity: sha512-dy6duzl+JnAZcDbNTfmaP3xHiKtbXYOaz3G51MGVljh548Y8MWzTr+PHLOfvpypEVW9zwvl+VyKjbWKEVbV1Rg==}
+    peerDependencies:
+      react: '>=16.8'
+
+  '@react-hook/throttle@2.2.0':
+    resolution: {integrity: sha512-LJ5eg+yMV8lXtqK3lR+OtOZ2WH/EfWvuiEEu0M3bhR7dZRfTyEJKxH1oK9uyBxiXPtWXiQggWbZirMCXam51tg==}
+    peerDependencies:
+      react: '>=16.8'
+
+  '@reduxjs/toolkit@2.8.2':
+    resolution: {integrity: sha512-MYlOhQ0sLdw4ud48FoC5w0dH9VfWQjtCjreKwYTT3l+r427qYC5Y8PihNutepr8XrNaBUDQo9khWUwQxZaqt5A==}
+    peerDependencies:
+      react: ^16.9.0 || ^17.0.0 || ^18 || ^19
+      react-redux: ^7.2.1 || ^8.1.3 || ^9.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      react-redux:
+        optional: true
+
+  '@rollup/plugin-commonjs@15.1.0':
+    resolution: {integrity: sha512-xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      rollup: ^2.22.0
+
+  '@rollup/plugin-node-resolve@8.4.0':
+    resolution: {integrity: sha512-LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0
+
+  '@rollup/pluginutils@3.1.0':
+    resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0
+
+  '@rooks/use-mutation-observer@4.11.2':
+    resolution: {integrity: sha512-vpsdrZdr6TkB1zZJcHx+fR1YC/pHs2BaqcuYiEGjBVbwY5xcC49+h0hAUtQKHth3oJqXfIX/Ng8S7s5HFHdM/A==}
+    peerDependencies:
+      react: '>=16.8.0'
+
+  '@rtsao/scc@1.1.0':
+    resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
+
+  '@samverschueren/stream-to-observable@0.3.1':
+    resolution: {integrity: sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==}
+    engines: {node: '>=6'}
+    peerDependencies:
+      rxjs: '*'
+      zen-observable: '*'
+    peerDependenciesMeta:
+      rxjs:
+        optional: true
+      zen-observable:
+        optional: true
+
+  '@sinclair/typebox@0.27.8':
+    resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
+
+  '@sinonjs/commons@1.8.6':
+    resolution: {integrity: sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==}
+
+  '@sinonjs/commons@3.0.1':
+    resolution: {integrity: sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==}
+
+  '@sinonjs/fake-timers@10.3.0':
+    resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==}
+
+  '@sinonjs/fake-timers@6.0.1':
+    resolution: {integrity: sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==}
+
+  '@sinonjs/formatio@4.0.1':
+    resolution: {integrity: sha512-asIdlLFrla/WZybhm0C8eEzaDNNrzymiTqHMeJl6zPW2881l3uuVRpm0QlRQEjqYWv6CcKMGYME3LbrLJsORBw==}
+
+  '@sinonjs/samsam@4.2.2':
+    resolution: {integrity: sha512-z9o4LZUzSD9Hl22zV38aXNykgFeVj8acqfFabCY6FY83n/6s/XwNJyYYldz6/9lBJanpno9h+oL6HTISkviweA==}
+
+  '@sinonjs/text-encoding@0.7.3':
+    resolution: {integrity: sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==}
+
+  '@standard-schema/spec@1.0.0':
+    resolution: {integrity: sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==}
+
+  '@standard-schema/utils@0.3.0':
+    resolution: {integrity: sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==}
+
+  '@stylistic/eslint-plugin-js@3.1.0':
+    resolution: {integrity: sha512-lQktsOiCr8S6StG29C5fzXYxLOD6ID1rp4j6TRS+E/qY1xd59Fm7dy5qm9UauJIEoSTlYx6yGsCHYh5UkgXPyg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: '>=8.40.0'
+
+  '@teamsupercell/typings-for-css-modules-loader@2.5.2':
+    resolution: {integrity: sha512-3sqH2B4itcm5XgV1IHENt4NOaW7bOC1CwJr63vrdKWWyKVxNxtBM+ABVhJZYFCCVAwNy7ulA64z6HyQqw96m4A==}
+
+  '@testing-library/dom@7.31.2':
+    resolution: {integrity: sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==}
+    engines: {node: '>=10'}
+
+  '@testing-library/react@10.4.9':
+    resolution: {integrity: sha512-pHZKkqUy0tmiD81afs8xfiuseXfU/N7rAX3iKjeZYje86t9VaB0LrxYVa+OOsvkrveX5jCK3IjajVn2MbePvqA==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      react: '*'
+      react-dom: '*'
+
+  '@testing-library/react@16.3.0':
+    resolution: {integrity: sha512-kFSyxiEDwv1WLl2fgsq6pPBbw5aWKrsY2/noi1Id0TK0UParSF62oFQFGHXIyaG4pp2tEub/Zlel+fjjZILDsw==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@testing-library/dom': ^10.0.0
+      '@types/react': ^18.0.0 || ^19.0.0
+      '@types/react-dom': ^18.0.0 || ^19.0.0
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@tootallnate/once@1.1.2':
+    resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
+    engines: {node: '>= 6'}
+
+  '@tootallnate/once@2.0.0':
+    resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
+    engines: {node: '>= 10'}
+
+  '@tsconfig/node10@1.0.11':
+    resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==}
+
+  '@tsconfig/node12@1.0.11':
+    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
+
+  '@tsconfig/node14@1.0.3':
+    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
+
+  '@tsconfig/node16@1.0.4':
+    resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}
+
+  '@types/accepts@1.3.7':
+    resolution: {integrity: sha512-Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ==}
+
+  '@types/aria-query@4.2.2':
+    resolution: {integrity: sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==}
+
+  '@types/babel__core@7.20.5':
+    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
+
+  '@types/babel__generator@7.6.8':
+    resolution: {integrity: sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==}
+
+  '@types/babel__template@7.4.4':
+    resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
+
+  '@types/babel__traverse@7.20.6':
+    resolution: {integrity: sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==}
+
+  '@types/body-parser@1.19.0':
+    resolution: {integrity: sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==}
+
+  '@types/body-parser@1.19.5':
+    resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==}
+
+  '@types/bonjour@3.5.13':
+    resolution: {integrity: sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==}
+
+  '@types/codemirror@0.0.99':
+    resolution: {integrity: sha512-iSNLwL9ZXUDUhhljqyO9lDpxKOnye9Y2IY0vvoarapI3QLpZsx8RF8Ybic4+gne+DVsnc5ReBOQA3p4FVbsXMw==}
+
+  '@types/connect-history-api-fallback@1.5.4':
+    resolution: {integrity: sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==}
+
+  '@types/connect@3.4.38':
+    resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
+
+  '@types/content-disposition@0.5.8':
+    resolution: {integrity: sha512-QVSSvno3dE0MgO76pJhmv4Qyi/j0Yk9pBp0Y7TJ2Tlj+KCgJWY6qX7nnxCOLkZ3VYRSIk1WTxCvwUSdx6CCLdg==}
+
+  '@types/cookies@0.9.0':
+    resolution: {integrity: sha512-40Zk8qR147RABiQ7NQnBzWzDcjKzNrntB5BAmeGCb2p/MIyOE+4BVvc17wumsUqUw00bJYqoXFHYygQnEFh4/Q==}
+
+  '@types/cors@2.8.10':
+    resolution: {integrity: sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==}
+
+  '@types/d3-array@3.2.1':
+    resolution: {integrity: sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==}
+
+  '@types/d3-color@3.1.3':
+    resolution: {integrity: sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==}
+
+  '@types/d3-ease@3.0.2':
+    resolution: {integrity: sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==}
+
+  '@types/d3-interpolate@3.0.4':
+    resolution: {integrity: sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==}
+
+  '@types/d3-path@1.0.11':
+    resolution: {integrity: sha512-4pQMp8ldf7UaB/gR8Fvvy69psNHkTpD/pVw3vmEi8iZAB9EPMBruB1JvHO4BIq9QkUUd2lV1F5YXpMNj7JPBpw==}
+
+  '@types/d3-scale@4.0.9':
+    resolution: {integrity: sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==}
+
+  '@types/d3-shape@3.1.7':
+    resolution: {integrity: sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==}
+
+  '@types/d3-time@3.0.4':
+    resolution: {integrity: sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==}
+
+  '@types/d3-timer@3.0.2':
+    resolution: {integrity: sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==}
+
+  '@types/debug@4.1.12':
+    resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
+
+  '@types/eslint-scope@3.7.7':
+    resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
+
+  '@types/eslint@8.56.12':
+    resolution: {integrity: sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==}
+
+  '@types/eslint@9.6.1':
+    resolution: {integrity: sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==}
+
+  '@types/estree@0.0.39':
+    resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==}
+
+  '@types/estree@1.0.6':
+    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
+
+  '@types/express-serve-static-core@4.19.6':
+    resolution: {integrity: sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==}
+
+  '@types/express-serve-static-core@5.0.6':
+    resolution: {integrity: sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==}
+
+  '@types/express@4.17.21':
+    resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==}
+
+  '@types/fs-capacitor@2.0.0':
+    resolution: {integrity: sha512-FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ==}
+
+  '@types/graceful-fs@4.1.9':
+    resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==}
+
+  '@types/hoist-non-react-statics@3.3.6':
+    resolution: {integrity: sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==}
+
+  '@types/html-minifier-terser@6.1.0':
+    resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==}
+
+  '@types/http-assert@1.5.6':
+    resolution: {integrity: sha512-TTEwmtjgVbYAzZYWyeHPrrtWnfVkm8tQkP8P21uQifPgMRgjrow3XDEYqucuC8SKZJT7pUnhU/JymvjggxO9vw==}
+
+  '@types/http-errors@2.0.4':
+    resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==}
+
+  '@types/http-proxy@1.17.16':
+    resolution: {integrity: sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==}
+
+  '@types/istanbul-lib-coverage@2.0.6':
+    resolution: {integrity: sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==}
+
+  '@types/istanbul-lib-report@3.0.3':
+    resolution: {integrity: sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==}
+
+  '@types/istanbul-reports@3.0.4':
+    resolution: {integrity: sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==}
+
+  '@types/jest@26.0.24':
+    resolution: {integrity: sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==}
+
+  '@types/jest@29.5.14':
+    resolution: {integrity: sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==}
+
+  '@types/js-cookie@3.0.6':
+    resolution: {integrity: sha512-wkw9yd1kEXOPnvEeEV1Go1MmxtBJL0RR79aOTAApecWFVu7w0NNXNqhcWgvw2YgZDYadliXkl14pa3WXw5jlCQ==}
+
+  '@types/jsdom@20.0.1':
+    resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==}
+
+  '@types/json-schema@7.0.15':
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+
+  '@types/json5@0.0.29':
+    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
+
+  '@types/keygrip@1.0.6':
+    resolution: {integrity: sha512-lZuNAY9xeJt7Bx4t4dx0rYCDqGPW8RXhQZK1td7d4H6E9zYbLoOtjBvfwdTKpsyxQI/2jv+armjX/RW+ZNpXOQ==}
+
+  '@types/koa-compose@3.2.8':
+    resolution: {integrity: sha512-4Olc63RY+MKvxMwVknCUDhRQX1pFQoBZ/lXcRLP69PQkEpze/0cr8LNqJQe5NFb/b19DWi2a5bTi2VAlQzhJuA==}
+
+  '@types/koa@2.15.0':
+    resolution: {integrity: sha512-7QFsywoE5URbuVnG3loe03QXuGajrnotr3gQkXcEBShORai23MePfFYdhz90FEtBBpkyIYQbVD+evKtloCgX3g==}
+
+  '@types/loadable__component@5.13.9':
+    resolution: {integrity: sha512-QWOtIkwZqHNdQj3nixQ8oyihQiTMKZLk/DNuvNxMSbTfxf47w+kqcbnxlUeBgAxdOtW0Dh48dTAIp83iJKtnrQ==}
+
+  '@types/long@4.0.2':
+    resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==}
+
+  '@types/mime@1.3.5':
+    resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
+
+  '@types/ms@2.1.0':
+    resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
+
+  '@types/nanoid@3.0.0':
+    resolution: {integrity: sha512-UXitWSmXCwhDmAKe7D3hNQtQaHeHt5L8LO1CB8GF8jlYVzOv5cBWDNqiJ+oPEWrWei3i3dkZtHY/bUtd0R/uOQ==}
+    deprecated: This is a stub types definition. nanoid provides its own type definitions, so you do not need this installed.
+
+  '@types/node-forge@1.3.11':
+    resolution: {integrity: sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==}
+
+  '@types/node@10.17.60':
+    resolution: {integrity: sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==}
+
+  '@types/node@12.12.50':
+    resolution: {integrity: sha512-5ImO01Fb8YsEOYpV+aeyGYztcYcjGsBvN4D7G5r1ef2cuQOpymjWNQi5V0rKHE6PC2ru3HkoUr/Br2/8GUA84w==}
+
+  '@types/node@20.19.11':
+    resolution: {integrity: sha512-uug3FEEGv0r+jrecvUUpbY8lLisvIjg6AAic6a2bSP5OEOLeJsDSnvhCDov7ipFFMXS3orMpzlmi0ZcuGkBbow==}
+
+  '@types/normalize-package-data@2.4.4':
+    resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
+
+  '@types/parse-json@4.0.2':
+    resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
+
+  '@types/prettier@2.7.3':
+    resolution: {integrity: sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==}
+
+  '@types/prop-types@15.7.15':
+    resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==}
+
+  '@types/qs@6.9.18':
+    resolution: {integrity: sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==}
+
+  '@types/randomcolor@0.5.9':
+    resolution: {integrity: sha512-k58cfpkK15AKn1m+oRd9nh5BnuiowhbyvBBdAzcddtARMr3xRzP0VlFaAKovSG6N6Knx08EicjPlOMzDejerrQ==}
+
+  '@types/range-parser@1.2.7':
+    resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}
+
+  '@types/react-beautiful-dnd@13.1.8':
+    resolution: {integrity: sha512-E3TyFsro9pQuK4r8S/OL6G99eq7p8v29sX0PM7oT8Z+PJfZvSQTx4zTQbUJ+QZXioAF0e7TGBEcA1XhYhCweyQ==}
+
+  '@types/react-copy-to-clipboard@5.0.7':
+    resolution: {integrity: sha512-Gft19D+as4M+9Whq1oglhmK49vqPhcLzk8WfvfLvaYMIPYanyfLy0+CwFucMJfdKoSFyySPmkkWn8/E6voQXjQ==}
+
+  '@types/react-dom@19.0.4':
+    resolution: {integrity: sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==}
+    peerDependencies:
+      '@types/react': ^19.0.0
+
+  '@types/react-input-autosize@2.2.4':
+    resolution: {integrity: sha512-7O028jRZHZo3mj63h3HSvB0WpvPXNWN86sajHTi0+CtjA4Ym+DFzO9RzrSbfFURe5ZWsq6P72xk7MInI6aGWJA==}
+
+  '@types/react-redux@7.1.34':
+    resolution: {integrity: sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==}
+
+  '@types/react-transition-group@4.4.12':
+    resolution: {integrity: sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==}
+    peerDependencies:
+      '@types/react': '*'
+
+  '@types/react@19.1.11':
+    resolution: {integrity: sha512-lr3jdBw/BGj49Eps7EvqlUaoeA0xpj3pc0RoJkHpYaCHkVK7i28dKyImLQb3JVlqs3aYSXf7qYuWOW/fgZnTXQ==}
+
+  '@types/reactour@1.18.5':
+    resolution: {integrity: sha512-Pl5yh9bXeXaFcioDk6XVmUzdJGZDAKesVmwoh2KvN/1FXSd9saN8pIprLvfspnXANMcgl3AtSlD4zs0cJIhGIw==}
+
+  '@types/redux-testkit@1.0.8':
+    resolution: {integrity: sha512-AoccdnYEPZvSuzepo+oYnZWB83uibnqxAIep4G60pRALBNXjAk8Y5jHkkWQkzXLK0o/8u9CCglBQlxrjBWS+9w==}
+
+  '@types/resolve@1.17.1':
+    resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==}
+
+  '@types/retry@0.12.0':
+    resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==}
+
+  '@types/semver@7.5.8':
+    resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==}
+
+  '@types/send@0.17.4':
+    resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==}
+
+  '@types/serve-index@1.9.4':
+    resolution: {integrity: sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==}
+
+  '@types/serve-static@1.15.7':
+    resolution: {integrity: sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==}
+
+  '@types/sinon@7.5.2':
+    resolution: {integrity: sha512-T+m89VdXj/eidZyejvmoP9jivXgBDdkOSBVQjU9kF349NEx10QdPNGxHeZUaj1IlJ32/ewdyXJjnJxyxJroYwg==}
+
+  '@types/sinonjs__fake-timers@6.0.4':
+    resolution: {integrity: sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A==}
+
+  '@types/sizzle@2.3.9':
+    resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==}
+
+  '@types/sockjs@0.3.36':
+    resolution: {integrity: sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==}
+
+  '@types/stack-utils@2.0.3':
+    resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==}
+
+  '@types/tern@0.23.9':
+    resolution: {integrity: sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==}
+
+  '@types/tough-cookie@4.0.5':
+    resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==}
+
+  '@types/use-sync-external-store@0.0.6':
+    resolution: {integrity: sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==}
+
+  '@types/validator@13.12.2':
+    resolution: {integrity: sha512-6SlHBzUW8Jhf3liqrGGXyTJSIFe4nqlJ5A5KaMZ2l/vbM3Wh3KSybots/wfWVzNLK4D1NZluDlSQIbIEPx6oyA==}
+
+  '@types/ws@7.4.7':
+    resolution: {integrity: sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==}
+
+  '@types/ws@8.5.14':
+    resolution: {integrity: sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==}
+
+  '@types/yargs-parser@21.0.3':
+    resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==}
+
+  '@types/yargs@15.0.19':
+    resolution: {integrity: sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==}
+
+  '@types/yargs@17.0.33':
+    resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==}
+
+  '@typescript-eslint/eslint-plugin@5.62.0':
+    resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/parser@5.62.0':
+    resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/parser@6.21.0':
+    resolution: {integrity: sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/scope-manager@5.62.0':
+    resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/scope-manager@6.21.0':
+    resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+
+  '@typescript-eslint/type-utils@5.62.0':
+    resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/types@5.62.0':
+    resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/types@6.21.0':
+    resolution: {integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+
+  '@typescript-eslint/typescript-estree@5.62.0':
+    resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/typescript-estree@6.21.0':
+    resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/utils@5.62.0':
+    resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  '@typescript-eslint/visitor-keys@5.62.0':
+    resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/visitor-keys@6.21.0':
+    resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+
+  '@uidotdev/usehooks@2.4.1':
+    resolution: {integrity: sha512-1I+RwWyS+kdv3Mv0Vmc+p0dPYH0DTRAo04HLyXReYBL9AeseDWUJyi4THuksBJcu9F0Pih69Ak150VDnqbVnXg==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      react: '>=18.0.0'
+      react-dom: '>=18.0.0'
+
+  '@ungap/structured-clone@1.3.0':
+    resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
+
+  '@webassemblyjs/ast@1.14.1':
+    resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==}
+
+  '@webassemblyjs/floating-point-hex-parser@1.13.2':
+    resolution: {integrity: sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==}
+
+  '@webassemblyjs/helper-api-error@1.13.2':
+    resolution: {integrity: sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==}
+
+  '@webassemblyjs/helper-buffer@1.14.1':
+    resolution: {integrity: sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==}
+
+  '@webassemblyjs/helper-numbers@1.13.2':
+    resolution: {integrity: sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==}
+
+  '@webassemblyjs/helper-wasm-bytecode@1.13.2':
+    resolution: {integrity: sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==}
+
+  '@webassemblyjs/helper-wasm-section@1.14.1':
+    resolution: {integrity: sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==}
+
+  '@webassemblyjs/ieee754@1.13.2':
+    resolution: {integrity: sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==}
+
+  '@webassemblyjs/leb128@1.13.2':
+    resolution: {integrity: sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==}
+
+  '@webassemblyjs/utf8@1.13.2':
+    resolution: {integrity: sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==}
+
+  '@webassemblyjs/wasm-edit@1.14.1':
+    resolution: {integrity: sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==}
+
+  '@webassemblyjs/wasm-gen@1.14.1':
+    resolution: {integrity: sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==}
+
+  '@webassemblyjs/wasm-opt@1.14.1':
+    resolution: {integrity: sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==}
+
+  '@webassemblyjs/wasm-parser@1.14.1':
+    resolution: {integrity: sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==}
+
+  '@webassemblyjs/wast-printer@1.14.1':
+    resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==}
+
+  '@webpack-cli/configtest@2.1.1':
+    resolution: {integrity: sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==}
+    engines: {node: '>=14.15.0'}
+    peerDependencies:
+      webpack: 5.x.x
+      webpack-cli: 5.x.x
+
+  '@webpack-cli/info@2.0.2':
+    resolution: {integrity: sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==}
+    engines: {node: '>=14.15.0'}
+    peerDependencies:
+      webpack: 5.x.x
+      webpack-cli: 5.x.x
+
+  '@webpack-cli/serve@2.0.5':
+    resolution: {integrity: sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==}
+    engines: {node: '>=14.15.0'}
+    peerDependencies:
+      webpack: 5.x.x
+      webpack-cli: 5.x.x
+      webpack-dev-server: '*'
+    peerDependenciesMeta:
+      webpack-dev-server:
+        optional: true
+
+  '@wry/caches@1.0.1':
+    resolution: {integrity: sha512-bXuaUNLVVkD20wcGBWRyo7j9N3TxePEWFZj2Y+r9OoUzfqmavM84+mFykRicNsBqatba5JLay1t48wxaXaWnlA==}
+    engines: {node: '>=8'}
+
+  '@wry/context@0.7.4':
+    resolution: {integrity: sha512-jmT7Sb4ZQWI5iyu3lobQxICu2nC/vbUhP0vIdd6tHC9PTfenmRmuIFqktc6GH9cgi+ZHnsLWPvfSvc4DrYmKiQ==}
+    engines: {node: '>=8'}
+
+  '@wry/equality@0.1.11':
+    resolution: {integrity: sha512-mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA==}
+
+  '@wry/equality@0.5.7':
+    resolution: {integrity: sha512-BRFORjsTuQv5gxcXsuDXx6oGRhuVsEGwZy6LOzRRfgu+eSfxbhUQ9L9YtSEIuIjY/o7g3iWFjrc5eSY1GXP2Dw==}
+    engines: {node: '>=8'}
+
+  '@wry/trie@0.5.0':
+    resolution: {integrity: sha512-FNoYzHawTMk/6KMQoEG5O4PuioX19UbwdQKF44yw0nLfOypfQdjtfZzo/UIJWAJ23sNIFbD1Ug9lbaDGMwbqQA==}
+    engines: {node: '>=8'}
+
+  '@xtuc/ieee754@1.2.0':
+    resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
+
+  '@xtuc/long@4.2.2':
+    resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
+
+  abab@2.0.6:
+    resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
+    deprecated: Use your platform's native atob() and btoa() methods instead
+
+  abbrev@1.1.1:
+    resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
+
+  abort-controller@3.0.0:
+    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
+    engines: {node: '>=6.5'}
+
+  accepts@1.3.8:
+    resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
+    engines: {node: '>= 0.6'}
+
+  acorn-globals@4.3.4:
+    resolution: {integrity: sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==}
+
+  acorn-globals@6.0.0:
+    resolution: {integrity: sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==}
+
+  acorn-globals@7.0.1:
+    resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
+
+  acorn-jsx@5.3.2:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  acorn-walk@6.2.0:
+    resolution: {integrity: sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==}
+    engines: {node: '>=0.4.0'}
+
+  acorn-walk@7.2.0:
+    resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
+    engines: {node: '>=0.4.0'}
+
+  acorn-walk@8.3.4:
+    resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}
+    engines: {node: '>=0.4.0'}
+
+  acorn@6.4.2:
+    resolution: {integrity: sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  acorn@7.4.1:
+    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  acorn@8.14.0:
+    resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  agent-base@6.0.2:
+    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
+    engines: {node: '>= 6.0.0'}
+
+  aggregate-error@3.1.0:
+    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
+    engines: {node: '>=8'}
+
+  ajv-errors@1.0.1:
+    resolution: {integrity: sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==}
+    peerDependencies:
+      ajv: '>=5.0.0'
+
+  ajv-formats@2.1.1:
+    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+
+  ajv-keywords@3.5.2:
+    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
+    peerDependencies:
+      ajv: ^6.9.1
+
+  ajv-keywords@5.1.0:
+    resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}
+    peerDependencies:
+      ajv: ^8.8.2
+
+  ajv@6.12.6:
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+
+  ajv@8.17.1:
+    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
+
+  ansi-colors@4.1.3:
+    resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
+    engines: {node: '>=6'}
+
+  ansi-escapes@3.2.0:
+    resolution: {integrity: sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==}
+    engines: {node: '>=4'}
+
+  ansi-escapes@4.3.2:
+    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
+    engines: {node: '>=8'}
+
+  ansi-html-community@0.0.8:
+    resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==}
+    engines: {'0': node >= 0.8.0}
+    hasBin: true
+
+  ansi-regex@2.1.1:
+    resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
+    engines: {node: '>=0.10.0'}
+
+  ansi-regex@3.0.1:
+    resolution: {integrity: sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==}
+    engines: {node: '>=4'}
+
+  ansi-regex@4.1.1:
+    resolution: {integrity: sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==}
+    engines: {node: '>=6'}
+
+  ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  ansi-regex@6.1.0:
+    resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==}
+    engines: {node: '>=12'}
+
+  ansi-styles@2.2.1:
+    resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==}
+    engines: {node: '>=0.10.0'}
+
+  ansi-styles@3.2.1:
+    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+    engines: {node: '>=4'}
+
+  ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+
+  ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+
+  ansi-styles@6.2.1:
+    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
+    engines: {node: '>=12'}
+
+  any-observable@0.3.0:
+    resolution: {integrity: sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==}
+    engines: {node: '>=6'}
+    peerDependencies:
+      rxjs: '*'
+      zenObservable: '*'
+    peerDependenciesMeta:
+      rxjs:
+        optional: true
+      zenObservable:
+        optional: true
+
+  anymatch@2.0.0:
+    resolution: {integrity: sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==}
+
+  anymatch@3.1.3:
+    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
+    engines: {node: '>= 8'}
+
+  apollo-cache-control@0.15.0:
+    resolution: {integrity: sha512-U2uYvHZsWmR6s6CD5zlq3PepfbUAM8953CeVM2Y2QYMtJ8i4CYplEPbIWb3zTIXSPbIPeWGddM56pChI6Iz3zA==}
+    engines: {node: '>=6.0'}
+    deprecated: The functionality provided by the `apollo-cache-control` package is built in to `apollo-server-core` starting with Apollo Server 3. See https://www.apollographql.com/docs/apollo-server/migration/#cachecontrol for details.
+    peerDependencies:
+      graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  apollo-datasource@0.10.0:
+    resolution: {integrity: sha512-wrLhuoM2MtA0KA0+3qyioe0H2FjAxjTvuFOlNCk6WberA887m0MQlWULZImCWTkKuN+zEAMerHfxN+F+W8+lBA==}
+    engines: {node: '>=6'}
+    deprecated: The `apollo-datasource` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.
+
+  apollo-graphql@0.9.7:
+    resolution: {integrity: sha512-bezL9ItUWUGHTm1bI/XzIgiiZbhXpsC7uxk4UxFPmcVJwJsDc3ayZ99oXxAaK+3Rbg/IoqrHckA6CwmkCsbaSA==}
+    engines: {node: '>=6'}
+    peerDependencies:
+      graphql: ^14.2.1 || ^15.0.0
+
+  apollo-link@1.2.14:
+    resolution: {integrity: sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg==}
+    peerDependencies:
+      graphql: ^0.11.3 || ^0.12.3 || ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  apollo-reporting-protobuf@0.8.0:
+    resolution: {integrity: sha512-B3XmnkH6Y458iV6OsA7AhfwvTgeZnFq9nPVjbxmLKnvfkEl8hYADtz724uPa0WeBiD7DSFcnLtqg9yGmCkBohg==}
+    deprecated: The `apollo-reporting-protobuf` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/usage-reporting-protobuf` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.
+
+  apollo-server-caching@0.7.0:
+    resolution: {integrity: sha512-MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw==}
+    engines: {node: '>=6'}
+    deprecated: This package is part of the legacy caching implementation used by Apollo Server v2 and v3, and is no longer maintained. We recommend you switch to the newer Keyv-based implementation (which is compatible with all versions of Apollo Server). See https://www.apollographql.com/docs/apollo-server/v3/performance/cache-backends#legacy-caching-implementation for more details.
+
+  apollo-server-core@2.26.2:
+    resolution: {integrity: sha512-r8jOhf1jElaxsNsALFMy/MLiJCqSa1ZiwxkerVYbsEkyWrpD1Khy0extDkTBrfa6uK8CatX7xK9U413bYNhJFA==}
+    engines: {node: '>=6'}
+    deprecated: The `apollo-server-core` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.
+    peerDependencies:
+      graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  apollo-server-env@3.2.0:
+    resolution: {integrity: sha512-V+kO5e6vUo2JwqV1/Ng71ZE3J6x1hCOC+nID2/++bCYl0/fPY9iLChbBNSgN/uoFcjhgmBchOv+m4o0Nie/TFQ==}
+    engines: {node: '>=6'}
+    deprecated: The `apollo-server-env` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/utils.fetcher` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.
+
+  apollo-server-errors@2.5.0:
+    resolution: {integrity: sha512-lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA==}
+    engines: {node: '>=6'}
+    deprecated: The `apollo-server-errors` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.
+    peerDependencies:
+      graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  apollo-server-express@2.26.2:
+    resolution: {integrity: sha512-8KaDwc6/DMK6e5KmP4AGH/NNY7OhEOFxusz3JZ/Du08a+PN8c/JmaEAwQ0aTNpySb5PWpv6xeXRPPwNfaPK9IQ==}
+    engines: {node: '>=6'}
+    deprecated: The `apollo-server-express` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.
+    peerDependencies:
+      graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  apollo-server-plugin-base@0.14.0:
+    resolution: {integrity: sha512-nTNSFuBhZURGjtWptdVqwemYUOdsvABj/GSKzeNvepiEubiv4N0rt4Gvy1inHDiMbo98wQTdF/7XohNcB9A77g==}
+    engines: {node: '>=6'}
+    deprecated: The `apollo-server-plugin-base` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.
+    peerDependencies:
+      graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  apollo-server-types@0.10.0:
+    resolution: {integrity: sha512-LsB3epw1X3Co/HGiKHCGtzWG35J59gG8Ypx0p22+wgdM9AVDm1ylsNGZy+osNIVJc1lUJf3nF5kZ90vA866K/w==}
+    engines: {node: '>=6'}
+    deprecated: The `apollo-server-types` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details.
+    peerDependencies:
+      graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  apollo-tracing@0.16.0:
+    resolution: {integrity: sha512-Oy8kTggB+fJ/hHXwHyMpuTl5KW7u1XetKFDErZVOobUKc2zjc/NgWiC/s7SGYZCgfLodBjvwfa6rMcvLkz7c0w==}
+    engines: {node: '>=4.0'}
+    deprecated: The `apollo-tracing` package is no longer part of Apollo Server 3. See https://www.apollographql.com/docs/apollo-server/migration/#tracing for details
+    peerDependencies:
+      graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  apollo-utilities@1.3.4:
+    resolution: {integrity: sha512-pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig==}
+    peerDependencies:
+      graphql: ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  aproba@2.0.0:
+    resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
+
+  arch@2.2.0:
+    resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
+
+  are-passive-events-supported@1.1.1:
+    resolution: {integrity: sha512-5wnvlvB/dTbfrCvJ027Y4L4gW/6Mwoy1uFSavney0YO++GU+0e/flnjiBBwH+1kh7xNCgCOGvmJC3s32joYbww==}
+
+  are-we-there-yet@2.0.0:
+    resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==}
+    engines: {node: '>=10'}
+    deprecated: This package is no longer supported.
+
+  arg@4.1.3:
+    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
+
+  argparse@1.0.10:
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+
+  argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+
+  aria-query@4.2.2:
+    resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==}
+    engines: {node: '>=6.0'}
+
+  aria-query@5.3.2:
+    resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
+    engines: {node: '>= 0.4'}
+
+  arr-diff@4.0.0:
+    resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==}
+    engines: {node: '>=0.10.0'}
+
+  arr-flatten@1.1.0:
+    resolution: {integrity: sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==}
+    engines: {node: '>=0.10.0'}
+
+  arr-union@3.1.0:
+    resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
+    engines: {node: '>=0.10.0'}
+
+  array-buffer-byte-length@1.0.2:
+    resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==}
+    engines: {node: '>= 0.4'}
+
+  array-each@1.0.1:
+    resolution: {integrity: sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==}
+    engines: {node: '>=0.10.0'}
+
+  array-equal@1.0.2:
+    resolution: {integrity: sha512-gUHx76KtnhEgB3HOuFYiCm3FIdEs6ocM2asHvNTkfu/Y09qQVrrVVaOKENmS2KkSaGoxgXNqC+ZVtR/n0MOkSA==}
+
+  array-flatten@1.1.1:
+    resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
+
+  array-includes@3.1.8:
+    resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
+    engines: {node: '>= 0.4'}
+
+  array-slice@1.1.0:
+    resolution: {integrity: sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==}
+    engines: {node: '>=0.10.0'}
+
+  array-union@2.1.0:
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
+    engines: {node: '>=8'}
+
+  array-unique@0.3.2:
+    resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
+    engines: {node: '>=0.10.0'}
+
+  array.prototype.findlast@1.2.5:
+    resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.findlastindex@1.2.5:
+    resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flat@1.3.3:
+    resolution: {integrity: sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flatmap@1.3.3:
+    resolution: {integrity: sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.reduce@1.0.7:
+    resolution: {integrity: sha512-mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.tosorted@1.1.4:
+    resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
+    engines: {node: '>= 0.4'}
+
+  arraybuffer.prototype.slice@1.0.4:
+    resolution: {integrity: sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==}
+    engines: {node: '>= 0.4'}
+
+  arrify@2.0.1:
+    resolution: {integrity: sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==}
+    engines: {node: '>=8'}
+
+  asap@2.0.6:
+    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
+
+  asn1@0.2.6:
+    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
+
+  assert-plus@1.0.0:
+    resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
+    engines: {node: '>=0.8'}
+
+  assign-symbols@1.0.0:
+    resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
+    engines: {node: '>=0.10.0'}
+
+  ast-types-flow@0.0.8:
+    resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==}
+
+  astring@1.9.0:
+    resolution: {integrity: sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==}
+    hasBin: true
+
+  async-array-reduce@0.2.1:
+    resolution: {integrity: sha512-/ywTADOcaEnwiAnOEi0UB/rAcIq5bTFfCV9euv3jLYFUMmy6KvKccTQUnLlp8Ensmfj43wHSmbGiPqjsZ6RhNA==}
+    engines: {node: '>=0.10.0'}
+
+  async-function@1.0.0:
+    resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==}
+    engines: {node: '>= 0.4'}
+
+  async-limiter@1.0.1:
+    resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==}
+
+  async-retry@1.3.3:
+    resolution: {integrity: sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==}
+
+  async@1.5.2:
+    resolution: {integrity: sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==}
+
+  async@2.6.4:
+    resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
+
+  async@3.2.6:
+    resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
+
+  asynckit@0.4.0:
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+
+  at-least-node@1.0.0:
+    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
+    engines: {node: '>= 4.0.0'}
+
+  atob@2.1.2:
+    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
+    engines: {node: '>= 4.5.0'}
+    hasBin: true
+
+  autoprefixer@6.7.2:
+    resolution: {integrity: sha512-BrtFd8nGiHJrfPfGZ4/iv3yFH15Fvo/+nb/ObqjfEaPM/KTUWprhJTBKdp5V3hATndPNV5v6ZLxHiqiQeZBgqQ==}
+
+  available-typed-arrays@1.0.7:
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
+
+  aws-sign2@0.7.0:
+    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
+
+  aws4@1.13.2:
+    resolution: {integrity: sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==}
+
+  axe-core@4.10.2:
+    resolution: {integrity: sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==}
+    engines: {node: '>=4'}
+
+  axobject-query@4.1.0:
+    resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
+    engines: {node: '>= 0.4'}
+
+  babel-eslint@10.1.0:
+    resolution: {integrity: sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==}
+    engines: {node: '>=6'}
+    deprecated: babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.
+    peerDependencies:
+      eslint: '>= 4.12.1'
+
+  babel-jest@26.6.3:
+    resolution: {integrity: sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==}
+    engines: {node: '>= 10.14.2'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  babel-jest@29.7.0:
+    resolution: {integrity: sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@babel/core': ^7.8.0
+
+  babel-loader@8.4.1:
+    resolution: {integrity: sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==}
+    engines: {node: '>= 8.9'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+      webpack: '>=2'
+
+  babel-plugin-istanbul@6.1.1:
+    resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
+    engines: {node: '>=8'}
+
+  babel-plugin-jest-hoist@26.6.2:
+    resolution: {integrity: sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==}
+    engines: {node: '>= 10.14.2'}
+
+  babel-plugin-jest-hoist@29.6.3:
+    resolution: {integrity: sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  babel-plugin-macros@3.1.0:
+    resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
+    engines: {node: '>=10', npm: '>=6'}
+
+  babel-plugin-polyfill-corejs2@0.4.12:
+    resolution: {integrity: sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-corejs3@0.10.6:
+    resolution: {integrity: sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-corejs3@0.11.1:
+    resolution: {integrity: sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-regenerator@0.6.3:
+    resolution: {integrity: sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-styled-components@2.1.4:
+    resolution: {integrity: sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==}
+    peerDependencies:
+      styled-components: '>= 2'
+
+  babel-plugin-transform-react-remove-prop-types@0.4.24:
+    resolution: {integrity: sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==}
+
+  babel-polyfill@6.26.0:
+    resolution: {integrity: sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==}
+
+  babel-preset-airbnb@4.5.0:
+    resolution: {integrity: sha512-vw1Y1k/yeHB1wglFrSWXPPvgqCg7qGeT+m7m1GWpgL26dvjrGHwyQIOGuLmcHNvE51Rp4M0b685HG7pu3YGCyw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+      '@babel/runtime': ^7.0.0
+
+  babel-preset-current-node-syntax@1.1.0:
+    resolution: {integrity: sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  babel-preset-jest@26.6.2:
+    resolution: {integrity: sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==}
+    engines: {node: '>= 10.14.2'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  babel-preset-jest@29.6.3:
+    resolution: {integrity: sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  babel-runtime@6.26.0:
+    resolution: {integrity: sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==}
+
+  backo2@1.0.2:
+    resolution: {integrity: sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==}
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
+  base@0.11.2:
+    resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
+    engines: {node: '>=0.10.0'}
+
+  batch@0.6.1:
+    resolution: {integrity: sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==}
+
+  bcrypt-pbkdf@1.0.2:
+    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
+
+  bcrypt@5.1.1:
+    resolution: {integrity: sha512-AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww==}
+    engines: {node: '>= 10.0.0'}
+
+  big.js@3.2.0:
+    resolution: {integrity: sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==}
+
+  big.js@5.2.2:
+    resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
+
+  bignumber.js@9.1.2:
+    resolution: {integrity: sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==}
+
+  binary-extensions@2.3.0:
+    resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
+    engines: {node: '>=8'}
+
+  blob-util@2.0.2:
+    resolution: {integrity: sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==}
+
+  bluebird@3.7.2:
+    resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
+
+  body-parser@1.20.3:
+    resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+
+  body@5.1.0:
+    resolution: {integrity: sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==}
+
+  bonjour-service@1.3.0:
+    resolution: {integrity: sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==}
+
+  boolbase@1.0.0:
+    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
+
+  brace-expansion@1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+
+  brace-expansion@2.0.1:
+    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+
+  braces@2.3.2:
+    resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==}
+    engines: {node: '>=0.10.0'}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  browser-env@3.3.0:
+    resolution: {integrity: sha512-XO+rbi2f9DtuoYgnN/Um80Qz/m033C3fKdUxKbbNs+jCshezRENMlG+QGT9qZyZE4b/KYTwUu6RNMCavGhPdEQ==}
+    engines: {node: '>=4'}
+
+  browser-process-hrtime@1.0.0:
+    resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==}
+
+  browserslist@1.7.7:
+    resolution: {integrity: sha512-qHJblDE2bXVRYzuDetv/wAeHOJyO97+9wxC1cdCtyzgNuSozOyRCiiLaCR1f71AN66lQdVVBipWm63V+a7bPOw==}
+    deprecated: Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.
+    hasBin: true
+
+  browserslist@4.24.4:
+    resolution: {integrity: sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  bs-logger@0.2.6:
+    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
+    engines: {node: '>= 6'}
+
+  bser@2.1.1:
+    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
+
+  buffer-crc32@0.2.13:
+    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
+
+  buffer-equal-constant-time@1.0.1:
+    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
+
+  buffer-from@1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+
+  builtin-modules@3.3.0:
+    resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
+    engines: {node: '>=6'}
+
+  busboy@0.3.1:
+    resolution: {integrity: sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==}
+    engines: {node: '>=4.5.0'}
+
+  bytes@1.0.0:
+    resolution: {integrity: sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ==}
+
+  bytes@3.1.2:
+    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
+    engines: {node: '>= 0.8'}
+
+  cacache@15.3.0:
+    resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==}
+    engines: {node: '>= 10'}
+
+  cache-base@1.0.1:
+    resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
+    engines: {node: '>=0.10.0'}
+
+  cachedir@2.4.0:
+    resolution: {integrity: sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==}
+    engines: {node: '>=6'}
+
+  call-bind-apply-helpers@1.0.2:
+    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
+    engines: {node: '>= 0.4'}
+
+  call-bind@1.0.8:
+    resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==}
+    engines: {node: '>= 0.4'}
+
+  call-bound@1.0.3:
+    resolution: {integrity: sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==}
+    engines: {node: '>= 0.4'}
+
+  callsites@3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
+
+  camel-case@4.1.2:
+    resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
+
+  camelcase@5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
+    engines: {node: '>=6'}
+
+  camelcase@6.3.0:
+    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
+    engines: {node: '>=10'}
+
+  camelize@1.0.1:
+    resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==}
+
+  caniuse-db@1.0.30001700:
+    resolution: {integrity: sha512-rovRZqmw7ysPAeb5s5updDElS6Bp3DvB2JWgmpvGI8z3dMzGI0xpZLx/K6HOK6e7rNRr6dCx32ZGnd4J/WWcrA==}
+
+  caniuse-lite@1.0.30001700:
+    resolution: {integrity: sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==}
+
+  capture-exit@2.0.0:
+    resolution: {integrity: sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  case-sensitive-paths-webpack-plugin@2.4.0:
+    resolution: {integrity: sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==}
+    engines: {node: '>=4'}
+
+  caseless@0.12.0:
+    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
+
+  chalk@1.1.3:
+    resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==}
+    engines: {node: '>=0.10.0'}
+
+  chalk@2.4.2:
+    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
+    engines: {node: '>=4'}
+
+  chalk@3.0.0:
+    resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}
+    engines: {node: '>=8'}
+
+  chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+
+  char-regex@1.0.2:
+    resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
+    engines: {node: '>=10'}
+
+  check-more-types@2.24.0:
+    resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==}
+    engines: {node: '>= 0.8.0'}
+
+  chokidar@3.6.0:
+    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
+    engines: {node: '>= 8.10.0'}
+
+  chokidar@4.0.3:
+    resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
+    engines: {node: '>= 14.16.0'}
+
+  chownr@2.0.0:
+    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
+    engines: {node: '>=10'}
+
+  chrome-trace-event@1.0.4:
+    resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==}
+    engines: {node: '>=6.0'}
+
+  ci-info@2.0.0:
+    resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==}
+
+  ci-info@3.9.0:
+    resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
+    engines: {node: '>=8'}
+
+  cjs-module-lexer@0.6.0:
+    resolution: {integrity: sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==}
+
+  cjs-module-lexer@1.4.3:
+    resolution: {integrity: sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==}
+
+  class-utils@0.3.6:
+    resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
+    engines: {node: '>=0.10.0'}
+
+  classnames@2.3.1:
+    resolution: {integrity: sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==}
+
+  clean-css@5.3.3:
+    resolution: {integrity: sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==}
+    engines: {node: '>= 10.0'}
+
+  clean-stack@2.2.0:
+    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
+    engines: {node: '>=6'}
+
+  cli-cursor@1.0.2:
+    resolution: {integrity: sha512-25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==}
+    engines: {node: '>=0.10.0'}
+
+  cli-cursor@2.1.0:
+    resolution: {integrity: sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==}
+    engines: {node: '>=4'}
+
+  cli-progress@3.12.0:
+    resolution: {integrity: sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==}
+    engines: {node: '>=4'}
+
+  cli-table3@0.6.5:
+    resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==}
+    engines: {node: 10.* || >= 12.*}
+
+  cli-truncate@0.2.1:
+    resolution: {integrity: sha512-f4r4yJnbT++qUPI9NR4XLDLq41gQ+uqnPItWG0F5ZkehuNiTTa3EY0S4AqTSUOeJ7/zU41oWPQSNkW5BqPL9bg==}
+    engines: {node: '>=0.10.0'}
+
+  cliui@5.0.0:
+    resolution: {integrity: sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==}
+
+  cliui@6.0.0:
+    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
+
+  cliui@7.0.4:
+    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
+
+  cliui@8.0.1:
+    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
+    engines: {node: '>=12'}
+
+  clone-deep@4.0.1:
+    resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==}
+    engines: {node: '>=6'}
+
+  clsx@2.1.1:
+    resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
+    engines: {node: '>=6'}
+
+  co@4.6.0:
+    resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
+    engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
+
+  code-point-at@1.1.0:
+    resolution: {integrity: sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==}
+    engines: {node: '>=0.10.0'}
+
+  codemirror@5.65.18:
+    resolution: {integrity: sha512-Gaz4gHnkbHMGgahNt3CA5HBk5lLQBqmD/pBgeB4kQU6OedZmqMBjlRF0LSrp2tJ4wlLNPm2FfaUd1pDy0mdlpA==}
+
+  collect-v8-coverage@1.0.2:
+    resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==}
+
+  collection-visit@1.0.0:
+    resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
+    engines: {node: '>=0.10.0'}
+
+  color-convert@1.9.3:
+    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+
+  color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+
+  color-name@1.1.3:
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
+
+  color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  color-support@1.1.3:
+    resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
+    hasBin: true
+
+  colorette@2.0.20:
+    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
+
+  colors@1.1.2:
+    resolution: {integrity: sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w==}
+    engines: {node: '>=0.1.90'}
+
+  combined-stream@1.0.8:
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+    engines: {node: '>= 0.8'}
+
+  commander@10.0.1:
+    resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
+    engines: {node: '>=14'}
+
+  commander@2.20.3:
+    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
+
+  commander@5.1.0:
+    resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
+    engines: {node: '>= 6'}
+
+  commander@7.2.0:
+    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
+    engines: {node: '>= 10'}
+
+  commander@8.3.0:
+    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
+    engines: {node: '>= 12'}
+
+  common-tags@1.8.2:
+    resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
+    engines: {node: '>=4.0.0'}
+
+  commondir@1.0.1:
+    resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
+
+  component-emitter@1.3.1:
+    resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
+
+  compressible@2.0.18:
+    resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==}
+    engines: {node: '>= 0.6'}
+
+  compression@1.8.0:
+    resolution: {integrity: sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==}
+    engines: {node: '>= 0.8.0'}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  concat-stream@1.6.2:
+    resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==}
+    engines: {'0': node >= 0.8}
+
+  concurrently@5.3.0:
+    resolution: {integrity: sha512-8MhqOB6PWlBfA2vJ8a0bSFKATOdWlHiQlk11IfmQBPaHVP8oP2gsh2MObE6UR3hqDHqvaIvLTyceNW6obVuFHQ==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  confusing-browser-globals@1.0.11:
+    resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==}
+
+  connect-history-api-fallback@2.0.0:
+    resolution: {integrity: sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==}
+    engines: {node: '>=0.8'}
+
+  console-control-strings@1.1.0:
+    resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
+
+  content-disposition@0.5.4:
+    resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
+    engines: {node: '>= 0.6'}
+
+  content-type@1.0.5:
+    resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
+    engines: {node: '>= 0.6'}
+
+  continuable-cache@0.3.1:
+    resolution: {integrity: sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA==}
+
+  convert-source-map@1.9.0:
+    resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
+
+  convert-source-map@2.0.0:
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
+
+  cookie-parser@1.4.7:
+    resolution: {integrity: sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==}
+    engines: {node: '>= 0.8.0'}
+
+  cookie-signature@1.0.6:
+    resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
+
+  cookie@0.7.1:
+    resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==}
+    engines: {node: '>= 0.6'}
+
+  cookie@0.7.2:
+    resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==}
+    engines: {node: '>= 0.6'}
+
+  cookie@1.0.2:
+    resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==}
+    engines: {node: '>=18'}
+
+  copy-descriptor@0.1.1:
+    resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
+    engines: {node: '>=0.10.0'}
+
+  copy-to-clipboard@3.3.3:
+    resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}
+
+  copyfiles@2.4.1:
+    resolution: {integrity: sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==}
+    hasBin: true
+
+  core-js-compat@3.40.0:
+    resolution: {integrity: sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==}
+
+  core-js-pure@3.40.0:
+    resolution: {integrity: sha512-AtDzVIgRrmRKQai62yuSIN5vNiQjcJakJb4fbhVw3ehxx7Lohphvw9SGNWKhLFqSxC4ilD0g/L1huAYFQU3Q6A==}
+
+  core-js@2.6.12:
+    resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==}
+    deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
+
+  core-util-is@1.0.2:
+    resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
+
+  core-util-is@1.0.3:
+    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
+
+  cors@2.8.5:
+    resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
+    engines: {node: '>= 0.10'}
+
+  cosmiconfig@2.2.2:
+    resolution: {integrity: sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==}
+    engines: {node: '>=0.12'}
+
+  cosmiconfig@7.1.0:
+    resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
+    engines: {node: '>=10'}
+
+  countup.js@2.9.0:
+    resolution: {integrity: sha512-llqrvyXztRFPp6+i8jx25phHWcVWhrHO4Nlt0uAOSKHB8778zzQswa4MU3qKBvkXfJKftRYFJuVHez67lyKdHg==}
+
+  coveralls@3.1.1:
+    resolution: {integrity: sha512-+dxnG2NHncSD1NrqbSM3dn/lE57O6Qf/koe9+I7c+wzkqRmEvcp0kgJdxKInzYzkICKkFMZsX3Vct3++tsF9ww==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  create-jest@29.7.0:
+    resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+
+  create-require@1.1.1:
+    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
+
+  cross-fetch@3.2.0:
+    resolution: {integrity: sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==}
+
+  cross-spawn@6.0.6:
+    resolution: {integrity: sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==}
+    engines: {node: '>=4.8'}
+
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
+    engines: {node: '>= 8'}
+
+  css-box-model@1.2.1:
+    resolution: {integrity: sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==}
+
+  css-color-keywords@1.0.0:
+    resolution: {integrity: sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==}
+    engines: {node: '>=4'}
+
+  css-loader@3.6.0:
+    resolution: {integrity: sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==}
+    engines: {node: '>= 8.9.0'}
+    peerDependencies:
+      webpack: ^4.0.0 || ^5.0.0
+
+  css-select@4.3.0:
+    resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==}
+
+  css-to-react-native@2.3.2:
+    resolution: {integrity: sha512-VOFaeZA053BqvvvqIA8c9n0+9vFppVBAHCp6JgFTtTMU3Mzi+XnelJ9XC9ul3BqFzZyQ5N+H0SnwsWT2Ebchxw==}
+
+  css-what@6.1.0:
+    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
+    engines: {node: '>= 6'}
+
+  cssesc@3.0.0:
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  cssfilter@0.0.10:
+    resolution: {integrity: sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==}
+
+  cssom@0.3.8:
+    resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
+
+  cssom@0.4.4:
+    resolution: {integrity: sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==}
+
+  cssom@0.5.0:
+    resolution: {integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==}
+
+  cssstyle@1.4.0:
+    resolution: {integrity: sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==}
+
+  cssstyle@2.3.0:
+    resolution: {integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==}
+    engines: {node: '>=8'}
+
+  csstype@3.1.3:
+    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+
+  cypress@6.9.1:
+    resolution: {integrity: sha512-/RVx6sOhsyTR9sd9v0BHI4tnDZAhsH9rNat7CIKCUEr5VPWxyfGH0EzK4IHhAqAH8vjFcD4U14tPiJXshoUrmQ==}
+    engines: {node: '>=10.0.0'}
+    hasBin: true
+
+  d3-array@3.2.4:
+    resolution: {integrity: sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==}
+    engines: {node: '>=12'}
+
+  d3-color@1.4.1:
+    resolution: {integrity: sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==}
+
+  d3-ease@3.0.1:
+    resolution: {integrity: sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==}
+    engines: {node: '>=12'}
+
+  d3-format@1.4.5:
+    resolution: {integrity: sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==}
+
+  d3-interpolate@3.0.1:
+    resolution: {integrity: sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==}
+    engines: {node: '>=12'}
+
+  d3-path@3.1.0:
+    resolution: {integrity: sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==}
+    engines: {node: '>=12'}
+
+  d3-scale@4.0.2:
+    resolution: {integrity: sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==}
+    engines: {node: '>=12'}
+
+  d3-shape@3.2.0:
+    resolution: {integrity: sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==}
+    engines: {node: '>=12'}
+
+  d3-time-format@2.3.0:
+    resolution: {integrity: sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==}
+
+  d3-time@1.1.0:
+    resolution: {integrity: sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==}
+
+  d3-time@3.1.0:
+    resolution: {integrity: sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==}
+    engines: {node: '>=12'}
+
+  d3-timer@3.0.1:
+    resolution: {integrity: sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==}
+    engines: {node: '>=12'}
+
+  damerau-levenshtein@1.0.8:
+    resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
+
+  dashdash@1.14.1:
+    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
+    engines: {node: '>=0.10'}
+
+  data-urls@1.1.0:
+    resolution: {integrity: sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==}
+
+  data-urls@2.0.0:
+    resolution: {integrity: sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==}
+    engines: {node: '>=10'}
+
+  data-urls@3.0.2:
+    resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==}
+    engines: {node: '>=12'}
+
+  data-view-buffer@1.0.2:
+    resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-length@1.0.2:
+    resolution: {integrity: sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-offset@1.0.1:
+    resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
+    engines: {node: '>= 0.4'}
+
+  date-fns@1.30.1:
+    resolution: {integrity: sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==}
+
+  date-fns@2.30.0:
+    resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
+    engines: {node: '>=0.11'}
+
+  dateformat@4.6.3:
+    resolution: {integrity: sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==}
+
+  dayjs@1.11.13:
+    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
+
+  debounce@1.2.1:
+    resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
+
+  debug@2.6.9:
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@3.2.7:
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.3.2:
+    resolution: {integrity: sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.4.0:
+    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  decamelize@1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+    engines: {node: '>=0.10.0'}
+
+  decimal.js-light@2.5.1:
+    resolution: {integrity: sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==}
+
+  decimal.js@10.5.0:
+    resolution: {integrity: sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==}
+
+  decode-uri-component@0.2.2:
+    resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
+    engines: {node: '>=0.10'}
+
+  dedent@1.5.3:
+    resolution: {integrity: sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==}
+    peerDependencies:
+      babel-plugin-macros: ^3.1.0
+    peerDependenciesMeta:
+      babel-plugin-macros:
+        optional: true
+
+  deep-freeze@0.0.1:
+    resolution: {integrity: sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg==}
+
+  deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
+  deepmerge@4.3.1:
+    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
+    engines: {node: '>=0.10.0'}
+
+  default-gateway@6.0.3:
+    resolution: {integrity: sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==}
+    engines: {node: '>= 10'}
+
+  define-data-property@1.1.4:
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
+
+  define-lazy-prop@2.0.0:
+    resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
+    engines: {node: '>=8'}
+
+  define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+
+  define-property@0.2.5:
+    resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
+    engines: {node: '>=0.10.0'}
+
+  define-property@1.0.0:
+    resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==}
+    engines: {node: '>=0.10.0'}
+
+  define-property@2.0.2:
+    resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
+    engines: {node: '>=0.10.0'}
+
+  delayed-stream@1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
+
+  delegates@1.0.0:
+    resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
+
+  denque@2.1.0:
+    resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==}
+    engines: {node: '>=0.10'}
+
+  depd@1.1.2:
+    resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==}
+    engines: {node: '>= 0.6'}
+
+  depd@2.0.0:
+    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
+    engines: {node: '>= 0.8'}
+
+  deprecated-decorator@0.1.6:
+    resolution: {integrity: sha512-MHidOOnCHGlZDKsI21+mbIIhf4Fff+hhCTB7gtVg4uoIqjcrTZc5v6M+GS2zVI0sV7PqK415rb8XaOSQsQkHOw==}
+
+  destroy@1.2.0:
+    resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+
+  detect-file@1.0.0:
+    resolution: {integrity: sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==}
+    engines: {node: '>=0.10.0'}
+
+  detect-libc@1.0.3:
+    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  detect-libc@2.0.3:
+    resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
+    engines: {node: '>=8'}
+
+  detect-newline@3.1.0:
+    resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
+    engines: {node: '>=8'}
+
+  detect-node-es@1.1.0:
+    resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
+
+  detect-node@2.1.0:
+    resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
+
+  dicer@0.3.0:
+    resolution: {integrity: sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==}
+    engines: {node: '>=4.5.0'}
+
+  diff-sequences@26.6.2:
+    resolution: {integrity: sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==}
+    engines: {node: '>= 10.14.2'}
+
+  diff-sequences@29.6.3:
+    resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  diff@4.0.2:
+    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
+    engines: {node: '>=0.3.1'}
+
+  dir-glob@3.0.1:
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
+    engines: {node: '>=8'}
+
+  dlv@1.1.3:
+    resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
+
+  dns-packet@5.6.1:
+    resolution: {integrity: sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==}
+    engines: {node: '>=6'}
+
+  doctrine@2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
+
+  doctrine@3.0.0:
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
+    engines: {node: '>=6.0.0'}
+
+  dom-accessibility-api@0.5.16:
+    resolution: {integrity: sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==}
+
+  dom-converter@0.2.0:
+    resolution: {integrity: sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==}
+
+  dom-helpers@5.2.1:
+    resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==}
+
+  dom-serializer@1.4.1:
+    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
+
+  domelementtype@2.3.0:
+    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
+
+  domexception@1.0.1:
+    resolution: {integrity: sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==}
+    deprecated: Use your platform's native DOMException instead
+
+  domexception@2.0.1:
+    resolution: {integrity: sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==}
+    engines: {node: '>=8'}
+    deprecated: Use your platform's native DOMException instead
+
+  domexception@4.0.0:
+    resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==}
+    engines: {node: '>=12'}
+    deprecated: Use your platform's native DOMException instead
+
+  domhandler@4.3.1:
+    resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
+    engines: {node: '>= 4'}
+
+  domutils@2.8.0:
+    resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
+
+  dot-case@3.0.4:
+    resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
+
+  dotenv-defaults@2.0.2:
+    resolution: {integrity: sha512-iOIzovWfsUHU91L5i8bJce3NYK5JXeAwH50Jh6+ARUdLiiGlYWfGw6UkzsYqaXZH/hjE/eCd/PlfM/qqyK0AMg==}
+
+  dotenv-webpack@6.0.4:
+    resolution: {integrity: sha512-WiTPNLanDNJ1O8AvgkBpsbarw78a4PMYG2EfJcQoxTHFWy+ji213HR+3f4PhWB1RBumiD9cbiuC3SNxJXbBp9g==}
+    peerDependencies:
+      webpack: ^1 || ^2 || ^3 || ^4 || ^5
+
+  dotenv@8.6.0:
+    resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
+    engines: {node: '>=10'}
+
+  dottie@2.0.6:
+    resolution: {integrity: sha512-iGCHkfUc5kFekGiqhe8B/mdaurD+lakO9txNnTvKtA6PISrw86LgqHvRzWYPyoE2Ph5aMIrCw9/uko6XHTKCwA==}
+
+  dunder-proto@1.0.1:
+    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
+    engines: {node: '>= 0.4'}
+
+  duplexer@0.1.2:
+    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
+
+  eastasianwidth@0.2.0:
+    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
+
+  ecc-jsbn@0.1.2:
+    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
+
+  ecdsa-sig-formatter@1.0.11:
+    resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
+
+  ee-first@1.1.1:
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
+
+  ejs@3.1.10:
+    resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+
+  electron-to-chromium@1.5.102:
+    resolution: {integrity: sha512-eHhqaja8tE/FNpIiBrvBjFV/SSKpyWHLvxuR9dPTdo+3V9ppdLmFB7ZZQ98qNovcngPLYIz0oOBF9P0FfZef5Q==}
+
+  elegant-spinner@1.0.1:
+    resolution: {integrity: sha512-B+ZM+RXvRqQaAmkMlO/oSe5nMUOaUnyfGYCEHoR8wrXsZR2mA0XVibsxV1bvTwxdRWah1PkQqso2EzhILGHtEQ==}
+    engines: {node: '>=0.10.0'}
+
+  emittery@0.13.1:
+    resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
+    engines: {node: '>=12'}
+
+  emittery@0.7.2:
+    resolution: {integrity: sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==}
+    engines: {node: '>=10'}
+
+  emoji-regex@7.0.3:
+    resolution: {integrity: sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==}
+
+  emoji-regex@8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+
+  emoji-regex@9.2.2:
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+
+  emojis-list@2.1.0:
+    resolution: {integrity: sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==}
+    engines: {node: '>= 0.10'}
+
+  emojis-list@3.0.0:
+    resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==}
+    engines: {node: '>= 4'}
+
+  encodeurl@1.0.2:
+    resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}
+    engines: {node: '>= 0.8'}
+
+  encodeurl@2.0.0:
+    resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
+    engines: {node: '>= 0.8'}
+
+  end-of-stream@1.4.4:
+    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+
+  enhanced-resolve@5.18.1:
+    resolution: {integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==}
+    engines: {node: '>=10.13.0'}
+
+  entities@2.2.0:
+    resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
+
+  entities@4.5.0:
+    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
+    engines: {node: '>=0.12'}
+
+  envinfo@7.14.0:
+    resolution: {integrity: sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  error-ex@1.3.2:
+    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+
+  error@7.2.1:
+    resolution: {integrity: sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==}
+
+  es-abstract@1.23.9:
+    resolution: {integrity: sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==}
+    engines: {node: '>= 0.4'}
+
+  es-array-method-boxes-properly@1.0.0:
+    resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==}
+
+  es-define-property@1.0.1:
+    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
+    engines: {node: '>= 0.4'}
+
+  es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
+
+  es-iterator-helpers@1.2.1:
+    resolution: {integrity: sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==}
+    engines: {node: '>= 0.4'}
+
+  es-module-lexer@1.6.0:
+    resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==}
+
+  es-object-atoms@1.1.1:
+    resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.1.0:
+    resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
+    engines: {node: '>= 0.4'}
+
+  es-shim-unscopables@1.1.0:
+    resolution: {integrity: sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==}
+    engines: {node: '>= 0.4'}
+
+  es-to-primitive@1.3.0:
+    resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
+    engines: {node: '>= 0.4'}
+
+  es-toolkit@1.39.10:
+    resolution: {integrity: sha512-E0iGnTtbDhkeczB0T+mxmoVlT4YNweEKBLq7oaU4p11mecdsZpNWOglI4895Vh4usbQ+LsJiuLuI2L0Vdmfm2w==}
+
+  esbuild@0.25.0:
+    resolution: {integrity: sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  escalade@3.2.0:
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
+    engines: {node: '>=6'}
+
+  escape-html@1.0.3:
+    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
+
+  escape-string-regexp@1.0.5:
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+    engines: {node: '>=0.8.0'}
+
+  escape-string-regexp@2.0.0:
+    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
+    engines: {node: '>=8'}
+
+  escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
+  escodegen@1.14.3:
+    resolution: {integrity: sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==}
+    engines: {node: '>=4.0'}
+    hasBin: true
+
+  escodegen@2.1.0:
+    resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==}
+    engines: {node: '>=6.0'}
+    hasBin: true
+
+  eslint-config-airbnb-base@15.0.0:
+    resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+    peerDependencies:
+      eslint: ^7.32.0 || ^8.2.0
+      eslint-plugin-import: ^2.25.2
+
+  eslint-config-airbnb@19.0.4:
+    resolution: {integrity: sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==}
+    engines: {node: ^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^7.32.0 || ^8.2.0
+      eslint-plugin-import: ^2.25.3
+      eslint-plugin-jsx-a11y: ^6.5.1
+      eslint-plugin-react: ^7.28.0
+      eslint-plugin-react-hooks: ^4.3.0
+
+  eslint-import-resolver-node@0.3.9:
+    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
+
+  eslint-module-utils@2.12.0:
+    resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+
+  eslint-plugin-import@2.31.0:
+    resolution: {integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+
+  eslint-plugin-jsx-a11y@6.10.2:
+    resolution: {integrity: sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
+
+  eslint-plugin-react-hooks@4.6.2:
+    resolution: {integrity: sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
+
+  eslint-plugin-react@7.37.4:
+    resolution: {integrity: sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
+
+  eslint-scope@5.1.1:
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
+    engines: {node: '>=8.0.0'}
+
+  eslint-scope@7.2.2:
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@1.3.0:
+    resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==}
+    engines: {node: '>=4'}
+
+  eslint-visitor-keys@3.4.3:
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@4.2.0:
+    resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  eslint-webpack-plugin@4.2.0:
+    resolution: {integrity: sha512-rsfpFQ01AWQbqtjgPRr2usVRxhWDuG0YDYcG8DJOteD3EFnpeuYuOwk0PQiN7PRBTqS6ElNdtPZPggj8If9WnA==}
+    engines: {node: '>= 14.15.0'}
+    peerDependencies:
+      eslint: ^8.0.0 || ^9.0.0
+      webpack: ^5.0.0
+
+  eslint@8.57.1:
+    resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
+    hasBin: true
+
+  espree@10.3.0:
+    resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  esprima@4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  esquery@1.6.0:
+    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
+    engines: {node: '>=0.10'}
+
+  esrecurse@4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+
+  estraverse@4.3.0:
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
+    engines: {node: '>=4.0'}
+
+  estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+
+  estree-walker@0.6.1:
+    resolution: {integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==}
+
+  estree-walker@1.0.1:
+    resolution: {integrity: sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==}
+
+  estree-walker@2.0.2:
+    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+
+  esutils@2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
+
+  etag@1.8.1:
+    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
+    engines: {node: '>= 0.6'}
+
+  event-target-shim@5.0.1:
+    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
+    engines: {node: '>=6'}
+
+  eventemitter2@0.4.14:
+    resolution: {integrity: sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==}
+
+  eventemitter2@6.4.9:
+    resolution: {integrity: sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==}
+
+  eventemitter3@3.1.2:
+    resolution: {integrity: sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==}
+
+  eventemitter3@4.0.7:
+    resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
+
+  eventemitter3@5.0.1:
+    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
+
+  events@3.3.0:
+    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
+    engines: {node: '>=0.8.x'}
+
+  exec-sh@0.3.6:
+    resolution: {integrity: sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==}
+
+  execa@1.0.0:
+    resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==}
+    engines: {node: '>=6'}
+
+  execa@4.1.0:
+    resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
+    engines: {node: '>=10'}
+
+  execa@5.1.1:
+    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
+    engines: {node: '>=10'}
+
+  executable@4.1.1:
+    resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}
+    engines: {node: '>=4'}
+
+  exit-hook@1.1.1:
+    resolution: {integrity: sha512-MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==}
+    engines: {node: '>=0.10.0'}
+
+  exit@0.1.2:
+    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
+    engines: {node: '>= 0.8.0'}
+
+  expand-brackets@2.1.4:
+    resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==}
+    engines: {node: '>=0.10.0'}
+
+  expand-tilde@2.0.2:
+    resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
+    engines: {node: '>=0.10.0'}
+
+  expect@26.6.2:
+    resolution: {integrity: sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==}
+    engines: {node: '>= 10.14.2'}
+
+  expect@29.7.0:
+    resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  express@4.21.2:
+    resolution: {integrity: sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==}
+    engines: {node: '>= 0.10.0'}
+
+  extend-shallow@2.0.1:
+    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
+    engines: {node: '>=0.10.0'}
+
+  extend-shallow@3.0.2:
+    resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
+    engines: {node: '>=0.10.0'}
+
+  extend@3.0.2:
+    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
+
+  extglob@2.0.4:
+    resolution: {integrity: sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==}
+    engines: {node: '>=0.10.0'}
+
+  extract-text-webpack-plugin@1.0.1:
+    resolution: {integrity: sha512-cl5NaZf1uB2ijZsLmoaPaaDMDBkd4ll5fv0b9BUmNADAg537ArDwvcvUY46KR+GI4uWwF7aF3MEo4GKKWv/+vg==}
+    deprecated: Deprecated. Please use https://github.com/webpack-contrib/mini-css-extract-plugin
+    peerDependencies:
+      webpack: ^1.9.11
+
+  extract-zip@1.7.0:
+    resolution: {integrity: sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==}
+    hasBin: true
+
+  extsprintf@1.3.0:
+    resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==}
+    engines: {'0': node >=0.6.0}
+
+  fast-deep-equal@3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+
+  fast-glob@3.3.3:
+    resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
+    engines: {node: '>=8.6.0'}
+
+  fast-json-stable-stringify@2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+  fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
+  fast-text-encoding@1.0.6:
+    resolution: {integrity: sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==}
+
+  fast-uri@3.0.6:
+    resolution: {integrity: sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==}
+
+  fastest-levenshtein@1.0.16:
+    resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
+    engines: {node: '>= 4.9.1'}
+
+  fastq@1.19.0:
+    resolution: {integrity: sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==}
+
+  faye-websocket@0.10.0:
+    resolution: {integrity: sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ==}
+    engines: {node: '>=0.4.0'}
+
+  faye-websocket@0.11.4:
+    resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==}
+    engines: {node: '>=0.8.0'}
+
+  fb-watchman@2.0.2:
+    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
+
+  fd-slicer@1.1.0:
+    resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
+
+  figures@1.7.0:
+    resolution: {integrity: sha512-UxKlfCRuCBxSXU4C6t9scbDyWZ4VlaFFdojKtzJuSkuOBQ5CNFum+zZXFwHjo+CxBC1t6zlYPgHIgFjL8ggoEQ==}
+    engines: {node: '>=0.10.0'}
+
+  figures@2.0.0:
+    resolution: {integrity: sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==}
+    engines: {node: '>=4'}
+
+  figures@3.2.0:
+    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
+    engines: {node: '>=8'}
+
+  file-entry-cache@6.0.1:
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  file-sync-cmp@0.1.1:
+    resolution: {integrity: sha512-0k45oWBokCqh2MOexeYKpyqmGKG+8mQ2Wd8iawx+uWd/weWJQAZ6SoPybagdCI4xFisag8iAR77WPm4h3pTfxA==}
+
+  filelist@1.0.4:
+    resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
+
+  fill-range@4.0.0:
+    resolution: {integrity: sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==}
+    engines: {node: '>=0.10.0'}
+
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
+  finalhandler@1.3.1:
+    resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==}
+    engines: {node: '>= 0.8'}
+
+  find-cache-dir@3.3.2:
+    resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==}
+    engines: {node: '>=8'}
+
+  find-root@1.1.0:
+    resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
+
+  find-up@3.0.0:
+    resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==}
+    engines: {node: '>=6'}
+
+  find-up@4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+    engines: {node: '>=8'}
+
+  find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+
+  findup-sync@4.0.0:
+    resolution: {integrity: sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==}
+    engines: {node: '>= 8'}
+
+  findup-sync@5.0.0:
+    resolution: {integrity: sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==}
+    engines: {node: '>= 10.13.0'}
+
+  fined@1.2.0:
+    resolution: {integrity: sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==}
+    engines: {node: '>= 0.10'}
+
+  flagged-respawn@1.0.1:
+    resolution: {integrity: sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==}
+    engines: {node: '>= 0.10'}
+
+  flat-cache@3.2.0:
+    resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  flat@5.0.2:
+    resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
+    hasBin: true
+
+  flatted@3.3.2:
+    resolution: {integrity: sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==}
+
+  focus-lock@1.3.6:
+    resolution: {integrity: sha512-Ik/6OCk9RQQ0T5Xw+hKNLWrjSMtv51dD4GRmJjbD5a58TIEpI5a5iXagKVl3Z5UuyslMCA8Xwnu76jQob62Yhg==}
+    engines: {node: '>=10'}
+
+  focus-outline-manager@1.0.2:
+    resolution: {integrity: sha512-bHWEmjLsTjGP9gVs7P3Hyl+oY5NlMW8aTSPdTJ+X2GKt6glDctt9fUCLbRV+d/l8NDC40+FxMjp9WlTQXaQALw==}
+
+  follow-redirects@1.15.9:
+    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+
+  for-each@0.3.5:
+    resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==}
+    engines: {node: '>= 0.4'}
+
+  for-in@1.0.2:
+    resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
+    engines: {node: '>=0.10.0'}
+
+  for-own@1.0.0:
+    resolution: {integrity: sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==}
+    engines: {node: '>=0.10.0'}
+
+  foreground-child@3.3.0:
+    resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
+    engines: {node: '>=14'}
+
+  forever-agent@0.6.1:
+    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
+
+  form-data@2.3.3:
+    resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
+    engines: {node: '>= 0.12'}
+
+  form-data@3.0.3:
+    resolution: {integrity: sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==}
+    engines: {node: '>= 6'}
+
+  form-data@4.0.2:
+    resolution: {integrity: sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==}
+    engines: {node: '>= 6'}
+
+  forwarded@0.2.0:
+    resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
+    engines: {node: '>= 0.6'}
+
+  fragment-cache@0.2.1:
+    resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
+    engines: {node: '>=0.10.0'}
+
+  fresh@0.5.2:
+    resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
+    engines: {node: '>= 0.6'}
+
+  fs-capacitor@2.0.4:
+    resolution: {integrity: sha512-8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA==}
+    engines: {node: '>=8.5'}
+
+  fs-extra@8.1.0:
+    resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
+    engines: {node: '>=6 <7 || >=8'}
+
+  fs-extra@9.1.0:
+    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
+    engines: {node: '>=10'}
+
+  fs-minipass@2.1.0:
+    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
+    engines: {node: '>= 8'}
+
+  fs-monkey@1.0.6:
+    resolution: {integrity: sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==}
+
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
+  function.prototype.name@1.1.8:
+    resolution: {integrity: sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==}
+    engines: {node: '>= 0.4'}
+
+  functions-have-names@1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+
+  gauge@3.0.2:
+    resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==}
+    engines: {node: '>=10'}
+    deprecated: This package is no longer supported.
+
+  gaxios@4.3.3:
+    resolution: {integrity: sha512-gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA==}
+    engines: {node: '>=10'}
+
+  gaze@1.1.3:
+    resolution: {integrity: sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==}
+    engines: {node: '>= 4.0.0'}
+
+  gcp-metadata@4.3.1:
+    resolution: {integrity: sha512-x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A==}
+    engines: {node: '>=10'}
+
+  generate-function@2.3.1:
+    resolution: {integrity: sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==}
+
+  gensync@1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+
+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  get-intrinsic@1.2.7:
+    resolution: {integrity: sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==}
+    engines: {node: '>= 0.4'}
+
+  get-package-type@0.1.0:
+    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
+    engines: {node: '>=8.0.0'}
+
+  get-proto@1.0.1:
+    resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
+    engines: {node: '>= 0.4'}
+
+  get-stream@4.1.0:
+    resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==}
+    engines: {node: '>=6'}
+
+  get-stream@5.2.0:
+    resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
+    engines: {node: '>=8'}
+
+  get-stream@6.0.1:
+    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
+    engines: {node: '>=10'}
+
+  get-symbol-description@1.1.0:
+    resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==}
+    engines: {node: '>= 0.4'}
+
+  get-value@2.0.6:
+    resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
+    engines: {node: '>=0.10.0'}
+
+  getobject@1.0.2:
+    resolution: {integrity: sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==}
+    engines: {node: '>=10'}
+
+  getos@3.2.1:
+    resolution: {integrity: sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==}
+
+  getpass@0.1.7:
+    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
+
+  glob-parent@5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
+
+  glob-parent@6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+
+  glob-to-regexp@0.4.1:
+    resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
+
+  glob@11.0.1:
+    resolution: {integrity: sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+
+  glob@7.1.7:
+    resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==}
+    deprecated: Glob versions prior to v9 are no longer supported
+
+  glob@7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
+
+  global-dirs@2.1.0:
+    resolution: {integrity: sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==}
+    engines: {node: '>=8'}
+
+  global-modules@1.0.0:
+    resolution: {integrity: sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==}
+    engines: {node: '>=0.10.0'}
+
+  global-prefix@1.0.2:
+    resolution: {integrity: sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==}
+    engines: {node: '>=0.10.0'}
+
+  globals@11.12.0:
+    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
+    engines: {node: '>=4'}
+
+  globals@13.24.0:
+    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
+    engines: {node: '>=8'}
+
+  globalthis@1.0.4:
+    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
+    engines: {node: '>= 0.4'}
+
+  globby@11.1.0:
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
+    engines: {node: '>=10'}
+
+  globule@1.3.4:
+    resolution: {integrity: sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==}
+    engines: {node: '>= 0.10'}
+
+  google-auth-library@6.1.6:
+    resolution: {integrity: sha512-Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ==}
+    engines: {node: '>=10'}
+
+  google-p12-pem@3.1.4:
+    resolution: {integrity: sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg==}
+    engines: {node: '>=10'}
+    deprecated: Package is no longer maintained
+    hasBin: true
+
+  googleapis-common@4.4.3:
+    resolution: {integrity: sha512-W46WKCk3QtlCCfmZyQIH5zxmDOyeV5Qj+qs7nr2ox08eRkEJMWp6iwv542R/PsokXaGUSrmif4vCC4+rGzRSsQ==}
+    engines: {node: '>=10.10.0'}
+
+  googleapis@65.0.0:
+    resolution: {integrity: sha512-dcfZVkML8H6mPAsph0hgfyRQYKJpw2XjKchAXx5YEfDYWU7021Mpzaf+ejNSipa3QmcfOLOcWg6sUr0I7M4jjQ==}
+    engines: {node: '>=10'}
+
+  gopd@1.2.0:
+    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
+    engines: {node: '>= 0.4'}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+
+  graphql-extensions@0.16.0:
+    resolution: {integrity: sha512-rZQc/USoEIw437BGRUwoHoLPR1LA791Ltj6axONqgKIyyx2sqIO3YT9kTbB/eIUdJBrCozp4KuUeZ09xKeQDxg==}
+    engines: {node: '>=6.0'}
+    deprecated: 'The `graphql-extensions` API has been removed from Apollo Server 3. Use the plugin API instead: https://www.apollographql.com/docs/apollo-server/integrations/plugins/'
+    peerDependencies:
+      graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  graphql-subscriptions@1.2.1:
+    resolution: {integrity: sha512-95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g==}
+    peerDependencies:
+      graphql: ^0.10.5 || ^0.11.3 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  graphql-tag@2.12.6:
+    resolution: {integrity: sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      graphql: ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+
+  graphql-tools@4.0.8:
+    resolution: {integrity: sha512-MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg==}
+    deprecated: |-
+      This package has been deprecated and now it only exports makeExecutableSchema.
+      And it will no longer receive updates.
+      We recommend you to migrate to scoped packages such as @graphql-tools/schema, @graphql-tools/utils and etc.
+      Check out https://www.graphql-tools.com to learn what package you should use instead
+    peerDependencies:
+      graphql: ^0.13.0 || ^14.0.0 || ^15.0.0
+
+  graphql@16.11.0:
+    resolution: {integrity: sha512-mS1lbMsxgQj6hge1XZ6p7GPhbrtFwUFYi3wRzXAC/FmYnyXMTvvI3td3rjmQ2u8ewXueaSvRPWaEcgVVOT9Jnw==}
+    engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
+
+  growly@1.3.0:
+    resolution: {integrity: sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==}
+
+  grunt-cli@1.4.3:
+    resolution: {integrity: sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  grunt-cli@1.5.0:
+    resolution: {integrity: sha512-rILKAFoU0dzlf22SUfDtq2R1fosChXXlJM5j7wI6uoW8gwmXDXzbUvirlKZSYCdXl3LXFbR+8xyS+WFo+b6vlA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  grunt-contrib-clean@2.0.1:
+    resolution: {integrity: sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      grunt: '>=0.4.5'
+
+  grunt-contrib-copy@1.0.0:
+    resolution: {integrity: sha512-gFRFUB0ZbLcjKb67Magz1yOHGBkyU6uL29hiEW1tdQ9gQt72NuMKIy/kS6dsCbV0cZ0maNCb0s6y+uT1FKU7jA==}
+    engines: {node: '>=0.10.0'}
+
+  grunt-contrib-cssmin@5.0.0:
+    resolution: {integrity: sha512-SNp4H4+85mm2xaHYi83FBHuOXylpi5vcwgtNoYCZBbkgeXQXoeTAKa59VODRb0woTDBvxouP91Ff5PzCkikg6g==}
+    engines: {node: '>=14.0'}
+
+  grunt-contrib-uglify@5.2.2:
+    resolution: {integrity: sha512-ITxiWxrjjP+RZu/aJ5GLvdele+sxlznh+6fK9Qckio5ma8f7Iv8woZjRkGfafvpuygxNefOJNc+hfjjBayRn2Q==}
+    engines: {node: '>=12'}
+
+  grunt-contrib-watch@1.1.0:
+    resolution: {integrity: sha512-yGweN+0DW5yM+oo58fRu/XIRrPcn3r4tQx+nL7eMRwjpvk+rQY6R8o94BPK0i2UhTg9FN21hS+m8vR8v9vXfeg==}
+    engines: {node: '>=0.10.0'}
+
+  grunt-known-options@2.0.0:
+    resolution: {integrity: sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==}
+    engines: {node: '>=0.10.0'}
+
+  grunt-legacy-log-utils@2.1.0:
+    resolution: {integrity: sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==}
+    engines: {node: '>=10'}
+
+  grunt-legacy-log@3.0.0:
+    resolution: {integrity: sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==}
+    engines: {node: '>= 0.10.0'}
+
+  grunt-legacy-util@2.0.1:
+    resolution: {integrity: sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==}
+    engines: {node: '>=10'}
+
+  grunt-md5@0.1.12:
+    resolution: {integrity: sha512-78RGGhrhooT2CdSh6k5H/v0hrYFloe2XHsWBL/N5kFnu7pB6z14d0trFAACVGx5ckSKniliv5QXQt63hAw4dKQ==}
+    hasBin: true
+    peerDependencies:
+      grunt: '>=0.4.0'
+
+  grunt-shell@4.0.0:
+    resolution: {integrity: sha512-dHFy8VZDfWGYLTeNvIHze4PKXGvIlDWuN0UE7hUZstTQeiEyv1VmW1MaDYQ3X5tE3bCi3bEia1gGKH8z/f1czQ==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      grunt: '>=1'
+
+  grunt@1.6.1:
+    resolution: {integrity: sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==}
+    engines: {node: '>=16'}
+    hasBin: true
+
+  gtoken@5.3.2:
+    resolution: {integrity: sha512-gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ==}
+    engines: {node: '>=10'}
+
+  gzip-size@5.1.1:
+    resolution: {integrity: sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==}
+    engines: {node: '>=6'}
+
+  gzip-size@6.0.0:
+    resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==}
+    engines: {node: '>=10'}
+
+  handle-thing@2.0.1:
+    resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==}
+
+  har-schema@2.0.0:
+    resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
+    engines: {node: '>=4'}
+
+  har-validator@5.1.5:
+    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==}
+    engines: {node: '>=6'}
+    deprecated: this library is no longer supported
+
+  harmony-reflect@1.6.2:
+    resolution: {integrity: sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==}
+
+  has-ansi@2.0.0:
+    resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
+    engines: {node: '>=0.10.0'}
+
+  has-bigints@1.1.0:
+    resolution: {integrity: sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==}
+    engines: {node: '>= 0.4'}
+
+  has-flag@1.0.0:
+    resolution: {integrity: sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==}
+    engines: {node: '>=0.10.0'}
+
+  has-flag@3.0.0:
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+    engines: {node: '>=4'}
+
+  has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  has-glob@1.0.0:
+    resolution: {integrity: sha512-D+8A457fBShSEI3tFCj65PAbT++5sKiFtdCdOam0gnfBgw9D277OERk+HM9qYJXmdVLZ/znez10SqHN0BBQ50g==}
+    engines: {node: '>=0.10.0'}
+
+  has-property-descriptors@1.0.2:
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+
+  has-proto@1.2.0:
+    resolution: {integrity: sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==}
+    engines: {node: '>= 0.4'}
+
+  has-symbols@1.1.0:
+    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
+    engines: {node: '>= 0.4'}
+
+  has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
+
+  has-unicode@2.0.1:
+    resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
+
+  has-value@0.3.1:
+    resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
+    engines: {node: '>=0.10.0'}
+
+  has-value@1.0.0:
+    resolution: {integrity: sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==}
+    engines: {node: '>=0.10.0'}
+
+  has-values@0.1.4:
+    resolution: {integrity: sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==}
+    engines: {node: '>=0.10.0'}
+
+  has-values@1.0.0:
+    resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
+    engines: {node: '>=0.10.0'}
+
+  hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+
+  he@1.2.0:
+    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
+    hasBin: true
+
+  history@5.3.0:
+    resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==}
+
+  hoist-non-react-statics@3.3.2:
+    resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
+
+  homedir-polyfill@1.0.3:
+    resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
+    engines: {node: '>=0.10.0'}
+
+  hooker@0.2.3:
+    resolution: {integrity: sha512-t+UerCsQviSymAInD01Pw+Dn/usmz1sRO+3Zk1+lx8eg+WKpD2ulcwWqHHL0+aseRBr+3+vIhiG1K1JTwaIcTA==}
+
+  hosted-git-info@2.8.9:
+    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
+
+  hpack.js@2.1.6:
+    resolution: {integrity: sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==}
+
+  html-encoding-sniffer@1.0.2:
+    resolution: {integrity: sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==}
+
+  html-encoding-sniffer@2.0.1:
+    resolution: {integrity: sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==}
+    engines: {node: '>=10'}
+
+  html-encoding-sniffer@3.0.0:
+    resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
+    engines: {node: '>=12'}
+
+  html-entities@2.5.2:
+    resolution: {integrity: sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==}
+
+  html-escaper@2.0.2:
+    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
+
+  html-minifier-terser@6.1.0:
+    resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  html-webpack-plugin@5.6.3:
+    resolution: {integrity: sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==}
+    engines: {node: '>=10.13.0'}
+    peerDependencies:
+      '@rspack/core': 0.x || 1.x
+      webpack: ^5.20.0
+    peerDependenciesMeta:
+      '@rspack/core':
+        optional: true
+      webpack:
+        optional: true
+
+  htmlparser2@6.1.0:
+    resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==}
+
+  http-deceiver@1.2.7:
+    resolution: {integrity: sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==}
+
+  http-errors@1.6.3:
+    resolution: {integrity: sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==}
+    engines: {node: '>= 0.6'}
+
+  http-errors@1.8.1:
+    resolution: {integrity: sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==}
+    engines: {node: '>= 0.6'}
+
+  http-errors@2.0.0:
+    resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
+    engines: {node: '>= 0.8'}
+
+  http-parser-js@0.5.9:
+    resolution: {integrity: sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw==}
+
+  http-proxy-agent@4.0.1:
+    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
+    engines: {node: '>= 6'}
+
+  http-proxy-agent@5.0.0:
+    resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
+    engines: {node: '>= 6'}
+
+  http-proxy-middleware@2.0.7:
+    resolution: {integrity: sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      '@types/express': ^4.17.13
+    peerDependenciesMeta:
+      '@types/express':
+        optional: true
+
+  http-proxy@1.18.1:
+    resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==}
+    engines: {node: '>=8.0.0'}
+
+  http-signature@1.2.0:
+    resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
+    engines: {node: '>=0.8', npm: '>=1.3.7'}
+
+  http-signature@1.3.6:
+    resolution: {integrity: sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==}
+    engines: {node: '>=0.10'}
+
+  https-proxy-agent@5.0.1:
+    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
+    engines: {node: '>= 6'}
+
+  human-signals@1.1.1:
+    resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
+    engines: {node: '>=8.12.0'}
+
+  human-signals@2.1.0:
+    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
+    engines: {node: '>=10.17.0'}
+
+  iconv-lite@0.4.24:
+    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
+    engines: {node: '>=0.10.0'}
+
+  iconv-lite@0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
+    engines: {node: '>=0.10.0'}
+
+  icss-utils@4.1.1:
+    resolution: {integrity: sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==}
+    engines: {node: '>= 6'}
+
+  identity-obj-proxy@3.0.0:
+    resolution: {integrity: sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==}
+    engines: {node: '>=4'}
+
+  ignore-by-default@1.0.1:
+    resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==}
+
+  ignore@5.3.2:
+    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
+    engines: {node: '>= 4'}
+
+  immer@10.1.1:
+    resolution: {integrity: sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==}
+
+  immutable@5.0.3:
+    resolution: {integrity: sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==}
+
+  import-fresh@3.3.1:
+    resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
+    engines: {node: '>=6'}
+
+  import-local@3.2.0:
+    resolution: {integrity: sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==}
+    engines: {node: '>=8'}
+    hasBin: true
+
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  indent-string@3.2.0:
+    resolution: {integrity: sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==}
+    engines: {node: '>=4'}
+
+  indent-string@4.0.0:
+    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
+    engines: {node: '>=8'}
+
+  infer-owner@1.0.4:
+    resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==}
+
+  inflection@1.13.4:
+    resolution: {integrity: sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==}
+    engines: {'0': node >= 0.4.0}
+
+  inflight@1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+
+  inherits@2.0.3:
+    resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==}
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  ini@1.3.7:
+    resolution: {integrity: sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==}
+
+  ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+
+  internal-slot@1.1.0:
+    resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==}
+    engines: {node: '>= 0.4'}
+
+  internmap@2.0.3:
+    resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
+    engines: {node: '>=12'}
+
+  interpret@1.1.0:
+    resolution: {integrity: sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==}
+
+  interpret@3.1.1:
+    resolution: {integrity: sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==}
+    engines: {node: '>=10.13.0'}
+
+  invariant@2.2.4:
+    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
+
+  ipaddr.js@1.9.1:
+    resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
+    engines: {node: '>= 0.10'}
+
+  ipaddr.js@2.2.0:
+    resolution: {integrity: sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==}
+    engines: {node: '>= 10'}
+
+  is-absolute@1.0.0:
+    resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}
+    engines: {node: '>=0.10.0'}
+
+  is-accessor-descriptor@1.0.1:
+    resolution: {integrity: sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==}
+    engines: {node: '>= 0.10'}
+
+  is-array-buffer@3.0.5:
+    resolution: {integrity: sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==}
+    engines: {node: '>= 0.4'}
+
+  is-arrayish@0.2.1:
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
+
+  is-async-function@2.1.1:
+    resolution: {integrity: sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==}
+    engines: {node: '>= 0.4'}
+
+  is-bigint@1.1.0:
+    resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==}
+    engines: {node: '>= 0.4'}
+
+  is-binary-path@2.1.0:
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
+    engines: {node: '>=8'}
+
+  is-boolean-object@1.2.2:
+    resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==}
+    engines: {node: '>= 0.4'}
+
+  is-buffer@1.1.6:
+    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
+
+  is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
+
+  is-ci@2.0.0:
+    resolution: {integrity: sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==}
+    hasBin: true
+
+  is-core-module@2.16.1:
+    resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==}
+    engines: {node: '>= 0.4'}
+
+  is-data-descriptor@1.0.1:
+    resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==}
+    engines: {node: '>= 0.4'}
+
+  is-data-view@1.0.2:
+    resolution: {integrity: sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==}
+    engines: {node: '>= 0.4'}
+
+  is-date-object@1.1.0:
+    resolution: {integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==}
+    engines: {node: '>= 0.4'}
+
+  is-descriptor@0.1.7:
+    resolution: {integrity: sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==}
+    engines: {node: '>= 0.4'}
+
+  is-descriptor@1.0.3:
+    resolution: {integrity: sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==}
+    engines: {node: '>= 0.4'}
+
+  is-directory@0.3.1:
+    resolution: {integrity: sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==}
+    engines: {node: '>=0.10.0'}
+
+  is-docker@2.2.1:
+    resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
+    engines: {node: '>=8'}
+    hasBin: true
+
+  is-extendable@0.1.1:
+    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
+    engines: {node: '>=0.10.0'}
+
+  is-extendable@1.0.1:
+    resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
+    engines: {node: '>=0.10.0'}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-finalizationregistry@1.1.1:
+    resolution: {integrity: sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==}
+    engines: {node: '>= 0.4'}
+
+  is-fullwidth-code-point@1.0.0:
+    resolution: {integrity: sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==}
+    engines: {node: '>=0.10.0'}
+
+  is-fullwidth-code-point@2.0.0:
+    resolution: {integrity: sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==}
+    engines: {node: '>=4'}
+
+  is-fullwidth-code-point@3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
+
+  is-generator-fn@2.1.0:
+    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
+    engines: {node: '>=6'}
+
+  is-generator-function@1.1.0:
+    resolution: {integrity: sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==}
+    engines: {node: '>= 0.4'}
+
+  is-glob@3.1.0:
+    resolution: {integrity: sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==}
+    engines: {node: '>=0.10.0'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-installed-globally@0.3.2:
+    resolution: {integrity: sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==}
+    engines: {node: '>=8'}
+
+  is-map@2.0.3:
+    resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==}
+    engines: {node: '>= 0.4'}
+
+  is-module@1.0.0:
+    resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}
+
+  is-number-object@1.1.1:
+    resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==}
+    engines: {node: '>= 0.4'}
+
+  is-number@3.0.0:
+    resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
+    engines: {node: '>=0.10.0'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  is-observable@1.1.0:
+    resolution: {integrity: sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==}
+    engines: {node: '>=4'}
+
+  is-path-inside@3.0.3:
+    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
+    engines: {node: '>=8'}
+
+  is-plain-obj@1.1.0:
+    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
+    engines: {node: '>=0.10.0'}
+
+  is-plain-obj@3.0.0:
+    resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==}
+    engines: {node: '>=10'}
+
+  is-plain-object@2.0.4:
+    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
+    engines: {node: '>=0.10.0'}
+
+  is-potential-custom-element-name@1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+
+  is-promise@2.2.2:
+    resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==}
+
+  is-property@1.0.2:
+    resolution: {integrity: sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==}
+
+  is-reference@1.2.1:
+    resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
+
+  is-regex@1.2.1:
+    resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==}
+    engines: {node: '>= 0.4'}
+
+  is-relative@1.0.0:
+    resolution: {integrity: sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==}
+    engines: {node: '>=0.10.0'}
+
+  is-set@2.0.3:
+    resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==}
+    engines: {node: '>= 0.4'}
+
+  is-shared-array-buffer@1.0.4:
+    resolution: {integrity: sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==}
+    engines: {node: '>= 0.4'}
+
+  is-stream@1.1.0:
+    resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-stream@2.0.1:
+    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
+    engines: {node: '>=8'}
+
+  is-string@1.1.1:
+    resolution: {integrity: sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==}
+    engines: {node: '>= 0.4'}
+
+  is-symbol@1.1.1:
+    resolution: {integrity: sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==}
+    engines: {node: '>= 0.4'}
+
+  is-typed-array@1.1.15:
+    resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==}
+    engines: {node: '>= 0.4'}
+
+  is-typedarray@1.0.0:
+    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
+
+  is-unc-path@1.0.0:
+    resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-unicode-supported@0.1.0:
+    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
+    engines: {node: '>=10'}
+
+  is-valid-glob@1.0.0:
+    resolution: {integrity: sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==}
+    engines: {node: '>=0.10.0'}
+
+  is-weakmap@2.0.2:
+    resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
+    engines: {node: '>= 0.4'}
+
+  is-weakref@1.1.1:
+    resolution: {integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==}
+    engines: {node: '>= 0.4'}
+
+  is-weakset@2.0.4:
+    resolution: {integrity: sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==}
+    engines: {node: '>= 0.4'}
+
+  is-what@3.14.1:
+    resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==}
+
+  is-windows@1.0.2:
+    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
+    engines: {node: '>=0.10.0'}
+
+  is-wsl@2.2.0:
+    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
+    engines: {node: '>=8'}
+
+  isarray@0.0.1:
+    resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==}
+
+  isarray@1.0.0:
+    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+
+  isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  isobject@2.1.0:
+    resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==}
+    engines: {node: '>=0.10.0'}
+
+  isobject@3.0.1:
+    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
+    engines: {node: '>=0.10.0'}
+
+  isstream@0.1.2:
+    resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
+
+  istanbul-lib-coverage@3.2.2:
+    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
+    engines: {node: '>=8'}
+
+  istanbul-lib-instrument@4.0.3:
+    resolution: {integrity: sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==}
+    engines: {node: '>=8'}
+
+  istanbul-lib-instrument@5.2.1:
+    resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
+    engines: {node: '>=8'}
+
+  istanbul-lib-instrument@6.0.3:
+    resolution: {integrity: sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==}
+    engines: {node: '>=10'}
+
+  istanbul-lib-report@3.0.1:
+    resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
+    engines: {node: '>=10'}
+
+  istanbul-lib-source-maps@4.0.1:
+    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
+    engines: {node: '>=10'}
+
+  istanbul-reports@3.1.7:
+    resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==}
+    engines: {node: '>=8'}
+
+  iterall@1.3.0:
+    resolution: {integrity: sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==}
+
+  iterator.prototype@1.1.5:
+    resolution: {integrity: sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==}
+    engines: {node: '>= 0.4'}
+
+  jackspeak@4.0.3:
+    resolution: {integrity: sha512-oSwM7q8PTHQWuZAlp995iPpPJ4Vkl7qT0ZRD+9duL9j2oBy6KcTfyxc8mEuHJYC+z/kbps80aJLkaNzTOrf/kw==}
+    engines: {node: 20 || >=22}
+
+  jake@10.9.2:
+    resolution: {integrity: sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  jest-changed-files@26.6.2:
+    resolution: {integrity: sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-changed-files@29.7.0:
+    resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-circus@29.7.0:
+    resolution: {integrity: sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-cli@26.6.3:
+    resolution: {integrity: sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==}
+    engines: {node: '>= 10.14.2'}
+    hasBin: true
+
+  jest-cli@29.7.0:
+    resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  jest-config@26.6.3:
+    resolution: {integrity: sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==}
+    engines: {node: '>= 10.14.2'}
+    peerDependencies:
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      ts-node:
+        optional: true
+
+  jest-config@29.7.0:
+    resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@types/node': '*'
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      ts-node:
+        optional: true
+
+  jest-css-modules@2.1.0:
+    resolution: {integrity: sha512-my3Scnt6l2tOll/eGwNZeh1KLAFkNzdl4MyZRdpl46GO6/93JcKKdTjNqK6Nokg8A8rT84MFLOpY1pzqKBEqMw==}
+
+  jest-diff@26.6.2:
+    resolution: {integrity: sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-diff@29.7.0:
+    resolution: {integrity: sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-docblock@26.0.0:
+    resolution: {integrity: sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-docblock@29.7.0:
+    resolution: {integrity: sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-each@26.6.2:
+    resolution: {integrity: sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-each@29.7.0:
+    resolution: {integrity: sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-environment-jsdom@26.6.2:
+    resolution: {integrity: sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-environment-jsdom@29.7.0:
+    resolution: {integrity: sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      canvas: ^2.5.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+
+  jest-environment-node@26.6.2:
+    resolution: {integrity: sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-environment-node@29.7.0:
+    resolution: {integrity: sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-get-type@26.3.0:
+    resolution: {integrity: sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-get-type@29.6.3:
+    resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-haste-map@26.6.2:
+    resolution: {integrity: sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-haste-map@29.7.0:
+    resolution: {integrity: sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-jasmine2@26.6.3:
+    resolution: {integrity: sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-leak-detector@26.6.2:
+    resolution: {integrity: sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-leak-detector@29.7.0:
+    resolution: {integrity: sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-matcher-utils@26.6.2:
+    resolution: {integrity: sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-matcher-utils@29.7.0:
+    resolution: {integrity: sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-message-util@26.6.2:
+    resolution: {integrity: sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-message-util@29.7.0:
+    resolution: {integrity: sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-mock@26.6.2:
+    resolution: {integrity: sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-mock@29.7.0:
+    resolution: {integrity: sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-pnp-resolver@1.2.3:
+    resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
+    engines: {node: '>=6'}
+    peerDependencies:
+      jest-resolve: '*'
+    peerDependenciesMeta:
+      jest-resolve:
+        optional: true
+
+  jest-regex-util@26.0.0:
+    resolution: {integrity: sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-regex-util@29.6.3:
+    resolution: {integrity: sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-resolve-dependencies@26.6.3:
+    resolution: {integrity: sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-resolve-dependencies@29.7.0:
+    resolution: {integrity: sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-resolve@26.6.2:
+    resolution: {integrity: sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-resolve@29.7.0:
+    resolution: {integrity: sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-runner@26.6.3:
+    resolution: {integrity: sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-runner@29.7.0:
+    resolution: {integrity: sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-runtime@26.6.3:
+    resolution: {integrity: sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==}
+    engines: {node: '>= 10.14.2'}
+    hasBin: true
+
+  jest-runtime@29.7.0:
+    resolution: {integrity: sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-serializer@26.6.2:
+    resolution: {integrity: sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-snapshot@26.6.2:
+    resolution: {integrity: sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-snapshot@29.7.0:
+    resolution: {integrity: sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-util@26.6.2:
+    resolution: {integrity: sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-util@29.7.0:
+    resolution: {integrity: sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-validate@26.6.2:
+    resolution: {integrity: sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-validate@29.7.0:
+    resolution: {integrity: sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-watcher@26.6.2:
+    resolution: {integrity: sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==}
+    engines: {node: '>= 10.14.2'}
+
+  jest-watcher@29.7.0:
+    resolution: {integrity: sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest-worker@26.6.2:
+    resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
+    engines: {node: '>= 10.13.0'}
+
+  jest-worker@27.5.1:
+    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
+    engines: {node: '>= 10.13.0'}
+
+  jest-worker@29.7.0:
+    resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  jest@26.6.3:
+    resolution: {integrity: sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==}
+    engines: {node: '>= 10.14.2'}
+    hasBin: true
+
+  jest@29.7.0:
+    resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+
+  js-base64@2.6.4:
+    resolution: {integrity: sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==}
+
+  js-cookie@3.0.5:
+    resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==}
+    engines: {node: '>=14'}
+
+  js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+
+  js-yaml@3.14.1:
+    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+    hasBin: true
+
+  js-yaml@4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
+
+  jsbn@0.1.1:
+    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
+
+  jsdom@13.2.0:
+    resolution: {integrity: sha512-cG1NtMWO9hWpqRNRR3dSvEQa8bFI6iLlqU2x4kwX51FQjp0qus8T9aBaAO6iGp3DeBrhdwuKxckknohkmfvsFw==}
+    engines: {node: '>=8'}
+
+  jsdom@16.7.0:
+    resolution: {integrity: sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      canvas: ^2.5.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+
+  jsdom@20.0.3:
+    resolution: {integrity: sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      canvas: ^2.5.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+
+  jsesc@3.0.2:
+    resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  jsesc@3.1.0:
+    resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  json-bigint@1.0.0:
+    resolution: {integrity: sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==}
+
+  json-buffer@3.0.1:
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
+
+  json-loader@0.5.4:
+    resolution: {integrity: sha512-UR2AoqXOuhwApRPGe9YUuU3ARd2fQ4gfZvCpJjZ2ZrKOrt3+DbLg5QXa1W5rUvdUIuhMHyxniMr+u4bHjWMVYQ==}
+
+  json-parse-better-errors@1.0.2:
+    resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==}
+
+  json-parse-even-better-errors@2.3.1:
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
+
+  json-schema-traverse@0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+
+  json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+
+  json-schema@0.4.0:
+    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
+
+  json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+
+  json-stringify-safe@5.0.1:
+    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
+
+  json5@0.5.1:
+    resolution: {integrity: sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==}
+    hasBin: true
+
+  json5@1.0.2:
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
+    hasBin: true
+
+  json5@2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  jsonfile@4.0.0:
+    resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
+
+  jsonfile@6.1.0:
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+
+  jsonwebtoken@9.0.2:
+    resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==}
+    engines: {node: '>=12', npm: '>=6'}
+
+  jsprim@1.4.2:
+    resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
+    engines: {node: '>=0.6.0'}
+
+  jsprim@2.0.2:
+    resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
+    engines: {'0': node >=0.6.0}
+
+  jsx-ast-utils@3.3.5:
+    resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
+    engines: {node: '>=4.0'}
+
+  just-extend@4.2.1:
+    resolution: {integrity: sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==}
+
+  jwa@1.4.1:
+    resolution: {integrity: sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==}
+
+  jwa@2.0.0:
+    resolution: {integrity: sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==}
+
+  jws@3.2.2:
+    resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==}
+
+  jws@4.0.0:
+    resolution: {integrity: sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==}
+
+  keyv@4.5.4:
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+
+  kind-of@3.2.2:
+    resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
+    engines: {node: '>=0.10.0'}
+
+  kind-of@4.0.0:
+    resolution: {integrity: sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==}
+    engines: {node: '>=0.10.0'}
+
+  kind-of@6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
+    engines: {node: '>=0.10.0'}
+
+  kleur@3.0.3:
+    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
+    engines: {node: '>=6'}
+
+  language-subtag-registry@0.3.23:
+    resolution: {integrity: sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==}
+
+  language-tags@1.0.9:
+    resolution: {integrity: sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==}
+    engines: {node: '>=0.10'}
+
+  launch-editor@2.10.0:
+    resolution: {integrity: sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==}
+
+  lazy-ass@1.6.0:
+    resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==}
+    engines: {node: '> 0.8'}
+
+  lcov-parse@1.0.0:
+    resolution: {integrity: sha512-aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ==}
+    hasBin: true
+
+  leven@3.1.0:
+    resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
+    engines: {node: '>=6'}
+
+  levn@0.3.0:
+    resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
+    engines: {node: '>= 0.8.0'}
+
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+
+  liftup@3.0.1:
+    resolution: {integrity: sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==}
+    engines: {node: '>=10'}
+
+  lines-and-columns@1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+
+  listr-silent-renderer@1.1.1:
+    resolution: {integrity: sha512-L26cIFm7/oZeSNVhWB6faeorXhMg4HNlb/dS/7jHhr708jxlXrtrBWo4YUxZQkc6dGoxEAe6J/D3juTRBUzjtA==}
+    engines: {node: '>=4'}
+
+  listr-update-renderer@0.5.0:
+    resolution: {integrity: sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==}
+    engines: {node: '>=6'}
+    peerDependencies:
+      listr: ^0.14.2
+
+  listr-verbose-renderer@0.5.0:
+    resolution: {integrity: sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==}
+    engines: {node: '>=4'}
+
+  listr@0.14.3:
+    resolution: {integrity: sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==}
+    engines: {node: '>=6'}
+
+  livereload-js@2.4.0:
+    resolution: {integrity: sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==}
+
+  load-json-file@4.0.0:
+    resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
+    engines: {node: '>=4'}
+
+  loader-runner@4.3.0:
+    resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
+    engines: {node: '>=6.11.5'}
+
+  loader-utils@0.2.17:
+    resolution: {integrity: sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==}
+
+  loader-utils@1.4.2:
+    resolution: {integrity: sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==}
+    engines: {node: '>=4.0.0'}
+
+  loader-utils@2.0.4:
+    resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==}
+    engines: {node: '>=8.9.0'}
+
+  locate-path@3.0.0:
+    resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==}
+    engines: {node: '>=6'}
+
+  locate-path@5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+    engines: {node: '>=8'}
+
+  locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
+
+  lodash.debounce@4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+
+  lodash.get@4.4.2:
+    resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
+    deprecated: This package is deprecated. Use the optional chaining (?.) operator instead.
+
+  lodash.includes@4.3.0:
+    resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==}
+
+  lodash.isboolean@3.0.3:
+    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
+
+  lodash.isinteger@4.0.4:
+    resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==}
+
+  lodash.isnumber@3.0.3:
+    resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==}
+
+  lodash.isplainobject@4.0.6:
+    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
+
+  lodash.isstring@4.0.1:
+    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
+
+  lodash.memoize@4.1.2:
+    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
+
+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
+  lodash.once@4.1.1:
+    resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
+
+  lodash.sortby@4.7.0:
+    resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
+
+  lodash@4.17.21:
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+
+  log-driver@1.2.7:
+    resolution: {integrity: sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==}
+    engines: {node: '>=0.8.6'}
+
+  log-symbols@1.0.2:
+    resolution: {integrity: sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ==}
+    engines: {node: '>=0.10.0'}
+
+  log-symbols@4.1.0:
+    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
+    engines: {node: '>=10'}
+
+  log-update@2.3.0:
+    resolution: {integrity: sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==}
+    engines: {node: '>=4'}
+
+  loglevel-colored-level-prefix@1.0.0:
+    resolution: {integrity: sha512-u45Wcxxc+SdAlh4yeF/uKlC1SPUPCy0gullSNKXod5I4bmifzk+Q4lSLExNEVn19tGaJipbZ4V4jbFn79/6mVA==}
+
+  loglevel@1.9.2:
+    resolution: {integrity: sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==}
+    engines: {node: '>= 0.6.0'}
+
+  lolex@5.1.2:
+    resolution: {integrity: sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==}
+
+  long@4.0.0:
+    resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==}
+
+  loose-envify@1.4.0:
+    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
+    hasBin: true
+
+  lower-case@2.0.2:
+    resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
+
+  lru-cache@11.0.2:
+    resolution: {integrity: sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==}
+    engines: {node: 20 || >=22}
+
+  lru-cache@5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
+
+  lru-cache@6.0.0:
+    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
+    engines: {node: '>=10'}
+
+  lru-cache@7.18.3:
+    resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
+    engines: {node: '>=12'}
+
+  lz-string@1.5.0:
+    resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
+    hasBin: true
+
+  magic-string@0.25.9:
+    resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
+
+  make-dir@3.1.0:
+    resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
+    engines: {node: '>=8'}
+
+  make-dir@4.0.0:
+    resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
+    engines: {node: '>=10'}
+
+  make-error@1.3.6:
+    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
+
+  make-iterator@1.0.1:
+    resolution: {integrity: sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==}
+    engines: {node: '>=0.10.0'}
+
+  makeerror@1.0.12:
+    resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
+
+  map-cache@0.2.2:
+    resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
+    engines: {node: '>=0.10.0'}
+
+  map-visit@1.0.0:
+    resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
+    engines: {node: '>=0.10.0'}
+
+  matched@1.0.2:
+    resolution: {integrity: sha512-7ivM1jFZVTOOS77QsR+TtYHH0ecdLclMkqbf5qiJdX2RorqfhsL65QHySPZgDE0ZjHoh+mQUNHTanNXIlzXd0Q==}
+    engines: {node: '>= 0.12.0'}
+
+  math-intrinsics@1.1.0:
+    resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
+    engines: {node: '>= 0.4'}
+
+  maxmin@3.0.0:
+    resolution: {integrity: sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g==}
+    engines: {node: '>=10'}
+
+  md5-file@5.0.0:
+    resolution: {integrity: sha512-xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+
+  media-typer@0.3.0:
+    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
+    engines: {node: '>= 0.6'}
+
+  memfs@3.5.3:
+    resolution: {integrity: sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==}
+    engines: {node: '>= 4.0.0'}
+
+  memoize-one@5.2.1:
+    resolution: {integrity: sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==}
+
+  memoize-one@6.0.0:
+    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==}
+
+  memorystream@0.3.1:
+    resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
+    engines: {node: '>= 0.10.0'}
+
+  merge-anything@2.4.4:
+    resolution: {integrity: sha512-l5XlriUDJKQT12bH+rVhAHjwIuXWdAIecGwsYjv2LJo+dA1AeRTmeQS+3QBpO6lEthBMDi2IUMpLC1yyRvGlwQ==}
+
+  merge-descriptors@1.0.3:
+    resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==}
+
+  merge-stream@2.0.0:
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+
+  merge2@1.4.1:
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
+
+  methods@1.1.2:
+    resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
+    engines: {node: '>= 0.6'}
+
+  micromatch@3.1.10:
+    resolution: {integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==}
+    engines: {node: '>=0.10.0'}
+
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
+
+  mime-db@1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
+
+  mime-db@1.53.0:
+    resolution: {integrity: sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==}
+    engines: {node: '>= 0.6'}
+
+  mime-types@2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
+
+  mime@1.6.0:
+    resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  mimic-fn@1.2.0:
+    resolution: {integrity: sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==}
+    engines: {node: '>=4'}
+
+  mimic-fn@2.1.0:
+    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
+    engines: {node: '>=6'}
+
+  mini-css-extract-plugin@0.8.2:
+    resolution: {integrity: sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw==}
+    engines: {node: '>= 6.9.0'}
+    peerDependencies:
+      webpack: ^4.4.0
+
+  minimalistic-assert@1.0.1:
+    resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
+
+  minimatch@10.0.1:
+    resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==}
+    engines: {node: 20 || >=22}
+
+  minimatch@3.0.8:
+    resolution: {integrity: sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==}
+
+  minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+
+  minimatch@5.1.6:
+    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
+    engines: {node: '>=10'}
+
+  minimatch@9.0.3:
+    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
+  minipass-collect@1.0.2:
+    resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
+    engines: {node: '>= 8'}
+
+  minipass-flush@1.0.5:
+    resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==}
+    engines: {node: '>= 8'}
+
+  minipass-pipeline@1.2.4:
+    resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
+    engines: {node: '>=8'}
+
+  minipass@3.3.6:
+    resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
+    engines: {node: '>=8'}
+
+  minipass@5.0.0:
+    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
+    engines: {node: '>=8'}
+
+  minipass@7.1.2:
+    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minizlib@2.1.2:
+    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
+    engines: {node: '>= 8'}
+
+  mixin-deep@1.3.2:
+    resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
+    engines: {node: '>=0.10.0'}
+
+  mkdirp@0.5.6:
+    resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
+    hasBin: true
+
+  mkdirp@1.0.4:
+    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  moment-timezone@0.5.47:
+    resolution: {integrity: sha512-UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==}
+
+  moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+
+  mrmime@2.0.1:
+    resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
+    engines: {node: '>=10'}
+
+  ms@2.0.0:
+    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
+
+  ms@2.1.2:
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  multicast-dns@7.2.5:
+    resolution: {integrity: sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==}
+    hasBin: true
+
+  mysql2@2.3.3:
+    resolution: {integrity: sha512-wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA==}
+    engines: {node: '>= 8.0'}
+
+  named-placeholders@1.1.3:
+    resolution: {integrity: sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==}
+    engines: {node: '>=12.0.0'}
+
+  nanoid@3.3.8:
+    resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  nanoid@5.1.5:
+    resolution: {integrity: sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
+
+  nanomatch@1.2.13:
+    resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
+    engines: {node: '>=0.10.0'}
+
+  natural-compare-lite@1.4.0:
+    resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
+
+  natural-compare@1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
+  negotiator@0.6.3:
+    resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
+    engines: {node: '>= 0.6'}
+
+  negotiator@0.6.4:
+    resolution: {integrity: sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==}
+    engines: {node: '>= 0.6'}
+
+  neo-async@2.6.2:
+    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
+
+  nice-try@1.0.5:
+    resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
+
+  nise@3.0.1:
+    resolution: {integrity: sha512-fYcH9y0drBGSoi88kvhpbZEsenX58Yr+wOJ4/Mi1K4cy+iGP/a73gNoyNhu5E9QxPdgTlVChfIaAlnyOy/gHUA==}
+
+  no-case@3.0.4:
+    resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
+
+  node-addon-api@5.1.0:
+    resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==}
+
+  node-addon-api@7.1.1:
+    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
+
+  node-fetch@2.7.0:
+    resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+
+  node-forge@1.3.1:
+    resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
+    engines: {node: '>= 6.13.0'}
+
+  node-int64@0.4.0:
+    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
+
+  node-notifier@8.0.2:
+    resolution: {integrity: sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==}
+
+  node-releases@2.0.19:
+    resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==}
+
+  nodemailer@6.10.0:
+    resolution: {integrity: sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==}
+    engines: {node: '>=6.0.0'}
+
+  nodemon@2.0.22:
+    resolution: {integrity: sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==}
+    engines: {node: '>=8.10.0'}
+    hasBin: true
+
+  noms@0.0.0:
+    resolution: {integrity: sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow==}
+
+  nopt@3.0.6:
+    resolution: {integrity: sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==}
+    hasBin: true
+
+  nopt@4.0.3:
+    resolution: {integrity: sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==}
+    hasBin: true
+
+  nopt@5.0.0:
+    resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  normalize-package-data@2.5.0:
+    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
+
+  normalize-path@2.1.1:
+    resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==}
+    engines: {node: '>=0.10.0'}
+
+  normalize-path@3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
+
+  normalize-range@0.1.2:
+    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
+    engines: {node: '>=0.10.0'}
+
+  normalize-url@1.9.1:
+    resolution: {integrity: sha512-A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ==}
+    engines: {node: '>=4'}
+
+  npm-run-all@4.1.5:
+    resolution: {integrity: sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==}
+    engines: {node: '>= 4'}
+    hasBin: true
+
+  npm-run-path@2.0.2:
+    resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}
+    engines: {node: '>=4'}
+
+  npm-run-path@4.0.1:
+    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
+    engines: {node: '>=8'}
+
+  npmlog@5.0.1:
+    resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==}
+    deprecated: This package is no longer supported.
+
+  nth-check@2.1.1:
+    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
+
+  num2fraction@1.2.2:
+    resolution: {integrity: sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==}
+
+  number-is-nan@1.0.1:
+    resolution: {integrity: sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==}
+    engines: {node: '>=0.10.0'}
+
+  nwsapi@2.2.16:
+    resolution: {integrity: sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==}
+
+  oauth-sign@0.9.0:
+    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
+
+  object-assign@4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
+
+  object-copy@0.1.0:
+    resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
+    engines: {node: '>=0.10.0'}
+
+  object-inspect@1.13.4:
+    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
+    engines: {node: '>= 0.4'}
+
+  object-keys@1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
+
+  object-path@0.11.8:
+    resolution: {integrity: sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==}
+    engines: {node: '>= 10.12.0'}
+
+  object-visit@1.0.1:
+    resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
+    engines: {node: '>=0.10.0'}
+
+  object.assign@4.1.7:
+    resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==}
+    engines: {node: '>= 0.4'}
+
+  object.defaults@1.1.0:
+    resolution: {integrity: sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==}
+    engines: {node: '>=0.10.0'}
+
+  object.entries@1.1.8:
+    resolution: {integrity: sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==}
+    engines: {node: '>= 0.4'}
+
+  object.fromentries@2.0.8:
+    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
+    engines: {node: '>= 0.4'}
+
+  object.getownpropertydescriptors@2.1.8:
+    resolution: {integrity: sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==}
+    engines: {node: '>= 0.8'}
+
+  object.groupby@1.0.3:
+    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
+    engines: {node: '>= 0.4'}
+
+  object.map@1.0.1:
+    resolution: {integrity: sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==}
+    engines: {node: '>=0.10.0'}
+
+  object.pick@1.3.0:
+    resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
+    engines: {node: '>=0.10.0'}
+
+  object.values@1.2.1:
+    resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==}
+    engines: {node: '>= 0.4'}
+
+  obuf@1.1.2:
+    resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==}
+
+  on-finished@2.4.1:
+    resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
+    engines: {node: '>= 0.8'}
+
+  on-headers@1.0.2:
+    resolution: {integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==}
+    engines: {node: '>= 0.8'}
+
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+
+  onetime@1.1.0:
+    resolution: {integrity: sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==}
+    engines: {node: '>=0.10.0'}
+
+  onetime@2.0.1:
+    resolution: {integrity: sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==}
+    engines: {node: '>=4'}
+
+  onetime@5.1.2:
+    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
+    engines: {node: '>=6'}
+
+  open@8.4.2:
+    resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==}
+    engines: {node: '>=12'}
+
+  opener@1.5.2:
+    resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==}
+    hasBin: true
+
+  optimism@0.18.1:
+    resolution: {integrity: sha512-mLXNwWPa9dgFyDqkNi54sjDyNJ9/fTI6WGBLgnXku1vdKY/jovHfZT5r+aiVeFFLOz+foPNOm5YJ4mqgld2GBQ==}
+
+  optionator@0.8.3:
+    resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}
+    engines: {node: '>= 0.8.0'}
+
+  optionator@0.9.4:
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+    engines: {node: '>= 0.8.0'}
+
+  os-homedir@1.0.2:
+    resolution: {integrity: sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==}
+    engines: {node: '>=0.10.0'}
+
+  os-tmpdir@1.0.2:
+    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
+    engines: {node: '>=0.10.0'}
+
+  osenv@0.1.5:
+    resolution: {integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==}
+    deprecated: This package is no longer supported.
+
+  ospath@1.2.2:
+    resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
+
+  own-keys@1.0.1:
+    resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
+    engines: {node: '>= 0.4'}
+
+  p-each-series@2.2.0:
+    resolution: {integrity: sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==}
+    engines: {node: '>=8'}
+
+  p-finally@1.0.0:
+    resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
+    engines: {node: '>=4'}
+
+  p-limit@2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
+
+  p-limit@3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
+
+  p-locate@3.0.0:
+    resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==}
+    engines: {node: '>=6'}
+
+  p-locate@4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+    engines: {node: '>=8'}
+
+  p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+
+  p-map@2.1.0:
+    resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==}
+    engines: {node: '>=6'}
+
+  p-map@4.0.0:
+    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
+    engines: {node: '>=10'}
+
+  p-retry@4.6.2:
+    resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==}
+    engines: {node: '>=8'}
+
+  p-try@2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
+
+  package-json-from-dist@1.0.1:
+    resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
+
+  param-case@3.0.4:
+    resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
+
+  parent-module@1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
+
+  parse-filepath@1.0.2:
+    resolution: {integrity: sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==}
+    engines: {node: '>=0.8'}
+
+  parse-json@2.2.0:
+    resolution: {integrity: sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==}
+    engines: {node: '>=0.10.0'}
+
+  parse-json@4.0.0:
+    resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==}
+    engines: {node: '>=4'}
+
+  parse-json@5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
+
+  parse-passwd@1.0.0:
+    resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==}
+    engines: {node: '>=0.10.0'}
+
+  parse5@5.1.0:
+    resolution: {integrity: sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==}
+
+  parse5@6.0.1:
+    resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
+
+  parse5@7.2.1:
+    resolution: {integrity: sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==}
+
+  parseurl@1.3.3:
+    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
+    engines: {node: '>= 0.8'}
+
+  pascal-case@3.1.2:
+    resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
+
+  pascalcase@0.1.1:
+    resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
+    engines: {node: '>=0.10.0'}
+
+  path-exists@3.0.0:
+    resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
+    engines: {node: '>=4'}
+
+  path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
+  path-is-absolute@1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
+
+  path-key@2.0.1:
+    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
+    engines: {node: '>=4'}
+
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  path-parse@1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+
+  path-root-regex@0.1.2:
+    resolution: {integrity: sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==}
+    engines: {node: '>=0.10.0'}
+
+  path-root@0.1.1:
+    resolution: {integrity: sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==}
+    engines: {node: '>=0.10.0'}
+
+  path-scurry@2.0.0:
+    resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
+    engines: {node: 20 || >=22}
+
+  path-to-regexp@0.1.12:
+    resolution: {integrity: sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==}
+
+  path-to-regexp@1.9.0:
+    resolution: {integrity: sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==}
+
+  path-type@3.0.0:
+    resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
+    engines: {node: '>=4'}
+
+  path-type@4.0.0:
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
+    engines: {node: '>=8'}
+
+  pend@1.2.0:
+    resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
+
+  performance-now@2.1.0:
+    resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
+
+  pg-connection-string@2.7.0:
+    resolution: {integrity: sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA==}
+
+  picocolors@0.2.1:
+    resolution: {integrity: sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==}
+
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
+  picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+
+  pidtree@0.3.1:
+    resolution: {integrity: sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  pify@2.3.0:
+    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
+    engines: {node: '>=0.10.0'}
+
+  pify@3.0.0:
+    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
+    engines: {node: '>=4'}
+
+  pify@4.0.1:
+    resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
+    engines: {node: '>=6'}
+
+  pirates@4.0.6:
+    resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
+    engines: {node: '>= 6'}
+
+  pkg-dir@4.2.0:
+    resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
+    engines: {node: '>=8'}
+
+  pn@1.1.0:
+    resolution: {integrity: sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==}
+
+  posix-character-classes@0.1.1:
+    resolution: {integrity: sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==}
+    engines: {node: '>=0.10.0'}
+
+  possible-typed-array-names@1.1.0:
+    resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
+    engines: {node: '>= 0.4'}
+
+  postcss-load-config@1.2.0:
+    resolution: {integrity: sha512-3fpCfnXo9Qd/O/q/XL4cJUhRsqjVD2V1Vhy3wOEcLE5kz0TGtdDXJSoiTdH4e847KphbEac4+EZSH4qLRYIgLw==}
+    engines: {node: '>=0.12'}
+
+  postcss-load-options@1.2.0:
+    resolution: {integrity: sha512-WKS5LJMZLWGwtfhs5ahb2ycpoYF3m0kK4QEaM+elr5EpiMt0H296P/9ETa13WXzjPwB0DDTBiUBBWSHoApQIJg==}
+    engines: {node: '>=0.12'}
+
+  postcss-load-plugins@2.3.0:
+    resolution: {integrity: sha512-/WGUMYhKiryWjYO6c7kAcqMuD7DVkaQ8HcbQenDme/d3OBOmrYMFObOKgUWyUy1uih5U2Dakq8H6VcJi5C9wHQ==}
+    engines: {node: '>=0.12'}
+
+  postcss-loader@1.2.2:
+    resolution: {integrity: sha512-QwfNNl87ssVBm0c0ygbM9y4lqO6Sy6ADm5iL6iyf+tDOB/yxhG8iKYtkgCYSgAY6B0OTfOLvy3JPJue7qCpusA==}
+    engines: {node: '>=0.12'}
+
+  postcss-modules-extract-imports@2.0.0:
+    resolution: {integrity: sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==}
+    engines: {node: '>= 6'}
+
+  postcss-modules-local-by-default@3.0.3:
+    resolution: {integrity: sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==}
+    engines: {node: '>= 6'}
+
+  postcss-modules-scope@2.2.0:
+    resolution: {integrity: sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==}
+    engines: {node: '>= 6'}
+
+  postcss-modules-values@3.0.0:
+    resolution: {integrity: sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==}
+
+  postcss-selector-parser@6.1.2:
+    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
+    engines: {node: '>=4'}
+
+  postcss-value-parser@3.3.1:
+    resolution: {integrity: sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==}
+
+  postcss-value-parser@4.2.0:
+    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
+
+  postcss@5.2.18:
+    resolution: {integrity: sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==}
+    engines: {node: '>=0.12'}
+
+  postcss@7.0.39:
+    resolution: {integrity: sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==}
+    engines: {node: '>=6.0.0'}
+
+  prelude-ls@1.1.2:
+    resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
+    engines: {node: '>= 0.8.0'}
+
+  prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+
+  prepend-http@1.0.4:
+    resolution: {integrity: sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==}
+    engines: {node: '>=0.10.0'}
+
+  prettier-eslint@16.3.0:
+    resolution: {integrity: sha512-Lh102TIFCr11PJKUMQ2kwNmxGhTsv/KzUg9QYF2Gkw259g/kPgndZDWavk7/ycbRvj2oz4BPZ1gCU8bhfZH/Xg==}
+    engines: {node: '>=16.10.0'}
+    peerDependencies:
+      prettier-plugin-svelte: ^3.0.0
+      svelte-eslint-parser: '*'
+    peerDependenciesMeta:
+      prettier-plugin-svelte:
+        optional: true
+      svelte-eslint-parser:
+        optional: true
+
+  prettier@3.5.1:
+    resolution: {integrity: sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  pretty-bytes@5.6.0:
+    resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
+    engines: {node: '>=6'}
+
+  pretty-bytes@7.0.1:
+    resolution: {integrity: sha512-285/jRCYIbMGDciDdrw0KPNC4LKEEwz/bwErcYNxSJOi4CpGUuLpb9gQpg3XJP0XYj9ldSRluXxih4lX2YN8Xw==}
+    engines: {node: '>=20'}
+
+  pretty-error@4.0.0:
+    resolution: {integrity: sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==}
+
+  pretty-format@26.6.2:
+    resolution: {integrity: sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==}
+    engines: {node: '>= 10'}
+
+  pretty-format@29.7.0:
+    resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  process-nextick-args@2.0.1:
+    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
+
+  promise-inflight@1.0.1:
+    resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
+    peerDependencies:
+      bluebird: '*'
+    peerDependenciesMeta:
+      bluebird:
+        optional: true
+
+  promise@7.1.1:
+    resolution: {integrity: sha512-mxw1Fcl1jxLdpzS7MTIxrdiWk3CeMvZvVSGWE4P9eml3diZPBZTNV4oQsdYY3fY6j9udbmC1mSP6lqlzg6voBA==}
+
+  prompts@2.4.2:
+    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
+    engines: {node: '>= 6'}
+
+  prop-types@15.7.2:
+    resolution: {integrity: sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==}
+
+  prop-types@15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+
+  proxy-addr@2.0.7:
+    resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
+    engines: {node: '>= 0.10'}
+
+  psl@1.15.0:
+    resolution: {integrity: sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==}
+
+  pstree.remy@1.1.8:
+    resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}
+
+  pump@3.0.2:
+    resolution: {integrity: sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==}
+
+  punycode@1.4.1:
+    resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==}
+
+  punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+
+  pure-rand@6.1.0:
+    resolution: {integrity: sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==}
+
+  qs@6.10.4:
+    resolution: {integrity: sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==}
+    engines: {node: '>=0.6'}
+
+  qs@6.13.0:
+    resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
+    engines: {node: '>=0.6'}
+
+  qs@6.14.0:
+    resolution: {integrity: sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==}
+    engines: {node: '>=0.6'}
+
+  qs@6.5.3:
+    resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
+    engines: {node: '>=0.6'}
+
+  query-string@4.3.4:
+    resolution: {integrity: sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==}
+    engines: {node: '>=0.10.0'}
+
+  querystringify@2.2.0:
+    resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
+
+  queue-microtask@1.2.3:
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+
+  raf-schd@4.0.3:
+    resolution: {integrity: sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==}
+
+  ramda@0.27.2:
+    resolution: {integrity: sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==}
+
+  randombytes@2.1.0:
+    resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
+
+  randomcolor@0.6.2:
+    resolution: {integrity: sha512-Mn6TbyYpFgwFuQ8KJKqf3bqqY9O1y37/0jgSK/61PUxV4QfIMv0+K2ioq8DfOjkBslcjwSzRfIDEXfzA9aCx7A==}
+
+  range-parser@1.2.1:
+    resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}
+    engines: {node: '>= 0.6'}
+
+  raw-body@1.1.7:
+    resolution: {integrity: sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg==}
+    engines: {node: '>= 0.8.0'}
+
+  raw-body@2.5.2:
+    resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==}
+    engines: {node: '>= 0.8'}
+
+  react-beautiful-dnd@13.1.1:
+    resolution: {integrity: sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==}
+    deprecated: 'react-beautiful-dnd is now deprecated. Context and options: https://github.com/atlassian/react-beautiful-dnd/issues/2672'
+    peerDependencies:
+      react: ^16.8.5 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.5 || ^17.0.0 || ^18.0.0
+
+  react-clientside-effect@1.2.7:
+    resolution: {integrity: sha512-gce9m0Pk/xYYMEojRI9bgvqQAkl6hm7ozQvqWPyQx+kULiatdHgkNM1QG4DQRx5N9BAzWSCJmt9mMV8/KsdgVg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+
+  react-codemirror2@8.0.1:
+    resolution: {integrity: sha512-ZALowE5sGK1t66i0Fm1hoJLWT/iZHNjaAmcjwgYl9gyl2v1sqWwxzWHLmgq6K9KCk7p5+I+U3jMF1vsLaIkrmA==}
+    peerDependencies:
+      codemirror: 5.x
+      react: '>=15.5 <=18.x'
+
+  react-copy-to-clipboard@5.1.0:
+    resolution: {integrity: sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==}
+    peerDependencies:
+      react: ^15.3.0 || 16 || 17 || 18
+
+  react-countup@6.5.3:
+    resolution: {integrity: sha512-udnqVQitxC7QWADSPDOxVWULkLvKUWrDapn5i53HE4DPRVgs+Y5rr4bo25qEl8jSh+0l2cToJgGMx+clxPM3+w==}
+    peerDependencies:
+      react: '>= 16.3.0'
+
+  react-dom@19.1.1:
+    resolution: {integrity: sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw==}
+    peerDependencies:
+      react: ^19.1.1
+
+  react-focus-lock@2.13.6:
+    resolution: {integrity: sha512-ehylFFWyYtBKXjAO9+3v8d0i+cnc1trGS0vlTGhzFW1vbFXVUTmR8s2tt/ZQG8x5hElg6rhENlLG1H3EZK0Llg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  react-hooks-window-size@0.3.0:
+    resolution: {integrity: sha512-XsufwGaJ4Pz/JJWLjUu9QEr5TrSv6gE88v5IijXQoa/ennUg5gUFknIx2V+GLIpr9bzsZBvL95F3XDkISBZ+Pg==}
+    peerDependencies:
+      react: ^18.2.0
+
+  react-input-autosize@3.0.0:
+    resolution: {integrity: sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==}
+    peerDependencies:
+      react: ^16.3.0 || ^17.0.0
+
+  react-is@16.13.1:
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+
+  react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+
+  react-is@18.3.1:
+    resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
+
+  react-is@19.1.1:
+    resolution: {integrity: sha512-tr41fA15Vn8p4X9ntI+yCyeGSf1TlYaY5vlTZfQmeLBrFo3psOPX6HhTDnFNL9uj3EhP0KAQ80cugCl4b4BERA==}
+
+  react-lifecycles-compat@3.0.4:
+    resolution: {integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==}
+
+  react-number-format@5.4.4:
+    resolution: {integrity: sha512-wOmoNZoOpvMminhifQYiYSTCLUDOiUbBunrMrMjA+dV52sY+vck1S4UhR6PkgnoCquvvMSeJjErXZ4qSaWCliA==}
+    peerDependencies:
+      react: ^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  react-redux@7.2.9:
+    resolution: {integrity: sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==}
+    peerDependencies:
+      react: ^16.8.3 || ^17 || ^18
+      react-dom: '*'
+      react-native: '*'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+      react-native:
+        optional: true
+
+  react-redux@9.2.0:
+    resolution: {integrity: sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==}
+    peerDependencies:
+      '@types/react': ^18.2.25 || ^19
+      react: ^18.0 || ^19
+      redux: ^5.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      redux:
+        optional: true
+
+  react-router-dom@7.8.2:
+    resolution: {integrity: sha512-Z4VM5mKDipal2jQ385H6UBhiiEDlnJPx6jyWsTYoZQdl5TrjxEV2a9yl3Fi60NBJxYzOTGTTHXPi0pdizvTwow==}
+    engines: {node: '>=20.0.0'}
+    peerDependencies:
+      react: '>=18'
+      react-dom: '>=18'
+
+  react-router@7.8.2:
+    resolution: {integrity: sha512-7M2fR1JbIZ/jFWqelpvSZx+7vd7UlBTfdZqf6OSdF9g6+sfdqJDAWcak6ervbHph200ePlu+7G8LdoiC3ReyAQ==}
+    engines: {node: '>=20.0.0'}
+    peerDependencies:
+      react: '>=18'
+      react-dom: '>=18'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+
+  react-select@5.10.2:
+    resolution: {integrity: sha512-Z33nHdEFWq9tfnfVXaiM12rbJmk+QjFEztWLtmXqQhz6Al4UZZ9xc0wiatmGtUOCCnHN0WizL3tCMYRENX4rVQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  react-sortable-hoc@1.11.0:
+    resolution: {integrity: sha512-v1CDCvdfoR3zLGNp6qsBa4J1BWMEVH25+UKxF/RvQRh+mrB+emqtVHMgZ+WreUiKJoEaiwYoScaueIKhMVBHUg==}
+    peerDependencies:
+      prop-types: ^15.5.7
+      react: ^0.14.0 || ^15.0.0 || ^16.0.0
+      react-dom: ^0.14.0 || ^15.0.0 || ^16.0.0
+
+  react-split-pane@0.1.92:
+    resolution: {integrity: sha512-GfXP1xSzLMcLJI5BM36Vh7GgZBpy+U/X0no+VM3fxayv+p1Jly5HpMofZJraeaMl73b3hvlr+N9zJKvLB/uz9w==}
+    peerDependencies:
+      react: ^16.0.0-0
+      react-dom: ^16.0.0-0
+
+  react-style-proptype@3.2.2:
+    resolution: {integrity: sha512-ywYLSjNkxKHiZOqNlso9PZByNEY+FTyh3C+7uuziK0xFXu9xzdyfHwg4S9iyiRRoPCR4k2LqaBBsWVmSBwCWYQ==}
+
+  react-transition-group@4.4.5:
+    resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==}
+    peerDependencies:
+      react: '>=16.6.0'
+      react-dom: '>=16.6.0'
+
+  react@19.1.1:
+    resolution: {integrity: sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==}
+    engines: {node: '>=0.10.0'}
+
+  reactour@1.19.4:
+    resolution: {integrity: sha512-cMIaUQazGkdXt03m7AXAYXrCdyQl+uvH4nQBGP/oEjIaeSTZqj92C3W3y6doPakIIu21WeoGh1b0hBRKOxIViA==}
+    peerDependencies:
+      react: ^16.3.0 || ^17.0.0-0 || ^18.0.0-0
+      react-dom: ^16.3.0 || ^17.0.0-0 || ^18.0.0-0
+      react-is: ^16.8 || ^17.0.0-0 || ^18.0.0-0
+      styled-components: ^4.0.0 || ^5.0.0
+
+  read-pkg-up@7.0.1:
+    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
+    engines: {node: '>=8'}
+
+  read-pkg@3.0.0:
+    resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==}
+    engines: {node: '>=4'}
+
+  read-pkg@4.0.1:
+    resolution: {integrity: sha512-+UBirHHDm5J+3WDmLBZYSklRYg82nMlz+enn+GMZ22nSR2f4bzxmhso6rzQW/3mT2PVzpzDTiYIZahk8UmZ44w==}
+    engines: {node: '>=6'}
+
+  read-pkg@5.2.0:
+    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
+    engines: {node: '>=8'}
+
+  readable-stream@1.0.34:
+    resolution: {integrity: sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==}
+
+  readable-stream@2.3.8:
+    resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
+
+  readable-stream@3.6.2:
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+    engines: {node: '>= 6'}
+
+  readdirp@3.6.0:
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
+
+  readdirp@4.1.2:
+    resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
+    engines: {node: '>= 14.18.0'}
+
+  recharts@3.1.2:
+    resolution: {integrity: sha512-vhNbYwaxNbk/IATK0Ki29k3qvTkGqwvCgyQAQ9MavvvBwjvKnMTswdbklJpcOAoMPN/qxF3Lyqob0zO+ZXkZ4g==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-is: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  rechoir@0.7.1:
+    resolution: {integrity: sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==}
+    engines: {node: '>= 0.10'}
+
+  rechoir@0.8.0:
+    resolution: {integrity: sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==}
+    engines: {node: '>= 10.13.0'}
+
+  redux-persist@6.0.0:
+    resolution: {integrity: sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==}
+    peerDependencies:
+      react: '>=16'
+      redux: '>4.0.0'
+    peerDependenciesMeta:
+      react:
+        optional: true
+
+  redux-testkit@1.0.6:
+    resolution: {integrity: sha512-Poym2JNvwLE1ie0v+vQ6CcvGvjOumDbEwcdree3BW7Ct2wiEVqa+fzgrprowT6Vdb2QjjrLrXOWBlOLDK8L6tA==}
+
+  redux-thunk@3.1.0:
+    resolution: {integrity: sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==}
+    peerDependencies:
+      redux: ^5.0.0
+
+  redux@4.2.1:
+    resolution: {integrity: sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==}
+
+  redux@5.0.1:
+    resolution: {integrity: sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==}
+
+  reflect.getprototypeof@1.0.10:
+    resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==}
+    engines: {node: '>= 0.4'}
+
+  regenerate-unicode-properties@10.2.0:
+    resolution: {integrity: sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==}
+    engines: {node: '>=4'}
+
+  regenerate@1.4.2:
+    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
+
+  regenerator-runtime@0.10.5:
+    resolution: {integrity: sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==}
+
+  regenerator-runtime@0.11.1:
+    resolution: {integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==}
+
+  regenerator-runtime@0.14.1:
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
+
+  regenerator-transform@0.15.2:
+    resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==}
+
+  regex-not@1.0.2:
+    resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
+    engines: {node: '>=0.10.0'}
+
+  regexp.prototype.flags@1.5.4:
+    resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}
+    engines: {node: '>= 0.4'}
+
+  regexpu-core@6.2.0:
+    resolution: {integrity: sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==}
+    engines: {node: '>=4'}
+
+  regjsgen@0.8.0:
+    resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==}
+
+  regjsparser@0.12.0:
+    resolution: {integrity: sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==}
+    hasBin: true
+
+  relateurl@0.2.7:
+    resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==}
+    engines: {node: '>= 0.10'}
+
+  remove-trailing-separator@1.1.0:
+    resolution: {integrity: sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==}
+
+  renderkid@3.0.0:
+    resolution: {integrity: sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==}
+
+  repeat-element@1.1.4:
+    resolution: {integrity: sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==}
+    engines: {node: '>=0.10.0'}
+
+  repeat-string@1.6.1:
+    resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
+    engines: {node: '>=0.10'}
+
+  request-progress@3.0.0:
+    resolution: {integrity: sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==}
+
+  request-promise-core@1.1.4:
+    resolution: {integrity: sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==}
+    engines: {node: '>=0.10.0'}
+    peerDependencies:
+      request: ^2.34
+
+  request-promise-native@1.0.9:
+    resolution: {integrity: sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==}
+    engines: {node: '>=0.12.0'}
+    deprecated: request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142
+    peerDependencies:
+      request: ^2.34
+
+  request@2.88.2:
+    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
+    engines: {node: '>= 6'}
+    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
+
+  require-directory@2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
+
+  require-from-string@1.2.1:
+    resolution: {integrity: sha512-H7AkJWMobeskkttHyhTVtS0fxpFLjxhbfMa6Bk3wimP7sdPRGL3EyCg3sAQenFfAe+xQ+oAc85Nmtvq0ROM83Q==}
+    engines: {node: '>=0.10.0'}
+
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+
+  require-main-filename@2.0.0:
+    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
+
+  require-relative@0.8.7:
+    resolution: {integrity: sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg==}
+
+  requires-port@1.0.0:
+    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+
+  reselect@4.1.8:
+    resolution: {integrity: sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==}
+
+  reselect@5.1.1:
+    resolution: {integrity: sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==}
+
+  resolve-cwd@3.0.0:
+    resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
+    engines: {node: '>=8'}
+
+  resolve-dir@1.0.1:
+    resolution: {integrity: sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==}
+    engines: {node: '>=0.10.0'}
+
+  resolve-from@4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
+
+  resolve-from@5.0.0:
+    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
+    engines: {node: '>=8'}
+
+  resolve-url@0.2.1:
+    resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
+    deprecated: https://github.com/lydell/resolve-url#deprecated
+
+  resolve.exports@2.0.3:
+    resolution: {integrity: sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==}
+    engines: {node: '>=10'}
+
+  resolve@1.17.0:
+    resolution: {integrity: sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==}
+
+  resolve@1.22.10:
+    resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==}
+    engines: {node: '>= 0.4'}
+    hasBin: true
+
+  resolve@2.0.0-next.5:
+    resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==}
+    hasBin: true
+
+  restore-cursor@1.0.1:
+    resolution: {integrity: sha512-reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==}
+    engines: {node: '>=0.10.0'}
+
+  restore-cursor@2.0.0:
+    resolution: {integrity: sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==}
+    engines: {node: '>=4'}
+
+  ret@0.1.15:
+    resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
+    engines: {node: '>=0.12'}
+
+  retry-as-promised@7.0.4:
+    resolution: {integrity: sha512-XgmCoxKWkDofwH8WddD0w85ZfqYz+ZHlr5yo+3YUCfycWawU56T5ckWXsScsj5B8tqUcIG67DxXByo3VUgiAdA==}
+
+  retry@0.13.1:
+    resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==}
+    engines: {node: '>= 4'}
+
+  reusify@1.0.4:
+    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+
+  rimraf@2.7.1:
+    resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
+    hasBin: true
+
+  rimraf@3.0.2:
+    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
+    hasBin: true
+
+  rimraf@6.0.1:
+    resolution: {integrity: sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+
+  rollup-plugin-multi-entry@2.1.0:
+    resolution: {integrity: sha512-YVVsI15uvbxMKdeYS5NXQa5zbVr/DYdDBBwseC80+KAc7mqDUjM6Qe4wl+jFucVw1yvBDZFk0PPSBZqoLq8xUA==}
+    deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-multi-entry.
+
+  rollup-plugin-strip-exports@2.0.7:
+    resolution: {integrity: sha512-dPvZcbAihL2vTZ+rof6gZj69HZ+VU+RVDSt9Tg+mps3blfpukUYxGA+029mmRaU0Ov9m8vWYtjknUahJHZXfJw==}
+    engines: {node: '>=10'}
+
+  rollup-plugin-terser@6.1.0:
+    resolution: {integrity: sha512-4fB3M9nuoWxrwm39habpd4hvrbrde2W2GG4zEGPQg1YITNkM3Tqur5jSuXlWNzbv/2aMLJ+dZJaySc3GCD8oDw==}
+    deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser
+    peerDependencies:
+      rollup: ^2.0.0
+
+  rollup-plugin-typescript2@0.27.3:
+    resolution: {integrity: sha512-gmYPIFmALj9D3Ga1ZbTZAKTXq1JKlTQBtj299DXhqYz9cL3g/AQfUvbb2UhH+Nf++cCq941W2Mv7UcrcgLzJJg==}
+    peerDependencies:
+      rollup: '>=1.26.3'
+      typescript: '>=2.4.0'
+
+  rollup-pluginutils@2.8.2:
+    resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==}
+
+  rollup@2.79.2:
+    resolution: {integrity: sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==}
+    engines: {node: '>=10.0.0'}
+    hasBin: true
+
+  rsvp@4.8.5:
+    resolution: {integrity: sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==}
+    engines: {node: 6.* || >= 7.*}
+
+  run-parallel@1.2.0:
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+
+  rxjs@6.6.7:
+    resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==}
+    engines: {npm: '>=2.0.0'}
+
+  rxjs@7.8.2:
+    resolution: {integrity: sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==}
+
+  safe-array-concat@1.1.3:
+    resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==}
+    engines: {node: '>=0.4'}
+
+  safe-buffer@5.1.2:
+    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
+
+  safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
+  safe-json-parse@1.0.1:
+    resolution: {integrity: sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A==}
+
+  safe-push-apply@1.0.0:
+    resolution: {integrity: sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==}
+    engines: {node: '>= 0.4'}
+
+  safe-regex-test@1.1.0:
+    resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
+    engines: {node: '>= 0.4'}
+
+  safe-regex@1.1.0:
+    resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
+
+  safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+
+  sane@4.1.0:
+    resolution: {integrity: sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+    deprecated: some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added
+    hasBin: true
+
+  sass-loader@16.0.5:
+    resolution: {integrity: sha512-oL+CMBXrj6BZ/zOq4os+UECPL+bWqt6OAC6DWS8Ln8GZRcMDjlJ4JC3FBDuHJdYaFWIdKNIBYmtZtK2MaMkNIw==}
+    engines: {node: '>= 18.12.0'}
+    peerDependencies:
+      '@rspack/core': 0.x || 1.x
+      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
+      sass: ^1.3.0
+      sass-embedded: '*'
+      webpack: ^5.0.0
+    peerDependenciesMeta:
+      '@rspack/core':
+        optional: true
+      node-sass:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      webpack:
+        optional: true
+
+  sass@1.85.0:
+    resolution: {integrity: sha512-3ToiC1xZ1Y8aU7+CkgCI/tqyuPXEmYGJXO7H4uqp0xkLXUqp88rQQ4j1HmP37xSJLbCJPaIiv+cT1y+grssrww==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+
+  saxes@3.1.11:
+    resolution: {integrity: sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==}
+    engines: {node: '>=8'}
+
+  saxes@5.0.1:
+    resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==}
+    engines: {node: '>=10'}
+
+  saxes@6.0.0:
+    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
+    engines: {node: '>=v12.22.7'}
+
+  scheduler@0.26.0:
+    resolution: {integrity: sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==}
+
+  schema-utils@1.0.0:
+    resolution: {integrity: sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==}
+    engines: {node: '>= 4'}
+
+  schema-utils@2.7.1:
+    resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==}
+    engines: {node: '>= 8.9.0'}
+
+  schema-utils@4.3.0:
+    resolution: {integrity: sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==}
+    engines: {node: '>= 10.13.0'}
+
+  scroll-smooth@1.1.1:
+    resolution: {integrity: sha512-i9e/hJf0ODPEsy+AubE0zES6xdOuIvtebe5MvdSI1lB4t91k+O+8kV15CYfPN0yPH4j4hZUoKM3rVaPVcmiOoQ==}
+
+  scrollparent@2.0.1:
+    resolution: {integrity: sha512-HSdN78VMvFCSGCkh0oYX/tY4R3P1DW61f8+TeZZ4j2VLgfwvw0bpRSOv4PCVKisktIwbzHCfZsx+rLbbDBqIBA==}
+
+  select-hose@2.0.0:
+    resolution: {integrity: sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==}
+
+  selfsigned@2.4.1:
+    resolution: {integrity: sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==}
+    engines: {node: '>=10'}
+
+  semver@5.7.2:
+    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
+    hasBin: true
+
+  semver@6.3.1:
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
+    hasBin: true
+
+  semver@7.0.0:
+    resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==}
+    hasBin: true
+
+  semver@7.7.1:
+    resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  send@0.19.0:
+    resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==}
+    engines: {node: '>= 0.8.0'}
+
+  seq-queue@0.0.5:
+    resolution: {integrity: sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==}
+
+  sequelize-pool@7.1.0:
+    resolution: {integrity: sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==}
+    engines: {node: '>= 10.0.0'}
+
+  sequelize@6.37.5:
+    resolution: {integrity: sha512-10WA4poUb3XWnUROThqL2Apq9C2NhyV1xHPMZuybNMCucDsbbFuKg51jhmyvvAUyUqCiimwTZamc3AHhMoBr2Q==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      ibm_db: '*'
+      mariadb: '*'
+      mysql2: '*'
+      oracledb: '*'
+      pg: '*'
+      pg-hstore: '*'
+      snowflake-sdk: '*'
+      sqlite3: '*'
+      tedious: '*'
+    peerDependenciesMeta:
+      ibm_db:
+        optional: true
+      mariadb:
+        optional: true
+      mysql2:
+        optional: true
+      oracledb:
+        optional: true
+      pg:
+        optional: true
+      pg-hstore:
+        optional: true
+      snowflake-sdk:
+        optional: true
+      sqlite3:
+        optional: true
+      tedious:
+        optional: true
+
+  serialize-javascript@3.1.0:
+    resolution: {integrity: sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==}
+
+  serialize-javascript@4.0.0:
+    resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==}
+
+  serialize-javascript@6.0.2:
+    resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==}
+
+  serve-index@1.9.1:
+    resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==}
+    engines: {node: '>= 0.8.0'}
+
+  serve-static@1.16.2:
+    resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==}
+    engines: {node: '>= 0.8.0'}
+
+  set-blocking@2.0.0:
+    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
+
+  set-cookie-parser@2.7.1:
+    resolution: {integrity: sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==}
+
+  set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
+
+  set-function-name@2.0.2:
+    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
+    engines: {node: '>= 0.4'}
+
+  set-proto@1.0.0:
+    resolution: {integrity: sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==}
+    engines: {node: '>= 0.4'}
+
+  set-value@2.0.1:
+    resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
+    engines: {node: '>=0.10.0'}
+
+  setprototypeof@1.1.0:
+    resolution: {integrity: sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==}
+
+  setprototypeof@1.2.0:
+    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
+
+  sha.js@2.4.11:
+    resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
+    hasBin: true
+
+  shallow-clone@3.0.1:
+    resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}
+    engines: {node: '>=8'}
+
+  shebang-command@1.2.0:
+    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
+    engines: {node: '>=0.10.0'}
+
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@1.0.0:
+    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
+    engines: {node: '>=0.10.0'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
+  shell-quote@1.8.2:
+    resolution: {integrity: sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==}
+    engines: {node: '>= 0.4'}
+
+  shellwords@0.1.1:
+    resolution: {integrity: sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==}
+
+  side-channel-list@1.0.0:
+    resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-map@1.0.1:
+    resolution: {integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-weakmap@1.0.2:
+    resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
+    engines: {node: '>= 0.4'}
+
+  side-channel@1.1.0:
+    resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
+    engines: {node: '>= 0.4'}
+
+  signal-exit@3.0.7:
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
+
+  signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
+
+  simple-update-notifier@1.1.0:
+    resolution: {integrity: sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==}
+    engines: {node: '>=8.10.0'}
+
+  sinon@8.1.1:
+    resolution: {integrity: sha512-E+tWr3acRdoe1nXbHMu86SSqA1WGM7Yw3jZRLvlCMnXwTHP8lgFFVn5BnKnF26uc5SfZ3D7pA9sN7S3Y2jG4Ew==}
+    deprecated: 16.1.1
+
+  sirv@2.0.4:
+    resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==}
+    engines: {node: '>= 10'}
+
+  sisteransi@1.0.5:
+    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+
+  slash@3.0.0:
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
+    engines: {node: '>=8'}
+
+  slice-ansi@0.0.4:
+    resolution: {integrity: sha512-up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw==}
+    engines: {node: '>=0.10.0'}
+
+  snapdragon-node@2.1.1:
+    resolution: {integrity: sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==}
+    engines: {node: '>=0.10.0'}
+
+  snapdragon-util@3.0.1:
+    resolution: {integrity: sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==}
+    engines: {node: '>=0.10.0'}
+
+  snapdragon@0.8.2:
+    resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
+    engines: {node: '>=0.10.0'}
+
+  sockjs@0.3.24:
+    resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==}
+
+  sort-keys@1.1.2:
+    resolution: {integrity: sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==}
+    engines: {node: '>=0.10.0'}
+
+  source-list-map@0.1.8:
+    resolution: {integrity: sha512-cabwdhnSNf/tTDMh/DXZXlkeQLvdYT5xfGYBohqHG7wb3bBQrQlHQNWM9NWSOboXXK1zgwz6JzS5e4hZq9vxMw==}
+
+  source-list-map@2.0.1:
+    resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==}
+
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
+
+  source-map-resolve@0.5.3:
+    resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==}
+    deprecated: See https://github.com/lydell/source-map-resolve#deprecated
+
+  source-map-support@0.5.13:
+    resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
+
+  source-map-support@0.5.21:
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+
+  source-map-url@0.4.1:
+    resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
+    deprecated: See https://github.com/lydell/source-map-url#deprecated
+
+  source-map@0.5.7:
+    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
+    engines: {node: '>=0.10.0'}
+
+  source-map@0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
+
+  source-map@0.7.4:
+    resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
+    engines: {node: '>= 8'}
+
+  sourcemap-codec@1.4.8:
+    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
+    deprecated: Please use @jridgewell/sourcemap-codec instead
+
+  spawn-command@0.0.2:
+    resolution: {integrity: sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==}
+
+  spdx-correct@3.2.0:
+    resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==}
+
+  spdx-exceptions@2.5.0:
+    resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==}
+
+  spdx-expression-parse@3.0.1:
+    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
+
+  spdx-license-ids@3.0.21:
+    resolution: {integrity: sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==}
+
+  spdy-transport@3.0.0:
+    resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==}
+
+  spdy@4.0.2:
+    resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==}
+    engines: {node: '>=6.0.0'}
+
+  split-string@3.1.0:
+    resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
+    engines: {node: '>=0.10.0'}
+
+  sprintf-js@1.0.3:
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+
+  sprintf-js@1.1.3:
+    resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
+
+  sqlstring@2.3.3:
+    resolution: {integrity: sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==}
+    engines: {node: '>= 0.6'}
+
+  sshpk@1.18.0:
+    resolution: {integrity: sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+
+  ssri@8.0.1:
+    resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==}
+    engines: {node: '>= 8'}
+
+  stack-utils@2.0.6:
+    resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
+    engines: {node: '>=10'}
+
+  static-extend@0.1.2:
+    resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
+    engines: {node: '>=0.10.0'}
+
+  statuses@1.5.0:
+    resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==}
+    engines: {node: '>= 0.6'}
+
+  statuses@2.0.1:
+    resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
+    engines: {node: '>= 0.8'}
+
+  stealthy-require@1.1.1:
+    resolution: {integrity: sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==}
+    engines: {node: '>=0.10.0'}
+
+  streamsearch@0.1.2:
+    resolution: {integrity: sha512-jos8u++JKm0ARcSUTAZXOVC0mSox7Bhn6sBgty73P1f3JGf7yG2clTbBNHUdde/kdvP2FESam+vM6l8jBrNxHA==}
+    engines: {node: '>=0.8.0'}
+
+  strict-uri-encode@1.1.0:
+    resolution: {integrity: sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==}
+    engines: {node: '>=0.10.0'}
+
+  string-length@4.0.2:
+    resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
+    engines: {node: '>=10'}
+
+  string-template@0.2.1:
+    resolution: {integrity: sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==}
+
+  string-width@1.0.2:
+    resolution: {integrity: sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==}
+    engines: {node: '>=0.10.0'}
+
+  string-width@2.1.1:
+    resolution: {integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==}
+    engines: {node: '>=4'}
+
+  string-width@3.1.0:
+    resolution: {integrity: sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==}
+    engines: {node: '>=6'}
+
+  string-width@4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
+
+  string-width@5.1.2:
+    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
+    engines: {node: '>=12'}
+
+  string.prototype.includes@2.0.1:
+    resolution: {integrity: sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.matchall@4.0.12:
+    resolution: {integrity: sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.padend@3.1.6:
+    resolution: {integrity: sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.repeat@1.0.0:
+    resolution: {integrity: sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==}
+
+  string.prototype.trim@1.2.10:
+    resolution: {integrity: sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trimend@1.0.9:
+    resolution: {integrity: sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trimstart@1.0.8:
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
+    engines: {node: '>= 0.4'}
+
+  string_decoder@0.10.31:
+    resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==}
+
+  string_decoder@1.1.1:
+    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
+
+  string_decoder@1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+
+  strip-ansi@3.0.1:
+    resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==}
+    engines: {node: '>=0.10.0'}
+
+  strip-ansi@4.0.0:
+    resolution: {integrity: sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==}
+    engines: {node: '>=4'}
+
+  strip-ansi@5.2.0:
+    resolution: {integrity: sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==}
+    engines: {node: '>=6'}
+
+  strip-ansi@6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
+
+  strip-ansi@7.1.0:
+    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+    engines: {node: '>=12'}
+
+  strip-bom@3.0.0:
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+    engines: {node: '>=4'}
+
+  strip-bom@4.0.0:
+    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
+    engines: {node: '>=8'}
+
+  strip-eof@1.0.0:
+    resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==}
+    engines: {node: '>=0.10.0'}
+
+  strip-final-newline@2.0.0:
+    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
+    engines: {node: '>=6'}
+
+  strip-json-comments@3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
+
+  style-loader@1.3.0:
+    resolution: {integrity: sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==}
+    engines: {node: '>= 8.9.0'}
+    peerDependencies:
+      webpack: ^4.0.0 || ^5.0.0
+
+  styled-components@4.4.1:
+    resolution: {integrity: sha512-RNqj14kYzw++6Sr38n7197xG33ipEOktGElty4I70IKzQF1jzaD1U4xQ+Ny/i03UUhHlC5NWEO+d8olRCDji6g==}
+    peerDependencies:
+      react: '>= 16.3.0'
+      react-dom: '>= 16.3.0'
+
+  stylis-rule-sheet@0.0.10:
+    resolution: {integrity: sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==}
+    peerDependencies:
+      stylis: ^3.5.0
+
+  stylis@3.5.4:
+    resolution: {integrity: sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q==}
+
+  stylis@4.2.0:
+    resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==}
+
+  subscriptions-transport-ws@0.9.19:
+    resolution: {integrity: sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw==}
+    deprecated: The `subscriptions-transport-ws` package is no longer maintained. We recommend you use `graphql-ws` instead. For help migrating Apollo software to `graphql-ws`, see https://www.apollographql.com/docs/apollo-server/data/subscriptions/#switching-from-subscriptions-transport-ws    For general help using `graphql-ws`, see https://github.com/enisdenjo/graphql-ws/blob/master/README.md
+    peerDependencies:
+      graphql: '>=0.10.0'
+
+  supports-color@2.0.0:
+    resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}
+    engines: {node: '>=0.8.0'}
+
+  supports-color@3.2.3:
+    resolution: {integrity: sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==}
+    engines: {node: '>=0.8.0'}
+
+  supports-color@5.5.0:
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+    engines: {node: '>=4'}
+
+  supports-color@6.1.0:
+    resolution: {integrity: sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==}
+    engines: {node: '>=6'}
+
+  supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
+
+  supports-color@8.1.1:
+    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
+    engines: {node: '>=10'}
+
+  supports-hyperlinks@2.3.0:
+    resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
+    engines: {node: '>=8'}
+
+  supports-preserve-symlinks-flag@1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
+
+  symbol-observable@1.2.0:
+    resolution: {integrity: sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==}
+    engines: {node: '>=0.10.0'}
+
+  symbol-tree@3.2.4:
+    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
+
+  tapable@2.2.1:
+    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
+    engines: {node: '>=6'}
+
+  tar@6.2.1:
+    resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
+    engines: {node: '>=10'}
+
+  terminal-link@2.1.1:
+    resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
+    engines: {node: '>=8'}
+
+  terser-webpack-plugin@3.1.0:
+    resolution: {integrity: sha512-cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA==}
+    engines: {node: '>= 10.13.0'}
+    peerDependencies:
+      webpack: ^4.0.0 || ^5.0.0
+
+  terser-webpack-plugin@5.3.11:
+    resolution: {integrity: sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==}
+    engines: {node: '>= 10.13.0'}
+    peerDependencies:
+      '@swc/core': '*'
+      esbuild: '*'
+      uglify-js: '*'
+      webpack: ^5.1.0
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      esbuild:
+        optional: true
+      uglify-js:
+        optional: true
+
+  terser@4.8.1:
+    resolution: {integrity: sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  terser@5.39.0:
+    resolution: {integrity: sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  test-exclude@6.0.0:
+    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
+    engines: {node: '>=8'}
+
+  text-table@0.2.0:
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+
+  throat@5.0.0:
+    resolution: {integrity: sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==}
+
+  throttleit@1.0.1:
+    resolution: {integrity: sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==}
+
+  through2@2.0.5:
+    resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
+
+  thunky@1.1.0:
+    resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==}
+
+  tiny-invariant@1.3.3:
+    resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
+
+  tiny-lr@1.1.1:
+    resolution: {integrity: sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==}
+
+  tmp@0.2.3:
+    resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
+    engines: {node: '>=14.14'}
+
+  tmpl@1.0.5:
+    resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
+
+  to-object-path@0.3.0:
+    resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
+    engines: {node: '>=0.10.0'}
+
+  to-regex-range@2.1.1:
+    resolution: {integrity: sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==}
+    engines: {node: '>=0.10.0'}
+
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
+  to-regex@3.0.2:
+    resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
+    engines: {node: '>=0.10.0'}
+
+  toggle-selection@1.0.6:
+    resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
+
+  toidentifier@1.0.1:
+    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
+    engines: {node: '>=0.6'}
+
+  toposort-class@1.0.1:
+    resolution: {integrity: sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg==}
+
+  totalist@3.0.1:
+    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
+    engines: {node: '>=6'}
+
+  touch@3.1.1:
+    resolution: {integrity: sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==}
+    hasBin: true
+
+  tough-cookie@2.5.0:
+    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
+    engines: {node: '>=0.8'}
+
+  tough-cookie@4.1.4:
+    resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==}
+    engines: {node: '>=6'}
+
+  tr46@0.0.3:
+    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+
+  tr46@1.0.1:
+    resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
+
+  tr46@2.1.0:
+    resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==}
+    engines: {node: '>=8'}
+
+  tr46@3.0.0:
+    resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
+    engines: {node: '>=12'}
+
+  tree-kill@1.2.2:
+    resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
+    hasBin: true
+
+  ts-api-utils@1.4.3:
+    resolution: {integrity: sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      typescript: '>=4.2.0'
+
+  ts-invariant@0.4.4:
+    resolution: {integrity: sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==}
+
+  ts-jest@29.2.5:
+    resolution: {integrity: sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@babel/core': '>=7.0.0-beta.0 <8'
+      '@jest/transform': ^29.0.0
+      '@jest/types': ^29.0.0
+      babel-jest: ^29.0.0
+      esbuild: '*'
+      jest: ^29.0.0
+      typescript: '>=4.3 <6'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      '@jest/transform':
+        optional: true
+      '@jest/types':
+        optional: true
+      babel-jest:
+        optional: true
+      esbuild:
+        optional: true
+
+  ts-loader@9.5.2:
+    resolution: {integrity: sha512-Qo4piXvOTWcMGIgRiuFa6nHNm+54HbYaZCKqc9eeZCLRy3XqafQgwX2F7mofrbJG3g7EEb+lkiR+z2Lic2s3Zw==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      typescript: '*'
+      webpack: ^5.0.0
+
+  ts-node@10.9.2:
+    resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
+    hasBin: true
+    peerDependencies:
+      '@swc/core': '>=1.2.50'
+      '@swc/wasm': '>=1.2.50'
+      '@types/node': '*'
+      typescript: '>=2.7'
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      '@swc/wasm':
+        optional: true
+
+  tsconfig-paths@3.15.0:
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
+
+  tsconfig-paths@4.1.1:
+    resolution: {integrity: sha512-VgPrtLKpRgEAJsMj5Q/I/mXouC6A/7eJ/X4Nuk6o0cRPwBtznYxTCU4FodbexbzH9somBPEXYi0ZkUViUpJ21Q==}
+    engines: {node: '>=6'}
+
+  tslib@1.14.1:
+    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
+
+  tslib@2.0.1:
+    resolution: {integrity: sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==}
+
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
+
+  tsutils@3.21.0:
+    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
+    engines: {node: '>= 6'}
+    peerDependencies:
+      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+
+  tunnel-agent@0.6.0:
+    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
+
+  turbo-darwin-64@2.4.2:
+    resolution: {integrity: sha512-HFfemyWB60CJtEvVQj9yby5rkkWw9fLAdLtAPGtPQoU3tKh8t/uzCAZKso2aPVbib9vGUuGbPGoGpaRXdVhj5g==}
+    cpu: [x64]
+    os: [darwin]
+
+  turbo-darwin-arm64@2.4.2:
+    resolution: {integrity: sha512-uwSx1dsBSSFeEC0nxyx2O219FEsS/haiESaWwE9JI8mHkQK61s6w6fN2G586krKxyNam4AIxRltleL+O2Em94g==}
+    cpu: [arm64]
+    os: [darwin]
+
+  turbo-linux-64@2.4.2:
+    resolution: {integrity: sha512-Fy/uL8z/LAYcPbm7a1LwFnTY9pIi5FAi12iuHsgB7zHjdh4eeIKS2NIg4nroAmTcUTUZ0/cVTo4bDOCUcS3aKw==}
+    cpu: [x64]
+    os: [linux]
+
+  turbo-linux-arm64@2.4.2:
+    resolution: {integrity: sha512-AEA0d8h5W/K6iiXfEgiNwWt0yqRL1NpBs8zQCLdc4/L7WeYeJW3sORWX8zt7xhutF/KW9gTm8ehKpiK6cCIsAA==}
+    cpu: [arm64]
+    os: [linux]
+
+  turbo-windows-64@2.4.2:
+    resolution: {integrity: sha512-CybtIZ9wRgnnNFVN9En9G+rxsO+mwU81fvW4RpE8BWyNEkhQ8J28qYf4PaimueMxGHHp/28i/G7Kcdn2GAWG0g==}
+    cpu: [x64]
+    os: [win32]
+
+  turbo-windows-arm64@2.4.2:
+    resolution: {integrity: sha512-7V0yneVPL8Y3TgrkUIjw7Odmwu1tHnyIiPHFM7eFcA7U+H6hPXyCxge7nC3wOKfjhKCQqUm+Vf/k6kjmLz5G4g==}
+    cpu: [arm64]
+    os: [win32]
+
+  turbo@2.4.2:
+    resolution: {integrity: sha512-Qxi0ioQCxMRUCcHKHZkTnYH8e7XCpNfg9QiJcyfWIc+ZXeaCjzV5rCGlbQlTXMAtI8qgfP8fZADv3CFtPwqdPQ==}
+    hasBin: true
+
+  tweetnacl@0.14.5:
+    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
+
+  type-check@0.3.2:
+    resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==}
+    engines: {node: '>= 0.8.0'}
+
+  type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+
+  type-detect@4.0.8:
+    resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
+    engines: {node: '>=4'}
+
+  type-detect@4.1.0:
+    resolution: {integrity: sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==}
+    engines: {node: '>=4'}
+
+  type-fest@0.20.2:
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
+    engines: {node: '>=10'}
+
+  type-fest@0.21.3:
+    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
+    engines: {node: '>=10'}
+
+  type-fest@0.6.0:
+    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
+    engines: {node: '>=8'}
+
+  type-fest@0.8.1:
+    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
+    engines: {node: '>=8'}
+
+  type-is@1.6.18:
+    resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
+    engines: {node: '>= 0.6'}
+
+  typed-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-length@1.0.3:
+    resolution: {integrity: sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-offset@1.0.4:
+    resolution: {integrity: sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-length@1.0.7:
+    resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==}
+    engines: {node: '>= 0.4'}
+
+  typedarray-to-buffer@3.1.5:
+    resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
+
+  typedarray@0.0.6:
+    resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
+
+  typescript@4.9.5:
+    resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
+    engines: {node: '>=4.2.0'}
+    hasBin: true
+
+  typescript@5.7.3:
+    resolution: {integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  typescript@5.9.2:
+    resolution: {integrity: sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  uglify-js@3.19.3:
+    resolution: {integrity: sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==}
+    engines: {node: '>=0.8.0'}
+    hasBin: true
+
+  unbox-primitive@1.1.0:
+    resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
+    engines: {node: '>= 0.4'}
+
+  unc-path-regex@0.1.2:
+    resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
+    engines: {node: '>=0.10.0'}
+
+  undefsafe@2.0.5:
+    resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
+
+  underscore.string@3.3.6:
+    resolution: {integrity: sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==}
+
+  underscore@1.13.7:
+    resolution: {integrity: sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==}
+
+  undici-types@6.21.0:
+    resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
+
+  unicode-canonical-property-names-ecmascript@2.0.1:
+    resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
+    engines: {node: '>=4'}
+
+  unicode-match-property-ecmascript@2.0.0:
+    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
+    engines: {node: '>=4'}
+
+  unicode-match-property-value-ecmascript@2.2.0:
+    resolution: {integrity: sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==}
+    engines: {node: '>=4'}
+
+  unicode-property-aliases-ecmascript@2.1.0:
+    resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==}
+    engines: {node: '>=4'}
+
+  union-value@1.0.1:
+    resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
+    engines: {node: '>=0.10.0'}
+
+  unique-filename@1.1.1:
+    resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
+
+  unique-slug@2.0.2:
+    resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==}
+
+  universalify@0.1.2:
+    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
+    engines: {node: '>= 4.0.0'}
+
+  universalify@0.2.0:
+    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
+    engines: {node: '>= 4.0.0'}
+
+  universalify@2.0.1:
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
+    engines: {node: '>= 10.0.0'}
+
+  unpipe@1.0.0:
+    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
+    engines: {node: '>= 0.8'}
+
+  unset-value@1.0.0:
+    resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
+    engines: {node: '>=0.10.0'}
+
+  untildify@4.0.0:
+    resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
+    engines: {node: '>=8'}
+
+  update-browserslist-db@1.1.2:
+    resolution: {integrity: sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
+  uri-js@4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+
+  uri-path@1.0.0:
+    resolution: {integrity: sha512-8pMuAn4KacYdGMkFaoQARicp4HSw24/DHOVKWqVRJ8LhhAwPPFpdGvdL9184JVmUwe7vz7Z9n6IqI6t5n2ELdg==}
+    engines: {node: '>= 0.10'}
+
+  urix@0.1.0:
+    resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
+    deprecated: Please see https://github.com/lydell/urix#deprecated
+
+  url-parse@1.5.10:
+    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
+
+  url-template@2.0.8:
+    resolution: {integrity: sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==}
+
+  url@0.11.4:
+    resolution: {integrity: sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==}
+    engines: {node: '>= 0.4'}
+
+  use-callback-ref@1.3.3:
+    resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  use-isomorphic-layout-effect@1.2.0:
+    resolution: {integrity: sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  use-latest@1.3.0:
+    resolution: {integrity: sha512-mhg3xdm9NaM8q+gLT8KryJPnRFOz1/5XPBhmDEVZK1webPzDjrPk7f/mbpeLqTgB9msytYWANxgALOCJKnLvcQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  use-memo-one@1.1.3:
+    resolution: {integrity: sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+
+  use-onclickoutside@0.3.2:
+    resolution: {integrity: sha512-7P+U4B6nUlWLtmktuF6KTNg9mzxf7VqnBVxv418i3SQytw68/19Fk8hUW1uZjZv3DGHtGEwLa4vnjbm5sPL2ZQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0
+
+  use-sidecar@1.1.3:
+    resolution: {integrity: sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  use-sync-external-store@1.5.0:
+    resolution: {integrity: sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  use@3.1.1:
+    resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
+    engines: {node: '>=0.10.0'}
+
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+
+  util.promisify@1.1.3:
+    resolution: {integrity: sha512-GIEaZ6o86fj09Wtf0VfZ5XP7tmd4t3jM5aZCgmBi231D0DB1AEBa3Aa6MP48DMsAIi96WkpWLimIWVwOjbDMOw==}
+    engines: {node: '>= 0.8'}
+
+  utila@0.4.0:
+    resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==}
+
+  utils-merge@1.0.1:
+    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
+    engines: {node: '>= 0.4.0'}
+
+  uuid@3.4.0:
+    resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
+    deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
+    hasBin: true
+
+  uuid@8.3.2:
+    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    hasBin: true
+
+  v8-compile-cache-lib@3.0.1:
+    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
+
+  v8-to-istanbul@7.1.2:
+    resolution: {integrity: sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==}
+    engines: {node: '>=10.10.0'}
+
+  v8-to-istanbul@9.3.0:
+    resolution: {integrity: sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==}
+    engines: {node: '>=10.12.0'}
+
+  v8flags@3.2.0:
+    resolution: {integrity: sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==}
+    engines: {node: '>= 0.10'}
+
+  v8flags@4.0.1:
+    resolution: {integrity: sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==}
+    engines: {node: '>= 10.13.0'}
+
+  validate-npm-package-license@3.0.4:
+    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
+
+  validator@13.12.0:
+    resolution: {integrity: sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==}
+    engines: {node: '>= 0.10'}
+
+  vary@1.1.2:
+    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
+    engines: {node: '>= 0.8'}
+
+  verror@1.10.0:
+    resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
+    engines: {'0': node >=0.6.0}
+
+  victory-vendor@37.3.6:
+    resolution: {integrity: sha512-SbPDPdDBYp+5MJHhBCAyI7wKM3d5ivekigc2Dk2s7pgbZ9wIgIBYGVw4zGHBml/qTFbexrofXW6Gu4noGxrOwQ==}
+
+  vue-eslint-parser@9.4.3:
+    resolution: {integrity: sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==}
+    engines: {node: ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '>=6.0.0'
+
+  w3c-hr-time@1.0.2:
+    resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
+    deprecated: Use your platform's native performance.now() and performance.timeOrigin.
+
+  w3c-xmlserializer@1.1.2:
+    resolution: {integrity: sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==}
+
+  w3c-xmlserializer@2.0.0:
+    resolution: {integrity: sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==}
+    engines: {node: '>=10'}
+
+  w3c-xmlserializer@4.0.0:
+    resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==}
+    engines: {node: '>=14'}
+
+  walker@1.0.8:
+    resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
+
+  watchpack@2.4.2:
+    resolution: {integrity: sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==}
+    engines: {node: '>=10.13.0'}
+
+  wbuf@1.7.3:
+    resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==}
+
+  webidl-conversions@3.0.1:
+    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
+
+  webidl-conversions@4.0.2:
+    resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
+
+  webidl-conversions@5.0.0:
+    resolution: {integrity: sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==}
+    engines: {node: '>=8'}
+
+  webidl-conversions@6.1.0:
+    resolution: {integrity: sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==}
+    engines: {node: '>=10.4'}
+
+  webidl-conversions@7.0.0:
+    resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
+    engines: {node: '>=12'}
+
+  webpack-bundle-analyzer@4.10.2:
+    resolution: {integrity: sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==}
+    engines: {node: '>= 10.13.0'}
+    hasBin: true
+
+  webpack-cli@5.1.4:
+    resolution: {integrity: sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==}
+    engines: {node: '>=14.15.0'}
+    hasBin: true
+    peerDependencies:
+      '@webpack-cli/generators': '*'
+      webpack: 5.x.x
+      webpack-bundle-analyzer: '*'
+      webpack-dev-server: '*'
+    peerDependenciesMeta:
+      '@webpack-cli/generators':
+        optional: true
+      webpack-bundle-analyzer:
+        optional: true
+      webpack-dev-server:
+        optional: true
+
+  webpack-dev-middleware@5.3.4:
+    resolution: {integrity: sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==}
+    engines: {node: '>= 12.13.0'}
+    peerDependencies:
+      webpack: ^4.0.0 || ^5.0.0
+
+  webpack-dev-middleware@6.1.3:
+    resolution: {integrity: sha512-A4ChP0Qj8oGociTs6UdlRUGANIGrCDL3y+pmQMc+dSsraXHCatFpmMey4mYELA+juqwUqwQsUgJJISXl1KWmiw==}
+    engines: {node: '>= 14.15.0'}
+    peerDependencies:
+      webpack: ^5.0.0
+    peerDependenciesMeta:
+      webpack:
+        optional: true
+
+  webpack-dev-server@4.15.2:
+    resolution: {integrity: sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==}
+    engines: {node: '>= 12.13.0'}
+    hasBin: true
+    peerDependencies:
+      webpack: ^4.37.0 || ^5.0.0
+      webpack-cli: '*'
+    peerDependenciesMeta:
+      webpack:
+        optional: true
+      webpack-cli:
+        optional: true
+
+  webpack-hot-middleware@2.26.1:
+    resolution: {integrity: sha512-khZGfAeJx6I8K9zKohEWWYN6KDlVw2DHownoe+6Vtwj1LP9WFgegXnVMSkZ/dBEBtXFwrkkydsaPFlB7f8wU2A==}
+
+  webpack-manifest-plugin@5.0.0:
+    resolution: {integrity: sha512-8RQfMAdc5Uw3QbCQ/CBV/AXqOR8mt03B6GJmRbhWopE8GzRfEpn+k0ZuWywxW+5QZsffhmFDY1J6ohqJo+eMuw==}
+    engines: {node: '>=12.22.0'}
+    peerDependencies:
+      webpack: ^5.47.0
+
+  webpack-merge@5.10.0:
+    resolution: {integrity: sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==}
+    engines: {node: '>=10.0.0'}
+
+  webpack-sources@0.1.5:
+    resolution: {integrity: sha512-8CXYfPZkWvY0VWadHDQ3q2hUBqk2IJKTTdDPYb5hwnGVVma8bzqTJEerUDrpWwXnuY9vxZ0mGEnjYD0XLhRHeQ==}
+
+  webpack-sources@1.4.3:
+    resolution: {integrity: sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==}
+
+  webpack-sources@2.3.1:
+    resolution: {integrity: sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==}
+    engines: {node: '>=10.13.0'}
+
+  webpack-sources@3.2.3:
+    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
+    engines: {node: '>=10.13.0'}
+
+  webpack@5.98.0:
+    resolution: {integrity: sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    peerDependencies:
+      webpack-cli: '*'
+    peerDependenciesMeta:
+      webpack-cli:
+        optional: true
+
+  websocket-driver@0.7.4:
+    resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==}
+    engines: {node: '>=0.8.0'}
+
+  websocket-extensions@0.1.4:
+    resolution: {integrity: sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==}
+    engines: {node: '>=0.8.0'}
+
+  whatwg-encoding@1.0.5:
+    resolution: {integrity: sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==}
+
+  whatwg-encoding@2.0.0:
+    resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
+    engines: {node: '>=12'}
+
+  whatwg-mimetype@2.3.0:
+    resolution: {integrity: sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==}
+
+  whatwg-mimetype@3.0.0:
+    resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
+    engines: {node: '>=12'}
+
+  whatwg-url@11.0.0:
+    resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==}
+    engines: {node: '>=12'}
+
+  whatwg-url@5.0.0:
+    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
+
+  whatwg-url@7.1.0:
+    resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}
+
+  whatwg-url@8.7.0:
+    resolution: {integrity: sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==}
+    engines: {node: '>=10'}
+
+  which-boxed-primitive@1.1.1:
+    resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}
+    engines: {node: '>= 0.4'}
+
+  which-builtin-type@1.2.1:
+    resolution: {integrity: sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==}
+    engines: {node: '>= 0.4'}
+
+  which-collection@1.0.2:
+    resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
+    engines: {node: '>= 0.4'}
+
+  which-module@2.0.1:
+    resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
+
+  which-typed-array@1.1.18:
+    resolution: {integrity: sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==}
+    engines: {node: '>= 0.4'}
+
+  which@1.3.1:
+    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
+    hasBin: true
+
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
+  wide-align@1.1.5:
+    resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
+
+  wildcard@2.0.1:
+    resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==}
+
+  window@4.2.6:
+    resolution: {integrity: sha512-vk5Uv4hlPkZjUTAUVJUyvJQrbA05T99Qm3CTk0krXHKdoghxV70uPbHK3uGmrI1SfyJpdYncvZ7CbewJ30e9MQ==}
+    engines: {node: '>=4'}
+
+  wkx@0.5.0:
+    resolution: {integrity: sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==}
+
+  word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+    engines: {node: '>=0.10.0'}
+
+  wrap-ansi@3.0.1:
+    resolution: {integrity: sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==}
+    engines: {node: '>=4'}
+
+  wrap-ansi@5.1.0:
+    resolution: {integrity: sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==}
+    engines: {node: '>=6'}
+
+  wrap-ansi@6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+    engines: {node: '>=8'}
+
+  wrap-ansi@7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
+
+  wrap-ansi@8.1.0:
+    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
+    engines: {node: '>=12'}
+
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+  write-file-atomic@3.0.3:
+    resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}
+
+  write-file-atomic@4.0.2:
+    resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+
+  ws@6.2.3:
+    resolution: {integrity: sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: ^5.0.2
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  ws@7.5.10:
+    resolution: {integrity: sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==}
+    engines: {node: '>=8.3.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: ^5.0.2
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  ws@8.18.0:
+    resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  xml-name-validator@3.0.0:
+    resolution: {integrity: sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==}
+
+  xml-name-validator@4.0.0:
+    resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
+    engines: {node: '>=12'}
+
+  xmlchars@2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+
+  xss@1.0.15:
+    resolution: {integrity: sha512-FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg==}
+    engines: {node: '>= 0.10.0'}
+    hasBin: true
+
+  xtend@4.0.2:
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
+
+  y18n@4.0.3:
+    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
+
+  y18n@5.0.8:
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
+
+  yallist@3.1.1:
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
+
+  yallist@4.0.0:
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
+
+  yaml@1.10.2:
+    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
+    engines: {node: '>= 6'}
+
+  yargs-parser@13.1.2:
+    resolution: {integrity: sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==}
+
+  yargs-parser@18.1.3:
+    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
+    engines: {node: '>=6'}
+
+  yargs-parser@20.2.9:
+    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
+    engines: {node: '>=10'}
+
+  yargs-parser@21.1.1:
+    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
+    engines: {node: '>=12'}
+
+  yargs@13.3.2:
+    resolution: {integrity: sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==}
+
+  yargs@15.4.1:
+    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
+    engines: {node: '>=8'}
+
+  yargs@16.2.0:
+    resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
+    engines: {node: '>=10'}
+
+  yargs@17.7.2:
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
+
+  yauzl@2.10.0:
+    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
+
+  yn@3.1.1:
+    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
+    engines: {node: '>=6'}
+
+  yocto-queue@0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
+
+  zen-observable-ts@0.8.21:
+    resolution: {integrity: sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg==}
+
+  zen-observable@0.8.15:
+    resolution: {integrity: sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==}
+
+snapshots:
+
+  '@ampproject/remapping@2.3.0':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.8
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@apollo/client@4.0.0(graphql@16.11.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)(rxjs@7.8.2)(subscriptions-transport-ws@0.9.19(graphql@16.11.0))':
+    dependencies:
+      '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0)
+      '@wry/caches': 1.0.1
+      '@wry/equality': 0.5.7
+      '@wry/trie': 0.5.0
+      graphql: 16.11.0
+      graphql-tag: 2.12.6(graphql@16.11.0)
+      optimism: 0.18.1
+      rxjs: 7.8.2
+      tslib: 2.8.1
+    optionalDependencies:
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+      subscriptions-transport-ws: 0.9.19(graphql@16.11.0)
+
+  '@apollo/protobufjs@1.2.2':
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/base64': 1.1.2
+      '@protobufjs/codegen': 2.0.4
+      '@protobufjs/eventemitter': 1.1.0
+      '@protobufjs/fetch': 1.1.0
+      '@protobufjs/float': 1.0.2
+      '@protobufjs/inquire': 1.1.0
+      '@protobufjs/path': 1.1.2
+      '@protobufjs/pool': 1.1.0
+      '@protobufjs/utf8': 1.1.0
+      '@types/long': 4.0.2
+      '@types/node': 10.17.60
+      long: 4.0.0
+
+  '@apollographql/apollo-tools@0.5.4(graphql@16.11.0)':
+    dependencies:
+      graphql: 16.11.0
+
+  '@apollographql/graphql-playground-html@1.6.27':
+    dependencies:
+      xss: 1.0.15
+
+  '@apollographql/graphql-upload-8-fork@8.1.4(graphql@16.11.0)':
+    dependencies:
+      '@types/express': 4.17.21
+      '@types/fs-capacitor': 2.0.0
+      '@types/koa': 2.15.0
+      busboy: 0.3.1
+      fs-capacitor: 2.0.4
+      graphql: 16.11.0
+      http-errors: 1.8.1
+      object-path: 0.11.8
+
+  '@babel/code-frame@7.26.2':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.25.9
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
+  '@babel/compat-data@7.26.8': {}
+
+  '@babel/core@7.26.9':
+    dependencies:
+      '@ampproject/remapping': 2.3.0
+      '@babel/code-frame': 7.26.2
+      '@babel/generator': 7.26.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.9)
+      '@babel/helpers': 7.26.9
+      '@babel/parser': 7.26.9
+      '@babel/template': 7.26.9
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+      '@babel/types': 7.26.9
+      convert-source-map: 2.0.0
+      debug: 4.4.0(supports-color@5.5.0)
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/generator@7.26.9':
+    dependencies:
+      '@babel/parser': 7.26.9
+      '@babel/types': 7.26.9
+      '@jridgewell/gen-mapping': 0.3.8
+      '@jridgewell/trace-mapping': 0.3.25
+      jsesc: 3.1.0
+
+  '@babel/helper-annotate-as-pure@7.25.9':
+    dependencies:
+      '@babel/types': 7.26.9
+
+  '@babel/helper-compilation-targets@7.26.5':
+    dependencies:
+      '@babel/compat-data': 7.26.8
+      '@babel/helper-validator-option': 7.25.9
+      browserslist: 4.24.4
+      lru-cache: 5.1.1
+      semver: 6.3.1
+
+  '@babel/helper-create-class-features-plugin@7.26.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.9)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-create-regexp-features-plugin@7.26.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      regexpu-core: 6.2.0
+      semver: 6.3.1
+
+  '@babel/helper-define-polyfill-provider@0.6.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-plugin-utils': 7.26.5
+      debug: 4.4.0(supports-color@5.5.0)
+      lodash.debounce: 4.0.8
+      resolve: 1.22.10
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-member-expression-to-functions@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+      '@babel/types': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-imports@7.25.9(supports-color@5.5.0)':
+    dependencies:
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+      '@babel/types': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-module-imports': 7.25.9(supports-color@5.5.0)
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-optimise-call-expression@7.25.9':
+    dependencies:
+      '@babel/types': 7.26.9
+
+  '@babel/helper-plugin-utils@7.26.5': {}
+
+  '@babel/helper-remap-async-to-generator@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-wrap-function': 7.25.9
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-replace-supers@7.26.5(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+      '@babel/types': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-string-parser@7.25.9': {}
+
+  '@babel/helper-validator-identifier@7.25.9': {}
+
+  '@babel/helper-validator-option@7.25.9': {}
+
+  '@babel/helper-wrap-function@7.25.9':
+    dependencies:
+      '@babel/template': 7.26.9
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+      '@babel/types': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helpers@7.26.9':
+    dependencies:
+      '@babel/template': 7.26.9
+      '@babel/types': 7.26.9
+
+  '@babel/parser@7.26.9':
+    dependencies:
+      '@babel/types': 7.26.9
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.9)
+
+  '@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.9)
+
+  '@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/compat-data': 7.26.8
+      '@babel/core': 7.26.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.9)
+      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.9)
+
+  '@babel/plugin-proposal-optional-catch-binding@7.18.6(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.9)
+
+  '@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+
+  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-import-assertions@7.26.0(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-import-attributes@7.26.0(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-jsx@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-typescript@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-arrow-functions@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-async-generator-functions@7.26.8(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.9)
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-async-to-generator@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-module-imports': 7.25.9(supports-color@5.5.0)
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-block-scoped-functions@7.26.5(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-block-scoping@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-class-properties@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-class-static-block@7.26.0(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-classes@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.9)
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-computed-properties@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/template': 7.26.9
+
+  '@babel/plugin-transform-destructuring@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-dotall-regex@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-duplicate-keys@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-dynamic-import@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-exponentiation-operator@7.26.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-export-namespace-from@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-for-of@7.26.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-function-name@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-jscript@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-json-strings@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-literals@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-logical-assignment-operators@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-member-expression-literals@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-modules-amd@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-commonjs@7.26.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-systemjs@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-umd@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-new-target@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-nullish-coalescing-operator@7.26.6(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-numeric-separator@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-object-rest-spread@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.9)
+
+  '@babel/plugin-transform-object-super@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-optional-catch-binding@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-optional-chaining@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-parameters@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-private-property-in-object@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-property-literals@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-property-mutators@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-react-display-name@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-react-jsx-development@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/plugin-transform-react-jsx': 7.25.9(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-react-jsx@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-module-imports': 7.25.9(supports-color@5.5.0)
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.9)
+      '@babel/types': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-react-pure-annotations@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-regenerator@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      regenerator-transform: 0.15.2
+
+  '@babel/plugin-transform-regexp-modifiers@7.26.0(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-reserved-words@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-runtime@7.26.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-module-imports': 7.25.9(supports-color@5.5.0)
+      '@babel/helper-plugin-utils': 7.26.5
+      babel-plugin-polyfill-corejs2: 0.4.12(@babel/core@7.26.9)
+      babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.26.9)
+      babel-plugin-polyfill-regenerator: 0.6.3(@babel/core@7.26.9)
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-shorthand-properties@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-spread@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-sticky-regex@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-template-literals@7.26.8(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-typeof-symbol@7.26.7(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-unicode-escapes@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-unicode-property-regex@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-unicode-regex@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-unicode-sets-regex@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/preset-env@7.26.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/compat-data': 7.26.8
+      '@babel/core': 7.26.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-validator-option': 7.25.9
+      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.9)
+      '@babel/plugin-syntax-import-assertions': 7.26.0(@babel/core@7.26.9)
+      '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.9)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.26.9)
+      '@babel/plugin-transform-arrow-functions': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-async-generator-functions': 7.26.8(@babel/core@7.26.9)
+      '@babel/plugin-transform-async-to-generator': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-block-scoped-functions': 7.26.5(@babel/core@7.26.9)
+      '@babel/plugin-transform-block-scoping': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-class-properties': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-class-static-block': 7.26.0(@babel/core@7.26.9)
+      '@babel/plugin-transform-classes': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-computed-properties': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-destructuring': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-dotall-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-duplicate-keys': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-dynamic-import': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-exponentiation-operator': 7.26.3(@babel/core@7.26.9)
+      '@babel/plugin-transform-export-namespace-from': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-for-of': 7.26.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-function-name': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-json-strings': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-literals': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-logical-assignment-operators': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-member-expression-literals': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-modules-amd': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-modules-commonjs': 7.26.3(@babel/core@7.26.9)
+      '@babel/plugin-transform-modules-systemjs': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-modules-umd': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-new-target': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.26.6(@babel/core@7.26.9)
+      '@babel/plugin-transform-numeric-separator': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-object-rest-spread': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-object-super': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-optional-catch-binding': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-private-property-in-object': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-property-literals': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-regenerator': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-regexp-modifiers': 7.26.0(@babel/core@7.26.9)
+      '@babel/plugin-transform-reserved-words': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-shorthand-properties': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-spread': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-sticky-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-template-literals': 7.26.8(@babel/core@7.26.9)
+      '@babel/plugin-transform-typeof-symbol': 7.26.7(@babel/core@7.26.9)
+      '@babel/plugin-transform-unicode-escapes': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-unicode-property-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-unicode-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-unicode-sets-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.26.9)
+      babel-plugin-polyfill-corejs2: 0.4.12(@babel/core@7.26.9)
+      babel-plugin-polyfill-corejs3: 0.11.1(@babel/core@7.26.9)
+      babel-plugin-polyfill-regenerator: 0.6.3(@babel/core@7.26.9)
+      core-js-compat: 3.40.0
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/types': 7.26.9
+      esutils: 2.0.3
+
+  '@babel/preset-react@7.26.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-validator-option': 7.25.9
+      '@babel/plugin-transform-react-display-name': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-react-jsx': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-react-jsx-development': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-react-pure-annotations': 7.25.9(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/runtime-corejs3@7.26.9':
+    dependencies:
+      core-js-pure: 3.40.0
+      regenerator-runtime: 0.14.1
+
+  '@babel/runtime@7.26.9':
+    dependencies:
+      regenerator-runtime: 0.14.1
+
+  '@babel/runtime@7.28.3': {}
+
+  '@babel/template@7.26.9':
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/parser': 7.26.9
+      '@babel/types': 7.26.9
+
+  '@babel/traverse@7.26.9(supports-color@5.5.0)':
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/generator': 7.26.9
+      '@babel/parser': 7.26.9
+      '@babel/template': 7.26.9
+      '@babel/types': 7.26.9
+      debug: 4.4.0(supports-color@5.5.0)
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/types@7.26.9':
+    dependencies:
+      '@babel/helper-string-parser': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+
+  '@bcoe/v8-coverage@0.2.3': {}
+
+  '@cnakazawa/watch@1.0.4':
+    dependencies:
+      exec-sh: 0.3.6
+      minimist: 1.2.8
+
+  '@colors/colors@1.5.0':
+    optional: true
+
+  '@cspotcode/source-map-support@0.8.1':
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.9
+
+  '@cypress/listr-verbose-renderer@0.4.1':
+    dependencies:
+      chalk: 1.1.3
+      cli-cursor: 1.0.2
+      date-fns: 1.30.1
+      figures: 1.7.0
+
+  '@cypress/request@2.88.12':
+    dependencies:
+      aws-sign2: 0.7.0
+      aws4: 1.13.2
+      caseless: 0.12.0
+      combined-stream: 1.0.8
+      extend: 3.0.2
+      forever-agent: 0.6.1
+      form-data: 2.3.3
+      http-signature: 1.3.6
+      is-typedarray: 1.0.0
+      isstream: 0.1.2
+      json-stringify-safe: 5.0.1
+      mime-types: 2.1.35
+      performance-now: 2.1.0
+      qs: 6.10.4
+      safe-buffer: 5.2.1
+      tough-cookie: 4.1.4
+      tunnel-agent: 0.6.0
+      uuid: 8.3.2
+
+  '@cypress/xvfb@1.2.4(supports-color@7.2.0)':
+    dependencies:
+      debug: 3.2.7(supports-color@7.2.0)
+      lodash.once: 4.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@date-io/core@1.3.13': {}
+
+  '@date-io/date-fns@1.3.13(date-fns@2.30.0)':
+    dependencies:
+      '@date-io/core': 1.3.13
+      date-fns: 2.30.0
+
+  '@discoveryjs/json-ext@0.5.7': {}
+
+  '@emotion/babel-plugin@11.13.5':
+    dependencies:
+      '@babel/helper-module-imports': 7.25.9(supports-color@5.5.0)
+      '@babel/runtime': 7.28.3
+      '@emotion/hash': 0.9.2
+      '@emotion/memoize': 0.9.0
+      '@emotion/serialize': 1.3.3
+      babel-plugin-macros: 3.1.0
+      convert-source-map: 1.9.0
+      escape-string-regexp: 4.0.0
+      find-root: 1.1.0
+      source-map: 0.5.7
+      stylis: 4.2.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@emotion/cache@11.14.0':
+    dependencies:
+      '@emotion/memoize': 0.9.0
+      '@emotion/sheet': 1.4.0
+      '@emotion/utils': 1.4.2
+      '@emotion/weak-memoize': 0.4.0
+      stylis: 4.2.0
+
+  '@emotion/hash@0.9.2': {}
+
+  '@emotion/is-prop-valid@0.8.8':
+    dependencies:
+      '@emotion/memoize': 0.7.4
+
+  '@emotion/memoize@0.7.4': {}
+
+  '@emotion/memoize@0.9.0': {}
+
+  '@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.26.9
+      '@emotion/babel-plugin': 11.13.5
+      '@emotion/cache': 11.14.0
+      '@emotion/serialize': 1.3.3
+      '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@19.1.1)
+      '@emotion/utils': 1.4.2
+      '@emotion/weak-memoize': 0.4.0
+      hoist-non-react-statics: 3.3.2
+      react: 19.1.1
+    optionalDependencies:
+      '@types/react': 19.1.11
+    transitivePeerDependencies:
+      - supports-color
+
+  '@emotion/serialize@1.3.3':
+    dependencies:
+      '@emotion/hash': 0.9.2
+      '@emotion/memoize': 0.9.0
+      '@emotion/unitless': 0.10.0
+      '@emotion/utils': 1.4.2
+      csstype: 3.1.3
+
+  '@emotion/sheet@1.4.0': {}
+
+  '@emotion/unitless@0.10.0': {}
+
+  '@emotion/unitless@0.7.5': {}
+
+  '@emotion/use-insertion-effect-with-fallbacks@1.2.0(react@19.1.1)':
+    dependencies:
+      react: 19.1.1
+
+  '@emotion/utils@1.4.2': {}
+
+  '@emotion/weak-memoize@0.4.0': {}
+
+  '@esbuild-plugins/tsconfig-paths@0.0.4(esbuild@0.25.0)(typescript@4.9.5)':
+    dependencies:
+      debug: 4.4.0(supports-color@5.5.0)
+      esbuild: 0.25.0
+      find-up: 5.0.0
+      strip-json-comments: 3.1.1
+      typescript: 4.9.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@esbuild/aix-ppc64@0.25.0':
+    optional: true
+
+  '@esbuild/android-arm64@0.25.0':
+    optional: true
+
+  '@esbuild/android-arm@0.25.0':
+    optional: true
+
+  '@esbuild/android-x64@0.25.0':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.25.0':
+    optional: true
+
+  '@esbuild/darwin-x64@0.25.0':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.25.0':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.25.0':
+    optional: true
+
+  '@esbuild/linux-arm64@0.25.0':
+    optional: true
+
+  '@esbuild/linux-arm@0.25.0':
+    optional: true
+
+  '@esbuild/linux-ia32@0.25.0':
+    optional: true
+
+  '@esbuild/linux-loong64@0.25.0':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.25.0':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.25.0':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.25.0':
+    optional: true
+
+  '@esbuild/linux-s390x@0.25.0':
+    optional: true
+
+  '@esbuild/linux-x64@0.25.0':
+    optional: true
+
+  '@esbuild/netbsd-arm64@0.25.0':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.25.0':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.25.0':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.25.0':
+    optional: true
+
+  '@esbuild/sunos-x64@0.25.0':
+    optional: true
+
+  '@esbuild/win32-arm64@0.25.0':
+    optional: true
+
+  '@esbuild/win32-ia32@0.25.0':
+    optional: true
+
+  '@esbuild/win32-x64@0.25.0':
+    optional: true
+
+  '@eslint-community/eslint-utils@4.4.1(eslint@8.57.1)':
+    dependencies:
+      eslint: 8.57.1
+      eslint-visitor-keys: 3.4.3
+
+  '@eslint-community/regexpp@4.12.1': {}
+
+  '@eslint/eslintrc@2.1.4':
+    dependencies:
+      ajv: 6.12.6
+      debug: 4.4.0(supports-color@5.5.0)
+      espree: 9.6.1
+      globals: 13.24.0
+      ignore: 5.3.2
+      import-fresh: 3.3.1
+      js-yaml: 4.1.0
+      minimatch: 3.1.2
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/js@8.57.1': {}
+
+  '@floating-ui/core@1.7.3':
+    dependencies:
+      '@floating-ui/utils': 0.2.10
+
+  '@floating-ui/dom@1.7.4':
+    dependencies:
+      '@floating-ui/core': 1.7.3
+      '@floating-ui/utils': 0.2.10
+
+  '@floating-ui/utils@0.2.10': {}
+
+  '@gar/promisify@1.1.3': {}
+
+  '@graphql-typed-document-node/core@3.2.0(graphql@16.11.0)':
+    dependencies:
+      graphql: 16.11.0
+
+  '@humanwhocodes/config-array@0.13.0':
+    dependencies:
+      '@humanwhocodes/object-schema': 2.0.3
+      debug: 4.4.0(supports-color@5.5.0)
+      minimatch: 3.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@humanwhocodes/module-importer@1.0.1': {}
+
+  '@humanwhocodes/object-schema@2.0.3': {}
+
+  '@isaacs/cliui@8.0.2':
+    dependencies:
+      string-width: 5.1.2
+      string-width-cjs: string-width@4.2.3
+      strip-ansi: 7.1.0
+      strip-ansi-cjs: strip-ansi@6.0.1
+      wrap-ansi: 8.1.0
+      wrap-ansi-cjs: wrap-ansi@7.0.0
+
+  '@istanbuljs/load-nyc-config@1.1.0':
+    dependencies:
+      camelcase: 5.3.1
+      find-up: 4.1.0
+      get-package-type: 0.1.0
+      js-yaml: 3.14.1
+      resolve-from: 5.0.0
+
+  '@istanbuljs/schema@0.1.3': {}
+
+  '@jest/console@26.6.2':
+    dependencies:
+      '@jest/types': 26.6.2
+      '@types/node': 20.19.11
+      chalk: 4.1.2
+      jest-message-util: 26.6.2
+      jest-util: 26.6.2
+      slash: 3.0.0
+
+  '@jest/console@29.7.0':
+    dependencies:
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.11
+      chalk: 4.1.2
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+      slash: 3.0.0
+
+  '@jest/core@26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))':
+    dependencies:
+      '@jest/console': 26.6.2
+      '@jest/reporters': 26.6.2
+      '@jest/test-result': 26.6.2
+      '@jest/transform': 26.6.2
+      '@jest/types': 26.6.2
+      '@types/node': 20.19.11
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-changed-files: 26.6.2
+      jest-config: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-haste-map: 26.6.2
+      jest-message-util: 26.6.2
+      jest-regex-util: 26.0.0
+      jest-resolve: 26.6.2
+      jest-resolve-dependencies: 26.6.3
+      jest-runner: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-runtime: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-snapshot: 26.6.2
+      jest-util: 26.6.2
+      jest-validate: 26.6.2
+      jest-watcher: 26.6.2
+      micromatch: 4.0.8
+      p-each-series: 2.2.0
+      rimraf: 3.0.2
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+
+  '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5))':
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/reporters': 29.7.0(node-notifier@8.0.2)
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.11
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-changed-files: 29.7.0
+      jest-config: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5))
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-resolve-dependencies: 29.7.0
+      jest-runner: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      jest-watcher: 29.7.0
+      micromatch: 4.0.8
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    optionalDependencies:
+      node-notifier: 8.0.2
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))':
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/reporters': 29.7.0(node-notifier@8.0.2)
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.11
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-changed-files: 29.7.0
+      jest-config: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-resolve-dependencies: 29.7.0
+      jest-runner: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      jest-watcher: 29.7.0
+      micromatch: 4.0.8
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    optionalDependencies:
+      node-notifier: 8.0.2
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  '@jest/environment@26.6.2':
+    dependencies:
+      '@jest/fake-timers': 26.6.2
+      '@jest/types': 26.6.2
+      '@types/node': 20.19.11
+      jest-mock: 26.6.2
+
+  '@jest/environment@29.7.0':
+    dependencies:
+      '@jest/fake-timers': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.11
+      jest-mock: 29.7.0
+
+  '@jest/expect-utils@29.7.0':
+    dependencies:
+      jest-get-type: 29.6.3
+
+  '@jest/expect@29.7.0':
+    dependencies:
+      expect: 29.7.0
+      jest-snapshot: 29.7.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/fake-timers@26.6.2':
+    dependencies:
+      '@jest/types': 26.6.2
+      '@sinonjs/fake-timers': 6.0.1
+      '@types/node': 20.19.11
+      jest-message-util: 26.6.2
+      jest-mock: 26.6.2
+      jest-util: 26.6.2
+
+  '@jest/fake-timers@29.7.0':
+    dependencies:
+      '@jest/types': 29.6.3
+      '@sinonjs/fake-timers': 10.3.0
+      '@types/node': 20.19.11
+      jest-message-util: 29.7.0
+      jest-mock: 29.7.0
+      jest-util: 29.7.0
+
+  '@jest/globals@26.6.2':
+    dependencies:
+      '@jest/environment': 26.6.2
+      '@jest/types': 26.6.2
+      expect: 26.6.2
+
+  '@jest/globals@29.7.0':
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/expect': 29.7.0
+      '@jest/types': 29.6.3
+      jest-mock: 29.7.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/reporters@26.6.2':
+    dependencies:
+      '@bcoe/v8-coverage': 0.2.3
+      '@jest/console': 26.6.2
+      '@jest/test-result': 26.6.2
+      '@jest/transform': 26.6.2
+      '@jest/types': 26.6.2
+      chalk: 4.1.2
+      collect-v8-coverage: 1.0.2
+      exit: 0.1.2
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-instrument: 4.0.3
+      istanbul-lib-report: 3.0.1
+      istanbul-lib-source-maps: 4.0.1
+      istanbul-reports: 3.1.7
+      jest-haste-map: 26.6.2
+      jest-resolve: 26.6.2
+      jest-util: 26.6.2
+      jest-worker: 26.6.2
+      slash: 3.0.0
+      source-map: 0.6.1
+      string-length: 4.0.2
+      terminal-link: 2.1.1
+      v8-to-istanbul: 7.1.2
+    optionalDependencies:
+      node-notifier: 8.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/reporters@29.7.0(node-notifier@8.0.2)':
+    dependencies:
+      '@bcoe/v8-coverage': 0.2.3
+      '@jest/console': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@jridgewell/trace-mapping': 0.3.25
+      '@types/node': 20.19.11
+      chalk: 4.1.2
+      collect-v8-coverage: 1.0.2
+      exit: 0.1.2
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-instrument: 6.0.3
+      istanbul-lib-report: 3.0.1
+      istanbul-lib-source-maps: 4.0.1
+      istanbul-reports: 3.1.7
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+      jest-worker: 29.7.0
+      slash: 3.0.0
+      string-length: 4.0.2
+      strip-ansi: 6.0.1
+      v8-to-istanbul: 9.3.0
+    optionalDependencies:
+      node-notifier: 8.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/schemas@29.6.3':
+    dependencies:
+      '@sinclair/typebox': 0.27.8
+
+  '@jest/source-map@26.6.2':
+    dependencies:
+      callsites: 3.1.0
+      graceful-fs: 4.2.11
+      source-map: 0.6.1
+
+  '@jest/source-map@29.6.3':
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.25
+      callsites: 3.1.0
+      graceful-fs: 4.2.11
+
+  '@jest/test-result@26.6.2':
+    dependencies:
+      '@jest/console': 26.6.2
+      '@jest/types': 26.6.2
+      '@types/istanbul-lib-coverage': 2.0.6
+      collect-v8-coverage: 1.0.2
+
+  '@jest/test-result@29.7.0':
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/istanbul-lib-coverage': 2.0.6
+      collect-v8-coverage: 1.0.2
+
+  '@jest/test-sequencer@26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))':
+    dependencies:
+      '@jest/test-result': 26.6.2
+      graceful-fs: 4.2.11
+      jest-haste-map: 26.6.2
+      jest-runner: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-runtime: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+
+  '@jest/test-sequencer@29.7.0':
+    dependencies:
+      '@jest/test-result': 29.7.0
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      slash: 3.0.0
+
+  '@jest/transform@26.6.2':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@jest/types': 26.6.2
+      babel-plugin-istanbul: 6.1.1
+      chalk: 4.1.2
+      convert-source-map: 1.9.0
+      fast-json-stable-stringify: 2.1.0
+      graceful-fs: 4.2.11
+      jest-haste-map: 26.6.2
+      jest-regex-util: 26.0.0
+      jest-util: 26.6.2
+      micromatch: 4.0.8
+      pirates: 4.0.6
+      slash: 3.0.0
+      source-map: 0.6.1
+      write-file-atomic: 3.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/transform@29.7.0':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@jest/types': 29.6.3
+      '@jridgewell/trace-mapping': 0.3.25
+      babel-plugin-istanbul: 6.1.1
+      chalk: 4.1.2
+      convert-source-map: 2.0.0
+      fast-json-stable-stringify: 2.1.0
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-util: 29.7.0
+      micromatch: 4.0.8
+      pirates: 4.0.6
+      slash: 3.0.0
+      write-file-atomic: 4.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jest/types@26.6.2':
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.6
+      '@types/istanbul-reports': 3.0.4
+      '@types/node': 20.19.11
+      '@types/yargs': 15.0.19
+      chalk: 4.1.2
+
+  '@jest/types@29.6.3':
+    dependencies:
+      '@jest/schemas': 29.6.3
+      '@types/istanbul-lib-coverage': 2.0.6
+      '@types/istanbul-reports': 3.0.4
+      '@types/node': 20.19.11
+      '@types/yargs': 17.0.33
+      chalk: 4.1.2
+
+  '@josephg/resolvable@1.0.1': {}
+
+  '@jridgewell/gen-mapping@0.3.8':
+    dependencies:
+      '@jridgewell/set-array': 1.2.1
+      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@jridgewell/resolve-uri@3.1.2': {}
+
+  '@jridgewell/set-array@1.2.1': {}
+
+  '@jridgewell/source-map@0.3.6':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.8
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@jridgewell/sourcemap-codec@1.5.0': {}
+
+  '@jridgewell/trace-mapping@0.3.25':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.0
+
+  '@jridgewell/trace-mapping@0.3.9':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.0
+
+  '@leichtgewicht/ip-codec@2.0.5': {}
+
+  '@mapbox/node-pre-gyp@1.0.11':
+    dependencies:
+      detect-libc: 2.0.3
+      https-proxy-agent: 5.0.1
+      make-dir: 3.1.0
+      node-fetch: 2.7.0
+      nopt: 5.0.0
+      npmlog: 5.0.1
+      rimraf: 3.0.2
+      semver: 7.7.1
+      tar: 6.2.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  '@mui/core-downloads-tracker@7.3.1': {}
+
+  '@mui/icons-material@7.3.1(@mui/material@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(@types/react@19.1.11)(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.28.3
+      '@mui/material': 7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      react: 19.1.1
+    optionalDependencies:
+      '@types/react': 19.1.11
+
+  '@mui/lab@7.0.0-beta.16(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@mui/material@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.28.3
+      '@mui/material': 7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      '@mui/system': 7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react@19.1.1)
+      '@mui/types': 7.4.5(@types/react@19.1.11)
+      '@mui/utils': 7.3.1(@types/react@19.1.11)(react@19.1.1)
+      clsx: 2.1.1
+      prop-types: 15.8.1
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+    optionalDependencies:
+      '@emotion/react': 11.14.0(@types/react@19.1.11)(react@19.1.1)
+      '@types/react': 19.1.11
+
+  '@mui/material@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.28.3
+      '@mui/core-downloads-tracker': 7.3.1
+      '@mui/system': 7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react@19.1.1)
+      '@mui/types': 7.4.5(@types/react@19.1.11)
+      '@mui/utils': 7.3.1(@types/react@19.1.11)(react@19.1.1)
+      '@popperjs/core': 2.11.8
+      '@types/react-transition-group': 4.4.12(@types/react@19.1.11)
+      clsx: 2.1.1
+      csstype: 3.1.3
+      prop-types: 15.8.1
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+      react-is: 19.1.1
+      react-transition-group: 4.4.5(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+    optionalDependencies:
+      '@emotion/react': 11.14.0(@types/react@19.1.11)(react@19.1.1)
+      '@types/react': 19.1.11
+
+  '@mui/private-theming@7.3.1(@types/react@19.1.11)(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.28.3
+      '@mui/utils': 7.3.1(@types/react@19.1.11)(react@19.1.1)
+      prop-types: 15.8.1
+      react: 19.1.1
+    optionalDependencies:
+      '@types/react': 19.1.11
+
+  '@mui/styled-engine@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.28.3
+      '@emotion/cache': 11.14.0
+      '@emotion/serialize': 1.3.3
+      '@emotion/sheet': 1.4.0
+      csstype: 3.1.3
+      prop-types: 15.8.1
+      react: 19.1.1
+    optionalDependencies:
+      '@emotion/react': 11.14.0(@types/react@19.1.11)(react@19.1.1)
+
+  '@mui/system@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.28.3
+      '@mui/private-theming': 7.3.1(@types/react@19.1.11)(react@19.1.1)
+      '@mui/styled-engine': 7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(react@19.1.1)
+      '@mui/types': 7.4.5(@types/react@19.1.11)
+      '@mui/utils': 7.3.1(@types/react@19.1.11)(react@19.1.1)
+      clsx: 2.1.1
+      csstype: 3.1.3
+      prop-types: 15.8.1
+      react: 19.1.1
+    optionalDependencies:
+      '@emotion/react': 11.14.0(@types/react@19.1.11)(react@19.1.1)
+      '@types/react': 19.1.11
+
+  '@mui/types@7.4.5(@types/react@19.1.11)':
+    dependencies:
+      '@babel/runtime': 7.28.3
+    optionalDependencies:
+      '@types/react': 19.1.11
+
+  '@mui/utils@7.3.1(@types/react@19.1.11)(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.28.3
+      '@mui/types': 7.4.5(@types/react@19.1.11)
+      '@types/prop-types': 15.7.15
+      clsx: 2.1.1
+      prop-types: 15.8.1
+      react: 19.1.1
+      react-is: 19.1.1
+    optionalDependencies:
+      '@types/react': 19.1.11
+
+  '@mui/x-date-pickers@8.10.2(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@mui/material@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(@mui/system@7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(date-fns@2.30.0)(dayjs@1.11.13)(moment@2.30.1)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.28.3
+      '@mui/material': 7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      '@mui/system': 7.3.1(@emotion/react@11.14.0(@types/react@19.1.11)(react@19.1.1))(@types/react@19.1.11)(react@19.1.1)
+      '@mui/utils': 7.3.1(@types/react@19.1.11)(react@19.1.1)
+      '@mui/x-internals': 8.10.2(@types/react@19.1.11)(react@19.1.1)
+      '@types/react-transition-group': 4.4.12(@types/react@19.1.11)
+      clsx: 2.1.1
+      prop-types: 15.8.1
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+      react-transition-group: 4.4.5(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+    optionalDependencies:
+      '@emotion/react': 11.14.0(@types/react@19.1.11)(react@19.1.1)
+      date-fns: 2.30.0
+      dayjs: 1.11.13
+      moment: 2.30.1
+    transitivePeerDependencies:
+      - '@types/react'
+
+  '@mui/x-internals@8.10.2(@types/react@19.1.11)(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.28.3
+      '@mui/utils': 7.3.1(@types/react@19.1.11)(react@19.1.1)
+      react: 19.1.1
+      reselect: 5.1.1
+      use-sync-external-store: 1.5.0(react@19.1.1)
+    transitivePeerDependencies:
+      - '@types/react'
+
+  '@nodelib/fs.scandir@2.1.5':
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      run-parallel: 1.2.0
+
+  '@nodelib/fs.stat@2.0.5': {}
+
+  '@nodelib/fs.walk@1.2.8':
+    dependencies:
+      '@nodelib/fs.scandir': 2.1.5
+      fastq: 1.19.0
+
+  '@npmcli/fs@1.1.1':
+    dependencies:
+      '@gar/promisify': 1.1.3
+      semver: 7.7.1
+
+  '@npmcli/move-file@1.1.2':
+    dependencies:
+      mkdirp: 1.0.4
+      rimraf: 3.0.2
+
+  '@parcel/watcher-android-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher@2.5.1':
+    dependencies:
+      detect-libc: 1.0.3
+      is-glob: 4.0.3
+      micromatch: 4.0.8
+      node-addon-api: 7.1.1
+    optionalDependencies:
+      '@parcel/watcher-android-arm64': 2.5.1
+      '@parcel/watcher-darwin-arm64': 2.5.1
+      '@parcel/watcher-darwin-x64': 2.5.1
+      '@parcel/watcher-freebsd-x64': 2.5.1
+      '@parcel/watcher-linux-arm-glibc': 2.5.1
+      '@parcel/watcher-linux-arm-musl': 2.5.1
+      '@parcel/watcher-linux-arm64-glibc': 2.5.1
+      '@parcel/watcher-linux-arm64-musl': 2.5.1
+      '@parcel/watcher-linux-x64-glibc': 2.5.1
+      '@parcel/watcher-linux-x64-musl': 2.5.1
+      '@parcel/watcher-win32-arm64': 2.5.1
+      '@parcel/watcher-win32-ia32': 2.5.1
+      '@parcel/watcher-win32-x64': 2.5.1
+    optional: true
+
+  '@polka/url@1.0.0-next.28': {}
+
+  '@popperjs/core@2.11.8': {}
+
+  '@protobufjs/aspromise@1.1.2': {}
+
+  '@protobufjs/base64@1.1.2': {}
+
+  '@protobufjs/codegen@2.0.4': {}
+
+  '@protobufjs/eventemitter@1.1.0': {}
+
+  '@protobufjs/fetch@1.1.0':
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/inquire': 1.1.0
+
+  '@protobufjs/float@1.0.2': {}
+
+  '@protobufjs/inquire@1.1.0': {}
+
+  '@protobufjs/path@1.1.2': {}
+
+  '@protobufjs/pool@1.1.0': {}
+
+  '@protobufjs/utf8@1.1.0': {}
+
+  '@react-hook/latest@1.0.3(react@19.1.1)':
+    dependencies:
+      react: 19.1.1
+
+  '@react-hook/throttle@2.2.0(react@19.1.1)':
+    dependencies:
+      '@react-hook/latest': 1.0.3(react@19.1.1)
+      react: 19.1.1
+
+  '@reduxjs/toolkit@2.8.2(react-redux@9.2.0(@types/react@19.1.11)(react@19.1.1)(redux@5.0.1))(react@19.1.1)':
+    dependencies:
+      '@standard-schema/spec': 1.0.0
+      '@standard-schema/utils': 0.3.0
+      immer: 10.1.1
+      redux: 5.0.1
+      redux-thunk: 3.1.0(redux@5.0.1)
+      reselect: 5.1.1
+    optionalDependencies:
+      react: 19.1.1
+      react-redux: 9.2.0(@types/react@19.1.11)(react@19.1.1)(redux@5.0.1)
+
+  '@rollup/plugin-commonjs@15.1.0(rollup@2.79.2)':
+    dependencies:
+      '@rollup/pluginutils': 3.1.0(rollup@2.79.2)
+      commondir: 1.0.1
+      estree-walker: 2.0.2
+      glob: 7.2.3
+      is-reference: 1.2.1
+      magic-string: 0.25.9
+      resolve: 1.22.10
+      rollup: 2.79.2
+
+  '@rollup/plugin-node-resolve@8.4.0(rollup@2.79.2)':
+    dependencies:
+      '@rollup/pluginutils': 3.1.0(rollup@2.79.2)
+      '@types/resolve': 1.17.1
+      builtin-modules: 3.3.0
+      deep-freeze: 0.0.1
+      deepmerge: 4.3.1
+      is-module: 1.0.0
+      resolve: 1.22.10
+      rollup: 2.79.2
+
+  '@rollup/pluginutils@3.1.0(rollup@2.79.2)':
+    dependencies:
+      '@types/estree': 0.0.39
+      estree-walker: 1.0.1
+      picomatch: 2.3.1
+      rollup: 2.79.2
+
+  '@rooks/use-mutation-observer@4.11.2(react@19.1.1)':
+    dependencies:
+      react: 19.1.1
+
+  '@rtsao/scc@1.1.0': {}
+
+  '@samverschueren/stream-to-observable@0.3.1(rxjs@6.6.7)':
+    dependencies:
+      any-observable: 0.3.0(rxjs@6.6.7)
+    optionalDependencies:
+      rxjs: 6.6.7
+    transitivePeerDependencies:
+      - zenObservable
+
+  '@sinclair/typebox@0.27.8': {}
+
+  '@sinonjs/commons@1.8.6':
+    dependencies:
+      type-detect: 4.0.8
+
+  '@sinonjs/commons@3.0.1':
+    dependencies:
+      type-detect: 4.0.8
+
+  '@sinonjs/fake-timers@10.3.0':
+    dependencies:
+      '@sinonjs/commons': 3.0.1
+
+  '@sinonjs/fake-timers@6.0.1':
+    dependencies:
+      '@sinonjs/commons': 1.8.6
+
+  '@sinonjs/formatio@4.0.1':
+    dependencies:
+      '@sinonjs/commons': 1.8.6
+      '@sinonjs/samsam': 4.2.2
+
+  '@sinonjs/samsam@4.2.2':
+    dependencies:
+      '@sinonjs/commons': 1.8.6
+      lodash.get: 4.4.2
+      type-detect: 4.1.0
+
+  '@sinonjs/text-encoding@0.7.3': {}
+
+  '@standard-schema/spec@1.0.0': {}
+
+  '@standard-schema/utils@0.3.0': {}
+
+  '@stylistic/eslint-plugin-js@3.1.0(eslint@8.57.1)':
+    dependencies:
+      eslint: 8.57.1
+      eslint-visitor-keys: 4.2.0
+      espree: 10.3.0
+
+  '@teamsupercell/typings-for-css-modules-loader@2.5.2':
+    dependencies:
+      camelcase: 5.3.1
+      loader-utils: 1.4.2
+      schema-utils: 2.7.1
+    optionalDependencies:
+      prettier: 3.5.1
+
+  '@testing-library/dom@7.31.2':
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/runtime': 7.26.9
+      '@types/aria-query': 4.2.2
+      aria-query: 4.2.2
+      chalk: 4.1.2
+      dom-accessibility-api: 0.5.16
+      lz-string: 1.5.0
+      pretty-format: 26.6.2
+
+  '@testing-library/react@10.4.9(react-dom@19.1.1(react@19.1.1))(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.26.9
+      '@testing-library/dom': 7.31.2
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+
+  '@testing-library/react@16.3.0(@testing-library/dom@7.31.2)(@types/react-dom@19.0.4(@types/react@19.1.11))(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)':
+    dependencies:
+      '@babel/runtime': 7.26.9
+      '@testing-library/dom': 7.31.2
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+    optionalDependencies:
+      '@types/react': 19.1.11
+      '@types/react-dom': 19.0.4(@types/react@19.1.11)
+
+  '@tootallnate/once@1.1.2': {}
+
+  '@tootallnate/once@2.0.0': {}
+
+  '@tsconfig/node10@1.0.11': {}
+
+  '@tsconfig/node12@1.0.11': {}
+
+  '@tsconfig/node14@1.0.3': {}
+
+  '@tsconfig/node16@1.0.4': {}
+
+  '@types/accepts@1.3.7':
+    dependencies:
+      '@types/node': 20.19.11
+
+  '@types/aria-query@4.2.2': {}
+
+  '@types/babel__core@7.20.5':
+    dependencies:
+      '@babel/parser': 7.26.9
+      '@babel/types': 7.26.9
+      '@types/babel__generator': 7.6.8
+      '@types/babel__template': 7.4.4
+      '@types/babel__traverse': 7.20.6
+
+  '@types/babel__generator@7.6.8':
+    dependencies:
+      '@babel/types': 7.26.9
+
+  '@types/babel__template@7.4.4':
+    dependencies:
+      '@babel/parser': 7.26.9
+      '@babel/types': 7.26.9
+
+  '@types/babel__traverse@7.20.6':
+    dependencies:
+      '@babel/types': 7.26.9
+
+  '@types/body-parser@1.19.0':
+    dependencies:
+      '@types/connect': 3.4.38
+      '@types/node': 20.19.11
+
+  '@types/body-parser@1.19.5':
+    dependencies:
+      '@types/connect': 3.4.38
+      '@types/node': 20.19.11
+
+  '@types/bonjour@3.5.13':
+    dependencies:
+      '@types/node': 20.19.11
+
+  '@types/codemirror@0.0.99':
+    dependencies:
+      '@types/tern': 0.23.9
+
+  '@types/connect-history-api-fallback@1.5.4':
+    dependencies:
+      '@types/express-serve-static-core': 5.0.6
+      '@types/node': 20.19.11
+
+  '@types/connect@3.4.38':
+    dependencies:
+      '@types/node': 20.19.11
+
+  '@types/content-disposition@0.5.8': {}
+
+  '@types/cookies@0.9.0':
+    dependencies:
+      '@types/connect': 3.4.38
+      '@types/express': 4.17.21
+      '@types/keygrip': 1.0.6
+      '@types/node': 20.19.11
+
+  '@types/cors@2.8.10': {}
+
+  '@types/d3-array@3.2.1': {}
+
+  '@types/d3-color@3.1.3': {}
+
+  '@types/d3-ease@3.0.2': {}
+
+  '@types/d3-interpolate@3.0.4':
+    dependencies:
+      '@types/d3-color': 3.1.3
+
+  '@types/d3-path@1.0.11': {}
+
+  '@types/d3-scale@4.0.9':
+    dependencies:
+      '@types/d3-time': 3.0.4
+
+  '@types/d3-shape@3.1.7':
+    dependencies:
+      '@types/d3-path': 1.0.11
+
+  '@types/d3-time@3.0.4': {}
+
+  '@types/d3-timer@3.0.2': {}
+
+  '@types/debug@4.1.12':
+    dependencies:
+      '@types/ms': 2.1.0
+
+  '@types/eslint-scope@3.7.7':
+    dependencies:
+      '@types/eslint': 9.6.1
+      '@types/estree': 1.0.6
+
+  '@types/eslint@8.56.12':
+    dependencies:
+      '@types/estree': 1.0.6
+      '@types/json-schema': 7.0.15
+
+  '@types/eslint@9.6.1':
+    dependencies:
+      '@types/estree': 1.0.6
+      '@types/json-schema': 7.0.15
+
+  '@types/estree@0.0.39': {}
+
+  '@types/estree@1.0.6': {}
+
+  '@types/express-serve-static-core@4.19.6':
+    dependencies:
+      '@types/node': 20.19.11
+      '@types/qs': 6.9.18
+      '@types/range-parser': 1.2.7
+      '@types/send': 0.17.4
+
+  '@types/express-serve-static-core@5.0.6':
+    dependencies:
+      '@types/node': 20.19.11
+      '@types/qs': 6.9.18
+      '@types/range-parser': 1.2.7
+      '@types/send': 0.17.4
+
+  '@types/express@4.17.21':
+    dependencies:
+      '@types/body-parser': 1.19.5
+      '@types/express-serve-static-core': 4.19.6
+      '@types/qs': 6.9.18
+      '@types/serve-static': 1.15.7
+
+  '@types/fs-capacitor@2.0.0':
+    dependencies:
+      '@types/node': 20.19.11
+
+  '@types/graceful-fs@4.1.9':
+    dependencies:
+      '@types/node': 20.19.11
+
+  '@types/hoist-non-react-statics@3.3.6':
+    dependencies:
+      '@types/react': 19.1.11
+      hoist-non-react-statics: 3.3.2
+
+  '@types/html-minifier-terser@6.1.0': {}
+
+  '@types/http-assert@1.5.6': {}
+
+  '@types/http-errors@2.0.4': {}
+
+  '@types/http-proxy@1.17.16':
+    dependencies:
+      '@types/node': 20.19.11
+
+  '@types/istanbul-lib-coverage@2.0.6': {}
+
+  '@types/istanbul-lib-report@3.0.3':
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.6
+
+  '@types/istanbul-reports@3.0.4':
+    dependencies:
+      '@types/istanbul-lib-report': 3.0.3
+
+  '@types/jest@26.0.24':
+    dependencies:
+      jest-diff: 26.6.2
+      pretty-format: 26.6.2
+
+  '@types/jest@29.5.14':
+    dependencies:
+      expect: 29.7.0
+      pretty-format: 29.7.0
+
+  '@types/js-cookie@3.0.6': {}
+
+  '@types/jsdom@20.0.1':
+    dependencies:
+      '@types/node': 20.19.11
+      '@types/tough-cookie': 4.0.5
+      parse5: 7.2.1
+
+  '@types/json-schema@7.0.15': {}
+
+  '@types/json5@0.0.29': {}
+
+  '@types/keygrip@1.0.6': {}
+
+  '@types/koa-compose@3.2.8':
+    dependencies:
+      '@types/koa': 2.15.0
+
+  '@types/koa@2.15.0':
+    dependencies:
+      '@types/accepts': 1.3.7
+      '@types/content-disposition': 0.5.8
+      '@types/cookies': 0.9.0
+      '@types/http-assert': 1.5.6
+      '@types/http-errors': 2.0.4
+      '@types/keygrip': 1.0.6
+      '@types/koa-compose': 3.2.8
+      '@types/node': 20.19.11
+
+  '@types/loadable__component@5.13.9':
+    dependencies:
+      '@types/react': 19.1.11
+
+  '@types/long@4.0.2': {}
+
+  '@types/mime@1.3.5': {}
+
+  '@types/ms@2.1.0': {}
+
+  '@types/nanoid@3.0.0':
+    dependencies:
+      nanoid: 3.3.8
+
+  '@types/node-forge@1.3.11':
+    dependencies:
+      '@types/node': 20.19.11
+
+  '@types/node@10.17.60': {}
+
+  '@types/node@12.12.50': {}
+
+  '@types/node@20.19.11':
+    dependencies:
+      undici-types: 6.21.0
+
+  '@types/normalize-package-data@2.4.4': {}
+
+  '@types/parse-json@4.0.2': {}
+
+  '@types/prettier@2.7.3': {}
+
+  '@types/prop-types@15.7.15': {}
+
+  '@types/qs@6.9.18': {}
+
+  '@types/randomcolor@0.5.9': {}
+
+  '@types/range-parser@1.2.7': {}
+
+  '@types/react-beautiful-dnd@13.1.8':
+    dependencies:
+      '@types/react': 19.1.11
+
+  '@types/react-copy-to-clipboard@5.0.7':
+    dependencies:
+      '@types/react': 19.1.11
+
+  '@types/react-dom@19.0.4(@types/react@19.1.11)':
+    dependencies:
+      '@types/react': 19.1.11
+    optional: true
+
+  '@types/react-input-autosize@2.2.4':
+    dependencies:
+      '@types/react': 19.1.11
+
+  '@types/react-redux@7.1.34':
+    dependencies:
+      '@types/hoist-non-react-statics': 3.3.6
+      '@types/react': 19.1.11
+      hoist-non-react-statics: 3.3.2
+      redux: 4.2.1
+
+  '@types/react-transition-group@4.4.12(@types/react@19.1.11)':
+    dependencies:
+      '@types/react': 19.1.11
+
+  '@types/react@19.1.11':
+    dependencies:
+      csstype: 3.1.3
+
+  '@types/reactour@1.18.5':
+    dependencies:
+      '@types/react': 19.1.11
+
+  '@types/redux-testkit@1.0.8':
+    dependencies:
+      redux: 5.0.1
+      redux-thunk: 3.1.0(redux@5.0.1)
+
+  '@types/resolve@1.17.1':
+    dependencies:
+      '@types/node': 20.19.11
+
+  '@types/retry@0.12.0': {}
+
+  '@types/semver@7.5.8': {}
+
+  '@types/send@0.17.4':
+    dependencies:
+      '@types/mime': 1.3.5
+      '@types/node': 20.19.11
+
+  '@types/serve-index@1.9.4':
+    dependencies:
+      '@types/express': 4.17.21
+
+  '@types/serve-static@1.15.7':
+    dependencies:
+      '@types/http-errors': 2.0.4
+      '@types/node': 20.19.11
+      '@types/send': 0.17.4
+
+  '@types/sinon@7.5.2': {}
+
+  '@types/sinonjs__fake-timers@6.0.4': {}
+
+  '@types/sizzle@2.3.9': {}
+
+  '@types/sockjs@0.3.36':
+    dependencies:
+      '@types/node': 20.19.11
+
+  '@types/stack-utils@2.0.3': {}
+
+  '@types/tern@0.23.9':
+    dependencies:
+      '@types/estree': 1.0.6
+
+  '@types/tough-cookie@4.0.5': {}
+
+  '@types/use-sync-external-store@0.0.6': {}
+
+  '@types/validator@13.12.2': {}
+
+  '@types/ws@7.4.7':
+    dependencies:
+      '@types/node': 20.19.11
+
+  '@types/ws@8.5.14':
+    dependencies:
+      '@types/node': 20.19.11
+
+  '@types/yargs-parser@21.0.3': {}
+
+  '@types/yargs@15.0.19':
+    dependencies:
+      '@types/yargs-parser': 21.0.3
+
+  '@types/yargs@17.0.33':
+    dependencies:
+      '@types/yargs-parser': 21.0.3
+
+  '@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)(typescript@4.9.5)':
+    dependencies:
+      '@eslint-community/regexpp': 4.12.1
+      '@typescript-eslint/parser': 5.62.0(eslint@8.57.1)(typescript@4.9.5)
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/type-utils': 5.62.0(eslint@8.57.1)(typescript@4.9.5)
+      '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@4.9.5)
+      debug: 4.4.0(supports-color@5.5.0)
+      eslint: 8.57.1
+      graphemer: 1.4.0
+      ignore: 5.3.2
+      natural-compare-lite: 1.4.0
+      semver: 7.7.1
+      tsutils: 3.21.0(typescript@4.9.5)
+    optionalDependencies:
+      typescript: 4.9.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5)
+      debug: 4.4.0(supports-color@5.5.0)
+      eslint: 8.57.1
+    optionalDependencies:
+      typescript: 4.9.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.7.3)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 6.21.0
+      '@typescript-eslint/types': 6.21.0
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.7.3)
+      '@typescript-eslint/visitor-keys': 6.21.0
+      debug: 4.4.0(supports-color@5.5.0)
+      eslint: 8.57.1
+    optionalDependencies:
+      typescript: 5.7.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/scope-manager@5.62.0':
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/visitor-keys': 5.62.0
+
+  '@typescript-eslint/scope-manager@6.21.0':
+    dependencies:
+      '@typescript-eslint/types': 6.21.0
+      '@typescript-eslint/visitor-keys': 6.21.0
+
+  '@typescript-eslint/type-utils@5.62.0(eslint@8.57.1)(typescript@4.9.5)':
+    dependencies:
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5)
+      '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@4.9.5)
+      debug: 4.4.0(supports-color@5.5.0)
+      eslint: 8.57.1
+      tsutils: 3.21.0(typescript@4.9.5)
+    optionalDependencies:
+      typescript: 4.9.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/types@5.62.0': {}
+
+  '@typescript-eslint/types@6.21.0': {}
+
+  '@typescript-eslint/typescript-estree@5.62.0(typescript@4.9.5)':
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/visitor-keys': 5.62.0
+      debug: 4.4.0(supports-color@5.5.0)
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.7.1
+      tsutils: 3.21.0(typescript@4.9.5)
+    optionalDependencies:
+      typescript: 4.9.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/typescript-estree@6.21.0(typescript@5.7.3)':
+    dependencies:
+      '@typescript-eslint/types': 6.21.0
+      '@typescript-eslint/visitor-keys': 6.21.0
+      debug: 4.4.0(supports-color@5.5.0)
+      globby: 11.1.0
+      is-glob: 4.0.3
+      minimatch: 9.0.3
+      semver: 7.7.1
+      ts-api-utils: 1.4.3(typescript@5.7.3)
+    optionalDependencies:
+      typescript: 5.7.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/utils@5.62.0(eslint@8.57.1)(typescript@4.9.5)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1)
+      '@types/json-schema': 7.0.15
+      '@types/semver': 7.5.8
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5)
+      eslint: 8.57.1
+      eslint-scope: 5.1.1
+      semver: 7.7.1
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  '@typescript-eslint/visitor-keys@5.62.0':
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      eslint-visitor-keys: 3.4.3
+
+  '@typescript-eslint/visitor-keys@6.21.0':
+    dependencies:
+      '@typescript-eslint/types': 6.21.0
+      eslint-visitor-keys: 3.4.3
+
+  '@uidotdev/usehooks@2.4.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1)':
+    dependencies:
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+
+  '@ungap/structured-clone@1.3.0': {}
+
+  '@webassemblyjs/ast@1.14.1':
+    dependencies:
+      '@webassemblyjs/helper-numbers': 1.13.2
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+
+  '@webassemblyjs/floating-point-hex-parser@1.13.2': {}
+
+  '@webassemblyjs/helper-api-error@1.13.2': {}
+
+  '@webassemblyjs/helper-buffer@1.14.1': {}
+
+  '@webassemblyjs/helper-numbers@1.13.2':
+    dependencies:
+      '@webassemblyjs/floating-point-hex-parser': 1.13.2
+      '@webassemblyjs/helper-api-error': 1.13.2
+      '@xtuc/long': 4.2.2
+
+  '@webassemblyjs/helper-wasm-bytecode@1.13.2': {}
+
+  '@webassemblyjs/helper-wasm-section@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-buffer': 1.14.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/wasm-gen': 1.14.1
+
+  '@webassemblyjs/ieee754@1.13.2':
+    dependencies:
+      '@xtuc/ieee754': 1.2.0
+
+  '@webassemblyjs/leb128@1.13.2':
+    dependencies:
+      '@xtuc/long': 4.2.2
+
+  '@webassemblyjs/utf8@1.13.2': {}
+
+  '@webassemblyjs/wasm-edit@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-buffer': 1.14.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/helper-wasm-section': 1.14.1
+      '@webassemblyjs/wasm-gen': 1.14.1
+      '@webassemblyjs/wasm-opt': 1.14.1
+      '@webassemblyjs/wasm-parser': 1.14.1
+      '@webassemblyjs/wast-printer': 1.14.1
+
+  '@webassemblyjs/wasm-gen@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/ieee754': 1.13.2
+      '@webassemblyjs/leb128': 1.13.2
+      '@webassemblyjs/utf8': 1.13.2
+
+  '@webassemblyjs/wasm-opt@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-buffer': 1.14.1
+      '@webassemblyjs/wasm-gen': 1.14.1
+      '@webassemblyjs/wasm-parser': 1.14.1
+
+  '@webassemblyjs/wasm-parser@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-api-error': 1.13.2
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/ieee754': 1.13.2
+      '@webassemblyjs/leb128': 1.13.2
+      '@webassemblyjs/utf8': 1.13.2
+
+  '@webassemblyjs/wast-printer@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@xtuc/long': 4.2.2
+
+  '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0))(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))':
+    dependencies:
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0)
+
+  '@webpack-cli/info@2.0.2(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0))(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))':
+    dependencies:
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0)
+
+  '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0))(webpack-dev-server@4.15.2(webpack-cli@5.1.4)(webpack@5.98.0))(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))':
+    dependencies:
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0)
+    optionalDependencies:
+      webpack-dev-server: 4.15.2(webpack-cli@5.1.4)(webpack@5.98.0)
+
+  '@wry/caches@1.0.1':
+    dependencies:
+      tslib: 2.8.1
+
+  '@wry/context@0.7.4':
+    dependencies:
+      tslib: 2.8.1
+
+  '@wry/equality@0.1.11':
+    dependencies:
+      tslib: 1.14.1
+
+  '@wry/equality@0.5.7':
+    dependencies:
+      tslib: 2.8.1
+
+  '@wry/trie@0.5.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@xtuc/ieee754@1.2.0': {}
+
+  '@xtuc/long@4.2.2': {}
+
+  abab@2.0.6: {}
+
+  abbrev@1.1.1: {}
+
+  abort-controller@3.0.0:
+    dependencies:
+      event-target-shim: 5.0.1
+
+  accepts@1.3.8:
+    dependencies:
+      mime-types: 2.1.35
+      negotiator: 0.6.3
+
+  acorn-globals@4.3.4:
+    dependencies:
+      acorn: 6.4.2
+      acorn-walk: 6.2.0
+
+  acorn-globals@6.0.0:
+    dependencies:
+      acorn: 7.4.1
+      acorn-walk: 7.2.0
+
+  acorn-globals@7.0.1:
+    dependencies:
+      acorn: 8.14.0
+      acorn-walk: 8.3.4
+
+  acorn-jsx@5.3.2(acorn@8.14.0):
+    dependencies:
+      acorn: 8.14.0
+
+  acorn-walk@6.2.0: {}
+
+  acorn-walk@7.2.0: {}
+
+  acorn-walk@8.3.4:
+    dependencies:
+      acorn: 8.14.0
+
+  acorn@6.4.2: {}
+
+  acorn@7.4.1: {}
+
+  acorn@8.14.0: {}
+
+  agent-base@6.0.2:
+    dependencies:
+      debug: 4.4.0(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  aggregate-error@3.1.0:
+    dependencies:
+      clean-stack: 2.2.0
+      indent-string: 4.0.0
+
+  ajv-errors@1.0.1(ajv@6.12.6):
+    dependencies:
+      ajv: 6.12.6
+
+  ajv-formats@2.1.1(ajv@8.17.1):
+    optionalDependencies:
+      ajv: 8.17.1
+
+  ajv-keywords@3.5.2(ajv@6.12.6):
+    dependencies:
+      ajv: 6.12.6
+
+  ajv-keywords@5.1.0(ajv@8.17.1):
+    dependencies:
+      ajv: 8.17.1
+      fast-deep-equal: 3.1.3
+
+  ajv@6.12.6:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-json-stable-stringify: 2.1.0
+      json-schema-traverse: 0.4.1
+      uri-js: 4.4.1
+
+  ajv@8.17.1:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-uri: 3.0.6
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+
+  ansi-colors@4.1.3: {}
+
+  ansi-escapes@3.2.0: {}
+
+  ansi-escapes@4.3.2:
+    dependencies:
+      type-fest: 0.21.3
+
+  ansi-html-community@0.0.8: {}
+
+  ansi-regex@2.1.1: {}
+
+  ansi-regex@3.0.1: {}
+
+  ansi-regex@4.1.1: {}
+
+  ansi-regex@5.0.1: {}
+
+  ansi-regex@6.1.0: {}
+
+  ansi-styles@2.2.1: {}
+
+  ansi-styles@3.2.1:
+    dependencies:
+      color-convert: 1.9.3
+
+  ansi-styles@4.3.0:
+    dependencies:
+      color-convert: 2.0.1
+
+  ansi-styles@5.2.0: {}
+
+  ansi-styles@6.2.1: {}
+
+  any-observable@0.3.0(rxjs@6.6.7):
+    optionalDependencies:
+      rxjs: 6.6.7
+
+  anymatch@2.0.0:
+    dependencies:
+      micromatch: 3.1.10
+      normalize-path: 2.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  anymatch@3.1.3:
+    dependencies:
+      normalize-path: 3.0.0
+      picomatch: 2.3.1
+
+  apollo-cache-control@0.15.0(graphql@16.11.0):
+    dependencies:
+      apollo-server-env: 3.2.0
+      apollo-server-plugin-base: 0.14.0(graphql@16.11.0)
+      graphql: 16.11.0
+    transitivePeerDependencies:
+      - encoding
+
+  apollo-datasource@0.10.0:
+    dependencies:
+      apollo-server-caching: 0.7.0
+      apollo-server-env: 3.2.0
+    transitivePeerDependencies:
+      - encoding
+
+  apollo-graphql@0.9.7(graphql@16.11.0):
+    dependencies:
+      core-js-pure: 3.40.0
+      graphql: 16.11.0
+      lodash.sortby: 4.7.0
+      sha.js: 2.4.11
+
+  apollo-link@1.2.14(graphql@16.11.0):
+    dependencies:
+      apollo-utilities: 1.3.4(graphql@16.11.0)
+      graphql: 16.11.0
+      ts-invariant: 0.4.4
+      tslib: 1.14.1
+      zen-observable-ts: 0.8.21
+
+  apollo-reporting-protobuf@0.8.0:
+    dependencies:
+      '@apollo/protobufjs': 1.2.2
+
+  apollo-server-caching@0.7.0:
+    dependencies:
+      lru-cache: 6.0.0
+
+  apollo-server-core@2.26.2(graphql@16.11.0):
+    dependencies:
+      '@apollographql/apollo-tools': 0.5.4(graphql@16.11.0)
+      '@apollographql/graphql-playground-html': 1.6.27
+      '@apollographql/graphql-upload-8-fork': 8.1.4(graphql@16.11.0)
+      '@josephg/resolvable': 1.0.1
+      '@types/ws': 7.4.7
+      apollo-cache-control: 0.15.0(graphql@16.11.0)
+      apollo-datasource: 0.10.0
+      apollo-graphql: 0.9.7(graphql@16.11.0)
+      apollo-reporting-protobuf: 0.8.0
+      apollo-server-caching: 0.7.0
+      apollo-server-env: 3.2.0
+      apollo-server-errors: 2.5.0(graphql@16.11.0)
+      apollo-server-plugin-base: 0.14.0(graphql@16.11.0)
+      apollo-server-types: 0.10.0(graphql@16.11.0)
+      apollo-tracing: 0.16.0(graphql@16.11.0)
+      async-retry: 1.3.3
+      fast-json-stable-stringify: 2.1.0
+      graphql: 16.11.0
+      graphql-extensions: 0.16.0(graphql@16.11.0)
+      graphql-tag: 2.12.6(graphql@16.11.0)
+      graphql-tools: 4.0.8(graphql@16.11.0)
+      loglevel: 1.9.2
+      lru-cache: 6.0.0
+      sha.js: 2.4.11
+      subscriptions-transport-ws: 0.9.19(graphql@16.11.0)
+      uuid: 8.3.2
+    transitivePeerDependencies:
+      - bufferutil
+      - encoding
+      - utf-8-validate
+
+  apollo-server-env@3.2.0:
+    dependencies:
+      node-fetch: 2.7.0
+      util.promisify: 1.1.3
+    transitivePeerDependencies:
+      - encoding
+
+  apollo-server-errors@2.5.0(graphql@16.11.0):
+    dependencies:
+      graphql: 16.11.0
+
+  apollo-server-express@2.26.2(graphql@16.11.0):
+    dependencies:
+      '@apollographql/graphql-playground-html': 1.6.27
+      '@types/accepts': 1.3.7
+      '@types/body-parser': 1.19.0
+      '@types/cors': 2.8.10
+      '@types/express': 4.17.21
+      '@types/express-serve-static-core': 4.19.6
+      accepts: 1.3.8
+      apollo-server-core: 2.26.2(graphql@16.11.0)
+      apollo-server-types: 0.10.0(graphql@16.11.0)
+      body-parser: 1.20.3
+      cors: 2.8.5
+      express: 4.21.2
+      graphql: 16.11.0
+      graphql-subscriptions: 1.2.1(graphql@16.11.0)
+      graphql-tools: 4.0.8(graphql@16.11.0)
+      parseurl: 1.3.3
+      subscriptions-transport-ws: 0.9.19(graphql@16.11.0)
+      type-is: 1.6.18
+    transitivePeerDependencies:
+      - bufferutil
+      - encoding
+      - supports-color
+      - utf-8-validate
+
+  apollo-server-plugin-base@0.14.0(graphql@16.11.0):
+    dependencies:
+      apollo-server-types: 0.10.0(graphql@16.11.0)
+      graphql: 16.11.0
+    transitivePeerDependencies:
+      - encoding
+
+  apollo-server-types@0.10.0(graphql@16.11.0):
+    dependencies:
+      apollo-reporting-protobuf: 0.8.0
+      apollo-server-caching: 0.7.0
+      apollo-server-env: 3.2.0
+      graphql: 16.11.0
+    transitivePeerDependencies:
+      - encoding
+
+  apollo-tracing@0.16.0(graphql@16.11.0):
+    dependencies:
+      apollo-server-env: 3.2.0
+      apollo-server-plugin-base: 0.14.0(graphql@16.11.0)
+      graphql: 16.11.0
+    transitivePeerDependencies:
+      - encoding
+
+  apollo-utilities@1.3.4(graphql@16.11.0):
+    dependencies:
+      '@wry/equality': 0.1.11
+      fast-json-stable-stringify: 2.1.0
+      graphql: 16.11.0
+      ts-invariant: 0.4.4
+      tslib: 1.14.1
+
+  aproba@2.0.0: {}
+
+  arch@2.2.0: {}
+
+  are-passive-events-supported@1.1.1: {}
+
+  are-we-there-yet@2.0.0:
+    dependencies:
+      delegates: 1.0.0
+      readable-stream: 3.6.2
+
+  arg@4.1.3: {}
+
+  argparse@1.0.10:
+    dependencies:
+      sprintf-js: 1.0.3
+
+  argparse@2.0.1: {}
+
+  aria-query@4.2.2:
+    dependencies:
+      '@babel/runtime': 7.28.3
+      '@babel/runtime-corejs3': 7.26.9
+
+  aria-query@5.3.2: {}
+
+  arr-diff@4.0.0: {}
+
+  arr-flatten@1.1.0: {}
+
+  arr-union@3.1.0: {}
+
+  array-buffer-byte-length@1.0.2:
+    dependencies:
+      call-bound: 1.0.3
+      is-array-buffer: 3.0.5
+
+  array-each@1.0.1: {}
+
+  array-equal@1.0.2: {}
+
+  array-flatten@1.1.1: {}
+
+  array-includes@3.1.8:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.2.7
+      is-string: 1.1.1
+
+  array-slice@1.1.0: {}
+
+  array-union@2.1.0: {}
+
+  array-unique@0.3.2: {}
+
+  array.prototype.findlast@1.2.5:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.findlastindex@1.2.5:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.flat@1.3.3:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.flatmap@1.3.3:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.reduce@1.0.7:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-array-method-boxes-properly: 1.0.0
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      is-string: 1.1.1
+
+  array.prototype.tosorted@1.1.4:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-errors: 1.3.0
+      es-shim-unscopables: 1.1.0
+
+  arraybuffer.prototype.slice@1.0.4:
+    dependencies:
+      array-buffer-byte-length: 1.0.2
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.7
+      is-array-buffer: 3.0.5
+
+  arrify@2.0.1: {}
+
+  asap@2.0.6: {}
+
+  asn1@0.2.6:
+    dependencies:
+      safer-buffer: 2.1.2
+
+  assert-plus@1.0.0: {}
+
+  assign-symbols@1.0.0: {}
+
+  ast-types-flow@0.0.8: {}
+
+  astring@1.9.0: {}
+
+  async-array-reduce@0.2.1: {}
+
+  async-function@1.0.0: {}
+
+  async-limiter@1.0.1: {}
+
+  async-retry@1.3.3:
+    dependencies:
+      retry: 0.13.1
+
+  async@1.5.2: {}
+
+  async@2.6.4:
+    dependencies:
+      lodash: 4.17.21
+
+  async@3.2.6: {}
+
+  asynckit@0.4.0: {}
+
+  at-least-node@1.0.0: {}
+
+  atob@2.1.2: {}
+
+  autoprefixer@6.7.2:
+    dependencies:
+      browserslist: 1.7.7
+      caniuse-db: 1.0.30001700
+      normalize-range: 0.1.2
+      num2fraction: 1.2.2
+      postcss: 5.2.18
+      postcss-value-parser: 3.3.1
+
+  available-typed-arrays@1.0.7:
+    dependencies:
+      possible-typed-array-names: 1.1.0
+
+  aws-sign2@0.7.0: {}
+
+  aws4@1.13.2: {}
+
+  axe-core@4.10.2: {}
+
+  axobject-query@4.1.0: {}
+
+  babel-eslint@10.1.0(eslint@8.57.1):
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/parser': 7.26.9
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+      '@babel/types': 7.26.9
+      eslint: 8.57.1
+      eslint-visitor-keys: 1.3.0
+      resolve: 1.22.10
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-jest@26.6.3(@babel/core@7.26.9):
+    dependencies:
+      '@babel/core': 7.26.9
+      '@jest/transform': 26.6.2
+      '@jest/types': 26.6.2
+      '@types/babel__core': 7.20.5
+      babel-plugin-istanbul: 6.1.1
+      babel-preset-jest: 26.6.2(@babel/core@7.26.9)
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      slash: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-jest@29.7.0(@babel/core@7.26.9):
+    dependencies:
+      '@babel/core': 7.26.9
+      '@jest/transform': 29.7.0
+      '@types/babel__core': 7.20.5
+      babel-plugin-istanbul: 6.1.1
+      babel-preset-jest: 29.6.3(@babel/core@7.26.9)
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      slash: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-loader@8.4.1(@babel/core@7.26.9)(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      '@babel/core': 7.26.9
+      find-cache-dir: 3.3.2
+      loader-utils: 2.0.4
+      make-dir: 3.1.0
+      schema-utils: 2.7.1
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+
+  babel-plugin-istanbul@6.1.1:
+    dependencies:
+      '@babel/helper-plugin-utils': 7.26.5
+      '@istanbuljs/load-nyc-config': 1.1.0
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-instrument: 5.2.1
+      test-exclude: 6.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-jest-hoist@26.6.2:
+    dependencies:
+      '@babel/template': 7.26.9
+      '@babel/types': 7.26.9
+      '@types/babel__core': 7.20.5
+      '@types/babel__traverse': 7.20.6
+
+  babel-plugin-jest-hoist@29.6.3:
+    dependencies:
+      '@babel/template': 7.26.9
+      '@babel/types': 7.26.9
+      '@types/babel__core': 7.20.5
+      '@types/babel__traverse': 7.20.6
+
+  babel-plugin-macros@3.1.0:
+    dependencies:
+      '@babel/runtime': 7.28.3
+      cosmiconfig: 7.1.0
+      resolve: 1.22.10
+
+  babel-plugin-polyfill-corejs2@0.4.12(@babel/core@7.26.9):
+    dependencies:
+      '@babel/compat-data': 7.26.8
+      '@babel/core': 7.26.9
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.9)
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.26.9):
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.9)
+      core-js-compat: 3.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-corejs3@0.11.1(@babel/core@7.26.9):
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.9)
+      core-js-compat: 3.40.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-regenerator@0.6.3(@babel/core@7.26.9):
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-styled-components@2.1.4(@babel/core@7.26.9)(styled-components@4.4.1(@babel/core@7.26.9)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(supports-color@5.5.0):
+    dependencies:
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-module-imports': 7.25.9(supports-color@5.5.0)
+      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.9)
+      lodash: 4.17.21
+      picomatch: 2.3.1
+      styled-components: 4.4.1(@babel/core@7.26.9)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+    transitivePeerDependencies:
+      - '@babel/core'
+      - supports-color
+
+  babel-plugin-transform-react-remove-prop-types@0.4.24: {}
+
+  babel-polyfill@6.26.0:
+    dependencies:
+      babel-runtime: 6.26.0
+      core-js: 2.6.12
+      regenerator-runtime: 0.10.5
+
+  babel-preset-airbnb@4.5.0(@babel/core@7.26.9)(@babel/runtime@7.28.3):
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.26.9)
+      '@babel/plugin-proposal-numeric-separator': 7.18.6(@babel/core@7.26.9)
+      '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.26.9)
+      '@babel/plugin-proposal-optional-catch-binding': 7.18.6(@babel/core@7.26.9)
+      '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.26.9)
+      '@babel/plugin-transform-classes': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-exponentiation-operator': 7.26.3(@babel/core@7.26.9)
+      '@babel/plugin-transform-jscript': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-member-expression-literals': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-property-literals': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-property-mutators': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-runtime': 7.26.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-template-literals': 7.26.8(@babel/core@7.26.9)
+      '@babel/preset-env': 7.26.9(@babel/core@7.26.9)
+      '@babel/preset-react': 7.26.3(@babel/core@7.26.9)
+      '@babel/runtime': 7.28.3
+      babel-plugin-transform-react-remove-prop-types: 0.4.24
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-preset-current-node-syntax@1.1.0(@babel/core@7.26.9):
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.9)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.26.9)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.26.9)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.26.9)
+      '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.9)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.9)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.9)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.9)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.9)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.9)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.9)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.9)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.9)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.9)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.26.9)
+
+  babel-preset-jest@26.6.2(@babel/core@7.26.9):
+    dependencies:
+      '@babel/core': 7.26.9
+      babel-plugin-jest-hoist: 26.6.2
+      babel-preset-current-node-syntax: 1.1.0(@babel/core@7.26.9)
+
+  babel-preset-jest@29.6.3(@babel/core@7.26.9):
+    dependencies:
+      '@babel/core': 7.26.9
+      babel-plugin-jest-hoist: 29.6.3
+      babel-preset-current-node-syntax: 1.1.0(@babel/core@7.26.9)
+
+  babel-runtime@6.26.0:
+    dependencies:
+      core-js: 2.6.12
+      regenerator-runtime: 0.11.1
+
+  backo2@1.0.2: {}
+
+  balanced-match@1.0.2: {}
+
+  base64-js@1.5.1: {}
+
+  base@0.11.2:
+    dependencies:
+      cache-base: 1.0.1
+      class-utils: 0.3.6
+      component-emitter: 1.3.1
+      define-property: 1.0.0
+      isobject: 3.0.1
+      mixin-deep: 1.3.2
+      pascalcase: 0.1.1
+
+  batch@0.6.1: {}
+
+  bcrypt-pbkdf@1.0.2:
+    dependencies:
+      tweetnacl: 0.14.5
+
+  bcrypt@5.1.1:
+    dependencies:
+      '@mapbox/node-pre-gyp': 1.0.11
+      node-addon-api: 5.1.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  big.js@3.2.0: {}
+
+  big.js@5.2.2: {}
+
+  bignumber.js@9.1.2: {}
+
+  binary-extensions@2.3.0: {}
+
+  blob-util@2.0.2: {}
+
+  bluebird@3.7.2: {}
+
+  body-parser@1.20.3:
+    dependencies:
+      bytes: 3.1.2
+      content-type: 1.0.5
+      debug: 2.6.9(supports-color@7.2.0)
+      depd: 2.0.0
+      destroy: 1.2.0
+      http-errors: 2.0.0
+      iconv-lite: 0.4.24
+      on-finished: 2.4.1
+      qs: 6.13.0
+      raw-body: 2.5.2
+      type-is: 1.6.18
+      unpipe: 1.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  body@5.1.0:
+    dependencies:
+      continuable-cache: 0.3.1
+      error: 7.2.1
+      raw-body: 1.1.7
+      safe-json-parse: 1.0.1
+
+  bonjour-service@1.3.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      multicast-dns: 7.2.5
+
+  boolbase@1.0.0: {}
+
+  brace-expansion@1.1.11:
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+
+  brace-expansion@2.0.1:
+    dependencies:
+      balanced-match: 1.0.2
+
+  braces@2.3.2:
+    dependencies:
+      arr-flatten: 1.1.0
+      array-unique: 0.3.2
+      extend-shallow: 2.0.1
+      fill-range: 4.0.0
+      isobject: 3.0.1
+      repeat-element: 1.1.4
+      snapdragon: 0.8.2
+      snapdragon-node: 2.1.1
+      split-string: 3.1.0
+      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  braces@3.0.3:
+    dependencies:
+      fill-range: 7.1.1
+
+  browser-env@3.3.0:
+    dependencies:
+      window: 4.2.6
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  browser-process-hrtime@1.0.0: {}
+
+  browserslist@1.7.7:
+    dependencies:
+      caniuse-db: 1.0.30001700
+      electron-to-chromium: 1.5.102
+
+  browserslist@4.24.4:
+    dependencies:
+      caniuse-lite: 1.0.30001700
+      electron-to-chromium: 1.5.102
+      node-releases: 2.0.19
+      update-browserslist-db: 1.1.2(browserslist@4.24.4)
+
+  bs-logger@0.2.6:
+    dependencies:
+      fast-json-stable-stringify: 2.1.0
+
+  bser@2.1.1:
+    dependencies:
+      node-int64: 0.4.0
+
+  buffer-crc32@0.2.13: {}
+
+  buffer-equal-constant-time@1.0.1: {}
+
+  buffer-from@1.1.2: {}
+
+  builtin-modules@3.3.0: {}
+
+  busboy@0.3.1:
+    dependencies:
+      dicer: 0.3.0
+
+  bytes@1.0.0: {}
+
+  bytes@3.1.2: {}
+
+  cacache@15.3.0:
+    dependencies:
+      '@npmcli/fs': 1.1.1
+      '@npmcli/move-file': 1.1.2
+      chownr: 2.0.0
+      fs-minipass: 2.1.0
+      glob: 7.2.3
+      infer-owner: 1.0.4
+      lru-cache: 6.0.0
+      minipass: 3.3.6
+      minipass-collect: 1.0.2
+      minipass-flush: 1.0.5
+      minipass-pipeline: 1.2.4
+      mkdirp: 1.0.4
+      p-map: 4.0.0
+      promise-inflight: 1.0.1
+      rimraf: 3.0.2
+      ssri: 8.0.1
+      tar: 6.2.1
+      unique-filename: 1.1.1
+    transitivePeerDependencies:
+      - bluebird
+
+  cache-base@1.0.1:
+    dependencies:
+      collection-visit: 1.0.0
+      component-emitter: 1.3.1
+      get-value: 2.0.6
+      has-value: 1.0.0
+      isobject: 3.0.1
+      set-value: 2.0.1
+      to-object-path: 0.3.0
+      union-value: 1.0.1
+      unset-value: 1.0.0
+
+  cachedir@2.4.0: {}
+
+  call-bind-apply-helpers@1.0.2:
+    dependencies:
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+
+  call-bind@1.0.8:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-define-property: 1.0.1
+      get-intrinsic: 1.2.7
+      set-function-length: 1.2.2
+
+  call-bound@1.0.3:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      get-intrinsic: 1.2.7
+
+  callsites@3.1.0: {}
+
+  camel-case@4.1.2:
+    dependencies:
+      pascal-case: 3.1.2
+      tslib: 2.8.1
+
+  camelcase@5.3.1: {}
+
+  camelcase@6.3.0: {}
+
+  camelize@1.0.1: {}
+
+  caniuse-db@1.0.30001700: {}
+
+  caniuse-lite@1.0.30001700: {}
+
+  capture-exit@2.0.0:
+    dependencies:
+      rsvp: 4.8.5
+
+  case-sensitive-paths-webpack-plugin@2.4.0: {}
+
+  caseless@0.12.0: {}
+
+  chalk@1.1.3:
+    dependencies:
+      ansi-styles: 2.2.1
+      escape-string-regexp: 1.0.5
+      has-ansi: 2.0.0
+      strip-ansi: 3.0.1
+      supports-color: 2.0.0
+
+  chalk@2.4.2:
+    dependencies:
+      ansi-styles: 3.2.1
+      escape-string-regexp: 1.0.5
+      supports-color: 5.5.0
+
+  chalk@3.0.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
+
+  chalk@4.1.2:
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
+
+  char-regex@1.0.2: {}
+
+  check-more-types@2.24.0: {}
+
+  chokidar@3.6.0:
+    dependencies:
+      anymatch: 3.1.3
+      braces: 3.0.3
+      glob-parent: 5.1.2
+      is-binary-path: 2.1.0
+      is-glob: 4.0.3
+      normalize-path: 3.0.0
+      readdirp: 3.6.0
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  chokidar@4.0.3:
+    dependencies:
+      readdirp: 4.1.2
+
+  chownr@2.0.0: {}
+
+  chrome-trace-event@1.0.4: {}
+
+  ci-info@2.0.0: {}
+
+  ci-info@3.9.0: {}
+
+  cjs-module-lexer@0.6.0: {}
+
+  cjs-module-lexer@1.4.3: {}
+
+  class-utils@0.3.6:
+    dependencies:
+      arr-union: 3.1.0
+      define-property: 0.2.5
+      isobject: 3.0.1
+      static-extend: 0.1.2
+
+  classnames@2.3.1: {}
+
+  clean-css@5.3.3:
+    dependencies:
+      source-map: 0.6.1
+
+  clean-stack@2.2.0: {}
+
+  cli-cursor@1.0.2:
+    dependencies:
+      restore-cursor: 1.0.1
+
+  cli-cursor@2.1.0:
+    dependencies:
+      restore-cursor: 2.0.0
+
+  cli-progress@3.12.0:
+    dependencies:
+      string-width: 4.2.3
+
+  cli-table3@0.6.5:
+    dependencies:
+      string-width: 4.2.3
+    optionalDependencies:
+      '@colors/colors': 1.5.0
+
+  cli-truncate@0.2.1:
+    dependencies:
+      slice-ansi: 0.0.4
+      string-width: 1.0.2
+
+  cliui@5.0.0:
+    dependencies:
+      string-width: 3.1.0
+      strip-ansi: 5.2.0
+      wrap-ansi: 5.1.0
+
+  cliui@6.0.0:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 6.2.0
+
+  cliui@7.0.4:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 7.0.0
+
+  cliui@8.0.1:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 7.0.0
+
+  clone-deep@4.0.1:
+    dependencies:
+      is-plain-object: 2.0.4
+      kind-of: 6.0.3
+      shallow-clone: 3.0.1
+
+  clsx@2.1.1: {}
+
+  co@4.6.0: {}
+
+  code-point-at@1.1.0: {}
+
+  codemirror@5.65.18: {}
+
+  collect-v8-coverage@1.0.2: {}
+
+  collection-visit@1.0.0:
+    dependencies:
+      map-visit: 1.0.0
+      object-visit: 1.0.1
+
+  color-convert@1.9.3:
+    dependencies:
+      color-name: 1.1.3
+
+  color-convert@2.0.1:
+    dependencies:
+      color-name: 1.1.4
+
+  color-name@1.1.3: {}
+
+  color-name@1.1.4: {}
+
+  color-support@1.1.3: {}
+
+  colorette@2.0.20: {}
+
+  colors@1.1.2: {}
+
+  combined-stream@1.0.8:
+    dependencies:
+      delayed-stream: 1.0.0
+
+  commander@10.0.1: {}
+
+  commander@2.20.3: {}
+
+  commander@5.1.0: {}
+
+  commander@7.2.0: {}
+
+  commander@8.3.0: {}
+
+  common-tags@1.8.2: {}
+
+  commondir@1.0.1: {}
+
+  component-emitter@1.3.1: {}
+
+  compressible@2.0.18:
+    dependencies:
+      mime-db: 1.53.0
+
+  compression@1.8.0:
+    dependencies:
+      bytes: 3.1.2
+      compressible: 2.0.18
+      debug: 2.6.9(supports-color@7.2.0)
+      negotiator: 0.6.4
+      on-headers: 1.0.2
+      safe-buffer: 5.2.1
+      vary: 1.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  concat-map@0.0.1: {}
+
+  concat-stream@1.6.2:
+    dependencies:
+      buffer-from: 1.1.2
+      inherits: 2.0.4
+      readable-stream: 2.3.8
+      typedarray: 0.0.6
+
+  concurrently@5.3.0:
+    dependencies:
+      chalk: 2.4.2
+      date-fns: 2.30.0
+      lodash: 4.17.21
+      read-pkg: 4.0.1
+      rxjs: 6.6.7
+      spawn-command: 0.0.2
+      supports-color: 6.1.0
+      tree-kill: 1.2.2
+      yargs: 13.3.2
+
+  confusing-browser-globals@1.0.11: {}
+
+  connect-history-api-fallback@2.0.0: {}
+
+  console-control-strings@1.1.0: {}
+
+  content-disposition@0.5.4:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  content-type@1.0.5: {}
+
+  continuable-cache@0.3.1: {}
+
+  convert-source-map@1.9.0: {}
+
+  convert-source-map@2.0.0: {}
+
+  cookie-parser@1.4.7:
+    dependencies:
+      cookie: 0.7.2
+      cookie-signature: 1.0.6
+
+  cookie-signature@1.0.6: {}
+
+  cookie@0.7.1: {}
+
+  cookie@0.7.2: {}
+
+  cookie@1.0.2: {}
+
+  copy-descriptor@0.1.1: {}
+
+  copy-to-clipboard@3.3.3:
+    dependencies:
+      toggle-selection: 1.0.6
+
+  copyfiles@2.4.1:
+    dependencies:
+      glob: 7.2.3
+      minimatch: 3.1.2
+      mkdirp: 1.0.4
+      noms: 0.0.0
+      through2: 2.0.5
+      untildify: 4.0.0
+      yargs: 16.2.0
+
+  core-js-compat@3.40.0:
+    dependencies:
+      browserslist: 4.24.4
+
+  core-js-pure@3.40.0: {}
+
+  core-js@2.6.12: {}
+
+  core-util-is@1.0.2: {}
+
+  core-util-is@1.0.3: {}
+
+  cors@2.8.5:
+    dependencies:
+      object-assign: 4.1.1
+      vary: 1.1.2
+
+  cosmiconfig@2.2.2:
+    dependencies:
+      is-directory: 0.3.1
+      js-yaml: 3.14.1
+      minimist: 1.2.8
+      object-assign: 4.1.1
+      os-homedir: 1.0.2
+      parse-json: 2.2.0
+      require-from-string: 1.2.1
+
+  cosmiconfig@7.1.0:
+    dependencies:
+      '@types/parse-json': 4.0.2
+      import-fresh: 3.3.1
+      parse-json: 5.2.0
+      path-type: 4.0.0
+      yaml: 1.10.2
+
+  countup.js@2.9.0: {}
+
+  coveralls@3.1.1:
+    dependencies:
+      js-yaml: 3.14.1
+      lcov-parse: 1.0.0
+      log-driver: 1.2.7
+      minimist: 1.2.8
+      request: 2.88.2
+
+  create-jest@29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5)):
+    dependencies:
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-config: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5))
+      jest-util: 29.7.0
+      prompts: 2.4.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  create-jest@29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3)):
+    dependencies:
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-config: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-util: 29.7.0
+      prompts: 2.4.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  create-require@1.1.1: {}
+
+  cross-fetch@3.2.0:
+    dependencies:
+      node-fetch: 2.7.0
+    transitivePeerDependencies:
+      - encoding
+
+  cross-spawn@6.0.6:
+    dependencies:
+      nice-try: 1.0.5
+      path-key: 2.0.1
+      semver: 5.7.2
+      shebang-command: 1.2.0
+      which: 1.3.1
+
+  cross-spawn@7.0.6:
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+
+  css-box-model@1.2.1:
+    dependencies:
+      tiny-invariant: 1.3.3
+
+  css-color-keywords@1.0.0: {}
+
+  css-loader@3.6.0(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      camelcase: 5.3.1
+      cssesc: 3.0.0
+      icss-utils: 4.1.1
+      loader-utils: 1.4.2
+      normalize-path: 3.0.0
+      postcss: 7.0.39
+      postcss-modules-extract-imports: 2.0.0
+      postcss-modules-local-by-default: 3.0.3
+      postcss-modules-scope: 2.2.0
+      postcss-modules-values: 3.0.0
+      postcss-value-parser: 4.2.0
+      schema-utils: 2.7.1
+      semver: 6.3.1
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+
+  css-select@4.3.0:
+    dependencies:
+      boolbase: 1.0.0
+      css-what: 6.1.0
+      domhandler: 4.3.1
+      domutils: 2.8.0
+      nth-check: 2.1.1
+
+  css-to-react-native@2.3.2:
+    dependencies:
+      camelize: 1.0.1
+      css-color-keywords: 1.0.0
+      postcss-value-parser: 3.3.1
+
+  css-what@6.1.0: {}
+
+  cssesc@3.0.0: {}
+
+  cssfilter@0.0.10: {}
+
+  cssom@0.3.8: {}
+
+  cssom@0.4.4: {}
+
+  cssom@0.5.0: {}
+
+  cssstyle@1.4.0:
+    dependencies:
+      cssom: 0.3.8
+
+  cssstyle@2.3.0:
+    dependencies:
+      cssom: 0.3.8
+
+  csstype@3.1.3: {}
+
+  cypress@6.9.1:
+    dependencies:
+      '@cypress/listr-verbose-renderer': 0.4.1
+      '@cypress/request': 2.88.12
+      '@cypress/xvfb': 1.2.4(supports-color@7.2.0)
+      '@types/node': 12.12.50
+      '@types/sinonjs__fake-timers': 6.0.4
+      '@types/sizzle': 2.3.9
+      arch: 2.2.0
+      blob-util: 2.0.2
+      bluebird: 3.7.2
+      cachedir: 2.4.0
+      chalk: 4.1.2
+      check-more-types: 2.24.0
+      cli-table3: 0.6.5
+      commander: 5.1.0
+      common-tags: 1.8.2
+      dayjs: 1.11.13
+      debug: 4.3.2(supports-color@7.2.0)
+      eventemitter2: 6.4.9
+      execa: 4.1.0
+      executable: 4.1.1
+      extract-zip: 1.7.0(supports-color@7.2.0)
+      fs-extra: 9.1.0
+      getos: 3.2.1
+      is-ci: 2.0.0
+      is-installed-globally: 0.3.2
+      lazy-ass: 1.6.0
+      listr: 0.14.3
+      lodash: 4.17.21
+      log-symbols: 4.1.0
+      minimist: 1.2.8
+      moment: 2.30.1
+      ospath: 1.2.2
+      pretty-bytes: 5.6.0
+      ramda: 0.27.2
+      request-progress: 3.0.0
+      supports-color: 7.2.0
+      tmp: 0.2.3
+      untildify: 4.0.0
+      url: 0.11.4
+      yauzl: 2.10.0
+    transitivePeerDependencies:
+      - zen-observable
+      - zenObservable
+
+  d3-array@3.2.4:
+    dependencies:
+      internmap: 2.0.3
+
+  d3-color@1.4.1: {}
+
+  d3-ease@3.0.1: {}
+
+  d3-format@1.4.5: {}
+
+  d3-interpolate@3.0.1:
+    dependencies:
+      d3-color: 1.4.1
+
+  d3-path@3.1.0: {}
+
+  d3-scale@4.0.2:
+    dependencies:
+      d3-array: 3.2.4
+      d3-format: 1.4.5
+      d3-interpolate: 3.0.1
+      d3-time: 3.1.0
+      d3-time-format: 2.3.0
+
+  d3-shape@3.2.0:
+    dependencies:
+      d3-path: 3.1.0
+
+  d3-time-format@2.3.0:
+    dependencies:
+      d3-time: 1.1.0
+
+  d3-time@1.1.0: {}
+
+  d3-time@3.1.0:
+    dependencies:
+      d3-array: 3.2.4
+
+  d3-timer@3.0.1: {}
+
+  damerau-levenshtein@1.0.8: {}
+
+  dashdash@1.14.1:
+    dependencies:
+      assert-plus: 1.0.0
+
+  data-urls@1.1.0:
+    dependencies:
+      abab: 2.0.6
+      whatwg-mimetype: 2.3.0
+      whatwg-url: 7.1.0
+
+  data-urls@2.0.0:
+    dependencies:
+      abab: 2.0.6
+      whatwg-mimetype: 2.3.0
+      whatwg-url: 8.7.0
+
+  data-urls@3.0.2:
+    dependencies:
+      abab: 2.0.6
+      whatwg-mimetype: 3.0.0
+      whatwg-url: 11.0.0
+
+  data-view-buffer@1.0.2:
+    dependencies:
+      call-bound: 1.0.3
+      es-errors: 1.3.0
+      is-data-view: 1.0.2
+
+  data-view-byte-length@1.0.2:
+    dependencies:
+      call-bound: 1.0.3
+      es-errors: 1.3.0
+      is-data-view: 1.0.2
+
+  data-view-byte-offset@1.0.1:
+    dependencies:
+      call-bound: 1.0.3
+      es-errors: 1.3.0
+      is-data-view: 1.0.2
+
+  date-fns@1.30.1: {}
+
+  date-fns@2.30.0:
+    dependencies:
+      '@babel/runtime': 7.26.9
+
+  dateformat@4.6.3: {}
+
+  dayjs@1.11.13: {}
+
+  debounce@1.2.1: {}
+
+  debug@2.6.9(supports-color@7.2.0):
+    dependencies:
+      ms: 2.0.0
+    optionalDependencies:
+      supports-color: 7.2.0
+
+  debug@3.2.7(supports-color@5.5.0):
+    dependencies:
+      ms: 2.1.3
+    optionalDependencies:
+      supports-color: 5.5.0
+
+  debug@3.2.7(supports-color@7.2.0):
+    dependencies:
+      ms: 2.1.3
+    optionalDependencies:
+      supports-color: 7.2.0
+
+  debug@4.3.2(supports-color@7.2.0):
+    dependencies:
+      ms: 2.1.2
+    optionalDependencies:
+      supports-color: 7.2.0
+
+  debug@4.4.0(supports-color@5.5.0):
+    dependencies:
+      ms: 2.1.3
+    optionalDependencies:
+      supports-color: 5.5.0
+
+  decamelize@1.2.0: {}
+
+  decimal.js-light@2.5.1: {}
+
+  decimal.js@10.5.0: {}
+
+  decode-uri-component@0.2.2: {}
+
+  dedent@1.5.3(babel-plugin-macros@3.1.0):
+    optionalDependencies:
+      babel-plugin-macros: 3.1.0
+
+  deep-freeze@0.0.1: {}
+
+  deep-is@0.1.4: {}
+
+  deepmerge@4.3.1: {}
+
+  default-gateway@6.0.3:
+    dependencies:
+      execa: 5.1.1
+
+  define-data-property@1.1.4:
+    dependencies:
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      gopd: 1.2.0
+
+  define-lazy-prop@2.0.0: {}
+
+  define-properties@1.2.1:
+    dependencies:
+      define-data-property: 1.1.4
+      has-property-descriptors: 1.0.2
+      object-keys: 1.1.1
+
+  define-property@0.2.5:
+    dependencies:
+      is-descriptor: 0.1.7
+
+  define-property@1.0.0:
+    dependencies:
+      is-descriptor: 1.0.3
+
+  define-property@2.0.2:
+    dependencies:
+      is-descriptor: 1.0.3
+      isobject: 3.0.1
+
+  delayed-stream@1.0.0: {}
+
+  delegates@1.0.0: {}
+
+  denque@2.1.0: {}
+
+  depd@1.1.2: {}
+
+  depd@2.0.0: {}
+
+  deprecated-decorator@0.1.6: {}
+
+  destroy@1.2.0: {}
+
+  detect-file@1.0.0: {}
+
+  detect-libc@1.0.3:
+    optional: true
+
+  detect-libc@2.0.3: {}
+
+  detect-newline@3.1.0: {}
+
+  detect-node-es@1.1.0: {}
+
+  detect-node@2.1.0: {}
+
+  dicer@0.3.0:
+    dependencies:
+      streamsearch: 0.1.2
+
+  diff-sequences@26.6.2: {}
+
+  diff-sequences@29.6.3: {}
+
+  diff@4.0.2: {}
+
+  dir-glob@3.0.1:
+    dependencies:
+      path-type: 4.0.0
+
+  dlv@1.1.3: {}
+
+  dns-packet@5.6.1:
+    dependencies:
+      '@leichtgewicht/ip-codec': 2.0.5
+
+  doctrine@2.1.0:
+    dependencies:
+      esutils: 2.0.3
+
+  doctrine@3.0.0:
+    dependencies:
+      esutils: 2.0.3
+
+  dom-accessibility-api@0.5.16: {}
+
+  dom-converter@0.2.0:
+    dependencies:
+      utila: 0.4.0
+
+  dom-helpers@5.2.1:
+    dependencies:
+      '@babel/runtime': 7.28.3
+      csstype: 3.1.3
+
+  dom-serializer@1.4.1:
+    dependencies:
+      domelementtype: 2.3.0
+      domhandler: 4.3.1
+      entities: 2.2.0
+
+  domelementtype@2.3.0: {}
+
+  domexception@1.0.1:
+    dependencies:
+      webidl-conversions: 4.0.2
+
+  domexception@2.0.1:
+    dependencies:
+      webidl-conversions: 5.0.0
+
+  domexception@4.0.0:
+    dependencies:
+      webidl-conversions: 7.0.0
+
+  domhandler@4.3.1:
+    dependencies:
+      domelementtype: 2.3.0
+
+  domutils@2.8.0:
+    dependencies:
+      dom-serializer: 1.4.1
+      domelementtype: 2.3.0
+      domhandler: 4.3.1
+
+  dot-case@3.0.4:
+    dependencies:
+      no-case: 3.0.4
+      tslib: 2.8.1
+
+  dotenv-defaults@2.0.2:
+    dependencies:
+      dotenv: 8.6.0
+
+  dotenv-webpack@6.0.4(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      dotenv-defaults: 2.0.2
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+
+  dotenv@8.6.0: {}
+
+  dottie@2.0.6: {}
+
+  dunder-proto@1.0.1:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-errors: 1.3.0
+      gopd: 1.2.0
+
+  duplexer@0.1.2: {}
+
+  eastasianwidth@0.2.0: {}
+
+  ecc-jsbn@0.1.2:
+    dependencies:
+      jsbn: 0.1.1
+      safer-buffer: 2.1.2
+
+  ecdsa-sig-formatter@1.0.11:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  ee-first@1.1.1: {}
+
+  ejs@3.1.10:
+    dependencies:
+      jake: 10.9.2
+
+  electron-to-chromium@1.5.102: {}
+
+  elegant-spinner@1.0.1: {}
+
+  emittery@0.13.1: {}
+
+  emittery@0.7.2: {}
+
+  emoji-regex@7.0.3: {}
+
+  emoji-regex@8.0.0: {}
+
+  emoji-regex@9.2.2: {}
+
+  emojis-list@2.1.0: {}
+
+  emojis-list@3.0.0: {}
+
+  encodeurl@1.0.2: {}
+
+  encodeurl@2.0.0: {}
+
+  end-of-stream@1.4.4:
+    dependencies:
+      once: 1.4.0
+
+  enhanced-resolve@5.18.1:
+    dependencies:
+      graceful-fs: 4.2.11
+      tapable: 2.2.1
+
+  entities@2.2.0: {}
+
+  entities@4.5.0: {}
+
+  envinfo@7.14.0: {}
+
+  error-ex@1.3.2:
+    dependencies:
+      is-arrayish: 0.2.1
+
+  error@7.2.1:
+    dependencies:
+      string-template: 0.2.1
+
+  es-abstract@1.23.9:
+    dependencies:
+      array-buffer-byte-length: 1.0.2
+      arraybuffer.prototype.slice: 1.0.4
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      data-view-buffer: 1.0.2
+      data-view-byte-length: 1.0.2
+      data-view-byte-offset: 1.0.1
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      es-set-tostringtag: 2.1.0
+      es-to-primitive: 1.3.0
+      function.prototype.name: 1.1.8
+      get-intrinsic: 1.2.7
+      get-proto: 1.0.1
+      get-symbol-description: 1.1.0
+      globalthis: 1.0.4
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+      has-proto: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.2
+      internal-slot: 1.1.0
+      is-array-buffer: 3.0.5
+      is-callable: 1.2.7
+      is-data-view: 1.0.2
+      is-regex: 1.2.1
+      is-shared-array-buffer: 1.0.4
+      is-string: 1.1.1
+      is-typed-array: 1.1.15
+      is-weakref: 1.1.1
+      math-intrinsics: 1.1.0
+      object-inspect: 1.13.4
+      object-keys: 1.1.1
+      object.assign: 4.1.7
+      own-keys: 1.0.1
+      regexp.prototype.flags: 1.5.4
+      safe-array-concat: 1.1.3
+      safe-push-apply: 1.0.0
+      safe-regex-test: 1.1.0
+      set-proto: 1.0.0
+      string.prototype.trim: 1.2.10
+      string.prototype.trimend: 1.0.9
+      string.prototype.trimstart: 1.0.8
+      typed-array-buffer: 1.0.3
+      typed-array-byte-length: 1.0.3
+      typed-array-byte-offset: 1.0.4
+      typed-array-length: 1.0.7
+      unbox-primitive: 1.1.0
+      which-typed-array: 1.1.18
+
+  es-array-method-boxes-properly@1.0.0: {}
+
+  es-define-property@1.0.1: {}
+
+  es-errors@1.3.0: {}
+
+  es-iterator-helpers@1.2.1:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-errors: 1.3.0
+      es-set-tostringtag: 2.1.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.7
+      globalthis: 1.0.4
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+      has-proto: 1.2.0
+      has-symbols: 1.1.0
+      internal-slot: 1.1.0
+      iterator.prototype: 1.1.5
+      safe-array-concat: 1.1.3
+
+  es-module-lexer@1.6.0: {}
+
+  es-object-atoms@1.1.1:
+    dependencies:
+      es-errors: 1.3.0
+
+  es-set-tostringtag@2.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.7
+      has-tostringtag: 1.0.2
+      hasown: 2.0.2
+
+  es-shim-unscopables@1.1.0:
+    dependencies:
+      hasown: 2.0.2
+
+  es-to-primitive@1.3.0:
+    dependencies:
+      is-callable: 1.2.7
+      is-date-object: 1.1.0
+      is-symbol: 1.1.1
+
+  es-toolkit@1.39.10: {}
+
+  esbuild@0.25.0:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.25.0
+      '@esbuild/android-arm': 0.25.0
+      '@esbuild/android-arm64': 0.25.0
+      '@esbuild/android-x64': 0.25.0
+      '@esbuild/darwin-arm64': 0.25.0
+      '@esbuild/darwin-x64': 0.25.0
+      '@esbuild/freebsd-arm64': 0.25.0
+      '@esbuild/freebsd-x64': 0.25.0
+      '@esbuild/linux-arm': 0.25.0
+      '@esbuild/linux-arm64': 0.25.0
+      '@esbuild/linux-ia32': 0.25.0
+      '@esbuild/linux-loong64': 0.25.0
+      '@esbuild/linux-mips64el': 0.25.0
+      '@esbuild/linux-ppc64': 0.25.0
+      '@esbuild/linux-riscv64': 0.25.0
+      '@esbuild/linux-s390x': 0.25.0
+      '@esbuild/linux-x64': 0.25.0
+      '@esbuild/netbsd-arm64': 0.25.0
+      '@esbuild/netbsd-x64': 0.25.0
+      '@esbuild/openbsd-arm64': 0.25.0
+      '@esbuild/openbsd-x64': 0.25.0
+      '@esbuild/sunos-x64': 0.25.0
+      '@esbuild/win32-arm64': 0.25.0
+      '@esbuild/win32-ia32': 0.25.0
+      '@esbuild/win32-x64': 0.25.0
+
+  escalade@3.2.0: {}
+
+  escape-html@1.0.3: {}
+
+  escape-string-regexp@1.0.5: {}
+
+  escape-string-regexp@2.0.0: {}
+
+  escape-string-regexp@4.0.0: {}
+
+  escodegen@1.14.3:
+    dependencies:
+      esprima: 4.0.1
+      estraverse: 4.3.0
+      esutils: 2.0.3
+      optionator: 0.8.3
+    optionalDependencies:
+      source-map: 0.6.1
+
+  escodegen@2.1.0:
+    dependencies:
+      esprima: 4.0.1
+      estraverse: 5.3.0
+      esutils: 2.0.3
+    optionalDependencies:
+      source-map: 0.6.1
+
+  eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1))(eslint@8.57.1):
+    dependencies:
+      confusing-browser-globals: 1.0.11
+      eslint: 8.57.1
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)
+      object.assign: 4.1.7
+      object.entries: 1.1.8
+      semver: 6.3.1
+
+  eslint-config-airbnb@19.0.4(eslint-plugin-import@2.31.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.37.4(eslint@8.57.1))(eslint@8.57.1):
+    dependencies:
+      eslint: 8.57.1
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.31.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)
+      eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
+      eslint-plugin-react: 7.37.4(eslint@8.57.1)
+      eslint-plugin-react-hooks: 4.6.2(eslint@8.57.1)
+      object.assign: 4.1.7
+      object.entries: 1.1.8
+
+  eslint-import-resolver-node@0.3.9:
+    dependencies:
+      debug: 3.2.7(supports-color@5.5.0)
+      is-core-module: 2.16.1
+      resolve: 1.22.10
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1):
+    dependencies:
+      debug: 3.2.7(supports-color@5.5.0)
+    optionalDependencies:
+      '@typescript-eslint/parser': 5.62.0(eslint@8.57.1)(typescript@4.9.5)
+      eslint: 8.57.1
+      eslint-import-resolver-node: 0.3.9
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-import@2.31.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1):
+    dependencies:
+      '@rtsao/scc': 1.1.0
+      array-includes: 3.1.8
+      array.prototype.findlastindex: 1.2.5
+      array.prototype.flat: 1.3.3
+      array.prototype.flatmap: 1.3.3
+      debug: 3.2.7(supports-color@5.5.0)
+      doctrine: 2.1.0
+      eslint: 8.57.1
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1)
+      hasown: 2.0.2
+      is-core-module: 2.16.1
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.fromentries: 2.0.8
+      object.groupby: 1.0.3
+      object.values: 1.2.1
+      semver: 6.3.1
+      string.prototype.trimend: 1.0.9
+      tsconfig-paths: 3.15.0
+    optionalDependencies:
+      '@typescript-eslint/parser': 5.62.0(eslint@8.57.1)(typescript@4.9.5)
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+
+  eslint-plugin-jsx-a11y@6.10.2(eslint@8.57.1):
+    dependencies:
+      aria-query: 5.3.2
+      array-includes: 3.1.8
+      array.prototype.flatmap: 1.3.3
+      ast-types-flow: 0.0.8
+      axe-core: 4.10.2
+      axobject-query: 4.1.0
+      damerau-levenshtein: 1.0.8
+      emoji-regex: 9.2.2
+      eslint: 8.57.1
+      hasown: 2.0.2
+      jsx-ast-utils: 3.3.5
+      language-tags: 1.0.9
+      minimatch: 3.1.2
+      object.fromentries: 2.0.8
+      safe-regex-test: 1.1.0
+      string.prototype.includes: 2.0.1
+
+  eslint-plugin-react-hooks@4.6.2(eslint@8.57.1):
+    dependencies:
+      eslint: 8.57.1
+
+  eslint-plugin-react@7.37.4(eslint@8.57.1):
+    dependencies:
+      array-includes: 3.1.8
+      array.prototype.findlast: 1.2.5
+      array.prototype.flatmap: 1.3.3
+      array.prototype.tosorted: 1.1.4
+      doctrine: 2.1.0
+      es-iterator-helpers: 1.2.1
+      eslint: 8.57.1
+      estraverse: 5.3.0
+      hasown: 2.0.2
+      jsx-ast-utils: 3.3.5
+      minimatch: 3.1.2
+      object.entries: 1.1.8
+      object.fromentries: 2.0.8
+      object.values: 1.2.1
+      prop-types: 15.8.1
+      resolve: 2.0.0-next.5
+      semver: 6.3.1
+      string.prototype.matchall: 4.0.12
+      string.prototype.repeat: 1.0.0
+
+  eslint-scope@5.1.1:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 4.3.0
+
+  eslint-scope@7.2.2:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
+  eslint-visitor-keys@1.3.0: {}
+
+  eslint-visitor-keys@3.4.3: {}
+
+  eslint-visitor-keys@4.2.0: {}
+
+  eslint-webpack-plugin@4.2.0(eslint@8.57.1)(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      '@types/eslint': 8.56.12
+      eslint: 8.57.1
+      jest-worker: 29.7.0
+      micromatch: 4.0.8
+      normalize-path: 3.0.0
+      schema-utils: 4.3.0
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+
+  eslint@8.57.1:
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1)
+      '@eslint-community/regexpp': 4.12.1
+      '@eslint/eslintrc': 2.1.4
+      '@eslint/js': 8.57.1
+      '@humanwhocodes/config-array': 0.13.0
+      '@humanwhocodes/module-importer': 1.0.1
+      '@nodelib/fs.walk': 1.2.8
+      '@ungap/structured-clone': 1.3.0
+      ajv: 6.12.6
+      chalk: 4.1.2
+      cross-spawn: 7.0.6
+      debug: 4.4.0(supports-color@5.5.0)
+      doctrine: 3.0.0
+      escape-string-regexp: 4.0.0
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      esquery: 1.6.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 6.0.1
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      globals: 13.24.0
+      graphemer: 1.4.0
+      ignore: 5.3.2
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      is-path-inside: 3.0.3
+      js-yaml: 4.1.0
+      json-stable-stringify-without-jsonify: 1.0.1
+      levn: 0.4.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.2
+      natural-compare: 1.4.0
+      optionator: 0.9.4
+      strip-ansi: 6.0.1
+      text-table: 0.2.0
+    transitivePeerDependencies:
+      - supports-color
+
+  espree@10.3.0:
+    dependencies:
+      acorn: 8.14.0
+      acorn-jsx: 5.3.2(acorn@8.14.0)
+      eslint-visitor-keys: 4.2.0
+
+  espree@9.6.1:
+    dependencies:
+      acorn: 8.14.0
+      acorn-jsx: 5.3.2(acorn@8.14.0)
+      eslint-visitor-keys: 3.4.3
+
+  esprima@4.0.1: {}
+
+  esquery@1.6.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  esrecurse@4.3.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  estraverse@4.3.0: {}
+
+  estraverse@5.3.0: {}
+
+  estree-walker@0.6.1: {}
+
+  estree-walker@1.0.1: {}
+
+  estree-walker@2.0.2: {}
+
+  esutils@2.0.3: {}
+
+  etag@1.8.1: {}
+
+  event-target-shim@5.0.1: {}
+
+  eventemitter2@0.4.14: {}
+
+  eventemitter2@6.4.9: {}
+
+  eventemitter3@3.1.2: {}
+
+  eventemitter3@4.0.7: {}
+
+  eventemitter3@5.0.1: {}
+
+  events@3.3.0: {}
+
+  exec-sh@0.3.6: {}
+
+  execa@1.0.0:
+    dependencies:
+      cross-spawn: 6.0.6
+      get-stream: 4.1.0
+      is-stream: 1.1.0
+      npm-run-path: 2.0.2
+      p-finally: 1.0.0
+      signal-exit: 3.0.7
+      strip-eof: 1.0.0
+
+  execa@4.1.0:
+    dependencies:
+      cross-spawn: 7.0.6
+      get-stream: 5.2.0
+      human-signals: 1.1.1
+      is-stream: 2.0.1
+      merge-stream: 2.0.0
+      npm-run-path: 4.0.1
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+      strip-final-newline: 2.0.0
+
+  execa@5.1.1:
+    dependencies:
+      cross-spawn: 7.0.6
+      get-stream: 6.0.1
+      human-signals: 2.1.0
+      is-stream: 2.0.1
+      merge-stream: 2.0.0
+      npm-run-path: 4.0.1
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+      strip-final-newline: 2.0.0
+
+  executable@4.1.1:
+    dependencies:
+      pify: 2.3.0
+
+  exit-hook@1.1.1: {}
+
+  exit@0.1.2: {}
+
+  expand-brackets@2.1.4:
+    dependencies:
+      debug: 2.6.9(supports-color@7.2.0)
+      define-property: 0.2.5
+      extend-shallow: 2.0.1
+      posix-character-classes: 0.1.1
+      regex-not: 1.0.2
+      snapdragon: 0.8.2
+      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  expand-tilde@2.0.2:
+    dependencies:
+      homedir-polyfill: 1.0.3
+
+  expect@26.6.2:
+    dependencies:
+      '@jest/types': 26.6.2
+      ansi-styles: 4.3.0
+      jest-get-type: 26.3.0
+      jest-matcher-utils: 26.6.2
+      jest-message-util: 26.6.2
+      jest-regex-util: 26.0.0
+
+  expect@29.7.0:
+    dependencies:
+      '@jest/expect-utils': 29.7.0
+      jest-get-type: 29.6.3
+      jest-matcher-utils: 29.7.0
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+
+  express@4.21.2:
+    dependencies:
+      accepts: 1.3.8
+      array-flatten: 1.1.1
+      body-parser: 1.20.3
+      content-disposition: 0.5.4
+      content-type: 1.0.5
+      cookie: 0.7.1
+      cookie-signature: 1.0.6
+      debug: 2.6.9(supports-color@7.2.0)
+      depd: 2.0.0
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      etag: 1.8.1
+      finalhandler: 1.3.1
+      fresh: 0.5.2
+      http-errors: 2.0.0
+      merge-descriptors: 1.0.3
+      methods: 1.1.2
+      on-finished: 2.4.1
+      parseurl: 1.3.3
+      path-to-regexp: 0.1.12
+      proxy-addr: 2.0.7
+      qs: 6.13.0
+      range-parser: 1.2.1
+      safe-buffer: 5.2.1
+      send: 0.19.0
+      serve-static: 1.16.2
+      setprototypeof: 1.2.0
+      statuses: 2.0.1
+      type-is: 1.6.18
+      utils-merge: 1.0.1
+      vary: 1.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  extend-shallow@2.0.1:
+    dependencies:
+      is-extendable: 0.1.1
+
+  extend-shallow@3.0.2:
+    dependencies:
+      assign-symbols: 1.0.0
+      is-extendable: 1.0.1
+
+  extend@3.0.2: {}
+
+  extglob@2.0.4:
+    dependencies:
+      array-unique: 0.3.2
+      define-property: 1.0.0
+      expand-brackets: 2.1.4
+      extend-shallow: 2.0.1
+      fragment-cache: 0.2.1
+      regex-not: 1.0.2
+      snapdragon: 0.8.2
+      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  extract-text-webpack-plugin@1.0.1(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      async: 1.5.2
+      loader-utils: 0.2.17
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+      webpack-sources: 0.1.5
+
+  extract-zip@1.7.0(supports-color@7.2.0):
+    dependencies:
+      concat-stream: 1.6.2
+      debug: 2.6.9(supports-color@7.2.0)
+      mkdirp: 0.5.6
+      yauzl: 2.10.0
+    transitivePeerDependencies:
+      - supports-color
+
+  extsprintf@1.3.0: {}
+
+  fast-deep-equal@3.1.3: {}
+
+  fast-glob@3.3.3:
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.8
+
+  fast-json-stable-stringify@2.1.0: {}
+
+  fast-levenshtein@2.0.6: {}
+
+  fast-text-encoding@1.0.6: {}
+
+  fast-uri@3.0.6: {}
+
+  fastest-levenshtein@1.0.16: {}
+
+  fastq@1.19.0:
+    dependencies:
+      reusify: 1.0.4
+
+  faye-websocket@0.10.0:
+    dependencies:
+      websocket-driver: 0.7.4
+
+  faye-websocket@0.11.4:
+    dependencies:
+      websocket-driver: 0.7.4
+
+  fb-watchman@2.0.2:
+    dependencies:
+      bser: 2.1.1
+
+  fd-slicer@1.1.0:
+    dependencies:
+      pend: 1.2.0
+
+  figures@1.7.0:
+    dependencies:
+      escape-string-regexp: 1.0.5
+      object-assign: 4.1.1
+
+  figures@2.0.0:
+    dependencies:
+      escape-string-regexp: 1.0.5
+
+  figures@3.2.0:
+    dependencies:
+      escape-string-regexp: 1.0.5
+
+  file-entry-cache@6.0.1:
+    dependencies:
+      flat-cache: 3.2.0
+
+  file-sync-cmp@0.1.1: {}
+
+  filelist@1.0.4:
+    dependencies:
+      minimatch: 5.1.6
+
+  fill-range@4.0.0:
+    dependencies:
+      extend-shallow: 2.0.1
+      is-number: 3.0.0
+      repeat-string: 1.6.1
+      to-regex-range: 2.1.1
+
+  fill-range@7.1.1:
+    dependencies:
+      to-regex-range: 5.0.1
+
+  finalhandler@1.3.1:
+    dependencies:
+      debug: 2.6.9(supports-color@7.2.0)
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      on-finished: 2.4.1
+      parseurl: 1.3.3
+      statuses: 2.0.1
+      unpipe: 1.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  find-cache-dir@3.3.2:
+    dependencies:
+      commondir: 1.0.1
+      make-dir: 3.1.0
+      pkg-dir: 4.2.0
+
+  find-root@1.1.0: {}
+
+  find-up@3.0.0:
+    dependencies:
+      locate-path: 3.0.0
+
+  find-up@4.1.0:
+    dependencies:
+      locate-path: 5.0.0
+      path-exists: 4.0.0
+
+  find-up@5.0.0:
+    dependencies:
+      locate-path: 6.0.0
+      path-exists: 4.0.0
+
+  findup-sync@4.0.0:
+    dependencies:
+      detect-file: 1.0.0
+      is-glob: 4.0.3
+      micromatch: 4.0.8
+      resolve-dir: 1.0.1
+
+  findup-sync@5.0.0:
+    dependencies:
+      detect-file: 1.0.0
+      is-glob: 4.0.3
+      micromatch: 4.0.8
+      resolve-dir: 1.0.1
+
+  fined@1.2.0:
+    dependencies:
+      expand-tilde: 2.0.2
+      is-plain-object: 2.0.4
+      object.defaults: 1.1.0
+      object.pick: 1.3.0
+      parse-filepath: 1.0.2
+
+  flagged-respawn@1.0.1: {}
+
+  flat-cache@3.2.0:
+    dependencies:
+      flatted: 3.3.2
+      keyv: 4.5.4
+      rimraf: 3.0.2
+
+  flat@5.0.2: {}
+
+  flatted@3.3.2: {}
+
+  focus-lock@1.3.6:
+    dependencies:
+      tslib: 2.8.1
+
+  focus-outline-manager@1.0.2: {}
+
+  follow-redirects@1.15.9: {}
+
+  for-each@0.3.5:
+    dependencies:
+      is-callable: 1.2.7
+
+  for-in@1.0.2: {}
+
+  for-own@1.0.0:
+    dependencies:
+      for-in: 1.0.2
+
+  foreground-child@3.3.0:
+    dependencies:
+      cross-spawn: 7.0.6
+      signal-exit: 4.1.0
+
+  forever-agent@0.6.1: {}
+
+  form-data@2.3.3:
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
+
+  form-data@3.0.3:
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      es-set-tostringtag: 2.1.0
+      mime-types: 2.1.35
+
+  form-data@4.0.2:
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      es-set-tostringtag: 2.1.0
+      mime-types: 2.1.35
+
+  forwarded@0.2.0: {}
+
+  fragment-cache@0.2.1:
+    dependencies:
+      map-cache: 0.2.2
+
+  fresh@0.5.2: {}
+
+  fs-capacitor@2.0.4: {}
+
+  fs-extra@8.1.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 4.0.0
+      universalify: 0.1.2
+
+  fs-extra@9.1.0:
+    dependencies:
+      at-least-node: 1.0.0
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.1
+
+  fs-minipass@2.1.0:
+    dependencies:
+      minipass: 3.3.6
+
+  fs-monkey@1.0.6: {}
+
+  fs.realpath@1.0.0: {}
+
+  fsevents@2.3.3:
+    optional: true
+
+  function-bind@1.1.2: {}
+
+  function.prototype.name@1.1.8:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      define-properties: 1.2.1
+      functions-have-names: 1.2.3
+      hasown: 2.0.2
+      is-callable: 1.2.7
+
+  functions-have-names@1.2.3: {}
+
+  gauge@3.0.2:
+    dependencies:
+      aproba: 2.0.0
+      color-support: 1.1.3
+      console-control-strings: 1.1.0
+      has-unicode: 2.0.1
+      object-assign: 4.1.1
+      signal-exit: 3.0.7
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wide-align: 1.1.5
+
+  gaxios@4.3.3:
+    dependencies:
+      abort-controller: 3.0.0
+      extend: 3.0.2
+      https-proxy-agent: 5.0.1
+      is-stream: 2.0.1
+      node-fetch: 2.7.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  gaze@1.1.3:
+    dependencies:
+      globule: 1.3.4
+
+  gcp-metadata@4.3.1:
+    dependencies:
+      gaxios: 4.3.3
+      json-bigint: 1.0.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  generate-function@2.3.1:
+    dependencies:
+      is-property: 1.0.2
+
+  gensync@1.0.0-beta.2: {}
+
+  get-caller-file@2.0.5: {}
+
+  get-intrinsic@1.2.7:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      function-bind: 1.1.2
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.2
+      math-intrinsics: 1.1.0
+
+  get-package-type@0.1.0: {}
+
+  get-proto@1.0.1:
+    dependencies:
+      dunder-proto: 1.0.1
+      es-object-atoms: 1.1.1
+
+  get-stream@4.1.0:
+    dependencies:
+      pump: 3.0.2
+
+  get-stream@5.2.0:
+    dependencies:
+      pump: 3.0.2
+
+  get-stream@6.0.1: {}
+
+  get-symbol-description@1.1.0:
+    dependencies:
+      call-bound: 1.0.3
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.7
+
+  get-value@2.0.6: {}
+
+  getobject@1.0.2: {}
+
+  getos@3.2.1:
+    dependencies:
+      async: 3.2.6
+
+  getpass@0.1.7:
+    dependencies:
+      assert-plus: 1.0.0
+
+  glob-parent@5.1.2:
+    dependencies:
+      is-glob: 4.0.3
+
+  glob-parent@6.0.2:
+    dependencies:
+      is-glob: 4.0.3
+
+  glob-to-regexp@0.4.1: {}
+
+  glob@11.0.1:
+    dependencies:
+      foreground-child: 3.3.0
+      jackspeak: 4.0.3
+      minimatch: 10.0.1
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.1
+      path-scurry: 2.0.0
+
+  glob@7.1.7:
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.0.8
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+
+  glob@7.2.3:
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+
+  global-dirs@2.1.0:
+    dependencies:
+      ini: 1.3.7
+
+  global-modules@1.0.0:
+    dependencies:
+      global-prefix: 1.0.2
+      is-windows: 1.0.2
+      resolve-dir: 1.0.1
+
+  global-prefix@1.0.2:
+    dependencies:
+      expand-tilde: 2.0.2
+      homedir-polyfill: 1.0.3
+      ini: 1.3.8
+      is-windows: 1.0.2
+      which: 1.3.1
+
+  globals@11.12.0: {}
+
+  globals@13.24.0:
+    dependencies:
+      type-fest: 0.20.2
+
+  globalthis@1.0.4:
+    dependencies:
+      define-properties: 1.2.1
+      gopd: 1.2.0
+
+  globby@11.1.0:
+    dependencies:
+      array-union: 2.1.0
+      dir-glob: 3.0.1
+      fast-glob: 3.3.3
+      ignore: 5.3.2
+      merge2: 1.4.1
+      slash: 3.0.0
+
+  globule@1.3.4:
+    dependencies:
+      glob: 7.1.7
+      lodash: 4.17.21
+      minimatch: 3.0.8
+
+  google-auth-library@6.1.6:
+    dependencies:
+      arrify: 2.0.1
+      base64-js: 1.5.1
+      ecdsa-sig-formatter: 1.0.11
+      fast-text-encoding: 1.0.6
+      gaxios: 4.3.3
+      gcp-metadata: 4.3.1
+      gtoken: 5.3.2
+      jws: 4.0.0
+      lru-cache: 6.0.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  google-p12-pem@3.1.4:
+    dependencies:
+      node-forge: 1.3.1
+
+  googleapis-common@4.4.3:
+    dependencies:
+      extend: 3.0.2
+      gaxios: 4.3.3
+      google-auth-library: 6.1.6
+      qs: 6.14.0
+      url-template: 2.0.8
+      uuid: 8.3.2
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  googleapis@65.0.0:
+    dependencies:
+      google-auth-library: 6.1.6
+      googleapis-common: 4.4.3
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  gopd@1.2.0: {}
+
+  graceful-fs@4.2.11: {}
+
+  graphemer@1.4.0: {}
+
+  graphql-extensions@0.16.0(graphql@16.11.0):
+    dependencies:
+      '@apollographql/apollo-tools': 0.5.4(graphql@16.11.0)
+      apollo-server-env: 3.2.0
+      apollo-server-types: 0.10.0(graphql@16.11.0)
+      graphql: 16.11.0
+    transitivePeerDependencies:
+      - encoding
+
+  graphql-subscriptions@1.2.1(graphql@16.11.0):
+    dependencies:
+      graphql: 16.11.0
+      iterall: 1.3.0
+
+  graphql-tag@2.12.6(graphql@16.11.0):
+    dependencies:
+      graphql: 16.11.0
+      tslib: 2.8.1
+
+  graphql-tools@4.0.8(graphql@16.11.0):
+    dependencies:
+      apollo-link: 1.2.14(graphql@16.11.0)
+      apollo-utilities: 1.3.4(graphql@16.11.0)
+      deprecated-decorator: 0.1.6
+      graphql: 16.11.0
+      iterall: 1.3.0
+      uuid: 3.4.0
+
+  graphql@16.11.0: {}
+
+  growly@1.3.0:
+    optional: true
+
+  grunt-cli@1.4.3:
+    dependencies:
+      grunt-known-options: 2.0.0
+      interpret: 1.1.0
+      liftup: 3.0.1
+      nopt: 4.0.3
+      v8flags: 3.2.0
+
+  grunt-cli@1.5.0:
+    dependencies:
+      grunt-known-options: 2.0.0
+      interpret: 1.1.0
+      liftup: 3.0.1
+      nopt: 5.0.0
+      v8flags: 4.0.1
+
+  grunt-contrib-clean@2.0.1(grunt@1.6.1):
+    dependencies:
+      async: 3.2.6
+      grunt: 1.6.1
+      rimraf: 2.7.1
+
+  grunt-contrib-copy@1.0.0:
+    dependencies:
+      chalk: 1.1.3
+      file-sync-cmp: 0.1.1
+
+  grunt-contrib-cssmin@5.0.0:
+    dependencies:
+      chalk: 4.1.2
+      clean-css: 5.3.3
+      maxmin: 3.0.0
+
+  grunt-contrib-uglify@5.2.2:
+    dependencies:
+      chalk: 4.1.2
+      maxmin: 3.0.0
+      uglify-js: 3.19.3
+      uri-path: 1.0.0
+
+  grunt-contrib-watch@1.1.0:
+    dependencies:
+      async: 2.6.4
+      gaze: 1.1.3
+      lodash: 4.17.21
+      tiny-lr: 1.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  grunt-known-options@2.0.0: {}
+
+  grunt-legacy-log-utils@2.1.0:
+    dependencies:
+      chalk: 4.1.2
+      lodash: 4.17.21
+
+  grunt-legacy-log@3.0.0:
+    dependencies:
+      colors: 1.1.2
+      grunt-legacy-log-utils: 2.1.0
+      hooker: 0.2.3
+      lodash: 4.17.21
+
+  grunt-legacy-util@2.0.1:
+    dependencies:
+      async: 3.2.6
+      exit: 0.1.2
+      getobject: 1.0.2
+      hooker: 0.2.3
+      lodash: 4.17.21
+      underscore.string: 3.3.6
+      which: 2.0.2
+
+  grunt-md5@0.1.12(grunt@1.6.1):
+    dependencies:
+      grunt: 1.6.1
+
+  grunt-shell@4.0.0(grunt@1.6.1):
+    dependencies:
+      chalk: 3.0.0
+      grunt: 1.6.1
+      npm-run-path: 2.0.2
+      strip-ansi: 6.0.1
+
+  grunt@1.6.1:
+    dependencies:
+      dateformat: 4.6.3
+      eventemitter2: 0.4.14
+      exit: 0.1.2
+      findup-sync: 5.0.0
+      glob: 7.1.7
+      grunt-cli: 1.4.3
+      grunt-known-options: 2.0.0
+      grunt-legacy-log: 3.0.0
+      grunt-legacy-util: 2.0.1
+      iconv-lite: 0.6.3
+      js-yaml: 3.14.1
+      minimatch: 3.0.8
+      nopt: 3.0.6
+
+  gtoken@5.3.2:
+    dependencies:
+      gaxios: 4.3.3
+      google-p12-pem: 3.1.4
+      jws: 4.0.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  gzip-size@5.1.1:
+    dependencies:
+      duplexer: 0.1.2
+      pify: 4.0.1
+
+  gzip-size@6.0.0:
+    dependencies:
+      duplexer: 0.1.2
+
+  handle-thing@2.0.1: {}
+
+  har-schema@2.0.0: {}
+
+  har-validator@5.1.5:
+    dependencies:
+      ajv: 6.12.6
+      har-schema: 2.0.0
+
+  harmony-reflect@1.6.2: {}
+
+  has-ansi@2.0.0:
+    dependencies:
+      ansi-regex: 2.1.1
+
+  has-bigints@1.1.0: {}
+
+  has-flag@1.0.0: {}
+
+  has-flag@3.0.0: {}
+
+  has-flag@4.0.0: {}
+
+  has-glob@1.0.0:
+    dependencies:
+      is-glob: 3.1.0
+
+  has-property-descriptors@1.0.2:
+    dependencies:
+      es-define-property: 1.0.1
+
+  has-proto@1.2.0:
+    dependencies:
+      dunder-proto: 1.0.1
+
+  has-symbols@1.1.0: {}
+
+  has-tostringtag@1.0.2:
+    dependencies:
+      has-symbols: 1.1.0
+
+  has-unicode@2.0.1: {}
+
+  has-value@0.3.1:
+    dependencies:
+      get-value: 2.0.6
+      has-values: 0.1.4
+      isobject: 2.1.0
+
+  has-value@1.0.0:
+    dependencies:
+      get-value: 2.0.6
+      has-values: 1.0.0
+      isobject: 3.0.1
+
+  has-values@0.1.4: {}
+
+  has-values@1.0.0:
+    dependencies:
+      is-number: 3.0.0
+      kind-of: 4.0.0
+
+  hasown@2.0.2:
+    dependencies:
+      function-bind: 1.1.2
+
+  he@1.2.0: {}
+
+  history@5.3.0:
+    dependencies:
+      '@babel/runtime': 7.26.9
+
+  hoist-non-react-statics@3.3.2:
+    dependencies:
+      react-is: 16.13.1
+
+  homedir-polyfill@1.0.3:
+    dependencies:
+      parse-passwd: 1.0.0
+
+  hooker@0.2.3: {}
+
+  hosted-git-info@2.8.9: {}
+
+  hpack.js@2.1.6:
+    dependencies:
+      inherits: 2.0.4
+      obuf: 1.1.2
+      readable-stream: 2.3.8
+      wbuf: 1.7.3
+
+  html-encoding-sniffer@1.0.2:
+    dependencies:
+      whatwg-encoding: 1.0.5
+
+  html-encoding-sniffer@2.0.1:
+    dependencies:
+      whatwg-encoding: 1.0.5
+
+  html-encoding-sniffer@3.0.0:
+    dependencies:
+      whatwg-encoding: 2.0.0
+
+  html-entities@2.5.2: {}
+
+  html-escaper@2.0.2: {}
+
+  html-minifier-terser@6.1.0:
+    dependencies:
+      camel-case: 4.1.2
+      clean-css: 5.3.3
+      commander: 8.3.0
+      he: 1.2.0
+      param-case: 3.0.4
+      relateurl: 0.2.7
+      terser: 5.39.0
+
+  html-webpack-plugin@5.6.3(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      '@types/html-minifier-terser': 6.1.0
+      html-minifier-terser: 6.1.0
+      lodash: 4.17.21
+      pretty-error: 4.0.0
+      tapable: 2.2.1
+    optionalDependencies:
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+
+  htmlparser2@6.1.0:
+    dependencies:
+      domelementtype: 2.3.0
+      domhandler: 4.3.1
+      domutils: 2.8.0
+      entities: 2.2.0
+
+  http-deceiver@1.2.7: {}
+
+  http-errors@1.6.3:
+    dependencies:
+      depd: 1.1.2
+      inherits: 2.0.3
+      setprototypeof: 1.1.0
+      statuses: 1.5.0
+
+  http-errors@1.8.1:
+    dependencies:
+      depd: 1.1.2
+      inherits: 2.0.4
+      setprototypeof: 1.2.0
+      statuses: 1.5.0
+      toidentifier: 1.0.1
+
+  http-errors@2.0.0:
+    dependencies:
+      depd: 2.0.0
+      inherits: 2.0.4
+      setprototypeof: 1.2.0
+      statuses: 2.0.1
+      toidentifier: 1.0.1
+
+  http-parser-js@0.5.9: {}
+
+  http-proxy-agent@4.0.1:
+    dependencies:
+      '@tootallnate/once': 1.1.2
+      agent-base: 6.0.2
+      debug: 4.4.0(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  http-proxy-agent@5.0.0:
+    dependencies:
+      '@tootallnate/once': 2.0.0
+      agent-base: 6.0.2
+      debug: 4.4.0(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  http-proxy-middleware@2.0.7(@types/express@4.17.21):
+    dependencies:
+      '@types/http-proxy': 1.17.16
+      http-proxy: 1.18.1
+      is-glob: 4.0.3
+      is-plain-obj: 3.0.0
+      micromatch: 4.0.8
+    optionalDependencies:
+      '@types/express': 4.17.21
+    transitivePeerDependencies:
+      - debug
+
+  http-proxy@1.18.1:
+    dependencies:
+      eventemitter3: 4.0.7
+      follow-redirects: 1.15.9
+      requires-port: 1.0.0
+    transitivePeerDependencies:
+      - debug
+
+  http-signature@1.2.0:
+    dependencies:
+      assert-plus: 1.0.0
+      jsprim: 1.4.2
+      sshpk: 1.18.0
+
+  http-signature@1.3.6:
+    dependencies:
+      assert-plus: 1.0.0
+      jsprim: 2.0.2
+      sshpk: 1.18.0
+
+  https-proxy-agent@5.0.1:
+    dependencies:
+      agent-base: 6.0.2
+      debug: 4.4.0(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  human-signals@1.1.1: {}
+
+  human-signals@2.1.0: {}
+
+  iconv-lite@0.4.24:
+    dependencies:
+      safer-buffer: 2.1.2
+
+  iconv-lite@0.6.3:
+    dependencies:
+      safer-buffer: 2.1.2
+
+  icss-utils@4.1.1:
+    dependencies:
+      postcss: 7.0.39
+
+  identity-obj-proxy@3.0.0:
+    dependencies:
+      harmony-reflect: 1.6.2
+
+  ignore-by-default@1.0.1: {}
+
+  ignore@5.3.2: {}
+
+  immer@10.1.1: {}
+
+  immutable@5.0.3: {}
+
+  import-fresh@3.3.1:
+    dependencies:
+      parent-module: 1.0.1
+      resolve-from: 4.0.0
+
+  import-local@3.2.0:
+    dependencies:
+      pkg-dir: 4.2.0
+      resolve-cwd: 3.0.0
+
+  imurmurhash@0.1.4: {}
+
+  indent-string@3.2.0: {}
+
+  indent-string@4.0.0: {}
+
+  infer-owner@1.0.4: {}
+
+  inflection@1.13.4: {}
+
+  inflight@1.0.6:
+    dependencies:
+      once: 1.4.0
+      wrappy: 1.0.2
+
+  inherits@2.0.3: {}
+
+  inherits@2.0.4: {}
+
+  ini@1.3.7: {}
+
+  ini@1.3.8: {}
+
+  internal-slot@1.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      hasown: 2.0.2
+      side-channel: 1.1.0
+
+  internmap@2.0.3: {}
+
+  interpret@1.1.0: {}
+
+  interpret@3.1.1: {}
+
+  invariant@2.2.4:
+    dependencies:
+      loose-envify: 1.4.0
+
+  ipaddr.js@1.9.1: {}
+
+  ipaddr.js@2.2.0: {}
+
+  is-absolute@1.0.0:
+    dependencies:
+      is-relative: 1.0.0
+      is-windows: 1.0.2
+
+  is-accessor-descriptor@1.0.1:
+    dependencies:
+      hasown: 2.0.2
+
+  is-array-buffer@3.0.5:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      get-intrinsic: 1.2.7
+
+  is-arrayish@0.2.1: {}
+
+  is-async-function@2.1.1:
+    dependencies:
+      async-function: 1.0.0
+      call-bound: 1.0.3
+      get-proto: 1.0.1
+      has-tostringtag: 1.0.2
+      safe-regex-test: 1.1.0
+
+  is-bigint@1.1.0:
+    dependencies:
+      has-bigints: 1.1.0
+
+  is-binary-path@2.1.0:
+    dependencies:
+      binary-extensions: 2.3.0
+
+  is-boolean-object@1.2.2:
+    dependencies:
+      call-bound: 1.0.3
+      has-tostringtag: 1.0.2
+
+  is-buffer@1.1.6: {}
+
+  is-callable@1.2.7: {}
+
+  is-ci@2.0.0:
+    dependencies:
+      ci-info: 2.0.0
+
+  is-core-module@2.16.1:
+    dependencies:
+      hasown: 2.0.2
+
+  is-data-descriptor@1.0.1:
+    dependencies:
+      hasown: 2.0.2
+
+  is-data-view@1.0.2:
+    dependencies:
+      call-bound: 1.0.3
+      get-intrinsic: 1.2.7
+      is-typed-array: 1.1.15
+
+  is-date-object@1.1.0:
+    dependencies:
+      call-bound: 1.0.3
+      has-tostringtag: 1.0.2
+
+  is-descriptor@0.1.7:
+    dependencies:
+      is-accessor-descriptor: 1.0.1
+      is-data-descriptor: 1.0.1
+
+  is-descriptor@1.0.3:
+    dependencies:
+      is-accessor-descriptor: 1.0.1
+      is-data-descriptor: 1.0.1
+
+  is-directory@0.3.1: {}
+
+  is-docker@2.2.1: {}
+
+  is-extendable@0.1.1: {}
+
+  is-extendable@1.0.1:
+    dependencies:
+      is-plain-object: 2.0.4
+
+  is-extglob@2.1.1: {}
+
+  is-finalizationregistry@1.1.1:
+    dependencies:
+      call-bound: 1.0.3
+
+  is-fullwidth-code-point@1.0.0:
+    dependencies:
+      number-is-nan: 1.0.1
+
+  is-fullwidth-code-point@2.0.0: {}
+
+  is-fullwidth-code-point@3.0.0: {}
+
+  is-generator-fn@2.1.0: {}
+
+  is-generator-function@1.1.0:
+    dependencies:
+      call-bound: 1.0.3
+      get-proto: 1.0.1
+      has-tostringtag: 1.0.2
+      safe-regex-test: 1.1.0
+
+  is-glob@3.1.0:
+    dependencies:
+      is-extglob: 2.1.1
+
+  is-glob@4.0.3:
+    dependencies:
+      is-extglob: 2.1.1
+
+  is-installed-globally@0.3.2:
+    dependencies:
+      global-dirs: 2.1.0
+      is-path-inside: 3.0.3
+
+  is-map@2.0.3: {}
+
+  is-module@1.0.0: {}
+
+  is-number-object@1.1.1:
+    dependencies:
+      call-bound: 1.0.3
+      has-tostringtag: 1.0.2
+
+  is-number@3.0.0:
+    dependencies:
+      kind-of: 3.2.2
+
+  is-number@7.0.0: {}
+
+  is-observable@1.1.0:
+    dependencies:
+      symbol-observable: 1.2.0
+
+  is-path-inside@3.0.3: {}
+
+  is-plain-obj@1.1.0: {}
+
+  is-plain-obj@3.0.0: {}
+
+  is-plain-object@2.0.4:
+    dependencies:
+      isobject: 3.0.1
+
+  is-potential-custom-element-name@1.0.1: {}
+
+  is-promise@2.2.2: {}
+
+  is-property@1.0.2: {}
+
+  is-reference@1.2.1:
+    dependencies:
+      '@types/estree': 1.0.6
+
+  is-regex@1.2.1:
+    dependencies:
+      call-bound: 1.0.3
+      gopd: 1.2.0
+      has-tostringtag: 1.0.2
+      hasown: 2.0.2
+
+  is-relative@1.0.0:
+    dependencies:
+      is-unc-path: 1.0.0
+
+  is-set@2.0.3: {}
+
+  is-shared-array-buffer@1.0.4:
+    dependencies:
+      call-bound: 1.0.3
+
+  is-stream@1.1.0: {}
+
+  is-stream@2.0.1: {}
+
+  is-string@1.1.1:
+    dependencies:
+      call-bound: 1.0.3
+      has-tostringtag: 1.0.2
+
+  is-symbol@1.1.1:
+    dependencies:
+      call-bound: 1.0.3
+      has-symbols: 1.1.0
+      safe-regex-test: 1.1.0
+
+  is-typed-array@1.1.15:
+    dependencies:
+      which-typed-array: 1.1.18
+
+  is-typedarray@1.0.0: {}
+
+  is-unc-path@1.0.0:
+    dependencies:
+      unc-path-regex: 0.1.2
+
+  is-unicode-supported@0.1.0: {}
+
+  is-valid-glob@1.0.0: {}
+
+  is-weakmap@2.0.2: {}
+
+  is-weakref@1.1.1:
+    dependencies:
+      call-bound: 1.0.3
+
+  is-weakset@2.0.4:
+    dependencies:
+      call-bound: 1.0.3
+      get-intrinsic: 1.2.7
+
+  is-what@3.14.1: {}
+
+  is-windows@1.0.2: {}
+
+  is-wsl@2.2.0:
+    dependencies:
+      is-docker: 2.2.1
+
+  isarray@0.0.1: {}
+
+  isarray@1.0.0: {}
+
+  isarray@2.0.5: {}
+
+  isexe@2.0.0: {}
+
+  isobject@2.1.0:
+    dependencies:
+      isarray: 1.0.0
+
+  isobject@3.0.1: {}
+
+  isstream@0.1.2: {}
+
+  istanbul-lib-coverage@3.2.2: {}
+
+  istanbul-lib-instrument@4.0.3:
+    dependencies:
+      '@babel/core': 7.26.9
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-coverage: 3.2.2
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  istanbul-lib-instrument@5.2.1:
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/parser': 7.26.9
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-coverage: 3.2.2
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  istanbul-lib-instrument@6.0.3:
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/parser': 7.26.9
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-coverage: 3.2.2
+      semver: 7.7.1
+    transitivePeerDependencies:
+      - supports-color
+
+  istanbul-lib-report@3.0.1:
+    dependencies:
+      istanbul-lib-coverage: 3.2.2
+      make-dir: 4.0.0
+      supports-color: 7.2.0
+
+  istanbul-lib-source-maps@4.0.1:
+    dependencies:
+      debug: 4.4.0(supports-color@5.5.0)
+      istanbul-lib-coverage: 3.2.2
+      source-map: 0.6.1
+    transitivePeerDependencies:
+      - supports-color
+
+  istanbul-reports@3.1.7:
+    dependencies:
+      html-escaper: 2.0.2
+      istanbul-lib-report: 3.0.1
+
+  iterall@1.3.0: {}
+
+  iterator.prototype@1.1.5:
+    dependencies:
+      define-data-property: 1.1.4
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.2.7
+      get-proto: 1.0.1
+      has-symbols: 1.1.0
+      set-function-name: 2.0.2
+
+  jackspeak@4.0.3:
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+
+  jake@10.9.2:
+    dependencies:
+      async: 3.2.6
+      chalk: 4.1.2
+      filelist: 1.0.4
+      minimatch: 3.1.2
+
+  jest-changed-files@26.6.2:
+    dependencies:
+      '@jest/types': 26.6.2
+      execa: 4.1.0
+      throat: 5.0.0
+
+  jest-changed-files@29.7.0:
+    dependencies:
+      execa: 5.1.1
+      jest-util: 29.7.0
+      p-limit: 3.1.0
+
+  jest-circus@29.7.0(babel-plugin-macros@3.1.0):
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/expect': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.11
+      chalk: 4.1.2
+      co: 4.6.0
+      dedent: 1.5.3(babel-plugin-macros@3.1.0)
+      is-generator-fn: 2.1.0
+      jest-each: 29.7.0
+      jest-matcher-utils: 29.7.0
+      jest-message-util: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      p-limit: 3.1.0
+      pretty-format: 29.7.0
+      pure-rand: 6.1.0
+      slash: 3.0.0
+      stack-utils: 2.0.6
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  jest-cli@26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3)):
+    dependencies:
+      '@jest/core': 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      '@jest/test-result': 26.6.2
+      '@jest/types': 26.6.2
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      import-local: 3.2.0
+      is-ci: 2.0.0
+      jest-config: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-util: 26.6.2
+      jest-validate: 26.6.2
+      prompts: 2.4.2
+      yargs: 15.4.1
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+
+  jest-cli@29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5)):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5))
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      create-jest: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5))
+      exit: 0.1.2
+      import-local: 3.2.0
+      jest-config: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5))
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      yargs: 17.7.2
+    optionalDependencies:
+      node-notifier: 8.0.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  jest-cli@29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3)):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      create-jest: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      exit: 0.1.2
+      import-local: 3.2.0
+      jest-config: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      yargs: 17.7.2
+    optionalDependencies:
+      node-notifier: 8.0.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  jest-config@26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3)):
+    dependencies:
+      '@babel/core': 7.26.9
+      '@jest/test-sequencer': 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      '@jest/types': 26.6.2
+      babel-jest: 26.6.3(@babel/core@7.26.9)
+      chalk: 4.1.2
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-environment-jsdom: 26.6.2
+      jest-environment-node: 26.6.2
+      jest-get-type: 26.3.0
+      jest-jasmine2: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-regex-util: 26.0.0
+      jest-resolve: 26.6.2
+      jest-util: 26.6.2
+      jest-validate: 26.6.2
+      micromatch: 4.0.8
+      pretty-format: 26.6.2
+    optionalDependencies:
+      ts-node: 10.9.2(@types/node@20.19.11)(typescript@5.7.3)
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - utf-8-validate
+
+  jest-config@29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5)):
+    dependencies:
+      '@babel/core': 7.26.9
+      '@jest/test-sequencer': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.26.9)
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.7.0(babel-plugin-macros@3.1.0)
+      jest-environment-node: 29.7.0
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-runner: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      micromatch: 4.0.8
+      parse-json: 5.2.0
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 20.19.11
+      ts-node: 10.9.2(@types/node@20.19.11)(typescript@4.9.5)
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  jest-config@29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3)):
+    dependencies:
+      '@babel/core': 7.26.9
+      '@jest/test-sequencer': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.26.9)
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.7.0(babel-plugin-macros@3.1.0)
+      jest-environment-node: 29.7.0
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-runner: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      micromatch: 4.0.8
+      parse-json: 5.2.0
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 20.19.11
+      ts-node: 10.9.2(@types/node@20.19.11)(typescript@5.7.3)
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  jest-css-modules@2.1.0:
+    dependencies:
+      identity-obj-proxy: 3.0.0
+
+  jest-diff@26.6.2:
+    dependencies:
+      chalk: 4.1.2
+      diff-sequences: 26.6.2
+      jest-get-type: 26.3.0
+      pretty-format: 26.6.2
+
+  jest-diff@29.7.0:
+    dependencies:
+      chalk: 4.1.2
+      diff-sequences: 29.6.3
+      jest-get-type: 29.6.3
+      pretty-format: 29.7.0
+
+  jest-docblock@26.0.0:
+    dependencies:
+      detect-newline: 3.1.0
+
+  jest-docblock@29.7.0:
+    dependencies:
+      detect-newline: 3.1.0
+
+  jest-each@26.6.2:
+    dependencies:
+      '@jest/types': 26.6.2
+      chalk: 4.1.2
+      jest-get-type: 26.3.0
+      jest-util: 26.6.2
+      pretty-format: 26.6.2
+
+  jest-each@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      jest-get-type: 29.6.3
+      jest-util: 29.7.0
+      pretty-format: 29.7.0
+
+  jest-environment-jsdom@26.6.2:
+    dependencies:
+      '@jest/environment': 26.6.2
+      '@jest/fake-timers': 26.6.2
+      '@jest/types': 26.6.2
+      '@types/node': 20.19.11
+      jest-mock: 26.6.2
+      jest-util: 26.6.2
+      jsdom: 16.7.0
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - utf-8-validate
+
+  jest-environment-jsdom@29.7.0:
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/fake-timers': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/jsdom': 20.0.1
+      '@types/node': 20.19.11
+      jest-mock: 29.7.0
+      jest-util: 29.7.0
+      jsdom: 20.0.3
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+
+  jest-environment-node@26.6.2:
+    dependencies:
+      '@jest/environment': 26.6.2
+      '@jest/fake-timers': 26.6.2
+      '@jest/types': 26.6.2
+      '@types/node': 20.19.11
+      jest-mock: 26.6.2
+      jest-util: 26.6.2
+
+  jest-environment-node@29.7.0:
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/fake-timers': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.11
+      jest-mock: 29.7.0
+      jest-util: 29.7.0
+
+  jest-get-type@26.3.0: {}
+
+  jest-get-type@29.6.3: {}
+
+  jest-haste-map@26.6.2:
+    dependencies:
+      '@jest/types': 26.6.2
+      '@types/graceful-fs': 4.1.9
+      '@types/node': 20.19.11
+      anymatch: 3.1.3
+      fb-watchman: 2.0.2
+      graceful-fs: 4.2.11
+      jest-regex-util: 26.0.0
+      jest-serializer: 26.6.2
+      jest-util: 26.6.2
+      jest-worker: 26.6.2
+      micromatch: 4.0.8
+      sane: 4.1.0
+      walker: 1.0.8
+    optionalDependencies:
+      fsevents: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+
+  jest-haste-map@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      '@types/graceful-fs': 4.1.9
+      '@types/node': 20.19.11
+      anymatch: 3.1.3
+      fb-watchman: 2.0.2
+      graceful-fs: 4.2.11
+      jest-regex-util: 29.6.3
+      jest-util: 29.7.0
+      jest-worker: 29.7.0
+      micromatch: 4.0.8
+      walker: 1.0.8
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  jest-jasmine2@26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3)):
+    dependencies:
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+      '@jest/environment': 26.6.2
+      '@jest/source-map': 26.6.2
+      '@jest/test-result': 26.6.2
+      '@jest/types': 26.6.2
+      '@types/node': 20.19.11
+      chalk: 4.1.2
+      co: 4.6.0
+      expect: 26.6.2
+      is-generator-fn: 2.1.0
+      jest-each: 26.6.2
+      jest-matcher-utils: 26.6.2
+      jest-message-util: 26.6.2
+      jest-runtime: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-snapshot: 26.6.2
+      jest-util: 26.6.2
+      pretty-format: 26.6.2
+      throat: 5.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+
+  jest-leak-detector@26.6.2:
+    dependencies:
+      jest-get-type: 26.3.0
+      pretty-format: 26.6.2
+
+  jest-leak-detector@29.7.0:
+    dependencies:
+      jest-get-type: 29.6.3
+      pretty-format: 29.7.0
+
+  jest-matcher-utils@26.6.2:
+    dependencies:
+      chalk: 4.1.2
+      jest-diff: 26.6.2
+      jest-get-type: 26.3.0
+      pretty-format: 26.6.2
+
+  jest-matcher-utils@29.7.0:
+    dependencies:
+      chalk: 4.1.2
+      jest-diff: 29.7.0
+      jest-get-type: 29.6.3
+      pretty-format: 29.7.0
+
+  jest-message-util@26.6.2:
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@jest/types': 26.6.2
+      '@types/stack-utils': 2.0.3
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      micromatch: 4.0.8
+      pretty-format: 26.6.2
+      slash: 3.0.0
+      stack-utils: 2.0.6
+
+  jest-message-util@29.7.0:
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@jest/types': 29.6.3
+      '@types/stack-utils': 2.0.3
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      micromatch: 4.0.8
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      stack-utils: 2.0.6
+
+  jest-mock@26.6.2:
+    dependencies:
+      '@jest/types': 26.6.2
+      '@types/node': 20.19.11
+
+  jest-mock@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.11
+      jest-util: 29.7.0
+
+  jest-pnp-resolver@1.2.3(jest-resolve@26.6.2):
+    optionalDependencies:
+      jest-resolve: 26.6.2
+
+  jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
+    optionalDependencies:
+      jest-resolve: 29.7.0
+
+  jest-regex-util@26.0.0: {}
+
+  jest-regex-util@29.6.3: {}
+
+  jest-resolve-dependencies@26.6.3:
+    dependencies:
+      '@jest/types': 26.6.2
+      jest-regex-util: 26.0.0
+      jest-snapshot: 26.6.2
+    transitivePeerDependencies:
+      - supports-color
+
+  jest-resolve-dependencies@29.7.0:
+    dependencies:
+      jest-regex-util: 29.6.3
+      jest-snapshot: 29.7.0
+    transitivePeerDependencies:
+      - supports-color
+
+  jest-resolve@26.6.2:
+    dependencies:
+      '@jest/types': 26.6.2
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      jest-pnp-resolver: 1.2.3(jest-resolve@26.6.2)
+      jest-util: 26.6.2
+      read-pkg-up: 7.0.1
+      resolve: 1.22.10
+      slash: 3.0.0
+
+  jest-resolve@29.7.0:
+    dependencies:
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      jest-pnp-resolver: 1.2.3(jest-resolve@29.7.0)
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      resolve: 1.22.10
+      resolve.exports: 2.0.3
+      slash: 3.0.0
+
+  jest-runner@26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3)):
+    dependencies:
+      '@jest/console': 26.6.2
+      '@jest/environment': 26.6.2
+      '@jest/test-result': 26.6.2
+      '@jest/types': 26.6.2
+      '@types/node': 20.19.11
+      chalk: 4.1.2
+      emittery: 0.7.2
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-config: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-docblock: 26.0.0
+      jest-haste-map: 26.6.2
+      jest-leak-detector: 26.6.2
+      jest-message-util: 26.6.2
+      jest-resolve: 26.6.2
+      jest-runtime: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-util: 26.6.2
+      jest-worker: 26.6.2
+      source-map-support: 0.5.21
+      throat: 5.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+
+  jest-runner@29.7.0:
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/environment': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.11
+      chalk: 4.1.2
+      emittery: 0.13.1
+      graceful-fs: 4.2.11
+      jest-docblock: 29.7.0
+      jest-environment-node: 29.7.0
+      jest-haste-map: 29.7.0
+      jest-leak-detector: 29.7.0
+      jest-message-util: 29.7.0
+      jest-resolve: 29.7.0
+      jest-runtime: 29.7.0
+      jest-util: 29.7.0
+      jest-watcher: 29.7.0
+      jest-worker: 29.7.0
+      p-limit: 3.1.0
+      source-map-support: 0.5.13
+    transitivePeerDependencies:
+      - supports-color
+
+  jest-runtime@26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3)):
+    dependencies:
+      '@jest/console': 26.6.2
+      '@jest/environment': 26.6.2
+      '@jest/fake-timers': 26.6.2
+      '@jest/globals': 26.6.2
+      '@jest/source-map': 26.6.2
+      '@jest/test-result': 26.6.2
+      '@jest/transform': 26.6.2
+      '@jest/types': 26.6.2
+      '@types/yargs': 15.0.19
+      chalk: 4.1.2
+      cjs-module-lexer: 0.6.0
+      collect-v8-coverage: 1.0.2
+      exit: 0.1.2
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-config: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      jest-haste-map: 26.6.2
+      jest-message-util: 26.6.2
+      jest-mock: 26.6.2
+      jest-regex-util: 26.0.0
+      jest-resolve: 26.6.2
+      jest-snapshot: 26.6.2
+      jest-util: 26.6.2
+      jest-validate: 26.6.2
+      slash: 3.0.0
+      strip-bom: 4.0.0
+      yargs: 15.4.1
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+
+  jest-runtime@29.7.0:
+    dependencies:
+      '@jest/environment': 29.7.0
+      '@jest/fake-timers': 29.7.0
+      '@jest/globals': 29.7.0
+      '@jest/source-map': 29.6.3
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.11
+      chalk: 4.1.2
+      cjs-module-lexer: 1.4.3
+      collect-v8-coverage: 1.0.2
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-mock: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      slash: 3.0.0
+      strip-bom: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  jest-serializer@26.6.2:
+    dependencies:
+      '@types/node': 20.19.11
+      graceful-fs: 4.2.11
+
+  jest-snapshot@26.6.2:
+    dependencies:
+      '@babel/types': 7.26.9
+      '@jest/types': 26.6.2
+      '@types/babel__traverse': 7.20.6
+      '@types/prettier': 2.7.3
+      chalk: 4.1.2
+      expect: 26.6.2
+      graceful-fs: 4.2.11
+      jest-diff: 26.6.2
+      jest-get-type: 26.3.0
+      jest-haste-map: 26.6.2
+      jest-matcher-utils: 26.6.2
+      jest-message-util: 26.6.2
+      jest-resolve: 26.6.2
+      natural-compare: 1.4.0
+      pretty-format: 26.6.2
+      semver: 7.7.1
+    transitivePeerDependencies:
+      - supports-color
+
+  jest-snapshot@29.7.0:
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/generator': 7.26.9
+      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.9)
+      '@babel/types': 7.26.9
+      '@jest/expect-utils': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      babel-preset-current-node-syntax: 1.1.0(@babel/core@7.26.9)
+      chalk: 4.1.2
+      expect: 29.7.0
+      graceful-fs: 4.2.11
+      jest-diff: 29.7.0
+      jest-get-type: 29.6.3
+      jest-matcher-utils: 29.7.0
+      jest-message-util: 29.7.0
+      jest-util: 29.7.0
+      natural-compare: 1.4.0
+      pretty-format: 29.7.0
+      semver: 7.7.1
+    transitivePeerDependencies:
+      - supports-color
+
+  jest-util@26.6.2:
+    dependencies:
+      '@jest/types': 26.6.2
+      '@types/node': 20.19.11
+      chalk: 4.1.2
+      graceful-fs: 4.2.11
+      is-ci: 2.0.0
+      micromatch: 4.0.8
+
+  jest-util@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.11
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      graceful-fs: 4.2.11
+      picomatch: 2.3.1
+
+  jest-validate@26.6.2:
+    dependencies:
+      '@jest/types': 26.6.2
+      camelcase: 6.3.0
+      chalk: 4.1.2
+      jest-get-type: 26.3.0
+      leven: 3.1.0
+      pretty-format: 26.6.2
+
+  jest-validate@29.7.0:
+    dependencies:
+      '@jest/types': 29.6.3
+      camelcase: 6.3.0
+      chalk: 4.1.2
+      jest-get-type: 29.6.3
+      leven: 3.1.0
+      pretty-format: 29.7.0
+
+  jest-watcher@26.6.2:
+    dependencies:
+      '@jest/test-result': 26.6.2
+      '@jest/types': 26.6.2
+      '@types/node': 20.19.11
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      jest-util: 26.6.2
+      string-length: 4.0.2
+
+  jest-watcher@29.7.0:
+    dependencies:
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.19.11
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      emittery: 0.13.1
+      jest-util: 29.7.0
+      string-length: 4.0.2
+
+  jest-worker@26.6.2:
+    dependencies:
+      '@types/node': 20.19.11
+      merge-stream: 2.0.0
+      supports-color: 7.2.0
+
+  jest-worker@27.5.1:
+    dependencies:
+      '@types/node': 20.19.11
+      merge-stream: 2.0.0
+      supports-color: 8.1.1
+
+  jest-worker@29.7.0:
+    dependencies:
+      '@types/node': 20.19.11
+      jest-util: 29.7.0
+      merge-stream: 2.0.0
+      supports-color: 8.1.1
+
+  jest@26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3)):
+    dependencies:
+      '@jest/core': 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      import-local: 3.2.0
+      jest-cli: 26.6.3(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - ts-node
+      - utf-8-validate
+
+  jest@29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5)):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5))
+      '@jest/types': 29.6.3
+      import-local: 3.2.0
+      jest-cli: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5))
+    optionalDependencies:
+      node-notifier: 8.0.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  jest@29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3)):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+      '@jest/types': 29.6.3
+      import-local: 3.2.0
+      jest-cli: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3))
+    optionalDependencies:
+      node-notifier: 8.0.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  js-base64@2.6.4: {}
+
+  js-cookie@3.0.5: {}
+
+  js-tokens@4.0.0: {}
+
+  js-yaml@3.14.1:
+    dependencies:
+      argparse: 1.0.10
+      esprima: 4.0.1
+
+  js-yaml@4.1.0:
+    dependencies:
+      argparse: 2.0.1
+
+  jsbn@0.1.1: {}
+
+  jsdom@13.2.0:
+    dependencies:
+      abab: 2.0.6
+      acorn: 6.4.2
+      acorn-globals: 4.3.4
+      array-equal: 1.0.2
+      cssom: 0.3.8
+      cssstyle: 1.4.0
+      data-urls: 1.1.0
+      domexception: 1.0.1
+      escodegen: 1.14.3
+      html-encoding-sniffer: 1.0.2
+      nwsapi: 2.2.16
+      parse5: 5.1.0
+      pn: 1.1.0
+      request: 2.88.2
+      request-promise-native: 1.0.9(request@2.88.2)
+      saxes: 3.1.11
+      symbol-tree: 3.2.4
+      tough-cookie: 2.5.0
+      w3c-hr-time: 1.0.2
+      w3c-xmlserializer: 1.1.2
+      webidl-conversions: 4.0.2
+      whatwg-encoding: 1.0.5
+      whatwg-mimetype: 2.3.0
+      whatwg-url: 7.1.0
+      ws: 6.2.3
+      xml-name-validator: 3.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  jsdom@16.7.0:
+    dependencies:
+      abab: 2.0.6
+      acorn: 8.14.0
+      acorn-globals: 6.0.0
+      cssom: 0.4.4
+      cssstyle: 2.3.0
+      data-urls: 2.0.0
+      decimal.js: 10.5.0
+      domexception: 2.0.1
+      escodegen: 2.1.0
+      form-data: 3.0.3
+      html-encoding-sniffer: 2.0.1
+      http-proxy-agent: 4.0.1
+      https-proxy-agent: 5.0.1
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.16
+      parse5: 6.0.1
+      saxes: 5.0.1
+      symbol-tree: 3.2.4
+      tough-cookie: 4.1.4
+      w3c-hr-time: 1.0.2
+      w3c-xmlserializer: 2.0.0
+      webidl-conversions: 6.1.0
+      whatwg-encoding: 1.0.5
+      whatwg-mimetype: 2.3.0
+      whatwg-url: 8.7.0
+      ws: 7.5.10
+      xml-name-validator: 3.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+
+  jsdom@20.0.3:
+    dependencies:
+      abab: 2.0.6
+      acorn: 8.14.0
+      acorn-globals: 7.0.1
+      cssom: 0.5.0
+      cssstyle: 2.3.0
+      data-urls: 3.0.2
+      decimal.js: 10.5.0
+      domexception: 4.0.0
+      escodegen: 2.1.0
+      form-data: 4.0.2
+      html-encoding-sniffer: 3.0.0
+      http-proxy-agent: 5.0.0
+      https-proxy-agent: 5.0.1
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.16
+      parse5: 7.2.1
+      saxes: 6.0.0
+      symbol-tree: 3.2.4
+      tough-cookie: 4.1.4
+      w3c-xmlserializer: 4.0.0
+      webidl-conversions: 7.0.0
+      whatwg-encoding: 2.0.0
+      whatwg-mimetype: 3.0.0
+      whatwg-url: 11.0.0
+      ws: 8.18.0
+      xml-name-validator: 4.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+
+  jsesc@3.0.2: {}
+
+  jsesc@3.1.0: {}
+
+  json-bigint@1.0.0:
+    dependencies:
+      bignumber.js: 9.1.2
+
+  json-buffer@3.0.1: {}
+
+  json-loader@0.5.4: {}
+
+  json-parse-better-errors@1.0.2: {}
+
+  json-parse-even-better-errors@2.3.1: {}
+
+  json-schema-traverse@0.4.1: {}
+
+  json-schema-traverse@1.0.0: {}
+
+  json-schema@0.4.0: {}
+
+  json-stable-stringify-without-jsonify@1.0.1: {}
+
+  json-stringify-safe@5.0.1: {}
+
+  json5@0.5.1: {}
+
+  json5@1.0.2:
+    dependencies:
+      minimist: 1.2.8
+
+  json5@2.2.3: {}
+
+  jsonfile@4.0.0:
+    optionalDependencies:
+      graceful-fs: 4.2.11
+
+  jsonfile@6.1.0:
+    dependencies:
+      universalify: 2.0.1
+    optionalDependencies:
+      graceful-fs: 4.2.11
+
+  jsonwebtoken@9.0.2:
+    dependencies:
+      jws: 3.2.2
+      lodash.includes: 4.3.0
+      lodash.isboolean: 3.0.3
+      lodash.isinteger: 4.0.4
+      lodash.isnumber: 3.0.3
+      lodash.isplainobject: 4.0.6
+      lodash.isstring: 4.0.1
+      lodash.once: 4.1.1
+      ms: 2.1.3
+      semver: 7.7.1
+
+  jsprim@1.4.2:
+    dependencies:
+      assert-plus: 1.0.0
+      extsprintf: 1.3.0
+      json-schema: 0.4.0
+      verror: 1.10.0
+
+  jsprim@2.0.2:
+    dependencies:
+      assert-plus: 1.0.0
+      extsprintf: 1.3.0
+      json-schema: 0.4.0
+      verror: 1.10.0
+
+  jsx-ast-utils@3.3.5:
+    dependencies:
+      array-includes: 3.1.8
+      array.prototype.flat: 1.3.3
+      object.assign: 4.1.7
+      object.values: 1.2.1
+
+  just-extend@4.2.1: {}
+
+  jwa@1.4.1:
+    dependencies:
+      buffer-equal-constant-time: 1.0.1
+      ecdsa-sig-formatter: 1.0.11
+      safe-buffer: 5.2.1
+
+  jwa@2.0.0:
+    dependencies:
+      buffer-equal-constant-time: 1.0.1
+      ecdsa-sig-formatter: 1.0.11
+      safe-buffer: 5.2.1
+
+  jws@3.2.2:
+    dependencies:
+      jwa: 1.4.1
+      safe-buffer: 5.2.1
+
+  jws@4.0.0:
+    dependencies:
+      jwa: 2.0.0
+      safe-buffer: 5.2.1
+
+  keyv@4.5.4:
+    dependencies:
+      json-buffer: 3.0.1
+
+  kind-of@3.2.2:
+    dependencies:
+      is-buffer: 1.1.6
+
+  kind-of@4.0.0:
+    dependencies:
+      is-buffer: 1.1.6
+
+  kind-of@6.0.3: {}
+
+  kleur@3.0.3: {}
+
+  language-subtag-registry@0.3.23: {}
+
+  language-tags@1.0.9:
+    dependencies:
+      language-subtag-registry: 0.3.23
+
+  launch-editor@2.10.0:
+    dependencies:
+      picocolors: 1.1.1
+      shell-quote: 1.8.2
+
+  lazy-ass@1.6.0: {}
+
+  lcov-parse@1.0.0: {}
+
+  leven@3.1.0: {}
+
+  levn@0.3.0:
+    dependencies:
+      prelude-ls: 1.1.2
+      type-check: 0.3.2
+
+  levn@0.4.1:
+    dependencies:
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+
+  liftup@3.0.1:
+    dependencies:
+      extend: 3.0.2
+      findup-sync: 4.0.0
+      fined: 1.2.0
+      flagged-respawn: 1.0.1
+      is-plain-object: 2.0.4
+      object.map: 1.0.1
+      rechoir: 0.7.1
+      resolve: 1.22.10
+
+  lines-and-columns@1.2.4: {}
+
+  listr-silent-renderer@1.1.1: {}
+
+  listr-update-renderer@0.5.0(listr@0.14.3):
+    dependencies:
+      chalk: 1.1.3
+      cli-truncate: 0.2.1
+      elegant-spinner: 1.0.1
+      figures: 1.7.0
+      indent-string: 3.2.0
+      listr: 0.14.3
+      log-symbols: 1.0.2
+      log-update: 2.3.0
+      strip-ansi: 3.0.1
+
+  listr-verbose-renderer@0.5.0:
+    dependencies:
+      chalk: 2.4.2
+      cli-cursor: 2.1.0
+      date-fns: 1.30.1
+      figures: 2.0.0
+
+  listr@0.14.3:
+    dependencies:
+      '@samverschueren/stream-to-observable': 0.3.1(rxjs@6.6.7)
+      is-observable: 1.1.0
+      is-promise: 2.2.2
+      is-stream: 1.1.0
+      listr-silent-renderer: 1.1.1
+      listr-update-renderer: 0.5.0(listr@0.14.3)
+      listr-verbose-renderer: 0.5.0
+      p-map: 2.1.0
+      rxjs: 6.6.7
+    transitivePeerDependencies:
+      - zen-observable
+      - zenObservable
+
+  livereload-js@2.4.0: {}
+
+  load-json-file@4.0.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      parse-json: 4.0.0
+      pify: 3.0.0
+      strip-bom: 3.0.0
+
+  loader-runner@4.3.0: {}
+
+  loader-utils@0.2.17:
+    dependencies:
+      big.js: 3.2.0
+      emojis-list: 2.1.0
+      json5: 0.5.1
+      object-assign: 4.1.1
+
+  loader-utils@1.4.2:
+    dependencies:
+      big.js: 5.2.2
+      emojis-list: 3.0.0
+      json5: 1.0.2
+
+  loader-utils@2.0.4:
+    dependencies:
+      big.js: 5.2.2
+      emojis-list: 3.0.0
+      json5: 2.2.3
+
+  locate-path@3.0.0:
+    dependencies:
+      p-locate: 3.0.0
+      path-exists: 3.0.0
+
+  locate-path@5.0.0:
+    dependencies:
+      p-locate: 4.1.0
+
+  locate-path@6.0.0:
+    dependencies:
+      p-locate: 5.0.0
+
+  lodash.debounce@4.0.8: {}
+
+  lodash.get@4.4.2: {}
+
+  lodash.includes@4.3.0: {}
+
+  lodash.isboolean@3.0.3: {}
+
+  lodash.isinteger@4.0.4: {}
+
+  lodash.isnumber@3.0.3: {}
+
+  lodash.isplainobject@4.0.6: {}
+
+  lodash.isstring@4.0.1: {}
+
+  lodash.memoize@4.1.2: {}
+
+  lodash.merge@4.6.2: {}
+
+  lodash.once@4.1.1: {}
+
+  lodash.sortby@4.7.0: {}
+
+  lodash@4.17.21: {}
+
+  log-driver@1.2.7: {}
+
+  log-symbols@1.0.2:
+    dependencies:
+      chalk: 1.1.3
+
+  log-symbols@4.1.0:
+    dependencies:
+      chalk: 4.1.2
+      is-unicode-supported: 0.1.0
+
+  log-update@2.3.0:
+    dependencies:
+      ansi-escapes: 3.2.0
+      cli-cursor: 2.1.0
+      wrap-ansi: 3.0.1
+
+  loglevel-colored-level-prefix@1.0.0:
+    dependencies:
+      chalk: 1.1.3
+      loglevel: 1.9.2
+
+  loglevel@1.9.2: {}
+
+  lolex@5.1.2:
+    dependencies:
+      '@sinonjs/commons': 1.8.6
+
+  long@4.0.0: {}
+
+  loose-envify@1.4.0:
+    dependencies:
+      js-tokens: 4.0.0
+
+  lower-case@2.0.2:
+    dependencies:
+      tslib: 2.8.1
+
+  lru-cache@11.0.2: {}
+
+  lru-cache@5.1.1:
+    dependencies:
+      yallist: 3.1.1
+
+  lru-cache@6.0.0:
+    dependencies:
+      yallist: 4.0.0
+
+  lru-cache@7.18.3: {}
+
+  lz-string@1.5.0: {}
+
+  magic-string@0.25.9:
+    dependencies:
+      sourcemap-codec: 1.4.8
+
+  make-dir@3.1.0:
+    dependencies:
+      semver: 6.3.1
+
+  make-dir@4.0.0:
+    dependencies:
+      semver: 7.7.1
+
+  make-error@1.3.6: {}
+
+  make-iterator@1.0.1:
+    dependencies:
+      kind-of: 6.0.3
+
+  makeerror@1.0.12:
+    dependencies:
+      tmpl: 1.0.5
+
+  map-cache@0.2.2: {}
+
+  map-visit@1.0.0:
+    dependencies:
+      object-visit: 1.0.1
+
+  matched@1.0.2:
+    dependencies:
+      arr-union: 3.1.0
+      async-array-reduce: 0.2.1
+      glob: 7.2.3
+      has-glob: 1.0.0
+      is-valid-glob: 1.0.0
+      resolve-dir: 1.0.1
+
+  math-intrinsics@1.1.0: {}
+
+  maxmin@3.0.0:
+    dependencies:
+      chalk: 4.1.2
+      figures: 3.2.0
+      gzip-size: 5.1.1
+      pretty-bytes: 5.6.0
+
+  md5-file@5.0.0: {}
+
+  media-typer@0.3.0: {}
+
+  memfs@3.5.3:
+    dependencies:
+      fs-monkey: 1.0.6
+
+  memoize-one@5.2.1: {}
+
+  memoize-one@6.0.0: {}
+
+  memorystream@0.3.1: {}
+
+  merge-anything@2.4.4:
+    dependencies:
+      is-what: 3.14.1
+
+  merge-descriptors@1.0.3: {}
+
+  merge-stream@2.0.0: {}
+
+  merge2@1.4.1: {}
+
+  methods@1.1.2: {}
+
+  micromatch@3.1.10:
+    dependencies:
+      arr-diff: 4.0.0
+      array-unique: 0.3.2
+      braces: 2.3.2
+      define-property: 2.0.2
+      extend-shallow: 3.0.2
+      extglob: 2.0.4
+      fragment-cache: 0.2.1
+      kind-of: 6.0.3
+      nanomatch: 1.2.13
+      object.pick: 1.3.0
+      regex-not: 1.0.2
+      snapdragon: 0.8.2
+      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  micromatch@4.0.8:
+    dependencies:
+      braces: 3.0.3
+      picomatch: 2.3.1
+
+  mime-db@1.52.0: {}
+
+  mime-db@1.53.0: {}
+
+  mime-types@2.1.35:
+    dependencies:
+      mime-db: 1.52.0
+
+  mime@1.6.0: {}
+
+  mimic-fn@1.2.0: {}
+
+  mimic-fn@2.1.0: {}
+
+  mini-css-extract-plugin@0.8.2(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      loader-utils: 1.4.2
+      normalize-url: 1.9.1
+      schema-utils: 1.0.0
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+      webpack-sources: 1.4.3
+
+  minimalistic-assert@1.0.1: {}
+
+  minimatch@10.0.1:
+    dependencies:
+      brace-expansion: 2.0.1
+
+  minimatch@3.0.8:
+    dependencies:
+      brace-expansion: 1.1.11
+
+  minimatch@3.1.2:
+    dependencies:
+      brace-expansion: 1.1.11
+
+  minimatch@5.1.6:
+    dependencies:
+      brace-expansion: 2.0.1
+
+  minimatch@9.0.3:
+    dependencies:
+      brace-expansion: 2.0.1
+
+  minimist@1.2.8: {}
+
+  minipass-collect@1.0.2:
+    dependencies:
+      minipass: 3.3.6
+
+  minipass-flush@1.0.5:
+    dependencies:
+      minipass: 3.3.6
+
+  minipass-pipeline@1.2.4:
+    dependencies:
+      minipass: 3.3.6
+
+  minipass@3.3.6:
+    dependencies:
+      yallist: 4.0.0
+
+  minipass@5.0.0: {}
+
+  minipass@7.1.2: {}
+
+  minizlib@2.1.2:
+    dependencies:
+      minipass: 3.3.6
+      yallist: 4.0.0
+
+  mixin-deep@1.3.2:
+    dependencies:
+      for-in: 1.0.2
+      is-extendable: 1.0.1
+
+  mkdirp@0.5.6:
+    dependencies:
+      minimist: 1.2.8
+
+  mkdirp@1.0.4: {}
+
+  moment-timezone@0.5.47:
+    dependencies:
+      moment: 2.30.1
+
+  moment@2.30.1: {}
+
+  mrmime@2.0.1: {}
+
+  ms@2.0.0: {}
+
+  ms@2.1.2: {}
+
+  ms@2.1.3: {}
+
+  multicast-dns@7.2.5:
+    dependencies:
+      dns-packet: 5.6.1
+      thunky: 1.1.0
+
+  mysql2@2.3.3:
+    dependencies:
+      denque: 2.1.0
+      generate-function: 2.3.1
+      iconv-lite: 0.6.3
+      long: 4.0.0
+      lru-cache: 6.0.0
+      named-placeholders: 1.1.3
+      seq-queue: 0.0.5
+      sqlstring: 2.3.3
+
+  named-placeholders@1.1.3:
+    dependencies:
+      lru-cache: 7.18.3
+
+  nanoid@3.3.8: {}
+
+  nanoid@5.1.5: {}
+
+  nanomatch@1.2.13:
+    dependencies:
+      arr-diff: 4.0.0
+      array-unique: 0.3.2
+      define-property: 2.0.2
+      extend-shallow: 3.0.2
+      fragment-cache: 0.2.1
+      is-windows: 1.0.2
+      kind-of: 6.0.3
+      object.pick: 1.3.0
+      regex-not: 1.0.2
+      snapdragon: 0.8.2
+      to-regex: 3.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  natural-compare-lite@1.4.0: {}
+
+  natural-compare@1.4.0: {}
+
+  negotiator@0.6.3: {}
+
+  negotiator@0.6.4: {}
+
+  neo-async@2.6.2: {}
+
+  nice-try@1.0.5: {}
+
+  nise@3.0.1:
+    dependencies:
+      '@sinonjs/commons': 1.8.6
+      '@sinonjs/formatio': 4.0.1
+      '@sinonjs/text-encoding': 0.7.3
+      just-extend: 4.2.1
+      lolex: 5.1.2
+      path-to-regexp: 1.9.0
+
+  no-case@3.0.4:
+    dependencies:
+      lower-case: 2.0.2
+      tslib: 2.8.1
+
+  node-addon-api@5.1.0: {}
+
+  node-addon-api@7.1.1:
+    optional: true
+
+  node-fetch@2.7.0:
+    dependencies:
+      whatwg-url: 5.0.0
+
+  node-forge@1.3.1: {}
+
+  node-int64@0.4.0: {}
+
+  node-notifier@8.0.2:
+    dependencies:
+      growly: 1.3.0
+      is-wsl: 2.2.0
+      semver: 7.7.1
+      shellwords: 0.1.1
+      uuid: 8.3.2
+      which: 2.0.2
+    optional: true
+
+  node-releases@2.0.19: {}
+
+  nodemailer@6.10.0: {}
+
+  nodemon@2.0.22:
+    dependencies:
+      chokidar: 3.6.0
+      debug: 3.2.7(supports-color@5.5.0)
+      ignore-by-default: 1.0.1
+      minimatch: 3.1.2
+      pstree.remy: 1.1.8
+      semver: 5.7.2
+      simple-update-notifier: 1.1.0
+      supports-color: 5.5.0
+      touch: 3.1.1
+      undefsafe: 2.0.5
+
+  noms@0.0.0:
+    dependencies:
+      inherits: 2.0.4
+      readable-stream: 1.0.34
+
+  nopt@3.0.6:
+    dependencies:
+      abbrev: 1.1.1
+
+  nopt@4.0.3:
+    dependencies:
+      abbrev: 1.1.1
+      osenv: 0.1.5
+
+  nopt@5.0.0:
+    dependencies:
+      abbrev: 1.1.1
+
+  normalize-package-data@2.5.0:
+    dependencies:
+      hosted-git-info: 2.8.9
+      resolve: 1.22.10
+      semver: 5.7.2
+      validate-npm-package-license: 3.0.4
+
+  normalize-path@2.1.1:
+    dependencies:
+      remove-trailing-separator: 1.1.0
+
+  normalize-path@3.0.0: {}
+
+  normalize-range@0.1.2: {}
+
+  normalize-url@1.9.1:
+    dependencies:
+      object-assign: 4.1.1
+      prepend-http: 1.0.4
+      query-string: 4.3.4
+      sort-keys: 1.1.2
+
+  npm-run-all@4.1.5:
+    dependencies:
+      ansi-styles: 3.2.1
+      chalk: 2.4.2
+      cross-spawn: 6.0.6
+      memorystream: 0.3.1
+      minimatch: 3.1.2
+      pidtree: 0.3.1
+      read-pkg: 3.0.0
+      shell-quote: 1.8.2
+      string.prototype.padend: 3.1.6
+
+  npm-run-path@2.0.2:
+    dependencies:
+      path-key: 2.0.1
+
+  npm-run-path@4.0.1:
+    dependencies:
+      path-key: 3.1.1
+
+  npmlog@5.0.1:
+    dependencies:
+      are-we-there-yet: 2.0.0
+      console-control-strings: 1.1.0
+      gauge: 3.0.2
+      set-blocking: 2.0.0
+
+  nth-check@2.1.1:
+    dependencies:
+      boolbase: 1.0.0
+
+  num2fraction@1.2.2: {}
+
+  number-is-nan@1.0.1: {}
+
+  nwsapi@2.2.16: {}
+
+  oauth-sign@0.9.0: {}
+
+  object-assign@4.1.1: {}
+
+  object-copy@0.1.0:
+    dependencies:
+      copy-descriptor: 0.1.1
+      define-property: 0.2.5
+      kind-of: 3.2.2
+
+  object-inspect@1.13.4: {}
+
+  object-keys@1.1.1: {}
+
+  object-path@0.11.8: {}
+
+  object-visit@1.0.1:
+    dependencies:
+      isobject: 3.0.1
+
+  object.assign@4.1.7:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.1
+      has-symbols: 1.1.0
+      object-keys: 1.1.1
+
+  object.defaults@1.1.0:
+    dependencies:
+      array-each: 1.0.1
+      array-slice: 1.1.0
+      for-own: 1.0.0
+      isobject: 3.0.1
+
+  object.entries@1.1.8:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.1
+
+  object.fromentries@2.0.8:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-object-atoms: 1.1.1
+
+  object.getownpropertydescriptors@2.1.8:
+    dependencies:
+      array.prototype.reduce: 1.0.7
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-object-atoms: 1.1.1
+      gopd: 1.2.0
+      safe-array-concat: 1.1.3
+
+  object.groupby@1.0.3:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+
+  object.map@1.0.1:
+    dependencies:
+      for-own: 1.0.0
+      make-iterator: 1.0.1
+
+  object.pick@1.3.0:
+    dependencies:
+      isobject: 3.0.1
+
+  object.values@1.2.1:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.1
+
+  obuf@1.1.2: {}
+
+  on-finished@2.4.1:
+    dependencies:
+      ee-first: 1.1.1
+
+  on-headers@1.0.2: {}
+
+  once@1.4.0:
+    dependencies:
+      wrappy: 1.0.2
+
+  onetime@1.1.0: {}
+
+  onetime@2.0.1:
+    dependencies:
+      mimic-fn: 1.2.0
+
+  onetime@5.1.2:
+    dependencies:
+      mimic-fn: 2.1.0
+
+  open@8.4.2:
+    dependencies:
+      define-lazy-prop: 2.0.0
+      is-docker: 2.2.1
+      is-wsl: 2.2.0
+
+  opener@1.5.2: {}
+
+  optimism@0.18.1:
+    dependencies:
+      '@wry/caches': 1.0.1
+      '@wry/context': 0.7.4
+      '@wry/trie': 0.5.0
+      tslib: 2.8.1
+
+  optionator@0.8.3:
+    dependencies:
+      deep-is: 0.1.4
+      fast-levenshtein: 2.0.6
+      levn: 0.3.0
+      prelude-ls: 1.1.2
+      type-check: 0.3.2
+      word-wrap: 1.2.5
+
+  optionator@0.9.4:
+    dependencies:
+      deep-is: 0.1.4
+      fast-levenshtein: 2.0.6
+      levn: 0.4.1
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+      word-wrap: 1.2.5
+
+  os-homedir@1.0.2: {}
+
+  os-tmpdir@1.0.2: {}
+
+  osenv@0.1.5:
+    dependencies:
+      os-homedir: 1.0.2
+      os-tmpdir: 1.0.2
+
+  ospath@1.2.2: {}
+
+  own-keys@1.0.1:
+    dependencies:
+      get-intrinsic: 1.2.7
+      object-keys: 1.1.1
+      safe-push-apply: 1.0.0
+
+  p-each-series@2.2.0: {}
+
+  p-finally@1.0.0: {}
+
+  p-limit@2.3.0:
+    dependencies:
+      p-try: 2.2.0
+
+  p-limit@3.1.0:
+    dependencies:
+      yocto-queue: 0.1.0
+
+  p-locate@3.0.0:
+    dependencies:
+      p-limit: 2.3.0
+
+  p-locate@4.1.0:
+    dependencies:
+      p-limit: 2.3.0
+
+  p-locate@5.0.0:
+    dependencies:
+      p-limit: 3.1.0
+
+  p-map@2.1.0: {}
+
+  p-map@4.0.0:
+    dependencies:
+      aggregate-error: 3.1.0
+
+  p-retry@4.6.2:
+    dependencies:
+      '@types/retry': 0.12.0
+      retry: 0.13.1
+
+  p-try@2.2.0: {}
+
+  package-json-from-dist@1.0.1: {}
+
+  param-case@3.0.4:
+    dependencies:
+      dot-case: 3.0.4
+      tslib: 2.8.1
+
+  parent-module@1.0.1:
+    dependencies:
+      callsites: 3.1.0
+
+  parse-filepath@1.0.2:
+    dependencies:
+      is-absolute: 1.0.0
+      map-cache: 0.2.2
+      path-root: 0.1.1
+
+  parse-json@2.2.0:
+    dependencies:
+      error-ex: 1.3.2
+
+  parse-json@4.0.0:
+    dependencies:
+      error-ex: 1.3.2
+      json-parse-better-errors: 1.0.2
+
+  parse-json@5.2.0:
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      error-ex: 1.3.2
+      json-parse-even-better-errors: 2.3.1
+      lines-and-columns: 1.2.4
+
+  parse-passwd@1.0.0: {}
+
+  parse5@5.1.0: {}
+
+  parse5@6.0.1: {}
+
+  parse5@7.2.1:
+    dependencies:
+      entities: 4.5.0
+
+  parseurl@1.3.3: {}
+
+  pascal-case@3.1.2:
+    dependencies:
+      no-case: 3.0.4
+      tslib: 2.8.1
+
+  pascalcase@0.1.1: {}
+
+  path-exists@3.0.0: {}
+
+  path-exists@4.0.0: {}
+
+  path-is-absolute@1.0.1: {}
+
+  path-key@2.0.1: {}
+
+  path-key@3.1.1: {}
+
+  path-parse@1.0.7: {}
+
+  path-root-regex@0.1.2: {}
+
+  path-root@0.1.1:
+    dependencies:
+      path-root-regex: 0.1.2
+
+  path-scurry@2.0.0:
+    dependencies:
+      lru-cache: 11.0.2
+      minipass: 7.1.2
+
+  path-to-regexp@0.1.12: {}
+
+  path-to-regexp@1.9.0:
+    dependencies:
+      isarray: 0.0.1
+
+  path-type@3.0.0:
+    dependencies:
+      pify: 3.0.0
+
+  path-type@4.0.0: {}
+
+  pend@1.2.0: {}
+
+  performance-now@2.1.0: {}
+
+  pg-connection-string@2.7.0: {}
+
+  picocolors@0.2.1: {}
+
+  picocolors@1.1.1: {}
+
+  picomatch@2.3.1: {}
+
+  pidtree@0.3.1: {}
+
+  pify@2.3.0: {}
+
+  pify@3.0.0: {}
+
+  pify@4.0.1: {}
+
+  pirates@4.0.6: {}
+
+  pkg-dir@4.2.0:
+    dependencies:
+      find-up: 4.1.0
+
+  pn@1.1.0: {}
+
+  posix-character-classes@0.1.1: {}
+
+  possible-typed-array-names@1.1.0: {}
+
+  postcss-load-config@1.2.0:
+    dependencies:
+      cosmiconfig: 2.2.2
+      object-assign: 4.1.1
+      postcss-load-options: 1.2.0
+      postcss-load-plugins: 2.3.0
+
+  postcss-load-options@1.2.0:
+    dependencies:
+      cosmiconfig: 2.2.2
+      object-assign: 4.1.1
+
+  postcss-load-plugins@2.3.0:
+    dependencies:
+      cosmiconfig: 2.2.2
+      object-assign: 4.1.1
+
+  postcss-loader@1.2.2:
+    dependencies:
+      loader-utils: 0.2.17
+      object-assign: 4.1.1
+      postcss: 5.2.18
+      postcss-load-config: 1.2.0
+
+  postcss-modules-extract-imports@2.0.0:
+    dependencies:
+      postcss: 7.0.39
+
+  postcss-modules-local-by-default@3.0.3:
+    dependencies:
+      icss-utils: 4.1.1
+      postcss: 7.0.39
+      postcss-selector-parser: 6.1.2
+      postcss-value-parser: 4.2.0
+
+  postcss-modules-scope@2.2.0:
+    dependencies:
+      postcss: 7.0.39
+      postcss-selector-parser: 6.1.2
+
+  postcss-modules-values@3.0.0:
+    dependencies:
+      icss-utils: 4.1.1
+      postcss: 7.0.39
+
+  postcss-selector-parser@6.1.2:
+    dependencies:
+      cssesc: 3.0.0
+      util-deprecate: 1.0.2
+
+  postcss-value-parser@3.3.1: {}
+
+  postcss-value-parser@4.2.0: {}
+
+  postcss@5.2.18:
+    dependencies:
+      chalk: 1.1.3
+      js-base64: 2.6.4
+      source-map: 0.5.7
+      supports-color: 3.2.3
+
+  postcss@7.0.39:
+    dependencies:
+      picocolors: 0.2.1
+      source-map: 0.6.1
+
+  prelude-ls@1.1.2: {}
+
+  prelude-ls@1.2.1: {}
+
+  prepend-http@1.0.4: {}
+
+  prettier-eslint@16.3.0:
+    dependencies:
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.7.3)
+      common-tags: 1.8.2
+      dlv: 1.1.3
+      eslint: 8.57.1
+      indent-string: 4.0.0
+      lodash.merge: 4.6.2
+      loglevel-colored-level-prefix: 1.0.0
+      prettier: 3.5.1
+      pretty-format: 29.7.0
+      require-relative: 0.8.7
+      typescript: 5.7.3
+      vue-eslint-parser: 9.4.3(eslint@8.57.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  prettier@3.5.1: {}
+
+  pretty-bytes@5.6.0: {}
+
+  pretty-bytes@7.0.1: {}
+
+  pretty-error@4.0.0:
+    dependencies:
+      lodash: 4.17.21
+      renderkid: 3.0.0
+
+  pretty-format@26.6.2:
+    dependencies:
+      '@jest/types': 26.6.2
+      ansi-regex: 5.0.1
+      ansi-styles: 4.3.0
+      react-is: 17.0.2
+
+  pretty-format@29.7.0:
+    dependencies:
+      '@jest/schemas': 29.6.3
+      ansi-styles: 5.2.0
+      react-is: 18.3.1
+
+  process-nextick-args@2.0.1: {}
+
+  promise-inflight@1.0.1: {}
+
+  promise@7.1.1:
+    dependencies:
+      asap: 2.0.6
+
+  prompts@2.4.2:
+    dependencies:
+      kleur: 3.0.3
+      sisteransi: 1.0.5
+
+  prop-types@15.7.2:
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+
+  prop-types@15.8.1:
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+
+  proxy-addr@2.0.7:
+    dependencies:
+      forwarded: 0.2.0
+      ipaddr.js: 1.9.1
+
+  psl@1.15.0:
+    dependencies:
+      punycode: 2.3.1
+
+  pstree.remy@1.1.8: {}
+
+  pump@3.0.2:
+    dependencies:
+      end-of-stream: 1.4.4
+      once: 1.4.0
+
+  punycode@1.4.1: {}
+
+  punycode@2.3.1: {}
+
+  pure-rand@6.1.0: {}
+
+  qs@6.10.4:
+    dependencies:
+      side-channel: 1.1.0
+
+  qs@6.13.0:
+    dependencies:
+      side-channel: 1.1.0
+
+  qs@6.14.0:
+    dependencies:
+      side-channel: 1.1.0
+
+  qs@6.5.3: {}
+
+  query-string@4.3.4:
+    dependencies:
+      object-assign: 4.1.1
+      strict-uri-encode: 1.1.0
+
+  querystringify@2.2.0: {}
+
+  queue-microtask@1.2.3: {}
+
+  raf-schd@4.0.3: {}
+
+  ramda@0.27.2: {}
+
+  randombytes@2.1.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  randomcolor@0.6.2: {}
+
+  range-parser@1.2.1: {}
+
+  raw-body@1.1.7:
+    dependencies:
+      bytes: 1.0.0
+      string_decoder: 0.10.31
+
+  raw-body@2.5.2:
+    dependencies:
+      bytes: 3.1.2
+      http-errors: 2.0.0
+      iconv-lite: 0.4.24
+      unpipe: 1.0.0
+
+  react-beautiful-dnd@13.1.1(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      '@babel/runtime': 7.26.9
+      css-box-model: 1.2.1
+      memoize-one: 5.2.1
+      raf-schd: 4.0.3
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+      react-redux: 7.2.9(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      redux: 4.2.1
+      use-memo-one: 1.1.3(react@19.1.1)
+    transitivePeerDependencies:
+      - react-native
+
+  react-clientside-effect@1.2.7(react@19.1.1):
+    dependencies:
+      '@babel/runtime': 7.28.3
+      react: 19.1.1
+
+  react-codemirror2@8.0.1(codemirror@5.65.18)(react@19.1.1):
+    dependencies:
+      codemirror: 5.65.18
+      react: 19.1.1
+
+  react-copy-to-clipboard@5.1.0(react@19.1.1):
+    dependencies:
+      copy-to-clipboard: 3.3.3
+      prop-types: 15.8.1
+      react: 19.1.1
+
+  react-countup@6.5.3(react@19.1.1):
+    dependencies:
+      countup.js: 2.9.0
+      react: 19.1.1
+
+  react-dom@19.1.1(react@19.1.1):
+    dependencies:
+      react: 19.1.1
+      scheduler: 0.26.0
+
+  react-focus-lock@2.13.6(@types/react@19.1.11)(react@19.1.1):
+    dependencies:
+      '@babel/runtime': 7.26.9
+      focus-lock: 1.3.6
+      prop-types: 15.8.1
+      react: 19.1.1
+      react-clientside-effect: 1.2.7(react@19.1.1)
+      use-callback-ref: 1.3.3(@types/react@19.1.11)(react@19.1.1)
+      use-sidecar: 1.1.3(@types/react@19.1.11)(react@19.1.1)
+    optionalDependencies:
+      '@types/react': 19.1.11
+
+  react-hooks-window-size@0.3.0(react@19.1.1):
+    dependencies:
+      react: 19.1.1
+      tslib: 2.8.1
+
+  react-input-autosize@3.0.0(react@19.1.1):
+    dependencies:
+      prop-types: 15.8.1
+      react: 19.1.1
+
+  react-is@16.13.1: {}
+
+  react-is@17.0.2: {}
+
+  react-is@18.3.1: {}
+
+  react-is@19.1.1: {}
+
+  react-lifecycles-compat@3.0.4: {}
+
+  react-number-format@5.4.4(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+
+  react-redux@7.2.9(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      '@babel/runtime': 7.26.9
+      '@types/react-redux': 7.1.34
+      hoist-non-react-statics: 3.3.2
+      loose-envify: 1.4.0
+      prop-types: 15.8.1
+      react: 19.1.1
+      react-is: 17.0.2
+    optionalDependencies:
+      react-dom: 19.1.1(react@19.1.1)
+
+  react-redux@9.2.0(@types/react@19.1.11)(react@19.1.1)(redux@5.0.1):
+    dependencies:
+      '@types/use-sync-external-store': 0.0.6
+      react: 19.1.1
+      use-sync-external-store: 1.5.0(react@19.1.1)
+    optionalDependencies:
+      '@types/react': 19.1.11
+      redux: 5.0.1
+
+  react-router-dom@7.8.2(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+      react-router: 7.8.2(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+
+  react-router@7.8.2(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      cookie: 1.0.2
+      react: 19.1.1
+      set-cookie-parser: 2.7.1
+    optionalDependencies:
+      react-dom: 19.1.1(react@19.1.1)
+
+  react-select@5.10.2(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      '@babel/runtime': 7.26.9
+      '@emotion/cache': 11.14.0
+      '@emotion/react': 11.14.0(@types/react@19.1.11)(react@19.1.1)
+      '@floating-ui/dom': 1.7.4
+      '@types/react-transition-group': 4.4.12(@types/react@19.1.11)
+      memoize-one: 6.0.0
+      prop-types: 15.8.1
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+      react-transition-group: 4.4.5(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+      use-isomorphic-layout-effect: 1.2.0(@types/react@19.1.11)(react@19.1.1)
+    transitivePeerDependencies:
+      - '@types/react'
+      - supports-color
+
+  react-sortable-hoc@1.11.0(prop-types@15.8.1)(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      '@babel/runtime': 7.26.9
+      invariant: 2.2.4
+      prop-types: 15.8.1
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+
+  react-split-pane@0.1.92(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      prop-types: 15.8.1
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+      react-lifecycles-compat: 3.0.4
+      react-style-proptype: 3.2.2
+
+  react-style-proptype@3.2.2:
+    dependencies:
+      prop-types: 15.8.1
+
+  react-transition-group@4.4.5(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      '@babel/runtime': 7.28.3
+      dom-helpers: 5.2.1
+      loose-envify: 1.4.0
+      prop-types: 15.8.1
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+
+  react@19.1.1: {}
+
+  reactour@1.19.4(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react-is@19.1.1)(react@19.1.1)(styled-components@4.4.1(@babel/core@7.26.9)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)):
+    dependencies:
+      '@rooks/use-mutation-observer': 4.11.2(react@19.1.1)
+      classnames: 2.3.1
+      focus-outline-manager: 1.0.2
+      lodash.debounce: 4.0.8
+      prop-types: 15.7.2
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+      react-focus-lock: 2.13.6(@types/react@19.1.11)(react@19.1.1)
+      react-is: 19.1.1
+      scroll-smooth: 1.1.1
+      scrollparent: 2.0.1
+      styled-components: 4.4.1(@babel/core@7.26.9)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)
+    transitivePeerDependencies:
+      - '@types/react'
+
+  read-pkg-up@7.0.1:
+    dependencies:
+      find-up: 4.1.0
+      read-pkg: 5.2.0
+      type-fest: 0.8.1
+
+  read-pkg@3.0.0:
+    dependencies:
+      load-json-file: 4.0.0
+      normalize-package-data: 2.5.0
+      path-type: 3.0.0
+
+  read-pkg@4.0.1:
+    dependencies:
+      normalize-package-data: 2.5.0
+      parse-json: 4.0.0
+      pify: 3.0.0
+
+  read-pkg@5.2.0:
+    dependencies:
+      '@types/normalize-package-data': 2.4.4
+      normalize-package-data: 2.5.0
+      parse-json: 5.2.0
+      type-fest: 0.6.0
+
+  readable-stream@1.0.34:
+    dependencies:
+      core-util-is: 1.0.3
+      inherits: 2.0.4
+      isarray: 0.0.1
+      string_decoder: 0.10.31
+
+  readable-stream@2.3.8:
+    dependencies:
+      core-util-is: 1.0.3
+      inherits: 2.0.4
+      isarray: 1.0.0
+      process-nextick-args: 2.0.1
+      safe-buffer: 5.1.2
+      string_decoder: 1.1.1
+      util-deprecate: 1.0.2
+
+  readable-stream@3.6.2:
+    dependencies:
+      inherits: 2.0.4
+      string_decoder: 1.3.0
+      util-deprecate: 1.0.2
+
+  readdirp@3.6.0:
+    dependencies:
+      picomatch: 2.3.1
+
+  readdirp@4.1.2: {}
+
+  recharts@3.1.2(@types/react@19.1.11)(react-dom@19.1.1(react@19.1.1))(react-is@19.1.1)(react@19.1.1)(redux@5.0.1):
+    dependencies:
+      '@reduxjs/toolkit': 2.8.2(react-redux@9.2.0(@types/react@19.1.11)(react@19.1.1)(redux@5.0.1))(react@19.1.1)
+      clsx: 2.1.1
+      decimal.js-light: 2.5.1
+      es-toolkit: 1.39.10
+      eventemitter3: 5.0.1
+      immer: 10.1.1
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+      react-is: 19.1.1
+      react-redux: 9.2.0(@types/react@19.1.11)(react@19.1.1)(redux@5.0.1)
+      reselect: 5.1.1
+      tiny-invariant: 1.3.3
+      use-sync-external-store: 1.5.0(react@19.1.1)
+      victory-vendor: 37.3.6
+    transitivePeerDependencies:
+      - '@types/react'
+      - redux
+
+  rechoir@0.7.1:
+    dependencies:
+      resolve: 1.22.10
+
+  rechoir@0.8.0:
+    dependencies:
+      resolve: 1.22.10
+
+  redux-persist@6.0.0(react@19.1.1)(redux@5.0.1):
+    dependencies:
+      redux: 5.0.1
+    optionalDependencies:
+      react: 19.1.1
+
+  redux-testkit@1.0.6:
+    dependencies:
+      babel-polyfill: 6.26.0
+      lodash: 4.17.21
+
+  redux-thunk@3.1.0(redux@5.0.1):
+    dependencies:
+      redux: 5.0.1
+
+  redux@4.2.1:
+    dependencies:
+      '@babel/runtime': 7.26.9
+
+  redux@5.0.1: {}
+
+  reflect.getprototypeof@1.0.10:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.2.7
+      get-proto: 1.0.1
+      which-builtin-type: 1.2.1
+
+  regenerate-unicode-properties@10.2.0:
+    dependencies:
+      regenerate: 1.4.2
+
+  regenerate@1.4.2: {}
+
+  regenerator-runtime@0.10.5: {}
+
+  regenerator-runtime@0.11.1: {}
+
+  regenerator-runtime@0.14.1: {}
+
+  regenerator-transform@0.15.2:
+    dependencies:
+      '@babel/runtime': 7.26.9
+
+  regex-not@1.0.2:
+    dependencies:
+      extend-shallow: 3.0.2
+      safe-regex: 1.1.0
+
+  regexp.prototype.flags@1.5.4:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-errors: 1.3.0
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      set-function-name: 2.0.2
+
+  regexpu-core@6.2.0:
+    dependencies:
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 10.2.0
+      regjsgen: 0.8.0
+      regjsparser: 0.12.0
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.2.0
+
+  regjsgen@0.8.0: {}
+
+  regjsparser@0.12.0:
+    dependencies:
+      jsesc: 3.0.2
+
+  relateurl@0.2.7: {}
+
+  remove-trailing-separator@1.1.0: {}
+
+  renderkid@3.0.0:
+    dependencies:
+      css-select: 4.3.0
+      dom-converter: 0.2.0
+      htmlparser2: 6.1.0
+      lodash: 4.17.21
+      strip-ansi: 6.0.1
+
+  repeat-element@1.1.4: {}
+
+  repeat-string@1.6.1: {}
+
+  request-progress@3.0.0:
+    dependencies:
+      throttleit: 1.0.1
+
+  request-promise-core@1.1.4(request@2.88.2):
+    dependencies:
+      lodash: 4.17.21
+      request: 2.88.2
+
+  request-promise-native@1.0.9(request@2.88.2):
+    dependencies:
+      request: 2.88.2
+      request-promise-core: 1.1.4(request@2.88.2)
+      stealthy-require: 1.1.1
+      tough-cookie: 2.5.0
+
+  request@2.88.2:
+    dependencies:
+      aws-sign2: 0.7.0
+      aws4: 1.13.2
+      caseless: 0.12.0
+      combined-stream: 1.0.8
+      extend: 3.0.2
+      forever-agent: 0.6.1
+      form-data: 2.3.3
+      har-validator: 5.1.5
+      http-signature: 1.2.0
+      is-typedarray: 1.0.0
+      isstream: 0.1.2
+      json-stringify-safe: 5.0.1
+      mime-types: 2.1.35
+      oauth-sign: 0.9.0
+      performance-now: 2.1.0
+      qs: 6.5.3
+      safe-buffer: 5.2.1
+      tough-cookie: 2.5.0
+      tunnel-agent: 0.6.0
+      uuid: 3.4.0
+
+  require-directory@2.1.1: {}
+
+  require-from-string@1.2.1: {}
+
+  require-from-string@2.0.2: {}
+
+  require-main-filename@2.0.0: {}
+
+  require-relative@0.8.7: {}
+
+  requires-port@1.0.0: {}
+
+  reselect@4.1.8: {}
+
+  reselect@5.1.1: {}
+
+  resolve-cwd@3.0.0:
+    dependencies:
+      resolve-from: 5.0.0
+
+  resolve-dir@1.0.1:
+    dependencies:
+      expand-tilde: 2.0.2
+      global-modules: 1.0.0
+
+  resolve-from@4.0.0: {}
+
+  resolve-from@5.0.0: {}
+
+  resolve-url@0.2.1: {}
+
+  resolve.exports@2.0.3: {}
+
+  resolve@1.17.0:
+    dependencies:
+      path-parse: 1.0.7
+
+  resolve@1.22.10:
+    dependencies:
+      is-core-module: 2.16.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
+  resolve@2.0.0-next.5:
+    dependencies:
+      is-core-module: 2.16.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
+  restore-cursor@1.0.1:
+    dependencies:
+      exit-hook: 1.1.1
+      onetime: 1.1.0
+
+  restore-cursor@2.0.0:
+    dependencies:
+      onetime: 2.0.1
+      signal-exit: 3.0.7
+
+  ret@0.1.15: {}
+
+  retry-as-promised@7.0.4: {}
+
+  retry@0.13.1: {}
+
+  reusify@1.0.4: {}
+
+  rimraf@2.7.1:
+    dependencies:
+      glob: 7.2.3
+
+  rimraf@3.0.2:
+    dependencies:
+      glob: 7.2.3
+
+  rimraf@6.0.1:
+    dependencies:
+      glob: 11.0.1
+      package-json-from-dist: 1.0.1
+
+  rollup-plugin-multi-entry@2.1.0:
+    dependencies:
+      matched: 1.0.2
+
+  rollup-plugin-strip-exports@2.0.7:
+    dependencies:
+      astring: 1.9.0
+      estree-walker: 2.0.2
+      magic-string: 0.25.9
+      rollup-pluginutils: 2.8.2
+
+  rollup-plugin-terser@6.1.0(rollup@2.79.2):
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      jest-worker: 26.6.2
+      rollup: 2.79.2
+      serialize-javascript: 3.1.0
+      terser: 4.8.1
+
+  rollup-plugin-typescript2@0.27.3(rollup@2.79.2)(typescript@4.9.5):
+    dependencies:
+      '@rollup/pluginutils': 3.1.0(rollup@2.79.2)
+      find-cache-dir: 3.3.2
+      fs-extra: 8.1.0
+      resolve: 1.17.0
+      rollup: 2.79.2
+      tslib: 2.0.1
+      typescript: 4.9.5
+
+  rollup-pluginutils@2.8.2:
+    dependencies:
+      estree-walker: 0.6.1
+
+  rollup@2.79.2:
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  rsvp@4.8.5: {}
+
+  run-parallel@1.2.0:
+    dependencies:
+      queue-microtask: 1.2.3
+
+  rxjs@6.6.7:
+    dependencies:
+      tslib: 1.14.1
+
+  rxjs@7.8.2:
+    dependencies:
+      tslib: 2.8.1
+
+  safe-array-concat@1.1.3:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      get-intrinsic: 1.2.7
+      has-symbols: 1.1.0
+      isarray: 2.0.5
+
+  safe-buffer@5.1.2: {}
+
+  safe-buffer@5.2.1: {}
+
+  safe-json-parse@1.0.1: {}
+
+  safe-push-apply@1.0.0:
+    dependencies:
+      es-errors: 1.3.0
+      isarray: 2.0.5
+
+  safe-regex-test@1.1.0:
+    dependencies:
+      call-bound: 1.0.3
+      es-errors: 1.3.0
+      is-regex: 1.2.1
+
+  safe-regex@1.1.0:
+    dependencies:
+      ret: 0.1.15
+
+  safer-buffer@2.1.2: {}
+
+  sane@4.1.0:
+    dependencies:
+      '@cnakazawa/watch': 1.0.4
+      anymatch: 2.0.0
+      capture-exit: 2.0.0
+      exec-sh: 0.3.6
+      execa: 1.0.0
+      fb-watchman: 2.0.2
+      micromatch: 3.1.10
+      minimist: 1.2.8
+      walker: 1.0.8
+    transitivePeerDependencies:
+      - supports-color
+
+  sass-loader@16.0.5(sass@1.85.0)(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      neo-async: 2.6.2
+    optionalDependencies:
+      sass: 1.85.0
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+
+  sass@1.85.0:
+    dependencies:
+      chokidar: 4.0.3
+      immutable: 5.0.3
+      source-map-js: 1.2.1
+    optionalDependencies:
+      '@parcel/watcher': 2.5.1
+
+  saxes@3.1.11:
+    dependencies:
+      xmlchars: 2.2.0
+
+  saxes@5.0.1:
+    dependencies:
+      xmlchars: 2.2.0
+
+  saxes@6.0.0:
+    dependencies:
+      xmlchars: 2.2.0
+
+  scheduler@0.26.0: {}
+
+  schema-utils@1.0.0:
+    dependencies:
+      ajv: 6.12.6
+      ajv-errors: 1.0.1(ajv@6.12.6)
+      ajv-keywords: 3.5.2(ajv@6.12.6)
+
+  schema-utils@2.7.1:
+    dependencies:
+      '@types/json-schema': 7.0.15
+      ajv: 6.12.6
+      ajv-keywords: 3.5.2(ajv@6.12.6)
+
+  schema-utils@4.3.0:
+    dependencies:
+      '@types/json-schema': 7.0.15
+      ajv: 8.17.1
+      ajv-formats: 2.1.1(ajv@8.17.1)
+      ajv-keywords: 5.1.0(ajv@8.17.1)
+
+  scroll-smooth@1.1.1: {}
+
+  scrollparent@2.0.1: {}
+
+  select-hose@2.0.0: {}
+
+  selfsigned@2.4.1:
+    dependencies:
+      '@types/node-forge': 1.3.11
+      node-forge: 1.3.1
+
+  semver@5.7.2: {}
+
+  semver@6.3.1: {}
+
+  semver@7.0.0: {}
+
+  semver@7.7.1: {}
+
+  send@0.19.0:
+    dependencies:
+      debug: 2.6.9(supports-color@7.2.0)
+      depd: 2.0.0
+      destroy: 1.2.0
+      encodeurl: 1.0.2
+      escape-html: 1.0.3
+      etag: 1.8.1
+      fresh: 0.5.2
+      http-errors: 2.0.0
+      mime: 1.6.0
+      ms: 2.1.3
+      on-finished: 2.4.1
+      range-parser: 1.2.1
+      statuses: 2.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  seq-queue@0.0.5: {}
+
+  sequelize-pool@7.1.0: {}
+
+  sequelize@6.37.5(mysql2@2.3.3):
+    dependencies:
+      '@types/debug': 4.1.12
+      '@types/validator': 13.12.2
+      debug: 4.4.0(supports-color@5.5.0)
+      dottie: 2.0.6
+      inflection: 1.13.4
+      lodash: 4.17.21
+      moment: 2.30.1
+      moment-timezone: 0.5.47
+      pg-connection-string: 2.7.0
+      retry-as-promised: 7.0.4
+      semver: 7.7.1
+      sequelize-pool: 7.1.0
+      toposort-class: 1.0.1
+      uuid: 8.3.2
+      validator: 13.12.0
+      wkx: 0.5.0
+    optionalDependencies:
+      mysql2: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+
+  serialize-javascript@3.1.0:
+    dependencies:
+      randombytes: 2.1.0
+
+  serialize-javascript@4.0.0:
+    dependencies:
+      randombytes: 2.1.0
+
+  serialize-javascript@6.0.2:
+    dependencies:
+      randombytes: 2.1.0
+
+  serve-index@1.9.1:
+    dependencies:
+      accepts: 1.3.8
+      batch: 0.6.1
+      debug: 2.6.9(supports-color@7.2.0)
+      escape-html: 1.0.3
+      http-errors: 1.6.3
+      mime-types: 2.1.35
+      parseurl: 1.3.3
+    transitivePeerDependencies:
+      - supports-color
+
+  serve-static@1.16.2:
+    dependencies:
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      parseurl: 1.3.3
+      send: 0.19.0
+    transitivePeerDependencies:
+      - supports-color
+
+  set-blocking@2.0.0: {}
+
+  set-cookie-parser@2.7.1: {}
+
+  set-function-length@1.2.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.7
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+
+  set-function-name@2.0.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      functions-have-names: 1.2.3
+      has-property-descriptors: 1.0.2
+
+  set-proto@1.0.0:
+    dependencies:
+      dunder-proto: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+
+  set-value@2.0.1:
+    dependencies:
+      extend-shallow: 2.0.1
+      is-extendable: 0.1.1
+      is-plain-object: 2.0.4
+      split-string: 3.1.0
+
+  setprototypeof@1.1.0: {}
+
+  setprototypeof@1.2.0: {}
+
+  sha.js@2.4.11:
+    dependencies:
+      inherits: 2.0.4
+      safe-buffer: 5.2.1
+
+  shallow-clone@3.0.1:
+    dependencies:
+      kind-of: 6.0.3
+
+  shebang-command@1.2.0:
+    dependencies:
+      shebang-regex: 1.0.0
+
+  shebang-command@2.0.0:
+    dependencies:
+      shebang-regex: 3.0.0
+
+  shebang-regex@1.0.0: {}
+
+  shebang-regex@3.0.0: {}
+
+  shell-quote@1.8.2: {}
+
+  shellwords@0.1.1:
+    optional: true
+
+  side-channel-list@1.0.0:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+
+  side-channel-map@1.0.1:
+    dependencies:
+      call-bound: 1.0.3
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.7
+      object-inspect: 1.13.4
+
+  side-channel-weakmap@1.0.2:
+    dependencies:
+      call-bound: 1.0.3
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.7
+      object-inspect: 1.13.4
+      side-channel-map: 1.0.1
+
+  side-channel@1.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+      side-channel-list: 1.0.0
+      side-channel-map: 1.0.1
+      side-channel-weakmap: 1.0.2
+
+  signal-exit@3.0.7: {}
+
+  signal-exit@4.1.0: {}
+
+  simple-update-notifier@1.1.0:
+    dependencies:
+      semver: 7.0.0
+
+  sinon@8.1.1:
+    dependencies:
+      '@sinonjs/commons': 1.8.6
+      '@sinonjs/formatio': 4.0.1
+      '@sinonjs/samsam': 4.2.2
+      diff: 4.0.2
+      lolex: 5.1.2
+      nise: 3.0.1
+      supports-color: 7.2.0
+
+  sirv@2.0.4:
+    dependencies:
+      '@polka/url': 1.0.0-next.28
+      mrmime: 2.0.1
+      totalist: 3.0.1
+
+  sisteransi@1.0.5: {}
+
+  slash@3.0.0: {}
+
+  slice-ansi@0.0.4: {}
+
+  snapdragon-node@2.1.1:
+    dependencies:
+      define-property: 1.0.0
+      isobject: 3.0.1
+      snapdragon-util: 3.0.1
+
+  snapdragon-util@3.0.1:
+    dependencies:
+      kind-of: 3.2.2
+
+  snapdragon@0.8.2:
+    dependencies:
+      base: 0.11.2
+      debug: 2.6.9(supports-color@7.2.0)
+      define-property: 0.2.5
+      extend-shallow: 2.0.1
+      map-cache: 0.2.2
+      source-map: 0.5.7
+      source-map-resolve: 0.5.3
+      use: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  sockjs@0.3.24:
+    dependencies:
+      faye-websocket: 0.11.4
+      uuid: 8.3.2
+      websocket-driver: 0.7.4
+
+  sort-keys@1.1.2:
+    dependencies:
+      is-plain-obj: 1.1.0
+
+  source-list-map@0.1.8: {}
+
+  source-list-map@2.0.1: {}
+
+  source-map-js@1.2.1: {}
+
+  source-map-resolve@0.5.3:
+    dependencies:
+      atob: 2.1.2
+      decode-uri-component: 0.2.2
+      resolve-url: 0.2.1
+      source-map-url: 0.4.1
+      urix: 0.1.0
+
+  source-map-support@0.5.13:
+    dependencies:
+      buffer-from: 1.1.2
+      source-map: 0.6.1
+
+  source-map-support@0.5.21:
+    dependencies:
+      buffer-from: 1.1.2
+      source-map: 0.6.1
+
+  source-map-url@0.4.1: {}
+
+  source-map@0.5.7: {}
+
+  source-map@0.6.1: {}
+
+  source-map@0.7.4: {}
+
+  sourcemap-codec@1.4.8: {}
+
+  spawn-command@0.0.2: {}
+
+  spdx-correct@3.2.0:
+    dependencies:
+      spdx-expression-parse: 3.0.1
+      spdx-license-ids: 3.0.21
+
+  spdx-exceptions@2.5.0: {}
+
+  spdx-expression-parse@3.0.1:
+    dependencies:
+      spdx-exceptions: 2.5.0
+      spdx-license-ids: 3.0.21
+
+  spdx-license-ids@3.0.21: {}
+
+  spdy-transport@3.0.0:
+    dependencies:
+      debug: 4.4.0(supports-color@5.5.0)
+      detect-node: 2.1.0
+      hpack.js: 2.1.6
+      obuf: 1.1.2
+      readable-stream: 3.6.2
+      wbuf: 1.7.3
+    transitivePeerDependencies:
+      - supports-color
+
+  spdy@4.0.2:
+    dependencies:
+      debug: 4.4.0(supports-color@5.5.0)
+      handle-thing: 2.0.1
+      http-deceiver: 1.2.7
+      select-hose: 2.0.0
+      spdy-transport: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  split-string@3.1.0:
+    dependencies:
+      extend-shallow: 3.0.2
+
+  sprintf-js@1.0.3: {}
+
+  sprintf-js@1.1.3: {}
+
+  sqlstring@2.3.3: {}
+
+  sshpk@1.18.0:
+    dependencies:
+      asn1: 0.2.6
+      assert-plus: 1.0.0
+      bcrypt-pbkdf: 1.0.2
+      dashdash: 1.14.1
+      ecc-jsbn: 0.1.2
+      getpass: 0.1.7
+      jsbn: 0.1.1
+      safer-buffer: 2.1.2
+      tweetnacl: 0.14.5
+
+  ssri@8.0.1:
+    dependencies:
+      minipass: 3.3.6
+
+  stack-utils@2.0.6:
+    dependencies:
+      escape-string-regexp: 2.0.0
+
+  static-extend@0.1.2:
+    dependencies:
+      define-property: 0.2.5
+      object-copy: 0.1.0
+
+  statuses@1.5.0: {}
+
+  statuses@2.0.1: {}
+
+  stealthy-require@1.1.1: {}
+
+  streamsearch@0.1.2: {}
+
+  strict-uri-encode@1.1.0: {}
+
+  string-length@4.0.2:
+    dependencies:
+      char-regex: 1.0.2
+      strip-ansi: 6.0.1
+
+  string-template@0.2.1: {}
+
+  string-width@1.0.2:
+    dependencies:
+      code-point-at: 1.1.0
+      is-fullwidth-code-point: 1.0.0
+      strip-ansi: 3.0.1
+
+  string-width@2.1.1:
+    dependencies:
+      is-fullwidth-code-point: 2.0.0
+      strip-ansi: 4.0.0
+
+  string-width@3.1.0:
+    dependencies:
+      emoji-regex: 7.0.3
+      is-fullwidth-code-point: 2.0.0
+      strip-ansi: 5.2.0
+
+  string-width@4.2.3:
+    dependencies:
+      emoji-regex: 8.0.0
+      is-fullwidth-code-point: 3.0.0
+      strip-ansi: 6.0.1
+
+  string-width@5.1.2:
+    dependencies:
+      eastasianwidth: 0.2.0
+      emoji-regex: 9.2.2
+      strip-ansi: 7.1.0
+
+  string.prototype.includes@2.0.1:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+
+  string.prototype.matchall@4.0.12:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.2.7
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      internal-slot: 1.1.0
+      regexp.prototype.flags: 1.5.4
+      set-function-name: 2.0.2
+      side-channel: 1.1.0
+
+  string.prototype.padend@3.1.6:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-object-atoms: 1.1.1
+
+  string.prototype.repeat@1.0.0:
+    dependencies:
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+
+  string.prototype.trim@1.2.10:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      define-data-property: 1.1.4
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
+      es-object-atoms: 1.1.1
+      has-property-descriptors: 1.0.2
+
+  string.prototype.trimend@1.0.9:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.1
+
+  string.prototype.trimstart@1.0.8:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.1
+
+  string_decoder@0.10.31: {}
+
+  string_decoder@1.1.1:
+    dependencies:
+      safe-buffer: 5.1.2
+
+  string_decoder@1.3.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  strip-ansi@3.0.1:
+    dependencies:
+      ansi-regex: 2.1.1
+
+  strip-ansi@4.0.0:
+    dependencies:
+      ansi-regex: 3.0.1
+
+  strip-ansi@5.2.0:
+    dependencies:
+      ansi-regex: 4.1.1
+
+  strip-ansi@6.0.1:
+    dependencies:
+      ansi-regex: 5.0.1
+
+  strip-ansi@7.1.0:
+    dependencies:
+      ansi-regex: 6.1.0
+
+  strip-bom@3.0.0: {}
+
+  strip-bom@4.0.0: {}
+
+  strip-eof@1.0.0: {}
+
+  strip-final-newline@2.0.0: {}
+
+  strip-json-comments@3.1.1: {}
+
+  style-loader@1.3.0(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      loader-utils: 2.0.4
+      schema-utils: 2.7.1
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+
+  styled-components@4.4.1(@babel/core@7.26.9)(react-dom@19.1.1(react@19.1.1))(react@19.1.1):
+    dependencies:
+      '@babel/helper-module-imports': 7.25.9(supports-color@5.5.0)
+      '@babel/traverse': 7.26.9(supports-color@5.5.0)
+      '@emotion/is-prop-valid': 0.8.8
+      '@emotion/unitless': 0.7.5
+      babel-plugin-styled-components: 2.1.4(@babel/core@7.26.9)(styled-components@4.4.1(@babel/core@7.26.9)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(supports-color@5.5.0)
+      css-to-react-native: 2.3.2
+      memoize-one: 5.2.1
+      merge-anything: 2.4.4
+      prop-types: 15.8.1
+      react: 19.1.1
+      react-dom: 19.1.1(react@19.1.1)
+      react-is: 16.13.1
+      stylis: 3.5.4
+      stylis-rule-sheet: 0.0.10(stylis@3.5.4)
+      supports-color: 5.5.0
+    transitivePeerDependencies:
+      - '@babel/core'
+
+  stylis-rule-sheet@0.0.10(stylis@3.5.4):
+    dependencies:
+      stylis: 3.5.4
+
+  stylis@3.5.4: {}
+
+  stylis@4.2.0: {}
+
+  subscriptions-transport-ws@0.9.19(graphql@16.11.0):
+    dependencies:
+      backo2: 1.0.2
+      eventemitter3: 3.1.2
+      graphql: 16.11.0
+      iterall: 1.3.0
+      symbol-observable: 1.2.0
+      ws: 7.5.10
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  supports-color@2.0.0: {}
+
+  supports-color@3.2.3:
+    dependencies:
+      has-flag: 1.0.0
+
+  supports-color@5.5.0:
+    dependencies:
+      has-flag: 3.0.0
+
+  supports-color@6.1.0:
+    dependencies:
+      has-flag: 3.0.0
+
+  supports-color@7.2.0:
+    dependencies:
+      has-flag: 4.0.0
+
+  supports-color@8.1.1:
+    dependencies:
+      has-flag: 4.0.0
+
+  supports-hyperlinks@2.3.0:
+    dependencies:
+      has-flag: 4.0.0
+      supports-color: 7.2.0
+
+  supports-preserve-symlinks-flag@1.0.0: {}
+
+  symbol-observable@1.2.0: {}
+
+  symbol-tree@3.2.4: {}
+
+  tapable@2.2.1: {}
+
+  tar@6.2.1:
+    dependencies:
+      chownr: 2.0.0
+      fs-minipass: 2.1.0
+      minipass: 5.0.0
+      minizlib: 2.1.2
+      mkdirp: 1.0.4
+      yallist: 4.0.0
+
+  terminal-link@2.1.1:
+    dependencies:
+      ansi-escapes: 4.3.2
+      supports-hyperlinks: 2.3.0
+
+  terser-webpack-plugin@3.1.0(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      cacache: 15.3.0
+      find-cache-dir: 3.3.2
+      jest-worker: 26.6.2
+      p-limit: 3.1.0
+      schema-utils: 2.7.1
+      serialize-javascript: 4.0.0
+      source-map: 0.6.1
+      terser: 4.8.1
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+      webpack-sources: 1.4.3
+    transitivePeerDependencies:
+      - bluebird
+
+  terser-webpack-plugin@5.3.11(esbuild@0.25.0)(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.25
+      jest-worker: 27.5.1
+      schema-utils: 4.3.0
+      serialize-javascript: 6.0.2
+      terser: 5.39.0
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+    optionalDependencies:
+      esbuild: 0.25.0
+
+  terser@4.8.1:
+    dependencies:
+      acorn: 8.14.0
+      commander: 2.20.3
+      source-map: 0.6.1
+      source-map-support: 0.5.21
+
+  terser@5.39.0:
+    dependencies:
+      '@jridgewell/source-map': 0.3.6
+      acorn: 8.14.0
+      commander: 2.20.3
+      source-map-support: 0.5.21
+
+  test-exclude@6.0.0:
+    dependencies:
+      '@istanbuljs/schema': 0.1.3
+      glob: 7.2.3
+      minimatch: 3.1.2
+
+  text-table@0.2.0: {}
+
+  throat@5.0.0: {}
+
+  throttleit@1.0.1: {}
+
+  through2@2.0.5:
+    dependencies:
+      readable-stream: 2.3.8
+      xtend: 4.0.2
+
+  thunky@1.1.0: {}
+
+  tiny-invariant@1.3.3: {}
+
+  tiny-lr@1.1.1:
+    dependencies:
+      body: 5.1.0
+      debug: 3.2.7(supports-color@5.5.0)
+      faye-websocket: 0.10.0
+      livereload-js: 2.4.0
+      object-assign: 4.1.1
+      qs: 6.14.0
+    transitivePeerDependencies:
+      - supports-color
+
+  tmp@0.2.3: {}
+
+  tmpl@1.0.5: {}
+
+  to-object-path@0.3.0:
+    dependencies:
+      kind-of: 3.2.2
+
+  to-regex-range@2.1.1:
+    dependencies:
+      is-number: 3.0.0
+      repeat-string: 1.6.1
+
+  to-regex-range@5.0.1:
+    dependencies:
+      is-number: 7.0.0
+
+  to-regex@3.0.2:
+    dependencies:
+      define-property: 2.0.2
+      extend-shallow: 3.0.2
+      regex-not: 1.0.2
+      safe-regex: 1.1.0
+
+  toggle-selection@1.0.6: {}
+
+  toidentifier@1.0.1: {}
+
+  toposort-class@1.0.1: {}
+
+  totalist@3.0.1: {}
+
+  touch@3.1.1: {}
+
+  tough-cookie@2.5.0:
+    dependencies:
+      psl: 1.15.0
+      punycode: 2.3.1
+
+  tough-cookie@4.1.4:
+    dependencies:
+      psl: 1.15.0
+      punycode: 2.3.1
+      universalify: 0.2.0
+      url-parse: 1.5.10
+
+  tr46@0.0.3: {}
+
+  tr46@1.0.1:
+    dependencies:
+      punycode: 2.3.1
+
+  tr46@2.1.0:
+    dependencies:
+      punycode: 2.3.1
+
+  tr46@3.0.0:
+    dependencies:
+      punycode: 2.3.1
+
+  tree-kill@1.2.2: {}
+
+  ts-api-utils@1.4.3(typescript@5.7.3):
+    dependencies:
+      typescript: 5.7.3
+
+  ts-invariant@0.4.4:
+    dependencies:
+      tslib: 1.14.1
+
+  ts-jest@29.2.5(@babel/core@7.26.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.9))(esbuild@0.25.0)(jest@29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5)))(typescript@4.9.5):
+    dependencies:
+      bs-logger: 0.2.6
+      ejs: 3.1.10
+      fast-json-stable-stringify: 2.1.0
+      jest: 29.7.0(@types/node@20.19.11)(babel-plugin-macros@3.1.0)(node-notifier@8.0.2)(ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5))
+      jest-util: 29.7.0
+      json5: 2.2.3
+      lodash.memoize: 4.1.2
+      make-error: 1.3.6
+      semver: 7.7.1
+      typescript: 4.9.5
+      yargs-parser: 21.1.1
+    optionalDependencies:
+      '@babel/core': 7.26.9
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.26.9)
+      esbuild: 0.25.0
+
+  ts-loader@9.5.2(typescript@4.9.5)(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      chalk: 4.1.2
+      enhanced-resolve: 5.18.1
+      micromatch: 4.0.8
+      semver: 7.7.1
+      source-map: 0.7.4
+      typescript: 4.9.5
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+
+  ts-node@10.9.2(@types/node@20.19.11)(typescript@4.9.5):
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.11
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 20.19.11
+      acorn: 8.14.0
+      acorn-walk: 8.3.4
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 4.9.5
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+
+  ts-node@10.9.2(@types/node@20.19.11)(typescript@5.7.3):
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.11
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 20.19.11
+      acorn: 8.14.0
+      acorn-walk: 8.3.4
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 5.7.3
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+    optional: true
+
+  tsconfig-paths@3.15.0:
+    dependencies:
+      '@types/json5': 0.0.29
+      json5: 1.0.2
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+
+  tsconfig-paths@4.1.1:
+    dependencies:
+      json5: 2.2.3
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+
+  tslib@1.14.1: {}
+
+  tslib@2.0.1: {}
+
+  tslib@2.8.1: {}
+
+  tsutils@3.21.0(typescript@4.9.5):
+    dependencies:
+      tslib: 1.14.1
+      typescript: 4.9.5
+
+  tunnel-agent@0.6.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  turbo-darwin-64@2.4.2:
+    optional: true
+
+  turbo-darwin-arm64@2.4.2:
+    optional: true
+
+  turbo-linux-64@2.4.2:
+    optional: true
+
+  turbo-linux-arm64@2.4.2:
+    optional: true
+
+  turbo-windows-64@2.4.2:
+    optional: true
+
+  turbo-windows-arm64@2.4.2:
+    optional: true
+
+  turbo@2.4.2:
+    optionalDependencies:
+      turbo-darwin-64: 2.4.2
+      turbo-darwin-arm64: 2.4.2
+      turbo-linux-64: 2.4.2
+      turbo-linux-arm64: 2.4.2
+      turbo-windows-64: 2.4.2
+      turbo-windows-arm64: 2.4.2
+
+  tweetnacl@0.14.5: {}
+
+  type-check@0.3.2:
+    dependencies:
+      prelude-ls: 1.1.2
+
+  type-check@0.4.0:
+    dependencies:
+      prelude-ls: 1.2.1
+
+  type-detect@4.0.8: {}
+
+  type-detect@4.1.0: {}
+
+  type-fest@0.20.2: {}
+
+  type-fest@0.21.3: {}
+
+  type-fest@0.6.0: {}
+
+  type-fest@0.8.1: {}
+
+  type-is@1.6.18:
+    dependencies:
+      media-typer: 0.3.0
+      mime-types: 2.1.35
+
+  typed-array-buffer@1.0.3:
+    dependencies:
+      call-bound: 1.0.3
+      es-errors: 1.3.0
+      is-typed-array: 1.1.15
+
+  typed-array-byte-length@1.0.3:
+    dependencies:
+      call-bind: 1.0.8
+      for-each: 0.3.5
+      gopd: 1.2.0
+      has-proto: 1.2.0
+      is-typed-array: 1.1.15
+
+  typed-array-byte-offset@1.0.4:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      for-each: 0.3.5
+      gopd: 1.2.0
+      has-proto: 1.2.0
+      is-typed-array: 1.1.15
+      reflect.getprototypeof: 1.0.10
+
+  typed-array-length@1.0.7:
+    dependencies:
+      call-bind: 1.0.8
+      for-each: 0.3.5
+      gopd: 1.2.0
+      is-typed-array: 1.1.15
+      possible-typed-array-names: 1.1.0
+      reflect.getprototypeof: 1.0.10
+
+  typedarray-to-buffer@3.1.5:
+    dependencies:
+      is-typedarray: 1.0.0
+
+  typedarray@0.0.6: {}
+
+  typescript@4.9.5: {}
+
+  typescript@5.7.3: {}
+
+  typescript@5.9.2: {}
+
+  uglify-js@3.19.3: {}
+
+  unbox-primitive@1.1.0:
+    dependencies:
+      call-bound: 1.0.3
+      has-bigints: 1.1.0
+      has-symbols: 1.1.0
+      which-boxed-primitive: 1.1.1
+
+  unc-path-regex@0.1.2: {}
+
+  undefsafe@2.0.5: {}
+
+  underscore.string@3.3.6:
+    dependencies:
+      sprintf-js: 1.1.3
+      util-deprecate: 1.0.2
+
+  underscore@1.13.7: {}
+
+  undici-types@6.21.0: {}
+
+  unicode-canonical-property-names-ecmascript@2.0.1: {}
+
+  unicode-match-property-ecmascript@2.0.0:
+    dependencies:
+      unicode-canonical-property-names-ecmascript: 2.0.1
+      unicode-property-aliases-ecmascript: 2.1.0
+
+  unicode-match-property-value-ecmascript@2.2.0: {}
+
+  unicode-property-aliases-ecmascript@2.1.0: {}
+
+  union-value@1.0.1:
+    dependencies:
+      arr-union: 3.1.0
+      get-value: 2.0.6
+      is-extendable: 0.1.1
+      set-value: 2.0.1
+
+  unique-filename@1.1.1:
+    dependencies:
+      unique-slug: 2.0.2
+
+  unique-slug@2.0.2:
+    dependencies:
+      imurmurhash: 0.1.4
+
+  universalify@0.1.2: {}
+
+  universalify@0.2.0: {}
+
+  universalify@2.0.1: {}
+
+  unpipe@1.0.0: {}
+
+  unset-value@1.0.0:
+    dependencies:
+      has-value: 0.3.1
+      isobject: 3.0.1
+
+  untildify@4.0.0: {}
+
+  update-browserslist-db@1.1.2(browserslist@4.24.4):
+    dependencies:
+      browserslist: 4.24.4
+      escalade: 3.2.0
+      picocolors: 1.1.1
+
+  uri-js@4.4.1:
+    dependencies:
+      punycode: 2.3.1
+
+  uri-path@1.0.0: {}
+
+  urix@0.1.0: {}
+
+  url-parse@1.5.10:
+    dependencies:
+      querystringify: 2.2.0
+      requires-port: 1.0.0
+
+  url-template@2.0.8: {}
+
+  url@0.11.4:
+    dependencies:
+      punycode: 1.4.1
+      qs: 6.14.0
+
+  use-callback-ref@1.3.3(@types/react@19.1.11)(react@19.1.1):
+    dependencies:
+      react: 19.1.1
+      tslib: 2.8.1
+    optionalDependencies:
+      '@types/react': 19.1.11
+
+  use-isomorphic-layout-effect@1.2.0(@types/react@19.1.11)(react@19.1.1):
+    dependencies:
+      react: 19.1.1
+    optionalDependencies:
+      '@types/react': 19.1.11
+
+  use-latest@1.3.0(@types/react@19.1.11)(react@19.1.1):
+    dependencies:
+      react: 19.1.1
+      use-isomorphic-layout-effect: 1.2.0(@types/react@19.1.11)(react@19.1.1)
+    optionalDependencies:
+      '@types/react': 19.1.11
+
+  use-memo-one@1.1.3(react@19.1.1):
+    dependencies:
+      react: 19.1.1
+
+  use-onclickoutside@0.3.2(@types/react@19.1.11)(react@19.1.1):
+    dependencies:
+      are-passive-events-supported: 1.1.1
+      react: 19.1.1
+      use-latest: 1.3.0(@types/react@19.1.11)(react@19.1.1)
+    transitivePeerDependencies:
+      - '@types/react'
+
+  use-sidecar@1.1.3(@types/react@19.1.11)(react@19.1.1):
+    dependencies:
+      detect-node-es: 1.1.0
+      react: 19.1.1
+      tslib: 2.8.1
+    optionalDependencies:
+      '@types/react': 19.1.11
+
+  use-sync-external-store@1.5.0(react@19.1.1):
+    dependencies:
+      react: 19.1.1
+
+  use@3.1.1: {}
+
+  util-deprecate@1.0.2: {}
+
+  util.promisify@1.1.3:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      define-data-property: 1.1.4
+      define-properties: 1.2.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      for-each: 0.3.5
+      get-intrinsic: 1.2.7
+      has-proto: 1.2.0
+      has-symbols: 1.1.0
+      object.getownpropertydescriptors: 2.1.8
+      safe-array-concat: 1.1.3
+
+  utila@0.4.0: {}
+
+  utils-merge@1.0.1: {}
+
+  uuid@3.4.0: {}
+
+  uuid@8.3.2: {}
+
+  v8-compile-cache-lib@3.0.1: {}
+
+  v8-to-istanbul@7.1.2:
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.6
+      convert-source-map: 1.9.0
+      source-map: 0.7.4
+
+  v8-to-istanbul@9.3.0:
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.25
+      '@types/istanbul-lib-coverage': 2.0.6
+      convert-source-map: 2.0.0
+
+  v8flags@3.2.0:
+    dependencies:
+      homedir-polyfill: 1.0.3
+
+  v8flags@4.0.1: {}
+
+  validate-npm-package-license@3.0.4:
+    dependencies:
+      spdx-correct: 3.2.0
+      spdx-expression-parse: 3.0.1
+
+  validator@13.12.0: {}
+
+  vary@1.1.2: {}
+
+  verror@1.10.0:
+    dependencies:
+      assert-plus: 1.0.0
+      core-util-is: 1.0.2
+      extsprintf: 1.3.0
+
+  victory-vendor@37.3.6:
+    dependencies:
+      '@types/d3-array': 3.2.1
+      '@types/d3-ease': 3.0.2
+      '@types/d3-interpolate': 3.0.4
+      '@types/d3-scale': 4.0.9
+      '@types/d3-shape': 3.1.7
+      '@types/d3-time': 3.0.4
+      '@types/d3-timer': 3.0.2
+      d3-array: 3.2.4
+      d3-ease: 3.0.1
+      d3-interpolate: 3.0.1
+      d3-scale: 4.0.2
+      d3-shape: 3.2.0
+      d3-time: 3.1.0
+      d3-timer: 3.0.1
+
+  vue-eslint-parser@9.4.3(eslint@8.57.1):
+    dependencies:
+      debug: 4.4.0(supports-color@5.5.0)
+      eslint: 8.57.1
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      esquery: 1.6.0
+      lodash: 4.17.21
+      semver: 7.7.1
+    transitivePeerDependencies:
+      - supports-color
+
+  w3c-hr-time@1.0.2:
+    dependencies:
+      browser-process-hrtime: 1.0.0
+
+  w3c-xmlserializer@1.1.2:
+    dependencies:
+      domexception: 1.0.1
+      webidl-conversions: 4.0.2
+      xml-name-validator: 3.0.0
+
+  w3c-xmlserializer@2.0.0:
+    dependencies:
+      xml-name-validator: 3.0.0
+
+  w3c-xmlserializer@4.0.0:
+    dependencies:
+      xml-name-validator: 4.0.0
+
+  walker@1.0.8:
+    dependencies:
+      makeerror: 1.0.12
+
+  watchpack@2.4.2:
+    dependencies:
+      glob-to-regexp: 0.4.1
+      graceful-fs: 4.2.11
+
+  wbuf@1.7.3:
+    dependencies:
+      minimalistic-assert: 1.0.1
+
+  webidl-conversions@3.0.1: {}
+
+  webidl-conversions@4.0.2: {}
+
+  webidl-conversions@5.0.0: {}
+
+  webidl-conversions@6.1.0: {}
+
+  webidl-conversions@7.0.0: {}
+
+  webpack-bundle-analyzer@4.10.2:
+    dependencies:
+      '@discoveryjs/json-ext': 0.5.7
+      acorn: 8.14.0
+      acorn-walk: 8.3.4
+      commander: 7.2.0
+      debounce: 1.2.1
+      escape-string-regexp: 4.0.0
+      gzip-size: 6.0.0
+      html-escaper: 2.0.2
+      opener: 1.5.2
+      picocolors: 1.1.1
+      sirv: 2.0.4
+      ws: 7.5.10
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0):
+    dependencies:
+      '@discoveryjs/json-ext': 0.5.7
+      '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0))(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0))(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0))(webpack-dev-server@4.15.2(webpack-cli@5.1.4)(webpack@5.98.0))(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      colorette: 2.0.20
+      commander: 10.0.1
+      cross-spawn: 7.0.6
+      envinfo: 7.14.0
+      fastest-levenshtein: 1.0.16
+      import-local: 3.2.0
+      interpret: 3.1.1
+      rechoir: 0.8.0
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+      webpack-merge: 5.10.0
+    optionalDependencies:
+      webpack-bundle-analyzer: 4.10.2
+      webpack-dev-server: 4.15.2(webpack-cli@5.1.4)(webpack@5.98.0)
+
+  webpack-dev-middleware@5.3.4(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      colorette: 2.0.20
+      memfs: 3.5.3
+      mime-types: 2.1.35
+      range-parser: 1.2.1
+      schema-utils: 4.3.0
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+
+  webpack-dev-middleware@6.1.3(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      colorette: 2.0.20
+      memfs: 3.5.3
+      mime-types: 2.1.35
+      range-parser: 1.2.1
+      schema-utils: 4.3.0
+    optionalDependencies:
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+
+  webpack-dev-server@4.15.2(webpack-cli@5.1.4)(webpack@5.98.0):
+    dependencies:
+      '@types/bonjour': 3.5.13
+      '@types/connect-history-api-fallback': 1.5.4
+      '@types/express': 4.17.21
+      '@types/serve-index': 1.9.4
+      '@types/serve-static': 1.15.7
+      '@types/sockjs': 0.3.36
+      '@types/ws': 8.5.14
+      ansi-html-community: 0.0.8
+      bonjour-service: 1.3.0
+      chokidar: 3.6.0
+      colorette: 2.0.20
+      compression: 1.8.0
+      connect-history-api-fallback: 2.0.0
+      default-gateway: 6.0.3
+      express: 4.21.2
+      graceful-fs: 4.2.11
+      html-entities: 2.5.2
+      http-proxy-middleware: 2.0.7(@types/express@4.17.21)
+      ipaddr.js: 2.2.0
+      launch-editor: 2.10.0
+      open: 8.4.2
+      p-retry: 4.6.2
+      rimraf: 3.0.2
+      schema-utils: 4.3.0
+      selfsigned: 2.4.1
+      serve-index: 1.9.1
+      sockjs: 0.3.24
+      spdy: 4.0.2
+      webpack-dev-middleware: 5.3.4(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      ws: 8.18.0
+    optionalDependencies:
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0)
+    transitivePeerDependencies:
+      - bufferutil
+      - debug
+      - supports-color
+      - utf-8-validate
+
+  webpack-hot-middleware@2.26.1:
+    dependencies:
+      ansi-html-community: 0.0.8
+      html-entities: 2.5.2
+      strip-ansi: 6.0.1
+
+  webpack-manifest-plugin@5.0.0(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)):
+    dependencies:
+      tapable: 2.2.1
+      webpack: 5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4)
+      webpack-sources: 2.3.1
+
+  webpack-merge@5.10.0:
+    dependencies:
+      clone-deep: 4.0.1
+      flat: 5.0.2
+      wildcard: 2.0.1
+
+  webpack-sources@0.1.5:
+    dependencies:
+      source-list-map: 0.1.8
+      source-map: 0.5.7
+
+  webpack-sources@1.4.3:
+    dependencies:
+      source-list-map: 2.0.1
+      source-map: 0.6.1
+
+  webpack-sources@2.3.1:
+    dependencies:
+      source-list-map: 2.0.1
+      source-map: 0.6.1
+
+  webpack-sources@3.2.3: {}
+
+  webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4):
+    dependencies:
+      '@types/eslint-scope': 3.7.7
+      '@types/estree': 1.0.6
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/wasm-edit': 1.14.1
+      '@webassemblyjs/wasm-parser': 1.14.1
+      acorn: 8.14.0
+      browserslist: 4.24.4
+      chrome-trace-event: 1.0.4
+      enhanced-resolve: 5.18.1
+      es-module-lexer: 1.6.0
+      eslint-scope: 5.1.1
+      events: 3.3.0
+      glob-to-regexp: 0.4.1
+      graceful-fs: 4.2.11
+      json-parse-even-better-errors: 2.3.1
+      loader-runner: 4.3.0
+      mime-types: 2.1.35
+      neo-async: 2.6.2
+      schema-utils: 4.3.0
+      tapable: 2.2.1
+      terser-webpack-plugin: 5.3.11(esbuild@0.25.0)(webpack@5.98.0(esbuild@0.25.0)(webpack-cli@5.1.4))
+      watchpack: 2.4.2
+      webpack-sources: 3.2.3
+    optionalDependencies:
+      webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack-dev-server@4.15.2)(webpack@5.98.0)
+    transitivePeerDependencies:
+      - '@swc/core'
+      - esbuild
+      - uglify-js
+
+  websocket-driver@0.7.4:
+    dependencies:
+      http-parser-js: 0.5.9
+      safe-buffer: 5.2.1
+      websocket-extensions: 0.1.4
+
+  websocket-extensions@0.1.4: {}
+
+  whatwg-encoding@1.0.5:
+    dependencies:
+      iconv-lite: 0.4.24
+
+  whatwg-encoding@2.0.0:
+    dependencies:
+      iconv-lite: 0.6.3
+
+  whatwg-mimetype@2.3.0: {}
+
+  whatwg-mimetype@3.0.0: {}
+
+  whatwg-url@11.0.0:
+    dependencies:
+      tr46: 3.0.0
+      webidl-conversions: 7.0.0
+
+  whatwg-url@5.0.0:
+    dependencies:
+      tr46: 0.0.3
+      webidl-conversions: 3.0.1
+
+  whatwg-url@7.1.0:
+    dependencies:
+      lodash.sortby: 4.7.0
+      tr46: 1.0.1
+      webidl-conversions: 4.0.2
+
+  whatwg-url@8.7.0:
+    dependencies:
+      lodash: 4.17.21
+      tr46: 2.1.0
+      webidl-conversions: 6.1.0
+
+  which-boxed-primitive@1.1.1:
+    dependencies:
+      is-bigint: 1.1.0
+      is-boolean-object: 1.2.2
+      is-number-object: 1.1.1
+      is-string: 1.1.1
+      is-symbol: 1.1.1
+
+  which-builtin-type@1.2.1:
+    dependencies:
+      call-bound: 1.0.3
+      function.prototype.name: 1.1.8
+      has-tostringtag: 1.0.2
+      is-async-function: 2.1.1
+      is-date-object: 1.1.0
+      is-finalizationregistry: 1.1.1
+      is-generator-function: 1.1.0
+      is-regex: 1.2.1
+      is-weakref: 1.1.1
+      isarray: 2.0.5
+      which-boxed-primitive: 1.1.1
+      which-collection: 1.0.2
+      which-typed-array: 1.1.18
+
+  which-collection@1.0.2:
+    dependencies:
+      is-map: 2.0.3
+      is-set: 2.0.3
+      is-weakmap: 2.0.2
+      is-weakset: 2.0.4
+
+  which-module@2.0.1: {}
+
+  which-typed-array@1.1.18:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      for-each: 0.3.5
+      gopd: 1.2.0
+      has-tostringtag: 1.0.2
+
+  which@1.3.1:
+    dependencies:
+      isexe: 2.0.0
+
+  which@2.0.2:
+    dependencies:
+      isexe: 2.0.0
+
+  wide-align@1.1.5:
+    dependencies:
+      string-width: 4.2.3
+
+  wildcard@2.0.1: {}
+
+  window@4.2.6:
+    dependencies:
+      jsdom: 13.2.0
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  wkx@0.5.0:
+    dependencies:
+      '@types/node': 20.19.11
+
+  word-wrap@1.2.5: {}
+
+  wrap-ansi@3.0.1:
+    dependencies:
+      string-width: 2.1.1
+      strip-ansi: 4.0.0
+
+  wrap-ansi@5.1.0:
+    dependencies:
+      ansi-styles: 3.2.1
+      string-width: 3.1.0
+      strip-ansi: 5.2.0
+
+  wrap-ansi@6.2.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  wrap-ansi@7.0.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  wrap-ansi@8.1.0:
+    dependencies:
+      ansi-styles: 6.2.1
+      string-width: 5.1.2
+      strip-ansi: 7.1.0
+
+  wrappy@1.0.2: {}
+
+  write-file-atomic@3.0.3:
+    dependencies:
+      imurmurhash: 0.1.4
+      is-typedarray: 1.0.0
+      signal-exit: 3.0.7
+      typedarray-to-buffer: 3.1.5
+
+  write-file-atomic@4.0.2:
+    dependencies:
+      imurmurhash: 0.1.4
+      signal-exit: 3.0.7
+
+  ws@6.2.3:
+    dependencies:
+      async-limiter: 1.0.1
+
+  ws@7.5.10: {}
+
+  ws@8.18.0: {}
+
+  xml-name-validator@3.0.0: {}
+
+  xml-name-validator@4.0.0: {}
+
+  xmlchars@2.2.0: {}
+
+  xss@1.0.15:
+    dependencies:
+      commander: 2.20.3
+      cssfilter: 0.0.10
+
+  xtend@4.0.2: {}
+
+  y18n@4.0.3: {}
+
+  y18n@5.0.8: {}
+
+  yallist@3.1.1: {}
+
+  yallist@4.0.0: {}
+
+  yaml@1.10.2: {}
+
+  yargs-parser@13.1.2:
+    dependencies:
+      camelcase: 5.3.1
+      decamelize: 1.2.0
+
+  yargs-parser@18.1.3:
+    dependencies:
+      camelcase: 5.3.1
+      decamelize: 1.2.0
+
+  yargs-parser@20.2.9: {}
+
+  yargs-parser@21.1.1: {}
+
+  yargs@13.3.2:
+    dependencies:
+      cliui: 5.0.0
+      find-up: 3.0.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      require-main-filename: 2.0.0
+      set-blocking: 2.0.0
+      string-width: 3.1.0
+      which-module: 2.0.1
+      y18n: 4.0.3
+      yargs-parser: 13.1.2
+
+  yargs@15.4.1:
+    dependencies:
+      cliui: 6.0.0
+      decamelize: 1.2.0
+      find-up: 4.1.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      require-main-filename: 2.0.0
+      set-blocking: 2.0.0
+      string-width: 4.2.3
+      which-module: 2.0.1
+      y18n: 4.0.3
+      yargs-parser: 18.1.3
+
+  yargs@16.2.0:
+    dependencies:
+      cliui: 7.0.4
+      escalade: 3.2.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 20.2.9
+
+  yargs@17.7.2:
+    dependencies:
+      cliui: 8.0.1
+      escalade: 3.2.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
+
+  yauzl@2.10.0:
+    dependencies:
+      buffer-crc32: 0.2.13
+      fd-slicer: 1.1.0
+
+  yn@3.1.1: {}
+
+  yocto-queue@0.1.0: {}
+
+  zen-observable-ts@0.8.21:
+    dependencies:
+      tslib: 1.14.1
+      zen-observable: 0.8.15
+
+  zen-observable@0.8.15: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
new file mode 100644
index 000000000..3e712d3ca
--- /dev/null
+++ b/pnpm-workspace.yaml
@@ -0,0 +1,3 @@
+packages:
+  - "apps/*"
+  - "packages/*"
\ No newline at end of file
diff --git a/resources/classes/Account.class.php b/resources/classes/Account.class.php
deleted file mode 100755
index 08ceb596d..000000000
--- a/resources/classes/Account.class.php
+++ /dev/null
@@ -1,667 +0,0 @@
-<?php
-
-
-/**
- * @package Core
- * @author Ben Keen <ben.keen@gmail.com>
- */
-class Account {
-
-	/**
-	 * There are two types of anonymous users:
-	 * 1. Anonymous admin. This is when the generator is configured to have a single user account at all times.
-	 *    This account type has permission to do everything; there's a single user in the user_accounts DB table.
-	 * 2. Anonymous user. This is when the user hasn't logged in, but MUST, in order to save and load stuff.
-	 */
-	private $isAnonymousAdmin = false;
-	private $isAnonymousUser = false;
-	private $accountID;
-	private $accountType;
-	private $dateCreated;
-	private $lastUpdated;
-	private $dateExpires;
-	private $firstName;
-	private $lastName;
-	private $email;
-	private $configurations;
-
-
-	/**
-	 * Instantiates a user account. This is passed either "anonymous" or the Account ID
-	 * as the constructor parameter. User account login is done via the login method below.
- 	 *
-	 * @param mixed $accountID
-	 */
-	public function __construct($accountID) {
-		$this->getCurrentUser($accountID);
-	}
-
-	/**
-	 * Called by the constructor and any time the user updates his user account. 
-	 */
-	private function getCurrentUser($accountID) {
-		if ($accountID == "anonymousAdmin") {
-			$accountID = 1;
-			$this->isAnonymousAdmin = true;
-			$_SESSION["account_id"] = 1;
-		} else if ($accountID == "anonymousUser") {
-			$this->isAnonymousUser = true;
-		}
-
-		if (is_numeric($accountID)) {
-			$prefix = Core::getDbTablePrefix();
-			$response = Core::$db->query("
-				SELECT * 
-				FROM {$prefix}user_accounts
-				WHERE account_id = $accountID
-			");
-
-			if ($response["success"]) {
-				$accountInfo = mysqli_fetch_assoc($response["results"]);
-				$this->accountID = $accountInfo["account_id"];
-				$this->accountType = $accountInfo["account_type"];
-				$this->dateCreated = date("U", strtotime($accountInfo["date_created"]));
-				$this->lastUpdated = date("U", strtotime($accountInfo["last_updated"]));
-				$this->dateExpires = date("U", strtotime($accountInfo["date_expires"]));
-				$this->firstName = $accountInfo["first_name"];
-				$this->lastName = $accountInfo["last_name"];
-				$this->email = $accountInfo["email"];
-				$this->getConfigurations();
-				$this->numRowsGenerated = $accountInfo["num_rows_generated"];
-			}
-		}
-	}
-
-	/**
-	 * Attempts to log a user in. If successful, it updates sessions and returns a success
-	 * message; otherwise, just returns the appropriate error
-	 */
-	public static function login($email, $password) {
-		$prefix = Core::getDbTablePrefix();
-		$email = Utils::sanitize($email);
-		$response = Core::$db->query("
-			SELECT *
-			FROM {$prefix}user_accounts
-			WHERE email = '$email'
-			LIMIT 1
-		");
-
-		if (!$response["success"]) {
-			return;
-		}
-		$L = Core::$language->getCurrentLanguageStrings();
-
-		$data = mysqli_fetch_assoc($response["results"]);
-		if (empty($data)) {
-			return array(
-				"success" => false,
-				"message" => $L["no_account_found"]
-			);
-		}
-
-		// compare the passwords
-		$encryptionSalt    = Core::getEncryptionSalt();
-		$encryptedPassword = crypt($password, $encryptionSalt);
-		if ($encryptedPassword != $data["password"]) {
-			return array(
-				"success" => false,
-				"message" => $L["invalid_password"]
-			);
-		}
-
-		// store the account in sessions
-		$_SESSION["account_id"] = $data["account_id"];
-
-		// update the last login time for this user 
-		$now = Utils::getCurrentDatetime();
-		Core::$db->query("UPDATE {$prefix}user_accounts SET last_logged_in = '$now' WHERE account_id = {$data["account_id"]}");
-
-		return array(
-			"success" => true,
-			"message" => ""
-		);
-	}
-
-	public static function logout() {
-		session_destroy(); 
-	}
-
-	public static function resetPassword($email) {
-		$prefix = Core::getDbTablePrefix();
-		$email = Utils::sanitize($email);
-		$response = Core::$db->query("
-			SELECT * 
-			FROM {$prefix}user_accounts
-			WHERE email = '$email'
-			LIMIT 1
-		");
-
-		if (!$response["success"]) {
-			return;
-		}
-
-		$L = Core::$language->getCurrentLanguageStrings();
-
-		$data = mysqli_fetch_assoc($response["results"]);
-		if (empty($data)) {
-			return array(
-				"success" => false,
-				"message" => $L["user_not_found"]
-			);
-		}
-
-		$randPassword = Utils::generateRandomAlphanumericStr("CXCXCX");
-
-		// now attempt to send the email
-		try {
-			$emailContent = preg_replace("/%1/", $randPassword, $L["password_reset_email_content1"]);
-			$emailContent .= "\n\n" . $L["password_reset_email_content2"];
-			$emailSent = Emails::sendEmail(array(
-				"recipient" => $email,
-				"subject"   => $L["reset_password"],
-				"content"   => $emailContent
-			));
-
-			$encryptionSalt = Core::getEncryptionSalt();
-			$encryptedPassword = crypt($randPassword, $encryptionSalt);
-			$response = Core::$db->query("
-				UPDATE {$prefix}user_accounts
-				SET password = '$encryptedPassword'
-				WHERE email = '$email'
-				LIMIT 1
-			");
-
-			if ($response && $emailSent) {
-				if ($response["success"]) {
-					return array(
-						"success" => true,
-						"message" => $L["password_reset_complete"]
-					);
-				}
-			} else {
-				return array(
-					"success" => false,
-					"message" => $L["email_not_sent"]
-				);
-			}
-
-		} catch (Exception $e) {
-			return array(
-				"success" => false,
-				"message" => $L["email_not_sent"]
-			);
-		}
-	}
-
-
-	public function getAccount() {
-		return array(
-			"isAnonymousAdmin" => $this->isAnonymousAdmin,
-			"accountID"        => $this->accountID,
-			"accountType"      => $this->accountType,
-			"dateCreated"      => $this->dateCreated,
-			"lastUpdated"      => $this->lastUpdated,
-			"dateExpires"      => $this->dateExpires,
-			"firstName"        => $this->firstName,
-			"lastName"         => $this->lastName,
-			"email"            => $this->email,
-			"configurations"   => $this->configurations,
-			"numRowsGenerated" => $this->numRowsGenerated
-		);
-	}
-
-	public function isAnonymousAdmin() {
-		return $this->isAnonymousAdmin;
-	}
-
-	public function isAdmin() {
-		return $this->accountType == "admin";
-	}
-
-	public function getAccountID() {
-		return $this->accountID;
-	}
-
-	public function getAccountType() {
-		return $this->accountType;
-	}
-
-	/**
-	 * Loads ANY public data set.
-	 */
-	public function getPublicDataSet($configurationID) {
-		$success = false;
-		$message = "";
-
-		if (!empty($configurationID) && is_numeric($configurationID)) {
-			$prefix   = Core::getDbTablePrefix();		
-			$response = Core::$db->query("
-				SELECT *, unix_timestamp(date_created) as date_created_unix, unix_timestamp(last_updated) as last_updated_unix
-				FROM   {$prefix}configurations
-				WHERE  configuration_id = $configurationID AND
-					   status = 'public'
-			");
-
-			if ($response["success"]) {
-				if (mysqli_num_rows($response["results"]) == 1) {
-					$success = true;
-					$message = mysqli_fetch_assoc($response["results"]);
-				}
-			} else {	
-				$message = $response["errorMessage"];
-			}
-		}
-
-		return array(
-			"success" => $success,
-			"message" => $message
-		);
-	}
-
-	public function getConfigurations() {
-		$accountID = $this->accountID;
-		$prefix   = Core::getDbTablePrefix();		
-		$response = Core::$db->query("
-			SELECT *, unix_timestamp(date_created) as date_created_unix, unix_timestamp(last_updated) as last_updated_unix
-			FROM   {$prefix}configurations
-			WHERE  account_id = $accountID
-			ORDER BY last_updated DESC
-		");
-
-		if ($response["success"]) {
-			$data = array();
-			while ($row = mysqli_fetch_assoc($response["results"])) {
-				$data[] = $row;
-			}
-			$this->configurations = $data;
-		} else {
-			// TODO
-		}
-	}
-
-
-	public function deleteConfigurations($configurationIDs) {
-		if (empty($configurationIDs)) {
-			return;
-		}
-
-		$cleanedConfigurationIDs = array();
-		for ($i=0; $i<count($configurationIDs); $i++) {
-			if (is_numeric($configurationIDs[$i])) {
-				$cleanedConfigurationIDs[] = $configurationIDs[$i];
-			}
-		}
-
-		$configIDStr = implode(", ", $cleanedConfigurationIDs);
-		$accountID = $this->accountID;
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			DELETE FROM {$prefix}configurations 
-			WHERE account_id = {$accountID} AND
-				  configuration_id IN ($configIDStr)
-		");
-
-		if ($response["success"]) {
-			return array(
-				"success" => true,
-				"message" => $cleanedConfigurationIDs
-			);
-		} else {
-			return array(
-				"success"   => false,
-				"errorCode" => ErrorCodes::FAILED_SQL_STATEMENT,
-				"message"   => $response["errorMessage"]
-			);
-		}
-	}
-
-
-	public function saveConfiguration($data) {
-		$configurationName = Utils::sanitize($data["dataSetName"]);
-
-		$configurationID = null;
-		if (array_key_exists("configurationID", $data)) {
-			$configurationID = $data["configurationID"];
-			unset($data["configurationID"]);
-		}
-
-		unset($data["action"]);
-		unset($data["dataSetName"]);
-		$content = addslashes(json_encode($data));
-
-		$now = Utils::getCurrentDatetime();
-		$nowUnixTime = Utils::convertDatetimeToTimestamp($now);
-		$prefix = Core::getDbTablePrefix();
-		$accountID = $this->accountID;
-
-		if ($configurationID == null) {
-			$response = Core::$db->query("
-				INSERT INTO {$prefix}configurations (status, date_created, last_updated, account_id, configuration_name, content)
-				VALUES ('private', '$now', '$now', $accountID, '" . $configurationName . "', '" . $content . "')
-			");
-
-			if ($response["success"]) {
-				$configurationID = mysqli_insert_id(Core::$db->getDBLink());
-				return array(
-					"success" => true,
-					"message" => $configurationID,
-					"lastUpdated" => $nowUnixTime
-				);
-			} else {
-				return array(
-					"success" => false,
-					"message" => "There was a problem saving the configuration: " . $response["errorMessage"]
-				);
-			}
-		} else {
-			$response = Core::$db->query("
-				UPDATE {$prefix}configurations 
-				SET 	last_updated = '$now',
-						configuration_name = '" . $configurationName . "',
-						content = '" . $content . "'
-				WHERE account_id = $accountID AND
-						configuration_id = $configurationID
-			");
-
-			if ($response["success"]) {
-				return array(
-					"success" => true,
-					"message" => $configurationID,
-					"lastUpdated" => $nowUnixTime
-				);
-			} else {
-				return array(
-					"success" => false,
-					"message" => "There was a problem saving the configuration: " . $response["errorMessage"]
-				);
-			}
-		}
-	}
-
-	public function copyConfiguration($data) {
-		$dataSetId         = Utils::sanitize($data["dataSetId"]);
-		$configurationName = Utils::sanitize($data["newDataSetName"]);
-
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			INSERT INTO {$prefix}configurations (status, date_created, last_updated, account_id, configuration_name, content, num_rows_generated)
-				SELECT status, date_created, last_updated, account_id, configuration_name, content, num_rows_generated
-				FROM {$prefix}configurations
-				WHERE configuration_id = $dataSetId
-		");
-
-		// if it worked okay (it should!) update the last_updated and configuration_name fields
-		if ($response["success"]) {
-			$newConfigurationID = mysqli_insert_id(Core::$db->getDBLink());
-			$now = Utils::getCurrentDatetime();
-			$response2 = Core::$db->query("
-				UPDATE {$prefix}configurations
-				SET configuration_name = '$configurationName',
-					last_updated = '$now'
-				WHERE configuration_id = $newConfigurationID
-			");
-
-			if ($response2["success"]) {
-				return array(
-					"success" => true,
-					"message" => ""
-				);
-			}
-
-		} else {
-			return array(
-				"success" => false,
-				"message" => "There was a problem copying the Data Set: " . $response["errorMessage"]
-			);
-		}
-	}
-
-	/**
-	 * Used (currently) in the installation script. Note: this function relies on the settings file having
-	 * been defined, along with an arbitrary encryption salt.
-	 * @param $accountInfo
-	 * @param bool $isCurrentUser
-	 * @return int
-	 */
-	public static function createAccount($accountInfo, $isCurrentUser = false) {
-		$accountInfo = Utils::sanitize($accountInfo);
-		$encryptionSalt = Core::getEncryptionSalt();
-
-		$accountType = $accountInfo["accountType"];
-		$firstName   = isset($accountInfo["firstName"]) && !empty($accountInfo["firstName"]) ? $accountInfo["firstName"] : "";
-		$lastName    = isset($accountInfo["lastName"]) && !empty($accountInfo["lastName"]) ? $accountInfo["lastName"] : "";
-		$email       = isset($accountInfo["email"]) && !empty($accountInfo["email"]) ? $accountInfo["email"] : "";
-		$password    = "";
-		if (isset($accountInfo["password"]) && !empty($accountInfo["password"])) {
-			$password = crypt($accountInfo["password"], $encryptionSalt);
-		}
-
-		// TODO - this is weird!
-		$autoEmail   = isset($accountInfo["accountType"]) ? $accountInfo["accountType"] : false;
-
-		$L = Core::$language->getCurrentLanguageStrings();
-		$now = Utils::getCurrentDatetime();
-		$prefix = Core::getDbTablePrefix();
-		$result = Core::$db->query("
-			INSERT INTO {$prefix}user_accounts (date_created, last_updated, date_expires, last_logged_in, account_type, 
-				first_name, last_name, email, password)
-			VALUES ('$now', '$now', '$now', NULL, '$accountType', '$firstName', '$lastName', '$email', '$password')
-		");
-
-		$emailSent = false; // not used yet, but we should notify the user via the interface
-		if ($autoEmail) {
-			try {
-				$content = $L["account_created_msg"] . "\n\n";
-				if (isset($_SERVER["HTTP_REFERER"]) && !empty($_SERVER["HTTP_REFERER"])) {
-					$content .= "{$L["login_url_c"]} {$_SERVER["HTTP_REFERER"]}\n";
-				}
-				$content .= "{$L["email_c"]} $email\n{$L["password_c"]} {$accountInfo["password"]}\n";
-				Emails::sendEmail(array(
-					"recipient" => $email,
-					"subject"   => $L["account_created"],
-					"content"   => $content
-				));
-				$emailSent = true;
-			} catch (Exception $e) {
-				$emailSent = false;
-			}
-		}
-
-		$returnInfo = array(
-			"success" => $result["success"]
-		);
-
-		if ($result["success"]) {
-			$accountID = mysqli_insert_id(Core::$db->getDBLink());
-			if ($isCurrentUser) {
-				Core::initSessions();
-				$_SESSION["account_id"] = $accountID;
-				Core::initUser(true);
-			}
-			$returnInfo["accountID"] = $accountID;
-		}
-
-		return $returnInfo;
-	}
-
-
-	public function updateAccount($accountID, $info) {
-		$L = Core::$language->getCurrentLanguageStrings();
-		$dbLink = Core::$db->getDBLink();
-		$accountID = mysqli_real_escape_string($dbLink, $accountID);
-		$prefix = Core::getDbTablePrefix();
-
-		if (empty($accountID) || !is_numeric($accountID)) {
-			return array(
-				"success" => false,
-				"errorCode" => ErrorCodes::INVALID_PARAMS,
-				"errorMsg" => $L["invalid_account_id"]
-			);
-		}
-		$firstName = $info["firstName"];
-		$lastName  = $info["lastName"];
-		$email     = $info["email"];
-
-		$passwordClause = "";
-		if (isset($info["password"]) && !empty($info["password"])) {
-			$encryptionSalt    = Core::getEncryptionSalt();
-			$encryptedPassword = crypt($info["password"], $encryptionSalt);
-			$passwordClause = ", password = '$encryptedPassword'";
-		}
-
-		$response = Core::$db->query("
-			UPDATE {$prefix}user_accounts
-			SET first_name = '$firstName',
-				last_name = '$lastName',
-				email = '$email'
-				$passwordClause
-			WHERE account_id = $accountID
-		");
-
-		if ($response["success"]) { 
-			$this->getCurrentUser($accountID);
-			return array(
-				"success" => true
-			);
-		} else {
-			// TODO
-		}
-	}
-	
-	public function deleteAccount($accountID) {
-		$L = Core::$language->getCurrentLanguageStrings();
-		$dbLink = Core::$db->getDBLink();
-		if ($this->accountType != "admin") {
-			return array(
-				"success" => false,
-				"errorCode" => ErrorCodes::NON_ADMIN
-			);
-		} else if (!is_numeric($accountID)) {
-			return array(
-				"success" => false,
-				"errorCode" => ErrorCodes::INVALID_PARAMS,
-				"errorMsg" => $L["invalid_account_id"]
-			);
-		}
-
-		$accountID = mysqli_real_escape_string($dbLink, $accountID);
-		$prefix = Core::getDbTablePrefix();
-		Core::$db->query("DELETE FROM {$prefix}user_accounts WHERE account_id = $accountID");
-		Core::$db->query("DELETE FROM {$prefix}configurations WHERE account_id = $accountID");
-
-		return array("success" => true);
-	}
-
-	/**
-	 * Helper function to determine if a user account exists, as determined by their email address.
-	 * @param $email
-	 * @return bool
-	 */
-	public static function checkAccountExists($email) {
-		$email = Utils::sanitize(trim($email));
-		$prefix = Core::getDbTablePrefix();
-
-		$response = Core::$db->query("
-			SELECT count(*) as c
-			FROM   {$prefix}user_accounts
-			WHERE email = '$email'
-		");
-
-		$result = mysqli_fetch_assoc($response["results"]);
-
-		// shouldn't be necessary, but just in case, check for >= 1
-		return $result["c"] >= 1;
-	}
-
-	public function getUsers() {
-		if ($this->accountType != "admin") {
-			return array(
-				"success" => false,
-				"errorCode" => ErrorCodes::NON_ADMIN
-			);
-		}
-
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			SELECT *
-			FROM {$prefix}user_accounts 
-			WHERE account_type = 'user'
-			ORDER BY last_name ASC
-		");
-
-		$data = array();
-		if ($response["success"]) {
-			while ($row = mysqli_fetch_assoc($response["results"])) {
-				$row["date_created"] = date("U", strtotime($row["date_created"]));
-				$row["last_updated"] = date("U", strtotime($row["last_updated"]));
-				$row["last_logged_in"] = (!empty($row["last_logged_in"]) && $row["last_logged_in"] != "0000-00-00 00:00:00") ? date("U", strtotime($row["last_logged_in"])) : "";
-				$data[] = $row;
-			}
-		}
-
-		return array(
-			"success" => true,
-			"accounts" => $data
-		);
-	}
-
-
-	public function updateRowsGeneratedCount($configurationID, $rowsGenerated) {
-		if (!is_numeric($rowsGenerated)) {
-			return;
-		}
-		$dbLink = Core::$db->getDBLink();
-		$cleanRowsGenerated = mysqli_real_escape_string($dbLink, $rowsGenerated);
-		$prefix    = Core::getDbTablePrefix();
-		$accountID = $this->accountID;
-		$response = Core::$db->query("
-			UPDATE {$prefix}configurations
-			SET num_rows_generated = num_rows_generated+$cleanRowsGenerated
-			WHERE  account_id = $accountID AND configuration_id = $configurationID
-		");
-
-		$response = Core::$db->query("
-			UPDATE {$prefix}user_accounts
-			SET num_rows_generated = num_rows_generated+$cleanRowsGenerated
-			WHERE account_id = $accountID
-		");
-	}
-
-	/**
-	 * Time is currently passed but not used. It's going to be used to ensure that only NEWEST requests
-	 * actually update the record
-	 */
-	public function saveDataSetVisibilityStatus($configurationID, $status, $time) {
-		if (!is_numeric($configurationID)) {
-			return;
-		}
-
-		$prefix = Core::getDbTablePrefix();
-		$dbLink = Core::$db->getDBLink();
-		$accountID = $this->accountID;
-		$configurationID = mysqli_real_escape_string($dbLink, $configurationID);
-		$status = mysqli_real_escape_string($dbLink, $status);
-
-		$response = Core::$db->query("
-			UPDATE {$prefix}configurations
-			SET    status = '$status'
-			WHERE  account_id = $accountID AND 
-				   configuration_id = $configurationID
-		");
-
-		if ($response["success"]) {
-			return array(
-				"success" => true,
-				"message" => $configurationID,
-				"newStatus" => $status
-			);
-		} else {
-			return array(
-				"success" => false,
-				"message" => "There was a problem saving the configuration: " . $response["errorMessage"]
-			);
-		}
-
-	}
-}
-
diff --git a/resources/classes/AjaxRequest.class.php b/resources/classes/AjaxRequest.class.php
deleted file mode 100644
index 9b3a5649d..000000000
--- a/resources/classes/AjaxRequest.class.php
+++ /dev/null
@@ -1,461 +0,0 @@
-<?php
-
-/**
- * A generic class for handling all of the Core's Ajax requests. All requests are identified
- * through a unique "action" string, and (usually) arbitrary other info passed via POST.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class AjaxRequest {
-	private $action;
-	private $response;
-	private $post;
-
-	/**
-	 * AjaxRequest objects are automatically processed when they are created, based on the unique $action
-	 * value. The result of the call is stored in $response to be handled however you need (e.g. output
-	 * as JSON, XML etc) - or an Exception is thrown if something went wrong. Exceptions are used SOLELY for
-	 * program errors: not for user-entry errors.
-	 */
-	public function __construct($action, $post = array()) {
-
-		$this->action = $action;
-		$this->post = Utils::sanitize($post);
-
-		switch ($this->action) {
-
-			// ------------------------------------------------------------------------------------
-			// INSTALLATION
-			// ------------------------------------------------------------------------------------
-
-			// a fresh install assumes it's a blank slate: no database tables, no settings file
-			case "installationTestDbSettings":
-				Core::init("installation");
-				if (Core::checkIsInstalled()) {
-					return;
-				}
-				list($success, $content) = Database::testDbSettings($this->post["dbHostname"], $this->post["dbName"], $this->post["dbUsername"], $this->post["dbPassword"]);
-				$this->response["success"] = $success;
-				$this->response["content"] = $content;
-				break;
-
-			case "installationCreateSettingsFile":
-				Core::init("installation");
-				if (Core::checkIsInstalled()) {
-					return;
-				}
-				if (Core::checkSettingsFileExists()) {
-					$this->response["success"] = 0;
-					$this->response["content"] = "Your settings.php file already exists.";
-					return;
-				} else {
-					list($success, $content) = Installation::createSettingsFile($this->post["dbHostname"],
-						$this->post["dbName"], $this->post["dbUsername"], $this->post["dbPassword"], $this->post["dbTablePrefix"]);
-					$this->response["success"] = ($success) ? 1 : 0; // bah!
-					$this->response["content"] = $content;
-				}
-				break;
-
-			case "confirmSettingsFileExists":
-				Core::init("installation");
-				$settingsFileExists = Core::checkSettingsFileExists();
-				$this->response["success"] = ($settingsFileExists) ? 1 : 0;
-				break;
-
-			case "installationCreateDatabase":
-				Core::init("installationDatabaseReady");
-				if (Core::checkIsInstalled()) {
-					$this->response["success"] = 0;
-					$this->response["content"] = "It appears that the script is already installed. If the database already existed, you may need to delete the tables manually before being able to continue.";
-					return;
-				}
-				list($success, $content) = Installation::createDatabase();
-				if (!$success) {
-					$this->response["success"] = 0;
-					$this->response["content"] = $content;
-					return;
-				}
-
-				// always create the administrator account. If the user chose the anonymous setup, all values
-				// will be blank and all configurations will be associated with this (anonymous) user
-				$adminAccount = array(
-					"accountType" => "admin"
-				);
-				if ($this->post["userAccountSetup"] != "anonymous") {
-					$adminAccount["firstName"] = $this->post["firstName"];
-					$adminAccount["lastName"]  = $this->post["lastName"];
-					$adminAccount["email"]     = $this->post["email"];
-					$adminAccount["password"]  = $this->post["password"];
-				}
-				Account::createAccount($adminAccount, true);
-
-				// make note of the fact that we've passed this step of the installation process
-				Settings::setSetting("userAccountSetup", $this->post["userAccountSetup"]);
-				Settings::setSetting("installationStepComplete_Core", "yes");
-				Settings::setSetting("defaultLanguage", $this->post["defaultLanguage"]);
-				Settings::setSetting("allowAnonymousAccess", ($this->post["allowAnonymousAccess"] == "yes") ? "yes" : "no");
-				Settings::setSetting("anonymousUserPermissionDeniedMsg", $this->post["anonymousUserPermissionDeniedMsg"]);
-
-				$this->response["success"] = 1;
-				$this->response["content"] = "";
-				break;
-
-			// ------------------------------------------------------------------------------------
-			// PLUGINS (installation + reset)
-			// ------------------------------------------------------------------------------------
-
-			case "installationDataTypes":
-				Core::init("installationDatabaseReady");
-				if (!Core::checkIsInstalled()) {
-					$this->setDataTypes();
-				}
-				break;
-
-			case "resetDataTypes":
-				Core::init("resetPlugins");
-				if (Core::checkIsLoggedIn() && Core::$user->isAdmin()) {
-					$this->setDataTypes();
-				}
-				break;
-
-			case "installationSaveDataTypes":
-				Core::init("installationDatabaseReady");
-				if (!Core::checkIsInstalled()) {
-					$folders = $this->post["folders"];
-					$response = Settings::setSetting("installedDataTypes", $folders);
-					$this->response["success"] = $response["success"];
-					$this->response["content"] = $response["errorMessage"];
-				}
-				break;
-
-			case "resetSaveDataTypes":
-				Core::init("resetPlugins");
-				if (Core::checkIsLoggedIn() && Core::$user->isAdmin()) {
-					$folders = $this->post["folders"];
-					$response = Settings::setSetting("installedDataTypes", $folders);
-					$this->response["success"] = $response["success"];
-					$this->response["content"] = $response["errorMessage"];
-				}
-				break;
-
-			case "installationExportTypes":
-				Core::init("installationDatabaseReady");
-				if (!Core::checkIsInstalled()) {
-					$this->setExportTypes();
-				}
-				break;
-
-			case "resetExportTypes":
-				Core::init("resetPlugins");
-				if (Core::checkIsLoggedIn() && Core::$user->isAdmin()) {
-					$this->setExportTypes();
-				}
-				break;
-
-			case "installationSaveExportTypes":
-				Core::init("installationDatabaseReady");
-				if (!Core::checkIsInstalled()) {
-					$folders = $this->post["folders"];
-					$response = Settings::setSetting("installedExportTypes", $folders);
-					$this->response["success"] = $response["success"];
-					$this->response["content"] = $response["errorMessage"];
-				}
-				break;
-
-			case "resetSaveExportTypes":
-				Core::init("resetPlugins");
-				if (Core::checkIsLoggedIn() && Core::$user->isAdmin()) {
-					$folders = $this->post["folders"];
-					$response = Settings::setSetting("installedExportTypes", $folders);
-					$this->response["success"] = $response["success"];
-					$this->response["content"] = $response["errorMessage"];
-				}
-				break;
-
-			case "installationCountries":
-				Core::init("installationDatabaseReady");
-				if (!Core::checkIsInstalled()) {
-					$this->setCountries();
-				}
-				break;
-
-			case "resetCountries":
-				Core::init("resetPlugins");
-				if (Core::checkIsLoggedIn() && Core::$user->isAdmin()) {
-					$this->setCountries();
-				}
-				break;
-
-			case "installationSaveCountries":
-				Core::init("installationDatabaseReady");
-				if (!Core::checkIsInstalled()) {
-					$folders = $this->post["folders"];
-					Settings::setSetting("installedCountries", $folders);
-					$response = Settings::setSetting("installationComplete", "yes");
-					$this->response["success"] = $response["success"];
-					$this->response["content"] = $response["errorMessage"];
-				}
-				break;
-
-			case "resetSaveCountries":
-				Core::init("resetPlugins");
-				if (Core::checkIsLoggedIn() && Core::$user->isAdmin()) {
-					$folders = $this->post["folders"];
-					Settings::setSetting("installedCountries", $folders);
-					$this->response["success"] = true; // ...!
-				}
-				break;
-
-			// called anytime the plugins were updated (either via the installation or core script). This
-			// runs any post-processes that need to be done
-			case "updatedPluginsPostProcess":
-				Core::init();
-				$this->response["success"] = (Minification::createAppStartFile()) ? 1 : 0;
-				break;
-
-			// ------------------------------------------------------------------------------------
-			// USER ACCOUNTS
-			// ------------------------------------------------------------------------------------
-
-			case "getAccount":
-				Core::init();
-				$response = Core::$user->getAccount();
-				$this->response["success"] = true;
-				$this->response["content"] = $response;
-				break;
-
-			case "getUsers":
-				Core::init();
-				$response = Core::$user->getUsers();
-				$this->response["success"] = $response["success"];
-				if (isset($response["accounts"])) {
-					$this->response["content"] = $response["accounts"];
-				}
-				break;
-
-			case "createAccount":
-				Core::init();
-				if (!Core::checkIsLoggedIn()) {
-					$this->response["success"] = false;
-					$this->response["errorCode"] = ErrorCodes::NOT_LOGGED_IN;
-				} else if (Core::$user->getAccountType() != "admin") {
-					$this->response["success"] = false;
-					$this->response["errorCode"] = ErrorCodes::NON_ADMIN;
-				} else if (Account::checkAccountExists($this->post["email"])) {
-					$this->response["success"] = false;
-					$this->response["errorCode"] = ErrorCodes::ACCOUNT_ALREADY_EXISTS;
-				} else {
-					$accountInfo = $this->post;
-					$accountInfo["accountType"] = "user";
-					Account::createAccount($accountInfo);
-					$this->response["success"] = true;
-				}
-				break;
-
-			case "deleteAccount":
-				Core::init();
-				if (!Core::checkIsLoggedIn()) {
-					$this->response["success"] = false;
-					$this->response["errorCode"] = ErrorCodes::NOT_LOGGED_IN;
-				} else if (Core::$user->getAccountType() != "admin") {
-					$this->response["success"] = false;
-					$this->response["errorCode"] = ErrorCodes::NON_ADMIN;
-				} else {
-					$accountID = $this->post["accountID"];
-					$response = Core::$user->deleteAccount($accountID);
-					$this->response["success"] = true;
-				}
-				break;
-
-			// updates the current logged in user's info
-			case "updateAccount":
-				Core::init();
-				if (!Core::checkIsLoggedIn()) {
-					$this->response["success"] = false;
-					$this->response["errorCode"] = ErrorCodes::NOT_LOGGED_IN;
-				} else if (Core::$user->isAnonymousAdmin()) {
-					$this->response["success"] = false;
-					$this->response["errorCode"] = ErrorCodes::INVALID_REQUEST;
-				} else {
-					$accountID = $this->post["accountID"];
-					$this->response = Core::$user->updateAccount($accountID, $this->post);
-				}
-				break;
-
-			case "saveConfiguration":
-				Core::init();
-				$response = Core::$user->saveConfiguration($this->post);
-				$this->response["success"] = $response["success"];
-				$this->response["content"] = $response["message"];
-				if (isset($response["lastUpdated"])) {
-					$this->response["lastUpdated"] = $response["lastUpdated"];
-				}
-				break;
-
-			case "copyDataSet":
-				Core::init();
-				$response = Core::$user->copyConfiguration($this->post);
-				$this->response["success"] = $response["success"];
-				$this->response["content"] = $response["message"];
-				break;
-
-			case "deleteDataSets":
-				Core::init();
-				$configurationIDs = $this->post["configurationIDs"];
-				$response = Core::$user->deleteConfigurations($configurationIDs);
-				$this->response["success"] = $response["success"];
-				$this->response["content"] = $response["message"];
-				break;
-
-			case "saveDataSetVisibilityStatus":
-				Core::init();
-				$configurationID = $this->post["configurationID"];
-				$status = $this->post["status"];
-				$time   = $this->post["time"];
-				$response = Core::$user->saveDataSetVisibilityStatus($configurationID, $status, $time);
-				$this->response["success"] = $response["success"];
-				$this->response["content"] = $response["message"];
-				if (isset($response["newStatus"])) {
-					$this->response["newStatus"] = $response["newStatus"];
-				}
-				break;
-
-			case "getPublicDataSet":
-				Core::init();
-				$configurationID = $this->post["dataSetID"];
-				$response = Core::$user->getPublicDataSet($configurationID);
-				$this->response["success"] = $response["success"];
-				$this->response["content"] = $response["message"];
-				break;
-
-			case "login":
-				Core::init();
-				$email = $this->post["email"];
-				$password = $this->post["password"];
-				$response = Account::login($email, $password);
-				$this->response["success"] = $response["success"];
-				$this->response["content"] = $response["message"];
-				break;
-
-			case "logout":
-				Core::init();
-				if (!Core::checkIsLoggedIn()) {
-					$this->response["success"] = true;
-				} else if (!Core::$user->isAnonymousAdmin()) {
-					Core::$user->logout();
-					$this->response["success"] = true;
-				}
-				break;
-
-			case "resetPassword":
-				Core::init();
-				$email = $this->post["email"];
-				$response = Account::resetPassword($email);
-				$this->response["success"] = $response["success"];
-				$this->response["content"] = $response["message"];
-				break;
-
-
-			// ------------------------------------------------------------------------------------
-			// DATA GENERATION
-			// ------------------------------------------------------------------------------------
-
-			case "generateInPage":
-				Core::init("generation");
-				$gen = new DataGenerator($this->post);
-				$response = $gen->generate();
-				$this->response["success"]    = $response["success"];
-				$this->response["content"]    = $response["content"];
-				$this->response["isComplete"] = $response["isComplete"];
-				break;
-
-		}
-	}
-
-
-	// HELPERS
-
-	public function getResponse() {
-		return Utils::utf8_encode_array($this->response);
-	}
-
-
-	private function setDataTypes() {
-		$index = $this->post["index"];
-		$groupedDataTypes = DataTypePluginHelper::getDataTypePlugins("installationDatabaseReady", false);
-		$dataTypes        = DataTypePluginHelper::getDataTypeList($groupedDataTypes);
-
-		if ($index >= count($dataTypes)) {
-			$this->response["success"] = 1;
-			$this->response["content"] = "";
-			$this->response["isComplete"] = true;
-		} else {
-			// attempt to install this data type
-			$currDataType = $dataTypes[$index];
-			$this->response["dataTypeName"] = $currDataType->getName();
-			$this->response["dataTypeFolder"] = $currDataType->folder;
-			$this->response["isComplete"] = false;
-
-			try {
-				list($success, $content) = $currDataType->install();
-				$this->response["success"] = $success;
-				$this->response["content"] = $content;
-			} catch (Exception $e) {
-				$this->response["success"] = false;
-				$this->response["content"] = "Unknown error.";
-			}
-		}
-	}
-
-	private function setExportTypes() {
-		$index = $this->post["index"];
-		$exportTypes = ExportTypePluginHelper::getExportTypePlugins("installationDatabaseReady", false);
-
-		if ($index >= count($exportTypes)) {
-			$this->response["success"] = 1;
-			$this->response["content"] = "";
-			$this->response["isComplete"] = true;
-		} else {
-			// attempt to install this export type
-			$currExportType = $exportTypes[$index];
-			$this->response["exportTypeName"] = $currExportType->getName();
-			$this->response["exportTypeFolder"] = $currExportType->folder;
-			$this->response["isComplete"] = false;
-			try {
-				list($success, $content) = $currExportType->install();
-				$this->response["success"] = $success;
-				$this->response["content"] = $content;
-			} catch (Exception $e) {
-				$this->response["success"] = false;
-				$this->response["content"] = "Unknown error.";
-			}
-		}
-	}
-
-	private function setCountries() {
-		$index = $this->post["index"];
-		$countryPlugins = CountryPluginHelper::getCountryPlugins(false);
-
-		if ($index >= count($countryPlugins)) {
-			$this->response["success"] = 1;
-			$this->response["content"] = "";
-			$this->response["isComplete"] = true;
-		} else {
-			// attempt to install this country
-			$currCountryPlugin = $countryPlugins[$index];
-			$this->response["countryName"] = $currCountryPlugin->getName();
-			$this->response["countryFolder"] = $currCountryPlugin->folder;
-			$this->response["isComplete"] = false;
-			try {
-				// always run the uninstallation function first to ensure any old data is all cleared out
-				$currCountryPlugin->uninstall();
-				list($success, $content) = $currCountryPlugin->install();
-				$this->response["success"] = $success;
-				$this->response["content"] = $content;
-			} catch (Exception $e) {
-				$this->response["success"] = false;
-				$this->response["content"] = "Unknown error.";
-			}
-		}
-	}
-}
diff --git a/resources/classes/Core.class.php b/resources/classes/Core.class.php
deleted file mode 100644
index e7417437d..000000000
--- a/resources/classes/Core.class.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-
-/**
- * Called on script load for any Data Generator page. It does all the heavy lifting and initializes various
- * general vars and data for the script. It's used instead of the global namespace to store info needed throughout
- * the code; the class is static so we don't need to re-instantiate it all over the place, and force it to
- * reload/re-instantiate the various components.
- *
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class Core {
-
-	// overridable settings that the user may define in settings.php
-	private static $demoMode = false;	
-	private static $dbHostname;
-	private static $dbName;
-	private static $dbUsername;
-	private static $dbPassword;
-	private static $dbTablePrefix = "gd_";
-	private static $encryptionSalt;
-	private static $errorReporting = 1;
-	private static $maxGeneratedRows = 100000;
-	private static $defaultNumRows = 100;
-	private static $maxDemoModeRows = 100;
-	private static $defaultLanguageFile = "en";
-	private static $defaultExportType = "HTML";
-	private static $defaultCountryPlugins = array();
-	private static $defaultTheme = "classic";
-	private static $enableSmartySecurity = true;
-	private static $useMinifiedResources = false;
-
-	// non-overridable settings
-	private static $version = "3.1.1";
-	private static $releaseDate = "2014-01-30";
-	private static $minimumPHPVersion = "5.3.0";
-	private static $minimumMySQLVersion = "4.1.3";
-	private static $settingsFileExists = false;
-	private static $dataTypeGroups = array("human_data", "geo", "credit_card_data", "text", "numeric", "math", "other");
-	private static $continents = array("africa", "asia", "central_america", "europe", "north_america", "oceania", "south_america");
-	private static $isLoggedIn = false;
-
-
-	// left as public, because they're often modified / accessed, and it's just too fussy otherwise. The
-	// PHPDoc helps my IDE figure out what the hell each of them are
-
-	/**
-	 * @var Language
-	 */
-	public static $language;
-
-	/**
-	 * @var Database
-	 */
-	public static $db;
-
-	/**
-	 * @var Translations
-	 */
-	public static $translations;
-
-	/**
-	 * @var Account
-	 */
-	public static $user;
-
-	/**
-	 * @var GeoData
-	 */
-	public static $geoData;
-
-	/**
-	 * @var Smarty
-	 */
-	public static $smarty;
-
-	public static $dataTypePlugins;
-	public static $exportTypePlugins;
-
-	/**
-	 * @var CountryPlugin
-	 */
-	public static $countryPlugins;
-	public static $allowThemes = false;
-
-
-	/**
-	 * Core::init()
-	 *
-	 * Our initialization function. This is called on all page requests to initialize the Core
-	 * object. Since it's also used during installation (when the database and/or plugins haven't been
-	 * installed), the optional parameter controls whether or not the database object, plugins, sessions and user
-	 * should be initialized. Different call contexts require different initialization.
-	 *
-	 * @access public
-	 * @static
-	 * @param string $runtimeContext This determines the context in which the Core is being initialized. This
-	 *          info is used to let plugins instantiate themselves differently, as well as prevent the loading
-	 *          of incomplete parts of the script.<br />
-	 *          <b>installation</b>:              a fresh installation, DB not installed yet<br />
-	 *          <b>installationDatabaseReady</b>: during installation after the DB has been installed<br />
-	 *          <b>ui</b>:                        (default) for the main generator page<br />
-	 *          <b>generation</b>:                when we're in the process of creating actual data
-	 *          <b>resetPlugins</b>:              initialized everything except the plugins, which may be safely reset
-	 */
-	public static function init($runtimeContext = "ui") {
-		self::loadSettingsFile();
-		error_reporting(self::$errorReporting);
-
-		// ensure the timezone is set
-		if (ini_get("date.timezone") == "") {
-			ini_set("date.timezone", "Canada/Vancouver");
-		}
-
-		self::$translations = new Translations();
-
-		// the order is significant in all of this
-		if ($runtimeContext != "installation") {
-			self::initDatabase();
-			if (in_array($runtimeContext, array("installationDatabaseReady", "ui",  "generation", "resetPlugins"))) {
-				self::initSessions();
-			}
-
-			$dbDefaultLanguage = Settings::getSetting("defaultLanguage");
-			if (!empty($dbDefaultLanguage)) {
-				self::$defaultLanguageFile = $dbDefaultLanguage;
-			}
-		}
-		self::$language = new Language(self::$defaultLanguageFile);
-		self::initSmarty();
-
-		if ($runtimeContext == "generation") {
-			self::initGeoData();
-		}
-		if ($runtimeContext == "ui" || $runtimeContext == "generation") {
-			self::initCountries();
-			self::initExportTypes($runtimeContext);
-			self::initDataTypes($runtimeContext);
-		}
-		if (in_array($runtimeContext, array("ui", "generation", "resetPlugins"))) {
-			self::initUser();
-		}
-	}
-
-
-	/**
-     * Core::loadSettingsFile()
-     *
-	 * Attempts to load the settings file. If successful, it updates the various private member vars
-	 * with whatever's been defined.
-	 * @access private
-	 */
-	private static function loadSettingsFile() {
-		$settingsFilePath = realpath(__DIR__ . "/../../settings.php");
-		if (file_exists($settingsFilePath)) {
-			self::$settingsFileExists = true;
-			require_once($settingsFilePath);
-			self::$demoMode = (isset($demoMode)) ? $demoMode : null;
-			self::$dbHostname = (isset($dbHostname)) ? $dbHostname : null;
-			self::$dbName     = (isset($dbName)) ? $dbName : null;
-			self::$dbUsername = (isset($dbUsername)) ? $dbUsername : null;
-			self::$dbPassword = (isset($dbPassword)) ? $dbPassword : null;
-			self::$dbTablePrefix = (isset($dbTablePrefix)) ? $dbTablePrefix : null;
-			self::$encryptionSalt = (isset($encryptionSalt)) ? $encryptionSalt : null;
-
-			if (isset($demoMode)) {
-				self::$demoMode = $demoMode;
-			}
-			if (isset($errorReporting)) {
-				self::$errorReporting = $errorReporting;
-			}
-			if (isset($maxGeneratedRows)) {
-				self::$maxGeneratedRows = $maxGeneratedRows;
-			}
-			if (isset($defaultNumRows)) {
-				self::$defaultNumRows = $defaultNumRows;
-			}
-			if (isset($maxDemoModeRows)) {
-				self::$maxDemoModeRows = $maxDemoModeRows;
-			}
-			if (isset($defaultLanguageFile)) {
-				self::$defaultLanguageFile = $defaultLanguageFile;
-			}
-			if (isset($enableSmartySecurity)) {
-				self::$enableSmartySecurity = $enableSmartySecurity;
-			}
-			if (isset($useMinifiedResources)) {
-				self::$useMinifiedResources = $useMinifiedResources;
-			}
-
-			// TODO temporary, during alpha dev
-			if (isset($allowThemes)) {
-				self::$allowThemes = $allowThemes;
-			}
-		}
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getDefaultExportType() {
-		return self::$defaultExportType;
-	}
-
-    /**
-     * TODO Yuck! Why does this return a boolean as a frickin' string?! Was I drunk?
-     * @access public
-     */
-	public static function checkDemoMode() {
-		return (self::$demoMode) ? "true" : "false";
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function checkAllowMultiUserAnonymousUse() {
-		$allowAnonymousAccessSetting = Settings::getSetting("allowAnonymousAccess");
-		return ($allowAnonymousAccessSetting == "yes");
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getDefaultCountryPlugins() {
-		return self::$defaultCountryPlugins;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getHostname() {
-		return self::$dbHostname;
-	}
-
-	/**
-	 * @access public
-	 */
-    public static function getDbName() {
-		return self::$dbName;
-	}
-
-	/**
-	 * @access public
-	 */
-    public static function getDbUsername() {
-		return self::$dbUsername;
-	}
-
-	/**
-	 * @access public
-	 */
-    public static function getDbPassword() {
-		return self::$dbPassword;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getDbTablePrefix() {
-		return self::$dbTablePrefix;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getMaxGeneratedRows() {
-		return self::$maxGeneratedRows;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getEncryptionSalt() {
-		return self::$encryptionSalt;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getDefaultNumRows() {
-		return self::$defaultNumRows;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getMaxDemoModeRows() {
-		return self::$maxDemoModeRows;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getVersion() {
-		return self::$version;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function checkSettingsFileExists() {
-		return self::$settingsFileExists;
-	}
-
-	/**
-	 * Full installation of the program is determined by (a) the settings.php file existing and (b)
-	 * the "installationComplete" setting value existing in the database. Note: this function assumes
-	 * the database connection in Core::$db has already been created.
-	 * @access public
-	 */
-	public static function checkIsInstalled() {
-		if (!self::$settingsFileExists) {
-			return false;
-		}
-		$installationComplete = Settings::getSetting("installationComplete");
-		if (!isset($installationComplete) || $installationComplete == "no") {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function checkIsLoggedIn() {
-		if (!isset($_SESSION["account_id"])) {
-			self::$isLoggedIn = false;
-		}
-		return self::$isLoggedIn;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getDefaultLanguageFile() {
-		return self::$defaultLanguageFile;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getDataTypeGroups() {
-		return self::$dataTypeGroups;
-	}
-
-	/**
-	 * @access public
-	 */
-	public static function getContinents() {
-		return self::$continents;
-	}
-
-	/**
-	 * Returns the minimum PHP version required to run this script. Used during installation to ensure the
-	 * server environment is adequate.
-	 * @access public
-	 */
-	public static function getMinimumPHPVersion() {
-		return self::$minimumPHPVersion;
-	}
-
-	/**
-	 * Returns the minimum MySQL version required to run this script. Used during installation to ensure the
-	 * server environment is adequate.
-	 * @access public
-	 */
-	public static function getMinimumMySQLVersion() {
-		return self::$minimumMySQLVersion;
-	}
-
-	/**
-	 * Returns a boolean signifying whether we should use the minified + bundled resources generated via Grunt.
-	 * @return bool
-	 */
-	public static function isUsingMinifiedResources() {
-		return self::$useMinifiedResources;
-	}
-
-	/**
-	 * Used during the installation process only: it returns the default theme for new installations.
-	 * @access public
-	 */
-	public static function getDefaultTheme() {
-		return self::$defaultTheme;
-	}
-
-
-	public static function isSmartySecurityEnabled() {
-		return self::$enableSmartySecurity;
-	}
-
-	// ------------------ private methods ------------------
-
-	/**
-	 * Initializes the Smarty object used for things like rendering the Smarty templates found in
-	 * /resources/templates/ - and for other misc uses.
-	 * @access private
-	 */
-	private function initSmarty() {
-		self::$smarty = new SecureSmarty();
-		self::$smarty->template_dir = realpath(__DIR__ . "/../templates/");
-		self::$smarty->compile_dir  = realpath(__DIR__ . "/../../cache/");
-		self::$smarty->assign("version", self::getVersion());
-		self::$smarty->assign("samePage", Utils::getCleanPhpSelf());
-	}
-
-	/**
-	 * Called by Core::init(), this initializes Core::$countryPlugins.
-	 * @access private
-	 */
-	private static function initCountries() {
-		if (!Core::$settingsFileExists) {
-			return;
-		}
-		self::$countryPlugins = CountryPluginHelper::getCountryPlugins();
-	}
-
-	/**
-	 * This function returns the actual data populated in the database by the Country plugins. It
-	 * returns an array of country data, contains regions and cities.
-	 * @access private
-	 */
-	private static function initGeoData() {
-		self::$geoData = new GeoData();
-	}
-
-	/**
-	 * Initializes the Database object and stores it in Core::$db.
-	 * @access private
-	 */
-	private static function initDatabase() {
-		if (Core::$settingsFileExists) {
-			self::$db = new Database();
-		}
-	}
-
-	/**
-	 * Called by Core::init(), this initializes Core::$dataTypePlugins.
-	 * @access private
-	 */
-	private static function initDataTypes($runtimeContext) {
-		if (!Core::$settingsFileExists) {
-			return;
-		}
-
-		// parse the Data Types folder and identify those plugins that are available
-		self::$dataTypePlugins = DataTypePluginHelper::getDataTypePlugins($runtimeContext);
-	}
-
-	/**
-	 * Called by Core::init(), this initializes Core::$exportTypePlugins.
-	 * @access private
-	 */
-	private static function initExportTypes($runtimeContext) {
-		if (!Core::$settingsFileExists) {
-			return;
-		}
-		self::$exportTypePlugins = ExportTypePluginHelper::getExportTypePlugins($runtimeContext);
-	}
-
-	/**
-	 * Initializes the current logged in user and stores their Account object in Core::$user.
-	 * @param bool $bypass
-	 */
-	public static function initUser($bypass = false) {
-		if ($bypass || self::checkIsInstalled()) {
-			$setup = Settings::getSetting("userAccountSetup");
-			if ($setup == "anonymousAdmin") {
-				self::$user = new Account($setup);
-				self::$isLoggedIn = true;
-			} else {
-				if (isset($_SESSION["account_id"])) {
-					self::$user = new Account($_SESSION["account_id"]);
-					self::$isLoggedIn = true;
-				}
-			}
-		}
-	}
-
-	public static function initSessions() {
-		if (session_id() == '') {
-			new SessionManager();
-			session_start();
-			header("Cache-control: private");
-		}
-	}
-}
diff --git a/resources/classes/CountryPlugin.abstract.class.php b/resources/classes/CountryPlugin.abstract.class.php
deleted file mode 100644
index f032808cb..000000000
--- a/resources/classes/CountryPlugin.abstract.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- * @abstract
- */
-abstract class CountryPlugin {
-	protected $continent;
-	protected $countryName;
-	protected $countrySlug;
-	protected $regionNames;
-	protected $countryData;
-
-	// this may be optionally defined and extended as need be. It contains whatever custom information
-	// Data Types need and can be appended to in the individual Country classes over time without further
-	// modification of the abstract class
-	protected $extendedData;
-
-
-	/**
-	 * The installation function. This should populate the countries, regions and cities tables
-	 * with the country-specific data.
-	 */
-	public function install() {
-		return array(true, "");
-	}
-
-	/**
-	 * Country plugins don't need to implement their own uninstallation function - this takes
-	 * care of all the database cleanup for them, since we know the locations of all the data.
-	 * However, if need be, this function can be overridden.
-	 */
-	public function uninstall() {
-		$prefix = Core::getDbTablePrefix();
-		$countrySlug = $this->countrySlug;
-		$queries = array();
-		$queries[] = "DELETE FROM {$prefix}cities    WHERE country_slug = '{$countrySlug}'";
-		$queries[] = "DELETE FROM {$prefix}regions   WHERE country_slug = '{$countrySlug}'";
-		$queries[] = "DELETE FROM {$prefix}countries WHERE country_slug = '{$countrySlug}'";
-		Core::$db->query($queries);
-	}
-
-	// non-overridable helper functions
-	final public function getContinent() {
-		return $this->continent;
-	}
-
-	final public function getName() {
-        return $this->countryName;
-	}
-
-	final public function getSlug() {
-		return $this->countrySlug;
-	}
-
-	final public function getCountryData() {
-		return $this->countryData;
-	}
-
-	final public function getRegionNames() {
-		return $this->regionNames;
-	}
-
-	final public function getExtendedData() {
-		return $this->extendedData;
-	}
-
-	/**
-	 * A generalized function for returning any custom data defined in the region's extendedData section.
-	 * @param $key contains the top-level key
-	 * @return array a hash of [regionSlug] to whatever info is stored in the desired key
-	 */
-	final public function getRegionalExtendedData($key) {
-		$regionSpecificData = array();
-
-		foreach ($this->countryData as $regionInfo) {
-			if (!array_key_exists("extendedData", $regionInfo)) {
-				continue;
-			}
-
-			if (array_key_exists($key, $regionInfo["extendedData"])) {
-				$regionSpecificData[$regionInfo["regionSlug"]] = $regionInfo["extendedData"][$key];
-			}
-		}
-
-		return $regionSpecificData;
-	}
-}
diff --git a/resources/classes/CountryPluginHelper.class.php b/resources/classes/CountryPluginHelper.class.php
deleted file mode 100755
index cec35a7e3..000000000
--- a/resources/classes/CountryPluginHelper.class.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-
-/**
- * A helper class used by the Core script for instantiating and working with the Country plugins. None
- * of these functions are useful to plugins directly.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class CountryPluginHelper {
-
-	/**
-	 * This returns all those countries in the database that have country-specific data, namely:
-	 * region info (province / state / county), postal code info AND a list of cities. These countries
-	 * have special functionality within the UI.
-	 *
-	 * TODO this pretty poor. It actually instantiates the country plugins
-	 *
-	 * @param boolean $installedOnly this determines
-	 * @return array
-	 */
-	public static function getCountryPlugins($installedOnly = true) {
-		$allowedCountries = array();
-		if ($installedOnly) {
-			$installedCountries = Settings::getSetting("installedCountries");
-			$allowedCountries = explode(",", $installedCountries);
-		}
-
-		$countryPluginsFolder = realpath(__DIR__ . "/../../plugins/countries");
-		$countryPlugins = array();
-
-		if ($handle = opendir($countryPluginsFolder)) {
-			while (false !== ($item = readdir($handle))) {
-				if ($item == "." || $item == ".." || $item == ".svn") {
-					continue;
-				}
-				if (!empty($allowedCountries) && !in_array($item, $allowedCountries)) {
-					continue;
-				}
-
-				if (is_dir("$countryPluginsFolder/$item")) {
-					$obj = self::instantiateCountryPlugin($countryPluginsFolder, $item);
-					if ($obj != null) {
-						$obj->path = $countryPluginsFolder;
-						$obj->folder = $item;
-						$countryPlugins[] = $obj;
-					}
-				}
-			}
-			closedir($handle);
-		}
-
-		return $countryPlugins;
-	}
-
-
-	private function instantiateCountryPlugin($baseFolder, $countryPluginFolder) {
-		$countryPluginClassFileName = "{$countryPluginFolder}.class.php";
-		if (!is_file("$baseFolder/$countryPluginFolder/$countryPluginClassFileName")) {
-			return false;
-		}
-
-		try {
-			include("$baseFolder/$countryPluginFolder/$countryPluginClassFileName");
-		} catch (Exception $e) {
-			return false;
-		}
-
-		$className = "Country_$countryPluginFolder";
-		if (!class_exists($className)) {
-			return false;
-		}
-
-		$instance = null;
-		try {
-			$instance = new $className();
-		} catch (Exception $e) {
-			return false;
-		}
-
-		// enforce inheritance of the abstract CountryPlugin class
-		if (!($instance instanceof CountryPlugin)) {
-			return false;
-		}
-
-		return $instance;
-	}
-
-
-	/**
-	 * Helper function for country plugins to populate the database by simply passing the country data.
-	 *
-	 * @param string $countryName
-	 * @param string $countrySlug
-	 * @param array $data the data needs to be in the following format.
-	 * 		$data = array(
-	 *          array(
-	 *              "regionName" => "",
-	 *              "regionShort" => "",
-	 *              "regionSlug" => "",
-	 *              "weight" => ".",
-	 *              "cities" => array(
-	 *          	    "A", "B", "C"
-	 *              )
-	 *          ),
-	 *          ...
-	 *      );
-	 */
-	public static function populateDB($countryName, $countrySlug, $data) {
-		$prefix = Core::getDbTablePrefix();
-
-		$countryName = addslashes($countryName);
-		$countrySlug = addslashes($countrySlug);
-
-		// now insert the data
-		$queries = array();
-		$queries[] = "INSERT INTO {$prefix}countries (country, country_slug) VALUES ('$countryName', '$countrySlug')";
-
-		foreach ($data as $regionInfo) {
-			$currRegionName  = addslashes($regionInfo["regionName"]);
-			$currRegionSlug  = $regionInfo["regionSlug"];
-			$currRegionShort = addslashes($regionInfo["regionShort"]);
-
-			$queries[] = "
-				INSERT INTO {$prefix}regions (country_slug, region, region_slug, region_short, weight)
-				VALUES ('$countrySlug', '$currRegionName', '$currRegionSlug', '$currRegionShort', '{$regionInfo["weight"]}')
-			";
-
-			$rows = array();
-			foreach ($regionInfo["cities"] as $cityName) {
-				$cityName = addslashes($cityName);
-				$rows[] = "('$countrySlug', '$currRegionSlug', '$cityName')";
-			}
-			$rowsStr = implode(",", $rows);
-			$queries[] = "
-				INSERT INTO {$prefix}cities (country_slug, region_slug, city)
-				VALUES $rowsStr
-			";
-		}
-
-		$response = Core::$db->query($queries);
-
-		if ($response["success"]) {
-			return array(true, "");
-		} else {
-			//print_r($response);
-			//$this->uninstall();// TODO
-			return array(false, $response["errorMessage"]);
-		}
-	}
-}
diff --git a/resources/classes/DataGenerator.class.php b/resources/classes/DataGenerator.class.php
deleted file mode 100644
index 967f0abf4..000000000
--- a/resources/classes/DataGenerator.class.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-
-/**
- * Our generator class. This does the work of interpreting the form data, passing the work off to the various
- * plugins and piecing the generated data for returning to the client.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class DataGenerator {
-	private $exportTarget;
-	private $batchNum;
-	private $batchSize;
-	private $numResults;
-	private $template;
-	private $exportType;
-	private $countries;
-	private $dataTypes;
-	private $postData;
-	private $isFirstBatch;
-	private $isLastBatch;
-	private $currentBatchFirstRow;
-	private $currentBatchLastRow;
-	
-	// compression flag - set as per user choice
-	private $isCompressionRequired = false;
-
-	// this may or may not exist. If the user is generating data from a saved data set, it will have a value. Otherwise
-	// it won't be included in $postData passed to the constructor
-	private $configurationID = null;
-
-
-	/**
-	 * @param $postData array everything from the form post. The Generator is used in 3 different
-	 * contexts: for in-page generation, new tab/window or for prompting download of the data.
-	 */
-	public function __construct($postData) {
-		$this->exportTarget = $postData["gdExportTarget"]; // inPage, newTab or promptDownload
-
-		if ($this->exportTarget == "inPage") {
-			$this->batchSize  = $postData["gdBatchSize"];
-			$this->batchNum   = $postData["gdCurrentBatchNum"];
-		} else {
-			$this->batchSize = $postData["gdNumRowsToGenerate"];
-			$this->batchNum = 1;
-		}
-
-		$this->numResults = $postData["gdNumRowsToGenerate"];
-
-		if (Core::checkDemoMode() && !Core::checkIsLoggedIn()) {
-			$maxDemoModeRows = Core::getMaxDemoModeRows();
-			if ($this->numResults > $maxDemoModeRows) {
-				$this->numResults = $maxDemoModeRows;
-			}
-		}
-
-        // always apply the max generated rows limitation. Technically this value could be lower than
-        // the $maxDemoModeRows value above, but it's extremely unlikely & an acceptable restriction
-        $maxGeneratedRows = Core::getMaxGeneratedRows();
-        if ($this->numResults > $maxGeneratedRows) {
-            $this->numResults = $maxGeneratedRows;
-        }
-
-		$this->countries = isset($postData["gdCountries"]) ? $postData["gdCountries"] : array();
-		$this->dataTypes = DataTypePluginHelper::getDataTypeHash(Core::$dataTypePlugins);
-		$this->postData  = $postData;
-
-		if (isset($postData["configurationID"])) {
-			$this->configurationID = $postData["configurationID"];
-		}
-
-		// make a note of whether this batch is the first / last. This is useful information for the
-		// Export Types to know whether to output special content at the top or bottom
-		$this->isFirstBatch = ($this->batchNum == 1);
-		$this->isLastBatch = (($this->batchNum * $this->batchSize) >= $this->numResults);
-		$this->currentBatchFirstRow = (($this->batchNum - 1) * $this->batchSize) + 1;
-		$this->currentBatchLastRow = ($this->currentBatchFirstRow + $this->batchSize > $this->numResults) ?
-			$this->numResults : $this->currentBatchFirstRow + $this->batchSize - 1;
-
-		// figure out what we're going to need to generate
-		$this->createDataSetTemplate($postData);
-		
-		// now we farm out the work of data generation to the selected Export Type
-		$exportTypes = Core::$exportTypePlugins;
-		$selectedExportType = null;
-		foreach ($exportTypes as $currExportType) {
-			if ($currExportType->getFolder() != $postData["gdExportType"]) {
-				continue;
-			}
-			$this->exportType = $currExportType;
-			break;
-		}
-
-		// set the value of isCompressionRequired
-		if ($postData["gdExportTarget"] == "promptDownload" && $postData["gdExportTarget_promptDownload_zip"] == "doZip") {
-			$this->isCompressionRequired = true;
-		}
-	}
-
-
-	/**
-	 * Calls the appropriate Export Type's generation function to actually generate the random data.
-	 */
-	public function generate() {
-		$response = $this->exportType->generate($this);
-
-		$response["contentTypeHeader"] = $this->exportType->getContentTypeHeader();
-		$response["isComplete"] = $this->isLastBatch;
-
-		if ($this->exportTarget == "promptDownload") {
-			$response["promptDownloadFilename"] = $this->exportType->getDownloadFilename($this);
-		}
-
-		// if this is the last batch, and we're generating data for a saved data set, update the "total rows" count
-		if ($this->isLastBatch && $this->configurationID != null && Core::checkIsLoggedIn()) {
-			Core::$user->updateRowsGeneratedCount($this->configurationID, $this->numResults);
-		}
-
-		return $response;
-	}
-
-
-	/**
-	 * This function creates a "template" of the data set to be generated by passing off work to the
-	 * various Data Types. The "template" that's returned is an ordered array of hashes, each hash being
-	 * of the following structure:
-	 *
-	 *   array(
-	 *      "title" => "", // whatever string is being used for the column title / node name / etc.
-	 *      "type"  => "", // the namespace (folder name) of the Data Type
-	 *      "options" => "" // whatever custom options have been specified for this Data Type
-	 *      "has_dependencies" => ""  // boolean true / false. This is for Data Types whose generated content
-	 *                                // (may) depend on values in other fields in the row, e.g. "Region",
-	 *                                // which would need to know the randomly generated country to generate
-	 *                                // an appropriate value
-	 *   )
-	 *
-	 * The first two values are found right in the $_POST values, but the third and fourth are determined by
-	 * the Data Type itself.
-	 *
-	 * @param array $hash
-	 * @param integer $numCols
-	 * @return array
-	 */
-	private function createDataSetTemplate($hash) {
-		$numCols  = $hash["gdNumCols"];
-		$rowOrder = $hash["gdRowOrder"];
-		$rowNums = explode(",", $rowOrder);
-
-		// find out what the user wants to generate
-		$templatesByProcessOrder = array();
-		$order = 1;
-		foreach ($rowNums as $i) {
-			$title    = $hash["gdTitle_$i"];
-			$dataType = $hash["gdDataType_$i"];
-
-			// if there's no data type, the row wasn't filled in so we just ignore it
-			if (empty($dataType)) {
-				continue;
-			}
-
-			$dataTypeFolder = preg_replace("/^data-type-/", "", $dataType);
-			$currDataType = $this->dataTypes[$dataTypeFolder];
-			$processOrder = $currDataType->getProcessOrder();
-			$options = $currDataType->getRowGenerationOptions($this, $hash, $i, $numCols);
-
-			// the only time $options is false is if this Data Type explicitly returned it, meaning
-			// that it was unable to determine the options needed. This could occur if the user didn't enter in
-			// appropriate values in the UI and the Data Type failed to catch it via the JS validation
-			if ($options !== false) {
-				if (!array_key_exists("$processOrder", $templatesByProcessOrder)) {
-					$templatesByProcessOrder["$processOrder"] = array();
-				}
-				$templatesByProcessOrder["$processOrder"][] = array(
-					"title"             => $title,
-				    "colNum"            => $order,
-					"dataTypeFolder"    => $dataTypeFolder,
-					"generationOptions" => $options,
-					"columnMetadata"    => $currDataType->getDataTypeMetaData()
-				);
-			}
-
-			$order++;
-		}
-
-		// sort by process order and return
-		ksort($templatesByProcessOrder, SORT_NUMERIC);
-		$this->template = $templatesByProcessOrder;
-	}
-
-
-	/**
-	 * This is a helper function for use by the Export Types. It sifts through all the data and returns a hash containing
-	 * the information most likely to be needed for generation, namely:
-	 * 	  array(
-	 *       "isFirstBatch" => (boolean),
-	 *       "isLastBatch" => (boolean),
-	 *       "colData" => ordered array of the column names,
-	 *       "rowData" => an array of arrays. Each top level array
-	 *    );
-	 *
-	 * Using this function is completely optional - it's just provided for convenience.
-	 * @return array
-	 */
-	public function generateExportData() {
-		$columns      = $this->getTemplateByDisplayOrder();
-		$template     = $this->getTemplateByProcessOrder();
-		$dataTypes    = $this->getDataTypes();
-		$firstRowNum  = $this->getCurrentBatchFirstRow();
-		$lastRowNum   = $this->getCurrentBatchLastRow();
-
-		// first, generate the (ordered) list of table headings
-		$cols = array();
-		foreach ($columns as $colInfo) {
-			$cols[] = $colInfo["title"];
-		}
-
-		// contains only the information needed for display purposes
-		$displayData = array();
-		for ($rowNum=$firstRowNum; $rowNum<=$lastRowNum; $rowNum++) {
-
-			// $template is already grouped by process order. Just loop through each one, passing off the
-			// actual data generation to the appropriate Data Type. Note that we pass all previously generated
-			// data (including any metadata returned by the Data Type).
-			$currRowData = array();
-
-			while (list($order, $dataTypeGenerationInfo) = each($template)) {
-				foreach ($dataTypeGenerationInfo as $genInfo) {
-					$colNum = $genInfo["colNum"];
-					$currDataType = $dataTypes[$genInfo["dataTypeFolder"]];
-					$generationContextData = array(
-						"rowNum"            => $rowNum,
-						"generationOptions" => $genInfo["generationOptions"],
-						"existingRowData"   => $currRowData
-					);
-					$genInfo["randomData"] = $currDataType->generate($this, $generationContextData);
-					$currRowData["$colNum"] = $genInfo;
-				}
-			}
-			reset($template);
-
-			// now sort the row columns in the desired order
-			ksort($currRowData, SORT_NUMERIC);
-
-			// now we have all the info we need for this row, filter out the display value
-			$currRowDisplayData = array();
-			foreach ($currRowData as $orderedRowData) {
-				$currRowDisplayData[] = $orderedRowData["randomData"]["display"];
-			}
-			$displayData[] = $currRowDisplayData;
-		}
-
-		$data = array(
-			"isFirstBatch" => $this->isFirstBatch(),
-			"isLastBatch"  => $this->isLastBatch(),
-			"colData"      => $cols,
-			"rowData"      => $displayData
-		);
-
-		return $data;
-	}
-
-
-	/**
-	 * Returns a string representing the target / location of the data generation is happening:
-	 * 		"inPage"
-	 * 		"newTab"
-	 * 		"promptDownload"
-	 * @return string
-	 */
-	public function getExportTarget() {
-		return $this->exportTarget;
-	}
-
-	public function getBatchNum() {
-		return $this->batchNum;
-	}
-
-	public function getBatchSize() {
-		return $this->batchSize;
-	}
-
-	public function getNumResults() {
-		return $this->numResults;
-	}
-
-	public function getTemplateByProcessOrder() {
-		return $this->template;
-	}
-
-	/**
-	 * this->template contains the entire data set to be generated by the Export Type, grouped
-	 * by the priority in which they should be generated. This flattens the info and returns a
-	 *
-	 * This is generally used for producing the list of headings in the expected order.
-	 *
-	 * @param array $template
-	 */
-	public function getTemplateByDisplayOrder() {
-		$ordered = array();
-
-		while (list($order, $dataTypes) = each($this->template)) {
-			foreach ($dataTypes as $dataType) {
-		    	$order = $dataType["colNum"];
-		    	$ordered[$order] = $dataType;
-			}
-		}
-		reset($this->template);
-		ksort($ordered, SORT_NUMERIC);
-		return array_values($ordered);
-	}
-
-	public function getExportType() {
-		return $this->exportType;
-	}
-
-	public function getCountries() {
-		return $this->countries;
-	}
-
-	public function getDataTypes() {
-		return $this->dataTypes;
-	}
-
-	public function getPostData() {
-		return $this->postData;
-	}
-
-	public function isFirstBatch() {
-		return $this->isFirstBatch;
-	}
-
-	public function isLastBatch() {
-		return $this->isLastBatch;
-	}
-
-	public function getCurrentBatchFirstRow() {
-		return $this->currentBatchFirstRow;
-	}
-
-	public function getCurrentBatchLastRow() {
-		return $this->currentBatchLastRow;
-	}
-	
-	public function isPromptDownloadZipped(){
-		return $this->isCompressionRequired;
-	}
-}
diff --git a/resources/classes/DataTypePlugin.abstract.class.php b/resources/classes/DataTypePlugin.abstract.class.php
deleted file mode 100644
index d643b14d9..000000000
--- a/resources/classes/DataTypePlugin.abstract.class.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-
-
-/**
- * Our base class for all Data Type plugins. All Data Types must define a class that extends this class.
- * This page documents and defines (where the language permits!) what's required, what's optional, and
- * what each method and member variable does.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- * @abstract
- */
-abstract class DataTypePlugin {
-
-
-	// REQUIRED MEMBER VARS
-	protected $dataTypeName = "";
-	protected $dataTypeFieldGroup; // string
-	protected $dataTypeFieldGroupOrder; // int
-
-
-	// OPTIONAL MEMBER VARS
-	protected $isEnabled = true;
-	protected $processOrder = 1; // int
-
-	/**
-	 * An array of JS modules that need to be included for this module. They should be requireJS-friendly
-	 * modules.
-	 * @var array
-	 */
-	protected $jsModules = array();
-
-	/**
-	 * A single CSS file for any additional CSS needed for the module. It's up to the developer to properly
-	 * name their CSS classes/IDs to prevent namespace collisions.
-	 */
-	protected $cssFiles = array();
-
-	/**
-	 * Contains all strings for the current language. This is populated automatically on instantiation and
-	 * contains the strings for the currently selected language.
-	 * @var array
-	 */
-	public $L = array();
-
-
-	// REQUIRED METHODS
-
-	/**
-	 * This is the main workhorse function: it does the work of actually generating a random data snippet.
-	 *
-	 * @param object $generator the Generator object, through which a Data Type can call the various
-	 *     available public methods.
-	 * @param array $generationContextData a hash of information relating to the generation context. Namely:
-	 *     "rowNum"             => the row number in the generated content (indexed from 1)
-	 *     "generationOptions"  => whatever options were passed for this particular row and data type; i.e.
-	 *                             whatever information was returned by getRowGenerationOptions(). This data
-	 *                             can be empty or contain anything needed - in whatever format. By default,
-	 *                             this is set to null.
-	 *     "existingRowData"    => data already generated for the row.
-	 * @return array Data Types have to return a hash with at least one key: "display". They can also load up
-	 *     the hash with whatever else they want, if they want to provide additional meta data to other Data
-	 *     Types that are being generated on that row (e.g. Country, passing it's country_slug info to Region)
-	 */
-	abstract function generate($generator, $generationContextData);
-
-
-	// 2. OPTIONALLY DEFINED FUNCTIONS
-
-	/**
-	 * The default constructor. Automatically populates the $L member var with whatever language is currently being
-	 * used. If a Data Type uses its own constructor, it should always call the parent constructor as well, to ensure
-	 * $L is populated. ( parent::__construct($runtimeContext); )
-	 *
-	 * @param string $content "ui" / "generation". Data Types are instantiated in one of two contexts: once when
-	 *    the main UI page loads, so that the Data Type can be presented as an option for selection in the Data
-	 *    Generator, and secondly when we're actually actually generating the results. It's sometimes beneficial
-	 *    to only instantiate aspects of the class depending on the context.
-	 */
-	public function __construct($runtimeContext) {
-
-		// a little magic to find the current instantiated class's folder
-		$currClass = new ReflectionClass(get_class($this));
-		$currClassFolder = dirname($currClass->getFileName());
-
-		$defaultLangFileStr = Core::getDefaultLanguageFile();
-		$currentLangFileStr = Core::$language->getCurrentLanguageFile();
-
-		$currentLangFile = $currClassFolder . "/lang/" . $currentLangFileStr . ".php";
-		$defaultLangFile = $currClassFolder . "/lang/" . $defaultLangFileStr . ".php";
-
-		if (file_exists($currentLangFile)) {
-			require($currentLangFile);
-		} else if (file_exists($defaultLangFile)) {
-			require($defaultLangFile);
-		}
-
-		if (isset($L)) {
-			$this->L = $L;
-		}
-	}
-
-
-	/**
-	 * This is called once during the initial installation of the script, or when the installation is reset (which is
-	 * effectively a fresh install). It is called AFTER the Core tables are installed, and you can rely
-	 * on Core::$db having been initialized and the database connection having been set up.
-	 *
-	 * @return array [0] success / error
-	 * 				 [1] the error message, if there was a problem
-	 */
-	static function install() {
-		return array(true, "");
-	}
-
-	/**
-	 * If the Data Type wants to include something in the Example column, it should return the raw HTML via this function.
-	 * If this function isn't defined (or it returns an empty string), the string "No examples available." will be
-	 * outputted in the cell. This is used for inserting static content into the appropriate spot in the table; if the
-	 * Data Type needs something more dynamic, it should subscribe to the appropriate event.
-	 */
-	public function getExampleColumnHTML() {
-		return "";
-	}
-
-	/**
-	 * If the Data Type wants to include something in the Options column, it must return the HTML via this function.
-	 * If this function isn't defined (or it returns an empty string), the string "No options available." will be
-	 * outputted in the cell. This is used for inserting static content into the appropriate spot in the table; if the
-	 * Data Type needs something more dynamic, it should subscribe to the appropriate event.
-	 */
-	public function getOptionsColumnHTML() {
-		return "";
-	}
-
-	/**
-	 * Returns the help content for this Data Type (HTML / string).
-	 */
-	public function getHelpHTML() {
-		return "<p>No help available.</p>";
-	}
-
-
-	/**
-	 * Called during data generation. This determines what options the user selected in the user interface; it's
-	 * used to figure out what settings to pass to each Data Type to provide that function the information needed
-	 * to generate that particular data item.
-	 *
-	 * Note: if this function determines that the values entered by the user in the options column are invalid
-	 * (most likely just incomplete) the function can explicitly return false to tell the core script to ignore
-	 * this row.
-	 *
-	 * @param object $generator the instance of the Generator object, containing assorted public methods
-	 * @param array $post the entire contents of $_POST
-	 * @param integer the column number (*row* in the UI...!) of the item
-	 * @param integer the number of columns in the data set
-	 * @return mixed
-	 *        - false, if the Data Type doesn't have sufficient information to generate the row (i.e. things weren't
-	 *        filled in in the UI and the Data Type didn't add proper validation)
-	 *        - anything else. This can be any data structure needed by the Data Type. It'll be passed as-is
-	 *        into the generateItem function as the second parameter.
-	 */
-	public function getRowGenerationOptions($generator, $postdata, $colNum, $numCols) {
-		return null;
-	}
-
-	/**
-	 * Used for providing additional metadata about the Data Type for use during generation. Right now this
-	 * is only used to pass additional data to the SQL Export Type so it can intelligently create a CREATE TABLE
-	 * statement with database column types and sizes that are appropriate to each field type.
-	 * @return array
-	 */
-	public function getDataTypeMetadata() {
-		return array();
-	}
-
-	/**
-	 * For debugging and dev work.
-	 */
-	public function __toString() {
-		echo $this->getName();
-	}
-
-
-	// 3. NON-OVERRIDABLE FUNCTIONS
-	// - these are automatically inherited by all Data Types when they extend this abstract class.
-
-
-	final public function getName() {
-		return (isset($this->L["DATA_TYPE_NAME"])) ? $this->L["DATA_TYPE_NAME"] : $this->dataTypeName;
-	}
-
-	/**
-	 * Returns an array of file names, which will be included ONCE in the main generator page.
-	 *
-	 * @return array
-	 */
-	final public function getIncludedFiles() {
-		return $this->includedFiles;
-	}
-
-	/**
-	 * This returns the field group that this Data Type should be listed in. See the Core::$dataTypeGroups for the
-	 * available options.
-	 *
-	 * @return string
-	 */
-	final public function getDataTypeFieldGroup() {
-		return $this->dataTypeFieldGroup;
-	}
-
-	/**
-	 * Returns the order within the field group that this Data Type should appear.
-	 *
-	 * @return integer
-	 */
-	final public function getDataTypeFieldGroupOrder() {
-		return $this->dataTypeFieldGroupOrder;
-	}
-
-	/**
-	 * Returns the order in which this data type should be parsed. The generator does N number of passes for each
-	 * row of data generated, each pass processes whatever data types are ...
-	 *
-	 * @return integer
-	 */
-	final public function getProcessOrder() {
-		return $this->processOrder;
-	}
-
-	/**
-	 * Returns the path from the generatedata root folder. That value is automatically created
-	 * for each module when it it instantiated.
-	 * @return string
-	 */
-	public final function getPath() {
-		return $this->path;
-	}
-
-	/**
-	 * Returns a list of all javascript modules for this Data Type (if included).
-	 * @return array
-	 */
-	public final function getJSModules() {
-		return $this->jsModules;
-	}
-
-	/**
-	 * Returns the CSS filename for this Data Type (if included).
-	 * @return array
-	 */
-	public final function getCSSFiles() {
-		return $this->cssFiles;
-	}
-
-	/**
-	 * Returns the isEnabled flag for this class.
-	 * @return boolean
-	 */
-	public final function isEnabled() {
-		return $this->isEnabled;
-	}
-}
diff --git a/resources/classes/DataTypePluginHelper.class.php b/resources/classes/DataTypePluginHelper.class.php
deleted file mode 100644
index deb05b520..000000000
--- a/resources/classes/DataTypePluginHelper.class.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class DataTypePluginHelper {
-
-	/**
-	 * Used in the main generator page to output raw HTML content into the page for use
-	 * by the dynamic generator table to insert/update the appropriate row based on the selected
-	 * Data Type.
-	 *
-	 * @return array
-	 */
-	public function getDataTypeResources() {
-		$dataTypeGroups = Core::$dataTypePlugins;
-		$resources = array();
-		while (list($group, $dataTypes) = each($dataTypeGroups)) {
-			foreach ($dataTypes as $dataType) {
-				$resources[] = array(
-					"folder" => $dataType->folder,
-					"examples" => $dataType->getExampleColumnHTML(),
-					"options" => $dataType->getOptionsColumnHTML(),
-					"help" => $dataType->getHelpHTML()
-				);
-			}
-		}
-
-		return $resources;
-	}
-
-
-	/**
-	 * Helper function to convert the data types that are grouped in Core::$dataTypePlugins into
-	 * a simple array, where order is not important.
-	 * @param array $groupedDataTypes
-	 * @return array
-	 */
-	public static function getDataTypeList($groupedDataTypes) {
-		$list = array();
-		while (list($group_name, $dataTypes) = each($groupedDataTypes)) {
-			foreach ($dataTypes as $dataType) {
-				$list[] = $dataType;
-			}
-		}
-		return $list;
-	}
-
-	/**
-	 * A second helper function to convert the data types that are grouepd in Core::$dataTypePlugins
-	 * into a hash of [Data Type Folder] => object
-	 * @param array $groupedDataTypes
-	 * @return array
-	 */
-	public static function getDataTypeHash($groupedDataTypes) {
-		$hash = array();
-		while (list($group_name, $dataTypes) = each($groupedDataTypes)) {
-			foreach ($dataTypes as $dataType) {
-				$hash[$dataType->folder] = $dataType;
-			}
-		}
-		return $hash;
-	}
-
-
-	/**
-	 * Used in the main page to generate a list of Export Type JS files.
-	 * @param $dataTypes
-	 * @param string $format
-	 * @param string $pathRoot
-	 * @return array|string
-	 */
-	public static function getDataTypeJSResources($dataTypes, $format = "string", $pathRoot = "") {
-		$files = array();
-		foreach ($dataTypes as $dataType) {
-			$jsModules = $dataType->getJSModules();
-			$path      = $dataType->getPath();
-			for ($i=0; $i<count($jsModules); $i++) {
-				$files[] = "{$pathRoot}$path/{$jsModules[$i]}";
-			}
-		}
-
-		$returnVal = "";
-		if ($format == "string") {
-			if (!empty($files)) {
-				$returnVal = "\"" . implode("\",\n\"", $files) . "\"";
-			}
-		} else {
-			$returnVal = $files;
-		}
-
-		return $returnVal;
-	}
-
-
-	/**
-	 * Used in the main page to generate the Data Type CSS includes.
-	 * @param array the data types
-	 * @param array
-	 */
-	public static function getDataTypeCSSIncludes($dataTypes) {
-		$files = array();
-		foreach ($dataTypes as $dataType) {
-			$cssFiles = $dataType->getCSSFiles();
-			if (!empty($cssFiles)) {
-				$path = $dataType->getPath();
-				foreach ($cssFiles as $file) {
-					$files[] = "$path/$file";
-				}
-			}
-		}
-
-		$cssIncludes = "";
-		foreach ($files as $file) {
-			$cssIncludes[] = "<link rel=\"stylesheet\" type=\"text/css\" href=\"$file\" />";
-		}
-		return implode("\n", $cssIncludes);
-	}
-
-	/**
-	 * Returns an array of available, grouped, instantiated Data Type objects.
-	 * @param string
-	 * @param boolean
-	 * @return array
-	 */
-	public static function getDataTypePlugins($runtimeContext, $installedOnly = true) {
-		$allowedDataTypes = array();
-		if ($installedOnly) {
-			$installedDataTypes = Settings::getSetting("installedDataTypes");
-			$allowedDataTypes = explode(",", $installedDataTypes);
-		}
-
-		$dataTypesFolder = realpath(__DIR__ . "/../../plugins/dataTypes");
-		$dataTypes = array();
-		if ($handle = opendir($dataTypesFolder)) {
-			while (false !== ($item = readdir($handle))) {
-				if ($item == "." || $item == ".." || $item == ".svn") {
-					continue;
-				}
-				if (!empty($allowedDataTypes) && !in_array($item, $allowedDataTypes)) {
-					continue;
-				}
-				if (is_dir("$dataTypesFolder/$item")) {
-					$obj = self::instantiateDataType($runtimeContext, $dataTypesFolder, $item);
-					if ($obj != null && $obj !== false) {
-						$folders = explode(DIRECTORY_SEPARATOR, $dataTypesFolder . DIRECTORY_SEPARATOR . $item);
-						$folders = array_reverse($folders);
-
-						$obj->path = "{$folders[2]}/{$folders[1]}/{$folders[0]}";
-						$obj->folder = $item;
-						$dataTypes[] = $obj;
-					}
-				}
-			}
-			closedir($handle);
-		}
-
-		// now sort the data type information by field groups first and their order within those
-		// field groups
-		$dataTypeGroups = Core::getDataTypeGroups();
-		$sortedDataTypes = array();
-		foreach ($dataTypeGroups as $groupNameKey) {
-			$groupTypes = array();
-			foreach ($dataTypes as $currDataType) {
-				$currFieldGroupKey   = $currDataType->getDataTypeFieldGroup();
-				$currFieldGroupOrder = $currDataType->getDataTypeFieldGroupOrder();
-
-				if ($currFieldGroupKey == $groupNameKey) {
-					// TODO this prevents two DataTypes using the same order, which leads to accidental bugs
-					$groupTypes[$currFieldGroupOrder] = $currDataType;
-				}
-			}
-			ksort($groupTypes, SORT_NUMERIC);
-			$sortedDataTypes[$groupNameKey] = array_values($groupTypes);
-		}
-
-		return $sortedDataTypes;
-	}
-
-
-	/**
-	 * Instantiates and returns a Data Type object.
-	 *
-	 * @param $runtimeContext
-	 * @param $baseFolder
-	 * @param $dataTypeFolderName
-	 * @internal param $string
-	 * @internal param $string
-	 * @internal param $string
-	 * @return object
-	 */
-	private function instantiateDataType($runtimeContext, $baseFolder, $dataTypeFolderName) {
-
-		$dataTypeClassFileName = "{$dataTypeFolderName}.class.php";
-		if (!is_file("$baseFolder/$dataTypeFolderName/$dataTypeClassFileName")) {
-			return false;
-		}
-
-		// now try to include and instantiate the class [bug...]
-		try {
-			include("$baseFolder/$dataTypeFolderName/$dataTypeClassFileName");
-		} catch (Exception $e) {
-			return false;
-		}
-
-		$className = "DataType_$dataTypeFolderName";
-		if (!class_exists($className)) {
-			return false;
-		}
-
-		$instance = null;
-		try {
-			$instance = new $className($runtimeContext);
-		} catch (Exception $e) {
-
-			return false;
-		}
-
-		// enforce inheritance of the abstract DataType class
-		if (!($instance instanceof DataTypePlugin)) {
-			return false;
-		}
-
-		// if the class enabled? If not, it's not ready for prime-time
-		if (!$instance->isEnabled()) {
-			return false;
-		}
-
-		return $instance;
-	}
-}
diff --git a/resources/classes/Database.class.php b/resources/classes/Database.class.php
deleted file mode 100644
index d417d928e..000000000
--- a/resources/classes/Database.class.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class Database {
-	private $link;
-
-	public function __construct() {
-		$dbHostname = Core::getHostname();
-		$dbUsername = Core::getDbUsername();
-		$dbPassword = Core::getDbPassword();
-		$dbName     = Core::getDbName();
-
-		try {
-			$this->link = mysqli_connect($dbHostname, $dbUsername, $dbPassword, $dbName);
-		} catch (Exception $e) {
-			// or die("Couldn't connect to database: " . mysql_error());
-		}
-
-		try {
-			@mysqli_query("SET NAMES 'utf8'", $this->link);
-		} catch (Exception $e) {
-		 //  die ("couldn't find database '$g_db_name': " . mysql_error());
-		}
-	}
-
-
-	/**
-	 * Disconnects from a database.
-	 * @access public
-	 */
-	public function disconnect($link) {
-		@mysqli_close($link);
-	}
-
-
-	/**
-	 * Checks to see if the database information provided is valid or not.
-	 * @access public
-	 */
-	public static function testDbSettings($dbHostname, $dbName, $dbUsername, $dbPassword) {
-		$dbConnectionError = "";
-		$lang = Core::$language->getCurrentLanguageStrings();
-		$link = @mysqli_connect($dbHostname, $dbUsername, $dbPassword, $dbName);
-		if (mysqli_connect_errno($link)) {
-			$dbConnectionError = mysqli_connect_error();
-		}
-
-		if ($dbConnectionError) {
-			$placeholders = array("db_connection_error" => $dbConnectionError);
-			$error = Templates::evalSmartyString($lang["install_invalid_db_info"], $placeholders);
-			return array(false, $error);
-		} else {
-			@mysqli_close($link);
-		}
-
-		return array(true, "");
-	}
-
-	/**
-	 * Performs our actual database query/queries.  This accepts either a single query string or an array of queries
-	 * through the first param. The second optional param allows for a custom rollback. We don't use transactions
-	 * because it requires the InnoDB or BDB storage engines being available (and from my experience with formtools.org,
-	 * there are still a lot of environments that don't have it).
-	 *
-	 * This function works for any query type: INSERT, UPDATE, SELECT. But the returned info obviously only has
-	 * meaning with the SELECT query.
-	 *
-	 * @param mixed $queries
-	 * @param mixed $rollbackQueries
-	 * @return hash "success"      => boolean
-	 *              "errorMessage" => error string
-	 *              "results"      => the result of the MySQL query, or an array of results if an array was passed
-	 */
-	public function query($queries, $rollbackQueries = "") {
-		$singleQuery = false;
-		if (!is_array($queries)) {
-			$queries = array($queries);
-			$singleQuery = true;
-		}
-		if (!is_array($rollbackQueries)) {
-			$rollbackQueries = array($rollbackQueries);
-		}
-
-		$results = array();
-		$errorMessage = "";
-		foreach ($queries as $query) {
-			$result = mysqli_query($this->link, $query);
-			if (!$result) {
-				$errorMessage = mysqli_error($this->link);
-				break;
-			} else {
-				$results[] = $result;
-			}
-		}
-
-		if (!empty($errorMessage)) {
-			foreach ($rollbackQueries as $query) {
-				@mysqli_query($this->link, $query);
-			}
-		}
-
-		// if this was a single query, make $results
-		if ($singleQuery && isset($results[0])) {
-			$results = $results[0];
-		}
-
-		return array(
-			"success"      => empty($errorMessage),
-			"errorMessage" => $errorMessage,
-			"results"      => $results
-		);
-	}
-
-	/**
-	 * Returns the database connection. Used by SessionManager.
-	 * @access public
-	 */
-	public function getDBLink() {
-		return $this->link;
-	}
-}
-
-
diff --git a/resources/classes/Emails.class.php b/resources/classes/Emails.class.php
deleted file mode 100644
index 5dcfd5fd4..000000000
--- a/resources/classes/Emails.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-
-/**
- * Nothing  much here yet - but it's here so we can expand on it cleanly later on.
- * @package Emails
- * @author Ben Keen <ben.keen@gmail.com>
- */
-class Emails {
-
-	public static function sendEmail($info) {
-		return mail($info["recipient"], $info["subject"], $info["content"]);
-	}
-
-}
\ No newline at end of file
diff --git a/resources/classes/ErrorCodes.class.php b/resources/classes/ErrorCodes.class.php
deleted file mode 100644
index f4317afe1..000000000
--- a/resources/classes/ErrorCodes.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * A storage class for all error codes. This provides a little more meaning than just embedding
- * magic numbers all over the place.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class ErrorCodes {
-	const NOT_LOGGED_IN          = 1;
-	const NON_ADMIN              = 2;
-	const FAILED_SQL_STATEMENT   = 3;
-	const INVALID_PARAMS         = 4;
-	const INVALID_REQUEST        = 5;
-	const ACCOUNT_ALREADY_EXISTS = 6;
-}
\ No newline at end of file
diff --git a/resources/classes/ExportTypePlugin.abstract.class.php b/resources/classes/ExportTypePlugin.abstract.class.php
deleted file mode 100644
index a3e015da8..000000000
--- a/resources/classes/ExportTypePlugin.abstract.class.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-
-
-/**
- * Our base class for all Export Type plugins. All Export Types must define a class that extends this class.
- * This page documents and defines (where the language permits!) what's required, what's optional, and
- * what each method and member variable does.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- * @abstract
- */
-abstract class ExportTypePlugin {
-
-	// REQUIRED MEMBER VARS
-
-	/**
-	 * The name of the export type "HTML", "XML" etc. This is always in English; even in different languages,
-	 * "JSON" is still "JSON", so having no translation is acceptable here.
-	 * @var string
-	 */
-	protected $exportTypeName = "";
-
-
-	// OPTIONAL MEMBER VARS
-
-	/**
-	 * Used during development. Only Export Types that have $isEnabled == true will get listed in the Data
-	 * Generator for use.
-	 * @var boolean
-	 */
-	protected $isEnabled = true;
-
-	/**
-	 * An array of JS modules that need to be included for this module. They should be requireJS-friendly
-	 * modules.
-	 * @var array
-	 */
-	protected $jsModules = array();
-
-	/**
-	 * An array of CSS files for any additional CSS needed for the module. It's up to the developer to properly
-	 * name their CSS classes/IDs to prevent namespace collisions.
-	 */
-	protected $cssFiles = array();
-
-	/**
-	 * An array of whatever CodeMirror modes (the syntax highlighter) this Export Type needs. This ensures they're
-	 * all loaded at runtime for use in the generator.
-	 * @var array
-	 */
-	protected $codeMirrorModes = array();
-
-	/**
-	 * Needed for the "prompt for download" export option. This should contain the standard Content-Type header
-	 * value (like "text/html") of the generated content, so the browser knows what to do with the downloaded file.
-	 * @var string
-	 */
-	protected $contentTypeHeader;
-
-	/**
-	 * Export Types *should* be able to handle all three Export Targets available in the page (in-page, new window/tab, 
-	 * prompt for download), but if they can't, they should specify this var. The system will automatically grey 
-	 * out those options that aren't selectable as soon as the user selects the Export Type.
-	 * @var string
-	 */
-	protected $compatibleExportTargets = array("inPage", "newTab", "promptDownload");
-
-	/**
-	 * Contains all strings for the current language. This is populated automatically on instantiation and
-	 * contains the strings for the currently selected language.
-	 * @var array
-	 */
-	public $L = array();
-
-
-
-	// 1. REQUIRED METHODS
-
-	/**
-	 * This does the job of actually generating the data in the appropriate format. It's fed the instantiated
-	 * Generator class, containing the various information the Export Type could need.
-	 *
-	 * @param Generator $generator
-	 * @return array
-	 */
-	abstract function generate($generator);
-
-	/**
-	 * Used for the "prompt for download" option for all Export Types. This function needs to return the
-	 * filename of the downloadable file. It can either be "clever" and construct a filename based on the
-	 * current data being generated, or simple: the same filename each time. It doesn't matter: purely a
-	 * matter of preference.
-	 * @param Generator $generator
-	 * @return string
-	 */
-	abstract function getDownloadFilename($generator);
-
-
-	// 2. OPTIONALLY DEFINED FUNCTIONS
-
-	/**
-	 * Our default constructor. This populates $L for the instantiated class. Export Types
-	 * are constructed when the main generator UI page loads; for actual code generation, their generate()
-	 * function is called.
-	 */
-	public function __construct($runtimeContext) {
-
-		// a little magic to find the current instantiated class's folder
-		$currClass = new ReflectionClass(get_class($this));
-		$currClassFolder = dirname($currClass->getFileName());
-
-		$defaultLangFileStr = Core::getDefaultLanguageFile();
-		$defaultLangFile = $currClassFolder . "/lang/" . $defaultLangFileStr . ".php";
-
-		$currentLangFileStr = Core::$language->getCurrentLanguageFile();
-		$currentLangFile = $currClassFolder . "/lang/" . $currentLangFileStr . ".php";
-
-		if (file_exists($currentLangFile)) {
-			require($currentLangFile);
-		} else if (file_exists($defaultLangFile)) {
-			require($defaultLangFile);
-		}
-
-		if (isset($L)) {
-			$this->L = $L;
-		}
-	}
-
-	/**
-	 * This is called once during the initial installation of the script, or when the installation is reset (which is
-	 * effectively a fresh install). It is called AFTER the Core tables are installed, and you can rely
-	 * on Core::$db having been initialized and the database connection having been set up.
-	 *
-	 * @return array [0] success / Error
-	 * 				 [1] the error message, if there was a problem
-	 */
-	static function install() {
-		return array(true, "");
-	}
-
-	/**
-	 * If the Export Type needs to display any additional settings in the UI (like XML, CSV or SQL does), it needs
-	 * to define this function which return the markup. The hiding/showing of the appropriate section happens automatically.
-	 * @return string
-	 */
-	public function getAdditionalSettingsHTML() {
-		return "";
-	}
-
-
-	// 3. NON-OVERRIDABLE FUNCTIONS
-
-	/**
-	 * Returns the name of the Export Type in the current language.
-	 * @return string
-	 */
-	public final function getName() {
-		return (isset($this->L["EXPORT_TYPE_NAME"])) ? $this->L["EXPORT_TYPE_NAME"] : $this->exportTypeName;
-	}
-
-	/**
-	 * Returns a list of all javascript modules for this Export Type.
-	 * @return array
-	 */
-	public final function getJSModules() {
-		return $this->jsModules;
-	}
-
-	/**
-	 * Returns the CSS filename for this Data Type (if included).
-	 * @return array
-	 */
-	public final function getCSSFiles() {
-		return $this->cssFiles;
-	}
-
-	/**
-	 * Returns the Export Type folder.
-	 * @return string
-	 */
-	public final function getFolder() {
-		return $this->folder;
-	}
-
-	/**
-	 * Returns the path from the generatedata root folder. That value is automatically created
-	 * for each module when it it instantiated.
-	 * @return string
-	 */
-	public final function getPath() {
-		return $this->path;
-	}
-
-	/**
-	 * @return string
-	 */
-	public final function getContentTypeHeader() {
-		return $this->contentTypeHeader;
-	}
-
-	/**
-	 * @return array
-	 */
-	public final function getCodeMirrorModes() {
-		return $this->codeMirrorModes;
-	}
-
-	/**
-	 * @return array
-	 */
-	public final function getCompatibleExportTargets() {
-		return $this->compatibleExportTargets;
-	}
-
-	/**
-	 * Returns the isEnabled flag for this class.
-	 * @return boolean
-	 */
-	public final function isEnabled() {
-		return $this->isEnabled;
-	}
-}
diff --git a/resources/classes/ExportTypePluginHelper.class.php b/resources/classes/ExportTypePluginHelper.class.php
deleted file mode 100644
index 923f00fa2..000000000
--- a/resources/classes/ExportTypePluginHelper.class.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-/**
- * The ExportTypePlugin.abstract.class.php file defines the abstract class that all Export Types
- * need to extend in order to be registered within the system. This class contains a number of
- * helper methods for interacting with Export Types as a whole. It's used by the Core only.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class ExportTypePluginHelper {
-
-	/**
-	 * Returns an array of available, instantiated Export Type objects.
-	 */
-	public static function getExportTypePlugins($runtimeContext, $installedOnly = true) {
-		$allowedExportTypes = array();
-		if ($installedOnly) {
-			$exportTypes = Settings::getSetting("installedExportTypes");
-			$allowedExportTypes = explode(",", $exportTypes);
-		}
-		$exportTypesFolder = realpath(__DIR__ . "/../../plugins/exportTypes");
-		$exportTypes = array();
-		if ($handle = opendir($exportTypesFolder)) {
-			while (false !== ($item = readdir($handle))) {
-				if ($item == "." || $item == ".." || $item == ".svn") {
-					continue;
-				}
-				if (!empty($allowedExportTypes) && !in_array($item, $allowedExportTypes)) {
-					continue;
-				}
-				if (is_dir("$exportTypesFolder/$item")) {
-					$obj = self::instantiateExportType($runtimeContext, $exportTypesFolder, $item);
-
-					if ($obj != null) {
-						$folders = explode(DIRECTORY_SEPARATOR, $exportTypesFolder . DIRECTORY_SEPARATOR . $item);
-						$folders = array_reverse($folders);
-
-						// interesting, this. This is extremely simple and makes access to these values really easy
-						// ($class->path), but they're public so they can be overridden (bad!). But I still think
-						// it's better than some verbose getter function like $obj->getPath();
-						$obj->path = "{$folders[2]}/{$folders[1]}/{$folders[0]}";
-						$obj->folder = $folders[0];
-
-						$exportTypes[] = $obj;
-					}
-				}
-			}
-			closedir($handle);
-		}
-
-		return $exportTypes;
-	}
-
-	/**
-	 * Instantiates and returns an Export Type object.
-	 *
-	 * @param $runtimeContext
-	 * @param $baseFolder
-	 * @param $exportTypeFolderName
-	 * @return bool|ExportTypePlugin
-	 */
-	private function instantiateExportType($runtimeContext, $baseFolder, $exportTypeFolderName) {
-
-		$filename = "{$exportTypeFolderName}.class.php";
-		if (!is_file("$baseFolder/$exportTypeFolderName/$filename")) {
-			return false;
-		}
-
-		// now try to include and instantiate the class
-		try {
-			include("$baseFolder/$exportTypeFolderName/$filename");
-		} catch (Exception $e) {
-			return false;
-		}
-
-		if (!class_exists($exportTypeFolderName)) {
-			return false;
-		}
-
-		$instance = null;
-		try {
-			$instance = new $exportTypeFolderName($runtimeContext);
-		} catch (Exception $e) {
-			return false;
-		}
-
-		// enforce inheritance of the abstract DataType class
-		if (!($instance instanceof ExportTypePlugin)) {
-			return false;
-		}
-
-		// lastly, check the class is enabled
-		if (!$instance->isEnabled()) {
-			return false;
-		}
-
-		return $instance;
-	}
-
-	/**
-	 * Used in the main page to generate a list of Export Type JS files. DREADFUL function.
-	 * @param $exportTypes
-	 * @param string $format
-	 * @return array|string
-	 */
-	public static function getExportTypeJSResources($exportTypes, $format = "string", $pathRoot = "") {
-		$files = array();
-		foreach ($exportTypes as $exportType) {
-			$jsModules = $exportType->getJSModules();
-			$path      = $exportType->getPath();
-			for ($i=0; $i<count($jsModules); $i++) {
-				$files[] = "{$pathRoot}$path/{$jsModules[$i]}";
-			}
-		}
-
-		$returnVal = "";
-		if ($format == "string") {
-			if (!empty($files)) {
-				$returnVal = "\"" . implode("\",\n\"", $files) . "\"";
-			}
-		} else {
-			$returnVal = $files;
-		}
-
-		return $returnVal;
-	}
-
-	/**
-	 * Used in the main page to generate the tabset of additional settings for each Export Type.
-	 * @return array
-	 */
-	public static function getExportTypeAdditionalSettingsHTML($exportTypes) {
-		$additionalSettings = array();
-		foreach ($exportTypes as $exportType) {
-			$folderName = $exportType->getFolder();
-			$settings = $exportType->getAdditionalSettingsHTML();
-			if (!empty($settings)) {
-				$additionalSettings[$folderName] = $settings;
-			} else {
-				$lang = Core::$language->getCurrentLanguageStrings();
-				$additionalSettings[$folderName] = $lang["no_additional_export_type_settings"];
-			}
-		}
-
-		return $additionalSettings;
-	}
-
-	/**
-	 * Used in the main page to generate the Export Type CSS includes.
-	 * @param array the export types
-	 * @param string
-	 */
-	public static function getExportTypeCSSIncludes($exportTypes) {
-		$files = array();
-		foreach ($exportTypes as $exportType) {
-			$cssFiles = $exportType->getCSSFiles();
-			if (!empty($cssFiles)) {
-				$path = $exportType->getPath();
-				foreach ($cssFiles as $file) {
-					$files[] = "$path/$file";
-				}
-			}
-		}
-
-		$cssIncludes = "";
-		foreach ($files as $file) {
-			$cssIncludes[] = "<link rel=\"stylesheet\" type=\"text/css\" href=\"$file\" />";
-		}
-		return implode("\n", $cssIncludes);
-	}
-
-	/**
-	 * Returns a string of all <script> tags linking to the appropriate CodeMirror modes.
-	 * @param array $exportTypes
-	 * @return string
-	 */
-	public static function getExportTypeCodeMirrorModes($exportTypes) {
-		$files = array();
-		foreach ($exportTypes as $exportType) {
-			$modes = $exportType->getCodeMirrorModes();
-			foreach ($modes as $mode) {
-				if (file_exists(realpath(__DIR__ . "/../libs/codemirror/mode/{$mode}/{$mode}.js"))) {
-					$files[] = "resources/libs/codemirror/mode/{$mode}/{$mode}.js";
-				}
-			}
-		}
-
-		// remove duplicated
-		$files = array_unique($files);
-
-		$includes = "";
-		foreach ($files as $file) {
-			$includes[] = "<script src=\"$file\"></script>";
-		}
-		return implode("\n", $includes);
-	}
-
-}
diff --git a/resources/classes/GDException.class.php b/resources/classes/GDException.class.php
deleted file mode 100644
index a3416a013..000000000
--- a/resources/classes/GDException.class.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * Our custom Exception class. This is pretty much just the native Exception class, with a few tweaks.
- *   1. It does away with the first $message param. That's constructed automatically based on
- *   2. It allows for additional, custom info relative to the current error to be stashed in $data. For example,
- *      if the user fails to enter all installation DB field info (a scenario which SHOULD be caught by the client-side
- *      code), this stores the fields that are missing in $data.
- *   3. There's a custom getFormattedError function which generates a simple hash of the Exception information in a
- *      format easily convertable to JSON, along with a custom generate human-friendly error string.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
-class GDException extends Exception {
-	private $data;
-
-	public function __construct($code, $data = array()) {
-		parent::__construct(null, $code);
-		$this->data = $data;
-	}
-
-	public function getFormattedError() {
-		$language     = Core::getLanguage()->getCurrentLanguageStrings();
-		$errorCode    = $this->getCode();
-		$errorMessage = "";
-
-		switch ($errorCode) {
-			case Exceptions::SETTINGSFILEEXISTS:
-				$errorMessage = $language["settings_file_exists"];
-				break;
-			case Exceptions::NOTLOGGEDIN:
-				$errorMessage = "";
-				break;
-			case Exceptions::NOTNUMERICFIELD:
-				$errorMessage = "";
-				break;
-		}
-
-		return array(
-			"success"   => 0,
-			"exception" => 1,
-			"message"   => $errorMessage
-		);
-	}
-}
-*/
\ No newline at end of file
diff --git a/resources/classes/GeoData.class.php b/resources/classes/GeoData.class.php
deleted file mode 100644
index 62ae70001..000000000
--- a/resources/classes/GeoData.class.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-
-/**
- * This contains all practical functions for accessing the geographical data (countries,
- * regions and cities) in the database that have been populated by the various Country plugins.
- * This class is automatically instantiated by the Core during code generation
- * (runtimeContext == "generation") and found in Core::$geoData
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class GeoData {
-
-	private $countryData;
-	private $regionData;
-	private $cityData;
-	private $countryRegions;
-	private $regionCities;
-
-
-	/**
-	 * Our contructor. This extracts all the region info from the database (country, region +
-	 * city) and stores them in private vars for easy reference later on.
-	 */
-	public function __construct() {
-		$this->initCountryData();
-		$this->initRegionData();
-		$this->initCityData();
-		$this->constructDataSubsets();
-	}
-
-	/**
-	 * Returns a hash of country_slug => country data. The regions are stored in a "regions"
-	 * key and the number of regions is additionally stored in a "numRegions" key, for convenience.
-	 * @param null $countrySlug
-	 * @return array
-	 */
-	public function getCountryRegionHash($countrySlug = null) {
-		$data = $this->countryRegions;
-		if ($countrySlug != null) {
-			foreach ($this->countryRegions as $countryData) {
-				if ($countryData["countrySlug"] == $countrySlug) {
-					$data = $countryData;
-					break;
-				}
-			}
-		}
-
-		// convert the country-region info into something more useful for us
-		$countryRegionHash = array();
-		foreach ($data as $countryRegion) {
-			$countrySlug = $countryRegion["country_slug"];
-			$countryRegion["numRegions"] = count($countryRegion["regions"]);
-			$countryRegionHash[$countrySlug] = $countryRegion;
-		}
-
-		return $countryRegionHash;
-	}
-
-	public function getRegionCities($regionSlug = null) {
-		$data = $this->regionCities;
-		if ($regionSlug != null) {
-			foreach ($this->regionRegions as $regionData) {
-				if ($regionData["regionSlug"] == $regionSlug) {
-					$data = $regionData;
-					break;
-				}
-			}
-		}
-		return $data;
-	}
-
-	private function initCountryData() {
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			SELECT *
-			FROM   {$prefix}countries
-			ORDER BY country
-		");
-
-		// TODO
-		if (!$response["success"]) {
-			//throw new GDException();
-			return;
-		}
-		$countryData = array();
-		while ($row = mysqli_fetch_assoc($response["results"])) {
-			$countryData[] = $row;
-		}
-
-		$this->countryData = $countryData;
-	}
-
-	private function initRegionData() {
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			SELECT *
-			FROM   {$prefix}regions
-			ORDER BY country_slug
-		");
-		if (!$response["success"]) {
-			return;
-		}
-		$regionData = array();
-		while ($row = mysqli_fetch_assoc($response["results"])) {
-			$regionData[] = $row;
-		}
-		$this->regionData = $regionData;
-	}
-
-	private function initCityData() {
-		$prefix = Core::getDbTablePrefix();
-		$response = Core::$db->query("
-			SELECT *
-			FROM   {$prefix}cities
-			ORDER BY country_slug
-		");
-		if (!$response["success"]) {
-			return;
-		}
-		$cityData = array();
-		while ($row = mysqli_fetch_assoc($response["results"])) {
-			$cityData[] = $row;
-		}
-		$this->cityData = $cityData;
-	}
-
-	/**
-	 * Called after the country, region and city data has been populated. This populates $countryRegions
-	 * and $regionCities, for general use.
-	 */
-	private function constructDataSubsets() {
-
-		// first, create the country-regions map
-		$countryRegions = array();
-		$ungroupedRegionData = $this->regionData;
-		foreach ($this->countryData as $countryData) {
-			$countryData["regions"] = array();
-			$remainingRegionData = array();
-
-			foreach ($ungroupedRegionData as $regionData) {
-				if ($regionData["country_slug"] == $countryData["country_slug"]) {
-					unset($regionData["country_slug"]);
-					$countryData["regions"][] = $regionData;
-				} else {
-					$remainingRegionData[] = $regionData;
-				}
-			}
-
-			$ungroupedRegionData = $remainingRegionData;
-			$countryRegions[] = $countryData;
-		}
-		$this->countryRegions = $countryRegions;
-
-		// second, create the region-city map
-		$ungroupedCityData = $this->cityData;
-		$regionCities = array();
-		foreach ($this->regionData as $regionData) {
-			$regionData["cities"] = array();
-			$remainingCityData = array();
-			foreach ($ungroupedCityData as $cityData) {
-				if ($cityData["country_slug"] == $regionData["country_slug"] &&
-					$cityData["region_slug"] == $regionData["region_slug"]) {
-					$regionData["cities"][] = $cityData;
-				} else {
-					$remainingCityData[] = $cityData;
-				}
-			}
-			$ungroupedCityData = $remainingCityData;
-			$regionCities[] = $regionData;
-		}
-		$this->regionCities = $regionCities;
-	}
-}
diff --git a/resources/classes/Installation.class.php b/resources/classes/Installation.class.php
deleted file mode 100644
index 181bfaf3e..000000000
--- a/resources/classes/Installation.class.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-
-/**
- * A simple namespace class to include all installation code. The installation functions to create the
- * database tables run AFTER the settings file has been created.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class Installation {
-	private $databaseCreationError = false;
-
-
-	public static function createSettingsFile($dbHostname, $dbName, $dbUsername, $dbPassword, $tablePrefix) {
-		$encryptionSalt = Utils::generateRandomAlphanumericStr("DDD");
-		$dbUsername = Utils::sanitize($dbUsername);
-		$dbPassword = Utils::sanitize($dbPassword);
-		$tablePrefix = Utils::sanitize($tablePrefix);
-
-		$content =<<< END
-<?php
-
-\$dbHostname     = '$dbHostname';
-\$dbName         = '$dbName';
-\$dbUsername     = '$dbUsername';
-\$dbPassword     = '$dbPassword';
-\$dbTablePrefix  = '$tablePrefix';
-\$encryptionSalt = '$encryptionSalt';
-END;
-
-		$file = __DIR__ . "/../../settings.php";
-		$handle = @fopen($file, "w");
-		if ($handle) {
-			fwrite($handle, $content);
-			fclose($handle);
-			return array(true, "");
-		}
-
-		// no such luck! we couldn't create the file on the server. The user will need to do it manually
-		return array(false, $content);
-	}
-
-
-	public static function createDatabase() {
-		$response = self::createCoreTables();
-
-		if ($response["success"] == 1) {
-			return array(true, "");
-		} else {
-			return array(false, "There was a problem creating the Core tables. Please report this problem.");
-		}
-	}
-
-
-	/**
-	 * Creates the core tables and populates them.
-	 */
-	public static function createCoreTables() {
-		$prefix = Core::getDbTablePrefix();
-
-		$rollbackQueries = array(
-			"DROP TABLE IF EXISTS {$prefix}cities",
-			"DROP TABLE IF EXISTS {$prefix}configurations",
-			"DROP TABLE IF EXISTS {$prefix}countries",
-			"DROP TABLE IF EXISTS {$prefix}first_names",
-			"DROP TABLE IF EXISTS {$prefix}last_names",
-			"DROP TABLE IF EXISTS {$prefix}regions",
-			"DROP TABLE IF EXISTS {$prefix}sessions",
-			"DROP TABLE IF EXISTS {$prefix}settings",
-			"DROP TABLE IF EXISTS {$prefix}user_accounts"
-		);
-
-		// start off by clearing out the DB, just in case. For this, we just run the rollback queries (used
-		// below, in case of an SQL error)
-		Core::$db->query($rollbackQueries);
-
-		// now construct the database
-		$queries = array();
-		$queries[] = "
-			CREATE TABLE {$prefix}cities (
-				city_id mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
-				country_slug varchar(100) NOT NULL,
-				region_slug varchar(100) NOT NULL,
-				city varchar(80) CHARACTER SET utf8 NOT NULL,
-				PRIMARY KEY (city_id)
-			)
-		";
-		$queries[] = "
-			CREATE TABLE {$prefix}configurations (
-				configuration_id mediumint(9) NOT NULL auto_increment,
-				status ENUM('public','private') NOT NULL,
-				date_created datetime NOT NULL,
-				last_updated datetime NOT NULL,
-				account_id mediumint(9) NOT NULL,
-				configuration_name varchar(100) NOT NULL,
-				content mediumtext NOT NULL,
-				num_rows_generated MEDIUMINT DEFAULT 0,
-				PRIMARY KEY (configuration_id)
-			)
-		";
-		$queries[] = "
-			CREATE TABLE {$prefix}countries (
-				id mediumint(9) NOT NULL AUTO_INCREMENT,
-				country varchar(100) NOT NULL DEFAULT '',
-				country_slug varchar(100) DEFAULT NULL,
-				PRIMARY KEY (id)
-			)
-		";
-		$queries[] = "
-			CREATE TABLE {$prefix}regions (
-				region_id mediumint(9) NOT NULL AUTO_INCREMENT,
-				country_slug varchar(100) NOT NULL,
-				region varchar(35) CHARACTER SET utf8 NOT NULL,
-				region_short char(2) CHARACTER SET utf8 DEFAULT NULL,
-				region_slug varchar(100) NOT NULL,
-				weight smallint(3) NOT NULL,
-				PRIMARY KEY (region_id)
-			)
-		";
-		$queries[] = "
-			CREATE TABLE {$prefix}settings (
-				setting_name varchar(100) NOT NULL,
-				setting_value text NOT NULL,
-				UNIQUE KEY setting_name (setting_name)
-			)
-		";
-		$defaultTheme = Core::getDefaultTheme();
-		$queries[] = "
-			INSERT INTO {$prefix}settings (setting_name, setting_value)
-			VALUES
-				('lipsum', 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sed tortor. Integer aliquam adipiscing lacus. Ut nec urna et arcu imperdiet ullamcorper. Duis at lacus. Quisque purus sapien, gravida non, sollicitudin a, malesuada id, erat. Etiam vestibulum massa rutrum magna. Cras convallis convallis dolor. Quisque tincidunt pede ac urna. Ut tincidunt vehicula risus. Nulla eget metus eu erat semper rutrum. Fusce dolor quam, elementum at, egestas a, scelerisque sed, sapien. Nunc pulvinar arcu et pede. Nunc sed orci lobortis augue scelerisque mollis. Phasellus libero mauris, aliquam eu, accumsan sed, facilisis vitae, orci. Phasellus dapibus quam quis diam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Fusce aliquet magna a neque. Nullam ut nisi a odio semper cursus. Integer mollis. Integer tincidunt aliquam arcu. Aliquam ultrices iaculis odio. Nam interdum enim non nisi. Aenean eget metus. In nec orci. Donec nibh. Quisque nonummy ipsum non arcu. Vivamus sit amet risus. Donec egestas. Aliquam nec enim. Nunc ut erat. Sed nunc est, mollis non, cursus non, egestas a, dui. Cras pellentesque. Sed dictum. Proin eget odio. Aliquam vulputate ullamcorper magna. Sed eu eros. Nam consequat dolor vitae dolor. Donec fringilla. Donec feugiat metus sit amet ante. Vivamus non lorem vitae odio sagittis semper. Nam tempor diam dictum sapien. Aenean massa. Integer vitae nibh. Donec est mauris, rhoncus id, mollis nec, cursus a, enim. Suspendisse aliquet, sem ut cursus luctus, ipsum leo elementum sem, vitae aliquam eros turpis non enim. Mauris quis turpis vitae purus gravida sagittis. Duis gravida. Praesent eu nulla at sem molestie sodales. Mauris blandit enim consequat purus. Maecenas libero est, congue a, aliquet vel, vulputate eu, odio. Phasellus at augue id ante dictum cursus. Nunc mauris elit, dictum eu, eleifend nec, malesuada ut, sem. Nulla interdum. Curabitur dictum. Phasellus in felis. Nulla tempor augue ac ipsum. Phasellus vitae mauris sit amet lorem semper auctor. Mauris vel turpis. Aliquam adipiscing lobortis risus. In mi pede, nonummy ut, molestie in, tempus eu, ligula. Aenean euismod mauris eu elit. Nulla facilisi. Sed neque. Sed eget lacus. Mauris non dui nec urna suscipit nonummy. Fusce fermentum fermentum arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Phasellus ornare. Fusce mollis. Duis sit amet diam eu dolor egestas rhoncus. Proin nisl sem, consequat nec, mollis vitae, posuere at, velit. Cras lorem lorem, luctus ut, pellentesque eget, dictum placerat, augue. Sed molestie. Sed id risus quis diam luctus lobortis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Mauris ut quam vel sapien imperdiet ornare. In faucibus. Morbi vehicula. Pellentesque tincidunt tempus risus. Donec egestas. Duis ac arcu. Nunc mauris. Morbi non sapien molestie orci tincidunt adipiscing. Mauris molestie pharetra nibh. Aliquam ornare, libero at auctor ullamcorper, nisl arcu iaculis enim, sit amet ornare lectus justo eu arcu. Morbi sit amet massa. Quisque porttitor eros nec tellus. Nunc lectus pede, ultrices a, auctor non, feugiat nec, diam. Duis mi enim, condimentum eget, volutpat ornare, facilisis eget, ipsum. Donec sollicitudin adipiscing ligula. Aenean gravida nunc sed pede. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel arcu eu odio tristique pharetra. Quisque ac libero nec ligula consectetuer rhoncus. Nullam velit dui, semper et, lacinia vitae, sodales at, velit. Pellentesque ultricies dignissim lacus. Aliquam rutrum lorem ac risus. Morbi metus. Vivamus euismod urna. Nullam lobortis quam a felis ullamcorper viverra. Maecenas iaculis aliquet diam. Sed diam lorem, auctor quis, tristique ac, eleifend vitae, erat. Vivamus nisi. Mauris nulla. Integer urna. Vivamus molestie dapibus ligula. Aliquam erat volutpat. Nulla dignissim. Maecenas ornare egestas ligula. Nullam feugiat placerat velit. Quisque varius. Nam porttitor scelerisque neque. Nullam nisl. Maecenas malesuada fringilla est. Mauris eu turpis. Nulla aliquet. Proin velit. Sed malesuada augue ut lacus. Nulla tincidunt, neque vitae semper egestas, urna justo faucibus lectus, a sollicitudin orci sem eget massa. Suspendisse eleifend. Cras sed leo. Cras vehicula aliquet libero. Integer in magna. Phasellus dolor elit, pellentesque a, facilisis non, bibendum sed, est. Nunc laoreet lectus quis massa. Mauris vestibulum, neque sed dictum eleifend, nunc risus varius orci, in consequat enim diam vel arcu. Curabitur ut odio vel est tempor bibendum. Donec felis orci, adipiscing non, luctus sit amet, faucibus ut, nulla. Cras eu tellus eu augue porttitor interdum. Sed auctor odio a purus. Duis elementum, dui quis accumsan convallis, ante lectus convallis est, vitae sodales nisi magna sed dui. Fusce aliquam, enim nec tempus scelerisque, lorem ipsum sodales purus, in molestie tortor nibh sit amet orci. Ut sagittis lobortis mauris. Suspendisse aliquet molestie tellus. Aenean egestas hendrerit neque. In ornare sagittis felis. Donec tempor, est ac mattis semper, dui lectus rutrum urna, nec luctus felis purus ac tellus. Suspendisse sed dolor. Fusce mi lorem, vehicula et, rutrum eu, ultrices sit amet, risus. Donec nibh enim, gravida sit amet, dapibus id, blandit at, nisi. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin vel nisl. Quisque fringilla euismod enim. Etiam gravida molestie arcu. Sed eu nibh vulputate mauris sagittis placerat. Cras dictum ultricies ligula. Nullam enim. Sed nulla ante, iaculis nec, eleifend non, dapibus rutrum, justo. Praesent luctus. Curabitur egestas nunc sed libero. Proin sed turpis nec mauris blandit mattis. Cras eget nisi dictum augue malesuada malesuada. Integer id magna et ipsum cursus vestibulum. Mauris magna. Duis dignissim tempor arcu. Vestibulum ut eros non enim commodo hendrerit. Donec porttitor tellus non magna. Nam ligula elit, pretium et, rutrum non, hendrerit id, ante. Nunc mauris sapien, cursus in, hendrerit consectetuer, cursus et, magna. Praesent interdum ligula eu enim. Etiam imperdiet dictum magna. Ut tincidunt orci quis lectus. Nullam suscipit, est ac facilisis facilisis, magna tellus faucibus leo, in lobortis tellus justo sit amet nulla. Donec non justo. Proin non massa non ante bibendum ullamcorper. Duis cursus, diam at pretium aliquet, metus urna convallis erat, eget tincidunt dui augue eu tellus. Phasellus elit pede, malesuada vel, venenatis vel, faucibus id, libero. Donec consectetuer mauris id sapien. Cras dolor dolor, tempus non, lacinia at, iaculis quis, pede. Praesent eu dui. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eget magna. Suspendisse tristique neque venenatis lacus. Etiam bibendum fermentum metus. Aenean sed pede nec ante blandit viverra. Donec tempus, lorem fringilla ornare placerat, orci lacus vestibulum lorem, sit amet ultricies sem magna nec quam. Curabitur vel lectus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec dignissim magna a tortor. Nunc commodo auctor velit. Aliquam nisl. Nulla eu neque pellentesque massa lobortis ultrices. Vivamus rhoncus. Donec est. Nunc ullamcorper, velit in aliquet lobortis, nisi nibh lacinia orci, consectetuer euismod est arcu ac orci. Ut semper pretium neque. Morbi quis urna. Nunc quis arcu vel quam dignissim pharetra. Nam ac nulla. In tincidunt congue turpis. In condimentum. Donec at arcu. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec tincidunt. Donec vitae erat vel pede blandit congue. In scelerisque scelerisque dui. Suspendisse ac metus vitae velit egestas lacinia. Sed congue, elit sed consequat auctor, nunc nulla vulputate dui, nec tempus mauris erat eget ipsum. Suspendisse sagittis. Nullam vitae diam. Proin dolor. Nulla semper tellus id nunc interdum feugiat. Sed nec metus facilisis lorem tristique aliquet. Phasellus fermentum convallis ligula. Donec luctus aliquet odio. Etiam ligula tortor, dictum eu, placerat eget, venenatis a, magna. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Etiam laoreet, libero et tristique pellentesque, tellus sem mollis dui, in sodales elit erat vitae risus. Duis a mi fringilla mi lacinia mattis. Integer eu lacus. Quisque imperdiet, erat nonummy ultricies ornare, elit elit fermentum risus, at fringilla purus mauris a nunc. In at pede. Cras vulputate velit eu sem. Pellentesque ut ipsum ac mi eleifend egestas. Sed pharetra, felis eget varius ultrices, mauris ipsum porta elit, a feugiat tellus lorem eu metus. In lorem. Donec elementum, lorem ut aliquam iaculis, lacus pede sagittis augue, eu tempor erat neque non quam. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam fringilla cursus purus. Nullam scelerisque neque sed sem egestas blandit. Nam nulla magna, malesuada vel, convallis in, cursus et, eros. Proin ultrices. Duis volutpat nunc sit amet metus. Aliquam erat volutpat. Nulla facilisis. Suspendisse commodo tincidunt nibh. Phasellus nulla. Integer vulputate, risus a ultricies adipiscing, enim mi tempor lorem, eget mollis lectus pede et risus. Quisque libero lacus, varius et, euismod et, commodo at, libero. Morbi accumsan laoreet ipsum. Curabitur consequat, lectus sit amet luctus vulputate, nisi sem semper erat, in consectetuer ipsum nunc id enim. Curabitur massa. Vestibulum accumsan neque et nunc. Quisque ornare tortor at risus. Nunc ac sem ut dolor dapibus gravida. Aliquam tincidunt, nunc ac mattis ornare, lectus ante dictum mi, ac mattis velit justo nec ante. Maecenas mi felis, adipiscing fringilla, porttitor vulputate, posuere vulputate, lacus. Cras interdum. Nunc sollicitudin commodo ipsum. Suspendisse non leo. Vivamus nibh dolor, nonummy ac, feugiat non, lobortis quis, pede. Suspendisse dui. Fusce diam nunc, ullamcorper eu, euismod ac, fermentum vel, mauris. Integer sem elit, pharetra ut, pharetra sed, hendrerit a, arcu. Sed et libero. Proin mi. Aliquam gravida mauris ut mi. Duis risus odio, auctor vitae, aliquet nec, imperdiet nec, leo. Morbi neque tellus, imperdiet non, vestibulum nec, euismod in, dolor. Fusce feugiat. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam auctor, velit eget laoreet posuere, enim nisl elementum purus, accumsan interdum libero dui nec ipsum.'),
-				('userAccountSetup', ''),
-				('consoleEventsPublish', ''),
-				('consoleEventsSubscribe', ''),
-				('consoleEventsDataTypePlugins', ''),
-				('consoleEventsExportTypePlugins', ''),
-				('consoleCoreEvents', ''),
-				('consoleWarnings', ''),
-				('defaultLanguage', ''),
-				('installationStepComplete_Core', 'no'),
-				('installationComplete', 'no'),
-				('installedDataTypes', ''),
-				('installedExportTypes', ''),
-				('installedCountries', ''),
-				('allowAnonymousAccess', ''),
-				('anonymousUserPermissionDeniedMsg', ''),
-				('theme', '$defaultTheme')
-		";
-		$queries[] = "
-			CREATE TABLE {$prefix}sessions (
-				session_id varchar(100) NOT NULL default '',
-				session_data text NOT NULL,
-				expires int(11) NOT NULL default '0',
-				PRIMARY KEY (session_id)
-			)
-		";
-
-		$queries[] = "
-			CREATE TABLE {$prefix}user_accounts (
-				account_id mediumint(8) unsigned NOT NULL auto_increment,
-				date_created datetime NOT NULL,
-				last_updated datetime NOT NULL,
-				last_logged_in datetime NULL,
-				date_expires datetime default NULL,
-				account_type ENUM('user', 'admin') NOT NULL,
-				first_name varchar(50) default NULL,
-				last_name varchar(50) default NULL,
-				email varchar(100) NOT NULL,
-				password varchar(50) NOT NULL,
-				password_recovery_question varchar(100) default NULL,
-				password_recovery_answer varchar(100) default NULL,
-				num_rows_generated mediumint(9) default 0,
-				max_records mediumint(9) default NULL,
-				PRIMARY KEY (account_id)
-			)
-		";
-
-		return Core::$db->query($queries, $rollbackQueries);
-	}
-}
diff --git a/resources/classes/Language.class.php b/resources/classes/Language.class.php
deleted file mode 100644
index 16c6e1125..000000000
--- a/resources/classes/Language.class.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/**
- * This class contains all functionality relating to the current selected language. For code
- * relating to all available translations, see the Translation class.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class Language {
-
-	private $currentLanguageFile; // should include .php suffix, no?
-	private $currentLanguageStrings;
-
-
-	// TODO also add private var for human-readable string of current language
-
-	/**
-	 * The Language class constructor requires the name of the language file (i.e. "fr" in "fr.php") as the
-	 * first param. But to keep things as simple (and still as loosely coupled) as possible, there's an optional
-	 * second param which will override the value passed in param #1. This overrides the value first based
-	 * on whatever's in sessions and secondly, whatever is in the query param. The query param always takes
-	 * precedence.
-	 *
-	 * @param string $languageFile
-	 * @param boolean $overrideDefault
-	 */
-	function __construct($languageFile, $overrideDefault = true) {
-		$this->currentLanguageFile = $languageFile;
-
-		if ($overrideDefault) {
-			$this->overrideDefaultLanguageFile();
-		}
-
-		// TODO exception handling here
-
-		$fileAndPath = realpath(__DIR__ . "/../lang/" . $this->currentLanguageFile . ".php");
-		require($fileAndPath);
-		$this->currentLanguageStrings = $L;
-	}
-
-	public function getCurrentLanguageFile() {
-		return $this->currentLanguageFile;
-	}
-
-	public function getCurrentLanguageStrings() { // TODO far too verbose
-		return $this->currentLanguageStrings;
-	}
-
-	/**
-	 * Used in lang.php to return the current language strings for the Core, data types and
-	 * export types.
-	 */
-	public function getLanguageStringsJS() {
-		$lines = array();
-		while (list($key, $value) = each($this->currentLanguageStrings)) {
-			if (is_string($value)) {
-				$lines[] = "\"$key\":\"" . addslashes($value) . "\"";
-			}
-		}
-
-		// Export Types
-		$exportTypeLines = array();
-		$exportTypes = Core::$exportTypePlugins;
-
-		if (is_array($exportTypes)) {
-			foreach ($exportTypes as $exportType) {
-				$moduleFolder = $exportType->folder;
-				if (!isset($exportType->L)) {
-					continue;
-				}
-				$currModuleLines = array();
-				while (list($key, $value) = each($exportType->L)) {
-					$currModuleLines[] = "\"$key\":\"" . addslashes($value) . "\"";
-				}
-				$exportTypeLines[] = "  \"$moduleFolder\": {" . implode(",\n", $currModuleLines) . "}";
-			}
-			$lines[] = "\"exportTypePlugins\": {\n" . implode(",\n", $exportTypeLines) . "\n}";
-		}
-
-		// Data Types
-		$dataTypeLines = array();
-		$dataTypesByGroup = Core::$dataTypePlugins;
-		if (is_array($dataTypesByGroup)) {
-			$dataTypes = DataTypePluginHelper::getDataTypeList($dataTypesByGroup);
-			foreach ($dataTypes as $dataType) {
-				$moduleFolder = $dataType->folder;
-				if (!isset($dataType->L)) {
-					continue;
-				}
-				$currModuleLines = array();
-				while (list($key, $value) = each($dataType->L)) {
-					$currModuleLines[] = "\"$key\":\"" . addslashes($value) . "\"";
-				}
-				$dataTypeLines[] = "  \"$moduleFolder\": {" . implode(",\n", $currModuleLines) . "}";
-			}
-			$lines[] = "\"dataTypePlugins\": {\n" . implode(",\n", $dataTypeLines) . "\n}";
-		}
-
-		return "var L={\n" . implode(",\n", $lines) . "}";
-	}
-
-
-	// private member functions
-
-	private function overrideDefaultLanguageFile() {
-		$languageFile = $this->currentLanguageFile;
-
-		// if sessions are enabled, see if the current language is stashed in there
-		$overriddenLangFile = "";
-		if (isset($_GET["lang"])) {
-			$overriddenLangFile = strip_tags($_GET["lang"]);
-			$overriddenLangFile = preg_replace("/\W/", "", $overriddenLangFile);
-			$_SESSION["lang"] = $overriddenLangFile;
-		} else if (isset($_SESSION["lang"])) {
-			$overriddenLangFile = $_SESSION["lang"];
-		}
-
-		if (!empty($overriddenLangFile)) {
-			$fileAndPath = realpath(__DIR__ . "/../lang/{$overriddenLangFile}.php");
-			if (file_exists($fileAndPath)) {
-				$languageFile = $overriddenLangFile;
-			}
-		}
-
-		$this->currentLanguageFile = $languageFile;
-	}
-}
-
diff --git a/resources/classes/Minification.class.php b/resources/classes/Minification.class.php
deleted file mode 100644
index 7794e9c53..000000000
--- a/resources/classes/Minification.class.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Added in 3.0.7 to help tie-in resource bundling, minification and MD5-renaming via Grunt. Up to this point
- * we didn't do any bundling/minification, but that obviously needed to be fixed. Here's how it works:
- *
- * - Grunt handles JS and CSS minification and bundling, and renaming of files to include their md5 hash (for
- *   cache-busting). It also generates a /cache/minifiedResourcePaths.php file every time it's run that contains
- *   a single var with the various path maps.
- * - To use the bundled resource, just add the following line to your config.php file:
- *        $useMinifiedResources = true
- * - To trigger re-bundling, you can either just type "grunt" in the command line, or click on the "Reset Plugins"
- *   option on the Settings page in the UI. Both require grunt to have been configured.
- * - for local usage / dev, you DON'T need to have configured Grunt. You can just NOT add $useMinifiedResources = true
- *   to your config. It will run slower but it will always include the latest files.
- */
-class Minification {
-
-	public static function getMinifiedResourcePaths() {
-		$result = self::checkMinifiedFileExists();
-		if ($result === false) {
-			return false;
-		} else {
-			return $result;
-		}
-	}
-
-	/**
-	 * create a /cache/appStart-unminified.js file. Grunt will handle the renaming of the file and the generation
-	 * of the /cache/minifiedResourcePaths.php file.
-	 */
-	public static function createAppStartFile() {
-		$exportTypes = Core::$exportTypePlugins;
-		$exportTypeJSModules = ExportTypePluginHelper::getExportTypeJSResources($exportTypes, "string");
-
-		$dataTypes = DataTypePluginHelper::getDataTypeList(Core::$dataTypePlugins);
-		$dataTypeJSModules = DataTypePluginHelper::getDataTypeJSResources($dataTypes, "string");
-
-		$js = 'require(["manager","generator","accountManager",' . $exportTypeJSModules . "," . $dataTypeJSModules . ',"pageInit"], function(manager) {manager.start(); });';
-
-		$file = realpath(__DIR__ . "/../../cache/") . "/appStartGenerated.js";
-		if (is_file($file)) {
-			unlink($file);
-		}
-
-		if (file_put_contents($file, $js)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	private static function checkMinifiedFileExists() {
-		@include(realpath(__DIR__ . "/../../cache/minifiedResourcePaths.php"));
-		$info = get_defined_vars();
-
-		if (!isset($info["MINIFIED"])) {
-			return false;
-		}
-		return $info["MINIFIED"];
-	}
-
-}
diff --git a/resources/classes/SecureSmarty.class.php b/resources/classes/SecureSmarty.class.php
deleted file mode 100644
index 91909a31c..000000000
--- a/resources/classes/SecureSmarty.class.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Added in 3.0.7 for security purposes. All code (modules included) should now use this class.
- * It returns an instantiated Smarty object with a security policy applied: PHP is stripped out
- */
-class SecureSmarty extends Smarty {
-
-	public function __construct() {
-		parent::__construct();
-
-		if (Core::isSmartySecurityEnabled()) {
-			$securityPolicy = new Smarty_Security($this);
-			$securityPolicy->php_functions = null;
-			$securityPolicy->php_handling = Smarty::PHP_REMOVE;
-			$securityPolicy->disabled_tags = array("eval", "exec", "system");
-
-			$this->enableSecurity($securityPolicy);
-		}
-	}
-}
diff --git a/resources/classes/SessionManager.class.php b/resources/classes/SessionManager.class.php
deleted file mode 100644
index 7b047762f..000000000
--- a/resources/classes/SessionManager.class.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class SessionManager {
-	private $dbLink;
-	private $dbPrefix;
-
-
-	function __construct() {
-		if (!Core::checkIsInstalled()) {
-			return;
-		}
-		$this->dbLink   = Core::$db->getDBLink();
-		$this->dbPrefix = Core::getDbTablePrefix();
-
-		// register this object as the session handler
-		session_set_save_handler(
-			array(&$this, "open"),
-			array(&$this, "close"),
-			array(&$this, "read"),
-			array(&$this, "write"),
-			array(&$this, "destroy"),
-			array(&$this, "gc")
-		);
-	}
-
-	function open($save_path, $session_name) {
-		return true;
-	}
-
-	function close() {
-		return true;
-	}
-
-	function read($id) {
-		// fetch session data from the selected database
-		$time  = time();
-		$newID = mysqli_real_escape_string($this->dbLink, $id);
-		$sql   = "SELECT session_data FROM {$this->dbPrefix}sessions WHERE session_id = '$newID' AND expires > $time";
-
-		$response = mysqli_query($this->dbLink, $sql);
-		$numRows  = mysqli_num_rows($response);
-
-		$data = "";
-		if ($numRows > 0) {
-			$row = mysqli_fetch_assoc($response);
-			$data = $row["session_data"];
-		}
-
-		return $data;
-	}
-
-	// this is only executed until after the output stream has been closed
-	function write($id, $data) {
-		$life_time = 3600;
-		$time = time() + $life_time;
-		$newID   = mysqli_real_escape_string($this->dbLink, $id);
-		$newData = mysqli_real_escape_string($this->dbLink, $data);
-
-		$sql = "REPLACE {$this->dbPrefix}sessions (session_id, session_data, expires) VALUES('$newID', '$newData', $time)";
-		mysqli_query($this->dbLink, $sql);
-
-		return true;
-	}
-
-	function destroy($id) {
-		$newID = mysqli_real_escape_string($this->dbLink, $id);
-		$sql = "DELETE FROM {$this->dbPrefix}sessions WHERE session_id = '$newID'";
-		mysqli_query($this->dbLink, $sql);
-		return true;
-	}
-
-	// delete all records who have passed the expiration time
-	function gc() {
-		$sql = "DELETE FROM {$this->dbPrefix}sessions WHERE expires < UNIX_TIMESTAMP()";
-		mysqli_query($this->dbLink, $sql);
-		return true;
-	}
-}
diff --git a/resources/classes/Settings.class.php b/resources/classes/Settings.class.php
deleted file mode 100644
index ee312544b..000000000
--- a/resources/classes/Settings.class.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class Settings {
-
-	/**
-	 * Returns all settings in the database.
-	 * @return
-	 */
-	public static function getSettings() {
-		$prefix = Core::getDbTablePrefix();
-		$query = Core::$db->query("SELECT * FROM {$prefix}settings");
-
-		// TODO. work out standardized return format... Exception maybe
-		if ($query["success"]) {
-			$results = array();
-			while ($row = mysqli_fetch_assoc($query["results"])) {
-				$results[$row["setting_name"]] = $row["setting_value"];
-			}
-			return $results;
-		} else {
-			return;
-		}
-	}
-
-	/**
-	 * Returns the value of a specific settings.
-	 * @param string the unique setting name (setting_name column value in the Settings table)
-	 * @return if not found, null. Otherwise the string value
-	 */
-	public static function getSetting($settingName) {
-		$prefix = Core::getDbTablePrefix();
-
-		if (!Core::$db) {
-			return;
-		}
-
-		$response = Core::$db->query("
-			SELECT setting_value
-			FROM {$prefix}settings
-			WHERE setting_name = '$settingName'
-		");
-
-		$value = null;
-		if ($response["success"]) {
-			$data = mysqli_fetch_assoc($response["results"]);
-			$value = $data["setting_value"];
-		}
-
-		return $value;
-	}
-
-	public static function setSetting($settingName, $settingValue) {
-		$prefix = Core::getDbTablePrefix();
-		$settingValue = mysqli_real_escape_string(Core::$db->getDBLink(), $settingValue);
-		$response = Core::$db->query("
-			UPDATE {$prefix}settings
-			SET    setting_value = '$settingValue'
-			WHERE  setting_name = '$settingName'
-		");
-		return $response;
-	}
-
-	/**
-	 * Used to update the settings on the Settings tab.
-	 * @param array $post
-	 */
-	public static function updateSettings($post) {
-		$accountInfo = Core::$user->getAccount();
-		$dbLink = Core::$db->getDBLink();
-		$accountType = $accountInfo["accountType"];
-		$isAnonymous = isset($accountInfo["isAnonymous"]) ? $accountInfo["isAnonymous"] : "";
-
-		$L = Core::$language->getCurrentLanguageStrings();
-		if (!isset($post["consoleEventsDataTypePlugins"]) || empty($post["consoleEventsDataTypePlugins"])) {
-			$post["consoleEventsDataTypePlugins"] = array();
-		}
-		if (!isset($post["consoleEventsExportTypePlugins"]) || empty($post["consoleEventsExportTypePlugins"])) {
-			$post["consoleEventsExportTypePlugins"] = array();
-		}
-
-		$settings = array(
-			"consoleWarnings"         => isset($post["consoleWarnings"]) ? "enabled" : "",
-			"consoleEventsPublish"    => isset($post["consoleEventsPublish"]) ? "enabled" : "",
-			"consoleEventsSubscribe"  => isset($post["consoleEventsSubscribe"]) ? "enabled" : "",
-			"consoleCoreEvents"       => isset($post["consoleCoreEvents"]) ? "enabled" : "",
-			"consoleEventsDataTypePlugins"   => implode(",", $post["consoleEventsDataTypePlugins"]),
-			"consoleEventsExportTypePlugins" => implode(",", $post["consoleEventsExportTypePlugins"]),
-		    "theme" => $post["theme"]
-		);
-
-		if (!$isAnonymous && $accountType == "admin") {
-			if (isset($post["userAccountSetup"])) {
-				$settings["userAccountSetup"] = ($post["userAccountSetup"] == "single") ? "single" : "multiple";
-			}
-		}
-
-		$prefix = Core::getDbTablePrefix();
-		$errors = array();
-		while (list($key, $value) = each($settings)) {
-			$value = mysqli_real_escape_string($dbLink, $value);
-			$result = Core::$db->query("
-				UPDATE {$prefix}settings
-				SET    setting_value = '$value'
-				WHERE  setting_name = '$key'
-			");
-			if (!$result["success"]) {
-				$errors[] = $result["errorMessage"];
-			}
-		}
-
-		if (count($errors) > 0) {
-			return array(false, implode("<br />", $errors));
-		} else {
-			return array(true, $L["notify_settings_updated"]);
-		}
-	}
-
-	/**
-	 * A custom function for outputting a settings file into the constants.js file. This
-	 * allows the file to be referenced in the installation script prior to actual installation (where
-	 * there are no settings yet in the DB).
-	 *
-	 * @param string $setting
-	 */
-	public function safeDisplaySetting($setting) {
-		switch ($setting) {
-			case "consoleWarnings":
-				if (!Core::checkIsInstalled()) {
-					echo "false";
-				} else {
-					echo (Settings::getSetting("consoleWarnings") == "enabled") ? "true" : "false";
-				}
-				break;
-
-			case "consoleEventsPublish":
-				if (!Core::checkIsInstalled()) {
-					echo "false";
-				} else {
-					echo (Settings::getSetting("consoleEventsPublish") == "enabled") ? "true" : "false";
-				}
-				break;
-
-			case "consoleEventsSubscribe":
-				if (!Core::checkIsInstalled()) {
-					echo "false";
-				} else {
-					echo (Settings::getSetting("consoleEventsSubscribe") == "enabled") ? "true" : "false";
-				}
-				break;
-
-			case "consoleCoreEvents":
-				if (!Core::checkIsInstalled()) {
-					echo "false";
-				} else {
-					echo (Settings::getSetting("consoleCoreEvents") == "enabled") ? "true" : "false";
-				}
-				break;
-
-			case "consoleEventsDataTypePlugins":
-				if (Core::checkIsInstalled()) {
-					echo Settings::getSetting("consoleEventsDataTypePlugins");
-				}
-				break;
-
-			case "consoleEventsExportTypePlugins":
-				if (Core::checkIsInstalled()) {
-					echo Settings::getSetting("consoleEventsExportTypePlugins");
-				}
-				break;
-
-			case "theme":
-				if (Core::checkIsInstalled()) {
-					echo Settings::getSetting("theme");
-				}
-				break;
-
-			case "anonymousUserPermissionDeniedMsg":
-				if (Core::checkIsInstalled()) {
-					// this message is entered by the user during installation. It can contain any old thing, but we're outputting it
-					// into a JS var. So, handle newlines + double quotes.
-					$message = Settings::getSetting("anonymousUserPermissionDeniedMsg");
-					$message = addslashes($message);
-					$message = preg_replace("/\n/", "\\n", $message);
-					echo $message;
-				}
-				break;
-		}
-	}
-}
diff --git a/resources/classes/Templates.class.php b/resources/classes/Templates.class.php
deleted file mode 100644
index 4ab61a2f0..000000000
--- a/resources/classes/Templates.class.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/**
- * Functions for interacting with Smarty templates, and anything relating to actually generating or displaying markup.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class Templates {
-
-	/**
-	 * Used to generate the main index and install pages.
-	 * @param string $template the path from the GD root to the template
-	 * @param array $pageVars
-	 * @param string $action "display" displays the result (default) or "return" to return the value
-	 * @return mixed
-	 */
-	public static function displayPage($template, $pageVars = array(), $action = "display") {
-
-		// check the compile directory has the write permissions
-		if (!is_writable(Core::$smarty->compile_dir) && is_readable(Core::$smarty->compile_dir)) {
-			Templates::displaySeriousError("The <b>/cache</b> folder isn't writable. This folder is used by Smarty to generate temporary files for speedy page loads. You'll need to update that folder's permissions to allow read and write permissions (777 on unix/mac).");
-			exit;
-		}
-
-		// check that the user is running a recent enough version of PHP. This is needed for json_encode,
-		// json_decode and for Smarty 3
-		$minimumPHPVersion = Core::getMinimumPHPVersion();
-		$currentVersion = PHP_VERSION;
-		if (version_compare($currentVersion, $minimumPHPVersion) < 0) {
-			Templates::displaySeriousError("Sorry, you need to be running PHP <b>$minimumPHPVersion</b> or later. You're currently running <b>$currentVersion</b>.");
-			exit;
-		}
-
-		Core::$smarty->assign("L", Core::$language->getCurrentLanguageStrings());
-		Core::$smarty->assign("currLang", Core::$language->getCurrentLanguageFile());
-		Core::$smarty->assign("queryString", $_SERVER["QUERY_STRING"]);
-
-		// this sucks. Needs to cache the DB value
-		$theme = isset($pageVars["theme"]) ? $pageVars["theme"] : Settings::getSetting("theme");
-
-		Core::$smarty->assign("theme", $theme);
-		Core::$smarty->assign("inDemoMode", Core::checkDemoMode());
-		Core::$smarty->assign("allowThemes", Core::$allowThemes);
-
-		// now add the custom variables for this template, as defined in $page_vars
-		foreach ($pageVars as $key=>$value) {
-			Core::$smarty->assign($key, $value);
-		}
-
-		// "success" and "message" are special
-		if (!isset($pageVars["success"])) {
-			Core::$smarty->assign("success", null);
-		}
-		if (!isset($pageVars["message"])) {
-			Core::$smarty->assign("message", null);
-		}
-
-		try {
-			$templatePath = realpath(__DIR__ . "/../../$template");
-
-			if ($action == "display") {
-				Core::$smarty->display($templatePath);
-			} else {
-				return Core::$smarty->fetch($templatePath);
-			}
-		} catch (Exception $e) {
-			Templates::displaySeriousError("Smarty encountered a problem writing to the /cache folder. The (probably indecipherable) error message returned is:", $e);
-			exit;
-		}
-	}
-
-	/**
-	 * Helper function for use by any of the modules (or Core). It lets
-	 * @param string $template the template (.tpl file) and path from the Generate Data root.
-	 * @param array $placeholders
-	 * @return string
-	 */
-	public static function evalSmartyTemplate($template, $placeholders) {
-		return Templates::displayPage($template, $placeholders, "return");
-	}
-
-	/**
-	 * A more lightweight version of evalSmartyTemplate, this evaluates a string containing Smarty content.
-	 * @param $placeholderStr
-	 * @param $placeholders
-	 * @return string
-	 */
-	public static function evalSmartyString($placeholderStr, $placeholders) {
-		$smarty = new SecureSmarty();
-		$smarty->template_dir = realpath(__DIR__ . "/../libs/smarty");
-		$smarty->compile_dir  = realpath(__DIR__ . "/../../cache");
-
-		if (!empty($placeholders)) {
-			while (list($key, $value) = each($placeholders)) {
-				$smarty->assign($key, $value);
-			}
-		}
-		return $smarty->fetch("string:" . $placeholderStr);
-	}
-
-	/**
-	 * This is used for serious errors: when no database connection can be made or the Smarty cache folder isn't writable.
-	 * All it does is output the error string with no other dependencies - not even language strings. The paths assume
-	 * that we're in the application root (otherwise they won't work).
-	 *
-	 * This function only handles English. For problems of this severity, I think that's okay.
-	 * @param $error
-	 * @param string $errorDetails
-	 */
-	public static function displaySeriousError($error, $errorDetails = "") {
-		$notFixedMessage = "";
-		if (isset($_GET["source"])) {
-			$notFixedMessage = "<p id=\"gdNotFixed\">Nope, ain't fixed yet. Try again.</p>";
-		}
-
-		if (!empty($errorDetails)) {
-			$errorDetails = "<div id=\"gdSeriousError\">" . htmlspecialchars($errorDetails) . "</div>";
-		}
-
-		echo <<< END
-	<!DOCTYPE html>
-	<html>
-	<head>
-		<title>Things just ain't right.</title>
-		<link rel="stylesheet" type="text/css" href="resources/themes/classic/compiled/styles.css">
-		<script src="resources/scripts/libs/jquery.min.js"></script>
-		<script>
-		$(function() {
-			$("button").bind("click", function() { window.location = "index.php?source=fromerrorpage"; });
-		});
-		</script>
-	</head>
-	<body class="gdErrorPage">
-	<div id="gdBox">
-		<h1>Uh-oh.</h1>
-		$notFixedMessage
-		<p>$error</p>
-
-		$errorDetails
-		<button class="gdPrimaryButton">Click here when you think you've fixed it.</button>
-	</div>
-	</body>
-	</html>
-END;
-	}
-}
diff --git a/resources/classes/Translations.class.php b/resources/classes/Translations.class.php
deleted file mode 100644
index 6114678f7..000000000
--- a/resources/classes/Translations.class.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class Translations {
-	private $list;
-
-	/**
-	 * Examines the contents of the /global/lang folder and returns the $L["language"] value for
-	 * all translation files.
-	 *
-	 * @return array a hash of filename => language name
-	 */
-	function __construct() {
-		$translationsFolder = realpath(__DIR__ . "/../lang/");
-		$translations = array();
-		if ($handle = opendir($translationsFolder)) {
-			while (false !== ($item = readdir($handle))) {
-				if ($item == "." || $item == ".." || $item == ".svn") {
-					continue;
-				}
-
-				if (is_file("$translationsFolder/$item") && preg_match("/php$/", $item)) {
-					$validLanguage = $this->checkValidLangFile("$translationsFolder/$item");
-					if ($validLanguage !== false) {
-						$translations[$item] = $validLanguage;
-					}
-				}
-			}
-			closedir($handle);
-		}
-
-		$this->list = $translations;
-	}
-
-	public function getList() {
-		return $this->list;
-	}
-
-	private function checkValidLangFile($file) {
-		@include($file);
-		$info = get_defined_vars();
-
-		if (!isset($info["L"])) {
-			return false;
-		}
-		if (!isset($info["L"]["language"])) {
-			return false;
-		}
-		if (!isset($info["L"]["ENABLED"]) || $info["L"]["ENABLED"] !== true) {
-			return false;
-		}
-
-		return $info["L"]["language"];
-	}
-}
diff --git a/resources/classes/Utils.class.php b/resources/classes/Utils.class.php
deleted file mode 100644
index 9fe8f5df3..000000000
--- a/resources/classes/Utils.class.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-
-/**
- * Utility functions for use throughout the script.
- * @author Ben Keen <ben.keen@gmail.com>
- * @package Core
- */
-class Utils {
-
-	public static function cleanHash($hash) {
-		$cleanHash = $hash;
-		if (get_magic_quotes_gpc()) {
-			while (list($key, $value) = each($hash)) {
-				if (!is_array($value)) {
-					$cleanHash[$key] = stripslashes($value);
-				} else {
-					$cleanArray = array();
-					foreach ($value as $val) {
-						$cleanArray[] = stripslashes($val);
-					}
-					$cleanHash[$key] = $cleanArray;
-				}
-			}
-		}
-		return $cleanHash;
-	}
-
-
-	/**
-	 * A generic assertion function used to confirm the existence of things like the existence of values in $_POST,
-	 * $_GET, $_SESSIONS, whether the user is logged in and so on. If it fails anything, it throws a GDException,
-	 * otherwise it does nothing.
-	 * @param $statements
-	 * @throws GDException
-	 */
-	public static function assert($statements) {
-		if (empty($statements)) {
-			return;
-		}
-
-		 while (list($test, $values) = each($statements)) {
-			 switch ($test) {
-				 case "loggedIn":
-					if (empty(Core::$user)) {
-						throw new GDException(Exceptions::NOTLOGGEDIN);
-						return;
-					}
-					 break;
-
-				 case "noSettingsFile":
-					 $settingsFileAndPath = realpath(__DIR__ . "/../settings.php");
-					 $settingsFileExists = file_exists($settingsFileAndPath);
-					if ($values === true && $settingsFileExists) {
-						throw new GDException(Exceptions::SETTINGSFILEEXISTS);
-					}
-					 break;
-			 }
-		}
-	}
-
-
-	/**
-	 * Recursively sanitizes data stored in any non-object data format, preparing it
-	 * for safe use in SQL statements.
-	 */
-	public static function sanitize($input) {
-		if (is_array($input)) {
-			$output = array();
-			foreach ($input as $k=>$i) {
-				$output[$k] = Utils::sanitize($i);
-			}
-		} else {
-			if (get_magic_quotes_gpc()) {
-				$output = stripslashes($input);
-			} else {
-				$output = $input;
-			}
-		}
-
-		return $output;
-	}
-
-
-	/**
-	 * Returns a random subset of an array. The result may be empty, or the same set.
-	 *
-	 * @param array $set set of items
-	 * @param integer $num the number of items in the set to return
-	 * @return array
-	 * @throws Exception
-	 */
-	public static function returnRandomSubset($set, $num) {
-		if (!is_array($set) || !is_numeric($num)) {
-			throw new Exception(ErrorCodes::INVALID_PARAMS);
-			return;
-		}
-		// check $num is no greater than the total set
-		if ($num > count($set)) {
-			$num = count($set);
-		}
-		shuffle($set);
-		return array_slice($set, 0, $num);
-	}
-
-	/**
-	 * Converts a datetime to a timestamp.
-	 * @param $datetime
-	 * @return int
-	 */
-	public static function convertDatetimeToTimestamp($datetime) {
-		list($date, $time) = explode(" ", $datetime);
-		list($year, $month, $day) = explode("-", $date);
-		list($hours, $minutes, $seconds) = explode(":", $time);
-		return mktime($hours, $minutes, $seconds, $month, $day, $year);
-	}
-
-	/**
-	 * @return string
-	 */
-	public static function getCurrentDatetime() {
-		return date("Y-m-d H:i:s");
-	}
-
-	/**
-	 * Adds years to a MySQL datetime & returns a UNIX timestamp of the new date
-	 */
-	public static function addYearsToDatetime($datetime, $yearsToAdd) {
-		list($date, $time) = explode(" ", $datetime);
-		list($year, $month, $day) = explode("-", $date);
-		list($hours, $minutes, $seconds) = explode(":", $time);
-		return mktime($hours, $minutes, $seconds, $month, $day, $year+$yearsToAdd);
-	}
-
-	/**
-	 * This function is like rand, only allows it to be weighted.
-	 *
-	 * @param $weightedValues
-	 * @return int|string
-	 */
-	public static function weightedRand($weightedValues) {
-		$rand = mt_rand(1, (int) array_sum($weightedValues));
-		foreach ($weightedValues as $key => $value) {
-			$rand -= $value;
-			if ($rand <= 0) {
-				return $key;
-			}
-		}
-	}
-
-	/**
-	 * A security-related function. This returns a clean version of PHP_SELF for use in the templates. This wards
-	 * against URI Cross-site scripting attacks.
-	 *
-	 * @return the cleaned $_SERVER["PHP_SELF"]
-	 */
-	public static function getCleanPhpSelf() {
-		return htmlspecialchars(strip_tags($_SERVER['PHP_SELF']), ENT_QUOTES);
-	}
-
-	/**
-	 * Converts the following characters in the parameter string and returns it:
-	 *
-	 *     C, c, A - any consonant (Upper case, lower case, any)
-	 *     V, v, B - any vowel (Upper case, lower case, any)
-	 *     L, l, D - any letter (Upper case, lower case, any)
-	 *     X       - 1-9
-	 *     x       - 0-9
-	 *     H       - 0-F
-	 *
-	 * @param string
-	 * @return string
-	 */
-	static public function generateRandomAlphanumericStr($str) {
-		$letters    = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-		$consonants = "BCDFGHJKLMNPQRSTVWXYZ";
-		$vowels     = "AEIOU";
-		$hex        = "0123456789ABCDEF";
-
-		// loop through each character and convert all unescaped X's to 1-9 and
-		// unescaped x's to 0-9.
-		$new_str = "";
-		for ($i=0; $i<strlen($str); $i++) {
-			switch ($str[$i]) {
-				// Numbers
-				case "X": $new_str .= mt_rand(1,9);  break;
-				case "x": $new_str .= mt_rand(0,9);  break;
-
-				// Letters
-				case "L": $new_str .= $letters[mt_rand(0, strlen($letters)-1)]; break;
-				case "l": $new_str .= strtolower($letters[mt_rand(0, strlen($letters)-1)]); break;
-				case "D":
-					$bool = mt_rand()&1;
-					if ($bool) {
-						$new_str .= $letters[mt_rand(0, strlen($letters)-1)];
-					} else {
-						$new_str .= strtolower($letters[mt_rand(0, strlen($letters)-1)]);
-					}
-					break;
-
-				// Consonants
-				case "C": $new_str .= $consonants[mt_rand(0, strlen($consonants)-1)];      break;
-				case "c": $new_str .= strtolower($consonants[mt_rand(0, strlen($consonants)-1)]);  break;
-				case "E":
-					$bool = mt_rand()&1;
-					if ($bool) {
-						$new_str .= $consonants[mt_rand(0, strlen($consonants)-1)];
-					} else {
-						$new_str .= strtolower($consonants[mt_rand(0, strlen($consonants)-1)]);
-					}
-					break;
-
-				// Vowels
-				case "V": $new_str .= $vowels[mt_rand(0, strlen($vowels)-1)];  break;
-				case "v": $new_str .= strtolower($vowels[mt_rand(0, strlen($vowels)-1)]);  break;
-				case "F":
-					$bool = mt_rand()&1;
-					if ($bool) {
-						$new_str .= $vowels[mt_rand(0, strlen($vowels)-1)];
-					} else {
-						$new_str .= strtolower($vowels[mt_rand(0, strlen($vowels)-1)]);
-					}
-					break;
-
-				case "H":
-					$new_str .= $hex[mt_rand(0, strlen($hex)-1)];
-					break;
-
-				default:
-					$new_str .= $str[$i];
-					break;
-			}
-		}
-
-		return trim($new_str);
-	}
-
-
-	/**
-	 * Returns an array of lorem ipsum words. Assumes that a file exists in a misc/ subfolder called
-	 * loremipsum.txt, containing lorem ipsum text.
-	 *
-	 * TODO this seems a good candidate to memoize... (no kidding, yikes!)
-	 *
-	 * @return array a large array of words
-	 */
-	public static function getLipsum() {
-		$prefix = Core::getDbTablePrefix();
-
-		// grab all the words in the text files & put them in an array (1 word per index)
-		$response = Core::$db->query("
-			SELECT *
-			FROM {$prefix}settings
-			WHERE setting_name = 'lipsum'
-		");
-
-		if ($response["success"]) {
-			$info = mysqli_fetch_assoc($response["results"]);
-			$words = preg_split("/\s+/", $info["setting_value"]);
-			return $words;
-		}
-	}
-
-
-	/**
-	 * Generates a string of lorem ipsum words.
-	 *
-	 * @param string $starts_with_lipsum  - true/false
-	 * @param string $type                - "fixed"/"range"
-	 * @param integer $min     - the minimum # of words to return OR the total number
-	 * @param integer $max     - the max # of words to return (or null for "fixed" type)
-	 */
-	public static function generateRandomTextStr($words, $startsWithLipsum, $type, $min, $max = "") {
-		// determine the number of words to return
-		$index = 0;
-		if ($type == "fixed") {
-			$numWords = $min;
-		} else if ($type == "range") {
-			$numWords = mt_rand($min, $max);
-		}
-
-		if ($numWords > count($words)) {
-			$numWords = count($words);
-		}
-
-		// determine the offset
-		$offset = 0;
-		if (!$startsWithLipsum) {
-			$offset = mt_rand(2, count($words) - ($numWords + 1));
-		}
-		$wordArray = array_slice($words, $offset, $numWords);
-
-		return join(" ", $wordArray);
-	}
-
-
-	/**
-	 * Converts all x's and X's in a string with a random digit. X's: 1-9, x's: 0-9.
-	 */
-	public static function generateRandomNumStr($str) {
-		// loop through each character and convert all unescaped X's to 1-9 and unescaped x's to 0-9.
-		$new_str = "";
-		for ($i=0; $i<strlen($str); $i++) {
-			if ($str[$i] == '\\' && ($str[$i+1] == "X" || $str[$i+1] == "x")) {
-				continue;
-			} else if ($str[$i] == "X") {
-				if ($i != 0 && ($str[$i-1] == '\\')) {
-					$new_str .= "X";
-				} else {
-					$new_str .= mt_rand(1,9);
-				}
-			} else if ($str[$i] == "x") {
-				if ($i != 0 && ($str[$i-1] == '\\')) {
-					$new_str .= "x";
-				} else {
-					$new_str .= mt_rand(0,9);
-				}
-			} else {
-				$new_str .= $str[$i];
-			}
-		}
-
-		return trim($new_str);
-	}
-
-
-	public static function maybeShowInstallationPage() {
-		if (!Core::checkIsInstalled()) {
-			$query_string = (isset($_GET["source"]) && in_array($_GET["source"], array("fromerrorpage"))) ?
-				"?source={$_GET["source"]}" : "";
-
-			header("location: install.php{$query_string}");
-			exit;
-		}
-	}
-
-	public static function enquoteArray($arr, $char = "\"") {
-		$newArr = array();
-		foreach ($arr as $item) {
-			$newArr[] = "{$char}$item{$char}";
-		}
-		return $newArr;
-	}
-
-	public static function isHash($var) {
-		if (!is_array($var)) {
-			return false;
-		}
-		return array_keys($var) !== range(0, sizeof($var) - 1);
-	}
-
-	/**
-	 * A method to recursively encode an array (associative or indexed).
-	 * @param $array
-	 */
-	public static function utf8_encode_array($array) {
-
-		// if the parameter wasn't an array, explicitly return false
-		if (!is_array($array)) {
-			return false;
-		}
-
-		$resultArray = array();
-		foreach ($array as $key => $value) {
-			if (Utils::isHash($array)) {
-				if (is_array($value)) {
-					$resultArray[utf8_encode($key)] = Utils::utf8_encode_array($value);
-				} else {
-					if (is_string($value)) {
-						$resultArray[utf8_encode($key)] = utf8_encode($value);
-					} else {
-						$resultArray[utf8_encode($key)] = $value;
-					}
-				}
-			} else {
-				if (is_array($value)) {
-					$resultArray[$key] = Utils::utf8_encode_array($value);
-				} else {
-					if (is_string($value)) {
-						$resultArray[$key] = utf8_encode($value);
-					} else {
-						$resultArray[$key] = $value;
-					}
-				}
-			}
-		}
-		return $resultArray;
-	}
-}
diff --git a/resources/classes/index.html b/resources/classes/index.html
deleted file mode 100644
index aa7b9c934..000000000
--- a/resources/classes/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-</body>
-</html>
\ No newline at end of file
diff --git a/resources/css/chosen/chosen-sprite.png b/resources/css/chosen/chosen-sprite.png
deleted file mode 100644
index 113dc9885..000000000
Binary files a/resources/css/chosen/chosen-sprite.png and /dev/null differ
diff --git a/resources/css/chosen/chosen.css b/resources/css/chosen/chosen.css
deleted file mode 100644
index 30fa359c7..000000000
--- a/resources/css/chosen/chosen.css
+++ /dev/null
@@ -1,397 +0,0 @@
-/* @group Base */
-.chzn-container {
-  font-size: 13px;
-  position: relative;
-  display: inline-block;
-  zoom: 1;
-  *display: inline;
-}
-.chzn-container .chzn-drop {
-  background: #fff;
-  border: 1px solid #aaa;
-  border-top: 0;
-  position: absolute;
-  top: 29px;
-  left: 0;
-  -webkit-box-shadow: 0 4px 5px rgba(0,0,0,.15);
-  -moz-box-shadow   : 0 4px 5px rgba(0,0,0,.15);
-  box-shadow        : 0 4px 5px rgba(0,0,0,.15);
-  z-index: 1010;
-}
-/* @end */
-
-/* @group Single Chosen */
-.chzn-container-single .chzn-single {
-  background-color: #ffffff;
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0 );
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
-  background-image: -webkit-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background-image: -moz-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background-image: -o-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background-image: linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  -webkit-border-radius: 5px;
-  -moz-border-radius   : 5px;
-  border-radius        : 5px;
-  -moz-background-clip: padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-  border: 1px solid #aaaaaa;
-  -webkit-box-shadow: 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
-  -moz-box-shadow   : 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
-  box-shadow        : 0 0 3px #ffffff inset, 0 1px 1px rgba(0,0,0,0.1);
-  display: block;
-  overflow: hidden;
-  white-space: nowrap;
-  position: relative;
-  height: 23px;
-  line-height: 24px;
-  padding: 0 0 0 8px;
-  color: #444444;
-  text-decoration: none;
-}
-.chzn-container-single .chzn-default {
-  color: #999;
-}
-.chzn-container-single .chzn-single span {
-  margin-right: 26px;
-  display: block;
-  overflow: hidden;
-  white-space: nowrap;
-  -o-text-overflow: ellipsis;
-  -ms-text-overflow: ellipsis;
-  text-overflow: ellipsis;
-}
-.chzn-container-single .chzn-single abbr {
-  display: block;
-  position: absolute;
-  right: 26px;
-  top: 6px;
-  width: 12px;
-  height: 13px;
-  font-size: 1px;
-  background: url('chosen-sprite.png') right top no-repeat;
-}
-.chzn-container-single .chzn-single abbr:hover {
-  background-position: right -11px;
-}
-.chzn-container-single.chzn-disabled .chzn-single abbr:hover {
-  background-position: right top;
-}
-.chzn-container-single .chzn-single div {
-  position: absolute;
-  right: 0;
-  top: 0;
-  display: block;
-  height: 100%;
-  width: 18px;
-}
-.chzn-container-single .chzn-single div b {
-  background: url('chosen-sprite.png') no-repeat 0 0;
-  display: block;
-  width: 100%;
-  height: 100%;
-}
-.chzn-container-single .chzn-search {
-  padding: 3px 4px;
-  position: relative;
-  margin: 0;
-  white-space: nowrap;
-  z-index: 1010;
-}
-.chzn-container-single .chzn-search input {
-  background: #fff url('chosen-sprite.png') no-repeat 100% -22px;
-  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-gradient(linear, 0 0, 0 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
-  background: url('chosen-sprite.png') no-repeat 100% -22px, -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
-  background: url('chosen-sprite.png') no-repeat 100% -22px, -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
-  background: url('chosen-sprite.png') no-repeat 100% -22px, -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
-  background: url('chosen-sprite.png') no-repeat 100% -22px, linear-gradient(#eeeeee 1%, #ffffff 15%);
-  margin: 1px 0;
-  padding: 4px 20px 4px 5px;
-  outline: 0;
-  border: 1px solid #aaa;
-  font-family: sans-serif;
-  font-size: 1em;
-}
-.chzn-container-single .chzn-drop {
-  -webkit-border-radius: 0 0 4px 4px;
-  -moz-border-radius   : 0 0 4px 4px;
-  border-radius        : 0 0 4px 4px;
-  -moz-background-clip   : padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-}
-/* @end */
-
-.chzn-container-single-nosearch .chzn-search input {
-  position: absolute;
-  left: -9000px;
-}
-
-/* @group Multi Chosen */
-.chzn-container-multi .chzn-choices {
-  background-color: #fff;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
-  background-image: -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
-  background-image: -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
-  background-image: -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
-  background-image: linear-gradient(#eeeeee 1%, #ffffff 15%);
-  border: 1px solid #aaa;
-  margin: 0;
-  padding: 0;
-  cursor: text;
-  overflow: hidden;
-  height: auto !important;
-  height: 1%;
-  position: relative;
-}
-.chzn-container-multi .chzn-choices li {
-  float: left;
-  list-style: none;
-}
-.chzn-container-multi .chzn-choices .search-field {
-  white-space: nowrap;
-  margin: 0;
-  padding: 0;
-}
-.chzn-container-multi .chzn-choices .search-field input {
-  color: #666;
-  background: transparent !important;
-  border: 0 !important;
-  font-family: sans-serif;
-  font-size: 100%;
-  height: 15px;
-  padding: 5px;
-  margin: 1px 0;
-  outline: 0;
-  -webkit-box-shadow: none;
-  -moz-box-shadow   : none;
-  box-shadow        : none;
-}
-.chzn-container-multi .chzn-choices .search-field .default {
-  color: #999;
-}
-.chzn-container-multi .chzn-choices .search-choice {
-  -webkit-border-radius: 3px;
-  -moz-border-radius   : 3px;
-  border-radius        : 3px;
-  -moz-background-clip   : padding;
-  -webkit-background-clip: padding-box;
-  background-clip        : padding-box;
-  background-color: #e4e4e4;
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#eeeeee', GradientType=0 );
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
-  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  -webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
-  -moz-box-shadow   : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
-  box-shadow        : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
-  color: #333;
-  border: 1px solid #aaaaaa;
-  line-height: 13px;
-  padding: 3px 20px 3px 5px;
-  margin: 3px 0 3px 5px;
-  position: relative;
-  cursor: default;
-}
-.chzn-container-multi .chzn-choices .search-choice.search-choice-disabled {
-  background-color: #e4e4e4;
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#eeeeee', GradientType=0 );
-  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
-  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -ms-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  color: #666;
-  border: 1px solid #cccccc;
-  padding-right: 5px;
-}
-.chzn-container-multi .chzn-choices .search-choice-focus {
-  background: #d4d4d4;
-}
-.chzn-container-multi .chzn-choices .search-choice .search-choice-close {
-  display: block;
-  position: absolute;
-  right: 3px;
-  top: 4px;
-  width: 12px;
-  height: 13px;
-  font-size: 1px;
-  background: url('chosen-sprite.png') right top no-repeat;
-}
-.chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
-  background-position: right -11px;
-}
-.chzn-container-multi .chzn-choices .search-choice-focus .search-choice-close {
-  background-position: right -11px;
-}
-/* @end */
-
-/* @group Results */
-.chzn-container .chzn-results {
-  margin: 0 4px 4px 0;
-  max-height: 240px;
-  padding: 0 0 0 4px;
-  position: relative;
-  overflow-x: hidden;
-  overflow-y: auto;
-  -webkit-overflow-scrolling: touch;
-}
-.chzn-container-multi .chzn-results {
-  margin: -1px 0 0;
-  padding: 0;
-}
-.chzn-container .chzn-results li {
-  display: none;
-  line-height: 15px;
-  padding: 5px 6px;
-  margin: 0;
-  list-style: none;
-}
-.chzn-container .chzn-results .active-result {
-  cursor: pointer;
-  display: list-item;
-}
-.chzn-container .chzn-results .highlighted {
-  background-color: #3875d7;
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3875d7', endColorstr='#2a62bc', GradientType=0 );
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc));
-  background-image: -webkit-linear-gradient(top, #3875d7 20%, #2a62bc 90%);
-  background-image: -moz-linear-gradient(top, #3875d7 20%, #2a62bc 90%);
-  background-image: -o-linear-gradient(top, #3875d7 20%, #2a62bc 90%);
-  background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
-  color: #fff;
-}
-.chzn-container .chzn-results li em {
-  background: #feffde;
-  font-style: normal;
-}
-.chzn-container .chzn-results .highlighted em {
-  background: transparent;
-}
-.chzn-container .chzn-results .no-results {
-  background: #f4f4f4;
-  display: list-item;
-}
-.chzn-container .chzn-results .group-result {
-  cursor: default;
-  color: #999;
-  font-weight: bold;
-}
-.chzn-container .chzn-results .group-option {
-  padding-left: 15px;
-}
-.chzn-container-multi .chzn-drop .result-selected {
-  display: none;
-}
-.chzn-container .chzn-results-scroll {
-  background: white;
-  margin: 0 4px;
-  position: absolute;
-  text-align: center;
-  width: 321px; /* This should by dynamic with js */
-  z-index: 1;
-}
-.chzn-container .chzn-results-scroll span {
-  display: inline-block;
-  height: 17px;
-  text-indent: -5000px;
-  width: 9px;
-}
-.chzn-container .chzn-results-scroll-down {
-  bottom: 0;
-}
-.chzn-container .chzn-results-scroll-down span {
-  background: url('chosen-sprite.png') no-repeat -4px -3px;
-}
-.chzn-container .chzn-results-scroll-up span {
-  background: url('chosen-sprite.png') no-repeat -22px -3px;
-}
-/* @end */
-
-/* @group Active  */
-.chzn-container-active .chzn-single {
-  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
-  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
-  box-shadow        : 0 0 5px rgba(0,0,0,.3);
-  border: 1px solid #5897fb;
-}
-.chzn-container-active .chzn-single-with-drop {
-  border: 1px solid #aaa;
-  -webkit-box-shadow: 0 1px 0 #fff inset;
-  -moz-box-shadow   : 0 1px 0 #fff inset;
-  box-shadow        : 0 1px 0 #fff inset;
-  background-color: #eee;
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0 );
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, color-stop(20%, #eeeeee), color-stop(80%, #ffffff));
-  background-image: -webkit-linear-gradient(top, #eeeeee 20%, #ffffff 80%);
-  background-image: -moz-linear-gradient(top, #eeeeee 20%, #ffffff 80%);
-  background-image: -o-linear-gradient(top, #eeeeee 20%, #ffffff 80%);
-  background-image: linear-gradient(#eeeeee 20%, #ffffff 80%);
-  -webkit-border-bottom-left-radius : 0;
-  -webkit-border-bottom-right-radius: 0;
-  -moz-border-radius-bottomleft : 0;
-  -moz-border-radius-bottomright: 0;
-  border-bottom-left-radius : 0;
-  border-bottom-right-radius: 0;
-}
-.chzn-container-active .chzn-single-with-drop div {
-  background: transparent;
-  border-left: none;
-}
-.chzn-container-active .chzn-single-with-drop div b {
-  background-position: -18px 1px;
-}
-.chzn-container-active .chzn-choices {
-  -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
-  -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
-  box-shadow        : 0 0 5px rgba(0,0,0,.3);
-  border: 1px solid #5897fb;
-}
-.chzn-container-active .chzn-choices .search-field input {
-  color: #111 !important;
-}
-/* @end */
-
-/* @group Disabled Support */
-.chzn-disabled {
-  cursor: default;
-  opacity:0.5 !important;
-}
-.chzn-disabled .chzn-single {
-  cursor: default;
-}
-.chzn-disabled .chzn-choices .search-choice .search-choice-close {
-  cursor: default;
-}
-
-/* @group Right to Left */
-.chzn-rtl { text-align: right; }
-.chzn-rtl .chzn-single { padding: 0 8px 0 0; overflow: visible; }
-.chzn-rtl .chzn-single span { margin-left: 26px; margin-right: 0; direction: rtl; }
-
-.chzn-rtl .chzn-single div { left: 3px; right: auto; }
-.chzn-rtl .chzn-single abbr {
-  left: 26px;
-  right: auto;
-}
-.chzn-rtl .chzn-choices .search-field input { direction: rtl; }
-.chzn-rtl .chzn-choices li { float: right; }
-.chzn-rtl .chzn-choices .search-choice { padding: 3px 5px 3px 19px; margin: 3px 5px 3px 0; }
-.chzn-rtl .chzn-choices .search-choice .search-choice-close { left: 4px; right: auto; background-position: right top;}
-.chzn-rtl.chzn-container-single .chzn-results { margin: 0 0 4px 4px; padding: 0 4px 0 0; }
-.chzn-rtl .chzn-results .group-option { padding-left: 0; padding-right: 15px; }
-.chzn-rtl.chzn-container-active .chzn-single-with-drop div { border-right: none; }
-.chzn-rtl .chzn-search input {
-  background: #fff url('chosen-sprite.png') no-repeat -38px -22px;
-  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-gradient(linear, 0 0, 0 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
-  background: url('chosen-sprite.png') no-repeat -38px -22px, -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
-  background: url('chosen-sprite.png') no-repeat -38px -22px, -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
-  background: url('chosen-sprite.png') no-repeat -38px -22px, -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
-  background: url('chosen-sprite.png') no-repeat -38px -22px, linear-gradient(#eeeeee 1%, #ffffff 15%);
-  padding: 4px 5px 4px 20px;
-  direction: rtl;
-}
-/* @end */
diff --git a/resources/css/filters.svg b/resources/css/filters.svg
deleted file mode 100644
index 6d36050fd..000000000
--- a/resources/css/filters.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" baseProfile="full" xmlns="http://www.w3.org/2000/svg">
-	<filter id="grayscale">
-		<feColorMatrix type="matrix" values="0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0"/>
-	</filter>
-</svg>
\ No newline at end of file
diff --git a/resources/css/index.html b/resources/css/index.html
deleted file mode 100644
index 170718246..000000000
--- a/resources/css/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head></head><body></body></html>
\ No newline at end of file
diff --git a/resources/css/smoothness/images/index.html b/resources/css/smoothness/images/index.html
deleted file mode 100644
index aa7b9c934..000000000
--- a/resources/css/smoothness/images/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-</body>
-</html>
\ No newline at end of file
diff --git a/resources/css/smoothness/images/ui-bg_flat_0_333333_40x100.png b/resources/css/smoothness/images/ui-bg_flat_0_333333_40x100.png
deleted file mode 100644
index 2f2c7a45b..000000000
Binary files a/resources/css/smoothness/images/ui-bg_flat_0_333333_40x100.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/resources/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
deleted file mode 100755
index 5b5dab2ab..000000000
Binary files a/resources/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/resources/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
deleted file mode 100755
index ac8b229af..000000000
Binary files a/resources/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/resources/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100755
index ad3d6346e..000000000
Binary files a/resources/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/resources/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100755
index 42ccba269..000000000
Binary files a/resources/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/resources/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100755
index 5a46b47cb..000000000
Binary files a/resources/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/resources/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100755
index 86c2baa65..000000000
Binary files a/resources/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/resources/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100755
index 8f28bc99c..000000000
Binary files a/resources/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/resources/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted file mode 100755
index 7c9fa6c6e..000000000
Binary files a/resources/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-icons_222222_256x240.png b/resources/css/smoothness/images/ui-icons_222222_256x240.png
deleted file mode 100755
index b273ff111..000000000
Binary files a/resources/css/smoothness/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-icons_2e83ff_256x240.png b/resources/css/smoothness/images/ui-icons_2e83ff_256x240.png
deleted file mode 100755
index 09d1cdc85..000000000
Binary files a/resources/css/smoothness/images/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-icons_454545_256x240.png b/resources/css/smoothness/images/ui-icons_454545_256x240.png
deleted file mode 100755
index 59bd45b90..000000000
Binary files a/resources/css/smoothness/images/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-icons_888888_256x240.png b/resources/css/smoothness/images/ui-icons_888888_256x240.png
deleted file mode 100755
index 6d02426c1..000000000
Binary files a/resources/css/smoothness/images/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/resources/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/resources/css/smoothness/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100755
index 2ab019b73..000000000
Binary files a/resources/css/smoothness/images/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/resources/css/smoothness/index.html b/resources/css/smoothness/index.html
deleted file mode 100644
index aa7b9c934..000000000
--- a/resources/css/smoothness/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-</body>
-</html>
\ No newline at end of file
diff --git a/resources/css/smoothness/jquery-ui-1.8.23.custom.css b/resources/css/smoothness/jquery-ui-1.8.23.custom.css
deleted file mode 100755
index bba3f78f1..000000000
--- a/resources/css/smoothness/jquery-ui-1.8.23.custom.css
+++ /dev/null
@@ -1,565 +0,0 @@
-/*!
- * jQuery UI CSS Framework 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*!
- * jQuery UI CSS Framework 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-.ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
-.ui-widget-header a { color: #222222; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
-
-/*!
- * jQuery UI Resizable 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*!
- * jQuery UI Selectable 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*!
- * jQuery UI Accordion 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion#theming
- */
-/* IE/Win - Fix animation bug - #4615 */
-.ui-accordion { width: 100%; }
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
-/*!
- * jQuery UI Autocomplete 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete#theming
- */
-.ui-autocomplete { position: absolute; cursor: default; }
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-
-/*
- * jQuery UI Menu 1.8.23
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
-	list-style:none;
-	padding: 2px;
-	margin: 0;
-	display:block;
-	float: left;
-}
-.ui-menu .ui-menu {
-	margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
-	margin:0;
-	padding: 0;
-	zoom: 1;
-	float: left;
-	clear: left;
-	width: 100%;
-}
-.ui-menu .ui-menu-item a {
-	text-decoration:none;
-	display:block;
-	padding:.2em .4em;
-	line-height:1.5;
-	zoom:1;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
-}
-/*!
- * jQuery UI Button 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button#theming
- */
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; }
-button.ui-button-icons-only { width: 3.7em; }
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4;  }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-/*!
- * jQuery UI Dialog 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog#theming
- */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/*!
- * jQuery UI Slider 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/*!
- * jQuery UI Tabs 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs#theming
- */
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
-/*!
- * jQuery UI Datepicker 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/*!
- * jQuery UI Progressbar 1.8.23
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
diff --git a/resources/css/smoothness/jquery-ui.min.css b/resources/css/smoothness/jquery-ui.min.css
deleted file mode 100755
index 4efa97729..000000000
--- a/resources/css/smoothness/jquery-ui.min.css
+++ /dev/null
@@ -1,462 +0,0 @@
-/*! jQuery UI - v1.9.2 - 2012-12-26
-* http://jqueryui.com
-* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-* Copyright (c) 2012 jQuery Foundation and other contributors Licensed MIT */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-.ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; }
-.ui-accordion .ui-accordion-icons { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-noicons { padding-left: .7em; }
-.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; overflow: auto; zoom: 1; }
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
-.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; }
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; } 
-button.ui-button-icons-only { width: 3.7em; } 
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4;  }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-.ui-menu { list-style:none; padding: 2px; margin: 0; display:block; outline: none; }
-.ui-menu .ui-menu { margin-top: -3px; position: absolute; }
-.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%; }
-.ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; }
-.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; }
-.ui-menu .ui-menu-item a.ui-state-focus,
-.ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; }
-
-.ui-menu .ui-state-disabled { font-weight: normal; margin: .4em 0 .2em; line-height: 1.5; }
-.ui-menu .ui-state-disabled a { cursor: default; }
-
-/* icon support */
-.ui-menu-icons { position: relative; }
-.ui-menu-icons .ui-menu-item a { position: relative; padding-left: 2em; }
-
-/* left-aligned */
-.ui-menu .ui-icon { position: absolute; top: .2em; left: .2em; }
-
-/* right-aligned */
-.ui-menu .ui-menu-icon { position: static; float: right; }
-.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; }
-.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; }
-.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; text-align: center; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; }
-.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */
-.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */
-.ui-spinner-up { top: 0; }
-.ui-spinner-down { bottom: 0; }
-
-/* TR overrides */
-.ui-spinner .ui-icon-triangle-1-s {
-	/* need to fix icons sprite */
-	background-position:-65px -16px;
-}
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 0; margin: 1px .2em 0 0; border-bottom: 0; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: -1px; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-tabs-loading a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
-.ui-tooltip {
-	padding: 8px;
-	position: absolute;
-	z-index: 9999;
-	max-width: 300px;
-	-webkit-box-shadow: 0 0 5px #aaa;
-	box-shadow: 0 0 5px #aaa;
-}
-/* Fades and background-images don't work well together in IE6, drop the image */
-* html .ui-tooltip {
-	background-image: none;
-}
-body .ui-tooltip { border-width: 2px; }
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-.ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
-.ui-widget-header a { color: #222222; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-.ui-state-disabled .ui-icon { filter:Alpha(Opacity=35); } /* For IE8 - See #6059 */
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
\ No newline at end of file
diff --git a/resources/css/tablesorter.theme.css b/resources/css/tablesorter.theme.css
deleted file mode 100644
index 36c7f4f4d..000000000
--- a/resources/css/tablesorter.theme.css
+++ /dev/null
@@ -1,177 +0,0 @@
-/*************
-Default Theme
-*************/
-/* overall */
-.tablesorter-default {
-	width: 100%;
-	font: 12px/18px Arial, Sans-serif;
-	color: #333;
-	background-color: #fff;
-	border-spacing: 0;
-	margin: 10px 0 15px;
-	text-align: left;
-}
-
-/* header */
-.tablesorter-default th,
-.tablesorter-default thead td {
-	font: bold 12px/18px Arial, Sans-serif;
-	color: #000;
-	background-color: #fff;
-	border-collapse: collapse;
-	border-bottom: 1px solid #999999;
-	padding: 0;
-}
-.tablesorter-default tfoot th,
-.tablesorter-default tfoot td {
-	border: 0;
-}
-.tablesorter-default .header,
-.tablesorter-default .tablesorter-header {
-	background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==);
-	background-position: center right;
-	background-repeat: no-repeat;
-	cursor: pointer;
-	white-space: normal;
-	padding: 4px 20px 4px 4px;
-}
-.tablesorter-default thead .headerSortUp,
-.tablesorter-default thead .tablesorter-headerSortUp,
-.tablesorter-default thead .tablesorter-headerAsc {
-	background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7);
-	border-bottom: #000 2px solid;
-}
-.tablesorter-default thead .headerSortDown,
-.tablesorter-default thead .tablesorter-headerSortDown,
-.tablesorter-default thead .tablesorter-headerDesc {
-	background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7);
-	border-bottom: #000 2px solid;
-}
-.tablesorter-default thead .sorter-false {
-	background-image: none;
-	padding: 4px;
-}
-
-/* tfoot */
-.tablesorter-default tfoot .tablesorter-headerSortUp,
-.tablesorter-default tfoot .tablesorter-headerSortDown,
-.tablesorter-default tfoot .tablesorter-headerAsc,
-.tablesorter-default tfoot .tablesorter-headerDesc {
-	border-top: #000 2px solid;
-}
-
-/* tbody */
-.tablesorter-default td {
-	background-color: #fff;
-	border-bottom: #ccc 1px solid;
-	padding: 2px 4px;
-	vertical-align: top;
-}
-
-/* hovered row colors */
-.tablesorter-default tbody > tr:hover > td,
-.tablesorter-default tbody > tr.even:hover > td,
-.tablesorter-default tbody > tr.odd:hover > td {
-	background: #fff;
-	color: #000;
-}
-
-/* table processing indicator */
-.tablesorter-default .tablesorter-processing {
-	background-position: center center !important;
-	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
-	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
-}
-
-/* Zebra Widget - row alternating colors */
-.tablesorter-default tr.odd td {
-	background-color: #f2f2f2;
-}
-.tablesorter-default tr.even td {
-	background-color: #ffffff;
-}
-
-/* Column Widget - column sort colors */
-.tablesorter-default tr.odd td.primary {
-	background-color: #EAFFE6;
-}
-.tablesorter-default td.primary,
-.tablesorter-default tr.even td.primary {
-	background-color: #e8f2e6;
-}
-.tablesorter-default tr.odd td.secondary {
-	background-color: #e8f2e6;
-}
-.tablesorter-default td.secondary,
-.tablesorter-default tr.even td.secondary {
-	background-color: #e6e6e6;
-}
-.tablesorter-default tr.odd td.tertiary {
-	background-color: #e6e6e6;
-}
-.tablesorter-default td.tertiary,
-.tablesorter-default tr.even td.tertiary {
-	background-color: #f2f2f2;
-}
-
-/* caption */
-caption {
-	background: #fff;
-}
-
-/* filter widget */
-.tablesorter-default .tablesorter-filter-row td {
-	background: #eee;
-	border-bottom: #ccc 1px solid;
-	line-height: normal;
-	text-align: center; /* center the input */
-	-webkit-transition: line-height 0.1s ease;
-	-moz-transition: line-height 0.1s ease;
-	-o-transition: line-height 0.1s ease;
-	transition: line-height 0.1s ease;
-}
-/* optional disabled input styling */
-.tablesorter-default .tablesorter-filter-row .disabled {
-	opacity: 0.5;
-	filter: alpha(opacity=50);
-	cursor: not-allowed;
-}
-/* hidden filter row */
-.tablesorter-default .tablesorter-filter-row.hideme td {
-	/*** *********************************************** ***/
-	/*** change this padding to modify the thickness     ***/
-	/*** of the closed filter row (height = padding x 2) ***/
-	padding: 2px;
-	/*** *********************************************** ***/
-	margin: 0;
-	line-height: 0;
-	cursor: pointer;
-}
-.tablesorter-default .tablesorter-filter-row.hideme .tablesorter-filter {
-	height: 1px;
-	min-height: 0;
-	border: 0;
-	padding: 0;
-	margin: 0;
-	/* don't use visibility: hidden because it disables tabbing */
-	opacity: 0;
-	filter: alpha(opacity=0);
-}
-/* filters */
-.tablesorter-default .tablesorter-filter {
-	width: 95%;
-	height: auto;
-	margin: 4px;
-	padding: 4px;
-	background-color: #fff;
-	border: 1px solid #bbb;
-	color: #333;
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-	-webkit-transition: height 0.1s ease;
-	-moz-transition: height 0.1s ease;
-	-o-transition: height 0.1s ease;
-	transition: height 0.1s ease;
-}
diff --git a/resources/index.html b/resources/index.html
deleted file mode 100644
index 42682b474..000000000
--- a/resources/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><body></body></html>
\ No newline at end of file
diff --git a/resources/lang/de.php b/resources/lang/de.php
deleted file mode 100644
index 0916c36e3..000000000
--- a/resources/lang/de.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-
-
-$L = array();
-$L["language"] = "Deutsch";
-$L["ENABLED"] = true;
-
-// Category: Core
-$L["a_few_links"] = "Ein paar Links";
-$L["about"] = "Über";
-$L["about_para1"] = "Manchmal braucht man gefälschte Daten für Dinge wie Prüfsoftware, bevölkern Datenbanken und Erstellung realistischer aussehende Mockups. Für Text, haben wir <i>Lorem ipsum</i>, aber für alles andere ...? Dieses Tool wurde geschrieben, um eine schnelle und einfache Möglichkeit, um Sie erzeugen große Mengen von benutzerdefinierten Daten in welchem ​​Format Sie benötigen.";
-$L["about_para2"] = "Die <b>generieren</b> Seite enthält das gesamte Skript: einfach in den verschiedenen Bereichen der Seite ausfüllen zu konstruieren die Daten legen Sie in interessiert sind, dann klicken Sie auf die Schaltfläche Erzeugen. Und schwupps! Einfach, oder?";
-$L["about_para3"] = "Das out-the-box-Skript enthält die Art von Funktionalität, die Sie benötigen im Allgemeinen. Aber nichts ist jemals komplett - vielleicht brauchen Sie, um zufällige esoterischen mathematischen Gleichungen zu erzeugen, ziehen zufällige Tweets oder anzuzeigen zufällige Bilder von Flickr mit dem Wort \"Red-backed Wühlmäuse\" in den Titel. Wer weiß. Jeder der Use-Case ist anders.";
-$L["about_para4"] = "Vor diesem Hintergrund wurde die neue Version des Skripts (3.0.0 +) entwickelt, um vollständig erweiterbar: Entwickler können ihre eigenen Datentypen zu schreiben, neue Arten von zufälligen Daten zu generieren, und sogar anpassen, die Export-Typen - also das Format, in dem die Daten ausgegeben werden. Für die Menschen in Erzeugung genauer lokalisierten geografischen Daten interessiert sind, können sie auch neue Land Plugins, die Bezeichnungen der Regionen (Länder, Provinzen, Territorien etc), Städtenamen und Post / zip-Formate liefern für ihr Land der Wahl.";
-$L["about_para5"] = "Für weitere Informationen darüber, wie sie zu verlängern, besuchen Sie die <a href=\"docs/\">Entwickler-Dokumentation</a>.";
-$L["about_title"] = "Was <i>ist</i> das Ding?";
-$L["account_created"] = "Nutzerprofil erstellt";
-$L["account_created_msg"] = "Ein Konto wurde für Sie erstellt.";
-$L["account_info"] = "Kundendaten";
-$L["account_settings"] = "Account-Einstellungen";
-$L["account_type"] = "Kontotyp";
-$L["account_updated"] = "Ihr Konto wurde aktualisiert.";
-$L["accounts"] = "Konten";
-$L["add"] = "Hinzufügen";
-$L["admin"] = "Admin";
-$L["admin_account"] = "Admin-Konto";
-$L["africa"] = "Afrika";
-$L["all_countries"] = "Alle Länder";
-$L["all_data_type_plugins"] = "Alle Daten Typ plugins";
-$L["all_export_type_plugins"] = "Alle Export Type Plugins";
-$L["anonymous_access"] = "Anonymer Zugriff";
-$L["anonymous_admin_account"] = "Anonymous Admin-Konto";
-$L["anonymous_user_default_message"] = "Bitte loggen Sie sich ein oder mailen someone@yoursite.com, um ein Benutzerkonto zu erhalten.";
-$L["anonymous_user_desc"] = "Anonyme Benutzer können das Skript aber nur begrenzten Zugang: Sie können nicht speichern, verknüpfen ihre Datensätze oder erzeugen mehr als 100 Zeilen zu einem Zeitpunkt.";
-$L["anonymous_user_message"] = "Nachricht an den anonymen Benutzern angezeigt, wenn sie versuchen zu sparen:";
-$L["asia"] = "Asien";
-$L["back"] = "Zurück";
-$L["blog"] = "Blog";
-$L["cancel"] = "kündigen";
-$L["cannot_change_num_rows"] = "Sorry, du bist nicht berechtigt, die Anzahl der generierten Zeilen zu ändern.";
-$L["central_america"] = "Zentralamerika";
-$L["check_database_info"] = "Überprüfen Database Info";
-$L["clear_the_page"] = "Deaktivieren Sie die Seite";
-$L["close"] = "Schließen";
-$L["complete_excl"] = "Fertig!";
-$L["confirm_delete_form"] = "Sind Sie sicher, dass Sie dieses Formular löschen?";
-$L["confirm_delete_user_account"] = "Sind Sie sicher, dass Sie dieses Benutzerkonto löschen?";
-$L["confirm_empty_form"] = "Sind Sie sicher, dass Sie die Seite löschen?";
-$L["confirm_file_exists"] = "Bestätigen Datei vorhanden";
-$L["continue_rightarrow"] = "Weiter »";
-$L["countries"] = "Länder";
-$L["country_specific_data"] = "Länderspezifische Daten";
-$L["create_account"] = "Konto erstellen";
-$L["create_account_rightarrow"] = "Konto erstellen »";
-$L["create_file_rightarrow"] = "Datei erstellen »";
-$L["create_settings_file"] = "Erstellen Settings File";
-$L["data_created"] = "Daten Erstellt";
-$L["data_format"] = "Data Format";
-$L["data_set"] = "Data Set";
-$L["data_set_help"] = "Dies ist, wo Sie genau, welche Art von Daten, die Sie erzeugen wollen definieren. Versuchen Sie füllen in einer Zeile oder zwei und klicken Sie auf die Schaltfläche Erzeugen. Du wirst den Dreh ziemlich schnell bekommen.";
-$L["data_set_name"] = "Data Set Namen";
-$L["data_type"] = "Datentyp";
-$L["data_types"] = "Datentypen";
-$L["database_info"] = "Database Info";
-$L["database_name"] = "Database Name";
-$L["date_account_created"] = "Datum Konto erstellt";
-$L["date_created"] = "Erstellungsdatum";
-$L["default_language"] = "Standard Sprache";
-$L["default_save_form_empty_str"] = "Geben Form name here";
-$L["del"] = "Del";
-$L["del_uc"] = "DEL";
-$L["delete"] = "Löschen";
-$L["delete_1_data_set"] = "Löschen Sie ein Data Set";
-$L["delete_N_data_sets"] = "Löschen %1 Datensätzen";
-$L["delete_account"] = "Account löschen";
-$L["developer"] = "Entwickler";
-$L["developer_doc"] = "Entwickler doc";
-$L["developer_intro"] = "In den folgenden Abschnitten können Sie die Feinabstimmung, was Sie in Ihrem JavaScript-Konsole zu sehen für Entwicklungszwecke.";
-$L["documentation"] = "Dokumentation";
-$L["donate"] = "Spenden!";
-$L["download"] = "Herunterladen";
-$L["edit"] = "Bearbeiten";
-$L["email"] = "E-Mail";
-$L["email_c"] = "E-Mail:";
-$L["email_not_sent"] = "Wir waren nicht in der Lage, um die E-Mail-Benachrichtigung zu senden.";
-$L["email_user_login_info"] = "E-Mail dem Nutzer ihre Login-Daten";
-$L["empty_form"] = "Leeres Formular";
-$L["enter_email_address_to_reset_password"] = "Geben Sie einfach Ihre E-Mail-Adresse ein, um Ihr Passwort zurückzusetzen.";
-$L["enter_user_account_details"] = "Bitte geben Sie Ihr Benutzerkonto Details unten.";
-$L["error"] = "Fehler";
-$L["europe"] = "Europa";
-$L["examples"] = "Beispiele";
-$L["export_type_validate_error"] = "Ack! Es gab einen Fehler in der Export Typ der validate ()-Funktion. Leider können wir nicht gehen - rufen Sie einen Entwickler!";
-$L["export_types"] = "Export-Typen";
-$L["export_types_help"] = "In diesem Abschnitt können Sie steuern das Format der generierten Daten. Jedes Format kann bieten verschiedene Optionen, um Ihnen maßgeschneiderte den Ausgang auf genau das, was Sie wollen.";
-$L["extend_id"] = "Erweitern";
-$L["extend_it"] = "Erweitern";
-$L["fatal_error"] = "Ein schwerwiegender Fehler ist aufgetreten.";
-$L["feature_enabled"] = "Aktiviert";
-$L["first_name"] = "Vorname";
-$L["forgot_password"] = "Passwort vergessen";
-$L["forgotten_your_password_q"] = "Passwort vergessen?";
-$L["fork_on_github"] = "Gabel den Code auf github";
-$L["fork_this_project_on_github"] = "Fork dieses Projekt auf Github";
-$L["form_deleted"] = "Die Form wurde gelöscht.";
-$L["form_exists_overwrite_confirmation"] = "Diese Form existiert bereits. Wollen Sie sie überschreiben?";
-$L["form_not_deleted"] = "Leider konnten wir nicht löschen dieses Formular. Re-log und versuchen es erneut.";
-$L["form_saved"] = "Ihr Formular wurde gespeichert.";
-$L["forums"] = "Foren";
-$L["generate"] = "Erzeugen";
-$L["generate_in_page"] = "Generieren in-page";
-$L["generated_X_of_Y_results"] = "Erstellt <span id=\"gdGenerateCount\"></span> <span id=\"gdGenerateTotal\"></span> Ergebnisse";
-$L["generator"] = "Generator";
-$L["geo"] = "Geo";
-$L["goto_script_rightarrow"] = "Zum script »";
-$L["goto_website"] = "Besuchen Sie die Website";
-$L["help"] = "Hilfe";
-$L["help_intro"] = "Das Installationsskript macht zwei Dinge für Sie. One, es generiert automatisch eine <b>settings.php</b>-Datei, die Ihre einzigartige Datenbank-Verbindung Informationen enthält, so dass es weiß, wie man mit der Datenbank verbinden, wenn Sie das Skript zu besuchen. Zwei, füllt sie die Datenbank mit verschiedenen Informationen, die er braucht: Dinge wie allgemeine Einstellungen, Benutzerkonten und Rohdaten, wie die Namen der Leute, Land und Stadt Namen.";
-$L["help_prereq_info"] = "Genau wie praktisch jeder anderen PHP / MySQL-Skript gibt, müssen Sie bereits erstellt haben eine Datenbank, bevor Sie das Installations-Skript. <i>Das Installationsskript nicht die Datenbank zu erstellen, es ist nur versucht, diesen zu verbinden, um die Tabellen zu erstellen.</i> Wenn Sie nicht sicher sind, wie Sie eine Datenbank in Ihrer Umgebung zu schaffen sind, werden Sie müssen entweder kontaktieren Sie Ihren Hosting-Anbieter, oder verbringen einige Zeit forschen sie auf Google. Sorry!";
-$L["help_prerequisites"] = "Voraussetzungen";
-$L["hide_data_format_options"] = "Ausblenden von Daten Format-Optionen";
-$L["hide_error"] = "Ausblenden von Fehlerwerten";
-$L["host_name"] = "Host Name";
-$L["human_data"] = "Humandaten";
-$L["info_and_stats"] = "Info und Statistiken";
-$L["install"] = "Installieren";
-$L["install_invalid_db_info"] = "Wir waren nicht in der Lage, um die Datenbank mit den von Ihnen angegebenen Informationen zu verbinden. Die Fehlermeldung der Datenbank zurückgegeben wird: <i>{\$db_connection_error}</i>";
-$L["install_no_db_connection"] = "Bitte überprüfen Sie Ihre Datenbank-und Login-Informationen. Obwohl wir in der Lage, auf die Datenbank-Host herstellen konnten, konnten wir nicht mit der Datenbank verbinden. Die Fehlermeldung der Datenbank zurückgegeben wird: <i>{\$db_select_error}</i>";
-$L["install_plugins_rightarrow"] = "Installieren Plugins »";
-$L["install_user_doc_link"] = "Für weitere Informationen über den Installationsprozess, besuche unsere <a href=\"http://benkeen.github.io/generatedata/install.html\" target=\"_blank\">Benutzer-Dokumentation</a>.";
-$L["installation"] = "Installation";
-$L["installation_complete_text"] = "Der Data Generator wurde erfolgreich installiert! Klicken Sie auf die Schaltfläche unten, um das Skript zu gehen.";
-$L["installation_error"] = "Fehler bei der Installation";
-$L["installation_failed_create_settings_file"] = "Das Skript konnte Ihre <b>settings.php</b> erstellen.";
-$L["installation_failed_create_settings_file_msg"] = "Dies tritt in der Regel, wenn es um Berechtigungen für den Ordner zu schreiben ausfällt. Bitte erstellen Sie manuell die Datei und legen Sie sie in der Basis-Ordner des Data Generator. Wenn Sie dies getan haben, auf die Schaltfläche unten die Installation fortzusetzen.";
-$L["installation_intro"] = "Alrighty, lasst uns diesen Sauger installiert. Geben Sie Ihre Datenbank Informationen zu Ihrem Datenbank-Tabellen erstellen. Wenn Sie unsicher über eines dieser Felder sind, auf der Registerkarte Hilfe klicken für ein wenig mehr Info.";
-$L["installation_plugin_intro"] = "Fast fertig! Jetzt werden wir die Plugins installieren: diese machen den Data Generator tatsächlich <i>nützliche</i> - also die Art der Daten, die Sie generieren (Datentypen) kann das Format der generierten Daten (Export-Typen) und alle Country-Daten wie Regionen und Städten.";
-$L["installation_step2_intro"] = "So weit, so gut! Nun klicken Sie auf die Schaltfläche unten, um Ihren <b>settings.php</b>-Datei zu erstellen. Diese Datei wird im Stammverzeichnis dieser Anwendung gespeichert und ist der einzige Ort (außer der Datenbank), die benutzerdefinierte Informationen über Ihre Installation speichert.";
-$L["installation_step3_intro"] = "Sie haben drei Möglichkeiten für den Weg der Installation übernimmt Benutzerkonten.";
-$L["invalid_account_id"] = "Die Konto-ID ist nicht gültig.";
-$L["invalid_custom_xml"] = "Es gibt eine Problem mit der benutzerdefinierten XML-Markup Sie eingegeben haben. Bitte konsultieren Sie die Dokumentation für weitere Informationen.";
-$L["invalid_num_results"] = "Bitte geben Sie eine gültige Anzahl von Ergebnissen.";
-$L["invalid_password"] = "Leider ist dieses Passwort nicht korrekt. Bitte versuchen Sie es erneut.";
-$L["invalid_table_names"] = "Database Spaltennamen kann nur alphanumerische Zeichen und muss mit einem Buchstaben beginnen. Bitte beheben Sie die folgenden Zeilen:";
-$L["last_edited"] = "zuletzt geändert";
-$L["last_logged_in"] = "Letzter Login";
-$L["last_modified"] = "Letzte Änderung";
-$L["last_name"] = "Nachname";
-$L["last_saved"] = "zuletzt gespeicherte";
-$L["latest_project_news"] = "Jüngstes Projekt News";
-$L["limit_pub_sub_console_messages"] = "Beschränken pub / sub-Konsole Nachrichten an bestimmte Module:";
-$L["link_to_data_set"] = "Link zu Data Set";
-$L["link_to_this_data_set"] = "Link zu dieser Data Set";
-$L["list_console_warn_events"] = "Liste console.warn () Veranstaltungen";
-$L["list_core_events"] = "Liste <b>Kern</b> Veranstaltungen";
-$L["list_module_publish_events"] = "List-Modul <b>veröffentlichen</b> Veranstaltungen";
-$L["list_module_subscribe_events"] = "List-Modul <b>anmelden</b> Veranstaltungen";
-$L["load"] = "Laden";
-$L["load_uc"] = "LOAD";
-$L["loading"] = "Verladung...";
-$L["login"] = "Login";
-$L["login_url_c"] = "Einloggen URL:";
-$L["logout"] = "Abmelden";
-$L["make_data_set_public_agreement"] = "Ich verstehe, dass diese Data Set Aktie, ich öffentlich machen müssen.";
-$L["math"] = "Mathe";
-$L["meta_description"] = "GenerateData.com: kostenlos, GNU-lizenzierte, zufällige benutzerdefinierten Daten-Generator zum Testen von Software";
-$L["meta_keywords"] = "Random Data, Test Data, Sample-Daten, Daten-Generator, Daten generieren";
-$L["misc"] = "Misc";
-$L["missing_node_names"] = "Die folgenden Zeilen sind fehlende Node-Namen:";
-$L["missing_table_names"] = "Die folgenden Zeilen fehlen Tabellenspaltennamen:";
-$L["multiple_accounts"] = "Mehrere Konten";
-$L["mysql_password"] = "MySQL-Passwort";
-$L["mysql_username"] = "MySQL Benutzername";
-$L["new_window_or_tab"] = "New window / tab";
-$L["no"] = "Nicht";
-$L["no_account_found"] = "Leider wurde dieses Konto nicht gefunden.";
-$L["no_additional_export_type_settings"] = "Keine zusätzlichen Export-Einstellungen.";
-$L["no_country_plugin_selected"] = "Bitte wählen Sie mindestens ein Land in der Country-Specific Data Abschnitt.";
-$L["no_csv_delimiter"] = "Bitte geben Sie die CSV Trennzeichen.";
-$L["no_data"] = "Oops, nichts zu generieren! Geben einige Daten generiert.";
-$L["no_data_types_found"] = "Keine Datentypen gefunden";
-$L["no_examples_available"] = "Keine Beispiele zur Verfügung.";
-$L["no_export_types_found"] = "Keine Export-Typen gefunden";
-$L["no_form_name"] = "Bitte geben Sie einen Formularnamen.";
-$L["no_js"] = "Bitte aktivieren Sie Javascript in Ihrem Browser.";
-$L["no_js_blurb"] = "Sie wissen, das ist, wie das 21. Jahrhundert? Der Data Generator script stützt sich stark auf Javascript - Dinge einfach nur nicht ohne ihn. Sie müssen es in Ihrem Browser aktivieren, dann aktualisieren Sie diese Seite.";
-$L["no_num_rows"] = "Bitte geben Sie die Anzahl der Zeilen hinzuzufügen.";
-$L["no_options_available"] = "Keine Optionen verfügbar.";
-$L["no_saved_data_sets"] = "Sie haben noch keine gespeicherten Datensätze.";
-$L["no_user_accounts_defined"] = "Keine Benutzerkonten definiert.";
-$L["node_name"] = "Node Name";
-$L["none"] = "Keiner";
-$L["north_america"] = "Nordamerika";
-$L["not_saved"] = "nicht gespeichert";
-$L["notify_settings_updated"] = "Ihre Einstellungen wurden aktualisiert.";
-$L["num_records_generated"] = "Num Datensätze generiert";
-$L["num_results"] = "Num Ergebnisse";
-$L["num_rows_too_large"] = "Sorry, du bist zu erzeugen <b>%1</b> Zeilen gleichzeitig beschränkt. Klicken Sie erzeugen, um fortzufahren.";
-$L["num_saved_data_sets"] = "Num gespeicherten Datensätze";
-$L["numeric"] = "Numerisch";
-$L["oceania"] = "Ozeanien";
-$L["ok"] = "Ok";
-$L["options"] = "Optionen";
-$L["order"] = "Bestellen";
-$L["other"] = "Andere";
-$L["password"] = "Kennwort";
-$L["password_c"] = "Passwort:";
-$L["password_change_note"] = "Sie müssen nur die Passwort-Felder ausfüllen, wenn Sie es ändern wollen.";
-$L["password_reset_complete"] = "Ihr Passwort wurde zurückgesetzt und Sie wurden das neue Passwort per E-Mail.";
-$L["password_reset_email_content1"] = "Ihr Passwort wurde zurückgesetzt. Sie können die folgenden Passwort um sich anzumelden: %1";
-$L["password_reset_email_content2"] = "Bitte ändern, sobald Sie angemeldet haben.";
-$L["please_confirm"] = "Bitte bestätigen Sie";
-$L["please_enter_all"] = "Bitte füllen Sie alle";
-$L["please_enter_data_set_name"] = "Bitte geben Sie den Namen des neuen Data Set.";
-$L["please_fix_errors"] = "Bitte beheben Sie die folgenden Fehler und resubmit:";
-$L["please_login"] = "Bitte Login";
-$L["please_select"] = "Bitte wählen";
-$L["plugins"] = "Plugins";
-$L["plugins_intro"] = "Jedes Mal, wenn Sie hinzufügen oder entfernen ein Plugin, müssen Sie die Plugins zurückgesetzt. Dies wird die Datenbank zu aktualisieren und sicherzustellen, können Sie die Plugins benötigen Sie zugreifen.";
-$L["prompt_to_download"] = "Prompt zum Download";
-$L["public_q"] = "Public?";
-$L["read_developer_doc"] = "Lesen Sie die Dokumentation für Entwickler";
-$L["reenter_password"] = "Passwort erneut eingeben";
-$L["refresh_page"] = "Seite aktualisieren";
-$L["regenerate"] = "Regenerieren";
-$L["report_bug"] = "Einen Fehler melden";
-$L["reset_password"] = "Passwort zurücksetzen";
-$L["reset_plugins"] = "Zurücksetzen plugins";
-$L["reset_plugins_with_bundling"] = "<b>Sie haben Bündelung / Verkleinerung aktiviert</b>. Nach einem Klick auf diese Schaltfläche, müssen Sie <i>Grunt</i>, um die Pakete neu zu erstellen. Für weitere Informationen <a href=\"http://benkeen.github.io/generatedata/developer.html#bundling\" target=\"_blank\">Lesen Sie diese Dokumentation Seite</a>. Wenn Sie irgendwelche Probleme haben, können Sie deaktivieren möchten Bündelung.";
-$L["result_type"] = "Result Type";
-$L["row_label"] = "Column Titel";
-$L["row_label_plural"] = "Spaltentitel";
-$L["row_sp"] = "Row (s)";
-$L["rows"] = "Zeilen";
-$L["rows_generated"] = "Zeilen generiert";
-$L["save"] = "Sparen";
-$L["save_data_set_to_link"] = "Um diese Daten mit anderen Menschen einstellen zu teilen, müssen Sie es zuerst zu speichern.";
-$L["save_uc"] = "SPAREN";
-$L["script_thinking"] = "Oops, halten für eine Sekunde. Das Skript ist das Denken.";
-$L["see_help_dialog"] = "Siehe Hilfe-Dialog.";
-$L["select_data_type"] = "Wählen Sie Data Type";
-$L["select_language"] = "Sprache auswählen";
-$L["settings"] = "Einstellungen";
-$L["settings_file_exists"] = "Die Konfigurationsdatei existiert bereits. Für neue Anlagen sollte die settings.php nicht existieren. Entweder löschen und die Installation fortzusetzen script oder versuchen Laden Sie das Skript erneut mit den vorhandenen Einstellungen file Werte.";
-$L["show_data_format_options"] = "zeigen die Daten, Format-Optionen";
-$L["single_anonymous_user_account"] = "Single, anonyme Benutzerkonto";
-$L["single_user_account_requires_login"] = "Einziges Benutzerkonto erfordert Login";
-$L["south_america"] = "Südamerika";
-$L["still_stuck"] = "Noch stecken?";
-$L["success"] = "Erfolg";
-$L["table_column"] = "Tabellenspalte";
-$L["table_prefix"] = "Table Prefix";
-$L["text"] = "Text";
-$L["theme"] = "Thema";
-$L["tip_country_data"] = "<p>In diesem Bereich können Sie steuern, welche länderspezifischen Daten in Ihrer erzeugten Datensätze einbezogen werden sollten. Die Werte, die Sie hier auswählen, wirken sich bestimmte Datentypen, die Sie wählen, wie <i>Region</i>, <i>Postal / Zip</i> und <i>Land</i>. </p><p>Um Ihnen eine bessere Vorstellung von dem, was das bedeutet, versuchen Sie, die <i>Region</i> Datentyp für einen Ihrer Zeilen in der Data Set Abschnitt, dann Hinzufügen / Entfernen von Ländern aus der Country-Specific Data Abschnitt. Du wirst sehen, dass die Reihe Optionen, die erscheinen, werden direkt von den Ländern die Sie ausgewählt haben betroffen: Sie können immer nur erzeugen eine Teilmenge der ausgewählten Länder.</p>";
-$L["title"] = "generatedata.com";
-$L["total_rows_generated"] = "Insgesamt Zeilen generiert";
-$L["update"] = "Aktualisieren";
-$L["update_account"] = "Konto aktualisieren";
-$L["update_settings"] = "Update-Einstellungen";
-$L["use_custom_xml_format"] = "Verwenden Sie benutzerdefinierte XML-Format";
-$L["user"] = "Benutzer";
-$L["user_account"] = "User Account";
-$L["user_account_section_intro"] = "In diesem Abschnitt können Sie eine beliebige Anzahl von Benutzerkonten, damit die Menschen Zugang zu dem Skript. Nur Sie, der Administrator, die Berechtigungen zum Erstellen oder Löschen von Konten.";
-$L["user_accounts"] = "User Accounts";
-$L["user_not_found"] = "Leider waren wir nicht in der Lage, Sie zu identifizieren.";
-$L["validation_account_already_exists"] = "Sorry, ein Konto mit dieser E-Mail-Adresse ist bereits vorhanden.";
-$L["validation_invalid_chars"] = "Alphanumerische Zeichen und Unterstriche Zeichen nur, bitte.";
-$L["validation_invalid_email"] = "Bitte geben Sie eine gültige E-Mail-Adresse.";
-$L["validation_invalid_permissions"] = "Sie haben keine Berechtigung, dies zu tun.";
-$L["validation_no_db_hostname"] = "Bitte geben Sie Ihre Datenbank hostname.";
-$L["validation_no_db_name"] = "Bitte geben Sie Ihren Namen der Datenbank.";
-$L["validation_no_email"] = "Bitte geben Sie Ihre E-Mail-Adresse.";
-$L["validation_no_first_name"] = "Bitte geben Sie Ihren Vornamen ein.";
-$L["validation_no_last_name"] = "Bitte geben Sie Ihren Nachnamen an.";
-$L["validation_no_mysql_username"] = "Bitte geben Sie Ihren MySQL-Benutzernamen ein.";
-$L["validation_no_password"] = "Bitte geben Sie Ihr Passwort ein.";
-$L["validation_not_logged_in"] = "Sie scheinen nicht eingeloggt sein Bitte melden Sie sich erneut.";
-$L["version"] = "Version";
-$L["website"] = "Webseite";
-$L["yes"] = "Ja";
-$L["your_account"] = "Ihr Konto";
-$L["your_data_set_name_here"] = "Ihre Daten gesetzt Namen hier ...";
-$L["your_data_sets"] = "Ihre Datensätze";
-$L["zip_q"] = "Zip?";
diff --git a/resources/lang/en.php b/resources/lang/en.php
deleted file mode 100755
index 93cc17642..000000000
--- a/resources/lang/en.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-
-
-$L = array();
-$L["ENABLED"] = true;
-
-// Core language strings
-$L["language"] = "English";
-$L["title"] = "generatedata.com";
-$L["about"] = "About";
-$L["accounts"] = "Accounts";
-$L["back"] = "Back";
-$L["add"] = "Add";
-$L["confirm_delete_form"] = "Are you sure you want to delete this form?";
-$L["confirm_empty_form"] = "Are you sure you want to clear the page?";
-$L["countries"] = "Countries";
-$L["meta_description"] = "GenerateData.com: free, GNU-licensed, random custom data generator for testing software";
-$L["meta_keywords"] = "Random Data, Test Data, Sample Data, data generator, generate data";
-$L["row_label"] = "Column Title";
-$L["row_label_plural"] = "Column Titles";
-$L["update_settings"] = "Update Settings";
-$L["data_type"] = "Data Type";
-$L["default_save_form_empty_str"] = "Enter form name here";
-$L["del"] = "Del";
-$L["del_uc"] = "DEL";
-$L["donate"] = "Donate!";
-$L["empty_form"] = "Empty Form";
-$L["examples"] = "Examples";
-$L["fatal_error"] = "A fatal error occurred.";
-$L["form_deleted"] = "The form has been deleted.";
-$L["form_exists_overwrite_confirmation"] = "This form already exists. Do you want to overwrite it?";
-$L["form_not_deleted"] = "Sorry, we couldn&#39;t delete this form. Re-log in and try again.";
-$L["form_saved"] = "Your form has been saved.";
-$L["forums"] = "Forums";
-$L["generate"] = "Generate";
-$L["generator"] = "Generator";
-$L["help"] = "Help";
-$L["hide_error"] = "Hide error";
-$L["human_data"] = "Human Data";
-$L["math"] = "Math";
-$L["invalid_custom_xml"] = "There&#39;s a problem with the custom XML markup you entered. Please consult the user documentation for more information.";
-$L["invalid_num_results"] = "Please enter a valid number of results.";
-$L["invalid_table_names"] = "Database column names can only alphanumeric characters and must begin with a letter. Please fix the following rows:";
-$L["load_uc"] = "LOAD";
-$L["load"] = "Load";
-$L["missing_node_names"] = "The following rows have missing node names:";
-$L["missing_table_names"] = "The following rows have missing table column names:";
-$L["no_csv_delimiter"] = "Please enter the CSV delimiter.";
-$L["no_data"] = "Oops, nothing to generate! Enter some data to be generated.";
-$L["no_examples_available"] = "No examples available.";
-$L["no_form_name"] = "Please enter a form name.";
-$L["no_num_rows"] = "Please enter the number of rows to add.";
-$L["no_options_available"] = "No options available.";
-$L["none"] = "None";
-$L["num_results"] = "Num Results";
-$L["ok"] = "OK";
-$L["options"] = "Options";
-$L["order"] = "Order";
-$L["other"] = "Other";
-$L["please_fix_errors"] = "Please fix the following errors and resubmit:";
-$L["please_select"] = "Please Select";
-$L["select_data_type"] = "Select Data Type";
-$L["result_type"] = "Result Type";
-$L["row_sp"] = "Row(s)";
-$L["save_uc"] = "SAVE";
-$L["script_thinking"] = "Oops, hold on for a second. The script is thinking.";
-$L["see_help_dialog"] = "&nbsp;See help dialog.";
-$L["select_language"] = "Select Language";
-$L["table_column"] = "Table Column";
-$L["text"] = "Text";
-$L["use_custom_xml_format"] = "Use custom XML format";
-$L["website"] = "Website";
-$L["no_js"] = "Please enable javascript in your browser.";
-$L["no_js_blurb"] = "You know this is, like, the 21st century? The Data Generator script relies heavily on javascript - things just plain won't work without it. You&#39;ll need to enable it in your browser then refresh this page.";
-$L["install"] = "Install";
-$L["host_name"] = "Host Name";
-$L["installation"] = "Installation";
-$L["table_prefix"] = "Table Prefix";
-$L["database_name"] = "Database Name";
-$L["mysql_username"] = "MySQL Username";
-$L["mysql_password"] = "MySQL Password";
-$L["default_language"] = "Default Language";
-$L["installation_intro"] = "Alrighty, let's get this sucker installed. Enter your database information to create your database tables. If you're unsure about any of these fields, click on the Help tab for a little more info.";
-$L["version"] = "Version";
-$L["help_intro"] = "The installation script does two things for you. One, it automatically generates a <b>settings.php</b> file which contains your unique database connection info, so that it knows how to connect to the database whenever you visit the script. Two, it populates the database with various information that it needs: things like general settings, user accounts and raw data like people's names, country and city names.";
-$L["help_prerequisites"] = "Pre-requisites";
-$L["help_prereq_info"] = "Just like virtually every other PHP/MySQL script out there, you need to have already created a database before running the installation script. <i>The installation script doesn't create the database, it just tries to connect to it to create the tables.</i> If you're not sure how to create a database within your environment, you'll either need to contact your hosting provider, or spend some time researching it on Google. Sorry!";
-$L["host_name_desc"] = "The name of your database connection. Often it's just <i>localhost</i>, but sometimes it's something like <i>mysql.yoursite.com</i>.";
-$L["still_stuck"] = "Still stuck?";
-$L["refresh_page"] = "Refresh Page";
-$L["database_info"] = "Database Info";
-$L["user_account"] = "User Account";
-$L["user_accounts"] = "User Accounts";
-$L["password"] = "Password";
-$L["reenter_password"] = "Re-enter password";
-$L["email"] = "Email";
-$L["yes"] = "Yes";
-$L["no"] = "No";
-$L["validation_no_db_hostname"] = "Please enter your database hostname.";
-$L["validation_no_db_name"] = "Please enter your database name.";
-$L["validation_invalid_chars"] = "Alphanumeric and underscore characters only, please.";
-$L["validation_no_mysql_username"] = "Please enter your MySQL username.";
-$L["validation_no_email"] = "Please enter your email address.";
-$L["validation_invalid_email"] = "Please enter a valid email address.";
-$L["validation_no_first_name"] = "Please enter your first name.";
-$L["validation_no_last_name"] = "Please enter your last name.";
-$L["validation_no_password"] = "Please enter your password.";
-$L["install_invalid_db_info"] = "We were unable to connect to the database using the information you supplied. The error message the database returned is: <i>{\$db_connection_error}</i>";
-$L["install_no_db_connection"] = "Please check your database name and login information. Although we were able to connect to the database host, we could not connect to the database. The error message the database returned is: <i>{\$db_select_error}</i>";
-$L["settings_file_exists"] = "The settings file already exists. For new installations, the settings.php shouldn't exist. Either delete it and continue the installation script or try loading the script again with the existing settings file values.";
-$L["first_name"] = "First Name";
-$L["last_name"] = "Last Name";
-$L["settings"] = "Settings";
-$L["geo"] = "Geo";
-$L["numeric"] = "Numeric";
-$L["notify_settings_updated"] = "Your settings have been updated.";
-$L["tip_country_data"] = "This section lets you control what country-specific data should be included in your generated data sets. The values you select here affect certain Data Types that you may select, such as <i>Region</i>, <i>Postal/Zip</i> and <i>Country</i>.</p><p>To give you a better idea of what this means, try selecting the <i>Region</i> Data Type for one of your rows in the Data Set section, then add / remove countries from the Country-Specific Data section. You'll see that the row options that appear are directly affected by the countries you have selected: you can only ever generate a subset of the countries selected.";
-$L["country_specific_data"] = "Country-specific data";
-$L["data_set"] = "Data Set";
-$L["data_format"] = "Data Format";
-$L["no_additional_export_type_settings"] = "No additional export type settings.";
-$L["blog"] = "Blog";
-$L["your_account"] = "Your Account";
-$L["your_data_sets"] = "Your Data Sets";
-$L["data_types"] = "Data Types";
-$L["account_type"] = "Account type";
-$L["num_saved_data_sets"] = "Num Saved Data Sets";
-$L["total_rows_generated"] = "Total rows generated";
-$L["date_account_created"] = "Date account created";
-$L["no_saved_data_sets"] = "You don't have any saved data sets.";
-$L["data_set_name"] = "Data Set Name";
-$L["data_created"] = "Data Created";
-$L["last_modified"] = "Last Modified";
-$L["public_q"] = "Public?";
-$L["rows_generated"] = "Rows Generated";
-$L["save_data_set_to_link"] = "De-<i>nied</i>. In order to share this Data Set with other people, you need to save it first.";
-$L["make_data_set_public_agreement"] = "I understand that to share this Data Set, I need to make it public.";
-$L["clear_the_page"] = "Clear the Page";
-$L["link_to_this_data_set"] = "Link to this Data Set";
-$L["save"] = "Save";
-$L["your_data_set_name_here"] = "Your data set name here...";
-$L["country_specific_data"] = "Country-Specific Data";
-$L["data_set_help"] = "This is where you define exactly what kind of data you want to generate. Try filling in a row or two and click the Generate button. You'll get the hang of it pretty fast.";
-$L["export_types"] = "Export Types";
-$L["export_types_help"] = "This section lets you control the format of your generated data. Each format may provide different options to let you tailor the output to exactly what you want.";
-$L["hide_data_format_options"] = "hide data format options";
-$L["show_data_format_options"] = "show data format options";
-$L["rows"] = "rows";
-$L["generate_in_page"] = "Generate in-page";
-$L["new_window_or_tab"] = "New window/tab";
-$L["prompt_to_download"] = "Prompt to download";
-$L["cancel"] = "cancel";
-$L["regenerate"] = "Regenerate";
-$L["generated_X_of_Y_results"] = "Generated <span id=\"gdGenerateCount\"></span> of <span id=\"gdGenerateTotal\"></span> results";
-$L["plugins"] = "Plugins";
-$L["plugins_intro"] = "Any time you add or remove a plugin, you need to reset the plugins. This will update the database and ensure you can access the plugins you require.";
-$L["reset_plugins"] = "Reset plugins";
-$L["misc"] = "Misc";
-$L["theme"] = "Theme";
-$L["developer"] = "Developer";
-$L["developer_intro"] = "The following sections lets you fine-tune what you see in your javascript console for development purposes.";
-$L["list_console_warn_events"] = "List console.warn() events";
-$L["list_module_publish_events"] = "List module <b>publish</b> events";
-$L["list_module_subscribe_events"] = "List module <b>subscribe</b> events";
-$L["list_core_events"] = "List <b>core</b> events";
-$L["limit_pub_sub_console_messages"] = "Limit pub/sub console messages to specific modules:";
-$L["all_data_type_plugins"] = "All Data Type plugins";
-$L["all_export_type_plugins"] = "All Export Type plugins";
-$L["about_title"] = "What <i>is</i> this thing?";
-$L["about_para1"] = "Sometimes you need fake data for things like testing software, populating databases and creating realistic-looking mockups. For text, we have <i>lorem ipsum</i>; but for everything else...? This tool was written to provide a quick and simple way to let you generate large volumes of custom data in whatever format you require.";
-$L["about_para2"] = "The <b>Generate</b> page contains the entire script: just fill in the various fields in the page to construct the data set you're interested in, then click the Generate button. And hey presto! Easy, huh?";
-$L["extend_id"] = "Extend it";
-$L["about_para3"] = "The out-the-box script contains the sort of functionality you generally need. But nothing's ever complete - maybe you need to generate random esoteric math equations, pull random tweets or display random images from Flickr with the word \"Red-backed vole\" in the title. Who knows. Everyone's use-case is different.";
-$L["about_para4"] = "With this in mind, the new version of the script (3.0.0+) was designed to be fully extensible: developers can write their own Data Types to generate new types of random data, and even customize the Export Types - i.e. the format in which the data is output. For people interested in generating more accurate localized geographical data, they can also add new Country plugins that supply region names (states, provinces, territories etc), city names and postal/zip code formats for their country of choice.";
-$L["about_para5"] = "For more information on how to extend it, visit the <a href=\"docs/\">developer documentation</a>.";
-$L["a_few_links"] = "A few links";
-$L["fork_on_github"] = "Fork the code on github";
-$L["read_developer_doc"] = "Read the developer documentation";
-$L["goto_website"] = "Go to the website";
-$L["latest_project_news"] = "Latest project news";
-$L["last_edited"] = "last edited";
-$L["last_saved"] = "last saved";
-$L["please_confirm"] = "Please confirm";
-$L["yes"] = "Yes";
-$L["no"] = "No";
-$L["not_saved"] = "not saved";
-$L["please_enter_all"] = "Please enter all";
-$L["export_type_validate_error"] = "Ack! There was an error in the Export Type's validate() function. Sorry, we can't proceed - call a developer!";
-$L["refresh_page"] = "Refresh Page";
-$L["close"] = "Close";
-$L["anonymous_admin_account"] = "Anonymous admin account";
-$L["report_bug"] = "Report a bug";
-$L["developer_doc"] = "Developer doc";
-$L["no_data_types_found"] = "No Data Types found";
-$L["no_export_types_found"] = "No Export Types found";
-$L["installation_error"] = "Installation error";
-$L["continue_rightarrow"] = "Continue &raquo;";
-$L["check_database_info"] = "Check Database Info";
-$L["create_settings_file"] = "Create Settings File";
-$L["complete_excl"] = "Complete!";
-$L["installation_step2_intro"] = "So far so good! Now click the button below to create your <b>settings.php</b> file. This file is stored in the root folder of this application and is the only place (other than the database) that stores custom information about your installation.";
-$L["create_file_rightarrow"] = "Create File &raquo;";
-$L["installation_step3_intro"] = "You have three choices for the way your installation handles user accounts.";
-$L["single_anonymous_user_account"] = "Single, anonymous user account";
-$L["single_user_account_requires_login"] = "Single user account, requires login";
-$L["multiple_accounts"] = "Multiple accounts";
-$L["goto_script_rightarrow"] = "Go to script &raquo;";
-$L["enter_user_account_details"] = "Please enter your user account details below.";
-$L["installation_plugin_intro"] = "Almost done! Now we're going to install the plugins: these are what make the Data Generator actually <i>useful</i> - i.e. the type of data you can generate (Data Types), the format of the generated data (Export Types) and all the Country-specific data like regions and cities.";
-$L["install_plugins_rightarrow"] = "Install Plugins &raquo;";
-$L["installation_complete_text"] = "The Data Generator has been successfully installed! Click the button below to go to the script.";
-$L["please_login"] = "Please Login";
-$L["forgotten_your_password_q"] = "Forgotten your password?";
-$L["admin"] = "Admin";
-$L["user"] = "User";
-$L["logout"] = "Logout";
-$L["create_account"] = "Create Account";
-$L["edit"] = "Edit";
-$L["delete"] = "Delete";
-$L["no_user_accounts_defined"] = "No user accounts defined.";
-$L["num_records_generated"] = "Generated";
-$L["last_logged_in"] = "Last Logged In";
-$L["date_created"] = "Date Created";
-$L["user_account_section_intro"] = "This section lets you create any number of users accounts to allow people access to the script. Only you are able to create or delete accounts.";
-$L["email_user_login_info"] = "Email the user their login information";
-$L["create_account_rightarrow"] = "Create Account &raquo;";
-$L["delete_account"] = "Delete Account";
-$L["update_account"] = "Update Account";
-$L["confirm_delete_user_account"] = "Are you sure you want to delete this user account?";
-$L["success"] = "success";
-$L["error"] = "error";
-$L["invalid_password"] = "Sorry, that password is not correct. Please try again.";
-$L["reset_password"] = "Reset Password";
-$L["password_reset_email_content1"] = "Your password has been reset. You may use the following password to log in: %1";
-$L["password_reset_email_content2"] = "Please change it once you've logged in.";
-$L["password_reset_complete"] = "Your password has been reset and you have been emailed the new password.";
-$L["email_not_sent"] = "We were unable to send the email notification.";
-$L["user_not_found"] = "Sorry, we were unable to identify you.";
-$L["account_created_msg"] = "An account has been created for you.";
-$L["account_created"] = "Account Created";
-$L["invalid_account_id"] = "The Account ID is not valid.";
-$L["account_info"] = "Account Info";
-$L["account_updated"] = "Your account has been updated.";
-$L["password_change_note"] = "You only need to fill the password fields in if you want to change it.";
-$L["info_and_stats"] = "Info and Stats";
-$L["account_settings"] = "Account Settings";
-$L["enter_email_address_to_reset_password"] = "Enter your email address below to reset your password.";
-$L["extend_it"] = "Extend it";
-$L["africa"] = "Africa";
-$L["asia"] = "Asia";
-$L["europe"] = "Europe";
-$L["north_america"] = "North America";
-$L["central_america"] = "Central America";
-$L["south_america"] = "South America";
-$L["oceania"] = "Oceania";
-$L["all_countries"] = "All countries";
-$L["link_to_data_set"] = "Link to Data Set";
-$L["login"] = "Login";
-$L["forgot_password"] = "Forgot Password";
-$L["admin_account"] = "Admin account";
-$L["feature_enabled"] = "Enabled";
-$L["anonymous_access"] = "Anonymous access";
-$L["anonymous_user_desc"] = "Anonymous users can use the script but have limited access: they cannot save, link to their data sets or generate more than 100 rows at a time.";
-$L["anonymous_user_message"] = "Message to display to anonymous users when trying to save:";
-$L["anonymous_user_default_message"] = "Please login or email someone@yoursite.com to get a user account.";
-$L["login_url_c"] = "Login URL:";
-$L["email_c"] = "Email:";
-$L["password_c"] = "Password:";
-$L["no_account_found"] = "Sorry, that account wasn't found.";
-$L["update"] = "Update";
-$L["documentation"] = "Documentation";
-$L["install_user_doc_link"] = "For more detailed information about the installation process, check out our <a href=\"http://benkeen.github.io/generatedata/install.html\" target=\"_blank\">user documentation</a>.";
-$L["num_rows_too_large"] = "Sorry, you're limited to generating <b>%1</b> rows at a time. Click generate to continue.";
-$L["fork_this_project_on_github"] = "Fork this project on Github";
-$L["download"] = "Download";
-$L["loading"] = "Loading...";
-$L["validation_account_already_exists"] = "Sorry, an account with that email address already exists.";
-$L["validation_not_logged_in"] = "You don't appear to be logged in. Please try logging in again.";
-$L["validation_invalid_permissions"] = "You don't have permissions to do this.";
-$L["installation_failed_create_settings_file"] = "The script was unable to create your <b>settings.php</b> file.";
-$L["installation_failed_create_settings_file_msg"] = "This usually occurs when it fails to have permissions to write to the folder. Please manually create this file and place it in the base folder of the Data Generator. When you have done this, button below to continue installing.";
-$L["confirm_file_exists"] = "Confirm File Exists";
-$L["reset_plugins_with_bundling"] = "<b>You have bundling/minification enabled</b>. After clicking this button you will need to run <i>grunt</i> to recreate the bundles. For more information <a href=\"http://benkeen.github.io/generatedata/developer.html#bundling\" target=\"_blank\">read this documentation page</a>. If you have any problems, you may want to turn off bundling.";
-$L["cannot_change_num_rows"] = "Sorry, you're not allowed to change the number of generated rows.";
-$L["zip_q"] = "Zip?";
-$L["please_enter_data_set_name"] = "Please enter the name of the new Data Set.";
-$L["delete_1_data_set"] = "Delete 1 Data Set";
-$L["delete_N_data_sets"] = "Delete %1 Data Sets";
-
-// new in 3.1.1
-$L["credit_card_data"] = "Credit Card Data";
diff --git a/resources/lang/es.php b/resources/lang/es.php
deleted file mode 100755
index 2464d1dba..000000000
--- a/resources/lang/es.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-
-
-$L = array();
-$L["ENABLED"] = true;
-
-// Core language strings
-$L["language"] = "Español";
-$L["title"] = "generatedata.com";
-$L["about"] = "Acerca de";
-$L["accounts"] = "Cuentas";
-$L["back"] = "Atrás";
-$L["add"] = "Añadir";
-$L["confirm_delete_form"] = "¿Está seguro de querer eliminar este formulario?";
-$L["confirm_empty_form"] = "¿Está seguro de querer borrar la página?";
-$L["countries"] = "Países";
-$L["meta_description"] = "GenerateData.com: generador de datos aleatorios personalizable para pruebas de software libre y licenciado como GNU";
-$L["meta_keywords"] = "Datos aleatorios, Datos de prueba, Datos de ejemplo, generador de datos, generar datos";
-$L["row_label"] = "Título de columna";
-$L["row_label_plural"] = "Títulos de columna";
-$L["update_settings"] = "Actualizar ajustes";
-$L["data_type"] = "Tipo de dato";
-$L["default_save_form_empty_str"] = "Introduzca nombre de formulario";
-$L["del"] = "Elim";
-$L["del_uc"] = "ELIMINAR";
-$L["donate"] = "¡Donar!";
-$L["empty_form"] = "Formulario vacío";
-$L["examples"] = "Ejemplos";
-$L["fatal_error"] = "Ocurrió un error fatal.";
-$L["form_deleted"] = "El formulario ha sido eliminado.";
-$L["form_exists_overwrite_confirmation"] = "Este formulario ya existe, ¿quiere sobrescribirlo?";
-$L["form_not_deleted"] = "Lo siento, no podemos eliminar este formulario. Inicia sesión e inténtalo de nuevo.";
-$L["form_saved"] = "Tu formulario ha sido salvado.";
-$L["forums"] = "Foros";
-$L["generate"] = "Generar";
-$L["generator"] = "Generador";
-$L["help"] = "Ayuda";
-$L["hide_error"] = "Ocultar error";
-$L["human_data"] = "Datos humanos";
-$L["math"] = "Matemático";
-$L["invalid_custom_xml"] = "Hay un problema con el código XML que has introducido. Por favor, consulta la documentación de usuario para más información.";
-$L["invalid_num_results"] = "Por favor, introduce un número válido de resultados.";
-$L["invalid_table_names"] = "Los nombres de columna de base de datos sólo pueden ser caracteres alfanuméricos y deben comenzar con una letra. Por favor, rellene las siguientes filas:";
-$L["load_uc"] = "CARGAR";
-$L["load"] = "Cargar";
-$L["missing_node_names"] = "Faltan los nombres de nodo de las siguientes filas:";
-$L["missing_table_names"] = "Faltan los nombres de columna de las siguientes filas:";
-$L["no_csv_delimiter"] = "Por favor, introduzca el delimitador de CSV.";
-$L["no_data"] = "Vaya, ¡no hay nada que generar! Introduzca algún dato para generar.";
-$L["no_examples_available"] = "No hay ejemplos disponibles.";
-$L["no_form_name"] = "Por favor, introduzca el nombre del formulario.";
-$L["no_num_rows"] = "Por favor, introduza el número de filas a añadir.";
-$L["no_options_available"] = "No hay opciones disponibles.";
-$L["none"] = "Ninguno";
-$L["num_results"] = "Núm. resultados";
-$L["ok"] = "Aceptar";
-$L["options"] = "Opciones";
-$L["order"] = "Orden";
-$L["other"] = "Otros";
-$L["please_fix_errors"] = "Por favor, arregle los errores y envíe de nuevo el formulario:";
-$L["please_select"] = "Por favor, seleccione";
-$L["select_data_type"] = "Seleccione tipo de dato";
-$L["result_type"] = "Tipo del resulado";
-$L["row_sp"] = "Fila(s)";
-$L["save_uc"] = "SALVAR";
-$L["script_thinking"] = "Vaya, espera un momento. Estamos trabajando...";
-$L["see_help_dialog"] = "&nbsp;Ver el diálogo de ayuda.";
-$L["select_language"] = "Elije idioma";
-$L["table_column"] = "Columna de la tabla";
-$L["text"] = "Texto";
-$L["use_custom_xml_format"] = "Usar formato XML a medida";
-$L["website"] = "Sitio web";
-$L["no_js"] = "Por favor, habilite javascript en su navegador.";
-$L["no_js_blurb"] = "¿Sabías que ya estamos en el siglo XXI, no? DataGenerator.com necesita JavaScript. Sin esto, simplemente no funciona. Necesitas habilitarlo en tu navegador y después refrescar esta página.";
-$L["install"] = "Instalar";
-$L["host_name"] = "Anfitrión";
-$L["installation"] = "Instalación";
-$L["table_prefix"] = "Prefijo de tabla";
-$L["database_name"] = "Nombre de base de datos";
-$L["mysql_username"] = "Usuario de MySQL";
-$L["mysql_password"] = "Contraseña de MySQL";
-$L["default_language"] = "Idioma por defecto";
-$L["installation_intro"] = "Muy bien, vamos a poner esto en marcha. Introduce la información de la base de datos para crear las tablas necesarias. Si no estás seguro de alguno de estos campos, haz click en la solapa de Ayuda para más información.";
-$L["version"] = "Versión";
-$L["help_intro"] = "El programa de instalación hace dos cosas por ti. Primero, genera automáticamente el fichero <b>settings.php</b> que contiene información única sobre la conexión a la base de datos, de forma que sabe como conectar a la base de datos siempre que visites GenerateData.com. Segundo, rellena la base de datos con más información necesaria: cosas como ajustes generales, cuentas de usuario y datos en bruto como nombres de personas, países y ciudades.";
-$L["help_prerequisites"] = "Pre-requisitos";
-$L["help_prereq_info"] = "Igual que ocurre casi con cualquier otro programa PHP/MySQL normal, necesitas tener una base de datos creada antes de poder ejecutar la instalación. <i>El programa de instalación no crea la base de datos, sólo intenta conectarse a una para crear las tablas.</i> Si no estás seguro de cómo crear una base de datos en tu entorno, tentrás que contactar con tu proveedor de alojamiento o invertir algo de tiempo investigando en Google, ¡lo siento!";
-$L["host_name_desc"] = "El nombre de tu conexión a base de datos. A  menudo, basta con <i>localhost</i>, pero algunas veces es algo como <i>mysql.tusitio.com</i>.";
-$L["still_stuck"] = "¿Aún atascado?";
-$L["refresh_page"] = "Refrescar página";
-$L["database_info"] = "Información de la base de datos";
-$L["user_account"] = "Cuenta de usuario";
-$L["user_accounts"] = "Cuentas de usuario";
-$L["password"] = "Contraseña";
-$L["reenter_password"] = "Repita contraseña";
-$L["email"] = "Correo electrónico";
-$L["yes"] = "Sí";
-$L["no"] = "No";
-$L["validation_no_db_hostname"] = "Por favor, introduce el nombre del servidor de base de datos.";
-$L["validation_no_db_name"] = "Por favor, introduce el nombre de tu base de datos.";
-$L["validation_invalid_chars"] = "Sólo caracteres alfanuméricos y guión bajo, por favor.";
-$L["validation_no_mysql_username"] = "Por favor, introduce el nombre de usuario de MySQL.";
-$L["validation_no_email"] = "Por favor, introduce tu dirección de correo.";
-$L["validation_invalid_email"] = "Por favor, introduce una dirección de correo válida.";
-$L["validation_no_first_name"] = "Por favor, introduce tu nombre.";
-$L["validation_no_last_name"] = "Por favor, introduce tus apellidos.";
-$L["validation_no_password"] = "Por favor, introduce tu contraseña.";
-$L["install_invalid_db_info"] = "No se ha podido conectar a la base de datos con la información suministrada. El mensaje de error que devolvió la base de datos es: <i>{\$db_connection_error}</i>";
-$L["install_no_db_connection"] = "Por favor, verifica el nombre de tu base de datos, usuario y contraseña. Aunque se ha podido conectar con el servidor de base de datos, no hemos podido conectar a la base de datos. El mensaje de error que devolvió la base de datos es: <i>{\$db_select_error}</i>";
-$L["settings_file_exists"] = "El fichero de ajustes ya existe. Para instalaciones nuevas, el fichero settings.php no debería existir. Elimínalo y continúa con la instalación o intenta reiniciar la instalación con los nuevos valores de los ajustes existentes.";
-$L["first_name"] = "Nombre";
-$L["last_name"] = "Apellidos";
-$L["settings"] = "Ajustes";
-$L["geo"] = "Geográficos";
-$L["numeric"] = "Numéricos";
-$L["notify_settings_updated"] = "Tus ajustes han sido actualizados.";
-$L["tip_country_data"] = "Esta sección te permite controlar qué datos específicos del país deber incluirse en tus conjuntos de datos generados. Los valores que elijas aquí afectarán a a ciertos tipos de dato que puedes elegir, como <i>Región</i>, <i>Código postal</i> y <i>País</i>. </p><p>Para darte una idea más clara de lo que significa, prueba a elegir el tipo de dato <i>Región</i> para una de las filas el la sección Conjunto de datos y entonces añade o elimina países de la sección de datos específicos de país. Verás que las opciones de la fila que aparecen están directamente afectadas por los países que has seleccionado y sólo podrás generar un subconjunto de los países seleccionados.";
-$L["country_specific_data"] = "Datos específicos de país";
-$L["data_set"] = "Conjunto de datos";
-$L["data_format"] = "Formato de datos";
-$L["no_additional_export_type_settings"] = "No hay ajustes de tipo.";
-$L["blog"] = "Blog";
-$L["your_account"] = "Tu cuenta";
-$L["your_data_sets"] = "Tus conjuntos de datos";
-$L["data_types"] = "Tipos de datos";
-$L["account_type"] = "Tipo de cuenta";
-$L["num_saved_data_sets"] = "Número de conjuntos de datos salvados";
-$L["total_rows_generated"] = "Total de filas generadas";
-$L["date_account_created"] = "Fecha de creación de la cuenta";
-$L["no_saved_data_sets"] = "No tienes ningún conjunto de datos salvado.";
-$L["data_set_name"] = "Nombre del conjunto de datos";
-$L["data_created"] = "Datos creados";
-$L["last_modified"] = "Última modificación";
-$L["public_q"] = "¿Es público?";
-$L["rows_generated"] = "Filas generadas";
-$L["save_data_set_to_link"] = "De-<i>negado</i>. Para compartir este conjunto de datos con otra gente, necesitas salvarlo primero.";
-$L["make_data_set_public_agreement"] = "Entiendo que para compartir este conjunto de datos necesit hacerlo público.";
-$L["clear_the_page"] = "Limpiar la página";
-$L["link_to_this_data_set"] = "Enlazar a este conjunto de datos";
-$L["save"] = "Salvar";
-$L["your_data_set_name_here"] = "El nombre de tu conjunto de datos va aquí...";
-$L["country_specific_data"] = "Datos específicos de país";
-$L["data_set_help"] = "Aquí es donde defines exactamente qué tipo de datos quieres generar. Prueba a rellenar una fila o dos y haz clic en el botón Generar. Te harás una idea bastante buena.";
-$L["export_types"] = "Tipos de exportación";
-$L["export_types_help"] = "Esta sección te permite controlar el formato de generación de tus datos. Cada formato puede proveer diferentes opciones para permitirte adaptar la salida a lo que quieres exactamente.";
-$L["hide_data_format_options"] = "ocultar opciones de formato de datos";
-$L["show_data_format_options"] = "mostrar opciones de formato de datos";
-$L["rows"] = "filas";
-$L["generate_in_page"] = "Generar en la página";
-$L["new_window_or_tab"] = "Nueva ventana/solapa";
-$L["prompt_to_download"] = "Solicitar la descarga";
-$L["cancel"] = "cancelar";
-$L["regenerate"] = "Regenerar";
-$L["generated_X_of_Y_results"] = "Generados <span id=\"gdGenerateCount\"></span> de <span id=\"gdGenerateTotal\"></span> resultados";
-$L["plugins"] = "Complementos";
-$L["plugins_intro"] = "Cada vez que añades o eliminas un complemento, necesitarás restablecer los complementos. Esto actualizará la base de datos y asegurará que puedes acceder a los complementos que requieres.";
-$L["reset_plugins"] = "Restablecer complementos";
-$L["misc"] = "Miscelánea";
-$L["theme"] = "Tema";
-$L["developer"] = "Desarrollador";
-$L["developer_intro"] = "Las siguientes secciones te permiten ajustar lo que verás en tu consola JavaScript cuando desarrolles.";
-$L["list_console_warn_events"] = "Listar eventos console.warn()";
-$L["list_module_publish_events"] = "Listar eventos <b>publish</b> de módulo";
-$L["list_module_subscribe_events"] = "List eventos <b>subscribe</b> de módulo";
-$L["list_core_events"] = "Listar eventos <b>core</b>";
-$L["limit_pub_sub_console_messages"] = "Limitar mensajes pub/sub de consola a los módulos específicos:";
-$L["all_data_type_plugins"] = "Todos los complementos de tipos de dato";
-$L["all_export_type_plugins"] = "Todos los complementos de tipos de exportación";
-$L["about_title"] = "¿Qué <i>es</i> esto?";
-$L["about_para1"] = "Algunas veces necesitas datos falsos para cosas como probar programas, rellenar bases de datos y crear maquetas de aspecto realista. Para texto, tenemos el <i>lorem ipsum</i> pero, ¿y para todo lo demás? Esta herramienta fue escrita para proveer de una forma sencilla y rápida de generar grandes volúmenes de datos personalizados en cualquier formato que requieras.";
-$L["about_para2"] = "La página <b>Generar</b> contiene el programa completo: sólo tienes que rellenar varios campos de la página para construir el conjunto de datos en que estés interesado y entonces hacer clic en el botón Generar. Y todo listo, fácil, ¿no?";
-$L["extend_id"] = "Ampliarlo";
-$L["about_para3"] = "El programa viene pre-configurado con la funcionalidad general que necesitas, pero no está completo. Puede que necesites generar ecuaciones matemáticas aleatorias, poner tweets aleatorios o visualizar imágenes aleatorias desde Flickr con la palabra \"Petirrojo\" en el título. ¿Quién sabe?, cada persona es un caso diferente.";
-$L["about_para4"] = "Con esto en mente, la nueva versión del programa (3.0.0+) fue diseñada para ser totalmente extensible: los desarrolladores pueden escribir sus propios tipos de dato para generar nuevos tipos de datos aleatorios e incluso personalizar los tipos de exportación, es decir, el formato en que se salen los datos. Para gente interesada en datos de localización geográfica más precisos, también pueden añadir nuevos complementos de país que provean nombres de región (estados, provincias, territorios, etc.), nombres de ciudades y formatos de código postal para el país de su elección.";
-$L["about_para5"] = "Para más información sobre como ampliarlo, visita la <a href=\"docs/\">documentación de desarrollo</a>.";
-$L["a_few_links"] = "Unos pocos enlaces";
-$L["fork_on_github"] = "Ver el código en Github";
-$L["read_developer_doc"] = "Leer la documentación de desarrollo";
-$L["goto_website"] = "Ir al sitio web";
-$L["latest_project_news"] = "Últimas noticias del proyecto";
-$L["last_edited"] = "editado por último";
-$L["last_saved"] = "salvado por último";
-$L["please_confirm"] = "Por favor, confirma";
-$L["yes"] = "Sí";
-$L["no"] = "No";
-$L["not_saved"] = "no salvado";
-$L["please_enter_all"] = "Por favor, introduce todo";
-$L["export_type_validate_error"] = "¡Vaya! Ha habido un error en la función validate() del tipo de exportación. Lo siento, no es posible proceder. ¡Avisa al desarrollador!";
-$L["refresh_page"] = "Refrescar página";
-$L["close"] = "Cerrar";
-$L["anonymous_admin_account"] = "Cuenta anónima de administración";
-$L["report_bug"] = "Informar de un error";
-$L["developer_doc"] = "Documentación de desarrollo";
-$L["no_data_types_found"] = "Tipos de dato no encontrados";
-$L["no_export_types_found"] = "Tipos de exportación no encontrados";
-$L["installation_error"] = "Error de installation";
-$L["continue_rightarrow"] = "Continuar &raquo;";
-$L["check_database_info"] = "Verificar información de la base de datos";
-$L["create_settings_file"] = "Crear fichero de ajustes";
-$L["complete_excl"] = "¡Completado!";
-$L["installation_step2_intro"] = "Hasta aquí, todo bien. Ahora haz clic en el botón de abajo para crear tu fichero <b>settings.php</b>. Este fichero se almacena en la carpeta raíz de esta aplicación y es el único lugar (distinto de la base de datos) que almacena la información a medida de tu instalación.";
-$L["create_file_rightarrow"] = "Crear fichero &raquo;";
-$L["installation_step3_intro"] = "Tienes tres opciones a elegir para el modo en que la instalación gestiona las cuentas de usuario.";
-$L["single_anonymous_user_account"] = "Sencillo, cuenta anónima";
-$L["single_user_account_requires_login"] = "Una sola cuenta de usuario, requiere entrada";
-$L["multiple_accounts"] = "Varias cuentas";
-$L["goto_script_rightarrow"] = "Ir al programa &raquo;";
-$L["enter_user_account_details"] = "Por favor, introduce los detalles de tu cuenta de usuario más abajo.";
-$L["installation_plugin_intro"] = "Casi hemos terminado. Ahora, vamos a instalar los complementos realmente <i>útiles</i>En concreto, el tipo de datos que puedes generar (Data Types), el formato de los datos generados (Export Types) y todos los datos específicos de cada país como regiones y ciudades.";
-$L["install_plugins_rightarrow"] = "Instalar complementos &raquo;";
-$L["installation_complete_text"] = "El generador de datos ha sido instalado con éxito. Haz clic en el botón de más abajo para ir a GenerateData.com.";
-$L["please_login"] = "Por favor, entra";
-$L["forgotten_your_password_q"] = "¿Olvidate tu contraseña?";
-$L["admin"] = "Administrador";
-$L["user"] = "Ususario";
-$L["logout"] = "Salir";
-$L["create_account"] = "Crear cuenta";
-$L["edit"] = "Editar";
-$L["delete"] = "Eliminar";
-$L["no_user_accounts_defined"] = "No hay cuentas creadas.";
-$L["num_records_generated"] = "Generados";
-$L["last_logged_in"] = "Última entrada";
-$L["date_created"] = "Fecha de creación";
-$L["user_account_section_intro"] = "Esta sección te permite crear cualquier número de cuentas de usuario para permitir usar GenerateData.com a la gente. Sólo podrás crear o eliminar cuentas.";
-$L["email_user_login_info"] = "Enviar un correo con su información de entrada";
-$L["create_account_rightarrow"] = "Crear cuenta &raquo;";
-$L["delete_account"] = "Eliminar cuenta";
-$L["update_account"] = "Actualizar cuenta";
-$L["confirm_delete_user_account"] = "¿Estás seguro de querer eliminar esta cuenta de usuario?";
-$L["success"] = "éxito";
-$L["error"] = "error";
-$L["invalid_password"] = "Lo siento, esa contraseña no es correcta. Inténtalo de nuevo.";
-$L["reset_password"] = "Restablecer contraseña";
-$L["password_reset_email_content1"] = "Tu contraseña ha sido restablecida. Ya puedes usar la siguiente contraseña para entrar: %1";
-$L["password_reset_email_content2"] = "Por favor, cámbiala una vez hayas entrado de nuevo.";
-$L["password_reset_complete"] = "Tu contraseña ha sido restablecida y hemos enviado un correo electrónico con la nueva contraseña.";
-$L["email_not_sent"] = "No se ha podido enviar el correo de notificación.";
-$L["user_not_found"] = "Lo siento, no te hemos podido identificar.";
-$L["account_created_msg"] = "Se ha creado una cuenta para ti.";
-$L["account_created"] = "Cuenta creada";
-$L["invalid_account_id"] = "El identificador de cuenta no es válido.";
-$L["account_info"] = "Información de cuenta";
-$L["account_updated"] = "Tu cuenta ha sido actualizada.";
-$L["password_change_note"] = "Sólo necesitas rellenar los campos de contraseña sólo si quieres cambiarla.";
-$L["info_and_stats"] = "Información y estadísticas";
-$L["account_settings"] = "Ajustes de cuenta";
-$L["enter_email_address_to_reset_password"] = "Introduce tu dirección de correo más abajo para restablecer tu contraseña.";
-$L["extend_it"] = "Ampliarlo";
-$L["africa"] = "África";
-$L["asia"] = "Ásia";
-$L["europe"] = "Europa";
-$L["north_america"] = "Norteamérica";
-$L["central_america"] = "América Central";
-$L["south_america"] = "Sudamérica";
-$L["oceania"] = "Oceanía";
-$L["all_countries"] = "Todos los países";
-$L["link_to_data_set"] = "Enlazar a conjunto de datos";
-$L["login"] = "Conexión";
-$L["forgot_password"] = "Contraseña olvidada";
-$L["admin_account"] = "Cuenta de administración";
-$L["feature_enabled"] = "Habilitado";
-$L["anonymous_access"] = "Acceso anónimo";
-$L["anonymous_user_desc"] = "Los usuarios anónimos pueden usar GenerateData.com, pero tienen acceso limitado: no pueden salvar, enlazar a sus conjuntos de datos o generar más de 100 filas cada vez.";
-$L["anonymous_user_message"] = "Mensaje a mostrar a los usuarios anónimos cuando intentan salvar:";
-$L["anonymous_user_default_message"] = "Por favor, conéctate o envía un correo a alguien@tusitio.com para obtener una cuenta de usuario.";
-$L["login_url_c"] = "URL de conexión:";
-$L["email_c"] = "Correo electrónico:";
-$L["password_c"] = "Contraseña:";
-$L["no_account_found"] = "Lo siento, no se encontró esa cuenta.";
-$L["update"] = "Actualizar";
-$L["documentation"] = "Documentación";
-$L["install_user_doc_link"] = "Para encontrar información más detallada sobre el proceso de instalación, visita nuestra <a href=\"http://benkeen.github.io/generatedata/install.html\" target=\"_blank\">documentación de usuario</a>.";
-$L["num_rows_too_large"] = "Lo siento, sólo puedes generar <b>%1</b> filas cada vez. Haz clic en generar para continuar.";
-$L["fork_this_project_on_github"] = "Vista este proyecto en Github";
-$L["download"] = "Descargar";
-$L["loading"] = "Cargando...";
-$L["validation_account_already_exists"] = "Lo siento, ya existe una cuenta con esa dirección de correo electrónico.";
-$L["validation_not_logged_in"] = "No apareces como conectado. Por favor, intenta conectarte de nuevo.";
-$L["validation_invalid_permissions"] = "No tienes permiso para hacer esto.";
-$L["installation_failed_create_settings_file"] = "El script no pudo crear el archivo <b>settings.php</b>.";
-$L["installation_failed_create_settings_file_msg"] = "Esto suele ocurrir cuando se deja de tener permisos para escribir en la carpeta. Por favor, cree manualmente este archivo y colocarlo en la carpeta base del generador de datos. Una vez hecho esto, el botón de abajo para continuar la instalación.";
-$L["confirm_file_exists"] = "Confirmar archivo existe";
-$L["reset_plugins_with_bundling"] = "<b>Has agrupación / minificación habilitado</b>. Después de hacer clic en este botón usted tendrá que ejecutar <i>Grunt</i> para volver a crear los paquetes. Para obtener más información <a href=\"http://benkeen.github.io/generatedata/developer.html#bundling\" target=\"_blank\">leer esta página de documentación</a>. Si tiene algún problema, es posible que desee desactivar la agrupación.";
-$L["cannot_change_num_rows"] = "Lo sentimos, no tienes permiso para cambiar el número de filas generadas.";
-$L["zip_q"] = "Zip?";
-$L["please_enter_data_set_name"] = "Por favor, introduzca el nombre del nuevo conjunto de datos.";
-$L["delete_1_data_set"] = "Eliminar 1 Conjunto de Datos";
-$L["delete_N_data_sets"] = "Eliminar %1 Conjuntos de Datos";
\ No newline at end of file
diff --git a/resources/lang/fr.php b/resources/lang/fr.php
deleted file mode 100755
index 8e142f391..000000000
--- a/resources/lang/fr.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-
-$L = array();
-$L["language"] = "Français";
-$L["ENABLED"] = true;
-
-// Category: Core
-$L["a_few_links"] = "Quelques liens";
-$L["about"] = "A propos";
-$L["about_para1"] = "Il peut arriver que vous ayez besoin de fausses données pour tester un logiciel, remplir et créer des bases de données réalistes, ... Pour le texte nous avons <i>lorem ipsum</i>, mais pour tout le reste ...? Cet outil a été créé afin de fournir un moyen rapide et simple de générer d'importants volumes de données personnalisées dans n'importe quel format.";
-$L["about_para2"] = "Le menu <b>Générer</b> contient l'intégralité de l'application: il suffit de remplir les différents champs de la page afin de construire le jeu de données qui vous intéresse, puis de cliquez sur le bouton Générer. Et hop! Facile, hein?";
-$L["about_para3"] = "Le script tel quel contient les fonctionnalités dont vous avez généralement besoin. Mais rien n'est jamais complet: vous avez peut-être besoin de générer au hasard des équations mathématiques ésotériques, de récupérer des tweets ou d'afficher des images aléatoires provenant de Flickr et contenant le mot \"Red-backed\" dans le titre. Qui sait. L'utilisation de chacun est différente.";
-$L["about_para4"] = "Dans cet esprit, la nouvelle version du script (3.0.0 +) a été conçue pour être entièrement extensible: les développeurs peuvent écrire leurs propres types de données afin de générer de nouvelles données aléatoires, et même personnaliser les Types d'Export - c'est à dire le format des données de sortie. Pour les personnes intéressées par la génération plus précises de données géographiques localisées, il est également possible d'ajouter de nouveaux plugins Pays qui fournissent des noms de régions (Etats, provinces, territoires, etc), des noms de villes et des codes postaux pour le pays de leur choix.";
-$L["about_para5"] = "Pour plus d'informations sur la façon d'améliorer le logiciel, visitez la <a href=\"docs/\">documentation développeur</a>.";
-$L["about_title"] = "C'est <i>quoi</i> ce truc?";
-$L["account_created"] = "Compte utilisateur créé";
-$L["account_created_msg"] = "Un compte a été créé avec succès.";
-$L["account_info"] = "Informations sur le compte";
-$L["account_settings"] = "Paramètres du compte";
-$L["account_type"] = "Type de compte";
-$L["account_updated"] = "Votre compte a été mis à jour.";
-$L["accounts"] = "Comptes";
-$L["add"] = "Ajouter";
-$L["admin"] = "Administrateur";
-$L["admin_account"] = "Compte Administrateur";
-$L["africa"] = "Afrique";
-$L["all_countries"] = "Tous les pays";
-$L["all_data_type_plugins"] = "Tous les plugins de types de données";
-$L["all_export_type_plugins"] = "Tous les plugins d'export";
-$L["anonymous_access"] = "Accès anonyme";
-$L["anonymous_admin_account"] = "Compte Administrateur anonyme";
-$L["anonymous_user_default_message"] = "Connectez-vous ou envoyez un email à someone@yoursite.com pour obtenir un compte utilisateur.";
-$L["anonymous_user_desc"] = "Les utilisateurs anonymes peuvent utiliser le script, mais ont un accès limité: ils ne peuvent ni enregistrer, ni générer un lien vers leurs données, ni générer plus de 100 lignes à la fois.";
-$L["anonymous_user_message"] = "Message à afficher aux utilisateurs anonymes qui essayent d'enregistrer:";
-$L["asia"] = "Asie";
-$L["back"] = "Retour";
-$L["blog"] = "Blog";
-$L["cancel"] = "Annuler";
-$L["cannot_change_num_rows"] = "Désolé, vous n'êtes pas autorisé à modifier le nombre de lignes générées.";
-$L["central_america"] = "Amérique Centrale";
-$L["check_database_info"] = "Base de données";
-$L["clear_the_page"] = "Vider la page";
-$L["close"] = "Fermer";
-$L["complete_excl"] = "Terminé!";
-$L["confirm_delete_form"] = "Êtes-vous sûr de vouloir supprimer ce formulaire?";
-$L["confirm_delete_user_account"] = "Êtes-vous sûr de vouloir supprimer ce compte utilisateur?";
-$L["confirm_empty_form"] = "Êtes-vous sûr de vouloir vider le formulaire?";
-$L["confirm_file_exists"] = "Fichier existant";
-$L["continue_rightarrow"] = "Continuer »";
-$L["countries"] = "Pays";
-$L["country_specific_data"] = "Données spécifiques aux pays...";
-$L["create_account"] = "Créer un compte";
-$L["create_account_rightarrow"] = "Créer un compte »";
-$L["create_file_rightarrow"] = "Créer un fichier »";
-$L["create_settings_file"] = "Fichier de paramètres";
-$L["data_created"] = "Données créées";
-$L["data_format"] = "Format des données";
-$L["data_set"] = "Jeu de données";
-$L["data_set_help"] = "C'est ici que vous définissez précisément le genre de données que vous souhaitez générer. Essayez de remplir une ligne ou deux et cliquez sur le bouton Générer. Vous comprendrez le fonctionnement très rapidement !";
-$L["data_set_name"] = "Nom du jeu de données";
-$L["data_type"] = "Type de données";
-$L["data_types"] = "Types de données";
-$L["database_info"] = "Informations de la base de données";
-$L["database_name"] = "Nom de la base de données";
-$L["date_account_created"] = "Date de création du compte";
-$L["date_created"] = "Date de création";
-$L["default_language"] = "Langue par défaut";
-$L["default_save_form_empty_str"] = "Entrez le nom du formulaire ici";
-$L["del"] = "Sup";
-$L["del_uc"] = "SUP";
-$L["delete"] = "Supprimer";
-$L["delete_1_data_set"] = "Supprimer une Data Set";
-$L["delete_N_data_sets"] = "Supprimer %1 Data Set";
-$L["delete_account"] = "Supprimer le compte";
-$L["developer"] = "Développeur";
-$L["developer_doc"] = "Doc développeur";
-$L["developer_intro"] = "Les sections suivantes vous permettent de personnaliser ce que vous voyez dans votre console javascript (à des fins de développement).";
-$L["documentation"] = "Documentation";
-$L["donate"] = "Faites un don!";
-$L["download"] = "Télécharger";
-$L["edit"] = "Éditer";
-$L["email"] = "Email";
-$L["email_c"] = "Email:";
-$L["email_not_sent"] = "Nous n'avons pas pu envoyer la notification email.";
-$L["email_user_login_info"] = "Envoyer à l'utilisateur ses informations de connexion";
-$L["empty_form"] = "Formulaire vide";
-$L["enter_email_address_to_reset_password"] = "Entrez votre adresse e-mail ci-dessous pour réinitialiser votre mot de passe.";
-$L["enter_user_account_details"] = "Entrez vos informations de compte d'utilisateur ci-dessous.";
-$L["error"] = "Erreur";
-$L["europe"] = "Europe";
-$L["examples"] = "Exemples";
-$L["export_type_validate_error"] = "Arf! Il y a une erreur dans la fonction validate() du type d'Export. Contactez un développeur!";
-$L["export_types"] = "Types d'Exports";
-$L["export_types_help"] = "Cette section vous permet de contrôler le format de vos données générées. Chaque format peut offrir différentes options pour vous permettre d'adapter la sortie à ce que vous voulez exactement.";
-$L["extend_id"] = "Commet l'améliorer";
-$L["extend_it"] = "Commet l'améliorer";
-$L["fatal_error"] = "Une erreur fatale s'est produite.";
-$L["feature_enabled"] = "Activé";
-$L["first_name"] = "Prénom";
-$L["forgot_password"] = "Mot de passe oublié";
-$L["forgotten_your_password_q"] = "Vous avez oublié votre mot de passe?";
-$L["fork_on_github"] = "Fork du projet sur github";
-$L["fork_this_project_on_github"] = "Fork ce projet sur Github";
-$L["form_deleted"] = "Le formulaire a été supprimé.";
-$L["form_exists_overwrite_confirmation"] = "Ce formulaire existe déjà. Voulez-vous l'écraser?";
-$L["form_not_deleted"] = "Désolé, nous n'avons pas pu supprimer ce formulaire. Reconnectez-vous et essayez à nouveau.";
-$L["form_saved"] = "Votre formulaire a été enregistré.";
-$L["forums"] = "Forums";
-$L["generate"] = "Générer";
-$L["generate_in_page"] = "Générer dans la page";
-$L["generated_X_of_Y_results"] = "<span id=\"gdGenerateCount\"></span> sur <span id=\"gdGenerateTotal\"></span> résultats ont été générés.";
-$L["generator"] = "Générateur";
-$L["geo"] = "Géo.";
-$L["goto_script_rightarrow"] = "Aller au script »";
-$L["goto_website"] = "Accéder au site";
-$L["help"] = "Aide";
-$L["help_intro"] = "Le script d'installation fait deux choses pour vous. Premièrement, il génère automatiquement un fichier <b>settings.php</b> qui contient vos informations de connexion à la base de données. Deuxièmement, il remplit la base de données avec diverses informations dont il a besoin: les paramètres généraux, les comptes utilisateurs et les données brutes comme les noms, les prénoms, les pays et les villes, ...";
-$L["help_prereq_info"] = "Comme presque tous les autres script PHP / MySQL vous devez avoir déjà créé une base de données avant d'exécuter le script d'installation. <i> Le script d'installation ne crée pas la base de données, il essaie juste de s'y connecter pour créer les tables.</i> Si vous n'êtes pas sûr de savoir comment créer une base de données dans votre environnement, vous devrez soit contacter votre fournisseur d'hébergement, soit passer un peu de temps dans des recherches sur Google. Désolé!";
-$L["help_prerequisites"] = "Pré-requis";
-$L["hide_data_format_options"] = "Cacher les options de formatage des données";
-$L["hide_error"] = "Cacher l'erreur";
-$L["host_name"] = "Nom de l'hôte";
-$L["human_data"] = "Données humaines";
-$L["info_and_stats"] = "Informations et statistiques";
-$L["install"] = "Installer";
-$L["install_invalid_db_info"] = "Impossible de se connecter à la base de données en utilisant les informations que vous avez fournies. Le message d'erreur retourné par la base de données est : <i>{\$db_connection_error}</i>";
-$L["install_no_db_connection"] = "Veuillez vérifier le nom de la base et les informations de connexion à la base de données. Bien que nous ayons été en mesure de nous connecter au serveur nous n'avons pas pu nous connecter à la base de données. Le message d'erreur retourné par la base de données est : <i>{\$db_select_error}</i>";
-$L["install_plugins_rightarrow"] = "Installer les Plugins &raquo;";
-$L["install_user_doc_link"] = "Pour des informations plus détaillées sur le processus d'installation, consultez notre <a href=\"http://benkeen.github.io/generatedata/install.html\" target=\"_blank\">documentation utilisateur</a>.";
-$L["installation"] = "Installation";
-$L["installation_complete_text"] = "Le générateur de données a été installé avec succès! Cliquez sur le bouton ci-dessous pour accéder à l'application.";
-$L["installation_error"] = "Erreur lors de l'installation";
-$L["installation_failed_create_settings_file"] = "Le script n'a pas réussi à créer le fichier <b>settings.php</b>.";
-$L["installation_failed_create_settings_file_msg"] = "Cela se produit généralement quand il ne parvient pas à avoir les autorisations pour écrire dans le dossier. Créez manuellement ce fichier et placez-le dans le dossier racine du générateur de données. Utilisez ensuite le bouton ci-dessous pour poursuivre l'installation.";
-$L["installation_intro"] = "Bien, finissons cette fichue installation. Saisissez vos informations de base de données pour créer les tables nécessaires. Si vous ne savez pas comment remplir ces champs, cliquez sur l'onglet Aide pour en savoir un peu plus.";
-$L["installation_plugin_intro"] = "C'est presque fini! Maintenant, nous allons installer les plugins qui rendent le générateur de données réellement utile: ce sont les types de données que vous pouvez générer, le format des données de sortie (Types d'export) et toutes les données spécifiques à chaque pays comme les régions et les villes.";
-$L["installation_step2_intro"] = "Jusqu'ici tout va bien! Maintenant cliquez sur le bouton ci-dessous pour créer votre fichier <b>settings.php</b>. Ce fichier est stocké dans le dossier racine du site et est le seul endroit (autre que la base de données) qui stocke des informations personnalisées sur votre installation.";
-$L["installation_step3_intro"] = "Vous avez trois choix de type de gestion des comptes utilisateurs.";
-$L["invalid_account_id"] = "Le numéro de compte n'est pas valide.";
-$L["invalid_custom_xml"] = "Il ya un problème avec le balisage XML personnalisée que vous avez entré. Consultez la documentation utilisateur pour plus d'informations.";
-$L["invalid_num_results"] = "Entrez un nombre valide de lignes à générer.";
-$L["invalid_password"] = "Désolé, ce mot de passe n'est pas correct. Veuillez essayer de nouveau.";
-$L["invalid_table_names"] = "Les noms des colonnes d'une base de données ne peut contenir que des caractères alphanumériques et doit commencer par une lettre. Corrigez les lignes suivantes:";
-$L["last_edited"] = "Dernière modification le";
-$L["last_logged_in"] = "Dernière session";
-$L["last_modified"] = "Dernière mise à jour";
-$L["last_name"] = "Nom de famille";
-$L["last_saved"] = "Dernier enregistrement";
-$L["latest_project_news"] = "Dernières nouvelles du projet";
-$L["limit_pub_sub_console_messages"] = "Limiter l'affichage des messages de la console pour des modules spécifiques:";
-$L["link_to_data_set"] = "Lien vers le jeu de données";
-$L["link_to_this_data_set"] = "Partager ce jeu de données";
-$L["list_console_warn_events"] = "Afficher les événements Console.warn()";
-$L["list_core_events"] = "Afficher les événements de la base du script";
-$L["list_module_publish_events"] = "Afficher les événements des modules de <b>publication</b>";
-$L["list_module_subscribe_events"] = "Afficher les événements des modules de <b>souscription</b>";
-$L["load"] = "Charger";
-$L["load_uc"] = "CHARGE";
-$L["loading"] = "Chargement...";
-$L["login"] = "Login";
-$L["login_url_c"] = "URL de connexion:";
-$L["logout"] = "Déconnexion";
-$L["make_data_set_public_agreement"] = "Je comprends que pour partager ce jeu de données j'ai besoin de le rendre public.";
-$L["math"] = "Maths";
-$L["meta_description"] = "GenerateData.com: logiciel libre sous licence GNU GPL, générateur aléatoire de données personnalisé pour tester des applications.";
-$L["meta_keywords"] = "Données aléatoires, données d'essais, exemples, générateur de données, générer des données";
-$L["misc"] = "Divers";
-$L["missing_node_names"] = "Les lignes suivantes nécessitent un nom de noeud:";
-$L["missing_table_names"] = "Les lignes suivantes nécessitent un nom de colonne de la table:";
-$L["multiple_accounts"] = "Comptes multiples";
-$L["mysql_password"] = "Mot de passe MySQL";
-$L["mysql_table_prefix_desc"] = "Cela ajoute un préfixe à toutes les tables de la base de données, afin d'éviter les conflits avec les noms des tables existantes.";
-$L["mysql_username"] = "Nom d'utilisateur MySQL";
-$L["new_window_or_tab"] = "Nouvelle fenêtre / onglet";
-$L["no"] = "Aucun";
-$L["no_account_found"] = "Désolé, ce compte n'a pas été trouvé.";
-$L["no_additional_export_type_settings"] = "Pas de paramètres supplémentaires pour ce type d'export.";
-$L["no_csv_delimiter"] = "Entrez le délimiteur CSV.";
-$L["no_data"] = "Oups, rien à générer! Entrez des données à générer.";
-$L["no_data_types_found"] = "Aucun Types de données trouvé";
-$L["no_examples_available"] = "Aucun exemple disponible.";
-$L["no_export_types_found"] = "Aucun type d'export trouvé";
-$L["no_form_name"] = "Entrez le nom du formulaire.";
-$L["no_js"] = "L'activation du JavaScript est requis pour utiliser cette application.";
-$L["no_js_blurb"] = "Vous savez que c'est le 21e siècle? Le script du Générateur de données s'appuie fortement sur le JavaScript: rien ne peut fonctionner sans lui. Vous devez l'activer dans votre navigateur puis actualiser cette page.";
-$L["no_num_rows"] = "Entrez le nombre de lignes à générer.";
-$L["no_options_available"] = "Aucune option disponible.";
-$L["no_saved_data_sets"] = "Vous n'avez aucun jeu de données sauvegardé.";
-$L["no_user_accounts_defined"] = "Aucun comptes d'utilisateurs n'est défini.";
-$L["node_name"] = "Nom du noeud";
-$L["none"] = "Aucun";
-$L["north_america"] = "Amérique du Nord";
-$L["not_saved"] = "Non enregistré";
-$L["notify_settings_updated"] = "Vos paramètres ont été mis à jour.";
-$L["num_records_generated"] = "Lignes générées";
-$L["num_results"] = "Résultats";
-$L["num_rows_too_large"] = "Désolé, vous êtes limité à la génération de <b>%1</b> lignes à la fois. Cliquez sur Générer pour continuer.";
-$L["num_saved_data_sets"] = "Jeux de données sauvegardés";
-$L["numeric"] = "Numérique";
-$L["oceania"] = "Océanie";
-$L["ok"] = "Ok";
-$L["options"] = "Options";
-$L["order"] = "Ordre";
-$L["other"] = "Autre";
-$L["password"] = "Mot de passe";
-$L["password_c"] = "Mot de passe:";
-$L["password_change_note"] = "Il vous suffit de remplir les champs de mot de passe si vous en voulez le changer.";
-$L["password_reset_complete"] = "Votre mot de passe a été réinitialisé et vous a été envoyé.";
-$L["password_reset_email_content1"] = "Votre mot de passe a été réinitialisé. Vous pouvez utiliser le mot de passe ci-dessous pour vous connecter: %1";
-$L["password_reset_email_content2"] = "Veuillez le changer une fois connecté.";
-$L["please_confirm"] = "Confirmer";
-$L["please_enter_all"] = "Veuillez renseigner tous les champs obligatoires.";
-$L["please_enter_data_set_name"] = "S'il vous plaît entrez le nom du nouveau jeu de données.";
-$L["please_fix_errors"] = "Corriger les erreurs suivantes et réessayez: ";
-$L["please_login"] = "Connection obligatoire";
-$L["please_select"] = "Sélection  obligatoire";
-$L["plugins"] = "Plugins";
-$L["plugins_intro"] = "Chaque fois que vous ajoutez ou supprimez un plugin, vous devez réinitialiser les plugins. Cela mettra à jour la base de données et vous assurera de pouvoir accéder aux plugins dont vous avez besoin.";
-$L["prompt_to_download"] = "Télécharger comme fichier";
-$L["public_q"] = "Publique ?";
-$L["read_developer_doc"] = "Lire la documentation pour les développeurs";
-$L["reenter_password"] = "Nouveau mot de passe";
-$L["refresh_page"] = "Actualiser la page";
-$L["regenerate"] = "Régénérer";
-$L["report_bug"] = "Signaler un bug";
-$L["reset_password"] = "Réinitialiser mot de passe";
-$L["reset_plugins"] = "Réinitialiser les plugins";
-$L["reset_plugins_with_bundling"] = "<b>Vous avez groupage / minification permis</b>. Après avoir cliqué sur ce bouton, vous devrez exécuter <i>Grunt</i> pour recréer les faisceaux. Pour plus d'informations <a href=\"http://benkeen.github.io/generatedata/developer.html#bundling\" target=\"_blank\">lire cette page de documentation</a>. Si vous avez des problèmes, vous pouvez éteindre regroupement.";
-$L["result_type"] = "Type de résultat";
-$L["row_label"] = "Titre de colonne";
-$L["row_label_plural"] = "Titres des colonnes";
-$L["row_sp"] = "Ligne(s)";
-$L["rows"] = "lignes";
-$L["rows_generated"] = "Lignes générées";
-$L["save"] = "Sauver";
-$L["save_data_set_to_link"] = "Erreur: afin de partager ce jeu de données avec d'autres personnes: vous devez l'enregistrer d'abord.";
-$L["save_uc"] = "SAUVER";
-$L["script_thinking"] = "Oups, attendez une seconde, le script est en train de réfléchir.";
-$L["see_help_dialog"] = "Consulter l'aide.";
-$L["select_data_type"] = "Choix du type de données";
-$L["select_language"] = "Choix de la langue";
-$L["settings"] = "Réglages";
-$L["settings_file_exists"] = "Le fichier de paramètres existe déjà. Pour une nouvelle installation le fichier settings.php ne devrait pas exister. Vous pouvez soit le supprimer et continuer le script d'installation, soit essayer de charger à nouveau le script avec les valeurs existantes du fichiers de réglages.";
-$L["show_data_format_options"] = "Afficher les options de formatage des données";
-$L["single_anonymous_user_account"] = "Un seul compte utilisateur, connexion anonyme";
-$L["single_user_account_requires_login"] = "Un seul compte utilisateur, nécessite une connexion";
-$L["south_america"] = "Amérique du Sud";
-$L["still_stuck"] = "Toujours bloqué?";
-$L["success"] = "Succès";
-$L["table_column"] = "Colonne de table";
-$L["table_prefix"] = "Préfixe de table";
-$L["text"] = "Texte";
-$L["theme"] = "Thème";
-$L["tip_country_data"] = "<p>Cette section vous permet de choisir quelles données spécifiques au pays doivent être inclus dans vos jeux de données générés. Les valeurs que vous sélectionnez ici affectent certains types de données que vous pouvez sélectionner, comme <i>Région</i>, <i>Code Postal</i> et <i>Pays</i>.</p><p>Pour vous donner une meilleure idée de ce que cela signifie, essayez de sélectionner le type de données <i>Région</I> pour l'une de vos lignes dans la section Type de données, puis ajoutez ou retiree un pays de la section <i>Données spécifiques aux pays</i>. Vous verrez que les options de ligne qui apparaissent sont directement induites par les pays que vous avez sélectionné: vous pouvez générer qu'un sous-ensemble des pays sélectionnés.";
-$L["title"] = "generatedata.com";
-$L["total_rows_generated"] = "Nombre total de lignes générées";
-$L["update"] = "Mettre à jour";
-$L["update_account"] = "Mise à jour du compte";
-$L["update_settings"] = "Mise à jour des paramètres";
-$L["use_custom_xml_format"] = "Utilisez un format XML personnalisé";
-$L["user"] = "Utilisateur";
-$L["user_account"] = "Compte utilisateur";
-$L["user_account_section_intro"] = "Cette section vous permet de créer un nombre illimité de comptes utilisateurs pour permettre l'accès au script. Seul vous, l'administrateur, a l'autorisation de créer ou de supprimer des comptes.";
-$L["user_accounts"] = "Comptes utilisateurs";
-$L["user_not_found"] = "Désolé, nous n'avons pas pu vous identifier.";
-$L["validation_account_already_exists"] = "Désolé, un compte avec cette adresse e-mail existe déjà.";
-$L["validation_invalid_chars"] = "Caractères alphanumériques et underscore uniquement.";
-$L["validation_invalid_email"] = "Entrez une adresse email valide.";
-$L["validation_invalid_permissions"] = "Vous n'avez pas les permissions nécessaires.";
-$L["validation_no_db_hostname"] = "Entrer l'adresse du serveur de base de données.";
-$L["validation_no_db_name"] = "Entrez le nom de la base de données.";
-$L["validation_no_email"] = "Entrez votre adresse e-mail.";
-$L["validation_no_first_name"] = "Entrez votre prénom.";
-$L["validation_no_last_name"] = "Entrez votre nom de famille.";
-$L["validation_no_mysql_username"] = "Entrez votre nom d'utilisateur MySQL.";
-$L["validation_no_password"] = "ntrez votre mot de passe.";
-$L["validation_not_logged_in"] = "Vous ne semblez pas être connecté actuellement. Essayez de vous reconnecter.";
-$L["version"] = "Version";
-$L["website"] = "Site Web";
-$L["yes"] = "Oui";
-$L["your_account"] = "Votre compte";
-$L["your_data_set_name_here"] = "Nom du jeu de données...";
-$L["your_data_sets"] = "Vos jeux de données";
-$L["zip_q"] = "Zip?";
diff --git a/resources/lang/index.html b/resources/lang/index.html
deleted file mode 100644
index aa7b9c934..000000000
--- a/resources/lang/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-</body>
-</html>
\ No newline at end of file
diff --git a/resources/lang/ja.php b/resources/lang/ja.php
deleted file mode 100644
index be2337d7d..000000000
--- a/resources/lang/ja.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-
-
-$L = array();
-$L["ENABLED"] = false;
-
-// Core language strings
-$L["language"] = "日本語";
-$L["title"] = "generatedata.com";
-$L["about"] = "About";
-$L["accounts"] = "アカウント";
-$L["back"] = "戻る";
-$L["add"] = "登録";
-$L["confirm_delete_form"] = "本当にフォームを削除してもよろしいですか？";
-$L["confirm_empty_form"] = "本当にフォームをクリアしてもよろしいですか？";
-$L["countries"] = "Countries";
-$L["meta_description"] = "GenerateData.com: free, GNU-licensed, random custom data generator for testing software";
-$L["meta_keywords"] = "Random Data, Test Data, Sample Data, data generator, generate data";
-$L["row_label"] = "Column Title";
-$L["row_label_plural"] = "Column Titles";
-$L["update_settings"] = "Update Settings";
-$L["data_type"] = "Data Type";
-$L["default_save_form_empty_str"] = "Enter form name here";
-$L["del"] = "Del";
-$L["del_uc"] = "DEL";
-$L["donate"] = "Donate!";
-$L["empty_form"] = "Empty Form";
-$L["examples"] = "Examples";
-$L["fatal_error"] = "A fatal error occurred.";
-$L["form_deleted"] = "The form has been deleted.";
-$L["form_exists_overwrite_confirmation"] = "This form already exists. Do you want to overwrite it?";
-$L["form_not_deleted"] = "Sorry, we couldn&#39;t delete this form. Re-log in and try again.";
-$L["form_saved"] = "Your form has been saved.";
-$L["forums"] = "Forums";
-$L["generate"] = "Generate";
-$L["generator"] = "Generator";
-$L["help"] = "Help";
-$L["hide_error"] = "Hide error";
-$L["human_data"] = "Human Data";
-$L["math"] = "Math";
-$L["invalid_custom_xml"] = "There&#39;s a problem with the custom XML markup you entered. Please consult the user documentation for more information.";
-$L["invalid_num_results"] = "Please enter a valid number of results.";
-$L["invalid_table_names"] = "Database column names can only alphanumeric characters and must begin with a letter. Please fix the following rows:";
-$L["load_uc"] = "LOAD";
-$L["load"] = "Load";
-$L["missing_node_names"] = "The following rows have missing node names:";
-$L["missing_table_names"] = "The following rows have missing table column names:";
-$L["no_csv_delimiter"] = "Please enter the CSV delimiter.";
-$L["no_data"] = "Oops, nothing to generate! Enter some data to be generated.";
-$L["no_examples_available"] = "No examples available.";
-$L["no_form_name"] = "Please enter a form name.";
-$L["no_num_rows"] = "Please enter the number of rows to add.";
-$L["no_options_available"] = "No options available.";
-$L["none"] = "None";
-$L["num_results"] = "Num Results";
-$L["ok"] = "OK";
-$L["options"] = "Options";
-$L["order"] = "Order";
-$L["other"] = "Other";
-$L["please_fix_errors"] = "Please fix the following errors and resubmit:";
-$L["please_select"] = "Please Select";
-$L["select_data_type"] = "Select Data Type";
-$L["result_type"] = "Result Type";
-$L["row_sp"] = "Row(s)";
-$L["save_uc"] = "SAVE";
-$L["script_thinking"] = "Oops, hold on for a second. The script is thinking.";
-$L["see_help_dialog"] = "&nbsp;See help dialog.";
-$L["select_language"] = "Select Language";
-$L["table_column"] = "Table Column";
-$L["text"] = "Text";
-$L["use_custom_xml_format"] = "Use custom XML format";
-$L["website"] = "Website";
-$L["no_js"] = "Please enable javascript in your browser.";
-$L["no_js_blurb"] = "You know this is, like, the 21st century? The Data Generator script relies heavily on javascript - things just plain won't work without it. You&#39;ll need to enable it in your browser then refresh this page.";
-$L["install"] = "Install";
-$L["host_name"] = "Host Name";
-$L["installation"] = "Installation";
-$L["table_prefix"] = "Table Prefix";
-$L["database_name"] = "Database Name";
-$L["mysql_username"] = "MySQL Username";
-$L["mysql_password"] = "MySQL Password";
-$L["default_language"] = "Default Language";
-$L["installation_intro"] = "Alrighty, let's get this sucker installed. Enter your database information to create your database tables. If you're unsure about any of these fields, click on the Help tab for a little more info.";
-$L["version"] = "Version";
-$L["help_intro"] = "The installation script does two things for you. One, it automatically generates a <b>settings.php</b> file which contains your unique database connection info, so that it knows how to connect to the database whenever you visit the script. Two, it populates the database with various information that it needs: things like general settings, user accounts and raw data like people's names, country and city names.";
-$L["help_prerequisites"] = "Pre-requisites";
-$L["help_prereq_info"] = "Just like virtually every other PHP/MySQL script out there, you need to have already created a database before running the installation script. <i>The installation script doesn't create the database, it just tries to connect to it to create the tables.</i> If you're not sure how to create a database within your environment, you'll either need to contact your hosting provider, or spend some time researching it on Google. Sorry!";
-$L["host_name_desc"] = "The name of your database connection. Often it's just <i>localhost</i>, but sometimes it's something like <i>mysql.yoursite.com</i>.";
-$L["still_stuck"] = "Still stuck?";
-$L["refresh_page"] = "Refresh Page";
-$L["database_info"] = "Database Info";
-$L["user_account"] = "User Account";
-$L["user_accounts"] = "User Accounts";
-$L["password"] = "Password";
-$L["reenter_password"] = "Re-enter password";
-$L["email"] = "Email";
-$L["yes"] = "Yes";
-$L["no"] = "No";
-$L["validation_no_db_hostname"] = "Please enter your database hostname.";
-$L["validation_no_db_name"] = "Please enter your database name.";
-$L["validation_invalid_chars"] = "Alphanumeric and underscore characters only, please.";
-$L["validation_no_mysql_username"] = "Please enter your MySQL username.";
-$L["validation_no_email"] = "Please enter your email address.";
-$L["validation_invalid_email"] = "Please enter a valid email address.";
-$L["validation_no_first_name"] = "Please enter your first name.";
-$L["validation_no_last_name"] = "Please enter your last name.";
-$L["validation_no_password"] = "Please enter your password.";
-$L["install_invalid_db_info"] = "We were unable to connect to the database using the information you supplied. The error message the database returned is: <i>{\$db_connection_error}</i>";
-$L["install_no_db_connection"] = "Please check your database name and login information. Although we were able to connect to the database host, we could not connect to the database. The error message the database returned is: <i>{\$db_select_error}</i>";
-$L["settings_file_exists"] = "The settings file already exists. For new installations, the settings.php shouldn't exist. Either delete it and continue the installation script or try loading the script again with the existing settings file values.";
-$L["first_name"] = "First Name";
-$L["last_name"] = "Last Name";
-$L["settings"] = "Settings";
-$L["geo"] = "Geo";
-$L["numeric"] = "Numeric";
-$L["notify_settings_updated"] = "Your settings have been updated.";
-$L["tip_country_data"] = "This section lets you control what country-specific data should be included in your generated data sets. The values you select here affect certain Data Types that you may select, such as <i>Region</i>, <i>Postal/Zip</i> and <i>Country</i>.</p><p>To give you a better idea of what this means, try selecting the <i>Region</i> Data Type for one of your rows in the Data Set section, then add / remove countries from the Country-Specific Data section. You'll see that the row options that appear are directly affected by the countries you have selected: you can only ever generate a subset of the countries selected.";
-$L["country_specific_data"] = "Country-specific data";
-$L["data_set"] = "Data Set";
-$L["data_format"] = "Data Format";
-$L["no_additional_export_type_settings"] = "No additional export type settings.";
-$L["blog"] = "Blog";
-$L["your_account"] = "Your Account";
-$L["your_data_sets"] = "Your Data Sets";
-$L["data_types"] = "Data Types";
-$L["account_type"] = "Account type";
-$L["num_saved_data_sets"] = "Num Saved Data Sets";
-$L["total_rows_generated"] = "Total rows generated";
-$L["date_account_created"] = "Date account created";
-$L["no_saved_data_sets"] = "You don't have any saved data sets.";
-$L["data_set_name"] = "Data Set Name";
-$L["data_created"] = "Data Created";
-$L["last_modified"] = "Last Modified";
-$L["public_q"] = "Public?";
-$L["rows_generated"] = "Rows Generated";
-$L["save_data_set_to_link"] = "De-<i>nied</i>. In order to share this Data Set with other people, you need to save it first.";
-$L["make_data_set_public_agreement"] = "I understand that to share this Data Set, I need to make it public.";
-$L["clear_the_page"] = "Clear the Page";
-$L["link_to_this_data_set"] = "Link to this Data Set";
-$L["save"] = "Save";
-$L["your_data_set_name_here"] = "Your data set name here...";
-$L["country_specific_data"] = "Country-Specific Data";
-$L["data_set_help"] = "This is where you define exactly what kind of data you want to generate. Try filling in a row or two and click the Generate button. You'll get the hang of it pretty fast.";
-$L["export_types"] = "Export Types";
-$L["export_types_help"] = "This section lets you control the format of your generated data. Each format may provide different options to let you tailor the output to exactly what you want.";
-$L["hide_data_format_options"] = "hide data format options";
-$L["show_data_format_options"] = "show data format options";
-$L["rows"] = "rows";
-$L["generate_in_page"] = "Generate in-page";
-$L["new_window_or_tab"] = "New window/tab";
-$L["prompt_to_download"] = "Prompt to download";
-$L["cancel"] = "cancel";
-$L["regenerate"] = "Regenerate";
-$L["generated_X_of_Y_results"] = "Generated <span id=\"gdGenerateCount\"></span> of <span id=\"gdGenerateTotal\"></span> results";
-$L["plugins"] = "Plugins";
-$L["plugins_intro"] = "Any time you add or remove a plugin, you need to reset the plugins. This will update the database and ensure you can access the plugins you require.";
-$L["reset_plugins"] = "Reset plugins";
-$L["misc"] = "Misc";
-$L["theme"] = "Theme";
-$L["developer"] = "Developer";
-$L["developer_intro"] = "The following sections lets you fine-tune what you see in your javascript console for development purposes.";
-$L["list_console_warn_events"] = "List console.warn() events";
-$L["list_module_publish_events"] = "List module <b>publish</b> events";
-$L["list_module_subscribe_events"] = "List module <b>subscribe</b> events";
-$L["list_core_events"] = "List <b>core</b> events";
-$L["limit_pub_sub_console_messages"] = "Limit pub/sub console messages to specific modules:";
-$L["all_data_type_plugins"] = "All Data Type plugins";
-$L["all_export_type_plugins"] = "All Export Type plugins";
-$L["about_title"] = "What <i>is</i> this thing?";
-$L["about_para1"] = "Sometimes you need fake data for things like testing software, populating databases and creating realistic-looking mockups. For text, we have <i>lorem ipsum</i>; but for everything else...? This tool was written to provide a quick and simple way to let you generate large volumes of custom data in whatever format you require.";
-$L["about_para2"] = "The <b>Generate</b> page contains the entire script: just fill in the various fields in the page to construct the data set you're interested in, then click the Generate button. And hey presto! Easy, huh?";
-$L["extend_id"] = "Extend it";
-$L["about_para3"] = "The out-the-box script contains the sort of functionality you generally need. But nothing's ever complete - maybe you need to generate random esoteric math equations, pull random tweets or display random images from Flickr with the word \"Red-backed vole\" in the title. Who knows. Everyone's use-case is different.";
-$L["about_para4"] = "With this in mind, the new version of the script (3.0.0+) was designed to be fully extensible: developers can write their own Data Types to generate new types of random data, and even customize the Export Types - i.e. the format in which the data is output. For people interested in generating more accurate localized geographical data, they can also add new Country plugins that supply region names (states, provinces, territories etc), city names and postal/zip code formats for their country of choice.";
-$L["about_para5"] = "For more information on how to extend it, visit the <a href=\"docs/\">developer documentation</a>.";
-$L["a_few_links"] = "A few links";
-$L["fork_on_github"] = "Fork the code on github";
-$L["read_developer_doc"] = "Read the developer documentation";
-$L["goto_website"] = "Go to the website";
-$L["latest_project_news"] = "Latest project news";
-$L["last_edited"] = "last edited";
-$L["last_saved"] = "last saved";
-$L["please_confirm"] = "Please confirm";
-$L["yes"] = "Yes";
-$L["no"] = "No";
-$L["not_saved"] = "not saved";
-$L["please_enter_all"] = "Please enter all";
-$L["export_type_validate_error"] = "Ack! There was an error in the Export Type's validate() function. Sorry, we can't proceed - call a developer!";
-$L["refresh_page"] = "Refresh Page";
-$L["close"] = "Close";
-$L["anonymous_admin_account"] = "Anonymous admin account";
-$L["report_bug"] = "Report a bug";
-$L["developer_doc"] = "Developer doc";
-$L["no_data_types_found"] = "No Data Types found";
-$L["no_export_types_found"] = "No Export Types found";
-$L["installation_error"] = "Installation error";
-$L["continue_rightarrow"] = "Continue &raquo;";
-$L["check_database_info"] = "Check Database Info";
-$L["create_settings_file"] = "Create Settings File";
-$L["complete_excl"] = "Complete!";
-$L["installation_step2_intro"] = "So far so good! Now click the button below to create your <b>settings.php</b> file. This file is stored in the root folder of this application and is the only place (other than the database) that stores custom information about your installation.";
-$L["create_file_rightarrow"] = "Create File &raquo;";
-$L["installation_step3_intro"] = "You have three choices for the way your installation handles user accounts.";
-$L["single_anonymous_user_account"] = "Single, anonymous user account";
-$L["single_user_account_requires_login"] = "Single user account, requires login";
-$L["multiple_accounts"] = "Multiple accounts";
-$L["goto_script_rightarrow"] = "Go to script &raquo;";
-$L["enter_user_account_details"] = "Please enter your user account details below.";
-$L["installation_plugin_intro"] = "Almost done! Now we're going to install the plugins: these are what make the Data Generator actually <i>useful</i> - i.e. the type of data you can generate (Data Types), the format of the generated data (Export Types) and all the Country-specific data like regions and cities.";
-$L["install_plugins_rightarrow"] = "Install Plugins &raquo;";
-$L["installation_complete_text"] = "The Data Generator has been successfully installed! Click the button below to go to the script.";
-$L["please_login"] = "Please Login";
-$L["forgotten_your_password_q"] = "Forgotten your password?";
-$L["admin"] = "Admin";
-$L["user"] = "User";
-$L["logout"] = "Logout";
-$L["create_account"] = "Create Account";
-$L["edit"] = "Edit";
-$L["delete"] = "Delete";
-$L["no_user_accounts_defined"] = "No user accounts defined.";
-$L["num_records_generated"] = "Generated";
-$L["last_logged_in"] = "Last Logged In";
-$L["date_created"] = "Date Created";
-$L["user_account_section_intro"] = "This section lets you create any number of users accounts to allow people access to the script. Only you are able to create or delete accounts.";
-$L["email_user_login_info"] = "Email the user their login information";
-$L["create_account_rightarrow"] = "Create Account &raquo;";
-$L["delete_account"] = "Delete Account";
-$L["update_account"] = "Update Account";
-$L["confirm_delete_user_account"] = "Are you sure you want to delete this user account?";
-$L["success"] = "success";
-$L["error"] = "error";
-$L["invalid_password"] = "Sorry, that password is not correct. Please try again.";
-$L["reset_password"] = "Reset Password";
-$L["password_reset_email_content1"] = "Your password has been reset. You may use the following password to log in: %1";
-$L["password_reset_email_content2"] = "Please change it once you've logged in.";
-$L["password_reset_complete"] = "Your password has been reset and you have been emailed the new password.";
-$L["email_not_sent"] = "We were unable to send the email notification.";
-$L["user_not_found"] = "Sorry, we were unable to identify you.";
-$L["account_created_msg"] = "An account has been created for you.";
-$L["account_created"] = "Account Created";
-$L["invalid_account_id"] = "The Account ID is not valid.";
-$L["account_info"] = "Account Info";
-$L["account_updated"] = "Your account has been updated.";
-$L["password_change_note"] = "You only need to fill the password fields in if you want to change it.";
-$L["info_and_stats"] = "Info and Stats";
-$L["account_settings"] = "Account Settings";
-$L["enter_email_address_to_reset_password"] = "Enter your email address below to reset your password.";
-$L["extend_it"] = "Extend it";
-$L["africa"] = "Africa";
-$L["asia"] = "Asia";
-$L["europe"] = "Europe";
-$L["north_america"] = "North America";
-$L["central_america"] = "Central America";
-$L["south_america"] = "South America";
-$L["oceania"] = "Oceania";
-$L["all_countries"] = "All countries";
-$L["link_to_data_set"] = "Link to Data Set";
-$L["login"] = "Login";
-$L["forgot_password"] = "Forgot Password";
-$L["admin_account"] = "Admin account";
-$L["feature_enabled"] = "Enabled";
-$L["anonymous_access"] = "Anonymous access";
-$L["anonymous_user_desc"] = "Anonymous users can use the script but have limited access: they cannot save, link to their data sets or generate more than 100 rows at a time.";
-$L["anonymous_user_message"] = "Message to display to anonymous users when trying to save:";
-$L["anonymous_user_default_message"] = "Please login or email someone@yoursite.com to get a user account.";
-$L["login_url_c"] = "Login URL:";
-$L["email_c"] = "Email:";
-$L["password_c"] = "Password:";
-$L["no_account_found"] = "Sorry, that account wasn't found.";
-$L["update"] = "Update";
-$L["documentation"] = "Documentation";
-$L["install_user_doc_link"] = "For more detailed information about the installation process, check out our <a href=\"http://benkeen.github.io/generatedata/install.html\" target=\"_blank\">user documentation</a>.";
-$L["num_rows_too_large"] = "Sorry, you're limited to generating <b>%1</b> rows at a time. Click generate to continue.";
-$L["fork_this_project_on_github"] = "Fork this project on Github";
-$L["download"] = "Download";
-$L["loading"] = "Loading...";
-$L["validation_account_already_exists"] = "Sorry, an account with that email address already exists.";
-$L["validation_not_logged_in"] = "You don't appear to be logged in. Please try logging in again.";
-$L["validation_invalid_permissions"] = "You don't have permissions to do this.";
-$L["installation_failed_create_settings_file"] = "The script was unable to create your <b>settings.php</b> file.";
-$L["installation_failed_create_settings_file_msg"] = "This usually occurs when it fails to have permissions to write to the folder. Please manually create this file and place it in the base folder of the Data Generator. When you have done this, button below to continue installing.";
-$L["confirm_file_exists"] = "Confirm File Exists";
-$L["reset_plugins_with_bundling"] = "<b>You have bundling/minification enabled</b>. After clicking this button you will need to run <i>grunt</i> to recreate the bundles. For more information <a href=\"http://benkeen.github.io/generatedata/developer.html#bundling\" target=\"_blank\">read this documentation page</a>. If you have any problems, you may want to turn off bundling.";
\ No newline at end of file
diff --git a/resources/lang/nl.php b/resources/lang/nl.php
deleted file mode 100644
index 1c70d6420..000000000
--- a/resources/lang/nl.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-
-
-$L = array();
-$L["language"] = "Nederlands";
-$L["ENABLED"] = true;
-
-// Category: Core
-$L["a_few_links"] = "Een paar links";
-$L["about"] = "Over";
-$L["about_para1"] = "Soms moet je nep gegevens voor dingen zoals het testen van software, vullen databases en het creëren van realistische uitziende testmodellen. Voor tekst, hebben wij <i>Lorem ipsum</i>, maar voor de rest ...? Deze tool is geschreven om een ​​snelle en eenvoudige manier om u te laten genereren grote hoeveelheden aangepaste gegevens in welk formaat u nodig heeft.";
-$L["about_para2"] = "De <b>genereren</b> bevat de volledige script: vul in de verschillende velden op de pagina om de bouw van de dataset u geïnteresseerd bent in, klik vervolgens op de knop Genereren. En hey presto! Makkelijk, hè?";
-$L["about_para3"] = "De out-the-box script bevat het soort functionaliteit die u over het algemeen nodig hebt. Maar niets is ooit compleet - misschien moet je willekeurige esoterische wiskundige vergelijkingen genereren, willekeurige mails te trekken of random weergeven van beelden van Flickr met het woord \"Red-backed woelmuis\" in de titel. Wie weet. Ieders use-case is anders.";
-$L["about_para4"] = "Met dit in het achterhoofd, werd de nieuwe versie van het script (3.0.0 +) ontworpen om volledig uitbreidbaar: ontwikkelaars kunnen schrijven hun eigen Data Types tot nieuwe vormen van willekeurige gegevens te genereren, en zelfs aanpassen van de Export Soorten - dat wil zeggen het formaat in waarin de gegevens worden uitgevoerd. Voor mensen die geïnteresseerd in het genereren van meer accurate gelokaliseerde geografische gegevens, kunnen ze ook nieuwe Land plugins die regio namen (staten, provincies, gebieden, enz.), plaatsnamen en post / postcode formaten te leveren voor hun land van keuze.";
-$L["about_para5"] = "Voor meer informatie over hoe te om het te verlengen, gaat u naar de <a href=\"docs/\">documentatie voor ontwikkelaars</a>.";
-$L["about_title"] = "Wat <i>is</i> dit ding?";
-$L["account_created"] = "Account Aangemaakt";
-$L["account_created_msg"] = "Een account is voor u gemaakt.";
-$L["account_info"] = "Account Info";
-$L["account_settings"] = "Accountinstellingen";
-$L["account_type"] = "Accounttype";
-$L["account_updated"] = "Uw account is bijgewerkt.";
-$L["accounts"] = "Accounts";
-$L["add"] = "Toevoegen";
-$L["admin"] = "Admin";
-$L["admin_account"] = "Admin-account";
-$L["africa"] = "Afrika";
-$L["all_countries"] = "Alle landen";
-$L["all_data_type_plugins"] = "Alle Gegevenstype plugins";
-$L["all_export_type_plugins"] = "Alle Export Type plugins";
-$L["anonymous_access"] = "Anonieme toegang";
-$L["anonymous_admin_account"] = "Anoniem admin account";
-$L["anonymous_user_default_message"] = "Log in of mail someone@yoursite.com om een ​​gebruikersaccount te krijgen.";
-$L["anonymous_user_desc"] = "Anonieme gebruikers kunnen het script gebruiken, maar hebben beperkte toegang: ze niet kunnen opslaan, koppelen aan hun datasets of het genereren van meer dan 100 rijen tegelijk.";
-$L["anonymous_user_message"] = "Boodschap te geven aan anonieme gebruikers wanneer het proberen om te slaan:";
-$L["asia"] = "Azië";
-$L["back"] = "Terug";
-$L["blog"] = "Blog";
-$L["cancel"] = "annuleren";
-$L["cannot_change_num_rows"] = "Sorry, je bent niet toegestaan ​​om het aantal gegenereerde rijen te wijzigen.";
-$L["central_america"] = "Centraal-Amerika";
-$L["check_database_info"] = "Check Database Info";
-$L["clear_the_page"] = "Moet u de pagina";
-$L["close"] = "Sluiten";
-$L["complete_excl"] = "Complete!";
-$L["confirm_delete_form"] = "Weet u zeker dat u dit formulier wilt verwijderen?";
-$L["confirm_delete_user_account"] = "Weet u zeker dat u deze gebruiker account wilt verwijderen?";
-$L["confirm_empty_form"] = "Weet u zeker dat u de pagina te wissen?";
-$L["confirm_file_exists"] = "Bevestigen Bestand bestaat";
-$L["continue_rightarrow"] = "Ga verder »";
-$L["countries"] = "Landen";
-$L["country_specific_data"] = "Landspecifieke gegevens";
-$L["create_account"] = "Account aanmaken";
-$L["create_account_rightarrow"] = "Account aanmaken »";
-$L["create_file_rightarrow"] = "Maak Bestand »";
-$L["create_settings_file"] = "Maak Instellingenbestand";
-$L["data_created"] = "Gegevens Gemaakt op";
-$L["data_format"] = "Data Format";
-$L["data_set"] = "Data Set";
-$L["data_set_help"] = "Dit is waar u precies bepalen welke gegevens u wilt genereren. Probeer het invullen van een rij of twee en klik op de knop Genereren. Je krijgt onder de knie vrij snel.";
-$L["data_set_name"] = "Data Set Naam";
-$L["data_type"] = "Gegevenstype";
-$L["data_types"] = "Data Types";
-$L["database_info"] = "Database Info";
-$L["database_name"] = "Database Name";
-$L["date_account_created"] = "Datum account aangemaakt";
-$L["date_created"] = "Aanmaakdatum";
-$L["default_language"] = "Standaardtaal";
-$L["default_save_form_empty_str"] = "Voer formulier naam hier";
-$L["del"] = "Del";
-$L["del_uc"] = "DEL";
-$L["delete"] = "Verwijder";
-$L["delete_1_data_set"] = "Verwijder 1 Data Set";
-$L["delete_N_data_sets"] = "Verwijder %1 gegevenssets";
-$L["delete_account"] = "Account verwijderen";
-$L["delimiter_chars"] = "Scheidingsteken (s)";
-$L["developer"] = "Ontwikkelaar";
-$L["developer_doc"] = "Ontwikkelaar doc";
-$L["developer_intro"] = "In de volgende paragrafen kunt u afstemmen wat je ziet in je javascript console voor ontwikkelingsdoeleinden.";
-$L["documentation"] = "Documentatie";
-$L["donate"] = "Doneer!";
-$L["download"] = "Download";
-$L["edit"] = "Redigeren";
-$L["email"] = "E-mail";
-$L["email_c"] = "E-mail:";
-$L["email_not_sent"] = "We waren niet in staat om de e-mail melding te verzenden.";
-$L["email_user_login_info"] = "E-mail van de gebruiker hun login-gegevens";
-$L["empty_form"] = "Lege Formulier";
-$L["enter_email_address_to_reset_password"] = "Vul uw e-mailadres hieronder in om uw wachtwoord opnieuw in te stellen.";
-$L["enter_user_account_details"] = "Vul hieronder uw gebruikersaccount details.";
-$L["eol_char"] = "Einde van de lijn karakter";
-$L["error"] = "fout";
-$L["europe"] = "Europa";
-$L["examples"] = "Voorbeelden";
-$L["export_type_validate_error"] = "Ack! Er is een fout opgetreden in de Export Type's te validate() functie. Sorry, we kunnen niet verder - noem een ​​ontwikkelaar!";
-$L["export_types"] = "Export Soorten";
-$L["export_types_help"] = "In dit gedeelte kunt u het formaat van uw gegenereerde data. Elk formaat kan verschillende opties om u te laten aanpassen van de output naar wat u precies wilt.";
-$L["extend_id"] = "Uit te breiden";
-$L["extend_it"] = "Uit te breiden";
-$L["fatal_error"] = "Een fatale fout opgetreden.";
-$L["feature_enabled"] = "Ingeschakeld";
-$L["first_name"] = "Voornaam";
-$L["forgot_password"] = "Wachtwoord vergeten";
-$L["forgotten_your_password_q"] = "Wachtwoord vergeten?";
-$L["fork_on_github"] = "Fork van de code op github";
-$L["fork_this_project_on_github"] = "Vork dit project op Github";
-$L["form_deleted"] = "Het formulier is verwijderd.";
-$L["form_exists_overwrite_confirmation"] = "Dit formulier bestaat reeds. Wilt u het overschrijven?";
-$L["form_not_deleted"] = "Sorry, we konden niet verwijderen dit formulier. Re-log dan in en probeer het opnieuw.";
-$L["form_saved"] = "Uw formulier is opgeslagen.";
-$L["forums"] = "Forum";
-$L["generate"] = "Voortbrengen";
-$L["generate_in_page"] = "Genereer in-pagina";
-$L["generated_X_of_Y_results"] = "Gegenereerd <span id=\"gdGenerateCount\"></span> van <span id=\"gdGenerateTotal\"></span> resultaten";
-$L["generator"] = "Generator";
-$L["geo"] = "Geo-";
-$L["goto_script_rightarrow"] = "Ga naar script »";
-$L["goto_website"] = "Ga naar de website";
-$L["help"] = "Help";
-$L["help_intro"] = "De installatie script doet twee dingen voor je. Een, het genereert automatisch een <b>settings.php</b>-bestand dat uw unieke database connectie informatie bevat, zodat het weet hoe u verbinding maakt met de database bij elk bezoek aan het script. Twee, het vult de database met verschillende gegevens die het nodig heeft: dingen als algemene instellingen, gebruikersaccounts en ruwe gegevens, zoals de namen van mensen, land en stad namen.";
-$L["help_prereq_info"] = "Net als vrijwel elke andere PHP / MySQL script die er zijn, moet je al hebt gemaakt een database voordat u de installatie script. <i>Het installatie script niet de database, probeert het alleen maar om verbinding te maken met de tabellen te maken.</i> Als je niet zeker weet hoe u een database aan te maken in uw omgeving, zult u ofwel moet contact op met uw hosting provider, of breng wat tijd onderzoek op Google. Sorry!";
-$L["help_prerequisites"] = "Vereisten";
-$L["hide_data_format_options"] = "verberg dataformaat opties";
-$L["hide_error"] = "Verberg fout";
-$L["host_name"] = "Hostnaam";
-$L["human_data"] = "Gegevens over de mens";
-$L["info_and_stats"] = "Info en Statistieken";
-$L["install"] = "Installeren";
-$L["install_invalid_db_info"] = "We waren niet in staat om verbinding te maken van de database met behulp van de informatie die u verstrekt. De foutmelding van de database terug is: <i>{\$db_connection_error}</i>";
-$L["install_no_db_connection"] = "Controleer de database naam en aanmeldingsgegevens. Maar we waren in staat om verbinding te maken met de database host, kunnen we geen verbinding met de database. De foutmelding van de database terug is: <i>{\$db_select_error}</i>";
-$L["install_plugins_rightarrow"] = "Installeer Plugins &raquo;";
-$L["install_user_doc_link"] = "Voor meer gedetailleerde informatie over de installatie, kijk op onze <a href=\"http://benkeen.github.io/generatedata/install.html\" target=\"_blank\">gebruikersdocumentatie</a>.";
-$L["installation"] = "Installatie";
-$L["installation_complete_text"] = "De Data Generator is met succes geïnstalleerd! Klik op de knop hieronder om naar het script.";
-$L["installation_error"] = "Installatie fout";
-$L["installation_failed_create_settings_file"] = "Het script was niet in staat om uw <b>settings.php</b> bestand te maken.";
-$L["installation_failed_create_settings_file_msg"] = "Dit gebeurt meestal wanneer het niet lukt om machtigingen moeten schrijven naar de map. Gelieve handmatig maken van dit bestand en plaats het in de map base van de Data Generator. Wanneer je dit hebt gedaan, onderstaande knop om verder te gaan installeren.";
-$L["installation_intro"] = "Alrighty, laten we deze sukkel geïnstalleerd. Vul uw database-informatie om uw database tabellen te maken. Als je onzeker bent over een van deze velden, klikt u op het tabblad Help voor een beetje meer info.";
-$L["installation_plugin_intro"] = "Bijna klaar! Nu gaan we naar de plugins te installeren: deze zijn wat te maken eigenlijk de Data Generator <i>nuttig</i> - dat wil zeggen de aard van de gegevens die u kunt genereren (Data Types), het formaat van de gegenereerde data (Export Soorten) en al de land-specifieke gegevens, zoals regio's en steden.";
-$L["installation_step2_intro"] = "So far so good! Nu klikt u op de knop om uw <b>settings.php</b>-bestand te maken. Dit bestand wordt opgeslagen in de hoofdmap van deze toepassing en is de enige plaats (met uitzondering van de database) met aangepaste gegevens over uw installatie opgeslagen.";
-$L["installation_step3_intro"] = "Je hebt drie keuzes voor de manier waarop uw installatie verwerkt gebruikersaccounts.";
-$L["invalid_account_id"] = "De account-ID is niet geldig.";
-$L["invalid_custom_xml"] = "Is er een probleem met de aangepaste XML-markup die u hebt ingevoerd. Raadpleeg de gebruikersdocumentatie voor meer informatie.";
-$L["invalid_num_results"] = "Vul een geldig aantal resultaten.";
-$L["invalid_password"] = "Sorry, dit wachtwoord is niet juist. Probeer het opnieuw.";
-$L["invalid_table_names"] = "Database kolomnamen kan alleen alfanumerieke tekens en moet beginnen met een letter. Please fix de volgende rijen:";
-$L["last_edited"] = "Laatst gewijzigd";
-$L["last_logged_in"] = "Laatste keer ingelogd";
-$L["last_modified"] = "Laatst gewijzigd op";
-$L["last_name"] = "Achternaam";
-$L["last_saved"] = "laatst opgeslagen";
-$L["latest_project_news"] = "Laatste project nieuws";
-$L["limit_pub_sub_console_messages"] = "Beperk pub / sub console berichten naar specifieke modules:";
-$L["link_to_data_set"] = "Link naar Optie Data";
-$L["link_to_this_data_set"] = "Link naar deze dataset";
-$L["list_console_warn_events"] = "Lijst console.warn() events";
-$L["list_core_events"] = "Lijst <b>kern</b>events";
-$L["list_module_publish_events"] = "Lijst module <b>publiceren</b> events";
-$L["list_module_subscribe_events"] = "Lijst module <b>subscribe</b> events";
-$L["load"] = "Laden";
-$L["loading"] = "Het Laden...";
-$L["load_uc"] = "LOAD";
-$L["login"] = "Inloggen";
-$L["login_url_c"] = "Inloggen URL:";
-$L["logout"] = "Afmelden";
-$L["make_data_set_public_agreement"] = "Ik begrijp dat deze Data Set te delen, ik moet het openbaar te maken.";
-$L["math"] = "Math";
-$L["meta_description"] = "GenerateData.com: gratis, GNU-licentie, willekeurige aangepaste gegevens generator voor het testen van software";
-$L["meta_keywords"] = "Willekeurige gegevens, testgegevens, Sample Data, data generator, het genereren van gegevens";
-$L["misc"] = "Misc";
-$L["missing_node_names"] = "De volgende rijen zijn ontbrekende knoop namen:";
-$L["missing_table_names"] = "De volgende rijen zijn ontbrekende tabel kolomnamen:";
-$L["multiple_accounts"] = "Meerdere accounts";
-$L["mysql_password"] = "MySQL Password";
-$L["mysql_username"] = "MySQL Username";
-$L["new_window_or_tab"] = "Nieuw venster / tabblad";
-$L["no"] = "Geen";
-$L["no_account_found"] = "Sorry, was dat de rekening niet gevonden.";
-$L["no_additional_export_type_settings"] = "Geen extra export-instellingen.";
-$L["no_country_plugin_selected"] = "Selecteer ten minste een land in het land-specifieke gegevens sectie.";
-$L["no_csv_delimiter"] = "Geef het CSV-scheidingsteken.";
-$L["no_data"] = "Oeps, niets te genereren! Voer een paar data te genereren.";
-$L["no_data_types_found"] = "No Data Types gevonden";
-$L["no_examples_available"] = "Geen voorbeelden beschikbaar.";
-$L["no_export_types_found"] = "Geen Export Soorten gevonden";
-$L["no_form_name"] = "Vul een formulier in.";
-$L["no_js"] = "Schakel javascript in uw browser.";
-$L["no_js_blurb"] = "Je weet dat dit is, zoals, de 21ste eeuw? De Data Generator-script leunt zwaar op javascript - dingen gewoon niet zal werken zonder. Je moet om het te schakelen in uw browser dan deze pagina vernieuwen.";
-$L["no_num_rows"] = "Vul het aantal rijen toe te voegen.";
-$L["no_options_available"] = "Geen opties beschikbaar.";
-$L["no_saved_data_sets"] = "Je hebt geen opgeslagen data sets.";
-$L["no_user_accounts_defined"] = "Geen gebruikersaccounts gedefinieerd.";
-$L["node_name"] = "Knooppunt naam";
-$L["none"] = "Geen";
-$L["north_america"] = "Noord-Amerika";
-$L["not_saved"] = "niet opgeslagen";
-$L["notify_settings_updated"] = "Uw instellingen zijn bijgewerkt.";
-$L["num_records_generated"] = "Num Records Gegenereerd";
-$L["num_results"] = "Num Resultaten";
-$L["num_rows_too_large"] = "Sorry, u bent beperkt tot het genereren <b>%1</b> rijen tegelijk. Klik genereren om verder te gaan.";
-$L["num_saved_data_sets"] = "Aantal opgeslagen gegevens Sets";
-$L["numeric"] = "Numerieke";
-$L["oceania"] = "Oceanië";
-$L["ok"] = "OK";
-$L["options"] = "Opties";
-$L["order"] = "Volgorde";
-$L["other"] = "Ander";
-$L["password"] = "Wachtwoord";
-$L["password_c"] = "Wachtwoord:";
-$L["password_change_note"] = "U hoeft alleen het wachtwoord velden in te vullen als je wilt om het te veranderen.";
-$L["password_reset_complete"] = "Uw wachtwoord is opnieuw ingesteld en je hebt gemaild met het nieuwe wachtwoord.";
-$L["password_reset_email_content1"] = "Uw wachtwoord is gereset. U mag gebruik maken van de volgende wachtwoord om in te loggen: %1";
-$L["password_reset_email_content2"] = "Gelieve veranderen als je eenmaal hebt ingelogd.";
-$L["please_confirm"] = "Gelieve te bevestigen";
-$L["please_enter_all"] = "Gelieve alle";
-$L["please_enter_data_set_name"] = "Vul de naam van de nieuwe gegevens.";
-$L["please_fix_errors"] = "Please fix de volgende fouten en verzend deze opnieuw:";
-$L["please_login"] = "Moet u zich aanmelden";
-$L["please_select"] = "Selecteer";
-$L["plugins"] = "Plugins";
-$L["plugins_intro"] = "Elke keer dat u toevoegen of verwijderen van een plugin, moet u de plug-ins opnieuw in te stellen. Dit zal de database bijwerken en ervoor zorgen dat u kunt de plugins die u nodig heeft voor toegang.";
-$L["prompt_to_download"] = "Vragen om te downloaden";
-$L["public_q"] = "Public?";
-$L["read_developer_doc"] = "Lees de documentatie voor ontwikkelaars";
-$L["reenter_password"] = "Herhaal wachtwoord";
-$L["refresh_page"] = "Pagina vernieuwen";
-$L["regenerate"] = "Wedergeboren";
-$L["report_bug"] = "Een bug melden";
-$L["reset_password"] = "Wachtwoord opnieuw instellen";
-$L["reset_plugins"] = "Reset plugins";
-$L["reset_plugins_with_bundling"] = "<b>Je hebt het bundelen / minification ingeschakeld</b>. Na het klikken op deze knop moet u <i>Grunt</i> om de bundels recreëren. Voor meer informatie <a href=\"http://benkeen.github.io/generatedata/developer.html#bundling\" target=\"_blank\">Lees deze documentatie pagina</a>. Als je problemen hebt, kunt u bundeling uitschakelen.";
-$L["result_type"] = "Resultaat Type";
-$L["row_label"] = "Column Titel";
-$L["row_label_plural"] = "Column Titles";
-$L["row_sp"] = "Rij (en)";
-$L["rows"] = "rijen";
-$L["rows_generated"] = "Gegenereerd Rijen";
-$L["save"] = "Besparen";
-$L["save_data_set_to_link"] = "De-<i>zeld</i>. Met het oog op deze dataset met andere mensen, moet u deze eerst opslaan.";
-$L["save_uc"] = "SAVE";
-$L["script_thinking"] = "Oeps, in de wacht voor een tweede. Het script is denken.";
-$L["see_help_dialog"] = "Zie helpen dialoogvenster.";
-$L["select_data_type"] = "Selecteer Data Type";
-$L["select_language"] = "Selecteer Taal";
-$L["settings"] = "Instellingen";
-$L["settings_file_exists"] = "De instellingen bestand bestaat reeds. Voor nieuwe installaties moet de settings.php niet bestaan. Of het verwijderen en verder met de installatie script of laad het script opnieuw met het bestaande instellingenbestand waarden.";
-$L["show_data_format_options"] = "tonen dataformaat opties";
-$L["single_anonymous_user_account"] = "Single, anonieme gebruikersaccount";
-$L["single_user_account_requires_login"] = "Single user account, vereist login";
-$L["south_america"] = "Zuid-Amerika";
-$L["still_stuck"] = "Nog steeds vast?";
-$L["success"] = "succes";
-$L["table_column"] = "Tabelkolom";
-$L["table_prefix"] = "Tabel Prefix";
-$L["text"] = "Tekst";
-$L["theme"] = "Thema";
-$L["tip_country_data"] = "<p>In dit hoofdstuk kunt u bepalen welk land-specifieke gegevens moeten worden opgenomen in uw gegenereerde datasets. De waarden die u hier selecteert, van invloed op bepaalde gegevenstypen die u kunt kiezen, zoals <i>Regio</i>, <i>Postal / Zip</i> en <i>Land</i>.</p><p>Om u een beter idee van wat dit betekent, probeer dan het selecteren van de <i>Gewest</i> Data Type voor een van uw rijen in de Data Set sectie, dan toevoegen / verwijderen van landen uit de landspecifieke data sectie. U zult zien dat de rij opties die worden weergegeven rechtstreeks worden geraakt door de landen die u hebt geselecteerd: u kunt alleen maar het genereren van een subset van de geselecteerde landen.</p>";
-$L["title"] = "generatedata.com";
-$L["total_rows_generated"] = "Gegenereerd totaalrijen";
-$L["update"] = "Bijwerken";
-$L["update_account"] = "UPDATE ACCOUNT";
-$L["update_settings"] = "Update-instellingen";
-$L["use_custom_xml_format"] = "Aangepaste XML-formaat";
-$L["user"] = "Gebruiker";
-$L["user_account"] = "User Account";
-$L["user_account_section_intro"] = "In dit gedeelte kunt u een onbeperkt aantal gebruikers accounts om mensen de toegang tot het script. Alleen jij, de beheerder, machtigingen te maken of te verwijderen accounts.";
-$L["user_accounts"] = "Gebruikersaccounts";
-$L["user_not_found"] = "We waren niet in staat om u te identificeren.";
-$L["validation_account_already_exists"] = "Sorry, een account met dat e-mailadres al bestaat.";
-$L["validation_invalid_chars"] = "Alfanumerieke en onderstrepingstekens alleen, alsjeblieft.";
-$L["validation_invalid_email"] = "Vul een geldig e-mailadres.";
-$L["validation_invalid_permissions"] = "U heeft geen rechten om dit te doen hebben.";
-$L["validation_no_db_hostname"] = "Vul uw database hostname.";
-$L["validation_no_db_name"] = "Voer uw database naam.";
-$L["validation_no_email"] = "Voer uw e-mailadres.";
-$L["validation_no_first_name"] = "Voer uw voornaam in.";
-$L["validation_no_last_name"] = "Voer uw achternaam in.";
-$L["validation_no_mysql_username"] = "Voer uw MySQL gebruikersnaam in.";
-$L["validation_no_password"] = "Voer uw wachtwoord in.";
-$L["validation_not_logged_in"] = "Je hoeft niet te worden ingelogd proberen aan te melden opnieuw in aub.";
-$L["version"] = "Versie";
-$L["website"] = "Website";
-$L["yes"] = "Ja";
-$L["your_account"] = "Uw account";
-$L["your_data_set_name_here"] = "Uw dataset naam hier ...";
-$L["your_data_sets"] = "Uw gegevens Sets";
-$L["zip_q"] = "Zip?";
diff --git a/resources/lang/ta.php b/resources/lang/ta.php
deleted file mode 100644
index eb0c43f1a..000000000
--- a/resources/lang/ta.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-
-
-$L = array();
-$L['ENABLED'] = false;
-
-// Core language strings
-$L['language'] = 'தமிழ்';
-$L['title'] = 'generatedata.com';
-$L['about'] = 'பற்றி';
-$L['accounts'] = 'கணக்கு';
-$L['back'] = 'மீண்டும்';
-$L['add'] = 'சேர்';
-$L['confirm_delete_form'] = 'நீங்கள் இந்த படிவத்தை நீக்க வேண்டுமா?';
-$L['confirm_empty_form'] = 'நீங்கள் பக்கம் அழிக்க வேண்டுமா?';
-$L['countries'] = 'நாடுகள்';
-$L['meta_description'] = 'GenerateData.com: சோதனை மென்பொருள் இலவசமாக, குனு உரிமம், சீரற்ற விருப்ப தரவு ஜெனரேட்டர்';
-$L['meta_keywords'] = 'சீரற்ற தரவு, சோதனை தரவு, மாதிரி தரவுகளை தரவு ஜெனரேட்டர், தரவு உருவாக்க';
-$L['row_label'] = 'வரிசை தலைப்பு';
-$L['row_label_plural'] = 'வரிசை தலைப்புகள்';
-$L['update_settings'] = 'புதுப்பித்தல் அமைப்புகள்';
-$L['data_type'] = 'தரவு இனம்';
-$L['default_save_form_empty_str'] = 'இங்கே வடிவம் பெயர் சேர்க்கவும்';
-$L['del'] = 'டெல்';
-$L['del_uc'] = 'DEL';
-$L['donate'] = 'நன்கொடை!';
-$L['empty_form'] = 'வெற்று படிவம்';
-$L['examples'] = 'எடுத்துக்காட்டுகள்';
-$L['fatal_error'] = 'ஒரு தீவிரமான பிழை ஏற்பட்டது.';
-$L['form_deleted'] = 'படிவம் நீக்கப்பட்டது.';
-$L['form_exists_overwrite_confirmation'] = 'இந்த வடிவம் ஏற்கனவே உள்ளது. நீங்கள் அதை மேலெழுத விரும்புகிறீர்களா?';
-$L['form_not_deleted'] = 'மன்னிக்கவும், இந்த வடிவம் நீக்க முடியவில்லை. மீண்டும் உள்நுழைந்து மீண்டும் முயற்சிக்கவும்.';
-$L['form_saved'] = 'உங்கள் வடிவத்தில் சேமிக்கப்படும்.';
-$L['forums'] = 'கருத்துக்களம்';
-$L['generate'] = 'உருவாக்குதல்';
-$L['generator'] = 'மக்களை பெறுபவர்';
-$L['help'] = 'உதவி';
-$L['hide_error'] = 'மறை பிழை';
-$L['human_data'] = 'மனித தகவல்கள்';
-$L['math'] = 'கணித';
-$L['invalid_custom_xml'] = 'நீங்கள் உள்ளிட்ட விருப்ப எக்ஸ்எம்எல் மார்க்அப் ஒரு பிரச்சனை இருக்கிறது. மேலும் தகவலுக்கு பயனர் ஆவணப்படுத்தலை பார்க்கவும்.';
-$L['invalid_num_results'] = 'முடிவு ஒரு செல்லுபடியாகும் எண்ணை உள்ளிடுக.';
-$L['invalid_table_names'] = 'தரவுத்தள அணிவரிசை பெயர்களை மட்டுமே எண்ணெழுத்து மற்றும் ஒரு கடிதம் தொடங்க வேண்டும். பின்வரும் வரிசைகள் சரி செய்து:';
-$L['load_uc'] = 'சுமையில்லாமல்';
-$L['load'] = 'சுமை';
-$L['missing_node_names'] = 'பின்வரும் வரிசைகள் முனை பெயர்களை காணாமல்:';
-$L['missing_table_names'] = 'பின்வரும் வரிசைகள் அட்டவணை நெடுவரிசை பெயர்கள் காணாமல்:';
-$L['no_csv_delimiter'] = 'CSV எல்லை உள்ளிடவும்.';
-$L['no_data'] = 'அச்சச்சோ, உருவாக்க ஒன்றுமில்லை! உருவாக்கப்படும் சில தரவு சேர்க்கவும்.';
-$L['no_examples_available'] = 'இல்லை உதாரணங்கள்.';
-$L['no_form_name'] = 'ஒரு வடிவம் பெயரை உள்ளிடவும்.';
-$L['no_num_rows'] = 'சேர்க்க வரிசைகளில் எண்ணை உள்ளிடவும்.';
-$L['no_options_available'] = 'இல்லை விருப்பங்கள்.';
-$L['none'] = 'இல்லை';
-$L['num_results'] = 'எண் முடிவுகள்';
-$L['ok'] = 'சரி';
-$L['options'] = 'விருப்பங்கள்';
-$L['order'] = 'ஒழுங்கு';
-$L['other'] = 'வேறு';
-$L['please_fix_errors'] = 'பின்வரும் பிழைகள் சரி மீண்டும் சமர்ப்பியுங்கள்:';
-$L['please_select'] = 'தேர்வு செய்க';
-$L['select_data_type'] = 'தரவு வகையை நீங்கள் தேர்ந்தெடுக்க';
-$L['result_type'] = 'முடிவு வகை';
-$L['row_sp'] = 'வரிசை (கள்)';
-$L['save_uc'] = 'சேவ்';
-$L['script_thinking'] = 'அச்சச்சோ, இரண்டாவது பிடித்து. ஸ்கிரிப்ட் நினைக்கிறார்கள்.';
-$L['see_help_dialog'] = 'உதவி உரையாடல் பார்க்கவும்.';
-$L['select_language'] = 'மொழியை தெரிவு';
-$L['table_column'] = 'டேபிள் வரிசை';
-$L['text'] = 'உரை';
-$L['use_custom_xml_format'] = 'விருப்ப XML வடிவத்தில் பயன்படுத்தவும்';
-$L['website'] = 'இணையத்தளம்';
-$L['no_js'] = 'உங்கள் உலாவியில் ஜாவாஸ்க்ரிப்ட் செயல்படுத்த, தயவு செய்து.';
-$L['no_js_blurb'] = 'இந்த 21 ஆம் நூற்றாண்டில், போன்ற, என்று உனக்கு தெரியுமா? தரவு ஜெனரேட்டர் ஸ்கிரிப்ட் JavaScript நம்பியிருக்கிறது - விஷயங்கள் வெறும் இல்லாமல் வேலை செய்யாது. நீங்கள் இந்த பக்கத்தை புதுப்பிக்கவும் உங்கள் உலாவியில் அதை செயல்படுத்த வேண்டும்.';
-$L['install'] = 'நிறுவு';
-$L['host_name'] = 'பெயர் புரவலன்';
-$L['installation'] = 'நிறுவல்';
-$L['table_prefix'] = 'அட்டவணை முன்னொட்டு';
-$L['database_name'] = 'தரவுத்தள பெயர்';
-$L['mysql_username'] = 'MySQL பயனாளர் பெயர்';
-$L['mysql_password'] = 'MySQL கடவுச்சொல்';
-$L['default_language'] = 'முன்னிருப்பு மொழி';
-$L['installation_intro'] = 'சரி சரி, இந்த உறிஞ்சி நிறுவப்பட்ட வைக்கலாம். உங்கள் தரவுத்தள அட்டவணைகள் உருவாக்க உங்கள் தகவல் தகவல் சேர்க்கவும். இந்த துறைகளில் எந்த பற்றி உறுதியற்று என்றால், ஒரு சிறிய மேலும் தகவலுக்கு உதவி தாவலை கிளிக் செய்யவும்.';
-$L['version'] = 'பதிப்பு';
-$L['help_intro'] = 'நிறுவல் ஸ்கிரிப்ட் உங்களுக்கு இரண்டு விஷயங்களை செய்கிறது. அதை நீங்கள் ஸ்கிரிப்ட் வருகை எப்போது தரவுத்தள இணைக்க எப்படி தெரியும் என்று ஒரு, அது தானாகவே, உங்கள் தனிப்பட்ட தரவுத்தள இணைப்பு தகவல் கொண்டிருக்கும் ஒரு <b> மாரியப்பனார் </b> கோப்பினை உருவாக்குகிறது. பொது அமைப்புகள், பயனர் கணக்குகள் மற்றும் மக்கள் பெயர்கள், நாடு மற்றும் நகர பெயர்கள் போன்ற மூல தரவு போன்ற விஷயங்களை: இரண்டு, அது வேண்டும் என்று பல்வேறு தகவல்களை தகவல் உருவாக்கியிருக்கிறது.';
-$L['help_prerequisites'] = 'முன் தேவைகள்';
-$L['help_prereq_info'] = 'அங்கு அவுட் ஒவ்வொரு மற்ற PHP / MySQL ஸ்கிரிப்ட் போன்ற, நீங்கள் ஏற்கனவே நிறுவல் உரை இயங்கும் முன் ஒரு தரவுத்தள உருவாக்கப்பட்டது வேண்டும். <i> நிறுவல் உரை தரவுத்தள உருவாக்க முடியாது, அது அட்டவணைகள் உருவாக்க இணைக்க முயற்சிக்கிறது. உங்கள் சூழலில் ஒரு தரவுத்தள உருவாக்க எப்படி உறுதியாக தெரியவில்லை என்றால் </i>, நீங்கள் வேண்டும் அல்லது உங்கள் ஹோஸ்டிங் வழங்குநரை தொடர்பு, அல்லது Google அதை ஆராய்ச்சி சில நேரம் செலவிட. மன்னிக்கவும்!';
-$L['host_name_desc'] = 'உங்கள் தரவுத்தள இணைப்பு பெயர். பெரும்பாலும் அது <i> localhost </i>, ஆனால் சில நேரங்களில் அது <i> mysql.yoursite.com</i>  மாதிரி ஏதாவது.';
-$L['still_stuck'] = 'இன்னும் சிக்கி?';
-$L['refresh_page'] = 'பக்கம் புதுப்பிப்பு';
-$L['database_info'] = 'டேட்டாபேஸ் தகவல்';
-$L['user_account'] = 'பயனர் கணக்கு';
-$L['user_accounts'] = 'பயனர் கணக்கு';
-$L['password'] = 'கடவுச்சொல்';
-$L['reenter_password'] = 'கடவுச்சொல்லை மீண்டும் உள்ளிடவும்';
-$L['email'] = 'மின்னஞ்சல்';
-$L['yes'] = 'ஆம்';
-$L['no'] = 'இல்லை';
-$L['validation_no_db_hostname'] = 'உங்கள் தகவல் புரவலன் உள்ளிடவும்.';
-$L['validation_no_db_name'] = 'உங்கள் தகவல் பெயரை உள்ளிடவும்.';
-$L['validation_invalid_chars'] = 'எண்ணெழுத்து மற்றும் மட்டுமே எழுத்துக்களை தயவு செய்து அடிக்கோடிட்டு காட்டுகின்றன.';
-$L['validation_no_mysql_username'] = 'உங்கள் MySQL பயனாளர் பெயர் உள்ளிடவும்.';
-$L['validation_no_email'] = 'உங்கள் மின்னஞ்சல் முகவரியை உள்ளிடவும்.';
-$L['validation_invalid_email'] = 'ஒரு செல்லுபடியாகும் மின்னஞ்சல் முகவரியை உள்ளிடவும்.';
-$L['validation_no_first_name'] = 'உங்கள் முதல் பெயரை உள்ளிடவும்.';
-$L['validation_no_last_name'] = 'உங்கள் கடைசி பெயர் உள்ளிடவும்.';
-$L['validation_no_password'] = 'உங்கள் கடவுச்சொல்லை உள்ளிடவும்.';
-$L['install_invalid_db_info'] = 'நாங்கள் உங்களுக்கு வழங்கப்பட்ட தகவலை பயன்படுத்தி தரவுத்தள இணைக்க முடியவில்லை. தகவல் மீண்டும் பிழை செய்தி இருக்கிறது: <i> {$db_connection_error} </i>';
-$L['install_no_db_connection'] = 'உங்கள் தரவுத்தள பெயர் மற்றும் தேதி தகவல் சரிபார்க்கவும். நாம் தரவுத்தள புரவலன் இணைக்க முடியும் என்றாலும், நாம் தரவுத்தள இணைக்க முடியவில்லை. தகவல் மீண்டும் பிழை செய்தி இருக்கிறது: <i> {$db_select_error} </i>';
-$L['settings_file_exists'] = 'அமைப்புகளை கோப்பு ஏற்கனவே உள்ளது. புதிய நிறுவல்கள், மாரியப்பனார் இல்லை வேண்டும். அதை நீக்க மற்றும் நிறுவல் உரை தொடர்ந்து அல்லது ஏற்கனவே உள்ள அமைப்புகளை கோப்பு மதிப்புகள் மீண்டும் ஸ்கிரிப்ட் ஏற்றும் முயற்சி ஒன்று.';
-$L['first_name'] = 'முதல் பெயர்';
-$L['last_name'] = 'கடைசி பெயர்';
-$L['settings'] = 'அமைப்புகள்';
-$L['geo'] = 'ஜியோ';
-$L['numeric'] = 'எண்';
-$L['notify_settings_updated'] = 'உங்கள் அமைப்புகள் புதுப்பிக்கப்பட்டன.';
-$L['tip_country_data'] = 'இந்த பகுதியில் நீங்கள் குறிப்பிட்ட நாடு தரவு உங்கள் உருவாக்கப்படும் தரவு செட் சேர்க்கப்பட்டுள்ளது வேண்டும், என்ன கட்டுப்படுத்த உதவுகிறது. நீங்கள் இங்கே தேர்ந்தெடுக்க மதிப்புகள் போன்ற பிராந்தியம் <i> நீங்கள் தேர்வு செய்யலாம் என்று சில தரவு வகைகள், </i> <i> தபால் / Zip </i> மற்றும் <i> நாடு </i>. </p> <பாதிக்கும் நாடு குறிப்பிட்ட தரவு பிரிவில் இருந்து நாடுகளில் நீக்க / பின்னர் சேர்க்க தரவு தொகுப்பு பிரிவில் உங்கள் வரிசைகளில் ஒரு <i> பிராந்தியம் </i> தகவல்கள் வகை தேர்வு முயற்சி, இதன் பொருள் என்ன ஒரு நல்ல யோசனை கொடுக்க ப>. நீங்கள் தோன்றும் அந்த வரிசையில் விருப்பங்களை நேரடியாக நீங்கள் தேர்ந்தெடுத்த நாடுகளில் பாதிக்கப்பட்ட என்று பார்க்கலாம்: நீங்கள் மட்டும் எப்போதும் தேர்ந்தெடுக்கப்பட்ட நாடுகளில் ஒரு துணைக்குழு உருவாக்க முடியும்.';
-$L['country_specific_data'] = 'நாட்டில் குறிப்பிட்ட தகவல்கள்';
-$L['data_set'] = 'தரவு தொகுதி';
-$L['data_format'] = 'தரவு வடிவம்';
-$L['no_additional_export_type_settings'] = 'கூடுதல் ஏற்றுமதி வகை அமைப்புகள்.';
-$L['blog'] = 'வலைப்பதிவு';
-$L['your_account'] = 'உங்கள் கணக்கு';
-$L['your_data_sets'] = 'உங்கள் தரவு தொகுதிகள்';
-$L['data_types'] = 'தரவு வகைகள்';
-$L['account_type'] = 'கணக்கு வகை';
-$L['num_saved_data_sets'] = 'எண் சேமிக்கப்பட்ட தரவு தொகுதிகள்';
-$L['total_rows_generated'] = 'உருவாக்கப்படும் மொத்த வரிசைகள்';
-$L['date_account_created'] = 'உருவாக்கப்பட்ட நாள் கணக்கு';
-$L['no_saved_data_sets'] = 'நீங்கள் எந்த சேமிக்கப்படும் தரவு தொகுதிகள் இல்லை.';
-$L['data_set_name'] = 'தரவு தொகுப்பு பெயர்';
-$L['data_created'] = 'Created தகவல்கள்';
-$L['last_modified'] = 'இறுதியாக திருத்தப்பட்டது';
-$L['public_q'] = 'பொது?';
-$L['rows_generated'] = 'உருவாக்கினீர்கள் வரிசைகள்';
-$L['save_data_set_to_link'] = '<i>மறுக்கப்பட்டது</i>. மற்ற மக்கள் இந்த தரவு தொகுப்பு பகிர்ந்து பொருட்டு, நீங்கள் முதலில் காப்பாற்ற வேண்டும்.';
-$L['make_data_set_public_agreement'] = 'நான் இந்த தரவு தொகுப்பு பகிர்ந்து கொள்ள வேண்டும் என்று புரிந்து கொள்ள, நான் அதை பொது செய்ய வேண்டும்.';
-$L['clear_the_page'] = 'பக்கம் அழி';
-$L['link_to_this_data_set'] = 'இந்த தரவு தொகுப்பு இணைப்பு';
-$L['save'] = 'சேமிக்கவும்';
-$L['your_data_set_name_here'] = 'உங்கள் தரவு இங்கே பெயர் அமைக்க ...';
-$L["country_specific_data"] = "நாட்டை குறிக்கும் புள்ளிவிவரங்கள்";
-$L['data_set_help'] = 'நீங்கள் உருவாக்க வேண்டும் தரவு என்ன மாதிரியான சரியாக வரையறுக்க அங்கு இது. ஒரு வரிசையில் அல்லது இரண்டு பூர்த்தி முயற்சி மற்றும் உருவாக்க பொத்தானை கிளிக் செய்யவும். நீங்கள் மிகவும் வேகமாக அதை செயலிழப்பு கிடைக்கும்.';
-$L['export_types'] = 'ஏற்றுமதி வகைகள்';
-$L['export_types_help'] = 'இந்த பகுதியில் நீங்கள் உங்கள் உருவாக்கப்படும் தரவு வடிவம் கட்டுப்படுத்த உதவுகிறது. ஒவ்வொரு வடிவத்தில் நீங்கள் சரியாக என்ன வெளியீடு தையல்காரர் நாம் வெவ்வேறு விருப்பங்கள் வழங்கலாம்.';
-$L['hide_data_format_options'] = 'தரவு வடிவம் விருப்பங்களை மறைக்க';
-$L['show_data_format_options'] = 'தரவு வடிவம் விருப்பங்களை காட்ட';
-$L['rows'] = 'வரிசைகள்';
-$L['generate_in_page'] = 'உருவாக்க உள்ள பக்கம்';
-$L['new_window_or_tab'] = 'புதிய சாளரம் / தாவல்';
-$L['prompt_to_download'] = 'பதிவிறக்க வரியில்';
-$L['cancel'] = 'ரத்து';
-$L['regenerate'] = 'மறுபடி உண்டாக்கு';
-$L['generated_X_of_Y_results'] = '<span id="gdGenerateTotal"></span> முடிவுகளின் <span id="gdGenerateCount"></span> மட்டுமே உருவாக்கப்பட்டது';
-$L['plugins'] = 'கூடுதல்';
-$L['plugins_intro'] = 'நீங்கள் ஒரு நீட்சி சேர்க்க அல்லது நீக்க எந்த நேரத்திலும், நீங்கள் கூடுதல் மீட்டமைக்க வேண்டும். இந்த தகவல் புதுப்பிக்கும் மற்றும் நீங்கள் தேவை கூடுதல் அணுக முடியும் என்பதை உறுதி செய்யும்.';
-$L['reset_plugins'] = 'கூடுதல் மீட்டமை';
-$L['misc'] = 'மற்றவை';
-$L['theme'] = 'தீம்';
-$L['developer'] = 'உருவாக்குபவர்';
-$L['developer_intro'] = 'பின்வரும் பிரிவுகள் நீங்கள் வளர்ச்சி நோக்கங்களுக்காக உங்கள் JavaScript கன்சோல் பார்க்க என்ன இவ்வறிவிப்பு முடிகின்றன.';
-$L['list_console_warn_events'] = 'பட்டியல் console.warn () நிகழ்வுகள்';
-$L['list_module_publish_events'] = 'பட்டியல் தொகுதி <b> நிகழ்வுகளை வெளியிடலாம் </b>';
-$L['list_module_subscribe_events'] = 'பட்டியல் தொகுதி <b> நிகழ்வுகளை பதிவு </b>';
-$L['list_core_events'] = 'பட்டியல் <b> கோர் </b> நிகழ்வுகள்';
-$L['limit_pub_sub_console_messages'] = 'குறிப்பிட்ட தொகுதிகள் எல்லை பப் / துணை பணியகம் செய்திகள்:';
-$L['all_data_type_plugins'] = 'அனைத்து தகவல்கள் வகை கூடுதல்';
-$L['all_export_type_plugins'] = 'அனைத்து ஏற்றுமதி வகை கூடுதல்';
-$L['about_title'] = 'என்ன <i> </i> இந்த விஷயம்?';
-$L['about_para1'] = 'சில நேரங்களில் நீங்கள், மென்பொருள் சோதனை தரவுத்தளங்கள் உருவாக்குகிறது மற்றும் யதார்த்தமான காணப்படும் Mockups உருவாக்கும் போன்ற விஷயங்களை போலி தரவு வேண்டும். <i> உரை, நாம் </i> அலங்காரம் வேண்டும்: ஆனால் எல்லாவற்றையும் ...? இந்த கருவி, நீங்கள் தேவை என்ன வடிவில் விருப்ப அதிக அளவிலான தரவுகளை உருவாக்க நாம் ஒரு விரைவான மற்றும் எளிமையான வழி வழங்க எழுதப்பட்டது.';
-$L['about_para2'] = '<b> முழு ஸ்கிரிப்ட் உள்ளது உருவாக்குதல் </b>: வெறும் தரவு நீங்கள் ஆர்வமாக அமைக்க கட்ட பக்கம் உள்ள பல்வேறு துறைகளில் நிரப்ப, பின்னர் பொத்தானை உருவாக்குதல் கிளிக் செய்யவும். விரைவாக ஏய்! எளிதாக, இல்லையா?';
-$L['extend_id'] = 'அதை நீட்டிக்க';
-$L['about_para3'] = 'வெளியே பெட்டி ஸ்கிரிப்ட் நீங்கள் பொதுவாக வேண்டும் செயல்பாடு வகையான கொண்டிருக்கிறது. ஆனால் எதுவும் இதுவரை முழுமையான இருக்கிறது - ஒருவேளை நீங்கள், சீரற்ற ஆச்சரியத்திற்குரிய கணித சமன்பாடுகள் உருவாக்க சீரற்ற ட்வீட் இழுக்க அல்லது வார்த்தை தலைப்பு "ரெட் ஆதரவு வோலை" மூலம் Flickr இருந்து சீரற்ற படங்களை காட்ட வேண்டும். யார் தெரிகிறது. அனைவரும் பயன்படுத்துவது வழக்கு வேறு.';
-$L['about_para4'] = 'இதை மனதில் கொண்டு, ஸ்கிரிப்ட் புதிய பதிப்பு (3.0.0 +) முழுமையாக நீடிக்கவும் இருக்கும் வடிவமைக்கப்பட்டுள்ளது: டெவலப்பர்கள் சீரற்ற தரவு புதிய வகையான உருவாக்க தங்கள் சொந்த தரவு வகைகள் எழுத, மற்றும் கூட ஏற்றுமதி வகைகள் தனிப்பயனாக்கலாம் - ல் வடிவம் அதாவது இது தரவு வெளிப்பாடு ஆகும். மிகவும் துல்லியமான மொழிபெயர்க்கப்பட்ட புவியியல் தரவு உருவாக்க ஆர்வமாக மக்கள், அவர்கள் தேர்வு தங்கள் நாட்டின் பகுதியில் பெயர்கள் (அமெரிக்கா, மாநிலங்கள், பகுதிகள் போன்றவை), நகரம் பெயர்கள் மற்றும் தபால் / ZIP குறியீடு வடிவங்கள் வழங்க புதிய நாடு கூடுதல் சேர்க்க முடியும்.';
-$L['about_para5'] = 'அதை நீட்டிக்க எப்படி மேலும் தகவலுக்கு, மிக <a href="docs/"> டெவலப்பர் ஆவணங்களை </a> செல்க.';
-$L['a_few_links'] = 'ஒரு சில இணைப்புகள்';
-$L['fork_on_github'] = 'மகிழ்ச்சியா குறியீடு வலுவாக்க';
-$L['read_developer_doc'] = 'டெவலப்பர் ஆவணங்களை படிக்க';
-$L['goto_website'] = 'வலைத்தளம் சென்று';
-$L['latest_project_news'] = 'சமீபத்திய திட்டம் செய்தி';
-$L['last_edited'] = 'கடந்த திருத்த';
-$L['last_saved'] = 'கடைசியாக சேமிக்கப்பட்ட';
-$L['please_confirm'] = 'உறுதி செய்து';
-$L["yes"] = "ஆம்";
-$L["no"] = "இல்லை";
-$L['not_saved'] = 'சேமித்த';
-$L['please_enter_all'] = 'அனைத்து உள்ளிடவும்';
-$L['export_type_validate_error'] = 'அச்சச்சோ! ஏற்றுமதி வகை தான் இன்றும் () செயல்பாடு ஒரு பிழை ஏற்பட்டது. மன்னிக்கவும், தொடர முடியாது - ஒரு டெவலப்பர் அழைப்பு!';
-$L["refresh_page"] = "பக்கம் புதுப்பிப்பு";
-$L['close'] = 'மூடு';
-$L['anonymous_admin_account'] = 'அநாமதேய நிர்வாகி கணக்கு';
-$L['report_bug'] = 'புகாரளி';
-$L['developer_doc'] = 'டெவலப்பர் டாக்';
-$L['no_data_types_found'] = 'தரவு எதுவும் வகைகள்';
-$L['no_export_types_found'] = 'எதுவும் ஏற்றுமதி வகைகள்';
-$L['installation_error'] = 'நிறுவல் பிழை';
-$L['continue_rightarrow'] = 'தொடர்க »';
-$L['check_database_info'] = 'டேட்டாபேஸ் தகவல் சரிபார்க்கவும்';
-$L['create_settings_file'] = 'அமைப்புகள் கோப்பை உருவாக்கு';
-$L['complete_excl'] = 'நிறைவு!';
-$L['installation_step2_intro'] = 'இதுவரை மிகவும் நல்ல! இப்போது உங்கள் <b> மாரியப்பனார் </b> கோப்பு உருவாக்க கீழே உள்ள பொத்தானை கிளிக் செய்யவும். இந்த கோப்பு இந்த விண்ணப்பத்தை மூல கோப்புறையில் சேமிக்கப்படும் மற்றும் உங்கள் நிறுவல் பற்றி தனிபயன் தகவல்களை சேமித்து (டேட்டாபேஸ் தவிர) மட்டும் இடம் உள்ளது.';
-$L['create_file_rightarrow'] = 'கோப்பு உருவாக்கவும் »';
-$L['installation_step3_intro'] = 'உங்கள் நிறுவல் பயனர் கணக்குகளை கையாளும் வழி மூன்று தேர்வுகள் உள்ளன.';
-$L['single_anonymous_user_account'] = 'ஒற்றை, அநாமதேய பயனர் கணக்கு';
-$L['single_user_account_requires_login'] = 'ஒற்றை பயனர் கணக்கு, உள்நுழைவு தேவை';
-$L['multiple_accounts'] = 'பல கணக்குகள்';
-$L['goto_script_rightarrow'] = '»ஸ்கிரிப்ட் சென்று';
-$L['enter_user_account_details'] = 'கீழே உங்கள் பயனர் கணக்கு விவரங்கள் உள்ளிடவும்.';
-$L['installation_plugin_intro'] = 'ஏறக்குறைய முடிந்தது! இப்போது நாம் கூடுதல் நிறுவ போகிறோம்: இந்த தரவு ஜெனரேட்டர் உண்மையில் பயனுள்ளதாக <i> செய்ய என்ன </i> - நீங்கள் (தரவு வகைகள்) உருவாக்க முடியும் தரவு வகை, அதாவது, உருவாக்கப்படும் தரவு வடிவம் (ஏற்றுமதி வகைகள்) மற்றும் பகுதிகள் மற்றும் நகரங்களில் போன்ற அனைத்து நாடு குறிப்பிட்ட தரவு.';
-$L['install_plugins_rightarrow'] = 'கூடுதல் »நிறுவ';
-$L['installation_complete_text'] = 'தரவு ஜெனரேட்டர் வெற்றிகரமாக நிறுவப்பட்ட! ஸ்கிரிப்ட் செல்ல கீழே உள்ள பொத்தானை சொடுக்கவும்.';
-$L['please_login'] = 'உள்நுழைவு';
-$L['forgotten_your_password_q'] = 'உங்கள் கடவுச்சொல்லை மறந்து விட்டீர்களா?';
-$L['admin'] = 'நிர்வாகம்';
-$L['user'] = 'பயனர்';
-$L['logout'] = 'விடு பதிகை';
-$L['create_account'] = 'கணக்கு உருவாக்க';
-$L['edit'] = 'திருத்து';
-$L['delete'] = 'நீக்கு';
-$L['no_user_accounts_defined'] = 'எந்த பயனர் கணக்குகளை வரையறுக்கப்பட்டுள்ளது.';
-$L['num_records_generated'] = 'உருவாக்கப்படும்';
-$L['last_logged_in'] = 'கடந்த Logged உள்ள';
-$L['date_created'] = 'தேதி உருவாக்கப்பட்டது';
-$L['user_account_section_intro'] = 'இந்த பகுதியில் நீங்கள் மக்கள் ஸ்கிரிப்ட் அணுக அனுமதிக்க பயனர்கள் கணக்குகளை எந்த எண்ணை உருவாக்க முடிகிறது. நீ மட்டும் கணக்குகளை உருவாக்க அல்லது நீக்க முடியும்.';
-$L['email_user_login_info'] = 'பயனர் தங்கள் உள்நுழைவு தகவல் மின்னஞ்சல்';
-$L['create_account_rightarrow'] = 'கணக்கை உருவாக்கவும் »';
-$L['delete_account'] = 'கணக்கு நீக்கு';
-$L['update_account'] = 'கணக்கு புதுப்பிப்பு';
-$L['confirm_delete_user_account'] = 'நீங்கள் இந்த பயனர் கணக்கை நீக்க வேண்டும் என்பதில் உறுதியாக இருக்கிறீர்களா?';
-$L['success'] = 'வெற்றி';
-$L['error'] = 'பிழை';
-$L['invalid_password'] = 'மன்னிக்கவும், கடவுச்சொல் தவறானது. மீண்டும் முயற்சிக்கவும்.';
-$L['reset_password'] = 'கடவுச்சொல் மீட்டமை';
-$L['password_reset_email_content1'] = 'உங்கள் கடவுச்சொல்லை மீட்டமைக்க. நீங்கள் புகுபதிகை செய்ய பின்வரும் கடவுச்சொல்லை பயன்படுத்தலாம்:% 1';
-$L['password_reset_email_content2'] = 'நீங்கள் இன்னும் உள்நுழைவு தொடங்கவில்லை ஒருமுறை அதை மாற்ற தயவு செய்து';
-$L['password_reset_complete'] = 'உங்கள் கடவுச்சொல்லை மீட்டமைக்க மற்றும் நீங்கள் புதிய கடவுச்சொல்லை மின்னஞ்சல் வருகின்றனர்.';
-$L['email_not_sent'] = 'நாம் மின்னஞ்சல் அறிவிப்பை அனுப்ப முடியவில்லை.';
-$L['user_not_found'] = 'மன்னிக்கவும், நீங்கள் அடையாளம் காண முடியவில்லை.';
-$L['account_created_msg'] = 'ஒரு கணக்கை நீங்கள் உருவாக்கப்பட்டது.';
-$L['account_created'] = 'கணக்கு';
-$L['invalid_account_id'] = 'கணக்கு ஐடி தவறானது.';
-$L['account_info'] = 'கணக்கு தகவல்';
-$L['account_updated'] = 'உங்கள் கணக்கு மேம்படுத்தப்பட்டது.';
-$L['password_change_note'] = 'நீங்கள் அதை மாற்ற வேண்டும் என்றால் நீங்கள் மட்டுமே கடவுச்சொல் புலங்கள் நிரப்ப வேண்டும்.';
-$L['info_and_stats'] = 'தகவல் மற்றும் விபரம்';
-$L['account_settings'] = 'கணக்கு அமைப்புகள்';
-$L['enter_email_address_to_reset_password'] = 'உங்கள் கடவுச்சொல்லை மீட்டமைக்க கீழே உங்கள் மின்னஞ்சல் முகவரியை உள்ளிடவும்.';
-$L['extend_it'] = 'அதை நீட்டிக்க';
-$L['africa'] = 'ஆப்ரிக்கா';
-$L['asia'] = 'ஆசியா';
-$L['europe'] = 'ஐரோப்பா';
-$L['north_america'] = 'வட அமெரிக்கா';
-$L['central_america'] = 'மத்திய அமெரிக்கா';
-$L['south_america'] = 'தென் அமெரிக்கா';
-$L['oceania'] = 'ஓசியானியா';
-$L['all_countries'] = 'அனைத்து நாடுகள்';
-$L['link_to_data_set'] = 'தரவை அமைக்க இணைப்பு';
-$L['login'] = 'புகுபதிகை';
-$L['forgot_password'] = 'கடவுச்சொல் மறந்து விட்டீர்களா';
-$L['admin_account'] = 'நிர்வாகி கணக்கு';
-$L['feature_enabled'] = 'இயக்கப்பட்டது';
-$L['anonymous_access'] = 'பெயரில்லா அணுகல்';
-$L['anonymous_user_desc'] = 'அடையாளம் காட்டாத பயனர்களை ஸ்கிரிப்ட் பயன்படுத்த ஆனால் மட்டுப்படுத்தப்பட்ட அணுக முடியும்: அவர்கள் தரவு பெட்டிகள், இணைப்பு சேமிக்க அல்லது ஒரு நேரத்தில் 100 க்கும் மேற்பட்ட வரிசைகள் உருவாக்க முடியாது.';
-$L['anonymous_user_message'] = 'காப்பாற்ற முயற்சிக்கும் போது அநாமதேய பயனர்கள் காட்ட செய்தி:';
-$L['anonymous_user_default_message'] = 'ஒரு பயனர் கணக்கை பெற someone@yoursite.com உள்நுழைய அல்லது மின்னஞ்சல் தயவு செய்து.';
-$L['login_url_c'] = 'URL:';
-$L['email_c'] = 'மின்னஞ்சல்:';
-$L['password_c'] = 'கடவுச்சொல்:';
-$L['no_account_found'] = 'மன்னிக்கவும், கணக்கு இல்லை.';
-$L['update'] = 'புதுப்பி';
-$L['documentation'] = 'ஆவணமாக்கம்';
-$L['install_user_doc_link'] = 'நிறுவலின் பற்றி மேலும் தகவலுக்கு, எங்கள் <a href="http://benkeen.github.io/generatedata/install.html" target="_blank"> பயனர் ஆவணங்கள் </a> பாருங்கள்.';
-$L['num_rows_too_large'] = 'மன்னிக்கவும், நீங்கள் ஒரு நேரத்தில் <b>% 1 </b> வரிசைகள் உருவாக்கும் மட்டுமே. தொடர்ந்து உருவாக்க சொடுக்கவும்.';
-$L['fork_this_project_on_github'] = 'மகிழ்ச்சியா இந்த திட்டம் வலுவாக்க';
-$L['download'] = 'பதிவிறக்கம்';
-$L['loading'] = 'ஏற்றுகிறது ...';
-$L['validation_account_already_exists'] = 'மன்னிக்கவும், மின்னஞ்சல் முகவரியை ஒரு கணக்கு ஏற்கனவே உள்ளது.';
-$L['validation_not_logged_in'] = 'நீங்கள் இன்னும் உள்நுழைவு தொடங்கவில்லை தோன்றும் இல்லை மீண்டும் உள்நுழைய முயலவும்.';
-$L['validation_invalid_permissions'] = 'நீங்கள் இதை செய்ய உங்களுக்கு அனுமதி இல்லை.';
-$L['installation_failed_create_settings_file'] = 'ஸ்கிரிப்ட் உங்கள் <b> மாரியப்பனார் </b> கோப்பினை உருவாக்க முடியவில்லை.';
-$L['installation_failed_create_settings_file_msg'] = 'அது அடைவு எழுத அனுமதி முடியவில்லை இது வழக்கமாக ஏற்படுகிறது. கைமுறையாக இந்த கோப்பு உருவாக்க மற்றும் தரவு ஜெனரேட்டர் அடிப்படை கோப்புறையில் அதை வைக்க தயவுசெய்து. இதை செய்து போது, கீழே உள்ள பொத்தானை நிறுவும் தொடர.';
-$L['confirm_file_exists'] = 'கோப்பு எதுவும் உறுதி';
-$L['reset_plugins_with_bundling'] = '<b> நீங்கள் கூட்டுதல் வேண்டும் / minification </b> உதவியது. இந்த பொத்தானை கிளிக் செய்து பின்னர் நீங்கள் மூட்டைகளை மீண்டும் <i> கிரண்ட் </i> இயக்க வேண்டும். மேலும் தகவல் வந்தது <a href="http://benkeen.github.io/generatedata/developer.html#bundling" target="_blank"> இந்த ஆவணங்களை பக்கம் </a> படிக்க. நீங்கள் எந்த பிரச்சினைகள் இருந்தால், நீங்கள் கூட்டுதல் அணைக்க வேண்டும்.';
-$L['cannot_change_num_rows'] = 'மன்னிக்கவும், நீங்கள் உருவாக்கிய வரிசைகள் எண்ணிக்கை மாற்ற அனுமதி இல்லை.';
-$L['zip_q'] = 'Zip?';
-$L['please_enter_data_set_name'] = 'புதிய தரவு தொகுப்பு பெயரை உள்ளிடவும்.';
-$L['delete_1_data_set'] = '1 தரவு அமை நீக்கு';
-$L['delete_N_data_sets'] = '% 1 தரவு தொகுதிகள் நீக்கு';
\ No newline at end of file
diff --git a/resources/lang/website_de.php b/resources/lang/website_de.php
deleted file mode 100644
index 06ac4b682..000000000
--- a/resources/lang/website_de.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-
-$L = array();
-
-// Category: Website
-$L["about_para1"] = "Mussten Sie schon mal benutzerdefinierte formatierte sample / Testdaten, wie, schlecht? Nun, das ist die Idee dieses Skript. Es ist ein kostenloses Open-Source-Tool in JavaScript, PHP und MySQL geschrieben, dass Sie schnell zu erzeugen große Mengen von benutzerdefinierten Daten in einer Vielzahl von Formaten für den Einsatz in Test-Software, Datenbanken bevölkern, und lässt ... so weiter und so fort.";
-$L["about_para2"] = "Diese Website bietet eine Online-Demo, wo Sie zu basteln willkommen sind rund um ein Gefühl von dem, was das Skript nicht zu bekommen, welche Funktionen es bietet und wie es funktioniert. Dann, sobald Sie haben Ihren Appetit anzuregen, gibt es eine kostenlose, voll funktionsfähige, GNU-lizenzierte Version zum Download zur Verfügung. Alternativ, wenn Sie den Ärger der Einstellung es auf Ihrem eigenen Server vermeiden möchten, können Sie spenden $20 oder mehr, ein Konto auf dieser Website zu erhalten, so dass Sie erzeugen bis zu 5.000 Datensätze in einer Zeit (statt der maximal 100), und lassen Sie Ihre Daten speichern Sets. Klicken Sie auf die Registerkarte Spenden für weitere Informationen.";
-$L["about_para3"] = "Für Benutzer, die ein Konto bei der alten Seite hatten, können Sie immer noch <a href=\"http://old.generatedata.com\">finden es hier</a>: mach dir keine Sorgen, können Sie sich trotzdem anmelden und Zugriff auf Ihre Datensätze. Leider aus technischen Gründen konnten wir nicht über Ihre Daten zu portieren setzt auf das neue Skript (es ist wirklich unterschiedlich). Allerdings werden Sie feststellen, dass Sie ein gültiges Benutzerkonto haben auf der neuen Website als gut, so können Sie mit der neuen Version heute.";
-$L["about_para4"] = "Die out-the-box-Skript enthält die Art von Funktionalität, die Sie benötigen im Allgemeinen. Aber nichts ist jemals komplett - vielleicht brauchen Sie, um zufällige esoterischen mathematischen Gleichungen zu erzeugen, ziehen zufällige Tweets oder anzuzeigen zufällige Bilder von Flickr mit dem Wort \"Rot-unterstützte Wühlmaus\" im Titel. Wer weiß. Jeder Anwendungsfall ist anders.";
-$L["about_para5"] = "Vor diesem Hintergrund wurde die neue Version des Skripts (3.0.0+) entwickelt, um vollständig erweiterbar: Entwickler können ihre eigenen Datentypen schreiben, neue Arten von zufälligen Daten zu erzeugen, und sogar anpassen, die Export-Typen - dh das Format, in dem die Daten ausgegeben werden. Für die Menschen in Erzeugung genauer lokalisierten geographischen Daten interessiert sind, können sie neue Land Plugins, die Bezeichnungen der Regionen (Staaten, Provinzen, Territorien etc), Städtenamen und Postleitzahl / PLZ Formate liefern für ihr Land der Wahl. Für weitere Informationen über all dies finden Sie auf der <a href=\"http://benkeen.github.io/generatedata/developer.html\" target=\"_blank\">Entwickler Dokumentation</a>.";
-$L["about_para6"] = "Klicken Sie auf die Schaltfläche unten, um die neueste Version des Skripts von github herunterladen. Weitere Informationen finden Sie in der <a href=\"http://benkeen.github.io/generatedata/\" target=\"_blank\">Anwender-Dokumentation</a>.";
-$L["amount"] = "Betrag";
-$L["date_account_expires"] = "Ablaufdatum für das Konto";
-$L["donate"] = "Spenden";
-$L["donate_now"] = "Spenden Sie jetzt!";
-$L["donate_para1"] = "Wenn dies hat Sie bei Ihrer Arbeit geholfen, ist eine Spende immer willkommen! Wenn ein allgemeines Gefühl der do-goodery ist nicht genug, um Sie davon zu überzeugen, zu spenden, sind hier ein paar weitere materielle Anreize:";
-$L["donate_para2"] = "Unterstützung des Projekts führt zu tollen neuen Features! Ehrlich!";
-$L["donate_para3"] = "Spenden $20 oder mehr erhalten Sie ein Benutzerkonto auf dieser Website. Mit einem Benutzerkonto können Sie:";
-$L["donate_para4"] = "Generieren Sie bis zu 5.000 Zeilen in einer Zeit statt der maximalen 100.";
-$L["donate_para5"] = "Speichern Sie Ihre Form Konfigurationen, so dass Sie nicht haben, um neu zu erstellen, Ihre Daten setzt jedes Mal, wenn Sie auf der Website.";
-$L["donate_para6"] = "Jede $20 Sie spenden fügt ein <b>Jahr</b> auf Ihr Konto. Sie können zu einem späteren Zeitpunkt zurück, um mehr Zeit zu Ihrem Konto hinzufügen - es wird bis zum Ende der aktuellen Zeit hinzugefügt werden. Nur sicher sein, mit der gleichen E-Mail-Adresse zu spenden. Wenn Sie irgendwelche Probleme spenden oder mit Ihrem Benutzerkonto, nur <a href=\"mailto:ben.keen@gmail.com\">Drop me a line</a>.";
-$L["error_creating_account_msg"] = "Es tut uns leid, es gab ein Problem beim Erstellen Ihres Benutzerkontos. Das sollte nicht passieren! Bitte versuchen Sie es später erneut.";
-$L["extend_id"] = "Verlängern sie";
-$L["incomplete_donation_msg"] = "Oops, es sieht aus wie Sie bereits gespendet, aber noch nicht fertig Einrichtung Ihres Kontos. <a href=\"{\$link}\">Klicken Sie hier</a>, um Ihr Konto einzurichten.";
-$L["loading_ellipsis"] = "Wird geladen ...";
-$L["news"] = "Nachrichten";
-$L["news_feed_error"] = "<p>Drat, gab es ein Problem der Interaktion mit dem News-Feed. Entschuldigung!</p><p>Um das neueste Projekt Nachrichten durchsuchen, <a href=\"http://www.benjaminkeen.com/category/projects/data-generator/\">goto meiner Website.</a></p>";
-$L["project_news"] = "Project News";
-$L["user_account_exists_msg"] = "Oops! Wie es aussieht, haben bereits ein Benutzerkonto. Bitte loggen Sie sich in der ersten, dann können Sie spenden, um Zeit zu Ihrem Konto hinzufügen. Klicken Sie auf den Link für die Anmeldung an der Spitze der Seite, um sich anzumelden / Ihr Passwort zurücksetzen.";
-$L["where_the_old_site"] = "Wo ist die alte Seite?";
-$L["years1"] = "1 Jahr";
-$L["years2"] = "2 Jahre";
-$L["years3"] = "3 Jahre";
-$L["years4"] = "4 Jahre";
-$L["years5"] = "5 Jahre";
diff --git a/resources/lang/website_en.php b/resources/lang/website_en.php
deleted file mode 100644
index dd2f4518c..000000000
--- a/resources/lang/website_en.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-$L = array();
-$L["about_para1"] = "Ever needed custom formatted sample / test data, like, bad? Well, that's the idea of this script. It's a free, open source tool written in JavaScript, PHP and MySQL that lets you quickly generate large volumes of custom data in a variety of formats for use in testing software, populating databases, and... so on and so forth.";
-$L["about_para2"] = "This site offers an online demo where you're welcome to tinker around to get a sense of what the script does, what features it offers and how it works. Then, once you've whet your appetite, there's a free, fully functional, GNU-licensed version available for download. Alternatively, if you want to avoid the hassle of setting it up on your own server, you can donate $20 or more to get an account on this site, letting you generate up to 5,000 records at a time (instead of the maximum 100), and let you save your data sets. Click on the Donate tab for more information.";
-$L["about_para3"] = "For users who had an account with the old site, you can still <a href=\"http://old.generatedata.com\">find it here</a>: don't worry, you can still login and access your data sets. Unfortunately, for technical reasons, we couldn't port over your data sets to the new script (it's <i>really</i> different). However, you'll find that you have a valid user account on the new site as well, so you can start using the new version today.";
-$L["about_para4"] = "The out-the-box script contains the sort of functionality you generally need. But nothing's ever complete - maybe you need to generate random esoteric math equations, pull random tweets or display random images from Flickr with the word \"Red-backed vole\" in the title. Who knows. Everyone's use-case is different.";
-$L["about_para5"] = "With this in mind, the new version of the script (3.0.0+) was designed to be fully extensible: developers can write their own Data Types to generate new types of random data, and even customize the Export Types - i.e. the format in which the data is output. For people interested in generating more accurate localized geographical data, they can add new Country plugins that supply region names (states, provinces, territories etc), city names and postal/zip code formats for their country of choice. For more information on all this, visit the <a href=\"http://benkeen.github.io/generatedata/developer.html\" target=\"_blank\">Developer Documentation</a>.";
-$L["about_para6"] = "Click the button below to download the latest version of the script from github. For more information see the <a href=\"http://benkeen.github.io/generatedata/\" target=\"_blank\">User Documentation</a>.";
-$L["amount"] = "Amount";
-$L["date_account_expires"] = "Date account expires";
-$L["donate"] = "Donate";
-$L["donate_now"] = "Donate now!";
-$L["donate_para1"] = "If this has helped you in your work, a donation is always appreciated! If a general sense of do-goodery isn't enough to persuade you to donate, here are a few more material incentives:";
-$L["donate_para2"] = "Supporting the project leads to great new features! Honest!";
-$L["donate_para3"] = "Donating $20 or more will get you a user account on this website. With a user account you can:";
-$L["donate_para4"] = "Generate up to 5,000 rows at a time instead of the maximum 100.";
-$L["donate_para5"] = "Save your form configurations so you don't have to re-create your data sets every time you return to the site.";
-$L["donate_para6"] = "Every $20 you donate adds a <b>year</b> to your account. You may return at a later date to add more time to your account - it will be added to the end of your current time. Just be sure to donate with the same email address. If you have any trouble donating or with your user account, just <a href=\"mailto:ben.keen@gmail.com\">drop me a line</a>.";
-$L["error_creating_account_msg"] = "Sorry, there was a problem creating your user account. This shouldn't happen! Please try again later.";
-$L["extend_id"] = "Extend it";
-$L["incomplete_donation_msg"] = "Oops, it looks like you've already donated, but haven't finished setting up your account. <a href=\"{\$link}\">Click here</a> to set up your account.";
-$L["loading_ellipsis"] = "Loading...";
-$L["news"] = "News";
-$L["news_feed_error"] = "<p>Drat, there was a problem interacting with the news feed. Apologies!</p> <p>To browse the latest project news, <a href=\"http://www.benjaminkeen.com/category/projects/data-generator/\">goto my website.</a></p>";
-$L["project_news"] = "Project News";
-$L["user_account_exists_msg"] = "Oops! It looks like you already have a user account. Please login in first, then you can donate to add time to your account. Click the login link at the top of the page to login / reset your password.";
-$L["where_the_old_site"] = "Where's the old site?";
-$L["years1"] = "1 year";
-$L["years2"] = "2 years";
-$L["years3"] = "3 years";
-$L["years4"] = "4 years";
-$L["years5"] = "5 years";
diff --git a/resources/lang/website_es.php b/resources/lang/website_es.php
deleted file mode 100644
index 9acf3553a..000000000
--- a/resources/lang/website_es.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-$L = array();
-$L["about_para1"] = "¿Necesitas personalizar el formato de los datos de ejemplo o prueba? Pues bien, esa es la idea de este programa. Es una herramienta libre y de código abierto escrita en JavaScript, PHP y MySQL que te permite generar rápidamente grandes volúmenes de datos personalizados en una variedad de formatos para su uso en pruebas de software, rellenar bases de datos, etc.";
-$L["about_para2"] = "Este sitio ofrece una demostración en línea donde te invitamos a juguetear para tener una idea de lo que hace este programa, las características que ofrece y cómo funciona. Luego, una vez que haya despertado tu interés, hay una versión gratuita y totalmente funcional, con licencia GNU, disponible para su descarga. Alternativamente, si deseas evitar la molestia de su puesta en marcha en tu propio servidor, puedes donar 20$ o más para obtener una cuenta en este sitio, lo que te permite generar hasta 5.000 registros a la vez (en lugar del máximo de 100), y guardar tus conjuntos de datos. Pinche en la pestaña Donar para más información.";
-$L["about_para3"] = "Para los usuarios que tengan una cuenta en el sitio antiguo, aun pueden <a href=\"http://old.generatedata.com\">encontrarla aquí</a>: no te preocupe, puedes iniciar sesión y acceder a tus conjuntos de datos. Lamentablemente, por razones técnicas, no podemos portar tus conjuntos de datos al nuevo programa (son <i>realmente</i> diferentes). Sin embargo, encontraras que tienes una cuenta de usuario válida en el nuevo sitio, así que podrás comenzar a utilizar la nueva versión.";
-$L["about_para4"] = "El programa viene pre-configurado con la funcionalidad general que necesitas, pero no está completa. Puede que necesites generar ecuaciones matemática aleatorias, poner tweets aleatorios o visualizar imágenes aleatorias desde Flickr con la palabra \"Petirojo\" en el título. ¿Quién sabe?, cada persona es un caso diferente.";
-$L["about_para5"] = "Con esto en mente, la nueva versión del programa (3.0.0+) ha sido diseñada para ser totalmente flexible: los desarrolladores pueden escribir sus propios tipos de datos para generar nuevos tipos de datos aleatorios e incluso personalizar los tipos de exportación, p.e. el formato de salida de los datos. Para las personas interesadas en la generación de datos de localización geográfica, se pueden añadir nuevos complementos para proporcionar nombres de regiones (estados, provincias, territorios, etc), nombres de ciudades y formatos de códigos postales para su país. Para obtener más información visita la <a href=\"http://benkeen.github.io/generatedata/developer.html\" target=\"_blank\">Documentación del desarrollador</a>";
-$L["about_para6"] = "Pincha en el botón de abajo para descargar la última versión del programa desde GitHup. Para obtener más información visita la <a href=\"http://benkeen.github.io/generatedata/\" target=\"_blank\">Documentación de usuario</a>.";
-$L["amount"] = "Cantidad";
-$L["date_account_expires"] = "Fecha de caducidad de cuenta";
-$L["donate"] = "Donar";
-$L["donate_now"] = "¡Donar ahora!";
-$L["donate_para1"] = "Si te hemos ayudado en tu trabajo, ¡una donación es siempre de agradecer!: si hacer una buena obra no es suficiente para persuadirte, aquí tienes más incentivos:";
-$L["donate_para2"] = "¡Apoyar el proyecto conduce a nuevas características!, !Honestidad!";
-$L["donate_para3"] = "La donación de 20$ o más te dará una cuenta de usuario de este sitio. Con la cuenta de usuario puedes:";
-$L["donate_para4"] = "Generar hasta 5.000 filas a la vez en lugar del máximo de 100.";
-$L["donate_para5"] = "Guardar tus configuraciones de forma que no tienes que volver a crear los conjuntos de datos cada vez que regreses al sitio.";
-$L["donate_para6"] = "Cada donación de 20$ añade un año más a tu cuenta. Puedes volver después y añadir más tiempo a tu cuenta, que es añadido al final de tu tiempo actual. Solo debes asegurarte de donar con la misma dirección de correo electrónico. Si tienes algún problema en la donación o con tu cuenta de usuario, simplemente <a href=\"mailto:ben.keen@gmail.com\">escribeme</a>.";
-$L["error_creating_account_msg"] = "Lo siento, hubo un problema al crear tu cuenta de usuario. ¡Esto no debería suceder!. Por favor, vuelve a intentarlo más tarde.";
-$L["extend_id"] = "Extiéndela";
-$L["incomplete_donation_msg"] = "¡Vaya!, parece que has donado pero no has terminado de configurar tu cuenta. <a href=\"{\$link}\">Pincha aquí</a> para configurar tu cuenta.";
-$L["loading_ellipsis"] = "Cargando...";
-$L["news"] = "Noticias";
-$L["news_feed_error"] = "<p>Maldición, ha habido un problema con el servicio de noticias. ¡Disculpa!</p> <p>Para ver las últimas noticias del proyecto <a href=\"http://www.benjaminkeen.com/category/projects/data-generator/\">ve a mi sitio Web</a>.</p>";
-$L["project_news"] = "Noticias del proyecto";
-$L["user_account_exists_msg"] = "¡Vaya!, parece que ya tienes una cuenta de usuario. Por favor inicia tu sesión primero y después puedes donar para añadir tiempo a tu cuenta. Pincha en el enlace de la parte superior de la página para iniciar sesión o reiniciar tu contraseña.";
-$L["where_the_old_site"] = "¿Dónde está el sitio antiguo?";
-$L["years1"] = "1 año";
-$L["years2"] = "2 años";
-$L["years3"] = "3 años";
-$L["years4"] = "4 años";
-$L["years5"] = "5 años";
diff --git a/resources/lang/website_fr.php b/resources/lang/website_fr.php
deleted file mode 100644
index 1a9af72ae..000000000
--- a/resources/lang/website_fr.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-$L = array();
-
-$L["about_para1"] = "Jamais nécessaire échantillon / test des données formatées personnalisées, comme, mauvais? Eh bien, c'est l'idée de ce script. C'est un outil gratuit et open source écrit en JavaScript, PHP et MySQL qui vous permet de générer rapidement de gros volumes de données personnalisées dans une variété de formats pour une utilisation dans les logiciels de tests, bases de données peuplent, et ... ainsi de suite, et ainsi de suite.";
-$L["about_para2"] = "Ce site offre une démonstration en ligne où vous êtes invités à bricoler pour avoir une idée de ce que le script fait, quelles sont les caractéristiques qu'il offre et comment cela fonctionne. Puis, une fois que vous avez vous mettre en appétit, il ya un service gratuit, entièrement fonctionnel, la version sous licence GNU GPL disponible en téléchargement. Alternativement, si vous voulez éviter les tracas de la mise en place sur votre propre serveur, vous pouvez faire un don de 20 $ ou plus pour obtenir un compte sur ce site, vous permettant de générer jusqu'à 5.000 enregistrements à la fois (au lieu du maximum de 100), et vous permettent de sauvegarder vos ensembles de données. Cliquez sur l'onglet Faire un don pour plus d'informations.";
-$L["about_para3"] = "Pour les utilisateurs qui ont un compte avec l'ancien site, vous pouvez toujours <a href=\"http://old.generatedata.com\">trouver ici</a>: Ne vous inquiétez pas, vous pouvez toujours vous connecter et accéder à votre ensembles de données. Malheureusement, pour des raisons techniques, nous ne pouvions pas porter sur vos ensembles de données à la nouvelle écriture (c'est <i>vraiment</i> différent). Cependant, vous constaterez que vous disposez d'un compte utilisateur valide sur le nouveau site, ainsi, de sorte que vous pouvez commencer à utiliser la nouvelle version aujourd'hui.";
-$L["about_para4"] = "Le script out-the-box contient le type de fonctionnalité dont vous avez besoin en général. Mais rien n'est jamais complète - peut-être vous avez besoin de générer au hasard des équations mathématiques ésotériques, tirez tweets aléatoires ou afficher des images aléatoires provenant de Flickr avec le mot \"campagnol à dos roux\" dans le titre. Qui sait. Cas d'utilisation de chacun est différent.";
-$L["about_para5"] = "Dans cet esprit, la nouvelle version du script (3.0.0 +) a été conçu pour être entièrement extensible: les développeurs peuvent écrire leurs propres types de données pour générer de nouveaux types de données aléatoires, et même personnaliser les types d'exportation - soit le format où les données sont sorties. Pour les personnes intéressées par la production de données géographiques localisées plus précis, ils peuvent ajouter de nouveaux plugins de pays qui fournissent des noms de régions (États, provinces, territoires, etc), les noms des villes et des formats de code postal / ZIP pour leur pays de leur choix. Pour plus d'informations sur tout cela, visitez le <a href=\"http://benkeen.github.io/generatedata/developer.html\" target=\"_blank\">Developer Documentation</a>.";
-$L["about_para6"] = "Cliquez sur le bouton ci-dessous pour télécharger la dernière version du script de github. Pour plus d'informations, voir le <a href=\"http://benkeen.github.io/generatedata/\" target=\"_blank\">Documentation utilisateur</a>.";
-$L["amount"] = "Montant";
-$L["date_account_expires"] = "compte Date expire";
-$L["donate"] = "Faire un don";
-$L["donate_now"] = "Faites un don maintenant!";
-$L["donate_para1"] = "Si cela vous a aidé dans votre travail, un don est toujours apprécié! Si une idée générale de faire-goodery ne suffit pas à vous convaincre de faire un don, voici quelques avantages matériels:";
-$L["donate_para2"] = "Soutenir le projet conduit à beaucoup de nouvelles fonctionnalités! Honnête!";
-$L["donate_para3"] = "Le don de 20 $ ou plus, vous obtiendrez un compte utilisateur sur ce site. Avec un compte d'utilisateur, vous pouvez:";
-$L["donate_para4"] = "Générer jusqu'à 5000 lignes à la fois au lieu du maximum de 100.";
-$L["donate_para5"] = "Sauvegardez vos configurations de formulaire de sorte que vous n'avez pas besoin de recréer vos ensembles de données chaque fois que vous revenez sur le site.";
-$L["donate_para6"] = "Chaque 20 $ vous donnez ajoute une année de votre compte. Vous pouvez retourner à une date ultérieure pour ajouter plus de temps pour votre compte - il sera ajouté à la fin de votre heure actuelle. Juste être sûr de faire un don à la même adresse e-mail. Si vous avez des problèmes ou don à votre compte d'utilisateur, juste <a href=\"mailto:ben.keen@gmail.com\">drop me a line</a>.";
-$L["error_creating_account_msg"] = "Désolé, un problème création de votre compte d'utilisateur. Cela ne devrait pas arriver! S'il vous plaît réessayer plus tard.";
-$L["extend_id"] = "L'étendre";
-$L["incomplete_donation_msg"] = "Oops, on dirait que vous avez déjà donné, mais n'ont pas fini de configurer votre compte. <a href=\"{\$link}\">Cliquez ici</a> pour créer votre compte.";
-$L["loading_ellipsis"] = "Chargement en cours ...";
-$L["news"] = "Nouvelles";
-$L["news_feed_error"] = "<p>Zut, il y avait un problème d'interagir avec le flux de nouvelles. Toutes mes excuses!</p><p>Pour voir les dernières nouvelles du projet, <a href=\"http://www.benjaminkeen.com/category/projects/data-generator/\">goto mon site.</a></p>";
-$L["project_news"] = "Nouvelles du projet";
-$L["user_account_exists_msg"] = "Oops! On dirait que vous avez déjà un compte utilisateur. Merci de vous connecter en premier, alors vous pouvez faire un don pour ajouter du temps à votre compte. Cliquez sur le lien de connexion en haut de la page pour vous connecter / réinitialiser votre mot de passe.";
-$L["where_the_old_site"] = "Où est l'ancien site?";
-$L["years1"] = "1 année";
-$L["years2"] = "2 années";
-$L["years3"] = "3 années";
-$L["years4"] = "4 années";
-$L["years5"] = "5 années";
diff --git a/resources/lang/website_ja.php b/resources/lang/website_ja.php
deleted file mode 100644
index 44bd6e22e..000000000
--- a/resources/lang/website_ja.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-
-$L = array();
-
-// Category: Website
-$L['about_para1'] = '今までに必要なカスタム、サンプル/テストデータをフォーマットされたような、悪い？まあ、それはこのスクリプトのアイデアです。それはあなたがすぐにデータベースを取り込む、テストソフトウェアで使用するために様々な形式でのカスタム大容量のデータを生成することができますJavaScriptを、PHPとMySQLで書かれたフリーでオープンソースのツールだし、...などなど。';
-$L['about_para2'] = 'このサイトは、スクリプトが何をするかの感覚を得るために周りいじくりして歓迎しているオンラインデモを提供しています、何がそれを提供していますし、それがどのように動作するか備えています。あなたの食欲を刺激したら、次に、ダウンロード可能な無料の、完全に機能する、GNUライセンスバージョンがあります。あなた自身のサーバーにそれを設定する手間を避けたい場合は、別の方法として、あなたは、あなたが（代わりに最大100の）時点で5000までのレコードを生成させること、このサイトのアカウントを取得するために20ドル以上を寄付することができますそして、あなたのデータセットを保存してみましょう。詳細については、寄付タブをクリックします。';
-$L['about_para3'] = '古いサイトのアカウントを持っていたユーザーのために、あなたはまだ <a href="http://old.generatedata.com">ここでそれを見つけることができます</a>：心配しないで、あなたはまだログインしてアクセスできますデータ·セット。残念ながら、技術的な理由から、我々は（それが本当に<i>だ</i>が異なる）新しいスクリプトへのデータセット上のポートではありませんでした。ただし、あなたが今日、新しいバージョンの使用を開始できるように、だけでなく、新しいサイト上の有効なユーザーアカウントを持っていることがわかります。';
-$L['about_para4'] = 'アウトオブボックスのスクリプトでは、一般的に必要な機能のようなものが含まれています。しかし、何も今まで完全ません - 多分あなたは、ランダムな難解な数学の方程式を生成するランダムなつぶやきを引っ張ったり、単語タ​​イトルに「レッド·バック·ハタネズミ」とFlickrのからランダムに画像を表示する必要があります。誰が知っている。みんなのユースケースが異なります。';
-$L['about_para5'] = 'このことを念頭に置いて、スクリプト（3.0.0 +）の新しいバージョンは、完全に拡張できるように設計されました。開発者は、ランダムな新しいタイプのデータを生成するために、独自のデータ型を記述し、さらにはエクスポート種類をカスタマイズすることができます - 内のフォーマット、つまりどのデータが出力される。より正確なローカライズされた地理的データの作成に興味がある人のために、彼らは選択した自分たちの国のための地域名（米国、州、準州など）、都市名、郵便/郵便番号の形式を提供する新しい国のプラグインを追加することができます。このすべての詳細については、<a href="http://benkeen.github.io/generatedata/developer.html" target="_blank">を開発者用ドキュメント</a>をご覧ください。';
-$L['about_para6'] = 'githubのからスクリプトの最新バージョンをダウンロードするには、以下のボタンをクリックしてください。詳細については、<a href="http://benkeen.github.io/generatedata/" target="_blank">をユーザードキュメント</a>を参照してください。';
-$L['amount'] = '額';
-$L['date_account_expires'] = '日付アカウントが期限切れになる';
-$L['donate'] = '寄付する';
-$L['donate_now'] = '今すぐ寄付！';
-$L['donate_para1'] = 'これはあなたの仕事であなたを助けている場合は、寄付は常に歓迎です！社会改良思想の一般的な意味を寄付することを説得するのに十分でない場合は、ここではさらにいくつかの材料の優遇措置は以下のとおりです。';
-$L['donate_para2'] = 'プロジェクトをサポートすることは、素晴らしい新機能につながる！正直！';
-$L['donate_para3'] = '20ドル以上を寄付することは、このウェブサイトにあなたのユーザアカウントを取得します。あなたができるユーザー·アカウントを使用して：';
-$L['donate_para4'] = '代わりに、最大100の時点で5000行まで生成します。';
-$L['donate_para5'] = 'あなたがサイトに戻ったびに再作成してデータセットする必要はありませんので、フォームの設定を保存します。';
-$L['donate_para6'] = 'あなたが寄付すべての20ドルは、アカウントに<b>年</b>]を追加します。あなたは、あなたのアカウントに多くの時間を追加し、後日返すことがあります - それはあなたの現在の時間の最後に追加されます。ちょうど同じメールアドレスで寄付してください。何かトラブルが寄付したり、ユーザーアカウントを使用してをお持ちの場合は、ちょうど私の行<a href="mailto:ben.keen@gmail.com">をドロップ</a>.';
-$L['error_creating_account_msg'] = '申し訳ありませんが、自分のユーザーアカウントを作成するという問題があった。これは起こるべきではありません！後で再試行してください。';
-$L['extend_id'] = 'それを拡張';
-$L['incomplete_donation_msg'] = 'あなたは既に寄付しましたが、自分のアカウントの設定が終了していないようなおっと、それが見えます。もし、あなたのアカウントを設定するには、ここをクリック<a href="{$link}">をクリックします</a>。';
-$L['loading_ellipsis'] = '読み込んでいます...';
-$L['news'] = 'ニュース';
-$L['news_feed_error'] = 'DRAT <p>、ニュースフィードと対話するという問題があった。謝罪！</p> <p>最新のプロジェクトのニュースを参照するには、<a href="http://www.benjaminkeen.com/category/projects/data-generator/">後藤私のウェブサイト。</a> < /p>';
-$L['project_news'] = 'プロジェクトニュース';
-$L['user_account_exists_msg'] = 'おっと！あなたは既にユーザーアカウントを持っているように見えます。最初にログインしてください、あなたはあなたのアカウントに時間を追加するために寄付することができます。ログインするには、ページの上部にある[ログイン]リンクをクリックします/あなたのパスワードをリセットします。';
-$L['where_the_old_site'] = '古いサイトはどこにありますか？';
-$L['years1'] = '1年間';
-$L['years2'] = '2年';
-$L['years3'] = '3年';
-$L['years4'] = '4年';
-$L['years5'] = '5年';
diff --git a/resources/lang/website_nl.php b/resources/lang/website_nl.php
deleted file mode 100644
index aa6c27d24..000000000
--- a/resources/lang/website_nl.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-$L = array();
-$L["about_para1"] = "Heeft u ooit specifieke voorbeelden / testgegevens nodig gehad, laten we zeggen, onmiddelijk? Nou, dat is het idee van dit script. Het is een gratis, open source tool geschreven in JavaScript, PHP en MySQL waarmee u snel grote hoeveelheden aangepaste gegevens kunt genereren in een verscheidenheid van formaten voor gebruik in het testen van software, het vullen van databases en ... enzovoort, enzovoort.";
-$L["about_para2"] = "Deze site biedt een online demo waar je van harte welkom bent om rond te knutselen om een gevoel te krijgen wat het script doet krijgen, welke functies het biedt en hoe het werkt. Dan, als we eenmaal je eetlust hebben weten te wekken: er is een gratis, volledig functionele, GNU-licentie versie beschikbaar te downloaden. Als alternatief, om het gedoe van de installatie op uw eigen server te voorkomen, kunt u $20 of meer doneren om een account te krijgen op deze site, om u tot 5.000 records te laten genereren in één keer (in plaats van de maximale 100), en laat u uw datasets opslaan. Klik op het tabblad Doneren voor meer informatie.";
-$L["about_para3"] = "Voor gebruikers die een account hadden bij de oude site, u kunt nog steeds <a href=\"http://old.generatedata.com\">naar de oude website</a>: maak u geen zorgen, u kunt nog steeds inloggen en toegang krijgen tot uw datasets. Helaas, om technische redenen, konden we uw datasets niet aan naar nieuwe script kopieeren (het is <i>echt</i> verschillend). Echter, zult u merken dat u ook een geldig gebruikersaccount op de nieuwe site heeft, zodat u vandaag kunt beginnen met de nieuwe versie.";
-$L["about_para4"] = "Het huidige script bevat de functionaliteit die u doorgaans nodig zal hebben. Maar niets is ooit compleet - misschien moet je willekeurige esoterische wiskundige vergelijkingen genereren, willekeurige tweets ophalen of willekeurige beelden van Flickr met het woord \" Noordelijke rosse woelmuis\" weergeven in de titel. Wie weet. Iedereen zijn use-case is anders.";
-$L["about_para5"] = "Met dit in het achterhoofd, is de nieuwe versie van het script (3.0.0 +) ontworpen om volledig uitbreidbaar te zijn: ontwikkelaars kunnen hun eigen Data Types schrijven om nieuwe vormen van willekeurige gegevens te genereren, en zelfs de Export Types aanpassen – dat wil zeggen: de indeling in waarin de gegevens worden geëxporteerd. Voor mensen die geïnteresseerd zijn in het genereren van meer gelokaliseerde geografische gegevens, kunnen ze nieuwe Land plugins gebruiken die regio namen (staten, provincies, gebieden etc), plaatsnamen en postcode formaten te leveren voor het land van hun keuze toe te voegen. Voor meer informatie over dit alles, bezoek de <a href=\"http://benkeen.github.io/generatedata/developer.html\" target=\"_blank\">Ontwikkelaarsdocumentatie</a>.";
-$L["about_para6"] = "Klik op de onderstaande knop om de nieuwste versie van het script te downloaden vanaf GitHub. Voor meer informatie zie de <a href=\"http://benkeen.github.io/generatedata/\" target=\"_blank\">Gebruikersdocumentatie</a>.";
-$L["amount"] = "Bedrag";
-$L["date_account_expires"] = "Datum account verloopt";
-$L["donate"] = "Doneer";
-$L["donate_now"] = "Doneer nu!";
-$L["donate_para1"] = "Als dit je heeft geholpen in je werk, is een donatie altijd welkom! Als een algemeen gevoel van goedgevigheid niet genoeg is om u te overtuigen om te doneren, zijn hier een paar meer materiële prikkels:";
-$L["donate_para2"] = "Ondersteuning van het project leidt tot grote nieuwe features! Eerlijk!";
-$L["donate_para3"] = "Doneer $20 of meer en u krijgt een gebruikersaccount op deze website. Met een gebruikersaccount kunt u:";
-$L["donate_para4"] = "Tot 5000 rijen genereren in één keer in plaats van 100.";
-$L["donate_para5"] = "Sla uw formulier configuraties op, zodat u uw data sets niet opnieuw hoeft te maken als u terugkeerd naar de website.";
-$L["donate_para6"] = "Elke $20 die u doneert voegt een <b>jaar</b> toe op uw account. U kan terugkeren op een latere datum om meer tijd aan uw account toe te voegen - het zal worden toegevoegd aan het einde van uw huidige tijd. Let wel op dat u dan doneert met hetzelfde e-mailadres. Als je problemen hebt met doneren of met uw gebruikersaccount, kunt u mij gewoon <a href=\"mailto:ben.keen@gmail.com\">een mail sturen</a>.";
-$L["error_creating_account_msg"] = "Sorry, er was een probleem met het maken van uw gebruikersaccount. Dat mag niet gebeuren! Probeer het later opnieuw.";
-$L["extend_id"] = "Verlengen";
-$L["incomplete_donation_msg"] = "Oeps, het lijkt alsof je al hebt gedoneerd, maar nog niet klaar met het instellen van uw account. <a href=\"{\$link}\">Klik hier</a> voor het opzetten van uw account.";
-$L["loading_ellipsis"] = "Loading ...";
-$L["news"] = "Nieuws";
-$L["news_feed_error"] = "<p>Verdorie, er is een probleem interactie met de nieuwsfeed. Excuses!</p><p>Als u het recentste project nieuws wilt doorbladeren, <a href=\"http://www.benjaminkeen.com/category/projects/data-generator\">ga naar mijn website.</a></p>";
-$L["project_news"] = "Project Nieuws";
-$L["user_account_exists_msg"] = "Oeps! Het lijkt erop dat u al een gebruikersaccount. Log eerst in, dan kunt u doneren om tijd toe te voegen aan uw account. Klik op de login-link bovenaan de pagina om in te loggen / reset je wachtwoord.";
-$L["where_the_old_site"] = "Waar is de oude site?";
-$L["years1"] = "1 jaar";
-$L["years2"] = "2 jaar";
-$L["years3"] = "3 jaar";
-$L["years4"] = "4 jaar";
-$L["years5"] = "5 jaar";
diff --git a/resources/lang/website_ta.php b/resources/lang/website_ta.php
deleted file mode 100644
index e871b51b1..000000000
--- a/resources/lang/website_ta.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-
-$L = array();
-
-// Category: Website
-$L['about_para1'] = 'எப்போதும் விருப்ப வடிவமைக்கப்பட்ட மாதிரி / சோதனை தரவு, போன்ற, மோசமான தேவை? சரி, இந்த ஸ்கிரிப்ட் யோசனை. அதை நீங்கள் விரைவில் தரவுத்தளங்கள் உருவாக்குகிறது, சோதனை மென்பொருள் பயன்படுத்த வடிவங்கள் பல்வேறு விருப்ப அதிக அளவிலான தரவுகளை உருவாக்க முடியும் என்று இங்கு, PHP மற்றும் MySQL எழுதப்பட்ட ஒரு இலவச, திறந்த மூல கருவி தான், மற்றும் ... அதனால் மற்றும் மிகவும் முன்னும் பின்னும்.';
-$L['about_para2'] = 'இந்த தளம் அது எவ்வாறு வழங்குகிறது மற்றும் அம்சங்கள் என்ன ஸ்கிரிப்ட் என்ன ஒரு உணர்வு பெற சுற்றி டிங்கர் வரவேற்கிறேன் ஒரு ஆன்லைன் டெமோ வழங்குகிறது. நீங்கள் உங்கள் பசியை சாணை ஒருமுறை, பின்னர், பதிவிறக்க கிடைக்கும் ஒரு இலவச, முழுமையாக செயல்பட்டாலும், குனு உரிமம் பதிப்பு உள்ளது. நீங்கள் உங்கள் சொந்த சர்வர் அதை அமைக்க தொல்லையின்றி தவிர்க்க வேண்டும் மாறாக, நீங்கள், நீங்கள் (அதற்கு பதிலாக அதிகபட்ச 100) ஒரு நேரத்தில் 5,000 பதிவுகள் வரை உருவாக்க விடாமல், இந்த தளத்தில் ஒரு கணக்கை பெற $ 20 அல்லது அதற்கு மேற்பட்ட தானம் செய்ய முடியும் உங்கள் தரவு செட் சேமிக்கலாம். மேலும் தகவலுக்கு நன்கொடை தாவலை கிளிக் செய்யவும்.';
-$L['about_para3'] = 'பழைய தளத்தில் ஒரு கணக்கு பயனர்களுக்கு, நீங்கள் இன்னும் <a href="http://old.generatedata.com"> இங்கே அதை கண்டுபிடிக்க </a> முடியும்: கவலைப்பட வேண்டாம், நீங்கள் இன்னும் உள்நுழைவு மற்றும் அணுக முடியும் உங்கள் தரவு செட். துரதிருஷ்டவசமாக, தொழில்நுட்ப காரணங்களுக்காக, நாங்கள் (அது <i> உண்மையில் </i> பல்வேறு) புதிய ஸ்கிரிப்ட் உங்கள் தரவு தொகுதிகள் மீது துறை முடியவில்லை. எனினும், நீங்கள் அதே புதிய தளத்தில் சரியான ஒரு பயனர் கணக்கு என்று கண்டுபிடிக்க வேண்டும், எனவே நீங்கள் இன்று புதிய பதிப்பு பயன்படுத்தி தொடங்க முடியும்.';
-$L['about_para4'] = 'வெளியே பெட்டி ஸ்கிரிப்ட் நீங்கள் பொதுவாக வேண்டும் செயல்பாடு வகையான கொண்டிருக்கிறது. ஆனால் எதுவும் இதுவரை முழுமையான இருக்கிறது - ஒருவேளை நீங்கள், சீரற்ற ஆச்சரியத்திற்குரிய கணித சமன்பாடுகள் உருவாக்க சீரற்ற ட்வீட் இழுக்க அல்லது வார்த்தை தலைப்பு "ரெட் ஆதரவு வோலை" மூலம் Flickr இருந்து சீரற்ற படங்களை காட்ட வேண்டும். யார் தெரிகிறது. அனைவரும் பயன்படுத்துவது வழக்கு வேறு.';
-$L['about_para5'] = 'இதை மனதில் கொண்டு, ஸ்கிரிப்ட் புதிய பதிப்பு (3.0.0 +) முழுமையாக நீடிக்கவும் இருக்கும் வடிவமைக்கப்பட்டுள்ளது: டெவலப்பர்கள் சீரற்ற தரவு புதிய வகையான உருவாக்க தங்கள் சொந்த தரவு வகைகள் எழுத, மற்றும் கூட ஏற்றுமதி வகைகள் தனிப்பயனாக்கலாம் - ல் வடிவம் அதாவது இது தரவு வெளிப்பாடு ஆகும். மிகவும் துல்லியமான மொழிபெயர்க்கப்பட்ட புவியியல் தரவு உருவாக்க ஆர்வமாக மக்கள், அவர்கள் விருப்பப்படி அவர்களது நாட்டின் பகுதியில் பெயர்கள் (அமெரிக்கா, மாநிலங்கள், பகுதிகள் போன்றவை), நகரம் பெயர்கள் மற்றும் தபால் / ZIP குறியீடு வடிவங்கள் வழங்க புதிய நாடு கூடுதல் சேர்க்க முடியும். இந்த மேலும் தகவலுக்கு, மிக <a href="http://benkeen.github.io/generatedata/developer.html" target="_blank"> டெவலப்பர் ஆவணப்படுத்தல் </a> செல்க.';
-$L['about_para6'] = 'மகிழ்ச்சியா இருந்து ஸ்கிரிப்ட் சமீபத்திய பதிப்பை பதிவிறக்க கீழே உள்ள பொத்தானை கிளிக் செய்யவும். மேலும் தகவலுக்கு, <a href="http://benkeen.github.io/generatedata/" target="_blank"> பயனர் ஆவணம் </a>.';
-$L['amount'] = 'தொகை';
-$L['date_account_expires'] = 'தேதி கணக்கு காலாவதியாகிறது';
-$L['donate'] = 'நன்கொடை';
-$L['donate_now'] = 'இப்போது நன்கொடை!';
-$L['donate_para1'] = 'இந்த உங்கள் பணியில் நீங்கள் உதவியது என்றால், ஒரு நன்கொடை எப்போதும் பாராட்டப்படுகிறது! செய்யும் goodery ஒரு பொது உணர்வு தானம் செய்ய நீங்கள் சம்மதிக்க போதுமானதாக இல்லை என்றால், இங்கே ஒரு சில பொருள் சலுகைகள் பின்வருமாறு:';
-$L['donate_para2'] = 'திட்ட துணை பெரிய புதிய அம்சங்கள் வழிவகுக்கிறது! நேர்மையான!';
-$L['donate_para3'] = '$20 அல்லது அதற்கு மேற்பட்ட நன்கொடை இந்த வலைத்தளத்தில் நீங்கள் ஒரு பயனர் கணக்கை கிடைக்கும். நீங்கள் ஒரு பயனர் கணக்கு:';
-$L['donate_para4'] = 'அதற்கு பதிலாக 100 இற்கு ஒரு நேரத்தில் 5,000 வரிசைகள் வரை உருவாக்குகிறது.';
-$L['donate_para5'] = 'உங்கள் தரவு செட் நீங்கள் தளம் திரும்ப ஒவ்வொரு முறையும் மீண்டும் உருவாக்க இல்லை, அதனால் உங்கள் படிவத்தை கட்டமைப்புகளில் சேமித்து.';
-$L['donate_para6'] = 'நீங்கள் தானம் ஒவ்வொரு  <b>$20 உங்கள் கணக்கில் </b> ஆண்டு சேர்க்கிறது. நீங்கள் உங்கள் கணக்கில் இன்னும் நேரம் சேர்க்க பிறகு ஒரு நாள் திரும்பி - அது உங்கள் தற்போதைய நேர முடிவில் சேர்க்கப்படும். அதே மின்னஞ்சல் முகவரியை கொண்டு தானம் செய்ய வேண்டும். உங்களுக்கு எந்த பிரச்சனையும் நன்கொடை அல்லது உங்கள் பயனர் கணக்கு இருந்தால், <a href="mailto:ben.keen@gmail.com">எனக்கு ஒரு வரி </a> கைவிட .';
-$L['error_creating_account_msg'] = 'மன்னிக்கவும், உங்கள் பயனர் கணக்கை உருவாக்குவதில் சிக்கல் ஏற்பட்டது. இது நடக்க கூடாது! பின்னர் மீண்டும் முயற்சிக்கவும்.';
-$L['extend_id'] = 'அதை நீட்டிக்க';
-$L['incomplete_donation_msg'] = 'உங்கள் கணக்கு அமைக்க ஏற்கனவே நன்கொடையாக, ஆனால் முடிக்கவில்லை அச்சச்சோ, அது தெரிகிறது. மிக <a href="{$link}"> உங்கள் கணக்கை அமைக்க வேண்டும் </a> இங்கே கிளிக் செய்யவும்.';
-$L['loading_ellipsis'] = 'ஏற்றுகிறது ...';
-$L['news'] = 'செய்தி';
-$L['news_feed_error'] = '<p> சாபமிடு, செய்தி ஜூன் தொடர்பு ஒரு பிரச்சனை இருந்தது. மன்னிக்கவும்! </p> <p>சமீபத்திய திட்டத்தின் செய்திகள் உலவ, <a href="http://www.benjaminkeen.com/category/projects/data-generator/"> செல் என் வலைத்தளத்தில். </a> </p>';
-$L['project_news'] = 'திட்டத்தின் செய்திகள்';
-$L['user_account_exists_msg'] = 'அச்சச்சோ! நீங்கள் ஏற்கனவே ஒரு பயனர் கணக்கு வேண்டும் போல் இருக்கிறது. முதல் வரைதான், பிறகு நீங்கள் உங்கள் கணக்கில் நேரம் சேர்க்க தானம் செய்ய முடியும். உங்கள் கடவுச்சொல்லை மீட்டமைக்க / உள் பக்கம் மேல் உள்நுழைவு இணைப்பை கிளிக் செய்யவும்.';
-$L['where_the_old_site'] = 'பழைய தளத்தில் இருக்கிறது?';
-$L['years1'] = '1 ஆண்டு';
-$L['years2'] = '2 ஆண்டுகள்';
-$L['years3'] = '3 ஆண்டுகள்';
-$L['years4'] = '4 ஆண்டுகள்';
-$L['years5'] = '5 ஆண்டுகள்';
diff --git a/resources/libs/codemirror/.gitattributes b/resources/libs/codemirror/.gitattributes
deleted file mode 100644
index f8bdd60f4..000000000
--- a/resources/libs/codemirror/.gitattributes
+++ /dev/null
@@ -1,8 +0,0 @@
-*.txt   text
-*.js    text
-*.html  text
-*.md    text
-*.json  text
-*.yml   text
-*.css   text
-*.svg   text
diff --git a/resources/libs/codemirror/.gitignore b/resources/libs/codemirror/.gitignore
deleted file mode 100644
index b471fe6e6..000000000
--- a/resources/libs/codemirror/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/node_modules
-/npm-debug.log
-test.html
-.tern-*
-*~
-*.swp
diff --git a/resources/libs/codemirror/.travis.yml b/resources/libs/codemirror/.travis.yml
deleted file mode 100644
index baa0031d5..000000000
--- a/resources/libs/codemirror/.travis.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-language: node_js
-node_js:
-  - 0.8
diff --git a/resources/libs/codemirror/LICENSE b/resources/libs/codemirror/LICENSE
deleted file mode 100644
index 442d11cdc..000000000
--- a/resources/libs/codemirror/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2013 by Marijn Haverbeke <marijnh@gmail.com> and others
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/resources/libs/codemirror/addon/comment/comment.js b/resources/libs/codemirror/addon/comment/comment.js
deleted file mode 100644
index cd2123e17..000000000
--- a/resources/libs/codemirror/addon/comment/comment.js
+++ /dev/null
@@ -1,145 +0,0 @@
-(function() {
-  "use strict";
-
-  var noOptions = {};
-  var nonWS = /[^\s\u00a0]/;
-  var Pos = CodeMirror.Pos;
-
-  function firstNonWS(str) {
-    var found = str.search(nonWS);
-    return found == -1 ? 0 : found;
-  }
-
-  CodeMirror.commands.toggleComment = function(cm) {
-    var from = cm.getCursor("start"), to = cm.getCursor("end");
-    cm.uncomment(from, to) || cm.lineComment(from, to);
-  };
-
-  CodeMirror.defineExtension("lineComment", function(from, to, options) {
-    if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
-    var commentString = options.lineComment || mode.lineComment;
-    if (!commentString) {
-      if (options.blockCommentStart || mode.blockCommentStart) {
-        options.fullLines = true;
-        self.blockComment(from, to, options);
-      }
-      return;
-    }
-    var firstLine = self.getLine(from.line);
-    if (firstLine == null) return;
-    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
-    var pad = options.padding == null ? " " : options.padding;
-    var blankLines = options.commentBlankLines || from.line == to.line;
-
-    self.operation(function() {
-      if (options.indent) {
-        var baseString = firstLine.slice(0, firstNonWS(firstLine));
-        for (var i = from.line; i < end; ++i) {
-          var line = self.getLine(i), cut = baseString.length;
-          if (!blankLines && !nonWS.test(line)) continue;
-          if (line.slice(0, cut) != baseString) cut = firstNonWS(line);
-          self.replaceRange(baseString + commentString + pad, Pos(i, 0), Pos(i, cut));
-        }
-      } else {
-        for (var i = from.line; i < end; ++i) {
-          if (blankLines || nonWS.test(self.getLine(i)))
-            self.replaceRange(commentString + pad, Pos(i, 0));
-        }
-      }
-    });
-  });
-
-  CodeMirror.defineExtension("blockComment", function(from, to, options) {
-    if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
-    var startString = options.blockCommentStart || mode.blockCommentStart;
-    var endString = options.blockCommentEnd || mode.blockCommentEnd;
-    if (!startString || !endString) {
-      if ((options.lineComment || mode.lineComment) && options.fullLines != false)
-        self.lineComment(from, to, options);
-      return;
-    }
-
-    var end = Math.min(to.line, self.lastLine());
-    if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end;
-
-    var pad = options.padding == null ? " " : options.padding;
-    if (from.line > end) return;
-
-    self.operation(function() {
-      if (options.fullLines != false) {
-        var lastLineHasText = nonWS.test(self.getLine(end));
-        self.replaceRange(pad + endString, Pos(end));
-        self.replaceRange(startString + pad, Pos(from.line, 0));
-        var lead = options.blockCommentLead || mode.blockCommentLead;
-        if (lead != null) for (var i = from.line + 1; i <= end; ++i)
-          if (i != end || lastLineHasText)
-            self.replaceRange(lead + pad, Pos(i, 0));
-      } else {
-        self.replaceRange(endString, to);
-        self.replaceRange(startString, from);
-      }
-    });
-  });
-
-  CodeMirror.defineExtension("uncomment", function(from, to, options) {
-    if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
-    var end = Math.min(to.line, self.lastLine()), start = Math.min(from.line, end);
-
-    // Try finding line comments
-    var lineString = options.lineComment || mode.lineComment, lines = [];
-    var pad = options.padding == null ? " " : options.padding, didSomething;
-    lineComment: {
-      if (!lineString) break lineComment;
-      for (var i = start; i <= end; ++i) {
-        var line = self.getLine(i);
-        var found = line.indexOf(lineString);
-        if (found == -1 && (i != end || i == start) && nonWS.test(line)) break lineComment;
-        if (i != start && found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
-        lines.push(line);
-      }
-      self.operation(function() {
-        for (var i = start; i <= end; ++i) {
-          var line = lines[i - start];
-          var pos = line.indexOf(lineString), endPos = pos + lineString.length;
-          if (pos < 0) continue;
-          if (line.slice(endPos, endPos + pad.length) == pad) endPos += pad.length;
-          didSomething = true;
-          self.replaceRange("", Pos(i, pos), Pos(i, endPos));
-        }
-      });
-      if (didSomething) return true;
-    }
-
-    // Try block comments
-    var startString = options.blockCommentStart || mode.blockCommentStart;
-    var endString = options.blockCommentEnd || mode.blockCommentEnd;
-    if (!startString || !endString) return false;
-    var lead = options.blockCommentLead || mode.blockCommentLead;
-    var startLine = self.getLine(start), endLine = end == start ? startLine : self.getLine(end);
-    var open = startLine.indexOf(startString), close = endLine.lastIndexOf(endString);
-    if (close == -1 && start != end) {
-      endLine = self.getLine(--end);
-      close = endLine.lastIndexOf(endString);
-    }
-    if (open == -1 || close == -1) return false;
-
-    self.operation(function() {
-      self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
-                        Pos(end, close + endString.length));
-      var openEnd = open + startString.length;
-      if (pad && startLine.slice(openEnd, openEnd + pad.length) == pad) openEnd += pad.length;
-      self.replaceRange("", Pos(start, open), Pos(start, openEnd));
-      if (lead) for (var i = start + 1; i <= end; ++i) {
-        var line = self.getLine(i), found = line.indexOf(lead);
-        if (found == -1 || nonWS.test(line.slice(0, found))) continue;
-        var foundEnd = found + lead.length;
-        if (pad && line.slice(foundEnd, foundEnd + pad.length) == pad) foundEnd += pad.length;
-        self.replaceRange("", Pos(i, found), Pos(i, foundEnd));
-      }
-    });
-    return true;
-  });
-})();
diff --git a/resources/libs/codemirror/addon/comment/continuecomment.js b/resources/libs/codemirror/addon/comment/continuecomment.js
deleted file mode 100644
index 94e5a3760..000000000
--- a/resources/libs/codemirror/addon/comment/continuecomment.js
+++ /dev/null
@@ -1,54 +0,0 @@
-(function() {
-  var modes = ["clike", "css", "javascript"];
-  for (var i = 0; i < modes.length; ++i)
-    CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
-
-  function continueComment(cm) {
-    var pos = cm.getCursor(), token = cm.getTokenAt(pos);
-    if (token.type != "comment") return CodeMirror.Pass;
-    var mode = CodeMirror.innerMode(cm.getMode(), token.state).mode;
-
-    var insert;
-    if (mode.blockCommentStart && mode.blockCommentContinue) {
-      var end = token.string.indexOf(mode.blockCommentEnd);
-      var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
-      if (end != -1 && end == token.string.length - mode.blockCommentEnd.length) {
-        // Comment ended, don't continue it
-      } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
-        insert = full.slice(0, token.start);
-        if (!/^\s*$/.test(insert)) {
-          insert = "";
-          for (var i = 0; i < token.start; ++i) insert += " ";
-        }
-      } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
-                 found + mode.blockCommentContinue.length > token.start &&
-                 /^\s*$/.test(full.slice(0, found))) {
-        insert = full.slice(0, found);
-      }
-      if (insert != null) insert += mode.blockCommentContinue;
-    }
-    if (insert == null && mode.lineComment) {
-      var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
-      if (found > -1) {
-        insert = line.slice(0, found);
-        if (/\S/.test(insert)) insert = null;
-        else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
-      }
-    }
-
-    if (insert != null)
-      cm.replaceSelection("\n" + insert, "end");
-    else
-      return CodeMirror.Pass;
-  }
-
-  CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {
-    if (prev && prev != CodeMirror.Init)
-      cm.removeKeyMap("continueComment");
-    if (val) {
-      var map = {name: "continueComment"};
-      map[typeof val == "string" ? val : "Enter"] = continueComment;
-      cm.addKeyMap(map);
-    }
-  });
-})();
diff --git a/resources/libs/codemirror/addon/dialog/dialog.css b/resources/libs/codemirror/addon/dialog/dialog.css
deleted file mode 100644
index 2e7c0fc9b..000000000
--- a/resources/libs/codemirror/addon/dialog/dialog.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.CodeMirror-dialog {
-  position: absolute;
-  left: 0; right: 0;
-  background: white;
-  z-index: 15;
-  padding: .1em .8em;
-  overflow: hidden;
-  color: #333;
-}
-
-.CodeMirror-dialog-top {
-  border-bottom: 1px solid #eee;
-  top: 0;
-}
-
-.CodeMirror-dialog-bottom {
-  border-top: 1px solid #eee;
-  bottom: 0;
-}
-
-.CodeMirror-dialog input {
-  border: none;
-  outline: none;
-  background: transparent;
-  width: 20em;
-  color: inherit;
-  font-family: monospace;
-}
-
-.CodeMirror-dialog button {
-  font-size: 70%;
-}
diff --git a/resources/libs/codemirror/addon/dialog/dialog.js b/resources/libs/codemirror/addon/dialog/dialog.js
deleted file mode 100644
index 499964fdb..000000000
--- a/resources/libs/codemirror/addon/dialog/dialog.js
+++ /dev/null
@@ -1,121 +0,0 @@
-// Open simple dialogs on top of an editor. Relies on dialog.css.
-
-(function() {
-  function dialogDiv(cm, template, bottom) {
-    var wrap = cm.getWrapperElement();
-    var dialog;
-    dialog = wrap.appendChild(document.createElement("div"));
-    if (bottom) {
-      dialog.className = "CodeMirror-dialog CodeMirror-dialog-bottom";
-    } else {
-      dialog.className = "CodeMirror-dialog CodeMirror-dialog-top";
-    }
-    if (typeof template == "string") {
-      dialog.innerHTML = template;
-    } else { // Assuming it's a detached DOM element.
-      dialog.appendChild(template);
-    }
-    return dialog;
-  }
-
-  function closeNotification(cm, newVal) {
-    if (cm.state.currentNotificationClose)
-      cm.state.currentNotificationClose();
-    cm.state.currentNotificationClose = newVal;
-  }
-
-  CodeMirror.defineExtension("openDialog", function(template, callback, options) {
-    closeNotification(this, null);
-    var dialog = dialogDiv(this, template, options && options.bottom);
-    var closed = false, me = this;
-    function close() {
-      if (closed) return;
-      closed = true;
-      dialog.parentNode.removeChild(dialog);
-    }
-    var inp = dialog.getElementsByTagName("input")[0], button;
-    if (inp) {
-      CodeMirror.on(inp, "keydown", function(e) {
-        if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
-        if (e.keyCode == 13 || e.keyCode == 27) {
-          CodeMirror.e_stop(e);
-          close();
-          me.focus();
-          if (e.keyCode == 13) callback(inp.value);
-        }
-      });
-      if (options && options.onKeyUp) {
-        CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
-      }
-      if (options && options.value) inp.value = options.value;
-      inp.focus();
-      CodeMirror.on(inp, "blur", close);
-    } else if (button = dialog.getElementsByTagName("button")[0]) {
-      CodeMirror.on(button, "click", function() {
-        close();
-        me.focus();
-      });
-      button.focus();
-      CodeMirror.on(button, "blur", close);
-    }
-    return close;
-  });
-
-  CodeMirror.defineExtension("openConfirm", function(template, callbacks, options) {
-    closeNotification(this, null);
-    var dialog = dialogDiv(this, template, options && options.bottom);
-    var buttons = dialog.getElementsByTagName("button");
-    var closed = false, me = this, blurring = 1;
-    function close() {
-      if (closed) return;
-      closed = true;
-      dialog.parentNode.removeChild(dialog);
-      me.focus();
-    }
-    buttons[0].focus();
-    for (var i = 0; i < buttons.length; ++i) {
-      var b = buttons[i];
-      (function(callback) {
-        CodeMirror.on(b, "click", function(e) {
-          CodeMirror.e_preventDefault(e);
-          close();
-          if (callback) callback(me);
-        });
-      })(callbacks[i]);
-      CodeMirror.on(b, "blur", function() {
-        --blurring;
-        setTimeout(function() { if (blurring <= 0) close(); }, 200);
-      });
-      CodeMirror.on(b, "focus", function() { ++blurring; });
-    }
-  });
-
-  /*
-   * openNotification
-   * Opens a notification, that can be closed with an optional timer
-   * (default 5000ms timer) and always closes on click.
-   *
-   * If a notification is opened while another is opened, it will close the
-   * currently opened one and open the new one immediately.
-   */
-  CodeMirror.defineExtension("openNotification", function(template, options) {
-    closeNotification(this, close);
-    var dialog = dialogDiv(this, template, options && options.bottom);
-    var duration = options && (options.duration === undefined ? 5000 : options.duration);
-    var closed = false, doneTimer;
-
-    function close() {
-      if (closed) return;
-      closed = true;
-      clearTimeout(doneTimer);
-      dialog.parentNode.removeChild(dialog);
-    }
-
-    CodeMirror.on(dialog, 'click', function(e) {
-      CodeMirror.e_preventDefault(e);
-      close();
-    });
-    if (duration)
-      doneTimer = setTimeout(close, options.duration);
-  });
-})();
diff --git a/resources/libs/codemirror/addon/display/fullscreen.css b/resources/libs/codemirror/addon/display/fullscreen.css
deleted file mode 100644
index 437acd89b..000000000
--- a/resources/libs/codemirror/addon/display/fullscreen.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.CodeMirror-fullscreen {
-  position: fixed;
-  top: 0; left: 0; right: 0; bottom: 0;
-  height: auto;
-  z-index: 9;
-}
diff --git a/resources/libs/codemirror/addon/display/fullscreen.js b/resources/libs/codemirror/addon/display/fullscreen.js
deleted file mode 100644
index a442f6a43..000000000
--- a/resources/libs/codemirror/addon/display/fullscreen.js
+++ /dev/null
@@ -1,31 +0,0 @@
-(function() {
-  "use strict";
-
-  CodeMirror.defineOption("fullScreen", false, function(cm, val, old) {
-    if (old == CodeMirror.Init) old = false;
-    if (!old == !val) return;
-    if (val) setFullscreen(cm);
-    else setNormal(cm);
-  });
-
-  function setFullscreen(cm) {
-    var wrap = cm.getWrapperElement();
-    cm.state.fullScreenRestore = {scrollTop: window.pageYOffset, scrollLeft: window.pageXOffset,
-                                  width: wrap.style.width, height: wrap.style.height};
-    wrap.style.width = "";
-    wrap.style.height = "auto";
-    wrap.className += " CodeMirror-fullscreen";
-    document.documentElement.style.overflow = "hidden";
-    cm.refresh();
-  }
-
-  function setNormal(cm) {
-    var wrap = cm.getWrapperElement();
-    wrap.className = wrap.className.replace(/\s*CodeMirror-fullscreen\b/, "");
-    document.documentElement.style.overflow = "";
-    var info = cm.state.fullScreenRestore;
-    wrap.style.width = info.width; wrap.style.height = info.height;
-    window.scrollTo(info.scrollLeft, info.scrollTop);
-    cm.refresh();
-  }
-})();
diff --git a/resources/libs/codemirror/addon/display/placeholder.js b/resources/libs/codemirror/addon/display/placeholder.js
deleted file mode 100644
index 748afe727..000000000
--- a/resources/libs/codemirror/addon/display/placeholder.js
+++ /dev/null
@@ -1,48 +0,0 @@
-(function() {
-  CodeMirror.defineOption("placeholder", "", function(cm, val, old) {
-    var prev = old && old != CodeMirror.Init;
-    if (val && !prev) {
-      cm.on("blur", onBlur);
-      cm.on("change", onChange);
-      onChange(cm);
-    } else if (!val && prev) {
-      cm.off("blur", onBlur);
-      cm.off("change", onChange);
-      clearPlaceholder(cm);
-      var wrapper = cm.getWrapperElement();
-      wrapper.className = wrapper.className.replace(" CodeMirror-empty", "");
-    }
-
-    if (val && !cm.hasFocus()) onBlur(cm);
-  });
-
-  function clearPlaceholder(cm) {
-    if (cm.state.placeholder) {
-      cm.state.placeholder.parentNode.removeChild(cm.state.placeholder);
-      cm.state.placeholder = null;
-    }
-  }
-  function setPlaceholder(cm) {
-    clearPlaceholder(cm);
-    var elt = cm.state.placeholder = document.createElement("pre");
-    elt.style.cssText = "height: 0; overflow: visible";
-    elt.className = "CodeMirror-placeholder";
-    elt.appendChild(document.createTextNode(cm.getOption("placeholder")));
-    cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
-  }
-
-  function onBlur(cm) {
-    if (isEmpty(cm)) setPlaceholder(cm);
-  }
-  function onChange(cm) {
-    var wrapper = cm.getWrapperElement(), empty = isEmpty(cm);
-    wrapper.className = wrapper.className.replace(" CodeMirror-empty", "") + (empty ? " CodeMirror-empty" : "");
-
-    if (empty) setPlaceholder(cm);
-    else clearPlaceholder(cm);
-  }
-
-  function isEmpty(cm) {
-    return (cm.lineCount() === 1) && (cm.getLine(0) === "");
-  }
-})();
diff --git a/resources/libs/codemirror/addon/edit/closebrackets.js b/resources/libs/codemirror/addon/edit/closebrackets.js
deleted file mode 100644
index 88718b772..000000000
--- a/resources/libs/codemirror/addon/edit/closebrackets.js
+++ /dev/null
@@ -1,82 +0,0 @@
-(function() {
-  var DEFAULT_BRACKETS = "()[]{}''\"\"";
-  var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
-  var SPACE_CHAR_REGEX = /\s/;
-
-  CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
-    if (old != CodeMirror.Init && old)
-      cm.removeKeyMap("autoCloseBrackets");
-    if (!val) return;
-    var pairs = DEFAULT_BRACKETS, explode = DEFAULT_EXPLODE_ON_ENTER;
-    if (typeof val == "string") pairs = val;
-    else if (typeof val == "object") {
-      if (val.pairs != null) pairs = val.pairs;
-      if (val.explode != null) explode = val.explode;
-    }
-    var map = buildKeymap(pairs);
-    if (explode) map.Enter = buildExplodeHandler(explode);
-    cm.addKeyMap(map);
-  });
-
-  function charsAround(cm, pos) {
-    var str = cm.getRange(CodeMirror.Pos(pos.line, pos.ch - 1),
-                          CodeMirror.Pos(pos.line, pos.ch + 1));
-    return str.length == 2 ? str : null;
-  }
-
-  function buildKeymap(pairs) {
-    var map = {
-      name : "autoCloseBrackets",
-      Backspace: function(cm) {
-        if (cm.somethingSelected()) return CodeMirror.Pass;
-        var cur = cm.getCursor(), around = charsAround(cm, cur);
-        if (around && pairs.indexOf(around) % 2 == 0)
-          cm.replaceRange("", CodeMirror.Pos(cur.line, cur.ch - 1), CodeMirror.Pos(cur.line, cur.ch + 1));
-        else
-          return CodeMirror.Pass;
-      }
-    };
-    var closingBrackets = "";
-    for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
-      if (left != right) closingBrackets += right;
-      function surround(cm) {
-        var selection = cm.getSelection();
-        cm.replaceSelection(left + selection + right);
-      }
-      function maybeOverwrite(cm) {
-        var cur = cm.getCursor(), ahead = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1));
-        if (ahead != right || cm.somethingSelected()) return CodeMirror.Pass;
-        else cm.execCommand("goCharRight");
-      }
-      map["'" + left + "'"] = function(cm) {
-        if (left == "'" && cm.getTokenAt(cm.getCursor()).type == "comment")
-          return CodeMirror.Pass;
-        if (cm.somethingSelected()) return surround(cm);
-        if (left == right && maybeOverwrite(cm) != CodeMirror.Pass) return;
-        var cur = cm.getCursor(), ahead = CodeMirror.Pos(cur.line, cur.ch + 1);
-        var line = cm.getLine(cur.line), nextChar = line.charAt(cur.ch), curChar = cur.ch > 0 ? line.charAt(cur.ch - 1) : "";
-        if (left == right && CodeMirror.isWordChar(curChar))
-          return CodeMirror.Pass;
-        if (line.length == cur.ch || closingBrackets.indexOf(nextChar) >= 0 || SPACE_CHAR_REGEX.test(nextChar))
-          cm.replaceSelection(left + right, {head: ahead, anchor: ahead});
-        else
-          return CodeMirror.Pass;
-      };
-      if (left != right) map["'" + right + "'"] = maybeOverwrite;
-    })(pairs.charAt(i), pairs.charAt(i + 1));
-    return map;
-  }
-
-  function buildExplodeHandler(pairs) {
-    return function(cm) {
-      var cur = cm.getCursor(), around = charsAround(cm, cur);
-      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
-      cm.operation(function() {
-        var newPos = CodeMirror.Pos(cur.line + 1, 0);
-        cm.replaceSelection("\n\n", {anchor: newPos, head: newPos}, "+input");
-        cm.indentLine(cur.line + 1, null, true);
-        cm.indentLine(cur.line + 2, null, true);
-      });
-    };
-  }
-})();
diff --git a/resources/libs/codemirror/addon/edit/closetag.js b/resources/libs/codemirror/addon/edit/closetag.js
deleted file mode 100644
index 1da89ba6d..000000000
--- a/resources/libs/codemirror/addon/edit/closetag.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Tag-closer extension for CodeMirror.
- *
- * This extension adds an "autoCloseTags" option that can be set to
- * either true to get the default behavior, or an object to further
- * configure its behavior.
- *
- * These are supported options:
- *
- * `whenClosing` (default true)
- *   Whether to autoclose when the '/' of a closing tag is typed.
- * `whenOpening` (default true)
- *   Whether to autoclose the tag when the final '>' of an opening
- *   tag is typed.
- * `dontCloseTags` (default is empty tags for HTML, none for XML)
- *   An array of tag names that should not be autoclosed.
- * `indentTags` (default is block tags for HTML, none for XML)
- *   An array of tag names that should, when opened, cause a
- *   blank line to be added inside the tag, and the blank line and
- *   closing line to be indented.
- *
- * See demos/closetag.html for a usage example.
- */
-
-(function() {
-  CodeMirror.defineOption("autoCloseTags", false, function(cm, val, old) {
-    if (old != CodeMirror.Init && old)
-      cm.removeKeyMap("autoCloseTags");
-    if (!val) return;
-    var map = {name: "autoCloseTags"};
-    if (typeof val != "object" || val.whenClosing)
-      map["'/'"] = function(cm) { return autoCloseSlash(cm); };
-    if (typeof val != "object" || val.whenOpening)
-      map["'>'"] = function(cm) { return autoCloseGT(cm); };
-    cm.addKeyMap(map);
-  });
-
-  var htmlDontClose = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param",
-                       "source", "track", "wbr"];
-  var htmlIndent = ["applet", "blockquote", "body", "button", "div", "dl", "fieldset", "form", "frameset", "h1", "h2", "h3", "h4",
-                    "h5", "h6", "head", "html", "iframe", "layer", "legend", "object", "ol", "p", "select", "table", "ul"];
-
-  function autoCloseGT(cm) {
-    var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
-    var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
-
-    var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
-    var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
-    var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
-
-    var tagName = state.tagName;
-    if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
-    var lowerTagName = tagName.toLowerCase();
-    // Don't process the '>' at the end of an end-tag or self-closing tag
-    if (tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
-        tok.type == "tag" && state.type == "closeTag" ||
-        tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
-        dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1)
-      return CodeMirror.Pass;
-
-    var doIndent = indentTags && indexOf(indentTags, lowerTagName) > -1;
-    var curPos = doIndent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1);
-    cm.replaceSelection(">" + (doIndent ? "\n\n" : "") + "</" + tagName + ">",
-                        {head: curPos, anchor: curPos});
-    if (doIndent) {
-      cm.indentLine(pos.line + 1);
-      cm.indentLine(pos.line + 2);
-    }
-  }
-
-  function autoCloseSlash(cm) {
-    var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
-    var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (tok.type == "string" || tok.string.charAt(0) != "<" ||
-        tok.start != pos.ch - 1 || inner.mode.name != "xml")
-      return CodeMirror.Pass;
-
-    var tagName = state.context && state.context.tagName;
-    if (tagName) cm.replaceSelection("/" + tagName + ">", "end");
-  }
-
-  function indexOf(collection, elt) {
-    if (collection.indexOf) return collection.indexOf(elt);
-    for (var i = 0, e = collection.length; i < e; ++i)
-      if (collection[i] == elt) return i;
-    return -1;
-  }
-})();
diff --git a/resources/libs/codemirror/addon/edit/continuelist.js b/resources/libs/codemirror/addon/edit/continuelist.js
deleted file mode 100644
index 826d17d71..000000000
--- a/resources/libs/codemirror/addon/edit/continuelist.js
+++ /dev/null
@@ -1,25 +0,0 @@
-(function() {
-  'use strict';
-
-  var listRE = /^(\s*)([*+-]|(\d+)\.)(\s*)/,
-      unorderedBullets = '*+-';
-
-  CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
-    var pos = cm.getCursor(),
-        inList = cm.getStateAfter(pos.line).list !== false,
-        match;
-
-    if (!inList || !(match = cm.getLine(pos.line).match(listRE))) {
-      cm.execCommand('newlineAndIndent');
-      return;
-    }
-
-    var indent = match[1], after = match[4];
-    var bullet = unorderedBullets.indexOf(match[2]) >= 0
-      ? match[2]
-      : (parseInt(match[3], 10) + 1) + '.';
-
-    cm.replaceSelection('\n' + indent + bullet + after, 'end');
-  };
-
-}());
diff --git a/resources/libs/codemirror/addon/edit/matchbrackets.js b/resources/libs/codemirror/addon/edit/matchbrackets.js
deleted file mode 100644
index 9d9b3882f..000000000
--- a/resources/libs/codemirror/addon/edit/matchbrackets.js
+++ /dev/null
@@ -1,87 +0,0 @@
-(function() {
-  var ie_lt8 = /MSIE \d/.test(navigator.userAgent) &&
-    (document.documentMode == null || document.documentMode < 8);
-
-  var Pos = CodeMirror.Pos;
-
-  var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
-  function findMatchingBracket(cm, where, strict) {
-    var state = cm.state.matchBrackets;
-    var maxScanLen = (state && state.maxScanLineLength) || 10000;
-    var maxScanLines = (state && state.maxScanLines) || 100;
-
-    var cur = where || cm.getCursor(), line = cm.getLineHandle(cur.line), pos = cur.ch - 1;
-    var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
-    if (!match) return null;
-    var forward = match.charAt(1) == ">", d = forward ? 1 : -1;
-    if (strict && forward != (pos == cur.ch)) return null;
-    var style = cm.getTokenTypeAt(Pos(cur.line, pos + 1));
-
-    var stack = [line.text.charAt(pos)], re = /[(){}[\]]/;
-    function scan(line, lineNo, start) {
-      if (!line.text) return;
-      var pos = forward ? 0 : line.text.length - 1, end = forward ? line.text.length : -1;
-      if (line.text.length > maxScanLen) return null;
-      if (start != null) pos = start + d;
-      for (; pos != end; pos += d) {
-        var ch = line.text.charAt(pos);
-        if (re.test(ch) && cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style) {
-          var match = matching[ch];
-          if (match.charAt(1) == ">" == forward) stack.push(ch);
-          else if (stack.pop() != match.charAt(0)) return {pos: pos, match: false};
-          else if (!stack.length) return {pos: pos, match: true};
-        }
-      }
-    }
-    for (var i = cur.line, found, e = forward ? Math.min(i + maxScanLines, cm.lineCount()) : Math.max(-1, i - maxScanLines); i != e; i+=d) {
-      if (i == cur.line) found = scan(line, i, pos);
-      else found = scan(cm.getLineHandle(i), i);
-      if (found) break;
-    }
-    return {from: Pos(cur.line, pos), to: found && Pos(i, found.pos),
-            match: found && found.match, forward: forward};
-  }
-
-  function matchBrackets(cm, autoclear) {
-    // Disable brace matching in long lines, since it'll cause hugely slow updates
-    var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
-    var found = findMatchingBracket(cm);
-    if (!found || cm.getLine(found.from.line).length > maxHighlightLen ||
-       found.to && cm.getLine(found.to.line).length > maxHighlightLen)
-      return;
-
-    var style = found.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
-    var one = cm.markText(found.from, Pos(found.from.line, found.from.ch + 1), {className: style});
-    var two = found.to && cm.markText(found.to, Pos(found.to.line, found.to.ch + 1), {className: style});
-    // Kludge to work around the IE bug from issue #1193, where text
-    // input stops going to the textare whever this fires.
-    if (ie_lt8 && cm.state.focused) cm.display.input.focus();
-    var clear = function() {
-      cm.operation(function() { one.clear(); two && two.clear(); });
-    };
-    if (autoclear) setTimeout(clear, 800);
-    else return clear;
-  }
-
-  var currentlyHighlighted = null;
-  function doMatchBrackets(cm) {
-    cm.operation(function() {
-      if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;}
-      if (!cm.somethingSelected()) currentlyHighlighted = matchBrackets(cm, false);
-    });
-  }
-
-  CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init)
-      cm.off("cursorActivity", doMatchBrackets);
-    if (val) {
-      cm.state.matchBrackets = typeof val == "object" ? val : {};
-      cm.on("cursorActivity", doMatchBrackets);
-    }
-  });
-
-  CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
-  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict){
-    return findMatchingBracket(this, pos, strict);
-  });
-})();
diff --git a/resources/libs/codemirror/addon/edit/matchtags.js b/resources/libs/codemirror/addon/edit/matchtags.js
deleted file mode 100644
index f189c1f8e..000000000
--- a/resources/libs/codemirror/addon/edit/matchtags.js
+++ /dev/null
@@ -1,56 +0,0 @@
-(function() {
-  "use strict";
-
-  CodeMirror.defineOption("matchTags", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      cm.off("cursorActivity", doMatchTags);
-      cm.off("viewportChange", maybeUpdateMatch);
-      clear(cm);
-    }
-    if (val) {
-      cm.state.matchBothTags = typeof val == "object" && val.bothTags;
-      cm.on("cursorActivity", doMatchTags);
-      cm.on("viewportChange", maybeUpdateMatch);
-      doMatchTags(cm);
-    }
-  });
-
-  function clear(cm) {
-    if (cm.state.tagHit) cm.state.tagHit.clear();
-    if (cm.state.tagOther) cm.state.tagOther.clear();
-    cm.state.tagHit = cm.state.tagOther = null;
-  }
-
-  function doMatchTags(cm) {
-    cm.state.failedTagMatch = false;
-    cm.operation(function() {
-      clear(cm);
-      if (cm.somethingSelected()) return;
-      var cur = cm.getCursor(), range = cm.getViewport();
-      range.from = Math.min(range.from, cur.line); range.to = Math.max(cur.line + 1, range.to);
-      var match = CodeMirror.findMatchingTag(cm, cur, range);
-      if (!match) return;
-      if (cm.state.matchBothTags) {
-        var hit = match.at == "open" ? match.open : match.close;
-        if (hit) cm.state.tagHit = cm.markText(hit.from, hit.to, {className: "CodeMirror-matchingtag"});
-      }
-      var other = match.at == "close" ? match.open : match.close;
-      if (other)
-        cm.state.tagOther = cm.markText(other.from, other.to, {className: "CodeMirror-matchingtag"});
-      else
-        cm.state.failedTagMatch = true;
-    });
-  }
-
-  function maybeUpdateMatch(cm) {
-    if (cm.state.failedTagMatch) doMatchTags(cm);
-  }
-
-  CodeMirror.commands.toMatchingTag = function(cm) {
-    var found = CodeMirror.findMatchingTag(cm, cm.getCursor());
-    if (found) {
-      var other = found.at == "close" ? found.open : found.close;
-      if (other) cm.setSelection(other.to, other.from);
-    }
-  };
-})();
diff --git a/resources/libs/codemirror/addon/edit/trailingspace.js b/resources/libs/codemirror/addon/edit/trailingspace.js
deleted file mode 100644
index f6bb02645..000000000
--- a/resources/libs/codemirror/addon/edit/trailingspace.js
+++ /dev/null
@@ -1,15 +0,0 @@
-CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) {
-  if (prev == CodeMirror.Init) prev = false;
-  if (prev && !val)
-    cm.removeOverlay("trailingspace");
-  else if (!prev && val)
-    cm.addOverlay({
-      token: function(stream) {
-        for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {}
-        if (i > stream.pos) { stream.pos = i; return null; }
-        stream.pos = l;
-        return "trailingspace";
-      },
-      name: "trailingspace"
-    });
-});
diff --git a/resources/libs/codemirror/addon/fold/brace-fold.js b/resources/libs/codemirror/addon/fold/brace-fold.js
deleted file mode 100644
index 2560b2b94..000000000
--- a/resources/libs/codemirror/addon/fold/brace-fold.js
+++ /dev/null
@@ -1,93 +0,0 @@
-CodeMirror.registerHelper("fold", "brace", function(cm, start) {
-  var line = start.line, lineText = cm.getLine(line);
-  var startCh, tokenType;
-
-  function findOpening(openCh) {
-    for (var at = start.ch, pass = 0;;) {
-      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
-      if (found == -1) {
-        if (pass == 1) break;
-        pass = 1;
-        at = lineText.length;
-        continue;
-      }
-      if (pass == 1 && found < start.ch) break;
-      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
-      if (!/^(comment|string)/.test(tokenType)) return found + 1;
-      at = found - 1;
-    }
-  }
-
-  var startToken = "{", endToken = "}", startCh = findOpening("{");
-  if (startCh == null) {
-    startToken = "[", endToken = "]";
-    startCh = findOpening("[");
-  }
-
-  if (startCh == null) return;
-  var count = 1, lastLine = cm.lastLine(), end, endCh;
-  outer: for (var i = line; i <= lastLine; ++i) {
-    var text = cm.getLine(i), pos = i == line ? startCh : 0;
-    for (;;) {
-      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
-      if (nextOpen < 0) nextOpen = text.length;
-      if (nextClose < 0) nextClose = text.length;
-      pos = Math.min(nextOpen, nextClose);
-      if (pos == text.length) break;
-      if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
-        if (pos == nextOpen) ++count;
-        else if (!--count) { end = i; endCh = pos; break outer; }
-      }
-      ++pos;
-    }
-  }
-  if (end == null || line == end && endCh == startCh) return;
-  return {from: CodeMirror.Pos(line, startCh),
-          to: CodeMirror.Pos(end, endCh)};
-});
-CodeMirror.braceRangeFinder = CodeMirror.fold.brace; // deprecated
-
-CodeMirror.registerHelper("fold", "import", function(cm, start) {
-  function hasImport(line) {
-    if (line < cm.firstLine() || line > cm.lastLine()) return null;
-    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
-    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
-    if (start.type != "keyword" || start.string != "import") return null;
-    // Now find closing semicolon, return its position
-    for (var i = line, e = Math.min(cm.lastLine(), line + 10); i <= e; ++i) {
-      var text = cm.getLine(i), semi = text.indexOf(";");
-      if (semi != -1) return {startCh: start.end, end: CodeMirror.Pos(i, semi)};
-    }
-  }
-
-  var start = start.line, has = hasImport(start), prev;
-  if (!has || hasImport(start - 1) || ((prev = hasImport(start - 2)) && prev.end.line == start - 1))
-    return null;
-  for (var end = has.end;;) {
-    var next = hasImport(end.line + 1);
-    if (next == null) break;
-    end = next.end;
-  }
-  return {from: cm.clipPos(CodeMirror.Pos(start, has.startCh + 1)), to: end};
-});
-CodeMirror.importRangeFinder = CodeMirror.fold["import"]; // deprecated
-
-CodeMirror.registerHelper("fold", "include", function(cm, start) {
-  function hasInclude(line) {
-    if (line < cm.firstLine() || line > cm.lastLine()) return null;
-    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
-    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
-    if (start.type == "meta" && start.string.slice(0, 8) == "#include") return start.start + 8;
-  }
-
-  var start = start.line, has = hasInclude(start);
-  if (has == null || hasInclude(start - 1) != null) return null;
-  for (var end = start;;) {
-    var next = hasInclude(end + 1);
-    if (next == null) break;
-    ++end;
-  }
-  return {from: CodeMirror.Pos(start, has + 1),
-          to: cm.clipPos(CodeMirror.Pos(end))};
-});
-CodeMirror.includeRangeFinder = CodeMirror.fold.include; // deprecated
diff --git a/resources/libs/codemirror/addon/fold/comment-fold.js b/resources/libs/codemirror/addon/fold/comment-fold.js
deleted file mode 100644
index a064cf8f5..000000000
--- a/resources/libs/codemirror/addon/fold/comment-fold.js
+++ /dev/null
@@ -1,40 +0,0 @@
-CodeMirror.registerHelper("fold", "comment", function(cm, start) {
-  var mode = cm.getModeAt(start), startToken = mode.blockCommentStart, endToken = mode.blockCommentEnd;
-  if (!startToken || !endToken) return;
-  var line = start.line, lineText = cm.getLine(line);
-
-  var startCh;
-  for (var at = start.ch, pass = 0;;) {
-    var found = at <= 0 ? -1 : lineText.lastIndexOf(startToken, at - 1);
-    if (found == -1) {
-      if (pass == 1) return;
-      pass = 1;
-      at = lineText.length;
-      continue;
-    }
-    if (pass == 1 && found < start.ch) return;
-    if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1)))) {
-      startCh = found + startToken.length;
-      break;
-    }
-    at = found - 1;
-  }
-
-  var depth = 1, lastLine = cm.lastLine(), end, endCh;
-  outer: for (var i = line; i <= lastLine; ++i) {
-    var text = cm.getLine(i), pos = i == line ? startCh : 0;
-    for (;;) {
-      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
-      if (nextOpen < 0) nextOpen = text.length;
-      if (nextClose < 0) nextClose = text.length;
-      pos = Math.min(nextOpen, nextClose);
-      if (pos == text.length) break;
-      if (pos == nextOpen) ++depth;
-      else if (!--depth) { end = i; endCh = pos; break outer; }
-      ++pos;
-    }
-  }
-  if (end == null || line == end && endCh == startCh) return;
-  return {from: CodeMirror.Pos(line, startCh),
-          to: CodeMirror.Pos(end, endCh)};
-});
diff --git a/resources/libs/codemirror/addon/fold/foldcode.js b/resources/libs/codemirror/addon/fold/foldcode.js
deleted file mode 100644
index c497bc29b..000000000
--- a/resources/libs/codemirror/addon/fold/foldcode.js
+++ /dev/null
@@ -1,75 +0,0 @@
-(function() {
-  "use strict";
-
-  function doFold(cm, pos, options, force) {
-    var finder = options && (options.call ? options : options.rangeFinder);
-    if (!finder) finder = cm.getHelper(pos, "fold");
-    if (!finder) return;
-    if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
-    var minSize = options && options.minFoldSize || 0;
-
-    function getRange(allowFolded) {
-      var range = finder(cm, pos);
-      if (!range || range.to.line - range.from.line < minSize) return null;
-      var marks = cm.findMarksAt(range.from);
-      for (var i = 0; i < marks.length; ++i) {
-        if (marks[i].__isFold && force !== "fold") {
-          if (!allowFolded) return null;
-          range.cleared = true;
-          marks[i].clear();
-        }
-      }
-      return range;
-    }
-
-    var range = getRange(true);
-    if (options && options.scanUp) while (!range && pos.line > cm.firstLine()) {
-      pos = CodeMirror.Pos(pos.line - 1, 0);
-      range = getRange(false);
-    }
-    if (!range || range.cleared || force === "unfold") return;
-
-    var myWidget = makeWidget(options);
-    CodeMirror.on(myWidget, "mousedown", function() { myRange.clear(); });
-    var myRange = cm.markText(range.from, range.to, {
-      replacedWith: myWidget,
-      clearOnEnter: true,
-      __isFold: true
-    });
-    myRange.on("clear", function(from, to) {
-      CodeMirror.signal(cm, "unfold", cm, from, to);
-    });
-    CodeMirror.signal(cm, "fold", cm, range.from, range.to);
-  }
-
-  function makeWidget(options) {
-    var widget = (options && options.widget) || "\u2194";
-    if (typeof widget == "string") {
-      var text = document.createTextNode(widget);
-      widget = document.createElement("span");
-      widget.appendChild(text);
-      widget.className = "CodeMirror-foldmarker";
-    }
-    return widget;
-  }
-
-  // Clumsy backwards-compatible interface
-  CodeMirror.newFoldFunction = function(rangeFinder, widget) {
-    return function(cm, pos) { doFold(cm, pos, {rangeFinder: rangeFinder, widget: widget}); };
-  };
-
-  // New-style interface
-  CodeMirror.defineExtension("foldCode", function(pos, options, force) {
-    doFold(this, pos, options, force);
-  });
-
-  CodeMirror.registerHelper("fold", "combine", function() {
-    var funcs = Array.prototype.slice.call(arguments, 0);
-    return function(cm, start) {
-      for (var i = 0; i < funcs.length; ++i) {
-        var found = funcs[i](cm, start);
-        if (found) return found;
-      }
-    };
-  });
-})();
diff --git a/resources/libs/codemirror/addon/fold/foldgutter.css b/resources/libs/codemirror/addon/fold/foldgutter.css
deleted file mode 100644
index 49805393d..000000000
--- a/resources/libs/codemirror/addon/fold/foldgutter.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.CodeMirror-foldmarker {
-  color: blue;
-  text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
-  font-family: arial;
-  line-height: .3;
-  cursor: pointer;
-}
-.CodeMirror-foldgutter {
-  width: .7em;
-}
-.CodeMirror-foldgutter-open,
-.CodeMirror-foldgutter-folded {
-  color: #555;
-  cursor: pointer;
-}
-.CodeMirror-foldgutter-open:after {
-  content: "\25BE";
-}
-.CodeMirror-foldgutter-folded:after {
-  content: "\25B8";
-}
diff --git a/resources/libs/codemirror/addon/fold/foldgutter.js b/resources/libs/codemirror/addon/fold/foldgutter.js
deleted file mode 100644
index 57336fbff..000000000
--- a/resources/libs/codemirror/addon/fold/foldgutter.js
+++ /dev/null
@@ -1,124 +0,0 @@
-(function() {
-  "use strict";
-
-  CodeMirror.defineOption("foldGutter", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      cm.clearGutter(cm.state.foldGutter.options.gutter);
-      cm.state.foldGutter = null;
-      cm.off("gutterClick", onGutterClick);
-      cm.off("change", onChange);
-      cm.off("viewportChange", onViewportChange);
-      cm.off("fold", onFold);
-      cm.off("unfold", onFold);
-      cm.off("swapDoc", updateInViewport);
-    }
-    if (val) {
-      cm.state.foldGutter = new State(parseOptions(val));
-      updateInViewport(cm);
-      cm.on("gutterClick", onGutterClick);
-      cm.on("change", onChange);
-      cm.on("viewportChange", onViewportChange);
-      cm.on("fold", onFold);
-      cm.on("unfold", onFold);
-      cm.on("swapDoc", updateInViewport);
-    }
-  });
-
-  var Pos = CodeMirror.Pos;
-
-  function State(options) {
-    this.options = options;
-    this.from = this.to = 0;
-  }
-
-  function parseOptions(opts) {
-    if (opts === true) opts = {};
-    if (opts.gutter == null) opts.gutter = "CodeMirror-foldgutter";
-    if (opts.indicatorOpen == null) opts.indicatorOpen = "CodeMirror-foldgutter-open";
-    if (opts.indicatorFolded == null) opts.indicatorFolded = "CodeMirror-foldgutter-folded";
-    return opts;
-  }
-
-  function isFolded(cm, line) {
-    var marks = cm.findMarksAt(Pos(line));
-    for (var i = 0; i < marks.length; ++i)
-      if (marks[i].__isFold && marks[i].find().from.line == line) return true;
-  }
-
-  function marker(spec) {
-    if (typeof spec == "string") {
-      var elt = document.createElement("div");
-      elt.className = spec;
-      return elt;
-    } else {
-      return spec.cloneNode(true);
-    }
-  }
-
-  function updateFoldInfo(cm, from, to) {
-    var opts = cm.state.foldGutter.options, cur = from;
-    cm.eachLine(from, to, function(line) {
-      var mark = null;
-      if (isFolded(cm, cur)) {
-        mark = marker(opts.indicatorFolded);
-      } else {
-        var pos = Pos(cur, 0), func = opts.rangeFinder || cm.getHelper(pos, "fold");
-        var range = func && func(cm, pos);
-        if (range && range.from.line + 1 < range.to.line)
-          mark = marker(opts.indicatorOpen);
-      }
-      cm.setGutterMarker(line, opts.gutter, mark);
-      ++cur;
-    });
-  }
-
-  function updateInViewport(cm) {
-    var vp = cm.getViewport(), state = cm.state.foldGutter;
-    if (!state) return;
-    cm.operation(function() {
-      updateFoldInfo(cm, vp.from, vp.to);
-    });
-    state.from = vp.from; state.to = vp.to;
-  }
-
-  function onGutterClick(cm, line, gutter) {
-    var opts = cm.state.foldGutter.options;
-    if (gutter != opts.gutter) return;
-    cm.foldCode(Pos(line, 0), opts.rangeFinder);
-  }
-
-  function onChange(cm) {
-    var state = cm.state.foldGutter, opts = cm.state.foldGutter.options;
-    state.from = state.to = 0;
-    clearTimeout(state.changeUpdate);
-    state.changeUpdate = setTimeout(function() { updateInViewport(cm); }, opts.foldOnChangeTimeSpan || 600);
-  }
-
-  function onViewportChange(cm) {
-    var state = cm.state.foldGutter, opts = cm.state.foldGutter.options;
-    clearTimeout(state.changeUpdate);
-    state.changeUpdate = setTimeout(function() {
-      var vp = cm.getViewport();
-      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
-        updateInViewport(cm);
-      } else {
-        cm.operation(function() {
-          if (vp.from < state.from) {
-            updateFoldInfo(cm, vp.from, state.from);
-            state.from = vp.from;
-          }
-          if (vp.to > state.to) {
-            updateFoldInfo(cm, state.to, vp.to);
-            state.to = vp.to;
-          }
-        });
-      }
-    }, opts.updateViewportTimeSpan || 400);
-  }
-
-  function onFold(cm, from) {
-    var state = cm.state.foldGutter, line = from.line;
-    if (line >= state.from && line < state.to)
-      updateFoldInfo(cm, line, line + 1);
-  }
-})();
diff --git a/resources/libs/codemirror/addon/fold/indent-fold.js b/resources/libs/codemirror/addon/fold/indent-fold.js
deleted file mode 100644
index 1bd600be4..000000000
--- a/resources/libs/codemirror/addon/fold/indent-fold.js
+++ /dev/null
@@ -1,30 +0,0 @@
-CodeMirror.registerHelper("fold", "indent", function(cm, start) {
-  var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
-  if (!/\S/.test(firstLine)) return;
-  var getIndent = function(lineNum) {
-    return CodeMirror.countColumn(lineNum, null, tabSize);
-  };
-  var myIndent = getIndent(firstLine);
-  var lastLineInFold = null;
-  // Go through lines until we find a line that definitely doesn't belong in
-  // the block we're folding, or to the end.
-  for (var i = start.line + 1, end = cm.lastLine(); i <= end; ++i) {
-    var curLine = cm.getLine(i);
-    var curIndent = getIndent(curLine);
-    if (curIndent > myIndent) {
-      // Lines with a greater indent are considered part of the block.
-      lastLineInFold = i;
-    } else if (!/\S/.test(curLine)) {
-      // Empty lines might be breaks within the block we're trying to fold.
-    } else {
-      // A non-empty line at an indent equal to or less than ours marks the
-      // start of another block.
-      break;
-    }
-  }
-  if (lastLineInFold) return {
-    from: CodeMirror.Pos(start.line, firstLine.length),
-    to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
-  };
-});
-CodeMirror.indentRangeFinder = CodeMirror.fold.indent; // deprecated
diff --git a/resources/libs/codemirror/addon/fold/xml-fold.js b/resources/libs/codemirror/addon/fold/xml-fold.js
deleted file mode 100644
index 88a107c4a..000000000
--- a/resources/libs/codemirror/addon/fold/xml-fold.js
+++ /dev/null
@@ -1,167 +0,0 @@
-(function() {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-  function cmp(a, b) { return a.line - b.line || a.ch - b.ch; }
-
-  var nameStartChar = "A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";
-  var nameChar = nameStartChar + "\-\:\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
-  var xmlTagStart = new RegExp("<(/?)([" + nameStartChar + "][" + nameChar + "]*)", "g");
-
-  function Iter(cm, line, ch, range) {
-    this.line = line; this.ch = ch;
-    this.cm = cm; this.text = cm.getLine(line);
-    this.min = range ? range.from : cm.firstLine();
-    this.max = range ? range.to - 1 : cm.lastLine();
-  }
-
-  function tagAt(iter, ch) {
-    var type = iter.cm.getTokenTypeAt(Pos(iter.line, ch));
-    return type && /\btag\b/.test(type);
-  }
-
-  function nextLine(iter) {
-    if (iter.line >= iter.max) return;
-    iter.ch = 0;
-    iter.text = iter.cm.getLine(++iter.line);
-    return true;
-  }
-  function prevLine(iter) {
-    if (iter.line <= iter.min) return;
-    iter.text = iter.cm.getLine(--iter.line);
-    iter.ch = iter.text.length;
-    return true;
-  }
-
-  function toTagEnd(iter) {
-    for (;;) {
-      var gt = iter.text.indexOf(">", iter.ch);
-      if (gt == -1) { if (nextLine(iter)) continue; else return; }
-      if (!tagAt(iter, gt + 1)) { iter.ch = gt + 1; continue; }
-      var lastSlash = iter.text.lastIndexOf("/", gt);
-      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
-      iter.ch = gt + 1;
-      return selfClose ? "selfClose" : "regular";
-    }
-  }
-  function toTagStart(iter) {
-    for (;;) {
-      var lt = iter.ch ? iter.text.lastIndexOf("<", iter.ch - 1) : -1;
-      if (lt == -1) { if (prevLine(iter)) continue; else return; }
-      if (!tagAt(iter, lt + 1)) { iter.ch = lt; continue; }
-      xmlTagStart.lastIndex = lt;
-      iter.ch = lt;
-      var match = xmlTagStart.exec(iter.text);
-      if (match && match.index == lt) return match;
-    }
-  }
-
-  function toNextTag(iter) {
-    for (;;) {
-      xmlTagStart.lastIndex = iter.ch;
-      var found = xmlTagStart.exec(iter.text);
-      if (!found) { if (nextLine(iter)) continue; else return; }
-      if (!tagAt(iter, found.index + 1)) { iter.ch = found.index + 1; continue; }
-      iter.ch = found.index + found[0].length;
-      return found;
-    }
-  }
-  function toPrevTag(iter) {
-    for (;;) {
-      var gt = iter.ch ? iter.text.lastIndexOf(">", iter.ch - 1) : -1;
-      if (gt == -1) { if (prevLine(iter)) continue; else return; }
-      if (!tagAt(iter, gt + 1)) { iter.ch = gt; continue; }
-      var lastSlash = iter.text.lastIndexOf("/", gt);
-      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
-      iter.ch = gt + 1;
-      return selfClose ? "selfClose" : "regular";
-    }
-  }
-
-  function findMatchingClose(iter, tag) {
-    var stack = [];
-    for (;;) {
-      var next = toNextTag(iter), end, startLine = iter.line, startCh = iter.ch - (next ? next[0].length : 0);
-      if (!next || !(end = toTagEnd(iter))) return;
-      if (end == "selfClose") continue;
-      if (next[1]) { // closing tag
-        for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == next[2]) {
-          stack.length = i;
-          break;
-        }
-        if (i < 0 && (!tag || tag == next[2])) return {
-          tag: next[2],
-          from: Pos(startLine, startCh),
-          to: Pos(iter.line, iter.ch)
-        };
-      } else { // opening tag
-        stack.push(next[2]);
-      }
-    }
-  }
-  function findMatchingOpen(iter, tag) {
-    var stack = [];
-    for (;;) {
-      var prev = toPrevTag(iter);
-      if (!prev) return;
-      if (prev == "selfClose") { toTagStart(iter); continue; }
-      var endLine = iter.line, endCh = iter.ch;
-      var start = toTagStart(iter);
-      if (!start) return;
-      if (start[1]) { // closing tag
-        stack.push(start[2]);
-      } else { // opening tag
-        for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == start[2]) {
-          stack.length = i;
-          break;
-        }
-        if (i < 0 && (!tag || tag == start[2])) return {
-          tag: start[2],
-          from: Pos(iter.line, iter.ch),
-          to: Pos(endLine, endCh)
-        };
-      }
-    }
-  }
-
-  CodeMirror.registerHelper("fold", "xml", function(cm, start) {
-    var iter = new Iter(cm, start.line, 0);
-    for (;;) {
-      var openTag = toNextTag(iter), end;
-      if (!openTag || iter.line != start.line || !(end = toTagEnd(iter))) return;
-      if (!openTag[1] && end != "selfClose") {
-        var start = Pos(iter.line, iter.ch);
-        var close = findMatchingClose(iter, openTag[2]);
-        return close && {from: start, to: close.from};
-      }
-    }
-  });
-  CodeMirror.tagRangeFinder = CodeMirror.fold.xml; // deprecated
-
-  CodeMirror.findMatchingTag = function(cm, pos, range) {
-    var iter = new Iter(cm, pos.line, pos.ch, range);
-    if (iter.text.indexOf(">") == -1 && iter.text.indexOf("<") == -1) return;
-    var end = toTagEnd(iter), to = end && Pos(iter.line, iter.ch);
-    var start = end && toTagStart(iter);
-    if (!end || end == "selfClose" || !start || cmp(iter, pos) > 0) return;
-    var here = {from: Pos(iter.line, iter.ch), to: to, tag: start[2]};
-
-    if (start[1]) { // closing tag
-      return {open: findMatchingOpen(iter, start[2]), close: here, at: "close"};
-    } else { // opening tag
-      iter = new Iter(cm, to.line, to.ch, range);
-      return {open: here, close: findMatchingClose(iter, start[2]), at: "open"};
-    }
-  };
-
-  CodeMirror.findEnclosingTag = function(cm, pos, range) {
-    var iter = new Iter(cm, pos.line, pos.ch, range);
-    for (;;) {
-      var open = findMatchingOpen(iter);
-      if (!open) break;
-      var forward = new Iter(cm, pos.line, pos.ch, range);
-      var close = findMatchingClose(forward, open.tag);
-      if (close) return {open: open, close: close};
-    }
-  };
-})();
diff --git a/resources/libs/codemirror/addon/hint/anyword-hint.js b/resources/libs/codemirror/addon/hint/anyword-hint.js
deleted file mode 100644
index 36ff618e0..000000000
--- a/resources/libs/codemirror/addon/hint/anyword-hint.js
+++ /dev/null
@@ -1,34 +0,0 @@
-(function() {
-  "use strict";
-
-  var WORD = /[\w$]+/, RANGE = 500;
-
-  CodeMirror.registerHelper("hint", "anyword", function(editor, options) {
-    var word = options && options.word || WORD;
-    var range = options && options.range || RANGE;
-    var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
-    var start = cur.ch, end = start;
-    while (end < curLine.length && word.test(curLine.charAt(end))) ++end;
-    while (start && word.test(curLine.charAt(start - 1))) --start;
-    var curWord = start != end && curLine.slice(start, end);
-
-    var list = [], seen = {};
-    function scan(dir) {
-      var line = cur.line, end = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
-      for (; line != end; line += dir) {
-        var text = editor.getLine(line), m;
-        var re = new RegExp(word.source, "g");
-        while (m = re.exec(text)) {
-          if (line == cur.line && m[0] === curWord) continue;
-          if ((!curWord || m[0].indexOf(curWord) == 0) && !seen.hasOwnProperty(m[0])) {
-            seen[m[0]] = true;
-            list.push(m[0]);
-          }
-        }
-      }
-    }
-    scan(-1);
-    scan(1);
-    return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
-  });
-})();
diff --git a/resources/libs/codemirror/addon/hint/css-hint.js b/resources/libs/codemirror/addon/hint/css-hint.js
deleted file mode 100644
index 2b15300d0..000000000
--- a/resources/libs/codemirror/addon/hint/css-hint.js
+++ /dev/null
@@ -1,50 +0,0 @@
-(function () {
-  "use strict";
-
-  function getHints(cm) {
-    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    var inner = CodeMirror.innerMode(cm.getMode(), token.state);
-    if (inner.mode.name != "css") return;
-
-    // If it's not a 'word-style' token, ignore the token.
-    if (!/^[\w$_-]*$/.test(token.string)) {
-      token = {
-        start: cur.ch, end: cur.ch, string: "", state: token.state,
-        type: null
-      };
-      var stack = token.state.stack;
-      var lastToken = stack && stack.length > 0 ? stack[stack.length - 1] : "";
-      if (token.string == ":" || lastToken.indexOf("property") == 0)
-        token.type = "variable";
-      else if (token.string == "{" || lastToken.indexOf("rule") == 0)
-        token.type = "property";
-    }
-
-    if (!token.type)
-      return;
-
-    var spec = CodeMirror.resolveMode("text/css");
-    var keywords = null;
-    if (token.type.indexOf("property") == 0)
-      keywords = spec.propertyKeywords;
-    else if (token.type.indexOf("variable") == 0)
-      keywords = spec.valueKeywords;
-
-    if (!keywords)
-      return;
-
-    var result = [];
-    for (var name in keywords) {
-      if (name.indexOf(token.string) == 0 /* > -1 */)
-        result.push(name);
-    }
-
-    return {
-      list: result,
-      from: CodeMirror.Pos(cur.line, token.start),
-      to: CodeMirror.Pos(cur.line, token.end)
-    };
-  }
-
-  CodeMirror.registerHelper("hint", "css", getHints);
-})();
diff --git a/resources/libs/codemirror/addon/hint/html-hint.js b/resources/libs/codemirror/addon/hint/html-hint.js
deleted file mode 100755
index cf256851e..000000000
--- a/resources/libs/codemirror/addon/hint/html-hint.js
+++ /dev/null
@@ -1,337 +0,0 @@
-(function () {
-  var langs = "ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" ");
-  var targets = ["_blank", "_self", "_top", "_parent"];
-  var charsets = ["ascii", "utf-8", "utf-16", "latin1", "latin1"];
-  var methods = ["get", "post", "put", "delete"];
-  var encs = ["application/x-www-form-urlencoded", "multipart/form-data", "text/plain"];
-  var media = ["all", "screen", "print", "embossed", "braille", "handheld", "print", "projection", "screen", "tty", "tv", "speech",
-               "3d-glasses", "resolution [>][<][=] [X]", "device-aspect-ratio: X/Y", "orientation:portrait",
-               "orientation:landscape", "device-height: [X]", "device-width: [X]"];
-  var s = { attrs: {} }; // Simple tag, reused for a whole lot of tags
-
-  var data = {
-    a: {
-      attrs: {
-        href: null, ping: null, type: null,
-        media: media,
-        target: targets,
-        hreflang: langs
-      }
-    },
-    abbr: s,
-    acronym: s,
-    address: s,
-    applet: s,
-    area: {
-      attrs: {
-        alt: null, coords: null, href: null, target: null, ping: null,
-        media: media, hreflang: langs, type: null,
-        shape: ["default", "rect", "circle", "poly"]
-      }
-    },
-    article: s,
-    aside: s,
-    audio: {
-      attrs: {
-        src: null, mediagroup: null,
-        crossorigin: ["anonymous", "use-credentials"],
-        preload: ["none", "metadata", "auto"],
-        autoplay: ["", "autoplay"],
-        loop: ["", "loop"],
-        controls: ["", "controls"]
-      }
-    },
-    b: s,
-    base: { attrs: { href: null, target: targets } },
-    basefont: s,
-    bdi: s,
-    bdo: s,
-    big: s,
-    blockquote: { attrs: { cite: null } },
-    body: s,
-    br: s,
-    button: {
-      attrs: {
-        form: null, formaction: null, name: null, value: null,
-        autofocus: ["", "autofocus"],
-        disabled: ["", "autofocus"],
-        formenctype: encs,
-        formmethod: methods,
-        formnovalidate: ["", "novalidate"],
-        formtarget: targets,
-        type: ["submit", "reset", "button"]
-      }
-    },
-    canvas: { attrs: { width: null, height: null } },
-    caption: s,
-    center: s,
-    cite: s,
-    code: s,
-    col: { attrs: { span: null } },
-    colgroup: { attrs: { span: null } },
-    command: {
-      attrs: {
-        type: ["command", "checkbox", "radio"],
-        label: null, icon: null, radiogroup: null, command: null, title: null,
-        disabled: ["", "disabled"],
-        checked: ["", "checked"]
-      }
-    },
-    data: { attrs: { value: null } },
-    datagrid: { attrs: { disabled: ["", "disabled"], multiple: ["", "multiple"] } },
-    datalist: { attrs: { data: null } },
-    dd: s,
-    del: { attrs: { cite: null, datetime: null } },
-    details: { attrs: { open: ["", "open"] } },
-    dfn: s,
-    dir: s,
-    div: s,
-    dl: s,
-    dt: s,
-    em: s,
-    embed: { attrs: { src: null, type: null, width: null, height: null } },
-    eventsource: { attrs: { src: null } },
-    fieldset: { attrs: { disabled: ["", "disabled"], form: null, name: null } },
-    figcaption: s,
-    figure: s,
-    font: s,
-    footer: s,
-    form: {
-      attrs: {
-        action: null, name: null,
-        "accept-charset": charsets,
-        autocomplete: ["on", "off"],
-        enctype: encs,
-        method: methods,
-        novalidate: ["", "novalidate"],
-        target: targets
-      }
-    },
-    frame: s,
-    frameset: s,
-    h1: s, h2: s, h3: s, h4: s, h5: s, h6: s,
-    head: {
-      attrs: {},
-      children: ["title", "base", "link", "style", "meta", "script", "noscript", "command"]
-    },
-    header: s,
-    hgroup: s,
-    hr: s,
-    html: {
-      attrs: { manifest: null },
-      children: ["head", "body"]
-    },
-    i: s,
-    iframe: {
-      attrs: {
-        src: null, srcdoc: null, name: null, width: null, height: null,
-        sandbox: ["allow-top-navigation", "allow-same-origin", "allow-forms", "allow-scripts"],
-        seamless: ["", "seamless"]
-      }
-    },
-    img: {
-      attrs: {
-        alt: null, src: null, ismap: null, usemap: null, width: null, height: null,
-        crossorigin: ["anonymous", "use-credentials"]
-      }
-    },
-    input: {
-      attrs: {
-        alt: null, dirname: null, form: null, formaction: null,
-        height: null, list: null, max: null, maxlength: null, min: null,
-        name: null, pattern: null, placeholder: null, size: null, src: null,
-        step: null, value: null, width: null,
-        accept: ["audio/*", "video/*", "image/*"],
-        autocomplete: ["on", "off"],
-        autofocus: ["", "autofocus"],
-        checked: ["", "checked"],
-        disabled: ["", "disabled"],
-        formenctype: encs,
-        formmethod: methods,
-        formnovalidate: ["", "novalidate"],
-        formtarget: targets,
-        multiple: ["", "multiple"],
-        readonly: ["", "readonly"],
-        required: ["", "required"],
-        type: ["hidden", "text", "search", "tel", "url", "email", "password", "datetime", "date", "month",
-               "week", "time", "datetime-local", "number", "range", "color", "checkbox", "radio",
-               "file", "submit", "image", "reset", "button"]
-      }
-    },
-    ins: { attrs: { cite: null, datetime: null } },
-    kbd: s,
-    keygen: {
-      attrs: {
-        challenge: null, form: null, name: null,
-        autofocus: ["", "autofocus"],
-        disabled: ["", "disabled"],
-        keytype: ["RSA"]
-      }
-    },
-    label: { attrs: { "for": null, form: null } },
-    legend: s,
-    li: { attrs: { value: null } },
-    link: {
-      attrs: {
-        href: null, type: null,
-        hreflang: langs,
-        media: media,
-        sizes: ["all", "16x16", "16x16 32x32", "16x16 32x32 64x64"]
-      }
-    },
-    map: { attrs: { name: null } },
-    mark: s,
-    menu: { attrs: { label: null, type: ["list", "context", "toolbar"] } },
-    meta: {
-      attrs: {
-        content: null,
-        charset: charsets,
-        name: ["viewport", "application-name", "author", "description", "generator", "keywords"],
-        "http-equiv": ["content-language", "content-type", "default-style", "refresh"]
-      }
-    },
-    meter: { attrs: { value: null, min: null, low: null, high: null, max: null, optimum: null } },
-    nav: s,
-    noframes: s,
-    noscript: s,
-    object: {
-      attrs: {
-        data: null, type: null, name: null, usemap: null, form: null, width: null, height: null,
-        typemustmatch: ["", "typemustmatch"]
-      }
-    },
-    ol: { attrs: { reversed: ["", "reversed"], start: null, type: ["1", "a", "A", "i", "I"] } },
-    optgroup: { attrs: { disabled: ["", "disabled"], label: null } },
-    option: { attrs: { disabled: ["", "disabled"], label: null, selected: ["", "selected"], value: null } },
-    output: { attrs: { "for": null, form: null, name: null } },
-    p: s,
-    param: { attrs: { name: null, value: null } },
-    pre: s,
-    progress: { attrs: { value: null, max: null } },
-    q: { attrs: { cite: null } },
-    rp: s,
-    rt: s,
-    ruby: s,
-    s: s,
-    samp: s,
-    script: {
-      attrs: {
-        type: ["text/javascript"],
-        src: null,
-        async: ["", "async"],
-        defer: ["", "defer"],
-        charset: charsets
-      }
-    },
-    section: s,
-    select: {
-      attrs: {
-        form: null, name: null, size: null,
-        autofocus: ["", "autofocus"],
-        disabled: ["", "disabled"],
-        multiple: ["", "multiple"]
-      }
-    },
-    small: s,
-    source: { attrs: { src: null, type: null, media: null } },
-    span: s,
-    strike: s,
-    strong: s,
-    style: {
-      attrs: {
-        type: ["text/css"],
-        media: media,
-        scoped: null
-      }
-    },
-    sub: s,
-    summary: s,
-    sup: s,
-    table: s,
-    tbody: s,
-    td: { attrs: { colspan: null, rowspan: null, headers: null } },
-    textarea: {
-      attrs: {
-        dirname: null, form: null, maxlength: null, name: null, placeholder: null,
-        rows: null, cols: null,
-        autofocus: ["", "autofocus"],
-        disabled: ["", "disabled"],
-        readonly: ["", "readonly"],
-        required: ["", "required"],
-        wrap: ["soft", "hard"]
-      }
-    },
-    tfoot: s,
-    th: { attrs: { colspan: null, rowspan: null, headers: null, scope: ["row", "col", "rowgroup", "colgroup"] } },
-    thead: s,
-    time: { attrs: { datetime: null } },
-    title: s,
-    tr: s,
-    track: {
-      attrs: {
-        src: null, label: null, "default": null,
-        kind: ["subtitles", "captions", "descriptions", "chapters", "metadata"],
-        srclang: langs
-      }
-    },
-    tt: s,
-    u: s,
-    ul: s,
-    "var": s,
-    video: {
-      attrs: {
-        src: null, poster: null, width: null, height: null,
-        crossorigin: ["anonymous", "use-credentials"],
-        preload: ["auto", "metadata", "none"],
-        autoplay: ["", "autoplay"],
-        mediagroup: ["movie"],
-        muted: ["", "muted"],
-        controls: ["", "controls"]
-      }
-    },
-    wbr: s
-  };
-
-  var globalAttrs = {
-    accesskey: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
-    "class": null,
-    contenteditable: ["true", "false"],
-    contextmenu: null,
-    dir: ["ltr", "rtl", "auto"],
-    draggable: ["true", "false", "auto"],
-    dropzone: ["copy", "move", "link", "string:", "file:"],
-    hidden: ["hidden"],
-    id: null,
-    inert: ["inert"],
-    itemid: null,
-    itemprop: null,
-    itemref: null,
-    itemscope: ["itemscope"],
-    itemtype: null,
-    lang: ["en", "es"],
-    spellcheck: ["true", "false"],
-    style: null,
-    tabindex: ["1", "2", "3", "4", "5", "6", "7", "8", "9"],
-    title: null,
-    translate: ["yes", "no"],
-    onclick: null,
-    rel: ["stylesheet", "alternate", "author", "bookmark", "help", "license", "next", "nofollow", "noreferrer", "prefetch", "prev", "search", "tag"]
-  };
-  function populate(obj) {
-    for (var attr in globalAttrs) if (globalAttrs.hasOwnProperty(attr))
-      obj.attrs[attr] = globalAttrs[attr];
-  }
-
-  populate(s);
-  for (var tag in data) if (data.hasOwnProperty(tag) && data[tag] != s)
-    populate(data[tag]);
-
-  CodeMirror.htmlSchema = data;
-  function htmlHint(cm, options) {
-    var local = {schemaInfo: data};
-    if (options) for (var opt in options) local[opt] = options[opt];
-    return CodeMirror.hint.xml(cm, local);
-  }
-  CodeMirror.htmlHint = htmlHint; // deprecated
-  CodeMirror.registerHelper("hint", "html", htmlHint);
-})();
diff --git a/resources/libs/codemirror/addon/hint/javascript-hint.js b/resources/libs/codemirror/addon/hint/javascript-hint.js
deleted file mode 100644
index c66b0a7a5..000000000
--- a/resources/libs/codemirror/addon/hint/javascript-hint.js
+++ /dev/null
@@ -1,131 +0,0 @@
-(function () {
-  var Pos = CodeMirror.Pos;
-
-  function forEach(arr, f) {
-    for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
-  }
-
-  function arrayContains(arr, item) {
-    if (!Array.prototype.indexOf) {
-      var i = arr.length;
-      while (i--) {
-        if (arr[i] === item) {
-          return true;
-        }
-      }
-      return false;
-    }
-    return arr.indexOf(item) != -1;
-  }
-
-  function scriptHint(editor, keywords, getToken, options) {
-    // Find the token at the cursor
-    var cur = editor.getCursor(), token = getToken(editor, cur), tprop = token;
-    if (/\b(?:string|comment)\b/.test(token.type)) return;
-    token.state = CodeMirror.innerMode(editor.getMode(), token.state).state;
-
-    // If it's not a 'word-style' token, ignore the token.
-    if (!/^[\w$_]*$/.test(token.string)) {
-      token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state,
-                       type: token.string == "." ? "property" : null};
-    }
-    // If it is a property, find out what it is a property of.
-    while (tprop.type == "property") {
-      tprop = getToken(editor, Pos(cur.line, tprop.start));
-      if (tprop.string != ".") return;
-      tprop = getToken(editor, Pos(cur.line, tprop.start));
-      if (!context) var context = [];
-      context.push(tprop);
-    }
-    return {list: getCompletions(token, context, keywords, options),
-            from: Pos(cur.line, token.start),
-            to: Pos(cur.line, token.end)};
-  }
-
-  function javascriptHint(editor, options) {
-    return scriptHint(editor, javascriptKeywords,
-                      function (e, cur) {return e.getTokenAt(cur);},
-                      options);
-  };
-  CodeMirror.javascriptHint = javascriptHint; // deprecated
-  CodeMirror.registerHelper("hint", "javascript", javascriptHint);
-
-  function getCoffeeScriptToken(editor, cur) {
-  // This getToken, it is for coffeescript, imitates the behavior of
-  // getTokenAt method in javascript.js, that is, returning "property"
-  // type and treat "." as indepenent token.
-    var token = editor.getTokenAt(cur);
-    if (cur.ch == token.start + 1 && token.string.charAt(0) == '.') {
-      token.end = token.start;
-      token.string = '.';
-      token.type = "property";
-    }
-    else if (/^\.[\w$_]*$/.test(token.string)) {
-      token.type = "property";
-      token.start++;
-      token.string = token.string.replace(/\./, '');
-    }
-    return token;
-  }
-
-  function coffeescriptHint(editor, options) {
-    return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken, options);
-  }
-  CodeMirror.coffeescriptHint = coffeescriptHint; // deprecated
-  CodeMirror.registerHelper("hint", "coffeescript", coffeescriptHint);
-
-  var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
-                     "toUpperCase toLowerCase split concat match replace search").split(" ");
-  var arrayProps = ("length concat join splice push pop shift unshift slice reverse sort indexOf " +
-                    "lastIndexOf every some filter forEach map reduce reduceRight ").split(" ");
-  var funcProps = "prototype apply call bind".split(" ");
-  var javascriptKeywords = ("break case catch continue debugger default delete do else false finally for function " +
-                  "if in instanceof new null return switch throw true try typeof var void while with").split(" ");
-  var coffeescriptKeywords = ("and break catch class continue delete do else extends false finally for " +
-                  "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
-
-  function getCompletions(token, context, keywords, options) {
-    var found = [], start = token.string;
-    function maybeAdd(str) {
-      if (str.indexOf(start) == 0 && !arrayContains(found, str)) found.push(str);
-    }
-    function gatherCompletions(obj) {
-      if (typeof obj == "string") forEach(stringProps, maybeAdd);
-      else if (obj instanceof Array) forEach(arrayProps, maybeAdd);
-      else if (obj instanceof Function) forEach(funcProps, maybeAdd);
-      for (var name in obj) maybeAdd(name);
-    }
-
-    if (context && context.length) {
-      // If this is a property, see if it belongs to some object we can
-      // find in the current environment.
-      var obj = context.pop(), base;
-      if (obj.type && obj.type.indexOf("variable") === 0) {
-        if (options && options.additionalContext)
-          base = options.additionalContext[obj.string];
-        base = base || window[obj.string];
-      } else if (obj.type == "string") {
-        base = "";
-      } else if (obj.type == "atom") {
-        base = 1;
-      } else if (obj.type == "function") {
-        if (window.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
-            (typeof window.jQuery == 'function'))
-          base = window.jQuery();
-        else if (window._ != null && (obj.string == '_') && (typeof window._ == 'function'))
-          base = window._();
-      }
-      while (base != null && context.length)
-        base = base[context.pop().string];
-      if (base != null) gatherCompletions(base);
-    } else {
-      // If not, just look in the window object and any local scope
-      // (reading into JS mode internals to get at the local and global variables)
-      for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
-      for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);
-      gatherCompletions(window);
-      forEach(keywords, maybeAdd);
-    }
-    return found;
-  }
-})();
diff --git a/resources/libs/codemirror/addon/hint/pig-hint.js b/resources/libs/codemirror/addon/hint/pig-hint.js
deleted file mode 100644
index 7ef336cec..000000000
--- a/resources/libs/codemirror/addon/hint/pig-hint.js
+++ /dev/null
@@ -1,121 +0,0 @@
-(function () {
-  "use strict";
-
-  function forEach(arr, f) {
-    for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
-  }
-
-  function arrayContains(arr, item) {
-    if (!Array.prototype.indexOf) {
-      var i = arr.length;
-      while (i--) {
-        if (arr[i] === item) {
-          return true;
-        }
-      }
-      return false;
-    }
-    return arr.indexOf(item) != -1;
-  }
-
-  function scriptHint(editor, _keywords, getToken) {
-    // Find the token at the cursor
-    var cur = editor.getCursor(), token = getToken(editor, cur), tprop = token;
-    // If it's not a 'word-style' token, ignore the token.
-
-    if (!/^[\w$_]*$/.test(token.string)) {
-        token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state,
-                         className: token.string == ":" ? "pig-type" : null};
-    }
-
-    if (!context) var context = [];
-    context.push(tprop);
-
-    var completionList = getCompletions(token, context);
-    completionList = completionList.sort();
-    //prevent autocomplete for last word, instead show dropdown with one word
-    if(completionList.length == 1) {
-      completionList.push(" ");
-    }
-
-    return {list: completionList,
-            from: CodeMirror.Pos(cur.line, token.start),
-            to: CodeMirror.Pos(cur.line, token.end)};
-  }
-
-  function pigHint(editor) {
-    return scriptHint(editor, pigKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
-  }
-  CodeMirror.pigHint = pigHint; // deprecated
-  CodeMirror.registerHelper("hint", "pig", pigHint);
-
-  var pigKeywords = "VOID IMPORT RETURNS DEFINE LOAD FILTER FOREACH ORDER CUBE DISTINCT COGROUP "
-  + "JOIN CROSS UNION SPLIT INTO IF OTHERWISE ALL AS BY USING INNER OUTER ONSCHEMA PARALLEL "
-  + "PARTITION GROUP AND OR NOT GENERATE FLATTEN ASC DESC IS STREAM THROUGH STORE MAPREDUCE "
-  + "SHIP CACHE INPUT OUTPUT STDERROR STDIN STDOUT LIMIT SAMPLE LEFT RIGHT FULL EQ GT LT GTE LTE "
-  + "NEQ MATCHES TRUE FALSE";
-  var pigKeywordsU = pigKeywords.split(" ");
-  var pigKeywordsL = pigKeywords.toLowerCase().split(" ");
-
-  var pigTypes = "BOOLEAN INT LONG FLOAT DOUBLE CHARARRAY BYTEARRAY BAG TUPLE MAP";
-  var pigTypesU = pigTypes.split(" ");
-  var pigTypesL = pigTypes.toLowerCase().split(" ");
-
-  var pigBuiltins = "ABS ACOS ARITY ASIN ATAN AVG BAGSIZE BINSTORAGE BLOOM BUILDBLOOM CBRT CEIL "
-  + "CONCAT COR COS COSH COUNT COUNT_STAR COV CONSTANTSIZE CUBEDIMENSIONS DIFF DISTINCT DOUBLEABS "
-  + "DOUBLEAVG DOUBLEBASE DOUBLEMAX DOUBLEMIN DOUBLEROUND DOUBLESUM EXP FLOOR FLOATABS FLOATAVG "
-  + "FLOATMAX FLOATMIN FLOATROUND FLOATSUM GENERICINVOKER INDEXOF INTABS INTAVG INTMAX INTMIN "
-  + "INTSUM INVOKEFORDOUBLE INVOKEFORFLOAT INVOKEFORINT INVOKEFORLONG INVOKEFORSTRING INVOKER "
-  + "ISEMPTY JSONLOADER JSONMETADATA JSONSTORAGE LAST_INDEX_OF LCFIRST LOG LOG10 LOWER LONGABS "
-  + "LONGAVG LONGMAX LONGMIN LONGSUM MAX MIN MAPSIZE MONITOREDUDF NONDETERMINISTIC OUTPUTSCHEMA  "
-  + "PIGSTORAGE PIGSTREAMING RANDOM REGEX_EXTRACT REGEX_EXTRACT_ALL REPLACE ROUND SIN SINH SIZE "
-  + "SQRT STRSPLIT SUBSTRING SUM STRINGCONCAT STRINGMAX STRINGMIN STRINGSIZE TAN TANH TOBAG "
-  + "TOKENIZE TOMAP TOP TOTUPLE TRIM TEXTLOADER TUPLESIZE UCFIRST UPPER UTF8STORAGECONVERTER";
-  var pigBuiltinsU = pigBuiltins.split(" ").join("() ").split(" ");
-  var pigBuiltinsL = pigBuiltins.toLowerCase().split(" ").join("() ").split(" ");
-  var pigBuiltinsC = ("BagSize BinStorage Bloom BuildBloom ConstantSize CubeDimensions DoubleAbs "
-  + "DoubleAvg DoubleBase DoubleMax DoubleMin DoubleRound DoubleSum FloatAbs FloatAvg FloatMax "
-  + "FloatMin FloatRound FloatSum GenericInvoker IntAbs IntAvg IntMax IntMin IntSum "
-  + "InvokeForDouble InvokeForFloat InvokeForInt InvokeForLong InvokeForString Invoker "
-  + "IsEmpty JsonLoader JsonMetadata JsonStorage LongAbs LongAvg LongMax LongMin LongSum MapSize "
-  + "MonitoredUDF Nondeterministic OutputSchema PigStorage PigStreaming StringConcat StringMax "
-  + "StringMin StringSize TextLoader TupleSize Utf8StorageConverter").split(" ").join("() ").split(" ");
-
-  function getCompletions(token, context) {
-    var found = [], start = token.string;
-    function maybeAdd(str) {
-      if (str.indexOf(start) == 0 && !arrayContains(found, str)) found.push(str);
-    }
-
-    function gatherCompletions(obj) {
-      if(obj == ":") {
-        forEach(pigTypesL, maybeAdd);
-      }
-      else {
-        forEach(pigBuiltinsU, maybeAdd);
-        forEach(pigBuiltinsL, maybeAdd);
-        forEach(pigBuiltinsC, maybeAdd);
-        forEach(pigTypesU, maybeAdd);
-        forEach(pigTypesL, maybeAdd);
-        forEach(pigKeywordsU, maybeAdd);
-        forEach(pigKeywordsL, maybeAdd);
-      }
-    }
-
-    if (context) {
-      // If this is a property, see if it belongs to some object we can
-      // find in the current environment.
-      var obj = context.pop(), base;
-
-      if (obj.type == "variable")
-          base = obj.string;
-      else if(obj.type == "variable-3")
-          base = ":" + obj.string;
-
-      while (base != null && context.length)
-        base = base[context.pop().string];
-      if (base != null) gatherCompletions(base);
-    }
-    return found;
-  }
-})();
diff --git a/resources/libs/codemirror/addon/hint/python-hint.js b/resources/libs/codemirror/addon/hint/python-hint.js
deleted file mode 100644
index 98d2a5897..000000000
--- a/resources/libs/codemirror/addon/hint/python-hint.js
+++ /dev/null
@@ -1,95 +0,0 @@
-(function () {
-  function forEach(arr, f) {
-    for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
-  }
-
-  function arrayContains(arr, item) {
-    if (!Array.prototype.indexOf) {
-      var i = arr.length;
-      while (i--) {
-        if (arr[i] === item) {
-          return true;
-        }
-      }
-      return false;
-    }
-    return arr.indexOf(item) != -1;
-  }
-
-  function scriptHint(editor, _keywords, getToken) {
-    // Find the token at the cursor
-    var cur = editor.getCursor(), token = getToken(editor, cur), tprop = token;
-    // If it's not a 'word-style' token, ignore the token.
-
-    if (!/^[\w$_]*$/.test(token.string)) {
-        token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state,
-                         className: token.string == ":" ? "python-type" : null};
-    }
-
-    if (!context) var context = [];
-    context.push(tprop);
-
-    var completionList = getCompletions(token, context);
-    completionList = completionList.sort();
-    //prevent autocomplete for last word, instead show dropdown with one word
-    if(completionList.length == 1) {
-      completionList.push(" ");
-    }
-
-    return {list: completionList,
-            from: CodeMirror.Pos(cur.line, token.start),
-            to: CodeMirror.Pos(cur.line, token.end)};
-  }
-
-  function pythonHint(editor) {
-    return scriptHint(editor, pythonKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
-  }
-  CodeMirror.pythonHint = pythonHint; // deprecated
-  CodeMirror.registerHelper("hint", "python", pythonHint);
-
-  var pythonKeywords = "and del from not while as elif global or with assert else if pass yield"
-+ "break except import print class exec in raise continue finally is return def for lambda try";
-  var pythonKeywordsL = pythonKeywords.split(" ");
-  var pythonKeywordsU = pythonKeywords.toUpperCase().split(" ");
-
-  var pythonBuiltins = "abs divmod input open staticmethod all enumerate int ord str "
-+ "any eval isinstance pow sum basestring execfile issubclass print super"
-+ "bin file iter property tuple bool filter len range type"
-+ "bytearray float list raw_input unichr callable format locals reduce unicode"
-+ "chr frozenset long reload vars classmethod getattr map repr xrange"
-+ "cmp globals max reversed zip compile hasattr memoryview round __import__"
-+ "complex hash min set apply delattr help next setattr buffer"
-+ "dict hex object slice coerce dir id oct sorted intern ";
-  var pythonBuiltinsL = pythonBuiltins.split(" ").join("() ").split(" ");
-  var pythonBuiltinsU = pythonBuiltins.toUpperCase().split(" ").join("() ").split(" ");
-
-  function getCompletions(token, context) {
-    var found = [], start = token.string;
-    function maybeAdd(str) {
-      if (str.indexOf(start) == 0 && !arrayContains(found, str)) found.push(str);
-    }
-
-    function gatherCompletions(_obj) {
-        forEach(pythonBuiltinsL, maybeAdd);
-        forEach(pythonBuiltinsU, maybeAdd);
-        forEach(pythonKeywordsL, maybeAdd);
-        forEach(pythonKeywordsU, maybeAdd);
-    }
-
-    if (context) {
-      // If this is a property, see if it belongs to some object we can
-      // find in the current environment.
-      var obj = context.pop(), base;
-
-      if (obj.type == "variable")
-          base = obj.string;
-      else if(obj.type == "variable-3")
-          base = ":" + obj.string;
-
-      while (base != null && context.length)
-        base = base[context.pop().string];
-      if (base != null) gatherCompletions(base);
-    }
-    return found;
-  }
-})();
diff --git a/resources/libs/codemirror/addon/hint/show-hint.css b/resources/libs/codemirror/addon/hint/show-hint.css
deleted file mode 100644
index 8a4ff052e..000000000
--- a/resources/libs/codemirror/addon/hint/show-hint.css
+++ /dev/null
@@ -1,38 +0,0 @@
-.CodeMirror-hints {
-  position: absolute;
-  z-index: 10;
-  overflow: hidden;
-  list-style: none;
-
-  margin: 0;
-  padding: 2px;
-
-  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  border-radius: 3px;
-  border: 1px solid silver;
-
-  background: white;
-  font-size: 90%;
-  font-family: monospace;
-
-  max-height: 20em;
-  overflow-y: auto;
-}
-
-.CodeMirror-hint {
-  margin: 0;
-  padding: 0 4px;
-  border-radius: 2px;
-  max-width: 19em;
-  overflow: hidden;
-  white-space: pre;
-  color: black;
-  cursor: pointer;
-}
-
-.CodeMirror-hint-active {
-  background: #08f;
-  color: white;
-}
diff --git a/resources/libs/codemirror/addon/hint/show-hint.js b/resources/libs/codemirror/addon/hint/show-hint.js
deleted file mode 100644
index 46103b719..000000000
--- a/resources/libs/codemirror/addon/hint/show-hint.js
+++ /dev/null
@@ -1,286 +0,0 @@
-(function() {
-  "use strict";
-
-  var HINT_ELEMENT_CLASS        = "CodeMirror-hint";
-  var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
-
-  CodeMirror.showHint = function(cm, getHints, options) {
-    // We want a single cursor position.
-    if (cm.somethingSelected()) return;
-    if (getHints == null) getHints = cm.getHelper(cm.getCursor(), "hint");
-    if (getHints == null) return;
-
-    if (cm.state.completionActive) cm.state.completionActive.close();
-
-    var completion = cm.state.completionActive = new Completion(cm, getHints, options || {});
-    CodeMirror.signal(cm, "startCompletion", cm);
-    if (completion.options.async)
-      getHints(cm, function(hints) { completion.showHints(hints); }, completion.options);
-    else
-      return completion.showHints(getHints(cm, completion.options));
-  };
-
-  function Completion(cm, getHints, options) {
-    this.cm = cm;
-    this.getHints = getHints;
-    this.options = options;
-    this.widget = this.onClose = null;
-  }
-
-  Completion.prototype = {
-    close: function() {
-      if (!this.active()) return;
-      this.cm.state.completionActive = null;
-
-      if (this.widget) this.widget.close();
-      if (this.onClose) this.onClose();
-      CodeMirror.signal(this.cm, "endCompletion", this.cm);
-    },
-
-    active: function() {
-      return this.cm.state.completionActive == this;
-    },
-
-    pick: function(data, i) {
-      var completion = data.list[i];
-      if (completion.hint) completion.hint(this.cm, data, completion);
-      else this.cm.replaceRange(getText(completion), data.from, data.to);
-      this.close();
-    },
-
-    showHints: function(data) {
-      if (!data || !data.list.length || !this.active()) return this.close();
-
-      if (this.options.completeSingle != false && data.list.length == 1)
-        this.pick(data, 0);
-      else
-        this.showWidget(data);
-    },
-
-    showWidget: function(data) {
-      this.widget = new Widget(this, data);
-      CodeMirror.signal(data, "shown");
-
-      var debounce = null, completion = this, finished;
-      var closeOn = this.options.closeCharacters || /[\s()\[\]{};:>,]/;
-      var startPos = this.cm.getCursor(), startLen = this.cm.getLine(startPos.line).length;
-
-      function done() {
-        if (finished) return;
-        finished = true;
-        completion.close();
-        completion.cm.off("cursorActivity", activity);
-        if (data) CodeMirror.signal(data, "close");
-      }
-
-      function update() {
-        if (finished) return;
-        CodeMirror.signal(data, "update");
-        if (completion.options.async)
-          completion.getHints(completion.cm, finishUpdate, completion.options);
-        else
-          finishUpdate(completion.getHints(completion.cm, completion.options));
-      }
-      function finishUpdate(data_) {
-        data = data_;
-        if (finished) return;
-        if (!data || !data.list.length) return done();
-        completion.widget = new Widget(completion, data);
-      }
-
-      function activity() {
-        clearTimeout(debounce);
-        var pos = completion.cm.getCursor(), line = completion.cm.getLine(pos.line);
-        if (pos.line != startPos.line || line.length - pos.ch != startLen - startPos.ch ||
-            pos.ch < startPos.ch || completion.cm.somethingSelected() ||
-            (pos.ch && closeOn.test(line.charAt(pos.ch - 1)))) {
-          completion.close();
-        } else {
-          debounce = setTimeout(update, 170);
-          if (completion.widget) completion.widget.close();
-        }
-      }
-      this.cm.on("cursorActivity", activity);
-      this.onClose = done;
-    }
-  };
-
-  function getText(completion) {
-    if (typeof completion == "string") return completion;
-    else return completion.text;
-  }
-
-  function buildKeyMap(options, handle) {
-    var baseMap = {
-      Up: function() {handle.moveFocus(-1);},
-      Down: function() {handle.moveFocus(1);},
-      PageUp: function() {handle.moveFocus(-handle.menuSize() + 1, true);},
-      PageDown: function() {handle.moveFocus(handle.menuSize() - 1, true);},
-      Home: function() {handle.setFocus(0);},
-      End: function() {handle.setFocus(handle.length - 1);},
-      Enter: handle.pick,
-      Tab: handle.pick,
-      Esc: handle.close
-    };
-    var ourMap = options.customKeys ? {} : baseMap;
-    function addBinding(key, val) {
-      var bound;
-      if (typeof val != "string")
-        bound = function(cm) { return val(cm, handle); };
-      // This mechanism is deprecated
-      else if (baseMap.hasOwnProperty(val))
-        bound = baseMap[val];
-      else
-        bound = val;
-      ourMap[key] = bound;
-    }
-    if (options.customKeys)
-      for (var key in options.customKeys) if (options.customKeys.hasOwnProperty(key))
-        addBinding(key, options.customKeys[key]);
-    if (options.extraKeys)
-      for (var key in options.extraKeys) if (options.extraKeys.hasOwnProperty(key))
-        addBinding(key, options.extraKeys[key]);
-    return ourMap;
-  }
-
-  function getHintElement(stopAt, el) {
-    while (el && el != stopAt) {
-      if (el.nodeName.toUpperCase() === "LI") return el;
-      el = el.parentNode;
-    }
-  }
-
-  function Widget(completion, data) {
-    this.completion = completion;
-    this.data = data;
-    var widget = this, cm = completion.cm, options = completion.options;
-
-    var hints = this.hints = document.createElement("ul");
-    hints.className = "CodeMirror-hints";
-    this.selectedHint = options.getDefaultSelection ? options.getDefaultSelection(cm,options,data) : 0;
-
-    var completions = data.list;
-    for (var i = 0; i < completions.length; ++i) {
-      var elt = hints.appendChild(document.createElement("li")), cur = completions[i];
-      var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
-      if (cur.className != null) className = cur.className + " " + className;
-      elt.className = className;
-      if (cur.render) cur.render(elt, data, cur);
-      else elt.appendChild(document.createTextNode(cur.displayText || getText(cur)));
-      elt.hintId = i;
-    }
-
-    var pos = cm.cursorCoords(options.alignWithWord !== false ? data.from : null);
-    var left = pos.left, top = pos.bottom, below = true;
-    hints.style.left = left + "px";
-    hints.style.top = top + "px";
-    // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
-    var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
-    var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
-    (options.container || document.body).appendChild(hints);
-    var box = hints.getBoundingClientRect();
-    var overlapX = box.right - winW, overlapY = box.bottom - winH;
-    if (overlapX > 0) {
-      if (box.right - box.left > winW) {
-        hints.style.width = (winW - 5) + "px";
-        overlapX -= (box.right - box.left) - winW;
-      }
-      hints.style.left = (left = pos.left - overlapX) + "px";
-    }
-    if (overlapY > 0) {
-      var height = box.bottom - box.top;
-      if (box.top - (pos.bottom - pos.top) - height > 0) {
-        overlapY = height + (pos.bottom - pos.top);
-        below = false;
-      } else if (height > winH) {
-        hints.style.height = (winH - 5) + "px";
-        overlapY -= height - winH;
-      }
-      hints.style.top = (top = pos.bottom - overlapY) + "px";
-    }
-
-    cm.addKeyMap(this.keyMap = buildKeyMap(options, {
-      moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },
-      setFocus: function(n) { widget.changeActive(n); },
-      menuSize: function() { return widget.screenAmount(); },
-      length: completions.length,
-      close: function() { completion.close(); },
-      pick: function() { widget.pick(); }
-    }));
-
-    if (options.closeOnUnfocus !== false) {
-      var closingOnBlur;
-      cm.on("blur", this.onBlur = function() { closingOnBlur = setTimeout(function() { completion.close(); }, 100); });
-      cm.on("focus", this.onFocus = function() { clearTimeout(closingOnBlur); });
-    }
-
-    var startScroll = cm.getScrollInfo();
-    cm.on("scroll", this.onScroll = function() {
-      var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
-      var newTop = top + startScroll.top - curScroll.top;
-      var point = newTop - (window.pageYOffset || (document.documentElement || document.body).scrollTop);
-      if (!below) point += hints.offsetHeight;
-      if (point <= editor.top || point >= editor.bottom) return completion.close();
-      hints.style.top = newTop + "px";
-      hints.style.left = (left + startScroll.left - curScroll.left) + "px";
-    });
-
-    CodeMirror.on(hints, "dblclick", function(e) {
-      var t = getHintElement(hints, e.target || e.srcElement);
-      if (t && t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
-    });
-
-    CodeMirror.on(hints, "click", function(e) {
-      var t = getHintElement(hints, e.target || e.srcElement);
-      if (t && t.hintId != null) widget.changeActive(t.hintId);
-    });
-
-    CodeMirror.on(hints, "mousedown", function() {
-      setTimeout(function(){cm.focus();}, 20);
-    });
-
-    CodeMirror.signal(data, "select", completions[0], hints.firstChild);
-    return true;
-  }
-
-  Widget.prototype = {
-    close: function() {
-      if (this.completion.widget != this) return;
-      this.completion.widget = null;
-      this.hints.parentNode.removeChild(this.hints);
-      this.completion.cm.removeKeyMap(this.keyMap);
-
-      var cm = this.completion.cm;
-      if (this.completion.options.closeOnUnfocus !== false) {
-        cm.off("blur", this.onBlur);
-        cm.off("focus", this.onFocus);
-      }
-      cm.off("scroll", this.onScroll);
-    },
-
-    pick: function() {
-      this.completion.pick(this.data, this.selectedHint);
-    },
-
-    changeActive: function(i, avoidWrap) {
-      if (i >= this.data.list.length)
-        i = avoidWrap ? this.data.list.length - 1 : 0;
-      else if (i < 0)
-        i = avoidWrap ? 0  : this.data.list.length - 1;
-      if (this.selectedHint == i) return;
-      var node = this.hints.childNodes[this.selectedHint];
-      node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
-      node = this.hints.childNodes[this.selectedHint = i];
-      node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
-      if (node.offsetTop < this.hints.scrollTop)
-        this.hints.scrollTop = node.offsetTop - 3;
-      else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
-        this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + 3;
-      CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
-    },
-
-    screenAmount: function() {
-      return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
-    }
-  };
-})();
diff --git a/resources/libs/codemirror/addon/hint/sql-hint.js b/resources/libs/codemirror/addon/hint/sql-hint.js
deleted file mode 100644
index 95f6b50a1..000000000
--- a/resources/libs/codemirror/addon/hint/sql-hint.js
+++ /dev/null
@@ -1,105 +0,0 @@
-(function () {
-  "use strict";
-
-  var tables;
-  var keywords;
-
-  function getKeywords(editor) {
-    var mode = editor.doc.modeOption;
-    if(mode === "sql") mode = "text/x-sql";
-    return CodeMirror.resolveMode(mode).keywords;
-  }
-
-  function match(string, word) {
-    var len = string.length;
-    var sub = word.substr(0, len);
-    return string.toUpperCase() === sub.toUpperCase();
-  }
-
-  function addMatches(result, search, wordlist, formatter) {
-    for(var word in wordlist) {
-      if(!wordlist.hasOwnProperty(word)) continue;
-      if(Array.isArray(wordlist)) {
-        word = wordlist[word];
-      }
-      if(match(search, word)) {
-        result.push(formatter(word));
-      }
-    }
-  }
-
-  function columnCompletion(result, editor) {
-    var cur = editor.getCursor();
-    var token = editor.getTokenAt(cur);
-    var string = token.string.substr(1);
-    var prevCur = CodeMirror.Pos(cur.line, token.start);
-    var table = editor.getTokenAt(prevCur).string;
-    var columns = tables[table];
-    if(!columns) {
-      table = findTableByAlias(table, editor);
-    }
-    columns = tables[table];
-    if(!columns) {
-      return;
-    }
-    addMatches(result, string, columns,
-        function(w) {return "." + w;});
-  }
-
-  function eachWord(line, f) {
-    var words = line.text.split(" ");
-    for(var i = 0; i < words.length; i++) {
-      f(words[i]);
-    }
-  }
-
-  // Tries to find possible table name from alias.
-  function findTableByAlias(alias, editor) {
-    var aliasUpperCase = alias.toUpperCase();
-    var previousWord = "";
-    var table = "";
-
-    editor.eachLine(function(line) {
-      eachWord(line, function(word) {
-        var wordUpperCase = word.toUpperCase();
-        if(wordUpperCase === aliasUpperCase) {
-          if(tables.hasOwnProperty(previousWord)) {
-            table = previousWord;
-          }
-        }
-        if(wordUpperCase !== "AS") {
-          previousWord = word;
-        }
-      });
-    });
-    return table;
-  }
-
-  function sqlHint(editor, options) {
-    tables = (options && options.tables) || {};
-    keywords = keywords || getKeywords(editor);
-    var cur = editor.getCursor();
-    var token = editor.getTokenAt(cur);
-
-    var result = [];
-
-    var search = token.string.trim();
-
-    addMatches(result, search, keywords,
-        function(w) {return w.toUpperCase();});
-
-    addMatches(result, search, tables,
-        function(w) {return w;});
-
-    if(search.lastIndexOf('.') === 0) {
-      columnCompletion(result, editor);
-    }
-
-    return {
-      list: result,
-        from: CodeMirror.Pos(cur.line, token.start),
-        to: CodeMirror.Pos(cur.line, token.end)
-    };
-  }
-  CodeMirror.registerHelper("hint", "sql", sqlHint);
-})();
diff --git a/resources/libs/codemirror/addon/hint/xml-hint.js b/resources/libs/codemirror/addon/hint/xml-hint.js
deleted file mode 100644
index a72174344..000000000
--- a/resources/libs/codemirror/addon/hint/xml-hint.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function() {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-
-  function getHints(cm, options) {
-    var tags = options && options.schemaInfo;
-    var quote = (options && options.quoteChar) || '"';
-    if (!tags) return;
-    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    var inner = CodeMirror.innerMode(cm.getMode(), token.state);
-    if (inner.mode.name != "xml") return;
-    var result = [], replaceToken = false, prefix;
-    var isTag = token.string.charAt(0) == "<";
-    if (!inner.state.tagName || isTag) { // Tag completion
-      if (isTag) {
-        prefix = token.string.slice(1);
-        replaceToken = true;
-      }
-      var cx = inner.state.context, curTag = cx && tags[cx.tagName];
-      var childList = cx ? curTag && curTag.children : tags["!top"];
-      if (childList) {
-        for (var i = 0; i < childList.length; ++i) if (!prefix || childList[i].indexOf(prefix) == 0)
-          result.push("<" + childList[i]);
-      } else {
-        for (var name in tags) if (tags.hasOwnProperty(name) && name != "!top" && (!prefix || name.indexOf(prefix) == 0))
-          result.push("<" + name);
-      }
-      if (cx && (!prefix || ("/" + cx.tagName).indexOf(prefix) == 0))
-        result.push("</" + cx.tagName + ">");
-    } else {
-      // Attribute completion
-      var curTag = tags[inner.state.tagName], attrs = curTag && curTag.attrs;
-      if (!attrs) return;
-      if (token.type == "string" || token.string == "=") { // A value
-        var before = cm.getRange(Pos(cur.line, Math.max(0, cur.ch - 60)),
-                                 Pos(cur.line, token.type == "string" ? token.start : token.end));
-        var atName = before.match(/([^\s\u00a0=<>\"\']+)=$/), atValues;
-        if (!atName || !attrs.hasOwnProperty(atName[1]) || !(atValues = attrs[atName[1]])) return;
-        if (typeof atValues == 'function') atValues = atValues.call(this, cm); // Functions can be used to supply values for autocomplete widget
-        if (token.type == "string") {
-          prefix = token.string;
-          if (/['"]/.test(token.string.charAt(0))) {
-            quote = token.string.charAt(0);
-            prefix = token.string.slice(1);
-          }
-          replaceToken = true;
-        }
-        for (var i = 0; i < atValues.length; ++i) if (!prefix || atValues[i].indexOf(prefix) == 0)
-          result.push(quote + atValues[i] + quote);
-      } else { // An attribute name
-        if (token.type == "attribute") {
-          prefix = token.string;
-          replaceToken = true;
-        }
-        for (var attr in attrs) if (attrs.hasOwnProperty(attr) && (!prefix || attr.indexOf(prefix) == 0))
-          result.push(attr);
-      }
-    }
-    return {
-      list: result,
-      from: replaceToken ? Pos(cur.line, token.start) : cur,
-      to: replaceToken ? Pos(cur.line, token.end) : cur
-    };
-  }
-
-  CodeMirror.xmlHint = getHints; // deprecated
-  CodeMirror.registerHelper("hint", "xml", getHints);
-})();
diff --git a/resources/libs/codemirror/addon/lint/coffeescript-lint.js b/resources/libs/codemirror/addon/lint/coffeescript-lint.js
deleted file mode 100644
index 7f55a294d..000000000
--- a/resources/libs/codemirror/addon/lint/coffeescript-lint.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
-
-// declare global: coffeelint
-
-CodeMirror.registerHelper("lint", "coffeescript", function(text) {
-  var found = [];
-  var parseError = function(err) {
-    var loc = err.lineNumber;
-    found.push({from: CodeMirror.Pos(loc-1, 0),
-                to: CodeMirror.Pos(loc, 0),
-                severity: err.level,
-                message: err.message});
-  };
-  try {
-    var res = coffeelint.lint(text);
-    for(var i = 0; i < res.length; i++) {
-      parseError(res[i]);
-    }
-  } catch(e) {
-    found.push({from: CodeMirror.Pos(e.location.first_line, 0),
-                to: CodeMirror.Pos(e.location.last_line, e.location.last_column),
-                severity: 'error',
-                message: e.message});
-  }
-  return found;
-});
-CodeMirror.coffeeValidator = CodeMirror.lint.coffeescript; // deprecated
diff --git a/resources/libs/codemirror/addon/lint/css-lint.js b/resources/libs/codemirror/addon/lint/css-lint.js
deleted file mode 100644
index 1de71fbcb..000000000
--- a/resources/libs/codemirror/addon/lint/css-lint.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Depends on csslint.js from https://github.com/stubbornella/csslint
-
-// declare global: CSSLint
-
-CodeMirror.registerHelper("lint", "css", function(text) {
-  var found = [];
-  var results = CSSLint.verify(text), messages = results.messages, message = null;
-  for ( var i = 0; i < messages.length; i++) {
-    message = messages[i];
-    var startLine = message.line -1, endLine = message.line -1, startCol = message.col -1, endCol = message.col;
-    found.push({
-      from: CodeMirror.Pos(startLine, startCol),
-      to: CodeMirror.Pos(endLine, endCol),
-      message: message.message,
-      severity : message.type
-    });
-  }
-  return found;
-});
diff --git a/resources/libs/codemirror/addon/lint/javascript-lint.js b/resources/libs/codemirror/addon/lint/javascript-lint.js
deleted file mode 100644
index 7123ab7e6..000000000
--- a/resources/libs/codemirror/addon/lint/javascript-lint.js
+++ /dev/null
@@ -1,126 +0,0 @@
-(function() {
-  "use strict";
-  // declare global: JSHINT
-
-  var bogus = [ "Dangerous comment" ];
-
-  var warnings = [ [ "Expected '{'",
-                     "Statement body should be inside '{ }' braces." ] ];
-
-  var errors = [ "Missing semicolon", "Extra comma", "Missing property name",
-                 "Unmatched ", " and instead saw", " is not defined",
-                 "Unclosed string", "Stopping, unable to continue" ];
-
-  function validator(text, options) {
-    JSHINT(text, options);
-    var errors = JSHINT.data().errors, result = [];
-    if (errors) parseErrors(errors, result);
-    return result;
-  }
-
-  CodeMirror.registerHelper("lint", "javascript", validator);
-  CodeMirror.javascriptValidator = CodeMirror.lint.javascript; // deprecated
-
-  function cleanup(error) {
-    // All problems are warnings by default
-    fixWith(error, warnings, "warning", true);
-    fixWith(error, errors, "error");
-
-    return isBogus(error) ? null : error;
-  }
-
-  function fixWith(error, fixes, severity, force) {
-    var description, fix, find, replace, found;
-
-    description = error.description;
-
-    for ( var i = 0; i < fixes.length; i++) {
-      fix = fixes[i];
-      find = (typeof fix === "string" ? fix : fix[0]);
-      replace = (typeof fix === "string" ? null : fix[1]);
-      found = description.indexOf(find) !== -1;
-
-      if (force || found) {
-        error.severity = severity;
-      }
-      if (found && replace) {
-        error.description = replace;
-      }
-    }
-  }
-
-  function isBogus(error) {
-    var description = error.description;
-    for ( var i = 0; i < bogus.length; i++) {
-      if (description.indexOf(bogus[i]) !== -1) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  function parseErrors(errors, output) {
-    for ( var i = 0; i < errors.length; i++) {
-      var error = errors[i];
-      if (error) {
-        var linetabpositions, index;
-
-        linetabpositions = [];
-
-        // This next block is to fix a problem in jshint. Jshint
-        // replaces
-        // all tabs with spaces then performs some checks. The error
-        // positions (character/space) are then reported incorrectly,
-        // not taking the replacement step into account. Here we look
-        // at the evidence line and try to adjust the character position
-        // to the correct value.
-        if (error.evidence) {
-          // Tab positions are computed once per line and cached
-          var tabpositions = linetabpositions[error.line];
-          if (!tabpositions) {
-            var evidence = error.evidence;
-            tabpositions = [];
-            // ugggh phantomjs does not like this
-            // forEachChar(evidence, function(item, index) {
-            Array.prototype.forEach.call(evidence, function(item,
-                                                            index) {
-              if (item === '\t') {
-                // First col is 1 (not 0) to match error
-                // positions
-                tabpositions.push(index + 1);
-              }
-            });
-            linetabpositions[error.line] = tabpositions;
-          }
-          if (tabpositions.length > 0) {
-            var pos = error.character;
-            tabpositions.forEach(function(tabposition) {
-              if (pos > tabposition) pos -= 1;
-            });
-            error.character = pos;
-          }
-        }
-
-        var start = error.character - 1, end = start + 1;
-        if (error.evidence) {
-          index = error.evidence.substring(start).search(/.\b/);
-          if (index > -1) {
-            end += index;
-          }
-        }
-
-        // Convert to format expected by validation service
-        error.description = error.reason;// + "(jshint)";
-        error.start = error.character;
-        error.end = end;
-        error = cleanup(error);
-
-        if (error)
-          output.push({message: error.description,
-                       severity: error.severity,
-                       from: CodeMirror.Pos(error.line - 1, start),
-                       to: CodeMirror.Pos(error.line - 1, end)});
-      }
-    }
-  }
-})();
diff --git a/resources/libs/codemirror/addon/lint/json-lint.js b/resources/libs/codemirror/addon/lint/json-lint.js
deleted file mode 100644
index e10e11bca..000000000
--- a/resources/libs/codemirror/addon/lint/json-lint.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Depends on jsonlint.js from https://github.com/zaach/jsonlint
-
-// declare global: jsonlint
-
-CodeMirror.registerHelper("lint", "json", function(text) {
-  var found = [];
-  jsonlint.parseError = function(str, hash) {
-    var loc = hash.loc;
-    found.push({from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),
-                to: CodeMirror.Pos(loc.last_line - 1, loc.last_column),
-                message: str});
-  };
-  try { jsonlint.parse(text); }
-  catch(e) {}
-  return found;
-});
-CodeMirror.jsonValidator = CodeMirror.lint.json; // deprecated
diff --git a/resources/libs/codemirror/addon/lint/lint.css b/resources/libs/codemirror/addon/lint/lint.css
deleted file mode 100644
index 414a9a0e0..000000000
--- a/resources/libs/codemirror/addon/lint/lint.css
+++ /dev/null
@@ -1,73 +0,0 @@
-/* The lint marker gutter */
-.CodeMirror-lint-markers {
-  width: 16px;
-}
-
-.CodeMirror-lint-tooltip {
-  background-color: infobackground;
-  border: 1px solid black;
-  border-radius: 4px 4px 4px 4px;
-  color: infotext;
-  font-family: monospace;
-  font-size: 10pt;
-  overflow: hidden;
-  padding: 2px 5px;
-  position: fixed;
-  white-space: pre;
-  white-space: pre-wrap;
-  z-index: 100;
-  max-width: 600px;
-  opacity: 0;
-  transition: opacity .4s;
-  -moz-transition: opacity .4s;
-  -webkit-transition: opacity .4s;
-  -o-transition: opacity .4s;
-  -ms-transition: opacity .4s;
-}
-
-.CodeMirror-lint-mark-error, .CodeMirror-lint-mark-warning {
-  background-position: left bottom;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-lint-mark-error {
-  background-image:
-  url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==")
-  ;
-}
-
-.CodeMirror-lint-mark-warning {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning {
-  background-position: center center;
-  background-repeat: no-repeat;
-  cursor: pointer;
-  display: inline-block;
-  height: 16px;
-  width: 16px;
-  vertical-align: middle;
-  position: relative;
-}
-
-.CodeMirror-lint-message-error, .CodeMirror-lint-message-warning {
-  padding-left: 18px;
-  background-position: top left;
-  background-repeat: no-repeat;
-}
-
-.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-multiple {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC");
-  background-repeat: no-repeat;
-  background-position: right bottom;
-  width: 100%; height: 100%;
-}
diff --git a/resources/libs/codemirror/addon/lint/lint.js b/resources/libs/codemirror/addon/lint/lint.js
deleted file mode 100644
index b502ee41f..000000000
--- a/resources/libs/codemirror/addon/lint/lint.js
+++ /dev/null
@@ -1,203 +0,0 @@
-(function() {
-  "use strict";
-  var GUTTER_ID = "CodeMirror-lint-markers";
-  var SEVERITIES = /^(?:error|warning)$/;
-
-  function showTooltip(e, content) {
-    var tt = document.createElement("div");
-    tt.className = "CodeMirror-lint-tooltip";
-    tt.appendChild(content.cloneNode(true));
-    document.body.appendChild(tt);
-
-    function position(e) {
-      if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position);
-      tt.style.top = Math.max(0, e.clientY - tt.offsetHeight - 5) + "px";
-      tt.style.left = (e.clientX + 5) + "px";
-    }
-    CodeMirror.on(document, "mousemove", position);
-    position(e);
-    if (tt.style.opacity != null) tt.style.opacity = 1;
-    return tt;
-  }
-  function rm(elt) {
-    if (elt.parentNode) elt.parentNode.removeChild(elt);
-  }
-  function hideTooltip(tt) {
-    if (!tt.parentNode) return;
-    if (tt.style.opacity == null) rm(tt);
-    tt.style.opacity = 0;
-    setTimeout(function() { rm(tt); }, 600);
-  }
-
-  function showTooltipFor(e, content, node) {
-    var tooltip = showTooltip(e, content);
-    function hide() {
-      CodeMirror.off(node, "mouseout", hide);
-      if (tooltip) { hideTooltip(tooltip); tooltip = null; }
-    }
-    var poll = setInterval(function() {
-      if (tooltip) for (var n = node;; n = n.parentNode) {
-        if (n == document.body) return;
-        if (!n) { hide(); break; }
-      }
-      if (!tooltip) return clearInterval(poll);
-    }, 400);
-    CodeMirror.on(node, "mouseout", hide);
-  }
-
-  function LintState(cm, options, hasGutter) {
-    this.marked = [];
-    this.options = options;
-    this.timeout = null;
-    this.hasGutter = hasGutter;
-    this.onMouseOver = function(e) { onMouseOver(cm, e); };
-  }
-
-  function parseOptions(cm, options) {
-    if (options instanceof Function) return {getAnnotations: options};
-    if (!options || options === true) options = {};
-    if (!options.getAnnotations) options.getAnnotations = cm.getHelper(CodeMirror.Pos(0, 0), "lint");
-    if (!options.getAnnotations) throw new Error("Required option 'getAnnotations' missing (lint addon)");
-    return options;
-  }
-
-  function clearMarks(cm) {
-    var state = cm.state.lint;
-    if (state.hasGutter) cm.clearGutter(GUTTER_ID);
-    for (var i = 0; i < state.marked.length; ++i)
-      state.marked[i].clear();
-    state.marked.length = 0;
-  }
-
-  function makeMarker(labels, severity, multiple, tooltips) {
-    var marker = document.createElement("div"), inner = marker;
-    marker.className = "CodeMirror-lint-marker-" + severity;
-    if (multiple) {
-      inner = marker.appendChild(document.createElement("div"));
-      inner.className = "CodeMirror-lint-marker-multiple";
-    }
-
-    if (tooltips != false) CodeMirror.on(inner, "mouseover", function(e) {
-      showTooltipFor(e, labels, inner);
-    });
-
-    return marker;
-  }
-
-  function getMaxSeverity(a, b) {
-    if (a == "error") return a;
-    else return b;
-  }
-
-  function groupByLine(annotations) {
-    var lines = [];
-    for (var i = 0; i < annotations.length; ++i) {
-      var ann = annotations[i], line = ann.from.line;
-      (lines[line] || (lines[line] = [])).push(ann);
-    }
-    return lines;
-  }
-
-  function annotationTooltip(ann) {
-    var severity = ann.severity;
-    if (!SEVERITIES.test(severity)) severity = "error";
-    var tip = document.createElement("div");
-    tip.className = "CodeMirror-lint-message-" + severity;
-    tip.appendChild(document.createTextNode(ann.message));
-    return tip;
-  }
-
-  function startLinting(cm) {
-    var state = cm.state.lint, options = state.options;
-    if (options.async)
-      options.getAnnotations(cm, updateLinting, options);
-    else
-      updateLinting(cm, options.getAnnotations(cm.getValue(), options));
-  }
-
-  function updateLinting(cm, annotationsNotSorted) {
-    clearMarks(cm);
-    var state = cm.state.lint, options = state.options;
-
-    var annotations = groupByLine(annotationsNotSorted);
-
-    for (var line = 0; line < annotations.length; ++line) {
-      var anns = annotations[line];
-      if (!anns) continue;
-
-      var maxSeverity = null;
-      var tipLabel = state.hasGutter && document.createDocumentFragment();
-
-      for (var i = 0; i < anns.length; ++i) {
-        var ann = anns[i];
-        var severity = ann.severity;
-        if (!SEVERITIES.test(severity)) severity = "error";
-        maxSeverity = getMaxSeverity(maxSeverity, severity);
-
-        if (options.formatAnnotation) ann = options.formatAnnotation(ann);
-        if (state.hasGutter) tipLabel.appendChild(annotationTooltip(ann));
-
-        if (ann.to) state.marked.push(cm.markText(ann.from, ann.to, {
-          className: "CodeMirror-lint-mark-" + severity,
-          __annotation: ann
-        }));
-      }
-
-      if (state.hasGutter)
-        cm.setGutterMarker(line, GUTTER_ID, makeMarker(tipLabel, maxSeverity, anns.length > 1,
-                                                       state.options.tooltips));
-    }
-    if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
-  }
-
-  function onChange(cm) {
-    var state = cm.state.lint;
-    clearTimeout(state.timeout);
-    state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
-  }
-
-  function popupSpanTooltip(ann, e) {
-    var target = e.target || e.srcElement;
-    showTooltipFor(e, annotationTooltip(ann), target);
-  }
-
-  // When the mouseover fires, the cursor might not actually be over
-  // the character itself yet. These pairs of x,y offsets are used to
-  // probe a few nearby points when no suitable marked range is found.
-  var nearby = [0, 0, 0, 5, 0, -5, 5, 0, -5, 0];
-
-  function onMouseOver(cm, e) {
-    if (!/\bCodeMirror-lint-mark-/.test((e.target || e.srcElement).className)) return;
-    for (var i = 0; i < nearby.length; i += 2) {
-      var spans = cm.findMarksAt(cm.coordsChar({left: e.clientX + nearby[i],
-                                                top: e.clientY + nearby[i + 1]}));
-      for (var j = 0; j < spans.length; ++j) {
-        var span = spans[j], ann = span.__annotation;
-        if (ann) return popupSpanTooltip(ann, e);
-      }
-    }
-  }
-
-  function optionHandler(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      clearMarks(cm);
-      cm.off("change", onChange);
-      CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
-      delete cm.state.lint;
-    }
-
-    if (val) {
-      var gutters = cm.getOption("gutters"), hasLintGutter = false;
-      for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
-      var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
-      cm.on("change", onChange);
-      if (state.options.tooltips != false)
-        CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
-
-      startLinting(cm);
-    }
-  }
-
-  CodeMirror.defineOption("lintWith", false, optionHandler); // deprecated
-  CodeMirror.defineOption("lint", false, optionHandler); // deprecated
-})();
diff --git a/resources/libs/codemirror/addon/merge/dep/diff_match_patch.js b/resources/libs/codemirror/addon/merge/dep/diff_match_patch.js
deleted file mode 100644
index ac34105fc..000000000
--- a/resources/libs/codemirror/addon/merge/dep/diff_match_patch.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// From https://code.google.com/p/google-diff-match-patch/ , licensed under the Apache License 2.0
-(function(){function diff_match_patch(){this.Diff_Timeout=1;this.Diff_EditCost=4;this.Match_Threshold=0.5;this.Match_Distance=1E3;this.Patch_DeleteThreshold=0.5;this.Patch_Margin=4;this.Match_MaxBits=32}
-diff_match_patch.prototype.diff_main=function(a,b,c,d){"undefined"==typeof d&&(d=0>=this.Diff_Timeout?Number.MAX_VALUE:(new Date).getTime()+1E3*this.Diff_Timeout);if(null==a||null==b)throw Error("Null input. (diff_main)");if(a==b)return a?[[0,a]]:[];"undefined"==typeof c&&(c=!0);var e=c,f=this.diff_commonPrefix(a,b);c=a.substring(0,f);a=a.substring(f);b=b.substring(f);var f=this.diff_commonSuffix(a,b),g=a.substring(a.length-f);a=a.substring(0,a.length-f);b=b.substring(0,b.length-f);a=this.diff_compute_(a,
-b,e,d);c&&a.unshift([0,c]);g&&a.push([0,g]);this.diff_cleanupMerge(a);return a};
-diff_match_patch.prototype.diff_compute_=function(a,b,c,d){if(!a)return[[1,b]];if(!b)return[[-1,a]];var e=a.length>b.length?a:b,f=a.length>b.length?b:a,g=e.indexOf(f);return-1!=g?(c=[[1,e.substring(0,g)],[0,f],[1,e.substring(g+f.length)]],a.length>b.length&&(c[0][0]=c[2][0]=-1),c):1==f.length?[[-1,a],[1,b]]:(e=this.diff_halfMatch_(a,b))?(f=e[0],a=e[1],g=e[2],b=e[3],e=e[4],f=this.diff_main(f,g,c,d),c=this.diff_main(a,b,c,d),f.concat([[0,e]],c)):c&&100<a.length&&100<b.length?this.diff_lineMode_(a,b,
-d):this.diff_bisect_(a,b,d)};
-diff_match_patch.prototype.diff_lineMode_=function(a,b,c){var d=this.diff_linesToChars_(a,b);a=d.chars1;b=d.chars2;d=d.lineArray;a=this.diff_main(a,b,!1,c);this.diff_charsToLines_(a,d);this.diff_cleanupSemantic(a);a.push([0,""]);for(var e=d=b=0,f="",g="";b<a.length;){switch(a[b][0]){case 1:e++;g+=a[b][1];break;case -1:d++;f+=a[b][1];break;case 0:if(1<=d&&1<=e){a.splice(b-d-e,d+e);b=b-d-e;d=this.diff_main(f,g,!1,c);for(e=d.length-1;0<=e;e--)a.splice(b,0,d[e]);b+=d.length}d=e=0;g=f=""}b++}a.pop();return a};
-diff_match_patch.prototype.diff_bisect_=function(a,b,c){for(var d=a.length,e=b.length,f=Math.ceil((d+e)/2),g=f,h=2*f,j=Array(h),i=Array(h),k=0;k<h;k++)j[k]=-1,i[k]=-1;j[g+1]=0;i[g+1]=0;for(var k=d-e,q=0!=k%2,r=0,t=0,p=0,w=0,v=0;v<f&&!((new Date).getTime()>c);v++){for(var n=-v+r;n<=v-t;n+=2){var l=g+n,m;m=n==-v||n!=v&&j[l-1]<j[l+1]?j[l+1]:j[l-1]+1;for(var s=m-n;m<d&&s<e&&a.charAt(m)==b.charAt(s);)m++,s++;j[l]=m;if(m>d)t+=2;else if(s>e)r+=2;else if(q&&(l=g+k-n,0<=l&&l<h&&-1!=i[l])){var u=d-i[l];if(m>=
-u)return this.diff_bisectSplit_(a,b,m,s,c)}}for(n=-v+p;n<=v-w;n+=2){l=g+n;u=n==-v||n!=v&&i[l-1]<i[l+1]?i[l+1]:i[l-1]+1;for(m=u-n;u<d&&m<e&&a.charAt(d-u-1)==b.charAt(e-m-1);)u++,m++;i[l]=u;if(u>d)w+=2;else if(m>e)p+=2;else if(!q&&(l=g+k-n,0<=l&&(l<h&&-1!=j[l])&&(m=j[l],s=g+m-l,u=d-u,m>=u)))return this.diff_bisectSplit_(a,b,m,s,c)}}return[[-1,a],[1,b]]};
-diff_match_patch.prototype.diff_bisectSplit_=function(a,b,c,d,e){var f=a.substring(0,c),g=b.substring(0,d);a=a.substring(c);b=b.substring(d);f=this.diff_main(f,g,!1,e);e=this.diff_main(a,b,!1,e);return f.concat(e)};
-diff_match_patch.prototype.diff_linesToChars_=function(a,b){function c(a){for(var b="",c=0,f=-1,g=d.length;f<a.length-1;){f=a.indexOf("\n",c);-1==f&&(f=a.length-1);var r=a.substring(c,f+1),c=f+1;(e.hasOwnProperty?e.hasOwnProperty(r):void 0!==e[r])?b+=String.fromCharCode(e[r]):(b+=String.fromCharCode(g),e[r]=g,d[g++]=r)}return b}var d=[],e={};d[0]="";var f=c(a),g=c(b);return{chars1:f,chars2:g,lineArray:d}};
-diff_match_patch.prototype.diff_charsToLines_=function(a,b){for(var c=0;c<a.length;c++){for(var d=a[c][1],e=[],f=0;f<d.length;f++)e[f]=b[d.charCodeAt(f)];a[c][1]=e.join("")}};diff_match_patch.prototype.diff_commonPrefix=function(a,b){if(!a||!b||a.charAt(0)!=b.charAt(0))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(f,e)==b.substring(f,e)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
-diff_match_patch.prototype.diff_commonSuffix=function(a,b){if(!a||!b||a.charAt(a.length-1)!=b.charAt(b.length-1))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(a.length-e,a.length-f)==b.substring(b.length-e,b.length-f)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
-diff_match_patch.prototype.diff_commonOverlap_=function(a,b){var c=a.length,d=b.length;if(0==c||0==d)return 0;c>d?a=a.substring(c-d):c<d&&(b=b.substring(0,c));c=Math.min(c,d);if(a==b)return c;for(var d=0,e=1;;){var f=a.substring(c-e),f=b.indexOf(f);if(-1==f)return d;e+=f;if(0==f||a.substring(c-e)==b.substring(0,e))d=e,e++}};
-diff_match_patch.prototype.diff_halfMatch_=function(a,b){function c(a,b,c){for(var d=a.substring(c,c+Math.floor(a.length/4)),e=-1,g="",h,j,n,l;-1!=(e=b.indexOf(d,e+1));){var m=f.diff_commonPrefix(a.substring(c),b.substring(e)),s=f.diff_commonSuffix(a.substring(0,c),b.substring(0,e));g.length<s+m&&(g=b.substring(e-s,e)+b.substring(e,e+m),h=a.substring(0,c-s),j=a.substring(c+m),n=b.substring(0,e-s),l=b.substring(e+m))}return 2*g.length>=a.length?[h,j,n,l,g]:null}if(0>=this.Diff_Timeout)return null;
-var d=a.length>b.length?a:b,e=a.length>b.length?b:a;if(4>d.length||2*e.length<d.length)return null;var f=this,g=c(d,e,Math.ceil(d.length/4)),d=c(d,e,Math.ceil(d.length/2)),h;if(!g&&!d)return null;h=d?g?g[4].length>d[4].length?g:d:d:g;var j;a.length>b.length?(g=h[0],d=h[1],e=h[2],j=h[3]):(e=h[0],j=h[1],g=h[2],d=h[3]);h=h[4];return[g,d,e,j,h]};
-diff_match_patch.prototype.diff_cleanupSemantic=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=0,h=0,j=0,i=0;f<a.length;)0==a[f][0]?(c[d++]=f,g=j,h=i,i=j=0,e=a[f][1]):(1==a[f][0]?j+=a[f][1].length:i+=a[f][1].length,e&&(e.length<=Math.max(g,h)&&e.length<=Math.max(j,i))&&(a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,d--,f=0<d?c[d-1]:-1,i=j=h=g=0,e=null,b=!0)),f++;b&&this.diff_cleanupMerge(a);this.diff_cleanupSemanticLossless(a);for(f=1;f<a.length;){if(-1==a[f-1][0]&&1==a[f][0]){b=a[f-1][1];c=a[f][1];
-d=this.diff_commonOverlap_(b,c);e=this.diff_commonOverlap_(c,b);if(d>=e){if(d>=b.length/2||d>=c.length/2)a.splice(f,0,[0,c.substring(0,d)]),a[f-1][1]=b.substring(0,b.length-d),a[f+1][1]=c.substring(d),f++}else if(e>=b.length/2||e>=c.length/2)a.splice(f,0,[0,b.substring(0,e)]),a[f-1][0]=1,a[f-1][1]=c.substring(0,c.length-e),a[f+1][0]=-1,a[f+1][1]=b.substring(e),f++;f++}f++}};
-diff_match_patch.prototype.diff_cleanupSemanticLossless=function(a){function b(a,b){if(!a||!b)return 6;var c=a.charAt(a.length-1),d=b.charAt(0),e=c.match(diff_match_patch.nonAlphaNumericRegex_),f=d.match(diff_match_patch.nonAlphaNumericRegex_),g=e&&c.match(diff_match_patch.whitespaceRegex_),h=f&&d.match(diff_match_patch.whitespaceRegex_),c=g&&c.match(diff_match_patch.linebreakRegex_),d=h&&d.match(diff_match_patch.linebreakRegex_),i=c&&a.match(diff_match_patch.blanklineEndRegex_),j=d&&b.match(diff_match_patch.blanklineStartRegex_);
-return i||j?5:c||d?4:e&&!g&&h?3:g||h?2:e||f?1:0}for(var c=1;c<a.length-1;){if(0==a[c-1][0]&&0==a[c+1][0]){var d=a[c-1][1],e=a[c][1],f=a[c+1][1],g=this.diff_commonSuffix(d,e);if(g)var h=e.substring(e.length-g),d=d.substring(0,d.length-g),e=h+e.substring(0,e.length-g),f=h+f;for(var g=d,h=e,j=f,i=b(d,e)+b(e,f);e.charAt(0)===f.charAt(0);){var d=d+e.charAt(0),e=e.substring(1)+f.charAt(0),f=f.substring(1),k=b(d,e)+b(e,f);k>=i&&(i=k,g=d,h=e,j=f)}a[c-1][1]!=g&&(g?a[c-1][1]=g:(a.splice(c-1,1),c--),a[c][1]=
-h,j?a[c+1][1]=j:(a.splice(c+1,1),c--))}c++}};diff_match_patch.nonAlphaNumericRegex_=/[^a-zA-Z0-9]/;diff_match_patch.whitespaceRegex_=/\s/;diff_match_patch.linebreakRegex_=/[\r\n]/;diff_match_patch.blanklineEndRegex_=/\n\r?\n$/;diff_match_patch.blanklineStartRegex_=/^\r?\n\r?\n/;
-diff_match_patch.prototype.diff_cleanupEfficiency=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=!1,h=!1,j=!1,i=!1;f<a.length;){if(0==a[f][0])a[f][1].length<this.Diff_EditCost&&(j||i)?(c[d++]=f,g=j,h=i,e=a[f][1]):(d=0,e=null),j=i=!1;else if(-1==a[f][0]?i=!0:j=!0,e&&(g&&h&&j&&i||e.length<this.Diff_EditCost/2&&3==g+h+j+i))a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,e=null,g&&h?(j=i=!0,d=0):(d--,f=0<d?c[d-1]:-1,j=i=!1),b=!0;f++}b&&this.diff_cleanupMerge(a)};
-diff_match_patch.prototype.diff_cleanupMerge=function(a){a.push([0,""]);for(var b=0,c=0,d=0,e="",f="",g;b<a.length;)switch(a[b][0]){case 1:d++;f+=a[b][1];b++;break;case -1:c++;e+=a[b][1];b++;break;case 0:1<c+d?(0!==c&&0!==d&&(g=this.diff_commonPrefix(f,e),0!==g&&(0<b-c-d&&0==a[b-c-d-1][0]?a[b-c-d-1][1]+=f.substring(0,g):(a.splice(0,0,[0,f.substring(0,g)]),b++),f=f.substring(g),e=e.substring(g)),g=this.diff_commonSuffix(f,e),0!==g&&(a[b][1]=f.substring(f.length-g)+a[b][1],f=f.substring(0,f.length-
-g),e=e.substring(0,e.length-g))),0===c?a.splice(b-d,c+d,[1,f]):0===d?a.splice(b-c,c+d,[-1,e]):a.splice(b-c-d,c+d,[-1,e],[1,f]),b=b-c-d+(c?1:0)+(d?1:0)+1):0!==b&&0==a[b-1][0]?(a[b-1][1]+=a[b][1],a.splice(b,1)):b++,c=d=0,f=e=""}""===a[a.length-1][1]&&a.pop();c=!1;for(b=1;b<a.length-1;)0==a[b-1][0]&&0==a[b+1][0]&&(a[b][1].substring(a[b][1].length-a[b-1][1].length)==a[b-1][1]?(a[b][1]=a[b-1][1]+a[b][1].substring(0,a[b][1].length-a[b-1][1].length),a[b+1][1]=a[b-1][1]+a[b+1][1],a.splice(b-1,1),c=!0):a[b][1].substring(0,
-a[b+1][1].length)==a[b+1][1]&&(a[b-1][1]+=a[b+1][1],a[b][1]=a[b][1].substring(a[b+1][1].length)+a[b+1][1],a.splice(b+1,1),c=!0)),b++;c&&this.diff_cleanupMerge(a)};diff_match_patch.prototype.diff_xIndex=function(a,b){var c=0,d=0,e=0,f=0,g;for(g=0;g<a.length;g++){1!==a[g][0]&&(c+=a[g][1].length);-1!==a[g][0]&&(d+=a[g][1].length);if(c>b)break;e=c;f=d}return a.length!=g&&-1===a[g][0]?f:f+(b-e)};
-diff_match_patch.prototype.diff_prettyHtml=function(a){for(var b=[],c=/&/g,d=/</g,e=/>/g,f=/\n/g,g=0;g<a.length;g++){var h=a[g][0],j=a[g][1],j=j.replace(c,"&amp;").replace(d,"&lt;").replace(e,"&gt;").replace(f,"&para;<br>");switch(h){case 1:b[g]='<ins style="background:#e6ffe6;">'+j+"</ins>";break;case -1:b[g]='<del style="background:#ffe6e6;">'+j+"</del>";break;case 0:b[g]="<span>"+j+"</span>"}}return b.join("")};
-diff_match_patch.prototype.diff_text1=function(a){for(var b=[],c=0;c<a.length;c++)1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_text2=function(a){for(var b=[],c=0;c<a.length;c++)-1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_levenshtein=function(a){for(var b=0,c=0,d=0,e=0;e<a.length;e++){var f=a[e][0],g=a[e][1];switch(f){case 1:c+=g.length;break;case -1:d+=g.length;break;case 0:b+=Math.max(c,d),d=c=0}}return b+=Math.max(c,d)};
-diff_match_patch.prototype.diff_toDelta=function(a){for(var b=[],c=0;c<a.length;c++)switch(a[c][0]){case 1:b[c]="+"+encodeURI(a[c][1]);break;case -1:b[c]="-"+a[c][1].length;break;case 0:b[c]="="+a[c][1].length}return b.join("\t").replace(/%20/g," ")};
-diff_match_patch.prototype.diff_fromDelta=function(a,b){for(var c=[],d=0,e=0,f=b.split(/\t/g),g=0;g<f.length;g++){var h=f[g].substring(1);switch(f[g].charAt(0)){case "+":try{c[d++]=[1,decodeURI(h)]}catch(j){throw Error("Illegal escape in diff_fromDelta: "+h);}break;case "-":case "=":var i=parseInt(h,10);if(isNaN(i)||0>i)throw Error("Invalid number in diff_fromDelta: "+h);h=a.substring(e,e+=i);"="==f[g].charAt(0)?c[d++]=[0,h]:c[d++]=[-1,h];break;default:if(f[g])throw Error("Invalid diff operation in diff_fromDelta: "+
-f[g]);}}if(e!=a.length)throw Error("Delta length ("+e+") does not equal source text length ("+a.length+").");return c};diff_match_patch.prototype.match_main=function(a,b,c){if(null==a||null==b||null==c)throw Error("Null input. (match_main)");c=Math.max(0,Math.min(c,a.length));return a==b?0:a.length?a.substring(c,c+b.length)==b?c:this.match_bitap_(a,b,c):-1};
-diff_match_patch.prototype.match_bitap_=function(a,b,c){function d(a,d){var e=a/b.length,g=Math.abs(c-d);return!f.Match_Distance?g?1:e:e+g/f.Match_Distance}if(b.length>this.Match_MaxBits)throw Error("Pattern too long for this browser.");var e=this.match_alphabet_(b),f=this,g=this.Match_Threshold,h=a.indexOf(b,c);-1!=h&&(g=Math.min(d(0,h),g),h=a.lastIndexOf(b,c+b.length),-1!=h&&(g=Math.min(d(0,h),g)));for(var j=1<<b.length-1,h=-1,i,k,q=b.length+a.length,r,t=0;t<b.length;t++){i=0;for(k=q;i<k;)d(t,c+
-k)<=g?i=k:q=k,k=Math.floor((q-i)/2+i);q=k;i=Math.max(1,c-k+1);var p=Math.min(c+k,a.length)+b.length;k=Array(p+2);for(k[p+1]=(1<<t)-1;p>=i;p--){var w=e[a.charAt(p-1)];k[p]=0===t?(k[p+1]<<1|1)&w:(k[p+1]<<1|1)&w|((r[p+1]|r[p])<<1|1)|r[p+1];if(k[p]&j&&(w=d(t,p-1),w<=g))if(g=w,h=p-1,h>c)i=Math.max(1,2*c-h);else break}if(d(t+1,c)>g)break;r=k}return h};
-diff_match_patch.prototype.match_alphabet_=function(a){for(var b={},c=0;c<a.length;c++)b[a.charAt(c)]=0;for(c=0;c<a.length;c++)b[a.charAt(c)]|=1<<a.length-c-1;return b};
-diff_match_patch.prototype.patch_addContext_=function(a,b){if(0!=b.length){for(var c=b.substring(a.start2,a.start2+a.length1),d=0;b.indexOf(c)!=b.lastIndexOf(c)&&c.length<this.Match_MaxBits-this.Patch_Margin-this.Patch_Margin;)d+=this.Patch_Margin,c=b.substring(a.start2-d,a.start2+a.length1+d);d+=this.Patch_Margin;(c=b.substring(a.start2-d,a.start2))&&a.diffs.unshift([0,c]);(d=b.substring(a.start2+a.length1,a.start2+a.length1+d))&&a.diffs.push([0,d]);a.start1-=c.length;a.start2-=c.length;a.length1+=
-c.length+d.length;a.length2+=c.length+d.length}};
-diff_match_patch.prototype.patch_make=function(a,b,c){var d;if("string"==typeof a&&"string"==typeof b&&"undefined"==typeof c)d=a,b=this.diff_main(d,b,!0),2<b.length&&(this.diff_cleanupSemantic(b),this.diff_cleanupEfficiency(b));else if(a&&"object"==typeof a&&"undefined"==typeof b&&"undefined"==typeof c)b=a,d=this.diff_text1(b);else if("string"==typeof a&&b&&"object"==typeof b&&"undefined"==typeof c)d=a;else if("string"==typeof a&&"string"==typeof b&&c&&"object"==typeof c)d=a,b=c;else throw Error("Unknown call format to patch_make.");
-if(0===b.length)return[];c=[];a=new diff_match_patch.patch_obj;for(var e=0,f=0,g=0,h=d,j=0;j<b.length;j++){var i=b[j][0],k=b[j][1];!e&&0!==i&&(a.start1=f,a.start2=g);switch(i){case 1:a.diffs[e++]=b[j];a.length2+=k.length;d=d.substring(0,g)+k+d.substring(g);break;case -1:a.length1+=k.length;a.diffs[e++]=b[j];d=d.substring(0,g)+d.substring(g+k.length);break;case 0:k.length<=2*this.Patch_Margin&&e&&b.length!=j+1?(a.diffs[e++]=b[j],a.length1+=k.length,a.length2+=k.length):k.length>=2*this.Patch_Margin&&
-e&&(this.patch_addContext_(a,h),c.push(a),a=new diff_match_patch.patch_obj,e=0,h=d,f=g)}1!==i&&(f+=k.length);-1!==i&&(g+=k.length)}e&&(this.patch_addContext_(a,h),c.push(a));return c};diff_match_patch.prototype.patch_deepCopy=function(a){for(var b=[],c=0;c<a.length;c++){var d=a[c],e=new diff_match_patch.patch_obj;e.diffs=[];for(var f=0;f<d.diffs.length;f++)e.diffs[f]=d.diffs[f].slice();e.start1=d.start1;e.start2=d.start2;e.length1=d.length1;e.length2=d.length2;b[c]=e}return b};
-diff_match_patch.prototype.patch_apply=function(a,b){if(0==a.length)return[b,[]];a=this.patch_deepCopy(a);var c=this.patch_addPadding(a);b=c+b+c;this.patch_splitMax(a);for(var d=0,e=[],f=0;f<a.length;f++){var g=a[f].start2+d,h=this.diff_text1(a[f].diffs),j,i=-1;if(h.length>this.Match_MaxBits){if(j=this.match_main(b,h.substring(0,this.Match_MaxBits),g),-1!=j&&(i=this.match_main(b,h.substring(h.length-this.Match_MaxBits),g+h.length-this.Match_MaxBits),-1==i||j>=i))j=-1}else j=this.match_main(b,h,g);
-if(-1==j)e[f]=!1,d-=a[f].length2-a[f].length1;else if(e[f]=!0,d=j-g,g=-1==i?b.substring(j,j+h.length):b.substring(j,i+this.Match_MaxBits),h==g)b=b.substring(0,j)+this.diff_text2(a[f].diffs)+b.substring(j+h.length);else if(g=this.diff_main(h,g,!1),h.length>this.Match_MaxBits&&this.diff_levenshtein(g)/h.length>this.Patch_DeleteThreshold)e[f]=!1;else{this.diff_cleanupSemanticLossless(g);for(var h=0,k,i=0;i<a[f].diffs.length;i++){var q=a[f].diffs[i];0!==q[0]&&(k=this.diff_xIndex(g,h));1===q[0]?b=b.substring(0,
-j+k)+q[1]+b.substring(j+k):-1===q[0]&&(b=b.substring(0,j+k)+b.substring(j+this.diff_xIndex(g,h+q[1].length)));-1!==q[0]&&(h+=q[1].length)}}}b=b.substring(c.length,b.length-c.length);return[b,e]};
-diff_match_patch.prototype.patch_addPadding=function(a){for(var b=this.Patch_Margin,c="",d=1;d<=b;d++)c+=String.fromCharCode(d);for(d=0;d<a.length;d++)a[d].start1+=b,a[d].start2+=b;var d=a[0],e=d.diffs;if(0==e.length||0!=e[0][0])e.unshift([0,c]),d.start1-=b,d.start2-=b,d.length1+=b,d.length2+=b;else if(b>e[0][1].length){var f=b-e[0][1].length;e[0][1]=c.substring(e[0][1].length)+e[0][1];d.start1-=f;d.start2-=f;d.length1+=f;d.length2+=f}d=a[a.length-1];e=d.diffs;0==e.length||0!=e[e.length-1][0]?(e.push([0,
-c]),d.length1+=b,d.length2+=b):b>e[e.length-1][1].length&&(f=b-e[e.length-1][1].length,e[e.length-1][1]+=c.substring(0,f),d.length1+=f,d.length2+=f);return c};
-diff_match_patch.prototype.patch_splitMax=function(a){for(var b=this.Match_MaxBits,c=0;c<a.length;c++)if(!(a[c].length1<=b)){var d=a[c];a.splice(c--,1);for(var e=d.start1,f=d.start2,g="";0!==d.diffs.length;){var h=new diff_match_patch.patch_obj,j=!0;h.start1=e-g.length;h.start2=f-g.length;""!==g&&(h.length1=h.length2=g.length,h.diffs.push([0,g]));for(;0!==d.diffs.length&&h.length1<b-this.Patch_Margin;){var g=d.diffs[0][0],i=d.diffs[0][1];1===g?(h.length2+=i.length,f+=i.length,h.diffs.push(d.diffs.shift()),
-j=!1):-1===g&&1==h.diffs.length&&0==h.diffs[0][0]&&i.length>2*b?(h.length1+=i.length,e+=i.length,j=!1,h.diffs.push([g,i]),d.diffs.shift()):(i=i.substring(0,b-h.length1-this.Patch_Margin),h.length1+=i.length,e+=i.length,0===g?(h.length2+=i.length,f+=i.length):j=!1,h.diffs.push([g,i]),i==d.diffs[0][1]?d.diffs.shift():d.diffs[0][1]=d.diffs[0][1].substring(i.length))}g=this.diff_text2(h.diffs);g=g.substring(g.length-this.Patch_Margin);i=this.diff_text1(d.diffs).substring(0,this.Patch_Margin);""!==i&&
-(h.length1+=i.length,h.length2+=i.length,0!==h.diffs.length&&0===h.diffs[h.diffs.length-1][0]?h.diffs[h.diffs.length-1][1]+=i:h.diffs.push([0,i]));j||a.splice(++c,0,h)}}};diff_match_patch.prototype.patch_toText=function(a){for(var b=[],c=0;c<a.length;c++)b[c]=a[c];return b.join("")};
-diff_match_patch.prototype.patch_fromText=function(a){var b=[];if(!a)return b;a=a.split("\n");for(var c=0,d=/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/;c<a.length;){var e=a[c].match(d);if(!e)throw Error("Invalid patch string: "+a[c]);var f=new diff_match_patch.patch_obj;b.push(f);f.start1=parseInt(e[1],10);""===e[2]?(f.start1--,f.length1=1):"0"==e[2]?f.length1=0:(f.start1--,f.length1=parseInt(e[2],10));f.start2=parseInt(e[3],10);""===e[4]?(f.start2--,f.length2=1):"0"==e[4]?f.length2=0:(f.start2--,f.length2=
-parseInt(e[4],10));for(c++;c<a.length;){e=a[c].charAt(0);try{var g=decodeURI(a[c].substring(1))}catch(h){throw Error("Illegal escape in patch_fromText: "+g);}if("-"==e)f.diffs.push([-1,g]);else if("+"==e)f.diffs.push([1,g]);else if(" "==e)f.diffs.push([0,g]);else if("@"==e)break;else if(""!==e)throw Error('Invalid patch mode "'+e+'" in: '+g);c++}}return b};diff_match_patch.patch_obj=function(){this.diffs=[];this.start2=this.start1=null;this.length2=this.length1=0};
-diff_match_patch.patch_obj.prototype.toString=function(){var a,b;a=0===this.length1?this.start1+",0":1==this.length1?this.start1+1:this.start1+1+","+this.length1;b=0===this.length2?this.start2+",0":1==this.length2?this.start2+1:this.start2+1+","+this.length2;a=["@@ -"+a+" +"+b+" @@\n"];var c;for(b=0;b<this.diffs.length;b++){switch(this.diffs[b][0]){case 1:c="+";break;case -1:c="-";break;case 0:c=" "}a[b+1]=c+encodeURI(this.diffs[b][1])+"\n"}return a.join("").replace(/%20/g," ")};
-this.diff_match_patch=diff_match_patch;this.DIFF_DELETE=-1;this.DIFF_INSERT=1;this.DIFF_EQUAL=0;})()
diff --git a/resources/libs/codemirror/addon/merge/merge.css b/resources/libs/codemirror/addon/merge/merge.css
deleted file mode 100644
index 63237fc8e..000000000
--- a/resources/libs/codemirror/addon/merge/merge.css
+++ /dev/null
@@ -1,92 +0,0 @@
-.CodeMirror-merge {
-  position: relative;
-  border: 1px solid #ddd;
-  white-space: pre;
-}
-
-.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
-  height: 350px;
-}
-
-.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 47%; }
-.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 6%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
-
-.CodeMirror-merge-pane {
-  display: inline-block;
-  white-space: normal;
-  vertical-align: top;
-}
-.CodeMirror-merge-pane-rightmost {
-  position: absolute;
-  right: 0px;
-  z-index: 1;
-}
-
-.CodeMirror-merge-gap {
-  z-index: 2;
-  display: inline-block;
-  height: 100%;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  overflow: hidden;
-  border-left: 1px solid #ddd;
-  border-right: 1px solid #ddd;
-  position: relative;
-  background: #f8f8f8;
-}
-
-.CodeMirror-merge-scrolllock-wrap {
-  position: absolute;
-  bottom: 0; left: 50%;
-}
-.CodeMirror-merge-scrolllock {
-  position: relative;
-  left: -50%;
-  cursor: pointer;
-  color: #555;
-  line-height: 1;
-}
-
-.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
-  position: absolute;
-  left: 0; top: 0;
-  right: 0; bottom: 0;
-  line-height: 1;
-}
-
-.CodeMirror-merge-copy {
-  position: absolute;
-  cursor: pointer;
-  color: #44c;
-}
-
-.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
-.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
-
-.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
-  background-position: bottom left;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
-  background-position: bottom left;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-chunk { background: #ffffe0; }
-.CodeMirror-merge-r-chunk-start { border-top: 1px solid #ee8; }
-.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #ee8; }
-.CodeMirror-merge-r-connect { fill: #ffffe0; stroke: #ee8; stroke-width: 1px; }
-
-.CodeMirror-merge-l-chunk { background: #eef; }
-.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
-.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
-.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
-
-.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
-.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
-.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
diff --git a/resources/libs/codemirror/addon/merge/merge.js b/resources/libs/codemirror/addon/merge/merge.js
deleted file mode 100644
index 70341e4d1..000000000
--- a/resources/libs/codemirror/addon/merge/merge.js
+++ /dev/null
@@ -1,474 +0,0 @@
-(function() {
-  "use strict";
-  // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
-
-  var Pos = CodeMirror.Pos;
-  var svgNS = "http://www.w3.org/2000/svg";
-
-  function DiffView(mv, type) {
-    this.mv = mv;
-    this.type = type;
-    this.classes = type == "left"
-      ? {chunk: "CodeMirror-merge-l-chunk",
-         start: "CodeMirror-merge-l-chunk-start",
-         end: "CodeMirror-merge-l-chunk-end",
-         insert: "CodeMirror-merge-l-inserted",
-         del: "CodeMirror-merge-l-deleted",
-         connect: "CodeMirror-merge-l-connect"}
-      : {chunk: "CodeMirror-merge-r-chunk",
-         start: "CodeMirror-merge-r-chunk-start",
-         end: "CodeMirror-merge-r-chunk-end",
-         insert: "CodeMirror-merge-r-inserted",
-         del: "CodeMirror-merge-r-deleted",
-         connect: "CodeMirror-merge-r-connect"};
-  }
-
-  DiffView.prototype = {
-    constructor: DiffView,
-    init: function(pane, orig, options) {
-      this.edit = this.mv.edit;
-      this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: true}, copyObj(options)));
-
-      this.diff = getDiff(orig, options.value);
-      this.diffOutOfDate = false;
-
-      this.showDifferences = options.showDifferences !== false;
-      this.forceUpdate = registerUpdate(this);
-      setScrollLock(this, true, false);
-      registerScroll(this);
-    },
-    setShowDifferences: function(val) {
-      val = val !== false;
-      if (val != this.showDifferences) {
-        this.showDifferences = val;
-        this.forceUpdate("full");
-      }
-    }
-  };
-
-  function registerUpdate(dv) {
-    var edit = {from: 0, to: 0, marked: []};
-    var orig = {from: 0, to: 0, marked: []};
-    var debounceChange;
-    function update(mode) {
-      if (mode == "full") {
-        if (dv.svg) clear(dv.svg);
-        clear(dv.copyButtons);
-        clearMarks(dv.edit, edit.marked, dv.classes);
-        clearMarks(dv.orig, orig.marked, dv.classes);
-        edit.from = edit.to = orig.from = orig.to = 0;
-      }
-      if (dv.diffOutOfDate) {
-        dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
-        dv.diffOutOfDate = false;
-        CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
-      }
-      if (dv.showDifferences) {
-        updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
-        updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
-      }
-      drawConnectors(dv);
-    }
-    function set(slow) {
-      clearTimeout(debounceChange);
-      debounceChange = setTimeout(update, slow == true ? 250 : 100);
-    }
-    function change() {
-      if (!dv.diffOutOfDate) {
-        dv.diffOutOfDate = true;
-        edit.from = edit.to = orig.from = orig.to = 0;
-      }
-      set(true);
-    }
-    dv.edit.on("change", change);
-    dv.orig.on("change", change);
-    dv.edit.on("viewportChange", set);
-    dv.orig.on("viewportChange", set);
-    update();
-    return update;
-  }
-
-  function registerScroll(dv) {
-    dv.edit.on("scroll", function() {
-      syncScroll(dv, DIFF_INSERT) && drawConnectors(dv);
-    });
-    dv.orig.on("scroll", function() {
-      syncScroll(dv, DIFF_DELETE) && drawConnectors(dv);
-    });
-  }
-
-  function syncScroll(dv, type) {
-    // Change handler will do a refresh after a timeout when diff is out of date
-    if (dv.diffOutOfDate) return false;
-    if (!dv.lockScroll) return true;
-    var editor, other, now = +new Date;
-    if (type == DIFF_INSERT) { editor = dv.edit; other = dv.orig; }
-    else { editor = dv.orig; other = dv.edit; }
-    // Don't take action if the position of this editor was recently set
-    // (to prevent feedback loops)
-    if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 50 > now) return false;
-
-    var sInfo = editor.getScrollInfo(), halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
-    var mid = editor.lineAtHeight(midY, "local");
-    var around = chunkBoundariesAround(dv.diff, mid, type == DIFF_INSERT);
-    var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
-    var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
-    var ratio = (midY - off.top) / (off.bot - off.top);
-    var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
-
-    var botDist, mix;
-    // Some careful tweaking to make sure no space is left out of view
-    // when scrolling to top or bottom.
-    if (targetPos > sInfo.top && (mix = sInfo.top / halfScreen) < 1) {
-      targetPos = targetPos * mix + sInfo.top * (1 - mix);
-    } else if ((botDist = sInfo.height - sInfo.clientHeight - sInfo.top) < halfScreen) {
-      var otherInfo = other.getScrollInfo();
-      var botDistOther = otherInfo.height - otherInfo.clientHeight - targetPos;
-      if (botDistOther > botDist && (mix = botDist / halfScreen) < 1)
-        targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix);
-    }
-
-    other.scrollTo(sInfo.left, targetPos);
-    other.state.scrollSetAt = now;
-    other.state.scrollSetBy = dv;
-    return true;
-  }
-
-  function getOffsets(editor, around) {
-    var bot = around.after;
-    if (bot == null) bot = editor.lastLine() + 1;
-    return {top: editor.heightAtLine(around.before || 0, "local"),
-            bot: editor.heightAtLine(bot, "local")};
-  }
-
-  function setScrollLock(dv, val, action) {
-    dv.lockScroll = val;
-    if (val && action != false) syncScroll(dv, DIFF_INSERT) && drawConnectors(dv);
-    dv.lockButton.innerHTML = val ? "\u21db\u21da" : "\u21db&nbsp;&nbsp;\u21da";
-  }
-
-  // Updating the marks for editor content
-
-  function clearMarks(editor, arr, classes) {
-    for (var i = 0; i < arr.length; ++i) {
-      var mark = arr[i];
-      if (mark instanceof CodeMirror.TextMarker) {
-        mark.clear();
-      } else {
-        editor.removeLineClass(mark, "background", classes.chunk);
-        editor.removeLineClass(mark, "background", classes.start);
-        editor.removeLineClass(mark, "background", classes.end);
-      }
-    }
-    arr.length = 0;
-  }
-
-  // FIXME maybe add a margin around viewport to prevent too many updates
-  function updateMarks(editor, diff, state, type, classes) {
-    var vp = editor.getViewport();
-    editor.operation(function() {
-      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
-        clearMarks(editor, state.marked, classes);
-        markChanges(editor, diff, type, state.marked, vp.from, vp.to, classes);
-        state.from = vp.from; state.to = vp.to;
-      } else {
-        if (vp.from < state.from) {
-          markChanges(editor, diff, type, state.marked, vp.from, state.from, classes);
-          state.from = vp.from;
-        }
-        if (vp.to > state.to) {
-          markChanges(editor, diff, type, state.marked, state.to, vp.to, classes);
-          state.to = vp.to;
-        }
-      }
-    });
-  }
-
-  function markChanges(editor, diff, type, marks, from, to, classes) {
-    var pos = Pos(0, 0);
-    var top = Pos(from, 0), bot = editor.clipPos(Pos(to - 1));
-    var cls = type == DIFF_DELETE ? classes.del : classes.insert;
-    function markChunk(start, end) {
-      var bfrom = Math.max(from, start), bto = Math.min(to, end);
-      for (var i = bfrom; i < bto; ++i) {
-        var line = editor.addLineClass(i, "background", classes.chunk);
-        if (i == start) editor.addLineClass(line, "background", classes.start);
-        if (i == end - 1) editor.addLineClass(line, "background", classes.end);
-        marks.push(line);
-      }
-      // When the chunk is empty, make sure a horizontal line shows up
-      if (start == end && bfrom == end && bto == end) {
-        if (bfrom)
-          marks.push(editor.addLineClass(bfrom - 1, "background", classes.end));
-        else
-          marks.push(editor.addLineClass(bfrom, "background", classes.start));
-      }
-    }
-
-    var chunkStart = 0;
-    for (var i = 0; i < diff.length; ++i) {
-      var part = diff[i], tp = part[0], str = part[1];
-      if (tp == DIFF_EQUAL) {
-        var cleanFrom = pos.line + (startOfLineClean(diff, i) ? 0 : 1);
-        moveOver(pos, str);
-        var cleanTo = pos.line + (endOfLineClean(diff, i) ? 1 : 0);
-        if (cleanTo > cleanFrom) {
-          if (i) markChunk(chunkStart, cleanFrom);
-          chunkStart = cleanTo;
-        }
-      } else {
-        if (tp == type) {
-          var end = moveOver(pos, str, true);
-          var a = posMax(top, pos), b = posMin(bot, end);
-          if (!posEq(a, b))
-            marks.push(editor.markText(a, b, {className: cls}));
-          pos = end;
-        }
-      }
-    }
-    if (chunkStart <= pos.line) markChunk(chunkStart, pos.line + 1);
-  }
-
-  // Updating the gap between editor and original
-
-  function drawConnectors(dv) {
-    if (!dv.showDifferences) return;
-
-    if (dv.svg) {
-      clear(dv.svg);
-      var w = dv.gap.offsetWidth;
-      attrs(dv.svg, "width", w, "height", dv.gap.offsetHeight);
-    }
-    clear(dv.copyButtons);
-
-    var flip = dv.type == "left";
-    var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
-    var sTopEdit = dv.edit.getScrollInfo().top, sTopOrig = dv.orig.getScrollInfo().top;
-    iterateChunks(dv.diff, function(topOrig, botOrig, topEdit, botEdit) {
-      if (topEdit > vpEdit.to || botEdit < vpEdit.from ||
-          topOrig > vpOrig.to || botOrig < vpOrig.from)
-        return;
-      var topLpx = dv.orig.heightAtLine(topOrig, "local") - sTopOrig, top = topLpx;
-      if (dv.svg) {
-        var topRpx = dv.edit.heightAtLine(topEdit, "local") - sTopEdit;
-        if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
-        var botLpx = dv.orig.heightAtLine(botOrig, "local") - sTopOrig;
-        var botRpx = dv.edit.heightAtLine(botEdit, "local") - sTopEdit;
-        if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
-        var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
-        var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
-        attrs(dv.svg.appendChild(document.createElementNS(svgNS, "path")),
-              "d", "M -1 " + topRpx + curveTop + " L " + (w + 2) + " " + botLpx + curveBot + " z",
-              "class", dv.classes.connect);
-      }
-      var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
-                                                "CodeMirror-merge-copy"));
-      copy.title = "Revert chunk";
-      copy.chunk = {topEdit: topEdit, botEdit: botEdit, topOrig: topOrig, botOrig: botOrig};
-      copy.style.top = top + "px";
-    });
-  }
-
-  function copyChunk(dv, chunk) {
-    if (dv.diffOutOfDate) return;
-    dv.edit.replaceRange(dv.orig.getRange(Pos(chunk.topOrig, 0), Pos(chunk.botOrig, 0)),
-                         Pos(chunk.topEdit, 0), Pos(chunk.botEdit, 0));
-  }
-
-  // Merge view, containing 0, 1, or 2 diff views.
-
-  var MergeView = CodeMirror.MergeView = function(node, options) {
-    if (!(this instanceof MergeView)) return new MergeView(node, options);
-
-    var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
-    var hasLeft = origLeft != null, hasRight = origRight != null;
-    var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
-    var wrap = [], left = this.left = null, right = this.right = null;
-
-    if (hasLeft) {
-      left = this.left = new DiffView(this, "left");
-      var leftPane = elt("div", null, "CodeMirror-merge-pane");
-      wrap.push(leftPane);
-      wrap.push(buildGap(left));
-    }
-
-    var editPane = elt("div", null, "CodeMirror-merge-pane");
-    wrap.push(editPane);
-
-    if (hasRight) {
-      right = this.right = new DiffView(this, "right");
-      wrap.push(buildGap(right));
-      var rightPane = elt("div", null, "CodeMirror-merge-pane");
-      wrap.push(rightPane);
-    }
-
-    (hasRight ? rightPane : editPane).className += " CodeMirror-merge-pane-rightmost";
-
-    wrap.push(elt("div", null, null, "height: 0; clear: both;"));
-    var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-merge CodeMirror-merge-" + panes + "pane"));
-    this.edit = CodeMirror(editPane, copyObj(options));
-
-    if (left) left.init(leftPane, origLeft, options);
-    if (right) right.init(rightPane, origRight, options);
-
-    var onResize = function() {
-      if (left) drawConnectors(left);
-      if (right) drawConnectors(right);
-    };
-    CodeMirror.on(window, "resize", onResize);
-    var resizeInterval = setInterval(function() {
-      for (var p = wrapElt.parentNode; p && p != document.body; p = p.parentNode) {}
-      if (!p) { clearInterval(resizeInterval); CodeMirror.off(window, "resize", onResize); }
-    }, 5000);
-  };
-
-  function buildGap(dv) {
-    var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
-    lock.title = "Toggle locked scrolling";
-    var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
-    CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
-    dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
-    CodeMirror.on(dv.copyButtons, "click", function(e) {
-      var node = e.target || e.srcElement;
-      if (node.chunk) copyChunk(dv, node.chunk);
-    });
-    var gapElts = [dv.copyButtons, lockWrap];
-    var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
-    if (svg && !svg.createSVGRect) svg = null;
-    dv.svg = svg;
-    if (svg) gapElts.push(svg);
-
-    return dv.gap = elt("div", gapElts, "CodeMirror-merge-gap");
-  }
-
-  MergeView.prototype = {
-    constuctor: MergeView,
-    editor: function() { return this.edit; },
-    rightOriginal: function() { return this.right && this.right.orig; },
-    leftOriginal: function() { return this.left && this.left.orig; },
-    setShowDifferences: function(val) {
-      if (this.right) this.right.setShowDifferences(val);
-      if (this.left) this.left.setShowDifferences(val);
-    }
-  };
-
-  // Operations on diffs
-
-  var dmp = new diff_match_patch();
-  function getDiff(a, b) {
-    var diff = dmp.diff_main(a, b);
-    dmp.diff_cleanupSemantic(diff);
-    // The library sometimes leaves in empty parts, which confuse the algorithm
-    for (var i = 0; i < diff.length; ++i) {
-      var part = diff[i];
-      if (!part[1]) {
-        diff.splice(i--, 1);
-      } else if (i && diff[i - 1][0] == part[0]) {
-        diff.splice(i--, 1);
-        diff[i][1] += part[1];
-      }
-    }
-    return diff;
-  }
-
-  function iterateChunks(diff, f) {
-    var startEdit = 0, startOrig = 0;
-    var edit = Pos(0, 0), orig = Pos(0, 0);
-    for (var i = 0; i < diff.length; ++i) {
-      var part = diff[i], tp = part[0];
-      if (tp == DIFF_EQUAL) {
-        var startOff = startOfLineClean(diff, i) ? 0 : 1;
-        var cleanFromEdit = edit.line + startOff, cleanFromOrig = orig.line + startOff;
-        moveOver(edit, part[1], null, orig);
-        var endOff = endOfLineClean(diff, i) ? 1 : 0;
-        var cleanToEdit = edit.line + endOff, cleanToOrig = orig.line + endOff;
-        if (cleanToEdit > cleanFromEdit) {
-          if (i) f(startOrig, cleanFromOrig, startEdit, cleanFromEdit);
-          startEdit = cleanToEdit; startOrig = cleanToOrig;
-        }
-      } else {
-        moveOver(tp == DIFF_INSERT ? edit : orig, part[1]);
-      }
-    }
-    if (startEdit <= edit.line || startOrig <= orig.line)
-      f(startOrig, orig.line + 1, startEdit, edit.line + 1);
-  }
-
-  function endOfLineClean(diff, i) {
-    if (i == diff.length - 1) return true;
-    var next = diff[i + 1][1];
-    if (next.length == 1 || next.charCodeAt(0) != 10) return false;
-    if (i == diff.length - 2) return true;
-    next = diff[i + 2][1];
-    return next.length > 1 && next.charCodeAt(0) == 10;
-  }
-
-  function startOfLineClean(diff, i) {
-    if (i == 0) return true;
-    var last = diff[i - 1][1];
-    if (last.charCodeAt(last.length - 1) != 10) return false;
-    if (i == 1) return true;
-    last = diff[i - 2][1];
-    return last.charCodeAt(last.length - 1) == 10;
-  }
-
-  function chunkBoundariesAround(diff, n, nInEdit) {
-    var beforeE, afterE, beforeO, afterO;
-    iterateChunks(diff, function(fromOrig, toOrig, fromEdit, toEdit) {
-      var fromLocal = nInEdit ? fromEdit : fromOrig;
-      var toLocal = nInEdit ? toEdit : toOrig;
-      if (afterE == null) {
-        if (fromLocal > n) { afterE = fromEdit; afterO = fromOrig; }
-        else if (toLocal > n) { afterE = toEdit; afterO = toOrig; }
-      }
-      if (toLocal <= n) { beforeE = toEdit; beforeO = toOrig; }
-      else if (fromLocal <= n) { beforeE = fromEdit; beforeO = fromOrig; }
-    });
-    return {edit: {before: beforeE, after: afterE}, orig: {before: beforeO, after: afterO}};
-  }
-
-  // General utilities
-
-  function elt(tag, content, className, style) {
-    var e = document.createElement(tag);
-    if (className) e.className = className;
-    if (style) e.style.cssText = style;
-    if (typeof content == "string") e.appendChild(document.createTextNode(content));
-    else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
-    return e;
-  }
-
-  function clear(node) {
-    for (var count = node.childNodes.length; count > 0; --count)
-      node.removeChild(node.firstChild);
-  }
-
-  function attrs(elt) {
-    for (var i = 1; i < arguments.length; i += 2)
-      elt.setAttribute(arguments[i], arguments[i+1]);
-  }
-
-  function copyObj(obj, target) {
-    if (!target) target = {};
-    for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
-    return target;
-  }
-
-  function moveOver(pos, str, copy, other) {
-    var out = copy ? Pos(pos.line, pos.ch) : pos, at = 0;
-    for (;;) {
-      var nl = str.indexOf("\n", at);
-      if (nl == -1) break;
-      ++out.line;
-      if (other) ++other.line;
-      at = nl + 1;
-    }
-    out.ch = (at ? 0 : out.ch) + (str.length - at);
-    if (other) other.ch = (at ? 0 : other.ch) + (str.length - at);
-    return out;
-  }
-
-  function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
-  function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
-  function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
-})();
diff --git a/resources/libs/codemirror/addon/mode/loadmode.js b/resources/libs/codemirror/addon/mode/loadmode.js
deleted file mode 100644
index 60fafbb17..000000000
--- a/resources/libs/codemirror/addon/mode/loadmode.js
+++ /dev/null
@@ -1,51 +0,0 @@
-(function() {
-  if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
-
-  var loading = {};
-  function splitCallback(cont, n) {
-    var countDown = n;
-    return function() { if (--countDown == 0) cont(); };
-  }
-  function ensureDeps(mode, cont) {
-    var deps = CodeMirror.modes[mode].dependencies;
-    if (!deps) return cont();
-    var missing = [];
-    for (var i = 0; i < deps.length; ++i) {
-      if (!CodeMirror.modes.hasOwnProperty(deps[i]))
-        missing.push(deps[i]);
-    }
-    if (!missing.length) return cont();
-    var split = splitCallback(cont, missing.length);
-    for (var i = 0; i < missing.length; ++i)
-      CodeMirror.requireMode(missing[i], split);
-  }
-
-  CodeMirror.requireMode = function(mode, cont) {
-    if (typeof mode != "string") mode = mode.name;
-    if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);
-    if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);
-
-    var script = document.createElement("script");
-    script.src = CodeMirror.modeURL.replace(/%N/g, mode);
-    var others = document.getElementsByTagName("script")[0];
-    others.parentNode.insertBefore(script, others);
-    var list = loading[mode] = [cont];
-    var count = 0, poll = setInterval(function() {
-      if (++count > 100) return clearInterval(poll);
-      if (CodeMirror.modes.hasOwnProperty(mode)) {
-        clearInterval(poll);
-        loading[mode] = null;
-        ensureDeps(mode, function() {
-          for (var i = 0; i < list.length; ++i) list[i]();
-        });
-      }
-    }, 200);
-  };
-
-  CodeMirror.autoLoadMode = function(instance, mode) {
-    if (!CodeMirror.modes.hasOwnProperty(mode))
-      CodeMirror.requireMode(mode, function() {
-        instance.setOption("mode", instance.getOption("mode"));
-      });
-  };
-}());
diff --git a/resources/libs/codemirror/addon/mode/multiplex.js b/resources/libs/codemirror/addon/mode/multiplex.js
deleted file mode 100644
index 32cc579c3..000000000
--- a/resources/libs/codemirror/addon/mode/multiplex.js
+++ /dev/null
@@ -1,101 +0,0 @@
-CodeMirror.multiplexingMode = function(outer /*, others */) {
-  // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
-  var others = Array.prototype.slice.call(arguments, 1);
-  var n_others = others.length;
-
-  function indexOf(string, pattern, from) {
-    if (typeof pattern == "string") return string.indexOf(pattern, from);
-    var m = pattern.exec(from ? string.slice(from) : string);
-    return m ? m.index + from : -1;
-  }
-
-  return {
-    startState: function() {
-      return {
-        outer: CodeMirror.startState(outer),
-        innerActive: null,
-        inner: null
-      };
-    },
-
-    copyState: function(state) {
-      return {
-        outer: CodeMirror.copyState(outer, state.outer),
-        innerActive: state.innerActive,
-        inner: state.innerActive && CodeMirror.copyState(state.innerActive.mode, state.inner)
-      };
-    },
-
-    token: function(stream, state) {
-      if (!state.innerActive) {
-        var cutOff = Infinity, oldContent = stream.string;
-        for (var i = 0; i < n_others; ++i) {
-          var other = others[i];
-          var found = indexOf(oldContent, other.open, stream.pos);
-          if (found == stream.pos) {
-            stream.match(other.open);
-            state.innerActive = other;
-            state.inner = CodeMirror.startState(other.mode, outer.indent ? outer.indent(state.outer, "") : 0);
-            return other.delimStyle;
-          } else if (found != -1 && found < cutOff) {
-            cutOff = found;
-          }
-        }
-        if (cutOff != Infinity) stream.string = oldContent.slice(0, cutOff);
-        var outerToken = outer.token(stream, state.outer);
-        if (cutOff != Infinity) stream.string = oldContent;
-        return outerToken;
-      } else {
-        var curInner = state.innerActive, oldContent = stream.string;
-        var found = indexOf(oldContent, curInner.close, stream.pos);
-        if (found == stream.pos) {
-          stream.match(curInner.close);
-          state.innerActive = state.inner = null;
-          return curInner.delimStyle;
-        }
-        if (found > -1) stream.string = oldContent.slice(0, found);
-        var innerToken = curInner.mode.token(stream, state.inner);
-        if (found > -1) stream.string = oldContent;
-        var cur = stream.current(), found = cur.indexOf(curInner.close);
-        if (found > -1) stream.backUp(cur.length - found);
-
-        if (curInner.innerStyle) {
-          if (innerToken) innerToken = innerToken + ' ' + curInner.innerStyle;
-          else innerToken = curInner.innerStyle;
-        }
-
-        return innerToken;
-      }
-    },
-
-    indent: function(state, textAfter) {
-      var mode = state.innerActive ? state.innerActive.mode : outer;
-      if (!mode.indent) return CodeMirror.Pass;
-      return mode.indent(state.innerActive ? state.inner : state.outer, textAfter);
-    },
-
-    blankLine: function(state) {
-      var mode = state.innerActive ? state.innerActive.mode : outer;
-      if (mode.blankLine) {
-        mode.blankLine(state.innerActive ? state.inner : state.outer);
-      }
-      if (!state.innerActive) {
-        for (var i = 0; i < n_others; ++i) {
-          var other = others[i];
-          if (other.open === "\n") {
-            state.innerActive = other;
-            state.inner = CodeMirror.startState(other.mode, mode.indent ? mode.indent(state.outer, "") : 0);
-          }
-        }
-      } else if (state.innerActive.close === "\n") {
-        state.innerActive = state.inner = null;
-      }
-    },
-
-    electricChars: outer.electricChars,
-
-    innerMode: function(state) {
-      return state.inner ? {state: state.inner, mode: state.innerActive.mode} : {state: state.outer, mode: outer};
-    }
-  };
-};
diff --git a/resources/libs/codemirror/addon/mode/multiplex_test.js b/resources/libs/codemirror/addon/mode/multiplex_test.js
deleted file mode 100644
index c0656357c..000000000
--- a/resources/libs/codemirror/addon/mode/multiplex_test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-(function() {
-  CodeMirror.defineMode("markdown_with_stex", function(){
-    var inner = CodeMirror.getMode({}, "stex");
-    var outer = CodeMirror.getMode({}, "markdown");
-
-    var innerOptions = {
-      open: '$',
-      close: '$',
-      mode: inner,
-      delimStyle: 'delim',
-      innerStyle: 'inner'
-    };
-
-    return CodeMirror.multiplexingMode(outer, innerOptions);
-  });
-
-  var mode = CodeMirror.getMode({}, "markdown_with_stex");
-
-  function MT(name) {
-    test.mode(
-      name,
-      mode,
-      Array.prototype.slice.call(arguments, 1),
-      'multiplexing');
-  }
-
-  MT(
-    "stexInsideMarkdown",
-    "[strong **Equation:**] [delim $][inner&tag \\pi][delim $]");
-})();
diff --git a/resources/libs/codemirror/addon/mode/overlay.js b/resources/libs/codemirror/addon/mode/overlay.js
deleted file mode 100644
index b7928a7bb..000000000
--- a/resources/libs/codemirror/addon/mode/overlay.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Utility function that allows modes to be combined. The mode given
-// as the base argument takes care of most of the normal mode
-// functionality, but a second (typically simple) mode is used, which
-// can override the style of text. Both modes get to parse all of the
-// text, but when both assign a non-null style to a piece of code, the
-// overlay wins, unless the combine argument was true, in which case
-// the styles are combined.
-
-// overlayParser is the old, deprecated name
-CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, combine) {
-  return {
-    startState: function() {
-      return {
-        base: CodeMirror.startState(base),
-        overlay: CodeMirror.startState(overlay),
-        basePos: 0, baseCur: null,
-        overlayPos: 0, overlayCur: null
-      };
-    },
-    copyState: function(state) {
-      return {
-        base: CodeMirror.copyState(base, state.base),
-        overlay: CodeMirror.copyState(overlay, state.overlay),
-        basePos: state.basePos, baseCur: null,
-        overlayPos: state.overlayPos, overlayCur: null
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.start == state.basePos) {
-        state.baseCur = base.token(stream, state.base);
-        state.basePos = stream.pos;
-      }
-      if (stream.start == state.overlayPos) {
-        stream.pos = stream.start;
-        state.overlayCur = overlay.token(stream, state.overlay);
-        state.overlayPos = stream.pos;
-      }
-      stream.pos = Math.min(state.basePos, state.overlayPos);
-      if (stream.eol()) state.basePos = state.overlayPos = 0;
-
-      if (state.overlayCur == null) return state.baseCur;
-      if (state.baseCur != null && combine) return state.baseCur + " " + state.overlayCur;
-      else return state.overlayCur;
-    },
-
-    indent: base.indent && function(state, textAfter) {
-      return base.indent(state.base, textAfter);
-    },
-    electricChars: base.electricChars,
-
-    innerMode: function(state) { return {state: state.base, mode: base}; },
-
-    blankLine: function(state) {
-      if (base.blankLine) base.blankLine(state.base);
-      if (overlay.blankLine) overlay.blankLine(state.overlay);
-    }
-  };
-};
diff --git a/resources/libs/codemirror/addon/runmode/colorize.js b/resources/libs/codemirror/addon/runmode/colorize.js
deleted file mode 100644
index 62286d21e..000000000
--- a/resources/libs/codemirror/addon/runmode/colorize.js
+++ /dev/null
@@ -1,29 +0,0 @@
-CodeMirror.colorize = (function() {
-
-  var isBlock = /^(p|li|div|h\\d|pre|blockquote|td)$/;
-
-  function textContent(node, out) {
-    if (node.nodeType == 3) return out.push(node.nodeValue);
-    for (var ch = node.firstChild; ch; ch = ch.nextSibling) {
-      textContent(ch, out);
-      if (isBlock.test(node.nodeType)) out.push("\n");
-    }
-  }
-
-  return function(collection, defaultMode) {
-    if (!collection) collection = document.body.getElementsByTagName("pre");
-
-    for (var i = 0; i < collection.length; ++i) {
-      var node = collection[i];
-      var mode = node.getAttribute("data-lang") || defaultMode;
-      if (!mode) continue;
-
-      var text = [];
-      textContent(node, text);
-      node.innerHTML = "";
-      CodeMirror.runMode(text.join(""), mode, node);
-
-      node.className += " cm-s-default";
-    }
-  };
-})();
diff --git a/resources/libs/codemirror/addon/runmode/runmode-standalone.js b/resources/libs/codemirror/addon/runmode/runmode-standalone.js
deleted file mode 100644
index d117166c9..000000000
--- a/resources/libs/codemirror/addon/runmode/runmode-standalone.js
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Just enough of CodeMirror to run runMode under node.js */
-
-window.CodeMirror = {};
-
-(function() {
-"use strict";
-
-function splitLines(string){ return string.split(/\r?\n|\r/); };
-
-function StringStream(string) {
-  this.pos = this.start = 0;
-  this.string = string;
-}
-StringStream.prototype = {
-  eol: function() {return this.pos >= this.string.length;},
-  sol: function() {return this.pos == 0;},
-  peek: function() {return this.string.charAt(this.pos) || null;},
-  next: function() {
-    if (this.pos < this.string.length)
-      return this.string.charAt(this.pos++);
-  },
-  eat: function(match) {
-    var ch = this.string.charAt(this.pos);
-    if (typeof match == "string") var ok = ch == match;
-    else var ok = ch && (match.test ? match.test(ch) : match(ch));
-    if (ok) {++this.pos; return ch;}
-  },
-  eatWhile: function(match) {
-    var start = this.pos;
-    while (this.eat(match)){}
-    return this.pos > start;
-  },
-  eatSpace: function() {
-    var start = this.pos;
-    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-    return this.pos > start;
-  },
-  skipToEnd: function() {this.pos = this.string.length;},
-  skipTo: function(ch) {
-    var found = this.string.indexOf(ch, this.pos);
-    if (found > -1) {this.pos = found; return true;}
-  },
-  backUp: function(n) {this.pos -= n;},
-  column: function() {return this.start;},
-  indentation: function() {return 0;},
-  match: function(pattern, consume, caseInsensitive) {
-    if (typeof pattern == "string") {
-      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-      var substr = this.string.substr(this.pos, pattern.length);
-      if (cased(substr) == cased(pattern)) {
-        if (consume !== false) this.pos += pattern.length;
-        return true;
-      }
-    } else {
-      var match = this.string.slice(this.pos).match(pattern);
-      if (match && match.index > 0) return null;
-      if (match && consume !== false) this.pos += match[0].length;
-      return match;
-    }
-  },
-  current: function(){return this.string.slice(this.start, this.pos);}
-};
-CodeMirror.StringStream = StringStream;
-
-CodeMirror.startState = function (mode, a1, a2) {
-  return mode.startState ? mode.startState(a1, a2) : true;
-};
-
-var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-CodeMirror.defineMode = function (name, mode) { modes[name] = mode; };
-CodeMirror.defineMIME = function (mime, spec) { mimeModes[mime] = spec; };
-CodeMirror.getMode = function (options, spec) {
-  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec))
-    spec = mimeModes[spec];
-  if (typeof spec == "string")
-    var mname = spec, config = {};
-  else if (spec != null)
-    var mname = spec.name, config = spec;
-  var mfactory = modes[mname];
-  if (!mfactory) throw new Error("Unknown mode: " + spec);
-  return mfactory(options, config || {});
-};
-
-CodeMirror.runMode = function (string, modespec, callback, options) {
-  var mode = CodeMirror.getMode({ indentUnit: 2 }, modespec);
-
-  if (callback.nodeType == 1) {
-    var tabSize = (options && options.tabSize) || 4;
-    var node = callback, col = 0;
-    node.innerHTML = "";
-    callback = function (text, style) {
-      if (text == "\n") {
-        node.appendChild(document.createElement("br"));
-        col = 0;
-        return;
-      }
-      var content = "";
-      // replace tabs
-      for (var pos = 0; ;) {
-        var idx = text.indexOf("\t", pos);
-        if (idx == -1) {
-          content += text.slice(pos);
-          col += text.length - pos;
-          break;
-        } else {
-          col += idx - pos;
-          content += text.slice(pos, idx);
-          var size = tabSize - col % tabSize;
-          col += size;
-          for (var i = 0; i < size; ++i) content += " ";
-          pos = idx + 1;
-        }
-      }
-
-      if (style) {
-        var sp = node.appendChild(document.createElement("span"));
-        sp.className = "cm-" + style.replace(/ +/g, " cm-");
-        sp.appendChild(document.createTextNode(content));
-      } else {
-        node.appendChild(document.createTextNode(content));
-      }
-    };
-  }
-
-  var lines = splitLines(string), state = CodeMirror.startState(mode);
-  for (var i = 0, e = lines.length; i < e; ++i) {
-    if (i) callback("\n");
-    var stream = new CodeMirror.StringStream(lines[i]);
-    while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
-      stream.start = stream.pos;
-    }
-  }
-};
-})();
diff --git a/resources/libs/codemirror/addon/runmode/runmode.js b/resources/libs/codemirror/addon/runmode/runmode.js
deleted file mode 100644
index 7aafa2ad8..000000000
--- a/resources/libs/codemirror/addon/runmode/runmode.js
+++ /dev/null
@@ -1,56 +0,0 @@
-CodeMirror.runMode = function(string, modespec, callback, options) {
-  var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);
-  var ie = /MSIE \d/.test(navigator.userAgent);
-  var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
-
-  if (callback.nodeType == 1) {
-    var tabSize = (options && options.tabSize) || CodeMirror.defaults.tabSize;
-    var node = callback, col = 0;
-    node.innerHTML = "";
-    callback = function(text, style) {
-      if (text == "\n") {
-        // Emitting LF or CRLF on IE8 or earlier results in an incorrect display.
-        // Emitting a carriage return makes everything ok.
-        node.appendChild(document.createTextNode(ie_lt9 ? '\r' : text));
-        col = 0;
-        return;
-      }
-      var content = "";
-      // replace tabs
-      for (var pos = 0;;) {
-        var idx = text.indexOf("\t", pos);
-        if (idx == -1) {
-          content += text.slice(pos);
-          col += text.length - pos;
-          break;
-        } else {
-          col += idx - pos;
-          content += text.slice(pos, idx);
-          var size = tabSize - col % tabSize;
-          col += size;
-          for (var i = 0; i < size; ++i) content += " ";
-          pos = idx + 1;
-        }
-      }
-
-      if (style) {
-        var sp = node.appendChild(document.createElement("span"));
-        sp.className = "cm-" + style.replace(/ +/g, " cm-");
-        sp.appendChild(document.createTextNode(content));
-      } else {
-        node.appendChild(document.createTextNode(content));
-      }
-    };
-  }
-
-  var lines = CodeMirror.splitLines(string), state = CodeMirror.startState(mode);
-  for (var i = 0, e = lines.length; i < e; ++i) {
-    if (i) callback("\n");
-    var stream = new CodeMirror.StringStream(lines[i]);
-    while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
-      stream.start = stream.pos;
-    }
-  }
-};
diff --git a/resources/libs/codemirror/addon/runmode/runmode.node.js b/resources/libs/codemirror/addon/runmode/runmode.node.js
deleted file mode 100644
index 0f1088fa2..000000000
--- a/resources/libs/codemirror/addon/runmode/runmode.node.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Just enough of CodeMirror to run runMode under node.js */
-
-function splitLines(string){ return string.split(/\r?\n|\r/); };
-
-function StringStream(string) {
-  this.pos = this.start = 0;
-  this.string = string;
-}
-StringStream.prototype = {
-  eol: function() {return this.pos >= this.string.length;},
-  sol: function() {return this.pos == 0;},
-  peek: function() {return this.string.charAt(this.pos) || null;},
-  next: function() {
-    if (this.pos < this.string.length)
-      return this.string.charAt(this.pos++);
-  },
-  eat: function(match) {
-    var ch = this.string.charAt(this.pos);
-    if (typeof match == "string") var ok = ch == match;
-    else var ok = ch && (match.test ? match.test(ch) : match(ch));
-    if (ok) {++this.pos; return ch;}
-  },
-  eatWhile: function(match) {
-    var start = this.pos;
-    while (this.eat(match)){}
-    return this.pos > start;
-  },
-  eatSpace: function() {
-    var start = this.pos;
-    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-    return this.pos > start;
-  },
-  skipToEnd: function() {this.pos = this.string.length;},
-  skipTo: function(ch) {
-    var found = this.string.indexOf(ch, this.pos);
-    if (found > -1) {this.pos = found; return true;}
-  },
-  backUp: function(n) {this.pos -= n;},
-  column: function() {return this.start;},
-  indentation: function() {return 0;},
-  match: function(pattern, consume, caseInsensitive) {
-    if (typeof pattern == "string") {
-      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-      var substr = this.string.substr(this.pos, pattern.length);
-      if (cased(substr) == cased(pattern)) {
-        if (consume !== false) this.pos += pattern.length;
-        return true;
-      }
-    } else {
-      var match = this.string.slice(this.pos).match(pattern);
-      if (match && match.index > 0) return null;
-      if (match && consume !== false) this.pos += match[0].length;
-      return match;
-    }
-  },
-  current: function(){return this.string.slice(this.start, this.pos);}
-};
-exports.StringStream = StringStream;
-
-exports.startState = function(mode, a1, a2) {
-  return mode.startState ? mode.startState(a1, a2) : true;
-};
-
-var modes = exports.modes = {}, mimeModes = exports.mimeModes = {};
-exports.defineMode = function(name, mode) {
-  if (arguments.length > 2) {
-    mode.dependencies = [];
-    for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
-  }
-  modes[name] = mode;
-};
-exports.defineMIME = function(mime, spec) { mimeModes[mime] = spec; };
-
-exports.defineMode("null", function() {
-  return {token: function(stream) {stream.skipToEnd();}};
-});
-exports.defineMIME("text/plain", "null");
-
-exports.getMode = function(options, spec) {
-  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec))
-    spec = mimeModes[spec];
-  if (typeof spec == "string")
-    var mname = spec, config = {};
-  else if (spec != null)
-    var mname = spec.name, config = spec;
-  var mfactory = modes[mname];
-  if (!mfactory) throw new Error("Unknown mode: " + spec);
-  return mfactory(options, config || {});
-};
-
-exports.runMode = function(string, modespec, callback) {
-  var mode = exports.getMode({indentUnit: 2}, modespec);
-  var lines = splitLines(string), state = exports.startState(mode);
-  for (var i = 0, e = lines.length; i < e; ++i) {
-    if (i) callback("\n");
-    var stream = new exports.StringStream(lines[i]);
-    while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
-      stream.start = stream.pos;
-    }
-  }
-};
diff --git a/resources/libs/codemirror/addon/scroll/scrollpastend.js b/resources/libs/codemirror/addon/scroll/scrollpastend.js
deleted file mode 100644
index 14d7d5aee..000000000
--- a/resources/libs/codemirror/addon/scroll/scrollpastend.js
+++ /dev/null
@@ -1,34 +0,0 @@
-(function() {
-  "use strict";
-
-  CodeMirror.defineOption("scrollPastEnd", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      cm.off("change", onChange);
-      cm.display.lineSpace.parentNode.style.paddingBottom = "";
-      cm.state.scrollPastEndPadding = null;
-    }
-    if (val) {
-      cm.on("change", onChange);
-      updateBottomMargin(cm);
-    }
-  });
-
-  function onChange(cm, change) {
-    if (CodeMirror.changeEnd(change).line == cm.lastLine())
-      updateBottomMargin(cm);
-  }
-
-  function updateBottomMargin(cm) {
-    var padding = "";
-    if (cm.lineCount() > 1) {
-      var totalH = cm.display.scroller.clientHeight - 30,
-          lastLineH = cm.getLineHandle(cm.lastLine()).height;
-      padding = (totalH - lastLineH) + "px";
-    }
-    if (cm.state.scrollPastEndPadding != padding) {
-      cm.state.scrollPastEndPadding = padding;
-      cm.display.lineSpace.parentNode.style.paddingBottom = padding;
-      cm.setSize();
-    }
-  }
-})();
diff --git a/resources/libs/codemirror/addon/search/match-highlighter.js b/resources/libs/codemirror/addon/search/match-highlighter.js
deleted file mode 100644
index e5cbeacab..000000000
--- a/resources/libs/codemirror/addon/search/match-highlighter.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Highlighting text that matches the selection
-//
-// Defines an option highlightSelectionMatches, which, when enabled,
-// will style strings that match the selection throughout the
-// document.
-//
-// The option can be set to true to simply enable it, or to a
-// {minChars, style, showToken} object to explicitly configure it.
-// minChars is the minimum amount of characters that should be
-// selected for the behavior to occur, and style is the token style to
-// apply to the matches. This will be prefixed by "cm-" to create an
-// actual CSS class name. showToken, when enabled, will cause the
-// current token to be highlighted when nothing is selected.
-
-(function() {
-  var DEFAULT_MIN_CHARS = 2;
-  var DEFAULT_TOKEN_STYLE = "matchhighlight";
-  var DEFAULT_DELAY = 100;
-
-  function State(options) {
-    if (typeof options == "object") {
-      this.minChars = options.minChars;
-      this.style = options.style;
-      this.showToken = options.showToken;
-      this.delay = options.delay;
-    }
-    if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
-    if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
-    if (this.delay == null) this.delay = DEFAULT_DELAY;
-    this.overlay = this.timeout = null;
-  }
-
-  CodeMirror.defineOption("highlightSelectionMatches", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      var over = cm.state.matchHighlighter.overlay;
-      if (over) cm.removeOverlay(over);
-      clearTimeout(cm.state.matchHighlighter.timeout);
-      cm.state.matchHighlighter = null;
-      cm.off("cursorActivity", cursorActivity);
-    }
-    if (val) {
-      cm.state.matchHighlighter = new State(val);
-      highlightMatches(cm);
-      cm.on("cursorActivity", cursorActivity);
-    }
-  });
-
-  function cursorActivity(cm) {
-    var state = cm.state.matchHighlighter;
-    clearTimeout(state.timeout);
-    state.timeout = setTimeout(function() {highlightMatches(cm);}, state.delay);
-  }
-
-  function highlightMatches(cm) {
-    cm.operation(function() {
-      var state = cm.state.matchHighlighter;
-      if (state.overlay) {
-        cm.removeOverlay(state.overlay);
-        state.overlay = null;
-      }
-      if (!cm.somethingSelected() && state.showToken) {
-        var re = state.showToken === true ? /[\w$]/ : state.showToken;
-        var cur = cm.getCursor(), line = cm.getLine(cur.line), start = cur.ch, end = start;
-        while (start && re.test(line.charAt(start - 1))) --start;
-        while (end < line.length && re.test(line.charAt(end))) ++end;
-        if (start < end)
-          cm.addOverlay(state.overlay = makeOverlay(line.slice(start, end), re, state.style));
-        return;
-      }
-      if (cm.getCursor("head").line != cm.getCursor("anchor").line) return;
-      var selection = cm.getSelection().replace(/^\s+|\s+$/g, "");
-      if (selection.length >= state.minChars)
-        cm.addOverlay(state.overlay = makeOverlay(selection, false, state.style));
-    });
-  }
-
-  function boundariesAround(stream, re) {
-    return (!stream.start || !re.test(stream.string.charAt(stream.start - 1))) &&
-      (stream.pos == stream.string.length || !re.test(stream.string.charAt(stream.pos)));
-  }
-
-  function makeOverlay(query, hasBoundary, style) {
-    return {token: function(stream) {
-      if (stream.match(query) &&
-          (!hasBoundary || boundariesAround(stream, hasBoundary)))
-        return style;
-      stream.next();
-      stream.skipTo(query.charAt(0)) || stream.skipToEnd();
-    }};
-  }
-})();
diff --git a/resources/libs/codemirror/addon/search/search.js b/resources/libs/codemirror/addon/search/search.js
deleted file mode 100644
index 71ed75b50..000000000
--- a/resources/libs/codemirror/addon/search/search.js
+++ /dev/null
@@ -1,133 +0,0 @@
-// Define search commands. Depends on dialog.js or another
-// implementation of the openDialog method.
-
-// Replace works a little oddly -- it will do the replace on the next
-// Ctrl-G (or whatever is bound to findNext) press. You prevent a
-// replace by making sure the match is no longer selected when hitting
-// Ctrl-G.
-
-(function() {
-  function searchOverlay(query) {
-    if (typeof query == "string") return {token: function(stream) {
-      if (stream.match(query)) return "searching";
-      stream.next();
-      stream.skipTo(query.charAt(0)) || stream.skipToEnd();
-    }};
-    return {token: function(stream) {
-      if (stream.match(query)) return "searching";
-      while (!stream.eol()) {
-        stream.next();
-        if (stream.match(query, false)) break;
-      }
-    }};
-  }
-
-  function SearchState() {
-    this.posFrom = this.posTo = this.query = null;
-    this.overlay = null;
-  }
-  function getSearchState(cm) {
-    return cm.state.search || (cm.state.search = new SearchState());
-  }
-  function getSearchCursor(cm, query, pos) {
-    // Heuristic: if the query string is all lowercase, do a case insensitive search.
-    return cm.getSearchCursor(query, pos, typeof query == "string" && query == query.toLowerCase());
-  }
-  function dialog(cm, text, shortText, f) {
-    if (cm.openDialog) cm.openDialog(text, f);
-    else f(prompt(shortText, ""));
-  }
-  function confirmDialog(cm, text, shortText, fs) {
-    if (cm.openConfirm) cm.openConfirm(text, fs);
-    else if (confirm(shortText)) fs[0]();
-  }
-  function parseQuery(query) {
-    var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
-    return isRE ? new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i") : query;
-  }
-  var queryDialog =
-    'Search: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp search)</span>';
-  function doSearch(cm, rev) {
-    var state = getSearchState(cm);
-    if (state.query) return findNext(cm, rev);
-    dialog(cm, queryDialog, "Search for:", function(query) {
-      cm.operation(function() {
-        if (!query || state.query) return;
-        state.query = parseQuery(query);
-        cm.removeOverlay(state.overlay);
-        state.overlay = searchOverlay(state.query);
-        cm.addOverlay(state.overlay);
-        state.posFrom = state.posTo = cm.getCursor();
-        findNext(cm, rev);
-      });
-    });
-  }
-  function findNext(cm, rev) {cm.operation(function() {
-    var state = getSearchState(cm);
-    var cursor = getSearchCursor(cm, state.query, rev ? state.posFrom : state.posTo);
-    if (!cursor.find(rev)) {
-      cursor = getSearchCursor(cm, state.query, rev ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(cm.firstLine(), 0));
-      if (!cursor.find(rev)) return;
-    }
-    cm.setSelection(cursor.from(), cursor.to());
-    cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
-    state.posFrom = cursor.from(); state.posTo = cursor.to();
-  });}
-  function clearSearch(cm) {cm.operation(function() {
-    var state = getSearchState(cm);
-    if (!state.query) return;
-    state.query = null;
-    cm.removeOverlay(state.overlay);
-  });}
-
-  var replaceQueryDialog =
-    'Replace: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp search)</span>';
-  var replacementQueryDialog = 'With: <input type="text" style="width: 10em"/>';
-  var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>Stop</button>";
-  function replace(cm, all) {
-    dialog(cm, replaceQueryDialog, "Replace:", function(query) {
-      if (!query) return;
-      query = parseQuery(query);
-      dialog(cm, replacementQueryDialog, "Replace with:", function(text) {
-        if (all) {
-          cm.operation(function() {
-            for (var cursor = getSearchCursor(cm, query); cursor.findNext();) {
-              if (typeof query != "string") {
-                var match = cm.getRange(cursor.from(), cursor.to()).match(query);
-                cursor.replace(text.replace(/\$(\d)/, function(_, i) {return match[i];}));
-              } else cursor.replace(text);
-            }
-          });
-        } else {
-          clearSearch(cm);
-          var cursor = getSearchCursor(cm, query, cm.getCursor());
-          var advance = function() {
-            var start = cursor.from(), match;
-            if (!(match = cursor.findNext())) {
-              cursor = getSearchCursor(cm, query);
-              if (!(match = cursor.findNext()) ||
-                  (start && cursor.from().line == start.line && cursor.from().ch == start.ch)) return;
-            }
-            cm.setSelection(cursor.from(), cursor.to());
-            cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
-            confirmDialog(cm, doReplaceConfirm, "Replace?",
-                          [function() {doReplace(match);}, advance]);
-          };
-          var doReplace = function(match) {
-            cursor.replace(typeof query == "string" ? text :
-                           text.replace(/\$(\d)/, function(_, i) {return match[i];}));
-            advance();
-          };
-          advance();
-        }
-      });
-    });
-  }
-
-  CodeMirror.commands.find = function(cm) {clearSearch(cm); doSearch(cm);};
-  CodeMirror.commands.findNext = doSearch;
-  CodeMirror.commands.findPrev = function(cm) {doSearch(cm, true);};
-  CodeMirror.commands.clearSearch = clearSearch;
-  CodeMirror.commands.replace = replace;
-  CodeMirror.commands.replaceAll = function(cm) {replace(cm, true);};
-})();
diff --git a/resources/libs/codemirror/addon/search/searchcursor.js b/resources/libs/codemirror/addon/search/searchcursor.js
deleted file mode 100644
index c034d5865..000000000
--- a/resources/libs/codemirror/addon/search/searchcursor.js
+++ /dev/null
@@ -1,143 +0,0 @@
-(function(){
-  var Pos = CodeMirror.Pos;
-
-  function SearchCursor(doc, query, pos, caseFold) {
-    this.atOccurrence = false; this.doc = doc;
-    if (caseFold == null && typeof query == "string") caseFold = false;
-
-    pos = pos ? doc.clipPos(pos) : Pos(0, 0);
-    this.pos = {from: pos, to: pos};
-
-    // The matches method is filled in based on the type of query.
-    // It takes a position and a direction, and returns an object
-    // describing the next occurrence of the query, or null if no
-    // more matches were found.
-    if (typeof query != "string") { // Regexp match
-      if (!query.global) query = new RegExp(query.source, query.ignoreCase ? "ig" : "g");
-      this.matches = function(reverse, pos) {
-        if (reverse) {
-          query.lastIndex = 0;
-          var line = doc.getLine(pos.line).slice(0, pos.ch), cutOff = 0, match, start;
-          for (;;) {
-            query.lastIndex = cutOff;
-            var newMatch = query.exec(line);
-            if (!newMatch) break;
-            match = newMatch;
-            start = match.index;
-            cutOff = match.index + (match[0].length || 1);
-            if (cutOff == line.length) break;
-          }
-          var matchLen = (match && match[0].length) || 0;
-          if (!matchLen) {
-            if (start == 0 && line.length == 0) {match = undefined;}
-            else if (start != doc.getLine(pos.line).length) {
-              matchLen++;
-            }
-          }
-        } else {
-          query.lastIndex = pos.ch;
-          var line = doc.getLine(pos.line), match = query.exec(line);
-          var matchLen = (match && match[0].length) || 0;
-          var start = match && match.index;
-          if (start + matchLen != line.length && !matchLen) matchLen = 1;
-        }
-        if (match && matchLen)
-          return {from: Pos(pos.line, start),
-                  to: Pos(pos.line, start + matchLen),
-                  match: match};
-      };
-    } else { // String query
-      if (caseFold) query = query.toLowerCase();
-      var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
-      var target = query.split("\n");
-      // Different methods for single-line and multi-line queries
-      if (target.length == 1) {
-        if (!query.length) {
-          // Empty string would match anything and never progress, so
-          // we define it to match nothing instead.
-          this.matches = function() {};
-        } else {
-          this.matches = function(reverse, pos) {
-            var line = fold(doc.getLine(pos.line)), len = query.length, match;
-            if (reverse ? (pos.ch >= len && (match = line.lastIndexOf(query, pos.ch - len)) != -1)
-                        : (match = line.indexOf(query, pos.ch)) != -1)
-              return {from: Pos(pos.line, match),
-                      to: Pos(pos.line, match + len)};
-          };
-        }
-      } else {
-        this.matches = function(reverse, pos) {
-          var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(doc.getLine(ln));
-          var offsetA = (reverse ? line.indexOf(match) + match.length : line.lastIndexOf(match));
-          if (reverse ? offsetA > pos.ch || offsetA != match.length
-              : offsetA < pos.ch || offsetA != line.length - match.length)
-            return;
-          for (;;) {
-            if (reverse ? !ln : ln == doc.lineCount() - 1) return;
-            line = fold(doc.getLine(ln += reverse ? -1 : 1));
-            match = target[reverse ? --idx : ++idx];
-            if (idx > 0 && idx < target.length - 1) {
-              if (line != match) return;
-              else continue;
-            }
-            var offsetB = (reverse ? line.lastIndexOf(match) : line.indexOf(match) + match.length);
-            if (reverse ? offsetB != line.length - match.length : offsetB != match.length)
-              return;
-            var start = Pos(pos.line, offsetA), end = Pos(ln, offsetB);
-            return {from: reverse ? end : start, to: reverse ? start : end};
-          }
-        };
-      }
-    }
-  }
-
-  SearchCursor.prototype = {
-    findNext: function() {return this.find(false);},
-    findPrevious: function() {return this.find(true);},
-
-    find: function(reverse) {
-      var self = this, pos = this.doc.clipPos(reverse ? this.pos.from : this.pos.to);
-      function savePosAndFail(line) {
-        var pos = Pos(line, 0);
-        self.pos = {from: pos, to: pos};
-        self.atOccurrence = false;
-        return false;
-      }
-
-      for (;;) {
-        if (this.pos = this.matches(reverse, pos)) {
-          if (!this.pos.from || !this.pos.to) { console.log(this.matches, this.pos); }
-          this.atOccurrence = true;
-          return this.pos.match || true;
-        }
-        if (reverse) {
-          if (!pos.line) return savePosAndFail(0);
-          pos = Pos(pos.line-1, this.doc.getLine(pos.line-1).length);
-        }
-        else {
-          var maxLine = this.doc.lineCount();
-          if (pos.line == maxLine - 1) return savePosAndFail(maxLine);
-          pos = Pos(pos.line + 1, 0);
-        }
-      }
-    },
-
-    from: function() {if (this.atOccurrence) return this.pos.from;},
-    to: function() {if (this.atOccurrence) return this.pos.to;},
-
-    replace: function(newText) {
-      if (!this.atOccurrence) return;
-      var lines = CodeMirror.splitLines(newText);
-      this.doc.replaceRange(lines, this.pos.from, this.pos.to);
-      this.pos.to = Pos(this.pos.from.line + lines.length - 1,
-                        lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0));
-    }
-  };
-
-  CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this.doc, query, pos, caseFold);
-  });
-  CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this, query, pos, caseFold);
-  });
-})();
diff --git a/resources/libs/codemirror/addon/selection/active-line.js b/resources/libs/codemirror/addon/selection/active-line.js
deleted file mode 100644
index e50508653..000000000
--- a/resources/libs/codemirror/addon/selection/active-line.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Because sometimes you need to style the cursor's line.
-//
-// Adds an option 'styleActiveLine' which, when enabled, gives the
-// active line's wrapping <div> the CSS class "CodeMirror-activeline",
-// and gives its background <div> the class "CodeMirror-activeline-background".
-
-(function() {
-  "use strict";
-  var WRAP_CLASS = "CodeMirror-activeline";
-  var BACK_CLASS = "CodeMirror-activeline-background";
-
-  CodeMirror.defineOption("styleActiveLine", false, function(cm, val, old) {
-    var prev = old && old != CodeMirror.Init;
-    if (val && !prev) {
-      updateActiveLine(cm);
-      cm.on("cursorActivity", updateActiveLine);
-    } else if (!val && prev) {
-      cm.off("cursorActivity", updateActiveLine);
-      clearActiveLine(cm);
-      delete cm.state.activeLine;
-    }
-  });
-
-  function clearActiveLine(cm) {
-    if ("activeLine" in cm.state) {
-      cm.removeLineClass(cm.state.activeLine, "wrap", WRAP_CLASS);
-      cm.removeLineClass(cm.state.activeLine, "background", BACK_CLASS);
-    }
-  }
-
-  function updateActiveLine(cm) {
-    var line = cm.getLineHandleVisualStart(cm.getCursor().line);
-    if (cm.state.activeLine == line) return;
-    clearActiveLine(cm);
-    cm.addLineClass(line, "wrap", WRAP_CLASS);
-    cm.addLineClass(line, "background", BACK_CLASS);
-    cm.state.activeLine = line;
-  }
-})();
diff --git a/resources/libs/codemirror/addon/selection/mark-selection.js b/resources/libs/codemirror/addon/selection/mark-selection.js
deleted file mode 100644
index c97776e49..000000000
--- a/resources/libs/codemirror/addon/selection/mark-selection.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// Because sometimes you need to mark the selected *text*.
-//
-// Adds an option 'styleSelectedText' which, when enabled, gives
-// selected text the CSS class given as option value, or
-// "CodeMirror-selectedtext" when the value is not a string.
-
-(function() {
-  "use strict";
-
-  CodeMirror.defineOption("styleSelectedText", false, function(cm, val, old) {
-    var prev = old && old != CodeMirror.Init;
-    if (val && !prev) {
-      cm.state.markedSelection = [];
-      cm.state.markedSelectionStyle = typeof val == "string" ? val : "CodeMirror-selectedtext";
-      reset(cm);
-      cm.on("cursorActivity", onCursorActivity);
-      cm.on("change", onChange);
-    } else if (!val && prev) {
-      cm.off("cursorActivity", onCursorActivity);
-      cm.off("change", onChange);
-      clear(cm);
-      cm.state.markedSelection = cm.state.markedSelectionStyle = null;
-    }
-  });
-
-  function onCursorActivity(cm) {
-    cm.operation(function() { update(cm); });
-  }
-
-  function onChange(cm) {
-    if (cm.state.markedSelection.length)
-      cm.operation(function() { clear(cm); });
-  }
-
-  var CHUNK_SIZE = 8;
-  var Pos = CodeMirror.Pos;
-
-  function cmp(pos1, pos2) {
-    return pos1.line - pos2.line || pos1.ch - pos2.ch;
-  }
-
-  function coverRange(cm, from, to, addAt) {
-    if (cmp(from, to) == 0) return;
-    var array = cm.state.markedSelection;
-    var cls = cm.state.markedSelectionStyle;
-    for (var line = from.line;;) {
-      var start = line == from.line ? from : Pos(line, 0);
-      var endLine = line + CHUNK_SIZE, atEnd = endLine >= to.line;
-      var end = atEnd ? to : Pos(endLine, 0);
-      var mark = cm.markText(start, end, {className: cls});
-      if (addAt == null) array.push(mark);
-      else array.splice(addAt++, 0, mark);
-      if (atEnd) break;
-      line = endLine;
-    }
-  }
-
-  function clear(cm) {
-    var array = cm.state.markedSelection;
-    for (var i = 0; i < array.length; ++i) array[i].clear();
-    array.length = 0;
-  }
-
-  function reset(cm) {
-    clear(cm);
-    var from = cm.getCursor("start"), to = cm.getCursor("end");
-    coverRange(cm, from, to);
-  }
-
-  function update(cm) {
-    var from = cm.getCursor("start"), to = cm.getCursor("end");
-    if (cmp(from, to) == 0) return clear(cm);
-
-    var array = cm.state.markedSelection;
-    if (!array.length) return coverRange(cm, from, to);
-
-    var coverStart = array[0].find(), coverEnd = array[array.length - 1].find();
-    if (!coverStart || !coverEnd || to.line - from.line < CHUNK_SIZE ||
-        cmp(from, coverEnd.to) >= 0 || cmp(to, coverStart.from) <= 0)
-      return reset(cm);
-
-    while (cmp(from, coverStart.from) > 0) {
-      array.shift().clear();
-      coverStart = array[0].find();
-    }
-    if (cmp(from, coverStart.from) < 0) {
-      if (coverStart.to.line - from.line < CHUNK_SIZE) {
-        array.shift().clear();
-        coverRange(cm, from, coverStart.to, 0);
-      } else {
-        coverRange(cm, from, coverStart.from, 0);
-      }
-    }
-
-    while (cmp(to, coverEnd.to) < 0) {
-      array.pop().clear();
-      coverEnd = array[array.length - 1].find();
-    }
-    if (cmp(to, coverEnd.to) > 0) {
-      if (to.line - coverEnd.from.line < CHUNK_SIZE) {
-        array.pop().clear();
-        coverRange(cm, coverEnd.from, to);
-      } else {
-        coverRange(cm, coverEnd.to, to);
-      }
-    }
-  }
-})();
diff --git a/resources/libs/codemirror/addon/tern/tern.css b/resources/libs/codemirror/addon/tern/tern.css
deleted file mode 100644
index eacc2f053..000000000
--- a/resources/libs/codemirror/addon/tern/tern.css
+++ /dev/null
@@ -1,85 +0,0 @@
-.CodeMirror-Tern-completion {
-  padding-left: 22px;
-  position: relative;
-}
-.CodeMirror-Tern-completion:before {
-  position: absolute;
-  left: 2px;
-  bottom: 2px;
-  border-radius: 50%;
-  font-size: 12px;
-  font-weight: bold;
-  height: 15px;
-  width: 15px;
-  line-height: 16px;
-  text-align: center;
-  color: white;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.CodeMirror-Tern-completion-unknown:before {
-  content: "?";
-  background: #4bb;
-}
-.CodeMirror-Tern-completion-object:before {
-  content: "O";
-  background: #77c;
-}
-.CodeMirror-Tern-completion-fn:before {
-  content: "F";
-  background: #7c7;
-}
-.CodeMirror-Tern-completion-array:before {
-  content: "A";
-  background: #c66;
-}
-.CodeMirror-Tern-completion-number:before {
-  content: "1";
-  background: #999;
-}
-.CodeMirror-Tern-completion-string:before {
-  content: "S";
-  background: #999;
-}
-.CodeMirror-Tern-completion-bool:before {
-  content: "B";
-  background: #999;
-}
-
-.CodeMirror-Tern-completion-guess {
-  color: #999;
-}
-
-.CodeMirror-Tern-tooltip {
-  border: 1px solid silver;
-  border-radius: 3px;
-  color: #444;
-  padding: 2px 5px;
-  font-size: 90%;
-  font-family: monospace;
-  background-color: white;
-  white-space: pre-wrap;
-
-  max-width: 40em;
-  position: absolute;
-  z-index: 10;
-  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-
-  transition: opacity 1s;
-  -moz-transition: opacity 1s;
-  -webkit-transition: opacity 1s;
-  -o-transition: opacity 1s;
-  -ms-transition: opacity 1s;
-}
-
-.CodeMirror-Tern-hint-doc {
-  max-width: 25em;
-}
-
-.CodeMirror-Tern-fname { color: black; }
-.CodeMirror-Tern-farg { color: #70a; }
-.CodeMirror-Tern-farg-current { text-decoration: underline; }
-.CodeMirror-Tern-type { color: #07c; }
-.CodeMirror-Tern-fhint-guess { opacity: .7; }
diff --git a/resources/libs/codemirror/addon/tern/tern.js b/resources/libs/codemirror/addon/tern/tern.js
deleted file mode 100644
index 1f18a657f..000000000
--- a/resources/libs/codemirror/addon/tern/tern.js
+++ /dev/null
@@ -1,632 +0,0 @@
-// Glue code between CodeMirror and Tern.
-//
-// Create a CodeMirror.TernServer to wrap an actual Tern server,
-// register open documents (CodeMirror.Doc instances) with it, and
-// call its methods to activate the assisting functions that Tern
-// provides.
-//
-// Options supported (all optional):
-// * defs: An array of JSON definition data structures.
-// * plugins: An object mapping plugin names to configuration
-//   options.
-// * getFile: A function(name, c) that can be used to access files in
-//   the project that haven't been loaded yet. Simply do c(null) to
-//   indicate that a file is not available.
-// * fileFilter: A function(value, docName, doc) that will be applied
-//   to documents before passing them on to Tern.
-// * switchToDoc: A function(name) that should, when providing a
-//   multi-file view, switch the view or focus to the named file.
-// * showError: A function(editor, message) that can be used to
-//   override the way errors are displayed.
-// * completionTip: Customize the content in tooltips for completions.
-//   Is passed a single argument—the completion's data as returned by
-//   Tern—and may return a string, DOM node, or null to indicate that
-//   no tip should be shown. By default the docstring is shown.
-// * typeTip: Like completionTip, but for the tooltips shown for type
-//   queries.
-// * responseFilter: A function(doc, query, request, error, data) that
-//   will be applied to the Tern responses before treating them
-//
-//
-// It is possible to run the Tern server in a web worker by specifying
-// these additional options:
-// * useWorker: Set to true to enable web worker mode. You'll probably
-//   want to feature detect the actual value you use here, for example
-//   !!window.Worker.
-// * workerScript: The main script of the worker. Point this to
-//   wherever you are hosting worker.js from this directory.
-// * workerDeps: An array of paths pointing (relative to workerScript)
-//   to the Acorn and Tern libraries and any Tern plugins you want to
-//   load. Or, if you minified those into a single script and included
-//   them in the workerScript, simply leave this undefined.
-
-(function() {
-  "use strict";
-  // declare global: tern
-
-  CodeMirror.TernServer = function(options) {
-    var self = this;
-    this.options = options || {};
-    var plugins = this.options.plugins || (this.options.plugins = {});
-    if (!plugins.doc_comment) plugins.doc_comment = true;
-    if (this.options.useWorker) {
-      this.server = new WorkerServer(this);
-    } else {
-      this.server = new tern.Server({
-        getFile: function(name, c) { return getFile(self, name, c); },
-        async: true,
-        defs: this.options.defs || [],
-        plugins: plugins
-      });
-    }
-    this.docs = Object.create(null);
-    this.trackChange = function(doc, change) { trackChange(self, doc, change); };
-
-    this.cachedArgHints = null;
-    this.activeArgHints = null;
-    this.jumpStack = [];
-  };
-
-  CodeMirror.TernServer.prototype = {
-    addDoc: function(name, doc) {
-      var data = {doc: doc, name: name, changed: null};
-      this.server.addFile(name, docValue(this, data));
-      CodeMirror.on(doc, "change", this.trackChange);
-      return this.docs[name] = data;
-    },
-
-    delDoc: function(name) {
-      var found = this.docs[name];
-      if (!found) return;
-      CodeMirror.off(found.doc, "change", this.trackChange);
-      delete this.docs[name];
-      this.server.delFile(name);
-    },
-
-    hideDoc: function(name) {
-      closeArgHints(this);
-      var found = this.docs[name];
-      if (found && found.changed) sendDoc(this, found);
-    },
-
-    complete: function(cm) {
-      var self = this;
-      CodeMirror.showHint(cm, function(cm, c) { return hint(self, cm, c); }, {async: true});
-    },
-
-    getHint: function(cm, c) { return hint(this, cm, c); },
-
-    showType: function(cm, pos) { showType(this, cm, pos); },
-
-    updateArgHints: function(cm) { updateArgHints(this, cm); },
-
-    jumpToDef: function(cm) { jumpToDef(this, cm); },
-
-    jumpBack: function(cm) { jumpBack(this, cm); },
-
-    rename: function(cm) { rename(this, cm); },
-
-    request: function (cm, query, c, pos) {
-      var self = this;
-      var doc = findDoc(this, cm.getDoc());
-      var request = buildRequest(this, doc, query, pos);
-
-      this.server.request(request, function (error, data) {
-        if (!error && self.options.responseFilter)
-          data = self.options.responseFilter(doc, query, request, error, data);
-        c(error, data);
-      });
-    }
-  };
-
-  var Pos = CodeMirror.Pos;
-  var cls = "CodeMirror-Tern-";
-  var bigDoc = 250;
-
-  function getFile(ts, name, c) {
-    var buf = ts.docs[name];
-    if (buf)
-      c(docValue(ts, buf));
-    else if (ts.options.getFile)
-      ts.options.getFile(name, c);
-    else
-      c(null);
-  }
-
-  function findDoc(ts, doc, name) {
-    for (var n in ts.docs) {
-      var cur = ts.docs[n];
-      if (cur.doc == doc) return cur;
-    }
-    if (!name) for (var i = 0;; ++i) {
-      n = "[doc" + (i || "") + "]";
-      if (!ts.docs[n]) { name = n; break; }
-    }
-    return ts.addDoc(name, doc);
-  }
-
-  function trackChange(ts, doc, change) {
-    var data = findDoc(ts, doc);
-
-    var argHints = ts.cachedArgHints;
-    if (argHints && argHints.doc == doc && cmpPos(argHints.start, change.to) <= 0)
-      ts.cachedArgHints = null;
-
-    var changed = data.changed;
-    if (changed == null)
-      data.changed = changed = {from: change.from.line, to: change.from.line};
-    var end = change.from.line + (change.text.length - 1);
-    if (change.from.line < changed.to) changed.to = changed.to - (change.to.line - end);
-    if (end >= changed.to) changed.to = end + 1;
-    if (changed.from > change.from.line) changed.from = change.from.line;
-
-    if (doc.lineCount() > bigDoc && change.to - changed.from > 100) setTimeout(function() {
-      if (data.changed && data.changed.to - data.changed.from > 100) sendDoc(ts, data);
-    }, 200);
-  }
-
-  function sendDoc(ts, doc) {
-    ts.server.request({files: [{type: "full", name: doc.name, text: docValue(ts, doc)}]}, function(error) {
-      if (error) console.error(error);
-      else doc.changed = null;
-    });
-  }
-
-  // Completion
-
-  function hint(ts, cm, c) {
-    ts.request(cm, {type: "completions", types: true, docs: true, urls: true}, function(error, data) {
-      if (error) return showError(ts, cm, error);
-      var completions = [], after = "";
-      var from = data.start, to = data.end;
-      if (cm.getRange(Pos(from.line, from.ch - 2), from) == "[\"" &&
-          cm.getRange(to, Pos(to.line, to.ch + 2)) != "\"]")
-        after = "\"]";
-
-      for (var i = 0; i < data.completions.length; ++i) {
-        var completion = data.completions[i], className = typeToIcon(completion.type);
-        if (data.guess) className += " " + cls + "guess";
-        completions.push({text: completion.name + after,
-                          displayText: completion.name,
-                          className: className,
-                          data: completion});
-      }
-
-      var obj = {from: from, to: to, list: completions};
-      var tooltip = null;
-      CodeMirror.on(obj, "close", function() { remove(tooltip); });
-      CodeMirror.on(obj, "update", function() { remove(tooltip); });
-      CodeMirror.on(obj, "select", function(cur, node) {
-        remove(tooltip);
-        var content = ts.options.completionTip ? ts.options.completionTip(cur.data) : cur.data.doc;
-        if (content) {
-          tooltip = makeTooltip(node.parentNode.getBoundingClientRect().right + window.pageXOffset,
-                                node.getBoundingClientRect().top + window.pageYOffset, content);
-          tooltip.className += " " + cls + "hint-doc";
-        }
-      });
-      c(obj);
-    });
-  }
-
-  function typeToIcon(type) {
-    var suffix;
-    if (type == "?") suffix = "unknown";
-    else if (type == "number" || type == "string" || type == "bool") suffix = type;
-    else if (/^fn\(/.test(type)) suffix = "fn";
-    else if (/^\[/.test(type)) suffix = "array";
-    else suffix = "object";
-    return cls + "completion " + cls + "completion-" + suffix;
-  }
-
-  // Type queries
-
-  function showType(ts, cm, pos) {
-    ts.request(cm, "type", function(error, data) {
-      if (error) return showError(ts, cm, error);
-      if (ts.options.typeTip) {
-        var tip = ts.options.typeTip(data);
-      } else {
-        var tip = elt("span", null, elt("strong", null, data.type || "not found"));
-        if (data.doc)
-          tip.appendChild(document.createTextNode(" — " + data.doc));
-        if (data.url) {
-          tip.appendChild(document.createTextNode(" "));
-          tip.appendChild(elt("a", null, "[docs]")).href = data.url;
-        }
-      }
-      tempTooltip(cm, tip);
-    }, pos);
-  }
-
-  // Maintaining argument hints
-
-  function updateArgHints(ts, cm) {
-    closeArgHints(ts);
-
-    if (cm.somethingSelected()) return;
-    var state = cm.getTokenAt(cm.getCursor()).state;
-    var inner = CodeMirror.innerMode(cm.getMode(), state);
-    if (inner.mode.name != "javascript") return;
-    var lex = inner.state.lexical;
-    if (lex.info != "call") return;
-
-    var ch, pos = lex.pos || 0, tabSize = cm.getOption("tabSize");
-    for (var line = cm.getCursor().line, e = Math.max(0, line - 9), found = false; line >= e; --line) {
-      var str = cm.getLine(line), extra = 0;
-      for (var pos = 0;;) {
-        var tab = str.indexOf("\t", pos);
-        if (tab == -1) break;
-        extra += tabSize - (tab + extra) % tabSize - 1;
-        pos = tab + 1;
-      }
-      ch = lex.column - extra;
-      if (str.charAt(ch) == "(") {found = true; break;}
-    }
-    if (!found) return;
-
-    var start = Pos(line, ch);
-    var cache = ts.cachedArgHints;
-    if (cache && cache.doc == cm.getDoc() && cmpPos(start, cache.start) == 0)
-      return showArgHints(ts, cm, pos);
-
-    ts.request(cm, {type: "type", preferFunction: true, end: start}, function(error, data) {
-      if (error || !data.type || !(/^fn\(/).test(data.type)) return;
-      ts.cachedArgHints = {
-        start: pos,
-        type: parseFnType(data.type),
-        name: data.exprName || data.name || "fn",
-        guess: data.guess,
-        doc: cm.getDoc()
-      };
-      showArgHints(ts, cm, pos);
-    });
-  }
-
-  function showArgHints(ts, cm, pos) {
-    closeArgHints(ts);
-
-    var cache = ts.cachedArgHints, tp = cache.type;
-    var tip = elt("span", cache.guess ? cls + "fhint-guess" : null,
-                  elt("span", cls + "fname", cache.name), "(");
-    for (var i = 0; i < tp.args.length; ++i) {
-      if (i) tip.appendChild(document.createTextNode(", "));
-      var arg = tp.args[i];
-      tip.appendChild(elt("span", cls + "farg" + (i == pos ? " " + cls + "farg-current" : ""), arg.name || "?"));
-      if (arg.type != "?") {
-        tip.appendChild(document.createTextNode(":\u00a0"));
-        tip.appendChild(elt("span", cls + "type", arg.type));
-      }
-    }
-    tip.appendChild(document.createTextNode(tp.rettype ? ") ->\u00a0" : ")"));
-    if (tp.rettype) tip.appendChild(elt("span", cls + "type", tp.rettype));
-    var place = cm.cursorCoords(null, "page");
-    ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip);
-  }
-
-  function parseFnType(text) {
-    var args = [], pos = 3;
-
-    function skipMatching(upto) {
-      var depth = 0, start = pos;
-      for (;;) {
-        var next = text.charAt(pos);
-        if (upto.test(next) && !depth) return text.slice(start, pos);
-        if (/[{\[\(]/.test(next)) ++depth;
-        else if (/[}\]\)]/.test(next)) --depth;
-        ++pos;
-      }
-    }
-
-    // Parse arguments
-    if (text.charAt(pos) != ")") for (;;) {
-      var name = text.slice(pos).match(/^([^, \(\[\{]+): /);
-      if (name) {
-        pos += name[0].length;
-        name = name[1];
-      }
-      args.push({name: name, type: skipMatching(/[\),]/)});
-      if (text.charAt(pos) == ")") break;
-      pos += 2;
-    }
-
-    var rettype = text.slice(pos).match(/^\) -> (.*)$/);
-
-    return {args: args, rettype: rettype && rettype[1]};
-  }
-
-  // Moving to the definition of something
-
-  function jumpToDef(ts, cm) {
-    function inner(varName) {
-      var req = {type: "definition", variable: varName || null};
-      var doc = findDoc(ts, cm.getDoc());
-      ts.server.request(buildRequest(ts, doc, req), function(error, data) {
-        if (error) return showError(ts, cm, error);
-        if (!data.file && data.url) { window.open(data.url); return; }
-
-        if (data.file) {
-          var localDoc = ts.docs[data.file], found;
-          if (localDoc && (found = findContext(localDoc.doc, data))) {
-            ts.jumpStack.push({file: doc.name,
-                               start: cm.getCursor("from"),
-                               end: cm.getCursor("to")});
-            moveTo(ts, doc, localDoc, found.start, found.end);
-            return;
-          }
-        }
-        showError(ts, cm, "Could not find a definition.");
-      });
-    }
-
-    if (!atInterestingExpression(cm))
-      dialog(cm, "Jump to variable", function(name) { if (name) inner(name); });
-    else
-      inner();
-  }
-
-  function jumpBack(ts, cm) {
-    var pos = ts.jumpStack.pop(), doc = pos && ts.docs[pos.file];
-    if (!doc) return;
-    moveTo(ts, findDoc(ts, cm.getDoc()), doc, pos.start, pos.end);
-  }
-
-  function moveTo(ts, curDoc, doc, start, end) {
-    doc.doc.setSelection(end, start);
-    if (curDoc != doc && ts.options.switchToDoc) {
-      closeArgHints(ts);
-      ts.options.switchToDoc(doc.name);
-    }
-  }
-
-  // The {line,ch} representation of positions makes this rather awkward.
-  function findContext(doc, data) {
-    var before = data.context.slice(0, data.contextOffset).split("\n");
-    var startLine = data.start.line - (before.length - 1);
-    var start = Pos(startLine, (before.length == 1 ? data.start.ch : doc.getLine(startLine).length) - before[0].length);
-
-    var text = doc.getLine(startLine).slice(start.ch);
-    for (var cur = startLine + 1; cur < doc.lineCount() && text.length < data.context.length; ++cur)
-      text += "\n" + doc.getLine(cur);
-    if (text.slice(0, data.context.length) == data.context) return data;
-
-    var cursor = doc.getSearchCursor(data.context, 0, false);
-    var nearest, nearestDist = Infinity;
-    while (cursor.findNext()) {
-      var from = cursor.from(), dist = Math.abs(from.line - start.line) * 10000;
-      if (!dist) dist = Math.abs(from.ch - start.ch);
-      if (dist < nearestDist) { nearest = from; nearestDist = dist; }
-    }
-    if (!nearest) return null;
-
-    if (before.length == 1)
-      nearest.ch += before[0].length;
-    else
-      nearest = Pos(nearest.line + (before.length - 1), before[before.length - 1].length);
-    if (data.start.line == data.end.line)
-      var end = Pos(nearest.line, nearest.ch + (data.end.ch - data.start.ch));
-    else
-      var end = Pos(nearest.line + (data.end.line - data.start.line), data.end.ch);
-    return {start: nearest, end: end};
-  }
-
-  function atInterestingExpression(cm) {
-    var pos = cm.getCursor("end"), tok = cm.getTokenAt(pos);
-    if (tok.start < pos.ch && (tok.type == "comment" || tok.type == "string")) return false;
-    return /\w/.test(cm.getLine(pos.line).slice(Math.max(pos.ch - 1, 0), pos.ch + 1));
-  }
-
-  // Variable renaming
-
-  function rename(ts, cm) {
-    var token = cm.getTokenAt(cm.getCursor());
-    if (!/\w/.test(token.string)) showError(ts, cm, "Not at a variable");
-    dialog(cm, "New name for " + token.string, function(newName) {
-      ts.request(cm, {type: "rename", newName: newName, fullDocs: true}, function(error, data) {
-        if (error) return showError(ts, cm, error);
-        applyChanges(ts, data.changes);
-      });
-    });
-  }
-
-  var nextChangeOrig = 0;
-  function applyChanges(ts, changes) {
-    var perFile = Object.create(null);
-    for (var i = 0; i < changes.length; ++i) {
-      var ch = changes[i];
-      (perFile[ch.file] || (perFile[ch.file] = [])).push(ch);
-    }
-    for (var file in perFile) {
-      var known = ts.docs[file], chs = perFile[file];;
-      if (!known) continue;
-      chs.sort(function(a, b) { return cmpPos(b.start, a.start); });
-      var origin = "*rename" + (++nextChangeOrig);
-      for (var i = 0; i < chs.length; ++i) {
-        var ch = chs[i];
-        known.doc.replaceRange(ch.text, ch.start, ch.end, origin);
-      }
-    }
-  }
-
-  // Generic request-building helper
-
-  function buildRequest(ts, doc, query, pos) {
-    var files = [], offsetLines = 0, allowFragments = !query.fullDocs;
-    if (!allowFragments) delete query.fullDocs;
-    if (typeof query == "string") query = {type: query};
-    query.lineCharPositions = true;
-    if (query.end == null) {
-      query.end = pos || doc.doc.getCursor("end");
-      if (doc.doc.somethingSelected())
-        query.start = doc.doc.getCursor("start");
-    }
-    var startPos = query.start || query.end;
-
-    if (doc.changed) {
-      if (doc.doc.lineCount() > bigDoc && allowFragments !== false &&
-          doc.changed.to - doc.changed.from < 100 &&
-          doc.changed.from <= startPos.line && doc.changed.to > query.end.line) {
-        files.push(getFragmentAround(doc, startPos, query.end));
-        query.file = "#0";
-        var offsetLines = files[0].offsetLines;
-        if (query.start != null) query.start = Pos(query.start.line - -offsetLines, query.start.ch);
-        query.end = Pos(query.end.line - offsetLines, query.end.ch);
-      } else {
-        files.push({type: "full",
-                    name: doc.name,
-                    text: docValue(ts, doc)});
-        query.file = doc.name;
-        doc.changed = null;
-      }
-    } else {
-      query.file = doc.name;
-    }
-    for (var name in ts.docs) {
-      var cur = ts.docs[name];
-      if (cur.changed && cur != doc) {
-        files.push({type: "full", name: cur.name, text: docValue(ts, cur)});
-        cur.changed = null;
-      }
-    }
-
-    return {query: query, files: files};
-  }
-
-  function getFragmentAround(data, start, end) {
-    var doc = data.doc;
-    var minIndent = null, minLine = null, endLine, tabSize = 4;
-    for (var p = start.line - 1, min = Math.max(0, p - 50); p >= min; --p) {
-      var line = doc.getLine(p), fn = line.search(/\bfunction\b/);
-      if (fn < 0) continue;
-      var indent = CodeMirror.countColumn(line, null, tabSize);
-      if (minIndent != null && minIndent <= indent) continue;
-      minIndent = indent;
-      minLine = p;
-    }
-    if (minLine == null) minLine = min;
-    var max = Math.min(doc.lastLine(), end.line + 20);
-    if (minIndent == null || minIndent == CodeMirror.countColumn(doc.getLine(start.line), null, tabSize))
-      endLine = max;
-    else for (endLine = end.line + 1; endLine < max; ++endLine) {
-      var indent = CodeMirror.countColumn(doc.getLine(endLine), null, tabSize);
-      if (indent <= minIndent) break;
-    }
-    var from = Pos(minLine, 0);
-
-    return {type: "part",
-            name: data.name,
-            offsetLines: from.line,
-            text: doc.getRange(from, Pos(endLine, 0))};
-  }
-
-  // Generic utilities
-
-  function cmpPos(a, b) { return a.line - b.line || a.ch - b.ch; }
-
-  function elt(tagname, cls /*, ... elts*/) {
-    var e = document.createElement(tagname);
-    if (cls) e.className = cls;
-    for (var i = 2; i < arguments.length; ++i) {
-      var elt = arguments[i];
-      if (typeof elt == "string") elt = document.createTextNode(elt);
-      e.appendChild(elt);
-    }
-    return e;
-  }
-
-  function dialog(cm, text, f) {
-    if (cm.openDialog)
-      cm.openDialog(text + ": <input type=text>", f);
-    else
-      f(prompt(text, ""));
-  }
-
-  // Tooltips
-
-  function tempTooltip(cm, content) {
-    var where = cm.cursorCoords();
-    var tip = makeTooltip(where.right + 1, where.bottom, content);
-    function clear() {
-      if (!tip.parentNode) return;
-      cm.off("cursorActivity", clear);
-      fadeOut(tip);
-    }
-    setTimeout(clear, 1700);
-    cm.on("cursorActivity", clear);
-  }
-
-  function makeTooltip(x, y, content) {
-    var node = elt("div", cls + "tooltip", content);
-    node.style.left = x + "px";
-    node.style.top = y + "px";
-    document.body.appendChild(node);
-    return node;
-  }
-
-  function remove(node) {
-    var p = node && node.parentNode;
-    if (p) p.removeChild(node);
-  }
-
-  function fadeOut(tooltip) {
-    tooltip.style.opacity = "0";
-    setTimeout(function() { remove(tooltip); }, 1100);
-  }
-
-  function showError(ts, cm, msg) {
-    if (ts.options.showError)
-      ts.options.showError(cm, msg);
-    else
-      tempTooltip(cm, String(msg));
-  }
-
-  function closeArgHints(ts) {
-    if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
-  }
-
-  function docValue(ts, doc) {
-    var val = doc.doc.getValue();
-    if (ts.options.fileFilter) val = ts.options.fileFilter(val, doc.name, doc.doc);
-    return val;
-  }
-
-  // Worker wrapper
-
-  function WorkerServer(ts) {
-    var worker = new Worker(ts.options.workerScript);
-    worker.postMessage({type: "init",
-                        defs: ts.options.defs,
-                        plugins: ts.options.plugins,
-                        scripts: ts.options.workerDeps});
-    var msgId = 0, pending = {};
-
-    function send(data, c) {
-      if (c) {
-        data.id = ++msgId;
-        pending[msgId] = c;
-      }
-      worker.postMessage(data);
-    }
-    worker.onmessage = function(e) {
-      var data = e.data;
-      if (data.type == "getFile") {
-        getFile(ts, data.name, function(err, text) {
-          send({type: "getFile", err: String(err), text: text, id: data.id});
-        });
-      } else if (data.type == "debug") {
-        console.log(data.message);
-      } else if (data.id && pending[data.id]) {
-        pending[data.id](data.err, data.body);
-        delete pending[data.id];
-      }
-    };
-    worker.onerror = function(e) {
-      for (var id in pending) pending[id](e);
-      pending = {};
-    };
-
-    this.addFile = function(name, text) { send({type: "add", name: name, text: text}); };
-    this.delFile = function(name) { send({type: "del", name: name}); };
-    this.request = function(body, c) { send({type: "req", body: body}, c); };
-  }
-})();
diff --git a/resources/libs/codemirror/addon/tern/worker.js b/resources/libs/codemirror/addon/tern/worker.js
deleted file mode 100644
index 1ff63de41..000000000
--- a/resources/libs/codemirror/addon/tern/worker.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// declare global: tern, server
-
-var server;
-
-this.onmessage = function(e) {
-  var data = e.data;
-  switch (data.type) {
-  case "init": return startServer(data.defs, data.plugins, data.scripts);
-  case "add": return server.addFile(data.name, data.text);
-  case "del": return server.delFile(data.name);
-  case "req": return server.request(data.body, function(err, reqData) {
-    postMessage({id: data.id, body: reqData, err: err && String(err)});
-  });
-  case "getFile":
-    var c = pending[data.id];
-    delete pending[data.id];
-    return c(data.err, data.text);
-  default: throw new Error("Unknown message type: " + data.type);
-  }
-};
-
-var nextId = 0, pending = {};
-function getFile(file, c) {
-  postMessage({type: "getFile", name: file, id: ++nextId});
-  pending[nextId] = c;
-}
-
-function startServer(defs, plugins, scripts) {
-  if (scripts) importScripts.apply(null, scripts);
-
-  server = new tern.Server({
-    getFile: getFile,
-    async: true,
-    defs: defs,
-    plugins: plugins
-  });
-}
-
-var console = {
-  log: function(v) { postMessage({type: "debug", message: v}); }
-};
diff --git a/resources/libs/codemirror/addon/wrap/hardwrap.js b/resources/libs/codemirror/addon/wrap/hardwrap.js
deleted file mode 100644
index f252ffc9e..000000000
--- a/resources/libs/codemirror/addon/wrap/hardwrap.js
+++ /dev/null
@@ -1,99 +0,0 @@
-(function() {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-
-  function findParagraph(cm, pos, options) {
-    var startRE = options.paragraphStart || cm.getHelper(pos, "paragraphStart");
-    for (var start = pos.line, first = cm.firstLine(); start > first; --start) {
-      var line = cm.getLine(start);
-      if (startRE && startRE.test(line)) break;
-      if (!/\S/.test(line)) { ++start; break; }
-    }
-    var endRE = options.paragraphEnd || cm.getHelper(pos, "paragraphEnd");
-    for (var end = pos.line + 1, last = cm.lastLine(); end <= last; ++end) {
-      var line = cm.getLine(end);
-      if (endRE && endRE.test(line)) { ++end; break; }
-      if (!/\S/.test(line)) break;
-    }
-    return {from: start, to: end};
-  }
-
-  function findBreakPoint(text, column, wrapOn, killTrailingSpace) {
-    for (var at = column; at > 0; --at)
-      if (wrapOn.test(text.slice(at - 1, at + 1))) break;
-    if (at == 0) at = column;
-    var endOfText = at;
-    if (killTrailingSpace)
-      while (text.charAt(endOfText - 1) == " ") --endOfText;
-    return {from: endOfText, to: at};
-  }
-
-  function wrapRange(cm, from, to, options) {
-    from = cm.clipPos(from); to = cm.clipPos(to);
-    var column = options.column || 80;
-    var wrapOn = options.wrapOn || /\s\S|-[^\.\d]/;
-    var killTrailing = options.killTrailingSpace !== false;
-    var changes = [], curLine = "", curNo = from.line;
-    var lines = cm.getRange(from, to, false);
-    for (var i = 0; i < lines.length; ++i) {
-      var text = lines[i], oldLen = curLine.length, spaceInserted = 0;
-      if (curLine && text && !wrapOn.test(curLine.charAt(curLine.length - 1) + text.charAt(0))) {
-        curLine += " ";
-        spaceInserted = 1;
-      }
-      curLine += text;
-      if (i) {
-        var firstBreak = curLine.length > column && findBreakPoint(curLine, column, wrapOn, killTrailing);
-        // If this isn't broken, or is broken at a different point, remove old break
-        if (!firstBreak || firstBreak.from != oldLen || firstBreak.to != oldLen + spaceInserted) {
-          changes.push({text: spaceInserted ? " " : "",
-                        from: Pos(curNo, oldLen),
-                        to: Pos(curNo + 1, 0)});
-        } else {
-          curLine = text;
-          ++curNo;
-        }
-      }
-      while (curLine.length > column) {
-        var bp = findBreakPoint(curLine, column, wrapOn, killTrailing);
-        changes.push({text: "\n",
-                      from: Pos(curNo, bp.from),
-                      to: Pos(curNo, bp.to)});
-        curLine = curLine.slice(bp.to);
-        ++curNo;
-      }
-    }
-    if (changes.length) cm.operation(function() {
-      for (var i = 0; i < changes.length; ++i) {
-        var change = changes[i];
-        cm.replaceRange(change.text, change.from, change.to);
-      }
-    });
-  }
-
-  CodeMirror.defineExtension("wrapParagraph", function(pos, options) {
-    options = options || {};
-    if (!pos) pos = this.getCursor();
-    var para = findParagraph(this, pos, options);
-    wrapRange(this, Pos(para.from, 0), Pos(para.to - 1), options);
-  });
-
-  CodeMirror.defineExtension("wrapRange", function(from, to, options) {
-    wrapRange(this, from, to, options || {});
-  });
-
-  CodeMirror.defineExtension("wrapParagraphsInRange", function(from, to, options) {
-    options = options || {};
-    var cm = this, paras = [];
-    for (var line = from.line; line <= to.line;) {
-      var para = findParagraph(cm, Pos(line, 0), options);
-      paras.push(para);
-      line = para.to;
-    }
-    if (paras.length) cm.operation(function() {
-      for (var i = paras.length - 1; i >= 0; --i)
-        wrapRange(cm, Pos(paras[i].from, 0), Pos(paras[i].to - 1), options);
-    });
-  });
-})();
diff --git a/resources/libs/codemirror/bin/authors.sh b/resources/libs/codemirror/bin/authors.sh
deleted file mode 100755
index b3ee99c6d..000000000
--- a/resources/libs/codemirror/bin/authors.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Combine existing list of authors with everyone known in git, sort, add header.
-tail --lines=+3 AUTHORS > AUTHORS.tmp
-git log --format='%aN' >> AUTHORS.tmp
-echo -e "List of CodeMirror contributors. Updated before every release.\n" > AUTHORS
-sort -u AUTHORS.tmp >> AUTHORS
-rm -f AUTHORS.tmp
diff --git a/resources/libs/codemirror/bin/compress b/resources/libs/codemirror/bin/compress
deleted file mode 100755
index 809fbe83d..000000000
--- a/resources/libs/codemirror/bin/compress
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env node
-
-// Compression helper for CodeMirror
-//
-// Example:
-//
-//   bin/compress codemirror runmode javascript xml
-//
-// Will take lib/codemirror.js, addon/runmode/runmode.js,
-// mode/javascript/javascript.js, and mode/xml/xml.js, run them though
-// the online minifier at http://marijnhaverbeke.nl/uglifyjs, and spit
-// out the result.
-//
-//   bin/compress codemirror --local /path/to/bin/UglifyJS
-//
-// Will use a local minifier instead of the online default one.
-//
-// Script files are specified without .js ending. Prefixing them with
-// their full (local) path is optional. So you may say lib/codemirror
-// or mode/xml/xml to be more precise. In fact, even the .js suffix
-// may be speficied, if wanted.
-
-"use strict";
-
-var fs = require("fs");
-
-function help(ok) {
-  console.log("usage: " + process.argv[1] + " [--local /path/to/uglifyjs] files...");
-  process.exit(ok ? 0 : 1);
-}
-
-var local = null, args = [], extraArgs = null, files = [], blob = "";
-
-for (var i = 2; i < process.argv.length; ++i) {
-  var arg = process.argv[i];
-  if (arg == "--local" && i + 1 < process.argv.length) {
-    var parts = process.argv[++i].split(/\s+/);
-    local = parts[0];
-    extraArgs = parts.slice(1);
-    if (!extraArgs.length) extraArgs = ["-c", "-m"];
-  } else if (arg == "--help") {
-    help(true);
-  } else if (arg[0] != "-") {
-    files.push({name: arg, re: new RegExp("(?:\\/|^)" + arg + (/\.js$/.test(arg) ? "$" : "\\.js$"))});
-  } else help(false);
-}
-
-function walk(dir) {
-  fs.readdirSync(dir).forEach(function(fname) {
-    if (/^[_\.]/.test(fname)) return;
-    var file = dir + fname;
-    if (fs.statSync(file).isDirectory()) return walk(file + "/");
-    if (files.some(function(spec, i) {
-      var match = spec.re.test(file);
-      if (match) files.splice(i, 1);
-      return match;
-    })) {
-      if (local) args.push(file);
-      else blob += fs.readFileSync(file, "utf8");
-    }
-  });
-}
-
-walk("lib/");
-walk("addon/");
-walk("mode/");
-
-if (!local && !blob) help(false);
-
-if (files.length) {
-  console.log("Some speficied files were not found: " +
-              files.map(function(a){return a.name;}).join(", "));
-  process.exit(1);
-}
-  
-if (local) {
-  require("child_process").spawn(local, args.concat(extraArgs), {stdio: ["ignore", process.stdout, process.stderr]});
-} else {
-  var data = new Buffer("js_code=" + require("querystring").escape(blob), "utf8");
-  var req = require("http").request({
-    host: "marijnhaverbeke.nl",
-    port: 80,
-    method: "POST",
-    path: "/uglifyjs",
-    headers: {"content-type": "application/x-www-form-urlencoded",
-              "content-length": data.length}
-  });
-  req.on("response", function(resp) {
-    resp.on("data", function (chunk) { process.stdout.write(chunk); });
-  });
-  req.end(data);
-}
diff --git a/resources/libs/codemirror/bin/lint b/resources/libs/codemirror/bin/lint
deleted file mode 100755
index 4f70994c5..000000000
--- a/resources/libs/codemirror/bin/lint
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env node
-
-var lint = require("../test/lint/lint"),
-    path = require("path");
-
-if (process.argv.length > 2) {
-  lint.checkDir(process.argv[2]);
-} else {
-  process.chdir(path.resolve(__dirname, ".."));
-  lint.checkDir("lib");
-  lint.checkDir("mode");
-  lint.checkDir("addon");
-  lint.checkDir("keymap");
-}
-
-process.exit(lint.success() ? 0 : 1);
diff --git a/resources/libs/codemirror/bin/source-highlight b/resources/libs/codemirror/bin/source-highlight
deleted file mode 100755
index 7596ed776..000000000
--- a/resources/libs/codemirror/bin/source-highlight
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env node
-
-// Simple command-line code highlighting tool. Reads code from stdin,
-// spits html to stdout. For example:
-//
-//   echo 'function foo(a) { return a; }' | bin/source-highlight -s javascript
-//   bin/source-highlight -s 
-
-var fs = require("fs");
-
-CodeMirror = require("../addon/runmode/runmode.node.js");
-require("../mode/meta.js");
-
-var sPos = process.argv.indexOf("-s");
-if (sPos == -1 || sPos == process.argv.length - 1) {
-   console.error("Usage: source-highlight -s language");
-   process.exit(1);
-}
-var lang = process.argv[sPos + 1].toLowerCase(), modeName = lang;
-CodeMirror.modeInfo.forEach(function(info) {
-  if (info.mime == lang) {
-    modeName = info.mode;
-  } else if (info.name.toLowerCase() == lang) {
-    modeName = info.mode;
-    lang = info.mime;
-  }
-});
-
-function ensureMode(name) {
-  if (CodeMirror.modes[name] || name == "null") return;
-  try {
-    require("../mode/" + name + "/" + name + ".js");
-  } catch(e) {
-    console.error("Could not load mode " + name + ".");
-    process.exit(1);
-  }
-  var obj = CodeMirror.modes[name];
-  if (obj.dependencies) obj.dependencies.forEach(ensureMode);
-}
-ensureMode(modeName);
-
-function esc(str) {
-  return str.replace(/[<&]/, function(ch) { return ch == "&" ? "&amp;" : "&lt;"; });
-}
-
-var code = fs.readFileSync("/dev/stdin", "utf8");
-var curStyle = null, accum = "";
-function flush() {
-  if (curStyle) process.stdout.write("<span class=\"" + curStyle.replace(/(^|\s+)/g, "$1cm-") + "\">" + esc(accum) + "</span>");
-  else process.stdout.write(esc(accum));
-}
-
-CodeMirror.runMode(code, lang, function(text, style) {
-  if (style != curStyle) {
-    flush();
-    curStyle = style; accum = text;
-  } else {
-    accum += text;
-  }
-});
-flush();
diff --git a/resources/libs/codemirror/demo/activeline.html b/resources/libs/codemirror/demo/activeline.html
deleted file mode 100644
index 14851c35e..000000000
--- a/resources/libs/codemirror/demo/activeline.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Active Line Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<script src="../addon/selection/active-line.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Active Line</a>
-  </ul>
-</div>
-
-<article>
-<h2>Active Line Demo</h2>
-<form><textarea id="code" name="code">
-<?xml version="1.0" encoding="UTF-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"
-     xmlns:georss="http://www.georss.org/georss"
-     xmlns:twitter="http://api.twitter.com">
-  <channel>
-    <title>Twitter / codemirror</title>
-    <link>http://twitter.com/codemirror</link>
-    <atom:link type="application/rss+xml"
-               href="http://twitter.com/statuses/user_timeline/242283288.rss" rel="self"/>
-    <description>Twitter updates from CodeMirror / codemirror.</description>
-    <language>en-us</language>
-    <ttl>40</ttl>
-  <item>
-    <title>codemirror: http://cloud-ide.com &#8212; they're springing up like mushrooms. This one
-      uses CodeMirror as its editor.</title>
-    <description>codemirror: http://cloud-ide.com &#8212; they're springing up like mushrooms. This
-      one uses CodeMirror as its editor.</description>
-    <pubDate>Thu, 17 Mar 2011 23:34:47 +0000</pubDate>
-    <guid>http://twitter.com/codemirror/statuses/48527733722058752</guid>
-    <link>http://twitter.com/codemirror/statuses/48527733722058752</link>
-    <twitter:source>web</twitter:source>
-    <twitter:place/>
-  </item>
-  <item>
-    <title>codemirror: Posted a description of the CodeMirror 2 internals at
-      http://codemirror.net/2/internals.html</title>
-    <description>codemirror: Posted a description of the CodeMirror 2 internals at
-      http://codemirror.net/2/internals.html</description>
-    <pubDate>Wed, 02 Mar 2011 12:15:09 +0000</pubDate>
-    <guid>http://twitter.com/codemirror/statuses/42920879788789760</guid>
-    <link>http://twitter.com/codemirror/statuses/42920879788789760</link>
-    <twitter:source>web</twitter:source>
-    <twitter:place/>
-  </item>
-  </channel>
-</rss></textarea></form>
-
-    <script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  mode: "application/xml",
-  styleActiveLine: true,
-  lineNumbers: true,
-  lineWrapping: true
-});
-</script>
-
-    <p>Styling the current cursor line.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/anywordhint.html b/resources/libs/codemirror/demo/anywordhint.html
deleted file mode 100644
index 851f43000..000000000
--- a/resources/libs/codemirror/demo/anywordhint.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Any Word Completion Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/hint/show-hint.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/hint/show-hint.js"></script>
-<script src="../addon/hint/anyword-hint.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Any Word Completion</a>
-  </ul>
-</div>
-
-<article>
-<h2>Any Word Completion Demo</h2>
-<form><textarea id="code" name="code">
-(function() {
-  "use strict";
-
-  var WORD = /[\w$]+/g, RANGE = 500;
-
-  CodeMirror.registerHelper("hint", "anyword", function(editor, options) {
-    var word = options && options.word || WORD;
-    var range = options && options.range || RANGE;
-    var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
-    var start = cur.ch, end = start;
-    while (end < curLine.length && word.test(curLine.charAt(end))) ++end;
-    while (start && word.test(curLine.charAt(start - 1))) --start;
-    var curWord = start != end && curLine.slice(start, end);
-
-    var list = [], seen = {};
-    function scan(dir) {
-      var line = cur.line, end = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
-      for (; line != end; line += dir) {
-        var text = editor.getLine(line), m;
-        word.lastIndex = 0;
-        while (m = word.exec(text)) {
-          if ((!curWord || m[0].indexOf(curWord) == 0) && !seen.hasOwnProperty(m[0])) {
-            seen[m[0]] = true;
-            list.push(m[0]);
-          }
-        }
-      }
-    }
-    scan(-1);
-    scan(1);
-    return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
-  });
-})();
-</textarea></form>
-
-<p>Press <strong>ctrl-space</strong> to activate autocompletion. The
-completion uses
-the <a href="../doc/manual.html#addon_anyword-hint">anyword-hint.js</a>
-module, which simply looks at nearby words in the buffer and completes
-to those.</p>
-
-    <script>
-      CodeMirror.commands.autocomplete = function(cm) {
-        CodeMirror.showHint(cm, CodeMirror.hint.anyword);
-      }
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        extraKeys: {"Ctrl-Space": "autocomplete"}
-      });
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/demo/bidi.html b/resources/libs/codemirror/demo/bidi.html
deleted file mode 100644
index 4f1f8f3e4..000000000
--- a/resources/libs/codemirror/demo/bidi.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Bi-directional Text Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Bi-directional Text</a>
-  </ul>
-</div>
-
-<article>
-<h2>Bi-directional Text Demo</h2>
-<form><textarea id="code" name="code"><!-- Piece of the CodeMirror manual, 'translated' into Arabic by
-     Google Translate -->
-
-<dl>
-  <dt id=option_value><code>value (string or Doc)</code></dt>
-  <dd>قيمة البداية المحرر. يمكن أن تكون سلسلة، أو. كائن مستند.</dd>
-  <dt id=option_mode><code>mode (string or object)</code></dt>
-  <dd>وضع الاستخدام. عندما لا تعطى، وهذا الافتراضي إلى الطريقة الاولى
-  التي تم تحميلها. قد يكون من سلسلة، والتي إما أسماء أو ببساطة هو وضع
-  MIME نوع المرتبطة اسطة. بدلا من ذلك، قد يكون من كائن يحتوي على
-  خيارات التكوين لواسطة، مع <code>name</code> الخاصية التي وضع أسماء
-  (على سبيل المثال <code>{name: "javascript", json: true}</code>).
-  صفحات التجريبي لكل وضع تحتوي على معلومات حول ما معلمات تكوين وضع
-  يدعمها. يمكنك أن تطلب CodeMirror التي تم تعريفها طرق وأنواع MIME
-  الكشف على <code>CodeMirror.modes</code>
-  و <code>CodeMirror.mimeModes</code> الكائنات. وضع خرائط الأسماء
-  الأولى لمنشئات الخاصة بهم، وخرائط لأنواع MIME 2 المواصفات
-  واسطة.</dd>
-  <dt id=option_theme><code>theme (string)</code></dt>
-  <dd>موضوع لنمط المحرر مع. يجب عليك التأكد من الملف CSS تحديد
-  المقابلة <code>.cm-s-[name]</code> يتم تحميل أنماط (انظر
-  <a href=../theme/><code>theme</code></a> الدليل في التوزيع).
-  الافتراضي هو <code>"default"</code> ، والتي تم تضمينها في
-  الألوان <code>codemirror.css</code>. فمن الممكن استخدام فئات متعددة
-  في تطبيق السمات مرة واحدة على سبيل المثال <code>"foo bar"</code>
-  سيتم تعيين كل من <code>cm-s-foo</code> و <code>cm-s-bar</code>
-  الطبقات إلى المحرر.</dd>
-</dl>
-</textarea></form>
-
-    <script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  mode: "text/html",
-  lineNumbers: true
-});
-</script>
-
-  <p>Demonstration of bi-directional text support. See
-  the <a href="http://marijnhaverbeke.nl/blog/cursor-in-bidi-text.html">related
-  blog post</a> for more background.</p>
-
-  <p><strong>Note:</strong> There is
-  a <a href="https://github.com/marijnh/CodeMirror/issues/1757">known
-  bug</a> with cursor motion and mouse clicks in bi-directional lines
-  that are line wrapped.</p>
-
-</article>
diff --git a/resources/libs/codemirror/demo/btree.html b/resources/libs/codemirror/demo/btree.html
deleted file mode 100644
index 7635ca1bb..000000000
--- a/resources/libs/codemirror/demo/btree.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: B-Tree visualization</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<style type="text/css">
-      .lineblock { display: inline-block; margin: 1px; height: 5px; }
-      .CodeMirror {border: 1px solid #aaa; height: 400px}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">B-Tree visualization</a>
-  </ul>
-</div>
-
-<article>
-<h2>B-Tree visualization</h2>
-<form><textarea id="code" name="code">type here, see a summary of the document b-tree below</textarea></form>
-      </div>
-      <div style="display: inline-block; height: 402px; overflow-y: auto" id="output"></div>
-    </div>
-
-    <script id="me">
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  lineNumbers: true,
-  lineWrapping: true
-});
-var updateTimeout;
-editor.on("change", function(cm) {
-  clearTimeout(updateTimeout);
-  updateTimeout = setTimeout(updateVisual, 200);
-});
-updateVisual();
-
-function updateVisual() {
-  var out = document.getElementById("output");
-  out.innerHTML = "";
-
-  function drawTree(out, node) {
-    if (node.lines) {
-      out.appendChild(document.createElement("div")).innerHTML =
-        "<b>leaf</b>: " + node.lines.length + " lines, " + Math.round(node.height) + " px";
-      var lines = out.appendChild(document.createElement("div"));
-      lines.style.lineHeight = "6px"; lines.style.marginLeft = "10px";
-      for (var i = 0; i < node.lines.length; ++i) {
-        var line = node.lines[i], lineElt = lines.appendChild(document.createElement("div"));
-        lineElt.className = "lineblock";
-        var gray = Math.min(line.text.length * 3, 230), col = gray.toString(16);
-        if (col.length == 1) col = "0" + col;
-        lineElt.style.background = "#" + col + col + col;
-                          console.log(line.height, line);
-        lineElt.style.width = Math.max(Math.round(line.height / 3), 1) + "px";
-      }
-    } else {
-      out.appendChild(document.createElement("div")).innerHTML =
-        "<b>node</b>: " + node.size + " lines, " + Math.round(node.height) + " px";
-      var sub = out.appendChild(document.createElement("div"));
-      sub.style.paddingLeft = "20px";
-      for (var i = 0; i < node.children.length; ++i)
-        drawTree(sub, node.children[i]);
-    }
-  }
-  drawTree(out, editor.getDoc());
-}
-
-function fillEditor() {
-  var sc = document.getElementById("me");
-  var doc = (sc.textContent || sc.innerText || sc.innerHTML).replace(/^\s*/, "") + "\n";
-  doc += doc; doc += doc; doc += doc; doc += doc; doc += doc; doc += doc;
-  editor.setValue(doc);
-}
-    </script>
-
-<p><button onclick="fillEditor()">Add a lot of content</button></p>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/buffers.html b/resources/libs/codemirror/demo/buffers.html
deleted file mode 100644
index 951209cad..000000000
--- a/resources/libs/codemirror/demo/buffers.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Multiple Buffer & Split View Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<script src="../mode/css/css.js"></script>
-<style type="text/css" id=style>
-      .CodeMirror {border: 1px solid black; height: 250px;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Multiple Buffer & Split View</a>
-  </ul>
-</div>
-
-<article>
-<h2>Multiple Buffer & Split View Demo</h2>
-
-
-    <div id=code_top></div>
-    <div>
-      Select buffer: <select id=buffers_top></select>
-      &nbsp; &nbsp; <button onclick="newBuf('top')">New buffer</button>
-    </div>
-    <div id=code_bot></div>
-    <div>
-      Select buffer: <select id=buffers_bot></select>
-      &nbsp; &nbsp; <button onclick="newBuf('bot')">New buffer</button>
-    </div>
-
-    <script id=script>
-var sel_top = document.getElementById("buffers_top");
-CodeMirror.on(sel_top, "change", function() {
-  selectBuffer(ed_top, sel_top.options[sel_top.selectedIndex].value);
-});
-
-var sel_bot = document.getElementById("buffers_bot");
-CodeMirror.on(sel_bot, "change", function() {
-  selectBuffer(ed_bot, sel_bot.options[sel_bot.selectedIndex].value);
-});
-
-var buffers = {};
-
-function openBuffer(name, text, mode) {
-  buffers[name] = CodeMirror.Doc(text, mode);
-  var opt = document.createElement("option");
-  opt.appendChild(document.createTextNode(name));
-  sel_top.appendChild(opt);
-  sel_bot.appendChild(opt.cloneNode(true));
-}
-
-function newBuf(where) {
-  var name = prompt("Name for the buffer", "*scratch*");
-  if (name == null) return;
-  if (buffers.hasOwnProperty(name)) {
-    alert("There's already a buffer by that name.");
-    return;
-  }
-  openBuffer(name, "", "javascript");
-  selectBuffer(where == "top" ? ed_top : ed_bot, name);
-  var sel = where == "top" ? sel_top : sel_bot;
-  sel.value = name;
-}
-
-function selectBuffer(editor, name) {
-  var buf = buffers[name];
-  if (buf.getEditor()) buf = buf.linkedDoc({sharedHist: true});
-  var old = editor.swapDoc(buf);
-  var linked = old.iterLinkedDocs(function(doc) {linked = doc;});
-  if (linked) {
-    // Make sure the document in buffers is the one the other view is looking at
-    for (var name in buffers) if (buffers[name] == old) buffers[name] = linked;
-    old.unlinkDoc(linked);
-  }
-  editor.focus();
-}
-
-function nodeContent(id) {
-  var node = document.getElementById(id), val = node.textContent || node.innerText;
-  val = val.slice(val.match(/^\s*/)[0].length, val.length - val.match(/\s*$/)[0].length) + "\n";
-  return val;
-}
-openBuffer("js", nodeContent("script"), "javascript");
-openBuffer("css", nodeContent("style"), "css");
-
-var ed_top = CodeMirror(document.getElementById("code_top"), {lineNumbers: true});
-selectBuffer(ed_top, "js");
-var ed_bot = CodeMirror(document.getElementById("code_bot"), {lineNumbers: true});
-selectBuffer(ed_bot, "js");
-</script>
-
-    <p>Demonstration of
-    using <a href="../doc/manual.html#linkedDoc">linked documents</a>
-    to provide a split view on a document, and
-    using <a href="../doc/manual.html#swapDoc"><code>swapDoc</code></a>
-    to use a single editor to display multiple documents.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/changemode.html b/resources/libs/codemirror/demo/changemode.html
deleted file mode 100644
index 61c178607..000000000
--- a/resources/libs/codemirror/demo/changemode.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Mode-Changing Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<script src="../mode/scheme/scheme.js"></script>
-<style type="text/css">
-      .CodeMirror {border: 1px solid black;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Mode-Changing</a>
-  </ul>
-</div>
-
-<article>
-<h2>Mode-Changing Demo</h2>
-<form><textarea id="code" name="code">
-;; If there is Scheme code in here, the editor will be in Scheme mode.
-;; If you put in JS instead, it'll switch to JS mode.
-
-(define (double x)
-  (* x x))
-</textarea></form>
-
-<p>On changes to the content of the above editor, a (crude) script
-tries to auto-detect the language used, and switches the editor to
-either JavaScript or Scheme mode based on that.</p>
-
-<script>
-  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-    mode: "scheme",
-    lineNumbers: true,
-    tabMode: "indent"
-  });
-  editor.on("change", function() {
-    clearTimeout(pending);
-    setTimeout(update, 400);
-  });
-  var pending;
-  function looksLikeScheme(code) {
-    return !/^\s*\(\s*function\b/.test(code) && /^\s*[;\(]/.test(code);
-  }
-  function update() {
-    editor.setOption("mode", looksLikeScheme(editor.getValue()) ? "scheme" : "javascript");
-  }
-</script>
-  </article>
diff --git a/resources/libs/codemirror/demo/closebrackets.html b/resources/libs/codemirror/demo/closebrackets.html
deleted file mode 100644
index 8c0dc1cc3..000000000
--- a/resources/libs/codemirror/demo/closebrackets.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Closebrackets Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/edit/closebrackets.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Closebrackets</a>
-  </ul>
-</div>
-
-<article>
-<h2>Closebrackets Demo</h2>
-<form><textarea id="code" name="code">(function() {
-  var DEFAULT_BRACKETS = "()[]{}''\"\"";
-
-  CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
-    var wasOn = old && old != CodeMirror.Init;
-    if (val && !wasOn)
-      cm.addKeyMap(buildKeymap(typeof val == "string" ? val : DEFAULT_BRACKETS));
-    else if (!val && wasOn)
-      cm.removeKeyMap("autoCloseBrackets");
-  });
-
-  function buildKeymap(pairs) {
-    var map = {name : "autoCloseBrackets"};
-    for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
-      function maybeOverwrite(cm) {
-        var cur = cm.getCursor(), ahead = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1));
-        if (ahead != right) return CodeMirror.Pass;
-        else cm.execCommand("goCharRight");
-      }
-      map["'" + left + "'"] = function(cm) {
-        if (left == right && maybeOverwrite(cm) != CodeMirror.Pass) return;
-        var cur = cm.getCursor(), ahead = CodeMirror.Pos(cur.line, cur.ch + 1);
-        cm.replaceSelection(left + right, {head: ahead, anchor: ahead});
-      };
-      if (left != right) map["'" + right + "'"] = maybeOverwrite;
-    })(pairs.charAt(i), pairs.charAt(i + 1));
-    return map;
-  }
-})();
-</textarea></form>
-
-    <script type="text/javascript">
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {autoCloseBrackets: true});
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/demo/closetag.html b/resources/libs/codemirror/demo/closetag.html
deleted file mode 100644
index 8981f7eb3..000000000
--- a/resources/libs/codemirror/demo/closetag.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Close-Tag Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/edit/closetag.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<script src="../mode/css/css.js"></script>
-<script src="../mode/htmlmixed/htmlmixed.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Close-Tag</a>
-  </ul>
-</div>
-
-<article>
-<h2>Close-Tag Demo</h2>
-<form><textarea id="code" name="code"><html</textarea></form>
-
-    <script type="text/javascript">
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: 'text/html',
-        autoCloseTags: true
-      });
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/demo/complete.html b/resources/libs/codemirror/demo/complete.html
deleted file mode 100644
index e256a908b..000000000
--- a/resources/libs/codemirror/demo/complete.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Autocomplete Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/hint/show-hint.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/hint/show-hint.js"></script>
-<script src="../addon/hint/javascript-hint.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Autocomplete</a>
-  </ul>
-</div>
-
-<article>
-<h2>Autocomplete Demo</h2>
-<form><textarea id="code" name="code">
-function getCompletions(token, context) {
-  var found = [], start = token.string;
-  function maybeAdd(str) {
-    if (str.indexOf(start) == 0) found.push(str);
-  }
-  function gatherCompletions(obj) {
-    if (typeof obj == "string") forEach(stringProps, maybeAdd);
-    else if (obj instanceof Array) forEach(arrayProps, maybeAdd);
-    else if (obj instanceof Function) forEach(funcProps, maybeAdd);
-    for (var name in obj) maybeAdd(name);
-  }
-
-  if (context) {
-    // If this is a property, see if it belongs to some object we can
-    // find in the current environment.
-    var obj = context.pop(), base;
-    if (obj.className == "js-variable")
-      base = window[obj.string];
-    else if (obj.className == "js-string")
-      base = "";
-    else if (obj.className == "js-atom")
-      base = 1;
-    while (base != null && context.length)
-      base = base[context.pop().string];
-    if (base != null) gatherCompletions(base);
-  }
-  else {
-    // If not, just look in the window object and any local scope
-    // (reading into JS mode internals to get at the local variables)
-    for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
-    gatherCompletions(window);
-    forEach(keywords, maybeAdd);
-  }
-  return found;
-}
-</textarea></form>
-
-<p>Press <strong>ctrl-space</strong> to activate autocompletion. Built
-on top of the <a href="../doc/manual.html#addon_show-hint"><code>show-hint</code></a>
-and <a href="../doc/manual.html#addon_javascript-hint"><code>javascript-hint</code></a>
-addons.</p>
-
-    <script>
-      CodeMirror.commands.autocomplete = function(cm) {
-        CodeMirror.showHint(cm, CodeMirror.hint.javascript);
-      };
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        extraKeys: {"Ctrl-Space": "autocomplete"}
-      });
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/demo/emacs.html b/resources/libs/codemirror/demo/emacs.html
deleted file mode 100644
index 5b622a999..000000000
--- a/resources/libs/codemirror/demo/emacs.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Emacs bindings demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/dialog/dialog.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/clike/clike.js"></script>
-<script src="../keymap/emacs.js"></script>
-<script src="../addon/edit/matchbrackets.js"></script>
-<script src="../addon/comment/comment.js"></script>
-<script src="../addon/dialog/dialog.js"></script>
-<script src="../addon/search/searchcursor.js"></script>
-<script src="../addon/search/search.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Emacs bindings</a>
-  </ul>
-</div>
-
-<article>
-<h2>Emacs bindings demo</h2>
-<form><textarea id="code" name="code">
-#include "syscalls.h"
-/* getchar:  simple buffered version */
-int getchar(void)
-{
-  static char buf[BUFSIZ];
-  static char *bufp = buf;
-  static int n = 0;
-  if (n == 0) {  /* buffer is empty */
-    n = read(0, buf, sizeof buf);
-    bufp = buf;
-  }
-  return (--n >= 0) ? (unsigned char) *bufp++ : EOF;
-}
-</textarea></form>
-
-<p>The emacs keybindings are enabled by
-including <a href="../keymap/emacs.js">keymap/emacs.js</a> and setting
-the <code>keyMap</code> option to <code>"emacs"</code>. Because
-CodeMirror's internal API is quite different from Emacs, they are only
-a loose approximation of actual emacs bindings, though.</p>
-
-<p>Also note that a lot of browsers disallow certain keys from being
-captured. For example, Chrome blocks both Ctrl-W and Ctrl-N, with the
-result that idiomatic use of Emacs keys will constantly close your tab
-or open a new window.</p>
-
-    <script>
-      CodeMirror.commands.save = function() {
-        var elt = editor.getWrapperElement();
-        elt.style.background = "#def";
-        setTimeout(function() { elt.style.background = ""; }, 300);
-      };
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "text/x-csrc",
-        keyMap: "emacs"
-      });
-    </script>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/folding.html b/resources/libs/codemirror/demo/folding.html
deleted file mode 100644
index 946180127..000000000
--- a/resources/libs/codemirror/demo/folding.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Code Folding Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/fold/foldgutter.css" />
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/fold/foldcode.js"></script>
-<script src="../addon/fold/foldgutter.js"></script>
-<script src="../addon/fold/brace-fold.js"></script>
-<script src="../addon/fold/xml-fold.js"></script>
-<script src="../addon/fold/comment-fold.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Code Folding</a>
-  </ul>
-</div>
-
-<article>
-<h2>Code Folding Demo</h2>
-<form>
-      <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br><textarea id="code" name="code"></textarea></div>
-      <div style="max-width: 50em">HTML:<br><textarea id="code-html" name="code-html"></textarea></div>
-    </form>
-    <script id="script">
-/*
- * Demonstration of code folding
- */
-window.onload = function() {
-  var te = document.getElementById("code");
-  var sc = document.getElementById("script");
-  te.value = (sc.textContent || sc.innerText || sc.innerHTML).replace(/^\s*/, "");
-  sc.innerHTML = "";
-  var te_html = document.getElementById("code-html");
-  te_html.value = "<html>\n  " + document.documentElement.innerHTML + "\n</html>";
-
-  window.editor = CodeMirror.fromTextArea(te, {
-    mode: "javascript",
-    lineNumbers: true,
-    lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
-    foldGutter: {
-    	rangeFinder: new CodeMirror.fold.combine(CodeMirror.fold.brace, CodeMirror.fold.comment)
-    },
-    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
-  });
-  editor.foldCode(CodeMirror.Pos(8, 0));
-
-  window.editor_html = CodeMirror.fromTextArea(te_html, {
-    mode: "text/html",
-    lineNumbers: true,
-    lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
-    foldGutter: true,
-    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
-  });
-  editor_html.foldCode(CodeMirror.Pos(13, 0));
-  editor_html.foldCode(CodeMirror.Pos(1, 0));
-};
-</script>
-  </article>
diff --git a/resources/libs/codemirror/demo/fullscreen.html b/resources/libs/codemirror/demo/fullscreen.html
deleted file mode 100644
index 827d55d0c..000000000
--- a/resources/libs/codemirror/demo/fullscreen.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Full Screen Editing</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/display/fullscreen.css">
-<link rel="stylesheet" href="../theme/night.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<script src="../addon/display/fullscreen.js"></script>
-
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Full Screen Editing</a>
-  </ul>
-</div>
-
-<article>
-<h2>Full Screen Editing</h2>
-<form><textarea id="code" name="code" rows="5">
-  <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt>
-  <dd>Whether, when indenting, the first N*8 spaces should be
-  replaced by N tabs. Default is false.</dd>
-
-  <dt id="option_tabMode"><code>tabMode (string)</code></dt>
-  <dd>Determines what happens when the user presses the tab key.
-  Must be one of the following:
-    <dl>
-      <dt><code>"classic" (the default)</code></dt>
-      <dd>When nothing is selected, insert a tab. Otherwise,
-      behave like the <code>"shift"</code> mode. (When shift is
-      held, this behaves like the <code>"indent"</code> mode.)</dd>
-      <dt><code>"shift"</code></dt>
-      <dd>Indent all selected lines by
-      one <a href="#option_indentUnit"><code>indentUnit</code></a>.
-      If shift was held while pressing tab, un-indent all selected
-      lines one unit.</dd>
-      <dt><code>"indent"</code></dt>
-      <dd>Indent the line the 'correctly', based on its syntactic
-      context. Only works if the
-      mode <a href="#indent">supports</a> it.</dd>
-      <dt><code>"default"</code></dt>
-      <dd>Do not capture tab presses, let the browser apply its
-      default behaviour (which usually means it skips to the next
-      control).</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-
-</textarea></form>
-  <script>
-    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-      lineNumbers: true,
-      theme: "night",
-      extraKeys: {
-        "F11": function(cm) {
-          cm.setOption("fullScreen", !cm.getOption("fullScreen"));
-        },
-        "Esc": function(cm) {
-          if (cm.getOption("fullScreen")) cm.setOption("fullScreen", false);
-        }
-      }
-    });
-  </script>
-
-    <p>Demonstration of
-    the <a href="../doc/manual.html#addon_fullscreen">fullscreen</a>
-    addon. Press <strong>F11</strong> when cursor is in the editor to
-    toggle full screen editing. <strong>Esc</strong> can also be used
-    to <i>exit</i> full screen editing.</p>
-  </article>
diff --git a/resources/libs/codemirror/demo/hardwrap.html b/resources/libs/codemirror/demo/hardwrap.html
deleted file mode 100644
index a53d68dec..000000000
--- a/resources/libs/codemirror/demo/hardwrap.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Hard-wrapping Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/markdown/markdown.js"></script>
-<script src="../addon/wrap/hardwrap.js"></script>
-<style type="text/css">
-  .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Hard-wrapping</a>
-  </ul>
-</div>
-
-<article>
-<h2>Hard-wrapping Demo</h2>
-<form><textarea id="code" name="code">Lorem ipsum dolor sit amet, vim augue dictas constituto ex,
-sit falli simul viderer te. Graeco scaevola maluisset sit
-ut, in idque viris praesent sea. Ea sea eirmod indoctum
-repudiare. Vel noluisse suscipit pericula ut. In ius nulla
-alienum molestie. Mei essent discere democritum id.
-
-Equidem ponderum expetendis ius in, mea an erroribus
-constituto, congue timeam perfecto ad est. Ius ut primis
-timeam, per in ullum mediocrem. An case vero labitur pri,
-vel dicit laoreet et. An qui prompta conclusionemque, eam
-timeam sapientem in, cum dictas epicurei eu.
-
-Usu cu vide dictas deseruisse, eum choro graece adipiscing
-ut. Cibo qualisque ius ad, et dicat scripta mea, eam nihil
-mentitum aliquando cu. Debet aperiam splendide at quo, ad
-paulo nostro commodo duo. Sea adhuc utinam conclusionemque
-id, quas doming malorum nec ad. Tollit eruditi vivendum ad
-ius, eos soleat ignota ad.
-</textarea></form>
-
-<p>Demonstration of
-the <a href="../doc/manual.html#addon_hardwrap">hardwrap</a> addon.
-The above editor has its change event hooked up to
-the <code>wrapParagraphsInRange</code> method, so that the paragraphs
-are reflown as you are typing.</p>
-
-<script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  mode: "markdown",
-  lineNumbers: true
-});
-var wait, options = {column: 60};
-editor.on("change", function(cm, change) {
-  clearTimeout(wait);
-  wait = setTimeout(function() {
-    cm.wrapParagraphsInRange(change.from, CodeMirror.changeEnd(change), options);
-  }, 200);
-});
-</script>
-
-</article>
diff --git a/resources/libs/codemirror/demo/html5complete.html b/resources/libs/codemirror/demo/html5complete.html
deleted file mode 100644
index 899260aa2..000000000
--- a/resources/libs/codemirror/demo/html5complete.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: HTML completion demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/hint/show-hint.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/hint/show-hint.js"></script>
-<script src="../addon/hint/xml-hint.js"></script>
-<script src="../addon/hint/html-hint.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<script src="../mode/css/css.js"></script>
-<script src="../mode/htmlmixed/htmlmixed.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">HTML completion</a>
-  </ul>
-</div>
-
-<article>
-<h2>HTML completion demo</h2>
-
-    <p>Shows the <a href="xmlcomplete.html">XML completer</a>
-    parameterized with information about the tags in HTML.
-    Press <strong>ctrl-space</strong> to activate completion.</p>
-
-    <div id="code"></div>
-
-    <script type="text/javascript">
-      CodeMirror.commands.autocomplete = function(cm) {
-          CodeMirror.showHint(cm, CodeMirror.hint.html);
-      }
-      window.onload = function() {
-        editor = CodeMirror(document.getElementById("code"), {
-          mode: "text/html",
-          extraKeys: {"Ctrl-Space": "autocomplete"},
-          value: "<!doctype html>\n<html>\n  " + document.documentElement.innerHTML + "\n</html>"
-        });
-      };
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/demo/indentwrap.html b/resources/libs/codemirror/demo/indentwrap.html
deleted file mode 100644
index 6c1fc596e..000000000
--- a/resources/libs/codemirror/demo/indentwrap.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Indented wrapped line demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Indented wrapped line</a>
-  </ul>
-</div>
-
-<article>
-<h2>Indented wrapped line demo</h2>
-<form><textarea id="code" name="code">
-<!doctype html>
-<body>
-  <h2 id="overview">Overview</h2>
-
-  <p>CodeMirror is a code-editor component that can be embedded in Web pages. The core library provides <em>only</em> the editor component, no accompanying buttons, auto-completion, or other IDE functionality. It does provide a rich API on top of which such functionality can be straightforwardly implemented. See the <a href="#addons">add-ons</a> included in the distribution, and the <a href="https://github.com/jagthedrummer/codemirror-ui">CodeMirror UI</a> project, for reusable implementations of extra features.</p>
-
-  <p>CodeMirror works with language-specific modes. Modes are JavaScript programs that help color (and optionally indent) text written in a given language. The distribution comes with a number of modes (see the <a href="../mode/"><code>mode/</code></a> directory), and it isn't hard to <a href="#modeapi">write new ones</a> for other languages.</p>
-</body>
-</textarea></form>
-
-    <p>This page uses a hack on top of the <code>"renderLine"</code>
-    event to make wrapped text line up with the base indentation of
-    the line.</p>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        lineWrapping: true,
-        mode: "text/html"
-      });
-      var charWidth = editor.defaultCharWidth(), basePadding = 4;
-      editor.on("renderLine", function(cm, line, elt) {
-        var off = CodeMirror.countColumn(line.text, null, cm.getOption("tabSize")) * charWidth;
-        elt.style.textIndent = "-" + off + "px";
-        elt.style.paddingLeft = (basePadding + off) + "px";
-      });
-      editor.refresh();
-    </script>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/lint.html b/resources/libs/codemirror/demo/lint.html
deleted file mode 100644
index 8372c52c4..000000000
--- a/resources/libs/codemirror/demo/lint.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Linter Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/lint/lint.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<script src="../mode/css/css.js"></script>
-<script src="http://ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
-<script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
-<script src="https://rawgithub.amrom.workers.dev/stubbornella/csslint/master/release/csslint.js"></script>
-<script src="../addon/lint/lint.js"></script>
-<script src="../addon/lint/javascript-lint.js"></script>
-<script src="../addon/lint/json-lint.js"></script>
-<script src="../addon/lint/css-lint.js"></script>
-<style type="text/css">
-      .CodeMirror {border: 1px solid black;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Linter</a>
-  </ul>
-</div>
-
-<article>
-<h2>Linter Demo</h2>
-
-
-    <p><textarea id="code-js">var widgets = []
-function updateHints() {
-  editor.operation(function(){
-    for (var i = 0; i < widgets.length; ++i)
-      editor.removeLineWidget(widgets[i]);
-    widgets.length = 0;
-
-    JSHINT(editor.getValue());
-    for (var i = 0; i < JSHINT.errors.length; ++i) {
-      var err = JSHINT.errors[i];
-      if (!err) continue;
-      var msg = document.createElement("div");
-      var icon = msg.appendChild(document.createElement("span"));
-      icon.innerHTML = "!!";
-      icon.className = "lint-error-icon";
-      msg.appendChild(document.createTextNode(err.reason));
-      msg.className = "lint-error";
-      widgets.push(editor.addLineWidget(err.line - 1, msg, {coverGutter: false, noHScroll: true}));
-    }
-  });
-  var info = editor.getScrollInfo();
-  var after = editor.charCoords({line: editor.getCursor().line + 1, ch: 0}, "local").top;
-  if (info.top + info.clientHeight < after)
-    editor.scrollTo(null, after - info.clientHeight + 3);
-}
-</textarea></p>
-
-    <p><textarea id="code-json">[
- {
-  _id: "post 1",
-  "author": "Bob",
-  "content": "...",
-  "page_views": 5
- },
- {
-  "_id": "post 2",
-  "author": "Bob",
-  "content": "...",
-  "page_views": 9
- },
- {
-  "_id": "post 3",
-  "author": "Bob",
-  "content": "...",
-  "page_views": 8
- }
-]
-</textarea></p>
-
-    <p><textarea id="code-css">@charset "UTF-8";
-
-@import url("booya.css") print, screen;
-@import "whatup.css" screen;
-@import "wicked.css";
-
-/*Error*/
-@charset "UTF-8";
-
-
-@namespace "http://www.w3.org/1999/xhtml";
-@namespace svg "http://www.w3.org/2000/svg";
-
-/*Warning: empty ruleset */
-.foo {
-}
-
-h1 {
-    font-weight: bold;
-}
-
-/*Warning: qualified heading */
-.foo h1 {
-    font-weight: bold;
-}
-
-/*Warning: adjoining classes */
-.foo.bar {
-    zoom: 1;
-}
-
-li.inline {
-    width: 100%;  /*Warning: 100% can be problematic*/
-}
-
-li.last {
-  display: inline;
-  padding-left: 3px !important;
-  padding-right: 3px;
-  border-right: 0px;
-}
-
-@media print {
-    li.inline {
-      color: black;
-    }
-}
-
-@page {
-  margin: 10%;
-  counter-increment: page;
-
-  @top-center {
-    font-family: sans-serif;
-    font-weight: bold;
-    font-size: 2em;
-    content: counter(page);
-  }
-}
-</textarea></p>
-<script>
-  var editor = CodeMirror.fromTextArea(document.getElementById("code-js"), {
-    lineNumbers: true,
-    mode: "javascript",
-    gutters: ["CodeMirror-lint-markers"],
-    lint: true
-  });
-
-  var editor_json = CodeMirror.fromTextArea(document.getElementById("code-json"), {
-    lineNumbers: true,
-    mode: "application/json",
-    gutters: ["CodeMirror-lint-markers"],
-    lint: true
-  });
-  
-  var editor_css = CodeMirror.fromTextArea(document.getElementById("code-css"), {
-    lineNumbers: true,
-    mode: "css",
-    gutters: ["CodeMirror-lint-markers"],
-    lint: true
-  });
-</script>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/loadmode.html b/resources/libs/codemirror/demo/loadmode.html
deleted file mode 100644
index be28c7a81..000000000
--- a/resources/libs/codemirror/demo/loadmode.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Lazy Mode Loading Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/mode/loadmode.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Lazy Mode Loading</a>
-  </ul>
-</div>
-
-<article>
-<h2>Lazy Mode Loading Demo</h2>
-<form><textarea id="code" name="code">This is the editor.
-// It starts out in plain text mode,
-#  use the control below to load and apply a mode
-  "you'll see the highlighting of" this text /*change*/.
-</textarea></form>
-<p><input type=text value=javascript id=mode> <button type=button onclick="change()">change mode</button></p>
-
-    <script>
-CodeMirror.modeURL = "../mode/%N/%N.js";
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  lineNumbers: true
-});
-var modeInput = document.getElementById("mode");
-CodeMirror.on(modeInput, "keypress", function(e) {
-  if (e.keyCode == 13) change();
-});
-function change() {
-   editor.setOption("mode", modeInput.value);
-   CodeMirror.autoLoadMode(editor, modeInput.value);
-}
-</script>
-  </article>
diff --git a/resources/libs/codemirror/demo/marker.html b/resources/libs/codemirror/demo/marker.html
deleted file mode 100644
index ac4dfda89..000000000
--- a/resources/libs/codemirror/demo/marker.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Breakpoint Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<style type="text/css">
-      .breakpoints {width: .8em;}
-      .breakpoint { color: #822; }
-      .CodeMirror {border: 1px solid #aaa;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Breakpoint</a>
-  </ul>
-</div>
-
-<article>
-<h2>Breakpoint Demo</h2>
-<form><textarea id="code" name="code">
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  lineNumbers: true,
-  gutters: ["CodeMirror-linenumbers", "breakpoints"]
-});
-editor.on("gutterClick", function(cm, n) {
-  var info = cm.lineInfo(n);
-  cm.setGutterMarker(n, "breakpoints", info.gutterMarkers ? null : makeMarker());
-});
-
-function makeMarker() {
-  var marker = document.createElement("div");
-  marker.style.color = "#822";
-  marker.innerHTML = "●";
-  return marker;
-}
-</textarea></form>
-
-<p>Click the line-number gutter to add or remove 'breakpoints'.</p>
-
-    <script>eval(document.getElementById("code").value);</script>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/markselection.html b/resources/libs/codemirror/demo/markselection.html
deleted file mode 100644
index 454933264..000000000
--- a/resources/libs/codemirror/demo/markselection.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Match Selection Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/search/searchcursor.js"></script>
-<script src="../addon/selection/mark-selection.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .CodeMirror-selected  { background-color: blue !important; }
-      .CodeMirror-selectedtext { color: white; }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Match Selection</a>
-  </ul>
-</div>
-
-<article>
-<h2>Match Selection Demo</h2>
-<form><textarea id="code" name="code">Select something from here.
-You'll see that the selection's foreground color changes to white!
-Since, by default, CodeMirror only puts an independent "marker" layer
-behind the text, you'll need something like this to change its colour.</textarea></form>
-
-    <script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  lineNumbers: true,
-  styleSelectedText: true
-});
-</script>
-
-    <p>Simple addon to easily mark (and style) selected text.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/matchhighlighter.html b/resources/libs/codemirror/demo/matchhighlighter.html
deleted file mode 100644
index 170213bfc..000000000
--- a/resources/libs/codemirror/demo/matchhighlighter.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Match Highlighter Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/search/searchcursor.js"></script>
-<script src="../addon/search/match-highlighter.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .CodeMirror-focused .cm-matchhighlight {
-        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
-        background-position: bottom;
-        background-repeat: repeat-x;
-      }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Match Highlighter</a>
-  </ul>
-</div>
-
-<article>
-<h2>Match Highlighter Demo</h2>
-<form><textarea id="code" name="code">Select this text: hardToSpotVar
-	And everywhere else in your code where hardToSpotVar appears will automatically illuminate.
-Give it a try!  No more hardToSpotVars.</textarea></form>
-
-    <script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  lineNumbers: true,
-  highlightSelectionMatches: {showToken: /\w/}
-});
-</script>
-
-    <p>Search and highlight occurences of the selected text.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/matchtags.html b/resources/libs/codemirror/demo/matchtags.html
deleted file mode 100644
index 9a3797e59..000000000
--- a/resources/libs/codemirror/demo/matchtags.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Tag Matcher Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/fold/xml-fold.js"></script>
-<script src="../addon/edit/matchtags.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Tag Matcher</a>
-  </ul>
-</div>
-
-<article>
-<h2>Tag Matcher Demo</h2>
-
-
-    <div id="editor"></div>
-
-    <script>
-window.onload = function() {
-  editor = CodeMirror(document.getElementById("editor"), {
-    value: "<html>\n  " + document.documentElement.innerHTML + "\n</html>",
-    mode: "text/html",
-    matchTags: {bothTags: true},
-    extraKeys: {"Ctrl-J": "toMatchingTag"}
-  });
-};
-    </script>
-
-    <p>Put the cursor on or inside a pair of tags to highlight them.
-    Press Ctrl-J to jump to the tag that matches the one under the
-    cursor.</p>
-  </article>
diff --git a/resources/libs/codemirror/demo/merge.html b/resources/libs/codemirror/demo/merge.html
deleted file mode 100644
index d2df900c2..000000000
--- a/resources/libs/codemirror/demo/merge.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: merge view demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel=stylesheet href="../lib/codemirror.css">
-<link rel=stylesheet href="../addon/merge/merge.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<script src="../addon/merge/dep/diff_match_patch.js"></script>
-<script src="../addon/merge/merge.js"></script>
-<style>
-    .CodeMirror { line-height: 1.2; }
-    body { max-width: 80em; }
-    span.clicky {
-      cursor: pointer;
-      background: #d70;
-      color: white;
-      padding: 0 3px;
-      border-radius: 3px;
-    }
-  </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">merge view</a>
-  </ul>
-</div>
-
-<article>
-<h2>merge view demo</h2>
-
-
-<div id=view></div>
-
-<p>The <a href="../doc/manual.html#addon_merge"><code>merge</code></a>
-addon provides an interface for displaying and merging diffs,
-either <span class=clicky onclick="initUI(2)">two-way</span>
-or <span class=clicky onclick="initUI(3)">three-way</span>. The left
-(or center) pane is editable, and the differences with the other
-pane(s) are <span class=clicky onclick="toggleDifferences()">optionally</span> shown live as you edit it.</p>
-
-<p>This addon depends on
-the <a href="https://code.google.com/p/google-diff-match-patch/">google-diff-match-patch</a>
-library to compute the diffs.</p>
-
-<script>
-var value, orig1, orig2, dv, hilight= true;
-function initUI(panes) {
-  if (value == null) return;
-  var target = document.getElementById("view");
-  target.innerHTML = "";
-  dv = CodeMirror.MergeView(target, {
-    value: value,
-    origLeft: panes == 3 ? orig1 : null,
-    orig: orig2,
-    lineNumbers: true,
-    mode: "text/html",
-    highlightDifferences: hilight
-  });
-}
-
-function toggleDifferences() {
-  dv.setShowDifferences(hilight = !hilight);
-}
-
-window.onload = function() {
-  value = document.documentElement.innerHTML;
-  orig1 = value.replace(/\.\.\//g, "codemirror/").replace("yellow", "orange");
-  orig2 = value.replace(/\u003cscript/g, "\u003cscript type=text/javascript ")
-    .replace("white", "purple;\n      font: comic sans;\n      text-decoration: underline;\n      height: 15em");
-  initUI(2);
-};
-</script>
-</article>
diff --git a/resources/libs/codemirror/demo/multiplex.html b/resources/libs/codemirror/demo/multiplex.html
deleted file mode 100644
index 2ad9608a8..000000000
--- a/resources/libs/codemirror/demo/multiplex.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Multiplexing Parser Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/mode/multiplex.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<style type="text/css">
-      .CodeMirror {border: 1px solid black;}
-      .cm-delimit {color: #fa4;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Multiplexing Parser</a>
-  </ul>
-</div>
-
-<article>
-<h2>Multiplexing Parser Demo</h2>
-<form><textarea id="code" name="code">
-<html>
-  <body style="<<magic>>">
-    <h1><< this is not <html >></h1>
-    <<
-        multiline
-        not html
-        at all : &amp;amp; <link/>
-    >>
-    <p>this is html again</p>
-  </body>
-</html>
-</textarea></form>
-
-    <script>
-CodeMirror.defineMode("demo", function(config) {
-  return CodeMirror.multiplexingMode(
-    CodeMirror.getMode(config, "text/html"),
-    {open: "<<", close: ">>",
-     mode: CodeMirror.getMode(config, "text/plain"),
-     delimStyle: "delimit"}
-    // .. more multiplexed styles can follow here
-  );
-});
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  mode: "demo",
-  lineNumbers: true,
-  lineWrapping: true
-});
-</script>
-
-    <p>Demonstration of a multiplexing mode, which, at certain
-    boundary strings, switches to one or more inner modes. The out
-    (HTML) mode does not get fed the content of the <code>&lt;&lt;
-    >></code> blocks. See
-    the <a href="../doc/manual.html#addon_multiplex">manual</a> and
-    the <a href="../addon/mode/multiplex.js">source</a> for more
-    information.</p>
-
-    <p>
-      <strong>Parsing/Highlighting Tests:</strong>
-      <a href="../test/index.html#multiplexing_*">normal</a>,
-      <a href="../test/index.html#verbose,multiplexing_*">verbose</a>.
-    </p>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/mustache.html b/resources/libs/codemirror/demo/mustache.html
deleted file mode 100644
index cb0291598..000000000
--- a/resources/libs/codemirror/demo/mustache.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Overlay Parser Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/mode/overlay.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<style type="text/css">
-      .CodeMirror {border: 1px solid black;}
-      .cm-mustache {color: #0ca;}
-</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Overlay Parser</a>
-  </ul>
-</div>
-
-<article>
-<h2>Overlay Parser Demo</h2>
-<form><textarea id="code" name="code">
-<html>
-  <body>
-    <h1>{{title}}</h1>
-    <p>These are links to {{things}}:</p>
-    <ul>{{#links}}
-      <li><a href="{{url}}">{{text}}</a></li>
-    {{/links}}</ul>
-  </body>
-</html>
-</textarea></form>
-
-    <script>
-CodeMirror.defineMode("mustache", function(config, parserConfig) {
-  var mustacheOverlay = {
-    token: function(stream, state) {
-      var ch;
-      if (stream.match("{{")) {
-        while ((ch = stream.next()) != null)
-          if (ch == "}" && stream.next() == "}") break;
-        stream.eat("}");
-        return "mustache";
-      }
-      while (stream.next() != null && !stream.match("{{", false)) {}
-      return null;
-    }
-  };
-  return CodeMirror.overlayMode(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), mustacheOverlay);
-});
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "mustache"});
-</script>
-
-    <p>Demonstration of a mode that parses HTML, highlighting
-    the <a href="http://mustache.github.com/">Mustache</a> templating
-    directives inside of it by using the code
-    in <a href="../addon/mode/overlay.js"><code>overlay.js</code></a>. View
-    source to see the 15 lines of code needed to accomplish this.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/placeholder.html b/resources/libs/codemirror/demo/placeholder.html
deleted file mode 100644
index 6cf098b01..000000000
--- a/resources/libs/codemirror/demo/placeholder.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Placeholder demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/display/placeholder.js"></script>
-<style type="text/css">
-      .CodeMirror { border: 1px solid silver; }
-      .CodeMirror-empty { outline: 1px solid #c22; }
-      .CodeMirror-empty.CodeMirror-focused { outline: none; }
-      .CodeMirror pre.CodeMirror-placeholder { color: #999; }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Placeholder</a>
-  </ul>
-</div>
-
-<article>
-<h2>Placeholder demo</h2>
-<form><textarea id="code" name="code" placeholder="Code goes here..."></textarea></form>
-
-    <p>The <a href="../doc/manual.html#addon_placeholder">placeholder</a>
-    plug-in adds an option <code>placeholder</code> that can be set to
-    make text appear in the editor when it is empty and not focused.
-    If the source textarea has a <code>placeholder</code> attribute,
-    it will automatically be inherited.</p>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true
-      });
-    </script>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/preview.html b/resources/libs/codemirror/demo/preview.html
deleted file mode 100644
index ccf9122e9..000000000
--- a/resources/libs/codemirror/demo/preview.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: HTML5 preview</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel=stylesheet href=../lib/codemirror.css>
-<script src=../lib/codemirror.js></script>
-<script src=../mode/xml/xml.js></script>
-<script src=../mode/javascript/javascript.js></script>
-<script src=../mode/css/css.js></script>
-<script src=../mode/htmlmixed/htmlmixed.js></script>
-<style type=text/css>
-      .CodeMirror {
-        float: left;
-        width: 50%;
-        border: 1px solid black;
-      }
-      iframe {
-        width: 49%;
-        float: left;
-        height: 300px;
-        border: 1px solid black;
-        border-left: 0px;
-      }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">HTML5 preview</a>
-  </ul>
-</div>
-
-<article>
-<h2>HTML5 preview</h2>
-
-    <textarea id=code name=code>
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>HTML5 canvas demo</title>
-    <style>p {font-family: monospace;}</style>
-  </head>
-  <body>
-    <p>Canvas pane goes here:</p>
-    <canvas id=pane width=300 height=200></canvas>
-    <script>
-      var canvas = document.getElementById('pane');
-      var context = canvas.getContext('2d');
-
-      context.fillStyle = 'rgb(250,0,0)';
-      context.fillRect(10, 10, 55, 50);
-
-      context.fillStyle = 'rgba(0, 0, 250, 0.5)';
-      context.fillRect(30, 30, 55, 50);
-    </script>
-  </body>
-</html></textarea>
-    <iframe id=preview></iframe>
-    <script>
-      var delay;
-      // Initialize CodeMirror editor with a nice html5 canvas demo.
-      var editor = CodeMirror.fromTextArea(document.getElementById('code'), {
-        mode: 'text/html',
-        tabMode: 'indent'
-      });
-      editor.on("change", function() {
-        clearTimeout(delay);
-        delay = setTimeout(updatePreview, 300);
-      });
-      
-      function updatePreview() {
-        var previewFrame = document.getElementById('preview');
-        var preview =  previewFrame.contentDocument ||  previewFrame.contentWindow.document;
-        preview.open();
-        preview.write(editor.getValue());
-        preview.close();
-      }
-      setTimeout(updatePreview, 300);
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/demo/resize.html b/resources/libs/codemirror/demo/resize.html
deleted file mode 100644
index 10326ef66..000000000
--- a/resources/libs/codemirror/demo/resize.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Autoresize Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/css/css.js"></script>
-<style type="text/css">
-      .CodeMirror {
-        border: 1px solid #eee;
-        height: auto;
-      }
-      .CodeMirror-scroll {
-        overflow-y: hidden;
-        overflow-x: auto;
-      }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Autoresize</a>
-  </ul>
-</div>
-
-<article>
-<h2>Autoresize Demo</h2>
-<form><textarea id="code" name="code">
-.CodeMirror {
-  border: 1px solid #eee;
-  height: auto;
-}
-.CodeMirror-scroll {
-  overflow-y: hidden;
-  overflow-x: auto;
-}
-</textarea></form>
-
-<p>By setting a few CSS properties, and giving
-the <a href="../doc/manual.html#option_viewportMargin"><code>viewportMargin</code></a>
-a value of <code>Infinity</code>, CodeMirror can be made to
-automatically resize to fit its content.</p>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        viewportMargin: Infinity
-      });
-    </script>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/runmode.html b/resources/libs/codemirror/demo/runmode.html
deleted file mode 100644
index 144783d34..000000000
--- a/resources/libs/codemirror/demo/runmode.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Mode Runner Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/runmode/runmode.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Mode Runner</a>
-  </ul>
-</div>
-
-<article>
-<h2>Mode Runner Demo</h2>
-
-
-    <textarea id="code" style="width: 90%; height: 7em; border: 1px solid black; padding: .2em .4em;">
-<foobar>
-  <blah>Enter your xml here and press the button below to display
-    it as highlighted by the CodeMirror XML mode</blah>
-  <tag2 foo="2" bar="&amp;quot;bar&amp;quot;"/>
-</foobar></textarea><br>
-    <button onclick="doHighlight();">Highlight!</button>
-    <pre id="output" class="cm-s-default"></pre>
-
-    <script>
-function doHighlight() {
-  CodeMirror.runMode(document.getElementById("code").value, "application/xml",
-                     document.getElementById("output"));
-}
-</script>
-
-    <p>Running a CodeMirror mode outside of the editor.
-    The <code>CodeMirror.runMode</code> function, defined
-    in <code><a href="../addon/runmode/runmode.js">lib/runmode.js</a></code> takes the following arguments:</p>
-
-    <dl>
-      <dt><code>text (string)</code></dt>
-      <dd>The document to run through the highlighter.</dd>
-      <dt><code>mode (<a href="../doc/manual.html#option_mode">mode spec</a>)</code></dt>
-      <dd>The mode to use (must be loaded as normal).</dd>
-      <dt><code>output (function or DOM node)</code></dt>
-      <dd>If this is a function, it will be called for each token with
-      two arguments, the token's text and the token's style class (may
-      be <code>null</code> for unstyled tokens). If it is a DOM node,
-      the tokens will be converted to <code>span</code> elements as in
-      an editor, and inserted into the node
-      (through <code>innerHTML</code>).</dd>
-    </dl>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/search.html b/resources/libs/codemirror/demo/search.html
deleted file mode 100644
index 4aef2a81c..000000000
--- a/resources/libs/codemirror/demo/search.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Search/Replace Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/dialog/dialog.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<script src="../addon/dialog/dialog.js"></script>
-<script src="../addon/search/searchcursor.js"></script>
-<script src="../addon/search/search.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      dt {font-family: monospace; color: #666;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Search/Replace</a>
-  </ul>
-</div>
-
-<article>
-<h2>Search/Replace Demo</h2>
-<form><textarea id="code" name="code">
-  <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt>
-  <dd>Whether, when indenting, the first N*8 spaces should be
-  replaced by N tabs. Default is false.</dd>
-
-  <dt id="option_tabMode"><code>tabMode (string)</code></dt>
-  <dd>Determines what happens when the user presses the tab key.
-  Must be one of the following:
-    <dl>
-      <dt><code>"classic" (the default)</code></dt>
-      <dd>When nothing is selected, insert a tab. Otherwise,
-      behave like the <code>"shift"</code> mode. (When shift is
-      held, this behaves like the <code>"indent"</code> mode.)</dd>
-      <dt><code>"shift"</code></dt>
-      <dd>Indent all selected lines by
-      one <a href="#option_indentUnit"><code>indentUnit</code></a>.
-      If shift was held while pressing tab, un-indent all selected
-      lines one unit.</dd>
-      <dt><code>"indent"</code></dt>
-      <dd>Indent the line the 'correctly', based on its syntactic
-      context. Only works if the
-      mode <a href="#indent">supports</a> it.</dd>
-      <dt><code>"default"</code></dt>
-      <dd>Do not capture tab presses, let the browser apply its
-      default behaviour (which usually means it skips to the next
-      control).</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-</textarea></form>
-
-    <script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "text/html", lineNumbers: true});
-</script>
-
-    <p>Demonstration of primitive search/replace functionality. The
-    keybindings (which can be overridden by custom keymaps) are:</p>
-    <dl>
-      <dt>Ctrl-F / Cmd-F</dt><dd>Start searching</dd>
-      <dt>Ctrl-G / Cmd-G</dt><dd>Find next</dd>
-      <dt>Shift-Ctrl-G / Shift-Cmd-G</dt><dd>Find previous</dd>
-      <dt>Shift-Ctrl-F / Cmd-Option-F</dt><dd>Replace</dd>
-      <dt>Shift-Ctrl-R / Shift-Cmd-Option-F</dt><dd>Replace all</dd>
-    </dl>
-    <p>Searching is enabled by
-    including <a href="../addon/search/search.js">addon/search/search.js</a>
-    and <a href="../addon/search/searchcursor.js">addon/search/searchcursor.js</a>.
-    For good-looking input dialogs, you also want to include
-    <a href="../addon/dialog/dialog.js">addon/dialog/dialog.js</a>
-    and <a href="../addon/dialog/dialog.css">addon/dialog/dialog.css</a>.</p>
-  </article>
diff --git a/resources/libs/codemirror/demo/spanaffectswrapping_shim.html b/resources/libs/codemirror/demo/spanaffectswrapping_shim.html
deleted file mode 100644
index e598221c0..000000000
--- a/resources/libs/codemirror/demo/spanaffectswrapping_shim.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Automatically derive odd wrapping behavior for your browser</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Automatically derive odd wrapping behavior for your browser</a>
-  </ul>
-</div>
-
-<article>
-<h2>Automatically derive odd wrapping behavior for your browser</h2>
-
-
-    <p>This is a hack to automatically derive
-    a <code>spanAffectsWrapping</code> regexp for a browser. See the
-    comments above that variable
-    in <a href="../lib/codemirror.js"><code>lib/codemirror.js</code></a>
-    for some more details.</p>
-
-    <div style="white-space: pre-wrap; width: 50px;" id="area"></div>
-    <pre id="output"></pre>
-
-    <script id="script">
-      var a = document.getElementById("area"), bad = Object.create(null);
-      var chars = "a~`!@#$%^&*()-_=+}{[]\\|'\"/?.>,<:;", l = chars.length;
-      for (var x = 0; x < l; ++x) for (var y = 0; y < l; ++y) {
-        var s1 = "foooo" + chars.charAt(x), s2 = chars.charAt(y) + "br";
-        a.appendChild(document.createTextNode(s1 + s2));
-        var h1 = a.offsetHeight;
-        a.innerHTML = "";
-        a.appendChild(document.createElement("span")).appendChild(document.createTextNode(s1));
-        a.appendChild(document.createElement("span")).appendChild(document.createTextNode(s2));
-        if (a.offsetHeight != h1)
-          bad[chars.charAt(x)] = (bad[chars.charAt(x)] || "") + chars.charAt(y);
-        a.innerHTML = "";
-      }
-
-      var re = "";
-      function toREElt(str) {
-        if (str.length > 1) {
-          var invert = false;
-          if (str.length > chars.length * .6) {
-            invert = true;
-            var newStr = "";
-            for (var i = 0; i < l; ++i) if (str.indexOf(chars.charAt(i)) == -1) newStr += chars.charAt(i);
-            str = newStr;
-          }
-          str = str.replace(/[\-\.\]\"\'\\\/\^a]/g, function(orig) { return orig == "a" ? "\\w" : "\\" + orig; });
-          return "[" + (invert ? "^" : "") + str + "]";
-        } else if (str == "a") {
-          return "\\w";
-        } else if (/[?$*()+{}[\]\.|/\'\"]/.test(str)) {
-          return "\\" + str;
-        } else {
-          return str;
-        }
-      }
-
-      var newRE = "";
-      for (;;) {
-        var left = null;
-        for (var left in bad) break;
-        if (left == null) break;
-        var right = bad[left];
-        delete bad[left];
-        for (var other in bad) if (bad[other] == right) {
-          left += other;
-          delete bad[other];
-        }
-        newRE += (newRE ? "|" : "") + toREElt(left) + toREElt(right);
-      }
-
-      document.getElementById("output").appendChild(document.createTextNode("Your regexp is: " + (newRE || "^$")));
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/demo/tern.html b/resources/libs/codemirror/demo/tern.html
deleted file mode 100644
index 6843c7f5e..000000000
--- a/resources/libs/codemirror/demo/tern.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Tern Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/dialog/dialog.css">
-<link rel="stylesheet" href="../addon/hint/show-hint.css">
-<link rel="stylesheet" href="../addon/tern/tern.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<script src="../addon/dialog/dialog.js"></script>
-<script src="../addon/hint/show-hint.js"></script>
-<script src="../addon/tern/tern.js"></script>
-<script src="http://marijnhaverbeke.nl/acorn/acorn.js"></script>
-<script src="http://marijnhaverbeke.nl/acorn/acorn_loose.js"></script>
-<script src="http://marijnhaverbeke.nl/acorn/util/walk.js"></script>
-<script src="http://ternjs.net/doc/demo/polyfill.js"></script>
-<script src="http://ternjs.net/lib/signal.js"></script>
-<script src="http://ternjs.net/lib/tern.js"></script>
-<script src="http://ternjs.net/lib/def.js"></script>
-<script src="http://ternjs.net/lib/comment.js"></script>
-<script src="http://ternjs.net/lib/infer.js"></script>
-<script src="http://ternjs.net/plugin/doc_comment.js"></script>
-<style>
-      .CodeMirror {border: 1px solid #ddd;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Tern</a>
-  </ul>
-</div>
-
-<article>
-<h2>Tern Demo</h2>
-<form><textarea id="code" name="code">// Use ctrl-space to complete something
-// Put the cursor in or after an expression, press ctrl-i to
-// find its type
-
-var foo = ["array", "of", "strings"];
-var bar = foo.slice(0, 2).join("").split("a")[0];
-
-// Works for locally defined types too.
-
-function CTor() { this.size = 10; }
-CTor.prototype.hallo = "hallo";
-
-var baz = new CTor;
-baz.
-
-// You can press ctrl-q when the cursor is on a variable name to
-// rename it. Try it with CTor...
-
-// When the cursor is in an argument list, the arguments are
-// shown below the editor.
-
-[1].reduce(  );
-
-// And a little more advanced code...
-
-(function(exports) {
-  exports.randomElt = function(arr) {
-    return arr[Math.floor(arr.length * Math.random())];
-  };
-  exports.strList = "foo".split("");
-  exports.intList = exports.strList.map(function(s) { return s.charCodeAt(0); });
-})(window.myMod = {});
-
-var randomStr = myMod.randomElt(myMod.strList);
-var randomInt = myMod.randomElt(myMod.intList);
-</textarea></p>
-
-<p>Demonstrates integration of <a href="http://ternjs.net/">Tern</a>
-and CodeMirror. The following keys are bound:</p>
-
-<dl>
-  <dt>Ctrl-Space</dt><dd>Autocomplete</dd>
-  <dt>Ctrl-I</dt><dd>Find type at cursor</dd>
-  <dt>Alt-.</dt><dd>Jump to definition (Alt-, to jump back)</dd>
-  <dt>Ctrl-Q</dt><dd>Rename variable</dd>
-</dl>
-
-<p>Documentation is sparse for now. See the top of
-the <a href="../addon/tern/tern.js">script</a> for a rough API
-overview.</p>
-
-<script>
-  function getURL(url, c) {
-    var xhr = new XMLHttpRequest();
-    xhr.open("get", url, true);
-    xhr.send();
-    xhr.onreadystatechange = function() {
-      if (xhr.readyState != 4) return;
-      if (xhr.status < 400) return c(null, xhr.responseText);
-      var e = new Error(xhr.responseText || "No response");
-      e.status = xhr.status;
-      c(e);
-    };
-  }
-
-  var server;
-  getURL("http://ternjs.net/defs/ecma5.json", function(err, code) {
-    if (err) throw new Error("Request for ecma5.json: " + err);
-    server = new CodeMirror.TernServer({defs: [JSON.parse(code)]});
-    editor.setOption("extraKeys", {
-      "Ctrl-Space": function(cm) { server.complete(cm); },
-      "Ctrl-I": function(cm) { server.showType(cm); },
-      "Alt-.": function(cm) { server.jumpToDef(cm); },
-      "Alt-,": function(cm) { server.jumpBack(cm); },
-      "Ctrl-Q": function(cm) { server.rename(cm); },
-    })
-    editor.on("cursorActivity", function(cm) { server.updateArgHints(cm); });
-  });
-
-  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-    lineNumbers: true,
-    mode: "javascript"
-  });
-</script>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/theme.html b/resources/libs/codemirror/demo/theme.html
deleted file mode 100644
index a6e2b2da0..000000000
--- a/resources/libs/codemirror/demo/theme.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Theme Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../theme/3024-day.css">
-<link rel="stylesheet" href="../theme/3024-night.css">
-<link rel="stylesheet" href="../theme/ambiance.css">
-<link rel="stylesheet" href="../theme/base16-dark.css">
-<link rel="stylesheet" href="../theme/base16-light.css">
-<link rel="stylesheet" href="../theme/blackboard.css">
-<link rel="stylesheet" href="../theme/cobalt.css">
-<link rel="stylesheet" href="../theme/eclipse.css">
-<link rel="stylesheet" href="../theme/elegant.css">
-<link rel="stylesheet" href="../theme/erlang-dark.css">
-<link rel="stylesheet" href="../theme/lesser-dark.css">
-<link rel="stylesheet" href="../theme/mbo.css">
-<link rel="stylesheet" href="../theme/midnight.css">
-<link rel="stylesheet" href="../theme/monokai.css">
-<link rel="stylesheet" href="../theme/neat.css">
-<link rel="stylesheet" href="../theme/night.css">
-<link rel="stylesheet" href="../theme/paraiso-dark.css">
-<link rel="stylesheet" href="../theme/paraiso-light.css">
-<link rel="stylesheet" href="../theme/rubyblue.css">
-<link rel="stylesheet" href="../theme/solarized.css">
-<link rel="stylesheet" href="../theme/the-matrix.css">
-<link rel="stylesheet" href="../theme/tomorrow-night-eighties.css">
-<link rel="stylesheet" href="../theme/twilight.css">
-<link rel="stylesheet" href="../theme/vibrant-ink.css">
-<link rel="stylesheet" href="../theme/xq-dark.css">
-<link rel="stylesheet" href="../theme/xq-light.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<script src="../keymap/extra.js"></script>
-<script src="../addon/selection/active-line.js"></script>
-<script src="../addon/edit/matchbrackets.js"></script>
-<style type="text/css">
-      .CodeMirror {border: 1px solid black; font-size:13px}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Theme</a>
-  </ul>
-</div>
-
-<article>
-<h2>Theme Demo</h2>
-<form><textarea id="code" name="code">
-function findSequence(goal) {
-  function find(start, history) {
-    if (start == goal)
-      return history;
-    else if (start > goal)
-      return null;
-    else
-      return find(start + 5, "(" + history + " + 5)") ||
-             find(start * 3, "(" + history + " * 3)");
-  }
-  return find(1, "1");
-}</textarea></form>
-
-<p>Select a theme: <select onchange="selectTheme()" id=select>
-    <option selected>default</option>
-    <option>3024-day</option>
-    <option>3024-night</option>
-    <option>ambiance</option>
-    <option>base16-dark</option>
-    <option>base16-light</option>
-    <option>blackboard</option>
-    <option>cobalt</option>
-    <option>eclipse</option>
-    <option>elegant</option>
-    <option>erlang-dark</option>
-    <option>lesser-dark</option>
-    <option>mbo</option>
-    <option>midnight</option>
-    <option>monokai</option>
-    <option>neat</option>
-    <option>night</option>
-    <option>paraiso-dark</option>
-    <option>paraiso-light</option>
-    <option>rubyblue</option>
-    <option>solarized dark</option>
-    <option>solarized light</option>
-    <option>the-matrix</option>
-    <option>tomorrow-night-eighties</option>
-    <option>twilight</option>
-    <option>vibrant-ink</option>
-    <option>xq-dark</option>
-    <option>xq-light</option>
-</select>
-</p>
-
-<script>
-  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-    lineNumbers: true,
-    styleActiveLine: true,
-    matchBrackets: true
-  });
-  var input = document.getElementById("select");
-  function selectTheme() {
-    var theme = input.options[input.selectedIndex].innerHTML;
-    editor.setOption("theme", theme);
-  }
-  var choice = document.location.search &&
-               decodeURIComponent(document.location.search.slice(1));
-  if (choice) {
-    input.value = choice;
-    editor.setOption("theme", choice);
-  }
-</script>
-  </article>
diff --git a/resources/libs/codemirror/demo/trailingspace.html b/resources/libs/codemirror/demo/trailingspace.html
deleted file mode 100644
index c3e9c3763..000000000
--- a/resources/libs/codemirror/demo/trailingspace.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Trailing Whitespace Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/edit/trailingspace.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .cm-trailingspace {
-        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==);
-        background-position: bottom left;
-        background-repeat: repeat-x;
-      }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Trailing Whitespace</a>
-  </ul>
-</div>
-
-<article>
-<h2>Trailing Whitespace Demo</h2>
-<form><textarea id="code" name="code">This text  
- has some	 
-trailing whitespace!</textarea></form>
-
-    <script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  lineNumbers: true,
-  showTrailingSpace: true
-});
-</script>
-
-<p>Uses
-the <a href="../doc/manual.html#addon_trailingspace">trailingspace</a>
-addon to highlight trailing whitespace.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/variableheight.html b/resources/libs/codemirror/demo/variableheight.html
deleted file mode 100644
index ab241c6d2..000000000
--- a/resources/libs/codemirror/demo/variableheight.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Variable Height Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/markdown/markdown.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<style type="text/css">
-      .CodeMirror {border: 1px solid silver; border-width: 1px 2px; }
-      .cm-header { font-family: arial; }
-      .cm-header1 { font-size: 150%; }
-      .cm-header2 { font-size: 130%; }
-      .cm-header3 { font-size: 120%; }
-      .cm-header4 { font-size: 110%; }
-      .cm-header5 { font-size: 100%; }
-      .cm-header6 { font-size: 90%; }
-      .cm-strong { font-size: 140%; }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Variable Height</a>
-  </ul>
-</div>
-
-<article>
-<h2>Variable Height Demo</h2>
-<form><textarea id="code" name="code"># A First Level Header
-
-**Bold** text in a normal-size paragraph.
-
-And a very long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long long, wrapped line with a piece of **big** text inside of it.
-
-## A Second Level Header
-
-Now is the time for all good men to come to
-the aid of their country. This is just a
-regular paragraph.
-
-The quick brown fox jumped over the lazy
-dog's back.
-
-### Header 3
-
-> This is a blockquote.
-> 
-> This is the second paragraph in the blockquote.
->
-> ## This is an H2 in a blockquote       
-</textarea></form>
-    <script id="script">
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        lineWrapping: true,
-        mode: "markdown"
-      });
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/demo/vim.html b/resources/libs/codemirror/demo/vim.html
deleted file mode 100644
index 379fac147..000000000
--- a/resources/libs/codemirror/demo/vim.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Vim bindings demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/dialog/dialog.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/dialog/dialog.js"></script>
-<script src="../addon/search/searchcursor.js"></script>
-<script src="../mode/clike/clike.js"></script>
-<script src="../keymap/vim.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Vim bindings</a>
-  </ul>
-</div>
-
-<article>
-<h2>Vim bindings demo</h2>
-<form><textarea id="code" name="code">
-#include "syscalls.h"
-/* getchar:  simple buffered version */
-int getchar(void)
-{
-  static char buf[BUFSIZ];
-  static char *bufp = buf;
-  static int n = 0;
-  if (n == 0) {  /* buffer is empty */
-    n = read(0, buf, sizeof buf);
-    bufp = buf;
-  }
-  return (--n >= 0) ? (unsigned char) *bufp++ : EOF;
-}
-</textarea></form>
-
-    <form><textarea id="code2" name="code2">
-        I am another file! You can yank from my neighbor and paste here.
-</textarea></form>
-
-<p>The vim keybindings are enabled by
-including <a href="../keymap/vim.js">keymap/vim.js</a> and setting
-the <code>keyMap</code> option to <code>"vim"</code>. Because
-CodeMirror's internal API is quite different from Vim, they are only
-a loose approximation of actual vim bindings, though.</p>
-
-    <script>
-      CodeMirror.commands.save = function(){ alert("Saving"); };
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "text/x-csrc",
-        vimMode: true,
-        showCursorWhenSelecting: true
-      });
-      var editor2 = CodeMirror.fromTextArea(document.getElementById("code2"), {
-        lineNumbers: true,
-        mode: "text/x-csrc",
-        vimMode: true,
-        showCursorWhenSelecting: true
-      });
-    </script>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/visibletabs.html b/resources/libs/codemirror/demo/visibletabs.html
deleted file mode 100644
index 5a5a19aa0..000000000
--- a/resources/libs/codemirror/demo/visibletabs.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Visible tabs demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/clike/clike.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
-      .cm-tab {
-         background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
-         background-position: right;
-         background-repeat: no-repeat;
-      }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Visible tabs</a>
-  </ul>
-</div>
-
-<article>
-<h2>Visible tabs demo</h2>
-<form><textarea id="code" name="code">
-#include "syscalls.h"
-/* getchar:  simple buffered version */
-int getchar(void)
-{
-	static char buf[BUFSIZ];
-	static char *bufp = buf;
-	static int n = 0;
-	if (n == 0) {  /* buffer is empty */
-		n = read(0, buf, sizeof buf);
-		bufp = buf;
-	}
-	return (--n >= 0) ? (unsigned char) *bufp++ : EOF;
-}
-</textarea></form>
-
-<p>Tabs inside the editor are spans with the
-class <code>cm-tab</code>, and can be styled.</p>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        tabSize: 4,
-        indentUnit: 4,
-        indentWithTabs: true,
-        mode: "text/x-csrc"
-      });
-    </script>
-
-  </article>
diff --git a/resources/libs/codemirror/demo/widget.html b/resources/libs/codemirror/demo/widget.html
deleted file mode 100644
index 6c4685396..000000000
--- a/resources/libs/codemirror/demo/widget.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Inline Widget Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<script src="http://ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
-<style type="text/css">
-      .CodeMirror {border: 1px solid black;}
-      .lint-error {font-family: arial; font-size: 70%; background: #ffa; color: #a00; padding: 2px 5px 3px; }
-      .lint-error-icon {color: white; background-color: red; font-weight: bold; border-radius: 50%; padding: 0 3px; margin-right: 7px;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Inline Widget</a>
-  </ul>
-</div>
-
-<article>
-<h2>Inline Widget Demo</h2>
-
-
-    <div id=code></div>
-    <script id="script">var widgets = []
-function updateHints() {
-  editor.operation(function(){
-    for (var i = 0; i < widgets.length; ++i)
-      editor.removeLineWidget(widgets[i]);
-    widgets.length = 0;
-
-    JSHINT(editor.getValue());
-    for (var i = 0; i < JSHINT.errors.length; ++i) {
-      var err = JSHINT.errors[i];
-      if (!err) continue;
-      var msg = document.createElement("div");
-      var icon = msg.appendChild(document.createElement("span"));
-      icon.innerHTML = "!!";
-      icon.className = "lint-error-icon";
-      msg.appendChild(document.createTextNode(err.reason));
-      msg.className = "lint-error";
-      widgets.push(editor.addLineWidget(err.line - 1, msg, {coverGutter: false, noHScroll: true}));
-    }
-  });
-  var info = editor.getScrollInfo();
-  var after = editor.charCoords({line: editor.getCursor().line + 1, ch: 0}, "local").top;
-  if (info.top + info.clientHeight < after)
-    editor.scrollTo(null, after - info.clientHeight + 3);
-}
-
-window.onload = function() {
-  var sc = document.getElementById("script");
-  var content = sc.textContent || sc.innerText || sc.innerHTML;
-
-  window.editor = CodeMirror(document.getElementById("code"), {
-    lineNumbers: true,
-    mode: "javascript",
-    value: content
-  });
-
-  var waiting;
-  editor.on("change", function() {
-    clearTimeout(waiting);
-    waiting = setTimeout(updateHints, 500);
-  });
-
-  setTimeout(updateHints, 100);
-};
-
-"long line to create a horizontal scrollbar, in order to test whether the (non-inline) widgets stay in place when scrolling to the right";
-</script>
-<p>This demo runs <a href="http://jshint.com">JSHint</a> over the code
-in the editor (which is the script used on this page), and
-inserts <a href="../doc/manual.html#addLineWidget">line widgets</a> to
-display the warnings that JSHint comes up with.</p>
-  </article>
diff --git a/resources/libs/codemirror/demo/xmlcomplete.html b/resources/libs/codemirror/demo/xmlcomplete.html
deleted file mode 100644
index 2f81c54cf..000000000
--- a/resources/libs/codemirror/demo/xmlcomplete.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: XML Autocomplete Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/hint/show-hint.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/hint/show-hint.js"></script>
-<script src="../addon/hint/xml-hint.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<style type="text/css">
-      .CodeMirror { border: 1px solid #eee; }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">XML Autocomplete</a>
-  </ul>
-</div>
-
-<article>
-<h2>XML Autocomplete Demo</h2>
-<form><textarea id="code" name="code"><!-- write some xml below -->
-</textarea></form>
-
-    <p>Press <strong>ctrl-space</strong>, or type a '<' character to
-    activate autocompletion. This demo defines a simple schema that
-    guides completion. The schema can be customized—see
-    the <a href="../doc/manual.html#addon_xml-hint">manual</a>.</p>
-
-    <p>Development of the <code>xml-hint</code> addon was kindly
-    sponsored
-    by <a href="http://www.xperiment.mobi">www.xperiment.mobi</a>.</p>
-
-    <script>
-      var dummy = {
-        attrs: {
-          color: ["red", "green", "blue", "purple", "white", "black", "yellow"],
-          size: ["large", "medium", "small"],
-          description: null
-        },
-        children: []
-      };
-
-      var tags = {
-        "!top": ["top"],
-        top: {
-          attrs: {
-            lang: ["en", "de", "fr", "nl"],
-            freeform: null
-          },
-          children: ["animal", "plant"]
-        },
-        animal: {
-          attrs: {
-            name: null,
-            isduck: ["yes", "no"]
-          },
-          children: ["wings", "feet", "body", "head", "tail"]
-        },
-        plant: {
-          attrs: {name: null},
-          children: ["leaves", "stem", "flowers"]
-        },
-        wings: dummy, feet: dummy, body: dummy, head: dummy, tail: dummy,
-        leaves: dummy, stem: dummy, flowers: dummy
-      };
-
-      function completeAfter(cm, pred) {
-        var cur = cm.getCursor();
-        if (!pred || pred()) setTimeout(function() {
-          if (!cm.state.completionActive)
-            CodeMirror.showHint(cm, CodeMirror.hint.xml, {schemaInfo: tags, completeSingle: false});
-        }, 100);
-        return CodeMirror.Pass;
-      }
-
-      function completeIfAfterLt(cm) {
-        return completeAfter(cm, function() {
-          var cur = cm.getCursor();
-          return cm.getRange(CodeMirror.Pos(cur.line, cur.ch - 1), cur) == "<";
-        });
-      }
-
-      function completeIfInTag(cm) {
-        return completeAfter(cm, function() {
-          var tok = cm.getTokenAt(cm.getCursor());
-          if (tok.type == "string" && (!/['"]/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1)) return false;
-          var inner = CodeMirror.innerMode(cm.getMode(), tok.state).state;
-          return inner.tagName;
-        });
-      }
-
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "xml",
-        lineNumbers: true,
-        extraKeys: {
-          "'<'": completeAfter,
-          "'/'": completeIfAfterLt,
-          "' '": completeIfInTag,
-          "'='": completeIfInTag,
-          "Ctrl-Space": function(cm) {
-            CodeMirror.showHint(cm, CodeMirror.hint.xml, {schemaInfo: tags});
-          }
-        }
-      });
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/keymap/emacs.js b/resources/libs/codemirror/keymap/emacs.js
deleted file mode 100644
index 7a3dfb11a..000000000
--- a/resources/libs/codemirror/keymap/emacs.js
+++ /dev/null
@@ -1,387 +0,0 @@
-(function() {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-  function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
-
-  // Kill 'ring'
-
-  var killRing = [];
-  function addToRing(str) {
-    killRing.push(str);
-    if (killRing.length > 50) killRing.shift();
-  }
-  function growRingTop(str) {
-    if (!killRing.length) return addToRing(str);
-    killRing[killRing.length - 1] += str;
-  }
-  function getFromRing(n) { return killRing[killRing.length - (n ? Math.min(n, 1) : 1)] || ""; }
-  function popFromRing() { if (killRing.length > 1) killRing.pop(); return getFromRing(); }
-
-  var lastKill = null;
-
-  function kill(cm, from, to, mayGrow, text) {
-    if (text == null) text = cm.getRange(from, to);
-
-    if (mayGrow && lastKill && lastKill.cm == cm && posEq(from, lastKill.pos) && cm.isClean(lastKill.gen))
-      growRingTop(text);
-    else
-      addToRing(text);
-    cm.replaceRange("", from, to, "+delete");
-
-    if (mayGrow) lastKill = {cm: cm, pos: from, gen: cm.changeGeneration()};
-    else lastKill = null;
-  }
-
-  // Boundaries of various units
-
-  function byChar(cm, pos, dir) {
-    return cm.findPosH(pos, dir, "char", true);
-  }
-
-  function byWord(cm, pos, dir) {
-    return cm.findPosH(pos, dir, "word", true);
-  }
-
-  function byLine(cm, pos, dir) {
-    return cm.findPosV(pos, dir, "line", cm.doc.sel.goalColumn);
-  }
-
-  function byPage(cm, pos, dir) {
-    return cm.findPosV(pos, dir, "page", cm.doc.sel.goalColumn);
-  }
-
-  function byParagraph(cm, pos, dir) {
-    var no = pos.line, line = cm.getLine(no);
-    var sawText = /\S/.test(dir < 0 ? line.slice(0, pos.ch) : line.slice(pos.ch));
-    var fst = cm.firstLine(), lst = cm.lastLine();
-    for (;;) {
-      no += dir;
-      if (no < fst || no > lst)
-        return cm.clipPos(Pos(no - dir, dir < 0 ? 0 : null));
-      line = cm.getLine(no);
-      var hasText = /\S/.test(line);
-      if (hasText) sawText = true;
-      else if (sawText) return Pos(no, 0);
-    }
-  }
-
-  function bySentence(cm, pos, dir) {
-    var line = pos.line, ch = pos.ch;
-    var text = cm.getLine(pos.line), sawWord = false;
-    for (;;) {
-      var next = text.charAt(ch + (dir < 0 ? -1 : 0));
-      if (!next) { // End/beginning of line reached
-        if (line == (dir < 0 ? cm.firstLine() : cm.lastLine())) return Pos(line, ch);
-        text = cm.getLine(line + dir);
-        if (!/\S/.test(text)) return Pos(line, ch);
-        line += dir;
-        ch = dir < 0 ? text.length : 0;
-        continue;
-      }
-      if (sawWord && /[!?.]/.test(next)) return Pos(line, ch + (dir > 0 ? 1 : 0));
-      if (!sawWord) sawWord = /\w/.test(next);
-      ch += dir;
-    }
-  }
-
-  function byExpr(cm, pos, dir) {
-    var wrap;
-    if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, true))
-        && wrap.match && (wrap.forward ? 1 : -1) == dir)
-      return dir > 0 ? Pos(wrap.to.line, wrap.to.ch + 1) : wrap.to;
-
-    for (var first = true;; first = false) {
-      var token = cm.getTokenAt(pos);
-      var after = Pos(pos.line, dir < 0 ? token.start : token.end);
-      if (first && dir > 0 && token.end == pos.ch || !/\w/.test(token.string)) {
-        var newPos = cm.findPosH(after, dir, "char");
-        if (posEq(after, newPos)) return pos;
-        else pos = newPos;
-      } else {
-        return after;
-      }
-    }
-  }
-
-  // Prefixes (only crudely supported)
-
-  function getPrefix(cm, precise) {
-    var digits = cm.state.emacsPrefix;
-    if (!digits) return precise ? null : 1;
-    clearPrefix(cm);
-    return digits == "-" ? -1 : Number(digits);
-  }
-
-  function repeated(cmd) {
-    var f = typeof cmd == "string" ? function(cm) { cm.execCommand(cmd); } : cmd;
-    return function(cm) {
-      var prefix = getPrefix(cm);
-      f(cm);
-      for (var i = 1; i < prefix; ++i) f(cm);
-    };
-  }
-
-  function findEnd(cm, by, dir) {
-    var pos = cm.getCursor(), prefix = getPrefix(cm);
-    if (prefix < 0) { dir = -dir; prefix = -prefix; }
-    for (var i = 0; i < prefix; ++i) {
-      var newPos = by(cm, pos, dir);
-      if (posEq(newPos, pos)) break;
-      pos = newPos;
-    }
-    return pos;
-  }
-
-  function move(by, dir) {
-    var f = function(cm) {
-      cm.extendSelection(findEnd(cm, by, dir));
-    };
-    f.motion = true;
-    return f;
-  }
-
-  function killTo(cm, by, dir) {
-    kill(cm, cm.getCursor(), findEnd(cm, by, dir), true);
-  }
-
-  function addPrefix(cm, digit) {
-    if (cm.state.emacsPrefix) {
-      if (digit != "-") cm.state.emacsPrefix += digit;
-      return;
-    }
-    // Not active yet
-    cm.state.emacsPrefix = digit;
-    cm.on("keyHandled", maybeClearPrefix);
-    cm.on("inputRead", maybeDuplicateInput);
-  }
-
-  var prefixPreservingKeys = {"Alt-G": true, "Ctrl-X": true, "Ctrl-Q": true, "Ctrl-U": true};
-
-  function maybeClearPrefix(cm, arg) {
-    if (!cm.state.emacsPrefixMap && !prefixPreservingKeys.hasOwnProperty(arg))
-      clearPrefix(cm);
-  }
-
-  function clearPrefix(cm) {
-    cm.state.emacsPrefix = null;
-    cm.off("keyHandled", maybeClearPrefix);
-    cm.off("inputRead", maybeDuplicateInput);
-  }
-
-  function maybeDuplicateInput(cm, event) {
-    var dup = getPrefix(cm);
-    if (dup > 1 && event.origin == "+input") {
-      var one = event.text.join("\n"), txt = "";
-      for (var i = 1; i < dup; ++i) txt += one;
-      cm.replaceSelection(txt, "end", "+input");
-    }
-  }
-
-  function addPrefixMap(cm) {
-    cm.state.emacsPrefixMap = true;
-    cm.addKeyMap(prefixMap);
-    cm.on("keyHandled", maybeRemovePrefixMap);
-    cm.on("inputRead", maybeRemovePrefixMap);
-  }
-
-  function maybeRemovePrefixMap(cm, arg) {
-    if (typeof arg == "string" && (/^\d$/.test(arg) || arg == "Ctrl-U")) return;
-    cm.removeKeyMap(prefixMap);
-    cm.state.emacsPrefixMap = false;
-    cm.off("keyHandled", maybeRemovePrefixMap);
-    cm.off("inputRead", maybeRemovePrefixMap);
-  }
-
-  // Utilities
-
-  function setMark(cm) {
-    cm.setCursor(cm.getCursor());
-    cm.setExtending(true);
-    cm.on("change", function() { cm.setExtending(false); });
-  }
-
-  function getInput(cm, msg, f) {
-    if (cm.openDialog)
-      cm.openDialog(msg + ": <input type=\"text\" style=\"width: 10em\"/>", f, {bottom: true});
-    else
-      f(prompt(msg, ""));
-  }
-
-  function operateOnWord(cm, op) {
-    var start = cm.getCursor(), end = cm.findPosH(start, 1, "word");
-    cm.replaceRange(op(cm.getRange(start, end)), start, end);
-    cm.setCursor(end);
-  }
-
-  function toEnclosingExpr(cm) {
-    var pos = cm.getCursor(), line = pos.line, ch = pos.ch;
-    var stack = [];
-    while (line >= cm.firstLine()) {
-      var text = cm.getLine(line);
-      for (var i = ch == null ? text.length : ch; i > 0;) {
-        var ch = text.charAt(--i);
-        if (ch == ")")
-          stack.push("(");
-        else if (ch == "]")
-          stack.push("[");
-        else if (ch == "}")
-          stack.push("{");
-        else if (/[\(\{\[]/.test(ch) && (!stack.length || stack.pop() != ch))
-          return cm.extendSelection(Pos(line, i));
-      }
-      --line; ch = null;
-    }
-  }
-
-  // Actual keymap
-
-  var keyMap = CodeMirror.keyMap.emacs = {
-    "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
-    "Ctrl-K": repeated(function(cm) {
-      var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
-      var text = cm.getRange(start, end);
-      if (!/\S/.test(text)) {
-        text += "\n";
-        end = Pos(start.line + 1, 0);
-      }
-      kill(cm, start, end, true, text);
-    }),
-    "Alt-W": function(cm) {
-      addToRing(cm.getSelection());
-    },
-    "Ctrl-Y": function(cm) {
-      var start = cm.getCursor();
-      cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste");
-      cm.setSelection(start, cm.getCursor());
-    },
-    "Alt-Y": function(cm) {cm.replaceSelection(popFromRing());},
-
-    "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
-
-    "Ctrl-F": move(byChar, 1), "Ctrl-B": move(byChar, -1),
-    "Right": move(byChar, 1), "Left": move(byChar, -1),
-    "Ctrl-D": function(cm) { killTo(cm, byChar, 1); },
-    "Delete": function(cm) { killTo(cm, byChar, 1); },
-    "Ctrl-H": function(cm) { killTo(cm, byChar, -1); },
-    "Backspace": function(cm) { killTo(cm, byChar, -1); },
-
-    "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1),
-    "Alt-D": function(cm) { killTo(cm, byWord, 1); },
-    "Alt-Backspace": function(cm) { killTo(cm, byWord, -1); },
-
-    "Ctrl-N": move(byLine, 1), "Ctrl-P": move(byLine, -1),
-    "Down": move(byLine, 1), "Up": move(byLine, -1),
-    "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-    "End": "goLineEnd", "Home": "goLineStart",
-
-    "Alt-V": move(byPage, -1), "Ctrl-V": move(byPage, 1),
-    "PageUp": move(byPage, -1), "PageDown": move(byPage, 1),
-
-    "Ctrl-Up": move(byParagraph, -1), "Ctrl-Down": move(byParagraph, 1),
-
-    "Alt-A": move(bySentence, -1), "Alt-E": move(bySentence, 1),
-    "Alt-K": function(cm) { killTo(cm, bySentence, 1); },
-
-    "Ctrl-Alt-K": function(cm) { killTo(cm, byExpr, 1); },
-    "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1); },
-    "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1),
-
-    "Shift-Ctrl-Alt-2": function(cm) {
-      cm.setSelection(findEnd(cm, byExpr, 1), cm.getCursor());
-    },
-    "Ctrl-Alt-T": function(cm) {
-      var leftStart = byExpr(cm, cm.getCursor(), -1), leftEnd = byExpr(cm, leftStart, 1);
-      var rightEnd = byExpr(cm, leftEnd, 1), rightStart = byExpr(cm, rightEnd, -1);
-      cm.replaceRange(cm.getRange(rightStart, rightEnd) + cm.getRange(leftEnd, rightStart) +
-                      cm.getRange(leftStart, leftEnd), leftStart, rightEnd);
-    },
-    "Ctrl-Alt-U": repeated(toEnclosingExpr),
-
-    "Alt-Space": function(cm) {
-      var pos = cm.getCursor(), from = pos.ch, to = pos.ch, text = cm.getLine(pos.line);
-      while (from && /\s/.test(text.charAt(from - 1))) --from;
-      while (to < text.length && /\s/.test(text.charAt(to))) ++to;
-      cm.replaceRange(" ", Pos(pos.line, from), Pos(pos.line, to));
-    },
-    "Ctrl-O": repeated(function(cm) { cm.replaceSelection("\n", "start"); }),
-    "Ctrl-T": repeated(function(cm) {
-      var pos = cm.getCursor();
-      if (pos.ch < cm.getLine(pos.line).length) pos = Pos(pos.line, pos.ch + 1);
-      var from = cm.findPosH(pos, -2, "char");
-      var range = cm.getRange(from, pos);
-      if (range.length != 2) return;
-      cm.setSelection(from, pos);
-      cm.replaceSelection(range.charAt(1) + range.charAt(0), "end");
-    }),
-
-    "Alt-C": repeated(function(cm) {
-      operateOnWord(cm, function(w) {
-        var letter = w.search(/\w/);
-        if (letter == -1) return w;
-        return w.slice(0, letter) + w.charAt(letter).toUpperCase() + w.slice(letter + 1).toLowerCase();
-      });
-    }),
-    "Alt-U": repeated(function(cm) {
-      operateOnWord(cm, function(w) { return w.toUpperCase(); });
-    }),
-    "Alt-L": repeated(function(cm) {
-      operateOnWord(cm, function(w) { return w.toLowerCase(); });
-    }),
-
-    "Alt-;": "toggleComment",
-
-    "Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"),
-    "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
-    "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
-    "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": "clearSearch", "Shift-Alt-5": "replace",
-    "Alt-/": "autocomplete",
-    "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto",
-
-    "Alt-G": function(cm) {cm.setOption("keyMap", "emacs-Alt-G");},
-    "Ctrl-X": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-X");},
-    "Ctrl-Q": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-Q");},
-    "Ctrl-U": addPrefixMap
-  };
-
-  CodeMirror.keyMap["emacs-Ctrl-X"] = {
-    "Tab": function(cm) {
-      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
-    },
-    "Ctrl-X": function(cm) {
-      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
-    },
-
-    "Ctrl-S": "save", "Ctrl-W": "save", "S": "saveAll", "F": "open", "U": repeated("undo"), "K": "close",
-    "Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
-    auto: "emacs", nofallthrough: true, disableInput: true
-  };
-
-  CodeMirror.keyMap["emacs-Alt-G"] = {
-    "G": function(cm) {
-      var prefix = getPrefix(cm, true);
-      if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1);
-
-      getInput(cm, "Goto line", function(str) {
-        var num;
-        if (str && !isNaN(num = Number(str)) && num == num|0 && num > 0)
-          cm.setCursor(num - 1);
-      });
-    },
-    auto: "emacs", nofallthrough: true, disableInput: true
-  };
-
-  CodeMirror.keyMap["emacs-Ctrl-Q"] = {
-    "Tab": repeated("insertTab"),
-    auto: "emacs", nofallthrough: true
-  };
-
-  var prefixMap = {"Ctrl-G": clearPrefix};
-  function regPrefix(d) {
-    prefixMap[d] = function(cm) { addPrefix(cm, d); };
-    keyMap["Ctrl-" + d] = function(cm) { addPrefix(cm, d); };
-    prefixPreservingKeys["Ctrl-" + d] = true;
-  }
-  for (var i = 0; i < 10; ++i) regPrefix(String(i));
-  regPrefix("-");
-})();
diff --git a/resources/libs/codemirror/keymap/extra.js b/resources/libs/codemirror/keymap/extra.js
deleted file mode 100644
index 18dd5a979..000000000
--- a/resources/libs/codemirror/keymap/extra.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// A number of additional default bindings that are too obscure to
-// include in the core codemirror.js file.
-
-(function() {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-
-  function moveLines(cm, start, end, dist) {
-    if (!dist || start > end) return 0;
-
-    var from = cm.clipPos(Pos(start, 0)), to = cm.clipPos(Pos(end));
-    var text = cm.getRange(from, to);
-
-    if (start <= cm.firstLine())
-      cm.replaceRange("", from, Pos(to.line + 1, 0));
-    else
-      cm.replaceRange("", Pos(from.line - 1), to);
-    var target = from.line + dist;
-    if (target <= cm.firstLine()) {
-      cm.replaceRange(text + "\n", Pos(target, 0));
-      return cm.firstLine() - from.line;
-    } else {
-      var targetPos = cm.clipPos(Pos(target - 1));
-      cm.replaceRange("\n" + text, targetPos);
-      return targetPos.line + 1 - from.line;
-    }
-  }
-
-  function moveSelectedLines(cm, dist) {
-    var head = cm.getCursor("head"), anchor = cm.getCursor("anchor");
-    cm.operation(function() {
-      var moved = moveLines(cm, Math.min(head.line, anchor.line), Math.max(head.line, anchor.line), dist);
-      cm.setSelection(Pos(anchor.line + moved, anchor.ch), Pos(head.line + moved, head.ch));
-    });
-  }
-
-  CodeMirror.commands.moveLinesUp = function(cm) { moveSelectedLines(cm, -1); };
-  CodeMirror.commands.moveLinesDown = function(cm) { moveSelectedLines(cm, 1); };
-
-  CodeMirror.keyMap["default"]["Alt-Up"] = "moveLinesUp";
-  CodeMirror.keyMap["default"]["Alt-Down"] = "moveLinesDown";
-})();
diff --git a/resources/libs/codemirror/keymap/vim.js b/resources/libs/codemirror/keymap/vim.js
deleted file mode 100644
index dab10e21a..000000000
--- a/resources/libs/codemirror/keymap/vim.js
+++ /dev/null
@@ -1,3703 +0,0 @@
-/**
- * Supported keybindings:
- *
- *   Motion:
- *   h, j, k, l
- *   gj, gk
- *   e, E, w, W, b, B, ge, gE
- *   f<character>, F<character>, t<character>, T<character>
- *   $, ^, 0, -, +, _
- *   gg, G
- *   %
- *   '<character>, `<character>
- *
- *   Operator:
- *   d, y, c
- *   dd, yy, cc
- *   g~, g~g~
- *   >, <, >>, <<
- *
- *   Operator-Motion:
- *   x, X, D, Y, C, ~
- *
- *   Action:
- *   a, i, s, A, I, S, o, O
- *   zz, z., z<CR>, zt, zb, z-
- *   J
- *   u, Ctrl-r
- *   m<character>
- *   r<character>
- *
- *   Modes:
- *   ESC - leave insert mode, visual mode, and clear input state.
- *   Ctrl-[, Ctrl-c - same as ESC.
- *
- * Registers: unamed, -, a-z, A-Z, 0-9
- *   (Does not respect the special case for number registers when delete
- *    operator is made with these commands: %, (, ),  , /, ?, n, N, {, } )
- *   TODO: Implement the remaining registers.
- * Marks: a-z, A-Z, and 0-9
- *   TODO: Implement the remaining special marks. They have more complex
- *       behavior.
- *
- * Events:
- *  'vim-mode-change' - raised on the editor anytime the current mode changes,
- *                      Event object: {mode: "visual", subMode: "linewise"}
- *
- * Code structure:
- *  1. Default keymap
- *  2. Variable declarations and short basic helpers
- *  3. Instance (External API) implementation
- *  4. Internal state tracking objects (input state, counter) implementation
- *     and instanstiation
- *  5. Key handler (the main command dispatcher) implementation
- *  6. Motion, operator, and action implementations
- *  7. Helper functions for the key handler, motions, operators, and actions
- *  8. Set up Vim to work as a keymap for CodeMirror.
- */
-
-(function() {
-  'use strict';
-
-  var defaultKeymap = [
-    // Key to key mapping. This goes first to make it possible to override
-    // existing mappings.
-    { keys: ['<Left>'], type: 'keyToKey', toKeys: ['h'] },
-    { keys: ['<Right>'], type: 'keyToKey', toKeys: ['l'] },
-    { keys: ['<Up>'], type: 'keyToKey', toKeys: ['k'] },
-    { keys: ['<Down>'], type: 'keyToKey', toKeys: ['j'] },
-    { keys: ['<Space>'], type: 'keyToKey', toKeys: ['l'] },
-    { keys: ['<BS>'], type: 'keyToKey', toKeys: ['h'] },
-    { keys: ['<C-Space>'], type: 'keyToKey', toKeys: ['W'] },
-    { keys: ['<C-BS>'], type: 'keyToKey', toKeys: ['B'] },
-    { keys: ['<S-Space>'], type: 'keyToKey', toKeys: ['w'] },
-    { keys: ['<S-BS>'], type: 'keyToKey', toKeys: ['b'] },
-    { keys: ['<C-n>'], type: 'keyToKey', toKeys: ['j'] },
-    { keys: ['<C-p>'], type: 'keyToKey', toKeys: ['k'] },
-    { keys: ['C-['], type: 'keyToKey', toKeys: ['<Esc>'] },
-    { keys: ['<C-c>'], type: 'keyToKey', toKeys: ['<Esc>'] },
-    { keys: ['s'], type: 'keyToKey', toKeys: ['c', 'l'], context: 'normal' },
-    { keys: ['s'], type: 'keyToKey', toKeys: ['x', 'i'], context: 'visual'},
-    { keys: ['S'], type: 'keyToKey', toKeys: ['c', 'c'], context: 'normal' },
-    { keys: ['S'], type: 'keyToKey', toKeys: ['d', 'c', 'c'], context: 'visual' },
-    { keys: ['<Home>'], type: 'keyToKey', toKeys: ['0'] },
-    { keys: ['<End>'], type: 'keyToKey', toKeys: ['$'] },
-    { keys: ['<PageUp>'], type: 'keyToKey', toKeys: ['<C-b>'] },
-    { keys: ['<PageDown>'], type: 'keyToKey', toKeys: ['<C-f>'] },
-    // Motions
-    { keys: ['H'], type: 'motion',
-        motion: 'moveToTopLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['M'], type: 'motion',
-        motion: 'moveToMiddleLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['L'], type: 'motion',
-        motion: 'moveToBottomLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['h'], type: 'motion',
-        motion: 'moveByCharacters',
-        motionArgs: { forward: false }},
-    { keys: ['l'], type: 'motion',
-        motion: 'moveByCharacters',
-        motionArgs: { forward: true }},
-    { keys: ['j'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, linewise: true }},
-    { keys: ['k'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: false, linewise: true }},
-    { keys: ['g','j'], type: 'motion',
-        motion: 'moveByDisplayLines',
-        motionArgs: { forward: true }},
-    { keys: ['g','k'], type: 'motion',
-        motion: 'moveByDisplayLines',
-        motionArgs: { forward: false }},
-    { keys: ['w'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: false }},
-    { keys: ['W'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: false, bigWord: true }},
-    { keys: ['e'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: true, inclusive: true }},
-    { keys: ['E'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: true, bigWord: true,
-            inclusive: true }},
-    { keys: ['b'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: false }},
-    { keys: ['B'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: false, bigWord: true }},
-    { keys: ['g', 'e'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: true, inclusive: true }},
-    { keys: ['g', 'E'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: true, bigWord: true,
-            inclusive: true }},
-    { keys: ['{'], type: 'motion', motion: 'moveByParagraph',
-        motionArgs: { forward: false, toJumplist: true }},
-    { keys: ['}'], type: 'motion', motion: 'moveByParagraph',
-        motionArgs: { forward: true, toJumplist: true }},
-    { keys: ['<C-f>'], type: 'motion',
-        motion: 'moveByPage', motionArgs: { forward: true }},
-    { keys: ['<C-b>'], type: 'motion',
-        motion: 'moveByPage', motionArgs: { forward: false }},
-    { keys: ['<C-d>'], type: 'motion',
-        motion: 'moveByScroll',
-        motionArgs: { forward: true, explicitRepeat: true }},
-    { keys: ['<C-u>'], type: 'motion',
-        motion: 'moveByScroll',
-        motionArgs: { forward: false, explicitRepeat: true }},
-    { keys: ['g', 'g'], type: 'motion',
-        motion: 'moveToLineOrEdgeOfDocument',
-        motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: ['G'], type: 'motion',
-        motion: 'moveToLineOrEdgeOfDocument',
-        motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: ['0'], type: 'motion', motion: 'moveToStartOfLine' },
-    { keys: ['^'], type: 'motion',
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['+'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, toFirstChar:true }},
-    { keys: ['-'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: false, toFirstChar:true }},
-    { keys: ['_'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
-    { keys: ['$'], type: 'motion',
-        motion: 'moveToEol',
-        motionArgs: { inclusive: true }},
-    { keys: ['%'], type: 'motion',
-        motion: 'moveToMatchedSymbol',
-        motionArgs: { inclusive: true, toJumplist: true }},
-    { keys: ['f', 'character'], type: 'motion',
-        motion: 'moveToCharacter',
-        motionArgs: { forward: true , inclusive: true }},
-    { keys: ['F', 'character'], type: 'motion',
-        motion: 'moveToCharacter',
-        motionArgs: { forward: false }},
-    { keys: ['t', 'character'], type: 'motion',
-        motion: 'moveTillCharacter',
-        motionArgs: { forward: true, inclusive: true }},
-    { keys: ['T', 'character'], type: 'motion',
-        motion: 'moveTillCharacter',
-        motionArgs: { forward: false }},
-    { keys: [';'], type: 'motion', motion: 'repeatLastCharacterSearch',
-        motionArgs: { forward: true }},
-    { keys: [','], type: 'motion', motion: 'repeatLastCharacterSearch',
-        motionArgs: { forward: false }},
-    { keys: ['\'', 'character'], type: 'motion', motion: 'goToMark',
-        motionArgs: {toJumplist: true}},
-    { keys: ['`', 'character'], type: 'motion', motion: 'goToMark',
-        motionArgs: {toJumplist: true}},
-    { keys: [']', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
-    { keys: ['[', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
-    { keys: [']', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
-    { keys: ['[', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
-    { keys: [']', 'character'], type: 'motion',
-        motion: 'moveToSymbol',
-        motionArgs: { forward: true, toJumplist: true}},
-    { keys: ['[', 'character'], type: 'motion',
-        motion: 'moveToSymbol',
-        motionArgs: { forward: false, toJumplist: true}},
-    { keys: ['|'], type: 'motion',
-        motion: 'moveToColumn',
-        motionArgs: { }},
-    // Operators
-    { keys: ['d'], type: 'operator', operator: 'delete' },
-    { keys: ['y'], type: 'operator', operator: 'yank' },
-    { keys: ['c'], type: 'operator', operator: 'change' },
-    { keys: ['>'], type: 'operator', operator: 'indent',
-        operatorArgs: { indentRight: true }},
-    { keys: ['<'], type: 'operator', operator: 'indent',
-        operatorArgs: { indentRight: false }},
-    { keys: ['g', '~'], type: 'operator', operator: 'swapcase' },
-    { keys: ['n'], type: 'motion', motion: 'findNext',
-        motionArgs: { forward: true, toJumplist: true }},
-    { keys: ['N'], type: 'motion', motion: 'findNext',
-        motionArgs: { forward: false, toJumplist: true }},
-    // Operator-Motion dual commands
-    { keys: ['x'], type: 'operatorMotion', operator: 'delete',
-        motion: 'moveByCharacters', motionArgs: { forward: true },
-        operatorMotionArgs: { visualLine: false }},
-    { keys: ['X'], type: 'operatorMotion', operator: 'delete',
-        motion: 'moveByCharacters', motionArgs: { forward: false },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['D'], type: 'operatorMotion', operator: 'delete',
-      motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['Y'], type: 'operatorMotion', operator: 'yank',
-        motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['C'], type: 'operatorMotion',
-        operator: 'change',
-        motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['~'], type: 'operatorMotion',
-        operator: 'swapcase', operatorArgs: { shouldMoveCursor: true },
-        motion: 'moveByCharacters', motionArgs: { forward: true }},
-    // Actions
-    { keys: ['<C-i>'], type: 'action', action: 'jumpListWalk',
-        actionArgs: { forward: true }},
-    { keys: ['<C-o>'], type: 'action', action: 'jumpListWalk',
-        actionArgs: { forward: false }},
-    { keys: ['a'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'charAfter' }},
-    { keys: ['A'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'eol' }},
-    { keys: ['i'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'inplace' }},
-    { keys: ['I'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'firstNonBlank' }},
-    { keys: ['o'], type: 'action', action: 'newLineAndEnterInsertMode',
-        isEdit: true, interlaceInsertRepeat: true,
-        actionArgs: { after: true }},
-    { keys: ['O'], type: 'action', action: 'newLineAndEnterInsertMode',
-        isEdit: true, interlaceInsertRepeat: true,
-        actionArgs: { after: false }},
-    { keys: ['v'], type: 'action', action: 'toggleVisualMode' },
-    { keys: ['V'], type: 'action', action: 'toggleVisualMode',
-        actionArgs: { linewise: true }},
-    { keys: ['J'], type: 'action', action: 'joinLines', isEdit: true },
-    { keys: ['p'], type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: true, isEdit: true }},
-    { keys: ['P'], type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: false, isEdit: true }},
-    { keys: ['r', 'character'], type: 'action', action: 'replace', isEdit: true },
-    { keys: ['@', 'character'], type: 'action', action: 'replayMacro' },
-    { keys: ['q', 'character'], type: 'action', action: 'enterMacroRecordMode' },
-    // Handle Replace-mode as a special case of insert mode.
-    { keys: ['R'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { replace: true }},
-    { keys: ['u'], type: 'action', action: 'undo' },
-    { keys: ['<C-r>'], type: 'action', action: 'redo' },
-    { keys: ['m', 'character'], type: 'action', action: 'setMark' },
-    { keys: ['"', 'character'], type: 'action', action: 'setRegister' },
-    { keys: ['z', 'z'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'center' }},
-    { keys: ['z', '.'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'center' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['z', 't'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'top' }},
-    { keys: ['z', '<CR>'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'top' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['z', '-'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'bottom' }},
-    { keys: ['z', 'b'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'bottom' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['.'], type: 'action', action: 'repeatLastEdit' },
-    { keys: ['<C-a>'], type: 'action', action: 'incrementNumberToken',
-        isEdit: true,
-        actionArgs: {increase: true, backtrack: false}},
-    { keys: ['<C-x>'], type: 'action', action: 'incrementNumberToken',
-        isEdit: true,
-        actionArgs: {increase: false, backtrack: false}},
-    // Text object motions
-    { keys: ['a', 'character'], type: 'motion',
-        motion: 'textObjectManipulation' },
-    { keys: ['i', 'character'], type: 'motion',
-        motion: 'textObjectManipulation',
-        motionArgs: { textObjectInner: true }},
-    // Search
-    { keys: ['/'], type: 'search',
-        searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
-    { keys: ['?'], type: 'search',
-        searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
-    { keys: ['*'], type: 'search',
-        searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
-    { keys: ['#'], type: 'search',
-        searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
-    // Ex command
-    { keys: [':'], type: 'ex' }
-  ];
-
-  var Vim = function() {
-    CodeMirror.defineOption('vimMode', false, function(cm, val) {
-      if (val) {
-        cm.setOption('keyMap', 'vim');
-        CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-        cm.on('beforeSelectionChange', beforeSelectionChange);
-        maybeInitVimState(cm);
-      } else if (cm.state.vim) {
-        cm.setOption('keyMap', 'default');
-        cm.off('beforeSelectionChange', beforeSelectionChange);
-        cm.state.vim = null;
-      }
-    });
-    function beforeSelectionChange(cm, cur) {
-      var vim = cm.state.vim;
-      if (vim.insertMode || vim.exMode) return;
-
-      var head = cur.head;
-      if (head.ch && head.ch == cm.doc.getLine(head.line).length) {
-        head.ch--;
-      }
-    }
-
-    var numberRegex = /[\d]/;
-    var wordRegexp = [(/\w/), (/[^\w\s]/)], bigWordRegexp = [(/\S/)];
-    function makeKeyRange(start, size) {
-      var keys = [];
-      for (var i = start; i < start + size; i++) {
-        keys.push(String.fromCharCode(i));
-      }
-      return keys;
-    }
-    var upperCaseAlphabet = makeKeyRange(65, 26);
-    var lowerCaseAlphabet = makeKeyRange(97, 26);
-    var numbers = makeKeyRange(48, 10);
-    var specialSymbols = '~`!@#$%^&*()_-+=[{}]\\|/?.,<>:;"\''.split('');
-    var specialKeys = ['Left', 'Right', 'Up', 'Down', 'Space', 'Backspace',
-        'Esc', 'Home', 'End', 'PageUp', 'PageDown', 'Enter'];
-    var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
-    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"']);
-
-    function isLine(cm, line) {
-      return line >= cm.firstLine() && line <= cm.lastLine();
-    }
-    function isLowerCase(k) {
-      return (/^[a-z]$/).test(k);
-    }
-    function isMatchableSymbol(k) {
-      return '()[]{}'.indexOf(k) != -1;
-    }
-    function isNumber(k) {
-      return numberRegex.test(k);
-    }
-    function isUpperCase(k) {
-      return (/^[A-Z]$/).test(k);
-    }
-    function isWhiteSpaceString(k) {
-      return (/^\s*$/).test(k);
-    }
-    function inArray(val, arr) {
-      for (var i = 0; i < arr.length; i++) {
-        if (arr[i] == val) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    var createCircularJumpList = function() {
-      var size = 100;
-      var pointer = -1;
-      var head = 0;
-      var tail = 0;
-      var buffer = new Array(size);
-      function add(cm, oldCur, newCur) {
-        var current = pointer % size;
-        var curMark = buffer[current];
-        function useNextSlot(cursor) {
-          var next = ++pointer % size;
-          var trashMark = buffer[next];
-          if (trashMark) {
-            trashMark.clear();
-          }
-          buffer[next] = cm.setBookmark(cursor);
-        }
-        if (curMark) {
-          var markPos = curMark.find();
-          // avoid recording redundant cursor position
-          if (markPos && !cursorEqual(markPos, oldCur)) {
-            useNextSlot(oldCur);
-          }
-        } else {
-          useNextSlot(oldCur);
-        }
-        useNextSlot(newCur);
-        head = pointer;
-        tail = pointer - size + 1;
-        if (tail < 0) {
-          tail = 0;
-        }
-      }
-      function move(cm, offset) {
-        pointer += offset;
-        if (pointer > head) {
-          pointer = head;
-        } else if (pointer < tail) {
-          pointer = tail;
-        }
-        var mark = buffer[(size + pointer) % size];
-        // skip marks that are temporarily removed from text buffer
-        if (mark && !mark.find()) {
-          var inc = offset > 0 ? 1 : -1;
-          var newCur;
-          var oldCur = cm.getCursor();
-          do {
-            pointer += inc;
-            mark = buffer[(size + pointer) % size];
-            // skip marks that are the same as current position
-            if (mark &&
-                (newCur = mark.find()) &&
-                !cursorEqual(oldCur, newCur)) {
-              break;
-            }
-          } while (pointer < head && pointer > tail);
-        }
-        return mark;
-      }
-      return {
-        cachedCursor: undefined, //used for # and * jumps
-        add: add,
-        move: move
-      };
-    };
-
-    var createMacroState = function() {
-      return {
-        macroKeyBuffer: [],
-        latestRegister: undefined,
-        inReplay: false,
-        lastInsertModeChanges: {
-          changes: [], // Change list
-          expectCursorActivityForChange: false // Set to true on change, false on cursorActivity.
-        },
-        enteredMacroMode: undefined,
-        isMacroPlaying: false,
-        toggle: function(cm, registerName) {
-          if (this.enteredMacroMode) { //onExit
-            this.enteredMacroMode(); // close dialog
-            this.enteredMacroMode = undefined;
-          } else { //onEnter
-            this.latestRegister = registerName;
-            this.enteredMacroMode = cm.openDialog(
-              '(recording)['+registerName+']', null, {bottom:true});
-          }
-        }
-      };
-    };
-
-
-    function maybeInitVimState(cm) {
-      if (!cm.state.vim) {
-        // Store instance state in the CodeMirror object.
-        cm.state.vim = {
-          inputState: new InputState(),
-          // Vim's input state that triggered the last edit, used to repeat
-          // motions and operators with '.'.
-          lastEditInputState: undefined,
-          // Vim's action command before the last edit, used to repeat actions
-          // with '.' and insert mode repeat.
-          lastEditActionCommand: undefined,
-          // When using jk for navigation, if you move from a longer line to a
-          // shorter line, the cursor may clip to the end of the shorter line.
-          // If j is pressed again and cursor goes to the next line, the
-          // cursor should go back to its horizontal position on the longer
-          // line if it can. This is to keep track of the horizontal position.
-          lastHPos: -1,
-          // Doing the same with screen-position for gj/gk
-          lastHSPos: -1,
-          // The last motion command run. Cleared if a non-motion command gets
-          // executed in between.
-          lastMotion: null,
-          marks: {},
-          insertMode: false,
-          // Repeat count for changes made in insert mode, triggered by key
-          // sequences like 3,i. Only exists when insertMode is true.
-          insertModeRepeat: undefined,
-          visualMode: false,
-          // If we are in visual line mode. No effect if visualMode is false.
-          visualLine: false
-        };
-      }
-      return cm.state.vim;
-    }
-    var vimGlobalState;
-    function resetVimGlobalState() {
-      vimGlobalState = {
-        // The current search query.
-        searchQuery: null,
-        // Whether we are searching backwards.
-        searchIsReversed: false,
-        jumpList: createCircularJumpList(),
-        macroModeState: createMacroState(),
-        // Recording latest f, t, F or T motion command.
-        lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
-        registerController: new RegisterController({})
-      };
-    }
-
-    var vimApi= {
-      buildKeyMap: function() {
-        // TODO: Convert keymap into dictionary format for fast lookup.
-      },
-      // Testing hook, though it might be useful to expose the register
-      // controller anyways.
-      getRegisterController: function() {
-        return vimGlobalState.registerController;
-      },
-      // Testing hook.
-      resetVimGlobalState_: resetVimGlobalState,
-
-      // Testing hook.
-      getVimGlobalState_: function() {
-        return vimGlobalState;
-      },
-
-      // Testing hook.
-      maybeInitVimState_: maybeInitVimState,
-
-      InsertModeKey: InsertModeKey,
-      map: function(lhs, rhs) {
-        // Add user defined key bindings.
-        exCommandDispatcher.map(lhs, rhs);
-      },
-      defineEx: function(name, prefix, func){
-        if (name.indexOf(prefix) !== 0) {
-          throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered');
-        }
-        exCommands[name]=func;
-        exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
-      },
-      // This is the outermost function called by CodeMirror, after keys have
-      // been mapped to their Vim equivalents.
-      handleKey: function(cm, key) {
-        var command;
-        var vim = maybeInitVimState(cm);
-        var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.enteredMacroMode) {
-          if (key == 'q') {
-            actions.exitMacroRecordMode();
-            vim.inputState = new InputState();
-            return;
-          }
-        }
-        if (key == '<Esc>') {
-          // Clear input state and get back to normal mode.
-          vim.inputState = new InputState();
-          if (vim.visualMode) {
-            exitVisualMode(cm);
-          }
-          return;
-        }
-        // Enter visual mode when the mouse selects text.
-        if (!vim.visualMode &&
-            !cursorEqual(cm.getCursor('head'), cm.getCursor('anchor'))) {
-          vim.visualMode = true;
-          vim.visualLine = false;
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-          cm.on('mousedown', exitVisualMode);
-        }
-        if (key != '0' || (key == '0' && vim.inputState.getRepeat() === 0)) {
-          // Have to special case 0 since it's both a motion and a number.
-          command = commandDispatcher.matchCommand(key, defaultKeymap, vim);
-        }
-        if (!command) {
-          if (isNumber(key)) {
-            // Increment count unless count is 0 and key is 0.
-            vim.inputState.pushRepeatDigit(key);
-          }
-          return;
-        }
-        if (command.type == 'keyToKey') {
-          // TODO: prevent infinite recursion.
-          for (var i = 0; i < command.toKeys.length; i++) {
-            this.handleKey(cm, command.toKeys[i]);
-          }
-        } else {
-          if (macroModeState.enteredMacroMode) {
-            logKey(macroModeState, key);
-          }
-          commandDispatcher.processCommand(cm, vim, command);
-        }
-      },
-      handleEx: function(cm, input) {
-        exCommandDispatcher.processCommand(cm, input);
-      }
-    };
-
-    // Represents the current input state.
-    function InputState() {
-      this.prefixRepeat = [];
-      this.motionRepeat = [];
-
-      this.operator = null;
-      this.operatorArgs = null;
-      this.motion = null;
-      this.motionArgs = null;
-      this.keyBuffer = []; // For matching multi-key commands.
-      this.registerName = null; // Defaults to the unamed register.
-    }
-    InputState.prototype.pushRepeatDigit = function(n) {
-      if (!this.operator) {
-        this.prefixRepeat = this.prefixRepeat.concat(n);
-      } else {
-        this.motionRepeat = this.motionRepeat.concat(n);
-      }
-    };
-    InputState.prototype.getRepeat = function() {
-      var repeat = 0;
-      if (this.prefixRepeat.length > 0 || this.motionRepeat.length > 0) {
-        repeat = 1;
-        if (this.prefixRepeat.length > 0) {
-          repeat *= parseInt(this.prefixRepeat.join(''), 10);
-        }
-        if (this.motionRepeat.length > 0) {
-          repeat *= parseInt(this.motionRepeat.join(''), 10);
-        }
-      }
-      return repeat;
-    };
-
-    /*
-     * Register stores information about copy and paste registers.  Besides
-     * text, a register must store whether it is linewise (i.e., when it is
-     * pasted, should it insert itself into a new line, or should the text be
-     * inserted at the cursor position.)
-     */
-    function Register(text, linewise) {
-      this.clear();
-      if (text) {
-        this.set(text, linewise);
-      }
-    }
-    Register.prototype = {
-      set: function(text, linewise) {
-        this.text = text;
-        this.linewise = !!linewise;
-      },
-      append: function(text, linewise) {
-        // if this register has ever been set to linewise, use linewise.
-        if (linewise || this.linewise) {
-          this.text += '\n' + text;
-          this.linewise = true;
-        } else {
-          this.text += text;
-        }
-      },
-      clear: function() {
-        this.text = '';
-        this.linewise = false;
-      },
-      toString: function() { return this.text; }
-    };
-
-    /*
-     * vim registers allow you to keep many independent copy and paste buffers.
-     * See http://usevim.com/2012/04/13/registers/ for an introduction.
-     *
-     * RegisterController keeps the state of all the registers.  An initial
-     * state may be passed in.  The unnamed register '"' will always be
-     * overridden.
-     */
-    function RegisterController(registers) {
-      this.registers = registers;
-      this.unamedRegister = registers['"'] = new Register();
-    }
-    RegisterController.prototype = {
-      pushText: function(registerName, operator, text, linewise) {
-        if (linewise && text.charAt(0) == '\n') {
-          text = text.slice(1) + '\n';
-        }
-        if(linewise && text.charAt(text.length - 1) !== '\n'){
-          text += '\n';
-        }
-        // Lowercase and uppercase registers refer to the same register.
-        // Uppercase just means append.
-        var register = this.isValidRegister(registerName) ?
-            this.getRegister(registerName) : null;
-        // if no register/an invalid register was specified, things go to the
-        // default registers
-        if (!register) {
-          switch (operator) {
-            case 'yank':
-              // The 0 register contains the text from the most recent yank.
-              this.registers['0'] = new Register(text, linewise);
-              break;
-            case 'delete':
-            case 'change':
-              if (text.indexOf('\n') == -1) {
-                // Delete less than 1 line. Update the small delete register.
-                this.registers['-'] = new Register(text, linewise);
-              } else {
-                // Shift down the contents of the numbered registers and put the
-                // deleted text into register 1.
-                this.shiftNumericRegisters_();
-                this.registers['1'] = new Register(text, linewise);
-              }
-              break;
-          }
-          // Make sure the unnamed register is set to what just happened
-          this.unamedRegister.set(text, linewise);
-          return;
-        }
-
-        // If we've gotten to this point, we've actually specified a register
-        var append = isUpperCase(registerName);
-        if (append) {
-          register.append(text, linewise);
-          // The unamed register always has the same value as the last used
-          // register.
-          this.unamedRegister.append(text, linewise);
-        } else {
-          register.set(text, linewise);
-          this.unamedRegister.set(text, linewise);
-        }
-      },
-      setRegisterText: function(name, text, linewise) {
-        this.getRegister(name).set(text, linewise);
-      },
-      // Gets the register named @name.  If one of @name doesn't already exist,
-      // create it.  If @name is invalid, return the unamedRegister.
-      getRegister: function(name) {
-        if (!this.isValidRegister(name)) {
-          return this.unamedRegister;
-        }
-        name = name.toLowerCase();
-        if (!this.registers[name]) {
-          this.registers[name] = new Register();
-        }
-        return this.registers[name];
-      },
-      isValidRegister: function(name) {
-        return name && inArray(name, validRegisters);
-      },
-      shiftNumericRegisters_: function() {
-        for (var i = 9; i >= 2; i--) {
-          this.registers[i] = this.getRegister('' + (i - 1));
-        }
-      }
-    };
-
-    var commandDispatcher = {
-      matchCommand: function(key, keyMap, vim) {
-        var inputState = vim.inputState;
-        var keys = inputState.keyBuffer.concat(key);
-        var matchedCommands = [];
-        var selectedCharacter;
-        for (var i = 0; i < keyMap.length; i++) {
-          var command = keyMap[i];
-          if (matchKeysPartial(keys, command.keys)) {
-            if (inputState.operator && command.type == 'action') {
-              // Ignore matched action commands after an operator. Operators
-              // only operate on motions. This check is really for text
-              // objects since aW, a[ etcs conflicts with a.
-              continue;
-            }
-            // Match commands that take <character> as an argument.
-            if (command.keys[keys.length - 1] == 'character') {
-              selectedCharacter = keys[keys.length - 1];
-              if(selectedCharacter.length>1){
-                switch(selectedCharacter){
-                  case '<CR>':
-                    selectedCharacter='\n';
-                    break;
-                  case '<Space>':
-                    selectedCharacter=' ';
-                    break;
-                  default:
-                    continue;
-                }
-              }
-            }
-            // Add the command to the list of matched commands. Choose the best
-            // command later.
-            matchedCommands.push(command);
-          }
-        }
-
-        // Returns the command if it is a full match, or null if not.
-        function getFullyMatchedCommandOrNull(command) {
-          if (keys.length < command.keys.length) {
-            // Matches part of a multi-key command. Buffer and wait for next
-            // stroke.
-            inputState.keyBuffer.push(key);
-            return null;
-          } else {
-            if (command.keys[keys.length - 1] == 'character') {
-              inputState.selectedCharacter = selectedCharacter;
-            }
-            // Clear the buffer since a full match was found.
-            inputState.keyBuffer = [];
-            return command;
-          }
-        }
-
-        if (!matchedCommands.length) {
-          // Clear the buffer since there were no matches.
-          inputState.keyBuffer = [];
-          return null;
-        } else if (matchedCommands.length == 1) {
-          return getFullyMatchedCommandOrNull(matchedCommands[0]);
-        } else {
-          // Find the best match in the list of matchedCommands.
-          var context = vim.visualMode ? 'visual' : 'normal';
-          var bestMatch = matchedCommands[0]; // Default to first in the list.
-          for (var i = 0; i < matchedCommands.length; i++) {
-            if (matchedCommands[i].context == context) {
-              bestMatch = matchedCommands[i];
-              break;
-            }
-          }
-          return getFullyMatchedCommandOrNull(bestMatch);
-        }
-      },
-      processCommand: function(cm, vim, command) {
-        vim.inputState.repeatOverride = command.repeatOverride;
-        switch (command.type) {
-          case 'motion':
-            this.processMotion(cm, vim, command);
-            break;
-          case 'operator':
-            this.processOperator(cm, vim, command);
-            break;
-          case 'operatorMotion':
-            this.processOperatorMotion(cm, vim, command);
-            break;
-          case 'action':
-            this.processAction(cm, vim, command);
-            break;
-          case 'search':
-            this.processSearch(cm, vim, command);
-            break;
-          case 'ex':
-          case 'keyToEx':
-            this.processEx(cm, vim, command);
-            break;
-          default:
-            break;
-        }
-      },
-      processMotion: function(cm, vim, command) {
-        vim.inputState.motion = command.motion;
-        vim.inputState.motionArgs = copyArgs(command.motionArgs);
-        this.evalInput(cm, vim);
-      },
-      processOperator: function(cm, vim, command) {
-        var inputState = vim.inputState;
-        if (inputState.operator) {
-          if (inputState.operator == command.operator) {
-            // Typing an operator twice like 'dd' makes the operator operate
-            // linewise
-            inputState.motion = 'expandToLine';
-            inputState.motionArgs = { linewise: true };
-            this.evalInput(cm, vim);
-            return;
-          } else {
-            // 2 different operators in a row doesn't make sense.
-            vim.inputState = new InputState();
-          }
-        }
-        inputState.operator = command.operator;
-        inputState.operatorArgs = copyArgs(command.operatorArgs);
-        if (vim.visualMode) {
-          // Operating on a selection in visual mode. We don't need a motion.
-          this.evalInput(cm, vim);
-        }
-      },
-      processOperatorMotion: function(cm, vim, command) {
-        var visualMode = vim.visualMode;
-        var operatorMotionArgs = copyArgs(command.operatorMotionArgs);
-        if (operatorMotionArgs) {
-          // Operator motions may have special behavior in visual mode.
-          if (visualMode && operatorMotionArgs.visualLine) {
-            vim.visualLine = true;
-          }
-        }
-        this.processOperator(cm, vim, command);
-        if (!visualMode) {
-          this.processMotion(cm, vim, command);
-        }
-      },
-      processAction: function(cm, vim, command) {
-        var inputState = vim.inputState;
-        var repeat = inputState.getRepeat();
-        var repeatIsExplicit = !!repeat;
-        var actionArgs = copyArgs(command.actionArgs) || {};
-        if (inputState.selectedCharacter) {
-          actionArgs.selectedCharacter = inputState.selectedCharacter;
-        }
-        // Actions may or may not have motions and operators. Do these first.
-        if (command.operator) {
-          this.processOperator(cm, vim, command);
-        }
-        if (command.motion) {
-          this.processMotion(cm, vim, command);
-        }
-        if (command.motion || command.operator) {
-          this.evalInput(cm, vim);
-        }
-        actionArgs.repeat = repeat || 1;
-        actionArgs.repeatIsExplicit = repeatIsExplicit;
-        actionArgs.registerName = inputState.registerName;
-        vim.inputState = new InputState();
-        vim.lastMotion = null;
-        if (command.isEdit) {
-          this.recordLastEdit(vim, inputState, command);
-        }
-        actions[command.action](cm, actionArgs, vim);
-      },
-      processSearch: function(cm, vim, command) {
-        if (!cm.getSearchCursor) {
-          // Search depends on SearchCursor.
-          return;
-        }
-        var forward = command.searchArgs.forward;
-        getSearchState(cm).setReversed(!forward);
-        var promptPrefix = (forward) ? '/' : '?';
-        var originalQuery = getSearchState(cm).getQuery();
-        var originalScrollPos = cm.getScrollInfo();
-        function handleQuery(query, ignoreCase, smartCase) {
-          try {
-            updateSearchQuery(cm, query, ignoreCase, smartCase);
-          } catch (e) {
-            showConfirm(cm, 'Invalid regex: ' + query);
-            return;
-          }
-          commandDispatcher.processMotion(cm, vim, {
-            type: 'motion',
-            motion: 'findNext',
-            motionArgs: { forward: true, toJumplist: command.searchArgs.toJumplist }
-          });
-        }
-        function onPromptClose(query) {
-          cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
-          handleQuery(query, true /** ignoreCase */, true /** smartCase */);
-        }
-        function onPromptKeyUp(_e, query) {
-          var parsedQuery;
-          try {
-            parsedQuery = updateSearchQuery(cm, query,
-                true /** ignoreCase */, true /** smartCase */);
-          } catch (e) {
-            // Swallow bad regexes for incremental search.
-          }
-          if (parsedQuery) {
-            cm.scrollIntoView(findNext(cm, !forward, parsedQuery), 30);
-          } else {
-            clearSearchHighlight(cm);
-            cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
-          }
-        }
-        function onPromptKeyDown(e, _query, close) {
-          var keyName = CodeMirror.keyName(e);
-          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
-            updateSearchQuery(cm, originalQuery);
-            clearSearchHighlight(cm);
-            cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
-
-            CodeMirror.e_stop(e);
-            close();
-            cm.focus();
-          }
-        }
-        switch (command.searchArgs.querySrc) {
-          case 'prompt':
-            showPrompt(cm, {
-                onClose: onPromptClose,
-                prefix: promptPrefix,
-                desc: searchPromptDesc,
-                onKeyUp: onPromptKeyUp,
-                onKeyDown: onPromptKeyDown
-            });
-            break;
-          case 'wordUnderCursor':
-            var word = expandWordUnderCursor(cm, false /** inclusive */,
-                true /** forward */, false /** bigWord */,
-                true /** noSymbol */);
-            var isKeyword = true;
-            if (!word) {
-              word = expandWordUnderCursor(cm, false /** inclusive */,
-                  true /** forward */, false /** bigWord */,
-                  false /** noSymbol */);
-              isKeyword = false;
-            }
-            if (!word) {
-              return;
-            }
-            var query = cm.getLine(word.start.line).substring(word.start.ch,
-                word.end.ch);
-            if (isKeyword) {
-              query = '\\b' + query + '\\b';
-            } else {
-              query = escapeRegex(query);
-            }
-
-            // cachedCursor is used to save the old position of the cursor
-            // when * or # causes vim to seek for the nearest word and shift
-            // the cursor before entering the motion.
-            vimGlobalState.jumpList.cachedCursor = cm.getCursor();
-            cm.setCursor(word.start);
-
-            handleQuery(query, true /** ignoreCase */, false /** smartCase */);
-            break;
-        }
-      },
-      processEx: function(cm, vim, command) {
-        function onPromptClose(input) {
-          // Give the prompt some time to close so that if processCommand shows
-          // an error, the elements don't overlap.
-          exCommandDispatcher.processCommand(cm, input);
-        }
-        function onPromptKeyDown(e, _input, close) {
-          var keyName = CodeMirror.keyName(e);
-          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
-            CodeMirror.e_stop(e);
-            close();
-            cm.focus();
-          }
-        }
-        if (command.type == 'keyToEx') {
-          // Handle user defined Ex to Ex mappings
-          exCommandDispatcher.processCommand(cm, command.exArgs.input);
-        } else {
-          if (vim.visualMode) {
-            showPrompt(cm, { onClose: onPromptClose, prefix: ':', value: '\'<,\'>',
-                onKeyDown: onPromptKeyDown});
-          } else {
-            showPrompt(cm, { onClose: onPromptClose, prefix: ':',
-                onKeyDown: onPromptKeyDown});
-          }
-        }
-      },
-      evalInput: function(cm, vim) {
-        // If the motion comand is set, execute both the operator and motion.
-        // Otherwise return.
-        var inputState = vim.inputState;
-        var motion = inputState.motion;
-        var motionArgs = inputState.motionArgs || {};
-        var operator = inputState.operator;
-        var operatorArgs = inputState.operatorArgs || {};
-        var registerName = inputState.registerName;
-        var selectionEnd = cm.getCursor('head');
-        var selectionStart = cm.getCursor('anchor');
-        // The difference between cur and selection cursors are that cur is
-        // being operated on and ignores that there is a selection.
-        var curStart = copyCursor(selectionEnd);
-        var curOriginal = copyCursor(curStart);
-        var curEnd;
-        var repeat;
-        if (operator) {
-          this.recordLastEdit(vim, inputState);
-        }
-        if (inputState.repeatOverride !== undefined) {
-          // If repeatOverride is specified, that takes precedence over the
-          // input state's repeat. Used by Ex mode and can be user defined.
-          repeat = inputState.repeatOverride;
-        } else {
-          repeat = inputState.getRepeat();
-        }
-        if (repeat > 0 && motionArgs.explicitRepeat) {
-          motionArgs.repeatIsExplicit = true;
-        } else if (motionArgs.noRepeat ||
-            (!motionArgs.explicitRepeat && repeat === 0)) {
-          repeat = 1;
-          motionArgs.repeatIsExplicit = false;
-        }
-        if (inputState.selectedCharacter) {
-          // If there is a character input, stick it in all of the arg arrays.
-          motionArgs.selectedCharacter = operatorArgs.selectedCharacter =
-              inputState.selectedCharacter;
-        }
-        motionArgs.repeat = repeat;
-        vim.inputState = new InputState();
-        if (motion) {
-          var motionResult = motions[motion](cm, motionArgs, vim);
-          vim.lastMotion = motions[motion];
-          if (!motionResult) {
-            return;
-          }
-          if (motionArgs.toJumplist) {
-            var jumpList = vimGlobalState.jumpList;
-            // if the current motion is # or *, use cachedCursor
-            var cachedCursor = jumpList.cachedCursor;
-            if (cachedCursor) {
-              recordJumpPosition(cm, cachedCursor, motionResult);
-              delete jumpList.cachedCursor;
-            } else {
-              recordJumpPosition(cm, curOriginal, motionResult);
-            }
-          }
-          if (motionResult instanceof Array) {
-            curStart = motionResult[0];
-            curEnd = motionResult[1];
-          } else {
-            curEnd = motionResult;
-          }
-          // TODO: Handle null returns from motion commands better.
-          if (!curEnd) {
-            curEnd = { ch: curStart.ch, line: curStart.line };
-          }
-          if (vim.visualMode) {
-            // Check if the selection crossed over itself. Will need to shift
-            // the start point if that happened.
-            if (cursorIsBefore(selectionStart, selectionEnd) &&
-                (cursorEqual(selectionStart, curEnd) ||
-                    cursorIsBefore(curEnd, selectionStart))) {
-              // The end of the selection has moved from after the start to
-              // before the start. We will shift the start right by 1.
-              selectionStart.ch += 1;
-            } else if (cursorIsBefore(selectionEnd, selectionStart) &&
-                (cursorEqual(selectionStart, curEnd) ||
-                    cursorIsBefore(selectionStart, curEnd))) {
-              // The opposite happened. We will shift the start left by 1.
-              selectionStart.ch -= 1;
-            }
-            selectionEnd = curEnd;
-            if (vim.visualLine) {
-              if (cursorIsBefore(selectionStart, selectionEnd)) {
-                selectionStart.ch = 0;
-
-                var lastLine = cm.lastLine();
-                if (selectionEnd.line > lastLine) {
-                  selectionEnd.line = lastLine;
-                }
-                selectionEnd.ch = lineLength(cm, selectionEnd.line);
-              } else {
-                selectionEnd.ch = 0;
-                selectionStart.ch = lineLength(cm, selectionStart.line);
-              }
-            }
-            cm.setSelection(selectionStart, selectionEnd);
-            updateMark(cm, vim, '<',
-                cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
-                    : selectionEnd);
-            updateMark(cm, vim, '>',
-                cursorIsBefore(selectionStart, selectionEnd) ? selectionEnd
-                    : selectionStart);
-          } else if (!operator) {
-            curEnd = clipCursorToContent(cm, curEnd);
-            cm.setCursor(curEnd.line, curEnd.ch);
-          }
-        }
-
-        if (operator) {
-          var inverted = false;
-          vim.lastMotion = null;
-          operatorArgs.repeat = repeat; // Indent in visual mode needs this.
-          if (vim.visualMode) {
-            curStart = selectionStart;
-            curEnd = selectionEnd;
-            motionArgs.inclusive = true;
-          }
-          // Swap start and end if motion was backward.
-          if (cursorIsBefore(curEnd, curStart)) {
-            var tmp = curStart;
-            curStart = curEnd;
-            curEnd = tmp;
-            inverted = true;
-          }
-          if (motionArgs.inclusive && !(vim.visualMode && inverted)) {
-            // Move the selection end one to the right to include the last
-            // character.
-            curEnd.ch++;
-          }
-          var linewise = motionArgs.linewise ||
-              (vim.visualMode && vim.visualLine);
-          if (linewise) {
-            // Expand selection to entire line.
-            expandSelectionToLine(cm, curStart, curEnd);
-          } else if (motionArgs.forward) {
-            // Clip to trailing newlines only if the motion goes forward.
-            clipToLine(cm, curStart, curEnd);
-          }
-          operatorArgs.registerName = registerName;
-          // Keep track of linewise as it affects how paste and change behave.
-          operatorArgs.linewise = linewise;
-          operators[operator](cm, operatorArgs, vim, curStart,
-              curEnd, curOriginal);
-          if (vim.visualMode) {
-            exitVisualMode(cm);
-          }
-        }
-      },
-      recordLastEdit: function(vim, inputState, actionCommand) {
-        var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.inReplay) { return; }
-        vim.lastEditInputState = inputState;
-        vim.lastEditActionCommand = actionCommand;
-        macroModeState.lastInsertModeChanges.changes = [];
-        macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false;
-      }
-    };
-
-    /**
-     * typedef {Object{line:number,ch:number}} Cursor An object containing the
-     *     position of the cursor.
-     */
-    // All of the functions below return Cursor objects.
-    var motions = {
-      moveToTopLine: function(cm, motionArgs) {
-        var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
-        return { line: line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(line)) };
-      },
-      moveToMiddleLine: function(cm) {
-        var range = getUserVisibleLines(cm);
-        var line = Math.floor((range.top + range.bottom) * 0.5);
-        return { line: line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(line)) };
-      },
-      moveToBottomLine: function(cm, motionArgs) {
-        var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
-        return { line: line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(line)) };
-      },
-      expandToLine: function(cm, motionArgs) {
-        // Expands forward to end of line, and then to next line if repeat is
-        // >1. Does not handle backward motion!
-        var cur = cm.getCursor();
-        return { line: cur.line + motionArgs.repeat - 1, ch: Infinity };
-      },
-      findNext: function(cm, motionArgs) {
-        var state = getSearchState(cm);
-        var query = state.getQuery();
-        if (!query) {
-          return;
-        }
-        var prev = !motionArgs.forward;
-        // If search is initiated with ? instead of /, negate direction.
-        prev = (state.isReversed()) ? !prev : prev;
-        highlightSearchMatches(cm, query);
-        return findNext(cm, prev/** prev */, query, motionArgs.repeat);
-      },
-      goToMark: function(_cm, motionArgs, vim) {
-        var mark = vim.marks[motionArgs.selectedCharacter];
-        if (mark) {
-          return mark.find();
-        }
-        return null;
-      },
-      jumpToMark: function(cm, motionArgs, vim) {
-        var best = cm.getCursor();
-        for (var i = 0; i < motionArgs.repeat; i++) {
-          var cursor = best;
-          for (var key in vim.marks) {
-            if (!isLowerCase(key)) {
-              continue;
-            }
-            var mark = vim.marks[key].find();
-            var isWrongDirection = (motionArgs.forward) ?
-              cursorIsBefore(mark, cursor) : cursorIsBefore(cursor, mark);
-
-            if (isWrongDirection) {
-              continue;
-            }
-            if (motionArgs.linewise && (mark.line == cursor.line)) {
-              continue;
-            }
-
-            var equal = cursorEqual(cursor, best);
-            var between = (motionArgs.forward) ?
-              cusrorIsBetween(cursor, mark, best) :
-              cusrorIsBetween(best, mark, cursor);
-
-            if (equal || between) {
-              best = mark;
-            }
-          }
-        }
-
-        if (motionArgs.linewise) {
-          // Vim places the cursor on the first non-whitespace character of
-          // the line if there is one, else it places the cursor at the end
-          // of the line, regardless of whether a mark was found.
-          best.ch = findFirstNonWhiteSpaceCharacter(cm.getLine(best.line));
-        }
-        return best;
-      },
-      moveByCharacters: function(cm, motionArgs) {
-        var cur = cm.getCursor();
-        var repeat = motionArgs.repeat;
-        var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
-        return { line: cur.line, ch: ch };
-      },
-      moveByLines: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
-        var endCh = cur.ch;
-        // Depending what our last motion was, we may want to do different
-        // things. If our last motion was moving vertically, we want to
-        // preserve the HPos from our last horizontal move.  If our last motion
-        // was going to the end of a line, moving vertically we should go to
-        // the end of the line, etc.
-        switch (vim.lastMotion) {
-          case this.moveByLines:
-          case this.moveByDisplayLines:
-          case this.moveByScroll:
-          case this.moveToColumn:
-          case this.moveToEol:
-            endCh = vim.lastHPos;
-            break;
-          default:
-            vim.lastHPos = endCh;
-        }
-        var repeat = motionArgs.repeat+(motionArgs.repeatOffset||0);
-        var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
-        var first = cm.firstLine();
-        var last = cm.lastLine();
-        // Vim cancels linewise motions that start on an edge and move beyond
-        // that edge. It does not cancel motions that do not start on an edge.
-        if ((line < first && cur.line == first) ||
-            (line > last && cur.line == last)) {
-          return;
-        }
-        if(motionArgs.toFirstChar){
-          endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
-          vim.lastHPos = endCh;
-        }
-        vim.lastHSPos = cm.charCoords({line:line, ch:endCh},'div').left;
-        return { line: line, ch: endCh };
-      },
-      moveByDisplayLines: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
-        switch (vim.lastMotion) {
-          case this.moveByDisplayLines:
-          case this.moveByScroll:
-          case this.moveByLines:
-          case this.moveToColumn:
-          case this.moveToEol:
-            break;
-          default:
-            vim.lastHSPos = cm.charCoords(cur,'div').left;
-        }
-        var repeat = motionArgs.repeat;
-        var res=cm.findPosV(cur,(motionArgs.forward ? repeat : -repeat),'line',vim.lastHSPos);
-        if (res.hitSide) {
-          if (motionArgs.forward) {
-            var lastCharCoords = cm.charCoords(res, 'div');
-            var goalCoords = { top: lastCharCoords.top + 8, left: vim.lastHSPos };
-            var res = cm.coordsChar(goalCoords, 'div');
-          } else {
-            var resCoords = cm.charCoords({ line: cm.firstLine(), ch: 0}, 'div');
-            resCoords.left = vim.lastHSPos;
-            res = cm.coordsChar(resCoords, 'div');
-          }
-        }
-        vim.lastHPos = res.ch;
-        return res;
-      },
-      moveByPage: function(cm, motionArgs) {
-        // CodeMirror only exposes functions that move the cursor page down, so
-        // doing this bad hack to move the cursor and move it back. evalInput
-        // will move the cursor to where it should be in the end.
-        var curStart = cm.getCursor();
-        var repeat = motionArgs.repeat;
-        cm.moveV((motionArgs.forward ? repeat : -repeat), 'page');
-        var curEnd = cm.getCursor();
-        cm.setCursor(curStart);
-        return curEnd;
-      },
-      moveByParagraph: function(cm, motionArgs) {
-        var line = cm.getCursor().line;
-        var repeat = motionArgs.repeat;
-        var inc = motionArgs.forward ? 1 : -1;
-        for (var i = 0; i < repeat; i++) {
-          if ((!motionArgs.forward && line === cm.firstLine() ) ||
-              (motionArgs.forward && line == cm.lastLine())) {
-            break;
-          }
-          line += inc;
-          while (line !== cm.firstLine() && line != cm.lastLine() && cm.getLine(line)) {
-            line += inc;
-          }
-        }
-        return { line: line, ch: 0 };
-      },
-      moveByScroll: function(cm, motionArgs, vim) {
-        var scrollbox = cm.getScrollInfo();
-        var curEnd = null;
-        var repeat = motionArgs.repeat;
-        if (!repeat) {
-          repeat = scrollbox.clientHeight / (2 * cm.defaultTextHeight());
-        }
-        var orig = cm.charCoords(cm.getCursor(), 'local');
-        motionArgs.repeat = repeat;
-        var curEnd = motions.moveByDisplayLines(cm, motionArgs, vim);
-        if (!curEnd) {
-          return null;
-        }
-        var dest = cm.charCoords(curEnd, 'local');
-        cm.scrollTo(null, scrollbox.top + dest.top - orig.top);
-        return curEnd;
-      },
-      moveByWords: function(cm, motionArgs) {
-        return moveToWord(cm, motionArgs.repeat, !!motionArgs.forward,
-            !!motionArgs.wordEnd, !!motionArgs.bigWord);
-      },
-      moveTillCharacter: function(cm, motionArgs) {
-        var repeat = motionArgs.repeat;
-        var curEnd = moveToCharacter(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter);
-        var increment = motionArgs.forward ? -1 : 1;
-        recordLastCharacterSearch(increment, motionArgs);
-        if(!curEnd)return cm.getCursor();
-        curEnd.ch += increment;
-        return curEnd;
-      },
-      moveToCharacter: function(cm, motionArgs) {
-        var repeat = motionArgs.repeat;
-        recordLastCharacterSearch(0, motionArgs);
-        return moveToCharacter(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || cm.getCursor();
-      },
-      moveToSymbol: function(cm, motionArgs) {
-        var repeat = motionArgs.repeat;
-        return findSymbol(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || cm.getCursor();
-      },
-      moveToColumn: function(cm, motionArgs, vim) {
-        var repeat = motionArgs.repeat;
-        // repeat is equivalent to which column we want to move to!
-        vim.lastHPos = repeat - 1;
-        vim.lastHSPos = cm.charCoords(cm.getCursor(),'div').left;
-        return moveToColumn(cm, repeat);
-      },
-      moveToEol: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
-        vim.lastHPos = Infinity;
-        var retval={ line: cur.line + motionArgs.repeat - 1, ch: Infinity };
-        var end=cm.clipPos(retval);
-        end.ch--;
-        vim.lastHSPos = cm.charCoords(end,'div').left;
-        return retval;
-      },
-      moveToFirstNonWhiteSpaceCharacter: function(cm) {
-        // Go to the start of the line where the text begins, or the end for
-        // whitespace-only lines
-        var cursor = cm.getCursor();
-        return { line: cursor.line,
-            ch: findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)) };
-      },
-      moveToMatchedSymbol: function(cm) {
-        var cursor = cm.getCursor();
-        var line = cursor.line;
-        var ch = cursor.ch;
-        var lineText = cm.getLine(line);
-        var symbol;
-        var startContext = cm.getTokenAt(cursor).type;
-        var startCtxLevel = getContextLevel(startContext);
-        do {
-          symbol = lineText.charAt(ch++);
-          if (symbol && isMatchableSymbol(symbol)) {
-            var endContext = cm.getTokenAt({line:line, ch:ch}).type;
-            var endCtxLevel = getContextLevel(endContext);
-            if (startCtxLevel >= endCtxLevel) {
-              break;
-            }
-          }
-        } while (symbol);
-        if (symbol) {
-          return findMatchedSymbol(cm, {line:line, ch:ch-1}, symbol);
-        } else {
-          return cursor;
-        }
-      },
-      moveToStartOfLine: function(cm) {
-        var cursor = cm.getCursor();
-        return { line: cursor.line, ch: 0 };
-      },
-      moveToLineOrEdgeOfDocument: function(cm, motionArgs) {
-        var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
-        if (motionArgs.repeatIsExplicit) {
-          lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
-        }
-        return { line: lineNum,
-            ch: findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)) };
-      },
-      textObjectManipulation: function(cm, motionArgs) {
-        var character = motionArgs.selectedCharacter;
-        // Inclusive is the difference between a and i
-        // TODO: Instead of using the additional text object map to perform text
-        //     object operations, merge the map into the defaultKeyMap and use
-        //     motionArgs to define behavior. Define separate entries for 'aw',
-        //     'iw', 'a[', 'i[', etc.
-        var inclusive = !motionArgs.textObjectInner;
-        if (!textObjects[character]) {
-          // No text object defined for this, don't move.
-          return null;
-        }
-        var tmp = textObjects[character](cm, inclusive);
-        var start = tmp.start;
-        var end = tmp.end;
-        return [start, end];
-      },
-      repeatLastCharacterSearch: function(cm, motionArgs) {
-        var lastSearch = vimGlobalState.lastChararacterSearch;
-        var repeat = motionArgs.repeat;
-        var forward = motionArgs.forward === lastSearch.forward;
-        var increment = (lastSearch.increment ? 1 : 0) * (forward ? -1 : 1);
-        cm.moveH(-increment, 'char');
-        motionArgs.inclusive = forward ? true : false;
-        var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter);
-        if (!curEnd) {
-          cm.moveH(increment, 'char');
-          return cm.getCursor();
-        }
-        curEnd.ch += increment;
-        return curEnd;
-      }
-    };
-
-    var operators = {
-      change: function(cm, operatorArgs, _vim, curStart, curEnd) {
-        vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'change', cm.getRange(curStart, curEnd),
-            operatorArgs.linewise);
-        if (operatorArgs.linewise) {
-          // Push the next line back down, if there is a next line.
-          var replacement = curEnd.line > cm.lastLine() ? '' : '\n';
-          cm.replaceRange(replacement, curStart, curEnd);
-          cm.indentLine(curStart.line, 'smart');
-          // null ch so setCursor moves to end of line.
-          curStart.ch = null;
-        } else {
-          // Exclude trailing whitespace if the range is not all whitespace.
-          var text = cm.getRange(curStart, curEnd);
-          if (!isWhiteSpaceString(text)) {
-            var match = (/\s+$/).exec(text);
-            if (match) {
-              curEnd = offsetCursor(curEnd, 0, - match[0].length);
-            }
-          }
-          cm.replaceRange('', curStart, curEnd);
-        }
-        actions.enterInsertMode(cm, {}, cm.state.vim);
-        cm.setCursor(curStart);
-      },
-      // delete is a javascript keyword.
-      'delete': function(cm, operatorArgs, _vim, curStart, curEnd) {
-        // If the ending line is past the last line, inclusive, instead of
-        // including the trailing \n, include the \n before the starting line
-        if (operatorArgs.linewise &&
-            curEnd.line > cm.lastLine() && curStart.line > cm.firstLine()) {
-          curStart.line--;
-          curStart.ch = lineLength(cm, curStart.line);
-        }
-        vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'delete', cm.getRange(curStart, curEnd),
-            operatorArgs.linewise);
-        cm.replaceRange('', curStart, curEnd);
-        if (operatorArgs.linewise) {
-          cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
-        } else {
-          cm.setCursor(curStart);
-        }
-      },
-      indent: function(cm, operatorArgs, vim, curStart, curEnd) {
-        var startLine = curStart.line;
-        var endLine = curEnd.line;
-        // In visual mode, n> shifts the selection right n times, instead of
-        // shifting n lines right once.
-        var repeat = (vim.visualMode) ? operatorArgs.repeat : 1;
-        if (operatorArgs.linewise) {
-          // The only way to delete a newline is to delete until the start of
-          // the next line, so in linewise mode evalInput will include the next
-          // line. We don't want this in indent, so we go back a line.
-          endLine--;
-        }
-        for (var i = startLine; i <= endLine; i++) {
-          for (var j = 0; j < repeat; j++) {
-            cm.indentLine(i, operatorArgs.indentRight);
-          }
-        }
-        cm.setCursor(curStart);
-        cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
-      },
-      swapcase: function(cm, operatorArgs, _vim, curStart, curEnd, curOriginal) {
-        var toSwap = cm.getRange(curStart, curEnd);
-        var swapped = '';
-        for (var i = 0; i < toSwap.length; i++) {
-          var character = toSwap.charAt(i);
-          swapped += isUpperCase(character) ? character.toLowerCase() :
-              character.toUpperCase();
-        }
-        cm.replaceRange(swapped, curStart, curEnd);
-        if (!operatorArgs.shouldMoveCursor) {
-          cm.setCursor(curOriginal);
-        }
-      },
-      yank: function(cm, operatorArgs, _vim, curStart, curEnd, curOriginal) {
-        vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'yank',
-            cm.getRange(curStart, curEnd), operatorArgs.linewise);
-        cm.setCursor(curOriginal);
-      }
-    };
-
-    var actions = {
-      jumpListWalk: function(cm, actionArgs, vim) {
-        if (vim.visualMode) {
-          return;
-        }
-        var repeat = actionArgs.repeat;
-        var forward = actionArgs.forward;
-        var jumpList = vimGlobalState.jumpList;
-
-        var mark = jumpList.move(cm, forward ? repeat : -repeat);
-        var markPos = mark ? mark.find() : undefined;
-        markPos = markPos ? markPos : cm.getCursor();
-        cm.setCursor(markPos);
-      },
-      scrollToCursor: function(cm, actionArgs) {
-        var lineNum = cm.getCursor().line;
-        var charCoords = cm.charCoords({line: lineNum, ch: 0}, 'local');
-        var height = cm.getScrollInfo().clientHeight;
-        var y = charCoords.top;
-        var lineHeight = charCoords.bottom - y;
-        switch (actionArgs.position) {
-          case 'center': y = y - (height / 2) + lineHeight;
-            break;
-          case 'bottom': y = y - height + lineHeight*1.4;
-            break;
-          case 'top': y = y + lineHeight*0.4;
-            break;
-        }
-        cm.scrollTo(null, y);
-      },
-      replayMacro: function(cm, actionArgs) {
-        var registerName = actionArgs.selectedCharacter;
-        var repeat = actionArgs.repeat;
-        var macroModeState = vimGlobalState.macroModeState;
-        if (registerName == '@') {
-          registerName = macroModeState.latestRegister;
-        }
-        var keyBuffer = parseRegisterToKeyBuffer(macroModeState, registerName);
-        while(repeat--){
-          executeMacroKeyBuffer(cm, macroModeState, keyBuffer);
-        }
-      },
-      exitMacroRecordMode: function() {
-        var macroModeState = vimGlobalState.macroModeState;
-        macroModeState.toggle();
-        parseKeyBufferToRegister(macroModeState.latestRegister,
-                                 macroModeState.macroKeyBuffer);
-      },
-      enterMacroRecordMode: function(cm, actionArgs) {
-        var macroModeState = vimGlobalState.macroModeState;
-        var registerName = actionArgs.selectedCharacter;
-        macroModeState.toggle(cm, registerName);
-        emptyMacroKeyBuffer(macroModeState);
-      },
-      enterInsertMode: function(cm, actionArgs, vim) {
-        if (cm.getOption('readOnly')) { return; }
-        vim.insertMode = true;
-        vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
-        var insertAt = (actionArgs) ? actionArgs.insertAt : null;
-        if (insertAt == 'eol') {
-          var cursor = cm.getCursor();
-          cursor = { line: cursor.line, ch: lineLength(cm, cursor.line) };
-          cm.setCursor(cursor);
-        } else if (insertAt == 'charAfter') {
-          cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
-        } else if (insertAt == 'firstNonBlank') {
-          cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
-        }
-        cm.setOption('keyMap', 'vim-insert');
-        if (actionArgs && actionArgs.replace) {
-          // Handle Replace-mode as a special case of insert mode.
-          cm.toggleOverwrite(true);
-          cm.setOption('keyMap', 'vim-replace');
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
-        } else {
-          cm.setOption('keyMap', 'vim-insert');
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
-        }
-        if (!vimGlobalState.macroModeState.inReplay) {
-          // Only record if not replaying.
-          cm.on('change', onChange);
-          cm.on('cursorActivity', onCursorActivity);
-          CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
-        }
-      },
-      toggleVisualMode: function(cm, actionArgs, vim) {
-        var repeat = actionArgs.repeat;
-        var curStart = cm.getCursor();
-        var curEnd;
-        // TODO: The repeat should actually select number of characters/lines
-        //     equal to the repeat times the size of the previous visual
-        //     operation.
-        if (!vim.visualMode) {
-          cm.on('mousedown', exitVisualMode);
-          vim.visualMode = true;
-          vim.visualLine = !!actionArgs.linewise;
-          if (vim.visualLine) {
-            curStart.ch = 0;
-            curEnd = clipCursorToContent(cm, {
-              line: curStart.line + repeat - 1,
-              ch: lineLength(cm, curStart.line)
-            }, true /** includeLineBreak */);
-          } else {
-            curEnd = clipCursorToContent(cm, {
-              line: curStart.line,
-              ch: curStart.ch + repeat
-            }, true /** includeLineBreak */);
-          }
-          // Make the initial selection.
-          if (!actionArgs.repeatIsExplicit && !vim.visualLine) {
-            // This is a strange case. Here the implicit repeat is 1. The
-            // following commands lets the cursor hover over the 1 character
-            // selection.
-            cm.setCursor(curEnd);
-            cm.setSelection(curEnd, curStart);
-          } else {
-            cm.setSelection(curStart, curEnd);
-          }
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : ""});
-        } else {
-          curStart = cm.getCursor('anchor');
-          curEnd = cm.getCursor('head');
-          if (!vim.visualLine && actionArgs.linewise) {
-            // Shift-V pressed in characterwise visual mode. Switch to linewise
-            // visual mode instead of exiting visual mode.
-            vim.visualLine = true;
-            curStart.ch = cursorIsBefore(curStart, curEnd) ? 0 :
-                lineLength(cm, curStart.line);
-            curEnd.ch = cursorIsBefore(curStart, curEnd) ?
-                lineLength(cm, curEnd.line) : 0;
-            cm.setSelection(curStart, curEnd);
-            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: "linewise"});
-          } else if (vim.visualLine && !actionArgs.linewise) {
-            // v pressed in linewise visual mode. Switch to characterwise visual
-            // mode instead of exiting visual mode.
-            vim.visualLine = false;
-            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-          } else {
-            exitVisualMode(cm);
-          }
-        }
-        updateMark(cm, vim, '<', cursorIsBefore(curStart, curEnd) ? curStart
-            : curEnd);
-        updateMark(cm, vim, '>', cursorIsBefore(curStart, curEnd) ? curEnd
-            : curStart);
-      },
-      joinLines: function(cm, actionArgs, vim) {
-        var curStart, curEnd;
-        if (vim.visualMode) {
-          curStart = cm.getCursor('anchor');
-          curEnd = cm.getCursor('head');
-          curEnd.ch = lineLength(cm, curEnd.line) - 1;
-        } else {
-          // Repeat is the number of lines to join. Minimum 2 lines.
-          var repeat = Math.max(actionArgs.repeat, 2);
-          curStart = cm.getCursor();
-          curEnd = clipCursorToContent(cm, { line: curStart.line + repeat - 1,
-              ch: Infinity });
-        }
-        var finalCh = 0;
-        cm.operation(function() {
-          for (var i = curStart.line; i < curEnd.line; i++) {
-            finalCh = lineLength(cm, curStart.line);
-            var tmp = { line: curStart.line + 1,
-                ch: lineLength(cm, curStart.line + 1) };
-            var text = cm.getRange(curStart, tmp);
-            text = text.replace(/\n\s*/g, ' ');
-            cm.replaceRange(text, curStart, tmp);
-          }
-          var curFinalPos = { line: curStart.line, ch: finalCh };
-          cm.setCursor(curFinalPos);
-        });
-      },
-      newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
-        vim.insertMode = true;
-        var insertAt = cm.getCursor();
-        if (insertAt.line === cm.firstLine() && !actionArgs.after) {
-          // Special case for inserting newline before start of document.
-          cm.replaceRange('\n', { line: cm.firstLine(), ch: 0 });
-          cm.setCursor(cm.firstLine(), 0);
-        } else {
-          insertAt.line = (actionArgs.after) ? insertAt.line :
-              insertAt.line - 1;
-          insertAt.ch = lineLength(cm, insertAt.line);
-          cm.setCursor(insertAt);
-          var newlineFn = CodeMirror.commands.newlineAndIndentContinueComment ||
-              CodeMirror.commands.newlineAndIndent;
-          newlineFn(cm);
-        }
-        this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
-      },
-      paste: function(cm, actionArgs) {
-        var cur = cm.getCursor();
-        var register = vimGlobalState.registerController.getRegister(
-            actionArgs.registerName);
-        if (!register.text) {
-          return;
-        }
-        for (var text = '', i = 0; i < actionArgs.repeat; i++) {
-          text += register.text;
-        }
-        var linewise = register.linewise;
-        if (linewise) {
-          if (actionArgs.after) {
-            // Move the newline at the end to the start instead, and paste just
-            // before the newline character of the line we are on right now.
-            text = '\n' + text.slice(0, text.length - 1);
-            cur.ch = lineLength(cm, cur.line);
-          } else {
-            cur.ch = 0;
-          }
-        } else {
-          cur.ch += actionArgs.after ? 1 : 0;
-        }
-        cm.replaceRange(text, cur);
-        // Now fine tune the cursor to where we want it.
-        var curPosFinal;
-        var idx;
-        if (linewise && actionArgs.after) {
-          curPosFinal = { line: cur.line + 1,
-              ch: findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)) };
-        } else if (linewise && !actionArgs.after) {
-          curPosFinal = { line: cur.line,
-              ch: findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)) };
-        } else if (!linewise && actionArgs.after) {
-          idx = cm.indexFromPos(cur);
-          curPosFinal = cm.posFromIndex(idx + text.length - 1);
-        } else {
-          idx = cm.indexFromPos(cur);
-          curPosFinal = cm.posFromIndex(idx + text.length);
-        }
-        cm.setCursor(curPosFinal);
-      },
-      undo: function(cm, actionArgs) {
-        cm.operation(function() {
-          repeatFn(cm, CodeMirror.commands.undo, actionArgs.repeat)();
-          cm.setCursor(cm.getCursor('anchor'));
-        });
-      },
-      redo: function(cm, actionArgs) {
-        repeatFn(cm, CodeMirror.commands.redo, actionArgs.repeat)();
-      },
-      setRegister: function(_cm, actionArgs, vim) {
-        vim.inputState.registerName = actionArgs.selectedCharacter;
-      },
-      setMark: function(cm, actionArgs, vim) {
-        var markName = actionArgs.selectedCharacter;
-        updateMark(cm, vim, markName, cm.getCursor());
-      },
-      replace: function(cm, actionArgs, vim) {
-        var replaceWith = actionArgs.selectedCharacter;
-        var curStart = cm.getCursor();
-        var replaceTo;
-        var curEnd;
-        if(vim.visualMode){
-          curStart=cm.getCursor('start');
-          curEnd=cm.getCursor('end');
-          // workaround to catch the character under the cursor
-          //  existing workaround doesn't cover actions
-          curEnd=cm.clipPos({line: curEnd.line, ch: curEnd.ch+1});
-        }else{
-          var line = cm.getLine(curStart.line);
-          replaceTo = curStart.ch + actionArgs.repeat;
-          if (replaceTo > line.length) {
-            replaceTo=line.length;
-          }
-          curEnd = { line: curStart.line, ch: replaceTo };
-        }
-        if(replaceWith=='\n'){
-          if(!vim.visualMode) cm.replaceRange('', curStart, curEnd);
-          // special case, where vim help says to replace by just one line-break
-          (CodeMirror.commands.newlineAndIndentContinueComment || CodeMirror.commands.newlineAndIndent)(cm);
-        }else {
-          var replaceWithStr=cm.getRange(curStart, curEnd);
-          //replace all characters in range by selected, but keep linebreaks
-          replaceWithStr=replaceWithStr.replace(/[^\n]/g,replaceWith);
-          cm.replaceRange(replaceWithStr, curStart, curEnd);
-          if(vim.visualMode){
-            cm.setCursor(curStart);
-            exitVisualMode(cm);
-          }else{
-            cm.setCursor(offsetCursor(curEnd, 0, -1));
-          }
-        }
-      },
-      incrementNumberToken: function(cm, actionArgs) {
-        var cur = cm.getCursor();
-        var lineStr = cm.getLine(cur.line);
-        var re = /-?\d+/g;
-        var match;
-        var start;
-        var end;
-        var numberStr;
-        var token;
-        while ((match = re.exec(lineStr)) !== null) {
-          token = match[0];
-          start = match.index;
-          end = start + token.length;
-          if(cur.ch < end)break;
-        }
-        if(!actionArgs.backtrack && (end <= cur.ch))return;
-        if (token) {
-          var increment = actionArgs.increase ? 1 : -1;
-          var number = parseInt(token) + (increment * actionArgs.repeat);
-          var from = {ch:start, line:cur.line};
-          var to = {ch:end, line:cur.line};
-          numberStr = number.toString();
-          cm.replaceRange(numberStr, from, to);
-        } else {
-          return;
-        }
-        cm.setCursor({line: cur.line, ch: start + numberStr.length - 1});
-      },
-      repeatLastEdit: function(cm, actionArgs, vim) {
-        var lastEditInputState = vim.lastEditInputState;
-        if (!lastEditInputState) { return; }
-        var repeat = actionArgs.repeat;
-        if (repeat && actionArgs.repeatIsExplicit) {
-          vim.lastEditInputState.repeatOverride = repeat;
-        } else {
-          repeat = vim.lastEditInputState.repeatOverride || repeat;
-        }
-        repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
-      }
-    };
-
-    var textObjects = {
-      // TODO: lots of possible exceptions that can be thrown here. Try da(
-      //     outside of a () block.
-      // TODO: implement text objects for the reverse like }. Should just be
-      //     an additional mapping after moving to the defaultKeyMap.
-      'w': function(cm, inclusive) {
-        return expandWordUnderCursor(cm, inclusive, true /** forward */,
-            false /** bigWord */);
-      },
-      'W': function(cm, inclusive) {
-        return expandWordUnderCursor(cm, inclusive,
-            true /** forward */, true /** bigWord */);
-      },
-      '{': function(cm, inclusive) {
-        return selectCompanionObject(cm, '}', inclusive);
-      },
-      '(': function(cm, inclusive) {
-        return selectCompanionObject(cm, ')', inclusive);
-      },
-      '[': function(cm, inclusive) {
-        return selectCompanionObject(cm, ']', inclusive);
-      },
-      '\'': function(cm, inclusive) {
-        return findBeginningAndEnd(cm, "'", inclusive);
-      },
-      '"': function(cm, inclusive) {
-        return findBeginningAndEnd(cm, '"', inclusive);
-      }
-    };
-
-    /*
-     * Below are miscellaneous utility functions used by vim.js
-     */
-
-    /**
-     * Clips cursor to ensure that line is within the buffer's range
-     * If includeLineBreak is true, then allow cur.ch == lineLength.
-     */
-    function clipCursorToContent(cm, cur, includeLineBreak) {
-      var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() );
-      var maxCh = lineLength(cm, line) - 1;
-      maxCh = (includeLineBreak) ? maxCh + 1 : maxCh;
-      var ch = Math.min(Math.max(0, cur.ch), maxCh);
-      return { line: line, ch: ch };
-    }
-    function copyArgs(args) {
-      var ret = {};
-      for (var prop in args) {
-        if (args.hasOwnProperty(prop)) {
-          ret[prop] = args[prop];
-        }
-      }
-      return ret;
-    }
-    function offsetCursor(cur, offsetLine, offsetCh) {
-      return { line: cur.line + offsetLine, ch: cur.ch + offsetCh };
-    }
-    function matchKeysPartial(pressed, mapped) {
-      for (var i = 0; i < pressed.length; i++) {
-        // 'character' means any character. For mark, register commads, etc.
-        if (pressed[i] != mapped[i] && mapped[i] != 'character') {
-          return false;
-        }
-      }
-      return true;
-    }
-    function repeatFn(cm, fn, repeat) {
-      return function() {
-        for (var i = 0; i < repeat; i++) {
-          fn(cm);
-        }
-      };
-    }
-    function copyCursor(cur) {
-      return { line: cur.line, ch: cur.ch };
-    }
-    function cursorEqual(cur1, cur2) {
-      return cur1.ch == cur2.ch && cur1.line == cur2.line;
-    }
-    function cursorIsBefore(cur1, cur2) {
-      if (cur1.line < cur2.line) {
-        return true;
-      }
-      if (cur1.line == cur2.line && cur1.ch < cur2.ch) {
-        return true;
-      }
-      return false;
-    }
-    function cusrorIsBetween(cur1, cur2, cur3) {
-      // returns true if cur2 is between cur1 and cur3.
-      var cur1before2 = cursorIsBefore(cur1, cur2);
-      var cur2before3 = cursorIsBefore(cur2, cur3);
-      return cur1before2 && cur2before3;
-    }
-    function lineLength(cm, lineNum) {
-      return cm.getLine(lineNum).length;
-    }
-    function reverse(s){
-      return s.split('').reverse().join('');
-    }
-    function trim(s) {
-      if (s.trim) {
-        return s.trim();
-      }
-      return s.replace(/^\s+|\s+$/g, '');
-    }
-    function escapeRegex(s) {
-      return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
-    }
-
-    function exitVisualMode(cm) {
-      cm.off('mousedown', exitVisualMode);
-      var vim = cm.state.vim;
-      vim.visualMode = false;
-      vim.visualLine = false;
-      var selectionStart = cm.getCursor('anchor');
-      var selectionEnd = cm.getCursor('head');
-      if (!cursorEqual(selectionStart, selectionEnd)) {
-        // Clear the selection and set the cursor only if the selection has not
-        // already been cleared. Otherwise we risk moving the cursor somewhere
-        // it's not supposed to be.
-        cm.setCursor(clipCursorToContent(cm, selectionEnd));
-      }
-      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-    }
-
-    // Remove any trailing newlines from the selection. For
-    // example, with the caret at the start of the last word on the line,
-    // 'dw' should word, but not the newline, while 'w' should advance the
-    // caret to the first character of the next line.
-    function clipToLine(cm, curStart, curEnd) {
-      var selection = cm.getRange(curStart, curEnd);
-      // Only clip if the selection ends with trailing newline + whitespace
-      if (/\n\s*$/.test(selection)) {
-        var lines = selection.split('\n');
-        // We know this is all whitepsace.
-        lines.pop();
-
-        // Cases:
-        // 1. Last word is an empty line - do not clip the trailing '\n'
-        // 2. Last word is not an empty line - clip the trailing '\n'
-        var line;
-        // Find the line containing the last word, and clip all whitespace up
-        // to it.
-        for (var line = lines.pop(); lines.length > 0 && line && isWhiteSpaceString(line); line = lines.pop()) {
-          curEnd.line--;
-          curEnd.ch = 0;
-        }
-        // If the last word is not an empty line, clip an additional newline
-        if (line) {
-          curEnd.line--;
-          curEnd.ch = lineLength(cm, curEnd.line);
-        } else {
-          curEnd.ch = 0;
-        }
-      }
-    }
-
-    // Expand the selection to line ends.
-    function expandSelectionToLine(_cm, curStart, curEnd) {
-      curStart.ch = 0;
-      curEnd.ch = 0;
-      curEnd.line++;
-    }
-
-    function findFirstNonWhiteSpaceCharacter(text) {
-      if (!text) {
-        return 0;
-      }
-      var firstNonWS = text.search(/\S/);
-      return firstNonWS == -1 ? text.length : firstNonWS;
-    }
-
-    function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) {
-      var cur = cm.getCursor();
-      var line = cm.getLine(cur.line);
-      var idx = cur.ch;
-
-      // Seek to first word or non-whitespace character, depending on if
-      // noSymbol is true.
-      var textAfterIdx = line.substring(idx);
-      var firstMatchedChar;
-      if (noSymbol) {
-        firstMatchedChar = textAfterIdx.search(/\w/);
-      } else {
-        firstMatchedChar = textAfterIdx.search(/\S/);
-      }
-      if (firstMatchedChar == -1) {
-        return null;
-      }
-      idx += firstMatchedChar;
-      textAfterIdx = line.substring(idx);
-      var textBeforeIdx = line.substring(0, idx);
-
-      var matchRegex;
-      // Greedy matchers for the "word" we are trying to expand.
-      if (bigWord) {
-        matchRegex = /^\S+/;
-      } else {
-        if ((/\w/).test(line.charAt(idx))) {
-          matchRegex = /^\w+/;
-        } else {
-          matchRegex = /^[^\w\s]+/;
-        }
-      }
-
-      var wordAfterRegex = matchRegex.exec(textAfterIdx);
-      var wordStart = idx;
-      var wordEnd = idx + wordAfterRegex[0].length;
-      // TODO: Find a better way to do this. It will be slow on very long lines.
-      var revTextBeforeIdx = reverse(textBeforeIdx);
-      var wordBeforeRegex = matchRegex.exec(revTextBeforeIdx);
-      if (wordBeforeRegex) {
-        wordStart -= wordBeforeRegex[0].length;
-      }
-
-      if (inclusive) {
-        // If present, trim all whitespace after word.
-        // Otherwise, trim all whitespace before word.
-        var textAfterWordEnd = line.substring(wordEnd);
-        var whitespacesAfterWord = textAfterWordEnd.match(/^\s*/)[0].length;
-        if (whitespacesAfterWord > 0) {
-          wordEnd += whitespacesAfterWord;
-        } else {
-          var revTrim = revTextBeforeIdx.length - wordStart;
-          var textBeforeWordStart = revTextBeforeIdx.substring(revTrim);
-          var whitespacesBeforeWord = textBeforeWordStart.match(/^\s*/)[0].length;
-          wordStart -= whitespacesBeforeWord;
-        }
-      }
-
-      return { start: { line: cur.line, ch: wordStart },
-        end: { line: cur.line, ch: wordEnd }};
-    }
-
-    function recordJumpPosition(cm, oldCur, newCur) {
-      if(!cursorEqual(oldCur, newCur)) {
-        vimGlobalState.jumpList.add(cm, oldCur, newCur);
-      }
-    }
-
-    function recordLastCharacterSearch(increment, args) {
-        vimGlobalState.lastChararacterSearch.increment = increment;
-        vimGlobalState.lastChararacterSearch.forward = args.forward;
-        vimGlobalState.lastChararacterSearch.selectedCharacter = args.selectedCharacter;
-    }
-
-    var symbolToMode = {
-        '(': 'bracket', ')': 'bracket', '{': 'bracket', '}': 'bracket',
-        '[': 'section', ']': 'section',
-        '*': 'comment', '/': 'comment',
-        'm': 'method', 'M': 'method',
-        '#': 'preprocess'
-    };
-    var findSymbolModes = {
-      bracket: {
-        isComplete: function(state) {
-          if (state.nextCh === state.symb) {
-            state.depth++;
-            if(state.depth >= 1)return true;
-          } else if (state.nextCh === state.reverseSymb) {
-            state.depth--;
-          }
-          return false;
-        }
-      },
-      section: {
-        init: function(state) {
-          state.curMoveThrough = true;
-          state.symb = (state.forward ? ']' : '[') === state.symb ? '{' : '}';
-        },
-        isComplete: function(state) {
-          return state.index === 0 && state.nextCh === state.symb;
-        }
-      },
-      comment: {
-        isComplete: function(state) {
-          var found = state.lastCh === '*' && state.nextCh === '/';
-          state.lastCh = state.nextCh;
-          return found;
-        }
-      },
-      // TODO: The original Vim implementation only operates on level 1 and 2.
-      // The current implementation doesn't check for code block level and
-      // therefore it operates on any levels.
-      method: {
-        init: function(state) {
-          state.symb = (state.symb === 'm' ? '{' : '}');
-          state.reverseSymb = state.symb === '{' ? '}' : '{';
-        },
-        isComplete: function(state) {
-          if(state.nextCh === state.symb)return true;
-          return false;
-        }
-      },
-      preprocess: {
-        init: function(state) {
-          state.index = 0;
-        },
-        isComplete: function(state) {
-          if (state.nextCh === '#') {
-            var token = state.lineText.match(/#(\w+)/)[1];
-            if (token === 'endif') {
-              if (state.forward && state.depth === 0) {
-                return true;
-              }
-              state.depth++;
-            } else if (token === 'if') {
-              if (!state.forward && state.depth === 0) {
-                return true;
-              }
-              state.depth--;
-            }
-            if(token === 'else' && state.depth === 0)return true;
-          }
-          return false;
-        }
-      }
-    };
-    function findSymbol(cm, repeat, forward, symb) {
-      var cur = cm.getCursor();
-      var increment = forward ? 1 : -1;
-      var endLine = forward ? cm.lineCount() : -1;
-      var curCh = cur.ch;
-      var line = cur.line;
-      var lineText = cm.getLine(line);
-      var state = {
-        lineText: lineText,
-        nextCh: lineText.charAt(curCh),
-        lastCh: null,
-        index: curCh,
-        symb: symb,
-        reverseSymb: (forward ?  { ')': '(', '}': '{' } : { '(': ')', '{': '}' })[symb],
-        forward: forward,
-        depth: 0,
-        curMoveThrough: false
-      };
-      var mode = symbolToMode[symb];
-      if(!mode)return cur;
-      var init = findSymbolModes[mode].init;
-      var isComplete = findSymbolModes[mode].isComplete;
-      if(init)init(state);
-      while (line !== endLine && repeat) {
-        state.index += increment;
-        state.nextCh = state.lineText.charAt(state.index);
-        if (!state.nextCh) {
-          line += increment;
-          state.lineText = cm.getLine(line) || '';
-          if (increment > 0) {
-            state.index = 0;
-          } else {
-            var lineLen = state.lineText.length;
-            state.index = (lineLen > 0) ? (lineLen-1) : 0;
-          }
-          state.nextCh = state.lineText.charAt(state.index);
-        }
-        if (isComplete(state)) {
-          cur.line = line;
-          cur.ch = state.index;
-          repeat--;
-        }
-      }
-      if (state.nextCh || state.curMoveThrough) {
-        return { line: line, ch: state.index };
-      }
-      return cur;
-    }
-
-    /*
-     * Returns the boundaries of the next word. If the cursor in the middle of
-     * the word, then returns the boundaries of the current word, starting at
-     * the cursor. If the cursor is at the start/end of a word, and we are going
-     * forward/backward, respectively, find the boundaries of the next word.
-     *
-     * @param {CodeMirror} cm CodeMirror object.
-     * @param {Cursor} cur The cursor position.
-     * @param {boolean} forward True to search forward. False to search
-     *     backward.
-     * @param {boolean} bigWord True if punctuation count as part of the word.
-     *     False if only [a-zA-Z0-9] characters count as part of the word.
-     * @param {boolean} emptyLineIsWord True if empty lines should be treated
-     *     as words.
-     * @return {Object{from:number, to:number, line: number}} The boundaries of
-     *     the word, or null if there are no more words.
-     */
-    function findWord(cm, cur, forward, bigWord, emptyLineIsWord) {
-      var lineNum = cur.line;
-      var pos = cur.ch;
-      var line = cm.getLine(lineNum);
-      var dir = forward ? 1 : -1;
-      var regexps = bigWord ? bigWordRegexp : wordRegexp;
-
-      if (emptyLineIsWord && line == '') {
-        lineNum += dir;
-        line = cm.getLine(lineNum);
-        if (!isLine(cm, lineNum)) {
-          return null;
-        }
-        pos = (forward) ? 0 : line.length;
-      }
-
-      while (true) {
-        if (emptyLineIsWord && line == '') {
-          return { from: 0, to: 0, line: lineNum };
-        }
-        var stop = (dir > 0) ? line.length : -1;
-        var wordStart = stop, wordEnd = stop;
-        // Find bounds of next word.
-        while (pos != stop) {
-          var foundWord = false;
-          for (var i = 0; i < regexps.length && !foundWord; ++i) {
-            if (regexps[i].test(line.charAt(pos))) {
-              wordStart = pos;
-              // Advance to end of word.
-              while (pos != stop && regexps[i].test(line.charAt(pos))) {
-                pos += dir;
-              }
-              wordEnd = pos;
-              foundWord = wordStart != wordEnd;
-              if (wordStart == cur.ch && lineNum == cur.line &&
-                  wordEnd == wordStart + dir) {
-                // We started at the end of a word. Find the next one.
-                continue;
-              } else {
-                return {
-                  from: Math.min(wordStart, wordEnd + 1),
-                  to: Math.max(wordStart, wordEnd),
-                  line: lineNum };
-              }
-            }
-          }
-          if (!foundWord) {
-            pos += dir;
-          }
-        }
-        // Advance to next/prev line.
-        lineNum += dir;
-        if (!isLine(cm, lineNum)) {
-          return null;
-        }
-        line = cm.getLine(lineNum);
-        pos = (dir > 0) ? 0 : line.length;
-      }
-      // Should never get here.
-      throw new Error('The impossible happened.');
-    }
-
-    /**
-     * @param {CodeMirror} cm CodeMirror object.
-     * @param {int} repeat Number of words to move past.
-     * @param {boolean} forward True to search forward. False to search
-     *     backward.
-     * @param {boolean} wordEnd True to move to end of word. False to move to
-     *     beginning of word.
-     * @param {boolean} bigWord True if punctuation count as part of the word.
-     *     False if only alphabet characters count as part of the word.
-     * @return {Cursor} The position the cursor should move to.
-     */
-    function moveToWord(cm, repeat, forward, wordEnd, bigWord) {
-      var cur = cm.getCursor();
-      var curStart = copyCursor(cur);
-      var words = [];
-      if (forward && !wordEnd || !forward && wordEnd) {
-        repeat++;
-      }
-      // For 'e', empty lines are not considered words, go figure.
-      var emptyLineIsWord = !(forward && wordEnd);
-      for (var i = 0; i < repeat; i++) {
-        var word = findWord(cm, cur, forward, bigWord, emptyLineIsWord);
-        if (!word) {
-          var eodCh = lineLength(cm, cm.lastLine());
-          words.push(forward
-              ? {line: cm.lastLine(), from: eodCh, to: eodCh}
-              : {line: 0, from: 0, to: 0});
-          break;
-        }
-        words.push(word);
-        cur = {line: word.line, ch: forward ? (word.to - 1) : word.from};
-      }
-      var shortCircuit = words.length != repeat;
-      var firstWord = words[0];
-      var lastWord = words.pop();
-      if (forward && !wordEnd) {
-        // w
-        if (!shortCircuit && (firstWord.from != curStart.ch || firstWord.line != curStart.line)) {
-          // We did not start in the middle of a word. Discard the extra word at the end.
-          lastWord = words.pop();
-        }
-        return {line: lastWord.line, ch: lastWord.from};
-      } else if (forward && wordEnd) {
-        return {line: lastWord.line, ch: lastWord.to - 1};
-      } else if (!forward && wordEnd) {
-        // ge
-        if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) {
-          // We did not start in the middle of a word. Discard the extra word at the end.
-          lastWord = words.pop();
-        }
-        return {line: lastWord.line, ch: lastWord.to};
-      } else {
-        // b
-        return {line: lastWord.line, ch: lastWord.from};
-      }
-    }
-
-    function moveToCharacter(cm, repeat, forward, character) {
-      var cur = cm.getCursor();
-      var start = cur.ch;
-      var idx;
-      for (var i = 0; i < repeat; i ++) {
-        var line = cm.getLine(cur.line);
-        idx = charIdxInLine(start, line, character, forward, true);
-        if (idx == -1) {
-          return null;
-        }
-        start = idx;
-      }
-      return { line: cm.getCursor().line, ch: idx };
-    }
-
-    function moveToColumn(cm, repeat) {
-      // repeat is always >= 1, so repeat - 1 always corresponds
-      // to the column we want to go to.
-      var line = cm.getCursor().line;
-      return clipCursorToContent(cm, { line: line, ch: repeat - 1 });
-    }
-
-    function updateMark(cm, vim, markName, pos) {
-      if (!inArray(markName, validMarks)) {
-        return;
-      }
-      if (vim.marks[markName]) {
-        vim.marks[markName].clear();
-      }
-      vim.marks[markName] = cm.setBookmark(pos);
-    }
-
-    function charIdxInLine(start, line, character, forward, includeChar) {
-      // Search for char in line.
-      // motion_options: {forward, includeChar}
-      // If includeChar = true, include it too.
-      // If forward = true, search forward, else search backwards.
-      // If char is not found on this line, do nothing
-      var idx;
-      if (forward) {
-        idx = line.indexOf(character, start + 1);
-        if (idx != -1 && !includeChar) {
-          idx -= 1;
-        }
-      } else {
-        idx = line.lastIndexOf(character, start - 1);
-        if (idx != -1 && !includeChar) {
-          idx += 1;
-        }
-      }
-      return idx;
-    }
-
-    function getContextLevel(ctx) {
-      return (ctx === 'string' || ctx === 'comment') ? 1 : 0;
-    }
-
-    function findMatchedSymbol(cm, cur, symb) {
-      var line = cur.line;
-      var ch = cur.ch;
-      symb = symb ? symb : cm.getLine(line).charAt(ch);
-
-      var symbContext = cm.getTokenAt({line:line, ch:ch+1}).type;
-      var symbCtxLevel = getContextLevel(symbContext);
-
-      var reverseSymb = ({
-        '(': ')', ')': '(',
-        '[': ']', ']': '[',
-        '{': '}', '}': '{'})[symb];
-
-      // Couldn't find a matching symbol, abort
-      if (!reverseSymb) {
-        return cur;
-      }
-
-      // set our increment to move forward (+1) or backwards (-1)
-      // depending on which bracket we're matching
-      var increment = ({'(': 1, '{': 1, '[': 1})[symb] || -1;
-      var endLine = increment === 1 ? cm.lineCount() : -1;
-      var depth = 1, nextCh = symb, index = ch, lineText = cm.getLine(line);
-      // Simple search for closing paren--just count openings and closings till
-      // we find our match
-      // TODO: use info from CodeMirror to ignore closing brackets in comments
-      // and quotes, etc.
-      while (line !== endLine && depth > 0) {
-        index += increment;
-        nextCh = lineText.charAt(index);
-        if (!nextCh) {
-          line += increment;
-          lineText = cm.getLine(line) || '';
-          if (increment > 0) {
-            index = 0;
-          } else {
-            var lineLen = lineText.length;
-            index = (lineLen > 0) ? (lineLen-1) : 0;
-          }
-          nextCh = lineText.charAt(index);
-        }
-        var revSymbContext = cm.getTokenAt({line:line, ch:index+1}).type;
-        var revSymbCtxLevel = getContextLevel(revSymbContext);
-        if (symbCtxLevel >= revSymbCtxLevel) {
-          if (nextCh === symb) {
-            depth++;
-          } else if (nextCh === reverseSymb) {
-            depth--;
-          }
-        }
-      }
-
-      if (nextCh) {
-        return { line: line, ch: index };
-      }
-      return cur;
-    }
-
-    function selectCompanionObject(cm, revSymb, inclusive) {
-      var cur = cm.getCursor();
-
-      var end = findMatchedSymbol(cm, cur, revSymb);
-      var start = findMatchedSymbol(cm, end);
-      start.ch += inclusive ? 1 : 0;
-      end.ch += inclusive ? 0 : 1;
-
-      return { start: start, end: end };
-    }
-
-    // Takes in a symbol and a cursor and tries to simulate text objects that
-    // have identical opening and closing symbols
-    // TODO support across multiple lines
-    function findBeginningAndEnd(cm, symb, inclusive) {
-      var cur = cm.getCursor();
-      var line = cm.getLine(cur.line);
-      var chars = line.split('');
-      var start, end, i, len;
-      var firstIndex = chars.indexOf(symb);
-
-      // the decision tree is to always look backwards for the beginning first,
-      // but if the cursor is in front of the first instance of the symb,
-      // then move the cursor forward
-      if (cur.ch < firstIndex) {
-        cur.ch = firstIndex;
-        // Why is this line even here???
-        // cm.setCursor(cur.line, firstIndex+1);
-      }
-      // otherwise if the cursor is currently on the closing symbol
-      else if (firstIndex < cur.ch && chars[cur.ch] == symb) {
-        end = cur.ch; // assign end to the current cursor
-        --cur.ch; // make sure to look backwards
-      }
-
-      // if we're currently on the symbol, we've got a start
-      if (chars[cur.ch] == symb && !end) {
-        start = cur.ch + 1; // assign start to ahead of the cursor
-      } else {
-        // go backwards to find the start
-        for (i = cur.ch; i > -1 && !start; i--) {
-          if (chars[i] == symb) {
-            start = i + 1;
-          }
-        }
-      }
-
-      // look forwards for the end symbol
-      if (start && !end) {
-        for (i = start, len = chars.length; i < len && !end; i++) {
-          if (chars[i] == symb) {
-            end = i;
-          }
-        }
-      }
-
-      // nothing found
-      if (!start || !end) {
-        return { start: cur, end: cur };
-      }
-
-      // include the symbols
-      if (inclusive) {
-        --start; ++end;
-      }
-
-      return {
-        start: { line: cur.line, ch: start },
-        end: { line: cur.line, ch: end }
-      };
-    }
-
-    // Search functions
-    function SearchState() {}
-    SearchState.prototype = {
-      getQuery: function() {
-        return vimGlobalState.query;
-      },
-      setQuery: function(query) {
-        vimGlobalState.query = query;
-      },
-      getOverlay: function() {
-        return this.searchOverlay;
-      },
-      setOverlay: function(overlay) {
-        this.searchOverlay = overlay;
-      },
-      isReversed: function() {
-        return vimGlobalState.isReversed;
-      },
-      setReversed: function(reversed) {
-        vimGlobalState.isReversed = reversed;
-      }
-    };
-    function getSearchState(cm) {
-      var vim = cm.state.vim;
-      return vim.searchState_ || (vim.searchState_ = new SearchState());
-    }
-    function dialog(cm, template, shortText, onClose, options) {
-      if (cm.openDialog) {
-        cm.openDialog(template, onClose, { bottom: true, value: options.value,
-            onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp });
-      }
-      else {
-        onClose(prompt(shortText, ''));
-      }
-    }
-
-    function findUnescapedSlashes(str) {
-      var escapeNextChar = false;
-      var slashes = [];
-      for (var i = 0; i < str.length; i++) {
-        var c = str.charAt(i);
-        if (!escapeNextChar && c == '/') {
-          slashes.push(i);
-        }
-        escapeNextChar = (c == '\\');
-      }
-      return slashes;
-    }
-    /**
-     * Extract the regular expression from the query and return a Regexp object.
-     * Returns null if the query is blank.
-     * If ignoreCase is passed in, the Regexp object will have the 'i' flag set.
-     * If smartCase is passed in, and the query contains upper case letters,
-     *   then ignoreCase is overridden, and the 'i' flag will not be set.
-     * If the query contains the /i in the flag part of the regular expression,
-     *   then both ignoreCase and smartCase are ignored, and 'i' will be passed
-     *   through to the Regex object.
-     */
-    function parseQuery(query, ignoreCase, smartCase) {
-      // Check if the query is already a regex.
-      if (query instanceof RegExp) { return query; }
-      // First try to extract regex + flags from the input. If no flags found,
-      // extract just the regex. IE does not accept flags directly defined in
-      // the regex string in the form /regex/flags
-      var slashes = findUnescapedSlashes(query);
-      var regexPart;
-      var forceIgnoreCase;
-      if (!slashes.length) {
-        // Query looks like 'regexp'
-        regexPart = query;
-      } else {
-        // Query looks like 'regexp/...'
-        regexPart = query.substring(0, slashes[0]);
-        var flagsPart = query.substring(slashes[0]);
-        forceIgnoreCase = (flagsPart.indexOf('i') != -1);
-      }
-      if (!regexPart) {
-        return null;
-      }
-      if (smartCase) {
-        ignoreCase = (/^[^A-Z]*$/).test(regexPart);
-      }
-      var regexp = new RegExp(regexPart,
-          (ignoreCase || forceIgnoreCase) ? 'i' : undefined);
-      return regexp;
-    }
-    function showConfirm(cm, text) {
-      if (cm.openNotification) {
-        cm.openNotification('<span style="color: red">' + text + '</span>',
-                            {bottom: true, duration: 5000});
-      } else {
-        alert(text);
-      }
-    }
-    function makePrompt(prefix, desc) {
-      var raw = '';
-      if (prefix) {
-        raw += '<span style="font-family: monospace">' + prefix + '</span>';
-      }
-      raw += '<input type="text"/> ' +
-          '<span style="color: #888">';
-      if (desc) {
-        raw += '<span style="color: #888">';
-        raw += desc;
-        raw += '</span>';
-      }
-      return raw;
-    }
-    var searchPromptDesc = '(Javascript regexp)';
-    function showPrompt(cm, options) {
-      var shortText = (options.prefix || '') + ' ' + (options.desc || '');
-      var prompt = makePrompt(options.prefix, options.desc);
-      dialog(cm, prompt, shortText, options.onClose, options);
-    }
-    function regexEqual(r1, r2) {
-      if (r1 instanceof RegExp && r2 instanceof RegExp) {
-          var props = ['global', 'multiline', 'ignoreCase', 'source'];
-          for (var i = 0; i < props.length; i++) {
-              var prop = props[i];
-              if (r1[prop] !== r2[prop]) {
-                  return false;
-              }
-          }
-          return true;
-      }
-      return false;
-    }
-    // Returns true if the query is valid.
-    function updateSearchQuery(cm, rawQuery, ignoreCase, smartCase) {
-      if (!rawQuery) {
-        return;
-      }
-      var state = getSearchState(cm);
-      var query = parseQuery(rawQuery, !!ignoreCase, !!smartCase);
-      if (!query) {
-        return;
-      }
-      highlightSearchMatches(cm, query);
-      if (regexEqual(query, state.getQuery())) {
-        return query;
-      }
-      state.setQuery(query);
-      return query;
-    }
-    function searchOverlay(query) {
-      if (query.source.charAt(0) == '^') {
-        var matchSol = true;
-      }
-      return {
-        token: function(stream) {
-          if (matchSol && !stream.sol()) {
-            stream.skipToEnd();
-            return;
-          }
-          var match = stream.match(query, false);
-          if (match) {
-            if (match[0].length == 0) {
-              // Matched empty string, skip to next.
-              stream.next();
-              return 'searching';
-            }
-            if (!stream.sol()) {
-              // Backtrack 1 to match \b
-              stream.backUp(1);
-              if (!query.exec(stream.next() + match[0])) {
-                stream.next();
-                return null;
-              }
-            }
-            stream.match(query);
-            return 'searching';
-          }
-          while (!stream.eol()) {
-            stream.next();
-            if (stream.match(query, false)) break;
-          }
-        },
-        query: query
-      };
-    }
-    function highlightSearchMatches(cm, query) {
-      var overlay = getSearchState(cm).getOverlay();
-      if (!overlay || query != overlay.query) {
-        if (overlay) {
-          cm.removeOverlay(overlay);
-        }
-        overlay = searchOverlay(query);
-        cm.addOverlay(overlay);
-        getSearchState(cm).setOverlay(overlay);
-      }
-    }
-    function findNext(cm, prev, query, repeat) {
-      if (repeat === undefined) { repeat = 1; }
-      return cm.operation(function() {
-        var pos = cm.getCursor();
-        var cursor = cm.getSearchCursor(query, pos);
-        for (var i = 0; i < repeat; i++) {
-          var found = cursor.find(prev);
-          if (i == 0 && found && cursorEqual(cursor.from(), pos)) { found = cursor.find(prev); }
-          if (!found) {
-            // SearchCursor may have returned null because it hit EOF, wrap
-            // around and try again.
-            cursor = cm.getSearchCursor(query,
-                (prev) ? { line: cm.lastLine() } : {line: cm.firstLine(), ch: 0} );
-            if (!cursor.find(prev)) {
-              return;
-            }
-          }
-        }
-        return cursor.from();
-      });
-    }
-    function clearSearchHighlight(cm) {
-      cm.removeOverlay(getSearchState(cm).getOverlay());
-      getSearchState(cm).setOverlay(null);
-    }
-    /**
-     * Check if pos is in the specified range, INCLUSIVE.
-     * Range can be specified with 1 or 2 arguments.
-     * If the first range argument is an array, treat it as an array of line
-     * numbers. Match pos against any of the lines.
-     * If the first range argument is a number,
-     *   if there is only 1 range argument, check if pos has the same line
-     *       number
-     *   if there are 2 range arguments, then check if pos is in between the two
-     *       range arguments.
-     */
-    function isInRange(pos, start, end) {
-      if (typeof pos != 'number') {
-        // Assume it is a cursor position. Get the line number.
-        pos = pos.line;
-      }
-      if (start instanceof Array) {
-        return inArray(pos, start);
-      } else {
-        if (end) {
-          return (pos >= start && pos <= end);
-        } else {
-          return pos == start;
-        }
-      }
-    }
-    function getUserVisibleLines(cm) {
-      var scrollInfo = cm.getScrollInfo();
-      var occludeToleranceTop = 6;
-      var occludeToleranceBottom = 10;
-      var from = cm.coordsChar({left:0, top: occludeToleranceTop + scrollInfo.top}, 'local');
-      var bottomY = scrollInfo.clientHeight - occludeToleranceBottom + scrollInfo.top;
-      var to = cm.coordsChar({left:0, top: bottomY}, 'local');
-      return {top: from.line, bottom: to.line};
-    }
-
-    // Ex command handling
-    // Care must be taken when adding to the default Ex command map. For any
-    // pair of commands that have a shared prefix, at least one of their
-    // shortNames must not match the prefix of the other command.
-    var defaultExCommandMap = [
-      { name: 'map', type: 'builtIn' },
-      { name: 'write', shortName: 'w', type: 'builtIn' },
-      { name: 'undo', shortName: 'u', type: 'builtIn' },
-      { name: 'redo', shortName: 'red', type: 'builtIn' },
-      { name: 'sort', shortName: 'sor', type: 'builtIn'},
-      { name: 'substitute', shortName: 's', type: 'builtIn'},
-      { name: 'nohlsearch', shortName: 'noh', type: 'builtIn'},
-      { name: 'delmarks', shortName: 'delm', type: 'builtin'}
-    ];
-    Vim.ExCommandDispatcher = function() {
-      this.buildCommandMap_();
-    };
-    Vim.ExCommandDispatcher.prototype = {
-      processCommand: function(cm, input) {
-        var vim = cm.state.vim;
-        if (vim.visualMode) {
-          exitVisualMode(cm);
-        }
-        var inputStream = new CodeMirror.StringStream(input);
-        var params = {};
-        params.input = input;
-        try {
-          this.parseInput_(cm, inputStream, params);
-        } catch(e) {
-          showConfirm(cm, e);
-          return;
-        }
-        var commandName;
-        if (!params.commandName) {
-          // If only a line range is defined, move to the line.
-          if (params.line !== undefined) {
-            commandName = 'move';
-          }
-        } else {
-          var command = this.matchCommand_(params.commandName);
-          if (command) {
-            commandName = command.name;
-            this.parseCommandArgs_(inputStream, params, command);
-            if (command.type == 'exToKey') {
-              // Handle Ex to Key mapping.
-              for (var i = 0; i < command.toKeys.length; i++) {
-                CodeMirror.Vim.handleKey(cm, command.toKeys[i]);
-              }
-              return;
-            } else if (command.type == 'exToEx') {
-              // Handle Ex to Ex mapping.
-              this.processCommand(cm, command.toInput);
-              return;
-            }
-          }
-        }
-        if (!commandName) {
-          showConfirm(cm, 'Not an editor command ":' + input + '"');
-          return;
-        }
-        try {
-          exCommands[commandName](cm, params);
-        } catch(e) {
-          showConfirm(cm, e);
-        }
-      },
-      parseInput_: function(cm, inputStream, result) {
-        inputStream.eatWhile(':');
-        // Parse range.
-        if (inputStream.eat('%')) {
-          result.line = cm.firstLine();
-          result.lineEnd = cm.lastLine();
-        } else {
-          result.line = this.parseLineSpec_(cm, inputStream);
-          if (result.line !== undefined && inputStream.eat(',')) {
-            result.lineEnd = this.parseLineSpec_(cm, inputStream);
-          }
-        }
-
-        // Parse command name.
-        var commandMatch = inputStream.match(/^(\w+)/);
-        if (commandMatch) {
-          result.commandName = commandMatch[1];
-        } else {
-          result.commandName = inputStream.match(/.*/)[0];
-        }
-
-        return result;
-      },
-      parseLineSpec_: function(cm, inputStream) {
-        var numberMatch = inputStream.match(/^(\d+)/);
-        if (numberMatch) {
-          return parseInt(numberMatch[1], 10) - 1;
-        }
-        switch (inputStream.next()) {
-          case '.':
-            return cm.getCursor().line;
-          case '$':
-            return cm.lastLine();
-          case '\'':
-            var mark = cm.state.vim.marks[inputStream.next()];
-            if (mark && mark.find()) {
-              return mark.find().line;
-            }
-            throw new Error('Mark not set');
-          default:
-            inputStream.backUp(1);
-            return undefined;
-        }
-      },
-      parseCommandArgs_: function(inputStream, params, command) {
-        if (inputStream.eol()) {
-          return;
-        }
-        params.argString = inputStream.match(/.*/)[0];
-        // Parse command-line arguments
-        var delim = command.argDelimiter || /\s+/;
-        var args = trim(params.argString).split(delim);
-        if (args.length && args[0]) {
-          params.args = args;
-        }
-      },
-      matchCommand_: function(commandName) {
-        // Return the command in the command map that matches the shortest
-        // prefix of the passed in command name. The match is guaranteed to be
-        // unambiguous if the defaultExCommandMap's shortNames are set up
-        // correctly. (see @code{defaultExCommandMap}).
-        for (var i = commandName.length; i > 0; i--) {
-          var prefix = commandName.substring(0, i);
-          if (this.commandMap_[prefix]) {
-            var command = this.commandMap_[prefix];
-            if (command.name.indexOf(commandName) === 0) {
-              return command;
-            }
-          }
-        }
-        return null;
-      },
-      buildCommandMap_: function() {
-        this.commandMap_ = {};
-        for (var i = 0; i < defaultExCommandMap.length; i++) {
-          var command = defaultExCommandMap[i];
-          var key = command.shortName || command.name;
-          this.commandMap_[key] = command;
-        }
-      },
-      map: function(lhs, rhs) {
-        if (lhs != ':' && lhs.charAt(0) == ':') {
-          var commandName = lhs.substring(1);
-          if (rhs != ':' && rhs.charAt(0) == ':') {
-            // Ex to Ex mapping
-            this.commandMap_[commandName] = {
-              name: commandName,
-              type: 'exToEx',
-              toInput: rhs.substring(1)
-            };
-          } else {
-            // Ex to key mapping
-            this.commandMap_[commandName] = {
-              name: commandName,
-              type: 'exToKey',
-              toKeys: parseKeyString(rhs)
-            };
-          }
-        } else {
-          if (rhs != ':' && rhs.charAt(0) == ':') {
-            // Key to Ex mapping.
-            defaultKeymap.unshift({
-              keys: parseKeyString(lhs),
-              type: 'keyToEx',
-              exArgs: { input: rhs.substring(1) }});
-          } else {
-            // Key to key mapping
-            defaultKeymap.unshift({
-              keys: parseKeyString(lhs),
-              type: 'keyToKey',
-              toKeys: parseKeyString(rhs)
-            });
-          }
-        }
-      }
-    };
-
-    // Converts a key string sequence of the form a<C-w>bd<Left> into Vim's
-    // keymap representation.
-    function parseKeyString(str) {
-      var key, match;
-      var keys = [];
-      while (str) {
-        match = (/<\w+-.+?>|<\w+>|./).exec(str);
-        if(match === null)break;
-        key = match[0];
-        str = str.substring(match.index + key.length);
-        keys.push(key);
-      }
-      return keys;
-    }
-
-    var exCommands = {
-      map: function(cm, params) {
-        var mapArgs = params.args;
-        if (!mapArgs || mapArgs.length < 2) {
-          if (cm) {
-            showConfirm(cm, 'Invalid mapping: ' + params.input);
-          }
-          return;
-        }
-        exCommandDispatcher.map(mapArgs[0], mapArgs[1], cm);
-      },
-      move: function(cm, params) {
-        commandDispatcher.processCommand(cm, cm.state.vim, {
-            type: 'motion',
-            motion: 'moveToLineOrEdgeOfDocument',
-            motionArgs: { forward: false, explicitRepeat: true,
-              linewise: true },
-            repeatOverride: params.line+1});
-      },
-      sort: function(cm, params) {
-        var reverse, ignoreCase, unique, number;
-        function parseArgs() {
-          if (params.argString) {
-            var args = new CodeMirror.StringStream(params.argString);
-            if (args.eat('!')) { reverse = true; }
-            if (args.eol()) { return; }
-            if (!args.eatSpace()) { throw new Error('invalid arguments ' + args.match(/.*/)[0]); }
-            var opts = args.match(/[a-z]+/);
-            if (opts) {
-              opts = opts[0];
-              ignoreCase = opts.indexOf('i') != -1;
-              unique = opts.indexOf('u') != -1;
-              var decimal = opts.indexOf('d') != -1 && 1;
-              var hex = opts.indexOf('x') != -1 && 1;
-              var octal = opts.indexOf('o') != -1 && 1;
-              if (decimal + hex + octal > 1) { throw new Error('invalid arguments'); }
-              number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
-            }
-            if (args.eatSpace() && args.match(/\/.*\//)) { throw new Error('patterns not supported'); }
-          }
-        }
-        parseArgs();
-        var lineStart = params.line || cm.firstLine();
-        var lineEnd = params.lineEnd || params.line || cm.lastLine();
-        if (lineStart == lineEnd) { return; }
-        var curStart = { line: lineStart, ch: 0 };
-        var curEnd = { line: lineEnd, ch: lineLength(cm, lineEnd) };
-        var text = cm.getRange(curStart, curEnd).split('\n');
-        var numberRegex = (number == 'decimal') ? /(-?)([\d]+)/ :
-           (number == 'hex') ? /(-?)(?:0x)?([0-9a-f]+)/i :
-           (number == 'octal') ? /([0-7]+)/ : null;
-        var radix = (number == 'decimal') ? 10 : (number == 'hex') ? 16 : (number == 'octal') ? 8 : null;
-        var numPart = [], textPart = [];
-        if (number) {
-          for (var i = 0; i < text.length; i++) {
-            if (numberRegex.exec(text[i])) {
-              numPart.push(text[i]);
-            } else {
-              textPart.push(text[i]);
-            }
-          }
-        } else {
-          textPart = text;
-        }
-        function compareFn(a, b) {
-          if (reverse) { var tmp; tmp = a; a = b; b = tmp; }
-          if (ignoreCase) { a = a.toLowerCase(); b = b.toLowerCase(); }
-          var anum = number && numberRegex.exec(a);
-          var bnum = number && numberRegex.exec(b);
-          if (!anum) { return a < b ? -1 : 1; }
-          anum = parseInt((anum[1] + anum[2]).toLowerCase(), radix);
-          bnum = parseInt((bnum[1] + bnum[2]).toLowerCase(), radix);
-          return anum - bnum;
-        }
-        numPart.sort(compareFn);
-        textPart.sort(compareFn);
-        text = (!reverse) ? textPart.concat(numPart) : numPart.concat(textPart);
-        if (unique) { // Remove duplicate lines
-          var textOld = text;
-          var lastLine;
-          text = [];
-          for (var i = 0; i < textOld.length; i++) {
-            if (textOld[i] != lastLine) {
-              text.push(textOld[i]);
-            }
-            lastLine = textOld[i];
-          }
-        }
-        cm.replaceRange(text.join('\n'), curStart, curEnd);
-      },
-      substitute: function(cm, params) {
-        if (!cm.getSearchCursor) {
-          throw new Error('Search feature not available. Requires searchcursor.js or ' +
-              'any other getSearchCursor implementation.');
-        }
-        var argString = params.argString;
-        var slashes = findUnescapedSlashes(argString);
-        if (slashes[0] !== 0) {
-          showConfirm(cm, 'Substitutions should be of the form ' +
-              ':s/pattern/replace/');
-          return;
-        }
-        var regexPart = argString.substring(slashes[0] + 1, slashes[1]);
-        var replacePart = '';
-        var flagsPart;
-        var count;
-        var confirm = false; // Whether to confirm each replace.
-        if (slashes[1]) {
-          replacePart = argString.substring(slashes[1] + 1, slashes[2]);
-        }
-        if (slashes[2]) {
-          // After the 3rd slash, we can have flags followed by a space followed
-          // by count.
-          var trailing = argString.substring(slashes[2] + 1).split(' ');
-          flagsPart = trailing[0];
-          count = parseInt(trailing[1]);
-        }
-        if (flagsPart) {
-          if (flagsPart.indexOf('c') != -1) {
-            confirm = true;
-            flagsPart.replace('c', '');
-          }
-          regexPart = regexPart + '/' + flagsPart;
-        }
-        if (regexPart) {
-          // If regex part is empty, then use the previous query. Otherwise use
-          // the regex part as the new query.
-          try {
-            updateSearchQuery(cm, regexPart, true /** ignoreCase */,
-              true /** smartCase */);
-          } catch (e) {
-            showConfirm(cm, 'Invalid regex: ' + regexPart);
-            return;
-          }
-        }
-        var state = getSearchState(cm);
-        var query = state.getQuery();
-        var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
-        var lineEnd = params.lineEnd || lineStart;
-        if (count) {
-          lineStart = lineEnd;
-          lineEnd = lineStart + count - 1;
-        }
-        var startPos = clipCursorToContent(cm, { line: lineStart, ch: 0 });
-        var cursor = cm.getSearchCursor(query, startPos);
-        doReplace(cm, confirm, lineStart, lineEnd, cursor, query, replacePart);
-      },
-      redo: CodeMirror.commands.redo,
-      undo: CodeMirror.commands.undo,
-      write: function(cm) {
-        if (CodeMirror.commands.save) {
-          // If a save command is defined, call it.
-          CodeMirror.commands.save(cm);
-        } else {
-          // Saves to text area if no save command is defined.
-          cm.save();
-        }
-      },
-      nohlsearch: function(cm) {
-        clearSearchHighlight(cm);
-      },
-      delmarks: function(cm, params) {
-        if (!params.argString || !params.argString.trim()) {
-          showConfirm(cm, 'Argument required');
-          return;
-        }
-
-        var state = cm.state.vim;
-        var stream = new CodeMirror.StringStream(params.argString.trim());
-        while (!stream.eol()) {
-          stream.eatSpace();
-
-          // Record the streams position at the beginning of the loop for use
-          // in error messages.
-          var count = stream.pos;
-
-          if (!stream.match(/[a-zA-Z]/, false)) {
-            showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
-            return;
-          }
-
-          var sym = stream.next();
-          // Check if this symbol is part of a range
-          if (stream.match('-', true)) {
-            // This symbol is part of a range.
-
-            // The range must terminate at an alphabetic character.
-            if (!stream.match(/[a-zA-Z]/, false)) {
-              showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
-              return;
-            }
-
-            var startMark = sym;
-            var finishMark = stream.next();
-            // The range must terminate at an alphabetic character which
-            // shares the same case as the start of the range.
-            if (isLowerCase(startMark) && isLowerCase(finishMark) ||
-                isUpperCase(startMark) && isUpperCase(finishMark)) {
-              var start = startMark.charCodeAt(0);
-              var finish = finishMark.charCodeAt(0);
-              if (start >= finish) {
-                showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
-                return;
-              }
-
-              // Because marks are always ASCII values, and we have
-              // determined that they are the same case, we can use
-              // their char codes to iterate through the defined range.
-              for (var j = 0; j <= finish - start; j++) {
-                var mark = String.fromCharCode(start + j);
-                delete state.marks[mark];
-              }
-            } else {
-              showConfirm(cm, 'Invalid argument: ' + startMark + '-');
-              return;
-            }
-          } else {
-            // This symbol is a valid mark, and is not part of a range.
-            delete state.marks[sym];
-          }
-        }
-      }
-    };
-
-    var exCommandDispatcher = new Vim.ExCommandDispatcher();
-
-    /**
-    * @param {CodeMirror} cm CodeMirror instance we are in.
-    * @param {boolean} confirm Whether to confirm each replace.
-    * @param {Cursor} lineStart Line to start replacing from.
-    * @param {Cursor} lineEnd Line to stop replacing at.
-    * @param {RegExp} query Query for performing matches with.
-    * @param {string} replaceWith Text to replace matches with. May contain $1,
-    *     $2, etc for replacing captured groups using Javascript replace.
-    */
-    function doReplace(cm, confirm, lineStart, lineEnd, searchCursor, query,
-        replaceWith) {
-      // Set up all the functions.
-      cm.state.vim.exMode = true;
-      var done = false;
-      var lastPos = searchCursor.from();
-      function replaceAll() {
-        cm.operation(function() {
-          while (!done) {
-            replace();
-            next();
-          }
-          stop();
-        });
-      }
-      function replace() {
-        var text = cm.getRange(searchCursor.from(), searchCursor.to());
-        var newText = text.replace(query, replaceWith);
-        searchCursor.replace(newText);
-      }
-      function next() {
-        var found = searchCursor.findNext();
-        if (!found) {
-          done = true;
-        } else if (isInRange(searchCursor.from(), lineStart, lineEnd)) {
-          cm.scrollIntoView(searchCursor.from(), 30);
-          cm.setSelection(searchCursor.from(), searchCursor.to());
-          lastPos = searchCursor.from();
-          done = false;
-        } else {
-          done = true;
-        }
-      }
-      function stop(close) {
-        if (close) { close(); }
-        cm.focus();
-        if (lastPos) {
-          cm.setCursor(lastPos);
-          var vim = cm.state.vim;
-          vim.exMode = false;
-          vim.lastHPos = vim.lastHSPos = lastPos.ch;
-        }
-      }
-      function onPromptKeyDown(e, _value, close) {
-        // Swallow all keys.
-        CodeMirror.e_stop(e);
-        var keyName = CodeMirror.keyName(e);
-        switch (keyName) {
-          case 'Y':
-            replace(); next(); break;
-          case 'N':
-            next(); break;
-          case 'A':
-            cm.operation(replaceAll); break;
-          case 'L':
-            replace();
-            // fall through and exit.
-          case 'Q':
-          case 'Esc':
-          case 'Ctrl-C':
-          case 'Ctrl-[':
-            stop(close);
-            break;
-        }
-        if (done) { stop(close); }
-      }
-
-      // Actually do replace.
-      next();
-      if (done) {
-        throw new Error('No matches for ' + query.source);
-      }
-      if (!confirm) {
-        replaceAll();
-        return;
-      }
-      showPrompt(cm, {
-        prefix: 'replace with <strong>' + replaceWith + '</strong> (y/n/a/q/l)',
-        onKeyDown: onPromptKeyDown
-      });
-    }
-
-    // Register Vim with CodeMirror
-    function buildVimKeyMap() {
-      /**
-       * Handle the raw key event from CodeMirror. Translate the
-       * Shift + key modifier to the resulting letter, while preserving other
-       * modifers.
-       */
-      // TODO: Figure out a way to catch capslock.
-      function cmKeyToVimKey(key, modifier) {
-        var vimKey = key;
-        if (isUpperCase(vimKey)) {
-          // Convert to lower case if shift is not the modifier since the key
-          // we get from CodeMirror is always upper case.
-          if (modifier == 'Shift') {
-            modifier = null;
-          }
-          else {
-            vimKey = vimKey.toLowerCase();
-          }
-        }
-        if (modifier) {
-          // Vim will parse modifier+key combination as a single key.
-          vimKey = modifier.charAt(0) + '-' + vimKey;
-        }
-        var specialKey = ({Enter:'CR',Backspace:'BS',Delete:'Del'})[vimKey];
-        vimKey = specialKey ? specialKey : vimKey;
-        vimKey = vimKey.length > 1 ? '<'+ vimKey + '>' : vimKey;
-        return vimKey;
-      }
-
-      // Closure to bind CodeMirror, key, modifier.
-      function keyMapper(vimKey) {
-        return function(cm) {
-          CodeMirror.Vim.handleKey(cm, vimKey);
-        };
-      }
-
-      var cmToVimKeymap = {
-        'nofallthrough': true,
-        'disableInput': true,
-        'style': 'fat-cursor'
-      };
-      function bindKeys(keys, modifier) {
-        for (var i = 0; i < keys.length; i++) {
-          var key = keys[i];
-          if (!modifier && inArray(key, specialSymbols)) {
-            // Wrap special symbols with '' because that's how CodeMirror binds
-            // them.
-            key = "'" + key + "'";
-          }
-          var vimKey = cmKeyToVimKey(keys[i], modifier);
-          var cmKey = modifier ? modifier + '-' + key : key;
-          cmToVimKeymap[cmKey] = keyMapper(vimKey);
-        }
-      }
-      bindKeys(upperCaseAlphabet);
-      bindKeys(upperCaseAlphabet, 'Shift');
-      bindKeys(upperCaseAlphabet, 'Ctrl');
-      bindKeys(specialSymbols);
-      bindKeys(specialSymbols, 'Ctrl');
-      bindKeys(numbers);
-      bindKeys(numbers, 'Ctrl');
-      bindKeys(specialKeys);
-      bindKeys(specialKeys, 'Ctrl');
-      return cmToVimKeymap;
-    }
-    CodeMirror.keyMap.vim = buildVimKeyMap();
-
-    function exitInsertMode(cm) {
-      var vim = cm.state.vim;
-      var inReplay = vimGlobalState.macroModeState.inReplay;
-      if (!inReplay) {
-        cm.off('change', onChange);
-        cm.off('cursorActivity', onCursorActivity);
-        CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
-      }
-      if (!inReplay && vim.insertModeRepeat > 1) {
-        // Perform insert mode repeat for commands like 3,a and 3,o.
-        repeatLastEdit(cm, vim, vim.insertModeRepeat - 1,
-            true /** repeatForInsert */);
-        vim.lastEditInputState.repeatOverride = vim.insertModeRepeat;
-      }
-      delete vim.insertModeRepeat;
-      cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1, true);
-      vim.insertMode = false;
-      cm.setOption('keyMap', 'vim');
-      cm.toggleOverwrite(false); // exit replace mode if we were in it.
-      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-    }
-
-    CodeMirror.keyMap['vim-insert'] = {
-      // TODO: override navigation keys so that Esc will cancel automatic
-      // indentation from o, O, i_<CR>
-      'Esc': exitInsertMode,
-      'Ctrl-[': exitInsertMode,
-      'Ctrl-C': exitInsertMode,
-      'Ctrl-N': 'autocomplete',
-      'Ctrl-P': 'autocomplete',
-      'Enter': function(cm) {
-        var fn = CodeMirror.commands.newlineAndIndentContinueComment ||
-            CodeMirror.commands.newlineAndIndent;
-        fn(cm);
-      },
-      fallthrough: ['default']
-    };
-
-    CodeMirror.keyMap['vim-replace'] = {
-      'Backspace': 'goCharLeft',
-      fallthrough: ['vim-insert']
-    };
-
-    function parseRegisterToKeyBuffer(macroModeState, registerName) {
-      var match, key;
-      var register = vimGlobalState.registerController.getRegister(registerName);
-      var text = register.toString();
-      var macroKeyBuffer = macroModeState.macroKeyBuffer;
-      emptyMacroKeyBuffer(macroModeState);
-      do {
-        match = (/<\w+-.+?>|<\w+>|./).exec(text);
-        if(match === null)break;
-        key = match[0];
-        text = text.substring(match.index + key.length);
-        macroKeyBuffer.push(key);
-      } while (text);
-      return macroKeyBuffer;
-    }
-
-    function parseKeyBufferToRegister(registerName, keyBuffer) {
-      var text = keyBuffer.join('');
-      vimGlobalState.registerController.setRegisterText(registerName, text);
-    }
-
-    function emptyMacroKeyBuffer(macroModeState) {
-      if(macroModeState.isMacroPlaying)return;
-      var macroKeyBuffer = macroModeState.macroKeyBuffer;
-      macroKeyBuffer.length = 0;
-    }
-
-    function executeMacroKeyBuffer(cm, macroModeState, keyBuffer) {
-      macroModeState.isMacroPlaying = true;
-      for (var i = 0, len = keyBuffer.length; i < len; i++) {
-        CodeMirror.Vim.handleKey(cm, keyBuffer[i]);
-      };
-      macroModeState.isMacroPlaying = false;
-    }
-
-    function logKey(macroModeState, key) {
-      if(macroModeState.isMacroPlaying)return;
-      var macroKeyBuffer = macroModeState.macroKeyBuffer;
-      macroKeyBuffer.push(key);
-    }
-
-    /**
-     * Listens for changes made in insert mode.
-     * Should only be active in insert mode.
-     */
-    function onChange(_cm, changeObj) {
-      var macroModeState = vimGlobalState.macroModeState;
-      var lastChange = macroModeState.lastInsertModeChanges;
-      while (changeObj) {
-        lastChange.expectCursorActivityForChange = true;
-        if (changeObj.origin == '+input' || changeObj.origin == 'paste'
-            || changeObj.origin === undefined /* only in testing */) {
-          var text = changeObj.text.join('\n');
-          lastChange.changes.push(text);
-        }
-        // Change objects may be chained with next.
-        changeObj = changeObj.next;
-      }
-    }
-
-    /**
-    * Listens for any kind of cursor activity on CodeMirror.
-    * - For tracking cursor activity in insert mode.
-    * - Should only be active in insert mode.
-    */
-    function onCursorActivity() {
-      var macroModeState = vimGlobalState.macroModeState;
-      var lastChange = macroModeState.lastInsertModeChanges;
-      if (lastChange.expectCursorActivityForChange) {
-        lastChange.expectCursorActivityForChange = false;
-      } else {
-        // Cursor moved outside the context of an edit. Reset the change.
-        lastChange.changes = [];
-      }
-    }
-
-    /** Wrapper for special keys pressed in insert mode */
-    function InsertModeKey(keyName) {
-      this.keyName = keyName;
-    }
-
-    /**
-    * Handles raw key down events from the text area.
-    * - Should only be active in insert mode.
-    * - For recording deletes in insert mode.
-    */
-    function onKeyEventTargetKeyDown(e) {
-      var macroModeState = vimGlobalState.macroModeState;
-      var lastChange = macroModeState.lastInsertModeChanges;
-      var keyName = CodeMirror.keyName(e);
-      function onKeyFound() {
-        lastChange.changes.push(new InsertModeKey(keyName));
-        return true;
-      }
-      if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
-        CodeMirror.lookupKey(keyName, ['vim-insert'], onKeyFound);
-      }
-    }
-
-    /**
-     * Repeats the last edit, which includes exactly 1 command and at most 1
-     * insert. Operator and motion commands are read from lastEditInputState,
-     * while action commands are read from lastEditActionCommand.
-     *
-     * If repeatForInsert is true, then the function was called by
-     * exitInsertMode to repeat the insert mode changes the user just made. The
-     * corresponding enterInsertMode call was made with a count.
-     */
-    function repeatLastEdit(cm, vim, repeat, repeatForInsert) {
-      var macroModeState = vimGlobalState.macroModeState;
-      macroModeState.inReplay = true;
-      var isAction = !!vim.lastEditActionCommand;
-      var cachedInputState = vim.inputState;
-      function repeatCommand() {
-        if (isAction) {
-          commandDispatcher.processAction(cm, vim, vim.lastEditActionCommand);
-        } else {
-          commandDispatcher.evalInput(cm, vim);
-        }
-      }
-      function repeatInsert(repeat) {
-        if (macroModeState.lastInsertModeChanges.changes.length > 0) {
-          // For some reason, repeat cw in desktop VIM will does not repeat
-          // insert mode changes. Will conform to that behavior.
-          repeat = !vim.lastEditActionCommand ? 1 : repeat;
-          repeatLastInsertModeChanges(cm, repeat, macroModeState);
-        }
-      }
-      vim.inputState = vim.lastEditInputState;
-      if (isAction && vim.lastEditActionCommand.interlaceInsertRepeat) {
-        // o and O repeat have to be interlaced with insert repeats so that the
-        // insertions appear on separate lines instead of the last line.
-        for (var i = 0; i < repeat; i++) {
-          repeatCommand();
-          repeatInsert(1);
-        }
-      } else {
-        if (!repeatForInsert) {
-          // Hack to get the cursor to end up at the right place. If I is
-          // repeated in insert mode repeat, cursor will be 1 insert
-          // change set left of where it should be.
-          repeatCommand();
-        }
-        repeatInsert(repeat);
-      }
-      vim.inputState = cachedInputState;
-      if (vim.insertMode && !repeatForInsert) {
-        // Don't exit insert mode twice. If repeatForInsert is set, then we
-        // were called by an exitInsertMode call lower on the stack.
-        exitInsertMode(cm);
-      }
-      macroModeState.inReplay = false;
-    };
-
-    function repeatLastInsertModeChanges(cm, repeat, macroModeState) {
-      var lastChange = macroModeState.lastInsertModeChanges;
-      function keyHandler(binding) {
-        if (typeof binding == 'string') {
-          CodeMirror.commands[binding](cm);
-        } else {
-          binding(cm);
-        }
-        return true;
-      }
-      for (var i = 0; i < repeat; i++) {
-        for (var j = 0; j < lastChange.changes.length; j++) {
-          var change = lastChange.changes[j];
-          if (change instanceof InsertModeKey) {
-            CodeMirror.lookupKey(change.keyName, ['vim-insert'], keyHandler);
-          } else {
-            var cur = cm.getCursor();
-            cm.replaceRange(change, cur, cur);
-          }
-        }
-      }
-    }
-
-    resetVimGlobalState();
-    return vimApi;
-  };
-  // Initialize Vim and make it available as an API.
-  CodeMirror.Vim = Vim();
-}
-)();
diff --git a/resources/libs/codemirror/lib/codemirror.css b/resources/libs/codemirror/lib/codemirror.css
deleted file mode 100644
index cdab2adae..000000000
--- a/resources/libs/codemirror/lib/codemirror.css
+++ /dev/null
@@ -1,263 +0,0 @@
-/* BASICS */
-
-.CodeMirror {
-  /* Set height, width, borders, and global font properties here */
-  font-family: monospace;
-  height: 500px;
-}
-.CodeMirror-scroll {
-  /* Set scrolling behaviour here */
-  overflow: auto;
-}
-
-/* PADDING */
-
-.CodeMirror-lines {
-  padding: 4px 0; /* Vertical padding around content */
-}
-.CodeMirror pre {
-  padding: 0 4px; /* Horizontal padding of content */
-}
-
-.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  background-color: white; /* The little square between H and V scrollbars */
-}
-
-/* GUTTER */
-
-.CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
-  white-space: nowrap;
-}
-.CodeMirror-linenumbers {}
-.CodeMirror-linenumber {
-  padding: 0 3px 0 5px;
-  min-width: 20px;
-  text-align: right;
-  color: #999;
-}
-
-/* CURSOR */
-
-.CodeMirror div.CodeMirror-cursor {
-  border-left: 1px solid black;
-  z-index: 3;
-}
-/* Shown when moving in bi-directional text */
-.CodeMirror div.CodeMirror-secondarycursor {
-  border-left: 1px solid silver;
-}
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
-  width: auto;
-  border: 0;
-  background: #7e7;
-  z-index: 1;
-}
-/* Can style cursor different in overwrite (non-insert) mode */
-.CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {}
-
-.cm-tab { display: inline-block; }
-
-/* DEFAULT THEME */
-
-.cm-s-default .cm-keyword {color: #708;}
-.cm-s-default .cm-atom {color: #219;}
-.cm-s-default .cm-number {color: #164;}
-.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable {color: black;}
-.cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-property {color: black;}
-.cm-s-default .cm-operator {color: black;}
-.cm-s-default .cm-comment {color: #a50;}
-.cm-s-default .cm-string {color: #a11;}
-.cm-s-default .cm-string-2 {color: #f50;}
-.cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-qualifier {color: #555;}
-.cm-s-default .cm-builtin {color: #30a;}
-.cm-s-default .cm-bracket {color: #997;}
-.cm-s-default .cm-tag {color: #170;}
-.cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
-.cm-s-default .cm-hr {color: #999;}
-.cm-s-default .cm-link {color: #00c;}
-
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-
-.cm-s-default .cm-error {color: #f00;}
-.cm-invalidchar {color: #f00;}
-
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
-.CodeMirror-activeline-background {background: #e8f2ff;}
-
-/* STOP */
-
-/* The rest of this file contains styles related to the mechanics of
-   the editor. You probably shouldn't touch them. */
-
-.CodeMirror {
-  line-height: 1;
-  position: relative;
-  overflow: hidden;
-  background: white;
-  color: black;
-}
-
-.CodeMirror-scroll {
-  /* 30px is the magic margin used to hide the element's real scrollbars */
-  /* See overflow: hidden in .CodeMirror */
-  margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px; padding-right: 30px;
-  height: 100%;
-  outline: none; /* Prevent dragging from highlighting the element */
-  position: relative;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-}
-.CodeMirror-sizer {
-  position: relative;
-}
-
-/* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actuall scrolling happens, thus preventing shaking and
-   flickering artifacts. */
-.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  position: absolute;
-  z-index: 6;
-  display: none;
-}
-.CodeMirror-vscrollbar {
-  right: 0; top: 0;
-  overflow-x: hidden;
-  overflow-y: scroll;
-}
-.CodeMirror-hscrollbar {
-  bottom: 0; left: 0;
-  overflow-y: hidden;
-  overflow-x: scroll;
-}
-.CodeMirror-scrollbar-filler {
-  right: 0; bottom: 0;
-}
-.CodeMirror-gutter-filler {
-  left: 0; bottom: 0;
-}
-
-.CodeMirror-gutters {
-  position: absolute; left: 0; top: 0;
-  padding-bottom: 30px;
-  z-index: 3;
-}
-.CodeMirror-gutter {
-  white-space: normal;
-  height: 100%;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  padding-bottom: 30px;
-  margin-bottom: -32px;
-  display: inline-block;
-  /* Hack to make IE7 behave */
-  *zoom:1;
-  *display:inline;
-}
-.CodeMirror-gutter-elt {
-  position: absolute;
-  cursor: default;
-  z-index: 4;
-}
-
-.CodeMirror-lines {
-  cursor: text;
-}
-.CodeMirror pre {
-  /* Reset some styles that the rest of the page might have set */
-  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
-  border-width: 0;
-  background: transparent;
-  font-family: inherit;
-  font-size: inherit;
-  margin: 0;
-  white-space: pre;
-  word-wrap: normal;
-  line-height: inherit;
-  color: inherit;
-  z-index: 2;
-  position: relative;
-  overflow: visible;
-}
-.CodeMirror-wrap pre {
-  word-wrap: break-word;
-  white-space: pre-wrap;
-  word-break: normal;
-}
-.CodeMirror-code pre {
-  border-right: 30px solid transparent;
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-}
-.CodeMirror-wrap .CodeMirror-code pre {
-  border-right: none;
-  width: auto;
-}
-.CodeMirror-linebackground {
-  position: absolute;
-  left: 0; right: 0; top: 0; bottom: 0;
-  z-index: 0;
-}
-
-.CodeMirror-linewidget {
-  position: relative;
-  z-index: 2;
-  overflow: auto;
-}
-
-.CodeMirror-widget {}
-
-.CodeMirror-wrap .CodeMirror-scroll {
-  overflow-x: hidden;
-}
-
-.CodeMirror-measure {
-  position: absolute;
-  width: 100%;
-  height: 0;
-  overflow: hidden;
-  visibility: hidden;
-}
-.CodeMirror-measure pre { position: static; }
-
-.CodeMirror div.CodeMirror-cursor {
-  position: absolute;
-  visibility: hidden;
-  border-right: none;
-  width: 0;
-}
-.CodeMirror-focused div.CodeMirror-cursor {
-  visibility: visible;
-}
-
-.CodeMirror-selected { background: #d9d9d9; }
-.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
-
-.cm-searching {
-  background: #ffa;
-  background: rgba(255, 255, 0, .4);
-}
-
-/* IE7 hack to prevent it from returning funny offsetTops on the spans */
-.CodeMirror span { *vertical-align: text-bottom; }
-
-@media print {
-  /* Hide the cursor when printing */
-  .CodeMirror div.CodeMirror-cursor {
-    visibility: hidden;
-  }
-}
diff --git a/resources/libs/codemirror/lib/codemirror.js b/resources/libs/codemirror/lib/codemirror.js
deleted file mode 100644
index f8b2af58a..000000000
--- a/resources/libs/codemirror/lib/codemirror.js
+++ /dev/null
@@ -1,5944 +0,0 @@
-// CodeMirror version 3.20
-//
-// CodeMirror is the only global var we claim
-window.CodeMirror = (function() {
-  "use strict";
-
-  // BROWSER SNIFFING
-
-  // Crude, but necessary to handle a number of hard-to-feature-detect
-  // bugs and behavior differences.
-  var gecko = /gecko\/\d/i.test(navigator.userAgent);
-  // IE11 currently doesn't count as 'ie', since it has almost none of
-  // the same bugs as earlier versions. Use ie_gt10 to handle
-  // incompatibilities in that version.
-  var ie = /MSIE \d/.test(navigator.userAgent);
-  var ie_lt8 = ie && (document.documentMode == null || document.documentMode < 8);
-  var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
-  var ie_gt10 = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
-  var webkit = /WebKit\//.test(navigator.userAgent);
-  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
-  var chrome = /Chrome\//.test(navigator.userAgent);
-  var opera = /Opera\//.test(navigator.userAgent);
-  var safari = /Apple Computer/.test(navigator.vendor);
-  var khtml = /KHTML\//.test(navigator.userAgent);
-  var mac_geLion = /Mac OS X 1\d\D([7-9]|\d\d)\D/.test(navigator.userAgent);
-  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
-  var phantom = /PhantomJS/.test(navigator.userAgent);
-
-  var ios = /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent);
-  // This is woefully incomplete. Suggestions for alternative methods welcome.
-  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent);
-  var mac = ios || /Mac/.test(navigator.platform);
-  var windows = /win/i.test(navigator.platform);
-
-  var opera_version = opera && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
-  if (opera_version) opera_version = Number(opera_version[1]);
-  if (opera_version && opera_version >= 15) { opera = false; webkit = true; }
-  // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-  var flipCtrlCmd = mac && (qtwebkit || opera && (opera_version == null || opera_version < 12.11));
-  var captureMiddleClick = gecko || (ie && !ie_lt9);
-
-  // Optimize some code when these features are not used
-  var sawReadOnlySpans = false, sawCollapsedSpans = false;
-
-  // CONSTRUCTOR
-
-  function CodeMirror(place, options) {
-    if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
-
-    this.options = options = options || {};
-    // Determine effective options based on given values and defaults.
-    for (var opt in defaults) if (!options.hasOwnProperty(opt) && defaults.hasOwnProperty(opt))
-      options[opt] = defaults[opt];
-    setGuttersForLineNumbers(options);
-
-    var docStart = typeof options.value == "string" ? 0 : options.value.first;
-    var display = this.display = makeDisplay(place, docStart);
-    display.wrapper.CodeMirror = this;
-    updateGutters(this);
-    if (options.autofocus && !mobile) focusInput(this);
-
-    this.state = {keyMaps: [],
-                  overlays: [],
-                  modeGen: 0,
-                  overwrite: false, focused: false,
-                  suppressEdits: false, pasteIncoming: false,
-                  draggingText: false,
-                  highlight: new Delayed()};
-
-    themeChanged(this);
-    if (options.lineWrapping)
-      this.display.wrapper.className += " CodeMirror-wrap";
-
-    var doc = options.value;
-    if (typeof doc == "string") doc = new Doc(options.value, options.mode);
-    operation(this, attachDoc)(this, doc);
-
-    // Override magic textarea content restore that IE sometimes does
-    // on our hidden textarea on reload
-    if (ie) setTimeout(bind(resetInput, this, true), 20);
-
-    registerEventHandlers(this);
-    // IE throws unspecified error in certain cases, when
-    // trying to access activeElement before onload
-    var hasFocus; try { hasFocus = (document.activeElement == display.input); } catch(e) { }
-    if (hasFocus || (options.autofocus && !mobile)) setTimeout(bind(onFocus, this), 20);
-    else onBlur(this);
-
-    operation(this, function() {
-      for (var opt in optionHandlers)
-        if (optionHandlers.propertyIsEnumerable(opt))
-          optionHandlers[opt](this, options[opt], Init);
-      for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
-    })();
-  }
-
-  // DISPLAY CONSTRUCTOR
-
-  function makeDisplay(place, docStart) {
-    var d = {};
-
-    var input = d.input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none; font-size: 4px;");
-    if (webkit) input.style.width = "1000px";
-    else input.setAttribute("wrap", "off");
-    // if border: 0; -- iOS fails to open keyboard (issue #1287)
-    if (ios) input.style.border = "1px solid black";
-    input.setAttribute("autocorrect", "off"); input.setAttribute("autocapitalize", "off"); input.setAttribute("spellcheck", "false");
-
-    // Wraps and hides input textarea
-    d.inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
-    // The actual fake scrollbars.
-    d.scrollbarH = elt("div", [elt("div", null, null, "height: 1px")], "CodeMirror-hscrollbar");
-    d.scrollbarV = elt("div", [elt("div", null, null, "width: 1px")], "CodeMirror-vscrollbar");
-    d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
-    d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
-    // DIVs containing the selection and the actual code
-    d.lineDiv = elt("div", null, "CodeMirror-code");
-    d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
-    // Blinky cursor, and element used to ensure cursor fits at the end of a line
-    d.cursor = elt("div", "\u00a0", "CodeMirror-cursor");
-    // Secondary cursor, shown when on a 'jump' in bi-directional text
-    d.otherCursor = elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor");
-    // Used to measure text size
-    d.measure = elt("div", null, "CodeMirror-measure");
-    // Wraps everything that needs to exist inside the vertically-padded coordinate system
-    d.lineSpace = elt("div", [d.measure, d.selectionDiv, d.lineDiv, d.cursor, d.otherCursor],
-                         null, "position: relative; outline: none");
-    // Moved around its parent to cover visible view
-    d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
-    // Set to the height of the text, causes scrolling
-    d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
-    // D is needed because behavior of elts with overflow: auto and padding is inconsistent across browsers
-    d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerCutOff + "px; width: 1px;");
-    // Will contain the gutters, if any
-    d.gutters = elt("div", null, "CodeMirror-gutters");
-    d.lineGutter = null;
-    // Provides scrolling
-    d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
-    d.scroller.setAttribute("tabIndex", "-1");
-    // The element in which the editor lives.
-    d.wrapper = elt("div", [d.inputDiv, d.scrollbarH, d.scrollbarV,
-                            d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
-    // Work around IE7 z-index bug
-    if (ie_lt8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
-    if (place.appendChild) place.appendChild(d.wrapper); else place(d.wrapper);
-
-    // Needed to hide big blue blinking cursor on Mobile Safari
-    if (ios) input.style.width = "0px";
-    if (!webkit) d.scroller.draggable = true;
-    // Needed to handle Tab key in KHTML
-    if (khtml) { d.inputDiv.style.height = "1px"; d.inputDiv.style.position = "absolute"; }
-    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-    else if (ie_lt8) d.scrollbarH.style.minWidth = d.scrollbarV.style.minWidth = "18px";
-
-    // Current visible range (may be bigger than the view window).
-    d.viewOffset = d.lastSizeC = 0;
-    d.showingFrom = d.showingTo = docStart;
-
-    // Used to only resize the line number gutter when necessary (when
-    // the amount of lines crosses a boundary that makes its width change)
-    d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
-    // See readInput and resetInput
-    d.prevInput = "";
-    // Set to true when a non-horizontal-scrolling widget is added. As
-    // an optimization, widget aligning is skipped when d is false.
-    d.alignWidgets = false;
-    // Flag that indicates whether we currently expect input to appear
-    // (after some event like 'keypress' or 'input') and are polling
-    // intensively.
-    d.pollingFast = false;
-    // Self-resetting timeout for the poller
-    d.poll = new Delayed();
-
-    d.cachedCharWidth = d.cachedTextHeight = null;
-    d.measureLineCache = [];
-    d.measureLineCachePos = 0;
-
-    // Tracks when resetInput has punted to just putting a short
-    // string instead of the (large) selection.
-    d.inaccurateSelection = false;
-
-    // Tracks the maximum line length so that the horizontal scrollbar
-    // can be kept static when scrolling.
-    d.maxLine = null;
-    d.maxLineLength = 0;
-    d.maxLineChanged = false;
-
-    // Used for measuring wheel scrolling granularity
-    d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
-
-    return d;
-  }
-
-  // STATE UPDATES
-
-  // Used to get the editor into a consistent state again when options change.
-
-  function loadMode(cm) {
-    cm.doc.mode = CodeMirror.getMode(cm.options, cm.doc.modeOption);
-    cm.doc.iter(function(line) {
-      if (line.stateAfter) line.stateAfter = null;
-      if (line.styles) line.styles = null;
-    });
-    cm.doc.frontier = cm.doc.first;
-    startWorker(cm, 100);
-    cm.state.modeGen++;
-    if (cm.curOp) regChange(cm);
-  }
-
-  function wrappingChanged(cm) {
-    if (cm.options.lineWrapping) {
-      cm.display.wrapper.className += " CodeMirror-wrap";
-      cm.display.sizer.style.minWidth = "";
-    } else {
-      cm.display.wrapper.className = cm.display.wrapper.className.replace(" CodeMirror-wrap", "");
-      computeMaxLength(cm);
-    }
-    estimateLineHeights(cm);
-    regChange(cm);
-    clearCaches(cm);
-    setTimeout(function(){updateScrollbars(cm);}, 100);
-  }
-
-  function estimateHeight(cm) {
-    var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
-    var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
-    return function(line) {
-      if (lineIsHidden(cm.doc, line))
-        return 0;
-      else if (wrapping)
-        return (Math.ceil(line.text.length / perLine) || 1) * th;
-      else
-        return th;
-    };
-  }
-
-  function estimateLineHeights(cm) {
-    var doc = cm.doc, est = estimateHeight(cm);
-    doc.iter(function(line) {
-      var estHeight = est(line);
-      if (estHeight != line.height) updateLineHeight(line, estHeight);
-    });
-  }
-
-  function keyMapChanged(cm) {
-    var map = keyMap[cm.options.keyMap], style = map.style;
-    cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
-      (style ? " cm-keymap-" + style : "");
-    cm.state.disableInput = map.disableInput;
-  }
-
-  function themeChanged(cm) {
-    cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
-      cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
-    clearCaches(cm);
-  }
-
-  function guttersChanged(cm) {
-    updateGutters(cm);
-    regChange(cm);
-    setTimeout(function(){alignHorizontally(cm);}, 20);
-  }
-
-  function updateGutters(cm) {
-    var gutters = cm.display.gutters, specs = cm.options.gutters;
-    removeChildren(gutters);
-    for (var i = 0; i < specs.length; ++i) {
-      var gutterClass = specs[i];
-      var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass));
-      if (gutterClass == "CodeMirror-linenumbers") {
-        cm.display.lineGutter = gElt;
-        gElt.style.width = (cm.display.lineNumWidth || 1) + "px";
-      }
-    }
-    gutters.style.display = i ? "" : "none";
-  }
-
-  function lineLength(doc, line) {
-    if (line.height == 0) return 0;
-    var len = line.text.length, merged, cur = line;
-    while (merged = collapsedSpanAtStart(cur)) {
-      var found = merged.find();
-      cur = getLine(doc, found.from.line);
-      len += found.from.ch - found.to.ch;
-    }
-    cur = line;
-    while (merged = collapsedSpanAtEnd(cur)) {
-      var found = merged.find();
-      len -= cur.text.length - found.from.ch;
-      cur = getLine(doc, found.to.line);
-      len += cur.text.length - found.to.ch;
-    }
-    return len;
-  }
-
-  function computeMaxLength(cm) {
-    var d = cm.display, doc = cm.doc;
-    d.maxLine = getLine(doc, doc.first);
-    d.maxLineLength = lineLength(doc, d.maxLine);
-    d.maxLineChanged = true;
-    doc.iter(function(line) {
-      var len = lineLength(doc, line);
-      if (len > d.maxLineLength) {
-        d.maxLineLength = len;
-        d.maxLine = line;
-      }
-    });
-  }
-
-  // Make sure the gutters options contains the element
-  // "CodeMirror-linenumbers" when the lineNumbers option is true.
-  function setGuttersForLineNumbers(options) {
-    var found = indexOf(options.gutters, "CodeMirror-linenumbers");
-    if (found == -1 && options.lineNumbers) {
-      options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);
-    } else if (found > -1 && !options.lineNumbers) {
-      options.gutters = options.gutters.slice(0);
-      options.gutters.splice(found, 1);
-    }
-  }
-
-  // SCROLLBARS
-
-  // Re-synchronize the fake scrollbars with the actual size of the
-  // content. Optionally force a scrollTop.
-  function updateScrollbars(cm) {
-    var d = cm.display, docHeight = cm.doc.height;
-    var totalHeight = docHeight + paddingVert(d);
-    d.sizer.style.minHeight = d.heightForcer.style.top = totalHeight + "px";
-    d.gutters.style.height = Math.max(totalHeight, d.scroller.clientHeight - scrollerCutOff) + "px";
-    var scrollHeight = Math.max(totalHeight, d.scroller.scrollHeight);
-    var needsH = d.scroller.scrollWidth > (d.scroller.clientWidth + 1);
-    var needsV = scrollHeight > (d.scroller.clientHeight + 1);
-    if (needsV) {
-      d.scrollbarV.style.display = "block";
-      d.scrollbarV.style.bottom = needsH ? scrollbarWidth(d.measure) + "px" : "0";
-      d.scrollbarV.firstChild.style.height =
-        (scrollHeight - d.scroller.clientHeight + d.scrollbarV.clientHeight) + "px";
-    } else {
-      d.scrollbarV.style.display = "";
-      d.scrollbarV.firstChild.style.height = "0";
-    }
-    if (needsH) {
-      d.scrollbarH.style.display = "block";
-      d.scrollbarH.style.right = needsV ? scrollbarWidth(d.measure) + "px" : "0";
-      d.scrollbarH.firstChild.style.width =
-        (d.scroller.scrollWidth - d.scroller.clientWidth + d.scrollbarH.clientWidth) + "px";
-    } else {
-      d.scrollbarH.style.display = "";
-      d.scrollbarH.firstChild.style.width = "0";
-    }
-    if (needsH && needsV) {
-      d.scrollbarFiller.style.display = "block";
-      d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = scrollbarWidth(d.measure) + "px";
-    } else d.scrollbarFiller.style.display = "";
-    if (needsH && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
-      d.gutterFiller.style.display = "block";
-      d.gutterFiller.style.height = scrollbarWidth(d.measure) + "px";
-      d.gutterFiller.style.width = d.gutters.offsetWidth + "px";
-    } else d.gutterFiller.style.display = "";
-
-    if (mac_geLion && scrollbarWidth(d.measure) === 0) {
-      d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = mac_geMountainLion ? "18px" : "12px";
-      d.scrollbarV.style.pointerEvents = d.scrollbarH.style.pointerEvents = "none";
-    }
-  }
-
-  function visibleLines(display, doc, viewPort) {
-    var top = display.scroller.scrollTop, height = display.wrapper.clientHeight;
-    if (typeof viewPort == "number") top = viewPort;
-    else if (viewPort) {top = viewPort.top; height = viewPort.bottom - viewPort.top;}
-    top = Math.floor(top - paddingTop(display));
-    var bottom = Math.ceil(top + height);
-    return {from: lineAtHeight(doc, top), to: lineAtHeight(doc, bottom)};
-  }
-
-  // LINE NUMBERS
-
-  function alignHorizontally(cm) {
-    var display = cm.display;
-    if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return;
-    var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
-    var gutterW = display.gutters.offsetWidth, l = comp + "px";
-    for (var n = display.lineDiv.firstChild; n; n = n.nextSibling) if (n.alignable) {
-      for (var i = 0, a = n.alignable; i < a.length; ++i) a[i].style.left = l;
-    }
-    if (cm.options.fixedGutter)
-      display.gutters.style.left = (comp + gutterW) + "px";
-  }
-
-  function maybeUpdateLineNumberWidth(cm) {
-    if (!cm.options.lineNumbers) return false;
-    var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
-    if (last.length != display.lineNumChars) {
-      var test = display.measure.appendChild(elt("div", [elt("div", last)],
-                                                 "CodeMirror-linenumber CodeMirror-gutter-elt"));
-      var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
-      display.lineGutter.style.width = "";
-      display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding);
-      display.lineNumWidth = display.lineNumInnerWidth + padding;
-      display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
-      display.lineGutter.style.width = display.lineNumWidth + "px";
-      return true;
-    }
-    return false;
-  }
-
-  function lineNumberFor(options, i) {
-    return String(options.lineNumberFormatter(i + options.firstLineNumber));
-  }
-  function compensateForHScroll(display) {
-    return getRect(display.scroller).left - getRect(display.sizer).left;
-  }
-
-  // DISPLAY DRAWING
-
-  function updateDisplay(cm, changes, viewPort, forced) {
-    var oldFrom = cm.display.showingFrom, oldTo = cm.display.showingTo, updated;
-    var visible = visibleLines(cm.display, cm.doc, viewPort);
-    for (var first = true;; first = false) {
-      var oldWidth = cm.display.scroller.clientWidth;
-      if (!updateDisplayInner(cm, changes, visible, forced)) break;
-      updated = true;
-      changes = [];
-      updateSelection(cm);
-      updateScrollbars(cm);
-      if (first && cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
-        forced = true;
-        continue;
-      }
-      forced = false;
-
-      // Clip forced viewport to actual scrollable area
-      if (viewPort)
-        viewPort = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight,
-                            typeof viewPort == "number" ? viewPort : viewPort.top);
-      visible = visibleLines(cm.display, cm.doc, viewPort);
-      if (visible.from >= cm.display.showingFrom && visible.to <= cm.display.showingTo)
-        break;
-    }
-
-    if (updated) {
-      signalLater(cm, "update", cm);
-      if (cm.display.showingFrom != oldFrom || cm.display.showingTo != oldTo)
-        signalLater(cm, "viewportChange", cm, cm.display.showingFrom, cm.display.showingTo);
-    }
-    return updated;
-  }
-
-  // Uses a set of changes plus the current scroll position to
-  // determine which DOM updates have to be made, and makes the
-  // updates.
-  function updateDisplayInner(cm, changes, visible, forced) {
-    var display = cm.display, doc = cm.doc;
-    if (!display.wrapper.clientWidth) {
-      display.showingFrom = display.showingTo = doc.first;
-      display.viewOffset = 0;
-      return;
-    }
-
-    // Bail out if the visible area is already rendered and nothing changed.
-    if (!forced && changes.length == 0 &&
-        visible.from > display.showingFrom && visible.to < display.showingTo)
-      return;
-
-    if (maybeUpdateLineNumberWidth(cm))
-      changes = [{from: doc.first, to: doc.first + doc.size}];
-    var gutterW = display.sizer.style.marginLeft = display.gutters.offsetWidth + "px";
-    display.scrollbarH.style.left = cm.options.fixedGutter ? gutterW : "0";
-
-    // Used to determine which lines need their line numbers updated
-    var positionsChangedFrom = Infinity;
-    if (cm.options.lineNumbers)
-      for (var i = 0; i < changes.length; ++i)
-        if (changes[i].diff && changes[i].from < positionsChangedFrom) { positionsChangedFrom = changes[i].from; }
-
-    var end = doc.first + doc.size;
-    var from = Math.max(visible.from - cm.options.viewportMargin, doc.first);
-    var to = Math.min(end, visible.to + cm.options.viewportMargin);
-    if (display.showingFrom < from && from - display.showingFrom < 20) from = Math.max(doc.first, display.showingFrom);
-    if (display.showingTo > to && display.showingTo - to < 20) to = Math.min(end, display.showingTo);
-    if (sawCollapsedSpans) {
-      from = lineNo(visualLine(doc, getLine(doc, from)));
-      while (to < end && lineIsHidden(doc, getLine(doc, to))) ++to;
-    }
-
-    // Create a range of theoretically intact lines, and punch holes
-    // in that using the change info.
-    var intact = [{from: Math.max(display.showingFrom, doc.first),
-                   to: Math.min(display.showingTo, end)}];
-    if (intact[0].from >= intact[0].to) intact = [];
-    else intact = computeIntact(intact, changes);
-    // When merged lines are present, we might have to reduce the
-    // intact ranges because changes in continued fragments of the
-    // intact lines do require the lines to be redrawn.
-    if (sawCollapsedSpans)
-      for (var i = 0; i < intact.length; ++i) {
-        var range = intact[i], merged;
-        while (merged = collapsedSpanAtEnd(getLine(doc, range.to - 1))) {
-          var newTo = merged.find().from.line;
-          if (newTo > range.from) range.to = newTo;
-          else { intact.splice(i--, 1); break; }
-        }
-      }
-
-    // Clip off the parts that won't be visible
-    var intactLines = 0;
-    for (var i = 0; i < intact.length; ++i) {
-      var range = intact[i];
-      if (range.from < from) range.from = from;
-      if (range.to > to) range.to = to;
-      if (range.from >= range.to) intact.splice(i--, 1);
-      else intactLines += range.to - range.from;
-    }
-    if (!forced && intactLines == to - from && from == display.showingFrom && to == display.showingTo) {
-      updateViewOffset(cm);
-      return;
-    }
-    intact.sort(function(a, b) {return a.from - b.from;});
-
-    // Avoid crashing on IE's "unspecified error" when in iframes
-    try {
-      var focused = document.activeElement;
-    } catch(e) {}
-    if (intactLines < (to - from) * .7) display.lineDiv.style.display = "none";
-    patchDisplay(cm, from, to, intact, positionsChangedFrom);
-    display.lineDiv.style.display = "";
-    if (focused && document.activeElement != focused && focused.offsetHeight) focused.focus();
-
-    var different = from != display.showingFrom || to != display.showingTo ||
-      display.lastSizeC != display.wrapper.clientHeight;
-    // This is just a bogus formula that detects when the editor is
-    // resized or the font size changes.
-    if (different) {
-      display.lastSizeC = display.wrapper.clientHeight;
-      startWorker(cm, 400);
-    }
-    display.showingFrom = from; display.showingTo = to;
-
-    updateHeightsInViewport(cm);
-    updateViewOffset(cm);
-
-    return true;
-  }
-
-  function updateHeightsInViewport(cm) {
-    var display = cm.display;
-    var prevBottom = display.lineDiv.offsetTop;
-    for (var node = display.lineDiv.firstChild, height; node; node = node.nextSibling) if (node.lineObj) {
-      if (ie_lt8) {
-        var bot = node.offsetTop + node.offsetHeight;
-        height = bot - prevBottom;
-        prevBottom = bot;
-      } else {
-        var box = getRect(node);
-        height = box.bottom - box.top;
-      }
-      var diff = node.lineObj.height - height;
-      if (height < 2) height = textHeight(display);
-      if (diff > .001 || diff < -.001) {
-        updateLineHeight(node.lineObj, height);
-        var widgets = node.lineObj.widgets;
-        if (widgets) for (var i = 0; i < widgets.length; ++i)
-          widgets[i].height = widgets[i].node.offsetHeight;
-      }
-    }
-  }
-
-  function updateViewOffset(cm) {
-    var off = cm.display.viewOffset = heightAtLine(cm, getLine(cm.doc, cm.display.showingFrom));
-    // Position the mover div to align with the current virtual scroll position
-    cm.display.mover.style.top = off + "px";
-  }
-
-  function computeIntact(intact, changes) {
-    for (var i = 0, l = changes.length || 0; i < l; ++i) {
-      var change = changes[i], intact2 = [], diff = change.diff || 0;
-      for (var j = 0, l2 = intact.length; j < l2; ++j) {
-        var range = intact[j];
-        if (change.to <= range.from && change.diff) {
-          intact2.push({from: range.from + diff, to: range.to + diff});
-        } else if (change.to <= range.from || change.from >= range.to) {
-          intact2.push(range);
-        } else {
-          if (change.from > range.from)
-            intact2.push({from: range.from, to: change.from});
-          if (change.to < range.to)
-            intact2.push({from: change.to + diff, to: range.to + diff});
-        }
-      }
-      intact = intact2;
-    }
-    return intact;
-  }
-
-  function getDimensions(cm) {
-    var d = cm.display, left = {}, width = {};
-    for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
-      left[cm.options.gutters[i]] = n.offsetLeft;
-      width[cm.options.gutters[i]] = n.offsetWidth;
-    }
-    return {fixedPos: compensateForHScroll(d),
-            gutterTotalWidth: d.gutters.offsetWidth,
-            gutterLeft: left,
-            gutterWidth: width,
-            wrapperWidth: d.wrapper.clientWidth};
-  }
-
-  function patchDisplay(cm, from, to, intact, updateNumbersFrom) {
-    var dims = getDimensions(cm);
-    var display = cm.display, lineNumbers = cm.options.lineNumbers;
-    if (!intact.length && (!webkit || !cm.display.currentWheelTarget))
-      removeChildren(display.lineDiv);
-    var container = display.lineDiv, cur = container.firstChild;
-
-    function rm(node) {
-      var next = node.nextSibling;
-      if (webkit && mac && cm.display.currentWheelTarget == node) {
-        node.style.display = "none";
-        node.lineObj = null;
-      } else {
-        node.parentNode.removeChild(node);
-      }
-      return next;
-    }
-
-    var nextIntact = intact.shift(), lineN = from;
-    cm.doc.iter(from, to, function(line) {
-      if (nextIntact && nextIntact.to == lineN) nextIntact = intact.shift();
-      if (lineIsHidden(cm.doc, line)) {
-        if (line.height != 0) updateLineHeight(line, 0);
-        if (line.widgets && cur && cur.previousSibling) for (var i = 0; i < line.widgets.length; ++i) {
-          var w = line.widgets[i];
-          if (w.showIfHidden) {
-            var prev = cur.previousSibling;
-            if (/pre/i.test(prev.nodeName)) {
-              var wrap = elt("div", null, null, "position: relative");
-              prev.parentNode.replaceChild(wrap, prev);
-              wrap.appendChild(prev);
-              prev = wrap;
-            }
-            var wnode = prev.appendChild(elt("div", [w.node], "CodeMirror-linewidget"));
-            if (!w.handleMouseEvents) wnode.ignoreEvents = true;
-            positionLineWidget(w, wnode, prev, dims);
-          }
-        }
-      } else if (nextIntact && nextIntact.from <= lineN && nextIntact.to > lineN) {
-        // This line is intact. Skip to the actual node. Update its
-        // line number if needed.
-        while (cur.lineObj != line) cur = rm(cur);
-        if (lineNumbers && updateNumbersFrom <= lineN && cur.lineNumber)
-          setTextContent(cur.lineNumber, lineNumberFor(cm.options, lineN));
-        cur = cur.nextSibling;
-      } else {
-        // For lines with widgets, make an attempt to find and reuse
-        // the existing element, so that widgets aren't needlessly
-        // removed and re-inserted into the dom
-        if (line.widgets) for (var j = 0, search = cur, reuse; search && j < 20; ++j, search = search.nextSibling)
-          if (search.lineObj == line && /div/i.test(search.nodeName)) { reuse = search; break; }
-        // This line needs to be generated.
-        var lineNode = buildLineElement(cm, line, lineN, dims, reuse);
-        if (lineNode != reuse) {
-          container.insertBefore(lineNode, cur);
-        } else {
-          while (cur != reuse) cur = rm(cur);
-          cur = cur.nextSibling;
-        }
-
-        lineNode.lineObj = line;
-      }
-      ++lineN;
-    });
-    while (cur) cur = rm(cur);
-  }
-
-  function buildLineElement(cm, line, lineNo, dims, reuse) {
-    var built = buildLineContent(cm, line), lineElement = built.pre;
-    var markers = line.gutterMarkers, display = cm.display, wrap;
-
-    var bgClass = built.bgClass ? built.bgClass + " " + (line.bgClass || "") : line.bgClass;
-    if (!cm.options.lineNumbers && !markers && !bgClass && !line.wrapClass && !line.widgets)
-      return lineElement;
-
-    // Lines with gutter elements, widgets or a background class need
-    // to be wrapped again, and have the extra elements added to the
-    // wrapper div
-
-    if (reuse) {
-      reuse.alignable = null;
-      var isOk = true, widgetsSeen = 0, insertBefore = null;
-      for (var n = reuse.firstChild, next; n; n = next) {
-        next = n.nextSibling;
-        if (!/\bCodeMirror-linewidget\b/.test(n.className)) {
-          reuse.removeChild(n);
-        } else {
-          for (var i = 0; i < line.widgets.length; ++i) {
-            var widget = line.widgets[i];
-            if (widget.node == n.firstChild) {
-              if (!widget.above && !insertBefore) insertBefore = n;
-              positionLineWidget(widget, n, reuse, dims);
-              ++widgetsSeen;
-              break;
-            }
-          }
-          if (i == line.widgets.length) { isOk = false; break; }
-        }
-      }
-      reuse.insertBefore(lineElement, insertBefore);
-      if (isOk && widgetsSeen == line.widgets.length) {
-        wrap = reuse;
-        reuse.className = line.wrapClass || "";
-      }
-    }
-    if (!wrap) {
-      wrap = elt("div", null, line.wrapClass, "position: relative");
-      wrap.appendChild(lineElement);
-    }
-    // Kludge to make sure the styled element lies behind the selection (by z-index)
-    if (bgClass)
-      wrap.insertBefore(elt("div", null, bgClass + " CodeMirror-linebackground"), wrap.firstChild);
-    if (cm.options.lineNumbers || markers) {
-      var gutterWrap = wrap.insertBefore(elt("div", null, null, "position: absolute; left: " +
-                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"),
-                                         wrap.firstChild);
-      if (cm.options.fixedGutter) (wrap.alignable || (wrap.alignable = [])).push(gutterWrap);
-      if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
-        wrap.lineNumber = gutterWrap.appendChild(
-          elt("div", lineNumberFor(cm.options, lineNo),
-              "CodeMirror-linenumber CodeMirror-gutter-elt",
-              "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: "
-              + display.lineNumInnerWidth + "px"));
-      if (markers)
-        for (var k = 0; k < cm.options.gutters.length; ++k) {
-          var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id];
-          if (found)
-            gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " +
-                                       dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"));
-        }
-    }
-    if (ie_lt8) wrap.style.zIndex = 2;
-    if (line.widgets && wrap != reuse) for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
-      var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
-      if (!widget.handleMouseEvents) node.ignoreEvents = true;
-      positionLineWidget(widget, node, wrap, dims);
-      if (widget.above)
-        wrap.insertBefore(node, cm.options.lineNumbers && line.height != 0 ? gutterWrap : lineElement);
-      else
-        wrap.appendChild(node);
-      signalLater(widget, "redraw");
-    }
-    return wrap;
-  }
-
-  function positionLineWidget(widget, node, wrap, dims) {
-    if (widget.noHScroll) {
-      (wrap.alignable || (wrap.alignable = [])).push(node);
-      var width = dims.wrapperWidth;
-      node.style.left = dims.fixedPos + "px";
-      if (!widget.coverGutter) {
-        width -= dims.gutterTotalWidth;
-        node.style.paddingLeft = dims.gutterTotalWidth + "px";
-      }
-      node.style.width = width + "px";
-    }
-    if (widget.coverGutter) {
-      node.style.zIndex = 5;
-      node.style.position = "relative";
-      if (!widget.noHScroll) node.style.marginLeft = -dims.gutterTotalWidth + "px";
-    }
-  }
-
-  // SELECTION / CURSOR
-
-  function updateSelection(cm) {
-    var display = cm.display;
-    var collapsed = posEq(cm.doc.sel.from, cm.doc.sel.to);
-    if (collapsed || cm.options.showCursorWhenSelecting)
-      updateSelectionCursor(cm);
-    else
-      display.cursor.style.display = display.otherCursor.style.display = "none";
-    if (!collapsed)
-      updateSelectionRange(cm);
-    else
-      display.selectionDiv.style.display = "none";
-
-    // Move the hidden textarea near the cursor to prevent scrolling artifacts
-    if (cm.options.moveInputWithCursor) {
-      var headPos = cursorCoords(cm, cm.doc.sel.head, "div");
-      var wrapOff = getRect(display.wrapper), lineOff = getRect(display.lineDiv);
-      display.inputDiv.style.top = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
-                                                        headPos.top + lineOff.top - wrapOff.top)) + "px";
-      display.inputDiv.style.left = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
-                                                         headPos.left + lineOff.left - wrapOff.left)) + "px";
-    }
-  }
-
-  // No selection, plain cursor
-  function updateSelectionCursor(cm) {
-    var display = cm.display, pos = cursorCoords(cm, cm.doc.sel.head, "div");
-    display.cursor.style.left = pos.left + "px";
-    display.cursor.style.top = pos.top + "px";
-    display.cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
-    display.cursor.style.display = "";
-
-    if (pos.other) {
-      display.otherCursor.style.display = "";
-      display.otherCursor.style.left = pos.other.left + "px";
-      display.otherCursor.style.top = pos.other.top + "px";
-      display.otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
-    } else { display.otherCursor.style.display = "none"; }
-  }
-
-  // Highlight selection
-  function updateSelectionRange(cm) {
-    var display = cm.display, doc = cm.doc, sel = cm.doc.sel;
-    var fragment = document.createDocumentFragment();
-    var clientWidth = display.lineSpace.offsetWidth, pl = paddingLeft(cm.display);
-
-    function add(left, top, width, bottom) {
-      if (top < 0) top = 0;
-      fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
-                               "px; top: " + top + "px; width: " + (width == null ? clientWidth - left : width) +
-                               "px; height: " + (bottom - top) + "px"));
-    }
-
-    function drawForLine(line, fromArg, toArg) {
-      var lineObj = getLine(doc, line);
-      var lineLen = lineObj.text.length;
-      var start, end;
-      function coords(ch, bias) {
-        return charCoords(cm, Pos(line, ch), "div", lineObj, bias);
-      }
-
-      iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {
-        var leftPos = coords(from, "left"), rightPos, left, right;
-        if (from == to) {
-          rightPos = leftPos;
-          left = right = leftPos.left;
-        } else {
-          rightPos = coords(to - 1, "right");
-          if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp; }
-          left = leftPos.left;
-          right = rightPos.right;
-        }
-        if (fromArg == null && from == 0) left = pl;
-        if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
-          add(left, leftPos.top, null, leftPos.bottom);
-          left = pl;
-          if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top);
-        }
-        if (toArg == null && to == lineLen) right = clientWidth;
-        if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
-          start = leftPos;
-        if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
-          end = rightPos;
-        if (left < pl + 1) left = pl;
-        add(left, rightPos.top, right - left, rightPos.bottom);
-      });
-      return {start: start, end: end};
-    }
-
-    if (sel.from.line == sel.to.line) {
-      drawForLine(sel.from.line, sel.from.ch, sel.to.ch);
-    } else {
-      var fromLine = getLine(doc, sel.from.line), toLine = getLine(doc, sel.to.line);
-      var singleVLine = visualLine(doc, fromLine) == visualLine(doc, toLine);
-      var leftEnd = drawForLine(sel.from.line, sel.from.ch, singleVLine ? fromLine.text.length : null).end;
-      var rightStart = drawForLine(sel.to.line, singleVLine ? 0 : null, sel.to.ch).start;
-      if (singleVLine) {
-        if (leftEnd.top < rightStart.top - 2) {
-          add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
-          add(pl, rightStart.top, rightStart.left, rightStart.bottom);
-        } else {
-          add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
-        }
-      }
-      if (leftEnd.bottom < rightStart.top)
-        add(pl, leftEnd.bottom, null, rightStart.top);
-    }
-
-    removeChildrenAndAdd(display.selectionDiv, fragment);
-    display.selectionDiv.style.display = "";
-  }
-
-  // Cursor-blinking
-  function restartBlink(cm) {
-    if (!cm.state.focused) return;
-    var display = cm.display;
-    clearInterval(display.blinker);
-    var on = true;
-    display.cursor.style.visibility = display.otherCursor.style.visibility = "";
-    if (cm.options.cursorBlinkRate > 0)
-      display.blinker = setInterval(function() {
-        display.cursor.style.visibility = display.otherCursor.style.visibility = (on = !on) ? "" : "hidden";
-      }, cm.options.cursorBlinkRate);
-  }
-
-  // HIGHLIGHT WORKER
-
-  function startWorker(cm, time) {
-    if (cm.doc.mode.startState && cm.doc.frontier < cm.display.showingTo)
-      cm.state.highlight.set(time, bind(highlightWorker, cm));
-  }
-
-  function highlightWorker(cm) {
-    var doc = cm.doc;
-    if (doc.frontier < doc.first) doc.frontier = doc.first;
-    if (doc.frontier >= cm.display.showingTo) return;
-    var end = +new Date + cm.options.workTime;
-    var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
-    var changed = [], prevChange;
-    doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.showingTo + 500), function(line) {
-      if (doc.frontier >= cm.display.showingFrom) { // Visible
-        var oldStyles = line.styles;
-        line.styles = highlightLine(cm, line, state, true);
-        var ischange = !oldStyles || oldStyles.length != line.styles.length;
-        for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
-        if (ischange) {
-          if (prevChange && prevChange.end == doc.frontier) prevChange.end++;
-          else changed.push(prevChange = {start: doc.frontier, end: doc.frontier + 1});
-        }
-        line.stateAfter = copyState(doc.mode, state);
-      } else {
-        processLine(cm, line.text, state);
-        line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
-      }
-      ++doc.frontier;
-      if (+new Date > end) {
-        startWorker(cm, cm.options.workDelay);
-        return true;
-      }
-    });
-    if (changed.length)
-      operation(cm, function() {
-        for (var i = 0; i < changed.length; ++i)
-          regChange(this, changed[i].start, changed[i].end);
-      })();
-  }
-
-  // Finds the line to start with when starting a parse. Tries to
-  // find a line with a stateAfter, so that it can start with a
-  // valid state. If that fails, it returns the line with the
-  // smallest indentation, which tends to need the least context to
-  // parse correctly.
-  function findStartLine(cm, n, precise) {
-    var minindent, minline, doc = cm.doc;
-    var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
-    for (var search = n; search > lim; --search) {
-      if (search <= doc.first) return doc.first;
-      var line = getLine(doc, search - 1);
-      if (line.stateAfter && (!precise || search <= doc.frontier)) return search;
-      var indented = countColumn(line.text, null, cm.options.tabSize);
-      if (minline == null || minindent > indented) {
-        minline = search - 1;
-        minindent = indented;
-      }
-    }
-    return minline;
-  }
-
-  function getStateBefore(cm, n, precise) {
-    var doc = cm.doc, display = cm.display;
-    if (!doc.mode.startState) return true;
-    var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter;
-    if (!state) state = startState(doc.mode);
-    else state = copyState(doc.mode, state);
-    doc.iter(pos, n, function(line) {
-      processLine(cm, line.text, state);
-      var save = pos == n - 1 || pos % 5 == 0 || pos >= display.showingFrom && pos < display.showingTo;
-      line.stateAfter = save ? copyState(doc.mode, state) : null;
-      ++pos;
-    });
-    if (precise) doc.frontier = pos;
-    return state;
-  }
-
-  // POSITION MEASUREMENT
-
-  function paddingTop(display) {return display.lineSpace.offsetTop;}
-  function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight;}
-  function paddingLeft(display) {
-    var e = removeChildrenAndAdd(display.measure, elt("pre", null, null, "text-align: left")).appendChild(elt("span", "x"));
-    return e.offsetLeft;
-  }
-
-  function measureChar(cm, line, ch, data, bias) {
-    var dir = -1;
-    data = data || measureLine(cm, line);
-    if (data.crude) {
-      var left = data.left + ch * data.width;
-      return {left: left, right: left + data.width, top: data.top, bottom: data.bottom};
-    }
-
-    for (var pos = ch;; pos += dir) {
-      var r = data[pos];
-      if (r) break;
-      if (dir < 0 && pos == 0) dir = 1;
-    }
-    bias = pos > ch ? "left" : pos < ch ? "right" : bias;
-    if (bias == "left" && r.leftSide) r = r.leftSide;
-    else if (bias == "right" && r.rightSide) r = r.rightSide;
-    return {left: pos < ch ? r.right : r.left,
-            right: pos > ch ? r.left : r.right,
-            top: r.top,
-            bottom: r.bottom};
-  }
-
-  function findCachedMeasurement(cm, line) {
-    var cache = cm.display.measureLineCache;
-    for (var i = 0; i < cache.length; ++i) {
-      var memo = cache[i];
-      if (memo.text == line.text && memo.markedSpans == line.markedSpans &&
-          cm.display.scroller.clientWidth == memo.width &&
-          memo.classes == line.textClass + "|" + line.wrapClass)
-        return memo;
-    }
-  }
-
-  function clearCachedMeasurement(cm, line) {
-    var exists = findCachedMeasurement(cm, line);
-    if (exists) exists.text = exists.measure = exists.markedSpans = null;
-  }
-
-  function measureLine(cm, line) {
-    // First look in the cache
-    var cached = findCachedMeasurement(cm, line);
-    if (cached) return cached.measure;
-
-    // Failing that, recompute and store result in cache
-    var measure = measureLineInner(cm, line);
-    var cache = cm.display.measureLineCache;
-    var memo = {text: line.text, width: cm.display.scroller.clientWidth,
-                markedSpans: line.markedSpans, measure: measure,
-                classes: line.textClass + "|" + line.wrapClass};
-    if (cache.length == 16) cache[++cm.display.measureLineCachePos % 16] = memo;
-    else cache.push(memo);
-    return measure;
-  }
-
-  function measureLineInner(cm, line) {
-    if (!cm.options.lineWrapping && line.text.length >= cm.options.crudeMeasuringFrom)
-      return crudelyMeasureLine(cm, line);
-
-    var display = cm.display, measure = emptyArray(line.text.length);
-    var pre = buildLineContent(cm, line, measure, true).pre;
-
-    // IE does not cache element positions of inline elements between
-    // calls to getBoundingClientRect. This makes the loop below,
-    // which gathers the positions of all the characters on the line,
-    // do an amount of layout work quadratic to the number of
-    // characters. When line wrapping is off, we try to improve things
-    // by first subdividing the line into a bunch of inline blocks, so
-    // that IE can reuse most of the layout information from caches
-    // for those blocks. This does interfere with line wrapping, so it
-    // doesn't work when wrapping is on, but in that case the
-    // situation is slightly better, since IE does cache line-wrapping
-    // information and only recomputes per-line.
-    if (ie && !ie_lt8 && !cm.options.lineWrapping && pre.childNodes.length > 100) {
-      var fragment = document.createDocumentFragment();
-      var chunk = 10, n = pre.childNodes.length;
-      for (var i = 0, chunks = Math.ceil(n / chunk); i < chunks; ++i) {
-        var wrap = elt("div", null, null, "display: inline-block");
-        for (var j = 0; j < chunk && n; ++j) {
-          wrap.appendChild(pre.firstChild);
-          --n;
-        }
-        fragment.appendChild(wrap);
-      }
-      pre.appendChild(fragment);
-    }
-
-    removeChildrenAndAdd(display.measure, pre);
-
-    var outer = getRect(display.lineDiv);
-    var vranges = [], data = emptyArray(line.text.length), maxBot = pre.offsetHeight;
-    // Work around an IE7/8 bug where it will sometimes have randomly
-    // replaced our pre with a clone at this point.
-    if (ie_lt9 && display.measure.first != pre)
-      removeChildrenAndAdd(display.measure, pre);
-
-    function measureRect(rect) {
-      var top = rect.top - outer.top, bot = rect.bottom - outer.top;
-      if (bot > maxBot) bot = maxBot;
-      if (top < 0) top = 0;
-      for (var i = vranges.length - 2; i >= 0; i -= 2) {
-        var rtop = vranges[i], rbot = vranges[i+1];
-        if (rtop > bot || rbot < top) continue;
-        if (rtop <= top && rbot >= bot ||
-            top <= rtop && bot >= rbot ||
-            Math.min(bot, rbot) - Math.max(top, rtop) >= (bot - top) >> 1) {
-          vranges[i] = Math.min(top, rtop);
-          vranges[i+1] = Math.max(bot, rbot);
-          break;
-        }
-      }
-      if (i < 0) { i = vranges.length; vranges.push(top, bot); }
-      return {left: rect.left - outer.left,
-              right: rect.right - outer.left,
-              top: i, bottom: null};
-    }
-    function finishRect(rect) {
-      rect.bottom = vranges[rect.top+1];
-      rect.top = vranges[rect.top];
-    }
-
-    for (var i = 0, cur; i < measure.length; ++i) if (cur = measure[i]) {
-      var node = cur, rect = null;
-      // A widget might wrap, needs special care
-      if (/\bCodeMirror-widget\b/.test(cur.className) && cur.getClientRects) {
-        if (cur.firstChild.nodeType == 1) node = cur.firstChild;
-        var rects = node.getClientRects();
-        if (rects.length > 1) {
-          rect = data[i] = measureRect(rects[0]);
-          rect.rightSide = measureRect(rects[rects.length - 1]);
-        }
-      }
-      if (!rect) rect = data[i] = measureRect(getRect(node));
-      if (cur.measureRight) rect.right = getRect(cur.measureRight).left;
-      if (cur.leftSide) rect.leftSide = measureRect(getRect(cur.leftSide));
-    }
-    removeChildren(cm.display.measure);
-    for (var i = 0, cur; i < data.length; ++i) if (cur = data[i]) {
-      finishRect(cur);
-      if (cur.leftSide) finishRect(cur.leftSide);
-      if (cur.rightSide) finishRect(cur.rightSide);
-    }
-    return data;
-  }
-
-  function crudelyMeasureLine(cm, line) {
-    var copy = new Line(line.text.slice(0, 100), null);
-    if (line.textClass) copy.textClass = line.textClass;
-    var measure = measureLineInner(cm, copy);
-    var left = measureChar(cm, copy, 0, measure, "left");
-    var right = measureChar(cm, copy, 99, measure, "right");
-    return {crude: true, top: left.top, left: left.left, bottom: left.bottom, width: (right.right - left.left) / 100};
-  }
-
-  function measureLineWidth(cm, line) {
-    var hasBadSpan = false;
-    if (line.markedSpans) for (var i = 0; i < line.markedSpans; ++i) {
-      var sp = line.markedSpans[i];
-      if (sp.collapsed && (sp.to == null || sp.to == line.text.length)) hasBadSpan = true;
-    }
-    var cached = !hasBadSpan && findCachedMeasurement(cm, line);
-    if (cached || line.text.length >= cm.options.crudeMeasuringFrom)
-      return measureChar(cm, line, line.text.length, cached && cached.measure, "right").right;
-
-    var pre = buildLineContent(cm, line, null, true).pre;
-    var end = pre.appendChild(zeroWidthElement(cm.display.measure));
-    removeChildrenAndAdd(cm.display.measure, pre);
-    return getRect(end).right - getRect(cm.display.lineDiv).left;
-  }
-
-  function clearCaches(cm) {
-    cm.display.measureLineCache.length = cm.display.measureLineCachePos = 0;
-    cm.display.cachedCharWidth = cm.display.cachedTextHeight = null;
-    if (!cm.options.lineWrapping) cm.display.maxLineChanged = true;
-    cm.display.lineNumChars = null;
-  }
-
-  function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; }
-  function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; }
-
-  // Context is one of "line", "div" (display.lineDiv), "local"/null (editor), or "page"
-  function intoCoordSystem(cm, lineObj, rect, context) {
-    if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
-      var size = widgetHeight(lineObj.widgets[i]);
-      rect.top += size; rect.bottom += size;
-    }
-    if (context == "line") return rect;
-    if (!context) context = "local";
-    var yOff = heightAtLine(cm, lineObj);
-    if (context == "local") yOff += paddingTop(cm.display);
-    else yOff -= cm.display.viewOffset;
-    if (context == "page" || context == "window") {
-      var lOff = getRect(cm.display.lineSpace);
-      yOff += lOff.top + (context == "window" ? 0 : pageScrollY());
-      var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());
-      rect.left += xOff; rect.right += xOff;
-    }
-    rect.top += yOff; rect.bottom += yOff;
-    return rect;
-  }
-
-  // Context may be "window", "page", "div", or "local"/null
-  // Result is in "div" coords
-  function fromCoordSystem(cm, coords, context) {
-    if (context == "div") return coords;
-    var left = coords.left, top = coords.top;
-    // First move into "page" coordinate system
-    if (context == "page") {
-      left -= pageScrollX();
-      top -= pageScrollY();
-    } else if (context == "local" || !context) {
-      var localBox = getRect(cm.display.sizer);
-      left += localBox.left;
-      top += localBox.top;
-    }
-
-    var lineSpaceBox = getRect(cm.display.lineSpace);
-    return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top};
-  }
-
-  function charCoords(cm, pos, context, lineObj, bias) {
-    if (!lineObj) lineObj = getLine(cm.doc, pos.line);
-    return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, null, bias), context);
-  }
-
-  function cursorCoords(cm, pos, context, lineObj, measurement) {
-    lineObj = lineObj || getLine(cm.doc, pos.line);
-    if (!measurement) measurement = measureLine(cm, lineObj);
-    function get(ch, right) {
-      var m = measureChar(cm, lineObj, ch, measurement, right ? "right" : "left");
-      if (right) m.left = m.right; else m.right = m.left;
-      return intoCoordSystem(cm, lineObj, m, context);
-    }
-    function getBidi(ch, partPos) {
-      var part = order[partPos], right = part.level % 2;
-      if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
-        part = order[--partPos];
-        ch = bidiRight(part) - (part.level % 2 ? 0 : 1);
-        right = true;
-      } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
-        part = order[++partPos];
-        ch = bidiLeft(part) - part.level % 2;
-        right = false;
-      }
-      if (right && ch == part.to && ch > part.from) return get(ch - 1);
-      return get(ch, right);
-    }
-    var order = getOrder(lineObj), ch = pos.ch;
-    if (!order) return get(ch);
-    var partPos = getBidiPartAt(order, ch);
-    var val = getBidi(ch, partPos);
-    if (bidiOther != null) val.other = getBidi(ch, bidiOther);
-    return val;
-  }
-
-  function PosWithInfo(line, ch, outside, xRel) {
-    var pos = new Pos(line, ch);
-    pos.xRel = xRel;
-    if (outside) pos.outside = true;
-    return pos;
-  }
-
-  // Coords must be lineSpace-local
-  function coordsChar(cm, x, y) {
-    var doc = cm.doc;
-    y += cm.display.viewOffset;
-    if (y < 0) return PosWithInfo(doc.first, 0, true, -1);
-    var lineNo = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
-    if (lineNo > last)
-      return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1);
-    if (x < 0) x = 0;
-
-    for (;;) {
-      var lineObj = getLine(doc, lineNo);
-      var found = coordsCharInner(cm, lineObj, lineNo, x, y);
-      var merged = collapsedSpanAtEnd(lineObj);
-      var mergedPos = merged && merged.find();
-      if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
-        lineNo = mergedPos.to.line;
-      else
-        return found;
-    }
-  }
-
-  function coordsCharInner(cm, lineObj, lineNo, x, y) {
-    var innerOff = y - heightAtLine(cm, lineObj);
-    var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth;
-    var measurement = measureLine(cm, lineObj);
-
-    function getX(ch) {
-      var sp = cursorCoords(cm, Pos(lineNo, ch), "line",
-                            lineObj, measurement);
-      wrongLine = true;
-      if (innerOff > sp.bottom) return sp.left - adjust;
-      else if (innerOff < sp.top) return sp.left + adjust;
-      else wrongLine = false;
-      return sp.left;
-    }
-
-    var bidi = getOrder(lineObj), dist = lineObj.text.length;
-    var from = lineLeft(lineObj), to = lineRight(lineObj);
-    var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine;
-
-    if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1);
-    // Do a binary search between these bounds.
-    for (;;) {
-      if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
-        var ch = x < fromX || x - fromX <= toX - x ? from : to;
-        var xDiff = x - (ch == from ? fromX : toX);
-        while (isExtendingChar.test(lineObj.text.charAt(ch))) ++ch;
-        var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside,
-                              xDiff < 0 ? -1 : xDiff ? 1 : 0);
-        return pos;
-      }
-      var step = Math.ceil(dist / 2), middle = from + step;
-      if (bidi) {
-        middle = from;
-        for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1);
-      }
-      var middleX = getX(middle);
-      if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step;}
-      else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step;}
-    }
-  }
-
-  var measureText;
-  function textHeight(display) {
-    if (display.cachedTextHeight != null) return display.cachedTextHeight;
-    if (measureText == null) {
-      measureText = elt("pre");
-      // Measure a bunch of lines, for browsers that compute
-      // fractional heights.
-      for (var i = 0; i < 49; ++i) {
-        measureText.appendChild(document.createTextNode("x"));
-        measureText.appendChild(elt("br"));
-      }
-      measureText.appendChild(document.createTextNode("x"));
-    }
-    removeChildrenAndAdd(display.measure, measureText);
-    var height = measureText.offsetHeight / 50;
-    if (height > 3) display.cachedTextHeight = height;
-    removeChildren(display.measure);
-    return height || 1;
-  }
-
-  function charWidth(display) {
-    if (display.cachedCharWidth != null) return display.cachedCharWidth;
-    var anchor = elt("span", "x");
-    var pre = elt("pre", [anchor]);
-    removeChildrenAndAdd(display.measure, pre);
-    var width = anchor.offsetWidth;
-    if (width > 2) display.cachedCharWidth = width;
-    return width || 10;
-  }
-
-  // OPERATIONS
-
-  // Operations are used to wrap changes in such a way that each
-  // change won't have to update the cursor and display (which would
-  // be awkward, slow, and error-prone), but instead updates are
-  // batched and then all combined and executed at once.
-
-  var nextOpId = 0;
-  function startOperation(cm) {
-    cm.curOp = {
-      // An array of ranges of lines that have to be updated. See
-      // updateDisplay.
-      changes: [],
-      forceUpdate: false,
-      updateInput: null,
-      userSelChange: null,
-      textChanged: null,
-      selectionChanged: false,
-      cursorActivity: false,
-      updateMaxLine: false,
-      updateScrollPos: false,
-      id: ++nextOpId
-    };
-    if (!delayedCallbackDepth++) delayedCallbacks = [];
-  }
-
-  function endOperation(cm) {
-    var op = cm.curOp, doc = cm.doc, display = cm.display;
-    cm.curOp = null;
-
-    if (op.updateMaxLine) computeMaxLength(cm);
-    if (display.maxLineChanged && !cm.options.lineWrapping && display.maxLine) {
-      var width = measureLineWidth(cm, display.maxLine);
-      display.sizer.style.minWidth = Math.max(0, width + 3 + scrollerCutOff) + "px";
-      display.maxLineChanged = false;
-      var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + display.sizer.offsetWidth - display.scroller.clientWidth);
-      if (maxScrollLeft < doc.scrollLeft && !op.updateScrollPos)
-        setScrollLeft(cm, Math.min(display.scroller.scrollLeft, maxScrollLeft), true);
-    }
-    var newScrollPos, updated;
-    if (op.updateScrollPos) {
-      newScrollPos = op.updateScrollPos;
-    } else if (op.selectionChanged && display.scroller.clientHeight) { // don't rescroll if not visible
-      var coords = cursorCoords(cm, doc.sel.head);
-      newScrollPos = calculateScrollPos(cm, coords.left, coords.top, coords.left, coords.bottom);
-    }
-    if (op.changes.length || op.forceUpdate || newScrollPos && newScrollPos.scrollTop != null) {
-      updated = updateDisplay(cm, op.changes, newScrollPos && newScrollPos.scrollTop, op.forceUpdate);
-      if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
-    }
-    if (!updated && op.selectionChanged) updateSelection(cm);
-    if (op.updateScrollPos) {
-      var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, newScrollPos.scrollTop));
-      var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, newScrollPos.scrollLeft));
-      display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;
-      display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;
-      alignHorizontally(cm);
-      if (op.scrollToPos)
-        scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),
-                          clipPos(cm.doc, op.scrollToPos.to), op.scrollToPos.margin);
-    } else if (newScrollPos) {
-      scrollCursorIntoView(cm);
-    }
-    if (op.selectionChanged) restartBlink(cm);
-
-    if (cm.state.focused && op.updateInput)
-      resetInput(cm, op.userSelChange);
-
-    var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
-    if (hidden) for (var i = 0; i < hidden.length; ++i)
-      if (!hidden[i].lines.length) signal(hidden[i], "hide");
-    if (unhidden) for (var i = 0; i < unhidden.length; ++i)
-      if (unhidden[i].lines.length) signal(unhidden[i], "unhide");
-
-    var delayed;
-    if (!--delayedCallbackDepth) {
-      delayed = delayedCallbacks;
-      delayedCallbacks = null;
-    }
-    if (op.textChanged)
-      signal(cm, "change", cm, op.textChanged);
-    if (op.cursorActivity) signal(cm, "cursorActivity", cm);
-    if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
-  }
-
-  // Wraps a function in an operation. Returns the wrapped function.
-  function operation(cm1, f) {
-    return function() {
-      var cm = cm1 || this, withOp = !cm.curOp;
-      if (withOp) startOperation(cm);
-      try { var result = f.apply(cm, arguments); }
-      finally { if (withOp) endOperation(cm); }
-      return result;
-    };
-  }
-  function docOperation(f) {
-    return function() {
-      var withOp = this.cm && !this.cm.curOp, result;
-      if (withOp) startOperation(this.cm);
-      try { result = f.apply(this, arguments); }
-      finally { if (withOp) endOperation(this.cm); }
-      return result;
-    };
-  }
-  function runInOp(cm, f) {
-    var withOp = !cm.curOp, result;
-    if (withOp) startOperation(cm);
-    try { result = f(); }
-    finally { if (withOp) endOperation(cm); }
-    return result;
-  }
-
-  function regChange(cm, from, to, lendiff) {
-    if (from == null) from = cm.doc.first;
-    if (to == null) to = cm.doc.first + cm.doc.size;
-    cm.curOp.changes.push({from: from, to: to, diff: lendiff});
-  }
-
-  // INPUT HANDLING
-
-  function slowPoll(cm) {
-    if (cm.display.pollingFast) return;
-    cm.display.poll.set(cm.options.pollInterval, function() {
-      readInput(cm);
-      if (cm.state.focused) slowPoll(cm);
-    });
-  }
-
-  function fastPoll(cm) {
-    var missed = false;
-    cm.display.pollingFast = true;
-    function p() {
-      var changed = readInput(cm);
-      if (!changed && !missed) {missed = true; cm.display.poll.set(60, p);}
-      else {cm.display.pollingFast = false; slowPoll(cm);}
-    }
-    cm.display.poll.set(20, p);
-  }
-
-  // prevInput is a hack to work with IME. If we reset the textarea
-  // on every change, that breaks IME. So we look for changes
-  // compared to the previous content instead. (Modern browsers have
-  // events that indicate IME taking place, but these are not widely
-  // supported or compatible enough yet to rely on.)
-  function readInput(cm) {
-    var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc, sel = doc.sel;
-    if (!cm.state.focused || hasSelection(input) || isReadOnly(cm) || cm.state.disableInput) return false;
-    if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
-      input.value = input.value.substring(0, input.value.length - 1);
-      cm.state.fakedLastChar = false;
-    }
-    var text = input.value;
-    if (text == prevInput && posEq(sel.from, sel.to)) return false;
-    if (ie && !ie_lt9 && cm.display.inputHasSelection === text) {
-      resetInput(cm, true);
-      return false;
-    }
-
-    var withOp = !cm.curOp;
-    if (withOp) startOperation(cm);
-    sel.shift = false;
-    var same = 0, l = Math.min(prevInput.length, text.length);
-    while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
-    var from = sel.from, to = sel.to;
-    if (same < prevInput.length)
-      from = Pos(from.line, from.ch - (prevInput.length - same));
-    else if (cm.state.overwrite && posEq(from, to) && !cm.state.pasteIncoming)
-      to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + (text.length - same)));
-
-    var updateInput = cm.curOp.updateInput;
-    var changeEvent = {from: from, to: to, text: splitLines(text.slice(same)),
-                       origin: cm.state.pasteIncoming ? "paste" : "+input"};
-    makeChange(cm.doc, changeEvent, "end");
-    cm.curOp.updateInput = updateInput;
-    signalLater(cm, "inputRead", cm, changeEvent);
-
-    if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
-    else cm.display.prevInput = text;
-    if (withOp) endOperation(cm);
-    cm.state.pasteIncoming = false;
-    return true;
-  }
-
-  function resetInput(cm, user) {
-    var minimal, selected, doc = cm.doc;
-    if (!posEq(doc.sel.from, doc.sel.to)) {
-      cm.display.prevInput = "";
-      minimal = hasCopyEvent &&
-        (doc.sel.to.line - doc.sel.from.line > 100 || (selected = cm.getSelection()).length > 1000);
-      var content = minimal ? "-" : selected || cm.getSelection();
-      cm.display.input.value = content;
-      if (cm.state.focused) selectInput(cm.display.input);
-      if (ie && !ie_lt9) cm.display.inputHasSelection = content;
-    } else if (user) {
-      cm.display.prevInput = cm.display.input.value = "";
-      if (ie && !ie_lt9) cm.display.inputHasSelection = null;
-    }
-    cm.display.inaccurateSelection = minimal;
-  }
-
-  function focusInput(cm) {
-    if (cm.options.readOnly != "nocursor" && (!mobile || document.activeElement != cm.display.input))
-      cm.display.input.focus();
-  }
-
-  function isReadOnly(cm) {
-    return cm.options.readOnly || cm.doc.cantEdit;
-  }
-
-  // EVENT HANDLERS
-
-  function registerEventHandlers(cm) {
-    var d = cm.display;
-    on(d.scroller, "mousedown", operation(cm, onMouseDown));
-    if (ie)
-      on(d.scroller, "dblclick", operation(cm, function(e) {
-        if (signalDOMEvent(cm, e)) return;
-        var pos = posFromMouse(cm, e);
-        if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
-        e_preventDefault(e);
-        var word = findWordAt(getLine(cm.doc, pos.line).text, pos);
-        extendSelection(cm.doc, word.from, word.to);
-      }));
-    else
-      on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
-    on(d.lineSpace, "selectstart", function(e) {
-      if (!eventInWidget(d, e)) e_preventDefault(e);
-    });
-    // Gecko browsers fire contextmenu *after* opening the menu, at
-    // which point we can't mess with it anymore. Context menu is
-    // handled in onMouseDown for Gecko.
-    if (!captureMiddleClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
-
-    on(d.scroller, "scroll", function() {
-      if (d.scroller.clientHeight) {
-        setScrollTop(cm, d.scroller.scrollTop);
-        setScrollLeft(cm, d.scroller.scrollLeft, true);
-        signal(cm, "scroll", cm);
-      }
-    });
-    on(d.scrollbarV, "scroll", function() {
-      if (d.scroller.clientHeight) setScrollTop(cm, d.scrollbarV.scrollTop);
-    });
-    on(d.scrollbarH, "scroll", function() {
-      if (d.scroller.clientHeight) setScrollLeft(cm, d.scrollbarH.scrollLeft);
-    });
-
-    on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);});
-    on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);});
-
-    function reFocus() { if (cm.state.focused) setTimeout(bind(focusInput, cm), 0); }
-    on(d.scrollbarH, "mousedown", reFocus);
-    on(d.scrollbarV, "mousedown", reFocus);
-    // Prevent wrapper from ever scrolling
-    on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
-
-    var resizeTimer;
-    function onResize() {
-      if (resizeTimer == null) resizeTimer = setTimeout(function() {
-        resizeTimer = null;
-        // Might be a text scaling operation, clear size caches.
-        d.cachedCharWidth = d.cachedTextHeight = knownScrollbarWidth = null;
-        clearCaches(cm);
-        runInOp(cm, bind(regChange, cm));
-      }, 100);
-    }
-    on(window, "resize", onResize);
-    // Above handler holds on to the editor and its data structures.
-    // Here we poll to unregister it when the editor is no longer in
-    // the document, so that it can be garbage-collected.
-    function unregister() {
-      for (var p = d.wrapper.parentNode; p && p != document.body; p = p.parentNode) {}
-      if (p) setTimeout(unregister, 5000);
-      else off(window, "resize", onResize);
-    }
-    setTimeout(unregister, 5000);
-
-    on(d.input, "keyup", operation(cm, function(e) {
-      if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
-      if (e.keyCode == 16) cm.doc.sel.shift = false;
-    }));
-    on(d.input, "input", function() {
-      if (ie && !ie_lt9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
-      fastPoll(cm);
-    });
-    on(d.input, "keydown", operation(cm, onKeyDown));
-    on(d.input, "keypress", operation(cm, onKeyPress));
-    on(d.input, "focus", bind(onFocus, cm));
-    on(d.input, "blur", bind(onBlur, cm));
-
-    function drag_(e) {
-      if (signalDOMEvent(cm, e) || cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))) return;
-      e_stop(e);
-    }
-    if (cm.options.dragDrop) {
-      on(d.scroller, "dragstart", function(e){onDragStart(cm, e);});
-      on(d.scroller, "dragenter", drag_);
-      on(d.scroller, "dragover", drag_);
-      on(d.scroller, "drop", operation(cm, onDrop));
-    }
-    on(d.scroller, "paste", function(e) {
-      if (eventInWidget(d, e)) return;
-      focusInput(cm);
-      fastPoll(cm);
-    });
-    on(d.input, "paste", function() {
-      // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
-      // Add a char to the end of textarea before paste occur so that
-      // selection doesn't span to the end of textarea.
-      if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {
-        var start = d.input.selectionStart, end = d.input.selectionEnd;
-        d.input.value += "$";
-        d.input.selectionStart = start;
-        d.input.selectionEnd = end;
-        cm.state.fakedLastChar = true;
-      }
-      cm.state.pasteIncoming = true;
-      fastPoll(cm);
-    });
-
-    function prepareCopy() {
-      if (d.inaccurateSelection) {
-        d.prevInput = "";
-        d.inaccurateSelection = false;
-        d.input.value = cm.getSelection();
-        selectInput(d.input);
-      }
-    }
-    on(d.input, "cut", prepareCopy);
-    on(d.input, "copy", prepareCopy);
-
-    // Needed to handle Tab key in KHTML
-    if (khtml) on(d.sizer, "mouseup", function() {
-        if (document.activeElement == d.input) d.input.blur();
-        focusInput(cm);
-    });
-  }
-
-  function eventInWidget(display, e) {
-    for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
-      if (!n || n.ignoreEvents || n.parentNode == display.sizer && n != display.mover) return true;
-    }
-  }
-
-  function posFromMouse(cm, e, liberal) {
-    var display = cm.display;
-    if (!liberal) {
-      var target = e_target(e);
-      if (target == display.scrollbarH || target == display.scrollbarH.firstChild ||
-          target == display.scrollbarV || target == display.scrollbarV.firstChild ||
-          target == display.scrollbarFiller || target == display.gutterFiller) return null;
-    }
-    var x, y, space = getRect(display.lineSpace);
-    // Fails unpredictably on IE[67] when mouse is dragged around quickly.
-    try { x = e.clientX; y = e.clientY; } catch (e) { return null; }
-    return coordsChar(cm, x - space.left, y - space.top);
-  }
-
-  var lastClick, lastDoubleClick;
-  function onMouseDown(e) {
-    if (signalDOMEvent(this, e)) return;
-    var cm = this, display = cm.display, doc = cm.doc, sel = doc.sel;
-    sel.shift = e.shiftKey;
-
-    if (eventInWidget(display, e)) {
-      if (!webkit) {
-        display.scroller.draggable = false;
-        setTimeout(function(){display.scroller.draggable = true;}, 100);
-      }
-      return;
-    }
-    if (clickInGutter(cm, e)) return;
-    var start = posFromMouse(cm, e);
-
-    switch (e_button(e)) {
-    case 3:
-      if (captureMiddleClick) onContextMenu.call(cm, cm, e);
-      return;
-    case 2:
-      if (webkit) cm.state.lastMiddleDown = +new Date;
-      if (start) extendSelection(cm.doc, start);
-      setTimeout(bind(focusInput, cm), 20);
-      e_preventDefault(e);
-      return;
-    }
-    // For button 1, if it was clicked inside the editor
-    // (posFromMouse returning non-null), we have to adjust the
-    // selection.
-    if (!start) {if (e_target(e) == display.scroller) e_preventDefault(e); return;}
-
-    if (!cm.state.focused) onFocus(cm);
-
-    var now = +new Date, type = "single";
-    if (lastDoubleClick && lastDoubleClick.time > now - 400 && posEq(lastDoubleClick.pos, start)) {
-      type = "triple";
-      e_preventDefault(e);
-      setTimeout(bind(focusInput, cm), 20);
-      selectLine(cm, start.line);
-    } else if (lastClick && lastClick.time > now - 400 && posEq(lastClick.pos, start)) {
-      type = "double";
-      lastDoubleClick = {time: now, pos: start};
-      e_preventDefault(e);
-      var word = findWordAt(getLine(doc, start.line).text, start);
-      extendSelection(cm.doc, word.from, word.to);
-    } else { lastClick = {time: now, pos: start}; }
-
-    var last = start;
-    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) && !posEq(sel.from, sel.to) &&
-        !posLess(start, sel.from) && !posLess(sel.to, start) && type == "single") {
-      var dragEnd = operation(cm, function(e2) {
-        if (webkit) display.scroller.draggable = false;
-        cm.state.draggingText = false;
-        off(document, "mouseup", dragEnd);
-        off(display.scroller, "drop", dragEnd);
-        if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
-          e_preventDefault(e2);
-          extendSelection(cm.doc, start);
-          focusInput(cm);
-        }
-      });
-      // Let the drag handler handle this.
-      if (webkit) display.scroller.draggable = true;
-      cm.state.draggingText = dragEnd;
-      // IE's approach to draggable
-      if (display.scroller.dragDrop) display.scroller.dragDrop();
-      on(document, "mouseup", dragEnd);
-      on(display.scroller, "drop", dragEnd);
-      return;
-    }
-    e_preventDefault(e);
-    if (type == "single") extendSelection(cm.doc, clipPos(doc, start));
-
-    var startstart = sel.from, startend = sel.to, lastPos = start;
-
-    function doSelect(cur) {
-      if (posEq(lastPos, cur)) return;
-      lastPos = cur;
-
-      if (type == "single") {
-        extendSelection(cm.doc, clipPos(doc, start), cur);
-        return;
-      }
-
-      startstart = clipPos(doc, startstart);
-      startend = clipPos(doc, startend);
-      if (type == "double") {
-        var word = findWordAt(getLine(doc, cur.line).text, cur);
-        if (posLess(cur, startstart)) extendSelection(cm.doc, word.from, startend);
-        else extendSelection(cm.doc, startstart, word.to);
-      } else if (type == "triple") {
-        if (posLess(cur, startstart)) extendSelection(cm.doc, startend, clipPos(doc, Pos(cur.line, 0)));
-        else extendSelection(cm.doc, startstart, clipPos(doc, Pos(cur.line + 1, 0)));
-      }
-    }
-
-    var editorSize = getRect(display.wrapper);
-    // Used to ensure timeout re-tries don't fire when another extend
-    // happened in the meantime (clearTimeout isn't reliable -- at
-    // least on Chrome, the timeouts still happen even when cleared,
-    // if the clear happens after their scheduled firing time).
-    var counter = 0;
-
-    function extend(e) {
-      var curCount = ++counter;
-      var cur = posFromMouse(cm, e, true);
-      if (!cur) return;
-      if (!posEq(cur, last)) {
-        if (!cm.state.focused) onFocus(cm);
-        last = cur;
-        doSelect(cur);
-        var visible = visibleLines(display, doc);
-        if (cur.line >= visible.to || cur.line < visible.from)
-          setTimeout(operation(cm, function(){if (counter == curCount) extend(e);}), 150);
-      } else {
-        var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0;
-        if (outside) setTimeout(operation(cm, function() {
-          if (counter != curCount) return;
-          display.scroller.scrollTop += outside;
-          extend(e);
-        }), 50);
-      }
-    }
-
-    function done(e) {
-      counter = Infinity;
-      e_preventDefault(e);
-      focusInput(cm);
-      off(document, "mousemove", move);
-      off(document, "mouseup", up);
-    }
-
-    var move = operation(cm, function(e) {
-      if (!ie && !e_button(e)) done(e);
-      else extend(e);
-    });
-    var up = operation(cm, done);
-    on(document, "mousemove", move);
-    on(document, "mouseup", up);
-  }
-
-  function gutterEvent(cm, e, type, prevent, signalfn) {
-    try { var mX = e.clientX, mY = e.clientY; }
-    catch(e) { return false; }
-    if (mX >= Math.floor(getRect(cm.display.gutters).right)) return false;
-    if (prevent) e_preventDefault(e);
-
-    var display = cm.display;
-    var lineBox = getRect(display.lineDiv);
-
-    if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e);
-    mY -= lineBox.top - display.viewOffset;
-
-    for (var i = 0; i < cm.options.gutters.length; ++i) {
-      var g = display.gutters.childNodes[i];
-      if (g && getRect(g).right >= mX) {
-        var line = lineAtHeight(cm.doc, mY);
-        var gutter = cm.options.gutters[i];
-        signalfn(cm, type, cm, line, gutter, e);
-        return e_defaultPrevented(e);
-      }
-    }
-  }
-
-  function contextMenuInGutter(cm, e) {
-    if (!hasHandler(cm, "gutterContextMenu")) return false;
-    return gutterEvent(cm, e, "gutterContextMenu", false, signal);
-  }
-
-  function clickInGutter(cm, e) {
-    return gutterEvent(cm, e, "gutterClick", true, signalLater);
-  }
-
-  // Kludge to work around strange IE behavior where it'll sometimes
-  // re-fire a series of drag-related events right after the drop (#1551)
-  var lastDrop = 0;
-
-  function onDrop(e) {
-    var cm = this;
-    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e) || (cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))))
-      return;
-    e_preventDefault(e);
-    if (ie) lastDrop = +new Date;
-    var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
-    if (!pos || isReadOnly(cm)) return;
-    if (files && files.length && window.FileReader && window.File) {
-      var n = files.length, text = Array(n), read = 0;
-      var loadFile = function(file, i) {
-        var reader = new FileReader;
-        reader.onload = function() {
-          text[i] = reader.result;
-          if (++read == n) {
-            pos = clipPos(cm.doc, pos);
-            makeChange(cm.doc, {from: pos, to: pos, text: splitLines(text.join("\n")), origin: "paste"}, "around");
-          }
-        };
-        reader.readAsText(file);
-      };
-      for (var i = 0; i < n; ++i) loadFile(files[i], i);
-    } else {
-      // Don't do a replace if the drop happened inside of the selected text.
-      if (cm.state.draggingText && !(posLess(pos, cm.doc.sel.from) || posLess(cm.doc.sel.to, pos))) {
-        cm.state.draggingText(e);
-        // Ensure the editor is re-focused
-        setTimeout(bind(focusInput, cm), 20);
-        return;
-      }
-      try {
-        var text = e.dataTransfer.getData("Text");
-        if (text) {
-          var curFrom = cm.doc.sel.from, curTo = cm.doc.sel.to;
-          setSelection(cm.doc, pos, pos);
-          if (cm.state.draggingText) replaceRange(cm.doc, "", curFrom, curTo, "paste");
-          cm.replaceSelection(text, null, "paste");
-          focusInput(cm);
-        }
-      }
-      catch(e){}
-    }
-  }
-
-  function onDragStart(cm, e) {
-    if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
-    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
-
-    var txt = cm.getSelection();
-    e.dataTransfer.setData("Text", txt);
-
-    // Use dummy image instead of default browsers image.
-    // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
-    if (e.dataTransfer.setDragImage && !safari) {
-      var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
-      img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
-      if (opera) {
-        img.width = img.height = 1;
-        cm.display.wrapper.appendChild(img);
-        // Force a relayout, or Opera won't use our image for some obscure reason
-        img._top = img.offsetTop;
-      }
-      e.dataTransfer.setDragImage(img, 0, 0);
-      if (opera) img.parentNode.removeChild(img);
-    }
-  }
-
-  function setScrollTop(cm, val) {
-    if (Math.abs(cm.doc.scrollTop - val) < 2) return;
-    cm.doc.scrollTop = val;
-    if (!gecko) updateDisplay(cm, [], val);
-    if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
-    if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val;
-    if (gecko) updateDisplay(cm, []);
-    startWorker(cm, 100);
-  }
-  function setScrollLeft(cm, val, isScroller) {
-    if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return;
-    val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
-    cm.doc.scrollLeft = val;
-    alignHorizontally(cm);
-    if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val;
-    if (cm.display.scrollbarH.scrollLeft != val) cm.display.scrollbarH.scrollLeft = val;
-  }
-
-  // Since the delta values reported on mouse wheel events are
-  // unstandardized between browsers and even browser versions, and
-  // generally horribly unpredictable, this code starts by measuring
-  // the scroll effect that the first few mouse wheel events have,
-  // and, from that, detects the way it can convert deltas to pixel
-  // offsets afterwards.
-  //
-  // The reason we want to know the amount a wheel event will scroll
-  // is that it gives us a chance to update the display before the
-  // actual scrolling happens, reducing flickering.
-
-  var wheelSamples = 0, wheelPixelsPerUnit = null;
-  // Fill in a browser-detected starting value on browsers where we
-  // know one. These don't have to be accurate -- the result of them
-  // being wrong would just be a slight flicker on the first wheel
-  // scroll (if it is large enough).
-  if (ie) wheelPixelsPerUnit = -.53;
-  else if (gecko) wheelPixelsPerUnit = 15;
-  else if (chrome) wheelPixelsPerUnit = -.7;
-  else if (safari) wheelPixelsPerUnit = -1/3;
-
-  function onScrollWheel(cm, e) {
-    var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
-    if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail;
-    if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail;
-    else if (dy == null) dy = e.wheelDelta;
-
-    var display = cm.display, scroll = display.scroller;
-    // Quit if there's nothing to scroll here
-    if (!(dx && scroll.scrollWidth > scroll.clientWidth ||
-          dy && scroll.scrollHeight > scroll.clientHeight)) return;
-
-    // Webkit browsers on OS X abort momentum scrolls when the target
-    // of the scroll event is removed from the scrollable element.
-    // This hack (see related code in patchDisplay) makes sure the
-    // element is kept around.
-    if (dy && mac && webkit) {
-      for (var cur = e.target; cur != scroll; cur = cur.parentNode) {
-        if (cur.lineObj) {
-          cm.display.currentWheelTarget = cur;
-          break;
-        }
-      }
-    }
-
-    // On some browsers, horizontal scrolling will cause redraws to
-    // happen before the gutter has been realigned, causing it to
-    // wriggle around in a most unseemly way. When we have an
-    // estimated pixels/delta value, we just handle horizontal
-    // scrolling entirely here. It'll be slightly off from native, but
-    // better than glitching out.
-    if (dx && !gecko && !opera && wheelPixelsPerUnit != null) {
-      if (dy)
-        setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
-      setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
-      e_preventDefault(e);
-      display.wheelStartX = null; // Abort measurement, if in progress
-      return;
-    }
-
-    if (dy && wheelPixelsPerUnit != null) {
-      var pixels = dy * wheelPixelsPerUnit;
-      var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
-      if (pixels < 0) top = Math.max(0, top + pixels - 50);
-      else bot = Math.min(cm.doc.height, bot + pixels + 50);
-      updateDisplay(cm, [], {top: top, bottom: bot});
-    }
-
-    if (wheelSamples < 20) {
-      if (display.wheelStartX == null) {
-        display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
-        display.wheelDX = dx; display.wheelDY = dy;
-        setTimeout(function() {
-          if (display.wheelStartX == null) return;
-          var movedX = scroll.scrollLeft - display.wheelStartX;
-          var movedY = scroll.scrollTop - display.wheelStartY;
-          var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
-            (movedX && display.wheelDX && movedX / display.wheelDX);
-          display.wheelStartX = display.wheelStartY = null;
-          if (!sample) return;
-          wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
-          ++wheelSamples;
-        }, 200);
-      } else {
-        display.wheelDX += dx; display.wheelDY += dy;
-      }
-    }
-  }
-
-  function doHandleBinding(cm, bound, dropShift) {
-    if (typeof bound == "string") {
-      bound = commands[bound];
-      if (!bound) return false;
-    }
-    // Ensure previous input has been read, so that the handler sees a
-    // consistent view of the document
-    if (cm.display.pollingFast && readInput(cm)) cm.display.pollingFast = false;
-    var doc = cm.doc, prevShift = doc.sel.shift, done = false;
-    try {
-      if (isReadOnly(cm)) cm.state.suppressEdits = true;
-      if (dropShift) doc.sel.shift = false;
-      done = bound(cm) != Pass;
-    } finally {
-      doc.sel.shift = prevShift;
-      cm.state.suppressEdits = false;
-    }
-    return done;
-  }
-
-  function allKeyMaps(cm) {
-    var maps = cm.state.keyMaps.slice(0);
-    if (cm.options.extraKeys) maps.push(cm.options.extraKeys);
-    maps.push(cm.options.keyMap);
-    return maps;
-  }
-
-  var maybeTransition;
-  function handleKeyBinding(cm, e) {
-    // Handle auto keymap transitions
-    var startMap = getKeyMap(cm.options.keyMap), next = startMap.auto;
-    clearTimeout(maybeTransition);
-    if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {
-      if (getKeyMap(cm.options.keyMap) == startMap) {
-        cm.options.keyMap = (next.call ? next.call(null, cm) : next);
-        keyMapChanged(cm);
-      }
-    }, 50);
-
-    var name = keyName(e, true), handled = false;
-    if (!name) return false;
-    var keymaps = allKeyMaps(cm);
-
-    if (e.shiftKey) {
-      // First try to resolve full name (including 'Shift-'). Failing
-      // that, see if there is a cursor-motion command (starting with
-      // 'go') bound to the keyname without 'Shift-'.
-      handled = lookupKey("Shift-" + name, keymaps, function(b) {return doHandleBinding(cm, b, true);})
-             || lookupKey(name, keymaps, function(b) {
-                  if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
-                    return doHandleBinding(cm, b);
-                });
-    } else {
-      handled = lookupKey(name, keymaps, function(b) { return doHandleBinding(cm, b); });
-    }
-
-    if (handled) {
-      e_preventDefault(e);
-      restartBlink(cm);
-      if (ie_lt9) { e.oldKeyCode = e.keyCode; e.keyCode = 0; }
-      signalLater(cm, "keyHandled", cm, name, e);
-    }
-    return handled;
-  }
-
-  function handleCharBinding(cm, e, ch) {
-    var handled = lookupKey("'" + ch + "'", allKeyMaps(cm),
-                            function(b) { return doHandleBinding(cm, b, true); });
-    if (handled) {
-      e_preventDefault(e);
-      restartBlink(cm);
-      signalLater(cm, "keyHandled", cm, "'" + ch + "'", e);
-    }
-    return handled;
-  }
-
-  var lastStoppedKey = null;
-  function onKeyDown(e) {
-    var cm = this;
-    if (!cm.state.focused) onFocus(cm);
-    if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
-    if (ie && e.keyCode == 27) e.returnValue = false;
-    var code = e.keyCode;
-    // IE does strange things with escape.
-    cm.doc.sel.shift = code == 16 || e.shiftKey;
-    // First give onKeyEvent option a chance to handle this.
-    var handled = handleKeyBinding(cm, e);
-    if (opera) {
-      lastStoppedKey = handled ? code : null;
-      // Opera has no cut event... we try to at least catch the key combo
-      if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
-        cm.replaceSelection("");
-    }
-  }
-
-  function onKeyPress(e) {
-    var cm = this;
-    if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
-    var keyCode = e.keyCode, charCode = e.charCode;
-    if (opera && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
-    if (((opera && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
-    var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
-    if (this.options.electricChars && this.doc.mode.electricChars &&
-        this.options.smartIndent && !isReadOnly(this) &&
-        this.doc.mode.electricChars.indexOf(ch) > -1)
-      setTimeout(operation(cm, function() {indentLine(cm, cm.doc.sel.to.line, "smart");}), 75);
-    if (handleCharBinding(cm, e, ch)) return;
-    if (ie && !ie_lt9) cm.display.inputHasSelection = null;
-    fastPoll(cm);
-  }
-
-  function onFocus(cm) {
-    if (cm.options.readOnly == "nocursor") return;
-    if (!cm.state.focused) {
-      signal(cm, "focus", cm);
-      cm.state.focused = true;
-      if (cm.display.wrapper.className.search(/\bCodeMirror-focused\b/) == -1)
-        cm.display.wrapper.className += " CodeMirror-focused";
-      if (!cm.curOp) {
-        resetInput(cm, true);
-        if (webkit) setTimeout(bind(resetInput, cm, true), 0); // Issue #1730
-      }
-    }
-    slowPoll(cm);
-    restartBlink(cm);
-  }
-  function onBlur(cm) {
-    if (cm.state.focused) {
-      signal(cm, "blur", cm);
-      cm.state.focused = false;
-      cm.display.wrapper.className = cm.display.wrapper.className.replace(" CodeMirror-focused", "");
-    }
-    clearInterval(cm.display.blinker);
-    setTimeout(function() {if (!cm.state.focused) cm.doc.sel.shift = false;}, 150);
-  }
-
-  var detectingSelectAll;
-  function onContextMenu(cm, e) {
-    if (signalDOMEvent(cm, e, "contextmenu")) return;
-    var display = cm.display, sel = cm.doc.sel;
-    if (eventInWidget(display, e) || contextMenuInGutter(cm, e)) return;
-
-    var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
-    if (!pos || opera) return; // Opera is difficult.
-
-    // Reset the current text selection only if the click is done outside of the selection
-    // and 'resetSelectionOnContextMenu' option is true.
-    var reset = cm.options.resetSelectionOnContextMenu;
-    if (reset && (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to)))
-      operation(cm, setSelection)(cm.doc, pos, pos);
-
-    var oldCSS = display.input.style.cssText;
-    display.inputDiv.style.position = "absolute";
-    display.input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
-      "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: white; outline: none;" +
-      "border-width: 0; outline: none; overflow: hidden; opacity: .05; -ms-opacity: .05; filter: alpha(opacity=5);";
-    focusInput(cm);
-    resetInput(cm, true);
-    // Adds "Select all" to context menu in FF
-    if (posEq(sel.from, sel.to)) display.input.value = display.prevInput = " ";
-
-    function prepareSelectAllHack() {
-      if (display.input.selectionStart != null) {
-        var extval = display.input.value = "\u200b" + (posEq(sel.from, sel.to) ? "" : display.input.value);
-        display.prevInput = "\u200b";
-        display.input.selectionStart = 1; display.input.selectionEnd = extval.length;
-      }
-    }
-    function rehide() {
-      display.inputDiv.style.position = "relative";
-      display.input.style.cssText = oldCSS;
-      if (ie_lt9) display.scrollbarV.scrollTop = display.scroller.scrollTop = scrollPos;
-      slowPoll(cm);
-
-      // Try to detect the user choosing select-all
-      if (display.input.selectionStart != null) {
-        if (!ie || ie_lt9) prepareSelectAllHack();
-        clearTimeout(detectingSelectAll);
-        var i = 0, poll = function(){
-          if (display.prevInput == " " && display.input.selectionStart == 0)
-            operation(cm, commands.selectAll)(cm);
-          else if (i++ < 10) detectingSelectAll = setTimeout(poll, 500);
-          else resetInput(cm);
-        };
-        detectingSelectAll = setTimeout(poll, 200);
-      }
-    }
-
-    if (ie && !ie_lt9) prepareSelectAllHack();
-    if (captureMiddleClick) {
-      e_stop(e);
-      var mouseup = function() {
-        off(window, "mouseup", mouseup);
-        setTimeout(rehide, 20);
-      };
-      on(window, "mouseup", mouseup);
-    } else {
-      setTimeout(rehide, 50);
-    }
-  }
-
-  // UPDATING
-
-  var changeEnd = CodeMirror.changeEnd = function(change) {
-    if (!change.text) return change.to;
-    return Pos(change.from.line + change.text.length - 1,
-               lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0));
-  };
-
-  // Make sure a position will be valid after the given change.
-  function clipPostChange(doc, change, pos) {
-    if (!posLess(change.from, pos)) return clipPos(doc, pos);
-    var diff = (change.text.length - 1) - (change.to.line - change.from.line);
-    if (pos.line > change.to.line + diff) {
-      var preLine = pos.line - diff, lastLine = doc.first + doc.size - 1;
-      if (preLine > lastLine) return Pos(lastLine, getLine(doc, lastLine).text.length);
-      return clipToLen(pos, getLine(doc, preLine).text.length);
-    }
-    if (pos.line == change.to.line + diff)
-      return clipToLen(pos, lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0) +
-                       getLine(doc, change.to.line).text.length - change.to.ch);
-    var inside = pos.line - change.from.line;
-    return clipToLen(pos, change.text[inside].length + (inside ? 0 : change.from.ch));
-  }
-
-  // Hint can be null|"end"|"start"|"around"|{anchor,head}
-  function computeSelAfterChange(doc, change, hint) {
-    if (hint && typeof hint == "object") // Assumed to be {anchor, head} object
-      return {anchor: clipPostChange(doc, change, hint.anchor),
-              head: clipPostChange(doc, change, hint.head)};
-
-    if (hint == "start") return {anchor: change.from, head: change.from};
-
-    var end = changeEnd(change);
-    if (hint == "around") return {anchor: change.from, head: end};
-    if (hint == "end") return {anchor: end, head: end};
-
-    // hint is null, leave the selection alone as much as possible
-    var adjustPos = function(pos) {
-      if (posLess(pos, change.from)) return pos;
-      if (!posLess(change.to, pos)) return end;
-
-      var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
-      if (pos.line == change.to.line) ch += end.ch - change.to.ch;
-      return Pos(line, ch);
-    };
-    return {anchor: adjustPos(doc.sel.anchor), head: adjustPos(doc.sel.head)};
-  }
-
-  function filterChange(doc, change, update) {
-    var obj = {
-      canceled: false,
-      from: change.from,
-      to: change.to,
-      text: change.text,
-      origin: change.origin,
-      cancel: function() { this.canceled = true; }
-    };
-    if (update) obj.update = function(from, to, text, origin) {
-      if (from) this.from = clipPos(doc, from);
-      if (to) this.to = clipPos(doc, to);
-      if (text) this.text = text;
-      if (origin !== undefined) this.origin = origin;
-    };
-    signal(doc, "beforeChange", doc, obj);
-    if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj);
-
-    if (obj.canceled) return null;
-    return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin};
-  }
-
-  // Replace the range from from to to by the strings in replacement.
-  // change is a {from, to, text [, origin]} object
-  function makeChange(doc, change, selUpdate, ignoreReadOnly) {
-    if (doc.cm) {
-      if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, selUpdate, ignoreReadOnly);
-      if (doc.cm.state.suppressEdits) return;
-    }
-
-    if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
-      change = filterChange(doc, change, true);
-      if (!change) return;
-    }
-
-    // Possibly split or suppress the update based on the presence
-    // of read-only spans in its range.
-    var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
-    if (split) {
-      for (var i = split.length - 1; i >= 1; --i)
-        makeChangeNoReadonly(doc, {from: split[i].from, to: split[i].to, text: [""]});
-      if (split.length)
-        makeChangeNoReadonly(doc, {from: split[0].from, to: split[0].to, text: change.text}, selUpdate);
-    } else {
-      makeChangeNoReadonly(doc, change, selUpdate);
-    }
-  }
-
-  function makeChangeNoReadonly(doc, change, selUpdate) {
-    if (change.text.length == 1 && change.text[0] == "" && posEq(change.from, change.to)) return;
-    var selAfter = computeSelAfterChange(doc, change, selUpdate);
-    addToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
-
-    makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
-    var rebased = [];
-
-    linkedDocs(doc, function(doc, sharedHist) {
-      if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-        rebaseHist(doc.history, change);
-        rebased.push(doc.history);
-      }
-      makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change));
-    });
-  }
-
-  function makeChangeFromHistory(doc, type) {
-    if (doc.cm && doc.cm.state.suppressEdits) return;
-
-    var hist = doc.history;
-    var event = (type == "undo" ? hist.done : hist.undone).pop();
-    if (!event) return;
-
-    var anti = {changes: [], anchorBefore: event.anchorAfter, headBefore: event.headAfter,
-                anchorAfter: event.anchorBefore, headAfter: event.headBefore,
-                generation: hist.generation};
-    (type == "undo" ? hist.undone : hist.done).push(anti);
-    hist.generation = event.generation || ++hist.maxGeneration;
-
-    var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
-
-    for (var i = event.changes.length - 1; i >= 0; --i) {
-      var change = event.changes[i];
-      change.origin = type;
-      if (filter && !filterChange(doc, change, false)) {
-        (type == "undo" ? hist.done : hist.undone).length = 0;
-        return;
-      }
-
-      anti.changes.push(historyChangeFromChange(doc, change));
-
-      var after = i ? computeSelAfterChange(doc, change, null)
-                    : {anchor: event.anchorBefore, head: event.headBefore};
-      makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
-      var rebased = [];
-
-      linkedDocs(doc, function(doc, sharedHist) {
-        if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-          rebaseHist(doc.history, change);
-          rebased.push(doc.history);
-        }
-        makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change));
-      });
-    }
-  }
-
-  function shiftDoc(doc, distance) {
-    function shiftPos(pos) {return Pos(pos.line + distance, pos.ch);}
-    doc.first += distance;
-    if (doc.cm) regChange(doc.cm, doc.first, doc.first, distance);
-    doc.sel.head = shiftPos(doc.sel.head); doc.sel.anchor = shiftPos(doc.sel.anchor);
-    doc.sel.from = shiftPos(doc.sel.from); doc.sel.to = shiftPos(doc.sel.to);
-  }
-
-  function makeChangeSingleDoc(doc, change, selAfter, spans) {
-    if (doc.cm && !doc.cm.curOp)
-      return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans);
-
-    if (change.to.line < doc.first) {
-      shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line));
-      return;
-    }
-    if (change.from.line > doc.lastLine()) return;
-
-    // Clip the change to the size of this doc
-    if (change.from.line < doc.first) {
-      var shift = change.text.length - 1 - (doc.first - change.from.line);
-      shiftDoc(doc, shift);
-      change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
-                text: [lst(change.text)], origin: change.origin};
-    }
-    var last = doc.lastLine();
-    if (change.to.line > last) {
-      change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
-                text: [change.text[0]], origin: change.origin};
-    }
-
-    change.removed = getBetween(doc, change.from, change.to);
-
-    if (!selAfter) selAfter = computeSelAfterChange(doc, change, null);
-    if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans, selAfter);
-    else updateDoc(doc, change, spans, selAfter);
-  }
-
-  function makeChangeSingleDocInEditor(cm, change, spans, selAfter) {
-    var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
-
-    var recomputeMaxLength = false, checkWidthStart = from.line;
-    if (!cm.options.lineWrapping) {
-      checkWidthStart = lineNo(visualLine(doc, getLine(doc, from.line)));
-      doc.iter(checkWidthStart, to.line + 1, function(line) {
-        if (line == display.maxLine) {
-          recomputeMaxLength = true;
-          return true;
-        }
-      });
-    }
-
-    if (!posLess(doc.sel.head, change.from) && !posLess(change.to, doc.sel.head))
-      cm.curOp.cursorActivity = true;
-
-    updateDoc(doc, change, spans, selAfter, estimateHeight(cm));
-
-    if (!cm.options.lineWrapping) {
-      doc.iter(checkWidthStart, from.line + change.text.length, function(line) {
-        var len = lineLength(doc, line);
-        if (len > display.maxLineLength) {
-          display.maxLine = line;
-          display.maxLineLength = len;
-          display.maxLineChanged = true;
-          recomputeMaxLength = false;
-        }
-      });
-      if (recomputeMaxLength) cm.curOp.updateMaxLine = true;
-    }
-
-    // Adjust frontier, schedule worker
-    doc.frontier = Math.min(doc.frontier, from.line);
-    startWorker(cm, 400);
-
-    var lendiff = change.text.length - (to.line - from.line) - 1;
-    // Remember that these lines changed, for updating the display
-    regChange(cm, from.line, to.line + 1, lendiff);
-
-    if (hasHandler(cm, "change")) {
-      var changeObj = {from: from, to: to,
-                       text: change.text,
-                       removed: change.removed,
-                       origin: change.origin};
-      if (cm.curOp.textChanged) {
-        for (var cur = cm.curOp.textChanged; cur.next; cur = cur.next) {}
-        cur.next = changeObj;
-      } else cm.curOp.textChanged = changeObj;
-    }
-  }
-
-  function replaceRange(doc, code, from, to, origin) {
-    if (!to) to = from;
-    if (posLess(to, from)) { var tmp = to; to = from; from = tmp; }
-    if (typeof code == "string") code = splitLines(code);
-    makeChange(doc, {from: from, to: to, text: code, origin: origin}, null);
-  }
-
-  // POSITION OBJECT
-
-  function Pos(line, ch) {
-    if (!(this instanceof Pos)) return new Pos(line, ch);
-    this.line = line; this.ch = ch;
-  }
-  CodeMirror.Pos = Pos;
-
-  function posEq(a, b) {return a.line == b.line && a.ch == b.ch;}
-  function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);}
-  function copyPos(x) {return Pos(x.line, x.ch);}
-
-  // SELECTION
-
-  function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1));}
-  function clipPos(doc, pos) {
-    if (pos.line < doc.first) return Pos(doc.first, 0);
-    var last = doc.first + doc.size - 1;
-    if (pos.line > last) return Pos(last, getLine(doc, last).text.length);
-    return clipToLen(pos, getLine(doc, pos.line).text.length);
-  }
-  function clipToLen(pos, linelen) {
-    var ch = pos.ch;
-    if (ch == null || ch > linelen) return Pos(pos.line, linelen);
-    else if (ch < 0) return Pos(pos.line, 0);
-    else return pos;
-  }
-  function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;}
-
-  // If shift is held, this will move the selection anchor. Otherwise,
-  // it'll set the whole selection.
-  function extendSelection(doc, pos, other, bias) {
-    if (doc.sel.shift || doc.sel.extend) {
-      var anchor = doc.sel.anchor;
-      if (other) {
-        var posBefore = posLess(pos, anchor);
-        if (posBefore != posLess(other, anchor)) {
-          anchor = pos;
-          pos = other;
-        } else if (posBefore != posLess(pos, other)) {
-          pos = other;
-        }
-      }
-      setSelection(doc, anchor, pos, bias);
-    } else {
-      setSelection(doc, pos, other || pos, bias);
-    }
-    if (doc.cm) doc.cm.curOp.userSelChange = true;
-  }
-
-  function filterSelectionChange(doc, anchor, head) {
-    var obj = {anchor: anchor, head: head};
-    signal(doc, "beforeSelectionChange", doc, obj);
-    if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
-    obj.anchor = clipPos(doc, obj.anchor); obj.head = clipPos(doc, obj.head);
-    return obj;
-  }
-
-  // Update the selection. Last two args are only used by
-  // updateDoc, since they have to be expressed in the line
-  // numbers before the update.
-  function setSelection(doc, anchor, head, bias, checkAtomic) {
-    if (!checkAtomic && hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange")) {
-      var filtered = filterSelectionChange(doc, anchor, head);
-      head = filtered.head;
-      anchor = filtered.anchor;
-    }
-
-    var sel = doc.sel;
-    sel.goalColumn = null;
-    if (bias == null) bias = posLess(head, sel.head) ? -1 : 1;
-    // Skip over atomic spans.
-    if (checkAtomic || !posEq(anchor, sel.anchor))
-      anchor = skipAtomic(doc, anchor, bias, checkAtomic != "push");
-    if (checkAtomic || !posEq(head, sel.head))
-      head = skipAtomic(doc, head, bias, checkAtomic != "push");
-
-    if (posEq(sel.anchor, anchor) && posEq(sel.head, head)) return;
-
-    sel.anchor = anchor; sel.head = head;
-    var inv = posLess(head, anchor);
-    sel.from = inv ? head : anchor;
-    sel.to = inv ? anchor : head;
-
-    if (doc.cm)
-      doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged =
-        doc.cm.curOp.cursorActivity = true;
-
-    signalLater(doc, "cursorActivity", doc);
-  }
-
-  function reCheckSelection(cm) {
-    setSelection(cm.doc, cm.doc.sel.from, cm.doc.sel.to, null, "push");
-  }
-
-  function skipAtomic(doc, pos, bias, mayClear) {
-    var flipped = false, curPos = pos;
-    var dir = bias || 1;
-    doc.cantEdit = false;
-    search: for (;;) {
-      var line = getLine(doc, curPos.line);
-      if (line.markedSpans) {
-        for (var i = 0; i < line.markedSpans.length; ++i) {
-          var sp = line.markedSpans[i], m = sp.marker;
-          if ((sp.from == null || (m.inclusiveLeft ? sp.from <= curPos.ch : sp.from < curPos.ch)) &&
-              (sp.to == null || (m.inclusiveRight ? sp.to >= curPos.ch : sp.to > curPos.ch))) {
-            if (mayClear) {
-              signal(m, "beforeCursorEnter");
-              if (m.explicitlyCleared) {
-                if (!line.markedSpans) break;
-                else {--i; continue;}
-              }
-            }
-            if (!m.atomic) continue;
-            var newPos = m.find()[dir < 0 ? "from" : "to"];
-            if (posEq(newPos, curPos)) {
-              newPos.ch += dir;
-              if (newPos.ch < 0) {
-                if (newPos.line > doc.first) newPos = clipPos(doc, Pos(newPos.line - 1));
-                else newPos = null;
-              } else if (newPos.ch > line.text.length) {
-                if (newPos.line < doc.first + doc.size - 1) newPos = Pos(newPos.line + 1, 0);
-                else newPos = null;
-              }
-              if (!newPos) {
-                if (flipped) {
-                  // Driven in a corner -- no valid cursor position found at all
-                  // -- try again *with* clearing, if we didn't already
-                  if (!mayClear) return skipAtomic(doc, pos, bias, true);
-                  // Otherwise, turn off editing until further notice, and return the start of the doc
-                  doc.cantEdit = true;
-                  return Pos(doc.first, 0);
-                }
-                flipped = true; newPos = pos; dir = -dir;
-              }
-            }
-            curPos = newPos;
-            continue search;
-          }
-        }
-      }
-      return curPos;
-    }
-  }
-
-  // SCROLLING
-
-  function scrollCursorIntoView(cm) {
-    var coords = scrollPosIntoView(cm, cm.doc.sel.head, null, cm.options.cursorScrollMargin);
-    if (!cm.state.focused) return;
-    var display = cm.display, box = getRect(display.sizer), doScroll = null;
-    if (coords.top + box.top < 0) doScroll = true;
-    else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
-    if (doScroll != null && !phantom) {
-      var hidden = display.cursor.style.display == "none";
-      if (hidden) {
-        display.cursor.style.display = "";
-        display.cursor.style.left = coords.left + "px";
-        display.cursor.style.top = (coords.top - display.viewOffset) + "px";
-      }
-      display.cursor.scrollIntoView(doScroll);
-      if (hidden) display.cursor.style.display = "none";
-    }
-  }
-
-  function scrollPosIntoView(cm, pos, end, margin) {
-    if (margin == null) margin = 0;
-    for (;;) {
-      var changed = false, coords = cursorCoords(cm, pos);
-      var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
-      var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
-                                         Math.min(coords.top, endCoords.top) - margin,
-                                         Math.max(coords.left, endCoords.left),
-                                         Math.max(coords.bottom, endCoords.bottom) + margin);
-      var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
-      if (scrollPos.scrollTop != null) {
-        setScrollTop(cm, scrollPos.scrollTop);
-        if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true;
-      }
-      if (scrollPos.scrollLeft != null) {
-        setScrollLeft(cm, scrollPos.scrollLeft);
-        if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true;
-      }
-      if (!changed) return coords;
-    }
-  }
-
-  function scrollIntoView(cm, x1, y1, x2, y2) {
-    var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2);
-    if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop);
-    if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft);
-  }
-
-  function calculateScrollPos(cm, x1, y1, x2, y2) {
-    var display = cm.display, snapMargin = textHeight(cm.display);
-    if (y1 < 0) y1 = 0;
-    var screen = display.scroller.clientHeight - scrollerCutOff, screentop = display.scroller.scrollTop, result = {};
-    var docBottom = cm.doc.height + paddingVert(display);
-    var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
-    if (y1 < screentop) {
-      result.scrollTop = atTop ? 0 : y1;
-    } else if (y2 > screentop + screen) {
-      var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen);
-      if (newTop != screentop) result.scrollTop = newTop;
-    }
-
-    var screenw = display.scroller.clientWidth - scrollerCutOff, screenleft = display.scroller.scrollLeft;
-    x1 += display.gutters.offsetWidth; x2 += display.gutters.offsetWidth;
-    var gutterw = display.gutters.offsetWidth;
-    var atLeft = x1 < gutterw + 10;
-    if (x1 < screenleft + gutterw || atLeft) {
-      if (atLeft) x1 = 0;
-      result.scrollLeft = Math.max(0, x1 - 10 - gutterw);
-    } else if (x2 > screenw + screenleft - 3) {
-      result.scrollLeft = x2 + 10 - screenw;
-    }
-    return result;
-  }
-
-  function updateScrollPos(cm, left, top) {
-    cm.curOp.updateScrollPos = {scrollLeft: left == null ? cm.doc.scrollLeft : left,
-                                scrollTop: top == null ? cm.doc.scrollTop : top};
-  }
-
-  function addToScrollPos(cm, left, top) {
-    var pos = cm.curOp.updateScrollPos || (cm.curOp.updateScrollPos = {scrollLeft: cm.doc.scrollLeft, scrollTop: cm.doc.scrollTop});
-    var scroll = cm.display.scroller;
-    pos.scrollTop = Math.max(0, Math.min(scroll.scrollHeight - scroll.clientHeight, pos.scrollTop + top));
-    pos.scrollLeft = Math.max(0, Math.min(scroll.scrollWidth - scroll.clientWidth, pos.scrollLeft + left));
-  }
-
-  // API UTILITIES
-
-  function indentLine(cm, n, how, aggressive) {
-    var doc = cm.doc;
-    if (how == null) how = "add";
-    if (how == "smart") {
-      if (!cm.doc.mode.indent) how = "prev";
-      else var state = getStateBefore(cm, n);
-    }
-
-    var tabSize = cm.options.tabSize;
-    var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
-    var curSpaceString = line.text.match(/^\s*/)[0], indentation;
-    if (how == "smart") {
-      indentation = cm.doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
-      if (indentation == Pass) {
-        if (!aggressive) return;
-        how = "prev";
-      }
-    }
-    if (how == "prev") {
-      if (n > doc.first) indentation = countColumn(getLine(doc, n-1).text, null, tabSize);
-      else indentation = 0;
-    } else if (how == "add") {
-      indentation = curSpace + cm.options.indentUnit;
-    } else if (how == "subtract") {
-      indentation = curSpace - cm.options.indentUnit;
-    } else if (typeof how == "number") {
-      indentation = curSpace + how;
-    }
-    indentation = Math.max(0, indentation);
-
-    var indentString = "", pos = 0;
-    if (cm.options.indentWithTabs)
-      for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
-    if (pos < indentation) indentString += spaceStr(indentation - pos);
-
-    if (indentString != curSpaceString)
-      replaceRange(cm.doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
-    else if (doc.sel.head.line == n && doc.sel.head.ch < curSpaceString.length)
-      setSelection(doc, Pos(n, curSpaceString.length), Pos(n, curSpaceString.length), 1);
-    line.stateAfter = null;
-  }
-
-  function changeLine(cm, handle, op) {
-    var no = handle, line = handle, doc = cm.doc;
-    if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
-    else no = lineNo(handle);
-    if (no == null) return null;
-    if (op(line, no)) regChange(cm, no, no + 1);
-    else return null;
-    return line;
-  }
-
-  function findPosH(doc, pos, dir, unit, visually) {
-    var line = pos.line, ch = pos.ch, origDir = dir;
-    var lineObj = getLine(doc, line);
-    var possible = true;
-    function findNextLine() {
-      var l = line + dir;
-      if (l < doc.first || l >= doc.first + doc.size) return (possible = false);
-      line = l;
-      return lineObj = getLine(doc, l);
-    }
-    function moveOnce(boundToLine) {
-      var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true);
-      if (next == null) {
-        if (!boundToLine && findNextLine()) {
-          if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
-          else ch = dir < 0 ? lineObj.text.length : 0;
-        } else return (possible = false);
-      } else ch = next;
-      return true;
-    }
-
-    if (unit == "char") moveOnce();
-    else if (unit == "column") moveOnce(true);
-    else if (unit == "word" || unit == "group") {
-      var sawType = null, group = unit == "group";
-      for (var first = true;; first = false) {
-        if (dir < 0 && !moveOnce(!first)) break;
-        var cur = lineObj.text.charAt(ch) || "\n";
-        var type = isWordChar(cur) ? "w"
-          : !group ? null
-          : /\s/.test(cur) ? null
-          : "p";
-        if (sawType && sawType != type) {
-          if (dir < 0) {dir = 1; moveOnce();}
-          break;
-        }
-        if (type) sawType = type;
-        if (dir > 0 && !moveOnce(!first)) break;
-      }
-    }
-    var result = skipAtomic(doc, Pos(line, ch), origDir, true);
-    if (!possible) result.hitSide = true;
-    return result;
-  }
-
-  function findPosV(cm, pos, dir, unit) {
-    var doc = cm.doc, x = pos.left, y;
-    if (unit == "page") {
-      var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);
-      y = pos.top + dir * (pageSize - (dir < 0 ? 1.5 : .5) * textHeight(cm.display));
-    } else if (unit == "line") {
-      y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
-    }
-    for (;;) {
-      var target = coordsChar(cm, x, y);
-      if (!target.outside) break;
-      if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; }
-      y += dir * 5;
-    }
-    return target;
-  }
-
-  function findWordAt(line, pos) {
-    var start = pos.ch, end = pos.ch;
-    if (line) {
-      if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
-      var startChar = line.charAt(start);
-      var check = isWordChar(startChar) ? isWordChar
-        : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
-        : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
-      while (start > 0 && check(line.charAt(start - 1))) --start;
-      while (end < line.length && check(line.charAt(end))) ++end;
-    }
-    return {from: Pos(pos.line, start), to: Pos(pos.line, end)};
-  }
-
-  function selectLine(cm, line) {
-    extendSelection(cm.doc, Pos(line, 0), clipPos(cm.doc, Pos(line + 1, 0)));
-  }
-
-  // PROTOTYPE
-
-  // The publicly visible API. Note that operation(null, f) means
-  // 'wrap f in an operation, performed on its `this` parameter'
-
-  CodeMirror.prototype = {
-    constructor: CodeMirror,
-    focus: function(){window.focus(); focusInput(this); fastPoll(this);},
-
-    setOption: function(option, value) {
-      var options = this.options, old = options[option];
-      if (options[option] == value && option != "mode") return;
-      options[option] = value;
-      if (optionHandlers.hasOwnProperty(option))
-        operation(this, optionHandlers[option])(this, value, old);
-    },
-
-    getOption: function(option) {return this.options[option];},
-    getDoc: function() {return this.doc;},
-
-    addKeyMap: function(map, bottom) {
-      this.state.keyMaps[bottom ? "push" : "unshift"](map);
-    },
-    removeKeyMap: function(map) {
-      var maps = this.state.keyMaps;
-      for (var i = 0; i < maps.length; ++i)
-        if (maps[i] == map || (typeof maps[i] != "string" && maps[i].name == map)) {
-          maps.splice(i, 1);
-          return true;
-        }
-    },
-
-    addOverlay: operation(null, function(spec, options) {
-      var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
-      if (mode.startState) throw new Error("Overlays may not be stateful.");
-      this.state.overlays.push({mode: mode, modeSpec: spec, opaque: options && options.opaque});
-      this.state.modeGen++;
-      regChange(this);
-    }),
-    removeOverlay: operation(null, function(spec) {
-      var overlays = this.state.overlays;
-      for (var i = 0; i < overlays.length; ++i) {
-        var cur = overlays[i].modeSpec;
-        if (cur == spec || typeof spec == "string" && cur.name == spec) {
-          overlays.splice(i, 1);
-          this.state.modeGen++;
-          regChange(this);
-          return;
-        }
-      }
-    }),
-
-    indentLine: operation(null, function(n, dir, aggressive) {
-      if (typeof dir != "string" && typeof dir != "number") {
-        if (dir == null) dir = this.options.smartIndent ? "smart" : "prev";
-        else dir = dir ? "add" : "subtract";
-      }
-      if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive);
-    }),
-    indentSelection: operation(null, function(how) {
-      var sel = this.doc.sel;
-      if (posEq(sel.from, sel.to)) return indentLine(this, sel.from.line, how);
-      var e = sel.to.line - (sel.to.ch ? 0 : 1);
-      for (var i = sel.from.line; i <= e; ++i) indentLine(this, i, how);
-    }),
-
-    // Fetch the parser token for a given character. Useful for hacks
-    // that want to inspect the mode state (say, for completion).
-    getTokenAt: function(pos, precise) {
-      var doc = this.doc;
-      pos = clipPos(doc, pos);
-      var state = getStateBefore(this, pos.line, precise), mode = this.doc.mode;
-      var line = getLine(doc, pos.line);
-      var stream = new StringStream(line.text, this.options.tabSize);
-      while (stream.pos < pos.ch && !stream.eol()) {
-        stream.start = stream.pos;
-        var style = mode.token(stream, state);
-      }
-      return {start: stream.start,
-              end: stream.pos,
-              string: stream.current(),
-              className: style || null, // Deprecated, use 'type' instead
-              type: style || null,
-              state: state};
-    },
-
-    getTokenTypeAt: function(pos) {
-      pos = clipPos(this.doc, pos);
-      var styles = getLineStyles(this, getLine(this.doc, pos.line));
-      var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
-      if (ch == 0) return styles[2];
-      for (;;) {
-        var mid = (before + after) >> 1;
-        if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;
-        else if (styles[mid * 2 + 1] < ch) before = mid + 1;
-        else return styles[mid * 2 + 2];
-      }
-    },
-
-    getModeAt: function(pos) {
-      var mode = this.doc.mode;
-      if (!mode.innerMode) return mode;
-      return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode;
-    },
-
-    getHelper: function(pos, type) {
-      if (!helpers.hasOwnProperty(type)) return;
-      var help = helpers[type], mode = this.getModeAt(pos);
-      return mode[type] && help[mode[type]] ||
-        mode.helperType && help[mode.helperType] ||
-        help[mode.name];
-    },
-
-    getStateAfter: function(line, precise) {
-      var doc = this.doc;
-      line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
-      return getStateBefore(this, line + 1, precise);
-    },
-
-    cursorCoords: function(start, mode) {
-      var pos, sel = this.doc.sel;
-      if (start == null) pos = sel.head;
-      else if (typeof start == "object") pos = clipPos(this.doc, start);
-      else pos = start ? sel.from : sel.to;
-      return cursorCoords(this, pos, mode || "page");
-    },
-
-    charCoords: function(pos, mode) {
-      return charCoords(this, clipPos(this.doc, pos), mode || "page");
-    },
-
-    coordsChar: function(coords, mode) {
-      coords = fromCoordSystem(this, coords, mode || "page");
-      return coordsChar(this, coords.left, coords.top);
-    },
-
-    lineAtHeight: function(height, mode) {
-      height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
-      return lineAtHeight(this.doc, height + this.display.viewOffset);
-    },
-    heightAtLine: function(line, mode) {
-      var end = false, last = this.doc.first + this.doc.size - 1;
-      if (line < this.doc.first) line = this.doc.first;
-      else if (line > last) { line = last; end = true; }
-      var lineObj = getLine(this.doc, line);
-      return intoCoordSystem(this, getLine(this.doc, line), {top: 0, left: 0}, mode || "page").top +
-        (end ? lineObj.height : 0);
-    },
-
-    defaultTextHeight: function() { return textHeight(this.display); },
-    defaultCharWidth: function() { return charWidth(this.display); },
-
-    setGutterMarker: operation(null, function(line, gutterID, value) {
-      return changeLine(this, line, function(line) {
-        var markers = line.gutterMarkers || (line.gutterMarkers = {});
-        markers[gutterID] = value;
-        if (!value && isEmpty(markers)) line.gutterMarkers = null;
-        return true;
-      });
-    }),
-
-    clearGutter: operation(null, function(gutterID) {
-      var cm = this, doc = cm.doc, i = doc.first;
-      doc.iter(function(line) {
-        if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
-          line.gutterMarkers[gutterID] = null;
-          regChange(cm, i, i + 1);
-          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null;
-        }
-        ++i;
-      });
-    }),
-
-    addLineClass: operation(null, function(handle, where, cls) {
-      return changeLine(this, handle, function(line) {
-        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
-        if (!line[prop]) line[prop] = cls;
-        else if (new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)").test(line[prop])) return false;
-        else line[prop] += " " + cls;
-        return true;
-      });
-    }),
-
-    removeLineClass: operation(null, function(handle, where, cls) {
-      return changeLine(this, handle, function(line) {
-        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
-        var cur = line[prop];
-        if (!cur) return false;
-        else if (cls == null) line[prop] = null;
-        else {
-          var found = cur.match(new RegExp("(?:^|\\s+)" + cls + "(?:$|\\s+)"));
-          if (!found) return false;
-          var end = found.index + found[0].length;
-          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
-        }
-        return true;
-      });
-    }),
-
-    addLineWidget: operation(null, function(handle, node, options) {
-      return addLineWidget(this, handle, node, options);
-    }),
-
-    removeLineWidget: function(widget) { widget.clear(); },
-
-    lineInfo: function(line) {
-      if (typeof line == "number") {
-        if (!isLine(this.doc, line)) return null;
-        var n = line;
-        line = getLine(this.doc, line);
-        if (!line) return null;
-      } else {
-        var n = lineNo(line);
-        if (n == null) return null;
-      }
-      return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
-              textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
-              widgets: line.widgets};
-    },
-
-    getViewport: function() { return {from: this.display.showingFrom, to: this.display.showingTo};},
-
-    addWidget: function(pos, node, scroll, vert, horiz) {
-      var display = this.display;
-      pos = cursorCoords(this, clipPos(this.doc, pos));
-      var top = pos.bottom, left = pos.left;
-      node.style.position = "absolute";
-      display.sizer.appendChild(node);
-      if (vert == "over") {
-        top = pos.top;
-      } else if (vert == "above" || vert == "near") {
-        var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
-        hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth);
-        // Default to positioning above (if specified and possible); otherwise default to positioning below
-        if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
-          top = pos.top - node.offsetHeight;
-        else if (pos.bottom + node.offsetHeight <= vspace)
-          top = pos.bottom;
-        if (left + node.offsetWidth > hspace)
-          left = hspace - node.offsetWidth;
-      }
-      node.style.top = top + "px";
-      node.style.left = node.style.right = "";
-      if (horiz == "right") {
-        left = display.sizer.clientWidth - node.offsetWidth;
-        node.style.right = "0px";
-      } else {
-        if (horiz == "left") left = 0;
-        else if (horiz == "middle") left = (display.sizer.clientWidth - node.offsetWidth) / 2;
-        node.style.left = left + "px";
-      }
-      if (scroll)
-        scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight);
-    },
-
-    triggerOnKeyDown: operation(null, onKeyDown),
-
-    execCommand: function(cmd) {return commands[cmd](this);},
-
-    findPosH: function(from, amount, unit, visually) {
-      var dir = 1;
-      if (amount < 0) { dir = -1; amount = -amount; }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        cur = findPosH(this.doc, cur, dir, unit, visually);
-        if (cur.hitSide) break;
-      }
-      return cur;
-    },
-
-    moveH: operation(null, function(dir, unit) {
-      var sel = this.doc.sel, pos;
-      if (sel.shift || sel.extend || posEq(sel.from, sel.to))
-        pos = findPosH(this.doc, sel.head, dir, unit, this.options.rtlMoveVisually);
-      else
-        pos = dir < 0 ? sel.from : sel.to;
-      extendSelection(this.doc, pos, pos, dir);
-    }),
-
-    deleteH: operation(null, function(dir, unit) {
-      var sel = this.doc.sel;
-      if (!posEq(sel.from, sel.to)) replaceRange(this.doc, "", sel.from, sel.to, "+delete");
-      else replaceRange(this.doc, "", sel.from, findPosH(this.doc, sel.head, dir, unit, false), "+delete");
-      this.curOp.userSelChange = true;
-    }),
-
-    findPosV: function(from, amount, unit, goalColumn) {
-      var dir = 1, x = goalColumn;
-      if (amount < 0) { dir = -1; amount = -amount; }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        var coords = cursorCoords(this, cur, "div");
-        if (x == null) x = coords.left;
-        else coords.left = x;
-        cur = findPosV(this, coords, dir, unit);
-        if (cur.hitSide) break;
-      }
-      return cur;
-    },
-
-    moveV: operation(null, function(dir, unit) {
-      var sel = this.doc.sel;
-      var pos = cursorCoords(this, sel.head, "div");
-      if (sel.goalColumn != null) pos.left = sel.goalColumn;
-      var target = findPosV(this, pos, dir, unit);
-
-      if (unit == "page") addToScrollPos(this, 0, charCoords(this, target, "div").top - pos.top);
-      extendSelection(this.doc, target, target, dir);
-      sel.goalColumn = pos.left;
-    }),
-
-    toggleOverwrite: function(value) {
-      if (value != null && value == this.state.overwrite) return;
-      if (this.state.overwrite = !this.state.overwrite)
-        this.display.cursor.className += " CodeMirror-overwrite";
-      else
-        this.display.cursor.className = this.display.cursor.className.replace(" CodeMirror-overwrite", "");
-    },
-    hasFocus: function() { return this.state.focused; },
-
-    scrollTo: operation(null, function(x, y) {
-      updateScrollPos(this, x, y);
-    }),
-    getScrollInfo: function() {
-      var scroller = this.display.scroller, co = scrollerCutOff;
-      return {left: scroller.scrollLeft, top: scroller.scrollTop,
-              height: scroller.scrollHeight - co, width: scroller.scrollWidth - co,
-              clientHeight: scroller.clientHeight - co, clientWidth: scroller.clientWidth - co};
-    },
-
-    scrollIntoView: operation(null, function(range, margin) {
-      if (range == null) range = {from: this.doc.sel.head, to: null};
-      else if (typeof range == "number") range = {from: Pos(range, 0), to: null};
-      else if (range.from == null) range = {from: range, to: null};
-      if (!range.to) range.to = range.from;
-      if (!margin) margin = 0;
-
-      var coords = range;
-      if (range.from.line != null) {
-        this.curOp.scrollToPos = {from: range.from, to: range.to, margin: margin};
-        coords = {from: cursorCoords(this, range.from),
-                  to: cursorCoords(this, range.to)};
-      }
-      var sPos = calculateScrollPos(this, Math.min(coords.from.left, coords.to.left),
-                                    Math.min(coords.from.top, coords.to.top) - margin,
-                                    Math.max(coords.from.right, coords.to.right),
-                                    Math.max(coords.from.bottom, coords.to.bottom) + margin);
-      updateScrollPos(this, sPos.scrollLeft, sPos.scrollTop);
-    }),
-
-    setSize: operation(null, function(width, height) {
-      function interpret(val) {
-        return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
-      }
-      if (width != null) this.display.wrapper.style.width = interpret(width);
-      if (height != null) this.display.wrapper.style.height = interpret(height);
-      if (this.options.lineWrapping)
-        this.display.measureLineCache.length = this.display.measureLineCachePos = 0;
-      this.curOp.forceUpdate = true;
-    }),
-
-    operation: function(f){return runInOp(this, f);},
-
-    refresh: operation(null, function() {
-      var badHeight = this.display.cachedTextHeight == null;
-      clearCaches(this);
-      updateScrollPos(this, this.doc.scrollLeft, this.doc.scrollTop);
-      regChange(this);
-      if (badHeight) estimateLineHeights(this);
-    }),
-
-    swapDoc: operation(null, function(doc) {
-      var old = this.doc;
-      old.cm = null;
-      attachDoc(this, doc);
-      clearCaches(this);
-      resetInput(this, true);
-      updateScrollPos(this, doc.scrollLeft, doc.scrollTop);
-      signalLater(this, "swapDoc", this, old);
-      return old;
-    }),
-
-    getInputField: function(){return this.display.input;},
-    getWrapperElement: function(){return this.display.wrapper;},
-    getScrollerElement: function(){return this.display.scroller;},
-    getGutterElement: function(){return this.display.gutters;}
-  };
-  eventMixin(CodeMirror);
-
-  // OPTION DEFAULTS
-
-  var optionHandlers = CodeMirror.optionHandlers = {};
-
-  // The default configuration options.
-  var defaults = CodeMirror.defaults = {};
-
-  function option(name, deflt, handle, notOnInit) {
-    CodeMirror.defaults[name] = deflt;
-    if (handle) optionHandlers[name] =
-      notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old);} : handle;
-  }
-
-  var Init = CodeMirror.Init = {toString: function(){return "CodeMirror.Init";}};
-
-  // These two are, on init, called from the constructor because they
-  // have to be initialized before the editor can start at all.
-  option("value", "", function(cm, val) {
-    cm.setValue(val);
-  }, true);
-  option("mode", null, function(cm, val) {
-    cm.doc.modeOption = val;
-    loadMode(cm);
-  }, true);
-
-  option("indentUnit", 2, loadMode, true);
-  option("indentWithTabs", false);
-  option("smartIndent", true);
-  option("tabSize", 4, function(cm) {
-    loadMode(cm);
-    clearCaches(cm);
-    regChange(cm);
-  }, true);
-  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/g, function(cm, val) {
-    cm.options.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
-    cm.refresh();
-  }, true);
-  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
-  option("electricChars", true);
-  option("rtlMoveVisually", !windows);
-  option("wholeLineUpdateBefore", true);
-
-  option("theme", "default", function(cm) {
-    themeChanged(cm);
-    guttersChanged(cm);
-  }, true);
-  option("keyMap", "default", keyMapChanged);
-  option("extraKeys", null);
-
-  option("onKeyEvent", null);
-  option("onDragEvent", null);
-
-  option("lineWrapping", false, wrappingChanged, true);
-  option("gutters", [], function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
-  option("fixedGutter", true, function(cm, val) {
-    cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
-    cm.refresh();
-  }, true);
-  option("coverGutterNextToScrollbar", false, updateScrollbars, true);
-  option("lineNumbers", false, function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
-  option("firstLineNumber", 1, guttersChanged, true);
-  option("lineNumberFormatter", function(integer) {return integer;}, guttersChanged, true);
-  option("showCursorWhenSelecting", false, updateSelection, true);
-
-  option("resetSelectionOnContextMenu", true);
-
-  option("readOnly", false, function(cm, val) {
-    if (val == "nocursor") {
-      onBlur(cm);
-      cm.display.input.blur();
-      cm.display.disabled = true;
-    } else {
-      cm.display.disabled = false;
-      if (!val) resetInput(cm, true);
-    }
-  });
-  option("dragDrop", true);
-
-  option("cursorBlinkRate", 530);
-  option("cursorScrollMargin", 0);
-  option("cursorHeight", 1);
-  option("workTime", 100);
-  option("workDelay", 100);
-  option("flattenSpans", true);
-  option("pollInterval", 100);
-  option("undoDepth", 40, function(cm, val){cm.doc.history.undoDepth = val;});
-  option("historyEventDelay", 500);
-  option("viewportMargin", 10, function(cm){cm.refresh();}, true);
-  option("maxHighlightLength", 10000, function(cm){loadMode(cm); cm.refresh();}, true);
-  option("crudeMeasuringFrom", 10000);
-  option("moveInputWithCursor", true, function(cm, val) {
-    if (!val) cm.display.inputDiv.style.top = cm.display.inputDiv.style.left = 0;
-  });
-
-  option("tabindex", null, function(cm, val) {
-    cm.display.input.tabIndex = val || "";
-  });
-  option("autofocus", null);
-
-  // MODE DEFINITION AND QUERYING
-
-  // Known modes, by name and by MIME
-  var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-
-  CodeMirror.defineMode = function(name, mode) {
-    if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
-    if (arguments.length > 2) {
-      mode.dependencies = [];
-      for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
-    }
-    modes[name] = mode;
-  };
-
-  CodeMirror.defineMIME = function(mime, spec) {
-    mimeModes[mime] = spec;
-  };
-
-  CodeMirror.resolveMode = function(spec) {
-    if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
-      spec = mimeModes[spec];
-    } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
-      var found = mimeModes[spec.name];
-      spec = createObj(found, spec);
-      spec.name = found.name;
-    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
-      return CodeMirror.resolveMode("application/xml");
-    }
-    if (typeof spec == "string") return {name: spec};
-    else return spec || {name: "null"};
-  };
-
-  CodeMirror.getMode = function(options, spec) {
-    var spec = CodeMirror.resolveMode(spec);
-    var mfactory = modes[spec.name];
-    if (!mfactory) return CodeMirror.getMode(options, "text/plain");
-    var modeObj = mfactory(options, spec);
-    if (modeExtensions.hasOwnProperty(spec.name)) {
-      var exts = modeExtensions[spec.name];
-      for (var prop in exts) {
-        if (!exts.hasOwnProperty(prop)) continue;
-        if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
-        modeObj[prop] = exts[prop];
-      }
-    }
-    modeObj.name = spec.name;
-
-    return modeObj;
-  };
-
-  CodeMirror.defineMode("null", function() {
-    return {token: function(stream) {stream.skipToEnd();}};
-  });
-  CodeMirror.defineMIME("text/plain", "null");
-
-  var modeExtensions = CodeMirror.modeExtensions = {};
-  CodeMirror.extendMode = function(mode, properties) {
-    var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
-    copyObj(properties, exts);
-  };
-
-  // EXTENSIONS
-
-  CodeMirror.defineExtension = function(name, func) {
-    CodeMirror.prototype[name] = func;
-  };
-  CodeMirror.defineDocExtension = function(name, func) {
-    Doc.prototype[name] = func;
-  };
-  CodeMirror.defineOption = option;
-
-  var initHooks = [];
-  CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
-
-  var helpers = CodeMirror.helpers = {};
-  CodeMirror.registerHelper = function(type, name, value) {
-    if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {};
-    helpers[type][name] = value;
-  };
-
-  // UTILITIES
-
-  CodeMirror.isWordChar = isWordChar;
-
-  // MODE STATE HANDLING
-
-  // Utility functions for working with state. Exported because modes
-  // sometimes need to do this.
-  function copyState(mode, state) {
-    if (state === true) return state;
-    if (mode.copyState) return mode.copyState(state);
-    var nstate = {};
-    for (var n in state) {
-      var val = state[n];
-      if (val instanceof Array) val = val.concat([]);
-      nstate[n] = val;
-    }
-    return nstate;
-  }
-  CodeMirror.copyState = copyState;
-
-  function startState(mode, a1, a2) {
-    return mode.startState ? mode.startState(a1, a2) : true;
-  }
-  CodeMirror.startState = startState;
-
-  CodeMirror.innerMode = function(mode, state) {
-    while (mode.innerMode) {
-      var info = mode.innerMode(state);
-      if (!info || info.mode == mode) break;
-      state = info.state;
-      mode = info.mode;
-    }
-    return info || {mode: mode, state: state};
-  };
-
-  // STANDARD COMMANDS
-
-  var commands = CodeMirror.commands = {
-    selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()));},
-    killLine: function(cm) {
-      var from = cm.getCursor(true), to = cm.getCursor(false), sel = !posEq(from, to);
-      if (!sel && cm.getLine(from.line).length == from.ch)
-        cm.replaceRange("", from, Pos(from.line + 1, 0), "+delete");
-      else cm.replaceRange("", from, sel ? to : Pos(from.line), "+delete");
-    },
-    deleteLine: function(cm) {
-      var l = cm.getCursor().line;
-      cm.replaceRange("", Pos(l, 0), Pos(l), "+delete");
-    },
-    delLineLeft: function(cm) {
-      var cur = cm.getCursor();
-      cm.replaceRange("", Pos(cur.line, 0), cur, "+delete");
-    },
-    undo: function(cm) {cm.undo();},
-    redo: function(cm) {cm.redo();},
-    goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
-    goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
-    goLineStart: function(cm) {
-      cm.extendSelection(lineStart(cm, cm.getCursor().line));
-    },
-    goLineStartSmart: function(cm) {
-      var cur = cm.getCursor(), start = lineStart(cm, cur.line);
-      var line = cm.getLineHandle(start.line);
-      var order = getOrder(line);
-      if (!order || order[0].level == 0) {
-        var firstNonWS = Math.max(0, line.text.search(/\S/));
-        var inWS = cur.line == start.line && cur.ch <= firstNonWS && cur.ch;
-        cm.extendSelection(Pos(start.line, inWS ? 0 : firstNonWS));
-      } else cm.extendSelection(start);
-    },
-    goLineEnd: function(cm) {
-      cm.extendSelection(lineEnd(cm, cm.getCursor().line));
-    },
-    goLineRight: function(cm) {
-      var top = cm.charCoords(cm.getCursor(), "div").top + 5;
-      cm.extendSelection(cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div"));
-    },
-    goLineLeft: function(cm) {
-      var top = cm.charCoords(cm.getCursor(), "div").top + 5;
-      cm.extendSelection(cm.coordsChar({left: 0, top: top}, "div"));
-    },
-    goLineUp: function(cm) {cm.moveV(-1, "line");},
-    goLineDown: function(cm) {cm.moveV(1, "line");},
-    goPageUp: function(cm) {cm.moveV(-1, "page");},
-    goPageDown: function(cm) {cm.moveV(1, "page");},
-    goCharLeft: function(cm) {cm.moveH(-1, "char");},
-    goCharRight: function(cm) {cm.moveH(1, "char");},
-    goColumnLeft: function(cm) {cm.moveH(-1, "column");},
-    goColumnRight: function(cm) {cm.moveH(1, "column");},
-    goWordLeft: function(cm) {cm.moveH(-1, "word");},
-    goGroupRight: function(cm) {cm.moveH(1, "group");},
-    goGroupLeft: function(cm) {cm.moveH(-1, "group");},
-    goWordRight: function(cm) {cm.moveH(1, "word");},
-    delCharBefore: function(cm) {cm.deleteH(-1, "char");},
-    delCharAfter: function(cm) {cm.deleteH(1, "char");},
-    delWordBefore: function(cm) {cm.deleteH(-1, "word");},
-    delWordAfter: function(cm) {cm.deleteH(1, "word");},
-    delGroupBefore: function(cm) {cm.deleteH(-1, "group");},
-    delGroupAfter: function(cm) {cm.deleteH(1, "group");},
-    indentAuto: function(cm) {cm.indentSelection("smart");},
-    indentMore: function(cm) {cm.indentSelection("add");},
-    indentLess: function(cm) {cm.indentSelection("subtract");},
-    insertTab: function(cm) {cm.replaceSelection("\t", "end", "+input");},
-    defaultTab: function(cm) {
-      if (cm.somethingSelected()) cm.indentSelection("add");
-      else cm.replaceSelection("\t", "end", "+input");
-    },
-    transposeChars: function(cm) {
-      var cur = cm.getCursor(), line = cm.getLine(cur.line);
-      if (cur.ch > 0 && cur.ch < line.length - 1)
-        cm.replaceRange(line.charAt(cur.ch) + line.charAt(cur.ch - 1),
-                        Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
-    },
-    newlineAndIndent: function(cm) {
-      operation(cm, function() {
-        cm.replaceSelection("\n", "end", "+input");
-        cm.indentLine(cm.getCursor().line, null, true);
-      })();
-    },
-    toggleOverwrite: function(cm) {cm.toggleOverwrite();}
-  };
-
-  // STANDARD KEYMAPS
-
-  var keyMap = CodeMirror.keyMap = {};
-  keyMap.basic = {
-    "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
-    "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
-    "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
-    "Tab": "defaultTab", "Shift-Tab": "indentAuto",
-    "Enter": "newlineAndIndent", "Insert": "toggleOverwrite"
-  };
-  // Note that the save and find-related commands aren't defined by
-  // default. Unknown commands are simply ignored.
-  keyMap.pcDefault = {
-    "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
-    "Ctrl-Home": "goDocStart", "Alt-Up": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Down": "goDocEnd",
-    "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
-    "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
-    "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
-    "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
-    fallthrough: "basic"
-  };
-  keyMap.macDefault = {
-    "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
-    "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
-    "Alt-Right": "goGroupRight", "Cmd-Left": "goLineStart", "Cmd-Right": "goLineEnd", "Alt-Backspace": "delGroupBefore",
-    "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
-    "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
-    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delLineLeft",
-    fallthrough: ["basic", "emacsy"]
-  };
-  keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
-  keyMap.emacsy = {
-    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
-    "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-    "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
-    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
-  };
-
-  // KEYMAP DISPATCH
-
-  function getKeyMap(val) {
-    if (typeof val == "string") return keyMap[val];
-    else return val;
-  }
-
-  function lookupKey(name, maps, handle) {
-    function lookup(map) {
-      map = getKeyMap(map);
-      var found = map[name];
-      if (found === false) return "stop";
-      if (found != null && handle(found)) return true;
-      if (map.nofallthrough) return "stop";
-
-      var fallthrough = map.fallthrough;
-      if (fallthrough == null) return false;
-      if (Object.prototype.toString.call(fallthrough) != "[object Array]")
-        return lookup(fallthrough);
-      for (var i = 0, e = fallthrough.length; i < e; ++i) {
-        var done = lookup(fallthrough[i]);
-        if (done) return done;
-      }
-      return false;
-    }
-
-    for (var i = 0; i < maps.length; ++i) {
-      var done = lookup(maps[i]);
-      if (done) return done != "stop";
-    }
-  }
-  function isModifierKey(event) {
-    var name = keyNames[event.keyCode];
-    return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
-  }
-  function keyName(event, noShift) {
-    if (opera && event.keyCode == 34 && event["char"]) return false;
-    var name = keyNames[event.keyCode];
-    if (name == null || event.altGraphKey) return false;
-    if (event.altKey) name = "Alt-" + name;
-    if (flipCtrlCmd ? event.metaKey : event.ctrlKey) name = "Ctrl-" + name;
-    if (flipCtrlCmd ? event.ctrlKey : event.metaKey) name = "Cmd-" + name;
-    if (!noShift && event.shiftKey) name = "Shift-" + name;
-    return name;
-  }
-  CodeMirror.lookupKey = lookupKey;
-  CodeMirror.isModifierKey = isModifierKey;
-  CodeMirror.keyName = keyName;
-
-  // FROMTEXTAREA
-
-  CodeMirror.fromTextArea = function(textarea, options) {
-    if (!options) options = {};
-    options.value = textarea.value;
-    if (!options.tabindex && textarea.tabindex)
-      options.tabindex = textarea.tabindex;
-    if (!options.placeholder && textarea.placeholder)
-      options.placeholder = textarea.placeholder;
-    // Set autofocus to true if this textarea is focused, or if it has
-    // autofocus and no other element is focused.
-    if (options.autofocus == null) {
-      var hasFocus = document.body;
-      // doc.activeElement occasionally throws on IE
-      try { hasFocus = document.activeElement; } catch(e) {}
-      options.autofocus = hasFocus == textarea ||
-        textarea.getAttribute("autofocus") != null && hasFocus == document.body;
-    }
-
-    function save() {textarea.value = cm.getValue();}
-    if (textarea.form) {
-      on(textarea.form, "submit", save);
-      // Deplorable hack to make the submit method do the right thing.
-      if (!options.leaveSubmitMethodAlone) {
-        var form = textarea.form, realSubmit = form.submit;
-        try {
-          var wrappedSubmit = form.submit = function() {
-            save();
-            form.submit = realSubmit;
-            form.submit();
-            form.submit = wrappedSubmit;
-          };
-        } catch(e) {}
-      }
-    }
-
-    textarea.style.display = "none";
-    var cm = CodeMirror(function(node) {
-      textarea.parentNode.insertBefore(node, textarea.nextSibling);
-    }, options);
-    cm.save = save;
-    cm.getTextArea = function() { return textarea; };
-    cm.toTextArea = function() {
-      save();
-      textarea.parentNode.removeChild(cm.getWrapperElement());
-      textarea.style.display = "";
-      if (textarea.form) {
-        off(textarea.form, "submit", save);
-        if (typeof textarea.form.submit == "function")
-          textarea.form.submit = realSubmit;
-      }
-    };
-    return cm;
-  };
-
-  // STRING STREAM
-
-  // Fed to the mode parsers, provides helper functions to make
-  // parsers more succinct.
-
-  // The character stream used by a mode's parser.
-  function StringStream(string, tabSize) {
-    this.pos = this.start = 0;
-    this.string = string;
-    this.tabSize = tabSize || 8;
-    this.lastColumnPos = this.lastColumnValue = 0;
-  }
-
-  StringStream.prototype = {
-    eol: function() {return this.pos >= this.string.length;},
-    sol: function() {return this.pos == 0;},
-    peek: function() {return this.string.charAt(this.pos) || undefined;},
-    next: function() {
-      if (this.pos < this.string.length)
-        return this.string.charAt(this.pos++);
-    },
-    eat: function(match) {
-      var ch = this.string.charAt(this.pos);
-      if (typeof match == "string") var ok = ch == match;
-      else var ok = ch && (match.test ? match.test(ch) : match(ch));
-      if (ok) {++this.pos; return ch;}
-    },
-    eatWhile: function(match) {
-      var start = this.pos;
-      while (this.eat(match)){}
-      return this.pos > start;
-    },
-    eatSpace: function() {
-      var start = this.pos;
-      while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-      return this.pos > start;
-    },
-    skipToEnd: function() {this.pos = this.string.length;},
-    skipTo: function(ch) {
-      var found = this.string.indexOf(ch, this.pos);
-      if (found > -1) {this.pos = found; return true;}
-    },
-    backUp: function(n) {this.pos -= n;},
-    column: function() {
-      if (this.lastColumnPos < this.start) {
-        this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
-        this.lastColumnPos = this.start;
-      }
-      return this.lastColumnValue;
-    },
-    indentation: function() {return countColumn(this.string, null, this.tabSize);},
-    match: function(pattern, consume, caseInsensitive) {
-      if (typeof pattern == "string") {
-        var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-        var substr = this.string.substr(this.pos, pattern.length);
-        if (cased(substr) == cased(pattern)) {
-          if (consume !== false) this.pos += pattern.length;
-          return true;
-        }
-      } else {
-        var match = this.string.slice(this.pos).match(pattern);
-        if (match && match.index > 0) return null;
-        if (match && consume !== false) this.pos += match[0].length;
-        return match;
-      }
-    },
-    current: function(){return this.string.slice(this.start, this.pos);}
-  };
-  CodeMirror.StringStream = StringStream;
-
-  // TEXTMARKERS
-
-  function TextMarker(doc, type) {
-    this.lines = [];
-    this.type = type;
-    this.doc = doc;
-  }
-  CodeMirror.TextMarker = TextMarker;
-  eventMixin(TextMarker);
-
-  TextMarker.prototype.clear = function() {
-    if (this.explicitlyCleared) return;
-    var cm = this.doc.cm, withOp = cm && !cm.curOp;
-    if (withOp) startOperation(cm);
-    if (hasHandler(this, "clear")) {
-      var found = this.find();
-      if (found) signalLater(this, "clear", found.from, found.to);
-    }
-    var min = null, max = null;
-    for (var i = 0; i < this.lines.length; ++i) {
-      var line = this.lines[i];
-      var span = getMarkedSpanFor(line.markedSpans, this);
-      if (span.to != null) max = lineNo(line);
-      line.markedSpans = removeMarkedSpan(line.markedSpans, span);
-      if (span.from != null)
-        min = lineNo(line);
-      else if (this.collapsed && !lineIsHidden(this.doc, line) && cm)
-        updateLineHeight(line, textHeight(cm.display));
-    }
-    if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) {
-      var visual = visualLine(cm.doc, this.lines[i]), len = lineLength(cm.doc, visual);
-      if (len > cm.display.maxLineLength) {
-        cm.display.maxLine = visual;
-        cm.display.maxLineLength = len;
-        cm.display.maxLineChanged = true;
-      }
-    }
-
-    if (min != null && cm) regChange(cm, min, max + 1);
-    this.lines.length = 0;
-    this.explicitlyCleared = true;
-    if (this.atomic && this.doc.cantEdit) {
-      this.doc.cantEdit = false;
-      if (cm) reCheckSelection(cm);
-    }
-    if (withOp) endOperation(cm);
-  };
-
-  TextMarker.prototype.find = function() {
-    var from, to;
-    for (var i = 0; i < this.lines.length; ++i) {
-      var line = this.lines[i];
-      var span = getMarkedSpanFor(line.markedSpans, this);
-      if (span.from != null || span.to != null) {
-        var found = lineNo(line);
-        if (span.from != null) from = Pos(found, span.from);
-        if (span.to != null) to = Pos(found, span.to);
-      }
-    }
-    if (this.type == "bookmark") return from;
-    return from && {from: from, to: to};
-  };
-
-  TextMarker.prototype.changed = function() {
-    var pos = this.find(), cm = this.doc.cm;
-    if (!pos || !cm) return;
-    if (this.type != "bookmark") pos = pos.from;
-    var line = getLine(this.doc, pos.line);
-    clearCachedMeasurement(cm, line);
-    if (pos.line >= cm.display.showingFrom && pos.line < cm.display.showingTo) {
-      for (var node = cm.display.lineDiv.firstChild; node; node = node.nextSibling) if (node.lineObj == line) {
-        if (node.offsetHeight != line.height) updateLineHeight(line, node.offsetHeight);
-        break;
-      }
-      runInOp(cm, function() {
-        cm.curOp.selectionChanged = cm.curOp.forceUpdate = cm.curOp.updateMaxLine = true;
-      });
-    }
-  };
-
-  TextMarker.prototype.attachLine = function(line) {
-    if (!this.lines.length && this.doc.cm) {
-      var op = this.doc.cm.curOp;
-      if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
-        (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this);
-    }
-    this.lines.push(line);
-  };
-  TextMarker.prototype.detachLine = function(line) {
-    this.lines.splice(indexOf(this.lines, line), 1);
-    if (!this.lines.length && this.doc.cm) {
-      var op = this.doc.cm.curOp;
-      (op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this);
-    }
-  };
-
-  function markText(doc, from, to, options, type) {
-    if (options && options.shared) return markTextShared(doc, from, to, options, type);
-    if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
-
-    var marker = new TextMarker(doc, type);
-    if (posLess(to, from) || posEq(from, to) && type == "range" &&
-        !(options.inclusiveLeft && options.inclusiveRight))
-      return marker;
-    if (options) copyObj(options, marker);
-    if (marker.replacedWith) {
-      marker.collapsed = true;
-      marker.replacedWith = elt("span", [marker.replacedWith], "CodeMirror-widget");
-      if (!options.handleMouseEvents) marker.replacedWith.ignoreEvents = true;
-    }
-    if (marker.collapsed) sawCollapsedSpans = true;
-
-    if (marker.addToHistory)
-      addToHistory(doc, {from: from, to: to, origin: "markText"},
-                   {head: doc.sel.head, anchor: doc.sel.anchor}, NaN);
-
-    var curLine = from.line, size = 0, collapsedAtStart, collapsedAtEnd, cm = doc.cm, updateMaxLine;
-    doc.iter(curLine, to.line + 1, function(line) {
-      if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(doc, line) == cm.display.maxLine)
-        updateMaxLine = true;
-      var span = {from: null, to: null, marker: marker};
-      size += line.text.length;
-      if (curLine == from.line) {span.from = from.ch; size -= from.ch;}
-      if (curLine == to.line) {span.to = to.ch; size -= line.text.length - to.ch;}
-      if (marker.collapsed) {
-        if (curLine == to.line) collapsedAtEnd = collapsedSpanAt(line, to.ch);
-        if (curLine == from.line) collapsedAtStart = collapsedSpanAt(line, from.ch);
-        else updateLineHeight(line, 0);
-      }
-      addMarkedSpan(line, span);
-      ++curLine;
-    });
-    if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) {
-      if (lineIsHidden(doc, line)) updateLineHeight(line, 0);
-    });
-
-    if (marker.clearOnEnter) on(marker, "beforeCursorEnter", function() { marker.clear(); });
-
-    if (marker.readOnly) {
-      sawReadOnlySpans = true;
-      if (doc.history.done.length || doc.history.undone.length)
-        doc.clearHistory();
-    }
-    if (marker.collapsed) {
-      if (collapsedAtStart != collapsedAtEnd)
-        throw new Error("Inserting collapsed marker overlapping an existing one");
-      marker.size = size;
-      marker.atomic = true;
-    }
-    if (cm) {
-      if (updateMaxLine) cm.curOp.updateMaxLine = true;
-      if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.collapsed)
-        regChange(cm, from.line, to.line + 1);
-      if (marker.atomic) reCheckSelection(cm);
-    }
-    return marker;
-  }
-
-  // SHARED TEXTMARKERS
-
-  function SharedTextMarker(markers, primary) {
-    this.markers = markers;
-    this.primary = primary;
-    for (var i = 0, me = this; i < markers.length; ++i) {
-      markers[i].parent = this;
-      on(markers[i], "clear", function(){me.clear();});
-    }
-  }
-  CodeMirror.SharedTextMarker = SharedTextMarker;
-  eventMixin(SharedTextMarker);
-
-  SharedTextMarker.prototype.clear = function() {
-    if (this.explicitlyCleared) return;
-    this.explicitlyCleared = true;
-    for (var i = 0; i < this.markers.length; ++i)
-      this.markers[i].clear();
-    signalLater(this, "clear");
-  };
-  SharedTextMarker.prototype.find = function() {
-    return this.primary.find();
-  };
-
-  function markTextShared(doc, from, to, options, type) {
-    options = copyObj(options);
-    options.shared = false;
-    var markers = [markText(doc, from, to, options, type)], primary = markers[0];
-    var widget = options.replacedWith;
-    linkedDocs(doc, function(doc) {
-      if (widget) options.replacedWith = widget.cloneNode(true);
-      markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));
-      for (var i = 0; i < doc.linked.length; ++i)
-        if (doc.linked[i].isParent) return;
-      primary = lst(markers);
-    });
-    return new SharedTextMarker(markers, primary);
-  }
-
-  // TEXTMARKER SPANS
-
-  function getMarkedSpanFor(spans, marker) {
-    if (spans) for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
-      if (span.marker == marker) return span;
-    }
-  }
-  function removeMarkedSpan(spans, span) {
-    for (var r, i = 0; i < spans.length; ++i)
-      if (spans[i] != span) (r || (r = [])).push(spans[i]);
-    return r;
-  }
-  function addMarkedSpan(line, span) {
-    line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
-    span.marker.attachLine(line);
-  }
-
-  function markedSpansBefore(old, startCh, isInsert) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
-      if (startsBefore ||
-          (marker.inclusiveLeft && marker.inclusiveRight || marker.type == "bookmark") &&
-          span.from == startCh && (!isInsert || !span.marker.insertLeft)) {
-        var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
-        (nw || (nw = [])).push({from: span.from,
-                                to: endsAfter ? null : span.to,
-                                marker: marker});
-      }
-    }
-    return nw;
-  }
-
-  function markedSpansAfter(old, endCh, isInsert) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
-      if (endsAfter || marker.type == "bookmark" && span.from == endCh && (!isInsert || span.marker.insertLeft)) {
-        var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
-        (nw || (nw = [])).push({from: startsBefore ? null : span.from - endCh,
-                                to: span.to == null ? null : span.to - endCh,
-                                marker: marker});
-      }
-    }
-    return nw;
-  }
-
-  function stretchSpansOverChange(doc, change) {
-    var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
-    var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
-    if (!oldFirst && !oldLast) return null;
-
-    var startCh = change.from.ch, endCh = change.to.ch, isInsert = posEq(change.from, change.to);
-    // Get the spans that 'stick out' on both sides
-    var first = markedSpansBefore(oldFirst, startCh, isInsert);
-    var last = markedSpansAfter(oldLast, endCh, isInsert);
-
-    // Next, merge those two ends
-    var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);
-    if (first) {
-      // Fix up .to properties of first
-      for (var i = 0; i < first.length; ++i) {
-        var span = first[i];
-        if (span.to == null) {
-          var found = getMarkedSpanFor(last, span.marker);
-          if (!found) span.to = startCh;
-          else if (sameLine) span.to = found.to == null ? null : found.to + offset;
-        }
-      }
-    }
-    if (last) {
-      // Fix up .from in last (or move them into first in case of sameLine)
-      for (var i = 0; i < last.length; ++i) {
-        var span = last[i];
-        if (span.to != null) span.to += offset;
-        if (span.from == null) {
-          var found = getMarkedSpanFor(first, span.marker);
-          if (!found) {
-            span.from = offset;
-            if (sameLine) (first || (first = [])).push(span);
-          }
-        } else {
-          span.from += offset;
-          if (sameLine) (first || (first = [])).push(span);
-        }
-      }
-    }
-    if (sameLine && first) {
-      // Make sure we didn't create any zero-length spans
-      for (var i = 0; i < first.length; ++i)
-        if (first[i].from != null && first[i].from == first[i].to && first[i].marker.type != "bookmark")
-          first.splice(i--, 1);
-      if (!first.length) first = null;
-    }
-
-    var newMarkers = [first];
-    if (!sameLine) {
-      // Fill gap with whole-line-spans
-      var gap = change.text.length - 2, gapMarkers;
-      if (gap > 0 && first)
-        for (var i = 0; i < first.length; ++i)
-          if (first[i].to == null)
-            (gapMarkers || (gapMarkers = [])).push({from: null, to: null, marker: first[i].marker});
-      for (var i = 0; i < gap; ++i)
-        newMarkers.push(gapMarkers);
-      newMarkers.push(last);
-    }
-    return newMarkers;
-  }
-
-  function mergeOldSpans(doc, change) {
-    var old = getOldSpans(doc, change);
-    var stretched = stretchSpansOverChange(doc, change);
-    if (!old) return stretched;
-    if (!stretched) return old;
-
-    for (var i = 0; i < old.length; ++i) {
-      var oldCur = old[i], stretchCur = stretched[i];
-      if (oldCur && stretchCur) {
-        spans: for (var j = 0; j < stretchCur.length; ++j) {
-          var span = stretchCur[j];
-          for (var k = 0; k < oldCur.length; ++k)
-            if (oldCur[k].marker == span.marker) continue spans;
-          oldCur.push(span);
-        }
-      } else if (stretchCur) {
-        old[i] = stretchCur;
-      }
-    }
-    return old;
-  }
-
-  function removeReadOnlyRanges(doc, from, to) {
-    var markers = null;
-    doc.iter(from.line, to.line + 1, function(line) {
-      if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
-        var mark = line.markedSpans[i].marker;
-        if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
-          (markers || (markers = [])).push(mark);
-      }
-    });
-    if (!markers) return null;
-    var parts = [{from: from, to: to}];
-    for (var i = 0; i < markers.length; ++i) {
-      var mk = markers[i], m = mk.find();
-      for (var j = 0; j < parts.length; ++j) {
-        var p = parts[j];
-        if (posLess(p.to, m.from) || posLess(m.to, p.from)) continue;
-        var newParts = [j, 1];
-        if (posLess(p.from, m.from) || !mk.inclusiveLeft && posEq(p.from, m.from))
-          newParts.push({from: p.from, to: m.from});
-        if (posLess(m.to, p.to) || !mk.inclusiveRight && posEq(p.to, m.to))
-          newParts.push({from: m.to, to: p.to});
-        parts.splice.apply(parts, newParts);
-        j += newParts.length - 1;
-      }
-    }
-    return parts;
-  }
-
-  function collapsedSpanAt(line, ch) {
-    var sps = sawCollapsedSpans && line.markedSpans, found;
-    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-      sp = sps[i];
-      if (!sp.marker.collapsed) continue;
-      if ((sp.from == null || sp.from < ch) &&
-          (sp.to == null || sp.to > ch) &&
-          (!found || found.width < sp.marker.width))
-        found = sp.marker;
-    }
-    return found;
-  }
-  function collapsedSpanAtStart(line) { return collapsedSpanAt(line, -1); }
-  function collapsedSpanAtEnd(line) { return collapsedSpanAt(line, line.text.length + 1); }
-
-  function visualLine(doc, line) {
-    var merged;
-    while (merged = collapsedSpanAtStart(line))
-      line = getLine(doc, merged.find().from.line);
-    return line;
-  }
-
-  function lineIsHidden(doc, line) {
-    var sps = sawCollapsedSpans && line.markedSpans;
-    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-      sp = sps[i];
-      if (!sp.marker.collapsed) continue;
-      if (sp.from == null) return true;
-      if (sp.marker.replacedWith) continue;
-      if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
-        return true;
-    }
-  }
-  function lineIsHiddenInner(doc, line, span) {
-    if (span.to == null) {
-      var end = span.marker.find().to, endLine = getLine(doc, end.line);
-      return lineIsHiddenInner(doc, endLine, getMarkedSpanFor(endLine.markedSpans, span.marker));
-    }
-    if (span.marker.inclusiveRight && span.to == line.text.length)
-      return true;
-    for (var sp, i = 0; i < line.markedSpans.length; ++i) {
-      sp = line.markedSpans[i];
-      if (sp.marker.collapsed && !sp.marker.replacedWith && sp.from == span.to &&
-          (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
-          lineIsHiddenInner(doc, line, sp)) return true;
-    }
-  }
-
-  function detachMarkedSpans(line) {
-    var spans = line.markedSpans;
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.detachLine(line);
-    line.markedSpans = null;
-  }
-
-  function attachMarkedSpans(line, spans) {
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.attachLine(line);
-    line.markedSpans = spans;
-  }
-
-  // LINE WIDGETS
-
-  var LineWidget = CodeMirror.LineWidget = function(cm, node, options) {
-    if (options) for (var opt in options) if (options.hasOwnProperty(opt))
-      this[opt] = options[opt];
-    this.cm = cm;
-    this.node = node;
-  };
-  eventMixin(LineWidget);
-  function widgetOperation(f) {
-    return function() {
-      var withOp = !this.cm.curOp;
-      if (withOp) startOperation(this.cm);
-      try {var result = f.apply(this, arguments);}
-      finally {if (withOp) endOperation(this.cm);}
-      return result;
-    };
-  }
-  LineWidget.prototype.clear = widgetOperation(function() {
-    var ws = this.line.widgets, no = lineNo(this.line);
-    if (no == null || !ws) return;
-    for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
-    if (!ws.length) this.line.widgets = null;
-    var aboveVisible = heightAtLine(this.cm, this.line) < this.cm.doc.scrollTop;
-    updateLineHeight(this.line, Math.max(0, this.line.height - widgetHeight(this)));
-    if (aboveVisible) addToScrollPos(this.cm, 0, -this.height);
-    regChange(this.cm, no, no + 1);
-  });
-  LineWidget.prototype.changed = widgetOperation(function() {
-    var oldH = this.height;
-    this.height = null;
-    var diff = widgetHeight(this) - oldH;
-    if (!diff) return;
-    updateLineHeight(this.line, this.line.height + diff);
-    var no = lineNo(this.line);
-    regChange(this.cm, no, no + 1);
-  });
-
-  function widgetHeight(widget) {
-    if (widget.height != null) return widget.height;
-    if (!widget.node.parentNode || widget.node.parentNode.nodeType != 1)
-      removeChildrenAndAdd(widget.cm.display.measure, elt("div", [widget.node], null, "position: relative"));
-    return widget.height = widget.node.offsetHeight;
-  }
-
-  function addLineWidget(cm, handle, node, options) {
-    var widget = new LineWidget(cm, node, options);
-    if (widget.noHScroll) cm.display.alignWidgets = true;
-    changeLine(cm, handle, function(line) {
-      var widgets = line.widgets || (line.widgets = []);
-      if (widget.insertAt == null) widgets.push(widget);
-      else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
-      widget.line = line;
-      if (!lineIsHidden(cm.doc, line) || widget.showIfHidden) {
-        var aboveVisible = heightAtLine(cm, line) < cm.doc.scrollTop;
-        updateLineHeight(line, line.height + widgetHeight(widget));
-        if (aboveVisible) addToScrollPos(cm, 0, widget.height);
-      }
-      return true;
-    });
-    return widget;
-  }
-
-  // LINE DATA STRUCTURE
-
-  // Line objects. These hold state related to a line, including
-  // highlighting info (the styles array).
-  var Line = CodeMirror.Line = function(text, markedSpans, estimateHeight) {
-    this.text = text;
-    attachMarkedSpans(this, markedSpans);
-    this.height = estimateHeight ? estimateHeight(this) : 1;
-  };
-  eventMixin(Line);
-  Line.prototype.lineNo = function() { return lineNo(this); };
-
-  function updateLine(line, text, markedSpans, estimateHeight) {
-    line.text = text;
-    if (line.stateAfter) line.stateAfter = null;
-    if (line.styles) line.styles = null;
-    if (line.order != null) line.order = null;
-    detachMarkedSpans(line);
-    attachMarkedSpans(line, markedSpans);
-    var estHeight = estimateHeight ? estimateHeight(line) : 1;
-    if (estHeight != line.height) updateLineHeight(line, estHeight);
-  }
-
-  function cleanUpLine(line) {
-    line.parent = null;
-    detachMarkedSpans(line);
-  }
-
-  // Run the given mode's parser over a line, update the styles
-  // array, which contains alternating fragments of text and CSS
-  // classes.
-  function runMode(cm, text, mode, state, f, forceToEnd) {
-    var flattenSpans = mode.flattenSpans;
-    if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
-    var curStart = 0, curStyle = null;
-    var stream = new StringStream(text, cm.options.tabSize), style;
-    if (text == "" && mode.blankLine) mode.blankLine(state);
-    while (!stream.eol()) {
-      if (stream.pos > cm.options.maxHighlightLength) {
-        flattenSpans = false;
-        if (forceToEnd) processLine(cm, text, state, stream.pos);
-        stream.pos = text.length;
-        style = null;
-      } else {
-        style = mode.token(stream, state);
-      }
-      if (!flattenSpans || curStyle != style) {
-        if (curStart < stream.start) f(stream.start, curStyle);
-        curStart = stream.start; curStyle = style;
-      }
-      stream.start = stream.pos;
-    }
-    while (curStart < stream.pos) {
-      // Webkit seems to refuse to render text nodes longer than 57444 characters
-      var pos = Math.min(stream.pos, curStart + 50000);
-      f(pos, curStyle);
-      curStart = pos;
-    }
-  }
-
-  function highlightLine(cm, line, state, forceToEnd) {
-    // A styles array always starts with a number identifying the
-    // mode/overlays that it is based on (for easy invalidation).
-    var st = [cm.state.modeGen];
-    // Compute the base array of styles
-    runMode(cm, line.text, cm.doc.mode, state, function(end, style) {
-      st.push(end, style);
-    }, forceToEnd);
-
-    // Run overlays, adjust style array.
-    for (var o = 0; o < cm.state.overlays.length; ++o) {
-      var overlay = cm.state.overlays[o], i = 1, at = 0;
-      runMode(cm, line.text, overlay.mode, true, function(end, style) {
-        var start = i;
-        // Ensure there's a token end at the current position, and that i points at it
-        while (at < end) {
-          var i_end = st[i];
-          if (i_end > end)
-            st.splice(i, 1, end, st[i+1], i_end);
-          i += 2;
-          at = Math.min(end, i_end);
-        }
-        if (!style) return;
-        if (overlay.opaque) {
-          st.splice(start, i - start, end, style);
-          i = start + 2;
-        } else {
-          for (; start < i; start += 2) {
-            var cur = st[start+1];
-            st[start+1] = cur ? cur + " " + style : style;
-          }
-        }
-      });
-    }
-
-    return st;
-  }
-
-  function getLineStyles(cm, line) {
-    if (!line.styles || line.styles[0] != cm.state.modeGen)
-      line.styles = highlightLine(cm, line, line.stateAfter = getStateBefore(cm, lineNo(line)));
-    return line.styles;
-  }
-
-  // Lightweight form of highlight -- proceed over this line and
-  // update state, but don't save a style array.
-  function processLine(cm, text, state, startAt) {
-    var mode = cm.doc.mode;
-    var stream = new StringStream(text, cm.options.tabSize);
-    stream.start = stream.pos = startAt || 0;
-    if (text == "" && mode.blankLine) mode.blankLine(state);
-    while (!stream.eol() && stream.pos <= cm.options.maxHighlightLength) {
-      mode.token(stream, state);
-      stream.start = stream.pos;
-    }
-  }
-
-  var styleToClassCache = {};
-  function interpretTokenStyle(style, builder) {
-    if (!style) return null;
-    for (;;) {
-      var lineClass = style.match(/(?:^|\s)line-(background-)?(\S+)/);
-      if (!lineClass) break;
-      style = style.slice(0, lineClass.index) + style.slice(lineClass.index + lineClass[0].length);
-      var prop = lineClass[1] ? "bgClass" : "textClass";
-      if (builder[prop] == null)
-        builder[prop] = lineClass[2];
-      else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(builder[prop]))
-        builder[prop] += " " + lineClass[2];
-    }
-    return styleToClassCache[style] ||
-      (styleToClassCache[style] = "cm-" + style.replace(/ +/g, " cm-"));
-  }
-
-  function buildLineContent(cm, realLine, measure, copyWidgets) {
-    var merged, line = realLine, empty = true;
-    while (merged = collapsedSpanAtStart(line))
-      line = getLine(cm.doc, merged.find().from.line);
-
-    var builder = {pre: elt("pre"), col: 0, pos: 0,
-                   measure: null, measuredSomething: false, cm: cm,
-                   copyWidgets: copyWidgets};
-
-    do {
-      if (line.text) empty = false;
-      builder.measure = line == realLine && measure;
-      builder.pos = 0;
-      builder.addToken = builder.measure ? buildTokenMeasure : buildToken;
-      if ((ie || webkit) && cm.getOption("lineWrapping"))
-        builder.addToken = buildTokenSplitSpaces(builder.addToken);
-      var next = insertLineContent(line, builder, getLineStyles(cm, line));
-      if (measure && line == realLine && !builder.measuredSomething) {
-        measure[0] = builder.pre.appendChild(zeroWidthElement(cm.display.measure));
-        builder.measuredSomething = true;
-      }
-      if (next) line = getLine(cm.doc, next.to.line);
-    } while (next);
-
-    if (measure && !builder.measuredSomething && !measure[0])
-      measure[0] = builder.pre.appendChild(empty ? elt("span", "\u00a0") : zeroWidthElement(cm.display.measure));
-    if (!builder.pre.firstChild && !lineIsHidden(cm.doc, realLine))
-      builder.pre.appendChild(document.createTextNode("\u00a0"));
-
-    var order;
-    // Work around problem with the reported dimensions of single-char
-    // direction spans on IE (issue #1129). See also the comment in
-    // cursorCoords.
-    if (measure && (ie || ie_gt10) && (order = getOrder(line))) {
-      var l = order.length - 1;
-      if (order[l].from == order[l].to) --l;
-      var last = order[l], prev = order[l - 1];
-      if (last.from + 1 == last.to && prev && last.level < prev.level) {
-        var span = measure[builder.pos - 1];
-        if (span) span.parentNode.insertBefore(span.measureRight = zeroWidthElement(cm.display.measure),
-                                               span.nextSibling);
-      }
-    }
-
-    var textClass = builder.textClass ? builder.textClass + " " + (realLine.textClass || "") : realLine.textClass;
-    if (textClass) builder.pre.className = textClass;
-
-    signal(cm, "renderLine", cm, realLine, builder.pre);
-    return builder;
-  }
-
-  function defaultSpecialCharPlaceholder(ch) {
-    var token = elt("span", "\u2022", "cm-invalidchar");
-    token.title = "\\u" + ch.charCodeAt(0).toString(16);
-    return token;
-  }
-
-  function buildToken(builder, text, style, startStyle, endStyle, title) {
-    if (!text) return;
-    var special = builder.cm.options.specialChars;
-    if (!special.test(text)) {
-      builder.col += text.length;
-      var content = document.createTextNode(text);
-    } else {
-      var content = document.createDocumentFragment(), pos = 0;
-      while (true) {
-        special.lastIndex = pos;
-        var m = special.exec(text);
-        var skipped = m ? m.index - pos : text.length - pos;
-        if (skipped) {
-          content.appendChild(document.createTextNode(text.slice(pos, pos + skipped)));
-          builder.col += skipped;
-        }
-        if (!m) break;
-        pos += skipped + 1;
-        if (m[0] == "\t") {
-          var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
-          content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
-          builder.col += tabWidth;
-        } else {
-          var token = builder.cm.options.specialCharPlaceholder(m[0]);
-          content.appendChild(token);
-          builder.col += 1;
-        }
-      }
-    }
-    if (style || startStyle || endStyle || builder.measure) {
-      var fullStyle = style || "";
-      if (startStyle) fullStyle += startStyle;
-      if (endStyle) fullStyle += endStyle;
-      var token = elt("span", [content], fullStyle);
-      if (title) token.title = title;
-      return builder.pre.appendChild(token);
-    }
-    builder.pre.appendChild(content);
-  }
-
-  function buildTokenMeasure(builder, text, style, startStyle, endStyle) {
-    var wrapping = builder.cm.options.lineWrapping;
-    for (var i = 0; i < text.length; ++i) {
-      var ch = text.charAt(i), start = i == 0;
-      if (ch >= "\ud800" && ch < "\udbff" && i < text.length - 1) {
-        ch = text.slice(i, i + 2);
-        ++i;
-      } else if (i && wrapping && spanAffectsWrapping(text, i)) {
-        builder.pre.appendChild(elt("wbr"));
-      }
-      var old = builder.measure[builder.pos];
-      var span = builder.measure[builder.pos] =
-        buildToken(builder, ch, style,
-                   start && startStyle, i == text.length - 1 && endStyle);
-      if (old) span.leftSide = old.leftSide || old;
-      // In IE single-space nodes wrap differently than spaces
-      // embedded in larger text nodes, except when set to
-      // white-space: normal (issue #1268).
-      if (ie && wrapping && ch == " " && i && !/\s/.test(text.charAt(i - 1)) &&
-          i < text.length - 1 && !/\s/.test(text.charAt(i + 1)))
-        span.style.whiteSpace = "normal";
-      builder.pos += ch.length;
-    }
-    if (text.length) builder.measuredSomething = true;
-  }
-
-  function buildTokenSplitSpaces(inner) {
-    function split(old) {
-      var out = " ";
-      for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0";
-      out += " ";
-      return out;
-    }
-    return function(builder, text, style, startStyle, endStyle, title) {
-      return inner(builder, text.replace(/ {3,}/g, split), style, startStyle, endStyle, title);
-    };
-  }
-
-  function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
-    var widget = !ignoreWidget && marker.replacedWith;
-    if (widget) {
-      if (builder.copyWidgets) widget = widget.cloneNode(true);
-      builder.pre.appendChild(widget);
-      if (builder.measure) {
-        if (size) {
-          builder.measure[builder.pos] = widget;
-        } else {
-          var elt = zeroWidthElement(builder.cm.display.measure);
-          if (marker.type == "bookmark" && !marker.insertLeft)
-            builder.measure[builder.pos] = builder.pre.appendChild(elt);
-          else if (builder.measure[builder.pos])
-            return;
-          else
-            builder.measure[builder.pos] = builder.pre.insertBefore(elt, widget);
-        }
-        builder.measuredSomething = true;
-      }
-    }
-    builder.pos += size;
-  }
-
-  // Outputs a number of spans to make up a line, taking highlighting
-  // and marked text into account.
-  function insertLineContent(line, builder, styles) {
-    var spans = line.markedSpans, allText = line.text, at = 0;
-    if (!spans) {
-      for (var i = 1; i < styles.length; i+=2)
-        builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder));
-      return;
-    }
-
-    var len = allText.length, pos = 0, i = 1, text = "", style;
-    var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
-    for (;;) {
-      if (nextChange == pos) { // Update current marker set
-        spanStyle = spanEndStyle = spanStartStyle = title = "";
-        collapsed = null; nextChange = Infinity;
-        var foundBookmarks = [];
-        for (var j = 0; j < spans.length; ++j) {
-          var sp = spans[j], m = sp.marker;
-          if (sp.from <= pos && (sp.to == null || sp.to > pos)) {
-            if (sp.to != null && nextChange > sp.to) { nextChange = sp.to; spanEndStyle = ""; }
-            if (m.className) spanStyle += " " + m.className;
-            if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
-            if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
-            if (m.title && !title) title = m.title;
-            if (m.collapsed && (!collapsed || collapsed.marker.size < m.size))
-              collapsed = sp;
-          } else if (sp.from > pos && nextChange > sp.from) {
-            nextChange = sp.from;
-          }
-          if (m.type == "bookmark" && sp.from == pos && m.replacedWith) foundBookmarks.push(m);
-        }
-        if (collapsed && (collapsed.from || 0) == pos) {
-          buildCollapsedSpan(builder, (collapsed.to == null ? len : collapsed.to) - pos,
-                             collapsed.marker, collapsed.from == null);
-          if (collapsed.to == null) return collapsed.marker.find();
-        }
-        if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)
-          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
-      }
-      if (pos >= len) break;
-
-      var upto = Math.min(len, nextChange);
-      while (true) {
-        if (text) {
-          var end = pos + text.length;
-          if (!collapsed) {
-            var tokenText = end > upto ? text.slice(0, upto - pos) : text;
-            builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
-                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title);
-          }
-          if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
-          pos = end;
-          spanStartStyle = "";
-        }
-        text = allText.slice(at, at = styles[i++]);
-        style = interpretTokenStyle(styles[i++], builder);
-      }
-    }
-  }
-
-  // DOCUMENT DATA STRUCTURE
-
-  function updateDoc(doc, change, markedSpans, selAfter, estimateHeight) {
-    function spansFor(n) {return markedSpans ? markedSpans[n] : null;}
-    function update(line, text, spans) {
-      updateLine(line, text, spans, estimateHeight);
-      signalLater(line, "change", line, change);
-    }
-
-    var from = change.from, to = change.to, text = change.text;
-    var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
-    var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
-
-    // First adjust the line structure
-    if (from.ch == 0 && to.ch == 0 && lastText == "" &&
-        (!doc.cm || doc.cm.options.wholeLineUpdateBefore)) {
-      // This is a whole-line replace. Treated specially to make
-      // sure line objects move the way they are supposed to.
-      for (var i = 0, e = text.length - 1, added = []; i < e; ++i)
-        added.push(new Line(text[i], spansFor(i), estimateHeight));
-      update(lastLine, lastLine.text, lastSpans);
-      if (nlines) doc.remove(from.line, nlines);
-      if (added.length) doc.insert(from.line, added);
-    } else if (firstLine == lastLine) {
-      if (text.length == 1) {
-        update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
-      } else {
-        for (var added = [], i = 1, e = text.length - 1; i < e; ++i)
-          added.push(new Line(text[i], spansFor(i), estimateHeight));
-        added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
-        update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-        doc.insert(from.line + 1, added);
-      }
-    } else if (text.length == 1) {
-      update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0));
-      doc.remove(from.line + 1, nlines);
-    } else {
-      update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-      update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
-      for (var i = 1, e = text.length - 1, added = []; i < e; ++i)
-        added.push(new Line(text[i], spansFor(i), estimateHeight));
-      if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
-      doc.insert(from.line + 1, added);
-    }
-
-    signalLater(doc, "change", doc, change);
-    setSelection(doc, selAfter.anchor, selAfter.head, null, true);
-  }
-
-  function LeafChunk(lines) {
-    this.lines = lines;
-    this.parent = null;
-    for (var i = 0, e = lines.length, height = 0; i < e; ++i) {
-      lines[i].parent = this;
-      height += lines[i].height;
-    }
-    this.height = height;
-  }
-
-  LeafChunk.prototype = {
-    chunkSize: function() { return this.lines.length; },
-    removeInner: function(at, n) {
-      for (var i = at, e = at + n; i < e; ++i) {
-        var line = this.lines[i];
-        this.height -= line.height;
-        cleanUpLine(line);
-        signalLater(line, "delete");
-      }
-      this.lines.splice(at, n);
-    },
-    collapse: function(lines) {
-      lines.splice.apply(lines, [lines.length, 0].concat(this.lines));
-    },
-    insertInner: function(at, lines, height) {
-      this.height += height;
-      this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
-      for (var i = 0, e = lines.length; i < e; ++i) lines[i].parent = this;
-    },
-    iterN: function(at, n, op) {
-      for (var e = at + n; at < e; ++at)
-        if (op(this.lines[at])) return true;
-    }
-  };
-
-  function BranchChunk(children) {
-    this.children = children;
-    var size = 0, height = 0;
-    for (var i = 0, e = children.length; i < e; ++i) {
-      var ch = children[i];
-      size += ch.chunkSize(); height += ch.height;
-      ch.parent = this;
-    }
-    this.size = size;
-    this.height = height;
-    this.parent = null;
-  }
-
-  BranchChunk.prototype = {
-    chunkSize: function() { return this.size; },
-    removeInner: function(at, n) {
-      this.size -= n;
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var rm = Math.min(n, sz - at), oldHeight = child.height;
-          child.removeInner(at, rm);
-          this.height -= oldHeight - child.height;
-          if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
-          if ((n -= rm) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-      if (this.size - n < 25) {
-        var lines = [];
-        this.collapse(lines);
-        this.children = [new LeafChunk(lines)];
-        this.children[0].parent = this;
-      }
-    },
-    collapse: function(lines) {
-      for (var i = 0, e = this.children.length; i < e; ++i) this.children[i].collapse(lines);
-    },
-    insertInner: function(at, lines, height) {
-      this.size += lines.length;
-      this.height += height;
-      for (var i = 0, e = this.children.length; i < e; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at <= sz) {
-          child.insertInner(at, lines, height);
-          if (child.lines && child.lines.length > 50) {
-            while (child.lines.length > 50) {
-              var spilled = child.lines.splice(child.lines.length - 25, 25);
-              var newleaf = new LeafChunk(spilled);
-              child.height -= newleaf.height;
-              this.children.splice(i + 1, 0, newleaf);
-              newleaf.parent = this;
-            }
-            this.maybeSpill();
-          }
-          break;
-        }
-        at -= sz;
-      }
-    },
-    maybeSpill: function() {
-      if (this.children.length <= 10) return;
-      var me = this;
-      do {
-        var spilled = me.children.splice(me.children.length - 5, 5);
-        var sibling = new BranchChunk(spilled);
-        if (!me.parent) { // Become the parent node
-          var copy = new BranchChunk(me.children);
-          copy.parent = me;
-          me.children = [copy, sibling];
-          me = copy;
-        } else {
-          me.size -= sibling.size;
-          me.height -= sibling.height;
-          var myIndex = indexOf(me.parent.children, me);
-          me.parent.children.splice(myIndex + 1, 0, sibling);
-        }
-        sibling.parent = me.parent;
-      } while (me.children.length > 10);
-      me.parent.maybeSpill();
-    },
-    iterN: function(at, n, op) {
-      for (var i = 0, e = this.children.length; i < e; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var used = Math.min(n, sz - at);
-          if (child.iterN(at, used, op)) return true;
-          if ((n -= used) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-    }
-  };
-
-  var nextDocId = 0;
-  var Doc = CodeMirror.Doc = function(text, mode, firstLine) {
-    if (!(this instanceof Doc)) return new Doc(text, mode, firstLine);
-    if (firstLine == null) firstLine = 0;
-
-    BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
-    this.first = firstLine;
-    this.scrollTop = this.scrollLeft = 0;
-    this.cantEdit = false;
-    this.history = makeHistory();
-    this.cleanGeneration = 1;
-    this.frontier = firstLine;
-    var start = Pos(firstLine, 0);
-    this.sel = {from: start, to: start, head: start, anchor: start, shift: false, extend: false, goalColumn: null};
-    this.id = ++nextDocId;
-    this.modeOption = mode;
-
-    if (typeof text == "string") text = splitLines(text);
-    updateDoc(this, {from: start, to: start, text: text}, null, {head: start, anchor: start});
-  };
-
-  Doc.prototype = createObj(BranchChunk.prototype, {
-    constructor: Doc,
-    iter: function(from, to, op) {
-      if (op) this.iterN(from - this.first, to - from, op);
-      else this.iterN(this.first, this.first + this.size, from);
-    },
-
-    insert: function(at, lines) {
-      var height = 0;
-      for (var i = 0, e = lines.length; i < e; ++i) height += lines[i].height;
-      this.insertInner(at - this.first, lines, height);
-    },
-    remove: function(at, n) { this.removeInner(at - this.first, n); },
-
-    getValue: function(lineSep) {
-      var lines = getLines(this, this.first, this.first + this.size);
-      if (lineSep === false) return lines;
-      return lines.join(lineSep || "\n");
-    },
-    setValue: function(code) {
-      var top = Pos(this.first, 0), last = this.first + this.size - 1;
-      makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
-                        text: splitLines(code), origin: "setValue"},
-                 {head: top, anchor: top}, true);
-    },
-    replaceRange: function(code, from, to, origin) {
-      from = clipPos(this, from);
-      to = to ? clipPos(this, to) : from;
-      replaceRange(this, code, from, to, origin);
-    },
-    getRange: function(from, to, lineSep) {
-      var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
-      if (lineSep === false) return lines;
-      return lines.join(lineSep || "\n");
-    },
-
-    getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
-    setLine: function(line, text) {
-      if (isLine(this, line))
-        replaceRange(this, text, Pos(line, 0), clipPos(this, Pos(line)));
-    },
-    removeLine: function(line) {
-      if (line) replaceRange(this, "", clipPos(this, Pos(line - 1)), clipPos(this, Pos(line)));
-      else replaceRange(this, "", Pos(0, 0), clipPos(this, Pos(1, 0)));
-    },
-
-    getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);},
-    getLineNumber: function(line) {return lineNo(line);},
-
-    getLineHandleVisualStart: function(line) {
-      if (typeof line == "number") line = getLine(this, line);
-      return visualLine(this, line);
-    },
-
-    lineCount: function() {return this.size;},
-    firstLine: function() {return this.first;},
-    lastLine: function() {return this.first + this.size - 1;},
-
-    clipPos: function(pos) {return clipPos(this, pos);},
-
-    getCursor: function(start) {
-      var sel = this.sel, pos;
-      if (start == null || start == "head") pos = sel.head;
-      else if (start == "anchor") pos = sel.anchor;
-      else if (start == "end" || start === false) pos = sel.to;
-      else pos = sel.from;
-      return copyPos(pos);
-    },
-    somethingSelected: function() {return !posEq(this.sel.head, this.sel.anchor);},
-
-    setCursor: docOperation(function(line, ch, extend) {
-      var pos = clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line);
-      if (extend) extendSelection(this, pos);
-      else setSelection(this, pos, pos);
-    }),
-    setSelection: docOperation(function(anchor, head, bias) {
-      setSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), bias);
-    }),
-    extendSelection: docOperation(function(from, to, bias) {
-      extendSelection(this, clipPos(this, from), to && clipPos(this, to), bias);
-    }),
-
-    getSelection: function(lineSep) {return this.getRange(this.sel.from, this.sel.to, lineSep);},
-    replaceSelection: function(code, collapse, origin) {
-      makeChange(this, {from: this.sel.from, to: this.sel.to, text: splitLines(code), origin: origin}, collapse || "around");
-    },
-    undo: docOperation(function() {makeChangeFromHistory(this, "undo");}),
-    redo: docOperation(function() {makeChangeFromHistory(this, "redo");}),
-
-    setExtending: function(val) {this.sel.extend = val;},
-
-    historySize: function() {
-      var hist = this.history;
-      return {undo: hist.done.length, redo: hist.undone.length};
-    },
-    clearHistory: function() {this.history = makeHistory(this.history.maxGeneration);},
-
-    markClean: function() {
-      this.cleanGeneration = this.changeGeneration();
-    },
-    changeGeneration: function() {
-      this.history.lastOp = this.history.lastOrigin = null;
-      return this.history.generation;
-    },
-    isClean: function (gen) {
-      return this.history.generation == (gen || this.cleanGeneration);
-    },
-
-    getHistory: function() {
-      return {done: copyHistoryArray(this.history.done),
-              undone: copyHistoryArray(this.history.undone)};
-    },
-    setHistory: function(histData) {
-      var hist = this.history = makeHistory(this.history.maxGeneration);
-      hist.done = histData.done.slice(0);
-      hist.undone = histData.undone.slice(0);
-    },
-
-    markText: function(from, to, options) {
-      return markText(this, clipPos(this, from), clipPos(this, to), options, "range");
-    },
-    setBookmark: function(pos, options) {
-      var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
-                      insertLeft: options && options.insertLeft};
-      pos = clipPos(this, pos);
-      return markText(this, pos, pos, realOpts, "bookmark");
-    },
-    findMarksAt: function(pos) {
-      pos = clipPos(this, pos);
-      var markers = [], spans = getLine(this, pos.line).markedSpans;
-      if (spans) for (var i = 0; i < spans.length; ++i) {
-        var span = spans[i];
-        if ((span.from == null || span.from <= pos.ch) &&
-            (span.to == null || span.to >= pos.ch))
-          markers.push(span.marker.parent || span.marker);
-      }
-      return markers;
-    },
-    getAllMarks: function() {
-      var markers = [];
-      this.iter(function(line) {
-        var sps = line.markedSpans;
-        if (sps) for (var i = 0; i < sps.length; ++i)
-          if (sps[i].from != null) markers.push(sps[i].marker);
-      });
-      return markers;
-    },
-
-    posFromIndex: function(off) {
-      var ch, lineNo = this.first;
-      this.iter(function(line) {
-        var sz = line.text.length + 1;
-        if (sz > off) { ch = off; return true; }
-        off -= sz;
-        ++lineNo;
-      });
-      return clipPos(this, Pos(lineNo, ch));
-    },
-    indexFromPos: function (coords) {
-      coords = clipPos(this, coords);
-      var index = coords.ch;
-      if (coords.line < this.first || coords.ch < 0) return 0;
-      this.iter(this.first, coords.line, function (line) {
-        index += line.text.length + 1;
-      });
-      return index;
-    },
-
-    copy: function(copyHistory) {
-      var doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first);
-      doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
-      doc.sel = {from: this.sel.from, to: this.sel.to, head: this.sel.head, anchor: this.sel.anchor,
-                 shift: this.sel.shift, extend: false, goalColumn: this.sel.goalColumn};
-      if (copyHistory) {
-        doc.history.undoDepth = this.history.undoDepth;
-        doc.setHistory(this.getHistory());
-      }
-      return doc;
-    },
-
-    linkedDoc: function(options) {
-      if (!options) options = {};
-      var from = this.first, to = this.first + this.size;
-      if (options.from != null && options.from > from) from = options.from;
-      if (options.to != null && options.to < to) to = options.to;
-      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from);
-      if (options.sharedHist) copy.history = this.history;
-      (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
-      copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
-      return copy;
-    },
-    unlinkDoc: function(other) {
-      if (other instanceof CodeMirror) other = other.doc;
-      if (this.linked) for (var i = 0; i < this.linked.length; ++i) {
-        var link = this.linked[i];
-        if (link.doc != other) continue;
-        this.linked.splice(i, 1);
-        other.unlinkDoc(this);
-        break;
-      }
-      // If the histories were shared, split them again
-      if (other.history == this.history) {
-        var splitIds = [other.id];
-        linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true);
-        other.history = makeHistory();
-        other.history.done = copyHistoryArray(this.history.done, splitIds);
-        other.history.undone = copyHistoryArray(this.history.undone, splitIds);
-      }
-    },
-    iterLinkedDocs: function(f) {linkedDocs(this, f);},
-
-    getMode: function() {return this.mode;},
-    getEditor: function() {return this.cm;}
-  });
-
-  Doc.prototype.eachLine = Doc.prototype.iter;
-
-  // The Doc methods that should be available on CodeMirror instances
-  var dontDelegate = "iter insert remove copy getEditor".split(" ");
-  for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
-    CodeMirror.prototype[prop] = (function(method) {
-      return function() {return method.apply(this.doc, arguments);};
-    })(Doc.prototype[prop]);
-
-  eventMixin(Doc);
-
-  function linkedDocs(doc, f, sharedHistOnly) {
-    function propagate(doc, skip, sharedHist) {
-      if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) {
-        var rel = doc.linked[i];
-        if (rel.doc == skip) continue;
-        var shared = sharedHist && rel.sharedHist;
-        if (sharedHistOnly && !shared) continue;
-        f(rel.doc, shared);
-        propagate(rel.doc, doc, shared);
-      }
-    }
-    propagate(doc, null, true);
-  }
-
-  function attachDoc(cm, doc) {
-    if (doc.cm) throw new Error("This document is already in use.");
-    cm.doc = doc;
-    doc.cm = cm;
-    estimateLineHeights(cm);
-    loadMode(cm);
-    if (!cm.options.lineWrapping) computeMaxLength(cm);
-    cm.options.mode = doc.modeOption;
-    regChange(cm);
-  }
-
-  // LINE UTILITIES
-
-  function getLine(chunk, n) {
-    n -= chunk.first;
-    while (!chunk.lines) {
-      for (var i = 0;; ++i) {
-        var child = chunk.children[i], sz = child.chunkSize();
-        if (n < sz) { chunk = child; break; }
-        n -= sz;
-      }
-    }
-    return chunk.lines[n];
-  }
-
-  function getBetween(doc, start, end) {
-    var out = [], n = start.line;
-    doc.iter(start.line, end.line + 1, function(line) {
-      var text = line.text;
-      if (n == end.line) text = text.slice(0, end.ch);
-      if (n == start.line) text = text.slice(start.ch);
-      out.push(text);
-      ++n;
-    });
-    return out;
-  }
-  function getLines(doc, from, to) {
-    var out = [];
-    doc.iter(from, to, function(line) { out.push(line.text); });
-    return out;
-  }
-
-  function updateLineHeight(line, height) {
-    var diff = height - line.height;
-    for (var n = line; n; n = n.parent) n.height += diff;
-  }
-
-  function lineNo(line) {
-    if (line.parent == null) return null;
-    var cur = line.parent, no = indexOf(cur.lines, line);
-    for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
-      for (var i = 0;; ++i) {
-        if (chunk.children[i] == cur) break;
-        no += chunk.children[i].chunkSize();
-      }
-    }
-    return no + cur.first;
-  }
-
-  function lineAtHeight(chunk, h) {
-    var n = chunk.first;
-    outer: do {
-      for (var i = 0, e = chunk.children.length; i < e; ++i) {
-        var child = chunk.children[i], ch = child.height;
-        if (h < ch) { chunk = child; continue outer; }
-        h -= ch;
-        n += child.chunkSize();
-      }
-      return n;
-    } while (!chunk.lines);
-    for (var i = 0, e = chunk.lines.length; i < e; ++i) {
-      var line = chunk.lines[i], lh = line.height;
-      if (h < lh) break;
-      h -= lh;
-    }
-    return n + i;
-  }
-
-  function heightAtLine(cm, lineObj) {
-    lineObj = visualLine(cm.doc, lineObj);
-
-    var h = 0, chunk = lineObj.parent;
-    for (var i = 0; i < chunk.lines.length; ++i) {
-      var line = chunk.lines[i];
-      if (line == lineObj) break;
-      else h += line.height;
-    }
-    for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
-      for (var i = 0; i < p.children.length; ++i) {
-        var cur = p.children[i];
-        if (cur == chunk) break;
-        else h += cur.height;
-      }
-    }
-    return h;
-  }
-
-  function getOrder(line) {
-    var order = line.order;
-    if (order == null) order = line.order = bidiOrdering(line.text);
-    return order;
-  }
-
-  // HISTORY
-
-  function makeHistory(startGen) {
-    return {
-      // Arrays of history events. Doing something adds an event to
-      // done and clears undo. Undoing moves events from done to
-      // undone, redoing moves them in the other direction.
-      done: [], undone: [], undoDepth: Infinity,
-      // Used to track when changes can be merged into a single undo
-      // event
-      lastTime: 0, lastOp: null, lastOrigin: null,
-      // Used by the isClean() method
-      generation: startGen || 1, maxGeneration: startGen || 1
-    };
-  }
-
-  function attachLocalSpans(doc, change, from, to) {
-    var existing = change["spans_" + doc.id], n = 0;
-    doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) {
-      if (line.markedSpans)
-        (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans;
-      ++n;
-    });
-  }
-
-  function historyChangeFromChange(doc, change) {
-    var from = { line: change.from.line, ch: change.from.ch };
-    var histChange = {from: from, to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
-    attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
-    linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true);
-    return histChange;
-  }
-
-  function addToHistory(doc, change, selAfter, opId) {
-    var hist = doc.history;
-    hist.undone.length = 0;
-    var time = +new Date, cur = lst(hist.done);
-
-    if (cur &&
-        (hist.lastOp == opId ||
-         hist.lastOrigin == change.origin && change.origin &&
-         ((change.origin.charAt(0) == "+" && doc.cm && hist.lastTime > time - doc.cm.options.historyEventDelay) ||
-          change.origin.charAt(0) == "*"))) {
-      // Merge this change into the last event
-      var last = lst(cur.changes);
-      if (posEq(change.from, change.to) && posEq(change.from, last.to)) {
-        // Optimized case for simple insertion -- don't want to add
-        // new changesets for every character typed
-        last.to = changeEnd(change);
-      } else {
-        // Add new sub-event
-        cur.changes.push(historyChangeFromChange(doc, change));
-      }
-      cur.anchorAfter = selAfter.anchor; cur.headAfter = selAfter.head;
-    } else {
-      // Can not be merged, start a new event.
-      cur = {changes: [historyChangeFromChange(doc, change)],
-             generation: hist.generation,
-             anchorBefore: doc.sel.anchor, headBefore: doc.sel.head,
-             anchorAfter: selAfter.anchor, headAfter: selAfter.head};
-      hist.done.push(cur);
-      hist.generation = ++hist.maxGeneration;
-      while (hist.done.length > hist.undoDepth)
-        hist.done.shift();
-    }
-    hist.lastTime = time;
-    hist.lastOp = opId;
-    hist.lastOrigin = change.origin;
-  }
-
-  function removeClearedSpans(spans) {
-    if (!spans) return null;
-    for (var i = 0, out; i < spans.length; ++i) {
-      if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i); }
-      else if (out) out.push(spans[i]);
-    }
-    return !out ? spans : out.length ? out : null;
-  }
-
-  function getOldSpans(doc, change) {
-    var found = change["spans_" + doc.id];
-    if (!found) return null;
-    for (var i = 0, nw = []; i < change.text.length; ++i)
-      nw.push(removeClearedSpans(found[i]));
-    return nw;
-  }
-
-  // Used both to provide a JSON-safe object in .getHistory, and, when
-  // detaching a document, to split the history in two
-  function copyHistoryArray(events, newGroup) {
-    for (var i = 0, copy = []; i < events.length; ++i) {
-      var event = events[i], changes = event.changes, newChanges = [];
-      copy.push({changes: newChanges, anchorBefore: event.anchorBefore, headBefore: event.headBefore,
-                 anchorAfter: event.anchorAfter, headAfter: event.headAfter});
-      for (var j = 0; j < changes.length; ++j) {
-        var change = changes[j], m;
-        newChanges.push({from: change.from, to: change.to, text: change.text});
-        if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) {
-          if (indexOf(newGroup, Number(m[1])) > -1) {
-            lst(newChanges)[prop] = change[prop];
-            delete change[prop];
-          }
-        }
-      }
-    }
-    return copy;
-  }
-
-  // Rebasing/resetting history to deal with externally-sourced changes
-
-  function rebaseHistSel(pos, from, to, diff) {
-    if (to < pos.line) {
-      pos.line += diff;
-    } else if (from < pos.line) {
-      pos.line = from;
-      pos.ch = 0;
-    }
-  }
-
-  // Tries to rebase an array of history events given a change in the
-  // document. If the change touches the same lines as the event, the
-  // event, and everything 'behind' it, is discarded. If the change is
-  // before the event, the event's positions are updated. Uses a
-  // copy-on-write scheme for the positions, to avoid having to
-  // reallocate them all on every rebase, but also avoid problems with
-  // shared position objects being unsafely updated.
-  function rebaseHistArray(array, from, to, diff) {
-    for (var i = 0; i < array.length; ++i) {
-      var sub = array[i], ok = true;
-      for (var j = 0; j < sub.changes.length; ++j) {
-        var cur = sub.changes[j];
-        if (!sub.copied) { cur.from = copyPos(cur.from); cur.to = copyPos(cur.to); }
-        if (to < cur.from.line) {
-          cur.from.line += diff;
-          cur.to.line += diff;
-        } else if (from <= cur.to.line) {
-          ok = false;
-          break;
-        }
-      }
-      if (!sub.copied) {
-        sub.anchorBefore = copyPos(sub.anchorBefore); sub.headBefore = copyPos(sub.headBefore);
-        sub.anchorAfter = copyPos(sub.anchorAfter); sub.readAfter = copyPos(sub.headAfter);
-        sub.copied = true;
-      }
-      if (!ok) {
-        array.splice(0, i + 1);
-        i = 0;
-      } else {
-        rebaseHistSel(sub.anchorBefore); rebaseHistSel(sub.headBefore);
-        rebaseHistSel(sub.anchorAfter); rebaseHistSel(sub.headAfter);
-      }
-    }
-  }
-
-  function rebaseHist(hist, change) {
-    var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1;
-    rebaseHistArray(hist.done, from, to, diff);
-    rebaseHistArray(hist.undone, from, to, diff);
-  }
-
-  // EVENT OPERATORS
-
-  function stopMethod() {e_stop(this);}
-  // Ensure an event has a stop method.
-  function addStop(event) {
-    if (!event.stop) event.stop = stopMethod;
-    return event;
-  }
-
-  function e_preventDefault(e) {
-    if (e.preventDefault) e.preventDefault();
-    else e.returnValue = false;
-  }
-  function e_stopPropagation(e) {
-    if (e.stopPropagation) e.stopPropagation();
-    else e.cancelBubble = true;
-  }
-  function e_defaultPrevented(e) {
-    return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false;
-  }
-  function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}
-  CodeMirror.e_stop = e_stop;
-  CodeMirror.e_preventDefault = e_preventDefault;
-  CodeMirror.e_stopPropagation = e_stopPropagation;
-
-  function e_target(e) {return e.target || e.srcElement;}
-  function e_button(e) {
-    var b = e.which;
-    if (b == null) {
-      if (e.button & 1) b = 1;
-      else if (e.button & 2) b = 3;
-      else if (e.button & 4) b = 2;
-    }
-    if (mac && e.ctrlKey && b == 1) b = 3;
-    return b;
-  }
-
-  // EVENT HANDLING
-
-  function on(emitter, type, f) {
-    if (emitter.addEventListener)
-      emitter.addEventListener(type, f, false);
-    else if (emitter.attachEvent)
-      emitter.attachEvent("on" + type, f);
-    else {
-      var map = emitter._handlers || (emitter._handlers = {});
-      var arr = map[type] || (map[type] = []);
-      arr.push(f);
-    }
-  }
-
-  function off(emitter, type, f) {
-    if (emitter.removeEventListener)
-      emitter.removeEventListener(type, f, false);
-    else if (emitter.detachEvent)
-      emitter.detachEvent("on" + type, f);
-    else {
-      var arr = emitter._handlers && emitter._handlers[type];
-      if (!arr) return;
-      for (var i = 0; i < arr.length; ++i)
-        if (arr[i] == f) { arr.splice(i, 1); break; }
-    }
-  }
-
-  function signal(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
-    var args = Array.prototype.slice.call(arguments, 2);
-    for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args);
-  }
-
-  var delayedCallbacks, delayedCallbackDepth = 0;
-  function signalLater(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
-    var args = Array.prototype.slice.call(arguments, 2);
-    if (!delayedCallbacks) {
-      ++delayedCallbackDepth;
-      delayedCallbacks = [];
-      setTimeout(fireDelayed, 0);
-    }
-    function bnd(f) {return function(){f.apply(null, args);};};
-    for (var i = 0; i < arr.length; ++i)
-      delayedCallbacks.push(bnd(arr[i]));
-  }
-
-  function signalDOMEvent(cm, e, override) {
-    signal(cm, override || e.type, cm, e);
-    return e_defaultPrevented(e) || e.codemirrorIgnore;
-  }
-
-  function fireDelayed() {
-    --delayedCallbackDepth;
-    var delayed = delayedCallbacks;
-    delayedCallbacks = null;
-    for (var i = 0; i < delayed.length; ++i) delayed[i]();
-  }
-
-  function hasHandler(emitter, type) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    return arr && arr.length > 0;
-  }
-
-  CodeMirror.on = on; CodeMirror.off = off; CodeMirror.signal = signal;
-
-  function eventMixin(ctor) {
-    ctor.prototype.on = function(type, f) {on(this, type, f);};
-    ctor.prototype.off = function(type, f) {off(this, type, f);};
-  }
-
-  // MISC UTILITIES
-
-  // Number of pixels added to scroller and sizer to hide scrollbar
-  var scrollerCutOff = 30;
-
-  // Returned or thrown by various protocols to signal 'I'm not
-  // handling this'.
-  var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}};
-
-  function Delayed() {this.id = null;}
-  Delayed.prototype = {set: function(ms, f) {clearTimeout(this.id); this.id = setTimeout(f, ms);}};
-
-  // Counts the column offset in a string, taking tabs into account.
-  // Used mostly to find indentation.
-  function countColumn(string, end, tabSize, startIndex, startValue) {
-    if (end == null) {
-      end = string.search(/[^\s\u00a0]/);
-      if (end == -1) end = string.length;
-    }
-    for (var i = startIndex || 0, n = startValue || 0; i < end; ++i) {
-      if (string.charAt(i) == "\t") n += tabSize - (n % tabSize);
-      else ++n;
-    }
-    return n;
-  }
-  CodeMirror.countColumn = countColumn;
-
-  var spaceStrs = [""];
-  function spaceStr(n) {
-    while (spaceStrs.length <= n)
-      spaceStrs.push(lst(spaceStrs) + " ");
-    return spaceStrs[n];
-  }
-
-  function lst(arr) { return arr[arr.length-1]; }
-
-  function selectInput(node) {
-    if (ios) { // Mobile Safari apparently has a bug where select() is broken.
-      node.selectionStart = 0;
-      node.selectionEnd = node.value.length;
-    } else {
-      // Suppress mysterious IE10 errors
-      try { node.select(); }
-      catch(_e) {}
-    }
-  }
-
-  function indexOf(collection, elt) {
-    if (collection.indexOf) return collection.indexOf(elt);
-    for (var i = 0, e = collection.length; i < e; ++i)
-      if (collection[i] == elt) return i;
-    return -1;
-  }
-
-  function createObj(base, props) {
-    function Obj() {}
-    Obj.prototype = base;
-    var inst = new Obj();
-    if (props) copyObj(props, inst);
-    return inst;
-  }
-
-  function copyObj(obj, target) {
-    if (!target) target = {};
-    for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
-    return target;
-  }
-
-  function emptyArray(size) {
-    for (var a = [], i = 0; i < size; ++i) a.push(undefined);
-    return a;
-  }
-
-  function bind(f) {
-    var args = Array.prototype.slice.call(arguments, 1);
-    return function(){return f.apply(null, args);};
-  }
-
-  var nonASCIISingleCaseWordChar = /[\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
-  function isWordChar(ch) {
-    return /\w/.test(ch) || ch > "\x80" &&
-      (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));
-  }
-
-  function isEmpty(obj) {
-    for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false;
-    return true;
-  }
-
-  var isExtendingChar = /[\u0300-\u036F\u0483-\u0487\u0488-\u0489\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\uA66F\u1DC0–\u1DFF\u20D0–\u20FF\uA670-\uA672\uA674-\uA67D\uA69F\udc00-\udfff\uFE20–\uFE2F]/;
-
-  // DOM UTILITIES
-
-  function elt(tag, content, className, style) {
-    var e = document.createElement(tag);
-    if (className) e.className = className;
-    if (style) e.style.cssText = style;
-    if (typeof content == "string") setTextContent(e, content);
-    else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
-    return e;
-  }
-
-  function removeChildren(e) {
-    for (var count = e.childNodes.length; count > 0; --count)
-      e.removeChild(e.firstChild);
-    return e;
-  }
-
-  function removeChildrenAndAdd(parent, e) {
-    return removeChildren(parent).appendChild(e);
-  }
-
-  function setTextContent(e, str) {
-    if (ie_lt9) {
-      e.innerHTML = "";
-      e.appendChild(document.createTextNode(str));
-    } else e.textContent = str;
-  }
-
-  function getRect(node) {
-    return node.getBoundingClientRect();
-  }
-  CodeMirror.replaceGetRect = function(f) { getRect = f; };
-
-  // FEATURE DETECTION
-
-  // Detect drag-and-drop
-  var dragAndDrop = function() {
-    // There is *some* kind of drag-and-drop support in IE6-8, but I
-    // couldn't get it to work yet.
-    if (ie_lt9) return false;
-    var div = elt('div');
-    return "draggable" in div || "dragDrop" in div;
-  }();
-
-  // For a reason I have yet to figure out, some browsers disallow
-  // word wrapping between certain characters *only* if a new inline
-  // element is started between them. This makes it hard to reliably
-  // measure the position of things, since that requires inserting an
-  // extra span. This terribly fragile set of tests matches the
-  // character combinations that suffer from this phenomenon on the
-  // various browsers.
-  function spanAffectsWrapping() { return false; }
-  if (gecko) // Only for "$'"
-    spanAffectsWrapping = function(str, i) {
-      return str.charCodeAt(i - 1) == 36 && str.charCodeAt(i) == 39;
-    };
-  else if (safari && !/Version\/([6-9]|\d\d)\b/.test(navigator.userAgent))
-    spanAffectsWrapping = function(str, i) {
-      return /\-[^ \-?]|\?[^ !\'\"\),.\-\/:;\?\]\}]/.test(str.slice(i - 1, i + 1));
-    };
-  else if (webkit && /Chrome\/(?:29|[3-9]\d|\d\d\d)\./.test(navigator.userAgent))
-    spanAffectsWrapping = function(str, i) {
-      var code = str.charCodeAt(i - 1);
-      return code >= 8208 && code <= 8212;
-    };
-  else if (webkit)
-    spanAffectsWrapping = function(str, i) {
-      if (i > 1 && str.charCodeAt(i - 1) == 45) {
-        if (/\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i))) return true;
-        if (i > 2 && /[\d\.,]/.test(str.charAt(i - 2)) && /[\d\.,]/.test(str.charAt(i))) return false;
-      }
-      return /[~!#%&*)=+}\]\\|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|…[\w~`@#$%\^&*(_=+{[><]/.test(str.slice(i - 1, i + 1));
-    };
-
-  var knownScrollbarWidth;
-  function scrollbarWidth(measure) {
-    if (knownScrollbarWidth != null) return knownScrollbarWidth;
-    var test = elt("div", null, null, "width: 50px; height: 50px; overflow-x: scroll");
-    removeChildrenAndAdd(measure, test);
-    if (test.offsetWidth)
-      knownScrollbarWidth = test.offsetHeight - test.clientHeight;
-    return knownScrollbarWidth || 0;
-  }
-
-  var zwspSupported;
-  function zeroWidthElement(measure) {
-    if (zwspSupported == null) {
-      var test = elt("span", "\u200b");
-      removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
-      if (measure.firstChild.offsetHeight != 0)
-        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !ie_lt8;
-    }
-    if (zwspSupported) return elt("span", "\u200b");
-    else return elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
-  }
-
-  // See if "".split is the broken IE version, if so, provide an
-  // alternative way to split lines.
-  var splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
-    var pos = 0, result = [], l = string.length;
-    while (pos <= l) {
-      var nl = string.indexOf("\n", pos);
-      if (nl == -1) nl = string.length;
-      var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);
-      var rt = line.indexOf("\r");
-      if (rt != -1) {
-        result.push(line.slice(0, rt));
-        pos += rt + 1;
-      } else {
-        result.push(line);
-        pos = nl + 1;
-      }
-    }
-    return result;
-  } : function(string){return string.split(/\r\n?|\n/);};
-  CodeMirror.splitLines = splitLines;
-
-  var hasSelection = window.getSelection ? function(te) {
-    try { return te.selectionStart != te.selectionEnd; }
-    catch(e) { return false; }
-  } : function(te) {
-    try {var range = te.ownerDocument.selection.createRange();}
-    catch(e) {}
-    if (!range || range.parentElement() != te) return false;
-    return range.compareEndPoints("StartToEnd", range) != 0;
-  };
-
-  var hasCopyEvent = (function() {
-    var e = elt("div");
-    if ("oncopy" in e) return true;
-    e.setAttribute("oncopy", "return;");
-    return typeof e.oncopy == 'function';
-  })();
-
-  // KEY NAMING
-
-  var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
-                  19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
-                  36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
-                  46: "Delete", 59: ";", 91: "Mod", 92: "Mod", 93: "Mod", 109: "-", 107: "=", 127: "Delete",
-                  186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
-                  221: "]", 222: "'", 63276: "PageUp", 63277: "PageDown", 63275: "End", 63273: "Home",
-                  63234: "Left", 63232: "Up", 63235: "Right", 63233: "Down", 63302: "Insert", 63272: "Delete"};
-  CodeMirror.keyNames = keyNames;
-  (function() {
-    // Number keys
-    for (var i = 0; i < 10; i++) keyNames[i + 48] = String(i);
-    // Alphabetic keys
-    for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i);
-    // Function keys
-    for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
-  })();
-
-  // BIDI HELPERS
-
-  function iterateBidiSections(order, from, to, f) {
-    if (!order) return f(from, to, "ltr");
-    var found = false;
-    for (var i = 0; i < order.length; ++i) {
-      var part = order[i];
-      if (part.from < to && part.to > from || from == to && part.to == from) {
-        f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr");
-        found = true;
-      }
-    }
-    if (!found) f(from, to, "ltr");
-  }
-
-  function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }
-  function bidiRight(part) { return part.level % 2 ? part.from : part.to; }
-
-  function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0; }
-  function lineRight(line) {
-    var order = getOrder(line);
-    if (!order) return line.text.length;
-    return bidiRight(lst(order));
-  }
-
-  function lineStart(cm, lineN) {
-    var line = getLine(cm.doc, lineN);
-    var visual = visualLine(cm.doc, line);
-    if (visual != line) lineN = lineNo(visual);
-    var order = getOrder(visual);
-    var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual);
-    return Pos(lineN, ch);
-  }
-  function lineEnd(cm, lineN) {
-    var merged, line;
-    while (merged = collapsedSpanAtEnd(line = getLine(cm.doc, lineN)))
-      lineN = merged.find().to.line;
-    var order = getOrder(line);
-    var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line);
-    return Pos(lineN, ch);
-  }
-
-  function compareBidiLevel(order, a, b) {
-    var linedir = order[0].level;
-    if (a == linedir) return true;
-    if (b == linedir) return false;
-    return a < b;
-  }
-  var bidiOther;
-  function getBidiPartAt(order, pos) {
-    for (var i = 0, found; i < order.length; ++i) {
-      var cur = order[i];
-      if (cur.from < pos && cur.to > pos) { bidiOther = null; return i; }
-      if (cur.from == pos || cur.to == pos) {
-        if (found == null) {
-          found = i;
-        } else if (compareBidiLevel(order, cur.level, order[found].level)) {
-          bidiOther = found;
-          return i;
-        } else {
-          bidiOther = i;
-          return found;
-        }
-      }
-    }
-    bidiOther = null;
-    return found;
-  }
-
-  function moveInLine(line, pos, dir, byUnit) {
-    if (!byUnit) return pos + dir;
-    do pos += dir;
-    while (pos > 0 && isExtendingChar.test(line.text.charAt(pos)));
-    return pos;
-  }
-
-  // This is somewhat involved. It is needed in order to move
-  // 'visually' through bi-directional text -- i.e., pressing left
-  // should make the cursor go left, even when in RTL text. The
-  // tricky part is the 'jumps', where RTL and LTR text touch each
-  // other. This often requires the cursor offset to move more than
-  // one unit, in order to visually move one unit.
-  function moveVisually(line, start, dir, byUnit) {
-    var bidi = getOrder(line);
-    if (!bidi) return moveLogically(line, start, dir, byUnit);
-    var pos = getBidiPartAt(bidi, start), part = bidi[pos];
-    var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit);
-
-    for (;;) {
-      if (target > part.from && target < part.to) return target;
-      if (target == part.from || target == part.to) {
-        if (getBidiPartAt(bidi, target) == pos) return target;
-        part = bidi[pos += dir];
-        return (dir > 0) == part.level % 2 ? part.to : part.from;
-      } else {
-        part = bidi[pos += dir];
-        if (!part) return null;
-        if ((dir > 0) == part.level % 2)
-          target = moveInLine(line, part.to, -1, byUnit);
-        else
-          target = moveInLine(line, part.from, 1, byUnit);
-      }
-    }
-  }
-
-  function moveLogically(line, start, dir, byUnit) {
-    var target = start + dir;
-    if (byUnit) while (target > 0 && isExtendingChar.test(line.text.charAt(target))) target += dir;
-    return target < 0 || target > line.text.length ? null : target;
-  }
-
-  // Bidirectional ordering algorithm
-  // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
-  // that this (partially) implements.
-
-  // One-char codes used for character types:
-  // L (L):   Left-to-Right
-  // R (R):   Right-to-Left
-  // r (AL):  Right-to-Left Arabic
-  // 1 (EN):  European Number
-  // + (ES):  European Number Separator
-  // % (ET):  European Number Terminator
-  // n (AN):  Arabic Number
-  // , (CS):  Common Number Separator
-  // m (NSM): Non-Spacing Mark
-  // b (BN):  Boundary Neutral
-  // s (B):   Paragraph Separator
-  // t (S):   Segment Separator
-  // w (WS):  Whitespace
-  // N (ON):  Other Neutrals
-
-  // Returns null if characters are ordered as they appear
-  // (left-to-right), or an array of sections ({from, to, level}
-  // objects) in the order in which they occur visually.
-  var bidiOrdering = (function() {
-    // Character types for codepoints 0 to 0xff
-    var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLL";
-    // Character types for codepoints 0x600 to 0x6ff
-    var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmmrrrrrrrrrrrrrrrrrr";
-    function charType(code) {
-      if (code <= 0xff) return lowTypes.charAt(code);
-      else if (0x590 <= code && code <= 0x5f4) return "R";
-      else if (0x600 <= code && code <= 0x6ff) return arabicTypes.charAt(code - 0x600);
-      else if (0x700 <= code && code <= 0x8ac) return "r";
-      else return "L";
-    }
-
-    var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
-    var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;
-    // Browsers seem to always treat the boundaries of block elements as being L.
-    var outerType = "L";
-
-    return function(str) {
-      if (!bidiRE.test(str)) return false;
-      var len = str.length, types = [];
-      for (var i = 0, type; i < len; ++i)
-        types.push(type = charType(str.charCodeAt(i)));
-
-      // W1. Examine each non-spacing mark (NSM) in the level run, and
-      // change the type of the NSM to the type of the previous
-      // character. If the NSM is at the start of the level run, it will
-      // get the type of sor.
-      for (var i = 0, prev = outerType; i < len; ++i) {
-        var type = types[i];
-        if (type == "m") types[i] = prev;
-        else prev = type;
-      }
-
-      // W2. Search backwards from each instance of a European number
-      // until the first strong type (R, L, AL, or sor) is found. If an
-      // AL is found, change the type of the European number to Arabic
-      // number.
-      // W3. Change all ALs to R.
-      for (var i = 0, cur = outerType; i < len; ++i) {
-        var type = types[i];
-        if (type == "1" && cur == "r") types[i] = "n";
-        else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R"; }
-      }
-
-      // W4. A single European separator between two European numbers
-      // changes to a European number. A single common separator between
-      // two numbers of the same type changes to that type.
-      for (var i = 1, prev = types[0]; i < len - 1; ++i) {
-        var type = types[i];
-        if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1";
-        else if (type == "," && prev == types[i+1] &&
-                 (prev == "1" || prev == "n")) types[i] = prev;
-        prev = type;
-      }
-
-      // W5. A sequence of European terminators adjacent to European
-      // numbers changes to all European numbers.
-      // W6. Otherwise, separators and terminators change to Other
-      // Neutral.
-      for (var i = 0; i < len; ++i) {
-        var type = types[i];
-        if (type == ",") types[i] = "N";
-        else if (type == "%") {
-          for (var end = i + 1; end < len && types[end] == "%"; ++end) {}
-          var replace = (i && types[i-1] == "!") || (end < len - 1 && types[end] == "1") ? "1" : "N";
-          for (var j = i; j < end; ++j) types[j] = replace;
-          i = end - 1;
-        }
-      }
-
-      // W7. Search backwards from each instance of a European number
-      // until the first strong type (R, L, or sor) is found. If an L is
-      // found, then change the type of the European number to L.
-      for (var i = 0, cur = outerType; i < len; ++i) {
-        var type = types[i];
-        if (cur == "L" && type == "1") types[i] = "L";
-        else if (isStrong.test(type)) cur = type;
-      }
-
-      // N1. A sequence of neutrals takes the direction of the
-      // surrounding strong text if the text on both sides has the same
-      // direction. European and Arabic numbers act as if they were R in
-      // terms of their influence on neutrals. Start-of-level-run (sor)
-      // and end-of-level-run (eor) are used at level run boundaries.
-      // N2. Any remaining neutrals take the embedding direction.
-      for (var i = 0; i < len; ++i) {
-        if (isNeutral.test(types[i])) {
-          for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
-          var before = (i ? types[i-1] : outerType) == "L";
-          var after = (end < len - 1 ? types[end] : outerType) == "L";
-          var replace = before || after ? "L" : "R";
-          for (var j = i; j < end; ++j) types[j] = replace;
-          i = end - 1;
-        }
-      }
-
-      // Here we depart from the documented algorithm, in order to avoid
-      // building up an actual levels array. Since there are only three
-      // levels (0, 1, 2) in an implementation that doesn't take
-      // explicit embedding into account, we can build up the order on
-      // the fly, without following the level-based algorithm.
-      var order = [], m;
-      for (var i = 0; i < len;) {
-        if (countsAsLeft.test(types[i])) {
-          var start = i;
-          for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
-          order.push({from: start, to: i, level: 0});
-        } else {
-          var pos = i, at = order.length;
-          for (++i; i < len && types[i] != "L"; ++i) {}
-          for (var j = pos; j < i;) {
-            if (countsAsNum.test(types[j])) {
-              if (pos < j) order.splice(at, 0, {from: pos, to: j, level: 1});
-              var nstart = j;
-              for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
-              order.splice(at, 0, {from: nstart, to: j, level: 2});
-              pos = j;
-            } else ++j;
-          }
-          if (pos < i) order.splice(at, 0, {from: pos, to: i, level: 1});
-        }
-      }
-      if (order[0].level == 1 && (m = str.match(/^\s+/))) {
-        order[0].from = m[0].length;
-        order.unshift({from: 0, to: m[0].length, level: 0});
-      }
-      if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
-        lst(order).to -= m[0].length;
-        order.push({from: len - m[0].length, to: len, level: 0});
-      }
-      if (order[0].level != lst(order).level)
-        order.push({from: len, to: len, level: order[0].level});
-
-      return order;
-    };
-  })();
-
-  // THE END
-
-  CodeMirror.version = "3.20.0";
-
-  return CodeMirror;
-})();
diff --git a/resources/libs/codemirror/lib/codemirror.min.js b/resources/libs/codemirror/lib/codemirror.min.js
deleted file mode 100644
index 9500ada7b..000000000
--- a/resources/libs/codemirror/lib/codemirror.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-window.CodeMirror=function(){"use strict";function x(a,c){if(!(this instanceof x))return new x(a,c);this.options=c=c||{};for(var d in _c)!c.hasOwnProperty(d)&&_c.hasOwnProperty(d)&&(c[d]=_c[d]);J(c);var e="string"==typeof c.value?0:c.value.first,f=this.display=y(a,e);f.wrapper.CodeMirror=this,G(this),c.autofocus&&!p&&Nb(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,draggingText:!1,highlight:new Xe},E(this),c.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap");var g=c.value;"string"==typeof g&&(g=new ge(c.value,c.mode)),Fb(this,ke)(this,g),b&&setTimeout(ff(Mb,this,!0),20),Pb(this);var h;try{h=document.activeElement==f.input}catch(i){}h||c.autofocus&&!p?setTimeout(ff(mc,this),20):nc(this),Fb(this,function(){for(var a in $c)$c.propertyIsEnumerable(a)&&$c[a](this,c[a],bd);for(var b=0;b<fd.length;++b)fd[b](this)})()}function y(a,b){var d={},e=d.input=lf("textarea",null,null,"position: absolute; padding: 0; width: 1px; height: 1em; outline: none; font-size: 4px;");return f?e.style.width="1000px":e.setAttribute("wrap","off"),o&&(e.style.border="1px solid black"),e.setAttribute("autocorrect","off"),e.setAttribute("autocapitalize","off"),e.setAttribute("spellcheck","false"),d.inputDiv=lf("div",[e],null,"overflow: hidden; position: relative; width: 3px; height: 0px;"),d.scrollbarH=lf("div",[lf("div",null,null,"height: 1px")],"CodeMirror-hscrollbar"),d.scrollbarV=lf("div",[lf("div",null,null,"width: 1px")],"CodeMirror-vscrollbar"),d.scrollbarFiller=lf("div",null,"CodeMirror-scrollbar-filler"),d.gutterFiller=lf("div",null,"CodeMirror-gutter-filler"),d.lineDiv=lf("div",null,"CodeMirror-code"),d.selectionDiv=lf("div",null,null,"position: relative; z-index: 1"),d.cursor=lf("div","\xa0","CodeMirror-cursor"),d.otherCursor=lf("div","\xa0","CodeMirror-cursor CodeMirror-secondarycursor"),d.measure=lf("div",null,"CodeMirror-measure"),d.lineSpace=lf("div",[d.measure,d.selectionDiv,d.lineDiv,d.cursor,d.otherCursor],null,"position: relative; outline: none"),d.mover=lf("div",[lf("div",[d.lineSpace],"CodeMirror-lines")],null,"position: relative"),d.sizer=lf("div",[d.mover],"CodeMirror-sizer"),d.heightForcer=lf("div",null,null,"position: absolute; height: "+Ve+"px; width: 1px;"),d.gutters=lf("div",null,"CodeMirror-gutters"),d.lineGutter=null,d.scroller=lf("div",[d.sizer,d.heightForcer,d.gutters],"CodeMirror-scroll"),d.scroller.setAttribute("tabIndex","-1"),d.wrapper=lf("div",[d.inputDiv,d.scrollbarH,d.scrollbarV,d.scrollbarFiller,d.gutterFiller,d.scroller],"CodeMirror"),c&&(d.gutters.style.zIndex=-1,d.scroller.style.paddingRight=0),a.appendChild?a.appendChild(d.wrapper):a(d.wrapper),o&&(e.style.width="0px"),f||(d.scroller.draggable=!0),k?(d.inputDiv.style.height="1px",d.inputDiv.style.position="absolute"):c&&(d.scrollbarH.style.minWidth=d.scrollbarV.style.minWidth="18px"),d.viewOffset=d.lastSizeC=0,d.showingFrom=d.showingTo=b,d.lineNumWidth=d.lineNumInnerWidth=d.lineNumChars=null,d.prevInput="",d.alignWidgets=!1,d.pollingFast=!1,d.poll=new Xe,d.cachedCharWidth=d.cachedTextHeight=null,d.measureLineCache=[],d.measureLineCachePos=0,d.inaccurateSelection=!1,d.maxLine=null,d.maxLineLength=0,d.maxLineChanged=!1,d.wheelDX=d.wheelDY=d.wheelStartX=d.wheelStartY=null,d}function z(a){a.doc.mode=x.getMode(a.options,a.doc.modeOption),a.doc.iter(function(a){a.stateAfter&&(a.stateAfter=null),a.styles&&(a.styles=null)}),a.doc.frontier=a.doc.first,bb(a,100),a.state.modeGen++,a.curOp&&Ib(a)}function A(a){a.options.lineWrapping?(a.display.wrapper.className+=" CodeMirror-wrap",a.display.sizer.style.minWidth=""):(a.display.wrapper.className=a.display.wrapper.className.replace(" CodeMirror-wrap",""),I(a)),C(a),Ib(a),pb(a),setTimeout(function(){K(a)},100)}function B(a){var b=Ab(a.display),c=a.options.lineWrapping,d=c&&Math.max(5,a.display.scroller.clientWidth/Bb(a.display)-3);return function(e){return Gd(a.doc,e)?0:c?(Math.ceil(e.text.length/d)||1)*b:b}}function C(a){var b=a.doc,c=B(a);b.iter(function(a){var b=c(a);b!=a.height&&oe(a,b)})}function D(a){var b=kd[a.options.keyMap],c=b.style;a.display.wrapper.className=a.display.wrapper.className.replace(/\s*cm-keymap-\S+/g,"")+(c?" cm-keymap-"+c:""),a.state.disableInput=b.disableInput}function E(a){a.display.wrapper.className=a.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+a.options.theme.replace(/(^|\s)\s*/g," cm-s-"),pb(a)}function F(a){G(a),Ib(a),setTimeout(function(){M(a)},20)}function G(a){var b=a.display.gutters,c=a.options.gutters;mf(b);for(var d=0;d<c.length;++d){var e=c[d],f=b.appendChild(lf("div",null,"CodeMirror-gutter "+e));"CodeMirror-linenumbers"==e&&(a.display.lineGutter=f,f.style.width=(a.display.lineNumWidth||1)+"px")}b.style.display=d?"":"none"}function H(a,b){if(0==b.height)return 0;for(var d,c=b.text.length,e=b;d=Dd(e);){var f=d.find();e=le(a,f.from.line),c+=f.from.ch-f.to.ch}for(e=b;d=Ed(e);){var f=d.find();c-=e.text.length-f.from.ch,e=le(a,f.to.line),c+=e.text.length-f.to.ch}return c}function I(a){var b=a.display,c=a.doc;b.maxLine=le(c,c.first),b.maxLineLength=H(c,b.maxLine),b.maxLineChanged=!0,c.iter(function(a){var d=H(c,a);d>b.maxLineLength&&(b.maxLineLength=d,b.maxLine=a)})}function J(a){var b=bf(a.gutters,"CodeMirror-linenumbers");-1==b&&a.lineNumbers?a.gutters=a.gutters.concat(["CodeMirror-linenumbers"]):b>-1&&!a.lineNumbers&&(a.gutters=a.gutters.slice(0),a.gutters.splice(b,1))}function K(a){var b=a.display,c=a.doc.height,d=c+gb(b);b.sizer.style.minHeight=b.heightForcer.style.top=d+"px",b.gutters.style.height=Math.max(d,b.scroller.clientHeight-Ve)+"px";var e=Math.max(d,b.scroller.scrollHeight),f=b.scroller.scrollWidth>b.scroller.clientWidth+1,g=e>b.scroller.clientHeight+1;g?(b.scrollbarV.style.display="block",b.scrollbarV.style.bottom=f?tf(b.measure)+"px":"0",b.scrollbarV.firstChild.style.height=e-b.scroller.clientHeight+b.scrollbarV.clientHeight+"px"):(b.scrollbarV.style.display="",b.scrollbarV.firstChild.style.height="0"),f?(b.scrollbarH.style.display="block",b.scrollbarH.style.right=g?tf(b.measure)+"px":"0",b.scrollbarH.firstChild.style.width=b.scroller.scrollWidth-b.scroller.clientWidth+b.scrollbarH.clientWidth+"px"):(b.scrollbarH.style.display="",b.scrollbarH.firstChild.style.width="0"),f&&g?(b.scrollbarFiller.style.display="block",b.scrollbarFiller.style.height=b.scrollbarFiller.style.width=tf(b.measure)+"px"):b.scrollbarFiller.style.display="",f&&a.options.coverGutterNextToScrollbar&&a.options.fixedGutter?(b.gutterFiller.style.display="block",b.gutterFiller.style.height=tf(b.measure)+"px",b.gutterFiller.style.width=b.gutters.offsetWidth+"px"):b.gutterFiller.style.display="",l&&0===tf(b.measure)&&(b.scrollbarV.style.minWidth=b.scrollbarH.style.minHeight=m?"18px":"12px",b.scrollbarV.style.pointerEvents=b.scrollbarH.style.pointerEvents="none")}function L(a,b,c){var d=a.scroller.scrollTop,e=a.wrapper.clientHeight;"number"==typeof c?d=c:c&&(d=c.top,e=c.bottom-c.top),d=Math.floor(d-fb(a));var f=Math.ceil(d+e);return{from:qe(b,d),to:qe(b,f)}}function M(a){var b=a.display;if(b.alignWidgets||b.gutters.firstChild&&a.options.fixedGutter){for(var c=P(b)-b.scroller.scrollLeft+a.doc.scrollLeft,d=b.gutters.offsetWidth,e=c+"px",f=b.lineDiv.firstChild;f;f=f.nextSibling)if(f.alignable)for(var g=0,h=f.alignable;g<h.length;++g)h[g].style.left=e;a.options.fixedGutter&&(b.gutters.style.left=c+d+"px")}}function N(a){if(!a.options.lineNumbers)return!1;var b=a.doc,c=O(a.options,b.first+b.size-1),d=a.display;if(c.length!=d.lineNumChars){var e=d.measure.appendChild(lf("div",[lf("div",c)],"CodeMirror-linenumber CodeMirror-gutter-elt")),f=e.firstChild.offsetWidth,g=e.offsetWidth-f;return d.lineGutter.style.width="",d.lineNumInnerWidth=Math.max(f,d.lineGutter.offsetWidth-g),d.lineNumWidth=d.lineNumInnerWidth+g,d.lineNumChars=d.lineNumInnerWidth?c.length:-1,d.lineGutter.style.width=d.lineNumWidth+"px",!0}return!1}function O(a,b){return String(a.lineNumberFormatter(b+a.firstLineNumber))}function P(a){return pf(a.scroller).left-pf(a.sizer).left}function Q(a,b,c,d){for(var g,e=a.display.showingFrom,f=a.display.showingTo,h=L(a.display,a.doc,c),i=!0;;i=!1){var j=a.display.scroller.clientWidth;if(!R(a,b,h,d))break;if(g=!0,b=[],Z(a),K(a),i&&a.options.lineWrapping&&j!=a.display.scroller.clientWidth)d=!0;else if(d=!1,c&&(c=Math.min(a.display.scroller.scrollHeight-a.display.scroller.clientHeight,"number"==typeof c?c:c.top)),h=L(a.display,a.doc,c),h.from>=a.display.showingFrom&&h.to<=a.display.showingTo)break}return g&&(Qe(a,"update",a),(a.display.showingFrom!=e||a.display.showingTo!=f)&&Qe(a,"viewportChange",a,a.display.showingFrom,a.display.showingTo)),g}function R(a,b,c,d){var e=a.display,f=a.doc;if(!e.wrapper.clientWidth)return e.showingFrom=e.showingTo=f.first,e.viewOffset=0,void 0;if(!(!d&&0==b.length&&c.from>e.showingFrom&&c.to<e.showingTo)){N(a)&&(b=[{from:f.first,to:f.first+f.size}]);var g=e.sizer.style.marginLeft=e.gutters.offsetWidth+"px";e.scrollbarH.style.left=a.options.fixedGutter?g:"0";var h=1/0;if(a.options.lineNumbers)for(var i=0;i<b.length;++i)b[i].diff&&b[i].from<h&&(h=b[i].from);var j=f.first+f.size,k=Math.max(c.from-a.options.viewportMargin,f.first),l=Math.min(j,c.to+a.options.viewportMargin);if(e.showingFrom<k&&k-e.showingFrom<20&&(k=Math.max(f.first,e.showingFrom)),e.showingTo>l&&e.showingTo-l<20&&(l=Math.min(j,e.showingTo)),w)for(k=pe(Fd(f,le(f,k)));j>l&&Gd(f,le(f,l));)++l;var m=[{from:Math.max(e.showingFrom,f.first),to:Math.min(e.showingTo,j)}];if(m=m[0].from>=m[0].to?[]:U(m,b),w)for(var i=0;i<m.length;++i)for(var o,n=m[i];o=Ed(le(f,n.to-1));){var p=o.find().from.line;if(!(p>n.from)){m.splice(i--,1);break}n.to=p}for(var q=0,i=0;i<m.length;++i){var n=m[i];n.from<k&&(n.from=k),n.to>l&&(n.to=l),n.from>=n.to?m.splice(i--,1):q+=n.to-n.from}if(!d&&q==l-k&&k==e.showingFrom&&l==e.showingTo)return T(a),void 0;m.sort(function(a,b){return a.from-b.from});try{var r=document.activeElement}catch(s){}.7*(l-k)>q&&(e.lineDiv.style.display="none"),W(a,k,l,m,h),e.lineDiv.style.display="",r&&document.activeElement!=r&&r.offsetHeight&&r.focus();var t=k!=e.showingFrom||l!=e.showingTo||e.lastSizeC!=e.wrapper.clientHeight;return t&&(e.lastSizeC=e.wrapper.clientHeight,bb(a,400)),e.showingFrom=k,e.showingTo=l,S(a),T(a),!0}}function S(a){for(var f,b=a.display,d=b.lineDiv.offsetTop,e=b.lineDiv.firstChild;e;e=e.nextSibling)if(e.lineObj){if(c){var g=e.offsetTop+e.offsetHeight;f=g-d,d=g}else{var h=pf(e);f=h.bottom-h.top}var i=e.lineObj.height-f;if(2>f&&(f=Ab(b)),i>.001||-.001>i){oe(e.lineObj,f);var j=e.lineObj.widgets;if(j)for(var k=0;k<j.length;++k)j[k].height=j[k].node.offsetHeight}}}function T(a){var b=a.display.viewOffset=re(a,le(a.doc,a.display.showingFrom));a.display.mover.style.top=b+"px"}function U(a,b){for(var c=0,d=b.length||0;d>c;++c){for(var e=b[c],f=[],g=e.diff||0,h=0,i=a.length;i>h;++h){var j=a[h];e.to<=j.from&&e.diff?f.push({from:j.from+g,to:j.to+g}):e.to<=j.from||e.from>=j.to?f.push(j):(e.from>j.from&&f.push({from:j.from,to:e.from}),e.to<j.to&&f.push({from:e.to+g,to:j.to+g}))}a=f}return a}function V(a){for(var b=a.display,c={},d={},e=b.gutters.firstChild,f=0;e;e=e.nextSibling,++f)c[a.options.gutters[f]]=e.offsetLeft,d[a.options.gutters[f]]=e.offsetWidth;return{fixedPos:P(b),gutterTotalWidth:b.gutters.offsetWidth,gutterLeft:c,gutterWidth:d,wrapperWidth:b.wrapper.clientWidth}}function W(a,b,c,d,e){function l(b){var c=b.nextSibling;return f&&q&&a.display.currentWheelTarget==b?(b.style.display="none",b.lineObj=null):b.parentNode.removeChild(b),c}var g=V(a),h=a.display,i=a.options.lineNumbers;d.length||f&&a.display.currentWheelTarget||mf(h.lineDiv);var j=h.lineDiv,k=j.firstChild,m=d.shift(),n=b;for(a.doc.iter(b,c,function(b){if(m&&m.to==n&&(m=d.shift()),Gd(a.doc,b)){if(0!=b.height&&oe(b,0),b.widgets&&k&&k.previousSibling)for(var c=0;c<b.widgets.length;++c){var f=b.widgets[c];if(f.showIfHidden){var h=k.previousSibling;if(/pre/i.test(h.nodeName)){var o=lf("div",null,null,"position: relative");h.parentNode.replaceChild(o,h),o.appendChild(h),h=o}var p=h.appendChild(lf("div",[f.node],"CodeMirror-linewidget"));f.handleMouseEvents||(p.ignoreEvents=!0),Y(f,p,h,g)}}}else if(m&&m.from<=n&&m.to>n){for(;k.lineObj!=b;)k=l(k);i&&n>=e&&k.lineNumber&&of(k.lineNumber,O(a.options,n)),k=k.nextSibling}else{if(b.widgets)for(var s,q=0,r=k;r&&20>q;++q,r=r.nextSibling)if(r.lineObj==b&&/div/i.test(r.nodeName)){s=r;break}var t=X(a,b,n,g,s);if(t!=s)j.insertBefore(t,k);else{for(;k!=s;)k=l(k);k=k.nextSibling}t.lineObj=b}++n});k;)k=l(k)}function X(a,b,d,e,f){var k,g=Xd(a,b),h=g.pre,i=b.gutterMarkers,j=a.display,l=g.bgClass?g.bgClass+" "+(b.bgClass||""):b.bgClass;if(!(a.options.lineNumbers||i||l||b.wrapClass||b.widgets))return h;if(f){f.alignable=null;for(var q,m=!0,n=0,o=null,p=f.firstChild;p;p=q)if(q=p.nextSibling,/\bCodeMirror-linewidget\b/.test(p.className)){for(var r=0;r<b.widgets.length;++r){var s=b.widgets[r];if(s.node==p.firstChild){s.above||o||(o=p),Y(s,p,f,e),++n;break}}if(r==b.widgets.length){m=!1;break}}else f.removeChild(p);f.insertBefore(h,o),m&&n==b.widgets.length&&(k=f,f.className=b.wrapClass||"")}if(k||(k=lf("div",null,b.wrapClass,"position: relative"),k.appendChild(h)),l&&k.insertBefore(lf("div",null,l+" CodeMirror-linebackground"),k.firstChild),a.options.lineNumbers||i){var t=k.insertBefore(lf("div",null,null,"position: absolute; left: "+(a.options.fixedGutter?e.fixedPos:-e.gutterTotalWidth)+"px"),k.firstChild);if(a.options.fixedGutter&&(k.alignable||(k.alignable=[])).push(t),!a.options.lineNumbers||i&&i["CodeMirror-linenumbers"]||(k.lineNumber=t.appendChild(lf("div",O(a.options,d),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+e.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+j.lineNumInnerWidth+"px"))),i)for(var u=0;u<a.options.gutters.length;++u){var v=a.options.gutters[u],w=i.hasOwnProperty(v)&&i[v];w&&t.appendChild(lf("div",[w],"CodeMirror-gutter-elt","left: "+e.gutterLeft[v]+"px; width: "+e.gutterWidth[v]+"px"))}}if(c&&(k.style.zIndex=2),b.widgets&&k!=f)for(var r=0,x=b.widgets;r<x.length;++r){var s=x[r],y=lf("div",[s.node],"CodeMirror-linewidget");s.handleMouseEvents||(y.ignoreEvents=!0),Y(s,y,k,e),s.above?k.insertBefore(y,a.options.lineNumbers&&0!=b.height?t:h):k.appendChild(y),Qe(s,"redraw")}return k}function Y(a,b,c,d){if(a.noHScroll){(c.alignable||(c.alignable=[])).push(b);var e=d.wrapperWidth;b.style.left=d.fixedPos+"px",a.coverGutter||(e-=d.gutterTotalWidth,b.style.paddingLeft=d.gutterTotalWidth+"px"),b.style.width=e+"px"}a.coverGutter&&(b.style.zIndex=5,b.style.position="relative",a.noHScroll||(b.style.marginLeft=-d.gutterTotalWidth+"px"))}function Z(a){var b=a.display,c=Cc(a.doc.sel.from,a.doc.sel.to);if(c||a.options.showCursorWhenSelecting?$(a):b.cursor.style.display=b.otherCursor.style.display="none",c?b.selectionDiv.style.display="none":_(a),a.options.moveInputWithCursor){var d=vb(a,a.doc.sel.head,"div"),e=pf(b.wrapper),f=pf(b.lineDiv);b.inputDiv.style.top=Math.max(0,Math.min(b.wrapper.clientHeight-10,d.top+f.top-e.top))+"px",b.inputDiv.style.left=Math.max(0,Math.min(b.wrapper.clientWidth-10,d.left+f.left-e.left))+"px"}}function $(a){var b=a.display,c=vb(a,a.doc.sel.head,"div");b.cursor.style.left=c.left+"px",b.cursor.style.top=c.top+"px",b.cursor.style.height=Math.max(0,c.bottom-c.top)*a.options.cursorHeight+"px",b.cursor.style.display="",c.other?(b.otherCursor.style.display="",b.otherCursor.style.left=c.other.left+"px",b.otherCursor.style.top=c.other.top+"px",b.otherCursor.style.height=.85*(c.other.bottom-c.other.top)+"px"):b.otherCursor.style.display="none"}function _(a){function h(a,b,c,d){0>b&&(b=0),e.appendChild(lf("div",null,"CodeMirror-selected","position: absolute; left: "+a+"px; top: "+b+"px; width: "+(null==c?f-a:c)+"px; height: "+(d-b)+"px"))}function i(b,d,e){function m(c,d){return ub(a,Bc(b,c),"div",i,d)}var k,l,i=le(c,b),j=i.text.length;return Af(se(i),d||0,null==e?j:e,function(a,b,c){var n,o,p,i=m(a,"left");if(a==b)n=i,o=p=i.left;else{if(n=m(b-1,"right"),"rtl"==c){var q=i;i=n,n=q}o=i.left,p=n.right}null==d&&0==a&&(o=g),n.top-i.top>3&&(h(o,i.top,null,i.bottom),o=g,i.bottom<n.top&&h(o,i.bottom,null,n.top)),null==e&&b==j&&(p=f),(!k||i.top<k.top||i.top==k.top&&i.left<k.left)&&(k=i),(!l||n.bottom>l.bottom||n.bottom==l.bottom&&n.right>l.right)&&(l=n),g+1>o&&(o=g),h(o,n.top,p-o,n.bottom)}),{start:k,end:l}}var b=a.display,c=a.doc,d=a.doc.sel,e=document.createDocumentFragment(),f=b.lineSpace.offsetWidth,g=hb(a.display);if(d.from.line==d.to.line)i(d.from.line,d.from.ch,d.to.ch);else{var j=le(c,d.from.line),k=le(c,d.to.line),l=Fd(c,j)==Fd(c,k),m=i(d.from.line,d.from.ch,l?j.text.length:null).end,n=i(d.to.line,l?0:null,d.to.ch).start;l&&(m.top<n.top-2?(h(m.right,m.top,null,m.bottom),h(g,n.top,n.left,n.bottom)):h(m.right,m.top,n.left-m.right,m.bottom)),m.bottom<n.top&&h(g,m.bottom,null,n.top)}nf(b.selectionDiv,e),b.selectionDiv.style.display=""}function ab(a){if(a.state.focused){var b=a.display;clearInterval(b.blinker);var c=!0;b.cursor.style.visibility=b.otherCursor.style.visibility="",a.options.cursorBlinkRate>0&&(b.blinker=setInterval(function(){b.cursor.style.visibility=b.otherCursor.style.visibility=(c=!c)?"":"hidden"},a.options.cursorBlinkRate))}}function bb(a,b){a.doc.mode.startState&&a.doc.frontier<a.display.showingTo&&a.state.highlight.set(b,ff(cb,a))}function cb(a){var b=a.doc;if(b.frontier<b.first&&(b.frontier=b.first),!(b.frontier>=a.display.showingTo)){var f,c=+new Date+a.options.workTime,d=hd(b.mode,eb(a,b.frontier)),e=[];b.iter(b.frontier,Math.min(b.first+b.size,a.display.showingTo+500),function(g){if(b.frontier>=a.display.showingFrom){var h=g.styles;g.styles=Sd(a,g,d,!0);for(var i=!h||h.length!=g.styles.length,j=0;!i&&j<h.length;++j)i=h[j]!=g.styles[j];i&&(f&&f.end==b.frontier?f.end++:e.push(f={start:b.frontier,end:b.frontier+1})),g.stateAfter=hd(b.mode,d)}else Ud(a,g.text,d),g.stateAfter=0==b.frontier%5?hd(b.mode,d):null;return++b.frontier,+new Date>c?(bb(a,a.options.workDelay),!0):void 0}),e.length&&Fb(a,function(){for(var a=0;a<e.length;++a)Ib(this,e[a].start,e[a].end)})()}}function db(a,b,c){for(var d,e,f=a.doc,g=c?-1:b-(a.doc.mode.innerMode?1e3:100),h=b;h>g;--h){if(h<=f.first)return f.first;var i=le(f,h-1);if(i.stateAfter&&(!c||h<=f.frontier))return h;var j=Ye(i.text,null,a.options.tabSize);(null==e||d>j)&&(e=h-1,d=j)}return e}function eb(a,b,c){var d=a.doc,e=a.display;if(!d.mode.startState)return!0;var f=db(a,b,c),g=f>d.first&&le(d,f-1).stateAfter;return g=g?hd(d.mode,g):id(d.mode),d.iter(f,b,function(c){Ud(a,c.text,g);var h=f==b-1||0==f%5||f>=e.showingFrom&&f<e.showingTo;c.stateAfter=h?hd(d.mode,g):null,++f}),c&&(d.frontier=f),g}function fb(a){return a.lineSpace.offsetTop}function gb(a){return a.mover.offsetHeight-a.lineSpace.offsetHeight}function hb(a){var b=nf(a.measure,lf("pre",null,null,"text-align: left")).appendChild(lf("span","x"));return b.offsetLeft}function ib(a,b,c,d,e){var f=-1;if(d=d||lb(a,b),d.crude){var g=d.left+c*d.width;return{left:g,right:g+d.width,top:d.top,bottom:d.bottom}}for(var h=c;;h+=f){var i=d[h];if(i)break;0>f&&0==h&&(f=1)}return e=h>c?"left":c>h?"right":e,"left"==e&&i.leftSide?i=i.leftSide:"right"==e&&i.rightSide&&(i=i.rightSide),{left:c>h?i.right:i.left,right:h>c?i.left:i.right,top:i.top,bottom:i.bottom}}function jb(a,b){for(var c=a.display.measureLineCache,d=0;d<c.length;++d){var e=c[d];if(e.text==b.text&&e.markedSpans==b.markedSpans&&a.display.scroller.clientWidth==e.width&&e.classes==b.textClass+"|"+b.wrapClass)return e}}function kb(a,b){var c=jb(a,b);c&&(c.text=c.measure=c.markedSpans=null)}function lb(a,b){var c=jb(a,b);if(c)return c.measure;var d=mb(a,b),e=a.display.measureLineCache,f={text:b.text,width:a.display.scroller.clientWidth,markedSpans:b.markedSpans,measure:d,classes:b.textClass+"|"+b.wrapClass};return 16==e.length?e[++a.display.measureLineCachePos%16]=f:e.push(f),d}function mb(a,e){function t(a){var b=a.top-p.top,c=a.bottom-p.top;c>s&&(c=s),0>b&&(b=0);for(var d=q.length-2;d>=0;d-=2){var e=q[d],f=q[d+1];if(!(e>c||b>f)&&(b>=e&&f>=c||e>=b&&c>=f||Math.min(c,f)-Math.max(b,e)>=c-b>>1)){q[d]=Math.min(b,e),q[d+1]=Math.max(c,f);break}}return 0>d&&(d=q.length,q.push(b,c)),{left:a.left-p.left,right:a.right-p.left,top:d,bottom:null}}function u(a){a.bottom=q[a.top+1],a.top=q[a.top]}if(!a.options.lineWrapping&&e.text.length>=a.options.crudeMeasuringFrom)return nb(a,e);var f=a.display,g=ef(e.text.length),h=Xd(a,e,g,!0).pre;if(b&&!c&&!a.options.lineWrapping&&h.childNodes.length>100){for(var i=document.createDocumentFragment(),j=10,k=h.childNodes.length,l=0,m=Math.ceil(k/j);m>l;++l){for(var n=lf("div",null,null,"display: inline-block"),o=0;j>o&&k;++o)n.appendChild(h.firstChild),--k;i.appendChild(n)}h.appendChild(i)}nf(f.measure,h);var p=pf(f.lineDiv),q=[],r=ef(e.text.length),s=h.offsetHeight;d&&f.measure.first!=h&&nf(f.measure,h);for(var v,l=0;l<g.length;++l)if(v=g[l]){var w=v,x=null;if(/\bCodeMirror-widget\b/.test(v.className)&&v.getClientRects){1==v.firstChild.nodeType&&(w=v.firstChild);var y=w.getClientRects();y.length>1&&(x=r[l]=t(y[0]),x.rightSide=t(y[y.length-1]))}x||(x=r[l]=t(pf(w))),v.measureRight&&(x.right=pf(v.measureRight).left),v.leftSide&&(x.leftSide=t(pf(v.leftSide)))}mf(a.display.measure);for(var v,l=0;l<r.length;++l)(v=r[l])&&(u(v),v.leftSide&&u(v.leftSide),v.rightSide&&u(v.rightSide));return r}function nb(a,b){var c=new Od(b.text.slice(0,100),null);b.textClass&&(c.textClass=b.textClass);var d=mb(a,c),e=ib(a,c,0,d,"left"),f=ib(a,c,99,d,"right");return{crude:!0,top:e.top,left:e.left,bottom:e.bottom,width:(f.right-e.left)/100}}function ob(a,b){var c=!1;if(b.markedSpans)for(var d=0;d<b.markedSpans;++d){var e=b.markedSpans[d];!e.collapsed||null!=e.to&&e.to!=b.text.length||(c=!0)}var f=!c&&jb(a,b);if(f||b.text.length>=a.options.crudeMeasuringFrom)return ib(a,b,b.text.length,f&&f.measure,"right").right;var g=Xd(a,b,null,!0).pre,h=g.appendChild(vf(a.display.measure));return nf(a.display.measure,g),pf(h).right-pf(a.display.lineDiv).left}function pb(a){a.display.measureLineCache.length=a.display.measureLineCachePos=0,a.display.cachedCharWidth=a.display.cachedTextHeight=null,a.options.lineWrapping||(a.display.maxLineChanged=!0),a.display.lineNumChars=null}function qb(){return window.pageXOffset||(document.documentElement||document.body).scrollLeft}function rb(){return window.pageYOffset||(document.documentElement||document.body).scrollTop}function sb(a,b,c,d){if(b.widgets)for(var e=0;e<b.widgets.length;++e)if(b.widgets[e].above){var f=Md(b.widgets[e]);c.top+=f,c.bottom+=f}if("line"==d)return c;d||(d="local");var g=re(a,b);if("local"==d?g+=fb(a.display):g-=a.display.viewOffset,"page"==d||"window"==d){var h=pf(a.display.lineSpace);g+=h.top+("window"==d?0:rb());var i=h.left+("window"==d?0:qb());c.left+=i,c.right+=i}return c.top+=g,c.bottom+=g,c}function tb(a,b,c){if("div"==c)return b;var d=b.left,e=b.top;if("page"==c)d-=qb(),e-=rb();else if("local"==c||!c){var f=pf(a.display.sizer);d+=f.left,e+=f.top}var g=pf(a.display.lineSpace);return{left:d-g.left,top:e-g.top}}function ub(a,b,c,d,e){return d||(d=le(a.doc,b.line)),sb(a,d,ib(a,d,b.ch,null,e),c)}function vb(a,b,c,d,e){function f(b,f){var g=ib(a,d,b,e,f?"right":"left");return f?g.left=g.right:g.right=g.left,sb(a,d,g,c)}function g(a,b){var c=h[b],d=c.level%2;return a==Bf(c)&&b&&c.level<h[b-1].level?(c=h[--b],a=Cf(c)-(c.level%2?0:1),d=!0):a==Cf(c)&&b<h.length-1&&c.level<h[b+1].level&&(c=h[++b],a=Bf(c)-c.level%2,d=!1),d&&a==c.to&&a>c.from?f(a-1):f(a,d)}d=d||le(a.doc,b.line),e||(e=lb(a,d));var h=se(d),i=b.ch;if(!h)return f(i);var j=Jf(h,i),k=g(i,j);return null!=If&&(k.other=g(i,If)),k}function wb(a,b,c,d){var e=new Bc(a,b);return e.xRel=d,c&&(e.outside=!0),e}function xb(a,b,c){var d=a.doc;if(c+=a.display.viewOffset,0>c)return wb(d.first,0,!0,-1);var e=qe(d,c),f=d.first+d.size-1;if(e>f)return wb(d.first+d.size-1,le(d,f).text.length,!0,1);for(0>b&&(b=0);;){var g=le(d,e),h=yb(a,g,e,b,c),i=Ed(g),j=i&&i.find();if(!i||!(h.ch>j.from.ch||h.ch==j.from.ch&&h.xRel>0))return h;e=j.to.line}}function yb(a,b,c,d,e){function j(d){var e=vb(a,Bc(c,d),"line",b,i);return g=!0,f>e.bottom?e.left-h:f<e.top?e.left+h:(g=!1,e.left)}var f=e-re(a,b),g=!1,h=2*a.display.wrapper.clientWidth,i=lb(a,b),k=se(b),l=b.text.length,m=Df(b),n=Ef(b),o=j(m),p=g,q=j(n),r=g;if(d>q)return wb(c,n,r,1);for(;;){if(k?n==m||n==Lf(b,m,1):1>=n-m){for(var s=o>d||q-d>=d-o?m:n,t=d-(s==m?o:q);kf.test(b.text.charAt(s));)++s;var u=wb(c,s,s==m?p:r,0>t?-1:t?1:0);return u}var v=Math.ceil(l/2),w=m+v;if(k){w=m;for(var x=0;v>x;++x)w=Lf(b,w,1)}var y=j(w);y>d?(n=w,q=y,(r=g)&&(q+=1e3),l=v):(m=w,o=y,p=g,l-=v)}}function Ab(a){if(null!=a.cachedTextHeight)return a.cachedTextHeight;if(null==zb){zb=lf("pre");for(var b=0;49>b;++b)zb.appendChild(document.createTextNode("x")),zb.appendChild(lf("br"));zb.appendChild(document.createTextNode("x"))}nf(a.measure,zb);var c=zb.offsetHeight/50;return c>3&&(a.cachedTextHeight=c),mf(a.measure),c||1}function Bb(a){if(null!=a.cachedCharWidth)return a.cachedCharWidth;var b=lf("span","x"),c=lf("pre",[b]);nf(a.measure,c);var d=b.offsetWidth;return d>2&&(a.cachedCharWidth=d),d||10}function Db(a){a.curOp={changes:[],forceUpdate:!1,updateInput:null,userSelChange:null,textChanged:null,selectionChanged:!1,cursorActivity:!1,updateMaxLine:!1,updateScrollPos:!1,id:++Cb},Pe++||(Oe=[])}function Eb(a){var b=a.curOp,c=a.doc,d=a.display;if(a.curOp=null,b.updateMaxLine&&I(a),d.maxLineChanged&&!a.options.lineWrapping&&d.maxLine){var e=ob(a,d.maxLine);d.sizer.style.minWidth=Math.max(0,e+3+Ve)+"px",d.maxLineChanged=!1;var f=Math.max(0,d.sizer.offsetLeft+d.sizer.offsetWidth-d.scroller.clientWidth);f<c.scrollLeft&&!b.updateScrollPos&&ac(a,Math.min(d.scroller.scrollLeft,f),!0)}var g,h;if(b.updateScrollPos)g=b.updateScrollPos;else if(b.selectionChanged&&d.scroller.clientHeight){var i=vb(a,c.sel.head);g=Rc(a,i.left,i.top,i.left,i.bottom)}if((b.changes.length||b.forceUpdate||g&&null!=g.scrollTop)&&(h=Q(a,b.changes,g&&g.scrollTop,b.forceUpdate),a.display.scroller.offsetHeight&&(a.doc.scrollTop=a.display.scroller.scrollTop)),!h&&b.selectionChanged&&Z(a),b.updateScrollPos){var j=Math.max(0,Math.min(d.scroller.scrollHeight-d.scroller.clientHeight,g.scrollTop)),k=Math.max(0,Math.min(d.scroller.scrollWidth-d.scroller.clientWidth,g.scrollLeft));d.scroller.scrollTop=d.scrollbarV.scrollTop=c.scrollTop=j,d.scroller.scrollLeft=d.scrollbarH.scrollLeft=c.scrollLeft=k,M(a),b.scrollToPos&&Pc(a,Gc(a.doc,b.scrollToPos.from),Gc(a.doc,b.scrollToPos.to),b.scrollToPos.margin)}else g&&Oc(a);b.selectionChanged&&ab(a),a.state.focused&&b.updateInput&&Mb(a,b.userSelChange);var l=b.maybeHiddenMarkers,m=b.maybeUnhiddenMarkers;if(l)for(var n=0;n<l.length;++n)l[n].lines.length||Ne(l[n],"hide");if(m)for(var n=0;n<m.length;++n)m[n].lines.length&&Ne(m[n],"unhide");var o;if(--Pe||(o=Oe,Oe=null),b.textChanged&&Ne(a,"change",a,b.textChanged),b.cursorActivity&&Ne(a,"cursorActivity",a),o)for(var n=0;n<o.length;++n)o[n]()}function Fb(a,b){return function(){var c=a||this,d=!c.curOp;d&&Db(c);try{var e=b.apply(c,arguments)}finally{d&&Eb(c)}return e}}function Gb(a){return function(){var c,b=this.cm&&!this.cm.curOp;b&&Db(this.cm);try{c=a.apply(this,arguments)}finally{b&&Eb(this.cm)}return c}}function Hb(a,b){var d,c=!a.curOp;c&&Db(a);try{d=b()}finally{c&&Eb(a)}return d}function Ib(a,b,c,d){null==b&&(b=a.doc.first),null==c&&(c=a.doc.first+a.doc.size),a.curOp.changes.push({from:b,to:c,diff:d})}function Jb(a){a.display.pollingFast||a.display.poll.set(a.options.pollInterval,function(){Lb(a),a.state.focused&&Jb(a)})}function Kb(a){function c(){var d=Lb(a);d||b?(a.display.pollingFast=!1,Jb(a)):(b=!0,a.display.poll.set(60,c))}var b=!1;a.display.pollingFast=!0,a.display.poll.set(20,c)}function Lb(a){var c=a.display.input,e=a.display.prevInput,f=a.doc,g=f.sel;if(!a.state.focused||xf(c)||Ob(a)||a.state.disableInput)return!1;a.state.pasteIncoming&&a.state.fakedLastChar&&(c.value=c.value.substring(0,c.value.length-1),a.state.fakedLastChar=!1);var h=c.value;if(h==e&&Cc(g.from,g.to))return!1;if(b&&!d&&a.display.inputHasSelection===h)return Mb(a,!0),!1;var i=!a.curOp;i&&Db(a),g.shift=!1;for(var j=0,k=Math.min(e.length,h.length);k>j&&e.charCodeAt(j)==h.charCodeAt(j);)++j;var l=g.from,m=g.to;j<e.length?l=Bc(l.line,l.ch-(e.length-j)):a.state.overwrite&&Cc(l,m)&&!a.state.pasteIncoming&&(m=Bc(m.line,Math.min(le(f,m.line).text.length,m.ch+(h.length-j))));var n=a.curOp.updateInput,o={from:l,to:m,text:wf(h.slice(j)),origin:a.state.pasteIncoming?"paste":"+input"};return uc(a.doc,o,"end"),a.curOp.updateInput=n,Qe(a,"inputRead",a,o),h.length>1e3||h.indexOf("\n")>-1?c.value=a.display.prevInput="":a.display.prevInput=h,i&&Eb(a),a.state.pasteIncoming=!1,!0}function Mb(a,c){var e,f,g=a.doc;if(Cc(g.sel.from,g.sel.to))c&&(a.display.prevInput=a.display.input.value="",b&&!d&&(a.display.inputHasSelection=null));else{a.display.prevInput="",e=yf&&(g.sel.to.line-g.sel.from.line>100||(f=a.getSelection()).length>1e3);var h=e?"-":f||a.getSelection();a.display.input.value=h,a.state.focused&&af(a.display.input),b&&!d&&(a.display.inputHasSelection=h)}a.display.inaccurateSelection=e}function Nb(a){"nocursor"==a.options.readOnly||p&&document.activeElement==a.display.input||a.display.input.focus()}function Ob(a){return a.options.readOnly||a.doc.cantEdit}function Pb(a){function e(){a.state.focused&&setTimeout(ff(Nb,a),0)}function h(){null==g&&(g=setTimeout(function(){g=null,c.cachedCharWidth=c.cachedTextHeight=sf=null,pb(a),Hb(a,ff(Ib,a))},100))}function i(){for(var a=c.wrapper.parentNode;a&&a!=document.body;a=a.parentNode);a?setTimeout(i,5e3):Me(window,"resize",h)}function j(b){Re(a,b)||a.options.onDragEvent&&a.options.onDragEvent(a,Ee(b))||Ie(b)}function l(){c.inaccurateSelection&&(c.prevInput="",c.inaccurateSelection=!1,c.input.value=a.getSelection(),af(c.input))}var c=a.display;Le(c.scroller,"mousedown",Fb(a,Ub)),b?Le(c.scroller,"dblclick",Fb(a,function(b){if(!Re(a,b)){var c=Rb(a,b);if(c&&!Xb(a,b)&&!Qb(a.display,b)){Fe(b);var d=Yc(le(a.doc,c.line).text,c);Jc(a.doc,d.from,d.to)}}})):Le(c.scroller,"dblclick",function(b){Re(a,b)||Fe(b)}),Le(c.lineSpace,"selectstart",function(a){Qb(c,a)||Fe(a)}),u||Le(c.scroller,"contextmenu",function(b){pc(a,b)}),Le(c.scroller,"scroll",function(){c.scroller.clientHeight&&(_b(a,c.scroller.scrollTop),ac(a,c.scroller.scrollLeft,!0),Ne(a,"scroll",a))}),Le(c.scrollbarV,"scroll",function(){c.scroller.clientHeight&&_b(a,c.scrollbarV.scrollTop)}),Le(c.scrollbarH,"scroll",function(){c.scroller.clientHeight&&ac(a,c.scrollbarH.scrollLeft)}),Le(c.scroller,"mousewheel",function(b){dc(a,b)}),Le(c.scroller,"DOMMouseScroll",function(b){dc(a,b)}),Le(c.scrollbarH,"mousedown",e),Le(c.scrollbarV,"mousedown",e),Le(c.wrapper,"scroll",function(){c.wrapper.scrollTop=c.wrapper.scrollLeft=0});var g;Le(window,"resize",h),setTimeout(i,5e3),Le(c.input,"keyup",Fb(a,function(b){Re(a,b)||a.options.onKeyEvent&&a.options.onKeyEvent(a,Ee(b))||16==b.keyCode&&(a.doc.sel.shift=!1)})),Le(c.input,"input",function(){b&&!d&&a.display.inputHasSelection&&(a.display.inputHasSelection=null),Kb(a)}),Le(c.input,"keydown",Fb(a,kc)),Le(c.input,"keypress",Fb(a,lc)),Le(c.input,"focus",ff(mc,a)),Le(c.input,"blur",ff(nc,a)),a.options.dragDrop&&(Le(c.scroller,"dragstart",function(b){$b(a,b)}),Le(c.scroller,"dragenter",j),Le(c.scroller,"dragover",j),Le(c.scroller,"drop",Fb(a,Zb))),Le(c.scroller,"paste",function(b){Qb(c,b)||(Nb(a),Kb(a))}),Le(c.input,"paste",function(){if(f&&!a.state.fakedLastChar&&!(new Date-a.state.lastMiddleDown<200)){var b=c.input.selectionStart,d=c.input.selectionEnd;c.input.value+="$",c.input.selectionStart=b,c.input.selectionEnd=d,a.state.fakedLastChar=!0}a.state.pasteIncoming=!0,Kb(a)}),Le(c.input,"cut",l),Le(c.input,"copy",l),k&&Le(c.sizer,"mouseup",function(){document.activeElement==c.input&&c.input.blur(),Nb(a)})}function Qb(a,b){for(var c=Je(b);c!=a.wrapper;c=c.parentNode)if(!c||c.ignoreEvents||c.parentNode==a.sizer&&c!=a.mover)return!0}function Rb(a,b,c){var d=a.display;if(!c){var e=Je(b);if(e==d.scrollbarH||e==d.scrollbarH.firstChild||e==d.scrollbarV||e==d.scrollbarV.firstChild||e==d.scrollbarFiller||e==d.gutterFiller)return null}var f,g,h=pf(d.lineSpace);try{f=b.clientX,g=b.clientY}catch(b){return null}return xb(a,f-h.left,g-h.top)
-}function Ub(a){function q(a){if(!Cc(p,a)){if(p=a,"single"==j)return Jc(c.doc,Gc(e,h),a),void 0;if(n=Gc(e,n),o=Gc(e,o),"double"==j){var b=Yc(le(e,a.line).text,a);Dc(a,n)?Jc(c.doc,b.from,o):Jc(c.doc,n,b.to)}else"triple"==j&&(Dc(a,n)?Jc(c.doc,o,Gc(e,Bc(a.line,0))):Jc(c.doc,n,Gc(e,Bc(a.line+1,0))))}}function t(a){var b=++s,f=Rb(c,a,!0);if(f)if(Cc(f,l)){var h=a.clientY<r.top?-20:a.clientY>r.bottom?20:0;h&&setTimeout(Fb(c,function(){s==b&&(d.scroller.scrollTop+=h,t(a))}),50)}else{c.state.focused||mc(c),l=f,q(f);var g=L(d,e);(f.line>=g.to||f.line<g.from)&&setTimeout(Fb(c,function(){s==b&&t(a)}),150)}}function v(a){s=1/0,Fe(a),Nb(c),Me(document,"mousemove",w),Me(document,"mouseup",x)}if(!Re(this,a)){var c=this,d=c.display,e=c.doc,g=e.sel;if(g.shift=a.shiftKey,Qb(d,a))return f||(d.scroller.draggable=!1,setTimeout(function(){d.scroller.draggable=!0},100)),void 0;if(!Xb(c,a)){var h=Rb(c,a);switch(Ke(a)){case 3:return u&&pc.call(c,c,a),void 0;case 2:return f&&(c.state.lastMiddleDown=+new Date),h&&Jc(c.doc,h),setTimeout(ff(Nb,c),20),Fe(a),void 0}if(!h)return Je(a)==d.scroller&&Fe(a),void 0;c.state.focused||mc(c);var i=+new Date,j="single";if(Tb&&Tb.time>i-400&&Cc(Tb.pos,h))j="triple",Fe(a),setTimeout(ff(Nb,c),20),Zc(c,h.line);else if(Sb&&Sb.time>i-400&&Cc(Sb.pos,h)){j="double",Tb={time:i,pos:h},Fe(a);var k=Yc(le(e,h.line).text,h);Jc(c.doc,k.from,k.to)}else Sb={time:i,pos:h};var l=h;if(c.options.dragDrop&&qf&&!Ob(c)&&!Cc(g.from,g.to)&&!Dc(h,g.from)&&!Dc(g.to,h)&&"single"==j){var m=Fb(c,function(b){f&&(d.scroller.draggable=!1),c.state.draggingText=!1,Me(document,"mouseup",m),Me(d.scroller,"drop",m),Math.abs(a.clientX-b.clientX)+Math.abs(a.clientY-b.clientY)<10&&(Fe(b),Jc(c.doc,h),Nb(c))});return f&&(d.scroller.draggable=!0),c.state.draggingText=m,d.scroller.dragDrop&&d.scroller.dragDrop(),Le(document,"mouseup",m),Le(d.scroller,"drop",m),void 0}Fe(a),"single"==j&&Jc(c.doc,Gc(e,h));var n=g.from,o=g.to,p=h,r=pf(d.wrapper),s=0,w=Fb(c,function(a){b||Ke(a)?t(a):v(a)}),x=Fb(c,v);Le(document,"mousemove",w),Le(document,"mouseup",x)}}}function Vb(a,b,c,d,e){try{var f=b.clientX,g=b.clientY}catch(b){return!1}if(f>=Math.floor(pf(a.display.gutters).right))return!1;d&&Fe(b);var h=a.display,i=pf(h.lineDiv);if(g>i.bottom||!Te(a,c))return He(b);g-=i.top-h.viewOffset;for(var j=0;j<a.options.gutters.length;++j){var k=h.gutters.childNodes[j];if(k&&pf(k).right>=f){var l=qe(a.doc,g),m=a.options.gutters[j];return e(a,c,a,l,m,b),He(b)}}}function Wb(a,b){return Te(a,"gutterContextMenu")?Vb(a,b,"gutterContextMenu",!1,Ne):!1}function Xb(a,b){return Vb(a,b,"gutterClick",!0,Qe)}function Zb(a){var c=this;if(!(Re(c,a)||Qb(c.display,a)||c.options.onDragEvent&&c.options.onDragEvent(c,Ee(a)))){Fe(a),b&&(Yb=+new Date);var d=Rb(c,a,!0),e=a.dataTransfer.files;if(d&&!Ob(c))if(e&&e.length&&window.FileReader&&window.File)for(var f=e.length,g=Array(f),h=0,i=function(a,b){var e=new FileReader;e.onload=function(){g[b]=e.result,++h==f&&(d=Gc(c.doc,d),uc(c.doc,{from:d,to:d,text:wf(g.join("\n")),origin:"paste"},"around"))},e.readAsText(a)},j=0;f>j;++j)i(e[j],j);else{if(c.state.draggingText&&!Dc(d,c.doc.sel.from)&&!Dc(c.doc.sel.to,d))return c.state.draggingText(a),setTimeout(ff(Nb,c),20),void 0;try{var g=a.dataTransfer.getData("Text");if(g){var k=c.doc.sel.from,l=c.doc.sel.to;Lc(c.doc,d,d),c.state.draggingText&&Ac(c.doc,"",k,l,"paste"),c.replaceSelection(g,null,"paste"),Nb(c)}}catch(a){}}}}function $b(a,c){if(b&&(!a.state.draggingText||+new Date-Yb<100))return Ie(c),void 0;if(!Re(a,c)&&!Qb(a.display,c)){var d=a.getSelection();if(c.dataTransfer.setData("Text",d),c.dataTransfer.setDragImage&&!j){var e=lf("img",null,null,"position: fixed; left: 0; top: 0;");e.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",i&&(e.width=e.height=1,a.display.wrapper.appendChild(e),e._top=e.offsetTop),c.dataTransfer.setDragImage(e,0,0),i&&e.parentNode.removeChild(e)}}}function _b(b,c){Math.abs(b.doc.scrollTop-c)<2||(b.doc.scrollTop=c,a||Q(b,[],c),b.display.scroller.scrollTop!=c&&(b.display.scroller.scrollTop=c),b.display.scrollbarV.scrollTop!=c&&(b.display.scrollbarV.scrollTop=c),a&&Q(b,[]),bb(b,100))}function ac(a,b,c){(c?b==a.doc.scrollLeft:Math.abs(a.doc.scrollLeft-b)<2)||(b=Math.min(b,a.display.scroller.scrollWidth-a.display.scroller.clientWidth),a.doc.scrollLeft=b,M(a),a.display.scroller.scrollLeft!=b&&(a.display.scroller.scrollLeft=b),a.display.scrollbarH.scrollLeft!=b&&(a.display.scrollbarH.scrollLeft=b))}function dc(b,c){var d=c.wheelDeltaX,e=c.wheelDeltaY;null==d&&c.detail&&c.axis==c.HORIZONTAL_AXIS&&(d=c.detail),null==e&&c.detail&&c.axis==c.VERTICAL_AXIS?e=c.detail:null==e&&(e=c.wheelDelta);var g=b.display,h=g.scroller;if(d&&h.scrollWidth>h.clientWidth||e&&h.scrollHeight>h.clientHeight){if(e&&q&&f)for(var j=c.target;j!=h;j=j.parentNode)if(j.lineObj){b.display.currentWheelTarget=j;break}if(d&&!a&&!i&&null!=cc)return e&&_b(b,Math.max(0,Math.min(h.scrollTop+e*cc,h.scrollHeight-h.clientHeight))),ac(b,Math.max(0,Math.min(h.scrollLeft+d*cc,h.scrollWidth-h.clientWidth))),Fe(c),g.wheelStartX=null,void 0;if(e&&null!=cc){var k=e*cc,l=b.doc.scrollTop,m=l+g.wrapper.clientHeight;0>k?l=Math.max(0,l+k-50):m=Math.min(b.doc.height,m+k+50),Q(b,[],{top:l,bottom:m})}20>bc&&(null==g.wheelStartX?(g.wheelStartX=h.scrollLeft,g.wheelStartY=h.scrollTop,g.wheelDX=d,g.wheelDY=e,setTimeout(function(){if(null!=g.wheelStartX){var a=h.scrollLeft-g.wheelStartX,b=h.scrollTop-g.wheelStartY,c=b&&g.wheelDY&&b/g.wheelDY||a&&g.wheelDX&&a/g.wheelDX;g.wheelStartX=g.wheelStartY=null,c&&(cc=(cc*bc+c)/(bc+1),++bc)}},200)):(g.wheelDX+=d,g.wheelDY+=e))}}function ec(a,b,c){if("string"==typeof b&&(b=jd[b],!b))return!1;a.display.pollingFast&&Lb(a)&&(a.display.pollingFast=!1);var d=a.doc,e=d.sel.shift,f=!1;try{Ob(a)&&(a.state.suppressEdits=!0),c&&(d.sel.shift=!1),f=b(a)!=We}finally{d.sel.shift=e,a.state.suppressEdits=!1}return f}function fc(a){var b=a.state.keyMaps.slice(0);return a.options.extraKeys&&b.push(a.options.extraKeys),b.push(a.options.keyMap),b}function hc(a,b){var c=ld(a.options.keyMap),e=c.auto;clearTimeout(gc),e&&!nd(b)&&(gc=setTimeout(function(){ld(a.options.keyMap)==c&&(a.options.keyMap=e.call?e.call(null,a):e,D(a))},50));var f=od(b,!0),g=!1;if(!f)return!1;var h=fc(a);return g=b.shiftKey?md("Shift-"+f,h,function(b){return ec(a,b,!0)})||md(f,h,function(b){return("string"==typeof b?/^go[A-Z]/.test(b):b.motion)?ec(a,b):void 0}):md(f,h,function(b){return ec(a,b)}),g&&(Fe(b),ab(a),d&&(b.oldKeyCode=b.keyCode,b.keyCode=0),Qe(a,"keyHandled",a,f,b)),g}function ic(a,b,c){var d=md("'"+c+"'",fc(a),function(b){return ec(a,b,!0)});return d&&(Fe(b),ab(a),Qe(a,"keyHandled",a,"'"+c+"'",b)),d}function kc(a){var c=this;if(c.state.focused||mc(c),!(Re(c,a)||c.options.onKeyEvent&&c.options.onKeyEvent(c,Ee(a)))){b&&27==a.keyCode&&(a.returnValue=!1);var d=a.keyCode;c.doc.sel.shift=16==d||a.shiftKey;var e=hc(c,a);i&&(jc=e?d:null,!e&&88==d&&!yf&&(q?a.metaKey:a.ctrlKey)&&c.replaceSelection(""))}}function lc(a){var c=this;if(!(Re(c,a)||c.options.onKeyEvent&&c.options.onKeyEvent(c,Ee(a)))){var e=a.keyCode,f=a.charCode;if(i&&e==jc)return jc=null,Fe(a),void 0;if(!(i&&(!a.which||a.which<10)||k)||!hc(c,a)){var g=String.fromCharCode(null==f?e:f);this.options.electricChars&&this.doc.mode.electricChars&&this.options.smartIndent&&!Ob(this)&&this.doc.mode.electricChars.indexOf(g)>-1&&setTimeout(Fb(c,function(){Uc(c,c.doc.sel.to.line,"smart")}),75),ic(c,a,g)||(b&&!d&&(c.display.inputHasSelection=null),Kb(c))}}}function mc(a){"nocursor"!=a.options.readOnly&&(a.state.focused||(Ne(a,"focus",a),a.state.focused=!0,-1==a.display.wrapper.className.search(/\bCodeMirror-focused\b/)&&(a.display.wrapper.className+=" CodeMirror-focused"),a.curOp||(Mb(a,!0),f&&setTimeout(ff(Mb,a,!0),0))),Jb(a),ab(a))}function nc(a){a.state.focused&&(Ne(a,"blur",a),a.state.focused=!1,a.display.wrapper.className=a.display.wrapper.className.replace(" CodeMirror-focused","")),clearInterval(a.display.blinker),setTimeout(function(){a.state.focused||(a.doc.sel.shift=!1)},150)}function pc(a,c){function l(){if(null!=e.input.selectionStart){var a=e.input.value="\u200b"+(Cc(f.from,f.to)?"":e.input.value);e.prevInput="\u200b",e.input.selectionStart=1,e.input.selectionEnd=a.length}}function m(){if(e.inputDiv.style.position="relative",e.input.style.cssText=k,d&&(e.scrollbarV.scrollTop=e.scroller.scrollTop=h),Jb(a),null!=e.input.selectionStart){(!b||d)&&l(),clearTimeout(oc);var c=0,f=function(){" "==e.prevInput&&0==e.input.selectionStart?Fb(a,jd.selectAll)(a):c++<10?oc=setTimeout(f,500):Mb(a)};oc=setTimeout(f,200)}}if(!Re(a,c,"contextmenu")){var e=a.display,f=a.doc.sel;if(!Qb(e,c)&&!Wb(a,c)){var g=Rb(a,c),h=e.scroller.scrollTop;if(g&&!i){var j=a.options.resetSelectionOnContextMenu;j&&(Cc(f.from,f.to)||Dc(g,f.from)||!Dc(g,f.to))&&Fb(a,Lc)(a.doc,g,g);var k=e.input.style.cssText;if(e.inputDiv.style.position="absolute",e.input.style.cssText="position: fixed; width: 30px; height: 30px; top: "+(c.clientY-5)+"px; left: "+(c.clientX-5)+"px; z-index: 1000; background: white; outline: none;"+"border-width: 0; outline: none; overflow: hidden; opacity: .05; -ms-opacity: .05; filter: alpha(opacity=5);",Nb(a),Mb(a,!0),Cc(f.from,f.to)&&(e.input.value=e.prevInput=" "),b&&!d&&l(),u){Ie(c);var n=function(){Me(window,"mouseup",n),setTimeout(m,20)};Le(window,"mouseup",n)}else setTimeout(m,50)}}}}function rc(a,b,c){if(!Dc(b.from,c))return Gc(a,c);var d=b.text.length-1-(b.to.line-b.from.line);if(c.line>b.to.line+d){var e=c.line-d,f=a.first+a.size-1;return e>f?Bc(f,le(a,f).text.length):Hc(c,le(a,e).text.length)}if(c.line==b.to.line+d)return Hc(c,_e(b.text).length+(1==b.text.length?b.from.ch:0)+le(a,b.to.line).text.length-b.to.ch);var g=c.line-b.from.line;return Hc(c,b.text[g].length+(g?0:b.from.ch))}function sc(a,b,c){if(c&&"object"==typeof c)return{anchor:rc(a,b,c.anchor),head:rc(a,b,c.head)};if("start"==c)return{anchor:b.from,head:b.from};var d=qc(b);if("around"==c)return{anchor:b.from,head:d};if("end"==c)return{anchor:d,head:d};var e=function(a){if(Dc(a,b.from))return a;if(!Dc(b.to,a))return d;var c=a.line+b.text.length-(b.to.line-b.from.line)-1,e=a.ch;return a.line==b.to.line&&(e+=d.ch-b.to.ch),Bc(c,e)};return{anchor:e(a.sel.anchor),head:e(a.sel.head)}}function tc(a,b,c){var d={canceled:!1,from:b.from,to:b.to,text:b.text,origin:b.origin,cancel:function(){this.canceled=!0}};return c&&(d.update=function(b,c,d,e){b&&(this.from=Gc(a,b)),c&&(this.to=Gc(a,c)),d&&(this.text=d),void 0!==e&&(this.origin=e)}),Ne(a,"beforeChange",a,d),a.cm&&Ne(a.cm,"beforeChange",a.cm,d),d.canceled?null:{from:d.from,to:d.to,text:d.text,origin:d.origin}}function uc(a,b,c,d){if(a.cm){if(!a.cm.curOp)return Fb(a.cm,uc)(a,b,c,d);if(a.cm.state.suppressEdits)return}if(!(Te(a,"beforeChange")||a.cm&&Te(a.cm,"beforeChange"))||(b=tc(a,b,!0))){var e=v&&!d&&Bd(a,b.from,b.to);if(e){for(var f=e.length-1;f>=1;--f)vc(a,{from:e[f].from,to:e[f].to,text:[""]});e.length&&vc(a,{from:e[0].from,to:e[0].to,text:b.text},c)}else vc(a,b,c)}}function vc(a,b,c){if(1!=b.text.length||""!=b.text[0]||!Cc(b.from,b.to)){var d=sc(a,b,c);we(a,b,d,a.cm?a.cm.curOp.id:0/0),yc(a,b,d,zd(a,b));var e=[];je(a,function(a,c){c||-1!=bf(e,a.history)||(Ce(a.history,b),e.push(a.history)),yc(a,b,null,zd(a,b))})}}function wc(a,b){if(!a.cm||!a.cm.state.suppressEdits){var c=a.history,d=("undo"==b?c.done:c.undone).pop();if(d){var e={changes:[],anchorBefore:d.anchorAfter,headBefore:d.headAfter,anchorAfter:d.anchorBefore,headAfter:d.headBefore,generation:c.generation};("undo"==b?c.undone:c.done).push(e),c.generation=d.generation||++c.maxGeneration;for(var f=Te(a,"beforeChange")||a.cm&&Te(a.cm,"beforeChange"),g=d.changes.length-1;g>=0;--g){var h=d.changes[g];if(h.origin=b,f&&!tc(a,h,!1))return("undo"==b?c.done:c.undone).length=0,void 0;e.changes.push(ve(a,h));var i=g?sc(a,h,null):{anchor:d.anchorBefore,head:d.headBefore};yc(a,h,i,Ad(a,h));var j=[];je(a,function(a,b){b||-1!=bf(j,a.history)||(Ce(a.history,h),j.push(a.history)),yc(a,h,null,Ad(a,h))})}}}}function xc(a,b){function c(a){return Bc(a.line+b,a.ch)}a.first+=b,a.cm&&Ib(a.cm,a.first,a.first,b),a.sel.head=c(a.sel.head),a.sel.anchor=c(a.sel.anchor),a.sel.from=c(a.sel.from),a.sel.to=c(a.sel.to)}function yc(a,b,c,d){if(a.cm&&!a.cm.curOp)return Fb(a.cm,yc)(a,b,c,d);if(b.to.line<a.first)return xc(a,b.text.length-1-(b.to.line-b.from.line)),void 0;if(!(b.from.line>a.lastLine())){if(b.from.line<a.first){var e=b.text.length-1-(a.first-b.from.line);xc(a,e),b={from:Bc(a.first,0),to:Bc(b.to.line+e,b.to.ch),text:[_e(b.text)],origin:b.origin}}var f=a.lastLine();b.to.line>f&&(b={from:b.from,to:Bc(f,le(a,f).text.length),text:[b.text[0]],origin:b.origin}),b.removed=me(a,b.from,b.to),c||(c=sc(a,b,null)),a.cm?zc(a.cm,b,d,c):ce(a,b,d,c)}}function zc(a,b,c,d){var e=a.doc,f=a.display,g=b.from,h=b.to,i=!1,j=g.line;a.options.lineWrapping||(j=pe(Fd(e,le(e,g.line))),e.iter(j,h.line+1,function(a){return a==f.maxLine?(i=!0,!0):void 0})),Dc(e.sel.head,b.from)||Dc(b.to,e.sel.head)||(a.curOp.cursorActivity=!0),ce(e,b,c,d,B(a)),a.options.lineWrapping||(e.iter(j,g.line+b.text.length,function(a){var b=H(e,a);b>f.maxLineLength&&(f.maxLine=a,f.maxLineLength=b,f.maxLineChanged=!0,i=!1)}),i&&(a.curOp.updateMaxLine=!0)),e.frontier=Math.min(e.frontier,g.line),bb(a,400);var k=b.text.length-(h.line-g.line)-1;if(Ib(a,g.line,h.line+1,k),Te(a,"change")){var l={from:g,to:h,text:b.text,removed:b.removed,origin:b.origin};if(a.curOp.textChanged){for(var m=a.curOp.textChanged;m.next;m=m.next);m.next=l}else a.curOp.textChanged=l}}function Ac(a,b,c,d,e){if(d||(d=c),Dc(d,c)){var f=d;d=c,c=f}"string"==typeof b&&(b=wf(b)),uc(a,{from:c,to:d,text:b,origin:e},null)}function Bc(a,b){return this instanceof Bc?(this.line=a,this.ch=b,void 0):new Bc(a,b)}function Cc(a,b){return a.line==b.line&&a.ch==b.ch}function Dc(a,b){return a.line<b.line||a.line==b.line&&a.ch<b.ch}function Ec(a){return Bc(a.line,a.ch)}function Fc(a,b){return Math.max(a.first,Math.min(b,a.first+a.size-1))}function Gc(a,b){if(b.line<a.first)return Bc(a.first,0);var c=a.first+a.size-1;return b.line>c?Bc(c,le(a,c).text.length):Hc(b,le(a,b.line).text.length)}function Hc(a,b){var c=a.ch;return null==c||c>b?Bc(a.line,b):0>c?Bc(a.line,0):a}function Ic(a,b){return b>=a.first&&b<a.first+a.size}function Jc(a,b,c,d){if(a.sel.shift||a.sel.extend){var e=a.sel.anchor;if(c){var f=Dc(b,e);f!=Dc(c,e)?(e=b,b=c):f!=Dc(b,c)&&(b=c)}Lc(a,e,b,d)}else Lc(a,b,c||b,d);a.cm&&(a.cm.curOp.userSelChange=!0)}function Kc(a,b,c){var d={anchor:b,head:c};return Ne(a,"beforeSelectionChange",a,d),a.cm&&Ne(a.cm,"beforeSelectionChange",a.cm,d),d.anchor=Gc(a,d.anchor),d.head=Gc(a,d.head),d}function Lc(a,b,c,d,e){if(!e&&Te(a,"beforeSelectionChange")||a.cm&&Te(a.cm,"beforeSelectionChange")){var f=Kc(a,b,c);c=f.head,b=f.anchor}var g=a.sel;if(g.goalColumn=null,null==d&&(d=Dc(c,g.head)?-1:1),(e||!Cc(b,g.anchor))&&(b=Nc(a,b,d,"push"!=e)),(e||!Cc(c,g.head))&&(c=Nc(a,c,d,"push"!=e)),!Cc(g.anchor,b)||!Cc(g.head,c)){g.anchor=b,g.head=c;var h=Dc(c,b);g.from=h?c:b,g.to=h?b:c,a.cm&&(a.cm.curOp.updateInput=a.cm.curOp.selectionChanged=a.cm.curOp.cursorActivity=!0),Qe(a,"cursorActivity",a)}}function Mc(a){Lc(a.doc,a.doc.sel.from,a.doc.sel.to,null,"push")}function Nc(a,b,c,d){var e=!1,f=b,g=c||1;a.cantEdit=!1;a:for(;;){var h=le(a,f.line);if(h.markedSpans)for(var i=0;i<h.markedSpans.length;++i){var j=h.markedSpans[i],k=j.marker;if((null==j.from||(k.inclusiveLeft?j.from<=f.ch:j.from<f.ch))&&(null==j.to||(k.inclusiveRight?j.to>=f.ch:j.to>f.ch))){if(d&&(Ne(k,"beforeCursorEnter"),k.explicitlyCleared)){if(h.markedSpans){--i;continue}break}if(!k.atomic)continue;var l=k.find()[0>g?"from":"to"];if(Cc(l,f)&&(l.ch+=g,l.ch<0?l=l.line>a.first?Gc(a,Bc(l.line-1)):null:l.ch>h.text.length&&(l=l.line<a.first+a.size-1?Bc(l.line+1,0):null),!l)){if(e)return d?(a.cantEdit=!0,Bc(a.first,0)):Nc(a,b,c,!0);e=!0,l=b,g=-g}f=l;continue a}}return f}}function Oc(a){var b=Pc(a,a.doc.sel.head,null,a.options.cursorScrollMargin);if(a.state.focused){var c=a.display,d=pf(c.sizer),e=null;if(b.top+d.top<0?e=!0:b.bottom+d.top>(window.innerHeight||document.documentElement.clientHeight)&&(e=!1),null!=e&&!n){var f="none"==c.cursor.style.display;f&&(c.cursor.style.display="",c.cursor.style.left=b.left+"px",c.cursor.style.top=b.top-c.viewOffset+"px"),c.cursor.scrollIntoView(e),f&&(c.cursor.style.display="none")}}}function Pc(a,b,c,d){for(null==d&&(d=0);;){var e=!1,f=vb(a,b),g=c&&c!=b?vb(a,c):f,h=Rc(a,Math.min(f.left,g.left),Math.min(f.top,g.top)-d,Math.max(f.left,g.left),Math.max(f.bottom,g.bottom)+d),i=a.doc.scrollTop,j=a.doc.scrollLeft;if(null!=h.scrollTop&&(_b(a,h.scrollTop),Math.abs(a.doc.scrollTop-i)>1&&(e=!0)),null!=h.scrollLeft&&(ac(a,h.scrollLeft),Math.abs(a.doc.scrollLeft-j)>1&&(e=!0)),!e)return f}}function Qc(a,b,c,d,e){var f=Rc(a,b,c,d,e);null!=f.scrollTop&&_b(a,f.scrollTop),null!=f.scrollLeft&&ac(a,f.scrollLeft)}function Rc(a,b,c,d,e){var f=a.display,g=Ab(a.display);0>c&&(c=0);var h=f.scroller.clientHeight-Ve,i=f.scroller.scrollTop,j={},k=a.doc.height+gb(f),l=g>c,m=e>k-g;if(i>c)j.scrollTop=l?0:c;else if(e>i+h){var n=Math.min(c,(m?k:e)-h);n!=i&&(j.scrollTop=n)}var o=f.scroller.clientWidth-Ve,p=f.scroller.scrollLeft;b+=f.gutters.offsetWidth,d+=f.gutters.offsetWidth;var q=f.gutters.offsetWidth,r=q+10>b;return p+q>b||r?(r&&(b=0),j.scrollLeft=Math.max(0,b-10-q)):d>o+p-3&&(j.scrollLeft=d+10-o),j}function Sc(a,b,c){a.curOp.updateScrollPos={scrollLeft:null==b?a.doc.scrollLeft:b,scrollTop:null==c?a.doc.scrollTop:c}}function Tc(a,b,c){var d=a.curOp.updateScrollPos||(a.curOp.updateScrollPos={scrollLeft:a.doc.scrollLeft,scrollTop:a.doc.scrollTop}),e=a.display.scroller;d.scrollTop=Math.max(0,Math.min(e.scrollHeight-e.clientHeight,d.scrollTop+c)),d.scrollLeft=Math.max(0,Math.min(e.scrollWidth-e.clientWidth,d.scrollLeft+b))}function Uc(a,b,c,d){var e=a.doc;if(null==c&&(c="add"),"smart"==c)if(a.doc.mode.indent)var f=eb(a,b);else c="prev";var k,g=a.options.tabSize,h=le(e,b),i=Ye(h.text,null,g),j=h.text.match(/^\s*/)[0];if("smart"==c&&(k=a.doc.mode.indent(f,h.text.slice(j.length),h.text),k==We)){if(!d)return;c="prev"}"prev"==c?k=b>e.first?Ye(le(e,b-1).text,null,g):0:"add"==c?k=i+a.options.indentUnit:"subtract"==c?k=i-a.options.indentUnit:"number"==typeof c&&(k=i+c),k=Math.max(0,k);var l="",m=0;if(a.options.indentWithTabs)for(var n=Math.floor(k/g);n;--n)m+=g,l+="	";k>m&&(l+=$e(k-m)),l!=j?Ac(a.doc,l,Bc(b,0),Bc(b,j.length),"+input"):e.sel.head.line==b&&e.sel.head.ch<j.length&&Lc(e,Bc(b,j.length),Bc(b,j.length),1),h.stateAfter=null}function Vc(a,b,c){var d=b,e=b,f=a.doc;return"number"==typeof b?e=le(f,Fc(f,b)):d=pe(b),null==d?null:c(e,d)?(Ib(a,d,d+1),e):null}function Wc(a,b,c,d,e){function k(){var b=f+c;return b<a.first||b>=a.first+a.size?j=!1:(f=b,i=le(a,b))}function l(a){var b=(e?Lf:Mf)(i,g,c,!0);if(null==b){if(a||!k())return j=!1;g=e?(0>c?Ef:Df)(i):0>c?i.text.length:0}else g=b;return!0}var f=b.line,g=b.ch,h=c,i=le(a,f),j=!0;if("char"==d)l();else if("column"==d)l(!0);else if("word"==d||"group"==d)for(var m=null,n="group"==d,o=!0;!(0>c)||l(!o);o=!1){var p=i.text.charAt(g)||"\n",q=hf(p)?"w":n?/\s/.test(p)?null:"p":null;if(m&&m!=q){0>c&&(c=1,l());break}if(q&&(m=q),c>0&&!l(!o))break}var r=Nc(a,Bc(f,g),h,!0);return j||(r.hitSide=!0),r}function Xc(a,b,c,d){var g,e=a.doc,f=b.left;if("page"==d){var h=Math.min(a.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight);g=b.top+c*(h-(0>c?1.5:.5)*Ab(a.display))}else"line"==d&&(g=c>0?b.bottom+3:b.top-3);for(;;){var i=xb(a,f,g);if(!i.outside)break;if(0>c?0>=g:g>=e.height){i.hitSide=!0;break}g+=5*c}return i}function Yc(a,b){var c=b.ch,d=b.ch;if(a){(b.xRel<0||d==a.length)&&c?--c:++d;for(var e=a.charAt(c),f=hf(e)?hf:/\s/.test(e)?function(a){return/\s/.test(a)}:function(a){return!/\s/.test(a)&&!hf(a)};c>0&&f(a.charAt(c-1));)--c;for(;d<a.length&&f(a.charAt(d));)++d}return{from:Bc(b.line,c),to:Bc(b.line,d)}}function Zc(a,b){Jc(a.doc,Bc(b,0),Gc(a.doc,Bc(b+1,0)))}function ad(a,b,c,d){x.defaults[a]=b,c&&($c[a]=d?function(a,b,d){d!=bd&&c(a,b,d)}:c)}function hd(a,b){if(b===!0)return b;if(a.copyState)return a.copyState(b);var c={};for(var d in b){var e=b[d];e instanceof Array&&(e=e.concat([])),c[d]=e}return c}function id(a,b,c){return a.startState?a.startState(b,c):!0}function ld(a){return"string"==typeof a?kd[a]:a}function md(a,b,c){function d(b){b=ld(b);var e=b[a];if(e===!1)return"stop";if(null!=e&&c(e))return!0;if(b.nofallthrough)return"stop";var f=b.fallthrough;if(null==f)return!1;if("[object Array]"!=Object.prototype.toString.call(f))return d(f);for(var g=0,h=f.length;h>g;++g){var i=d(f[g]);if(i)return i}return!1}for(var e=0;e<b.length;++e){var f=d(b[e]);if(f)return"stop"!=f}}function nd(a){var b=zf[a.keyCode];return"Ctrl"==b||"Alt"==b||"Shift"==b||"Mod"==b}function od(a,b){if(i&&34==a.keyCode&&a["char"])return!1;var c=zf[a.keyCode];return null==c||a.altGraphKey?!1:(a.altKey&&(c="Alt-"+c),(t?a.metaKey:a.ctrlKey)&&(c="Ctrl-"+c),(t?a.ctrlKey:a.metaKey)&&(c="Cmd-"+c),!b&&a.shiftKey&&(c="Shift-"+c),c)}function pd(a,b){this.pos=this.start=0,this.string=a,this.tabSize=b||8,this.lastColumnPos=this.lastColumnValue=0}function qd(a,b){this.lines=[],this.type=b,this.doc=a}function rd(a,b,c,d,e){if(d&&d.shared)return td(a,b,c,d,e);if(a.cm&&!a.cm.curOp)return Fb(a.cm,rd)(a,b,c,d,e);var f=new qd(a,e);if(Dc(c,b)||Cc(b,c)&&"range"==e&&(!d.inclusiveLeft||!d.inclusiveRight))return f;d&&df(d,f),f.replacedWith&&(f.collapsed=!0,f.replacedWith=lf("span",[f.replacedWith],"CodeMirror-widget"),d.handleMouseEvents||(f.replacedWith.ignoreEvents=!0)),f.collapsed&&(w=!0),f.addToHistory&&we(a,{from:b,to:c,origin:"markText"},{head:a.sel.head,anchor:a.sel.anchor},0/0);var i,j,l,g=b.line,h=0,k=a.cm;if(a.iter(g,c.line+1,function(d){k&&f.collapsed&&!k.options.lineWrapping&&Fd(a,d)==k.display.maxLine&&(l=!0);var e={from:null,to:null,marker:f};h+=d.text.length,g==b.line&&(e.from=b.ch,h-=b.ch),g==c.line&&(e.to=c.ch,h-=d.text.length-c.ch),f.collapsed&&(g==c.line&&(j=Cd(d,c.ch)),g==b.line?i=Cd(d,b.ch):oe(d,0)),wd(d,e),++g}),f.collapsed&&a.iter(b.line,c.line+1,function(b){Gd(a,b)&&oe(b,0)}),f.clearOnEnter&&Le(f,"beforeCursorEnter",function(){f.clear()}),f.readOnly&&(v=!0,(a.history.done.length||a.history.undone.length)&&a.clearHistory()),f.collapsed){if(i!=j)throw new Error("Inserting collapsed marker overlapping an existing one");f.size=h,f.atomic=!0}return k&&(l&&(k.curOp.updateMaxLine=!0),(f.className||f.title||f.startStyle||f.endStyle||f.collapsed)&&Ib(k,b.line,c.line+1),f.atomic&&Mc(k)),f}function sd(a,b){this.markers=a,this.primary=b;for(var c=0,d=this;c<a.length;++c)a[c].parent=this,Le(a[c],"clear",function(){d.clear()})}function td(a,b,c,d,e){d=df(d),d.shared=!1;var f=[rd(a,b,c,d,e)],g=f[0],h=d.replacedWith;return je(a,function(a){h&&(d.replacedWith=h.cloneNode(!0)),f.push(rd(a,Gc(a,b),Gc(a,c),d,e));for(var i=0;i<a.linked.length;++i)if(a.linked[i].isParent)return;g=_e(f)}),new sd(f,g)}function ud(a,b){if(a)for(var c=0;c<a.length;++c){var d=a[c];if(d.marker==b)return d}}function vd(a,b){for(var c,d=0;d<a.length;++d)a[d]!=b&&(c||(c=[])).push(a[d]);return c}function wd(a,b){a.markedSpans=a.markedSpans?a.markedSpans.concat([b]):[b],b.marker.attachLine(a)}function xd(a,b,c){if(a)for(var e,d=0;d<a.length;++d){var f=a[d],g=f.marker,h=null==f.from||(g.inclusiveLeft?f.from<=b:f.from<b);if(h||(g.inclusiveLeft&&g.inclusiveRight||"bookmark"==g.type)&&f.from==b&&(!c||!f.marker.insertLeft)){var i=null==f.to||(g.inclusiveRight?f.to>=b:f.to>b);(e||(e=[])).push({from:f.from,to:i?null:f.to,marker:g})}}return e}function yd(a,b,c){if(a)for(var e,d=0;d<a.length;++d){var f=a[d],g=f.marker,h=null==f.to||(g.inclusiveRight?f.to>=b:f.to>b);if(h||"bookmark"==g.type&&f.from==b&&(!c||f.marker.insertLeft)){var i=null==f.from||(g.inclusiveLeft?f.from<=b:f.from<b);(e||(e=[])).push({from:i?null:f.from-b,to:null==f.to?null:f.to-b,marker:g})}}return e}function zd(a,b){var c=Ic(a,b.from.line)&&le(a,b.from.line).markedSpans,d=Ic(a,b.to.line)&&le(a,b.to.line).markedSpans;if(!c&&!d)return null;var e=b.from.ch,f=b.to.ch,g=Cc(b.from,b.to),h=xd(c,e,g),i=yd(d,f,g),j=1==b.text.length,k=_e(b.text).length+(j?e:0);if(h)for(var l=0;l<h.length;++l){var m=h[l];if(null==m.to){var n=ud(i,m.marker);n?j&&(m.to=null==n.to?null:n.to+k):m.to=e}}if(i)for(var l=0;l<i.length;++l){var m=i[l];if(null!=m.to&&(m.to+=k),null==m.from){var n=ud(h,m.marker);n||(m.from=k,j&&(h||(h=[])).push(m))}else m.from+=k,j&&(h||(h=[])).push(m)}if(j&&h){for(var l=0;l<h.length;++l)null!=h[l].from&&h[l].from==h[l].to&&"bookmark"!=h[l].marker.type&&h.splice(l--,1);h.length||(h=null)}var o=[h];if(!j){var q,p=b.text.length-2;if(p>0&&h)for(var l=0;l<h.length;++l)null==h[l].to&&(q||(q=[])).push({from:null,to:null,marker:h[l].marker});for(var l=0;p>l;++l)o.push(q);o.push(i)}return o}function Ad(a,b){var c=ye(a,b),d=zd(a,b);if(!c)return d;if(!d)return c;for(var e=0;e<c.length;++e){var f=c[e],g=d[e];if(f&&g)a:for(var h=0;h<g.length;++h){for(var i=g[h],j=0;j<f.length;++j)if(f[j].marker==i.marker)continue a;f.push(i)}else g&&(c[e]=g)}return c}function Bd(a,b,c){var d=null;if(a.iter(b.line,c.line+1,function(a){if(a.markedSpans)for(var b=0;b<a.markedSpans.length;++b){var c=a.markedSpans[b].marker;!c.readOnly||d&&-1!=bf(d,c)||(d||(d=[])).push(c)}}),!d)return null;for(var e=[{from:b,to:c}],f=0;f<d.length;++f)for(var g=d[f],h=g.find(),i=0;i<e.length;++i){var j=e[i];if(!Dc(j.to,h.from)&&!Dc(h.to,j.from)){var k=[i,1];(Dc(j.from,h.from)||!g.inclusiveLeft&&Cc(j.from,h.from))&&k.push({from:j.from,to:h.from}),(Dc(h.to,j.to)||!g.inclusiveRight&&Cc(j.to,h.to))&&k.push({from:h.to,to:j.to}),e.splice.apply(e,k),i+=k.length-1}}return e}function Cd(a,b){var d,c=w&&a.markedSpans;if(c)for(var e,f=0;f<c.length;++f)e=c[f],e.marker.collapsed&&(null==e.from||e.from<b)&&(null==e.to||e.to>b)&&(!d||d.width<e.marker.width)&&(d=e.marker);return d}function Dd(a){return Cd(a,-1)}function Ed(a){return Cd(a,a.text.length+1)}function Fd(a,b){for(var c;c=Dd(b);)b=le(a,c.find().from.line);return b}function Gd(a,b){var c=w&&b.markedSpans;if(c)for(var d,e=0;e<c.length;++e)if(d=c[e],d.marker.collapsed){if(null==d.from)return!0;if(!d.marker.replacedWith&&0==d.from&&d.marker.inclusiveLeft&&Hd(a,b,d))return!0}}function Hd(a,b,c){if(null==c.to){var d=c.marker.find().to,e=le(a,d.line);return Hd(a,e,ud(e.markedSpans,c.marker))}if(c.marker.inclusiveRight&&c.to==b.text.length)return!0;for(var f,g=0;g<b.markedSpans.length;++g)if(f=b.markedSpans[g],f.marker.collapsed&&!f.marker.replacedWith&&f.from==c.to&&(f.marker.inclusiveLeft||c.marker.inclusiveRight)&&Hd(a,b,f))return!0}function Id(a){var b=a.markedSpans;if(b){for(var c=0;c<b.length;++c)b[c].marker.detachLine(a);a.markedSpans=null}}function Jd(a,b){if(b){for(var c=0;c<b.length;++c)b[c].marker.attachLine(a);a.markedSpans=b}}function Ld(a){return function(){var b=!this.cm.curOp;b&&Db(this.cm);try{var c=a.apply(this,arguments)}finally{b&&Eb(this.cm)}return c}}function Md(a){return null!=a.height?a.height:(a.node.parentNode&&1==a.node.parentNode.nodeType||nf(a.cm.display.measure,lf("div",[a.node],null,"position: relative")),a.height=a.node.offsetHeight)}function Nd(a,b,c,d){var e=new Kd(a,c,d);return e.noHScroll&&(a.display.alignWidgets=!0),Vc(a,b,function(b){var c=b.widgets||(b.widgets=[]);if(null==e.insertAt?c.push(e):c.splice(Math.min(c.length-1,Math.max(0,e.insertAt)),0,e),e.line=b,!Gd(a.doc,b)||e.showIfHidden){var d=re(a,b)<a.doc.scrollTop;oe(b,b.height+Md(e)),d&&Tc(a,0,e.height)}return!0}),e}function Pd(a,b,c,d){a.text=b,a.stateAfter&&(a.stateAfter=null),a.styles&&(a.styles=null),null!=a.order&&(a.order=null),Id(a),Jd(a,c);var e=d?d(a):1;e!=a.height&&oe(a,e)}function Qd(a){a.parent=null,Id(a)}function Rd(a,b,c,d,e,f){var g=c.flattenSpans;null==g&&(g=a.options.flattenSpans);var k,h=0,i=null,j=new pd(b,a.options.tabSize);for(""==b&&c.blankLine&&c.blankLine(d);!j.eol();)j.pos>a.options.maxHighlightLength?(g=!1,f&&Ud(a,b,d,j.pos),j.pos=b.length,k=null):k=c.token(j,d),g&&i==k||(h<j.start&&e(j.start,i),h=j.start,i=k),j.start=j.pos;for(;h<j.pos;){var l=Math.min(j.pos,h+5e4);e(l,i),h=l}}function Sd(a,b,c,d){var e=[a.state.modeGen];Rd(a,b.text,a.doc.mode,c,function(a,b){e.push(a,b)},d);for(var f=0;f<a.state.overlays.length;++f){var g=a.state.overlays[f],h=1,i=0;Rd(a,b.text,g.mode,!0,function(a,b){for(var c=h;a>i;){var d=e[h];d>a&&e.splice(h,1,a,e[h+1],d),h+=2,i=Math.min(a,d)}if(b)if(g.opaque)e.splice(c,h-c,a,b),h=c+2;else for(;h>c;c+=2){var f=e[c+1];e[c+1]=f?f+" "+b:b}})}return e}function Td(a,b){return b.styles&&b.styles[0]==a.state.modeGen||(b.styles=Sd(a,b,b.stateAfter=eb(a,pe(b)))),b.styles}function Ud(a,b,c,d){var e=a.doc.mode,f=new pd(b,a.options.tabSize);for(f.start=f.pos=d||0,""==b&&e.blankLine&&e.blankLine(c);!f.eol()&&f.pos<=a.options.maxHighlightLength;)e.token(f,c),f.start=f.pos}function Wd(a,b){if(!a)return null;for(;;){var c=a.match(/(?:^|\s)line-(background-)?(\S+)/);if(!c)break;a=a.slice(0,c.index)+a.slice(c.index+c[0].length);var d=c[1]?"bgClass":"textClass";null==b[d]?b[d]=c[2]:new RegExp("(?:^|s)"+c[2]+"(?:$|s)").test(b[d])||(b[d]+=" "+c[2])}return Vd[a]||(Vd[a]="cm-"+a.replace(/ +/g," cm-"))}function Xd(a,c,d,g){for(var h,i=c,j=!0;h=Dd(i);)i=le(a.doc,h.find().from.line);var k={pre:lf("pre"),col:0,pos:0,measure:null,measuredSomething:!1,cm:a,copyWidgets:g};do{i.text&&(j=!1),k.measure=i==c&&d,k.pos=0,k.addToken=k.measure?$d:Zd,(b||f)&&a.getOption("lineWrapping")&&(k.addToken=_d(k.addToken));var l=be(i,k,Td(a,i));d&&i==c&&!k.measuredSomething&&(d[0]=k.pre.appendChild(vf(a.display.measure)),k.measuredSomething=!0),l&&(i=le(a.doc,l.to.line))}while(l);!d||k.measuredSomething||d[0]||(d[0]=k.pre.appendChild(j?lf("span","\xa0"):vf(a.display.measure))),k.pre.firstChild||Gd(a.doc,c)||k.pre.appendChild(document.createTextNode("\xa0"));var m;if(d&&(b||e)&&(m=se(i))){var n=m.length-1;m[n].from==m[n].to&&--n;var o=m[n],p=m[n-1];if(o.from+1==o.to&&p&&o.level<p.level){var q=d[k.pos-1];q&&q.parentNode.insertBefore(q.measureRight=vf(a.display.measure),q.nextSibling)}}var r=k.textClass?k.textClass+" "+(c.textClass||""):c.textClass;return r&&(k.pre.className=r),Ne(a,"renderLine",a,c,k.pre),k}function Yd(a){var b=lf("span","\u2022","cm-invalidchar");return b.title="\\u"+a.charCodeAt(0).toString(16),b}function Zd(a,b,c,d,e,f){if(b){var g=a.cm.options.specialChars;if(g.test(b))for(var h=document.createDocumentFragment(),i=0;;){g.lastIndex=i;var j=g.exec(b),k=j?j.index-i:b.length-i;if(k&&(h.appendChild(document.createTextNode(b.slice(i,i+k))),a.col+=k),!j)break;if(i+=k+1,"	"==j[0]){var l=a.cm.options.tabSize,m=l-a.col%l;h.appendChild(lf("span",$e(m),"cm-tab")),a.col+=m}else{var n=a.cm.options.specialCharPlaceholder(j[0]);h.appendChild(n),a.col+=1}}else{a.col+=b.length;var h=document.createTextNode(b)}if(c||d||e||a.measure){var o=c||"";d&&(o+=d),e&&(o+=e);var n=lf("span",[h],o);return f&&(n.title=f),a.pre.appendChild(n)}a.pre.appendChild(h)}}function $d(a,c,d,e,f){for(var g=a.cm.options.lineWrapping,h=0;h<c.length;++h){var i=c.charAt(h),j=0==h;i>="\ud800"&&"\udbff">i&&h<c.length-1?(i=c.slice(h,h+2),++h):h&&g&&rf(c,h)&&a.pre.appendChild(lf("wbr"));var k=a.measure[a.pos],l=a.measure[a.pos]=Zd(a,i,d,j&&e,h==c.length-1&&f);k&&(l.leftSide=k.leftSide||k),b&&g&&" "==i&&h&&!/\s/.test(c.charAt(h-1))&&h<c.length-1&&!/\s/.test(c.charAt(h+1))&&(l.style.whiteSpace="normal"),a.pos+=i.length}c.length&&(a.measuredSomething=!0)}function _d(a){function b(a){for(var b=" ",c=0;c<a.length-2;++c)b+=c%2?" ":"\xa0";return b+=" "}return function(c,d,e,f,g,h){return a(c,d.replace(/ {3,}/g,b),e,f,g,h)}}function ae(a,b,c,d){var e=!d&&c.replacedWith;if(e&&(a.copyWidgets&&(e=e.cloneNode(!0)),a.pre.appendChild(e),a.measure)){if(b)a.measure[a.pos]=e;else{var f=vf(a.cm.display.measure);if("bookmark"!=c.type||c.insertLeft){if(a.measure[a.pos])return;a.measure[a.pos]=a.pre.insertBefore(f,e)}else a.measure[a.pos]=a.pre.appendChild(f)}a.measuredSomething=!0}a.pos+=b}function be(a,b,c){var d=a.markedSpans,e=a.text,f=0;if(d)for(var k,m,n,o,p,q,h=e.length,i=0,g=1,j="",l=0;;){if(l==i){m=n=o=p="",q=null,l=1/0;for(var r=[],s=0;s<d.length;++s){var t=d[s],u=t.marker;t.from<=i&&(null==t.to||t.to>i)?(null!=t.to&&l>t.to&&(l=t.to,n=""),u.className&&(m+=" "+u.className),u.startStyle&&t.from==i&&(o+=" "+u.startStyle),u.endStyle&&t.to==l&&(n+=" "+u.endStyle),u.title&&!p&&(p=u.title),u.collapsed&&(!q||q.marker.size<u.size)&&(q=t)):t.from>i&&l>t.from&&(l=t.from),"bookmark"==u.type&&t.from==i&&u.replacedWith&&r.push(u)
-}if(q&&(q.from||0)==i&&(ae(b,(null==q.to?h:q.to)-i,q.marker,null==q.from),null==q.to))return q.marker.find();if(!q&&r.length)for(var s=0;s<r.length;++s)ae(b,0,r[s])}if(i>=h)break;for(var v=Math.min(h,l);;){if(j){var w=i+j.length;if(!q){var x=w>v?j.slice(0,v-i):j;b.addToken(b,x,k?k+m:m,o,i+x.length==l?n:"",p)}if(w>=v){j=j.slice(v-i),i=v;break}i=w,o=""}j=e.slice(f,f=c[g++]),k=Wd(c[g++],b)}}else for(var g=1;g<c.length;g+=2)b.addToken(b,e.slice(f,f=c[g]),Wd(c[g+1],b))}function ce(a,b,c,d,e){function f(a){return c?c[a]:null}function g(a,c,d){Pd(a,c,d,e),Qe(a,"change",a,b)}var h=b.from,i=b.to,j=b.text,k=le(a,h.line),l=le(a,i.line),m=_e(j),n=f(j.length-1),o=i.line-h.line;if(0!=h.ch||0!=i.ch||""!=m||a.cm&&!a.cm.options.wholeLineUpdateBefore)if(k==l)if(1==j.length)g(k,k.text.slice(0,h.ch)+m+k.text.slice(i.ch),n);else{for(var r=[],p=1,q=j.length-1;q>p;++p)r.push(new Od(j[p],f(p),e));r.push(new Od(m+k.text.slice(i.ch),n,e)),g(k,k.text.slice(0,h.ch)+j[0],f(0)),a.insert(h.line+1,r)}else if(1==j.length)g(k,k.text.slice(0,h.ch)+j[0]+l.text.slice(i.ch),f(0)),a.remove(h.line+1,o);else{g(k,k.text.slice(0,h.ch)+j[0],f(0)),g(l,m+l.text.slice(i.ch),n);for(var p=1,q=j.length-1,r=[];q>p;++p)r.push(new Od(j[p],f(p),e));o>1&&a.remove(h.line+1,o-1),a.insert(h.line+1,r)}else{for(var p=0,q=j.length-1,r=[];q>p;++p)r.push(new Od(j[p],f(p),e));g(l,l.text,n),o&&a.remove(h.line,o),r.length&&a.insert(h.line,r)}Qe(a,"change",a,b),Lc(a,d.anchor,d.head,null,!0)}function de(a){this.lines=a,this.parent=null;for(var b=0,c=a.length,d=0;c>b;++b)a[b].parent=this,d+=a[b].height;this.height=d}function ee(a){this.children=a;for(var b=0,c=0,d=0,e=a.length;e>d;++d){var f=a[d];b+=f.chunkSize(),c+=f.height,f.parent=this}this.size=b,this.height=c,this.parent=null}function je(a,b,c){function d(a,e,f){if(a.linked)for(var g=0;g<a.linked.length;++g){var h=a.linked[g];if(h.doc!=e){var i=f&&h.sharedHist;(!c||i)&&(b(h.doc,i),d(h.doc,a,i))}}}d(a,null,!0)}function ke(a,b){if(b.cm)throw new Error("This document is already in use.");a.doc=b,b.cm=a,C(a),z(a),a.options.lineWrapping||I(a),a.options.mode=b.modeOption,Ib(a)}function le(a,b){for(b-=a.first;!a.lines;)for(var c=0;;++c){var d=a.children[c],e=d.chunkSize();if(e>b){a=d;break}b-=e}return a.lines[b]}function me(a,b,c){var d=[],e=b.line;return a.iter(b.line,c.line+1,function(a){var f=a.text;e==c.line&&(f=f.slice(0,c.ch)),e==b.line&&(f=f.slice(b.ch)),d.push(f),++e}),d}function ne(a,b,c){var d=[];return a.iter(b,c,function(a){d.push(a.text)}),d}function oe(a,b){for(var c=b-a.height,d=a;d;d=d.parent)d.height+=c}function pe(a){if(null==a.parent)return null;for(var b=a.parent,c=bf(b.lines,a),d=b.parent;d;b=d,d=d.parent)for(var e=0;d.children[e]!=b;++e)c+=d.children[e].chunkSize();return c+b.first}function qe(a,b){var c=a.first;a:do{for(var d=0,e=a.children.length;e>d;++d){var f=a.children[d],g=f.height;if(g>b){a=f;continue a}b-=g,c+=f.chunkSize()}return c}while(!a.lines);for(var d=0,e=a.lines.length;e>d;++d){var h=a.lines[d],i=h.height;if(i>b)break;b-=i}return c+d}function re(a,b){b=Fd(a.doc,b);for(var c=0,d=b.parent,e=0;e<d.lines.length;++e){var f=d.lines[e];if(f==b)break;c+=f.height}for(var g=d.parent;g;d=g,g=d.parent)for(var e=0;e<g.children.length;++e){var h=g.children[e];if(h==d)break;c+=h.height}return c}function se(a){var b=a.order;return null==b&&(b=a.order=Nf(a.text)),b}function te(a){return{done:[],undone:[],undoDepth:1/0,lastTime:0,lastOp:null,lastOrigin:null,generation:a||1,maxGeneration:a||1}}function ue(a,b,c,d){var e=b["spans_"+a.id],f=0;a.iter(Math.max(a.first,c),Math.min(a.first+a.size,d),function(c){c.markedSpans&&((e||(e=b["spans_"+a.id]={}))[f]=c.markedSpans),++f})}function ve(a,b){var c={line:b.from.line,ch:b.from.ch},d={from:c,to:qc(b),text:me(a,b.from,b.to)};return ue(a,d,b.from.line,b.to.line+1),je(a,function(a){ue(a,d,b.from.line,b.to.line+1)},!0),d}function we(a,b,c,d){var e=a.history;e.undone.length=0;var f=+new Date,g=_e(e.done);if(g&&(e.lastOp==d||e.lastOrigin==b.origin&&b.origin&&("+"==b.origin.charAt(0)&&a.cm&&e.lastTime>f-a.cm.options.historyEventDelay||"*"==b.origin.charAt(0)))){var h=_e(g.changes);Cc(b.from,b.to)&&Cc(b.from,h.to)?h.to=qc(b):g.changes.push(ve(a,b)),g.anchorAfter=c.anchor,g.headAfter=c.head}else for(g={changes:[ve(a,b)],generation:e.generation,anchorBefore:a.sel.anchor,headBefore:a.sel.head,anchorAfter:c.anchor,headAfter:c.head},e.done.push(g),e.generation=++e.maxGeneration;e.done.length>e.undoDepth;)e.done.shift();e.lastTime=f,e.lastOp=d,e.lastOrigin=b.origin}function xe(a){if(!a)return null;for(var c,b=0;b<a.length;++b)a[b].marker.explicitlyCleared?c||(c=a.slice(0,b)):c&&c.push(a[b]);return c?c.length?c:null:a}function ye(a,b){var c=b["spans_"+a.id];if(!c)return null;for(var d=0,e=[];d<b.text.length;++d)e.push(xe(c[d]));return e}function ze(a,b){for(var c=0,d=[];c<a.length;++c){var e=a[c],f=e.changes,g=[];d.push({changes:g,anchorBefore:e.anchorBefore,headBefore:e.headBefore,anchorAfter:e.anchorAfter,headAfter:e.headAfter});for(var h=0;h<f.length;++h){var j,i=f[h];if(g.push({from:i.from,to:i.to,text:i.text}),b)for(var k in i)(j=k.match(/^spans_(\d+)$/))&&bf(b,Number(j[1]))>-1&&(_e(g)[k]=i[k],delete i[k])}}return d}function Ae(a,b,c,d){c<a.line?a.line+=d:b<a.line&&(a.line=b,a.ch=0)}function Be(a,b,c,d){for(var e=0;e<a.length;++e){for(var f=a[e],g=!0,h=0;h<f.changes.length;++h){var i=f.changes[h];if(f.copied||(i.from=Ec(i.from),i.to=Ec(i.to)),c<i.from.line)i.from.line+=d,i.to.line+=d;else if(b<=i.to.line){g=!1;break}}f.copied||(f.anchorBefore=Ec(f.anchorBefore),f.headBefore=Ec(f.headBefore),f.anchorAfter=Ec(f.anchorAfter),f.readAfter=Ec(f.headAfter),f.copied=!0),g?(Ae(f.anchorBefore),Ae(f.headBefore),Ae(f.anchorAfter),Ae(f.headAfter)):(a.splice(0,e+1),e=0)}}function Ce(a,b){var c=b.from.line,d=b.to.line,e=b.text.length-(d-c)-1;Be(a.done,c,d,e),Be(a.undone,c,d,e)}function De(){Ie(this)}function Ee(a){return a.stop||(a.stop=De),a}function Fe(a){a.preventDefault?a.preventDefault():a.returnValue=!1}function Ge(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0}function He(a){return null!=a.defaultPrevented?a.defaultPrevented:0==a.returnValue}function Ie(a){Fe(a),Ge(a)}function Je(a){return a.target||a.srcElement}function Ke(a){var b=a.which;return null==b&&(1&a.button?b=1:2&a.button?b=3:4&a.button&&(b=2)),q&&a.ctrlKey&&1==b&&(b=3),b}function Le(a,b,c){if(a.addEventListener)a.addEventListener(b,c,!1);else if(a.attachEvent)a.attachEvent("on"+b,c);else{var d=a._handlers||(a._handlers={}),e=d[b]||(d[b]=[]);e.push(c)}}function Me(a,b,c){if(a.removeEventListener)a.removeEventListener(b,c,!1);else if(a.detachEvent)a.detachEvent("on"+b,c);else{var d=a._handlers&&a._handlers[b];if(!d)return;for(var e=0;e<d.length;++e)if(d[e]==c){d.splice(e,1);break}}}function Ne(a,b){var c=a._handlers&&a._handlers[b];if(c)for(var d=Array.prototype.slice.call(arguments,2),e=0;e<c.length;++e)c[e].apply(null,d)}function Qe(a,b){function e(a){return function(){a.apply(null,d)}}var c=a._handlers&&a._handlers[b];if(c){var d=Array.prototype.slice.call(arguments,2);Oe||(++Pe,Oe=[],setTimeout(Se,0));for(var f=0;f<c.length;++f)Oe.push(e(c[f]))}}function Re(a,b,c){return Ne(a,c||b.type,a,b),He(b)||b.codemirrorIgnore}function Se(){--Pe;var a=Oe;Oe=null;for(var b=0;b<a.length;++b)a[b]()}function Te(a,b){var c=a._handlers&&a._handlers[b];return c&&c.length>0}function Ue(a){a.prototype.on=function(a,b){Le(this,a,b)},a.prototype.off=function(a,b){Me(this,a,b)}}function Xe(){this.id=null}function Ye(a,b,c,d,e){null==b&&(b=a.search(/[^\s\u00a0]/),-1==b&&(b=a.length));for(var f=d||0,g=e||0;b>f;++f)"	"==a.charAt(f)?g+=c-g%c:++g;return g}function $e(a){for(;Ze.length<=a;)Ze.push(_e(Ze)+" ");return Ze[a]}function _e(a){return a[a.length-1]}function af(a){if(o)a.selectionStart=0,a.selectionEnd=a.value.length;else try{a.select()}catch(b){}}function bf(a,b){if(a.indexOf)return a.indexOf(b);for(var c=0,d=a.length;d>c;++c)if(a[c]==b)return c;return-1}function cf(a,b){function c(){}c.prototype=a;var d=new c;return b&&df(b,d),d}function df(a,b){b||(b={});for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function ef(a){for(var b=[],c=0;a>c;++c)b.push(void 0);return b}function ff(a){var b=Array.prototype.slice.call(arguments,1);return function(){return a.apply(null,b)}}function hf(a){return/\w/.test(a)||a>"\x80"&&(a.toUpperCase()!=a.toLowerCase()||gf.test(a))}function jf(a){for(var b in a)if(a.hasOwnProperty(b)&&a[b])return!1;return!0}function lf(a,b,c,d){var e=document.createElement(a);if(c&&(e.className=c),d&&(e.style.cssText=d),"string"==typeof b)of(e,b);else if(b)for(var f=0;f<b.length;++f)e.appendChild(b[f]);return e}function mf(a){for(var b=a.childNodes.length;b>0;--b)a.removeChild(a.firstChild);return a}function nf(a,b){return mf(a).appendChild(b)}function of(a,b){d?(a.innerHTML="",a.appendChild(document.createTextNode(b))):a.textContent=b}function pf(a){return a.getBoundingClientRect()}function rf(){return!1}function tf(a){if(null!=sf)return sf;var b=lf("div",null,null,"width: 50px; height: 50px; overflow-x: scroll");return nf(a,b),b.offsetWidth&&(sf=b.offsetHeight-b.clientHeight),sf||0}function vf(a){if(null==uf){var b=lf("span","\u200b");nf(a,lf("span",[b,document.createTextNode("x")])),0!=a.firstChild.offsetHeight&&(uf=b.offsetWidth<=1&&b.offsetHeight>2&&!c)}return uf?lf("span","\u200b"):lf("span","\xa0",null,"display: inline-block; width: 1px; margin-right: -1px")}function Af(a,b,c,d){if(!a)return d(b,c,"ltr");for(var e=!1,f=0;f<a.length;++f){var g=a[f];(g.from<c&&g.to>b||b==c&&g.to==b)&&(d(Math.max(g.from,b),Math.min(g.to,c),1==g.level?"rtl":"ltr"),e=!0)}e||d(b,c,"ltr")}function Bf(a){return a.level%2?a.to:a.from}function Cf(a){return a.level%2?a.from:a.to}function Df(a){var b=se(a);return b?Bf(b[0]):0}function Ef(a){var b=se(a);return b?Cf(_e(b)):a.text.length}function Ff(a,b){var c=le(a.doc,b),d=Fd(a.doc,c);d!=c&&(b=pe(d));var e=se(d),f=e?e[0].level%2?Ef(d):Df(d):0;return Bc(b,f)}function Gf(a,b){for(var c,d;c=Ed(d=le(a.doc,b));)b=c.find().to.line;var e=se(d),f=e?e[0].level%2?Df(d):Ef(d):d.text.length;return Bc(b,f)}function Hf(a,b,c){var d=a[0].level;return b==d?!0:c==d?!1:c>b}function Jf(a,b){for(var d,c=0;c<a.length;++c){var e=a[c];if(e.from<b&&e.to>b)return If=null,c;if(e.from==b||e.to==b){if(null!=d)return Hf(a,e.level,a[d].level)?(If=d,c):(If=c,d);d=c}}return If=null,d}function Kf(a,b,c,d){if(!d)return b+c;do b+=c;while(b>0&&kf.test(a.text.charAt(b)));return b}function Lf(a,b,c,d){var e=se(a);if(!e)return Mf(a,b,c,d);for(var f=Jf(e,b),g=e[f],h=Kf(a,b,g.level%2?-c:c,d);;){if(h>g.from&&h<g.to)return h;if(h==g.from||h==g.to)return Jf(e,h)==f?h:(g=e[f+=c],c>0==g.level%2?g.to:g.from);if(g=e[f+=c],!g)return null;h=c>0==g.level%2?Kf(a,g.to,-1,d):Kf(a,g.from,1,d)}}function Mf(a,b,c,d){var e=b+c;if(d)for(;e>0&&kf.test(a.text.charAt(e));)e+=c;return 0>e||e>a.text.length?null:e}var a=/gecko\/\d/i.test(navigator.userAgent),b=/MSIE \d/.test(navigator.userAgent),c=b&&(null==document.documentMode||document.documentMode<8),d=b&&(null==document.documentMode||document.documentMode<9),e=/Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent),f=/WebKit\//.test(navigator.userAgent),g=f&&/Qt\/\d+\.\d+/.test(navigator.userAgent),h=/Chrome\//.test(navigator.userAgent),i=/Opera\//.test(navigator.userAgent),j=/Apple Computer/.test(navigator.vendor),k=/KHTML\//.test(navigator.userAgent),l=/Mac OS X 1\d\D([7-9]|\d\d)\D/.test(navigator.userAgent),m=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent),n=/PhantomJS/.test(navigator.userAgent),o=/AppleWebKit/.test(navigator.userAgent)&&/Mobile\/\w+/.test(navigator.userAgent),p=o||/Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent),q=o||/Mac/.test(navigator.platform),r=/win/i.test(navigator.platform),s=i&&navigator.userAgent.match(/Version\/(\d*\.\d*)/);s&&(s=Number(s[1])),s&&s>=15&&(i=!1,f=!0);var zb,Sb,Tb,t=q&&(g||i&&(null==s||12.11>s)),u=a||b&&!d,v=!1,w=!1,Cb=0,Yb=0,bc=0,cc=null;b?cc=-.53:a?cc=15:h?cc=-.7:j&&(cc=-1/3);var gc,oc,jc=null,qc=x.changeEnd=function(a){return a.text?Bc(a.from.line+a.text.length-1,_e(a.text).length+(1==a.text.length?a.from.ch:0)):a.to};x.Pos=Bc,x.prototype={constructor:x,focus:function(){window.focus(),Nb(this),Kb(this)},setOption:function(a,b){var c=this.options,d=c[a];(c[a]!=b||"mode"==a)&&(c[a]=b,$c.hasOwnProperty(a)&&Fb(this,$c[a])(this,b,d))},getOption:function(a){return this.options[a]},getDoc:function(){return this.doc},addKeyMap:function(a,b){this.state.keyMaps[b?"push":"unshift"](a)},removeKeyMap:function(a){for(var b=this.state.keyMaps,c=0;c<b.length;++c)if(b[c]==a||"string"!=typeof b[c]&&b[c].name==a)return b.splice(c,1),!0},addOverlay:Fb(null,function(a,b){var c=a.token?a:x.getMode(this.options,a);if(c.startState)throw new Error("Overlays may not be stateful.");this.state.overlays.push({mode:c,modeSpec:a,opaque:b&&b.opaque}),this.state.modeGen++,Ib(this)}),removeOverlay:Fb(null,function(a){for(var b=this.state.overlays,c=0;c<b.length;++c){var d=b[c].modeSpec;if(d==a||"string"==typeof a&&d.name==a)return b.splice(c,1),this.state.modeGen++,Ib(this),void 0}}),indentLine:Fb(null,function(a,b,c){"string"!=typeof b&&"number"!=typeof b&&(b=null==b?this.options.smartIndent?"smart":"prev":b?"add":"subtract"),Ic(this.doc,a)&&Uc(this,a,b,c)}),indentSelection:Fb(null,function(a){var b=this.doc.sel;if(Cc(b.from,b.to))return Uc(this,b.from.line,a);for(var c=b.to.line-(b.to.ch?0:1),d=b.from.line;c>=d;++d)Uc(this,d,a)}),getTokenAt:function(a,b){var c=this.doc;a=Gc(c,a);for(var d=eb(this,a.line,b),e=this.doc.mode,f=le(c,a.line),g=new pd(f.text,this.options.tabSize);g.pos<a.ch&&!g.eol();){g.start=g.pos;var h=e.token(g,d)}return{start:g.start,end:g.pos,string:g.current(),className:h||null,type:h||null,state:d}},getTokenTypeAt:function(a){a=Gc(this.doc,a);var b=Td(this,le(this.doc,a.line)),c=0,d=(b.length-1)/2,e=a.ch;if(0==e)return b[2];for(;;){var f=c+d>>1;if((f?b[2*f-1]:0)>=e)d=f;else{if(!(b[2*f+1]<e))return b[2*f+2];c=f+1}}},getModeAt:function(a){var b=this.doc.mode;return b.innerMode?x.innerMode(b,this.getTokenAt(a).state).mode:b},getHelper:function(a,b){if(gd.hasOwnProperty(b)){var c=gd[b],d=this.getModeAt(a);return d[b]&&c[d[b]]||d.helperType&&c[d.helperType]||c[d.name]}},getStateAfter:function(a,b){var c=this.doc;return a=Fc(c,null==a?c.first+c.size-1:a),eb(this,a+1,b)},cursorCoords:function(a,b){var c,d=this.doc.sel;return c=null==a?d.head:"object"==typeof a?Gc(this.doc,a):a?d.from:d.to,vb(this,c,b||"page")},charCoords:function(a,b){return ub(this,Gc(this.doc,a),b||"page")},coordsChar:function(a,b){return a=tb(this,a,b||"page"),xb(this,a.left,a.top)},lineAtHeight:function(a,b){return a=tb(this,{top:a,left:0},b||"page").top,qe(this.doc,a+this.display.viewOffset)},heightAtLine:function(a,b){var c=!1,d=this.doc.first+this.doc.size-1;a<this.doc.first?a=this.doc.first:a>d&&(a=d,c=!0);var e=le(this.doc,a);return sb(this,le(this.doc,a),{top:0,left:0},b||"page").top+(c?e.height:0)},defaultTextHeight:function(){return Ab(this.display)},defaultCharWidth:function(){return Bb(this.display)},setGutterMarker:Fb(null,function(a,b,c){return Vc(this,a,function(a){var d=a.gutterMarkers||(a.gutterMarkers={});return d[b]=c,!c&&jf(d)&&(a.gutterMarkers=null),!0})}),clearGutter:Fb(null,function(a){var b=this,c=b.doc,d=c.first;c.iter(function(c){c.gutterMarkers&&c.gutterMarkers[a]&&(c.gutterMarkers[a]=null,Ib(b,d,d+1),jf(c.gutterMarkers)&&(c.gutterMarkers=null)),++d})}),addLineClass:Fb(null,function(a,b,c){return Vc(this,a,function(a){var d="text"==b?"textClass":"background"==b?"bgClass":"wrapClass";if(a[d]){if(new RegExp("(?:^|\\s)"+c+"(?:$|\\s)").test(a[d]))return!1;a[d]+=" "+c}else a[d]=c;return!0})}),removeLineClass:Fb(null,function(a,b,c){return Vc(this,a,function(a){var d="text"==b?"textClass":"background"==b?"bgClass":"wrapClass",e=a[d];if(!e)return!1;if(null==c)a[d]=null;else{var f=e.match(new RegExp("(?:^|\\s+)"+c+"(?:$|\\s+)"));if(!f)return!1;var g=f.index+f[0].length;a[d]=e.slice(0,f.index)+(f.index&&g!=e.length?" ":"")+e.slice(g)||null}return!0})}),addLineWidget:Fb(null,function(a,b,c){return Nd(this,a,b,c)}),removeLineWidget:function(a){a.clear()},lineInfo:function(a){if("number"==typeof a){if(!Ic(this.doc,a))return null;var b=a;if(a=le(this.doc,a),!a)return null}else{var b=pe(a);if(null==b)return null}return{line:b,handle:a,text:a.text,gutterMarkers:a.gutterMarkers,textClass:a.textClass,bgClass:a.bgClass,wrapClass:a.wrapClass,widgets:a.widgets}},getViewport:function(){return{from:this.display.showingFrom,to:this.display.showingTo}},addWidget:function(a,b,c,d,e){var f=this.display;a=vb(this,Gc(this.doc,a));var g=a.bottom,h=a.left;if(b.style.position="absolute",f.sizer.appendChild(b),"over"==d)g=a.top;else if("above"==d||"near"==d){var i=Math.max(f.wrapper.clientHeight,this.doc.height),j=Math.max(f.sizer.clientWidth,f.lineSpace.clientWidth);("above"==d||a.bottom+b.offsetHeight>i)&&a.top>b.offsetHeight?g=a.top-b.offsetHeight:a.bottom+b.offsetHeight<=i&&(g=a.bottom),h+b.offsetWidth>j&&(h=j-b.offsetWidth)}b.style.top=g+"px",b.style.left=b.style.right="","right"==e?(h=f.sizer.clientWidth-b.offsetWidth,b.style.right="0px"):("left"==e?h=0:"middle"==e&&(h=(f.sizer.clientWidth-b.offsetWidth)/2),b.style.left=h+"px"),c&&Qc(this,h,g,h+b.offsetWidth,g+b.offsetHeight)},triggerOnKeyDown:Fb(null,kc),execCommand:function(a){return jd[a](this)},findPosH:function(a,b,c,d){var e=1;0>b&&(e=-1,b=-b);for(var f=0,g=Gc(this.doc,a);b>f&&(g=Wc(this.doc,g,e,c,d),!g.hitSide);++f);return g},moveH:Fb(null,function(a,b){var d,c=this.doc.sel;d=c.shift||c.extend||Cc(c.from,c.to)?Wc(this.doc,c.head,a,b,this.options.rtlMoveVisually):0>a?c.from:c.to,Jc(this.doc,d,d,a)}),deleteH:Fb(null,function(a,b){var c=this.doc.sel;Cc(c.from,c.to)?Ac(this.doc,"",c.from,Wc(this.doc,c.head,a,b,!1),"+delete"):Ac(this.doc,"",c.from,c.to,"+delete"),this.curOp.userSelChange=!0}),findPosV:function(a,b,c,d){var e=1,f=d;0>b&&(e=-1,b=-b);for(var g=0,h=Gc(this.doc,a);b>g;++g){var i=vb(this,h,"div");if(null==f?f=i.left:i.left=f,h=Xc(this,i,e,c),h.hitSide)break}return h},moveV:Fb(null,function(a,b){var c=this.doc.sel,d=vb(this,c.head,"div");null!=c.goalColumn&&(d.left=c.goalColumn);var e=Xc(this,d,a,b);"page"==b&&Tc(this,0,ub(this,e,"div").top-d.top),Jc(this.doc,e,e,a),c.goalColumn=d.left}),toggleOverwrite:function(a){(null==a||a!=this.state.overwrite)&&((this.state.overwrite=!this.state.overwrite)?this.display.cursor.className+=" CodeMirror-overwrite":this.display.cursor.className=this.display.cursor.className.replace(" CodeMirror-overwrite",""))},hasFocus:function(){return this.state.focused},scrollTo:Fb(null,function(a,b){Sc(this,a,b)}),getScrollInfo:function(){var a=this.display.scroller,b=Ve;return{left:a.scrollLeft,top:a.scrollTop,height:a.scrollHeight-b,width:a.scrollWidth-b,clientHeight:a.clientHeight-b,clientWidth:a.clientWidth-b}},scrollIntoView:Fb(null,function(a,b){null==a?a={from:this.doc.sel.head,to:null}:"number"==typeof a?a={from:Bc(a,0),to:null}:null==a.from&&(a={from:a,to:null}),a.to||(a.to=a.from),b||(b=0);var c=a;null!=a.from.line&&(this.curOp.scrollToPos={from:a.from,to:a.to,margin:b},c={from:vb(this,a.from),to:vb(this,a.to)});var d=Rc(this,Math.min(c.from.left,c.to.left),Math.min(c.from.top,c.to.top)-b,Math.max(c.from.right,c.to.right),Math.max(c.from.bottom,c.to.bottom)+b);Sc(this,d.scrollLeft,d.scrollTop)}),setSize:Fb(null,function(a,b){function c(a){return"number"==typeof a||/^\d+$/.test(String(a))?a+"px":a}null!=a&&(this.display.wrapper.style.width=c(a)),null!=b&&(this.display.wrapper.style.height=c(b)),this.options.lineWrapping&&(this.display.measureLineCache.length=this.display.measureLineCachePos=0),this.curOp.forceUpdate=!0}),operation:function(a){return Hb(this,a)},refresh:Fb(null,function(){var a=null==this.display.cachedTextHeight;pb(this),Sc(this,this.doc.scrollLeft,this.doc.scrollTop),Ib(this),a&&C(this)}),swapDoc:Fb(null,function(a){var b=this.doc;return b.cm=null,ke(this,a),pb(this),Mb(this,!0),Sc(this,a.scrollLeft,a.scrollTop),Qe(this,"swapDoc",this,b),b}),getInputField:function(){return this.display.input},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},Ue(x);var $c=x.optionHandlers={},_c=x.defaults={},bd=x.Init={toString:function(){return"CodeMirror.Init"}};ad("value","",function(a,b){a.setValue(b)},!0),ad("mode",null,function(a,b){a.doc.modeOption=b,z(a)},!0),ad("indentUnit",2,z,!0),ad("indentWithTabs",!1),ad("smartIndent",!0),ad("tabSize",4,function(a){z(a),pb(a),Ib(a)},!0),ad("specialChars",/[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/g,function(a,b){a.options.specialChars=new RegExp(b.source+(b.test("	")?"":"|	"),"g"),a.refresh()},!0),ad("specialCharPlaceholder",Yd,function(a){a.refresh()},!0),ad("electricChars",!0),ad("rtlMoveVisually",!r),ad("wholeLineUpdateBefore",!0),ad("theme","default",function(a){E(a),F(a)},!0),ad("keyMap","default",D),ad("extraKeys",null),ad("onKeyEvent",null),ad("onDragEvent",null),ad("lineWrapping",!1,A,!0),ad("gutters",[],function(a){J(a.options),F(a)},!0),ad("fixedGutter",!0,function(a,b){a.display.gutters.style.left=b?P(a.display)+"px":"0",a.refresh()},!0),ad("coverGutterNextToScrollbar",!1,K,!0),ad("lineNumbers",!1,function(a){J(a.options),F(a)},!0),ad("firstLineNumber",1,F,!0),ad("lineNumberFormatter",function(a){return a},F,!0),ad("showCursorWhenSelecting",!1,Z,!0),ad("resetSelectionOnContextMenu",!0),ad("readOnly",!1,function(a,b){"nocursor"==b?(nc(a),a.display.input.blur(),a.display.disabled=!0):(a.display.disabled=!1,b||Mb(a,!0))}),ad("dragDrop",!0),ad("cursorBlinkRate",530),ad("cursorScrollMargin",0),ad("cursorHeight",1),ad("workTime",100),ad("workDelay",100),ad("flattenSpans",!0),ad("pollInterval",100),ad("undoDepth",40,function(a,b){a.doc.history.undoDepth=b}),ad("historyEventDelay",500),ad("viewportMargin",10,function(a){a.refresh()},!0),ad("maxHighlightLength",1e4,function(a){z(a),a.refresh()},!0),ad("crudeMeasuringFrom",1e4),ad("moveInputWithCursor",!0,function(a,b){b||(a.display.inputDiv.style.top=a.display.inputDiv.style.left=0)}),ad("tabindex",null,function(a,b){a.display.input.tabIndex=b||""}),ad("autofocus",null);var cd=x.modes={},dd=x.mimeModes={};x.defineMode=function(a,b){if(x.defaults.mode||"null"==a||(x.defaults.mode=a),arguments.length>2){b.dependencies=[];for(var c=2;c<arguments.length;++c)b.dependencies.push(arguments[c])}cd[a]=b},x.defineMIME=function(a,b){dd[a]=b},x.resolveMode=function(a){if("string"==typeof a&&dd.hasOwnProperty(a))a=dd[a];else if(a&&"string"==typeof a.name&&dd.hasOwnProperty(a.name)){var b=dd[a.name];a=cf(b,a),a.name=b.name}else if("string"==typeof a&&/^[\w\-]+\/[\w\-]+\+xml$/.test(a))return x.resolveMode("application/xml");return"string"==typeof a?{name:a}:a||{name:"null"}},x.getMode=function(a,b){var b=x.resolveMode(b),c=cd[b.name];if(!c)return x.getMode(a,"text/plain");var d=c(a,b);if(ed.hasOwnProperty(b.name)){var e=ed[b.name];for(var f in e)e.hasOwnProperty(f)&&(d.hasOwnProperty(f)&&(d["_"+f]=d[f]),d[f]=e[f])}return d.name=b.name,d},x.defineMode("null",function(){return{token:function(a){a.skipToEnd()}}}),x.defineMIME("text/plain","null");var ed=x.modeExtensions={};x.extendMode=function(a,b){var c=ed.hasOwnProperty(a)?ed[a]:ed[a]={};df(b,c)},x.defineExtension=function(a,b){x.prototype[a]=b},x.defineDocExtension=function(a,b){ge.prototype[a]=b},x.defineOption=ad;var fd=[];x.defineInitHook=function(a){fd.push(a)};var gd=x.helpers={};x.registerHelper=function(a,b,c){gd.hasOwnProperty(a)||(gd[a]=x[a]={}),gd[a][b]=c},x.isWordChar=hf,x.copyState=hd,x.startState=id,x.innerMode=function(a,b){for(;a.innerMode;){var c=a.innerMode(b);if(!c||c.mode==a)break;b=c.state,a=c.mode}return c||{mode:a,state:b}};var jd=x.commands={selectAll:function(a){a.setSelection(Bc(a.firstLine(),0),Bc(a.lastLine()))},killLine:function(a){var b=a.getCursor(!0),c=a.getCursor(!1),d=!Cc(b,c);d||a.getLine(b.line).length!=b.ch?a.replaceRange("",b,d?c:Bc(b.line),"+delete"):a.replaceRange("",b,Bc(b.line+1,0),"+delete")},deleteLine:function(a){var b=a.getCursor().line;a.replaceRange("",Bc(b,0),Bc(b),"+delete")},delLineLeft:function(a){var b=a.getCursor();a.replaceRange("",Bc(b.line,0),b,"+delete")},undo:function(a){a.undo()},redo:function(a){a.redo()},goDocStart:function(a){a.extendSelection(Bc(a.firstLine(),0))},goDocEnd:function(a){a.extendSelection(Bc(a.lastLine()))},goLineStart:function(a){a.extendSelection(Ff(a,a.getCursor().line))},goLineStartSmart:function(a){var b=a.getCursor(),c=Ff(a,b.line),d=a.getLineHandle(c.line),e=se(d);if(e&&0!=e[0].level)a.extendSelection(c);else{var f=Math.max(0,d.text.search(/\S/)),g=b.line==c.line&&b.ch<=f&&b.ch;a.extendSelection(Bc(c.line,g?0:f))}},goLineEnd:function(a){a.extendSelection(Gf(a,a.getCursor().line))},goLineRight:function(a){var b=a.charCoords(a.getCursor(),"div").top+5;a.extendSelection(a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:b},"div"))},goLineLeft:function(a){var b=a.charCoords(a.getCursor(),"div").top+5;a.extendSelection(a.coordsChar({left:0,top:b},"div"))},goLineUp:function(a){a.moveV(-1,"line")},goLineDown:function(a){a.moveV(1,"line")},goPageUp:function(a){a.moveV(-1,"page")},goPageDown:function(a){a.moveV(1,"page")},goCharLeft:function(a){a.moveH(-1,"char")},goCharRight:function(a){a.moveH(1,"char")},goColumnLeft:function(a){a.moveH(-1,"column")},goColumnRight:function(a){a.moveH(1,"column")},goWordLeft:function(a){a.moveH(-1,"word")},goGroupRight:function(a){a.moveH(1,"group")},goGroupLeft:function(a){a.moveH(-1,"group")},goWordRight:function(a){a.moveH(1,"word")},delCharBefore:function(a){a.deleteH(-1,"char")},delCharAfter:function(a){a.deleteH(1,"char")},delWordBefore:function(a){a.deleteH(-1,"word")},delWordAfter:function(a){a.deleteH(1,"word")},delGroupBefore:function(a){a.deleteH(-1,"group")},delGroupAfter:function(a){a.deleteH(1,"group")},indentAuto:function(a){a.indentSelection("smart")},indentMore:function(a){a.indentSelection("add")},indentLess:function(a){a.indentSelection("subtract")},insertTab:function(a){a.replaceSelection("	","end","+input")},defaultTab:function(a){a.somethingSelected()?a.indentSelection("add"):a.replaceSelection("	","end","+input")},transposeChars:function(a){var b=a.getCursor(),c=a.getLine(b.line);b.ch>0&&b.ch<c.length-1&&a.replaceRange(c.charAt(b.ch)+c.charAt(b.ch-1),Bc(b.line,b.ch-1),Bc(b.line,b.ch+1))},newlineAndIndent:function(a){Fb(a,function(){a.replaceSelection("\n","end","+input"),a.indentLine(a.getCursor().line,null,!0)})()},toggleOverwrite:function(a){a.toggleOverwrite()}},kd=x.keyMap={};kd.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite"},kd.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Alt-Up":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Down":"goDocEnd","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore",fallthrough:"basic"},kd.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineStart","Cmd-Right":"goLineEnd","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delLineLeft",fallthrough:["basic","emacsy"]},kd["default"]=q?kd.macDefault:kd.pcDefault,kd.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars"},x.lookupKey=md,x.isModifierKey=nd,x.keyName=od,x.fromTextArea=function(a,b){function e(){a.value=i.getValue()}if(b||(b={}),b.value=a.value,!b.tabindex&&a.tabindex&&(b.tabindex=a.tabindex),!b.placeholder&&a.placeholder&&(b.placeholder=a.placeholder),null==b.autofocus){var c=document.body;try{c=document.activeElement}catch(d){}b.autofocus=c==a||null!=a.getAttribute("autofocus")&&c==document.body}if(a.form&&(Le(a.form,"submit",e),!b.leaveSubmitMethodAlone)){var f=a.form,g=f.submit;try{var h=f.submit=function(){e(),f.submit=g,f.submit(),f.submit=h}}catch(d){}}a.style.display="none";var i=x(function(b){a.parentNode.insertBefore(b,a.nextSibling)},b);return i.save=e,i.getTextArea=function(){return a},i.toTextArea=function(){e(),a.parentNode.removeChild(i.getWrapperElement()),a.style.display="",a.form&&(Me(a.form,"submit",e),"function"==typeof a.form.submit&&(a.form.submit=g))},i},pd.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return 0==this.pos},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){return this.pos<this.string.length?this.string.charAt(this.pos++):void 0},eat:function(a){var b=this.string.charAt(this.pos);if("string"==typeof a)var c=b==a;else var c=b&&(a.test?a.test(b):a(b));return c?(++this.pos,b):void 0},eatWhile:function(a){for(var b=this.pos;this.eat(a););return this.pos>b},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);return b>-1?(this.pos=b,!0):void 0},backUp:function(a){this.pos-=a},column:function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=Ye(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue},indentation:function(){return Ye(this.string,null,this.tabSize)},match:function(a,b,c){if("string"!=typeof a){var f=this.string.slice(this.pos).match(a);return f&&f.index>0?null:(f&&b!==!1&&(this.pos+=f[0].length),f)}var d=function(a){return c?a.toLowerCase():a},e=this.string.substr(this.pos,a.length);return d(e)==d(a)?(b!==!1&&(this.pos+=a.length),!0):void 0},current:function(){return this.string.slice(this.start,this.pos)}},x.StringStream=pd,x.TextMarker=qd,Ue(qd),qd.prototype.clear=function(){if(!this.explicitlyCleared){var a=this.doc.cm,b=a&&!a.curOp;if(b&&Db(a),Te(this,"clear")){var c=this.find();c&&Qe(this,"clear",c.from,c.to)}for(var d=null,e=null,f=0;f<this.lines.length;++f){var g=this.lines[f],h=ud(g.markedSpans,this);null!=h.to&&(e=pe(g)),g.markedSpans=vd(g.markedSpans,h),null!=h.from?d=pe(g):this.collapsed&&!Gd(this.doc,g)&&a&&oe(g,Ab(a.display))}if(a&&this.collapsed&&!a.options.lineWrapping)for(var f=0;f<this.lines.length;++f){var i=Fd(a.doc,this.lines[f]),j=H(a.doc,i);j>a.display.maxLineLength&&(a.display.maxLine=i,a.display.maxLineLength=j,a.display.maxLineChanged=!0)}null!=d&&a&&Ib(a,d,e+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,a&&Mc(a)),b&&Eb(a)}},qd.prototype.find=function(){for(var a,b,c=0;c<this.lines.length;++c){var d=this.lines[c],e=ud(d.markedSpans,this);if(null!=e.from||null!=e.to){var f=pe(d);null!=e.from&&(a=Bc(f,e.from)),null!=e.to&&(b=Bc(f,e.to))}}return"bookmark"==this.type?a:a&&{from:a,to:b}},qd.prototype.changed=function(){var a=this.find(),b=this.doc.cm;if(a&&b){"bookmark"!=this.type&&(a=a.from);var c=le(this.doc,a.line);if(kb(b,c),a.line>=b.display.showingFrom&&a.line<b.display.showingTo){for(var d=b.display.lineDiv.firstChild;d;d=d.nextSibling)if(d.lineObj==c){d.offsetHeight!=c.height&&oe(c,d.offsetHeight);
-	break}Hb(b,function(){b.curOp.selectionChanged=b.curOp.forceUpdate=b.curOp.updateMaxLine=!0})}}},qd.prototype.attachLine=function(a){if(!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;b.maybeHiddenMarkers&&-1!=bf(b.maybeHiddenMarkers,this)||(b.maybeUnhiddenMarkers||(b.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(a)},qd.prototype.detachLine=function(a){if(this.lines.splice(bf(this.lines,a),1),!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;(b.maybeHiddenMarkers||(b.maybeHiddenMarkers=[])).push(this)}},x.SharedTextMarker=sd,Ue(sd),sd.prototype.clear=function(){if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var a=0;a<this.markers.length;++a)this.markers[a].clear();Qe(this,"clear")}},sd.prototype.find=function(){return this.primary.find()};var Kd=x.LineWidget=function(a,b,c){if(c)for(var d in c)c.hasOwnProperty(d)&&(this[d]=c[d]);this.cm=a,this.node=b};Ue(Kd),Kd.prototype.clear=Ld(function(){var a=this.line.widgets,b=pe(this.line);if(null!=b&&a){for(var c=0;c<a.length;++c)a[c]==this&&a.splice(c--,1);a.length||(this.line.widgets=null);var d=re(this.cm,this.line)<this.cm.doc.scrollTop;oe(this.line,Math.max(0,this.line.height-Md(this))),d&&Tc(this.cm,0,-this.height),Ib(this.cm,b,b+1)}}),Kd.prototype.changed=Ld(function(){var a=this.height;this.height=null;var b=Md(this)-a;if(b){oe(this.line,this.line.height+b);var c=pe(this.line);Ib(this.cm,c,c+1)}});var Od=x.Line=function(a,b,c){this.text=a,Jd(this,b),this.height=c?c(this):1};Ue(Od),Od.prototype.lineNo=function(){return pe(this)};var Vd={};de.prototype={chunkSize:function(){return this.lines.length},removeInner:function(a,b){for(var c=a,d=a+b;d>c;++c){var e=this.lines[c];this.height-=e.height,Qd(e),Qe(e,"delete")}this.lines.splice(a,b)},collapse:function(a){a.splice.apply(a,[a.length,0].concat(this.lines))},insertInner:function(a,b,c){this.height+=c,this.lines=this.lines.slice(0,a).concat(b).concat(this.lines.slice(a));for(var d=0,e=b.length;e>d;++d)b[d].parent=this},iterN:function(a,b,c){for(var d=a+b;d>a;++a)if(c(this.lines[a]))return!0}},ee.prototype={chunkSize:function(){return this.size},removeInner:function(a,b){this.size-=b;for(var c=0;c<this.children.length;++c){var d=this.children[c],e=d.chunkSize();if(e>a){var f=Math.min(b,e-a),g=d.height;if(d.removeInner(a,f),this.height-=g-d.height,e==f&&(this.children.splice(c--,1),d.parent=null),0==(b-=f))break;a=0}else a-=e}if(this.size-b<25){var h=[];this.collapse(h),this.children=[new de(h)],this.children[0].parent=this}},collapse:function(a){for(var b=0,c=this.children.length;c>b;++b)this.children[b].collapse(a)},insertInner:function(a,b,c){this.size+=b.length,this.height+=c;for(var d=0,e=this.children.length;e>d;++d){var f=this.children[d],g=f.chunkSize();if(g>=a){if(f.insertInner(a,b,c),f.lines&&f.lines.length>50){for(;f.lines.length>50;){var h=f.lines.splice(f.lines.length-25,25),i=new de(h);f.height-=i.height,this.children.splice(d+1,0,i),i.parent=this}this.maybeSpill()}break}a-=g}},maybeSpill:function(){if(!(this.children.length<=10)){var a=this;do{var b=a.children.splice(a.children.length-5,5),c=new ee(b);if(a.parent){a.size-=c.size,a.height-=c.height;var e=bf(a.parent.children,a);a.parent.children.splice(e+1,0,c)}else{var d=new ee(a.children);d.parent=a,a.children=[d,c],a=d}c.parent=a.parent}while(a.children.length>10);a.parent.maybeSpill()}},iterN:function(a,b,c){for(var d=0,e=this.children.length;e>d;++d){var f=this.children[d],g=f.chunkSize();if(g>a){var h=Math.min(b,g-a);if(f.iterN(a,h,c))return!0;if(0==(b-=h))break;a=0}else a-=g}}};var fe=0,ge=x.Doc=function(a,b,c){if(!(this instanceof ge))return new ge(a,b,c);null==c&&(c=0),ee.call(this,[new de([new Od("",null)])]),this.first=c,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.history=te(),this.cleanGeneration=1,this.frontier=c;var d=Bc(c,0);this.sel={from:d,to:d,head:d,anchor:d,shift:!1,extend:!1,goalColumn:null},this.id=++fe,this.modeOption=b,"string"==typeof a&&(a=wf(a)),ce(this,{from:d,to:d,text:a},null,{head:d,anchor:d})};ge.prototype=cf(ee.prototype,{constructor:ge,iter:function(a,b,c){c?this.iterN(a-this.first,b-a,c):this.iterN(this.first,this.first+this.size,a)},insert:function(a,b){for(var c=0,d=0,e=b.length;e>d;++d)c+=b[d].height;this.insertInner(a-this.first,b,c)},remove:function(a,b){this.removeInner(a-this.first,b)},getValue:function(a){var b=ne(this,this.first,this.first+this.size);return a===!1?b:b.join(a||"\n")},setValue:function(a){var b=Bc(this.first,0),c=this.first+this.size-1;uc(this,{from:b,to:Bc(c,le(this,c).text.length),text:wf(a),origin:"setValue"},{head:b,anchor:b},!0)},replaceRange:function(a,b,c,d){b=Gc(this,b),c=c?Gc(this,c):b,Ac(this,a,b,c,d)},getRange:function(a,b,c){var d=me(this,Gc(this,a),Gc(this,b));return c===!1?d:d.join(c||"\n")},getLine:function(a){var b=this.getLineHandle(a);return b&&b.text},setLine:function(a,b){Ic(this,a)&&Ac(this,b,Bc(a,0),Gc(this,Bc(a)))},removeLine:function(a){a?Ac(this,"",Gc(this,Bc(a-1)),Gc(this,Bc(a))):Ac(this,"",Bc(0,0),Gc(this,Bc(1,0)))},getLineHandle:function(a){return Ic(this,a)?le(this,a):void 0},getLineNumber:function(a){return pe(a)},getLineHandleVisualStart:function(a){return"number"==typeof a&&(a=le(this,a)),Fd(this,a)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(a){return Gc(this,a)},getCursor:function(a){var c,b=this.sel;return c=null==a||"head"==a?b.head:"anchor"==a?b.anchor:"end"==a||a===!1?b.to:b.from,Ec(c)},somethingSelected:function(){return!Cc(this.sel.head,this.sel.anchor)},setCursor:Gb(function(a,b,c){var d=Gc(this,"number"==typeof a?Bc(a,b||0):a);c?Jc(this,d):Lc(this,d,d)}),setSelection:Gb(function(a,b,c){Lc(this,Gc(this,a),Gc(this,b||a),c)}),extendSelection:Gb(function(a,b,c){Jc(this,Gc(this,a),b&&Gc(this,b),c)}),getSelection:function(a){return this.getRange(this.sel.from,this.sel.to,a)},replaceSelection:function(a,b,c){uc(this,{from:this.sel.from,to:this.sel.to,text:wf(a),origin:c},b||"around")},undo:Gb(function(){wc(this,"undo")}),redo:Gb(function(){wc(this,"redo")}),setExtending:function(a){this.sel.extend=a},historySize:function(){var a=this.history;return{undo:a.done.length,redo:a.undone.length}},clearHistory:function(){this.history=te(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration()},changeGeneration:function(){return this.history.lastOp=this.history.lastOrigin=null,this.history.generation},isClean:function(a){return this.history.generation==(a||this.cleanGeneration)},getHistory:function(){return{done:ze(this.history.done),undone:ze(this.history.undone)}},setHistory:function(a){var b=this.history=te(this.history.maxGeneration);b.done=a.done.slice(0),b.undone=a.undone.slice(0)},markText:function(a,b,c){return rd(this,Gc(this,a),Gc(this,b),c,"range")},setBookmark:function(a,b){var c={replacedWith:b&&(null==b.nodeType?b.widget:b),insertLeft:b&&b.insertLeft};return a=Gc(this,a),rd(this,a,a,c,"bookmark")},findMarksAt:function(a){a=Gc(this,a);var b=[],c=le(this,a.line).markedSpans;if(c)for(var d=0;d<c.length;++d){var e=c[d];(null==e.from||e.from<=a.ch)&&(null==e.to||e.to>=a.ch)&&b.push(e.marker.parent||e.marker)}return b},getAllMarks:function(){var a=[];return this.iter(function(b){var c=b.markedSpans;if(c)for(var d=0;d<c.length;++d)null!=c[d].from&&a.push(c[d].marker)}),a},posFromIndex:function(a){var b,c=this.first;return this.iter(function(d){var e=d.text.length+1;return e>a?(b=a,!0):(a-=e,++c,void 0)}),Gc(this,Bc(c,b))},indexFromPos:function(a){a=Gc(this,a);var b=a.ch;return a.line<this.first||a.ch<0?0:(this.iter(this.first,a.line,function(a){b+=a.text.length+1}),b)},copy:function(a){var b=new ge(ne(this,this.first,this.first+this.size),this.modeOption,this.first);return b.scrollTop=this.scrollTop,b.scrollLeft=this.scrollLeft,b.sel={from:this.sel.from,to:this.sel.to,head:this.sel.head,anchor:this.sel.anchor,shift:this.sel.shift,extend:!1,goalColumn:this.sel.goalColumn},a&&(b.history.undoDepth=this.history.undoDepth,b.setHistory(this.getHistory())),b},linkedDoc:function(a){a||(a={});var b=this.first,c=this.first+this.size;null!=a.from&&a.from>b&&(b=a.from),null!=a.to&&a.to<c&&(c=a.to);var d=new ge(ne(this,b,c),a.mode||this.modeOption,b);return a.sharedHist&&(d.history=this.history),(this.linked||(this.linked=[])).push({doc:d,sharedHist:a.sharedHist}),d.linked=[{doc:this,isParent:!0,sharedHist:a.sharedHist}],d},unlinkDoc:function(a){if(a instanceof x&&(a=a.doc),this.linked)for(var b=0;b<this.linked.length;++b){var c=this.linked[b];if(c.doc==a){this.linked.splice(b,1),a.unlinkDoc(this);break}}if(a.history==this.history){var d=[a.id];je(a,function(a){d.push(a.id)},!0),a.history=te(),a.history.done=ze(this.history.done,d),a.history.undone=ze(this.history.undone,d)}},iterLinkedDocs:function(a){je(this,a)},getMode:function(){return this.mode},getEditor:function(){return this.cm}}),ge.prototype.eachLine=ge.prototype.iter;var he="iter insert remove copy getEditor".split(" ");for(var ie in ge.prototype)ge.prototype.hasOwnProperty(ie)&&bf(he,ie)<0&&(x.prototype[ie]=function(a){return function(){return a.apply(this.doc,arguments)}}(ge.prototype[ie]));Ue(ge),x.e_stop=Ie,x.e_preventDefault=Fe,x.e_stopPropagation=Ge;var Oe,Pe=0;x.on=Le,x.off=Me,x.signal=Ne;var Ve=30,We=x.Pass={toString:function(){return"CodeMirror.Pass"}};Xe.prototype={set:function(a,b){clearTimeout(this.id),this.id=setTimeout(b,a)}},x.countColumn=Ye;var Ze=[""],gf=/[\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/,kf=/[\u0300-\u036F\u0483-\u0487\u0488-\u0489\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\uA66F\u1DC0\u2013\u1DFF\u20D0\u2013\u20FF\uA670-\uA672\uA674-\uA67D\uA69F\udc00-\udfff\uFE20\u2013\uFE2F]/;x.replaceGetRect=function(a){pf=a};var qf=function(){if(d)return!1;var a=lf("div");return"draggable"in a||"dragDrop"in a}();a?rf=function(a,b){return 36==a.charCodeAt(b-1)&&39==a.charCodeAt(b)}:j&&!/Version\/([6-9]|\d\d)\b/.test(navigator.userAgent)?rf=function(a,b){return/\-[^ \-?]|\?[^ !\'\"\),.\-\/:;\?\]\}]/.test(a.slice(b-1,b+1))}:f&&/Chrome\/(?:29|[3-9]\d|\d\d\d)\./.test(navigator.userAgent)?rf=function(a,b){var c=a.charCodeAt(b-1);return c>=8208&&8212>=c}:f&&(rf=function(a,b){if(b>1&&45==a.charCodeAt(b-1)){if(/\w/.test(a.charAt(b-2))&&/[^\-?\.]/.test(a.charAt(b)))return!0;if(b>2&&/[\d\.,]/.test(a.charAt(b-2))&&/[\d\.,]/.test(a.charAt(b)))return!1}return/[~!#%&*)=+}\]\\|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|\u2026[\w~`@#$%\^&*(_=+{[><]/.test(a.slice(b-1,b+1))});var sf,uf,wf=3!="\n\nb".split(/\n/).length?function(a){for(var b=0,c=[],d=a.length;d>=b;){var e=a.indexOf("\n",b);-1==e&&(e=a.length);var f=a.slice(b,"\r"==a.charAt(e-1)?e-1:e),g=f.indexOf("\r");-1!=g?(c.push(f.slice(0,g)),b+=g+1):(c.push(f),b=e+1)}return c}:function(a){return a.split(/\r\n?|\n/)};x.splitLines=wf;var xf=window.getSelection?function(a){try{return a.selectionStart!=a.selectionEnd}catch(b){return!1}}:function(a){try{var b=a.ownerDocument.selection.createRange()}catch(c){}return b&&b.parentElement()==a?0!=b.compareEndPoints("StartToEnd",b):!1},yf=function(){var a=lf("div");return"oncopy"in a?!0:(a.setAttribute("oncopy","return;"),"function"==typeof a.oncopy)}(),zf={3:"Enter",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",91:"Mod",92:"Mod",93:"Mod",109:"-",107:"=",127:"Delete",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63276:"PageUp",63277:"PageDown",63275:"End",63273:"Home",63234:"Left",63232:"Up",63235:"Right",63233:"Down",63302:"Insert",63272:"Delete"};x.keyNames=zf,function(){for(var a=0;10>a;a++)zf[a+48]=String(a);for(var a=65;90>=a;a++)zf[a]=String.fromCharCode(a);for(var a=1;12>=a;a++)zf[a+111]=zf[a+63235]="F"+a}();var If,Nf=function(){function c(c){return 255>=c?a.charAt(c):c>=1424&&1524>=c?"R":c>=1536&&1791>=c?b.charAt(c-1536):c>=1792&&2220>=c?"r":"L"}var a="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLL",b="rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmmrrrrrrrrrrrrrrrrrr",d=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,e=/[stwN]/,f=/[LRr]/,g=/[Lb1n]/,h=/[1n]/,i="L";return function(a){if(!d.test(a))return!1;for(var l,b=a.length,j=[],k=0;b>k;++k)j.push(l=c(a.charCodeAt(k)));for(var k=0,m=i;b>k;++k){var l=j[k];"m"==l?j[k]=m:m=l}for(var k=0,n=i;b>k;++k){var l=j[k];"1"==l&&"r"==n?j[k]="n":f.test(l)&&(n=l,"r"==l&&(j[k]="R"))}for(var k=1,m=j[0];b-1>k;++k){var l=j[k];"+"==l&&"1"==m&&"1"==j[k+1]?j[k]="1":","!=l||m!=j[k+1]||"1"!=m&&"n"!=m||(j[k]=m),m=l}for(var k=0;b>k;++k){var l=j[k];if(","==l)j[k]="N";else if("%"==l){for(var o=k+1;b>o&&"%"==j[o];++o);for(var p=k&&"!"==j[k-1]||b-1>o&&"1"==j[o]?"1":"N",q=k;o>q;++q)j[q]=p;k=o-1}}for(var k=0,n=i;b>k;++k){var l=j[k];"L"==n&&"1"==l?j[k]="L":f.test(l)&&(n=l)}for(var k=0;b>k;++k)if(e.test(j[k])){for(var o=k+1;b>o&&e.test(j[o]);++o);for(var r="L"==(k?j[k-1]:i),s="L"==(b-1>o?j[o]:i),p=r||s?"L":"R",q=k;o>q;++q)j[q]=p;k=o-1}for(var u,t=[],k=0;b>k;)if(g.test(j[k])){var v=k;for(++k;b>k&&g.test(j[k]);++k);t.push({from:v,to:k,level:0})}else{var w=k,x=t.length;for(++k;b>k&&"L"!=j[k];++k);for(var q=w;k>q;)if(h.test(j[q])){q>w&&t.splice(x,0,{from:w,to:q,level:1});var y=q;for(++q;k>q&&h.test(j[q]);++q);t.splice(x,0,{from:y,to:q,level:2}),w=q}else++q;k>w&&t.splice(x,0,{from:w,to:k,level:1})}return 1==t[0].level&&(u=a.match(/^\s+/))&&(t[0].from=u[0].length,t.unshift({from:0,to:u[0].length,level:0})),1==_e(t).level&&(u=a.match(/\s+$/))&&(_e(t).to-=u[0].length,t.push({from:b-u[0].length,to:b,level:0})),t[0].level!=_e(t).level&&t.push({from:b,to:b,level:t[0].level}),t}}();return x.version="3.20.0",x}();
\ No newline at end of file
diff --git a/resources/libs/codemirror/mode/apl/apl.js b/resources/libs/codemirror/mode/apl/apl.js
deleted file mode 100644
index 5c23af85d..000000000
--- a/resources/libs/codemirror/mode/apl/apl.js
+++ /dev/null
@@ -1,160 +0,0 @@
-CodeMirror.defineMode("apl", function() {
-  var builtInOps = {
-    ".": "innerProduct",
-    "\\": "scan",
-    "/": "reduce",
-    "⌿": "reduce1Axis",
-    "⍀": "scan1Axis",
-    "¨": "each",
-    "⍣": "power"
-  };
-  var builtInFuncs = {
-    "+": ["conjugate", "add"],
-    "−": ["negate", "subtract"],
-    "×": ["signOf", "multiply"],
-    "÷": ["reciprocal", "divide"],
-    "⌈": ["ceiling", "greaterOf"],
-    "⌊": ["floor", "lesserOf"],
-    "∣": ["absolute", "residue"],
-    "⍳": ["indexGenerate", "indexOf"],
-    "?": ["roll", "deal"],
-    "⋆": ["exponentiate", "toThePowerOf"],
-    "⍟": ["naturalLog", "logToTheBase"],
-    "○": ["piTimes", "circularFuncs"],
-    "!": ["factorial", "binomial"],
-    "⌹": ["matrixInverse", "matrixDivide"],
-    "<": [null, "lessThan"],
-    "≤": [null, "lessThanOrEqual"],
-    "=": [null, "equals"],
-    ">": [null, "greaterThan"],
-    "≥": [null, "greaterThanOrEqual"],
-    "≠": [null, "notEqual"],
-    "≡": ["depth", "match"],
-    "≢": [null, "notMatch"],
-    "∈": ["enlist", "membership"],
-    "⍷": [null, "find"],
-    "∪": ["unique", "union"],
-    "∩": [null, "intersection"],
-    "∼": ["not", "without"],
-    "∨": [null, "or"],
-    "∧": [null, "and"],
-    "⍱": [null, "nor"],
-    "⍲": [null, "nand"],
-    "⍴": ["shapeOf", "reshape"],
-    ",": ["ravel", "catenate"],
-    "⍪": [null, "firstAxisCatenate"],
-    "⌽": ["reverse", "rotate"],
-    "⊖": ["axis1Reverse", "axis1Rotate"],
-    "⍉": ["transpose", null],
-    "↑": ["first", "take"],
-    "↓": [null, "drop"],
-    "⊂": ["enclose", "partitionWithAxis"],
-    "⊃": ["diclose", "pick"],
-    "⌷": [null, "index"],
-    "⍋": ["gradeUp", null],
-    "⍒": ["gradeDown", null],
-    "⊤": ["encode", null],
-    "⊥": ["decode", null],
-    "⍕": ["format", "formatByExample"],
-    "⍎": ["execute", null],
-    "⊣": ["stop", "left"],
-    "⊢": ["pass", "right"]
-  };
-
-  var isOperator = /[\.\/⌿⍀¨⍣]/;
-  var isNiladic = /⍬/;
-  var isFunction = /[\+−×÷⌈⌊∣⍳\?⋆⍟○!⌹<≤=>≥≠≡≢∈⍷∪∩∼∨∧⍱⍲⍴,⍪⌽⊖⍉↑↓⊂⊃⌷⍋⍒⊤⊥⍕⍎⊣⊢]/;
-  var isArrow = /←/;
-  var isComment = /[⍝#].*$/;
-
-  var stringEater = function(type) {
-    var prev;
-    prev = false;
-    return function(c) {
-      prev = c;
-      if (c === type) {
-        return prev === "\\";
-      }
-      return true;
-    };
-  };
-  return {
-    startState: function() {
-      return {
-        prev: false,
-        func: false,
-        op: false,
-        string: false,
-        escape: false
-      };
-    },
-    token: function(stream, state) {
-      var ch, funcName, word;
-      if (stream.eatSpace()) {
-        return null;
-      }
-      ch = stream.next();
-      if (ch === '"' || ch === "'") {
-        stream.eatWhile(stringEater(ch));
-        stream.next();
-        state.prev = true;
-        return "string";
-      }
-      if (/[\[{\(]/.test(ch)) {
-        state.prev = false;
-        return null;
-      }
-      if (/[\]}\)]/.test(ch)) {
-        state.prev = true;
-        return null;
-      }
-      if (isNiladic.test(ch)) {
-        state.prev = false;
-        return "niladic";
-      }
-      if (/[¯\d]/.test(ch)) {
-        if (state.func) {
-          state.func = false;
-          state.prev = false;
-        } else {
-          state.prev = true;
-        }
-        stream.eatWhile(/[\w\.]/);
-        return "number";
-      }
-      if (isOperator.test(ch)) {
-        return "operator apl-" + builtInOps[ch];
-      }
-      if (isArrow.test(ch)) {
-        return "apl-arrow";
-      }
-      if (isFunction.test(ch)) {
-        funcName = "apl-";
-        if (builtInFuncs[ch] != null) {
-          if (state.prev) {
-            funcName += builtInFuncs[ch][1];
-          } else {
-            funcName += builtInFuncs[ch][0];
-          }
-        }
-        state.func = true;
-        state.prev = false;
-        return "function " + funcName;
-      }
-      if (isComment.test(ch)) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      if (ch === "∘" && stream.peek() === ".") {
-        stream.next();
-        return "function jot-dot";
-      }
-      stream.eatWhile(/[\w\$_]/);
-      word = stream.current();
-      state.prev = true;
-      return "keyword";
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/apl", "apl");
diff --git a/resources/libs/codemirror/mode/apl/index.html b/resources/libs/codemirror/mode/apl/index.html
deleted file mode 100644
index f8282ac42..000000000
--- a/resources/libs/codemirror/mode/apl/index.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: APL mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="./apl.js"></script>
-<style>
-	.CodeMirror { border: 2px inset #dee; }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">APL</a>
-  </ul>
-</div>
-
-<article>
-<h2>APL mode</h2>
-<form><textarea id="code" name="code">
-⍝ Conway's game of life
-
-⍝ This example was inspired by the impressive demo at
-⍝ http://www.youtube.com/watch?v=a9xAKttWgP4
-
-⍝ Create a matrix:
-⍝     0 1 1
-⍝     1 1 0
-⍝     0 1 0
-creature ← (3 3 ⍴ ⍳ 9) ∈ 1 2 3 4 7   ⍝ Original creature from demo
-creature ← (3 3 ⍴ ⍳ 9) ∈ 1 3 6 7 8   ⍝ Glider
-
-⍝ Place the creature on a larger board, near the centre
-board ← ¯1 ⊖ ¯2 ⌽ 5 7 ↑ creature
-
-⍝ A function to move from one generation to the next
-life ← {∨/ 1 ⍵ ∧ 3 4 = ⊂+/ +⌿ 1 0 ¯1 ∘.⊖ 1 0 ¯1 ⌽¨ ⊂⍵}
-
-⍝ Compute n-th generation and format it as a
-⍝ character matrix
-gen ← {' #'[(life ⍣ ⍵) board]}
-
-⍝ Show first three generations
-(gen 1) (gen 2) (gen 3)
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/apl"
-      });
-    </script>
-
-    <p>Simple mode that tries to handle APL as well as it can.</p>
-    <p>It attempts to label functions/operators based upon
-    monadic/dyadic usage (but this is far from fully fleshed out).
-    This means there are meaningful classnames so hover states can
-    have popups etc.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/apl</code> (APL code)</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/asterisk/asterisk.js b/resources/libs/codemirror/mode/asterisk/asterisk.js
deleted file mode 100644
index 60b689d1d..000000000
--- a/resources/libs/codemirror/mode/asterisk/asterisk.js
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * =====================================================================================
- *
- *       Filename:  mode/asterisk/asterisk.js
- *
- *    Description:  CodeMirror mode for Asterisk dialplan
- *
- *        Created:  05/17/2012 09:20:25 PM
- *       Revision:  none
- *
- *         Author:  Stas Kobzar (stas@modulis.ca),
- *        Company:  Modulis.ca Inc.
- *
- * =====================================================================================
- */
-
-CodeMirror.defineMode("asterisk", function() {
-  var atoms    = ["exten", "same", "include","ignorepat","switch"],
-      dpcmd    = ["#include","#exec"],
-      apps     = [
-                  "addqueuemember","adsiprog","aelsub","agentlogin","agentmonitoroutgoing","agi",
-                  "alarmreceiver","amd","answer","authenticate","background","backgrounddetect",
-                  "bridge","busy","callcompletioncancel","callcompletionrequest","celgenuserevent",
-                  "changemonitor","chanisavail","channelredirect","chanspy","clearhash","confbridge",
-                  "congestion","continuewhile","controlplayback","dahdiacceptr2call","dahdibarge",
-                  "dahdiras","dahdiscan","dahdisendcallreroutingfacility","dahdisendkeypadfacility",
-                  "datetime","dbdel","dbdeltree","deadagi","dial","dictate","directory","disa",
-                  "dumpchan","eagi","echo","endwhile","exec","execif","execiftime","exitwhile","extenspy",
-                  "externalivr","festival","flash","followme","forkcdr","getcpeid","gosub","gosubif",
-                  "goto","gotoif","gotoiftime","hangup","iax2provision","ices","importvar","incomplete",
-                  "ivrdemo","jabberjoin","jabberleave","jabbersend","jabbersendgroup","jabberstatus",
-                  "jack","log","macro","macroexclusive","macroexit","macroif","mailboxexists","meetme",
-                  "meetmeadmin","meetmechanneladmin","meetmecount","milliwatt","minivmaccmess","minivmdelete",
-                  "minivmgreet","minivmmwi","minivmnotify","minivmrecord","mixmonitor","monitor","morsecode",
-                  "mp3player","mset","musiconhold","nbscat","nocdr","noop","odbc","odbc","odbcfinish",
-                  "originate","ospauth","ospfinish","osplookup","ospnext","page","park","parkandannounce",
-                  "parkedcall","pausemonitor","pausequeuemember","pickup","pickupchan","playback","playtones",
-                  "privacymanager","proceeding","progress","queue","queuelog","raiseexception","read","readexten",
-                  "readfile","receivefax","receivefax","receivefax","record","removequeuemember",
-                  "resetcdr","retrydial","return","ringing","sayalpha","saycountedadj","saycountednoun",
-                  "saycountpl","saydigits","saynumber","sayphonetic","sayunixtime","senddtmf","sendfax",
-                  "sendfax","sendfax","sendimage","sendtext","sendurl","set","setamaflags",
-                  "setcallerpres","setmusiconhold","sipaddheader","sipdtmfmode","sipremoveheader","skel",
-                  "slastation","slatrunk","sms","softhangup","speechactivategrammar","speechbackground",
-                  "speechcreate","speechdeactivategrammar","speechdestroy","speechloadgrammar","speechprocessingsound",
-                  "speechstart","speechunloadgrammar","stackpop","startmusiconhold","stopmixmonitor","stopmonitor",
-                  "stopmusiconhold","stopplaytones","system","testclient","testserver","transfer","tryexec",
-                  "trysystem","unpausemonitor","unpausequeuemember","userevent","verbose","vmauthenticate",
-                  "vmsayname","voicemail","voicemailmain","wait","waitexten","waitfornoise","waitforring",
-                  "waitforsilence","waitmusiconhold","waituntil","while","zapateller"
-                 ];
-
-  function basicToken(stream,state){
-    var cur = '';
-    var ch  = '';
-    ch = stream.next();
-    // comment
-    if(ch == ";") {
-      stream.skipToEnd();
-      return "comment";
-    }
-    // context
-    if(ch == '[') {
-      stream.skipTo(']');
-      stream.eat(']');
-      return "header";
-    }
-    // string
-    if(ch == '"') {
-      stream.skipTo('"');
-      return "string";
-    }
-    if(ch == "'") {
-      stream.skipTo("'");
-      return "string-2";
-    }
-    // dialplan commands
-    if(ch == '#') {
-      stream.eatWhile(/\w/);
-      cur = stream.current();
-      if(dpcmd.indexOf(cur) !== -1) {
-        stream.skipToEnd();
-        return "strong";
-      }
-    }
-    // application args
-    if(ch == '$'){
-      var ch1 = stream.peek();
-      if(ch1 == '{'){
-        stream.skipTo('}');
-        stream.eat('}');
-        return "variable-3";
-      }
-    }
-    // extension
-    stream.eatWhile(/\w/);
-    cur = stream.current();
-    if(atoms.indexOf(cur) !== -1) {
-      state.extenStart = true;
-      switch(cur) {
-        case 'same': state.extenSame = true; break;
-        case 'include':
-        case 'switch':
-        case 'ignorepat':
-          state.extenInclude = true;break;
-        default:break;
-      }
-      return "atom";
-    }
-  }
-
-  return {
-    startState: function() {
-      return {
-        extenStart: false,
-        extenSame:  false,
-        extenInclude: false,
-        extenExten: false,
-        extenPriority: false,
-        extenApplication: false
-      };
-    },
-    token: function(stream, state) {
-
-      var cur = '';
-      var ch  = '';
-      if(stream.eatSpace()) return null;
-      // extension started
-      if(state.extenStart){
-        stream.eatWhile(/[^\s]/);
-        cur = stream.current();
-        if(/^=>?$/.test(cur)){
-          state.extenExten = true;
-          state.extenStart = false;
-          return "strong";
-        } else {
-          state.extenStart = false;
-          stream.skipToEnd();
-          return "error";
-        }
-      } else if(state.extenExten) {
-        // set exten and priority
-        state.extenExten = false;
-        state.extenPriority = true;
-        stream.eatWhile(/[^,]/);
-        if(state.extenInclude) {
-          stream.skipToEnd();
-          state.extenPriority = false;
-          state.extenInclude = false;
-        }
-        if(state.extenSame) {
-          state.extenPriority = false;
-          state.extenSame = false;
-          state.extenApplication = true;
-        }
-        return "tag";
-      } else if(state.extenPriority) {
-        state.extenPriority = false;
-        state.extenApplication = true;
-        ch = stream.next(); // get comma
-        if(state.extenSame) return null;
-        stream.eatWhile(/[^,]/);
-        return "number";
-      } else if(state.extenApplication) {
-        stream.eatWhile(/,/);
-        cur = stream.current();
-        if(cur === ',') return null;
-        stream.eatWhile(/\w/);
-        cur = stream.current().toLowerCase();
-        state.extenApplication = false;
-        if(apps.indexOf(cur) !== -1){
-          return "def strong";
-        }
-      } else{
-        return basicToken(stream,state);
-      }
-
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-asterisk", "asterisk");
diff --git a/resources/libs/codemirror/mode/asterisk/index.html b/resources/libs/codemirror/mode/asterisk/index.html
deleted file mode 100644
index 6abdecb50..000000000
--- a/resources/libs/codemirror/mode/asterisk/index.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Asterisk dialplan mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="asterisk.js"></script>
-<style>
-      .CodeMirror {border: 1px solid #999;}
-      .cm-s-default span.cm-arrow { color: red; }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Asterisk dialplan</a>
-  </ul>
-</div>
-
-<article>
-<h2>Asterisk dialplan mode</h2>
-<form><textarea id="code" name="code">
-; extensions.conf - the Asterisk dial plan
-;
-
-[general]
-;
-; If static is set to no, or omitted, then the pbx_config will rewrite
-; this file when extensions are modified.  Remember that all comments
-; made in the file will be lost when that happens.
-static=yes
-
-#include "/etc/asterisk/additional_general.conf
-
-[iaxprovider]
-switch => IAX2/user:[key]@myserver/mycontext
-
-[dynamic]
-#exec /usr/bin/dynamic-peers.pl
-
-[trunkint]
-;
-; International long distance through trunk
-;
-exten => _9011.,1,Macro(dundi-e164,${EXTEN:4})
-exten => _9011.,n,Dial(${GLOBAL(TRUNK)}/${FILTER(0-9,${EXTEN:${GLOBAL(TRUNKMSD)}})})
-
-[local]
-;
-; Master context for local, toll-free, and iaxtel calls only
-;
-ignorepat => 9
-include => default
-
-[demo]
-include => stdexten
-;
-; We start with what to do when a call first comes in.
-;
-exten => s,1,Wait(1)			; Wait a second, just for fun
-same  => n,Answer			; Answer the line
-same  => n,Set(TIMEOUT(digit)=5)	; Set Digit Timeout to 5 seconds
-same  => n,Set(TIMEOUT(response)=10)	; Set Response Timeout to 10 seconds
-same  => n(restart),BackGround(demo-congrats)	; Play a congratulatory message
-same  => n(instruct),BackGround(demo-instruct)	; Play some instructions
-same  => n,WaitExten			; Wait for an extension to be dialed.
-
-exten => 2,1,BackGround(demo-moreinfo)	; Give some more information.
-exten => 2,n,Goto(s,instruct)
-
-exten => 3,1,Set(LANGUAGE()=fr)		; Set language to french
-exten => 3,n,Goto(s,restart)		; Start with the congratulations
-
-exten => 1000,1,Goto(default,s,1)
-;
-; We also create an example user, 1234, who is on the console and has
-; voicemail, etc.
-;
-exten => 1234,1,Playback(transfer,skip)		; "Please hold while..."
-					; (but skip if channel is not up)
-exten => 1234,n,Gosub(${EXTEN},stdexten(${GLOBAL(CONSOLE)}))
-exten => 1234,n,Goto(default,s,1)		; exited Voicemail
-
-exten => 1235,1,Voicemail(1234,u)		; Right to voicemail
-
-exten => 1236,1,Dial(Console/dsp)		; Ring forever
-exten => 1236,n,Voicemail(1234,b)		; Unless busy
-
-;
-; # for when they're done with the demo
-;
-exten => #,1,Playback(demo-thanks)	; "Thanks for trying the demo"
-exten => #,n,Hangup			; Hang them up.
-
-;
-; A timeout and "invalid extension rule"
-;
-exten => t,1,Goto(#,1)			; If they take too long, give up
-exten => i,1,Playback(invalid)		; "That's not valid, try again"
-
-;
-; Create an extension, 500, for dialing the
-; Asterisk demo.
-;
-exten => 500,1,Playback(demo-abouttotry); Let them know what's going on
-exten => 500,n,Dial(IAX2/guest@pbx.digium.com/s@default)	; Call the Asterisk demo
-exten => 500,n,Playback(demo-nogo)	; Couldn't connect to the demo site
-exten => 500,n,Goto(s,6)		; Return to the start over message.
-
-;
-; Create an extension, 600, for evaluating echo latency.
-;
-exten => 600,1,Playback(demo-echotest)	; Let them know what's going on
-exten => 600,n,Echo			; Do the echo test
-exten => 600,n,Playback(demo-echodone)	; Let them know it's over
-exten => 600,n,Goto(s,6)		; Start over
-
-;
-;	You can use the Macro Page to intercom a individual user
-exten => 76245,1,Macro(page,SIP/Grandstream1)
-; or if your peernames are the same as extensions
-exten => _7XXX,1,Macro(page,SIP/${EXTEN})
-;
-;
-; System Wide Page at extension 7999
-;
-exten => 7999,1,Set(TIMEOUT(absolute)=60)
-exten => 7999,2,Page(Local/Grandstream1@page&Local/Xlite1@page&Local/1234@page/n,d)
-
-; Give voicemail at extension 8500
-;
-exten => 8500,1,VoicemailMain
-exten => 8500,n,Goto(s,6)
-
-    </textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "text/x-asterisk",
-        matchBrackets: true,
-        lineNumber: true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-asterisk</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/clike/clike.js b/resources/libs/codemirror/mode/clike/clike.js
deleted file mode 100644
index f6626cd0e..000000000
--- a/resources/libs/codemirror/mode/clike/clike.js
+++ /dev/null
@@ -1,362 +0,0 @@
-CodeMirror.defineMode("clike", function(config, parserConfig) {
-  var indentUnit = config.indentUnit,
-      statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
-      dontAlignCalls = parserConfig.dontAlignCalls,
-      keywords = parserConfig.keywords || {},
-      builtin = parserConfig.builtin || {},
-      blockKeywords = parserConfig.blockKeywords || {},
-      atoms = parserConfig.atoms || {},
-      hooks = parserConfig.hooks || {},
-      multiLineStrings = parserConfig.multiLineStrings;
-  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
-
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "keyword";
-    }
-    if (builtin.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "builtin";
-    }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return "variable";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !(escaped || multiLineStrings))
-        state.tokenize = null;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function pushContext(state, col, type) {
-    var indent = state.indented;
-    if (state.context && state.context.type == "statement")
-      indent = state.context.indented;
-    return state.context = new Context(indent, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true
-      };
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if ((curPunc == ";" || curPunc == ":" || curPunc == ",") && ctx.type == "statement") popContext(state);
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') || (ctx.type == "statement" && curPunc == "newstatement"))
-        pushContext(state, stream.column(), "statement");
-      state.startOfLine = false;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
-      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
-      var closing = firstChar == ctx.type;
-      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
-      else if (ctx.align && (!dontAlignCalls || ctx.type != ")")) return ctx.column + (closing ? 0 : 1);
-      else if (ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit;
-      else return ctx.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: "{}",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//",
-    fold: "brace"
-  };
-});
-
-(function() {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var cKeywords = "auto if break int case long char register continue return default short do sizeof " +
-    "double static else struct entry switch extern typedef float union for unsigned " +
-    "goto while enum void const signed volatile";
-
-  function cppHook(stream, state) {
-    if (!state.startOfLine) return false;
-    for (;;) {
-      if (stream.skipTo("\\")) {
-        stream.next();
-        if (stream.eol()) {
-          state.tokenize = cppHook;
-          break;
-        }
-      } else {
-        stream.skipToEnd();
-        state.tokenize = null;
-        break;
-      }
-    }
-    return "meta";
-  }
-
-  // C#-style strings where "" escapes a quote.
-  function tokenAtString(stream, state) {
-    var next;
-    while ((next = stream.next()) != null) {
-      if (next == '"' && !stream.eat('"')) {
-        state.tokenize = null;
-        break;
-      }
-    }
-    return "string";
-  }
-
-  function mimes(ms, mode) {
-    for (var i = 0; i < ms.length; ++i) CodeMirror.defineMIME(ms[i], mode);
-  }
-
-  mimes(["text/x-csrc", "text/x-c", "text/x-chdr"], {
-    name: "clike",
-    keywords: words(cKeywords),
-    blockKeywords: words("case do else for if switch while struct"),
-    atoms: words("null"),
-    hooks: {"#": cppHook}
-  });
-  mimes(["text/x-c++src", "text/x-c++hdr"], {
-    name: "clike",
-    keywords: words(cKeywords + " asm dynamic_cast namespace reinterpret_cast try bool explicit new " +
-                    "static_cast typeid catch operator template typename class friend private " +
-                    "this using const_cast inline public throw virtual delete mutable protected " +
-                    "wchar_t"),
-    blockKeywords: words("catch class do else finally for if struct switch try while"),
-    atoms: words("true false null"),
-    hooks: {"#": cppHook}
-  });
-  CodeMirror.defineMIME("text/x-java", {
-    name: "clike",
-    keywords: words("abstract assert boolean break byte case catch char class const continue default " +
-                    "do double else enum extends final finally float for goto if implements import " +
-                    "instanceof int interface long native new package private protected public " +
-                    "return short static strictfp super switch synchronized this throw throws transient " +
-                    "try void volatile while"),
-    blockKeywords: words("catch class do else finally for if switch try while"),
-    atoms: words("true false null"),
-    hooks: {
-      "@": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
-        return "meta";
-      }
-    }
-  });
-  CodeMirror.defineMIME("text/x-csharp", {
-    name: "clike",
-    keywords: words("abstract as base break case catch checked class const continue" +
-                    " default delegate do else enum event explicit extern finally fixed for" +
-                    " foreach goto if implicit in interface internal is lock namespace new" +
-                    " operator out override params private protected public readonly ref return sealed" +
-                    " sizeof stackalloc static struct switch this throw try typeof unchecked" +
-                    " unsafe using virtual void volatile while add alias ascending descending dynamic from get" +
-                    " global group into join let orderby partial remove select set value var yield"),
-    blockKeywords: words("catch class do else finally for foreach if struct switch try while"),
-    builtin: words("Boolean Byte Char DateTime DateTimeOffset Decimal Double" +
-                    " Guid Int16 Int32 Int64 Object SByte Single String TimeSpan UInt16 UInt32" +
-                    " UInt64 bool byte char decimal double short int long object"  +
-                    " sbyte float string ushort uint ulong"),
-    atoms: words("true false null"),
-    hooks: {
-      "@": function(stream, state) {
-        if (stream.eat('"')) {
-          state.tokenize = tokenAtString;
-          return tokenAtString(stream, state);
-        }
-        stream.eatWhile(/[\w\$_]/);
-        return "meta";
-      }
-    }
-  });
-  CodeMirror.defineMIME("text/x-scala", {
-    name: "clike",
-    keywords: words(
-
-      /* scala */
-      "abstract case catch class def do else extends false final finally for forSome if " +
-      "implicit import lazy match new null object override package private protected return " +
-      "sealed super this throw trait try trye type val var while with yield _ : = => <- <: " +
-      "<% >: # @ " +
-
-      /* package scala */
-      "assert assume require print println printf readLine readBoolean readByte readShort " +
-      "readChar readInt readLong readFloat readDouble " +
-
-      "AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either " +
-      "Enumeration Equiv Error Exception Fractional Function IndexedSeq Integral Iterable " +
-      "Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering " +
-      "Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder " +
-      "StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector :: #:: " +
-
-      /* package java.lang */
-      "Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable " +
-      "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " +
-      "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
-      "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
-
-
-    ),
-    blockKeywords: words("catch class do else finally for forSome if match switch try while"),
-    atoms: words("true false null"),
-    hooks: {
-      "@": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
-        return "meta";
-      }
-    }
-  });
-  mimes(["x-shader/x-vertex", "x-shader/x-fragment"], {
-    name: "clike",
-    keywords: words("float int bool void " +
-                    "vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 " +
-                    "mat2 mat3 mat4 " +
-                    "sampler1D sampler2D sampler3D samplerCube " +
-                    "sampler1DShadow sampler2DShadow" +
-                    "const attribute uniform varying " +
-                    "break continue discard return " +
-                    "for while do if else struct " +
-                    "in out inout"),
-    blockKeywords: words("for while do if else struct"),
-    builtin: words("radians degrees sin cos tan asin acos atan " +
-                    "pow exp log exp2 sqrt inversesqrt " +
-                    "abs sign floor ceil fract mod min max clamp mix step smootstep " +
-                    "length distance dot cross normalize ftransform faceforward " +
-                    "reflect refract matrixCompMult " +
-                    "lessThan lessThanEqual greaterThan greaterThanEqual " +
-                    "equal notEqual any all not " +
-                    "texture1D texture1DProj texture1DLod texture1DProjLod " +
-                    "texture2D texture2DProj texture2DLod texture2DProjLod " +
-                    "texture3D texture3DProj texture3DLod texture3DProjLod " +
-                    "textureCube textureCubeLod " +
-                    "shadow1D shadow2D shadow1DProj shadow2DProj " +
-                    "shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod " +
-                    "dFdx dFdy fwidth " +
-                    "noise1 noise2 noise3 noise4"),
-    atoms: words("true false " +
-                "gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex " +
-                "gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 " +
-                "gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 " +
-                "gl_FogCoord " +
-                "gl_Position gl_PointSize gl_ClipVertex " +
-                "gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor " +
-                "gl_TexCoord gl_FogFragCoord " +
-                "gl_FragCoord gl_FrontFacing " +
-                "gl_FragColor gl_FragData gl_FragDepth " +
-                "gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix " +
-                "gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse " +
-                "gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse " +
-                "gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose " +
-                "gl_ProjectionMatrixInverseTranspose " +
-                "gl_ModelViewProjectionMatrixInverseTranspose " +
-                "gl_TextureMatrixInverseTranspose " +
-                "gl_NormalScale gl_DepthRange gl_ClipPlane " +
-                "gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel " +
-                "gl_FrontLightModelProduct gl_BackLightModelProduct " +
-                "gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ " +
-                "gl_FogParameters " +
-                "gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords " +
-                "gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats " +
-                "gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits " +
-                "gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits " +
-                "gl_MaxDrawBuffers"),
-    hooks: {"#": cppHook}
-  });
-}());
diff --git a/resources/libs/codemirror/mode/clike/index.html b/resources/libs/codemirror/mode/clike/index.html
deleted file mode 100644
index 93bd718a0..000000000
--- a/resources/libs/codemirror/mode/clike/index.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: C-like mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="clike.js"></script>
-<style>.CodeMirror {border: 2px inset #dee;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">C-like</a>
-  </ul>
-</div>
-
-<article>
-<h2>C-like mode</h2>
-
-<div><textarea id="c-code">
-/* C demo code */
-
-#include <zmq.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <time.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <malloc.h>
-
-typedef struct {
-  void* arg_socket;
-  zmq_msg_t* arg_msg;
-  char* arg_string;
-  unsigned long arg_len;
-  int arg_int, arg_command;
-
-  int signal_fd;
-  int pad;
-  void* context;
-  sem_t sem;
-} acl_zmq_context;
-
-#define p(X) (context->arg_##X)
-
-void* zmq_thread(void* context_pointer) {
-  acl_zmq_context* context = (acl_zmq_context*)context_pointer;
-  char ok = 'K', err = 'X';
-  int res;
-
-  while (1) {
-    while ((res = sem_wait(&amp;context->sem)) == EINTR);
-    if (res) {write(context->signal_fd, &amp;err, 1); goto cleanup;}
-    switch(p(command)) {
-    case 0: goto cleanup;
-    case 1: p(socket) = zmq_socket(context->context, p(int)); break;
-    case 2: p(int) = zmq_close(p(socket)); break;
-    case 3: p(int) = zmq_bind(p(socket), p(string)); break;
-    case 4: p(int) = zmq_connect(p(socket), p(string)); break;
-    case 5: p(int) = zmq_getsockopt(p(socket), p(int), (void*)p(string), &amp;p(len)); break;
-    case 6: p(int) = zmq_setsockopt(p(socket), p(int), (void*)p(string), p(len)); break;
-    case 7: p(int) = zmq_send(p(socket), p(msg), p(int)); break;
-    case 8: p(int) = zmq_recv(p(socket), p(msg), p(int)); break;
-    case 9: p(int) = zmq_poll(p(socket), p(int), p(len)); break;
-    }
-    p(command) = errno;
-    write(context->signal_fd, &amp;ok, 1);
-  }
- cleanup:
-  close(context->signal_fd);
-  free(context_pointer);
-  return 0;
-}
-
-void* zmq_thread_init(void* zmq_context, int signal_fd) {
-  acl_zmq_context* context = malloc(sizeof(acl_zmq_context));
-  pthread_t thread;
-
-  context->context = zmq_context;
-  context->signal_fd = signal_fd;
-  sem_init(&amp;context->sem, 1, 0);
-  pthread_create(&amp;thread, 0, &amp;zmq_thread, context);
-  pthread_detach(thread);
-  return context;
-}
-</textarea></div>
-
-<h2>C++ example</h2>
-
-<div><textarea id="cpp-code">
-#include <iostream>
-#include "mystuff/util.h"
-
-namespace {
-enum Enum {
-  VAL1, VAL2, VAL3
-};
-
-int Helper(const MyType& param) {
-  return 0;
-}
-} // namespace
-
-class ForwardDec;
-
-template <class T, class V>
-class Class : public BaseClass {
-  const MyType<T, V> member_;
-
- public:
-  const MyType<T, V>& Method() const {
-    return member_;
-  }
-
-  void Method2(MyType<T, V>* value);
-}
-
-template <class T, class V>
-void Class::Method2(MyType<T, V>* value) {
-  std::out << 1 >> method();
-  value->Method3(member_);
-  member_ = value;
-}
-</textarea></div>
-
-<h2>Java example</h2>
-
-<div><textarea id="java-code">
-import com.demo.util.MyType;
-import com.demo.util.MyInterface;
-
-public enum Enum {
-  VAL1, VAL2, VAL3
-}
-
-public class Class<T, V> implements MyInterface {
-  public static final MyType<T, V> member;
-  
-  private class InnerClass {
-    public int zero() {
-      return 0;
-    }
-  }
-
-  @Override
-  public MyType method() {
-    return member;
-  }
-
-  public void method2(MyType<T, V> value) {
-    method();
-    value.method3();
-    member = value;
-  }
-}
-</textarea></div>
-
-    <script>
-      var cEditor = CodeMirror.fromTextArea(document.getElementById("c-code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-csrc"
-      });
-      var cppEditor = CodeMirror.fromTextArea(document.getElementById("cpp-code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-c++src"
-      });
-      var javaEditor = CodeMirror.fromTextArea(document.getElementById("java-code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-java"
-      });
-    </script>
-
-    <p>Simple mode that tries to handle C-like languages as well as it
-    can. Takes two configuration parameters: <code>keywords</code>, an
-    object whose property names are the keywords in the language,
-    and <code>useCPP</code>, which determines whether C preprocessor
-    directives are recognized.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-csrc</code>
-    (C code), <code>text/x-c++src</code> (C++
-    code), <code>text/x-java</code> (Java
-    code), <code>text/x-csharp</code> (C#).</p>
-</article>
diff --git a/resources/libs/codemirror/mode/clike/scala.html b/resources/libs/codemirror/mode/clike/scala.html
deleted file mode 100644
index e9acc049b..000000000
--- a/resources/libs/codemirror/mode/clike/scala.html
+++ /dev/null
@@ -1,767 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Scala mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/ambiance.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="clike.js"></script>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Scala</a>
-  </ul>
-</div>
-
-<article>
-<h2>Scala mode</h2>
-<form>
-<textarea id="code" name="code">
-
-  /*                     __                                               *\
-  **     ________ ___   / /  ___     Scala API                            **
-  **    / __/ __// _ | / /  / _ |    (c) 2003-2011, LAMP/EPFL             **
-  **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-  ** /____/\___/_/ |_/____/_/ | |                                         **
-  **                          |/                                          **
-  \*                                                                      */
-
-  package scala.collection
-
-  import generic._
-  import mutable.{ Builder, ListBuffer }
-  import annotation.{tailrec, migration, bridge}
-  import annotation.unchecked.{ uncheckedVariance => uV }
-  import parallel.ParIterable
-
-  /** A template trait for traversable collections of type `Traversable[A]`.
-   *  
-   *  $traversableInfo
-   *  @define mutability
-   *  @define traversableInfo
-   *  This is a base trait of all kinds of $mutability Scala collections. It
-   *  implements the behavior common to all collections, in terms of a method
-   *  `foreach` with signature:
-   * {{{
-   *     def foreach[U](f: Elem => U): Unit
-   * }}}
-   *  Collection classes mixing in this trait provide a concrete 
-   *  `foreach` method which traverses all the
-   *  elements contained in the collection, applying a given function to each.
-   *  They also need to provide a method `newBuilder`
-   *  which creates a builder for collections of the same kind.
-   *  
-   *  A traversable class might or might not have two properties: strictness
-   *  and orderedness. Neither is represented as a type.
-   *  
-   *  The instances of a strict collection class have all their elements
-   *  computed before they can be used as values. By contrast, instances of
-   *  a non-strict collection class may defer computation of some of their
-   *  elements until after the instance is available as a value.
-   *  A typical example of a non-strict collection class is a
-   *  <a href="../immutable/Stream.html" target="ContentFrame">
-   *  `scala.collection.immutable.Stream`</a>.
-   *  A more general class of examples are `TraversableViews`.
-   *  
-   *  If a collection is an instance of an ordered collection class, traversing
-   *  its elements with `foreach` will always visit elements in the
-   *  same order, even for different runs of the program. If the class is not
-   *  ordered, `foreach` can visit elements in different orders for
-   *  different runs (but it will keep the same order in the same run).'
-   * 
-   *  A typical example of a collection class which is not ordered is a
-   *  `HashMap` of objects. The traversal order for hash maps will
-   *  depend on the hash codes of its elements, and these hash codes might
-   *  differ from one run to the next. By contrast, a `LinkedHashMap`
-   *  is ordered because it's `foreach` method visits elements in the
-   *  order they were inserted into the `HashMap`.
-   *
-   *  @author Martin Odersky
-   *  @version 2.8
-   *  @since   2.8
-   *  @tparam A    the element type of the collection
-   *  @tparam Repr the type of the actual collection containing the elements.
-   *
-   *  @define Coll Traversable
-   *  @define coll traversable collection
-   */
-  trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] 
-                                      with FilterMonadic[A, Repr]
-                                      with TraversableOnce[A]
-                                      with GenTraversableLike[A, Repr]
-                                      with Parallelizable[A, ParIterable[A]]
-  {
-    self =>
-
-    import Traversable.breaks._
-
-    /** The type implementing this traversable */
-    protected type Self = Repr
-
-    /** The collection of type $coll underlying this `TraversableLike` object.
-     *  By default this is implemented as the `TraversableLike` object itself,
-     *  but this can be overridden.
-     */
-    def repr: Repr = this.asInstanceOf[Repr]
-
-    /** The underlying collection seen as an instance of `$Coll`.
-     *  By default this is implemented as the current collection object itself,
-     *  but this can be overridden.
-     */
-    protected[this] def thisCollection: Traversable[A] = this.asInstanceOf[Traversable[A]]
-
-    /** A conversion from collections of type `Repr` to `$Coll` objects.
-     *  By default this is implemented as just a cast, but this can be overridden.
-     */
-    protected[this] def toCollection(repr: Repr): Traversable[A] = repr.asInstanceOf[Traversable[A]]
-
-    /** Creates a new builder for this collection type.
-     */
-    protected[this] def newBuilder: Builder[A, Repr]
-
-    protected[this] def parCombiner = ParIterable.newCombiner[A]
-
-    /** Applies a function `f` to all elements of this $coll.
-     *  
-     *    Note: this method underlies the implementation of most other bulk operations.
-     *    It's important to implement this method in an efficient way.
-     *  
-     *
-     *  @param  f   the function that is applied for its side-effect to every element.
-     *              The result of function `f` is discarded.
-     *              
-     *  @tparam  U  the type parameter describing the result of function `f`. 
-     *              This result will always be ignored. Typically `U` is `Unit`,
-     *              but this is not necessary.
-     *
-     *  @usecase def foreach(f: A => Unit): Unit
-     */
-    def foreach[U](f: A => U): Unit
-
-    /** Tests whether this $coll is empty.
-     *
-     *  @return    `true` if the $coll contain no elements, `false` otherwise.
-     */
-    def isEmpty: Boolean = {
-      var result = true
-      breakable {
-        for (x <- this) {
-          result = false
-          break
-        }
-      }
-      result
-    }
-
-    /** Tests whether this $coll is known to have a finite size.
-     *  All strict collections are known to have finite size. For a non-strict collection
-     *  such as `Stream`, the predicate returns `true` if all elements have been computed.
-     *  It returns `false` if the stream is not yet evaluated to the end.
-     *
-     *  Note: many collection methods will not work on collections of infinite sizes. 
-     *
-     *  @return  `true` if this collection is known to have finite size, `false` otherwise.
-     */
-    def hasDefiniteSize = true
-
-    def ++[B >: A, That](that: GenTraversableOnce[B])(implicit bf: CanBuildFrom[Repr, B, That]): That = {
-      val b = bf(repr)
-      if (that.isInstanceOf[IndexedSeqLike[_, _]]) b.sizeHint(this, that.seq.size)
-      b ++= thisCollection
-      b ++= that.seq
-      b.result
-    }
-
-    @bridge
-    def ++[B >: A, That](that: TraversableOnce[B])(implicit bf: CanBuildFrom[Repr, B, That]): That =
-      ++(that: GenTraversableOnce[B])(bf)
-
-    /** Concatenates this $coll with the elements of a traversable collection.
-     *  It differs from ++ in that the right operand determines the type of the
-     *  resulting collection rather than the left one.
-     * 
-     *  @param that   the traversable to append.
-     *  @tparam B     the element type of the returned collection. 
-     *  @tparam That  $thatinfo
-     *  @param bf     $bfinfo
-     *  @return       a new collection of type `That` which contains all elements
-     *                of this $coll followed by all elements of `that`.
-     * 
-     *  @usecase def ++:[B](that: TraversableOnce[B]): $Coll[B]
-     *  
-     *  @return       a new $coll which contains all elements of this $coll
-     *                followed by all elements of `that`.
-     */
-    def ++:[B >: A, That](that: TraversableOnce[B])(implicit bf: CanBuildFrom[Repr, B, That]): That = {
-      val b = bf(repr)
-      if (that.isInstanceOf[IndexedSeqLike[_, _]]) b.sizeHint(this, that.size)
-      b ++= that
-      b ++= thisCollection
-      b.result
-    }
-
-    /** This overload exists because: for the implementation of ++: we should reuse
-     *  that of ++ because many collections override it with more efficient versions.
-     *  Since TraversableOnce has no '++' method, we have to implement that directly,
-     *  but Traversable and down can use the overload.
-     */
-    def ++:[B >: A, That](that: Traversable[B])(implicit bf: CanBuildFrom[Repr, B, That]): That =
-      (that ++ seq)(breakOut)
-
-    def map[B, That](f: A => B)(implicit bf: CanBuildFrom[Repr, B, That]): That = {
-      val b = bf(repr)
-      b.sizeHint(this) 
-      for (x <- this) b += f(x)
-      b.result
-    }
-
-    def flatMap[B, That](f: A => GenTraversableOnce[B])(implicit bf: CanBuildFrom[Repr, B, That]): That = {
-      val b = bf(repr)
-      for (x <- this) b ++= f(x).seq
-      b.result
-    }
-
-    /** Selects all elements of this $coll which satisfy a predicate.
-     *
-     *  @param p     the predicate used to test elements.
-     *  @return      a new $coll consisting of all elements of this $coll that satisfy the given
-     *               predicate `p`. The order of the elements is preserved.
-     */
-    def filter(p: A => Boolean): Repr = {
-      val b = newBuilder
-      for (x <- this) 
-        if (p(x)) b += x
-      b.result
-    }
-
-    /** Selects all elements of this $coll which do not satisfy a predicate.
-     *
-     *  @param p     the predicate used to test elements.
-     *  @return      a new $coll consisting of all elements of this $coll that do not satisfy the given
-     *               predicate `p`. The order of the elements is preserved.
-     */
-    def filterNot(p: A => Boolean): Repr = filter(!p(_))
-
-    def collect[B, That](pf: PartialFunction[A, B])(implicit bf: CanBuildFrom[Repr, B, That]): That = {
-      val b = bf(repr)
-      for (x <- this) if (pf.isDefinedAt(x)) b += pf(x)
-      b.result
-    }
-
-    /** Builds a new collection by applying an option-valued function to all
-     *  elements of this $coll on which the function is defined.
-     *
-     *  @param f      the option-valued function which filters and maps the $coll.
-     *  @tparam B     the element type of the returned collection.
-     *  @tparam That  $thatinfo
-     *  @param bf     $bfinfo
-     *  @return       a new collection of type `That` resulting from applying the option-valued function
-     *                `f` to each element and collecting all defined results.
-     *                The order of the elements is preserved.
-     *
-     *  @usecase def filterMap[B](f: A => Option[B]): $Coll[B]
-     *  
-     *  @param pf     the partial function which filters and maps the $coll.
-     *  @return       a new $coll resulting from applying the given option-valued function
-     *                `f` to each element and collecting all defined results.
-     *                The order of the elements is preserved.
-    def filterMap[B, That](f: A => Option[B])(implicit bf: CanBuildFrom[Repr, B, That]): That = {
-      val b = bf(repr)
-      for (x <- this) 
-        f(x) match {
-          case Some(y) => b += y
-          case _ =>
-        }
-      b.result
-    }
-     */
-
-    /** Partitions this $coll in two ${coll}s according to a predicate.
-     *
-     *  @param p the predicate on which to partition.
-     *  @return  a pair of ${coll}s: the first $coll consists of all elements that 
-     *           satisfy the predicate `p` and the second $coll consists of all elements
-     *           that don't. The relative order of the elements in the resulting ${coll}s
-     *           is the same as in the original $coll.
-     */
-    def partition(p: A => Boolean): (Repr, Repr) = {
-      val l, r = newBuilder
-      for (x <- this) (if (p(x)) l else r) += x
-      (l.result, r.result)
-    }
-
-    def groupBy[K](f: A => K): immutable.Map[K, Repr] = {
-      val m = mutable.Map.empty[K, Builder[A, Repr]]
-      for (elem <- this) {
-        val key = f(elem)
-        val bldr = m.getOrElseUpdate(key, newBuilder)
-        bldr += elem
-      }
-      val b = immutable.Map.newBuilder[K, Repr]
-      for ((k, v) <- m)
-        b += ((k, v.result))
-
-      b.result
-    }
-
-    /** Tests whether a predicate holds for all elements of this $coll.
-     *
-     *  $mayNotTerminateInf
-     *
-     *  @param   p     the predicate used to test elements.
-     *  @return        `true` if the given predicate `p` holds for all elements
-     *                 of this $coll, otherwise `false`.
-     */
-    def forall(p: A => Boolean): Boolean = {
-      var result = true
-      breakable {
-        for (x <- this)
-          if (!p(x)) { result = false; break }
-      }
-      result
-    }
-
-    /** Tests whether a predicate holds for some of the elements of this $coll.
-     *
-     *  $mayNotTerminateInf
-     *
-     *  @param   p     the predicate used to test elements.
-     *  @return        `true` if the given predicate `p` holds for some of the
-     *                 elements of this $coll, otherwise `false`.
-     */
-    def exists(p: A => Boolean): Boolean = {
-      var result = false
-      breakable {
-        for (x <- this)
-          if (p(x)) { result = true; break }
-      }
-      result
-    }
-
-    /** Finds the first element of the $coll satisfying a predicate, if any.
-     * 
-     *  $mayNotTerminateInf
-     *  $orderDependent
-     *
-     *  @param p    the predicate used to test elements.
-     *  @return     an option value containing the first element in the $coll
-     *              that satisfies `p`, or `None` if none exists.
-     */
-    def find(p: A => Boolean): Option[A] = {
-      var result: Option[A] = None
-      breakable {
-        for (x <- this)
-          if (p(x)) { result = Some(x); break }
-      }
-      result
-    }
-
-    def scan[B >: A, That](z: B)(op: (B, B) => B)(implicit cbf: CanBuildFrom[Repr, B, That]): That = scanLeft(z)(op)
-
-    def scanLeft[B, That](z: B)(op: (B, A) => B)(implicit bf: CanBuildFrom[Repr, B, That]): That = {
-      val b = bf(repr)
-      b.sizeHint(this, 1)
-      var acc = z
-      b += acc
-      for (x <- this) { acc = op(acc, x); b += acc }
-      b.result
-    }
-
-    @migration(2, 9,
-      "This scanRight definition has changed in 2.9.\n" +
-      "The previous behavior can be reproduced with scanRight.reverse."
-    )
-    def scanRight[B, That](z: B)(op: (A, B) => B)(implicit bf: CanBuildFrom[Repr, B, That]): That = {
-      var scanned = List(z)
-      var acc = z
-      for (x <- reversed) {
-        acc = op(x, acc)
-        scanned ::= acc
-      }
-      val b = bf(repr)
-      for (elem <- scanned) b += elem
-      b.result
-    }
-
-    /** Selects the first element of this $coll.
-     *  $orderDependent
-     *  @return  the first element of this $coll.
-     *  @throws `NoSuchElementException` if the $coll is empty.
-     */
-    def head: A = {
-      var result: () => A = () => throw new NoSuchElementException
-      breakable {
-        for (x <- this) {
-          result = () => x
-          break
-        }
-      }
-      result()
-    }
-
-    /** Optionally selects the first element.
-     *  $orderDependent
-     *  @return  the first element of this $coll if it is nonempty, `None` if it is empty.
-     */
-    def headOption: Option[A] = if (isEmpty) None else Some(head)
-
-    /** Selects all elements except the first.
-     *  $orderDependent
-     *  @return  a $coll consisting of all elements of this $coll
-     *           except the first one.
-     *  @throws `UnsupportedOperationException` if the $coll is empty.
-     */ 
-    override def tail: Repr = {
-      if (isEmpty) throw new UnsupportedOperationException("empty.tail")
-      drop(1)
-    }
-
-    /** Selects the last element.
-      * $orderDependent
-      * @return The last element of this $coll.
-      * @throws NoSuchElementException If the $coll is empty.
-      */
-    def last: A = {
-      var lst = head
-      for (x <- this)
-        lst = x
-      lst
-    }
-
-    /** Optionally selects the last element.
-     *  $orderDependent
-     *  @return  the last element of this $coll$ if it is nonempty, `None` if it is empty.
-     */
-    def lastOption: Option[A] = if (isEmpty) None else Some(last)
-
-    /** Selects all elements except the last.
-     *  $orderDependent
-     *  @return  a $coll consisting of all elements of this $coll
-     *           except the last one.
-     *  @throws `UnsupportedOperationException` if the $coll is empty.
-     */
-    def init: Repr = {
-      if (isEmpty) throw new UnsupportedOperationException("empty.init")
-      var lst = head
-      var follow = false
-      val b = newBuilder
-      b.sizeHint(this, -1)
-      for (x <- this.seq) {
-        if (follow) b += lst
-        else follow = true
-        lst = x
-      }
-      b.result
-    }
-
-    def take(n: Int): Repr = slice(0, n)
-
-    def drop(n: Int): Repr = 
-      if (n <= 0) {
-        val b = newBuilder
-        b.sizeHint(this)
-        b ++= thisCollection result
-      }
-      else sliceWithKnownDelta(n, Int.MaxValue, -n)
-
-    def slice(from: Int, until: Int): Repr = sliceWithKnownBound(math.max(from, 0), until)
-
-    // Precondition: from >= 0, until > 0, builder already configured for building.
-    private[this] def sliceInternal(from: Int, until: Int, b: Builder[A, Repr]): Repr = {
-      var i = 0
-      breakable {
-        for (x <- this.seq) {
-          if (i >= from) b += x
-          i += 1
-          if (i >= until) break
-        }
-      }
-      b.result
-    }
-    // Precondition: from >= 0
-    private[scala] def sliceWithKnownDelta(from: Int, until: Int, delta: Int): Repr = {
-      val b = newBuilder
-      if (until <= from) b.result
-      else {
-        b.sizeHint(this, delta)
-        sliceInternal(from, until, b)
-      }
-    }
-    // Precondition: from >= 0
-    private[scala] def sliceWithKnownBound(from: Int, until: Int): Repr = {
-      val b = newBuilder
-      if (until <= from) b.result
-      else {
-        b.sizeHintBounded(until - from, this)      
-        sliceInternal(from, until, b)
-      }
-    }
-
-    def takeWhile(p: A => Boolean): Repr = {
-      val b = newBuilder
-      breakable {
-        for (x <- this) {
-          if (!p(x)) break
-          b += x
-        }
-      }
-      b.result
-    }
-
-    def dropWhile(p: A => Boolean): Repr = {
-      val b = newBuilder
-      var go = false
-      for (x <- this) {
-        if (!p(x)) go = true
-        if (go) b += x
-      }
-      b.result
-    }
-
-    def span(p: A => Boolean): (Repr, Repr) = {
-      val l, r = newBuilder
-      var toLeft = true
-      for (x <- this) {
-        toLeft = toLeft && p(x)
-        (if (toLeft) l else r) += x
-      }
-      (l.result, r.result)
-    }
-
-    def splitAt(n: Int): (Repr, Repr) = {
-      val l, r = newBuilder
-      l.sizeHintBounded(n, this)
-      if (n >= 0) r.sizeHint(this, -n)
-      var i = 0
-      for (x <- this) {
-        (if (i < n) l else r) += x
-        i += 1
-      }
-      (l.result, r.result)
-    }
-
-    /** Iterates over the tails of this $coll. The first value will be this
-     *  $coll and the final one will be an empty $coll, with the intervening
-     *  values the results of successive applications of `tail`.
-     *
-     *  @return   an iterator over all the tails of this $coll
-     *  @example  `List(1,2,3).tails = Iterator(List(1,2,3), List(2,3), List(3), Nil)`
-     */  
-    def tails: Iterator[Repr] = iterateUntilEmpty(_.tail)
-
-    /** Iterates over the inits of this $coll. The first value will be this
-     *  $coll and the final one will be an empty $coll, with the intervening
-     *  values the results of successive applications of `init`.
-     *
-     *  @return  an iterator over all the inits of this $coll
-     *  @example  `List(1,2,3).inits = Iterator(List(1,2,3), List(1,2), List(1), Nil)`
-     */
-    def inits: Iterator[Repr] = iterateUntilEmpty(_.init)
-
-    /** Copies elements of this $coll to an array.
-     *  Fills the given array `xs` with at most `len` elements of
-     *  this $coll, starting at position `start`.
-     *  Copying will stop once either the end of the current $coll is reached,
-     *  or the end of the array is reached, or `len` elements have been copied.
-     *
-     *  $willNotTerminateInf
-     * 
-     *  @param  xs     the array to fill.
-     *  @param  start  the starting index.
-     *  @param  len    the maximal number of elements to copy.
-     *  @tparam B      the type of the elements of the array. 
-     * 
-     *
-     *  @usecase def copyToArray(xs: Array[A], start: Int, len: Int): Unit
-     */
-    def copyToArray[B >: A](xs: Array[B], start: Int, len: Int) {
-      var i = start
-      val end = (start + len) min xs.length
-      breakable {
-        for (x <- this) {
-          if (i >= end) break
-          xs(i) = x
-          i += 1
-        }
-      }
-    }
-
-    def toTraversable: Traversable[A] = thisCollection
-    def toIterator: Iterator[A] = toStream.iterator
-    def toStream: Stream[A] = toBuffer.toStream
-
-    /** Converts this $coll to a string.
-     *
-     *  @return   a string representation of this collection. By default this
-     *            string consists of the `stringPrefix` of this $coll,
-     *            followed by all elements separated by commas and enclosed in parentheses.
-     */
-    override def toString = mkString(stringPrefix + "(", ", ", ")")
-
-    /** Defines the prefix of this object's `toString` representation.
-     *
-     *  @return  a string representation which starts the result of `toString`
-     *           applied to this $coll. By default the string prefix is the
-     *           simple name of the collection class $coll.
-     */
-    def stringPrefix : String = {
-      var string = repr.asInstanceOf[AnyRef].getClass.getName
-      val idx1 = string.lastIndexOf('.' : Int)
-      if (idx1 != -1) string = string.substring(idx1 + 1)
-      val idx2 = string.indexOf('$')
-      if (idx2 != -1) string = string.substring(0, idx2)
-      string
-    }
-
-    /** Creates a non-strict view of this $coll.
-     * 
-     *  @return a non-strict view of this $coll.
-     */
-    def view = new TraversableView[A, Repr] {
-      protected lazy val underlying = self.repr
-      override def foreach[U](f: A => U) = self foreach f
-    }
-
-    /** Creates a non-strict view of a slice of this $coll.
-     *
-     *  Note: the difference between `view` and `slice` is that `view` produces
-     *        a view of the current $coll, whereas `slice` produces a new $coll.
-     * 
-     *  Note: `view(from, to)` is equivalent to `view.slice(from, to)`
-     *  $orderDependent
-     * 
-     *  @param from   the index of the first element of the view
-     *  @param until  the index of the element following the view
-     *  @return a non-strict view of a slice of this $coll, starting at index `from`
-     *  and extending up to (but not including) index `until`.
-     */
-    def view(from: Int, until: Int): TraversableView[A, Repr] = view.slice(from, until)
-
-    /** Creates a non-strict filter of this $coll.
-     *
-     *  Note: the difference between `c filter p` and `c withFilter p` is that
-     *        the former creates a new collection, whereas the latter only
-     *        restricts the domain of subsequent `map`, `flatMap`, `foreach`,
-     *        and `withFilter` operations.
-     *  $orderDependent
-     * 
-     *  @param p   the predicate used to test elements.
-     *  @return    an object of class `WithFilter`, which supports
-     *             `map`, `flatMap`, `foreach`, and `withFilter` operations.
-     *             All these operations apply to those elements of this $coll which
-     *             satisfy the predicate `p`.
-     */
-    def withFilter(p: A => Boolean): FilterMonadic[A, Repr] = new WithFilter(p)
-
-    /** A class supporting filtered operations. Instances of this class are
-     *  returned by method `withFilter`.
-     */
-    class WithFilter(p: A => Boolean) extends FilterMonadic[A, Repr] {
-
-      /** Builds a new collection by applying a function to all elements of the
-       *  outer $coll containing this `WithFilter` instance that satisfy predicate `p`.
-       *
-       *  @param f      the function to apply to each element.
-       *  @tparam B     the element type of the returned collection.
-       *  @tparam That  $thatinfo
-       *  @param bf     $bfinfo
-       *  @return       a new collection of type `That` resulting from applying
-       *                the given function `f` to each element of the outer $coll
-       *                that satisfies predicate `p` and collecting the results.
-       *
-       *  @usecase def map[B](f: A => B): $Coll[B] 
-       *  
-       *  @return       a new $coll resulting from applying the given function
-       *                `f` to each element of the outer $coll that satisfies
-       *                predicate `p` and collecting the results.
-       */
-      def map[B, That](f: A => B)(implicit bf: CanBuildFrom[Repr, B, That]): That = {
-        val b = bf(repr)
-        for (x <- self) 
-          if (p(x)) b += f(x)
-        b.result
-      }
-
-      /** Builds a new collection by applying a function to all elements of the
-       *  outer $coll containing this `WithFilter` instance that satisfy
-       *  predicate `p` and concatenating the results. 
-       *
-       *  @param f      the function to apply to each element.
-       *  @tparam B     the element type of the returned collection.
-       *  @tparam That  $thatinfo
-       *  @param bf     $bfinfo
-       *  @return       a new collection of type `That` resulting from applying
-       *                the given collection-valued function `f` to each element
-       *                of the outer $coll that satisfies predicate `p` and
-       *                concatenating the results.
-       *
-       *  @usecase def flatMap[B](f: A => TraversableOnce[B]): $Coll[B]
-       * 
-       *  @return       a new $coll resulting from applying the given collection-valued function
-       *                `f` to each element of the outer $coll that satisfies predicate `p` and concatenating the results.
-       */
-      def flatMap[B, That](f: A => GenTraversableOnce[B])(implicit bf: CanBuildFrom[Repr, B, That]): That = {
-        val b = bf(repr)
-        for (x <- self) 
-          if (p(x)) b ++= f(x).seq
-        b.result
-      }
-
-      /** Applies a function `f` to all elements of the outer $coll containing
-       *  this `WithFilter` instance that satisfy predicate `p`.
-       *
-       *  @param  f   the function that is applied for its side-effect to every element.
-       *              The result of function `f` is discarded.
-       *              
-       *  @tparam  U  the type parameter describing the result of function `f`. 
-       *              This result will always be ignored. Typically `U` is `Unit`,
-       *              but this is not necessary.
-       *
-       *  @usecase def foreach(f: A => Unit): Unit
-       */   
-      def foreach[U](f: A => U): Unit = 
-        for (x <- self) 
-          if (p(x)) f(x)
-
-      /** Further refines the filter for this $coll.
-       *
-       *  @param q   the predicate used to test elements.
-       *  @return    an object of class `WithFilter`, which supports
-       *             `map`, `flatMap`, `foreach`, and `withFilter` operations.
-       *             All these operations apply to those elements of this $coll which
-       *             satisfy the predicate `q` in addition to the predicate `p`.
-       */
-      def withFilter(q: A => Boolean): WithFilter = 
-        new WithFilter(x => p(x) && q(x))
-    }
-
-    // A helper for tails and inits.
-    private def iterateUntilEmpty(f: Traversable[A @uV] => Traversable[A @uV]): Iterator[Repr] = {
-      val it = Iterator.iterate(thisCollection)(f) takeWhile (x => !x.isEmpty)
-      it ++ Iterator(Nil) map (newBuilder ++= _ result)
-    }
-  }
-
-
-</textarea>
-</form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        theme: "ambiance",
-        mode: "text/x-scala"
-      });
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/mode/clojure/clojure.js b/resources/libs/codemirror/mode/clojure/clojure.js
deleted file mode 100644
index ee22a12fe..000000000
--- a/resources/libs/codemirror/mode/clojure/clojure.js
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Author: Hans Engel
- * Branched from CodeMirror's Scheme mode (by Koh Zi Han, based on implementation by Koh Zi Chun)
- */
-CodeMirror.defineMode("clojure", function () {
-    var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2",
-        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword";
-    var INDENT_WORD_SKIP = 2;
-
-    function makeKeywords(str) {
-        var obj = {}, words = str.split(" ");
-        for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-        return obj;
-    }
-
-    var atoms = makeKeywords("true false nil");
-
-    var keywords = makeKeywords(
-      "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord defproject deftest slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars binding gen-class gen-and-load-class gen-and-save-class handler-case handle");
-
-    var builtins = makeKeywords(
-        "* *' *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *compiler-options* *data-readers* *e *err* *file* *flush-on-newline* *fn-loader* *in* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* + +' - -' -> ->> ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE accessor aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint biginteger binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* bound? butlast byte byte-array bytes case cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? declare default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol defrecord defstruct deftype delay delay? deliver denominator deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info extend extend-protocol extend-type extenders extends? false? ffirst file-seq filter filterv find find-keyword find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn fn? fnext fnil for force format frequencies future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash hash-combine hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc inc' init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt keep keep-indexed key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map-indexed map? mapcat mapv max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext nthrest num number? numerator object-array odd? or parents partial partition partition-all partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-dup print-method print-simple print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int rand-nth range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string realized? reduce reduce-kv reductions ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure reify release-pending-sends rem remove remove-all-methods remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest restart-agent resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? seque sequence sequential? set set-error-handler! set-error-mode! set-validator! set? short short-array shorts shuffle shutdown-agents slurp some some-fn sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap *default-data-reader-fn* as-> cond-> cond->> reduced reduced? send-via set-agent-send-executor! set-agent-send-off-executor! some-> some->>");
-
-    var indentKeys = makeKeywords(
-        // Built-ins
-        "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type try catch " +
-
-        // Binding forms
-        "let letfn binding loop for doseq dotimes when-let if-let " +
-
-        // Data structures
-        "defstruct struct-map assoc " +
-
-        // clojure.test
-        "testing deftest " +
-
-        // contrib
-        "handler-case handle dotrace deftrace");
-
-    var tests = {
-        digit: /\d/,
-        digit_or_colon: /[\d:]/,
-        hex: /[0-9a-f]/i,
-        sign: /[+-]/,
-        exponent: /e/i,
-        keyword_char: /[^\s\(\[\;\)\]]/,
-        symbol: /[\w*+!\-\._?:\/]/
-    };
-
-    function stateStack(indent, type, prev) { // represents a state stack object
-        this.indent = indent;
-        this.type = type;
-        this.prev = prev;
-    }
-
-    function pushStack(state, indent, type) {
-        state.indentStack = new stateStack(indent, type, state.indentStack);
-    }
-
-    function popStack(state) {
-        state.indentStack = state.indentStack.prev;
-    }
-
-    function isNumber(ch, stream){
-        // hex
-        if ( ch === '0' && stream.eat(/x/i) ) {
-            stream.eatWhile(tests.hex);
-            return true;
-        }
-
-        // leading sign
-        if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) {
-          stream.eat(tests.sign);
-          ch = stream.next();
-        }
-
-        if ( tests.digit.test(ch) ) {
-            stream.eat(ch);
-            stream.eatWhile(tests.digit);
-
-            if ( '.' == stream.peek() ) {
-                stream.eat('.');
-                stream.eatWhile(tests.digit);
-            }
-
-            if ( stream.eat(tests.exponent) ) {
-                stream.eat(tests.sign);
-                stream.eatWhile(tests.digit);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    // Eat character that starts after backslash \
-    function eatCharacter(stream) {
-        var first = stream.next();
-        // Read special literals: backspace, newline, space, return.
-        // Just read all lowercase letters.
-        if (first.match(/[a-z]/) && stream.match(/[a-z]+/, true)) {
-            return;
-        }
-        // Read unicode character: \u1000 \uA0a1
-        if (first === "u") {
-            stream.match(/[0-9a-z]{4}/i, true);
-        }
-    }
-
-    return {
-        startState: function () {
-            return {
-                indentStack: null,
-                indentation: 0,
-                mode: false
-            };
-        },
-
-        token: function (stream, state) {
-            if (state.indentStack == null && stream.sol()) {
-                // update indentation, but only if indentStack is empty
-                state.indentation = stream.indentation();
-            }
-
-            // skip spaces
-            if (stream.eatSpace()) {
-                return null;
-            }
-            var returnType = null;
-
-            switch(state.mode){
-                case "string": // multi-line string parsing mode
-                    var next, escaped = false;
-                    while ((next = stream.next()) != null) {
-                        if (next == "\"" && !escaped) {
-
-                            state.mode = false;
-                            break;
-                        }
-                        escaped = !escaped && next == "\\";
-                    }
-                    returnType = STRING; // continue on in string mode
-                    break;
-                default: // default parsing mode
-                    var ch = stream.next();
-
-                    if (ch == "\"") {
-                        state.mode = "string";
-                        returnType = STRING;
-                    } else if (ch == "\\") {
-                        eatCharacter(stream);
-                        returnType = CHARACTER;
-                    } else if (ch == "'" && !( tests.digit_or_colon.test(stream.peek()) )) {
-                        returnType = ATOM;
-                    } else if (ch == ";") { // comment
-                        stream.skipToEnd(); // rest of the line is a comment
-                        returnType = COMMENT;
-                    } else if (isNumber(ch,stream)){
-                        returnType = NUMBER;
-                    } else if (ch == "(" || ch == "[" || ch == "{" ) {
-                        var keyWord = '', indentTemp = stream.column(), letter;
-                        /**
-                        Either
-                        (indent-word ..
-                        (non-indent-word ..
-                        (;something else, bracket, etc.
-                        */
-
-                        if (ch == "(") while ((letter = stream.eat(tests.keyword_char)) != null) {
-                            keyWord += letter;
-                        }
-
-                        if (keyWord.length > 0 && (indentKeys.propertyIsEnumerable(keyWord) ||
-                                                   /^(?:def|with)/.test(keyWord))) { // indent-word
-                            pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
-                        } else { // non-indent word
-                            // we continue eating the spaces
-                            stream.eatSpace();
-                            if (stream.eol() || stream.peek() == ";") {
-                                // nothing significant after
-                                // we restart indentation 1 space after
-                                pushStack(state, indentTemp + 1, ch);
-                            } else {
-                                pushStack(state, indentTemp + stream.current().length, ch); // else we match
-                            }
-                        }
-                        stream.backUp(stream.current().length - 1); // undo all the eating
-
-                        returnType = BRACKET;
-                    } else if (ch == ")" || ch == "]" || ch == "}") {
-                        returnType = BRACKET;
-                        if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : (ch == "]" ? "[" :"{"))) {
-                            popStack(state);
-                        }
-                    } else if ( ch == ":" ) {
-                        stream.eatWhile(tests.symbol);
-                        return ATOM;
-                    } else {
-                        stream.eatWhile(tests.symbol);
-
-                        if (keywords && keywords.propertyIsEnumerable(stream.current())) {
-                            returnType = KEYWORD;
-                        } else if (builtins && builtins.propertyIsEnumerable(stream.current())) {
-                            returnType = BUILTIN;
-                        } else if (atoms && atoms.propertyIsEnumerable(stream.current())) {
-                            returnType = ATOM;
-                        } else returnType = null;
-                    }
-            }
-
-            return returnType;
-        },
-
-        indent: function (state) {
-            if (state.indentStack == null) return state.indentation;
-            return state.indentStack.indent;
-        },
-
-        lineComment: ";;"
-    };
-});
-
-CodeMirror.defineMIME("text/x-clojure", "clojure");
diff --git a/resources/libs/codemirror/mode/clojure/index.html b/resources/libs/codemirror/mode/clojure/index.html
deleted file mode 100644
index 5a50c566f..000000000
--- a/resources/libs/codemirror/mode/clojure/index.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Clojure mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="clojure.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Clojure</a>
-  </ul>
-</div>
-
-<article>
-<h2>Clojure mode</h2>
-<form><textarea id="code" name="code">
-; Conway's Game of Life, based on the work of:
-;; Laurent Petit https://gist.github.com/1200343
-;; Christophe Grand http://clj-me.cgrand.net/2011/08/19/conways-game-of-life
-
-(ns ^{:doc "Conway's Game of Life."}
- game-of-life)
-
-;; Core game of life's algorithm functions
-
-(defn neighbours
-  "Given a cell's coordinates, returns the coordinates of its neighbours."
-  [[x y]]
-  (for [dx [-1 0 1] dy (if (zero? dx) [-1 1] [-1 0 1])]
-    [(+ dx x) (+ dy y)]))
-
-(defn step
-  "Given a set of living cells, computes the new set of living cells."
-  [cells]
-  (set (for [[cell n] (frequencies (mapcat neighbours cells))
-             :when (or (= n 3) (and (= n 2) (cells cell)))]
-         cell)))
-
-;; Utility methods for displaying game on a text terminal
-
-(defn print-board
-  "Prints a board on *out*, representing a step in the game."
-  [board w h]
-  (doseq [x (range (inc w)) y (range (inc h))]
-    (if (= y 0) (print "\n"))
-    (print (if (board [x y]) "[X]" " . "))))
-
-(defn display-grids
-  "Prints a squence of boards on *out*, representing several steps."
-  [grids w h]
-  (doseq [board grids]
-    (print-board board w h)
-    (print "\n")))
-
-;; Launches an example board
-
-(def
-  ^{:doc "board represents the initial set of living cells"}
-   board #{[2 1] [2 2] [2 3]})
-
-(display-grids (take 3 (iterate step board)) 5 5)
-
-;; Let's play with characters
-(println \1 \a \# \\
-         \" \( \newline
-         \} \" \space
-         \tab \return \backspace
-         \u1000 \uAaAa \u9F9F)
-
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-clojure</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/cobol/cobol.js b/resources/libs/codemirror/mode/cobol/cobol.js
deleted file mode 100644
index d92491dde..000000000
--- a/resources/libs/codemirror/mode/cobol/cobol.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/**
- * Author: Gautam Mehta
- * Branched from CodeMirror's Scheme mode
- */
-CodeMirror.defineMode("cobol", function () {
-  var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
-      ATOM = "atom", NUMBER = "number", KEYWORD = "keyword", MODTAG = "header",
-      COBOLLINENUM = "def", PERIOD = "link";
-  function makeKeywords(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var atoms = makeKeywords("TRUE FALSE ZEROES ZEROS ZERO SPACES SPACE LOW-VALUE LOW-VALUES ");
-  var keywords = makeKeywords(
-      "ACCEPT ACCESS ACQUIRE ADD ADDRESS " +
-      "ADVANCING AFTER ALIAS ALL ALPHABET " +
-      "ALPHABETIC ALPHABETIC-LOWER ALPHABETIC-UPPER ALPHANUMERIC ALPHANUMERIC-EDITED " +
-      "ALSO ALTER ALTERNATE AND ANY " +
-      "ARE AREA AREAS ARITHMETIC ASCENDING " +
-      "ASSIGN AT ATTRIBUTE AUTHOR AUTO " +
-      "AUTO-SKIP AUTOMATIC B-AND B-EXOR B-LESS " +
-      "B-NOT B-OR BACKGROUND-COLOR BACKGROUND-COLOUR BEEP " +
-      "BEFORE BELL BINARY BIT BITS " +
-      "BLANK BLINK BLOCK BOOLEAN BOTTOM " +
-      "BY CALL CANCEL CD CF " +
-      "CH CHARACTER CHARACTERS CLASS CLOCK-UNITS " +
-      "CLOSE COBOL CODE CODE-SET COL " +
-      "COLLATING COLUMN COMMA COMMIT COMMITMENT " +
-      "COMMON COMMUNICATION COMP COMP-0 COMP-1 " +
-      "COMP-2 COMP-3 COMP-4 COMP-5 COMP-6 " +
-      "COMP-7 COMP-8 COMP-9 COMPUTATIONAL COMPUTATIONAL-0 " +
-      "COMPUTATIONAL-1 COMPUTATIONAL-2 COMPUTATIONAL-3 COMPUTATIONAL-4 COMPUTATIONAL-5 " +
-      "COMPUTATIONAL-6 COMPUTATIONAL-7 COMPUTATIONAL-8 COMPUTATIONAL-9 COMPUTE " +
-      "CONFIGURATION CONNECT CONSOLE CONTAINED CONTAINS " +
-      "CONTENT CONTINUE CONTROL CONTROL-AREA CONTROLS " +
-      "CONVERTING COPY CORR CORRESPONDING COUNT " +
-      "CRT CRT-UNDER CURRENCY CURRENT CURSOR " +
-      "DATA DATE DATE-COMPILED DATE-WRITTEN DAY " +
-      "DAY-OF-WEEK DB DB-ACCESS-CONTROL-KEY DB-DATA-NAME DB-EXCEPTION " +
-      "DB-FORMAT-NAME DB-RECORD-NAME DB-SET-NAME DB-STATUS DBCS " +
-      "DBCS-EDITED DE DEBUG-CONTENTS DEBUG-ITEM DEBUG-LINE " +
-      "DEBUG-NAME DEBUG-SUB-1 DEBUG-SUB-2 DEBUG-SUB-3 DEBUGGING " +
-      "DECIMAL-POINT DECLARATIVES DEFAULT DELETE DELIMITED " +
-      "DELIMITER DEPENDING DESCENDING DESCRIBED DESTINATION " +
-      "DETAIL DISABLE DISCONNECT DISPLAY DISPLAY-1 " +
-      "DISPLAY-2 DISPLAY-3 DISPLAY-4 DISPLAY-5 DISPLAY-6 " +
-      "DISPLAY-7 DISPLAY-8 DISPLAY-9 DIVIDE DIVISION " +
-      "DOWN DROP DUPLICATE DUPLICATES DYNAMIC " +
-      "EBCDIC EGI EJECT ELSE EMI " +
-      "EMPTY EMPTY-CHECK ENABLE END END. END-ACCEPT END-ACCEPT. " +
-      "END-ADD END-CALL END-COMPUTE END-DELETE END-DISPLAY " +
-      "END-DIVIDE END-EVALUATE END-IF END-INVOKE END-MULTIPLY " +
-      "END-OF-PAGE END-PERFORM END-READ END-RECEIVE END-RETURN " +
-      "END-REWRITE END-SEARCH END-START END-STRING END-SUBTRACT " +
-      "END-UNSTRING END-WRITE END-XML ENTER ENTRY " +
-      "ENVIRONMENT EOP EQUAL EQUALS ERASE " +
-      "ERROR ESI EVALUATE EVERY EXCEEDS " +
-      "EXCEPTION EXCLUSIVE EXIT EXTEND EXTERNAL " +
-      "EXTERNALLY-DESCRIBED-KEY FD FETCH FILE FILE-CONTROL " +
-      "FILE-STREAM FILES FILLER FINAL FIND " +
-      "FINISH FIRST FOOTING FOR FOREGROUND-COLOR " +
-      "FOREGROUND-COLOUR FORMAT FREE FROM FULL " +
-      "FUNCTION GENERATE GET GIVING GLOBAL " +
-      "GO GOBACK GREATER GROUP HEADING " +
-      "HIGH-VALUE HIGH-VALUES HIGHLIGHT I-O I-O-CONTROL " +
-      "ID IDENTIFICATION IF IN INDEX " +
-      "INDEX-1 INDEX-2 INDEX-3 INDEX-4 INDEX-5 " +
-      "INDEX-6 INDEX-7 INDEX-8 INDEX-9 INDEXED " +
-      "INDIC INDICATE INDICATOR INDICATORS INITIAL " +
-      "INITIALIZE INITIATE INPUT INPUT-OUTPUT INSPECT " +
-      "INSTALLATION INTO INVALID INVOKE IS " +
-      "JUST JUSTIFIED KANJI KEEP KEY " +
-      "LABEL LAST LD LEADING LEFT " +
-      "LEFT-JUSTIFY LENGTH LENGTH-CHECK LESS LIBRARY " +
-      "LIKE LIMIT LIMITS LINAGE LINAGE-COUNTER " +
-      "LINE LINE-COUNTER LINES LINKAGE LOCAL-STORAGE " +
-      "LOCALE LOCALLY LOCK " +
-      "MEMBER MEMORY MERGE MESSAGE METACLASS " +
-      "MODE MODIFIED MODIFY MODULES MOVE " +
-      "MULTIPLE MULTIPLY NATIONAL NATIVE NEGATIVE " +
-      "NEXT NO NO-ECHO NONE NOT " +
-      "NULL NULL-KEY-MAP NULL-MAP NULLS NUMBER " +
-      "NUMERIC NUMERIC-EDITED OBJECT OBJECT-COMPUTER OCCURS " +
-      "OF OFF OMITTED ON ONLY " +
-      "OPEN OPTIONAL OR ORDER ORGANIZATION " +
-      "OTHER OUTPUT OVERFLOW OWNER PACKED-DECIMAL " +
-      "PADDING PAGE PAGE-COUNTER PARSE PERFORM " +
-      "PF PH PIC PICTURE PLUS " +
-      "POINTER POSITION POSITIVE PREFIX PRESENT " +
-      "PRINTING PRIOR PROCEDURE PROCEDURE-POINTER PROCEDURES " +
-      "PROCEED PROCESS PROCESSING PROGRAM PROGRAM-ID " +
-      "PROMPT PROTECTED PURGE QUEUE QUOTE " +
-      "QUOTES RANDOM RD READ READY " +
-      "REALM RECEIVE RECONNECT RECORD RECORD-NAME " +
-      "RECORDS RECURSIVE REDEFINES REEL REFERENCE " +
-      "REFERENCE-MONITOR REFERENCES RELATION RELATIVE RELEASE " +
-      "REMAINDER REMOVAL RENAMES REPEATED REPLACE " +
-      "REPLACING REPORT REPORTING REPORTS REPOSITORY " +
-      "REQUIRED RERUN RESERVE RESET RETAINING " +
-      "RETRIEVAL RETURN RETURN-CODE RETURNING REVERSE-VIDEO " +
-      "REVERSED REWIND REWRITE RF RH " +
-      "RIGHT RIGHT-JUSTIFY ROLLBACK ROLLING ROUNDED " +
-      "RUN SAME SCREEN SD SEARCH " +
-      "SECTION SECURE SECURITY SEGMENT SEGMENT-LIMIT " +
-      "SELECT SEND SENTENCE SEPARATE SEQUENCE " +
-      "SEQUENTIAL SET SHARED SIGN SIZE " +
-      "SKIP1 SKIP2 SKIP3 SORT SORT-MERGE " +
-      "SORT-RETURN SOURCE SOURCE-COMPUTER SPACE-FILL " +
-      "SPECIAL-NAMES STANDARD STANDARD-1 STANDARD-2 " +
-      "START STARTING STATUS STOP STORE " +
-      "STRING SUB-QUEUE-1 SUB-QUEUE-2 SUB-QUEUE-3 SUB-SCHEMA " +
-      "SUBFILE SUBSTITUTE SUBTRACT SUM SUPPRESS " +
-      "SYMBOLIC SYNC SYNCHRONIZED SYSIN SYSOUT " +
-      "TABLE TALLYING TAPE TENANT TERMINAL " +
-      "TERMINATE TEST TEXT THAN THEN " +
-      "THROUGH THRU TIME TIMES TITLE " +
-      "TO TOP TRAILING TRAILING-SIGN TRANSACTION " +
-      "TYPE TYPEDEF UNDERLINE UNEQUAL UNIT " +
-      "UNSTRING UNTIL UP UPDATE UPON " +
-      "USAGE USAGE-MODE USE USING VALID " +
-      "VALIDATE VALUE VALUES VARYING VLR " +
-      "WAIT WHEN WHEN-COMPILED WITH WITHIN " +
-      "WORDS WORKING-STORAGE WRITE XML XML-CODE " +
-      "XML-EVENT XML-NTEXT XML-TEXT ZERO ZERO-FILL " );
-
-  var builtins = makeKeywords("- * ** / + < <= = > >= ");
-  var tests = {
-    digit: /\d/,
-    digit_or_colon: /[\d:]/,
-    hex: /[0-9a-f]/i,
-    sign: /[+-]/,
-    exponent: /e/i,
-    keyword_char: /[^\s\(\[\;\)\]]/,
-    symbol: /[\w*+\-]/
-  };
-  function isNumber(ch, stream){
-    // hex
-    if ( ch === '0' && stream.eat(/x/i) ) {
-      stream.eatWhile(tests.hex);
-      return true;
-    }
-    // leading sign
-    if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) {
-      stream.eat(tests.sign);
-      ch = stream.next();
-    }
-    if ( tests.digit.test(ch) ) {
-      stream.eat(ch);
-      stream.eatWhile(tests.digit);
-      if ( '.' == stream.peek()) {
-        stream.eat('.');
-        stream.eatWhile(tests.digit);
-      }
-      if ( stream.eat(tests.exponent) ) {
-        stream.eat(tests.sign);
-        stream.eatWhile(tests.digit);
-      }
-      return true;
-    }
-    return false;
-  }
-  return {
-    startState: function () {
-      return {
-        indentStack: null,
-        indentation: 0,
-        mode: false
-      };
-    },
-    token: function (stream, state) {
-      if (state.indentStack == null && stream.sol()) {
-        // update indentation, but only if indentStack is empty
-        state.indentation = 6 ; //stream.indentation();
-      }
-      // skip spaces
-      if (stream.eatSpace()) {
-        return null;
-      }
-      var returnType = null;
-      switch(state.mode){
-      case "string": // multi-line string parsing mode
-        var next = false;
-        while ((next = stream.next()) != null) {
-          if (next == "\"" || next == "\'") {
-            state.mode = false;
-            break;
-          }
-        }
-        returnType = STRING; // continue on in string mode
-        break;
-      default: // default parsing mode
-        var ch = stream.next();
-        var col = stream.column();
-        if (col >= 0 && col <= 5) {
-          returnType = COBOLLINENUM;
-        } else if (col >= 72 && col <= 79) {
-          stream.skipToEnd();
-          returnType = MODTAG;
-        } else if (ch == "*" && col == 6) { // comment
-          stream.skipToEnd(); // rest of the line is a comment
-          returnType = COMMENT;
-        } else if (ch == "\"" || ch == "\'") {
-          state.mode = "string";
-          returnType = STRING;
-        } else if (ch == "'" && !( tests.digit_or_colon.test(stream.peek()) )) {
-          returnType = ATOM;
-        } else if (ch == ".") {
-          returnType = PERIOD;
-        } else if (isNumber(ch,stream)){
-          returnType = NUMBER;
-        } else {
-          if (stream.current().match(tests.symbol)) {
-            while (col < 71) {
-              if (stream.eat(tests.symbol) === undefined) {
-                break;
-              } else {
-                col++;
-              }
-            }
-          }
-          if (keywords && keywords.propertyIsEnumerable(stream.current().toUpperCase())) {
-            returnType = KEYWORD;
-          } else if (builtins && builtins.propertyIsEnumerable(stream.current().toUpperCase())) {
-            returnType = BUILTIN;
-          } else if (atoms && atoms.propertyIsEnumerable(stream.current().toUpperCase())) {
-            returnType = ATOM;
-          } else returnType = null;
-        }
-      }
-      return returnType;
-    },
-    indent: function (state) {
-      if (state.indentStack == null) return state.indentation;
-      return state.indentStack.indent;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-cobol", "cobol");
diff --git a/resources/libs/codemirror/mode/cobol/index.html b/resources/libs/codemirror/mode/cobol/index.html
deleted file mode 100644
index 326e398b6..000000000
--- a/resources/libs/codemirror/mode/cobol/index.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: COBOL mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/neat.css">
-<link rel="stylesheet" href="../../theme/elegant.css">
-<link rel="stylesheet" href="../../theme/erlang-dark.css">
-<link rel="stylesheet" href="../../theme/night.css">
-<link rel="stylesheet" href="../../theme/monokai.css">
-<link rel="stylesheet" href="../../theme/cobalt.css">
-<link rel="stylesheet" href="../../theme/eclipse.css">
-<link rel="stylesheet" href="../../theme/rubyblue.css">
-<link rel="stylesheet" href="../../theme/lesser-dark.css">
-<link rel="stylesheet" href="../../theme/xq-dark.css">
-<link rel="stylesheet" href="../../theme/xq-light.css">
-<link rel="stylesheet" href="../../theme/ambiance.css">
-<link rel="stylesheet" href="../../theme/blackboard.css">
-<link rel="stylesheet" href="../../theme/vibrant-ink.css">
-<link rel="stylesheet" href="../../theme/solarized.css">
-<link rel="stylesheet" href="../../theme/twilight.css">
-<link rel="stylesheet" href="../../theme/midnight.css">
-<link rel="stylesheet" href="../../addon/dialog/dialog.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="cobol.js"></script>
-<script src="../../addon/selection/active-line.js"></script>
-<script src="../../addon/search/search.js"></script>
-<script src="../../addon/dialog/dialog.js"></script>
-<script src="../../addon/search/searchcursor.js"></script>
-<style>
-        .CodeMirror {
-          border: 1px solid #eee;
-          font-size : 20px;
-          height : auto !important;
-        }
-        .CodeMirror-activeline-background {background: #555555 !important;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">COBOL</a>
-  </ul>
-</div>
-
-<article>
-<h2>COBOL mode</h2>
-
-    <p> Select Theme <select onchange="selectTheme()" id="selectTheme">
-        <option>default</option>
-        <option>ambiance</option>
-        <option>blackboard</option>
-        <option>cobalt</option>
-        <option>eclipse</option>
-        <option>elegant</option>
-        <option>erlang-dark</option>
-        <option>lesser-dark</option>
-        <option>midnight</option>
-        <option>monokai</option>
-        <option>neat</option>
-        <option>night</option>
-        <option>rubyblue</option>
-        <option>solarized dark</option>
-        <option>solarized light</option>
-        <option selected>twilight</option>
-        <option>vibrant-ink</option>
-        <option>xq-dark</option>
-        <option>xq-light</option>
-    </select>    Select Font Size <select onchange="selectFontsize()" id="selectFontSize">
-          <option value="13px">13px</option>
-          <option value="14px">14px</option>
-          <option value="16px">16px</option>
-          <option value="18px">18px</option>
-          <option value="20px" selected="selected">20px</option>
-          <option value="24px">24px</option>
-          <option value="26px">26px</option>
-          <option value="28px">28px</option>
-          <option value="30px">30px</option>
-          <option value="32px">32px</option>
-          <option value="34px">34px</option>
-          <option value="36px">36px</option>
-        </select>
-<label for="checkBoxReadOnly">Read-only</label>
-<input type="checkbox" id="checkBoxReadOnly" onchange="selectReadOnly()">
-<label for="id_tabToIndentSpace">Insert Spaces on Tab</label>
-<input type="checkbox" id="id_tabToIndentSpace" onchange="tabToIndentSpace()">
-</p>
-<textarea id="code" name="code">
----------1---------2---------3---------4---------5---------6---------7---------8
-12345678911234567892123456789312345678941234567895123456789612345678971234567898
-000010 IDENTIFICATION DIVISION.                                        MODTGHERE
-000020 PROGRAM-ID.       SAMPLE.
-000030 AUTHOR.           TEST SAM. 
-000040 DATE-WRITTEN.     5 February 2013
-000041
-000042* A sample program just to show the form.
-000043* The program copies its input to the output,
-000044* and counts the number of records.
-000045* At the end this number is printed.
-000046
-000050 ENVIRONMENT DIVISION.
-000060 INPUT-OUTPUT SECTION.
-000070 FILE-CONTROL.
-000080     SELECT STUDENT-FILE     ASSIGN TO SYSIN
-000090         ORGANIZATION IS LINE SEQUENTIAL.
-000100     SELECT PRINT-FILE       ASSIGN TO SYSOUT
-000110         ORGANIZATION IS LINE SEQUENTIAL.
-000120
-000130 DATA DIVISION.
-000140 FILE SECTION.
-000150 FD  STUDENT-FILE
-000160     RECORD CONTAINS 43 CHARACTERS
-000170     DATA RECORD IS STUDENT-IN.
-000180 01  STUDENT-IN              PIC X(43).
-000190
-000200 FD  PRINT-FILE
-000210     RECORD CONTAINS 80 CHARACTERS
-000220     DATA RECORD IS PRINT-LINE.
-000230 01  PRINT-LINE              PIC X(80).
-000240
-000250 WORKING-STORAGE SECTION.
-000260 01  DATA-REMAINS-SWITCH     PIC X(2)      VALUE SPACES.
-000261 01  RECORDS-WRITTEN         PIC 99.
-000270
-000280 01  DETAIL-LINE.
-000290     05  FILLER              PIC X(7)      VALUE SPACES.
-000300     05  RECORD-IMAGE        PIC X(43).
-000310     05  FILLER              PIC X(30)     VALUE SPACES.
-000311 
-000312 01  SUMMARY-LINE.
-000313     05  FILLER              PIC X(7)      VALUE SPACES.
-000314     05  TOTAL-READ          PIC 99.
-000315     05  FILLER              PIC X         VALUE SPACE.
-000316     05  FILLER              PIC X(17)     
-000317                 VALUE  'Records were read'.
-000318     05  FILLER              PIC X(53)     VALUE SPACES.
-000319
-000320 PROCEDURE DIVISION.
-000321
-000330 PREPARE-SENIOR-REPORT.
-000340     OPEN INPUT  STUDENT-FILE
-000350          OUTPUT PRINT-FILE.
-000351     MOVE ZERO TO RECORDS-WRITTEN.
-000360     READ STUDENT-FILE
-000370         AT END MOVE 'NO' TO DATA-REMAINS-SWITCH
-000380     END-READ.
-000390     PERFORM PROCESS-RECORDS
-000410         UNTIL DATA-REMAINS-SWITCH = 'NO'.
-000411     PERFORM PRINT-SUMMARY.
-000420     CLOSE STUDENT-FILE
-000430           PRINT-FILE.
-000440     STOP RUN.
-000450
-000460 PROCESS-RECORDS.
-000470     MOVE STUDENT-IN TO RECORD-IMAGE.
-000480     MOVE DETAIL-LINE TO PRINT-LINE.
-000490     WRITE PRINT-LINE.
-000500     ADD 1 TO RECORDS-WRITTEN.
-000510     READ STUDENT-FILE
-000520         AT END MOVE 'NO' TO DATA-REMAINS-SWITCH
-000530     END-READ. 
-000540
-000550 PRINT-SUMMARY.
-000560     MOVE RECORDS-WRITTEN TO TOTAL-READ.
-000570     MOVE SUMMARY-LINE TO PRINT-LINE.
-000571     WRITE PRINT-LINE. 
-000572
-000580
-</textarea>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-cobol",
-        theme : "twilight",
-        styleActiveLine: true,
-        showCursorWhenSelecting : true,  
-      });
-      function selectTheme() {
-        var themeInput = document.getElementById("selectTheme");
-        var theme = themeInput.options[themeInput.selectedIndex].innerHTML;
-        editor.setOption("theme", theme);
-      }
-      function selectFontsize() {
-        var fontSizeInput = document.getElementById("selectFontSize");
-        var fontSize = fontSizeInput.options[fontSizeInput.selectedIndex].innerHTML;
-        editor.getWrapperElement().style["font-size"] = fontSize;
-        editor.refresh();
-      }
-      function selectReadOnly() {
-        editor.setOption("readOnly", document.getElementById("checkBoxReadOnly").checked);
-      }
-      function tabToIndentSpace() {
-        if (document.getElementById("id_tabToIndentSpace").checked) {
-            editor.setOption("extraKeys", {Tab: function(cm) { cm.replaceSelection("    ", "end"); }});
-        } else {
-            editor.setOption("extraKeys", {Tab: function(cm) { cm.replaceSelection("    ", "end"); }});
-        }
-      }
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/mode/coffeescript/coffeescript.js b/resources/libs/codemirror/mode/coffeescript/coffeescript.js
deleted file mode 100644
index e8bfe48a2..000000000
--- a/resources/libs/codemirror/mode/coffeescript/coffeescript.js
+++ /dev/null
@@ -1,354 +0,0 @@
-/**
- * Link to the project's GitHub page:
- * https://github.com/pickhardt/coffeescript-codemirror-mode
- */
-CodeMirror.defineMode("coffeescript", function(conf) {
-  var ERRORCLASS = "error";
-
-  function wordRegexp(words) {
-    return new RegExp("^((" + words.join(")|(") + "))\\b");
-  }
-
-  var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?)/;
-  var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
-  var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/;
-  var properties = /^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/;
-
-  var wordOperators = wordRegexp(["and", "or", "not",
-                                  "is", "isnt", "in",
-                                  "instanceof", "typeof"]);
-  var indentKeywords = ["for", "while", "loop", "if", "unless", "else",
-                        "switch", "try", "catch", "finally", "class"];
-  var commonKeywords = ["break", "by", "continue", "debugger", "delete",
-                        "do", "in", "of", "new", "return", "then",
-                        "this", "throw", "when", "until"];
-
-  var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
-
-  indentKeywords = wordRegexp(indentKeywords);
-
-
-  var stringPrefixes = /^('{3}|\"{3}|['\"])/;
-  var regexPrefixes = /^(\/{3}|\/)/;
-  var commonConstants = ["Infinity", "NaN", "undefined", "null", "true", "false", "on", "off", "yes", "no"];
-  var constants = wordRegexp(commonConstants);
-
-  // Tokenizers
-  function tokenBase(stream, state) {
-    // Handle scope changes
-    if (stream.sol()) {
-      if (state.scope.align === null) state.scope.align = false;
-      var scopeOffset = state.scope.offset;
-      if (stream.eatSpace()) {
-        var lineOffset = stream.indentation();
-        if (lineOffset > scopeOffset && state.scope.type == "coffee") {
-          return "indent";
-        } else if (lineOffset < scopeOffset) {
-          return "dedent";
-        }
-        return null;
-      } else {
-        if (scopeOffset > 0) {
-          dedent(stream, state);
-        }
-      }
-    }
-    if (stream.eatSpace()) {
-      return null;
-    }
-
-    var ch = stream.peek();
-
-    // Handle docco title comment (single line)
-    if (stream.match("####")) {
-      stream.skipToEnd();
-      return "comment";
-    }
-
-    // Handle multi line comments
-    if (stream.match("###")) {
-      state.tokenize = longComment;
-      return state.tokenize(stream, state);
-    }
-
-    // Single line comment
-    if (ch === "#") {
-      stream.skipToEnd();
-      return "comment";
-    }
-
-    // Handle number literals
-    if (stream.match(/^-?[0-9\.]/, false)) {
-      var floatLiteral = false;
-      // Floats
-      if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)) {
-        floatLiteral = true;
-      }
-      if (stream.match(/^-?\d+\.\d*/)) {
-        floatLiteral = true;
-      }
-      if (stream.match(/^-?\.\d+/)) {
-        floatLiteral = true;
-      }
-
-      if (floatLiteral) {
-        // prevent from getting extra . on 1..
-        if (stream.peek() == "."){
-          stream.backUp(1);
-        }
-        return "number";
-      }
-      // Integers
-      var intLiteral = false;
-      // Hex
-      if (stream.match(/^-?0x[0-9a-f]+/i)) {
-        intLiteral = true;
-      }
-      // Decimal
-      if (stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)) {
-        intLiteral = true;
-      }
-      // Zero by itself with no other piece of number.
-      if (stream.match(/^-?0(?![\dx])/i)) {
-        intLiteral = true;
-      }
-      if (intLiteral) {
-        return "number";
-      }
-    }
-
-    // Handle strings
-    if (stream.match(stringPrefixes)) {
-      state.tokenize = tokenFactory(stream.current(), "string");
-      return state.tokenize(stream, state);
-    }
-    // Handle regex literals
-    if (stream.match(regexPrefixes)) {
-      if (stream.current() != "/" || stream.match(/^.*\//, false)) { // prevent highlight of division
-        state.tokenize = tokenFactory(stream.current(), "string-2");
-        return state.tokenize(stream, state);
-      } else {
-        stream.backUp(1);
-      }
-    }
-
-    // Handle operators and delimiters
-    if (stream.match(operators) || stream.match(wordOperators)) {
-      return "operator";
-    }
-    if (stream.match(delimiters)) {
-      return "punctuation";
-    }
-
-    if (stream.match(constants)) {
-      return "atom";
-    }
-
-    if (stream.match(keywords)) {
-      return "keyword";
-    }
-
-    if (stream.match(identifiers)) {
-      return "variable";
-    }
-
-    if (stream.match(properties)) {
-      return "property";
-    }
-
-    // Handle non-detected items
-    stream.next();
-    return ERRORCLASS;
-  }
-
-  function tokenFactory(delimiter, outclass) {
-    var singleline = delimiter.length == 1;
-    return function(stream, state) {
-      while (!stream.eol()) {
-        stream.eatWhile(/[^'"\/\\]/);
-        if (stream.eat("\\")) {
-          stream.next();
-          if (singleline && stream.eol()) {
-            return outclass;
-          }
-        } else if (stream.match(delimiter)) {
-          state.tokenize = tokenBase;
-          return outclass;
-        } else {
-          stream.eat(/['"\/]/);
-        }
-      }
-      if (singleline) {
-        if (conf.mode.singleLineStringErrors) {
-          outclass = ERRORCLASS;
-        } else {
-          state.tokenize = tokenBase;
-        }
-      }
-      return outclass;
-    };
-  }
-
-  function longComment(stream, state) {
-    while (!stream.eol()) {
-      stream.eatWhile(/[^#]/);
-      if (stream.match("###")) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      stream.eatWhile("#");
-    }
-    return "comment";
-  }
-
-  function indent(stream, state, type) {
-    type = type || "coffee";
-    var offset = 0, align = false, alignOffset = null;
-    for (var scope = state.scope; scope; scope = scope.prev) {
-      if (scope.type === "coffee") {
-        offset = scope.offset + conf.indentUnit;
-        break;
-      }
-    }
-    if (type !== "coffee") {
-      align = null;
-      alignOffset = stream.column() + stream.current().length;
-    } else if (state.scope.align) {
-      state.scope.align = false;
-    }
-    state.scope = {
-      offset: offset,
-      type: type,
-      prev: state.scope,
-      align: align,
-      alignOffset: alignOffset
-    };
-  }
-
-  function dedent(stream, state) {
-    if (!state.scope.prev) return;
-    if (state.scope.type === "coffee") {
-      var _indent = stream.indentation();
-      var matched = false;
-      for (var scope = state.scope; scope; scope = scope.prev) {
-        if (_indent === scope.offset) {
-          matched = true;
-          break;
-        }
-      }
-      if (!matched) {
-        return true;
-      }
-      while (state.scope.prev && state.scope.offset !== _indent) {
-        state.scope = state.scope.prev;
-      }
-      return false;
-    } else {
-      state.scope = state.scope.prev;
-      return false;
-    }
-  }
-
-  function tokenLexer(stream, state) {
-    var style = state.tokenize(stream, state);
-    var current = stream.current();
-
-    // Handle "." connected identifiers
-    if (current === ".") {
-      style = state.tokenize(stream, state);
-      current = stream.current();
-      if (/^\.[\w$]+$/.test(current)) {
-        return "variable";
-      } else {
-        return ERRORCLASS;
-      }
-    }
-
-    // Handle scope changes.
-    if (current === "return") {
-      state.dedent += 1;
-    }
-    if (((current === "->" || current === "=>") &&
-         !state.lambda &&
-         !stream.peek())
-        || style === "indent") {
-      indent(stream, state);
-    }
-    var delimiter_index = "[({".indexOf(current);
-    if (delimiter_index !== -1) {
-      indent(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
-    }
-    if (indentKeywords.exec(current)){
-      indent(stream, state);
-    }
-    if (current == "then"){
-      dedent(stream, state);
-    }
-
-
-    if (style === "dedent") {
-      if (dedent(stream, state)) {
-        return ERRORCLASS;
-      }
-    }
-    delimiter_index = "])}".indexOf(current);
-    if (delimiter_index !== -1) {
-      while (state.scope.type == "coffee" && state.scope.prev)
-        state.scope = state.scope.prev;
-      if (state.scope.type == current)
-        state.scope = state.scope.prev;
-    }
-    if (state.dedent > 0 && stream.eol() && state.scope.type == "coffee") {
-      if (state.scope.prev) state.scope = state.scope.prev;
-      state.dedent -= 1;
-    }
-
-    return style;
-  }
-
-  var external = {
-    startState: function(basecolumn) {
-      return {
-        tokenize: tokenBase,
-        scope: {offset:basecolumn || 0, type:"coffee", prev: null, align: false},
-        lastToken: null,
-        lambda: false,
-        dedent: 0
-      };
-    },
-
-    token: function(stream, state) {
-      var fillAlign = state.scope.align === null && state.scope;
-      if (fillAlign && stream.sol()) fillAlign.align = false;
-
-      var style = tokenLexer(stream, state);
-      if (fillAlign && style && style != "comment") fillAlign.align = true;
-
-      state.lastToken = {style:style, content: stream.current()};
-
-      if (stream.eol() && stream.lambda) {
-        state.lambda = false;
-      }
-
-      return style;
-    },
-
-    indent: function(state, text) {
-      if (state.tokenize != tokenBase) return 0;
-      var scope = state.scope;
-      var closer = text && "])}".indexOf(text.charAt(0)) > -1;
-      if (closer) while (scope.type == "coffee" && scope.prev) scope = scope.prev;
-      var closes = closer && scope.type === text.charAt(0);
-      if (scope.align)
-        return scope.alignOffset - (closes ? 1 : 0);
-      else
-        return (closes ? scope.prev : scope).offset;
-    },
-
-    lineComment: "#",
-    fold: "indent"
-  };
-  return external;
-});
-
-CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");
diff --git a/resources/libs/codemirror/mode/coffeescript/index.html b/resources/libs/codemirror/mode/coffeescript/index.html
deleted file mode 100644
index 6e6fde52e..000000000
--- a/resources/libs/codemirror/mode/coffeescript/index.html
+++ /dev/null
@@ -1,740 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: CoffeeScript mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="coffeescript.js"></script>
-<style>.CodeMirror {border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">CoffeeScript</a>
-  </ul>
-</div>
-
-<article>
-<h2>CoffeeScript mode</h2>
-<form><textarea id="code" name="code">
-# CoffeeScript mode for CodeMirror
-# Copyright (c) 2011 Jeff Pickhardt, released under
-# the MIT License.
-#
-# Modified from the Python CodeMirror mode, which also is 
-# under the MIT License Copyright (c) 2010 Timothy Farrell.
-#
-# The following script, Underscore.coffee, is used to 
-# demonstrate CoffeeScript mode for CodeMirror.
-#
-# To download CoffeeScript mode for CodeMirror, go to:
-# https://github.com/pickhardt/coffeescript-codemirror-mode
-
-# **Underscore.coffee
-# (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.**
-# Underscore is freely distributable under the terms of the
-# [MIT license](http://en.wikipedia.org/wiki/MIT_License).
-# Portions of Underscore are inspired by or borrowed from
-# [Prototype.js](http://prototypejs.org/api), Oliver Steele's
-# [Functional](http://osteele.com), and John Resig's
-# [Micro-Templating](http://ejohn.org).
-# For all details and documentation:
-# http://documentcloud.github.com/underscore/
-
-
-# Baseline setup
-# --------------
-
-# Establish the root object, `window` in the browser, or `global` on the server.
-root = this
-
-
-# Save the previous value of the `_` variable.
-previousUnderscore = root._
-
-### Multiline
-    comment
-###
-
-# Establish the object that gets thrown to break out of a loop iteration.
-# `StopIteration` is SOP on Mozilla.
-breaker = if typeof(StopIteration) is 'undefined' then '__break__' else StopIteration
-
-
-#### Docco style single line comment (title)
-
-
-# Helper function to escape **RegExp** contents, because JS doesn't have one.
-escapeRegExp = (string) -> string.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1')
-
-
-# Save bytes in the minified (but not gzipped) version:
-ArrayProto = Array.prototype
-ObjProto = Object.prototype
-
-
-# Create quick reference variables for speed access to core prototypes.
-slice = ArrayProto.slice
-unshift = ArrayProto.unshift
-toString = ObjProto.toString
-hasOwnProperty = ObjProto.hasOwnProperty
-propertyIsEnumerable = ObjProto.propertyIsEnumerable
-
-
-# All **ECMA5** native implementations we hope to use are declared here.
-nativeForEach = ArrayProto.forEach
-nativeMap = ArrayProto.map
-nativeReduce = ArrayProto.reduce
-nativeReduceRight = ArrayProto.reduceRight
-nativeFilter = ArrayProto.filter
-nativeEvery = ArrayProto.every
-nativeSome = ArrayProto.some
-nativeIndexOf = ArrayProto.indexOf
-nativeLastIndexOf = ArrayProto.lastIndexOf
-nativeIsArray = Array.isArray
-nativeKeys = Object.keys
-
-
-# Create a safe reference to the Underscore object for use below.
-_ = (obj) -> new wrapper(obj)
-
-
-# Export the Underscore object for **CommonJS**.
-if typeof(exports) != 'undefined' then exports._ = _
-
-
-# Export Underscore to global scope.
-root._ = _
-
-
-# Current version.
-_.VERSION = '1.1.0'
-
-
-# Collection Functions
-# --------------------
-
-# The cornerstone, an **each** implementation.
-# Handles objects implementing **forEach**, arrays, and raw objects.
-_.each = (obj, iterator, context) ->
-  try
-    if nativeForEach and obj.forEach is nativeForEach
-      obj.forEach iterator, context
-    else if _.isNumber obj.length
-      iterator.call context, obj[i], i, obj for i in [0...obj.length]
-    else
-      iterator.call context, val, key, obj for own key, val of obj
-  catch e
-    throw e if e isnt breaker
-  obj
-
-
-# Return the results of applying the iterator to each element. Use JavaScript
-# 1.6's version of **map**, if possible.
-_.map = (obj, iterator, context) ->
-  return obj.map(iterator, context) if nativeMap and obj.map is nativeMap
-  results = []
-  _.each obj, (value, index, list) ->
-    results.push iterator.call context, value, index, list
-  results
-
-
-# **Reduce** builds up a single result from a list of values. Also known as
-# **inject**, or **foldl**. Uses JavaScript 1.8's version of **reduce**, if possible.
-_.reduce = (obj, iterator, memo, context) ->
-  if nativeReduce and obj.reduce is nativeReduce
-    iterator = _.bind iterator, context if context
-    return obj.reduce iterator, memo
-  _.each obj, (value, index, list) ->
-    memo = iterator.call context, memo, value, index, list
-  memo
-
-
-# The right-associative version of **reduce**, also known as **foldr**. Uses
-# JavaScript 1.8's version of **reduceRight**, if available.
-_.reduceRight = (obj, iterator, memo, context) ->
-  if nativeReduceRight and obj.reduceRight is nativeReduceRight
-    iterator = _.bind iterator, context if context
-    return obj.reduceRight iterator, memo
-  reversed = _.clone(_.toArray(obj)).reverse()
-  _.reduce reversed, iterator, memo, context
-
-
-# Return the first value which passes a truth test.
-_.detect = (obj, iterator, context) ->
-  result = null
-  _.each obj, (value, index, list) ->
-    if iterator.call context, value, index, list
-      result = value
-      _.breakLoop()
-  result
-
-
-# Return all the elements that pass a truth test. Use JavaScript 1.6's
-# **filter**, if it exists.
-_.filter = (obj, iterator, context) ->
-  return obj.filter iterator, context if nativeFilter and obj.filter is nativeFilter
-  results = []
-  _.each obj, (value, index, list) ->
-    results.push value if iterator.call context, value, index, list
-  results
-
-
-# Return all the elements for which a truth test fails.
-_.reject = (obj, iterator, context) ->
-  results = []
-  _.each obj, (value, index, list) ->
-    results.push value if not iterator.call context, value, index, list
-  results
-
-
-# Determine whether all of the elements match a truth test. Delegate to
-# JavaScript 1.6's **every**, if it is present.
-_.every = (obj, iterator, context) ->
-  iterator ||= _.identity
-  return obj.every iterator, context if nativeEvery and obj.every is nativeEvery
-  result = true
-  _.each obj, (value, index, list) ->
-    _.breakLoop() unless (result = result and iterator.call(context, value, index, list))
-  result
-
-
-# Determine if at least one element in the object matches a truth test. Use
-# JavaScript 1.6's **some**, if it exists.
-_.some = (obj, iterator, context) ->
-  iterator ||= _.identity
-  return obj.some iterator, context if nativeSome and obj.some is nativeSome
-  result = false
-  _.each obj, (value, index, list) ->
-    _.breakLoop() if (result = iterator.call(context, value, index, list))
-  result
-
-
-# Determine if a given value is included in the array or object,
-# based on `===`.
-_.include = (obj, target) ->
-  return _.indexOf(obj, target) isnt -1 if nativeIndexOf and obj.indexOf is nativeIndexOf
-  return true for own key, val of obj when val is target
-  false
-
-
-# Invoke a method with arguments on every item in a collection.
-_.invoke = (obj, method) ->
-  args = _.rest arguments, 2
-  (if method then val[method] else val).apply(val, args) for val in obj
-
-
-# Convenience version of a common use case of **map**: fetching a property.
-_.pluck = (obj, key) ->
-  _.map(obj, (val) -> val[key])
-
-
-# Return the maximum item or (item-based computation).
-_.max = (obj, iterator, context) ->
-  return Math.max.apply(Math, obj) if not iterator and _.isArray(obj)
-  result = computed: -Infinity
-  _.each obj, (value, index, list) ->
-    computed = if iterator then iterator.call(context, value, index, list) else value
-    computed >= result.computed and (result = {value: value, computed: computed})
-  result.value
-
-
-# Return the minimum element (or element-based computation).
-_.min = (obj, iterator, context) ->
-  return Math.min.apply(Math, obj) if not iterator and _.isArray(obj)
-  result = computed: Infinity
-  _.each obj, (value, index, list) ->
-    computed = if iterator then iterator.call(context, value, index, list) else value
-    computed < result.computed and (result = {value: value, computed: computed})
-  result.value
-
-
-# Sort the object's values by a criterion produced by an iterator.
-_.sortBy = (obj, iterator, context) ->
-  _.pluck(((_.map obj, (value, index, list) ->
-    {value: value, criteria: iterator.call(context, value, index, list)}
-  ).sort((left, right) ->
-    a = left.criteria; b = right.criteria
-    if a < b then -1 else if a > b then 1 else 0
-  )), 'value')
-
-
-# Use a comparator function to figure out at what index an object should
-# be inserted so as to maintain order. Uses binary search.
-_.sortedIndex = (array, obj, iterator) ->
-  iterator ||= _.identity
-  low = 0
-  high = array.length
-  while low < high
-    mid = (low + high) >> 1
-    if iterator(array[mid]) < iterator(obj) then low = mid + 1 else high = mid
-  low
-
-
-# Convert anything iterable into a real, live array.
-_.toArray = (iterable) ->
-  return [] if (!iterable)
-  return iterable.toArray() if (iterable.toArray)
-  return iterable if (_.isArray(iterable))
-  return slice.call(iterable) if (_.isArguments(iterable))
-  _.values(iterable)
-
-
-# Return the number of elements in an object.
-_.size = (obj) -> _.toArray(obj).length
-
-
-# Array Functions
-# ---------------
-
-# Get the first element of an array. Passing `n` will return the first N
-# values in the array. Aliased as **head**. The `guard` check allows it to work
-# with **map**.
-_.first = (array, n, guard) ->
-  if n and not guard then slice.call(array, 0, n) else array[0]
-
-
-# Returns everything but the first entry of the array. Aliased as **tail**.
-# Especially useful on the arguments object. Passing an `index` will return
-# the rest of the values in the array from that index onward. The `guard`
-# check allows it to work with **map**.
-_.rest = (array, index, guard) ->
-  slice.call(array, if _.isUndefined(index) or guard then 1 else index)
-
-
-# Get the last element of an array.
-_.last = (array) -> array[array.length - 1]
-
-
-# Trim out all falsy values from an array.
-_.compact = (array) -> item for item in array when item
-
-
-# Return a completely flattened version of an array.
-_.flatten = (array) ->
-  _.reduce array, (memo, value) ->
-    return memo.concat(_.flatten(value)) if _.isArray value
-    memo.push value
-    memo
-  , []
-
-
-# Return a version of the array that does not contain the specified value(s).
-_.without = (array) ->
-  values = _.rest arguments
-  val for val in _.toArray(array) when not _.include values, val
-
-
-# Produce a duplicate-free version of the array. If the array has already
-# been sorted, you have the option of using a faster algorithm.
-_.uniq = (array, isSorted) ->
-  memo = []
-  for el, i in _.toArray array
-    memo.push el if i is 0 || (if isSorted is true then _.last(memo) isnt el else not _.include(memo, el))
-  memo
-
-
-# Produce an array that contains every item shared between all the
-# passed-in arrays.
-_.intersect = (array) ->
-  rest = _.rest arguments
-  _.select _.uniq(array), (item) ->
-    _.all rest, (other) ->
-      _.indexOf(other, item) >= 0
-
-
-# Zip together multiple lists into a single array -- elements that share
-# an index go together.
-_.zip = ->
-  length = _.max _.pluck arguments, 'length'
-  results = new Array length
-  for i in [0...length]
-    results[i] = _.pluck arguments, String i
-  results
-
-
-# If the browser doesn't supply us with **indexOf** (I'm looking at you, MSIE),
-# we need this function. Return the position of the first occurrence of an
-# item in an array, or -1 if the item is not included in the array.
-_.indexOf = (array, item) ->
-  return array.indexOf item if nativeIndexOf and array.indexOf is nativeIndexOf
-  i = 0; l = array.length
-  while l - i
-    if array[i] is item then return i else i++
-  -1
-
-
-# Provide JavaScript 1.6's **lastIndexOf**, delegating to the native function,
-# if possible.
-_.lastIndexOf = (array, item) ->
-  return array.lastIndexOf(item) if nativeLastIndexOf and array.lastIndexOf is nativeLastIndexOf
-  i = array.length
-  while i
-    if array[i] is item then return i else i--
-  -1
-
-
-# Generate an integer Array containing an arithmetic progression. A port of
-# [the native Python **range** function](http://docs.python.org/library/functions.html#range).
-_.range = (start, stop, step) ->
-  a = arguments
-  solo = a.length <= 1
-  i = start = if solo then 0 else a[0]
-  stop = if solo then a[0] else a[1]
-  step = a[2] or 1
-  len = Math.ceil((stop - start) / step)
-  return [] if len <= 0
-  range = new Array len
-  idx = 0
-  loop
-    return range if (if step > 0 then i - stop else stop - i) >= 0
-    range[idx] = i
-    idx++
-    i+= step
-
-
-# Function Functions
-# ------------------
-
-# Create a function bound to a given object (assigning `this`, and arguments,
-# optionally). Binding with arguments is also known as **curry**.
-_.bind = (func, obj) ->
-  args = _.rest arguments, 2
-  -> func.apply obj or root, args.concat arguments
-
-
-# Bind all of an object's methods to that object. Useful for ensuring that
-# all callbacks defined on an object belong to it.
-_.bindAll = (obj) ->
-  funcs = if arguments.length > 1 then _.rest(arguments) else _.functions(obj)
-  _.each funcs, (f) -> obj[f] = _.bind obj[f], obj
-  obj
-
-
-# Delays a function for the given number of milliseconds, and then calls
-# it with the arguments supplied.
-_.delay = (func, wait) ->
-  args = _.rest arguments, 2
-  setTimeout((-> func.apply(func, args)), wait)
-
-
-# Memoize an expensive function by storing its results.
-_.memoize = (func, hasher) ->
-  memo = {}
-  hasher or= _.identity
-  ->
-    key = hasher.apply this, arguments
-    return memo[key] if key of memo
-    memo[key] = func.apply this, arguments
-
-
-# Defers a function, scheduling it to run after the current call stack has
-# cleared.
-_.defer = (func) ->
-  _.delay.apply _, [func, 1].concat _.rest arguments
-
-
-# Returns the first function passed as an argument to the second,
-# allowing you to adjust arguments, run code before and after, and
-# conditionally execute the original function.
-_.wrap = (func, wrapper) ->
-  -> wrapper.apply wrapper, [func].concat arguments
-
-
-# Returns a function that is the composition of a list of functions, each
-# consuming the return value of the function that follows.
-_.compose = ->
-  funcs = arguments
-  ->
-    args = arguments
-    for i in [funcs.length - 1..0] by -1
-      args = [funcs[i].apply(this, args)]
-    args[0]
-
-
-# Object Functions
-# ----------------
-
-# Retrieve the names of an object's properties.
-_.keys = nativeKeys or (obj) ->
-  return _.range 0, obj.length if _.isArray(obj)
-  key for key, val of obj
-
-
-# Retrieve the values of an object's properties.
-_.values = (obj) ->
-  _.map obj, _.identity
-
-
-# Return a sorted list of the function names available in Underscore.
-_.functions = (obj) ->
-  _.filter(_.keys(obj), (key) -> _.isFunction(obj[key])).sort()
-
-
-# Extend a given object with all of the properties in a source object.
-_.extend = (obj) ->
-  for source in _.rest(arguments)
-    obj[key] = val for key, val of source
-  obj
-
-
-# Create a (shallow-cloned) duplicate of an object.
-_.clone = (obj) ->
-  return obj.slice 0 if _.isArray obj
-  _.extend {}, obj
-
-
-# Invokes interceptor with the obj, and then returns obj.
-# The primary purpose of this method is to "tap into" a method chain,
-# in order to perform operations on intermediate results within
- the chain.
-_.tap = (obj, interceptor) ->
-  interceptor obj
-  obj
-
-
-# Perform a deep comparison to check if two objects are equal.
-_.isEqual = (a, b) ->
-  # Check object identity.
-  return true if a is b
-  # Different types?
-  atype = typeof(a); btype = typeof(b)
-  return false if atype isnt btype
-  # Basic equality test (watch out for coercions).
-  return true if `a == b`
-  # One is falsy and the other truthy.
-  return false if (!a and b) or (a and !b)
-  # One of them implements an `isEqual()`?
-  return a.isEqual(b) if a.isEqual
-  # Check dates' integer values.
-  return a.getTime() is b.getTime() if _.isDate(a) and _.isDate(b)
-  # Both are NaN?
-  return false if _.isNaN(a) and _.isNaN(b)
-  # Compare regular expressions.
-  if _.isRegExp(a) and _.isRegExp(b)
-    return a.source is b.source and
-           a.global is b.global and
-           a.ignoreCase is b.ignoreCase and
-           a.multiline is b.multiline
-  # If a is not an object by this point, we can't handle it.
-  return false if atype isnt 'object'
-  # Check for different array lengths before comparing contents.
-  return false if a.length and (a.length isnt b.length)
-  # Nothing else worked, deep compare the contents.
-  aKeys = _.keys(a); bKeys = _.keys(b)
-  # Different object sizes?
-  return false if aKeys.length isnt bKeys.length
-  # Recursive comparison of contents.
-  return false for key, val of a when !(key of b) or !_.isEqual(val, b[key])
-  true
-
-
-# Is a given array or object empty?
-_.isEmpty = (obj) ->
-  return obj.length is 0 if _.isArray(obj) or _.isString(obj)
-  return false for own key of obj
-  true
-
-
-# Is a given value a DOM element?
-_.isElement = (obj) -> obj and obj.nodeType is 1
-
-
-# Is a given value an array?
-_.isArray = nativeIsArray or (obj) -> !!(obj and obj.concat and obj.unshift and not obj.callee)
-
-
-# Is a given variable an arguments object?
-_.isArguments = (obj) -> obj and obj.callee
-
-
-# Is the given value a function?
-_.isFunction = (obj) -> !!(obj and obj.constructor and obj.call and obj.apply)
-
-
-# Is the given value a string?
-_.isString = (obj) -> !!(obj is '' or (obj and obj.charCodeAt and obj.substr))
-
-
-# Is a given value a number?
-_.isNumber = (obj) -> (obj is +obj) or toString.call(obj) is '[object Number]'
-
-
-# Is a given value a boolean?
-_.isBoolean = (obj) -> obj is true or obj is false
-
-
-# Is a given value a Date?
-_.isDate = (obj) -> !!(obj and obj.getTimezoneOffset and obj.setUTCFullYear)
-
-
-# Is the given value a regular expression?
-_.isRegExp = (obj) -> !!(obj and obj.exec and (obj.ignoreCase or obj.ignoreCase is false))
-
-
-# Is the given value NaN -- this one is interesting. `NaN != NaN`, and
-# `isNaN(undefined) == true`, so we make sure it's a number first.
-_.isNaN = (obj) -> _.isNumber(obj) and window.isNaN(obj)
-
-
-# Is a given value equal to null?
-_.isNull = (obj) -> obj is null
-
-
-# Is a given variable undefined?
-_.isUndefined = (obj) -> typeof obj is 'undefined'
-
-
-# Utility Functions
-# -----------------
-
-# Run Underscore.js in noConflict mode, returning the `_` variable to its
-# previous owner. Returns a reference to the Underscore object.
-_.noConflict = ->
-  root._ = previousUnderscore
-  this
-
-
-# Keep the identity function around for default iterators.
-_.identity = (value) -> value
-
-
-# Run a function `n` times.
-_.times = (n, iterator, context) ->
-  iterator.call context, i for i in [0...n]
-
-
-# Break out of the middle of an iteration.
-_.breakLoop = -> throw breaker
-
-
-# Add your own custom functions to the Underscore object, ensuring that
-# they're correctly added to the OOP wrapper as well.
-_.mixin = (obj) ->
-  for name in _.functions(obj)
-    addToWrapper name, _[name] = obj[name]
-
-
-# Generate a unique integer id (unique within the entire client session).
-# Useful for temporary DOM ids.
-idCounter = 0
-_.uniqueId = (prefix) ->
-  (prefix or '') + idCounter++
-
-
-# By default, Underscore uses **ERB**-style template delimiters, change the
-# following template settings to use alternative delimiters.
-_.templateSettings = {
-  start: '<%'
-  end: '%>'
-  interpolate: /<%=(.+?)%>/g
-}
-
-
-# JavaScript templating a-la **ERB**, pilfered from John Resig's
-# *Secrets of the JavaScript Ninja*, page 83.
-# Single-quote fix from Rick Strahl.
-# With alterations for arbitrary delimiters, and to preserve whitespace.
-_.template = (str, data) ->
-  c = _.templateSettings
-  endMatch = new RegExp("'(?=[^"+c.end.substr(0, 1)+"]*"+escapeRegExp(c.end)+")","g")
-  fn = new Function 'obj',
-    'var p=[],print=function(){p.push.apply(p,arguments);};' +
-    'with(obj||{}){p.push(\'' +
-    str.replace(/\r/g, '\\r')
-       .replace(/\n/g, '\\n')
-       .replace(/\t/g, '\\t')
-       .replace(endMatch,"���")
-       .split("'").join("\\'")
-       .split("���").join("'")
-       .replace(c.interpolate, "',$1,'")
-       .split(c.start).join("');")
-       .split(c.end).join("p.push('") +
-       "');}return p.join('');"
-  if data then fn(data) else fn
-
-
-# Aliases
-# -------
-
-_.forEach = _.each
-_.foldl = _.inject = _.reduce
-_.foldr = _.reduceRight
-_.select = _.filter
-_.all = _.every
-_.any = _.some
-_.contains = _.include
-_.head = _.first
-_.tail = _.rest
-_.methods = _.functions
-
-
-# Setup the OOP Wrapper
-# ---------------------
-
-# If Underscore is called as a function, it returns a wrapped object that
-# can be used OO-style. This wrapper holds altered versions of all the
-# underscore functions. Wrapped objects may be chained.
-wrapper = (obj) ->
-  this._wrapped = obj
-  this
-
-
-# Helper function to continue chaining intermediate results.
-result = (obj, chain) ->
-  if chain then _(obj).chain() else obj
-
-
-# A method to easily add functions to the OOP wrapper.
-addToWrapper = (name, func) ->
-  wrapper.prototype[name] = ->
-    args = _.toArray arguments
-    unshift.call args, this._wrapped
-    result func.apply(_, args), this._chain
-
-
-# Add all ofthe Underscore functions to the wrapper object.
-_.mixin _
-
-
-# Add all mutator Array functions to the wrapper.
-_.each ['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], (name) ->
-  method = Array.prototype[name]
-  wrapper.prototype[name] = ->
-    method.apply(this._wrapped, arguments)
-    result(this._wrapped, this._chain)
-
-
-# Add all accessor Array functions to the wrapper.
-_.each ['concat', 'join', 'slice'], (name) ->
-  method = Array.prototype[name]
-  wrapper.prototype[name] = ->
-    result(method.apply(this._wrapped, arguments), this._chain)
-
-
-# Start chaining a wrapped Underscore object.
-wrapper::chain = ->
-  this._chain = true
-  this
-
-
-# Extracts the result from a wrapped and chained object.
-wrapper::value = -> this._wrapped
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-coffeescript</code>.</p>
-
-    <p>The CoffeeScript mode was written by Jeff Pickhardt (<a href="LICENSE">license</a>).</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/commonlisp/commonlisp.js b/resources/libs/codemirror/mode/commonlisp/commonlisp.js
deleted file mode 100644
index 8fa08c8ac..000000000
--- a/resources/libs/codemirror/mode/commonlisp/commonlisp.js
+++ /dev/null
@@ -1,105 +0,0 @@
-CodeMirror.defineMode("commonlisp", function (config) {
-  var assumeBody = /^with|^def|^do|^prog|case$|^cond$|bind$|when$|unless$/;
-  var numLiteral = /^(?:[+\-]?(?:\d+|\d*\.\d+)(?:[efd][+\-]?\d+)?|[+\-]?\d+(?:\/[+\-]?\d+)?|#b[+\-]?[01]+|#o[+\-]?[0-7]+|#x[+\-]?[\da-f]+)/;
-  var symbol = /[^\s'`,@()\[\]";]/;
-  var type;
-
-  function readSym(stream) {
-    var ch;
-    while (ch = stream.next()) {
-      if (ch == "\\") stream.next();
-      else if (!symbol.test(ch)) { stream.backUp(1); break; }
-    }
-    return stream.current();
-  }
-
-  function base(stream, state) {
-    if (stream.eatSpace()) {type = "ws"; return null;}
-    if (stream.match(numLiteral)) return "number";
-    var ch = stream.next();
-    if (ch == "\\") ch = stream.next();
-
-    if (ch == '"') return (state.tokenize = inString)(stream, state);
-    else if (ch == "(") { type = "open"; return "bracket"; }
-    else if (ch == ")" || ch == "]") { type = "close"; return "bracket"; }
-    else if (ch == ";") { stream.skipToEnd(); type = "ws"; return "comment"; }
-    else if (/['`,@]/.test(ch)) return null;
-    else if (ch == "|") {
-      if (stream.skipTo("|")) { stream.next(); return "symbol"; }
-      else { stream.skipToEnd(); return "error"; }
-    } else if (ch == "#") {
-      var ch = stream.next();
-      if (ch == "[") { type = "open"; return "bracket"; }
-      else if (/[+\-=\.']/.test(ch)) return null;
-      else if (/\d/.test(ch) && stream.match(/^\d*#/)) return null;
-      else if (ch == "|") return (state.tokenize = inComment)(stream, state);
-      else if (ch == ":") { readSym(stream); return "meta"; }
-      else return "error";
-    } else {
-      var name = readSym(stream);
-      if (name == ".") return null;
-      type = "symbol";
-      if (name == "nil" || name == "t") return "atom";
-      if (name.charAt(0) == ":") return "keyword";
-      if (name.charAt(0) == "&") return "variable-2";
-      return "variable";
-    }
-  }
-
-  function inString(stream, state) {
-    var escaped = false, next;
-    while (next = stream.next()) {
-      if (next == '"' && !escaped) { state.tokenize = base; break; }
-      escaped = !escaped && next == "\\";
-    }
-    return "string";
-  }
-
-  function inComment(stream, state) {
-    var next, last;
-    while (next = stream.next()) {
-      if (next == "#" && last == "|") { state.tokenize = base; break; }
-      last = next;
-    }
-    type = "ws";
-    return "comment";
-  }
-
-  return {
-    startState: function () {
-      return {ctx: {prev: null, start: 0, indentTo: 0}, tokenize: base};
-    },
-
-    token: function (stream, state) {
-      if (stream.sol() && typeof state.ctx.indentTo != "number")
-        state.ctx.indentTo = state.ctx.start + 1;
-
-      type = null;
-      var style = state.tokenize(stream, state);
-      if (type != "ws") {
-        if (state.ctx.indentTo == null) {
-          if (type == "symbol" && assumeBody.test(stream.current()))
-            state.ctx.indentTo = state.ctx.start + config.indentUnit;
-          else
-            state.ctx.indentTo = "next";
-        } else if (state.ctx.indentTo == "next") {
-          state.ctx.indentTo = stream.column();
-        }
-      }
-      if (type == "open") state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
-      else if (type == "close") state.ctx = state.ctx.prev || state.ctx;
-      return style;
-    },
-
-    indent: function (state, _textAfter) {
-      var i = state.ctx.indentTo;
-      return typeof i == "number" ? i : state.ctx.start + 1;
-    },
-
-    lineComment: ";;",
-    blockCommentStart: "#|",
-    blockCommentEnd: "|#"
-  };
-});
-
-CodeMirror.defineMIME("text/x-common-lisp", "commonlisp");
diff --git a/resources/libs/codemirror/mode/commonlisp/index.html b/resources/libs/codemirror/mode/commonlisp/index.html
deleted file mode 100644
index d48be8d23..000000000
--- a/resources/libs/codemirror/mode/commonlisp/index.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Common Lisp mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="commonlisp.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Common Lisp</a>
-  </ul>
-</div>
-
-<article>
-<h2>Common Lisp mode</h2>
-<form><textarea id="code" name="code">(in-package :cl-postgres)
-
-;; These are used to synthesize reader and writer names for integer
-;; reading/writing functions when the amount of bytes and the
-;; signedness is known. Both the macro that creates the functions and
-;; some macros that use them create names this way.
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defun integer-reader-name (bytes signed)
-    (intern (with-standard-io-syntax
-              (format nil "~a~a~a~a" '#:read- (if signed "" '#:u) '#:int bytes))))
-  (defun integer-writer-name (bytes signed)
-    (intern (with-standard-io-syntax
-              (format nil "~a~a~a~a" '#:write- (if signed "" '#:u) '#:int bytes)))))
-
-(defmacro integer-reader (bytes)
-  "Create a function to read integers from a binary stream."
-  (let ((bits (* bytes 8)))
-    (labels ((return-form (signed)
-               (if signed
-                   `(if (logbitp ,(1- bits) result)
-                        (dpb result (byte ,(1- bits) 0) -1)
-                        result)
-                   `result))
-             (generate-reader (signed)
-               `(defun ,(integer-reader-name bytes signed) (socket)
-                  (declare (type stream socket)
-                           #.*optimize*)
-                  ,(if (= bytes 1)
-                       `(let ((result (the (unsigned-byte 8) (read-byte socket))))
-                          (declare (type (unsigned-byte 8) result))
-                          ,(return-form signed))
-                       `(let ((result 0))
-                          (declare (type (unsigned-byte ,bits) result))
-                          ,@(loop :for byte :from (1- bytes) :downto 0
-                                   :collect `(setf (ldb (byte 8 ,(* 8 byte)) result)
-                                                   (the (unsigned-byte 8) (read-byte socket))))
-                          ,(return-form signed))))))
-      `(progn
-;; This causes weird errors on SBCL in some circumstances. Disabled for now.
-;;         (declaim (inline ,(integer-reader-name bytes t)
-;;                          ,(integer-reader-name bytes nil)))
-         (declaim (ftype (function (t) (signed-byte ,bits))
-                         ,(integer-reader-name bytes t)))
-         ,(generate-reader t)
-         (declaim (ftype (function (t) (unsigned-byte ,bits))
-                         ,(integer-reader-name bytes nil)))
-         ,(generate-reader nil)))))
-
-(defmacro integer-writer (bytes)
-  "Create a function to write integers to a binary stream."
-  (let ((bits (* 8 bytes)))
-    `(progn
-      (declaim (inline ,(integer-writer-name bytes t)
-                       ,(integer-writer-name bytes nil)))
-      (defun ,(integer-writer-name bytes nil) (socket value)
-        (declare (type stream socket)
-                 (type (unsigned-byte ,bits) value)
-                 #.*optimize*)
-        ,@(if (= bytes 1)
-              `((write-byte value socket))
-              (loop :for byte :from (1- bytes) :downto 0
-                    :collect `(write-byte (ldb (byte 8 ,(* byte 8)) value)
-                               socket)))
-        (values))
-      (defun ,(integer-writer-name bytes t) (socket value)
-        (declare (type stream socket)
-                 (type (signed-byte ,bits) value)
-                 #.*optimize*)
-        ,@(if (= bytes 1)
-              `((write-byte (ldb (byte 8 0) value) socket))
-              (loop :for byte :from (1- bytes) :downto 0
-                    :collect `(write-byte (ldb (byte 8 ,(* byte 8)) value)
-                               socket)))
-        (values)))))
-
-;; All the instances of the above that we need.
-
-(integer-reader 1)
-(integer-reader 2)
-(integer-reader 4)
-(integer-reader 8)
-
-(integer-writer 1)
-(integer-writer 2)
-(integer-writer 4)
-
-(defun write-bytes (socket bytes)
-  "Write a byte-array to a stream."
-  (declare (type stream socket)
-           (type (simple-array (unsigned-byte 8)) bytes)
-           #.*optimize*)
-  (write-sequence bytes socket))
-
-(defun write-str (socket string)
-  "Write a null-terminated string to a stream \(encoding it when UTF-8
-support is enabled.)."
-  (declare (type stream socket)
-           (type string string)
-           #.*optimize*)
-  (enc-write-string string socket)
-  (write-uint1 socket 0))
-
-(declaim (ftype (function (t unsigned-byte)
-                          (simple-array (unsigned-byte 8) (*)))
-                read-bytes))
-(defun read-bytes (socket length)
-  "Read a byte array of the given length from a stream."
-  (declare (type stream socket)
-           (type fixnum length)
-           #.*optimize*)
-  (let ((result (make-array length :element-type '(unsigned-byte 8))))
-    (read-sequence result socket)
-    result))
-
-(declaim (ftype (function (t) string) read-str))
-(defun read-str (socket)
-  "Read a null-terminated string from a stream. Takes care of encoding
-when UTF-8 support is enabled."
-  (declare (type stream socket)
-           #.*optimize*)
-  (enc-read-string socket :null-terminated t))
-
-(defun skip-bytes (socket length)
-  "Skip a given number of bytes in a binary stream."
-  (declare (type stream socket)
-           (type (unsigned-byte 32) length)
-           #.*optimize*)
-  (dotimes (i length)
-    (read-byte socket)))
-
-(defun skip-str (socket)
-  "Skip a null-terminated string."
-  (declare (type stream socket)
-           #.*optimize*)
-  (loop :for char :of-type fixnum = (read-byte socket)
-        :until (zerop char)))
-
-(defun ensure-socket-is-closed (socket &amp;key abort)
-  (when (open-stream-p socket)
-    (handler-case
-        (close socket :abort abort)
-      (error (error)
-        (warn "Ignoring the error which happened while trying to close PostgreSQL socket: ~A" error)))))
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {lineNumbers: true});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-common-lisp</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/css/css.js b/resources/libs/codemirror/mode/css/css.js
deleted file mode 100644
index d8c30cf33..000000000
--- a/resources/libs/codemirror/mode/css/css.js
+++ /dev/null
@@ -1,639 +0,0 @@
-CodeMirror.defineMode("css", function(config, parserConfig) {
-  "use strict";
-
-  if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
-
-  var indentUnit = config.indentUnit || config.tabSize || 2,
-      hooks = parserConfig.hooks || {},
-      atMediaTypes = parserConfig.atMediaTypes || {},
-      atMediaFeatures = parserConfig.atMediaFeatures || {},
-      propertyKeywords = parserConfig.propertyKeywords || {},
-      colorKeywords = parserConfig.colorKeywords || {},
-      valueKeywords = parserConfig.valueKeywords || {},
-      allowNested = !!parserConfig.allowNested,
-      type = null;
-
-  function ret(style, tp) { type = tp; return style; }
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (hooks[ch]) {
-      // result[0] is style and result[1] is type
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-    if (ch == "@") {stream.eatWhile(/[\w\\\-]/); return ret("def", stream.current());}
-    else if (ch == "=") ret(null, "compare");
-    else if ((ch == "~" || ch == "|") && stream.eat("=")) return ret(null, "compare");
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    else if (ch == "#") {
-      stream.eatWhile(/[\w\\\-]/);
-      return ret("atom", "hash");
-    }
-    else if (ch == "!") {
-      stream.match(/^\s*\w*/);
-      return ret("keyword", "important");
-    }
-    else if (/\d/.test(ch) || ch == "." && stream.eat(/\d/)) {
-      stream.eatWhile(/[\w.%]/);
-      return ret("number", "unit");
-    }
-    else if (ch === "-") {
-      if (/\d/.test(stream.peek())) {
-        stream.eatWhile(/[\w.%]/);
-        return ret("number", "unit");
-      } else if (stream.match(/^[^-]+-/)) {
-        return ret("meta", "meta");
-      }
-    }
-    else if (/[,+>*\/]/.test(ch)) {
-      return ret(null, "select-op");
-    }
-    else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) {
-      return ret("qualifier", "qualifier");
-    }
-    else if (ch == ":") {
-      return ret("operator", ch);
-    }
-    else if (/[;{}\[\]\(\)]/.test(ch)) {
-      return ret(null, ch);
-    }
-    else if (ch == "u" && stream.match("rl(")) {
-      stream.backUp(1);
-      state.tokenize = tokenParenthesized;
-      return ret("property", "variable");
-    }
-    else {
-      stream.eatWhile(/[\w\\\-]/);
-      return ret("property", "variable");
-    }
-  }
-
-  function tokenString(quote, nonInclusive) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped)
-          break;
-        escaped = !escaped && ch == "\\";
-      }
-      if (!escaped) {
-        if (nonInclusive) stream.backUp(1);
-        state.tokenize = tokenBase;
-      }
-      return ret("string", "string");
-    };
-  }
-
-  function tokenParenthesized(stream, state) {
-    stream.next(); // Must be '('
-    if (!stream.match(/\s*[\"\']/, false))
-      state.tokenize = tokenString(")", true);
-    else
-      state.tokenize = tokenBase;
-    return ret(null, "(");
-  }
-
-  return {
-    startState: function(base) {
-      return {tokenize: tokenBase,
-              baseIndent: base || 0,
-              stack: [],
-              lastToken: null};
-    },
-
-    token: function(stream, state) {
-
-      // Use these terms when applicable (see http://www.xanthir.com/blog/b4E50)
-      //
-      // rule** or **ruleset:
-      // A selector + braces combo, or an at-rule.
-      //
-      // declaration block:
-      // A sequence of declarations.
-      //
-      // declaration:
-      // A property + colon + value combo.
-      //
-      // property value:
-      // The entire value of a property.
-      //
-      // component value:
-      // A single piece of a property value. Like the 5px in
-      // text-shadow: 0 0 5px blue;. Can also refer to things that are
-      // multiple terms, like the 1-4 terms that make up the background-size
-      // portion of the background shorthand.
-      //
-      // term:
-      // The basic unit of author-facing CSS, like a single number (5),
-      // dimension (5px), string ("foo"), or function. Officially defined
-      //  by the CSS 2.1 grammar (look for the 'term' production)
-      //
-      //
-      // simple selector:
-      // A single atomic selector, like a type selector, an attr selector, a
-      // class selector, etc.
-      //
-      // compound selector:
-      // One or more simple selectors without a combinator. div.example is
-      // compound, div > .example is not.
-      //
-      // complex selector:
-      // One or more compound selectors chained with combinators.
-      //
-      // combinator:
-      // The parts of selectors that express relationships. There are four
-      // currently - the space (descendant combinator), the greater-than
-      // bracket (child combinator), the plus sign (next sibling combinator),
-      // and the tilda (following sibling combinator).
-      //
-      // sequence of selectors:
-      // One or more of the named type of selector chained with commas.
-
-      state.tokenize = state.tokenize || tokenBase;
-      if (state.tokenize == tokenBase && stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (style && typeof style != "string") style = ret(style[0], style[1]);
-
-      // Changing style returned based on context
-      var context = state.stack[state.stack.length-1];
-      if (style == "variable") {
-        if (type == "variable-definition") state.stack.push("propertyValue");
-        return state.lastToken = "variable-2";
-      } else if (style == "property") {
-        var word = stream.current().toLowerCase();
-        if (context == "propertyValue") {
-          if (valueKeywords.hasOwnProperty(word)) {
-            style = "string-2";
-          } else if (colorKeywords.hasOwnProperty(word)) {
-            style = "keyword";
-          } else {
-            style = "variable-2";
-          }
-        } else if (context == "rule") {
-          if (!propertyKeywords.hasOwnProperty(word)) {
-            style += " error";
-          }
-        } else if (context == "block") {
-          // if a value is present in both property, value, or color, the order
-          // of preference is property -> color -> value
-          if (propertyKeywords.hasOwnProperty(word)) {
-            style = "property";
-          } else if (colorKeywords.hasOwnProperty(word)) {
-            style = "keyword";
-          } else if (valueKeywords.hasOwnProperty(word)) {
-            style = "string-2";
-          } else {
-            style = "tag";
-          }
-        } else if (!context || context == "@media{") {
-          style = "tag";
-        } else if (context == "@media") {
-          if (atMediaTypes[stream.current()]) {
-            style = "attribute"; // Known attribute
-          } else if (/^(only|not)$/.test(word)) {
-            style = "keyword";
-          } else if (word == "and") {
-            style = "error"; // "and" is only allowed in @mediaType
-          } else if (atMediaFeatures.hasOwnProperty(word)) {
-            style = "error"; // Known property, should be in @mediaType(
-          } else {
-            // Unknown, expecting keyword or attribute, assuming attribute
-            style = "attribute error";
-          }
-        } else if (context == "@mediaType") {
-          if (atMediaTypes.hasOwnProperty(word)) {
-            style = "attribute";
-          } else if (word == "and") {
-            style = "operator";
-          } else if (/^(only|not)$/.test(word)) {
-            style = "error"; // Only allowed in @media
-          } else {
-            // Unknown attribute or property, but expecting property (preceded
-            // by "and"). Should be in parentheses
-            style = "error";
-          }
-        } else if (context == "@mediaType(") {
-          if (propertyKeywords.hasOwnProperty(word)) {
-            // do nothing, remains "property"
-          } else if (atMediaTypes.hasOwnProperty(word)) {
-            style = "error"; // Known property, should be in parentheses
-          } else if (word == "and") {
-            style = "operator";
-          } else if (/^(only|not)$/.test(word)) {
-            style = "error"; // Only allowed in @media
-          } else {
-            style += " error";
-          }
-        } else if (context == "@import") {
-          style = "tag";
-        } else {
-          style = "error";
-        }
-      } else if (style == "atom") {
-        if(!context || context == "@media{" || context == "block") {
-          style = "builtin";
-        } else if (context == "propertyValue") {
-          if (!/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
-            style += " error";
-          }
-        } else {
-          style = "error";
-        }
-      } else if (context == "@media" && type == "{") {
-        style = "error";
-      }
-
-      // Push/pop context stack
-      if (type == "{") {
-        if (context == "@media" || context == "@mediaType") {
-          state.stack[state.stack.length-1] = "@media{";
-        }
-        else {
-          var newContext = allowNested ? "block" : "rule";
-          state.stack.push(newContext);
-        }
-      }
-      else if (type == "}") {
-        if (context == "interpolation") style = "operator";
-        // Pop off end of array until { is reached
-        while(state.stack.length){
-          var removed = state.stack.pop();
-          if(removed.indexOf("{") > -1 || removed == "block" || removed == "rule"){
-            break;
-          }
-        }
-      }
-      else if (type == "interpolation") state.stack.push("interpolation");
-      else if (type == "@media") state.stack.push("@media");
-      else if (type == "@import") state.stack.push("@import");
-      else if (context == "@media" && /\b(keyword|attribute)\b/.test(style))
-        state.stack[state.stack.length-1] = "@mediaType";
-      else if (context == "@mediaType" && stream.current() == ",")
-        state.stack[state.stack.length-1] = "@media";
-      else if (type == "(") {
-        if (context == "@media" || context == "@mediaType") {
-          // Make sure @mediaType is used to avoid error on {
-          state.stack[state.stack.length-1] = "@mediaType";
-          state.stack.push("@mediaType(");
-        }
-        else state.stack.push("(");
-      }
-      else if (type == ")") {
-        // Pop off end of array until ( is reached
-        while(state.stack.length){
-          var removed = state.stack.pop();
-          if(removed.indexOf("(") > -1){
-            break;
-          }
-        }
-      }
-      else if (type == ":" && state.lastToken == "property") state.stack.push("propertyValue");
-      else if (context == "propertyValue" && type == ";") state.stack.pop();
-      else if (context == "@import" && type == ";") state.stack.pop();
-
-      return state.lastToken = style;
-    },
-
-    indent: function(state, textAfter) {
-      var n = state.stack.length;
-      if (/^\}/.test(textAfter))
-        n -= state.stack[n-1] == "propertyValue" ? 2 : 1;
-      return state.baseIndent + n * indentUnit;
-    },
-
-    electricChars: "}",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    fold: "brace"
-  };
-});
-
-(function() {
-  function keySet(array) {
-    var keys = {};
-    for (var i = 0; i < array.length; ++i) {
-      keys[array[i]] = true;
-    }
-    return keys;
-  }
-
-  var atMediaTypes = keySet([
-    "all", "aural", "braille", "handheld", "print", "projection", "screen",
-    "tty", "tv", "embossed"
-  ]);
-
-  var atMediaFeatures = keySet([
-    "width", "min-width", "max-width", "height", "min-height", "max-height",
-    "device-width", "min-device-width", "max-device-width", "device-height",
-    "min-device-height", "max-device-height", "aspect-ratio",
-    "min-aspect-ratio", "max-aspect-ratio", "device-aspect-ratio",
-    "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color",
-    "max-color", "color-index", "min-color-index", "max-color-index",
-    "monochrome", "min-monochrome", "max-monochrome", "resolution",
-    "min-resolution", "max-resolution", "scan", "grid"
-  ]);
-
-  var propertyKeywords = keySet([
-    "align-content", "align-items", "align-self", "alignment-adjust",
-    "alignment-baseline", "anchor-point", "animation", "animation-delay",
-    "animation-direction", "animation-duration", "animation-iteration-count",
-    "animation-name", "animation-play-state", "animation-timing-function",
-    "appearance", "azimuth", "backface-visibility", "background",
-    "background-attachment", "background-clip", "background-color",
-    "background-image", "background-origin", "background-position",
-    "background-repeat", "background-size", "baseline-shift", "binding",
-    "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
-    "bookmark-target", "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", "color", "color-profile", "column-count",
-    "column-fill", "column-gap", "column-rule", "column-rule-color",
-    "column-rule-style", "column-rule-width", "column-span", "column-width",
-    "columns", "content", "counter-increment", "counter-reset", "crop", "cue",
-    "cue-after", "cue-before", "cursor", "direction", "display",
-    "dominant-baseline", "drop-initial-after-adjust",
-    "drop-initial-after-align", "drop-initial-before-adjust",
-    "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
-    "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
-    "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
-    "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings",
-    "font-family", "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-cell", "grid-column", "grid-column-align",
-    "grid-column-sizing", "grid-column-span", "grid-columns", "grid-flow",
-    "grid-row", "grid-row-align", "grid-row-sizing", "grid-row-span",
-    "grid-rows", "grid-template", "hanging-punctuation", "height", "hyphens",
-    "icon", "image-orientation", "image-rendering", "image-resolution",
-    "inline-box-align", "justify-content", "left", "letter-spacing",
-    "line-break", "line-height", "line-stacking", "line-stacking-ruby",
-    "line-stacking-shift", "line-stacking-strategy", "list-style",
-    "list-style-image", "list-style-position", "list-style-type", "margin",
-    "margin-bottom", "margin-left", "margin-right", "margin-top",
-    "marker-offset", "marks", "marquee-direction", "marquee-loop",
-    "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
-    "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index",
-    "nav-left", "nav-right", "nav-up", "opacity", "order", "orphans", "outline",
-    "outline-color", "outline-offset", "outline-style", "outline-width",
-    "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y",
-    "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
-    "page", "page-break-after", "page-break-before", "page-break-inside",
-    "page-policy", "pause", "pause-after", "pause-before", "perspective",
-    "perspective-origin", "pitch", "pitch-range", "play-during", "position",
-    "presentation-level", "punctuation-trim", "quotes", "region-break-after",
-    "region-break-before", "region-break-inside", "region-fragment",
-    "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
-    "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang",
-    "ruby-position", "ruby-span", "shape-inside", "shape-outside", "size",
-    "speak", "speak-as", "speak-header",
-    "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
-    "tab-size", "table-layout", "target", "target-name", "target-new",
-    "target-position", "text-align", "text-align-last", "text-decoration",
-    "text-decoration-color", "text-decoration-line", "text-decoration-skip",
-    "text-decoration-style", "text-emphasis", "text-emphasis-color",
-    "text-emphasis-position", "text-emphasis-style", "text-height",
-    "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow",
-    "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position",
-    "text-wrap", "top", "transform", "transform-origin", "transform-style",
-    "transition", "transition-delay", "transition-duration",
-    "transition-property", "transition-timing-function", "unicode-bidi",
-    "vertical-align", "visibility", "voice-balance", "voice-duration",
-    "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
-    "voice-volume", "volume", "white-space", "widows", "width", "word-break",
-    "word-spacing", "word-wrap", "z-index", "zoom",
-    // SVG-specific
-    "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
-    "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
-    "color-interpolation", "color-interpolation-filters", "color-profile",
-    "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering",
-    "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke",
-    "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin",
-    "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering",
-    "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal",
-    "glyph-orientation-vertical", "kerning", "text-anchor", "writing-mode"
-  ]);
-
-  var colorKeywords = keySet([
-    "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", "darkkhaki", "darkmagenta", "darkolivegreen",
-    "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen",
-    "darkslateblue", "darkslategray", "darkturquoise", "darkviolet",
-    "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick",
-    "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite",
-    "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew",
-    "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender",
-    "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral",
-    "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightpink",
-    "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray",
-    "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", "red", "rosybrown", "royalblue", "saddlebrown", "salmon",
-    "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",
-    "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan",
-    "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white",
-    "whitesmoke", "yellow", "yellowgreen"
-  ]);
-
-  var valueKeywords = keySet([
-    "above", "absolute", "activeborder", "activecaption", "afar",
-    "after-white-space", "ahead", "alias", "all", "all-scroll", "alternate",
-    "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
-    "arabic-indic", "armenian", "asterisks", "auto", "avoid", "avoid-column", "avoid-page",
-    "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
-    "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
-    "both", "bottom", "break", "break-all", "break-word", "button", "button-bevel",
-    "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "cambodian",
-    "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
-    "cell", "center", "checkbox", "circle", "cjk-earthly-branch",
-    "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
-    "col-resize", "collapse", "column", "compact", "condensed", "contain", "content",
-    "content-box", "context-menu", "continuous", "copy", "cover", "crop",
-    "cross", "crosshair", "currentcolor", "cursive", "dashed", "decimal",
-    "decimal-leading-zero", "default", "default-button", "destination-atop",
-    "destination-in", "destination-out", "destination-over", "devanagari",
-    "disc", "discard", "document", "dot-dash", "dot-dot-dash", "dotted",
-    "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
-    "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
-    "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
-    "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
-    "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et",
-    "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
-    "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
-    "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et",
-    "ethiopic-halehame-tig", "ew-resize", "expanded", "extra-condensed",
-    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "footnotes",
-    "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
-    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew",
-    "help", "hidden", "hide", "higher", "highlight", "highlighttext",
-    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "icon", "ignore",
-    "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
-    "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
-    "inline-block", "inline-table", "inset", "inside", "intrinsic", "invert",
-    "italic", "justify", "kannada", "katakana", "katakana-iroha", "keep-all", "khmer",
-    "landscape", "lao", "large", "larger", "left", "level", "lighter",
-    "line-through", "linear", "lines", "list-item", "listbox", "listitem",
-    "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
-    "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
-    "lower-roman", "lowercase", "ltr", "malayalam", "match",
-    "media-controls-background", "media-current-time-display",
-    "media-fullscreen-button", "media-mute-button", "media-play-button",
-    "media-return-to-realtime-button", "media-rewind-button",
-    "media-seek-back-button", "media-seek-forward-button", "media-slider",
-    "media-sliderthumb", "media-time-remaining-display", "media-volume-slider",
-    "media-volume-slider-container", "media-volume-sliderthumb", "medium",
-    "menu", "menulist", "menulist-button", "menulist-text",
-    "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
-    "mix", "mongolian", "monospace", "move", "multiple", "myanmar", "n-resize",
-    "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
-    "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
-    "ns-resize", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
-    "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
-    "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
-    "painted", "page", "paused", "persian", "plus-darker", "plus-lighter", "pointer",
-    "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
-    "radio", "read-only", "read-write", "read-write-plaintext-only", "rectangle", "region",
-    "relative", "repeat", "repeat-x", "repeat-y", "reset", "reverse", "rgb", "rgba",
-    "ridge", "right", "round", "row-resize", "rtl", "run-in", "running",
-    "s-resize", "sans-serif", "scroll", "scrollbar", "se-resize", "searchfield",
-    "searchfield-cancel-button", "searchfield-decoration",
-    "searchfield-results-button", "searchfield-results-decoration",
-    "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
-    "single", "skip-white-space", "slide", "slider-horizontal",
-    "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
-    "small", "small-caps", "small-caption", "smaller", "solid", "somali",
-    "source-atop", "source-in", "source-out", "source-over", "space", "square",
-    "square-button", "start", "static", "status-bar", "stretch", "stroke",
-    "sub", "subpixel-antialiased", "super", "sw-resize", "table",
-    "table-caption", "table-cell", "table-column", "table-column-group",
-    "table-footer-group", "table-header-group", "table-row", "table-row-group",
-    "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai",
-    "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
-    "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
-    "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
-    "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
-    "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
-    "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
-    "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
-    "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
-    "window", "windowframe", "windowtext", "x-large", "x-small", "xor",
-    "xx-large", "xx-small"
-  ]);
-
-  function tokenCComment(stream, state) {
-    var maybeEnd = false, ch;
-    while ((ch = stream.next()) != null) {
-      if (maybeEnd && ch == "/") {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ["comment", "comment"];
-  }
-
-  CodeMirror.defineMIME("text/css", {
-    atMediaTypes: atMediaTypes,
-    atMediaFeatures: atMediaFeatures,
-    propertyKeywords: propertyKeywords,
-    colorKeywords: colorKeywords,
-    valueKeywords: valueKeywords,
-    hooks: {
-      "<": function(stream, state) {
-        function tokenSGMLComment(stream, state) {
-          var dashes = 0, ch;
-          while ((ch = stream.next()) != null) {
-            if (dashes >= 2 && ch == ">") {
-              state.tokenize = null;
-              break;
-            }
-            dashes = (ch == "-") ? dashes + 1 : 0;
-          }
-          return ["comment", "comment"];
-        }
-        if (stream.eat("!")) {
-          state.tokenize = tokenSGMLComment;
-          return tokenSGMLComment(stream, state);
-        }
-      },
-      "/": function(stream, state) {
-        if (stream.eat("*")) {
-          state.tokenize = tokenCComment;
-          return tokenCComment(stream, state);
-        }
-        return false;
-      }
-    },
-    name: "css"
-  });
-
-  CodeMirror.defineMIME("text/x-scss", {
-    atMediaTypes: atMediaTypes,
-    atMediaFeatures: atMediaFeatures,
-    propertyKeywords: propertyKeywords,
-    colorKeywords: colorKeywords,
-    valueKeywords: valueKeywords,
-    allowNested: true,
-    hooks: {
-      ":": function(stream) {
-        if (stream.match(/\s*{/)) {
-          return [null, "{"];
-        }
-        return false;
-      },
-      "$": function(stream) {
-        stream.match(/^[\w-]+/);
-        if (stream.peek() == ":") {
-          return ["variable", "variable-definition"];
-        }
-        return ["variable", "variable"];
-      },
-      ",": function(stream, state) {
-        if (state.stack[state.stack.length - 1] == "propertyValue" && stream.match(/^ *\$/, false)) {
-          return ["operator", ";"];
-        }
-      },
-      "/": function(stream, state) {
-        if (stream.eat("/")) {
-          stream.skipToEnd();
-          return ["comment", "comment"];
-        } else if (stream.eat("*")) {
-          state.tokenize = tokenCComment;
-          return tokenCComment(stream, state);
-        } else {
-          return ["operator", "operator"];
-        }
-      },
-      "#": function(stream) {
-        if (stream.eat("{")) {
-          return ["operator", "interpolation"];
-        } else {
-          stream.eatWhile(/[\w\\\-]/);
-          return ["atom", "hash"];
-        }
-      }
-    },
-    name: "css"
-  });
-})();
diff --git a/resources/libs/codemirror/mode/css/index.html b/resources/libs/codemirror/mode/css/index.html
deleted file mode 100644
index 1d1865e2e..000000000
--- a/resources/libs/codemirror/mode/css/index.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: CSS mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="css.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">CSS</a>
-  </ul>
-</div>
-
-<article>
-<h2>CSS mode</h2>
-<form><textarea id="code" name="code">
-/* Some example CSS */
-
-@import url("something.css");
-
-body {
-  margin: 0;
-  padding: 3em 6em;
-  font-family: tahoma, arial, sans-serif;
-  color: #000;
-}
-
-#navigation a {
-  font-weight: bold;
-  text-decoration: none !important;
-}
-
-h1 {
-  font-size: 2.5em;
-}
-
-h2 {
-  font-size: 1.7em;
-}
-
-h1:before, h2:before {
-  content: "::";
-}
-
-code {
-  font-family: courier, monospace;
-  font-size: 80%;
-  color: #418A8A;
-}
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/css</code>.</p>
-
-    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#css_*">normal</a>,  <a href="../../test/index.html#verbose,css_*">verbose</a>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/css/scss.html b/resources/libs/codemirror/mode/css/scss.html
deleted file mode 100644
index 72781c0dc..000000000
--- a/resources/libs/codemirror/mode/css/scss.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: SCSS mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="css.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">SCSS</a>
-  </ul>
-</div>
-
-<article>
-<h2>SCSS mode</h2>
-<form><textarea id="code" name="code">
-/* Some example SCSS */
-
-@import "compass/css3";
-$variable: #333;
-
-$blue: #3bbfce;
-$margin: 16px;
-
-.content-navigation {
-  #nested {
-    background-color: black;
-  }
-  border-color: $blue;
-  color:
-    darken($blue, 9%);
-}
-
-.border {
-  padding: $margin / 2;
-  margin: $margin / 2;
-  border-color: $blue;
-}
-
-@mixin table-base {
-  th {
-    text-align: center;
-    font-weight: bold;
-  }
-  td, th {padding: 2px}
-}
-
-table.hl {
-  margin: 2em 0;
-  td.ln {
-    text-align: right;
-  }
-}
-
-li {
-  font: {
-    family: serif;
-    weight: bold;
-    size: 1.2em;
-  }
-}
-
-@mixin left($dist) {
-  float: left;
-  margin-left: $dist;
-}
-
-#data {
-  @include left(10px);
-  @include table-base;
-}
-
-.source {
-  @include flow-into(target);
-  border: 10px solid green;
-  margin: 20px;
-  width: 200px; }
-
-.new-container {
-  @include flow-from(target);
-  border: 10px solid red;
-  margin: 20px;
-  width: 200px; }
-
-body {
-  margin: 0;
-  padding: 3em 6em;
-  font-family: tahoma, arial, sans-serif;
-  color: #000;
-}
-
-@mixin yellow() {
-  background: yellow;
-}
-
-.big {
-  font-size: 14px;
-}
-
-.nested {
-  @include border-radius(3px);
-  @extend .big;
-  p {
-    background: whitesmoke;
-    a {
-      color: red;
-    }
-  }
-}
-
-#navigation a {
-  font-weight: bold;
-  text-decoration: none !important;
-}
-
-h1 {
-  font-size: 2.5em;
-}
-
-h2 {
-  font-size: 1.7em;
-}
-
-h1:before, h2:before {
-  content: "::";
-}
-
-code {
-  font-family: courier, monospace;
-  font-size: 80%;
-  color: #418A8A;
-}
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-scss"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/scss</code>.</p>
-
-    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#scss_*">normal</a>,  <a href="../../test/index.html#verbose,scss_*">verbose</a>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/css/scss_test.js b/resources/libs/codemirror/mode/css/scss_test.js
deleted file mode 100644
index 9998e2aac..000000000
--- a/resources/libs/codemirror/mode/css/scss_test.js
+++ /dev/null
@@ -1,93 +0,0 @@
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 1}, "text/x-scss");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
-  function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
-
-  MT('url_with_quotation',
-    "[tag foo] { [property background][operator :][string-2 url]([string test.jpg]) }");
-
-  MT('url_with_double_quotes',
-    "[tag foo] { [property background][operator :][string-2 url]([string \"test.jpg\"]) }");
-
-  MT('url_with_single_quotes',
-    "[tag foo] { [property background][operator :][string-2 url]([string \'test.jpg\']) }");
-
-  MT('string',
-    "[def @import] [string \"compass/css3\"]");
-
-  MT('important_keyword',
-    "[tag foo] { [property background][operator :][string-2 url]([string \'test.jpg\']) [keyword !important] }");
-
-  MT('variable',
-    "[variable-2 $blue][operator :][atom #333]");
-
-  MT('variable_as_attribute',
-    "[tag foo] { [property color][operator :][variable-2 $blue] }");
-
-  MT('numbers',
-    "[tag foo] { [property padding][operator :][number 10px] [number 10] [number 10em] [number 8in] }");
-
-  MT('number_percentage',
-    "[tag foo] { [property width][operator :][number 80%] }");
-
-  MT('selector',
-    "[builtin #hello][qualifier .world]{}");
-
-  MT('singleline_comment',
-    "[comment // this is a comment]");
-
-  MT('multiline_comment',
-    "[comment /*foobar*/]");
-
-  MT('attribute_with_hyphen',
-    "[tag foo] { [property font-size][operator :][number 10px] }");
-
-  MT('string_after_attribute',
-    "[tag foo] { [property content][operator :][string \"::\"] }");
-
-  MT('directives',
-    "[def @include] [qualifier .mixin]");
-
-  MT('basic_structure',
-    "[tag p] { [property background][operator :][keyword red]; }");
-
-  MT('nested_structure',
-    "[tag p] { [tag a] { [property color][operator :][keyword red]; } }");
-
-  MT('mixin',
-    "[def @mixin] [tag table-base] {}");
-
-  MT('number_without_semicolon',
-    "[tag p] {[property width][operator :][number 12]}",
-    "[tag a] {[property color][operator :][keyword red];}");
-
-  MT('atom_in_nested_block',
-    "[tag p] { [tag a] { [property color][operator :][atom #000]; } }");
-
-  MT('interpolation_in_property',
-    "[tag foo] { [operator #{][variable-2 $hello][operator }:][number 2]; }");
-
-  MT('interpolation_in_selector',
-    "[tag foo][operator #{][variable-2 $hello][operator }] { [property color][operator :][atom #000]; }");
-
-  MT('interpolation_error',
-    "[tag foo][operator #{][error foo][operator }] { [property color][operator :][atom #000]; }");
-
-  MT("divide_operator",
-    "[tag foo] { [property width][operator :][number 4] [operator /] [number 2] }");
-
-  MT('nested_structure_with_id_selector',
-    "[tag p] { [builtin #hello] { [property color][operator :][keyword red]; } }");
-
-  IT('mixin',
-    "@mixin container[1 (][2 $a: 10][1 , ][2 $b: 10][1 , ][2 $c: 10]) [1 {]}");
-
-  IT('nested',
-    "foo [1 { bar ][2 { ][1 } ]}");
-
-  IT('comma',
-    "foo [1 { font-family][2 : verdana, sans-serif][1 ; ]}");
-
-  IT('parentheses',
-    "foo [1 { color][2 : darken][3 ($blue, 9%][2 )][1 ; ]}");
-})();
diff --git a/resources/libs/codemirror/mode/css/test.js b/resources/libs/codemirror/mode/css/test.js
deleted file mode 100644
index 3c52460d9..000000000
--- a/resources/libs/codemirror/mode/css/test.js
+++ /dev/null
@@ -1,142 +0,0 @@
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 1}, "css");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-  function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  // Requires at least one media query
-  MT("atMediaEmpty",
-     "[def @media] [error {] }");
-
-  MT("atMediaMultiple",
-     "[def @media] [keyword not] [attribute screen] [operator and] ([property color]), [keyword not] [attribute print] [operator and] ([property color]) { }");
-
-  MT("atMediaCheckStack",
-     "[def @media] [attribute screen] { } [tag foo] { }");
-
-  MT("atMediaCheckStack",
-     "[def @media] [attribute screen] ([property color]) { } [tag foo] { }");
-
-  MT("atMediaPropertyOnly",
-     "[def @media] ([property color]) { } [tag foo] { }");
-
-  MT("atMediaCheckStackInvalidAttribute",
-     "[def @media] [attribute&error foobarhello] { [tag foo] { } }");
-
-  MT("atMediaCheckStackInvalidAttribute",
-     "[def @media] [attribute&error foobarhello] { } [tag foo] { }");
-
-  // Error, because "and" is only allowed immediately preceding a media expression
-  MT("atMediaInvalidAttribute",
-     "[def @media] [attribute&error foobarhello] { }");
-
-  // Error, because "and" is only allowed immediately preceding a media expression
-  MT("atMediaInvalidAnd",
-     "[def @media] [error and] [attribute screen] { }");
-
-  // Error, because "not" is only allowed as the first item in each media query
-  MT("atMediaInvalidNot",
-     "[def @media] [attribute screen] [error not] ([error not]) { }");
-
-  // Error, because "only" is only allowed as the first item in each media query
-  MT("atMediaInvalidOnly",
-     "[def @media] [attribute screen] [error only] ([error only]) { }");
-
-  // Error, because "foobarhello" is neither a known type or property, but
-  // property was expected (after "and"), and it should be in parenthese.
-  MT("atMediaUnknownType",
-     "[def @media] [attribute screen] [operator and] [error foobarhello] { }");
-
-  // Error, because "color" is not a known type, but is a known property, and
-  // should be in parentheses.
-  MT("atMediaInvalidType",
-     "[def @media] [attribute screen] [operator and] [error color] { }");
-
-  // Error, because "print" is not a known property, but is a known type,
-  // and should not be in parenthese.
-  MT("atMediaInvalidProperty",
-     "[def @media] [attribute screen] [operator and] ([error print]) { }");
-
-  // Soft error, because "foobarhello" is not a known property or type.
-  MT("atMediaUnknownProperty",
-     "[def @media] [attribute screen] [operator and] ([property&error foobarhello]) { }");
-
-  // Make sure nesting works with media queries
-  MT("atMediaMaxWidthNested",
-     "[def @media] [attribute screen] [operator and] ([property max-width][operator :] [number 25px]) { [tag foo] { } }");
-
-  MT("tagSelector",
-     "[tag foo] { }");
-
-  MT("classSelector",
-     "[qualifier .foo-bar_hello] { }");
-
-  MT("idSelector",
-     "[builtin #foo] { [error #foo] }");
-
-  MT("tagSelectorUnclosed",
-     "[tag foo] { [property margin][operator :] [number 0] } [tag bar] { }");
-
-  MT("tagStringNoQuotes",
-     "[tag foo] { [property font-family][operator :] [variable-2 hello] [variable-2 world]; }");
-
-  MT("tagStringDouble",
-     "[tag foo] { [property font-family][operator :] [string \"hello world\"]; }");
-
-  MT("tagStringSingle",
-     "[tag foo] { [property font-family][operator :] [string 'hello world']; }");
-
-  MT("tagColorKeyword",
-     "[tag foo] {" +
-       "[property color][operator :] [keyword black];" +
-       "[property color][operator :] [keyword navy];" +
-       "[property color][operator :] [keyword yellow];" +
-       "}");
-
-  MT("tagColorHex3",
-     "[tag foo] { [property background][operator :] [atom #fff]; }");
-
-  MT("tagColorHex6",
-     "[tag foo] { [property background][operator :] [atom #ffffff]; }");
-
-  MT("tagColorHex4",
-     "[tag foo] { [property background][operator :] [atom&error #ffff]; }");
-
-  MT("tagColorHexInvalid",
-     "[tag foo] { [property background][operator :] [atom&error #ffg]; }");
-
-  MT("tagNegativeNumber",
-     "[tag foo] { [property margin][operator :] [number -5px]; }");
-
-  MT("tagPositiveNumber",
-     "[tag foo] { [property padding][operator :] [number 5px]; }");
-
-  MT("tagVendor",
-     "[tag foo] { [meta -foo-][property box-sizing][operator :] [meta -foo-][string-2 border-box]; }");
-
-  MT("tagBogusProperty",
-     "[tag foo] { [property&error barhelloworld][operator :] [number 0]; }");
-
-  MT("tagTwoProperties",
-     "[tag foo] { [property margin][operator :] [number 0]; [property padding][operator :] [number 0]; }");
-
-  MT("tagTwoPropertiesURL",
-     "[tag foo] { [property background][operator :] [string-2 url]([string //example.com/foo.png]); [property padding][operator :] [number 0]; }");
-
-  MT("commentSGML",
-     "[comment <!--comment-->]");
-
-  IT("tagSelector",
-    "strong, em [1 { background][2 : rgba][3 (255, 255, 0, .2][2 )][1 ;]}");
-
-  IT("atMedia",
-    "[1 @media { foo ][2 { ][1 } ]}");
-
-  IT("comma",
-    "foo [1 { font-family][2 : verdana, sans-serif][1 ; ]}");
-
-  IT("parentheses",
-    "foo [1 { background][2 : url][3 (\"bar\"][2 )][1 ; ]}");
-
-  IT("pseudo",
-    "foo:before [1 { ]}");
-})();
diff --git a/resources/libs/codemirror/mode/d/d.js b/resources/libs/codemirror/mode/d/d.js
deleted file mode 100644
index ab345f1a0..000000000
--- a/resources/libs/codemirror/mode/d/d.js
+++ /dev/null
@@ -1,205 +0,0 @@
-CodeMirror.defineMode("d", function(config, parserConfig) {
-  var indentUnit = config.indentUnit,
-      statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
-      keywords = parserConfig.keywords || {},
-      builtin = parserConfig.builtin || {},
-      blockKeywords = parserConfig.blockKeywords || {},
-      atoms = parserConfig.atoms || {},
-      hooks = parserConfig.hooks || {},
-      multiLineStrings = parserConfig.multiLineStrings;
-  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
-
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-    if (ch == '"' || ch == "'" || ch == "`") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("+")) {
-        state.tokenize = tokenComment;
-        return tokenNestedComment(stream, state);
-      }
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "keyword";
-    }
-    if (builtin.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "builtin";
-    }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return "variable";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !(escaped || multiLineStrings))
-        state.tokenize = null;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function tokenNestedComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch == "+");
-    }
-    return "comment";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function pushContext(state, col, type) {
-    var indent = state.indented;
-    if (state.context && state.context.type == "statement")
-      indent = state.context.indented;
-    return state.context = new Context(indent, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true
-      };
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if ((curPunc == ";" || curPunc == ":" || curPunc == ",") && ctx.type == "statement") popContext(state);
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') || (ctx.type == "statement" && curPunc == "newstatement"))
-        pushContext(state, stream.column(), "statement");
-      state.startOfLine = false;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
-      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
-      var closing = firstChar == ctx.type;
-      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: "{}"
-  };
-});
-
-(function() {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  var blockKeywords = "body catch class do else enum for foreach foreach_reverse if in interface mixin " +
-                      "out scope struct switch try union unittest version while with";
-
-  CodeMirror.defineMIME("text/x-d", {
-    name: "d",
-    keywords: words("abstract alias align asm assert auto break case cast cdouble cent cfloat const continue " +
-                    "debug default delegate delete deprecated export extern final finally function goto immutable " +
-                    "import inout invariant is lazy macro module new nothrow override package pragma private " +
-                    "protected public pure ref return shared short static super synchronized template this " +
-                    "throw typedef typeid typeof volatile __FILE__ __LINE__ __gshared __traits __vector __parameters " +
-                    blockKeywords),
-    blockKeywords: words(blockKeywords),
-    builtin: words("bool byte char creal dchar double float idouble ifloat int ireal long real short ubyte " +
-                   "ucent uint ulong ushort wchar wstring void size_t sizediff_t"),
-    atoms: words("exit failure success true false null"),
-    hooks: {
-      "@": function(stream, _state) {
-        stream.eatWhile(/[\w\$_]/);
-        return "meta";
-      }
-    }
-  });
-}());
diff --git a/resources/libs/codemirror/mode/d/index.html b/resources/libs/codemirror/mode/d/index.html
deleted file mode 100644
index 8b25fcc5c..000000000
--- a/resources/libs/codemirror/mode/d/index.html
+++ /dev/null
@@ -1,273 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: D mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="d.js"></script>
-<style>.CodeMirror {border: 2px inset #dee;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">D</a>
-  </ul>
-</div>
-
-<article>
-<h2>D mode</h2>
-<form><textarea id="code" name="code">
-/* D demo code // copied from phobos/sd/metastrings.d */
-// Written in the D programming language.
-
-/**
-Templates with which to do compile-time manipulation of strings.
-
-Macros:
- WIKI = Phobos/StdMetastrings
-
-Copyright: Copyright Digital Mars 2007 - 2009.
-License:   <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
-Authors:   $(WEB digitalmars.com, Walter Bright),
-           Don Clugston
-Source:    $(PHOBOSSRC std/_metastrings.d)
-*/
-/*
-         Copyright Digital Mars 2007 - 2009.
-Distributed under the Boost Software License, Version 1.0.
-   (See accompanying file LICENSE_1_0.txt or copy at
-         http://www.boost.org/LICENSE_1_0.txt)
- */
-module std.metastrings;
-
-/**
-Formats constants into a string at compile time.  Analogous to $(XREF
-string,format).
-
-Parameters:
-
-A = tuple of constants, which can be strings, characters, or integral
-    values.
-
-Formats:
- *    The formats supported are %s for strings, and %%
- *    for the % character.
-Example:
----
-import std.metastrings;
-import std.stdio;
-
-void main()
-{
-  string s = Format!("Arg %s = %s", "foo", 27);
-  writefln(s); // "Arg foo = 27"
-}
- * ---
- */
-
-template Format(A...)
-{
-    static if (A.length == 0)
-        enum Format = "";
-    else static if (is(typeof(A[0]) : const(char)[]))
-        enum Format = FormatString!(A[0], A[1..$]);
-    else
-        enum Format = toStringNow!(A[0]) ~ Format!(A[1..$]);
-}
-
-template FormatString(const(char)[] F, A...)
-{
-    static if (F.length == 0)
-        enum FormatString = Format!(A);
-    else static if (F.length == 1)
-        enum FormatString = F[0] ~ Format!(A);
-    else static if (F[0..2] == "%s")
-        enum FormatString
-            = toStringNow!(A[0]) ~ FormatString!(F[2..$],A[1..$]);
-    else static if (F[0..2] == "%%")
-        enum FormatString = "%" ~ FormatString!(F[2..$],A);
-    else
-    {
-        static assert(F[0] != '%', "unrecognized format %" ~ F[1]);
-        enum FormatString = F[0] ~ FormatString!(F[1..$],A);
-    }
-}
-
-unittest
-{
-    auto s = Format!("hel%slo", "world", -138, 'c', true);
-    assert(s == "helworldlo-138ctrue", "[" ~ s ~ "]");
-}
-
-/**
- * Convert constant argument to a string.
- */
-
-template toStringNow(ulong v)
-{
-    static if (v < 10)
-        enum toStringNow = "" ~ cast(char)(v + '0');
-    else
-        enum toStringNow = toStringNow!(v / 10) ~ toStringNow!(v % 10);
-}
-
-unittest
-{
-    static assert(toStringNow!(1uL << 62) == "4611686018427387904");
-}
-
-/// ditto
-template toStringNow(long v)
-{
-    static if (v < 0)
-        enum toStringNow = "-" ~ toStringNow!(cast(ulong) -v);
-    else
-        enum toStringNow = toStringNow!(cast(ulong) v);
-}
-
-unittest
-{
-    static assert(toStringNow!(0x100000000) == "4294967296");
-    static assert(toStringNow!(-138L) == "-138");
-}
-
-/// ditto
-template toStringNow(uint U)
-{
-    enum toStringNow = toStringNow!(cast(ulong)U);
-}
-
-/// ditto
-template toStringNow(int I)
-{
-    enum toStringNow = toStringNow!(cast(long)I);
-}
-
-/// ditto
-template toStringNow(bool B)
-{
-    enum toStringNow = B ? "true" : "false";
-}
-
-/// ditto
-template toStringNow(string S)
-{
-    enum toStringNow = S;
-}
-
-/// ditto
-template toStringNow(char C)
-{
-    enum toStringNow = "" ~ C;
-}
-
-
-/********
- * Parse unsigned integer literal from the start of string s.
- * returns:
- *    .value = the integer literal as a string,
- *    .rest = the string following the integer literal
- * Otherwise:
- *    .value = null,
- *    .rest = s
- */
-
-template parseUinteger(const(char)[] s)
-{
-    static if (s.length == 0)
-    {
-        enum value = "";
-        enum rest = "";
-    }
-    else static if (s[0] >= '0' && s[0] <= '9')
-    {
-        enum value = s[0] ~ parseUinteger!(s[1..$]).value;
-        enum rest = parseUinteger!(s[1..$]).rest;
-    }
-    else
-    {
-        enum value = "";
-        enum rest = s;
-    }
-}
-
-/********
-Parse integer literal optionally preceded by $(D '-') from the start
-of string $(D s).
-
-Returns:
-   .value = the integer literal as a string,
-   .rest = the string following the integer literal
-
-Otherwise:
-   .value = null,
-   .rest = s
-*/
-
-template parseInteger(const(char)[] s)
-{
-    static if (s.length == 0)
-    {
-        enum value = "";
-        enum rest = "";
-    }
-    else static if (s[0] >= '0' && s[0] <= '9')
-    {
-        enum value = s[0] ~ parseUinteger!(s[1..$]).value;
-        enum rest = parseUinteger!(s[1..$]).rest;
-    }
-    else static if (s.length >= 2 &&
-            s[0] == '-' && s[1] >= '0' && s[1] <= '9')
-    {
-        enum value = s[0..2] ~ parseUinteger!(s[2..$]).value;
-        enum rest = parseUinteger!(s[2..$]).rest;
-    }
-    else
-    {
-        enum value = "";
-        enum rest = s;
-    }
-}
-
-unittest
-{
-    assert(parseUinteger!("1234abc").value == "1234");
-    assert(parseUinteger!("1234abc").rest == "abc");
-    assert(parseInteger!("-1234abc").value == "-1234");
-    assert(parseInteger!("-1234abc").rest == "abc");
-}
-
-/**
-Deprecated aliases held for backward compatibility.
-*/
-deprecated alias toStringNow ToString;
-/// Ditto
-deprecated alias parseUinteger ParseUinteger;
-/// Ditto
-deprecated alias parseUinteger ParseInteger;
-
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        indentUnit: 4,
-        mode: "text/x-d"
-      });
-    </script>
-
-    <p>Simple mode that handle D-Syntax (<a href="http://www.dlang.org">DLang Homepage</a>).</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-d</code>
-    .</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/diff/diff.js b/resources/libs/codemirror/mode/diff/diff.js
deleted file mode 100644
index 9a0d90ea5..000000000
--- a/resources/libs/codemirror/mode/diff/diff.js
+++ /dev/null
@@ -1,32 +0,0 @@
-CodeMirror.defineMode("diff", function() {
-
-  var TOKEN_NAMES = {
-    '+': 'positive',
-    '-': 'negative',
-    '@': 'meta'
-  };
-
-  return {
-    token: function(stream) {
-      var tw_pos = stream.string.search(/[\t ]+?$/);
-
-      if (!stream.sol() || tw_pos === 0) {
-        stream.skipToEnd();
-        return ("error " + (
-          TOKEN_NAMES[stream.string.charAt(0)] || '')).replace(/ $/, '');
-      }
-
-      var token_name = TOKEN_NAMES[stream.peek()] || stream.skipToEnd();
-
-      if (tw_pos === -1) {
-        stream.skipToEnd();
-      } else {
-        stream.pos = tw_pos;
-      }
-
-      return token_name;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-diff", "diff");
diff --git a/resources/libs/codemirror/mode/diff/index.html b/resources/libs/codemirror/mode/diff/index.html
deleted file mode 100644
index 6ceae8b33..000000000
--- a/resources/libs/codemirror/mode/diff/index.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Diff mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="diff.js"></script>
-<style>
-      .CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}
-      span.cm-meta {color: #a0b !important;}
-      span.cm-error { background-color: black; opacity: 0.4;}
-      span.cm-error.cm-string { background-color: red; }
-      span.cm-error.cm-tag { background-color: #2b2; }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Diff</a>
-  </ul>
-</div>
-
-<article>
-<h2>Diff mode</h2>
-<form><textarea id="code" name="code">
-diff --git a/index.html b/index.html
-index c1d9156..7764744 100644
---- a/index.html
-+++ b/index.html
-@@ -95,7 +95,8 @@ StringStream.prototype = {
-     <script>
-       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-         lineNumbers: true,
--        autoMatchBrackets: true
-+        autoMatchBrackets: true,
-+      onGutterClick: function(x){console.log(x);}
-       });
-     </script>
-   </body>
-diff --git a/lib/codemirror.js b/lib/codemirror.js
-index 04646a9..9a39cc7 100644
---- a/lib/codemirror.js
-+++ b/lib/codemirror.js
-@@ -399,10 +399,16 @@ var CodeMirror = (function() {
-     }
- 
-     function onMouseDown(e) {
--      var start = posFromMouse(e), last = start;    
-+      var start = posFromMouse(e), last = start, target = e.target();
-       if (!start) return;
-       setCursor(start.line, start.ch, false);
-       if (e.button() != 1) return;
-+      if (target.parentNode == gutter) {    
-+        if (options.onGutterClick)
-+          options.onGutterClick(indexOf(gutter.childNodes, target) + showingFrom);
-+        return;
-+      }
-+
-       if (!focused) onFocus();
- 
-       e.stop();
-@@ -808,7 +814,7 @@ var CodeMirror = (function() {
-       for (var i = showingFrom; i < showingTo; ++i) {
-         var marker = lines[i].gutterMarker;
-         if (marker) html.push('<div class="' + marker.style + '">' + htmlEscape(marker.text) + '</div>');
--        else html.push("<div>" + (options.lineNumbers ? i + 1 : "\u00a0") + "</div>");
-+        else html.push("<div>" + (options.lineNumbers ? i + options.firstLineNumber : "\u00a0") + "</div>");
-       }
-       gutter.style.display = "none"; // TODO test whether this actually helps
-       gutter.innerHTML = html.join("");
-@@ -1371,10 +1377,8 @@ var CodeMirror = (function() {
-         if (option == "parser") setParser(value);
-         else if (option === "lineNumbers") setLineNumbers(value);
-         else if (option === "gutter") setGutter(value);
--        else if (option === "readOnly") options.readOnly = value;
--        else if (option === "indentUnit") {options.indentUnit = indentUnit = value; setParser(options.parser);}
--        else if (/^(?:enterMode|tabMode|indentWithTabs|readOnly|autoMatchBrackets|undoDepth)$/.test(option)) options[option] = value;
--        else throw new Error("Can't set option " + option);
-+        else if (option === "indentUnit") {options.indentUnit = value; setParser(options.parser);}
-+        else options[option] = value;
-       },
-       cursorCoords: cursorCoords,
-       undo: operation(undo),
-@@ -1402,7 +1406,8 @@ var CodeMirror = (function() {
-       replaceRange: operation(replaceRange),
- 
-       operation: function(f){return operation(f)();},
--      refresh: function(){updateDisplay([{from: 0, to: lines.length}]);}
-+      refresh: function(){updateDisplay([{from: 0, to: lines.length}]);},
-+      getInputField: function(){return input;}
-     };
-     return instance;
-   }
-@@ -1420,6 +1425,7 @@ var CodeMirror = (function() {
-     readOnly: false,
-     onChange: null,
-     onCursorActivity: null,
-+    onGutterClick: null,
-     autoMatchBrackets: false,
-     workTime: 200,
-     workDelay: 300,
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-diff</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/dtd/dtd.js b/resources/libs/codemirror/mode/dtd/dtd.js
deleted file mode 100644
index 7033bf0f8..000000000
--- a/resources/libs/codemirror/mode/dtd/dtd.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-  DTD mode
-  Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
-  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
-  GitHub: @peterkroon
-*/
-
-CodeMirror.defineMode("dtd", function(config) {
-  var indentUnit = config.indentUnit, type;
-  function ret(style, tp) {type = tp; return style;}
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-
-    if (ch == "<" && stream.eat("!") ) {
-      if (stream.eatWhile(/[\-]/)) {
-        state.tokenize = tokenSGMLComment;
-        return tokenSGMLComment(stream, state);
-      } else if (stream.eatWhile(/[\w]/)) return ret("keyword", "doindent");
-    } else if (ch == "<" && stream.eat("?")) { //xml declaration
-      state.tokenize = inBlock("meta", "?>");
-      return ret("meta", ch);
-    } else if (ch == "#" && stream.eatWhile(/[\w]/)) return ret("atom", "tag");
-    else if (ch == "|") return ret("keyword", "seperator");
-    else if (ch.match(/[\(\)\[\]\-\.,\+\?>]/)) return ret(null, ch);//if(ch === ">") return ret(null, "endtag"); else
-    else if (ch.match(/[\[\]]/)) return ret("rule", ch);
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    } else if (stream.eatWhile(/[a-zA-Z\?\+\d]/)) {
-      var sc = stream.current();
-      if( sc.substr(sc.length-1,sc.length).match(/\?|\+/) !== null )stream.backUp(1);
-      return ret("tag", "tag");
-    } else if (ch == "%" || ch == "*" ) return ret("number", "number");
-    else {
-      stream.eatWhile(/[\w\\\-_%.{,]/);
-      return ret(null, null);
-    }
-  }
-
-  function tokenSGMLComment(stream, state) {
-    var dashes = 0, ch;
-    while ((ch = stream.next()) != null) {
-      if (dashes >= 2 && ch == ">") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      dashes = (ch == "-") ? dashes + 1 : 0;
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      return ret("string", "tag");
-    };
-  }
-
-  function inBlock(style, terminator) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.match(terminator)) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        stream.next();
-      }
-      return style;
-    };
-  }
-
-  return {
-    startState: function(base) {
-      return {tokenize: tokenBase,
-              baseIndent: base || 0,
-              stack: []};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-
-      var context = state.stack[state.stack.length-1];
-      if (stream.current() == "[" || type === "doindent" || type == "[") state.stack.push("rule");
-      else if (type === "endtag") state.stack[state.stack.length-1] = "endtag";
-      else if (stream.current() == "]" || type == "]" || (type == ">" && context == "rule")) state.stack.pop();
-      else if (type == "[") state.stack.push("[");
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var n = state.stack.length;
-
-      if( textAfter.match(/\]\s+|\]/) )n=n-1;
-      else if(textAfter.substr(textAfter.length-1, textAfter.length) === ">"){
-        if(textAfter.substr(0,1) === "<")n;
-        else if( type == "doindent" && textAfter.length > 1 )n;
-        else if( type == "doindent")n--;
-        else if( type == ">" && textAfter.length > 1)n;
-        else if( type == "tag" && textAfter !== ">")n;
-        else if( type == "tag" && state.stack[state.stack.length-1] == "rule")n--;
-        else if( type == "tag")n++;
-        else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule" && type === ">")n--;
-        else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule")n;
-        else if( textAfter.substr(0,1) !== "<" && textAfter.substr(0,1) === ">" )n=n-1;
-        else if( textAfter === ">")n;
-        else n=n-1;
-        //over rule them all
-        if(type == null || type == "]")n--;
-      }
-
-      return state.baseIndent + n * indentUnit;
-    },
-
-    electricChars: "]>"
-  };
-});
-
-CodeMirror.defineMIME("application/xml-dtd", "dtd");
diff --git a/resources/libs/codemirror/mode/dtd/index.html b/resources/libs/codemirror/mode/dtd/index.html
deleted file mode 100644
index 076d827f7..000000000
--- a/resources/libs/codemirror/mode/dtd/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: DTD mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="dtd.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">DTD</a>
-  </ul>
-</div>
-
-<article>
-<h2>DTD mode</h2>
-<form><textarea id="code" name="code"><?xml version="1.0" encoding="UTF-8"?>
-
-<!ATTLIST title
-  xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
-  role	CDATA	#IMPLIED
-  %db.common.attributes;
-  %db.common.linking.attributes;
->
-
-<!--
-  Try: http://docbook.org/xml/5.0/dtd/docbook.dtd
--->
-
-<!DOCTYPE xsl:stylesheet
-  [
-    <!ENTITY nbsp   "&amp;#160;">
-    <!ENTITY copy   "&amp;#169;">
-    <!ENTITY reg    "&amp;#174;">
-    <!ENTITY trade  "&amp;#8482;">
-    <!ENTITY mdash  "&amp;#8212;">
-    <!ENTITY ldquo  "&amp;#8220;">
-    <!ENTITY rdquo  "&amp;#8221;">
-    <!ENTITY pound  "&amp;#163;">
-    <!ENTITY yen    "&amp;#165;">
-    <!ENTITY euro   "&amp;#8364;">
-    <!ENTITY mathml "http://www.w3.org/1998/Math/MathML">
-  ]
->
-
-<!ELEMENT title (#PCDATA|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|abbrev|acronym|date|emphasis|footnote|footnoteref|foreignphrase|phrase|quote|wordasword|firstterm|glossterm|coref|trademark|productnumber|productname|database|application|hardware|citation|citerefentry|citetitle|citebiblioid|author|person|personname|org|orgname|editor|jobtitle|replaceable|package|parameter|termdef|nonterminal|systemitem|option|optional|property|inlineequation|tag|markup|token|symbol|literal|code|constant|email|uri|guiicon|guibutton|guimenuitem|guimenu|guisubmenu|guilabel|menuchoice|mousebutton|keycombo|keycap|keycode|keysym|shortcut|accel|prompt|envar|filename|command|computeroutput|userinput|function|varname|returnvalue|type|classname|exceptionname|interfacename|methodname|modifier|initializer|ooclass|ooexception|oointerface|errorcode|errortext|errorname|errortype)*>
-
-<!ENTITY % db.common.attributes "
-  xml:id	ID	#IMPLIED
-  version	CDATA	#IMPLIED
-  xml:lang	CDATA	#IMPLIED
-  xml:base	CDATA	#IMPLIED
-  remap	CDATA	#IMPLIED
-  xreflabel	CDATA	#IMPLIED
-  revisionflag	(changed|added|deleted|off)	#IMPLIED
-  dir	(ltr|rtl|lro|rlo)	#IMPLIED
-  arch	CDATA	#IMPLIED
-  audience	CDATA	#IMPLIED
-  condition	CDATA	#IMPLIED
-  conformance	CDATA	#IMPLIED
-  os	CDATA	#IMPLIED
-  revision	CDATA	#IMPLIED
-  security	CDATA	#IMPLIED
-  userlevel	CDATA	#IMPLIED
-  vendor	CDATA	#IMPLIED
-  wordsize	CDATA	#IMPLIED
-  annotations	CDATA	#IMPLIED
-
-"></textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "dtd", alignCDATA: true},
-        lineNumbers: true,
-        lineWrapping: true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>application/xml-dtd</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/ecl/ecl.js b/resources/libs/codemirror/mode/ecl/ecl.js
deleted file mode 100644
index 7601b189a..000000000
--- a/resources/libs/codemirror/mode/ecl/ecl.js
+++ /dev/null
@@ -1,192 +0,0 @@
-CodeMirror.defineMode("ecl", function(config) {
-
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  function metaHook(stream, state) {
-    if (!state.startOfLine) return false;
-    stream.skipToEnd();
-    return "meta";
-  }
-
-  var indentUnit = config.indentUnit;
-  var keyword = words("abs acos allnodes ascii asin asstring atan atan2 ave case choose choosen choosesets clustersize combine correlation cos cosh count covariance cron dataset dedup define denormalize distribute distributed distribution ebcdic enth error evaluate event eventextra eventname exists exp failcode failmessage fetch fromunicode getisvalid global graph group hash hash32 hash64 hashcrc hashmd5 having if index intformat isvalid iterate join keyunicode length library limit ln local log loop map matched matchlength matchposition matchtext matchunicode max merge mergejoin min nolocal nonempty normalize parse pipe power preload process project pull random range rank ranked realformat recordof regexfind regexreplace regroup rejected rollup round roundup row rowdiff sample set sin sinh sizeof soapcall sort sorted sqrt stepped stored sum table tan tanh thisnode topn tounicode transfer trim truncate typeof ungroup unicodeorder variance which workunit xmldecode xmlencode xmltext xmlunicode");
-  var variable = words("apply assert build buildindex evaluate fail keydiff keypatch loadxml nothor notify output parallel sequential soapcall wait");
-  var variable_2 = words("__compressed__ all and any as atmost before beginc++ best between case const counter csv descend encrypt end endc++ endmacro except exclusive expire export extend false few first flat from full function group header heading hole ifblock import in interface joined keep keyed last left limit load local locale lookup macro many maxcount maxlength min skew module named nocase noroot noscan nosort not of only opt or outer overwrite packed partition penalty physicallength pipe quote record relationship repeat return right scan self separator service shared skew skip sql store terminator thor threshold token transform trim true type unicodeorder unsorted validate virtual whole wild within xml xpath");
-  var variable_3 = words("ascii big_endian boolean data decimal ebcdic integer pattern qstring real record rule set of string token udecimal unicode unsigned varstring varunicode");
-  var builtin = words("checkpoint deprecated failcode failmessage failure global independent onwarning persist priority recovery stored success wait when");
-  var blockKeywords = words("catch class do else finally for if switch try while");
-  var atoms = words("true false null");
-  var hooks = {"#": metaHook};
-  var multiLineStrings;
-  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
-
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    var cur = stream.current().toLowerCase();
-    if (keyword.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "keyword";
-    } else if (variable.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "variable";
-    } else if (variable_2.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "variable-2";
-    } else if (variable_3.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "variable-3";
-    } else if (builtin.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "builtin";
-    } else { //Data types are of from KEYWORD##
-                var i = cur.length - 1;
-                while(i >= 0 && (!isNaN(cur[i]) || cur[i] == '_'))
-                        --i;
-
-                if (i > 0) {
-                        var cur2 = cur.substr(0, i + 1);
-                if (variable_3.propertyIsEnumerable(cur2)) {
-                        if (blockKeywords.propertyIsEnumerable(cur2)) curPunc = "newstatement";
-                        return "variable-3";
-                }
-            }
-    }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return null;
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !(escaped || multiLineStrings))
-        state.tokenize = tokenBase;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function pushContext(state, col, type) {
-    return state.context = new Context(state.indented, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true
-      };
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
-        pushContext(state, stream.column(), "statement");
-      state.startOfLine = false;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
-      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
-      var closing = firstChar == ctx.type;
-      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : indentUnit);
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: "{}"
-  };
-});
-
-CodeMirror.defineMIME("text/x-ecl", "ecl");
diff --git a/resources/libs/codemirror/mode/ecl/index.html b/resources/libs/codemirror/mode/ecl/index.html
deleted file mode 100644
index f4b612d61..000000000
--- a/resources/libs/codemirror/mode/ecl/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: ECL mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="ecl.js"></script>
-<style>.CodeMirror {border: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">ECL</a>
-  </ul>
-</div>
-
-<article>
-<h2>ECL mode</h2>
-<form><textarea id="code" name="code">
-/*
-sample useless code to demonstrate ecl syntax highlighting
-this is a multiline comment!
-*/
-
-//  this is a singleline comment!
-
-import ut;
-r := 
-  record
-   string22 s1 := '123';
-   integer4 i1 := 123;
-  end;
-#option('tmp', true);
-d := dataset('tmp::qb', r, thor);
-output(d);
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p>Based on CodeMirror's clike mode.  For more information see <a href="http://hpccsystems.com">HPCC Systems</a> web site.</p>
-    <p><strong>MIME types defined:</strong> <code>text/x-ecl</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/eiffel/eiffel.js b/resources/libs/codemirror/mode/eiffel/eiffel.js
deleted file mode 100644
index 15f34a932..000000000
--- a/resources/libs/codemirror/mode/eiffel/eiffel.js
+++ /dev/null
@@ -1,147 +0,0 @@
-CodeMirror.defineMode("eiffel", function() {
-  function wordObj(words) {
-    var o = {};
-    for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
-    return o;
-  }
-  var keywords = wordObj([
-    'note',
-    'across',
-    'when',
-    'variant',
-    'until',
-    'unique',
-    'undefine',
-    'then',
-    'strip',
-    'select',
-    'retry',
-    'rescue',
-    'require',
-    'rename',
-    'reference',
-    'redefine',
-    'prefix',
-    'once',
-    'old',
-    'obsolete',
-    'loop',
-    'local',
-    'like',
-    'is',
-    'inspect',
-    'infix',
-    'include',
-    'if',
-    'frozen',
-    'from',
-    'external',
-    'export',
-    'ensure',
-    'end',
-    'elseif',
-    'else',
-    'do',
-    'creation',
-    'create',
-    'check',
-    'alias',
-    'agent',
-    'separate',
-    'invariant',
-    'inherit',
-    'indexing',
-    'feature',
-    'expanded',
-    'deferred',
-    'class',
-    'Void',
-    'True',
-    'Result',
-    'Precursor',
-    'False',
-    'Current',
-    'create',
-    'attached',
-    'detachable',
-    'as',
-    'and',
-    'implies',
-    'not',
-    'or'
-  ]);
-  var operators = wordObj([":=", "and then","and", "or","<<",">>"]);
-  var curPunc;
-
-  function chain(newtok, stream, state) {
-    state.tokenize.push(newtok);
-    return newtok(stream, state);
-  }
-
-  function tokenBase(stream, state) {
-    curPunc = null;
-    if (stream.eatSpace()) return null;
-    var ch = stream.next();
-    if (ch == '"'||ch == "'") {
-      return chain(readQuoted(ch, "string"), stream, state);
-    } else if (ch == "-"&&stream.eat("-")) {
-      stream.skipToEnd();
-      return "comment";
-    } else if (ch == ":"&&stream.eat("=")) {
-      return "operator";
-    } else if (/[0-9]/.test(ch)) {
-      stream.eatWhile(/[xXbBCc0-9\.]/);
-      stream.eat(/[\?\!]/);
-      return "ident";
-    } else if (/[a-zA-Z_0-9]/.test(ch)) {
-      stream.eatWhile(/[a-zA-Z_0-9]/);
-      stream.eat(/[\?\!]/);
-      return "ident";
-    } else if (/[=+\-\/*^%<>~]/.test(ch)) {
-      stream.eatWhile(/[=+\-\/*^%<>~]/);
-      return "operator";
-    } else {
-      return null;
-    }
-  }
-
-  function readQuoted(quote, style,  unescaped) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && (unescaped || !escaped)) {
-          state.tokenize.pop();
-          break;
-        }
-        escaped = !escaped && ch == "%";
-      }
-      return style;
-    };
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: [tokenBase]};
-    },
-
-    token: function(stream, state) {
-      var style = state.tokenize[state.tokenize.length-1](stream, state);
-      if (style == "ident") {
-        var word = stream.current();
-        style = keywords.propertyIsEnumerable(stream.current()) ? "keyword"
-          : operators.propertyIsEnumerable(stream.current()) ? "operator"
-          : /^[A-Z][A-Z_0-9]*$/g.test(word) ? "tag"
-          : /^0[bB][0-1]+$/g.test(word) ? "number"
-          : /^0[cC][0-7]+$/g.test(word) ? "number"
-          : /^0[xX][a-fA-F0-9]+$/g.test(word) ? "number"
-          : /^([0-9]+\.[0-9]*)|([0-9]*\.[0-9]+)$/g.test(word) ? "number"
-          : /^[0-9]+$/g.test(word) ? "number"
-          : "variable";
-      }
-      return style;
-    },
-    lineComment: "--"
-  };
-});
-
-CodeMirror.defineMIME("text/x-eiffel", "eiffel");
diff --git a/resources/libs/codemirror/mode/eiffel/index.html b/resources/libs/codemirror/mode/eiffel/index.html
deleted file mode 100644
index 5d395a05c..000000000
--- a/resources/libs/codemirror/mode/eiffel/index.html
+++ /dev/null
@@ -1,430 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Eiffel mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/neat.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="eiffel.js"></script>
-<style>
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .cm-s-default span.cm-arrow { color: red; }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Eiffel</a>
-  </ul>
-</div>
-
-<article>
-<h2>Eiffel mode</h2>
-<form><textarea id="code" name="code">
-note
-    description: "[
-        Project-wide universal properties.
-        This class is an ancestor to all developer-written classes.
-        ANY may be customized for individual projects or teams.
-        ]"
-
-    library: "Free implementation of ELKS library"
-    status: "See notice at end of class."
-    legal: "See notice at end of class."
-    date: "$Date: 2013-01-25 11:49:00 -0800 (Fri, 25 Jan 2013) $"
-    revision: "$Revision: 712 $"
-
-class
-    ANY
-
-feature -- Customization
-
-feature -- Access
-
-    generator: STRING
-            -- Name of current object's generating class
-            -- (base class of the type of which it is a direct instance)
-        external
-            "built_in"
-        ensure
-            generator_not_void: Result /= Void
-            generator_not_empty: not Result.is_empty
-        end
-
-    generating_type: TYPE [detachable like Current]
-            -- Type of current object
-            -- (type of which it is a direct instance)
-        do
-            Result := {detachable like Current}
-        ensure
-            generating_type_not_void: Result /= Void
-        end
-
-feature -- Status report
-
-    conforms_to (other: ANY): BOOLEAN
-            -- Does type of current object conform to type
-            -- of `other' (as per Eiffel: The Language, chapter 13)?
-        require
-            other_not_void: other /= Void
-        external
-            "built_in"
-        end
-
-    same_type (other: ANY): BOOLEAN
-            -- Is type of current object identical to type of `other'?
-        require
-            other_not_void: other /= Void
-        external
-            "built_in"
-        ensure
-            definition: Result = (conforms_to (other) and
-                                        other.conforms_to (Current))
-        end
-
-feature -- Comparison
-
-    is_equal (other: like Current): BOOLEAN
-            -- Is `other' attached to an object considered
-            -- equal to current object?
-        require
-            other_not_void: other /= Void
-        external
-            "built_in"
-        ensure
-            symmetric: Result implies other ~ Current
-            consistent: standard_is_equal (other) implies Result
-        end
-
-    frozen standard_is_equal (other: like Current): BOOLEAN
-            -- Is `other' attached to an object of the same type
-            -- as current object, and field-by-field identical to it?
-        require
-            other_not_void: other /= Void
-        external
-            "built_in"
-        ensure
-            same_type: Result implies same_type (other)
-            symmetric: Result implies other.standard_is_equal (Current)
-        end
-
-    frozen equal (a: detachable ANY; b: like a): BOOLEAN
-            -- Are `a' and `b' either both void or attached
-            -- to objects considered equal?
-        do
-            if a = Void then
-                Result := b = Void
-            else
-                Result := b /= Void and then
-                            a.is_equal (b)
-            end
-        ensure
-            definition: Result = (a = Void and b = Void) or else
-                        ((a /= Void and b /= Void) and then
-                        a.is_equal (b))
-        end
-
-    frozen standard_equal (a: detachable ANY; b: like a): BOOLEAN
-            -- Are `a' and `b' either both void or attached to
-            -- field-by-field identical objects of the same type?
-            -- Always uses default object comparison criterion.
-        do
-            if a = Void then
-                Result := b = Void
-            else
-                Result := b /= Void and then
-                            a.standard_is_equal (b)
-            end
-        ensure
-            definition: Result = (a = Void and b = Void) or else
-                        ((a /= Void and b /= Void) and then
-                        a.standard_is_equal (b))
-        end
-
-    frozen is_deep_equal (other: like Current): BOOLEAN
-            -- Are `Current' and `other' attached to isomorphic object structures?
-        require
-            other_not_void: other /= Void
-        external
-            "built_in"
-        ensure
-            shallow_implies_deep: standard_is_equal (other) implies Result
-            same_type: Result implies same_type (other)
-            symmetric: Result implies other.is_deep_equal (Current)
-        end
-
-    frozen deep_equal (a: detachable ANY; b: like a): BOOLEAN
-            -- Are `a' and `b' either both void
-            -- or attached to isomorphic object structures?
-        do
-            if a = Void then
-                Result := b = Void
-            else
-                Result := b /= Void and then a.is_deep_equal (b)
-            end
-        ensure
-            shallow_implies_deep: standard_equal (a, b) implies Result
-            both_or_none_void: (a = Void) implies (Result = (b = Void))
-            same_type: (Result and (a /= Void)) implies (b /= Void and then a.same_type (b))
-            symmetric: Result implies deep_equal (b, a)
-        end
-
-feature -- Duplication
-
-    frozen twin: like Current
-            -- New object equal to `Current'
-            -- `twin' calls `copy'; to change copying/twinning semantics, redefine `copy'.
-        external
-            "built_in"
-        ensure
-            twin_not_void: Result /= Void
-            is_equal: Result ~ Current
-        end
-
-    copy (other: like Current)
-            -- Update current object using fields of object attached
-            -- to `other', so as to yield equal objects.
-        require
-            other_not_void: other /= Void
-            type_identity: same_type (other)
-        external
-            "built_in"
-        ensure
-            is_equal: Current ~ other
-        end
-
-    frozen standard_copy (other: like Current)
-            -- Copy every field of `other' onto corresponding field
-            -- of current object.
-        require
-            other_not_void: other /= Void
-            type_identity: same_type (other)
-        external
-            "built_in"
-        ensure
-            is_standard_equal: standard_is_equal (other)
-        end
-
-    frozen clone (other: detachable ANY): like other
-            -- Void if `other' is void; otherwise new object
-            -- equal to `other'
-            --
-            -- For non-void `other', `clone' calls `copy';
-            -- to change copying/cloning semantics, redefine `copy'.
-        obsolete
-            "Use `twin' instead."
-        do
-            if other /= Void then
-                Result := other.twin
-            end
-        ensure
-            equal: Result ~ other
-        end
-
-    frozen standard_clone (other: detachable ANY): like other
-            -- Void if `other' is void; otherwise new object
-            -- field-by-field identical to `other'.
-            -- Always uses default copying semantics.
-        obsolete
-            "Use `standard_twin' instead."
-        do
-            if other /= Void then
-                Result := other.standard_twin
-            end
-        ensure
-            equal: standard_equal (Result, other)
-        end
-
-    frozen standard_twin: like Current
-            -- New object field-by-field identical to `other'.
-            -- Always uses default copying semantics.
-        external
-            "built_in"
-        ensure
-            standard_twin_not_void: Result /= Void
-            equal: standard_equal (Result, Current)
-        end
-
-    frozen deep_twin: like Current
-            -- New object structure recursively duplicated from Current.
-        external
-            "built_in"
-        ensure
-            deep_twin_not_void: Result /= Void
-            deep_equal: deep_equal (Current, Result)
-        end
-
-    frozen deep_clone (other: detachable ANY): like other
-            -- Void if `other' is void: otherwise, new object structure
-            -- recursively duplicated from the one attached to `other'
-        obsolete
-            "Use `deep_twin' instead."
-        do
-            if other /= Void then
-                Result := other.deep_twin
-            end
-        ensure
-            deep_equal: deep_equal (other, Result)
-        end
-
-    frozen deep_copy (other: like Current)
-            -- Effect equivalent to that of:
-            --      `copy' (`other' . `deep_twin')
-        require
-            other_not_void: other /= Void
-        do
-            copy (other.deep_twin)
-        ensure
-            deep_equal: deep_equal (Current, other)
-        end
-
-feature {NONE} -- Retrieval
-
-    frozen internal_correct_mismatch
-            -- Called from runtime to perform a proper dynamic dispatch on `correct_mismatch'
-            -- from MISMATCH_CORRECTOR.
-        local
-            l_msg: STRING
-            l_exc: EXCEPTIONS
-        do
-            if attached {MISMATCH_CORRECTOR} Current as l_corrector then
-                l_corrector.correct_mismatch
-            else
-                create l_msg.make_from_string ("Mismatch: ")
-                create l_exc
-                l_msg.append (generating_type.name)
-                l_exc.raise_retrieval_exception (l_msg)
-            end
-        end
-
-feature -- Output
-
-    io: STD_FILES
-            -- Handle to standard file setup
-        once
-            create Result
-            Result.set_output_default
-        ensure
-            io_not_void: Result /= Void
-        end
-
-    out: STRING
-            -- New string containing terse printable representation
-            -- of current object
-        do
-            Result := tagged_out
-        ensure
-            out_not_void: Result /= Void
-        end
-
-    frozen tagged_out: STRING
-            -- New string containing terse printable representation
-            -- of current object
-        external
-            "built_in"
-        ensure
-            tagged_out_not_void: Result /= Void
-        end
-
-    print (o: detachable ANY)
-            -- Write terse external representation of `o'
-            -- on standard output.
-        do
-            if o /= Void then
-                io.put_string (o.out)
-            end
-        end
-
-feature -- Platform
-
-    Operating_environment: OPERATING_ENVIRONMENT
-            -- Objects available from the operating system
-        once
-            create Result
-        ensure
-            operating_environment_not_void: Result /= Void
-        end
-
-feature {NONE} -- Initialization
-
-    default_create
-            -- Process instances of classes with no creation clause.
-            -- (Default: do nothing.)
-        do
-        end
-
-feature -- Basic operations
-
-    default_rescue
-            -- Process exception for routines with no Rescue clause.
-            -- (Default: do nothing.)
-        do
-        end
-
-    frozen do_nothing
-            -- Execute a null action.
-        do
-        end
-
-    frozen default: detachable like Current
-            -- Default value of object's type
-        do
-        end
-
-    frozen default_pointer: POINTER
-            -- Default value of type `POINTER'
-            -- (Avoid the need to write `p'.`default' for
-            -- some `p' of type `POINTER'.)
-        do
-        ensure
-            -- Result = Result.default
-        end
-
-    frozen as_attached: attached like Current
-            -- Attached version of Current
-            -- (Can be used during transitional period to convert
-            -- non-void-safe classes to void-safe ones.)
-        do
-            Result := Current
-        end
-
-invariant
-    reflexive_equality: standard_is_equal (Current)
-    reflexive_conformance: conforms_to (Current)
-
-note
-    copyright: "Copyright (c) 1984-2012, Eiffel Software and others"
-    license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-    source: "[
-            Eiffel Software
-            5949 Hollister Ave., Goleta, CA 93117 USA
-            Telephone 805-685-1006, Fax 805-685-6869
-            Website http://www.eiffel.com
-            Customer support http://support.eiffel.com
-        ]"
-
-end
-
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "text/x-eiffel",
-        tabMode: "indent",
-        indentUnit: 4,
-        lineNumbers: true,
-        theme: "neat"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-eiffel</code>.</p>
- 
- <p> Created by <a href="https://github.com/ynh">YNH</a>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/erlang/erlang.js b/resources/libs/codemirror/mode/erlang/erlang.js
deleted file mode 100644
index af8953c33..000000000
--- a/resources/libs/codemirror/mode/erlang/erlang.js
+++ /dev/null
@@ -1,484 +0,0 @@
-// block; "begin", "case", "fun", "if", "receive", "try": closed by "end"
-// block internal; "after", "catch", "of"
-// guard; "when", closed by "->"
-// "->" opens a clause, closed by ";" or "."
-// "<<" opens a binary, closed by ">>"
-// "," appears in arglists, lists, tuples and terminates lines of code
-// "." resets indentation to 0
-// obsolete; "cond", "let", "query"
-
-CodeMirror.defineMIME("text/x-erlang", "erlang");
-
-CodeMirror.defineMode("erlang", function(cmCfg) {
-
-  function rval(state,_stream,type) {
-    // distinguish between "." as terminator and record field operator
-    state.in_record = (type == "record");
-
-    //     erlang             -> CodeMirror tag
-    switch (type) {
-      case "atom":        return "atom";
-      case "attribute":   return "attribute";
-      case "boolean":     return "special";
-      case "builtin":     return "builtin";
-      case "comment":     return "comment";
-      case "fun":         return "meta";
-      case "function":    return "tag";
-      case "guard":       return "property";
-      case "keyword":     return "keyword";
-      case "macro":       return "variable-2";
-      case "number":      return "number";
-      case "operator":    return "operator";
-      case "record":      return "bracket";
-      case "string":      return "string";
-      case "type":        return "def";
-      case "variable":    return "variable";
-      case "error":       return "error";
-      case "separator":   return null;
-      case "open_paren":  return null;
-      case "close_paren": return null;
-      default:            return null;
-    }
-  }
-
-  var typeWords = [
-    "-type", "-spec", "-export_type", "-opaque"];
-
-  var keywordWords = [
-    "after","begin","catch","case","cond","end","fun","if",
-    "let","of","query","receive","try","when"];
-
-  var separatorRE        = /[\->\.,:;]/;
-  var separatorWords = [
-    "->",";",":",".",","];
-
-  var operatorWords = [
-    "and","andalso","band","bnot","bor","bsl","bsr","bxor",
-    "div","not","or","orelse","rem","xor"];
-
-  var symbolRE     = /[\+\-\*\/<>=\|:!]/;
-  var symbolWords = [
-    "+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-","!"];
-
-  var openParenRE  = /[<\(\[\{]/;
-  var openParenWords = [
-    "<<","(","[","{"];
-
-  var closeParenRE = /[>\)\]\}]/;
-  var closeParenWords = [
-    "}","]",")",">>"];
-
-  var guardWords = [
-    "is_atom","is_binary","is_bitstring","is_boolean","is_float",
-    "is_function","is_integer","is_list","is_number","is_pid",
-    "is_port","is_record","is_reference","is_tuple",
-    "atom","binary","bitstring","boolean","function","integer","list",
-    "number","pid","port","record","reference","tuple"];
-
-  var bifWords = [
-    "abs","adler32","adler32_combine","alive","apply","atom_to_binary",
-    "atom_to_list","binary_to_atom","binary_to_existing_atom",
-    "binary_to_list","binary_to_term","bit_size","bitstring_to_list",
-    "byte_size","check_process_code","contact_binary","crc32",
-    "crc32_combine","date","decode_packet","delete_module",
-    "disconnect_node","element","erase","exit","float","float_to_list",
-    "garbage_collect","get","get_keys","group_leader","halt","hd",
-    "integer_to_list","internal_bif","iolist_size","iolist_to_binary",
-    "is_alive","is_atom","is_binary","is_bitstring","is_boolean",
-    "is_float","is_function","is_integer","is_list","is_number","is_pid",
-    "is_port","is_process_alive","is_record","is_reference","is_tuple",
-    "length","link","list_to_atom","list_to_binary","list_to_bitstring",
-    "list_to_existing_atom","list_to_float","list_to_integer",
-    "list_to_pid","list_to_tuple","load_module","make_ref","module_loaded",
-    "monitor_node","node","node_link","node_unlink","nodes","notalive",
-    "now","open_port","pid_to_list","port_close","port_command",
-    "port_connect","port_control","pre_loaded","process_flag",
-    "process_info","processes","purge_module","put","register",
-    "registered","round","self","setelement","size","spawn","spawn_link",
-    "spawn_monitor","spawn_opt","split_binary","statistics",
-    "term_to_binary","time","throw","tl","trunc","tuple_size",
-    "tuple_to_list","unlink","unregister","whereis"];
-
-// [Ø-Þ] [À-Ö]
-// [ß-ö] [ø-ÿ]
-  var anumRE       = /[\w@Ø-ÞÀ-Öß-öø-ÿ]/;
-  var escapesRE    =
-    /[0-7]{1,3}|[bdefnrstv\\"']|\^[a-zA-Z]|x[0-9a-zA-Z]{2}|x{[0-9a-zA-Z]+}/;
-
-  function tokenize(stream, state) {
-
-    // in multi-line string
-    if (state.in_string) {
-      state.in_string =  (!doubleQuote(stream));
-      return rval(state,stream,"string");
-    }
-
-    // in multi-line atom
-    if (state.in_atom) {
-      state.in_atom =  (!singleQuote(stream));
-      return rval(state,stream,"atom");
-    }
-
-    // whitespace
-    if (stream.eatSpace()) {
-      return rval(state,stream,"whitespace");
-    }
-
-    // attributes and type specs
-    if ((peekToken(state).token == "") &&
-        stream.match(/-\s*[a-zß-öø-ÿ][\wØ-ÞÀ-Öß-öø-ÿ]*/)) {
-      if (isMember(stream.current(),typeWords)) {
-        return rval(state,stream,"type");
-      }else{
-        return rval(state,stream,"attribute");
-      }
-    }
-
-    var ch = stream.next();
-
-    // comment
-    if (ch == '%') {
-      stream.skipToEnd();
-      return rval(state,stream,"comment");
-    }
-
-    // macro
-    if (ch == '?') {
-      stream.eatWhile(anumRE);
-      return rval(state,stream,"macro");
-    }
-
-    // record
-    if (ch == "#") {
-      stream.eatWhile(anumRE);
-      return rval(state,stream,"record");
-    }
-
-    // dollar escape
-    if ( ch == "$" ) {
-      if (stream.next() == "\\" && !stream.match(escapesRE)) {
-        return rval(state,stream,"error");
-      }
-      return rval(state,stream,"number");
-    }
-
-    // quoted atom
-    if (ch == '\'') {
-      if (!(state.in_atom = (!singleQuote(stream)))) {
-        if (stream.match(/\s*\/\s*[0-9]/,false)) {
-          stream.match(/\s*\/\s*[0-9]/,true);
-          popToken(state);
-          return rval(state,stream,"fun");      // 'f'/0 style fun
-        }
-        if (stream.match(/\s*\(/,false) || stream.match(/\s*:/,false)) {
-          return rval(state,stream,"function");
-        }
-      }
-      return rval(state,stream,"atom");
-    }
-
-    // string
-    if (ch == '"') {
-      state.in_string = (!doubleQuote(stream));
-      return rval(state,stream,"string");
-    }
-
-    // variable
-    if (/[A-Z_Ø-ÞÀ-Ö]/.test(ch)) {
-      stream.eatWhile(anumRE);
-      return rval(state,stream,"variable");
-    }
-
-    // atom/keyword/BIF/function
-    if (/[a-z_ß-öø-ÿ]/.test(ch)) {
-      stream.eatWhile(anumRE);
-
-      if (stream.match(/\s*\/\s*[0-9]/,false)) {
-        stream.match(/\s*\/\s*[0-9]/,true);
-        popToken(state);
-        return rval(state,stream,"fun");      // f/0 style fun
-      }
-
-      var w = stream.current();
-
-      if (isMember(w,keywordWords)) {
-        pushToken(state,stream);
-        return rval(state,stream,"keyword");
-      }else if (stream.match(/\s*\(/,false)) {
-        // 'put' and 'erlang:put' are bifs, 'foo:put' is not
-        if (isMember(w,bifWords) &&
-            (!isPrev(stream,":") || isPrev(stream,"erlang:"))) {
-          return rval(state,stream,"builtin");
-        }else if (isMember(w,guardWords)) {
-          return rval(state,stream,"guard");
-        }else{
-          return rval(state,stream,"function");
-        }
-      }else if (isMember(w,operatorWords)) {
-        return rval(state,stream,"operator");
-      }else if (stream.match(/\s*:/,false)) {
-        if (w == "erlang") {
-          return rval(state,stream,"builtin");
-        } else {
-          return rval(state,stream,"function");
-        }
-      }else if (isMember(w,["true","false"])) {
-        return rval(state,stream,"boolean");
-      }else{
-        return rval(state,stream,"atom");
-      }
-    }
-
-    // number
-    var digitRE      = /[0-9]/;
-    var radixRE      = /[0-9a-zA-Z]/;         // 36#zZ style int
-    if (digitRE.test(ch)) {
-      stream.eatWhile(digitRE);
-      if (stream.eat('#')) {
-        stream.eatWhile(radixRE);    // 36#aZ  style integer
-      } else {
-        if (stream.eat('.')) {       // float
-          stream.eatWhile(digitRE);
-        }
-        if (stream.eat(/[eE]/)) {
-          stream.eat(/[-+]/);        // float with exponent
-          stream.eatWhile(digitRE);
-        }
-      }
-      return rval(state,stream,"number");   // normal integer
-    }
-
-    // open parens
-    if (nongreedy(stream,openParenRE,openParenWords)) {
-      pushToken(state,stream);
-      return rval(state,stream,"open_paren");
-    }
-
-    // close parens
-    if (nongreedy(stream,closeParenRE,closeParenWords)) {
-      pushToken(state,stream);
-      return rval(state,stream,"close_paren");
-    }
-
-    // separators
-    if (greedy(stream,separatorRE,separatorWords)) {
-      // distinguish between "." as terminator and record field operator
-      if (!state.in_record) {
-        pushToken(state,stream);
-      }
-      return rval(state,stream,"separator");
-    }
-
-    // operators
-    if (greedy(stream,symbolRE,symbolWords)) {
-      return rval(state,stream,"operator");
-    }
-
-    return rval(state,stream,null);
-  }
-
-  function isPrev(stream,string) {
-    var start = stream.start;
-    var len = string.length;
-    if (len <= start) {
-      var word = stream.string.slice(start-len,start);
-      return word == string;
-    }else{
-      return false;
-    }
-  }
-
-  function nongreedy(stream,re,words) {
-    if (stream.current().length == 1 && re.test(stream.current())) {
-      stream.backUp(1);
-      while (re.test(stream.peek())) {
-        stream.next();
-        if (isMember(stream.current(),words)) {
-          return true;
-        }
-      }
-      stream.backUp(stream.current().length-1);
-    }
-    return false;
-  }
-
-  function greedy(stream,re,words) {
-    if (stream.current().length == 1 && re.test(stream.current())) {
-      while (re.test(stream.peek())) {
-        stream.next();
-      }
-      while (0 < stream.current().length) {
-        if (isMember(stream.current(),words)) {
-          return true;
-        }else{
-          stream.backUp(1);
-        }
-      }
-      stream.next();
-    }
-    return false;
-  }
-
-  function doubleQuote(stream) {
-    return quote(stream, '"', '\\');
-  }
-
-  function singleQuote(stream) {
-    return quote(stream,'\'','\\');
-  }
-
-  function quote(stream,quoteChar,escapeChar) {
-    while (!stream.eol()) {
-      var ch = stream.next();
-      if (ch == quoteChar) {
-        return true;
-      }else if (ch == escapeChar) {
-        stream.next();
-      }
-    }
-    return false;
-  }
-
-  function isMember(element,list) {
-    return (-1 < list.indexOf(element));
-  }
-
-/////////////////////////////////////////////////////////////////////////////
-  function myIndent(state,textAfter) {
-    var indent = cmCfg.indentUnit;
-    var token = (peekToken(state)).token;
-    var wordAfter = takewhile(textAfter,/[^a-z]/);
-
-    if (state.in_string || state.in_atom) {
-      return CodeMirror.Pass;
-    }else if (token == "") {
-      return 0;
-    }else if (isMember(token,openParenWords)) {
-      return (peekToken(state)).column+token.length;
-    }else if (token == "when") {
-      return (peekToken(state)).column+token.length+1;
-    }else if (token == "fun" && wordAfter == "") {
-      return (peekToken(state)).column+token.length;
-    }else if (token == "->") {
-      if (isMember(wordAfter,["end","after","catch"])) {
-        return peekToken(state,2).column;
-      }else if (peekToken(state,2).token == "fun") {
-        return peekToken(state,2).column+indent;
-      }else if (peekToken(state,2).token == "") {
-        return indent;
-      }else{
-        return (peekToken(state)).indent+indent;
-      }
-    }else if (isMember(wordAfter,["after","catch","of"])) {
-      return (peekToken(state)).indent;
-    }else{
-      return (peekToken(state)).column+indent;
-    }
-  }
-
-  function takewhile(str,re) {
-    var m = str.match(re);
-    return m ? str.slice(0,m.index) : str;
-  }
-
-  function Token(stream) {
-    this.token  = stream ? stream.current() : "";
-    this.column = stream ? stream.column() : 0;
-    this.indent = stream ? stream.indentation() : 0;
-  }
-
-  function popToken(state) {
-    return state.tokenStack.pop();
-  }
-
-  function peekToken(state,depth) {
-    var len = state.tokenStack.length;
-    var dep = (depth ? depth : 1);
-    if (len < dep) {
-      return new Token;
-    }else{
-      return state.tokenStack[len-dep];
-    }
-  }
-
-  function pushToken(state,stream) {
-    var token = stream.current();
-    var prev_token = peekToken(state).token;
-
-    if (token == ".") {
-      state.tokenStack = [];
-      return false;
-    }else if(isMember(token,[",", ":", "of", "cond", "let", "query"])) {
-      return false;
-    }else if (drop_last(prev_token,token)) {
-      return false;
-    }else if (drop_both(prev_token,token)) {
-      popToken(state);
-      return false;
-    }else if (drop_first(prev_token,token)) {
-      popToken(state);
-      return pushToken(state,stream);
-    }else if (isMember(token,["after","catch"])) {
-      return false;
-    }else{
-      state.tokenStack.push(new Token(stream));
-      return true;
-    }
-  }
-
-  function drop_last(open, close) {
-    switch(open+" "+close) {
-      case "when ;": return true;
-      default: return false;
-    }
-  }
-
-  function drop_first(open, close) {
-    switch (open+" "+close) {
-      case "when ->":       return true;
-      case "-> end":        return true;
-      default:              return false;
-    }
-  }
-
-  function drop_both(open, close) {
-    switch (open+" "+close) {
-      case "( )":         return true;
-      case "[ ]":         return true;
-      case "{ }":         return true;
-      case "<< >>":       return true;
-      case "begin end":   return true;
-      case "case end":    return true;
-      case "fun end":     return true;
-      case "if end":      return true;
-      case "receive end": return true;
-      case "try end":     return true;
-      case "-> catch":    return true;
-      case "-> after":    return true;
-      case "-> ;":        return true;
-      default:            return false;
-    }
-  }
-
-  return {
-    startState:
-      function() {
-        return {tokenStack: [],
-                in_record:  false,
-                in_string:  false,
-                in_atom:    false};
-      },
-
-    token:
-      function(stream, state) {
-        return tokenize(stream, state);
-      },
-
-    indent:
-      function(state, textAfter) {
-        return myIndent(state,textAfter);
-      },
-
-    lineComment: "%"
-  };
-});
diff --git a/resources/libs/codemirror/mode/erlang/index.html b/resources/libs/codemirror/mode/erlang/index.html
deleted file mode 100644
index e63e23120..000000000
--- a/resources/libs/codemirror/mode/erlang/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Erlang mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/erlang-dark.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="erlang.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Erlang</a>
-  </ul>
-</div>
-
-<article>
-<h2>Erlang mode</h2>
-<form><textarea id="code" name="code">
-%% -*- mode: erlang; erlang-indent-level: 2 -*-
-%%% Created :  7 May 2012 by mats cronqvist <masse@klarna.com>
-
-%% @doc
-%% Demonstrates how to print a record.
-%% @end
-
--module('ex').
--author('mats cronqvist').
--export([demo/0,
-         rec_info/1]).
-
--record(demo,{a="One",b="Two",c="Three",d="Four"}).
-
-rec_info(demo) -> record_info(fields,demo).
-
-demo() -> expand_recs(?MODULE,#demo{a="A",b="BB"}).
-
-expand_recs(M,List) when is_list(List) ->
-  [expand_recs(M,L)||L<-List];
-expand_recs(M,Tup) when is_tuple(Tup) ->
-  case tuple_size(Tup) of
-    L when L < 1 -> Tup;
-    L ->
-      try Fields = M:rec_info(element(1,Tup)),
-          L = length(Fields)+1,
-          lists:zip(Fields,expand_recs(M,tl(tuple_to_list(Tup))))
-      catch _:_ ->
-          list_to_tuple(expand_recs(M,tuple_to_list(Tup)))
-      end
-  end;
-expand_recs(_,Term) ->
-  Term.
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        extraKeys: {"Tab":  "indentAuto"},
-        theme: "erlang-dark"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-erlang</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/fortran/fortran.js b/resources/libs/codemirror/mode/fortran/fortran.js
deleted file mode 100644
index 83fd8fde8..000000000
--- a/resources/libs/codemirror/mode/fortran/fortran.js
+++ /dev/null
@@ -1,173 +0,0 @@
-CodeMirror.defineMode("fortran", function() {
-  function words(array) {
-    var keys = {};
-    for (var i = 0; i < array.length; ++i) {
-      keys[array[i]] = true;
-    }
-    return keys;
-  }
-
-  var keywords = words([
-                  "abstract", "accept", "allocatable", "allocate",
-                  "array", "assign", "asynchronous", "backspace",
-                  "bind", "block", "byte", "call", "case",
-                  "class", "close", "common", "contains",
-                  "continue", "cycle", "data", "deallocate",
-                  "decode", "deferred", "dimension", "do",
-                  "elemental", "else", "encode", "end",
-                  "endif", "entry", "enumerator", "equivalence",
-                  "exit", "external", "extrinsic", "final",
-                  "forall", "format", "function", "generic",
-                  "go", "goto", "if", "implicit", "import", "include",
-                  "inquire", "intent", "interface", "intrinsic",
-                  "module", "namelist", "non_intrinsic",
-                  "non_overridable", "none", "nopass",
-                  "nullify", "open", "optional", "options",
-                  "parameter", "pass", "pause", "pointer",
-                  "print", "private", "program", "protected",
-                  "public", "pure", "read", "recursive", "result",
-                  "return", "rewind", "save", "select", "sequence",
-                  "stop", "subroutine", "target", "then", "to", "type",
-                  "use", "value", "volatile", "where", "while",
-                  "write"]);
-  var builtins = words(["abort", "abs", "access", "achar", "acos",
-                          "adjustl", "adjustr", "aimag", "aint", "alarm",
-                          "all", "allocated", "alog", "amax", "amin",
-                          "amod", "and", "anint", "any", "asin",
-                          "associated", "atan", "besj", "besjn", "besy",
-                          "besyn", "bit_size", "btest", "cabs", "ccos",
-                          "ceiling", "cexp", "char", "chdir", "chmod",
-                          "clog", "cmplx", "command_argument_count",
-                          "complex", "conjg", "cos", "cosh", "count",
-                          "cpu_time", "cshift", "csin", "csqrt", "ctime",
-                          "c_funloc", "c_loc", "c_associated", "c_null_ptr",
-                          "c_null_funptr", "c_f_pointer", "c_null_char",
-                          "c_alert", "c_backspace", "c_form_feed",
-                          "c_new_line", "c_carriage_return",
-                          "c_horizontal_tab", "c_vertical_tab", "dabs",
-                          "dacos", "dasin", "datan", "date_and_time",
-                          "dbesj", "dbesj", "dbesjn", "dbesy", "dbesy",
-                          "dbesyn", "dble", "dcos", "dcosh", "ddim", "derf",
-                          "derfc", "dexp", "digits", "dim", "dint", "dlog",
-                          "dlog", "dmax", "dmin", "dmod", "dnint",
-                          "dot_product", "dprod", "dsign", "dsinh",
-                          "dsin", "dsqrt", "dtanh", "dtan", "dtime",
-                          "eoshift", "epsilon", "erf", "erfc", "etime",
-                          "exit", "exp", "exponent", "extends_type_of",
-                          "fdate", "fget", "fgetc", "float", "floor",
-                          "flush", "fnum", "fputc", "fput", "fraction",
-                          "fseek", "fstat", "ftell", "gerror", "getarg",
-                          "get_command", "get_command_argument",
-                          "get_environment_variable", "getcwd",
-                          "getenv", "getgid", "getlog", "getpid",
-                          "getuid", "gmtime", "hostnm", "huge", "iabs",
-                          "iachar", "iand", "iargc", "ibclr", "ibits",
-                          "ibset", "ichar", "idate", "idim", "idint",
-                          "idnint", "ieor", "ierrno", "ifix", "imag",
-                          "imagpart", "index", "int", "ior", "irand",
-                          "isatty", "ishft", "ishftc", "isign",
-                          "iso_c_binding", "is_iostat_end", "is_iostat_eor",
-                          "itime", "kill", "kind", "lbound", "len", "len_trim",
-                          "lge", "lgt", "link", "lle", "llt", "lnblnk", "loc",
-                          "log", "logical", "long", "lshift", "lstat", "ltime",
-                          "matmul", "max", "maxexponent", "maxloc", "maxval",
-                          "mclock", "merge", "move_alloc", "min", "minexponent",
-                          "minloc", "minval", "mod", "modulo", "mvbits",
-                          "nearest", "new_line", "nint", "not", "or", "pack",
-                          "perror", "precision", "present", "product", "radix",
-                          "rand", "random_number", "random_seed", "range",
-                          "real", "realpart", "rename", "repeat", "reshape",
-                          "rrspacing", "rshift", "same_type_as", "scale",
-                          "scan", "second", "selected_int_kind",
-                          "selected_real_kind", "set_exponent", "shape",
-                          "short", "sign", "signal", "sinh", "sin", "sleep",
-                          "sngl", "spacing", "spread", "sqrt", "srand", "stat",
-                          "sum", "symlnk", "system", "system_clock", "tan",
-                          "tanh", "time", "tiny", "transfer", "transpose",
-                          "trim", "ttynam", "ubound", "umask", "unlink",
-                          "unpack", "verify", "xor", "zabs", "zcos", "zexp",
-                          "zlog", "zsin", "zsqrt"]);
-
-    var dataTypes =  words(["c_bool", "c_char", "c_double", "c_double_complex",
-                     "c_float", "c_float_complex", "c_funptr", "c_int",
-                     "c_int16_t", "c_int32_t", "c_int64_t", "c_int8_t",
-                     "c_int_fast16_t", "c_int_fast32_t", "c_int_fast64_t",
-                     "c_int_fast8_t", "c_int_least16_t", "c_int_least32_t",
-                     "c_int_least64_t", "c_int_least8_t", "c_intmax_t",
-                     "c_intptr_t", "c_long", "c_long_double",
-                     "c_long_double_complex", "c_long_long", "c_ptr",
-                     "c_short", "c_signed_char", "c_size_t", "character",
-                     "complex", "double", "integer", "logical", "real"]);
-  var isOperatorChar = /[+\-*&=<>\/\:]/;
-  var litOperator = new RegExp("(\.and\.|\.or\.|\.eq\.|\.lt\.|\.le\.|\.gt\.|\.ge\.|\.ne\.|\.not\.|\.eqv\.|\.neqv\.)", "i");
-
-  function tokenBase(stream, state) {
-
-    if (stream.match(litOperator)){
-        return 'operator';
-    }
-
-    var ch = stream.next();
-    if (ch == "!") {
-      stream.skipToEnd();
-      return "comment";
-    }
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (/[\[\]\(\),]/.test(ch)) {
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    var word = stream.current().toLowerCase();
-
-    if (keywords.hasOwnProperty(word)){
-            return 'keyword';
-    }
-    if (builtins.hasOwnProperty(word) || dataTypes.hasOwnProperty(word)) {
-            return 'builtin';
-    }
-    return "variable";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-            end = true;
-            break;
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !escaped) state.tokenize = null;
-      return "string";
-    };
-  }
-
-  // Interface
-
-  return {
-    startState: function() {
-      return {tokenize: null};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
-      return style;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-fortran", "fortran");
diff --git a/resources/libs/codemirror/mode/fortran/index.html b/resources/libs/codemirror/mode/fortran/index.html
deleted file mode 100644
index efa55ec89..000000000
--- a/resources/libs/codemirror/mode/fortran/index.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Fortran mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="fortran.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Fortran</a>
-  </ul>
-</div>
-
-<article>
-<h2>Fortran mode</h2>
-
-
-<div><textarea id="code" name="code">
-! Example Fortran code
-  program average
-
-  ! Read in some numbers and take the average
-  ! As written, if there are no data points, an average of zero is returned
-  ! While this may not be desired behavior, it keeps this example simple
-
-  implicit none
-
-  real, dimension(:), allocatable :: points
-  integer                         :: number_of_points
-  real                            :: average_points=0., positive_average=0., negative_average=0.
-
-  write (*,*) "Input number of points to average:"
-  read  (*,*) number_of_points
-
-  allocate (points(number_of_points))
-
-  write (*,*) "Enter the points to average:"
-  read  (*,*) points
-
-  ! Take the average by summing points and dividing by number_of_points
-  if (number_of_points > 0) average_points = sum(points) / number_of_points
-
-  ! Now form average over positive and negative points only
-  if (count(points > 0.) > 0) then
-     positive_average = sum(points, points > 0.) / count(points > 0.)
-  end if
-
-  if (count(points < 0.) > 0) then
-     negative_average = sum(points, points < 0.) / count(points < 0.)
-  end if
-
-  deallocate (points)
-
-  ! Print result to terminal
-  write (*,'(a,g12.4)') 'Average = ', average_points
-  write (*,'(a,g12.4)') 'Average of positive points = ', positive_average
-  write (*,'(a,g12.4)') 'Average of negative points = ', negative_average
-
-  end program average
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "text/x-fortran"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-Fortran</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/gas/gas.js b/resources/libs/codemirror/mode/gas/gas.js
deleted file mode 100644
index a6e689290..000000000
--- a/resources/libs/codemirror/mode/gas/gas.js
+++ /dev/null
@@ -1,330 +0,0 @@
-CodeMirror.defineMode("gas", function(_config, parserConfig) {
-  'use strict';
-
-  // If an architecture is specified, its initialization function may
-  // populate this array with custom parsing functions which will be
-  // tried in the event that the standard functions do not find a match.
-  var custom = [];
-
-  // The symbol used to start a line comment changes based on the target
-  // architecture.
-  // If no architecture is pased in "parserConfig" then only multiline
-  // comments will have syntax support.
-  var lineCommentStartSymbol = "";
-
-  // These directives are architecture independent.
-  // Machine specific directives should go in their respective
-  // architecture initialization function.
-  // Reference:
-  // http://sourceware.org/binutils/docs/as/Pseudo-Ops.html#Pseudo-Ops
-  var directives = {
-    ".abort" : "builtin",
-    ".align" : "builtin",
-    ".altmacro" : "builtin",
-    ".ascii" : "builtin",
-    ".asciz" : "builtin",
-    ".balign" : "builtin",
-    ".balignw" : "builtin",
-    ".balignl" : "builtin",
-    ".bundle_align_mode" : "builtin",
-    ".bundle_lock" : "builtin",
-    ".bundle_unlock" : "builtin",
-    ".byte" : "builtin",
-    ".cfi_startproc" : "builtin",
-    ".comm" : "builtin",
-    ".data" : "builtin",
-    ".def" : "builtin",
-    ".desc" : "builtin",
-    ".dim" : "builtin",
-    ".double" : "builtin",
-    ".eject" : "builtin",
-    ".else" : "builtin",
-    ".elseif" : "builtin",
-    ".end" : "builtin",
-    ".endef" : "builtin",
-    ".endfunc" : "builtin",
-    ".endif" : "builtin",
-    ".equ" : "builtin",
-    ".equiv" : "builtin",
-    ".eqv" : "builtin",
-    ".err" : "builtin",
-    ".error" : "builtin",
-    ".exitm" : "builtin",
-    ".extern" : "builtin",
-    ".fail" : "builtin",
-    ".file" : "builtin",
-    ".fill" : "builtin",
-    ".float" : "builtin",
-    ".func" : "builtin",
-    ".global" : "builtin",
-    ".gnu_attribute" : "builtin",
-    ".hidden" : "builtin",
-    ".hword" : "builtin",
-    ".ident" : "builtin",
-    ".if" : "builtin",
-    ".incbin" : "builtin",
-    ".include" : "builtin",
-    ".int" : "builtin",
-    ".internal" : "builtin",
-    ".irp" : "builtin",
-    ".irpc" : "builtin",
-    ".lcomm" : "builtin",
-    ".lflags" : "builtin",
-    ".line" : "builtin",
-    ".linkonce" : "builtin",
-    ".list" : "builtin",
-    ".ln" : "builtin",
-    ".loc" : "builtin",
-    ".loc_mark_labels" : "builtin",
-    ".local" : "builtin",
-    ".long" : "builtin",
-    ".macro" : "builtin",
-    ".mri" : "builtin",
-    ".noaltmacro" : "builtin",
-    ".nolist" : "builtin",
-    ".octa" : "builtin",
-    ".offset" : "builtin",
-    ".org" : "builtin",
-    ".p2align" : "builtin",
-    ".popsection" : "builtin",
-    ".previous" : "builtin",
-    ".print" : "builtin",
-    ".protected" : "builtin",
-    ".psize" : "builtin",
-    ".purgem" : "builtin",
-    ".pushsection" : "builtin",
-    ".quad" : "builtin",
-    ".reloc" : "builtin",
-    ".rept" : "builtin",
-    ".sbttl" : "builtin",
-    ".scl" : "builtin",
-    ".section" : "builtin",
-    ".set" : "builtin",
-    ".short" : "builtin",
-    ".single" : "builtin",
-    ".size" : "builtin",
-    ".skip" : "builtin",
-    ".sleb128" : "builtin",
-    ".space" : "builtin",
-    ".stab" : "builtin",
-    ".string" : "builtin",
-    ".struct" : "builtin",
-    ".subsection" : "builtin",
-    ".symver" : "builtin",
-    ".tag" : "builtin",
-    ".text" : "builtin",
-    ".title" : "builtin",
-    ".type" : "builtin",
-    ".uleb128" : "builtin",
-    ".val" : "builtin",
-    ".version" : "builtin",
-    ".vtable_entry" : "builtin",
-    ".vtable_inherit" : "builtin",
-    ".warning" : "builtin",
-    ".weak" : "builtin",
-    ".weakref" : "builtin",
-    ".word" : "builtin"
-  };
-
-  var registers = {};
-
-  function x86(_parserConfig) {
-    lineCommentStartSymbol = "#";
-
-    registers.ax  = "variable";
-    registers.eax = "variable-2";
-    registers.rax = "variable-3";
-
-    registers.bx  = "variable";
-    registers.ebx = "variable-2";
-    registers.rbx = "variable-3";
-
-    registers.cx  = "variable";
-    registers.ecx = "variable-2";
-    registers.rcx = "variable-3";
-
-    registers.dx  = "variable";
-    registers.edx = "variable-2";
-    registers.rdx = "variable-3";
-
-    registers.si  = "variable";
-    registers.esi = "variable-2";
-    registers.rsi = "variable-3";
-
-    registers.di  = "variable";
-    registers.edi = "variable-2";
-    registers.rdi = "variable-3";
-
-    registers.sp  = "variable";
-    registers.esp = "variable-2";
-    registers.rsp = "variable-3";
-
-    registers.bp  = "variable";
-    registers.ebp = "variable-2";
-    registers.rbp = "variable-3";
-
-    registers.ip  = "variable";
-    registers.eip = "variable-2";
-    registers.rip = "variable-3";
-
-    registers.cs  = "keyword";
-    registers.ds  = "keyword";
-    registers.ss  = "keyword";
-    registers.es  = "keyword";
-    registers.fs  = "keyword";
-    registers.gs  = "keyword";
-  }
-
-  function armv6(_parserConfig) {
-    // Reference:
-    // http://infocenter.arm.com/help/topic/com.arm.doc.qrc0001l/QRC0001_UAL.pdf
-    // http://infocenter.arm.com/help/topic/com.arm.doc.ddi0301h/DDI0301H_arm1176jzfs_r0p7_trm.pdf
-    lineCommentStartSymbol = "@";
-    directives.syntax = "builtin";
-
-    registers.r0  = "variable";
-    registers.r1  = "variable";
-    registers.r2  = "variable";
-    registers.r3  = "variable";
-    registers.r4  = "variable";
-    registers.r5  = "variable";
-    registers.r6  = "variable";
-    registers.r7  = "variable";
-    registers.r8  = "variable";
-    registers.r9  = "variable";
-    registers.r10 = "variable";
-    registers.r11 = "variable";
-    registers.r12 = "variable";
-
-    registers.sp  = "variable-2";
-    registers.lr  = "variable-2";
-    registers.pc  = "variable-2";
-    registers.r13 = registers.sp;
-    registers.r14 = registers.lr;
-    registers.r15 = registers.pc;
-
-    custom.push(function(ch, stream) {
-      if (ch === '#') {
-        stream.eatWhile(/\w/);
-        return "number";
-      }
-    });
-  }
-
-  var arch = parserConfig.architecture.toLowerCase();
-  if (arch === "x86") {
-    x86(parserConfig);
-  } else if (arch === "arm" || arch === "armv6") {
-    armv6(parserConfig);
-  }
-
-  function nextUntilUnescaped(stream, end) {
-    var escaped = false, next;
-    while ((next = stream.next()) != null) {
-      if (next === end && !escaped) {
-        return false;
-      }
-      escaped = !escaped && next === "\\";
-    }
-    return escaped;
-  }
-
-  function clikeComment(stream, state) {
-    var maybeEnd = false, ch;
-    while ((ch = stream.next()) != null) {
-      if (ch === "/" && maybeEnd) {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch === "*");
-    }
-    return "comment";
-  }
-
-  return {
-    startState: function() {
-      return {
-        tokenize: null
-      };
-    },
-
-    token: function(stream, state) {
-      if (state.tokenize) {
-        return state.tokenize(stream, state);
-      }
-
-      if (stream.eatSpace()) {
-        return null;
-      }
-
-      var style, cur, ch = stream.next();
-
-      if (ch === "/") {
-        if (stream.eat("*")) {
-          state.tokenize = clikeComment;
-          return clikeComment(stream, state);
-        }
-      }
-
-      if (ch === lineCommentStartSymbol) {
-        stream.skipToEnd();
-        return "comment";
-      }
-
-      if (ch === '"') {
-        nextUntilUnescaped(stream, '"');
-        return "string";
-      }
-
-      if (ch === '.') {
-        stream.eatWhile(/\w/);
-        cur = stream.current().toLowerCase();
-        style = directives[cur];
-        return style || null;
-      }
-
-      if (ch === '=') {
-        stream.eatWhile(/\w/);
-        return "tag";
-      }
-
-      if (ch === '{') {
-        return "braket";
-      }
-
-      if (ch === '}') {
-        return "braket";
-      }
-
-      if (/\d/.test(ch)) {
-        if (ch === "0" && stream.eat("x")) {
-          stream.eatWhile(/[0-9a-fA-F]/);
-          return "number";
-        }
-        stream.eatWhile(/\d/);
-        return "number";
-      }
-
-      if (/\w/.test(ch)) {
-        stream.eatWhile(/\w/);
-        if (stream.eat(":")) {
-          return 'tag';
-        }
-        cur = stream.current().toLowerCase();
-        style = registers[cur];
-        return style || null;
-      }
-
-      for (var i = 0; i < custom.length; i++) {
-        style = custom[i](ch, stream, state);
-        if (style) {
-          return style;
-        }
-      }
-    },
-
-    lineComment: lineCommentStartSymbol,
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/"
-  };
-});
diff --git a/resources/libs/codemirror/mode/gas/index.html b/resources/libs/codemirror/mode/gas/index.html
deleted file mode 100644
index cd8a2ff5a..000000000
--- a/resources/libs/codemirror/mode/gas/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Gas mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="gas.js"></script>
-<style>.CodeMirror {border: 2px inset #dee;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Gas</a>
-  </ul>
-</div>
-
-<article>
-<h2>Gas mode</h2>
-<form>
-<textarea id="code" name="code">
-.syntax unified
-.global main
-
-/* 
- *  A
- *  multi-line
- *  comment.
- */
-
-@ A single line comment.
-
-main:
-        push    {sp, lr}
-        ldr     r0, =message
-        bl      puts
-        mov     r0, #0
-        pop     {sp, pc}
-
-message:
-        .asciz "Hello world!<br />"
-</textarea>
-        </form>
-
-        <script>
-            var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-                lineNumbers: true,
-                mode: {name: "gas", architecture: "ARMv6"},
-            });
-        </script>
-
-        <p>Handles AT&amp;T assembler syntax (more specifically this handles
-        the GNU Assembler (gas) syntax.)
-        It takes a single optional configuration parameter:
-        <code>architecture</code>, which can be one of <code>"ARM"</code>,
-        <code>"ARMv6"</code> or <code>"x86"</code>.
-        Including the parameter adds syntax for the registers and special
-        directives for the supplied architecture.
-
-        <p><strong>MIME types defined:</strong> <code>text/x-gas</code></p>
-    </article>
diff --git a/resources/libs/codemirror/mode/gfm/gfm.js b/resources/libs/codemirror/mode/gfm/gfm.js
deleted file mode 100644
index 1411a9382..000000000
--- a/resources/libs/codemirror/mode/gfm/gfm.js
+++ /dev/null
@@ -1,97 +0,0 @@
-CodeMirror.defineMode("gfm", function(config) {
-  var codeDepth = 0;
-  function blankLine(state) {
-    state.code = false;
-    return null;
-  }
-  var gfmOverlay = {
-    startState: function() {
-      return {
-        code: false,
-        codeBlock: false,
-        ateSpace: false
-      };
-    },
-    copyState: function(s) {
-      return {
-        code: s.code,
-        codeBlock: s.codeBlock,
-        ateSpace: s.ateSpace
-      };
-    },
-    token: function(stream, state) {
-      // Hack to prevent formatting override inside code blocks (block and inline)
-      if (state.codeBlock) {
-        if (stream.match(/^```/)) {
-          state.codeBlock = false;
-          return null;
-        }
-        stream.skipToEnd();
-        return null;
-      }
-      if (stream.sol()) {
-        state.code = false;
-      }
-      if (stream.sol() && stream.match(/^```/)) {
-        stream.skipToEnd();
-        state.codeBlock = true;
-        return null;
-      }
-      // If this block is changed, it may need to be updated in Markdown mode
-      if (stream.peek() === '`') {
-        stream.next();
-        var before = stream.pos;
-        stream.eatWhile('`');
-        var difference = 1 + stream.pos - before;
-        if (!state.code) {
-          codeDepth = difference;
-          state.code = true;
-        } else {
-          if (difference === codeDepth) { // Must be exact
-            state.code = false;
-          }
-        }
-        return null;
-      } else if (state.code) {
-        stream.next();
-        return null;
-      }
-      // Check if space. If so, links can be formatted later on
-      if (stream.eatSpace()) {
-        state.ateSpace = true;
-        return null;
-      }
-      if (stream.sol() || state.ateSpace) {
-        state.ateSpace = false;
-        if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) {
-          // User/Project@SHA
-          // User@SHA
-          // SHA
-          return "link";
-        } else if (stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/)) {
-          // User/Project#Num
-          // User#Num
-          // #Num
-          return "link";
-        }
-      }
-      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
-         stream.string.slice(stream.start - 2, stream.start) != "](") {
-        // URLs
-        // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
-        // And then (issue #1160) simplified to make it not crash the Chrome Regexp engine
-        return "link";
-      }
-      stream.next();
-      return null;
-    },
-    blankLine: blankLine
-  };
-  CodeMirror.defineMIME("gfmBase", {
-    name: "markdown",
-    underscoresBreakWords: false,
-    taskLists: true,
-    fencedCodeBlocks: true
-  });
-  return CodeMirror.overlayMode(CodeMirror.getMode(config, "gfmBase"), gfmOverlay);
-}, "markdown");
diff --git a/resources/libs/codemirror/mode/gfm/index.html b/resources/libs/codemirror/mode/gfm/index.html
deleted file mode 100644
index b71cd5c75..000000000
--- a/resources/libs/codemirror/mode/gfm/index.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: GFM mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/mode/overlay.js"></script>
-<script src="../xml/xml.js"></script>
-<script src="../markdown/markdown.js"></script>
-<script src="gfm.js"></script>
-<script src="../javascript/javascript.js"></script>
-<script src="../css/css.js"></script>
-<script src="../htmlmixed/htmlmixed.js"></script>
-<script src="../clike/clike.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">GFM</a>
-  </ul>
-</div>
-
-<article>
-<h2>GFM mode</h2>
-<form><textarea id="code" name="code">
-GitHub Flavored Markdown
-========================
-
-Everything from markdown plus GFM features:
-
-## URL autolinking
-
-Underscores_are_allowed_between_words.
-
-## Fenced code blocks (and syntax highlighting)
-
-```javascript
-for (var i = 0; i &lt; items.length; i++) {
-    console.log(items[i], i); // log them
-}
-```
-
-## Task Lists
-
-- [ ] Incomplete task list item
-- [x] **Completed** task list item
-
-## A bit of GitHub spice
-
-* SHA: be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
-* User@SHA ref: mojombo@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
-* User/Project@SHA: mojombo/god@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
-* \#Num: #1
-* User/#Num: mojombo#1
-* User/Project#Num: mojombo/god#1
-
-See http://github.github.com/github-flavored-markdown/.
-
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: 'gfm',
-        lineNumbers: true,
-        theme: "default"
-      });
-    </script>
-
-    <p>Optionally depends on other modes for properly highlighted code blocks.</p>
-
-    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#gfm_*">normal</a>,  <a href="../../test/index.html#verbose,gfm_*">verbose</a>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/gfm/test.js b/resources/libs/codemirror/mode/gfm/test.js
deleted file mode 100644
index 3ccaec501..000000000
--- a/resources/libs/codemirror/mode/gfm/test.js
+++ /dev/null
@@ -1,112 +0,0 @@
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "gfm");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("emInWordAsterisk",
-     "foo[em *bar*]hello");
-
-  MT("emInWordUnderscore",
-     "foo_bar_hello");
-
-  MT("emStrongUnderscore",
-     "[strong __][em&strong _foo__][em _] bar");
-
-  MT("fencedCodeBlocks",
-     "[comment ```]",
-     "[comment foo]",
-     "",
-     "[comment ```]",
-     "bar");
-
-  MT("fencedCodeBlockModeSwitching",
-     "[comment ```javascript]",
-     "[variable foo]",
-     "",
-     "[comment ```]",
-     "bar");
-
-  MT("taskListAsterisk",
-     "[variable-2 * []] foo]", // Invalid; must have space or x between []
-     "[variable-2 * [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 * [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 * ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
-     "    [variable-3 * ][property [x]]][variable-3  foo]"); // Valid; can be nested
-
-  MT("taskListPlus",
-     "[variable-2 + []] foo]", // Invalid; must have space or x between []
-     "[variable-2 + [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 + [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 + ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
-     "    [variable-3 + ][property [x]]][variable-3  foo]"); // Valid; can be nested
-
-  MT("taskListDash",
-     "[variable-2 - []] foo]", // Invalid; must have space or x between []
-     "[variable-2 - [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 - [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 - ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
-     "    [variable-3 - ][property [x]]][variable-3  foo]"); // Valid; can be nested
-
-  MT("taskListNumber",
-     "[variable-2 1. []] foo]", // Invalid; must have space or x between []
-     "[variable-2 2. [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 3. [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 4. ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
-     "    [variable-3 1. ][property [x]]][variable-3  foo]"); // Valid; can be nested
-
-  MT("SHA",
-     "foo [link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] bar");
-
-  MT("shortSHA",
-     "foo [link be6a8cc] bar");
-
-  MT("tooShortSHA",
-     "foo be6a8c bar");
-
-  MT("longSHA",
-     "foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd22 bar");
-
-  MT("badSHA",
-     "foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cg2 bar");
-
-  MT("userSHA",
-     "foo [link bar@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] hello");
-
-  MT("userProjectSHA",
-     "foo [link bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] world");
-
-  MT("num",
-     "foo [link #1] bar");
-
-  MT("badNum",
-     "foo #1bar hello");
-
-  MT("userNum",
-     "foo [link bar#1] hello");
-
-  MT("userProjectNum",
-     "foo [link bar/hello#1] world");
-
-  MT("vanillaLink",
-     "foo [link http://www.example.com/] bar");
-
-  MT("vanillaLinkPunctuation",
-     "foo [link http://www.example.com/]. bar");
-
-  MT("vanillaLinkExtension",
-     "foo [link http://www.example.com/index.html] bar");
-
-  MT("notALink",
-     "[comment ```css]",
-     "[tag foo] {[property color][operator :][keyword black];}",
-     "[comment ```][link http://www.example.com/]");
-
-  MT("notALink",
-     "[comment ``foo `bar` http://www.example.com/``] hello");
-
-  MT("notALink",
-     "[comment `foo]",
-     "[link http://www.example.com/]",
-     "[comment `foo]",
-     "",
-     "[link http://www.example.com/]");
-})();
diff --git a/resources/libs/codemirror/mode/gherkin/gherkin.js b/resources/libs/codemirror/mode/gherkin/gherkin.js
deleted file mode 100644
index dadb58362..000000000
--- a/resources/libs/codemirror/mode/gherkin/gherkin.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-Gherkin mode - http://www.cukes.info/
-Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
-*/
-
-// Following Objs from Brackets implementation: https://github.com/tregusti/brackets-gherkin/blob/master/main.js
-//var Quotes = {
-//  SINGLE: 1,
-//  DOUBLE: 2
-//};
-
-//var regex = {
-//  keywords: /(Feature| {2}(Scenario|In order to|As|I)| {4}(Given|When|Then|And))/
-//};
-
-CodeMirror.defineMode("gherkin", function () {
-  return {
-    startState: function () {
-      return {
-        lineNumber: 0,
-        tableHeaderLine: null,
-        allowFeature: true,
-        allowBackground: false,
-        allowScenario: false,
-        allowSteps: false,
-        allowPlaceholders: false,
-        inMultilineArgument: false,
-        inMultilineString: false,
-        inMultilineTable: false
-      };
-    },
-    token: function (stream, state) {
-      if (stream.sol()) {
-        state.lineNumber++;
-      }
-      stream.eatSpace();
-
-      // INSIDE OF MULTILINE ARGUMENTS
-      if (state.inMultilineArgument) {
-
-        // STRING
-        if (state.inMultilineString) {
-          if (stream.match('"""')) {
-            state.inMultilineString = false;
-            state.inMultilineArgument = false;
-          } else {
-            stream.match(/.*/);
-          }
-          return "string";
-        }
-
-        // TABLE
-        if (state.inMultilineTable) {
-          // New table, assume first row is headers
-          if (state.tableHeaderLine === null) {
-            state.tableHeaderLine = state.lineNumber;
-          }
-
-          if (stream.match(/\|\s*/)) {
-            if (stream.eol()) {
-              state.inMultilineTable = false;
-            }
-            return "bracket";
-          } else {
-            stream.match(/[^\|]*/);
-            return state.tableHeaderLine === state.lineNumber ? "property" : "string";
-          }
-        }
-
-        // DETECT START
-        if (stream.match('"""')) {
-          // String
-          state.inMultilineString = true;
-          return "string";
-        } else if (stream.match("|")) {
-          // Table
-          state.inMultilineTable = true;
-          return "bracket";
-        } else {
-          // Or abort
-          state.inMultilineArgument = false;
-          state.tableHeaderLine = null;
-        }
-
-
-        return null;
-      }
-
-      // LINE COMMENT
-      if (stream.match(/#.*/)) {
-        return "comment";
-
-      // TAG
-      } else if (stream.match(/@\S+/)) {
-        return "def";
-
-      // FEATURE
-      } else if (state.allowFeature && stream.match(/Feature:/)) {
-        state.allowScenario = true;
-        state.allowBackground = true;
-        state.allowPlaceholders = false;
-        state.allowSteps = false;
-        return "keyword";
-
-      // BACKGROUND
-      } else if (state.allowBackground && stream.match("Background:")) {
-        state.allowPlaceholders = false;
-        state.allowSteps = true;
-        state.allowBackground = false;
-        return "keyword";
-
-      // SCENARIO OUTLINE
-      } else if (state.allowScenario && stream.match("Scenario Outline:")) {
-        state.allowPlaceholders = true;
-        state.allowSteps = true;
-        return "keyword";
-
-      // EXAMPLES
-      } else if (state.allowScenario && stream.match("Examples:")) {
-        state.allowPlaceholders = false;
-        state.allowSteps = true;
-        state.allowBackground = false;
-        state.inMultilineArgument = true;
-        return "keyword";
-
-      // SCENARIO
-      } else if (state.allowScenario && stream.match(/Scenario:/)) {
-        state.allowPlaceholders = false;
-        state.allowSteps = true;
-        state.allowBackground = false;
-        return "keyword";
-
-      // STEPS
-      } else if (state.allowSteps && stream.match(/(Given|When|Then|And|But)/)) {
-        return "keyword";
-
-      // INLINE STRING
-      } else if (!state.inMultilineArgument && stream.match(/"/)) {
-        stream.match(/.*?"/);
-        return "string";
-
-      // MULTILINE ARGUMENTS
-      } else if (state.allowSteps && stream.eat(":")) {
-        if (stream.match(/\s*$/)) {
-          state.inMultilineArgument = true;
-          return "keyword";
-        } else {
-          return null;
-        }
-
-      } else if (state.allowSteps && stream.match("<")) {
-        if (stream.match(/.*?>/)) {
-          return "property";
-        } else {
-          return null;
-        }
-
-      // Fall through
-      } else {
-        stream.eatWhile(/[^":<]/);
-      }
-
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-feature", "gherkin");
diff --git a/resources/libs/codemirror/mode/gherkin/index.html b/resources/libs/codemirror/mode/gherkin/index.html
deleted file mode 100644
index b76877acd..000000000
--- a/resources/libs/codemirror/mode/gherkin/index.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Gherkin mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="gherkin.js"></script>
-<style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Gherkin</a>
-  </ul>
-</div>
-
-<article>
-<h2>Gherkin mode</h2>
-<form><textarea id="code" name="code">
-Feature: Using Google
-  Background: 
-    Something something
-    Something else
-  Scenario: Has a homepage
-    When I navigate to the google home page
-    Then the home page should contain the menu and the search form
-  Scenario: Searching for a term 
-    When I navigate to the google home page
-    When I search for Tofu
-    Then the search results page is displayed
-    Then the search results page contains 10 individual search results
-    Then the search results contain a link to the wikipedia tofu page
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-feature</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/go/go.js b/resources/libs/codemirror/mode/go/go.js
deleted file mode 100644
index 862c09112..000000000
--- a/resources/libs/codemirror/mode/go/go.js
+++ /dev/null
@@ -1,168 +0,0 @@
-CodeMirror.defineMode("go", function(config) {
-  var indentUnit = config.indentUnit;
-
-  var keywords = {
-    "break":true, "case":true, "chan":true, "const":true, "continue":true,
-    "default":true, "defer":true, "else":true, "fallthrough":true, "for":true,
-    "func":true, "go":true, "goto":true, "if":true, "import":true,
-    "interface":true, "map":true, "package":true, "range":true, "return":true,
-    "select":true, "struct":true, "switch":true, "type":true, "var":true,
-    "bool":true, "byte":true, "complex64":true, "complex128":true,
-    "float32":true, "float64":true, "int8":true, "int16":true, "int32":true,
-    "int64":true, "string":true, "uint8":true, "uint16":true, "uint32":true,
-    "uint64":true, "int":true, "uint":true, "uintptr":true
-  };
-
-  var atoms = {
-    "true":true, "false":true, "iota":true, "nil":true, "append":true,
-    "cap":true, "close":true, "complex":true, "copy":true, "imag":true,
-    "len":true, "make":true, "new":true, "panic":true, "print":true,
-    "println":true, "real":true, "recover":true
-  };
-
-  var isOperatorChar = /[+\-*&^%:=<>!|\/]/;
-
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'" || ch == "`") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (/[\d\.]/.test(ch)) {
-      if (ch == ".") {
-        stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
-      } else if (ch == "0") {
-        stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
-      } else {
-        stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
-      }
-      return "number";
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (cur == "case" || cur == "default") curPunc = "case";
-      return "keyword";
-    }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return "variable";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !(escaped || quote == "`"))
-        state.tokenize = tokenBase;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function pushContext(state, col, type) {
-    return state.context = new Context(state.indented, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true
-      };
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-        if (ctx.type == "case") ctx.type = "}";
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "case") ctx.type = "case";
-      else if (curPunc == "}" && ctx.type == "}") ctx = popContext(state);
-      else if (curPunc == ctx.type) popContext(state);
-      state.startOfLine = false;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
-      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (ctx.type == "case" && /^(?:case|default)\b/.test(textAfter)) {
-        state.context.type = "}";
-        return ctx.indented;
-      }
-      var closing = firstChar == ctx.type;
-      if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: "{}):",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//"
-  };
-});
-
-CodeMirror.defineMIME("text/x-go", "go");
diff --git a/resources/libs/codemirror/mode/go/index.html b/resources/libs/codemirror/mode/go/index.html
deleted file mode 100644
index 3673fa0b0..000000000
--- a/resources/libs/codemirror/mode/go/index.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Go mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/elegant.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="go.js"></script>
-<style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Go</a>
-  </ul>
-</div>
-
-<article>
-<h2>Go mode</h2>
-<form><textarea id="code" name="code">
-// Prime Sieve in Go.
-// Taken from the Go specification.
-// Copyright © The Go Authors.
-
-package main
-
-import "fmt"
-
-// Send the sequence 2, 3, 4, ... to channel 'ch'.
-func generate(ch chan&lt;- int) {
-	for i := 2; ; i++ {
-		ch &lt;- i  // Send 'i' to channel 'ch'
-	}
-}
-
-// Copy the values from channel 'src' to channel 'dst',
-// removing those divisible by 'prime'.
-func filter(src &lt;-chan int, dst chan&lt;- int, prime int) {
-	for i := range src {    // Loop over values received from 'src'.
-		if i%prime != 0 {
-			dst &lt;- i  // Send 'i' to channel 'dst'.
-		}
-	}
-}
-
-// The prime sieve: Daisy-chain filter processes together.
-func sieve() {
-	ch := make(chan int)  // Create a new channel.
-	go generate(ch)       // Start generate() as a subprocess.
-	for {
-		prime := &lt;-ch
-		fmt.Print(prime, "\n")
-		ch1 := make(chan int)
-		go filter(ch, ch1, prime)
-		ch = ch1
-	}
-}
-
-func main() {
-	sieve()
-}
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        theme: "elegant",
-        matchBrackets: true,
-        indentUnit: 8,
-        tabSize: 8,
-        indentWithTabs: true,
-        mode: "text/x-go"
-      });
-    </script>
-
-    <p><strong>MIME type:</strong> <code>text/x-go</code></p>
-  </article>
diff --git a/resources/libs/codemirror/mode/groovy/groovy.js b/resources/libs/codemirror/mode/groovy/groovy.js
deleted file mode 100644
index 6800e0aaf..000000000
--- a/resources/libs/codemirror/mode/groovy/groovy.js
+++ /dev/null
@@ -1,211 +0,0 @@
-CodeMirror.defineMode("groovy", function(config) {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var keywords = words(
-    "abstract as assert boolean break byte case catch char class const continue def default " +
-    "do double else enum extends final finally float for goto if implements import in " +
-    "instanceof int interface long native new package private protected public return " +
-    "short static strictfp super switch synchronized threadsafe throw throws transient " +
-    "try void volatile while");
-  var blockKeywords = words("catch class do else finally for if switch try while enum interface def");
-  var atoms = words("null true false this");
-
-  var curPunc;
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'") {
-      return startString(ch, stream, state);
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      if (stream.eat(/eE/)) { stream.eat(/\+\-/); stream.eatWhile(/\d/); }
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize.push(tokenComment);
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      if (expectExpression(state.lastToken)) {
-        return startString(ch, stream, state);
-      }
-    }
-    if (ch == "-" && stream.eat(">")) {
-      curPunc = "->";
-      return null;
-    }
-    if (/[+\-*&%=<>!?|\/~]/.test(ch)) {
-      stream.eatWhile(/[+\-*&%=<>|~]/);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    if (ch == "@") { stream.eatWhile(/[\w\$_\.]/); return "meta"; }
-    if (state.lastToken == ".") return "property";
-    if (stream.eat(":")) { curPunc = "proplabel"; return "property"; }
-    var cur = stream.current();
-    if (atoms.propertyIsEnumerable(cur)) { return "atom"; }
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "keyword";
-    }
-    return "variable";
-  }
-  tokenBase.isBase = true;
-
-  function startString(quote, stream, state) {
-    var tripleQuoted = false;
-    if (quote != "/" && stream.eat(quote)) {
-      if (stream.eat(quote)) tripleQuoted = true;
-      else return "string";
-    }
-    function t(stream, state) {
-      var escaped = false, next, end = !tripleQuoted;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-          if (!tripleQuoted) { break; }
-          if (stream.match(quote + quote)) { end = true; break; }
-        }
-        if (quote == '"' && next == "$" && !escaped && stream.eat("{")) {
-          state.tokenize.push(tokenBaseUntilBrace());
-          return "string";
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (end) state.tokenize.pop();
-      return "string";
-    }
-    state.tokenize.push(t);
-    return t(stream, state);
-  }
-
-  function tokenBaseUntilBrace() {
-    var depth = 1;
-    function t(stream, state) {
-      if (stream.peek() == "}") {
-        depth--;
-        if (depth == 0) {
-          state.tokenize.pop();
-          return state.tokenize[state.tokenize.length-1](stream, state);
-        }
-      } else if (stream.peek() == "{") {
-        depth++;
-      }
-      return tokenBase(stream, state);
-    }
-    t.isBase = true;
-    return t;
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize.pop();
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function expectExpression(last) {
-    return !last || last == "operator" || last == "->" || /[\.\[\{\(,;:]/.test(last) ||
-      last == "newstatement" || last == "keyword" || last == "proplabel";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function pushContext(state, col, type) {
-    return state.context = new Context(state.indented, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: [tokenBase],
-        context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true,
-        lastToken: null
-      };
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-        // Automatic semicolon insertion
-        if (ctx.type == "statement" && !expectExpression(state.lastToken)) {
-          popContext(state); ctx = state.context;
-        }
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = state.tokenize[state.tokenize.length-1](stream, state);
-      if (style == "comment") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
-      // Handle indentation for {x -> \n ... }
-      else if (curPunc == "->" && ctx.type == "statement" && ctx.prev.type == "}") {
-        popContext(state);
-        state.context.align = false;
-      }
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
-        pushContext(state, stream.column(), "statement");
-      state.startOfLine = false;
-      state.lastToken = curPunc || style;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (!state.tokenize[state.tokenize.length-1].isBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
-      if (ctx.type == "statement" && !expectExpression(state.lastToken)) ctx = ctx.prev;
-      var closing = firstChar == ctx.type;
-      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : config.indentUnit);
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : config.indentUnit);
-    },
-
-    electricChars: "{}",
-    fold: "brace"
-  };
-});
-
-CodeMirror.defineMIME("text/x-groovy", "groovy");
diff --git a/resources/libs/codemirror/mode/groovy/index.html b/resources/libs/codemirror/mode/groovy/index.html
deleted file mode 100644
index f5efdf758..000000000
--- a/resources/libs/codemirror/mode/groovy/index.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Groovy mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="groovy.js"></script>
-<style>.CodeMirror {border-top: 1px solid #500; border-bottom: 1px solid #500;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Groovy</a>
-  </ul>
-</div>
-
-<article>
-<h2>Groovy mode</h2>
-<form><textarea id="code" name="code">
-//Pattern for groovy script
-def p = ~/.*\.groovy/
-new File( 'd:\\scripts' ).eachFileMatch(p) {f ->
-  // imports list
-  def imports = []
-  f.eachLine {
-    // condition to detect an import instruction
-    ln -> if ( ln =~ '^import .*' ) {
-      imports << "${ln - 'import '}"
-    }
-  }
-  // print thmen
-  if ( ! imports.empty ) {
-    println f
-    imports.each{ println "   $it" }
-  }
-}
-
-/* Coin changer demo code from http://groovy.codehaus.org */
-
-enum UsCoin {
-  quarter(25), dime(10), nickel(5), penny(1)
-  UsCoin(v) { value = v }
-  final value
-}
-
-enum OzzieCoin {
-  fifty(50), twenty(20), ten(10), five(5)
-  OzzieCoin(v) { value = v }
-  final value
-}
-
-def plural(word, count) {
-  if (count == 1) return word
-  word[-1] == 'y' ? word[0..-2] + "ies" : word + "s"
-}
-
-def change(currency, amount) {
-  currency.values().inject([]){ list, coin ->
-     int count = amount / coin.value
-     amount = amount % coin.value
-     list += "$count ${plural(coin.toString(), count)}"
-  }
-}
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-groovy"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-groovy</code></p>
-  </article>
diff --git a/resources/libs/codemirror/mode/haml/haml.js b/resources/libs/codemirror/mode/haml/haml.js
deleted file mode 100644
index 793308f6f..000000000
--- a/resources/libs/codemirror/mode/haml/haml.js
+++ /dev/null
@@ -1,153 +0,0 @@
-(function() {
-  "use strict";
-
-  // full haml mode. This handled embeded ruby and html fragments too
-  CodeMirror.defineMode("haml", function(config) {
-    var htmlMode = CodeMirror.getMode(config, {name: "htmlmixed"});
-    var rubyMode = CodeMirror.getMode(config, "ruby");
-
-    function rubyInQuote(endQuote) {
-      return function(stream, state) {
-        var ch = stream.peek();
-        if (ch == endQuote && state.rubyState.tokenize.length == 1) {
-          // step out of ruby context as it seems to complete processing all the braces
-          stream.next();
-          state.tokenize = html;
-          return "closeAttributeTag";
-        } else {
-          return ruby(stream, state);
-        }
-      };
-    }
-
-    function ruby(stream, state) {
-      if (stream.match("-#")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      return rubyMode.token(stream, state.rubyState);
-    }
-
-    function html(stream, state) {
-      var ch = stream.peek();
-
-      // handle haml declarations. All declarations that cant be handled here
-      // will be passed to html mode
-      if (state.previousToken.style == "comment" ) {
-        if (state.indented > state.previousToken.indented) {
-          stream.skipToEnd();
-          return "commentLine";
-        }
-      }
-
-      if (state.startOfLine) {
-        if (ch == "!" && stream.match("!!")) {
-          stream.skipToEnd();
-          return "tag";
-        } else if (stream.match(/^%[\w:#\.]+=/)) {
-          state.tokenize = ruby;
-          return "hamlTag";
-        } else if (stream.match(/^%[\w:]+/)) {
-          return "hamlTag";
-        } else if (ch == "/" ) {
-          stream.skipToEnd();
-          return "comment";
-        }
-      }
-
-      if (state.startOfLine || state.previousToken.style == "hamlTag") {
-        if ( ch == "#" || ch == ".") {
-          stream.match(/[\w-#\.]*/);
-          return "hamlAttribute";
-        }
-      }
-
-      // donot handle --> as valid ruby, make it HTML close comment instead
-      if (state.startOfLine && !stream.match("-->", false) && (ch == "=" || ch == "-" )) {
-        state.tokenize = ruby;
-        return null;
-      }
-
-      if (state.previousToken.style == "hamlTag" ||
-          state.previousToken.style == "closeAttributeTag" ||
-          state.previousToken.style == "hamlAttribute") {
-        if (ch == "(") {
-          state.tokenize = rubyInQuote(")");
-          return null;
-        } else if (ch == "{") {
-          state.tokenize = rubyInQuote("}");
-          return null;
-        }
-      }
-
-      return htmlMode.token(stream, state.htmlState);
-    }
-
-    return {
-      // default to html mode
-      startState: function() {
-        var htmlState = htmlMode.startState();
-        var rubyState = rubyMode.startState();
-        return {
-          htmlState: htmlState,
-          rubyState: rubyState,
-          indented: 0,
-          previousToken: { style: null, indented: 0},
-          tokenize: html
-        };
-      },
-
-      copyState: function(state) {
-        return {
-          htmlState : CodeMirror.copyState(htmlMode, state.htmlState),
-          rubyState: CodeMirror.copyState(rubyMode, state.rubyState),
-          indented: state.indented,
-          previousToken: state.previousToken,
-          tokenize: state.tokenize
-        };
-      },
-
-      token: function(stream, state) {
-        if (stream.sol()) {
-          state.indented = stream.indentation();
-          state.startOfLine = true;
-        }
-        if (stream.eatSpace()) return null;
-        var style = state.tokenize(stream, state);
-        state.startOfLine = false;
-        // dont record comment line as we only want to measure comment line with
-        // the opening comment block
-        if (style && style != "commentLine") {
-          state.previousToken = { style: style, indented: state.indented };
-        }
-        // if current state is ruby and the previous token is not `,` reset the
-        // tokenize to html
-        if (stream.eol() && state.tokenize == ruby) {
-          stream.backUp(1);
-          var ch = stream.peek();
-          stream.next();
-          if (ch && ch != ",") {
-            state.tokenize = html;
-          }
-        }
-        // reprocess some of the specific style tag when finish setting previousToken
-        if (style == "hamlTag") {
-          style = "tag";
-        } else if (style == "commentLine") {
-          style = "comment";
-        } else if (style == "hamlAttribute") {
-          style = "attribute";
-        } else if (style == "closeAttributeTag") {
-          style = null;
-        }
-        return style;
-      },
-
-      indent: function(state) {
-        return state.indented;
-      }
-    };
-  }, "htmlmixed", "ruby");
-
-  CodeMirror.defineMIME("text/x-haml", "haml");
-})();
diff --git a/resources/libs/codemirror/mode/haml/index.html b/resources/libs/codemirror/mode/haml/index.html
deleted file mode 100644
index a73787554..000000000
--- a/resources/libs/codemirror/mode/haml/index.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: HAML mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../xml/xml.js"></script>
-<script src="../htmlmixed/htmlmixed.js"></script>
-<script src="../javascript/javascript.js"></script>
-<script src="../ruby/ruby.js"></script>
-<script src="haml.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">HAML</a>
-  </ul>
-</div>
-
-<article>
-<h2>HAML mode</h2>
-<form><textarea id="code" name="code">
-!!!
-#content
-.left.column(title="title"){:href => "/hello", :test => "#{hello}_#{world}"}
-    <!-- This is a comment -->
-    %h2 Welcome to our site!
-    %p= puts "HAML MODE"
-  .right.column
-    = render :partial => "sidebar"
-
-.container
-  .row
-    .span8
-      %h1.title= @page_title
-%p.title= @page_title
-%p
-  /
-    The same as HTML comment
-    Hello multiline comment
-
-  -# haml comment
-      This wont be displayed
-      nor will this
-  Date/Time:
-  - now = DateTime.now
-  %strong= now
-  - if now > DateTime.parse("December 31, 2006")
-    = "Happy new " + "year!"
-
-%title
-  = @title
-  \= @title
-  <h1>Title</h1>
-  <h1 title="HELLO">
-    Title
-  </h1>
-    </textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "text/x-haml"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-haml</code>.</p>
-
-    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#haml_*">normal</a>,  <a href="../../test/index.html#verbose,haml_*">verbose</a>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/haml/test.js b/resources/libs/codemirror/mode/haml/test.js
deleted file mode 100644
index b7178d40f..000000000
--- a/resources/libs/codemirror/mode/haml/test.js
+++ /dev/null
@@ -1,94 +0,0 @@
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "haml");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  // Requires at least one media query
-  MT("elementName",
-     "[tag %h1] Hey There");
-
-  MT("oneElementPerLine",
-     "[tag %h1] Hey There %h2");
-
-  MT("idSelector",
-     "[tag %h1][attribute #test] Hey There");
-
-  MT("classSelector",
-     "[tag %h1][attribute .hello] Hey There");
-
-  MT("docType",
-     "[tag !!! XML]");
-
-  MT("comment",
-     "[comment / Hello WORLD]");
-
-  MT("notComment",
-     "[tag %h1] This is not a / comment ");
-
-  MT("attributes",
-     "[tag %a]([variable title][operator =][string \"test\"]){[atom :title] [operator =>] [string \"test\"]}");
-
-  MT("htmlCode",
-     "[tag <h1>]Title[tag </h1>]");
-
-  MT("rubyBlock",
-     "[operator =][variable-2 @item]");
-
-  MT("selectorRubyBlock",
-     "[tag %a.selector=] [variable-2 @item]");
-
-  MT("nestedRubyBlock",
-      "[tag %a]",
-      "   [operator =][variable puts] [string \"test\"]");
-
-  MT("multilinePlaintext",
-      "[tag %p]",
-      "  Hello,",
-      "  World");
-
-  MT("multilineRuby",
-      "[tag %p]",
-      "  [comment -# this is a comment]",
-      "     [comment and this is a comment too]",
-      "  Date/Time",
-      "  [operator -] [variable now] [operator =] [tag DateTime][operator .][variable now]",
-      "  [tag %strong=] [variable now]",
-      "  [operator -] [keyword if] [variable now] [operator >] [tag DateTime][operator .][variable parse]([string \"December 31, 2006\"])",
-      "     [operator =][string \"Happy\"]",
-      "     [operator =][string \"Belated\"]",
-      "     [operator =][string \"Birthday\"]");
-
-  MT("multilineComment",
-      "[comment /]",
-      "  [comment Multiline]",
-      "  [comment Comment]");
-
-  MT("hamlComment",
-     "[comment -# this is a comment]");
-
-  MT("multilineHamlComment",
-     "[comment -# this is a comment]",
-     "   [comment and this is a comment too]");
-
-  MT("multilineHTMLComment",
-    "[comment <!--]",
-    "  [comment what a comment]",
-    "  [comment -->]");
-
-  MT("hamlAfterRubyTag",
-    "[attribute .block]",
-    "  [tag %strong=] [variable now]",
-    "  [attribute .test]",
-    "     [operator =][variable now]",
-    "  [attribute .right]");
-
-  MT("stretchedRuby",
-     "[operator =] [variable puts] [string \"Hello\"],",
-     "   [string \"World\"]");
-
-  MT("interpolationInHashAttribute",
-     //"[tag %div]{[atom :id] [operator =>] [string \"#{][variable test][string }_#{][variable ting][string }\"]} test");
-     "[tag %div]{[atom :id] [operator =>] [string \"#{][variable test][string }_#{][variable ting][string }\"]} test");
-
-  MT("interpolationInHTMLAttribute",
-     "[tag %div]([variable title][operator =][string \"#{][variable test][string }_#{][variable ting]()[string }\"]) Test");
-})();
diff --git a/resources/libs/codemirror/mode/haskell/haskell.js b/resources/libs/codemirror/mode/haskell/haskell.js
deleted file mode 100644
index 68a6317e6..000000000
--- a/resources/libs/codemirror/mode/haskell/haskell.js
+++ /dev/null
@@ -1,250 +0,0 @@
-CodeMirror.defineMode("haskell", function(_config, modeConfig) {
-
-  function switchState(source, setState, f) {
-    setState(f);
-    return f(source, setState);
-  }
-
-  // These should all be Unicode extended, as per the Haskell 2010 report
-  var smallRE = /[a-z_]/;
-  var largeRE = /[A-Z]/;
-  var digitRE = /[0-9]/;
-  var hexitRE = /[0-9A-Fa-f]/;
-  var octitRE = /[0-7]/;
-  var idRE = /[a-z_A-Z0-9']/;
-  var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:]/;
-  var specialRE = /[(),;[\]`{}]/;
-  var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer
-
-  function normal(source, setState) {
-    if (source.eatWhile(whiteCharRE)) {
-      return null;
-    }
-
-    var ch = source.next();
-    if (specialRE.test(ch)) {
-      if (ch == '{' && source.eat('-')) {
-        var t = "comment";
-        if (source.eat('#')) {
-          t = "meta";
-        }
-        return switchState(source, setState, ncomment(t, 1));
-      }
-      return null;
-    }
-
-    if (ch == '\'') {
-      if (source.eat('\\')) {
-        source.next();  // should handle other escapes here
-      }
-      else {
-        source.next();
-      }
-      if (source.eat('\'')) {
-        return "string";
-      }
-      return "error";
-    }
-
-    if (ch == '"') {
-      return switchState(source, setState, stringLiteral);
-    }
-
-    if (largeRE.test(ch)) {
-      source.eatWhile(idRE);
-      if (source.eat('.')) {
-        return "qualifier";
-      }
-      return "variable-2";
-    }
-
-    if (smallRE.test(ch)) {
-      source.eatWhile(idRE);
-      return "variable";
-    }
-
-    if (digitRE.test(ch)) {
-      if (ch == '0') {
-        if (source.eat(/[xX]/)) {
-          source.eatWhile(hexitRE); // should require at least 1
-          return "integer";
-        }
-        if (source.eat(/[oO]/)) {
-          source.eatWhile(octitRE); // should require at least 1
-          return "number";
-        }
-      }
-      source.eatWhile(digitRE);
-      var t = "number";
-      if (source.eat('.')) {
-        t = "number";
-        source.eatWhile(digitRE); // should require at least 1
-      }
-      if (source.eat(/[eE]/)) {
-        t = "number";
-        source.eat(/[-+]/);
-        source.eatWhile(digitRE); // should require at least 1
-      }
-      return t;
-    }
-
-    if (symbolRE.test(ch)) {
-      if (ch == '-' && source.eat(/-/)) {
-        source.eatWhile(/-/);
-        if (!source.eat(symbolRE)) {
-          source.skipToEnd();
-          return "comment";
-        }
-      }
-      var t = "variable";
-      if (ch == ':') {
-        t = "variable-2";
-      }
-      source.eatWhile(symbolRE);
-      return t;
-    }
-
-    return "error";
-  }
-
-  function ncomment(type, nest) {
-    if (nest == 0) {
-      return normal;
-    }
-    return function(source, setState) {
-      var currNest = nest;
-      while (!source.eol()) {
-        var ch = source.next();
-        if (ch == '{' && source.eat('-')) {
-          ++currNest;
-        }
-        else if (ch == '-' && source.eat('}')) {
-          --currNest;
-          if (currNest == 0) {
-            setState(normal);
-            return type;
-          }
-        }
-      }
-      setState(ncomment(type, currNest));
-      return type;
-    };
-  }
-
-  function stringLiteral(source, setState) {
-    while (!source.eol()) {
-      var ch = source.next();
-      if (ch == '"') {
-        setState(normal);
-        return "string";
-      }
-      if (ch == '\\') {
-        if (source.eol() || source.eat(whiteCharRE)) {
-          setState(stringGap);
-          return "string";
-        }
-        if (source.eat('&')) {
-        }
-        else {
-          source.next(); // should handle other escapes here
-        }
-      }
-    }
-    setState(normal);
-    return "error";
-  }
-
-  function stringGap(source, setState) {
-    if (source.eat('\\')) {
-      return switchState(source, setState, stringLiteral);
-    }
-    source.next();
-    setState(normal);
-    return "error";
-  }
-
-
-  var wellKnownWords = (function() {
-    var wkw = {};
-    function setType(t) {
-      return function () {
-        for (var i = 0; i < arguments.length; i++)
-          wkw[arguments[i]] = t;
-      };
-    }
-
-    setType("keyword")(
-      "case", "class", "data", "default", "deriving", "do", "else", "foreign",
-      "if", "import", "in", "infix", "infixl", "infixr", "instance", "let",
-      "module", "newtype", "of", "then", "type", "where", "_");
-
-    setType("keyword")(
-      "\.\.", ":", "::", "=", "\\", "\"", "<-", "->", "@", "~", "=>");
-
-    setType("builtin")(
-      "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<=", "=<<",
-      "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*", "**");
-
-    setType("builtin")(
-      "Bool", "Bounded", "Char", "Double", "EQ", "Either", "Enum", "Eq",
-      "False", "FilePath", "Float", "Floating", "Fractional", "Functor", "GT",
-      "IO", "IOError", "Int", "Integer", "Integral", "Just", "LT", "Left",
-      "Maybe", "Monad", "Nothing", "Num", "Ord", "Ordering", "Rational", "Read",
-      "ReadS", "Real", "RealFloat", "RealFrac", "Right", "Show", "ShowS",
-      "String", "True");
-
-    setType("builtin")(
-      "abs", "acos", "acosh", "all", "and", "any", "appendFile", "asTypeOf",
-      "asin", "asinh", "atan", "atan2", "atanh", "break", "catch", "ceiling",
-      "compare", "concat", "concatMap", "const", "cos", "cosh", "curry",
-      "cycle", "decodeFloat", "div", "divMod", "drop", "dropWhile", "either",
-      "elem", "encodeFloat", "enumFrom", "enumFromThen", "enumFromThenTo",
-      "enumFromTo", "error", "even", "exp", "exponent", "fail", "filter",
-      "flip", "floatDigits", "floatRadix", "floatRange", "floor", "fmap",
-      "foldl", "foldl1", "foldr", "foldr1", "fromEnum", "fromInteger",
-      "fromIntegral", "fromRational", "fst", "gcd", "getChar", "getContents",
-      "getLine", "head", "id", "init", "interact", "ioError", "isDenormalized",
-      "isIEEE", "isInfinite", "isNaN", "isNegativeZero", "iterate", "last",
-      "lcm", "length", "lex", "lines", "log", "logBase", "lookup", "map",
-      "mapM", "mapM_", "max", "maxBound", "maximum", "maybe", "min", "minBound",
-      "minimum", "mod", "negate", "not", "notElem", "null", "odd", "or",
-      "otherwise", "pi", "pred", "print", "product", "properFraction",
-      "putChar", "putStr", "putStrLn", "quot", "quotRem", "read", "readFile",
-      "readIO", "readList", "readLn", "readParen", "reads", "readsPrec",
-      "realToFrac", "recip", "rem", "repeat", "replicate", "return", "reverse",
-      "round", "scaleFloat", "scanl", "scanl1", "scanr", "scanr1", "seq",
-      "sequence", "sequence_", "show", "showChar", "showList", "showParen",
-      "showString", "shows", "showsPrec", "significand", "signum", "sin",
-      "sinh", "snd", "span", "splitAt", "sqrt", "subtract", "succ", "sum",
-      "tail", "take", "takeWhile", "tan", "tanh", "toEnum", "toInteger",
-      "toRational", "truncate", "uncurry", "undefined", "unlines", "until",
-      "unwords", "unzip", "unzip3", "userError", "words", "writeFile", "zip",
-      "zip3", "zipWith", "zipWith3");
-
-    var override = modeConfig.overrideKeywords;
-    if (override) for (var word in override) if (override.hasOwnProperty(word))
-      wkw[word] = override[word];
-
-    return wkw;
-  })();
-
-
-
-  return {
-    startState: function ()  { return { f: normal }; },
-    copyState:  function (s) { return { f: s.f }; },
-
-    token: function(stream, state) {
-      var t = state.f(stream, function(s) { state.f = s; });
-      var w = stream.current();
-      return wellKnownWords.hasOwnProperty(w) ? wellKnownWords[w] : t;
-    },
-
-    blockCommentStart: "{-",
-    blockCommentEnd: "-}",
-    lineComment: "--"
-  };
-
-});
-
-CodeMirror.defineMIME("text/x-haskell", "haskell");
diff --git a/resources/libs/codemirror/mode/haskell/index.html b/resources/libs/codemirror/mode/haskell/index.html
deleted file mode 100644
index 056b01d46..000000000
--- a/resources/libs/codemirror/mode/haskell/index.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Haskell mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/elegant.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="haskell.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Haskell</a>
-  </ul>
-</div>
-
-<article>
-<h2>Haskell mode</h2>
-<form><textarea id="code" name="code">
-module UniquePerms (
-    uniquePerms
-    )
-where
-
--- | Find all unique permutations of a list where there might be duplicates.
-uniquePerms :: (Eq a) => [a] -> [[a]]
-uniquePerms = permBag . makeBag
-
--- | An unordered collection where duplicate values are allowed,
--- but represented with a single value and a count.
-type Bag a = [(a, Int)]
-
-makeBag :: (Eq a) => [a] -> Bag a
-makeBag [] = []
-makeBag (a:as) = mix a $ makeBag as
-  where
-    mix a []                        = [(a,1)]
-    mix a (bn@(b,n):bs) | a == b    = (b,n+1):bs
-                        | otherwise = bn : mix a bs
-
-permBag :: Bag a -> [[a]]
-permBag [] = [[]]
-permBag bs = concatMap (\(f,cs) -> map (f:) $ permBag cs) . oneOfEach $ bs
-  where
-    oneOfEach [] = []
-    oneOfEach (an@(a,n):bs) =
-        let bs' = if n == 1 then bs else (a,n-1):bs
-        in (a,bs') : mapSnd (an:) (oneOfEach bs)
-    
-    apSnd f (a,b) = (a, f b)
-    mapSnd = map . apSnd
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        theme: "elegant"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-haskell</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/haxe/haxe.js b/resources/libs/codemirror/mode/haxe/haxe.js
deleted file mode 100644
index cb761ad1c..000000000
--- a/resources/libs/codemirror/mode/haxe/haxe.js
+++ /dev/null
@@ -1,429 +0,0 @@
-CodeMirror.defineMode("haxe", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-
-  // Tokenizer
-
-  var keywords = function(){
-    function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
-    var operator = kw("operator"), atom = {type: "atom", style: "atom"}, attribute = {type:"attribute", style: "attribute"};
-  var type = kw("typedef");
-    return {
-      "if": A, "while": A, "else": B, "do": B, "try": B,
-      "return": C, "break": C, "continue": C, "new": C, "throw": C,
-      "var": kw("var"), "inline":attribute, "static": attribute, "using":kw("import"),
-    "public": attribute, "private": attribute, "cast": kw("cast"), "import": kw("import"), "macro": kw("macro"),
-      "function": kw("function"), "catch": kw("catch"), "untyped": kw("untyped"), "callback": kw("cb"),
-      "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-      "in": operator, "never": kw("property_access"), "trace":kw("trace"),
-    "class": type, "enum":type, "interface":type, "typedef":type, "extends":type, "implements":type, "dynamic":type,
-      "true": atom, "false": atom, "null": atom
-    };
-  }();
-
-  var isOperatorChar = /[+\-*&%=<>!?|]/;
-
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-
-  function nextUntilUnescaped(stream, end) {
-    var escaped = false, next;
-    while ((next = stream.next()) != null) {
-      if (next == end && !escaped)
-        return false;
-      escaped = !escaped && next == "\\";
-    }
-    return escaped;
-  }
-
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-  function ret(tp, style, cont) {
-    type = tp; content = cont;
-    return style;
-  }
-
-  function haxeTokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'")
-      return chain(stream, state, haxeTokenString(ch));
-    else if (/[\[\]{}\(\),;\:\.]/.test(ch))
-      return ret(ch);
-    else if (ch == "0" && stream.eat(/x/i)) {
-      stream.eatWhile(/[\da-f]/i);
-      return ret("number", "number");
-    }
-    else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
-      stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
-      return ret("number", "number");
-    }
-    else if (state.reAllowed && (ch == "~" && stream.eat(/\//))) {
-      nextUntilUnescaped(stream, "/");
-      stream.eatWhile(/[gimsu]/);
-      return ret("regexp", "string-2");
-    }
-    else if (ch == "/") {
-      if (stream.eat("*")) {
-        return chain(stream, state, haxeTokenComment);
-      }
-      else if (stream.eat("/")) {
-        stream.skipToEnd();
-        return ret("comment", "comment");
-      }
-      else {
-        stream.eatWhile(isOperatorChar);
-        return ret("operator", null, stream.current());
-      }
-    }
-    else if (ch == "#") {
-        stream.skipToEnd();
-        return ret("conditional", "meta");
-    }
-    else if (ch == "@") {
-      stream.eat(/:/);
-      stream.eatWhile(/[\w_]/);
-      return ret ("metadata", "meta");
-    }
-    else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return ret("operator", null, stream.current());
-    }
-    else {
-    var word;
-    if(/[A-Z]/.test(ch))
-    {
-      stream.eatWhile(/[\w_<>]/);
-      word = stream.current();
-      return ret("type", "variable-3", word);
-    }
-    else
-    {
-        stream.eatWhile(/[\w_]/);
-        var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
-        return (known && state.kwAllowed) ? ret(known.type, known.style, word) :
-                       ret("variable", "variable", word);
-    }
-    }
-  }
-
-  function haxeTokenString(quote) {
-    return function(stream, state) {
-      if (!nextUntilUnescaped(stream, quote))
-        state.tokenize = haxeTokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  function haxeTokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = haxeTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  // Parser
-
-  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true};
-
-  function HaxeLexical(indented, column, type, align, prev, info) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.prev = prev;
-    this.info = info;
-    if (align != null) this.align = align;
-  }
-
-  function inScope(state, varname) {
-    for (var v = state.localVars; v; v = v.next)
-      if (v.name == varname) return true;
-  }
-
-  function parseHaxe(state, style, type, content, stream) {
-    var cc = state.cc;
-    // Communicate our context to the combinators.
-    // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
-
-    if (!state.lexical.hasOwnProperty("align"))
-      state.lexical.align = true;
-
-    while(true) {
-      var combinator = cc.length ? cc.pop() : statement;
-      if (combinator(type, content)) {
-        while(cc.length && cc[cc.length - 1].lex)
-          cc.pop()();
-        if (cx.marked) return cx.marked;
-        if (type == "variable" && inScope(state, content)) return "variable-2";
-    if (type == "variable" && imported(state, content)) return "variable-3";
-        return style;
-      }
-    }
-  }
-
-  function imported(state, typename)
-  {
-  if (/[a-z]/.test(typename.charAt(0)))
-    return false;
-  var len = state.importedtypes.length;
-  for (var i = 0; i<len; i++)
-    if(state.importedtypes[i]==typename) return true;
-  }
-
-
-  function registerimport(importname) {
-  var state = cx.state;
-  for (var t = state.importedtypes; t; t = t.next)
-    if(t.name == importname) return;
-  state.importedtypes = { name: importname, next: state.importedtypes };
-  }
-  // Combinator utils
-
-  var cx = {state: null, column: null, marked: null, cc: null};
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-  function register(varname) {
-    var state = cx.state;
-    if (state.context) {
-      cx.marked = "def";
-      for (var v = state.localVars; v; v = v.next)
-        if (v.name == varname) return;
-      state.localVars = {name: varname, next: state.localVars};
-    }
-  }
-
-  // Combinators
-
-  var defaultVars = {name: "this", next: null};
-  function pushcontext() {
-    if (!cx.state.context) cx.state.localVars = defaultVars;
-    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
-  }
-  function popcontext() {
-    cx.state.localVars = cx.state.context.vars;
-    cx.state.context = cx.state.context.prev;
-  }
-  function pushlex(type, info) {
-    var result = function() {
-      var state = cx.state;
-      state.lexical = new HaxeLexical(state.indented, cx.stream.column(), type, null, state.lexical, info);
-    };
-    result.lex = true;
-    return result;
-  }
-  function poplex() {
-    var state = cx.state;
-    if (state.lexical.prev) {
-      if (state.lexical.type == ")")
-        state.indented = state.lexical.indented;
-      state.lexical = state.lexical.prev;
-    }
-  }
-  poplex.lex = true;
-
-  function expect(wanted) {
-    return function(type) {
-      if (type == wanted) return cont();
-      else if (wanted == ";") return pass();
-      else return cont(arguments.callee);
-    };
-  }
-
-  function statement(type) {
-    if (type == "@") return cont(metadef);
-    if (type == "var") return cont(pushlex("vardef"), vardef1, expect(";"), poplex);
-    if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex);
-    if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
-    if (type == "{") return cont(pushlex("}"), pushcontext, block, poplex, popcontext);
-    if (type == ";") return cont();
-    if (type == "attribute") return cont(maybeattribute);
-    if (type == "function") return cont(functiondef);
-    if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"),
-                                      poplex, statement, poplex);
-    if (type == "variable") return cont(pushlex("stat"), maybelabel);
-    if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
-                                         block, poplex, poplex);
-    if (type == "case") return cont(expression, expect(":"));
-    if (type == "default") return cont(expect(":"));
-    if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
-                                        statement, poplex, popcontext);
-    if (type == "import") return cont(importdef, expect(";"));
-    if (type == "typedef") return cont(typedef);
-    return pass(pushlex("stat"), expression, expect(";"), poplex);
-  }
-  function expression(type) {
-    if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator);
-    if (type == "function") return cont(functiondef);
-    if (type == "keyword c") return cont(maybeexpression);
-    if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeoperator);
-    if (type == "operator") return cont(expression);
-    if (type == "[") return cont(pushlex("]"), commasep(expression, "]"), poplex, maybeoperator);
-    if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator);
-    return cont();
-  }
-  function maybeexpression(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expression);
-  }
-
-  function maybeoperator(type, value) {
-    if (type == "operator" && /\+\+|--/.test(value)) return cont(maybeoperator);
-    if (type == "operator" || type == ":") return cont(expression);
-    if (type == ";") return;
-    if (type == "(") return cont(pushlex(")"), commasep(expression, ")"), poplex, maybeoperator);
-    if (type == ".") return cont(property, maybeoperator);
-    if (type == "[") return cont(pushlex("]"), expression, expect("]"), poplex, maybeoperator);
-  }
-
-  function maybeattribute(type) {
-    if (type == "attribute") return cont(maybeattribute);
-    if (type == "function") return cont(functiondef);
-    if (type == "var") return cont(vardef1);
-  }
-
-  function metadef(type) {
-    if(type == ":") return cont(metadef);
-    if(type == "variable") return cont(metadef);
-    if(type == "(") return cont(pushlex(")"), commasep(metaargs, ")"), poplex, statement);
-  }
-  function metaargs(type) {
-    if(type == "variable") return cont();
-  }
-
-  function importdef (type, value) {
-  if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
-  else if(type == "variable" || type == "property" || type == ".") return cont(importdef);
-  }
-
-  function typedef (type, value)
-  {
-  if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
-  }
-
-  function maybelabel(type) {
-    if (type == ":") return cont(poplex, statement);
-    return pass(maybeoperator, expect(";"), poplex);
-  }
-  function property(type) {
-    if (type == "variable") {cx.marked = "property"; return cont();}
-  }
-  function objprop(type) {
-    if (type == "variable") cx.marked = "property";
-    if (atomicTypes.hasOwnProperty(type)) return cont(expect(":"), expression);
-  }
-  function commasep(what, end) {
-    function proceed(type) {
-      if (type == ",") return cont(what, proceed);
-      if (type == end) return cont();
-      return cont(expect(end));
-    }
-    return function(type) {
-      if (type == end) return cont();
-      else return pass(what, proceed);
-    };
-  }
-  function block(type) {
-    if (type == "}") return cont();
-    return pass(statement, block);
-  }
-  function vardef1(type, value) {
-    if (type == "variable"){register(value); return cont(typeuse, vardef2);}
-    return cont();
-  }
-  function vardef2(type, value) {
-    if (value == "=") return cont(expression, vardef2);
-    if (type == ",") return cont(vardef1);
-  }
-  function forspec1(type, value) {
-  if (type == "variable") {
-    register(value);
-  }
-  return cont(pushlex(")"), pushcontext, forin, expression, poplex, statement, popcontext);
-  }
-  function forin(_type, value) {
-    if (value == "in") return cont();
-  }
-  function functiondef(type, value) {
-    if (type == "variable") {register(value); return cont(functiondef);}
-    if (value == "new") return cont(functiondef);
-    if (type == "(") return cont(pushlex(")"), pushcontext, commasep(funarg, ")"), poplex, typeuse, statement, popcontext);
-  }
-  function typeuse(type) {
-    if(type == ":") return cont(typestring);
-  }
-  function typestring(type) {
-    if(type == "type") return cont();
-    if(type == "variable") return cont();
-    if(type == "{") return cont(pushlex("}"), commasep(typeprop, "}"), poplex);
-  }
-  function typeprop(type) {
-    if(type == "variable") return cont(typeuse);
-  }
-  function funarg(type, value) {
-    if (type == "variable") {register(value); return cont(typeuse);}
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-    var defaulttypes = ["Int", "Float", "String", "Void", "Std", "Bool", "Dynamic", "Array"];
-      return {
-        tokenize: haxeTokenBase,
-        reAllowed: true,
-        kwAllowed: true,
-        cc: [],
-        lexical: new HaxeLexical((basecolumn || 0) - indentUnit, 0, "block", false),
-        localVars: parserConfig.localVars,
-    importedtypes: defaulttypes,
-        context: parserConfig.localVars && {vars: parserConfig.localVars},
-        indented: 0
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (!state.lexical.hasOwnProperty("align"))
-          state.lexical.align = false;
-        state.indented = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (type == "comment") return style;
-      state.reAllowed = !!(type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/));
-      state.kwAllowed = type != '.';
-      return parseHaxe(state, style, type, content, stream);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != haxeTokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
-      if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
-      var type = lexical.type, closing = firstChar == type;
-      if (type == "vardef") return lexical.indented + 4;
-      else if (type == "form" && firstChar == "{") return lexical.indented;
-      else if (type == "stat" || type == "form") return lexical.indented + indentUnit;
-      else if (lexical.info == "switch" && !closing)
-        return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
-      else if (lexical.align) return lexical.column + (closing ? 0 : 1);
-      else return lexical.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: "{}"
-  };
-});
-
-CodeMirror.defineMIME("text/x-haxe", "haxe");
diff --git a/resources/libs/codemirror/mode/haxe/index.html b/resources/libs/codemirror/mode/haxe/index.html
deleted file mode 100644
index ec3b8e0e7..000000000
--- a/resources/libs/codemirror/mode/haxe/index.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Haxe mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="haxe.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Haxe</a>
-  </ul>
-</div>
-
-<article>
-<h2>Haxe mode</h2>
-
-
-<div><textarea id="code" name="code">
-import one.two.Three;
-
-@attr("test")
-class Foo&lt;T&gt; extends Three
-{
-	public function new()
-	{
-		noFoo = 12;
-	}
-	
-	public static inline function doFoo(obj:{k:Int, l:Float}):Int
-	{
-		for(i in 0...10)
-		{
-			obj.k++;
-			trace(i);
-			var var1 = new Array();
-			if(var1.length > 1)
-				throw "Error";
-		}
-		// The following line should not be colored, the variable is scoped out
-		var1;
-		/* Multi line
-		 * Comment test
-		 */
-		return obj.k;
-	}
-	private function bar():Void
-	{
-		#if flash
-		var t1:String = "1.21";
-		#end
-		try {
-			doFoo({k:3, l:1.2});
-		}
-		catch (e : String) {
-			trace(e);
-		}
-		var t2:Float = cast(3.2);
-		var t3:haxe.Timer = new haxe.Timer();
-		var t4 = {k:Std.int(t2), l:Std.parseFloat(t1)};
-		var t5 = ~/123+.*$/i;
-		doFoo(t4);
-		untyped t1 = 4;
-		bob = new Foo&lt;Int&gt;
-	}
-	public var okFoo(default, never):Float;
-	var noFoo(getFoo, null):Int;
-	function getFoo():Int {
-		return noFoo;
-	}
-	
-	public var three:Int;
-}
-enum Color
-{
-	red;
-	green;
-	blue;
-	grey( v : Int );
-	rgb (r:Int,g:Int,b:Int);
-}
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        indentUnit: 4,
-        indentWithTabs: true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-haxe</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/htmlembedded/htmlembedded.js b/resources/libs/codemirror/mode/htmlembedded/htmlembedded.js
deleted file mode 100644
index ff6dfd2f9..000000000
--- a/resources/libs/codemirror/mode/htmlembedded/htmlembedded.js
+++ /dev/null
@@ -1,73 +0,0 @@
-CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
-
-  //config settings
-  var scriptStartRegex = parserConfig.scriptStartRegex || /^<%/i,
-      scriptEndRegex = parserConfig.scriptEndRegex || /^%>/i;
-
-  //inner modes
-  var scriptingMode, htmlMixedMode;
-
-  //tokenizer when in html mode
-  function htmlDispatch(stream, state) {
-      if (stream.match(scriptStartRegex, false)) {
-          state.token=scriptingDispatch;
-          return scriptingMode.token(stream, state.scriptState);
-          }
-      else
-          return htmlMixedMode.token(stream, state.htmlState);
-    }
-
-  //tokenizer when in scripting mode
-  function scriptingDispatch(stream, state) {
-      if (stream.match(scriptEndRegex, false))  {
-          state.token=htmlDispatch;
-          return htmlMixedMode.token(stream, state.htmlState);
-         }
-      else
-          return scriptingMode.token(stream, state.scriptState);
-         }
-
-
-  return {
-    startState: function() {
-      scriptingMode = scriptingMode || CodeMirror.getMode(config, parserConfig.scriptingModeSpec);
-      htmlMixedMode = htmlMixedMode || CodeMirror.getMode(config, "htmlmixed");
-      return {
-          token :  parserConfig.startOpen ? scriptingDispatch : htmlDispatch,
-          htmlState : CodeMirror.startState(htmlMixedMode),
-          scriptState : CodeMirror.startState(scriptingMode)
-      };
-    },
-
-    token: function(stream, state) {
-      return state.token(stream, state);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.token == htmlDispatch)
-        return htmlMixedMode.indent(state.htmlState, textAfter);
-      else if (scriptingMode.indent)
-        return scriptingMode.indent(state.scriptState, textAfter);
-    },
-
-    copyState: function(state) {
-      return {
-       token : state.token,
-       htmlState : CodeMirror.copyState(htmlMixedMode, state.htmlState),
-       scriptState : CodeMirror.copyState(scriptingMode, state.scriptState)
-      };
-    },
-
-    electricChars: "/{}:",
-
-    innerMode: function(state) {
-      if (state.token == scriptingDispatch) return {state: state.scriptState, mode: scriptingMode};
-      else return {state: state.htmlState, mode: htmlMixedMode};
-    }
-  };
-}, "htmlmixed");
-
-CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"});
-CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
-CodeMirror.defineMIME("application/x-jsp", { name: "htmlembedded", scriptingModeSpec:"text/x-java"});
-CodeMirror.defineMIME("application/x-erb", { name: "htmlembedded", scriptingModeSpec:"ruby"});
diff --git a/resources/libs/codemirror/mode/htmlembedded/index.html b/resources/libs/codemirror/mode/htmlembedded/index.html
deleted file mode 100644
index 4ab90f7d8..000000000
--- a/resources/libs/codemirror/mode/htmlembedded/index.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Html Embedded Scripts mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../xml/xml.js"></script>
-<script src="../javascript/javascript.js"></script>
-<script src="../css/css.js"></script>
-<script src="../htmlmixed/htmlmixed.js"></script>
-<script src="htmlembedded.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Html Embedded Scripts</a>
-  </ul>
-</div>
-
-<article>
-<h2>Html Embedded Scripts mode</h2>
-<form><textarea id="code" name="code">
-<%
-function hello(who) {
-	return "Hello " + who;
-}
-%>
-This is an example of EJS (embedded javascript)
-<p>The program says <%= hello("world") %>.</p>
-<script>
-	alert("And here is some normal JS code"); // also colored
-</script>
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "application/x-ejs",
-        indentUnit: 4,
-        indentWithTabs: true,
-        enterMode: "keep",
-        tabMode: "shift"
-      });
-    </script>
-
-    <p>Mode for html embedded scripts like JSP and ASP.NET. Depends on HtmlMixed which in turn depends on
-    JavaScript, CSS and XML.<br />Other dependancies include those of the scriping language chosen.</p>
-
-    <p><strong>MIME types defined:</strong> <code>application/x-aspx</code> (ASP.NET), 
-    <code>application/x-ejs</code> (Embedded Javascript), <code>application/x-jsp</code> (JavaServer Pages)</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/htmlmixed/htmlmixed.js b/resources/libs/codemirror/mode/htmlmixed/htmlmixed.js
deleted file mode 100644
index b59ef37ed..000000000
--- a/resources/libs/codemirror/mode/htmlmixed/htmlmixed.js
+++ /dev/null
@@ -1,104 +0,0 @@
-CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
-  var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true});
-  var cssMode = CodeMirror.getMode(config, "css");
-
-  var scriptTypes = [], scriptTypesConf = parserConfig && parserConfig.scriptTypes;
-  scriptTypes.push({matches: /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i,
-                    mode: CodeMirror.getMode(config, "javascript")});
-  if (scriptTypesConf) for (var i = 0; i < scriptTypesConf.length; ++i) {
-    var conf = scriptTypesConf[i];
-    scriptTypes.push({matches: conf.matches, mode: conf.mode && CodeMirror.getMode(config, conf.mode)});
-  }
-  scriptTypes.push({matches: /./,
-                    mode: CodeMirror.getMode(config, "text/plain")});
-
-  function html(stream, state) {
-    var tagName = state.htmlState.tagName;
-    var style = htmlMode.token(stream, state.htmlState);
-    if (tagName == "script" && /\btag\b/.test(style) && stream.current() == ">") {
-      // Script block: mode to change to depends on type attribute
-      var scriptType = stream.string.slice(Math.max(0, stream.pos - 100), stream.pos).match(/\btype\s*=\s*("[^"]+"|'[^']+'|\S+)[^<]*$/i);
-      scriptType = scriptType ? scriptType[1] : "";
-      if (scriptType && /[\"\']/.test(scriptType.charAt(0))) scriptType = scriptType.slice(1, scriptType.length - 1);
-      for (var i = 0; i < scriptTypes.length; ++i) {
-        var tp = scriptTypes[i];
-        if (typeof tp.matches == "string" ? scriptType == tp.matches : tp.matches.test(scriptType)) {
-          if (tp.mode) {
-            state.token = script;
-            state.localMode = tp.mode;
-            state.localState = tp.mode.startState && tp.mode.startState(htmlMode.indent(state.htmlState, ""));
-          }
-          break;
-        }
-      }
-    } else if (tagName == "style" && /\btag\b/.test(style) && stream.current() == ">") {
-      state.token = css;
-      state.localMode = cssMode;
-      state.localState = cssMode.startState(htmlMode.indent(state.htmlState, ""));
-    }
-    return style;
-  }
-  function maybeBackup(stream, pat, style) {
-    var cur = stream.current();
-    var close = cur.search(pat), m;
-    if (close > -1) stream.backUp(cur.length - close);
-    else if (m = cur.match(/<\/?$/)) {
-      stream.backUp(cur.length);
-      if (!stream.match(pat, false)) stream.match(cur);
-    }
-    return style;
-  }
-  function script(stream, state) {
-    if (stream.match(/^<\/\s*script\s*>/i, false)) {
-      state.token = html;
-      state.localState = state.localMode = null;
-      return html(stream, state);
-    }
-    return maybeBackup(stream, /<\/\s*script\s*>/,
-                       state.localMode.token(stream, state.localState));
-  }
-  function css(stream, state) {
-    if (stream.match(/^<\/\s*style\s*>/i, false)) {
-      state.token = html;
-      state.localState = state.localMode = null;
-      return html(stream, state);
-    }
-    return maybeBackup(stream, /<\/\s*style\s*>/,
-                       cssMode.token(stream, state.localState));
-  }
-
-  return {
-    startState: function() {
-      var state = htmlMode.startState();
-      return {token: html, localMode: null, localState: null, htmlState: state};
-    },
-
-    copyState: function(state) {
-      if (state.localState)
-        var local = CodeMirror.copyState(state.localMode, state.localState);
-      return {token: state.token, localMode: state.localMode, localState: local,
-              htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
-    },
-
-    token: function(stream, state) {
-      return state.token(stream, state);
-    },
-
-    indent: function(state, textAfter) {
-      if (!state.localMode || /^\s*<\//.test(textAfter))
-        return htmlMode.indent(state.htmlState, textAfter);
-      else if (state.localMode.indent)
-        return state.localMode.indent(state.localState, textAfter);
-      else
-        return CodeMirror.Pass;
-    },
-
-    electricChars: "/{}:",
-
-    innerMode: function(state) {
-      return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode};
-    }
-  };
-}, "xml", "javascript", "css");
-
-CodeMirror.defineMIME("text/html", "htmlmixed");
diff --git a/resources/libs/codemirror/mode/htmlmixed/index.html b/resources/libs/codemirror/mode/htmlmixed/index.html
deleted file mode 100644
index b46174351..000000000
--- a/resources/libs/codemirror/mode/htmlmixed/index.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: HTML mixed mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../xml/xml.js"></script>
-<script src="../javascript/javascript.js"></script>
-<script src="../css/css.js"></script>
-<script src="../vbscript/vbscript.js"></script>
-<script src="htmlmixed.js"></script>
-<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">HTML mixed</a>
-  </ul>
-</div>
-
-<article>
-<h2>HTML mixed mode</h2>
-<form><textarea id="code" name="code">
-<html style="color: green">
-  <!-- this is a comment -->
-  <head>
-    <title>Mixed HTML Example</title>
-    <style type="text/css">
-      h1 {font-family: comic sans; color: #f0f;}
-      div {background: yellow !important;}
-      body {
-        max-width: 50em;
-        margin: 1em 2em 1em 5em;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>Mixed HTML Example</h1>
-    <script>
-      function jsFunc(arg1, arg2) {
-        if (arg1 && arg2) document.body.innerHTML = "achoo";
-      }
-    </script>
-  </body>
-</html>
-</textarea></form>
-    <script>
-      // Define an extended mixed-mode that understands vbscript and
-      // leaves mustache/handlebars embedded templates in html mode
-      var mixedMode = {
-        name: "htmlmixed",
-        scriptTypes: [{matches: /\/x-handlebars-template|\/x-mustache/i,
-                       mode: null},
-                      {matches: /(text|application)\/(x-)?vb(a|script)/i,
-                       mode: "vbscript"}]
-      };
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: mixedMode, tabMode: "indent"});
-    </script>
-
-    <p>The HTML mixed mode depends on the XML, JavaScript, and CSS modes.</p>
-
-    <p>It takes an optional mode configuration
-    option, <code>scriptTypes</code>, which can be used to add custom
-    behavior for specific <code>&lt;script type="..."></code> tags. If
-    given, it should hold an array of <code>{matches, mode}</code>
-    objects, where <code>matches</code> is a string or regexp that
-    matches the script type, and <code>mode</code> is
-    either <code>null</code>, for script types that should stay in
-    HTML mode, or a <a href="../../doc/manual.html#option_mode">mode
-    spec</a> corresponding to the mode that should be used for the
-    script.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/html</code>
-    (redefined, only takes effect if you load this parser after the
-    XML parser).</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/http/http.js b/resources/libs/codemirror/mode/http/http.js
deleted file mode 100644
index 5a5163602..000000000
--- a/resources/libs/codemirror/mode/http/http.js
+++ /dev/null
@@ -1,98 +0,0 @@
-CodeMirror.defineMode("http", function() {
-  function failFirstLine(stream, state) {
-    stream.skipToEnd();
-    state.cur = header;
-    return "error";
-  }
-
-  function start(stream, state) {
-    if (stream.match(/^HTTP\/\d\.\d/)) {
-      state.cur = responseStatusCode;
-      return "keyword";
-    } else if (stream.match(/^[A-Z]+/) && /[ \t]/.test(stream.peek())) {
-      state.cur = requestPath;
-      return "keyword";
-    } else {
-      return failFirstLine(stream, state);
-    }
-  }
-
-  function responseStatusCode(stream, state) {
-    var code = stream.match(/^\d+/);
-    if (!code) return failFirstLine(stream, state);
-
-    state.cur = responseStatusText;
-    var status = Number(code[0]);
-    if (status >= 100 && status < 200) {
-      return "positive informational";
-    } else if (status >= 200 && status < 300) {
-      return "positive success";
-    } else if (status >= 300 && status < 400) {
-      return "positive redirect";
-    } else if (status >= 400 && status < 500) {
-      return "negative client-error";
-    } else if (status >= 500 && status < 600) {
-      return "negative server-error";
-    } else {
-      return "error";
-    }
-  }
-
-  function responseStatusText(stream, state) {
-    stream.skipToEnd();
-    state.cur = header;
-    return null;
-  }
-
-  function requestPath(stream, state) {
-    stream.eatWhile(/\S/);
-    state.cur = requestProtocol;
-    return "string-2";
-  }
-
-  function requestProtocol(stream, state) {
-    if (stream.match(/^HTTP\/\d\.\d$/)) {
-      state.cur = header;
-      return "keyword";
-    } else {
-      return failFirstLine(stream, state);
-    }
-  }
-
-  function header(stream) {
-    if (stream.sol() && !stream.eat(/[ \t]/)) {
-      if (stream.match(/^.*?:/)) {
-        return "atom";
-      } else {
-        stream.skipToEnd();
-        return "error";
-      }
-    } else {
-      stream.skipToEnd();
-      return "string";
-    }
-  }
-
-  function body(stream) {
-    stream.skipToEnd();
-    return null;
-  }
-
-  return {
-    token: function(stream, state) {
-      var cur = state.cur;
-      if (cur != header && cur != body && stream.eatSpace()) return null;
-      return cur(stream, state);
-    },
-
-    blankLine: function(state) {
-      state.cur = body;
-    },
-
-    startState: function() {
-      return {cur: start};
-    }
-  };
-});
-
-CodeMirror.defineMIME("message/http", "http");
diff --git a/resources/libs/codemirror/mode/http/index.html b/resources/libs/codemirror/mode/http/index.html
deleted file mode 100644
index 705085e22..000000000
--- a/resources/libs/codemirror/mode/http/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: HTTP mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="http.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">HTTP</a>
-  </ul>
-</div>
-
-<article>
-<h2>HTTP mode</h2>
-
-
-<div><textarea id="code" name="code">
-POST /somewhere HTTP/1.1
-Host: example.com
-If-Modified-Since: Sat, 29 Oct 1994 19:43:31 GMT
-Content-Type: application/x-www-form-urlencoded;
-	charset=utf-8
-User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/536.11 (KHTML, like Gecko) Ubuntu/12.04 Chromium/20.0.1132.47 Chrome/20.0.1132.47 Safari/536.11
-
-This is the request body!
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>message/http</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/index.html b/resources/libs/codemirror/mode/index.html
deleted file mode 100644
index 81abc42d8..000000000
--- a/resources/libs/codemirror/mode/index.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Language Modes</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Language modes</a>
-  </ul>
-</div>
-
-<article>
-
-<h2>Language modes</h2>
-
-<p>This is a list of every mode in the distribution. Each mode lives
-in a subdirectory of the <code>mode/</code> directory, and typically
-defines a single JavaScript file that implements the mode. Loading
-such file will make the language available to CodeMirror, through
-the <a href="manual.html#option_mode"><code>mode</code></a>
-option.</p>
-
-<div style="-webkit-columns: 100px 2; -moz-columns: 100px 2; columns: 100px 2;">
-    <ul>
-      <li><a href="apl/index.html">APL</a></li>
-      <li><a href="asterisk/index.html">Asterisk dialplan</a></li>
-      <li><a href="clike/index.html">C, C++, C#</a></li>
-      <li><a href="clojure/index.html">Clojure</a></li>
-      <li><a href="cobol/index.html">COBOL</a></li>
-      <li><a href="coffeescript/index.html">CoffeeScript</a></li>
-      <li><a href="commonlisp/index.html">Common Lisp</a></li>
-      <li><a href="css/index.html">CSS</a></li>
-      <li><a href="python/index.html">Cython</a></li>
-      <li><a href="d/index.html">D</a></li>
-      <li><a href="diff/index.html">diff</a></li>
-      <li><a href="dtd/index.html">DTD</a></li>
-      <li><a href="ecl/index.html">ECL</a></li>
-      <li><a href="eiffel/index.html">Eiffel</a></li>
-      <li><a href="erlang/index.html">Erlang</a></li>
-      <li><a href="fortran/index.html">Fortran</a></li>
-      <li><a href="gas/index.html">Gas</a> (AT&amp;T-style assembly)</li>
-      <li><a href="gherkin/index.html">Gherkin</a></li>
-      <li><a href="go/index.html">Go</a></li>
-      <li><a href="groovy/index.html">Groovy</a></li>
-      <li><a href="haml/index.html">HAML</a></li>
-      <li><a href="haskell/index.html">Haskell</a></li>
-      <li><a href="haxe/index.html">Haxe</a></li>
-      <li><a href="htmlembedded/index.html">HTML embedded scripts</a></li>
-      <li><a href="htmlmixed/index.html">HTML mixed-mode</a></li>
-      <li><a href="http/index.html">HTTP</a></li>
-      <li><a href="clike/index.html">Java</a></li>
-      <li><a href="jade/index.html">Jade</a></li>
-      <li><a href="javascript/index.html">JavaScript</a></li>
-      <li><a href="jinja2/index.html">Jinja2</a></li>
-      <li><a href="julia/index.html">Julia</a></li>
-      <li><a href="less/index.html">LESS</a></li>
-      <li><a href="livescript/index.html">LiveScript</a></li>
-      <li><a href="lua/index.html">Lua</a></li>
-      <li><a href="markdown/index.html">Markdown</a> (<a href="gfm/index.html">GitHub-flavour</a>)</li>
-      <li><a href="mirc/index.html">mIRC</a></li>
-      <li><a href="nginx/index.html">Nginx</a></li>
-      <li><a href="ntriples/index.html">NTriples</a></li>
-      <li><a href="ocaml/index.html">OCaml</a></li>
-      <li><a href="octave/index.html">Octave</a> (MATLAB)</li>
-      <li><a href="pascal/index.html">Pascal</a></li>
-      <li><a href="pegjs/index.html">PEG.js</a></li>
-      <li><a href="perl/index.html">Perl</a></li>
-      <li><a href="php/index.html">PHP</a></li>
-      <li><a href="pig/index.html">Pig Latin</a></li>
-      <li><a href="properties/index.html">Properties files</a></li>
-      <li><a href="python/index.html">Python</a></li>
-      <li><a href="q/index.html">Q</a></li>
-      <li><a href="r/index.html">R</a></li>
-      <li>RPM <a href="rpm/spec/index.html">spec</a> and <a href="rpm/changes/index.html">changelog</a></li>
-      <li><a href="rst/index.html">reStructuredText</a></li>
-      <li><a href="ruby/index.html">Ruby</a></li>
-      <li><a href="rust/index.html">Rust</a></li>
-      <li><a href="sass/index.html">Sass</a></li>
-      <li><a href="clike/scala.html">Scala</a></li>
-      <li><a href="scheme/index.html">Scheme</a></li>
-      <li><a href="css/scss.html">SCSS</a></li>
-      <li><a href="shell/index.html">Shell</a></li>
-      <li><a href="sieve/index.html">Sieve</a></li>
-      <li><a href="smalltalk/index.html">Smalltalk</a></li>
-      <li><a href="smarty/index.html">Smarty</a></li>
-      <li><a href="smartymixed/index.html">Smarty/HTML mixed</a></li>
-      <li><a href="sql/index.html">SQL</a> (several dialects)</li>
-      <li><a href="sparql/index.html">SPARQL</a></li>
-      <li><a href="stex/index.html">sTeX, LaTeX</a></li>
-      <li><a href="tcl/index.html">Tcl</a></li>
-      <li><a href="tiddlywiki/index.html">Tiddlywiki</a></li>
-      <li><a href="tiki/index.html">Tiki wiki</a></li>
-      <li><a href="toml/index.html">TOML</a></li>
-      <li><a href="turtle/index.html">Turtle</a></li>
-      <li><a href="vb/index.html">VB.NET</a></li>
-      <li><a href="vbscript/index.html">VBScript</a></li>
-      <li><a href="velocity/index.html">Velocity</a></li>
-      <li><a href="verilog/index.html">Verilog</a></li>
-      <li><a href="xml/index.html">XML/HTML</a></li>
-      <li><a href="xquery/index.html">XQuery</a></li>
-      <li><a href="yaml/index.html">YAML</a></li>
-      <li><a href="z80/index.html">Z80</a></li>
-    </ul>
-  </div>
-
-</article>
diff --git a/resources/libs/codemirror/mode/jade/index.html b/resources/libs/codemirror/mode/jade/index.html
deleted file mode 100644
index e22b15e65..000000000
--- a/resources/libs/codemirror/mode/jade/index.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Jade Templating Mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="jade.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Jade Templating Mode</a>
-  </ul>
-</div>
-
-<article>
-<h2>Jade Templating Mode</h2>
-<form><textarea id="code" name="code">
-doctype 5
-  html
-    head
-      title= "Jade Templating CodeMirror Mode Example"
-      link(rel='stylesheet', href='/css/bootstrap.min.css')
-      link(rel='stylesheet', href='/css/index.css')
-      script(type='text/javascript', src='/js/jquery-1.9.1.min.js')
-      script(type='text/javascript', src='/js/bootstrap.min.js')
-    body
-      div.header
-        h1 Welcome to this Example
-      div.spots
-        if locals.spots
-          each spot in spots
-            div.spot.well
-         div
-           if spot.logo
-             img.img-rounded.logo(src=spot.logo)
-           else
-             img.img-rounded.logo(src="img/placeholder.png")
-         h3
-           a(href=spot.hash) ##{spot.hash}
-           if spot.title
-             span.title #{spot.title}
-           if spot.desc
-             div #{spot.desc}
-        else
-          h3 There are no spots currently available.
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "jade", alignCDATA: true},
-        lineNumbers: true
-      });
-    </script>
-    <h3>The Jade Templating Mode</h3>
-      <p> Created by Drew Bratcher. Managed as part of an Adobe Brackets extension at <a href="https://github.com/dbratcher/brackets-jade">https://github.com/dbratcher/brackets-jade</a>.</p>
-    <p><strong>MIME type defined:</strong> <code>text/x-jade</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/jade/jade.js b/resources/libs/codemirror/mode/jade/jade.js
deleted file mode 100644
index 61abb27ab..000000000
--- a/resources/libs/codemirror/mode/jade/jade.js
+++ /dev/null
@@ -1,90 +0,0 @@
-CodeMirror.defineMode("jade", function () {
-  var symbol_regex1 = /^(?:~|!|%|\^|\*|\+|=|\\|:|;|,|\/|\?|&|<|>|\|)/;
-  var open_paren_regex = /^(\(|\[)/;
-  var close_paren_regex = /^(\)|\])/;
-  var keyword_regex1 = /^(if|else|return|var|function|include|doctype|each)/;
-  var keyword_regex2 = /^(#|{|}|\.)/;
-  var keyword_regex3 = /^(in)/;
-  var html_regex1 = /^(html|head|title|meta|link|script|body|br|div|input|span|a|img)/;
-  var html_regex2 = /^(h1|h2|h3|h4|h5|p|strong|em)/;
-  return {
-    startState: function () {
-      return {
-        inString: false,
-        stringType: "",
-        beforeTag: true,
-        justMatchedKeyword: false,
-        afterParen: false
-      };
-    },
-    token: function (stream, state) {
-      //check for state changes
-      if (!state.inString && ((stream.peek() == '"') || (stream.peek() == "'"))) {
-        state.stringType = stream.peek();
-        stream.next(); // Skip quote
-        state.inString = true; // Update state
-      }
-
-      //return state
-      if (state.inString) {
-        if (stream.skipTo(state.stringType)) { // Quote found on this line
-          stream.next(); // Skip quote
-          state.inString = false; // Clear flag
-        } else {
-          stream.skipToEnd(); // Rest of line is string
-        }
-        state.justMatchedKeyword = false;
-        return "string"; // Token style
-      } else if (stream.sol() && stream.eatSpace()) {
-        if (stream.match(keyword_regex1)) {
-          state.justMatchedKeyword = true;
-          stream.eatSpace();
-          return "keyword";
-        }
-        if (stream.match(html_regex1) || stream.match(html_regex2)) {
-          state.justMatchedKeyword = true;
-          return "variable";
-        }
-      } else if (stream.sol() && stream.match(keyword_regex1)) {
-        state.justMatchedKeyword = true;
-        stream.eatSpace();
-        return "keyword";
-      } else if (stream.sol() && (stream.match(html_regex1) || stream.match(html_regex2))) {
-        state.justMatchedKeyword = true;
-        return "variable";
-      } else if (stream.eatSpace()) {
-        state.justMatchedKeyword = false;
-        if (stream.match(keyword_regex3) && stream.eatSpace()) {
-          state.justMatchedKeyword = true;
-          return "keyword";
-        }
-      } else if (stream.match(symbol_regex1)) {
-        state.justMatchedKeyword = false;
-        return "atom";
-      } else if (stream.match(open_paren_regex)) {
-        state.afterParen = true;
-        state.justMatchedKeyword = true;
-        return "def";
-      } else if (stream.match(close_paren_regex)) {
-        state.afterParen = false;
-        state.justMatchedKeyword = true;
-        return "def";
-      } else if (stream.match(keyword_regex2)) {
-        state.justMatchedKeyword = true;
-        return "keyword";
-      } else if (stream.eatSpace()) {
-        state.justMatchedKeyword = false;
-      } else {
-        stream.next();
-        if (state.justMatchedKeyword) {
-          return "property";
-        } else if (state.afterParen) {
-          return "property";
-        }
-      }
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME('text/x-jade', 'jade');
diff --git a/resources/libs/codemirror/mode/javascript/index.html b/resources/libs/codemirror/mode/javascript/index.html
deleted file mode 100644
index 45d70ffdb..000000000
--- a/resources/libs/codemirror/mode/javascript/index.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: JavaScript mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="../../addon/comment/continuecomment.js"></script>
-<script src="../../addon/comment/comment.js"></script>
-<script src="javascript.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">JavaScript</a>
-  </ul>
-</div>
-
-<article>
-<h2>JavaScript mode</h2>
-
-
-<div><textarea id="code" name="code">
-// Demo code (the actual new parser character stream implementation)
-
-function StringStream(string) {
-  this.pos = 0;
-  this.string = string;
-}
-
-StringStream.prototype = {
-  done: function() {return this.pos >= this.string.length;},
-  peek: function() {return this.string.charAt(this.pos);},
-  next: function() {
-    if (this.pos &lt; this.string.length)
-      return this.string.charAt(this.pos++);
-  },
-  eat: function(match) {
-    var ch = this.string.charAt(this.pos);
-    if (typeof match == "string") var ok = ch == match;
-    else var ok = ch &amp;&amp; match.test ? match.test(ch) : match(ch);
-    if (ok) {this.pos++; return ch;}
-  },
-  eatWhile: function(match) {
-    var start = this.pos;
-    while (this.eat(match));
-    if (this.pos > start) return this.string.slice(start, this.pos);
-  },
-  backUp: function(n) {this.pos -= n;},
-  column: function() {return this.pos;},
-  eatSpace: function() {
-    var start = this.pos;
-    while (/\s/.test(this.string.charAt(this.pos))) this.pos++;
-    return this.pos - start;
-  },
-  match: function(pattern, consume, caseInsensitive) {
-    if (typeof pattern == "string") {
-      function cased(str) {return caseInsensitive ? str.toLowerCase() : str;}
-      if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) {
-        if (consume !== false) this.pos += str.length;
-        return true;
-      }
-    }
-    else {
-      var match = this.string.slice(this.pos).match(pattern);
-      if (match &amp;&amp; consume !== false) this.pos += match[0].length;
-      return match;
-    }
-  }
-};
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        continueComments: "Enter",
-        extraKeys: {"Ctrl-Q": "toggleComment"}
-      });
-    </script>
-
-    <p>
-      JavaScript mode supports a two configuration
-      options:
-      <ul>
-        <li><code>json</code> which will set the mode to expect JSON
-        data rather than a JavaScript program.</li>
-        <li><code>typescript</code> which will activate additional
-        syntax highlighting and some other things for TypeScript code
-        (<a href="typescript.html">demo</a>).</li>
-        <li><code>statementIndent</code> which (given a number) will
-        determine the amount of indentation to use for statements
-        continued on a new line.</li>
-      </ul>
-    </p>
-
-    <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/json</code>, <code>text/typescript</code>, <code>application/typescript</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/javascript/javascript.js b/resources/libs/codemirror/mode/javascript/javascript.js
deleted file mode 100644
index f27c06346..000000000
--- a/resources/libs/codemirror/mode/javascript/javascript.js
+++ /dev/null
@@ -1,617 +0,0 @@
-// TODO actually recognize syntax of TypeScript constructs
-
-CodeMirror.defineMode("javascript", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var statementIndent = parserConfig.statementIndent;
-  var jsonMode = parserConfig.json;
-  var isTS = parserConfig.typescript;
-
-  // Tokenizer
-
-  var keywords = function(){
-    function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
-    var operator = kw("operator"), atom = {type: "atom", style: "atom"};
-
-    var jsKeywords = {
-      "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C,
-      "var": kw("var"), "const": kw("var"), "let": kw("var"),
-      "function": kw("function"), "catch": kw("catch"),
-      "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-      "in": operator, "typeof": operator, "instanceof": operator,
-      "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
-      "this": kw("this"), "module": kw("module"), "class": kw("class"), "super": kw("atom"),
-      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
-    };
-
-    // Extend the 'normal' keywords with the TypeScript language extensions
-    if (isTS) {
-      var type = {type: "variable", style: "variable-3"};
-      var tsKeywords = {
-        // object-like things
-        "interface": kw("interface"),
-        "extends": kw("extends"),
-        "constructor": kw("constructor"),
-
-        // scope modifiers
-        "public": kw("public"),
-        "private": kw("private"),
-        "protected": kw("protected"),
-        "static": kw("static"),
-
-        // types
-        "string": type, "number": type, "bool": type, "any": type
-      };
-
-      for (var attr in tsKeywords) {
-        jsKeywords[attr] = tsKeywords[attr];
-      }
-    }
-
-    return jsKeywords;
-  }();
-
-  var isOperatorChar = /[+\-*&%=<>!?|~^]/;
-
-  function nextUntilUnescaped(stream, end) {
-    var escaped = false, next;
-    while ((next = stream.next()) != null) {
-      if (next == end && !escaped)
-        return false;
-      escaped = !escaped && next == "\\";
-    }
-    return escaped;
-  }
-
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-  function ret(tp, style, cont) {
-    type = tp; content = cont;
-    return style;
-  }
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) {
-      return ret("number", "number");
-    } else if (ch == "." && stream.match("..")) {
-      return ret("spread", "meta");
-    } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      return ret(ch);
-    } else if (ch == "=" && stream.eat(">")) {
-      return ret("=>");
-    } else if (ch == "0" && stream.eat(/x/i)) {
-      stream.eatWhile(/[\da-f]/i);
-      return ret("number", "number");
-    } else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
-      return ret("number", "number");
-    } else if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      } else if (stream.eat("/")) {
-        stream.skipToEnd();
-        return ret("comment", "comment");
-      } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
-               state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
-        nextUntilUnescaped(stream, "/");
-        stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla
-        return ret("regexp", "string-2");
-      } else {
-        stream.eatWhile(isOperatorChar);
-        return ret("operator", null, stream.current());
-      }
-    } else if (ch == "`") {
-      state.tokenize = tokenQuasi;
-      return tokenQuasi(stream, state);
-    } else if (ch == "#") {
-      stream.skipToEnd();
-      return ret("error", "error");
-    } else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return ret("operator", null, stream.current());
-    } else {
-      stream.eatWhile(/[\w\$_]/);
-      var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
-      return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
-                     ret("variable", "variable", word);
-    }
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      if (!nextUntilUnescaped(stream, quote))
-        state.tokenize = tokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenQuasi(stream, state) {
-    var escaped = false, next;
-    while ((next = stream.next()) != null) {
-      if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      escaped = !escaped && next == "\\";
-    }
-    return ret("quasi", "string-2", stream.current());
-  }
-
-  var brackets = "([{}])";
-  // This is a crude lookahead trick to try and notice that we're
-  // parsing the argument patterns for a fat-arrow function before we
-  // actually hit the arrow token. It only works if the arrow is on
-  // the same line as the arguments and there's no strange noise
-  // (comments) in between. Fallback is to only notice when we hit the
-  // arrow, and not declare the arguments as locals for the arrow
-  // body.
-  function findFatArrow(stream, state) {
-    if (state.fatArrowAt) state.fatArrowAt = null;
-    var arrow = stream.string.indexOf("=>", stream.start);
-    if (arrow < 0) return;
-
-    var depth = 0, sawSomething = false;
-    for (var pos = arrow - 1; pos >= 0; --pos) {
-      var ch = stream.string.charAt(pos);
-      var bracket = brackets.indexOf(ch);
-      if (bracket >= 0 && bracket < 3) {
-        if (!depth) { ++pos; break; }
-        if (--depth == 0) break;
-      } else if (bracket >= 3 && bracket < 6) {
-        ++depth;
-      } else if (/[$\w]/.test(ch)) {
-        sawSomething = true;
-      } else if (sawSomething && !depth) {
-        ++pos;
-        break;
-      }
-    }
-    if (sawSomething && !depth) state.fatArrowAt = pos;
-  }
-
-  // Parser
-
-  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true};
-
-  function JSLexical(indented, column, type, align, prev, info) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.prev = prev;
-    this.info = info;
-    if (align != null) this.align = align;
-  }
-
-  function inScope(state, varname) {
-    for (var v = state.localVars; v; v = v.next)
-      if (v.name == varname) return true;
-    for (var cx = state.context; cx; cx = cx.prev) {
-      for (var v = cx.vars; v; v = v.next)
-        if (v.name == varname) return true;
-    }
-  }
-
-  function parseJS(state, style, type, content, stream) {
-    var cc = state.cc;
-    // Communicate our context to the combinators.
-    // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
-
-    if (!state.lexical.hasOwnProperty("align"))
-      state.lexical.align = true;
-
-    while(true) {
-      var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement;
-      if (combinator(type, content)) {
-        while(cc.length && cc[cc.length - 1].lex)
-          cc.pop()();
-        if (cx.marked) return cx.marked;
-        if (type == "variable" && inScope(state, content)) return "variable-2";
-        return style;
-      }
-    }
-  }
-
-  // Combinator utils
-
-  var cx = {state: null, column: null, marked: null, cc: null};
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-  function register(varname) {
-    function inList(list) {
-      for (var v = list; v; v = v.next)
-        if (v.name == varname) return true;
-      return false;
-    }
-    var state = cx.state;
-    if (state.context) {
-      cx.marked = "def";
-      if (inList(state.localVars)) return;
-      state.localVars = {name: varname, next: state.localVars};
-    } else {
-      if (inList(state.globalVars)) return;
-      if (parserConfig.globalVars)
-        state.globalVars = {name: varname, next: state.globalVars};
-    }
-  }
-
-  // Combinators
-
-  var defaultVars = {name: "this", next: {name: "arguments"}};
-  function pushcontext() {
-    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
-    cx.state.localVars = defaultVars;
-  }
-  function popcontext() {
-    cx.state.localVars = cx.state.context.vars;
-    cx.state.context = cx.state.context.prev;
-  }
-  function pushlex(type, info) {
-    var result = function() {
-      var state = cx.state, indent = state.indented;
-      if (state.lexical.type == "stat") indent = state.lexical.indented;
-      state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info);
-    };
-    result.lex = true;
-    return result;
-  }
-  function poplex() {
-    var state = cx.state;
-    if (state.lexical.prev) {
-      if (state.lexical.type == ")")
-        state.indented = state.lexical.indented;
-      state.lexical = state.lexical.prev;
-    }
-  }
-  poplex.lex = true;
-
-  function expect(wanted) {
-    return function(type) {
-      if (type == wanted) return cont();
-      else if (wanted == ";") return pass();
-      else return cont(arguments.callee);
-    };
-  }
-
-  function statement(type, value) {
-    if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex);
-    if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex);
-    if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    if (type == ";") return cont();
-    if (type == "if") return cont(pushlex("form"), expression, statement, poplex, maybeelse);
-    if (type == "function") return cont(functiondef);
-    if (type == "for") return cont(pushlex("form"), forspec, poplex, statement, poplex);
-    if (type == "variable") return cont(pushlex("stat"), maybelabel);
-    if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
-                                      block, poplex, poplex);
-    if (type == "case") return cont(expression, expect(":"));
-    if (type == "default") return cont(expect(":"));
-    if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
-                                     statement, poplex, popcontext);
-    if (type == "module") return cont(pushlex("form"), pushcontext, afterModule, popcontext, poplex);
-    if (type == "class") return cont(pushlex("form"), className, objlit, poplex);
-    if (type == "export") return cont(pushlex("form"), afterExport, poplex);
-    if (type == "import") return cont(pushlex("form"), afterImport, poplex);
-    return pass(pushlex("stat"), expression, expect(";"), poplex);
-  }
-  function expression(type) {
-    return expressionInner(type, false);
-  }
-  function expressionNoComma(type) {
-    return expressionInner(type, true);
-  }
-  function expressionInner(type, noComma) {
-    if (cx.state.fatArrowAt == cx.stream.start) {
-      var body = noComma ? arrowBodyNoComma : arrowBody;
-      if (type == "(") return cont(pushcontext, commasep(pattern, ")"), expect("=>"), body, popcontext);
-      else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext);
-    }
-
-    var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
-    if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
-    if (type == "function") return cont(functiondef);
-    if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
-    if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
-    if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
-    if (type == "[") return cont(pushlex("]"), expressionNoComma, maybeArrayComprehension, poplex, maybeop);
-    if (type == "{") return cont(commasep(objprop, "}"), maybeop);
-    return cont();
-  }
-  function maybeexpression(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expression);
-  }
-  function maybeexpressionNoComma(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expressionNoComma);
-  }
-
-  function maybeoperatorComma(type, value) {
-    if (type == ",") return cont(expression);
-    return maybeoperatorNoComma(type, value, false);
-  }
-  function maybeoperatorNoComma(type, value, noComma) {
-    var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
-    var expr = noComma == false ? expression : expressionNoComma;
-    if (value == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
-    if (type == "operator") {
-      if (/\+\+|--/.test(value)) return cont(me);
-      if (value == "?") return cont(expression, expect(":"), expr);
-      return cont(expr);
-    }
-    if (type == "quasi") { cx.cc.push(me); return quasi(value); }
-    if (type == ";") return;
-    if (type == "(") return cont(commasep(expressionNoComma, ")", "call"), me);
-    if (type == ".") return cont(property, me);
-    if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
-  }
-  function quasi(value) {
-    if (!value) debugger;
-    if (value.slice(value.length - 2) != "${") return cont();
-    return cont(expression, continueQuasi);
-  }
-  function continueQuasi(type) {
-    if (type == "}") {
-      cx.marked = "string-2";
-      cx.state.tokenize = tokenQuasi;
-      return cont();
-    }
-  }
-  function arrowBody(type) {
-    findFatArrow(cx.stream, cx.state);
-    if (type == "{") return pass(statement);
-    return pass(expression);
-  }
-  function arrowBodyNoComma(type) {
-    findFatArrow(cx.stream, cx.state);
-    if (type == "{") return pass(statement);
-    return pass(expressionNoComma);
-  }
-  function maybelabel(type) {
-    if (type == ":") return cont(poplex, statement);
-    return pass(maybeoperatorComma, expect(";"), poplex);
-  }
-  function property(type) {
-    if (type == "variable") {cx.marked = "property"; return cont();}
-  }
-  function objprop(type, value) {
-    if (type == "variable") {
-      cx.marked = "property";
-      if (value == "get" || value == "set") return cont(getterSetter);
-    } else if (type == "number" || type == "string") {
-      cx.marked = type + " property";
-    } else if (type == "[") {
-      return cont(expression, expect("]"), afterprop);
-    }
-    if (atomicTypes.hasOwnProperty(type)) return cont(afterprop);
-  }
-  function getterSetter(type) {
-    if (type != "variable") return pass(afterprop);
-    cx.marked = "property";
-    return cont(functiondef);
-  }
-  function afterprop(type) {
-    if (type == ":") return cont(expressionNoComma);
-    if (type == "(") return pass(functiondef);
-  }
-  function commasep(what, end, info) {
-    function proceed(type) {
-      if (type == ",") {
-        var lex = cx.state.lexical;
-        if (lex.info == "call") lex.pos = (lex.pos || 0) + 1;
-        return cont(what, proceed);
-      }
-      if (type == end) return cont();
-      return cont(expect(end));
-    }
-    return function(type) {
-      if (type == end) return cont();
-      if (info === false) return pass(what, proceed);
-      return pass(pushlex(end, info), what, proceed, poplex);
-    };
-  }
-  function block(type) {
-    if (type == "}") return cont();
-    return pass(statement, block);
-  }
-  function maybetype(type) {
-    if (isTS && type == ":") return cont(typedef);
-  }
-  function typedef(type) {
-    if (type == "variable"){cx.marked = "variable-3"; return cont();}
-  }
-  function vardef() {
-    return pass(pattern, maybetype, maybeAssign, vardefCont);
-  }
-  function pattern(type, value) {
-    if (type == "variable") { register(value); return cont(); }
-    if (type == "[") return cont(commasep(pattern, "]"));
-    if (type == "{") return cont(commasep(proppattern, "}"));
-  }
-  function proppattern(type, value) {
-    if (type == "variable" && !cx.stream.match(/^\s*:/, false)) {
-      register(value);
-      return cont(maybeAssign);
-    }
-    if (type == "variable") cx.marked = "property";
-    return cont(expect(":"), pattern, maybeAssign);
-  }
-  function maybeAssign(_type, value) {
-    if (value == "=") return cont(expressionNoComma);
-  }
-  function vardefCont(type) {
-    if (type == ",") return cont(vardef);
-  }
-  function maybeelse(type, value) {
-    if (type == "keyword b" && value == "else") return cont(pushlex("form"), statement, poplex);
-  }
-  function forspec(type) {
-    if (type == "(") return cont(pushlex(")"), forspec1, expect(")"));
-  }
-  function forspec1(type) {
-    if (type == "var") return cont(vardef, expect(";"), forspec2);
-    if (type == ";") return cont(forspec2);
-    if (type == "variable") return cont(formaybeinof);
-    return pass(expression, expect(";"), forspec2);
-  }
-  function formaybeinof(_type, value) {
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return cont(maybeoperatorComma, forspec2);
-  }
-  function forspec2(type, value) {
-    if (type == ";") return cont(forspec3);
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return pass(expression, expect(";"), forspec3);
-  }
-  function forspec3(type) {
-    if (type != ")") cont(expression);
-  }
-  function functiondef(type, value) {
-    if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
-    if (type == "variable") {register(value); return cont(functiondef);}
-    if (type == "(") return cont(pushcontext, commasep(funarg, ")"), statement, popcontext);
-  }
-  function funarg(type) {
-    if (type == "spread") return cont(funarg);
-    return pass(pattern, maybetype);
-  }
-  function className(type, value) {
-    if (type == "variable") {register(value); return cont(classNameAfter);}
-  }
-  function classNameAfter(_type, value) {
-    if (value == "extends") return cont(expression);
-  }
-  function objlit(type) {
-    if (type == "{") return cont(commasep(objprop, "}"));
-  }
-  function afterModule(type, value) {
-    if (type == "string") return cont(statement);
-    if (type == "variable") { register(value); return cont(maybeFrom); }
-  }
-  function afterExport(_type, value) {
-    if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
-    if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }
-    return pass(statement);
-  }
-  function afterImport(type) {
-    if (type == "string") return cont();
-    return pass(importSpec, maybeFrom);
-  }
-  function importSpec(type, value) {
-    if (type == "{") return cont(commasep(importSpec, "}"));
-    if (type == "variable") register(value);
-    return cont();
-  }
-  function maybeFrom(_type, value) {
-    if (value == "from") { cx.marked = "keyword"; return cont(expression); }
-  }
-  function maybeArrayComprehension(type) {
-    if (type == "for") return pass(comprehension);
-    if (type == ",") return cont(commasep(expressionNoComma, "]", false));
-    return pass(commasep(expressionNoComma, "]", false));
-  }
-  function comprehension(type) {
-    if (type == "for") return cont(forspec, comprehension);
-    if (type == "if") return cont(expression, comprehension);
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      var state = {
-        tokenize: tokenBase,
-        lastType: "sof",
-        cc: [],
-        lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
-        localVars: parserConfig.localVars,
-        context: parserConfig.localVars && {vars: parserConfig.localVars},
-        indented: 0
-      };
-      if (parserConfig.globalVars) state.globalVars = parserConfig.globalVars;
-      return state;
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (!state.lexical.hasOwnProperty("align"))
-          state.lexical.align = false;
-        state.indented = stream.indentation();
-        findFatArrow(stream, state);
-      }
-      if (state.tokenize != tokenComment && stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (type == "comment") return style;
-      state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type;
-      return parseJS(state, style, type, content, stream);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize == tokenComment) return CodeMirror.Pass;
-      if (state.tokenize != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
-      // Kludge to prevent 'maybelse' from blocking lexical scope pops
-      for (var i = state.cc.length - 1; i >= 0; --i) {
-        var c = state.cc[i];
-        if (c == poplex) lexical = lexical.prev;
-        else if (c != maybeelse) break;
-      }
-      if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
-      if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
-        lexical = lexical.prev;
-      var type = lexical.type, closing = firstChar == type;
-
-      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0);
-      else if (type == "form" && firstChar == "{") return lexical.indented;
-      else if (type == "form") return lexical.indented + indentUnit;
-      else if (type == "stat")
-        return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? statementIndent || indentUnit : 0);
-      else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false)
-        return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
-      else if (lexical.align) return lexical.column + (closing ? 0 : 1);
-      else return lexical.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: ":{}",
-    blockCommentStart: jsonMode ? null : "/*",
-    blockCommentEnd: jsonMode ? null : "*/",
-    lineComment: jsonMode ? null : "//",
-    fold: "brace",
-
-    helperType: jsonMode ? "json" : "javascript",
-    jsonMode: jsonMode
-  };
-});
-
-CodeMirror.defineMIME("text/javascript", "javascript");
-CodeMirror.defineMIME("text/ecmascript", "javascript");
-CodeMirror.defineMIME("application/javascript", "javascript");
-CodeMirror.defineMIME("application/ecmascript", "javascript");
-CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
-CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
-CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
-CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
diff --git a/resources/libs/codemirror/mode/javascript/test.js b/resources/libs/codemirror/mode/javascript/test.js
deleted file mode 100644
index 760152499..000000000
--- a/resources/libs/codemirror/mode/javascript/test.js
+++ /dev/null
@@ -1,72 +0,0 @@
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "javascript");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("locals",
-     "[keyword function] [variable foo]([def a], [def b]) { [keyword var] [def c] = [number 10]; [keyword return] [variable-2 a] + [variable-2 c] + [variable d]; }");
-
-  MT("comma-and-binop",
-     "[keyword function](){ [keyword var] [def x] = [number 1] + [number 2], [def y]; }");
-
-  MT("destructuring",
-     "([keyword function]([def a], [[[def b], [def c] ]]) {",
-     "  [keyword let] {[def d], [property foo]: [def c]=[number 10], [def x]} = [variable foo]([variable-2 a]);",
-     "  [[[variable-2 c], [variable y] ]] = [variable-2 c];",
-     "})();");
-
-  MT("class",
-     "[keyword class] [variable Point] [keyword extends] [variable SuperThing] {",
-     "  [[ [string-2 /expr/] ]]: [number 24],",
-     "  [property constructor]([def x], [def y]) {",
-     "    [keyword super]([string 'something']);",
-     "    [keyword this].[property x] = [variable-2 x];",
-     "  }",
-     "}");
-
-  MT("module",
-     "[keyword module] [string 'foo'] {",
-     "  [keyword export] [keyword let] [def x] = [number 42];",
-     "  [keyword export] [keyword *] [keyword from] [string 'somewhere'];",
-     "}");
-
-  MT("import",
-     "[keyword function] [variable foo]() {",
-     "  [keyword import] [def $] [keyword from] [string 'jquery'];",
-     "  [keyword module] [def crypto] [keyword from] [string 'crypto'];",
-     "  [keyword import] { [def encrypt], [def decrypt] } [keyword from] [string 'crypto'];",
-     "}");
-
-  MT("const",
-     "[keyword function] [variable f]() {",
-     "  [keyword const] [[ [def a], [def b] ]] = [[ [number 1], [number 2] ]];",
-     "}");
-
-  MT("for/of",
-     "[keyword for]([keyword let] [variable of] [keyword of] [variable something]) {}");
-
-  MT("generator",
-     "[keyword function*] [variable repeat]([def n]) {",
-     "  [keyword for]([keyword var] [def i] = [number 0]; [variable-2 i] < [variable-2 n]; ++[variable-2 i])",
-     "    [keyword yield] [variable-2 i];",
-     "}");
-
-  MT("fatArrow",
-     "[variable array].[property filter]([def a] => [variable-2 a] + [number 1]);",
-     "[variable a];", // No longer in scope
-     "[keyword let] [variable f] = ([[ [def a], [def b] ]], [def c]) => [variable-2 a] + [variable-2 c];",
-     "[variable c];");
-
-  MT("spread",
-     "[keyword function] [variable f]([def a], [meta ...][def b]) {",
-     "  [variable something]([variable-2 a], [meta ...][variable-2 b]);",
-     "}");
-
-  MT("comprehension",
-     "[keyword function] [variable f]() {",
-     "  [[ [variable x] + [number 1] [keyword for] ([keyword var] [def x] [keyword in] [variable y]) [keyword if] [variable pred]([variable-2 x]) ]];",
-     "  ([variable u] [keyword for] ([keyword var] [def u] [keyword of] [variable generateValues]()) [keyword if] ([variable-2 u].[property color] === [string 'blue']));",
-     "}");
-
-  MT("quasi",
-     "[variable re][string-2 `fofdlakj${][variable x] + ([variable re][string-2 `foo`]) + [number 1][string-2 }fdsa`] + [number 2]");
-})();
diff --git a/resources/libs/codemirror/mode/javascript/typescript.html b/resources/libs/codemirror/mode/javascript/typescript.html
deleted file mode 100644
index 9cc5f4932..000000000
--- a/resources/libs/codemirror/mode/javascript/typescript.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: TypeScript mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="javascript.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">TypeScript</a>
-  </ul>
-</div>
-
-<article>
-<h2>TypeScript mode</h2>
-
-
-<div><textarea id="code" name="code">
-class Greeter {
-	greeting: string;
-	constructor (message: string) {
-		this.greeting = message;
-	}
-	greet() {
-		return "Hello, " + this.greeting;
-	}
-}   
-
-var greeter = new Greeter("world");
-
-var button = document.createElement('button')
-button.innerText = "Say Hello"
-button.onclick = function() {
-	alert(greeter.greet())
-}
-
-document.body.appendChild(button)
-
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/typescript"
-      });
-    </script>
-
-    <p>This is a specialization of the <a href="index.html">JavaScript mode</a>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/jinja2/index.html b/resources/libs/codemirror/mode/jinja2/index.html
deleted file mode 100644
index 66bf2ec60..000000000
--- a/resources/libs/codemirror/mode/jinja2/index.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Jinja2 mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="jinja2.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Jinja2</a>
-  </ul>
-</div>
-
-<article>
-<h2>Jinja2 mode</h2>
-<form><textarea id="code" name="code">
-&lt;html style="color: green"&gt;
-  &lt;!-- this is a comment --&gt;
-  &lt;head&gt;
-    &lt;title&gt;Jinja2 Example&lt;/title&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-    &lt;ul&gt;
-    {# this is a comment #}
-    {%- for item in li -%}
-      &lt;li&gt;
-        {{ item.label }}
-      &lt;/li&gt;
-    {% endfor -%}
-    &lt;/ul&gt;
-  &lt;/body&gt;
-&lt;/html&gt;
-</textarea></form>
-    <script>
-      var editor =
-      CodeMirror.fromTextArea(document.getElementById("code"), {mode:
-        {name: "jinja2", htmlMode: true}});
-    </script>
-  </article>
diff --git a/resources/libs/codemirror/mode/jinja2/jinja2.js b/resources/libs/codemirror/mode/jinja2/jinja2.js
deleted file mode 100644
index 16b06c48e..000000000
--- a/resources/libs/codemirror/mode/jinja2/jinja2.js
+++ /dev/null
@@ -1,42 +0,0 @@
-CodeMirror.defineMode("jinja2", function() {
-    var keywords = ["block", "endblock", "for", "endfor", "in", "true", "false",
-                    "loop", "none", "self", "super", "if", "as", "not", "and",
-                    "else", "import", "with", "without", "context"];
-    keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
-
-    function tokenBase (stream, state) {
-        var ch = stream.next();
-        if (ch == "{") {
-            if (ch = stream.eat(/\{|%|#/)) {
-                stream.eat("-");
-                state.tokenize = inTag(ch);
-                return "tag";
-            }
-        }
-    }
-    function inTag (close) {
-        if (close == "{") {
-            close = "}";
-        }
-        return function (stream, state) {
-            var ch = stream.next();
-            if ((ch == close || (ch == "-" && stream.eat(close)))
-                && stream.eat("}")) {
-                state.tokenize = tokenBase;
-                return "tag";
-            }
-            if (stream.match(keywords)) {
-                return "keyword";
-            }
-            return close == "#" ? "comment" : "string";
-        };
-    }
-    return {
-        startState: function () {
-            return {tokenize: tokenBase};
-        },
-        token: function (stream, state) {
-            return state.tokenize(stream, state);
-        }
-    };
-});
diff --git a/resources/libs/codemirror/mode/julia/index.html b/resources/libs/codemirror/mode/julia/index.html
deleted file mode 100644
index dd567a623..000000000
--- a/resources/libs/codemirror/mode/julia/index.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Julia mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="julia.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Julia</a>
-  </ul>
-</div>
-
-<article>
-<h2>Julia mode</h2>
-
-    <div><textarea id="code" name="code">
-#numbers
-1234
-1234im
-.234
-.234im
-2.23im
-2.3f3
-23e2
-0x234
-
-#strings
-'a'
-"asdf"
-r"regex"
-b"bytestring"
-
-"""
-multiline string
-"""
-
-#identifiers
-a
-as123
-function_name!
-
-#literal identifier multiples
-3x
-4[1, 2, 3]
-
-#dicts and indexing
-x=[1, 2, 3]
-x[end-1]
-x={"julia"=>"language of technical computing"}
-
-#exception handling
-try
-  f()
-catch
-  @printf "Error"
-finally
-  g()
-end
-
-#types
-immutable Color{T<:Number}
-  r::T
-  g::T
-  b::T
-end
-
-#functions
-function change!(x::Vector{Float64})
-  for i = 1:length(x)
-    x[i] *= 2
-  end
-end
-
-#function invocation
-f('b', (2, 3)...)
-
-#operators
-|=
-&=
-^=
-\-
-%=
-*=
-+=
--=
-<=
->=
-!=
-==
-%
-*
-+
--
-<
->
-!
-=
-|
-&
-^
-\
-?
-~
-:
-$
-<:
-.<
-.>
-<<
-<<=
->>
->>>>
->>=
->>>=
-<<=
-<<<=
-.<=
-.>=
-.==
-->
-//
-in
-...
-//
-:=
-.//=
-.*=
-./=
-.^=
-.%=
-.+=
-.-=
-\=
-\\=
-||
-===
-&&
-|=
-.|=
-<:
->:
-|>
-<|
-::
-x ? y : z
-
-#macros
-@spawnat 2 1+1
-@eval(:x)
-
-#keywords and operators
-if else elseif while for
- begin let end do
-try catch finally return break continue
-global local const 
-export import importall using
-function macro module baremodule 
-type immutable quote
-true false enumerate
-
-
-    </textarea></div>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "julia",
-               },
-        lineNumbers: true,
-        indentUnit: 4,
-        tabMode: "shift",
-        matchBrackets: true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-julia</code>.</p>
-</article>
diff --git a/resources/libs/codemirror/mode/julia/julia.js b/resources/libs/codemirror/mode/julia/julia.js
deleted file mode 100644
index 9ec2428cd..000000000
--- a/resources/libs/codemirror/mode/julia/julia.js
+++ /dev/null
@@ -1,262 +0,0 @@
-CodeMirror.defineMode("julia", function(_conf, parserConf) {
-  var ERRORCLASS = 'error';
-
-  function wordRegexp(words) {
-    return new RegExp("^((" + words.join(")|(") + "))\\b");
-  }
-
-  var operators = parserConf.operators || /^(?:\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|<:|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b|\.{3})/;
-  var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
-  var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*!*/;
-  var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch"];
-  var blockClosers = ["end", "else", "elseif", "catch", "finally"];
-  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype', 'ccall'];
-  var builtinList = ['true', 'false', 'enumerate', 'open', 'close', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'UTF8String', 'ASCIIString', 'error', 'warn', 'info', '@printf'];
-
-  //var stringPrefixes = new RegExp("^[br]?('|\")")
-  var stringPrefixes = /^[br]?('|"{3}|")/;
-  var keywords = wordRegexp(keywordList);
-  var builtins = wordRegexp(builtinList);
-  var openers = wordRegexp(blockOpeners);
-  var closers = wordRegexp(blockClosers);
-  var macro = /@[_A-Za-z][_A-Za-z0-9]*!*/;
-  var indentInfo = null;
-
-  function in_array(state) {
-    var ch = cur_scope(state);
-    if(ch=="[" || ch=="{") {
-      return true;
-    }
-    else {
-      return false;
-    }
-  }
-
-  function cur_scope(state) {
-    if(state.scopes.length==0) {
-      return null;
-    }
-    return state.scopes[state.scopes.length - 1];
-  }
-
-  // tokenizers
-  function tokenBase(stream, state) {
-    // Handle scope changes
-    var leaving_expr = state.leaving_expr;
-    state.leaving_expr = false;
-    if(leaving_expr) {
-      if(stream.match(/^'+/)) {
-        return 'operator';
-      }
-      if(stream.match("...")) {
-        return 'operator';
-      }
-    }
-
-    if (stream.eatSpace()) {
-      return null;
-    }
-
-    var ch = stream.peek();
-    // Handle Comments
-    if (ch === '#') {
-        stream.skipToEnd();
-        return 'comment';
-    }
-    if(ch==='[') {
-      state.scopes.push("[");
-    }
-
-    if(ch==='{') {
-      state.scopes.push("{");
-    }
-
-    var scope=cur_scope(state);
-
-    if(scope==='[' && ch===']') {
-      state.scopes.pop();
-      state.leaving_expr=true;
-    }
-
-    if(scope==='{' && ch==='}') {
-      state.scopes.pop();
-      state.leaving_expr=true;
-    }
-
-    var match;
-    if(match=stream.match(openers, false)) {
-      state.scopes.push(match);
-    }
-
-    if(!in_array(state) && stream.match(closers, false)) {
-      state.scopes.pop();
-    }
-
-    if(in_array(state)) {
-      if(stream.match("end")) {
-        return 'number';
-      }
-
-    }
-    if(stream.match("=>")) {
-      return 'operator';
-    }
-    // Handle Number Literals
-    if (stream.match(/^[0-9\.]/, false)) {
-      var imMatcher = RegExp(/^im\b/);
-      var floatLiteral = false;
-      // Floats
-      if (stream.match(/^\d*\.\d+([ef][\+\-]?\d+)?/i)) { floatLiteral = true; }
-      if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
-      if (stream.match(/^\.\d+/)) { floatLiteral = true; }
-      if (floatLiteral) {
-          // Float literals may be "imaginary"
-          stream.match(imMatcher);
-          return 'number';
-      }
-      // Integers
-      var intLiteral = false;
-      // Hex
-      if (stream.match(/^0x[0-9a-f]+/i)) { intLiteral = true; }
-      // Binary
-      if (stream.match(/^0b[01]+/i)) { intLiteral = true; }
-      // Octal
-      if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; }
-      // Decimal
-      if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
-          // Decimal literals may be "imaginary"
-          stream.eat(/J/i);
-          // TODO - Can you have imaginary longs?
-          intLiteral = true;
-      }
-      // Zero by itself with no other piece of number.
-      if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
-      if (intLiteral) {
-          // Integer literals may be "long"
-          stream.match(imMatcher);
-          return 'number';
-      }
-    }
-
-    // Handle Strings
-    if (stream.match(stringPrefixes)) {
-      state.tokenize = tokenStringFactory(stream.current());
-      return state.tokenize(stream, state);
-    }
-
-    // Handle operators and Delimiters
-    if (stream.match(operators)) {
-      return 'operator';
-    }
-
-    if (stream.match(delimiters)) {
-      return null;
-    }
-
-    if (stream.match(keywords)) {
-      return 'keyword';
-    }
-
-    if (stream.match(builtins)) {
-      return 'builtin';
-    }
-
-    if (stream.match(macro)) {
-      return 'meta';
-    }
-
-    if (stream.match(identifiers)) {
-      state.leaving_expr=true;
-      return 'variable';
-    }
-    // Handle non-detected items
-    stream.next();
-    return ERRORCLASS;
-  }
-
-  function tokenStringFactory(delimiter) {
-    while ('rub'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
-      delimiter = delimiter.substr(1);
-    }
-    var singleline = delimiter.length == 1;
-    var OUTCLASS = 'string';
-
-    function tokenString(stream, state) {
-      while (!stream.eol()) {
-        stream.eatWhile(/[^'"\\]/);
-        if (stream.eat('\\')) {
-            stream.next();
-            if (singleline && stream.eol()) {
-              return OUTCLASS;
-            }
-        } else if (stream.match(delimiter)) {
-            state.tokenize = tokenBase;
-            return OUTCLASS;
-        } else {
-            stream.eat(/['"]/);
-        }
-      }
-      if (singleline) {
-        if (parserConf.singleLineStringErrors) {
-            return ERRORCLASS;
-        } else {
-            state.tokenize = tokenBase;
-        }
-      }
-      return OUTCLASS;
-    }
-    tokenString.isString = true;
-    return tokenString;
-  }
-
-  function tokenLexer(stream, state) {
-    indentInfo = null;
-    var style = state.tokenize(stream, state);
-    var current = stream.current();
-
-    // Handle '.' connected identifiers
-    if (current === '.') {
-      style = stream.match(identifiers, false) ? null : ERRORCLASS;
-      if (style === null && state.lastStyle === 'meta') {
-          // Apply 'meta' style to '.' connected identifiers when
-          // appropriate.
-        style = 'meta';
-      }
-      return style;
-    }
-
-    return style;
-  }
-
-  var external = {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        scopes: [],
-        leaving_expr: false
-      };
-    },
-
-    token: function(stream, state) {
-      var style = tokenLexer(stream, state);
-      state.lastStyle = style;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var delta = 0;
-      if(textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif" || textAfter=="catch" || textAfter=="finally") {
-        delta = -1;
-      }
-      return (state.scopes.length + delta) * 2;
-    },
-
-    lineComment: "#",
-    fold: "indent",
-    electricChars: "edlsifyh]}"
-  };
-  return external;
-});
-
-
-CodeMirror.defineMIME("text/x-julia", "julia");
diff --git a/resources/libs/codemirror/mode/less/index.html b/resources/libs/codemirror/mode/less/index.html
deleted file mode 100644
index 7239143c8..000000000
--- a/resources/libs/codemirror/mode/less/index.html
+++ /dev/null
@@ -1,753 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: LESS mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/lesser-dark.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="less.js"></script>
-<style>.CodeMirror {background: #f8f8f8; border: 1px solid #ddd; font-size:12px; height: 400px}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">LESS</a>
-  </ul>
-</div>
-
-<article>
-<h2>LESS mode</h2>
-<form><textarea id="code" name="code">@media screen and (device-aspect-ratio: 16/9) { … }
-@media screen and (device-aspect-ratio: 32/18) { … }
-@media screen and (device-aspect-ratio: 1280/720) { … }
-@media screen and (device-aspect-ratio: 2560/1440) { … }
-
-html:lang(fr-be)
-html:lang(de)
-:lang(fr-be) > q
-:lang(de) > q
-
-tr:nth-child(2n+1) /* represents every odd row of an HTML table */
-tr:nth-child(odd)  /* same */
-tr:nth-child(2n+0) /* represents every even row of an HTML table */
-tr:nth-child(even) /* same */
-
-/* Alternate paragraph colours in CSS */
-p:nth-child(4n+1) { color: navy; }
-p:nth-child(4n+2) { color: green; }
-p:nth-child(4n+3) { color: maroon; }
-p:nth-child(4n+4) { color: purple; }
-
-:nth-child(10n-1)  /* represents the 9th, 19th, 29th, etc, element */
-:nth-child(10n+9)  /* Same */
-:nth-child(10n+-1) /* Syntactically invalid, and would be ignored */
-
-:nth-child( 3n + 1 )
-:nth-child( +3n - 2 )
-:nth-child( -n+ 6)
-:nth-child( +6 )
-
-html|tr:nth-child(-n+6)  /* represents the 6 first rows of XHTML tables */
-
-img:nth-of-type(2n+1) { float: right; }
-img:nth-of-type(2n) { float: left; }
-
-body > h2:nth-of-type(n+2):nth-last-of-type(n+2)
-body > h2:not(:first-of-type):not(:last-of-type)
-
-html|*:not(:link):not(:visited)
-*|*:not(:hover)
-p::first-line { text-transform: uppercase }
-
-p { color: red; font-size: 12pt }
-p::first-letter { color: green; font-size: 200% }
-p::first-line { color: blue }
-
-p { line-height: 1.1 }
-p::first-letter { font-size: 3em; font-weight: normal }
-span { font-weight: bold }
-
-*               /* a=0 b=0 c=0 -> specificity =   0 */
-LI              /* a=0 b=0 c=1 -> specificity =   1 */
-UL LI           /* a=0 b=0 c=2 -> specificity =   2 */
-UL OL+LI        /* a=0 b=0 c=3 -> specificity =   3 */
-H1 + *[REL=up]  /* a=0 b=1 c=1 -> specificity =  11 */
-UL OL LI.red    /* a=0 b=1 c=3 -> specificity =  13 */
-LI.red.level    /* a=0 b=2 c=1 -> specificity =  21 */
-#x34y           /* a=1 b=0 c=0 -> specificity = 100 */
-#s12:not(FOO)   /* a=1 b=0 c=1 -> specificity = 101 */
-
-@namespace foo url(http://www.example.com);
-foo|h1 { color: blue }  /* first rule */
-foo|* { color: yellow } /* second rule */
-|h1 { color: red }      /* ...*/
-*|h1 { color: green }
-h1 { color: green }
-
-span[hello="Ocean"][goodbye="Land"]
-
-a[rel~="copyright"] { ... }
-a[href="http://www.w3.org/"] { ... }
-
-DIALOGUE[character=romeo]
-DIALOGUE[character=juliet]
-
-[att^=val]
-[att$=val]
-[att*=val]
-
-@namespace foo "http://www.example.com";
-[foo|att=val] { color: blue }
-[*|att] { color: yellow }
-[|att] { color: green }
-[att] { color: green }
-
-
-*:target { color : red }
-*:target::before { content : url(target.png) }
-
-E[foo]{
-  padding:65px;
-}
-E[foo] ~ F{
-  padding:65px;
-}
-E#myid{
-  padding:65px;
-}
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
-  padding: 0;
-  border: 0;
-}
-.btn {
-  // reset here as of 2.0.3 due to Recess property order
-  border-color: #ccc;
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);
-}
-fieldset span button, fieldset span input[type="file"] {
-  font-size:12px;
-	font-family:Arial, Helvetica, sans-serif;
-}
-.el tr:nth-child(even):last-child td:first-child{
-	-moz-border-radius-bottomleft:3px;
-	-webkit-border-bottom-left-radius:3px;
-	border-bottom-left-radius:3px;
-}
-
-/* Some LESS code */
-
-button {
-    width:  32px;
-    height: 32px;
-    border: 0;
-    margin: 4px;
-    cursor: pointer;
-}
-button.icon-plus { background: url(http://dahlström.net/tmp/sharp-icons/svg-icon-target.svg#plus) no-repeat; }
-button.icon-chart { background: url(http://dahlström.net/tmp/sharp-icons/svg-icon-target.svg#chart) no-repeat; }
-
-button:hover { background-color: #999; }
-button:active { background-color: #666; }
-
-@test_a: #eeeQQQ;//this is not a valid hex value and thus parsed as an element id
-@test_b: #eeeFFF //this is a valid hex value but the declaration doesn't end with a semicolon and thus parsed as an element id
-
-#eee aaa .box
-{
-  #test bbb {
-    width: 500px;
-    height: 250px;
-    background-image: url(dir/output/sheep.png), url( betweengrassandsky.png );
-    background-position: center bottom, left top;
-    background-repeat: no-repeat;
-  }
-}
-
-@base: #f938ab;
-
-.box-shadow(@style, @c) when (iscolor(@c)) {
-  box-shadow:         @style @c;
-  -webkit-box-shadow: @style @c;
-  -moz-box-shadow:    @style @c;
-}
-.box-shadow(@style, @alpha: 50%) when (isnumber(@alpha)) {
-  .box-shadow(@style, rgba(0, 0, 0, @alpha));
-}
-
-@color: #4D926F;
-
-#header {
-  color: @color;
-  color: #000000;
-}
-h2 {
-  color: @color;
-}
-
-.rounded-corners (@radius: 5px) {
-  border-radius: @radius;
-  -webkit-border-radius: @radius;
-  -moz-border-radius: @radius;
-}
-
-#header {
-  .rounded-corners;
-}
-#footer {
-  .rounded-corners(10px);
-}
-
-.box-shadow (@x: 0, @y: 0, @blur: 1px, @alpha) {
-  @val: @x @y @blur rgba(0, 0, 0, @alpha);
-
-  box-shadow:         @val;
-  -webkit-box-shadow: @val;
-  -moz-box-shadow:    @val;
-}
-.box { @base: #f938ab;
-  color:        saturate(@base, 5%);
-  border-color: lighten(@base, 30%);
-  div { .box-shadow(0, 0, 5px, 0.4) }
-}
-
-@import url("something.css");
-
-@light-blue:   hsl(190, 50%, 65%);
-@light-yellow: desaturate(#fefec8, 10%);
-@dark-yellow:  desaturate(darken(@light-yellow, 10%), 40%);
-@darkest:      hsl(20, 0%, 15%);
-@dark:         hsl(190, 20%, 30%);
-@medium:       hsl(10, 60%, 30%);
-@light:        hsl(90, 40%, 20%);
-@lightest:     hsl(90, 20%, 90%);
-@highlight:    hsl(80, 50%, 90%);
-@blue:         hsl(210, 60%, 20%);
-@alpha-blue:   hsla(210, 60%, 40%, 0.5);
-
-.box-shadow (@x, @y, @blur, @alpha) {
-  @value: @x @y @blur rgba(0, 0, 0, @alpha);
-  box-shadow:         @value;
-  -moz-box-shadow:    @value;
-  -webkit-box-shadow: @value;
-}
-.border-radius (@radius) {
-  border-radius: @radius;
-  -moz-border-radius: @radius;
-  -webkit-border-radius: @radius;
-}
-
-.border-radius (@radius, bottom) {
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
-  -moz-border-top-right-radius: 0;
-  -moz-border-top-left-radius: 0;
-  -webkit-border-top-left-radius: 0;
-  -webkit-border-top-right-radius: 0;
-}
-.border-radius (@radius, right) {
-  border-bottom-left-radius: 0;
-  border-top-left-radius: 0;
-  -moz-border-bottom-left-radius: 0;
-  -moz-border-top-left-radius: 0;
-  -webkit-border-bottom-left-radius: 0;
-  -webkit-border-top-left-radius: 0;
-}
-.box-shadow-inset (@x, @y, @blur, @color) {
-  box-shadow: @x @y @blur @color inset;
-  -moz-box-shadow: @x @y @blur @color inset;
-  -webkit-box-shadow: @x @y @blur @color inset;
-}
-.code () {
-  font-family: 'Bitstream Vera Sans Mono',
-               'DejaVu Sans Mono',
-               'Monaco',
-               Courier,
-               monospace !important;
-}
-.wrap () {
-  text-wrap: wrap;
-  white-space: pre-wrap;       /* css-3 */
-  white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-  white-space: -pre-wrap;      /* Opera 4-6 */
-  white-space: -o-pre-wrap;    /* Opera 7 */
-  word-wrap: break-word;       /* Internet Explorer 5.5+ */
-}
-
-html { margin: 0 }
-body {
-  background-color: @darkest;
-  margin: 0 auto;
-  font-family: Arial, sans-serif;
-  font-size: 100%;
-  overflow-x: hidden;
-}
-nav, header, footer, section, article {
-  display: block;
-}
-a {
-  color: #b83000;
-}
-h1 a {
-  color: black;
-  text-decoration: none;
-}
-a:hover {
-  text-decoration: underline;
-}
-h1, h2, h3, h4 {
-  margin: 0;
-  font-weight: normal;
-}
-ul, li {
-  list-style-type: none;
-}
-code { .code; }
-code {
-  .string, .regexp { color: @dark }
-  .keyword { font-weight: bold }
-  .comment { color: rgba(0, 0, 0, 0.5) }
-  .number { color: @blue }
-  .class, .special { color: rgba(0, 50, 100, 0.8) }
-}
-pre {
-  padding: 0 30px;
-  .wrap;
-}
-blockquote {
-  font-style: italic;
-}
-body > footer {
-  text-align: left;
-  margin-left: 10px;
-  font-style: italic;
-  font-size: 18px;
-  color: #888;
-}
-
-#logo {
-  margin-top: 30px;
-  margin-bottom: 30px;
-  display: block;
-  width: 199px;
-  height: 81px;
-  background: url(/images/logo.png) no-repeat;
-}
-nav {
-  margin-left: 15px;
-}
-nav a, #dropdown li {
-  display: inline-block;
-  color: white;
-  line-height: 42px;
-  margin: 0;
-  padding: 0px 15px;
-  text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.5);
-  text-decoration: none;
-  border: 2px solid transparent;
-  border-width: 0 2px;
-  &:hover {
-    .dark-red; 
-    text-decoration: none;
-  }
-}
-.dark-red {
-    @red: @medium;
-    border: 2px solid darken(@red, 25%);
-    border-left-color: darken(@red, 15%);
-    border-right-color: darken(@red, 15%);
-    border-bottom: 0;
-    border-top: 0;
-    background-color: darken(@red, 10%);
-}
-
-.content {
-  margin: 0 auto;
-  width: 980px;
-}
-
-#menu {
-  position: absolute;
-  width: 100%;
-  z-index: 3;
-  clear: both;
-  display: block;
-  background-color: @blue;
-  height: 42px;
-  border-top: 2px solid lighten(@alpha-blue, 20%);
-  border-bottom: 2px solid darken(@alpha-blue, 25%);
-  .box-shadow(0, 1px, 8px, 0.6);
-  -moz-box-shadow: 0 0 0 #000; // Because firefox sucks.
-
-  &.docked {
-    background-color: hsla(210, 60%, 40%, 0.4);
-  }
-  &:hover {
-    background-color: @blue;
-  }
-
-  #dropdown {
-    margin: 0 0 0 117px;
-    padding: 0;
-    padding-top: 5px;
-    display: none;
-    width: 190px;
-    border-top: 2px solid @medium;
-    color: @highlight;
-    border: 2px solid darken(@medium, 25%);
-    border-left-color: darken(@medium, 15%);
-    border-right-color: darken(@medium, 15%);
-    border-top-width: 0;
-    background-color: darken(@medium, 10%);
-    ul {
-      padding: 0px;  
-    }
-    li {
-      font-size: 14px;
-      display: block;
-      text-align: left;
-      padding: 0;
-      border: 0;
-      a {
-        display: block;
-        padding: 0px 15px;  
-        text-decoration: none;
-        color: white;  
-        &:hover {
-          background-color: darken(@medium, 15%);
-          text-decoration: none;
-        }
-      }
-    }
-    .border-radius(5px, bottom);
-    .box-shadow(0, 6px, 8px, 0.5);
-  }
-}
-
-#main {
-  margin: 0 auto;
-  width: 100%;
-  background-color: @light-blue;
-  border-top: 8px solid darken(@light-blue, 5%);
-
-  #intro {
-    background-color: lighten(@light-blue, 25%);
-    float: left;
-    margin-top: -8px;
-    margin-right: 5px;
-
-    height: 380px;
-    position: relative;
-    z-index: 2;
-    font-family: 'Droid Serif', 'Georgia';
-    width: 395px;
-    padding: 45px 20px 23px 30px;
-    border: 2px dashed darken(@light-blue, 10%);
-    .box-shadow(1px, 0px, 6px, 0.5);
-    border-bottom: 0;
-    border-top: 0;
-    #download { color: transparent; border: 0; float: left; display: inline-block; margin: 15px 0 15px -5px; }
-    #download img { display: inline-block}
-    #download-info {
-      code {
-        font-size: 13px;  
-      }
-      color: @blue + #333; display: inline; float: left; margin: 36px 0 0 15px }
-  }
-  h2 {
-    span {
-      color: @medium;  
-    }
-    color: @blue;
-    margin: 20px 0;
-    font-size: 24px;
-    line-height: 1.2em;
-  }
-  h3 {
-    color: @blue;
-    line-height: 1.4em;
-    margin: 30px 0 15px 0;
-    font-size: 1em;
-    text-shadow: 0px 0px 0px @lightest;
-    span { color: @medium }
-  }
-  #example {
-    p {
-      font-size: 18px;
-      color: @blue;
-      font-weight: bold;
-      text-shadow: 0px 1px 1px @lightest;
-    }
-    pre {
-      margin: 0;
-      text-shadow: 0 -1px 1px @darkest;
-      margin-top: 20px;
-      background-color: desaturate(@darkest, 8%);
-      border: 0;
-      width: 450px;
-      color: lighten(@lightest, 2%);
-      background-repeat: repeat;
-      padding: 15px;
-      border: 1px dashed @lightest;
-      line-height: 15px;
-      .box-shadow(0, 0px, 15px, 0.5);
-      .code;
-      .border-radius(2px);
-      code .attribute { color: hsl(40, 50%, 70%) }
-      code .variable  { color: hsl(120, 10%, 50%) }
-      code .element   { color: hsl(170, 20%, 50%) }
-
-      code .string, .regexp { color: hsl(75, 50%, 65%) }
-      code .class { color: hsl(40, 40%, 60%); font-weight: normal }
-      code .id { color: hsl(50, 40%, 60%); font-weight: normal }
-      code .comment { color: rgba(255, 255, 255, 0.2) }
-      code .number, .color { color: hsl(10, 40%, 50%) }
-      code .class, code .mixin, .special { color: hsl(190, 20%, 50%) }
-      #time { color: #aaa }
-    }
-    float: right;
-    font-size: 12px;
-    margin: 0;
-    margin-top: 15px;
-    padding: 0;
-    width: 500px;
-  }
-}
-
-
-.page {
-  .content {
-    width: 870px;
-    padding: 45px;
-  }
-  margin: 0 auto;
-  font-family: 'Georgia', serif;
-  font-size: 18px;
-  line-height: 26px;
-  padding: 0 60px;
-  code {
-    font-size: 16px;  
-  }
-  pre {
-    border-width: 1px;
-    border-style: dashed;
-    padding: 15px;
-    margin: 15px 0;
-  }
-  h1 {
-    text-align: left;
-    font-size: 40px;
-    margin-top: 15px;
-    margin-bottom: 35px;
-  }
-  p + h1 { margin-top: 60px }
-  h2, h3 {
-    margin: 30px 0 15px 0;
-  }
-  p + h2, pre + h2, code + h2 {
-    border-top: 6px solid rgba(255, 255, 255, 0.1);
-    padding-top: 30px;
-  }
-  h3 {
-    margin: 15px 0;
-  }
-}
-
-
-#docs {
-  @bg: lighten(@light-blue, 5%);
-  border-top: 2px solid lighten(@bg, 5%);
-  color: @blue;
-  background-color: @light-blue;
-  .box-shadow(0, -2px, 5px, 0.2);
-
-  h1 {
-    font-family: 'Droid Serif', 'Georgia', serif;
-    padding-top: 30px;
-    padding-left: 45px;
-    font-size: 44px;
-    text-align: left;
-    margin: 30px 0 !important;
-    text-shadow: 0px 1px 1px @lightest;
-    font-weight: bold;
-  }
-  .content {
-    clear: both;
-    border-color: transparent;
-    background-color: lighten(@light-blue, 25%);
-    .box-shadow(0, 5px, 5px, 0.4);
-  }
-  pre {
-    @background: lighten(@bg, 30%);
-    color: lighten(@blue, 10%);
-    background-color: @background;
-    border-color: lighten(@light-blue, 25%);
-    border-width: 2px;
-    code .attribute { color: hsl(40, 50%, 30%) }
-    code .variable  { color: hsl(120, 10%, 30%) }
-    code .element   { color: hsl(170, 20%, 30%) }
-
-    code .string, .regexp { color: hsl(75, 50%, 35%) }
-    code .class { color: hsl(40, 40%, 30%); font-weight: normal }
-    code .id { color: hsl(50, 40%, 30%); font-weight: normal }
-    code .comment { color: rgba(0, 0, 0, 0.4) }
-    code .number, .color { color: hsl(10, 40%, 30%) }
-    code .class, code .mixin, .special { color: hsl(190, 20%, 30%) }
-  }
-  pre code                    { font-size: 15px  }
-  p + h2, pre + h2, code + h2 { border-top-color: rgba(0, 0, 0, 0.1) }
-}
-
-td {
-  padding-right: 30px;  
-}
-#synopsis {
-  .box-shadow(0, 5px, 5px, 0.2);
-}
-#synopsis, #about {
-  h2 {
-    font-size: 30px;  
-    padding: 10px 0;
-  }
-  h1 + h2 {
-      margin-top: 15px;  
-  }
-  h3 { font-size: 22px }
-
-  .code-example {
-    border-spacing: 0;
-    border-width: 1px;
-    border-style: dashed;
-    padding: 0;
-    pre { border: 0; margin: 0 }
-    td {
-      border: 0;
-      margin: 0;
-      background-color: desaturate(darken(@darkest, 5%), 20%);
-      vertical-align: top;
-      padding: 0;
-    }
-    tr { padding: 0 }
-  }
-  .css-output {
-    td {
-      border-left: 0;  
-    }
-  }
-  .less-example {
-    //border-right: 1px dotted rgba(255, 255, 255, 0.5) !important;
-  }
-  .css-output, .less-example {
-    width: 390px;
-  }
-  pre {
-    padding: 20px;
-    line-height: 20px;
-    font-size: 14px;
-  }
-}
-#about, #synopsis, #guide {
-  a {
-    text-decoration: none;
-    color: @light-yellow;
-    border-bottom: 1px dashed rgba(255, 255, 255, 0.2);
-    &:hover {
-      text-decoration: none;
-      border-bottom: 1px dashed @light-yellow;
-    }
-  }
-  @bg: desaturate(darken(@darkest, 5%), 20%);
-  text-shadow: 0 -1px 1px lighten(@bg, 5%);
-  color: @highlight;
-  background-color: @bg;
-  .content {
-    background-color: desaturate(@darkest, 20%);
-    clear: both;
-    .box-shadow(0, 5px, 5px, 0.4);
-  }
-  h1, h2, h3 {
-    color: @dark-yellow;
-  }
-  pre {
-      code .attribute { color: hsl(40, 50%, 70%) }
-      code .variable  { color: hsl(120, 10%, 50%) }
-      code .element   { color: hsl(170, 20%, 50%) }
-
-      code .string, .regexp { color: hsl(75, 50%, 65%) }
-      code .class { color: hsl(40, 40%, 60%); font-weight: normal }
-      code .id { color: hsl(50, 40%, 60%); font-weight: normal }
-      code .comment { color: rgba(255, 255, 255, 0.2) }
-      code .number, .color { color: hsl(10, 40%, 50%) }
-      code .class, code .mixin, .special { color: hsl(190, 20%, 50%) }
-    background-color: @bg;
-    border-color: darken(@light-yellow, 5%);
-  }
-  code {
-    color: darken(@dark-yellow, 5%);
-    .string, .regexp { color: desaturate(@light-blue, 15%) }
-    .keyword { color: hsl(40, 40%, 60%); font-weight: normal }
-    .comment { color: rgba(255, 255, 255, 0.2) }
-    .number { color: lighten(@blue, 10%) }
-    .class, .special { color: hsl(190, 20%, 50%) }
-  }
-}
-#guide {
-  background-color: @darkest;
-  .content {
-    background-color: transparent;
-  }
-
-}
-
-#about {
-  background-color: @darkest !important;
-  .content {
-    background-color: desaturate(lighten(@darkest, 3%), 5%);
-  }
-}
-#synopsis {
-  background-color: desaturate(lighten(@darkest, 3%), 5%) !important;
-  .content {
-    background-color: desaturate(lighten(@darkest, 3%), 5%);
-  }
-  pre {}
-}
-#synopsis, #guide {
-  .content {
-    .box-shadow(0, 0px, 0px, 0.0);
-  }
-}
-#about footer {
-  margin-top: 30px;
-  padding-top: 30px;
-  border-top: 6px solid rgba(0, 0, 0, 0.1);
-  text-align: center;
-  font-size: 16px;
-  color: rgba(255, 255, 255, 0.35);
-  #copy { font-size: 12px }
-  text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.02);
-}
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        theme: "lesser-dark",
-        lineNumbers : true,
-        matchBrackets : true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-less</code>, <code>text/css</code> (if not previously defined).</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/less/less.js b/resources/libs/codemirror/mode/less/less.js
deleted file mode 100644
index da3907485..000000000
--- a/resources/libs/codemirror/mode/less/less.js
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
-  LESS mode - http://www.lesscss.org/
-  Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
-  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
-  GitHub: @peterkroon
-*/
-
-CodeMirror.defineMode("less", function(config) {
-  var indentUnit = config.indentUnit, type;
-  function ret(style, tp) {type = tp; return style;}
-
-  var selectors = /(^\:root$|^\:nth\-child$|^\:nth\-last\-child$|^\:nth\-of\-type$|^\:nth\-last\-of\-type$|^\:first\-child$|^\:last\-child$|^\:first\-of\-type$|^\:last\-of\-type$|^\:only\-child$|^\:only\-of\-type$|^\:empty$|^\:link|^\:visited$|^\:active$|^\:hover$|^\:focus$|^\:target$|^\:lang$|^\:enabled^\:disabled$|^\:checked$|^\:first\-line$|^\:first\-letter$|^\:before$|^\:after$|^\:not$|^\:required$|^\:invalid$)/;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-
-    if (ch == "@") {stream.eatWhile(/[\w\-]/); return ret("meta", stream.current());}
-    else if (ch == "/" && stream.eat("*")) {
-      state.tokenize = tokenCComment;
-      return tokenCComment(stream, state);
-    } else if (ch == "<" && stream.eat("!")) {
-      state.tokenize = tokenSGMLComment;
-      return tokenSGMLComment(stream, state);
-    } else if (ch == "=") ret(null, "compare");
-    else if (ch == "|" && stream.eat("=")) return ret(null, "compare");
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    } else if (ch == "/") { // e.g.: .png will not be parsed as a class
-      if(stream.eat("/")){
-        state.tokenize = tokenSComment;
-        return tokenSComment(stream, state);
-      } else {
-        if(type == "string" || type == "(") return ret("string", "string");
-        if(state.stack[state.stack.length-1] !== undefined) return ret(null, ch);
-        stream.eatWhile(/[\a-zA-Z0-9\-_.\s]/);
-        if( /\/|\)|#/.test(stream.peek() || (stream.eatSpace() && stream.peek() === ")"))  || stream.eol() )return ret("string", "string"); // let url(/images/logo.png) without quotes return as string
-      }
-    } else if (ch == "!") {
-      stream.match(/^\s*\w*/);
-      return ret("keyword", "important");
-    } else if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w.%]/);
-      return ret("number", "unit");
-    } else if (/[,+<>*\/]/.test(ch)) {
-      if(stream.peek() == "=" || type == "a")return ret("string", "string");
-      if(ch === ",")return ret(null, ch);
-      return ret(null, "select-op");
-    } else if (/[;{}:\[\]()~\|]/.test(ch)) {
-      if(ch == ":"){
-        stream.eatWhile(/[a-z\\\-]/);
-        if( selectors.test(stream.current()) ){
-          return ret("tag", "tag");
-        } else if(stream.peek() == ":"){//::-webkit-search-decoration
-          stream.next();
-          stream.eatWhile(/[a-z\\\-]/);
-          if(stream.current().match(/\:\:\-(o|ms|moz|webkit)\-/))return ret("string", "string");
-          if( selectors.test(stream.current().substring(1)) )return ret("tag", "tag");
-          return ret(null, ch);
-        } else {
-          return ret(null, ch);
-        }
-      } else if(ch == "~"){
-        if(type == "r")return ret("string", "string");
-      } else {
-        return ret(null, ch);
-      }
-    } else if (ch == ".") {
-      if(type == "(")return ret("string", "string"); // allow url(../image.png)
-      stream.eatWhile(/[\a-zA-Z0-9\-_]/);
-      if(stream.peek() === " ")stream.eatSpace();
-      if(stream.peek() === ")" || type === ":")return ret("number", "unit");//rgba(0,0,0,.25);
-      else if(stream.current().length >1){
-        if(state.stack[state.stack.length-1] === "rule" && stream.peek().match(/{|,|\+|\(/) === null)return ret("number", "unit");
-      }
-      return ret("tag", "tag");
-    } else if (ch == "#") {
-      //we don't eat white-space, we want the hex color and or id only
-      stream.eatWhile(/[A-Za-z0-9]/);
-      //check if there is a proper hex color length e.g. #eee || #eeeEEE
-      if(stream.current().length == 4 || stream.current().length == 7){
-        if(stream.current().match(/[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}/,false) != null){//is there a valid hex color value present in the current stream
-          //when not a valid hex value, parse as id
-          if(stream.current().substring(1) != stream.current().match(/[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}/,false))return ret("atom", "tag");
-          //eat white-space
-          stream.eatSpace();
-          //when hex value declaration doesn't end with [;,] but is does with a slash/cc comment treat it as an id, just like the other hex values that don't end with[;,]
-          if( /[\/<>.(){!$%^&*_\-\\?=+\|#'~`]/.test(stream.peek()) ){
-            if(type === "select-op")return ret("number", "unit"); else return ret("atom", "tag");
-          }
-          //#time { color: #aaa }
-          else if(stream.peek() == "}" )return ret("number", "unit");
-          //we have a valid hex color value, parse as id whenever an element/class is defined after the hex(id) value e.g. #eee aaa || #eee .aaa
-          else if( /[a-zA-Z\\]/.test(stream.peek()) )return ret("atom", "tag");
-          //when a hex value is on the end of a line, parse as id
-          else if(stream.eol())return ret("atom", "tag");
-          //default
-          else return ret("number", "unit");
-        } else {//when not a valid hexvalue in the current stream e.g. #footer
-          stream.eatWhile(/[\w\\\-]/);
-          return ret("atom", stream.current());
-        }
-      } else {//when not a valid hexvalue length
-        stream.eatWhile(/[\w\\\-]/);
-        if(state.stack[state.stack.length-1] === "rule")return ret("atom", stream.current());return ret("atom", stream.current());
-        return ret("atom", "tag");
-      }
-    } else if (ch == "&") {
-      stream.eatWhile(/[\w\-]/);
-      return ret(null, ch);
-    } else {
-      stream.eatWhile(/[\w\\\-_%.{]/);
-      if(stream.current().match(/\\/) !== null){
-        if(stream.current().charAt(stream.current().length-1) === "\\"){
-          stream.eat(/\'|\"|\)|\(/);
-          while(stream.eatWhile(/[\w\\\-_%.{]/)){
-            stream.eat(/\'|\"|\)|\(/);
-          }
-          return ret("string", stream.current());
-        }
-      } //else if(type === "tag")return ret("tag", "tag");
-        else if(type == "string"){
-        if(state.stack[state.stack.length-1] === "{" && stream.peek() === ":")return ret("variable", "variable");
-        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
-        return ret(type, stream.current());
-      } else if(stream.current().match(/(^http$|^https$)/) != null){
-        stream.eatWhile(/[\w\\\-_%.{:\/]/);
-        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
-        return ret("string", "string");
-      } else if(stream.peek() == "<" || stream.peek() == ">" || stream.peek() == "+"){
-        if(type === "(" && (stream.current() === "n" || stream.current() === "-n"))return ret("string", stream.current());
-        return ret("tag", "tag");
-      } else if( /\(/.test(stream.peek()) ){
-        if(stream.current() === "when")return ret("variable","variable");
-        else if(state.stack[state.stack.length-1] === "@media" && stream.current() === "and")return ret("variable",stream.current());
-        return ret(null, ch);
-      } else if (stream.peek() == "/" && state.stack[state.stack.length-1] !== undefined){ // url(dir/center/image.png)
-        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
-        return ret("string", stream.current());
-      } else if( stream.current().match(/\-\d|\-.\d/) ){ // match e.g.: -5px -0.4 etc... only colorize the minus sign
-        //commment out these 2 comment if you want the minus sign to be parsed as null -500px
-        //stream.backUp(stream.current().length-1);
-        //return ret(null, ch);
-        return ret("number", "unit");
-      } else if( /\/|[\s\)]/.test(stream.peek() || stream.eol() || (stream.eatSpace() && stream.peek() == "/")) && stream.current().indexOf(".") !== -1){
-        if(stream.current().substring(stream.current().length-1,stream.current().length) == "{"){
-          stream.backUp(1);
-          return ret("tag", "tag");
-        }//end if
-        stream.eatSpace();
-        if( /[{<>.a-zA-Z\/]/.test(stream.peek())  || stream.eol() )return ret("tag", "tag"); // e.g. button.icon-plus
-        return ret("string", "string"); // let url(/images/logo.png) without quotes return as string
-      } else if( stream.eol() || stream.peek() == "[" || stream.peek() == "#" || type == "tag" ){
-
-        if(stream.current().substring(stream.current().length-1,stream.current().length) == "{")stream.backUp(1);
-        else if(state.stack[state.stack.length-1] === "border-color" || state.stack[state.stack.length-1] === "background-position" || state.stack[state.stack.length-1] === "font-family")return ret(null, stream.current());
-        else if(type === "tag")return ret("tag", "tag");
-        else if((type === ":" || type === "unit") && state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
-        else if(state.stack[state.stack.length-1] === "rule" && type === "tag")return ret("string", stream.current());
-        else if(state.stack[state.stack.length-1] === ";" && type === ":")return ret(null, stream.current());
-        //else if(state.stack[state.stack.length-1] === ";" || type === "")return ret("variable", stream.current());
-        else if(stream.peek() === "#" && type !== undefined && type.match(/\+|,|tag|select\-op|}|{|;/g) === null)return ret("string", stream.current());
-        else if(type === "variable")return ret(null, stream.current());
-        else if(state.stack[state.stack.length-1] === "{" && type === "comment")return ret("variable", stream.current());
-        else if(state.stack.length === 0 && (type === ";" || type === "comment"))return ret("tag", stream.current());
-        else if((state.stack[state.stack.length-1] === "{" || type === ";") && state.stack[state.stack.length-1] !== "@media{")return ret("variable", stream.current());
-        else if(state.stack[state.stack.length-2] === "{" && state.stack[state.stack.length-1] === ";")return ret("variable", stream.current());
-
-        return ret("tag", "tag");
-      } else if(type == "compare" || type == "a" || type == "("){
-        return ret("string", "string");
-      } else if(type == "|" || stream.current() == "-" || type == "["){
-        if(type == "|" && stream.peek().match(/\]|=|\~/) !== null)return ret("number", stream.current());
-        else if(type == "|" )return ret("tag", "tag");
-        else if(type == "["){
-          stream.eatWhile(/\w\-/);
-          return ret("number", stream.current());
-        }
-        return ret(null, ch);
-      } else if((stream.peek() == ":") || ( stream.eatSpace() && stream.peek() == ":")) {
-        stream.next();
-        var t_v = stream.peek() == ":" ? true : false;
-        if(!t_v){
-          var old_pos = stream.pos;
-          var sc = stream.current().length;
-          stream.eatWhile(/[a-z\\\-]/);
-          var new_pos = stream.pos;
-          if(stream.current().substring(sc-1).match(selectors) != null){
-            stream.backUp(new_pos-(old_pos-1));
-            return ret("tag", "tag");
-          } else stream.backUp(new_pos-(old_pos-1));
-        } else {
-          stream.backUp(1);
-        }
-        if(t_v)return ret("tag", "tag"); else return ret("variable", "variable");
-      } else if(state.stack[state.stack.length-1]  === "font-family" || state.stack[state.stack.length-1]  === "background-position" || state.stack[state.stack.length-1]  === "border-color"){
-        return ret(null, null);
-      } else {
-
-        if(state.stack[state.stack.length-1] === null && type === ":")return ret(null, stream.current());
-
-        //else if((type === ")" && state.stack[state.stack.length-1] === "rule") || (state.stack[state.stack.length-2] === "{" && state.stack[state.stack.length-1] === "rule" && type === "variable"))return ret(null, stream.current());
-
-        else if(/\^|\$/.test(stream.current()) && stream.peek().match(/\~|=/) !== null)return ret("string", "string");//att^=val
-
-        else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
-        else if(type === "unit" && state.stack[state.stack.length-1] === ";")return ret(null, "unit");
-        else if(type === ")" && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
-        else if(type && type.match("@") !== null  && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
-        //else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
-
-        else if((type === ";" || type === "}" || type === ",") && state.stack[state.stack.length-1] === ";")return ret("tag", stream.current());
-        else if((type === ";" && stream.peek() !== undefined && stream.peek().match(/{|./) === null) || (type === ";" && stream.eatSpace() && stream.peek().match(/{|./) === null))return ret("variable", stream.current());
-        else if((type === "@media" && state.stack[state.stack.length-1] === "@media") || type === "@namespace")return ret("tag", stream.current());
-
-        else if(type === "{"  && state.stack[state.stack.length-1] === ";" && stream.peek() === "{")return ret("tag", "tag");
-        else if((type === "{" || type === ":") && state.stack[state.stack.length-1] === ";")return ret(null, stream.current());
-        else if((state.stack[state.stack.length-1] === "{" && stream.eatSpace() && stream.peek().match(/.|#/) === null) || type === "select-op"  || (state.stack[state.stack.length-1] === "rule" && type === ",") )return ret("tag", "tag");
-        else if(type === "variable" && state.stack[state.stack.length-1] === "rule")return ret("tag", "tag");
-        else if((stream.eatSpace() && stream.peek() === "{") || stream.eol() || stream.peek() === "{")return ret("tag", "tag");
-        //this one messes up indentation
-        //else if((type === "}" && stream.peek() !== ":") || (type === "}" && stream.eatSpace() && stream.peek() !== ":"))return(type, "tag");
-
-        else if(type === ")" && (stream.current() == "and" || stream.current() == "and "))return ret("variable", "variable");
-        else if(type === ")" && (stream.current() == "when" || stream.current() == "when "))return ret("variable", "variable");
-        else if(type === ")" || type === "comment" || type === "{")return ret("tag", "tag");
-        else if(stream.sol())return ret("tag", "tag");
-        else if((stream.eatSpace() && stream.peek() === "#") || stream.peek() === "#")return ret("tag", "tag");
-        else if(state.stack.length === 0)return ret("tag", "tag");
-        else if(type === ";" && stream.peek() !== undefined && stream.peek().match(/^[.|\#]/g) !== null)return ret("tag", "tag");
-
-        else if(type === ":"){stream.eatSpace();return ret(null, stream.current());}
-
-        else if(stream.current() === "and " || stream.current() === "and")return ret("variable", stream.current());
-        else if(type === ";" && state.stack[state.stack.length-1] === "{")return ret("variable", stream.current());
-
-        else if(state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
-
-        return ret("tag", stream.current());
-      }
-    }
-  }
-
-  function tokenSComment(stream, state) { // SComment = Slash comment
-    stream.skipToEnd();
-    state.tokenize = tokenBase;
-    return ret("comment", "comment");
-  }
-
-  function tokenCComment(stream, state) {
-    var maybeEnd = false, ch;
-    while ((ch = stream.next()) != null) {
-      if (maybeEnd && ch == "/") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenSGMLComment(stream, state) {
-    var dashes = 0, ch;
-    while ((ch = stream.next()) != null) {
-      if (dashes >= 2 && ch == ">") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      dashes = (ch == "-") ? dashes + 1 : 0;
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped)
-          break;
-        escaped = !escaped && ch == "\\";
-      }
-      if (!escaped) state.tokenize = tokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  return {
-    startState: function(base) {
-      return {tokenize: tokenBase,
-              baseIndent: base || 0,
-              stack: []};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-
-      var context = state.stack[state.stack.length-1];
-      if (type == "hash" && context == "rule") style = "atom";
-      else if (style == "variable") {
-        if (context == "rule") style = null; //"tag"
-        else if (!context || context == "@media{") {
-          style = stream.current() == "when"  ? "variable" :
-          /[\s,|\s\)|\s]/.test(stream.peek()) ? "tag"      : type;
-        }
-      }
-
-      if (context == "rule" && /^[\{\};]$/.test(type))
-        state.stack.pop();
-      if (type == "{") {
-        if (context == "@media") state.stack[state.stack.length-1] = "@media{";
-        else state.stack.push("{");
-      }
-      else if (type == "}") state.stack.pop();
-      else if (type == "@media") state.stack.push("@media");
-      else if (stream.current() === "font-family") state.stack[state.stack.length-1] = "font-family";
-      else if (stream.current() === "background-position") state.stack[state.stack.length-1] = "background-position";
-      else if (stream.current() === "border-color") state.stack[state.stack.length-1] = "border-color";
-      else if (context == "{" && type != "comment" && type !== "tag") state.stack.push("rule");
-      else if (stream.peek() === ":" && stream.current().match(/@|#/) === null) style = type;
-      if(type === ";" && (state.stack[state.stack.length-1] == "font-family" || state.stack[state.stack.length-1] == "background-position" || state.stack[state.stack.length-1] == "border-color"))state.stack[state.stack.length-1] = stream.current();
-      else if(type === "tag" && stream.peek() === ")" && stream.current().match(/\:/) === null){type = null; style = null;}
-      // ????
-      else if((type === "variable" && stream.peek() === ")") || (type === "variable" && stream.eatSpace() && stream.peek() === ")"))return ret(null,stream.current());
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var n = state.stack.length;
-      if (/^\}/.test(textAfter))
-        n -= state.stack[state.stack.length-1] === "rule" ? 2 : 1;
-      else if (state.stack[state.stack.length-2] === "{")
-        n -= state.stack[state.stack.length-1] === "rule" ? 1 : 0;
-      return state.baseIndent + n * indentUnit;
-    },
-
-    electricChars: "}",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//"
-  };
-});
-
-CodeMirror.defineMIME("text/x-less", "less");
-if (!CodeMirror.mimeModes.hasOwnProperty("text/css"))
-  CodeMirror.defineMIME("text/css", "less");
diff --git a/resources/libs/codemirror/mode/livescript/index.html b/resources/libs/codemirror/mode/livescript/index.html
deleted file mode 100644
index b5944697d..000000000
--- a/resources/libs/codemirror/mode/livescript/index.html
+++ /dev/null
@@ -1,459 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: LiveScript mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/solarized.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="livescript.js"></script>
-<style>.CodeMirror {font-size: 80%;border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">LiveScript</a>
-  </ul>
-</div>
-
-<article>
-<h2>LiveScript mode</h2>
-<form><textarea id="code" name="code">
-# LiveScript mode for CodeMirror
-# The following script, prelude.ls, is used to
-# demonstrate LiveScript mode for CodeMirror.
-#   https://github.com/gkz/prelude-ls
-
-export objToFunc = objToFunc = (obj) ->
-  (key) -> obj[key]
-
-export each = (f, xs) -->
-  if typeof! xs is \Object
-    for , x of xs then f x
-  else
-    for x in xs then f x
-  xs
-
-export map = (f, xs) -->
-  f = objToFunc f if typeof! f isnt \Function
-  type = typeof! xs
-  if type is \Object
-    {[key, f x] for key, x of xs}
-  else
-    result = [f x for x in xs]
-    if type is \String then result * '' else result
-
-export filter = (f, xs) -->
-  f = objToFunc f if typeof! f isnt \Function
-  type = typeof! xs
-  if type is \Object
-    {[key, x] for key, x of xs when f x}
-  else
-    result = [x for x in xs when f x]
-    if type is \String then result * '' else result
-
-export reject = (f, xs) -->
-  f = objToFunc f if typeof! f isnt \Function
-  type = typeof! xs
-  if type is \Object
-    {[key, x] for key, x of xs when not f x}
-  else
-    result = [x for x in xs when not f x]
-    if type is \String then result * '' else result
-
-export partition = (f, xs) -->
-  f = objToFunc f if typeof! f isnt \Function
-  type = typeof! xs
-  if type is \Object
-    passed = {}
-    failed = {}
-    for key, x of xs
-      (if f x then passed else failed)[key] = x
-  else
-    passed = []
-    failed = []
-    for x in xs
-      (if f x then passed else failed)push x
-    if type is \String
-      passed *= ''
-      failed *= ''
-  [passed, failed]
-
-export find = (f, xs) -->
-  f = objToFunc f if typeof! f isnt \Function
-  if typeof! xs is \Object
-    for , x of xs when f x then return x
-  else
-    for x in xs when f x then return x
-  void
-
-export head = export first = (xs) ->
-  return void if not xs.length
-  xs.0
-
-export tail = (xs) ->
-  return void if not xs.length
-  xs.slice 1
-
-export last = (xs) ->
-  return void if not xs.length
-  xs[*-1]
-
-export initial = (xs) ->
-  return void if not xs.length
-  xs.slice 0 xs.length - 1
-
-export empty = (xs) ->
-  if typeof! xs is \Object
-    for x of xs then return false
-    return yes
-  not xs.length
-
-export values = (obj) ->
-  [x for , x of obj]
-
-export keys = (obj) ->
-  [x for x of obj]
-
-export len = (xs) ->
-  xs = values xs if typeof! xs is \Object
-  xs.length
-
-export cons = (x, xs) -->
-  if typeof! xs is \String then x + xs else [x] ++ xs
-
-export append = (xs, ys) -->
-  if typeof! ys is \String then xs + ys else xs ++ ys
-
-export join = (sep, xs) -->
-  xs = values xs if typeof! xs is \Object
-  xs.join sep
-
-export reverse = (xs) ->
-  if typeof! xs is \String
-  then (xs / '')reverse! * ''
-  else xs.slice!reverse!
-
-export fold = export foldl = (f, memo, xs) -->
-  if typeof! xs is \Object
-    for , x of xs then memo = f memo, x
-  else
-    for x in xs then memo = f memo, x
-  memo
-
-export fold1 = export foldl1 = (f, xs) --> fold f, xs.0, xs.slice 1
-
-export foldr = (f, memo, xs) --> fold f, memo, xs.slice!reverse!
-
-export foldr1 = (f, xs) -->
-  xs.=slice!reverse!
-  fold f, xs.0, xs.slice 1
-
-export unfoldr = export unfold = (f, b) -->
-  if (f b)?
-    [that.0] ++ unfoldr f, that.1
-  else
-    []
-
-export andList = (xs) ->
-  for x in xs when not x
-    return false
-  true
-
-export orList = (xs) ->
-  for x in xs when x
-    return true
-  false
-
-export any = (f, xs) -->
-  f = objToFunc f if typeof! f isnt \Function
-  for x in xs when f x
-    return yes
-  no
-
-export all = (f, xs) -->
-  f = objToFunc f if typeof! f isnt \Function
-  for x in xs when not f x
-    return no
-  yes
-
-export unique = (xs) ->
-  result = []
-  if typeof! xs is \Object
-    for , x of xs when x not in result then result.push x
-  else
-    for x   in xs when x not in result then result.push x
-  if typeof! xs is \String then result * '' else result
-
-export sort = (xs) ->
-  xs.concat!sort (x, y) ->
-    | x > y =>  1
-    | x < y => -1
-    | _     =>  0
-
-export sortBy = (f, xs) -->
-  return [] unless xs.length
-  xs.concat!sort f
-
-export compare = (f, x, y) -->
-  | (f x) > (f y) =>  1
-  | (f x) < (f y) => -1
-  | otherwise     =>  0
-
-export sum = (xs) ->
-  result = 0
-  if typeof! xs is \Object
-    for , x of xs then result += x
-  else
-    for x   in xs then result += x
-  result
-
-export product = (xs) ->
-  result = 1
-  if typeof! xs is \Object
-    for , x of xs then result *= x
-  else
-    for x   in xs then result *= x
-  result
-
-export mean = export average = (xs) -> (sum xs) / len xs
-
-export concat = (xss) -> fold append, [], xss
-
-export concatMap = (f, xs) --> fold ((memo, x) -> append memo, f x), [], xs
-
-export listToObj = (xs) ->
-  {[x.0, x.1] for x in xs}
-
-export maximum = (xs) -> fold1 (>?), xs
-
-export minimum = (xs) -> fold1 (<?), xs
-
-export scan = export scanl = (f, memo, xs) -->
-  last = memo
-  if typeof! xs is \Object
-  then [memo] ++ [last = f last, x for , x of xs]
-  else [memo] ++ [last = f last, x for x in xs]
-
-export scan1 = export scanl1 = (f, xs) --> scan f, xs.0, xs.slice 1
-
-export scanr = (f, memo, xs) -->
-  xs.=slice!reverse!
-  scan f, memo, xs .reverse!
-
-export scanr1 = (f, xs) -->
-  xs.=slice!reverse!
-  scan f, xs.0, xs.slice 1 .reverse!
-
-export replicate = (n, x) -->
-  result = []
-  i = 0
-  while i < n, ++i then result.push x
-  result
-
-export take = (n, xs) -->
-  | n <= 0
-    if typeof! xs is \String then '' else []
-  | not xs.length => xs
-  | otherwise     => xs.slice 0, n
-
-export drop = (n, xs) -->
-  | n <= 0        => xs
-  | not xs.length => xs
-  | otherwise     => xs.slice n
-
-export splitAt = (n, xs) --> [(take n, xs), (drop n, xs)]
-
-export takeWhile = (p, xs) -->
-  return xs if not xs.length
-  p = objToFunc p if typeof! p isnt \Function
-  result = []
-  for x in xs
-    break if not p x
-    result.push x
-  if typeof! xs is \String then result * '' else result
-
-export dropWhile = (p, xs) -->
-  return xs if not xs.length
-  p = objToFunc p if typeof! p isnt \Function
-  i = 0
-  for x in xs
-    break if not p x
-    ++i
-  drop i, xs
-
-export span = (p, xs) --> [(takeWhile p, xs), (dropWhile p, xs)]
-
-export breakIt = (p, xs) --> span (not) << p, xs
-
-export zip = (xs, ys) -->
-  result = []
-  for zs, i in [xs, ys]
-    for z, j in zs
-      result.push [] if i is 0
-      result[j]?push z
-  result
-
-export zipWith = (f,xs, ys) -->
-  f = objToFunc f if typeof! f isnt \Function
-  if not xs.length or not ys.length
-    []
-  else
-    [f.apply this, zs for zs in zip.call this, xs, ys]
-
-export zipAll = (...xss) ->
-  result = []
-  for xs, i in xss
-    for x, j in xs
-      result.push [] if i is 0
-      result[j]?push x
-  result
-
-export zipAllWith = (f, ...xss) ->
-  f = objToFunc f if typeof! f isnt \Function
-  if not xss.0.length or not xss.1.length
-    []
-  else
-    [f.apply this, xs for xs in zipAll.apply this, xss]
-
-export compose = (...funcs) ->
-  ->
-    args = arguments
-    for f in funcs
-      args = [f.apply this, args]
-    args.0
-
-export curry = (f) ->
-  curry$ f # using util method curry$ from livescript
-
-export id = (x) -> x
-
-export flip = (f, x, y) --> f y, x
-
-export fix = (f) ->
-  ( (g, x) -> -> f(g g) ...arguments ) do
-    (g, x) -> -> f(g g) ...arguments
-
-export lines = (str) ->
-  return [] if not str.length
-  str / \\n
-
-export unlines = (strs) -> strs * \\n
-
-export words = (str) ->
-  return [] if not str.length
-  str / /[ ]+/
-
-export unwords = (strs) -> strs * ' '
-
-export max = (>?)
-
-export min = (<?)
-
-export negate = (x) -> -x
-
-export abs = Math.abs
-
-export signum = (x) ->
-  | x < 0     => -1
-  | x > 0     =>  1
-  | otherwise =>  0
-
-export quot = (x, y) --> ~~(x / y)
-
-export rem = (%)
-
-export div = (x, y) --> Math.floor x / y
-
-export mod = (%%)
-
-export recip = (1 /)
-
-export pi = Math.PI
-
-export tau = pi * 2
-
-export exp = Math.exp
-
-export sqrt = Math.sqrt
-
-# changed from log as log is a
-# common function for logging things
-export ln = Math.log
-
-export pow = (^)
-
-export sin = Math.sin
-
-export tan = Math.tan
-
-export cos = Math.cos
-
-export asin = Math.asin
-
-export acos = Math.acos
-
-export atan = Math.atan
-
-export atan2 = (x, y) --> Math.atan2 x, y
-
-# sinh
-# tanh
-# cosh
-# asinh
-# atanh
-# acosh
-
-export truncate = (x) -> ~~x
-
-export round = Math.round
-
-export ceiling = Math.ceil
-
-export floor = Math.floor
-
-export isItNaN = (x) -> x isnt x
-
-export even = (x) -> x % 2 == 0
-
-export odd = (x) -> x % 2 != 0
-
-export gcd = (x, y) -->
-  x = Math.abs x
-  y = Math.abs y
-  until y is 0
-    z = x % y
-    x = y
-    y = z
-  x
-
-export lcm = (x, y) -->
-  Math.abs Math.floor (x / (gcd x, y) * y)
-
-# meta
-export installPrelude = !(target) ->
-  unless target.prelude?isInstalled
-    target <<< out$ # using out$ generated by livescript
-    target <<< target.prelude.isInstalled = true
-
-export prelude = out$
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        theme: "solarized light",
-        lineNumbers: true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-livescript</code>.</p>
-
-    <p>The LiveScript mode was written by Kenneth Bentley (<a href="LICENSE">license</a>).</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/livescript/livescript.js b/resources/libs/codemirror/mode/livescript/livescript.js
deleted file mode 100644
index c000324b8..000000000
--- a/resources/libs/codemirror/mode/livescript/livescript.js
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- * Link to the project's GitHub page:
- * https://github.com/duralog/CodeMirror
- */
-(function() {
-  CodeMirror.defineMode('livescript', function(){
-    var tokenBase, external;
-    tokenBase = function(stream, state){
-      var next_rule, nr, i$, len$, r, m;
-      if (next_rule = state.next || 'start') {
-        state.next = state.next;
-        if (Array.isArray(nr = Rules[next_rule])) {
-          for (i$ = 0, len$ = nr.length; i$ < len$; ++i$) {
-            r = nr[i$];
-            if (r.regex && (m = stream.match(r.regex))) {
-              state.next = r.next;
-              return r.token;
-            }
-          }
-          stream.next();
-          return 'error';
-        }
-        if (stream.match(r = Rules[next_rule])) {
-          if (r.regex && stream.match(r.regex)) {
-            state.next = r.next;
-            return r.token;
-          } else {
-            stream.next();
-            return 'error';
-          }
-        }
-      }
-      stream.next();
-      return 'error';
-    };
-    external = {
-      startState: function(){
-        return {
-          next: 'start',
-          lastToken: null
-        };
-      },
-      token: function(stream, state){
-        var style;
-        style = tokenBase(stream, state);
-        state.lastToken = {
-          style: style,
-          indent: stream.indentation(),
-          content: stream.current()
-        };
-        return style.replace(/\./g, ' ');
-      },
-      indent: function(state){
-        var indentation;
-        indentation = state.lastToken.indent;
-        if (state.lastToken.content.match(indenter)) {
-          indentation += 2;
-        }
-        return indentation;
-      }
-    };
-    return external;
-  });
-
-  var identifier = '(?![\\d\\s])[$\\w\\xAA-\\uFFDC](?:(?!\\s)[$\\w\\xAA-\\uFFDC]|-[A-Za-z])*';
-  var indenter = RegExp('(?:[({[=:]|[-~]>|\\b(?:e(?:lse|xport)|d(?:o|efault)|t(?:ry|hen)|finally|import(?:\\s*all)?|const|var|let|new|catch(?:\\s*' + identifier + ')?))\\s*$');
-  var keywordend = '(?![$\\w]|-[A-Za-z]|\\s*:(?![:=]))';
-  var stringfill = {
-    token: 'string',
-    regex: '.+'
-  };
-  var Rules = {
-    start: [
-      {
-        token: 'comment.doc',
-        regex: '/\\*',
-        next: 'comment'
-      }, {
-        token: 'comment',
-        regex: '#.*'
-      }, {
-        token: 'keyword',
-        regex: '(?:t(?:h(?:is|row|en)|ry|ypeof!?)|c(?:on(?:tinue|st)|a(?:se|tch)|lass)|i(?:n(?:stanceof)?|mp(?:ort(?:\\s+all)?|lements)|[fs])|d(?:e(?:fault|lete|bugger)|o)|f(?:or(?:\\s+own)?|inally|unction)|s(?:uper|witch)|e(?:lse|x(?:tends|port)|val)|a(?:nd|rguments)|n(?:ew|ot)|un(?:less|til)|w(?:hile|ith)|o[fr]|return|break|let|var|loop)' + keywordend
-      }, {
-        token: 'constant.language',
-        regex: '(?:true|false|yes|no|on|off|null|void|undefined)' + keywordend
-      }, {
-        token: 'invalid.illegal',
-        regex: '(?:p(?:ackage|r(?:ivate|otected)|ublic)|i(?:mplements|nterface)|enum|static|yield)' + keywordend
-      }, {
-        token: 'language.support.class',
-        regex: '(?:R(?:e(?:gExp|ferenceError)|angeError)|S(?:tring|yntaxError)|E(?:rror|valError)|Array|Boolean|Date|Function|Number|Object|TypeError|URIError)' + keywordend
-      }, {
-        token: 'language.support.function',
-        regex: '(?:is(?:NaN|Finite)|parse(?:Int|Float)|Math|JSON|(?:en|de)codeURI(?:Component)?)' + keywordend
-      }, {
-        token: 'variable.language',
-        regex: '(?:t(?:hat|il|o)|f(?:rom|allthrough)|it|by|e)' + keywordend
-      }, {
-        token: 'identifier',
-        regex: identifier + '\\s*:(?![:=])'
-      }, {
-        token: 'variable',
-        regex: identifier
-      }, {
-        token: 'keyword.operator',
-        regex: '(?:\\.{3}|\\s+\\?)'
-      }, {
-        token: 'keyword.variable',
-        regex: '(?:@+|::|\\.\\.)',
-        next: 'key'
-      }, {
-        token: 'keyword.operator',
-        regex: '\\.\\s*',
-        next: 'key'
-      }, {
-        token: 'string',
-        regex: '\\\\\\S[^\\s,;)}\\]]*'
-      }, {
-        token: 'string.doc',
-        regex: '\'\'\'',
-        next: 'qdoc'
-      }, {
-        token: 'string.doc',
-        regex: '"""',
-        next: 'qqdoc'
-      }, {
-        token: 'string',
-        regex: '\'',
-        next: 'qstring'
-      }, {
-        token: 'string',
-        regex: '"',
-        next: 'qqstring'
-      }, {
-        token: 'string',
-        regex: '`',
-        next: 'js'
-      }, {
-        token: 'string',
-        regex: '<\\[',
-        next: 'words'
-      }, {
-        token: 'string.regex',
-        regex: '//',
-        next: 'heregex'
-      }, {
-        token: 'string.regex',
-        regex: '\\/(?:[^[\\/\\n\\\\]*(?:(?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[\\/\\n\\\\]*)*)\\/[gimy$]{0,4}',
-        next: 'key'
-      }, {
-        token: 'constant.numeric',
-        regex: '(?:0x[\\da-fA-F][\\da-fA-F_]*|(?:[2-9]|[12]\\d|3[0-6])r[\\da-zA-Z][\\da-zA-Z_]*|(?:\\d[\\d_]*(?:\\.\\d[\\d_]*)?|\\.\\d[\\d_]*)(?:e[+-]?\\d[\\d_]*)?[\\w$]*)'
-      }, {
-        token: 'lparen',
-        regex: '[({[]'
-      }, {
-        token: 'rparen',
-        regex: '[)}\\]]',
-        next: 'key'
-      }, {
-        token: 'keyword.operator',
-        regex: '\\S+'
-      }, {
-        token: 'text',
-        regex: '\\s+'
-      }
-    ],
-    heregex: [
-      {
-        token: 'string.regex',
-        regex: '.*?//[gimy$?]{0,4}',
-        next: 'start'
-      }, {
-        token: 'string.regex',
-        regex: '\\s*#{'
-      }, {
-        token: 'comment.regex',
-        regex: '\\s+(?:#.*)?'
-      }, {
-        token: 'string.regex',
-        regex: '\\S+'
-      }
-    ],
-    key: [
-      {
-        token: 'keyword.operator',
-        regex: '[.?@!]+'
-      }, {
-        token: 'identifier',
-        regex: identifier,
-        next: 'start'
-      }, {
-        token: 'text',
-        regex: '.',
-        next: 'start'
-      }
-    ],
-    comment: [
-      {
-        token: 'comment.doc',
-        regex: '.*?\\*/',
-        next: 'start'
-      }, {
-        token: 'comment.doc',
-        regex: '.+'
-      }
-    ],
-    qdoc: [
-      {
-        token: 'string',
-        regex: ".*?'''",
-        next: 'key'
-      }, stringfill
-    ],
-    qqdoc: [
-      {
-        token: 'string',
-        regex: '.*?"""',
-        next: 'key'
-      }, stringfill
-    ],
-    qstring: [
-      {
-        token: 'string',
-        regex: '[^\\\\\']*(?:\\\\.[^\\\\\']*)*\'',
-        next: 'key'
-      }, stringfill
-    ],
-    qqstring: [
-      {
-        token: 'string',
-        regex: '[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',
-        next: 'key'
-      }, stringfill
-    ],
-    js: [
-      {
-        token: 'string',
-        regex: '[^\\\\`]*(?:\\\\.[^\\\\`]*)*`',
-        next: 'key'
-      }, stringfill
-    ],
-    words: [
-      {
-        token: 'string',
-        regex: '.*?\\]>',
-        next: 'key'
-      }, stringfill
-    ]
-  };
-  for (var idx in Rules) {
-    var r = Rules[idx];
-    if (Array.isArray(r)) {
-      for (var i = 0, len = r.length; i < len; ++i) {
-        var rr = r[i];
-        if (rr.regex) {
-          Rules[idx][i].regex = new RegExp('^' + rr.regex);
-        }
-      }
-    } else if (r.regex) {
-      Rules[idx].regex = new RegExp('^' + r.regex);
-    }
-  }
-})();
-
-CodeMirror.defineMIME('text/x-livescript', 'livescript');
diff --git a/resources/libs/codemirror/mode/livescript/livescript.ls b/resources/libs/codemirror/mode/livescript/livescript.ls
deleted file mode 100644
index 065242312..000000000
--- a/resources/libs/codemirror/mode/livescript/livescript.ls
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * Link to the project's GitHub page:
- * https://github.com/duralog/CodeMirror
- */
-CodeMirror.defineMode 'livescript', (conf) ->
-  tokenBase = (stream, state) ->
-    #indent =
-    if next_rule = state.next or \start
-      state.next = state.next
-      if Array.isArray nr = Rules[next_rule]
-        for r in nr
-          if r.regex and m = stream.match r.regex
-            state.next = r.next
-            return r.token
-        stream.next!
-        return \error
-      if stream.match r = Rules[next_rule]
-        if r.regex and stream.match r.regex
-          state.next = r.next
-          return r.token
-        else
-          stream.next!
-          return \error
-    stream.next!
-    return 'error'
-  external = {
-    startState: (basecolumn) ->
-      {
-        next: \start
-        lastToken: null
-      }
-    token: (stream, state) ->
-      style = tokenBase stream, state #tokenLexer stream, state
-      state.lastToken = {
-        style: style
-        indent: stream.indentation!
-        content: stream.current!
-      }
-      style.replace /\./g, ' '
-    indent: (state, textAfter) ->
-      # XXX this won't work with backcalls
-      indentation = state.lastToken.indent
-      if state.lastToken.content.match indenter then indentation += 2
-      return indentation
-  }
-  external
-
-### Highlight Rules
-# taken from mode-ls.ls
-
-indenter = // (?
-    : [({[=:]
-    | [-~]>
-    | \b (?: e(?:lse|xport) | d(?:o|efault) | t(?:ry|hen) | finally |
-             import (?:\s* all)? | const | var |
-             let | new | catch (?:\s* #identifier)? )
-  ) \s* $ //
-
-identifier = /(?![\d\s])[$\w\xAA-\uFFDC](?:(?!\s)[$\w\xAA-\uFFDC]|-[A-Za-z])*/$
-keywordend = /(?![$\w]|-[A-Za-z]|\s*:(?![:=]))/$
-stringfill = token: \string, regex: '.+'
-
-Rules =
-  start:
-    * token: \comment.doc
-      regex: '/\\*'
-      next : \comment
-
-    * token: \comment
-      regex: '#.*'
-
-    * token: \keyword
-      regex: //(?
-        :t(?:h(?:is|row|en)|ry|ypeof!?)
-        |c(?:on(?:tinue|st)|a(?:se|tch)|lass)
-        |i(?:n(?:stanceof)?|mp(?:ort(?:\s+all)?|lements)|[fs])
-        |d(?:e(?:fault|lete|bugger)|o)
-        |f(?:or(?:\s+own)?|inally|unction)
-        |s(?:uper|witch)
-        |e(?:lse|x(?:tends|port)|val)
-        |a(?:nd|rguments)
-        |n(?:ew|ot)
-        |un(?:less|til)
-        |w(?:hile|ith)
-        |o[fr]|return|break|let|var|loop
-      )//$ + keywordend
-
-    * token: \constant.language
-      regex: '(?:true|false|yes|no|on|off|null|void|undefined)' + keywordend
-
-    * token: \invalid.illegal
-      regex: '(?
-        :p(?:ackage|r(?:ivate|otected)|ublic)
-        |i(?:mplements|nterface)
-        |enum|static|yield
-      )' + keywordend
-
-    * token: \language.support.class
-      regex: '(?
-        :R(?:e(?:gExp|ferenceError)|angeError)
-        |S(?:tring|yntaxError)
-        |E(?:rror|valError)
-        |Array|Boolean|Date|Function|Number|Object|TypeError|URIError
-      )' + keywordend
-
-    * token: \language.support.function
-      regex: '(?
-        :is(?:NaN|Finite)
-        |parse(?:Int|Float)
-        |Math|JSON
-        |(?:en|de)codeURI(?:Component)?
-      )' + keywordend
-
-    * token: \variable.language
-      regex: '(?:t(?:hat|il|o)|f(?:rom|allthrough)|it|by|e)' + keywordend
-
-    * token: \identifier
-      regex: identifier + /\s*:(?![:=])/$
-
-    * token: \variable
-      regex: identifier
-
-    * token: \keyword.operator
-      regex: /(?:\.{3}|\s+\?)/$
-
-    * token: \keyword.variable
-      regex: /(?:@+|::|\.\.)/$
-      next : \key
-
-    * token: \keyword.operator
-      regex: /\.\s*/$
-      next : \key
-
-    * token: \string
-      regex: /\\\S[^\s,;)}\]]*/$
-
-    * token: \string.doc
-      regex: \'''
-      next : \qdoc
-
-    * token: \string.doc
-      regex: \"""
-      next : \qqdoc
-
-    * token: \string
-      regex: \'
-      next : \qstring
-
-    * token: \string
-      regex: \"
-      next : \qqstring
-
-    * token: \string
-      regex: \`
-      next : \js
-
-    * token: \string
-      regex: '<\\['
-      next : \words
-
-    * token: \string.regex
-      regex: \//
-      next : \heregex
-
-    * token: \string.regex
-      regex: //
-        /(?: [^ [ / \n \\ ]*
-          (?: (?: \\.
-                | \[ [^\]\n\\]* (?:\\.[^\]\n\\]*)* \]
-              ) [^ [ / \n \\ ]*
-          )*
-        )/ [gimy$]{0,4}
-      //$
-      next : \key
-
-    * token: \constant.numeric
-      regex: '(?:0x[\\da-fA-F][\\da-fA-F_]*
-                |(?:[2-9]|[12]\\d|3[0-6])r[\\da-zA-Z][\\da-zA-Z_]*
-                |(?:\\d[\\d_]*(?:\\.\\d[\\d_]*)?|\\.\\d[\\d_]*)
-                 (?:e[+-]?\\d[\\d_]*)?[\\w$]*)'
-
-    * token: \lparen
-      regex: '[({[]'
-
-    * token: \rparen
-      regex: '[)}\\]]'
-      next : \key
-
-    * token: \keyword.operator
-      regex: \\\S+
-
-    * token: \text
-      regex: \\\s+
-
-  heregex:
-    * token: \string.regex
-      regex: '.*?//[gimy$?]{0,4}'
-      next : \start
-    * token: \string.regex
-      regex: '\\s*#{'
-    * token: \comment.regex
-      regex: '\\s+(?:#.*)?'
-    * token: \string.regex
-      regex: '\\S+'
-
-  key:
-    * token: \keyword.operator
-      regex: '[.?@!]+'
-    * token: \identifier
-      regex: identifier
-      next : \start
-    * token: \text
-      regex: '.'
-      next : \start
-
-  comment:
-    * token: \comment.doc
-      regex: '.*?\\*/'
-      next : \start
-    * token: \comment.doc
-      regex: '.+'
-
-  qdoc:
-    token: \string
-    regex: ".*?'''"
-    next : \key
-    stringfill
-
-  qqdoc:
-    token: \string
-    regex: '.*?"""'
-    next : \key
-    stringfill
-
-  qstring:
-    token: \string
-    regex: /[^\\']*(?:\\.[^\\']*)*'/$
-    next : \key
-    stringfill
-
-  qqstring:
-    token: \string
-    regex: /[^\\"]*(?:\\.[^\\"]*)*"/$
-    next : \key
-    stringfill
-
-  js:
-    token: \string
-    regex: /[^\\`]*(?:\\.[^\\`]*)*`/$
-    next : \key
-    stringfill
-
-  words:
-    token: \string
-    regex: '.*?\\]>'
-    next : \key
-    stringfill
-
-# for optimization, precompile the regexps
-for idx, r of Rules
-  if Array.isArray r
-    for rr, i in r
-      if rr.regex then Rules[idx][i].regex = new RegExp '^'+rr.regex
-  else if r.regex then Rules[idx].regex = new RegExp '^'+r.regex
-
-CodeMirror.defineMIME 'text/x-livescript', 'livescript'
diff --git a/resources/libs/codemirror/mode/lua/index.html b/resources/libs/codemirror/mode/lua/index.html
deleted file mode 100644
index 69433e44a..000000000
--- a/resources/libs/codemirror/mode/lua/index.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Lua mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/neat.css">
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="../../lib/codemirror.js"></script>
-<script src="lua.js"></script>
-<style>.CodeMirror {border: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Lua</a>
-  </ul>
-</div>
-
-<article>
-<h2>Lua mode</h2>
-<form><textarea id="code" name="code">
---[[
-example useless code to show lua syntax highlighting
-this is multiline comment
-]]
-
-function blahblahblah(x)
-
-  local table = {
-    "asd" = 123,
-    "x" = 0.34,  
-  }
-  if x ~= 3 then
-    print( x )
-  elseif x == "string"
-    my_custom_function( 0x34 )
-  else
-    unknown_function( "some string" )
-  end
-
-  --single line comment
-  
-end
-
-function blablabla3()
-
-  for k,v in ipairs( table ) do
-    --abcde..
-    y=[=[
-  x=[[
-      x is a multi line string
-   ]]
-  but its definition is iside a highest level string!
-  ]=]
-    print(" \"\" ")
-
-    s = math.sin( x )
-  end
-
-end
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        tabMode: "indent",
-        matchBrackets: true,
-        theme: "neat"
-      });
-    </script>
-
-    <p>Loosely based on Franciszek
-    Wawrzak's <a href="http://codemirror.net/1/contrib/lua">CodeMirror
-    1 mode</a>. One configuration parameter is
-    supported, <code>specials</code>, to which you can provide an
-    array of strings to have those identifiers highlighted with
-    the <code>lua-special</code> style.</p>
-    <p><strong>MIME types defined:</strong> <code>text/x-lua</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/lua/lua.js b/resources/libs/codemirror/mode/lua/lua.js
deleted file mode 100644
index b8deaa257..000000000
--- a/resources/libs/codemirror/mode/lua/lua.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's
-// CodeMirror 1 mode.
-// highlights keywords, strings, comments (no leveling supported! ("[==[")), tokens, basic indenting
-
-CodeMirror.defineMode("lua", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-
-  function prefixRE(words) {
-    return new RegExp("^(?:" + words.join("|") + ")", "i");
-  }
-  function wordRE(words) {
-    return new RegExp("^(?:" + words.join("|") + ")$", "i");
-  }
-  var specials = wordRE(parserConfig.specials || []);
-
-  // long list of standard functions from lua manual
-  var builtins = wordRE([
-    "_G","_VERSION","assert","collectgarbage","dofile","error","getfenv","getmetatable","ipairs","load",
-    "loadfile","loadstring","module","next","pairs","pcall","print","rawequal","rawget","rawset","require",
-    "select","setfenv","setmetatable","tonumber","tostring","type","unpack","xpcall",
-
-    "coroutine.create","coroutine.resume","coroutine.running","coroutine.status","coroutine.wrap","coroutine.yield",
-
-    "debug.debug","debug.getfenv","debug.gethook","debug.getinfo","debug.getlocal","debug.getmetatable",
-    "debug.getregistry","debug.getupvalue","debug.setfenv","debug.sethook","debug.setlocal","debug.setmetatable",
-    "debug.setupvalue","debug.traceback",
-
-    "close","flush","lines","read","seek","setvbuf","write",
-
-    "io.close","io.flush","io.input","io.lines","io.open","io.output","io.popen","io.read","io.stderr","io.stdin",
-    "io.stdout","io.tmpfile","io.type","io.write",
-
-    "math.abs","math.acos","math.asin","math.atan","math.atan2","math.ceil","math.cos","math.cosh","math.deg",
-    "math.exp","math.floor","math.fmod","math.frexp","math.huge","math.ldexp","math.log","math.log10","math.max",
-    "math.min","math.modf","math.pi","math.pow","math.rad","math.random","math.randomseed","math.sin","math.sinh",
-    "math.sqrt","math.tan","math.tanh",
-
-    "os.clock","os.date","os.difftime","os.execute","os.exit","os.getenv","os.remove","os.rename","os.setlocale",
-    "os.time","os.tmpname",
-
-    "package.cpath","package.loaded","package.loaders","package.loadlib","package.path","package.preload",
-    "package.seeall",
-
-    "string.byte","string.char","string.dump","string.find","string.format","string.gmatch","string.gsub",
-    "string.len","string.lower","string.match","string.rep","string.reverse","string.sub","string.upper",
-
-    "table.concat","table.insert","table.maxn","table.remove","table.sort"
-  ]);
-  var keywords = wordRE(["and","break","elseif","false","nil","not","or","return",
-                         "true","function", "end", "if", "then", "else", "do",
-                         "while", "repeat", "until", "for", "in", "local" ]);
-
-  var indentTokens = wordRE(["function", "if","repeat","do", "\\(", "{"]);
-  var dedentTokens = wordRE(["end", "until", "\\)", "}"]);
-  var dedentPartial = prefixRE(["end", "until", "\\)", "}", "else", "elseif"]);
-
-  function readBracket(stream) {
-    var level = 0;
-    while (stream.eat("=")) ++level;
-    stream.eat("[");
-    return level;
-  }
-
-  function normal(stream, state) {
-    var ch = stream.next();
-    if (ch == "-" && stream.eat("-")) {
-      if (stream.eat("[") && stream.eat("["))
-        return (state.cur = bracketed(readBracket(stream), "comment"))(stream, state);
-      stream.skipToEnd();
-      return "comment";
-    }
-    if (ch == "\"" || ch == "'")
-      return (state.cur = string(ch))(stream, state);
-    if (ch == "[" && /[\[=]/.test(stream.peek()))
-      return (state.cur = bracketed(readBracket(stream), "string"))(stream, state);
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w.%]/);
-      return "number";
-    }
-    if (/[\w_]/.test(ch)) {
-      stream.eatWhile(/[\w\\\-_.]/);
-      return "variable";
-    }
-    return null;
-  }
-
-  function bracketed(level, style) {
-    return function(stream, state) {
-      var curlev = null, ch;
-      while ((ch = stream.next()) != null) {
-        if (curlev == null) {if (ch == "]") curlev = 0;}
-        else if (ch == "=") ++curlev;
-        else if (ch == "]" && curlev == level) { state.cur = normal; break; }
-        else curlev = null;
-      }
-      return style;
-    };
-  }
-
-  function string(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) break;
-        escaped = !escaped && ch == "\\";
-      }
-      if (!escaped) state.cur = normal;
-      return "string";
-    };
-  }
-
-  return {
-    startState: function(basecol) {
-      return {basecol: basecol || 0, indentDepth: 0, cur: normal};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = state.cur(stream, state);
-      var word = stream.current();
-      if (style == "variable") {
-        if (keywords.test(word)) style = "keyword";
-        else if (builtins.test(word)) style = "builtin";
-        else if (specials.test(word)) style = "variable-2";
-      }
-      if ((style != "comment") && (style != "string")){
-        if (indentTokens.test(word)) ++state.indentDepth;
-        else if (dedentTokens.test(word)) --state.indentDepth;
-      }
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var closing = dedentPartial.test(textAfter);
-      return state.basecol + indentUnit * (state.indentDepth - (closing ? 1 : 0));
-    },
-
-    lineComment: "--",
-    blockCommentStart: "--[[",
-    blockCommentEnd: "]]"
-  };
-});
-
-CodeMirror.defineMIME("text/x-lua", "lua");
diff --git a/resources/libs/codemirror/mode/markdown/index.html b/resources/libs/codemirror/mode/markdown/index.html
deleted file mode 100644
index a6b541e2e..000000000
--- a/resources/libs/codemirror/mode/markdown/index.html
+++ /dev/null
@@ -1,359 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Markdown mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/continuelist.js"></script>
-<script src="../xml/xml.js"></script>
-<script src="markdown.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .cm-s-default .cm-trailing-space-a:before,
-      .cm-s-default .cm-trailing-space-b:before {position: absolute; content: "\00B7"; color: #777;}
-      .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Markdown</a>
-  </ul>
-</div>
-
-<article>
-<h2>Markdown mode</h2>
-<form><textarea id="code" name="code">
-Markdown: Basics
-================
-
-&lt;ul id="ProjectSubmenu"&gt;
-    &lt;li&gt;&lt;a href="/projects/markdown/" title="Markdown Project Page"&gt;Main&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a class="selected" title="Markdown Basics"&gt;Basics&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="/projects/markdown/syntax" title="Markdown Syntax Documentation"&gt;Syntax&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="/projects/markdown/license" title="Pricing and License Information"&gt;License&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="/projects/markdown/dingus" title="Online Markdown Web Form"&gt;Dingus&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;
-
-
-Getting the Gist of Markdown's Formatting Syntax
-------------------------------------------------
-
-This page offers a brief overview of what it's like to use Markdown.
-The [syntax page] [s] provides complete, detailed documentation for
-every feature, but Markdown should be very easy to pick up simply by
-looking at a few examples of it in action. The examples on this page
-are written in a before/after style, showing example syntax and the
-HTML output produced by Markdown.
-
-It's also helpful to simply try Markdown out; the [Dingus] [d] is a
-web application that allows you type your own Markdown-formatted text
-and translate it to XHTML.
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL] [src].
-
-  [s]: /projects/markdown/syntax  "Markdown Syntax"
-  [d]: /projects/markdown/dingus  "Markdown Dingus"
-  [src]: /projects/markdown/basics.text
-
-
-## Paragraphs, Headers, Blockquotes ##
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like
-a blank line -- a line containing nothing but spaces or tabs is
-considered blank.) Normal paragraphs should not be indented with
-spaces or tabs.
-
-Markdown offers two styles of headers: *Setext* and *atx*.
-Setext-style headers for `&lt;h1&gt;` and `&lt;h2&gt;` are created by
-"underlining" with equal signs (`=`) and hyphens (`-`), respectively.
-To create an atx-style header, you put 1-6 hash marks (`#`) at the
-beginning of the line -- the number of hashes equals the resulting
-HTML header level.
-
-Blockquotes are indicated using email-style '`&gt;`' angle brackets.
-
-Markdown:
-
-    A First Level Header
-    ====================
-    
-    A Second Level Header
-    ---------------------
-
-    Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.
-
-    The quick brown fox jumped over the lazy
-    dog's back.
-    
-    ### Header 3
-
-    &gt; This is a blockquote.
-    &gt; 
-    &gt; This is the second paragraph in the blockquote.
-    &gt;
-    &gt; ## This is an H2 in a blockquote
-
-
-Output:
-
-    &lt;h1&gt;A First Level Header&lt;/h1&gt;
-    
-    &lt;h2&gt;A Second Level Header&lt;/h2&gt;
-    
-    &lt;p&gt;Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.&lt;/p&gt;
-    
-    &lt;p&gt;The quick brown fox jumped over the lazy
-    dog's back.&lt;/p&gt;
-    
-    &lt;h3&gt;Header 3&lt;/h3&gt;
-    
-    &lt;blockquote&gt;
-        &lt;p&gt;This is a blockquote.&lt;/p&gt;
-        
-        &lt;p&gt;This is the second paragraph in the blockquote.&lt;/p&gt;
-        
-        &lt;h2&gt;This is an H2 in a blockquote&lt;/h2&gt;
-    &lt;/blockquote&gt;
-
-
-
-### Phrase Emphasis ###
-
-Markdown uses asterisks and underscores to indicate spans of emphasis.
-
-Markdown:
-
-    Some of these words *are emphasized*.
-    Some of these words _are emphasized also_.
-    
-    Use two asterisks for **strong emphasis**.
-    Or, if you prefer, __use two underscores instead__.
-
-Output:
-
-    &lt;p&gt;Some of these words &lt;em&gt;are emphasized&lt;/em&gt;.
-    Some of these words &lt;em&gt;are emphasized also&lt;/em&gt;.&lt;/p&gt;
-    
-    &lt;p&gt;Use two asterisks for &lt;strong&gt;strong emphasis&lt;/strong&gt;.
-    Or, if you prefer, &lt;strong&gt;use two underscores instead&lt;/strong&gt;.&lt;/p&gt;
-   
-
-
-## Lists ##
-
-Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
-`+`, and `-`) as list markers. These three markers are
-interchangable; this:
-
-    *   Candy.
-    *   Gum.
-    *   Booze.
-
-this:
-
-    +   Candy.
-    +   Gum.
-    +   Booze.
-
-and this:
-
-    -   Candy.
-    -   Gum.
-    -   Booze.
-
-all produce the same output:
-
-    &lt;ul&gt;
-    &lt;li&gt;Candy.&lt;/li&gt;
-    &lt;li&gt;Gum.&lt;/li&gt;
-    &lt;li&gt;Booze.&lt;/li&gt;
-    &lt;/ul&gt;
-
-Ordered (numbered) lists use regular numbers, followed by periods, as
-list markers:
-
-    1.  Red
-    2.  Green
-    3.  Blue
-
-Output:
-
-    &lt;ol&gt;
-    &lt;li&gt;Red&lt;/li&gt;
-    &lt;li&gt;Green&lt;/li&gt;
-    &lt;li&gt;Blue&lt;/li&gt;
-    &lt;/ol&gt;
-
-If you put blank lines between items, you'll get `&lt;p&gt;` tags for the
-list item text. You can create multi-paragraph list items by indenting
-the paragraphs by 4 spaces or 1 tab:
-
-    *   A list item.
-    
-        With multiple paragraphs.
-
-    *   Another item in the list.
-
-Output:
-
-    &lt;ul&gt;
-    &lt;li&gt;&lt;p&gt;A list item.&lt;/p&gt;
-    &lt;p&gt;With multiple paragraphs.&lt;/p&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;p&gt;Another item in the list.&lt;/p&gt;&lt;/li&gt;
-    &lt;/ul&gt;
-    
-
-
-### Links ###
-
-Markdown supports two styles for creating links: *inline* and
-*reference*. With both styles, you use square brackets to delimit the
-text you want to turn into a link.
-
-Inline-style links use parentheses immediately after the link text.
-For example:
-
-    This is an [example link](http://example.com/).
-
-Output:
-
-    &lt;p&gt;This is an &lt;a href="http://example.com/"&gt;
-    example link&lt;/a&gt;.&lt;/p&gt;
-
-Optionally, you may include a title attribute in the parentheses:
-
-    This is an [example link](http://example.com/ "With a Title").
-
-Output:
-
-    &lt;p&gt;This is an &lt;a href="http://example.com/" title="With a Title"&gt;
-    example link&lt;/a&gt;.&lt;/p&gt;
-
-Reference-style links allow you to refer to your links by names, which
-you define elsewhere in your document:
-
-    I get 10 times more traffic from [Google][1] than from
-    [Yahoo][2] or [MSN][3].
-
-    [1]: http://google.com/        "Google"
-    [2]: http://search.yahoo.com/  "Yahoo Search"
-    [3]: http://search.msn.com/    "MSN Search"
-
-Output:
-
-    &lt;p&gt;I get 10 times more traffic from &lt;a href="http://google.com/"
-    title="Google"&gt;Google&lt;/a&gt; than from &lt;a href="http://search.yahoo.com/"
-    title="Yahoo Search"&gt;Yahoo&lt;/a&gt; or &lt;a href="http://search.msn.com/"
-    title="MSN Search"&gt;MSN&lt;/a&gt;.&lt;/p&gt;
-
-The title attribute is optional. Link names may contain letters,
-numbers and spaces, but are *not* case sensitive:
-
-    I start my morning with a cup of coffee and
-    [The New York Times][NY Times].
-
-    [ny times]: http://www.nytimes.com/
-
-Output:
-
-    &lt;p&gt;I start my morning with a cup of coffee and
-    &lt;a href="http://www.nytimes.com/"&gt;The New York Times&lt;/a&gt;.&lt;/p&gt;
-
-
-### Images ###
-
-Image syntax is very much like link syntax.
-
-Inline (titles are optional):
-
-    ![alt text](/path/to/img.jpg "Title")
-
-Reference-style:
-
-    ![alt text][id]
-
-    [id]: /path/to/img.jpg "Title"
-
-Both of the above examples produce the same output:
-
-    &lt;img src="/path/to/img.jpg" alt="alt text" title="Title" /&gt;
-
-
-
-### Code ###
-
-In a regular paragraph, you can create code span by wrapping text in
-backtick quotes. Any ampersands (`&amp;`) and angle brackets (`&lt;` or
-`&gt;`) will automatically be translated into HTML entities. This makes
-it easy to use Markdown to write about HTML example code:
-
-    I strongly recommend against using any `&lt;blink&gt;` tags.
-
-    I wish SmartyPants used named entities like `&amp;mdash;`
-    instead of decimal-encoded entites like `&amp;#8212;`.
-
-Output:
-
-    &lt;p&gt;I strongly recommend against using any
-    &lt;code&gt;&amp;lt;blink&amp;gt;&lt;/code&gt; tags.&lt;/p&gt;
-    
-    &lt;p&gt;I wish SmartyPants used named entities like
-    &lt;code&gt;&amp;amp;mdash;&lt;/code&gt; instead of decimal-encoded
-    entites like &lt;code&gt;&amp;amp;#8212;&lt;/code&gt;.&lt;/p&gt;
-
-
-To specify an entire block of pre-formatted code, indent every line of
-the block by 4 spaces or 1 tab. Just like with code spans, `&amp;`, `&lt;`,
-and `&gt;` characters will be escaped automatically.
-
-Markdown:
-
-    If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:
-
-        &lt;blockquote&gt;
-            &lt;p&gt;For example.&lt;/p&gt;
-        &lt;/blockquote&gt;
-
-Output:
-
-    &lt;p&gt;If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:&lt;/p&gt;
-    
-    &lt;pre&gt;&lt;code&gt;&amp;lt;blockquote&amp;gt;
-        &amp;lt;p&amp;gt;For example.&amp;lt;/p&amp;gt;
-    &amp;lt;/blockquote&amp;gt;
-    &lt;/code&gt;&lt;/pre&gt;
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: 'markdown',
-        lineNumbers: true,
-        theme: "default",
-        extraKeys: {"Enter": "newlineAndIndentContinueMarkdownList"}
-      });
-    </script>
-
-    <p>Optionally depends on the XML mode for properly highlighted inline XML blocks.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-markdown</code>.</p>
-
-    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#markdown_*">normal</a>,  <a href="../../test/index.html#verbose,markdown_*">verbose</a>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/markdown/markdown.js b/resources/libs/codemirror/mode/markdown/markdown.js
deleted file mode 100644
index 218408fb5..000000000
--- a/resources/libs/codemirror/mode/markdown/markdown.js
+++ /dev/null
@@ -1,560 +0,0 @@
-CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
-
-  var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
-  var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? {name: "xml", htmlMode: true} : "text/plain");
-  var aliases = {
-    html: "htmlmixed",
-    js: "javascript",
-    json: "application/json",
-    c: "text/x-csrc",
-    "c++": "text/x-c++src",
-    java: "text/x-java",
-    csharp: "text/x-csharp",
-    "c#": "text/x-csharp",
-    scala: "text/x-scala"
-  };
-
-  var getMode = (function () {
-    var i, modes = {}, mimes = {}, mime;
-
-    var list = [];
-    for (var m in CodeMirror.modes)
-      if (CodeMirror.modes.propertyIsEnumerable(m)) list.push(m);
-    for (i = 0; i < list.length; i++) {
-      modes[list[i]] = list[i];
-    }
-    var mimesList = [];
-    for (var m in CodeMirror.mimeModes)
-      if (CodeMirror.mimeModes.propertyIsEnumerable(m))
-        mimesList.push({mime: m, mode: CodeMirror.mimeModes[m]});
-    for (i = 0; i < mimesList.length; i++) {
-      mime = mimesList[i].mime;
-      mimes[mime] = mimesList[i].mime;
-    }
-
-    for (var a in aliases) {
-      if (aliases[a] in modes || aliases[a] in mimes)
-        modes[a] = aliases[a];
-    }
-
-    return function (lang) {
-      return modes[lang] ? CodeMirror.getMode(cmCfg, modes[lang]) : null;
-    };
-  }());
-
-  // Should underscores in words open/close em/strong?
-  if (modeCfg.underscoresBreakWords === undefined)
-    modeCfg.underscoresBreakWords = true;
-
-  // Turn on fenced code blocks? ("```" to start/end)
-  if (modeCfg.fencedCodeBlocks === undefined) modeCfg.fencedCodeBlocks = false;
-
-  // Turn on task lists? ("- [ ] " and "- [x] ")
-  if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
-
-  var codeDepth = 0;
-
-  var header   = 'header'
-  ,   code     = 'comment'
-  ,   quote1   = 'atom'
-  ,   quote2   = 'number'
-  ,   list1    = 'variable-2'
-  ,   list2    = 'variable-3'
-  ,   list3    = 'keyword'
-  ,   hr       = 'hr'
-  ,   image    = 'tag'
-  ,   linkinline = 'link'
-  ,   linkemail = 'link'
-  ,   linktext = 'link'
-  ,   linkhref = 'string'
-  ,   em       = 'em'
-  ,   strong   = 'strong';
-
-  var hrRE = /^([*\-=_])(?:\s*\1){2,}\s*$/
-  ,   ulRE = /^[*\-+]\s+/
-  ,   olRE = /^[0-9]+\.\s+/
-  ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
-  ,   atxHeaderRE = /^#+/
-  ,   setextHeaderRE = /^(?:\={1,}|-{1,})$/
-  ,   textRE = /^[^!\[\]*_\\<>` "'(]+/;
-
-  function switchInline(stream, state, f) {
-    state.f = state.inline = f;
-    return f(stream, state);
-  }
-
-  function switchBlock(stream, state, f) {
-    state.f = state.block = f;
-    return f(stream, state);
-  }
-
-
-  // Blocks
-
-  function blankLine(state) {
-    // Reset linkTitle state
-    state.linkTitle = false;
-    // Reset EM state
-    state.em = false;
-    // Reset STRONG state
-    state.strong = false;
-    // Reset state.quote
-    state.quote = 0;
-    if (!htmlFound && state.f == htmlBlock) {
-      state.f = inlineNormal;
-      state.block = blockNormal;
-    }
-    // Reset state.trailingSpace
-    state.trailingSpace = 0;
-    state.trailingSpaceNewLine = false;
-    // Mark this line as blank
-    state.thisLineHasContent = false;
-    return null;
-  }
-
-  function blockNormal(stream, state) {
-
-    var prevLineIsList = (state.list !== false);
-    if (state.list !== false && state.indentationDiff >= 0) { // Continued list
-      if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block
-        state.indentation -= state.indentationDiff;
-      }
-      state.list = null;
-    } else if (state.list !== false && state.indentation > 0) {
-      state.list = null;
-      state.listDepth = Math.floor(state.indentation / 4);
-    } else if (state.list !== false) { // No longer a list
-      state.list = false;
-      state.listDepth = 0;
-    }
-
-    var match = null;
-    if (state.indentationDiff >= 4) {
-      state.indentation -= 4;
-      stream.skipToEnd();
-      return code;
-    } else if (stream.eatSpace()) {
-      return null;
-    } else if (match = stream.match(atxHeaderRE)) {
-      state.header = match[0].length <= 6 ? match[0].length : 6;
-    } else if (state.prevLineHasContent && (match = stream.match(setextHeaderRE))) {
-      state.header = match[0].charAt(0) == '=' ? 1 : 2;
-    } else if (stream.eat('>')) {
-      state.indentation++;
-      state.quote = 1;
-      stream.eatSpace();
-      while (stream.eat('>')) {
-        stream.eatSpace();
-        state.quote++;
-      }
-    } else if (stream.peek() === '[') {
-      return switchInline(stream, state, footnoteLink);
-    } else if (stream.match(hrRE, true)) {
-      return hr;
-    } else if ((!state.prevLineHasContent || prevLineIsList) && (stream.match(ulRE, true) || stream.match(olRE, true))) {
-      state.indentation += 4;
-      state.list = true;
-      state.listDepth++;
-      if (modeCfg.taskLists && stream.match(taskListRE, false)) {
-        state.taskList = true;
-      }
-    } else if (modeCfg.fencedCodeBlocks && stream.match(/^```([\w+#]*)/, true)) {
-      // try switching mode
-      state.localMode = getMode(RegExp.$1);
-      if (state.localMode) state.localState = state.localMode.startState();
-      switchBlock(stream, state, local);
-      return code;
-    }
-
-    return switchInline(stream, state, state.inline);
-  }
-
-  function htmlBlock(stream, state) {
-    var style = htmlMode.token(stream, state.htmlState);
-    if (htmlFound && style === 'tag' && state.htmlState.type !== 'openTag' && !state.htmlState.context) {
-      state.f = inlineNormal;
-      state.block = blockNormal;
-    }
-    if (state.md_inside && stream.current().indexOf(">")!=-1) {
-      state.f = inlineNormal;
-      state.block = blockNormal;
-      state.htmlState.context = undefined;
-    }
-    return style;
-  }
-
-  function local(stream, state) {
-    if (stream.sol() && stream.match(/^```/, true)) {
-      state.localMode = state.localState = null;
-      state.f = inlineNormal;
-      state.block = blockNormal;
-      return code;
-    } else if (state.localMode) {
-      return state.localMode.token(stream, state.localState);
-    } else {
-      stream.skipToEnd();
-      return code;
-    }
-  }
-
-  // Inline
-  function getType(state) {
-    var styles = [];
-
-    if (state.taskOpen) { return "meta"; }
-    if (state.taskClosed) { return "property"; }
-
-    if (state.strong) { styles.push(strong); }
-    if (state.em) { styles.push(em); }
-
-    if (state.linkText) { styles.push(linktext); }
-
-    if (state.code) { styles.push(code); }
-
-    if (state.header) { styles.push(header); styles.push(header + state.header); }
-    if (state.quote) { styles.push(state.quote % 2 ? quote1 : quote2); }
-    if (state.list !== false) {
-      var listMod = (state.listDepth - 1) % 3;
-      if (!listMod) {
-        styles.push(list1);
-      } else if (listMod === 1) {
-        styles.push(list2);
-      } else {
-        styles.push(list3);
-      }
-    }
-
-    if (state.trailingSpaceNewLine) {
-      styles.push("trailing-space-new-line");
-    } else if (state.trailingSpace) {
-      styles.push("trailing-space-" + (state.trailingSpace % 2 ? "a" : "b"));
-    }
-
-    return styles.length ? styles.join(' ') : null;
-  }
-
-  function handleText(stream, state) {
-    if (stream.match(textRE, true)) {
-      return getType(state);
-    }
-    return undefined;
-  }
-
-  function inlineNormal(stream, state) {
-    var style = state.text(stream, state);
-    if (typeof style !== 'undefined')
-      return style;
-
-    if (state.list) { // List marker (*, +, -, 1., etc)
-      state.list = null;
-      return getType(state);
-    }
-
-    if (state.taskList) {
-      var taskOpen = stream.match(taskListRE, true)[1] !== "x";
-      if (taskOpen) state.taskOpen = true;
-      else state.taskClosed = true;
-      state.taskList = false;
-      return getType(state);
-    }
-
-    state.taskOpen = false;
-    state.taskClosed = false;
-
-    // Get sol() value now, before character is consumed
-    var sol = stream.sol();
-
-    var ch = stream.next();
-
-    if (ch === '\\') {
-      stream.next();
-      return getType(state);
-    }
-
-    // Matches link titles present on next line
-    if (state.linkTitle) {
-      state.linkTitle = false;
-      var matchCh = ch;
-      if (ch === '(') {
-        matchCh = ')';
-      }
-      matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
-      var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh;
-      if (stream.match(new RegExp(regex), true)) {
-        return linkhref;
-      }
-    }
-
-    // If this block is changed, it may need to be updated in GFM mode
-    if (ch === '`') {
-      var t = getType(state);
-      var before = stream.pos;
-      stream.eatWhile('`');
-      var difference = 1 + stream.pos - before;
-      if (!state.code) {
-        codeDepth = difference;
-        state.code = true;
-        return getType(state);
-      } else {
-        if (difference === codeDepth) { // Must be exact
-          state.code = false;
-          return t;
-        }
-        return getType(state);
-      }
-    } else if (state.code) {
-      return getType(state);
-    }
-
-    if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
-      stream.match(/\[[^\]]*\]/);
-      state.inline = state.f = linkHref;
-      return image;
-    }
-
-    if (ch === '[' && stream.match(/.*\](\(| ?\[)/, false)) {
-      state.linkText = true;
-      return getType(state);
-    }
-
-    if (ch === ']' && state.linkText) {
-      var type = getType(state);
-      state.linkText = false;
-      state.inline = state.f = linkHref;
-      return type;
-    }
-
-    if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, false)) {
-      return switchInline(stream, state, inlineElement(linkinline, '>'));
-    }
-
-    if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) {
-      return switchInline(stream, state, inlineElement(linkemail, '>'));
-    }
-
-    if (ch === '<' && stream.match(/^\w/, false)) {
-      if (stream.string.indexOf(">")!=-1) {
-        var atts = stream.string.substring(1,stream.string.indexOf(">"));
-        if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) {
-          state.md_inside = true;
-        }
-      }
-      stream.backUp(1);
-      return switchBlock(stream, state, htmlBlock);
-    }
-
-    if (ch === '<' && stream.match(/^\/\w*?>/)) {
-      state.md_inside = false;
-      return "tag";
-    }
-
-    var ignoreUnderscore = false;
-    if (!modeCfg.underscoresBreakWords) {
-      if (ch === '_' && stream.peek() !== '_' && stream.match(/(\w)/, false)) {
-        var prevPos = stream.pos - 2;
-        if (prevPos >= 0) {
-          var prevCh = stream.string.charAt(prevPos);
-          if (prevCh !== '_' && prevCh.match(/(\w)/, false)) {
-            ignoreUnderscore = true;
-          }
-        }
-      }
-    }
-    var t = getType(state);
-    if (ch === '*' || (ch === '_' && !ignoreUnderscore)) {
-      if (sol && stream.peek() === ' ') {
-        // Do nothing, surrounded by newline and space
-      } else if (state.strong === ch && stream.eat(ch)) { // Remove STRONG
-        state.strong = false;
-        return t;
-      } else if (!state.strong && stream.eat(ch)) { // Add STRONG
-        state.strong = ch;
-        return getType(state);
-      } else if (state.em === ch) { // Remove EM
-        state.em = false;
-        return t;
-      } else if (!state.em) { // Add EM
-        state.em = ch;
-        return getType(state);
-      }
-    } else if (ch === ' ') {
-      if (stream.eat('*') || stream.eat('_')) { // Probably surrounded by spaces
-        if (stream.peek() === ' ') { // Surrounded by spaces, ignore
-          return getType(state);
-        } else { // Not surrounded by spaces, back up pointer
-          stream.backUp(1);
-        }
-      }
-    }
-
-    if (ch === ' ') {
-      if (stream.match(/ +$/, false)) {
-        state.trailingSpace++;
-      } else if (state.trailingSpace) {
-        state.trailingSpaceNewLine = true;
-      }
-    }
-
-    return getType(state);
-  }
-
-  function linkHref(stream, state) {
-    // Check if space, and return NULL if so (to avoid marking the space)
-    if(stream.eatSpace()){
-      return null;
-    }
-    var ch = stream.next();
-    if (ch === '(' || ch === '[') {
-      return switchInline(stream, state, inlineElement(linkhref, ch === '(' ? ')' : ']'));
-    }
-    return 'error';
-  }
-
-  function footnoteLink(stream, state) {
-    if (stream.match(/^[^\]]*\]:/, true)) {
-      state.f = footnoteUrl;
-      return linktext;
-    }
-    return switchInline(stream, state, inlineNormal);
-  }
-
-  function footnoteUrl(stream, state) {
-    // Check if space, and return NULL if so (to avoid marking the space)
-    if(stream.eatSpace()){
-      return null;
-    }
-    // Match URL
-    stream.match(/^[^\s]+/, true);
-    // Check for link title
-    if (stream.peek() === undefined) { // End of line, set flag to check next line
-      state.linkTitle = true;
-    } else { // More content on line, check if link title
-      stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
-    }
-    state.f = state.inline = inlineNormal;
-    return linkhref;
-  }
-
-  var savedInlineRE = [];
-  function inlineRE(endChar) {
-    if (!savedInlineRE[endChar]) {
-      // Escape endChar for RegExp (taken from http://stackoverflow.com/a/494122/526741)
-      endChar = (endChar+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
-      // Match any non-endChar, escaped character, as well as the closing
-      // endChar.
-      savedInlineRE[endChar] = new RegExp('^(?:[^\\\\]|\\\\.)*?(' + endChar + ')');
-    }
-    return savedInlineRE[endChar];
-  }
-
-  function inlineElement(type, endChar, next) {
-    next = next || inlineNormal;
-    return function(stream, state) {
-      stream.match(inlineRE(endChar));
-      state.inline = state.f = next;
-      return type;
-    };
-  }
-
-  return {
-    startState: function() {
-      return {
-        f: blockNormal,
-
-        prevLineHasContent: false,
-        thisLineHasContent: false,
-
-        block: blockNormal,
-        htmlState: CodeMirror.startState(htmlMode),
-        indentation: 0,
-
-        inline: inlineNormal,
-        text: handleText,
-
-        linkText: false,
-        linkTitle: false,
-        em: false,
-        strong: false,
-        header: 0,
-        taskList: false,
-        list: false,
-        listDepth: 0,
-        quote: 0,
-        trailingSpace: 0,
-        trailingSpaceNewLine: false
-      };
-    },
-
-    copyState: function(s) {
-      return {
-        f: s.f,
-
-        prevLineHasContent: s.prevLineHasContent,
-        thisLineHasContent: s.thisLineHasContent,
-
-        block: s.block,
-        htmlState: CodeMirror.copyState(htmlMode, s.htmlState),
-        indentation: s.indentation,
-
-        localMode: s.localMode,
-        localState: s.localMode ? CodeMirror.copyState(s.localMode, s.localState) : null,
-
-        inline: s.inline,
-        text: s.text,
-        linkTitle: s.linkTitle,
-        em: s.em,
-        strong: s.strong,
-        header: s.header,
-        taskList: s.taskList,
-        list: s.list,
-        listDepth: s.listDepth,
-        quote: s.quote,
-        trailingSpace: s.trailingSpace,
-        trailingSpaceNewLine: s.trailingSpaceNewLine,
-        md_inside: s.md_inside
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (stream.match(/^\s*$/, true)) {
-          state.prevLineHasContent = false;
-          return blankLine(state);
-        } else {
-          state.prevLineHasContent = state.thisLineHasContent;
-          state.thisLineHasContent = true;
-        }
-
-        // Reset state.header
-        state.header = 0;
-
-        // Reset state.taskList
-        state.taskList = false;
-
-        // Reset state.code
-        state.code = false;
-
-        // Reset state.trailingSpace
-        state.trailingSpace = 0;
-        state.trailingSpaceNewLine = false;
-
-        state.f = state.block;
-        var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
-        var difference = Math.floor((indentation - state.indentation) / 4) * 4;
-        if (difference > 4) difference = 4;
-        var adjustedIndentation = state.indentation + difference;
-        state.indentationDiff = adjustedIndentation - state.indentation;
-        state.indentation = adjustedIndentation;
-        if (indentation > 0) return null;
-      }
-      return state.f(stream, state);
-    },
-
-    blankLine: blankLine,
-
-    getType: getType
-  };
-
-}, "xml");
-
-CodeMirror.defineMIME("text/x-markdown", "markdown");
diff --git a/resources/libs/codemirror/mode/markdown/test.js b/resources/libs/codemirror/mode/markdown/test.js
deleted file mode 100644
index 6bf400655..000000000
--- a/resources/libs/codemirror/mode/markdown/test.js
+++ /dev/null
@@ -1,664 +0,0 @@
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "markdown");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("plainText",
-     "foo");
-
-  // Don't style single trailing space
-  MT("trailingSpace1",
-     "foo ");
-
-  // Two or more trailing spaces should be styled with line break character
-  MT("trailingSpace2",
-     "foo[trailing-space-a  ][trailing-space-new-line  ]");
-
-  MT("trailingSpace3",
-     "foo[trailing-space-a  ][trailing-space-b  ][trailing-space-new-line  ]");
-
-  MT("trailingSpace4",
-     "foo[trailing-space-a  ][trailing-space-b  ][trailing-space-a  ][trailing-space-new-line  ]");
-
-  // Code blocks using 4 spaces (regardless of CodeMirror.tabSize value)
-  MT("codeBlocksUsing4Spaces",
-     "    [comment foo]");
-
-  // Code blocks using 4 spaces with internal indentation
-  MT("codeBlocksUsing4SpacesIndentation",
-     "    [comment bar]",
-     "        [comment hello]",
-     "            [comment world]",
-     "    [comment foo]",
-     "bar");
-
-  // Code blocks using 4 spaces with internal indentation
-  MT("codeBlocksUsing4SpacesIndentation",
-     " foo",
-     "    [comment bar]",
-     "        [comment hello]",
-     "    [comment world]");
-
-  // Code blocks using 1 tab (regardless of CodeMirror.indentWithTabs value)
-  MT("codeBlocksUsing1Tab",
-     "\t[comment foo]");
-
-  // Inline code using backticks
-  MT("inlineCodeUsingBackticks",
-     "foo [comment `bar`]");
-
-  // Block code using single backtick (shouldn't work)
-  MT("blockCodeSingleBacktick",
-     "[comment `]",
-     "foo",
-     "[comment `]");
-
-  // Unclosed backticks
-  // Instead of simply marking as CODE, it would be nice to have an
-  // incomplete flag for CODE, that is styled slightly different.
-  MT("unclosedBackticks",
-     "foo [comment `bar]");
-
-  // Per documentation: "To include a literal backtick character within a
-  // code span, you can use multiple backticks as the opening and closing
-  // delimiters"
-  MT("doubleBackticks",
-     "[comment ``foo ` bar``]");
-
-  // Tests based on Dingus
-  // http://daringfireball.net/projects/markdown/dingus
-  //
-  // Multiple backticks within an inline code block
-  MT("consecutiveBackticks",
-     "[comment `foo```bar`]");
-
-  // Multiple backticks within an inline code block with a second code block
-  MT("consecutiveBackticks",
-     "[comment `foo```bar`] hello [comment `world`]");
-
-  // Unclosed with several different groups of backticks
-  MT("unclosedBackticks",
-     "[comment ``foo ``` bar` hello]");
-
-  // Closed with several different groups of backticks
-  MT("closedBackticks",
-     "[comment ``foo ``` bar` hello``] world");
-
-  // atx headers
-  // http://daringfireball.net/projects/markdown/syntax#header
-
-  MT("atxH1",
-     "[header&header1 # foo]");
-
-  MT("atxH2",
-     "[header&header2 ## foo]");
-
-  MT("atxH3",
-     "[header&header3 ### foo]");
-
-  MT("atxH4",
-     "[header&header4 #### foo]");
-
-  MT("atxH5",
-     "[header&header5 ##### foo]");
-
-  MT("atxH6",
-     "[header&header6 ###### foo]");
-
-  // H6 - 7x '#' should still be H6, per Dingus
-  // http://daringfireball.net/projects/markdown/dingus
-  MT("atxH6NotH7",
-     "[header&header6 ####### foo]");
-
-  // Inline styles should be parsed inside headers
-  MT("atxH1inline",
-     "[header&header1 # foo ][header&header1&em *bar*]");
-
-  // Setext headers - H1, H2
-  // Per documentation, "Any number of underlining =’s or -’s will work."
-  // http://daringfireball.net/projects/markdown/syntax#header
-  // Ideally, the text would be marked as `header` as well, but this is
-  // not really feasible at the moment. So, instead, we're testing against
-  // what works today, to avoid any regressions.
-  //
-  // Check if single underlining = works
-  MT("setextH1",
-     "foo",
-     "[header&header1 =]");
-
-  // Check if 3+ ='s work
-  MT("setextH1",
-     "foo",
-     "[header&header1 ===]");
-
-  // Check if single underlining - works
-  MT("setextH2",
-     "foo",
-     "[header&header2 -]");
-
-  // Check if 3+ -'s work
-  MT("setextH2",
-     "foo",
-     "[header&header2 ---]");
-
-  // Single-line blockquote with trailing space
-  MT("blockquoteSpace",
-     "[atom > foo]");
-
-  // Single-line blockquote
-  MT("blockquoteNoSpace",
-     "[atom >foo]");
-
-  // No blank line before blockquote
-  MT("blockquoteNoBlankLine",
-     "foo",
-     "[atom > bar]");
-
-  // Nested blockquote
-  MT("blockquoteSpace",
-     "[atom > foo]",
-     "[number > > foo]",
-     "[atom > > > foo]");
-
-  // Single-line blockquote followed by normal paragraph
-  MT("blockquoteThenParagraph",
-     "[atom >foo]",
-     "",
-     "bar");
-
-  // Multi-line blockquote (lazy mode)
-  MT("multiBlockquoteLazy",
-     "[atom >foo]",
-     "[atom bar]");
-
-  // Multi-line blockquote followed by normal paragraph (lazy mode)
-  MT("multiBlockquoteLazyThenParagraph",
-     "[atom >foo]",
-     "[atom bar]",
-     "",
-     "hello");
-
-  // Multi-line blockquote (non-lazy mode)
-  MT("multiBlockquote",
-     "[atom >foo]",
-     "[atom >bar]");
-
-  // Multi-line blockquote followed by normal paragraph (non-lazy mode)
-  MT("multiBlockquoteThenParagraph",
-     "[atom >foo]",
-     "[atom >bar]",
-     "",
-     "hello");
-
-  // Check list types
-
-  MT("listAsterisk",
-     "foo",
-     "bar",
-     "",
-     "[variable-2 * foo]",
-     "[variable-2 * bar]");
-
-  MT("listPlus",
-     "foo",
-     "bar",
-     "",
-     "[variable-2 + foo]",
-     "[variable-2 + bar]");
-
-  MT("listDash",
-     "foo",
-     "bar",
-     "",
-     "[variable-2 - foo]",
-     "[variable-2 - bar]");
-
-  MT("listNumber",
-     "foo",
-     "bar",
-     "",
-     "[variable-2 1. foo]",
-     "[variable-2 2. bar]");
-
-  // Lists require a preceding blank line (per Dingus)
-  MT("listBogus",
-     "foo",
-     "1. bar",
-     "2. hello");
-
-  // Formatting in lists (*)
-  MT("listAsteriskFormatting",
-     "[variable-2 * ][variable-2&em *foo*][variable-2  bar]",
-     "[variable-2 * ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 * ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
-     "[variable-2 * ][variable-2&comment `foo`][variable-2  bar]");
-
-  // Formatting in lists (+)
-  MT("listPlusFormatting",
-     "[variable-2 + ][variable-2&em *foo*][variable-2  bar]",
-     "[variable-2 + ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 + ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
-     "[variable-2 + ][variable-2&comment `foo`][variable-2  bar]");
-
-  // Formatting in lists (-)
-  MT("listDashFormatting",
-     "[variable-2 - ][variable-2&em *foo*][variable-2  bar]",
-     "[variable-2 - ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 - ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
-     "[variable-2 - ][variable-2&comment `foo`][variable-2  bar]");
-
-  // Formatting in lists (1.)
-  MT("listNumberFormatting",
-     "[variable-2 1. ][variable-2&em *foo*][variable-2  bar]",
-     "[variable-2 2. ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 3. ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
-     "[variable-2 4. ][variable-2&comment `foo`][variable-2  bar]");
-
-  // Paragraph lists
-  MT("listParagraph",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]");
-
-  // Multi-paragraph lists
-  //
-  // 4 spaces
-  MT("listMultiParagraph",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "    [variable-2 hello]");
-
-  // 4 spaces, extra blank lines (should still be list, per Dingus)
-  MT("listMultiParagraphExtra",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "",
-     "    [variable-2 hello]");
-
-  // 4 spaces, plus 1 space (should still be list, per Dingus)
-  MT("listMultiParagraphExtraSpace",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "     [variable-2 hello]",
-     "",
-     "    [variable-2 world]");
-
-  // 1 tab
-  MT("listTab",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "\t[variable-2 hello]");
-
-  // No indent
-  MT("listNoIndent",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "hello");
-
-  // Blockquote
-  MT("blockquote",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "    [variable-2&atom > hello]");
-
-  // Code block
-  MT("blockquoteCode",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "        [comment > hello]",
-     "",
-     "    [variable-2 world]");
-
-  // Code block followed by text
-  MT("blockquoteCodeText",
-     "[variable-2 * foo]",
-     "",
-     "    [variable-2 bar]",
-     "",
-     "        [comment hello]",
-     "",
-     "    [variable-2 world]");
-
-  // Nested list
-
-  MT("listAsteriskNested",
-     "[variable-2 * foo]",
-     "",
-     "    [variable-3 * bar]");
-
-  MT("listPlusNested",
-     "[variable-2 + foo]",
-     "",
-     "    [variable-3 + bar]");
-
-  MT("listDashNested",
-     "[variable-2 - foo]",
-     "",
-     "    [variable-3 - bar]");
-
-  MT("listNumberNested",
-     "[variable-2 1. foo]",
-     "",
-     "    [variable-3 2. bar]");
-
-  MT("listMixed",
-     "[variable-2 * foo]",
-     "",
-     "    [variable-3 + bar]",
-     "",
-     "        [keyword - hello]",
-     "",
-     "            [variable-2 1. world]");
-
-  MT("listBlockquote",
-     "[variable-2 * foo]",
-     "",
-     "    [variable-3 + bar]",
-     "",
-     "        [atom&variable-3 > hello]");
-
-  MT("listCode",
-     "[variable-2 * foo]",
-     "",
-     "    [variable-3 + bar]",
-     "",
-     "            [comment hello]");
-
-  // Code with internal indentation
-  MT("listCodeIndentation",
-     "[variable-2 * foo]",
-     "",
-     "        [comment bar]",
-     "            [comment hello]",
-     "                [comment world]",
-     "        [comment foo]",
-     "    [variable-2 bar]");
-
-  // List nesting edge cases
-  MT("listNested",
-    "[variable-2 * foo]",
-    "",
-    "    [variable-3 * bar]",
-    "",
-    "       [variable-2 hello]"
-  );
-  MT("listNested",
-    "[variable-2 * foo]",
-    "",
-    "    [variable-3 * bar]",
-    "",
-    "      [variable-3 * foo]"
-  );
-
-  // Code followed by text
-  MT("listCodeText",
-     "[variable-2 * foo]",
-     "",
-     "        [comment bar]",
-     "",
-     "hello");
-
-  // Following tests directly from official Markdown documentation
-  // http://daringfireball.net/projects/markdown/syntax#hr
-
-  MT("hrSpace",
-     "[hr * * *]");
-
-  MT("hr",
-     "[hr ***]");
-
-  MT("hrLong",
-     "[hr *****]");
-
-  MT("hrSpaceDash",
-     "[hr - - -]");
-
-  MT("hrDashLong",
-     "[hr ---------------------------------------]");
-
-  // Inline link with title
-  MT("linkTitle",
-     "[link [[foo]]][string (http://example.com/ \"bar\")] hello");
-
-  // Inline link without title
-  MT("linkNoTitle",
-     "[link [[foo]]][string (http://example.com/)] bar");
-
-  // Inline link with image
-  MT("linkImage",
-     "[link [[][tag ![[foo]]][string (http://example.com/)][link ]]][string (http://example.com/)] bar");
-
-  // Inline link with Em
-  MT("linkEm",
-     "[link [[][link&em *foo*][link ]]][string (http://example.com/)] bar");
-
-  // Inline link with Strong
-  MT("linkStrong",
-     "[link [[][link&strong **foo**][link ]]][string (http://example.com/)] bar");
-
-  // Inline link with EmStrong
-  MT("linkEmStrong",
-     "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string (http://example.com/)] bar");
-
-  // Image with title
-  MT("imageTitle",
-     "[tag ![[foo]]][string (http://example.com/ \"bar\")] hello");
-
-  // Image without title
-  MT("imageNoTitle",
-     "[tag ![[foo]]][string (http://example.com/)] bar");
-
-  // Image with asterisks
-  MT("imageAsterisks",
-     "[tag ![[*foo*]]][string (http://example.com/)] bar");
-
-  // Not a link. Should be normal text due to square brackets being used
-  // regularly in text, especially in quoted material, and no space is allowed
-  // between square brackets and parentheses (per Dingus).
-  MT("notALink",
-     "[[foo]] (bar)");
-
-  // Reference-style links
-  MT("linkReference",
-     "[link [[foo]]][string [[bar]]] hello");
-
-  // Reference-style links with Em
-  MT("linkReferenceEm",
-     "[link [[][link&em *foo*][link ]]][string [[bar]]] hello");
-
-  // Reference-style links with Strong
-  MT("linkReferenceStrong",
-     "[link [[][link&strong **foo**][link ]]][string [[bar]]] hello");
-
-  // Reference-style links with EmStrong
-  MT("linkReferenceEmStrong",
-     "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string [[bar]]] hello");
-
-  // Reference-style links with optional space separator (per docuentation)
-  // "You can optionally use a space to separate the sets of brackets"
-  MT("linkReferenceSpace",
-     "[link [[foo]]] [string [[bar]]] hello");
-
-  // Should only allow a single space ("...use *a* space...")
-  MT("linkReferenceDoubleSpace",
-     "[[foo]]  [[bar]] hello");
-
-  // Reference-style links with implicit link name
-  MT("linkImplicit",
-     "[link [[foo]]][string [[]]] hello");
-
-  // @todo It would be nice if, at some point, the document was actually
-  // checked to see if the referenced link exists
-
-  // Link label, for reference-style links (taken from documentation)
-
-  MT("labelNoTitle",
-     "[link [[foo]]:] [string http://example.com/]");
-
-  MT("labelIndented",
-     "   [link [[foo]]:] [string http://example.com/]");
-
-  MT("labelSpaceTitle",
-     "[link [[foo bar]]:] [string http://example.com/ \"hello\"]");
-
-  MT("labelDoubleTitle",
-     "[link [[foo bar]]:] [string http://example.com/ \"hello\"] \"world\"");
-
-  MT("labelTitleDoubleQuotes",
-     "[link [[foo]]:] [string http://example.com/  \"bar\"]");
-
-  MT("labelTitleSingleQuotes",
-     "[link [[foo]]:] [string http://example.com/  'bar']");
-
-  MT("labelTitleParenthese",
-     "[link [[foo]]:] [string http://example.com/  (bar)]");
-
-  MT("labelTitleInvalid",
-     "[link [[foo]]:] [string http://example.com/] bar");
-
-  MT("labelLinkAngleBrackets",
-     "[link [[foo]]:] [string <http://example.com/>  \"bar\"]");
-
-  MT("labelTitleNextDoubleQuotes",
-     "[link [[foo]]:] [string http://example.com/]",
-     "[string \"bar\"] hello");
-
-  MT("labelTitleNextSingleQuotes",
-     "[link [[foo]]:] [string http://example.com/]",
-     "[string 'bar'] hello");
-
-  MT("labelTitleNextParenthese",
-     "[link [[foo]]:] [string http://example.com/]",
-     "[string (bar)] hello");
-
-  MT("labelTitleNextMixed",
-     "[link [[foo]]:] [string http://example.com/]",
-     "(bar\" hello");
-
-  MT("linkWeb",
-     "[link <http://example.com/>] foo");
-
-  MT("linkWebDouble",
-     "[link <http://example.com/>] foo [link <http://example.com/>]");
-
-  MT("linkEmail",
-     "[link <user@example.com>] foo");
-
-  MT("linkEmailDouble",
-     "[link <user@example.com>] foo [link <user@example.com>]");
-
-  MT("emAsterisk",
-     "[em *foo*] bar");
-
-  MT("emUnderscore",
-     "[em _foo_] bar");
-
-  MT("emInWordAsterisk",
-     "foo[em *bar*]hello");
-
-  MT("emInWordUnderscore",
-     "foo[em _bar_]hello");
-
-  // Per documentation: "...surround an * or _ with spaces, it’ll be
-  // treated as a literal asterisk or underscore."
-
-  MT("emEscapedBySpaceIn",
-     "foo [em _bar _ hello_] world");
-
-  MT("emEscapedBySpaceOut",
-     "foo _ bar[em _hello_]world");
-
-  MT("emEscapedByNewline",
-     "foo",
-     "_ bar[em _hello_]world");
-
-  // Unclosed emphasis characters
-  // Instead of simply marking as EM / STRONG, it would be nice to have an
-  // incomplete flag for EM and STRONG, that is styled slightly different.
-  MT("emIncompleteAsterisk",
-     "foo [em *bar]");
-
-  MT("emIncompleteUnderscore",
-     "foo [em _bar]");
-
-  MT("strongAsterisk",
-     "[strong **foo**] bar");
-
-  MT("strongUnderscore",
-     "[strong __foo__] bar");
-
-  MT("emStrongAsterisk",
-     "[em *foo][em&strong **bar*][strong hello**] world");
-
-  MT("emStrongUnderscore",
-     "[em _foo][em&strong __bar_][strong hello__] world");
-
-  // "...same character must be used to open and close an emphasis span.""
-  MT("emStrongMixed",
-     "[em _foo][em&strong **bar*hello__ world]");
-
-  MT("emStrongMixed",
-     "[em *foo][em&strong __bar_hello** world]");
-
-  // These characters should be escaped:
-  // \   backslash
-  // `   backtick
-  // *   asterisk
-  // _   underscore
-  // {}  curly braces
-  // []  square brackets
-  // ()  parentheses
-  // #   hash mark
-  // +   plus sign
-  // -   minus sign (hyphen)
-  // .   dot
-  // !   exclamation mark
-
-  MT("escapeBacktick",
-     "foo \\`bar\\`");
-
-  MT("doubleEscapeBacktick",
-     "foo \\\\[comment `bar\\\\`]");
-
-  MT("escapeAsterisk",
-     "foo \\*bar\\*");
-
-  MT("doubleEscapeAsterisk",
-     "foo \\\\[em *bar\\\\*]");
-
-  MT("escapeUnderscore",
-     "foo \\_bar\\_");
-
-  MT("doubleEscapeUnderscore",
-     "foo \\\\[em _bar\\\\_]");
-
-  MT("escapeHash",
-     "\\# foo");
-
-  MT("doubleEscapeHash",
-     "\\\\# foo");
-
-
-  // Tests to make sure GFM-specific things aren't getting through
-
-  MT("taskList",
-     "[variable-2 * [ ]] bar]");
-
-  MT("fencedCodeBlocks",
-     "[comment ```]",
-     "foo",
-     "[comment ```]");
-})();
diff --git a/resources/libs/codemirror/mode/meta.js b/resources/libs/codemirror/mode/meta.js
deleted file mode 100644
index 226cff12e..000000000
--- a/resources/libs/codemirror/mode/meta.js
+++ /dev/null
@@ -1,91 +0,0 @@
-CodeMirror.modeInfo = [
-  {name: 'APL', mime: 'text/apl', mode: 'apl'},
-  {name: 'Asterisk', mime: 'text/x-asterisk', mode: 'asterisk'},
-  {name: 'C', mime: 'text/x-csrc', mode: 'clike'},
-  {name: 'C++', mime: 'text/x-c++src', mode: 'clike'},
-  {name: 'Cobol', mime: 'text/x-cobol', mode: 'cobol'},
-  {name: 'Java', mime: 'text/x-java', mode: 'clike'},
-  {name: 'C#', mime: 'text/x-csharp', mode: 'clike'},
-  {name: 'Scala', mime: 'text/x-scala', mode: 'clike'},
-  {name: 'Clojure', mime: 'text/x-clojure', mode: 'clojure'},
-  {name: 'CoffeeScript', mime: 'text/x-coffeescript', mode: 'coffeescript'},
-  {name: 'Common Lisp', mime: 'text/x-common-lisp', mode: 'commonlisp'},
-  {name: 'CSS', mime: 'text/css', mode: 'css'},
-  {name: 'D', mime: 'text/x-d', mode: 'd'},
-  {name: 'diff', mime: 'text/x-diff', mode: 'diff'},
-  {name: 'DTD', mime: 'application/xml-dtd', mode: 'dtd'},
-  {name: 'ECL', mime: 'text/x-ecl', mode: 'ecl'},
-  {name: 'Eiffel', mime: 'text/x-eiffel', mode: 'eiffel'},
-  {name: 'Erlang', mime: 'text/x-erlang', mode: 'erlang'},
-  {name: 'Fortran', mime: 'text/x-fortran', mode: 'fortran'},
-  {name: 'Gas', mime: 'text/x-gas', mode: 'gas'},
-  {name: 'Gherkin', mime: 'text/x-feature', mode: 'gherkin'},
-  {name: 'GitHub Flavored Markdown', mime: 'text/x-gfm', mode: 'gfm'},
-  {name: 'Go', mime: 'text/x-go', mode: 'go'},
-  {name: 'Groovy', mime: 'text/x-groovy', mode: 'groovy'},
-  {name: 'HAML', mime: 'text/x-haml', mode: 'haml'},
-  {name: 'Haskell', mime: 'text/x-haskell', mode: 'haskell'},
-  {name: 'Haxe', mime: 'text/x-haxe', mode: 'haxe'},
-  {name: 'ASP.NET', mime: 'application/x-aspx', mode: 'htmlembedded'},
-  {name: 'Embedded Javascript', mime: 'application/x-ejs', mode: 'htmlembedded'},
-  {name: 'JavaServer Pages', mime: 'application/x-jsp', mode: 'htmlembedded'},
-  {name: 'HTML', mime: 'text/html', mode: 'htmlmixed'},
-  {name: 'HTTP', mime: 'message/http', mode: 'http'},
-  {name: 'Jade', mime: 'text/x-jade', mode: 'jade'},
-  {name: 'JavaScript', mime: 'text/javascript', mode: 'javascript'},
-  {name: 'JSON', mime: 'application/x-json', mode: 'javascript'},
-  {name: 'JSON', mime: 'application/json', mode: 'javascript'},
-  {name: 'TypeScript', mime: 'application/typescript', mode: 'javascript'},
-  {name: 'Jinja2', mime: null, mode: 'jinja2'},
-  {name: 'Julia', mime: 'text/x-julia', mode: 'julia'},
-  {name: 'LESS', mime: 'text/x-less', mode: 'less'},
-  {name: 'LiveScript', mime: 'text/x-livescript', mode: 'livescript'},
-  {name: 'Lua', mime: 'text/x-lua', mode: 'lua'},
-  {name: 'Markdown (GitHub-flavour)', mime: 'text/x-markdown', mode: 'markdown'},
-  {name: 'mIRC', mime: 'text/mirc', mode: 'mirc'},
-  {name: 'Nginx', mime: 'text/x-nginx-conf', mode: 'nginx'},
-  {name: 'NTriples', mime: 'text/n-triples', mode: 'ntriples'},
-  {name: 'OCaml', mime: 'text/x-ocaml', mode: 'ocaml'},
-  {name: 'Octave', mime: 'text/x-octave', mode: 'octave'},
-  {name: 'Pascal', mime: 'text/x-pascal', mode: 'pascal'},
-  {name: 'PEG.js', mime: null, mode: 'pegjs'},
-  {name: 'Perl', mime: 'text/x-perl', mode: 'perl'},
-  {name: 'PHP', mime: 'text/x-php', mode: 'php'},
-  {name: 'PHP(HTML)', mime: 'application/x-httpd-php', mode: 'php'},
-  {name: 'Pig', mime: 'text/x-pig', mode: 'pig'},
-  {name: 'Plain Text', mime: 'text/plain', mode: 'null'},
-  {name: 'Properties files', mime: 'text/x-properties', mode: 'properties'},
-  {name: 'Python', mime: 'text/x-python', mode: 'python'},
-  {name: 'Cython', mime: 'text/x-cython', mode: 'python'},
-  {name: 'R', mime: 'text/x-rsrc', mode: 'r'},
-  {name: 'reStructuredText', mime: 'text/x-rst', mode: 'rst'},
-  {name: 'Ruby', mime: 'text/x-ruby', mode: 'ruby'},
-  {name: 'Rust', mime: 'text/x-rustsrc', mode: 'rust'},
-  {name: 'Sass', mime: 'text/x-sass', mode: 'sass'},
-  {name: 'Scheme', mime: 'text/x-scheme', mode: 'scheme'},
-  {name: 'SCSS', mime: 'text/x-scss', mode: 'css'},
-  {name: 'Shell', mime: 'text/x-sh', mode: 'shell'},
-  {name: 'Sieve', mime: 'application/sieve', mode: 'sieve'},
-  {name: 'Smalltalk', mime: 'text/x-stsrc', mode: 'smalltalk'},
-  {name: 'Smarty', mime: 'text/x-smarty', mode: 'smarty'},
-  {name: 'SmartyMixed', mime: 'text/x-smarty', mode: 'smartymixed'},
-  {name: 'SPARQL', mime: 'application/x-sparql-query', mode: 'sparql'},
-  {name: 'SQL', mime: 'text/x-sql', mode: 'sql'},
-  {name: 'MariaDB', mime: 'text/x-mariadb', mode: 'sql'},
-  {name: 'sTeX', mime: 'text/x-stex', mode: 'stex'},
-  {name: 'LaTeX', mime: 'text/x-latex', mode: 'stex'},
-  {name: 'Tcl', mime: 'text/x-tcl', mode: 'tcl'},
-  {name: 'TiddlyWiki ', mime: 'text/x-tiddlywiki', mode: 'tiddlywiki'},
-  {name: 'Tiki wiki', mime: 'text/tiki', mode: 'tiki'},
-  {name: 'TOML', mime: 'text/x-toml', mode: 'toml'},
-  {name: 'Turtle', mime: 'text/turtle', mode: 'turtle'},
-  {name: 'VB.NET', mime: 'text/x-vb', mode: 'vb'},
-  {name: 'VBScript', mime: 'text/vbscript', mode: 'vbscript'},
-  {name: 'Velocity', mime: 'text/velocity', mode: 'velocity'},
-  {name: 'Verilog', mime: 'text/x-verilog', mode: 'verilog'},
-  {name: 'XML', mime: 'application/xml', mode: 'xml'},
-  {name: 'HTML', mime: 'text/html', mode: 'xml'},
-  {name: 'XQuery', mime: 'application/xquery', mode: 'xquery'},
-  {name: 'YAML', mime: 'text/x-yaml', mode: 'yaml'},
-  {name: 'Z80', mime: 'text/x-z80', mode: 'z80'}
-];
diff --git a/resources/libs/codemirror/mode/mirc/index.html b/resources/libs/codemirror/mode/mirc/index.html
deleted file mode 100644
index dbd7a06d8..000000000
--- a/resources/libs/codemirror/mode/mirc/index.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: mIRC mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/twilight.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="mirc.js"></script>
-<style>.CodeMirror {border: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">mIRC</a>
-  </ul>
-</div>
-
-<article>
-<h2>mIRC mode</h2>
-<form><textarea id="code" name="code">
-;AKA Nick Tracker by Ford_Lawnmower irc.GeekShed.net #Script-Help
-;*****************************************************************************;
-;**Start Setup
-;Change JoinDisplay, below, for On Join AKA Display. On = 1 - Off = 0
-alias -l JoinDisplay { return 1 }
-;Change MaxNicks, below, to the number of nicknames you want to store for each hostmask. I wouldn't go over 400 with this ;/
-alias -l MaxNicks { return 20 }
-;Change AKALogo, below, To the text you want displayed before each AKA result.
-alias -l AKALogo { return 06 05A06K07A 06 }
-;**End Setup
-;*****************************************************************************;
-On *:Join:#: {
-  if ($nick == $me) { .timer 1 1 ialupdateCheck $chan }
-  NickNamesAdd $nick $+($network,$wildsite)
-  if ($JoinDisplay) { .timerNickNames $+ $nick 1 2 NickNames.display $nick $chan $network $wildsite }
-}
-on *:Nick: { NickNamesAdd $newnick $+($network,$wildsite) $nick }
-alias -l NickNames.display {
-  if ($gettok($hget(NickNames,$+($3,$4)),0,126) > 1) {
-    echo -g $2 $AKALogo $+(09,$1) $AKALogo 07 $mid($replace($hget(NickNames,$+($3,$4)),$chr(126),$chr(44)),2,-1)
-  }
-}
-alias -l NickNamesAdd {
-  if ($hget(NickNames,$2)) {
-    if (!$regex($hget(NickNames,$2),/~\Q $+ $replacecs($1,\E,\E\\E\Q) $+ \E~/i)) {
-      if ($gettok($hget(NickNames,$2),0,126) <= $MaxNicks) {
-        hadd NickNames $2 $+($hget(NickNames,$2),$1,~)
-      }
-      else {
-        hadd NickNames $2 $+($mid($hget(NickNames,$2),$pos($hget(NickNames,$2),~,2)),$1,~)
-      }
-    }
-  }
-  else {
-    hadd -m NickNames $2 $+(~,$1,~,$iif($3,$+($3,~)))
-  }
-}
-alias -l Fix.All.MindUser {
-  var %Fix.Count = $hfind(NickNames,/[^~]+[0-9]{4}~/,0,r).data
-  while (%Fix.Count) {
-    if ($Fix.MindUser($hget(NickNames,$hfind(NickNames,/[^~]+[0-9]{4}~/,%Fix.Count,r).data))) {
-      echo -ag Record %Fix.Count - $v1 - Was Cleaned
-      hadd NickNames $hfind(NickNames,/[^~]+[0-9]{4}~/,%Fix.Count,r).data $v1
-    }
-    dec %Fix.Count
-  }
-}
-alias -l Fix.MindUser { return $regsubex($1,/[^~]+[0-9]{4}~/g,$null) }
-menu nicklist,query {
-  -
-  .AKA
-  ..Check $$1: {
-    if ($gettok($hget(NickNames,$+($network,$address($1,2))),0,126) > 1) {
-      NickNames.display $1 $active $network $address($1,2)
-    }
-    else { echo -ag $AKALogo $+(09,$1) 07has not been known by any other nicknames while I have been watching. }
-  }
-  ..Cleanup $$1:hadd NickNames $+($network,$address($1,2)) $fix.minduser($hget(NickNames,$+($network,$address($1,2))))
-  ..Clear $$1:hadd NickNames $+($network,$address($1,2)) $+(~,$1,~)
-  ..AKA Search Dialog:dialog $iif($dialog(AKA_Search),-v,-m) AKA_Search AKA_Search
-  -
-}
-menu status,channel {
-  -
-  .AKA
-  ..AKA Search Dialog:dialog $iif($dialog(AKA_Search),-v,-m) AKA_Search AKA_Search
-  ..Clean All Records:Fix.All.Minduser
-  -
-}
-dialog AKA_Search {
-  title "AKA Search Engine"
-  size -1 -1 206 221
-  option dbu
-  edit "", 1, 8 5 149 10, autohs
-  button "Search", 2, 163 4 32 12
-  radio "Search HostMask", 4, 61 22 55 10
-  radio "Search Nicknames", 5, 123 22 56 10
-  list 6, 8 38 190 169, sort extsel vsbar
-  button "Check Selected", 7, 67 206 40 12
-  button "Close", 8, 160 206 38 12, cancel
-  box "Search Type", 3, 11 17 183 18
-  button "Copy to Clipboard", 9, 111 206 46 12
-}
-On *:Dialog:Aka_Search:init:*: { did -c $dname 5 }
-On *:Dialog:Aka_Search:Sclick:2,7,9: {
-  if ($did == 2) && ($did($dname,1)) {
-    did -r $dname 6
-    var %search $+(*,$v1,*), %type $iif($did($dname,5).state,data,item), %matches = $hfind(NickNames,%search,0,w). [ $+ [ %type ] ]
-    while (%matches) {
-      did -a $dname 6 $hfind(NickNames,%search,%matches,w). [ $+ [ %type ] ]
-      dec %matches
-    }
-    did -c $dname 6 1
-  }
-  elseif ($did == 7) && ($did($dname,6).seltext) { echo -ga $AKALogo 07 $mid($replace($hget(NickNames,$v1),$chr(126),$chr(44)),2,-1) }
-  elseif ($did == 9) && ($did($dname,6).seltext) { clipboard $mid($v1,$pos($v1,*,1)) }
-}
-On *:Start:{
-  if (!$hget(NickNames)) { hmake NickNames 10 }
-  if ($isfile(NickNames.hsh)) { hload  NickNames NickNames.hsh }
-}
-On *:Exit: { if ($hget(NickNames)) { hsave NickNames NickNames.hsh } }
-On *:Disconnect: { if ($hget(NickNames)) { hsave NickNames NickNames.hsh } }
-On *:Unload: { hfree NickNames }
-alias -l ialupdateCheck {
-  inc -z $+(%,ialupdateCheck,$network) $calc($nick($1,0) / 4)
-  ;If your ial is already being updated on join .who $1 out.
-  ;If you are using /names to update ial you will still need this line.
-  .who $1
-}
-Raw 352:*: {
-  if ($($+(%,ialupdateCheck,$network),2)) haltdef
-  NickNamesAdd $6 $+($network,$address($6,2))
-}
-Raw 315:*: {
-  if ($($+(%,ialupdateCheck,$network),2)) haltdef
-}
-
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        tabMode: "indent",
-		theme: "twilight",
-        lineNumbers: true,
-		matchBrackets: true,
-        indentUnit: 4,
-        mode: "text/mirc"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/mirc</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/mirc/mirc.js b/resources/libs/codemirror/mode/mirc/mirc.js
deleted file mode 100644
index fc88bc56f..000000000
--- a/resources/libs/codemirror/mode/mirc/mirc.js
+++ /dev/null
@@ -1,177 +0,0 @@
-//mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
-CodeMirror.defineMIME("text/mirc", "mirc");
-CodeMirror.defineMode("mirc", function() {
-  function parseWords(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var specials = parseWords("$! $$ $& $? $+ $abook $abs $active $activecid " +
-                            "$activewid $address $addtok $agent $agentname $agentstat $agentver " +
-                            "$alias $and $anick $ansi2mirc $aop $appactive $appstate $asc $asctime " +
-                            "$asin $atan $avoice $away $awaymsg $awaytime $banmask $base $bfind " +
-                            "$binoff $biton $bnick $bvar $bytes $calc $cb $cd $ceil $chan $chanmodes " +
-                            "$chantypes $chat $chr $cid $clevel $click $cmdbox $cmdline $cnick $color " +
-                            "$com $comcall $comchan $comerr $compact $compress $comval $cos $count " +
-                            "$cr $crc $creq $crlf $ctime $ctimer $ctrlenter $date $day $daylight " +
-                            "$dbuh $dbuw $dccignore $dccport $dde $ddename $debug $decode $decompress " +
-                            "$deltok $devent $dialog $did $didreg $didtok $didwm $disk $dlevel $dll " +
-                            "$dllcall $dname $dns $duration $ebeeps $editbox $emailaddr $encode $error " +
-                            "$eval $event $exist $feof $ferr $fgetc $file $filename $filtered $finddir " +
-                            "$finddirn $findfile $findfilen $findtok $fline $floor $fopen $fread $fserve " +
-                            "$fulladdress $fulldate $fullname $fullscreen $get $getdir $getdot $gettok $gmt " +
-                            "$group $halted $hash $height $hfind $hget $highlight $hnick $hotline " +
-                            "$hotlinepos $ial $ialchan $ibl $idle $iel $ifmatch $ignore $iif $iil " +
-                            "$inelipse $ini $inmidi $inpaste $inpoly $input $inrect $inroundrect " +
-                            "$insong $instok $int $inwave $ip $isalias $isbit $isdde $isdir $isfile " +
-                            "$isid $islower $istok $isupper $keychar $keyrpt $keyval $knick $lactive " +
-                            "$lactivecid $lactivewid $left $len $level $lf $line $lines $link $lock " +
-                            "$lock $locked $log $logstamp $logstampfmt $longfn $longip $lower $ltimer " +
-                            "$maddress $mask $matchkey $matchtok $md5 $me $menu $menubar $menucontext " +
-                            "$menutype $mid $middir $mircdir $mircexe $mircini $mklogfn $mnick $mode " +
-                            "$modefirst $modelast $modespl $mouse $msfile $network $newnick $nick $nofile " +
-                            "$nopath $noqt $not $notags $notify $null $numeric $numok $oline $onpoly " +
-                            "$opnick $or $ord $os $passivedcc $pic $play $pnick $port $portable $portfree " +
-                            "$pos $prefix $prop $protect $puttok $qt $query $rand $r $rawmsg $read $readomo " +
-                            "$readn $regex $regml $regsub $regsubex $remove $remtok $replace $replacex " +
-                            "$reptok $result $rgb $right $round $scid $scon $script $scriptdir $scriptline " +
-                            "$sdir $send $server $serverip $sfile $sha1 $shortfn $show $signal $sin " +
-                            "$site $sline $snick $snicks $snotify $sock $sockbr $sockerr $sockname " +
-                            "$sorttok $sound $sqrt $ssl $sreq $sslready $status $strip $str $stripped " +
-                            "$syle $submenu $switchbar $tan $target $ticks $time $timer $timestamp " +
-                            "$timestampfmt $timezone $tip $titlebar $toolbar $treebar $trust $ulevel " +
-                            "$ulist $upper $uptime $url $usermode $v1 $v2 $var $vcmd $vcmdstat $vcmdver " +
-                            "$version $vnick $vol $wid $width $wildsite $wildtok $window $wrap $xor");
-  var keywords = parseWords("abook ajinvite alias aline ame amsg anick aop auser autojoin avoice " +
-                            "away background ban bcopy beep bread break breplace bset btrunc bunset bwrite " +
-                            "channel clear clearall cline clipboard close cnick color comclose comopen " +
-                            "comreg continue copy creq ctcpreply ctcps dcc dccserver dde ddeserver " +
-                            "debug dec describe dialog did didtok disable disconnect dlevel dline dll " +
-                            "dns dqwindow drawcopy drawdot drawfill drawline drawpic drawrect drawreplace " +
-                            "drawrot drawsave drawscroll drawtext ebeeps echo editbox emailaddr enable " +
-                            "events exit fclose filter findtext finger firewall flash flist flood flush " +
-                            "flushini font fopen fseek fsend fserve fullname fwrite ghide gload gmove " +
-                            "gopts goto gplay gpoint gqreq groups gshow gsize gstop gtalk gunload hadd " +
-                            "halt haltdef hdec hdel help hfree hinc hload hmake hop hsave ial ialclear " +
-                            "ialmark identd if ignore iline inc invite iuser join kick linesep links list " +
-                            "load loadbuf localinfo log mdi me menubar mkdir mnick mode msg nick noop notice " +
-                            "notify omsg onotice part partall pdcc perform play playctrl pop protect pvoice " +
-                            "qme qmsg query queryn quit raw reload remini remote remove rename renwin " +
-                            "reseterror resetidle return rlevel rline rmdir run ruser save savebuf saveini " +
-                            "say scid scon server set showmirc signam sline sockaccept sockclose socklist " +
-                            "socklisten sockmark sockopen sockpause sockread sockrename sockudp sockwrite " +
-                            "sound speak splay sreq strip switchbar timer timestamp titlebar tnick tokenize " +
-                            "toolbar topic tray treebar ulist unload unset unsetall updatenl url uwho " +
-                            "var vcadd vcmd vcrem vol while whois window winhelp write writeint if isalnum " +
-                            "isalpha isaop isavoice isban ischan ishop isignore isin isincs isletter islower " +
-                            "isnotify isnum ison isop isprotect isreg isupper isvoice iswm iswmcs " +
-                            "elseif else goto menu nicklist status title icon size option text edit " +
-                            "button check radio box scroll list combo link tab item");
-  var functions = parseWords("if elseif else and not or eq ne in ni for foreach while switch");
-  var isOperatorChar = /[+\-*&%=<>!?^\/\|]/;
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-  function tokenBase(stream, state) {
-    var beforeParams = state.beforeParams;
-    state.beforeParams = false;
-    var ch = stream.next();
-    if (/[\[\]{}\(\),\.]/.test(ch)) {
-      if (ch == "(" && beforeParams) state.inParams = true;
-      else if (ch == ")") state.inParams = false;
-      return null;
-    }
-    else if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    else if (ch == "\\") {
-      stream.eat("\\");
-      stream.eat(/./);
-      return "number";
-    }
-    else if (ch == "/" && stream.eat("*")) {
-      return chain(stream, state, tokenComment);
-    }
-    else if (ch == ";" && stream.match(/ *\( *\(/)) {
-      return chain(stream, state, tokenUnparsed);
-    }
-    else if (ch == ";" && !state.inParams) {
-      stream.skipToEnd();
-      return "comment";
-    }
-    else if (ch == '"') {
-      stream.eat(/"/);
-      return "keyword";
-    }
-    else if (ch == "$") {
-      stream.eatWhile(/[$_a-z0-9A-Z\.:]/);
-      if (specials && specials.propertyIsEnumerable(stream.current().toLowerCase())) {
-        return "keyword";
-      }
-      else {
-        state.beforeParams = true;
-        return "builtin";
-      }
-    }
-    else if (ch == "%") {
-      stream.eatWhile(/[^,^\s^\(^\)]/);
-      state.beforeParams = true;
-      return "string";
-    }
-    else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    else {
-      stream.eatWhile(/[\w\$_{}]/);
-      var word = stream.current().toLowerCase();
-      if (keywords && keywords.propertyIsEnumerable(word))
-        return "keyword";
-      if (functions && functions.propertyIsEnumerable(word)) {
-        state.beforeParams = true;
-        return "keyword";
-      }
-      return null;
-    }
-  }
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-  function tokenUnparsed(stream, state) {
-    var maybeEnd = 0, ch;
-    while (ch = stream.next()) {
-      if (ch == ";" && maybeEnd == 2) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      if (ch == ")")
-        maybeEnd++;
-      else if (ch != " ")
-        maybeEnd = 0;
-    }
-    return "meta";
-  }
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        beforeParams: false,
-        inParams: false
-      };
-    },
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      return state.tokenize(stream, state);
-    }
-  };
-});
diff --git a/resources/libs/codemirror/mode/nginx/index.html b/resources/libs/codemirror/mode/nginx/index.html
deleted file mode 100644
index 16be1eb61..000000000
--- a/resources/libs/codemirror/mode/nginx/index.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: NGINX mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="nginx.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-
-  <style>
-    body {
-      margin: 0em auto;
-    }
-
-    .CodeMirror, .CodeMirror-scroll {
-      height: 600px;
-    }
-  </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">NGINX</a>
-  </ul>
-</div>
-
-<article>
-<h2>NGINX mode</h2>
-<form><textarea id="code" name="code" style="height: 800px;">
-server {
-  listen 173.255.219.235:80;
-  server_name website.com.au;
-  rewrite / $scheme://www.$host$request_uri permanent; ## Forcibly prepend a www
-}
-
-server {
-  listen 173.255.219.235:443;
-  server_name website.com.au;
-  rewrite / $scheme://www.$host$request_uri permanent; ## Forcibly prepend a www
-}
-
-server {
-
-  listen      173.255.219.235:80;
-  server_name www.website.com.au;
-
-
-
-  root        /data/www;
-  index       index.html index.php;
-
-  location / {
-    index index.html index.php;     ## Allow a static html file to be shown first
-    try_files $uri $uri/ @handler;  ## If missing pass the URI to Magento's front handler
-    expires 30d;                    ## Assume all files are cachable
-  }
-
-  ## These locations would be hidden by .htaccess normally
-  location /app/                { deny all; }
-  location /includes/           { deny all; }
-  location /lib/                { deny all; }
-  location /media/downloadable/ { deny all; }
-  location /pkginfo/            { deny all; }
-  location /report/config.xml   { deny all; }
-  location /var/                { deny all; }
-
-  location /var/export/ { ## Allow admins only to view export folder
-    auth_basic           "Restricted"; ## Message shown in login window
-    auth_basic_user_file /rs/passwords/testfile; ## See /etc/nginx/htpassword
-    autoindex            on;
-  }
-
-  location  /. { ## Disable .htaccess and other hidden files
-    return 404;
-  }
-
-  location @handler { ## Magento uses a common front handler
-    rewrite / /index.php;
-  }
-
-  location ~ .php/ { ## Forward paths like /js/index.php/x.js to relevant handler
-    rewrite ^/(.*.php)/ /$1 last;
-  }
-
-  location ~ \.php$ {
-    if (!-e $request_filename) { rewrite / /index.php last; } ## Catch 404s that try_files miss
-
-    fastcgi_pass   127.0.0.1:9000;
-    fastcgi_index  index.php;
-    fastcgi_param PATH_INFO $fastcgi_script_name;
-    fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    include        /rs/confs/nginx/fastcgi_params;
-  }
-
-}
-
-
-server {
-
-  listen              173.255.219.235:443;
-  server_name         website.com.au www.website.com.au;
-
-  root   /data/www;
-  index index.html index.php;
-
-  ssl                 on;
-  ssl_certificate     /rs/ssl/ssl.crt;
-  ssl_certificate_key /rs/ssl/ssl.key;
-
-  ssl_session_timeout  5m;
-
-  ssl_protocols  SSLv2 SSLv3 TLSv1;
-  ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
-  ssl_prefer_server_ciphers   on;
-
-
-
-  location / {
-    index index.html index.php; ## Allow a static html file to be shown first
-    try_files $uri $uri/ @handler; ## If missing pass the URI to Magento's front handler
-    expires 30d; ## Assume all files are cachable
-  }
-
-  ## These locations would be hidden by .htaccess normally
-  location /app/                { deny all; }
-  location /includes/           { deny all; }
-  location /lib/                { deny all; }
-  location /media/downloadable/ { deny all; }
-  location /pkginfo/            { deny all; }
-  location /report/config.xml   { deny all; }
-  location /var/                { deny all; }
-
-  location /var/export/ { ## Allow admins only to view export folder
-    auth_basic           "Restricted"; ## Message shown in login window
-    auth_basic_user_file htpasswd; ## See /etc/nginx/htpassword
-    autoindex            on;
-  }
-
-  location  /. { ## Disable .htaccess and other hidden files
-    return 404;
-  }
-
-  location @handler { ## Magento uses a common front handler
-    rewrite / /index.php;
-  }
-
-  location ~ .php/ { ## Forward paths like /js/index.php/x.js to relevant handler
-    rewrite ^/(.*.php)/ /$1 last;
-  }
-
-  location ~ .php$ { ## Execute PHP scripts
-    if (!-e $request_filename) { rewrite  /index.php last; } ## Catch 404s that try_files miss
-
-    fastcgi_pass 127.0.0.1:9000;
-    fastcgi_index  index.php;
-    fastcgi_param PATH_INFO $fastcgi_script_name;
-    fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    include        /rs/confs/nginx/fastcgi_params;
-
-    fastcgi_param HTTPS on;
-  }
-
-}
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/nginx</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/nginx/nginx.js b/resources/libs/codemirror/mode/nginx/nginx.js
deleted file mode 100644
index c98c8a1dd..000000000
--- a/resources/libs/codemirror/mode/nginx/nginx.js
+++ /dev/null
@@ -1,163 +0,0 @@
-CodeMirror.defineMode("nginx", function(config) {
-
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  var keywords = words(
-    /* ngxDirectiveControl */ "break return rewrite set" +
-    /* ngxDirective */ " accept_mutex accept_mutex_delay access_log add_after_body add_before_body add_header addition_types aio alias allow ancient_browser ancient_browser_value auth_basic auth_basic_user_file auth_http auth_http_header auth_http_timeout autoindex autoindex_exact_size autoindex_localtime charset charset_types client_body_buffer_size client_body_in_file_only client_body_in_single_buffer client_body_temp_path client_body_timeout client_header_buffer_size client_header_timeout client_max_body_size connection_pool_size create_full_put_path daemon dav_access dav_methods debug_connection debug_points default_type degradation degrade deny devpoll_changes devpoll_events directio directio_alignment empty_gif env epoll_events error_log eventport_events expires fastcgi_bind fastcgi_buffer_size fastcgi_buffers fastcgi_busy_buffers_size fastcgi_cache fastcgi_cache_key fastcgi_cache_methods fastcgi_cache_min_uses fastcgi_cache_path fastcgi_cache_use_stale fastcgi_cache_valid fastcgi_catch_stderr fastcgi_connect_timeout fastcgi_hide_header fastcgi_ignore_client_abort fastcgi_ignore_headers fastcgi_index fastcgi_intercept_errors fastcgi_max_temp_file_size fastcgi_next_upstream fastcgi_param fastcgi_pass_header fastcgi_pass_request_body fastcgi_pass_request_headers fastcgi_read_timeout fastcgi_send_lowat fastcgi_send_timeout fastcgi_split_path_info fastcgi_store fastcgi_store_access fastcgi_temp_file_write_size fastcgi_temp_path fastcgi_upstream_fail_timeout fastcgi_upstream_max_fails flv geoip_city geoip_country google_perftools_profiles gzip gzip_buffers gzip_comp_level gzip_disable gzip_hash gzip_http_version gzip_min_length gzip_no_buffer gzip_proxied gzip_static gzip_types gzip_vary gzip_window if_modified_since ignore_invalid_headers image_filter image_filter_buffer image_filter_jpeg_quality image_filter_transparency imap_auth imap_capabilities imap_client_buffer index ip_hash keepalive_requests keepalive_timeout kqueue_changes kqueue_events large_client_header_buffers limit_conn limit_conn_log_level limit_rate limit_rate_after limit_req limit_req_log_level limit_req_zone limit_zone lingering_time lingering_timeout lock_file log_format log_not_found log_subrequest map_hash_bucket_size map_hash_max_size master_process memcached_bind memcached_buffer_size memcached_connect_timeout memcached_next_upstream memcached_read_timeout memcached_send_timeout memcached_upstream_fail_timeout memcached_upstream_max_fails merge_slashes min_delete_depth modern_browser modern_browser_value msie_padding msie_refresh multi_accept open_file_cache open_file_cache_errors open_file_cache_events open_file_cache_min_uses open_file_cache_valid open_log_file_cache output_buffers override_charset perl perl_modules perl_require perl_set pid pop3_auth pop3_capabilities port_in_redirect postpone_gzipping postpone_output protocol proxy proxy_bind proxy_buffer proxy_buffer_size proxy_buffering proxy_buffers proxy_busy_buffers_size proxy_cache proxy_cache_key proxy_cache_methods proxy_cache_min_uses proxy_cache_path proxy_cache_use_stale proxy_cache_valid proxy_connect_timeout proxy_headers_hash_bucket_size proxy_headers_hash_max_size proxy_hide_header proxy_ignore_client_abort proxy_ignore_headers proxy_intercept_errors proxy_max_temp_file_size proxy_method proxy_next_upstream proxy_pass_error_message proxy_pass_header proxy_pass_request_body proxy_pass_request_headers proxy_read_timeout proxy_redirect proxy_send_lowat proxy_send_timeout proxy_set_body proxy_set_header proxy_ssl_session_reuse proxy_store proxy_store_access proxy_temp_file_write_size proxy_temp_path proxy_timeout proxy_upstream_fail_timeout proxy_upstream_max_fails random_index read_ahead real_ip_header recursive_error_pages request_pool_size reset_timedout_connection resolver resolver_timeout rewrite_log rtsig_overflow_events rtsig_overflow_test rtsig_overflow_threshold rtsig_signo satisfy secure_link_secret send_lowat send_timeout sendfile sendfile_max_chunk server_name_in_redirect server_names_hash_bucket_size server_names_hash_max_size server_tokens set_real_ip_from smtp_auth smtp_capabilities smtp_client_buffer smtp_greeting_delay so_keepalive source_charset ssi ssi_ignore_recycled_buffers ssi_min_file_chunk ssi_silent_errors ssi_types ssi_value_length ssl ssl_certificate ssl_certificate_key ssl_ciphers ssl_client_certificate ssl_crl ssl_dhparam ssl_engine ssl_prefer_server_ciphers ssl_protocols ssl_session_cache ssl_session_timeout ssl_verify_client ssl_verify_depth starttls stub_status sub_filter sub_filter_once sub_filter_types tcp_nodelay tcp_nopush thread_stack_size timeout timer_resolution types_hash_bucket_size types_hash_max_size underscores_in_headers uninitialized_variable_warn use user userid userid_domain userid_expires userid_mark userid_name userid_p3p userid_path userid_service valid_referers variables_hash_bucket_size variables_hash_max_size worker_connections worker_cpu_affinity worker_priority worker_processes worker_rlimit_core worker_rlimit_nofile worker_rlimit_sigpending worker_threads working_directory xclient xml_entities xslt_stylesheet xslt_typesdrew@li229-23"
-    );
-
-  var keywords_block = words(
-    /* ngxDirectiveBlock */ "http mail events server types location upstream charset_map limit_except if geo map"
-    );
-
-  var keywords_important = words(
-    /* ngxDirectiveImportant */ "include root server server_name listen internal proxy_pass memcached_pass fastcgi_pass try_files"
-    );
-
-  var indentUnit = config.indentUnit, type;
-  function ret(style, tp) {type = tp; return style;}
-
-  function tokenBase(stream, state) {
-
-
-    stream.eatWhile(/[\w\$_]/);
-
-    var cur = stream.current();
-
-
-    if (keywords.propertyIsEnumerable(cur)) {
-      return "keyword";
-    }
-    else if (keywords_block.propertyIsEnumerable(cur)) {
-      return "variable-2";
-    }
-    else if (keywords_important.propertyIsEnumerable(cur)) {
-      return "string-2";
-    }
-    /**/
-
-    var ch = stream.next();
-    if (ch == "@") {stream.eatWhile(/[\w\\\-]/); return ret("meta", stream.current());}
-    else if (ch == "/" && stream.eat("*")) {
-      state.tokenize = tokenCComment;
-      return tokenCComment(stream, state);
-    }
-    else if (ch == "<" && stream.eat("!")) {
-      state.tokenize = tokenSGMLComment;
-      return tokenSGMLComment(stream, state);
-    }
-    else if (ch == "=") ret(null, "compare");
-    else if ((ch == "~" || ch == "|") && stream.eat("=")) return ret(null, "compare");
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    else if (ch == "#") {
-      stream.skipToEnd();
-      return ret("comment", "comment");
-    }
-    else if (ch == "!") {
-      stream.match(/^\s*\w*/);
-      return ret("keyword", "important");
-    }
-    else if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w.%]/);
-      return ret("number", "unit");
-    }
-    else if (/[,.+>*\/]/.test(ch)) {
-      return ret(null, "select-op");
-    }
-    else if (/[;{}:\[\]]/.test(ch)) {
-      return ret(null, ch);
-    }
-    else {
-      stream.eatWhile(/[\w\\\-]/);
-      return ret("variable", "variable");
-    }
-  }
-
-  function tokenCComment(stream, state) {
-    var maybeEnd = false, ch;
-    while ((ch = stream.next()) != null) {
-      if (maybeEnd && ch == "/") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenSGMLComment(stream, state) {
-    var dashes = 0, ch;
-    while ((ch = stream.next()) != null) {
-      if (dashes >= 2 && ch == ">") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      dashes = (ch == "-") ? dashes + 1 : 0;
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped)
-          break;
-        escaped = !escaped && ch == "\\";
-      }
-      if (!escaped) state.tokenize = tokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  return {
-    startState: function(base) {
-      return {tokenize: tokenBase,
-              baseIndent: base || 0,
-              stack: []};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      type = null;
-      var style = state.tokenize(stream, state);
-
-      var context = state.stack[state.stack.length-1];
-      if (type == "hash" && context == "rule") style = "atom";
-      else if (style == "variable") {
-        if (context == "rule") style = "number";
-        else if (!context || context == "@media{") style = "tag";
-      }
-
-      if (context == "rule" && /^[\{\};]$/.test(type))
-        state.stack.pop();
-      if (type == "{") {
-        if (context == "@media") state.stack[state.stack.length-1] = "@media{";
-        else state.stack.push("{");
-      }
-      else if (type == "}") state.stack.pop();
-      else if (type == "@media") state.stack.push("@media");
-      else if (context == "{" && type != "comment") state.stack.push("rule");
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var n = state.stack.length;
-      if (/^\}/.test(textAfter))
-        n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1;
-      return state.baseIndent + n * indentUnit;
-    },
-
-    electricChars: "}"
-  };
-});
-
-CodeMirror.defineMIME("text/nginx", "text/x-nginx-conf");
diff --git a/resources/libs/codemirror/mode/ntriples/index.html b/resources/libs/codemirror/mode/ntriples/index.html
deleted file mode 100644
index c8a67916d..000000000
--- a/resources/libs/codemirror/mode/ntriples/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: NTriples mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="ntriples.js"></script>
-<style type="text/css">
-      .CodeMirror {
-        border: 1px solid #eee;
-      }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">NTriples</a>
-  </ul>
-</div>
-
-<article>
-<h2>NTriples mode</h2>
-<form>
-<textarea id="ntriples" name="ntriples">    
-<http://Sub1>     <http://pred1>     <http://obj> .
-<http://Sub2>     <http://pred2#an2> "literal 1" .
-<http://Sub3#an3> <http://pred3>     _:bnode3 .
-_:bnode4          <http://pred4>     "literal 2"@lang .
-_:bnode5          <http://pred5>     "literal 3"^^<http://type> .
-</textarea>
-</form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("ntriples"), {});
-    </script>
-    <p><strong>MIME types defined:</strong> <code>text/n-triples</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/ntriples/ntriples.js b/resources/libs/codemirror/mode/ntriples/ntriples.js
deleted file mode 100644
index ed0cee34b..000000000
--- a/resources/libs/codemirror/mode/ntriples/ntriples.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/**********************************************************
-* This script provides syntax highlighting support for
-* the Ntriples format.
-* Ntriples format specification:
-*     http://www.w3.org/TR/rdf-testcases/#ntriples
-***********************************************************/
-
-/*
-    The following expression defines the defined ASF grammar transitions.
-
-    pre_subject ->
-        {
-        ( writing_subject_uri | writing_bnode_uri )
-            -> pre_predicate
-                -> writing_predicate_uri
-                    -> pre_object
-                        -> writing_object_uri | writing_object_bnode |
-                          (
-                            writing_object_literal
-                                -> writing_literal_lang | writing_literal_type
-                          )
-                            -> post_object
-                                -> BEGIN
-         } otherwise {
-             -> ERROR
-         }
-*/
-CodeMirror.defineMode("ntriples", function() {
-
-  var Location = {
-    PRE_SUBJECT         : 0,
-    WRITING_SUB_URI     : 1,
-    WRITING_BNODE_URI   : 2,
-    PRE_PRED            : 3,
-    WRITING_PRED_URI    : 4,
-    PRE_OBJ             : 5,
-    WRITING_OBJ_URI     : 6,
-    WRITING_OBJ_BNODE   : 7,
-    WRITING_OBJ_LITERAL : 8,
-    WRITING_LIT_LANG    : 9,
-    WRITING_LIT_TYPE    : 10,
-    POST_OBJ            : 11,
-    ERROR               : 12
-  };
-  function transitState(currState, c) {
-    var currLocation = currState.location;
-    var ret;
-
-    // Opening.
-    if     (currLocation == Location.PRE_SUBJECT && c == '<') ret = Location.WRITING_SUB_URI;
-    else if(currLocation == Location.PRE_SUBJECT && c == '_') ret = Location.WRITING_BNODE_URI;
-    else if(currLocation == Location.PRE_PRED    && c == '<') ret = Location.WRITING_PRED_URI;
-    else if(currLocation == Location.PRE_OBJ     && c == '<') ret = Location.WRITING_OBJ_URI;
-    else if(currLocation == Location.PRE_OBJ     && c == '_') ret = Location.WRITING_OBJ_BNODE;
-    else if(currLocation == Location.PRE_OBJ     && c == '"') ret = Location.WRITING_OBJ_LITERAL;
-
-    // Closing.
-    else if(currLocation == Location.WRITING_SUB_URI     && c == '>') ret = Location.PRE_PRED;
-    else if(currLocation == Location.WRITING_BNODE_URI   && c == ' ') ret = Location.PRE_PRED;
-    else if(currLocation == Location.WRITING_PRED_URI    && c == '>') ret = Location.PRE_OBJ;
-    else if(currLocation == Location.WRITING_OBJ_URI     && c == '>') ret = Location.POST_OBJ;
-    else if(currLocation == Location.WRITING_OBJ_BNODE   && c == ' ') ret = Location.POST_OBJ;
-    else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '"') ret = Location.POST_OBJ;
-    else if(currLocation == Location.WRITING_LIT_LANG && c == ' ') ret = Location.POST_OBJ;
-    else if(currLocation == Location.WRITING_LIT_TYPE && c == '>') ret = Location.POST_OBJ;
-
-    // Closing typed and language literal.
-    else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '@') ret = Location.WRITING_LIT_LANG;
-    else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '^') ret = Location.WRITING_LIT_TYPE;
-
-    // Spaces.
-    else if( c == ' ' &&
-             (
-               currLocation == Location.PRE_SUBJECT ||
-               currLocation == Location.PRE_PRED    ||
-               currLocation == Location.PRE_OBJ     ||
-               currLocation == Location.POST_OBJ
-             )
-           ) ret = currLocation;
-
-    // Reset.
-    else if(currLocation == Location.POST_OBJ && c == '.') ret = Location.PRE_SUBJECT;
-
-    // Error
-    else ret = Location.ERROR;
-
-    currState.location=ret;
-  }
-
-  return {
-    startState: function() {
-       return {
-           location : Location.PRE_SUBJECT,
-           uris     : [],
-           anchors  : [],
-           bnodes   : [],
-           langs    : [],
-           types    : []
-       };
-    },
-    token: function(stream, state) {
-      var ch = stream.next();
-      if(ch == '<') {
-         transitState(state, ch);
-         var parsedURI = '';
-         stream.eatWhile( function(c) { if( c != '#' && c != '>' ) { parsedURI += c; return true; } return false;} );
-         state.uris.push(parsedURI);
-         if( stream.match('#', false) ) return 'variable';
-         stream.next();
-         transitState(state, '>');
-         return 'variable';
-      }
-      if(ch == '#') {
-        var parsedAnchor = '';
-        stream.eatWhile(function(c) { if(c != '>' && c != ' ') { parsedAnchor+= c; return true; } return false;});
-        state.anchors.push(parsedAnchor);
-        return 'variable-2';
-      }
-      if(ch == '>') {
-          transitState(state, '>');
-          return 'variable';
-      }
-      if(ch == '_') {
-          transitState(state, ch);
-          var parsedBNode = '';
-          stream.eatWhile(function(c) { if( c != ' ' ) { parsedBNode += c; return true; } return false;});
-          state.bnodes.push(parsedBNode);
-          stream.next();
-          transitState(state, ' ');
-          return 'builtin';
-      }
-      if(ch == '"') {
-          transitState(state, ch);
-          stream.eatWhile( function(c) { return c != '"'; } );
-          stream.next();
-          if( stream.peek() != '@' && stream.peek() != '^' ) {
-              transitState(state, '"');
-          }
-          return 'string';
-      }
-      if( ch == '@' ) {
-          transitState(state, '@');
-          var parsedLang = '';
-          stream.eatWhile(function(c) { if( c != ' ' ) { parsedLang += c; return true; } return false;});
-          state.langs.push(parsedLang);
-          stream.next();
-          transitState(state, ' ');
-          return 'string-2';
-      }
-      if( ch == '^' ) {
-          stream.next();
-          transitState(state, '^');
-          var parsedType = '';
-          stream.eatWhile(function(c) { if( c != '>' ) { parsedType += c; return true; } return false;} );
-          state.types.push(parsedType);
-          stream.next();
-          transitState(state, '>');
-          return 'variable';
-      }
-      if( ch == ' ' ) {
-          transitState(state, ch);
-      }
-      if( ch == '.' ) {
-          transitState(state, ch);
-      }
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/n-triples", "ntriples");
diff --git a/resources/libs/codemirror/mode/ocaml/index.html b/resources/libs/codemirror/mode/ocaml/index.html
deleted file mode 100644
index 5d39fadd9..000000000
--- a/resources/libs/codemirror/mode/ocaml/index.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: OCaml mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel=stylesheet href=../../lib/codemirror.css>
-<script src=../../lib/codemirror.js></script>
-<script src=../../addon/edit/matchbrackets.js></script>
-<script src=ocaml.js></script>
-<style type=text/css>
-  .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">OCaml</a>
-  </ul>
-</div>
-
-<article>
-<h2>OCaml mode</h2>
-
-
-<textarea id=code>
-(* Summing a list of integers *)
-let rec sum xs =
-  match xs with
-    | []       -&gt; 0
-    | x :: xs' -&gt; x + sum xs'
-
-(* Quicksort *)
-let rec qsort = function
-   | [] -&gt; []
-   | pivot :: rest -&gt;
-       let is_less x = x &lt; pivot in
-       let left, right = List.partition is_less rest in
-       qsort left @ [pivot] @ qsort right
-
-(* Fibonacci Sequence *)
-let rec fib_aux n a b =
-  match n with
-  | 0 -&gt; a
-  | _ -&gt; fib_aux (n - 1) (a + b) a
-let fib n = fib_aux n 0 1
-
-(* Birthday paradox *)
-let year_size = 365.
-
-let rec birthday_paradox prob people =
-    let prob' = (year_size -. float people) /. year_size *. prob  in
-    if prob' &lt; 0.5 then
-        Printf.printf "answer = %d\n" (people+1)
-    else
-        birthday_paradox prob' (people+1) ;;
-
-birthday_paradox 1.0 1
-
-(* Church numerals *)
-let zero f x = x
-let succ n f x = f (n f x)
-let one = succ zero
-let two = succ (succ zero)
-let add n1 n2 f x = n1 f (n2 f x)
-let to_string n = n (fun k -&gt; "S" ^ k) "0"
-let _ = to_string (add (succ two) two)
-
-(* Elementary functions *)
-let square x = x * x;;
-let rec fact x =
-  if x &lt;= 1 then 1 else x * fact (x - 1);;
-
-(* Automatic memory management *)
-let l = 1 :: 2 :: 3 :: [];;
-[1; 2; 3];;
-5 :: l;;
-
-(* Polymorphism: sorting lists *)
-let rec sort = function
-  | [] -&gt; []
-  | x :: l -&gt; insert x (sort l)
-
-and insert elem = function
-  | [] -&gt; [elem]
-  | x :: l -&gt; 
-      if elem &lt; x then elem :: x :: l else x :: insert elem l;;
-
-(* Imperative features *)
-let add_polynom p1 p2 =
-  let n1 = Array.length p1
-  and n2 = Array.length p2 in
-  let result = Array.create (max n1 n2) 0 in
-  for i = 0 to n1 - 1 do result.(i) &lt;- p1.(i) done;
-  for i = 0 to n2 - 1 do result.(i) &lt;- result.(i) + p2.(i) done;
-  result;;
-add_polynom [| 1; 2 |] [| 1; 2; 3 |];;
-
-(* We may redefine fact using a reference cell and a for loop *)
-let fact n =
-  let result = ref 1 in
-  for i = 2 to n do
-    result := i * !result
-   done;
-   !result;;
-fact 5;;
-
-(* Triangle (graphics) *)
-let () =
-  ignore( Glut.init Sys.argv );
-  Glut.initDisplayMode ~double_buffer:true ();
-  ignore (Glut.createWindow ~title:"OpenGL Demo");
-  let angle t = 10. *. t *. t in
-  let render () =
-    GlClear.clear [ `color ];
-    GlMat.load_identity ();
-    GlMat.rotate ~angle: (angle (Sys.time ())) ~z:1. ();
-    GlDraw.begins `triangles;
-    List.iter GlDraw.vertex2 [-1., -1.; 0., 1.; 1., -1.];
-    GlDraw.ends ();
-    Glut.swapBuffers () in
-  GlMat.mode `modelview;
-  Glut.displayFunc ~cb:render;
-  Glut.idleFunc ~cb:(Some Glut.postRedisplay);
-  Glut.mainLoop ()
-
-(* A Hundred Lines of Caml - http://caml.inria.fr/about/taste.en.html *)
-(* OCaml page on Wikipedia - http://en.wikipedia.org/wiki/OCaml *)
-</textarea>
-
-<script>
-  var editor = CodeMirror.fromTextArea(document.getElementById('code'), {
-    mode: 'ocaml',
-    lineNumbers: true,
-    matchBrackets: true
-  });
-</script>
-
-<p><strong>MIME types defined:</strong> <code>text/x-ocaml</code>.</p>
-</article>
diff --git a/resources/libs/codemirror/mode/ocaml/ocaml.js b/resources/libs/codemirror/mode/ocaml/ocaml.js
deleted file mode 100644
index 32cbc0b7b..000000000
--- a/resources/libs/codemirror/mode/ocaml/ocaml.js
+++ /dev/null
@@ -1,116 +0,0 @@
-CodeMirror.defineMode('ocaml', function() {
-
-  var words = {
-    'true': 'atom',
-    'false': 'atom',
-    'let': 'keyword',
-    'rec': 'keyword',
-    'in': 'keyword',
-    'of': 'keyword',
-    'and': 'keyword',
-    'succ': 'keyword',
-    'if': 'keyword',
-    'then': 'keyword',
-    'else': 'keyword',
-    'for': 'keyword',
-    'to': 'keyword',
-    'while': 'keyword',
-    'do': 'keyword',
-    'done': 'keyword',
-    'fun': 'keyword',
-    'function': 'keyword',
-    'val': 'keyword',
-    'type': 'keyword',
-    'mutable': 'keyword',
-    'match': 'keyword',
-    'with': 'keyword',
-    'try': 'keyword',
-    'raise': 'keyword',
-    'begin': 'keyword',
-    'end': 'keyword',
-    'open': 'builtin',
-    'trace': 'builtin',
-    'ignore': 'builtin',
-    'exit': 'builtin',
-    'print_string': 'builtin',
-    'print_endline': 'builtin'
-  };
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-
-    if (ch === '"') {
-      state.tokenize = tokenString;
-      return state.tokenize(stream, state);
-    }
-    if (ch === '(') {
-      if (stream.eat('*')) {
-        state.commentLevel++;
-        state.tokenize = tokenComment;
-        return state.tokenize(stream, state);
-      }
-    }
-    if (ch === '~') {
-      stream.eatWhile(/\w/);
-      return 'variable-2';
-    }
-    if (ch === '`') {
-      stream.eatWhile(/\w/);
-      return 'quote';
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\d]/);
-      if (stream.eat('.')) {
-        stream.eatWhile(/[\d]/);
-      }
-      return 'number';
-    }
-    if ( /[+\-*&%=<>!?|]/.test(ch)) {
-      return 'operator';
-    }
-    stream.eatWhile(/\w/);
-    var cur = stream.current();
-    return words[cur] || 'variable';
-  }
-
-  function tokenString(stream, state) {
-    var next, end = false, escaped = false;
-    while ((next = stream.next()) != null) {
-      if (next === '"' && !escaped) {
-        end = true;
-        break;
-      }
-      escaped = !escaped && next === '\\';
-    }
-    if (end && !escaped) {
-      state.tokenize = tokenBase;
-    }
-    return 'string';
-  };
-
-  function tokenComment(stream, state) {
-    var prev, next;
-    while(state.commentLevel > 0 && (next = stream.next()) != null) {
-      if (prev === '(' && next === '*') state.commentLevel++;
-      if (prev === '*' && next === ')') state.commentLevel--;
-      prev = next;
-    }
-    if (state.commentLevel <= 0) {
-      state.tokenize = tokenBase;
-    }
-    return 'comment';
-  }
-
-  return {
-    startState: function() {return {tokenize: tokenBase, commentLevel: 0};},
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      return state.tokenize(stream, state);
-    },
-
-    blockCommentStart: "(*",
-    blockCommentEnd: "*)"
-  };
-});
-
-CodeMirror.defineMIME('text/x-ocaml', 'ocaml');
diff --git a/resources/libs/codemirror/mode/octave/index.html b/resources/libs/codemirror/mode/octave/index.html
deleted file mode 100644
index bd5a52329..000000000
--- a/resources/libs/codemirror/mode/octave/index.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Octave mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="octave.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Octave</a>
-  </ul>
-</div>
-
-<article>
-<h2>Octave mode</h2>
-
-    <div><textarea id="code" name="code">
-%numbers
-1234
-1234i
-1234j
-.234
-.234j
-2.23i
-23e2
-12E1j
-123D-4
-0x234
-
-%strings
-'asda''a'
-"asda""a"
-
-%identifiers
-a
-as123
-__asd__
-
-%operators
--
-+
-=
-==
->
-<
->=
-<=
-&
-~
-...
-break zeros default margin round ones rand
-ceil floor size clear zeros eye mean std cov
-error eval function
-abs acos atan asin cos cosh exp log prod sum
-log10 max min sign sin sinh sqrt tan reshape
-return
-case switch
-else elseif end if otherwise
-do for while
-try catch
-classdef properties events methods
-global persistent
-
-%one line comment
-...one line comment
-%{ multi 
-line commment %}
-1
-
-    </textarea></div>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "octave",
-               version: 2,
-               singleLineStringErrors: false},
-        lineNumbers: true,
-        indentUnit: 4,
-        tabMode: "shift",
-        matchBrackets: true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-octave</code>.</p>
-</article>
diff --git a/resources/libs/codemirror/mode/octave/octave.js b/resources/libs/codemirror/mode/octave/octave.js
deleted file mode 100644
index 23cd2fe22..000000000
--- a/resources/libs/codemirror/mode/octave/octave.js
+++ /dev/null
@@ -1,118 +0,0 @@
-CodeMirror.defineMode("octave", function() {
-  function wordRegexp(words) {
-    return new RegExp("^((" + words.join(")|(") + "))\\b");
-  }
-
-  var singleOperators = new RegExp("^[\\+\\-\\*/&|\\^~<>!@'\\\\]");
-  var singleDelimiters = new RegExp('^[\\(\\[\\{\\},:=;]');
-  var doubleOperators = new RegExp("^((==)|(~=)|(<=)|(>=)|(<<)|(>>)|(\\.[\\+\\-\\*/\\^\\\\]))");
-  var doubleDelimiters = new RegExp("^((!=)|(\\+=)|(\\-=)|(\\*=)|(/=)|(&=)|(\\|=)|(\\^=))");
-  var tripleDelimiters = new RegExp("^((>>=)|(<<=))");
-  var expressionEnd = new RegExp("^[\\]\\)]");
-  var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
-
-  var builtins = wordRegexp([
-    'error', 'eval', 'function', 'abs', 'acos', 'atan', 'asin', 'cos',
-    'cosh', 'exp', 'log', 'prod', 'log10', 'max', 'min', 'sign', 'sin', 'sinh',
-    'sqrt', 'tan', 'reshape', 'break', 'zeros', 'default', 'margin', 'round', 'ones',
-    'rand', 'syn', 'ceil', 'floor', 'size', 'clear', 'zeros', 'eye', 'mean', 'std', 'cov',
-    'det', 'eig', 'inv', 'norm', 'rank', 'trace', 'expm', 'logm', 'sqrtm', 'linspace', 'plot',
-    'title', 'xlabel', 'ylabel', 'legend', 'text', 'meshgrid', 'mesh', 'num2str'
-  ]);
-
-  var keywords = wordRegexp([
-    'return', 'case', 'switch', 'else', 'elseif', 'end', 'endif', 'endfunction',
-    'if', 'otherwise', 'do', 'for', 'while', 'try', 'catch', 'classdef', 'properties', 'events',
-    'methods', 'global', 'persistent', 'endfor', 'endwhile', 'printf', 'disp', 'until', 'continue'
-  ]);
-
-
-  // tokenizers
-  function tokenTranspose(stream, state) {
-    if (!stream.sol() && stream.peek() === '\'') {
-      stream.next();
-      state.tokenize = tokenBase;
-      return 'operator';
-    }
-    state.tokenize = tokenBase;
-    return tokenBase(stream, state);
-  }
-
-
-  function tokenComment(stream, state) {
-    if (stream.match(/^.*%}/)) {
-      state.tokenize = tokenBase;
-      return 'comment';
-    };
-    stream.skipToEnd();
-    return 'comment';
-  }
-
-  function tokenBase(stream, state) {
-    // whitespaces
-    if (stream.eatSpace()) return null;
-
-    // Handle one line Comments
-    if (stream.match('%{')){
-      state.tokenize = tokenComment;
-      stream.skipToEnd();
-      return 'comment';
-    }
-
-    if (stream.match(/^(%)|(\.\.\.)/)){
-      stream.skipToEnd();
-      return 'comment';
-    }
-
-    // Handle Number Literals
-    if (stream.match(/^[0-9\.+-]/, false)) {
-      if (stream.match(/^[+-]?0x[0-9a-fA-F]+[ij]?/)) {
-        stream.tokenize = tokenBase;
-        return 'number'; };
-      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?[ij]?/)) { return 'number'; };
-      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?[ij]?/)) { return 'number'; };
-    }
-    if (stream.match(wordRegexp(['nan','NaN','inf','Inf']))) { return 'number'; };
-
-    // Handle Strings
-    if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; } ;
-    if (stream.match(/^'([^']|(''))*'/)) { return 'string'; } ;
-
-    // Handle words
-    if (stream.match(keywords)) { return 'keyword'; } ;
-    if (stream.match(builtins)) { return 'builtin'; } ;
-    if (stream.match(identifiers)) { return 'variable'; } ;
-
-    if (stream.match(singleOperators) || stream.match(doubleOperators)) { return 'operator'; };
-    if (stream.match(singleDelimiters) || stream.match(doubleDelimiters) || stream.match(tripleDelimiters)) { return null; };
-
-    if (stream.match(expressionEnd)) {
-      state.tokenize = tokenTranspose;
-      return null;
-    };
-
-
-    // Handle non-detected items
-    stream.next();
-    return 'error';
-  };
-
-
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase
-      };
-    },
-
-    token: function(stream, state) {
-      var style = state.tokenize(stream, state);
-      if (style === 'number' || style === 'variable'){
-        state.tokenize = tokenTranspose;
-      }
-      return style;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-octave", "octave");
diff --git a/resources/libs/codemirror/mode/pascal/index.html b/resources/libs/codemirror/mode/pascal/index.html
deleted file mode 100644
index bf8ff0d63..000000000
--- a/resources/libs/codemirror/mode/pascal/index.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Pascal mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="pascal.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Pascal</a>
-  </ul>
-</div>
-
-<article>
-<h2>Pascal mode</h2>
-
-
-<div><textarea id="code" name="code">
-(* Example Pascal code *)
-
-while a <> b do writeln('Waiting');
- 
-if a > b then 
-  writeln('Condition met')
-else 
-  writeln('Condition not met');
- 
-for i := 1 to 10 do 
-  writeln('Iteration: ', i:1);
- 
-repeat
-  a := a + 1
-until a = 10;
- 
-case i of
-  0: write('zero');
-  1: write('one');
-  2: write('two')
-end;
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "text/x-pascal"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-pascal</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/pascal/pascal.js b/resources/libs/codemirror/mode/pascal/pascal.js
deleted file mode 100644
index 09d9b0617..000000000
--- a/resources/libs/codemirror/mode/pascal/pascal.js
+++ /dev/null
@@ -1,94 +0,0 @@
-CodeMirror.defineMode("pascal", function() {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var keywords = words("and array begin case const div do downto else end file for forward integer " +
-                       "boolean char function goto if in label mod nil not of or packed procedure " +
-                       "program record repeat set string then to type until var while with");
-  var atoms = {"null": true};
-
-  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == "#" && state.startOfLine) {
-      stream.skipToEnd();
-      return "meta";
-    }
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (ch == "(" && stream.eat("*")) {
-      state.tokenize = tokenComment;
-      return tokenComment(stream, state);
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) return "keyword";
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return "variable";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !escaped) state.tokenize = null;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == ")" && maybeEnd) {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  // Interface
-
-  return {
-    startState: function() {
-      return {tokenize: null};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
-      return style;
-    },
-
-    electricChars: "{}"
-  };
-});
-
-CodeMirror.defineMIME("text/x-pascal", "pascal");
diff --git a/resources/libs/codemirror/mode/pegjs/index.html b/resources/libs/codemirror/mode/pegjs/index.html
deleted file mode 100644
index 678b714d8..000000000
--- a/resources/libs/codemirror/mode/pegjs/index.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>CodeMirror: PEG.js Mode</title>
-    <meta charset="utf-8"/>
-    <link rel=stylesheet href="../../doc/docs.css">
-
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../javascript/javascript.js"></script>
-    <script src="pegjs.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <div id=nav>
-      <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-      <ul>
-        <li><a href="../../index.html">Home</a>
-        <li><a href="../../doc/manual.html">Manual</a>
-        <li><a href="https://github.com/marijnh/codemirror">Code</a>
-      </ul>
-      <ul>
-        <li><a href="../index.html">Language modes</a>
-        <li><a class=active href="#">PEG.js Mode</a>
-      </ul>
-    </div>
-
-    <article>
-      <h2>PEG.js Mode</h2>
-      <form><textarea id="code" name="code">
-/*
- * Classic example grammar, which recognizes simple arithmetic expressions like
- * "2*(3+4)". The parser generated from this grammar then computes their value.
- */
-
-start
-  = additive
-
-additive
-  = left:multiplicative "+" right:additive { return left + right; }
-  / multiplicative
-
-multiplicative
-  = left:primary "*" right:multiplicative { return left * right; }
-  / primary
-
-primary
-  = integer
-  / "(" additive:additive ")" { return additive; }
-
-integer "integer"
-  = digits:[0-9]+ { return parseInt(digits.join(""), 10); }
-
-letter = [a-z]+</textarea></form>
-      <script>
-        var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-          mode: {name: "pegjs"},
-          lineNumbers: true
-        });
-      </script>
-      <h3>The PEG.js Mode</h3>
-      <p> Created by Forbes Lindesay.</p>
-    </article>
-  </body>
-</html>
diff --git a/resources/libs/codemirror/mode/pegjs/pegjs.js b/resources/libs/codemirror/mode/pegjs/pegjs.js
deleted file mode 100644
index 6cdcc61f3..000000000
--- a/resources/libs/codemirror/mode/pegjs/pegjs.js
+++ /dev/null
@@ -1,103 +0,0 @@
-CodeMirror.defineMode("pegjs", function (config) {
-  var jsMode = CodeMirror.getMode(config, "javascript");
-
-  function identifier(stream) {
-    return stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/);
-  }
-
-  return {
-    startState: function () {
-      return {
-        inString: false,
-        stringType: null,
-        inComment: false,
-        inChracterClass: false,
-        braced: 0,
-        lhs: true,
-        localState: null
-      };
-    },
-    token: function (stream, state) {
-      if (stream)
-
-      //check for state changes
-      if (!state.inString && !state.inComment && ((stream.peek() == '"') || (stream.peek() == "'"))) {
-        state.stringType = stream.peek();
-        stream.next(); // Skip quote
-        state.inString = true; // Update state
-      }
-      if (!state.inString && !state.inComment && stream.match(/^\/\*/)) {
-        state.inComment = true;
-      }
-
-      //return state
-      if (state.inString) {
-        while (state.inString && !stream.eol()) {
-          if (stream.peek() === state.stringType) {
-            stream.next(); // Skip quote
-            state.inString = false; // Clear flag
-          } else if (stream.peek() === '\\') {
-            stream.next();
-            stream.next();
-          } else {
-            stream.match(/^.[^\\\"\']*/);
-          }
-        }
-        return state.lhs ? "property string" : "string"; // Token style
-      } else if (state.inComment) {
-        while (state.inComment && !stream.eol()) {
-          if (stream.match(/\*\//)) {
-            state.inComment = false; // Clear flag
-          } else {
-            stream.match(/^.[^\*]*/);
-          }
-        }
-        return "comment";
-      } else if (state.inChracterClass) {
-        if (stream.match(/^[^\]\\]+/)) {
-          return;
-        } else if (stream.match(/^\\./)) {
-          return;
-        } else {
-          stream.next();
-          state.inChracterClass = false;
-          return 'bracket';
-        }
-      } else if (stream.peek() === '[') {
-        stream.next();
-        state.inChracterClass = true;
-        return 'bracket';
-      } else if (stream.match(/^\/\//)) {
-        stream.skipToEnd();
-        return "comment";
-      } else if (state.braced || stream.peek() === '{') {
-        if (state.localState === null) {
-          state.localState = jsMode.startState();
-        }
-        var token = jsMode.token(stream, state.localState);
-        var text = stream.current();
-        if (!token) {
-          for (var i = 0; i < text.length; i++) {
-            if (text[i] === '{') {
-              state.braced++;
-            } else if (text[i] === '}') {
-              state.braced--;
-            }
-          };
-        }
-        return token;
-      } else if (identifier(stream)) {
-        if (stream.peek() === ':') {
-          return 'variable';
-        }
-        return 'variable-2';
-      } else if (['[', ']', '(', ')'].indexOf(stream.peek()) != -1) {
-        stream.next();
-        return 'bracket';
-      } else if (!stream.eatSpace()) {
-        stream.next();
-      }
-      return null;
-    }
-  };
-}, "javascript");
diff --git a/resources/libs/codemirror/mode/perl/index.html b/resources/libs/codemirror/mode/perl/index.html
deleted file mode 100644
index 2b7578efe..000000000
--- a/resources/libs/codemirror/mode/perl/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Perl mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="perl.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Perl</a>
-  </ul>
-</div>
-
-<article>
-<h2>Perl mode</h2>
-
-
-<div><textarea id="code" name="code">
-#!/usr/bin/perl
-
-use Something qw(func1 func2);
-
-# strings
-my $s1 = qq'single line';
-our $s2 = q(multi-
-              line);
-
-=item Something
-	Example.
-=cut
-
-my $html=<<'HTML'
-<html>
-<title>hi!</title>
-</html>
-HTML
-
-print "first,".join(',', 'second', qq~third~);
-
-if($s1 =~ m[(?<!\s)(l.ne)\z]o) {
-	$h->{$1}=$$.' predefined variables';
-	$s2 =~ s/\-line//ox;
-	$s1 =~ s[
-		  line ]
-		[
-		  block
-		]ox;
-}
-
-1; # numbers and comments
-
-__END__
-something...
-
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-perl</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/perl/perl.js b/resources/libs/codemirror/mode/perl/perl.js
deleted file mode 100644
index 5954b1a61..000000000
--- a/resources/libs/codemirror/mode/perl/perl.js
+++ /dev/null
@@ -1,816 +0,0 @@
-// CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
-// This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com)
-CodeMirror.defineMode("perl",function(){
-        // http://perldoc.perl.org
-        var PERL={                                      //   null - magic touch
-                                                        //   1 - keyword
-                                                        //   2 - def
-                                                        //   3 - atom
-                                                        //   4 - operator
-                                                        //   5 - variable-2 (predefined)
-                                                        //   [x,y] - x=1,2,3; y=must be defined if x{...}
-                                                //      PERL operators
-                '->'                            :   4,
-                '++'                            :   4,
-                '--'                            :   4,
-                '**'                            :   4,
-                                                        //   ! ~ \ and unary + and -
-                '=~'                            :   4,
-                '!~'                            :   4,
-                '*'                             :   4,
-                '/'                             :   4,
-                '%'                             :   4,
-                'x'                             :   4,
-                '+'                             :   4,
-                '-'                             :   4,
-                '.'                             :   4,
-                '<<'                            :   4,
-                '>>'                            :   4,
-                                                        //   named unary operators
-                '<'                             :   4,
-                '>'                             :   4,
-                '<='                            :   4,
-                '>='                            :   4,
-                'lt'                            :   4,
-                'gt'                            :   4,
-                'le'                            :   4,
-                'ge'                            :   4,
-                '=='                            :   4,
-                '!='                            :   4,
-                '<=>'                           :   4,
-                'eq'                            :   4,
-                'ne'                            :   4,
-                'cmp'                           :   4,
-                '~~'                            :   4,
-                '&'                             :   4,
-                '|'                             :   4,
-                '^'                             :   4,
-                '&&'                            :   4,
-                '||'                            :   4,
-                '//'                            :   4,
-                '..'                            :   4,
-                '...'                           :   4,
-                '?'                             :   4,
-                ':'                             :   4,
-                '='                             :   4,
-                '+='                            :   4,
-                '-='                            :   4,
-                '*='                            :   4,  //   etc. ???
-                ','                             :   4,
-                '=>'                            :   4,
-                '::'                            :   4,
-                                                        //   list operators (rightward)
-                'not'                           :   4,
-                'and'                           :   4,
-                'or'                            :   4,
-                'xor'                           :   4,
-                                                //      PERL predefined variables (I know, what this is a paranoid idea, but may be needed for people, who learn PERL, and for me as well, ...and may be for you?;)
-                'BEGIN'                         :   [5,1],
-                'END'                           :   [5,1],
-                'PRINT'                         :   [5,1],
-                'PRINTF'                        :   [5,1],
-                'GETC'                          :   [5,1],
-                'READ'                          :   [5,1],
-                'READLINE'                      :   [5,1],
-                'DESTROY'                       :   [5,1],
-                'TIE'                           :   [5,1],
-                'TIEHANDLE'                     :   [5,1],
-                'UNTIE'                         :   [5,1],
-                'STDIN'                         :    5,
-                'STDIN_TOP'                     :    5,
-                'STDOUT'                        :    5,
-                'STDOUT_TOP'                    :    5,
-                'STDERR'                        :    5,
-                'STDERR_TOP'                    :    5,
-                '$ARG'                          :    5,
-                '$_'                            :    5,
-                '@ARG'                          :    5,
-                '@_'                            :    5,
-                '$LIST_SEPARATOR'               :    5,
-                '$"'                            :    5,
-                '$PROCESS_ID'                   :    5,
-                '$PID'                          :    5,
-                '$$'                            :    5,
-                '$REAL_GROUP_ID'                :    5,
-                '$GID'                          :    5,
-                '$('                            :    5,
-                '$EFFECTIVE_GROUP_ID'           :    5,
-                '$EGID'                         :    5,
-                '$)'                            :    5,
-                '$PROGRAM_NAME'                 :    5,
-                '$0'                            :    5,
-                '$SUBSCRIPT_SEPARATOR'          :    5,
-                '$SUBSEP'                       :    5,
-                '$;'                            :    5,
-                '$REAL_USER_ID'                 :    5,
-                '$UID'                          :    5,
-                '$<'                            :    5,
-                '$EFFECTIVE_USER_ID'            :    5,
-                '$EUID'                         :    5,
-                '$>'                            :    5,
-                '$a'                            :    5,
-                '$b'                            :    5,
-                '$COMPILING'                    :    5,
-                '$^C'                           :    5,
-                '$DEBUGGING'                    :    5,
-                '$^D'                           :    5,
-                '${^ENCODING}'                  :    5,
-                '$ENV'                          :    5,
-                '%ENV'                          :    5,
-                '$SYSTEM_FD_MAX'                :    5,
-                '$^F'                           :    5,
-                '@F'                            :    5,
-                '${^GLOBAL_PHASE}'              :    5,
-                '$^H'                           :    5,
-                '%^H'                           :    5,
-                '@INC'                          :    5,
-                '%INC'                          :    5,
-                '$INPLACE_EDIT'                 :    5,
-                '$^I'                           :    5,
-                '$^M'                           :    5,
-                '$OSNAME'                       :    5,
-                '$^O'                           :    5,
-                '${^OPEN}'                      :    5,
-                '$PERLDB'                       :    5,
-                '$^P'                           :    5,
-                '$SIG'                          :    5,
-                '%SIG'                          :    5,
-                '$BASETIME'                     :    5,
-                '$^T'                           :    5,
-                '${^TAINT}'                     :    5,
-                '${^UNICODE}'                   :    5,
-                '${^UTF8CACHE}'                 :    5,
-                '${^UTF8LOCALE}'                :    5,
-                '$PERL_VERSION'                 :    5,
-                '$^V'                           :    5,
-                '${^WIN32_SLOPPY_STAT}'         :    5,
-                '$EXECUTABLE_NAME'              :    5,
-                '$^X'                           :    5,
-                '$1'                            :    5, // - regexp $1, $2...
-                '$MATCH'                        :    5,
-                '$&'                            :    5,
-                '${^MATCH}'                     :    5,
-                '$PREMATCH'                     :    5,
-                '$`'                            :    5,
-                '${^PREMATCH}'                  :    5,
-                '$POSTMATCH'                    :    5,
-                "$'"                            :    5,
-                '${^POSTMATCH}'                 :    5,
-                '$LAST_PAREN_MATCH'             :    5,
-                '$+'                            :    5,
-                '$LAST_SUBMATCH_RESULT'         :    5,
-                '$^N'                           :    5,
-                '@LAST_MATCH_END'               :    5,
-                '@+'                            :    5,
-                '%LAST_PAREN_MATCH'             :    5,
-                '%+'                            :    5,
-                '@LAST_MATCH_START'             :    5,
-                '@-'                            :    5,
-                '%LAST_MATCH_START'             :    5,
-                '%-'                            :    5,
-                '$LAST_REGEXP_CODE_RESULT'      :    5,
-                '$^R'                           :    5,
-                '${^RE_DEBUG_FLAGS}'            :    5,
-                '${^RE_TRIE_MAXBUF}'            :    5,
-                '$ARGV'                         :    5,
-                '@ARGV'                         :    5,
-                'ARGV'                          :    5,
-                'ARGVOUT'                       :    5,
-                '$OUTPUT_FIELD_SEPARATOR'       :    5,
-                '$OFS'                          :    5,
-                '$,'                            :    5,
-                '$INPUT_LINE_NUMBER'            :    5,
-                '$NR'                           :    5,
-                '$.'                            :    5,
-                '$INPUT_RECORD_SEPARATOR'       :    5,
-                '$RS'                           :    5,
-                '$/'                            :    5,
-                '$OUTPUT_RECORD_SEPARATOR'      :    5,
-                '$ORS'                          :    5,
-                '$\\'                           :    5,
-                '$OUTPUT_AUTOFLUSH'             :    5,
-                '$|'                            :    5,
-                '$ACCUMULATOR'                  :    5,
-                '$^A'                           :    5,
-                '$FORMAT_FORMFEED'              :    5,
-                '$^L'                           :    5,
-                '$FORMAT_PAGE_NUMBER'           :    5,
-                '$%'                            :    5,
-                '$FORMAT_LINES_LEFT'            :    5,
-                '$-'                            :    5,
-                '$FORMAT_LINE_BREAK_CHARACTERS' :    5,
-                '$:'                            :    5,
-                '$FORMAT_LINES_PER_PAGE'        :    5,
-                '$='                            :    5,
-                '$FORMAT_TOP_NAME'              :    5,
-                '$^'                            :    5,
-                '$FORMAT_NAME'                  :    5,
-                '$~'                            :    5,
-                '${^CHILD_ERROR_NATIVE}'        :    5,
-                '$EXTENDED_OS_ERROR'            :    5,
-                '$^E'                           :    5,
-                '$EXCEPTIONS_BEING_CAUGHT'      :    5,
-                '$^S'                           :    5,
-                '$WARNING'                      :    5,
-                '$^W'                           :    5,
-                '${^WARNING_BITS}'              :    5,
-                '$OS_ERROR'                     :    5,
-                '$ERRNO'                        :    5,
-                '$!'                            :    5,
-                '%OS_ERROR'                     :    5,
-                '%ERRNO'                        :    5,
-                '%!'                            :    5,
-                '$CHILD_ERROR'                  :    5,
-                '$?'                            :    5,
-                '$EVAL_ERROR'                   :    5,
-                '$@'                            :    5,
-                '$OFMT'                         :    5,
-                '$#'                            :    5,
-                '$*'                            :    5,
-                '$ARRAY_BASE'                   :    5,
-                '$['                            :    5,
-                '$OLD_PERL_VERSION'             :    5,
-                '$]'                            :    5,
-                                                //      PERL blocks
-                'if'                            :[1,1],
-                elsif                           :[1,1],
-                'else'                          :[1,1],
-                'while'                         :[1,1],
-                unless                          :[1,1],
-                'for'                           :[1,1],
-                foreach                         :[1,1],
-                                                //      PERL functions
-                'abs'                           :1,     // - absolute value function
-                accept                          :1,     // - accept an incoming socket connect
-                alarm                           :1,     // - schedule a SIGALRM
-                'atan2'                         :1,     // - arctangent of Y/X in the range -PI to PI
-                bind                            :1,     // - binds an address to a socket
-                binmode                         :1,     // - prepare binary files for I/O
-                bless                           :1,     // - create an object
-                bootstrap                       :1,     //
-                'break'                         :1,     // - break out of a "given" block
-                caller                          :1,     // - get context of the current subroutine call
-                chdir                           :1,     // - change your current working directory
-                chmod                           :1,     // - changes the permissions on a list of files
-                chomp                           :1,     // - remove a trailing record separator from a string
-                chop                            :1,     // - remove the last character from a string
-                chown                           :1,     // - change the owership on a list of files
-                chr                             :1,     // - get character this number represents
-                chroot                          :1,     // - make directory new root for path lookups
-                close                           :1,     // - close file (or pipe or socket) handle
-                closedir                        :1,     // - close directory handle
-                connect                         :1,     // - connect to a remote socket
-                'continue'                      :[1,1], // - optional trailing block in a while or foreach
-                'cos'                           :1,     // - cosine function
-                crypt                           :1,     // - one-way passwd-style encryption
-                dbmclose                        :1,     // - breaks binding on a tied dbm file
-                dbmopen                         :1,     // - create binding on a tied dbm file
-                'default'                       :1,     //
-                defined                         :1,     // - test whether a value, variable, or function is defined
-                'delete'                        :1,     // - deletes a value from a hash
-                die                             :1,     // - raise an exception or bail out
-                'do'                            :1,     // - turn a BLOCK into a TERM
-                dump                            :1,     // - create an immediate core dump
-                each                            :1,     // - retrieve the next key/value pair from a hash
-                endgrent                        :1,     // - be done using group file
-                endhostent                      :1,     // - be done using hosts file
-                endnetent                       :1,     // - be done using networks file
-                endprotoent                     :1,     // - be done using protocols file
-                endpwent                        :1,     // - be done using passwd file
-                endservent                      :1,     // - be done using services file
-                eof                             :1,     // - test a filehandle for its end
-                'eval'                          :1,     // - catch exceptions or compile and run code
-                'exec'                          :1,     // - abandon this program to run another
-                exists                          :1,     // - test whether a hash key is present
-                exit                            :1,     // - terminate this program
-                'exp'                           :1,     // - raise I to a power
-                fcntl                           :1,     // - file control system call
-                fileno                          :1,     // - return file descriptor from filehandle
-                flock                           :1,     // - lock an entire file with an advisory lock
-                fork                            :1,     // - create a new process just like this one
-                format                          :1,     // - declare a picture format with use by the write() function
-                formline                        :1,     // - internal function used for formats
-                getc                            :1,     // - get the next character from the filehandle
-                getgrent                        :1,     // - get next group record
-                getgrgid                        :1,     // - get group record given group user ID
-                getgrnam                        :1,     // - get group record given group name
-                gethostbyaddr                   :1,     // - get host record given its address
-                gethostbyname                   :1,     // - get host record given name
-                gethostent                      :1,     // - get next hosts record
-                getlogin                        :1,     // - return who logged in at this tty
-                getnetbyaddr                    :1,     // - get network record given its address
-                getnetbyname                    :1,     // - get networks record given name
-                getnetent                       :1,     // - get next networks record
-                getpeername                     :1,     // - find the other end of a socket connection
-                getpgrp                         :1,     // - get process group
-                getppid                         :1,     // - get parent process ID
-                getpriority                     :1,     // - get current nice value
-                getprotobyname                  :1,     // - get protocol record given name
-                getprotobynumber                :1,     // - get protocol record numeric protocol
-                getprotoent                     :1,     // - get next protocols record
-                getpwent                        :1,     // - get next passwd record
-                getpwnam                        :1,     // - get passwd record given user login name
-                getpwuid                        :1,     // - get passwd record given user ID
-                getservbyname                   :1,     // - get services record given its name
-                getservbyport                   :1,     // - get services record given numeric port
-                getservent                      :1,     // - get next services record
-                getsockname                     :1,     // - retrieve the sockaddr for a given socket
-                getsockopt                      :1,     // - get socket options on a given socket
-                given                           :1,     //
-                glob                            :1,     // - expand filenames using wildcards
-                gmtime                          :1,     // - convert UNIX time into record or string using Greenwich time
-                'goto'                          :1,     // - create spaghetti code
-                grep                            :1,     // - locate elements in a list test true against a given criterion
-                hex                             :1,     // - convert a string to a hexadecimal number
-                'import'                        :1,     // - patch a module's namespace into your own
-                index                           :1,     // - find a substring within a string
-                'int'                           :1,     // - get the integer portion of a number
-                ioctl                           :1,     // - system-dependent device control system call
-                'join'                          :1,     // - join a list into a string using a separator
-                keys                            :1,     // - retrieve list of indices from a hash
-                kill                            :1,     // - send a signal to a process or process group
-                last                            :1,     // - exit a block prematurely
-                lc                              :1,     // - return lower-case version of a string
-                lcfirst                         :1,     // - return a string with just the next letter in lower case
-                length                          :1,     // - return the number of bytes in a string
-                'link'                          :1,     // - create a hard link in the filesytem
-                listen                          :1,     // - register your socket as a server
-                local                           : 2,    // - create a temporary value for a global variable (dynamic scoping)
-                localtime                       :1,     // - convert UNIX time into record or string using local time
-                lock                            :1,     // - get a thread lock on a variable, subroutine, or method
-                'log'                           :1,     // - retrieve the natural logarithm for a number
-                lstat                           :1,     // - stat a symbolic link
-                m                               :null,  // - match a string with a regular expression pattern
-                map                             :1,     // - apply a change to a list to get back a new list with the changes
-                mkdir                           :1,     // - create a directory
-                msgctl                          :1,     // - SysV IPC message control operations
-                msgget                          :1,     // - get SysV IPC message queue
-                msgrcv                          :1,     // - receive a SysV IPC message from a message queue
-                msgsnd                          :1,     // - send a SysV IPC message to a message queue
-                my                              : 2,    // - declare and assign a local variable (lexical scoping)
-                'new'                           :1,     //
-                next                            :1,     // - iterate a block prematurely
-                no                              :1,     // - unimport some module symbols or semantics at compile time
-                oct                             :1,     // - convert a string to an octal number
-                open                            :1,     // - open a file, pipe, or descriptor
-                opendir                         :1,     // - open a directory
-                ord                             :1,     // - find a character's numeric representation
-                our                             : 2,    // - declare and assign a package variable (lexical scoping)
-                pack                            :1,     // - convert a list into a binary representation
-                'package'                       :1,     // - declare a separate global namespace
-                pipe                            :1,     // - open a pair of connected filehandles
-                pop                             :1,     // - remove the last element from an array and return it
-                pos                             :1,     // - find or set the offset for the last/next m//g search
-                print                           :1,     // - output a list to a filehandle
-                printf                          :1,     // - output a formatted list to a filehandle
-                prototype                       :1,     // - get the prototype (if any) of a subroutine
-                push                            :1,     // - append one or more elements to an array
-                q                               :null,  // - singly quote a string
-                qq                              :null,  // - doubly quote a string
-                qr                              :null,  // - Compile pattern
-                quotemeta                       :null,  // - quote regular expression magic characters
-                qw                              :null,  // - quote a list of words
-                qx                              :null,  // - backquote quote a string
-                rand                            :1,     // - retrieve the next pseudorandom number
-                read                            :1,     // - fixed-length buffered input from a filehandle
-                readdir                         :1,     // - get a directory from a directory handle
-                readline                        :1,     // - fetch a record from a file
-                readlink                        :1,     // - determine where a symbolic link is pointing
-                readpipe                        :1,     // - execute a system command and collect standard output
-                recv                            :1,     // - receive a message over a Socket
-                redo                            :1,     // - start this loop iteration over again
-                ref                             :1,     // - find out the type of thing being referenced
-                rename                          :1,     // - change a filename
-                require                         :1,     // - load in external functions from a library at runtime
-                reset                           :1,     // - clear all variables of a given name
-                'return'                        :1,     // - get out of a function early
-                reverse                         :1,     // - flip a string or a list
-                rewinddir                       :1,     // - reset directory handle
-                rindex                          :1,     // - right-to-left substring search
-                rmdir                           :1,     // - remove a directory
-                s                               :null,  // - replace a pattern with a string
-                say                             :1,     // - print with newline
-                scalar                          :1,     // - force a scalar context
-                seek                            :1,     // - reposition file pointer for random-access I/O
-                seekdir                         :1,     // - reposition directory pointer
-                select                          :1,     // - reset default output or do I/O multiplexing
-                semctl                          :1,     // - SysV semaphore control operations
-                semget                          :1,     // - get set of SysV semaphores
-                semop                           :1,     // - SysV semaphore operations
-                send                            :1,     // - send a message over a socket
-                setgrent                        :1,     // - prepare group file for use
-                sethostent                      :1,     // - prepare hosts file for use
-                setnetent                       :1,     // - prepare networks file for use
-                setpgrp                         :1,     // - set the process group of a process
-                setpriority                     :1,     // - set a process's nice value
-                setprotoent                     :1,     // - prepare protocols file for use
-                setpwent                        :1,     // - prepare passwd file for use
-                setservent                      :1,     // - prepare services file for use
-                setsockopt                      :1,     // - set some socket options
-                shift                           :1,     // - remove the first element of an array, and return it
-                shmctl                          :1,     // - SysV shared memory operations
-                shmget                          :1,     // - get SysV shared memory segment identifier
-                shmread                         :1,     // - read SysV shared memory
-                shmwrite                        :1,     // - write SysV shared memory
-                shutdown                        :1,     // - close down just half of a socket connection
-                'sin'                           :1,     // - return the sine of a number
-                sleep                           :1,     // - block for some number of seconds
-                socket                          :1,     // - create a socket
-                socketpair                      :1,     // - create a pair of sockets
-                'sort'                          :1,     // - sort a list of values
-                splice                          :1,     // - add or remove elements anywhere in an array
-                'split'                         :1,     // - split up a string using a regexp delimiter
-                sprintf                         :1,     // - formatted print into a string
-                'sqrt'                          :1,     // - square root function
-                srand                           :1,     // - seed the random number generator
-                stat                            :1,     // - get a file's status information
-                state                           :1,     // - declare and assign a state variable (persistent lexical scoping)
-                study                           :1,     // - optimize input data for repeated searches
-                'sub'                           :1,     // - declare a subroutine, possibly anonymously
-                'substr'                        :1,     // - get or alter a portion of a stirng
-                symlink                         :1,     // - create a symbolic link to a file
-                syscall                         :1,     // - execute an arbitrary system call
-                sysopen                         :1,     // - open a file, pipe, or descriptor
-                sysread                         :1,     // - fixed-length unbuffered input from a filehandle
-                sysseek                         :1,     // - position I/O pointer on handle used with sysread and syswrite
-                system                          :1,     // - run a separate program
-                syswrite                        :1,     // - fixed-length unbuffered output to a filehandle
-                tell                            :1,     // - get current seekpointer on a filehandle
-                telldir                         :1,     // - get current seekpointer on a directory handle
-                tie                             :1,     // - bind a variable to an object class
-                tied                            :1,     // - get a reference to the object underlying a tied variable
-                time                            :1,     // - return number of seconds since 1970
-                times                           :1,     // - return elapsed time for self and child processes
-                tr                              :null,  // - transliterate a string
-                truncate                        :1,     // - shorten a file
-                uc                              :1,     // - return upper-case version of a string
-                ucfirst                         :1,     // - return a string with just the next letter in upper case
-                umask                           :1,     // - set file creation mode mask
-                undef                           :1,     // - remove a variable or function definition
-                unlink                          :1,     // - remove one link to a file
-                unpack                          :1,     // - convert binary structure into normal perl variables
-                unshift                         :1,     // - prepend more elements to the beginning of a list
-                untie                           :1,     // - break a tie binding to a variable
-                use                             :1,     // - load in a module at compile time
-                utime                           :1,     // - set a file's last access and modify times
-                values                          :1,     // - return a list of the values in a hash
-                vec                             :1,     // - test or set particular bits in a string
-                wait                            :1,     // - wait for any child process to die
-                waitpid                         :1,     // - wait for a particular child process to die
-                wantarray                       :1,     // - get void vs scalar vs list context of current subroutine call
-                warn                            :1,     // - print debugging info
-                when                            :1,     //
-                write                           :1,     // - print a picture record
-                y                               :null}; // - transliterate a string
-
-        var RXstyle="string-2";
-        var RXmodifiers=/[goseximacplud]/;              // NOTE: "m", "s", "y" and "tr" need to correct real modifiers for each regexp type
-
-        function tokenChain(stream,state,chain,style,tail){     // NOTE: chain.length > 2 is not working now (it's for s[...][...]geos;)
-                state.chain=null;                               //                                                          12   3tail
-                state.style=null;
-                state.tail=null;
-                state.tokenize=function(stream,state){
-                        var e=false,c,i=0;
-                        while(c=stream.next()){
-                                if(c===chain[i]&&!e){
-                                        if(chain[++i]!==undefined){
-                                                state.chain=chain[i];
-                                                state.style=style;
-                                                state.tail=tail;}
-                                        else if(tail)
-                                                stream.eatWhile(tail);
-                                        state.tokenize=tokenPerl;
-                                        return style;}
-                                e=!e&&c=="\\";}
-                        return style;};
-                return state.tokenize(stream,state);}
-
-        function tokenSOMETHING(stream,state,string){
-                state.tokenize=function(stream,state){
-                        if(stream.string==string)
-                                state.tokenize=tokenPerl;
-                        stream.skipToEnd();
-                        return "string";};
-                return state.tokenize(stream,state);}
-
-        function tokenPerl(stream,state){
-                if(stream.eatSpace())
-                        return null;
-                if(state.chain)
-                        return tokenChain(stream,state,state.chain,state.style,state.tail);
-                if(stream.match(/^\-?[\d\.]/,false))
-                        if(stream.match(/^(\-?(\d*\.\d+(e[+-]?\d+)?|\d+\.\d*)|0x[\da-fA-F]+|0b[01]+|\d+(e[+-]?\d+)?)/))
-                                return 'number';
-                if(stream.match(/^<<(?=\w)/)){                  // NOTE: <<SOMETHING\n...\nSOMETHING\n
-                        stream.eatWhile(/\w/);
-                        return tokenSOMETHING(stream,state,stream.current().substr(2));}
-                if(stream.sol()&&stream.match(/^\=item(?!\w)/)){// NOTE: \n=item...\n=cut\n
-                        return tokenSOMETHING(stream,state,'=cut');}
-                var ch=stream.next();
-                if(ch=='"'||ch=="'"){                           // NOTE: ' or " or <<'SOMETHING'\n...\nSOMETHING\n or <<"SOMETHING"\n...\nSOMETHING\n
-                        if(stream.prefix(3)=="<<"+ch){
-                                var p=stream.pos;
-                                stream.eatWhile(/\w/);
-                                var n=stream.current().substr(1);
-                                if(n&&stream.eat(ch))
-                                        return tokenSOMETHING(stream,state,n);
-                                stream.pos=p;}
-                        return tokenChain(stream,state,[ch],"string");}
-                if(ch=="q"){
-                        var c=stream.look(-2);
-                        if(!(c&&/\w/.test(c))){
-                                c=stream.look(0);
-                                if(c=="x"){
-                                        c=stream.look(1);
-                                        if(c=="("){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
-                                        if(c=="["){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
-                                        if(c=="{"){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
-                                        if(c=="<"){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
-                                                return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
-                                else if(c=="q"){
-                                        c=stream.look(1);
-                                        if(c=="("){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,[")"],"string");}
-                                        if(c=="["){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,["]"],"string");}
-                                        if(c=="{"){
-stream.eatSuffix(2);
-                                                return tokenChain(stream,state,["}"],"string");}
-                                        if(c=="<"){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,[">"],"string");}
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
-                                                return tokenChain(stream,state,[stream.eat(c)],"string");}}
-                                else if(c=="w"){
-                                        c=stream.look(1);
-                                        if(c=="("){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,[")"],"bracket");}
-                                        if(c=="["){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,["]"],"bracket");}
-                                        if(c=="{"){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,["}"],"bracket");}
-                                        if(c=="<"){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,[">"],"bracket");}
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
-                                                return tokenChain(stream,state,[stream.eat(c)],"bracket");}}
-                                else if(c=="r"){
-                                        c=stream.look(1);
-                                        if(c=="("){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
-                                        if(c=="["){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
-                                        if(c=="{"){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
-                                        if(c=="<"){
-                                                stream.eatSuffix(2);
-                                                return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
-                                                return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
-                                else if(/[\^'"!~\/(\[{<]/.test(c)){
-                                        if(c=="("){
-                                                stream.eatSuffix(1);
-                                                return tokenChain(stream,state,[")"],"string");}
-                                        if(c=="["){
-                                                stream.eatSuffix(1);
-                                                return tokenChain(stream,state,["]"],"string");}
-                                        if(c=="{"){
-                                                stream.eatSuffix(1);
-                                                return tokenChain(stream,state,["}"],"string");}
-                                        if(c=="<"){
-                                                stream.eatSuffix(1);
-                                                return tokenChain(stream,state,[">"],"string");}
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                return tokenChain(stream,state,[stream.eat(c)],"string");}}}}
-                if(ch=="m"){
-                        var c=stream.look(-2);
-                        if(!(c&&/\w/.test(c))){
-                                c=stream.eat(/[(\[{<\^'"!~\/]/);
-                                if(c){
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                return tokenChain(stream,state,[c],RXstyle,RXmodifiers);}
-                                        if(c=="("){
-                                                return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
-                                        if(c=="["){
-                                                return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
-                                        if(c=="{"){
-                                                return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
-                                        if(c=="<"){
-                                                return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}}}}
-                if(ch=="s"){
-                        var c=/[\/>\]})\w]/.test(stream.look(-2));
-                        if(!c){
-                                c=stream.eat(/[(\[{<\^'"!~\/]/);
-                                if(c){
-                                        if(c=="[")
-                                                return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers);
-                                        if(c=="{")
-                                                return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers);
-                                        if(c=="<")
-                                                return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
-                                        if(c=="(")
-                                                return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
-                                        return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
-                if(ch=="y"){
-                        var c=/[\/>\]})\w]/.test(stream.look(-2));
-                        if(!c){
-                                c=stream.eat(/[(\[{<\^'"!~\/]/);
-                                if(c){
-                                        if(c=="[")
-                                                return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers);
-                                        if(c=="{")
-                                                return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers);
-                                        if(c=="<")
-                                                return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
-                                        if(c=="(")
-                                                return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
-                                        return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
-                if(ch=="t"){
-                        var c=/[\/>\]})\w]/.test(stream.look(-2));
-                        if(!c){
-                                c=stream.eat("r");if(c){
-                                c=stream.eat(/[(\[{<\^'"!~\/]/);
-                                if(c){
-                                        if(c=="[")
-                                                return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers);
-                                        if(c=="{")
-                                                return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers);
-                                        if(c=="<")
-                                                return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
-                                        if(c=="(")
-                                                return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
-                                        return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}}
-                if(ch=="`"){
-                        return tokenChain(stream,state,[ch],"variable-2");}
-                if(ch=="/"){
-                        if(!/~\s*$/.test(stream.prefix()))
-                                return "operator";
-                        else
-                                return tokenChain(stream,state,[ch],RXstyle,RXmodifiers);}
-                if(ch=="$"){
-                        var p=stream.pos;
-                        if(stream.eatWhile(/\d/)||stream.eat("{")&&stream.eatWhile(/\d/)&&stream.eat("}"))
-                                return "variable-2";
-                        else
-                                stream.pos=p;}
-                if(/[$@%]/.test(ch)){
-                        var p=stream.pos;
-                        if(stream.eat("^")&&stream.eat(/[A-Z]/)||!/[@$%&]/.test(stream.look(-2))&&stream.eat(/[=|\\\-#?@;:&`~\^!\[\]*'"$+.,\/<>()]/)){
-                                var c=stream.current();
-                                if(PERL[c])
-                                        return "variable-2";}
-                        stream.pos=p;}
-                if(/[$@%&]/.test(ch)){
-                        if(stream.eatWhile(/[\w$\[\]]/)||stream.eat("{")&&stream.eatWhile(/[\w$\[\]]/)&&stream.eat("}")){
-                                var c=stream.current();
-                                if(PERL[c])
-                                        return "variable-2";
-                                else
-                                        return "variable";}}
-                if(ch=="#"){
-                        if(stream.look(-2)!="$"){
-                                stream.skipToEnd();
-                                return "comment";}}
-                if(/[:+\-\^*$&%@=<>!?|\/~\.]/.test(ch)){
-                        var p=stream.pos;
-                        stream.eatWhile(/[:+\-\^*$&%@=<>!?|\/~\.]/);
-                        if(PERL[stream.current()])
-                                return "operator";
-                        else
-                                stream.pos=p;}
-                if(ch=="_"){
-                        if(stream.pos==1){
-                                if(stream.suffix(6)=="_END__"){
-                                        return tokenChain(stream,state,['\0'],"comment");}
-                                else if(stream.suffix(7)=="_DATA__"){
-                                        return tokenChain(stream,state,['\0'],"variable-2");}
-                                else if(stream.suffix(7)=="_C__"){
-                                        return tokenChain(stream,state,['\0'],"string");}}}
-                if(/\w/.test(ch)){
-                        var p=stream.pos;
-                        if(stream.look(-2)=="{"&&(stream.look(0)=="}"||stream.eatWhile(/\w/)&&stream.look(0)=="}"))
-                                return "string";
-                        else
-                                stream.pos=p;}
-                if(/[A-Z]/.test(ch)){
-                        var l=stream.look(-2);
-                        var p=stream.pos;
-                        stream.eatWhile(/[A-Z_]/);
-                        if(/[\da-z]/.test(stream.look(0))){
-                                stream.pos=p;}
-                        else{
-                                var c=PERL[stream.current()];
-                                if(!c)
-                                        return "meta";
-                                if(c[1])
-                                        c=c[0];
-                                if(l!=":"){
-                                        if(c==1)
-                                                return "keyword";
-                                        else if(c==2)
-                                                return "def";
-                                        else if(c==3)
-                                                return "atom";
-                                        else if(c==4)
-                                                return "operator";
-                                        else if(c==5)
-                                                return "variable-2";
-                                        else
-                                                return "meta";}
-                                else
-                                        return "meta";}}
-                if(/[a-zA-Z_]/.test(ch)){
-                        var l=stream.look(-2);
-                        stream.eatWhile(/\w/);
-                        var c=PERL[stream.current()];
-                        if(!c)
-                                return "meta";
-                        if(c[1])
-                                c=c[0];
-                        if(l!=":"){
-                                if(c==1)
-                                        return "keyword";
-                                else if(c==2)
-                                        return "def";
-                                else if(c==3)
-                                        return "atom";
-                                else if(c==4)
-                                        return "operator";
-                                else if(c==5)
-                                        return "variable-2";
-                                else
-                                        return "meta";}
-                        else
-                                return "meta";}
-                return null;}
-
-        return{
-                startState:function(){
-                        return{
-                                tokenize:tokenPerl,
-                                chain:null,
-                                style:null,
-                                tail:null};},
-                token:function(stream,state){
-                        return (state.tokenize||tokenPerl)(stream,state);},
-                electricChars:"{}"};});
-
-CodeMirror.defineMIME("text/x-perl", "perl");
-
-// it's like "peek", but need for look-ahead or look-behind if index < 0
-CodeMirror.StringStream.prototype.look=function(c){
-        return this.string.charAt(this.pos+(c||0));};
-
-// return a part of prefix of current stream from current position
-CodeMirror.StringStream.prototype.prefix=function(c){
-        if(c){
-                var x=this.pos-c;
-                return this.string.substr((x>=0?x:0),c);}
-        else{
-                return this.string.substr(0,this.pos-1);}};
-
-// return a part of suffix of current stream from current position
-CodeMirror.StringStream.prototype.suffix=function(c){
-        var y=this.string.length;
-        var x=y-this.pos+1;
-        return this.string.substr(this.pos,(c&&c<y?c:x));};
-
-// return a part of suffix of current stream from current position and change current position
-CodeMirror.StringStream.prototype.nsuffix=function(c){
-        var p=this.pos;
-        var l=c||(this.string.length-this.pos+1);
-        this.pos+=l;
-        return this.string.substr(p,l);};
-
-// eating and vomiting a part of stream from current position
-CodeMirror.StringStream.prototype.eatSuffix=function(c){
-        var x=this.pos+c;
-        var y;
-        if(x<=0)
-                this.pos=0;
-        else if(x>=(y=this.string.length-1))
-                this.pos=y;
-        else
-                this.pos=x;};
diff --git a/resources/libs/codemirror/mode/php/index.html b/resources/libs/codemirror/mode/php/index.html
deleted file mode 100644
index aaf51c0f5..000000000
--- a/resources/libs/codemirror/mode/php/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: PHP mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="../htmlmixed/htmlmixed.js"></script>
-<script src="../xml/xml.js"></script>
-<script src="../javascript/javascript.js"></script>
-<script src="../css/css.js"></script>
-<script src="../clike/clike.js"></script>
-<script src="php.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">PHP</a>
-  </ul>
-</div>
-
-<article>
-<h2>PHP mode</h2>
-<form><textarea id="code" name="code">
-<?php
-function hello($who) {
-	return "Hello " . $who;
-}
-?>
-<p>The program says <?= hello("World") ?>.</p>
-<script>
-	alert("And here is some JS code"); // also colored
-</script>
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "application/x-httpd-php",
-        indentUnit: 4,
-        indentWithTabs: true,
-        enterMode: "keep",
-        tabMode: "shift"
-      });
-    </script>
-
-    <p>Simple HTML/PHP mode based on
-    the <a href="../clike/">C-like</a> mode. Depends on XML,
-    JavaScript, CSS, HTMLMixed, and C-like modes.</p>
-
-    <p><strong>MIME types defined:</strong> <code>application/x-httpd-php</code> (HTML with PHP code), <code>text/x-php</code> (plain, non-wrapped PHP code).</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/php/php.js b/resources/libs/codemirror/mode/php/php.js
deleted file mode 100755
index 3555b8b14..000000000
--- a/resources/libs/codemirror/mode/php/php.js
+++ /dev/null
@@ -1,132 +0,0 @@
-(function() {
-  function keywords(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  function heredoc(delim) {
-    return function(stream, state) {
-      if (stream.match(delim)) state.tokenize = null;
-      else stream.skipToEnd();
-      return "string";
-    };
-  }
-  var phpConfig = {
-    name: "clike",
-    keywords: keywords("abstract and array as break case catch class clone const continue declare default " +
-                       "do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final " +
-                       "for foreach function global goto if implements interface instanceof namespace " +
-                       "new or private protected public static switch throw trait try use var while xor " +
-                       "die echo empty exit eval include include_once isset list require require_once return " +
-                       "print unset __halt_compiler self static parent yield insteadof finally"),
-    blockKeywords: keywords("catch do else elseif for foreach if switch try while finally"),
-    atoms: keywords("true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__"),
-    builtin: keywords("func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once"),
-    multiLineStrings: true,
-    hooks: {
-      "$": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
-        return "variable-2";
-      },
-      "<": function(stream, state) {
-        if (stream.match(/<</)) {
-          stream.eatWhile(/[\w\.]/);
-          state.tokenize = heredoc(stream.current().slice(3));
-          return state.tokenize(stream, state);
-        }
-        return false;
-      },
-      "#": function(stream) {
-        while (!stream.eol() && !stream.match("?>", false)) stream.next();
-        return "comment";
-      },
-      "/": function(stream) {
-        if (stream.eat("/")) {
-          while (!stream.eol() && !stream.match("?>", false)) stream.next();
-          return "comment";
-        }
-        return false;
-      }
-    }
-  };
-
-  CodeMirror.defineMode("php", function(config, parserConfig) {
-    var htmlMode = CodeMirror.getMode(config, "text/html");
-    var phpMode = CodeMirror.getMode(config, phpConfig);
-
-    function dispatch(stream, state) {
-      var isPHP = state.curMode == phpMode;
-      if (stream.sol() && state.pending != '"') state.pending = null;
-      if (!isPHP) {
-        if (stream.match(/^<\?\w*/)) {
-          state.curMode = phpMode;
-          state.curState = state.php;
-          return "meta";
-        }
-        if (state.pending == '"') {
-          while (!stream.eol() && stream.next() != '"') {}
-          var style = "string";
-        } else if (state.pending && stream.pos < state.pending.end) {
-          stream.pos = state.pending.end;
-          var style = state.pending.style;
-        } else {
-          var style = htmlMode.token(stream, state.curState);
-        }
-        state.pending = null;
-        var cur = stream.current(), openPHP = cur.search(/<\?/);
-        if (openPHP != -1) {
-          if (style == "string" && /\"$/.test(cur) && !/\?>/.test(cur)) state.pending = '"';
-          else state.pending = {end: stream.pos, style: style};
-          stream.backUp(cur.length - openPHP);
-        }
-        return style;
-      } else if (isPHP && state.php.tokenize == null && stream.match("?>")) {
-        state.curMode = htmlMode;
-        state.curState = state.html;
-        return "meta";
-      } else {
-        return phpMode.token(stream, state.curState);
-      }
-    }
-
-    return {
-      startState: function() {
-        var html = CodeMirror.startState(htmlMode), php = CodeMirror.startState(phpMode);
-        return {html: html,
-                php: php,
-                curMode: parserConfig.startOpen ? phpMode : htmlMode,
-                curState: parserConfig.startOpen ? php : html,
-                pending: null};
-      },
-
-      copyState: function(state) {
-        var html = state.html, htmlNew = CodeMirror.copyState(htmlMode, html),
-            php = state.php, phpNew = CodeMirror.copyState(phpMode, php), cur;
-        if (state.curMode == htmlMode) cur = htmlNew;
-        else cur = phpNew;
-        return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur,
-                pending: state.pending};
-      },
-
-      token: dispatch,
-
-      indent: function(state, textAfter) {
-        if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) ||
-            (state.curMode == phpMode && /^\?>/.test(textAfter)))
-          return htmlMode.indent(state.html, textAfter);
-        return state.curMode.indent(state.curState, textAfter);
-      },
-
-      electricChars: "/{}:",
-      blockCommentStart: "/*",
-      blockCommentEnd: "*/",
-      lineComment: "//",
-
-      innerMode: function(state) { return {state: state.curState, mode: state.curMode}; }
-    };
-  }, "htmlmixed", "clike");
-
-  CodeMirror.defineMIME("application/x-httpd-php", "php");
-  CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});
-  CodeMirror.defineMIME("text/x-php", phpConfig);
-})();
diff --git a/resources/libs/codemirror/mode/pig/index.html b/resources/libs/codemirror/mode/pig/index.html
deleted file mode 100644
index 93744ae2d..000000000
--- a/resources/libs/codemirror/mode/pig/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Pig Latin mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="pig.js"></script>
-<style>.CodeMirror {border: 2px inset #dee;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Pig Latin</a>
-  </ul>
-</div>
-
-<article>
-<h2>Pig Latin mode</h2>
-<form><textarea id="code" name="code">
--- Apache Pig (Pig Latin Language) Demo
-/* 
-This is a multiline comment.
-*/
-a = LOAD "\path\to\input" USING PigStorage('\t') AS (x:long, y:chararray, z:bytearray);
-b = GROUP a BY (x,y,3+4);
-c = FOREACH b GENERATE flatten(group) as (x,y), SUM(group.$2) as z;
-STORE c INTO "\path\to\output";
-
---
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        indentUnit: 4,
-        mode: "text/x-pig"
-      });
-    </script>
-
-    <p>
-        Simple mode that handles Pig Latin language.
-    </p>
-
-    <p><strong>MIME type defined:</strong> <code>text/x-pig</code>
-    (PIG code)
-</html>
-</article>
diff --git a/resources/libs/codemirror/mode/pig/pig.js b/resources/libs/codemirror/mode/pig/pig.js
deleted file mode 100644
index 4b44e7ccc..000000000
--- a/resources/libs/codemirror/mode/pig/pig.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- *      Pig Latin Mode for CodeMirror 2
- *      @author Prasanth Jayachandran
- *      @link   https://github.com/prasanthj/pig-codemirror-2
- *  This implementation is adapted from PL/SQL mode in CodeMirror 2.
- */
-CodeMirror.defineMode("pig", function(_config, parserConfig) {
-  var keywords = parserConfig.keywords,
-  builtins = parserConfig.builtins,
-  types = parserConfig.types,
-  multiLineStrings = parserConfig.multiLineStrings;
-
-  var isOperatorChar = /[*+\-%<>=&?:\/!|]/;
-
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-
-  var type;
-  function ret(tp, style) {
-    type = tp;
-    return style;
-  }
-
-  function tokenComment(stream, state) {
-    var isEnd = false;
-    var ch;
-    while(ch = stream.next()) {
-      if(ch == "/" && isEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      isEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-          end = true; break;
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !(escaped || multiLineStrings))
-        state.tokenize = tokenBase;
-      return ret("string", "error");
-    };
-  }
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-
-    // is a start of string?
-    if (ch == '"' || ch == "'")
-      return chain(stream, state, tokenString(ch));
-    // is it one of the special chars
-    else if(/[\[\]{}\(\),;\.]/.test(ch))
-      return ret(ch);
-    // is it a number?
-    else if(/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return ret("number", "number");
-    }
-    // multi line comment or operator
-    else if (ch == "/") {
-      if (stream.eat("*")) {
-        return chain(stream, state, tokenComment);
-      }
-      else {
-        stream.eatWhile(isOperatorChar);
-        return ret("operator", "operator");
-      }
-    }
-    // single line comment or operator
-    else if (ch=="-") {
-      if(stream.eat("-")){
-        stream.skipToEnd();
-        return ret("comment", "comment");
-      }
-      else {
-        stream.eatWhile(isOperatorChar);
-        return ret("operator", "operator");
-      }
-    }
-    // is it an operator
-    else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return ret("operator", "operator");
-    }
-    else {
-      // get the while word
-      stream.eatWhile(/[\w\$_]/);
-      // is it one of the listed keywords?
-      if (keywords && keywords.propertyIsEnumerable(stream.current().toUpperCase())) {
-        if (stream.eat(")") || stream.eat(".")) {
-          //keywords can be used as variables like flatten(group), group.$0 etc..
-        }
-        else {
-          return ("keyword", "keyword");
-        }
-      }
-      // is it one of the builtin functions?
-      if (builtins && builtins.propertyIsEnumerable(stream.current().toUpperCase()))
-      {
-        return ("keyword", "variable-2");
-      }
-      // is it one of the listed types?
-      if (types && types.propertyIsEnumerable(stream.current().toUpperCase()))
-        return ("keyword", "variable-3");
-      // default is a 'variable'
-      return ret("variable", "pig-word");
-    }
-  }
-
-  // Interface
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        startOfLine: true
-      };
-    },
-
-    token: function(stream, state) {
-      if(stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      return style;
-    }
-  };
-});
-
-(function() {
-  function keywords(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  // builtin funcs taken from trunk revision 1303237
-  var pBuiltins = "ABS ACOS ARITY ASIN ATAN AVG BAGSIZE BINSTORAGE BLOOM BUILDBLOOM CBRT CEIL "
-    + "CONCAT COR COS COSH COUNT COUNT_STAR COV CONSTANTSIZE CUBEDIMENSIONS DIFF DISTINCT DOUBLEABS "
-    + "DOUBLEAVG DOUBLEBASE DOUBLEMAX DOUBLEMIN DOUBLEROUND DOUBLESUM EXP FLOOR FLOATABS FLOATAVG "
-    + "FLOATMAX FLOATMIN FLOATROUND FLOATSUM GENERICINVOKER INDEXOF INTABS INTAVG INTMAX INTMIN "
-    + "INTSUM INVOKEFORDOUBLE INVOKEFORFLOAT INVOKEFORINT INVOKEFORLONG INVOKEFORSTRING INVOKER "
-    + "ISEMPTY JSONLOADER JSONMETADATA JSONSTORAGE LAST_INDEX_OF LCFIRST LOG LOG10 LOWER LONGABS "
-    + "LONGAVG LONGMAX LONGMIN LONGSUM MAX MIN MAPSIZE MONITOREDUDF NONDETERMINISTIC OUTPUTSCHEMA  "
-    + "PIGSTORAGE PIGSTREAMING RANDOM REGEX_EXTRACT REGEX_EXTRACT_ALL REPLACE ROUND SIN SINH SIZE "
-    + "SQRT STRSPLIT SUBSTRING SUM STRINGCONCAT STRINGMAX STRINGMIN STRINGSIZE TAN TANH TOBAG "
-    + "TOKENIZE TOMAP TOP TOTUPLE TRIM TEXTLOADER TUPLESIZE UCFIRST UPPER UTF8STORAGECONVERTER ";
-
-  // taken from QueryLexer.g
-  var pKeywords = "VOID IMPORT RETURNS DEFINE LOAD FILTER FOREACH ORDER CUBE DISTINCT COGROUP "
-    + "JOIN CROSS UNION SPLIT INTO IF OTHERWISE ALL AS BY USING INNER OUTER ONSCHEMA PARALLEL "
-    + "PARTITION GROUP AND OR NOT GENERATE FLATTEN ASC DESC IS STREAM THROUGH STORE MAPREDUCE "
-    + "SHIP CACHE INPUT OUTPUT STDERROR STDIN STDOUT LIMIT SAMPLE LEFT RIGHT FULL EQ GT LT GTE LTE "
-    + "NEQ MATCHES TRUE FALSE DUMP";
-
-  // data types
-  var pTypes = "BOOLEAN INT LONG FLOAT DOUBLE CHARARRAY BYTEARRAY BAG TUPLE MAP ";
-
-  CodeMirror.defineMIME("text/x-pig", {
-    name: "pig",
-    builtins: keywords(pBuiltins),
-    keywords: keywords(pKeywords),
-    types: keywords(pTypes)
-  });
-}());
diff --git a/resources/libs/codemirror/mode/properties/index.html b/resources/libs/codemirror/mode/properties/index.html
deleted file mode 100644
index 40ee1a37b..000000000
--- a/resources/libs/codemirror/mode/properties/index.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Properties files mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="properties.js"></script>
-<style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Properties files</a>
-  </ul>
-</div>
-
-<article>
-<h2>Properties files mode</h2>
-<form><textarea id="code" name="code">
-# This is a properties file
-a.key = A value
-another.key = http://example.com
-! Exclamation mark as comment
-but.not=Within ! A value # indeed
-   # Spaces at the beginning of a line
-   spaces.before.key=value
-backslash=Used for multi\
-          line entries,\
-          that's convenient.
-# Unicode sequences
-unicode.key=This is \u0020 Unicode
-no.multiline=here
-# Colons
-colons : can be used too
-# Spaces
-spaces\ in\ keys=Not very common...
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-properties</code>,
-    <code>text/x-ini</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/properties/properties.js b/resources/libs/codemirror/mode/properties/properties.js
deleted file mode 100644
index d3a13c765..000000000
--- a/resources/libs/codemirror/mode/properties/properties.js
+++ /dev/null
@@ -1,63 +0,0 @@
-CodeMirror.defineMode("properties", function() {
-  return {
-    token: function(stream, state) {
-      var sol = stream.sol() || state.afterSection;
-      var eol = stream.eol();
-
-      state.afterSection = false;
-
-      if (sol) {
-        if (state.nextMultiline) {
-          state.inMultiline = true;
-          state.nextMultiline = false;
-        } else {
-          state.position = "def";
-        }
-      }
-
-      if (eol && ! state.nextMultiline) {
-        state.inMultiline = false;
-        state.position = "def";
-      }
-
-      if (sol) {
-        while(stream.eatSpace());
-      }
-
-      var ch = stream.next();
-
-      if (sol && (ch === "#" || ch === "!" || ch === ";")) {
-        state.position = "comment";
-        stream.skipToEnd();
-        return "comment";
-      } else if (sol && ch === "[") {
-        state.afterSection = true;
-        stream.skipTo("]"); stream.eat("]");
-        return "header";
-      } else if (ch === "=" || ch === ":") {
-        state.position = "quote";
-        return null;
-      } else if (ch === "\\" && state.position === "quote") {
-        if (stream.next() !== "u") {    // u = Unicode sequence \u1234
-          // Multiline value
-          state.nextMultiline = true;
-        }
-      }
-
-      return state.position;
-    },
-
-    startState: function() {
-      return {
-        position : "def",       // Current position, "def", "quote" or "comment"
-        nextMultiline : false,  // Is the next line multiline value
-        inMultiline : false,    // Is the current line a multiline value
-        afterSection : false    // Did we just open a section
-      };
-    }
-
-  };
-});
-
-CodeMirror.defineMIME("text/x-properties", "properties");
-CodeMirror.defineMIME("text/x-ini", "properties");
diff --git a/resources/libs/codemirror/mode/python/index.html b/resources/libs/codemirror/mode/python/index.html
deleted file mode 100644
index 497734920..000000000
--- a/resources/libs/codemirror/mode/python/index.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Python mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="python.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Python</a>
-  </ul>
-</div>
-
-<article>
-<h2>Python mode</h2>
-
-    <div><textarea id="code" name="code">
-# Literals
-1234
-0.0e101
-.123
-0b01010011100
-0o01234567
-0x0987654321abcdef
-7
-2147483647
-3L
-79228162514264337593543950336L
-0x100000000L
-79228162514264337593543950336
-0xdeadbeef
-3.14j
-10.j
-10j
-.001j
-1e100j
-3.14e-10j
-
-
-# String Literals
-'For\''
-"God\""
-"""so loved
-the world"""
-'''that he gave
-his only begotten\' '''
-'that whosoever believeth \
-in him'
-''
-
-# Identifiers
-__a__
-a.b
-a.b.c
-
-# Operators
-+ - * / % & | ^ ~ < >
-== != <= >= <> << >> // **
-and or not in is
-
-# Delimiters
-() [] {} , : ` = ; @ .  # Note that @ and . require the proper context.
-+= -= *= /= %= &= |= ^=
-//= >>= <<= **=
-
-# Keywords
-as assert break class continue def del elif else except
-finally for from global if import lambda pass raise
-return try while with yield
-
-# Python 2 Keywords (otherwise Identifiers)
-exec print
-
-# Python 3 Keywords (otherwise Identifiers)
-nonlocal
-
-# Types
-bool classmethod complex dict enumerate float frozenset int list object
-property reversed set slice staticmethod str super tuple type
-
-# Python 2 Types (otherwise Identifiers)
-basestring buffer file long unicode xrange
-
-# Python 3 Types (otherwise Identifiers)
-bytearray bytes filter map memoryview open range zip
-
-# Some Example code
-import os
-from package import ParentClass
-
-@nonsenseDecorator
-def doesNothing():
-    pass
-
-class ExampleClass(ParentClass):
-    @staticmethod
-    def example(inputStr):
-        a = list(inputStr)
-        a.reverse()
-        return ''.join(a)
-
-    def __init__(self, mixin = 'Hello'):
-        self.mixin = mixin
-
-</textarea></div>
-
-
-<h2>Cython mode</h2>
-
-<div><textarea id="code-cython" name="code-cython">
-
-import numpy as np
-cimport cython
-from libc.math cimport sqrt
-
-@cython.boundscheck(False)
-@cython.wraparound(False)
-def pairwise_cython(double[:, ::1] X):
-    cdef int M = X.shape[0]
-    cdef int N = X.shape[1]
-    cdef double tmp, d
-    cdef double[:, ::1] D = np.empty((M, M), dtype=np.float64)
-    for i in range(M):
-        for j in range(M):
-            d = 0.0
-            for k in range(N):
-                tmp = X[i, k] - X[j, k]
-                d += tmp * tmp
-            D[i, j] = sqrt(d)
-    return np.asarray(D)
-
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "python",
-               version: 2,
-               singleLineStringErrors: false},
-        lineNumbers: true,
-        indentUnit: 4,
-        tabMode: "shift",
-        matchBrackets: true
-    });
-
-    CodeMirror.fromTextArea(document.getElementById("code-cython"), {
-        mode: {name: "text/x-cython",
-               version: 2,
-               singleLineStringErrors: false},
-        lineNumbers: true,
-        indentUnit: 4,
-        tabMode: "shift",
-        matchBrackets: true
-      });
-    </script>
-    <h2>Configuration Options for Python mode:</h2>
-    <ul>
-      <li>version - 2/3 - The version of Python to recognize.  Default is 2.</li>
-      <li>singleLineStringErrors - true/false - If you have a single-line string that is not terminated at the end of the line, this will show subsequent lines as errors if true, otherwise it will consider the newline as the end of the string. Default is false.</li>
-    </ul>
-    <h2>Advanced Configuration Options:</h2>
-    <p>Usefull for superset of python syntax like Enthought enaml, IPython magics and  questionmark help</p>
-    <ul>
-      <li>singleOperators - RegEx - Regular Expression for single operator matching,  default : <pre>^[\\+\\-\\*/%&amp;|\\^~&lt;&gt;!]</pre></li>
-      <li>singleDelimiters - RegEx - Regular Expression for single delimiter matching, default :  <pre>^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]</pre></li>
-      <li>doubleOperators - RegEx - Regular Expression for double operators matching, default : <pre>^((==)|(!=)|(&lt;=)|(&gt;=)|(&lt;&gt;)|(&lt;&lt;)|(&gt;&gt;)|(//)|(\\*\\*))</pre></li>
-      <li>doubleDelimiters - RegEx - Regular Expressoin for double delimiters matching, default : <pre>^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&amp;=)|(\\|=)|(\\^=))</pre></li>
-      <li>tripleDelimiters - RegEx - Regular Expression for triple delimiters matching, default : <pre>^((//=)|(&gt;&gt;=)|(&lt;&lt;=)|(\\*\\*=))</pre></li>
-      <li>identifiers - RegEx - Regular Expression for identifier, default : <pre>^[_A-Za-z][_A-Za-z0-9]*</pre></li>
-      <li>extra_keywords - list of string - List of extra words ton consider as keywords</li>
-      <li>extra_builtins - list of string - List of extra words ton consider as builtins</li>
-    </ul>
-
-
-    <p><strong>MIME types defined:</strong> <code>text/x-python</code> and <code>text/x-cython</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/python/python.js b/resources/libs/codemirror/mode/python/python.js
deleted file mode 100644
index 802c2dd4a..000000000
--- a/resources/libs/codemirror/mode/python/python.js
+++ /dev/null
@@ -1,368 +0,0 @@
-CodeMirror.defineMode("python", function(conf, parserConf) {
-    var ERRORCLASS = 'error';
-
-    function wordRegexp(words) {
-        return new RegExp("^((" + words.join(")|(") + "))\\b");
-    }
-
-    var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
-    var singleDelimiters = parserConf.singleDelimiters || new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');
-    var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
-    var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
-    var tripleDelimiters = parserConf.tripleDelimiters || new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
-    var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
-
-    var wordOperators = wordRegexp(['and', 'or', 'not', 'is', 'in']);
-    var commonkeywords = ['as', 'assert', 'break', 'class', 'continue',
-                          'def', 'del', 'elif', 'else', 'except', 'finally',
-                          'for', 'from', 'global', 'if', 'import',
-                          'lambda', 'pass', 'raise', 'return',
-                          'try', 'while', 'with', 'yield'];
-    var commonBuiltins = ['abs', 'all', 'any', 'bin', 'bool', 'bytearray', 'callable', 'chr',
-                          'classmethod', 'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod',
-                          'enumerate', 'eval', 'filter', 'float', 'format', 'frozenset',
-                          'getattr', 'globals', 'hasattr', 'hash', 'help', 'hex', 'id',
-                          'input', 'int', 'isinstance', 'issubclass', 'iter', 'len',
-                          'list', 'locals', 'map', 'max', 'memoryview', 'min', 'next',
-                          'object', 'oct', 'open', 'ord', 'pow', 'property', 'range',
-                          'repr', 'reversed', 'round', 'set', 'setattr', 'slice',
-                          'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple',
-                          'type', 'vars', 'zip', '__import__', 'NotImplemented',
-                          'Ellipsis', '__debug__'];
-    var py2 = {'builtins': ['apply', 'basestring', 'buffer', 'cmp', 'coerce', 'execfile',
-                            'file', 'intern', 'long', 'raw_input', 'reduce', 'reload',
-                            'unichr', 'unicode', 'xrange', 'False', 'True', 'None'],
-               'keywords': ['exec', 'print']};
-    var py3 = {'builtins': ['ascii', 'bytes', 'exec', 'print'],
-               'keywords': ['nonlocal', 'False', 'True', 'None']};
-
-    if(parserConf.extra_keywords != undefined){
-        commonkeywords = commonkeywords.concat(parserConf.extra_keywords);
-    }
-    if(parserConf.extra_builtins != undefined){
-        commonBuiltins = commonBuiltins.concat(parserConf.extra_builtins);
-    }
-    if (!!parserConf.version && parseInt(parserConf.version, 10) === 3) {
-        commonkeywords = commonkeywords.concat(py3.keywords);
-        commonBuiltins = commonBuiltins.concat(py3.builtins);
-        var stringPrefixes = new RegExp("^(([rb]|(br))?('{3}|\"{3}|['\"]))", "i");
-    } else {
-        commonkeywords = commonkeywords.concat(py2.keywords);
-        commonBuiltins = commonBuiltins.concat(py2.builtins);
-        var stringPrefixes = new RegExp("^(([rub]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
-    }
-    var keywords = wordRegexp(commonkeywords);
-    var builtins = wordRegexp(commonBuiltins);
-
-    var indentInfo = null;
-
-    // tokenizers
-    function tokenBase(stream, state) {
-        // Handle scope changes
-        if (stream.sol()) {
-            var scopeOffset = state.scopes[0].offset;
-            if (stream.eatSpace()) {
-                var lineOffset = stream.indentation();
-                if (lineOffset > scopeOffset) {
-                    indentInfo = 'indent';
-                } else if (lineOffset < scopeOffset) {
-                    indentInfo = 'dedent';
-                }
-                return null;
-            } else {
-                if (scopeOffset > 0) {
-                    dedent(stream, state);
-                }
-            }
-        }
-        if (stream.eatSpace()) {
-            return null;
-        }
-
-        var ch = stream.peek();
-
-        // Handle Comments
-        if (ch === '#') {
-            stream.skipToEnd();
-            return 'comment';
-        }
-
-        // Handle Number Literals
-        if (stream.match(/^[0-9\.]/, false)) {
-            var floatLiteral = false;
-            // Floats
-            if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
-            if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
-            if (stream.match(/^\.\d+/)) { floatLiteral = true; }
-            if (floatLiteral) {
-                // Float literals may be "imaginary"
-                stream.eat(/J/i);
-                return 'number';
-            }
-            // Integers
-            var intLiteral = false;
-            // Hex
-            if (stream.match(/^0x[0-9a-f]+/i)) { intLiteral = true; }
-            // Binary
-            if (stream.match(/^0b[01]+/i)) { intLiteral = true; }
-            // Octal
-            if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; }
-            // Decimal
-            if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
-                // Decimal literals may be "imaginary"
-                stream.eat(/J/i);
-                // TODO - Can you have imaginary longs?
-                intLiteral = true;
-            }
-            // Zero by itself with no other piece of number.
-            if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
-            if (intLiteral) {
-                // Integer literals may be "long"
-                stream.eat(/L/i);
-                return 'number';
-            }
-        }
-
-        // Handle Strings
-        if (stream.match(stringPrefixes)) {
-            state.tokenize = tokenStringFactory(stream.current());
-            return state.tokenize(stream, state);
-        }
-
-        // Handle operators and Delimiters
-        if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
-            return null;
-        }
-        if (stream.match(doubleOperators)
-            || stream.match(singleOperators)
-            || stream.match(wordOperators)) {
-            return 'operator';
-        }
-        if (stream.match(singleDelimiters)) {
-            return null;
-        }
-
-        if (stream.match(keywords)) {
-            return 'keyword';
-        }
-
-        if (stream.match(builtins)) {
-            return 'builtin';
-        }
-
-        if (stream.match(identifiers)) {
-            if (state.lastToken == 'def' || state.lastToken == 'class') {
-                return 'def';
-            }
-            return 'variable';
-        }
-
-        // Handle non-detected items
-        stream.next();
-        return ERRORCLASS;
-    }
-
-    function tokenStringFactory(delimiter) {
-        while ('rub'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
-            delimiter = delimiter.substr(1);
-        }
-        var singleline = delimiter.length == 1;
-        var OUTCLASS = 'string';
-
-        function tokenString(stream, state) {
-            while (!stream.eol()) {
-                stream.eatWhile(/[^'"\\]/);
-                if (stream.eat('\\')) {
-                    stream.next();
-                    if (singleline && stream.eol()) {
-                        return OUTCLASS;
-                    }
-                } else if (stream.match(delimiter)) {
-                    state.tokenize = tokenBase;
-                    return OUTCLASS;
-                } else {
-                    stream.eat(/['"]/);
-                }
-            }
-            if (singleline) {
-                if (parserConf.singleLineStringErrors) {
-                    return ERRORCLASS;
-                } else {
-                    state.tokenize = tokenBase;
-                }
-            }
-            return OUTCLASS;
-        }
-        tokenString.isString = true;
-        return tokenString;
-    }
-
-    function indent(stream, state, type) {
-        type = type || 'py';
-        var indentUnit = 0;
-        if (type === 'py') {
-            if (state.scopes[0].type !== 'py') {
-                state.scopes[0].offset = stream.indentation();
-                return;
-            }
-            for (var i = 0; i < state.scopes.length; ++i) {
-                if (state.scopes[i].type === 'py') {
-                    indentUnit = state.scopes[i].offset + conf.indentUnit;
-                    break;
-                }
-            }
-        } else {
-            indentUnit = stream.column() + stream.current().length;
-        }
-        state.scopes.unshift({
-            offset: indentUnit,
-            type: type
-        });
-    }
-
-    function dedent(stream, state, type) {
-        type = type || 'py';
-        if (state.scopes.length == 1) return;
-        if (state.scopes[0].type === 'py') {
-            var _indent = stream.indentation();
-            var _indent_index = -1;
-            for (var i = 0; i < state.scopes.length; ++i) {
-                if (_indent === state.scopes[i].offset) {
-                    _indent_index = i;
-                    break;
-                }
-            }
-            if (_indent_index === -1) {
-                return true;
-            }
-            while (state.scopes[0].offset !== _indent) {
-                state.scopes.shift();
-            }
-            return false;
-        } else {
-            if (type === 'py') {
-                state.scopes[0].offset = stream.indentation();
-                return false;
-            } else {
-                if (state.scopes[0].type != type) {
-                    return true;
-                }
-                state.scopes.shift();
-                return false;
-            }
-        }
-    }
-
-    function tokenLexer(stream, state) {
-        indentInfo = null;
-        var style = state.tokenize(stream, state);
-        var current = stream.current();
-
-        // Handle '.' connected identifiers
-        if (current === '.') {
-            style = stream.match(identifiers, false) ? null : ERRORCLASS;
-            if (style === null && state.lastStyle === 'meta') {
-                // Apply 'meta' style to '.' connected identifiers when
-                // appropriate.
-                style = 'meta';
-            }
-            return style;
-        }
-
-        // Handle decorators
-        if (current === '@') {
-            return stream.match(identifiers, false) ? 'meta' : ERRORCLASS;
-        }
-
-        if ((style === 'variable' || style === 'builtin')
-            && state.lastStyle === 'meta') {
-            style = 'meta';
-        }
-
-        // Handle scope changes.
-        if (current === 'pass' || current === 'return') {
-            state.dedent += 1;
-        }
-        if (current === 'lambda') state.lambda = true;
-        if ((current === ':' && !state.lambda && state.scopes[0].type == 'py')
-            || indentInfo === 'indent') {
-            indent(stream, state);
-        }
-        var delimiter_index = '[({'.indexOf(current);
-        if (delimiter_index !== -1) {
-            indent(stream, state, '])}'.slice(delimiter_index, delimiter_index+1));
-        }
-        if (indentInfo === 'dedent') {
-            if (dedent(stream, state)) {
-                return ERRORCLASS;
-            }
-        }
-        delimiter_index = '])}'.indexOf(current);
-        if (delimiter_index !== -1) {
-            if (dedent(stream, state, current)) {
-                return ERRORCLASS;
-            }
-        }
-        if (state.dedent > 0 && stream.eol() && state.scopes[0].type == 'py') {
-            if (state.scopes.length > 1) state.scopes.shift();
-            state.dedent -= 1;
-        }
-
-        return style;
-    }
-
-    var external = {
-        startState: function(basecolumn) {
-            return {
-              tokenize: tokenBase,
-              scopes: [{offset:basecolumn || 0, type:'py'}],
-              lastStyle: null,
-              lastToken: null,
-              lambda: false,
-              dedent: 0
-          };
-        },
-
-        token: function(stream, state) {
-            var style = tokenLexer(stream, state);
-
-            state.lastStyle = style;
-
-            var current = stream.current();
-            if (current && style) {
-                state.lastToken = current;
-            }
-
-            if (stream.eol() && state.lambda) {
-                state.lambda = false;
-            }
-            return style;
-        },
-
-        indent: function(state) {
-            if (state.tokenize != tokenBase) {
-                return state.tokenize.isString ? CodeMirror.Pass : 0;
-            }
-
-            return state.scopes[0].offset;
-        },
-
-        lineComment: "#",
-        fold: "indent"
-    };
-    return external;
-});
-
-CodeMirror.defineMIME("text/x-python", "python");
-
-(function() {
-  "use strict";
-  var words = function(str){return str.split(' ');};
-
-  CodeMirror.defineMIME("text/x-cython", {
-    name: "python",
-    extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
-                          "extern gil include nogil property public"+
-                          "readonly struct union DEF IF ELIF ELSE")
-  });
-})();
diff --git a/resources/libs/codemirror/mode/q/index.html b/resources/libs/codemirror/mode/q/index.html
deleted file mode 100644
index 78ed3d88f..000000000
--- a/resources/libs/codemirror/mode/q/index.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Q mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="q.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Q</a>
-  </ul>
-</div>
-
-<article>
-<h2>Q mode</h2>
-
-
-<div><textarea id="code" name="code">
-/ utilities to quickly load a csv file - for more exhaustive analysis of the csv contents see csvguess.q
-/ 2009.09.20 - updated to match latest csvguess.q 
-
-/ .csv.colhdrs[file] - return a list of colhdrs from file
-/ info:.csv.info[file] - return a table of information about the file
-/ columns are: 
-/	c - column name; ci - column index; t - load type; mw - max width; 
-/	dchar - distinct characters in values; rule - rule that caught the type
-/	maybe - needs checking, _could_ be say a date, but perhaps just a float?
-/ .csv.info0[file;onlycols] - like .csv.info except that it only analyses <onlycols>
-/ example:
-/	info:.csv.info0[file;(.csv.colhdrs file)like"*price"]
-/	info:.csv.infolike[file;"*price"]
-/	show delete from info where t=" "
-/ .csv.data[file;info] - use the info from .csv.info to read the data
-/ .csv.data10[file;info] - like .csv.data but only returns the first 10 rows
-/ bulkload[file;info] - bulk loads file into table DATA (which must be already defined :: DATA:() )
-/ .csv.read[file]/read10[file] - for when you don't care about checking/tweaking the <info> before reading 
-
-\d .csv
-DELIM:","
-ZAPHDRS:0b / lowercase and remove _ from colhdrs (junk characters are always removed)
-WIDTHHDR:25000 / number of characters read to get the header
-READLINES:222 / number of lines read and used to guess the types
-SYMMAXWIDTH:11 / character columns narrower than this are stored as symbols
-SYMMAXGR:10 / max symbol granularity% before we give up and keep as a * string
-FORCECHARWIDTH:30 / every field (of any type) with values this wide or more is forced to character "*"
-DISCARDEMPTY:0b / completely ignore empty columns if true else set them to "C"
-CHUNKSIZE:50000000 / used in fs2 (modified .Q.fs)
-
-k)nameltrim:{$[~@x;.z.s'x;~(*x)in aA:.Q.a,.Q.A;(+/&\~x in aA)_x;x]}
-k)fs2:{[f;s]((-7!s)>){[f;s;x]i:1+last@&0xa=r:1:(s;x;CHUNKSIZE);f@`\:i#r;x+i}[f;s]/0j}
-cleanhdrs:{{$[ZAPHDRS;lower x except"_";x]}x where x in DELIM,.Q.an}
-cancast:{nw:x$"";if[not x in"BXCS";nw:(min 0#;max 0#;::)@\:nw];$[not any nw in x$(11&count y)#y;$[11<count y;not any nw in x$y;1b];0b]}
-
-read:{[file]data[file;info[file]]}  
-read10:{[file]data10[file;info[file]]}  
-
-colhdrs:{[file]
-	`$nameltrim DELIM vs cleanhdrs first read0(file;0;1+first where 0xa=read1(file;0;WIDTHHDR))}
-data:{[file;info]
-	(exec c from info where not t=" ")xcol(exec t from info;enlist DELIM)0:file}
-data10:{[file;info]
-	data[;info](file;0;1+last 11#where 0xa=read1(file;0;15*WIDTHHDR))}
-info0:{[file;onlycols]
-	colhdrs:`$nameltrim DELIM vs cleanhdrs first head:read0(file;0;1+last where 0xa=read1(file;0;WIDTHHDR));
-	loadfmts:(count colhdrs)#"S";if[count onlycols;loadfmts[where not colhdrs in onlycols]:"C"];
-	breaks:where 0xa=read1(file;0;floor(10+READLINES)*WIDTHHDR%count head);
-	nas:count as:colhdrs xcol(loadfmts;enlist DELIM)0:(file;0;1+last((1+READLINES)&count breaks)#breaks);
-	info:([]c:key flip as;v:value flip as);as:();
-	reserved:key`.q;reserved,:.Q.res;reserved,:`i;
-	info:update res:c in reserved from info;
-	info:update ci:i,t:"?",ipa:0b,mdot:0,mw:0,rule:0,gr:0,ndv:0,maybe:0b,empty:0b,j10:0b,j12:0b from info;
-	info:update ci:`s#ci from info;
-	if[count onlycols;info:update t:" ",rule:10 from info where not c in onlycols];
-	info:update sdv:{string(distinct x)except`}peach v from info; 
-	info:update ndv:count each sdv from info;
-	info:update gr:floor 0.5+100*ndv%nas,mw:{max count each x}peach sdv from info where 0<ndv;
-	info:update t:"*",rule:20 from info where mw>.csv.FORCECHARWIDTH; / long values
-	info:update t:"C "[.csv.DISCARDEMPTY],rule:30,empty:1b from info where t="?",mw=0; / empty columns
-	info:update dchar:{asc distinct raze x}peach sdv from info where t="?";
-	info:update mdot:{max sum each"."=x}peach sdv from info where t="?",{"."in x}each dchar;
-	info:update t:"n",rule:40 from info where t="?",{any x in"0123456789"}each dchar; / vaguely numeric..
-	info:update t:"I",rule:50,ipa:1b from info where t="n",mw within 7 15,mdot=3,{all x in".0123456789"}each dchar,.csv.cancast["I"]peach sdv; / ip-address
-	info:update t:"J",rule:60 from info where t="n",mdot=0,{all x in"+-0123456789"}each dchar,.csv.cancast["J"]peach sdv;
-	info:update t:"I",rule:70 from info where t="J",mw<12,.csv.cancast["I"]peach sdv;
-	info:update t:"H",rule:80 from info where t="I",mw<7,.csv.cancast["H"]peach sdv;
-	info:update t:"F",rule:90 from info where t="n",mdot<2,mw>1,.csv.cancast["F"]peach sdv;
-	info:update t:"E",rule:100,maybe:1b from info where t="F",mw<9;
-	info:update t:"M",rule:110,maybe:1b from info where t in"nIHEF",mdot<2,mw within 4 7,.csv.cancast["M"]peach sdv; 
-	info:update t:"D",rule:120,maybe:1b from info where t in"nI",mdot in 0 2,mw within 6 11,.csv.cancast["D"]peach sdv; 
-	info:update t:"V",rule:130,maybe:1b from info where t="I",mw in 5 6,7<count each dchar,{all x like"*[0-9][0-5][0-9][0-5][0-9]"}peach sdv,.csv.cancast["V"]peach sdv; / 235959 12345        
-	info:update t:"U",rule:140,maybe:1b from info where t="H",mw in 3 4,7<count each dchar,{all x like"*[0-9][0-5][0-9]"}peach sdv,.csv.cancast["U"]peach sdv; /2359
-	info:update t:"U",rule:150,maybe:0b from info where t="n",mw in 4 5,mdot=0,{all x like"*[0-9]:[0-5][0-9]"}peach sdv,.csv.cancast["U"]peach sdv;
-	info:update t:"T",rule:160,maybe:0b from info where t="n",mw within 7 12,mdot<2,{all x like"*[0-9]:[0-5][0-9]:[0-5][0-9]*"}peach sdv,.csv.cancast["T"]peach sdv;
-	info:update t:"V",rule:170,maybe:0b from info where t="T",mw in 7 8,mdot=0,.csv.cancast["V"]peach sdv;
-	info:update t:"T",rule:180,maybe:1b from info where t in"EF",mw within 7 10,mdot=1,{all x like"*[0-9][0-5][0-9][0-5][0-9].*"}peach sdv,.csv.cancast["T"]peach sdv;
-	info:update t:"Z",rule:190,maybe:0b from info where t="n",mw within 11 24,mdot<4,.csv.cancast["Z"]peach sdv;
-	info:update t:"P",rule:200,maybe:1b from info where t="n",mw within 12 29,mdot<4,{all x like"[12]*"}peach sdv,.csv.cancast["P"]peach sdv;
-	info:update t:"N",rule:210,maybe:1b from info where t="n",mw within 3 28,mdot=1,.csv.cancast["N"]peach sdv;
-	info:update t:"?",rule:220,maybe:0b from info where t="n"; / reset remaining maybe numeric
-	info:update t:"C",rule:230,maybe:0b from info where t="?",mw=1; / char
-	info:update t:"B",rule:240,maybe:0b from info where t in"HC",mw=1,mdot=0,{$[all x in"01tTfFyYnN";(any"0fFnN"in x)and any"1tTyY"in x;0b]}each dchar; / boolean
-	info:update t:"B",rule:250,maybe:1b from info where t in"HC",mw=1,mdot=0,{all x in"01tTfFyYnN"}each dchar; / boolean
-	info:update t:"X",rule:260,maybe:0b from info where t="?",mw=2,{$[all x in"0123456789abcdefABCDEF";(any .Q.n in x)and any"abcdefABCDEF"in x;0b]}each dchar; /hex
-	info:update t:"S",rule:270,maybe:1b from info where t="?",mw<.csv.SYMMAXWIDTH,mw>1,gr<.csv.SYMMAXGR; / symbols (max width permitting)
-	info:update t:"*",rule:280,maybe:0b from info where t="?"; / the rest as strings
-	/ flag those S/* columns which could be encoded to integers (.Q.j10/x10/j12/x12) to avoid symbols
-	info:update j12:1b from info where t in"S*",mw<13,{all x in .Q.nA}each dchar;
-	info:update j10:1b from info where t in"S*",mw<11,{all x in .Q.b6}each dchar; 
-	select c,ci,t,maybe,empty,res,j10,j12,ipa,mw,mdot,rule,gr,ndv,dchar from info}
-info:info0[;()] / by default don't restrict columns
-infolike:{[file;pattern] info0[file;{x where x like y}[lower colhdrs[file];pattern]]} / .csv.infolike[file;"*time"]
-
-\d .
-/ DATA:()
-bulkload:{[file;info]
-	if[not`DATA in system"v";'`DATA.not.defined];
-	if[count DATA;'`DATA.not.empty];
-	loadhdrs:exec c from info where not t=" ";loadfmts:exec t from info;
-	.csv.fs2[{[file;loadhdrs;loadfmts] `DATA insert $[count DATA;flip loadhdrs!(loadfmts;.csv.DELIM)0:file;loadhdrs xcol(loadfmts;enlist .csv.DELIM)0:file]}[file;loadhdrs;loadfmts]];
-	count DATA}
-@[.:;"\\l csvutil.custom.q";::]; / save your custom settings in csvutil.custom.q to override those set at the beginning of the file 
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true
-      });
-    </script>
-
-    <p><strong>MIME type defined:</strong> <code>text/x-q</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/q/q.js b/resources/libs/codemirror/mode/q/q.js
deleted file mode 100644
index 56017e30a..000000000
--- a/resources/libs/codemirror/mode/q/q.js
+++ /dev/null
@@ -1,124 +0,0 @@
-CodeMirror.defineMode("q",function(config){
-  var indentUnit=config.indentUnit,
-      curPunc,
-      keywords=buildRE(["abs","acos","aj","aj0","all","and","any","asc","asin","asof","atan","attr","avg","avgs","bin","by","ceiling","cols","cor","cos","count","cov","cross","csv","cut","delete","deltas","desc","dev","differ","distinct","div","do","each","ej","enlist","eval","except","exec","exit","exp","fby","fills","first","fkeys","flip","floor","from","get","getenv","group","gtime","hclose","hcount","hdel","hopen","hsym","iasc","idesc","if","ij","in","insert","inter","inv","key","keys","last","like","list","lj","load","log","lower","lsq","ltime","ltrim","mavg","max","maxs","mcount","md5","mdev","med","meta","min","mins","mmax","mmin","mmu","mod","msum","neg","next","not","null","or","over","parse","peach","pj","plist","prd","prds","prev","prior","rand","rank","ratios","raze","read0","read1","reciprocal","reverse","rload","rotate","rsave","rtrim","save","scan","select","set","setenv","show","signum","sin","sqrt","ss","ssr","string","sublist","sum","sums","sv","system","tables","tan","til","trim","txf","type","uj","ungroup","union","update","upper","upsert","value","var","view","views","vs","wavg","where","where","while","within","wj","wj1","wsum","xasc","xbar","xcol","xcols","xdesc","xexp","xgroup","xkey","xlog","xprev","xrank"]),
-      E=/[|/&^!+:\\\-*%$=~#;@><,?_\'\"\[\(\]\)\s{}]/;
-  function buildRE(w){return new RegExp("^("+w.join("|")+")$");}
-  function tokenBase(stream,state){
-    var sol=stream.sol(),c=stream.next();
-    curPunc=null;
-    if(sol)
-      if(c=="/")
-        return(state.tokenize=tokenLineComment)(stream,state);
-      else if(c=="\\"){
-        if(stream.eol()||/\s/.test(stream.peek()))
-          return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream, state):state.tokenize=tokenBase,"comment";
-        else
-          return state.tokenize=tokenBase,"builtin";
-      }
-    if(/\s/.test(c))
-      return stream.peek()=="/"?(stream.skipToEnd(),"comment"):"whitespace";
-    if(c=='"')
-      return(state.tokenize=tokenString)(stream,state);
-    if(c=='`')
-      return stream.eatWhile(/[A-Z|a-z|\d|_|:|\/|\.]/),"symbol";
-    if(("."==c&&/\d/.test(stream.peek()))||/\d/.test(c)){
-      var t=null;
-      stream.backUp(1);
-      if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([D|T](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)
-      || stream.match(/^\d+D(\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)/)
-      || stream.match(/^\d{2}:\d{2}(:\d{2}(\.\d{1,9})?)?/)
-      || stream.match(/^\d+[ptuv]{1}/))
-        t="temporal";
-      else if(stream.match(/^0[NwW]{1}/)
-      || stream.match(/^0x[\d|a-f|A-F]*/)
-      || stream.match(/^[0|1]+[b]{1}/)
-      || stream.match(/^\d+[chijn]{1}/)
-      || stream.match(/-?\d*(\.\d*)?(e[+\-]?\d+)?(e|f)?/))
-        t="number";
-      return(t&&(!(c=stream.peek())||E.test(c)))?t:(stream.next(),"error");
-    }
-    if(/[A-Z|a-z]|\./.test(c))
-      return stream.eatWhile(/[A-Z|a-z|\.|_|\d]/),keywords.test(stream.current())?"keyword":"variable";
-    if(/[|/&^!+:\\\-*%$=~#;@><\.,?_\']/.test(c))
-      return null;
-    if(/[{}\(\[\]\)]/.test(c))
-      return null;
-    return"error";
-  }
-  function tokenLineComment(stream,state){
-    return stream.skipToEnd(),/\/\s*$/.test(stream.current())?(state.tokenize=tokenBlockComment)(stream,state):(state.tokenize=tokenBase),"comment";
-  }
-  function tokenBlockComment(stream,state){
-    var f=stream.sol()&&stream.peek()=="\\";
-    stream.skipToEnd();
-    if(f&&/^\\\s*$/.test(stream.current()))
-      state.tokenize=tokenBase;
-    return"comment";
-  }
-  function tokenCommentToEOF(stream){return stream.skipToEnd(),"comment";}
-  function tokenString(stream,state){
-    var escaped=false,next,end=false;
-    while((next=stream.next())){
-      if(next=="\""&&!escaped){end=true;break;}
-      escaped=!escaped&&next=="\\";
-    }
-    if(end)state.tokenize=tokenBase;
-    return"string";
-  }
-  function pushContext(state,type,col){state.context={prev:state.context,indent:state.indent,col:col,type:type};}
-  function popContext(state){state.indent=state.context.indent;state.context=state.context.prev;}
-  return{
-    startState:function(){
-      return{tokenize:tokenBase,
-             context:null,
-             indent:0,
-             col:0};
-    },
-    token:function(stream,state){
-      if(stream.sol()){
-        if(state.context&&state.context.align==null)
-          state.context.align=false;
-        state.indent=stream.indentation();
-      }
-      //if (stream.eatSpace()) return null;
-      var style=state.tokenize(stream,state);
-      if(style!="comment"&&state.context&&state.context.align==null&&state.context.type!="pattern"){
-        state.context.align=true;
-      }
-      if(curPunc=="(")pushContext(state,")",stream.column());
-      else if(curPunc=="[")pushContext(state,"]",stream.column());
-      else if(curPunc=="{")pushContext(state,"}",stream.column());
-      else if(/[\]\}\)]/.test(curPunc)){
-        while(state.context&&state.context.type=="pattern")popContext(state);
-        if(state.context&&curPunc==state.context.type)popContext(state);
-      }
-      else if(curPunc=="."&&state.context&&state.context.type=="pattern")popContext(state);
-      else if(/atom|string|variable/.test(style)&&state.context){
-        if(/[\}\]]/.test(state.context.type))
-          pushContext(state,"pattern",stream.column());
-        else if(state.context.type=="pattern"&&!state.context.align){
-          state.context.align=true;
-          state.context.col=stream.column();
-        }
-      }
-      return style;
-    },
-    indent:function(state,textAfter){
-      var firstChar=textAfter&&textAfter.charAt(0);
-      var context=state.context;
-      if(/[\]\}]/.test(firstChar))
-        while (context&&context.type=="pattern")context=context.prev;
-      var closing=context&&firstChar==context.type;
-      if(!context)
-        return 0;
-      else if(context.type=="pattern")
-        return context.col;
-      else if(context.align)
-        return context.col+(closing?0:1);
-      else
-        return context.indent+(closing?0:indentUnit);
-    }
-  };
-});
-CodeMirror.defineMIME("text/x-q","q");
diff --git a/resources/libs/codemirror/mode/r/index.html b/resources/libs/codemirror/mode/r/index.html
deleted file mode 100644
index f73e13d62..000000000
--- a/resources/libs/codemirror/mode/r/index.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: R mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="r.js"></script>
-<style>
-      .CodeMirror { border-top: 1px solid silver; border-bottom: 1px solid silver; }
-      .cm-s-default span.cm-semi { color: blue; font-weight: bold; }
-      .cm-s-default span.cm-dollar { color: orange; font-weight: bold; }
-      .cm-s-default span.cm-arrow { color: brown; }
-      .cm-s-default span.cm-arg-is { color: brown; }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">R</a>
-  </ul>
-</div>
-
-<article>
-<h2>R mode</h2>
-<form><textarea id="code" name="code">
-# Code from http://www.mayin.org/ajayshah/KB/R/
-
-# FIRST LEARN ABOUT LISTS --
-X = list(height=5.4, weight=54)
-print("Use default printing --")
-print(X)
-print("Accessing individual elements --")
-cat("Your height is ", X$height, " and your weight is ", X$weight, "\n")
-
-# FUNCTIONS --
-square <- function(x) {
-  return(x*x)
-}
-cat("The square of 3 is ", square(3), "\n")
-
-                 # default value of the arg is set to 5.
-cube <- function(x=5) {
-  return(x*x*x);
-}
-cat("Calling cube with 2 : ", cube(2), "\n")    # will give 2^3
-cat("Calling cube        : ", cube(), "\n")     # will default to 5^3.
-
-# LEARN ABOUT FUNCTIONS THAT RETURN MULTIPLE OBJECTS --
-powers <- function(x) {
-  parcel = list(x2=x*x, x3=x*x*x, x4=x*x*x*x);
-  return(parcel);
-}
-
-X = powers(3);
-print("Showing powers of 3 --"); print(X);
-
-# WRITING THIS COMPACTLY (4 lines instead of 7)
-
-powerful <- function(x) {
-  return(list(x2=x*x, x3=x*x*x, x4=x*x*x*x));
-}
-print("Showing powers of 3 --"); print(powerful(3));
-
-# In R, the last expression in a function is, by default, what is
-# returned. So you could equally just say:
-powerful <- function(x) {list(x2=x*x, x3=x*x*x, x4=x*x*x*x)}
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-rsrc</code>.</p>
-
-    <p>Development of the CodeMirror R mode was kindly sponsored
-    by <a href="http://ubalo.com/">Ubalo</a>, who hold
-    the <a href="LICENSE">license</a>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/r/r.js b/resources/libs/codemirror/mode/r/r.js
deleted file mode 100644
index 6410efbb2..000000000
--- a/resources/libs/codemirror/mode/r/r.js
+++ /dev/null
@@ -1,141 +0,0 @@
-CodeMirror.defineMode("r", function(config) {
-  function wordObj(str) {
-    var words = str.split(" "), res = {};
-    for (var i = 0; i < words.length; ++i) res[words[i]] = true;
-    return res;
-  }
-  var atoms = wordObj("NULL NA Inf NaN NA_integer_ NA_real_ NA_complex_ NA_character_");
-  var builtins = wordObj("list quote bquote eval return call parse deparse");
-  var keywords = wordObj("if else repeat while function for in next break");
-  var blockkeywords = wordObj("if else repeat while function for");
-  var opChars = /[+\-*\/^<>=!&|~$:]/;
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    curPunc = null;
-    var ch = stream.next();
-    if (ch == "#") {
-      stream.skipToEnd();
-      return "comment";
-    } else if (ch == "0" && stream.eat("x")) {
-      stream.eatWhile(/[\da-f]/i);
-      return "number";
-    } else if (ch == "." && stream.eat(/\d/)) {
-      stream.match(/\d*(?:e[+\-]?\d+)?/);
-      return "number";
-    } else if (/\d/.test(ch)) {
-      stream.match(/\d*(?:\.\d+)?(?:e[+\-]\d+)?L?/);
-      return "number";
-    } else if (ch == "'" || ch == '"') {
-      state.tokenize = tokenString(ch);
-      return "string";
-    } else if (ch == "." && stream.match(/.[.\d]+/)) {
-      return "keyword";
-    } else if (/[\w\.]/.test(ch) && ch != "_") {
-      stream.eatWhile(/[\w\.]/);
-      var word = stream.current();
-      if (atoms.propertyIsEnumerable(word)) return "atom";
-      if (keywords.propertyIsEnumerable(word)) {
-        if (blockkeywords.propertyIsEnumerable(word)) curPunc = "block";
-        return "keyword";
-      }
-      if (builtins.propertyIsEnumerable(word)) return "builtin";
-      return "variable";
-    } else if (ch == "%") {
-      if (stream.skipTo("%")) stream.next();
-      return "variable-2";
-    } else if (ch == "<" && stream.eat("-")) {
-      return "arrow";
-    } else if (ch == "=" && state.ctx.argList) {
-      return "arg-is";
-    } else if (opChars.test(ch)) {
-      if (ch == "$") return "dollar";
-      stream.eatWhile(opChars);
-      return "operator";
-    } else if (/[\(\){}\[\];]/.test(ch)) {
-      curPunc = ch;
-      if (ch == ";") return "semi";
-      return null;
-    } else {
-      return null;
-    }
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      if (stream.eat("\\")) {
-        var ch = stream.next();
-        if (ch == "x") stream.match(/^[a-f0-9]{2}/i);
-        else if ((ch == "u" || ch == "U") && stream.eat("{") && stream.skipTo("}")) stream.next();
-        else if (ch == "u") stream.match(/^[a-f0-9]{4}/i);
-        else if (ch == "U") stream.match(/^[a-f0-9]{8}/i);
-        else if (/[0-7]/.test(ch)) stream.match(/^[0-7]{1,2}/);
-        return "string-2";
-      } else {
-        var next;
-        while ((next = stream.next()) != null) {
-          if (next == quote) { state.tokenize = tokenBase; break; }
-          if (next == "\\") { stream.backUp(1); break; }
-        }
-        return "string";
-      }
-    };
-  }
-
-  function push(state, type, stream) {
-    state.ctx = {type: type,
-                 indent: state.indent,
-                 align: null,
-                 column: stream.column(),
-                 prev: state.ctx};
-  }
-  function pop(state) {
-    state.indent = state.ctx.indent;
-    state.ctx = state.ctx.prev;
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: tokenBase,
-              ctx: {type: "top",
-                    indent: -config.indentUnit,
-                    align: false},
-              indent: 0,
-              afterIdent: false};
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (state.ctx.align == null) state.ctx.align = false;
-        state.indent = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (style != "comment" && state.ctx.align == null) state.ctx.align = true;
-
-      var ctype = state.ctx.type;
-      if ((curPunc == ";" || curPunc == "{" || curPunc == "}") && ctype == "block") pop(state);
-      if (curPunc == "{") push(state, "}", stream);
-      else if (curPunc == "(") {
-        push(state, ")", stream);
-        if (state.afterIdent) state.ctx.argList = true;
-      }
-      else if (curPunc == "[") push(state, "]", stream);
-      else if (curPunc == "block") push(state, "block", stream);
-      else if (curPunc == ctype) pop(state);
-      state.afterIdent = style == "variable" || style == "keyword";
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), ctx = state.ctx,
-          closing = firstChar == ctx.type;
-      if (ctx.type == "block") return ctx.indent + (firstChar == "{" ? 0 : config.indentUnit);
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indent + (closing ? 0 : config.indentUnit);
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-rsrc", "r");
diff --git a/resources/libs/codemirror/mode/rpm/changes/changes.js b/resources/libs/codemirror/mode/rpm/changes/changes.js
deleted file mode 100644
index 14a08d970..000000000
--- a/resources/libs/codemirror/mode/rpm/changes/changes.js
+++ /dev/null
@@ -1,19 +0,0 @@
-CodeMirror.defineMode("changes", function() {
-  var headerSeperator = /^-+$/;
-  var headerLine = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)  ?\d{1,2} \d{2}:\d{2}(:\d{2})? [A-Z]{3,4} \d{4} - /;
-  var simpleEmail = /^[\w+.-]+@[\w.-]+/;
-
-  return {
-    token: function(stream) {
-      if (stream.sol()) {
-        if (stream.match(headerSeperator)) { return 'tag'; }
-        if (stream.match(headerLine)) { return 'tag'; }
-      }
-      if (stream.match(simpleEmail)) { return 'string'; }
-      stream.next();
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-rpm-changes", "changes");
diff --git a/resources/libs/codemirror/mode/rpm/changes/index.html b/resources/libs/codemirror/mode/rpm/changes/index.html
deleted file mode 100644
index 18fe7ab7b..000000000
--- a/resources/libs/codemirror/mode/rpm/changes/index.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: RPM changes mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-    <link rel="stylesheet" href="../../../lib/codemirror.css">
-    <script src="../../../lib/codemirror.js"></script>
-    <script src="changes.js"></script>
-    <link rel="stylesheet" href="../../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../../index.html">Home</a>
-    <li><a href="../../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../../index.html">Language modes</a>
-    <li><a class=active href="#">RPM changes</a>
-  </ul>
-</div>
-
-<article>
-<h2>RPM changes mode</h2>
-
-    <div><textarea id="code" name="code">
--------------------------------------------------------------------
-Tue Oct 18 13:58:40 UTC 2011 - misterx@example.com
-
-- Update to r60.3
-- Fixes bug in the reflect package
-  * disallow Interface method on Value obtained via unexported name
-
--------------------------------------------------------------------
-Thu Oct  6 08:14:24 UTC 2011 - misterx@example.com
-
-- Update to r60.2
-- Fixes memory leak in certain map types
-
--------------------------------------------------------------------
-Wed Oct  5 14:34:10 UTC 2011 - misterx@example.com
-
-- Tweaks for gdb debugging
-- go.spec changes:
-  - move %go_arch definition to %prep section
-  - pass correct location of go specific gdb pretty printer and
-    functions to cpp as HOST_EXTRA_CFLAGS macro
-  - install go gdb functions & printer
-- gdb-printer.patch
-  - patch linker (src/cmd/ld/dwarf.c) to emit correct location of go
-    gdb functions and pretty printer
-</textarea></div>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "changes"},
-        lineNumbers: true,
-        indentUnit: 4,
-        tabMode: "shift"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-rpm-changes</code>.</p>
-</article>
diff --git a/resources/libs/codemirror/mode/rpm/spec/index.html b/resources/libs/codemirror/mode/rpm/spec/index.html
deleted file mode 100644
index 127b72ee9..000000000
--- a/resources/libs/codemirror/mode/rpm/spec/index.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: RPM spec mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-    <link rel="stylesheet" href="../../../lib/codemirror.css">
-    <script src="../../../lib/codemirror.js"></script>
-    <script src="spec.js"></script>
-    <link rel="stylesheet" href="spec.css">
-    <link rel="stylesheet" href="../../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../../index.html">Home</a>
-    <li><a href="../../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../../index.html">Language modes</a>
-    <li><a class=active href="#">RPM spec</a>
-  </ul>
-</div>
-
-<article>
-<h2>RPM spec mode</h2>
-    
-    <div><textarea id="code" name="code">
-#
-# spec file for package minidlna
-#
-# Copyright (c) 2011, Sascha Peilicke <saschpe@gmx.de>
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-
-Name:           libupnp6
-Version:        1.6.13
-Release:        0
-Summary:        Portable Universal Plug and Play (UPnP) SDK
-Group:          System/Libraries
-License:        BSD-3-Clause
-Url:            http://sourceforge.net/projects/pupnp/
-Source0:        http://downloads.sourceforge.net/pupnp/libupnp-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-%description
-The portable Universal Plug and Play (UPnP) SDK provides support for building
-UPnP-compliant control points, devices, and bridges on several operating
-systems.
-
-%package -n libupnp-devel
-Summary:        Portable Universal Plug and Play (UPnP) SDK
-Group:          Development/Libraries/C and C++
-Provides:       pkgconfig(libupnp)
-Requires:       %{name} = %{version}
-
-%description -n libupnp-devel
-The portable Universal Plug and Play (UPnP) SDK provides support for building
-UPnP-compliant control points, devices, and bridges on several operating
-systems.
-
-%prep
-%setup -n libupnp-%{version}
-
-%build
-%configure --disable-static
-make %{?_smp_mflags}
-
-%install
-%makeinstall
-find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog NEWS README TODO
-%{_libdir}/libixml.so.*
-%{_libdir}/libthreadutil.so.*
-%{_libdir}/libupnp.so.*
-
-%files -n libupnp-devel
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/libupnp.pc
-%{_libdir}/libixml.so
-%{_libdir}/libthreadutil.so
-%{_libdir}/libupnp.so
-%{_includedir}/upnp/
-
-%changelog</textarea></div>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "spec"},
-        lineNumbers: true,
-        indentUnit: 4
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-rpm-spec</code>.</p>
-
-</article>
diff --git a/resources/libs/codemirror/mode/rpm/spec/spec.css b/resources/libs/codemirror/mode/rpm/spec/spec.css
deleted file mode 100644
index d0a5d430c..000000000
--- a/resources/libs/codemirror/mode/rpm/spec/spec.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.cm-s-default span.cm-preamble {color: #b26818; font-weight: bold;}
-.cm-s-default span.cm-macro {color: #b218b2;}
-.cm-s-default span.cm-section {color: green; font-weight: bold;}
-.cm-s-default span.cm-script {color: red;}
-.cm-s-default span.cm-issue {color: yellow;}
diff --git a/resources/libs/codemirror/mode/rpm/spec/spec.js b/resources/libs/codemirror/mode/rpm/spec/spec.js
deleted file mode 100644
index 9f339c21b..000000000
--- a/resources/libs/codemirror/mode/rpm/spec/spec.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Quick and dirty spec file highlighting
-
-CodeMirror.defineMode("spec", function() {
-  var arch = /^(i386|i586|i686|x86_64|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
-
-  var preamble = /^(Name|Version|Release|License|Summary|Url|Group|Source|BuildArch|BuildRequires|BuildRoot|AutoReqProv|Provides|Requires(\(\w+\))?|Obsoletes|Conflicts|Recommends|Source\d*|Patch\d*|ExclusiveArch|NoSource|Supplements):/;
-  var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preun|postun|pre|post|triggerin|triggerun|pretrans|posttrans|verifyscript|check|triggerpostun|triggerprein|trigger)/;
-  var control_flow_complex = /^%(ifnarch|ifarch|if)/; // rpm control flow macros
-  var control_flow_simple = /^%(else|endif)/; // rpm control flow macros
-  var operators = /^(\!|\?|\<\=|\<|\>\=|\>|\=\=|\&\&|\|\|)/; // operators in control flow macros
-
-  return {
-    startState: function () {
-        return {
-          controlFlow: false,
-          macroParameters: false,
-          section: false
-        };
-    },
-    token: function (stream, state) {
-      var ch = stream.peek();
-      if (ch == "#") { stream.skipToEnd(); return "comment"; }
-
-      if (stream.sol()) {
-        if (stream.match(preamble)) { return "preamble"; }
-        if (stream.match(section)) { return "section"; }
-      }
-
-      if (stream.match(/^\$\w+/)) { return "def"; } // Variables like '$RPM_BUILD_ROOT'
-      if (stream.match(/^\$\{\w+\}/)) { return "def"; } // Variables like '${RPM_BUILD_ROOT}'
-
-      if (stream.match(control_flow_simple)) { return "keyword"; }
-      if (stream.match(control_flow_complex)) {
-        state.controlFlow = true;
-        return "keyword";
-      }
-      if (state.controlFlow) {
-        if (stream.match(operators)) { return "operator"; }
-        if (stream.match(/^(\d+)/)) { return "number"; }
-        if (stream.eol()) { state.controlFlow = false; }
-      }
-
-      if (stream.match(arch)) { return "number"; }
-
-      // Macros like '%make_install' or '%attr(0775,root,root)'
-      if (stream.match(/^%[\w]+/)) {
-        if (stream.match(/^\(/)) { state.macroParameters = true; }
-        return "macro";
-      }
-      if (state.macroParameters) {
-        if (stream.match(/^\d+/)) { return "number";}
-        if (stream.match(/^\)/)) {
-          state.macroParameters = false;
-          return "macro";
-        }
-      }
-      if (stream.match(/^%\{\??[\w \-]+\}/)) { return "macro"; } // Macros like '%{defined fedora}'
-
-      //TODO: Include bash script sub-parser (CodeMirror supports that)
-      stream.next();
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-rpm-spec", "spec");
diff --git a/resources/libs/codemirror/mode/rst/index.html b/resources/libs/codemirror/mode/rst/index.html
deleted file mode 100644
index 78030ebe9..000000000
--- a/resources/libs/codemirror/mode/rst/index.html
+++ /dev/null
@@ -1,534 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: reStructuredText mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="rst.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">reStructuredText</a>
-  </ul>
-</div>
-
-<article>
-<h2>reStructuredText mode</h2>
-<form><textarea id="code" name="code">
-.. This is an excerpt from Sphinx documentation: http://sphinx.pocoo.org/_sources/rest.txt
-
-.. highlightlang:: rest
-
-.. _rst-primer:
-
-reStructuredText Primer
-=======================
-
-This section is a brief introduction to reStructuredText (reST) concepts and
-syntax, intended to provide authors with enough information to author documents
-productively.  Since reST was designed to be a simple, unobtrusive markup
-language, this will not take too long.
-
-.. seealso::
-
-   The authoritative `reStructuredText User Documentation
-   &lt;http://docutils.sourceforge.net/rst.html&gt;`_.  The "ref" links in this
-   document link to the description of the individual constructs in the reST
-   reference.
-
-
-Paragraphs
-----------
-
-The paragraph (:duref:`ref &lt;paragraphs&gt;`) is the most basic block in a reST
-document.  Paragraphs are simply chunks of text separated by one or more blank
-lines.  As in Python, indentation is significant in reST, so all lines of the
-same paragraph must be left-aligned to the same level of indentation.
-
-
-.. _inlinemarkup:
-
-Inline markup
--------------
-
-The standard reST inline markup is quite simple: use
-
-* one asterisk: ``*text*`` for emphasis (italics),
-* two asterisks: ``**text**`` for strong emphasis (boldface), and
-* backquotes: ````text```` for code samples.
-
-If asterisks or backquotes appear in running text and could be confused with
-inline markup delimiters, they have to be escaped with a backslash.
-
-Be aware of some restrictions of this markup:
-
-* it may not be nested,
-* content may not start or end with whitespace: ``* text*`` is wrong,
-* it must be separated from surrounding text by non-word characters.  Use a
-  backslash escaped space to work around that: ``thisis\ *one*\ word``.
-
-These restrictions may be lifted in future versions of the docutils.
-
-reST also allows for custom "interpreted text roles"', which signify that the
-enclosed text should be interpreted in a specific way.  Sphinx uses this to
-provide semantic markup and cross-referencing of identifiers, as described in
-the appropriate section.  The general syntax is ``:rolename:`content```.
-
-Standard reST provides the following roles:
-
-* :durole:`emphasis` -- alternate spelling for ``*emphasis*``
-* :durole:`strong` -- alternate spelling for ``**strong**``
-* :durole:`literal` -- alternate spelling for ````literal````
-* :durole:`subscript` -- subscript text
-* :durole:`superscript` -- superscript text
-* :durole:`title-reference` -- for titles of books, periodicals, and other
-  materials
-
-See :ref:`inline-markup` for roles added by Sphinx.
-
-
-Lists and Quote-like blocks
----------------------------
-
-List markup (:duref:`ref &lt;bullet-lists&gt;`) is natural: just place an asterisk at
-the start of a paragraph and indent properly.  The same goes for numbered lists;
-they can also be autonumbered using a ``#`` sign::
-
-   * This is a bulleted list.
-   * It has two items, the second
-     item uses two lines.
-
-   1. This is a numbered list.
-   2. It has two items too.
-
-   #. This is a numbered list.
-   #. It has two items too.
-
-
-Nested lists are possible, but be aware that they must be separated from the
-parent list items by blank lines::
-
-   * this is
-   * a list
-
-     * with a nested list
-     * and some subitems
-
-   * and here the parent list continues
-
-Definition lists (:duref:`ref &lt;definition-lists&gt;`) are created as follows::
-
-   term (up to a line of text)
-      Definition of the term, which must be indented
-
-      and can even consist of multiple paragraphs
-
-   next term
-      Description.
-
-Note that the term cannot have more than one line of text.
-
-Quoted paragraphs (:duref:`ref &lt;block-quotes&gt;`) are created by just indenting
-them more than the surrounding paragraphs.
-
-Line blocks (:duref:`ref &lt;line-blocks&gt;`) are a way of preserving line breaks::
-
-   | These lines are
-   | broken exactly like in
-   | the source file.
-
-There are also several more special blocks available:
-
-* field lists (:duref:`ref &lt;field-lists&gt;`)
-* option lists (:duref:`ref &lt;option-lists&gt;`)
-* quoted literal blocks (:duref:`ref &lt;quoted-literal-blocks&gt;`)
-* doctest blocks (:duref:`ref &lt;doctest-blocks&gt;`)
-
-
-Source Code
------------
-
-Literal code blocks (:duref:`ref &lt;literal-blocks&gt;`) are introduced by ending a
-paragraph with the special marker ``::``.  The literal block must be indented
-(and, like all paragraphs, separated from the surrounding ones by blank lines)::
-
-   This is a normal text paragraph. The next paragraph is a code sample::
-
-      It is not processed in any way, except
-      that the indentation is removed.
-
-      It can span multiple lines.
-
-   This is a normal text paragraph again.
-
-The handling of the ``::`` marker is smart:
-
-* If it occurs as a paragraph of its own, that paragraph is completely left
-  out of the document.
-* If it is preceded by whitespace, the marker is removed.
-* If it is preceded by non-whitespace, the marker is replaced by a single
-  colon.
-
-That way, the second sentence in the above example's first paragraph would be
-rendered as "The next paragraph is a code sample:".
-
-
-.. _rst-tables:
-
-Tables
-------
-
-Two forms of tables are supported.  For *grid tables* (:duref:`ref
-&lt;grid-tables&gt;`), you have to "paint" the cell grid yourself.  They look like
-this::
-
-   +------------------------+------------+----------+----------+
-   | Header row, column 1   | Header 2   | Header 3 | Header 4 |
-   | (header rows optional) |            |          |          |
-   +========================+============+==========+==========+
-   | body row 1, column 1   | column 2   | column 3 | column 4 |
-   +------------------------+------------+----------+----------+
-   | body row 2             | ...        | ...      |          |
-   +------------------------+------------+----------+----------+
-
-*Simple tables* (:duref:`ref &lt;simple-tables&gt;`) are easier to write, but
-limited: they must contain more than one row, and the first column cannot
-contain multiple lines.  They look like this::
-
-   =====  =====  =======
-   A      B      A and B
-   =====  =====  =======
-   False  False  False
-   True   False  False
-   False  True   False
-   True   True   True
-   =====  =====  =======
-
-
-Hyperlinks
-----------
-
-External links
-^^^^^^^^^^^^^^
-
-Use ```Link text &lt;http://example.com/&gt;`_`` for inline web links.  If the link
-text should be the web address, you don't need special markup at all, the parser
-finds links and mail addresses in ordinary text.
-
-You can also separate the link and the target definition (:duref:`ref
-&lt;hyperlink-targets&gt;`), like this::
-
-   This is a paragraph that contains `a link`_.
-
-   .. _a link: http://example.com/
-
-
-Internal links
-^^^^^^^^^^^^^^
-
-Internal linking is done via a special reST role provided by Sphinx, see the
-section on specific markup, :ref:`ref-role`.
-
-
-Sections
---------
-
-Section headers (:duref:`ref &lt;sections&gt;`) are created by underlining (and
-optionally overlining) the section title with a punctuation character, at least
-as long as the text::
-
-   =================
-   This is a heading
-   =================
-
-Normally, there are no heading levels assigned to certain characters as the
-structure is determined from the succession of headings.  However, for the
-Python documentation, this convention is used which you may follow:
-
-* ``#`` with overline, for parts
-* ``*`` with overline, for chapters
-* ``=``, for sections
-* ``-``, for subsections
-* ``^``, for subsubsections
-* ``"``, for paragraphs
-
-Of course, you are free to use your own marker characters (see the reST
-documentation), and use a deeper nesting level, but keep in mind that most
-target formats (HTML, LaTeX) have a limited supported nesting depth.
-
-
-Explicit Markup
----------------
-
-"Explicit markup" (:duref:`ref &lt;explicit-markup-blocks&gt;`) is used in reST for
-most constructs that need special handling, such as footnotes,
-specially-highlighted paragraphs, comments, and generic directives.
-
-An explicit markup block begins with a line starting with ``..`` followed by
-whitespace and is terminated by the next paragraph at the same level of
-indentation.  (There needs to be a blank line between explicit markup and normal
-paragraphs.  This may all sound a bit complicated, but it is intuitive enough
-when you write it.)
-
-
-.. _directives:
-
-Directives
-----------
-
-A directive (:duref:`ref &lt;directives&gt;`) is a generic block of explicit markup.
-Besides roles, it is one of the extension mechanisms of reST, and Sphinx makes
-heavy use of it.
-
-Docutils supports the following directives:
-
-* Admonitions: :dudir:`attention`, :dudir:`caution`, :dudir:`danger`,
-  :dudir:`error`, :dudir:`hint`, :dudir:`important`, :dudir:`note`,
-  :dudir:`tip`, :dudir:`warning` and the generic :dudir:`admonition`.
-  (Most themes style only "note" and "warning" specially.)
-
-* Images:
-
-  - :dudir:`image` (see also Images_ below)
-  - :dudir:`figure` (an image with caption and optional legend)
-
-* Additional body elements:
-
-  - :dudir:`contents` (a local, i.e. for the current file only, table of
-    contents)
-  - :dudir:`container` (a container with a custom class, useful to generate an
-    outer ``&lt;div&gt;`` in HTML)
-  - :dudir:`rubric` (a heading without relation to the document sectioning)
-  - :dudir:`topic`, :dudir:`sidebar` (special highlighted body elements)
-  - :dudir:`parsed-literal` (literal block that supports inline markup)
-  - :dudir:`epigraph` (a block quote with optional attribution line)
-  - :dudir:`highlights`, :dudir:`pull-quote` (block quotes with their own
-    class attribute)
-  - :dudir:`compound` (a compound paragraph)
-
-* Special tables:
-
-  - :dudir:`table` (a table with title)
-  - :dudir:`csv-table` (a table generated from comma-separated values)
-  - :dudir:`list-table` (a table generated from a list of lists)
-
-* Special directives:
-
-  - :dudir:`raw` (include raw target-format markup)
-  - :dudir:`include` (include reStructuredText from another file)
-    -- in Sphinx, when given an absolute include file path, this directive takes
-    it as relative to the source directory
-  - :dudir:`class` (assign a class attribute to the next element) [1]_
-
-* HTML specifics:
-
-  - :dudir:`meta` (generation of HTML ``&lt;meta&gt;`` tags)
-  - :dudir:`title` (override document title)
-
-* Influencing markup:
-
-  - :dudir:`default-role` (set a new default role)
-  - :dudir:`role` (create a new role)
-
-  Since these are only per-file, better use Sphinx' facilities for setting the
-  :confval:`default_role`.
-
-Do *not* use the directives :dudir:`sectnum`, :dudir:`header` and
-:dudir:`footer`.
-
-Directives added by Sphinx are described in :ref:`sphinxmarkup`.
-
-Basically, a directive consists of a name, arguments, options and content. (Keep
-this terminology in mind, it is used in the next chapter describing custom
-directives.)  Looking at this example, ::
-
-   .. function:: foo(x)
-                 foo(y, z)
-      :module: some.module.name
-
-      Return a line of text input from the user.
-
-``function`` is the directive name.  It is given two arguments here, the
-remainder of the first line and the second line, as well as one option
-``module`` (as you can see, options are given in the lines immediately following
-the arguments and indicated by the colons).  Options must be indented to the
-same level as the directive content.
-
-The directive content follows after a blank line and is indented relative to the
-directive start.
-
-
-Images
-------
-
-reST supports an image directive (:dudir:`ref &lt;image&gt;`), used like so::
-
-   .. image:: gnu.png
-      (options)
-
-When used within Sphinx, the file name given (here ``gnu.png``) must either be
-relative to the source file, or absolute which means that they are relative to
-the top source directory.  For example, the file ``sketch/spam.rst`` could refer
-to the image ``images/spam.png`` as ``../images/spam.png`` or
-``/images/spam.png``.
-
-Sphinx will automatically copy image files over to a subdirectory of the output
-directory on building (e.g. the ``_static`` directory for HTML output.)
-
-Interpretation of image size options (``width`` and ``height``) is as follows:
-if the size has no unit or the unit is pixels, the given size will only be
-respected for output channels that support pixels (i.e. not in LaTeX output).
-Other units (like ``pt`` for points) will be used for HTML and LaTeX output.
-
-Sphinx extends the standard docutils behavior by allowing an asterisk for the
-extension::
-
-   .. image:: gnu.*
-
-Sphinx then searches for all images matching the provided pattern and determines
-their type.  Each builder then chooses the best image out of these candidates.
-For instance, if the file name ``gnu.*`` was given and two files :file:`gnu.pdf`
-and :file:`gnu.png` existed in the source tree, the LaTeX builder would choose
-the former, while the HTML builder would prefer the latter.
-
-.. versionchanged:: 0.4
-   Added the support for file names ending in an asterisk.
-
-.. versionchanged:: 0.6
-   Image paths can now be absolute.
-
-
-Footnotes
----------
-
-For footnotes (:duref:`ref &lt;footnotes&gt;`), use ``[#name]_`` to mark the footnote
-location, and add the footnote body at the bottom of the document after a
-"Footnotes" rubric heading, like so::
-
-   Lorem ipsum [#f1]_ dolor sit amet ... [#f2]_
-
-   .. rubric:: Footnotes
-
-   .. [#f1] Text of the first footnote.
-   .. [#f2] Text of the second footnote.
-
-You can also explicitly number the footnotes (``[1]_``) or use auto-numbered
-footnotes without names (``[#]_``).
-
-
-Citations
----------
-
-Standard reST citations (:duref:`ref &lt;citations&gt;`) are supported, with the
-additional feature that they are "global", i.e. all citations can be referenced
-from all files.  Use them like so::
-
-   Lorem ipsum [Ref]_ dolor sit amet.
-
-   .. [Ref] Book or article reference, URL or whatever.
-
-Citation usage is similar to footnote usage, but with a label that is not
-numeric or begins with ``#``.
-
-
-Substitutions
--------------
-
-reST supports "substitutions" (:duref:`ref &lt;substitution-definitions&gt;`), which
-are pieces of text and/or markup referred to in the text by ``|name|``.  They
-are defined like footnotes with explicit markup blocks, like this::
-
-   .. |name| replace:: replacement *text*
-
-or this::
-
-   .. |caution| image:: warning.png
-                :alt: Warning!
-
-See the :duref:`reST reference for substitutions &lt;substitution-definitions&gt;`
-for details.
-
-If you want to use some substitutions for all documents, put them into
-:confval:`rst_prolog` or put them into a separate file and include it into all
-documents you want to use them in, using the :rst:dir:`include` directive.  (Be
-sure to give the include file a file name extension differing from that of other
-source files, to avoid Sphinx finding it as a standalone document.)
-
-Sphinx defines some default substitutions, see :ref:`default-substitutions`.
-
-
-Comments
---------
-
-Every explicit markup block which isn't a valid markup construct (like the
-footnotes above) is regarded as a comment (:duref:`ref &lt;comments&gt;`).  For
-example::
-
-   .. This is a comment.
-
-You can indent text after a comment start to form multiline comments::
-
-   ..
-      This whole indented block
-      is a comment.
-
-      Still in the comment.
-
-
-Source encoding
----------------
-
-Since the easiest way to include special characters like em dashes or copyright
-signs in reST is to directly write them as Unicode characters, one has to
-specify an encoding.  Sphinx assumes source files to be encoded in UTF-8 by
-default; you can change this with the :confval:`source_encoding` config value.
-
-
-Gotchas
--------
-
-There are some problems one commonly runs into while authoring reST documents:
-
-* **Separation of inline markup:** As said above, inline markup spans must be
-  separated from the surrounding text by non-word characters, you have to use a
-  backslash-escaped space to get around that.  See `the reference
-  &lt;http://docutils.sf.net/docs/ref/rst/restructuredtext.html#inline-markup&gt;`_
-  for the details.
-
-* **No nested inline markup:** Something like ``*see :func:`foo`*`` is not
-  possible.
-
-
-.. rubric:: Footnotes
-
-.. [1] When the default domain contains a :rst:dir:`class` directive, this directive
-       will be shadowed.  Therefore, Sphinx re-exports it as :rst:dir:`rst-class`.
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-      });
-    </script>
-    <p>
-        The <code>python</code> mode will be used for highlighting blocks
-        containing Python/IPython terminal sessions: blocks starting with
-        <code>&gt;&gt;&gt;</code> (for Python) or <code>In [num]:</code> (for
-        IPython).
-
-        Further, the <code>stex</code> mode will be used for highlighting
-        blocks containing LaTex code.
-    </p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-rst</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/rst/rst.js b/resources/libs/codemirror/mode/rst/rst.js
deleted file mode 100644
index 75563ba98..000000000
--- a/resources/libs/codemirror/mode/rst/rst.js
+++ /dev/null
@@ -1,560 +0,0 @@
-CodeMirror.defineMode('rst-base', function (config) {
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    function format(string) {
-        var args = Array.prototype.slice.call(arguments, 1);
-        return string.replace(/{(\d+)}/g, function (match, n) {
-            return typeof args[n] != 'undefined' ? args[n] : match;
-        });
-    }
-
-    function AssertException(message) {
-        this.message = message;
-    }
-
-    AssertException.prototype.toString = function () {
-        return 'AssertException: ' + this.message;
-    };
-
-    function assert(expression, message) {
-        if (!expression) throw new AssertException(message);
-        return expression;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    var mode_python = CodeMirror.getMode(config, 'python');
-    var mode_stex = CodeMirror.getMode(config, 'stex');
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    var SEPA = "\\s+";
-    var TAIL = "(?:\\s*|\\W|$)",
-        rx_TAIL = new RegExp(format('^{0}', TAIL));
-
-    var NAME =
-        "(?:[^\\W\\d_](?:[\\w!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)",
-        rx_NAME = new RegExp(format('^{0}', NAME));
-    var NAME_WWS =
-        "(?:[^\\W\\d_](?:[\\w\\s!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)";
-    var REF_NAME = format('(?:{0}|`{1}`)', NAME, NAME_WWS);
-
-    var TEXT1 = "(?:[^\\s\\|](?:[^\\|]*[^\\s\\|])?)";
-    var TEXT2 = "(?:[^\\`]+)",
-        rx_TEXT2 = new RegExp(format('^{0}', TEXT2));
-
-    var rx_section = new RegExp(
-        "^([!'#$%&\"()*+,-./:;<=>?@\\[\\\\\\]^_`{|}~])\\1{3,}\\s*$");
-    var rx_explicit = new RegExp(
-        format('^\\.\\.{0}', SEPA));
-    var rx_link = new RegExp(
-        format('^_{0}:{1}|^__:{1}', REF_NAME, TAIL));
-    var rx_directive = new RegExp(
-        format('^{0}::{1}', REF_NAME, TAIL));
-    var rx_substitution = new RegExp(
-        format('^\\|{0}\\|{1}{2}::{3}', TEXT1, SEPA, REF_NAME, TAIL));
-    var rx_footnote = new RegExp(
-        format('^\\[(?:\\d+|#{0}?|\\*)]{1}', REF_NAME, TAIL));
-    var rx_citation = new RegExp(
-        format('^\\[{0}\\]{1}', REF_NAME, TAIL));
-
-    var rx_substitution_ref = new RegExp(
-        format('^\\|{0}\\|', TEXT1));
-    var rx_footnote_ref = new RegExp(
-        format('^\\[(?:\\d+|#{0}?|\\*)]_', REF_NAME));
-    var rx_citation_ref = new RegExp(
-        format('^\\[{0}\\]_', REF_NAME));
-    var rx_link_ref1 = new RegExp(
-        format('^{0}__?', REF_NAME));
-    var rx_link_ref2 = new RegExp(
-        format('^`{0}`_', TEXT2));
-
-    var rx_role_pre = new RegExp(
-        format('^:{0}:`{1}`{2}', NAME, TEXT2, TAIL));
-    var rx_role_suf = new RegExp(
-        format('^`{1}`:{0}:{2}', NAME, TEXT2, TAIL));
-    var rx_role = new RegExp(
-        format('^:{0}:{1}', NAME, TAIL));
-
-    var rx_directive_name = new RegExp(format('^{0}', REF_NAME));
-    var rx_directive_tail = new RegExp(format('^::{0}', TAIL));
-    var rx_substitution_text = new RegExp(format('^\\|{0}\\|', TEXT1));
-    var rx_substitution_sepa = new RegExp(format('^{0}', SEPA));
-    var rx_substitution_name = new RegExp(format('^{0}', REF_NAME));
-    var rx_substitution_tail = new RegExp(format('^::{0}', TAIL));
-    var rx_link_head = new RegExp("^_");
-    var rx_link_name = new RegExp(format('^{0}|_', REF_NAME));
-    var rx_link_tail = new RegExp(format('^:{0}', TAIL));
-
-    var rx_verbatim = new RegExp('^::\\s*$');
-    var rx_examples = new RegExp('^\\s+(?:>>>|In \\[\\d+\\]:)\\s');
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    function to_normal(stream, state) {
-        var token = null;
-
-        if (stream.sol() && stream.match(rx_examples, false)) {
-            change(state, to_mode, {
-                mode: mode_python, local: mode_python.startState()
-            });
-        } else if (stream.sol() && stream.match(rx_explicit)) {
-            change(state, to_explicit);
-            token = 'meta';
-        } else if (stream.sol() && stream.match(rx_section)) {
-            change(state, to_normal);
-            token = 'header';
-        } else if (phase(state) == rx_role_pre ||
-            stream.match(rx_role_pre, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_normal, context(rx_role_pre, 1));
-                    assert(stream.match(/^:/));
-                    token = 'meta';
-                    break;
-                case 1:
-                    change(state, to_normal, context(rx_role_pre, 2));
-                    assert(stream.match(rx_NAME));
-                    token = 'keyword';
-
-                    if (stream.current().match(/^(?:math|latex)/)) {
-                        state.tmp_stex = true;
-                    }
-                    break;
-                case 2:
-                    change(state, to_normal, context(rx_role_pre, 3));
-                    assert(stream.match(/^:`/));
-                    token = 'meta';
-                    break;
-                case 3:
-                    if (state.tmp_stex) {
-                        state.tmp_stex = undefined; state.tmp = {
-                            mode: mode_stex, local: mode_stex.startState()
-                        };
-                    }
-
-                    if (state.tmp) {
-                        if (stream.peek() == '`') {
-                            change(state, to_normal, context(rx_role_pre, 4));
-                            state.tmp = undefined;
-                            break;
-                        }
-
-                        token = state.tmp.mode.token(stream, state.tmp.local);
-                        break;
-                    }
-
-                    change(state, to_normal, context(rx_role_pre, 4));
-                    assert(stream.match(rx_TEXT2));
-                    token = 'string';
-                    break;
-                case 4:
-                    change(state, to_normal, context(rx_role_pre, 5));
-                    assert(stream.match(/^`/));
-                    token = 'meta';
-                    break;
-                case 5:
-                    change(state, to_normal, context(rx_role_pre, 6));
-                    assert(stream.match(rx_TAIL));
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (phase(state) == rx_role_suf ||
-            stream.match(rx_role_suf, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_normal, context(rx_role_suf, 1));
-                    assert(stream.match(/^`/));
-                    token = 'meta';
-                    break;
-                case 1:
-                    change(state, to_normal, context(rx_role_suf, 2));
-                    assert(stream.match(rx_TEXT2));
-                    token = 'string';
-                    break;
-                case 2:
-                    change(state, to_normal, context(rx_role_suf, 3));
-                    assert(stream.match(/^`:/));
-                    token = 'meta';
-                    break;
-                case 3:
-                    change(state, to_normal, context(rx_role_suf, 4));
-                    assert(stream.match(rx_NAME));
-                    token = 'keyword';
-                    break;
-                case 4:
-                    change(state, to_normal, context(rx_role_suf, 5));
-                    assert(stream.match(/^:/));
-                    token = 'meta';
-                    break;
-                case 5:
-                    change(state, to_normal, context(rx_role_suf, 6));
-                    assert(stream.match(rx_TAIL));
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (phase(state) == rx_role || stream.match(rx_role, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_normal, context(rx_role, 1));
-                    assert(stream.match(/^:/));
-                    token = 'meta';
-                    break;
-                case 1:
-                    change(state, to_normal, context(rx_role, 2));
-                    assert(stream.match(rx_NAME));
-                    token = 'keyword';
-                    break;
-                case 2:
-                    change(state, to_normal, context(rx_role, 3));
-                    assert(stream.match(/^:/));
-                    token = 'meta';
-                    break;
-                case 3:
-                    change(state, to_normal, context(rx_role, 4));
-                    assert(stream.match(rx_TAIL));
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (phase(state) == rx_substitution_ref ||
-            stream.match(rx_substitution_ref, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_normal, context(rx_substitution_ref, 1));
-                    assert(stream.match(rx_substitution_text));
-                    token = 'variable-2';
-                    break;
-                case 1:
-                    change(state, to_normal, context(rx_substitution_ref, 2));
-                    if (stream.match(/^_?_?/)) token = 'link';
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (stream.match(rx_footnote_ref)) {
-            change(state, to_normal);
-            token = 'quote';
-        } else if (stream.match(rx_citation_ref)) {
-            change(state, to_normal);
-            token = 'quote';
-        } else if (stream.match(rx_link_ref1)) {
-            change(state, to_normal);
-            if (!stream.peek() || stream.peek().match(/^\W$/)) {
-                token = 'link';
-            }
-        } else if (phase(state) == rx_link_ref2 ||
-            stream.match(rx_link_ref2, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    if (!stream.peek() || stream.peek().match(/^\W$/)) {
-                        change(state, to_normal, context(rx_link_ref2, 1));
-                    } else {
-                        stream.match(rx_link_ref2);
-                    }
-                    break;
-                case 1:
-                    change(state, to_normal, context(rx_link_ref2, 2));
-                    assert(stream.match(/^`/));
-                    token = 'link';
-                    break;
-                case 2:
-                    change(state, to_normal, context(rx_link_ref2, 3));
-                    assert(stream.match(rx_TEXT2));
-                    break;
-                case 3:
-                    change(state, to_normal, context(rx_link_ref2, 4));
-                    assert(stream.match(/^`_/));
-                    token = 'link';
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (stream.match(rx_verbatim)) {
-            change(state, to_verbatim);
-        }
-
-        else {
-            if (stream.next()) change(state, to_normal);
-        }
-
-        return token;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    function to_explicit(stream, state) {
-        var token = null;
-
-        if (phase(state) == rx_substitution ||
-            stream.match(rx_substitution, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_explicit, context(rx_substitution, 1));
-                    assert(stream.match(rx_substitution_text));
-                    token = 'variable-2';
-                    break;
-                case 1:
-                    change(state, to_explicit, context(rx_substitution, 2));
-                    assert(stream.match(rx_substitution_sepa));
-                    break;
-                case 2:
-                    change(state, to_explicit, context(rx_substitution, 3));
-                    assert(stream.match(rx_substitution_name));
-                    token = 'keyword';
-                    break;
-                case 3:
-                    change(state, to_explicit, context(rx_substitution, 4));
-                    assert(stream.match(rx_substitution_tail));
-                    token = 'meta';
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (phase(state) == rx_directive ||
-            stream.match(rx_directive, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_explicit, context(rx_directive, 1));
-                    assert(stream.match(rx_directive_name));
-                    token = 'keyword';
-
-                    if (stream.current().match(/^(?:math|latex)/))
-                        state.tmp_stex = true;
-                    else if (stream.current().match(/^python/))
-                        state.tmp_py = true;
-                    break;
-                case 1:
-                    change(state, to_explicit, context(rx_directive, 2));
-                    assert(stream.match(rx_directive_tail));
-                    token = 'meta';
-
-                    if (stream.match(/^latex\s*$/) || state.tmp_stex) {
-                        state.tmp_stex = undefined; change(state, to_mode, {
-                            mode: mode_stex, local: mode_stex.startState()
-                        });
-                    }
-                    break;
-                case 2:
-                    change(state, to_explicit, context(rx_directive, 3));
-                    if (stream.match(/^python\s*$/) || state.tmp_py) {
-                        state.tmp_py = undefined; change(state, to_mode, {
-                            mode: mode_python, local: mode_python.startState()
-                        });
-                    }
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (phase(state) == rx_link || stream.match(rx_link, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_explicit, context(rx_link, 1));
-                    assert(stream.match(rx_link_head));
-                    assert(stream.match(rx_link_name));
-                    token = 'link';
-                    break;
-                case 1:
-                    change(state, to_explicit, context(rx_link, 2));
-                    assert(stream.match(rx_link_tail));
-                    token = 'meta';
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (stream.match(rx_footnote)) {
-            change(state, to_normal);
-            token = 'quote';
-        } else if (stream.match(rx_citation)) {
-            change(state, to_normal);
-            token = 'quote';
-        }
-
-        else {
-            stream.eatSpace();
-            if (stream.eol()) {
-                change(state, to_normal);
-            } else {
-                stream.skipToEnd();
-                change(state, to_comment);
-                token = 'comment';
-            }
-        }
-
-        return token;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    function to_comment(stream, state) {
-        return as_block(stream, state, 'comment');
-    }
-
-    function to_verbatim(stream, state) {
-        return as_block(stream, state, 'meta');
-    }
-
-    function as_block(stream, state, token) {
-        if (stream.eol() || stream.eatSpace()) {
-            stream.skipToEnd();
-            return token;
-        } else {
-            change(state, to_normal);
-            return null;
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    function to_mode(stream, state) {
-
-        if (state.ctx.mode && state.ctx.local) {
-
-            if (stream.sol()) {
-                if (!stream.eatSpace()) change(state, to_normal);
-                return null;
-            }
-
-            return state.ctx.mode.token(stream, state.ctx.local);
-        }
-
-        change(state, to_normal);
-        return null;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    function context(phase, stage, mode, local) {
-        return {phase: phase, stage: stage, mode: mode, local: local};
-    }
-
-    function change(state, tok, ctx) {
-        state.tok = tok;
-        state.ctx = ctx || {};
-    }
-
-    function stage(state) {
-        return state.ctx.stage || 0;
-    }
-
-    function phase(state) {
-        return state.ctx.phase;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    return {
-        startState: function () {
-            return {tok: to_normal, ctx: context(undefined, 0)};
-        },
-
-        copyState: function (state) {
-            return {tok: state.tok, ctx: state.ctx};
-        },
-
-        innerMode: function (state) {
-            return state.tmp ? {state: state.tmp.local, mode: state.tmp.mode}
-                 : state.ctx ? {state: state.ctx.local, mode: state.ctx.mode}
-                             : null;
-        },
-
-        token: function (stream, state) {
-            return state.tok(stream, state);
-        }
-    };
-}, 'python', 'stex');
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-CodeMirror.defineMode('rst', function (config, options) {
-
-    var rx_strong = /^\*\*[^\*\s](?:[^\*]*[^\*\s])?\*\*/;
-    var rx_emphasis = /^\*[^\*\s](?:[^\*]*[^\*\s])?\*/;
-    var rx_literal = /^``[^`\s](?:[^`]*[^`\s])``/;
-
-    var rx_number = /^(?:[\d]+(?:[\.,]\d+)*)/;
-    var rx_positive = /^(?:\s\+[\d]+(?:[\.,]\d+)*)/;
-    var rx_negative = /^(?:\s\-[\d]+(?:[\.,]\d+)*)/;
-
-    var rx_uri_protocol = "[Hh][Tt][Tt][Pp][Ss]?://";
-    var rx_uri_domain = "(?:[\\d\\w.-]+)\\.(?:\\w{2,6})";
-    var rx_uri_path = "(?:/[\\d\\w\\#\\%\\&\\-\\.\\,\\/\\:\\=\\?\\~]+)*";
-    var rx_uri = new RegExp("^" +
-        rx_uri_protocol + rx_uri_domain + rx_uri_path
-    );
-
-    var overlay = {
-        token: function (stream) {
-
-            if (stream.match(rx_strong) && stream.match (/\W+|$/, false))
-                return 'strong';
-            if (stream.match(rx_emphasis) && stream.match (/\W+|$/, false))
-                return 'em';
-            if (stream.match(rx_literal) && stream.match (/\W+|$/, false))
-                return 'string-2';
-            if (stream.match(rx_number))
-                return 'number';
-            if (stream.match(rx_positive))
-                return 'positive';
-            if (stream.match(rx_negative))
-                return 'negative';
-            if (stream.match(rx_uri))
-                return 'link';
-
-            while (stream.next() != null) {
-                if (stream.match(rx_strong, false)) break;
-                if (stream.match(rx_emphasis, false)) break;
-                if (stream.match(rx_literal, false)) break;
-                if (stream.match(rx_number, false)) break;
-                if (stream.match(rx_positive, false)) break;
-                if (stream.match(rx_negative, false)) break;
-                if (stream.match(rx_uri, false)) break;
-            }
-
-            return null;
-        }
-    };
-
-    var mode = CodeMirror.getMode(
-        config, options.backdrop || 'rst-base'
-    );
-
-    return CodeMirror.overlayMode(mode, overlay, true); // combine
-}, 'python', 'stex');
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-CodeMirror.defineMIME('text/x-rst', 'rst');
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
diff --git a/resources/libs/codemirror/mode/ruby/index.html b/resources/libs/codemirror/mode/ruby/index.html
deleted file mode 100644
index 2b3e1a3eb..000000000
--- a/resources/libs/codemirror/mode/ruby/index.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Ruby mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="ruby.js"></script>
-<style>
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .cm-s-default span.cm-arrow { color: red; }
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Ruby</a>
-  </ul>
-</div>
-
-<article>
-<h2>Ruby mode</h2>
-<form><textarea id="code" name="code">
-# Code from http://sandbox.mc.edu/~bennet/ruby/code/poly_rb.html
-#
-# This program evaluates polynomials.  It first asks for the coefficients
-# of a polynomial, which must be entered on one line, highest-order first.
-# It then requests values of x and will compute the value of the poly for
-# each x.  It will repeatly ask for x values, unless you the user enters
-# a blank line.  It that case, it will ask for another polynomial.  If the
-# user types quit for either input, the program immediately exits.
-#
-
-#
-# Function to evaluate a polynomial at x.  The polynomial is given
-# as a list of coefficients, from the greatest to the least.
-def polyval(x, coef)
-    sum = 0
-    coef = coef.clone           # Don't want to destroy the original
-    while true
-        sum += coef.shift       # Add and remove the next coef
-        break if coef.empty?    # If no more, done entirely.
-        sum *= x                # This happens the right number of times.
-    end
-    return sum
-end
-
-#
-# Function to read a line containing a list of integers and return
-# them as an array of integers.  If the string conversion fails, it
-# throws TypeError.  If the input line is the word 'quit', then it
-# converts it to an end-of-file exception
-def readints(prompt)
-    # Read a line
-    print prompt
-    line = readline.chomp
-    raise EOFError.new if line == 'quit' # You can also use a real EOF.
-            
-    # Go through each item on the line, converting each one and adding it
-    # to retval.
-    retval = [ ]
-    for str in line.split(/\s+/)
-        if str =~ /^\-?\d+$/
-            retval.push(str.to_i)
-        else
-            raise TypeError.new
-        end
-    end
-
-    return retval
-end
-
-#
-# Take a coeff and an exponent and return the string representation, ignoring
-# the sign of the coefficient.
-def term_to_str(coef, exp)
-    ret = ""
-
-    # Show coeff, unless it's 1 or at the right
-    coef = coef.abs
-    ret = coef.to_s     unless coef == 1 && exp > 0
-    ret += "x" if exp > 0                               # x if exponent not 0
-    ret += "^" + exp.to_s if exp > 1                    # ^exponent, if > 1.
-
-    return ret
-end
-
-#
-# Create a string of the polynomial in sort-of-readable form.
-def polystr(p)
-    # Get the exponent of first coefficient, plus 1.
-    exp = p.length
-
-    # Assign exponents to each term, making pairs of coeff and exponent,
-    # Then get rid of the zero terms.
-    p = (p.map { |c| exp -= 1; [ c, exp ] }).select { |p| p[0] != 0 }
-
-    # If there's nothing left, it's a zero
-    return "0" if p.empty?
-
-    # *** Now p is a non-empty list of [ coef, exponent ] pairs. ***
-
-    # Convert the first term, preceded by a "-" if it's negative.
-    result = (if p[0][0] < 0 then "-" else "" end) + term_to_str(*p[0])
-
-    # Convert the rest of the terms, in each case adding the appropriate
-    # + or - separating them.  
-    for term in p[1...p.length]
-        # Add the separator then the rep. of the term.
-        result += (if term[0] < 0 then " - " else " + " end) + 
-                term_to_str(*term)
-    end
-
-    return result
-end
-        
-#
-# Run until some kind of endfile.
-begin
-    # Repeat until an exception or quit gets us out.
-    while true
-        # Read a poly until it works.  An EOF will except out of the
-        # program.
-        print "\n"
-        begin
-            poly = readints("Enter a polynomial coefficients: ")
-        rescue TypeError
-            print "Try again.\n"
-            retry
-        end
-        break if poly.empty?
-
-        # Read and evaluate x values until the user types a blank line.
-        # Again, an EOF will except out of the pgm.
-        while true
-            # Request an integer.
-            print "Enter x value or blank line: "
-            x = readline.chomp
-            break if x == ''
-            raise EOFError.new if x == 'quit'
-
-            # If it looks bad, let's try again.
-            if x !~ /^\-?\d+$/
-                print "That doesn't look like an integer.  Please try again.\n"
-                next
-            end
-
-            # Convert to an integer and print the result.
-            x = x.to_i
-            print "p(x) = ", polystr(poly), "\n"
-            print "p(", x, ") = ", polyval(x, poly), "\n"
-        end
-    end
-rescue EOFError
-    print "\n=== EOF ===\n"
-rescue Interrupt, SignalException
-    print "\n=== Interrupted ===\n"
-else
-    print "--- Bye ---\n"
-end
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "text/x-ruby",
-        tabMode: "indent",
-        matchBrackets: true,
-        indentUnit: 4
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-ruby</code>.</p>
-
-    <p>Development of the CodeMirror Ruby mode was kindly sponsored
-    by <a href="http://ubalo.com/">Ubalo</a>, who hold
-    the <a href="LICENSE">license</a>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/ruby/ruby.js b/resources/libs/codemirror/mode/ruby/ruby.js
deleted file mode 100644
index 96cdd5f9d..000000000
--- a/resources/libs/codemirror/mode/ruby/ruby.js
+++ /dev/null
@@ -1,247 +0,0 @@
-CodeMirror.defineMode("ruby", function(config) {
-  function wordObj(words) {
-    var o = {};
-    for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
-    return o;
-  }
-  var keywords = wordObj([
-    "alias", "and", "BEGIN", "begin", "break", "case", "class", "def", "defined?", "do", "else",
-    "elsif", "END", "end", "ensure", "false", "for", "if", "in", "module", "next", "not", "or",
-    "redo", "rescue", "retry", "return", "self", "super", "then", "true", "undef", "unless",
-    "until", "when", "while", "yield", "nil", "raise", "throw", "catch", "fail", "loop", "callcc",
-    "caller", "lambda", "proc", "public", "protected", "private", "require", "load",
-    "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
-  ]);
-  var indentWords = wordObj(["def", "class", "case", "for", "while", "do", "module", "then",
-                             "catch", "loop", "proc", "begin"]);
-  var dedentWords = wordObj(["end", "until"]);
-  var matching = {"[": "]", "{": "}", "(": ")"};
-  var curPunc;
-
-  function chain(newtok, stream, state) {
-    state.tokenize.push(newtok);
-    return newtok(stream, state);
-  }
-
-  function tokenBase(stream, state) {
-    curPunc = null;
-    if (stream.sol() && stream.match("=begin") && stream.eol()) {
-      state.tokenize.push(readBlockComment);
-      return "comment";
-    }
-    if (stream.eatSpace()) return null;
-    var ch = stream.next(), m;
-    if (ch == "`" || ch == "'" || ch == '"') {
-      return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
-    } else if (ch == "/" && !stream.eol() && stream.peek() != " ") {
-      return chain(readQuoted(ch, "string-2", true), stream, state);
-    } else if (ch == "%") {
-      var style = "string", embed = true;
-      if (stream.eat("s")) style = "atom";
-      else if (stream.eat(/[WQ]/)) style = "string";
-      else if (stream.eat(/[r]/)) style = "string-2";
-      else if (stream.eat(/[wxq]/)) { style = "string"; embed = false; }
-      var delim = stream.eat(/[^\w\s]/);
-      if (!delim) return "operator";
-      if (matching.propertyIsEnumerable(delim)) delim = matching[delim];
-      return chain(readQuoted(delim, style, embed, true), stream, state);
-    } else if (ch == "#") {
-      stream.skipToEnd();
-      return "comment";
-    } else if (ch == "<" && (m = stream.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
-      return chain(readHereDoc(m[1]), stream, state);
-    } else if (ch == "0") {
-      if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/);
-      else if (stream.eat("b")) stream.eatWhile(/[01]/);
-      else stream.eatWhile(/[0-7]/);
-      return "number";
-    } else if (/\d/.test(ch)) {
-      stream.match(/^[\d_]*(?:\.[\d_]+)?(?:[eE][+\-]?[\d_]+)?/);
-      return "number";
-    } else if (ch == "?") {
-      while (stream.match(/^\\[CM]-/)) {}
-      if (stream.eat("\\")) stream.eatWhile(/\w/);
-      else stream.next();
-      return "string";
-    } else if (ch == ":") {
-      if (stream.eat("'")) return chain(readQuoted("'", "atom", false), stream, state);
-      if (stream.eat('"')) return chain(readQuoted('"', "atom", true), stream, state);
-
-      // :> :>> :< :<< are valid symbols
-      if (stream.eat(/[\<\>]/)) {
-        stream.eat(/[\<\>]/);
-        return "atom";
-      }
-
-      // :+ :- :/ :* :| :& :! are valid symbols
-      if (stream.eat(/[\+\-\*\/\&\|\:\!]/)) {
-        return "atom";
-      }
-
-      // Symbols can't start by a digit
-      if (stream.eat(/[a-zA-Z$@_]/)) {
-        stream.eatWhile(/[\w]/);
-        // Only one ? ! = is allowed and only as the last character
-        stream.eat(/[\?\!\=]/);
-        return "atom";
-      }
-      return "operator";
-    } else if (ch == "@" && stream.match(/^@?[a-zA-Z_]/)) {
-      stream.eat("@");
-      stream.eatWhile(/[\w]/);
-      return "variable-2";
-    } else if (ch == "$") {
-      if (stream.eat(/[a-zA-Z_]/)) {
-        stream.eatWhile(/[\w]/);
-      } else if (stream.eat(/\d/)) {
-        stream.eat(/\d/);
-      } else {
-        stream.next(); // Must be a special global like $: or $!
-      }
-      return "variable-3";
-    } else if (/[a-zA-Z_]/.test(ch)) {
-      stream.eatWhile(/[\w]/);
-      stream.eat(/[\?\!]/);
-      if (stream.eat(":")) return "atom";
-      return "ident";
-    } else if (ch == "|" && (state.varList || state.lastTok == "{" || state.lastTok == "do")) {
-      curPunc = "|";
-      return null;
-    } else if (/[\(\)\[\]{}\\;]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    } else if (ch == "-" && stream.eat(">")) {
-      return "arrow";
-    } else if (/[=+\-\/*:\.^%<>~|]/.test(ch)) {
-      stream.eatWhile(/[=+\-\/*:\.^%<>~|]/);
-      return "operator";
-    } else {
-      return null;
-    }
-  }
-
-  function tokenBaseUntilBrace() {
-    var depth = 1;
-    return function(stream, state) {
-      if (stream.peek() == "}") {
-        depth--;
-        if (depth == 0) {
-          state.tokenize.pop();
-          return state.tokenize[state.tokenize.length-1](stream, state);
-        }
-      } else if (stream.peek() == "{") {
-        depth++;
-      }
-      return tokenBase(stream, state);
-    };
-  }
-  function tokenBaseOnce() {
-    var alreadyCalled = false;
-    return function(stream, state) {
-      if (alreadyCalled) {
-        state.tokenize.pop();
-        return state.tokenize[state.tokenize.length-1](stream, state);
-      }
-      alreadyCalled = true;
-      return tokenBase(stream, state);
-    };
-  }
-  function readQuoted(quote, style, embed, unescaped) {
-    return function(stream, state) {
-      var escaped = false, ch;
-
-      if (state.context.type === 'read-quoted-paused') {
-        state.context = state.context.prev;
-        stream.eat("}");
-      }
-
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && (unescaped || !escaped)) {
-          state.tokenize.pop();
-          break;
-        }
-        if (embed && ch == "#" && !escaped) {
-          if (stream.eat("{")) {
-            if (quote == "}") {
-              state.context = {prev: state.context, type: 'read-quoted-paused'};
-            }
-            state.tokenize.push(tokenBaseUntilBrace());
-            break;
-          } else if (/[@\$]/.test(stream.peek())) {
-            state.tokenize.push(tokenBaseOnce());
-            break;
-          }
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      return style;
-    };
-  }
-  function readHereDoc(phrase) {
-    return function(stream, state) {
-      if (stream.match(phrase)) state.tokenize.pop();
-      else stream.skipToEnd();
-      return "string";
-    };
-  }
-  function readBlockComment(stream, state) {
-    if (stream.sol() && stream.match("=end") && stream.eol())
-      state.tokenize.pop();
-    stream.skipToEnd();
-    return "comment";
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: [tokenBase],
-              indented: 0,
-              context: {type: "top", indented: -config.indentUnit},
-              continuedLine: false,
-              lastTok: null,
-              varList: false};
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) state.indented = stream.indentation();
-      var style = state.tokenize[state.tokenize.length-1](stream, state), kwtype;
-      if (style == "ident") {
-        var word = stream.current();
-        style = keywords.propertyIsEnumerable(stream.current()) ? "keyword"
-          : /^[A-Z]/.test(word) ? "tag"
-          : (state.lastTok == "def" || state.lastTok == "class" || state.varList) ? "def"
-          : "variable";
-        if (indentWords.propertyIsEnumerable(word)) kwtype = "indent";
-        else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent";
-        else if ((word == "if" || word == "unless") && stream.column() == stream.indentation())
-          kwtype = "indent";
-      }
-      if (curPunc || (style && style != "comment")) state.lastTok = word || curPunc || style;
-      if (curPunc == "|") state.varList = !state.varList;
-
-      if (kwtype == "indent" || /[\(\[\{]/.test(curPunc))
-        state.context = {prev: state.context, type: curPunc || style, indented: state.indented};
-      else if ((kwtype == "dedent" || /[\)\]\}]/.test(curPunc)) && state.context.prev)
-        state.context = state.context.prev;
-
-      if (stream.eol())
-        state.continuedLine = (curPunc == "\\" || style == "operator");
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize[state.tokenize.length-1] != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0);
-      var ct = state.context;
-      var closing = ct.type == matching[firstChar] ||
-        ct.type == "keyword" && /^(?:end|until|else|elsif|when|rescue)\b/.test(textAfter);
-      return ct.indented + (closing ? 0 : config.indentUnit) +
-        (state.continuedLine ? config.indentUnit : 0);
-    },
-
-    electricChars: "}de", // enD and rescuE
-    lineComment: "#"
-  };
-});
-
-CodeMirror.defineMIME("text/x-ruby", "ruby");
-
diff --git a/resources/libs/codemirror/mode/rust/index.html b/resources/libs/codemirror/mode/rust/index.html
deleted file mode 100644
index b0b4c2416..000000000
--- a/resources/libs/codemirror/mode/rust/index.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Rust mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="rust.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Rust</a>
-  </ul>
-</div>
-
-<article>
-<h2>Rust mode</h2>
-
-
-<div><textarea id="code" name="code">
-// Demo code.
-
-type foo<T> = int;
-enum bar {
-    some(int, foo<float>),
-    none
-}
-
-fn check_crate(x: int) {
-    let v = 10;
-    alt foo {
-      1 to 3 {
-        print_foo();
-        if x {
-            blah() + 10;
-        }
-      }
-      (x, y) { "bye" }
-      _ { "hi" }
-    }
-}
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        tabMode: "indent"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-rustsrc</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/rust/rust.js b/resources/libs/codemirror/mode/rust/rust.js
deleted file mode 100644
index c7530b6cc..000000000
--- a/resources/libs/codemirror/mode/rust/rust.js
+++ /dev/null
@@ -1,436 +0,0 @@
-CodeMirror.defineMode("rust", function() {
-  var indentUnit = 4, altIndentUnit = 2;
-  var valKeywords = {
-    "if": "if-style", "while": "if-style", "else": "else-style",
-    "do": "else-style", "ret": "else-style", "fail": "else-style",
-    "break": "atom", "cont": "atom", "const": "let", "resource": "fn",
-    "let": "let", "fn": "fn", "for": "for", "alt": "alt", "iface": "iface",
-    "impl": "impl", "type": "type", "enum": "enum", "mod": "mod",
-    "as": "op", "true": "atom", "false": "atom", "assert": "op", "check": "op",
-    "claim": "op", "native": "ignore", "unsafe": "ignore", "import": "else-style",
-    "export": "else-style", "copy": "op", "log": "op", "log_err": "op",
-    "use": "op", "bind": "op", "self": "atom"
-  };
-  var typeKeywords = function() {
-    var keywords = {"fn": "fn", "block": "fn", "obj": "obj"};
-    var atoms = "bool uint int i8 i16 i32 i64 u8 u16 u32 u64 float f32 f64 str char".split(" ");
-    for (var i = 0, e = atoms.length; i < e; ++i) keywords[atoms[i]] = "atom";
-    return keywords;
-  }();
-  var operatorChar = /[+\-*&%=<>!?|\.@]/;
-
-  // Tokenizer
-
-  // Used as scratch variable to communicate multiple values without
-  // consing up tons of objects.
-  var tcat, content;
-  function r(tc, style) {
-    tcat = tc;
-    return style;
-  }
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"') {
-      state.tokenize = tokenString;
-      return state.tokenize(stream, state);
-    }
-    if (ch == "'") {
-      tcat = "atom";
-      if (stream.eat("\\")) {
-        if (stream.skipTo("'")) { stream.next(); return "string"; }
-        else { return "error"; }
-      } else {
-        stream.next();
-        return stream.eat("'") ? "string" : "error";
-      }
-    }
-    if (ch == "/") {
-      if (stream.eat("/")) { stream.skipToEnd(); return "comment"; }
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment(1);
-        return state.tokenize(stream, state);
-      }
-    }
-    if (ch == "#") {
-      if (stream.eat("[")) { tcat = "open-attr"; return null; }
-      stream.eatWhile(/\w/);
-      return r("macro", "meta");
-    }
-    if (ch == ":" && stream.match(":<")) {
-      return r("op", null);
-    }
-    if (ch.match(/\d/) || (ch == "." && stream.eat(/\d/))) {
-      var flp = false;
-      if (!stream.match(/^x[\da-f]+/i) && !stream.match(/^b[01]+/)) {
-        stream.eatWhile(/\d/);
-        if (stream.eat(".")) { flp = true; stream.eatWhile(/\d/); }
-        if (stream.match(/^e[+\-]?\d+/i)) { flp = true; }
-      }
-      if (flp) stream.match(/^f(?:32|64)/);
-      else stream.match(/^[ui](?:8|16|32|64)/);
-      return r("atom", "number");
-    }
-    if (ch.match(/[()\[\]{}:;,]/)) return r(ch, null);
-    if (ch == "-" && stream.eat(">")) return r("->", null);
-    if (ch.match(operatorChar)) {
-      stream.eatWhile(operatorChar);
-      return r("op", null);
-    }
-    stream.eatWhile(/\w/);
-    content = stream.current();
-    if (stream.match(/^::\w/)) {
-      stream.backUp(1);
-      return r("prefix", "variable-2");
-    }
-    if (state.keywords.propertyIsEnumerable(content))
-      return r(state.keywords[content], content.match(/true|false/) ? "atom" : "keyword");
-    return r("name", "variable");
-  }
-
-  function tokenString(stream, state) {
-    var ch, escaped = false;
-    while (ch = stream.next()) {
-      if (ch == '"' && !escaped) {
-        state.tokenize = tokenBase;
-        return r("atom", "string");
-      }
-      escaped = !escaped && ch == "\\";
-    }
-    // Hack to not confuse the parser when a string is split in
-    // pieces.
-    return r("op", "string");
-  }
-
-  function tokenComment(depth) {
-    return function(stream, state) {
-      var lastCh = null, ch;
-      while (ch = stream.next()) {
-        if (ch == "/" && lastCh == "*") {
-          if (depth == 1) {
-            state.tokenize = tokenBase;
-            break;
-          } else {
-            state.tokenize = tokenComment(depth - 1);
-            return state.tokenize(stream, state);
-          }
-        }
-        if (ch == "*" && lastCh == "/") {
-          state.tokenize = tokenComment(depth + 1);
-          return state.tokenize(stream, state);
-        }
-        lastCh = ch;
-      }
-      return "comment";
-    };
-  }
-
-  // Parser
-
-  var cx = {state: null, stream: null, marked: null, cc: null};
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-
-  function pushlex(type, info) {
-    var result = function() {
-      var state = cx.state;
-      state.lexical = {indented: state.indented, column: cx.stream.column(),
-                       type: type, prev: state.lexical, info: info};
-    };
-    result.lex = true;
-    return result;
-  }
-  function poplex() {
-    var state = cx.state;
-    if (state.lexical.prev) {
-      if (state.lexical.type == ")")
-        state.indented = state.lexical.indented;
-      state.lexical = state.lexical.prev;
-    }
-  }
-  function typecx() { cx.state.keywords = typeKeywords; }
-  function valcx() { cx.state.keywords = valKeywords; }
-  poplex.lex = typecx.lex = valcx.lex = true;
-
-  function commasep(comb, end) {
-    function more(type) {
-      if (type == ",") return cont(comb, more);
-      if (type == end) return cont();
-      return cont(more);
-    }
-    return function(type) {
-      if (type == end) return cont();
-      return pass(comb, more);
-    };
-  }
-
-  function stat_of(comb, tag) {
-    return cont(pushlex("stat", tag), comb, poplex, block);
-  }
-  function block(type) {
-    if (type == "}") return cont();
-    if (type == "let") return stat_of(letdef1, "let");
-    if (type == "fn") return stat_of(fndef);
-    if (type == "type") return cont(pushlex("stat"), tydef, endstatement, poplex, block);
-    if (type == "enum") return stat_of(enumdef);
-    if (type == "mod") return stat_of(mod);
-    if (type == "iface") return stat_of(iface);
-    if (type == "impl") return stat_of(impl);
-    if (type == "open-attr") return cont(pushlex("]"), commasep(expression, "]"), poplex);
-    if (type == "ignore" || type.match(/[\]\);,]/)) return cont(block);
-    return pass(pushlex("stat"), expression, poplex, endstatement, block);
-  }
-  function endstatement(type) {
-    if (type == ";") return cont();
-    return pass();
-  }
-  function expression(type) {
-    if (type == "atom" || type == "name") return cont(maybeop);
-    if (type == "{") return cont(pushlex("}"), exprbrace, poplex);
-    if (type.match(/[\[\(]/)) return matchBrackets(type, expression);
-    if (type.match(/[\]\)\};,]/)) return pass();
-    if (type == "if-style") return cont(expression, expression);
-    if (type == "else-style" || type == "op") return cont(expression);
-    if (type == "for") return cont(pattern, maybetype, inop, expression, expression);
-    if (type == "alt") return cont(expression, altbody);
-    if (type == "fn") return cont(fndef);
-    if (type == "macro") return cont(macro);
-    return cont();
-  }
-  function maybeop(type) {
-    if (content == ".") return cont(maybeprop);
-    if (content == "::<"){return cont(typarams, maybeop);}
-    if (type == "op" || content == ":") return cont(expression);
-    if (type == "(" || type == "[") return matchBrackets(type, expression);
-    return pass();
-  }
-  function maybeprop() {
-    if (content.match(/^\w+$/)) {cx.marked = "variable"; return cont(maybeop);}
-    return pass(expression);
-  }
-  function exprbrace(type) {
-    if (type == "op") {
-      if (content == "|") return cont(blockvars, poplex, pushlex("}", "block"), block);
-      if (content == "||") return cont(poplex, pushlex("}", "block"), block);
-    }
-    if (content == "mutable" || (content.match(/^\w+$/) && cx.stream.peek() == ":"
-                                 && !cx.stream.match("::", false)))
-      return pass(record_of(expression));
-    return pass(block);
-  }
-  function record_of(comb) {
-    function ro(type) {
-      if (content == "mutable" || content == "with") {cx.marked = "keyword"; return cont(ro);}
-      if (content.match(/^\w*$/)) {cx.marked = "variable"; return cont(ro);}
-      if (type == ":") return cont(comb, ro);
-      if (type == "}") return cont();
-      return cont(ro);
-    }
-    return ro;
-  }
-  function blockvars(type) {
-    if (type == "name") {cx.marked = "def"; return cont(blockvars);}
-    if (type == "op" && content == "|") return cont();
-    return cont(blockvars);
-  }
-
-  function letdef1(type) {
-    if (type.match(/[\]\)\};]/)) return cont();
-    if (content == "=") return cont(expression, letdef2);
-    if (type == ",") return cont(letdef1);
-    return pass(pattern, maybetype, letdef1);
-  }
-  function letdef2(type) {
-    if (type.match(/[\]\)\};,]/)) return pass(letdef1);
-    else return pass(expression, letdef2);
-  }
-  function maybetype(type) {
-    if (type == ":") return cont(typecx, rtype, valcx);
-    return pass();
-  }
-  function inop(type) {
-    if (type == "name" && content == "in") {cx.marked = "keyword"; return cont();}
-    return pass();
-  }
-  function fndef(type) {
-    if (content == "@" || content == "~") {cx.marked = "keyword"; return cont(fndef);}
-    if (type == "name") {cx.marked = "def"; return cont(fndef);}
-    if (content == "<") return cont(typarams, fndef);
-    if (type == "{") return pass(expression);
-    if (type == "(") return cont(pushlex(")"), commasep(argdef, ")"), poplex, fndef);
-    if (type == "->") return cont(typecx, rtype, valcx, fndef);
-    if (type == ";") return cont();
-    return cont(fndef);
-  }
-  function tydef(type) {
-    if (type == "name") {cx.marked = "def"; return cont(tydef);}
-    if (content == "<") return cont(typarams, tydef);
-    if (content == "=") return cont(typecx, rtype, valcx);
-    return cont(tydef);
-  }
-  function enumdef(type) {
-    if (type == "name") {cx.marked = "def"; return cont(enumdef);}
-    if (content == "<") return cont(typarams, enumdef);
-    if (content == "=") return cont(typecx, rtype, valcx, endstatement);
-    if (type == "{") return cont(pushlex("}"), typecx, enumblock, valcx, poplex);
-    return cont(enumdef);
-  }
-  function enumblock(type) {
-    if (type == "}") return cont();
-    if (type == "(") return cont(pushlex(")"), commasep(rtype, ")"), poplex, enumblock);
-    if (content.match(/^\w+$/)) cx.marked = "def";
-    return cont(enumblock);
-  }
-  function mod(type) {
-    if (type == "name") {cx.marked = "def"; return cont(mod);}
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    return pass();
-  }
-  function iface(type) {
-    if (type == "name") {cx.marked = "def"; return cont(iface);}
-    if (content == "<") return cont(typarams, iface);
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    return pass();
-  }
-  function impl(type) {
-    if (content == "<") return cont(typarams, impl);
-    if (content == "of" || content == "for") {cx.marked = "keyword"; return cont(rtype, impl);}
-    if (type == "name") {cx.marked = "def"; return cont(impl);}
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    return pass();
-  }
-  function typarams() {
-    if (content == ">") return cont();
-    if (content == ",") return cont(typarams);
-    if (content == ":") return cont(rtype, typarams);
-    return pass(rtype, typarams);
-  }
-  function argdef(type) {
-    if (type == "name") {cx.marked = "def"; return cont(argdef);}
-    if (type == ":") return cont(typecx, rtype, valcx);
-    return pass();
-  }
-  function rtype(type) {
-    if (type == "name") {cx.marked = "variable-3"; return cont(rtypemaybeparam); }
-    if (content == "mutable") {cx.marked = "keyword"; return cont(rtype);}
-    if (type == "atom") return cont(rtypemaybeparam);
-    if (type == "op" || type == "obj") return cont(rtype);
-    if (type == "fn") return cont(fntype);
-    if (type == "{") return cont(pushlex("{"), record_of(rtype), poplex);
-    return matchBrackets(type, rtype);
-  }
-  function rtypemaybeparam() {
-    if (content == "<") return cont(typarams);
-    return pass();
-  }
-  function fntype(type) {
-    if (type == "(") return cont(pushlex("("), commasep(rtype, ")"), poplex, fntype);
-    if (type == "->") return cont(rtype);
-    return pass();
-  }
-  function pattern(type) {
-    if (type == "name") {cx.marked = "def"; return cont(patternmaybeop);}
-    if (type == "atom") return cont(patternmaybeop);
-    if (type == "op") return cont(pattern);
-    if (type.match(/[\]\)\};,]/)) return pass();
-    return matchBrackets(type, pattern);
-  }
-  function patternmaybeop(type) {
-    if (type == "op" && content == ".") return cont();
-    if (content == "to") {cx.marked = "keyword"; return cont(pattern);}
-    else return pass();
-  }
-  function altbody(type) {
-    if (type == "{") return cont(pushlex("}", "alt"), altblock1, poplex);
-    return pass();
-  }
-  function altblock1(type) {
-    if (type == "}") return cont();
-    if (type == "|") return cont(altblock1);
-    if (content == "when") {cx.marked = "keyword"; return cont(expression, altblock2);}
-    if (type.match(/[\]\);,]/)) return cont(altblock1);
-    return pass(pattern, altblock2);
-  }
-  function altblock2(type) {
-    if (type == "{") return cont(pushlex("}", "alt"), block, poplex, altblock1);
-    else return pass(altblock1);
-  }
-
-  function macro(type) {
-    if (type.match(/[\[\(\{]/)) return matchBrackets(type, expression);
-    return pass();
-  }
-  function matchBrackets(type, comb) {
-    if (type == "[") return cont(pushlex("]"), commasep(comb, "]"), poplex);
-    if (type == "(") return cont(pushlex(")"), commasep(comb, ")"), poplex);
-    if (type == "{") return cont(pushlex("}"), commasep(comb, "}"), poplex);
-    return cont();
-  }
-
-  function parse(state, stream, style) {
-    var cc = state.cc;
-    // Communicate our context to the combinators.
-    // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
-
-    while (true) {
-      var combinator = cc.length ? cc.pop() : block;
-      if (combinator(tcat)) {
-        while(cc.length && cc[cc.length - 1].lex)
-          cc.pop()();
-        return cx.marked || style;
-      }
-    }
-  }
-
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        cc: [],
-        lexical: {indented: -indentUnit, column: 0, type: "top", align: false},
-        keywords: valKeywords,
-        indented: 0
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (!state.lexical.hasOwnProperty("align"))
-          state.lexical.align = false;
-        state.indented = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      tcat = content = null;
-      var style = state.tokenize(stream, state);
-      if (style == "comment") return style;
-      if (!state.lexical.hasOwnProperty("align"))
-        state.lexical.align = true;
-      if (tcat == "prefix") return style;
-      if (!content) content = stream.current();
-      return parse(state, stream, style);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical,
-          type = lexical.type, closing = firstChar == type;
-      if (type == "stat") return lexical.indented + indentUnit;
-      if (lexical.align) return lexical.column + (closing ? 0 : 1);
-      return lexical.indented + (closing ? 0 : (lexical.info == "alt" ? altIndentUnit : indentUnit));
-    },
-
-    electricChars: "{}",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//",
-    fold: "brace"
-  };
-});
-
-CodeMirror.defineMIME("text/x-rustsrc", "rust");
diff --git a/resources/libs/codemirror/mode/sass/index.html b/resources/libs/codemirror/mode/sass/index.html
deleted file mode 100644
index 66d467784..000000000
--- a/resources/libs/codemirror/mode/sass/index.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Sass mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="sass.js"></script>
-<style>.CodeMirror {border: 1px solid #ddd; font-size:12px; height: 400px}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Sass</a>
-  </ul>
-</div>
-
-<article>
-<h2>Sass mode</h2>
-<form><textarea id="code" name="code">// Variable Definitions
-
-$page-width:    800px
-$sidebar-width: 200px
-$primary-color: #eeeeee
-
-// Global Attributes
-
-body
-  font:
-    family: sans-serif
-    size: 30em
-    weight: bold
-
-// Scoped Styles
-
-#contents
-  width: $page-width
-  #sidebar
-    float: right
-    width: $sidebar-width
-  #main
-    width: $page-width - $sidebar-width
-    background: $primary-color
-    h2
-      color: blue
-
-#footer
-  height: 200px
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers : true,
-        matchBrackets : true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-sass</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/sass/sass.js b/resources/libs/codemirror/mode/sass/sass.js
deleted file mode 100644
index 9c9a0dae0..000000000
--- a/resources/libs/codemirror/mode/sass/sass.js
+++ /dev/null
@@ -1,330 +0,0 @@
-CodeMirror.defineMode("sass", function(config) {
-  var tokenRegexp = function(words){
-    return new RegExp("^" + words.join("|"));
-  };
-
-  var keywords = ["true", "false", "null", "auto"];
-  var keywordsRegexp = new RegExp("^" + keywords.join("|"));
-
-  var operators = ["\\(", "\\)", "=", ">", "<", "==", ">=", "<=", "\\+", "-", "\\!=", "/", "\\*", "%", "and", "or", "not"];
-  var opRegexp = tokenRegexp(operators);
-
-  var pseudoElementsRegexp = /^::?[\w\-]+/;
-
-  var urlTokens = function(stream, state){
-    var ch = stream.peek();
-
-    if (ch === ")"){
-      stream.next();
-      state.tokenizer = tokenBase;
-      return "operator";
-    }else if (ch === "("){
-      stream.next();
-      stream.eatSpace();
-
-      return "operator";
-    }else if (ch === "'" || ch === '"'){
-      state.tokenizer = buildStringTokenizer(stream.next());
-      return "string";
-    }else{
-      state.tokenizer = buildStringTokenizer(")", false);
-      return "string";
-    }
-  };
-  var multilineComment = function(stream, state) {
-    if (stream.skipTo("*/")){
-      stream.next();
-      stream.next();
-      state.tokenizer = tokenBase;
-    }else {
-      stream.next();
-    }
-
-    return "comment";
-  };
-
-  var buildStringTokenizer = function(quote, greedy){
-    if(greedy == null){ greedy = true; }
-
-    function stringTokenizer(stream, state){
-      var nextChar = stream.next();
-      var peekChar = stream.peek();
-      var previousChar = stream.string.charAt(stream.pos-2);
-
-      var endingString = ((nextChar !== "\\" && peekChar === quote) || (nextChar === quote && previousChar !== "\\"));
-
-      /*
-      console.log("previousChar: " + previousChar);
-      console.log("nextChar: " + nextChar);
-      console.log("peekChar: " + peekChar);
-      console.log("ending: " + endingString);
-      */
-
-      if (endingString){
-        if (nextChar !== quote && greedy) { stream.next(); }
-        state.tokenizer = tokenBase;
-        return "string";
-      }else if (nextChar === "#" && peekChar === "{"){
-        state.tokenizer = buildInterpolationTokenizer(stringTokenizer);
-        stream.next();
-        return "operator";
-      }else {
-        return "string";
-      }
-    }
-
-    return stringTokenizer;
-  };
-
-  var buildInterpolationTokenizer = function(currentTokenizer){
-    return function(stream, state){
-      if (stream.peek() === "}"){
-        stream.next();
-        state.tokenizer = currentTokenizer;
-        return "operator";
-      }else{
-        return tokenBase(stream, state);
-      }
-    };
-  };
-
-  var indent = function(state){
-    if (state.indentCount == 0){
-      state.indentCount++;
-      var lastScopeOffset = state.scopes[0].offset;
-      var currentOffset = lastScopeOffset + config.indentUnit;
-      state.scopes.unshift({ offset:currentOffset });
-    }
-  };
-
-  var dedent = function(state){
-    if (state.scopes.length == 1) { return; }
-
-    state.scopes.shift();
-  };
-
-  var tokenBase = function(stream, state) {
-    var ch = stream.peek();
-
-    // Single line Comment
-    if (stream.match('//')) {
-      stream.skipToEnd();
-      return "comment";
-    }
-
-    // Multiline Comment
-    if (stream.match('/*')){
-      state.tokenizer = multilineComment;
-      return state.tokenizer(stream, state);
-    }
-
-    // Interpolation
-    if (stream.match('#{')){
-    state.tokenizer = buildInterpolationTokenizer(tokenBase);
-      return "operator";
-    }
-
-    if (ch === "."){
-      stream.next();
-
-      // Match class selectors
-      if (stream.match(/^[\w-]+/)){
-        indent(state);
-        return "atom";
-      }else if (stream.peek() === "#"){
-        indent(state);
-        return "atom";
-      }else{
-        return "operator";
-      }
-    }
-
-    if (ch === "#"){
-      stream.next();
-
-      // Hex numbers
-      if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
-        return "number";
-      }
-
-      // ID selectors
-      if (stream.match(/^[\w-]+/)){
-        indent(state);
-        return "atom";
-      }
-
-      if (stream.peek() === "#"){
-        indent(state);
-        return "atom";
-      }
-    }
-
-    // Numbers
-    if (stream.match(/^-?[0-9\.]+/)){
-      return "number";
-    }
-
-    // Units
-    if (stream.match(/^(px|em|in)\b/)){
-      return "unit";
-    }
-
-    if (stream.match(keywordsRegexp)){
-      return "keyword";
-    }
-
-    if (stream.match(/^url/) && stream.peek() === "("){
-      state.tokenizer = urlTokens;
-      return "atom";
-    }
-
-    // Variables
-    if (ch === "$"){
-      stream.next();
-      stream.eatWhile(/[\w-]/);
-
-      if (stream.peek() === ":"){
-        stream.next();
-        return "variable-2";
-      }else{
-        return "variable-3";
-      }
-    }
-
-    if (ch === "!"){
-      stream.next();
-
-      if (stream.match(/^[\w]+/)){
-        return "keyword";
-      }
-
-      return "operator";
-    }
-
-    if (ch === "="){
-      stream.next();
-
-      // Match shortcut mixin definition
-      if (stream.match(/^[\w-]+/)){
-        indent(state);
-        return "meta";
-      }else {
-        return "operator";
-      }
-    }
-
-    if (ch === "+"){
-      stream.next();
-
-      // Match shortcut mixin definition
-      if (stream.match(/^[\w-]+/)){
-        return "variable-3";
-      }else {
-        return "operator";
-      }
-    }
-
-    // Indent Directives
-    if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)){
-      indent(state);
-      return "meta";
-    }
-
-    // Other Directives
-    if (ch === "@"){
-      stream.next();
-      stream.eatWhile(/[\w-]/);
-      return "meta";
-    }
-
-    // Strings
-    if (ch === '"' || ch === "'"){
-      stream.next();
-      state.tokenizer = buildStringTokenizer(ch);
-      return "string";
-    }
-
-    // Pseudo element selectors
-    if (ch == ':' && stream.match(pseudoElementsRegexp)){
-      return "keyword";
-    }
-
-    // atoms
-    if (stream.eatWhile(/[\w-&]/)){
-      // matches a property definition
-      if (stream.peek() === ":" && !stream.match(pseudoElementsRegexp, false))
-        return "property";
-      else
-        return "atom";
-    }
-
-    if (stream.match(opRegexp)){
-      return "operator";
-    }
-
-    // If we haven't returned by now, we move 1 character
-    // and return an error
-    stream.next();
-    return null;
-  };
-
-  var tokenLexer = function(stream, state) {
-    if (stream.sol()){
-      state.indentCount = 0;
-    }
-    var style = state.tokenizer(stream, state);
-    var current = stream.current();
-
-    if (current === "@return"){
-      dedent(state);
-    }
-
-    if (style === "atom"){
-      indent(state);
-    }
-
-    if (style !== null){
-      var startOfToken = stream.pos - current.length;
-      var withCurrentIndent = startOfToken + (config.indentUnit * state.indentCount);
-
-      var newScopes = [];
-
-      for (var i = 0; i < state.scopes.length; i++){
-        var scope = state.scopes[i];
-
-        if (scope.offset <= withCurrentIndent){
-          newScopes.push(scope);
-        }
-      }
-
-      state.scopes = newScopes;
-    }
-
-
-    return style;
-  };
-
-  return {
-    startState: function() {
-      return {
-        tokenizer: tokenBase,
-        scopes: [{offset: 0, type: 'sass'}],
-        definedVars: [],
-        definedMixins: []
-      };
-    },
-    token: function(stream, state) {
-      var style = tokenLexer(stream, state);
-
-      state.lastToken = { style: style, content: stream.current() };
-
-      return style;
-    },
-
-    indent: function(state) {
-      return state.scopes[0].offset;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-sass", "sass");
diff --git a/resources/libs/codemirror/mode/scheme/index.html b/resources/libs/codemirror/mode/scheme/index.html
deleted file mode 100644
index 164d5da60..000000000
--- a/resources/libs/codemirror/mode/scheme/index.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Scheme mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="scheme.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Scheme</a>
-  </ul>
-</div>
-
-<article>
-<h2>Scheme mode</h2>
-<form><textarea id="code" name="code">
-; See if the input starts with a given symbol.
-(define (match-symbol input pattern)
-  (cond ((null? (remain input)) #f)
-	((eqv? (car (remain input)) pattern) (r-cdr input))
-	(else #f)))
-
-; Allow the input to start with one of a list of patterns.
-(define (match-or input pattern)
-  (cond ((null? pattern) #f)
-	((match-pattern input (car pattern)))
-	(else (match-or input (cdr pattern)))))
-
-; Allow a sequence of patterns.
-(define (match-seq input pattern)
-  (if (null? pattern)
-      input
-      (let ((match (match-pattern input (car pattern))))
-	(if match (match-seq match (cdr pattern)) #f))))
-
-; Match with the pattern but no problem if it does not match.
-(define (match-opt input pattern)
-  (let ((match (match-pattern input (car pattern))))
-    (if match match input)))
-
-; Match anything (other than '()), until pattern is found. The rather
-; clumsy form of requiring an ending pattern is needed to decide where
-; the end of the match is. If none is given, this will match the rest
-; of the sentence.
-(define (match-any input pattern)
-  (cond ((null? (remain input)) #f)
-	((null? pattern) (f-cons (remain input) (clear-remain input)))
-	(else
-	 (let ((accum-any (collector)))
-	   (define (match-pattern-any input pattern)
-	     (cond ((null? (remain input)) #f)
-		   (else (accum-any (car (remain input)))
-			 (cond ((match-pattern (r-cdr input) pattern))
-			       (else (match-pattern-any (r-cdr input) pattern))))))
-	   (let ((retval (match-pattern-any input (car pattern))))
-	     (if retval
-		 (f-cons (accum-any) retval)
-		 #f))))))
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-scheme</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/scheme/scheme.js b/resources/libs/codemirror/mode/scheme/scheme.js
deleted file mode 100644
index c5990ae92..000000000
--- a/resources/libs/codemirror/mode/scheme/scheme.js
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- * Author: Koh Zi Han, based on implementation by Koh Zi Chun
- */
-CodeMirror.defineMode("scheme", function () {
-    var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
-        ATOM = "atom", NUMBER = "number", BRACKET = "bracket";
-    var INDENT_WORD_SKIP = 2;
-
-    function makeKeywords(str) {
-        var obj = {}, words = str.split(" ");
-        for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-        return obj;
-    }
-
-    var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?");
-    var indentKeys = makeKeywords("define let letrec let* lambda");
-
-    function stateStack(indent, type, prev) { // represents a state stack object
-        this.indent = indent;
-        this.type = type;
-        this.prev = prev;
-    }
-
-    function pushStack(state, indent, type) {
-        state.indentStack = new stateStack(indent, type, state.indentStack);
-    }
-
-    function popStack(state) {
-        state.indentStack = state.indentStack.prev;
-    }
-
-    var binaryMatcher = new RegExp(/^(?:[-+]i|[-+][01]+#*(?:\/[01]+#*)?i|[-+]?[01]+#*(?:\/[01]+#*)?@[-+]?[01]+#*(?:\/[01]+#*)?|[-+]?[01]+#*(?:\/[01]+#*)?[-+](?:[01]+#*(?:\/[01]+#*)?)?i|[-+]?[01]+#*(?:\/[01]+#*)?)(?=[()\s;"]|$)/i);
-    var octalMatcher = new RegExp(/^(?:[-+]i|[-+][0-7]+#*(?:\/[0-7]+#*)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?@[-+]?[0-7]+#*(?:\/[0-7]+#*)?|[-+]?[0-7]+#*(?:\/[0-7]+#*)?[-+](?:[0-7]+#*(?:\/[0-7]+#*)?)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?)(?=[()\s;"]|$)/i);
-    var hexMatcher = new RegExp(/^(?:[-+]i|[-+][\da-f]+#*(?:\/[\da-f]+#*)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?@[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?[-+](?:[\da-f]+#*(?:\/[\da-f]+#*)?)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?)(?=[()\s;"]|$)/i);
-    var decimalMatcher = new RegExp(/^(?:[-+]i|[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)i|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)@[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)?i|(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*))(?=[()\s;"]|$)/i);
-
-    function isBinaryNumber (stream) {
-        return stream.match(binaryMatcher);
-    }
-
-    function isOctalNumber (stream) {
-        return stream.match(octalMatcher);
-    }
-
-    function isDecimalNumber (stream, backup) {
-        if (backup === true) {
-            stream.backUp(1);
-        }
-        return stream.match(decimalMatcher);
-    }
-
-    function isHexNumber (stream) {
-        return stream.match(hexMatcher);
-    }
-
-    return {
-        startState: function () {
-            return {
-                indentStack: null,
-                indentation: 0,
-                mode: false,
-                sExprComment: false
-            };
-        },
-
-        token: function (stream, state) {
-            if (state.indentStack == null && stream.sol()) {
-                // update indentation, but only if indentStack is empty
-                state.indentation = stream.indentation();
-            }
-
-            // skip spaces
-            if (stream.eatSpace()) {
-                return null;
-            }
-            var returnType = null;
-
-            switch(state.mode){
-                case "string": // multi-line string parsing mode
-                    var next, escaped = false;
-                    while ((next = stream.next()) != null) {
-                        if (next == "\"" && !escaped) {
-
-                            state.mode = false;
-                            break;
-                        }
-                        escaped = !escaped && next == "\\";
-                    }
-                    returnType = STRING; // continue on in scheme-string mode
-                    break;
-                case "comment": // comment parsing mode
-                    var next, maybeEnd = false;
-                    while ((next = stream.next()) != null) {
-                        if (next == "#" && maybeEnd) {
-
-                            state.mode = false;
-                            break;
-                        }
-                        maybeEnd = (next == "|");
-                    }
-                    returnType = COMMENT;
-                    break;
-                case "s-expr-comment": // s-expr commenting mode
-                    state.mode = false;
-                    if(stream.peek() == "(" || stream.peek() == "["){
-                        // actually start scheme s-expr commenting mode
-                        state.sExprComment = 0;
-                    }else{
-                        // if not we just comment the entire of the next token
-                        stream.eatWhile(/[^/s]/); // eat non spaces
-                        returnType = COMMENT;
-                        break;
-                    }
-                default: // default parsing mode
-                    var ch = stream.next();
-
-                    if (ch == "\"") {
-                        state.mode = "string";
-                        returnType = STRING;
-
-                    } else if (ch == "'") {
-                        returnType = ATOM;
-                    } else if (ch == '#') {
-                        if (stream.eat("|")) {                    // Multi-line comment
-                            state.mode = "comment"; // toggle to comment mode
-                            returnType = COMMENT;
-                        } else if (stream.eat(/[tf]/i)) {            // #t/#f (atom)
-                            returnType = ATOM;
-                        } else if (stream.eat(';')) {                // S-Expr comment
-                            state.mode = "s-expr-comment";
-                            returnType = COMMENT;
-                        } else {
-                            var numTest = null, hasExactness = false, hasRadix = true;
-                            if (stream.eat(/[ei]/i)) {
-                                hasExactness = true;
-                            } else {
-                                stream.backUp(1);       // must be radix specifier
-                            }
-                            if (stream.match(/^#b/i)) {
-                                numTest = isBinaryNumber;
-                            } else if (stream.match(/^#o/i)) {
-                                numTest = isOctalNumber;
-                            } else if (stream.match(/^#x/i)) {
-                                numTest = isHexNumber;
-                            } else if (stream.match(/^#d/i)) {
-                                numTest = isDecimalNumber;
-                            } else if (stream.match(/^[-+0-9.]/, false)) {
-                                hasRadix = false;
-                                numTest = isDecimalNumber;
-                            // re-consume the intial # if all matches failed
-                            } else if (!hasExactness) {
-                                stream.eat('#');
-                            }
-                            if (numTest != null) {
-                                if (hasRadix && !hasExactness) {
-                                    // consume optional exactness after radix
-                                    stream.match(/^#[ei]/i);
-                                }
-                                if (numTest(stream))
-                                    returnType = NUMBER;
-                            }
-                        }
-                    } else if (/^[-+0-9.]/.test(ch) && isDecimalNumber(stream, true)) { // match non-prefixed number, must be decimal
-                        returnType = NUMBER;
-                    } else if (ch == ";") { // comment
-                        stream.skipToEnd(); // rest of the line is a comment
-                        returnType = COMMENT;
-                    } else if (ch == "(" || ch == "[") {
-                      var keyWord = ''; var indentTemp = stream.column(), letter;
-                        /**
-                        Either
-                        (indent-word ..
-                        (non-indent-word ..
-                        (;something else, bracket, etc.
-                        */
-
-                        while ((letter = stream.eat(/[^\s\(\[\;\)\]]/)) != null) {
-                            keyWord += letter;
-                        }
-
-                        if (keyWord.length > 0 && indentKeys.propertyIsEnumerable(keyWord)) { // indent-word
-
-                            pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
-                        } else { // non-indent word
-                            // we continue eating the spaces
-                            stream.eatSpace();
-                            if (stream.eol() || stream.peek() == ";") {
-                                // nothing significant after
-                                // we restart indentation 1 space after
-                                pushStack(state, indentTemp + 1, ch);
-                            } else {
-                                pushStack(state, indentTemp + stream.current().length, ch); // else we match
-                            }
-                        }
-                        stream.backUp(stream.current().length - 1); // undo all the eating
-
-                        if(typeof state.sExprComment == "number") state.sExprComment++;
-
-                        returnType = BRACKET;
-                    } else if (ch == ")" || ch == "]") {
-                        returnType = BRACKET;
-                        if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : "[")) {
-                            popStack(state);
-
-                            if(typeof state.sExprComment == "number"){
-                                if(--state.sExprComment == 0){
-                                    returnType = COMMENT; // final closing bracket
-                                    state.sExprComment = false; // turn off s-expr commenting mode
-                                }
-                            }
-                        }
-                    } else {
-                        stream.eatWhile(/[\w\$_\-!$%&*+\.\/:<=>?@\^~]/);
-
-                        if (keywords && keywords.propertyIsEnumerable(stream.current())) {
-                            returnType = BUILTIN;
-                        } else returnType = "variable";
-                    }
-            }
-            return (typeof state.sExprComment == "number") ? COMMENT : returnType;
-        },
-
-        indent: function (state) {
-            if (state.indentStack == null) return state.indentation;
-            return state.indentStack.indent;
-        },
-
-        lineComment: ";;"
-    };
-});
-
-CodeMirror.defineMIME("text/x-scheme", "scheme");
diff --git a/resources/libs/codemirror/mode/shell/index.html b/resources/libs/codemirror/mode/shell/index.html
deleted file mode 100644
index cf415e832..000000000
--- a/resources/libs/codemirror/mode/shell/index.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Shell mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel=stylesheet href=../../lib/codemirror.css>
-<script src=../../lib/codemirror.js></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src=shell.js></script>
-<style type=text/css>
-  .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Shell</a>
-  </ul>
-</div>
-
-<article>
-<h2>Shell mode</h2>
-
-
-<textarea id=code>
-#!/bin/bash
-
-# clone the repository
-git clone http://github.com/garden/tree
-
-# generate HTTPS credentials
-cd tree
-openssl genrsa -aes256 -out https.key 1024
-openssl req -new -nodes -key https.key -out https.csr
-openssl x509 -req -days 365 -in https.csr -signkey https.key -out https.crt
-cp https.key{,.orig}
-openssl rsa -in https.key.orig -out https.key
-
-# start the server in HTTPS mode
-cd web
-sudo node ../server.js 443 'yes' &gt;&gt; ../node.log &amp;
-
-# here is how to stop the server
-for pid in `ps aux | grep 'node ../server.js' | awk '{print $2}'` ; do
-  sudo kill -9 $pid 2&gt; /dev/null
-done
-
-exit 0</textarea>
-
-<script>
-  var editor = CodeMirror.fromTextArea(document.getElementById('code'), {
-    mode: 'shell',
-    lineNumbers: true,
-    matchBrackets: true
-  });
-</script>
-
-<p><strong>MIME types defined:</strong> <code>text/x-sh</code>.</p>
-</article>
diff --git a/resources/libs/codemirror/mode/shell/shell.js b/resources/libs/codemirror/mode/shell/shell.js
deleted file mode 100644
index abfd21445..000000000
--- a/resources/libs/codemirror/mode/shell/shell.js
+++ /dev/null
@@ -1,118 +0,0 @@
-CodeMirror.defineMode('shell', function() {
-
-  var words = {};
-  function define(style, string) {
-    var split = string.split(' ');
-    for(var i = 0; i < split.length; i++) {
-      words[split[i]] = style;
-    }
-  };
-
-  // Atoms
-  define('atom', 'true false');
-
-  // Keywords
-  define('keyword', 'if then do else elif while until for in esac fi fin ' +
-    'fil done exit set unset export function');
-
-  // Commands
-  define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
-    'curl cut diff echo find gawk gcc get git grep kill killall ln ls make ' +
-    'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' +
-    'shopt shred source sort sleep ssh start stop su sudo tee telnet top ' +
-    'touch vi vim wall wc wget who write yes zsh');
-
-  function tokenBase(stream, state) {
-
-    var sol = stream.sol();
-    var ch = stream.next();
-
-    if (ch === '\'' || ch === '"' || ch === '`') {
-      state.tokens.unshift(tokenString(ch));
-      return tokenize(stream, state);
-    }
-    if (ch === '#') {
-      if (sol && stream.eat('!')) {
-        stream.skipToEnd();
-        return 'meta'; // 'comment'?
-      }
-      stream.skipToEnd();
-      return 'comment';
-    }
-    if (ch === '$') {
-      state.tokens.unshift(tokenDollar);
-      return tokenize(stream, state);
-    }
-    if (ch === '+' || ch === '=') {
-      return 'operator';
-    }
-    if (ch === '-') {
-      stream.eat('-');
-      stream.eatWhile(/\w/);
-      return 'attribute';
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/\d/);
-      if(!/\w/.test(stream.peek())) {
-        return 'number';
-      }
-    }
-    stream.eatWhile(/[\w-]/);
-    var cur = stream.current();
-    if (stream.peek() === '=' && /\w+/.test(cur)) return 'def';
-    return words.hasOwnProperty(cur) ? words[cur] : null;
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var next, end = false, escaped = false;
-      while ((next = stream.next()) != null) {
-        if (next === quote && !escaped) {
-          end = true;
-          break;
-        }
-        if (next === '$' && !escaped && quote !== '\'') {
-          escaped = true;
-          stream.backUp(1);
-          state.tokens.unshift(tokenDollar);
-          break;
-        }
-        escaped = !escaped && next === '\\';
-      }
-      if (end || !escaped) {
-        state.tokens.shift();
-      }
-      return (quote === '`' || quote === ')' ? 'quote' : 'string');
-    };
-  };
-
-  var tokenDollar = function(stream, state) {
-    if (state.tokens.length > 1) stream.eat('$');
-    var ch = stream.next(), hungry = /\w/;
-    if (ch === '{') hungry = /[^}]/;
-    if (ch === '(') {
-      state.tokens[0] = tokenString(')');
-      return tokenize(stream, state);
-    }
-    if (!/\d/.test(ch)) {
-      stream.eatWhile(hungry);
-      stream.eat('}');
-    }
-    state.tokens.shift();
-    return 'def';
-  };
-
-  function tokenize(stream, state) {
-    return (state.tokens[0] || tokenBase) (stream, state);
-  };
-
-  return {
-    startState: function() {return {tokens:[]};},
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      return tokenize(stream, state);
-    }
-  };
-});
-
-CodeMirror.defineMIME('text/x-sh', 'shell');
diff --git a/resources/libs/codemirror/mode/sieve/index.html b/resources/libs/codemirror/mode/sieve/index.html
deleted file mode 100644
index 9d814a9d5..000000000
--- a/resources/libs/codemirror/mode/sieve/index.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Sieve (RFC5228) mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="sieve.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Sieve (RFC5228)</a>
-  </ul>
-</div>
-
-<article>
-<h2>Sieve (RFC5228) mode</h2>
-<form><textarea id="code" name="code">
-#
-# Example Sieve Filter
-# Declare any optional features or extension used by the script
-#
-
-require ["fileinto", "reject"];
-
-#
-# Reject any large messages (note that the four leading dots get
-# "stuffed" to three)
-#
-if size :over 1M
-{
-  reject text:
-Please do not send me large attachments.
-Put your file on a server and send me the URL.
-Thank you.
-.... Fred
-.
-;
-  stop;
-}
-
-#
-# Handle messages from known mailing lists
-# Move messages from IETF filter discussion list to filter folder
-#
-if header :is "Sender" "owner-ietf-mta-filters@imc.org"
-{
-  fileinto "filter";  # move to "filter" folder
-}
-#
-# Keep all messages to or from people in my company
-#
-elsif address :domain :is ["From", "To"] "example.com"
-{
-  keep;               # keep in "In" folder
-}
-
-#
-# Try and catch unsolicited email.  If a message is not to me,
-# or it contains a subject known to be spam, file it away.
-#
-elsif anyof (not address :all :contains
-               ["To", "Cc", "Bcc"] "me@example.com",
-             header :matches "subject"
-               ["*make*money*fast*", "*university*dipl*mas*"])
-{
-  # If message header does not contain my address,
-  # it's from a list.
-  fileinto "spam";   # move to "spam" folder
-}
-else
-{
-  # Move all other (non-company) mail to "personal"
-  # folder.
-  fileinto "personal";
-}
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>application/sieve</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/sieve/sieve.js b/resources/libs/codemirror/mode/sieve/sieve.js
deleted file mode 100644
index 8ca2a4cb8..000000000
--- a/resources/libs/codemirror/mode/sieve/sieve.js
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * See LICENSE in this directory for the license under which this code
- * is released.
- */
-
-CodeMirror.defineMode("sieve", function(config) {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  var keywords = words("if elsif else stop require");
-  var atoms = words("true false not");
-  var indentUnit = config.indentUnit;
-
-  function tokenBase(stream, state) {
-
-    var ch = stream.next();
-    if (ch == "/" && stream.eat("*")) {
-      state.tokenize = tokenCComment;
-      return tokenCComment(stream, state);
-    }
-
-    if (ch === '#') {
-      stream.skipToEnd();
-      return "comment";
-    }
-
-    if (ch == "\"") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-
-    if (ch == "(") {
-      state._indent.push("(");
-      // add virtual angel wings so that editor behaves...
-      // ...more sane incase of broken brackets
-      state._indent.push("{");
-      return null;
-    }
-
-    if (ch === "{") {
-      state._indent.push("{");
-      return null;
-    }
-
-    if (ch == ")")  {
-      state._indent.pop();
-      state._indent.pop();
-    }
-
-    if (ch === "}") {
-      state._indent.pop();
-      return null;
-    }
-
-    if (ch == ",")
-      return null;
-
-    if (ch == ";")
-      return null;
-
-
-    if (/[{}\(\),;]/.test(ch))
-      return null;
-
-    // 1*DIGIT "K" / "M" / "G"
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\d]/);
-      stream.eat(/[KkMmGg]/);
-      return "number";
-    }
-
-    // ":" (ALPHA / "_") *(ALPHA / DIGIT / "_")
-    if (ch == ":") {
-      stream.eatWhile(/[a-zA-Z_]/);
-      stream.eatWhile(/[a-zA-Z0-9_]/);
-
-      return "operator";
-    }
-
-    stream.eatWhile(/\w/);
-    var cur = stream.current();
-
-    // "text:" *(SP / HTAB) (hash-comment / CRLF)
-    // *(multiline-literal / multiline-dotstart)
-    // "." CRLF
-    if ((cur == "text") && stream.eat(":"))
-    {
-      state.tokenize = tokenMultiLineString;
-      return "string";
-    }
-
-    if (keywords.propertyIsEnumerable(cur))
-      return "keyword";
-
-    if (atoms.propertyIsEnumerable(cur))
-      return "atom";
-
-    return null;
-  }
-
-  function tokenMultiLineString(stream, state)
-  {
-    state._multiLineString = true;
-    // the first line is special it may contain a comment
-    if (!stream.sol()) {
-      stream.eatSpace();
-
-      if (stream.peek() == "#") {
-        stream.skipToEnd();
-        return "comment";
-      }
-
-      stream.skipToEnd();
-      return "string";
-    }
-
-    if ((stream.next() == ".")  && (stream.eol()))
-    {
-      state._multiLineString = false;
-      state.tokenize = tokenBase;
-    }
-
-    return "string";
-  }
-
-  function tokenCComment(stream, state) {
-    var maybeEnd = false, ch;
-    while ((ch = stream.next()) != null) {
-      if (maybeEnd && ch == "/") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped)
-          break;
-        escaped = !escaped && ch == "\\";
-      }
-      if (!escaped) state.tokenize = tokenBase;
-      return "string";
-    };
-  }
-
-  return {
-    startState: function(base) {
-      return {tokenize: tokenBase,
-              baseIndent: base || 0,
-              _indent: []};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace())
-        return null;
-
-      return (state.tokenize || tokenBase)(stream, state);;
-    },
-
-    indent: function(state, _textAfter) {
-      var length = state._indent.length;
-      if (_textAfter && (_textAfter[0] == "}"))
-        length--;
-
-      if (length <0)
-        length = 0;
-
-      return length * indentUnit;
-    },
-
-    electricChars: "}"
-  };
-});
-
-CodeMirror.defineMIME("application/sieve", "sieve");
diff --git a/resources/libs/codemirror/mode/smalltalk/index.html b/resources/libs/codemirror/mode/smalltalk/index.html
deleted file mode 100644
index 0d2b172e1..000000000
--- a/resources/libs/codemirror/mode/smalltalk/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Smalltalk mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="smalltalk.js"></script>
-<style>
-      .CodeMirror {border: 2px solid #dee; border-right-width: 10px;}
-      .CodeMirror-gutter {border: none; background: #dee;}
-      .CodeMirror-gutter pre {color: white; font-weight: bold;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Smalltalk</a>
-  </ul>
-</div>
-
-<article>
-<h2>Smalltalk mode</h2>
-<form><textarea id="code" name="code">
-" 
-    This is a test of the Smalltalk code
-"
-Seaside.WAComponent subclass: #MyCounter [
-    | count |
-    MyCounter class &gt;&gt; canBeRoot [ ^true ]
-
-    initialize [
-        super initialize.
-        count := 0.
-    ]
-    states [ ^{ self } ]
-    renderContentOn: html [
-        html heading: count.
-        html anchor callback: [ count := count + 1 ]; with: '++'.
-        html space.
-        html anchor callback: [ count := count - 1 ]; with: '--'.
-    ]
-]
-
-MyCounter registerAsApplication: 'mycounter'
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-stsrc",
-        indentUnit: 4
-      });
-    </script>
-
-    <p>Simple Smalltalk mode.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-stsrc</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/smalltalk/smalltalk.js b/resources/libs/codemirror/mode/smalltalk/smalltalk.js
deleted file mode 100644
index f2d4cb318..000000000
--- a/resources/libs/codemirror/mode/smalltalk/smalltalk.js
+++ /dev/null
@@ -1,151 +0,0 @@
-CodeMirror.defineMode('smalltalk', function(config) {
-
-  var specialChars = /[+\-\/\\*~<>=@%|&?!.,:;^]/;
-  var keywords = /true|false|nil|self|super|thisContext/;
-
-  var Context = function(tokenizer, parent) {
-    this.next = tokenizer;
-    this.parent = parent;
-  };
-
-  var Token = function(name, context, eos) {
-    this.name = name;
-    this.context = context;
-    this.eos = eos;
-  };
-
-  var State = function() {
-    this.context = new Context(next, null);
-    this.expectVariable = true;
-    this.indentation = 0;
-    this.userIndentationDelta = 0;
-  };
-
-  State.prototype.userIndent = function(indentation) {
-    this.userIndentationDelta = indentation > 0 ? (indentation / config.indentUnit - this.indentation) : 0;
-  };
-
-  var next = function(stream, context, state) {
-    var token = new Token(null, context, false);
-    var aChar = stream.next();
-
-    if (aChar === '"') {
-      token = nextComment(stream, new Context(nextComment, context));
-
-    } else if (aChar === '\'') {
-      token = nextString(stream, new Context(nextString, context));
-
-    } else if (aChar === '#') {
-      if (stream.peek() === '\'') {
-        stream.next();
-        token = nextSymbol(stream, new Context(nextSymbol, context));
-      } else {
-        stream.eatWhile(/[^ .\[\]()]/);
-        token.name = 'string-2';
-      }
-
-    } else if (aChar === '$') {
-      if (stream.next() === '<') {
-        stream.eatWhile(/[^ >]/);
-        stream.next();
-      }
-      token.name = 'string-2';
-
-    } else if (aChar === '|' && state.expectVariable) {
-      token.context = new Context(nextTemporaries, context);
-
-    } else if (/[\[\]{}()]/.test(aChar)) {
-      token.name = 'bracket';
-      token.eos = /[\[{(]/.test(aChar);
-
-      if (aChar === '[') {
-        state.indentation++;
-      } else if (aChar === ']') {
-        state.indentation = Math.max(0, state.indentation - 1);
-      }
-
-    } else if (specialChars.test(aChar)) {
-      stream.eatWhile(specialChars);
-      token.name = 'operator';
-      token.eos = aChar !== ';'; // ; cascaded message expression
-
-    } else if (/\d/.test(aChar)) {
-      stream.eatWhile(/[\w\d]/);
-      token.name = 'number';
-
-    } else if (/[\w_]/.test(aChar)) {
-      stream.eatWhile(/[\w\d_]/);
-      token.name = state.expectVariable ? (keywords.test(stream.current()) ? 'keyword' : 'variable') : null;
-
-    } else {
-      token.eos = state.expectVariable;
-    }
-
-    return token;
-  };
-
-  var nextComment = function(stream, context) {
-    stream.eatWhile(/[^"]/);
-    return new Token('comment', stream.eat('"') ? context.parent : context, true);
-  };
-
-  var nextString = function(stream, context) {
-    stream.eatWhile(/[^']/);
-    return new Token('string', stream.eat('\'') ? context.parent : context, false);
-  };
-
-  var nextSymbol = function(stream, context) {
-    stream.eatWhile(/[^']/);
-    return new Token('string-2', stream.eat('\'') ? context.parent : context, false);
-  };
-
-  var nextTemporaries = function(stream, context) {
-    var token = new Token(null, context, false);
-    var aChar = stream.next();
-
-    if (aChar === '|') {
-      token.context = context.parent;
-      token.eos = true;
-
-    } else {
-      stream.eatWhile(/[^|]/);
-      token.name = 'variable';
-    }
-
-    return token;
-  };
-
-  return {
-    startState: function() {
-      return new State;
-    },
-
-    token: function(stream, state) {
-      state.userIndent(stream.indentation());
-
-      if (stream.eatSpace()) {
-        return null;
-      }
-
-      var token = state.context.next(stream, state.context, state);
-      state.context = token.context;
-      state.expectVariable = token.eos;
-
-      return token.name;
-    },
-
-    blankLine: function(state) {
-      state.userIndent(0);
-    },
-
-    indent: function(state, textAfter) {
-      var i = state.context.next === next && textAfter && textAfter.charAt(0) === ']' ? -1 : state.userIndentationDelta;
-      return (state.indentation + i) * config.indentUnit;
-    },
-
-    electricChars: ']'
-  };
-
-});
-
-CodeMirror.defineMIME('text/x-stsrc', {name: 'smalltalk'});
diff --git a/resources/libs/codemirror/mode/smarty/index.html b/resources/libs/codemirror/mode/smarty/index.html
deleted file mode 100644
index d458aef0f..000000000
--- a/resources/libs/codemirror/mode/smarty/index.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Smarty mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="smarty.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Smarty</a>
-  </ul>
-</div>
-
-<article>
-<h2>Smarty mode</h2>
-<form><textarea id="code" name="code">
-{extends file="parent.tpl"}
-{include file="template.tpl"}
-
-{* some example Smarty content *}
-{if isset($name) && $name == 'Blog'}
-  This is a {$var}.
-  {$integer = 451}, {$array[] = "a"}, {$stringvar = "string"}
-  {assign var='bob' value=$var.prop}
-{elseif $name == $foo}
-  {function name=menu level=0}
-    {foreach $data as $entry}
-      {if is_array($entry)}
-        - {$entry@key}
-        {menu data=$entry level=$level+1}
-      {else}
-        {$entry}
-      {/if}
-    {/foreach}
-  {/function}
-{/if}</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "smarty"
-      });
-    </script>
-
-    <br />
-
-	<h3>Smarty 2, custom delimiters</h3>
-    <form><textarea id="code2" name="code2">
-{--extends file="parent.tpl"--}
-{--include file="template.tpl"--}
-
-{--* some example Smarty content *--}
-{--if isset($name) && $name == 'Blog'--}
-  This is a {--$var--}.
-  {--$integer = 451--}, {--$array[] = "a"--}, {--$stringvar = "string"--}
-  {--assign var='bob' value=$var.prop--}
-{--elseif $name == $foo--}
-  {--function name=menu level=0--}
-    {--foreach $data as $entry--}
-      {--if is_array($entry)--}
-        - {--$entry@key--}
-        {--menu data=$entry level=$level+1--}
-      {--else--}
-        {--$entry--}
-      {--/if--}
-    {--/foreach--}
-  {--/function--}
-{--/if--}</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code2"), {
-        lineNumbers: true,
-        mode: {
-          name: "smarty",
-          leftDelimiter: "{--",
-          rightDelimiter: "--}"
-        }
-      });
-    </script>
-
-	<br />
-
-	<h3>Smarty 3</h3>
-
-	<textarea id="code3" name="code3">
-Nested tags {$foo={counter one=1 two={inception}}+3} are now valid in Smarty 3.
-
-<script>
-function test() {
-	console.log("Smarty 3 permits single curly braces followed by whitespace to NOT slip into Smarty mode.");
-}
-</script>
-
-{assign var=foo value=[1,2,3]}
-{assign var=foo value=['y'=>'yellow','b'=>'blue']}
-{assign var=foo value=[1,[9,8],3]}
-
-{$foo=$bar+2} {* a comment *}
-{$foo.bar=1}  {* another comment *}
-{$foo = myfunct(($x+$y)*3)}
-{$foo = strlen($bar)}
-{$foo.bar.baz=1}, {$foo[]=1}
-
-Smarty "dot" syntax (note: embedded {} are used to address ambiguities):
-
-{$foo.a.b.c}      => $foo['a']['b']['c']
-{$foo.a.$b.c}     => $foo['a'][$b]['c']
-{$foo.a.{$b+4}.c} => $foo['a'][$b+4]['c']
-{$foo.a.{$b.c}}   => $foo['a'][$b['c']]
-
-{$object->method1($x)->method2($y)}</textarea>
-
-	<script>
-		var editor = CodeMirror.fromTextArea(document.getElementById("code3"), {
-			lineNumbers: true,
-			mode: "smarty",
-			smartyVersion: 3
-		});
-	</script>
-
-
-    <p>A plain text/Smarty version 2 or 3 mode, which allows for custom delimiter tags.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-smarty</code></p>
-  </article>
diff --git a/resources/libs/codemirror/mode/smarty/smarty.js b/resources/libs/codemirror/mode/smarty/smarty.js
deleted file mode 100644
index 826c2b966..000000000
--- a/resources/libs/codemirror/mode/smarty/smarty.js
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- * Smarty 2 and 3 mode.
- */
-CodeMirror.defineMode("smarty", function(config) {
-  "use strict";
-
-  // our default settings; check to see if they're overridden
-  var settings = {
-    rightDelimiter: '}',
-    leftDelimiter: '{',
-    smartyVersion: 2 // for backward compatibility
-  };
-  if (config.hasOwnProperty("leftDelimiter")) {
-    settings.leftDelimiter = config.leftDelimiter;
-  }
-  if (config.hasOwnProperty("rightDelimiter")) {
-    settings.rightDelimiter = config.rightDelimiter;
-  }
-  if (config.hasOwnProperty("smartyVersion") && config.smartyVersion === 3) {
-    settings.smartyVersion = 3;
-  }
-
-  var keyFunctions = ["debug", "extends", "function", "include", "literal"];
-  var last;
-  var regs = {
-    operatorChars: /[+\-*&%=<>!?]/,
-    validIdentifier: /[a-zA-Z0-9_]/,
-    stringChar: /['"]/
-  };
-
-  var helpers = {
-    cont: function(style, lastType) {
-      last = lastType;
-      return style;
-    },
-    chain: function(stream, state, parser) {
-      state.tokenize = parser;
-      return parser(stream, state);
-    }
-  };
-
-
-  // our various parsers
-  var parsers = {
-
-    // the main tokenizer
-    tokenizer: function(stream, state) {
-      if (stream.match(settings.leftDelimiter, true)) {
-        if (stream.eat("*")) {
-          return helpers.chain(stream, state, parsers.inBlock("comment", "*" + settings.rightDelimiter));
-        } else {
-          // Smarty 3 allows { and } surrounded by whitespace to NOT slip into Smarty mode
-          state.depth++;
-          var isEol = stream.eol();
-          var isFollowedByWhitespace = /\s/.test(stream.peek());
-          if (settings.smartyVersion === 3 && settings.leftDelimiter === "{" && (isEol || isFollowedByWhitespace)) {
-            state.depth--;
-            return null;
-          } else {
-            state.tokenize = parsers.smarty;
-            last = "startTag";
-            return "tag";
-          }
-        }
-      } else {
-        stream.next();
-        return null;
-      }
-    },
-
-    // parsing Smarty content
-    smarty: function(stream, state) {
-      if (stream.match(settings.rightDelimiter, true)) {
-        if (settings.smartyVersion === 3) {
-          state.depth--;
-          if (state.depth <= 0) {
-            state.tokenize = parsers.tokenizer;
-          }
-        } else {
-          state.tokenize = parsers.tokenizer;
-        }
-        return helpers.cont("tag", null);
-      }
-
-      if (stream.match(settings.leftDelimiter, true)) {
-        state.depth++;
-        return helpers.cont("tag", "startTag");
-      }
-
-      var ch = stream.next();
-      if (ch == "$") {
-        stream.eatWhile(regs.validIdentifier);
-        return helpers.cont("variable-2", "variable");
-      } else if (ch == "|") {
-        return helpers.cont("operator", "pipe");
-      } else if (ch == ".") {
-        return helpers.cont("operator", "property");
-      } else if (regs.stringChar.test(ch)) {
-        state.tokenize = parsers.inAttribute(ch);
-        return helpers.cont("string", "string");
-      } else if (regs.operatorChars.test(ch)) {
-        stream.eatWhile(regs.operatorChars);
-        return helpers.cont("operator", "operator");
-      } else if (ch == "[" || ch == "]") {
-        return helpers.cont("bracket", "bracket");
-      } else if (ch == "(" || ch == ")") {
-        return helpers.cont("bracket", "operator");
-      } else if (/\d/.test(ch)) {
-        stream.eatWhile(/\d/);
-        return helpers.cont("number", "number");
-      } else {
-
-        if (state.last == "variable") {
-          if (ch == "@") {
-            stream.eatWhile(regs.validIdentifier);
-            return helpers.cont("property", "property");
-          } else if (ch == "|") {
-            stream.eatWhile(regs.validIdentifier);
-            return helpers.cont("qualifier", "modifier");
-          }
-        } else if (state.last == "pipe") {
-          stream.eatWhile(regs.validIdentifier);
-          return helpers.cont("qualifier", "modifier");
-        } else if (state.last == "whitespace") {
-          stream.eatWhile(regs.validIdentifier);
-          return helpers.cont("attribute", "modifier");
-        } if (state.last == "property") {
-          stream.eatWhile(regs.validIdentifier);
-          return helpers.cont("property", null);
-        } else if (/\s/.test(ch)) {
-          last = "whitespace";
-          return null;
-        }
-
-        var str = "";
-        if (ch != "/") {
-          str += ch;
-        }
-        var c = null;
-        while (c = stream.eat(regs.validIdentifier)) {
-          str += c;
-        }
-        for (var i=0, j=keyFunctions.length; i<j; i++) {
-          if (keyFunctions[i] == str) {
-            return helpers.cont("keyword", "keyword");
-          }
-        }
-        if (/\s/.test(ch)) {
-          return null;
-        }
-        return helpers.cont("tag", "tag");
-      }
-    },
-
-    inAttribute: function(quote) {
-      return function(stream, state) {
-        var prevChar = null;
-        var currChar = null;
-        while (!stream.eol()) {
-          currChar = stream.peek();
-          if (stream.next() == quote && prevChar !== '\\') {
-            state.tokenize = parsers.smarty;
-            break;
-          }
-          prevChar = currChar;
-        }
-        return "string";
-      };
-    },
-
-    inBlock: function(style, terminator) {
-      return function(stream, state) {
-        while (!stream.eol()) {
-          if (stream.match(terminator)) {
-            state.tokenize = parsers.tokenizer;
-            break;
-          }
-          stream.next();
-        }
-        return style;
-      };
-    }
-  };
-
-
-  // the public API for CodeMirror
-  return {
-    startState: function() {
-      return {
-        tokenize: parsers.tokenizer,
-        mode: "smarty",
-        last: null,
-        depth: 0
-      };
-    },
-    token: function(stream, state) {
-      var style = state.tokenize(stream, state);
-      state.last = last;
-      return style;
-    },
-    electricChars: ""
-  };
-});
-
-CodeMirror.defineMIME("text/x-smarty", "smarty");
diff --git a/resources/libs/codemirror/mode/smartymixed/index.html b/resources/libs/codemirror/mode/smartymixed/index.html
deleted file mode 100644
index 47c805fac..000000000
--- a/resources/libs/codemirror/mode/smartymixed/index.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Smarty mixed mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../mode/xml/xml.js"></script>
-<script src="../../mode/javascript/javascript.js"></script>
-<script src="../../mode/css/css.js"></script>
-<script src="../../mode/htmlmixed/htmlmixed.js"></script>
-<script src="../../mode/smarty/smarty.js"></script>
-<script src="../../mode/smartymixed/smartymixed.js"></script>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Smarty mixed</a>
-  </ul>
-</div>
-
-<article>
-<h2>Smarty mixed mode</h2>
-<form><textarea id="code" name="code">
-{**
-* @brief Smarty mixed mode
-* @author Ruslan Osmanov
-* @date 29.06.2013
-*}
-<html>
-<head>
-  <title>{$title|htmlspecialchars|truncate:30}</title>
-</head>
-<body class="{$bodyclass}">
-  {* Multiline smarty
-  * comment, no {$variables} here
-  *}
-  {literal}
-  {literal} is just an HTML text.
-  <script type="text/javascript">//<![CDATA[
-    var a = {$just_a_normal_js_object : "value"};
-    var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("code"), {
-      mode           : "smartymixed",
-      tabSize        : 2,
-      indentUnit     : 2,
-      indentWithTabs : false,
-      lineNumbers    : true,
-      smartyVersion  : 3
-    });
-    // ]]>
-  </script>
-  <style>
-    /* CSS content 
-    {$no_smarty} */
-    .some-class { font-weight: bolder; color: "orange"; }
-  </style>
-  {/literal}
-
-  {extends file="parent.tpl"}
-  {include file="template.tpl"}
-
-  {* some example Smarty content *}
-  {if isset($name) && $name == 'Blog'}
-    This is a {$var}.
-    {$integer = 4511}, {$array[] = "a"}, {$stringvar = "string"}
-    {$integer = 4512} {$array[] = "a"} {$stringvar = "string"}
-    {assign var='bob' value=$var.prop}
-  {elseif $name == $foo}
-    {function name=menu level=0}
-    {foreach $data as $entry}
-      {if is_array($entry)}
-      - {$entry@key}
-      {menu data=$entry level=$level+1}
-      {else}
-      {$entry}
-      {* One
-      * Two
-      * Three
-      *}
-      {/if}
-    {/foreach}
-    {/function}
-  {/if}
-  </body>
-  <!-- R.O. -->
-</html>
-</textarea></form>
-
-    <script type="text/javascript">
-      var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode           : "smartymixed",
-        tabSize        : 2,
-        indentUnit     : 2,
-        indentWithTabs : false,
-        lineNumbers    : true,
-        smartyVersion  : 3,
-        matchBrackets  : true,
-      });
-    </script>
-
-    <p>The Smarty mixed mode depends on the Smarty and HTML mixed modes. HTML
-    mixed mode itself depends on XML, JavaScript, and CSS modes.</p>
-
-    <p>It takes the same options, as Smarty and HTML mixed modes.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-smarty</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/smartymixed/smartymixed.js b/resources/libs/codemirror/mode/smartymixed/smartymixed.js
deleted file mode 100755
index a033ab04f..000000000
--- a/resources/libs/codemirror/mode/smartymixed/smartymixed.js
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
-* @file smartymixed.js
-* @brief Smarty Mixed Codemirror mode (Smarty + Mixed HTML)
-* @author Ruslan Osmanov <rrosmanov at gmail dot com>
-* @version 3.0
-* @date 05.07.2013
-*/
-CodeMirror.defineMode("smartymixed", function(config) {
-  var settings, regs, helpers, parsers,
-  htmlMixedMode = CodeMirror.getMode(config, "htmlmixed"),
-  smartyMode = CodeMirror.getMode(config, "smarty"),
-
-  settings = {
-    rightDelimiter: '}',
-    leftDelimiter: '{'
-  };
-
-  if (config.hasOwnProperty("leftDelimiter")) {
-    settings.leftDelimiter = config.leftDelimiter;
-  }
-  if (config.hasOwnProperty("rightDelimiter")) {
-    settings.rightDelimiter = config.rightDelimiter;
-  }
-
-  regs = {
-    smartyComment: new RegExp("^" + settings.leftDelimiter + "\\*"),
-    literalOpen: new RegExp(settings.leftDelimiter + "literal" + settings.rightDelimiter),
-    literalClose: new RegExp(settings.leftDelimiter + "\/literal" + settings.rightDelimiter),
-    hasLeftDelimeter: new RegExp(".*" + settings.leftDelimiter),
-    htmlHasLeftDelimeter: new RegExp("[^<>]*" + settings.leftDelimiter)
-  };
-
-  helpers = {
-    chain: function(stream, state, parser) {
-      state.tokenize = parser;
-      return parser(stream, state);
-    },
-
-    cleanChain: function(stream, state, parser) {
-      state.tokenize = null;
-      state.localState = null;
-      state.localMode = null;
-      return (typeof parser == "string") ? (parser ? parser : null) : parser(stream, state);
-    },
-
-    maybeBackup: function(stream, pat, style) {
-      var cur = stream.current();
-      var close = cur.search(pat),
-      m;
-      if (close > - 1) stream.backUp(cur.length - close);
-      else if (m = cur.match(/<\/?$/)) {
-        stream.backUp(cur.length);
-        if (!stream.match(pat, false)) stream.match(cur[0]);
-      }
-      return style;
-    }
-  };
-
-  parsers = {
-    html: function(stream, state) {
-      if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false) && state.htmlMixedState.htmlState.tagName === null) {
-        state.tokenize = parsers.smarty;
-        state.localMode = smartyMode;
-        state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));
-        return helpers.maybeBackup(stream, settings.leftDelimiter, smartyMode.token(stream, state.localState));
-      } else if (!state.inLiteral && stream.match(settings.leftDelimiter, false)) {
-        state.tokenize = parsers.smarty;
-        state.localMode = smartyMode;
-        state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));
-        return helpers.maybeBackup(stream, settings.leftDelimiter, smartyMode.token(stream, state.localState));
-      }
-      return htmlMixedMode.token(stream, state.htmlMixedState);
-    },
-
-    smarty: function(stream, state) {
-      if (stream.match(settings.leftDelimiter, false)) {
-        if (stream.match(regs.smartyComment, false)) {
-          return helpers.chain(stream, state, parsers.inBlock("comment", "*" + settings.rightDelimiter));
-        }
-      } else if (stream.match(settings.rightDelimiter, false)) {
-        stream.eat(settings.rightDelimiter);
-        state.tokenize = parsers.html;
-        state.localMode = htmlMixedMode;
-        state.localState = state.htmlMixedState;
-        return "tag";
-      }
-
-      return helpers.maybeBackup(stream, settings.rightDelimiter, smartyMode.token(stream, state.localState));
-    },
-
-    inBlock: function(style, terminator) {
-      return function(stream, state) {
-        while (!stream.eol()) {
-          if (stream.match(terminator)) {
-            helpers.cleanChain(stream, state, "");
-            break;
-          }
-          stream.next();
-        }
-        return style;
-      };
-    }
-  };
-
-  return {
-    startState: function() {
-      var state = htmlMixedMode.startState();
-      return {
-        token: parsers.html,
-        localMode: null,
-        localState: null,
-        htmlMixedState: state,
-        tokenize: null,
-        inLiteral: false
-      };
-    },
-
-    copyState: function(state) {
-      var local = null, tok = (state.tokenize || state.token);
-      if (state.localState) {
-        local = CodeMirror.copyState((tok != parsers.html ? smartyMode : htmlMixedMode), state.localState);
-      }
-      return {
-        token: state.token,
-        tokenize: state.tokenize,
-        localMode: state.localMode,
-        localState: local,
-        htmlMixedState: CodeMirror.copyState(htmlMixedMode, state.htmlMixedState),
-        inLiteral: state.inLiteral
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.match(settings.leftDelimiter, false)) {
-        if (!state.inLiteral && stream.match(regs.literalOpen, true)) {
-          state.inLiteral = true;
-          return "keyword";
-        } else if (state.inLiteral && stream.match(regs.literalClose, true)) {
-          state.inLiteral = false;
-          return "keyword";
-        }
-      }
-      if (state.inLiteral && state.localState != state.htmlMixedState) {
-        state.tokenize = parsers.html;
-        state.localMode = htmlMixedMode;
-        state.localState = state.htmlMixedState;
-      }
-
-      var style = (state.tokenize || state.token)(stream, state);
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.localMode == smartyMode
-          || (state.inLiteral && !state.localMode)
-         || regs.hasLeftDelimeter.test(textAfter)) {
-        return CodeMirror.Pass;
-      }
-      return htmlMixedMode.indent(state.htmlMixedState, textAfter);
-    },
-
-    electricChars: "/{}:",
-
-    innerMode: function(state) {
-      return {
-        state: state.localState || state.htmlMixedState,
-        mode: state.localMode || htmlMixedMode
-      };
-    }
-  };
-},
-"htmlmixed");
-
-CodeMirror.defineMIME("text/x-smarty", "smartymixed");
-// vim: et ts=2 sts=2 sw=2
diff --git a/resources/libs/codemirror/mode/sparql/index.html b/resources/libs/codemirror/mode/sparql/index.html
deleted file mode 100644
index 7c41e17b7..000000000
--- a/resources/libs/codemirror/mode/sparql/index.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: SPARQL mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="sparql.js"></script>
-<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">SPARQL</a>
-  </ul>
-</div>
-
-<article>
-<h2>SPARQL mode</h2>
-<form><textarea id="code" name="code">
-PREFIX a: &lt;http://www.w3.org/2000/10/annotation-ns#>
-PREFIX dc: &lt;http://purl.org/dc/elements/1.1/>
-PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/>
-
-# Comment!
-
-SELECT ?given ?family
-WHERE {
-  ?annot a:annotates &lt;http://www.w3.org/TR/rdf-sparql-query/> .
-  ?annot dc:creator ?c .
-  OPTIONAL {?c foaf:given ?given ;
-               foaf:family ?family } .
-  FILTER isBlank(?c)
-}
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "application/x-sparql-query",
-        tabMode: "indent",
-        matchBrackets: true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>application/x-sparql-query</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/sparql/sparql.js b/resources/libs/codemirror/mode/sparql/sparql.js
deleted file mode 100644
index 0329057f6..000000000
--- a/resources/libs/codemirror/mode/sparql/sparql.js
+++ /dev/null
@@ -1,145 +0,0 @@
-CodeMirror.defineMode("sparql", function(config) {
-  var indentUnit = config.indentUnit;
-  var curPunc;
-
-  function wordRegexp(words) {
-    return new RegExp("^(?:" + words.join("|") + ")$", "i");
-  }
-  var ops = wordRegexp(["str", "lang", "langmatches", "datatype", "bound", "sameterm", "isiri", "isuri",
-                        "isblank", "isliteral", "a"]);
-  var keywords = wordRegexp(["base", "prefix", "select", "distinct", "reduced", "construct", "describe",
-                             "ask", "from", "named", "where", "order", "limit", "offset", "filter", "optional",
-                             "graph", "by", "asc", "desc", "as", "having", "undef", "values", "group",
-                             "minus", "in", "not", "service", "silent", "using", "insert", "delete", "union",
-                             "data", "copy", "to", "move", "add", "create", "drop", "clear", "load"]);
-  var operatorChars = /[*+\-<>=&|]/;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    curPunc = null;
-    if (ch == "$" || ch == "?") {
-      stream.match(/^[\w\d]*/);
-      return "variable-2";
-    }
-    else if (ch == "<" && !stream.match(/^[\s\u00a0=]/, false)) {
-      stream.match(/^[^\s\u00a0>]*>?/);
-      return "atom";
-    }
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenLiteral(ch);
-      return state.tokenize(stream, state);
-    }
-    else if (/[{}\(\),\.;\[\]]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    else if (ch == "#") {
-      stream.skipToEnd();
-      return "comment";
-    }
-    else if (operatorChars.test(ch)) {
-      stream.eatWhile(operatorChars);
-      return null;
-    }
-    else if (ch == ":") {
-      stream.eatWhile(/[\w\d\._\-]/);
-      return "atom";
-    }
-    else {
-      stream.eatWhile(/[_\w\d]/);
-      if (stream.eat(":")) {
-        stream.eatWhile(/[\w\d_\-]/);
-        return "atom";
-      }
-      var word = stream.current();
-      if (ops.test(word))
-        return null;
-      else if (keywords.test(word))
-        return "keyword";
-      else
-        return "variable";
-    }
-  }
-
-  function tokenLiteral(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      return "string";
-    };
-  }
-
-  function pushContext(state, type, col) {
-    state.context = {prev: state.context, indent: state.indent, col: col, type: type};
-  }
-  function popContext(state) {
-    state.indent = state.context.indent;
-    state.context = state.context.prev;
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: tokenBase,
-              context: null,
-              indent: 0,
-              col: 0};
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (state.context && state.context.align == null) state.context.align = false;
-        state.indent = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-
-      if (style != "comment" && state.context && state.context.align == null && state.context.type != "pattern") {
-        state.context.align = true;
-      }
-
-      if (curPunc == "(") pushContext(state, ")", stream.column());
-      else if (curPunc == "[") pushContext(state, "]", stream.column());
-      else if (curPunc == "{") pushContext(state, "}", stream.column());
-      else if (/[\]\}\)]/.test(curPunc)) {
-        while (state.context && state.context.type == "pattern") popContext(state);
-        if (state.context && curPunc == state.context.type) popContext(state);
-      }
-      else if (curPunc == "." && state.context && state.context.type == "pattern") popContext(state);
-      else if (/atom|string|variable/.test(style) && state.context) {
-        if (/[\}\]]/.test(state.context.type))
-          pushContext(state, "pattern", stream.column());
-        else if (state.context.type == "pattern" && !state.context.align) {
-          state.context.align = true;
-          state.context.col = stream.column();
-        }
-      }
-
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var firstChar = textAfter && textAfter.charAt(0);
-      var context = state.context;
-      if (/[\]\}]/.test(firstChar))
-        while (context && context.type == "pattern") context = context.prev;
-
-      var closing = context && firstChar == context.type;
-      if (!context)
-        return 0;
-      else if (context.type == "pattern")
-        return context.col;
-      else if (context.align)
-        return context.col + (closing ? 0 : 1);
-      else
-        return context.indent + (closing ? 0 : indentUnit);
-    }
-  };
-});
-
-CodeMirror.defineMIME("application/x-sparql-query", "sparql");
diff --git a/resources/libs/codemirror/mode/sql/index.html b/resources/libs/codemirror/mode/sql/index.html
deleted file mode 100644
index e6882d79c..000000000
--- a/resources/libs/codemirror/mode/sql/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: SQL Mode for CodeMirror</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css" />
-<script src="../../lib/codemirror.js"></script>
-<script src="sql.js"></script>
-<style>
-.CodeMirror {
-    border-top: 1px solid black;
-    border-bottom: 1px solid black;
-}
-        </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">SQL Mode for CodeMirror</a>
-  </ul>
-</div>
-
-<article>
-<h2>SQL Mode for CodeMirror</h2>
-<form>
-            <textarea id="code" name="code">-- SQL Mode for CodeMirror
-SELECT SQL_NO_CACHE DISTINCT
-		@var1 AS `val1`, @'val2', @global.'sql_mode',
-		1.1 AS `float_val`, .14 AS `another_float`, 0.09e3 AS `int_with_esp`,
-		0xFA5 AS `hex`, x'fa5' AS `hex2`, 0b101 AS `bin`, b'101' AS `bin2`,
-		DATE '1994-01-01' AS `sql_date`, { T "1994-01-01" } AS `odbc_date`,
-		'my string', _utf8'your string', N'her string',
-        TRUE, FALSE, UNKNOWN
-	FROM DUAL
-	-- space needed after '--'
-	# 1 line comment
-	/* multiline
-	comment! */
-	LIMIT 1 OFFSET 0;
-</textarea>
-            </form>
-            <p><strong>MIME types defined:</strong> 
-            <code><a href="?mime=text/x-sql">text/x-sql</a></code>,
-            <code><a href="?mime=text/x-mysql">text/x-mysql</a></code>,
-            <code><a href="?mime=text/x-mariadb">text/x-mariadb</a></code>,
-            <code><a href="?mime=text/x-cassandra">text/x-cassandra</a></code>,
-            <code><a href="?mime=text/x-plsql">text/x-plsql</a></code>,
-            <code><a href="?mime=text/x-mssql">text/x-mssql</a></code>.
-        </p>
-<script>
-window.onload = function() {
-  var mime = 'text/x-mariadb';
-  // get mime type
-  if (window.location.href.indexOf('mime=') > -1) {
-    mime = window.location.href.substr(window.location.href.indexOf('mime=') + 5);
-  }
-  window.editor = CodeMirror.fromTextArea(document.getElementById('code'), {
-    mode: mime,
-    indentWithTabs: true,
-    smartIndent: true,
-    lineNumbers: true,
-    matchBrackets : true,
-    autofocus: true
-  });
-};
-</script>
-
-</article>
diff --git a/resources/libs/codemirror/mode/sql/sql.js b/resources/libs/codemirror/mode/sql/sql.js
deleted file mode 100644
index 3be68caa1..000000000
--- a/resources/libs/codemirror/mode/sql/sql.js
+++ /dev/null
@@ -1,365 +0,0 @@
-CodeMirror.defineMode("sql", function(config, parserConfig) {
-  "use strict";
-
-  var client         = parserConfig.client || {},
-      atoms          = parserConfig.atoms || {"false": true, "true": true, "null": true},
-      builtin        = parserConfig.builtin || {},
-      keywords       = parserConfig.keywords || {},
-      operatorChars  = parserConfig.operatorChars || /^[*+\-%<>!=&|~^]/,
-      support        = parserConfig.support || {},
-      hooks          = parserConfig.hooks || {},
-      dateSQL        = parserConfig.dateSQL || {"date" : true, "time" : true, "timestamp" : true};
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-
-    // call hooks from the mime type
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-
-    if (support.hexNumber == true &&
-      ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/))
-      || (ch == "x" || ch == "X") && stream.match(/^'[0-9a-fA-F]+'/))) {
-      // hex
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/hexadecimal-literals.html
-      return "number";
-    } else if (support.binaryNumber == true &&
-      (((ch == "b" || ch == "B") && stream.match(/^'[01]+'/))
-      || (ch == "0" && stream.match(/^b[01]+/)))) {
-      // bitstring
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/bit-field-literals.html
-      return "number";
-    } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
-      // numbers
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
-          stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
-      support.decimallessFloat == true && stream.eat('.');
-      return "number";
-    } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) {
-      // placeholders
-      return "variable-3";
-    } else if (ch == "'" || (ch == '"' && support.doubleQuote)) {
-      // strings
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
-      state.tokenize = tokenLiteral(ch);
-      return state.tokenize(stream, state);
-    } else if ((((support.nCharCast == true && (ch == "n" || ch == "N"))
-        || (support.charsetCast == true && ch == "_" && stream.match(/[a-z][a-z0-9]*/i)))
-        && (stream.peek() == "'" || stream.peek() == '"'))) {
-      // charset casting: _utf8'str', N'str', n'str'
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
-      return "keyword";
-    } else if (/^[\(\),\;\[\]]/.test(ch)) {
-      // no highlightning
-      return null;
-    } else if (support.commentSlashSlash && ch == "/" && stream.eat("/")) {
-      // 1-line comment
-      stream.skipToEnd();
-      return "comment";
-    } else if ((support.commentHash && ch == "#")
-        || (ch == "-" && stream.eat("-") && (!support.commentSpaceRequired || stream.eat(" ")))) {
-      // 1-line comments
-      // ref: https://kb.askmonty.org/en/comment-syntax/
-      stream.skipToEnd();
-      return "comment";
-    } else if (ch == "/" && stream.eat("*")) {
-      // multi-line comments
-      // ref: https://kb.askmonty.org/en/comment-syntax/
-      state.tokenize = tokenComment;
-      return state.tokenize(stream, state);
-    } else if (ch == ".") {
-      // .1 for 0.1
-      if (support.zerolessFloat == true && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i)) {
-        return "number";
-      }
-      // .table_name (ODBC)
-      // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
-      if (support.ODBCdotTable == true && stream.match(/^[a-zA-Z_]+/)) {
-        return "variable-2";
-      }
-    } else if (operatorChars.test(ch)) {
-      // operators
-      stream.eatWhile(operatorChars);
-      return null;
-    } else if (ch == '{' &&
-        (stream.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/) || stream.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/))) {
-      // dates (weird ODBC syntax)
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
-      return "number";
-    } else {
-      stream.eatWhile(/^[_\w\d]/);
-      var word = stream.current().toLowerCase();
-      // dates (standard SQL syntax)
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
-      if (dateSQL.hasOwnProperty(word) && (stream.match(/^( )+'[^']*'/) || stream.match(/^( )+"[^"]*"/)))
-        return "number";
-      if (atoms.hasOwnProperty(word)) return "atom";
-      if (builtin.hasOwnProperty(word)) return "builtin";
-      if (keywords.hasOwnProperty(word)) return "keyword";
-      if (client.hasOwnProperty(word)) return "string-2";
-      return null;
-    }
-  }
-
-  // 'string', with char specified in quote escaped by '\'
-  function tokenLiteral(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      return "string";
-    };
-  }
-  function tokenComment(stream, state) {
-    while (true) {
-      if (stream.skipTo("*")) {
-        stream.next();
-        if (stream.eat("/")) {
-          state.tokenize = tokenBase;
-          break;
-        }
-      } else {
-        stream.skipToEnd();
-        break;
-      }
-    }
-    return "comment";
-  }
-
-  function pushContext(stream, state, type) {
-    state.context = {
-      prev: state.context,
-      indent: stream.indentation(),
-      col: stream.column(),
-      type: type
-    };
-  }
-
-  function popContext(state) {
-    state.indent = state.context.indent;
-    state.context = state.context.prev;
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: tokenBase, context: null};
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (state.context && state.context.align == null)
-          state.context.align = false;
-      }
-      if (stream.eatSpace()) return null;
-
-      var style = state.tokenize(stream, state);
-      if (style == "comment") return style;
-
-      if (state.context && state.context.align == null)
-        state.context.align = true;
-
-      var tok = stream.current();
-      if (tok == "(")
-        pushContext(stream, state, ")");
-      else if (tok == "[")
-        pushContext(stream, state, "]");
-      else if (state.context && state.context.type == tok)
-        popContext(state);
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var cx = state.context;
-      if (!cx) return CodeMirror.Pass;
-      if (cx.align) return cx.col + (textAfter.charAt(0) == cx.type ? 0 : 1);
-      else return cx.indent + config.indentUnit;
-    },
-
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : null
-  };
-});
-
-(function() {
-  "use strict";
-
-  // `identifier`
-  function hookIdentifier(stream) {
-    // MySQL/MariaDB identifiers
-    // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
-    var ch;
-    while ((ch = stream.next()) != null) {
-      if (ch == "`" && !stream.eat("`")) return "variable-2";
-    }
-    return null;
-  }
-
-  // variable token
-  function hookVar(stream) {
-    // variables
-    // @@prefix.varName @varName
-    // varName can be quoted with ` or ' or "
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/user-variables.html
-    if (stream.eat("@")) {
-      stream.match(/^session\./);
-      stream.match(/^local\./);
-      stream.match(/^global\./);
-    }
-
-    if (stream.eat("'")) {
-      stream.match(/^.*'/);
-      return "variable-2";
-    } else if (stream.eat('"')) {
-      stream.match(/^.*"/);
-      return "variable-2";
-    } else if (stream.eat("`")) {
-      stream.match(/^.*`/);
-      return "variable-2";
-    } else if (stream.match(/^[0-9a-zA-Z$\.\_]+/)) {
-      return "variable-2";
-    }
-    return null;
-  };
-
-  // short client keyword token
-  function hookClient(stream) {
-    // \N means NULL
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/null-values.html
-    if (stream.eat("N")) {
-        return "atom";
-    }
-    // \g, etc
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/mysql-commands.html
-    return stream.match(/^[a-zA-Z.#!?]/) ? "variable-2" : null;
-  }
-
-  // these keywords are used by all SQL dialects (however, a mode can still overwrite it)
-  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from having in insert into is join like not on or order select set table union update values where ";
-
-  // turn a space-separated list into an array
-  function set(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  // A generic SQL Mode. It's not a standard, it just try to support what is generally supported
-  CodeMirror.defineMIME("text/x-sql", {
-    name: "sql",
-    keywords: set(sqlKeywords + "begin"),
-    builtin: set("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=]/,
-    dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
-  });
-
-  CodeMirror.defineMIME("text/x-mssql", {
-    name: "sql",
-    client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
-    keywords: set(sqlKeywords + "begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered"),
-    builtin: set("bigint numeric bit smallint decimal smallmoney int tinyint money float real char varchar text nchar nvarchar ntext binary varbinary image cursor timestamp hierarchyid uniqueidentifier sql_variant xml table "),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=]/,
-    dateSQL: set("date datetimeoffset datetime2 smalldatetime datetime time"),
-    hooks: {
-      "@":   hookVar
-    }
-  });
-
-  CodeMirror.defineMIME("text/x-mysql", {
-    name: "sql",
-    client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
-    keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group groupby_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
-    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=&|^]/,
-    dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
-    hooks: {
-      "@":   hookVar,
-      "`":   hookIdentifier,
-      "\\":  hookClient
-    }
-  });
-
-  CodeMirror.defineMIME("text/x-mariadb", {
-    name: "sql",
-    client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
-    keywords: set(sqlKeywords + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
-    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=&|^]/,
-    dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
-    hooks: {
-      "@":   hookVar,
-      "`":   hookIdentifier,
-      "\\":  hookClient
-    }
-  });
-
-  // the query language used by Apache Cassandra is called CQL, but this mime type
-  // is called Cassandra to avoid confusion with Contextual Query Language
-  CodeMirror.defineMIME("text/x-cassandra", {
-    name: "sql",
-    client: { },
-    keywords: set("use select from using consistency where limit first reversed first and in insert into values using consistency ttl update set delete truncate begin batch apply create keyspace with columnfamily primary key index on drop alter type add any one quorum all local_quorum each_quorum"),
-    builtin: set("ascii bigint blob boolean counter decimal double float int text timestamp uuid varchar varint"),
-    atoms: set("false true"),
-    operatorChars: /^[<>=]/,
-    dateSQL: { },
-    support: set("commentSlashSlash decimallessFloat"),
-    hooks: { }
-  });
-
-  // this is based on Peter Raganitsch's 'plsql' mode
-  CodeMirror.defineMIME("text/x-plsql", {
-    name:       "sql",
-    client:     set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),
-    keywords:   set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
-    builtin:    set("bfile blob character clob dec float int integer mlslabel natural naturaln nchar nclob number numeric nvarchar2 real rowtype signtype smallint string varchar varchar2 abs acos add_months ascii asin atan atan2 average bfilename ceil chartorowid chr concat convert cos cosh count decode deref dual dump dup_val_on_index empty error exp false floor found glb greatest hextoraw initcap instr instrb isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mod months_between new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null nvl others power rawtohex reftohex round rowcount rowidtochar rpad rtrim sign sin sinh soundex sqlcode sqlerrm sqrt stddev substr substrb sum sysdate tan tanh to_char to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid upper user userenv variance vsize"),
-    operatorChars: /^[*+\-%<>!=~]/,
-    dateSQL:    set("date time timestamp"),
-    support:    set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")
-  });
-}());
-
-/*
-  How Properties of Mime Types are used by SQL Mode
-  =================================================
-
-  keywords:
-    A list of keywords you want to be highlighted.
-  functions:
-    A list of function names you want to be highlighted.
-  builtin:
-    A list of builtin types you want to be highlighted (if you want types to be of class "builtin" instead of "keyword").
-  operatorChars:
-    All characters that must be handled as operators.
-  client:
-    Commands parsed and executed by the client (not the server).
-  support:
-    A list of supported syntaxes which are not common, but are supported by more than 1 DBMS.
-    * ODBCdotTable: .tableName
-    * zerolessFloat: .1
-    * doubleQuote
-    * nCharCast: N'string'
-    * charsetCast: _utf8'string'
-    * commentHash: use # char for comments
-    * commentSlashSlash: use // for comments
-    * commentSpaceRequired: require a space after -- for comments
-  atoms:
-    Keywords that must be highlighted as atoms,. Some DBMS's support more atoms than others:
-    UNKNOWN, INFINITY, UNDERFLOW, NaN...
-  dateSQL:
-    Used for date/time SQL standard syntax, because not all DBMS's support same temporal types.
-*/
diff --git a/resources/libs/codemirror/mode/stex/index.html b/resources/libs/codemirror/mode/stex/index.html
deleted file mode 100644
index 28b8f64be..000000000
--- a/resources/libs/codemirror/mode/stex/index.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: sTeX mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="stex.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">sTeX</a>
-  </ul>
-</div>
-
-<article>
-<h2>sTeX mode</h2>
-<form><textarea id="code" name="code">
-\begin{module}[id=bbt-size]
-\importmodule[balanced-binary-trees]{balanced-binary-trees}
-\importmodule[\KWARCslides{dmath/en/cardinality}]{cardinality}
-
-\begin{frame}
-  \frametitle{Size Lemma for Balanced Trees}
-  \begin{itemize}
-  \item
-    \begin{assertion}[id=size-lemma,type=lemma] 
-    Let $G=\tup{V,E}$ be a \termref[cd=binary-trees]{balanced binary tree} 
-    of \termref[cd=graph-depth,name=vertex-depth]{depth}$n>i$, then the set
-     $\defeq{\livar{V}i}{\setst{\inset{v}{V}}{\gdepth{v} = i}}$ of
-    \termref[cd=graphs-intro,name=node]{nodes} at 
-    \termref[cd=graph-depth,name=vertex-depth]{depth} $i$ has
-    \termref[cd=cardinality,name=cardinality]{cardinality} $\power2i$.
-   \end{assertion}
-  \item
-    \begin{sproof}[id=size-lemma-pf,proofend=,for=size-lemma]{via induction over the depth $i$.}
-      \begin{spfcases}{We have to consider two cases}
-        \begin{spfcase}{$i=0$}
-          \begin{spfstep}[display=flow]
-            then $\livar{V}i=\set{\livar{v}r}$, where $\livar{v}r$ is the root, so
-            $\eq{\card{\livar{V}0},\card{\set{\livar{v}r}},1,\power20}$.
-          \end{spfstep}
-        \end{spfcase}
-        \begin{spfcase}{$i>0$}
-          \begin{spfstep}[display=flow]
-           then $\livar{V}{i-1}$ contains $\power2{i-1}$ vertexes 
-           \begin{justification}[method=byIH](IH)\end{justification}
-          \end{spfstep}
-          \begin{spfstep}
-           By the \begin{justification}[method=byDef]definition of a binary
-              tree\end{justification}, each $\inset{v}{\livar{V}{i-1}}$ is a leaf or has
-            two children that are at depth $i$.
-          \end{spfstep}
-          \begin{spfstep}
-           As $G$ is \termref[cd=balanced-binary-trees,name=balanced-binary-tree]{balanced} and $\gdepth{G}=n>i$, $\livar{V}{i-1}$ cannot contain
-            leaves.
-          \end{spfstep}
-          \begin{spfstep}[type=conclusion]
-           Thus $\eq{\card{\livar{V}i},{\atimes[cdot]{2,\card{\livar{V}{i-1}}}},{\atimes[cdot]{2,\power2{i-1}}},\power2i}$.
-          \end{spfstep}
-        \end{spfcase}
-      \end{spfcases}
-    \end{sproof}
-  \item 
-    \begin{assertion}[id=fbbt,type=corollary]	
-      A fully balanced tree of depth $d$ has $\power2{d+1}-1$ nodes.
-    \end{assertion}
-  \item
-      \begin{sproof}[for=fbbt,id=fbbt-pf]{}
-        \begin{spfstep}
-          Let $\defeq{G}{\tup{V,E}}$ be a fully balanced tree
-        \end{spfstep}
-        \begin{spfstep}
-          Then $\card{V}=\Sumfromto{i}1d{\power2i}= \power2{d+1}-1$.
-        \end{spfstep}
-      \end{sproof}
-    \end{itemize}
-  \end{frame}
-\begin{note}
-  \begin{omtext}[type=conclusion,for=binary-tree]
-    This shows that balanced binary trees grow in breadth very quickly, a consequence of
-    this is that they are very shallow (and this compute very fast), which is the essence of
-    the next result.
-  \end{omtext}
-\end{note}
-\end{module}
-
-%%% Local Variables: 
-%%% mode: LaTeX
-%%% TeX-master: "all"
-%%% End: \end{document}
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-stex</code>.</p>
-
-    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#stex_*">normal</a>,  <a href="../../test/index.html#verbose,stex_*">verbose</a>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/stex/stex.js b/resources/libs/codemirror/mode/stex/stex.js
deleted file mode 100644
index ca04c24f2..000000000
--- a/resources/libs/codemirror/mode/stex/stex.js
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Author: Constantin Jucovschi (c.jucovschi@jacobs-university.de)
- * Licence: MIT
- */
-
-CodeMirror.defineMode("stex", function() {
-    "use strict";
-
-    function pushCommand(state, command) {
-        state.cmdState.push(command);
-    }
-
-    function peekCommand(state) {
-        if (state.cmdState.length > 0) {
-            return state.cmdState[state.cmdState.length - 1];
-        } else {
-            return null;
-        }
-    }
-
-    function popCommand(state) {
-        var plug = state.cmdState.pop();
-        if (plug) {
-            plug.closeBracket();
-        }
-    }
-
-    // returns the non-default plugin closest to the end of the list
-    function getMostPowerful(state) {
-        var context = state.cmdState;
-        for (var i = context.length - 1; i >= 0; i--) {
-            var plug = context[i];
-            if (plug.name == "DEFAULT") {
-                continue;
-            }
-            return plug;
-        }
-        return { styleIdentifier: function() { return null; } };
-    }
-
-    function addPluginPattern(pluginName, cmdStyle, styles) {
-        return function () {
-            this.name = pluginName;
-            this.bracketNo = 0;
-            this.style = cmdStyle;
-            this.styles = styles;
-            this.argument = null;   // \begin and \end have arguments that follow. These are stored in the plugin
-
-            this.styleIdentifier = function() {
-                return this.styles[this.bracketNo - 1] || null;
-            };
-            this.openBracket = function() {
-                this.bracketNo++;
-                return "bracket";
-            };
-            this.closeBracket = function() {};
-        };
-    }
-
-    var plugins = {};
-
-    plugins["importmodule"] = addPluginPattern("importmodule", "tag", ["string", "builtin"]);
-    plugins["documentclass"] = addPluginPattern("documentclass", "tag", ["", "atom"]);
-    plugins["usepackage"] = addPluginPattern("usepackage", "tag", ["atom"]);
-    plugins["begin"] = addPluginPattern("begin", "tag", ["atom"]);
-    plugins["end"] = addPluginPattern("end", "tag", ["atom"]);
-
-    plugins["DEFAULT"] = function () {
-        this.name = "DEFAULT";
-        this.style = "tag";
-
-        this.styleIdentifier = this.openBracket = this.closeBracket = function() {};
-    };
-
-    function setState(state, f) {
-        state.f = f;
-    }
-
-    // called when in a normal (no environment) context
-    function normal(source, state) {
-        var plug;
-        // Do we look like '\command' ?  If so, attempt to apply the plugin 'command'
-        if (source.match(/^\\[a-zA-Z@]+/)) {
-            var cmdName = source.current().slice(1);
-            plug = plugins[cmdName] || plugins["DEFAULT"];
-            plug = new plug();
-            pushCommand(state, plug);
-            setState(state, beginParams);
-            return plug.style;
-        }
-
-        // escape characters
-        if (source.match(/^\\[$&%#{}_]/)) {
-          return "tag";
-        }
-
-        // white space control characters
-        if (source.match(/^\\[,;!\/\\]/)) {
-          return "tag";
-        }
-
-        // find if we're starting various math modes
-        if (source.match("\\[")) {
-            setState(state, function(source, state){ return inMathMode(source, state, "\\]"); });
-            return "keyword";
-        }
-        if (source.match("$$")) {
-            setState(state, function(source, state){ return inMathMode(source, state, "$$"); });
-            return "keyword";
-        }
-        if (source.match("$")) {
-            setState(state, function(source, state){ return inMathMode(source, state, "$"); });
-            return "keyword";
-        }
-
-        var ch = source.next();
-        if (ch == "%") {
-            // special case: % at end of its own line; stay in same state
-            if (!source.eol()) {
-              setState(state, inCComment);
-            }
-            return "comment";
-        }
-        else if (ch == '}' || ch == ']') {
-            plug = peekCommand(state);
-            if (plug) {
-                plug.closeBracket(ch);
-                setState(state, beginParams);
-            } else {
-                return "error";
-            }
-            return "bracket";
-        } else if (ch == '{' || ch == '[') {
-            plug = plugins["DEFAULT"];
-            plug = new plug();
-            pushCommand(state, plug);
-            return "bracket";
-        }
-        else if (/\d/.test(ch)) {
-            source.eatWhile(/[\w.%]/);
-            return "atom";
-        }
-        else {
-            source.eatWhile(/[\w\-_]/);
-            plug = getMostPowerful(state);
-            if (plug.name == 'begin') {
-                plug.argument = source.current();
-            }
-            return plug.styleIdentifier();
-        }
-    }
-
-    function inCComment(source, state) {
-        source.skipToEnd();
-        setState(state, normal);
-        return "comment";
-    }
-
-    function inMathMode(source, state, endModeSeq) {
-        if (source.eatSpace()) {
-            return null;
-        }
-        if (source.match(endModeSeq)) {
-            setState(state, normal);
-            return "keyword";
-        }
-        if (source.match(/^\\[a-zA-Z@]+/)) {
-            return "tag";
-        }
-        if (source.match(/^[a-zA-Z]+/)) {
-            return "variable-2";
-        }
-        // escape characters
-        if (source.match(/^\\[$&%#{}_]/)) {
-          return "tag";
-        }
-        // white space control characters
-        if (source.match(/^\\[,;!\/]/)) {
-          return "tag";
-        }
-        // special math-mode characters
-        if (source.match(/^[\^_&]/)) {
-          return "tag";
-        }
-        // non-special characters
-        if (source.match(/^[+\-<>|=,\/@!*:;'"`~#?]/)) {
-            return null;
-        }
-        if (source.match(/^(\d+\.\d*|\d*\.\d+|\d+)/)) {
-          return "number";
-        }
-        var ch = source.next();
-        if (ch == "{" || ch == "}" || ch == "[" || ch == "]" || ch == "(" || ch == ")") {
-            return "bracket";
-        }
-
-        // eat comments here, because inCComment returns us to normal state!
-        if (ch == "%") {
-            if (!source.eol()) {
-                source.skipToEnd();
-            }
-            return "comment";
-        }
-        return "error";
-    }
-
-    function beginParams(source, state) {
-        var ch = source.peek(), lastPlug;
-        if (ch == '{' || ch == '[') {
-            lastPlug = peekCommand(state);
-            lastPlug.openBracket(ch);
-            source.eat(ch);
-            setState(state, normal);
-            return "bracket";
-        }
-        if (/[ \t\r]/.test(ch)) {
-            source.eat(ch);
-            return null;
-        }
-        setState(state, normal);
-        popCommand(state);
-
-        return normal(source, state);
-    }
-
-    return {
-        startState: function() {
-            return {
-                cmdState: [],
-                f: normal
-            };
-        },
-        copyState: function(s) {
-            return {
-                cmdState: s.cmdState.slice(),
-                f: s.f
-            };
-        },
-        token: function(stream, state) {
-            return state.f(stream, state);
-        }
-    };
-});
-
-CodeMirror.defineMIME("text/x-stex", "stex");
-CodeMirror.defineMIME("text/x-latex", "stex");
diff --git a/resources/libs/codemirror/mode/stex/test.js b/resources/libs/codemirror/mode/stex/test.js
deleted file mode 100644
index ab629e81e..000000000
--- a/resources/libs/codemirror/mode/stex/test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "stex");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("word",
-     "foo");
-
-  MT("twoWords",
-     "foo bar");
-
-  MT("beginEndDocument",
-     "[tag \\begin][bracket {][atom document][bracket }]",
-     "[tag \\end][bracket {][atom document][bracket }]");
-
-  MT("beginEndEquation",
-     "[tag \\begin][bracket {][atom equation][bracket }]",
-     "  E=mc^2",
-     "[tag \\end][bracket {][atom equation][bracket }]");
-
-  MT("beginModule",
-     "[tag \\begin][bracket {][atom module][bracket }[[]]]");
-
-  MT("beginModuleId",
-     "[tag \\begin][bracket {][atom module][bracket }[[]id=bbt-size[bracket ]]]");
-
-  MT("importModule",
-     "[tag \\importmodule][bracket [[][string b-b-t][bracket ]]{][builtin b-b-t][bracket }]");
-
-  MT("importModulePath",
-     "[tag \\importmodule][bracket [[][tag \\KWARCslides][bracket {][string dmath/en/cardinality][bracket }]]{][builtin card][bracket }]");
-
-  MT("psForPDF",
-     "[tag \\PSforPDF][bracket [[][atom 1][bracket ]]{]#1[bracket }]");
-
-  MT("comment",
-     "[comment % foo]");
-
-  MT("tagComment",
-     "[tag \\item][comment % bar]");
-
-  MT("commentTag",
-     " [comment % \\item]");
-
-  MT("commentLineBreak",
-     "[comment %]",
-     "foo");
-
-  MT("tagErrorCurly",
-     "[tag \\begin][error }][bracket {]");
-
-  MT("tagErrorSquare",
-     "[tag \\item][error ]]][bracket {]");
-
-  MT("commentCurly",
-     "[comment % }]");
-
-  MT("tagHash",
-     "the [tag \\#] key");
-
-  MT("tagNumber",
-     "a [tag \\$][atom 5] stetson");
-
-  MT("tagPercent",
-     "[atom 100][tag \\%] beef");
-
-  MT("tagAmpersand",
-     "L [tag \\&] N");
-
-  MT("tagUnderscore",
-     "foo[tag \\_]bar");
-
-  MT("tagBracketOpen",
-     "[tag \\emph][bracket {][tag \\{][bracket }]");
-
-  MT("tagBracketClose",
-     "[tag \\emph][bracket {][tag \\}][bracket }]");
-
-  MT("tagLetterNumber",
-     "section [tag \\S][atom 1]");
-
-  MT("textTagNumber",
-     "para [tag \\P][atom 2]");
-
-  MT("thinspace",
-     "x[tag \\,]y");
-
-  MT("thickspace",
-     "x[tag \\;]y");
-
-  MT("negativeThinspace",
-     "x[tag \\!]y");
-
-  MT("periodNotSentence",
-     "J.\\ L.\\ is");
-
-  MT("periodSentence",
-     "X[tag \\@]. The");
-
-  MT("italicCorrection",
-     "[bracket {][tag \\em] If[tag \\/][bracket }] I");
-
-  MT("tagBracket",
-     "[tag \\newcommand][bracket {][tag \\pop][bracket }]");
-
-  MT("inlineMathTagFollowedByNumber",
-     "[keyword $][tag \\pi][number 2][keyword $]");
-
-  MT("inlineMath",
-     "[keyword $][number 3][variable-2 x][tag ^][number 2.45]-[tag \\sqrt][bracket {][tag \\$\\alpha][bracket }] = [number 2][keyword $] other text");
-
-  MT("displayMath",
-     "More [keyword $$]\t[variable-2 S][tag ^][variable-2 n][tag \\sum] [variable-2 i][keyword $$] other text");
-
-  MT("mathWithComment",
-     "[keyword $][variable-2 x] [comment % $]",
-     "[variable-2 y][keyword $] other text");
-
-  MT("lineBreakArgument",
-    "[tag \\\\][bracket [[][atom 1cm][bracket ]]]");
-})();
diff --git a/resources/libs/codemirror/mode/tcl/index.html b/resources/libs/codemirror/mode/tcl/index.html
deleted file mode 100644
index 2c0d1a2de..000000000
--- a/resources/libs/codemirror/mode/tcl/index.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Tcl mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/night.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="tcl.js"></script>
-<script src="../../addon/scroll/scrollpastend.js"></script>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Tcl</a>
-  </ul>
-</div>
-
-<article>
-<h2>Tcl mode</h2>
-<form><textarea id="code" name="code">
-##############################################################################################
-##  ##     whois.tcl for eggdrop by Ford_Lawnmower irc.geekshed.net #Script-Help        ##  ##
-##############################################################################################
-## To use this script you must set channel flag +whois (ie .chanset #chan +whois)           ##
-##############################################################################################
-##      ____                __                 ###########################################  ##
-##     / __/___ _ ___ _ ___/ /____ ___   ___   ###########################################  ##
-##    / _/ / _ `// _ `// _  // __// _ \ / _ \  ###########################################  ##
-##   /___/ \_, / \_, / \_,_//_/   \___// .__/  ###########################################  ##
-##        /___/ /___/                 /_/      ###########################################  ##
-##                                             ###########################################  ##
-##############################################################################################
-##  ##                             Start Setup.                                         ##  ##
-##############################################################################################
-namespace eval whois {
-## change cmdchar to the trigger you want to use                                        ##  ##
-  variable cmdchar "!"
-## change command to the word trigger you would like to use.                            ##  ##
-## Keep in mind, This will also change the .chanset +/-command                          ##  ##
-  variable command "whois"
-## change textf to the colors you want for the text.                                    ##  ##
-  variable textf "\017\00304"
-## change tagf to the colors you want for tags:                                         ##  ##
-  variable tagf "\017\002"
-## Change logo to the logo you want at the start of the line.                           ##  ##
-  variable logo "\017\00304\002\[\00306W\003hois\00304\]\017"
-## Change lineout to the results you want. Valid results are channel users modes topic  ##  ##
-  variable lineout "channel users modes topic"
-##############################################################################################
-##  ##                           End Setup.                                              ## ##
-##############################################################################################
-  variable channel ""
-  setudef flag $whois::command
-  bind pub -|- [string trimleft $whois::cmdchar]${whois::command} whois::list
-  bind raw -|- "311" whois::311
-  bind raw -|- "312" whois::312
-  bind raw -|- "319" whois::319
-  bind raw -|- "317" whois::317
-  bind raw -|- "313" whois::multi
-  bind raw -|- "310" whois::multi
-  bind raw -|- "335" whois::multi
-  bind raw -|- "301" whois::301
-  bind raw -|- "671" whois::multi
-  bind raw -|- "320" whois::multi
-  bind raw -|- "401" whois::multi
-  bind raw -|- "318" whois::318
-  bind raw -|- "307" whois::307
-}
-proc whois::311 {from key text} {
-  if {[regexp -- {^[^\s]+\s(.+?)\s(.+?)\s(.+?)\s\*\s\:(.+)$} $text wholematch nick ident host realname]} {
-    putserv "PRIVMSG $whois::channel :${whois::logo} ${whois::tagf}Host:${whois::textf} \
-	$nick \(${ident}@${host}\) ${whois::tagf}Realname:${whois::textf} $realname"
-  }
-}
-proc whois::multi {from key text} {
-  if {[regexp {\:(.*)$} $text match $key]} {
-    putserv "PRIVMSG $whois::channel :${whois::logo} ${whois::tagf}Note:${whois::textf} [subst $$key]"
-	return 1
-  }
-}
-proc whois::312 {from key text} {
-  regexp {([^\s]+)\s\:} $text match server
-  putserv "PRIVMSG $whois::channel :${whois::logo} ${whois::tagf}Server:${whois::textf} $server"
-}
-proc whois::319 {from key text} {
-  if {[regexp {.+\:(.+)$} $text match channels]} {
-    putserv "PRIVMSG $whois::channel :${whois::logo} ${whois::tagf}Channels:${whois::textf} $channels"
-  }
-}
-proc whois::317 {from key text} {
-  if {[regexp -- {.*\s(\d+)\s(\d+)\s\:} $text wholematch idle signon]} {
-    putserv "PRIVMSG $whois::channel :${whois::logo} ${whois::tagf}Connected:${whois::textf} \
-	[ctime $signon] ${whois::tagf}Idle:${whois::textf} [duration $idle]"
-  }
-}
-proc whois::301 {from key text} {
-  if {[regexp {^.+\s[^\s]+\s\:(.*)$} $text match awaymsg]} {
-    putserv "PRIVMSG $whois::channel :${whois::logo} ${whois::tagf}Away:${whois::textf} $awaymsg"
-  }
-}
-proc whois::318 {from key text} {
-  namespace eval whois {
-	variable channel ""
-  }
-  variable whois::channel ""
-}
-proc whois::307 {from key text} {
-  putserv "PRIVMSG $whois::channel :${whois::logo} ${whois::tagf}Services:${whois::textf} Registered Nick"
-}
-proc whois::list {nick host hand chan text} {
-  if {[lsearch -exact [channel info $chan] "+${whois::command}"] != -1} {
-    namespace eval whois {
-	  variable channel ""
-	}
-    variable whois::channel $chan
-    putserv "WHOIS $text"
-  }
-}
-putlog "\002*Loaded* \017\00304\002\[\00306W\003hois\00304\]\017 \002by \
-Ford_Lawnmower irc.GeekShed.net #Script-Help"
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        tabMode: "indent",
-		theme: "night",
-        lineNumbers: true,
-        indentUnit: 2,
-        scrollPastEnd: true,
-        mode: "text/x-tcl"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-tcl</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/tcl/tcl.js b/resources/libs/codemirror/mode/tcl/tcl.js
deleted file mode 100644
index ed2c69721..000000000
--- a/resources/libs/codemirror/mode/tcl/tcl.js
+++ /dev/null
@@ -1,131 +0,0 @@
-//tcl mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
-CodeMirror.defineMode("tcl", function() {
-  function parseWords(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var keywords = parseWords("Tcl safe after append array auto_execok auto_import auto_load " +
-        "auto_mkindex auto_mkindex_old auto_qualify auto_reset bgerror " +
-        "binary break catch cd close concat continue dde eof encoding error " +
-        "eval exec exit expr fblocked fconfigure fcopy file fileevent filename " +
-        "filename flush for foreach format gets glob global history http if " +
-        "incr info interp join lappend lindex linsert list llength load lrange " +
-        "lreplace lsearch lset lsort memory msgcat namespace open package parray " +
-        "pid pkg::create pkg_mkIndex proc puts pwd re_syntax read regex regexp " +
-        "registry regsub rename resource return scan seek set socket source split " +
-        "string subst switch tcl_endOfWord tcl_findLibrary tcl_startOfNextWord " +
-        "tcl_wordBreakAfter tcl_startOfPreviousWord tcl_wordBreakBefore tcltest " +
-        "tclvars tell time trace unknown unset update uplevel upvar variable " +
-    "vwait");
-    var functions = parseWords("if elseif else and not or eq ne in ni for foreach while switch");
-    var isOperatorChar = /[+\-*&%=<>!?^\/\|]/;
-    function chain(stream, state, f) {
-      state.tokenize = f;
-      return f(stream, state);
-    }
-    function tokenBase(stream, state) {
-      var beforeParams = state.beforeParams;
-      state.beforeParams = false;
-      var ch = stream.next();
-      if ((ch == '"' || ch == "'") && state.inParams)
-        return chain(stream, state, tokenString(ch));
-      else if (/[\[\]{}\(\),;\.]/.test(ch)) {
-        if (ch == "(" && beforeParams) state.inParams = true;
-        else if (ch == ")") state.inParams = false;
-          return null;
-      }
-      else if (/\d/.test(ch)) {
-        stream.eatWhile(/[\w\.]/);
-        return "number";
-      }
-      else if (ch == "#" && stream.eat("*")) {
-        return chain(stream, state, tokenComment);
-      }
-      else if (ch == "#" && stream.match(/ *\[ *\[/)) {
-        return chain(stream, state, tokenUnparsed);
-      }
-      else if (ch == "#" && stream.eat("#")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      else if (ch == '"') {
-        stream.skipTo(/"/);
-        return "comment";
-      }
-      else if (ch == "$") {
-        stream.eatWhile(/[$_a-z0-9A-Z\.{:]/);
-        stream.eatWhile(/}/);
-        state.beforeParams = true;
-        return "builtin";
-      }
-      else if (isOperatorChar.test(ch)) {
-        stream.eatWhile(isOperatorChar);
-        return "comment";
-      }
-      else {
-        stream.eatWhile(/[\w\$_{}]/);
-        var word = stream.current().toLowerCase();
-        if (keywords && keywords.propertyIsEnumerable(word))
-          return "keyword";
-        if (functions && functions.propertyIsEnumerable(word)) {
-          state.beforeParams = true;
-          return "keyword";
-        }
-        return null;
-      }
-    }
-    function tokenString(quote) {
-      return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-          end = true;
-          break;
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (end) state.tokenize = tokenBase;
-        return "string";
-      };
-    }
-    function tokenComment(stream, state) {
-      var maybeEnd = false, ch;
-      while (ch = stream.next()) {
-        if (ch == "#" && maybeEnd) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        maybeEnd = (ch == "*");
-      }
-      return "comment";
-    }
-    function tokenUnparsed(stream, state) {
-      var maybeEnd = 0, ch;
-      while (ch = stream.next()) {
-        if (ch == "#" && maybeEnd == 2) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        if (ch == "]")
-          maybeEnd++;
-        else if (ch != " ")
-          maybeEnd = 0;
-      }
-      return "meta";
-    }
-    return {
-      startState: function() {
-        return {
-          tokenize: tokenBase,
-          beforeParams: false,
-          inParams: false
-        };
-      },
-      token: function(stream, state) {
-        if (stream.eatSpace()) return null;
-        return state.tokenize(stream, state);
-      }
-    };
-});
-CodeMirror.defineMIME("text/x-tcl", "tcl");
diff --git a/resources/libs/codemirror/mode/tiddlywiki/index.html b/resources/libs/codemirror/mode/tiddlywiki/index.html
deleted file mode 100644
index fc8f5d392..000000000
--- a/resources/libs/codemirror/mode/tiddlywiki/index.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: TiddlyWiki mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="tiddlywiki.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="tiddlywiki.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">TiddlyWiki</a>
-  </ul>
-</div>
-
-<article>
-<h2>TiddlyWiki mode</h2>
-
-
-<div><textarea id="code" name="code">
-!TiddlyWiki Formatting
-* Rendered versions can be found at: http://www.tiddlywiki.com/#Reference
-
-|!Option            | !Syntax            |
-|bold font          | ''bold''           |
-|italic type        | //italic//         |
-|underlined text    | __underlined__     |
-|strikethrough text | --strikethrough--  |
-|superscript text   | super^^script^^    |
-|subscript text     | sub~~script~~      |
-|highlighted text   | @@highlighted@@    |
-|preformatted text  | {{{preformatted}}} |
-
-!Block Elements
-<<<
-!Heading 1
-
-!!Heading 2
-
-!!!Heading 3
-
-!!!!Heading 4
-
-!!!!!Heading 5
-<<<
-
-!!Lists
-<<<
-* unordered list, level 1
-** unordered list, level 2
-*** unordered list, level 3
-
-# ordered list, level 1
-## ordered list, level 2
-### unordered list, level 3
-
-; definition list, term
-: definition list, description
-<<<
-
-!!Blockquotes
-<<<
-> blockquote, level 1
->> blockquote, level 2
->>> blockquote, level 3
-
-> blockquote
-<<<
-
-!!Preformatted Text
-<<<
-{{{
-preformatted (e.g. code)
-}}}
-<<<
-
-!!Code Sections
-<<<
-{{{
-Text style code
-}}}
-
-//{{{
-JS styled code. TiddlyWiki mixed mode should support highlighter switching in the future.
-//}}}
-
-<!--{{{-->
-XML styled code. TiddlyWiki mixed mode should support highlighter switching in the future.
-<!--}}}-->
-<<<
-
-!!Tables
-<<<
-|CssClass|k
-|!heading column 1|!heading column 2|
-|row 1, column 1|row 1, column 2|
-|row 2, column 1|row 2, column 2|
-|>|COLSPAN|
-|ROWSPAN| ... |
-|~| ... |
-|CssProperty:value;...| ... |
-|caption|c
-
-''Annotation:''
-* The {{{>}}} marker creates a "colspan", causing the current cell to merge with the one to the right.
-* The {{{~}}} marker creates a "rowspan", causing the current cell to merge with the one above.
-<<<
-!!Images /% TODO %/
-cf. [[TiddlyWiki.com|http://www.tiddlywiki.com/#EmbeddedImages]]
-
-!Hyperlinks
-* [[WikiWords|WikiWord]] are automatically transformed to hyperlinks to the respective tiddler
-** the automatic transformation can be suppressed by preceding the respective WikiWord with a tilde ({{{~}}}): {{{~WikiWord}}}
-* [[PrettyLinks]] are enclosed in square brackets and contain the desired tiddler name: {{{[[tiddler name]]}}}
-** optionally, a custom title or description can be added, separated by a pipe character ({{{|}}}): {{{[[title|target]]}}}<br>'''N.B.:''' In this case, the target can also be any website (i.e. URL).
-
-!Custom Styling
-* {{{@@CssProperty:value;CssProperty:value;...@@}}}<br>''N.B.:'' CSS color definitions should use lowercase letters to prevent the inadvertent creation of WikiWords.
-* <html><code>{{customCssClass{...}}}</code></html>
-* raw HTML can be inserted by enclosing the respective code in HTML tags: {{{<html> ... </html>}}}
-
-!Special Markers
-* {{{<br>}}} forces a manual line break
-* {{{----}}} creates a horizontal ruler
-* [[HTML entities|http://www.tiddlywiki.com/#HtmlEntities]]
-* [[HTML entities local|HtmlEntities]]
-* {{{<<macroName>>}}} calls the respective [[macro|Macros]]
-* To hide text within a tiddler so that it is not displayed, it can be wrapped in {{{/%}}} and {{{%/}}}.<br/>This can be a useful trick for hiding drafts or annotating complex markup.
-* To prevent wiki markup from taking effect for a particular section, that section can be enclosed in three double quotes: e.g. {{{"""WikiWord"""}}}.
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: 'tiddlywiki',      
-        lineNumbers: true,
-        enterMode: 'keep',
-        matchBrackets: true
-      });
-    </script>
-
-    <p>TiddlyWiki mode supports a single configuration.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-tiddlywiki</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/tiddlywiki/tiddlywiki.css b/resources/libs/codemirror/mode/tiddlywiki/tiddlywiki.css
deleted file mode 100644
index 9a69b639f..000000000
--- a/resources/libs/codemirror/mode/tiddlywiki/tiddlywiki.css
+++ /dev/null
@@ -1,14 +0,0 @@
-span.cm-underlined {
-  text-decoration: underline;
-}
-span.cm-strikethrough {
-  text-decoration: line-through;
-}
-span.cm-brace {
-  color: #170;
-  font-weight: bold;
-}
-span.cm-table {
-  color: blue;
-  font-weight: bold;
-}
diff --git a/resources/libs/codemirror/mode/tiddlywiki/tiddlywiki.js b/resources/libs/codemirror/mode/tiddlywiki/tiddlywiki.js
deleted file mode 100644
index 24a24786b..000000000
--- a/resources/libs/codemirror/mode/tiddlywiki/tiddlywiki.js
+++ /dev/null
@@ -1,353 +0,0 @@
-/***
-    |''Name''|tiddlywiki.js|
-    |''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror|
-    |''Author''|PMario|
-    |''Version''|0.1.7|
-    |''Status''|''stable''|
-    |''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]|
-    |''Documentation''|http://codemirror.tiddlyspace.com/|
-    |''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]|
-    |''CoreVersion''|2.5.0|
-    |''Requires''|codemirror.js|
-    |''Keywords''|syntax highlighting color code mirror codemirror|
-    ! Info
-    CoreVersion parameter is needed for TiddlyWiki only!
-***/
-//{{{
-CodeMirror.defineMode("tiddlywiki", function () {
-  // Tokenizer
-  var textwords = {};
-
-  var keywords = function () {
-    function kw(type) {
-      return { type: type, style: "macro"};
-    }
-    return {
-      "allTags": kw('allTags'), "closeAll": kw('closeAll'), "list": kw('list'),
-      "newJournal": kw('newJournal'), "newTiddler": kw('newTiddler'),
-      "permaview": kw('permaview'), "saveChanges": kw('saveChanges'),
-      "search": kw('search'), "slider": kw('slider'),   "tabs": kw('tabs'),
-      "tag": kw('tag'), "tagging": kw('tagging'),       "tags": kw('tags'),
-      "tiddler": kw('tiddler'), "timeline": kw('timeline'),
-      "today": kw('today'), "version": kw('version'),   "option": kw('option'),
-
-      "with": kw('with'),
-      "filter": kw('filter')
-    };
-  }();
-
-  var isSpaceName = /[\w_\-]/i,
-  reHR = /^\-\-\-\-+$/,                                 // <hr>
-  reWikiCommentStart = /^\/\*\*\*$/,            // /***
-  reWikiCommentStop = /^\*\*\*\/$/,             // ***/
-  reBlockQuote = /^<<<$/,
-
-  reJsCodeStart = /^\/\/\{\{\{$/,                       // //{{{ js block start
-  reJsCodeStop = /^\/\/\}\}\}$/,                        // //}}} js stop
-  reXmlCodeStart = /^<!--\{\{\{-->$/,           // xml block start
-  reXmlCodeStop = /^<!--\}\}\}-->$/,            // xml stop
-
-  reCodeBlockStart = /^\{\{\{$/,                        // {{{ TW text div block start
-  reCodeBlockStop = /^\}\}\}$/,                 // }}} TW text stop
-
-  reUntilCodeStop = /.*?\}\}\}/;
-
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-
-  function ret(tp, style, cont) {
-    type = tp;
-    content = cont;
-    return style;
-  }
-
-  function jsTokenBase(stream, state) {
-    var sol = stream.sol(), ch;
-
-    state.block = false;        // indicates the start of a code block.
-
-    ch = stream.peek();         // don't eat, to make matching simpler
-
-    // check start of  blocks
-    if (sol && /[<\/\*{}\-]/.test(ch)) {
-      if (stream.match(reCodeBlockStart)) {
-        state.block = true;
-        return chain(stream, state, twTokenCode);
-      }
-      if (stream.match(reBlockQuote)) {
-        return ret('quote', 'quote');
-      }
-      if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop)) {
-        return ret('code', 'comment');
-      }
-      if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop)) {
-        return ret('code', 'comment');
-      }
-      if (stream.match(reHR)) {
-        return ret('hr', 'hr');
-      }
-    } // sol
-    ch = stream.next();
-
-    if (sol && /[\/\*!#;:>|]/.test(ch)) {
-      if (ch == "!") { // tw header
-        stream.skipToEnd();
-        return ret("header", "header");
-      }
-      if (ch == "*") { // tw list
-        stream.eatWhile('*');
-        return ret("list", "comment");
-      }
-      if (ch == "#") { // tw numbered list
-        stream.eatWhile('#');
-        return ret("list", "comment");
-      }
-      if (ch == ";") { // definition list, term
-        stream.eatWhile(';');
-        return ret("list", "comment");
-      }
-      if (ch == ":") { // definition list, description
-        stream.eatWhile(':');
-        return ret("list", "comment");
-      }
-      if (ch == ">") { // single line quote
-        stream.eatWhile(">");
-        return ret("quote", "quote");
-      }
-      if (ch == '|') {
-        return ret('table', 'header');
-      }
-    }
-
-    if (ch == '{' && stream.match(/\{\{/)) {
-      return chain(stream, state, twTokenCode);
-    }
-
-    // rudimentary html:// file:// link matching. TW knows much more ...
-    if (/[hf]/i.test(ch)) {
-      if (/[ti]/i.test(stream.peek()) && stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i)) {
-        return ret("link", "link");
-      }
-    }
-    // just a little string indicator, don't want to have the whole string covered
-    if (ch == '"') {
-      return ret('string', 'string');
-    }
-    if (ch == '~') {    // _no_ CamelCase indicator should be bold
-      return ret('text', 'brace');
-    }
-    if (/[\[\]]/.test(ch)) { // check for [[..]]
-      if (stream.peek() == ch) {
-        stream.next();
-        return ret('brace', 'brace');
-      }
-    }
-    if (ch == "@") {    // check for space link. TODO fix @@...@@ highlighting
-      stream.eatWhile(isSpaceName);
-      return ret("link", "link");
-    }
-    if (/\d/.test(ch)) {        // numbers
-      stream.eatWhile(/\d/);
-      return ret("number", "number");
-    }
-    if (ch == "/") { // tw invisible comment
-      if (stream.eat("%")) {
-        return chain(stream, state, twTokenComment);
-      }
-      else if (stream.eat("/")) { //
-        return chain(stream, state, twTokenEm);
-      }
-    }
-    if (ch == "_") { // tw underline
-      if (stream.eat("_")) {
-        return chain(stream, state, twTokenUnderline);
-      }
-    }
-    // strikethrough and mdash handling
-    if (ch == "-") {
-      if (stream.eat("-")) {
-        // if strikethrough looks ugly, change CSS.
-        if (stream.peek() != ' ')
-          return chain(stream, state, twTokenStrike);
-        // mdash
-        if (stream.peek() == ' ')
-          return ret('text', 'brace');
-      }
-    }
-    if (ch == "'") { // tw bold
-      if (stream.eat("'")) {
-        return chain(stream, state, twTokenStrong);
-      }
-    }
-    if (ch == "<") { // tw macro
-      if (stream.eat("<")) {
-        return chain(stream, state, twTokenMacro);
-      }
-    }
-    else {
-      return ret(ch);
-    }
-
-    // core macro handling
-    stream.eatWhile(/[\w\$_]/);
-    var word = stream.current(),
-    known = textwords.propertyIsEnumerable(word) && textwords[word];
-
-    return known ? ret(known.type, known.style, word) : ret("text", null, word);
-
-  } // jsTokenBase()
-
-  // tw invisible comment
-  function twTokenComment(stream, state) {
-    var maybeEnd = false,
-    ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = jsTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "%");
-    }
-    return ret("comment", "comment");
-  }
-
-  // tw strong / bold
-  function twTokenStrong(stream, state) {
-    var maybeEnd = false,
-    ch;
-    while (ch = stream.next()) {
-      if (ch == "'" && maybeEnd) {
-        state.tokenize = jsTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "'");
-    }
-    return ret("text", "strong");
-  }
-
-  // tw code
-  function twTokenCode(stream, state) {
-    var ch, sb = state.block;
-
-    if (sb && stream.current()) {
-      return ret("code", "comment");
-    }
-
-    if (!sb && stream.match(reUntilCodeStop)) {
-      state.tokenize = jsTokenBase;
-      return ret("code", "comment");
-    }
-
-    if (sb && stream.sol() && stream.match(reCodeBlockStop)) {
-      state.tokenize = jsTokenBase;
-      return ret("code", "comment");
-    }
-
-    ch = stream.next();
-    return (sb) ? ret("code", "comment") : ret("code", "comment");
-  }
-
-  // tw em / italic
-  function twTokenEm(stream, state) {
-    var maybeEnd = false,
-    ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = jsTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "/");
-    }
-    return ret("text", "em");
-  }
-
-  // tw underlined text
-  function twTokenUnderline(stream, state) {
-    var maybeEnd = false,
-    ch;
-    while (ch = stream.next()) {
-      if (ch == "_" && maybeEnd) {
-        state.tokenize = jsTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "_");
-    }
-    return ret("text", "underlined");
-  }
-
-  // tw strike through text looks ugly
-  // change CSS if needed
-  function twTokenStrike(stream, state) {
-    var maybeEnd = false, ch;
-
-    while (ch = stream.next()) {
-      if (ch == "-" && maybeEnd) {
-        state.tokenize = jsTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "-");
-    }
-    return ret("text", "strikethrough");
-  }
-
-  // macro
-  function twTokenMacro(stream, state) {
-    var ch, word, known;
-
-    if (stream.current() == '<<') {
-      return ret('brace', 'macro');
-    }
-
-    ch = stream.next();
-    if (!ch) {
-      state.tokenize = jsTokenBase;
-      return ret(ch);
-    }
-    if (ch == ">") {
-      if (stream.peek() == '>') {
-        stream.next();
-        state.tokenize = jsTokenBase;
-        return ret("brace", "macro");
-      }
-    }
-
-    stream.eatWhile(/[\w\$_]/);
-    word = stream.current();
-    known = keywords.propertyIsEnumerable(word) && keywords[word];
-
-    if (known) {
-      return ret(known.type, known.style, word);
-    }
-    else {
-      return ret("macro", null, word);
-    }
-  }
-
-  // Interface
-  return {
-    startState: function () {
-      return {
-        tokenize: jsTokenBase,
-        indented: 0,
-        level: 0
-      };
-    },
-
-    token: function (stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      return style;
-    },
-
-    electricChars: ""
-  };
-});
-
-CodeMirror.defineMIME("text/x-tiddlywiki", "tiddlywiki");
-//}}}
diff --git a/resources/libs/codemirror/mode/tiki/index.html b/resources/libs/codemirror/mode/tiki/index.html
deleted file mode 100644
index 5315dbfcd..000000000
--- a/resources/libs/codemirror/mode/tiki/index.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Tiki wiki mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="tiki.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="tiki.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Tiki wiki</a>
-  </ul>
-</div>
-
-<article>
-<h2>Tiki wiki mode</h2>
-
-
-<div><textarea id="code" name="code">
-Headings
-!Header 1
-!!Header 2
-!!!Header 3
-!!!!Header 4
-!!!!!Header 5
-!!!!!!Header 6
-
-Styling
--=titlebar=-
-^^ Box on multi
-lines
-of content^^
-__bold__
-''italic''
-===underline===
-::center::
---Line Through--
-
-Operators
-~np~No parse~/np~
-
-Link
-[link|desc|nocache]
-
-Wiki
-((Wiki))
-((Wiki|desc))
-((Wiki|desc|timeout))
-
-Table
-||row1 col1|row1 col2|row1 col3
-row2 col1|row2 col2|row2 col3
-row3 col1|row3 col2|row3 col3||
-
-Lists:
-*bla
-**bla-1
-++continue-bla-1
-***bla-2
-++continue-bla-1
-*bla
-+continue-bla
-#bla
-** tra-la-la
-+continue-bla
-#bla
-
-Plugin (standard):
-{PLUGIN(attr="my attr")}
-Plugin Body
-{PLUGIN}
-
-Plugin (inline):
-{plugin attr="my attr"}
-</textarea></div>
-
-<script type="text/javascript">
-	var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: 'tiki',      
-        lineNumbers: true
-    });
-</script>
-
-</article>
diff --git a/resources/libs/codemirror/mode/tiki/tiki.css b/resources/libs/codemirror/mode/tiki/tiki.css
deleted file mode 100644
index 0dbc3ea0e..000000000
--- a/resources/libs/codemirror/mode/tiki/tiki.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.cm-tw-syntaxerror {
-	color: #FFF;
-	background-color: #900;
-}
-
-.cm-tw-deleted {
-	text-decoration: line-through;
-}
-
-.cm-tw-header5 {
-	font-weight: bold;
-}
-.cm-tw-listitem:first-child { /*Added first child to fix duplicate padding when highlighting*/
-	padding-left: 10px;
-}
-
-.cm-tw-box {
-	border-top-width: 0px ! important;
-	border-style: solid;
-	border-width: 1px;
-	border-color: inherit;
-}
-
-.cm-tw-underline {
-	text-decoration: underline;
-}
\ No newline at end of file
diff --git a/resources/libs/codemirror/mode/tiki/tiki.js b/resources/libs/codemirror/mode/tiki/tiki.js
deleted file mode 100644
index e789163dc..000000000
--- a/resources/libs/codemirror/mode/tiki/tiki.js
+++ /dev/null
@@ -1,308 +0,0 @@
-CodeMirror.defineMode('tiki', function(config) {
-  function inBlock(style, terminator, returnTokenizer) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.match(terminator)) {
-          state.tokenize = inText;
-          break;
-        }
-        stream.next();
-      }
-
-      if (returnTokenizer) state.tokenize = returnTokenizer;
-
-      return style;
-    };
-  }
-
-  function inLine(style) {
-    return function(stream, state) {
-      while(!stream.eol()) {
-        stream.next();
-      }
-      state.tokenize = inText;
-      return style;
-    };
-  }
-
-  function inText(stream, state) {
-    function chain(parser) {
-      state.tokenize = parser;
-      return parser(stream, state);
-    }
-
-    var sol = stream.sol();
-    var ch = stream.next();
-
-    //non start of line
-    switch (ch) { //switch is generally much faster than if, so it is used here
-    case "{": //plugin
-      stream.eat("/");
-      stream.eatSpace();
-      var tagName = "";
-      var c;
-      while ((c = stream.eat(/[^\s\u00a0=\"\'\/?(}]/))) tagName += c;
-      state.tokenize = inPlugin;
-      return "tag";
-      break;
-    case "_": //bold
-      if (stream.eat("_")) {
-        return chain(inBlock("strong", "__", inText));
-      }
-      break;
-    case "'": //italics
-      if (stream.eat("'")) {
-        // Italic text
-        return chain(inBlock("em", "''", inText));
-      }
-      break;
-    case "(":// Wiki Link
-      if (stream.eat("(")) {
-        return chain(inBlock("variable-2", "))", inText));
-      }
-      break;
-    case "[":// Weblink
-      return chain(inBlock("variable-3", "]", inText));
-      break;
-    case "|": //table
-      if (stream.eat("|")) {
-        return chain(inBlock("comment", "||"));
-      }
-      break;
-    case "-":
-      if (stream.eat("=")) {//titleBar
-        return chain(inBlock("header string", "=-", inText));
-      } else if (stream.eat("-")) {//deleted
-        return chain(inBlock("error tw-deleted", "--", inText));
-      }
-      break;
-    case "=": //underline
-      if (stream.match("==")) {
-        return chain(inBlock("tw-underline", "===", inText));
-      }
-      break;
-    case ":":
-      if (stream.eat(":")) {
-        return chain(inBlock("comment", "::"));
-      }
-      break;
-    case "^": //box
-      return chain(inBlock("tw-box", "^"));
-      break;
-    case "~": //np
-      if (stream.match("np~")) {
-        return chain(inBlock("meta", "~/np~"));
-      }
-      break;
-    }
-
-    //start of line types
-    if (sol) {
-      switch (ch) {
-      case "!": //header at start of line
-        if (stream.match('!!!!!')) {
-          return chain(inLine("header string"));
-        } else if (stream.match('!!!!')) {
-          return chain(inLine("header string"));
-        } else if (stream.match('!!!')) {
-          return chain(inLine("header string"));
-        } else if (stream.match('!!')) {
-          return chain(inLine("header string"));
-        } else {
-          return chain(inLine("header string"));
-        }
-        break;
-      case "*": //unordered list line item, or <li /> at start of line
-      case "#": //ordered list line item, or <li /> at start of line
-      case "+": //ordered list line item, or <li /> at start of line
-        return chain(inLine("tw-listitem bracket"));
-        break;
-      }
-    }
-
-    //stream.eatWhile(/[&{]/); was eating up plugins, turned off to act less like html and more like tiki
-    return null;
-  }
-
-  var indentUnit = config.indentUnit;
-
-  // Return variables for tokenizers
-  var pluginName, type;
-  function inPlugin(stream, state) {
-    var ch = stream.next();
-    var peek = stream.peek();
-
-    if (ch == "}") {
-      state.tokenize = inText;
-      //type = ch == ")" ? "endPlugin" : "selfclosePlugin"; inPlugin
-      return "tag";
-    } else if (ch == "(" || ch == ")") {
-      return "bracket";
-    } else if (ch == "=") {
-      type = "equals";
-
-      if (peek == ">") {
-        ch = stream.next();
-        peek = stream.peek();
-      }
-
-      //here we detect values directly after equal character with no quotes
-      if (!/[\'\"]/.test(peek)) {
-        state.tokenize = inAttributeNoQuote();
-      }
-      //end detect values
-
-      return "operator";
-    } else if (/[\'\"]/.test(ch)) {
-      state.tokenize = inAttribute(ch);
-      return state.tokenize(stream, state);
-    } else {
-      stream.eatWhile(/[^\s\u00a0=\"\'\/?]/);
-      return "keyword";
-    }
-  }
-
-  function inAttribute(quote) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.next() == quote) {
-          state.tokenize = inPlugin;
-          break;
-        }
-      }
-      return "string";
-    };
-  }
-
-  function inAttributeNoQuote() {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        var ch = stream.next();
-        var peek = stream.peek();
-        if (ch == " " || ch == "," || /[ )}]/.test(peek)) {
-      state.tokenize = inPlugin;
-      break;
-    }
-  }
-  return "string";
-};
-                     }
-
-var curState, setStyle;
-function pass() {
-  for (var i = arguments.length - 1; i >= 0; i--) curState.cc.push(arguments[i]);
-}
-
-function cont() {
-  pass.apply(null, arguments);
-  return true;
-}
-
-function pushContext(pluginName, startOfLine) {
-  var noIndent = curState.context && curState.context.noIndent;
-  curState.context = {
-    prev: curState.context,
-    pluginName: pluginName,
-    indent: curState.indented,
-    startOfLine: startOfLine,
-    noIndent: noIndent
-  };
-}
-
-function popContext() {
-  if (curState.context) curState.context = curState.context.prev;
-}
-
-function element(type) {
-  if (type == "openPlugin") {curState.pluginName = pluginName; return cont(attributes, endplugin(curState.startOfLine));}
-  else if (type == "closePlugin") {
-    var err = false;
-    if (curState.context) {
-      err = curState.context.pluginName != pluginName;
-      popContext();
-    } else {
-      err = true;
-    }
-    if (err) setStyle = "error";
-    return cont(endcloseplugin(err));
-  }
-  else if (type == "string") {
-    if (!curState.context || curState.context.name != "!cdata") pushContext("!cdata");
-    if (curState.tokenize == inText) popContext();
-    return cont();
-  }
-  else return cont();
-}
-
-function endplugin(startOfLine) {
-  return function(type) {
-    if (
-      type == "selfclosePlugin" ||
-        type == "endPlugin"
-    )
-      return cont();
-    if (type == "endPlugin") {pushContext(curState.pluginName, startOfLine); return cont();}
-    return cont();
-  };
-}
-
-function endcloseplugin(err) {
-  return function(type) {
-    if (err) setStyle = "error";
-    if (type == "endPlugin") return cont();
-    return pass();
-  };
-}
-
-function attributes(type) {
-  if (type == "keyword") {setStyle = "attribute"; return cont(attributes);}
-  if (type == "equals") return cont(attvalue, attributes);
-  return pass();
-}
-function attvalue(type) {
-  if (type == "keyword") {setStyle = "string"; return cont();}
-  if (type == "string") return cont(attvaluemaybe);
-  return pass();
-}
-function attvaluemaybe(type) {
-  if (type == "string") return cont(attvaluemaybe);
-  else return pass();
-}
-return {
-  startState: function() {
-    return {tokenize: inText, cc: [], indented: 0, startOfLine: true, pluginName: null, context: null};
-  },
-  token: function(stream, state) {
-    if (stream.sol()) {
-      state.startOfLine = true;
-      state.indented = stream.indentation();
-    }
-    if (stream.eatSpace()) return null;
-
-    setStyle = type = pluginName = null;
-    var style = state.tokenize(stream, state);
-    if ((style || type) && style != "comment") {
-      curState = state;
-      while (true) {
-        var comb = state.cc.pop() || element;
-        if (comb(type || style)) break;
-      }
-    }
-    state.startOfLine = false;
-    return setStyle || style;
-  },
-  indent: function(state, textAfter) {
-    var context = state.context;
-    if (context && context.noIndent) return 0;
-    if (context && /^{\//.test(textAfter))
-        context = context.prev;
-        while (context && !context.startOfLine)
-          context = context.prev;
-        if (context) return context.indent + indentUnit;
-        else return 0;
-       },
-    electricChars: "/"
-  };
-});
-
-CodeMirror.defineMIME("text/tiki", "tiki");
diff --git a/resources/libs/codemirror/mode/toml/index.html b/resources/libs/codemirror/mode/toml/index.html
deleted file mode 100644
index c59b4cc08..000000000
--- a/resources/libs/codemirror/mode/toml/index.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: TOML Mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="toml.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">TOML Mode</a>
-  </ul>
-</div>
-
-<article>
-<h2>TOML Mode</h2>
-<form><textarea id="code" name="code">
-# This is a TOML document. Boom.
-
-title = "TOML Example"
-
-[owner]
-name = "Tom Preston-Werner"
-organization = "GitHub"
-bio = "GitHub Cofounder &amp; CEO\nLikes tater tots and beer."
-dob = 1979-05-27T07:32:00Z # First class dates? Why not?
-
-[database]
-server = "192.168.1.1"
-ports = [ 8001, 8001, 8002 ]
-connection_max = 5000
-enabled = true
-
-[servers]
-
-  # You can indent as you please. Tabs or spaces. TOML don't care.
-  [servers.alpha]
-  ip = "10.0.0.1"
-  dc = "eqdc10"
-  
-  [servers.beta]
-  ip = "10.0.0.2"
-  dc = "eqdc10"
-  
-[clients]
-data = [ ["gamma", "delta"], [1, 2] ]
-
-# Line breaks are OK when inside arrays
-hosts = [
-  "alpha",
-  "omega"
-]
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "toml"},
-        lineNumbers: true
-      });
-    </script>
-    <h3>The TOML Mode</h3>
-      <p> Created by Forbes Lindesay.</p>
-    <p><strong>MIME type defined:</strong> <code>text/x-toml</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/toml/toml.js b/resources/libs/codemirror/mode/toml/toml.js
deleted file mode 100644
index 1d163f13b..000000000
--- a/resources/libs/codemirror/mode/toml/toml.js
+++ /dev/null
@@ -1,71 +0,0 @@
-CodeMirror.defineMode("toml", function () {
-  return {
-    startState: function () {
-      return {
-        inString: false,
-        stringType: "",
-        lhs: true,
-        inArray: 0
-      };
-    },
-    token: function (stream, state) {
-      //check for state changes
-      if (!state.inString && ((stream.peek() == '"') || (stream.peek() == "'"))) {
-        state.stringType = stream.peek();
-        stream.next(); // Skip quote
-        state.inString = true; // Update state
-      }
-      if (stream.sol() && state.inArray === 0) {
-        state.lhs = true;
-      }
-      //return state
-      if (state.inString) {
-        while (state.inString && !stream.eol()) {
-          if (stream.peek() === state.stringType) {
-            stream.next(); // Skip quote
-            state.inString = false; // Clear flag
-          } else if (stream.peek() === '\\') {
-            stream.next();
-            stream.next();
-          } else {
-            stream.match(/^.[^\\\"\']*/);
-          }
-        }
-        return state.lhs ? "property string" : "string"; // Token style
-      } else if (state.inArray && stream.peek() === ']') {
-        stream.next();
-        state.inArray--;
-        return 'bracket';
-      } else if (state.lhs && stream.peek() === '[' && stream.skipTo(']')) {
-        stream.next();//skip closing ]
-        return "atom";
-      } else if (stream.peek() === "#") {
-        stream.skipToEnd();
-        return "comment";
-      } else if (stream.eatSpace()) {
-        return null;
-      } else if (state.lhs && stream.eatWhile(function (c) { return c != '=' && c != ' '; })) {
-        return "property";
-      } else if (state.lhs && stream.peek() === "=") {
-        stream.next();
-        state.lhs = false;
-        return null;
-      } else if (!state.lhs && stream.match(/^\d\d\d\d[\d\-\:\.T]*Z/)) {
-        return 'atom'; //date
-      } else if (!state.lhs && (stream.match('true') || stream.match('false'))) {
-        return 'atom';
-      } else if (!state.lhs && stream.peek() === '[') {
-        state.inArray++;
-        stream.next();
-        return 'bracket';
-      } else if (!state.lhs && stream.match(/^\-?\d+(?:\.\d+)?/)) {
-        return 'number';
-      } else if (!stream.eatSpace()) {
-        stream.next();
-      }
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME('text/x-toml', 'toml');
diff --git a/resources/libs/codemirror/mode/turtle/index.html b/resources/libs/codemirror/mode/turtle/index.html
deleted file mode 100644
index 74b5f896d..000000000
--- a/resources/libs/codemirror/mode/turtle/index.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Turtle mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="turtle.js"></script>
-<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Turtle</a>
-  </ul>
-</div>
-
-<article>
-<h2>Turtle mode</h2>
-<form><textarea id="code" name="code">
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-<http://purl.org/net/bsletten> 
-    a foaf:Person;
-    foaf:interest <http://www.w3.org/2000/01/sw/>;
-    foaf:based_near [
-        geo:lat "34.0736111" ;
-        geo:lon "-118.3994444"
-   ]
-
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "text/turtle",
-        tabMode: "indent",
-        matchBrackets: true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/turtle</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/turtle/turtle.js b/resources/libs/codemirror/mode/turtle/turtle.js
deleted file mode 100644
index e118bfbce..000000000
--- a/resources/libs/codemirror/mode/turtle/turtle.js
+++ /dev/null
@@ -1,145 +0,0 @@
-CodeMirror.defineMode("turtle", function(config) {
-  var indentUnit = config.indentUnit;
-  var curPunc;
-
-  function wordRegexp(words) {
-    return new RegExp("^(?:" + words.join("|") + ")$", "i");
-  }
-  var ops = wordRegexp([]);
-  var keywords = wordRegexp(["@prefix", "@base", "a"]);
-  var operatorChars = /[*+\-<>=&|]/;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    curPunc = null;
-    if (ch == "<" && !stream.match(/^[\s\u00a0=]/, false)) {
-      stream.match(/^[^\s\u00a0>]*>?/);
-      return "atom";
-    }
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenLiteral(ch);
-      return state.tokenize(stream, state);
-    }
-    else if (/[{}\(\),\.;\[\]]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    else if (ch == "#") {
-      stream.skipToEnd();
-      return "comment";
-    }
-    else if (operatorChars.test(ch)) {
-      stream.eatWhile(operatorChars);
-      return null;
-    }
-    else if (ch == ":") {
-          return "operator";
-        } else {
-      stream.eatWhile(/[_\w\d]/);
-      if(stream.peek() == ":") {
-        return "variable-3";
-      } else {
-             var word = stream.current();
-
-             if(keywords.test(word)) {
-                        return "meta";
-             }
-
-             if(ch >= "A" && ch <= "Z") {
-                    return "comment";
-                 } else {
-                        return "keyword";
-                 }
-      }
-      var word = stream.current();
-      if (ops.test(word))
-        return null;
-      else if (keywords.test(word))
-        return "meta";
-      else
-        return "variable";
-    }
-  }
-
-  function tokenLiteral(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      return "string";
-    };
-  }
-
-  function pushContext(state, type, col) {
-    state.context = {prev: state.context, indent: state.indent, col: col, type: type};
-  }
-  function popContext(state) {
-    state.indent = state.context.indent;
-    state.context = state.context.prev;
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: tokenBase,
-              context: null,
-              indent: 0,
-              col: 0};
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (state.context && state.context.align == null) state.context.align = false;
-        state.indent = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-
-      if (style != "comment" && state.context && state.context.align == null && state.context.type != "pattern") {
-        state.context.align = true;
-      }
-
-      if (curPunc == "(") pushContext(state, ")", stream.column());
-      else if (curPunc == "[") pushContext(state, "]", stream.column());
-      else if (curPunc == "{") pushContext(state, "}", stream.column());
-      else if (/[\]\}\)]/.test(curPunc)) {
-        while (state.context && state.context.type == "pattern") popContext(state);
-        if (state.context && curPunc == state.context.type) popContext(state);
-      }
-      else if (curPunc == "." && state.context && state.context.type == "pattern") popContext(state);
-      else if (/atom|string|variable/.test(style) && state.context) {
-        if (/[\}\]]/.test(state.context.type))
-          pushContext(state, "pattern", stream.column());
-        else if (state.context.type == "pattern" && !state.context.align) {
-          state.context.align = true;
-          state.context.col = stream.column();
-        }
-      }
-
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var firstChar = textAfter && textAfter.charAt(0);
-      var context = state.context;
-      if (/[\]\}]/.test(firstChar))
-        while (context && context.type == "pattern") context = context.prev;
-
-      var closing = context && firstChar == context.type;
-      if (!context)
-        return 0;
-      else if (context.type == "pattern")
-        return context.col;
-      else if (context.align)
-        return context.col + (closing ? 0 : 1);
-      else
-        return context.indent + (closing ? 0 : indentUnit);
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/turtle", "turtle");
diff --git a/resources/libs/codemirror/mode/vb/index.html b/resources/libs/codemirror/mode/vb/index.html
deleted file mode 100644
index 42c3e5261..000000000
--- a/resources/libs/codemirror/mode/vb/index.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: VB.NET mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link href="http://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet" type="text/css">
-<script src="../../lib/codemirror.js"></script>
-<script src="vb.js"></script>
-<script type="text/javascript" src="../../addon/runmode/runmode.js"></script>
-<style>
-      .CodeMirror {border: 1px solid #aaa; height:210px; height: auto;}
-      .CodeMirror-scroll { overflow-x: auto; overflow-y: hidden;}
-      .CodeMirror pre { font-family: Inconsolata; font-size: 14px}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">VB.NET</a>
-  </ul>
-</div>
-
-<article>
-<h2>VB.NET mode</h2>
-
-<script type="text/javascript">
-function test(golden, text) {
-  var ok = true;
-  var i = 0;
-  function callback(token, style, lineNo, pos){
-		//console.log(String(token) + " " + String(style) + " " + String(lineNo) + " " + String(pos));
-    var result = [String(token), String(style)];
-    if (golden[i][0] != result[0] || golden[i][1] != result[1]){
-      return "Error, expected: " + String(golden[i]) + ", got: " + String(result);
-      ok = false;
-    }
-    i++;
-  }
-  CodeMirror.runMode(text, "text/x-vb",callback); 
-
-  if (ok) return "Tests OK";
-}
-function testTypes() {
-  var golden = [['Integer','keyword'],[' ','null'],['Float','keyword']]
-  var text =  "Integer Float";
-  return test(golden,text);
-}
-function testIf(){
-  var golden = [['If','keyword'],[' ','null'],['True','keyword'],[' ','null'],['End','keyword'],[' ','null'],['If','keyword']];
-  var text = 'If True End If';
-  return test(golden, text);
-}
-function testDecl(){
-   var golden = [['Dim','keyword'],[' ','null'],['x','variable'],[' ','null'],['as','keyword'],[' ','null'],['Integer','keyword']];
-   var text = 'Dim x as Integer';
-   return test(golden, text);
-}
-function testAll(){
-  var result = "";
-
-  result += testTypes() + "\n";
-  result += testIf() + "\n";
-  result += testDecl() + "\n";
-  return result;
-
-}
-function initText(editor) {
-  var content = 'Class rocket\nPrivate quality as Double\nPublic Sub launch() as String\nif quality > 0.8\nlaunch = "Successful"\nElse\nlaunch = "Failed"\nEnd If\nEnd sub\nEnd class\n';
-  editor.setValue(content);
-  for (var i =0; i< editor.lineCount(); i++) editor.indentLine(i);
-}
-function init() {
-    editor = CodeMirror.fromTextArea(document.getElementById("solution"), {
-        lineNumbers: true,
-        mode: "text/x-vb",
-        readOnly: false,
-        tabMode: "shift"
-    });
-    runTest();
-}
-function runTest() {
-	document.getElementById('testresult').innerHTML = testAll();
-  initText(editor);
-	
-}
-document.body.onload = init;
-</script>
-
-  <div id="edit">
-  <textarea style="width:95%;height:200px;padding:5px;" name="solution" id="solution" ></textarea>
-  </div>
-  <pre id="testresult"></pre>
-  <p>MIME type defined: <code>text/x-vb</code>.</p>
-
-</article>
diff --git a/resources/libs/codemirror/mode/vb/vb.js b/resources/libs/codemirror/mode/vb/vb.js
deleted file mode 100644
index 27b227195..000000000
--- a/resources/libs/codemirror/mode/vb/vb.js
+++ /dev/null
@@ -1,259 +0,0 @@
-CodeMirror.defineMode("vb", function(conf, parserConf) {
-    var ERRORCLASS = 'error';
-
-    function wordRegexp(words) {
-        return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
-    }
-
-    var singleOperators = new RegExp("^[\\+\\-\\*/%&\\\\|\\^~<>!]");
-    var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');
-    var doubleOperators = new RegExp("^((==)|(<>)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
-    var doubleDelimiters = new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
-    var tripleDelimiters = new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
-    var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
-
-    var openingKeywords = ['class','module', 'sub','enum','select','while','if','function',  'get','set','property', 'try'];
-    var middleKeywords = ['else','elseif','case', 'catch'];
-    var endKeywords = ['next','loop'];
-
-    var wordOperators = wordRegexp(['and', 'or', 'not', 'xor', 'in']);
-    var commonkeywords = ['as', 'dim', 'break',  'continue','optional', 'then',  'until',
-                          'goto', 'byval','byref','new','handles','property', 'return',
-                          'const','private', 'protected', 'friend', 'public', 'shared', 'static', 'true','false'];
-    var commontypes = ['integer','string','double','decimal','boolean','short','char', 'float','single'];
-
-    var keywords = wordRegexp(commonkeywords);
-    var types = wordRegexp(commontypes);
-    var stringPrefixes = '"';
-
-    var opening = wordRegexp(openingKeywords);
-    var middle = wordRegexp(middleKeywords);
-    var closing = wordRegexp(endKeywords);
-    var doubleClosing = wordRegexp(['end']);
-    var doOpening = wordRegexp(['do']);
-
-    var indentInfo = null;
-
-
-
-
-    function indent(_stream, state) {
-      state.currentIndent++;
-    }
-
-    function dedent(_stream, state) {
-      state.currentIndent--;
-    }
-    // tokenizers
-    function tokenBase(stream, state) {
-        if (stream.eatSpace()) {
-            return null;
-        }
-
-        var ch = stream.peek();
-
-        // Handle Comments
-        if (ch === "'") {
-            stream.skipToEnd();
-            return 'comment';
-        }
-
-
-        // Handle Number Literals
-        if (stream.match(/^((&H)|(&O))?[0-9\.a-f]/i, false)) {
-            var floatLiteral = false;
-            // Floats
-            if (stream.match(/^\d*\.\d+F?/i)) { floatLiteral = true; }
-            else if (stream.match(/^\d+\.\d*F?/)) { floatLiteral = true; }
-            else if (stream.match(/^\.\d+F?/)) { floatLiteral = true; }
-
-            if (floatLiteral) {
-                // Float literals may be "imaginary"
-                stream.eat(/J/i);
-                return 'number';
-            }
-            // Integers
-            var intLiteral = false;
-            // Hex
-            if (stream.match(/^&H[0-9a-f]+/i)) { intLiteral = true; }
-            // Octal
-            else if (stream.match(/^&O[0-7]+/i)) { intLiteral = true; }
-            // Decimal
-            else if (stream.match(/^[1-9]\d*F?/)) {
-                // Decimal literals may be "imaginary"
-                stream.eat(/J/i);
-                // TODO - Can you have imaginary longs?
-                intLiteral = true;
-            }
-            // Zero by itself with no other piece of number.
-            else if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
-            if (intLiteral) {
-                // Integer literals may be "long"
-                stream.eat(/L/i);
-                return 'number';
-            }
-        }
-
-        // Handle Strings
-        if (stream.match(stringPrefixes)) {
-            state.tokenize = tokenStringFactory(stream.current());
-            return state.tokenize(stream, state);
-        }
-
-        // Handle operators and Delimiters
-        if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
-            return null;
-        }
-        if (stream.match(doubleOperators)
-            || stream.match(singleOperators)
-            || stream.match(wordOperators)) {
-            return 'operator';
-        }
-        if (stream.match(singleDelimiters)) {
-            return null;
-        }
-        if (stream.match(doOpening)) {
-            indent(stream,state);
-            state.doInCurrentLine = true;
-            return 'keyword';
-        }
-        if (stream.match(opening)) {
-            if (! state.doInCurrentLine)
-              indent(stream,state);
-            else
-              state.doInCurrentLine = false;
-            return 'keyword';
-        }
-        if (stream.match(middle)) {
-            return 'keyword';
-        }
-
-        if (stream.match(doubleClosing)) {
-            dedent(stream,state);
-            dedent(stream,state);
-            return 'keyword';
-        }
-        if (stream.match(closing)) {
-            dedent(stream,state);
-            return 'keyword';
-        }
-
-        if (stream.match(types)) {
-            return 'keyword';
-        }
-
-        if (stream.match(keywords)) {
-            return 'keyword';
-        }
-
-        if (stream.match(identifiers)) {
-            return 'variable';
-        }
-
-        // Handle non-detected items
-        stream.next();
-        return ERRORCLASS;
-    }
-
-    function tokenStringFactory(delimiter) {
-        var singleline = delimiter.length == 1;
-        var OUTCLASS = 'string';
-
-        return function(stream, state) {
-            while (!stream.eol()) {
-                stream.eatWhile(/[^'"]/);
-                if (stream.match(delimiter)) {
-                    state.tokenize = tokenBase;
-                    return OUTCLASS;
-                } else {
-                    stream.eat(/['"]/);
-                }
-            }
-            if (singleline) {
-                if (parserConf.singleLineStringErrors) {
-                    return ERRORCLASS;
-                } else {
-                    state.tokenize = tokenBase;
-                }
-            }
-            return OUTCLASS;
-        };
-    }
-
-
-    function tokenLexer(stream, state) {
-        var style = state.tokenize(stream, state);
-        var current = stream.current();
-
-        // Handle '.' connected identifiers
-        if (current === '.') {
-            style = state.tokenize(stream, state);
-            current = stream.current();
-            if (style === 'variable') {
-                return 'variable';
-            } else {
-                return ERRORCLASS;
-            }
-        }
-
-
-        var delimiter_index = '[({'.indexOf(current);
-        if (delimiter_index !== -1) {
-            indent(stream, state );
-        }
-        if (indentInfo === 'dedent') {
-            if (dedent(stream, state)) {
-                return ERRORCLASS;
-            }
-        }
-        delimiter_index = '])}'.indexOf(current);
-        if (delimiter_index !== -1) {
-            if (dedent(stream, state)) {
-                return ERRORCLASS;
-            }
-        }
-
-        return style;
-    }
-
-    var external = {
-        electricChars:"dDpPtTfFeE ",
-        startState: function() {
-            return {
-              tokenize: tokenBase,
-              lastToken: null,
-              currentIndent: 0,
-              nextLineIndent: 0,
-              doInCurrentLine: false
-
-
-          };
-        },
-
-        token: function(stream, state) {
-            if (stream.sol()) {
-              state.currentIndent += state.nextLineIndent;
-              state.nextLineIndent = 0;
-              state.doInCurrentLine = 0;
-            }
-            var style = tokenLexer(stream, state);
-
-            state.lastToken = {style:style, content: stream.current()};
-
-
-
-            return style;
-        },
-
-        indent: function(state, textAfter) {
-            var trueText = textAfter.replace(/^\s+|\s+$/g, '') ;
-            if (trueText.match(closing) || trueText.match(doubleClosing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1);
-            if(state.currentIndent < 0) return 0;
-            return state.currentIndent * conf.indentUnit;
-        }
-
-    };
-    return external;
-});
-
-CodeMirror.defineMIME("text/x-vb", "vb");
diff --git a/resources/libs/codemirror/mode/vbscript/index.html b/resources/libs/codemirror/mode/vbscript/index.html
deleted file mode 100644
index 9b506b798..000000000
--- a/resources/libs/codemirror/mode/vbscript/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: VBScript mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="vbscript.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">VBScript</a>
-  </ul>
-</div>
-
-<article>
-<h2>VBScript mode</h2>
-
-
-<div><textarea id="code" name="code">
-' Pete Guhl
-' 03-04-2012
-'
-' Basic VBScript support for codemirror2
-
-Const ForReading = 1, ForWriting = 2, ForAppending = 8
-
-Call Sub020_PostBroadcastToUrbanAirship(strUserName, strPassword, intTransmitID, strResponse)
-
-If Not IsNull(strResponse) AND Len(strResponse) = 0 Then
-	boolTransmitOkYN = False
-Else
-	' WScript.Echo "Oh Happy Day! Oh Happy DAY!"
-	boolTransmitOkYN = True
-End If
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        indentUnit: 4
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/vbscript</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/vbscript/vbscript.js b/resources/libs/codemirror/mode/vbscript/vbscript.js
deleted file mode 100644
index 0a97fb640..000000000
--- a/resources/libs/codemirror/mode/vbscript/vbscript.js
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
-For extra ASP classic objects, initialize CodeMirror instance with this option:
-    isASP: true
-
-E.G.:
-    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        isASP: true
-      });
-*/
-CodeMirror.defineMode("vbscript", function(conf, parserConf) {
-    var ERRORCLASS = 'error';
-
-    function wordRegexp(words) {
-        return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
-    }
-
-    var singleOperators = new RegExp("^[\\+\\-\\*/&\\\\\\^<>=]");
-    var doubleOperators = new RegExp("^((<>)|(<=)|(>=))");
-    var singleDelimiters = new RegExp('^[\\.,]');
-    var brakets = new RegExp('^[\\(\\)]');
-    var identifiers = new RegExp("^[A-Za-z][_A-Za-z0-9]*");
-
-    var openingKeywords = ['class','sub','select','while','if','function', 'property', 'with', 'for'];
-    var middleKeywords = ['else','elseif','case'];
-    var endKeywords = ['next','loop','wend'];
-
-    var wordOperators = wordRegexp(['and', 'or', 'not', 'xor', 'is', 'mod', 'eqv', 'imp']);
-    var commonkeywords = ['dim', 'redim', 'then',  'until', 'randomize',
-                          'byval','byref','new','property', 'exit', 'in',
-                          'const','private', 'public',
-                          'get','set','let', 'stop', 'on error resume next', 'on error goto 0', 'option explicit', 'call', 'me'];
-
-    //This list was from: http://msdn.microsoft.com/en-us/library/f8tbc79x(v=vs.84).aspx
-    var atomWords = ['true', 'false', 'nothing', 'empty', 'null'];
-    //This list was from: http://msdn.microsoft.com/en-us/library/3ca8tfek(v=vs.84).aspx
-    var builtinFuncsWords = ['abs', 'array', 'asc', 'atn', 'cbool', 'cbyte', 'ccur', 'cdate', 'cdbl', 'chr', 'cint', 'clng', 'cos', 'csng', 'cstr', 'date', 'dateadd', 'datediff', 'datepart',
-                        'dateserial', 'datevalue', 'day', 'escape', 'eval', 'execute', 'exp', 'filter', 'formatcurrency', 'formatdatetime', 'formatnumber', 'formatpercent', 'getlocale', 'getobject',
-                        'getref', 'hex', 'hour', 'inputbox', 'instr', 'instrrev', 'int', 'fix', 'isarray', 'isdate', 'isempty', 'isnull', 'isnumeric', 'isobject', 'join', 'lbound', 'lcase', 'left',
-                        'len', 'loadpicture', 'log', 'ltrim', 'rtrim', 'trim', 'maths', 'mid', 'minute', 'month', 'monthname', 'msgbox', 'now', 'oct', 'replace', 'rgb', 'right', 'rnd', 'round',
-                        'scriptengine', 'scriptenginebuildversion', 'scriptenginemajorversion', 'scriptengineminorversion', 'second', 'setlocale', 'sgn', 'sin', 'space', 'split', 'sqr', 'strcomp',
-                        'string', 'strreverse', 'tan', 'time', 'timer', 'timeserial', 'timevalue', 'typename', 'ubound', 'ucase', 'unescape', 'vartype', 'weekday', 'weekdayname', 'year'];
-
-    //This list was from: http://msdn.microsoft.com/en-us/library/ydz4cfk3(v=vs.84).aspx
-    var builtinConsts = ['vbBlack', 'vbRed', 'vbGreen', 'vbYellow', 'vbBlue', 'vbMagenta', 'vbCyan', 'vbWhite', 'vbBinaryCompare', 'vbTextCompare',
-                         'vbSunday', 'vbMonday', 'vbTuesday', 'vbWednesday', 'vbThursday', 'vbFriday', 'vbSaturday', 'vbUseSystemDayOfWeek', 'vbFirstJan1', 'vbFirstFourDays', 'vbFirstFullWeek',
-                         'vbGeneralDate', 'vbLongDate', 'vbShortDate', 'vbLongTime', 'vbShortTime', 'vbObjectError',
-                         'vbOKOnly', 'vbOKCancel', 'vbAbortRetryIgnore', 'vbYesNoCancel', 'vbYesNo', 'vbRetryCancel', 'vbCritical', 'vbQuestion', 'vbExclamation', 'vbInformation', 'vbDefaultButton1', 'vbDefaultButton2',
-                         'vbDefaultButton3', 'vbDefaultButton4', 'vbApplicationModal', 'vbSystemModal', 'vbOK', 'vbCancel', 'vbAbort', 'vbRetry', 'vbIgnore', 'vbYes', 'vbNo',
-                         'vbCr', 'VbCrLf', 'vbFormFeed', 'vbLf', 'vbNewLine', 'vbNullChar', 'vbNullString', 'vbTab', 'vbVerticalTab', 'vbUseDefault', 'vbTrue', 'vbFalse',
-                         'vbEmpty', 'vbNull', 'vbInteger', 'vbLong', 'vbSingle', 'vbDouble', 'vbCurrency', 'vbDate', 'vbString', 'vbObject', 'vbError', 'vbBoolean', 'vbVariant', 'vbDataObject', 'vbDecimal', 'vbByte', 'vbArray'];
-    //This list was from: http://msdn.microsoft.com/en-us/library/hkc375ea(v=vs.84).aspx
-    var builtinObjsWords = ['WScript', 'err', 'debug', 'RegExp'];
-    var knownProperties = ['description', 'firstindex', 'global', 'helpcontext', 'helpfile', 'ignorecase', 'length', 'number', 'pattern', 'source', 'value', 'count'];
-    var knownMethods = ['clear', 'execute', 'raise', 'replace', 'test', 'write', 'writeline', 'close', 'open', 'state', 'eof', 'update', 'addnew', 'end', 'createobject', 'quit'];
-
-    var aspBuiltinObjsWords = ['server', 'response', 'request', 'session', 'application'];
-    var aspKnownProperties = ['buffer', 'cachecontrol', 'charset', 'contenttype', 'expires', 'expiresabsolute', 'isclientconnected', 'pics', 'status', //response
-                              'clientcertificate', 'cookies', 'form', 'querystring', 'servervariables', 'totalbytes', //request
-                              'contents', 'staticobjects', //application
-                              'codepage', 'lcid', 'sessionid', 'timeout', //session
-                              'scripttimeout']; //server
-    var aspKnownMethods = ['addheader', 'appendtolog', 'binarywrite', 'end', 'flush', 'redirect', //response
-                           'binaryread', //request
-                           'remove', 'removeall', 'lock', 'unlock', //application
-                           'abandon', //session
-                           'getlasterror', 'htmlencode', 'mappath', 'transfer', 'urlencode']; //server
-
-    var knownWords = knownMethods.concat(knownProperties);
-
-    builtinObjsWords = builtinObjsWords.concat(builtinConsts);
-
-    if (conf.isASP){
-        builtinObjsWords = builtinObjsWords.concat(aspBuiltinObjsWords);
-        knownWords = knownWords.concat(aspKnownMethods, aspKnownProperties);
-    };
-
-    var keywords = wordRegexp(commonkeywords);
-    var atoms = wordRegexp(atomWords);
-    var builtinFuncs = wordRegexp(builtinFuncsWords);
-    var builtinObjs = wordRegexp(builtinObjsWords);
-    var known = wordRegexp(knownWords);
-    var stringPrefixes = '"';
-
-    var opening = wordRegexp(openingKeywords);
-    var middle = wordRegexp(middleKeywords);
-    var closing = wordRegexp(endKeywords);
-    var doubleClosing = wordRegexp(['end']);
-    var doOpening = wordRegexp(['do']);
-    var noIndentWords = wordRegexp(['on error resume next', 'exit']);
-    var comment = wordRegexp(['rem']);
-
-
-    function indent(_stream, state) {
-      state.currentIndent++;
-    }
-
-    function dedent(_stream, state) {
-      state.currentIndent--;
-    }
-    // tokenizers
-    function tokenBase(stream, state) {
-        if (stream.eatSpace()) {
-            return 'space';
-            //return null;
-        }
-
-        var ch = stream.peek();
-
-        // Handle Comments
-        if (ch === "'") {
-            stream.skipToEnd();
-            return 'comment';
-        }
-        if (stream.match(comment)){
-            stream.skipToEnd();
-            return 'comment';
-        }
-
-
-        // Handle Number Literals
-        if (stream.match(/^((&H)|(&O))?[0-9\.]/i, false) && !stream.match(/^((&H)|(&O))?[0-9\.]+[a-z_]/i, false)) {
-            var floatLiteral = false;
-            // Floats
-            if (stream.match(/^\d*\.\d+/i)) { floatLiteral = true; }
-            else if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
-            else if (stream.match(/^\.\d+/)) { floatLiteral = true; }
-
-            if (floatLiteral) {
-                // Float literals may be "imaginary"
-                stream.eat(/J/i);
-                return 'number';
-            }
-            // Integers
-            var intLiteral = false;
-            // Hex
-            if (stream.match(/^&H[0-9a-f]+/i)) { intLiteral = true; }
-            // Octal
-            else if (stream.match(/^&O[0-7]+/i)) { intLiteral = true; }
-            // Decimal
-            else if (stream.match(/^[1-9]\d*F?/)) {
-                // Decimal literals may be "imaginary"
-                stream.eat(/J/i);
-                // TODO - Can you have imaginary longs?
-                intLiteral = true;
-            }
-            // Zero by itself with no other piece of number.
-            else if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
-            if (intLiteral) {
-                // Integer literals may be "long"
-                stream.eat(/L/i);
-                return 'number';
-            }
-        }
-
-        // Handle Strings
-        if (stream.match(stringPrefixes)) {
-            state.tokenize = tokenStringFactory(stream.current());
-            return state.tokenize(stream, state);
-        }
-
-        // Handle operators and Delimiters
-        if (stream.match(doubleOperators)
-            || stream.match(singleOperators)
-            || stream.match(wordOperators)) {
-            return 'operator';
-        }
-        if (stream.match(singleDelimiters)) {
-            return null;
-        }
-
-        if (stream.match(brakets)) {
-            return "bracket";
-        }
-
-        if (stream.match(noIndentWords)) {
-            state.doInCurrentLine = true;
-
-            return 'keyword';
-        }
-
-        if (stream.match(doOpening)) {
-            indent(stream,state);
-            state.doInCurrentLine = true;
-
-            return 'keyword';
-        }
-        if (stream.match(opening)) {
-            if (! state.doInCurrentLine)
-              indent(stream,state);
-            else
-              state.doInCurrentLine = false;
-
-            return 'keyword';
-        }
-        if (stream.match(middle)) {
-            return 'keyword';
-        }
-
-
-        if (stream.match(doubleClosing)) {
-            dedent(stream,state);
-            dedent(stream,state);
-
-            return 'keyword';
-        }
-        if (stream.match(closing)) {
-            if (! state.doInCurrentLine)
-              dedent(stream,state);
-            else
-              state.doInCurrentLine = false;
-
-            return 'keyword';
-        }
-
-        if (stream.match(keywords)) {
-            return 'keyword';
-        }
-
-        if (stream.match(atoms)) {
-            return 'atom';
-        }
-
-        if (stream.match(known)) {
-            return 'variable-2';
-        }
-
-        if (stream.match(builtinFuncs)) {
-            return 'builtin';
-        }
-
-        if (stream.match(builtinObjs)){
-            return 'variable-2';
-        }
-
-        if (stream.match(identifiers)) {
-            return 'variable';
-        }
-
-        // Handle non-detected items
-        stream.next();
-        return ERRORCLASS;
-    }
-
-    function tokenStringFactory(delimiter) {
-        var singleline = delimiter.length == 1;
-        var OUTCLASS = 'string';
-
-        return function(stream, state) {
-            while (!stream.eol()) {
-                stream.eatWhile(/[^'"]/);
-                if (stream.match(delimiter)) {
-                    state.tokenize = tokenBase;
-                    return OUTCLASS;
-                } else {
-                    stream.eat(/['"]/);
-                }
-            }
-            if (singleline) {
-                if (parserConf.singleLineStringErrors) {
-                    return ERRORCLASS;
-                } else {
-                    state.tokenize = tokenBase;
-                }
-            }
-            return OUTCLASS;
-        };
-    }
-
-
-    function tokenLexer(stream, state) {
-        var style = state.tokenize(stream, state);
-        var current = stream.current();
-
-        // Handle '.' connected identifiers
-        if (current === '.') {
-            style = state.tokenize(stream, state);
-
-            current = stream.current();
-            if (style.substr(0, 8) === 'variable' || style==='builtin' || style==='keyword'){//|| knownWords.indexOf(current.substring(1)) > -1) {
-                if (style === 'builtin' || style === 'keyword') style='variable';
-                if (knownWords.indexOf(current.substr(1)) > -1) style='variable-2';
-
-                return style;
-            } else {
-                return ERRORCLASS;
-            }
-        }
-
-        return style;
-    }
-
-    var external = {
-        electricChars:"dDpPtTfFeE ",
-        startState: function() {
-            return {
-              tokenize: tokenBase,
-              lastToken: null,
-              currentIndent: 0,
-              nextLineIndent: 0,
-              doInCurrentLine: false,
-              ignoreKeyword: false
-
-
-          };
-        },
-
-        token: function(stream, state) {
-            if (stream.sol()) {
-              state.currentIndent += state.nextLineIndent;
-              state.nextLineIndent = 0;
-              state.doInCurrentLine = 0;
-            }
-            var style = tokenLexer(stream, state);
-
-            state.lastToken = {style:style, content: stream.current()};
-
-            if (style==='space') style=null;
-
-            return style;
-        },
-
-        indent: function(state, textAfter) {
-            var trueText = textAfter.replace(/^\s+|\s+$/g, '') ;
-            if (trueText.match(closing) || trueText.match(doubleClosing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1);
-            if(state.currentIndent < 0) return 0;
-            return state.currentIndent * conf.indentUnit;
-        }
-
-    };
-    return external;
-});
-
-CodeMirror.defineMIME("text/vbscript", "vbscript");
diff --git a/resources/libs/codemirror/mode/velocity/index.html b/resources/libs/codemirror/mode/velocity/index.html
deleted file mode 100644
index 023542d1d..000000000
--- a/resources/libs/codemirror/mode/velocity/index.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Velocity mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/night.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="velocity.js"></script>
-<style>.CodeMirror {border: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Velocity</a>
-  </ul>
-</div>
-
-<article>
-<h2>Velocity mode</h2>
-<form><textarea id="code" name="code">
-## Velocity Code Demo
-#*
-   based on PL/SQL mode by Peter Raganitsch, adapted to Velocity by Steve O'Hara ( http://www.pivotal-solutions.co.uk )
-   August 2011
-*#
-
-#*
-   This is a multiline comment.
-   This is the second line
-*#
-
-#[[ hello steve
-   This has invalid syntax that would normally need "poor man's escaping" like:
-
-   #define()
-
-   ${blah
-]]#
-
-#include( "disclaimer.txt" "opinion.txt" )
-#include( $foo $bar )
-
-#parse( "lecorbusier.vm" )
-#parse( $foo )
-
-#evaluate( 'string with VTL #if(true)will be displayed#end' )
-
-#define( $hello ) Hello $who #end #set( $who = "World!") $hello ## displays Hello World!
-
-#foreach( $customer in $customerList )
-
-    $foreach.count $customer.Name
-
-    #if( $foo == ${bar})
-        it's true!
-        #break
-    #{else}
-        it's not!
-        #stop
-    #end
-
-    #if ($foreach.parent.hasNext)
-        $velocityCount
-    #end
-#end
-
-$someObject.getValues("this is a string split
-        across lines")
-
-$someObject("This plus $something in the middle").method(7567).property
-
-#macro( tablerows $color $somelist )
-    #foreach( $something in $somelist )
-        <tr><td bgcolor=$color>$something</td></tr>
-        <tr><td bgcolor=$color>$bodyContent</td></tr>
-    #end
-#end
-
-#tablerows("red" ["dadsdf","dsa"])
-#@tablerows("red" ["dadsdf","dsa"]) some body content #end
-
-   Variable reference: #set( $monkey = $bill )
-   String literal: #set( $monkey.Friend = 'monica' )
-   Property reference: #set( $monkey.Blame = $whitehouse.Leak )
-   Method reference: #set( $monkey.Plan = $spindoctor.weave($web) )
-   Number literal: #set( $monkey.Number = 123 )
-   Range operator: #set( $monkey.Numbers = [1..3] )
-   Object list: #set( $monkey.Say = ["Not", $my, "fault"] )
-   Object map: #set( $monkey.Map = {"banana" : "good", "roast beef" : "bad"})
-
-The RHS can also be a simple arithmetic expression, such as:
-Addition: #set( $value = $foo + 1 )
-   Subtraction: #set( $value = $bar - 1 )
-   Multiplication: #set( $value = $foo * $bar )
-   Division: #set( $value = $foo / $bar )
-   Remainder: #set( $value = $foo % $bar )
-
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        tabMode: "indent",
-        theme: "night",
-        lineNumbers: true,
-        indentUnit: 4,
-        mode: "text/velocity"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/velocity</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/velocity/velocity.js b/resources/libs/codemirror/mode/velocity/velocity.js
deleted file mode 100644
index 968d8799e..000000000
--- a/resources/libs/codemirror/mode/velocity/velocity.js
+++ /dev/null
@@ -1,186 +0,0 @@
-CodeMirror.defineMode("velocity", function() {
-    function parseWords(str) {
-        var obj = {}, words = str.split(" ");
-        for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-        return obj;
-    }
-
-    var keywords = parseWords("#end #else #break #stop #[[ #]] " +
-                              "#{end} #{else} #{break} #{stop}");
-    var functions = parseWords("#if #elseif #foreach #set #include #parse #macro #define #evaluate " +
-                               "#{if} #{elseif} #{foreach} #{set} #{include} #{parse} #{macro} #{define} #{evaluate}");
-    var specials = parseWords("$foreach.count $foreach.hasNext $foreach.first $foreach.last $foreach.topmost $foreach.parent.count $foreach.parent.hasNext $foreach.parent.first $foreach.parent.last $foreach.parent $velocityCount $!bodyContent $bodyContent");
-    var isOperatorChar = /[+\-*&%=<>!?:\/|]/;
-
-    function chain(stream, state, f) {
-        state.tokenize = f;
-        return f(stream, state);
-    }
-    function tokenBase(stream, state) {
-        var beforeParams = state.beforeParams;
-        state.beforeParams = false;
-        var ch = stream.next();
-        // start of unparsed string?
-        if ((ch == "'") && state.inParams) {
-            state.lastTokenWasBuiltin = false;
-            return chain(stream, state, tokenString(ch));
-        }
-        // start of parsed string?
-        else if ((ch == '"')) {
-            state.lastTokenWasBuiltin = false;
-            if (state.inString) {
-                state.inString = false;
-                return "string";
-            }
-            else if (state.inParams)
-                return chain(stream, state, tokenString(ch));
-        }
-        // is it one of the special signs []{}().,;? Seperator?
-        else if (/[\[\]{}\(\),;\.]/.test(ch)) {
-            if (ch == "(" && beforeParams)
-                state.inParams = true;
-            else if (ch == ")") {
-                state.inParams = false;
-                state.lastTokenWasBuiltin = true;
-            }
-            return null;
-        }
-        // start of a number value?
-        else if (/\d/.test(ch)) {
-            state.lastTokenWasBuiltin = false;
-            stream.eatWhile(/[\w\.]/);
-            return "number";
-        }
-        // multi line comment?
-        else if (ch == "#" && stream.eat("*")) {
-            state.lastTokenWasBuiltin = false;
-            return chain(stream, state, tokenComment);
-        }
-        // unparsed content?
-        else if (ch == "#" && stream.match(/ *\[ *\[/)) {
-            state.lastTokenWasBuiltin = false;
-            return chain(stream, state, tokenUnparsed);
-        }
-        // single line comment?
-        else if (ch == "#" && stream.eat("#")) {
-            state.lastTokenWasBuiltin = false;
-            stream.skipToEnd();
-            return "comment";
-        }
-        // variable?
-        else if (ch == "$") {
-            stream.eatWhile(/[\w\d\$_\.{}]/);
-            // is it one of the specials?
-            if (specials && specials.propertyIsEnumerable(stream.current())) {
-                return "keyword";
-            }
-            else {
-                state.lastTokenWasBuiltin = true;
-                state.beforeParams = true;
-                return "builtin";
-            }
-        }
-        // is it a operator?
-        else if (isOperatorChar.test(ch)) {
-            state.lastTokenWasBuiltin = false;
-            stream.eatWhile(isOperatorChar);
-            return "operator";
-        }
-        else {
-            // get the whole word
-            stream.eatWhile(/[\w\$_{}@]/);
-            var word = stream.current();
-            // is it one of the listed keywords?
-            if (keywords && keywords.propertyIsEnumerable(word))
-                return "keyword";
-            // is it one of the listed functions?
-            if (functions && functions.propertyIsEnumerable(word) ||
-                    (stream.current().match(/^#@?[a-z0-9_]+ *$/i) && stream.peek()=="(") &&
-                     !(functions && functions.propertyIsEnumerable(word.toLowerCase()))) {
-                state.beforeParams = true;
-                state.lastTokenWasBuiltin = false;
-                return "keyword";
-            }
-            if (state.inString) {
-                state.lastTokenWasBuiltin = false;
-                return "string";
-            }
-            if (stream.pos > word.length && stream.string.charAt(stream.pos-word.length-1)=="." && state.lastTokenWasBuiltin)
-                return "builtin";
-            // default: just a "word"
-            state.lastTokenWasBuiltin = false;
-            return null;
-        }
-    }
-
-    function tokenString(quote) {
-        return function(stream, state) {
-            var escaped = false, next, end = false;
-            while ((next = stream.next()) != null) {
-                if ((next == quote) && !escaped) {
-                    end = true;
-                    break;
-                }
-                if (quote=='"' && stream.peek() == '$' && !escaped) {
-                    state.inString = true;
-                    end = true;
-                    break;
-                }
-                escaped = !escaped && next == "\\";
-            }
-            if (end) state.tokenize = tokenBase;
-            return "string";
-        };
-    }
-
-    function tokenComment(stream, state) {
-        var maybeEnd = false, ch;
-        while (ch = stream.next()) {
-            if (ch == "#" && maybeEnd) {
-                state.tokenize = tokenBase;
-                break;
-            }
-            maybeEnd = (ch == "*");
-        }
-        return "comment";
-    }
-
-    function tokenUnparsed(stream, state) {
-        var maybeEnd = 0, ch;
-        while (ch = stream.next()) {
-            if (ch == "#" && maybeEnd == 2) {
-                state.tokenize = tokenBase;
-                break;
-            }
-            if (ch == "]")
-                maybeEnd++;
-            else if (ch != " ")
-                maybeEnd = 0;
-        }
-        return "meta";
-    }
-    // Interface
-
-    return {
-        startState: function() {
-            return {
-                tokenize: tokenBase,
-                beforeParams: false,
-                inParams: false,
-                inString: false,
-                lastTokenWasBuiltin: false
-            };
-        },
-
-        token: function(stream, state) {
-            if (stream.eatSpace()) return null;
-            return state.tokenize(stream, state);
-        },
-        blockCommentStart: "#*",
-        blockCommentEnd: "*#",
-        lineComment: "##",
-        fold: "velocity"
-    };
-});
-
-CodeMirror.defineMIME("text/velocity", "velocity");
diff --git a/resources/libs/codemirror/mode/verilog/index.html b/resources/libs/codemirror/mode/verilog/index.html
deleted file mode 100644
index cc7105644..000000000
--- a/resources/libs/codemirror/mode/verilog/index.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Verilog mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="verilog.js"></script>
-<style>.CodeMirror {border: 2px inset #dee;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Verilog</a>
-  </ul>
-</div>
-
-<article>
-<h2>Verilog mode</h2>
-<form><textarea id="code" name="code">
-/* Verilog demo code */
-
-module butterfly
-  #(
-    parameter WIDTH = 32,
-    parameter MWIDTH = 1
-    )
-   (
-    input wire                     clk,
-    input wire                     rst_n,
-    // m_in contains data that passes through this block with no change.
-    input wire [MWIDTH-1:0]        m_in,
-    // The twiddle factor.
-    input wire signed [WIDTH-1:0]  w,
-    // XA
-    input wire signed [WIDTH-1:0]  xa,
-    // XB
-    input wire signed [WIDTH-1:0]  xb,
-    // Set to 1 when new data is present on inputs.
-    input wire                     x_nd,
-    // delayed version of m_in.
-    output reg [MWIDTH-1:0]        m_out,
-    // YA = XA + W*XB
-    // YB = XA - W*XB
-    output wire signed [WIDTH-1:0] ya,
-    output wire signed [WIDTH-1:0] yb,
-    output reg                     y_nd,
-    output reg                     error
-    );
-
-   // Set wire to the real and imag parts for convenience.
-   wire signed [WIDTH/2-1:0]        xa_re;
-   wire signed [WIDTH/2-1:0]        xa_im;
-   assign xa_re = xa[WIDTH-1:WIDTH/2];
-   assign xa_im = xa[WIDTH/2-1:0];
-   wire signed [WIDTH/2-1: 0]       ya_re;
-   wire signed [WIDTH/2-1: 0]       ya_im;
-   assign ya = {ya_re, ya_im};
-   wire signed [WIDTH/2-1: 0]       yb_re;
-   wire signed [WIDTH/2-1: 0]       yb_im;
-   assign yb = {yb_re, yb_im};
-
-   // Delayed stuff.
-   reg signed [WIDTH/2-1:0]         xa_re_z;
-   reg signed [WIDTH/2-1:0]         xa_im_z;
-   // Output of multiplier
-   wire signed [WIDTH-1:0]          xbw;
-   wire signed [WIDTH/2-1:0]        xbw_re;
-   wire signed [WIDTH/2-1:0]        xbw_im;
-   assign xbw_re = xbw[WIDTH-1:WIDTH/2];
-   assign xbw_im = xbw[WIDTH/2-1:0];
-   // Do summing
-   // I don't think we should get overflow here because of the
-   // size of the twiddle factors.
-   // If we do testing should catch it.
-   assign ya_re = xa_re_z + xbw_re;
-   assign ya_im = xa_im_z + xbw_im;
-   assign yb_re = xa_re_z - xbw_re;
-   assign yb_im = xa_im_z - xbw_im;
-   
-   // Create the multiply module.
-   multiply_complex #(WIDTH) multiply_complex_0
-     (.clk(clk),
-      .rst_n(rst_n),
-      .x(xb),
-      .y(w),
-      .z(xbw)
-      );
-
-  always @ (posedge clk)
-    begin
-       if (!rst_n)
-         begin
-            y_nd <= 1'b0;
-            error <= 1'b0;
-         end
-       else
-         begin
-            // Set delay for x_nd_old and m.
-            y_nd <= x_nd;
-            m_out <= m_in;
-            if (x_nd)
-              begin
-                 xa_re_z <= xa_re/2;
-                 xa_im_z <= xa_im/2;
-              end
-         end
-    end
-   
-endmodule
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "text/x-verilog"
-      });
-    </script>
-
-    <p>Simple mode that tries to handle Verilog-like languages as well as it
-    can. Takes one configuration parameters: <code>keywords</code>, an
-    object whose property names are the keywords in the language.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-verilog</code> (Verilog code).</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/verilog/verilog.js b/resources/libs/codemirror/mode/verilog/verilog.js
deleted file mode 100644
index 708de23f4..000000000
--- a/resources/libs/codemirror/mode/verilog/verilog.js
+++ /dev/null
@@ -1,182 +0,0 @@
-CodeMirror.defineMode("verilog", function(config, parserConfig) {
-  var indentUnit = config.indentUnit,
-      keywords = parserConfig.keywords || {},
-      blockKeywords = parserConfig.blockKeywords || {},
-      atoms = parserConfig.atoms || {},
-      hooks = parserConfig.hooks || {},
-      multiLineStrings = parserConfig.multiLineStrings;
-  var isOperatorChar = /[&|~><!\)\(*#%@+\/=?\:;}{,\.\^\-\[\]]/;
-
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-    if (ch == '"') {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/[\d']/.test(ch)) {
-      stream.eatWhile(/[\w\.']/);
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "keyword";
-    }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return "variable";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !(escaped || multiLineStrings))
-        state.tokenize = tokenBase;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function pushContext(state, col, type) {
-    return state.context = new Context(state.indented, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true
-      };
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
-        pushContext(state, stream.column(), "statement");
-      state.startOfLine = false;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), ctx = state.context, closing = firstChar == ctx.type;
-      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : indentUnit);
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: "{}"
-  };
-});
-
-(function() {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  var verilogKeywords = "always and assign automatic begin buf bufif0 bufif1 case casex casez cell cmos config " +
-    "deassign default defparam design disable edge else end endcase endconfig endfunction endgenerate endmodule " +
-    "endprimitive endspecify endtable endtask event for force forever fork function generate genvar highz0 " +
-    "highz1 if ifnone incdir include initial inout input instance integer join large liblist library localparam " +
-    "macromodule medium module nand negedge nmos nor noshowcancelled not notif0 notif1 or output parameter pmos " +
-    "posedge primitive pull0 pull1 pulldown pullup pulsestyle_onevent pulsestyle_ondetect rcmos real realtime " +
-    "reg release repeat rnmos rpmos rtran rtranif0 rtranif1 scalared showcancelled signed small specify specparam " +
-    "strong0 strong1 supply0 supply1 table task time tran tranif0 tranif1 tri tri0 tri1 triand trior trireg " +
-    "unsigned use vectored wait wand weak0 weak1 while wire wor xnor xor";
-
-  var verilogBlockKeywords = "begin bufif0 bufif1 case casex casez config else end endcase endconfig endfunction " +
-    "endgenerate endmodule endprimitive endspecify endtable endtask for forever function generate if ifnone " +
-    "macromodule module primitive repeat specify table task while";
-
-  function metaHook(stream) {
-    stream.eatWhile(/[\w\$_]/);
-    return "meta";
-  }
-
-  CodeMirror.defineMIME("text/x-verilog", {
-    name: "verilog",
-    keywords: words(verilogKeywords),
-    blockKeywords: words(verilogBlockKeywords),
-    atoms: words("null"),
-    hooks: {"`": metaHook, "$": metaHook}
-  });
-}());
diff --git a/resources/libs/codemirror/mode/xml/index.html b/resources/libs/codemirror/mode/xml/index.html
deleted file mode 100644
index 873099aab..000000000
--- a/resources/libs/codemirror/mode/xml/index.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: XML mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="xml.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">XML</a>
-  </ul>
-</div>
-
-<article>
-<h2>XML mode</h2>
-<form><textarea id="code" name="code">
-&lt;html style="color: green"&gt;
-  &lt;!-- this is a comment --&gt;
-  &lt;head&gt;
-    &lt;title&gt;HTML Example&lt;/title&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-    The indentation tries to be &lt;em&gt;somewhat &amp;quot;do what
-    I mean&amp;quot;&lt;/em&gt;... but might not match your style.
-  &lt;/body&gt;
-&lt;/html&gt;
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "xml", alignCDATA: true},
-        lineNumbers: true
-      });
-    </script>
-    <p>The XML mode supports two configuration parameters:</p>
-    <dl>
-      <dt><code>htmlMode (boolean)</code></dt>
-      <dd>This switches the mode to parse HTML instead of XML. This
-      means attributes do not have to be quoted, and some elements
-      (such as <code>br</code>) do not require a closing tag.</dd>
-      <dt><code>alignCDATA (boolean)</code></dt>
-      <dd>Setting this to true will force the opening tag of CDATA
-      blocks to not be indented.</dd>
-    </dl>
-
-    <p><strong>MIME types defined:</strong> <code>application/xml</code>, <code>text/html</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/xml/xml.js b/resources/libs/codemirror/mode/xml/xml.js
deleted file mode 100644
index 4f49e07fa..000000000
--- a/resources/libs/codemirror/mode/xml/xml.js
+++ /dev/null
@@ -1,345 +0,0 @@
-CodeMirror.defineMode("xml", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1;
-  var multilineTagIndentPastTag = parserConfig.multilineTagIndentPastTag || true;
-
-  var Kludges = parserConfig.htmlMode ? {
-    autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
-                      'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
-                      'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
-                      'track': true, 'wbr': true},
-    implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
-                       'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
-                       'th': true, 'tr': true},
-    contextGrabbers: {
-      'dd': {'dd': true, 'dt': true},
-      'dt': {'dd': true, 'dt': true},
-      'li': {'li': true},
-      'option': {'option': true, 'optgroup': true},
-      'optgroup': {'optgroup': true},
-      'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
-            'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
-            'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
-            'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
-            'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
-      'rp': {'rp': true, 'rt': true},
-      'rt': {'rp': true, 'rt': true},
-      'tbody': {'tbody': true, 'tfoot': true},
-      'td': {'td': true, 'th': true},
-      'tfoot': {'tbody': true},
-      'th': {'td': true, 'th': true},
-      'thead': {'tbody': true, 'tfoot': true},
-      'tr': {'tr': true}
-    },
-    doNotIndent: {"pre": true},
-    allowUnquoted: true,
-    allowMissing: true
-  } : {
-    autoSelfClosers: {},
-    implicitlyClosed: {},
-    contextGrabbers: {},
-    doNotIndent: {},
-    allowUnquoted: false,
-    allowMissing: false
-  };
-  var alignCDATA = parserConfig.alignCDATA;
-
-  // Return variables for tokenizers
-  var tagName, type;
-
-  function inText(stream, state) {
-    function chain(parser) {
-      state.tokenize = parser;
-      return parser(stream, state);
-    }
-
-    var ch = stream.next();
-    if (ch == "<") {
-      if (stream.eat("!")) {
-        if (stream.eat("[")) {
-          if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>"));
-          else return null;
-        } else if (stream.match("--")) {
-          return chain(inBlock("comment", "-->"));
-        } else if (stream.match("DOCTYPE", true, true)) {
-          stream.eatWhile(/[\w\._\-]/);
-          return chain(doctype(1));
-        } else {
-          return null;
-        }
-      } else if (stream.eat("?")) {
-        stream.eatWhile(/[\w\._\-]/);
-        state.tokenize = inBlock("meta", "?>");
-        return "meta";
-      } else {
-        var isClose = stream.eat("/");
-        tagName = "";
-        var c;
-        while ((c = stream.eat(/[^\s\u00a0=<>\"\'\/?]/))) tagName += c;
-        if (!tagName) return "tag error";
-        type = isClose ? "closeTag" : "openTag";
-        state.tokenize = inTag;
-        return "tag";
-      }
-    } else if (ch == "&") {
-      var ok;
-      if (stream.eat("#")) {
-        if (stream.eat("x")) {
-          ok = stream.eatWhile(/[a-fA-F\d]/) && stream.eat(";");
-        } else {
-          ok = stream.eatWhile(/[\d]/) && stream.eat(";");
-        }
-      } else {
-        ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";");
-      }
-      return ok ? "atom" : "error";
-    } else {
-      stream.eatWhile(/[^&<]/);
-      return null;
-    }
-  }
-
-  function inTag(stream, state) {
-    var ch = stream.next();
-    if (ch == ">" || (ch == "/" && stream.eat(">"))) {
-      state.tokenize = inText;
-      type = ch == ">" ? "endTag" : "selfcloseTag";
-      return "tag";
-    } else if (ch == "=") {
-      type = "equals";
-      return null;
-    } else if (ch == "<") {
-      state.tokenize = inText;
-      var next = state.tokenize(stream, state);
-      return next ? next + " error" : "error";
-    } else if (/[\'\"]/.test(ch)) {
-      state.tokenize = inAttribute(ch);
-      state.stringStartCol = stream.column();
-      return state.tokenize(stream, state);
-    } else {
-      stream.eatWhile(/[^\s\u00a0=<>\"\']/);
-      return "word";
-    }
-  }
-
-  function inAttribute(quote) {
-    var closure = function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.next() == quote) {
-          state.tokenize = inTag;
-          break;
-        }
-      }
-      return "string";
-    };
-    closure.isInAttribute = true;
-    return closure;
-  }
-
-  function inBlock(style, terminator) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.match(terminator)) {
-          state.tokenize = inText;
-          break;
-        }
-        stream.next();
-      }
-      return style;
-    };
-  }
-  function doctype(depth) {
-    return function(stream, state) {
-      var ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == "<") {
-          state.tokenize = doctype(depth + 1);
-          return state.tokenize(stream, state);
-        } else if (ch == ">") {
-          if (depth == 1) {
-            state.tokenize = inText;
-            break;
-          } else {
-            state.tokenize = doctype(depth - 1);
-            return state.tokenize(stream, state);
-          }
-        }
-      }
-      return "meta";
-    };
-  }
-
-  var curState, curStream, setStyle;
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) curState.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-
-  function pushContext(tagName, startOfLine) {
-    var noIndent = Kludges.doNotIndent.hasOwnProperty(tagName) || (curState.context && curState.context.noIndent);
-    curState.context = {
-      prev: curState.context,
-      tagName: tagName,
-      indent: curState.indented,
-      startOfLine: startOfLine,
-      noIndent: noIndent
-    };
-  }
-  function popContext() {
-    if (curState.context) curState.context = curState.context.prev;
-  }
-
-  function element(type) {
-    if (type == "openTag") {
-      curState.tagName = tagName;
-      curState.tagStart = curStream.column();
-      return cont(attributes, endtag(curState.startOfLine));
-    } else if (type == "closeTag") {
-      var err = false;
-      if (curState.context) {
-        if (curState.context.tagName != tagName) {
-          if (Kludges.implicitlyClosed.hasOwnProperty(curState.context.tagName.toLowerCase())) {
-            popContext();
-          }
-          err = !curState.context || curState.context.tagName != tagName;
-        }
-      } else {
-        err = true;
-      }
-      if (err) setStyle = "error";
-      return cont(endclosetag(err));
-    }
-    return cont();
-  }
-  function endtag(startOfLine) {
-    return function(type) {
-      var tagName = curState.tagName;
-      curState.tagName = curState.tagStart = null;
-      if (type == "selfcloseTag" ||
-          (type == "endTag" && Kludges.autoSelfClosers.hasOwnProperty(tagName.toLowerCase()))) {
-        maybePopContext(tagName.toLowerCase());
-        return cont();
-      }
-      if (type == "endTag") {
-        maybePopContext(tagName.toLowerCase());
-        pushContext(tagName, startOfLine);
-        return cont();
-      }
-      return cont();
-    };
-  }
-  function endclosetag(err) {
-    return function(type) {
-      if (err) setStyle = "error";
-      if (type == "endTag") { popContext(); return cont(); }
-      setStyle = "error";
-      return cont(arguments.callee);
-    };
-  }
-  function maybePopContext(nextTagName) {
-    var parentTagName;
-    while (true) {
-      if (!curState.context) {
-        return;
-      }
-      parentTagName = curState.context.tagName.toLowerCase();
-      if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
-          !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
-        return;
-      }
-      popContext();
-    }
-  }
-
-  function attributes(type) {
-    if (type == "word") {setStyle = "attribute"; return cont(attribute, attributes);}
-    if (type == "endTag" || type == "selfcloseTag") return pass();
-    setStyle = "error";
-    return cont(attributes);
-  }
-  function attribute(type) {
-    if (type == "equals") return cont(attvalue, attributes);
-    if (!Kludges.allowMissing) setStyle = "error";
-    else if (type == "word") {setStyle = "attribute"; return cont(attribute, attributes);}
-    return (type == "endTag" || type == "selfcloseTag") ? pass() : cont();
-  }
-  function attvalue(type) {
-    if (type == "string") return cont(attvaluemaybe);
-    if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return cont();}
-    setStyle = "error";
-    return (type == "endTag" || type == "selfCloseTag") ? pass() : cont();
-  }
-  function attvaluemaybe(type) {
-    if (type == "string") return cont(attvaluemaybe);
-    else return pass();
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: inText, cc: [], indented: 0, startOfLine: true, tagName: null, tagStart: null, context: null};
-    },
-
-    token: function(stream, state) {
-      if (!state.tagName && stream.sol()) {
-        state.startOfLine = true;
-        state.indented = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-
-      setStyle = type = tagName = null;
-      var style = state.tokenize(stream, state);
-      state.type = type;
-      if ((style || type) && style != "comment") {
-        curState = state; curStream = stream;
-        while (true) {
-          var comb = state.cc.pop() || element;
-          if (comb(type || style)) break;
-        }
-      }
-      state.startOfLine = false;
-      if (setStyle)
-        style = setStyle == "error" ? style + " error" : setStyle;
-      return style;
-    },
-
-    indent: function(state, textAfter, fullLine) {
-      var context = state.context;
-      // Indent multi-line strings (e.g. css).
-      if (state.tokenize.isInAttribute) {
-        return state.stringStartCol + 1;
-      }
-      if ((state.tokenize != inTag && state.tokenize != inText) ||
-          context && context.noIndent)
-        return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
-      // Indent the starts of attribute names.
-      if (state.tagName) {
-        if (multilineTagIndentPastTag)
-          return state.tagStart + state.tagName.length + 2;
-        else
-          return state.tagStart + indentUnit * multilineTagIndentFactor;
-      }
-      if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
-      if (context && /^<\//.test(textAfter))
-        context = context.prev;
-      while (context && !context.startOfLine)
-        context = context.prev;
-      if (context) return context.indent + indentUnit;
-      else return 0;
-    },
-
-    electricChars: "/",
-    blockCommentStart: "<!--",
-    blockCommentEnd: "-->",
-
-    configuration: parserConfig.htmlMode ? "html" : "xml",
-    helperType: parserConfig.htmlMode ? "html" : "xml"
-  };
-});
-
-CodeMirror.defineMIME("text/xml", "xml");
-CodeMirror.defineMIME("application/xml", "xml");
-if (!CodeMirror.mimeModes.hasOwnProperty("text/html"))
-  CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});
diff --git a/resources/libs/codemirror/mode/xquery/index.html b/resources/libs/codemirror/mode/xquery/index.html
deleted file mode 100644
index 3baf5e3e3..000000000
--- a/resources/libs/codemirror/mode/xquery/index.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: XQuery mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/xq-dark.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="xquery.js"></script>
-<style type="text/css">
-	.CodeMirror {
-	  border-top: 1px solid black; border-bottom: 1px solid black;
-	  height:400px;
-	}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">XQuery</a>
-  </ul>
-</div>
-
-<article>
-<h2>XQuery mode</h2>
- 
- 
-<div class="cm-s-default"> 
-	<textarea id="code" name="code"> 
-xquery version &quot;1.0-ml&quot;;
-(: this is
- : a 
-   "comment" :)
-let $let := &lt;x attr=&quot;value&quot;&gt;&quot;test&quot;&lt;func&gt;function() $var {function()} {$var}&lt;/func&gt;&lt;/x&gt;
-let $joe:=1
-return element element {
-	attribute attribute { 1 },
-	element test { &#39;a&#39; }, 
-	attribute foo { &quot;bar&quot; },
-	fn:doc()[ foo/@bar eq $let ],
-	//x }    
- 
-(: a more 'evil' test :)
-(: Modified Blakeley example (: with nested comment :) ... :)
-declare private function local:declare() {()};
-declare private function local:private() {()};
-declare private function local:function() {()};
-declare private function local:local() {()};
-let $let := &lt;let&gt;let $let := &quot;let&quot;&lt;/let&gt;
-return element element {
-	attribute attribute { try { xdmp:version() } catch($e) { xdmp:log($e) } },
-	attribute fn:doc { &quot;bar&quot; castable as xs:string },
-	element text { text { &quot;text&quot; } },
-	fn:doc()[ child::eq/(@bar | attribute::attribute) eq $let ],
-	//fn:doc
-}
-
-
-
-xquery version &quot;1.0-ml&quot;;
-
-(: Copyright 2006-2010 Mark Logic Corporation. :)
-
-(:
- : Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
- : you may not use this file except in compliance with the License.
- : You may obtain a copy of the License at
- :
- :     http://www.apache.org/licenses/LICENSE-2.0
- :
- : Unless required by applicable law or agreed to in writing, software
- : distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
- : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- : See the License for the specific language governing permissions and
- : limitations under the License.
- :)
-
-module namespace json = &quot;http://marklogic.com/json&quot;;
-declare default function namespace &quot;http://www.w3.org/2005/xpath-functions&quot;;
-
-(: Need to backslash escape any double quotes, backslashes, and newlines :)
-declare function json:escape($s as xs:string) as xs:string {
-  let $s := replace($s, &quot;\\&quot;, &quot;\\\\&quot;)
-  let $s := replace($s, &quot;&quot;&quot;&quot;, &quot;\\&quot;&quot;&quot;)
-  let $s := replace($s, codepoints-to-string((13, 10)), &quot;\\n&quot;)
-  let $s := replace($s, codepoints-to-string(13), &quot;\\n&quot;)
-  let $s := replace($s, codepoints-to-string(10), &quot;\\n&quot;)
-  return $s
-};
-
-declare function json:atomize($x as element()) as xs:string {
-  if (count($x/node()) = 0) then 'null'
-  else if ($x/@type = &quot;number&quot;) then
-    let $castable := $x castable as xs:float or
-                     $x castable as xs:double or
-                     $x castable as xs:decimal
-    return
-    if ($castable) then xs:string($x)
-    else error(concat(&quot;Not a number: &quot;, xdmp:describe($x)))
-  else if ($x/@type = &quot;boolean&quot;) then
-    let $castable := $x castable as xs:boolean
-    return
-    if ($castable) then xs:string(xs:boolean($x))
-    else error(concat(&quot;Not a boolean: &quot;, xdmp:describe($x)))
-  else concat('&quot;', json:escape($x), '&quot;')
-};
-
-(: Print the thing that comes after the colon :)
-declare function json:print-value($x as element()) as xs:string {
-  if (count($x/*) = 0) then
-    json:atomize($x)
-  else if ($x/@quote = &quot;true&quot;) then
-    concat('&quot;', json:escape(xdmp:quote($x/node())), '&quot;')
-  else
-    string-join(('{',
-      string-join(for $i in $x/* return json:print-name-value($i), &quot;,&quot;),
-    '}'), &quot;&quot;)
-};
-
-(: Print the name and value both :)
-declare function json:print-name-value($x as element()) as xs:string? {
-  let $name := name($x)
-  let $first-in-array :=
-    count($x/preceding-sibling::*[name(.) = $name]) = 0 and
-    (count($x/following-sibling::*[name(.) = $name]) &gt; 0 or $x/@array = &quot;true&quot;)
-  let $later-in-array := count($x/preceding-sibling::*[name(.) = $name]) &gt; 0
-  return
-
-  if ($later-in-array) then
-    ()  (: I was handled previously :)
-  else if ($first-in-array) then
-    string-join(('&quot;', json:escape($name), '&quot;:[',
-      string-join((for $i in ($x, $x/following-sibling::*[name(.) = $name]) return json:print-value($i)), &quot;,&quot;),
-    ']'), &quot;&quot;)
-   else
-     string-join(('&quot;', json:escape($name), '&quot;:', json:print-value($x)), &quot;&quot;)
-};
-
-(:~
-  Transforms an XML element into a JSON string representation.  See http://json.org.
-  &lt;p/&gt;
-  Sample usage:
-  &lt;pre&gt;
-    xquery version &quot;1.0-ml&quot;;
-    import module namespace json=&quot;http://marklogic.com/json&quot; at &quot;json.xqy&quot;;
-    json:serialize(&amp;lt;foo&amp;gt;&amp;lt;bar&amp;gt;kid&amp;lt;/bar&amp;gt;&amp;lt;/foo&amp;gt;)
-  &lt;/pre&gt;
-  Sample transformations:
-  &lt;pre&gt;
-  &amp;lt;e/&amp;gt; becomes {&quot;e&quot;:null}
-  &amp;lt;e&amp;gt;text&amp;lt;/e&amp;gt; becomes {&quot;e&quot;:&quot;text&quot;}
-  &amp;lt;e&amp;gt;quote &quot; escaping&amp;lt;/e&amp;gt; becomes {&quot;e&quot;:&quot;quote \&quot; escaping&quot;}
-  &amp;lt;e&amp;gt;backslash \ escaping&amp;lt;/e&amp;gt; becomes {&quot;e&quot;:&quot;backslash \\ escaping&quot;}
-  &amp;lt;e&amp;gt;&amp;lt;a&amp;gt;text1&amp;lt;/a&amp;gt;&amp;lt;b&amp;gt;text2&amp;lt;/b&amp;gt;&amp;lt;/e&amp;gt; becomes {&quot;e&quot;:{&quot;a&quot;:&quot;text1&quot;,&quot;b&quot;:&quot;text2&quot;}}
-  &amp;lt;e&amp;gt;&amp;lt;a&amp;gt;text1&amp;lt;/a&amp;gt;&amp;lt;a&amp;gt;text2&amp;lt;/a&amp;gt;&amp;lt;/e&amp;gt; becomes {&quot;e&quot;:{&quot;a&quot;:[&quot;text1&quot;,&quot;text2&quot;]}}
-  &amp;lt;e&amp;gt;&amp;lt;a array=&quot;true&quot;&amp;gt;text1&amp;lt;/a&amp;gt;&amp;lt;/e&amp;gt; becomes {&quot;e&quot;:{&quot;a&quot;:[&quot;text1&quot;]}}
-  &amp;lt;e&amp;gt;&amp;lt;a type=&quot;boolean&quot;&amp;gt;false&amp;lt;/a&amp;gt;&amp;lt;/e&amp;gt; becomes {&quot;e&quot;:{&quot;a&quot;:false}}
-  &amp;lt;e&amp;gt;&amp;lt;a type=&quot;number&quot;&amp;gt;123.5&amp;lt;/a&amp;gt;&amp;lt;/e&amp;gt; becomes {&quot;e&quot;:{&quot;a&quot;:123.5}}
-  &amp;lt;e quote=&quot;true&quot;&amp;gt;&amp;lt;div attrib=&quot;value&quot;/&amp;gt;&amp;lt;/e&amp;gt; becomes {&quot;e&quot;:&quot;&amp;lt;div attrib=\&quot;value\&quot;/&amp;gt;&quot;}
-  &lt;/pre&gt;
-  &lt;p/&gt;
-  Namespace URIs are ignored.  Namespace prefixes are included in the JSON name.
-  &lt;p/&gt;
-  Attributes are ignored, except for the special attribute @array=&quot;true&quot; that
-  indicates the JSON serialization should write the node, even if single, as an
-  array, and the attribute @type that can be set to &quot;boolean&quot; or &quot;number&quot; to
-  dictate the value should be written as that type (unquoted).  There's also
-  an @quote attribute that when set to true writes the inner content as text
-  rather than as structured JSON, useful for sending some XHTML over the
-  wire.
-  &lt;p/&gt;
-  Text nodes within mixed content are ignored.
-
-  @param $x Element node to convert
-  @return String holding JSON serialized representation of $x
-
-  @author Jason Hunter
-  @version 1.0.1
-  
-  Ported to xquery 1.0-ml; double escaped backslashes in json:escape
-:)
-declare function json:serialize($x as element())  as xs:string {
-  string-join(('{', json:print-name-value($x), '}'), &quot;&quot;)
-};
-  </textarea> 
-</div> 
- 
-    <script> 
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        theme: "xq-dark"
-      });
-    </script> 
- 
-    <p><strong>MIME types defined:</strong> <code>application/xquery</code>.</p> 
- 
-    <p>Development of the CodeMirror XQuery mode was sponsored by 
-      <a href="http://marklogic.com">MarkLogic</a> and developed by 
-      <a href="https://twitter.com/mbrevoort">Mike Brevoort</a>.
-    </p>
- 
-  </article>
diff --git a/resources/libs/codemirror/mode/xquery/test.js b/resources/libs/codemirror/mode/xquery/test.js
deleted file mode 100644
index 41719dd16..000000000
--- a/resources/libs/codemirror/mode/xquery/test.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// Don't take these too seriously -- the expected results appear to be
-// based on the results of actual runs without any serious manual
-// verification. If a change you made causes them to fail, the test is
-// as likely to wrong as the code.
-
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "xquery");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("eviltest",
-     "[keyword xquery] [keyword version] [variable &quot;1][keyword .][atom 0][keyword -][variable ml&quot;][def&variable ;]      [comment (: this is       : a          \"comment\" :)]",
-     "      [keyword let] [variable $let] [keyword :=] [variable &lt;x] [variable attr][keyword =][variable &quot;value&quot;&gt;&quot;test&quot;&lt;func&gt][def&variable ;function]() [variable $var] {[keyword function]()} {[variable $var]}[variable &lt;][keyword /][variable func&gt;&lt;][keyword /][variable x&gt;]",
-     "      [keyword let] [variable $joe][keyword :=][atom 1]",
-     "      [keyword return] [keyword element] [variable element] {",
-     "          [keyword attribute] [variable attribute] { [atom 1] },",
-     "          [keyword element] [variable test] { [variable &#39;a&#39;] },           [keyword attribute] [variable foo] { [variable &quot;bar&quot;] },",
-     "          [def&variable fn:doc]()[[ [variable foo][keyword /][variable @bar] [keyword eq] [variable $let] ]],",
-     "          [keyword //][variable x] }                 [comment (: a more 'evil' test :)]",
-     "      [comment (: Modified Blakeley example (: with nested comment :) ... :)]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:declare]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:private]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:function]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:local]() {()}[variable ;]",
-     "      [keyword let] [variable $let] [keyword :=] [variable &lt;let&gt;let] [variable $let] [keyword :=] [variable &quot;let&quot;&lt;][keyword /let][variable &gt;]",
-     "      [keyword return] [keyword element] [variable element] {",
-     "          [keyword attribute] [variable attribute] { [keyword try] { [def&variable xdmp:version]() } [keyword catch]([variable $e]) { [def&variable xdmp:log]([variable $e]) } },",
-     "          [keyword attribute] [variable fn:doc] { [variable &quot;bar&quot;] [variable castable] [keyword as] [atom xs:string] },",
-     "          [keyword element] [variable text] { [keyword text] { [variable &quot;text&quot;] } },",
-     "          [def&variable fn:doc]()[[ [qualifier child::][variable eq][keyword /]([variable @bar] [keyword |] [qualifier attribute::][variable attribute]) [keyword eq] [variable $let] ]],",
-     "          [keyword //][variable fn:doc]",
-     "      }");
-
-  MT("testEmptySequenceKeyword",
-     "[string \"foo\"] [keyword instance] [keyword of] [keyword empty-sequence]()");
-
-  MT("testMultiAttr",
-     "[tag <p ][attribute a1]=[string \"foo\"] [attribute a2]=[string \"bar\"][tag >][variable hello] [variable world][tag </p>]");
-
-  MT("test namespaced variable",
-     "[keyword declare] [keyword namespace] [variable e] [keyword =] [string \"http://example.com/ANamespace\"][variable ;declare] [keyword variable] [variable $e:exampleComThisVarIsNotRecognized] [keyword as] [keyword element]([keyword *]) [variable external;]");
-
-  MT("test EQName variable",
-     "[keyword declare] [keyword variable] [variable $\"http://www.example.com/ns/my\":var] [keyword :=] [atom 12][variable ;]",
-     "[tag <out>]{[variable $\"http://www.example.com/ns/my\":var]}[tag </out>]");
-
-  MT("test EQName function",
-     "[keyword declare] [keyword function] [def&variable \"http://www.example.com/ns/my\":fn] ([variable $a] [keyword as] [atom xs:integer]) [keyword as] [atom xs:integer] {",
-     "   [variable $a] [keyword +] [atom 2]",
-     "}[variable ;]",
-     "[tag <out>]{[def&variable \"http://www.example.com/ns/my\":fn]([atom 12])}[tag </out>]");
-
-  MT("test EQName function with single quotes",
-     "[keyword declare] [keyword function] [def&variable 'http://www.example.com/ns/my':fn] ([variable $a] [keyword as] [atom xs:integer]) [keyword as] [atom xs:integer] {",
-     "   [variable $a] [keyword +] [atom 2]",
-     "}[variable ;]",
-     "[tag <out>]{[def&variable 'http://www.example.com/ns/my':fn]([atom 12])}[tag </out>]");
-
-  MT("testProcessingInstructions",
-     "[def&variable data]([comment&meta <?target content?>]) [keyword instance] [keyword of] [atom xs:string]");
-
-  MT("testQuoteEscapeDouble",
-     "[keyword let] [variable $rootfolder] [keyword :=] [string \"c:\\builds\\winnt\\HEAD\\qa\\scripts\\\"]",
-     "[keyword let] [variable $keysfolder] [keyword :=] [def&variable concat]([variable $rootfolder], [string \"keys\\\"])");
-})();
diff --git a/resources/libs/codemirror/mode/xquery/xquery.js b/resources/libs/codemirror/mode/xquery/xquery.js
deleted file mode 100644
index be1798463..000000000
--- a/resources/libs/codemirror/mode/xquery/xquery.js
+++ /dev/null
@@ -1,432 +0,0 @@
-CodeMirror.defineMode("xquery", function() {
-
-  // The keywords object is set to the result of this self executing
-  // function. Each keyword is a property of the keywords object whose
-  // value is {type: atype, style: astyle}
-  var keywords = function(){
-    // conveinence functions used to build keywords object
-    function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a")
-      , B = kw("keyword b")
-      , C = kw("keyword c")
-      , operator = kw("operator")
-      , atom = {type: "atom", style: "atom"}
-      , punctuation = {type: "punctuation", style: null}
-      , qualifier = {type: "axis_specifier", style: "qualifier"};
-
-    // kwObj is what is return from this function at the end
-    var kwObj = {
-      'if': A, 'switch': A, 'while': A, 'for': A,
-      'else': B, 'then': B, 'try': B, 'finally': B, 'catch': B,
-      'element': C, 'attribute': C, 'let': C, 'implements': C, 'import': C, 'module': C, 'namespace': C,
-      'return': C, 'super': C, 'this': C, 'throws': C, 'where': C, 'private': C,
-      ',': punctuation,
-      'null': atom, 'fn:false()': atom, 'fn:true()': atom
-    };
-
-    // a list of 'basic' keywords. For each add a property to kwObj with the value of
-    // {type: basic[i], style: "keyword"} e.g. 'after' --> {type: "after", style: "keyword"}
-    var basic = ['after','ancestor','ancestor-or-self','and','as','ascending','assert','attribute','before',
-    'by','case','cast','child','comment','declare','default','define','descendant','descendant-or-self',
-    'descending','document','document-node','element','else','eq','every','except','external','following',
-    'following-sibling','follows','for','function','if','import','in','instance','intersect','item',
-    'let','module','namespace','node','node','of','only','or','order','parent','precedes','preceding',
-    'preceding-sibling','processing-instruction','ref','return','returns','satisfies','schema','schema-element',
-    'self','some','sortby','stable','text','then','to','treat','typeswitch','union','variable','version','where',
-    'xquery', 'empty-sequence'];
-    for(var i=0, l=basic.length; i < l; i++) { kwObj[basic[i]] = kw(basic[i]);};
-
-    // a list of types. For each add a property to kwObj with the value of
-    // {type: "atom", style: "atom"}
-    var types = ['xs:string', 'xs:float', 'xs:decimal', 'xs:double', 'xs:integer', 'xs:boolean', 'xs:date', 'xs:dateTime',
-    'xs:time', 'xs:duration', 'xs:dayTimeDuration', 'xs:time', 'xs:yearMonthDuration', 'numeric', 'xs:hexBinary',
-    'xs:base64Binary', 'xs:anyURI', 'xs:QName', 'xs:byte','xs:boolean','xs:anyURI','xf:yearMonthDuration'];
-    for(var i=0, l=types.length; i < l; i++) { kwObj[types[i]] = atom;};
-
-    // each operator will add a property to kwObj with value of {type: "operator", style: "keyword"}
-    var operators = ['eq', 'ne', 'lt', 'le', 'gt', 'ge', ':=', '=', '>', '>=', '<', '<=', '.', '|', '?', 'and', 'or', 'div', 'idiv', 'mod', '*', '/', '+', '-'];
-    for(var i=0, l=operators.length; i < l; i++) { kwObj[operators[i]] = operator;};
-
-    // each axis_specifiers will add a property to kwObj with value of {type: "axis_specifier", style: "qualifier"}
-    var axis_specifiers = ["self::", "attribute::", "child::", "descendant::", "descendant-or-self::", "parent::",
-    "ancestor::", "ancestor-or-self::", "following::", "preceding::", "following-sibling::", "preceding-sibling::"];
-    for(var i=0, l=axis_specifiers.length; i < l; i++) { kwObj[axis_specifiers[i]] = qualifier; };
-
-    return kwObj;
-  }();
-
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-
-  function ret(tp, style, cont) {
-    type = tp; content = cont;
-    return style;
-  }
-
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-
-  // the primary mode tokenizer
-  function tokenBase(stream, state) {
-    var ch = stream.next(),
-        mightBeFunction = false,
-        isEQName = isEQNameAhead(stream);
-
-    // an XML tag (if not in some sub, chained tokenizer)
-    if (ch == "<") {
-      if(stream.match("!--", true))
-        return chain(stream, state, tokenXMLComment);
-
-      if(stream.match("![CDATA", false)) {
-        state.tokenize = tokenCDATA;
-        return ret("tag", "tag");
-      }
-
-      if(stream.match("?", false)) {
-        return chain(stream, state, tokenPreProcessing);
-      }
-
-      var isclose = stream.eat("/");
-      stream.eatSpace();
-      var tagName = "", c;
-      while ((c = stream.eat(/[^\s\u00a0=<>\"\'\/?]/))) tagName += c;
-
-      return chain(stream, state, tokenTag(tagName, isclose));
-    }
-    // start code block
-    else if(ch == "{") {
-      pushStateStack(state,{ type: "codeblock"});
-      return ret("", null);
-    }
-    // end code block
-    else if(ch == "}") {
-      popStateStack(state);
-      return ret("", null);
-    }
-    // if we're in an XML block
-    else if(isInXmlBlock(state)) {
-      if(ch == ">")
-        return ret("tag", "tag");
-      else if(ch == "/" && stream.eat(">")) {
-        popStateStack(state);
-        return ret("tag", "tag");
-      }
-      else
-        return ret("word", "variable");
-    }
-    // if a number
-    else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:\.\d*)?(?:E[+\-]?\d+)?/);
-      return ret("number", "atom");
-    }
-    // comment start
-    else if (ch === "(" && stream.eat(":")) {
-      pushStateStack(state, { type: "comment"});
-      return chain(stream, state, tokenComment);
-    }
-    // quoted string
-    else if (  !isEQName && (ch === '"' || ch === "'"))
-      return chain(stream, state, tokenString(ch));
-    // variable
-    else if(ch === "$") {
-      return chain(stream, state, tokenVariable);
-    }
-    // assignment
-    else if(ch ===":" && stream.eat("=")) {
-      return ret("operator", "keyword");
-    }
-    // open paren
-    else if(ch === "(") {
-      pushStateStack(state, { type: "paren"});
-      return ret("", null);
-    }
-    // close paren
-    else if(ch === ")") {
-      popStateStack(state);
-      return ret("", null);
-    }
-    // open paren
-    else if(ch === "[") {
-      pushStateStack(state, { type: "bracket"});
-      return ret("", null);
-    }
-    // close paren
-    else if(ch === "]") {
-      popStateStack(state);
-      return ret("", null);
-    }
-    else {
-      var known = keywords.propertyIsEnumerable(ch) && keywords[ch];
-
-      // if there's a EQName ahead, consume the rest of the string portion, it's likely a function
-      if(isEQName && ch === '\"') while(stream.next() !== '"'){}
-      if(isEQName && ch === '\'') while(stream.next() !== '\''){}
-
-      // gobble up a word if the character is not known
-      if(!known) stream.eatWhile(/[\w\$_-]/);
-
-      // gobble a colon in the case that is a lib func type call fn:doc
-      var foundColon = stream.eat(":");
-
-      // if there's not a second colon, gobble another word. Otherwise, it's probably an axis specifier
-      // which should get matched as a keyword
-      if(!stream.eat(":") && foundColon) {
-        stream.eatWhile(/[\w\$_-]/);
-      }
-      // if the next non whitespace character is an open paren, this is probably a function (if not a keyword of other sort)
-      if(stream.match(/^[ \t]*\(/, false)) {
-        mightBeFunction = true;
-      }
-      // is the word a keyword?
-      var word = stream.current();
-      known = keywords.propertyIsEnumerable(word) && keywords[word];
-
-      // if we think it's a function call but not yet known,
-      // set style to variable for now for lack of something better
-      if(mightBeFunction && !known) known = {type: "function_call", style: "variable def"};
-
-      // if the previous word was element, attribute, axis specifier, this word should be the name of that
-      if(isInXmlConstructor(state)) {
-        popStateStack(state);
-        return ret("word", "variable", word);
-      }
-      // as previously checked, if the word is element,attribute, axis specifier, call it an "xmlconstructor" and
-      // push the stack so we know to look for it on the next word
-      if(word == "element" || word == "attribute" || known.type == "axis_specifier") pushStateStack(state, {type: "xmlconstructor"});
-
-      // if the word is known, return the details of that else just call this a generic 'word'
-      return known ? ret(known.type, known.style, word) :
-                     ret("word", "variable", word);
-    }
-  }
-
-  // handle comments, including nested
-  function tokenComment(stream, state) {
-    var maybeEnd = false, maybeNested = false, nestedCount = 0, ch;
-    while (ch = stream.next()) {
-      if (ch == ")" && maybeEnd) {
-        if(nestedCount > 0)
-          nestedCount--;
-        else {
-          popStateStack(state);
-          break;
-        }
-      }
-      else if(ch == ":" && maybeNested) {
-        nestedCount++;
-      }
-      maybeEnd = (ch == ":");
-      maybeNested = (ch == "(");
-    }
-
-    return ret("comment", "comment");
-  }
-
-  // tokenizer for string literals
-  // optionally pass a tokenizer function to set state.tokenize back to when finished
-  function tokenString(quote, f) {
-    return function(stream, state) {
-      var ch;
-
-      if(isInString(state) && stream.current() == quote) {
-        popStateStack(state);
-        if(f) state.tokenize = f;
-        return ret("string", "string");
-      }
-
-      pushStateStack(state, { type: "string", name: quote, tokenize: tokenString(quote, f) });
-
-      // if we're in a string and in an XML block, allow an embedded code block
-      if(stream.match("{", false) && isInXmlAttributeBlock(state)) {
-        state.tokenize = tokenBase;
-        return ret("string", "string");
-      }
-
-
-      while (ch = stream.next()) {
-        if (ch ==  quote) {
-          popStateStack(state);
-          if(f) state.tokenize = f;
-          break;
-        }
-        else {
-          // if we're in a string and in an XML block, allow an embedded code block in an attribute
-          if(stream.match("{", false) && isInXmlAttributeBlock(state)) {
-            state.tokenize = tokenBase;
-            return ret("string", "string");
-          }
-
-        }
-      }
-
-      return ret("string", "string");
-    };
-  }
-
-  // tokenizer for variables
-  function tokenVariable(stream, state) {
-    var isVariableChar = /[\w\$_-]/;
-
-    // a variable may start with a quoted EQName so if the next character is quote, consume to the next quote
-    if(stream.eat("\"")) {
-      while(stream.next() !== '\"'){};
-      stream.eat(":");
-    } else {
-      stream.eatWhile(isVariableChar);
-      if(!stream.match(":=", false)) stream.eat(":");
-    }
-    stream.eatWhile(isVariableChar);
-    state.tokenize = tokenBase;
-    return ret("variable", "variable");
-  }
-
-  // tokenizer for XML tags
-  function tokenTag(name, isclose) {
-    return function(stream, state) {
-      stream.eatSpace();
-      if(isclose && stream.eat(">")) {
-        popStateStack(state);
-        state.tokenize = tokenBase;
-        return ret("tag", "tag");
-      }
-      // self closing tag without attributes?
-      if(!stream.eat("/"))
-        pushStateStack(state, { type: "tag", name: name, tokenize: tokenBase});
-      if(!stream.eat(">")) {
-        state.tokenize = tokenAttribute;
-        return ret("tag", "tag");
-      }
-      else {
-        state.tokenize = tokenBase;
-      }
-      return ret("tag", "tag");
-    };
-  }
-
-  // tokenizer for XML attributes
-  function tokenAttribute(stream, state) {
-    var ch = stream.next();
-
-    if(ch == "/" && stream.eat(">")) {
-      if(isInXmlAttributeBlock(state)) popStateStack(state);
-      if(isInXmlBlock(state)) popStateStack(state);
-      return ret("tag", "tag");
-    }
-    if(ch == ">") {
-      if(isInXmlAttributeBlock(state)) popStateStack(state);
-      return ret("tag", "tag");
-    }
-    if(ch == "=")
-      return ret("", null);
-    // quoted string
-    if (ch == '"' || ch == "'")
-      return chain(stream, state, tokenString(ch, tokenAttribute));
-
-    if(!isInXmlAttributeBlock(state))
-      pushStateStack(state, { type: "attribute", tokenize: tokenAttribute});
-
-    stream.eat(/[a-zA-Z_:]/);
-    stream.eatWhile(/[-a-zA-Z0-9_:.]/);
-    stream.eatSpace();
-
-    // the case where the attribute has not value and the tag was closed
-    if(stream.match(">", false) || stream.match("/", false)) {
-      popStateStack(state);
-      state.tokenize = tokenBase;
-    }
-
-    return ret("attribute", "attribute");
-  }
-
-  // handle comments, including nested
-  function tokenXMLComment(stream, state) {
-    var ch;
-    while (ch = stream.next()) {
-      if (ch == "-" && stream.match("->", true)) {
-        state.tokenize = tokenBase;
-        return ret("comment", "comment");
-      }
-    }
-  }
-
-
-  // handle CDATA
-  function tokenCDATA(stream, state) {
-    var ch;
-    while (ch = stream.next()) {
-      if (ch == "]" && stream.match("]", true)) {
-        state.tokenize = tokenBase;
-        return ret("comment", "comment");
-      }
-    }
-  }
-
-  // handle preprocessing instructions
-  function tokenPreProcessing(stream, state) {
-    var ch;
-    while (ch = stream.next()) {
-      if (ch == "?" && stream.match(">", true)) {
-        state.tokenize = tokenBase;
-        return ret("comment", "comment meta");
-      }
-    }
-  }
-
-
-  // functions to test the current context of the state
-  function isInXmlBlock(state) { return isIn(state, "tag"); }
-  function isInXmlAttributeBlock(state) { return isIn(state, "attribute"); }
-  function isInXmlConstructor(state) { return isIn(state, "xmlconstructor"); }
-  function isInString(state) { return isIn(state, "string"); }
-
-  function isEQNameAhead(stream) {
-    // assume we've already eaten a quote (")
-    if(stream.current() === '"')
-      return stream.match(/^[^\"]+\"\:/, false);
-    else if(stream.current() === '\'')
-      return stream.match(/^[^\"]+\'\:/, false);
-    else
-      return false;
-  }
-
-  function isIn(state, type) {
-    return (state.stack.length && state.stack[state.stack.length - 1].type == type);
-  }
-
-  function pushStateStack(state, newState) {
-    state.stack.push(newState);
-  }
-
-  function popStateStack(state) {
-    state.stack.pop();
-    var reinstateTokenize = state.stack.length && state.stack[state.stack.length-1].tokenize;
-    state.tokenize = reinstateTokenize || tokenBase;
-  }
-
-  // the interface for the mode API
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        cc: [],
-        stack: []
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      return style;
-    },
-
-    blockCommentStart: "(:",
-    blockCommentEnd: ":)"
-
-  };
-
-});
-
-CodeMirror.defineMIME("application/xquery", "xquery");
diff --git a/resources/libs/codemirror/mode/yaml/index.html b/resources/libs/codemirror/mode/yaml/index.html
deleted file mode 100644
index bbb40a3c7..000000000
--- a/resources/libs/codemirror/mode/yaml/index.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: YAML mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="yaml.js"></script>
-<style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">YAML</a>
-  </ul>
-</div>
-
-<article>
-<h2>YAML mode</h2>
-<form><textarea id="code" name="code">
---- # Favorite movies
-- Casablanca
-- North by Northwest
-- The Man Who Wasn't There
---- # Shopping list
-[milk, pumpkin pie, eggs, juice]
---- # Indented Blocks, common in YAML data files, use indentation and new lines to separate the key: value pairs
-  name: John Smith
-  age: 33
---- # Inline Blocks, common in YAML data streams, use commas to separate the key: value pairs between braces
-{name: John Smith, age: 33}
----
-receipt:     Oz-Ware Purchase Invoice
-date:        2007-08-06
-customer:
-    given:   Dorothy
-    family:  Gale
-
-items:
-    - part_no:   A4786
-      descrip:   Water Bucket (Filled)
-      price:     1.47
-      quantity:  4
-
-    - part_no:   E1628
-      descrip:   High Heeled "Ruby" Slippers
-      size:       8
-      price:     100.27
-      quantity:  1
-
-bill-to:  &id001
-    street: |
-            123 Tornado Alley
-            Suite 16
-    city:   East Centerville
-    state:  KS
-
-ship-to:  *id001
-
-specialDelivery:  >
-    Follow the Yellow Brick
-    Road to the Emerald City.
-    Pay no attention to the
-    man behind the curtain.
-...
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-yaml</code>.</p>
-
-  </article>
diff --git a/resources/libs/codemirror/mode/yaml/yaml.js b/resources/libs/codemirror/mode/yaml/yaml.js
deleted file mode 100644
index efacd7d56..000000000
--- a/resources/libs/codemirror/mode/yaml/yaml.js
+++ /dev/null
@@ -1,97 +0,0 @@
-CodeMirror.defineMode("yaml", function() {
-
-  var cons = ['true', 'false', 'on', 'off', 'yes', 'no'];
-  var keywordRegex = new RegExp("\\b(("+cons.join(")|(")+"))$", 'i');
-
-  return {
-    token: function(stream, state) {
-      var ch = stream.peek();
-      var esc = state.escaped;
-      state.escaped = false;
-      /* comments */
-      if (ch == "#" && (stream.pos == 0 || /\s/.test(stream.string.charAt(stream.pos - 1)))) {
-        stream.skipToEnd(); return "comment";
-      }
-      if (state.literal && stream.indentation() > state.keyCol) {
-        stream.skipToEnd(); return "string";
-      } else if (state.literal) { state.literal = false; }
-      if (stream.sol()) {
-        state.keyCol = 0;
-        state.pair = false;
-        state.pairStart = false;
-        /* document start */
-        if(stream.match(/---/)) { return "def"; }
-        /* document end */
-        if (stream.match(/\.\.\./)) { return "def"; }
-        /* array list item */
-        if (stream.match(/\s*-\s+/)) { return 'meta'; }
-      }
-      /* inline pairs/lists */
-      if (stream.match(/^(\{|\}|\[|\])/)) {
-        if (ch == '{')
-          state.inlinePairs++;
-        else if (ch == '}')
-          state.inlinePairs--;
-        else if (ch == '[')
-          state.inlineList++;
-        else
-          state.inlineList--;
-        return 'meta';
-      }
-
-      /* list seperator */
-      if (state.inlineList > 0 && !esc && ch == ',') {
-        stream.next();
-        return 'meta';
-      }
-      /* pairs seperator */
-      if (state.inlinePairs > 0 && !esc && ch == ',') {
-        state.keyCol = 0;
-        state.pair = false;
-        state.pairStart = false;
-        stream.next();
-        return 'meta';
-      }
-
-      /* start of value of a pair */
-      if (state.pairStart) {
-        /* block literals */
-        if (stream.match(/^\s*(\||\>)\s*/)) { state.literal = true; return 'meta'; };
-        /* references */
-        if (stream.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i)) { return 'variable-2'; }
-        /* numbers */
-        if (state.inlinePairs == 0 && stream.match(/^\s*-?[0-9\.\,]+\s?$/)) { return 'number'; }
-        if (state.inlinePairs > 0 && stream.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/)) { return 'number'; }
-        /* keywords */
-        if (stream.match(keywordRegex)) { return 'keyword'; }
-      }
-
-      /* pairs (associative arrays) -> key */
-      if (!state.pair && stream.match(/^\s*\S+(?=\s*:($|\s))/i)) {
-        state.pair = true;
-        state.keyCol = stream.indentation();
-        return "atom";
-      }
-      if (state.pair && stream.match(/^:\s*/)) { state.pairStart = true; return 'meta'; }
-
-      /* nothing found, continue */
-      state.pairStart = false;
-      state.escaped = (ch == '\\');
-      stream.next();
-      return null;
-    },
-    startState: function() {
-      return {
-        pair: false,
-        pairStart: false,
-        keyCol: 0,
-        inlinePairs: 0,
-        inlineList: 0,
-        literal: false,
-        escaped: false
-      };
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-yaml", "yaml");
diff --git a/resources/libs/codemirror/mode/z80/index.html b/resources/libs/codemirror/mode/z80/index.html
deleted file mode 100644
index b63c9621a..000000000
--- a/resources/libs/codemirror/mode/z80/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Z80 assembly mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="z80.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Z80 assembly</a>
-  </ul>
-</div>
-
-<article>
-<h2>Z80 assembly mode</h2>
-
-
-<div><textarea id="code" name="code">
-#include    "ti83plus.inc"
-#define     progStart   $9D95
-.org        progStart-2
-.db         $BB,$6D
-    bcall(_ClrLCDFull)
-    ld  HL, 0
-    ld  (PenCol),   HL
-    ld  HL, Message
-    bcall(_PutS) ; Displays the string
-    bcall(_NewLine)
-    ret
-Message:
-.db         "Hello world!",0
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true
-      });
-    </script>
-
-    <p><strong>MIME type defined:</strong> <code>text/x-z80</code>.</p>
-  </article>
diff --git a/resources/libs/codemirror/mode/z80/z80.js b/resources/libs/codemirror/mode/z80/z80.js
deleted file mode 100644
index ff43d32b5..000000000
--- a/resources/libs/codemirror/mode/z80/z80.js
+++ /dev/null
@@ -1,85 +0,0 @@
-CodeMirror.defineMode('z80', function() {
-  var keywords1 = /^(exx?|(ld|cp|in)([di]r?)?|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|rst|[de]i|halt|im|ot[di]r|out[di]?)\b/i;
-  var keywords2 = /^(call|j[pr]|ret[in]?)\b/i;
-  var keywords3 = /^b_?(call|jump)\b/i;
-  var variables1 = /^(af?|bc?|c|de?|e|hl?|l|i[xy]?|r|sp)\b/i;
-  var variables2 = /^(n?[zc]|p[oe]?|m)\b/i;
-  var errors = /^([hl][xy]|i[xy][hl]|slia|sll)\b/i;
-  var numbers = /^([\da-f]+h|[0-7]+o|[01]+b|\d+)\b/i;
-
-  return {
-    startState: function() {
-      return {context: 0};
-    },
-    token: function(stream, state) {
-      if (!stream.column())
-        state.context = 0;
-
-      if (stream.eatSpace())
-        return null;
-
-      var w;
-
-      if (stream.eatWhile(/\w/)) {
-        w = stream.current();
-
-        if (stream.indentation()) {
-          if (state.context == 1 && variables1.test(w))
-            return 'variable-2';
-
-          if (state.context == 2 && variables2.test(w))
-            return 'variable-3';
-
-          if (keywords1.test(w)) {
-            state.context = 1;
-            return 'keyword';
-          } else if (keywords2.test(w)) {
-            state.context = 2;
-            return 'keyword';
-          } else if (keywords3.test(w)) {
-            state.context = 3;
-            return 'keyword';
-          }
-
-          if (errors.test(w))
-            return 'error';
-        } else if (numbers.test(w)) {
-          return 'number';
-        } else {
-          return null;
-        }
-      } else if (stream.eat(';')) {
-        stream.skipToEnd();
-        return 'comment';
-      } else if (stream.eat('"')) {
-        while (w = stream.next()) {
-          if (w == '"')
-            break;
-
-          if (w == '\\')
-            stream.next();
-        }
-        return 'string';
-      } else if (stream.eat('\'')) {
-        if (stream.match(/\\?.'/))
-          return 'number';
-      } else if (stream.eat('.') || stream.sol() && stream.eat('#')) {
-        state.context = 4;
-
-        if (stream.eatWhile(/\w/))
-          return 'def';
-      } else if (stream.eat('$')) {
-        if (stream.eatWhile(/[\da-f]/i))
-          return 'number';
-      } else if (stream.eat('%')) {
-        if (stream.eatWhile(/[01]/))
-          return 'number';
-      } else {
-        stream.next();
-      }
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-z80", "z80");
diff --git a/resources/libs/codemirror/theme/3024-day.css b/resources/libs/codemirror/theme/3024-day.css
deleted file mode 100644
index cbb9a4fa4..000000000
--- a/resources/libs/codemirror/theme/3024-day.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-    Name:       3024 day
-    Author:     Jan T. Sott (http://github.com/idleberg)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-day.CodeMirror {background: #f7f7f7; color: #3a3432;}
-.cm-s-3024-day div.CodeMirror-selected {background: #d6d5d4 !important;}
-.cm-s-3024-day .CodeMirror-gutters {background: #f7f7f7; border-right: 0px;}
-.cm-s-3024-day .CodeMirror-linenumber {color: #807d7c;}
-.cm-s-3024-day .CodeMirror-cursor {border-left: 1px solid #5c5855 !important;}
-
-.cm-s-3024-day span.cm-comment {color: #cdab53;}
-.cm-s-3024-day span.cm-atom {color: #a16a94;}
-.cm-s-3024-day span.cm-number {color: #a16a94;}
-
-.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute {color: #01a252;}
-.cm-s-3024-day span.cm-keyword {color: #db2d20;}
-.cm-s-3024-day span.cm-string {color: #fded02;}
-
-.cm-s-3024-day span.cm-variable {color: #01a252;}
-.cm-s-3024-day span.cm-variable-2 {color: #01a0e4;}
-.cm-s-3024-day span.cm-def {color: #e8bbd0;}
-.cm-s-3024-day span.cm-bracket {color: #3a3432;}
-.cm-s-3024-day span.cm-tag {color: #db2d20;}
-.cm-s-3024-day span.cm-link {color: #a16a94;}
-.cm-s-3024-day span.cm-error {background: #db2d20; color: #5c5855;}
-
-.cm-s-3024-day .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/resources/libs/codemirror/theme/3024-night.css b/resources/libs/codemirror/theme/3024-night.css
deleted file mode 100644
index 2c62e221b..000000000
--- a/resources/libs/codemirror/theme/3024-night.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-    Name:       3024 night
-    Author:     Jan T. Sott (http://github.com/idleberg)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-night.CodeMirror {background: #090300; color: #d6d5d4;}
-.cm-s-3024-night div.CodeMirror-selected {background: #3a3432 !important;}
-.cm-s-3024-night .CodeMirror-gutters {background: #090300; border-right: 0px;}
-.cm-s-3024-night .CodeMirror-linenumber {color: #5c5855;}
-.cm-s-3024-night .CodeMirror-cursor {border-left: 1px solid #807d7c !important;}
-
-.cm-s-3024-night span.cm-comment {color: #cdab53;}
-.cm-s-3024-night span.cm-atom {color: #a16a94;}
-.cm-s-3024-night span.cm-number {color: #a16a94;}
-
-.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute {color: #01a252;}
-.cm-s-3024-night span.cm-keyword {color: #db2d20;}
-.cm-s-3024-night span.cm-string {color: #fded02;}
-
-.cm-s-3024-night span.cm-variable {color: #01a252;}
-.cm-s-3024-night span.cm-variable-2 {color: #01a0e4;}
-.cm-s-3024-night span.cm-def {color: #e8bbd0;}
-.cm-s-3024-night span.cm-bracket {color: #d6d5d4;}
-.cm-s-3024-night span.cm-tag {color: #db2d20;}
-.cm-s-3024-night span.cm-link {color: #a16a94;}
-.cm-s-3024-night span.cm-error {background: #db2d20; color: #807d7c;}
-
-.cm-s-3024-night .CodeMirror-activeline-background {background: #2F2F2F !important;}
-.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/resources/libs/codemirror/theme/ambiance-mobile.css b/resources/libs/codemirror/theme/ambiance-mobile.css
deleted file mode 100644
index 88d332e1a..000000000
--- a/resources/libs/codemirror/theme/ambiance-mobile.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.cm-s-ambiance.CodeMirror {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
diff --git a/resources/libs/codemirror/theme/ambiance.css b/resources/libs/codemirror/theme/ambiance.css
deleted file mode 100644
index 3a54b2a02..000000000
--- a/resources/libs/codemirror/theme/ambiance.css
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ambiance theme for codemirror */
-
-/* Color scheme */
-
-.cm-s-ambiance .cm-keyword { color: #cda869; }
-.cm-s-ambiance .cm-atom { color: #CF7EA9; }
-.cm-s-ambiance .cm-number { color: #78CF8A; }
-.cm-s-ambiance .cm-def { color: #aac6e3; }
-.cm-s-ambiance .cm-variable { color: #ffb795; }
-.cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
-.cm-s-ambiance .cm-variable-3 { color: #faded3; }
-.cm-s-ambiance .cm-property { color: #eed1b3; }
-.cm-s-ambiance .cm-operator {color: #fa8d6a;}
-.cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
-.cm-s-ambiance .cm-string { color: #8f9d6a; }
-.cm-s-ambiance .cm-string-2 { color: #9d937c; }
-.cm-s-ambiance .cm-meta { color: #D2A8A1; }
-.cm-s-ambiance .cm-qualifier { color: yellow; }
-.cm-s-ambiance .cm-builtin { color: #9999cc; }
-.cm-s-ambiance .cm-bracket { color: #24C2C7; }
-.cm-s-ambiance .cm-tag { color: #fee4ff }
-.cm-s-ambiance .cm-attribute {  color: #9B859D; }
-.cm-s-ambiance .cm-header {color: blue;}
-.cm-s-ambiance .cm-quote { color: #24C2C7; }
-.cm-s-ambiance .cm-hr { color: pink; }
-.cm-s-ambiance .cm-link { color: #F4C20B; }
-.cm-s-ambiance .cm-special { color: #FF9D00; }
-.cm-s-ambiance .cm-error { color: #AF2018; }
-
-.cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
-.cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
-
-.cm-s-ambiance .CodeMirror-selected {
-  background: rgba(255, 255, 255, 0.15);
-}
-.cm-s-ambiance.CodeMirror-focused .CodeMirror-selected {
-  background: rgba(255, 255, 255, 0.10);
-}
-
-/* Editor styling */
-
-.cm-s-ambiance.CodeMirror {
-  line-height: 1.40em;
-  font-family: Monaco, Menlo,"Andale Mono","lucida console","Courier New",monospace !important;
-  color: #E6E1DC;
-  background-color: #202020;
-  -webkit-box-shadow: inset 0 0 10px black;
-  -moz-box-shadow: inset 0 0 10px black;
-  box-shadow: inset 0 0 10px black;
-}
-
-.cm-s-ambiance .CodeMirror-gutters {
-  background: #3D3D3D;
-  border-right: 1px solid #4D4D4D;
-  box-shadow: 0 10px 20px black;
-}
-
-.cm-s-ambiance .CodeMirror-linenumber {
-  text-shadow: 0px 1px 1px #4d4d4d;
-  color: #222;
-  padding: 0 5px;
-}
-
-.cm-s-ambiance .CodeMirror-lines .CodeMirror-cursor {
-  border-left: 1px solid #7991E8;
-}
-
-.cm-s-ambiance .CodeMirror-activeline-background {
-  background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
-}
-
-.cm-s-ambiance.CodeMirror,
-.cm-s-ambiance .CodeMirror-gutters {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
-}
diff --git a/resources/libs/codemirror/theme/base16-dark.css b/resources/libs/codemirror/theme/base16-dark.css
deleted file mode 100644
index 3b7b21c7a..000000000
--- a/resources/libs/codemirror/theme/base16-dark.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-    Name:       Base16 Default Dark
-    Author:     Chris Kempson (http://chriskempson.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-chrome-devtools)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-dark.CodeMirror {background: #151515; color: #e0e0e0;}
-.cm-s-base16-dark div.CodeMirror-selected {background: #202020 !important;}
-.cm-s-base16-dark .CodeMirror-gutters {background: #151515; border-right: 0px;}
-.cm-s-base16-dark .CodeMirror-linenumber {color: #505050;}
-.cm-s-base16-dark .CodeMirror-cursor {border-left: 1px solid #b0b0b0 !important;}
-
-.cm-s-base16-dark span.cm-comment {color: #8f5536;}
-.cm-s-base16-dark span.cm-atom {color: #aa759f;}
-.cm-s-base16-dark span.cm-number {color: #aa759f;}
-
-.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute {color: #90a959;}
-.cm-s-base16-dark span.cm-keyword {color: #ac4142;}
-.cm-s-base16-dark span.cm-string {color: #f4bf75;}
-
-.cm-s-base16-dark span.cm-variable {color: #90a959;}
-.cm-s-base16-dark span.cm-variable-2 {color: #6a9fb5;}
-.cm-s-base16-dark span.cm-def {color: #d28445;}
-.cm-s-base16-dark span.cm-bracket {color: #e0e0e0;}
-.cm-s-base16-dark span.cm-tag {color: #ac4142;}
-.cm-s-base16-dark span.cm-link {color: #aa759f;}
-.cm-s-base16-dark span.cm-error {background: #ac4142; color: #b0b0b0;}
-
-.cm-s-base16-dark .CodeMirror-activeline-background {background: #2F2F2F !important;}
-.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/resources/libs/codemirror/theme/base16-light.css b/resources/libs/codemirror/theme/base16-light.css
deleted file mode 100644
index 5aa4b5389..000000000
--- a/resources/libs/codemirror/theme/base16-light.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-    Name:       Base16 Default Light
-    Author:     Chris Kempson (http://chriskempson.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-chrome-devtools)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-light.CodeMirror {background: #f5f5f5; color: #202020;}
-.cm-s-base16-light div.CodeMirror-selected {background: #e0e0e0 !important;}
-.cm-s-base16-light .CodeMirror-gutters {background: #f5f5f5; border-right: 0px;}
-.cm-s-base16-light .CodeMirror-linenumber {color: #b0b0b0;}
-.cm-s-base16-light .CodeMirror-cursor {border-left: 1px solid #505050 !important;}
-
-.cm-s-base16-light span.cm-comment {color: #8f5536;}
-.cm-s-base16-light span.cm-atom {color: #aa759f;}
-.cm-s-base16-light span.cm-number {color: #aa759f;}
-
-.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute {color: #90a959;}
-.cm-s-base16-light span.cm-keyword {color: #ac4142;}
-.cm-s-base16-light span.cm-string {color: #f4bf75;}
-
-.cm-s-base16-light span.cm-variable {color: #90a959;}
-.cm-s-base16-light span.cm-variable-2 {color: #6a9fb5;}
-.cm-s-base16-light span.cm-def {color: #d28445;}
-.cm-s-base16-light span.cm-bracket {color: #202020;}
-.cm-s-base16-light span.cm-tag {color: #ac4142;}
-.cm-s-base16-light span.cm-link {color: #aa759f;}
-.cm-s-base16-light span.cm-error {background: #ac4142; color: #505050;}
-
-.cm-s-base16-light .CodeMirror-activeline-background {background: #DDDCDC !important;}
-.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/resources/libs/codemirror/theme/blackboard.css b/resources/libs/codemirror/theme/blackboard.css
deleted file mode 100644
index 8b7608472..000000000
--- a/resources/libs/codemirror/theme/blackboard.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Port of TextMate's Blackboard theme */
-
-.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
-.cm-s-blackboard .CodeMirror-selected { background: #253B76 !important; }
-.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
-.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
-.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7 !important; }
-
-.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
-.cm-s-blackboard .cm-atom { color: #D8FA3C; }
-.cm-s-blackboard .cm-number { color: #D8FA3C; }
-.cm-s-blackboard .cm-def { color: #8DA6CE; }
-.cm-s-blackboard .cm-variable { color: #FF6400; }
-.cm-s-blackboard .cm-operator { color: #FBDE2D;}
-.cm-s-blackboard .cm-comment { color: #AEAEAE; }
-.cm-s-blackboard .cm-string { color: #61CE3C; }
-.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
-.cm-s-blackboard .cm-meta { color: #D8FA3C; }
-.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
-.cm-s-blackboard .cm-tag { color: #8DA6CE; }
-.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
-.cm-s-blackboard .cm-header { color: #FF6400; }
-.cm-s-blackboard .cm-hr { color: #AEAEAE; }
-.cm-s-blackboard .cm-link { color: #8DA6CE; }
-.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
-
-.cm-s-blackboard .CodeMirror-activeline-background {background: #3C3636 !important;}
-.cm-s-blackboard .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
\ No newline at end of file
diff --git a/resources/libs/codemirror/theme/cobalt.css b/resources/libs/codemirror/theme/cobalt.css
deleted file mode 100644
index b4a917736..000000000
--- a/resources/libs/codemirror/theme/cobalt.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.cm-s-cobalt.CodeMirror { background: #002240; color: white; }
-.cm-s-cobalt div.CodeMirror-selected { background: #b36539 !important; }
-.cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white !important; }
-
-.cm-s-cobalt span.cm-comment { color: #08f; }
-.cm-s-cobalt span.cm-atom { color: #845dc4; }
-.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; }
-.cm-s-cobalt span.cm-keyword { color: #ffee80; }
-.cm-s-cobalt span.cm-string { color: #3ad900; }
-.cm-s-cobalt span.cm-meta { color: #ff9d00; }
-.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
-.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
-.cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
-.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
-.cm-s-cobalt span.cm-link { color: #845dc4; }
-.cm-s-cobalt span.cm-error { color: #9d1e15; }
-
-.cm-s-cobalt .CodeMirror-activeline-background {background: #002D57 !important;}
-.cm-s-cobalt .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
diff --git a/resources/libs/codemirror/theme/eclipse.css b/resources/libs/codemirror/theme/eclipse.css
deleted file mode 100644
index 317218e3d..000000000
--- a/resources/libs/codemirror/theme/eclipse.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.cm-s-eclipse span.cm-meta {color: #FF1717;}
-.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
-.cm-s-eclipse span.cm-atom {color: #219;}
-.cm-s-eclipse span.cm-number {color: #164;}
-.cm-s-eclipse span.cm-def {color: #00f;}
-.cm-s-eclipse span.cm-variable {color: black;}
-.cm-s-eclipse span.cm-variable-2 {color: #0000C0;}
-.cm-s-eclipse span.cm-variable-3 {color: #0000C0;}
-.cm-s-eclipse span.cm-property {color: black;}
-.cm-s-eclipse span.cm-operator {color: black;}
-.cm-s-eclipse span.cm-comment {color: #3F7F5F;}
-.cm-s-eclipse span.cm-string {color: #2A00FF;}
-.cm-s-eclipse span.cm-string-2 {color: #f50;}
-.cm-s-eclipse span.cm-qualifier {color: #555;}
-.cm-s-eclipse span.cm-builtin {color: #30a;}
-.cm-s-eclipse span.cm-bracket {color: #cc7;}
-.cm-s-eclipse span.cm-tag {color: #170;}
-.cm-s-eclipse span.cm-attribute {color: #00c;}
-.cm-s-eclipse span.cm-link {color: #219;}
-.cm-s-eclipse span.cm-error {color: #f00;}
-
-.cm-s-eclipse .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-eclipse .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
diff --git a/resources/libs/codemirror/theme/elegant.css b/resources/libs/codemirror/theme/elegant.css
deleted file mode 100644
index dd7df7b73..000000000
--- a/resources/libs/codemirror/theme/elegant.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;}
-.cm-s-elegant span.cm-comment {color: #262; font-style: italic; line-height: 1em;}
-.cm-s-elegant span.cm-meta {color: #555; font-style: italic; line-height: 1em;}
-.cm-s-elegant span.cm-variable {color: black;}
-.cm-s-elegant span.cm-variable-2 {color: #b11;}
-.cm-s-elegant span.cm-qualifier {color: #555;}
-.cm-s-elegant span.cm-keyword {color: #730;}
-.cm-s-elegant span.cm-builtin {color: #30a;}
-.cm-s-elegant span.cm-link {color: #762;}
-.cm-s-elegant span.cm-error {background-color: #fdd;}
-
-.cm-s-elegant .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-elegant .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
diff --git a/resources/libs/codemirror/theme/erlang-dark.css b/resources/libs/codemirror/theme/erlang-dark.css
deleted file mode 100644
index db56b1084..000000000
--- a/resources/libs/codemirror/theme/erlang-dark.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
-.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539 !important; }
-.cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
-
-.cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
-.cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
-.cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
-.cm-s-erlang-dark span.cm-builtin    { color: #eaa; }
-.cm-s-erlang-dark span.cm-comment    { color: #77f; }
-.cm-s-erlang-dark span.cm-def        { color: #e7a; }
-.cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
-.cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
-.cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
-.cm-s-erlang-dark span.cm-operator   { color: #d55; }
-.cm-s-erlang-dark span.cm-property   { color: #ccc; }
-.cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
-.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
-.cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
-.cm-s-erlang-dark span.cm-string     { color: #3ad900; }
-.cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
-.cm-s-erlang-dark span.cm-tag        { color: #9effff; }
-.cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
-.cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
-.cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
-.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
-
-.cm-s-erlang-dark .CodeMirror-activeline-background {background: #013461 !important;}
-.cm-s-erlang-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/resources/libs/codemirror/theme/lesser-dark.css b/resources/libs/codemirror/theme/lesser-dark.css
deleted file mode 100644
index c32559663..000000000
--- a/resources/libs/codemirror/theme/lesser-dark.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-http://lesscss.org/ dark theme
-Ported to CodeMirror by Peter Kroon
-*/
-.cm-s-lesser-dark {
-  line-height: 1.3em;
-}
-.cm-s-lesser-dark {
-  font-family: 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco', Courier, monospace !important;
-}
-
-.cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
-.cm-s-lesser-dark div.CodeMirror-selected {background: #45443B !important;} /* 33322B*/
-.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
-.cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
-
-.cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
-
-.cm-s-lesser-dark .CodeMirror-gutters { background: #262626; border-right:1px solid #aaa; }
-.cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
-
-.cm-s-lesser-dark span.cm-keyword { color: #599eff; }
-.cm-s-lesser-dark span.cm-atom { color: #C2B470; }
-.cm-s-lesser-dark span.cm-number { color: #B35E4D; }
-.cm-s-lesser-dark span.cm-def {color: white;}
-.cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
-.cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
-.cm-s-lesser-dark span.cm-variable-3 { color: white; }
-.cm-s-lesser-dark span.cm-property {color: #92A75C;}
-.cm-s-lesser-dark span.cm-operator {color: #92A75C;}
-.cm-s-lesser-dark span.cm-comment { color: #666; }
-.cm-s-lesser-dark span.cm-string { color: #BCD279; }
-.cm-s-lesser-dark span.cm-string-2 {color: #f50;}
-.cm-s-lesser-dark span.cm-meta { color: #738C73; }
-.cm-s-lesser-dark span.cm-qualifier {color: #555;}
-.cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
-.cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
-.cm-s-lesser-dark span.cm-tag { color: #669199; }
-.cm-s-lesser-dark span.cm-attribute {color: #00c;}
-.cm-s-lesser-dark span.cm-header {color: #a0a;}
-.cm-s-lesser-dark span.cm-quote {color: #090;}
-.cm-s-lesser-dark span.cm-hr {color: #999;}
-.cm-s-lesser-dark span.cm-link {color: #00c;}
-.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
-
-.cm-s-lesser-dark .CodeMirror-activeline-background {background: #3C3A3A !important;}
-.cm-s-lesser-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/resources/libs/codemirror/theme/mbo.css b/resources/libs/codemirror/theme/mbo.css
deleted file mode 100644
index 93fe3ee24..000000000
--- a/resources/libs/codemirror/theme/mbo.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Based on mbonaci's Brackets mbo theme */
-
-.cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffe9;}
-.cm-s-mbo div.CodeMirror-selected {background: #716C62 !important;}
-.cm-s-mbo .CodeMirror-gutters {background: #4e4e4e; border-right: 0px;}
-.cm-s-mbo .CodeMirror-linenumber {color: #dadada;}
-.cm-s-mbo .CodeMirror-cursor {border-left: 1px solid #ffffec !important;}
-
-.cm-s-mbo span.cm-comment {color: #95958a;}
-.cm-s-mbo span.cm-atom {color: #00a8c6;}
-.cm-s-mbo span.cm-number {color: #00a8c6;}
-
-.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute {color: #9ddfe9;}
-.cm-s-mbo span.cm-keyword {color: #ffb928;}
-.cm-s-mbo span.cm-string {color: #ffcf6c;}
-
-.cm-s-mbo span.cm-variable {color: #ffffec;}
-.cm-s-mbo span.cm-variable-2 {color: #00a8c6;}
-.cm-s-mbo span.cm-def {color: #ffffec;}
-.cm-s-mbo span.cm-bracket {color: #fffffc; font-weight: bold;}
-.cm-s-mbo span.cm-tag {color: #9ddfe9;}
-.cm-s-mbo span.cm-link {color: #f54b07;}
-.cm-s-mbo span.cm-error {background: #636363; color: #ffffec;}
-
-.cm-s-mbo .CodeMirror-activeline-background {background: #494b41 !important;}
-.cm-s-mbo .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: #f5e107 !important;
- }
- 
-.cm-s-mbo .CodeMirror-matchingtag {background: #4e4e4e;}
-
-div.CodeMirror span.CodeMirror-searching {
-  background-color: none;
-  background: none;
-  box-shadow: 0 0 0 1px #ffffec;
-}
diff --git a/resources/libs/codemirror/theme/midnight.css b/resources/libs/codemirror/theme/midnight.css
deleted file mode 100644
index 66126322b..000000000
--- a/resources/libs/codemirror/theme/midnight.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
-
-/*<!--match-->*/
-.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949 }
-.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
-
-/*<!--activeline-->*/
-.cm-s-midnight .CodeMirror-activeline-background {background: #253540 !important;}
-
-.cm-s-midnight.CodeMirror {
-    background: #0F192A;
-    color: #D1EDFF;
-}
-
-.cm-s-midnight.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-
-.cm-s-midnight div.CodeMirror-selected {background: #314D67 !important;}
-.cm-s-midnight .CodeMirror-gutters {background: #0F192A; border-right: 1px solid;}
-.cm-s-midnight .CodeMirror-linenumber {color: #D0D0D0;}
-.cm-s-midnight .CodeMirror-cursor {
-    border-left: 1px solid #F8F8F0 !important;
-}
-
-.cm-s-midnight span.cm-comment {color: #428BDD;}
-.cm-s-midnight span.cm-atom {color: #AE81FF;}
-.cm-s-midnight span.cm-number {color: #D1EDFF;}
-
-.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute {color: #A6E22E;}
-.cm-s-midnight span.cm-keyword {color: #E83737;}
-.cm-s-midnight span.cm-string {color: #1DC116;}
-
-.cm-s-midnight span.cm-variable {color: #FFAA3E;}
-.cm-s-midnight span.cm-variable-2 {color: #FFAA3E;}
-.cm-s-midnight span.cm-def {color: #4DD;}
-.cm-s-midnight span.cm-bracket {color: #D1EDFF;}
-.cm-s-midnight span.cm-tag {color: #449;}
-.cm-s-midnight span.cm-link {color: #AE81FF;}
-.cm-s-midnight span.cm-error {background: #F92672; color: #F8F8F0;}
-
-.cm-s-midnight .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}
diff --git a/resources/libs/codemirror/theme/monokai.css b/resources/libs/codemirror/theme/monokai.css
deleted file mode 100644
index 7ac601a13..000000000
--- a/resources/libs/codemirror/theme/monokai.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Based on Sublime Text's Monokai theme */
-
-.cm-s-monokai.CodeMirror {background: #272822; color: #f8f8f2;}
-.cm-s-monokai div.CodeMirror-selected {background: #49483E !important;}
-.cm-s-monokai .CodeMirror-gutters {background: #272822; border-right: 0px;}
-.cm-s-monokai .CodeMirror-linenumber {color: #d0d0d0;}
-.cm-s-monokai .CodeMirror-cursor {border-left: 1px solid #f8f8f0 !important;}
-
-.cm-s-monokai span.cm-comment {color: #75715e;}
-.cm-s-monokai span.cm-atom {color: #ae81ff;}
-.cm-s-monokai span.cm-number {color: #ae81ff;}
-
-.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute {color: #a6e22e;}
-.cm-s-monokai span.cm-keyword {color: #f92672;}
-.cm-s-monokai span.cm-string {color: #e6db74;}
-
-.cm-s-monokai span.cm-variable {color: #a6e22e;}
-.cm-s-monokai span.cm-variable-2 {color: #9effff;}
-.cm-s-monokai span.cm-def {color: #fd971f;}
-.cm-s-monokai span.cm-bracket {color: #f8f8f2;}
-.cm-s-monokai span.cm-tag {color: #f92672;}
-.cm-s-monokai span.cm-link {color: #ae81ff;}
-.cm-s-monokai span.cm-error {background: #f92672; color: #f8f8f0;}
-
-.cm-s-monokai .CodeMirror-activeline-background {background: #373831 !important;}
-.cm-s-monokai .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}
diff --git a/resources/libs/codemirror/theme/neat.css b/resources/libs/codemirror/theme/neat.css
deleted file mode 100644
index 115083b81..000000000
--- a/resources/libs/codemirror/theme/neat.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.cm-s-neat span.cm-comment { color: #a86; }
-.cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; }
-.cm-s-neat span.cm-string { color: #a22; }
-.cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; }
-.cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
-.cm-s-neat span.cm-variable { color: black; }
-.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
-.cm-s-neat span.cm-meta {color: #555;}
-.cm-s-neat span.cm-link { color: #3a3; }
-
-.cm-s-neat .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-neat .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
diff --git a/resources/libs/codemirror/theme/night.css b/resources/libs/codemirror/theme/night.css
deleted file mode 100644
index 016e55ee7..000000000
--- a/resources/libs/codemirror/theme/night.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Loosely based on the Midnight Textmate theme */
-
-.cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-night div.CodeMirror-selected { background: #447 !important; }
-.cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-night .CodeMirror-cursor { border-left: 1px solid white !important; }
-
-.cm-s-night span.cm-comment { color: #6900a1; }
-.cm-s-night span.cm-atom { color: #845dc4; }
-.cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; }
-.cm-s-night span.cm-keyword { color: #599eff; }
-.cm-s-night span.cm-string { color: #37f14a; }
-.cm-s-night span.cm-meta { color: #7678e2; }
-.cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
-.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
-.cm-s-night span.cm-bracket { color: #8da6ce; }
-.cm-s-night span.cm-comment { color: #6900a1; }
-.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
-.cm-s-night span.cm-link { color: #845dc4; }
-.cm-s-night span.cm-error { color: #9d1e15; }
-
-.cm-s-night .CodeMirror-activeline-background {background: #1C005A !important;}
-.cm-s-night .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/resources/libs/codemirror/theme/paraiso-dark.css b/resources/libs/codemirror/theme/paraiso-dark.css
deleted file mode 100644
index ddefc55d2..000000000
--- a/resources/libs/codemirror/theme/paraiso-dark.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-    Name:       Paraíso (Dark)
-    Author:     Jan T. Sott
-
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
-    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-dark.CodeMirror {background: #2f1e2e; color: #b9b6b0;}
-.cm-s-paraiso-dark div.CodeMirror-selected {background: #41323f !important;}
-.cm-s-paraiso-dark .CodeMirror-gutters {background: #2f1e2e; border-right: 0px;}
-.cm-s-paraiso-dark .CodeMirror-linenumber {color: #776e71;}
-.cm-s-paraiso-dark .CodeMirror-cursor {border-left: 1px solid #8d8687 !important;}
-
-.cm-s-paraiso-dark span.cm-comment {color: #e96ba8;}
-.cm-s-paraiso-dark span.cm-atom {color: #815ba4;}
-.cm-s-paraiso-dark span.cm-number {color: #815ba4;}
-
-.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute {color: #48b685;}
-.cm-s-paraiso-dark span.cm-keyword {color: #ef6155;}
-.cm-s-paraiso-dark span.cm-string {color: #fec418;}
-
-.cm-s-paraiso-dark span.cm-variable {color: #48b685;}
-.cm-s-paraiso-dark span.cm-variable-2 {color: #06b6ef;}
-.cm-s-paraiso-dark span.cm-def {color: #f99b15;}
-.cm-s-paraiso-dark span.cm-bracket {color: #b9b6b0;}
-.cm-s-paraiso-dark span.cm-tag {color: #ef6155;}
-.cm-s-paraiso-dark span.cm-link {color: #815ba4;}
-.cm-s-paraiso-dark span.cm-error {background: #ef6155; color: #8d8687;}
-
-.cm-s-paraiso-dark .CodeMirror-activeline-background {background: #4D344A !important;}
-.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/resources/libs/codemirror/theme/paraiso-light.css b/resources/libs/codemirror/theme/paraiso-light.css
deleted file mode 100644
index 8afb14be4..000000000
--- a/resources/libs/codemirror/theme/paraiso-light.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-    Name:       Paraíso (Light)
-    Author:     Jan T. Sott
-
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
-    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-light.CodeMirror {background: #e7e9db; color: #41323f;}
-.cm-s-paraiso-light div.CodeMirror-selected {background: #b9b6b0 !important;}
-.cm-s-paraiso-light .CodeMirror-gutters {background: #e7e9db; border-right: 0px;}
-.cm-s-paraiso-light .CodeMirror-linenumber {color: #8d8687;}
-.cm-s-paraiso-light .CodeMirror-cursor {border-left: 1px solid #776e71 !important;}
-
-.cm-s-paraiso-light span.cm-comment {color: #e96ba8;}
-.cm-s-paraiso-light span.cm-atom {color: #815ba4;}
-.cm-s-paraiso-light span.cm-number {color: #815ba4;}
-
-.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute {color: #48b685;}
-.cm-s-paraiso-light span.cm-keyword {color: #ef6155;}
-.cm-s-paraiso-light span.cm-string {color: #fec418;}
-
-.cm-s-paraiso-light span.cm-variable {color: #48b685;}
-.cm-s-paraiso-light span.cm-variable-2 {color: #06b6ef;}
-.cm-s-paraiso-light span.cm-def {color: #f99b15;}
-.cm-s-paraiso-light span.cm-bracket {color: #41323f;}
-.cm-s-paraiso-light span.cm-tag {color: #ef6155;}
-.cm-s-paraiso-light span.cm-link {color: #815ba4;}
-.cm-s-paraiso-light span.cm-error {background: #ef6155; color: #776e71;}
-
-.cm-s-paraiso-light .CodeMirror-activeline-background {background: #CFD1C4 !important;}
-.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/resources/libs/codemirror/theme/rubyblue.css b/resources/libs/codemirror/theme/rubyblue.css
deleted file mode 100644
index b556139d7..000000000
--- a/resources/libs/codemirror/theme/rubyblue.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.cm-s-rubyblue { font-family: Trebuchet, Verdana, sans-serif; }	/* - customized editor font - */
-
-.cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
-.cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
-.cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
-.cm-s-rubyblue .CodeMirror-linenumber { color: white; }
-.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; }
-
-.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
-.cm-s-rubyblue span.cm-atom { color: #F4C20B; }
-.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
-.cm-s-rubyblue span.cm-keyword { color: #F0F; }
-.cm-s-rubyblue span.cm-string { color: #F08047; }
-.cm-s-rubyblue span.cm-meta { color: #F0F; }
-.cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
-.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
-.cm-s-rubyblue span.cm-bracket { color: #F0F; }
-.cm-s-rubyblue span.cm-link { color: #F4C20B; }
-.cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
-.cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
-.cm-s-rubyblue span.cm-error { color: #AF2018; }
-
-.cm-s-rubyblue .CodeMirror-activeline-background {background: #173047 !important;}
diff --git a/resources/libs/codemirror/theme/solarized.css b/resources/libs/codemirror/theme/solarized.css
deleted file mode 100644
index af30d6213..000000000
--- a/resources/libs/codemirror/theme/solarized.css
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
-Solarized theme for code-mirror
-http://ethanschoonover.com/solarized
-*/
-
-/*
-Solarized color pallet
-http://ethanschoonover.com/solarized/img/solarized-palette.png
-*/
-
-.solarized.base03 { color: #002b36; }
-.solarized.base02 { color: #073642; }
-.solarized.base01 { color: #586e75; }
-.solarized.base00 { color: #657b83; }
-.solarized.base0 { color: #839496; }
-.solarized.base1 { color: #93a1a1; }
-.solarized.base2 { color: #eee8d5; }
-.solarized.base3  { color: #fdf6e3; }
-.solarized.solar-yellow  { color: #b58900; }
-.solarized.solar-orange  { color: #cb4b16; }
-.solarized.solar-red { color: #dc322f; }
-.solarized.solar-magenta { color: #d33682; }
-.solarized.solar-violet  { color: #6c71c4; }
-.solarized.solar-blue { color: #268bd2; }
-.solarized.solar-cyan { color: #2aa198; }
-.solarized.solar-green { color: #859900; }
-
-/* Color scheme for code-mirror */
-
-.cm-s-solarized {
-  line-height: 1.45em;
-  font-family: Menlo,Monaco,"Andale Mono","lucida console","Courier New",monospace !important;
-  color-profile: sRGB;
-  rendering-intent: auto;
-}
-.cm-s-solarized.cm-s-dark {
-  color: #839496;
-  background-color:  #002b36;
-  text-shadow: #002b36 0 1px;
-}
-.cm-s-solarized.cm-s-light {
-  background-color: #fdf6e3;
-  color: #657b83;
-  text-shadow: #eee8d5 0 1px;
-}
-
-.cm-s-solarized .CodeMirror-widget {
-  text-shadow: none;
-}
-
-
-.cm-s-solarized .cm-keyword { color: #cb4b16 }
-.cm-s-solarized .cm-atom { color: #d33682; }
-.cm-s-solarized .cm-number { color: #d33682; }
-.cm-s-solarized .cm-def { color: #2aa198; }
-
-.cm-s-solarized .cm-variable { color: #268bd2; }
-.cm-s-solarized .cm-variable-2 { color: #b58900; }
-.cm-s-solarized .cm-variable-3 { color: #6c71c4; }
-
-.cm-s-solarized .cm-property { color: #2aa198; }
-.cm-s-solarized .cm-operator {color: #6c71c4;}
-
-.cm-s-solarized .cm-comment { color: #586e75; font-style:italic; }
-
-.cm-s-solarized .cm-string { color: #859900; }
-.cm-s-solarized .cm-string-2 { color: #b58900; }
-
-.cm-s-solarized .cm-meta { color: #859900; }
-.cm-s-solarized .cm-qualifier { color: #b58900; }
-.cm-s-solarized .cm-builtin { color: #d33682; }
-.cm-s-solarized .cm-bracket { color: #cb4b16; }
-.cm-s-solarized .CodeMirror-matchingbracket { color: #859900; }
-.cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
-.cm-s-solarized .cm-tag { color: #93a1a1 }
-.cm-s-solarized .cm-attribute {  color: #2aa198; }
-.cm-s-solarized .cm-header { color: #586e75; }
-.cm-s-solarized .cm-quote { color: #93a1a1; }
-.cm-s-solarized .cm-hr {
-  color: transparent;
-  border-top: 1px solid #586e75;
-  display: block;
-}
-.cm-s-solarized .cm-link { color: #93a1a1; cursor: pointer; }
-.cm-s-solarized .cm-special { color: #6c71c4; }
-.cm-s-solarized .cm-em {
-  color: #999;
-  text-decoration: underline;
-  text-decoration-style: dotted;
-}
-.cm-s-solarized .cm-strong { color: #eee; }
-.cm-s-solarized .cm-tab:before {
-  content: "➤";   /*visualize tab character*/
-  color: #586e75;
-}
-.cm-s-solarized .cm-error,
-.cm-s-solarized .cm-invalidchar {
-  color: #586e75;
-  border-bottom: 1px dotted #dc322f;
-}
-
-.cm-s-solarized.cm-s-dark .CodeMirror-selected {
-  background: #073642;
-}
-
-.cm-s-solarized.cm-s-light .CodeMirror-selected {
-  background: #eee8d5;
-}
-
-/* Editor styling */
-
-
-
-/* Little shadow on the view-port of the buffer view */
-.cm-s-solarized.CodeMirror {
-  -moz-box-shadow: inset 7px 0 12px -6px #000;
-  -webkit-box-shadow: inset 7px 0 12px -6px #000;
-  box-shadow: inset 7px 0 12px -6px #000;
-}
-
-/* Gutter border and some shadow from it  */
-.cm-s-solarized .CodeMirror-gutters {
-  padding: 0 15px 0 10px;
-  box-shadow: 0 10px 20px black;
-  border-right: 1px solid;
-}
-
-/* Gutter colors and line number styling based of color scheme (dark / light) */
-
-/* Dark */
-.cm-s-solarized.cm-s-dark .CodeMirror-gutters {
-  background-color: #073642;
-  border-color: #00232c;
-}
-
-.cm-s-solarized.cm-s-dark .CodeMirror-linenumber {
-  text-shadow: #021014 0 -1px;
-}
-
-/* Light */
-.cm-s-solarized.cm-s-light .CodeMirror-gutters {
-  background-color: #eee8d5;
-  border-color: #eee8d5;
-}
-
-/* Common */
-.cm-s-solarized .CodeMirror-linenumber {
-  color: #586e75;
-}
-
-.cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text {
-  color: #586e75;
-}
-
-.cm-s-solarized .CodeMirror-lines {
-  padding-left: 5px;
-}
-
-.cm-s-solarized .CodeMirror-lines .CodeMirror-cursor {
-  border-left: 1px solid #819090;
-}
-
-/*
-Active line. Negative margin compensates left padding of the text in the
-view-port
-*/
-.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
-  background: rgba(255, 255, 255, 0.10);
-}
-.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
-  background: rgba(0, 0, 0, 0.10);
-}
-
-/*
-View-port and gutter both get little noise background to give it a real feel.
-*/
-.cm-s-solarized.CodeMirror,
-.cm-s-solarized .CodeMirror-gutters {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
-}
diff --git a/resources/libs/codemirror/theme/the-matrix.css b/resources/libs/codemirror/theme/the-matrix.css
deleted file mode 100644
index 9e60b7b04..000000000
--- a/resources/libs/codemirror/theme/the-matrix.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
-.cm-s-the-matrix span.CodeMirror-selected { background: #a8f !important; }
-.cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
-.cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00 !important; }
-
-.cm-s-the-matrix span.cm-keyword {color: #008803; font-weight: bold;}
-.cm-s-the-matrix span.cm-atom {color: #3FF;}
-.cm-s-the-matrix span.cm-number {color: #FFB94F;}
-.cm-s-the-matrix span.cm-def {color: #99C;}
-.cm-s-the-matrix span.cm-variable {color: #F6C;}
-.cm-s-the-matrix span.cm-variable-2 {color: #C6F;}
-.cm-s-the-matrix span.cm-variable-3 {color: #96F;}
-.cm-s-the-matrix span.cm-property {color: #62FFA0;}
-.cm-s-the-matrix span.cm-operator {color: #999}
-.cm-s-the-matrix span.cm-comment {color: #CCCCCC;}
-.cm-s-the-matrix span.cm-string {color: #39C;}
-.cm-s-the-matrix span.cm-meta {color: #C9F;}
-.cm-s-the-matrix span.cm-qualifier {color: #FFF700;}
-.cm-s-the-matrix span.cm-builtin {color: #30a;}
-.cm-s-the-matrix span.cm-bracket {color: #cc7;}
-.cm-s-the-matrix span.cm-tag {color: #FFBD40;}
-.cm-s-the-matrix span.cm-attribute {color: #FFF700;}
-.cm-s-the-matrix span.cm-error {color: #FF0000;}
-
-.cm-s-the-matrix .CodeMirror-activeline-background {background: #040;}
diff --git a/resources/libs/codemirror/theme/tomorrow-night-eighties.css b/resources/libs/codemirror/theme/tomorrow-night-eighties.css
deleted file mode 100644
index 85c2a4a78..000000000
--- a/resources/libs/codemirror/theme/tomorrow-night-eighties.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-    Name:       Tomorrow Night - Eighties
-    Author:     Chris Kempson
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-tomorrow-night-eighties.CodeMirror {background: #000000; color: #CCCCCC;}
-.cm-s-tomorrow-night-eighties div.CodeMirror-selected {background: #2D2D2D !important;}
-.cm-s-tomorrow-night-eighties .CodeMirror-gutters {background: #000000; border-right: 0px;}
-.cm-s-tomorrow-night-eighties .CodeMirror-linenumber {color: #515151;}
-.cm-s-tomorrow-night-eighties .CodeMirror-cursor {border-left: 1px solid #6A6A6A !important;}
-
-.cm-s-tomorrow-night-eighties span.cm-comment {color: #d27b53;}
-.cm-s-tomorrow-night-eighties span.cm-atom {color: #a16a94;}
-.cm-s-tomorrow-night-eighties span.cm-number {color: #a16a94;}
-
-.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute {color: #99cc99;}
-.cm-s-tomorrow-night-eighties span.cm-keyword {color: #f2777a;}
-.cm-s-tomorrow-night-eighties span.cm-string {color: #ffcc66;}
-
-.cm-s-tomorrow-night-eighties span.cm-variable {color: #99cc99;}
-.cm-s-tomorrow-night-eighties span.cm-variable-2 {color: #6699cc;}
-.cm-s-tomorrow-night-eighties span.cm-def {color: #f99157;}
-.cm-s-tomorrow-night-eighties span.cm-bracket {color: #CCCCCC;}
-.cm-s-tomorrow-night-eighties span.cm-tag {color: #f2777a;}
-.cm-s-tomorrow-night-eighties span.cm-link {color: #a16a94;}
-.cm-s-tomorrow-night-eighties span.cm-error {background: #f2777a; color: #6A6A6A;}
-
-.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background {background: #343600 !important;}
-.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/resources/libs/codemirror/theme/twilight.css b/resources/libs/codemirror/theme/twilight.css
deleted file mode 100644
index 19d6abadd..000000000
--- a/resources/libs/codemirror/theme/twilight.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
-.cm-s-twilight .CodeMirror-selected { background: #323232 !important; } /**/
-
-.cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
-.cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
-.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white !important; }
-
-.cm-s-twilight .cm-keyword {  color: #f9ee98; } /**/
-.cm-s-twilight .cm-atom { color: #FC0; }
-.cm-s-twilight .cm-number { color:  #ca7841; } /**/
-.cm-s-twilight .cm-def { color: #8DA6CE; }
-.cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
-.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def { color: #607392; } /**/
-.cm-s-twilight .cm-operator { color: #cda869; } /**/
-.cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
-.cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
-.cm-s-twilight .cm-string-2 { color:#bd6b18 } /*?*/
-.cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
-.cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
-.cm-s-twilight .cm-tag { color: #997643; } /**/
-.cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
-.cm-s-twilight .cm-header { color: #FF6400; }
-.cm-s-twilight .cm-hr { color: #AEAEAE; }
-.cm-s-twilight .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; } /**/
-.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
-
-.cm-s-twilight .CodeMirror-activeline-background {background: #27282E !important;}
-.cm-s-twilight .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/resources/libs/codemirror/theme/vibrant-ink.css b/resources/libs/codemirror/theme/vibrant-ink.css
deleted file mode 100644
index 0206225bf..000000000
--- a/resources/libs/codemirror/theme/vibrant-ink.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Taken from the popular Visual Studio Vibrant Ink Schema */
-
-.cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
-.cm-s-vibrant-ink .CodeMirror-selected { background: #35493c !important; }
-
-.cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white !important; }
-
-.cm-s-vibrant-ink .cm-keyword {  color: #CC7832; }
-.cm-s-vibrant-ink .cm-atom { color: #FC0; }
-.cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
-.cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
-.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D }
-.cm-s-vibrant-ink .cm-operator { color: #888; }
-.cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
-.cm-s-vibrant-ink .cm-string { color:  #A5C25C }
-.cm-s-vibrant-ink .cm-string-2 { color: red }
-.cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
-.cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-header { color: #FF6400; }
-.cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
-.cm-s-vibrant-ink .cm-link { color: blue; }
-.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
-
-.cm-s-vibrant-ink .CodeMirror-activeline-background {background: #27282E !important;}
-.cm-s-vibrant-ink .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/resources/libs/codemirror/theme/xq-dark.css b/resources/libs/codemirror/theme/xq-dark.css
deleted file mode 100644
index 4a0b2138c..000000000
--- a/resources/libs/codemirror/theme/xq-dark.css
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort <mike@brevoort.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-.cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-selected { background: #27007A !important; }
-.cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
-
-.cm-s-xq-dark span.cm-keyword {color: #FFBD40;}
-.cm-s-xq-dark span.cm-atom {color: #6C8CD5;}
-.cm-s-xq-dark span.cm-number {color: #164;}
-.cm-s-xq-dark span.cm-def {color: #FFF; text-decoration:underline;}
-.cm-s-xq-dark span.cm-variable {color: #FFF;}
-.cm-s-xq-dark span.cm-variable-2 {color: #EEE;}
-.cm-s-xq-dark span.cm-variable-3 {color: #DDD;}
-.cm-s-xq-dark span.cm-property {}
-.cm-s-xq-dark span.cm-operator {}
-.cm-s-xq-dark span.cm-comment {color: gray;}
-.cm-s-xq-dark span.cm-string {color: #9FEE00;}
-.cm-s-xq-dark span.cm-meta {color: yellow;}
-.cm-s-xq-dark span.cm-qualifier {color: #FFF700;}
-.cm-s-xq-dark span.cm-builtin {color: #30a;}
-.cm-s-xq-dark span.cm-bracket {color: #cc7;}
-.cm-s-xq-dark span.cm-tag {color: #FFBD40;}
-.cm-s-xq-dark span.cm-attribute {color: #FFF700;}
-.cm-s-xq-dark span.cm-error {color: #f00;}
-
-.cm-s-xq-dark .CodeMirror-activeline-background {background: #27282E !important;}
-.cm-s-xq-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
\ No newline at end of file
diff --git a/resources/libs/codemirror/theme/xq-light.css b/resources/libs/codemirror/theme/xq-light.css
deleted file mode 100644
index 20b5c7961..000000000
--- a/resources/libs/codemirror/theme/xq-light.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort <mike@brevoort.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-.cm-s-xq-light span.cm-keyword {line-height: 1em; font-weight: bold; color: #5A5CAD; }
-.cm-s-xq-light span.cm-atom {color: #6C8CD5;}
-.cm-s-xq-light span.cm-number {color: #164;}
-.cm-s-xq-light span.cm-def {text-decoration:underline;}
-.cm-s-xq-light span.cm-variable {color: black; }
-.cm-s-xq-light span.cm-variable-2 {color:black;}
-.cm-s-xq-light span.cm-variable-3 {color: black; }
-.cm-s-xq-light span.cm-property {}
-.cm-s-xq-light span.cm-operator {}
-.cm-s-xq-light span.cm-comment {color: #0080FF; font-style: italic;}
-.cm-s-xq-light span.cm-string {color: red;}
-.cm-s-xq-light span.cm-meta {color: yellow;}
-.cm-s-xq-light span.cm-qualifier {color: grey}
-.cm-s-xq-light span.cm-builtin {color: #7EA656;}
-.cm-s-xq-light span.cm-bracket {color: #cc7;}
-.cm-s-xq-light span.cm-tag {color: #3F7F7F;}
-.cm-s-xq-light span.cm-attribute {color: #7F007F;}
-.cm-s-xq-light span.cm-error {color: #f00;}
-
-.cm-s-xq-light .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-xq-light .CodeMirror-matchingbracket {outline:1px solid grey;color:black !important;background:yellow;}
\ No newline at end of file
diff --git a/resources/libs/index.html b/resources/libs/index.html
deleted file mode 100644
index 170718246..000000000
--- a/resources/libs/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head></head><body></body></html>
\ No newline at end of file
diff --git a/resources/libs/smarty/Smarty.class.php b/resources/libs/smarty/Smarty.class.php
deleted file mode 100644
index 737c5a92a..000000000
--- a/resources/libs/smarty/Smarty.class.php
+++ /dev/null
@@ -1,1511 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        Smarty.class.php
- * SVN:         $Id: Smarty.class.php 4551 2012-02-06 20:45:10Z rodneyrehm $
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- * @author Rodney Rehm
- * @package Smarty
- * @version 3.1.8
- */
-
-/**
- * define shorthand directory separator constant
- */
-if (!defined('DS')) {
-    define('DS', DIRECTORY_SEPARATOR);
-}
-
-/**
- * set SMARTY_DIR to absolute path to Smarty library files.
- * Sets SMARTY_DIR only if user application has not already defined it.
- */
-if (!defined('SMARTY_DIR')) {
-    define('SMARTY_DIR', dirname(__FILE__) . DS);
-}
-
-/**
- * set SMARTY_SYSPLUGINS_DIR to absolute path to Smarty internal plugins.
- * Sets SMARTY_SYSPLUGINS_DIR only if user application has not already defined it.
- */
-if (!defined('SMARTY_SYSPLUGINS_DIR')) {
-    define('SMARTY_SYSPLUGINS_DIR', SMARTY_DIR . 'sysplugins' . DS);
-}
-
-if (!defined('SMARTY_PLUGINS_DIR')) {
-    define('SMARTY_PLUGINS_DIR', SMARTY_DIR . 'plugins' . DS);
-}
-if (!defined('SMARTY_MBSTRING')) {
-    define('SMARTY_MBSTRING', function_exists('mb_strlen'));
-}
-if (!defined('SMARTY_RESOURCE_CHAR_SET')) {
-    // UTF-8 can only be done properly when mbstring is available!
-    /**
-     * @deprecated in favor of Smarty::$_CHARSET
-     */
-    define('SMARTY_RESOURCE_CHAR_SET', SMARTY_MBSTRING ? 'UTF-8' : 'ISO-8859-1');
-}
-if (!defined('SMARTY_RESOURCE_DATE_FORMAT')) {
-    /**
-     * @deprecated in favor of Smarty::$_DATE_FORMAT
-     */
-    define('SMARTY_RESOURCE_DATE_FORMAT', '%b %e, %Y');
-}
-
-/**
- * register the class autoloader
- */
-if (!defined('SMARTY_SPL_AUTOLOAD')) {
-    define('SMARTY_SPL_AUTOLOAD', 0);
-}
-
-if (SMARTY_SPL_AUTOLOAD && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false) {
-    $registeredAutoLoadFunctions = spl_autoload_functions();
-    if (!isset($registeredAutoLoadFunctions['spl_autoload'])) {
-        spl_autoload_register();
-    }
-} else {
-    spl_autoload_register('smartyAutoload');
-}
-
-/**
- * Load always needed external class files
- */
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_data.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_templatebase.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_template.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_resource.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_resource_file.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_cacheresource.php';
-include_once SMARTY_SYSPLUGINS_DIR.'smarty_internal_cacheresource_file.php';
-
-/**
- * This is the main Smarty class
- * @package Smarty
- */
-class Smarty extends Smarty_Internal_TemplateBase {
-
-    /**#@+
-     * constant definitions
-     */
-
-    /**
-     * smarty version
-     */
-    const SMARTY_VERSION = 'Smarty-3.1.8';
-
-    /**
-     * define variable scopes
-     */
-    const SCOPE_LOCAL = 0;
-    const SCOPE_PARENT = 1;
-    const SCOPE_ROOT = 2;
-    const SCOPE_GLOBAL = 3;
-    /**
-     * define caching modes
-     */
-    const CACHING_OFF = 0;
-    const CACHING_LIFETIME_CURRENT = 1;
-    const CACHING_LIFETIME_SAVED = 2;
-    /**
-     * define compile check modes
-     */
-    const COMPILECHECK_OFF = 0;
-    const COMPILECHECK_ON = 1;
-    const COMPILECHECK_CACHEMISS = 2;
-    /**
-     * modes for handling of "<?php ... ?>" tags in templates.
-     */
-    const PHP_PASSTHRU = 0; //-> print tags as plain text
-    const PHP_QUOTE = 1; //-> escape tags as entities
-    const PHP_REMOVE = 2; //-> escape tags as entities
-    const PHP_ALLOW = 3; //-> escape tags as entities
-    /**
-     * filter types
-     */
-    const FILTER_POST = 'post';
-    const FILTER_PRE = 'pre';
-    const FILTER_OUTPUT = 'output';
-    const FILTER_VARIABLE = 'variable';
-    /**
-     * plugin types
-     */
-    const PLUGIN_FUNCTION = 'function';
-    const PLUGIN_BLOCK = 'block';
-    const PLUGIN_COMPILER = 'compiler';
-    const PLUGIN_MODIFIER = 'modifier';
-    const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler';
-
-    /**#@-*/
-
-    /**
-     * assigned global tpl vars
-     */
-    public static $global_tpl_vars = array();
-
-    /**
-     * error handler returned by set_error_hanlder() in Smarty::muteExpectedErrors()
-     */
-    public static $_previous_error_handler = null;
-    /**
-     * contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
-     */
-    public static $_muted_directories = array();
-    /**
-     * Flag denoting if Multibyte String functions are available
-     */
-    public static $_MBSTRING = SMARTY_MBSTRING;
-    /**
-     * The character set to adhere to (e.g. "UTF-8")
-     */
-    public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET;
-    /**
-     * The date format to be used internally
-     * (accepts date() and strftime())
-     */
-    public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT;
-    /**
-     * Flag denoting if PCRE should run in UTF-8 mode
-     */
-    public static $_UTF8_MODIFIER = 'u';
-    
-    
-    /**#@+
-     * variables
-     */
-
-    /**
-     * auto literal on delimiters with whitspace
-     * @var boolean
-     */
-    public $auto_literal = true;
-    /**
-     * display error on not assigned variables
-     * @var boolean
-     */
-    public $error_unassigned = false;
-    /**
-     * look up relative filepaths in include_path
-     * @var boolean
-     */
-    public $use_include_path = false;
-    /**
-     * template directory
-     * @var array
-     */
-    private $template_dir = array();
-    /**
-     * joined template directory string used in cache keys
-     * @var string
-     */
-    public $joined_template_dir = null;
-    /**
-     * joined config directory string used in cache keys
-     * @var string
-     */
-    public $joined_config_dir = null;
-    /**
-     * default template handler
-     * @var callable
-     */
-    public $default_template_handler_func = null;
-    /**
-     * default config handler
-     * @var callable
-     */
-    public $default_config_handler_func = null;
-    /**
-     * default plugin handler
-     * @var callable
-     */
-    public $default_plugin_handler_func = null;
-    /**
-     * compile directory
-     * @var string
-     */
-    private $compile_dir = null;
-    /**
-     * plugins directory
-     * @var array
-     */
-    private $plugins_dir = array();
-    /**
-     * cache directory
-     * @var string
-     */
-    private $cache_dir = null;
-    /**
-     * config directory
-     * @var array
-     */
-    private $config_dir = array();
-    /**
-     * force template compiling?
-     * @var boolean
-     */
-    public $force_compile = false;
-    /**
-     * check template for modifications?
-     * @var boolean
-     */
-    public $compile_check = true;
-    /**
-     * use sub dirs for compiled/cached files?
-     * @var boolean
-     */
-    public $use_sub_dirs = false;
-    /**
-     * allow ambiguous resources (that are made unique by the resource handler)
-     * @var boolean
-     */
-    public $allow_ambiguous_resources = false;
-    /**
-     * caching enabled
-     * @var boolean
-     */
-    public $caching = false;
-    /**
-     * merge compiled includes
-     * @var boolean
-     */
-    public $merge_compiled_includes = false;
-    /**
-     * cache lifetime in seconds
-     * @var integer
-     */
-    public $cache_lifetime = 3600;
-    /**
-     * force cache file creation
-     * @var boolean
-     */
-    public $force_cache = false;
-    /**
-     * Set this if you want different sets of cache files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $cache_id = null;
-    /**
-     * Set this if you want different sets of compiled files for the same
-     * templates.
-     *
-     * @var string
-     */
-    public $compile_id = null;
-    /**
-     * template left-delimiter
-     * @var string
-     */
-    public $left_delimiter = "{";
-    /**
-     * template right-delimiter
-     * @var string
-     */
-    public $right_delimiter = "}";
-    /**#@+
-     * security
-     */
-    /**
-     * class name
-     *
-     * This should be instance of Smarty_Security.
-     *
-     * @var string
-     * @see Smarty_Security
-     */
-    public $security_class = 'Smarty_Security';
-    /**
-     * implementation of security class
-     *
-     * @var Smarty_Security
-     */
-    public $security_policy = null;
-    /**
-     * controls handling of PHP-blocks
-     *
-     * @var integer
-     */
-    public $php_handling = self::PHP_PASSTHRU;
-    /**
-     * controls if the php template file resource is allowed
-     *
-     * @var bool
-     */
-    public $allow_php_templates = false;
-    /**
-     * Should compiled-templates be prevented from being called directly?
-     *
-     * {@internal
-     * Currently used by Smarty_Internal_Template only.
-     * }}
-     *
-     * @var boolean
-     */
-    public $direct_access_security = true;
-    /**#@-*/
-    /**
-     * debug mode
-     *
-     * Setting this to true enables the debug-console.
-     *
-     * @var boolean
-     */
-    public $debugging = false;
-    /**
-     * This determines if debugging is enable-able from the browser.
-     * <ul>
-     *  <li>NONE => no debugging control allowed</li>
-     *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
-     * </ul>
-     * @var string
-     */
-    public $debugging_ctrl = 'NONE';
-    /**
-     * Name of debugging URL-param.
-     *
-     * Only used when $debugging_ctrl is set to 'URL'.
-     * The name of the URL-parameter that activates debugging.
-     *
-     * @var type
-     */
-    public $smarty_debug_id = 'SMARTY_DEBUG';
-    /**
-     * Path of debug template.
-     * @var string
-     */
-    public $debug_tpl = null;
-    /**
-     * When set, smarty uses this value as error_reporting-level.
-     * @var int
-     */
-    public $error_reporting = null;
-    /**
-     * Internal flag for getTags()
-     * @var boolean
-     */
-    public $get_used_tags = false;
-
-    /**#@+
-     * config var settings
-     */
-
-    /**
-     * Controls whether variables with the same name overwrite each other.
-     * @var boolean
-     */
-    public $config_overwrite = true;
-    /**
-     * Controls whether config values of on/true/yes and off/false/no get converted to boolean.
-     * @var boolean
-     */
-    public $config_booleanize = true;
-    /**
-     * Controls whether hidden config sections/vars are read from the file.
-     * @var boolean
-     */
-    public $config_read_hidden = false;
-
-    /**#@-*/
-
-    /**#@+
-     * resource locking
-     */
-
-    /**
-     * locking concurrent compiles
-     * @var boolean
-     */
-    public $compile_locking = true;
-    /**
-     * Controls whether cache resources should emply locking mechanism
-     * @var boolean
-     */
-    public $cache_locking = false;
-    /**
-     * seconds to wait for acquiring a lock before ignoring the write lock
-     * @var float
-     */
-    public $locking_timeout = 10;
-
-    /**#@-*/
-
-    /**
-     * global template functions
-     * @var array
-     */
-    public $template_functions = array();
-    /**
-     * resource type used if none given
-     *
-     * Must be an valid key of $registered_resources.
-     * @var string
-     */
-    public $default_resource_type = 'file';
-    /**
-     * caching type
-     *
-     * Must be an element of $cache_resource_types.
-     *
-     * @var string
-     */
-    public $caching_type = 'file';
-    /**
-     * internal config properties
-     * @var array
-     */
-    public $properties = array();
-    /**
-     * config type
-     * @var string
-     */
-    public $default_config_type = 'file';
-    /**
-     * cached template objects
-     * @var array
-     */
-    public $template_objects = array();
-    /**
-     * check If-Modified-Since headers
-     * @var boolean
-     */
-    public $cache_modified_check = false;
-    /**
-     * registered plugins
-     * @var array
-     */
-    public $registered_plugins = array();
-    /**
-     * plugin search order
-     * @var array
-     */
-    public $plugin_search_order = array('function', 'block', 'compiler', 'class');
-    /**
-     * registered objects
-     * @var array
-     */
-    public $registered_objects = array();
-    /**
-     * registered classes
-     * @var array
-     */
-    public $registered_classes = array();
-    /**
-     * registered filters
-     * @var array
-     */
-    public $registered_filters = array();
-    /**
-     * registered resources
-     * @var array
-     */
-    public $registered_resources = array();
-    /**
-     * resource handler cache
-     * @var array
-     */
-    public $_resource_handlers = array();
-    /**
-     * registered cache resources
-     * @var array
-     */
-    public $registered_cache_resources = array();
-    /**
-     * cache resource handler cache
-     * @var array
-     */
-    public $_cacheresource_handlers = array();
-    /**
-     * autoload filter
-     * @var array
-     */
-    public $autoload_filters = array();
-    /**
-     * default modifier
-     * @var array
-     */
-    public $default_modifiers = array();
-    /**
-     * autoescape variable output
-     * @var boolean
-     */
-    public $escape_html = false;
-    /**
-     * global internal smarty vars
-     * @var array
-     */
-    public static $_smarty_vars = array();
-    /**
-     * start time for execution time calculation
-     * @var int
-     */
-    public $start_time = 0;
-    /**
-     * default file permissions
-     * @var int
-     */
-    public $_file_perms = 0644;
-    /**
-     * default dir permissions
-     * @var int
-     */
-    public $_dir_perms = 0771;
-    /**
-     * block tag hierarchy
-     * @var array
-     */
-    public $_tag_stack = array();
-    /**
-     * self pointer to Smarty object
-     * @var Smarty
-     */
-    public $smarty;
-    /**
-     * required by the compiler for BC
-     * @var string
-     */
-    public $_current_file = null;
-    /**
-     * internal flag to enable parser debugging
-     * @var bool
-     */
-    public $_parserdebug = false;
-    /**
-     * Saved parameter of merged templates during compilation
-     *
-     * @var array
-     */
-    public $merged_templates_func = array();
-    /**#@-*/
-
-    /**
-     * Initialize new Smarty object
-     *
-     */
-    public function __construct()
-    {
-        // selfpointer needed by some other class methods
-        $this->smarty = $this;
-        if (is_callable('mb_internal_encoding')) {
-            mb_internal_encoding(Smarty::$_CHARSET);
-        }
-        $this->start_time = microtime(true);
-        // set default dirs
-        $this->setTemplateDir('.' . DS . 'templates' . DS)
-            ->setCompileDir('.' . DS . 'templates_c' . DS)
-            ->setPluginsDir(SMARTY_PLUGINS_DIR)
-            ->setCacheDir('.' . DS . 'cache' . DS)
-            ->setConfigDir('.' . DS . 'configs' . DS);
-
-        $this->debug_tpl = 'file:' . dirname(__FILE__) . '/debug.tpl';
-        if (isset($_SERVER['SCRIPT_NAME'])) {
-            $this->assignGlobal('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
-        }
-    }
-
-
-    /**
-     * Class destructor
-     */
-    public function __destruct()
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * <<magic>> set selfpointer on cloned object
-     */
-    public function __clone()
-    {
-        $this->smarty = $this;
-    }
-
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * Calls the appropriate getter function.
-     * Issues an E_USER_NOTICE if no valid getter is found.
-     *
-     * @param string $name property name
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        $allowed = array(
-        'template_dir' => 'getTemplateDir',
-        'config_dir' => 'getConfigDir',
-        'plugins_dir' => 'getPluginsDir',
-        'compile_dir' => 'getCompileDir',
-        'cache_dir' => 'getCacheDir',
-        );
-
-        if (isset($allowed[$name])) {
-            return $this->{$allowed[$name]}();
-        } else {
-            trigger_error('Undefined property: '. get_class($this) .'::$'. $name, E_USER_NOTICE);
-        }
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     *
-     * Calls the appropriate setter function.
-     * Issues an E_USER_NOTICE if no valid setter is found.
-     *
-     * @param string $name  property name
-     * @param mixed  $value parameter passed to setter
-     */
-    public function __set($name, $value)
-    {
-        $allowed = array(
-        'template_dir' => 'setTemplateDir',
-        'config_dir' => 'setConfigDir',
-        'plugins_dir' => 'setPluginsDir',
-        'compile_dir' => 'setCompileDir',
-        'cache_dir' => 'setCacheDir',
-        );
-
-        if (isset($allowed[$name])) {
-            $this->{$allowed[$name]}($value);
-        } else {
-            trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE);
-        }
-    }
-
-    /**
-     * Check if a template resource exists
-     *
-     * @param string $resource_name template name
-     * @return boolean status
-     */
-    public function templateExists($resource_name)
-    {
-        // create template object
-        $save = $this->template_objects;
-        $tpl = new $this->template_class($resource_name, $this);
-        // check if it does exists
-        $result = $tpl->source->exists;
-        $this->template_objects = $save;
-        return $result;
-    }
-
-    /**
-     * Returns a single or all global  variables
-     *
-     * @param object $smarty
-     * @param string $varname variable name or null
-     * @return string variable value or or array of variables
-     */
-    public function getGlobal($varname = null)
-    {
-        if (isset($varname)) {
-            if (isset(self::$global_tpl_vars[$varname])) {
-                return self::$global_tpl_vars[$varname]->value;
-            } else {
-                return '';
-            }
-        } else {
-            $_result = array();
-            foreach (self::$global_tpl_vars AS $key => $var) {
-                $_result[$key] = $var->value;
-            }
-            return $_result;
-        }
-    }
-
-    /**
-     * Empty cache folder
-     *
-     * @param integer $exp_time expiration time
-     * @param string  $type     resource type
-     * @return integer number of cache files deleted
-     */
-    function clearAllCache($exp_time = null, $type = null)
-    {
-        // load cache resource and call clearAll
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-        return $_cache_resource->clearAll($this, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param string  $template_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time
-     * @param string  $type          resource type
-     * @return integer number of cache files deleted
-     */
-    public function clearCache($template_name, $cache_id = null, $compile_id = null, $exp_time = null, $type = null)
-    {
-        // load cache resource and call clear
-        $_cache_resource = Smarty_CacheResource::load($this, $type);
-        Smarty_CacheResource::invalidLoadedCache($this);
-        return $_cache_resource->clear($this, $template_name, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * Loads security class and enables security
-     *
-     * @param string|Smarty_Security $security_class if a string is used, it must be class-name
-     * @return Smarty current Smarty instance for chaining
-     * @throws SmartyException when an invalid class name is provided
-     */
-    public function enableSecurity($security_class = null)
-    {
-        if ($security_class instanceof Smarty_Security) {
-            $this->security_policy = $security_class;
-            return $this;
-        } elseif (is_object($security_class)) {
-            throw new SmartyException("Class '" . get_class($security_class) . "' must extend Smarty_Security.");
-        }
-        if ($security_class == null) {
-            $security_class = $this->security_class;
-        }
-        if (!class_exists($security_class)) {
-            throw new SmartyException("Security class '$security_class' is not defined");
-        } elseif ($security_class !== 'Smarty_Security' && !is_subclass_of($security_class, 'Smarty_Security')) {
-            throw new SmartyException("Class '$security_class' must extend Smarty_Security.");
-        } else {
-            $this->security_policy = new $security_class($this);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Disable security
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function disableSecurity()
-    {
-        $this->security_policy = null;
-
-        return $this;
-    }
-
-    /**
-     * Set template directory
-     *
-     * @param string|array $template_dir directory(s) of template sources
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setTemplateDir($template_dir)
-    {
-        $this->template_dir = array();
-        foreach ((array) $template_dir as $k => $v) {
-            $this->template_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
-        return $this;
-    }
-
-    /**
-     * Add template directory(s)
-     *
-     * @param string|array $template_dir directory(s) of template sources
-     * @param string       $key          of the array element to assign the template dir to
-     * @return Smarty current Smarty instance for chaining
-     * @throws SmartyException when the given template directory is not valid
-     */
-    public function addTemplateDir($template_dir, $key=null)
-    {
-        // make sure we're dealing with an array
-        $this->template_dir = (array) $this->template_dir;
-
-        if (is_array($template_dir)) {
-            foreach ($template_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->template_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->template_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } elseif ($key !== null) {
-            // override directory at specified index
-            $this->template_dir[$key] = rtrim($template_dir, '/\\') . DS;
-        } else {
-            // append new directory
-            $this->template_dir[] = rtrim($template_dir, '/\\') . DS;
-        }
-        $this->joined_template_dir = join(DIRECTORY_SEPARATOR, $this->template_dir);
-        return $this;
-    }
-
-    /**
-     * Get template directories
-     *
-     * @param mixed index of directory to get, null to get all
-     * @return array|string list of template directories, or directory of $index
-     */
-    public function getTemplateDir($index=null)
-    {
-        if ($index !== null) {
-            return isset($this->template_dir[$index]) ? $this->template_dir[$index] : null;
-        }
-
-        return (array)$this->template_dir;
-    }
-
-    /**
-     * Set config directory
-     *
-     * @param string|array $template_dir directory(s) of configuration sources
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setConfigDir($config_dir)
-    {
-        $this->config_dir = array();
-        foreach ((array) $config_dir as $k => $v) {
-            $this->config_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-        return $this;
-    }
-
-    /**
-     * Add config directory(s)
-     *
-     * @param string|array $config_dir directory(s) of config sources
-     * @param string key of the array element to assign the config dir to
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addConfigDir($config_dir, $key=null)
-    {
-        // make sure we're dealing with an array
-        $this->config_dir = (array) $this->config_dir;
-
-        if (is_array($config_dir)) {
-            foreach ($config_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->config_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->config_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } elseif( $key !== null ) {
-            // override directory at specified index
-            $this->config_dir[$key] = rtrim($config_dir, '/\\') . DS;
-        } else {
-            // append new directory
-            $this->config_dir[] = rtrim($config_dir, '/\\') . DS;
-        }
-
-        $this->joined_config_dir = join(DIRECTORY_SEPARATOR, $this->config_dir);
-        return $this;
-    }
-
-    /**
-     * Get config directory
-     *
-     * @param mixed index of directory to get, null to get all
-     * @return array|string configuration directory
-     */
-    public function getConfigDir($index=null)
-    {
-        if ($index !== null) {
-            return isset($this->config_dir[$index]) ? $this->config_dir[$index] : null;
-        }
-
-        return (array)$this->config_dir;
-    }
-
-    /**
-     * Set plugins directory
-     *
-     * @param string|array $plugins_dir directory(s) of plugins
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setPluginsDir($plugins_dir)
-    {
-        $this->plugins_dir = array();
-        foreach ((array)$plugins_dir as $k => $v) {
-            $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds directory of plugin files
-     *
-     * @param object $smarty
-     * @param string $ |array $ plugins folder
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addPluginsDir($plugins_dir)
-    {
-        // make sure we're dealing with an array
-        $this->plugins_dir = (array) $this->plugins_dir;
-
-        if (is_array($plugins_dir)) {
-            foreach ($plugins_dir as $k => $v) {
-                if (is_int($k)) {
-                    // indexes are not merged but appended
-                    $this->plugins_dir[] = rtrim($v, '/\\') . DS;
-                } else {
-                    // string indexes are overridden
-                    $this->plugins_dir[$k] = rtrim($v, '/\\') . DS;
-                }
-            }
-        } else {
-            // append new directory
-            $this->plugins_dir[] = rtrim($plugins_dir, '/\\') . DS;
-        }
-
-        $this->plugins_dir = array_unique($this->plugins_dir);
-        return $this;
-    }
-
-    /**
-     * Get plugin directories
-     *
-     * @return array list of plugin directories
-     */
-    public function getPluginsDir()
-    {
-        return (array)$this->plugins_dir;
-    }
-
-    /**
-     * Set compile directory
-     *
-     * @param string $compile_dir directory to store compiled templates in
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setCompileDir($compile_dir)
-    {
-        $this->compile_dir = rtrim($compile_dir, '/\\') . DS;
-        if (!isset(Smarty::$_muted_directories[$this->compile_dir])) {
-            Smarty::$_muted_directories[$this->compile_dir] = null;
-        }
-        return $this;
-    }
-
-    /**
-     * Get compiled directory
-     *
-     * @return string path to compiled templates
-     */
-    public function getCompileDir()
-    {
-        return $this->compile_dir;
-    }
-
-    /**
-     * Set cache directory
-     *
-     * @param string $cache_dir directory to store cached templates in
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setCacheDir($cache_dir)
-    {
-        $this->cache_dir = rtrim($cache_dir, '/\\') . DS;
-        if (!isset(Smarty::$_muted_directories[$this->cache_dir])) {
-            Smarty::$_muted_directories[$this->cache_dir] = null;
-        }
-        return $this;
-    }
-
-    /**
-     * Get cache directory
-     *
-     * @return string path of cache directory
-     */
-    public function getCacheDir()
-    {
-        return $this->cache_dir;
-    }
-
-    /**
-     * Set default modifiers
-     *
-     * @param array|string $modifiers modifier or list of modifiers to set
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setDefaultModifiers($modifiers)
-    {
-        $this->default_modifiers = (array) $modifiers;
-        return $this;
-    }
-
-    /**
-     * Add default modifiers
-     *
-     * @param array|string $modifiers modifier or list of modifiers to add
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addDefaultModifiers($modifiers)
-    {
-        if (is_array($modifiers)) {
-            $this->default_modifiers = array_merge($this->default_modifiers, $modifiers);
-        } else {
-            $this->default_modifiers[] = $modifiers;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get default modifiers
-     *
-     * @return array list of default modifiers
-     */
-    public function getDefaultModifiers()
-    {
-        return $this->default_modifiers;
-    }
-
-
-    /**
-     * Set autoload filters
-     *
-     * @param array $filters filters to load automatically
-     * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function setAutoloadFilters($filters, $type=null)
-    {
-        if ($type !== null) {
-            $this->autoload_filters[$type] = (array) $filters;
-        } else {
-            $this->autoload_filters = (array) $filters;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add autoload filters
-     *
-     * @param array $filters filters to load automatically
-     * @param string $type "pre", "output", … specify the filter type to set. Defaults to none treating $filters' keys as the appropriate types
-     * @return Smarty current Smarty instance for chaining
-     */
-    public function addAutoloadFilters($filters, $type=null)
-    {
-        if ($type !== null) {
-            if (!empty($this->autoload_filters[$type])) {
-                $this->autoload_filters[$type] = array_merge($this->autoload_filters[$type], (array) $filters);
-            } else {
-                $this->autoload_filters[$type] = (array) $filters;
-            }
-        } else {
-            foreach ((array) $filters as $key => $value) {
-                if (!empty($this->autoload_filters[$key])) {
-                    $this->autoload_filters[$key] = array_merge($this->autoload_filters[$key], (array) $value);
-                } else {
-                    $this->autoload_filters[$key] = (array) $value;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get autoload filters
-     *
-     * @param string $type type of filter to get autoloads for. Defaults to all autoload filters
-     * @return array array( 'type1' => array( 'filter1', 'filter2', … ) ) or array( 'filter1', 'filter2', …) if $type was specified
-     */
-    public function getAutoloadFilters($type=null)
-    {
-        if ($type !== null) {
-            return isset($this->autoload_filters[$type]) ? $this->autoload_filters[$type] : array();
-        }
-
-        return $this->autoload_filters;
-    }
-
-    /**
-     * return name of debugging template
-     *
-     * @return string
-     */
-    public function getDebugTemplate()
-    {
-        return $this->debug_tpl;
-    }
-
-    /**
-     * set the debug template
-     *
-     * @param string $tpl_name
-     * @return Smarty current Smarty instance for chaining
-     * @throws SmartyException if file is not readable
-     */
-    public function setDebugTemplate($tpl_name)
-    {
-        if (!is_readable($tpl_name)) {
-            throw new SmartyException("Unknown file '{$tpl_name}'");
-        }
-        $this->debug_tpl = $tpl_name;
-
-        return $this;
-    }
-
-    /**
-     * creates a template object
-     *
-     * @param string $template the resource handle of the template file
-     * @param mixed $cache_id cache id to be used with this template
-     * @param mixed $compile_id compile id to be used with this template
-     * @param object $parent next higher level of Smarty variables
-     * @param boolean $do_clone flag is Smarty object shall be cloned
-     * @return object template object
-     */
-    public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
-    {
-        if (!empty($cache_id) && (is_object($cache_id) || is_array($cache_id))) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if (!empty($parent) && is_array($parent)) {
-            $data = $parent;
-            $parent = null;
-        } else {
-            $data = null;
-        }
-        // default to cache_id and compile_id of Smarty object
-        $cache_id = $cache_id === null ? $this->cache_id : $cache_id;
-        $compile_id = $compile_id === null ? $this->compile_id : $compile_id;
-        // already in template cache?
-        if ($this->allow_ambiguous_resources) {
-            $_templateId = Smarty_Resource::getUniqueTemplateName($this, $template) . $cache_id . $compile_id;
-        } else {
-            $_templateId = $this->joined_template_dir . '#' . $template . $cache_id . $compile_id;
-        }
-        if (isset($_templateId[150])) {
-            $_templateId = sha1($_templateId);
-        }
-        if ($do_clone) {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
-                $tpl = clone $this->template_objects[$_templateId];
-                $tpl->smarty = clone $tpl->smarty;
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
-            } else {
-                $tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id);
-            }
-        } else {
-            if (isset($this->template_objects[$_templateId])) {
-                // return cached template object
-                $tpl = $this->template_objects[$_templateId];
-                $tpl->parent = $parent;
-                $tpl->tpl_vars = array();
-                $tpl->config_vars = array();
-            } else {
-                $tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
-            }
-        }
-        // fill data if present
-        if (!empty($data) && is_array($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
-        return $tpl;
-    }
-
-
-    /**
-     * Takes unknown classes and loads plugin files for them
-     * class name format: Smarty_PluginType_PluginName
-     * plugin filename format: plugintype.pluginname.php
-     *
-     * @param string $plugin_name    class plugin name to load
-     * @param bool   $check          check if already loaded
-     * @return string |boolean filepath of loaded file or false
-     */
-    public function loadPlugin($plugin_name, $check = true)
-    {
-        // if function or class exists, exit silently (already loaded)
-        if ($check && (is_callable($plugin_name) || class_exists($plugin_name, false))) {
-            return true;
-        }
-        // Plugin name is expected to be: Smarty_[Type]_[Name]
-        $_name_parts = explode('_', $plugin_name, 3);
-        // class name must have three parts to be valid plugin
-        // count($_name_parts) < 3 === !isset($_name_parts[2])
-        if (!isset($_name_parts[2]) || strtolower($_name_parts[0]) !== 'smarty') {
-            throw new SmartyException("plugin {$plugin_name} is not a valid name format");
-            return false;
-        }
-        // if type is "internal", get plugin from sysplugins
-        if (strtolower($_name_parts[1]) == 'internal') {
-            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
-            if (file_exists($file)) {
-                require_once($file);
-                return $file;
-            } else {
-                return false;
-            }
-        }
-        // plugin filename is expected to be: [type].[name].php
-        $_plugin_filename = "{$_name_parts[1]}.{$_name_parts[2]}.php";
-        
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // loop through plugin dirs and find the plugin
-        foreach($this->getPluginsDir() as $_plugin_dir) {
-            $names = array(
-                $_plugin_dir . $_plugin_filename,
-                $_plugin_dir . strtolower($_plugin_filename),
-            );
-            foreach ($names as $file) {
-                if (file_exists($file)) {
-                    require_once($file);
-                    return $file;
-                }
-                if ($this->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $file = stream_resolve_include_path($file);
-                    } else {
-                        $file = Smarty_Internal_Get_Include_Path::getIncludePath($file);
-                    }
-                    
-                    if ($file !== false) {
-                        require_once($file);
-                        return $file;
-                    }
-                }
-            }
-        }
-        // no plugin loaded
-        return false;
-    }
-
-    /**
-     * Compile all template files
-     *
-     * @param string $extension file extension
-     * @param bool $force_compile force all to recompile
-     * @param int $time_limit
-     * @param int $max_errors
-     * @return integer number of template files recompiled
-     */
-    public function compileAllTemplates($extention = '.tpl', $force_compile = false, $time_limit = 0, $max_errors = null)
-    {
-        return Smarty_Internal_Utility::compileAllTemplates($extention, $force_compile, $time_limit, $max_errors, $this);
-    }
-
-    /**
-     * Compile all config files
-     *
-     * @param string $extension file extension
-     * @param bool $force_compile force all to recompile
-     * @param int $time_limit
-     * @param int $max_errors
-     * @return integer number of template files recompiled
-     */
-    public function compileAllConfig($extention = '.conf', $force_compile = false, $time_limit = 0, $max_errors = null)
-    {
-        return Smarty_Internal_Utility::compileAllConfig($extention, $force_compile, $time_limit, $max_errors, $this);
-    }
-
-    /**
-     * Delete compiled template file
-     *
-     * @param string $resource_name template name
-     * @param string $compile_id compile id
-     * @param integer $exp_time expiration time
-     * @return integer number of template files deleted
-     */
-    public function clearCompiledTemplate($resource_name = null, $compile_id = null, $exp_time = null)
-    {
-        return Smarty_Internal_Utility::clearCompiledTemplate($resource_name, $compile_id, $exp_time, $this);
-    }
-
-
-    /**
-     * Return array of tag/attributes of all tags used by an template
-     *
-     * @param object $templae template object
-     * @return array of tag/attributes
-     */
-    public function getTags(Smarty_Internal_Template $template)
-    {
-        return Smarty_Internal_Utility::getTags($template);
-    }
-
-    /**
-     * Run installation test
-     *
-     * @param array $errors Array to write errors into, rather than outputting them
-     * @return boolean true if setup is fine, false if something is wrong
-     */
-    public function testInstall(&$errors=null)
-    {
-        return Smarty_Internal_Utility::testInstall($this, $errors);
-    }
-
-    /**
-     * Error Handler to mute expected messages
-     *
-     * @link http://php.net/set_error_handler
-     * @param integer $errno Error level
-     * @return boolean
-     */
-    public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
-    {
-        $_is_muted_directory = false;
-
-        // add the SMARTY_DIR to the list of muted directories
-        if (!isset(Smarty::$_muted_directories[SMARTY_DIR])) {
-            $smarty_dir = realpath(SMARTY_DIR);
-            Smarty::$_muted_directories[SMARTY_DIR] = array(
-                'file' => $smarty_dir,
-                'length' => strlen($smarty_dir),
-            );
-        }
-
-        // walk the muted directories and test against $errfile
-        foreach (Smarty::$_muted_directories as $key => &$dir) {
-            if (!$dir) {
-                // resolve directory and length for speedy comparisons
-                $file = realpath($key);
-                $dir = array(
-                    'file' => $file,
-                    'length' => strlen($file),
-                );
-            }
-            if (!strncmp($errfile, $dir['file'], $dir['length'])) {
-                $_is_muted_directory = true;
-                break;
-            }
-        }
-
-        // pass to next error handler if this error did not occur inside SMARTY_DIR
-        // or the error was within smarty but masked to be ignored
-        if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
-            if (Smarty::$_previous_error_handler) {
-                return call_user_func(Smarty::$_previous_error_handler, $errno, $errstr, $errfile, $errline, $errcontext);
-            } else {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * Enable error handler to mute expected messages
-     *
-     * @return void
-     */
-    public static function muteExpectedErrors()
-    {
-        /*
-            error muting is done because some people implemented custom error_handlers using
-            http://php.net/set_error_handler and for some reason did not understand the following paragraph:
-
-                It is important to remember that the standard PHP error handler is completely bypassed for the
-                error types specified by error_types unless the callback function returns FALSE.
-                error_reporting() settings will have no effect and your error handler will be called regardless -
-                however you are still able to read the current value of error_reporting and act appropriately.
-                Of particular note is that this value will be 0 if the statement that caused the error was
-                prepended by the @ error-control operator.
-
-            Smarty deliberately uses @filemtime() over file_exists() and filemtime() in some places. Reasons include
-                - @filemtime() is almost twice as fast as using an additional file_exists()
-                - between file_exists() and filemtime() a possible race condition is opened,
-                  which does not exist using the simple @filemtime() approach.
-        */
-        $error_handler = array('Smarty', 'mutingErrorHandler');
-        $previous = set_error_handler($error_handler);
-
-        // avoid dead loops
-        if ($previous !== $error_handler) {
-            Smarty::$_previous_error_handler = $previous;
-        }
-    }
-
-    /**
-     * Disable error handler muting expected messages
-     *
-     * @return void
-     */
-    public static function unmuteExpectedErrors()
-    {
-        restore_error_handler();
-    }
-}
-
-// let PCRE (preg_*) treat strings as ISO-8859-1 if we're not dealing with UTF-8
-if (Smarty::$_CHARSET !== 'UTF-8') {
-    Smarty::$_UTF8_MODIFIER = '';
-}
-
-/**
- * Smarty exception class
- * @package Smarty
- */
-class SmartyException extends Exception {
-}
-
-/**
- * Smarty compiler exception class
- * @package Smarty
- */
-class SmartyCompilerException extends SmartyException  {
-}
-
-/**
- * Autoloader
- */
-function smartyAutoload($class)
-{
-    $_class = strtolower($class);
-    $_classes = array(
-        'smarty_config_source' => true,
-        'smarty_config_compiled' => true,
-        'smarty_security' => true,
-        'smarty_cacheresource' => true,
-        'smarty_cacheresource_custom' => true,
-        'smarty_cacheresource_keyvaluestore' => true,
-        'smarty_resource' => true,
-        'smarty_resource_custom' => true,
-        'smarty_resource_uncompiled' => true,
-        'smarty_resource_recompiled' => true,
-    );
-
-    if (!strncmp($_class, 'smarty_internal_', 16) || isset($_classes[$_class])) {
-        include SMARTY_SYSPLUGINS_DIR . $_class . '.php';
-    }
-}
-
-?>
diff --git a/resources/libs/smarty/SmartyBC.class.php b/resources/libs/smarty/SmartyBC.class.php
deleted file mode 100644
index f8f0a138f..000000000
--- a/resources/libs/smarty/SmartyBC.class.php
+++ /dev/null
@@ -1,460 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        SmartyBC.class.php
- * SVN:         $Id: $
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- * @author Rodney Rehm
- * @package Smarty
- */
-/**
- * @ignore
- */
-require(dirname(__FILE__) . '/Smarty.class.php');
-
-/**
- * Smarty Backward Compatability Wrapper Class
- *
- * @package Smarty
- */
-class SmartyBC extends Smarty {
-
-    /**
-     * Smarty 2 BC
-     * @var string
-     */
-    public $_version = self::SMARTY_VERSION;
-
-    /**
-     * Initialize new SmartyBC object
-     *
-     * @param array $options options to set during initialization, e.g. array( 'forceCompile' => false )
-     */
-    public function __construct(array $options=array())
-    {
-        parent::__construct($options);
-        // register {php} tag
-        $this->registerPlugin('block', 'php', 'smarty_php_tag');
-    }
-
-    /**
-     * wrapper for assign_by_ref
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed  &$value  the referenced value to assign
-     */
-    public function assign_by_ref($tpl_var, &$value)
-    {
-        $this->assignByRef($tpl_var, $value);
-    }
-
-    /**
-     * wrapper for append_by_ref
-     *
-     * @param string  $tpl_var the template variable name
-     * @param mixed   &$value  the referenced value to append
-     * @param boolean $merge   flag if array elements shall be merged
-     */
-    public function append_by_ref($tpl_var, &$value, $merge = false)
-    {
-        $this->appendByRef($tpl_var, $value, $merge);
-    }
-
-    /**
-     * clear the given assigned template variable.
-     *
-     * @param string $tpl_var the template variable to clear
-     */
-    public function clear_assign($tpl_var)
-    {
-        $this->clearAssign($tpl_var);
-    }
-
-    /**
-     * Registers custom function to be used in templates
-     *
-     * @param string $function      the name of the template function
-     * @param string $function_impl the name of the PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     */
-    public function register_function($function, $function_impl, $cacheable=true, $cache_attrs=null)
-    {
-        $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregisters custom function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_function($function)
-    {
-        $this->unregisterPlugin('function', $function);
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @param string  $object      name of template object
-     * @param object  $object_impl the referenced PHP object to register
-     * @param array   $allowed     list of allowed methods (empty = all)
-     * @param boolean $smarty_args smarty argument format, else traditional
-     * @param array   $block_functs list of methods that are block format
-     */
-    public function register_object($object, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
-    {
-        settype($allowed, 'array');
-        settype($smarty_args, 'boolean');
-        $this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods);
-    }
-
-    /**
-     * Unregisters object
-     *
-     * @param string $object name of template object
-     */
-    public function unregister_object($object)
-    {
-        $this->unregisterObject($object);
-    }
-
-    /**
-     * Registers block function to be used in templates
-     *
-     * @param string $block      name of template block
-     * @param string $block_impl PHP function to register
-     * @param bool   $cacheable
-     * @param mixed  $cache_attrs
-     */
-    public function register_block($block, $block_impl, $cacheable=true, $cache_attrs=null)
-    {
-        $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregisters block function
-     *
-     * @param string $block name of template function
-     */
-    public function unregister_block($block)
-    {
-        $this->unregisterPlugin('block', $block);
-    }
-
-    /**
-     * Registers compiler function
-     *
-     * @param string $function      name of template function
-     * @param string $function_impl name of PHP function to register
-     * @param bool   $cacheable
-     */
-    public function register_compiler_function($function, $function_impl, $cacheable=true)
-    {
-        $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
-    }
-
-    /**
-     * Unregisters compiler function
-     *
-     * @param string $function name of template function
-     */
-    public function unregister_compiler_function($function)
-    {
-        $this->unregisterPlugin('compiler', $function);
-    }
-
-    /**
-     * Registers modifier to be used in templates
-     *
-     * @param string $modifier name of template modifier
-     * @param string $modifier_impl name of PHP function to register
-     */
-    public function register_modifier($modifier, $modifier_impl)
-    {
-        $this->registerPlugin('modifier', $modifier, $modifier_impl);
-    }
-
-    /**
-     * Unregisters modifier
-     *
-     * @param string $modifier name of template modifier
-     */
-    public function unregister_modifier($modifier)
-    {
-        $this->unregisterPlugin('modifier', $modifier);
-    }
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @param string $type      name of resource
-     * @param array  $functions array of functions to handle resource
-     */
-    public function register_resource($type, $functions)
-    {
-        $this->registerResource($type, $functions);
-    }
-
-    /**
-     * Unregisters a resource
-     *
-     * @param string $type name of resource
-     */
-    public function unregister_resource($type)
-    {
-        $this->unregisterResource($type);
-    }
-
-    /**
-     * Registers a prefilter function to apply
-     * to a template before compiling
-     *
-     * @param callable $function
-     */
-    public function register_prefilter($function)
-    {
-        $this->registerFilter('pre', $function);
-    }
-
-    /**
-     * Unregisters a prefilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_prefilter($function)
-    {
-        $this->unregisterFilter('pre', $function);
-    }
-
-    /**
-     * Registers a postfilter function to apply
-     * to a compiled template after compilation
-     *
-     * @param callable $function
-     */
-    public function register_postfilter($function)
-    {
-        $this->registerFilter('post', $function);
-    }
-
-    /**
-     * Unregisters a postfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_postfilter($function)
-    {
-        $this->unregisterFilter('post', $function);
-    }
-
-    /**
-     * Registers an output filter function to apply
-     * to a template output
-     *
-     * @param callable $function
-     */
-    public function register_outputfilter($function)
-    {
-        $this->registerFilter('output', $function);
-    }
-
-    /**
-     * Unregisters an outputfilter function
-     *
-     * @param callable $function
-     */
-    public function unregister_outputfilter($function)
-    {
-        $this->unregisterFilter('output', $function);
-    }
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     */
-    public function load_filter($type, $name)
-    {
-        $this->loadFilter($type, $name);
-    }
-
-    /**
-     * clear cached content for the given template and cache id
-     *
-     * @param string $tpl_file   name of template file
-     * @param string $cache_id   name of cache_id
-     * @param string $compile_id name of compile_id
-     * @param string $exp_time   expiration time
-     * @return boolean
-     */
-    public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCache($tpl_file, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * clear the entire contents of cache (all templates)
-     *
-     * @param string $exp_time expire time
-     * @return boolean
-     */
-    public function clear_all_cache($exp_time = null)
-    {
-        return $this->clearCache(null, null, null, $exp_time);
-    }
-
-    /**
-     * test to see if valid cache exists for this template
-     *
-     * @param string $tpl_file name of template file
-     * @param string $cache_id
-     * @param string $compile_id
-     * @return boolean
-     */
-    public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
-    {
-        return $this->isCached($tpl_file, $cache_id, $compile_id);
-    }
-
-    /**
-     * clear all the assigned template variables.
-     */
-    public function clear_all_assign()
-    {
-        $this->clearAllAssign();
-    }
-
-    /**
-     * clears compiled version of specified template resource,
-     * or all compiled template files if one is not specified.
-     * This function is for advanced use only, not normally needed.
-     *
-     * @param string $tpl_file
-     * @param string $compile_id
-     * @param string $exp_time
-     * @return boolean results of {@link smarty_core_rm_auto()}
-     */
-    public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
-    {
-        return $this->clearCompiledTemplate($tpl_file, $compile_id, $exp_time);
-    }
-
-    /**
-     * Checks whether requested template exists.
-     *
-     * @param string $tpl_file
-     * @return boolean
-     */
-    public function template_exists($tpl_file)
-    {
-        return $this->templateExists($tpl_file);
-    }
-
-    /**
-     * Returns an array containing template variables
-     *
-     * @param string $name
-     * @return array
-     */
-    public function get_template_vars($name=null)
-    {
-        return $this->getTemplateVars($name);
-    }
-
-    /**
-     * Returns an array containing config variables
-     *
-     * @param string $name
-     * @return array
-     */
-    public function get_config_vars($name=null)
-    {
-        return $this->getConfigVars($name);
-    }
-
-    /**
-     * load configuration values
-     *
-     * @param string $file
-     * @param string $section
-     * @param string $scope
-     */
-    public function config_load($file, $section = null, $scope = 'global')
-    {
-        $this->ConfigLoad($file, $section, $scope);
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param string $name
-     * @return object
-     */
-    public function get_registered_object($name)
-    {
-        return $this->getRegisteredObject($name);
-    }
-
-    /**
-     * clear configuration values
-     *
-     * @param string $var
-     */
-    public function clear_config($var = null)
-    {
-        $this->clearConfig($var);
-    }
-
-    /**
-     * trigger Smarty error
-     *
-     * @param string $error_msg
-     * @param integer $error_type
-     */
-    public function trigger_error($error_msg, $error_type = E_USER_WARNING)
-    {
-        trigger_error("Smarty error: $error_msg", $error_type);
-    }
-
-}
-
-/**
- * Smarty {php}{/php} block function
- *
- * @param array   $params   parameter list
- * @param string  $content  contents of the block
- * @param object  $template template object
- * @param boolean &$repeat  repeat flag
- * @return string content re-formatted
- */
-function smarty_php_tag($params, $content, $template, &$repeat)
-{
-    eval($content);
-    return '';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/debug.tpl b/resources/libs/smarty/debug.tpl
deleted file mode 100644
index 12eef0ffd..000000000
--- a/resources/libs/smarty/debug.tpl
+++ /dev/null
@@ -1,133 +0,0 @@
-{capture name='_smarty_debug' assign=debug_output}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-    <title>Smarty Debug Console</title>
-<style type="text/css">
-{literal}
-body, h1, h2, td, th, p {
-    font-family: sans-serif;
-    font-weight: normal;
-    font-size: 0.9em;
-    margin: 1px;
-    padding: 0;
-}
-
-h1 {
-    margin: 0;
-    text-align: left;
-    padding: 2px;
-    background-color: #f0c040;
-    color:  black;
-    font-weight: bold;
-    font-size: 1.2em;
- }
-
-h2 {
-    background-color: #9B410E;
-    color: white;
-    text-align: left;
-    font-weight: bold;
-    padding: 2px;
-    border-top: 1px solid black;
-}
-
-body {
-    background: black; 
-}
-
-p, table, div {
-    background: #f0ead8;
-} 
-
-p {
-    margin: 0;
-    font-style: italic;
-    text-align: center;
-}
-
-table {
-    width: 100%;
-}
-
-th, td {
-    font-family: monospace;
-    vertical-align: top;
-    text-align: left;
-    width: 50%;
-}
-
-td {
-    color: green;
-}
-
-.odd {
-    background-color: #eeeeee;
-}
-
-.even {
-    background-color: #fafafa;
-}
-
-.exectime {
-    font-size: 0.8em;
-    font-style: italic;
-}
-
-#table_assigned_vars th {
-    color: blue;
-}
-
-#table_config_vars th {
-    color: maroon;
-}
-{/literal}
-</style>
-</head>
-<body>
-
-<h1>Smarty Debug Console  -  {if isset($template_name)}{$template_name|debug_print_var nofilter}{else}Total Time {$execution_time|string_format:"%.5f"}{/if}</h1>
-
-{if !empty($template_data)}
-<h2>included templates &amp; config files (load time in seconds)</h2>
-
-<div>
-{foreach $template_data as $template}
-  <font color=brown>{$template.name}</font>
-  <span class="exectime">
-   (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
-  </span>
-  <br>
-{/foreach}
-</div>
-{/if}
-
-<h2>assigned template variables</h2>
-
-<table id="table_assigned_vars">
-    {foreach $assigned_vars as $vars}
-       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
-       <th>${$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var nofilter}</td></tr>
-    {/foreach}
-</table>
-
-<h2>assigned config file variables (outer template scope)</h2>
-
-<table id="table_config_vars">
-    {foreach $config_vars as $vars}
-       <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">   
-       <th>{$vars@key|escape:'html'}</th>
-       <td>{$vars|debug_print_var nofilter}</td></tr>
-    {/foreach}
-
-</table>
-</body>
-</html>
-{/capture}
-<script type="text/javascript">
-{$id = $template_name|default:''|md5}
-    _smarty_console = window.open("","console{$id}","width=680,height=600,resizable,scrollbars=yes");
-    _smarty_console.document.write("{$debug_output|escape:'javascript' nofilter}");
-    _smarty_console.document.close();
-</script>
diff --git a/resources/libs/smarty/eval.tpl b/resources/libs/smarty/eval.tpl
deleted file mode 100755
index d34dfee04..000000000
--- a/resources/libs/smarty/eval.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{eval var=$eval_str}
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/block.textformat.php b/resources/libs/smarty/plugins/block.textformat.php
deleted file mode 100644
index b22b104a5..000000000
--- a/resources/libs/smarty/plugins/block.textformat.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Smarty plugin to format text blocks
- *
- * @package Smarty
- * @subpackage PluginsBlock
- */
-
-/**
- * Smarty {textformat}{/textformat} block plugin
- *
- * Type:     block function<br>
- * Name:     textformat<br>
- * Purpose:  format text a certain way with preset styles
- *           or custom wrap/indent settings<br>
- * Params:
- * <pre>
- * - style         - string (email)
- * - indent        - integer (0)
- * - wrap          - integer (80)
- * - wrap_char     - string ("\n")
- * - indent_char   - string (" ")
- * - wrap_boundary - boolean (true)
- * </pre>
- *
- * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat}
- *       (Smarty online manual)
- * @param array                    $params   parameters
- * @param string                   $content  contents of the block
- * @param Smarty_Internal_Template $template template object
- * @param boolean                  &$repeat  repeat flag
- * @return string content re-formatted
- * @author Monte Ohrt <monte at ohrt dot com>
- */
-function smarty_block_textformat($params, $content, $template, &$repeat)
-{
-    if (is_null($content)) {
-        return;
-    }
-
-    $style = null;
-    $indent = 0;
-    $indent_first = 0;
-    $indent_char = ' ';
-    $wrap = 80;
-    $wrap_char = "\n";
-    $wrap_cut = false;
-    $assign = null;
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'style':
-            case 'indent_char':
-            case 'wrap_char':
-            case 'assign':
-                $$_key = (string)$_val;
-                break;
-
-            case 'indent':
-            case 'indent_first':
-            case 'wrap':
-                $$_key = (int)$_val;
-                break;
-
-            case 'wrap_cut':
-                $$_key = (bool)$_val;
-                break;
-
-            default:
-                trigger_error("textformat: unknown attribute '$_key'");
-        }
-    }
-
-    if ($style == 'email') {
-        $wrap = 72;
-    }
-    // split into paragraphs
-    $_paragraphs = preg_split('![\r\n]{2}!', $content);
-    $_output = '';
-
-
-    foreach ($_paragraphs as &$_paragraph) {
-        if (!$_paragraph) {
-            continue;
-        }
-        // convert mult. spaces & special chars to single space
-        $_paragraph = preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER, '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER), array(' ', ''), $_paragraph);
-        // indent first line
-        if ($indent_first > 0) {
-            $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph;
-        }
-        // wordwrap sentences
-        if (Smarty::$_MBSTRING) {
-            require_once(SMARTY_PLUGINS_DIR . 'shared.mb_wordwrap.php');
-            $_paragraph = smarty_mb_wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
-        } else {
-            $_paragraph = wordwrap($_paragraph, $wrap - $indent, $wrap_char, $wrap_cut);
-        }
-        // indent lines
-        if ($indent > 0) {
-            $_paragraph = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraph);
-        }
-    }
-    $_output = implode($wrap_char . $wrap_char, $_paragraphs);
-    
-    if ($assign) {
-        $template->assign($assign, $_output);
-    } else {
-        return $_output;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.counter.php b/resources/libs/smarty/plugins/function.counter.php
deleted file mode 100644
index 3906badf0..000000000
--- a/resources/libs/smarty/plugins/function.counter.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {counter} function plugin
- *
- * Type:     function<br>
- * Name:     counter<br>
- * Purpose:  print out a counter value
- *
- * @author Monte Ohrt <monte at ohrt dot com>
- * @link http://www.smarty.net/manual/en/language.function.counter.php {counter}
- *       (Smarty online manual)
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string|null
- */
-function smarty_function_counter($params, $template)
-{
-    static $counters = array();
-
-    $name = (isset($params['name'])) ? $params['name'] : 'default';
-    if (!isset($counters[$name])) {
-        $counters[$name] = array(
-            'start'=>1,
-            'skip'=>1,
-            'direction'=>'up',
-            'count'=>1
-            );
-    }
-    $counter =& $counters[$name];
-
-    if (isset($params['start'])) {
-        $counter['start'] = $counter['count'] = (int)$params['start'];
-    }
-
-    if (!empty($params['assign'])) {
-        $counter['assign'] = $params['assign'];
-    }
-
-    if (isset($counter['assign'])) {
-        $template->assign($counter['assign'], $counter['count']);
-    }
-    
-    if (isset($params['print'])) {
-        $print = (bool)$params['print'];
-    } else {
-        $print = empty($counter['assign']);
-    }
-
-    if ($print) {
-        $retval = $counter['count'];
-    } else {
-        $retval = null;
-    }
-
-    if (isset($params['skip'])) {
-        $counter['skip'] = $params['skip'];
-    }
-    
-    if (isset($params['direction'])) {
-        $counter['direction'] = $params['direction'];
-    }
-
-    if ($counter['direction'] == "down")
-        $counter['count'] -= $counter['skip'];
-    else
-        $counter['count'] += $counter['skip'];
-    
-    return $retval;
-    
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.country_plugins.php b/resources/libs/smarty/plugins/function.country_plugins.php
deleted file mode 100644
index bf952931b..000000000
--- a/resources/libs/smarty/plugins/function.country_plugins.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-
-/**
- * Used in the main generator page to display a list of country-specific data. This is used
- * for the Country, State/Province, Postal Code - and potentially other Data Types.
- */
-function smarty_function_country_plugins() {
-	$continents     = Core::getContinents();
-	$defaultChecked = Core::getDefaultCountryPlugins();
-	$countryPlugins = Core::$countryPlugins;
-	$L = Core::$language->getCurrentLanguageStrings();
-
-	echo "<select id=\"gdCountries\" name=\"gdCountries[]\" multiple style=\"width: 100%\" data-placeholder=\"{$L["all_countries"]}\">";
-	foreach ($continents as $continent) {
-
-		$countriesInCurrContinent = array();
-		foreach ($countryPlugins as $obj) {
-			//echo $obj->getContinent();
-			if ($obj->getContinent() != $continent) {
-				continue;
-			}
-			$countryName = $obj->getName();
-			$slug        = $obj->getSlug();
-			$selected    = (in_array($slug, $defaultChecked)) ? " selected=\"selected\"" : "";
-			$countriesInCurrContinent[] = "<option value=\"$slug\"$selected>$countryName</option>";
-		}
-
-		if (!empty($countriesInCurrContinent)) {
-			$continent = $L[$continent];
-			echo "<optgroup label=\"$continent\">" . implode("\n", $countriesInCurrContinent) . "</optgroup>";
-		}
-	}
-	echo "</select>";
-}
diff --git a/resources/libs/smarty/plugins/function.cycle.php b/resources/libs/smarty/plugins/function.cycle.php
deleted file mode 100644
index 1778ffb53..000000000
--- a/resources/libs/smarty/plugins/function.cycle.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {cycle} function plugin
- *
- * Type:     function<br>
- * Name:     cycle<br>
- * Date:     May 3, 2002<br>
- * Purpose:  cycle through given values<br>
- * Params:
- * <pre>
- * - name      - name of cycle (optional)
- * - values    - comma separated list of values to cycle, or an array of values to cycle
- *               (this can be left out for subsequent calls)
- * - reset     - boolean - resets given var to true
- * - print     - boolean - print var or not. default is true
- * - advance   - boolean - whether or not to advance the cycle
- * - delimiter - the value delimiter, default is ","
- * - assign    - boolean, assigns to template var instead of printed.
- * </pre>
- * Examples:<br>
- * <pre>
- * {cycle values="#eeeeee,#d0d0d0d"}
- * {cycle name=row values="one,two,three" reset=true}
- * {cycle name=row}
- * </pre>
- *
- * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle}
- *       (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credit to Mark Priatel <mpriatel@rogers.com>
- * @author credit to Gerard <gerard@interfold.com>
- * @author credit to Jason Sweat <jsweat_php@yahoo.com>
- * @version  1.3
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string|null
- */
-
-function smarty_function_cycle($params, $template)
-{
-    static $cycle_vars;
-
-    $name = (empty($params['name'])) ? 'default' : $params['name'];
-    $print = (isset($params['print'])) ? (bool)$params['print'] : true;
-    $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true;
-    $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
-
-    if (!isset($params['values'])) {
-        if(!isset($cycle_vars[$name]['values'])) {
-            trigger_error("cycle: missing 'values' parameter");
-            return;
-        }
-    } else {
-        if(isset($cycle_vars[$name]['values'])
-            && $cycle_vars[$name]['values'] != $params['values'] ) {
-            $cycle_vars[$name]['index'] = 0;
-        }
-        $cycle_vars[$name]['values'] = $params['values'];
-    }
-
-    if (isset($params['delimiter'])) {
-        $cycle_vars[$name]['delimiter'] = $params['delimiter'];
-    } elseif (!isset($cycle_vars[$name]['delimiter'])) {
-        $cycle_vars[$name]['delimiter'] = ',';
-    }
-
-    if(is_array($cycle_vars[$name]['values'])) {
-        $cycle_array = $cycle_vars[$name]['values'];
-    } else {
-        $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
-    }
-
-    if(!isset($cycle_vars[$name]['index']) || $reset ) {
-        $cycle_vars[$name]['index'] = 0;
-    }
-
-    if (isset($params['assign'])) {
-        $print = false;
-        $template->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
-    }
-
-    if($print) {
-        $retval = $cycle_array[$cycle_vars[$name]['index']];
-    } else {
-        $retval = null;
-    }
-
-    if($advance) {
-        if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
-            $cycle_vars[$name]['index'] = 0;
-        } else {
-            $cycle_vars[$name]['index']++;
-        }
-    }
-
-    return $retval;
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.data_type_examples.php b/resources/libs/smarty/plugins/function.data_type_examples.php
deleted file mode 100644
index 69cb7ab24..000000000
--- a/resources/libs/smarty/plugins/function.data_type_examples.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * This is used on the generate page to output raw markup into the page for use by the generator.
- *
- * @param array $params
- * @param object $smarty
- */
-function smarty_function_data_type_examples($params, &$smarty) {
-	$resources = DataTypePluginHelper::getDataTypeResources();
-	for ($i=0; $i<count($resources); $i++) {
-		$currDataTypeResource = $resources[$i];
-
-		echo "<div id=\"gdDataTypeExamples_data-type-{$currDataTypeResource["folder"]}\">{$currDataTypeResource["examples"]}</div>";
-	}
-}
diff --git a/resources/libs/smarty/plugins/function.data_type_help.php b/resources/libs/smarty/plugins/function.data_type_help.php
deleted file mode 100644
index 29df7d358..000000000
--- a/resources/libs/smarty/plugins/function.data_type_help.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * This is used on the generate page to output raw markup into the page for use by the generator.
- *
- * @param array $params
- * @param object $smarty
- */
-function smarty_function_data_type_help($params, &$smarty) {
-	$resources = DataTypePluginHelper::getDataTypeResources();
-	for ($i=0; $i<count($resources); $i++) {
-		$currDataTypeResource = $resources[$i];
-		echo "<div id=\"gdDataTypeHelp_data-type-{$currDataTypeResource["folder"]}\" class=\"hidden\">{$currDataTypeResource["help"]}</div>";
-	}
-}
diff --git a/resources/libs/smarty/plugins/function.data_type_options.php b/resources/libs/smarty/plugins/function.data_type_options.php
deleted file mode 100644
index 297e9dbf6..000000000
--- a/resources/libs/smarty/plugins/function.data_type_options.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * This is used on the generate page to output raw markup into the page for use by the generator.
- *
- * @param array $params
- * @param object $smarty
- */
-function smarty_function_data_type_options($params, &$smarty) {
-	$resources = DataTypePluginHelper::getDataTypeResources();
-	for ($i=0; $i<count($resources); $i++) {
-		$currDataTypeResource = $resources[$i];
-		echo "<div id=\"gdDataTypeOptions_data-type-{$currDataTypeResource["folder"]}\">{$currDataTypeResource["options"]}</div>";
-	}
-}
diff --git a/resources/libs/smarty/plugins/function.data_types_dropdown.php b/resources/libs/smarty/plugins/function.data_types_dropdown.php
deleted file mode 100644
index f6f908ed4..000000000
--- a/resources/libs/smarty/plugins/function.data_types_dropdown.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Used in the Settings tab to output a list of available dropdowns. This is enhanced client-side with
- * the Chosen plugin.
- */
-function smarty_function_data_types_dropdown($params, &$smarty) {
-	$L = Core::$language->getCurrentLanguageStrings();
-	$dataTypeGroups = Core::$dataTypePlugins;
-
-	// TODO clean up these
-
-	$name = isset($params["name"]) ? $params["name"] : "gdDataType_%ROW%";
-	$id = isset($params["id"]) ? $params["id"] : "gdDataType_%ROW%";
-	$multiple = (isset($params["multiple"]) && $params["multiple"]) ? "multiple" : "";
-	$extras = (isset($params["extras"])) ? $params["extras"] : "";
-	$style = (isset($params["style"])) ? $params["style"] : "";
-	$includeDefaultOption = (isset($params["includeDefaultOption"])) ? $params["includeDefaultOption"] : true;
-	$selected = isset($params["selected"]) ? explode(",", $params["selected"]) : array();
-
-	$options = "";
-	if ($includeDefaultOption) {
-		$options .= "<option value=\"\">{$L["select_data_type"]}</option>";
-	}
-
-	while (list($group, $dataTypes) = each($dataTypeGroups)) {
-		$groupName = $L[$group];
-		$options .= "<optgroup label=\"$groupName\">\n";
-
-		foreach ($dataTypes as $dataType) {
-			$currName = $dataType->getName();
-			$value = "data-type-{$dataType->folder}";
-			$selectedAttr = (in_array($value, $selected)) ? " selected=\"selected\"" : "";
-			$options .= "<option value=\"$value\"$selectedAttr>$currName</option>\n";
-		}
-		$options .= "</optgroup>";
-	}
-
-	echo <<< END
-	<select class="gdDataType" name="$name" id="$id" style="$style" $multiple $extras>
-		$options
-	</select>
-END;
-}
diff --git a/resources/libs/smarty/plugins/function.data_types_list.php b/resources/libs/smarty/plugins/function.data_types_list.php
deleted file mode 100644
index aa07ac3fd..000000000
--- a/resources/libs/smarty/plugins/function.data_types_list.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Used in the Settings tab to output a list of available dropdowns. This is enhanced client-side with
- * the Chosen plugin.
- */
-function smarty_function_data_types_list($params, &$smarty) {
-	$L = Core::$language->getCurrentLanguageStrings();
-	$dataTypeGroups = Core::$dataTypePlugins;
-
-	$html = "<ul>\n";
-	while (list($group, $dataTypes) = each($dataTypeGroups)) {
-		$groupName = $L[$group];
-		$html .= "<li class=\"gdDataTypeHeader\">$groupName</li>";
-
-		foreach ($dataTypes as $dataType) {
-			$dataTypeName = $dataType->getName();
-			$moduleID = "data-type-{$dataType->folder}";
-			$html .= "<li data-module=\"$moduleID\"><a href=\"#\">$dataTypeName</a></li>\n";
-		}
-	}
-	$html .= "</ul>";
-
-	echo $html;
-}
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.export_type_tabs.php b/resources/libs/smarty/plugins/function.export_type_tabs.php
deleted file mode 100644
index 4227f8ed6..000000000
--- a/resources/libs/smarty/plugins/function.export_type_tabs.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Generates the list of available Export Types in tab format.
- *
- * @param array $params
- * @param object $smarty
- */
-function smarty_function_export_type_tabs($params, &$smarty) {
-	$defaultExportType = Core::getDefaultExportType();
-	$exportTypes       = Core::$exportTypePlugins;
-
-	echo "<ul>";
-	foreach ($exportTypes as $exportType) {
-		$name       = $exportType->getName();
-		$exportTypeClass = get_class($exportType);
-		$class = ($defaultExportType == $exportTypeClass) ? "gdSelected gdDefaultExportType" : "";
-		$exportTargets = implode(",", $exportType->getCompatibleExportTargets());
-		echo "<li data-export-type=\"$exportTypeClass\" data-compatible-export-targets=\"$exportTargets\" id=\"gdExportType_$exportTypeClass\" class=\"$class\">$name</li>";
-	}
-	echo "</ul>";
-}
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.export_types_dropdown.php b/resources/libs/smarty/plugins/function.export_types_dropdown.php
deleted file mode 100644
index 43382d34e..000000000
--- a/resources/libs/smarty/plugins/function.export_types_dropdown.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-function smarty_function_export_types_dropdown($params, &$smarty) {
-	$L = Core::$language->getCurrentLanguageStrings();
-	$exportTypeGroups = Core::$exportTypePlugins;
-
-	// TODO clean up these
-
-	$name = isset($params["name"]) ? $params["name"] : "gdDataType_%ROW%";
-	$id = isset($params["id"]) ? $params["id"] : "gdDataType_%ROW%";
-	$multiple = (isset($params["multiple"]) && $params["multiple"]) ? "multiple" : "";
-	$extras = (isset($params["extras"])) ? $params["extras"] : "";
-	$style = (isset($params["style"])) ? $params["style"] : "";
-	$includeDefaultOption = (isset($params["includeDefaultOption"])) ? $params["includeDefaultOption"] : true;
-	$selected = explode(",", $params["selected"]);
-
-	$options = "";
-	if ($includeDefaultOption) {
-		$options .= "<option value=\"\">{$L["please_select"]}</option>";
-	}
-
-	foreach ($exportTypeGroups as $exportTypeGroup) {
-		$currName = $exportTypeGroup->getName();
-		$value = "export-type-{$exportTypeGroup->folder}";
-		$selectedAttr = (in_array($value, $selected)) ? " selected=\"selected\"" : "";
-		$options .= "<option value=\"$value\"$selectedAttr>$currName</option>\n";
-	}
-
-	echo <<< END
-	<select class="gdDataType" name="$name" id="$id" style="$style" $multiple $extras>
-		$options
-	</select>
-END;
-}
diff --git a/resources/libs/smarty/plugins/function.fetch.php b/resources/libs/smarty/plugins/function.fetch.php
deleted file mode 100644
index eca1182d5..000000000
--- a/resources/libs/smarty/plugins/function.fetch.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {fetch} plugin
- *
- * Type:     function<br>
- * Name:     fetch<br>
- * Purpose:  fetch file, web or ftp data and display results
- *
- * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch}
- *       (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable
- */
-function smarty_function_fetch($params, $template)
-{
-    if (empty($params['file'])) {
-        trigger_error("[plugin] fetch parameter 'file' cannot be empty",E_USER_NOTICE);
-        return;
-    }
-    
-    // strip file protocol
-    if (stripos($params['file'], 'file://') === 0) {
-        $params['file'] = substr($params['file'], 7);
-    }
-    
-    $protocol = strpos($params['file'], '://');
-    if ($protocol !== false) {
-        $protocol = strtolower(substr($params['file'], 0, $protocol));
-    }
-    
-    if (isset($template->smarty->security_policy)) {
-        if ($protocol) {
-            // remote resource (or php stream, …)
-            if(!$template->smarty->security_policy->isTrustedUri($params['file'])) {
-                return;
-            }
-        } else {
-            // local file
-            if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
-                return;
-            }
-        }
-    }
-
-    $content = '';
-    if ($protocol == 'http') {
-        // http fetch
-        if($uri_parts = parse_url($params['file'])) {
-            // set defaults
-            $host = $server_name = $uri_parts['host'];
-            $timeout = 30;
-            $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
-            $agent = "Smarty Template Engine ". Smarty::SMARTY_VERSION;
-            $referer = "";
-            $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
-            $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
-            $_is_proxy = false;
-            if(empty($uri_parts['port'])) {
-                $port = 80;
-            } else {
-                $port = $uri_parts['port'];
-            }
-            if(!empty($uri_parts['user'])) {
-                $user = $uri_parts['user'];
-            }
-            if(!empty($uri_parts['pass'])) {
-                $pass = $uri_parts['pass'];
-            }
-            // loop through parameters, setup headers
-            foreach($params as $param_key => $param_value) {
-                switch($param_key) {
-                    case "file":
-                    case "assign":
-                    case "assign_headers":
-                        break;
-                    case "user":
-                        if(!empty($param_value)) {
-                            $user = $param_value;
-                        }
-                        break;
-                    case "pass":
-                        if(!empty($param_value)) {
-                            $pass = $param_value;
-                        }
-                        break;
-                    case "accept":
-                        if(!empty($param_value)) {
-                            $accept = $param_value;
-                        }
-                        break;
-                    case "header":
-                        if(!empty($param_value)) {
-                            if(!preg_match('![\w\d-]+: .+!',$param_value)) {
-                                trigger_error("[plugin] invalid header format '".$param_value."'",E_USER_NOTICE);
-                                return;
-                            } else {
-                                $extra_headers[] = $param_value;
-                            }
-                        }
-                        break;
-                    case "proxy_host":
-                        if(!empty($param_value)) {
-                            $proxy_host = $param_value;
-                        }
-                        break;
-                    case "proxy_port":
-                        if(!preg_match('!\D!', $param_value)) {
-                            $proxy_port = (int) $param_value;
-                        } else {
-                            trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
-                            return;
-                        }
-                        break;
-                    case "agent":
-                        if(!empty($param_value)) {
-                            $agent = $param_value;
-                        }
-                        break;
-                    case "referer":
-                        if(!empty($param_value)) {
-                            $referer = $param_value;
-                        }
-                        break;
-                    case "timeout":
-                        if(!preg_match('!\D!', $param_value)) {
-                            $timeout = (int) $param_value;
-                        } else {
-                            trigger_error("[plugin] invalid value for attribute '".$param_key."'",E_USER_NOTICE);
-                            return;
-                        }
-                        break;
-                    default:
-                        trigger_error("[plugin] unrecognized attribute '".$param_key."'",E_USER_NOTICE);
-                        return;
-                }
-            }
-            if(!empty($proxy_host) && !empty($proxy_port)) {
-                $_is_proxy = true;
-                $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout);
-            } else {
-                $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
-            }
-
-            if(!$fp) {
-                trigger_error("[plugin] unable to fetch: $errstr ($errno)",E_USER_NOTICE);
-                return;
-            } else {
-                if($_is_proxy) {
-                    fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
-                } else {
-                    fputs($fp, "GET $uri HTTP/1.0\r\n");
-                }
-                if(!empty($host)) {
-                    fputs($fp, "Host: $host\r\n");
-                }
-                if(!empty($accept)) {
-                    fputs($fp, "Accept: $accept\r\n");
-                }
-                if(!empty($agent)) {
-                    fputs($fp, "User-Agent: $agent\r\n");
-                }
-                if(!empty($referer)) {
-                    fputs($fp, "Referer: $referer\r\n");
-                }
-                if(isset($extra_headers) && is_array($extra_headers)) {
-                    foreach($extra_headers as $curr_header) {
-                        fputs($fp, $curr_header."\r\n");
-                    }
-                }
-                if(!empty($user) && !empty($pass)) {
-                    fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n");
-                }
-
-                fputs($fp, "\r\n");
-                while(!feof($fp)) {
-                    $content .= fgets($fp,4096);
-                }
-                fclose($fp);
-                $csplit = preg_split("!\r\n\r\n!",$content,2);
-
-                $content = $csplit[1];
-
-                if(!empty($params['assign_headers'])) {
-                    $template->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0]));
-                }
-            }
-        } else {
-            trigger_error("[plugin fetch] unable to parse URL, check syntax",E_USER_NOTICE);
-            return;
-        }
-    } else {
-        $content = @file_get_contents($params['file']);
-        if ($content === false) {
-            throw new SmartyException("{fetch} cannot read resource '" . $params['file'] ."'");
-        }
-    }
-
-    if (!empty($params['assign'])) {
-        $template->assign($params['assign'], $content);
-    } else {
-        return $content;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.html_checkboxes.php b/resources/libs/smarty/plugins/function.html_checkboxes.php
deleted file mode 100644
index fb9584bbd..000000000
--- a/resources/libs/smarty/plugins/function.html_checkboxes.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_checkboxes} function plugin
- *
- * File:       function.html_checkboxes.php<br>
- * Type:       function<br>
- * Name:       html_checkboxes<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of checkbox input types<br>
- * Examples:
- * <pre>
- * {html_checkboxes values=$ids output=$names}
- * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
- * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- * Params:
- * <pre>
- * - name       (optional) - string default "checkbox"
- * - values     (required) - array
- * - options    (optional) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie <br> or &nbsp;
- * - output     (optional) - the output next to each checkbox
- * - assign     (optional) - assign the output as an array to this variable
- * - escape     (optional) - escape the content (not value), defaults to true
- * </pre>
- *
- * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
- *      (Smarty online manual)
- * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte at ohrt dot com>
- * @version    1.0
- * @param array $params parameters
- * @param object $template template object
- * @return string
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_checkboxes($params, $template)
-{
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = 'checkbox';
-    $values = null;
-    $options = null;
-    $selected = array();
-    $separator = '';
-    $escape = true;
-    $labels = true;
-    $label_ids = false;
-    $output = null;
-
-    $extra = '';
-
-    foreach($params as $_key => $_val) {
-        switch($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = (string) $_val;
-                break;
-
-            case 'escape':
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool) $_val;
-                break;
-
-            case 'options':
-                $$_key = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            case 'checked':
-            case 'selected':
-                if (is_array($_val)) {
-                    $selected = array();
-                    foreach ($_val as $_sel) {
-                        if (is_object($_sel)) {
-                            if (method_exists($_sel, "__toString")) {
-                                $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
-                            } else {
-                                trigger_error("html_checkboxes: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE);
-                                continue;
-                            }
-                        } else {
-                            $_sel = smarty_function_escape_special_chars((string) $_sel);
-                        }
-                        $selected[$_sel] = true;
-                    }
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_checkboxes: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = smarty_function_escape_special_chars((string) $_val);
-                }
-                break;
-
-            case 'checkboxes':
-                trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING);
-                $options = (array) $_val;
-                break;
-
-            case 'assign':
-                break;
-
-            default:
-                if(!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
-                } else {
-                    trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
-
-    $_html_result = array();
-
-    if (isset($options)) {
-        foreach ($options as $_key=>$_val) {
-            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
-        }
-    } else {
-        foreach ($values as $_i=>$_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
-        }
-    }
-
-    if(!empty($params['assign'])) {
-        $template->assign($params['assign'], $_html_result);
-    } else {
-        return implode("\n", $_html_result);
-    }
-
-}
-
-function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape=true) {
-    $_output = '';
-    
-    if (is_object($value)) {
-        if (method_exists($value, "__toString")) {
-            $value = (string) $value->__toString();
-        } else {
-            trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
-            return '';
-        }
-    } else {
-        $value = (string) $value;
-    }
-    
-    if (is_object($output)) {
-        if (method_exists($output, "__toString")) {
-            $output = (string) $output->__toString();
-        } else {
-            trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE);
-            return '';
-        }
-    } else {
-        $output = (string) $output;
-    }
-    
-    if ($labels) {
-        if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value));
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        } 
-    }
-    
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-    
-    $_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
-    
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-    
-    if (is_array($selected)) {
-        if (isset($selected[$value])) {
-            $_output .= ' checked="checked"';
-        }
-    } elseif ($value === $selected) {
-        $_output .= ' checked="checked"';
-    }
-    
-    $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-    
-    $_output .=  $separator;
-    return $_output;
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.html_image.php b/resources/libs/smarty/plugins/function.html_image.php
deleted file mode 100644
index 6521966bb..000000000
--- a/resources/libs/smarty/plugins/function.html_image.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * 
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_image} function plugin
- * 
- * Type:     function<br>
- * Name:     html_image<br>
- * Date:     Feb 24, 2003<br>
- * Purpose:  format HTML tags for the image<br>
- * Examples: {html_image file="/images/masthead.gif"}<br>
- * Output:   <img src="/images/masthead.gif" width=400 height=23><br>
- * Params:
- * <pre>
- * - file        - (required) - file (and path) of image
- * - height      - (optional) - image height (default actual height)
- * - width       - (optional) - image width (default actual width)
- * - basedir     - (optional) - base directory for absolute paths, default is environment variable DOCUMENT_ROOT
- * - path_prefix - prefix for path output (optional, default empty)
- * </pre>
- * 
- * @link http://www.smarty.net/manual/en/language.function.html.image.php {html_image}
- *      (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author credits to Duda <duda@big.hu> 
- * @version 1.0
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_image($params, $template)
-{
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
- 
-    $alt = '';
-    $file = '';
-    $height = '';
-    $width = '';
-    $extra = '';
-    $prefix = '';
-    $suffix = '';
-    $path_prefix = '';
-    $basedir = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : '';
-    foreach($params as $_key => $_val) {
-        switch ($_key) {
-            case 'file':
-            case 'height':
-            case 'width':
-            case 'dpi':
-            case 'path_prefix':
-            case 'basedir':
-                $$_key = $_val;
-                break;
-
-            case 'alt':
-                if (!is_array($_val)) {
-                    $$_key = smarty_function_escape_special_chars($_val);
-                } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
-                break;
-
-            case 'link':
-            case 'href':
-                $prefix = '<a href="' . $_val . '">';
-                $suffix = '</a>';
-                break;
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    throw new SmartyException ("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
-                break;
-        } 
-    } 
-
-    if (empty($file)) {
-        trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
-        return;
-    } 
-
-    if ($file[0] == '/') {
-        $_image_path = $basedir . $file;
-    } else {
-        $_image_path = $file;
-    }
-    
-    // strip file protocol
-    if (stripos($params['file'], 'file://') === 0) {
-        $params['file'] = substr($params['file'], 7);
-    }
-    
-    $protocol = strpos($params['file'], '://');
-    if ($protocol !== false) {
-        $protocol = strtolower(substr($params['file'], 0, $protocol));
-    }
-    
-    if (isset($template->smarty->security_policy)) {
-        if ($protocol) {
-            // remote resource (or php stream, …)
-            if(!$template->smarty->security_policy->isTrustedUri($params['file'])) {
-                return;
-            }
-        } else {
-            // local file
-            if(!$template->smarty->security_policy->isTrustedResourceDir($params['file'])) {
-                return;
-            }
-        }
-    }
-
-    if (!isset($params['width']) || !isset($params['height'])) {
-        // FIXME: (rodneyrehm) getimagesize() loads the complete file off a remote resource, use custom [jpg,png,gif]header reader!
-        if (!$_image_data = @getimagesize($_image_path)) {
-            if (!file_exists($_image_path)) {
-                trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
-                return;
-            } else if (!is_readable($_image_path)) {
-                trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
-                return;
-            } else {
-                trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
-                return;
-            } 
-        }
-
-        if (!isset($params['width'])) {
-            $width = $_image_data[0];
-        } 
-        if (!isset($params['height'])) {
-            $height = $_image_data[1];
-        } 
-    } 
-
-    if (isset($params['dpi'])) {
-        if (strstr($_SERVER['HTTP_USER_AGENT'], 'Mac')) {
-            // FIXME: (rodneyrehm) wrong dpi assumption
-            // don't know who thought this up… even if it was true in 1998, it's definitely wrong in 2011.
-            $dpi_default = 72;
-        } else {
-            $dpi_default = 96;
-        } 
-        $_resize = $dpi_default / $params['dpi'];
-        $width = round($width * $_resize);
-        $height = round($height * $_resize);
-    } 
-
-    return $prefix . '<img src="' . $path_prefix . $file . '" alt="' . $alt . '" width="' . $width . '" height="' . $height . '"' . $extra . ' />' . $suffix;
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.html_options.php b/resources/libs/smarty/plugins/function.html_options.php
deleted file mode 100644
index 86266e269..000000000
--- a/resources/libs/smarty/plugins/function.html_options.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * 
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_options} function plugin
- * 
- * Type:     function<br>
- * Name:     html_options<br>
- * Purpose:  Prints the list of <option> tags generated from
- *           the passed parameters<br>
- * Params:
- * <pre>
- * - name       (optional) - string default "select"
- * - values     (required) - if no options supplied) - array
- * - options    (required) - if no values supplied) - associative array
- * - selected   (optional) - string default not set
- * - output     (required) - if not options supplied) - array
- * - id         (optional) - string default not set
- * - class      (optional) - string default not set
- * </pre>
- * 
- * @link http://www.smarty.net/manual/en/language.function.html.options.php {html_image}
- *      (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Ralf Strehle (minor optimization) <ralf dot strehle at yahoo dot de>
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_options($params, $template)
-{
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = null;
-    $values = null;
-    $options = null;
-    $selected = null;
-    $output = null;
-    $id = null;
-    $class = null;
-
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'class':
-            case 'id':
-                $$_key = (string) $_val;
-                break;
-
-            case 'options':
-                $options = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            case 'selected':
-                if (is_array($_val)) {
-                    $selected = array();
-                    foreach ($_val as $_sel) {
-                        if (is_object($_sel)) {
-                            if (method_exists($_sel, "__toString")) {
-                                $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
-                            } else {
-                                trigger_error("html_options: selected attribute contains an object of class '". get_class($_sel) ."' without __toString() method", E_USER_NOTICE);
-                                continue;
-                            }
-                        } else {
-                            $_sel = smarty_function_escape_special_chars((string) $_sel);
-                        }
-                        $selected[$_sel] = true;
-                    }
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_options: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = smarty_function_escape_special_chars((string) $_val);
-                }
-                break;
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
-                break;
-        } 
-    }
-
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-        return '';
-    }
-
-    $_html_result = '';
-    $_idx = 0;
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        } 
-    }
-
-    if (!empty($name)) {
-        $_html_class = !empty($class) ? ' class="'.$class.'"' : '';
-        $_html_id = !empty($id) ? ' id="'.$id.'"' : '';
-        $_html_result = '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
-    } 
-
-    return $_html_result;
-}
-
-function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
-{
-    if (!is_array($value)) {
-        $_key = smarty_function_escape_special_chars($key);
-        $_html_result = '<option value="' . $_key . '"';
-        if (is_array($selected)) {
-            if (isset($selected[$_key])) {
-                $_html_result .= ' selected="selected"';
-            }
-        } elseif ($_key === $selected) {
-            $_html_result .= ' selected="selected"';
-        }
-        $_html_class = !empty($class) ? ' class="'.$class.' option"' : '';
-        $_html_id = !empty($id) ? ' id="'.$id.'-'.$idx.'"' : '';
-        if (is_object($value)) {
-            if (method_exists($value, "__toString")) {
-                $value = smarty_function_escape_special_chars((string) $value->__toString());
-            } else {
-                trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
-                return '';
-            }
-        }
-        $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-        $idx++;
-    } else {
-        $_idx = 0;
-        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id.'-'.$idx) : null, $class, $_idx);
-        $idx++;
-    }
-    return $_html_result;
-} 
-
-function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
-{
-    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
-    foreach ($values as $key => $value) {
-        $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
-    } 
-    $optgroup_html .= "</optgroup>\n";
-    return $optgroup_html;
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.html_radios.php b/resources/libs/smarty/plugins/function.html_radios.php
deleted file mode 100644
index 7c830724a..000000000
--- a/resources/libs/smarty/plugins/function.html_radios.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * 
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_radios} function plugin
- * 
- * File:       function.html_radios.php<br>
- * Type:       function<br>
- * Name:       html_radios<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of radio input types<br>
- * Params:
- * <pre>
- * - name       (optional) - string default "radio"
- * - values     (required) - array
- * - options    (required) - associative array
- * - checked    (optional) - array default not set
- * - separator  (optional) - ie <br> or &nbsp;
- * - output     (optional) - the output next to each radio button
- * - assign     (optional) - assign the output as an array to this variable
- * - escape     (optional) - escape the content (not value), defaults to true
- * </pre>
- * Examples:
- * <pre>
- * {html_radios values=$ids output=$names}
- * {html_radios values=$ids name='box' separator='<br>' output=$names}
- * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- * 
- * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
- *      (Smarty online manual)
- * @author Christopher Kvarme <christopher.kvarme@flashjab.com> 
- * @author credits to Monte Ohrt <monte at ohrt dot com> 
- * @version 1.0
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string 
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_radios($params, $template)
-{
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = 'radio';
-    $values = null;
-    $options = null;
-    $selected = null;
-    $separator = '';
-    $escape = true;
-    $labels = true;
-    $label_ids = false;
-    $output = null;
-    $extra = '';
-
-    foreach($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = (string) $_val;
-                break;
-
-            case 'checked':
-            case 'selected':
-                if (is_array($_val)) {
-                    trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_radios: selected attribute is an object of class '". get_class($_val) ."' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = (string) $_val;
-                } 
-                break;
-
-            case 'escape':
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool) $_val;
-                break;
-
-            case 'options':
-                $$_key = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            case 'radios':
-                trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead', E_USER_WARNING);
-                $options = (array) $_val;
-                break;
-
-            case 'assign':
-                break;
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
-                break;
-        } 
-    } 
-
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-        return '';
-    }
-
-    $_html_result = array();
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $escape);
-        } 
-    } 
-
-    if (!empty($params['assign'])) {
-        $template->assign($params['assign'], $_html_result);
-    } else {
-        return implode("\n", $_html_result);
-    } 
-} 
-
-function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $escape)
-{
-    $_output = '';
-    
-    if (is_object($value)) {
-        if (method_exists($value, "__toString")) {
-            $value = (string) $value->__toString();
-        } else {
-            trigger_error("html_options: value is an object of class '". get_class($value) ."' without __toString() method", E_USER_NOTICE);
-            return '';
-        }
-    } else {
-        $value = (string) $value;
-    }
-    
-    if (is_object($output)) {
-        if (method_exists($output, "__toString")) {
-            $output = (string) $output->__toString();
-        } else {
-            trigger_error("html_options: output is an object of class '". get_class($output) ."' without __toString() method", E_USER_NOTICE);
-            return '';
-        }
-    } else {
-        $output = (string) $output;
-    }
-    
-    if ($labels) {
-        if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', $name . '_' . $value));
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        } 
-    }
-    
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-    
-    $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
-
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-
-    if ($value === $selected) {
-        $_output .= ' checked="checked"';
-    }
-    
-    $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-    
-    $_output .= $separator;
-    return $_output;
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.html_select_date.php b/resources/libs/smarty/plugins/function.html_select_date.php
deleted file mode 100644
index 13c500354..000000000
--- a/resources/libs/smarty/plugins/function.html_select_date.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * 
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-
-/**
- * Smarty {html_select_date} plugin
- * 
- * Type:     function<br>
- * Name:     html_select_date<br>
- * Purpose:  Prints the dropdowns for date selection.
- * 
- * ChangeLog:
- * <pre>
- *            - 1.0 initial release
- *            - 1.1 added support for +/- N syntax for begin
- *              and end year values. (Monte)
- *            - 1.2 added support for yyyy-mm-dd syntax for
- *              time value. (Jan Rosier)
- *            - 1.3 added support for choosing format for
- *              month values (Gary Loescher)
- *            - 1.3.1 added support for choosing format for
- *              day values (Marcus Bointon)
- *            - 1.3.2 support negative timestamps, force year
- *              dropdown to include given date unless explicitly set (Monte)
- *            - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
- *              of 0000-00-00 dates (cybot, boots)
- *            - 2.0 complete rewrite for performance,  
- *              added attributes month_names, *_id
- * </pre>
- * 
- * @link http://www.smarty.net/manual/en/language.function.html.select.date.php {html_select_date}
- *      (Smarty online manual)
- * @version 2.0
- * @author Andrei Zmievski 
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Rodney Rehm
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string 
- */
-function smarty_function_html_select_date($params, $template)
-{
-    // generate timestamps used for month names only
-    static $_month_timestamps = null;
-    static $_current_year = null;
-    if ($_month_timestamps === null) {
-        $_current_year = date('Y');
-        $_month_timestamps = array();
-        for ($i = 1; $i <= 12; $i++) {
-            $_month_timestamps[$i] = mktime(0, 0, 0, $i, 1, 2000);
-        }
-    }
-
-    /* Default values. */
-    $prefix = "Date_";
-    $start_year = null;
-    $end_year = null;
-    $display_days = true;
-    $display_months = true;
-    $display_years = true;
-    $month_format = "%B";
-    /* Write months as numbers by default  GL */
-    $month_value_format = "%m";
-    $day_format = "%02d";
-    /* Write day values using this format MB */
-    $day_value_format = "%d";
-    $year_as_text = false;
-    /* Display years in reverse order? Ie. 2000,1999,.... */
-    $reverse_years = false;
-    /* Should the select boxes be part of an array when returned from PHP?
-       e.g. setting it to "birthday", would create "birthday[Day]",
-       "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
-    $field_array = null;
-    /* <select size>'s of the different <select> tags.
-       If not set, uses default dropdown. */
-    $day_size = null;
-    $month_size = null;
-    $year_size = null;
-    /* Unparsed attributes common to *ALL* the <select>/<input> tags.
-       An example might be in the template: all_extra ='class ="foo"'. */
-    $all_extra = null;
-    /* Separate attributes for the tags. */
-    $day_extra = null;
-    $month_extra = null;
-    $year_extra = null;
-    /* Order in which to display the fields.
-       "D" -> day, "M" -> month, "Y" -> year. */
-    $field_order = 'MDY';
-    /* String printed between the different fields. */
-    $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-    // $all_empty = null;
-    // $day_empty = null;
-    // $month_empty = null;
-    // $year_empty = null;
-    $extra_attrs = '';
-    $all_id = null;
-    $day_id = null;
-    $month_id = null;
-    $year_id = null;
-
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
-                
-            case 'month_names':
-                if (is_array($_value) && count($_value) == 12) {
-                    $$_key = $_value;
-                } else {
-                    trigger_error("html_select_date: month_names must be an array of 12 strings", E_USER_NOTICE);
-                }
-                break;
-                
-            case 'prefix':
-            case 'field_array':
-            case 'start_year':
-            case 'end_year':
-            case 'day_format':
-            case 'day_value_format':
-            case 'month_format':
-            case 'month_value_format':
-            case 'day_size':
-            case 'month_size':
-            case 'year_size':
-            case 'all_extra':
-            case 'day_extra':
-            case 'month_extra':
-            case 'year_extra':
-            case 'field_order':
-            case 'field_separator':
-            case 'option_separator':
-            case 'all_empty':
-            case 'month_empty':
-            case 'day_empty':
-            case 'year_empty':
-            case 'all_id':
-            case 'month_id':
-            case 'day_id':
-            case 'year_id':
-                $$_key = (string)$_value;
-                break;
-
-            case 'display_days':
-            case 'display_months':
-            case 'display_years':
-            case 'year_as_text':
-            case 'reverse_years':
-                $$_key = (bool)$_value;
-                break;
-
-            default:
-                if (!is_array($_value)) {
-                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
-                } else {
-                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                } 
-                break;
-        } 
-    }
-    
-    // Note: date() is faster than strftime()
-    // Note: explode(date()) is faster than date() date() date()
-    if (isset($params['time']) && is_array($params['time'])) {
-        if (isset($params['time'][$prefix . 'Year'])) {
-            // $_REQUEST[$field_array] given
-            foreach (array('Y' => 'Year',  'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$prefix . $_elementName])
-                    ? $params['time'][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
-        } elseif (isset($params['time'][$field_array][$prefix . 'Year'])) {
-            // $_REQUEST given
-            foreach (array('Y' => 'Year',  'm' => 'Month', 'd' => 'Day') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
-                    ? $params['time'][$field_array][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $time = mktime(0, 0, 0, $_month, $_day, $_year);
-        } else {
-            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } elseif ($time === null) {
-        if (array_key_exists('time', $params)) {
-            $_year = $_month = $_day = $time = null;
-        } else {
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } else {
-        list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d', $time));
-    }
-
-    // make syntax "+N" or "-N" work with $start_year and $end_year
-    // Note preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match) is slower than trim+substr
-    foreach (array('start', 'end') as $key) {
-        $key .= '_year';
-        $t = $$key;
-        if ($t === null) {
-            $$key = (int)$_current_year;
-        } else if ($t[0] == '+') {
-            $$key = (int)($_current_year + trim(substr($t, 1)));
-        } else if ($t[0] == '-') {
-            $$key = (int)($_current_year - trim(substr($t, 1)));
-        } else {
-            $$key = (int)$$key;
-        }
-    }
-
-    // flip for ascending or descending
-    if (($start_year > $end_year && !$reverse_years) || ($start_year < $end_year && $reverse_years)) {
-        $t = $end_year;
-        $end_year = $start_year;
-        $start_year = $t;
-    }
-
-    // generate year <select> or <input>
-    if ($display_years) {
-        $_html_years = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Year]') : ($prefix . 'Year');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        } 
-        if ($year_extra) {
-            $_extra .= ' ' . $year_extra;
-        }
-        
-        if ($year_as_text) {
-            $_html_years = '<input type="text" name="' . $_name . '" value="' . $_year . '" size="4" maxlength="4"' . $_extra . $extra_attrs . ' />';
-        } else {
-            $_html_years = '<select name="' . $_name . '"';
-            if ($year_id !== null || $all_id !== null) {
-                $_html_years .= ' id="' . smarty_function_escape_special_chars( 
-                    $year_id !== null ? ( $year_id ? $year_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
-                ) . '"';
-            }
-            if ($year_size) {
-                $_html_years .= ' size="' . $year_size . '"';
-            } 
-            $_html_years .= $_extra . $extra_attrs . '>' . $option_separator;
-            
-            if (isset($year_empty) || isset($all_empty)) {
-                $_html_years .= '<option value="">' . ( isset($year_empty) ? $year_empty : $all_empty ) . '</option>' . $option_separator;
-            }
-            
-            $op = $start_year > $end_year ? -1 : 1;
-            for ($i=$start_year; $op > 0 ? $i <= $end_year : $i >= $end_year; $i += $op) {
-                $_html_years .= '<option value="' . $i . '"'
-                    . ($_year == $i ? ' selected="selected"' : '')
-                    . '>' . $i . '</option>' . $option_separator;
-            }
-            
-            $_html_years .= '</select>';
-        }
-    }
-    
-    // generate month <select> or <input>
-    if ($display_months) {
-        $_html_month = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Month]') : ($prefix . 'Month');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        } 
-        if ($month_extra) {
-            $_extra .= ' ' . $month_extra;
-        }
-        
-        $_html_months = '<select name="' . $_name . '"';
-        if ($month_id !== null || $all_id !== null) {
-            $_html_months .= ' id="' . smarty_function_escape_special_chars( 
-                $month_id !== null ? ( $month_id ? $month_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
-            ) . '"';
-        }
-        if ($month_size) {
-            $_html_months .= ' size="' . $month_size . '"';
-        } 
-        $_html_months .= $_extra . $extra_attrs . '>' . $option_separator;
-        
-        if (isset($month_empty) || isset($all_empty)) {
-            $_html_months .= '<option value="">' . ( isset($month_empty) ? $month_empty : $all_empty ) . '</option>' . $option_separator;
-        }
-        
-        for ($i = 1; $i <= 12; $i++) {
-            $_val = sprintf('%02d', $i);
-            $_text = isset($month_names) ? smarty_function_escape_special_chars($month_names[$i]) : ($month_format == "%m" ? $_val : strftime($month_format, $_month_timestamps[$i]));
-            $_value = $month_value_format == "%m" ? $_val : strftime($month_value_format, $_month_timestamps[$i]);
-            $_html_months .= '<option value="' . $_value . '"'
-                . ($_val == $_month ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-        
-        $_html_months .= '</select>';
-    }
-    
-    // generate day <select> or <input>
-    if ($display_days) {
-        $_html_day = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Day]') : ($prefix . 'Day');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        } 
-        if ($day_extra) {
-            $_extra .= ' ' . $day_extra;
-        }
-        
-        $_html_days = '<select name="' . $_name . '"';
-        if ($day_id !== null || $all_id !== null) {
-            $_html_days .= ' id="' . smarty_function_escape_special_chars( 
-                $day_id !== null ? ( $day_id ? $day_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name ) 
-            ) . '"';
-        }
-        if ($day_size) {
-            $_html_days .= ' size="' . $day_size . '"';
-        } 
-        $_html_days .= $_extra . $extra_attrs . '>' . $option_separator;
-        
-        if (isset($day_empty) || isset($all_empty)) {
-            $_html_days .= '<option value="">' . ( isset($day_empty) ? $day_empty : $all_empty ) . '</option>' . $option_separator;
-        }
-        
-        for ($i = 1; $i <= 31; $i++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $day_format == '%02d' ? $_val : sprintf($day_format, $i);
-            $_value = $day_value_format ==  '%02d' ? $_val : sprintf($day_value_format, $i);
-            $_html_days .= '<option value="' . $_value . '"'
-                . ($_val == $_day ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-        
-        $_html_days .= '</select>';
-    }
-
-    // order the fields for output
-    $_html = '';
-    for ($i=0; $i <= 2; $i++) {
-        switch ($field_order[$i]) {
-            case 'Y':
-            case 'y':
-                if (isset($_html_years)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_years;
-                }
-            break;
-            
-            case 'm':
-            case 'M':
-                if (isset($_html_months)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_months;
-                }
-            break;
-            
-            case 'd':
-            case 'D':
-                if (isset($_html_days)) {
-                    if ($_html) {
-                        $_html .= $field_separator;
-                    }
-                    $_html .= $_html_days;
-                }
-            break;
-        }
-    }
-    return $_html;
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.html_select_time.php b/resources/libs/smarty/plugins/function.html_select_time.php
deleted file mode 100644
index 9fb8038e4..000000000
--- a/resources/libs/smarty/plugins/function.html_select_time.php
+++ /dev/null
@@ -1,366 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-/**
- * @ignore
- */
-require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-
-/**
- * Smarty {html_select_time} function plugin
- *
- * Type:     function<br>
- * Name:     html_select_time<br>
- * Purpose:  Prints the dropdowns for time selection
- *
- * @link http://www.smarty.net/manual/en/language.function.html.select.time.php {html_select_time}
- *          (Smarty online manual)
- * @author Roberto Berto <roberto@berto.net>
- * @author Monte Ohrt <monte AT ohrt DOT com>
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string
- * @uses smarty_make_timestamp()
- */
-function smarty_function_html_select_time($params, $template)
-{
-    $prefix = "Time_";
-    $field_array = null;
-    $field_separator = "\n";
-    $option_separator = "\n";
-    $time = null;
-
-    $display_hours = true;
-    $display_minutes = true;
-    $display_seconds = true;
-    $display_meridian = true;
-
-    $hour_format = '%02d';
-    $hour_value_format = '%02d';
-    $minute_format = '%02d';
-    $minute_value_format = '%02d';
-    $second_format = '%02d';
-    $second_value_format = '%02d';
-
-    $hour_size = null;
-    $minute_size = null;
-    $second_size = null;
-    $meridian_size = null;
-
-    $all_empty = null;
-    $hour_empty = null;
-    $minute_empty = null;
-    $second_empty = null;
-    $meridian_empty = null;
-
-    $all_id = null;
-    $hour_id = null;
-    $minute_id = null;
-    $second_id = null;
-    $meridian_id = null;
-
-    $use_24_hours = true;
-    $minute_interval = 1;
-    $second_interval = 1;
-
-    $extra_attrs = '';
-    $all_extra = null;
-    $hour_extra = null;
-    $minute_extra = null;
-    $second_extra = null;
-    $meridian_extra = null;
-
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'time':
-                if (!is_array($_value) && $_value !== null) {
-                    $time = smarty_make_timestamp($_value);
-                }
-                break;
-
-            case 'prefix':
-            case 'field_array':
-
-            case 'field_separator':
-            case 'option_separator':
-
-            case 'all_extra':
-            case 'hour_extra':
-            case 'minute_extra':
-            case 'second_extra':
-            case 'meridian_extra':
-
-            case 'all_empty':
-            case 'hour_empty':
-            case 'minute_empty':
-            case 'second_empty':
-            case 'meridian_empty':
-
-            case 'all_id':
-            case 'hour_id':
-            case 'minute_id':
-            case 'second_id':
-            case 'meridian_id':
-
-            case 'hour_format':
-            case 'hour_value_format':
-            case 'minute_format':
-            case 'minute_value_format':
-            case 'second_format':
-            case 'second_value_format':
-                $$_key = (string)$_value;
-                break;
-
-            case 'display_hours':
-            case 'display_minutes':
-            case 'display_seconds':
-            case 'display_meridian':
-            case 'use_24_hours':
-                $$_key = (bool)$_value;
-                break;
-
-            case 'minute_interval':
-            case 'second_interval':
-
-            case 'hour_size':
-            case 'minute_size':
-            case 'second_size':
-            case 'meridian_size':
-                $$_key = (int)$_value;
-                break;
-
-            default:
-                if (!is_array($_value)) {
-                    $extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
-                } else {
-                    trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (isset($params['time']) && is_array($params['time'])) {
-        if (isset($params['time'][$prefix . 'Hour'])) {
-            // $_REQUEST[$field_array] given
-            foreach (array('H' => 'Hour',  'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$prefix . $_elementName])
-                    ? $params['time'][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $_meridian = isset($params['time'][$prefix . 'Meridian'])
-                ? (' ' . $params['time'][$prefix . 'Meridian'])
-                : '';
-            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } elseif (isset($params['time'][$field_array][$prefix . 'Hour'])) {
-            // $_REQUEST given
-            foreach (array('H' => 'Hour',  'i' => 'Minute', 's' => 'Second') as $_elementKey => $_elementName) {
-                $_variableName = '_' . strtolower($_elementName);
-                $$_variableName = isset($params['time'][$field_array][$prefix . $_elementName])
-                    ? $params['time'][$field_array][$prefix . $_elementName]
-                    : date($_elementKey);
-            }
-            $_meridian = isset($params['time'][$field_array][$prefix . 'Meridian'])
-                ? (' ' . $params['time'][$field_array][$prefix . 'Meridian'])
-                : '';
-            $time = strtotime( $_hour . ':' . $_minute . ':' . $_second . $_meridian );
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-        } else {
-            // no date found, use NOW
-            list($_year, $_month, $_day) = $time = explode('-', date('Y-m-d'));
-        }
-    } elseif ($time === null) {
-        if (array_key_exists('time', $params)) {
-            $_hour = $_minute = $_second = $time = null;
-        } else {
-            list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s'));
-        }
-    } else {
-        list($_hour, $_minute, $_second) = $time = explode('-', date('H-i-s', $time));
-    }
-
-    // generate hour <select>
-    if ($display_hours) {
-        $_html_hours = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Hour]') : ($prefix . 'Hour');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($hour_extra) {
-            $_extra .= ' ' . $hour_extra;
-        }
-
-        $_html_hours = '<select name="' . $_name . '"';
-        if ($hour_id !== null || $all_id !== null) {
-            $_html_hours .= ' id="' . smarty_function_escape_special_chars(
-                $hour_id !== null ? ( $hour_id ? $hour_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
-        }
-        if ($hour_size) {
-            $_html_hours .= ' size="' . $hour_size . '"';
-        }
-        $_html_hours .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($hour_empty) || isset($all_empty)) {
-            $_html_hours .= '<option value="">' . ( isset($hour_empty) ? $hour_empty : $all_empty ) . '</option>' . $option_separator;
-        }
-
-        $start = $use_24_hours ? 0 : 1;
-        $end = $use_24_hours ? 23 : 12;
-        for ($i=$start; $i <= $end; $i++) {
-            $_val = sprintf('%02d', $i);
-            $_text = $hour_format == '%02d' ? $_val : sprintf($hour_format, $i);
-            $_value = $hour_value_format == '%02d' ? $_val : sprintf($hour_value_format, $i);
-
-            if (!$use_24_hours) {
-                $_hour12 = $_hour == 0
-                    ? 12
-                    : ($_hour <= 12 ? $_hour : $_hour -12);
-            }
-
-            $selected = $_hour !== null ? ($use_24_hours ? $_hour == $_val : $_hour12 == $_val) : null;
-            $_html_hours .= '<option value="' . $_value . '"'
-                . ($selected ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_hours .= '</select>';
-    }
-
-    // generate minute <select>
-    if ($display_minutes) {
-        $_html_minutes = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Minute]') : ($prefix . 'Minute');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($minute_extra) {
-            $_extra .= ' ' . $minute_extra;
-        }
-
-        $_html_minutes = '<select name="' . $_name . '"';
-        if ($minute_id !== null || $all_id !== null) {
-            $_html_minutes .= ' id="' . smarty_function_escape_special_chars(
-                $minute_id !== null ? ( $minute_id ? $minute_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
-        }
-        if ($minute_size) {
-            $_html_minutes .= ' size="' . $minute_size . '"';
-        }
-        $_html_minutes .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($minute_empty) || isset($all_empty)) {
-            $_html_minutes .= '<option value="">' . ( isset($minute_empty) ? $minute_empty : $all_empty ) . '</option>' . $option_separator;
-        }
-
-        $selected = $_minute !== null ? ($_minute - $_minute % $minute_interval) : null;
-        for ($i=0; $i <= 59; $i += $minute_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $minute_format == '%02d' ? $_val : sprintf($minute_format, $i);
-            $_value = $minute_value_format == '%02d' ? $_val : sprintf($minute_value_format, $i);
-            $_html_minutes .= '<option value="' . $_value . '"'
-                . ($selected === $i ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_minutes .= '</select>';
-    }
-
-    // generate second <select>
-    if ($display_seconds) {
-        $_html_seconds = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Second]') : ($prefix . 'Second');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($second_extra) {
-            $_extra .= ' ' . $second_extra;
-        }
-
-        $_html_seconds = '<select name="' . $_name . '"';
-        if ($second_id !== null || $all_id !== null) {
-            $_html_seconds .= ' id="' . smarty_function_escape_special_chars(
-                $second_id !== null ? ( $second_id ? $second_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
-        }
-        if ($second_size) {
-            $_html_seconds .= ' size="' . $second_size . '"';
-        }
-        $_html_seconds .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($second_empty) || isset($all_empty)) {
-            $_html_seconds .= '<option value="">' . ( isset($second_empty) ? $second_empty : $all_empty ) . '</option>' . $option_separator;
-        }
-
-        $selected = $_second !== null ? ($_second - $_second % $second_interval) : null;
-        for ($i=0; $i <= 59; $i += $second_interval) {
-            $_val = sprintf('%02d', $i);
-            $_text = $second_format == '%02d' ? $_val : sprintf($second_format, $i);
-            $_value = $second_value_format == '%02d' ? $_val : sprintf($second_value_format, $i);
-            $_html_seconds .= '<option value="' . $_value . '"'
-                . ($selected === $i ? ' selected="selected"' : '')
-                . '>' . $_text . '</option>' . $option_separator;
-        }
-
-        $_html_seconds .= '</select>';
-    }
-
-    // generate meridian <select>
-    if ($display_meridian && !$use_24_hours) {
-        $_html_meridian = '';
-        $_extra = '';
-        $_name = $field_array ? ($field_array . '[' . $prefix . 'Meridian]') : ($prefix . 'Meridian');
-        if ($all_extra) {
-            $_extra .= ' ' . $all_extra;
-        }
-        if ($meridian_extra) {
-            $_extra .= ' ' . $meridian_extra;
-        }
-
-        $_html_meridian = '<select name="' . $_name . '"';
-        if ($meridian_id !== null || $all_id !== null) {
-            $_html_meridian .= ' id="' . smarty_function_escape_special_chars(
-                $meridian_id !== null ? ( $meridian_id ? $meridian_id : $_name ) : ( $all_id ? ($all_id . $_name) : $_name )
-            ) . '"';
-        }
-        if ($meridian_size) {
-            $_html_meridian .= ' size="' . $meridian_size . '"';
-        }
-        $_html_meridian .= $_extra . $extra_attrs . '>' . $option_separator;
-
-        if (isset($meridian_empty) || isset($all_empty)) {
-            $_html_meridian .= '<option value="">' . ( isset($meridian_empty) ? $meridian_empty : $all_empty ) . '</option>' . $option_separator;
-        }
-
-        $_html_meridian .= '<option value="am"'. ($_hour < 12 ? ' selected="selected"' : '') .'>AM</option>' . $option_separator
-            . '<option value="pm"'. ($_hour < 12 ? '' : ' selected="selected"') .'>PM</option>' . $option_separator
-            . '</select>';
-    }
-
-    $_html = '';
-    foreach (array('_html_hours', '_html_minutes', '_html_seconds', '_html_meridian') as $k) {
-        if (isset($$k)) {
-            if ($_html) {
-                $_html .= $field_separator;
-            }
-            $_html .= $$k;
-        }
-    }
-
-    return $_html;
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.html_table.php b/resources/libs/smarty/plugins/function.html_table.php
deleted file mode 100644
index 6b9cb9d12..000000000
--- a/resources/libs/smarty/plugins/function.html_table.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {html_table} function plugin
- *
- * Type:     function<br>
- * Name:     html_table<br>
- * Date:     Feb 17, 2003<br>
- * Purpose:  make an html table from an array of data<br>
- * Params:
- * <pre>
- * - loop       - array to loop through
- * - cols       - number of columns, comma separated list of column names
- *                or array of column names
- * - rows       - number of rows
- * - table_attr - table attributes
- * - th_attr    - table heading attributes (arrays are cycled)
- * - tr_attr    - table row attributes (arrays are cycled)
- * - td_attr    - table cell attributes (arrays are cycled)
- * - trailpad   - value to pad trailing cells with
- * - caption    - text for caption element
- * - vdir       - vertical direction (default: "down", means top-to-bottom)
- * - hdir       - horizontal direction (default: "right", means left-to-right)
- * - inner      - inner loop (default "cols": print $loop line by line,
- *                $loop will be printed column by column otherwise)
- * </pre>
- * Examples:
- * <pre>
- * {table loop=$data}
- * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
- * {table loop=$data cols="first,second,third" tr_attr=$colors}
- * </pre>
- *
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credit to Messju Mohr <messju at lammfellpuschen dot de>
- * @author credit to boots <boots dot smarty at yahoo dot com>
- * @version 1.1
- * @link http://www.smarty.net/manual/en/language.function.html.table.php {html_table}
- *          (Smarty online manual)
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string
- */
-function smarty_function_html_table($params, $template)
-{
-    $table_attr = 'border="1"';
-    $tr_attr = '';
-    $th_attr = '';
-    $td_attr = '';
-    $cols = $cols_count = 3;
-    $rows = 3;
-    $trailpad = '&nbsp;';
-    $vdir = 'down';
-    $hdir = 'right';
-    $inner = 'cols';
-    $caption = '';
-    $loop = null;
-
-    if (!isset($params['loop'])) {
-        trigger_error("html_table: missing 'loop' parameter",E_USER_WARNING);
-        return;
-    }
-
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'loop':
-                $$_key = (array)$_value;
-                break;
-
-            case 'cols':
-                if (is_array($_value) && !empty($_value)) {
-                    $cols = $_value;
-                    $cols_count = count($_value);
-                } elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
-                    $cols = explode(',', $_value);
-                    $cols_count = count($cols);
-                } elseif (!empty($_value)) {
-                    $cols_count = (int)$_value;
-                } else {
-                    $cols_count = $cols;
-                }
-                break;
-
-            case 'rows':
-                $$_key = (int)$_value;
-                break;
-
-            case 'table_attr':
-            case 'trailpad':
-            case 'hdir':
-            case 'vdir':
-            case 'inner':
-            case 'caption':
-                $$_key = (string)$_value;
-                break;
-
-            case 'tr_attr':
-            case 'td_attr':
-            case 'th_attr':
-                $$_key = $_value;
-                break;
-        }
-    }
-
-    $loop_count = count($loop);
-    if (empty($params['rows'])) {
-        /* no rows specified */
-        $rows = ceil($loop_count / $cols_count);
-    } elseif (empty($params['cols'])) {
-        if (!empty($params['rows'])) {
-            /* no cols specified, but rows */
-            $cols_count = ceil($loop_count / $rows);
-        }
-    }
-
-    $output = "<table $table_attr>\n";
-
-    if (!empty($caption)) {
-        $output .= '<caption>' . $caption . "</caption>\n";
-    }
-
-    if (is_array($cols)) {
-        $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
-        $output .= "<thead><tr>\n";
-
-        for ($r = 0; $r < $cols_count; $r++) {
-            $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-            $output .= $cols[$r];
-            $output .= "</th>\n";
-        }
-        $output .= "</tr></thead>\n";
-    }
-
-    $output .= "<tbody>\n";
-    for ($r = 0; $r < $rows; $r++) {
-        $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows-1 - $r) * $cols_count;
-
-        for ($c = 0; $c < $cols_count; $c++) {
-            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count-1 - $c;
-            if ($inner != 'cols') {
-                /* shuffle x to loop over rows*/
-                $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
-            }
-
-            if ($x < $loop_count) {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
-            } else {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
-            }
-        }
-        $output .= "</tr>\n";
-    }
-    $output .= "</tbody>\n";
-    $output .= "</table>\n";
-
-    return $output;
-}
-
-function smarty_function_html_table_cycle($name, $var, $no)
-{
-    if (!is_array($var)) {
-        $ret = $var;
-    } else {
-        $ret = $var[$no % count($var)];
-    }
-
-    return ($ret) ? ' ' . $ret : '';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.language_dropdown.php b/resources/libs/smarty/plugins/function.language_dropdown.php
deleted file mode 100644
index e90bd98e6..000000000
--- a/resources/libs/smarty/plugins/function.language_dropdown.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Displays the interface language dropdown. The onchange event is attached in general.js, but is only triggered if the
- * $name_id is set to "selectLanguage".
- *
- * @param array $params
- * @param object $smarty
- */
-function smarty_function_language_dropdown($params, &$smarty) {
-
-	// default to whatever is explicitly supplied. Failing that, default to the global var
-	$defaultLanguage = isset($params["default"]) ? $params["default"] : Core::$language->getCurrentLanguageFile();
-
-	$nameId = isset($params["nameId"]) ? $params["nameId"] : "";
-	$disabled = (isset($params["disabled"]) && $params["disabled"] == true) ? true : false;
-
-	$translations        = Core::$translations->getList();
-	$currentLanguageFile = Core::$language->getCurrentLanguageFile();
-	$L                   = Core::$language->getCurrentLanguageStrings();  
-
-	$options = "";
-	while (list($file, $language) = each($translations)) {
-		$value = preg_replace("/\.php$/", "", $file);
-		$selected = ($value == $currentLanguageFile) ? " selected=\"selected\"" : "";
-		$options .= "<option value=\"{$value}\"{$selected}>{$language}</option>\n";
-	}
-
-	$disabledAttr = ($disabled) ? ' disabled="disabled"' : "";
-
-	echo <<< END
-	<select name="$nameId" id="$nameId"$disabledAttr>
-		<option value="">{$L["select_language"]}</option>
-		{$options}
-	</select>
-END;
-}
diff --git a/resources/libs/smarty/plugins/function.mailto.php b/resources/libs/smarty/plugins/function.mailto.php
deleted file mode 100644
index 55d5c0602..000000000
--- a/resources/libs/smarty/plugins/function.mailto.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {mailto} function plugin
- *
- * Type:     function<br>
- * Name:     mailto<br>
- * Date:     May 21, 2002
- * Purpose:  automate mailto address link creation, and optionally encode them.<br>
- * Params:
- * <pre>
- * - address    - (required) - e-mail address
- * - text       - (optional) - text to display, default is address
- * - encode     - (optional) - can be one of:
- *                             * none : no encoding (default)
- *                             * javascript : encode with javascript
- *                             * javascript_charcode : encode with javascript charcode
- *                             * hex : encode with hexidecimal (no javascript)
- * - cc         - (optional) - address(es) to carbon copy
- * - bcc        - (optional) - address(es) to blind carbon copy
- * - subject    - (optional) - e-mail subject
- * - newsgroups - (optional) - newsgroup(s) to post to
- * - followupto - (optional) - address(es) to follow up to
- * - extra      - (optional) - extra tags for the href link
- * </pre>
- * Examples:
- * <pre>
- * {mailto address="me@domain.com"}
- * {mailto address="me@domain.com" encode="javascript"}
- * {mailto address="me@domain.com" encode="hex"}
- * {mailto address="me@domain.com" subject="Hello to you!"}
- * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
- * {mailto address="me@domain.com" extra='class="mailto"'}
- * </pre>
- *
- * @link http://www.smarty.net/manual/en/language.function.mailto.php {mailto}
- *          (Smarty online manual)
- * @version 1.2
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credits to Jason Sweat (added cc, bcc and subject functionality)
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string
- */
-function smarty_function_mailto($params, $template)
-{
-    static $_allowed_encoding = array('javascript' => true, 'javascript_charcode' => true, 'hex' => true, 'none' => true);
-    $extra = '';
-
-    if (empty($params['address'])) {
-        trigger_error("mailto: missing 'address' parameter",E_USER_WARNING);
-        return;
-    } else {
-        $address = $params['address'];
-    }
-
-    $text = $address;
-    // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
-    // so, don't encode it.
-    $search = array('%40', '%2C');
-    $replace = array('@', ',');
-    $mail_parms = array();
-    foreach ($params as $var => $value) {
-        switch ($var) {
-            case 'cc':
-            case 'bcc':
-            case 'followupto':
-                if (!empty($value))
-                    $mail_parms[] = $var . '=' . str_replace($search, $replace, rawurlencode($value));
-                break;
-
-            case 'subject':
-            case 'newsgroups':
-                $mail_parms[] = $var . '=' . rawurlencode($value);
-                break;
-
-            case 'extra':
-            case 'text':
-                $$var = $value;
-
-            default:
-        }
-    }
-
-    if ($mail_parms) {
-        $address .= '?' . join('&', $mail_parms);
-    }
-    
-    $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
-    if (!isset($_allowed_encoding[$encode])) {
-        trigger_error("mailto: 'encode' parameter must be none, javascript, javascript_charcode or hex", E_USER_WARNING);
-        return;
-    }
-    // FIXME: (rodneyrehm) document.write() excues me what? 1998 has passed!
-    if ($encode == 'javascript') {
-        $string = 'document.write(\'<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>\');';
-
-        $js_encode = '';
-        for ($x = 0, $_length = strlen($string); $x < $_length; $x++) {
-            $js_encode .= '%' . bin2hex($string[$x]);
-        }
-
-        return '<script type="text/javascript">eval(unescape(\'' . $js_encode . '\'))</script>';
-    } elseif ($encode == 'javascript_charcode') {
-        $string = '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-
-        for($x = 0, $y = strlen($string); $x < $y; $x++) {
-            $ord[] = ord($string[$x]);
-        }
-
-        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n"
-            . "{document.write(String.fromCharCode("
-            . implode(',', $ord)
-            . "))"
-            . "}\n"
-            . "</script>\n";
-
-        return $_ret;
-    } elseif ($encode == 'hex') {
-        preg_match('!^(.*)(\?.*)$!', $address, $match);
-        if (!empty($match[2])) {
-            trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.",E_USER_WARNING);
-            return;
-        }
-        $address_encode = '';
-        for ($x = 0, $_length = strlen($address); $x < $_length; $x++) {
-            if (preg_match('!\w!' . Smarty::$_UTF8_MODIFIER, $address[$x])) {
-                $address_encode .= '%' . bin2hex($address[$x]);
-            } else {
-                $address_encode .= $address[$x];
-            }
-        }
-        $text_encode = '';
-        for ($x = 0, $_length = strlen($text); $x < $_length; $x++) {
-            $text_encode .= '&#x' . bin2hex($text[$x]) . ';';
-        }
-
-        $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
-        return '<a href="' . $mailto . $address_encode . '" ' . $extra . '>' . $text_encode . '</a>';
-    } else {
-        // no encoding
-        return '<a href="mailto:' . $address . '" ' . $extra . '>' . $text . '</a>';
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/function.math.php b/resources/libs/smarty/plugins/function.math.php
deleted file mode 100644
index f4d3f05ee..000000000
--- a/resources/libs/smarty/plugins/function.math.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * This plugin is only for Smarty2 BC
- * @package Smarty
- * @subpackage PluginsFunction
- */
-
-/**
- * Smarty {math} function plugin
- *
- * Type:     function<br>
- * Name:     math<br>
- * Purpose:  handle math computations in template
- *
- * @link http://www.smarty.net/manual/en/language.function.math.php {math}
- *          (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param array                    $params   parameters
- * @param Smarty_Internal_Template $template template object
- * @return string|null
- */
-function smarty_function_math($params, $template)
-{
-    static $_allowed_funcs = array(
-        'int' => true, 'abs' => true, 'ceil' => true, 'cos' => true, 'exp' => true, 'floor' => true,
-        'log' => true, 'log10' => true, 'max' => true, 'min' => true, 'pi' => true, 'pow' => true,
-        'rand' => true, 'round' => true, 'sin' => true, 'sqrt' => true, 'srand' => true ,'tan' => true
-    );
-    // be sure equation parameter is present
-    if (empty($params['equation'])) {
-        trigger_error("math: missing equation parameter",E_USER_WARNING);
-        return;
-    }
-
-    $equation = $params['equation'];
-
-    // make sure parenthesis are balanced
-    if (substr_count($equation,"(") != substr_count($equation,")")) {
-        trigger_error("math: unbalanced parenthesis",E_USER_WARNING);
-        return;
-    }
-
-    // match all vars in equation, make sure all are passed
-    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
-
-    foreach($match[1] as $curr_var) {
-        if ($curr_var && !isset($params[$curr_var]) && !isset($_allowed_funcs[$curr_var])) {
-            trigger_error("math: function call $curr_var not allowed",E_USER_WARNING);
-            return;
-        }
-    }
-
-    foreach($params as $key => $val) {
-        if ($key != "equation" && $key != "format" && $key != "assign") {
-            // make sure value is not empty
-            if (strlen($val)==0) {
-                trigger_error("math: parameter $key is empty",E_USER_WARNING);
-                return;
-            }
-            if (!is_numeric($val)) {
-                trigger_error("math: parameter $key: is not numeric",E_USER_WARNING);
-                return;
-            }
-            $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
-        }
-    }
-    $smarty_math_result = null;
-    eval("\$smarty_math_result = ".$equation.";");
-
-    if (empty($params['format'])) {
-        if (empty($params['assign'])) {
-            return $smarty_math_result;
-        } else {
-            $template->assign($params['assign'],$smarty_math_result);
-        }
-    } else {
-        if (empty($params['assign'])){
-            printf($params['format'],$smarty_math_result);
-        } else {
-            $template->assign($params['assign'],sprintf($params['format'],$smarty_math_result));
-        }
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifier.capitalize.php b/resources/libs/smarty/plugins/modifier.capitalize.php
deleted file mode 100644
index a78e3632a..000000000
--- a/resources/libs/smarty/plugins/modifier.capitalize.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * 
- * @package Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty capitalize modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     capitalize<br>
- * Purpose:  capitalize words in the string
- *
- * {@internal {$string|capitalize:true:true} is the fastest option for MBString enabled systems }}
- *
- * @param string  $string    string to capitalize
- * @param boolean $uc_digits also capitalize "x123" to "X123"
- * @param boolean $lc_rest   capitalize first letters, lowercase all following letters "aAa" to "Aaa"
- * @return string capitalized string
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Rodney Rehm
- */
-function smarty_modifier_capitalize($string, $uc_digits = false, $lc_rest = false)
-{
-    if (Smarty::$_MBSTRING) {
-        if ($lc_rest) {
-            // uppercase (including hyphenated words)
-            $upper_string = mb_convert_case( $string, MB_CASE_TITLE, Smarty::$_CHARSET );
-        } else {
-            // uppercase word breaks
-            $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!eS" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').mb_convert_case(stripslashes('\\2'),MB_CASE_UPPER, '" . addslashes(Smarty::$_CHARSET) . "')", $string);
-        }
-        // check uc_digits case
-        if (!$uc_digits) {
-            if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
-                foreach($matches[1] as $match) {
-                    $upper_string = substr_replace($upper_string, mb_strtolower($match[0], Smarty::$_CHARSET), $match[1], strlen($match[0]));
-                }
-            } 
-        }
-        $upper_string = preg_replace("!((^|\s)['\"])(\w)!e" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').mb_convert_case(stripslashes('\\3'),MB_CASE_UPPER, '" . addslashes(Smarty::$_CHARSET) . "')", $upper_string);
-        return $upper_string;
-    }
-    
-    // lowercase first
-    if ($lc_rest) {
-        $string = strtolower($string);
-    }
-    // uppercase (including hyphenated words)
-    $upper_string = preg_replace("!(^|[^\p{L}'])([\p{Ll}])!eS" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').ucfirst(stripslashes('\\2'))", $string); 
-    // check uc_digits case
-    if (!$uc_digits) {
-        if (preg_match_all("!\b([\p{L}]*[\p{N}]+[\p{L}]*)\b!" . Smarty::$_UTF8_MODIFIER, $string, $matches, PREG_OFFSET_CAPTURE)) {
-            foreach($matches[1] as $match) {
-                $upper_string = substr_replace($upper_string, strtolower($match[0]), $match[1], strlen($match[0]));
-            }
-        } 
-    }
-    $upper_string = preg_replace("!((^|\s)['\"])(\w)!e" . Smarty::$_UTF8_MODIFIER, "stripslashes('\\1').strtoupper(stripslashes('\\3'))", $upper_string);
-    return $upper_string;
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifier.date_format.php b/resources/libs/smarty/plugins/modifier.date_format.php
deleted file mode 100644
index 3cca7d395..000000000
--- a/resources/libs/smarty/plugins/modifier.date_format.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * 
- * @package Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty date_format modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     date_format<br>
- * Purpose:  format datestamps via strftime<br>
- * Input:<br>
- *          - string: input date string
- *          - format: strftime format for output
- *          - default_date: default date if $string is empty
- * 
- * @link http://www.smarty.net/manual/en/language.modifier.date.format.php date_format (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param string $string       input date string
- * @param string $format       strftime format for output
- * @param string $default_date default date if $string is empty
- * @param string $formatter    either 'strftime' or 'auto'
- * @return string |void
- * @uses smarty_make_timestamp()
- */
-function smarty_modifier_date_format($string, $format=null, $default_date='', $formatter='auto')
-{
-    if ($format === null) {
-        $format = Smarty::$_DATE_FORMAT;
-    }
-    /**
-    * Include the {@link shared.make_timestamp.php} plugin
-    */
-    require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-    if ($string != '') {
-        $timestamp = smarty_make_timestamp($string);
-    } elseif ($default_date != '') {
-        $timestamp = smarty_make_timestamp($default_date);
-    } else {
-        return;
-    } 
-    if($formatter=='strftime'||($formatter=='auto'&&strpos($format,'%')!==false)) {
-        if (DS == '\\') {
-            $_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
-            $_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
-            if (strpos($format, '%e') !== false) {
-                $_win_from[] = '%e';
-                $_win_to[] = sprintf('%\' 2d', date('j', $timestamp));
-            } 
-            if (strpos($format, '%l') !== false) {
-                $_win_from[] = '%l';
-                $_win_to[] = sprintf('%\' 2d', date('h', $timestamp));
-            } 
-            $format = str_replace($_win_from, $_win_to, $format);
-        } 
-        return strftime($format, $timestamp);
-    } else {
-        return date($format, $timestamp);
-    }
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifier.debug_print_var.php b/resources/libs/smarty/plugins/modifier.debug_print_var.php
deleted file mode 100644
index fa44100e8..000000000
--- a/resources/libs/smarty/plugins/modifier.debug_print_var.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * 
- * @package Smarty
- * @subpackage Debug
- */
-
-/**
- * Smarty debug_print_var modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     debug_print_var<br>
- * Purpose:  formats variable contents for display in the console
- *
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param array|object $var     variable to be formatted
- * @param integer      $depth   maximum recursion depth if $var is an array
- * @param integer      $length  maximum string length if $var is a string
- * @return string 
- */
-function smarty_modifier_debug_print_var ($var, $depth = 0, $length = 40)
-{
-    $_replace = array("\n" => '<i>\n</i>',
-        "\r" => '<i>\r</i>',
-        "\t" => '<i>\t</i>'
-        );
-
-    switch (gettype($var)) {
-        case 'array' :
-            $results = '<b>Array (' . count($var) . ')</b>';
-            foreach ($var as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                 . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
-                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
-                $depth--;
-            } 
-            break;
-            
-        case 'object' :
-            $object_vars = get_object_vars($var);
-            $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
-            foreach ($object_vars as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                 . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
-                 . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
-                $depth--;
-            } 
-            break;
-            
-        case 'boolean' :
-        case 'NULL' :
-        case 'resource' :
-            if (true === $var) {
-                $results = 'true';
-            } elseif (false === $var) {
-                $results = 'false';
-            } elseif (null === $var) {
-                $results = 'null';
-            } else {
-                $results = htmlspecialchars((string) $var);
-            } 
-            $results = '<i>' . $results . '</i>';
-            break;
-            
-        case 'integer' :
-        case 'float' :
-            $results = htmlspecialchars((string) $var);
-            break;
-            
-        case 'string' :
-            $results = strtr($var, $_replace);
-            if (Smarty::$_MBSTRING) {
-                if (mb_strlen($var, Smarty::$_CHARSET) > $length) {
-                    $results = mb_substr($var, 0, $length - 3, Smarty::$_CHARSET) . '...';
-                }
-            } else {
-                if (isset($var[$length])) {
-                    $results = substr($var, 0, $length - 3) . '...';
-                }
-            }
-
-            $results = htmlspecialchars('"' . $results . '"');
-            break;
-            
-        case 'unknown type' :
-        default :
-            $results = strtr((string) $var, $_replace);
-            if (Smarty::$_MBSTRING) {
-                if (mb_strlen($results, Smarty::$_CHARSET) > $length) {
-                    $results = mb_substr($results, 0, $length - 3, Smarty::$_CHARSET) . '...';
-                }
-            } else {
-                if (strlen($results) > $length) {
-                    $results = substr($results, 0, $length - 3) . '...';
-                }
-            }
-             
-            $results = htmlspecialchars($results);
-    } 
-
-    return $results;
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifier.escape.php b/resources/libs/smarty/plugins/modifier.escape.php
deleted file mode 100644
index 523d0653a..000000000
--- a/resources/libs/smarty/plugins/modifier.escape.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty escape modifier plugin
- *
- * Type:     modifier<br>
- * Name:     escape<br>
- * Purpose:  escape string for output
- *
- * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @param string  $string        input string
- * @param string  $esc_type      escape type
- * @param string  $char_set      character set, used for htmlspecialchars() or htmlentities()
- * @param boolean $double_encode encode already encoded entitites again, used for htmlspecialchars() or htmlentities()
- * @return string escaped input string
- */
-function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
-{
-    if (!$char_set) {
-        $char_set = Smarty::$_CHARSET;
-    }
-
-    switch ($esc_type) {
-        case 'html':
-            return htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-
-        case 'htmlall':
-            if (Smarty::$_MBSTRING) {
-                // mb_convert_encoding ignores htmlspecialchars()
-                $string = htmlspecialchars($string, ENT_QUOTES, $char_set, $double_encode);
-                // htmlentities() won't convert everything, so use mb_convert_encoding
-                return mb_convert_encoding($string, 'HTML-ENTITIES', $char_set);
-            }
-
-            // no MBString fallback
-            return htmlentities($string, ENT_QUOTES, $char_set, $double_encode);
-
-        case 'url':
-            return rawurlencode($string);
-
-        case 'urlpathinfo':
-            return str_replace('%2F', '/', rawurlencode($string));
-
-        case 'quotes':
-            // escape unescaped single quotes
-            return preg_replace("%(?<!\\\\)'%", "\\'", $string);
-
-        case 'hex':
-            // escape every byte into hex
-            // Note that the UTF-8 encoded character ä will be represented as %c3%a4
-            $return = '';
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
-                $return .= '%' . bin2hex($string[$x]);
-            }
-            return $return;
-
-        case 'hexentity':
-            $return = '';
-            if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
-                $return = '';
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    $return .= '&#x' . strtoupper(dechex($unicode)) . ';';
-                }
-                return $return;
-            }
-            // no MBString fallback
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
-                $return .= '&#x' . bin2hex($string[$x]) . ';';
-            }
-            return $return;
-
-        case 'decentity':
-            $return = '';
-            if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
-                $return = '';
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    $return .= '&#' . $unicode . ';';
-                }
-                return $return;
-            }
-            // no MBString fallback
-            $_length = strlen($string);
-            for ($x = 0; $x < $_length; $x++) {
-                $return .= '&#' . ord($string[$x]) . ';';
-            }
-            return $return;
-
-        case 'javascript':
-            // escape quotes and backslashes, newlines, etc.
-            return strtr($string, array('\\' => '\\\\', "'" => "\\'", '"' => '\\"', "\r" => '\\r', "\n" => '\\n', '</' => '<\/'));
-
-        case 'mail':
-            if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-                return smarty_mb_str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
-            }
-            // no MBString fallback
-            return str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
-
-        case 'nonstd':
-            // escape non-standard chars, such as ms document quotes
-            $return = '';
-            if (Smarty::$_MBSTRING) {
-                require_once(SMARTY_PLUGINS_DIR . 'shared.mb_unicode.php');
-                foreach (smarty_mb_to_unicode($string, Smarty::$_CHARSET) as $unicode) {
-                    if ($unicode >= 126) {
-                        $return .= '&#' . $unicode . ';';
-                    } else {
-                        $return .= chr($unicode);
-                    }
-                }
-                return $return;
-            }
-
-            $_length = strlen($string);
-            for ($_i = 0; $_i < $_length; $_i++) {
-                $_ord = ord(substr($string, $_i, 1));
-                // non-standard char, escape it
-                if ($_ord >= 126) {
-                    $return .= '&#' . $_ord . ';';
-                } else {
-                    $return .= substr($string, $_i, 1);
-                }
-            }
-            return $return;
-
-        default:
-            return $string;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifier.regex_replace.php b/resources/libs/smarty/plugins/modifier.regex_replace.php
deleted file mode 100644
index f9fd5fa53..000000000
--- a/resources/libs/smarty/plugins/modifier.regex_replace.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty regex_replace modifier plugin
- *
- * Type:     modifier<br>
- * Name:     regex_replace<br>
- * Purpose:  regular expression search/replace
- *
- * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
- *          regex_replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @param string       $string   input string
- * @param string|array $search   regular expression(s) to search for
- * @param string|array $replace  string(s) that should be replaced
- * @return string
- */
-function smarty_modifier_regex_replace($string, $search, $replace)
-{
-    if(is_array($search)) {
-        foreach($search as $idx => $s) {
-            $search[$idx] = _smarty_regex_replace_check($s);
-        }
-    } else {
-        $search = _smarty_regex_replace_check($search);
-    }
-    return preg_replace($search, $replace, $string);
-}
-
-/**
- * @param  string $search string(s) that should be replaced
- * @return string
- * @ignore
- */
-function _smarty_regex_replace_check($search)
-{
-    // null-byte injection detection
-    // anything behind the first null-byte is ignored
-    if (($pos = strpos($search,"\0")) !== false) {
-        $search = substr($search,0,$pos);
-    }
-    // remove eval-modifier from $search
-    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
-        $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
-    }
-    return $search;
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifier.replace.php b/resources/libs/smarty/plugins/modifier.replace.php
deleted file mode 100644
index 4d71a6e9b..000000000
--- a/resources/libs/smarty/plugins/modifier.replace.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty replace modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     replace<br>
- * Purpose:  simple search/replace
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.replace.php replace (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @author Uwe Tews 
- * @param string $string  input string
- * @param string $search  text to search for
- * @param string $replace replacement text
- * @return string 
- */
-function smarty_modifier_replace($string, $search, $replace)
-{
-    if (Smarty::$_MBSTRING) {
-        require_once(SMARTY_PLUGINS_DIR . 'shared.mb_str_replace.php');
-        return smarty_mb_str_replace($search, $replace, $string);
-    }
-    
-    return str_replace($search, $replace, $string);
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifier.spacify.php b/resources/libs/smarty/plugins/modifier.spacify.php
deleted file mode 100644
index a907232ff..000000000
--- a/resources/libs/smarty/plugins/modifier.spacify.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty spacify modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     spacify<br>
- * Purpose:  add spaces between characters in a string
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.spacify.php spacify (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param string $string       input string
- * @param string $spacify_char string to insert between characters.
- * @return string
- */
-function smarty_modifier_spacify($string, $spacify_char = ' ')
-{
-    // well… what about charsets besides latin and UTF-8?
-    return implode($spacify_char, preg_split('//' . Smarty::$_UTF8_MODIFIER, $string, -1, PREG_SPLIT_NO_EMPTY));
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifier.truncate.php b/resources/libs/smarty/plugins/modifier.truncate.php
deleted file mode 100644
index 9a803ec99..000000000
--- a/resources/libs/smarty/plugins/modifier.truncate.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifier
- */
- 
-/**
- * Smarty truncate modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     truncate<br>
- * Purpose:  Truncate a string to a certain length if necessary,
- *               optionally splitting in the middle of a word, and
- *               appending the $etc string or inserting $etc into the middle.
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.truncate.php truncate (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> 
- * @param string  $string      input string
- * @param integer $length      length of truncated text
- * @param string  $etc         end string
- * @param boolean $break_words truncate at word boundary
- * @param boolean $middle      truncate in the middle of text
- * @return string truncated string
- */
-function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_words = false, $middle = false) {
-    if ($length == 0)
-        return '';
-
-    if (Smarty::$_MBSTRING) {
-        if (mb_strlen($string, Smarty::$_CHARSET) > $length) {
-            $length -= min($length, mb_strlen($etc, Smarty::$_CHARSET));
-            if (!$break_words && !$middle) {
-                $string = preg_replace('/\s+?(\S+)?$/' . Smarty::$_UTF8_MODIFIER, '', mb_substr($string, 0, $length + 1, Smarty::$_CHARSET));
-            } 
-            if (!$middle) {
-                return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
-            }
-            return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc . mb_substr($string, - $length / 2, $length, Smarty::$_CHARSET);
-        }
-        return $string;
-    }
-    
-    // no MBString fallback
-    if (isset($string[$length])) {
-        $length -= min($length, strlen($etc));
-        if (!$break_words && !$middle) {
-            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
-        } 
-        if (!$middle) {
-            return substr($string, 0, $length) . $etc;
-        }
-        return substr($string, 0, $length / 2) . $etc . substr($string, - $length / 2);
-    }
-    return $string;
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.cat.php b/resources/libs/smarty/plugins/modifiercompiler.cat.php
deleted file mode 100644
index 1cfe6308a..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.cat.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty cat modifier plugin
- *
- * Type:     modifier<br>
- * Name:     cat<br>
- * Date:     Feb 24, 2003<br>
- * Purpose:  catenate a value to a variable<br>
- * Input:    string to catenate<br>
- * Example:  {$var|cat:"foo"}
- *
- * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
- *          (Smarty online manual)
- * @author   Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_cat($params, $compiler)
-{
-    return '('.implode(').(', $params).')';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.count_characters.php b/resources/libs/smarty/plugins/modifiercompiler.count_characters.php
deleted file mode 100644
index 98e8efa0d..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.count_characters.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_characters modifier plugin
- *
- * Type:     modifier<br>
- * Name:     count_characteres<br>
- * Purpose:  count the number of characters in a text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.count.characters.php count_characters (Smarty online manual)
- * @author Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_characters($params, $compiler)
-{
-    if (!isset($params[1]) || $params[1] != 'true') {
-        return 'preg_match_all(\'/[^\s]/' . Smarty::$_UTF8_MODIFIER . '\',' . $params[0] . ', $tmp)';
-    }
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strlen(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')';
-    }
-    // no MBString fallback
-    return 'strlen(' . $params[0] . ')';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.count_paragraphs.php b/resources/libs/smarty/plugins/modifiercompiler.count_paragraphs.php
deleted file mode 100644
index 0e1b0af83..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.count_paragraphs.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_paragraphs modifier plugin
- *
- * Type:     modifier<br>
- * Name:     count_paragraphs<br>
- * Purpose:  count the number of paragraphs in a text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_paragraphs (Smarty online manual)
- * @author Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_paragraphs($params, $compiler)
-{
-    // count \r or \n characters
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $params[0] . ', $tmp)+1)';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.count_sentences.php b/resources/libs/smarty/plugins/modifiercompiler.count_sentences.php
deleted file mode 100644
index 2f517be96..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.count_sentences.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_sentences modifier plugin
- *
- * Type:     modifier<br>
- * Name:     count_sentences
- * Purpose:  count the number of sentences in a text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.count.paragraphs.php
- *          count_sentences (Smarty online manual)
- * @author Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_count_sentences($params, $compiler)
-{
-    // find periods, question marks, exclamation marks with a word before but not after.
-    return 'preg_match_all("#\w[\.\?\!](\W|$)#S' . Smarty::$_UTF8_MODIFIER . '", ' . $params[0] . ', $tmp)';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.count_words.php b/resources/libs/smarty/plugins/modifiercompiler.count_words.php
deleted file mode 100644
index e05738c01..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.count_words.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty count_words modifier plugin
- *
- * Type:     modifier<br>
- * Name:     count_words<br>
- * Purpose:  count the number of words in a text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.count.words.php count_words (Smarty online manual)
- * @author Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
-*/
-function smarty_modifiercompiler_count_words($params, $compiler)
-{
-    if (Smarty::$_MBSTRING) {
-        // return 'preg_match_all(\'#[\w\pL]+#' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
-        // expression taken from http://de.php.net/manual/en/function.str-word-count.php#85592
-        return 'preg_match_all(\'/\p{L}[\p{L}\p{Mn}\p{Pd}\\\'\x{2019}]*/' . Smarty::$_UTF8_MODIFIER . '\', ' . $params[0] . ', $tmp)';
-    }
-    // no MBString fallback
-    return 'str_word_count(' . $params[0] . ')';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.default.php b/resources/libs/smarty/plugins/modifiercompiler.default.php
deleted file mode 100644
index 4f831a589..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.default.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty default modifier plugin
- *
- * Type:     modifier<br>
- * Name:     default<br>
- * Purpose:  designate default value for empty variables
- *
- * @link http://www.smarty.net/manual/en/language.modifier.default.php default (Smarty online manual)
- * @author Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_default ($params, $compiler)
-{
-    $output = $params[0];
-    if (!isset($params[1])) {
-        $params[1] = "''";
-    }
-    
-    array_shift($params);
-    foreach ($params as $param) {
-        $output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
-    }
-    return $output;
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.escape.php b/resources/libs/smarty/plugins/modifiercompiler.escape.php
deleted file mode 100644
index b4cd3c88c..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.escape.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * @ignore
- */
-require_once( SMARTY_PLUGINS_DIR .'shared.literal_compiler_param.php' );
-
-/**
- * Smarty escape modifier plugin
- *
- * Type:     modifier<br>
- * Name:     escape<br>
- * Purpose:  escape string for output
- *
- * @link http://www.smarty.net/docsv2/en/language.modifier.escape count_characters (Smarty online manual)
- * @author Rodney Rehm
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_escape($params, $compiler)
-{
-    try {
-        $esc_type = smarty_literal_compiler_param($params, 1, 'html');
-        $char_set = smarty_literal_compiler_param($params, 2, Smarty::$_CHARSET);
-        $double_encode = smarty_literal_compiler_param($params, 3, true);
-
-        if (!$char_set) {
-            $char_set = Smarty::$_CHARSET;
-        }
-
-        switch ($esc_type) {
-            case 'html':
-                return 'htmlspecialchars('
-                    . $params[0] .', ENT_QUOTES, '
-                    . var_export($char_set, true) . ', '
-                    . var_export($double_encode, true) . ')';
-
-            case 'htmlall':
-                if (Smarty::$_MBSTRING) {
-                    return 'mb_convert_encoding(htmlspecialchars('
-                        . $params[0] .', ENT_QUOTES, '
-                        . var_export($char_set, true) . ', '
-                        . var_export($double_encode, true)
-                        . '), "HTML-ENTITIES", '
-                        . var_export($char_set, true) . ')';
-                }
-
-                // no MBString fallback
-                return 'htmlentities('
-                    . $params[0] .', ENT_QUOTES, '
-                    . var_export($char_set, true) . ', '
-                    . var_export($double_encode, true) . ')';
-
-            case 'url':
-                return 'rawurlencode(' . $params[0] . ')';
-
-            case 'urlpathinfo':
-                return 'str_replace("%2F", "/", rawurlencode(' . $params[0] . '))';
-
-            case 'quotes':
-                // escape unescaped single quotes
-                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[0] . ')';
-
-            case 'javascript':
-                // escape quotes and backslashes, newlines, etc.
-                return 'strtr(' . $params[0] . ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/" ))';
-
-        }
-    } catch(SmartyException $e) {
-        // pass through to regular plugin fallback
-    }
-
-    // could not optimize |escape call, so fallback to regular plugin
-    if ($compiler->tag_nocache | $compiler->nocache) {
-        $compiler->template->required_plugins['nocache']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php';
-        $compiler->template->required_plugins['nocache']['escape']['modifier']['function'] = 'smarty_modifier_escape';
-    } else {
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['file'] = SMARTY_PLUGINS_DIR .'modifier.escape.php';
-        $compiler->template->required_plugins['compiled']['escape']['modifier']['function'] = 'smarty_modifier_escape';
-    }
-    return 'smarty_modifier_escape(' . join( ', ', $params ) . ')';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.from_charset.php b/resources/libs/smarty/plugins/modifiercompiler.from_charset.php
deleted file mode 100644
index 93b568a5a..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.from_charset.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty from_charset modifier plugin
- *
- * Type:     modifier<br>
- * Name:     from_charset<br>
- * Purpose:  convert character encoding from $charset to internal encoding
- *
- * @author Rodney Rehm
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_from_charset($params, $compiler)
-{
-    if (!Smarty::$_MBSTRING) {
-        // FIXME: (rodneyrehm) shouldn't this throw an error?
-        return $params[0];
-    }
-
-    if (!isset($params[1])) {
-        $params[1] = '"ISO-8859-1"';
-    }
-
-    return 'mb_convert_encoding(' . $params[0] . ', "' . addslashes(Smarty::$_CHARSET) . '", ' . $params[1] . ')';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.indent.php b/resources/libs/smarty/plugins/modifiercompiler.indent.php
deleted file mode 100644
index 020c4fdb3..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.indent.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty indent modifier plugin
- *
- * Type:     modifier<br>
- * Name:     indent<br>
- * Purpose:  indent lines of text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.indent.php indent (Smarty online manual)
- * @author Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
- */
-
-function smarty_modifiercompiler_indent($params, $compiler)
-{
-    if (!isset($params[1])) {
-        $params[1] = 4;
-    }
-    if (!isset($params[2])) {
-        $params[2] = "' '";
-    }
-    return 'preg_replace(\'!^!m\',str_repeat(' . $params[2] . ',' . $params[1] . '),' . $params[0] . ')';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.lower.php b/resources/libs/smarty/plugins/modifiercompiler.lower.php
deleted file mode 100644
index 1845cc1d2..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.lower.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty lower modifier plugin
- *
- * Type:     modifier<br>
- * Name:     lower<br>
- * Purpose:  convert string to lowercase
- *
- * @link http://www.smarty.net/manual/en/language.modifier.lower.php lower (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
- */
-
-function smarty_modifiercompiler_lower($params, $compiler)
-{
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strtolower(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ;
-    }
-    // no MBString fallback
-    return 'strtolower(' . $params[0] . ')';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.noprint.php b/resources/libs/smarty/plugins/modifiercompiler.noprint.php
deleted file mode 100644
index 3ca26571a..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.noprint.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty noprint modifier plugin
- *
- * Type:     modifier<br>
- * Name:     noprint<br>
- * Purpose:  return an empty string
- *
- * @author   Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_noprint($params, $compiler)
-{
-    return "''";
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.string_format.php b/resources/libs/smarty/plugins/modifiercompiler.string_format.php
deleted file mode 100644
index 83345977b..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.string_format.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty string_format modifier plugin
- *
- * Type:     modifier<br>
- * Name:     string_format<br>
- * Purpose:  format strings via sprintf
- *
- * @link http://www.smarty.net/manual/en/language.modifier.string.format.php string_format (Smarty online manual)
- * @author Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_string_format($params, $compiler)
-{
-    return 'sprintf(' . $params[1] . ',' . $params[0] . ')';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.strip.php b/resources/libs/smarty/plugins/modifiercompiler.strip.php
deleted file mode 100644
index f1d5db045..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.strip.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty strip modifier plugin
- *
- * Type:     modifier<br>
- * Name:     strip<br>
- * Purpose:  Replace all repeated spaces, newlines, tabs
- *              with a single space or supplied replacement string.<br>
- * Example:  {$var|strip} {$var|strip:"&nbsp;"}<br>
- * Date:     September 25th, 2002
- *
- * @link http://www.smarty.net/manual/en/language.modifier.strip.php strip (Smarty online manual)
- * @author Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
- */
-
-function smarty_modifiercompiler_strip($params, $compiler)
-{
-    if (!isset($params[1])) {
-        $params[1] = "' '";
-    }
-    return "preg_replace('!\s+!" . Smarty::$_UTF8_MODIFIER . "', {$params[1]},{$params[0]})";
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.strip_tags.php b/resources/libs/smarty/plugins/modifiercompiler.strip_tags.php
deleted file mode 100644
index 296a3a2da..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.strip_tags.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty strip_tags modifier plugin
- *
- * Type:     modifier<br>
- * Name:     strip_tags<br>
- * Purpose:  strip html tags from text
- *
- * @link http://www.smarty.net/manual/en/language.modifier.strip.tags.php strip_tags (Smarty online manual)
- * @author Uwe Tews
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_strip_tags($params, $compiler)
-{
-   if (!isset($params[1])) {
-        $params[1] = true;
-    }
-    if ($params[1] === true) {
-        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
-    } else {
-        return 'strip_tags(' . $params[0] . ')';
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.to_charset.php b/resources/libs/smarty/plugins/modifiercompiler.to_charset.php
deleted file mode 100644
index f5cdf455f..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.to_charset.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty to_charset modifier plugin
- *
- * Type:     modifier<br>
- * Name:     to_charset<br>
- * Purpose:  convert character encoding from internal encoding to $charset
- *
- * @author Rodney Rehm
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_to_charset($params, $compiler)
-{
-    if (!Smarty::$_MBSTRING) {
-        // FIXME: (rodneyrehm) shouldn't this throw an error?
-        return $params[0];
-    }
-
-    if (!isset($params[1])) {
-        $params[1] = '"ISO-8859-1"';
-    }
-
-    return 'mb_convert_encoding(' . $params[0] . ', ' . $params[1] . ', "' . addslashes(Smarty::$_CHARSET) . '")';
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.unescape.php b/resources/libs/smarty/plugins/modifiercompiler.unescape.php
deleted file mode 100644
index 4321ff18d..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.unescape.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty unescape modifier plugin
- *
- * Type:     modifier<br>
- * Name:     unescape<br>
- * Purpose:  unescape html entities
- *
- * @author Rodney Rehm
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_unescape($params, $compiler)
-{
-    if (!isset($params[1])) {
-        $params[1] = 'html';
-    }
-    if (!isset($params[2])) {
-        $params[2] = '\'' . addslashes(Smarty::$_CHARSET) . '\'';
-    } else {
-        $params[2] = "'" . $params[2] . "'";
-    }
-
-    switch (trim($params[1], '"\'')) {
-        case 'entity':
-        case 'htmlall':
-            if (Smarty::$_MBSTRING) {
-                return 'mb_convert_encoding(' . $params[0] . ', ' . $params[2] . ', \'HTML-ENTITIES\')';
-            }
-
-            return 'html_entity_decode(' . $params[0] . ', ENT_NOQUOTES, ' . $params[2] . ')';
-
-        case 'html':
-            return 'htmlspecialchars_decode(' . $params[0] . ', ENT_QUOTES)';
-
-        case 'url':
-            return 'rawurldecode(' . $params[0] . ')';
-
-        default:
-            return $params[0];
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.upper.php b/resources/libs/smarty/plugins/modifiercompiler.upper.php
deleted file mode 100644
index f368e37dc..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.upper.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty upper modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     lower<br>
- * Purpose:  convert string to uppercase
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.upper.php lower (Smarty online manual)
- * @author Uwe Tews 
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_upper($params, $compiler)
-{
-    if (Smarty::$_MBSTRING) {
-        return 'mb_strtoupper(' . $params[0] . ', \'' . addslashes(Smarty::$_CHARSET) . '\')' ;
-    }
-    // no MBString fallback
-    return 'strtoupper(' . $params[0] . ')';
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/modifiercompiler.wordwrap.php b/resources/libs/smarty/plugins/modifiercompiler.wordwrap.php
deleted file mode 100644
index f6845ad37..000000000
--- a/resources/libs/smarty/plugins/modifiercompiler.wordwrap.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsModifierCompiler
- */
-
-/**
- * Smarty wordwrap modifier plugin
- * 
- * Type:     modifier<br>
- * Name:     wordwrap<br>
- * Purpose:  wrap a string of text at a given length
- * 
- * @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php wordwrap (Smarty online manual)
- * @author Uwe Tews 
- * @param array $params parameters
- * @return string with compiled code
- */
-function smarty_modifiercompiler_wordwrap($params, $compiler)
-{
-    if (!isset($params[1])) {
-        $params[1] = 80;
-    } 
-    if (!isset($params[2])) {
-        $params[2] = '"\n"';
-    } 
-    if (!isset($params[3])) {
-        $params[3] = 'false';
-    } 
-    $function = 'wordwrap';
-    if (Smarty::$_MBSTRING) {
-        if ($compiler->tag_nocache | $compiler->nocache) {
-            $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php';
-            $compiler->template->required_plugins['nocache']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
-        } else {
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['file'] = SMARTY_PLUGINS_DIR .'shared.mb_wordwrap.php';
-            $compiler->template->required_plugins['compiled']['wordwrap']['modifier']['function'] = 'smarty_mb_wordwrap';
-        }
-        $function = 'smarty_mb_wordwrap';
-    }
-    return $function . '(' . $params[0] . ',' . $params[1] . ',' . $params[2] . ',' . $params[3] . ')';
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/outputfilter.trimwhitespace.php b/resources/libs/smarty/plugins/outputfilter.trimwhitespace.php
deleted file mode 100644
index 31a75557c..000000000
--- a/resources/libs/smarty/plugins/outputfilter.trimwhitespace.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsFilter
- */
-
-/**
- * Smarty trimwhitespace outputfilter plugin
- *
- * Trim unnecessary whitespace from HTML markup.
- *
- * @author   Rodney Rehm
- * @param string                   $source input string
- * @param Smarty_Internal_Template $smarty Smarty object
- * @return string filtered output
- * @todo substr_replace() is not overloaded by mbstring.func_overload - so this function might fail!
- */
-function smarty_outputfilter_trimwhitespace($source, Smarty_Internal_Template $smarty)
-{
-    $store = array();
-    $_store = 0;
-    $_offset = 0;
-
-    // Unify Line-Breaks to \n
-    $source = preg_replace("/\015\012|\015|\012/", "\n", $source);
-
-    // capture Internet Explorer Conditional Comments
-    if (preg_match_all('#<!--\[[^\]]+\]>.*?<!\[[^\]]+\]-->#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $store[] = $match[0][0];
-            $_length = strlen($match[0][0]);
-            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
-
-            $_offset += $_length - strlen($replace);
-            $_store++;
-        }
-    }
-
-    // Strip all HTML-Comments
-    $source = preg_replace( '#<!--.*?-->#ms', '', $source );
-
-    // capture html elements not to be messed with
-    $_offset = 0;
-    if (preg_match_all('#<(script|pre|textarea)[^>]*>.*?</\\1>#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $store[] = $match[0][0];
-            $_length = strlen($match[0][0]);
-            $replace = '@!@SMARTY:' . $_store . ':SMARTY@!@';
-            $source = substr_replace($source, $replace, $match[0][1] - $_offset, $_length);
-
-            $_offset += $_length - strlen($replace);
-            $_store++;
-        }
-    }
-
-    $expressions = array(
-        // replace multiple spaces between tags by a single space
-        // can't remove them entirely, becaue that might break poorly implemented CSS display:inline-block elements
-        '#(:SMARTY@!@|>)\s+(?=@!@SMARTY:|<)#s' => '\1 \2',
-        // remove spaces between attributes (but not in attribute values!)
-        '#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4',
-        // note: for some very weird reason trim() seems to remove spaces inside attributes.
-        // maybe a \0 byte or something is interfering?
-        '#^\s+<#Ss' => '<',
-        '#>\s+$#Ss' => '>',
-    );
-
-    $source = preg_replace( array_keys($expressions), array_values($expressions), $source );
-    // note: for some very weird reason trim() seems to remove spaces inside attributes.
-    // maybe a \0 byte or something is interfering?
-    // $source = trim( $source );
-
-    // capture html elements not to be messed with
-    $_offset = 0;
-    if (preg_match_all('#@!@SMARTY:([0-9]+):SMARTY@!@#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-        foreach ($matches as $match) {
-            $store[] = $match[0][0];
-            $_length = strlen($match[0][0]);
-            $replace = array_shift($store);
-            $source = substr_replace($source, $replace, $match[0][1] + $_offset, $_length);
-
-            $_offset += strlen($replace) - $_length;
-            $_store++;
-        }
-    }
-
-    return $source;
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/shared.escape_special_chars.php b/resources/libs/smarty/plugins/shared.escape_special_chars.php
deleted file mode 100644
index d2609b674..000000000
--- a/resources/libs/smarty/plugins/shared.escape_special_chars.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package Smarty
- * @subpackage PluginsShared
- */
-
-if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
-    /**
-     * escape_special_chars common function
-     *
-     * Function: smarty_function_escape_special_chars<br>
-     * Purpose:  used by other smarty functions to escape
-     *           special chars except for already escaped ones
-     *
-     * @author   Monte Ohrt <monte at ohrt dot com>
-     * @param string $string text that should by escaped
-     * @return string
-     */
-    function smarty_function_escape_special_chars($string)
-    {
-        if (!is_array($string)) {
-            $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false);
-        }
-        return $string;
-    }  
-} else {         
-    /**
-     * escape_special_chars common function
-     *
-     * Function: smarty_function_escape_special_chars<br>
-     * Purpose:  used by other smarty functions to escape
-     *           special chars except for already escaped ones
-     *
-     * @author   Monte Ohrt <monte at ohrt dot com>
-     * @param string $string text that should by escaped
-     * @return string
-     */
-    function smarty_function_escape_special_chars($string)
-    {
-        if (!is_array($string)) {
-            $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-            $string = htmlspecialchars($string);
-            $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); 
-        }
-        return $string;
-    }                                                                                                             
-} 
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/shared.literal_compiler_param.php b/resources/libs/smarty/plugins/shared.literal_compiler_param.php
deleted file mode 100644
index dbcd9374c..000000000
--- a/resources/libs/smarty/plugins/shared.literal_compiler_param.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsShared
- */
-
-/**
- * evaluate compiler parameter
- *
- * @param array   $params  parameter array as given to the compiler function
- * @param integer $index   array index of the parameter to convert
- * @param mixed   $default value to be returned if the parameter is not present
- * @return mixed evaluated value of parameter or $default
- * @throws SmartyException if parameter is not a literal (but an expression, variable, …)
- * @author Rodney Rehm
- */
-function smarty_literal_compiler_param($params, $index, $default=null)
-{
-    // not set, go default
-    if (!isset($params[$index])) {
-        return $default;
-    }
-    // test if param is a literal
-    if (!preg_match('/^([\'"]?)[a-zA-Z0-9]+(\\1)$/', $params[$index])) {
-        throw new SmartyException('$param[' . $index . '] is not a literal and is thus not evaluatable at compile time');
-    }
-
-    $t = null;
-    eval("\$t = " . $params[$index] . ";");
-    return $t;
-}
diff --git a/resources/libs/smarty/plugins/shared.make_timestamp.php b/resources/libs/smarty/plugins/shared.make_timestamp.php
deleted file mode 100644
index 5d7c97e91..000000000
--- a/resources/libs/smarty/plugins/shared.make_timestamp.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package Smarty
- * @subpackage PluginsShared
- */
-
-/**
- * Function: smarty_make_timestamp<br>
- * Purpose:  used by other smarty functions to make a timestamp from a string.
- *
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param DateTime|int|string $string  date object, timestamp or string that can be converted using strtotime()
- * @return int
- */
-function smarty_make_timestamp($string)
-{
-    if (empty($string)) {
-        // use "now":
-        return time();
-    } elseif ($string instanceof DateTime) {
-        return $string->getTimestamp();
-    } elseif (strlen($string) == 14 && ctype_digit($string)) {
-        // it is mysql timestamp format of YYYYMMDDHHMMSS?
-        return mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
-                       substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
-    } elseif (is_numeric($string)) {
-        // it is a numeric string, we handle it as timestamp
-        return (int) $string;
-    } else {
-        // strtotime should handle it
-        $time = strtotime($string);
-        if ($time == -1 || $time === false) {
-            // strtotime() was not able to parse $string, use "now":
-            return time();
-        }
-        return $time;
-    }
-}
-
-?>
diff --git a/resources/libs/smarty/plugins/shared.mb_str_replace.php b/resources/libs/smarty/plugins/shared.mb_str_replace.php
deleted file mode 100644
index ecafeb74a..000000000
--- a/resources/libs/smarty/plugins/shared.mb_str_replace.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package Smarty
- * @subpackage PluginsShared
- */
-if (!function_exists('smarty_mb_str_replace')) {
-
-    /**
-     * Multibyte string replace
-     *
-     * @param string $search  the string to be searched
-     * @param string $replace the replacement string
-     * @param string $subject the source string
-     * @param int    &$count  number of matches found
-     * @return string replaced string
-     * @author Rodney Rehm
-     */
-    function smarty_mb_str_replace($search, $replace, $subject, &$count=0)
-    {
-        if (!is_array($search) && is_array($replace)) {
-            return false;
-        }
-        if (is_array($subject)) {
-            // call mb_replace for each single string in $subject
-            foreach ($subject as &$string) {
-                $string = &smarty_mb_str_replace($search, $replace, $string, $c);
-                $count += $c;
-            }
-        } elseif (is_array($search)) {
-            if (!is_array($replace)) {
-                foreach ($search as &$string) {
-                    $subject = smarty_mb_str_replace($string, $replace, $subject, $c);
-                    $count += $c;
-                }
-            } else {
-                $n = max(count($search), count($replace));
-                while ($n--) {
-                    $subject = smarty_mb_str_replace(current($search), current($replace), $subject, $c);
-                    $count += $c;
-                    next($search);
-                    next($replace);
-                }
-            }
-        } else {
-            $parts = mb_split(preg_quote($search), $subject);
-            $count = count($parts) - 1;
-            $subject = implode($replace, $parts);
-        }
-        return $subject;
-    }
-
-}
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/shared.mb_unicode.php b/resources/libs/smarty/plugins/shared.mb_unicode.php
deleted file mode 100644
index e7f839ec8..000000000
--- a/resources/libs/smarty/plugins/shared.mb_unicode.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package Smarty
- * @subpackage PluginsShared
- */
-
-/**
- * convert characters to their decimal unicode equivalents
- *
- * @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
- * @param string $string   characters to calculate unicode of
- * @param string $encoding encoding of $string, if null mb_internal_encoding() is used
- * @return array sequence of unicodes
- * @author Rodney Rehm
- */
-function smarty_mb_to_unicode($string, $encoding=null) {
-    if ($encoding) {
-        $expanded = mb_convert_encoding($string, "UTF-32BE", $encoding);
-    } else {
-        $expanded = mb_convert_encoding($string, "UTF-32BE");
-    }
-    return unpack("N*", $expanded);
-}
-
-/**
- * convert unicodes to the character of given encoding
- *
- * @link http://www.ibm.com/developerworks/library/os-php-unicode/index.html#listing3 for inspiration
- * @param integer|array $unicode  single unicode or list of unicodes to convert
- * @param string        $encoding encoding of returned string, if null mb_internal_encoding() is used
- * @return string unicode as character sequence in given $encoding
- * @author Rodney Rehm
- */
-function smarty_mb_from_unicode($unicode, $encoding=null) {
-    $t = '';
-    if (!$encoding) {
-        $encoding = mb_internal_encoding();
-    }
-    foreach((array) $unicode as $utf32be) {
-        $character = pack("N*", $utf32be);
-        $t .= mb_convert_encoding($character, $encoding, "UTF-32BE");
-    }
-    return $t;
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/shared.mb_wordwrap.php b/resources/libs/smarty/plugins/shared.mb_wordwrap.php
deleted file mode 100644
index ba3498c70..000000000
--- a/resources/libs/smarty/plugins/shared.mb_wordwrap.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- *
- * @package Smarty
- * @subpackage PluginsShared
- */
-
-if(!function_exists('smarty_mb_wordwrap')) {
-
-    /**
-     * Wrap a string to a given number of characters
-     *
-     * @link http://php.net/manual/en/function.wordwrap.php for similarity
-     * @param string  $str   the string to wrap
-     * @param int     $width the width of the output
-     * @param string  $break the character used to break the line
-     * @param boolean $cut   ignored parameter, just for the sake of
-     * @return string wrapped string
-     * @author Rodney Rehm
-     */
-    function smarty_mb_wordwrap($str, $width=75, $break="\n", $cut=false)
-    {
-        // break words into tokens using white space as a delimiter
-        $tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-        $length = 0;
-        $t = '';
-        $_previous = false;
-
-        foreach ($tokens as $_token) {
-            $token_length = mb_strlen($_token, Smarty::$_CHARSET);
-            $_tokens = array($_token);
-            if ($token_length > $width) {
-                // remove last space
-                $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
-                $_previous = false;
-                $length = 0;
-
-                if ($cut) {
-                    $_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
-                    // broken words go on a new line
-                    $t .= $break;
-                }
-            }
-
-            foreach ($_tokens as $token) {
-                $_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
-                $token_length = mb_strlen($token, Smarty::$_CHARSET);
-                $length += $token_length;
-
-                if ($length > $width) {
-                    // remove space before inserted break
-                    if ($_previous && $token_length < $width) {
-                        $t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
-                    }
-
-                    // add the break before the token
-                    $t .= $break;
-                    $length = $token_length;
-
-                    // skip space after inserting a break
-                    if ($_space) {
-                        $length = 0;
-                        continue;
-                    }
-                } else if ($token == "\n") {
-                    // hard break must reset counters
-                    $_previous = 0;
-                    $length = 0;
-                } else {
-                    // remember if we had a space or not
-                    $_previous = $_space;
-                }
-                // add the token
-                $t .= $token;
-            }
-        }
-
-        return $t;
-    }
-
-}
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/plugins/variablefilter.htmlspecialchars.php b/resources/libs/smarty/plugins/variablefilter.htmlspecialchars.php
deleted file mode 100644
index aff711e48..000000000
--- a/resources/libs/smarty/plugins/variablefilter.htmlspecialchars.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage PluginsFilter
- */
-
-/**
- * Smarty htmlspecialchars variablefilter plugin
- *
- * @param string                   $source input string
- * @param Smarty_Internal_Template $smarty Smarty object
- * @return string filtered output
- */
-function smarty_variablefilter_htmlspecialchars($source, $smarty)
-{
-    return htmlspecialchars($source, ENT_QUOTES, Smarty::$_CHARSET);
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_cacheresource.php b/resources/libs/smarty/sysplugins/smarty_cacheresource.php
deleted file mode 100644
index ca18add5e..000000000
--- a/resources/libs/smarty/sysplugins/smarty_cacheresource.php
+++ /dev/null
@@ -1,381 +0,0 @@
-<?php
-/**
-* Smarty Internal Plugin
-*
-* @package Smarty
-* @subpackage Cacher
-*/
-
-/**
-* Cache Handler API
-*
-* @package Smarty
-* @subpackage Cacher
-* @author Rodney Rehm
-*/
-abstract class Smarty_CacheResource {
-    /**
-    * cache for Smarty_CacheResource instances
-    * @var array
-    */
-    public static $resources = array();
-
-    /**
-    * resource types provided by the core
-    * @var array
-    */
-    protected static $sysplugins = array(
-        'file' => true,
-    );
-
-    /**
-    * populate Cached Object with meta data from Resource
-    *
-    * @param Smarty_Template_Cached $cached cached object
-    * @param Smarty_Internal_Template $_template template object
-    * @return void
-    */
-    public abstract function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template);
-
-    /**
-    * populate Cached Object with timestamp and exists from Resource
-    *
-    * @param Smarty_Template_Cached $source cached object
-    * @return void
-    */
-    public abstract function populateTimestamp(Smarty_Template_Cached $cached);
-
-    /**
-    * Read the cached template and process header
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param Smarty_Template_Cached $cached cached object
-    * @return booelan true or false if the cached content does not exist
-    */
-    public abstract function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null);
-
-    /**
-    * Write the rendered template output to cache
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content to cache
-    * @return boolean success
-    */
-    public abstract function writeCachedContent(Smarty_Internal_Template $_template, $content);
-
-    /**
-    * Return cached content
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content of cache
-    */
-    public function getCachedContent(Smarty_Internal_Template $_template)
-    {
-        if ($_template->cached->handler->process($_template)) {
-            ob_start();
-            $_template->properties['unifunc']($_template);
-            return ob_get_clean();
-        }
-        return null;
-    }
-
-    /**
-    * Empty cache
-    *
-    * @param Smarty $smarty Smarty object
-    * @param integer $exp_time expiration time (number of seconds, not timestamp)
-    * @return integer number of cache files deleted
-    */
-    public abstract function clearAll(Smarty $smarty, $exp_time=null);
-
-    /**
-    * Empty cache for a specific template
-    *
-    * @param Smarty $smarty Smarty object
-    * @param string $resource_name template name
-    * @param string $cache_id cache id
-    * @param string $compile_id compile id
-    * @param integer $exp_time expiration time (number of seconds, not timestamp)
-    * @return integer number of cache files deleted
-    */
-    public abstract function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time);
-
-
-    public function locked(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // theoretically locking_timeout should be checked against time_limit (max_execution_time)
-        $start = microtime(true);
-        $hadLock = null;
-        while ($this->hasLock($smarty, $cached)) {
-            $hadLock = true;
-            if (microtime(true) - $start > $smarty->locking_timeout) {
-                // abort waiting for lock release
-                return false;
-            }
-            sleep(1);
-        }
-        return $hadLock;
-    }
-
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // check if lock exists
-        return false;
-    }
-
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // create lock
-        return true;
-    }
-
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        // release lock
-        return true;
-    }
-
-
-    /**
-    * Load Cache Resource Handler
-    *
-    * @param Smarty $smarty Smarty object
-    * @param string $type name of the cache resource
-    * @return Smarty_CacheResource Cache Resource Handler
-    */
-    public static function load(Smarty $smarty, $type = null)
-    {
-        if (!isset($type)) {
-            $type = $smarty->caching_type;
-        }
-
-        // try smarty's cache
-        if (isset($smarty->_cacheresource_handlers[$type])) {
-            return $smarty->_cacheresource_handlers[$type];
-        }
-        
-        // try registered resource
-        if (isset($smarty->registered_cache_resources[$type])) {
-            // do not cache these instances as they may vary from instance to instance
-            return $smarty->_cacheresource_handlers[$type] = $smarty->registered_cache_resources[$type];
-        }
-        // try sysplugins dir
-        if (isset(self::$sysplugins[$type])) {
-            if (!isset(self::$resources[$type])) {
-                $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
-                self::$resources[$type] = new $cache_resource_class();
-            }
-            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
-        }
-        // try plugins dir
-        $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
-        if ($smarty->loadPlugin($cache_resource_class)) {
-            if (!isset(self::$resources[$type])) {
-                self::$resources[$type] = new $cache_resource_class();
-            }
-            return $smarty->_cacheresource_handlers[$type] = self::$resources[$type];
-        }
-        // give up
-        throw new SmartyException("Unable to load cache resource '{$type}'");
-    }
-
-    /**
-    * Invalid Loaded Cache Files
-    *
-    * @param Smarty $smarty Smarty object
-    */
-    public static function invalidLoadedCache(Smarty $smarty)
-    {
-        foreach ($smarty->template_objects as $tpl) {
-            if (isset($tpl->cached)) {
-                $tpl->cached->valid = false;
-                $tpl->cached->processed = false;
-            }
-        }
-    }
-}
-
-/**
-* Smarty Resource Data Object
-*
-* Cache Data Container for Template Files
-*
-* @package Smarty
-* @subpackage TemplateResources
-* @author Rodney Rehm
-*/
-class Smarty_Template_Cached {
-    /**
-    * Source Filepath
-    * @var string
-    */
-    public $filepath = false;
-
-    /**
-    * Source Content
-    * @var string
-    */
-    public $content = null;
-
-    /**
-    * Source Timestamp
-    * @var integer
-    */
-    public $timestamp = false;
-
-    /**
-    * Source Existance
-    * @var boolean
-    */
-    public $exists = false;
-
-    /**
-    * Cache Is Valid
-    * @var boolean
-    */
-    public $valid = false;
-
-    /**
-    * Cache was processed
-    * @var boolean
-    */
-    public $processed = false;
-
-    /**
-    * CacheResource Handler
-    * @var Smarty_CacheResource
-    */
-    public $handler = null;
-
-    /**
-    * Template Compile Id (Smarty_Internal_Template::$compile_id)
-    * @var string
-    */
-    public $compile_id = null;
-
-    /**
-    * Template Cache Id (Smarty_Internal_Template::$cache_id)
-    * @var string
-    */
-    public $cache_id = null;
-
-    /**
-    * Id for cache locking
-    * @var string
-    */
-    public $lock_id = null;
-
-    /**
-    * flag that cache is locked by this instance
-    * @var bool
-    */
-    public $is_locked = false;
-
-    /**
-    * Source Object
-    * @var Smarty_Template_Source
-    */
-    public $source = null;
-
-    /**
-    * create Cached Object container
-    *
-    * @param Smarty_Internal_Template $_template template object
-    */
-    public function __construct(Smarty_Internal_Template $_template)
-    {
-        $this->compile_id = $_template->compile_id;
-        $this->cache_id = $_template->cache_id;
-        $this->source = $_template->source;
-        $_template->cached = $this;
-        $smarty = $_template->smarty;
-
-        //
-        // load resource handler
-        //
-        $this->handler = $handler = Smarty_CacheResource::load($smarty); // Note: prone to circular references
-
-        //
-        //    check if cache is valid
-        //
-        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->recompiled) {
-            $handler->populate($this, $_template);
-            return;
-        }
-        while (true) {
-            while (true) {
-                $handler->populate($this, $_template);
-                if ($this->timestamp === false || $smarty->force_compile || $smarty->force_cache) {
-                    $this->valid = false;
-                } else {
-                    $this->valid = true;
-                }
-                if ($this->valid && $_template->caching == Smarty::CACHING_LIFETIME_CURRENT && $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)) {
-                    // lifetime expired
-                    $this->valid = false;
-                }
-                if ($this->valid || !$_template->smarty->cache_locking) {
-                    break;
-                }
-                if (!$this->handler->locked($_template->smarty, $this)) {
-                    $this->handler->acquireLock($_template->smarty, $this);
-                    break 2;
-                }
-            }
-            if ($this->valid) {
-                if (!$_template->smarty->cache_locking || $this->handler->locked($_template->smarty, $this) === null) {
-                    // load cache file for the following checks
-                    if ($smarty->debugging) {
-                        Smarty_Internal_Debug::start_cache($_template);
-                    }
-                    if($handler->process($_template, $this) === false) {
-                        $this->valid = false;
-                    } else {
-                        $this->processed = true;
-                    }
-                    if ($smarty->debugging) {
-                        Smarty_Internal_Debug::end_cache($_template);
-                    }
-                } else {
-                    continue;
-                }
-            } else {
-                return;
-            }
-            if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED && $_template->properties['cache_lifetime'] >= 0 && (time() > ($_template->cached->timestamp + $_template->properties['cache_lifetime']))) {
-                $this->valid = false;
-            }
-            if (!$this->valid && $_template->smarty->cache_locking) {
-                $this->handler->acquireLock($_template->smarty, $this);
-                return;
-            } else {
-                return;
-            }
-        }
-    }
-
-    /**
-    * Write this cache object to handler
-    *
-    * @param Smarty_Internal_Template $_template template object
-    * @param string $content content to cache
-    * @return boolean success
-    */
-    public function write(Smarty_Internal_Template $_template, $content)
-    {
-        if (!$_template->source->recompiled) {
-            if ($this->handler->writeCachedContent($_template, $content)) {
-                $this->timestamp = time();
-                $this->exists = true;
-                $this->valid = true;
-                if ($_template->smarty->cache_locking) {
-                    $this->handler->releaseLock($_template->smarty, $this);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-}
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_cacheresource_custom.php b/resources/libs/smarty/sysplugins/smarty_cacheresource_custom.php
deleted file mode 100644
index ee9de157b..000000000
--- a/resources/libs/smarty/sysplugins/smarty_cacheresource_custom.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package Smarty
- * @subpackage Cacher
- */
-
-/**
- * Cache Handler API
- *
- * @package Smarty
- * @subpackage Cacher
- * @author Rodney Rehm
- */
-abstract class Smarty_CacheResource_Custom extends Smarty_CacheResource {
-
-    /**
-     * fetch cached content and its modification time from data source
-     *
-     * @param string $id         unique cache content identifier
-     * @param string $name       template name
-     * @param string $cache_id   cache id
-     * @param string $compile_id compile id
-     * @param string $content    cached content
-     * @param integer $mtime cache modification timestamp (epoch)
-     * @return void
-     */
-    protected abstract function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime);
-
-    /**
-     * Fetch cached content's modification timestamp from data source
-     *
-     * {@internal implementing this method is optional.
-     *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
-     *
-     * @param string $id         unique cache content identifier
-     * @param string $name       template name
-     * @param string $cache_id   cache id
-     * @param string $compile_id compile id
-     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-     */
-    protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
-    {
-        return null;
-    }
-
-    /**
-     * Save content to cache
-     *
-     * @param string       $id         unique cache content identifier
-     * @param string       $name       template name
-     * @param string       $cache_id   cache id
-     * @param string       $compile_id compile id
-     * @param integer|null $exp_time   seconds till expiration or null
-     * @param string $content content to cache
-     * @return boolean success
-     */
-    protected abstract function save($id, $name, $cache_id, $compile_id, $exp_time, $content);
-
-    /**
-     * Delete content from cache
-     *
-     * @param string       $name       template name
-     * @param string       $cache_id   cache id
-     * @param string       $compile_id compile id
-     * @param integer|null $exp_time   seconds till expiration time in seconds or null
-     * @return integer number of deleted caches
-     */
-    protected abstract function delete($name, $cache_id, $compile_id, $exp_time);
-
-    /**
-     * populate Cached Object with meta data from Resource
-     *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
-     */
-    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
-    {
-        $_cache_id = isset($cached->cache_id) ? preg_replace('![^\w\|]+!', '_', $cached->cache_id) : null;
-        $_compile_id = isset($cached->compile_id) ? preg_replace('![^\w\|]+!', '_', $cached->compile_id) : null;
-
-        $cached->filepath = sha1($cached->source->filepath . $_cache_id . $_compile_id);
-        $this->populateTimestamp($cached);
-    }
-
-    /**
-     * populate Cached Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Cached $source cached object
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Cached $cached)
-    {
-        $mtime = $this->fetchTimestamp($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id);
-        if ($mtime !== null) {
-            $cached->timestamp = $mtime;
-            $cached->exists = !!$cached->timestamp;
-            return;
-        }
-        $timestamp = null;
-        $this->fetch($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id, $cached->content, $timestamp);
-        $cached->timestamp = isset($timestamp) ? $timestamp : false;
-        $cached->exists = !!$cached->timestamp;
-    }
-
-    /**
-     * Read the cached template and process the header
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if the cached content does not exist
-     */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
-    {
-        if (!$cached) {
-            $cached = $_template->cached;
-        }
-        $content = $cached->content ? $cached->content : null;
-        $timestamp = $cached->timestamp ? $cached->timestamp : null;
-        if ($content === null || !$timestamp) {
-            $this->fetch(
-                $_template->cached->filepath,
-                $_template->source->name,
-                $_template->cache_id,
-                $_template->compile_id,
-                $content,
-                $timestamp
-            );
-        }
-        if (isset($content)) {
-            $_smarty_tpl = $_template;
-            eval("?>" . $content);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Write the rendered template output to cache
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $content   content to cache
-     * @return boolean success
-     */
-    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-    {
-        return $this->save(
-            $_template->cached->filepath,
-            $_template->source->name,
-            $_template->cache_id,
-            $_template->compile_id,
-            $_template->properties['cache_lifetime'],
-            $content
-        );
-    }
-
-    /**
-     * Empty cache
-     *
-     * @param Smarty  $smarty   Smarty object
-     * @param integer $exp_time expiration time (number of seconds, not timestamp)
-     * @return integer number of cache files deleted
-     */
-    public function clearAll(Smarty $smarty, $exp_time=null)
-    {
-        $this->cache = array();
-        return $this->delete(null, null, null, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param Smarty  $smarty        Smarty object
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
-     * @return integer number of cache files deleted
-     */
-    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
-    {
-        $this->cache = array();
-        return $this->delete($resource_name, $cache_id, $compile_id, $exp_time);
-    }
-
-    /**
-     * Check is cache is locked for this template
-     *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if cache is locked
-     */
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $id = $cached->filepath;
-        $name = $cached->source->name . '.lock';
-
-        $mtime = $this->fetchTimestamp($id, $name, null, null);
-        if ($mtime === null) {
-            $this->fetch($id, $name, null, null, $content, $mtime);
-        }
-
-        return $mtime && time() - $mtime < $smarty->locking_timeout;
-    }
-
-    /**
-     * Lock cache for this template
-     *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     */
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = true;
-
-        $id = $cached->filepath;
-        $name = $cached->source->name . '.lock';
-        $this->save($id, $name, null, null, $smarty->locking_timeout, '');
-    }
-
-    /**
-     * Unlock cache for this template
-     *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     */
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = false;
-
-        $name = $cached->source->name . '.lock';
-        $this->delete($name, null, null, null);
-    }
-}
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php b/resources/libs/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
deleted file mode 100644
index dff9b65aa..000000000
--- a/resources/libs/smarty/sysplugins/smarty_cacheresource_keyvaluestore.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package Smarty
- * @subpackage Cacher
- */
-
-/**
- * Smarty Cache Handler Base for Key/Value Storage Implementations
- *
- * This class implements the functionality required to use simple key/value stores
- * for hierarchical cache groups. key/value stores like memcache or APC do not support
- * wildcards in keys, therefore a cache group cannot be cleared like "a|*" - which
- * is no problem to filesystem and RDBMS implementations.
- *
- * This implementation is based on the concept of invalidation. While one specific cache
- * can be identified and cleared, any range of caches cannot be identified. For this reason
- * each level of the cache group hierarchy can have its own value in the store. These values
- * are nothing but microtimes, telling us when a particular cache group was cleared for the
- * last time. These keys are evaluated for every cache read to determine if the cache has
- * been invalidated since it was created and should hence be treated as inexistent.
- *
- * Although deep hierarchies are possible, they are not recommended. Try to keep your
- * cache groups as shallow as possible. Anything up 3-5 parents should be ok. So
- * »a|b|c« is a good depth where »a|b|c|d|e|f|g|h|i|j|k« isn't. Try to join correlating
- * cache groups: if your cache groups look somewhat like »a|b|$page|$items|$whatever«
- * consider using »a|b|c|$page-$items-$whatever« instead.
- *
- * @package Smarty
- * @subpackage Cacher
- * @author Rodney Rehm
- */
-abstract class Smarty_CacheResource_KeyValueStore extends Smarty_CacheResource {
-
-    /**
-     * cache for contents
-     * @var array
-     */
-    protected $contents = array();
-    /**
-     * cache for timestamps
-     * @var array
-     */
-    protected $timestamps = array();
-
-    /**
-     * populate Cached Object with meta data from Resource
-     *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
-     */
-    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
-    {
-        $cached->filepath = $_template->source->uid
-                . '#' . $this->sanitize($cached->source->name)
-                . '#' . $this->sanitize($cached->cache_id)
-                . '#' . $this->sanitize($cached->compile_id);
-
-        $this->populateTimestamp($cached);
-    }
-
-    /**
-     * populate Cached Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Cached $cached cached object
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Cached $cached)
-    {
-        if (!$this->fetch($cached->filepath, $cached->source->name, $cached->cache_id, $cached->compile_id, $content, $timestamp, $cached->source->uid)) {
-            return;
-        }
-        $cached->content = $content;
-        $cached->timestamp = (int) $timestamp;
-        $cached->exists = $cached->timestamp;
-    }
-
-    /**
-     * Read the cached template and process the header
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if the cached content does not exist
-     */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
-    {
-        if (!$cached) {
-            $cached = $_template->cached;
-        }
-        $content = $cached->content ? $cached->content : null;
-        $timestamp = $cached->timestamp ? $cached->timestamp : null;
-        if ($content === null || !$timestamp) {
-            if (!$this->fetch($_template->cached->filepath, $_template->source->name, $_template->cache_id, $_template->compile_id, $content, $timestamp, $_template->source->uid)) {
-                return false;
-            }
-        }
-        if (isset($content)) {
-            $_smarty_tpl = $_template;
-            eval("?>" . $content);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Write the rendered template output to cache
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string $content content to cache
-     * @return boolean success
-     */
-    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-    {
-        $this->addMetaTimestamp($content);
-        return $this->write(array($_template->cached->filepath => $content), $_template->properties['cache_lifetime']);
-    }
-
-    /**
-     * Empty cache
-     *
-     * {@internal the $exp_time argument is ignored altogether }}
-     *
-     * @param Smarty  $smarty   Smarty object
-     * @param integer $exp_time expiration time [being ignored]
-     * @return integer number of cache files deleted [always -1]
-     * @uses purge() to clear the whole store
-     * @uses invalidate() to mark everything outdated if purge() is inapplicable
-     */
-    public function clearAll(Smarty $smarty, $exp_time=null)
-    {
-        if (!$this->purge()) {
-            $this->invalidate(null);
-        }
-        return -1;
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * {@internal the $exp_time argument is ignored altogether}}
-     *
-     * @param Smarty  $smarty        Smarty object
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time [being ignored]
-     * @return integer number of cache files deleted [always -1]
-     * @uses buildCachedFilepath() to generate the CacheID
-     * @uses invalidate() to mark CacheIDs parent chain as outdated
-     * @uses delete() to remove CacheID from cache
-     */
-    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
-    {
-        $uid = $this->getTemplateUid($smarty, $resource_name, $cache_id, $compile_id);
-        $cid = $uid . '#' . $this->sanitize($resource_name) . '#' . $this->sanitize($cache_id) . '#' . $this->sanitize($compile_id);
-        $this->delete(array($cid));
-        $this->invalidate($cid, $resource_name, $cache_id, $compile_id, $uid);
-        return -1;
-    }
-    /**
-     * Get template's unique ID
-     *
-     * @param Smarty $smarty        Smarty object
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
-     * @return string filepath of cache file
-     */
-    protected function getTemplateUid(Smarty $smarty, $resource_name, $cache_id, $compile_id)
-    {
-        $uid = '';
-        if (isset($resource_name)) {
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            if ($tpl->source->exists) {
-                $uid = $tpl->source->uid;
-            }
-            
-            // remove from template cache
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-        }
-        return $uid;
-    }
-
-    /**
-     * Sanitize CacheID components
-     *
-     * @param string $string CacheID component to sanitize
-     * @return string sanitized CacheID component
-     */
-    protected function sanitize($string)
-    {
-        // some poeple smoke bad weed
-        $string = trim($string, '|');
-        if (!$string) {
-            return null;
-        }
-        return preg_replace('#[^\w\|]+#S', '_', $string);
-    }
-
-    /**
-     * Fetch and prepare a cache object.
-     *
-     * @param string  $cid           CacheID to fetch
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param string  $content       cached content
-     * @param integer &$timestamp    cached timestamp (epoch)
-     * @param string  $resource_uid  resource's uid
-     * @return boolean success
-     */
-    protected function fetch($cid, $resource_name = null, $cache_id = null, $compile_id = null, &$content = null, &$timestamp = null, $resource_uid = null)
-    {
-        $t = $this->read(array($cid));
-        $content = !empty($t[$cid]) ? $t[$cid] : null;
-        $timestamp = null;
-
-        if ($content && ($timestamp = $this->getMetaTimestamp($content))) {
-            $invalidated = $this->getLatestInvalidationTimestamp($cid, $resource_name, $cache_id, $compile_id, $resource_uid);
-            if ($invalidated > $timestamp) {
-                $timestamp = null;
-                $content = null;
-            }
-        }
-
-        return !!$content;
-    }
-
-    /**
-     * Add current microtime to the beginning of $cache_content
-     *
-     * {@internal the header uses 8 Bytes, the first 4 Bytes are the seconds, the second 4 Bytes are the microseconds}}
-     *
-     * @param string &$content the content to be cached
-     */
-    protected function addMetaTimestamp(&$content)
-    {
-        $mt = explode(" ", microtime());
-        $ts = pack("NN", $mt[1], (int) ($mt[0] * 100000000));
-        $content = $ts . $content;
-    }
-
-    /**
-     * Extract the timestamp the $content was cached
-     *
-     * @param string &$content the cached content
-     * @return float the microtime the content was cached
-     */
-    protected function getMetaTimestamp(&$content)
-    {
-        $s = unpack("N", substr($content, 0, 4));
-        $m = unpack("N", substr($content, 4, 4));
-        $content = substr($content, 8);
-        return $s[1] + ($m[1] / 100000000);
-    }
-
-    /**
-     * Invalidate CacheID
-     *
-     * @param string $cid           CacheID
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
-     * @param string $resource_uid  source's uid
-     * @return void
-     */
-    protected function invalidate($cid = null, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
-    {
-        $now = microtime(true);
-        $key = null;
-        // invalidate everything
-        if (!$resource_name && !$cache_id && !$compile_id) {
-            $key = 'IVK#ALL';
-        }
-        // invalidate all caches by template
-        else if ($resource_name && !$cache_id && !$compile_id) {
-            $key = 'IVK#TEMPLATE#' . $resource_uid . '#' . $this->sanitize($resource_name);
-        }
-        // invalidate all caches by cache group
-        else if (!$resource_name && $cache_id && !$compile_id) {
-            $key = 'IVK#CACHE#' . $this->sanitize($cache_id);
-        }
-        // invalidate all caches by compile id
-        else if (!$resource_name && !$cache_id && $compile_id) {
-            $key = 'IVK#COMPILE#' . $this->sanitize($compile_id);
-        }
-        // invalidate by combination
-        else {
-            $key = 'IVK#CID#' . $cid;
-        }
-        $this->write(array($key => $now));
-    }
-
-    /**
-     * Determine the latest timestamp known to the invalidation chain
-     *
-     * @param string $cid           CacheID to determine latest invalidation timestamp of
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
-     * @param string $resource_uid  source's filepath
-     * @return float the microtime the CacheID was invalidated
-     */
-    protected function getLatestInvalidationTimestamp($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
-    {
-        // abort if there is no CacheID
-        if (false && !$cid) {
-            return 0;
-        }
-        // abort if there are no InvalidationKeys to check
-        if (!($_cid = $this->listInvalidationKeys($cid, $resource_name, $cache_id, $compile_id, $resource_uid))) {
-            return 0;
-        }
-        
-        // there are no InValidationKeys
-        if (!($values = $this->read($_cid))) {
-            return 0;
-        }
-        // make sure we're dealing with floats
-        $values = array_map('floatval', $values);
-        return max($values);
-    }
-
-    /**
-     * Translate a CacheID into the list of applicable InvalidationKeys.
-     *
-     * Splits "some|chain|into|an|array" into array( '#clearAll#', 'some', 'some|chain', 'some|chain|into', ... )
-     *
-     * @param string $cid           CacheID to translate
-     * @param string $resource_name template name
-     * @param string $cache_id      cache id
-     * @param string $compile_id    compile id
-     * @param string $resource_uid  source's filepath
-     * @return array list of InvalidationKeys
-     * @uses $invalidationKeyPrefix to prepend to each InvalidationKey
-     */
-    protected function listInvalidationKeys($cid, $resource_name = null, $cache_id = null, $compile_id = null, $resource_uid = null)
-    {
-        $t = array('IVK#ALL');
-        $_name = $_compile = '#';
-        if ($resource_name) {
-            $_name .= $resource_uid . '#' . $this->sanitize($resource_name);
-            $t[] = 'IVK#TEMPLATE' . $_name;
-        }
-        if ($compile_id) {
-            $_compile .= $this->sanitize($compile_id);
-            $t[] = 'IVK#COMPILE' . $_compile;
-        }
-        $_name .= '#';
-        // some poeple smoke bad weed
-        $cid = trim($cache_id, '|');
-        if (!$cid) {
-            return $t;
-        }
-        $i = 0;
-        while (true) {
-            // determine next delimiter position
-            $i = strpos($cid, '|', $i);
-            // add complete CacheID if there are no more delimiters
-            if ($i === false) {
-                $t[] = 'IVK#CACHE#' . $cid;
-                $t[] = 'IVK#CID' . $_name . $cid . $_compile;
-                $t[] = 'IVK#CID' . $_name . $_compile;
-                break;
-            }
-            $part = substr($cid, 0, $i);
-            // add slice to list
-            $t[] = 'IVK#CACHE#' . $part;
-            $t[] = 'IVK#CID' . $_name . $part . $_compile;
-            // skip past delimiter position
-            $i++;
-        }
-        return $t;
-    }
-
-    /**
-     * Check is cache is locked for this template
-     *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if cache is locked
-     */
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $key = 'LOCK#' . $cached->filepath;
-        $data = $this->read(array($key));
-        return $data && time() - $data[$key] < $smarty->locking_timeout;
-    }
-
-    /**
-     * Lock cache for this template
-     *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     */
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = true;
-        $key = 'LOCK#' . $cached->filepath;
-        $this->write(array($key => time()), $smarty->locking_timeout);
-    }
-
-    /**
-     * Unlock cache for this template
-     *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     */
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = false;
-        $key = 'LOCK#' . $cached->filepath;
-        $this->delete(array($key));
-    }
-
-    /**
-     * Read values for a set of keys from cache
-     *
-     * @param array $keys list of keys to fetch
-     * @return array list of values with the given keys used as indexes
-     */
-    protected abstract function read(array $keys);
-
-    /**
-     * Save values for a set of keys to cache
-     *
-     * @param array $keys   list of values to save
-     * @param int   $expire expiration time
-     * @return boolean true on success, false on failure
-     */
-    protected abstract function write(array $keys, $expire=null);
-
-    /**
-     * Remove values from cache
-     *
-     * @param array $keys list of keys to delete
-     * @return boolean true on success, false on failure
-     */
-    protected abstract function delete(array $keys);
-
-    /**
-     * Remove *all* values from cache
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function purge()
-    {
-        return false;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_config_source.php b/resources/libs/smarty/sysplugins/smarty_config_source.php
deleted file mode 100644
index 043ff13e9..000000000
--- a/resources/libs/smarty/sysplugins/smarty_config_source.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin
- *
- * @package Smarty
- * @subpackage TemplateResources
- */
-
-/**
- * Smarty Resource Data Object
- *
- * Meta Data Container for Config Files
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- *
- * @property string $content
- * @property int    $timestamp
- * @property bool   $exists
- */
-class Smarty_Config_Source extends Smarty_Template_Source {
-
-    /**
-     * create Config Object container
-     *
-     * @param Smarty_Resource $handler          Resource Handler this source object communicates with
-     * @param Smarty          $smarty           Smarty instance this source object belongs to
-     * @param string          $resource         full config_resource
-     * @param string          $type             type of resource
-     * @param string          $name             resource name
-     * @param string          $unique_resource  unqiue resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
-    {
-        $this->handler = $handler; // Note: prone to circular references
-
-        // Note: these may be ->config_compiler_class etc in the future
-        //$this->config_compiler_class = $handler->config_compiler_class;
-        //$this->config_lexer_class = $handler->config_lexer_class;
-        //$this->config_parser_class = $handler->config_parser_class;
-
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-        $this->unique_resource = $unique_resource;
-    }
-
-    /**
-     * <<magic>> Generic setter.
-     *
-     * @param string $property_name valid: content, timestamp, exists
-     * @param mixed  $value         newly assigned value (not check for correct type)
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'content':
-            case 'timestamp':
-            case 'exists':
-                $this->$property_name = $value;
-                break;
-
-            default:
-                throw new SmartyException("invalid config property '$property_name'.");
-        }
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * @param string $property_name valid: content, timestamp, exists
-     * @throws SmartyException when the given property name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'timestamp':
-            case 'exists':
-                $this->handler->populateTimestamp($this);
-                return $this->$property_name;
-
-            case 'content':
-                return $this->content = $this->handler->getContent($this);
-
-            default:
-                throw new SmartyException("config property '$property_name' does not exist.");
-        }
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_cacheresource_file.php b/resources/libs/smarty/sysplugins/smarty_internal_cacheresource_file.php
deleted file mode 100644
index 251954126..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_cacheresource_file.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin CacheResource File
- *
- * @package Smarty
- * @subpackage Cacher
- * @author Uwe Tews
- * @author Rodney Rehm
- */
-
-/**
- * This class does contain all necessary methods for the HTML cache on file system
- *
- * Implements the file system as resource for the HTML cache Version ussing nocache inserts.
- *
- * @package Smarty
- * @subpackage Cacher
- */
-class Smarty_Internal_CacheResource_File extends Smarty_CacheResource {
-
-    /**
-     * populate Cached Object with meta data from Resource
-     *
-     * @param Smarty_Template_Cached   $cached    cached object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
-     */
-    public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template)
-    {
-        $_source_file_path = str_replace(':', '.', $_template->source->filepath);
-        $_cache_id = isset($_template->cache_id) ? preg_replace('![^\w\|]+!', '_', $_template->cache_id) : null;
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-        $_filepath = $_template->source->uid;
-        // if use_sub_dirs, break file into directories
-        if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-                . substr($_filepath, 2, 2) . DS
-                . substr($_filepath, 4, 2) . DS
-                . $_filepath;
-        }
-        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_cache_id)) {
-            $_cache_id = str_replace('|', $_compile_dir_sep, $_cache_id) . $_compile_dir_sep;
-        } else {
-            $_cache_id = '';
-        }
-        if (isset($_compile_id)) {
-            $_compile_id = $_compile_id . $_compile_dir_sep;
-        } else {
-            $_compile_id = '';
-        }
-        $_cache_dir = $_template->smarty->getCacheDir();
-        if ($_template->smarty->cache_locking) {
-            // create locking file name
-            // relative file name?
-            if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_cache_dir)) {
-                $_lock_dir = rtrim(getcwd(), '/\\') . DS . $_cache_dir;
-            } else {
-                $_lock_dir = $_cache_dir;
-            }
-            $cached->lock_id = $_lock_dir.sha1($_cache_id.$_compile_id.$_template->source->uid).'.lock';
-        }
-        $cached->filepath = $_cache_dir . $_cache_id . $_compile_id . $_filepath . '.' . basename($_source_file_path) . '.php';
-        $cached->timestamp = @filemtime($cached->filepath);
-        $cached->exists = !!$cached->timestamp;
-    }
-
-    /**
-     * populate Cached Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Cached $cached cached object
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Cached $cached)
-    {
-        $cached->timestamp = @filemtime($cached->filepath);
-        $cached->exists = !!$cached->timestamp;
-    }
-
-    /**
-     * Read the cached template and process its header
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if the cached content does not exist
-     */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached=null)
-    {
-        $_smarty_tpl = $_template;
-        return @include $_template->cached->filepath;
-    }
-
-    /**
-     * Write the rendered template output to cache
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $content   content to cache
-     * @return boolean success
-     */
-    public function writeCachedContent(Smarty_Internal_Template $_template, $content)
-    {
-        if (Smarty_Internal_Write_File::writeFile($_template->cached->filepath, $content, $_template->smarty) === true) {
-            $_template->cached->timestamp = filemtime($_template->cached->filepath);
-            $_template->cached->exists = !!$_template->cached->timestamp;
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Empty cache
-     *
-     * @param Smarty_Internal_Template $_template template object
-     * @param integer                  $exp_time  expiration time (number of seconds, not timestamp)
-     * @return integer number of cache files deleted
-     */
-    public function clearAll(Smarty $smarty, $exp_time = null)
-    {
-        return $this->clear($smarty, null, null, null, $exp_time);
-    }
-
-    /**
-     * Empty cache for a specific template
-     *
-     * @param Smarty  $_template     template object
-     * @param string  $resource_name template name
-     * @param string  $cache_id      cache id
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time (number of seconds, not timestamp)
-     * @return integer number of cache files deleted
-    */
-    public function clear(Smarty $smarty, $resource_name, $cache_id, $compile_id, $exp_time)
-    {
-        $_cache_id = isset($cache_id) ? preg_replace('![^\w\|]+!', '_', $cache_id) : null;
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
-        $_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
-        $_dir = $smarty->getCacheDir();
-        $_dir_length = strlen($_dir);
-        if (isset($_cache_id)) {
-            $_cache_id_parts = explode('|', $_cache_id);
-            $_cache_id_parts_count = count($_cache_id_parts);
-            if ($smarty->use_sub_dirs) {
-                foreach ($_cache_id_parts as $id_part) {
-                    $_dir .= $id_part . DS;
-                }
-            }
-        }
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = true;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            // remove from template cache
-            $tpl->source; // have the template registered before unset()
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-
-            if ($tpl->source->exists) {
-                $_resourcename_parts = basename(str_replace('^', '/', $tpl->cached->filepath));
-            } else {
-                return 0;
-            }
-        }
-        $_count = 0;
-        $_time = time();
-        if (file_exists($_dir)) {
-            $_cacheDirs = new RecursiveDirectoryIterator($_dir);
-            $_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
-            foreach ($_cache as $_file) {
-                if (substr($_file->getBasename(),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
-                // directory ?
-                if ($_file->isDir()) {
-                    if (!$_cache->isDot()) {
-                        // delete folder if empty
-                        @rmdir($_file->getPathname());
-                    }
-                } else {
-                    $_parts = explode($_dir_sep, str_replace('\\', '/', substr((string)$_file, $_dir_length)));
-                    $_parts_count = count($_parts);
-                    // check name
-                    if (isset($resource_name)) {
-                        if ($_parts[$_parts_count-1] != $_resourcename_parts) {
-                            continue;
-                        }
-                    }
-                    // check compile id
-                    if (isset($_compile_id) && (!isset($_parts[$_parts_count-2 - $_compile_id_offset]) || $_parts[$_parts_count-2 - $_compile_id_offset] != $_compile_id)) {
-                        continue;
-                    }
-                    // check cache id
-                    if (isset($_cache_id)) {
-                        // count of cache id parts
-                        $_parts_count = (isset($_compile_id)) ? $_parts_count - 2 - $_compile_id_offset : $_parts_count - 1 - $_compile_id_offset;
-                        if ($_parts_count < $_cache_id_parts_count) {
-                            continue;
-                        }
-                        for ($i = 0; $i < $_cache_id_parts_count; $i++) {
-                            if ($_parts[$i] != $_cache_id_parts[$i]) continue 2;
-                        }
-                    }
-                    // expired ?
-                    if (isset($exp_time) && $_time - @filemtime($_file) < $exp_time) {
-                        continue;
-                    }
-                    $_count += @unlink((string) $_file) ? 1 : 0;
-                }
-            }
-        }
-        return $_count;
-    }
-
-    /**
-     * Check is cache is locked for this template
-     *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     * @return booelan true or false if cache is locked
-     */
-    public function hasLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-            clearstatcache(true, $cached->lock_id);
-        } else {
-            clearstatcache();
-        }
-        $t = @filemtime($cached->lock_id);
-        return $t && (time() - $t < $smarty->locking_timeout);
-    }
-
-    /**
-     * Lock cache for this template
-     *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     */
-    public function acquireLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = true;
-        touch($cached->lock_id);
-    }
-
-    /**
-     * Unlock cache for this template
-     *
-     * @param Smarty $smarty Smarty object
-     * @param Smarty_Template_Cached $cached cached object
-     */
-    public function releaseLock(Smarty $smarty, Smarty_Template_Cached $cached)
-    {
-        $cached->is_locked = false;
-        @unlink($cached->lock_id);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_append.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_append.php
deleted file mode 100644
index f6036e883..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_append.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Append
- *
- * Compiles the {append} tag
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Append Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Append extends Smarty_Internal_Compile_Assign {
-
-    /**
-     * Compiles code for the {append} tag
-     *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // the following must be assigned at runtime because it will be overwritten in parent class
-        $this->required_attributes = array('var', 'value');
-        $this->shorttag_order = array('var', 'value');
-        $this->optional_attributes = array('scope', 'index');
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // map to compile assign attributes
-        if (isset($_attr['index'])) {
-            $_params['smarty_internal_index'] = '[' . $_attr['index'] . ']';
-            unset($_attr['index']);
-        } else {
-            $_params['smarty_internal_index'] = '[]';
-        }
-        $_new_attr = array();
-        foreach ($_attr as $key => $value) {
-            $_new_attr[] = array($key => $value);
-        }
-        // call compile assign
-        return parent::compile($_new_attr, $compiler, $_params);
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_assign.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_assign.php
deleted file mode 100644
index 40e468621..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_assign.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Assign
- *
- * Compiles the {assign} tag
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Assign Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Assign extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {assign} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // the following must be assigned at runtime because it will be overwritten in Smarty_Internal_Compile_Append
-        $this->required_attributes = array('var', 'value');
-        $this->shorttag_order = array('var', 'value');
-        $this->optional_attributes = array('scope');
-        $_nocache = 'null';
-        $_scope = Smarty::SCOPE_LOCAL;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // nocache ?
-        if ($compiler->tag_nocache || $compiler->nocache) {
-            $_nocache = 'true';
-            // create nocache var to make it know for further compiling
-            $compiler->template->tpl_vars[trim($_attr['var'], "'")] = new Smarty_variable(null, true);
-        }
-        // scope setup
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_scope = Smarty::SCOPE_GLOBAL;
-            } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
-            }
-        }
-        // compiled output
-        if (isset($parameter['smarty_internal_index'])) {
-            $output = "<?php \$_smarty_tpl->createLocalArrayVariable($_attr[var], $_nocache, $_scope);\n\$_smarty_tpl->tpl_vars[$_attr[var]]->value$parameter[smarty_internal_index] = $_attr[value];";
-        } else {
-            $output = "<?php \$_smarty_tpl->tpl_vars[$_attr[var]] = new Smarty_variable($_attr[value], $_nocache, $_scope);";
-        }
-        if ($_scope == Smarty::SCOPE_PARENT) {
-            $output .= "\nif (\$_smarty_tpl->parent != null) \$_smarty_tpl->parent->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-        } elseif ($_scope == Smarty::SCOPE_ROOT || $_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\n\$_ptr = \$_smarty_tpl->parent; while (\$_ptr != null) {\$_ptr->tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]]; \$_ptr = \$_ptr->parent; }";
-        }
-        if ( $_scope == Smarty::SCOPE_GLOBAL) {
-            $output .= "\nSmarty::\$global_tpl_vars[$_attr[var]] = clone \$_smarty_tpl->tpl_vars[$_attr[var]];";
-        }
-        $output .= '?>';
-        return $output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_block.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_block.php
deleted file mode 100644
index d40c35773..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_block.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-/**
-* Smarty Internal Plugin Compile Block
-*
-* Compiles the {block}{/block} tags
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-
-/**
-* Smarty Internal Plugin Compile Block Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Block extends Smarty_Internal_CompileBase {
-
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $required_attributes = array('name');
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $shorttag_order = array('name', 'hide');
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $optional_attributes = array('hide');
-
-    /**
-    * Compiles code for the {block} tag
-    *
-    * @param array  $args     array with attributes from parser
-    * @param object $compiler compiler object
-    * @return boolean true
-    */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $save = array($_attr, $compiler->parser->current_buffer, $compiler->nocache, $compiler->smarty->merge_compiled_includes, $compiler->merged_templates, $compiler->smarty->merged_templates_func, $compiler->template->properties, $compiler->template->has_nocache_code);
-        $this->openTag($compiler, 'block', $save);
-        if ($_attr['nocache'] == true) {
-            $compiler->nocache = true;
-        }
-        // set flag for {block} tag
-        $compiler->inheritance = true;
-        // must merge includes
-        $compiler->smarty->merge_compiled_includes = true;
-
-        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->has_code = false;
-        return true;
-    }
-
-    /**
-    * Save or replace child block source by block name during parsing
-    *
-    * @param string $block_content     block source content
-    * @param string $block_tag         opening block tag
-    * @param object $template          template object
-    * @param string $filepath          filepath of template source
-    */
-    public static function saveBlockData($block_content, $block_tag, $template, $filepath)
-    {
-        $_rdl = preg_quote($template->smarty->right_delimiter);
-        $_ldl = preg_quote($template->smarty->left_delimiter);
-        if ($template->smarty->auto_literal) {
-            $al = '\s*';
-        } else {
-            $al = '';
-        }
-        if (0 == preg_match("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")(\s*?)?((append|prepend|nocache)?(\s*)?(hide)?)?(\s*{$_rdl})!", $block_tag, $_match)) {
-            $error_text = 'Syntax Error in template "' . $template->source->filepath . '"   "' . htmlspecialchars($block_tag) . '" illegal options';
-            throw new SmartyCompilerException($error_text);
-        } else {
-            $_name = trim($_match[3], '\'"');
-            if ($_match[8] != 'hide' || isset($template->block_data[$_name])) {        // replace {$smarty.block.child}
-                // do we have {$smart.block.child} in nested {block} tags?
-                if (0 != preg_match_all("!({$_ldl}{$al}block\s+)(name=)?(\w+|'.*'|\".*\")([\s\S]*?{$_rdl})([\s\S]*?)({$_ldl}{$al}\\\$smarty\.block\.child{$_rdl})([\s\S]*?{$_ldl}{$al}/block{$_rdl})!", $block_content, $_match2)) {
-                    foreach($_match2[3] as $name) {
-                        // get it's replacement
-                        $_name2 = trim($name, '\'"');
-                        if (isset($template->block_data[$_name2])) {
-                            $replacement = $template->block_data[$_name2]['source'];
-                        } else {
-                            $replacement = '';
-                        }
-                        // replace {$smarty.block.child} tag
-                        $search = array("%({$_ldl}{$al}block[\s\S]*?{$name}[\s\S]*?{$_rdl})([\s\S]*?)({$_ldl}{$al}\\\$smarty\.block\.child{$_rdl})([\s\S]*?)({$_ldl}{$al}/block{$_rdl})%","/���child���/");
-                        $replace = array('\2���child���\4', $replacement);
-                        $block_content = preg_replace($search, $replace , $block_content);
-                    }
-                }
-                // do we have not nested {$smart.block.child}
-                if (0 != preg_match("/({$_ldl}{$al}\\\$smarty\.block\.child{$_rdl})/", $block_content, $_match2)) {
-                    // get child replacement for this block
-                    if (isset($template->block_data[$_name])) {
-                        $replacement = $template->block_data[$_name]['source'];
-                        unset($template->block_data[$_name]);
-                    } else {
-                        $replacement = '';
-                    }
-                    $block_content = preg_replace("/({$_ldl}{$al}\\\$smarty\.block\.child{$_rdl})/", $replacement, $block_content);
-                }
-                if (isset($template->block_data[$_name])) {
-                    if (strpos($template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
-                        $template->block_data[$_name]['source'] =
-                        str_replace('%%%%SMARTY_PARENT%%%%', $block_content, $template->block_data[$_name]['source']);
-                    } elseif ($template->block_data[$_name]['mode'] == 'prepend') {
-                        $template->block_data[$_name]['source'] .= $block_content;
-                    } elseif ($template->block_data[$_name]['mode'] == 'append') {
-                        $template->block_data[$_name]['source'] = $block_content . $template->block_data[$_name]['source'];
-                    }
-                } else {
-                    $template->block_data[$_name]['source'] = $block_content;
-                    $template->block_data[$_name]['file'] = $filepath;
-                }
-                if ($_match[6] == 'append') {
-                    $template->block_data[$_name]['mode'] = 'append';
-                } elseif ($_match[6] == 'prepend') {
-                    $template->block_data[$_name]['mode'] = 'prepend';
-                } else {
-                    $template->block_data[$_name]['mode'] = 'replace';
-                }
-            }
-        }
-    }
-
-    /**
-    * Compile saved child block source
-    *
-    * @param object $compiler  compiler object
-    * @param string $_name     optional name of child block
-    * @return string   compiled code of schild block
-    */
-    public static function compileChildBlock($compiler, $_name = null)
-    {
-        $_output = '';
-        // if called by {$smarty.block.child} we must search the name of enclosing {block}
-        if ($_name == null) {
-            $stack_count = count($compiler->_tag_stack);
-            while (--$stack_count >= 0) {
-                if ($compiler->_tag_stack[$stack_count][0] == 'block') {
-                    $_name = trim($compiler->_tag_stack[$stack_count][1][0]['name'] ,"'\"");
-                    break;
-                }
-            }
-            // flag that child is already compile by {$smarty.block.child} inclusion
-            $compiler->template->block_data[$_name]['compiled'] = true;
-        }
-        if ($_name == null) {
-            $compiler->trigger_template_error('{$smarty.block.child} used out of context', $compiler->lex->taglineno);
-        }
-        // undefined child?
-        if (!isset($compiler->template->block_data[$_name]['source'])) {
-            return '';
-        }
-        $_tpl = new Smarty_Internal_template ('string:' . $compiler->template->block_data[$_name]['source'], $compiler->smarty, $compiler->template, $compiler->template->cache_id,
-        $compiler->template->compile_id = null, $compiler->template->caching, $compiler->template->cache_lifetime);
-        $_tpl->variable_filters = $compiler->template->variable_filters;
-        $_tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-        $_tpl->source->filepath = $compiler->template->block_data[$_name]['file'];
-        $_tpl->allow_relative_path = true;
-        if ($compiler->nocache) {
-            $_tpl->compiler->forceNocache = 2;
-        } else {
-            $_tpl->compiler->forceNocache = 1;
-        }
-        $_tpl->compiler->suppressHeader = true;
-        $_tpl->compiler->suppressTemplatePropertyHeader = true;
-        $_tpl->compiler->suppressMergedTemplates = true;
-        if (strpos($compiler->template->block_data[$_name]['source'], '%%%%SMARTY_PARENT%%%%') !== false) {
-            $_output = str_replace('%%%%SMARTY_PARENT%%%%', $compiler->parser->current_buffer->to_smarty_php(), $_tpl->compiler->compileTemplate($_tpl));
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
-            $_output = $_tpl->compiler->compileTemplate($_tpl) . $compiler->parser->current_buffer->to_smarty_php();
-        } elseif ($compiler->template->block_data[$_name]['mode'] == 'append') {
-            $_output = $compiler->parser->current_buffer->to_smarty_php() . $_tpl->compiler->compileTemplate($_tpl);
-        } elseif (!empty($compiler->template->block_data[$_name])) {
-            $_output = $_tpl->compiler->compileTemplate($_tpl);
-        }
-        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $_tpl->properties['file_dependency']);
-        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $_tpl->properties['function']);
-        $compiler->merged_templates = array_merge($compiler->merged_templates, $_tpl->compiler->merged_templates);
-        $compiler->template->variable_filters = $_tpl->variable_filters;
-        if ($_tpl->has_nocache_code) {
-            $compiler->template->has_nocache_code = true;
-        }
-        foreach($_tpl->required_plugins as $key => $tmp1) {
-            if ($compiler->nocache) {
-                $code = 'nocache';
-            } else {
-                $code = $key;
-            }
-            foreach($tmp1 as $name => $tmp) {
-                foreach($tmp as $type => $data) {
-                    $compiler->template->required_plugins[$code][$name][$type] = $data;
-                }
-            }
-        }
-        unset($_tpl);
-        return $_output;
-    }
-
-}
-
-/**
-* Smarty Internal Plugin Compile BlockClose Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_CompileBase {
-
-    /**
-    * Compiles code for the {/block} tag
-    *
-    * @param array  $args     array with attributes from parser
-    * @param object $compiler compiler object
-    * @return string compiled code
-    */
-    public function compile($args, $compiler)
-    {
-        $compiler->has_code = true;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $saved_data = $this->closeTag($compiler, array('block'));
-        $_name = trim($saved_data[0]['name'], "\"'");
-        if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) {
-            // restore to status before {block} tag as new subtemplate code of parent {block} is not needed
-            // TODO: Below code was disabled in 3.1.8 because of problems with {include} in nested {block} tags in child templates
-            //       combined with append/prepend or $smarty.block.parent
-            //       For later versions it should be checked under which conditions it could run for optimisation
-            //
-            //$compiler->merged_templates = $saved_data[4];
-            //$compiler->smarty->merged_templates_func = $saved_data[5];
-            //$compiler->template->properties = $saved_data[6];
-            //$compiler->template->has_nocache_code = $saved_data[7];
-            $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name);
-        } else {
-            if (isset($saved_data[0]['hide']) && !isset($compiler->template->block_data[$_name]['source'])) {
-                $_output = '';
-            } else {
-                $_output = $compiler->parser->current_buffer->to_smarty_php();
-            }
-            unset ($compiler->template->block_data[$_name]['compiled']);
-        }
-        // reset flags
-        $compiler->parser->current_buffer = $saved_data[1];
-        $compiler->nocache = $saved_data[2];
-        //$compiler->smarty->merge_compiled_includes = $saved_data[3];
-        // reset flag for {block} tag
-        $compiler->inheritance = false;
-        // $_output content has already nocache code processed
-        $compiler->suppressNocacheProcessing = true;
-        return $_output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_break.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_break.php
deleted file mode 100644
index 259c66e2b..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_break.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Break
- *
- * Compiles the {break} tag
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-/**
- * Smarty Internal Plugin Compile Break Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Break extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('levels');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('levels');
-
-    /**
-     * Compiles code for the {break} tag
-     *
-     * @param array  $args array with attributes from parser
-     * @param object $compiler   compiler object
-     * @param array  $parameter  array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-
-        if (isset($_attr['levels'])) {
-            if (!is_numeric($_attr['levels'])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
-            }
-            $_levels = $_attr['levels'];
-        } else {
-            $_levels = 1;
-        }
-        $level_count = $_levels;
-        $stack_count = count($compiler->_tag_stack) - 1;
-        while ($level_count > 0 && $stack_count >= 0) {
-            if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
-                $level_count--;
-            }
-            $stack_count--;
-        }
-        if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot break {$_levels} level(s)", $compiler->lex->taglineno);
-        }
-        $compiler->has_code = true;
-        return "<?php break {$_levels}?>";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_call.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_call.php
deleted file mode 100644
index af12a048c..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_call.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function_Call
- *
- * Compiles the calls of user defined tags defined by {function}
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function_Call Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles the calls of user defined tags defined by {function}
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // save possible attributes
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of beind displayed
-            $_assign = $_attr['assign'];
-        }
-        $_name = $_attr['name'];
-        if ($compiler->compiles_template_function) {
-            $compiler->called_functions[] = trim($_name, "'\"");
-        }
-        unset($_attr['name'], $_attr['assign'], $_attr['nocache']);
-        // set flag (compiled code of {function} must be included in cache file
-        if ($compiler->nocache || $compiler->tag_nocache) {
-            $_nocache = 'true';
-        } else {
-            $_nocache = 'false';
-        }
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        if (isset($compiler->template->properties['function'][$_name]['parameter'])) {
-            foreach ($compiler->template->properties['function'][$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        } elseif (isset($compiler->smarty->template_functions[$_name]['parameter'])) {
-            foreach ($compiler->smarty->template_functions[$_name]['parameter'] as $_key => $_value) {
-                if (!isset($_attr[$_key])) {
-                    if (is_int($_key)) {
-                        $_paramsArray[] = "$_key=>$_value";
-                    } else {
-                        $_paramsArray[] = "'$_key'=>$_value";
-                    }
-                }
-            }
-        }
-        //varibale name?
-        if (!(strpos($_name, '$') === false)) {
-            $call_cache = $_name;
-            $call_function = '$tmp = "smarty_template_function_".' . $_name . '; $tmp';
-        } else {
-            $_name = trim($_name, "'\"");
-            $call_cache = "'{$_name}'";
-            $call_function = 'smarty_template_function_' . $_name;
-        }
-
-        $_params = 'array(' . implode(",", $_paramsArray) . ')';
-        $_hash = str_replace('-', '_', $compiler->template->properties['nocache_hash']);
-        // was there an assign attribute
-        if (isset($_assign)) {
-            if ($compiler->template->caching) {
-                $_output = "<?php ob_start(); Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            } else {
-                $_output = "<?php ob_start(); {$call_function}(\$_smarty_tpl,{$_params}); \$_smarty_tpl->assign({$_assign}, ob_get_clean());?>\n";
-            }
-        } else {
-            if ($compiler->template->caching) {
-                $_output = "<?php Smarty_Internal_Function_Call_Handler::call ({$call_cache},\$_smarty_tpl,{$_params},'{$_hash}',{$_nocache});?>\n";
-            } else {
-                $_output = "<?php {$call_function}(\$_smarty_tpl,{$_params});?>\n";
-            }
-        }
-        return $_output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_capture.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_capture.php
deleted file mode 100644
index 9a5071ebe..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_capture.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Capture
- *
- * Compiles the {capture} tag
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Capture Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Capture extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('name', 'assign', 'append');
-
-    /**
-     * Compiles code for the {capture} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $buffer = isset($_attr['name']) ? $_attr['name'] : "'default'";
-        $assign = isset($_attr['assign']) ? $_attr['assign'] : 'null';
-        $append = isset($_attr['append']) ? $_attr['append'] : 'null';
-
-        $compiler->_capture_stack[0][] = array($buffer, $assign, $append, $compiler->nocache);
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        $_output = "<?php \$_smarty_tpl->_capture_stack[0][] = array($buffer, $assign, $append); ob_start(); ?>";
-
-        return $_output;
-    }
-
-}
-
-/**
- * Smarty Internal Plugin Compile Captureclose Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_CaptureClose extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {/capture} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-
-        list($buffer, $assign, $append, $compiler->nocache) = array_pop($compiler->_capture_stack[0]);
-
-        $_output = "<?php list(\$_capture_buffer, \$_capture_assign, \$_capture_append) = array_pop(\$_smarty_tpl->_capture_stack[0]);\n";
-        $_output .= "if (!empty(\$_capture_buffer)) {\n";
-        $_output .= " if (isset(\$_capture_assign)) \$_smarty_tpl->assign(\$_capture_assign, ob_get_contents());\n";
-        $_output .= " if (isset( \$_capture_append)) \$_smarty_tpl->append( \$_capture_append, ob_get_contents());\n";
-        $_output .= " Smarty::\$_smarty_vars['capture'][\$_capture_buffer]=ob_get_clean();\n";
-        $_output .= "} else \$_smarty_tpl->capture_error();?>";
-        return $_output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_config_load.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_config_load.php
deleted file mode 100644
index deaa052c5..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_config_load.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Config Load
- *
- * Compiles the {config load} tag
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Config Load Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Config_Load extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file','section');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('section', 'scope');
-
-    /**
-     * Compiles code for the {config_load} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        static $_is_legal_scope = array('local' => true,'parent' => true,'root' => true,'global' => true);
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-
-
-        // save posible attributes
-        $conf_file = $_attr['file'];
-        if (isset($_attr['section'])) {
-            $section = $_attr['section'];
-        } else {
-            $section = 'null';
-        }
-        $scope = 'local';
-        // scope setup
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if (isset($_is_legal_scope[$_attr['scope']])) {
-                $scope = $_attr['scope'];
-           } else {
-                $compiler->trigger_template_error('illegal value for "scope" attribute', $compiler->lex->taglineno);
-           }
-        }
-        // create config object
-        $_output = "<?php  \$_config = new Smarty_Internal_Config($conf_file, \$_smarty_tpl->smarty, \$_smarty_tpl);";
-        $_output .= "\$_config->loadConfigVars($section, '$scope'); ?>";
-        return $_output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_continue.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_continue.php
deleted file mode 100644
index 4082a93b3..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_continue.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Continue
- *
- * Compiles the {continue} tag
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Continue Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Continue extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('levels');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('levels');
-
-    /**
-     * Compiles code for the {continue} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        static $_is_loopy = array('for' => true, 'foreach' => true, 'while' => true, 'section' => true);
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-
-        if (isset($_attr['levels'])) {
-            if (!is_numeric($_attr['levels'])) {
-                $compiler->trigger_template_error('level attribute must be a numeric constant', $compiler->lex->taglineno);
-            }
-            $_levels = $_attr['levels'];
-        } else {
-            $_levels = 1;
-        }
-        $level_count = $_levels;
-        $stack_count = count($compiler->_tag_stack) - 1;
-        while ($level_count > 0 && $stack_count >= 0) {
-            if (isset($_is_loopy[$compiler->_tag_stack[$stack_count][0]])) {
-                $level_count--;
-            }
-            $stack_count--;
-        }
-        if ($level_count != 0) {
-            $compiler->trigger_template_error("cannot continue {$_levels} level(s)", $compiler->lex->taglineno);
-        }
-        $compiler->has_code = true;
-        return "<?php continue {$_levels}?>";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_debug.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_debug.php
deleted file mode 100644
index f50c7aee2..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_debug.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Debug
- *
- * Compiles the {debug} tag.
- * It opens a window the the Smarty Debugging Console.
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Debug Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Debug extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {debug} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        // compile always as nocache
-        $compiler->tag_nocache = true;
-
-        // display debug template
-        $_output = "<?php \$_smarty_tpl->smarty->loadPlugin('Smarty_Internal_Debug'); Smarty_Internal_Debug::display_debug(\$_smarty_tpl); ?>";
-        return $_output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_eval.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_eval.php
deleted file mode 100644
index 6cf481b50..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_eval.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Eval
- *
- * Compiles the {eval} tag.
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Eval Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Eval extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('var');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('assign');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('var','assign');
-
-    /**
-     * Compiles code for the {eval} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        $this->required_attributes = array('var');
-        $this->optional_attributes = array('assign');
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if (isset($_attr['assign'])) {
-              // output will be stored in a smarty variable instead of beind displayed
-            $_assign = $_attr['assign'];
-        }
-
-        // create template object
-        $_output = "\$_template = new {$compiler->smarty->template_class}('eval:'.".$_attr['var'].", \$_smarty_tpl->smarty, \$_smarty_tpl);";
-        //was there an assign attribute?
-        if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign($_assign,\$_template->fetch());";
-        } else {
-            $_output .= "echo \$_template->fetch();";
-        }
-        return "<?php $_output ?>";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_extends.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_extends.php
deleted file mode 100644
index 9042aa233..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_extends.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/**
-* Smarty Internal Plugin Compile extend
-*
-* Compiles the {extends} tag
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-
-/**
-* Smarty Internal Plugin Compile extend Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Extends extends Smarty_Internal_CompileBase {
-
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $required_attributes = array('file');
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $shorttag_order = array('file');
-    /**
-    * mbstring.overload flag
-    *
-    * @var int
-    */
-    public $mbstring_overload = 0;
-
-    /**
-    * Compiles code for the {extends} tag
-    *
-    * @param array  $args     array with attributes from parser
-    * @param object $compiler compiler object
-    * @return string compiled code
-    */
-    public function compile($args, $compiler)
-    {
-        static $_is_stringy = array('string' => true, 'eval' => true);
-        $this->_rdl = preg_quote($compiler->smarty->right_delimiter);
-        $this->_ldl = preg_quote($compiler->smarty->left_delimiter);
-        $filepath = $compiler->template->source->filepath;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-
-        $_smarty_tpl = $compiler->template;
-        $include_file = null;
-        if (strpos($_attr['file'], '$_tmp') !== false) {
-            $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno);
-        }
-        eval('$include_file = ' . $_attr['file'] . ';');
-        // create template object
-        $_template = new $compiler->smarty->template_class($include_file, $compiler->smarty, $compiler->template);
-        // save file dependency
-        if (isset($_is_stringy[$_template->source->type])) {
-            $template_sha1 = sha1($include_file);
-        } else {
-            $template_sha1 = sha1($_template->source->filepath);
-        }
-        if (isset($compiler->template->properties['file_dependency'][$template_sha1])) {
-            $compiler->trigger_template_error("illegal recursive call of \"{$include_file}\"", $compiler->lex->line - 1);
-        }
-        $compiler->template->properties['file_dependency'][$template_sha1] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);
-        $_content = ($this->mbstring_overload ? mb_substr($compiler->template->source->content, $compiler->lex->counter - 1, 20000000, 'latin1') : substr($compiler->template->source->content, $compiler->lex->counter - 1));
-        if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $s) !=
-        preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $c)) {
-            $compiler->trigger_template_error('unmatched {block} {/block} pairs');
-        }
-        preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}|{$this->_ldl}\*([\S\s]*?)\*{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
-        $_result_count = count($_result[0]);
-        $_start = 0;
-        while ($_start+1 < $_result_count) {
-            $_end = 0;
-            $_level = 1;
-            if (($this->mbstring_overload ? mb_substr($_result[0][$_start][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') {
-                $_start++;
-                continue;
-            }
-            while ($_level != 0) {
-                $_end++;
-                if (($this->mbstring_overload ? mb_substr($_result[0][$_start + $_end][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start + $_end][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') {
-                    continue;
-                }
-                if (!strpos($_result[0][$_start + $_end][0], '/')) {
-                    $_level++;
-                } else {
-                    $_level--;
-                }
-            }
-            $_block_content = str_replace($compiler->smarty->left_delimiter . '$smarty.block.parent' . $compiler->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
-            ($this->mbstring_overload ? mb_substr($_content, $_result[0][$_start][1] + mb_strlen($_result[0][$_start][0], 'latin1'), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + mb_strlen($_result[0][$_start][0], 'latin1'), 'latin1') : substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))));
-            Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath);
-            $_start = $_start + $_end + 1;
-        }
-        if ($_template->source->type == 'extends') {
-            $_template->block_data = $compiler->template->block_data;
-        }
-        $compiler->template->source->content = $_template->source->content;
-        if ($_template->source->type == 'extends') {
-            $compiler->template->block_data = $_template->block_data;
-            foreach ($_template->source->components as $key => $component) {
-                $compiler->template->properties['file_dependency'][$key] = array($component->filepath, $component->timestamp, $component->type);
-            }
-        }
-        $compiler->template->source->filepath = $_template->source->filepath;
-        $compiler->abort_and_recompile = true;
-        return '';
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_for.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_for.php
deleted file mode 100644
index 057f4fb79..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_for.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile For
- *
- * Compiles the {for} {forelse} {/for} tags
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile For Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_For extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {for} tag
-     *
-     * Smarty 3 does implement two different sytaxes:
-     *
-     * - {for $var in $array}
-     * For looping over arrays or iterators
-     *
-     * - {for $x=0; $x<$y; $x++}
-     * For general loops
-     *
-     * The parser is gereration different sets of attribute by which this compiler can
-     * determin which syntax is used.
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        if ($parameter == 0) {
-            $this->required_attributes = array('start', 'to');
-            $this->optional_attributes = array('max', 'step');
-        } else {
-            $this->required_attributes = array('start', 'ifexp', 'var', 'step');
-            $this->optional_attributes = array();
-        }
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $output = "<?php ";
-        if ($parameter == 1) {
-            foreach ($_attr['start'] as $_statement) {
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
-                $output .= " \$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value];\n";
-            }
-            $output .= "  if ($_attr[ifexp]){ for (\$_foo=true;$_attr[ifexp]; \$_smarty_tpl->tpl_vars[$_attr[var]]->value$_attr[step]){\n";
-        } else {
-            $_statement = $_attr['start'];
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]] = new Smarty_Variable;";
-            if (isset($_attr['step'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = $_attr[step];";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->step = 1;";
-            }
-            if (isset($_attr['max'])) {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)min(ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step)),$_attr[max]);\n";
-            } else {
-                $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->total = (int)ceil((\$_smarty_tpl->tpl_vars[$_statement[var]]->step > 0 ? $_attr[to]+1 - ($_statement[value]) : $_statement[value]-($_attr[to])+1)/abs(\$_smarty_tpl->tpl_vars[$_statement[var]]->step));\n";
-            }
-            $output .= "if (\$_smarty_tpl->tpl_vars[$_statement[var]]->total > 0){\n";
-            $output .= "for (\$_smarty_tpl->tpl_vars[$_statement[var]]->value = $_statement[value], \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration = 1;\$_smarty_tpl->tpl_vars[$_statement[var]]->iteration <= \$_smarty_tpl->tpl_vars[$_statement[var]]->total;\$_smarty_tpl->tpl_vars[$_statement[var]]->value += \$_smarty_tpl->tpl_vars[$_statement[var]]->step, \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration++){\n";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->first = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == 1;";
-            $output .= "\$_smarty_tpl->tpl_vars[$_statement[var]]->last = \$_smarty_tpl->tpl_vars[$_statement[var]]->iteration == \$_smarty_tpl->tpl_vars[$_statement[var]]->total;";
-        }
-        $output .= "?>";
-
-        $this->openTag($compiler, 'for', array('for', $compiler->nocache));
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        // return compiled code
-        return $output;
-    }
-
-}
-
-/**
- * Smarty Internal Plugin Compile Forelse Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Forelse extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {forelse} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr  = $this->getAttributes($compiler, $args);
-
-        list($openTag, $nocache) = $this->closeTag($compiler, array('for'));
-        $this->openTag($compiler, 'forelse', array('forelse', $nocache));
-        return "<?php }} else { ?>";
-    }
-
-}
-
-/**
- * Smarty Internal Plugin Compile Forclose Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Forclose extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {/for} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-
-        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('for', 'forelse'));
-
-        if ($openTag == 'forelse') {
-            return "<?php }  ?>";
-        } else {
-            return "<?php }} ?>";
-        }
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_foreach.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_foreach.php
deleted file mode 100644
index 1354c89d5..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_foreach.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Foreach
- *
- * Compiles the {foreach} {foreachelse} {/foreach} tags
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Foreach Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreach extends Smarty_Internal_CompileBase {
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('from', 'item');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('name', 'key');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('from','item','key','name');
-
-    /**
-     * Compiles code for the {foreach} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        $tpl = $compiler->template;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $from = $_attr['from'];
-        $item = $_attr['item'];
-        if (!strncmp("\$_smarty_tpl->tpl_vars[$item]", $from, strlen($item) + 24)) {
-            $compiler->trigger_template_error("item variable {$item} may not be the same variable as at 'from'", $compiler->lex->taglineno);
-        }
-
-        if (isset($_attr['key'])) {
-            $key = $_attr['key'];
-        } else {
-            $key = null;
-        }
-
-        $this->openTag($compiler, 'foreach', array('foreach', $compiler->nocache, $item, $key));
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-        if (isset($_attr['name'])) {
-            $name = $_attr['name'];
-            $has_name = true;
-            $SmartyVarName = '$smarty.foreach.' . trim($name, '\'"') . '.';
-        } else {
-            $name = null;
-            $has_name = false;
-        }
-        $ItemVarName = '$' . trim($item, '\'"') . '@';
-        // evaluates which Smarty variables and properties have to be computed
-        if ($has_name) {
-            $usesSmartyFirst = strpos($tpl->source->content, $SmartyVarName . 'first') !== false;
-            $usesSmartyLast = strpos($tpl->source->content, $SmartyVarName . 'last') !== false;
-            $usesSmartyIndex = strpos($tpl->source->content, $SmartyVarName . 'index') !== false;
-            $usesSmartyIteration = strpos($tpl->source->content, $SmartyVarName . 'iteration') !== false;
-            $usesSmartyShow = strpos($tpl->source->content, $SmartyVarName . 'show') !== false;
-            $usesSmartyTotal = strpos($tpl->source->content, $SmartyVarName . 'total') !== false;
-        } else {
-            $usesSmartyFirst = false;
-            $usesSmartyLast = false;
-            $usesSmartyTotal = false;
-            $usesSmartyShow = false;
-        }
-
-        $usesPropFirst = $usesSmartyFirst || strpos($tpl->source->content, $ItemVarName . 'first') !== false;
-        $usesPropLast = $usesSmartyLast || strpos($tpl->source->content, $ItemVarName . 'last') !== false;
-        $usesPropIndex = $usesPropFirst || strpos($tpl->source->content, $ItemVarName . 'index') !== false;
-        $usesPropIteration = $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'iteration') !== false;
-        $usesPropShow = strpos($tpl->source->content, $ItemVarName . 'show') !== false;
-        $usesPropTotal = $usesSmartyTotal || $usesSmartyShow || $usesPropShow || $usesPropLast || strpos($tpl->source->content, $ItemVarName . 'total') !== false;
-        // generate output code
-        $output = "<?php ";
-        $output .= " \$_smarty_tpl->tpl_vars[$item] = new Smarty_Variable; \$_smarty_tpl->tpl_vars[$item]->_loop = false;\n";
-        if ($key != null) {
-            $output .= " \$_smarty_tpl->tpl_vars[$key] = new Smarty_Variable;\n";
-        }
-        $output .= " \$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array');}\n";
-        if ($usesPropTotal) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->total= \$_smarty_tpl->_count(\$_from);\n";
-        }
-        if ($usesPropIteration) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration=0;\n";
-        }
-        if ($usesPropIndex) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->index=-1;\n";
-        }
-        if ($usesPropShow) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->show = (\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
-        }
-        if ($has_name) {
-            if ($usesSmartyTotal) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['total'] = \$_smarty_tpl->tpl_vars[$item]->total;\n";
-            }
-            if ($usesSmartyIteration) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']=0;\n";
-            }
-            if ($usesSmartyIndex) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']=-1;\n";
-            }
-            if ($usesSmartyShow) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['show']=(\$_smarty_tpl->tpl_vars[$item]->total > 0);\n";
-            }
-        }
-        $output .= "foreach (\$_from as \$_smarty_tpl->tpl_vars[$item]->key => \$_smarty_tpl->tpl_vars[$item]->value){\n\$_smarty_tpl->tpl_vars[$item]->_loop = true;\n";
-        if ($key != null) {
-            $output .= " \$_smarty_tpl->tpl_vars[$key]->value = \$_smarty_tpl->tpl_vars[$item]->key;\n";
-        }
-        if ($usesPropIteration) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->iteration++;\n";
-        }
-        if ($usesPropIndex) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->index++;\n";
-        }
-        if ($usesPropFirst) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->first = \$_smarty_tpl->tpl_vars[$item]->index === 0;\n";
-        }
-        if ($usesPropLast) {
-            $output .= " \$_smarty_tpl->tpl_vars[$item]->last = \$_smarty_tpl->tpl_vars[$item]->iteration === \$_smarty_tpl->tpl_vars[$item]->total;\n";
-        }
-        if ($has_name) {
-            if ($usesSmartyFirst) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['first'] = \$_smarty_tpl->tpl_vars[$item]->first;\n";
-            }
-            if ($usesSmartyIteration) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['iteration']++;\n";
-            }
-            if ($usesSmartyIndex) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['index']++;\n";
-            }
-            if ($usesSmartyLast) {
-                $output .= " \$_smarty_tpl->tpl_vars['smarty']->value['foreach'][$name]['last'] = \$_smarty_tpl->tpl_vars[$item]->last;\n";
-            }
-        }
-        $output .= "?>";
-
-        return $output;
-    }
-}
-
-/**
- * Smarty Internal Plugin Compile Foreachelse Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {foreachelse} tag
-     *
-     * @param array  $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        list($openTag, $nocache, $item, $key) = $this->closeTag($compiler, array('foreach'));
-        $this->openTag($compiler, 'foreachelse', array('foreachelse', $nocache, $item, $key));
-
-        return "<?php }\nif (!\$_smarty_tpl->tpl_vars[$item]->_loop) {\n?>";
-    }
-
-}
-
-/**
- * Smarty Internal Plugin Compile Foreachclose Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {/foreach} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-
-        list($openTag, $compiler->nocache, $item, $key) = $this->closeTag($compiler, array('foreach', 'foreachelse'));
-
-        return "<?php } ?>";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_function.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_function.php
deleted file mode 100644
index 876b13dee..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_function.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function
- *
- * Compiles the {function} {/function} tags
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the {function} tag
-     *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @return boolean true
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-        unset($_attr['nocache']);
-        $save = array($_attr, $compiler->parser->current_buffer,
-            $compiler->template->has_nocache_code, $compiler->template->required_plugins);
-        $this->openTag($compiler, 'function', $save);
-        $_name = trim($_attr['name'], "'\"");
-        unset($_attr['name']);
-        // set flag that we are compiling a template function
-        $compiler->compiles_template_function = true;
-        $compiler->template->properties['function'][$_name]['parameter'] = array();
-        $_smarty_tpl = $compiler->template;
-        foreach ($_attr as $_key => $_data) {
-            eval ('$tmp='.$_data.';');
-            $compiler->template->properties['function'][$_name]['parameter'][$_key] = $tmp;
-        }
-        $compiler->smarty->template_functions[$_name]['parameter'] = $compiler->template->properties['function'][$_name]['parameter'];
-        if ($compiler->template->caching) {
-            $output = '';
-        } else {
-            $output = "<?php if (!function_exists('smarty_template_function_{$_name}')) {
-    function smarty_template_function_{$_name}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-        }
-        // Init temporay context
-        $compiler->template->required_plugins = array('compiled' => array(), 'nocache' => array());
-        $compiler->parser->current_buffer = new _smarty_template_buffer($compiler->parser);
-        $compiler->parser->current_buffer->append_subtree(new _smarty_tag($compiler->parser, $output));
-        $compiler->template->has_nocache_code = false;
-        $compiler->has_code = false;
-        $compiler->template->properties['function'][$_name]['compiled'] = '';
-        return true;
-    }
-
-}
-
-/**
- * Smarty Internal Plugin Compile Functionclose Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {/function} tag
-     *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @return boolean true
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        $saved_data = $this->closeTag($compiler, array('function'));
-        $_name = trim($saved_data[0]['name'], "'\"");
-        // build plugin include code
-        $plugins_string = '';
-        if (!empty($compiler->template->required_plugins['compiled'])) {
-            $plugins_string = '<?php ';
-            foreach($compiler->template->required_plugins['compiled'] as $tmp) {
-                foreach($tmp as $data) {
-                    $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n";
-                }
-            }
-            $plugins_string .= '?>';
-        }
-        if (!empty($compiler->template->required_plugins['nocache'])) {
-            $plugins_string .= "<?php echo '/*%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/<?php ";
-            foreach($compiler->template->required_plugins['nocache'] as $tmp) {
-                foreach($tmp as $data) {
-                    $plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n";
-                }
-            }
-            $plugins_string .= "?>/*/%%SmartyNocache:{$compiler->template->properties['nocache_hash']}%%*/';?>\n";
-        }
-         // remove last line break from function definition
-         $last = count($compiler->parser->current_buffer->subtrees) - 1;
-         if ($compiler->parser->current_buffer->subtrees[$last] instanceof _smarty_linebreak) {
-             unset($compiler->parser->current_buffer->subtrees[$last]);
-         }
-        // if caching save template function for possible nocache call
-        if ($compiler->template->caching) {
-            $compiler->template->properties['function'][$_name]['compiled'] .= $plugins_string
-             . $compiler->parser->current_buffer->to_smarty_php();
-            $compiler->template->properties['function'][$_name]['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-            $compiler->template->properties['function'][$_name]['has_nocache_code'] = $compiler->template->has_nocache_code;
-            $compiler->template->properties['function'][$_name]['called_functions'] = $compiler->called_functions;
-            $compiler->called_functions = array();
-            $compiler->smarty->template_functions[$_name] = $compiler->template->properties['function'][$_name];
-            $compiler->has_code = false;
-            $output = true;
-        } else {
-            $output = $plugins_string . $compiler->parser->current_buffer->to_smarty_php() . "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}}?>\n";
-        }
-        // reset flag that we are compiling a template function
-        $compiler->compiles_template_function = false;
-        // restore old compiler status
-        $compiler->parser->current_buffer = $saved_data[1];
-        $compiler->template->has_nocache_code = $compiler->template->has_nocache_code | $saved_data[2];
-        $compiler->template->required_plugins = $saved_data[3];
-        return $output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_if.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_if.php
deleted file mode 100644
index 8794b014b..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_if.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/**
-* Smarty Internal Plugin Compile If
-*
-* Compiles the {if} {else} {elseif} {/if} tags
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-
-/**
-* Smarty Internal Plugin Compile If Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_If extends Smarty_Internal_CompileBase {
-
-    /**
-    * Compiles code for the {if} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $this->openTag($compiler, 'if', array(1, $compiler->nocache));
-        // must whole block be nocache ?
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-        if (!array_key_exists("if condition",$parameter)) {
-            $compiler->trigger_template_error("missing if condition", $compiler->lex->taglineno);
-        }
-
-        if (is_array($parameter['if condition'])) {
-            if ($compiler->nocache) {
-                $_nocache = ',true';
-                // create nocache var to make it know for further compiling
-                if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
-                } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
-                }
-            } else {
-                $_nocache = '';
-            }
-            if (is_array($parameter['if condition']['var'])) {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]) || !is_array(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value)) \$_smarty_tpl->createLocalArrayVariable(".$parameter['if condition']['var']['var']."$_nocache);\n";
-                $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']['var']."]->value".$parameter['if condition']['var']['smarty_internal_index']." = ".$parameter['if condition']['value']."){?>";
-            } else {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."])) \$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."] = new Smarty_Variable(null{$_nocache});";
-                $_output .= "if (\$_smarty_tpl->tpl_vars[".$parameter['if condition']['var']."]->value = ".$parameter['if condition']['value']."){?>";
-            }
-            return $_output;
-        } else {
-            return "<?php if ({$parameter['if condition']}){?>";
-        }
-    }
-
-}
-
-/**
-* Smarty Internal Plugin Compile Else Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Else extends Smarty_Internal_CompileBase {
-
-    /**
-    * Compiles code for the {else} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
-    {
-        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
-        $this->openTag($compiler, 'else', array($nesting, $compiler->tag_nocache));
-
-        return "<?php }else{ ?>";
-    }
-
-}
-
-/**
-* Smarty Internal Plugin Compile ElseIf Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Elseif extends Smarty_Internal_CompileBase {
-
-    /**
-    * Compiles code for the {elseif} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        list($nesting, $compiler->tag_nocache) = $this->closeTag($compiler, array('if', 'elseif'));
-
-        if (!array_key_exists("if condition",$parameter)) {
-            $compiler->trigger_template_error("missing elseif condition", $compiler->lex->taglineno);
-        }
-
-        if (is_array($parameter['if condition'])) {
-            $condition_by_assign = true;
-            if ($compiler->nocache) {
-                $_nocache = ',true';
-                // create nocache var to make it know for further compiling
-                if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
-                } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
-                }
-            } else {
-                $_nocache = '';
-            }
-        } else {
-            $condition_by_assign = false;
-        }
-
-        if (empty($compiler->prefix_code)) {
-            if ($condition_by_assign) {
-                $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
-                if (is_array($parameter['if condition']['var'])) {
-                    $_output = "<?php }else{ if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>";
-                } else {
-                    $_output = "<?php  }else{ if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>";
-                }
-                return $_output;
-            } else {
-                $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
-                return "<?php }elseif({$parameter['if condition']}){?>";
-            }
-        } else {
-            $tmp = '';
-            foreach ($compiler->prefix_code as $code)
-            $tmp .= $code;
-            $compiler->prefix_code = array();
-            $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
-            if ($condition_by_assign) {
-                if (is_array($parameter['if condition']['var'])) {
-                    $_output = "<?php }else{?>{$tmp}<?php  if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>";
-                } else {
-                    $_output = "<?php }else{?>{$tmp}<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                    $_output .= "if (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>";
-                }
-                return $_output;
-            } else {
-                return "<?php }else{?>{$tmp}<?php if ({$parameter['if condition']}){?>";
-            }
-        }
-    }
-
-}
-
-/**
-* Smarty Internal Plugin Compile Ifclose Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Ifclose extends Smarty_Internal_CompileBase {
-
-    /**
-    * Compiles code for the {/if} tag
-    *
-    * @param array  $args       array with attributes from parser
-    * @param object $compiler   compiler object
-    * @param array  $parameter  array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
-    {
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        list($nesting, $compiler->nocache) = $this->closeTag($compiler, array('if', 'else', 'elseif'));
-        $tmp = '';
-        for ($i = 0; $i < $nesting; $i++) {
-            $tmp .= '}';
-        }
-        return "<?php {$tmp}?>";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_include.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_include.php
deleted file mode 100644
index 43a144f94..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_include.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
-* Smarty Internal Plugin Compile Include
-*
-* Compiles the {include} tag
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-
-/**
-* Smarty Internal Plugin Compile Include Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
-
-    /**
-    * caching mode to create nocache code but no cache file
-    */
-    const CACHING_NOCACHE_CODE = 9999;
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $required_attributes = array('file');
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $shorttag_order = array('file');
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $option_flags = array('nocache', 'inline', 'caching');
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $optional_attributes = array('_any');
-
-    /**
-    * Compiles code for the {include} tag
-    *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // save posible attributes
-        $include_file = $_attr['file'];
-
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of beind displayed
-            $_assign = $_attr['assign'];
-        }
-
-        $_parent_scope = Smarty::SCOPE_LOCAL;
-        if (isset($_attr['scope'])) {
-            $_attr['scope'] = trim($_attr['scope'], "'\"");
-            if ($_attr['scope'] == 'parent') {
-                $_parent_scope = Smarty::SCOPE_PARENT;
-            } elseif ($_attr['scope'] == 'root') {
-                $_parent_scope = Smarty::SCOPE_ROOT;
-            } elseif ($_attr['scope'] == 'global') {
-                $_parent_scope = Smarty::SCOPE_GLOBAL;
-            }
-        }
-        $_caching = 'null';
-        if ($compiler->nocache || $compiler->tag_nocache) {
-            $_caching = Smarty::CACHING_OFF;
-        }
-        // default for included templates
-        if ($compiler->template->caching && !$compiler->nocache && !$compiler->tag_nocache) {
-            $_caching = self::CACHING_NOCACHE_CODE;
-        }
-        /*
-        * if the {include} tag provides individual parameter for caching
-        * it will not be included into the common cache file and treated like
-        * a nocache section
-        */
-        if (isset($_attr['cache_lifetime'])) {
-            $_cache_lifetime = $_attr['cache_lifetime'];
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        } else {
-            $_cache_lifetime = 'null';
-        }
-        if (isset($_attr['cache_id'])) {
-            $_cache_id = $_attr['cache_id'];
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        } else {
-            $_cache_id = '$_smarty_tpl->cache_id';
-        }
-        if (isset($_attr['compile_id'])) {
-            $_compile_id = $_attr['compile_id'];
-        } else {
-            $_compile_id = '$_smarty_tpl->compile_id';
-        }
-        if ($_attr['caching'] === true) {
-            $_caching = Smarty::CACHING_LIFETIME_CURRENT;
-        }
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-            $_caching = Smarty::CACHING_OFF;
-        }
-
-        $has_compiled_template = false;
-        if (($compiler->smarty->merge_compiled_includes || $_attr['inline'] === true) && !$compiler->template->source->recompiled
-            && !($compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache)) && $_caching != Smarty::CACHING_LIFETIME_CURRENT) {
-            // check if compiled code can be merged (contains no variable part)
-            if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2)
-               and substr_count($include_file, '(') == 0 and substr_count($include_file, '$_smarty_tpl->') == 0) {
-                $tpl_name = null;
-                eval("\$tpl_name = $include_file;");
-                if (!isset($compiler->smarty->merged_templates_func[$tpl_name]) || $compiler->inheritance) {
-                    $tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id);
-                    // save unique function name
-                    $compiler->smarty->merged_templates_func[$tpl_name]['func'] = $tpl->properties['unifunc'] = 'content_'. str_replace('.', '_', uniqid('', true));
-                    // use current nocache hash for inlined code
-                    $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'] = $tpl->properties['nocache_hash'] = $compiler->template->properties['nocache_hash'];
-                    if ($compiler->template->caching) {
-                        // needs code for cached page but no cache file
-                        $tpl->caching = self::CACHING_NOCACHE_CODE;
-                    }
-                    // make sure whole chain gest compiled
-                    $tpl->mustCompile = true;
-                    if (!($tpl->source->uncompiled) && $tpl->source->exists) {
-                        // get compiled code
-                        $compiled_code = $tpl->compiler->compileTemplate($tpl);
-                        // release compiler object to free memory
-                        unset($tpl->compiler);
-                        // merge compiled code for {function} tags
-                        $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $tpl->properties['function']);
-                        // merge filedependency
-                        $tpl->properties['file_dependency'][$tpl->source->uid] = array($tpl->source->filepath, $tpl->source->timestamp,$tpl->source->type);
-                        $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $tpl->properties['file_dependency']);
-                        // remove header code
-                        $compiled_code = preg_replace("/(<\?php \/\*%%SmartyHeaderCode:{$tpl->properties['nocache_hash']}%%\*\/(.+?)\/\*\/%%SmartyHeaderCode%%\*\/\?>\n)/s", '', $compiled_code);
-                        if ($tpl->has_nocache_code) {
-                            // replace nocache_hash
-                            $compiled_code = str_replace("{$tpl->properties['nocache_hash']}", $compiler->template->properties['nocache_hash'], $compiled_code);
-                            $compiler->template->has_nocache_code = true;
-                        }
-                        $compiler->merged_templates[$tpl->properties['unifunc']] = $compiled_code;
-                        $has_compiled_template = true;
-                    }
-                } else {
-                    $has_compiled_template = true;
-                }
-            }
-        }
-        // delete {include} standard attributes
-        unset($_attr['file'], $_attr['assign'], $_attr['cache_id'], $_attr['compile_id'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
-        // remaining attributes must be assigned as smarty variable
-        if (!empty($_attr)) {
-            if ($_parent_scope == Smarty::SCOPE_LOCAL) {
-                // create variables
-                foreach ($_attr as $key => $value) {
-                    $_pairs[] = "'$key'=>$value";
-                }
-                $_vars = 'array('.join(',',$_pairs).')';
-                $_has_vars = true;
-            } else {
-                $compiler->trigger_template_error('variable passing not allowed in parent/global scope', $compiler->lex->taglineno);
-            }
-        } else {
-            $_vars = 'array()';
-            $_has_vars = false;
-        }
-        if ($has_compiled_template) {
-            $_hash = $compiler->smarty->merged_templates_func[$tpl_name]['nocache_hash'];
-            $_output = "<?php /*  Call merged included template \"" . $tpl_name . "\" */\n";
-            $_output .= "\$_tpl_stack[] = \$_smarty_tpl;\n";
-            $_output .= " \$_smarty_tpl = \$_smarty_tpl->setupInlineSubTemplate($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope, '$_hash');\n";
-            if (isset($_assign)) {
-                $_output .= 'ob_start(); ';
-            }
-            $_output .= $compiler->smarty->merged_templates_func[$tpl_name]['func']. "(\$_smarty_tpl);\n";
-            $_output .= "\$_smarty_tpl = array_pop(\$_tpl_stack); ";
-            if (isset($_assign)) {
-                $_output .= " \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(ob_get_clean());";
-            }
-            $_output .= "/*  End of included template \"" . $tpl_name . "\" */?>";
-            return $_output;
-        }
-
-        // was there an assign attribute
-        if (isset($_assign)) {
-            $_output = "<?php \$_smarty_tpl->tpl_vars[$_assign] = new Smarty_variable(\$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope));?>\n";;
-        } else {
-            $_output = "<?php echo \$_smarty_tpl->getSubTemplate ($include_file, $_cache_id, $_compile_id, $_caching, $_cache_lifetime, $_vars, $_parent_scope);?>\n";
-        }
-        return $_output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_include_php.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_include_php.php
deleted file mode 100644
index d52712368..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_include_php.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Include PHP
- *
- * Compiles the {include_php} tag
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('file');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('file');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('once', 'assign');
-
-    /**
-     * Compiles code for the {include_php} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        if (!($compiler->smarty instanceof SmartyBC)) {
-            throw new SmartyException("{include_php} is deprecated, use SmartyBC class to enable");
-        }
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $_output = '<?php ';
-
-        $_smarty_tpl = $compiler->template;
-        $_filepath = false;
-        eval('$_file = ' . $_attr['file'] . ';');
-        if (!isset($compiler->smarty->security_policy) && file_exists($_file)) {
-            $_filepath = $_file;
-        } else {
-            if (isset($compiler->smarty->security_policy)) {
-                $_dir = $compiler->smarty->security_policy->trusted_dir;
-            } else {
-                $_dir = $compiler->smarty->trusted_dir;
-            }
-            if (!empty($_dir)) {
-                foreach((array)$_dir as $_script_dir) {
-                    $_script_dir = rtrim($_script_dir, '/\\') . DS;
-                    if (file_exists($_script_dir . $_file)) {
-                        $_filepath = $_script_dir .  $_file;
-                        break;
-                    }
-                }
-            }
-        }
-        if ($_filepath == false) {
-            $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $compiler->lex->taglineno);
-        }
-
-        if (isset($compiler->smarty->security_policy)) {
-            $compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
-        }
-
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr['assign'];
-        }
-        $_once = '_once';
-        if (isset($_attr['once'])) {
-            if ($_attr['once'] == 'false') {
-                $_once = '';
-            }
-        }
-
-        if (isset($_assign)) {
-            return "<?php ob_start(); include{$_once} ('{$_filepath}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
-        } else {
-            return "<?php include{$_once} ('{$_filepath}');?>\n";
-        }
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_insert.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_insert.php
deleted file mode 100644
index e4d3f9355..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_insert.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Compile Insert
- *
- * Compiles the {insert} tag
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the {insert} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // never compile as nocache code
-        $compiler->suppressNocacheProcessing = true;
-        $compiler->tag_nocache = true;
-        $_smarty_tpl = $compiler->template;
-        $_name = null;
-        $_script = null;
-
-        $_output = '<?php ';
-        // save posible attributes
-        eval('$_name = ' . $_attr['name'] . ';');
-        if (isset($_attr['assign'])) {
-            // output will be stored in a smarty variable instead of being displayed
-            $_assign = $_attr['assign'];
-            // create variable to make shure that the compiler knows about its nocache status
-            $compiler->template->tpl_vars[trim($_attr['assign'], "'")] = new Smarty_Variable(null, true);
-        }
-        if (isset($_attr['script'])) {
-            // script which must be included
-            $_function = "smarty_insert_{$_name}";
-            $_smarty_tpl = $compiler->template;
-            $_filepath = false;
-            eval('$_script = ' . $_attr['script'] . ';');
-            if (!isset($compiler->smarty->security_policy) && file_exists($_script)) {
-                $_filepath = $_script;
-            } else {
-                if (isset($compiler->smarty->security_policy)) {
-                    $_dir = $compiler->smarty->security_policy->trusted_dir;
-                } else {
-                    $_dir = $compiler->smarty->trusted_dir;
-                }
-                if (!empty($_dir)) {
-                    foreach((array)$_dir as $_script_dir) {
-                        $_script_dir = rtrim($_script_dir, '/\\') . DS;
-                        if (file_exists($_script_dir . $_script)) {
-                            $_filepath = $_script_dir . $_script;
-                            break;
-                        }
-                    }
-                }
-            }
-            if ($_filepath == false) {
-                $compiler->trigger_template_error("{insert} missing script file '{$_script}'", $compiler->lex->taglineno);
-            }
-            // code for script file loading
-            $_output .= "require_once '{$_filepath}' ;";
-            require_once $_filepath;
-            if (!is_callable($_function)) {
-                $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'", $compiler->lex->taglineno);
-            }
-        } else {
-            $_filepath = 'null';
-            $_function = "insert_{$_name}";
-            // function in PHP script ?
-            if (!is_callable($_function)) {
-                // try plugin
-                if (!$_function = $compiler->getPlugin($_name, 'insert')) {
-                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", $compiler->lex->taglineno);
-                }
-            }
-        }
-        // delete {insert} standard attributes
-        unset($_attr['name'], $_attr['assign'], $_attr['script'], $_attr['nocache']);
-        // convert attributes into parameter array string
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            $_paramsArray[] = "'$_key' => $_value";
-        }
-        $_params = 'array(' . implode(", ", $_paramsArray) . ')';
-        // call insert
-        if (isset($_assign)) {
-            if ($_smarty_tpl->caching) {
-                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}',{$_assign});?>";
-            } else {
-                $_output .= "\$_smarty_tpl->assign({$_assign} , {$_function} ({$_params},\$_smarty_tpl), true);?>";
-            }
-        } else {
-            $compiler->has_output = true;
-            if ($_smarty_tpl->caching) {
-                $_output .= "echo Smarty_Internal_Nocache_Insert::compile ('{$_function}',{$_params}, \$_smarty_tpl, '{$_filepath}');?>";
-            } else {
-                $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
-            }
-        }
-        return $_output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_ldelim.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_ldelim.php
deleted file mode 100644
index 990632590..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_ldelim.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Ldelim
- *
- * Compiles the {ldelim} tag
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Ldelim Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Ldelim extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {ldelim} tag
-     *
-     * This tag does output the left delimiter
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-        // this tag does not return compiled code
-        $compiler->has_code = true;
-        return $compiler->smarty->left_delimiter;
-    }
-
-}
-
-?>
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_nocache.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_nocache.php
deleted file mode 100644
index 5fb71b71d..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_nocache.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Nocache
- *
- * Compiles the {nocache} {/nocache} tags.
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Nocache Classv
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Nocache extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {nocache} tag
-     *
-     * This tag does not generate compiled output. It only sets a compiler flag.
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return bool
-     */
-    public function compile($args, $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-        // enter nocache mode
-        $compiler->nocache = true;
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-        return true;
-    }
-
-}
-
-/**
- * Smarty Internal Plugin Compile Nocacheclose Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Nocacheclose extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {/nocache} tag
-     *
-     * This tag does not generate compiled output. It only sets a compiler flag.
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return bool
-     */
-    public function compile($args, $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        // leave nocache mode
-        $compiler->nocache = false;
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-        return true;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
deleted file mode 100644
index 5288f4560..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_block_plugin.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Block Plugin
- *
- * Compiles code for the execution of block plugin
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Block Plugin Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Block_Plugin extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of block plugin
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of block plugin
-     * @param string $function  PHP function name
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag, $function)
-    {
-        if (!isset($tag[5]) || substr($tag, -5) != 'close') {
-            // opening tag of block plugin
-            // check and get attributes
-            $_attr = $this->getAttributes($compiler, $args);
-            if ($_attr['nocache'] === true) {
-                $compiler->tag_nocache = true;
-            }
-               unset($_attr['nocache']);
-            // convert attributes into parameter array string
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                }
-            }
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-            $this->openTag($compiler, $tag, array($_params, $compiler->nocache));
-            // maybe nocache because of nocache variables or nocache plugin
-            $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-            // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-        } else {
-            // must endblock be nocache?
-            if ($compiler->nocache) {
-                $compiler->tag_nocache = true;
-            }
-            // closing tag of block plugin, restore nocache
-            list($_params, $compiler->nocache) = $this->closeTag($compiler, substr($tag, 0, -5));
-            // This tag does create output
-            $compiler->has_output = true;
-            // compile code
-            if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post ='';
-            } else {
-                $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
-            }
-            $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-        }
-        return $output . "\n";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
deleted file mode 100644
index 70e764318..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_function_plugin.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Function Plugin
- *
- * Compiles code for the execution of function plugin
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Function Plugin Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Function_Plugin extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array();
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of function plugin
-     *
-     * @param array $args array with attributes from parser
-     * @param object $compiler compiler object
-     * @param array $parameter array with compilation parameter
-     * @param string $tag name of function plugin
-     * @param string $function PHP function name
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag, $function)
-    {
-        // This tag does create output
-        $compiler->has_output = true;
-
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-        }
-        unset($_attr['nocache']);
-        // convert attributes into parameter array string
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        $_params = 'array(' . implode(",", $_paramsArray) . ')';
-        // compile code
-        $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
-        return $output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_modifier.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_private_modifier.php
deleted file mode 100644
index ca4d90774..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_modifier.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Compile Modifier
- *
- * Compiles code for modifier execution
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Modifier Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for modifier execution
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $output = $parameter['value'];
-        // loop over list of modifiers
-        foreach ($parameter['modifierlist'] as $single_modifier) {
-            $modifier = $single_modifier[0];
-            $single_modifier[0] = $output;
-            $params = implode(',', $single_modifier);
-            // check for registered modifier
-            if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier])) {
-                $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$modifier][0];
-                if (!is_array($function)) {
-                    $output = "{$function}({$params})";
-                } else {
-                    if (is_object($function[0])) {
-                        $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' . $modifier . '\'][0][0]->' . $function[1] . '(' . $params . ')';
-                    } else {
-                        $output = $function[0] . '::' . $function[1] . '(' . $params . ')';
-                    }
-                }
-            } else if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0])) {
-                $output = call_user_func($compiler->smarty->registered_plugins[Smarty::PLUGIN_MODIFIERCOMPILER][$modifier][0], $single_modifier, $compiler->smarty);
-                // check for plugin modifiercompiler
-            } else if ($compiler->smarty->loadPlugin('smarty_modifiercompiler_' . $modifier)) {
-                // check if modifier allowed
-                if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
-                    $plugin = 'smarty_modifiercompiler_' . $modifier;
-                    $output = $plugin($single_modifier, $compiler);
-                }
-                // check for plugin modifier
-            } else if ($function = $compiler->getPlugin($modifier, Smarty::PLUGIN_MODIFIER)) {
-                // check if modifier allowed
-                if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedModifier($modifier, $compiler)) {
-                    $output = "{$function}({$params})";
-                }
-                // check if trusted PHP function
-            } else if (is_callable($modifier)) {
-                // check if modifier allowed
-                if (!is_object($compiler->smarty->security_policy) || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)) {
-                    $output = "{$modifier}({$params})";
-                }
-            } else {
-                $compiler->trigger_template_error("unknown modifier \"" . $modifier . "\"", $compiler->lex->taglineno);
-            }
-        }
-        return $output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
deleted file mode 100644
index cca924d10..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_object_block_function.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Object Block Function
- *
- * Compiles code for registered objects as block function
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Object Block Function Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Object_Block_Function extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of block plugin
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of block object
-     * @param string $method    name of method to call
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag, $method)
-    {
-        if (!isset($tag[5]) || substr($tag, -5) != 'close') {
-            // opening tag of block plugin
-            // check and get attributes
-            $_attr = $this->getAttributes($compiler, $args);
-            if ($_attr['nocache'] === true) {
-                $compiler->tag_nocache = true;
-            }
-            unset($_attr['nocache']);
-            // convert attributes into parameter array string
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                }
-            }
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-            $this->openTag($compiler, $tag . '->' . $method, array($_params, $compiler->nocache));
-            // maybe nocache because of nocache variables or nocache plugin
-            $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-            // compile code
-            $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}->{$method}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-        } else {
-            $base_tag = substr($tag, 0, -5);
-            // must endblock be nocache?
-            if ($compiler->nocache) {
-                $compiler->tag_nocache = true;
-            }
-            // closing tag of block plugin, restore nocache
-            list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag . '->' . $method);
-            // This tag does create output
-            $compiler->has_output = true;
-            // compile code
-            if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post = '';
-            } else {
-                $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo ' . $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifier_list'], 'value' => 'ob_get_clean()')) . ';';
-            }
-            $output = "<?php \$_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;" . $mod_pre . " echo \$_smarty_tpl->smarty->registered_objects['{$base_tag}'][0]->{$method}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); " . $mod_post . "  } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-        }
-        return $output . "\n";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_object_function.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_private_object_function.php
deleted file mode 100644
index f649084c3..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_object_function.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Object Funtion
- *
- * Compiles code for registered objects as function
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Object Function Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Object_Function extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of function plugin
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of function
-     * @param string $method    name of method to call
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag, $method)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-        }
-        unset($_attr['nocache']);
-        $_assign = null;
-        if (isset($_attr['assign'])) {
-            $_assign = $_attr['assign'];
-            unset($_attr['assign']);
-        }
-        // convert attributes into parameter array string
-        if ($compiler->smarty->registered_objects[$tag][2]) {
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                }
-            }
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params},\$_smarty_tpl)";
-        } else {
-            $_params = implode(",", $_attr);
-            $return = "\$_smarty_tpl->smarty->registered_objects['{$tag}'][0]->{$method}({$_params})";
-        }
-        if (empty($_assign)) {
-            // This tag does create output
-            $compiler->has_output = true;
-            $output = "<?php echo {$return};?>\n";
-        } else {
-            $output = "<?php \$_smarty_tpl->assign({$_assign},{$return});?>\n";
-        }
-        return $output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_print_expression.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
deleted file mode 100644
index a37119547..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_print_expression.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
-* Smarty Internal Plugin Compile Print Expression
-*
-* Compiles any tag which will output an expression or variable
-*
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-
-/**
-* Smarty Internal Plugin Compile Print Expression Class
-*
-* @package Smarty
-* @subpackage Compiler
-*/
-class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_CompileBase {
-
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $optional_attributes = array('assign');
-    /**
-    * Attribute definition: Overwrites base class.
-    *
-    * @var array
-    * @see Smarty_Internal_CompileBase
-    */
-    public $option_flags = array('nocache', 'nofilter');
-
-    /**
-    * Compiles code for gererting output from any expression
-    *
-    * @param array  $args      array with attributes from parser
-    * @param object $compiler  compiler object
-    * @param array  $parameter array with compilation parameter
-    * @return string compiled code
-    */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        // nocache option
-        if ($_attr['nocache'] === true) {
-            $compiler->tag_nocache = true;
-        }
-        // filter handling
-        if ($_attr['nofilter'] === true) {
-            $_filter = 'false';
-        } else {
-            $_filter = 'true';
-        }
-        if (isset($_attr['assign'])) {
-            // assign output to variable
-            $output = "<?php \$_smarty_tpl->assign({$_attr['assign']},{$parameter['value']});?>";
-        } else {
-            // display value
-            $output = $parameter['value'];
-            // tag modifier
-            if (!empty($parameter['modifierlist'])) {
-                $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output));
-            }
-            if (!$_attr['nofilter']) {
-                // default modifier
-                if (!empty($compiler->smarty->default_modifiers)) {
-                    if (empty($compiler->default_modifier_list)) {
-                        $modifierlist = array();
-                        foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) {
-                            preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array);
-                            for ($i = 0, $count = count($mod_array[0]);$i < $count;$i++) {
-                                if ($mod_array[0][$i] != ':') {
-                                    $modifierlist[$key][] = $mod_array[0][$i];
-                                }
-                            }
-                        }
-                        $compiler->default_modifier_list  = $modifierlist;
-                    }
-                    $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list, 'value' => $output));
-                }
-                // autoescape html
-                if ($compiler->template->smarty->escape_html) {
-                    $output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
-                }
-                // loop over registerd filters
-                if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) {
-                    foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) {
-                        if (!is_array($function)) {
-                            $output = "{$function}({$output},\$_smarty_tpl)";
-                        } else if (is_object($function[0])) {
-                            $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE][{$key}][0]->{$function[1]}({$output},\$_smarty_tpl)";
-                        } else {
-                            $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)";
-                        }
-                    }
-                }
-                // auto loaded filters
-                if (isset($compiler->smarty->autoload_filters[Smarty::FILTER_VARIABLE])) {
-                    foreach ((array)$compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) {
-                        $result = $this->compile_output_filter($compiler, $name, $output);
-                        if ($result !== false) {
-                            $output = $result;
-                        } else {
-                            // not found, throw exception
-                            throw new SmartyException("Unable to load filter '{$name}'");
-                        }
-                    }
-                }
-                if (isset($compiler->template->variable_filters)) {
-                    foreach ($compiler->template->variable_filters as $filter) {
-                        if (count($filter) == 1 && ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false) {
-                            $output = $result;
-                        } else {
-                            $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter), 'value' => $output));
-                        }
-                    }
-                }
-            }
-
-            $compiler->has_output = true;
-            $output = "<?php echo {$output};?>";
-        }
-        return $output;
-    }
-
-    /**
-    * @param object $compiler compiler object
-    * @param string $name     name of variable filter
-    * @param type   $output   embedded output
-    * @return string
-    */
-    private function compile_output_filter($compiler, $name, $output)
-    {
-        $plugin_name = "smarty_variablefilter_{$name}";
-        $path = $compiler->smarty->loadPlugin($plugin_name, false);
-        if ($path) {
-            if ($compiler->template->caching) {
-                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-                $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
-            } else {
-                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path;
-                $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name;
-            }
-        } else {
-            // not found
-            return false;
-        }
-        return "{$plugin_name}({$output},\$_smarty_tpl)";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_registered_block.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
deleted file mode 100644
index 9fed36c3b..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_registered_block.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Registered Block
- *
- * Compiles code for the execution of a registered block function
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Registered Block Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Registered_Block extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of a block function
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of block function
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag)
-    {
-        if (!isset($tag[5]) || substr($tag,-5) != 'close') {
-            // opening tag of block plugin
-            // check and get attributes
-            $_attr = $this->getAttributes($compiler, $args);
-            if ($_attr['nocache']) {
-                $compiler->tag_nocache = true;
-            }
-               unset($_attr['nocache']);
-               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag])) {
-                   $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$tag];
-               } else {
-                   $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$tag];
-               }
-            // convert attributes into parameter array string
-            $_paramsArray = array();
-            foreach ($_attr as $_key => $_value) {
-                if (is_int($_key)) {
-                    $_paramsArray[] = "$_key=>$_value";
-                } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) {
-                    $_value = str_replace("'","^#^",$_value);
-                    $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
-                } else {
-                    $_paramsArray[] = "'$_key'=>$_value";
-                }
-            }
-            $_params = 'array(' . implode(",", $_paramsArray) . ')';
-
-            $this->openTag($compiler, $tag, array($_params, $compiler->nocache));
-            // maybe nocache because of nocache variables or nocache plugin
-            $compiler->nocache = !$tag_info[1] | $compiler->nocache | $compiler->tag_nocache;
-            $function = $tag_info[0];
-            // compile code
-            if (!is_array($function)) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            } else if (is_object($function[0])) {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo \$_smarty_tpl->smarty->registered_plugins['block']['{$tag}'][0][0]->{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            } else {
-                $output = "<?php \$_smarty_tpl->smarty->_tag_stack[] = array('{$tag}', {$_params}); \$_block_repeat=true; echo {$function[0]}::{$function[1]}({$_params}, null, \$_smarty_tpl, \$_block_repeat);while (\$_block_repeat) { ob_start();?>";
-            }
-        } else {
-            // must endblock be nocache?
-            if ($compiler->nocache) {
-                $compiler->tag_nocache = true;
-            }
-            $base_tag = substr($tag, 0, -5);
-            // closing tag of block plugin, restore nocache
-            list($_params, $compiler->nocache) = $this->closeTag($compiler, $base_tag);
-            // This tag does create output
-            $compiler->has_output = true;
-               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
-                   $function = $compiler->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
-               } else {
-                   $function = $compiler->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag][0];
-               }
-            // compile code
-            if (!isset($parameter['modifier_list'])) {
-                $mod_pre = $mod_post ='';
-            } else {
-                $mod_pre = ' ob_start(); ';
-                $mod_post = 'echo '.$compiler->compileTag('private_modifier',array(),array('modifierlist'=>$parameter['modifier_list'],'value'=>'ob_get_clean()')).';';
-            }
-            if (!is_array($function)) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat);".$mod_post." } array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            } else if (is_object($function[0])) {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo \$_smarty_tpl->smarty->registered_plugins['block']['{$base_tag}'][0][0]->{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            } else {
-                $output = "<?php \$_block_content = ob_get_clean(); \$_block_repeat=false;".$mod_pre." echo {$function[0]}::{$function[1]}({$_params}, \$_block_content, \$_smarty_tpl, \$_block_repeat); ".$mod_post."} array_pop(\$_smarty_tpl->smarty->_tag_stack);?>";
-            }
-        }
-        return $output . "\n";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_registered_function.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
deleted file mode 100644
index 5058bfbbd..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_registered_function.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Registered Function
- *
- * Compiles code for the execution of a registered function
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Registered Function Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Registered_Function extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('_any');
-
-    /**
-     * Compiles code for the execution of a registered function
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @param string $tag       name of function
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter, $tag)
-    {
-        // This tag does create output
-        $compiler->has_output = true;
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache']) {
-            $compiler->tag_nocache = true;
-        }
-        unset($_attr['nocache']);
-               if (isset($compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag])) {
-                   $tag_info = $compiler->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION][$tag];
-               } else {
-                   $tag_info = $compiler->default_handler_plugins[Smarty::PLUGIN_FUNCTION][$tag];
-               }
-        // not cachable?
-        $compiler->tag_nocache =  $compiler->tag_nocache || !$tag_info[1];
-        // convert attributes into parameter array string
-        $_paramsArray = array();
-        foreach ($_attr as $_key => $_value) {
-            if (is_int($_key)) {
-                $_paramsArray[] = "$_key=>$_value";
-            } elseif ($compiler->template->caching && in_array($_key,$tag_info[2])) {
-                $_value = str_replace("'","^#^",$_value);
-                $_paramsArray[] = "'$_key'=>^#^.var_export($_value,true).^#^";
-            } else {
-                $_paramsArray[] = "'$_key'=>$_value";
-            }
-        }
-        $_params = 'array(' . implode(",", $_paramsArray) . ')';
-        $function = $tag_info[0];
-        // compile code
-        if (!is_array($function)) {
-            $output = "<?php echo {$function}({$_params},\$_smarty_tpl);?>\n";
-        } else if (is_object($function[0])) {
-            $output = "<?php echo \$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_FUNCTION]['{$tag}'][0][0]->{$function[1]}({$_params},\$_smarty_tpl);?>\n";
-        } else {
-            $output = "<?php echo {$function[0]}::{$function[1]}({$_params},\$_smarty_tpl);?>\n";
-        }
-        return $output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_special_variable.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
deleted file mode 100644
index 4760dbe3f..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_private_special_variable.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Special Smarty Variable
- *
- * Compiles the special $smarty variables
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile special Smarty Variable Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the speical $smarty variables
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        $_index = preg_split("/\]\[/",substr($parameter, 1, strlen($parameter)-2));
-        $compiled_ref = ' ';
-        $variable = trim($_index[0], "'");
-        switch ($variable) {
-            case 'foreach':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'section':
-                return "\$_smarty_tpl->getVariable('smarty')->value$parameter";
-            case 'capture':
-                return "Smarty::\$_smarty_vars$parameter";
-            case 'now':
-                return 'time()';
-            case 'cookies':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                    break;
-                }
-                $compiled_ref = '$_COOKIE';
-                break;
-
-            case 'get':
-            case 'post':
-            case 'env':
-            case 'server':
-            case 'session':
-            case 'request':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_super_globals) {
-                    $compiler->trigger_template_error("(secure mode) super globals not permitted");
-                    break;
-                }
-                $compiled_ref = '$_'.strtoupper($variable);
-                break;
-
-            case 'template':
-                return 'basename($_smarty_tpl->source->filepath)';
-
-            case 'template_object':
-                return '$_smarty_tpl';
-
-            case 'current_dir':
-                return 'dirname($_smarty_tpl->source->filepath)';
-
-            case 'version':
-                $_version = Smarty::SMARTY_VERSION;
-                return "'$_version'";
-
-            case 'const':
-                if (isset($compiler->smarty->security_policy) && !$compiler->smarty->security_policy->allow_constants) {
-                    $compiler->trigger_template_error("(secure mode) constants not permitted");
-                    break;
-                }
-                return '@' . trim($_index[1], "'");
-
-            case 'config':
-                return "\$_smarty_tpl->getConfigVariable($_index[1])";
-            case 'ldelim':
-                $_ldelim = $compiler->smarty->left_delimiter;
-                return "'$_ldelim'";
-
-            case 'rdelim':
-                $_rdelim = $compiler->smarty->right_delimiter;
-                return "'$_rdelim'";
-
-            default:
-                $compiler->trigger_template_error('$smarty.' . trim($_index[0], "'") . ' is invalid');
-                break;
-        }
-        if (isset($_index[1])) {
-            array_shift($_index);
-            foreach ($_index as $_ind) {
-                $compiled_ref = $compiled_ref . "[$_ind]";
-            }
-        }
-        return $compiled_ref;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_rdelim.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_rdelim.php
deleted file mode 100644
index 807c7e2b9..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_rdelim.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Rdelim
- *
- * Compiles the {rdelim} tag
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Rdelim Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Rdelim extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {rdelim} tag
-     *
-     * This tag does output the right delimiter.
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        if ($_attr['nocache'] === true) {
-            $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno);
-        }
-        // this tag does not return compiled code
-        $compiler->has_code = true;
-        return $compiler->smarty->right_delimiter;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_section.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_section.php
deleted file mode 100644
index ccb7673d8..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_section.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Section
- *
- * Compiles the {section} {sectionelse} {/section} tags
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Section Class
- * 
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Section extends Smarty_Internal_CompileBase {
-
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $required_attributes = array('name', 'loop');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $shorttag_order = array('name', 'loop');
-    /**
-     * Attribute definition: Overwrites base class.
-     *
-     * @var array
-     * @see Smarty_Internal_CompileBase
-     */
-    public $optional_attributes = array('start', 'step', 'max', 'show');
-
-    /**
-     * Compiles code for the {section} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        $this->openTag($compiler, 'section', array('section', $compiler->nocache));
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-
-        $output = "<?php ";
-
-        $section_name = $_attr['name'];
-
-        $output .= "if (isset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name])) unset(\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]);\n";
-        $section_props = "\$_smarty_tpl->tpl_vars['smarty']->value['section'][$section_name]";
-
-        foreach ($_attr as $attr_name => $attr_value) {
-            switch ($attr_name) {
-                case 'loop':
-                    $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n";
-                    break;
-
-                case 'show':
-                    if (is_bool($attr_value))
-                        $show_attr_value = $attr_value ? 'true' : 'false';
-                    else
-                        $show_attr_value = "(bool)$attr_value";
-                    $output .= "{$section_props}['show'] = $show_attr_value;\n";
-                    break;
-
-                case 'name':
-                    $output .= "{$section_props}['$attr_name'] = $attr_value;\n";
-                    break;
-
-                case 'max':
-                case 'start':
-                    $output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n";
-                    break;
-
-                case 'step':
-                    $output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n";
-                    break;
-            }
-        }
-
-        if (!isset($_attr['show']))
-            $output .= "{$section_props}['show'] = true;\n";
-
-        if (!isset($_attr['loop']))
-            $output .= "{$section_props}['loop'] = 1;\n";
-
-        if (!isset($_attr['max']))
-            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
-        else
-            $output .= "if ({$section_props}['max'] < 0)\n" . "    {$section_props}['max'] = {$section_props}['loop'];\n";
-
-        if (!isset($_attr['step']))
-            $output .= "{$section_props}['step'] = 1;\n";
-
-        if (!isset($_attr['start']))
-            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
-        else {
-            $output .= "if ({$section_props}['start'] < 0)\n" . "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . "else\n" . "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
-        }
-
-        $output .= "if ({$section_props}['show']) {\n";
-        if (!isset($_attr['start']) && !isset($_attr['step']) && !isset($_attr['max'])) {
-            $output .= "    {$section_props}['total'] = {$section_props}['loop'];\n";
-        } else {
-            $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
-        }
-        $output .= "    if ({$section_props}['total'] == 0)\n" . "        {$section_props}['show'] = false;\n" . "} else\n" . "    {$section_props}['total'] = 0;\n";
-
-        $output .= "if ({$section_props}['show']):\n";
-        $output .= "
-            for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
-                 {$section_props}['iteration'] <= {$section_props}['total'];
-                 {$section_props}['index'] += {$section_props}['step'], {$section_props}['iteration']++):\n";
-        $output .= "{$section_props}['rownum'] = {$section_props}['iteration'];\n";
-        $output .= "{$section_props}['index_prev'] = {$section_props}['index'] - {$section_props}['step'];\n";
-        $output .= "{$section_props}['index_next'] = {$section_props}['index'] + {$section_props}['step'];\n";
-        $output .= "{$section_props}['first']      = ({$section_props}['iteration'] == 1);\n";
-        $output .= "{$section_props}['last']       = ({$section_props}['iteration'] == {$section_props}['total']);\n";
-
-        $output .= "?>";
-        return $output;
-    }
-
-}
-
-/**
- * Smarty Internal Plugin Compile Sectionelse Class
- * 
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Sectionelse extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {sectionelse} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        list($openTag, $nocache) = $this->closeTag($compiler, array('section'));
-        $this->openTag($compiler, 'sectionelse', array('sectionelse', $nocache));
-
-        return "<?php endfor; else: ?>";
-    }
-
-}
-
-/**
- * Smarty Internal Plugin Compile Sectionclose Class
- * 
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {/section} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-
-        list($openTag, $compiler->nocache) = $this->closeTag($compiler, array('section', 'sectionelse'));
-
-        if ($openTag == 'sectionelse') {
-            return "<?php endif; ?>";
-        } else {
-            return "<?php endfor; endif; ?>";
-        }
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_setfilter.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_setfilter.php
deleted file mode 100644
index d1dd90cf8..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_setfilter.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile Setfilter
- *
- * Compiles code for setfilter tag
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Setfilter Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Setfilter extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for setfilter tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        $compiler->variable_filter_stack[] = $compiler->template->variable_filters;
-        $compiler->template->variable_filters = $parameter['modifier_list'];
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-        return true;
-    }
-
-}
-
-/**
- * Smarty Internal Plugin Compile Setfilterclose Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Setfilterclose extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {/setfilter} tag
-     *
-     * This tag does not generate compiled output. It resets variable filter.
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        $_attr = $this->getAttributes($compiler, $args);
-        // reset variable filter to previous state
-        if (count($compiler->variable_filter_stack)) {
-            $compiler->template->variable_filters = array_pop($compiler->variable_filter_stack);
-        } else {
-            $compiler->template->variable_filters = array();
-        }
-        // this tag does not return compiled code
-        $compiler->has_code = false;
-        return true;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compile_while.php b/resources/libs/smarty/sysplugins/smarty_internal_compile_while.php
deleted file mode 100644
index d7d986c34..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compile_while.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Compile While
- *
- * Compiles the {while} tag
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile While Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_While extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {while} tag
-     *
-     * @param array  $args      array with attributes from parser
-     * @param object $compiler  compiler object
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compile($args, $compiler, $parameter)
-    {
-        // check and get attributes
-        $_attr = $this->getAttributes($compiler, $args);
-        $this->openTag($compiler, 'while', $compiler->nocache);
-
-        if (!array_key_exists("if condition",$parameter)) {
-            $compiler->trigger_template_error("missing while condition", $compiler->lex->taglineno);
-        }
-
-        // maybe nocache because of nocache variables
-        $compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
-        if (is_array($parameter['if condition'])) {
-            if ($compiler->nocache) {
-                $_nocache = ',true';
-                // create nocache var to make it know for further compiling
-                if (is_array($parameter['if condition']['var'])) {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var']['var'], "'")] = new Smarty_variable(null, true);
-                } else {
-                    $compiler->template->tpl_vars[trim($parameter['if condition']['var'], "'")] = new Smarty_variable(null, true);
-                }
-            } else {
-                $_nocache = '';
-            }
-            if (is_array($parameter['if condition']['var'])) {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]) || !is_array(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value)) \$_smarty_tpl->createLocalArrayVariable(" . $parameter['if condition']['var']['var'] . "$_nocache);\n";
-                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var']['var'] . "]->value" . $parameter['if condition']['var']['smarty_internal_index'] . " = " . $parameter['if condition']['value'] . "){?>";
-            } else {
-                $_output = "<?php if (!isset(\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "])) \$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "] = new Smarty_Variable(null{$_nocache});";
-                $_output .= "while (\$_smarty_tpl->tpl_vars[" . $parameter['if condition']['var'] . "]->value = " . $parameter['if condition']['value'] . "){?>";
-            }
-            return $_output;
-        } else {
-            return "<?php while ({$parameter['if condition']}){?>";
-        }
-    }
-
-}
-
-/**
- * Smarty Internal Plugin Compile Whileclose Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Compile_Whileclose extends Smarty_Internal_CompileBase {
-
-    /**
-     * Compiles code for the {/while} tag
-     *
-     * @param array  $args     array with attributes from parser
-     * @param object $compiler compiler object
-     * @return string compiled code
-     */
-    public function compile($args, $compiler)
-    {
-        // must endblock be nocache?
-        if ($compiler->nocache) {
-            $compiler->tag_nocache = true;
-        }
-        $compiler->nocache = $this->closeTag($compiler, array('while'));
-        return "<?php }?>";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_compilebase.php b/resources/libs/smarty/sysplugins/smarty_internal_compilebase.php
deleted file mode 100644
index 5fb56f371..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_compilebase.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin CompileBase
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * This class does extend all internal compile plugins
- *
- * @package Smarty
- * @subpackage Compiler
- */
-abstract class Smarty_Internal_CompileBase {
-
-    /**
-     * Array of names of required attribute required by tag
-     *
-     * @var array
-     */
-    public $required_attributes = array();
-    /**
-     * Array of names of optional attribute required by tag
-     * use array('_any') if there is no restriction of attributes names
-     *
-     * @var array
-     */
-    public $optional_attributes = array();
-    /**
-     * Shorttag attribute order defined by its names
-     *
-     * @var array
-     */
-    public $shorttag_order = array();
-    /**
-     * Array of names of valid option flags
-     *
-     * @var array
-     */
-    public $option_flags = array('nocache');
-
-    /**
-     * This function checks if the attributes passed are valid
-     *
-     * The attributes passed for the tag to compile are checked against the list of required and
-     * optional attributes. Required attributes must be present. Optional attributes are check against
-     * the corresponding list. The keyword '_any' specifies that any attribute will be accepted
-     * as valid
-     *
-     * @param object $compiler   compiler object
-     * @param array  $attributes attributes applied to the tag
-     * @return array of mapped attributes for further processing
-     */
-    public function getAttributes($compiler, $attributes)
-    {
-        $_indexed_attr = array();
-        // loop over attributes
-        foreach ($attributes as $key => $mixed) {
-            // shorthand ?
-            if (!is_array($mixed)) {
-                // option flag ?
-                if (in_array(trim($mixed, '\'"'), $this->option_flags)) {
-                    $_indexed_attr[trim($mixed, '\'"')] = true;
-                    // shorthand attribute ?
-                } else if (isset($this->shorttag_order[$key])) {
-                    $_indexed_attr[$this->shorttag_order[$key]] = $mixed;
-                } else {
-                    // too many shorthands
-                    $compiler->trigger_template_error('too many shorthand attributes', $compiler->lex->taglineno);
-                }
-                // named attribute
-            } else {
-                $kv = each($mixed);
-                // option flag?
-                if (in_array($kv['key'], $this->option_flags)) {
-                    if (is_bool($kv['value'])) {
-                        $_indexed_attr[$kv['key']] = $kv['value'];
-                    } else if (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) {
-                        if (trim($kv['value']) == 'true') {
-                            $_indexed_attr[$kv['key']] = true;
-                        } else {
-                            $_indexed_attr[$kv['key']] = false;
-                        }
-                    } else if (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) {
-                        if ($kv['value'] == 1) {
-                            $_indexed_attr[$kv['key']] = true;
-                        } else {
-                            $_indexed_attr[$kv['key']] = false;
-                        }
-                    } else {
-                        $compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $compiler->lex->taglineno);
-                    }
-                    // must be named attribute
-                } else {
-                    reset($mixed);
-                    $_indexed_attr[key($mixed)] = $mixed[key($mixed)];
-                }
-            }
-        }
-        // check if all required attributes present
-        foreach ($this->required_attributes as $attr) {
-            if (!array_key_exists($attr, $_indexed_attr)) {
-                $compiler->trigger_template_error("missing \"" . $attr . "\" attribute", $compiler->lex->taglineno);
-            }
-        }
-        // check for unallowed attributes
-        if ($this->optional_attributes != array('_any')) {
-            $tmp_array = array_merge($this->required_attributes, $this->optional_attributes, $this->option_flags);
-            foreach ($_indexed_attr as $key => $dummy) {
-                if (!in_array($key, $tmp_array) && $key !== 0) {
-                    $compiler->trigger_template_error("unexpected \"" . $key . "\" attribute", $compiler->lex->taglineno);
-                }
-            }
-        }
-        // default 'false' for all option flags not set
-        foreach ($this->option_flags as $flag) {
-            if (!isset($_indexed_attr[$flag])) {
-                $_indexed_attr[$flag] = false;
-            }
-        }
-
-        return $_indexed_attr;
-    }
-
-    /**
-     * Push opening tag name on stack
-     *
-     * Optionally additional data can be saved on stack
-     *
-     * @param object    $compiler   compiler object
-     * @param string    $openTag    the opening tag's name
-     * @param mixed     $data       optional data saved
-     */
-    public function openTag($compiler, $openTag, $data = null)
-    {
-        array_push($compiler->_tag_stack, array($openTag, $data));
-    }
-
-    /**
-     * Pop closing tag
-     *
-     * Raise an error if this stack-top doesn't match with expected opening tags
-     *
-     * @param object       $compiler    compiler object
-     * @param array|string $expectedTag the expected opening tag names
-     * @return mixed any type the opening tag's name or saved data
-     */
-    public function closeTag($compiler, $expectedTag)
-    {
-        if (count($compiler->_tag_stack) > 0) {
-            // get stacked info
-            list($_openTag, $_data) = array_pop($compiler->_tag_stack);
-            // open tag must match with the expected ones
-            if (in_array($_openTag, (array) $expectedTag)) {
-                if (is_null($_data)) {
-                    // return opening tag
-                    return $_openTag;
-                } else {
-                    // return restored data
-                    return $_data;
-                }
-            }
-            // wrong nesting of tags
-            $compiler->trigger_template_error("unclosed {" . $_openTag . "} tag");
-            return;
-        }
-        // wrong nesting of tags
-        $compiler->trigger_template_error("unexpected closing tag", $compiler->lex->taglineno);
-        return;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_config.php b/resources/libs/smarty/sysplugins/smarty_internal_config.php
deleted file mode 100644
index a309ec9ff..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_config.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Config
- *
- * @package Smarty
- * @subpackage Config
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Config
- *
- * Main class for config variables
- *
- * @package Smarty
- * @subpackage Config
- *
- * @property Smarty_Config_Source   $source
- * @property Smarty_Config_Compiled $compiled
- * @ignore
- */
-class Smarty_Internal_Config {
-
-    /**
-     * Samrty instance
-     *
-     * @var Smarty object
-     */
-    public $smarty = null;
-    /**
-     * Object of config var storage
-     *
-     * @var object
-     */
-    public $data = null;
-    /**
-     * Config resource
-     * @var string
-     */
-    public $config_resource = null;
-    /**
-     * Compiled config file
-     *
-     * @var string
-     */
-    public $compiled_config = null;
-    /**
-     * filepath of compiled config file
-     *
-     * @var string
-     */
-    public $compiled_filepath = null;
-    /**
-     * Filemtime of compiled config Filemtime
-     *
-     * @var int
-     */
-    public $compiled_timestamp = null;
-    /**
-     * flag if compiled config file is invalid and must be (re)compiled
-     * @var bool
-     */
-    public $mustCompile = null;
-    /**
-     * Config file compiler object
-     *
-     * @var Smarty_Internal_Config_File_Compiler object
-     */
-    public $compiler_object = null;
-
-    /**
-     * Constructor of config file object
-     *
-     * @param string $config_resource config file resource name
-     * @param Smarty $smarty Smarty instance
-     * @param object $data object for config vars storage
-     */
-    public function __construct($config_resource, $smarty, $data = null)
-    {
-        $this->data = $data;
-        $this->smarty = $smarty;
-        $this->config_resource = $config_resource;
-    }
-
-    /**
-     * Returns the compiled  filepath
-     *
-     * @return string the compiled filepath
-     */
-    public function getCompiledFilepath()
-    {
-        return $this->compiled_filepath === null ?
-                ($this->compiled_filepath = $this->buildCompiledFilepath()) :
-                $this->compiled_filepath;
-    }
-
-    /**
-     * Get file path.
-     *
-     * @return string
-     */
-    public function buildCompiledFilepath()
-    {
-        $_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null;
-        $_flag = (int) $this->smarty->config_read_hidden + (int) $this->smarty->config_booleanize * 2
-                + (int) $this->smarty->config_overwrite * 4;
-        $_filepath = sha1($this->source->name . $_flag);
-        // if use_sub_dirs, break file into directories
-        if ($this->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-                    . substr($_filepath, 2, 2) . DS
-                    . substr($_filepath, 4, 2) . DS
-                    . $_filepath;
-        }
-        $_compile_dir_sep = $this->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        }
-        $_compile_dir = $this->smarty->getCompileDir();
-        return $_compile_dir . $_filepath . '.' . basename($this->source->name) . '.config' . '.php';
-    }
-
-    /**
-     * Returns the timpestamp of the compiled file
-     *
-     * @return integer the file timestamp
-     */
-    public function getCompiledTimestamp()
-    {
-        return $this->compiled_timestamp === null
-            ? ($this->compiled_timestamp = (file_exists($this->getCompiledFilepath())) ? filemtime($this->getCompiledFilepath()) : false)
-            : $this->compiled_timestamp;
-    }
-
-    /**
-     * Returns if the current config file must be compiled
-     *
-     * It does compare the timestamps of config source and the compiled config and checks the force compile configuration
-     *
-     * @return boolean true if the file must be compiled
-     */
-    public function mustCompile()
-    {
-        return $this->mustCompile === null ?
-            $this->mustCompile = ($this->smarty->force_compile || $this->getCompiledTimestamp () === false || $this->smarty->compile_check && $this->getCompiledTimestamp () < $this->source->timestamp):
-            $this->mustCompile;
-    }
-
-    /**
-     * Returns the compiled config file
-     *
-     * It checks if the config file must be compiled or just read the compiled version
-     *
-     * @return string the compiled config file
-     */
-    public function getCompiledConfig()
-    {
-        if ($this->compiled_config === null) {
-            // see if template needs compiling.
-            if ($this->mustCompile()) {
-                $this->compileConfigSource();
-            } else {
-                $this->compiled_config = file_get_contents($this->getCompiledFilepath());
-            }
-        }
-        return $this->compiled_config;
-    }
-
-    /**
-     * Compiles the config files
-     *
-     * @throws Exception
-     */
-    public function compileConfigSource()
-    {
-        // compile template
-        if (!is_object($this->compiler_object)) {
-            // load compiler
-            $this->compiler_object = new Smarty_Internal_Config_File_Compiler($this->smarty);
-        }
-        // compile locking
-        if ($this->smarty->compile_locking) {
-            if ($saved_timestamp = $this->getCompiledTimestamp()) {
-                touch($this->getCompiledFilepath());
-            }
-        }
-        // call compiler
-        try {
-            $this->compiler_object->compileSource($this);
-        } catch (Exception $e) {
-            // restore old timestamp in case of error
-            if ($this->smarty->compile_locking && $saved_timestamp) {
-                touch($this->getCompiledFilepath(), $saved_timestamp);
-            }
-            throw $e;
-        }
-        // compiling succeded
-        // write compiled template
-        Smarty_Internal_Write_File::writeFile($this->getCompiledFilepath(), $this->getCompiledConfig(), $this->smarty);
-    }
-
-    /**
-     * load config variables
-     *
-     * @param mixed $sections array of section names, single section or null
-     * @param object $scope global,parent or local
-     */
-    public function loadConfigVars($sections = null, $scope = 'local')
-    {
-        if ($this->data instanceof Smarty_Internal_Template) {
-            $this->data->properties['file_dependency'][sha1($this->source->filepath)] = array($this->source->filepath, $this->source->timestamp, 'file');
-        }
-        if ($this->mustCompile()) {
-            $this->compileConfigSource();
-        }
-        // pointer to scope
-        if ($scope == 'local') {
-            $scope_ptr = $this->data;
-        } elseif ($scope == 'parent') {
-            if (isset($this->data->parent)) {
-                $scope_ptr = $this->data->parent;
-            } else {
-                $scope_ptr = $this->data;
-            }
-        } elseif ($scope == 'root' || $scope == 'global') {
-            $scope_ptr = $this->data;
-            while (isset($scope_ptr->parent)) {
-                $scope_ptr = $scope_ptr->parent;
-            }
-        }
-        $_config_vars = array();
-        include($this->getCompiledFilepath());
-        // copy global config vars
-        foreach ($_config_vars['vars'] as $variable => $value) {
-            if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                $scope_ptr->config_vars[$variable] = $value;
-            } else {
-                $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
-            }
-        }
-        // scan sections
-        if (!empty($sections)) {
-            $sections = array_flip((array) $sections);
-            foreach ($_config_vars['sections'] as $this_section => $dummy) {
-                if (isset($sections[$this_section])) {
-                    foreach ($_config_vars['sections'][$this_section]['vars'] as $variable => $value) {
-                        if ($this->smarty->config_overwrite || !isset($scope_ptr->config_vars[$variable])) {
-                            $scope_ptr->config_vars[$variable] = $value;
-                        } else {
-                            $scope_ptr->config_vars[$variable] = array_merge((array) $scope_ptr->config_vars[$variable], (array) $value);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * set Smarty property in template context
-     *
-     * @param string $property_name property name
-     * @param mixed  $value         value
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'source':
-            case 'compiled':
-                $this->$property_name = $value;
-                return;
-        }
-
-        throw new SmartyException("invalid config property '$property_name'.");
-    }
-
-    /**
-     * get Smarty property in template context
-     *
-     * @param string $property_name property name
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'source':
-                if (empty($this->config_resource)) {
-                    throw new SmartyException("Unable to parse resource name \"{$this->config_resource}\"");
-                }
-                $this->source = Smarty_Resource::config($this);
-                return $this->source;
-
-            case 'compiled':
-                $this->compiled = $this->source->getCompiled($this);
-                return $this->compiled;
-        }
-
-        throw new SmartyException("config attribute '$property_name' does not exist.");
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_config_file_compiler.php b/resources/libs/smarty/sysplugins/smarty_internal_config_file_compiler.php
deleted file mode 100644
index b16a6940d..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_config_file_compiler.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Config File Compiler
- *
- * This is the config file compiler class. It calls the lexer and parser to
- * perform the compiling.
- *
- * @package Smarty
- * @subpackage Config
- * @author Uwe Tews
- */
-
-/**
- * Main config file compiler class
- *
- * @package Smarty
- * @subpackage Config
- */
-class Smarty_Internal_Config_File_Compiler {
-
-    /**
-     * Lexer object
-     *
-     * @var object
-     */
-    public $lex;
-
-    /**
-     * Parser object
-     *
-     * @var object
-     */
-    public $parser;
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty object
-     */
-    public $smarty;
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty_Internal_Config object
-     */
-    public $config;
-
-    /**
-     * Compiled config data sections and variables
-     *
-     * @var array
-     */
-    public $config_data = array();
-
-    /**
-     * Initialize compiler
-     *
-     * @param Smarty $smarty base instance
-     */
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-        $this->config_data['sections'] = array();
-        $this->config_data['vars'] = array();
-    }
-
-    /**
-     * Method to compile a Smarty template.
-     *
-     * @param  Smarty_Internal_Config $config config object
-     * @return bool true if compiling succeeded, false if it failed
-     */
-    public function compileSource(Smarty_Internal_Config $config)
-    {
-        /* here is where the compiling takes place. Smarty
-          tags in the templates are replaces with PHP code,
-          then written to compiled files. */
-        $this->config = $config;
-        // get config file source
-        $_content = $config->source->content . "\n";
-        // on empty template just return
-        if ($_content == '') {
-            return true;
-        }
-        // init the lexer/parser to compile the config file
-        $lex = new Smarty_Internal_Configfilelexer($_content, $this->smarty);
-        $parser = new Smarty_Internal_Configfileparser($lex, $this);
-        if ($this->smarty->_parserdebug) $parser->PrintTrace();
-        // get tokens from lexer and parse them
-        while ($lex->yylex()) {
-            if ($this->smarty->_parserdebug) echo "<br>Parsing  {$parser->yyTokenName[$lex->token]} Token {$lex->value} Line {$lex->line} \n";
-            $parser->doParse($lex->token, $lex->value);
-        }
-        // finish parsing process
-        $parser->doParse(0, 0);
-        $config->compiled_config = '<?php $_config_vars = ' . var_export($this->config_data, true) . '; ?>';
-    }
-
-    /**
-     * display compiler error messages without dying
-     *
-     * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about exspected tokens.
-     *
-     * If parameter $args contains a string this is used as error message
-     *
-     * @param string $args individual error message or null
-     */
-    public function trigger_config_file_error($args = null)
-    {
-        $this->lex = Smarty_Internal_Configfilelexer::instance();
-        $this->parser = Smarty_Internal_Configfileparser::instance();
-        // get template source line which has error
-        $line = $this->lex->line;
-        if (isset($args)) {
-            // $line--;
-        }
-        $match = preg_split("/\n/", $this->lex->data);
-        $error_text = "Syntax error in config file '{$this->config->source->filepath}' on line {$line} '{$match[$line-1]}' ";
-        if (isset($args)) {
-            // individual error message
-            $error_text .= $args;
-        } else {
-            // exspected token from parser
-            foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                $exp_token = $this->parser->yyTokenName[$token];
-                if (isset($this->lex->smarty_token_names[$exp_token])) {
-                    // token type from lexer
-                    $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
-                } else {
-                    // otherwise internal token name
-                    $expect[] = $this->parser->yyTokenName[$token];
-                }
-            }
-            // output parser error message
-            $error_text .= ' - Unexpected "' . $this->lex->value . '", expected one of: ' . implode(' , ', $expect);
-        }
-        throw new SmartyCompilerException($error_text);
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_configfilelexer.php b/resources/libs/smarty/sysplugins/smarty_internal_configfilelexer.php
deleted file mode 100644
index bade2fe74..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_configfilelexer.php
+++ /dev/null
@@ -1,622 +0,0 @@
-<?php
-/**
-* Smarty Internal Plugin Configfilelexer
-*
-* This is the lexer to break the config file source into tokens
-* @package Smarty
-* @subpackage Config
-* @author Uwe Tews
-*/
-/**
-* Smarty Internal Plugin Configfilelexer
-*/
-class Smarty_Internal_Configfilelexer
-{
-
-    public $data;
-    public $counter;
-    public $token;
-    public $value;
-    public $node;
-    public $line;
-    private $state = 1;
-    public $smarty_token_names = array (		// Text for parser error messages
-   				);
-
-
-    function __construct($data, $smarty)
-    {
-        // set instance object
-        self::instance($this);
-        $this->data = $data . "\n"; //now all lines are \n-terminated
-        $this->counter = 0;
-        $this->line = 1;
-        $this->smarty = $smarty;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
-    }
-    public static function &instance($new_instance = null)
-    {
-        static $instance = null;
-        if (isset($new_instance) && is_object($new_instance))
-            $instance = $new_instance;
-        return $instance;
-    }
-
-
-
-    private $_yy_state = 1;
-    private $_yy_stack = array();
-
-    function yylex()
-    {
-        return $this->{'yylex' . $this->_yy_state}();
-    }
-
-    function yypushstate($state)
-    {
-        array_push($this->_yy_stack, $this->_yy_state);
-        $this->_yy_state = $state;
-    }
-
-    function yypopstate()
-    {
-        $this->_yy_state = array_pop($this->_yy_stack);
-    }
-
-    function yybegin($state)
-    {
-        $this->_yy_state = $state;
-    }
-
-
-
-
-    function yylex1()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G(#|;)|\G(\\[)|\G(\\])|\G(=)|\G([ \t\r]+)|\G(\n)|\G([0-9]*[a-zA-Z_]\\w*)|\G([\S\s])/iS";
-
-        do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state START');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-
-    } // end function
-
-
-    const START = 1;
-    function yy_r1_1($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_COMMENTSTART;
-    $this->yypushstate(self::COMMENT);
-    }
-    function yy_r1_2($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_OPENB;
-    $this->yypushstate(self::SECTION);
-    }
-    function yy_r1_3($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_CLOSEB;
-    }
-    function yy_r1_4($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_EQUAL;
-    $this->yypushstate(self::VALUE);
-    }
-    function yy_r1_5($yy_subpatterns)
-    {
-
-    return false;
-    }
-    function yy_r1_6($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-    }
-    function yy_r1_7($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_ID;
-    }
-    function yy_r1_8($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_OTHER;
-    }
-
-
-
-    function yylex2()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G([ \t\r]+)|\G(\\d+\\.\\d+(?=[ \t\r]*[\n#;]))|\G(\\d+(?=[ \t\r]*[\n#;]))|\G(\"\"\")|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*'(?=[ \t\r]*[\n#;]))|\G(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"(?=[ \t\r]*[\n#;]))|\G([a-zA-Z]+(?=[ \t\r]*[\n#;]))|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
-
-        do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state VALUE');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-
-    } // end function
-
-
-    const VALUE = 2;
-    function yy_r2_1($yy_subpatterns)
-    {
-
-    return false;
-    }
-    function yy_r2_2($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_FLOAT;
-    $this->yypopstate();
-    }
-    function yy_r2_3($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_INT;
-    $this->yypopstate();
-    }
-    function yy_r2_4($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES;
-    $this->yypushstate(self::TRIPPLE);
-    }
-    function yy_r2_5($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_SINGLE_QUOTED_STRING;
-    $this->yypopstate();
-    }
-    function yy_r2_6($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_DOUBLE_QUOTED_STRING;
-    $this->yypopstate();
-    }
-    function yy_r2_7($yy_subpatterns)
-    {
-
-    if (!$this->smarty->config_booleanize || !in_array(strtolower($this->value), Array("true", "false", "on", "off", "yes", "no")) ) {
-        $this->yypopstate();
-        $this->yypushstate(self::NAKED_STRING_VALUE);
-        return true; //reprocess in new state
-    } else {
-        $this->token = Smarty_Internal_Configfileparser::TPC_BOOL;
-        $this->yypopstate();
-    }
-    }
-    function yy_r2_8($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->yypopstate();
-    }
-    function yy_r2_9($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->value = "";
-    $this->yypopstate();
-    }
-
-
-
-    function yylex3()
-    {
-        $tokenMap = array (
-              1 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G([^\n]+?(?=[ \t\r]*\n))/iS";
-
-        do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state NAKED_STRING_VALUE');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-
-    } // end function
-
-
-    const NAKED_STRING_VALUE = 3;
-    function yy_r3_1($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    $this->yypopstate();
-    }
-
-
-
-    function yylex4()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G([ \t\r]+)|\G([^\n]+?(?=[ \t\r]*\n))|\G(\n)/iS";
-
-        do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state COMMENT');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-
-    } // end function
-
-
-    const COMMENT = 4;
-    function yy_r4_1($yy_subpatterns)
-    {
-
-    return false;
-    }
-    function yy_r4_2($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_NAKED_STRING;
-    }
-    function yy_r4_3($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_NEWLINE;
-    $this->yypopstate();
-    }
-
-
-
-    function yylex5()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G(\\.)|\G(.*?(?=[\.=[\]\r\n]))/iS";
-
-        do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state SECTION');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r5_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-
-    } // end function
-
-
-    const SECTION = 5;
-    function yy_r5_1($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_DOT;
-    }
-    function yy_r5_2($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_SECTION;
-    $this->yypopstate();
-    }
-
-
-    function yylex6()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G(\"\"\"(?=[ \t\r]*[\n#;]))|\G([\S\s])/iS";
-
-        do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state TRIPPLE');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r6_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-
-    } // end function
-
-
-    const TRIPPLE = 6;
-    function yy_r6_1($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_QUOTES_END;
-    $this->yypopstate();
-    $this->yypushstate(self::START);
-    }
-    function yy_r6_2($yy_subpatterns)
-    {
-
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $to = strlen($this->data);
-  }
-  preg_match("/\"\"\"[ \t\r]*[\n#;]/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
-  if (isset($match[0][1])) {
-    $to = $match[0][1];
-  } else {
-    $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  }
-  $this->token = Smarty_Internal_Configfileparser::TPC_TRIPPLE_TEXT;
-    }
-
-
-}
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_configfileparser.php b/resources/libs/smarty/sysplugins/smarty_internal_configfileparser.php
deleted file mode 100644
index 784bc684d..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_configfileparser.php
+++ /dev/null
@@ -1,921 +0,0 @@
-<?php
-/**
-* Smarty Internal Plugin Configfileparser
-*
-* This is the config file parser.
-* It is generated from the internal.configfileparser.y file
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-
-class TPC_yyToken implements ArrayAccess
-{
-    public $string = '';
-    public $metadata = array();
-
-    function __construct($s, $m = array())
-    {
-        if ($s instanceof TPC_yyToken) {
-            $this->string = $s->string;
-            $this->metadata = $s->metadata;
-        } else {
-            $this->string = (string) $s;
-            if ($m instanceof TPC_yyToken) {
-                $this->metadata = $m->metadata;
-            } elseif (is_array($m)) {
-                $this->metadata = $m;
-            }
-        }
-    }
-
-    function __toString()
-    {
-        return $this->_string;
-    }
-
-    function offsetExists($offset)
-    {
-        return isset($this->metadata[$offset]);
-    }
-
-    function offsetGet($offset)
-    {
-        return $this->metadata[$offset];
-    }
-
-    function offsetSet($offset, $value)
-    {
-        if ($offset === null) {
-            if (isset($value[0])) {
-                $x = ($value instanceof TPC_yyToken) ?
-                    $value->metadata : $value;
-                $this->metadata = array_merge($this->metadata, $x);
-                return;
-            }
-            $offset = count($this->metadata);
-        }
-        if ($value === null) {
-            return;
-        }
-        if ($value instanceof TPC_yyToken) {
-            if ($value->metadata) {
-                $this->metadata[$offset] = $value->metadata;
-            }
-        } elseif ($value) {
-            $this->metadata[$offset] = $value;
-        }
-    }
-
-    function offsetUnset($offset)
-    {
-        unset($this->metadata[$offset]);
-    }
-}
-
-class TPC_yyStackEntry
-{
-    public $stateno;       /* The state-number */
-    public $major;         /* The major token value.  This is the code
-                     ** number for the token at this stack level */
-    public $minor; /* The user-supplied minor token value.  This
-                     ** is the value of the token  */
-};
-
-
-#line 12 "smarty_internal_configfileparser.y"
-class Smarty_Internal_Configfileparser#line 79 "smarty_internal_configfileparser.php"
-{
-#line 14 "smarty_internal_configfileparser.y"
-
-    // states whether the parse was successful or not
-    public $successful = true;
-    public $retvalue = 0;
-    private $lex;
-    private $internalError = false;
-
-    function __construct($lex, $compiler) {
-        // set instance object
-        self::instance($this);
-        $this->lex = $lex;
-        $this->smarty = $compiler->smarty;
-        $this->compiler = $compiler;
-    }
-    public static function &instance($new_instance = null)
-    {
-        static $instance = null;
-        if (isset($new_instance) && is_object($new_instance))
-            $instance = $new_instance;
-        return $instance;
-    }
-
-    private function parse_bool($str) {
-        if (in_array(strtolower($str) ,array('on','yes','true'))) {
-            $res = true;
-        } else {
-            $res = false;
-        }
-        return $res;
-    }
-
-    private static $escapes_single = Array('\\' => '\\',
-                                          '\'' => '\'');
-    private static function parse_single_quoted_string($qstr) {
-        $escaped_string = substr($qstr, 1, strlen($qstr)-2); //remove outer quotes
-
-        $ss = preg_split('/(\\\\.)/', $escaped_string, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-        $str = "";
-        foreach ($ss as $s) {
-            if (strlen($s) === 2 && $s[0] === '\\') {
-                if (isset(self::$escapes_single[$s[1]])) {
-                    $s = self::$escapes_single[$s[1]];
-                }
-             }
-
-             $str .= $s;
-        }
-
-        return $str;
-    }
-
-    private static function parse_double_quoted_string($qstr) {
-        $inner_str = substr($qstr, 1, strlen($qstr)-2);
-        return stripcslashes($inner_str);
-    }
-
-    private static function parse_tripple_double_quoted_string($qstr) {
-        return stripcslashes($qstr);
-    }
-
-    private function set_var(Array $var, Array &$target_array) {
-        $key = $var["key"];
-        $value = $var["value"];
-
-        if ($this->smarty->config_overwrite || !isset($target_array['vars'][$key])) {
-            $target_array['vars'][$key] = $value;
-        } else {
-            settype($target_array['vars'][$key], 'array');
-            $target_array['vars'][$key][] = $value;
-        }
-    }
-
-    private function add_global_vars(Array $vars) {
-        if (!isset($this->compiler->config_data['vars'])) {
-      $this->compiler->config_data['vars'] = Array();
-        }
-        foreach ($vars as $var) {
-            $this->set_var($var, $this->compiler->config_data);
-        }
-    }
-
-    private function add_section_vars($section_name, Array $vars) {
-        if (!isset($this->compiler->config_data['sections'][$section_name]['vars'])) {
-            $this->compiler->config_data['sections'][$section_name]['vars'] = Array();
-        }
-        foreach ($vars as $var) {
-            $this->set_var($var, $this->compiler->config_data['sections'][$section_name]);
-        }
-    }
-#line 173 "smarty_internal_configfileparser.php"
-
-    const TPC_OPENB                          =  1;
-    const TPC_SECTION                        =  2;
-    const TPC_CLOSEB                         =  3;
-    const TPC_DOT                            =  4;
-    const TPC_ID                             =  5;
-    const TPC_EQUAL                          =  6;
-    const TPC_FLOAT                          =  7;
-    const TPC_INT                            =  8;
-    const TPC_BOOL                           =  9;
-    const TPC_SINGLE_QUOTED_STRING           = 10;
-    const TPC_DOUBLE_QUOTED_STRING           = 11;
-    const TPC_TRIPPLE_QUOTES                 = 12;
-    const TPC_TRIPPLE_TEXT                   = 13;
-    const TPC_TRIPPLE_QUOTES_END             = 14;
-    const TPC_NAKED_STRING                   = 15;
-    const TPC_OTHER                          = 16;
-    const TPC_NEWLINE                        = 17;
-    const TPC_COMMENTSTART                   = 18;
-    const YY_NO_ACTION = 60;
-    const YY_ACCEPT_ACTION = 59;
-    const YY_ERROR_ACTION = 58;
-
-    const YY_SZ_ACTTAB = 38;
-static public $yy_action = array(
- /*     0 */    29,   30,   34,   33,   24,   13,   19,   25,   35,   21,
- /*    10 */    59,    8,    3,    1,   20,   12,   14,   31,   20,   12,
- /*    20 */    15,   17,   23,   18,   27,   26,    4,    5,    6,   32,
- /*    30 */     2,   11,   28,   22,   16,    9,    7,   10,
-    );
-    static public $yy_lookahead = array(
- /*     0 */     7,    8,    9,   10,   11,   12,    5,   27,   15,   16,
- /*    10 */    20,   21,   23,   23,   17,   18,   13,   14,   17,   18,
- /*    20 */    15,    2,   17,    4,   25,   26,    6,    3,    3,   14,
- /*    30 */    23,    1,   24,   17,    2,   25,   22,   25,
-);
-    const YY_SHIFT_USE_DFLT = -8;
-    const YY_SHIFT_MAX = 19;
-    static public $yy_shift_ofst = array(
- /*     0 */    -8,    1,    1,    1,   -7,   -3,   -3,   30,   -8,   -8,
- /*    10 */    -8,   19,    5,    3,   15,   16,   24,   25,   32,   20,
-);
-    const YY_REDUCE_USE_DFLT = -21;
-    const YY_REDUCE_MAX = 10;
-    static public $yy_reduce_ofst = array(
- /*     0 */   -10,   -1,   -1,   -1,  -20,   10,   12,    8,   14,    7,
- /*    10 */   -11,
-);
-    static public $yyExpectedTokens = array(
-        /* 0 */ array(),
-        /* 1 */ array(5, 17, 18, ),
-        /* 2 */ array(5, 17, 18, ),
-        /* 3 */ array(5, 17, 18, ),
-        /* 4 */ array(7, 8, 9, 10, 11, 12, 15, 16, ),
-        /* 5 */ array(17, 18, ),
-        /* 6 */ array(17, 18, ),
-        /* 7 */ array(1, ),
-        /* 8 */ array(),
-        /* 9 */ array(),
-        /* 10 */ array(),
-        /* 11 */ array(2, 4, ),
-        /* 12 */ array(15, 17, ),
-        /* 13 */ array(13, 14, ),
-        /* 14 */ array(14, ),
-        /* 15 */ array(17, ),
-        /* 16 */ array(3, ),
-        /* 17 */ array(3, ),
-        /* 18 */ array(2, ),
-        /* 19 */ array(6, ),
-        /* 20 */ array(),
-        /* 21 */ array(),
-        /* 22 */ array(),
-        /* 23 */ array(),
-        /* 24 */ array(),
-        /* 25 */ array(),
-        /* 26 */ array(),
-        /* 27 */ array(),
-        /* 28 */ array(),
-        /* 29 */ array(),
-        /* 30 */ array(),
-        /* 31 */ array(),
-        /* 32 */ array(),
-        /* 33 */ array(),
-        /* 34 */ array(),
-        /* 35 */ array(),
-);
-    static public $yy_default = array(
- /*     0 */    44,   37,   41,   40,   58,   58,   58,   36,   39,   44,
- /*    10 */    44,   58,   58,   58,   58,   58,   58,   58,   58,   58,
- /*    20 */    55,   54,   57,   56,   50,   45,   43,   42,   38,   46,
- /*    30 */    47,   52,   51,   49,   48,   53,
-);
-    const YYNOCODE = 29;
-    const YYSTACKDEPTH = 100;
-    const YYNSTATE = 36;
-    const YYNRULE = 22;
-    const YYERRORSYMBOL = 19;
-    const YYERRSYMDT = 'yy0';
-    const YYFALLBACK = 0;
-    static public $yyFallback = array(
-    );
-    static function Trace($TraceFILE, $zTracePrompt)
-    {
-        if (!$TraceFILE) {
-            $zTracePrompt = 0;
-        } elseif (!$zTracePrompt) {
-            $TraceFILE = 0;
-        }
-        self::$yyTraceFILE = $TraceFILE;
-        self::$yyTracePrompt = $zTracePrompt;
-    }
-
-    static function PrintTrace()
-    {
-        self::$yyTraceFILE = fopen('php://output', 'w');
-        self::$yyTracePrompt = '<br>';
-    }
-
-    static public $yyTraceFILE;
-    static public $yyTracePrompt;
-    public $yyidx;                    /* Index of top element in stack */
-    public $yyerrcnt;                 /* Shifts left before out of the error */
-    public $yystack = array();  /* The parser's stack */
-
-    public $yyTokenName = array(
-  '$',             'OPENB',         'SECTION',       'CLOSEB',
-  'DOT',           'ID',            'EQUAL',         'FLOAT',
-  'INT',           'BOOL',          'SINGLE_QUOTED_STRING',  'DOUBLE_QUOTED_STRING',
-  'TRIPPLE_QUOTES',  'TRIPPLE_TEXT',  'TRIPPLE_QUOTES_END',  'NAKED_STRING',
-  'OTHER',         'NEWLINE',       'COMMENTSTART',  'error',
-  'start',         'global_vars',   'sections',      'var_list',
-  'section',       'newline',       'var',           'value',
-    );
-
-    static public $yyRuleName = array(
- /*   0 */ "start ::= global_vars sections",
- /*   1 */ "global_vars ::= var_list",
- /*   2 */ "sections ::= sections section",
- /*   3 */ "sections ::=",
- /*   4 */ "section ::= OPENB SECTION CLOSEB newline var_list",
- /*   5 */ "section ::= OPENB DOT SECTION CLOSEB newline var_list",
- /*   6 */ "var_list ::= var_list newline",
- /*   7 */ "var_list ::= var_list var",
- /*   8 */ "var_list ::=",
- /*   9 */ "var ::= ID EQUAL value",
- /*  10 */ "value ::= FLOAT",
- /*  11 */ "value ::= INT",
- /*  12 */ "value ::= BOOL",
- /*  13 */ "value ::= SINGLE_QUOTED_STRING",
- /*  14 */ "value ::= DOUBLE_QUOTED_STRING",
- /*  15 */ "value ::= TRIPPLE_QUOTES TRIPPLE_TEXT TRIPPLE_QUOTES_END",
- /*  16 */ "value ::= TRIPPLE_QUOTES TRIPPLE_QUOTES_END",
- /*  17 */ "value ::= NAKED_STRING",
- /*  18 */ "value ::= OTHER",
- /*  19 */ "newline ::= NEWLINE",
- /*  20 */ "newline ::= COMMENTSTART NEWLINE",
- /*  21 */ "newline ::= COMMENTSTART NAKED_STRING NEWLINE",
-    );
-
-    function tokenName($tokenType)
-    {
-        if ($tokenType === 0) {
-            return 'End of Input';
-        }
-        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[$tokenType];
-        } else {
-            return "Unknown";
-        }
-    }
-
-    static function yy_destructor($yymajor, $yypminor)
-    {
-        switch ($yymajor) {
-            default:  break;   /* If no destructor action specified: do nothing */
-        }
-    }
-
-    function yy_pop_parser_stack()
-    {
-        if (!count($this->yystack)) {
-            return;
-        }
-        $yytos = array_pop($this->yystack);
-        if (self::$yyTraceFILE && $this->yyidx >= 0) {
-            fwrite(self::$yyTraceFILE,
-                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                    "\n");
-        }
-        $yymajor = $yytos->major;
-        self::yy_destructor($yymajor, $yytos->minor);
-        $this->yyidx--;
-        return $yymajor;
-    }
-
-    function __destruct()
-    {
-        while ($this->yystack !== Array()) {
-            $this->yy_pop_parser_stack();
-        }
-        if (is_resource(self::$yyTraceFILE)) {
-            fclose(self::$yyTraceFILE);
-        }
-    }
-
-    function yy_get_expected_tokens($token)
-    {
-        $state = $this->yystack[$this->yyidx]->stateno;
-        $expected = self::$yyExpectedTokens[$state];
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return $expected;
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done++ == 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return array_unique($expected);
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate])) {
-		        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                            if (in_array($token,
-                                  self::$yyExpectedTokens[$nextstate], true)) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return array_unique($expected);
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx++;
-                        $x = new TPC_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-                        $this->yystack[$this->yyidx] = $x;
-                        continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return array_unique($expected);
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return $expected;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-	$this->yyidx = $yyidx;
-	$this->yystack = $stack;
-        return array_unique($expected);
-    }
-
-    function yy_is_expected_token($token)
-    {
-        if ($token === 0) {
-            return true; // 0 is not part of this
-        }
-        $state = $this->yystack[$this->yyidx]->stateno;
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return true;
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done++ == 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return true;
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        return true;
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx++;
-                        $x = new TPC_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-                        $this->yystack[$this->yyidx] = $x;
-                        continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        if (!$token) {
-                            // end of input: this is valid
-                            return true;
-                        }
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return false;
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return true;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
-        return true;
-    }
-
-   function yy_find_shift_action($iLookAhead)
-    {
-        $stateno = $this->yystack[$this->yyidx]->stateno;
-
-        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[$stateno])) {
-            // no shift actions
-            return self::$yy_default[$stateno];
-        }
-        $i = self::$yy_shift_ofst[$stateno];
-        if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[$stateno];
-        }
-        if ($iLookAhead == self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
-                if (self::$yyTraceFILE) {
-                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
-                        $this->yyTokenName[$iLookAhead] . " => " .
-                        $this->yyTokenName[$iFallback] . "\n");
-                }
-                return $this->yy_find_shift_action($iFallback);
-            }
-            return self::$yy_default[$stateno];
-        } else {
-            return self::$yy_action[$i];
-        }
-    }
-
-    function yy_find_reduce_action($stateno, $iLookAhead)
-    {
-        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
-        if (!isset(self::$yy_reduce_ofst[$stateno])) {
-            return self::$yy_default[$stateno];
-        }
-        $i = self::$yy_reduce_ofst[$stateno];
-        if ($i == self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[$stateno];
-        }
-        if ($iLookAhead == self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            return self::$yy_default[$stateno];
-        } else {
-            return self::$yy_action[$i];
-        }
-    }
-
-    function yy_shift($yyNewState, $yyMajor, $yypMinor)
-    {
-        $this->yyidx++;
-        if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx--;
-            if (self::$yyTraceFILE) {
-                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
-            }
-            while ($this->yyidx >= 0) {
-                $this->yy_pop_parser_stack();
-            }
-#line 125 "smarty_internal_configfileparser.y"
-
-    $this->internalError = true;
-    $this->compiler->trigger_config_file_error("Stack overflow in configfile parser");
-#line 593 "smarty_internal_configfileparser.php"
-            return;
-        }
-        $yytos = new TPC_yyStackEntry;
-        $yytos->stateno = $yyNewState;
-        $yytos->major = $yyMajor;
-        $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
-        if (self::$yyTraceFILE && $this->yyidx > 0) {
-            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
-                $yyNewState);
-            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
-            for($i = 1; $i <= $this->yyidx; $i++) {
-                fprintf(self::$yyTraceFILE, " %s",
-                    $this->yyTokenName[$this->yystack[$i]->major]);
-            }
-            fwrite(self::$yyTraceFILE,"\n");
-        }
-    }
-
-    static public $yyRuleInfo = array(
-  array( 'lhs' => 20, 'rhs' => 2 ),
-  array( 'lhs' => 21, 'rhs' => 1 ),
-  array( 'lhs' => 22, 'rhs' => 2 ),
-  array( 'lhs' => 22, 'rhs' => 0 ),
-  array( 'lhs' => 24, 'rhs' => 5 ),
-  array( 'lhs' => 24, 'rhs' => 6 ),
-  array( 'lhs' => 23, 'rhs' => 2 ),
-  array( 'lhs' => 23, 'rhs' => 2 ),
-  array( 'lhs' => 23, 'rhs' => 0 ),
-  array( 'lhs' => 26, 'rhs' => 3 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 3 ),
-  array( 'lhs' => 27, 'rhs' => 2 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 27, 'rhs' => 1 ),
-  array( 'lhs' => 25, 'rhs' => 1 ),
-  array( 'lhs' => 25, 'rhs' => 2 ),
-  array( 'lhs' => 25, 'rhs' => 3 ),
-    );
-
-    static public $yyReduceMap = array(
-        0 => 0,
-        2 => 0,
-        3 => 0,
-        19 => 0,
-        20 => 0,
-        21 => 0,
-        1 => 1,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-        8 => 8,
-        9 => 9,
-        10 => 10,
-        11 => 11,
-        12 => 12,
-        13 => 13,
-        14 => 14,
-        15 => 15,
-        16 => 16,
-        17 => 17,
-        18 => 17,
-    );
-#line 131 "smarty_internal_configfileparser.y"
-    function yy_r0(){
-    $this->_retvalue = null;
-    }
-#line 666 "smarty_internal_configfileparser.php"
-#line 136 "smarty_internal_configfileparser.y"
-    function yy_r1(){
-    $this->add_global_vars($this->yystack[$this->yyidx + 0]->minor); $this->_retvalue = null;
-    }
-#line 671 "smarty_internal_configfileparser.php"
-#line 149 "smarty_internal_configfileparser.y"
-    function yy_r4(){
-    $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
-    $this->_retvalue = null;
-    }
-#line 677 "smarty_internal_configfileparser.php"
-#line 154 "smarty_internal_configfileparser.y"
-    function yy_r5(){
-    if ($this->smarty->config_read_hidden) {
-        $this->add_section_vars($this->yystack[$this->yyidx + -3]->minor, $this->yystack[$this->yyidx + 0]->minor);
-    }
-    $this->_retvalue = null;
-    }
-#line 685 "smarty_internal_configfileparser.php"
-#line 162 "smarty_internal_configfileparser.y"
-    function yy_r6(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    }
-#line 690 "smarty_internal_configfileparser.php"
-#line 166 "smarty_internal_configfileparser.y"
-    function yy_r7(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor, Array($this->yystack[$this->yyidx + 0]->minor));
-    }
-#line 695 "smarty_internal_configfileparser.php"
-#line 170 "smarty_internal_configfileparser.y"
-    function yy_r8(){
-    $this->_retvalue = Array();
-    }
-#line 700 "smarty_internal_configfileparser.php"
-#line 176 "smarty_internal_configfileparser.y"
-    function yy_r9(){
-    $this->_retvalue = Array("key" => $this->yystack[$this->yyidx + -2]->minor, "value" => $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 705 "smarty_internal_configfileparser.php"
-#line 181 "smarty_internal_configfileparser.y"
-    function yy_r10(){
-    $this->_retvalue = (float) $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 710 "smarty_internal_configfileparser.php"
-#line 185 "smarty_internal_configfileparser.y"
-    function yy_r11(){
-    $this->_retvalue = (int) $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 715 "smarty_internal_configfileparser.php"
-#line 189 "smarty_internal_configfileparser.y"
-    function yy_r12(){
-    $this->_retvalue = $this->parse_bool($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 720 "smarty_internal_configfileparser.php"
-#line 193 "smarty_internal_configfileparser.y"
-    function yy_r13(){
-    $this->_retvalue = self::parse_single_quoted_string($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 725 "smarty_internal_configfileparser.php"
-#line 197 "smarty_internal_configfileparser.y"
-    function yy_r14(){
-    $this->_retvalue = self::parse_double_quoted_string($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 730 "smarty_internal_configfileparser.php"
-#line 201 "smarty_internal_configfileparser.y"
-    function yy_r15(){
-    $this->_retvalue = self::parse_tripple_double_quoted_string($this->yystack[$this->yyidx + -1]->minor);
-    }
-#line 735 "smarty_internal_configfileparser.php"
-#line 205 "smarty_internal_configfileparser.y"
-    function yy_r16(){
-    $this->_retvalue = '';
-    }
-#line 740 "smarty_internal_configfileparser.php"
-#line 209 "smarty_internal_configfileparser.y"
-    function yy_r17(){
-    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 745 "smarty_internal_configfileparser.php"
-
-    private $_retvalue;
-
-    function yy_reduce($yyruleno)
-    {
-        $yymsp = $this->yystack[$this->yyidx];
-        if (self::$yyTraceFILE && $yyruleno >= 0
-              && $yyruleno < count(self::$yyRuleName)) {
-            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
-                self::$yyTracePrompt, $yyruleno,
-                self::$yyRuleName[$yyruleno]);
-        }
-
-        $this->_retvalue = $yy_lefthand_side = null;
-        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
-            // call the action
-            $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
-            $yy_lefthand_side = $this->_retvalue;
-        }
-        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
-        $this->yyidx -= $yysize;
-        for($i = $yysize; $i; $i--) {
-            // pop all of the right-hand side parameters
-            array_pop($this->yystack);
-        }
-        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
-        if ($yyact < self::YYNSTATE) {
-            if (!self::$yyTraceFILE && $yysize) {
-                $this->yyidx++;
-                $x = new TPC_yyStackEntry;
-                $x->stateno = $yyact;
-                $x->major = $yygoto;
-                $x->minor = $yy_lefthand_side;
-                $this->yystack[$this->yyidx] = $x;
-            } else {
-                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
-            }
-        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
-            $this->yy_accept();
-        }
-    }
-
-    function yy_parse_failed()
-    {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-    }
-
-    function yy_syntax_error($yymajor, $TOKEN)
-    {
-#line 118 "smarty_internal_configfileparser.y"
-
-    $this->internalError = true;
-    $this->yymajor = $yymajor;
-    $this->compiler->trigger_config_file_error();
-#line 808 "smarty_internal_configfileparser.php"
-    }
-
-    function yy_accept()
-    {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $stack = $this->yy_pop_parser_stack();
-        }
-#line 110 "smarty_internal_configfileparser.y"
-
-    $this->successful = !$this->internalError;
-    $this->internalError = false;
-    $this->retvalue = $this->_retvalue;
-    //echo $this->retvalue."\n\n";
-#line 826 "smarty_internal_configfileparser.php"
-    }
-
-    function doParse($yymajor, $yytokenvalue)
-    {
-        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
-
-        if ($this->yyidx === null || $this->yyidx < 0) {
-            $this->yyidx = 0;
-            $this->yyerrcnt = -1;
-            $x = new TPC_yyStackEntry;
-            $x->stateno = 0;
-            $x->major = 0;
-            $this->yystack = array();
-            array_push($this->yystack, $x);
-        }
-        $yyendofinput = ($yymajor==0);
-
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sInput %s\n",
-                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
-        }
-
-        do {
-            $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL &&
-                  !$this->yy_is_expected_token($yymajor)) {
-                // force a syntax error
-                $yyact = self::YY_ERROR_ACTION;
-            }
-            if ($yyact < self::YYNSTATE) {
-                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
-                $this->yyerrcnt--;
-                if ($yyendofinput && $this->yyidx >= 0) {
-                    $yymajor = 0;
-                } else {
-                    $yymajor = self::YYNOCODE;
-                }
-            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
-                $this->yy_reduce($yyact - self::YYNSTATE);
-            } elseif ($yyact == self::YY_ERROR_ACTION) {
-                if (self::$yyTraceFILE) {
-                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
-                        self::$yyTracePrompt);
-                }
-                if (self::YYERRORSYMBOL) {
-                    if ($this->yyerrcnt < 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $yymx = $this->yystack[$this->yyidx]->major;
-                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
-                        if (self::$yyTraceFILE) {
-                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
-                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
-                        }
-                        $this->yy_destructor($yymajor, $yytokenvalue);
-                        $yymajor = self::YYNOCODE;
-                    } else {
-                        while ($this->yyidx >= 0 &&
-                                 $yymx != self::YYERRORSYMBOL &&
-        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                              ){
-                            $this->yy_pop_parser_stack();
-                        }
-                        if ($this->yyidx < 0 || $yymajor==0) {
-                            $this->yy_destructor($yymajor, $yytokenvalue);
-                            $this->yy_parse_failed();
-                            $yymajor = self::YYNOCODE;
-                        } elseif ($yymx != self::YYERRORSYMBOL) {
-                            $u2 = 0;
-                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
-                        }
-                    }
-                    $this->yyerrcnt = 3;
-                    $yyerrorhit = 1;
-                } else {
-                    if ($this->yyerrcnt <= 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $this->yyerrcnt = 3;
-                    $this->yy_destructor($yymajor, $yytokenvalue);
-                    if ($yyendofinput) {
-                        $this->yy_parse_failed();
-                    }
-                    $yymajor = self::YYNOCODE;
-                }
-            } else {
-                $this->yy_accept();
-                $yymajor = self::YYNOCODE;
-            }
-        } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
-    }
-}
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_data.php b/resources/libs/smarty/sysplugins/smarty_internal_data.php
deleted file mode 100644
index 5baf3b76d..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_data.php
+++ /dev/null
@@ -1,551 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Data
- *
- * This file contains the basic classes and methodes for template and variable creation
- *
- * @package Smarty
- * @subpackage Template
- * @author Uwe Tews
- */
-
-/**
- * Base class with template and variable methodes
- *
- * @package Smarty
- * @subpackage Template
- */
-class Smarty_Internal_Data {
-
-    /**
-     * name of class used for templates
-     *
-     * @var string
-     */
-    public $template_class = 'Smarty_Internal_Template';
-    /**
-     * template variables
-     *
-     * @var array
-     */
-    public $tpl_vars = array();
-    /**
-     * parent template (if any)
-     *
-     * @var Smarty_Internal_Template
-     */
-    public $parent = null;
-    /**
-     * configuration settings
-     *
-     * @var array
-     */
-    public $config_vars = array();
-
-    /**
-     * assigns a Smarty variable
-     *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed        $value   the value to assign
-     * @param boolean      $nocache if true any output of this variable will be not cached
-     * @param boolean $scope the scope the variable will have  (local,parent or root)
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function assign($tpl_var, $value = null, $nocache = false)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $_key => $_val) {
-                if ($_key != '') {
-                    $this->tpl_vars[$_key] = new Smarty_variable($_val, $nocache);
-                }
-            }
-        } else {
-            if ($tpl_var != '') {
-                $this->tpl_vars[$tpl_var] = new Smarty_variable($value, $nocache);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * assigns a global Smarty variable
-     *
-     * @param string $varname the global variable name
-     * @param mixed  $value   the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function assignGlobal($varname, $value = null, $nocache = false)
-    {
-        if ($varname != '') {
-            Smarty::$global_tpl_vars[$varname] = new Smarty_variable($value, $nocache);
-        }
-
-        return $this;
-    }
-    /**
-     * assigns values to template variables by reference
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed $ &$value the referenced value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function assignByRef($tpl_var, &$value, $nocache = false)
-    {
-        if ($tpl_var != '') {
-            $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-            $this->tpl_vars[$tpl_var]->value = &$value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * appends values to template variables
-     *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed        $value   the value to append
-     * @param boolean      $merge   flag if array elements shall be merged
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function append($tpl_var, $value = null, $merge = false, $nocache = false)
-    {
-        if (is_array($tpl_var)) {
-            // $tpl_var is an array, ignore $value
-            foreach ($tpl_var as $_key => $_val) {
-                if ($_key != '') {
-                    if (!isset($this->tpl_vars[$_key])) {
-                        $tpl_var_inst = $this->getVariable($_key, null, true, false);
-                        if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-                            $this->tpl_vars[$_key] = new Smarty_variable(null, $nocache);
-                        } else {
-                            $this->tpl_vars[$_key] = clone $tpl_var_inst;
-                        }
-                    }
-                    if (!(is_array($this->tpl_vars[$_key]->value) || $this->tpl_vars[$_key]->value instanceof ArrayAccess)) {
-                        settype($this->tpl_vars[$_key]->value, 'array');
-                    }
-                    if ($merge && is_array($_val)) {
-                        foreach($_val as $_mkey => $_mval) {
-                            $this->tpl_vars[$_key]->value[$_mkey] = $_mval;
-                        }
-                    } else {
-                        $this->tpl_vars[$_key]->value[] = $_val;
-                    }
-                }
-            }
-        } else {
-            if ($tpl_var != '' && isset($value)) {
-                if (!isset($this->tpl_vars[$tpl_var])) {
-                    $tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
-                    if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
-                        $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache);
-                    } else {
-                        $this->tpl_vars[$tpl_var] = clone $tpl_var_inst;
-                    }
-                }
-                if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-                    settype($this->tpl_vars[$tpl_var]->value, 'array');
-                }
-                if ($merge && is_array($value)) {
-                    foreach($value as $_mkey => $_mval) {
-                        $this->tpl_vars[$tpl_var]->value[$_mkey] = $_mval;
-                    }
-                } else {
-                    $this->tpl_vars[$tpl_var]->value[] = $value;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * appends values to template variables by reference
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed  &$value  the referenced value to append
-     * @param boolean $merge  flag if array elements shall be merged
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function appendByRef($tpl_var, &$value, $merge = false)
-    {
-        if ($tpl_var != '' && isset($value)) {
-            if (!isset($this->tpl_vars[$tpl_var])) {
-                $this->tpl_vars[$tpl_var] = new Smarty_variable();
-            }
-            if (!is_array($this->tpl_vars[$tpl_var]->value)) {
-                settype($this->tpl_vars[$tpl_var]->value, 'array');
-            }
-            if ($merge && is_array($value)) {
-                foreach($value as $_key => $_val) {
-                    $this->tpl_vars[$tpl_var]->value[$_key] = &$value[$_key];
-                }
-            } else {
-                $this->tpl_vars[$tpl_var]->value[] = &$value;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns a single or all template variables
-     *
-     * @param string  $varname        variable name or null
-     * @param string  $_ptr           optional pointer to data object
-     * @param boolean $search_parents include parent templates?
-     * @return string variable value or or array of variables
-     */
-    public function getTemplateVars($varname = null, $_ptr = null, $search_parents = true)
-    {
-        if (isset($varname)) {
-            $_var = $this->getVariable($varname, $_ptr, $search_parents, false);
-            if (is_object($_var)) {
-                return $_var->value;
-            } else {
-                return null;
-            }
-        } else {
-            $_result = array();
-            if ($_ptr === null) {
-                $_ptr = $this;
-            } while ($_ptr !== null) {
-                foreach ($_ptr->tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                }
-                // not found, try at parent
-                if ($search_parents) {
-                    $_ptr = $_ptr->parent;
-                } else {
-                    $_ptr = null;
-                }
-            }
-            if ($search_parents && isset(Smarty::$global_tpl_vars)) {
-                foreach (Smarty::$global_tpl_vars AS $key => $var) {
-                    if (!array_key_exists($key, $_result)) {
-                        $_result[$key] = $var->value;
-                    }
-                }
-            }
-            return $_result;
-        }
-    }
-
-    /**
-     * clear the given assigned template variable.
-     *
-     * @param string|array $tpl_var the template variable(s) to clear
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function clearAssign($tpl_var)
-    {
-        if (is_array($tpl_var)) {
-            foreach ($tpl_var as $curr_var) {
-                unset($this->tpl_vars[$curr_var]);
-            }
-        } else {
-            unset($this->tpl_vars[$tpl_var]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * clear all the assigned template variables.
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function clearAllAssign()
-    {
-        $this->tpl_vars = array();
-        return $this;
-    }
-
-    /**
-     * load a config file, optionally load just selected sections
-     *
-     * @param string $config_file filename
-     * @param mixed  $sections    array of section names, single section or null
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function configLoad($config_file, $sections = null)
-    {
-        // load Config class
-        $config = new Smarty_Internal_Config($config_file, $this->smarty, $this);
-        $config->loadConfigVars($sections);
-        return $this;
-    }
-
-    /**
-     * gets the object of a Smarty variable
-     *
-     * @param string  $variable the name of the Smarty variable
-     * @param object  $_ptr     optional pointer to data object
-     * @param boolean $search_parents search also in parent data
-     * @return object the object of the variable
-     */
-    public function getVariable($variable, $_ptr = null, $search_parents = true, $error_enable = true)
-    {
-        if ($_ptr === null) {
-            $_ptr = $this;
-        } while ($_ptr !== null) {
-            if (isset($_ptr->tpl_vars[$variable])) {
-                // found it, return it
-                return $_ptr->tpl_vars[$variable];
-            }
-            // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset(Smarty::$global_tpl_vars[$variable])) {
-            // found it, return it
-            return Smarty::$global_tpl_vars[$variable];
-        }
-        if ($this->smarty->error_unassigned && $error_enable) {
-            // force a notice
-            $x = $$variable;
-        }
-        return new Undefined_Smarty_Variable;
-    }
-
-    /**
-     * gets  a config variable
-     *
-     * @param string $variable the name of the config variable
-     * @return mixed the value of the config variable
-     */
-    public function getConfigVariable($variable, $error_enable = true)
-    {
-        $_ptr = $this;
-        while ($_ptr !== null) {
-            if (isset($_ptr->config_vars[$variable])) {
-                // found it, return it
-                return $_ptr->config_vars[$variable];
-            }
-            // not found, try at parent
-            $_ptr = $_ptr->parent;
-        }
-        if ($this->smarty->error_unassigned && $error_enable) {
-            // force a notice
-            $x = $$variable;
-        }
-        return null;
-    }
-
-    /**
-     * gets  a stream variable
-     *
-     * @param string $variable the stream of the variable
-     * @return mixed the value of the stream variable
-     */
-    public function getStreamVariable($variable)
-    {
-        $_result = '';
-        $fp = fopen($variable, 'r+');
-        if ($fp) {
-            while (!feof($fp) && ($current_line = fgets($fp)) !== false ) {
-                $_result .= $current_line;
-            }
-            fclose($fp);
-            return $_result;
-        }
-
-        if ($this->smarty->error_unassigned) {
-            throw new SmartyException('Undefined stream variable "' . $variable . '"');
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns a single or all config variables
-     *
-     * @param string $varname variable name or null
-     * @return string variable value or or array of variables
-     */
-    public function getConfigVars($varname = null, $search_parents = true)
-    {
-        $_ptr = $this;
-        $var_array = array();
-        while ($_ptr !== null) {
-            if (isset($varname)) {
-                if (isset($_ptr->config_vars[$varname])) {
-                    return $_ptr->config_vars[$varname];
-                }
-            } else {
-                $var_array = array_merge($_ptr->config_vars, $var_array);
-            }
-             // not found, try at parent
-            if ($search_parents) {
-                $_ptr = $_ptr->parent;
-            } else {
-                $_ptr = null;
-            }
-        }
-        if (isset($varname)) {
-            return '';
-        } else {
-            return $var_array;
-        }
-    }
-
-    /**
-     * Deassigns a single or all config variables
-     *
-     * @param string $varname variable name or null
-     * @return Smarty_Internal_Data current Smarty_Internal_Data (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function clearConfig($varname = null)
-    {
-        if (isset($varname)) {
-            unset($this->config_vars[$varname]);
-        } else {
-            $this->config_vars = array();
-        }
-        return $this;
-    }
-
-}
-
-/**
- * class for the Smarty data object
- *
- * The Smarty data object will hold Smarty variables in the current scope
- *
- * @package Smarty
- * @subpackage Template
- */
-class Smarty_Data extends Smarty_Internal_Data {
-
-    /**
-     * Smarty object
-     *
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * create Smarty data object
-     *
-     * @param Smarty|array $_parent  parent template
-     * @param Smarty       $smarty   global smarty instance
-     */
-    public function __construct ($_parent = null, $smarty = null)
-    {
-        $this->smarty = $smarty;
-        if (is_object($_parent)) {
-            // when object set up back pointer
-            $this->parent = $_parent;
-        } elseif (is_array($_parent)) {
-            // set up variable values
-            foreach ($_parent as $_key => $_val) {
-                $this->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        } elseif ($_parent != null) {
-            throw new SmartyException("Wrong type for template variables");
-        }
-    }
-
-}
-
-/**
- * class for the Smarty variable object
- *
- * This class defines the Smarty variable object
- *
- * @package Smarty
- * @subpackage Template
- */
-class Smarty_Variable {
-
-    /**
-     * template variable
-     *
-     * @var mixed
-     */
-    public $value = null;
-    /**
-     * if true any output of this variable will be not cached
-     *
-     * @var boolean
-     */
-    public $nocache = false;
-    /**
-     * the scope the variable will have  (local,parent or root)
-     *
-     * @var int
-     */
-    public $scope = Smarty::SCOPE_LOCAL;
-
-    /**
-     * create Smarty variable object
-     *
-     * @param mixed   $value   the value to assign
-     * @param boolean $nocache if true any output of this variable will be not cached
-     * @param int     $scope   the scope the variable will have  (local,parent or root)
-     */
-    public function __construct($value = null, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-    {
-        $this->value = $value;
-        $this->nocache = $nocache;
-        $this->scope = $scope;
-    }
-
-    /**
-     * <<magic>> String conversion
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->value;
-    }
-
-}
-
-/**
- * class for undefined variable object
- *
- * This class defines an object for undefined variable handling
- *
- * @package Smarty
- * @subpackage Template
- */
-class Undefined_Smarty_Variable {
-
-    /**
-     * Returns FALSE for 'nocache' and NULL otherwise.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function __get($name)
-    {
-        if ($name == 'nocache') {
-            return false;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Always returns an empty string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return "";
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_debug.php b/resources/libs/smarty/sysplugins/smarty_internal_debug.php
deleted file mode 100644
index 2aea13f30..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_debug.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Debug
- *
- * Class to collect data for the Smarty Debugging Consol
- *
- * @package Smarty
- * @subpackage Debug
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Debug Class
- *
- * @package Smarty
- * @subpackage Debug
- */
-class Smarty_Internal_Debug extends Smarty_Internal_Data {
-
-    /**
-     * template data
-     *
-     * @var array
-     */
-    public static $template_data = array();
-
-    /**
-     * Start logging of compile time
-     *
-     * @param object $template
-     */
-    public static function start_compile($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
-    }
-
-    /**
-     * End logging of compile time
-     *
-     * @param object $template
-     */
-    public static function end_compile($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['compile_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-    }
-
-    /**
-     * Start logging of render time
-     *
-     * @param object $template
-     */
-    public static function start_render($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
-    }
-
-    /**
-     * End logging of compile time
-     *
-     * @param object $template
-     */
-    public static function end_render($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['render_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-    }
-
-    /**
-     * Start logging of cache time
-     *
-     * @param object $template cached template
-     */
-    public static function start_cache($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['start_time'] = microtime(true);
-    }
-
-    /**
-     * End logging of cache time
-     *
-     * @param object $template cached template
-     */
-    public static function end_cache($template)
-    {
-        $key = self::get_key($template);
-        self::$template_data[$key]['cache_time'] += microtime(true) - self::$template_data[$key]['start_time'];
-    }
-
-    /**
-     * Opens a window for the Smarty Debugging Consol and display the data
-     *
-     * @param Smarty_Internal_Template|Smarty $obj object to debug
-     */
-    public static function display_debug($obj)
-    {
-        // prepare information of assigned variables
-        $ptr = self::get_debug_vars($obj);
-        if ($obj instanceof Smarty) {
-            $smarty = clone $obj;
-        } else {
-            $smarty = clone $obj->smarty;
-        }
-        $_assigned_vars = $ptr->tpl_vars;
-        ksort($_assigned_vars);
-        $_config_vars = $ptr->config_vars;
-        ksort($_config_vars);
-        $smarty->registered_filters = array();
-        $smarty->autoload_filters = array();
-        $smarty->default_modifiers = array();
-        $smarty->force_compile = false;
-        $smarty->left_delimiter = '{';
-        $smarty->right_delimiter = '}';
-        $smarty->debugging = false;
-        $smarty->force_compile = false;
-        $_template = new Smarty_Internal_Template($smarty->debug_tpl, $smarty);
-        $_template->caching = false;
-        $_template->disableSecurity();
-        $_template->cache_id = null;
-        $_template->compile_id = null;
-        if ($obj instanceof Smarty_Internal_Template) {
-            $_template->assign('template_name', $obj->source->type . ':' . $obj->source->name);
-        }
-        if ($obj instanceof Smarty) {
-            $_template->assign('template_data', self::$template_data);
-        } else {
-            $_template->assign('template_data', null);
-        }
-        $_template->assign('assigned_vars', $_assigned_vars);
-        $_template->assign('config_vars', $_config_vars);
-        $_template->assign('execution_time', microtime(true) - $smarty->start_time);
-        echo $_template->fetch();
-    }
-
-    /**
-     * Recursively gets variables from all template/data scopes
-     *
-     * @param Smarty_Internal_Template|Smarty_Data $obj object to debug
-     * @return StdClass
-     */
-    public static function get_debug_vars($obj)
-    {
-        $config_vars = $obj->config_vars;
-        $tpl_vars = array();
-        foreach ($obj->tpl_vars as $key => $var) {
-            $tpl_vars[$key] = clone $var;
-            if ($obj instanceof Smarty_Internal_Template) {
-                $tpl_vars[$key]->scope = $obj->source->type . ':' . $obj->source->name;
-            } elseif ($obj instanceof Smarty_Data) {
-                $tpl_vars[$key]->scope = 'Data object';
-            } else {
-                $tpl_vars[$key]->scope = 'Smarty root';
-            }
-        }
-
-        if (isset($obj->parent)) {
-            $parent = self::get_debug_vars($obj->parent);
-            $tpl_vars = array_merge($parent->tpl_vars, $tpl_vars);
-            $config_vars = array_merge($parent->config_vars, $config_vars);
-        } else {
-            foreach (Smarty::$global_tpl_vars as $name => $var) {
-                if (!array_key_exists($name, $tpl_vars)) {
-                    $clone = clone $var;
-                    $clone->scope = 'Global';
-                    $tpl_vars[$name] = $clone;
-                }
-            }
-        }
-        return (object) array('tpl_vars' => $tpl_vars, 'config_vars' => $config_vars);
-    }
-
-    /**
-     * Return key into $template_data for template
-     *
-     * @param object $template  template object
-     * @return string   key into $template_data
-     */
-    private static function get_key($template)
-    {
-        static $_is_stringy = array('string' => true, 'eval' => true);
-        // calculate Uid if not already done
-        if ($template->source->uid == '') {
-            $template->source->filepath;
-        }
-        $key = $template->source->uid;
-        if (isset(self::$template_data[$key])) {
-            return $key;
-        } else {
-            if (isset($_is_stringy[$template->source->type])) {
-                self::$template_data[$key]['name'] = '\''.substr($template->source->name,0,25).'...\'';
-            } else {
-                self::$template_data[$key]['name'] = $template->source->filepath;
-            }
-            self::$template_data[$key]['compile_time'] = 0;
-            self::$template_data[$key]['render_time'] = 0;
-            self::$template_data[$key]['cache_time'] = 0;
-            return $key;
-        }
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_filter_handler.php b/resources/libs/smarty/sysplugins/smarty_internal_filter_handler.php
deleted file mode 100644
index c9370e1ac..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_filter_handler.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Filter Handler
- *
- * Smarty filter handler class
- *
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Uwe Tews
- */
-
-/**
- * Class for filter processing
- *
- * @package Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Filter_Handler {
-
-    /**
-     * Run filters over content
-     *
-     * The filters will be lazy loaded if required
-     * class name format: Smarty_FilterType_FilterName
-     * plugin filename format: filtertype.filtername.php
-     * Smarty2 filter plugins could be used
-     *
-     * @param string                   $type     the type of filter ('pre','post','output') which shall run
-     * @param string                   $content  the content which shall be processed by the filters
-     * @param Smarty_Internal_Template $template template object
-     * @return string the filtered content
-     */
-    public static function runFilter($type, $content, Smarty_Internal_Template $template)
-    {
-        $output = $content;
-        // loop over autoload filters of specified type
-        if (!empty($template->smarty->autoload_filters[$type])) {
-            foreach ((array)$template->smarty->autoload_filters[$type] as $name) {
-                $plugin_name = "Smarty_{$type}filter_{$name}";
-                if ($template->smarty->loadPlugin($plugin_name)) {
-                    if (function_exists($plugin_name)) {
-                        // use loaded Smarty2 style plugin
-                        $output = $plugin_name($output, $template);
-                    } elseif (class_exists($plugin_name, false)) {
-                        // loaded class of filter plugin
-                        $output = call_user_func(array($plugin_name, 'execute'), $output, $template);
-                    }
-                } else {
-                    // nothing found, throw exception
-                    throw new SmartyException("Unable to load filter {$plugin_name}");
-                }
-            }
-        }
-        // loop over registerd filters of specified type
-        if (!empty($template->smarty->registered_filters[$type])) {
-            foreach ($template->smarty->registered_filters[$type] as $key => $name) {
-                if (is_array($template->smarty->registered_filters[$type][$key])) {
-                    $output = call_user_func($template->smarty->registered_filters[$type][$key], $output, $template);
-                } else {
-                    $output = $template->smarty->registered_filters[$type][$key]($output, $template);
-                }
-            }
-        }
-        // return filtered output
-        return $output;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_function_call_handler.php b/resources/libs/smarty/sysplugins/smarty_internal_function_call_handler.php
deleted file mode 100644
index 010d63592..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_function_call_handler.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Function Call Handler
- *
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Uwe Tews
- */
-
-/**
- * This class does call function defined with the {function} tag
- *
- * @package Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Function_Call_Handler {
-
-    /**
-     * This function handles calls to template functions defined by {function}
-     * It does create a PHP function at the first call
-     *
-     * @param string                   $_name       template function name
-     * @param Smarty_Internal_Template $_template   template object
-     * @param array                    $_params     Smarty variables passed as call parameter
-     * @param string                   $_hash       nocache hash value
-     * @param bool                     $_nocache    nocache flag
-     */
-    public static function call($_name, Smarty_Internal_Template $_template, $_params, $_hash, $_nocache)
-    {
-        if ($_nocache) {
-            $_function = "smarty_template_function_{$_name}_nocache";
-        } else {
-            $_function = "smarty_template_function_{$_hash}_{$_name}";
-        }
-        if (!is_callable($_function)) {
-            $_code = "function {$_function}(\$_smarty_tpl,\$params) {
-    \$saved_tpl_vars = \$_smarty_tpl->tpl_vars;
-    foreach (\$_smarty_tpl->smarty->template_functions['{$_name}']['parameter'] as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);};
-    foreach (\$params as \$key => \$value) {\$_smarty_tpl->tpl_vars[\$key] = new Smarty_variable(\$value);}?>";
-            if ($_nocache) {
-                $_code .= preg_replace(array("!<\?php echo \\'/\*%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/|/\*/%%SmartyNocache:{$_template->smarty->template_functions[$_name]['nocache_hash']}%%\*/\\';\?>!",
-                        "!\\\'!"), array('', "'"), $_template->smarty->template_functions[$_name]['compiled']);
-                $_template->smarty->template_functions[$_name]['called_nocache'] = true;
-            } else {
-                $_code .= preg_replace("/{$_template->smarty->template_functions[$_name]['nocache_hash']}/", $_template->properties['nocache_hash'], $_template->smarty->template_functions[$_name]['compiled']);
-            }
-            $_code .= "<?php \$_smarty_tpl->tpl_vars = \$saved_tpl_vars;}";
-            eval($_code);
-        }
-        $_function($_template, $_params);
-    }
-
-}
-
-?>
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_get_include_path.php b/resources/libs/smarty/sysplugins/smarty_internal_get_include_path.php
deleted file mode 100644
index 518c406aa..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_get_include_path.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Smarty read include path plugin
- *
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Monte Ohrt
- */
-
-/**
- * Smarty Internal Read Include Path Class
- *
- * @package Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Get_Include_Path {
-
-    /**
-     * Return full file path from PHP include_path
-     *
-     * @param string $filepath filepath
-     * @return string|boolean full filepath or false
-     */
-    public static function getIncludePath($filepath)
-    {
-        static $_include_path = null;
-        
-        if (function_exists('stream_resolve_include_path')) {
-            // available since PHP 5.3.2
-            return stream_resolve_include_path($filepath);
-        }
-
-        if ($_include_path === null) {
-            $_include_path = explode(PATH_SEPARATOR, get_include_path());
-        }
-
-        foreach ($_include_path as $_path) {
-            if (file_exists($_path . DS . $filepath)) {
-                return $_path . DS . $filepath;
-            }
-        }
-
-        return false;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_nocache_insert.php b/resources/libs/smarty/sysplugins/smarty_internal_nocache_insert.php
deleted file mode 100644
index faae49af6..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_nocache_insert.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Nocache Insert
- *
- * Compiles the {insert} tag into the cache file
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Smarty Internal Plugin Compile Insert Class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_Nocache_Insert {
-
-    /**
-     * Compiles code for the {insert} tag into cache file
-     *
-     * @param string                   $_function insert function name
-     * @param array                    $_attr     array with parameter
-     * @param Smarty_Internal_Template $_template template object
-     * @param string                   $_script   script name to load or 'null'
-     * @param string                   $_assign   optional variable name
-     * @return string compiled code
-     */
-    public static function compile($_function, $_attr, $_template, $_script, $_assign = null)
-    {
-        $_output = '<?php ';
-        if ($_script != 'null') {
-            // script which must be included
-            // code for script file loading
-            $_output .= "require_once '{$_script}';";
-        }
-        // call insert
-        if (isset($_assign)) {
-            $_output .= "\$_smarty_tpl->assign('{$_assign}' , {$_function} (" . var_export($_attr, true) . ",\$_smarty_tpl), true);?>";
-        } else {
-            $_output .= "echo {$_function}(" . var_export($_attr, true) . ",\$_smarty_tpl);?>";
-        }
-        $_tpl = $_template;
-        while ($_tpl->parent instanceof Smarty_Internal_Template) {
-            $_tpl = $_tpl->parent;
-        }
-        return "/*%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/" . $_output . "/*/%%SmartyNocache:{$_tpl->properties['nocache_hash']}%%*/";
-    }
-
-}
-
-?>
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_parsetree.php b/resources/libs/smarty/sysplugins/smarty_internal_parsetree.php
deleted file mode 100644
index c9fb1f762..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_parsetree.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Templateparser Parsetrees
- *
- * These are classes to build parsetrees in the template parser
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Thue Kristensen
- * @author Uwe Tews
- */
-
-/**
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-abstract class _smarty_parsetree {
-
-    /**
-     * Parser object
-     * @var object
-     */
-    public $parser;
-    /**
-     * Buffer content
-     * @var mixed
-     */
-    public $data;
-
-    /**
-     * Return buffer
-     *
-     * @return string  buffer content
-     */
-    abstract public function to_smarty_php();
-
-}
-
-/**
- * A complete smarty tag.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_tag extends _smarty_parsetree {
-
-    /**
-     * Saved block nesting level
-     * @var int
-     */
-    public $saved_block_nesting;
-
-    /**
-     * Create parse tree buffer for Smarty tag
-     *
-     * @param object $parser    parser object
-     * @param string $data      content
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-        $this->saved_block_nesting = $parser->block_nesting_level;
-    }
-
-    /**
-     * Return buffer content
-     *
-     * @return string  content
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Return complied code that loads the evaluated outout of buffer content into a temporary variable
-     *
-     * @return string template code
-     */
-    public function assign_to_var()
-    {
-        $var = sprintf('$_tmp%d', ++$this->parser->prefix_number);
-        $this->parser->compiler->prefix_code[] = sprintf('<?php ob_start();?>%s<?php %s=ob_get_clean();?>', $this->data, $var);
-        return $var;
-    }
-
-}
-
-/**
- * Code fragment inside a tag.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_code extends _smarty_parsetree {
-
-
-    /**
-     * Create parse tree buffer for code fragment
-     *
-     * @param object $parser    parser object
-     * @param string $data      content
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return buffer content in parentheses
-     *
-     * @return string  content
-     */
-    public function to_smarty_php()
-    {
-        return sprintf("(%s)", $this->data);
-    }
-
-}
-
-/**
- * Double quoted string inside a tag.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_doublequoted extends _smarty_parsetree {
-
-    /**
-     * Create parse tree buffer for double quoted string subtrees
-     *
-     * @param object $parser    parser object
-     * @param _smarty_parsetree $subtree    parsetree buffer
-     */
-    public function __construct($parser, _smarty_parsetree $subtree)
-    {
-        $this->parser = $parser;
-        $this->subtrees[] = $subtree;
-        if ($subtree instanceof _smarty_tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        }
-    }
-
-    /**
-     * Append buffer to subtree
-     *
-     * @param _smarty_parsetree $subtree  parsetree buffer
-     */
-    public function append_subtree(_smarty_parsetree $subtree)
-    {
-        $last_subtree = count($this->subtrees) - 1;
-        if ($last_subtree >= 0 && $this->subtrees[$last_subtree] instanceof _smarty_tag && $this->subtrees[$last_subtree]->saved_block_nesting < $this->parser->block_nesting_level) {
-            if ($subtree instanceof _smarty_code) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo ' . $subtree->data . ';?>';
-            } elseif ($subtree instanceof _smarty_dq_content) {
-                $this->subtrees[$last_subtree]->data .= '<?php echo "' . $subtree->data . '";?>';
-            } else {
-                $this->subtrees[$last_subtree]->data .= $subtree->data;
-            }
-        } else {
-            $this->subtrees[] = $subtree;
-        }
-        if ($subtree instanceof _smarty_tag) {
-            $this->parser->block_nesting_level = count($this->parser->compiler->_tag_stack);
-        }
-    }
-
-    /**
-     * Merge subtree buffer content together
-     *
-     * @return string  compiled template code
-     */
-    public function to_smarty_php()
-    {
-        $code = '';
-        foreach ($this->subtrees as $subtree) {
-            if ($code !== "") {
-                $code .= ".";
-            }
-            if ($subtree instanceof _smarty_tag) {
-                $more_php = $subtree->assign_to_var();
-            } else {
-                $more_php = $subtree->to_smarty_php();
-            }
-
-            $code .= $more_php;
-
-            if (!$subtree instanceof _smarty_dq_content) {
-                $this->parser->compiler->has_variable_string = true;
-            }
-        }
-        return $code;
-    }
-
-}
-
-/**
- * Raw chars as part of a double quoted string.
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_dq_content extends _smarty_parsetree {
-
-
-    /**
-     * Create parse tree buffer with string content
-     *
-     * @param object $parser  parser object
-     * @param string $data    string section
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return content as double quoted string
-     *
-     * @return string doubled quoted string
-     */
-    public function to_smarty_php()
-    {
-        return '"' . $this->data . '"';
-    }
-
-}
-
-/**
- * Template element
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_template_buffer extends _smarty_parsetree {
-
-    /**
-     * Array of template elements
-     *
-     * @var array
-     */
-    public $subtrees = Array();
-
-    /**
-     * Create root of parse tree for template elements
-     *
-     * @param object $parser    parse object
-     */
-    public function __construct($parser)
-    {
-        $this->parser = $parser;
-    }
-
-    /**
-     * Append buffer to subtree
-     *
-     * @param _smarty_parsetree $subtree
-     */
-    public function append_subtree(_smarty_parsetree $subtree)
-    {
-        $this->subtrees[] = $subtree;
-    }
-
-    /**
-     * Sanitize and merge subtree buffers together
-     *
-     * @return string template code content
-     */
-    public function to_smarty_php()
-    {
-        $code = '';
-        for ($key = 0, $cnt = count($this->subtrees); $key < $cnt; $key++) {
-            if ($key + 2 < $cnt) {
-                if ($this->subtrees[$key] instanceof _smarty_linebreak && $this->subtrees[$key + 1] instanceof _smarty_tag && $this->subtrees[$key + 1]->data == '' && $this->subtrees[$key + 2] instanceof _smarty_linebreak) {
-                    $key = $key + 1;
-                    continue;
-                }
-                if (substr($this->subtrees[$key]->data, -1) == '<' && $this->subtrees[$key + 1]->data == '' && substr($this->subtrees[$key + 2]->data, -1) == '?') {
-                    $key = $key + 2;
-                    continue;
-                }
-            }
-            if (substr($code, -1) == '<') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '?') {
-                    $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>?' . substr($subtree, 1);
-                } elseif ($this->parser->asp_tags && substr($subtree, 0, 1) == '%') {
-                    $code = substr($code, 0, strlen($code) - 1) . '<<?php ?>%' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
-                continue;
-            }
-            if ($this->parser->asp_tags && substr($code, -1) == '%') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '>') {
-                    $code = substr($code, 0, strlen($code) - 1) . '%<?php ?>>' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
-                continue;
-            }
-            if (substr($code, -1) == '?') {
-                $subtree = $this->subtrees[$key]->to_smarty_php();
-                if (substr($subtree, 0, 1) == '>') {
-                    $code = substr($code, 0, strlen($code) - 1) . '?<?php ?>>' . substr($subtree, 1);
-                } else {
-                    $code .= $subtree;
-                }
-                continue;
-            }
-            $code .= $this->subtrees[$key]->to_smarty_php();
-        }
-        return $code;
-    }
-
-}
-
-/**
- * template text
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_text extends _smarty_parsetree {
-
-
-    /**
-     * Create template text buffer
-     *
-     * @param object $parser    parser object
-     * @param string $data      text
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return buffer content
-     *
-     * @return strint text
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-
-}
-
-/**
- * template linebreaks
- *
- * @package Smarty
- * @subpackage Compiler
- * @ignore
- */
-class _smarty_linebreak extends _smarty_parsetree {
-
-    /**
-     * Create buffer with linebreak content
-     *
-     * @param object $parser    parser object
-     * @param string  $data     linebreak string
-     */
-    public function __construct($parser, $data)
-    {
-        $this->parser = $parser;
-        $this->data = $data;
-    }
-
-    /**
-     * Return linebrak
-     *
-     * @return string linebreak
-     */
-    public function to_smarty_php()
-    {
-        return $this->data;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_resource_eval.php b/resources/libs/smarty/sysplugins/smarty_internal_resource_eval.php
deleted file mode 100644
index cf2ec3e1c..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_resource_eval.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Eval
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Eval
- *
- * Implements the strings as resource for Smarty template
- *
- * {@internal unlike string-resources the compiled state of eval-resources is NOT saved for subsequent access}}
- *
- * @package Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_Eval extends Smarty_Resource_Recompiled {
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $source->uid = $source->filepath = sha1($source->name);
-        $source->timestamp = false;
-        $source->exists = true;
-    }
-
-    /**
-     * Load template's source from $resource_name into current template object
-     *
-     * @uses decode() to decode base64 and urlencoded template_resources
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        return $this->decode($source->name);
-    }
-    
-    /**
-     * decode base64 and urlencode
-     *
-     * @param string $string template_resource to decode
-     * @return string decoded template_resource
-     */
-    protected function decode($string)
-    {
-        // decode if specified
-        if (($pos = strpos($string, ':')) !== false) {
-            if (!strncmp($string, 'base64', 6)) {
-                return base64_decode(substr($string, 7));
-            } elseif (!strncmp($string, 'urlencode', 9)) {
-                return urldecode(substr($string, 10));
-            }
-        }
-        
-        return $string;
-    }
-    
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
-     * @return string unique resource name
-     */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
-    {
-        return get_class($this) . '#' .$this->decode($resource_name);
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
-     */
-    protected function getBasename(Smarty_Template_Source $source)
-    {
-        return '';
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_resource_extends.php b/resources/libs/smarty/sysplugins/smarty_internal_resource_extends.php
deleted file mode 100644
index 9481d9922..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_resource_extends.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
-* Smarty Internal Plugin Resource Extends
-*
-* @package Smarty
-* @subpackage TemplateResources
-* @author Uwe Tews
-* @author Rodney Rehm
-*/
-
-/**
-* Smarty Internal Plugin Resource Extends
-*
-* Implements the file system as resource for Smarty which {extend}s a chain of template files templates
-*
-* @package Smarty
-* @subpackage TemplateResources
-*/
-class Smarty_Internal_Resource_Extends extends Smarty_Resource {
-
-    /**
-    * mbstring.overload flag
-    *
-    * @var int
-    */
-    public $mbstring_overload = 0;
-
-    /**
-    * populate Source Object with meta data from Resource
-    *
-    * @param Smarty_Template_Source   $source    source object
-    * @param Smarty_Internal_Template $_template template object
-    */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $uid = '';
-        $sources = array();
-        $components = explode('|', $source->name);
-        $exists = true;
-        foreach ($components as $component) {
-            $s = Smarty_Resource::source(null, $source->smarty, $component);
-            if ($s->type == 'php') {
-                throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type");
-            }
-            $sources[$s->uid] = $s;
-            $uid .= $s->filepath;
-            if ($_template && $_template->smarty->compile_check) {
-                $exists = $exists && $s->exists;
-            }
-        }
-        $source->components = $sources;
-        $source->filepath = $s->filepath;
-        $source->uid = sha1($uid);
-        if ($_template && $_template->smarty->compile_check) {
-            $source->timestamp = $s->timestamp;
-            $source->exists = $exists;
-        }
-        // need the template at getContent()
-        $source->template = $_template;
-    }
-
-    /**
-    * populate Source Object with timestamp and exists from Resource
-    *
-    * @param Smarty_Template_Source $source source object
-    */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->exists = true;
-        foreach ($source->components as $s) {
-            $source->exists = $source->exists && $s->exists;
-        }
-        $source->timestamp = $s->timestamp;
-    }
-
-    /**
-    * Load template's source from files into current template object
-    *
-    * @param Smarty_Template_Source $source source object
-    * @return string template source
-    * @throws SmartyException if source cannot be loaded
-    */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        if (!$source->exists) {
-            throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-        }
-
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
-        $_rdl = preg_quote($source->smarty->right_delimiter);
-        $_ldl = preg_quote($source->smarty->left_delimiter);
-        $_components = array_reverse($source->components);
-        $_first = reset($_components);
-        $_last = end($_components);
-
-        foreach ($_components as $_component) {
-            // register dependency
-            if ($_component != $_first) {
-                $source->template->properties['file_dependency'][$_component->uid] = array($_component->filepath, $_component->timestamp, $_component->type);
-            }
-
-            // read content
-            $source->filepath = $_component->filepath;
-            $_content = $_component->content;
-
-            // extend sources
-            if ($_component != $_last) {
-                if (preg_match_all("!({$_ldl}block\s(.+?){$_rdl})!", $_content, $_open) !=
-                preg_match_all("!({$_ldl}/block{$_rdl})!", $_content, $_close)) {
-                    throw new SmartyException("unmatched {block} {/block} pairs in template {$_component->type} '{$_component->name}'");
-                }
-                preg_match_all("!{$_ldl}block\s(.+?){$_rdl}|{$_ldl}/block{$_rdl}|{$_ldl}\*([\S\s]*?)\*{$_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE);
-                $_result_count = count($_result[0]);
-                $_start = 0;
-                while ($_start+1 < $_result_count) {
-                    $_end = 0;
-                    $_level = 1;
-                    if (($this->mbstring_overload ? mb_substr($_result[0][$_start][0],0,mb_strlen($source->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start][0],0,strlen($source->smarty->left_delimiter)+1)) == $source->smarty->left_delimiter.'*') {
-                        $_start++;
-                        continue;
-                    }
-                    while ($_level != 0) {
-                        $_end++;
-                        if (($this->mbstring_overload ? mb_substr($_result[0][$_start + $_end][0],0,mb_strlen($source->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start + $_end][0],0,strlen($source->smarty->left_delimiter)+1)) == $source->smarty->left_delimiter.'*') {
-                            continue;
-                        }
-                        if (!strpos($_result[0][$_start + $_end][0], '/')) {
-                            $_level++;
-                        } else {
-                            $_level--;
-                        }
-                    }
-                    $_block_content = str_replace($source->smarty->left_delimiter . '$smarty.block.parent' . $source->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
-                    ($this->mbstring_overload ? mb_substr($_content, $_result[0][$_start][1] + mb_strlen($_result[0][$_start][0], 'latin1'), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + mb_strlen($_result[0][$_start][0], 'latin1'), 'latin1') : substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0]))));
-                    Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $source->template, $_component->filepath);
-                    $_start = $_start + $_end + 1;
-                }
-            } else {
-                return $_content;
-            }
-        }
-    }
-
-    /**
-    * Determine basename for compiled filename
-    *
-    * @param Smarty_Template_Source $source source object
-    * @return string resource's basename
-    */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        return str_replace(':', '.', basename($source->filepath));
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_resource_file.php b/resources/libs/smarty/sysplugins/smarty_internal_resource_file.php
deleted file mode 100644
index 48b391d20..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_resource_file.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource File
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource File
- *
- * Implements the file system as resource for Smarty templates
- *
- * @package Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_File extends Smarty_Resource {
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $source->filepath = $this->buildFilepath($source, $_template);
-
-        if ($source->filepath !== false) {
-            if (is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
-            }
-
-            $source->uid = sha1($source->filepath);
-            if ($source->smarty->compile_check && !isset($source->timestamp)) {
-                $source->timestamp = @filemtime($source->filepath);
-                $source->exists = !!$source->timestamp;
-            }
-        }
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->timestamp = @filemtime($source->filepath);
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * Load template's source from file into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        if ($source->timestamp) {
-            return file_get_contents($source->filepath);
-        }
-        if ($source instanceof Smarty_Config_Source) {
-            throw new SmartyException("Unable to read config {$source->type} '{$source->name}'");
-        }
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
-     */
-    public function getBasename(Smarty_Template_Source $source)
-    {
-        $_file = $source->name;
-        if (($_pos = strpos($_file, ']')) !== false) {
-            $_file = substr($_file, $_pos + 1);
-        }
-        return basename($_file);
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_resource_php.php b/resources/libs/smarty/sysplugins/smarty_internal_resource_php.php
deleted file mode 100644
index 7cd8baeec..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_resource_php.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/**
- * Smarty Internal Plugin Resource PHP
- *
- * Implements the file system as resource for PHP templates
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
- */
-class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled {
-    /**
-     * container for short_open_tag directive's value before executing PHP templates
-     * @var string
-     */
-    protected $short_open_tag;
-
-    /**
-     * Create a new PHP Resource
-     *
-     */
-    public function __construct()
-    {
-        $this->short_open_tag = ini_get( 'short_open_tag' );
-    }
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $source->filepath = $this->buildFilepath($source, $_template);
-
-        if ($source->filepath !== false) {
-            if (is_object($source->smarty->security_policy)) {
-                $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
-            }
-
-            $source->uid = sha1($source->filepath);
-            if ($source->smarty->compile_check) {
-                $source->timestamp = @filemtime($source->filepath);
-                $source->exists = !!$source->timestamp;
-            }
-        }
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->timestamp = @filemtime($source->filepath);
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * Load template's source from file into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        if ($source->timestamp) {
-            return '';
-        }
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-    }
-
-    /**
-     * Render and output the template (without using the compiler)
-     *
-     * @param Smarty_Template_Source $source source object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
-     * @throws SmartyException if template cannot be loaded or allow_php_templates is disabled
-     */
-    public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
-    {
-        $_smarty_template = $_template;
-
-        if (!$source->smarty->allow_php_templates) {
-            throw new SmartyException("PHP templates are disabled");
-        }
-        if (!$source->exists) {
-            if ($_template->parent instanceof Smarty_Internal_Template) {
-                $parent_resource = " in '{$_template->parent->template_resource}'";
-            } else {
-                $parent_resource = '';
-            }
-            throw new SmartyException("Unable to load template {$source->type} '{$source->name}'{$parent_resource}");
-        }
-
-        // prepare variables
-        extract($_template->getTemplateVars());
-
-        // include PHP template with short open tags enabled
-        ini_set( 'short_open_tag', '1' );
-        include($source->filepath);
-        ini_set( 'short_open_tag', $this->short_open_tag );
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_resource_registered.php b/resources/libs/smarty/sysplugins/smarty_internal_resource_registered.php
deleted file mode 100644
index 44497b922..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_resource_registered.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Registered
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Registered
- *
- * Implements the registered resource for Smarty template
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @deprecated
- */
-class Smarty_Internal_Resource_Registered extends Smarty_Resource {
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $source->filepath = $source->type . ':' . $source->name;
-        $source->uid = sha1($source->filepath);
-        if ($source->smarty->compile_check) {
-            $source->timestamp = $this->getTemplateTimestamp($source);
-            $source->exists = !!$source->timestamp;
-        }
-    }
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return void
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        $source->timestamp = $this->getTemplateTimestamp($source);
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * Get timestamp (epoch) the template source was modified
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return integer|boolean timestamp (epoch) the template was modified, false if resources has no timestamp
-     */
-    public function getTemplateTimestamp(Smarty_Template_Source $source)
-    {
-        // return timestamp
-        $time_stamp = false;
-        call_user_func_array($source->smarty->registered_resources[$source->type][0][1], array($source->name, &$time_stamp, $source->smarty));
-        return is_numeric($time_stamp) ? (int) $time_stamp : $time_stamp;
-    }
-
-    /**
-     * Load template's source by invoking the registered callback into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        // return template string
-        $t = call_user_func_array($source->smarty->registered_resources[$source->type][0][0], array($source->name, &$source->content, $source->smarty));
-        if (is_bool($t) && !$t) {
-            throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-        }
-        return $source->content;
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
-     */
-    protected function getBasename(Smarty_Template_Source $source)
-    {
-        return basename($source->name);
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_resource_stream.php b/resources/libs/smarty/sysplugins/smarty_internal_resource_stream.php
deleted file mode 100644
index 85698c232..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_resource_stream.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource Stream
- *
- * Implements the streams as resource for Smarty template
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource Stream
- *
- * Implements the streams as resource for Smarty template
- *
- * @link http://php.net/streams
- * @package Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_Stream extends Smarty_Resource_Recompiled {
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $source->filepath = str_replace(':', '://', $source->resource);
-        $source->uid = false;
-        $source->content = $this->getContent($source);
-        $source->timestamp = false;
-        $source->exists = !!$source->content;
-    }
-
-    /**
-     * Load template's source from stream into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        $t = '';
-        // the availability of the stream has already been checked in Smarty_Resource::fetch()
-        $fp = fopen($source->filepath, 'r+');
-        if ($fp) {
-            while (!feof($fp) && ($current_line = fgets($fp)) !== false) {
-                $t .= $current_line;
-            }
-            fclose($fp);
-            return $t;
-        } else {
-            return false;
-        }
-    }
-    
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
-     * @return string unique resource name
-     */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
-    {
-        return get_class($this) . '#' . $resource_name;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_resource_string.php b/resources/libs/smarty/sysplugins/smarty_internal_resource_string.php
deleted file mode 100644
index 9571337b0..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_resource_string.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Resource String
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Uwe Tews
- * @author Rodney Rehm
- */
-
-/**
- * Smarty Internal Plugin Resource String
- *
- * Implements the strings as resource for Smarty template
- *
- * {@internal unlike eval-resources the compiled state of string-resources is saved for subsequent access}}
- *
- * @package Smarty
- * @subpackage TemplateResources
- */
-class Smarty_Internal_Resource_String extends Smarty_Resource {
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $source->uid = $source->filepath = sha1($source->name);
-        $source->timestamp = 0;
-        $source->exists = true;
-    }
-
-    /**
-     * Load template's source from $resource_name into current template object
-     *
-     * @uses decode() to decode base64 and urlencoded template_resources
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        return $this->decode($source->name);
-    }
-    
-    /**
-     * decode base64 and urlencode
-     *
-     * @param string $string template_resource to decode
-     * @return string decoded template_resource
-     */
-    protected function decode($string)
-    {
-        // decode if specified
-        if (($pos = strpos($string, ':')) !== false) {
-            if (!strncmp($string, 'base64', 6)) {
-                return base64_decode(substr($string, 7));
-            } elseif (!strncmp($string, 'urlencode', 9)) {
-                return urldecode(substr($string, 10));
-            }
-        }
-        
-        return $string;
-    }
-    
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
-     * @return string unique resource name
-     */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
-    {
-        return get_class($this) . '#' .$this->decode($resource_name);
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * Always returns an empty string.
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
-     */
-    protected function getBasename(Smarty_Template_Source $source)
-    {
-        return '';
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php b/resources/libs/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
deleted file mode 100644
index 1ec1aa430..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_smartytemplatecompiler.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Smarty Template Compiler Base
- *
- * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * @ignore
- */
-include ("smarty_internal_parsetree.php");
-
-/**
- * Class SmartyTemplateCompiler
- *
- * @package Smarty
- * @subpackage Compiler
- */
-class Smarty_Internal_SmartyTemplateCompiler extends Smarty_Internal_TemplateCompilerBase {
-
-    /**
-     * Lexer class name
-     *
-     * @var string
-     */
-    public $lexer_class;
-
-    /**
-     * Parser class name
-     *
-     * @var string
-     */
-    public $parser_class;
-
-    /**
-     * Lexer object
-     *
-     * @var object
-     */
-    public $lex;
-
-    /**
-     * Parser object
-     *
-     * @var object
-     */
-    public $parser;
-
-    /**
-     * Smarty object
-     *
-     * @var object
-     */
-    public $smarty;
-
-    /**
-     * array of vars which can be compiled in local scope
-     *
-     * @var array
-     */
-    public $local_var = array();
-
-    /**
-     * Initialize compiler
-     *
-     * @param string $lexer_class  class name
-     * @param string $parser_class class name
-     * @param Smarty $smarty       global instance
-     */
-    public function __construct($lexer_class, $parser_class, $smarty)
-    {
-        $this->smarty = $smarty;
-        parent::__construct();
-        // get required plugins
-        $this->lexer_class = $lexer_class;
-        $this->parser_class = $parser_class;
-    }
-
-    /**
-     * Methode to compile a Smarty template
-     *
-     * @param  mixed $_content template source
-     * @return bool true if compiling succeeded, false if it failed
-     */
-    protected function doCompile($_content)
-    {
-        /* here is where the compiling takes place. Smarty
-          tags in the templates are replaces with PHP code,
-          then written to compiled files. */
-        // init the lexer/parser to compile the template
-        $this->lex = new $this->lexer_class($_content, $this);
-        $this->parser = new $this->parser_class($this->lex, $this);
-        if ($this->smarty->_parserdebug)
-            $this->parser->PrintTrace();
-        // get tokens from lexer and parse them
-        while ($this->lex->yylex() && !$this->abort_and_recompile) {
-            if ($this->smarty->_parserdebug) {
-                echo "<pre>Line {$this->lex->line} Parsing  {$this->parser->yyTokenName[$this->lex->token]} Token " .
-                    htmlentities($this->lex->value) . "</pre>";
-            }
-            $this->parser->doParse($this->lex->token, $this->lex->value);
-        }
-
-        if ($this->abort_and_recompile) {
-            // exit here on abort
-            return false;
-        }
-        // finish parsing process
-        $this->parser->doParse(0, 0);
-        // check for unclosed tags
-        if (count($this->_tag_stack) > 0) {
-            // get stacked info
-            list($openTag, $_data) = array_pop($this->_tag_stack);
-            $this->trigger_template_error("unclosed {" . $openTag . "} tag");
-        }
-        // return compiled code
-        // return str_replace(array("? >\n<?php","? ><?php"), array('',''), $this->parser->retvalue);
-        return $this->parser->retvalue;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_template.php b/resources/libs/smarty/sysplugins/smarty_internal_template.php
deleted file mode 100644
index 447ff3c95..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_template.php
+++ /dev/null
@@ -1,682 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Template
- *
- * This file contains the Smarty template engine
- *
- * @package Smarty
- * @subpackage Template
- * @author Uwe Tews
- */
-
-/**
- * Main class with template data structures and methods
- *
- * @package Smarty
- * @subpackage Template
- *
- * @property Smarty_Template_Source   $source
- * @property Smarty_Template_Compiled $compiled
- * @property Smarty_Template_Cached   $cached
- */
-class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
-
-    /**
-     * cache_id
-     * @var string
-     */
-    public $cache_id = null;
-    /**
-     * $compile_id
-     * @var string
-     */
-    public $compile_id = null;
-    /**
-     * caching enabled
-     * @var boolean
-     */
-    public $caching = null;
-    /**
-     * cache lifetime in seconds
-     * @var integer
-     */
-    public $cache_lifetime = null;
-    /**
-     * Template resource
-     * @var string
-     */
-    public $template_resource = null;
-    /**
-     * flag if compiled template is invalid and must be (re)compiled
-     * @var bool
-     */
-    public $mustCompile = null;
-    /**
-     * flag if template does contain nocache code sections
-     * @var bool
-     */
-    public $has_nocache_code = false;
-    /**
-     * special compiled and cached template properties
-     * @var array
-     */
-    public $properties = array('file_dependency' => array(),
-        'nocache_hash' => '',
-        'function' => array());
-    /**
-     * required plugins
-     * @var array
-     */
-    public $required_plugins = array('compiled' => array(), 'nocache' => array());
-    /**
-     * Global smarty instance
-     * @var Smarty
-     */
-    public $smarty = null;
-    /**
-     * blocks for template inheritance
-     * @var array
-     */
-    public $block_data = array();
-    /**
-     * variable filters
-     * @var array
-     */
-    public $variable_filters = array();
-    /**
-     * optional log of tag/attributes
-     * @var array
-     */
-    public $used_tags = array();
-    /**
-     * internal flag to allow relative path in child template blocks
-     * @var bool
-     */
-    public $allow_relative_path = false;
-    /**
-     * internal capture runtime stack
-     * @var array
-     */
-    public $_capture_stack = array(0 => array());
-
-    /**
-     * Create template data object
-     *
-     * Some of the global Smarty settings copied to template scope
-     * It load the required template resources and cacher plugins
-     *
-     * @param string                   $template_resource template resource string
-     * @param Smarty                   $smarty            Smarty instance
-     * @param Smarty_Internal_Template $_parent           back pointer to parent object with variables or null
-     * @param mixed                    $_cache_id cache   id or null
-     * @param mixed                    $_compile_id       compile id or null
-     * @param bool                     $_caching          use caching?
-     * @param int                      $_cache_lifetime   cache life-time in seconds
-     */
-    public function __construct($template_resource, $smarty, $_parent = null, $_cache_id = null, $_compile_id = null, $_caching = null, $_cache_lifetime = null)
-    {
-        $this->smarty = &$smarty;
-        // Smarty parameter
-        $this->cache_id = $_cache_id === null ? $this->smarty->cache_id : $_cache_id;
-        $this->compile_id = $_compile_id === null ? $this->smarty->compile_id : $_compile_id;
-        $this->caching = $_caching === null ? $this->smarty->caching : $_caching;
-        if ($this->caching === true)
-            $this->caching = Smarty::CACHING_LIFETIME_CURRENT;
-        $this->cache_lifetime = $_cache_lifetime === null ? $this->smarty->cache_lifetime : $_cache_lifetime;
-        $this->parent = $_parent;
-        // Template resource
-        $this->template_resource = $template_resource;
-        // copy block data of template inheritance
-        if ($this->parent instanceof Smarty_Internal_Template) {
-            $this->block_data = $this->parent->block_data;
-        }
-    }
-
-    /**
-     * Returns if the current template must be compiled by the Smarty compiler
-     *
-     * It does compare the timestamps of template source and the compiled templates and checks the force compile configuration
-     *
-     * @return boolean true if the template must be compiled
-     */
-    public function mustCompile()
-    {
-        if (!$this->source->exists) {
-            if ($this->parent instanceof Smarty_Internal_Template) {
-                $parent_resource = " in '$this->parent->template_resource}'";
-            } else {
-                $parent_resource = '';
-            }
-            throw new SmartyException("Unable to load template {$this->source->type} '{$this->source->name}'{$parent_resource}");
-        }
-        if ($this->mustCompile === null) {
-            $this->mustCompile = (!$this->source->uncompiled && ($this->smarty->force_compile || $this->source->recompiled || $this->compiled->timestamp === false ||
-                    ($this->smarty->compile_check && $this->compiled->timestamp < $this->source->timestamp)));
-        }
-        return $this->mustCompile;
-    }
-
-    /**
-     * Compiles the template
-     *
-     * If the template is not evaluated the compiled template is saved on disk
-     */
-    public function compileTemplateSource()
-    {
-        if (!$this->source->recompiled) {
-            $this->properties['file_dependency'] = array();
-            if ($this->source->components) {
-                // uses real resource for file dependency
-                $source = end($this->source->components);
-                $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $source->type);
-            } else {
-                $this->properties['file_dependency'][$this->source->uid] = array($this->source->filepath, $this->source->timestamp, $this->source->type);
-            }
-        }
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::start_compile($this);
-        }
-        // compile locking
-        if ($this->smarty->compile_locking && !$this->source->recompiled) {
-            if ($saved_timestamp = $this->compiled->timestamp) {
-                touch($this->compiled->filepath);
-            }
-        }
-        // call compiler
-        try {
-            $code = $this->compiler->compileTemplate($this);
-        } catch (Exception $e) {
-            // restore old timestamp in case of error
-            if ($this->smarty->compile_locking && !$this->source->recompiled && $saved_timestamp) {
-                touch($this->compiled->filepath, $saved_timestamp);
-            }
-            throw $e;
-        }
-        // compiling succeded
-        if (!$this->source->recompiled && $this->compiler->write_compiled_code) {
-            // write compiled template
-            $_filepath = $this->compiled->filepath;
-            if ($_filepath === false)
-                throw new SmartyException('getCompiledFilepath() did not return a destination to save the compiled template to');
-            Smarty_Internal_Write_File::writeFile($_filepath, $code, $this->smarty);
-            $this->compiled->exists = true;
-            $this->compiled->isCompiled = true;
-        }
-        if ($this->smarty->debugging) {
-            Smarty_Internal_Debug::end_compile($this);
-        }
-        // release compiler object to free memory
-        unset($this->compiler);
-    }
-
-    /**
-     * Writes the cached template output
-     *
-     * @return bool
-     */
-    public function writeCachedContent($content)
-    {
-        if ($this->source->recompiled || !($this->caching == Smarty::CACHING_LIFETIME_CURRENT || $this->caching == Smarty::CACHING_LIFETIME_SAVED)) {
-            // don't write cache file
-            return false;
-        }
-        $this->properties['cache_lifetime'] = $this->cache_lifetime;
-        $this->properties['unifunc'] = 'content_' . str_replace('.', '_', uniqid('', true));
-        $content = $this->createTemplateCodeFrame($content, true);
-        $_smarty_tpl = $this;
-        eval("?>" . $content);
-        $this->cached->valid = true;
-        $this->cached->processed = true;
-        return $this->cached->write($this, $content);
-    }
-
-    /**
-     * Template code runtime function to get subtemplate content
-     *
-     * @param string  $template       the resource handle of the template file
-     * @param mixed   $cache_id       cache id to be used with this template
-     * @param mixed   $compile_id     compile id to be used with this template
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param array   $vars optional  variables to assign
-     * @param int     $parent_scope   scope in which {include} should execute
-     * @returns string template content
-     */
-    public function getSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope)
-    {
-        // already in template cache?
-        if ($this->smarty->allow_ambiguous_resources) {
-            $_templateId = Smarty_Resource::getUniqueTemplateName($this->smarty, $template) . $cache_id . $compile_id;
-        } else {
-            $_templateId = $this->smarty->joined_template_dir . '#' . $template . $cache_id . $compile_id;
-        }
-
-        if (isset($_templateId[150])) {
-            $_templateId = sha1($_templateId);
-        }
-        if (isset($this->smarty->template_objects[$_templateId])) {
-            // clone cached template object because of possible recursive call
-            $tpl = clone $this->smarty->template_objects[$_templateId];
-            $tpl->parent = $this;
-            $tpl->caching = $caching;
-            $tpl->cache_lifetime = $cache_lifetime;
-        } else {
-            $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
-        }
-        // get variables from calling scope
-        if ($parent_scope == Smarty::SCOPE_LOCAL) {
-            $tpl->tpl_vars = $this->tpl_vars;
-        } elseif ($parent_scope == Smarty::SCOPE_PARENT) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
-            $tpl->tpl_vars = &Smarty::$global_tpl_vars;
-        } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } else {
-            $tpl->tpl_vars = &$scope_ptr->tpl_vars;
-        }
-        $tpl->config_vars = $this->config_vars;
-        if (!empty($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
-        return $tpl->fetch(null, null, null, null, false, false, true);
-    }
-
-    /**
-     * Template code runtime function to set up an inline subtemplate
-     *
-     * @param string  $template       the resource handle of the template file
-     * @param mixed   $cache_id       cache id to be used with this template
-     * @param mixed   $compile_id     compile id to be used with this template
-     * @param integer $caching        cache mode
-     * @param integer $cache_lifetime life time of cache data
-     * @param array   $vars optional  variables to assign
-     * @param int     $parent_scope   scope in which {include} should execute
-     * @param string  $hash           nocache hash code
-     * @returns string template content
-     */
-    public function setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash)
-    {
-        $tpl = new $this->smarty->template_class($template, $this->smarty, $this, $cache_id, $compile_id, $caching, $cache_lifetime);
-        $tpl->properties['nocache_hash']  = $hash;
-        // get variables from calling scope
-        if ($parent_scope == Smarty::SCOPE_LOCAL ) {
-            $tpl->tpl_vars = $this->tpl_vars;
-        } elseif ($parent_scope == Smarty::SCOPE_PARENT) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } elseif ($parent_scope == Smarty::SCOPE_GLOBAL) {
-            $tpl->tpl_vars = &Smarty::$global_tpl_vars;
-        } elseif (($scope_ptr = $this->getScopePointer($parent_scope)) == null) {
-            $tpl->tpl_vars = &$this->tpl_vars;
-        } else {
-            $tpl->tpl_vars = &$scope_ptr->tpl_vars;
-        }
-        $tpl->config_vars = $this->config_vars;
-        if (!empty($data)) {
-            // set up variable values
-            foreach ($data as $_key => $_val) {
-                $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
-            }
-        }
-        return $tpl;
-    }
-
-
-    /**
-     * Create code frame for compiled and cached templates
-     *
-     * @param string $content   optional template content
-     * @param bool   $cache     flag for cache file
-     * @return string
-     */
-    public function createTemplateCodeFrame($content = '', $cache = false)
-    {
-        $plugins_string = '';
-        // include code for plugins
-        if (!$cache) {
-            if (!empty($this->required_plugins['compiled'])) {
-                $plugins_string = '<?php ';
-                foreach ($this->required_plugins['compiled'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data['file']);
-                        $plugins_string .= "if (!is_callable('{$data['function']}')) include '{$file}';\n";
-                    }
-                }
-                $plugins_string .= '?>';
-            }
-            if (!empty($this->required_plugins['nocache'])) {
-                $this->has_nocache_code = true;
-                $plugins_string .= "<?php echo '/*%%SmartyNocache:{$this->properties['nocache_hash']}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
-                foreach ($this->required_plugins['nocache'] as $tmp) {
-                    foreach ($tmp as $data) {
-                        $file = addslashes($data['file']);
-                        $plugins_string .= addslashes("if (!is_callable('{$data['function']}')) include '{$file}';\n");
-                    }
-                }
-                $plugins_string .= "?>/*/%%SmartyNocache:{$this->properties['nocache_hash']}%%*/';?>\n";
-            }
-        }
-        // build property code
-        $this->properties['has_nocache_code'] = $this->has_nocache_code;
-        $output = '';
-        if (!$this->source->recompiled) {
-            $output = "<?php /*%%SmartyHeaderCode:{$this->properties['nocache_hash']}%%*/";
-            if ($this->smarty->direct_access_security) {
-                $output .= "if(!defined('SMARTY_DIR')) exit('no direct access allowed');\n";
-            }
-        }
-        if ($cache) {
-            // remove compiled code of{function} definition
-            unset($this->properties['function']);
-            if (!empty($this->smarty->template_functions)) {
-                // copy code of {function} tags called in nocache mode
-                foreach ($this->smarty->template_functions as $name => $function_data) {
-                    if (isset($function_data['called_nocache'])) {
-                        foreach ($function_data['called_functions'] as $func_name) {
-                            $this->smarty->template_functions[$func_name]['called_nocache'] = true;
-                        }
-                    }
-                }
-                 foreach ($this->smarty->template_functions as $name => $function_data) {
-                    if (isset($function_data['called_nocache'])) {
-                        unset($function_data['called_nocache'], $function_data['called_functions'], $this->smarty->template_functions[$name]['called_nocache']);
-                        $this->properties['function'][$name] = $function_data;
-                    }
-                }
-            }
-        }
-        $this->properties['version'] = Smarty::SMARTY_VERSION;
-        if (!isset($this->properties['unifunc'])) {
-            $this->properties['unifunc'] = 'content_' . str_replace('.', '_', uniqid('', true));
-        }
-        if (!$this->source->recompiled) {
-            $output .= "\$_valid = \$_smarty_tpl->decodeProperties(" . var_export($this->properties, true) . ',' . ($cache ? 'true' : 'false') . "); /*/%%SmartyHeaderCode%%*/?>\n";
-            $output .= '<?php if ($_valid && !is_callable(\'' . $this->properties['unifunc'] . '\')) {function ' . $this->properties['unifunc'] . '($_smarty_tpl) {?>';
-        }
-        $output .= $plugins_string;
-        $output .= $content;
-        if (!$this->source->recompiled) {
-            $output .= '<?php }} ?>';
-        }
-        return $output;
-    }
-
-    /**
-     * This function is executed automatically when a compiled or cached template file is included
-     *
-     * - Decode saved properties from compiled template and cache files
-     * - Check if compiled or cache file is valid
-     *
-     * @param array $properties     special template properties
-     * @param bool  $cache          flag if called from cache file
-     * @return bool                 flag if compiled or cache file is valid
-     */
-    public function decodeProperties($properties, $cache = false)
-    {
-        $this->has_nocache_code = $properties['has_nocache_code'];
-        $this->properties['nocache_hash'] = $properties['nocache_hash'];
-        if (isset($properties['cache_lifetime'])) {
-            $this->properties['cache_lifetime'] = $properties['cache_lifetime'];
-        }
-        if (isset($properties['file_dependency'])) {
-            $this->properties['file_dependency'] = array_merge($this->properties['file_dependency'], $properties['file_dependency']);
-        }
-        if (!empty($properties['function'])) {
-            $this->properties['function'] = array_merge($this->properties['function'], $properties['function']);
-            $this->smarty->template_functions = array_merge($this->smarty->template_functions, $properties['function']);
-        }
-        $this->properties['version'] = (isset($properties['version'])) ? $properties['version'] : '';
-        $this->properties['unifunc'] = $properties['unifunc'];
-        // check file dependencies at compiled code
-        $is_valid = true;
-        if ($this->properties['version'] != Smarty::SMARTY_VERSION) {
-            $is_valid = false;
-        } else if (((!$cache && $this->smarty->compile_check && empty($this->compiled->_properties) && !$this->compiled->isCompiled) || $cache && ($this->smarty->compile_check === true || $this->smarty->compile_check === Smarty::COMPILECHECK_ON)) && !empty($this->properties['file_dependency'])) {
-            foreach ($this->properties['file_dependency'] as $_file_to_check) {
-                if ($_file_to_check[2] == 'file' || $_file_to_check[2] == 'php') {
-                    if ($this->source->filepath == $_file_to_check[0] && isset($this->source->timestamp)) {
-                        // do not recheck current template
-                        $mtime = $this->source->timestamp;
-                    } else {
-                        // file and php types can be checked without loading the respective resource handlers
-                        $mtime = filemtime($_file_to_check[0]);
-                    }
-                } elseif ($_file_to_check[2] == 'string') {
-                    continue;
-                } else {
-                    $source = Smarty_Resource::source(null, $this->smarty, $_file_to_check[0]);
-                    $mtime = $source->timestamp;
-                }
-                if ($mtime > $_file_to_check[1]) {
-                    $is_valid = false;
-                    break;
-                }
-            }
-        }
-        if ($cache) {
-            $this->cached->valid = $is_valid;
-        } else {
-            $this->mustCompile = !$is_valid;
-        }
-        // store data in reusable Smarty_Template_Compiled
-        if (!$cache) {
-            $this->compiled->_properties = $properties;
-        }
-        return $is_valid;
-    }
-
-    /**
-     * Template code runtime function to create a local Smarty variable for array assignments
-     *
-     * @param string $tpl_var   tempate variable name
-     * @param bool   $nocache   cache mode of variable
-     * @param int    $scope     scope of variable
-     */
-    public function createLocalArrayVariable($tpl_var, $nocache = false, $scope = Smarty::SCOPE_LOCAL)
-    {
-        if (!isset($this->tpl_vars[$tpl_var])) {
-            $this->tpl_vars[$tpl_var] = new Smarty_variable(array(), $nocache, $scope);
-        } else {
-            $this->tpl_vars[$tpl_var] = clone $this->tpl_vars[$tpl_var];
-            if ($scope != Smarty::SCOPE_LOCAL) {
-                $this->tpl_vars[$tpl_var]->scope = $scope;
-            }
-            if (!(is_array($this->tpl_vars[$tpl_var]->value) || $this->tpl_vars[$tpl_var]->value instanceof ArrayAccess)) {
-                settype($this->tpl_vars[$tpl_var]->value, 'array');
-            }
-        }
-    }
-
-    /**
-     * Template code runtime function to get pointer to template variable array of requested scope
-     *
-     * @param int $scope    requested variable scope
-     * @return array        array of template variables
-     */
-    public function &getScope($scope)
-    {
-        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-            return $this->parent->tpl_vars;
-        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-            $ptr = $this->parent;
-            while (!empty($ptr->parent)) {
-                $ptr = $ptr->parent;
-            }
-            return $ptr->tpl_vars;
-        } elseif ($scope == Smarty::SCOPE_GLOBAL) {
-            return Smarty::$global_tpl_vars;
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     * Get parent or root of template parent chain
-     *
-     * @param int $scope    pqrent or root scope
-     * @return mixed object
-     */
-    public function getScopePointer($scope)
-    {
-        if ($scope == Smarty::SCOPE_PARENT && !empty($this->parent)) {
-            return $this->parent;
-        } elseif ($scope == Smarty::SCOPE_ROOT && !empty($this->parent)) {
-            $ptr = $this->parent;
-            while (!empty($ptr->parent)) {
-                $ptr = $ptr->parent;
-            }
-            return $ptr;
-        }
-        return null;
-    }
-
-    /**
-     * [util function] counts an array, arrayaccess/traversable or PDOStatement object
-     *
-     * @param mixed $value
-     * @return int the count for arrays and objects that implement countable, 1 for other objects that don't, and 0 for empty elements
-     */
-    public function _count($value)
-    {
-        if (is_array($value) === true || $value instanceof Countable) {
-            return count($value);
-        } elseif ($value instanceof IteratorAggregate) {
-            // Note: getIterator() returns a Traversable, not an Iterator
-            // thus rewind() and valid() methods may not be present
-            return iterator_count($value->getIterator());
-        } elseif ($value instanceof Iterator) {
-            return iterator_count($value);
-        } elseif ($value instanceof PDOStatement) {
-            return $value->rowCount();
-        } elseif ($value instanceof Traversable) {
-            return iterator_count($value);
-        } elseif ($value instanceof ArrayAccess) {
-            if ($value->offsetExists(0)) {
-                return 1;
-            }
-        } elseif (is_object($value)) {
-            return count($value);
-        }
-        return 0;
-    }
-
-    /**
-     * runtime error not matching capture tags
-     *
-     */
-    public function capture_error()
-    {
-        throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\"");
-    }
-
-    /**
-    * Empty cache for this template
-    *
-    * @param integer $exp_time      expiration time
-    * @return integer number of cache files deleted
-    */
-    public function clearCache($exp_time=null)
-    {
-        Smarty_CacheResource::invalidLoadedCache($this->smarty);
-        return $this->cached->handler->clear($this->smarty, $this->template_name, $this->cache_id, $this->compile_id, $exp_time);
-    }
-
-     /**
-     * set Smarty property in template context
-     *
-     * @param string $property_name property name
-     * @param mixed  $value         value
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            case 'source':
-            case 'compiled':
-            case 'cached':
-            case 'compiler':
-                $this->$property_name = $value;
-                return;
-
-            // FIXME: routing of template -> smarty attributes
-            default:
-                if (property_exists($this->smarty, $property_name)) {
-                    $this->smarty->$property_name = $value;
-                    return;
-                }
-        }
-
-        throw new SmartyException("invalid template property '$property_name'.");
-    }
-
-    /**
-     * get Smarty property in template context
-     *
-     * @param string $property_name property name
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'source':
-                if (strlen($this->template_resource) == 0) {
-                    throw new SmartyException('Missing template name');
-                }
-                $this->source = Smarty_Resource::source($this);
-                // cache template object under a unique ID
-                // do not cache eval resources
-                if ($this->source->type != 'eval') {
-                    if ($this->smarty->allow_ambiguous_resources) {
-                        $_templateId = $this->source->unique_resource . $this->cache_id . $this->compile_id;
-                    } else {
-                        $_templateId = $this->smarty->joined_template_dir . '#' . $this->template_resource . $this->cache_id . $this->compile_id;
-                    }
-
-                    if (isset($_templateId[150])) {
-                        $_templateId = sha1($_templateId);
-                    }
-                    $this->smarty->template_objects[$_templateId] = $this;
-                }
-                return $this->source;
-
-            case 'compiled':
-                $this->compiled = $this->source->getCompiled($this);
-                return $this->compiled;
-
-            case 'cached':
-                if (!class_exists('Smarty_Template_Cached')) {
-                    include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
-                }
-                $this->cached = new Smarty_Template_Cached($this);
-                return $this->cached;
-
-            case 'compiler':
-                $this->smarty->loadPlugin($this->source->compiler_class);
-                $this->compiler = new $this->source->compiler_class($this->source->template_lexer_class, $this->source->template_parser_class, $this->smarty);
-                return $this->compiler;
-
-            // FIXME: routing of template -> smarty attributes
-            default:
-                if (property_exists($this->smarty, $property_name)) {
-                    return $this->smarty->$property_name;
-                }
-        }
-
-        throw new SmartyException("template property '$property_name' does not exist.");
-    }
-
-    /**
-     * Template data object destrutor
-     *
-     */
-    public function __destruct()
-    {
-        if ($this->smarty->cache_locking && isset($this->cached) && $this->cached->is_locked) {
-            $this->cached->handler->releaseLock($this->smarty, $this->cached);
-        }
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_templatebase.php b/resources/libs/smarty/sysplugins/smarty_internal_templatebase.php
deleted file mode 100644
index d60ecd16e..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_templatebase.php
+++ /dev/null
@@ -1,811 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Smarty Template  Base
- *
- * This file contains the basic shared methodes for template handling
- *
- * @package Smarty
- * @subpackage Template
- * @author Uwe Tews
- */
-
-/**
- * Class with shared template methodes
- *
- * @package Smarty
- * @subpackage Template
- */
-abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data {
-
-    /**
-     * fetches a rendered Smarty template
-     *
-     * @param string $template          the resource handle of the template file or template object
-     * @param mixed  $cache_id          cache id to be used with this template
-     * @param mixed  $compile_id        compile id to be used with this template
-     * @param object $parent            next higher level of Smarty variables
-     * @param bool   $display           true: display, false: fetch
-     * @param bool   $merge_tpl_vars    if true parent template variables merged in to local scope
-     * @param bool   $no_output_filter  if true do not run output filter
-     * @return string rendered template output
-     */
-    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false)
-    {
-        if ($template === null && $this instanceof $this->template_class) {
-            $template = $this;
-        }
-        if (!empty($cache_id) && is_object($cache_id)) {
-            $parent = $cache_id;
-            $cache_id = null;
-        }
-        if ($parent === null && ($this instanceof Smarty || is_string($template))) {
-            $parent = $this;
-        }
-        // create template object if necessary
-        $_template = ($template instanceof $this->template_class)
-        ? $template
-        : $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
-        // if called by Smarty object make sure we use current caching status
-        if ($this instanceof Smarty) {
-            $_template->caching = $this->caching;
-        }
-        // merge all variable scopes into template
-        if ($merge_tpl_vars) {
-            // save local variables
-            $save_tpl_vars = $_template->tpl_vars;
-            $save_config_vars = $_template->config_vars;
-            $ptr_array = array($_template);
-            $ptr = $_template;
-            while (isset($ptr->parent)) {
-                $ptr_array[] = $ptr = $ptr->parent;
-            }
-            $ptr_array = array_reverse($ptr_array);
-            $parent_ptr = reset($ptr_array);
-            $tpl_vars = $parent_ptr->tpl_vars;
-            $config_vars = $parent_ptr->config_vars;
-            while ($parent_ptr = next($ptr_array)) {
-                if (!empty($parent_ptr->tpl_vars)) {
-                    $tpl_vars = array_merge($tpl_vars, $parent_ptr->tpl_vars);
-                }
-                if (!empty($parent_ptr->config_vars)) {
-                    $config_vars = array_merge($config_vars, $parent_ptr->config_vars);
-                }
-            }
-            if (!empty(Smarty::$global_tpl_vars)) {
-                $tpl_vars = array_merge(Smarty::$global_tpl_vars, $tpl_vars);
-            }
-            $_template->tpl_vars = $tpl_vars;
-            $_template->config_vars = $config_vars;
-        }
-        // dummy local smarty variable
-        if (!isset($_template->tpl_vars['smarty'])) {
-            $_template->tpl_vars['smarty'] = new Smarty_Variable;
-        }
-        if (isset($this->smarty->error_reporting)) {
-            $_smarty_old_error_level = error_reporting($this->smarty->error_reporting);
-        }
-        // check URL debugging control
-        if (!$this->smarty->debugging && $this->smarty->debugging_ctrl == 'URL') {
-            if (isset($_SERVER['QUERY_STRING'])) {
-                $_query_string = $_SERVER['QUERY_STRING'];
-            } else {
-                $_query_string = '';
-            }
-            if (false !== strpos($_query_string, $this->smarty->smarty_debug_id)) {
-                if (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=on')) {
-                    // enable debugging for this browser session
-                    setcookie('SMARTY_DEBUG', true);
-                    $this->smarty->debugging = true;
-                } elseif (false !== strpos($_query_string, $this->smarty->smarty_debug_id . '=off')) {
-                    // disable debugging for this browser session
-                    setcookie('SMARTY_DEBUG', false);
-                    $this->smarty->debugging = false;
-                } else {
-                    // enable debugging for this page
-                    $this->smarty->debugging = true;
-                }
-            } else {
-                if (isset($_COOKIE['SMARTY_DEBUG'])) {
-                    $this->smarty->debugging = true;
-                }
-            }
-        }
-        // must reset merge template date
-        $_template->smarty->merged_templates_func = array();
-        // get rendered template
-        // disable caching for evaluated code
-        if ($_template->source->recompiled) {
-            $_template->caching = false;
-        }
-        // checks if template exists
-        if (!$_template->source->exists) {
-            if ($_template->parent instanceof Smarty_Internal_Template) {
-                $parent_resource = " in '{$_template->parent->template_resource}'";
-            } else {
-                $parent_resource = '';
-            }
-            throw new SmartyException("Unable to load template {$_template->source->type} '{$_template->source->name}'{$parent_resource}");
-        }
-        // read from cache or render
-        if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT || $_template->caching == Smarty::CACHING_LIFETIME_SAVED) || !$_template->cached->valid) {
-            // render template (not loaded and not in cache)
-            if (!$_template->source->uncompiled) {
-                $_smarty_tpl = $_template;
-                if ($_template->source->recompiled) {
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_compile($_template);
-                    }
-                    $code = $_template->compiler->compileTemplate($_template);
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::end_compile($_template);
-                    }
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_render($_template);
-                    }
-                    try {
-                        ob_start();
-                        eval("?>" . $code);
-                        unset($code);
-                    } catch (Exception $e) {
-                        ob_get_clean();
-                        throw $e;
-                    }
-                } else {
-                    if (!$_template->compiled->exists || ($_template->smarty->force_compile && !$_template->compiled->isCompiled)) {
-                        $_template->compileTemplateSource();
-                    }
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_render($_template);
-                    }
-                    if (!$_template->compiled->loaded) {
-                        include($_template->compiled->filepath);
-                        if ($_template->mustCompile) {
-                            // recompile and load again
-                            $_template->compileTemplateSource();
-                            include($_template->compiled->filepath);
-                        }
-                        $_template->compiled->loaded = true;
-                    } else {
-                        $_template->decodeProperties($_template->compiled->_properties, false);
-                    }
-                    try {
-                        ob_start();
-                        if (empty($_template->properties['unifunc']) || !is_callable($_template->properties['unifunc'])) {
-                            throw new SmartyException("Invalid compiled template for '{$_template->template_resource}'");
-                        }
-                        array_unshift($_template->_capture_stack,array());
-                        //
-                        // render compiled template
-                        //
-                        $_template->properties['unifunc']($_template);
-                        // any unclosed {capture} tags ?
-                        if (isset($_template->_capture_stack[0][0])) {
-                            $_template->capture_error();
-                        }
-                        array_shift($_template->_capture_stack);
-                    } catch (Exception $e) {
-                        ob_get_clean();
-                        throw $e;
-                    }
-                }
-            } else {
-                if ($_template->source->uncompiled) {
-                    if ($this->smarty->debugging) {
-                        Smarty_Internal_Debug::start_render($_template);
-                    }
-                    try {
-                        ob_start();
-                        $_template->source->renderUncompiled($_template);
-                    } catch (Exception $e) {
-                        ob_get_clean();
-                        throw $e;
-                    }
-                } else {
-                    throw new SmartyException("Resource '$_template->source->type' must have 'renderUncompiled' method");
-                }
-            }
-            $_output = ob_get_clean();
-            if (!$_template->source->recompiled && empty($_template->properties['file_dependency'][$_template->source->uid])) {
-                $_template->properties['file_dependency'][$_template->source->uid] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type);
-            }
-            if ($_template->parent instanceof Smarty_Internal_Template) {
-                $_template->parent->properties['file_dependency'] = array_merge($_template->parent->properties['file_dependency'], $_template->properties['file_dependency']);
-                foreach ($_template->required_plugins as $code => $tmp1) {
-                    foreach ($tmp1 as $name => $tmp) {
-                        foreach ($tmp as $type => $data) {
-                            $_template->parent->required_plugins[$code][$name][$type] = $data;
-                        }
-                    }
-                }
-            }
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_render($_template);
-            }
-            // write to cache when nessecary
-            if (!$_template->source->recompiled && ($_template->caching == Smarty::CACHING_LIFETIME_SAVED || $_template->caching == Smarty::CACHING_LIFETIME_CURRENT)) {
-                if ($this->smarty->debugging) {
-                    Smarty_Internal_Debug::start_cache($_template);
-                }
-                $_template->properties['has_nocache_code'] = false;
-                // get text between non-cached items
-                $cache_split = preg_split("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output);
-                // get non-cached items
-                preg_match_all("!/\*%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!s", $_output, $cache_parts);
-                $output = '';
-                // loop over items, stitch back together
-                foreach ($cache_split as $curr_idx => $curr_split) {
-                    // escape PHP tags in template content
-                    $output .= preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php echo \'$1\'; ?>', $curr_split);
-                    if (isset($cache_parts[0][$curr_idx])) {
-                        $_template->properties['has_nocache_code'] = true;
-                        // remove nocache tags from cache output
-                        $output .= preg_replace("!/\*/?%%SmartyNocache:{$_template->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]);
-                    }
-                }
-                if (!$no_output_filter && !$_template->has_nocache_code && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
-                    $output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $_template);
-                }
-                // rendering (must be done before writing cache file because of {function} nocache handling)
-                $_smarty_tpl = $_template;
-                try {
-                    ob_start();
-                    eval("?>" . $output);
-                    $_output = ob_get_clean();
-                } catch (Exception $e) {
-                    ob_get_clean();
-                    throw $e;
-                }
-                // write cache file content
-                $_template->writeCachedContent($output);
-                if ($this->smarty->debugging) {
-                    Smarty_Internal_Debug::end_cache($_template);
-                }
-            } else {
-                // var_dump('renderTemplate', $_template->has_nocache_code, $_template->template_resource, $_template->properties['nocache_hash'], $_template->parent->properties['nocache_hash'], $_output);
-                if (!empty($_template->properties['nocache_hash']) && !empty($_template->parent->properties['nocache_hash'])) {
-                    // replace nocache_hash
-                    $_output = str_replace("{$_template->properties['nocache_hash']}", $_template->parent->properties['nocache_hash'], $_output);
-                    $_template->parent->has_nocache_code = $_template->parent->has_nocache_code || $_template->has_nocache_code;
-                }
-            }
-        } else {
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::start_cache($_template);
-            }
-            try {
-                ob_start();
-                array_unshift($_template->_capture_stack,array());
-                //
-                // render cached template
-                //
-                $_template->properties['unifunc']($_template);
-                // any unclosed {capture} tags ?
-                if (isset($_template->_capture_stack[0][0])) {
-                    $_template->capture_error();
-                }
-                array_shift($_template->_capture_stack);
-                $_output = ob_get_clean();
-            } catch (Exception $e) {
-                ob_get_clean();
-                throw $e;
-            }
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::end_cache($_template);
-            }
-        }
-        if ((!$this->caching || $_template->has_nocache_code || $_template->source->recompiled) && !$no_output_filter && (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output']))) {
-            $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_output, $_template);
-        }
-        if (isset($this->error_reporting)) {
-            error_reporting($_smarty_old_error_level);
-        }
-        // display or fetch
-        if ($display) {
-            if ($this->caching && $this->cache_modified_check) {
-                $_isCached = $_template->isCached() && !$_template->has_nocache_code;
-                $_last_modified_date = @substr($_SERVER['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_SERVER['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
-                if ($_isCached && $_template->cached->timestamp <= strtotime($_last_modified_date)) {
-                    switch (PHP_SAPI) {
-                        case 'cgi':         // php-cgi < 5.3
-                        case 'cgi-fcgi':    // php-cgi >= 5.3
-                        case 'fpm-fcgi':    // php-fpm >= 5.3.3
-                        header('Status: 304 Not Modified');
-                        break;
-
-                        case 'cli':
-                        if (/* ^phpunit */!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS'])/* phpunit$ */) {
-                            $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = '304 Not Modified';
-                        }
-                        break;
-
-                        default:
-                        header('HTTP/1.1 304 Not Modified');
-                        break;
-                    }
-                } else {
-                    switch (PHP_SAPI) {
-                        case 'cli':
-                        if (/* ^phpunit */!empty($_SERVER['SMARTY_PHPUNIT_DISABLE_HEADERS'])/* phpunit$ */) {
-                            $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT';
-                        }
-                        break;
-
-                        default:
-                        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $_template->cached->timestamp) . ' GMT');
-                        break;
-                    }
-                    echo $_output;
-                }
-            } else {
-                echo $_output;
-            }
-            // debug output
-            if ($this->smarty->debugging) {
-                Smarty_Internal_Debug::display_debug($this);
-            }
-            if ($merge_tpl_vars) {
-                // restore local variables
-                $_template->tpl_vars = $save_tpl_vars;
-                $_template->config_vars =  $save_config_vars;
-            }
-            return;
-        } else {
-            if ($merge_tpl_vars) {
-                // restore local variables
-                $_template->tpl_vars = $save_tpl_vars;
-                $_template->config_vars =  $save_config_vars;
-            }
-            // return fetched content
-            return $_output;
-        }
-    }
-
-    /**
-     * displays a Smarty template
-     *
-     * @param string $template   the resource handle of the template file or template object
-     * @param mixed  $cache_id   cache id to be used with this template
-     * @param mixed  $compile_id compile id to be used with this template
-     * @param object $parent     next higher level of Smarty variables
-     */
-    public function display($template = null, $cache_id = null, $compile_id = null, $parent = null)
-    {
-        // display template
-        $this->fetch($template, $cache_id, $compile_id, $parent, true);
-    }
-
-    /**
-     * test if cache is valid
-     *
-     * @param string|object $template   the resource handle of the template file or template object
-     * @param mixed         $cache_id   cache id to be used with this template
-     * @param mixed         $compile_id compile id to be used with this template
-     * @param object        $parent     next higher level of Smarty variables
-     * @return boolean cache status
-     */
-    public function isCached($template = null, $cache_id = null, $compile_id = null, $parent = null)
-    {
-        if ($template === null && $this instanceof $this->template_class) {
-            return $this->cached->valid;
-        }
-        if (!($template instanceof $this->template_class)) {
-            if ($parent === null) {
-                $parent = $this;
-            }
-            $template = $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
-        }
-        // return cache status of template
-        return $template->cached->valid;
-    }
-
-    /**
-     * creates a data object
-     *
-     * @param object $parent next higher level of Smarty variables
-     * @returns Smarty_Data data object
-     */
-    public function createData($parent = null)
-    {
-        return new Smarty_Data($parent, $this);
-    }
-
-    /**
-     * Registers plugin to be used in templates
-     *
-     * @param string   $type       plugin type
-     * @param string   $tag        name of template tag
-     * @param callback $callback   PHP callback to register
-     * @param boolean  $cacheable  if true (default) this fuction is cachable
-     * @param array    $cache_attr caching attributes if any
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException when the plugin tag is invalid
-     */
-    public function registerPlugin($type, $tag, $callback, $cacheable = true, $cache_attr = null)
-    {
-        if (isset($this->smarty->registered_plugins[$type][$tag])) {
-            throw new SmartyException("Plugin tag \"{$tag}\" already registered");
-        } elseif (!is_callable($callback)) {
-            throw new SmartyException("Plugin \"{$tag}\" not callable");
-        } else {
-            $this->smarty->registered_plugins[$type][$tag] = array($callback, (bool) $cacheable, (array) $cache_attr);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Unregister Plugin
-     *
-     * @param string $type of plugin
-     * @param string $tag name of plugin
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterPlugin($type, $tag)
-    {
-        if (isset($this->smarty->registered_plugins[$type][$tag])) {
-            unset($this->smarty->registered_plugins[$type][$tag]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @param string $type name of resource type
-     * @param Smarty_Resource|array $callback or instance of Smarty_Resource, or array of callbacks to handle resource (deprecated)
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function registerResource($type, $callback)
-    {
-        $this->smarty->registered_resources[$type] = $callback instanceof Smarty_Resource ? $callback : array($callback, false);
-        return $this;
-    }
-
-    /**
-     * Unregisters a resource
-     *
-     * @param string $type name of resource type
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterResource($type)
-    {
-        if (isset($this->smarty->registered_resources[$type])) {
-            unset($this->smarty->registered_resources[$type]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a cache resource to cache a template's output
-     *
-     * @param string               $type     name of cache resource type
-     * @param Smarty_CacheResource $callback instance of Smarty_CacheResource to handle output caching
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function registerCacheResource($type, Smarty_CacheResource $callback)
-    {
-        $this->smarty->registered_cache_resources[$type] = $callback;
-        return $this;
-    }
-
-    /**
-     * Unregisters a cache resource
-     *
-     * @param string $type name of cache resource type
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterCacheResource($type)
-    {
-        if (isset($this->smarty->registered_cache_resources[$type])) {
-            unset($this->smarty->registered_cache_resources[$type]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @param string  $object        name of template object
-     * @param object  $object_impl   the referenced PHP object to register
-     * @param array   $allowed       list of allowed methods (empty = all)
-     * @param boolean $smarty_args   smarty argument format, else traditional
-     * @param array   $block_methods list of block-methods
-     * @param array $block_functs list of methods that are block format
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if any of the methods in $allowed or $block_methods are invalid
-     */
-    public function registerObject($object_name, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
-    {
-        // test if allowed methodes callable
-        if (!empty($allowed)) {
-            foreach ((array) $allowed as $method) {
-                if (!is_callable(array($object_impl, $method))) {
-                    throw new SmartyException("Undefined method '$method' in registered object");
-                }
-            }
-        }
-        // test if block methodes callable
-        if (!empty($block_methods)) {
-            foreach ((array) $block_methods as $method) {
-                if (!is_callable(array($object_impl, $method))) {
-                    throw new SmartyException("Undefined method '$method' in registered object");
-                }
-            }
-        }
-        // register the object
-        $this->smarty->registered_objects[$object_name] =
-        array($object_impl, (array) $allowed, (boolean) $smarty_args, (array) $block_methods);
-        return $this;
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param string $name object name
-     * @return object
-     * @throws SmartyException if no such object is found
-     */
-    public function getRegisteredObject($name)
-    {
-        if (!isset($this->smarty->registered_objects[$name])) {
-            throw new SmartyException("'$name' is not a registered object");
-        }
-        if (!is_object($this->smarty->registered_objects[$name][0])) {
-            throw new SmartyException("registered '$name' is not an object");
-        }
-        return $this->smarty->registered_objects[$name][0];
-    }
-
-    /**
-     * unregister an object
-     *
-     * @param string $name object name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterObject($name)
-    {
-        if (isset($this->smarty->registered_objects[$name])) {
-            unset($this->smarty->registered_objects[$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers static classes to be used in templates
-     *
-     * @param string $class name of template class
-     * @param string $class_impl the referenced PHP class to register
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if $class_impl does not refer to an existing class
-     */
-    public function registerClass($class_name, $class_impl)
-    {
-        // test if exists
-        if (!class_exists($class_impl)) {
-            throw new SmartyException("Undefined class '$class_impl' in register template class");
-        }
-        // register the class
-        $this->smarty->registered_classes[$class_name] = $class_impl;
-        return $this;
-    }
-
-    /**
-     * Registers a default plugin handler
-     *
-     * @param callable $callback class/method name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if $callback is not callable
-     */
-    public function registerDefaultPluginHandler($callback)
-    {
-        if (is_callable($callback)) {
-            $this->smarty->default_plugin_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default plugin handler '$callback' not callable");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a default template handler
-     *
-     * @param callable $callback class/method name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if $callback is not callable
-     */
-    public function registerDefaultTemplateHandler($callback)
-    {
-        if (is_callable($callback)) {
-            $this->smarty->default_template_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default template handler '$callback' not callable");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a default template handler
-     *
-     * @param callable $callback class/method name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     * @throws SmartyException if $callback is not callable
-     */
-    public function registerDefaultConfigHandler($callback)
-    {
-        if (is_callable($callback)) {
-            $this->smarty->default_config_handler_func = $callback;
-        } else {
-            throw new SmartyException("Default config handler '$callback' not callable");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Registers a filter function
-     *
-     * @param string $type filter type
-     * @param callback $callback
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function registerFilter($type, $callback)
-    {
-        $this->smarty->registered_filters[$type][$this->_get_filter_name($callback)] = $callback;
-        return $this;
-    }
-
-    /**
-     * Unregisters a filter function
-     *
-     * @param string $type filter type
-     * @param callback $callback
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unregisterFilter($type, $callback)
-    {
-        $name = $this->_get_filter_name($callback);
-        if (isset($this->smarty->registered_filters[$type][$name])) {
-            unset($this->smarty->registered_filters[$type][$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return internal filter name
-     *
-     * @param callback $function_name
-     * @return string internal filter name
-     */
-    public function _get_filter_name($function_name)
-    {
-        if (is_array($function_name)) {
-            $_class_name = (is_object($function_name[0]) ?
-            get_class($function_name[0]) : $function_name[0]);
-            return $_class_name . '_' . $function_name[1];
-        } else {
-            return $function_name;
-        }
-    }
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     * @throws SmartyException if filter could not be loaded
-     */
-    public function loadFilter($type, $name)
-    {
-        $_plugin = "smarty_{$type}filter_{$name}";
-        $_filter_name = $_plugin;
-        if ($this->smarty->loadPlugin($_plugin)) {
-            if (class_exists($_plugin, false)) {
-                $_plugin = array($_plugin, 'execute');
-            }
-            if (is_callable($_plugin)) {
-                $this->smarty->registered_filters[$type][$_filter_name] = $_plugin;
-                return true;
-            }
-        }
-        throw new SmartyException("{$type}filter \"{$name}\" not callable");
-    }
-
-    /**
-     * unload a filter of specified type and name
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     * @return Smarty_Internal_Templatebase current Smarty_Internal_Templatebase (or Smarty or Smarty_Internal_Template) instance for chaining
-     */
-    public function unloadFilter($type, $name)
-    {
-        $_filter_name = "smarty_{$type}filter_{$name}";
-        if (isset($this->smarty->registered_filters[$type][$_filter_name])) {
-            unset ($this->smarty->registered_filters[$type][$_filter_name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * preg_replace callback to convert camelcase getter/setter to underscore property names
-     *
-     * @param string $match match string
-     * @return string replacemant
-     */
-    private function replaceCamelcase($match) {
-        return "_" . strtolower($match[1]);
-    }
-
-    /**
-     * Handle unknown class methods
-     *
-     * @param string $name unknown method-name
-     * @param array  $args argument array
-     */
-    public function __call($name, $args)
-    {
-        static $_prefixes = array('set' => true, 'get' => true);
-        static $_resolved_property_name = array();
-        static $_resolved_property_source = array();
-
-        // method of Smarty object?
-        if (method_exists($this->smarty, $name)) {
-            return call_user_func_array(array($this->smarty, $name), $args);
-        }
-        // see if this is a set/get for a property
-        $first3 = strtolower(substr($name, 0, 3));
-        if (isset($_prefixes[$first3]) && isset($name[3]) && $name[3] !== '_') {
-            if (isset($_resolved_property_name[$name])) {
-                $property_name = $_resolved_property_name[$name];
-            } else {
-                // try to keep case correct for future PHP 6.0 case-sensitive class methods
-                // lcfirst() not available < PHP 5.3.0, so improvise
-                $property_name = strtolower(substr($name, 3, 1)) . substr($name, 4);
-                // convert camel case to underscored name
-                $property_name = preg_replace_callback('/([A-Z])/', array($this,'replaceCamelcase'), $property_name);
-                $_resolved_property_name[$name] = $property_name;
-            }
-            if (isset($_resolved_property_source[$property_name])) {
-                $_is_this = $_resolved_property_source[$property_name];
-            } else {
-                $_is_this = null;
-                if (property_exists($this, $property_name)) {
-                    $_is_this = true;
-                } else if (property_exists($this->smarty, $property_name)) {
-                    $_is_this = false;
-                }
-                $_resolved_property_source[$property_name] = $_is_this;
-            }
-            if ($_is_this) {
-                if ($first3 == 'get')
-                return $this->$property_name;
-                else
-                return $this->$property_name = $args[0];
-            } else if ($_is_this === false) {
-                if ($first3 == 'get')
-                return $this->smarty->$property_name;
-                else
-                return $this->smarty->$property_name = $args[0];
-            } else {
-                throw new SmartyException("property '$property_name' does not exist.");
-                return false;
-            }
-        }
-        if ($name == 'Smarty') {
-            throw new SmartyException("PHP5 requires you to call __construct() instead of Smarty()");
-        }
-        // must be unknown
-        throw new SmartyException("Call of unknown method '$name'.");
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_templatecompilerbase.php b/resources/libs/smarty/sysplugins/smarty_internal_templatecompilerbase.php
deleted file mode 100644
index a9264c73c..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_templatecompilerbase.php
+++ /dev/null
@@ -1,632 +0,0 @@
-<?php
-/**
- * Smarty Internal Plugin Smarty Template Compiler Base
- *
- * This file contains the basic classes and methodes for compiling Smarty templates with lexer/parser
- *
- * @package Smarty
- * @subpackage Compiler
- * @author Uwe Tews
- */
-
-/**
- * Main abstract compiler class
- *
- * @package Smarty
- * @subpackage Compiler
- */
-abstract class Smarty_Internal_TemplateCompilerBase {
-
-    /**
-     * hash for nocache sections
-     *
-     * @var mixed
-     */
-    private $nocache_hash = null;
-    /**
-     * suppress generation of nocache code
-     *
-     * @var bool
-     */
-    public $suppressNocacheProcessing = false;
-    /**
-     * suppress generation of merged template code
-     *
-     * @var bool
-     */
-    public $suppressMergedTemplates = false;
-    /**
-     * compile tag objects
-     *
-     * @var array
-     */
-    public static $_tag_objects = array();
-    /**
-     * tag stack
-     *
-     * @var array
-     */
-    public $_tag_stack = array();
-    /**
-     * current template
-     *
-     * @var Smarty_Internal_Template
-     */
-    public $template = null;
-    /**
-     * merged templates
-     *
-     * @var array
-     */
-    public $merged_templates = array();
-    /**
-     * flag when compiling {block}
-     *
-     * @var bool
-     */
-    public $inheritance = false;
-    /**
-     * plugins loaded by default plugin handler
-     *
-     * @var array
-     */
-    public $default_handler_plugins = array();
-    /**
-     * saved preprocessed modifier list
-     *
-     * @var mixed
-     */
-    public $default_modifier_list = null;
-    /**
-     * force compilation of complete template as nocache
-     * @var boolean
-     */
-    public $forceNocache = false;
-    /**
-     * suppress Smarty header code in compiled template
-     * @var bool
-     */
-    public $suppressHeader = false;
-    /**
-     * suppress template property header code in compiled template
-     * @var bool
-     */
-    public $suppressTemplatePropertyHeader = false;
-    /**
-     * flag if compiled template file shall we written
-     * @var bool
-     */
-    public $write_compiled_code = true;
-    /**
-     * flag if currently a template function is compiled
-     * @var bool
-     */
-    public $compiles_template_function = false;
-    /**
-     * called subfuntions from template function
-     * @var array
-     */
-    public $called_functions = array();
-    /**
-     * flags for used modifier plugins
-     * @var array
-     */
-    public $modifier_plugins = array();
-
-    /**
-     * Initialize compiler
-     */
-    public function __construct()
-    {
-        $this->nocache_hash = str_replace('.', '-', uniqid(rand(), true));
-    }
-
-    /**
-     * Method to compile a Smarty template
-     *
-     * @param  Smarty_Internal_Template $template template object to compile
-     * @return bool true if compiling succeeded, false if it failed
-     */
-    public function compileTemplate(Smarty_Internal_Template $template)
-    {
-        if (empty($template->properties['nocache_hash'])) {
-            $template->properties['nocache_hash'] = $this->nocache_hash;
-        } else {
-            $this->nocache_hash = $template->properties['nocache_hash'];
-        }
-        // flag for nochache sections
-        $this->nocache = false;
-        $this->tag_nocache = false;
-        // save template object in compiler class
-        $this->template = $template;
-        // reset has noche code flag
-        $this->template->has_nocache_code = false;
-        $this->smarty->_current_file = $saved_filepath = $this->template->source->filepath;
-        // template header code
-        $template_header = '';
-        if (!$this->suppressHeader) {
-            $template_header .= "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "\n";
-            $template_header .= "         compiled from \"" . $this->template->source->filepath . "\" */ ?>\n";
-        }
-
-        do {
-            // flag for aborting current and start recompile
-            $this->abort_and_recompile = false;
-            // get template source
-            $_content = $template->source->content;
-            // run prefilter if required
-            if (isset($this->smarty->autoload_filters['pre']) || isset($this->smarty->registered_filters['pre'])) {
-                $template->source->content = $_content = Smarty_Internal_Filter_Handler::runFilter('pre', $_content, $template);
-            }
-            // on empty template just return header
-            if ($_content == '') {
-                if ($this->suppressTemplatePropertyHeader) {
-                    $code = '';
-                } else {
-                    $code = $template_header . $template->createTemplateCodeFrame();
-                }
-                return $code;
-            }
-            // call compiler
-            $_compiled_code = $this->doCompile($_content);
-        } while ($this->abort_and_recompile);
-        $this->template->source->filepath = $saved_filepath;
-        // free memory
-        unset($this->parser->root_buffer, $this->parser->current_buffer, $this->parser, $this->lex, $this->template);
-        self::$_tag_objects = array();
-        // return compiled code to template object
-        $merged_code = '';
-        if (!$this->suppressMergedTemplates && !empty($this->merged_templates)) {
-            foreach ($this->merged_templates as $code) {
-                $merged_code .= $code;
-            }
-            // run postfilter if required on merged code
-            if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
-                $merged_code = Smarty_Internal_Filter_Handler::runFilter('post', $merged_code, $template);
-            }
-        }
-        // run postfilter if required on compiled template code
-        if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
-            $_compiled_code = Smarty_Internal_Filter_Handler::runFilter('post', $_compiled_code, $template);
-        }
-        if ($this->suppressTemplatePropertyHeader) {
-            $code = $_compiled_code . $merged_code;
-        } else {
-            $code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code;
-        }
-        return $code;
-    }
-
-    /**
-     * Compile Tag
-     *
-     * This is a call back from the lexer/parser
-     * It executes the required compile plugin for the Smarty tag
-     *
-     * @param string $tag       tag name
-     * @param array  $args      array with tag attributes
-     * @param array  $parameter array with compilation parameter
-     * @return string compiled code
-     */
-    public function compileTag($tag, $args, $parameter = array())
-    {
-        // $args contains the attributes parsed and compiled by the lexer/parser
-        // assume that tag does compile into code, but creates no HTML output
-        $this->has_code = true;
-        $this->has_output = false;
-        // log tag/attributes
-        if (isset($this->smarty->get_used_tags) && $this->smarty->get_used_tags) {
-            $this->template->used_tags[] = array($tag, $args);
-        }
-        // check nocache option flag
-        if (in_array("'nocache'",$args) || in_array(array('nocache'=>'true'),$args)
-        || in_array(array('nocache'=>'"true"'),$args) || in_array(array('nocache'=>"'true'"),$args)) {
-            $this->tag_nocache = true;
-        }
-        // compile the smarty tag (required compile classes to compile the tag are autoloaded)
-        if (($_output = $this->callTagCompiler($tag, $args, $parameter)) === false) {
-            if (isset($this->smarty->template_functions[$tag])) {
-                // template defined by {template} tag
-                $args['_attr']['name'] = "'" . $tag . "'";
-                $_output = $this->callTagCompiler('call', $args, $parameter);
-            }
-        }
-        if ($_output !== false) {
-            if ($_output !== true) {
-                // did we get compiled code
-                if ($this->has_code) {
-                    // Does it create output?
-                    if ($this->has_output) {
-                        $_output .= "\n";
-                    }
-                    // return compiled code
-                    return $_output;
-                }
-            }
-            // tag did not produce compiled code
-            return '';
-        } else {
-            // map_named attributes
-            if (isset($args['_attr'])) {
-                foreach ($args['_attr'] as $key => $attribute) {
-                    if (is_array($attribute)) {
-                        $args = array_merge($args, $attribute);
-                    }
-                }
-            }
-            // not an internal compiler tag
-            if (strlen($tag) < 6 || substr($tag, -5) != 'close') {
-                // check if tag is a registered object
-                if (isset($this->smarty->registered_objects[$tag]) && isset($parameter['object_methode'])) {
-                    $methode = $parameter['object_methode'];
-                    if (!in_array($methode, $this->smarty->registered_objects[$tag][3]) &&
-                    (empty($this->smarty->registered_objects[$tag][1]) || in_array($methode, $this->smarty->registered_objects[$tag][1]))) {
-                        return $this->callTagCompiler('private_object_function', $args, $parameter, $tag, $methode);
-                    } elseif (in_array($methode, $this->smarty->registered_objects[$tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
-                    } else {
-                        return $this->trigger_template_error ('unallowed methode "' . $methode . '" in registered object "' . $tag . '"', $this->lex->taglineno);
-                    }
-                }
-                // check if tag is registered
-                foreach (array(Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK) as $plugin_type) {
-                    if (isset($this->smarty->registered_plugins[$plugin_type][$tag])) {
-                        // if compiler function plugin call it now
-                        if ($plugin_type == Smarty::PLUGIN_COMPILER) {
-                            $new_args = array();
-                            foreach ($args as $key => $mixed) {
-                            	if (is_array($mixed)) {
-                                	$new_args = array_merge($new_args, $mixed);
-                                } else {
-                                	$new_args[$key] = $mixed;
-                                }
-                            }
-                            if (!$this->smarty->registered_plugins[$plugin_type][$tag][1]) {
-                                $this->tag_nocache = true;
-                            }
-                            $function = $this->smarty->registered_plugins[$plugin_type][$tag][0];
-                            if (!is_array($function)) {
-                                return $function($new_args, $this);
-                            } else if (is_object($function[0])) {
-                                return $this->smarty->registered_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
-                            } else {
-                                return call_user_func_array($function, array($new_args, $this));
-                            }
-                        }
-                        // compile registered function or block function
-                        if ($plugin_type == Smarty::PLUGIN_FUNCTION || $plugin_type == Smarty::PLUGIN_BLOCK) {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
-                        }
-
-                    }
-                }
-                // check plugins from plugins folder
-                foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                    if ($plugin_type == Smarty::PLUGIN_BLOCK && $this->smarty->loadPlugin('smarty_compiler_' . $tag) && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))) {
-                        $plugin = 'smarty_compiler_' . $tag;
-                        if (is_callable($plugin)) {
-                            // convert arguments format for old compiler plugins
-                            $new_args = array();
-                            foreach ($args as $key => $mixed) {
-                            	if (is_array($mixed)) {
-                                	$new_args = array_merge($new_args, $mixed);
-                                } else {
-                                	$new_args[$key] = $mixed;
-                                }
-                            }
-                            return $plugin($new_args, $this->smarty);
-                        }
-                        if (class_exists($plugin, false)) {
-                            $plugin_object = new $plugin;
-                            if (method_exists($plugin_object, 'compile')) {
-                                return $plugin_object->compile($args, $this);
-                            }
-                        }
-                        throw new SmartyException("Plugin \"{$tag}\" not callable");
-                    } else {
-                        if ($function = $this->getPlugin($tag, $plugin_type)) {
-                            if(!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-                                return $this->callTagCompiler('private_' . $plugin_type . '_plugin', $args, $parameter, $tag, $function);
-                            }
-                        }
-                    }
-                }
-                if (is_callable($this->smarty->default_plugin_handler_func)) {
-                    $found = false;
-                    // look for already resolved tags
-                    foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                        if (isset($this->default_handler_plugins[$plugin_type][$tag])) {
-                            $found = true;
-                            break;
-                        }
-                    }
-                    if (!$found) {
-                        // call default handler
-                        foreach ($this->smarty->plugin_search_order as $plugin_type) {
-                            if ($this->getPluginFromDefaultHandler($tag, $plugin_type)) {
-                                $found = true;
-                                break;
-                            }
-                        }
-                    }
-                    if ($found) {
-                        // if compiler function plugin call it now
-                        if ($plugin_type == Smarty::PLUGIN_COMPILER) {
-                            $new_args = array();
-                            foreach ($args as $mixed) {
-                                $new_args = array_merge($new_args, $mixed);
-                            }
-                            $function = $this->default_handler_plugins[$plugin_type][$tag][0];
-                            if (!is_array($function)) {
-                                return $function($new_args, $this);
-                            } else if (is_object($function[0])) {
-                                return $this->default_handler_plugins[$plugin_type][$tag][0][0]->$function[1]($new_args, $this);
-                            } else {
-                                return call_user_func_array($function, array($new_args, $this));
-                            }
-                        } else {
-                            return $this->callTagCompiler('private_registered_' . $plugin_type, $args, $parameter, $tag);
-                        }
-                    }
-                }
-            } else {
-                // compile closing tag of block function
-                $base_tag = substr($tag, 0, -5);
-                // check if closing tag is a registered object
-                if (isset($this->smarty->registered_objects[$base_tag]) && isset($parameter['object_methode'])) {
-                    $methode = $parameter['object_methode'];
-                    if (in_array($methode, $this->smarty->registered_objects[$base_tag][3])) {
-                        return $this->callTagCompiler('private_object_block_function', $args, $parameter, $tag, $methode);
-                    } else {
-                        return $this->trigger_template_error ('unallowed closing tag methode "' . $methode . '" in registered object "' . $base_tag . '"', $this->lex->taglineno);
-                    }
-                }
-                // registered block tag ?
-                if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK][$base_tag]) || isset($this->default_handler_plugins[Smarty::PLUGIN_BLOCK][$base_tag])) {
-                    return $this->callTagCompiler('private_registered_block', $args, $parameter, $tag);
-                }
-                // block plugin?
-                if ($function = $this->getPlugin($base_tag, Smarty::PLUGIN_BLOCK)) {
-                    return $this->callTagCompiler('private_block_plugin', $args, $parameter, $tag, $function);
-                }
-                if ($this->smarty->loadPlugin('smarty_compiler_' . $tag)) {
-                    $plugin = 'smarty_compiler_' . $tag;
-                    if (is_callable($plugin)) {
-                        return $plugin($args, $this->smarty);
-                    }
-                    if (class_exists($plugin, false)) {
-                        $plugin_object = new $plugin;
-                        if (method_exists($plugin_object, 'compile')) {
-                            return $plugin_object->compile($args, $this);
-                        }
-                    }
-                    throw new SmartyException("Plugin \"{$tag}\" not callable");
-                }
-            }
-            $this->trigger_template_error ("unknown tag \"" . $tag . "\"", $this->lex->taglineno);
-        }
-    }
-
-    /**
-     * lazy loads internal compile plugin for tag and calls the compile methode
-     *
-     * compile objects cached for reuse.
-     * class name format:  Smarty_Internal_Compile_TagName
-     * plugin filename format: Smarty_Internal_Tagname.php
-     *
-     * @param string $tag   tag name
-     * @param array $args   list of tag attributes
-     * @param mixed $param1 optional parameter
-     * @param mixed $param2 optional parameter
-     * @param mixed $param3 optional parameter
-     * @return string compiled code
-     */
-    public function callTagCompiler($tag, $args, $param1 = null, $param2 = null, $param3 = null)
-    {
-        // re-use object if already exists
-        if (isset(self::$_tag_objects[$tag])) {
-            // compile this tag
-            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
-        }
-        // lazy load internal compiler plugin
-        $class_name = 'Smarty_Internal_Compile_' . $tag;
-        if ($this->smarty->loadPlugin($class_name)) {
-            // check if tag allowed by security
-            if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
-            // use plugin if found
-            self::$_tag_objects[$tag] = new $class_name;
-            // compile this tag
-            return self::$_tag_objects[$tag]->compile($args, $this, $param1, $param2, $param3);
-            }
-        }
-        // no internal compile plugin for this tag
-        return false;
-    }
-
-    /**
-     * Check for plugins and return function name
-     *
-     * @param string $pugin_name  name of plugin or function
-     * @param string $plugin_type type of plugin
-     * @return string call name of function
-     */
-    public function getPlugin($plugin_name, $plugin_type)
-    {
-        $function = null;
-        if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-            if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
-            } else if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type] = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'];
-            }
-        } else {
-            if (isset($this->template->required_plugins['compiled'][$plugin_name][$plugin_type])) {
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
-            } else if (isset($this->template->required_plugins['nocache'][$plugin_name][$plugin_type])) {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type] = $this->template->required_plugins['nocache'][$plugin_name][$plugin_type];
-                $function = $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'];
-            }
-        }
-        if (isset($function)) {
-            if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[$plugin_name] = true;
-            }
-            return $function;
-        }
-        // loop through plugin dirs and find the plugin
-        $function = 'smarty_' . $plugin_type . '_' . $plugin_name;
-        $file = $this->smarty->loadPlugin($function, false);
-
-        if (is_string($file)) {
-            if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['nocache'][$plugin_name][$plugin_type]['function'] = $function;
-            } else {
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['file'] = $file;
-                $this->template->required_plugins['compiled'][$plugin_name][$plugin_type]['function'] = $function;
-            }
-            if ($plugin_type == 'modifier') {
-                $this->modifier_plugins[$plugin_name] = true;
-            }
-            return $function;
-        }
-        if (is_callable($function)) {
-            // plugin function is defined in the script
-            return $function;
-        }
-        return false;
-    }
-
-    /**
-     * Check for plugins by default plugin handler
-     *
-     * @param string $tag         name of tag
-     * @param string $plugin_type type of plugin
-     * @return boolean true if found
-     */
-    public function getPluginFromDefaultHandler($tag, $plugin_type)
-    {
-        $callback = null;
-        $script = null;
-        $cacheable = true;
-        $result = call_user_func_array(
-            $this->smarty->default_plugin_handler_func,
-            array($tag, $plugin_type, $this->template, &$callback, &$script, &$cacheable)
-        );
-        if ($result) {
-            $this->tag_nocache = $this->tag_nocache || !$cacheable;
-            if ($script !== null) {
-                if (is_file($script)) {
-                    if ($this->template->caching && ($this->nocache || $this->tag_nocache)) {
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['nocache'][$tag][$plugin_type]['function'] = $callback;
-                    } else {
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['file'] = $script;
-                        $this->template->required_plugins['compiled'][$tag][$plugin_type]['function'] = $callback;
-                    }
-                    include_once $script;
-                }  else {
-                    $this->trigger_template_error("Default plugin handler: Returned script file \"{$script}\" for \"{$tag}\" not found");
-                }
-            }
-            if (!is_string($callback) && !(is_array($callback) && is_string($callback[0]) && is_string($callback[1]))) {
-                $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" must be a static function name or array of class and function name");
-            }
-            if (is_callable($callback)) {
-                $this->default_handler_plugins[$plugin_type][$tag] = array($callback, true, array());
-                return true;
-            } else {
-                $this->trigger_template_error("Default plugin handler: Returned callback for \"{$tag}\" not callable");
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Inject inline code for nocache template sections
-     *
-     * This method gets the content of each template element from the parser.
-     * If the content is compiled code and it should be not cached the code is injected
-     * into the rendered output.
-     *
-     * @param string  $content content of template element
-     * @param boolean $is_code true if content is compiled code
-     * @return string content
-     */
-    public function processNocacheCode($content, $is_code)
-    {
-        // If the template is not evaluated and we have a nocache section and or a nocache tag
-        if ($is_code && !empty($content)) {
-            // generate replacement code
-            if ((!($this->template->source->recompiled) || $this->forceNocache) && $this->template->caching && !$this->suppressNocacheProcessing &&
-            ($this->nocache || $this->tag_nocache || $this->forceNocache == 2)) {
-                $this->template->has_nocache_code = true;
-                $_output = str_replace("'", "\'", $content);
-                $_output = str_replace('\\\\', '\\\\\\', $_output);
-                $_output = str_replace("^#^", "'", $_output);
-                $_output = "<?php echo '/*%%SmartyNocache:{$this->nocache_hash}%%*/" . $_output . "/*/%%SmartyNocache:{$this->nocache_hash}%%*/';?>\n";
-                // make sure we include modifer plugins for nocache code
-                foreach ($this->modifier_plugins as $plugin_name => $dummy) {
-                    if (isset($this->template->required_plugins['compiled'][$plugin_name]['modifier'])) {
-                        $this->template->required_plugins['nocache'][$plugin_name]['modifier'] = $this->template->required_plugins['compiled'][$plugin_name]['modifier'];
-                    }
-                }
-            } else {
-                $_output = $content;
-            }
-        } else {
-            $_output = $content;
-        }
-        $this->modifier_plugins = array();
-        $this->suppressNocacheProcessing = false;
-        $this->tag_nocache = false;
-        return $_output;
-    }
-
-    /**
-     * display compiler error messages without dying
-     *
-     * If parameter $args is empty it is a parser detected syntax error.
-     * In this case the parser is called to obtain information about expected tokens.
-     *
-     * If parameter $args contains a string this is used as error message
-     *
-     * @param string $args individual error message or null
-     * @param string $line line-number
-     * @throws SmartyCompilerException when an unexpected token is found
-     */
-    public function trigger_template_error($args = null, $line = null)
-    {
-        // get template source line which has error
-        if (!isset($line)) {
-            $line = $this->lex->line;
-        }
-        $match = preg_split("/\n/", $this->lex->data);
-        $error_text = 'Syntax Error in template "' . $this->template->source->filepath . '"  on line ' . $line . ' "' . htmlspecialchars(trim(preg_replace('![\t\r\n]+!',' ',$match[$line-1]))) . '" ';
-        if (isset($args)) {
-            // individual error message
-            $error_text .= $args;
-        } else {
-            // expected token from parser
-            $error_text .= ' - Unexpected "' . $this->lex->value.'"';
-            if (count($this->parser->yy_get_expected_tokens($this->parser->yymajor)) <= 4 ) {
-                foreach ($this->parser->yy_get_expected_tokens($this->parser->yymajor) as $token) {
-                    $exp_token = $this->parser->yyTokenName[$token];
-                    if (isset($this->lex->smarty_token_names[$exp_token])) {
-                        // token type from lexer
-                        $expect[] = '"' . $this->lex->smarty_token_names[$exp_token] . '"';
-                    } else {
-                        // otherwise internal token name
-                        $expect[] = $this->parser->yyTokenName[$token];
-                    }
-                }
-                $error_text .= ', expected one of: ' . implode(' , ', $expect);
-            }
-        }
-        throw new SmartyCompilerException($error_text);
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_templatelexer.php b/resources/libs/smarty/sysplugins/smarty_internal_templatelexer.php
deleted file mode 100644
index 5e4041241..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_templatelexer.php
+++ /dev/null
@@ -1,1184 +0,0 @@
-<?php
-/**
-* Smarty Internal Plugin Templatelexer
-*
-* This is the lexer to break the template source into tokens
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-/**
-* Smarty Internal Plugin Templatelexer
-*/
-class Smarty_Internal_Templatelexer
-{
-    public $data;
-    public $counter;
-    public $token;
-    public $value;
-    public $node;
-    public $line;
-    public $taglineno;
-    public $state = 1;
-    private $heredoc_id_stack = Array();
-    public $smarty_token_names = array (		// Text for parser error messages
-    				'IDENTITY'	=> '===',
-    				'NONEIDENTITY'	=> '!==',
-    				'EQUALS'	=> '==',
-    				'NOTEQUALS'	=> '!=',
-    				'GREATEREQUAL' => '(>=,ge)',
-    				'LESSEQUAL' => '(<=,le)',
-    				'GREATERTHAN' => '(>,gt)',
-    				'LESSTHAN' => '(<,lt)',
-    				'MOD' => '(%,mod)',
-    				'NOT'			=> '(!,not)',
-    				'LAND'		=> '(&&,and)',
-    				'LOR'			=> '(||,or)',
-    				'LXOR'			=> 'xor',
-    				'OPENP'		=> '(',
-    				'CLOSEP'	=> ')',
-    				'OPENB'		=> '[',
-    				'CLOSEB'	=> ']',
-    				'PTR'			=> '->',
-    				'APTR'		=> '=>',
-    				'EQUAL'		=> '=',
-    				'NUMBER'	=> 'number',
-    				'UNIMATH'	=> '+" , "-',
-    				'MATH'		=> '*" , "/" , "%',
-    				'INCDEC'	=> '++" , "--',
-    				'SPACE'		=> ' ',
-    				'DOLLAR'	=> '$',
-    				'SEMICOLON' => ';',
-    				'COLON'		=> ':',
-    				'DOUBLECOLON'		=> '::',
-    				'AT'		=> '@',
-    				'HATCH'		=> '#',
-    				'QUOTE'		=> '"',
-    				'BACKTICK'		=> '`',
-    				'VERT'		=> '|',
-    				'DOT'			=> '.',
-    				'COMMA'		=> '","',
-    				'ANDSYM'		=> '"&"',
-    				'QMARK'		=> '"?"',
-    				'ID'			=> 'identifier',
-    				'TEXT'		=> 'text',
-     				'FAKEPHPSTARTTAG'	=> 'Fake PHP start tag',
-     				'PHPSTARTTAG'	=> 'PHP start tag',
-     				'PHPENDTAG'	=> 'PHP end tag',
- 						'LITERALSTART'  => 'Literal start',
- 						'LITERALEND'    => 'Literal end',
-    				'LDELSLASH' => 'closing tag',
-    				'COMMENT' => 'comment',
-    				'AS' => 'as',
-    				'TO' => 'to',
-    				);
-
-
-    function __construct($data,$compiler)
-    {
-//        $this->data = preg_replace("/(\r\n|\r|\n)/", "\n", $data);
-        $this->data = $data;
-        $this->counter = 0;
-        $this->line = 1;
-        $this->smarty = $compiler->smarty;
-        $this->compiler = $compiler;
-        $this->ldel = preg_quote($this->smarty->left_delimiter,'/');
-        $this->ldel_length = strlen($this->smarty->left_delimiter);
-        $this->rdel = preg_quote($this->smarty->right_delimiter,'/');
-        $this->smarty_token_names['LDEL'] =	$this->smarty->left_delimiter;
-        $this->smarty_token_names['RDEL'] =	$this->smarty->right_delimiter;
-        $this->mbstring_overload = ini_get('mbstring.func_overload') & 2;
-     }
-
-
-    private $_yy_state = 1;
-    private $_yy_stack = array();
-
-    function yylex()
-    {
-        return $this->{'yylex' . $this->_yy_state}();
-    }
-
-    function yypushstate($state)
-    {
-        array_push($this->_yy_stack, $this->_yy_state);
-        $this->_yy_state = $state;
-    }
-
-    function yypopstate()
-    {
-        $this->_yy_state = array_pop($this->_yy_stack);
-    }
-
-    function yybegin($state)
-    {
-        $this->_yy_state = $state;
-    }
-
-
-
-    function yylex1()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 1,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-              10 => 0,
-              11 => 1,
-              13 => 0,
-              14 => 0,
-              15 => 0,
-              16 => 0,
-              17 => 0,
-              18 => 0,
-              19 => 0,
-              20 => 0,
-              21 => 0,
-              22 => 0,
-              23 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G(".$this->ldel."[$]smarty\\.block\\.child".$this->rdel.")|\G(\\{\\})|\G(".$this->ldel."\\*([\S\s]*?)\\*".$this->rdel.")|\G(".$this->ldel."strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/strip".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/strip\\s{1,}".$this->rdel.")|\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s*setfilter\\s+)|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS";
-
-        do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state TEXT');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-
-    } // end function
-
-
-    const TEXT = 1;
-    function yy_r1_1($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_SMARTYBLOCKCHILD;
-    }
-    function yy_r1_2($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-    function yy_r1_3($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_COMMENT;
-    }
-    function yy_r1_5($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
-    }
-    function yy_r1_6($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-    $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPON;
-  }
-    }
-    function yy_r1_7($yy_subpatterns)
-    {
-
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-    }
-    function yy_r1_8($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-    $this->token = Smarty_Internal_Templateparser::TP_STRIPOFF;
-  }
-    }
-    function yy_r1_9($yy_subpatterns)
-    {
-
-   $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-   $this->yypushstate(self::LITERAL);
-    }
-    function yy_r1_10($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_11($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_13($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_14($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_15($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSETFILTER;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_16($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r1_17($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r1_18($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r1_19($yy_subpatterns)
-    {
-
-  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
-    $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-  } elseif ($this->value == '<?xml') {
-      $this->token = Smarty_Internal_Templateparser::TP_XMLTAG;
-  } else {
-    $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
-    $this->value = substr($this->value, 0, 2);
-  }
-     }
-    function yy_r1_20($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-    }
-    function yy_r1_21($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-    function yy_r1_22($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-    }
-    function yy_r1_23($yy_subpatterns)
-    {
-
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $to = strlen($this->data);
-  }
-  preg_match("/{$this->ldel}|<\?|\?>|<%|%>/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
-  if (isset($match[0][1])) {
-    $to = $match[0][1];
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  }
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-
-    function yylex2()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 1,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-              10 => 0,
-              11 => 0,
-              12 => 0,
-              13 => 0,
-              14 => 0,
-              15 => 0,
-              16 => 0,
-              17 => 0,
-              18 => 0,
-              19 => 0,
-              20 => 1,
-              22 => 1,
-              24 => 1,
-              26 => 0,
-              27 => 0,
-              28 => 0,
-              29 => 0,
-              30 => 0,
-              31 => 0,
-              32 => 0,
-              33 => 0,
-              34 => 0,
-              35 => 0,
-              36 => 0,
-              37 => 0,
-              38 => 0,
-              39 => 0,
-              40 => 0,
-              41 => 0,
-              42 => 0,
-              43 => 3,
-              47 => 0,
-              48 => 0,
-              49 => 0,
-              50 => 0,
-              51 => 0,
-              52 => 0,
-              53 => 0,
-              54 => 0,
-              55 => 1,
-              57 => 1,
-              59 => 0,
-              60 => 0,
-              61 => 0,
-              62 => 0,
-              63 => 0,
-              64 => 0,
-              65 => 0,
-              66 => 0,
-              67 => 0,
-              68 => 0,
-              69 => 0,
-              70 => 0,
-              71 => 0,
-              72 => 0,
-              73 => 0,
-              74 => 0,
-              75 => 0,
-              76 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(\\s{1,}".$this->rdel.")|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(".$this->rdel.")|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*===\\s*)|\G(\\s*!==\\s*)|\G(\\s*==\\s*|\\s+eq\\s+)|\G(\\s*!=\\s*|\\s*<>\\s*|\\s+(ne|neq)\\s+)|\G(\\s*>=\\s*|\\s+(ge|gte)\\s+)|\G(\\s*<=\\s*|\\s+(le|lte)\\s+)|\G(\\s*>\\s*|\\s+gt\\s+)|\G(\\s*<\\s*|\\s+lt\\s+)|\G(\\s+mod\\s+)|\G(!\\s*|not\\s+)|\G(\\s*&&\\s*|\\s*and\\s+)|\G(\\s*\\|\\|\\s*|\\s*or\\s+)|\G(\\s*xor\\s+)|\G(\\s+is\\s+odd\\s+by\\s+)|\G(\\s+is\\s+not\\s+odd\\s+by\\s+)|\G(\\s+is\\s+odd)|\G(\\s+is\\s+not\\s+odd)|\G(\\s+is\\s+even\\s+by\\s+)|\G(\\s+is\\s+not\\s+even\\s+by\\s+)|\G(\\s+is\\s+even)|\G(\\s+is\\s+not\\s+even)|\G(\\s+is\\s+div\\s+by\\s+)|\G(\\s+is\\s+not\\s+div\\s+by\\s+)|\G(\\((int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)\\)\\s*)|\G(\\s*\\(\\s*)|\G(\\s*\\))|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*->\\s*)|\G(\\s*=>\\s*)|\G(\\s*=\\s*)|\G(\\+\\+|--)|\G(\\s*(\\+|-)\\s*)|\G(\\s*(\\*|\/|%)\\s*)|\G(\\$)|\G(\\s*;)|\G(::)|\G(\\s*:\\s*)|\G(@)|\G(#)|\G(\")|\G(`)|\G(\\|)|\G(\\.)|\G(\\s*,\\s*)|\G(\\s*&\\s*)|\G(\\s*\\?\\s*)|\G(0[xX][0-9a-fA-F]+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G(\\s+)|\G([\S\s])/iS";
-
-        do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state SMARTY');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r2_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-
-    } // end function
-
-
-    const SMARTY = 2;
-    function yy_r2_1($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_SINGLEQUOTESTRING;
-    }
-    function yy_r2_2($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_3($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_5($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_6($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_7($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r2_8($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-  $this->yypopstate();
-    }
-    function yy_r2_9($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r2_10($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r2_11($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_RDEL;
-     $this->yypopstate();
-    }
-    function yy_r2_12($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISIN;
-    }
-    function yy_r2_13($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_AS;
-    }
-    function yy_r2_14($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TO;
-    }
-    function yy_r2_15($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_STEP;
-    }
-    function yy_r2_16($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_INSTANCEOF;
-    }
-    function yy_r2_17($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_IDENTITY;
-    }
-    function yy_r2_18($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_NONEIDENTITY;
-    }
-    function yy_r2_19($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_EQUALS;
-    }
-    function yy_r2_20($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_NOTEQUALS;
-    }
-    function yy_r2_22($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_GREATEREQUAL;
-    }
-    function yy_r2_24($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LESSEQUAL;
-    }
-    function yy_r2_26($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_GREATERTHAN;
-    }
-    function yy_r2_27($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LESSTHAN;
-    }
-    function yy_r2_28($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_MOD;
-    }
-    function yy_r2_29($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_NOT;
-    }
-    function yy_r2_30($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LAND;
-    }
-    function yy_r2_31($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LOR;
-    }
-    function yy_r2_32($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LXOR;
-    }
-    function yy_r2_33($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISODDBY;
-    }
-    function yy_r2_34($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODDBY;
-    }
-    function yy_r2_35($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISODD;
-    }
-    function yy_r2_36($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTODD;
-    }
-    function yy_r2_37($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISEVENBY;
-    }
-    function yy_r2_38($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVENBY;
-    }
-    function yy_r2_39($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISEVEN;
-    }
-    function yy_r2_40($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTEVEN;
-    }
-    function yy_r2_41($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISDIVBY;
-    }
-    function yy_r2_42($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ISNOTDIVBY;
-    }
-    function yy_r2_43($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TYPECAST;
-    }
-    function yy_r2_47($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_OPENP;
-    }
-    function yy_r2_48($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_CLOSEP;
-    }
-    function yy_r2_49($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_OPENB;
-    }
-    function yy_r2_50($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_CLOSEB;
-    }
-    function yy_r2_51($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PTR;
-    }
-    function yy_r2_52($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_APTR;
-    }
-    function yy_r2_53($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_EQUAL;
-    }
-    function yy_r2_54($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_INCDEC;
-    }
-    function yy_r2_55($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_UNIMATH;
-    }
-    function yy_r2_57($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_MATH;
-    }
-    function yy_r2_59($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_DOLLAR;
-    }
-    function yy_r2_60($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_SEMICOLON;
-    }
-    function yy_r2_61($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_DOUBLECOLON;
-    }
-    function yy_r2_62($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_COLON;
-    }
-    function yy_r2_63($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_AT;
-    }
-    function yy_r2_64($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_HATCH;
-    }
-    function yy_r2_65($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-  $this->yypushstate(self::DOUBLEQUOTEDSTRING);
-    }
-    function yy_r2_66($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-  $this->yypopstate();
-    }
-    function yy_r2_67($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_VERT;
-    }
-    function yy_r2_68($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_DOT;
-    }
-    function yy_r2_69($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_COMMA;
-    }
-    function yy_r2_70($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ANDSYM;
-    }
-    function yy_r2_71($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_QMARK;
-    }
-    function yy_r2_72($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_HEX;
-    }
-    function yy_r2_73($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ID;
-    }
-    function yy_r2_74($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_INTEGER;
-    }
-    function yy_r2_75($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_SPACE;
-    }
-    function yy_r2_76($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-
-
-    function yylex3()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 0,
-              3 => 0,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G(".$this->ldel."\\s*literal\\s*".$this->rdel.")|\G(".$this->ldel."\\s*\/literal\\s*".$this->rdel.")|\G(<\\?(?:php\\w+|=|[a-zA-Z]+)?)|\G(\\?>)|\G(<%)|\G(%>)|\G([\S\s])/iS";
-
-        do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state LITERAL');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r3_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-
-    } // end function
-
-
-    const LITERAL = 3;
-    function yy_r3_1($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALSTART;
-  $this->yypushstate(self::LITERAL);
-    }
-    function yy_r3_2($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LITERALEND;
-  $this->yypopstate();
-    }
-    function yy_r3_3($yy_subpatterns)
-    {
-
-  if (in_array($this->value, Array('<?', '<?=', '<?php'))) {
-    $this->token = Smarty_Internal_Templateparser::TP_PHPSTARTTAG;
-   } else {
-    $this->token = Smarty_Internal_Templateparser::TP_FAKEPHPSTARTTAG;
-    $this->value = substr($this->value, 0, 2);
-   }
-    }
-    function yy_r3_4($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_PHPENDTAG;
-    }
-    function yy_r3_5($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPSTARTTAG;
-    }
-    function yy_r3_6($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_ASPENDTAG;
-    }
-    function yy_r3_7($yy_subpatterns)
-    {
-
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $to = strlen($this->data);
-  }
-  preg_match("/{$this->ldel}\/?literal{$this->rdel}|<\?|<%|\?>|%>/",$this->data,$match,PREG_OFFSET_CAPTURE,$this->counter);
-  if (isset($match[0][1])) {
-    $to = $match[0][1];
-  } else {
-    $this->compiler->trigger_template_error ("missing or misspelled literal closing tag");
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  }
-  $this->token = Smarty_Internal_Templateparser::TP_LITERAL;
-    }
-
-
-    function yylex4()
-    {
-        $tokenMap = array (
-              1 => 0,
-              2 => 1,
-              4 => 0,
-              5 => 0,
-              6 => 0,
-              7 => 0,
-              8 => 0,
-              9 => 0,
-              10 => 0,
-              11 => 0,
-              12 => 0,
-              13 => 3,
-              17 => 0,
-            );
-        if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-            return false; // end of input
-        }
-        $yy_global_pattern = "/\G(".$this->ldel."\\s{1,}\/)|\G(".$this->ldel."\\s*(if|elseif|else if|while)\\s+)|\G(".$this->ldel."\\s*for\\s+)|\G(".$this->ldel."\\s*foreach(?![^\s]))|\G(".$this->ldel."\\s{1,})|\G(".$this->ldel."\/)|\G(".$this->ldel.")|\G(\")|\G(`\\$)|\G(\\$[0-9]*[a-zA-Z_]\\w*)|\G(\\$)|\G(([^\"\\\\]*?)((?:\\\\.[^\"\\\\]*?)*?)(?=(".$this->ldel."|\\$|`\\$|\")))|\G([\S\s])/iS";
-
-        do {
-            if ($this->mbstring_overload ? preg_match($yy_global_pattern, mb_substr($this->data, $this->counter,2000000000,'latin1'), $yymatches) : preg_match($yy_global_pattern,$this->data, $yymatches, null, $this->counter)) {
-                $yysubmatches = $yymatches;
-                $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-                if (!count($yymatches)) {
-                    throw new Exception('Error: lexing failed because a rule matched' .
-                        ' an empty string.  Input "' . substr($this->data,
-                        $this->counter, 5) . '... state DOUBLEQUOTEDSTRING');
-                }
-                next($yymatches); // skip global match
-                $this->token = key($yymatches); // token number
-                if ($tokenMap[$this->token]) {
-                    // extract sub-patterns for passing to lex function
-                    $yysubmatches = array_slice($yysubmatches, $this->token + 1,
-                        $tokenMap[$this->token]);
-                } else {
-                    $yysubmatches = array();
-                }
-                $this->value = current($yymatches); // token value
-                $r = $this->{'yy_r4_' . $this->token}($yysubmatches);
-                if ($r === null) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    // accept this token
-                    return true;
-                } elseif ($r === true) {
-                    // we have changed state
-                    // process this token in the new state
-                    return $this->yylex();
-                } elseif ($r === false) {
-                    $this->counter += ($this->mbstring_overload ? mb_strlen($this->value,'latin1'): strlen($this->value));
-                    $this->line += substr_count($this->value, "\n");
-                    if ($this->counter >= ($this->mbstring_overload ? mb_strlen($this->data,'latin1'): strlen($this->data))) {
-                        return false; // end of input
-                    }
-                    // skip this token
-                    continue;
-                }            } else {
-                throw new Exception('Unexpected input at line' . $this->line .
-                    ': ' . $this->data[$this->counter]);
-            }
-            break;
-        } while (true);
-
-    } // end function
-
-
-    const DOUBLEQUOTEDSTRING = 4;
-    function yy_r4_1($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r4_2($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELIF;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r4_4($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOR;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r4_5($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal && trim(substr($this->value,$this->ldel_length,1)) == '') {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDELFOREACH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r4_6($yy_subpatterns)
-    {
-
-  if ($this->smarty->auto_literal) {
-     $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-  } else {
-     $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-  }
-    }
-    function yy_r4_7($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDELSLASH;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r4_8($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_LDEL;
-     $this->yypushstate(self::SMARTY);
-     $this->taglineno = $this->line;
-    }
-    function yy_r4_9($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_QUOTE;
-  $this->yypopstate();
-    }
-    function yy_r4_10($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_BACKTICK;
-  $this->value = substr($this->value,0,-1);
-  $this->yypushstate(self::SMARTY);
-  $this->taglineno = $this->line;
-    }
-    function yy_r4_11($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_DOLLARID;
-    }
-    function yy_r4_12($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-    function yy_r4_13($yy_subpatterns)
-    {
-
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-    function yy_r4_17($yy_subpatterns)
-    {
-
-  if ($this->mbstring_overload) {
-    $to = mb_strlen($this->data,'latin1');
-  } else {
-    $to = strlen($this->data);
-  }
-  if ($this->mbstring_overload) {
-    $this->value = mb_substr($this->data,$this->counter,$to-$this->counter,'latin1');
-  } else {
-    $this->value = substr($this->data,$this->counter,$to-$this->counter);
-  }
-  $this->token = Smarty_Internal_Templateparser::TP_TEXT;
-    }
-
-}
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_templateparser.php b/resources/libs/smarty/sysplugins/smarty_internal_templateparser.php
deleted file mode 100644
index 94dca0ac4..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_templateparser.php
+++ /dev/null
@@ -1,3265 +0,0 @@
-<?php
-/**
-* Smarty Internal Plugin Templateparser
-*
-* This is the template parser.
-* It is generated from the internal.templateparser.y file
-* @package Smarty
-* @subpackage Compiler
-* @author Uwe Tews
-*/
-
-class TP_yyToken implements ArrayAccess
-{
-    public $string = '';
-    public $metadata = array();
-
-    function __construct($s, $m = array())
-    {
-        if ($s instanceof TP_yyToken) {
-            $this->string = $s->string;
-            $this->metadata = $s->metadata;
-        } else {
-            $this->string = (string) $s;
-            if ($m instanceof TP_yyToken) {
-                $this->metadata = $m->metadata;
-            } elseif (is_array($m)) {
-                $this->metadata = $m;
-            }
-        }
-    }
-
-    function __toString()
-    {
-        return $this->_string;
-    }
-
-    function offsetExists($offset)
-    {
-        return isset($this->metadata[$offset]);
-    }
-
-    function offsetGet($offset)
-    {
-        return $this->metadata[$offset];
-    }
-
-    function offsetSet($offset, $value)
-    {
-        if ($offset === null) {
-            if (isset($value[0])) {
-                $x = ($value instanceof TP_yyToken) ?
-                    $value->metadata : $value;
-                $this->metadata = array_merge($this->metadata, $x);
-                return;
-            }
-            $offset = count($this->metadata);
-        }
-        if ($value === null) {
-            return;
-        }
-        if ($value instanceof TP_yyToken) {
-            if ($value->metadata) {
-                $this->metadata[$offset] = $value->metadata;
-            }
-        } elseif ($value) {
-            $this->metadata[$offset] = $value;
-        }
-    }
-
-    function offsetUnset($offset)
-    {
-        unset($this->metadata[$offset]);
-    }
-}
-
-class TP_yyStackEntry
-{
-    public $stateno;       /* The state-number */
-    public $major;         /* The major token value.  This is the code
-                     ** number for the token at this stack level */
-    public $minor; /* The user-supplied minor token value.  This
-                     ** is the value of the token  */
-};
-
-
-#line 12 "smarty_internal_templateparser.y"
-class Smarty_Internal_Templateparser#line 79 "smarty_internal_templateparser.php"
-{
-#line 14 "smarty_internal_templateparser.y"
-
-    const Err1 = "Security error: Call to private object member not allowed";
-    const Err2 = "Security error: Call to dynamic object member not allowed";
-    const Err3 = "PHP in template not allowed. Use SmartyBC to enable it";
-    // states whether the parse was successful or not
-    public $successful = true;
-    public $retvalue = 0;
-    private $lex;
-    private $internalError = false;
-    private $strip = false;
-
-    function __construct($lex, $compiler) {
-        $this->lex = $lex;
-        $this->compiler = $compiler;
-        $this->smarty = $this->compiler->smarty;
-        $this->template = $this->compiler->template;
-        $this->compiler->has_variable_string = false;
-        $this->compiler->prefix_code = array();
-        $this->prefix_number = 0;
-        $this->block_nesting_level = 0;
-        if ($this->security = isset($this->smarty->security_policy)) {
-            $this->php_handling = $this->smarty->security_policy->php_handling;
-        } else {
-            $this->php_handling = $this->smarty->php_handling;
-        }
-        $this->is_xml = false;
-        $this->asp_tags = (ini_get('asp_tags') != '0');
-        $this->current_buffer = $this->root_buffer = new _smarty_template_buffer($this);
-    }
-
-    public static function escape_start_tag($tag_text) {
-        $tag = preg_replace('/\A<\?(.*)\z/', '<<?php ?>?\1', $tag_text, -1 , $count); //Escape tag
-        return $tag;
-    }
-
-    public static function escape_end_tag($tag_text) {
-        return '?<?php ?>>';
-    }
-
-    public function compileVariable($variable) {
-        if (strpos($variable,'(') == 0) {
-            // not a variable variable
-            $var = trim($variable,'\'');
-            $this->compiler->tag_nocache=$this->compiler->tag_nocache|$this->template->getVariable($var, null, true, false)->nocache;
-            $this->template->properties['variables'][$var] = $this->compiler->tag_nocache|$this->compiler->nocache;
-        }
-//       return '(isset($_smarty_tpl->tpl_vars['. $variable .'])?$_smarty_tpl->tpl_vars['. $variable .']->value:$_smarty_tpl->getVariable('. $variable .')->value)';
-        return '$_smarty_tpl->tpl_vars['. $variable .']->value';
-    }
-#line 132 "smarty_internal_templateparser.php"
-
-    const TP_VERT                           =  1;
-    const TP_COLON                          =  2;
-    const TP_COMMENT                        =  3;
-    const TP_PHPSTARTTAG                    =  4;
-    const TP_PHPENDTAG                      =  5;
-    const TP_ASPSTARTTAG                    =  6;
-    const TP_ASPENDTAG                      =  7;
-    const TP_FAKEPHPSTARTTAG                =  8;
-    const TP_XMLTAG                         =  9;
-    const TP_TEXT                           = 10;
-    const TP_STRIPON                        = 11;
-    const TP_STRIPOFF                       = 12;
-    const TP_LITERALSTART                   = 13;
-    const TP_LITERALEND                     = 14;
-    const TP_LITERAL                        = 15;
-    const TP_LDEL                           = 16;
-    const TP_RDEL                           = 17;
-    const TP_DOLLAR                         = 18;
-    const TP_ID                             = 19;
-    const TP_EQUAL                          = 20;
-    const TP_PTR                            = 21;
-    const TP_LDELIF                         = 22;
-    const TP_LDELFOR                        = 23;
-    const TP_SEMICOLON                      = 24;
-    const TP_INCDEC                         = 25;
-    const TP_TO                             = 26;
-    const TP_STEP                           = 27;
-    const TP_LDELFOREACH                    = 28;
-    const TP_SPACE                          = 29;
-    const TP_AS                             = 30;
-    const TP_APTR                           = 31;
-    const TP_LDELSETFILTER                  = 32;
-    const TP_SMARTYBLOCKCHILD               = 33;
-    const TP_LDELSLASH                      = 34;
-    const TP_INTEGER                        = 35;
-    const TP_COMMA                          = 36;
-    const TP_OPENP                          = 37;
-    const TP_CLOSEP                         = 38;
-    const TP_MATH                           = 39;
-    const TP_UNIMATH                        = 40;
-    const TP_ANDSYM                         = 41;
-    const TP_ISIN                           = 42;
-    const TP_ISDIVBY                        = 43;
-    const TP_ISNOTDIVBY                     = 44;
-    const TP_ISEVEN                         = 45;
-    const TP_ISNOTEVEN                      = 46;
-    const TP_ISEVENBY                       = 47;
-    const TP_ISNOTEVENBY                    = 48;
-    const TP_ISODD                          = 49;
-    const TP_ISNOTODD                       = 50;
-    const TP_ISODDBY                        = 51;
-    const TP_ISNOTODDBY                     = 52;
-    const TP_INSTANCEOF                     = 53;
-    const TP_QMARK                          = 54;
-    const TP_NOT                            = 55;
-    const TP_TYPECAST                       = 56;
-    const TP_HEX                            = 57;
-    const TP_DOT                            = 58;
-    const TP_SINGLEQUOTESTRING              = 59;
-    const TP_DOUBLECOLON                    = 60;
-    const TP_AT                             = 61;
-    const TP_HATCH                          = 62;
-    const TP_OPENB                          = 63;
-    const TP_CLOSEB                         = 64;
-    const TP_EQUALS                         = 65;
-    const TP_NOTEQUALS                      = 66;
-    const TP_GREATERTHAN                    = 67;
-    const TP_LESSTHAN                       = 68;
-    const TP_GREATEREQUAL                   = 69;
-    const TP_LESSEQUAL                      = 70;
-    const TP_IDENTITY                       = 71;
-    const TP_NONEIDENTITY                   = 72;
-    const TP_MOD                            = 73;
-    const TP_LAND                           = 74;
-    const TP_LOR                            = 75;
-    const TP_LXOR                           = 76;
-    const TP_QUOTE                          = 77;
-    const TP_BACKTICK                       = 78;
-    const TP_DOLLARID                       = 79;
-    const YY_NO_ACTION = 592;
-    const YY_ACCEPT_ACTION = 591;
-    const YY_ERROR_ACTION = 590;
-
-    const YY_SZ_ACTTAB = 2562;
-static public $yy_action = array(
- /*     0 */   218,  317,  318,  320,  319,  316,  315,  311,  310,  312,
- /*    10 */   313,  314,  321,  322,  197,  193,  187,   43,  591,   95,
- /*    20 */   255,  318,  320,    6,  107,  292,   38,   11,   42,  154,
- /*    30 */   283,   13,  181,  245,  295,  241,  262,  284,   51,   50,
- /*    40 */    52,   44,   23,   28,  367,  374,   33,   32,  375,  383,
- /*    50 */    21,   31,  328,  323,  325,  326,  324,    9,   36,  353,
- /*    60 */   265,  197,  331,  329,  384,  385,  386,  382,  381,  377,
- /*    70 */   376,  378,  379,  282,  380,  362,  218,  344,    4,  106,
- /*    80 */   175,  120,    7,   11,   82,  129,  283,   12,  456,  292,
- /*    90 */   453,   27,  291,  301,  361,  109,  387,  236,  368,  365,
- /*   100 */   456,  343,  453,  243,   42,  136,  200,   37,    7,  267,
- /*   110 */     7,  219,  256,    7,   51,   50,   52,   44,   23,   28,
- /*   120 */   367,  374,   33,   32,  375,  383,   21,   31,  239,   99,
- /*   130 */   171,  136,   36,  136,  261,   26,  136,  123,  373,  292,
- /*   140 */   384,  385,  386,  382,  381,  377,  376,  378,  379,  282,
- /*   150 */   380,  362,  218,  344,  369,  218,  200,  132,  158,  184,
- /*   160 */    68,  119,  235,   11,   11,  153,  283,  283,  337,  301,
- /*   170 */   361,  458,  306,  236,  368,  365,   42,  343,  252,  284,
- /*   180 */    42,  191,  218,  458,  250,   11,  200,  287,  283,   12,
- /*   190 */    51,   50,   52,   44,   23,   28,  367,  374,   33,   32,
- /*   200 */   375,  383,   21,   31,  302,  108,  168,   49,  200,  232,
- /*   210 */    11,  218,   35,  283,  240,  292,  384,  385,  386,  382,
- /*   220 */   381,  377,  376,  378,  379,  282,  380,  362,  218,  344,
- /*   230 */   207,  218,  200,  132,   49,    8,   54,  119,  142,   11,
- /*   240 */    14,  158,  283,  110,  342,  301,  361,  455,  152,  236,
- /*   250 */   368,  365,   42,  343,  231,  239,   42,  350,  103,  455,
- /*   260 */   248,  199,  339,   49,  343,  345,   51,   50,   52,   44,
- /*   270 */    23,   28,  367,  374,   33,   32,  375,  383,   21,   31,
- /*   280 */   128,  183,  174,   49,  370,  163,  198,  339,   15,  158,
- /*   290 */   292,  292,  384,  385,  386,  382,  381,  377,  376,  378,
- /*   300 */   379,  282,  380,  362,  218,  344,  192,  218,  201,  120,
- /*   310 */   344,  272,   82,  129,  156,  164,  270,  218,  129,  158,
- /*   320 */   273,  301,  361,  458,  292,  236,  368,  365,  128,  343,
- /*   330 */   236,  368,  365,  296,  343,  458,  284,  244,  130,  227,
- /*   340 */   260,  330,   51,   50,   52,   44,   23,   28,  367,  374,
- /*   350 */    33,   32,  375,  383,   21,   31,  207,  196,  339,   49,
- /*   360 */    41,    8,  127,  162,  251,  229,  212,  242,  384,  385,
- /*   370 */   386,  382,  381,  377,  376,  378,  379,  282,  380,  362,
- /*   380 */   218,  344,  101,  218,  176,  132,  344,  140,   78,  129,
- /*   390 */   148,  166,  249,  292,  129,  186,  278,  301,  361,  327,
- /*   400 */   292,  236,  368,  365,  292,  343,  236,  368,  365,    5,
- /*   410 */   343,   42,  211,   36,  121,  281,  284,  201,   51,   50,
- /*   420 */    52,   44,   23,   28,  367,  374,   33,   32,  375,  383,
- /*   430 */    21,   31,  218,  178,    7,   49,  179,  275,  225,  185,
- /*   440 */    11,  284,  292,  283,  384,  385,  386,  382,  381,  377,
- /*   450 */   376,  378,  379,  282,  380,  362,   17,  136,   11,  201,
- /*   460 */   170,  226,  173,  200,  284,  141,  247,  223,  335,  292,
- /*   470 */    51,   50,   52,   44,   23,   28,  367,  374,   33,   32,
- /*   480 */   375,  383,   21,   31,  135,  218,  201,  359,   11,   11,
- /*   490 */    11,  238,  213,  234,  188,  302,  384,  385,  386,  382,
- /*   500 */   381,  377,  376,  378,  379,  282,  380,  362,  195,  351,
- /*   510 */   189,  366,  251,  235,  218,  251,  264,  333,  146,  332,
- /*   520 */   305,  200,  143,   51,   50,   52,   44,   23,   28,  367,
- /*   530 */   374,   33,   32,  375,  383,   21,   31,  218,  203,  137,
- /*   540 */    15,  297,   42,  271,  194,   19,   98,  116,  102,  384,
- /*   550 */   385,  386,  382,  381,  377,  376,  378,  379,  282,  380,
- /*   560 */   362,  372,  372,  372,  300,   34,  224,  138,   39,  139,
- /*   570 */   225,  146,  131,  133,  159,   51,   50,   52,   44,   23,
- /*   580 */    28,  367,  374,   33,   32,  375,  383,   21,   31,  372,
- /*   590 */   172,  334,   94,  299,  276,  302,    2,  371,    4,  292,
- /*   600 */   125,  384,  385,  386,  382,  381,  377,  376,  378,  379,
- /*   610 */   282,  380,  362,  218,  344,  372,  218,  308,  132,  344,
- /*   620 */   287,   78,  129,  150,  370,  201,  161,  129,  160,  204,
- /*   630 */   301,  361,  341,   29,  236,  368,  365,  292,  343,  236,
- /*   640 */   368,  365,  218,  343,  284,  216,   42,   20,  277,  284,
- /*   650 */   263,   51,   50,   52,   44,   23,   28,  367,  374,   33,
- /*   660 */    32,  375,  383,   21,   31,  218,  228,   45,   49,   16,
- /*   670 */   326,  249,  104,  326,  326,  118,  105,  384,  385,  386,
- /*   680 */   382,  381,  377,  376,  378,  379,  282,  380,  362,  340,
- /*   690 */   372,  372,  326,  326,  326,  326,  326,  326,  326,  326,
- /*   700 */   326,   42,  237,   51,   50,   52,   44,   23,   28,  367,
- /*   710 */   374,   33,   32,  375,  383,   21,   31,  218,  326,  326,
- /*   720 */   326,  326,  326,  326,  326,  326,  114,  326,  218,  384,
- /*   730 */   385,  386,  382,  381,  377,  376,  378,  379,  282,  380,
- /*   740 */   362,  372,  353,  326,  307,  326,  326,  326,  326,  326,
- /*   750 */   326,  326,  326,  326,  268,   51,   50,   52,   44,   23,
- /*   760 */    28,  367,  374,   33,   32,  375,  383,   21,   31,  218,
- /*   770 */   326,  326,  326,  326,  326,  326,  326,  326,   97,  355,
- /*   780 */   112,  384,  385,  386,  382,  381,  377,  376,  378,  379,
- /*   790 */   282,  380,  362,  372,  326,  372,  326,   42,  326,  326,
- /*   800 */   326,  326,  326,  326,  326,  326,  158,   51,   50,   52,
- /*   810 */    44,   23,   28,  367,  374,   33,   32,  375,  383,   21,
- /*   820 */    31,  218,  326,  326,  326,  326,  326,  326,  326,  326,
- /*   830 */   326,  326,  326,  384,  385,  386,  382,  381,  377,  376,
- /*   840 */   378,  379,  282,  380,  362,  128,  326,  326,  326,  326,
- /*   850 */   326,  326,  326,  326,  326,  326,  326,  326,  326,   51,
- /*   860 */    50,   52,   44,   23,   28,  367,  374,   33,   32,  375,
- /*   870 */   383,   21,   31,  326,  326,  326,  326,  326,  326,  326,
- /*   880 */   326,  326,  326,  326,  266,  384,  385,  386,  382,  381,
- /*   890 */   377,  376,  378,  379,  282,  380,  362,  218,  326,  326,
- /*   900 */   326,  326,  190,  344,  326,  326,   11,  145,  354,  283,
- /*   910 */   288,  129,  218,  202,   18,   24,   22,  218,   45,   42,
- /*   920 */     6,  107,   42,  236,  368,  365,  154,  343,  286,  200,
- /*   930 */   245,  295,  241,  285,  326,   51,   50,   52,   44,   23,
- /*   940 */    28,  367,  374,   33,   32,  375,  383,   21,   31,  218,
- /*   950 */    10,  326,  326,  326,  326,  326,  326,  326,  326,  326,
- /*   960 */   326,  384,  385,  386,  382,  381,  377,  376,  378,  379,
- /*   970 */   282,  380,  362,  326,  326,  356,   40,  352,  326,  326,
- /*   980 */   326,  326,  326,  326,  326,  326,  326,   51,   50,   52,
- /*   990 */    44,   23,   28,  367,  374,   33,   32,  375,  383,   21,
- /*  1000 */    31,  218,  326,  326,  326,  326,  326,  326,  326,  326,
- /*  1010 */   326,  326,  326,  384,  385,  386,  382,  381,  377,  376,
- /*  1020 */   378,  379,  282,  380,  362,  326,  326,  326,  326,  326,
- /*  1030 */   326,  326,  326,  326,  326,  326,  326,  326,  326,   51,
- /*  1040 */    50,   52,   44,   23,   28,  367,  374,   33,   32,  375,
- /*  1050 */   383,   21,   31,  326,  326,  326,  326,  326,  326,  326,
- /*  1060 */   326,  326,  326,  326,  326,  384,  385,  386,  382,  381,
- /*  1070 */   377,  376,  378,  379,  282,  380,  362,  218,  218,   51,
- /*  1080 */    50,   52,   44,   23,   28,  367,  374,   33,   32,  375,
- /*  1090 */   383,   21,   31,  303,  304,  326,  326,  326,  326,  326,
- /*  1100 */   326,  326,  326,  326,  326,  384,  385,  386,  382,  381,
- /*  1110 */   377,  376,  378,  379,  282,  380,  362,  218,  326,  218,
- /*  1120 */   326,  326,   43,  326,  134,  208,  326,  326,    6,  107,
- /*  1130 */   326,  326,  253,  348,  154,  452,  354,  230,  245,  295,
- /*  1140 */   241,  246,   18,   30,   42,   42,   48,   42,    6,  107,
- /*  1150 */   326,  326,  326,    7,  154,  326,  326,  326,  245,  295,
- /*  1160 */   241,   47,   46,  298,  233,  363,  326,  344,  101,    1,
- /*  1170 */   269,  155,  326,  326,  326,  129,  136,  326,   43,  326,
- /*  1180 */   134,  220,  326,   96,    6,  107,  358,  236,  368,  365,
- /*  1190 */   154,  343,  326,  326,  245,  295,  241,  246,   42,   30,
- /*  1200 */   326,  254,   48,  360,   40,  352,  326,  344,  326,  326,
- /*  1210 */   326,  151,  326,   42,  349,  129,  326,   47,   46,  298,
- /*  1220 */   233,  363,  326,  274,  101,    1,   42,  236,  368,  365,
- /*  1230 */   326,  343,  336,  357,   43,   42,  144,  220,  326,   96,
- /*  1240 */     6,  107,  289,  326,   42,   42,  154,  258,  326,  294,
- /*  1250 */   245,  295,  241,  246,   42,    3,  326,  338,   48,   42,
- /*  1260 */   259,   42,  326,  344,  326,  326,  326,  149,  326,   42,
- /*  1270 */   279,  129,   42,   47,   46,  298,  233,  363,  326,  293,
- /*  1280 */   101,    1,   42,  236,  368,  365,  326,  343,  309,  347,
- /*  1290 */    43,   42,  126,  220,  326,   96,    6,  107,  290,  326,
- /*  1300 */    42,   42,  154,  346,  326,  257,  245,  295,  241,  246,
- /*  1310 */    42,   30,  326,  326,   48,   42,  326,   42,  326,  326,
- /*  1320 */   326,  326,  326,  326,  326,  326,  326,  326,  326,   47,
- /*  1330 */    46,  298,  233,  363,  326,  326,  101,    1,  326,  326,
- /*  1340 */   326,  326,  326,  326,  326,  326,   43,  326,  130,  220,
- /*  1350 */   326,   96,    6,  107,  326,  326,  326,  326,  154,  326,
- /*  1360 */   326,  326,  245,  295,  241,  246,  326,   25,  326,  326,
- /*  1370 */    48,  326,  326,  326,  326,  326,  326,  326,  326,  326,
- /*  1380 */   326,  326,  326,  326,  326,   47,   46,  298,  233,  363,
- /*  1390 */   326,  326,  101,    1,  326,  326,  326,  326,  326,  326,
- /*  1400 */   326,  326,   43,  326,  134,  210,  326,   96,    6,  107,
- /*  1410 */   326,  326,  326,  326,  154,  326,  326,  326,  245,  295,
- /*  1420 */   241,  246,  326,   30,  326,  326,   48,  326,  326,  326,
- /*  1430 */   326,  326,  326,  326,  326,  326,  326,  326,  326,  326,
- /*  1440 */   326,   47,   46,  298,  233,  363,  326,  326,  101,    1,
- /*  1450 */   326,  326,  326,  326,  326,  326,  326,  326,   43,  326,
- /*  1460 */   124,   92,  326,   96,    6,  107,  326,  326,  326,  326,
- /*  1470 */   154,  326,  326,  326,  245,  295,  241,  246,  326,   30,
- /*  1480 */   326,  326,   48,  326,  326,  326,  326,  326,  326,  326,
- /*  1490 */   326,  326,  326,  326,  326,  326,  326,   47,   46,  298,
- /*  1500 */   233,  363,  326,  326,  101,    1,  326,  326,  326,  326,
- /*  1510 */   326,  326,  326,  326,   43,  326,  134,  206,  326,   96,
- /*  1520 */     6,  107,  326,  326,  326,  326,  154,  326,  326,  326,
- /*  1530 */   245,  295,  241,  222,  326,   30,  326,  326,   48,  326,
- /*  1540 */   326,  326,  326,  326,  326,  326,  326,  326,  326,  326,
- /*  1550 */   326,  326,  326,   47,   46,  298,  233,  363,  326,  326,
- /*  1560 */   101,    1,  326,  326,  326,  326,  326,  326,  326,  326,
- /*  1570 */    43,  326,  134,  205,  326,   96,    6,  107,  326,  326,
- /*  1580 */   326,  326,  154,  326,  326,  326,  245,  295,  241,  246,
- /*  1590 */   326,   30,  326,  326,   48,  326,  326,  326,  326,  326,
- /*  1600 */   326,  326,  326,  326,  326,  326,  326,  326,  326,   47,
- /*  1610 */    46,  298,  233,  363,  326,  326,  101,    1,  326,  326,
- /*  1620 */   326,  326,  326,  326,  326,  326,   43,  326,  134,  209,
- /*  1630 */   326,   96,    6,  107,  326,  326,  326,  326,  154,  326,
- /*  1640 */   326,  326,  245,  295,  241,  246,  326,   30,  326,  326,
- /*  1650 */    48,  326,  326,  326,  326,  326,  326,  326,  326,  326,
- /*  1660 */   326,  326,  326,  326,  326,   47,   46,  298,  233,  363,
- /*  1670 */   326,  326,  101,    1,  326,  326,  326,  326,  326,  326,
- /*  1680 */   326,  326,   43,  326,  130,  220,  326,   96,    6,  107,
- /*  1690 */   326,  326,  326,  326,  154,  326,  326,  326,  245,  295,
- /*  1700 */   241,  246,  326,   25,  326,  326,   48,  326,  326,  326,
- /*  1710 */   326,  326,  326,  326,  326,  326,  326,  326,  326,  190,
- /*  1720 */   165,   47,   46,  298,  233,  363,  326,  326,  101,  292,
- /*  1730 */   326,  326,   24,   22,  326,  326,  326,  326,   43,  326,
- /*  1740 */   130,  221,  326,   96,    6,  107,  200,  326,  326,  326,
- /*  1750 */   154,  326,  326,  326,  245,  295,  241,  246,  326,   25,
- /*  1760 */   326,  326,   48,  326,  326,  326,  326,  326,  326,  326,
- /*  1770 */   326,  326,  326,  326,  326,  326,  326,   47,   46,  298,
- /*  1780 */   233,  363,  326,  326,  101,  326,  326,  326,  326,  326,
- /*  1790 */   326,  326,  326,  326,  326,  501,  190,  180,  326,   96,
- /*  1800 */   326,  326,  501,  326,  501,  501,  292,  501,  501,   24,
- /*  1810 */    22,  326,  326,  344,  501,    7,  501,  132,  326,  326,
- /*  1820 */    78,  129,  326,  200,  326,  326,  326,  326,  326,  301,
- /*  1830 */   361,  501,  326,  236,  368,  365,  326,  343,  136,  326,
- /*  1840 */   326,  344,  501,  326,  217,   93,  326,  326,   59,  117,
- /*  1850 */   326,  326,  326,  326,  326,  326,  501,  301,  361,  326,
- /*  1860 */   326,  236,  368,  365,  344,  343,  326,  326,  132,  326,
- /*  1870 */   326,   77,  129,  326,  326,  326,  326,  326,  326,  326,
- /*  1880 */   301,  361,  326,  326,  236,  368,  365,  344,  343,  326,
- /*  1890 */   326,  132,  326,  326,   84,  129,  326,  326,  344,  326,
- /*  1900 */   326,  326,  115,  301,  361,   72,  129,  236,  368,  365,
- /*  1910 */   326,  343,  326,  326,  301,  361,  326,  326,  236,  368,
- /*  1920 */   365,  326,  343,  344,  326,  326,  326,  132,  326,  326,
- /*  1930 */    64,  129,  326,  326,  344,  326,  326,  326,  132,  301,
- /*  1940 */   361,   66,  129,  236,  368,  365,  326,  343,  326,  326,
- /*  1950 */   301,  361,  326,  344,  236,  368,  365,  132,  343,  326,
- /*  1960 */    68,  129,  326,  326,  326,  326,  326,  326,  326,  301,
- /*  1970 */   361,  326,  344,  236,  368,  365,  132,  343,  326,   76,
- /*  1980 */   129,  326,  326,  344,  326,  326,  326,  132,  301,  361,
- /*  1990 */    80,  129,  236,  368,  365,  326,  343,  326,  326,  301,
- /*  2000 */   361,  326,  326,  236,  368,  365,  326,  343,  344,  326,
- /*  2010 */   326,  326,  132,  326,  326,   60,  129,  326,  326,  344,
- /*  2020 */   326,  326,  326,  132,  301,  361,   73,  129,  236,  368,
- /*  2030 */   365,  326,  343,  326,  326,  301,  361,  326,  344,  236,
- /*  2040 */   368,  365,  132,  343,  326,   74,  129,  326,  326,  326,
- /*  2050 */   326,  326,  326,  326,  301,  361,  326,  344,  236,  368,
- /*  2060 */   365,  132,  343,  326,   90,  129,  326,  326,  344,  326,
- /*  2070 */   326,  326,  132,  301,  361,   65,  129,  236,  368,  365,
- /*  2080 */   326,  343,  326,  326,  301,  361,  326,  326,  236,  368,
- /*  2090 */   365,  326,  343,  344,  326,  326,  326,  132,  326,  326,
- /*  2100 */    83,  129,  326,  326,  344,  326,  326,  326,   93,  301,
- /*  2110 */   361,   53,  117,  236,  368,  365,  326,  343,  326,  326,
- /*  2120 */   301,  361,  326,  344,  215,  368,  365,  132,  343,  326,
- /*  2130 */    87,  129,  326,  326,  326,  326,  326,  326,  326,  301,
- /*  2140 */   361,  326,  344,  236,  368,  365,  132,  343,  326,   58,
- /*  2150 */   129,  326,  326,  344,  326,  326,  326,  122,  301,  361,
- /*  2160 */    55,  129,  236,  368,  365,  326,  343,  326,  326,  301,
- /*  2170 */   361,  326,  326,  236,  368,  365,  326,  343,  344,  326,
- /*  2180 */   326,  326,  132,  326,  326,   70,  129,  326,  326,  344,
- /*  2190 */   326,  326,  326,  132,  301,  361,   91,  129,  236,  368,
- /*  2200 */   365,  326,  343,  326,  326,  301,  361,  326,  344,  236,
- /*  2210 */   368,  365,  111,  343,  326,   63,  129,  326,  326,  326,
- /*  2220 */   326,  326,  326,  326,  301,  361,  326,  344,  236,  368,
- /*  2230 */   365,  132,  343,  326,   86,  129,  326,  326,  344,  326,
- /*  2240 */   326,  326,  132,  301,  361,   79,  129,  236,  368,  365,
- /*  2250 */   326,  343,  326,  326,  301,  361,  326,  326,  236,  368,
- /*  2260 */   365,  326,  343,  344,  326,  326,  326,  132,  326,  326,
- /*  2270 */    75,  129,  326,  326,  344,  326,  326,  326,  132,  301,
- /*  2280 */   361,   88,  129,  236,  368,  365,  326,  343,  326,  326,
- /*  2290 */   301,  361,  326,  344,  236,  368,  365,  132,  343,  326,
- /*  2300 */    62,  129,  326,  326,  326,  326,  326,  326,  326,  301,
- /*  2310 */   361,  326,  344,  236,  368,  365,  132,  343,  326,   61,
- /*  2320 */   129,  326,  326,  344,  326,  326,  326,  132,  301,  361,
- /*  2330 */    69,  129,  236,  368,  365,  326,  343,  326,  326,  301,
- /*  2340 */   361,  326,  326,  236,  368,  365,  326,  343,  344,  326,
- /*  2350 */   326,  326,  132,  326,  326,   57,  129,  326,  326,  344,
- /*  2360 */   326,  326,  326,  132,  301,  361,   89,  129,  236,  368,
- /*  2370 */   365,  326,  343,  326,  326,  301,  361,  326,  344,  236,
- /*  2380 */   368,  365,  132,  343,  326,   81,  129,  326,  326,  326,
- /*  2390 */   326,  326,  326,  326,  301,  361,  326,  344,  236,  368,
- /*  2400 */   365,  113,  343,  326,   85,  129,  326,  326,  344,  326,
- /*  2410 */   326,  326,  132,  301,  361,   71,  129,  236,  368,  365,
- /*  2420 */   326,  343,  326,  326,  301,  361,  326,  326,  236,  368,
- /*  2430 */   365,  326,  343,  344,  326,  326,  326,  132,  326,  326,
- /*  2440 */    67,  129,  326,  326,  344,  326,  326,  326,  132,  301,
- /*  2450 */   361,   56,  129,  214,  368,  365,  326,  343,  326,  326,
- /*  2460 */   301,  361,  326,  344,  236,  368,  365,  147,  343,  326,
- /*  2470 */   326,  129,  326,  326,  326,  326,  326,  326,  326,  326,
- /*  2480 */   364,  326,  344,  236,  368,  365,  157,  343,  326,  326,
- /*  2490 */   129,  326,  326,  326,  326,  100,  177,  326,  326,  280,
- /*  2500 */   326,  326,  236,  368,  365,  292,  343,  326,   24,   22,
- /*  2510 */   326,  190,  167,  326,  326,  326,  326,  326,  190,  182,
- /*  2520 */   326,  292,  200,  326,   24,   22,  326,  326,  292,  326,
- /*  2530 */   326,   24,   22,  326,  190,  169,  326,  326,  200,  326,
- /*  2540 */   326,  326,  326,  326,  292,  200,  326,   24,   22,  326,
- /*  2550 */   326,  326,  326,  326,  326,  326,  326,  326,  326,  326,
- /*  2560 */   326,  200,
-    );
-    static public $yy_lookahead = array(
- /*     0 */     1,   83,   84,   85,    3,    4,    5,    6,    7,    8,
- /*    10 */     9,   10,   11,   12,   13,   98,   90,   16,   81,   82,
- /*    20 */    83,   84,   85,   22,   23,   99,   27,   16,   29,   28,
- /*    30 */    19,   20,  109,   32,   33,   34,   25,  111,   39,   40,
- /*    40 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*    50 */    51,   52,    4,    5,    6,    7,    8,   16,   36,   84,
- /*    60 */    38,   13,   14,   15,   65,   66,   67,   68,   69,   70,
- /*    70 */    71,   72,   73,   74,   75,   76,    1,   84,   37,   89,
- /*    80 */    90,   88,   37,   16,   91,   92,   19,   20,   17,   99,
- /*    90 */    17,   20,   17,  100,  101,  120,  121,  104,  105,  106,
- /*   100 */    29,  108,   29,   58,   29,   60,  116,   31,   37,   64,
- /*   110 */    37,  118,  119,   37,   39,   40,   41,   42,   43,   44,
- /*   120 */    45,   46,   47,   48,   49,   50,   51,   52,   61,   89,
- /*   130 */    90,   60,   36,   60,   38,   16,   60,   18,   19,   99,
- /*   140 */    65,   66,   67,   68,   69,   70,   71,   72,   73,   74,
- /*   150 */    75,   76,    1,   84,   35,    1,  116,   88,   21,   89,
- /*   160 */    91,   92,   93,   16,   16,   97,   19,   19,   17,  100,
- /*   170 */   101,   17,   19,  104,  105,  106,   29,  108,   31,  111,
- /*   180 */    29,   89,    1,   29,   30,   16,  116,  117,   19,   20,
- /*   190 */    39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
- /*   200 */    49,   50,   51,   52,   25,   89,   90,   53,  116,   61,
- /*   210 */    16,    1,   31,   19,   61,   99,   65,   66,   67,   68,
- /*   220 */    69,   70,   71,   72,   73,   74,   75,   76,    1,   84,
- /*   230 */    58,    1,  116,   88,   53,   63,   91,   92,   93,   16,
- /*   240 */    20,   21,   19,   86,   17,  100,  101,   17,   92,  104,
- /*   250 */   105,  106,   29,  108,   31,   61,   29,   78,   98,   29,
- /*   260 */   104,  112,  113,   53,  108,  113,   39,   40,   41,   42,
- /*   270 */    43,   44,   45,   46,   47,   48,   49,   50,   51,   52,
- /*   280 */    60,   90,   90,   53,  110,  109,  112,  113,   20,   21,
- /*   290 */    99,   99,   65,   66,   67,   68,   69,   70,   71,   72,
- /*   300 */    73,   74,   75,   76,    1,   84,   98,    1,  116,   88,
- /*   310 */    84,   62,   91,   92,   88,   90,   64,    1,   92,   21,
- /*   320 */    17,  100,  101,   17,   99,  104,  105,  106,   60,  108,
- /*   330 */   104,  105,  106,   17,  108,   29,  111,   21,   18,   19,
- /*   340 */   119,   14,   39,   40,   41,   42,   43,   44,   45,   46,
- /*   350 */    47,   48,   49,   50,   51,   52,   58,  112,  113,   53,
- /*   360 */    16,   63,   18,   19,   92,   93,   94,   19,   65,   66,
- /*   370 */    67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
- /*   380 */     1,   84,   62,    1,   90,   88,   84,   19,   91,   92,
- /*   390 */    88,   90,   58,   99,   92,   90,   17,  100,  101,   17,
- /*   400 */    99,  104,  105,  106,   99,  108,  104,  105,  106,   36,
- /*   410 */   108,   29,  115,   36,   19,   38,  111,  116,   39,   40,
- /*   420 */    41,   42,   43,   44,   45,   46,   47,   48,   49,   50,
- /*   430 */    51,   52,    1,   90,   37,   53,   89,   64,    2,  109,
- /*   440 */    16,  111,   99,   19,   65,   66,   67,   68,   69,   70,
- /*   450 */    71,   72,   73,   74,   75,   76,   20,   60,   16,  116,
- /*   460 */    90,   19,  109,  116,  111,   18,   18,   19,   19,   99,
- /*   470 */    39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
- /*   480 */    49,   50,   51,   52,   37,    1,  116,   17,   16,   16,
- /*   490 */    16,   19,   19,   19,   89,   25,   65,   66,   67,   68,
- /*   500 */    69,   70,   71,   72,   73,   74,   75,   76,   24,   78,
- /*   510 */    24,  107,   92,   93,    1,   92,   93,   85,  114,   87,
- /*   520 */    19,  116,   36,   39,   40,   41,   42,   43,   44,   45,
- /*   530 */    46,   47,   48,   49,   50,   51,   52,    1,   19,   18,
- /*   540 */    20,   35,   29,   62,   19,    2,   96,   96,   96,   65,
- /*   550 */    66,   67,   68,   69,   70,   71,   72,   73,   74,   75,
- /*   560 */    76,  111,  111,  111,  107,   54,   30,   18,   26,   18,
- /*   570 */     2,  114,   18,   18,   96,   39,   40,   41,   42,   43,
- /*   580 */    44,   45,   46,   47,   48,   49,   50,   51,   52,  111,
- /*   590 */    90,   19,   19,   35,   38,   25,   37,   19,   37,   99,
- /*   600 */    96,   65,   66,   67,   68,   69,   70,   71,   72,   73,
- /*   610 */    74,   75,   76,    1,   84,  111,    1,   99,   88,   84,
- /*   620 */   117,   91,   92,   88,  110,  116,  109,   92,   90,   17,
- /*   630 */   100,  101,   17,   20,  104,  105,  106,   99,  108,  104,
- /*   640 */   105,  106,    1,  108,  111,  115,   29,   29,  114,  111,
- /*   650 */    29,   39,   40,   41,   42,   43,   44,   45,   46,   47,
- /*   660 */    48,   49,   50,   51,   52,    1,   95,    2,   53,   95,
- /*   670 */   122,   58,  109,  122,  122,   96,   96,   65,   66,   67,
- /*   680 */    68,   69,   70,   71,   72,   73,   74,   75,   76,   17,
- /*   690 */   111,  111,  122,  122,  122,  122,  122,  122,  122,  122,
- /*   700 */   122,   29,   38,   39,   40,   41,   42,   43,   44,   45,
- /*   710 */    46,   47,   48,   49,   50,   51,   52,    1,  122,  122,
- /*   720 */   122,  122,  122,  122,  122,  122,   96,  122,    1,   65,
- /*   730 */    66,   67,   68,   69,   70,   71,   72,   73,   74,   75,
- /*   740 */    76,  111,   84,  122,   17,  122,  122,  122,  122,  122,
- /*   750 */   122,  122,  122,  122,   38,   39,   40,   41,   42,   43,
- /*   760 */    44,   45,   46,   47,   48,   49,   50,   51,   52,    1,
- /*   770 */   122,  122,  122,  122,  122,  122,  122,  122,   96,  121,
- /*   780 */    96,   65,   66,   67,   68,   69,   70,   71,   72,   73,
- /*   790 */    74,   75,   76,  111,  122,  111,  122,   29,  122,  122,
- /*   800 */   122,  122,  122,  122,  122,  122,   21,   39,   40,   41,
- /*   810 */    42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
- /*   820 */    52,    1,  122,  122,  122,  122,  122,  122,  122,  122,
- /*   830 */   122,  122,  122,   65,   66,   67,   68,   69,   70,   71,
- /*   840 */    72,   73,   74,   75,   76,   60,  122,  122,  122,  122,
- /*   850 */   122,  122,  122,  122,  122,  122,  122,  122,  122,   39,
- /*   860 */    40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
- /*   870 */    50,   51,   52,  122,  122,  122,  122,  122,  122,  122,
- /*   880 */   122,  122,  122,  122,   64,   65,   66,   67,   68,   69,
- /*   890 */    70,   71,   72,   73,   74,   75,   76,    1,  122,  122,
- /*   900 */   122,  122,   89,   84,  122,  122,   16,   88,   10,   19,
- /*   910 */    17,   92,    1,   17,   16,  102,  103,    1,    2,   29,
- /*   920 */    22,   23,   29,  104,  105,  106,   28,  108,   17,  116,
- /*   930 */    32,   33,   34,   17,  122,   39,   40,   41,   42,   43,
- /*   940 */    44,   45,   46,   47,   48,   49,   50,   51,   52,    1,
- /*   950 */     2,  122,  122,  122,  122,  122,  122,  122,  122,  122,
- /*   960 */   122,   65,   66,   67,   68,   69,   70,   71,   72,   73,
- /*   970 */    74,   75,   76,  122,  122,   77,   78,   79,  122,  122,
- /*   980 */   122,  122,  122,  122,  122,  122,  122,   39,   40,   41,
- /*   990 */    42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
- /*  1000 */    52,    1,  122,  122,  122,  122,  122,  122,  122,  122,
- /*  1010 */   122,  122,  122,   65,   66,   67,   68,   69,   70,   71,
- /*  1020 */    72,   73,   74,   75,   76,  122,  122,  122,  122,  122,
- /*  1030 */   122,  122,  122,  122,  122,  122,  122,  122,  122,   39,
- /*  1040 */    40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
- /*  1050 */    50,   51,   52,  122,  122,  122,  122,  122,  122,  122,
- /*  1060 */   122,  122,  122,  122,  122,   65,   66,   67,   68,   69,
- /*  1070 */    70,   71,   72,   73,   74,   75,   76,    1,    1,   39,
- /*  1080 */    40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
- /*  1090 */    50,   51,   52,   17,   17,  122,  122,  122,  122,  122,
- /*  1100 */   122,  122,  122,  122,  122,   65,   66,   67,   68,   69,
- /*  1110 */    70,   71,   72,   73,   74,   75,   76,    1,  122,    1,
- /*  1120 */   122,  122,   16,  122,   18,   19,  122,  122,   22,   23,
- /*  1130 */   122,  122,   17,   17,   28,   17,   10,   21,   32,   33,
- /*  1140 */    34,   35,   16,   37,   29,   29,   40,   29,   22,   23,
- /*  1150 */   122,  122,  122,   37,   28,  122,  122,  122,   32,   33,
- /*  1160 */    34,   55,   56,   57,   58,   59,  122,   84,   62,   63,
- /*  1170 */    64,   88,  122,  122,  122,   92,   60,  122,   16,  122,
- /*  1180 */    18,   19,  122,   77,   22,   23,   17,  104,  105,  106,
- /*  1190 */    28,  108,  122,  122,   32,   33,   34,   35,   29,   37,
- /*  1200 */   122,   17,   40,   77,   78,   79,  122,   84,  122,  122,
- /*  1210 */   122,   88,  122,   29,   17,   92,  122,   55,   56,   57,
- /*  1220 */    58,   59,  122,   17,   62,   63,   29,  104,  105,  106,
- /*  1230 */   122,  108,   17,   17,   16,   29,   18,   19,  122,   77,
- /*  1240 */    22,   23,   17,  122,   29,   29,   28,   17,  122,   17,
- /*  1250 */    32,   33,   34,   35,   29,   37,  122,   17,   40,   29,
- /*  1260 */    17,   29,  122,   84,  122,  122,  122,   88,  122,   29,
- /*  1270 */    17,   92,   29,   55,   56,   57,   58,   59,  122,   17,
- /*  1280 */    62,   63,   29,  104,  105,  106,  122,  108,   17,   17,
- /*  1290 */    16,   29,   18,   19,  122,   77,   22,   23,   17,  122,
- /*  1300 */    29,   29,   28,   17,  122,   17,   32,   33,   34,   35,
- /*  1310 */    29,   37,  122,  122,   40,   29,  122,   29,  122,  122,
- /*  1320 */   122,  122,  122,  122,  122,  122,  122,  122,  122,   55,
- /*  1330 */    56,   57,   58,   59,  122,  122,   62,   63,  122,  122,
- /*  1340 */   122,  122,  122,  122,  122,  122,   16,  122,   18,   19,
- /*  1350 */   122,   77,   22,   23,  122,  122,  122,  122,   28,  122,
- /*  1360 */   122,  122,   32,   33,   34,   35,  122,   37,  122,  122,
- /*  1370 */    40,  122,  122,  122,  122,  122,  122,  122,  122,  122,
- /*  1380 */   122,  122,  122,  122,  122,   55,   56,   57,   58,   59,
- /*  1390 */   122,  122,   62,   63,  122,  122,  122,  122,  122,  122,
- /*  1400 */   122,  122,   16,  122,   18,   19,  122,   77,   22,   23,
- /*  1410 */   122,  122,  122,  122,   28,  122,  122,  122,   32,   33,
- /*  1420 */    34,   35,  122,   37,  122,  122,   40,  122,  122,  122,
- /*  1430 */   122,  122,  122,  122,  122,  122,  122,  122,  122,  122,
- /*  1440 */   122,   55,   56,   57,   58,   59,  122,  122,   62,   63,
- /*  1450 */   122,  122,  122,  122,  122,  122,  122,  122,   16,  122,
- /*  1460 */    18,   19,  122,   77,   22,   23,  122,  122,  122,  122,
- /*  1470 */    28,  122,  122,  122,   32,   33,   34,   35,  122,   37,
- /*  1480 */   122,  122,   40,  122,  122,  122,  122,  122,  122,  122,
- /*  1490 */   122,  122,  122,  122,  122,  122,  122,   55,   56,   57,
- /*  1500 */    58,   59,  122,  122,   62,   63,  122,  122,  122,  122,
- /*  1510 */   122,  122,  122,  122,   16,  122,   18,   19,  122,   77,
- /*  1520 */    22,   23,  122,  122,  122,  122,   28,  122,  122,  122,
- /*  1530 */    32,   33,   34,   35,  122,   37,  122,  122,   40,  122,
- /*  1540 */   122,  122,  122,  122,  122,  122,  122,  122,  122,  122,
- /*  1550 */   122,  122,  122,   55,   56,   57,   58,   59,  122,  122,
- /*  1560 */    62,   63,  122,  122,  122,  122,  122,  122,  122,  122,
- /*  1570 */    16,  122,   18,   19,  122,   77,   22,   23,  122,  122,
- /*  1580 */   122,  122,   28,  122,  122,  122,   32,   33,   34,   35,
- /*  1590 */   122,   37,  122,  122,   40,  122,  122,  122,  122,  122,
- /*  1600 */   122,  122,  122,  122,  122,  122,  122,  122,  122,   55,
- /*  1610 */    56,   57,   58,   59,  122,  122,   62,   63,  122,  122,
- /*  1620 */   122,  122,  122,  122,  122,  122,   16,  122,   18,   19,
- /*  1630 */   122,   77,   22,   23,  122,  122,  122,  122,   28,  122,
- /*  1640 */   122,  122,   32,   33,   34,   35,  122,   37,  122,  122,
- /*  1650 */    40,  122,  122,  122,  122,  122,  122,  122,  122,  122,
- /*  1660 */   122,  122,  122,  122,  122,   55,   56,   57,   58,   59,
- /*  1670 */   122,  122,   62,   63,  122,  122,  122,  122,  122,  122,
- /*  1680 */   122,  122,   16,  122,   18,   19,  122,   77,   22,   23,
- /*  1690 */   122,  122,  122,  122,   28,  122,  122,  122,   32,   33,
- /*  1700 */    34,   35,  122,   37,  122,  122,   40,  122,  122,  122,
- /*  1710 */   122,  122,  122,  122,  122,  122,  122,  122,  122,   89,
- /*  1720 */    90,   55,   56,   57,   58,   59,  122,  122,   62,   99,
- /*  1730 */   122,  122,  102,  103,  122,  122,  122,  122,   16,  122,
- /*  1740 */    18,   19,  122,   77,   22,   23,  116,  122,  122,  122,
- /*  1750 */    28,  122,  122,  122,   32,   33,   34,   35,  122,   37,
- /*  1760 */   122,  122,   40,  122,  122,  122,  122,  122,  122,  122,
- /*  1770 */   122,  122,  122,  122,  122,  122,  122,   55,   56,   57,
- /*  1780 */    58,   59,  122,  122,   62,  122,  122,  122,  122,  122,
- /*  1790 */   122,  122,  122,  122,  122,   17,   89,   90,  122,   77,
- /*  1800 */   122,  122,   24,  122,   26,   27,   99,   29,   30,  102,
- /*  1810 */   103,  122,  122,   84,   36,   37,   38,   88,  122,  122,
- /*  1820 */    91,   92,  122,  116,  122,  122,  122,  122,  122,  100,
- /*  1830 */   101,   53,  122,  104,  105,  106,  122,  108,   60,  122,
- /*  1840 */   122,   84,   64,  122,  115,   88,  122,  122,   91,   92,
- /*  1850 */   122,  122,  122,  122,  122,  122,   78,  100,  101,  122,
- /*  1860 */   122,  104,  105,  106,   84,  108,  122,  122,   88,  122,
- /*  1870 */   122,   91,   92,  122,  122,  122,  122,  122,  122,  122,
- /*  1880 */   100,  101,  122,  122,  104,  105,  106,   84,  108,  122,
- /*  1890 */   122,   88,  122,  122,   91,   92,  122,  122,   84,  122,
- /*  1900 */   122,  122,   88,  100,  101,   91,   92,  104,  105,  106,
- /*  1910 */   122,  108,  122,  122,  100,  101,  122,  122,  104,  105,
- /*  1920 */   106,  122,  108,   84,  122,  122,  122,   88,  122,  122,
- /*  1930 */    91,   92,  122,  122,   84,  122,  122,  122,   88,  100,
- /*  1940 */   101,   91,   92,  104,  105,  106,  122,  108,  122,  122,
- /*  1950 */   100,  101,  122,   84,  104,  105,  106,   88,  108,  122,
- /*  1960 */    91,   92,  122,  122,  122,  122,  122,  122,  122,  100,
- /*  1970 */   101,  122,   84,  104,  105,  106,   88,  108,  122,   91,
- /*  1980 */    92,  122,  122,   84,  122,  122,  122,   88,  100,  101,
- /*  1990 */    91,   92,  104,  105,  106,  122,  108,  122,  122,  100,
- /*  2000 */   101,  122,  122,  104,  105,  106,  122,  108,   84,  122,
- /*  2010 */   122,  122,   88,  122,  122,   91,   92,  122,  122,   84,
- /*  2020 */   122,  122,  122,   88,  100,  101,   91,   92,  104,  105,
- /*  2030 */   106,  122,  108,  122,  122,  100,  101,  122,   84,  104,
- /*  2040 */   105,  106,   88,  108,  122,   91,   92,  122,  122,  122,
- /*  2050 */   122,  122,  122,  122,  100,  101,  122,   84,  104,  105,
- /*  2060 */   106,   88,  108,  122,   91,   92,  122,  122,   84,  122,
- /*  2070 */   122,  122,   88,  100,  101,   91,   92,  104,  105,  106,
- /*  2080 */   122,  108,  122,  122,  100,  101,  122,  122,  104,  105,
- /*  2090 */   106,  122,  108,   84,  122,  122,  122,   88,  122,  122,
- /*  2100 */    91,   92,  122,  122,   84,  122,  122,  122,   88,  100,
- /*  2110 */   101,   91,   92,  104,  105,  106,  122,  108,  122,  122,
- /*  2120 */   100,  101,  122,   84,  104,  105,  106,   88,  108,  122,
- /*  2130 */    91,   92,  122,  122,  122,  122,  122,  122,  122,  100,
- /*  2140 */   101,  122,   84,  104,  105,  106,   88,  108,  122,   91,
- /*  2150 */    92,  122,  122,   84,  122,  122,  122,   88,  100,  101,
- /*  2160 */    91,   92,  104,  105,  106,  122,  108,  122,  122,  100,
- /*  2170 */   101,  122,  122,  104,  105,  106,  122,  108,   84,  122,
- /*  2180 */   122,  122,   88,  122,  122,   91,   92,  122,  122,   84,
- /*  2190 */   122,  122,  122,   88,  100,  101,   91,   92,  104,  105,
- /*  2200 */   106,  122,  108,  122,  122,  100,  101,  122,   84,  104,
- /*  2210 */   105,  106,   88,  108,  122,   91,   92,  122,  122,  122,
- /*  2220 */   122,  122,  122,  122,  100,  101,  122,   84,  104,  105,
- /*  2230 */   106,   88,  108,  122,   91,   92,  122,  122,   84,  122,
- /*  2240 */   122,  122,   88,  100,  101,   91,   92,  104,  105,  106,
- /*  2250 */   122,  108,  122,  122,  100,  101,  122,  122,  104,  105,
- /*  2260 */   106,  122,  108,   84,  122,  122,  122,   88,  122,  122,
- /*  2270 */    91,   92,  122,  122,   84,  122,  122,  122,   88,  100,
- /*  2280 */   101,   91,   92,  104,  105,  106,  122,  108,  122,  122,
- /*  2290 */   100,  101,  122,   84,  104,  105,  106,   88,  108,  122,
- /*  2300 */    91,   92,  122,  122,  122,  122,  122,  122,  122,  100,
- /*  2310 */   101,  122,   84,  104,  105,  106,   88,  108,  122,   91,
- /*  2320 */    92,  122,  122,   84,  122,  122,  122,   88,  100,  101,
- /*  2330 */    91,   92,  104,  105,  106,  122,  108,  122,  122,  100,
- /*  2340 */   101,  122,  122,  104,  105,  106,  122,  108,   84,  122,
- /*  2350 */   122,  122,   88,  122,  122,   91,   92,  122,  122,   84,
- /*  2360 */   122,  122,  122,   88,  100,  101,   91,   92,  104,  105,
- /*  2370 */   106,  122,  108,  122,  122,  100,  101,  122,   84,  104,
- /*  2380 */   105,  106,   88,  108,  122,   91,   92,  122,  122,  122,
- /*  2390 */   122,  122,  122,  122,  100,  101,  122,   84,  104,  105,
- /*  2400 */   106,   88,  108,  122,   91,   92,  122,  122,   84,  122,
- /*  2410 */   122,  122,   88,  100,  101,   91,   92,  104,  105,  106,
- /*  2420 */   122,  108,  122,  122,  100,  101,  122,  122,  104,  105,
- /*  2430 */   106,  122,  108,   84,  122,  122,  122,   88,  122,  122,
- /*  2440 */    91,   92,  122,  122,   84,  122,  122,  122,   88,  100,
- /*  2450 */   101,   91,   92,  104,  105,  106,  122,  108,  122,  122,
- /*  2460 */   100,  101,  122,   84,  104,  105,  106,   88,  108,  122,
- /*  2470 */   122,   92,  122,  122,  122,  122,  122,  122,  122,  122,
- /*  2480 */   101,  122,   84,  104,  105,  106,   88,  108,  122,  122,
- /*  2490 */    92,  122,  122,  122,  122,   89,   90,  122,  122,  101,
- /*  2500 */   122,  122,  104,  105,  106,   99,  108,  122,  102,  103,
- /*  2510 */   122,   89,   90,  122,  122,  122,  122,  122,   89,   90,
- /*  2520 */   122,   99,  116,  122,  102,  103,  122,  122,   99,  122,
- /*  2530 */   122,  102,  103,  122,   89,   90,  122,  122,  116,  122,
- /*  2540 */   122,  122,  122,  122,   99,  116,  122,  102,  103,  122,
- /*  2550 */   122,  122,  122,  122,  122,  122,  122,  122,  122,  122,
- /*  2560 */   122,  116,
-);
-    const YY_SHIFT_USE_DFLT = -2;
-    const YY_SHIFT_MAX = 252;
-    static public $yy_shift_ofst = array(
- /*     0 */     1, 1386, 1162, 1218, 1162, 1386, 1218, 1162, 1106, 1162,
- /*    10 */  1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1442, 1554,
- /*    20 */  1498, 1162, 1162, 1162, 1162, 1162, 1162, 1610, 1162, 1162,
- /*    30 */  1162, 1162, 1162, 1162, 1274, 1162, 1162, 1162, 1162, 1162,
- /*    40 */  1162, 1162, 1498, 1442, 1330, 1330, 1666, 1666, 1666, 1722,
- /*    50 */  1666, 1666, 1666,  227,   75,  151,   -1,  768,  768,  768,
- /*    60 */   948,  896,  820,  536,  379,  716,  303,  431,  664,  612,
- /*    70 */   484, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000,
- /*    80 */  1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000,
- /*    90 */  1040, 1040, 1116,  382,  513,    1, 1126,  147,  223, 1118,
- /*   100 */  1118,  320,  890,  916,  298,  890,  513,  447,  513,  898,
- /*   110 */    48,  154,   11,  306,   67,  230,  194,  220,  169,  268,
- /*   120 */   181,  316,  615,  424,  473,  424,  472,  474,  448,  785,
- /*   130 */   424,  424,  210,  424,  442,  447,  448,  424,  424,  424,
- /*   140 */   727,  424, 1288,  447,  442,  641,  137,  641,  641,  641,
- /*   150 */   641,  641,  137,  617,  618,  641,  641,   -2,  344,  148,
- /*   160 */   893,  172,   41,  172, 1225, 1215, 1216, 1206, 1197, 1115,
- /*   170 */  1169, 1184, 1230,  172, 1271,  672, 1262, 1272, 1286, 1077,
- /*   180 */  1281,  172, 1240, 1232,  911,  172, 1253, 1243, 1076,  621,
- /*   190 */   641,  641,  665,  665,  559,  621,  137,  327,  137,  137,
- /*   200 */    -2,   -2,   -2,   -2,   -2, 1778,   71,  119,   45,   73,
- /*   210 */    76,   96,  486,  436,  179,  470,   22,  377,  153,  373,
- /*   220 */   397,  397,  613,  561,  554,  572,  568,  249,  549,  542,
- /*   230 */   573,  555,  578,  558,  559,  556,  570,  511,  543,  449,
- /*   240 */   501,  395,  252,  348,  368,  519,  334,  525,  481,  506,
- /*   250 */   521,  520,  551,
-);
-    const YY_REDUCE_USE_DFLT = -84;
-    const YY_REDUCE_MAX = 204;
-    static public $yy_reduce_ofst = array(
- /*     0 */   -63,   -7, 1729,   69,  297,  221,  145,  530, 2209, 2228,
- /*    10 */  1973, 1850, 2190, 2039, 2058, 1899, 2094, 2069, 2020, 2105,
- /*    20 */  2124, 2179, 2154, 2143, 2009, 1984, 1839, 1814, 1780, 1803,
- /*    30 */  1869, 1888, 1954, 1935, 1924, 2275, 2324, 2294, 2264, 2360,
- /*    40 */  2349, 2239, 2313, 1757, 2379, 2398,  226,  819,  302,  535,
- /*    50 */  1179, 1123, 1083, 2406, 1707, 1630, 2422, 2445, 2429, 2406,
- /*    60 */   813,  813,  813,  813,  813,  813,  813,  813,  813,  813,
- /*    70 */   813,  813,  813,  813,  813,  813,  813,  813,  813,  813,
- /*    80 */   813,  813,  813,  813,  813,  813,  813,  813,  813,  813,
- /*    90 */   813,  813,  -10,   40,  116,  -82,  -25,  225,  -74,  192,
- /*   100 */   343,  156,  305,   70,  174,  538,  370,  272,  301,  658,
- /*   110 */   432,   92,   68,   92,  330,   92,  330,  245,  330,  245,
- /*   120 */    92,  347,   92,  478,  451,  353,  451,  504,  404,  245,
- /*   130 */   451,  450,   92,  452,  451,  420,  457,  682,  684,  580,
- /*   140 */   405,  579,  500,  423,  630,   92,  149,   92,   92,   92,
- /*   150 */    92,   92,  245,  294,  191,   92,   92,   92,  534,  533,
- /*   160 */   518,  514,  517,  514,  518,  518,  518,  518,  518,  518,
- /*   170 */   518,  518,  518,  514,  518,  518,  518,  518,  518,  509,
- /*   180 */   518,  514,  518,  518,  509,  514,  518,  518,  509,  574,
- /*   190 */   509,  509,  503,  503,  563,  571,  152,  157,  152,  152,
- /*   200 */   -83,  208,  176,  160,  -77,
-);
-    static public $yyExpectedTokens = array(
-        /* 0 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16, 22, 23, 28, 32, 33, 34, ),
-        /* 1 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 2 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 3 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 4 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 5 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 6 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 7 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 8 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 64, 77, ),
-        /* 9 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 10 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 11 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 12 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 13 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 14 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 15 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 16 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 17 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 18 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 19 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 20 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 21 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 22 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 23 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 24 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 25 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 26 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 27 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 28 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 29 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 30 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 31 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 32 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 33 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 34 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 35 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 36 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 37 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 38 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 39 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 40 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 41 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 42 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 43 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 44 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 45 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 63, 77, ),
-        /* 46 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
-        /* 47 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
-        /* 48 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
-        /* 49 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
-        /* 50 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
-        /* 51 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
-        /* 52 */ array(16, 18, 19, 22, 23, 28, 32, 33, 34, 35, 37, 40, 55, 56, 57, 58, 59, 62, 77, ),
-        /* 53 */ array(1, 17, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 54 */ array(1, 17, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 55 */ array(1, 17, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 56 */ array(1, 27, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 57 */ array(1, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 58 */ array(1, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 59 */ array(1, 29, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 60 */ array(1, 2, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 61 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 62 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 63 */ array(1, 30, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 64 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 65 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 66 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 67 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 78, ),
-        /* 68 */ array(1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 69 */ array(1, 17, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 70 */ array(1, 24, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 71 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 72 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 73 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 74 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 75 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 76 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 77 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 78 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 79 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 80 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 81 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 82 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 83 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 84 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 85 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 86 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 87 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 88 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 89 */ array(1, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 90 */ array(39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 91 */ array(39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, ),
-        /* 92 */ array(1, 17, 21, 29, 37, 60, ),
-        /* 93 */ array(1, 17, 29, 53, ),
-        /* 94 */ array(1, 29, ),
-        /* 95 */ array(3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16, 22, 23, 28, 32, 33, 34, ),
-        /* 96 */ array(10, 16, 22, 23, 28, 32, 33, 34, 77, 78, 79, ),
-        /* 97 */ array(16, 19, 29, 31, ),
-        /* 98 */ array(16, 19, 29, 31, ),
-        /* 99 */ array(1, 17, 29, ),
-        /* 100 */ array(1, 17, 29, ),
-        /* 101 */ array(18, 19, 62, ),
-        /* 102 */ array(16, 19, 29, ),
-        /* 103 */ array(1, 2, 17, ),
-        /* 104 */ array(21, 58, 63, ),
-        /* 105 */ array(16, 19, 29, ),
-        /* 106 */ array(1, 29, ),
-        /* 107 */ array(18, 37, ),
-        /* 108 */ array(1, 29, ),
-        /* 109 */ array(10, 16, 22, 23, 28, 32, 33, 34, 77, 78, 79, ),
-        /* 110 */ array(4, 5, 6, 7, 8, 13, 14, 15, ),
-        /* 111 */ array(1, 17, 29, 30, 53, ),
-        /* 112 */ array(16, 19, 20, 25, ),
-        /* 113 */ array(1, 17, 29, 53, ),
-        /* 114 */ array(16, 19, 20, 61, ),
-        /* 115 */ array(1, 17, 29, 53, ),
-        /* 116 */ array(16, 19, 61, ),
-        /* 117 */ array(20, 21, 60, ),
-        /* 118 */ array(16, 19, 20, ),
-        /* 119 */ array(20, 21, 60, ),
-        /* 120 */ array(1, 31, 53, ),
-        /* 121 */ array(1, 17, 21, ),
-        /* 122 */ array(1, 17, 53, ),
-        /* 123 */ array(16, 19, ),
-        /* 124 */ array(16, 19, ),
-        /* 125 */ array(16, 19, ),
-        /* 126 */ array(16, 19, ),
-        /* 127 */ array(16, 19, ),
-        /* 128 */ array(18, 19, ),
-        /* 129 */ array(21, 60, ),
-        /* 130 */ array(16, 19, ),
-        /* 131 */ array(16, 19, ),
-        /* 132 */ array(1, 53, ),
-        /* 133 */ array(16, 19, ),
-        /* 134 */ array(16, 19, ),
-        /* 135 */ array(18, 37, ),
-        /* 136 */ array(18, 19, ),
-        /* 137 */ array(16, 19, ),
-        /* 138 */ array(16, 19, ),
-        /* 139 */ array(16, 19, ),
-        /* 140 */ array(1, 17, ),
-        /* 141 */ array(16, 19, ),
-        /* 142 */ array(17, 29, ),
-        /* 143 */ array(18, 37, ),
-        /* 144 */ array(16, 19, ),
-        /* 145 */ array(1, ),
-        /* 146 */ array(21, ),
-        /* 147 */ array(1, ),
-        /* 148 */ array(1, ),
-        /* 149 */ array(1, ),
-        /* 150 */ array(1, ),
-        /* 151 */ array(1, ),
-        /* 152 */ array(21, ),
-        /* 153 */ array(29, ),
-        /* 154 */ array(29, ),
-        /* 155 */ array(1, ),
-        /* 156 */ array(1, ),
-        /* 157 */ array(),
-        /* 158 */ array(16, 18, 19, ),
-        /* 159 */ array(16, 19, 61, ),
-        /* 160 */ array(17, 29, ),
-        /* 161 */ array(58, 63, ),
-        /* 162 */ array(16, 37, ),
-        /* 163 */ array(58, 63, ),
-        /* 164 */ array(17, 29, ),
-        /* 165 */ array(17, 29, ),
-        /* 166 */ array(17, 29, ),
-        /* 167 */ array(17, 29, ),
-        /* 168 */ array(17, 29, ),
-        /* 169 */ array(17, 29, ),
-        /* 170 */ array(17, 29, ),
-        /* 171 */ array(17, 29, ),
-        /* 172 */ array(17, 29, ),
-        /* 173 */ array(58, 63, ),
-        /* 174 */ array(17, 29, ),
-        /* 175 */ array(17, 29, ),
-        /* 176 */ array(17, 29, ),
-        /* 177 */ array(17, 29, ),
-        /* 178 */ array(17, 29, ),
-        /* 179 */ array(1, 17, ),
-        /* 180 */ array(17, 29, ),
-        /* 181 */ array(58, 63, ),
-        /* 182 */ array(17, 29, ),
-        /* 183 */ array(17, 29, ),
-        /* 184 */ array(1, 17, ),
-        /* 185 */ array(58, 63, ),
-        /* 186 */ array(17, 29, ),
-        /* 187 */ array(17, 29, ),
-        /* 188 */ array(1, 17, ),
-        /* 189 */ array(29, ),
-        /* 190 */ array(1, ),
-        /* 191 */ array(1, ),
-        /* 192 */ array(2, ),
-        /* 193 */ array(2, ),
-        /* 194 */ array(37, ),
-        /* 195 */ array(29, ),
-        /* 196 */ array(21, ),
-        /* 197 */ array(14, ),
-        /* 198 */ array(21, ),
-        /* 199 */ array(21, ),
-        /* 200 */ array(),
-        /* 201 */ array(),
-        /* 202 */ array(),
-        /* 203 */ array(),
-        /* 204 */ array(),
-        /* 205 */ array(17, 24, 26, 27, 29, 30, 36, 37, 38, 53, 60, 64, 78, ),
-        /* 206 */ array(17, 20, 29, 37, 60, ),
-        /* 207 */ array(16, 18, 19, 35, ),
-        /* 208 */ array(37, 58, 60, 64, ),
-        /* 209 */ array(17, 29, 37, 60, ),
-        /* 210 */ array(31, 37, 60, ),
-        /* 211 */ array(36, 38, ),
-        /* 212 */ array(24, 36, ),
-        /* 213 */ array(2, 20, ),
-        /* 214 */ array(25, 78, ),
-        /* 215 */ array(17, 25, ),
-        /* 216 */ array(36, 38, ),
-        /* 217 */ array(36, 38, ),
-        /* 218 */ array(19, 61, ),
-        /* 219 */ array(36, 64, ),
-        /* 220 */ array(37, 60, ),
-        /* 221 */ array(37, 60, ),
-        /* 222 */ array(20, 58, ),
-        /* 223 */ array(37, ),
-        /* 224 */ array(18, ),
-        /* 225 */ array(19, ),
-        /* 226 */ array(2, ),
-        /* 227 */ array(62, ),
-        /* 228 */ array(18, ),
-        /* 229 */ array(26, ),
-        /* 230 */ array(19, ),
-        /* 231 */ array(18, ),
-        /* 232 */ array(19, ),
-        /* 233 */ array(35, ),
-        /* 234 */ array(37, ),
-        /* 235 */ array(38, ),
-        /* 236 */ array(25, ),
-        /* 237 */ array(54, ),
-        /* 238 */ array(2, ),
-        /* 239 */ array(19, ),
-        /* 240 */ array(19, ),
-        /* 241 */ array(19, ),
-        /* 242 */ array(64, ),
-        /* 243 */ array(19, ),
-        /* 244 */ array(19, ),
-        /* 245 */ array(19, ),
-        /* 246 */ array(58, ),
-        /* 247 */ array(19, ),
-        /* 248 */ array(62, ),
-        /* 249 */ array(35, ),
-        /* 250 */ array(18, ),
-        /* 251 */ array(20, ),
-        /* 252 */ array(18, ),
-        /* 253 */ array(),
-        /* 254 */ array(),
-        /* 255 */ array(),
-        /* 256 */ array(),
-        /* 257 */ array(),
-        /* 258 */ array(),
-        /* 259 */ array(),
-        /* 260 */ array(),
-        /* 261 */ array(),
-        /* 262 */ array(),
-        /* 263 */ array(),
-        /* 264 */ array(),
-        /* 265 */ array(),
-        /* 266 */ array(),
-        /* 267 */ array(),
-        /* 268 */ array(),
-        /* 269 */ array(),
-        /* 270 */ array(),
-        /* 271 */ array(),
-        /* 272 */ array(),
-        /* 273 */ array(),
-        /* 274 */ array(),
-        /* 275 */ array(),
-        /* 276 */ array(),
-        /* 277 */ array(),
-        /* 278 */ array(),
-        /* 279 */ array(),
-        /* 280 */ array(),
-        /* 281 */ array(),
-        /* 282 */ array(),
-        /* 283 */ array(),
-        /* 284 */ array(),
-        /* 285 */ array(),
-        /* 286 */ array(),
-        /* 287 */ array(),
-        /* 288 */ array(),
-        /* 289 */ array(),
-        /* 290 */ array(),
-        /* 291 */ array(),
-        /* 292 */ array(),
-        /* 293 */ array(),
-        /* 294 */ array(),
-        /* 295 */ array(),
-        /* 296 */ array(),
-        /* 297 */ array(),
-        /* 298 */ array(),
-        /* 299 */ array(),
-        /* 300 */ array(),
-        /* 301 */ array(),
-        /* 302 */ array(),
-        /* 303 */ array(),
-        /* 304 */ array(),
-        /* 305 */ array(),
-        /* 306 */ array(),
-        /* 307 */ array(),
-        /* 308 */ array(),
-        /* 309 */ array(),
-        /* 310 */ array(),
-        /* 311 */ array(),
-        /* 312 */ array(),
-        /* 313 */ array(),
-        /* 314 */ array(),
-        /* 315 */ array(),
-        /* 316 */ array(),
-        /* 317 */ array(),
-        /* 318 */ array(),
-        /* 319 */ array(),
-        /* 320 */ array(),
-        /* 321 */ array(),
-        /* 322 */ array(),
-        /* 323 */ array(),
-        /* 324 */ array(),
-        /* 325 */ array(),
-        /* 326 */ array(),
-        /* 327 */ array(),
-        /* 328 */ array(),
-        /* 329 */ array(),
-        /* 330 */ array(),
-        /* 331 */ array(),
-        /* 332 */ array(),
-        /* 333 */ array(),
-        /* 334 */ array(),
-        /* 335 */ array(),
-        /* 336 */ array(),
-        /* 337 */ array(),
-        /* 338 */ array(),
-        /* 339 */ array(),
-        /* 340 */ array(),
-        /* 341 */ array(),
-        /* 342 */ array(),
-        /* 343 */ array(),
-        /* 344 */ array(),
-        /* 345 */ array(),
-        /* 346 */ array(),
-        /* 347 */ array(),
-        /* 348 */ array(),
-        /* 349 */ array(),
-        /* 350 */ array(),
-        /* 351 */ array(),
-        /* 352 */ array(),
-        /* 353 */ array(),
-        /* 354 */ array(),
-        /* 355 */ array(),
-        /* 356 */ array(),
-        /* 357 */ array(),
-        /* 358 */ array(),
-        /* 359 */ array(),
-        /* 360 */ array(),
-        /* 361 */ array(),
-        /* 362 */ array(),
-        /* 363 */ array(),
-        /* 364 */ array(),
-        /* 365 */ array(),
-        /* 366 */ array(),
-        /* 367 */ array(),
-        /* 368 */ array(),
-        /* 369 */ array(),
-        /* 370 */ array(),
-        /* 371 */ array(),
-        /* 372 */ array(),
-        /* 373 */ array(),
-        /* 374 */ array(),
-        /* 375 */ array(),
-        /* 376 */ array(),
-        /* 377 */ array(),
-        /* 378 */ array(),
-        /* 379 */ array(),
-        /* 380 */ array(),
-        /* 381 */ array(),
-        /* 382 */ array(),
-        /* 383 */ array(),
-        /* 384 */ array(),
-        /* 385 */ array(),
-        /* 386 */ array(),
-        /* 387 */ array(),
-);
-    static public $yy_default = array(
- /*     0 */   391,  573,  544,  590,  544,  590,  590,  544,  590,  590,
- /*    10 */   590,  590,  590,  590,  590,  590,  590,  590,  590,  590,
- /*    20 */   590,  590,  590,  590,  590,  590,  590,  590,  590,  590,
- /*    30 */   590,  590,  590,  590,  590,  590,  590,  590,  590,  590,
- /*    40 */   590,  590,  590,  590,  590,  590,  590,  590,  590,  590,
- /*    50 */   590,  590,  590,  590,  590,  590,  452,  452,  452,  452,
- /*    60 */   590,  590,  590,  457,  590,  590,  590,  590,  590,  590,
- /*    70 */   590,  542,  454,  481,  482,  485,  486,  478,  543,  476,
- /*    80 */   463,  575,  576,  473,  459,  457,  477,  434,  462,  574,
- /*    90 */   490,  489,  501,  465,  452,  388,  590,  452,  452,  509,
- /*   100 */   472,  590,  452,  590,  556,  452,  452,  590,  452,  590,
- /*   110 */   590,  465,  590,  465,  517,  465,  517,  510,  517,  510,
- /*   120 */   465,  590,  465,  590,  590,  517,  590,  590,  590,  510,
- /*   130 */   590,  590,  465,  590,  590,  590,  590,  590,  590,  590,
- /*   140 */   590,  590,  590,  590,  590,  493,  553,  475,  492,  469,
- /*   150 */   488,  468,  510,  452,  452,  470,  494,  551,  590,  518,
- /*   160 */   590,  534,  517,  537,  590,  590,  590,  590,  590,  590,
- /*   170 */   590,  590,  590,  535,  590,  590,  590,  590,  590,  590,
- /*   180 */   590,  536,  590,  590,  590,  515,  590,  590,  590,  589,
- /*   190 */   472,  509,  545,  546,  517,  589,  531,  407,  557,  554,
- /*   200 */   550,  550,  517,  550,  517,  467,  501,  590,  501,  501,
- /*   210 */   501,  590,  590,  529,  491,  491,  590,  590,  590,  590,
- /*   220 */   501,  487,  497,  555,  590,  590,  529,  590,  590,  460,
- /*   230 */   590,  590,  590,  590,  529,  590,  491,  503,  529,  590,
- /*   240 */   590,  590,  590,  590,  590,  590,  497,  590,  590,  499,
- /*   250 */   590,  590,  590,  437,  417,  389,  571,  431,  432,  441,
- /*   260 */   572,  540,  435,  588,  461,  539,  525,  523,  503,  526,
- /*   270 */   524,  514,  513,  530,  436,  570,  464,  538,  522,  442,
- /*   280 */   552,  541,  567,  529,  528,  443,  444,  549,  440,  439,
- /*   290 */   430,  429,  451,  433,  438,  445,  446,  498,  496,  500,
- /*   300 */   506,  466,  495,  449,  447,  547,  548,  448,  450,  416,
- /*   310 */   398,  397,  399,  400,  401,  396,  395,  390,  392,  393,
- /*   320 */   394,  402,  403,  412,  411,  413,  414,  415,  410,  409,
- /*   330 */   404,  405,  406,  408,  467,  511,  422,  421,  423,  532,
- /*   340 */   424,  420,  585,  512,  508,  533,  418,  419,  425,  426,
- /*   350 */   581,  582,  583,  586,  587,  579,  578,  428,  427,  584,
- /*   360 */   577,  471,  569,  504,  474,  505,  507,  479,  502,  521,
- /*   370 */   516,  519,  527,  520,  480,  483,  564,  563,  565,  566,
- /*   380 */   568,  562,  561,  484,  558,  559,  560,  580,
-);
-    const YYNOCODE = 123;
-    const YYSTACKDEPTH = 100;
-    const YYNSTATE = 388;
-    const YYNRULE = 202;
-    const YYERRORSYMBOL = 80;
-    const YYERRSYMDT = 'yy0';
-    const YYFALLBACK = 0;
-    static public $yyFallback = array(
-    );
-    static function Trace($TraceFILE, $zTracePrompt)
-    {
-        if (!$TraceFILE) {
-            $zTracePrompt = 0;
-        } elseif (!$zTracePrompt) {
-            $TraceFILE = 0;
-        }
-        self::$yyTraceFILE = $TraceFILE;
-        self::$yyTracePrompt = $zTracePrompt;
-    }
-
-    static function PrintTrace()
-    {
-        self::$yyTraceFILE = fopen('php://output', 'w');
-        self::$yyTracePrompt = '<br>';
-    }
-
-    static public $yyTraceFILE;
-    static public $yyTracePrompt;
-    public $yyidx;                    /* Index of top element in stack */
-    public $yyerrcnt;                 /* Shifts left before out of the error */
-    public $yystack = array();  /* The parser's stack */
-
-    public $yyTokenName = array(
-  '$',             'VERT',          'COLON',         'COMMENT',
-  'PHPSTARTTAG',   'PHPENDTAG',     'ASPSTARTTAG',   'ASPENDTAG',
-  'FAKEPHPSTARTTAG',  'XMLTAG',        'TEXT',          'STRIPON',
-  'STRIPOFF',      'LITERALSTART',  'LITERALEND',    'LITERAL',
-  'LDEL',          'RDEL',          'DOLLAR',        'ID',
-  'EQUAL',         'PTR',           'LDELIF',        'LDELFOR',
-  'SEMICOLON',     'INCDEC',        'TO',            'STEP',
-  'LDELFOREACH',   'SPACE',         'AS',            'APTR',
-  'LDELSETFILTER',  'SMARTYBLOCKCHILD',  'LDELSLASH',     'INTEGER',
-  'COMMA',         'OPENP',         'CLOSEP',        'MATH',
-  'UNIMATH',       'ANDSYM',        'ISIN',          'ISDIVBY',
-  'ISNOTDIVBY',    'ISEVEN',        'ISNOTEVEN',     'ISEVENBY',
-  'ISNOTEVENBY',   'ISODD',         'ISNOTODD',      'ISODDBY',
-  'ISNOTODDBY',    'INSTANCEOF',    'QMARK',         'NOT',
-  'TYPECAST',      'HEX',           'DOT',           'SINGLEQUOTESTRING',
-  'DOUBLECOLON',   'AT',            'HATCH',         'OPENB',
-  'CLOSEB',        'EQUALS',        'NOTEQUALS',     'GREATERTHAN',
-  'LESSTHAN',      'GREATEREQUAL',  'LESSEQUAL',     'IDENTITY',
-  'NONEIDENTITY',  'MOD',           'LAND',          'LOR',
-  'LXOR',          'QUOTE',         'BACKTICK',      'DOLLARID',
-  'error',         'start',         'template',      'template_element',
-  'smartytag',     'literal',       'literal_elements',  'literal_element',
-  'value',         'modifierlist',  'attributes',    'expr',
-  'varindexed',    'statement',     'statements',    'optspace',
-  'varvar',        'foraction',     'modparameters',  'attribute',
-  'ternary',       'array',         'ifcond',        'lop',
-  'variable',      'function',      'doublequoted_with_quotes',  'static_class_access',
-  'object',        'arrayindex',    'indexdef',      'varvarele',
-  'objectchain',   'objectelement',  'method',        'params',
-  'modifier',      'modparameter',  'arrayelements',  'arrayelement',
-  'doublequoted',  'doublequotedcontent',
-    );
-
-    static public $yyRuleName = array(
- /*   0 */ "start ::= template",
- /*   1 */ "template ::= template_element",
- /*   2 */ "template ::= template template_element",
- /*   3 */ "template ::=",
- /*   4 */ "template_element ::= smartytag",
- /*   5 */ "template_element ::= COMMENT",
- /*   6 */ "template_element ::= literal",
- /*   7 */ "template_element ::= PHPSTARTTAG",
- /*   8 */ "template_element ::= PHPENDTAG",
- /*   9 */ "template_element ::= ASPSTARTTAG",
- /*  10 */ "template_element ::= ASPENDTAG",
- /*  11 */ "template_element ::= FAKEPHPSTARTTAG",
- /*  12 */ "template_element ::= XMLTAG",
- /*  13 */ "template_element ::= TEXT",
- /*  14 */ "template_element ::= STRIPON",
- /*  15 */ "template_element ::= STRIPOFF",
- /*  16 */ "literal ::= LITERALSTART LITERALEND",
- /*  17 */ "literal ::= LITERALSTART literal_elements LITERALEND",
- /*  18 */ "literal_elements ::= literal_elements literal_element",
- /*  19 */ "literal_elements ::=",
- /*  20 */ "literal_element ::= literal",
- /*  21 */ "literal_element ::= LITERAL",
- /*  22 */ "literal_element ::= PHPSTARTTAG",
- /*  23 */ "literal_element ::= FAKEPHPSTARTTAG",
- /*  24 */ "literal_element ::= PHPENDTAG",
- /*  25 */ "literal_element ::= ASPSTARTTAG",
- /*  26 */ "literal_element ::= ASPENDTAG",
- /*  27 */ "smartytag ::= LDEL value RDEL",
- /*  28 */ "smartytag ::= LDEL value modifierlist attributes RDEL",
- /*  29 */ "smartytag ::= LDEL value attributes RDEL",
- /*  30 */ "smartytag ::= LDEL expr modifierlist attributes RDEL",
- /*  31 */ "smartytag ::= LDEL expr attributes RDEL",
- /*  32 */ "smartytag ::= LDEL DOLLAR ID EQUAL value RDEL",
- /*  33 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr RDEL",
- /*  34 */ "smartytag ::= LDEL DOLLAR ID EQUAL expr attributes RDEL",
- /*  35 */ "smartytag ::= LDEL varindexed EQUAL expr attributes RDEL",
- /*  36 */ "smartytag ::= LDEL ID attributes RDEL",
- /*  37 */ "smartytag ::= LDEL ID RDEL",
- /*  38 */ "smartytag ::= LDEL ID PTR ID attributes RDEL",
- /*  39 */ "smartytag ::= LDEL ID modifierlist attributes RDEL",
- /*  40 */ "smartytag ::= LDEL ID PTR ID modifierlist attributes RDEL",
- /*  41 */ "smartytag ::= LDELIF expr RDEL",
- /*  42 */ "smartytag ::= LDELIF expr attributes RDEL",
- /*  43 */ "smartytag ::= LDELIF statement RDEL",
- /*  44 */ "smartytag ::= LDELIF statement attributes RDEL",
- /*  45 */ "smartytag ::= LDELFOR statements SEMICOLON optspace expr SEMICOLON optspace DOLLAR varvar foraction attributes RDEL",
- /*  46 */ "foraction ::= EQUAL expr",
- /*  47 */ "foraction ::= INCDEC",
- /*  48 */ "smartytag ::= LDELFOR statement TO expr attributes RDEL",
- /*  49 */ "smartytag ::= LDELFOR statement TO expr STEP expr attributes RDEL",
- /*  50 */ "smartytag ::= LDELFOREACH attributes RDEL",
- /*  51 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar attributes RDEL",
- /*  52 */ "smartytag ::= LDELFOREACH SPACE value AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
- /*  53 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar attributes RDEL",
- /*  54 */ "smartytag ::= LDELFOREACH SPACE expr AS DOLLAR varvar APTR DOLLAR varvar attributes RDEL",
- /*  55 */ "smartytag ::= LDELSETFILTER ID modparameters RDEL",
- /*  56 */ "smartytag ::= LDELSETFILTER ID modparameters modifierlist RDEL",
- /*  57 */ "smartytag ::= SMARTYBLOCKCHILD",
- /*  58 */ "smartytag ::= LDELSLASH ID RDEL",
- /*  59 */ "smartytag ::= LDELSLASH ID modifierlist RDEL",
- /*  60 */ "smartytag ::= LDELSLASH ID PTR ID RDEL",
- /*  61 */ "smartytag ::= LDELSLASH ID PTR ID modifierlist RDEL",
- /*  62 */ "attributes ::= attributes attribute",
- /*  63 */ "attributes ::= attribute",
- /*  64 */ "attributes ::=",
- /*  65 */ "attribute ::= SPACE ID EQUAL ID",
- /*  66 */ "attribute ::= SPACE ID EQUAL expr",
- /*  67 */ "attribute ::= SPACE ID EQUAL value",
- /*  68 */ "attribute ::= SPACE ID",
- /*  69 */ "attribute ::= SPACE expr",
- /*  70 */ "attribute ::= SPACE value",
- /*  71 */ "attribute ::= SPACE INTEGER EQUAL expr",
- /*  72 */ "statements ::= statement",
- /*  73 */ "statements ::= statements COMMA statement",
- /*  74 */ "statement ::= DOLLAR varvar EQUAL expr",
- /*  75 */ "statement ::= varindexed EQUAL expr",
- /*  76 */ "statement ::= OPENP statement CLOSEP",
- /*  77 */ "expr ::= value",
- /*  78 */ "expr ::= ternary",
- /*  79 */ "expr ::= DOLLAR ID COLON ID",
- /*  80 */ "expr ::= expr MATH value",
- /*  81 */ "expr ::= expr UNIMATH value",
- /*  82 */ "expr ::= expr ANDSYM value",
- /*  83 */ "expr ::= array",
- /*  84 */ "expr ::= expr modifierlist",
- /*  85 */ "expr ::= expr ifcond expr",
- /*  86 */ "expr ::= expr ISIN array",
- /*  87 */ "expr ::= expr ISIN value",
- /*  88 */ "expr ::= expr lop expr",
- /*  89 */ "expr ::= expr ISDIVBY expr",
- /*  90 */ "expr ::= expr ISNOTDIVBY expr",
- /*  91 */ "expr ::= expr ISEVEN",
- /*  92 */ "expr ::= expr ISNOTEVEN",
- /*  93 */ "expr ::= expr ISEVENBY expr",
- /*  94 */ "expr ::= expr ISNOTEVENBY expr",
- /*  95 */ "expr ::= expr ISODD",
- /*  96 */ "expr ::= expr ISNOTODD",
- /*  97 */ "expr ::= expr ISODDBY expr",
- /*  98 */ "expr ::= expr ISNOTODDBY expr",
- /*  99 */ "expr ::= value INSTANCEOF ID",
- /* 100 */ "expr ::= value INSTANCEOF value",
- /* 101 */ "ternary ::= OPENP expr CLOSEP QMARK DOLLAR ID COLON expr",
- /* 102 */ "ternary ::= OPENP expr CLOSEP QMARK expr COLON expr",
- /* 103 */ "value ::= variable",
- /* 104 */ "value ::= UNIMATH value",
- /* 105 */ "value ::= NOT value",
- /* 106 */ "value ::= TYPECAST value",
- /* 107 */ "value ::= variable INCDEC",
- /* 108 */ "value ::= HEX",
- /* 109 */ "value ::= INTEGER",
- /* 110 */ "value ::= INTEGER DOT INTEGER",
- /* 111 */ "value ::= INTEGER DOT",
- /* 112 */ "value ::= DOT INTEGER",
- /* 113 */ "value ::= ID",
- /* 114 */ "value ::= function",
- /* 115 */ "value ::= OPENP expr CLOSEP",
- /* 116 */ "value ::= SINGLEQUOTESTRING",
- /* 117 */ "value ::= doublequoted_with_quotes",
- /* 118 */ "value ::= ID DOUBLECOLON static_class_access",
- /* 119 */ "value ::= varindexed DOUBLECOLON static_class_access",
- /* 120 */ "value ::= smartytag",
- /* 121 */ "value ::= value modifierlist",
- /* 122 */ "variable ::= varindexed",
- /* 123 */ "variable ::= DOLLAR varvar AT ID",
- /* 124 */ "variable ::= object",
- /* 125 */ "variable ::= HATCH ID HATCH",
- /* 126 */ "variable ::= HATCH variable HATCH",
- /* 127 */ "varindexed ::= DOLLAR varvar arrayindex",
- /* 128 */ "arrayindex ::= arrayindex indexdef",
- /* 129 */ "arrayindex ::=",
- /* 130 */ "indexdef ::= DOT DOLLAR varvar",
- /* 131 */ "indexdef ::= DOT DOLLAR varvar AT ID",
- /* 132 */ "indexdef ::= DOT ID",
- /* 133 */ "indexdef ::= DOT INTEGER",
- /* 134 */ "indexdef ::= DOT LDEL expr RDEL",
- /* 135 */ "indexdef ::= OPENB ID CLOSEB",
- /* 136 */ "indexdef ::= OPENB ID DOT ID CLOSEB",
- /* 137 */ "indexdef ::= OPENB expr CLOSEB",
- /* 138 */ "indexdef ::= OPENB CLOSEB",
- /* 139 */ "varvar ::= varvarele",
- /* 140 */ "varvar ::= varvar varvarele",
- /* 141 */ "varvarele ::= ID",
- /* 142 */ "varvarele ::= LDEL expr RDEL",
- /* 143 */ "object ::= varindexed objectchain",
- /* 144 */ "objectchain ::= objectelement",
- /* 145 */ "objectchain ::= objectchain objectelement",
- /* 146 */ "objectelement ::= PTR ID arrayindex",
- /* 147 */ "objectelement ::= PTR DOLLAR varvar arrayindex",
- /* 148 */ "objectelement ::= PTR LDEL expr RDEL arrayindex",
- /* 149 */ "objectelement ::= PTR ID LDEL expr RDEL arrayindex",
- /* 150 */ "objectelement ::= PTR method",
- /* 151 */ "function ::= ID OPENP params CLOSEP",
- /* 152 */ "method ::= ID OPENP params CLOSEP",
- /* 153 */ "method ::= DOLLAR ID OPENP params CLOSEP",
- /* 154 */ "params ::= params COMMA expr",
- /* 155 */ "params ::= expr",
- /* 156 */ "params ::=",
- /* 157 */ "modifierlist ::= modifierlist modifier modparameters",
- /* 158 */ "modifierlist ::= modifier modparameters",
- /* 159 */ "modifier ::= VERT AT ID",
- /* 160 */ "modifier ::= VERT ID",
- /* 161 */ "modparameters ::= modparameters modparameter",
- /* 162 */ "modparameters ::=",
- /* 163 */ "modparameter ::= COLON value",
- /* 164 */ "modparameter ::= COLON array",
- /* 165 */ "static_class_access ::= method",
- /* 166 */ "static_class_access ::= method objectchain",
- /* 167 */ "static_class_access ::= ID",
- /* 168 */ "static_class_access ::= DOLLAR ID arrayindex",
- /* 169 */ "static_class_access ::= DOLLAR ID arrayindex objectchain",
- /* 170 */ "ifcond ::= EQUALS",
- /* 171 */ "ifcond ::= NOTEQUALS",
- /* 172 */ "ifcond ::= GREATERTHAN",
- /* 173 */ "ifcond ::= LESSTHAN",
- /* 174 */ "ifcond ::= GREATEREQUAL",
- /* 175 */ "ifcond ::= LESSEQUAL",
- /* 176 */ "ifcond ::= IDENTITY",
- /* 177 */ "ifcond ::= NONEIDENTITY",
- /* 178 */ "ifcond ::= MOD",
- /* 179 */ "lop ::= LAND",
- /* 180 */ "lop ::= LOR",
- /* 181 */ "lop ::= LXOR",
- /* 182 */ "array ::= OPENB arrayelements CLOSEB",
- /* 183 */ "arrayelements ::= arrayelement",
- /* 184 */ "arrayelements ::= arrayelements COMMA arrayelement",
- /* 185 */ "arrayelements ::=",
- /* 186 */ "arrayelement ::= value APTR expr",
- /* 187 */ "arrayelement ::= ID APTR expr",
- /* 188 */ "arrayelement ::= expr",
- /* 189 */ "doublequoted_with_quotes ::= QUOTE QUOTE",
- /* 190 */ "doublequoted_with_quotes ::= QUOTE doublequoted QUOTE",
- /* 191 */ "doublequoted ::= doublequoted doublequotedcontent",
- /* 192 */ "doublequoted ::= doublequotedcontent",
- /* 193 */ "doublequotedcontent ::= BACKTICK variable BACKTICK",
- /* 194 */ "doublequotedcontent ::= BACKTICK expr BACKTICK",
- /* 195 */ "doublequotedcontent ::= DOLLARID",
- /* 196 */ "doublequotedcontent ::= LDEL variable RDEL",
- /* 197 */ "doublequotedcontent ::= LDEL expr RDEL",
- /* 198 */ "doublequotedcontent ::= smartytag",
- /* 199 */ "doublequotedcontent ::= TEXT",
- /* 200 */ "optspace ::= SPACE",
- /* 201 */ "optspace ::=",
-    );
-
-    function tokenName($tokenType)
-    {
-        if ($tokenType === 0) {
-            return 'End of Input';
-        }
-        if ($tokenType > 0 && $tokenType < count($this->yyTokenName)) {
-            return $this->yyTokenName[$tokenType];
-        } else {
-            return "Unknown";
-        }
-    }
-
-    static function yy_destructor($yymajor, $yypminor)
-    {
-        switch ($yymajor) {
-            default:  break;   /* If no destructor action specified: do nothing */
-        }
-    }
-
-    function yy_pop_parser_stack()
-    {
-        if (!count($this->yystack)) {
-            return;
-        }
-        $yytos = array_pop($this->yystack);
-        if (self::$yyTraceFILE && $this->yyidx >= 0) {
-            fwrite(self::$yyTraceFILE,
-                self::$yyTracePrompt . 'Popping ' . $this->yyTokenName[$yytos->major] .
-                    "\n");
-        }
-        $yymajor = $yytos->major;
-        self::yy_destructor($yymajor, $yytos->minor);
-        $this->yyidx--;
-        return $yymajor;
-    }
-
-    function __destruct()
-    {
-        while ($this->yystack !== Array()) {
-            $this->yy_pop_parser_stack();
-        }
-        if (is_resource(self::$yyTraceFILE)) {
-            fclose(self::$yyTraceFILE);
-        }
-    }
-
-    function yy_get_expected_tokens($token)
-    {
-        $state = $this->yystack[$this->yyidx]->stateno;
-        $expected = self::$yyExpectedTokens[$state];
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return $expected;
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done++ == 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return array_unique($expected);
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate])) {
-		        $expected = array_merge($expected, self::$yyExpectedTokens[$nextstate]);
-                            if (in_array($token,
-                                  self::$yyExpectedTokens[$nextstate], true)) {
-                            $this->yyidx = $yyidx;
-                            $this->yystack = $stack;
-                            return array_unique($expected);
-                        }
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx++;
-                        $x = new TP_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-                        $this->yystack[$this->yyidx] = $x;
-                        continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return array_unique($expected);
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return $expected;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-	$this->yyidx = $yyidx;
-	$this->yystack = $stack;
-        return array_unique($expected);
-    }
-
-    function yy_is_expected_token($token)
-    {
-        if ($token === 0) {
-            return true; // 0 is not part of this
-        }
-        $state = $this->yystack[$this->yyidx]->stateno;
-        if (in_array($token, self::$yyExpectedTokens[$state], true)) {
-            return true;
-        }
-        $stack = $this->yystack;
-        $yyidx = $this->yyidx;
-        do {
-            $yyact = $this->yy_find_shift_action($token);
-            if ($yyact >= self::YYNSTATE && $yyact < self::YYNSTATE + self::YYNRULE) {
-                // reduce action
-                $done = 0;
-                do {
-                    if ($done++ == 100) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // too much recursion prevents proper detection
-                        // so give up
-                        return true;
-                    }
-                    $yyruleno = $yyact - self::YYNSTATE;
-                    $this->yyidx -= self::$yyRuleInfo[$yyruleno]['rhs'];
-                    $nextstate = $this->yy_find_reduce_action(
-                        $this->yystack[$this->yyidx]->stateno,
-                        self::$yyRuleInfo[$yyruleno]['lhs']);
-                    if (isset(self::$yyExpectedTokens[$nextstate]) &&
-                          in_array($token, self::$yyExpectedTokens[$nextstate], true)) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        return true;
-                    }
-                    if ($nextstate < self::YYNSTATE) {
-                        // we need to shift a non-terminal
-                        $this->yyidx++;
-                        $x = new TP_yyStackEntry;
-                        $x->stateno = $nextstate;
-                        $x->major = self::$yyRuleInfo[$yyruleno]['lhs'];
-                        $this->yystack[$this->yyidx] = $x;
-                        continue 2;
-                    } elseif ($nextstate == self::YYNSTATE + self::YYNRULE + 1) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        if (!$token) {
-                            // end of input: this is valid
-                            return true;
-                        }
-                        // the last token was just ignored, we can't accept
-                        // by ignoring input, this is in essence ignoring a
-                        // syntax error!
-                        return false;
-                    } elseif ($nextstate === self::YY_NO_ACTION) {
-                        $this->yyidx = $yyidx;
-                        $this->yystack = $stack;
-                        // input accepted, but not shifted (I guess)
-                        return true;
-                    } else {
-                        $yyact = $nextstate;
-                    }
-                } while (true);
-            }
-            break;
-        } while (true);
-        $this->yyidx = $yyidx;
-        $this->yystack = $stack;
-        return true;
-    }
-
-   function yy_find_shift_action($iLookAhead)
-    {
-        $stateno = $this->yystack[$this->yyidx]->stateno;
-
-        /* if ($this->yyidx < 0) return self::YY_NO_ACTION;  */
-        if (!isset(self::$yy_shift_ofst[$stateno])) {
-            // no shift actions
-            return self::$yy_default[$stateno];
-        }
-        $i = self::$yy_shift_ofst[$stateno];
-        if ($i === self::YY_SHIFT_USE_DFLT) {
-            return self::$yy_default[$stateno];
-        }
-        if ($iLookAhead == self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            if (count(self::$yyFallback) && $iLookAhead < count(self::$yyFallback)
-                   && ($iFallback = self::$yyFallback[$iLookAhead]) != 0) {
-                if (self::$yyTraceFILE) {
-                    fwrite(self::$yyTraceFILE, self::$yyTracePrompt . "FALLBACK " .
-                        $this->yyTokenName[$iLookAhead] . " => " .
-                        $this->yyTokenName[$iFallback] . "\n");
-                }
-                return $this->yy_find_shift_action($iFallback);
-            }
-            return self::$yy_default[$stateno];
-        } else {
-            return self::$yy_action[$i];
-        }
-    }
-
-    function yy_find_reduce_action($stateno, $iLookAhead)
-    {
-        /* $stateno = $this->yystack[$this->yyidx]->stateno; */
-
-        if (!isset(self::$yy_reduce_ofst[$stateno])) {
-            return self::$yy_default[$stateno];
-        }
-        $i = self::$yy_reduce_ofst[$stateno];
-        if ($i == self::YY_REDUCE_USE_DFLT) {
-            return self::$yy_default[$stateno];
-        }
-        if ($iLookAhead == self::YYNOCODE) {
-            return self::YY_NO_ACTION;
-        }
-        $i += $iLookAhead;
-        if ($i < 0 || $i >= self::YY_SZ_ACTTAB ||
-              self::$yy_lookahead[$i] != $iLookAhead) {
-            return self::$yy_default[$stateno];
-        } else {
-            return self::$yy_action[$i];
-        }
-    }
-
-    function yy_shift($yyNewState, $yyMajor, $yypMinor)
-    {
-        $this->yyidx++;
-        if ($this->yyidx >= self::YYSTACKDEPTH) {
-            $this->yyidx--;
-            if (self::$yyTraceFILE) {
-                fprintf(self::$yyTraceFILE, "%sStack Overflow!\n", self::$yyTracePrompt);
-            }
-            while ($this->yyidx >= 0) {
-                $this->yy_pop_parser_stack();
-            }
-#line 84 "smarty_internal_templateparser.y"
-
-    $this->internalError = true;
-    $this->compiler->trigger_template_error("Stack overflow in template parser");
-#line 1753 "smarty_internal_templateparser.php"
-            return;
-        }
-        $yytos = new TP_yyStackEntry;
-        $yytos->stateno = $yyNewState;
-        $yytos->major = $yyMajor;
-        $yytos->minor = $yypMinor;
-        array_push($this->yystack, $yytos);
-        if (self::$yyTraceFILE && $this->yyidx > 0) {
-            fprintf(self::$yyTraceFILE, "%sShift %d\n", self::$yyTracePrompt,
-                $yyNewState);
-            fprintf(self::$yyTraceFILE, "%sStack:", self::$yyTracePrompt);
-            for($i = 1; $i <= $this->yyidx; $i++) {
-                fprintf(self::$yyTraceFILE, " %s",
-                    $this->yyTokenName[$this->yystack[$i]->major]);
-            }
-            fwrite(self::$yyTraceFILE,"\n");
-        }
-    }
-
-    static public $yyRuleInfo = array(
-  array( 'lhs' => 81, 'rhs' => 1 ),
-  array( 'lhs' => 82, 'rhs' => 1 ),
-  array( 'lhs' => 82, 'rhs' => 2 ),
-  array( 'lhs' => 82, 'rhs' => 0 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 83, 'rhs' => 1 ),
-  array( 'lhs' => 85, 'rhs' => 2 ),
-  array( 'lhs' => 85, 'rhs' => 3 ),
-  array( 'lhs' => 86, 'rhs' => 2 ),
-  array( 'lhs' => 86, 'rhs' => 0 ),
-  array( 'lhs' => 87, 'rhs' => 1 ),
-  array( 'lhs' => 87, 'rhs' => 1 ),
-  array( 'lhs' => 87, 'rhs' => 1 ),
-  array( 'lhs' => 87, 'rhs' => 1 ),
-  array( 'lhs' => 87, 'rhs' => 1 ),
-  array( 'lhs' => 87, 'rhs' => 1 ),
-  array( 'lhs' => 87, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 3 ),
-  array( 'lhs' => 84, 'rhs' => 5 ),
-  array( 'lhs' => 84, 'rhs' => 4 ),
-  array( 'lhs' => 84, 'rhs' => 5 ),
-  array( 'lhs' => 84, 'rhs' => 4 ),
-  array( 'lhs' => 84, 'rhs' => 6 ),
-  array( 'lhs' => 84, 'rhs' => 6 ),
-  array( 'lhs' => 84, 'rhs' => 7 ),
-  array( 'lhs' => 84, 'rhs' => 6 ),
-  array( 'lhs' => 84, 'rhs' => 4 ),
-  array( 'lhs' => 84, 'rhs' => 3 ),
-  array( 'lhs' => 84, 'rhs' => 6 ),
-  array( 'lhs' => 84, 'rhs' => 5 ),
-  array( 'lhs' => 84, 'rhs' => 7 ),
-  array( 'lhs' => 84, 'rhs' => 3 ),
-  array( 'lhs' => 84, 'rhs' => 4 ),
-  array( 'lhs' => 84, 'rhs' => 3 ),
-  array( 'lhs' => 84, 'rhs' => 4 ),
-  array( 'lhs' => 84, 'rhs' => 12 ),
-  array( 'lhs' => 97, 'rhs' => 2 ),
-  array( 'lhs' => 97, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 6 ),
-  array( 'lhs' => 84, 'rhs' => 8 ),
-  array( 'lhs' => 84, 'rhs' => 3 ),
-  array( 'lhs' => 84, 'rhs' => 8 ),
-  array( 'lhs' => 84, 'rhs' => 11 ),
-  array( 'lhs' => 84, 'rhs' => 8 ),
-  array( 'lhs' => 84, 'rhs' => 11 ),
-  array( 'lhs' => 84, 'rhs' => 4 ),
-  array( 'lhs' => 84, 'rhs' => 5 ),
-  array( 'lhs' => 84, 'rhs' => 1 ),
-  array( 'lhs' => 84, 'rhs' => 3 ),
-  array( 'lhs' => 84, 'rhs' => 4 ),
-  array( 'lhs' => 84, 'rhs' => 5 ),
-  array( 'lhs' => 84, 'rhs' => 6 ),
-  array( 'lhs' => 90, 'rhs' => 2 ),
-  array( 'lhs' => 90, 'rhs' => 1 ),
-  array( 'lhs' => 90, 'rhs' => 0 ),
-  array( 'lhs' => 99, 'rhs' => 4 ),
-  array( 'lhs' => 99, 'rhs' => 4 ),
-  array( 'lhs' => 99, 'rhs' => 4 ),
-  array( 'lhs' => 99, 'rhs' => 2 ),
-  array( 'lhs' => 99, 'rhs' => 2 ),
-  array( 'lhs' => 99, 'rhs' => 2 ),
-  array( 'lhs' => 99, 'rhs' => 4 ),
-  array( 'lhs' => 94, 'rhs' => 1 ),
-  array( 'lhs' => 94, 'rhs' => 3 ),
-  array( 'lhs' => 93, 'rhs' => 4 ),
-  array( 'lhs' => 93, 'rhs' => 3 ),
-  array( 'lhs' => 93, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 1 ),
-  array( 'lhs' => 91, 'rhs' => 1 ),
-  array( 'lhs' => 91, 'rhs' => 4 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 1 ),
-  array( 'lhs' => 91, 'rhs' => 2 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 2 ),
-  array( 'lhs' => 91, 'rhs' => 2 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 2 ),
-  array( 'lhs' => 91, 'rhs' => 2 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 91, 'rhs' => 3 ),
-  array( 'lhs' => 100, 'rhs' => 8 ),
-  array( 'lhs' => 100, 'rhs' => 7 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 2 ),
-  array( 'lhs' => 88, 'rhs' => 2 ),
-  array( 'lhs' => 88, 'rhs' => 2 ),
-  array( 'lhs' => 88, 'rhs' => 2 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 3 ),
-  array( 'lhs' => 88, 'rhs' => 2 ),
-  array( 'lhs' => 88, 'rhs' => 2 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 3 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 3 ),
-  array( 'lhs' => 88, 'rhs' => 3 ),
-  array( 'lhs' => 88, 'rhs' => 1 ),
-  array( 'lhs' => 88, 'rhs' => 2 ),
-  array( 'lhs' => 104, 'rhs' => 1 ),
-  array( 'lhs' => 104, 'rhs' => 4 ),
-  array( 'lhs' => 104, 'rhs' => 1 ),
-  array( 'lhs' => 104, 'rhs' => 3 ),
-  array( 'lhs' => 104, 'rhs' => 3 ),
-  array( 'lhs' => 92, 'rhs' => 3 ),
-  array( 'lhs' => 109, 'rhs' => 2 ),
-  array( 'lhs' => 109, 'rhs' => 0 ),
-  array( 'lhs' => 110, 'rhs' => 3 ),
-  array( 'lhs' => 110, 'rhs' => 5 ),
-  array( 'lhs' => 110, 'rhs' => 2 ),
-  array( 'lhs' => 110, 'rhs' => 2 ),
-  array( 'lhs' => 110, 'rhs' => 4 ),
-  array( 'lhs' => 110, 'rhs' => 3 ),
-  array( 'lhs' => 110, 'rhs' => 5 ),
-  array( 'lhs' => 110, 'rhs' => 3 ),
-  array( 'lhs' => 110, 'rhs' => 2 ),
-  array( 'lhs' => 96, 'rhs' => 1 ),
-  array( 'lhs' => 96, 'rhs' => 2 ),
-  array( 'lhs' => 111, 'rhs' => 1 ),
-  array( 'lhs' => 111, 'rhs' => 3 ),
-  array( 'lhs' => 108, 'rhs' => 2 ),
-  array( 'lhs' => 112, 'rhs' => 1 ),
-  array( 'lhs' => 112, 'rhs' => 2 ),
-  array( 'lhs' => 113, 'rhs' => 3 ),
-  array( 'lhs' => 113, 'rhs' => 4 ),
-  array( 'lhs' => 113, 'rhs' => 5 ),
-  array( 'lhs' => 113, 'rhs' => 6 ),
-  array( 'lhs' => 113, 'rhs' => 2 ),
-  array( 'lhs' => 105, 'rhs' => 4 ),
-  array( 'lhs' => 114, 'rhs' => 4 ),
-  array( 'lhs' => 114, 'rhs' => 5 ),
-  array( 'lhs' => 115, 'rhs' => 3 ),
-  array( 'lhs' => 115, 'rhs' => 1 ),
-  array( 'lhs' => 115, 'rhs' => 0 ),
-  array( 'lhs' => 89, 'rhs' => 3 ),
-  array( 'lhs' => 89, 'rhs' => 2 ),
-  array( 'lhs' => 116, 'rhs' => 3 ),
-  array( 'lhs' => 116, 'rhs' => 2 ),
-  array( 'lhs' => 98, 'rhs' => 2 ),
-  array( 'lhs' => 98, 'rhs' => 0 ),
-  array( 'lhs' => 117, 'rhs' => 2 ),
-  array( 'lhs' => 117, 'rhs' => 2 ),
-  array( 'lhs' => 107, 'rhs' => 1 ),
-  array( 'lhs' => 107, 'rhs' => 2 ),
-  array( 'lhs' => 107, 'rhs' => 1 ),
-  array( 'lhs' => 107, 'rhs' => 3 ),
-  array( 'lhs' => 107, 'rhs' => 4 ),
-  array( 'lhs' => 102, 'rhs' => 1 ),
-  array( 'lhs' => 102, 'rhs' => 1 ),
-  array( 'lhs' => 102, 'rhs' => 1 ),
-  array( 'lhs' => 102, 'rhs' => 1 ),
-  array( 'lhs' => 102, 'rhs' => 1 ),
-  array( 'lhs' => 102, 'rhs' => 1 ),
-  array( 'lhs' => 102, 'rhs' => 1 ),
-  array( 'lhs' => 102, 'rhs' => 1 ),
-  array( 'lhs' => 102, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 103, 'rhs' => 1 ),
-  array( 'lhs' => 101, 'rhs' => 3 ),
-  array( 'lhs' => 118, 'rhs' => 1 ),
-  array( 'lhs' => 118, 'rhs' => 3 ),
-  array( 'lhs' => 118, 'rhs' => 0 ),
-  array( 'lhs' => 119, 'rhs' => 3 ),
-  array( 'lhs' => 119, 'rhs' => 3 ),
-  array( 'lhs' => 119, 'rhs' => 1 ),
-  array( 'lhs' => 106, 'rhs' => 2 ),
-  array( 'lhs' => 106, 'rhs' => 3 ),
-  array( 'lhs' => 120, 'rhs' => 2 ),
-  array( 'lhs' => 120, 'rhs' => 1 ),
-  array( 'lhs' => 121, 'rhs' => 3 ),
-  array( 'lhs' => 121, 'rhs' => 3 ),
-  array( 'lhs' => 121, 'rhs' => 1 ),
-  array( 'lhs' => 121, 'rhs' => 3 ),
-  array( 'lhs' => 121, 'rhs' => 3 ),
-  array( 'lhs' => 121, 'rhs' => 1 ),
-  array( 'lhs' => 121, 'rhs' => 1 ),
-  array( 'lhs' => 95, 'rhs' => 1 ),
-  array( 'lhs' => 95, 'rhs' => 0 ),
-    );
-
-    static public $yyReduceMap = array(
-        0 => 0,
-        1 => 1,
-        2 => 1,
-        4 => 4,
-        5 => 5,
-        6 => 6,
-        7 => 7,
-        8 => 8,
-        9 => 9,
-        10 => 10,
-        11 => 11,
-        12 => 12,
-        13 => 13,
-        14 => 14,
-        15 => 15,
-        16 => 16,
-        19 => 16,
-        201 => 16,
-        17 => 17,
-        76 => 17,
-        18 => 18,
-        104 => 18,
-        106 => 18,
-        107 => 18,
-        128 => 18,
-        166 => 18,
-        20 => 20,
-        21 => 20,
-        47 => 20,
-        69 => 20,
-        70 => 20,
-        77 => 20,
-        78 => 20,
-        83 => 20,
-        103 => 20,
-        108 => 20,
-        109 => 20,
-        114 => 20,
-        116 => 20,
-        117 => 20,
-        124 => 20,
-        139 => 20,
-        165 => 20,
-        167 => 20,
-        183 => 20,
-        188 => 20,
-        200 => 20,
-        22 => 22,
-        23 => 22,
-        24 => 24,
-        25 => 25,
-        26 => 26,
-        27 => 27,
-        28 => 28,
-        29 => 29,
-        31 => 29,
-        30 => 30,
-        32 => 32,
-        33 => 32,
-        34 => 34,
-        35 => 35,
-        36 => 36,
-        37 => 37,
-        38 => 38,
-        39 => 39,
-        40 => 40,
-        41 => 41,
-        42 => 42,
-        44 => 42,
-        43 => 43,
-        45 => 45,
-        46 => 46,
-        48 => 48,
-        49 => 49,
-        50 => 50,
-        51 => 51,
-        52 => 52,
-        53 => 53,
-        54 => 54,
-        55 => 55,
-        56 => 56,
-        57 => 57,
-        58 => 58,
-        59 => 59,
-        60 => 60,
-        61 => 61,
-        62 => 62,
-        63 => 63,
-        72 => 63,
-        155 => 63,
-        159 => 63,
-        163 => 63,
-        164 => 63,
-        64 => 64,
-        156 => 64,
-        162 => 64,
-        65 => 65,
-        66 => 66,
-        67 => 66,
-        71 => 66,
-        68 => 68,
-        73 => 73,
-        74 => 74,
-        75 => 74,
-        79 => 79,
-        80 => 80,
-        81 => 80,
-        82 => 80,
-        84 => 84,
-        121 => 84,
-        85 => 85,
-        88 => 85,
-        99 => 85,
-        86 => 86,
-        87 => 87,
-        89 => 89,
-        90 => 90,
-        91 => 91,
-        96 => 91,
-        92 => 92,
-        95 => 92,
-        93 => 93,
-        98 => 93,
-        94 => 94,
-        97 => 94,
-        100 => 100,
-        101 => 101,
-        102 => 102,
-        105 => 105,
-        110 => 110,
-        111 => 111,
-        112 => 112,
-        113 => 113,
-        115 => 115,
-        118 => 118,
-        119 => 119,
-        120 => 120,
-        122 => 122,
-        123 => 123,
-        125 => 125,
-        126 => 126,
-        127 => 127,
-        129 => 129,
-        185 => 129,
-        130 => 130,
-        131 => 131,
-        132 => 132,
-        133 => 133,
-        134 => 134,
-        137 => 134,
-        135 => 135,
-        136 => 136,
-        138 => 138,
-        140 => 140,
-        141 => 141,
-        142 => 142,
-        143 => 143,
-        144 => 144,
-        145 => 145,
-        146 => 146,
-        147 => 147,
-        148 => 148,
-        149 => 149,
-        150 => 150,
-        151 => 151,
-        152 => 152,
-        153 => 153,
-        154 => 154,
-        157 => 157,
-        158 => 158,
-        160 => 160,
-        161 => 161,
-        168 => 168,
-        169 => 169,
-        170 => 170,
-        171 => 171,
-        172 => 172,
-        173 => 173,
-        174 => 174,
-        175 => 175,
-        176 => 176,
-        177 => 177,
-        178 => 178,
-        179 => 179,
-        180 => 180,
-        181 => 181,
-        182 => 182,
-        184 => 184,
-        186 => 186,
-        187 => 187,
-        189 => 189,
-        190 => 190,
-        191 => 191,
-        192 => 192,
-        193 => 193,
-        194 => 193,
-        196 => 193,
-        195 => 195,
-        197 => 197,
-        198 => 198,
-        199 => 199,
-    );
-#line 95 "smarty_internal_templateparser.y"
-    function yy_r0(){
-    $this->_retvalue = $this->root_buffer->to_smarty_php();
-    }
-#line 2185 "smarty_internal_templateparser.php"
-#line 103 "smarty_internal_templateparser.y"
-    function yy_r1(){
-    $this->current_buffer->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2190 "smarty_internal_templateparser.php"
-#line 119 "smarty_internal_templateparser.y"
-    function yy_r4(){
-    if ($this->compiler->has_code) {
-        $tmp =''; foreach ($this->compiler->prefix_code as $code) {$tmp.=$code;} $this->compiler->prefix_code=array();
-        $this->_retvalue = new _smarty_tag($this, $this->compiler->processNocacheCode($tmp.$this->yystack[$this->yyidx + 0]->minor,true));
-    } else {
-        $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-    $this->compiler->has_variable_string = false;
-    $this->block_nesting_level = count($this->compiler->_tag_stack);
-    }
-#line 2202 "smarty_internal_templateparser.php"
-#line 131 "smarty_internal_templateparser.y"
-    function yy_r5(){
-    $this->_retvalue = new _smarty_tag($this, '');
-    }
-#line 2207 "smarty_internal_templateparser.php"
-#line 136 "smarty_internal_templateparser.y"
-    function yy_r6(){
-    $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2212 "smarty_internal_templateparser.php"
-#line 141 "smarty_internal_templateparser.y"
-    function yy_r7(){
-    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-        $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-        if (!($this->smarty instanceof SmartyBC)) {
-            $this->compiler->trigger_template_error (self::Err3);
-        }
-        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<?php', true));
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        $this->_retvalue = new _smarty_text($this, '');
-    }
-    }
-#line 2228 "smarty_internal_templateparser.php"
-#line 157 "smarty_internal_templateparser.y"
-    function yy_r8(){
-    if ($this->is_xml) {
-        $this->compiler->tag_nocache = true;
-        $this->is_xml = false;
-        $save = $this->template->has_nocache_code;
-        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '?>';?>", $this->compiler, true));
-        $this->template->has_nocache_code = $save;
-    } elseif ($this->php_handling == Smarty::PHP_PASSTHRU) {
-        $this->_retvalue = new _smarty_text($this, '?<?php ?>>');
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_text($this, htmlspecialchars('?>', ENT_QUOTES));
-    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-        $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('?>', true));
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        $this->_retvalue = new _smarty_text($this, '');
-    }
-    }
-#line 2247 "smarty_internal_templateparser.php"
-#line 176 "smarty_internal_templateparser.y"
-    function yy_r9(){
-    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-        $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_text($this, htmlspecialchars($this->yystack[$this->yyidx + 0]->minor, ENT_QUOTES));
-    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-        if ($this->asp_tags) {
-            if (!($this->smarty instanceof SmartyBC)) {
-                $this->compiler->trigger_template_error (self::Err3);
-            }
-            $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('<%', true));
-        } else {
-            $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-        }
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        if ($this->asp_tags) {
-            $this->_retvalue = new _smarty_text($this, '');
-        } else {
-            $this->_retvalue = new _smarty_text($this, '<<?php ?>%');
-        }
-    }
-    }
-#line 2271 "smarty_internal_templateparser.php"
-#line 200 "smarty_internal_templateparser.y"
-    function yy_r10(){
-    if ($this->php_handling == Smarty::PHP_PASSTHRU) {
-        $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-    } elseif ($this->php_handling == Smarty::PHP_QUOTE) {
-        $this->_retvalue = new _smarty_text($this, htmlspecialchars('%>', ENT_QUOTES));
-    } elseif ($this->php_handling == Smarty::PHP_ALLOW) {
-        if ($this->asp_tags) {
-            $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode('%>', true));
-        } else {
-            $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-        }
-    } elseif ($this->php_handling == Smarty::PHP_REMOVE) {
-        if ($this->asp_tags) {
-            $this->_retvalue = new _smarty_text($this, '');
-        } else {
-            $this->_retvalue = new _smarty_text($this, '%<?php ?>>');
-        }
-    }
-    }
-#line 2292 "smarty_internal_templateparser.php"
-#line 220 "smarty_internal_templateparser.y"
-    function yy_r11(){
-    if ($this->strip) {
-        $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor)));
-    } else {
-        $this->_retvalue = new _smarty_text($this, self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor));
-    }
-    }
-#line 2301 "smarty_internal_templateparser.php"
-#line 229 "smarty_internal_templateparser.y"
-    function yy_r12(){
-    $this->compiler->tag_nocache = true;
-    $this->is_xml = true;
-    $save = $this->template->has_nocache_code;
-    $this->_retvalue = new _smarty_text($this, $this->compiler->processNocacheCode("<?php echo '<?xml';?>", $this->compiler, true));
-    $this->template->has_nocache_code = $save;
-    }
-#line 2310 "smarty_internal_templateparser.php"
-#line 238 "smarty_internal_templateparser.y"
-    function yy_r13(){
-    if ($this->strip) {
-        $this->_retvalue = new _smarty_text($this, preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $this->yystack[$this->yyidx + 0]->minor));
-    } else {
-        $this->_retvalue = new _smarty_text($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-    }
-#line 2319 "smarty_internal_templateparser.php"
-#line 247 "smarty_internal_templateparser.y"
-    function yy_r14(){
-    $this->strip = true;
-    $this->_retvalue = new _smarty_text($this, '');
-    }
-#line 2325 "smarty_internal_templateparser.php"
-#line 252 "smarty_internal_templateparser.y"
-    function yy_r15(){
-    $this->strip = false;
-    $this->_retvalue = new _smarty_text($this, '');
-    }
-#line 2331 "smarty_internal_templateparser.php"
-#line 258 "smarty_internal_templateparser.y"
-    function yy_r16(){
-    $this->_retvalue = '';
-    }
-#line 2336 "smarty_internal_templateparser.php"
-#line 262 "smarty_internal_templateparser.y"
-    function yy_r17(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    }
-#line 2341 "smarty_internal_templateparser.php"
-#line 266 "smarty_internal_templateparser.y"
-    function yy_r18(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2346 "smarty_internal_templateparser.php"
-#line 274 "smarty_internal_templateparser.y"
-    function yy_r20(){
-    $this->_retvalue = $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2351 "smarty_internal_templateparser.php"
-#line 282 "smarty_internal_templateparser.y"
-    function yy_r22(){
-    $this->_retvalue = self::escape_start_tag($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2356 "smarty_internal_templateparser.php"
-#line 290 "smarty_internal_templateparser.y"
-    function yy_r24(){
-    $this->_retvalue = self::escape_end_tag($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2361 "smarty_internal_templateparser.php"
-#line 294 "smarty_internal_templateparser.y"
-    function yy_r25(){
-    $this->_retvalue = '<<?php ?>%';
-    }
-#line 2366 "smarty_internal_templateparser.php"
-#line 298 "smarty_internal_templateparser.y"
-    function yy_r26(){
-    $this->_retvalue = '%<?php ?>>';
-    }
-#line 2371 "smarty_internal_templateparser.php"
-#line 307 "smarty_internal_templateparser.y"
-    function yy_r27(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2376 "smarty_internal_templateparser.php"
-#line 311 "smarty_internal_templateparser.y"
-    function yy_r28(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor, 'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2381 "smarty_internal_templateparser.php"
-#line 315 "smarty_internal_templateparser.y"
-    function yy_r29(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2386 "smarty_internal_templateparser.php"
-#line 319 "smarty_internal_templateparser.y"
-    function yy_r30(){
-    $this->_retvalue = $this->compiler->compileTag('private_print_expression',$this->yystack[$this->yyidx + -1]->minor,array('value'=>$this->yystack[$this->yyidx + -3]->minor,'modifierlist'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2391 "smarty_internal_templateparser.php"
-#line 332 "smarty_internal_templateparser.y"
-    function yy_r32(){
-    $this->_retvalue = $this->compiler->compileTag('assign',array(array('value'=>$this->yystack[$this->yyidx + -1]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -3]->minor."'")));
-    }
-#line 2396 "smarty_internal_templateparser.php"
-#line 340 "smarty_internal_templateparser.y"
-    function yy_r34(){
-    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>"'".$this->yystack[$this->yyidx + -4]->minor."'")),$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2401 "smarty_internal_templateparser.php"
-#line 344 "smarty_internal_templateparser.y"
-    function yy_r35(){
-    $this->_retvalue = $this->compiler->compileTag('assign',array_merge(array(array('value'=>$this->yystack[$this->yyidx + -2]->minor),array('var'=>$this->yystack[$this->yyidx + -4]->minor['var'])),$this->yystack[$this->yyidx + -1]->minor),array('smarty_internal_index'=>$this->yystack[$this->yyidx + -4]->minor['smarty_internal_index']));
-    }
-#line 2406 "smarty_internal_templateparser.php"
-#line 349 "smarty_internal_templateparser.y"
-    function yy_r36(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor,$this->yystack[$this->yyidx + -1]->minor);
-    }
-#line 2411 "smarty_internal_templateparser.php"
-#line 353 "smarty_internal_templateparser.y"
-    function yy_r37(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor,array());
-    }
-#line 2416 "smarty_internal_templateparser.php"
-#line 358 "smarty_internal_templateparser.y"
-    function yy_r38(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2421 "smarty_internal_templateparser.php"
-#line 363 "smarty_internal_templateparser.y"
-    function yy_r39(){
-    $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor,$this->yystack[$this->yyidx + -1]->minor).'<?php echo ';
-    $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
-    }
-#line 2427 "smarty_internal_templateparser.php"
-#line 369 "smarty_internal_templateparser.y"
-    function yy_r40(){
-    $this->_retvalue = '<?php ob_start();?>'.$this->compiler->compileTag($this->yystack[$this->yyidx + -5]->minor,$this->yystack[$this->yyidx + -1]->minor,array('object_methode'=>$this->yystack[$this->yyidx + -3]->minor)).'<?php echo ';
-    $this->_retvalue .= $this->compiler->compileTag('private_modifier',array(),array('modifierlist'=>$this->yystack[$this->yyidx + -2]->minor,'value'=>'ob_get_clean()')).'?>';
-    }
-#line 2433 "smarty_internal_templateparser.php"
-#line 375 "smarty_internal_templateparser.y"
-    function yy_r41(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length));
-    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2439 "smarty_internal_templateparser.php"
-#line 380 "smarty_internal_templateparser.y"
-    function yy_r42(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -3]->minor,$this->lex->ldel_length));
-    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,$this->yystack[$this->yyidx + -1]->minor,array('if condition'=>$this->yystack[$this->yyidx + -2]->minor));
-    }
-#line 2445 "smarty_internal_templateparser.php"
-#line 385 "smarty_internal_templateparser.y"
-    function yy_r43(){
-    $tag = trim(substr($this->yystack[$this->yyidx + -2]->minor,$this->lex->ldel_length));
-    $this->_retvalue = $this->compiler->compileTag(($tag == 'else if')? 'elseif' : $tag,array(),array('if condition'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2451 "smarty_internal_templateparser.php"
-#line 396 "smarty_internal_templateparser.y"
-    function yy_r45(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -10]->minor),array('ifexp'=>$this->yystack[$this->yyidx + -7]->minor),array('var'=>$this->yystack[$this->yyidx + -3]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),1);
-    }
-#line 2456 "smarty_internal_templateparser.php"
-#line 400 "smarty_internal_templateparser.y"
-    function yy_r46(){
-    $this->_retvalue = '='.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2461 "smarty_internal_templateparser.php"
-#line 408 "smarty_internal_templateparser.y"
-    function yy_r48(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -4]->minor),array('to'=>$this->yystack[$this->yyidx + -2]->minor))),0);
-    }
-#line 2466 "smarty_internal_templateparser.php"
-#line 412 "smarty_internal_templateparser.y"
-    function yy_r49(){
-    $this->_retvalue = $this->compiler->compileTag('for',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('start'=>$this->yystack[$this->yyidx + -6]->minor),array('to'=>$this->yystack[$this->yyidx + -4]->minor),array('step'=>$this->yystack[$this->yyidx + -2]->minor))),0);
-    }
-#line 2471 "smarty_internal_templateparser.php"
-#line 417 "smarty_internal_templateparser.y"
-    function yy_r50(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',$this->yystack[$this->yyidx + -1]->minor);
-    }
-#line 2476 "smarty_internal_templateparser.php"
-#line 422 "smarty_internal_templateparser.y"
-    function yy_r51(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));
-    }
-#line 2481 "smarty_internal_templateparser.php"
-#line 426 "smarty_internal_templateparser.y"
-    function yy_r52(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));
-    }
-#line 2486 "smarty_internal_templateparser.php"
-#line 430 "smarty_internal_templateparser.y"
-    function yy_r53(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -5]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor))));
-    }
-#line 2491 "smarty_internal_templateparser.php"
-#line 434 "smarty_internal_templateparser.y"
-    function yy_r54(){
-    $this->_retvalue = $this->compiler->compileTag('foreach',array_merge($this->yystack[$this->yyidx + -1]->minor,array(array('from'=>$this->yystack[$this->yyidx + -8]->minor),array('item'=>$this->yystack[$this->yyidx + -2]->minor),array('key'=>$this->yystack[$this->yyidx + -5]->minor))));
-    }
-#line 2496 "smarty_internal_templateparser.php"
-#line 439 "smarty_internal_templateparser.y"
-    function yy_r55(){
-    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array(array_merge(array($this->yystack[$this->yyidx + -2]->minor),$this->yystack[$this->yyidx + -1]->minor))));
-    }
-#line 2501 "smarty_internal_templateparser.php"
-#line 443 "smarty_internal_templateparser.y"
-    function yy_r56(){
-    $this->_retvalue = $this->compiler->compileTag('setfilter',array(),array('modifier_list'=>array_merge(array(array_merge(array($this->yystack[$this->yyidx + -3]->minor),$this->yystack[$this->yyidx + -2]->minor)),$this->yystack[$this->yyidx + -1]->minor)));
-    }
-#line 2506 "smarty_internal_templateparser.php"
-#line 448 "smarty_internal_templateparser.y"
-    function yy_r57(){
-    $this->_retvalue = SMARTY_INTERNAL_COMPILE_BLOCK::compileChildBlock($this->compiler);
-    }
-#line 2511 "smarty_internal_templateparser.php"
-#line 454 "smarty_internal_templateparser.y"
-    function yy_r58(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -1]->minor.'close',array());
-    }
-#line 2516 "smarty_internal_templateparser.php"
-#line 458 "smarty_internal_templateparser.y"
-    function yy_r59(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -2]->minor.'close',array(),array('modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2521 "smarty_internal_templateparser.php"
-#line 463 "smarty_internal_templateparser.y"
-    function yy_r60(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -3]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2526 "smarty_internal_templateparser.php"
-#line 467 "smarty_internal_templateparser.y"
-    function yy_r61(){
-    $this->_retvalue = $this->compiler->compileTag($this->yystack[$this->yyidx + -4]->minor.'close',array(),array('object_methode'=>$this->yystack[$this->yyidx + -2]->minor, 'modifier_list'=>$this->yystack[$this->yyidx + -1]->minor));
-    }
-#line 2531 "smarty_internal_templateparser.php"
-#line 475 "smarty_internal_templateparser.y"
-    function yy_r62(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    $this->_retvalue[] = $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2537 "smarty_internal_templateparser.php"
-#line 481 "smarty_internal_templateparser.y"
-    function yy_r63(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2542 "smarty_internal_templateparser.php"
-#line 486 "smarty_internal_templateparser.y"
-    function yy_r64(){
-    $this->_retvalue = array();
-    }
-#line 2547 "smarty_internal_templateparser.php"
-#line 491 "smarty_internal_templateparser.y"
-    function yy_r65(){
-    if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'true');
-    } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'false');
-    } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>'null');
-    } else {
-        $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>"'".$this->yystack[$this->yyidx + 0]->minor."'");
-    }
-    }
-#line 2560 "smarty_internal_templateparser.php"
-#line 503 "smarty_internal_templateparser.y"
-    function yy_r66(){
-    $this->_retvalue = array($this->yystack[$this->yyidx + -2]->minor=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2565 "smarty_internal_templateparser.php"
-#line 511 "smarty_internal_templateparser.y"
-    function yy_r68(){
-    $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";
-    }
-#line 2570 "smarty_internal_templateparser.php"
-#line 536 "smarty_internal_templateparser.y"
-    function yy_r73(){
-    $this->yystack[$this->yyidx + -2]->minor[]=$this->yystack[$this->yyidx + 0]->minor;
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor;
-    }
-#line 2576 "smarty_internal_templateparser.php"
-#line 541 "smarty_internal_templateparser.y"
-    function yy_r74(){
-    $this->_retvalue = array('var' => $this->yystack[$this->yyidx + -2]->minor, 'value'=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2581 "smarty_internal_templateparser.php"
-#line 569 "smarty_internal_templateparser.y"
-    function yy_r79(){
-    $this->_retvalue = '$_smarty_tpl->getStreamVariable(\''. $this->yystack[$this->yyidx + -2]->minor .'://'. $this->yystack[$this->yyidx + 0]->minor . '\')';
-    }
-#line 2586 "smarty_internal_templateparser.php"
-#line 574 "smarty_internal_templateparser.y"
-    function yy_r80(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor . trim($this->yystack[$this->yyidx + -1]->minor) . $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2591 "smarty_internal_templateparser.php"
-#line 593 "smarty_internal_templateparser.y"
-    function yy_r84(){
-    $this->_retvalue = $this->compiler->compileTag('private_modifier',array(),array('value'=>$this->yystack[$this->yyidx + -1]->minor,'modifierlist'=>$this->yystack[$this->yyidx + 0]->minor));
-    }
-#line 2596 "smarty_internal_templateparser.php"
-#line 599 "smarty_internal_templateparser.y"
-    function yy_r85(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2601 "smarty_internal_templateparser.php"
-#line 603 "smarty_internal_templateparser.y"
-    function yy_r86(){
-    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2606 "smarty_internal_templateparser.php"
-#line 607 "smarty_internal_templateparser.y"
-    function yy_r87(){
-    $this->_retvalue = 'in_array('.$this->yystack[$this->yyidx + -2]->minor.',(array)'.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2611 "smarty_internal_templateparser.php"
-#line 615 "smarty_internal_templateparser.y"
-    function yy_r89(){
-    $this->_retvalue = '!('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2616 "smarty_internal_templateparser.php"
-#line 619 "smarty_internal_templateparser.y"
-    function yy_r90(){
-    $this->_retvalue = '('.$this->yystack[$this->yyidx + -2]->minor.' % '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2621 "smarty_internal_templateparser.php"
-#line 623 "smarty_internal_templateparser.y"
-    function yy_r91(){
-    $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-#line 2626 "smarty_internal_templateparser.php"
-#line 627 "smarty_internal_templateparser.y"
-    function yy_r92(){
-    $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-#line 2631 "smarty_internal_templateparser.php"
-#line 631 "smarty_internal_templateparser.y"
-    function yy_r93(){
-    $this->_retvalue = '!(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2636 "smarty_internal_templateparser.php"
-#line 635 "smarty_internal_templateparser.y"
-    function yy_r94(){
-    $this->_retvalue = '(1 & '.$this->yystack[$this->yyidx + -2]->minor.' / '.$this->yystack[$this->yyidx + 0]->minor.')';
-    }
-#line 2641 "smarty_internal_templateparser.php"
-#line 659 "smarty_internal_templateparser.y"
-    function yy_r100(){
-    $this->prefix_number++;
-    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->yystack[$this->yyidx + 0]->minor.';?>';
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.'$_tmp'.$this->prefix_number;
-    }
-#line 2648 "smarty_internal_templateparser.php"
-#line 668 "smarty_internal_templateparser.y"
-    function yy_r101(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -6]->minor.' ? '. $this->compileVariable("'".$this->yystack[$this->yyidx + -2]->minor."'") . ' : '.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2653 "smarty_internal_templateparser.php"
-#line 672 "smarty_internal_templateparser.y"
-    function yy_r102(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -5]->minor.' ? '.$this->yystack[$this->yyidx + -2]->minor.' : '.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2658 "smarty_internal_templateparser.php"
-#line 687 "smarty_internal_templateparser.y"
-    function yy_r105(){
-    $this->_retvalue = '!'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2663 "smarty_internal_templateparser.php"
-#line 708 "smarty_internal_templateparser.y"
-    function yy_r110(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2668 "smarty_internal_templateparser.php"
-#line 712 "smarty_internal_templateparser.y"
-    function yy_r111(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.';
-    }
-#line 2673 "smarty_internal_templateparser.php"
-#line 716 "smarty_internal_templateparser.y"
-    function yy_r112(){
-    $this->_retvalue = '.'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2678 "smarty_internal_templateparser.php"
-#line 721 "smarty_internal_templateparser.y"
-    function yy_r113(){
-    if (preg_match('~^true$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = 'true';
-    } elseif (preg_match('~^false$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = 'false';
-    } elseif (preg_match('~^null$~i', $this->yystack[$this->yyidx + 0]->minor)) {
-        $this->_retvalue = 'null';
-    } else {
-        $this->_retvalue = "'".$this->yystack[$this->yyidx + 0]->minor."'";
-    }
-    }
-#line 2691 "smarty_internal_templateparser.php"
-#line 739 "smarty_internal_templateparser.y"
-    function yy_r115(){
-    $this->_retvalue = "(". $this->yystack[$this->yyidx + -1]->minor .")";
-    }
-#line 2696 "smarty_internal_templateparser.php"
-#line 754 "smarty_internal_templateparser.y"
-    function yy_r118(){
-    if (!$this->security || isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor]) || $this->smarty->security_policy->isTrustedStaticClass($this->yystack[$this->yyidx + -2]->minor, $this->compiler)) {
-        if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
-            $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor;
-        } else {
-            $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor;
-        }
-    } else {
-        $this->compiler->trigger_template_error ("static class '".$this->yystack[$this->yyidx + -2]->minor."' is undefined or not allowed by security setting");
-    }
-    }
-#line 2709 "smarty_internal_templateparser.php"
-#line 766 "smarty_internal_templateparser.y"
-    function yy_r119(){
-    if ($this->yystack[$this->yyidx + -2]->minor['var'] == '\'smarty\'') {
-        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index']).'::'.$this->yystack[$this->yyidx + 0]->minor;
-    } else {
-        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -2]->minor['var']).$this->yystack[$this->yyidx + -2]->minor['smarty_internal_index'].'::'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-    }
-#line 2718 "smarty_internal_templateparser.php"
-#line 775 "smarty_internal_templateparser.y"
-    function yy_r120(){
-    $this->prefix_number++;
-    $this->compiler->prefix_code[] = '<?php ob_start();?>'.$this->yystack[$this->yyidx + 0]->minor.'<?php $_tmp'.$this->prefix_number.'=ob_get_clean();?>';
-    $this->_retvalue = '$_tmp'.$this->prefix_number;
-    }
-#line 2725 "smarty_internal_templateparser.php"
-#line 790 "smarty_internal_templateparser.y"
-    function yy_r122(){
-    if ($this->yystack[$this->yyidx + 0]->minor['var'] == '\'smarty\'') {
-        $smarty_var = $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index']);
-        $this->_retvalue = $smarty_var;
-    } else {
-        // used for array reset,next,prev,end,current
-        $this->last_variable = $this->yystack[$this->yyidx + 0]->minor['var'];
-        $this->last_index = $this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + 0]->minor['var']).$this->yystack[$this->yyidx + 0]->minor['smarty_internal_index'];
-    }
-    }
-#line 2738 "smarty_internal_templateparser.php"
-#line 803 "smarty_internal_templateparser.y"
-    function yy_r123(){
-    $this->_retvalue = '$_smarty_tpl->tpl_vars['. $this->yystack[$this->yyidx + -2]->minor .']->'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2743 "smarty_internal_templateparser.php"
-#line 813 "smarty_internal_templateparser.y"
-    function yy_r125(){
-    $this->_retvalue = '$_smarty_tpl->getConfigVariable(\''. $this->yystack[$this->yyidx + -1]->minor .'\')';
-    }
-#line 2748 "smarty_internal_templateparser.php"
-#line 817 "smarty_internal_templateparser.y"
-    function yy_r126(){
-    $this->_retvalue = '$_smarty_tpl->getConfigVariable('. $this->yystack[$this->yyidx + -1]->minor .')';
-    }
-#line 2753 "smarty_internal_templateparser.php"
-#line 821 "smarty_internal_templateparser.y"
-    function yy_r127(){
-    $this->_retvalue = array('var'=>$this->yystack[$this->yyidx + -1]->minor, 'smarty_internal_index'=>$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2758 "smarty_internal_templateparser.php"
-#line 834 "smarty_internal_templateparser.y"
-    function yy_r129(){
-    return;
-    }
-#line 2763 "smarty_internal_templateparser.php"
-#line 840 "smarty_internal_templateparser.y"
-    function yy_r130(){
-    $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + 0]->minor).']';
-    }
-#line 2768 "smarty_internal_templateparser.php"
-#line 844 "smarty_internal_templateparser.y"
-    function yy_r131(){
-    $this->_retvalue = '['.$this->compileVariable($this->yystack[$this->yyidx + -2]->minor).'->'.$this->yystack[$this->yyidx + 0]->minor.']';
-    }
-#line 2773 "smarty_internal_templateparser.php"
-#line 848 "smarty_internal_templateparser.y"
-    function yy_r132(){
-    $this->_retvalue = "['". $this->yystack[$this->yyidx + 0]->minor ."']";
-    }
-#line 2778 "smarty_internal_templateparser.php"
-#line 852 "smarty_internal_templateparser.y"
-    function yy_r133(){
-    $this->_retvalue = "[". $this->yystack[$this->yyidx + 0]->minor ."]";
-    }
-#line 2783 "smarty_internal_templateparser.php"
-#line 856 "smarty_internal_templateparser.y"
-    function yy_r134(){
-    $this->_retvalue = "[". $this->yystack[$this->yyidx + -1]->minor ."]";
-    }
-#line 2788 "smarty_internal_templateparser.php"
-#line 861 "smarty_internal_templateparser.y"
-    function yy_r135(){
-    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\'][\'index\']').']';
-    }
-#line 2793 "smarty_internal_templateparser.php"
-#line 865 "smarty_internal_templateparser.y"
-    function yy_r136(){
-    $this->_retvalue = '['.$this->compiler->compileTag('private_special_variable',array(),'[\'section\'][\''.$this->yystack[$this->yyidx + -3]->minor.'\'][\''.$this->yystack[$this->yyidx + -1]->minor.'\']').']';
-    }
-#line 2798 "smarty_internal_templateparser.php"
-#line 875 "smarty_internal_templateparser.y"
-    function yy_r138(){
-    $this->_retvalue = '[]';
-    }
-#line 2803 "smarty_internal_templateparser.php"
-#line 888 "smarty_internal_templateparser.y"
-    function yy_r140(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor.'.'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2808 "smarty_internal_templateparser.php"
-#line 893 "smarty_internal_templateparser.y"
-    function yy_r141(){
-    $this->_retvalue = '\''.$this->yystack[$this->yyidx + 0]->minor.'\'';
-    }
-#line 2813 "smarty_internal_templateparser.php"
-#line 898 "smarty_internal_templateparser.y"
-    function yy_r142(){
-    $this->_retvalue = '('.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-#line 2818 "smarty_internal_templateparser.php"
-#line 905 "smarty_internal_templateparser.y"
-    function yy_r143(){
-    if ($this->yystack[$this->yyidx + -1]->minor['var'] == '\'smarty\'') {
-        $this->_retvalue =  $this->compiler->compileTag('private_special_variable',array(),$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index']).$this->yystack[$this->yyidx + 0]->minor;
-    } else {
-        $this->_retvalue = $this->compileVariable($this->yystack[$this->yyidx + -1]->minor['var']).$this->yystack[$this->yyidx + -1]->minor['smarty_internal_index'].$this->yystack[$this->yyidx + 0]->minor;
-    }
-    }
-#line 2827 "smarty_internal_templateparser.php"
-#line 914 "smarty_internal_templateparser.y"
-    function yy_r144(){
-    $this->_retvalue  = $this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2832 "smarty_internal_templateparser.php"
-#line 919 "smarty_internal_templateparser.y"
-    function yy_r145(){
-    $this->_retvalue  = $this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2837 "smarty_internal_templateparser.php"
-#line 924 "smarty_internal_templateparser.y"
-    function yy_r146(){
-    if ($this->security && substr($this->yystack[$this->yyidx + -1]->minor,0,1) == '_') {
-        $this->compiler->trigger_template_error (self::Err1);
-    }
-    $this->_retvalue = '->'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2845 "smarty_internal_templateparser.php"
-#line 931 "smarty_internal_templateparser.y"
-    function yy_r147(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
-    }
-    $this->_retvalue = '->{'.$this->compileVariable($this->yystack[$this->yyidx + -1]->minor).$this->yystack[$this->yyidx + 0]->minor.'}';
-    }
-#line 2853 "smarty_internal_templateparser.php"
-#line 938 "smarty_internal_templateparser.y"
-    function yy_r148(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
-    }
-    $this->_retvalue = '->{'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
-    }
-#line 2861 "smarty_internal_templateparser.php"
-#line 945 "smarty_internal_templateparser.y"
-    function yy_r149(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
-    }
-    $this->_retvalue = '->{\''.$this->yystack[$this->yyidx + -4]->minor.'\'.'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + 0]->minor.'}';
-    }
-#line 2869 "smarty_internal_templateparser.php"
-#line 953 "smarty_internal_templateparser.y"
-    function yy_r150(){
-    $this->_retvalue = '->'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2874 "smarty_internal_templateparser.php"
-#line 961 "smarty_internal_templateparser.y"
-    function yy_r151(){
-    if (!$this->security || $this->smarty->security_policy->isTrustedPhpFunction($this->yystack[$this->yyidx + -3]->minor, $this->compiler)) {
-        if (strcasecmp($this->yystack[$this->yyidx + -3]->minor,'isset') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'empty') === 0 || strcasecmp($this->yystack[$this->yyidx + -3]->minor,'array') === 0 || is_callable($this->yystack[$this->yyidx + -3]->minor)) {
-            $func_name = strtolower($this->yystack[$this->yyidx + -3]->minor);
-            if ($func_name == 'isset') {
-                if (count($this->yystack[$this->yyidx + -1]->minor) == 0) {
-                    $this->compiler->trigger_template_error ('Illegal number of paramer in "isset()"');
-                }
-                $par = implode(',',$this->yystack[$this->yyidx + -1]->minor);
-                if (strncasecmp($par,'$_smarty_tpl->getConfigVariable',strlen('$_smarty_tpl->getConfigVariable')) === 0) {
-                    $this->prefix_number++;
-                    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.str_replace(')',', false)',$par).';?>';
-                    $isset_par = '$_tmp'.$this->prefix_number;
-                } else {
-                    $isset_par=str_replace("')->value","',null,true,false)->value",$par);
-                }
-                $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". $isset_par .")";
-            } elseif (in_array($func_name,array('empty','reset','current','end','prev','next'))){
-                if (count($this->yystack[$this->yyidx + -1]->minor) != 1) {
-                    $this->compiler->trigger_template_error ('Illegal number of paramer in "empty()"');
-                }
-                if ($func_name == 'empty') {
-                    $this->_retvalue = $func_name.'('.str_replace("')->value","',null,true,false)->value",$this->yystack[$this->yyidx + -1]->minor[0]).')';
-                } else {
-                    $this->_retvalue = $func_name.'('.$this->yystack[$this->yyidx + -1]->minor[0].')';
-                }
-            } else {
-                $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
-            }
-        } else {
-            $this->compiler->trigger_template_error ("unknown function \"" . $this->yystack[$this->yyidx + -3]->minor . "\"");
-        }
-    }
-    }
-#line 2910 "smarty_internal_templateparser.php"
-#line 999 "smarty_internal_templateparser.y"
-    function yy_r152(){
-    if ($this->security && substr($this->yystack[$this->yyidx + -3]->minor,0,1) == '_') {
-        $this->compiler->trigger_template_error (self::Err1);
-    }
-    $this->_retvalue = $this->yystack[$this->yyidx + -3]->minor . "(". implode(',',$this->yystack[$this->yyidx + -1]->minor) .")";
-    }
-#line 2918 "smarty_internal_templateparser.php"
-#line 1006 "smarty_internal_templateparser.y"
-    function yy_r153(){
-    if ($this->security) {
-        $this->compiler->trigger_template_error (self::Err2);
-    }
-    $this->prefix_number++;
-    $this->compiler->prefix_code[] = '<?php $_tmp'.$this->prefix_number.'='.$this->compileVariable("'".$this->yystack[$this->yyidx + -3]->minor."'").';?>';
-    $this->_retvalue = '$_tmp'.$this->prefix_number.'('. implode(',',$this->yystack[$this->yyidx + -1]->minor) .')';
-    }
-#line 2928 "smarty_internal_templateparser.php"
-#line 1017 "smarty_internal_templateparser.y"
-    function yy_r154(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array($this->yystack[$this->yyidx + 0]->minor));
-    }
-#line 2933 "smarty_internal_templateparser.php"
-#line 1034 "smarty_internal_templateparser.y"
-    function yy_r157(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -2]->minor,array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor)));
-    }
-#line 2938 "smarty_internal_templateparser.php"
-#line 1038 "smarty_internal_templateparser.y"
-    function yy_r158(){
-    $this->_retvalue = array(array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor));
-    }
-#line 2943 "smarty_internal_templateparser.php"
-#line 1046 "smarty_internal_templateparser.y"
-    function yy_r160(){
-    $this->_retvalue =  array($this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2948 "smarty_internal_templateparser.php"
-#line 1054 "smarty_internal_templateparser.y"
-    function yy_r161(){
-    $this->_retvalue = array_merge($this->yystack[$this->yyidx + -1]->minor,$this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 2953 "smarty_internal_templateparser.php"
-#line 1088 "smarty_internal_templateparser.y"
-    function yy_r168(){
-    $this->_retvalue = '$'.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2958 "smarty_internal_templateparser.php"
-#line 1093 "smarty_internal_templateparser.y"
-    function yy_r169(){
-    $this->_retvalue = '$'.$this->yystack[$this->yyidx + -2]->minor.$this->yystack[$this->yyidx + -1]->minor.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 2963 "smarty_internal_templateparser.php"
-#line 1099 "smarty_internal_templateparser.y"
-    function yy_r170(){
-    $this->_retvalue = '==';
-    }
-#line 2968 "smarty_internal_templateparser.php"
-#line 1103 "smarty_internal_templateparser.y"
-    function yy_r171(){
-    $this->_retvalue = '!=';
-    }
-#line 2973 "smarty_internal_templateparser.php"
-#line 1107 "smarty_internal_templateparser.y"
-    function yy_r172(){
-    $this->_retvalue = '>';
-    }
-#line 2978 "smarty_internal_templateparser.php"
-#line 1111 "smarty_internal_templateparser.y"
-    function yy_r173(){
-    $this->_retvalue = '<';
-    }
-#line 2983 "smarty_internal_templateparser.php"
-#line 1115 "smarty_internal_templateparser.y"
-    function yy_r174(){
-    $this->_retvalue = '>=';
-    }
-#line 2988 "smarty_internal_templateparser.php"
-#line 1119 "smarty_internal_templateparser.y"
-    function yy_r175(){
-    $this->_retvalue = '<=';
-    }
-#line 2993 "smarty_internal_templateparser.php"
-#line 1123 "smarty_internal_templateparser.y"
-    function yy_r176(){
-    $this->_retvalue = '===';
-    }
-#line 2998 "smarty_internal_templateparser.php"
-#line 1127 "smarty_internal_templateparser.y"
-    function yy_r177(){
-    $this->_retvalue = '!==';
-    }
-#line 3003 "smarty_internal_templateparser.php"
-#line 1131 "smarty_internal_templateparser.y"
-    function yy_r178(){
-    $this->_retvalue = '%';
-    }
-#line 3008 "smarty_internal_templateparser.php"
-#line 1135 "smarty_internal_templateparser.y"
-    function yy_r179(){
-    $this->_retvalue = '&&';
-    }
-#line 3013 "smarty_internal_templateparser.php"
-#line 1139 "smarty_internal_templateparser.y"
-    function yy_r180(){
-    $this->_retvalue = '||';
-    }
-#line 3018 "smarty_internal_templateparser.php"
-#line 1143 "smarty_internal_templateparser.y"
-    function yy_r181(){
-    $this->_retvalue = ' XOR ';
-    }
-#line 3023 "smarty_internal_templateparser.php"
-#line 1150 "smarty_internal_templateparser.y"
-    function yy_r182(){
-    $this->_retvalue = 'array('.$this->yystack[$this->yyidx + -1]->minor.')';
-    }
-#line 3028 "smarty_internal_templateparser.php"
-#line 1158 "smarty_internal_templateparser.y"
-    function yy_r184(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.','.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 3033 "smarty_internal_templateparser.php"
-#line 1166 "smarty_internal_templateparser.y"
-    function yy_r186(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'=>'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 3038 "smarty_internal_templateparser.php"
-#line 1170 "smarty_internal_templateparser.y"
-    function yy_r187(){
-    $this->_retvalue = '\''.$this->yystack[$this->yyidx + -2]->minor.'\'=>'.$this->yystack[$this->yyidx + 0]->minor;
-    }
-#line 3043 "smarty_internal_templateparser.php"
-#line 1182 "smarty_internal_templateparser.y"
-    function yy_r189(){
-    $this->_retvalue = "''";
-    }
-#line 3048 "smarty_internal_templateparser.php"
-#line 1186 "smarty_internal_templateparser.y"
-    function yy_r190(){
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor->to_smarty_php();
-    }
-#line 3053 "smarty_internal_templateparser.php"
-#line 1191 "smarty_internal_templateparser.y"
-    function yy_r191(){
-    $this->yystack[$this->yyidx + -1]->minor->append_subtree($this->yystack[$this->yyidx + 0]->minor);
-    $this->_retvalue = $this->yystack[$this->yyidx + -1]->minor;
-    }
-#line 3059 "smarty_internal_templateparser.php"
-#line 1196 "smarty_internal_templateparser.y"
-    function yy_r192(){
-    $this->_retvalue = new _smarty_doublequoted($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 3064 "smarty_internal_templateparser.php"
-#line 1200 "smarty_internal_templateparser.y"
-    function yy_r193(){
-    $this->_retvalue = new _smarty_code($this, $this->yystack[$this->yyidx + -1]->minor);
-    }
-#line 3069 "smarty_internal_templateparser.php"
-#line 1208 "smarty_internal_templateparser.y"
-    function yy_r195(){
-    $this->_retvalue = new _smarty_code($this, '$_smarty_tpl->tpl_vars[\''. substr($this->yystack[$this->yyidx + 0]->minor,1) .'\']->value');
-    }
-#line 3074 "smarty_internal_templateparser.php"
-#line 1216 "smarty_internal_templateparser.y"
-    function yy_r197(){
-    $this->_retvalue = new _smarty_code($this, '('.$this->yystack[$this->yyidx + -1]->minor.')');
-    }
-#line 3079 "smarty_internal_templateparser.php"
-#line 1220 "smarty_internal_templateparser.y"
-    function yy_r198(){
-    $this->_retvalue = new _smarty_tag($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 3084 "smarty_internal_templateparser.php"
-#line 1224 "smarty_internal_templateparser.y"
-    function yy_r199(){
-    $this->_retvalue = new _smarty_dq_content($this, $this->yystack[$this->yyidx + 0]->minor);
-    }
-#line 3089 "smarty_internal_templateparser.php"
-
-    private $_retvalue;
-
-    function yy_reduce($yyruleno)
-    {
-        $yymsp = $this->yystack[$this->yyidx];
-        if (self::$yyTraceFILE && $yyruleno >= 0
-              && $yyruleno < count(self::$yyRuleName)) {
-            fprintf(self::$yyTraceFILE, "%sReduce (%d) [%s].\n",
-                self::$yyTracePrompt, $yyruleno,
-                self::$yyRuleName[$yyruleno]);
-        }
-
-        $this->_retvalue = $yy_lefthand_side = null;
-        if (array_key_exists($yyruleno, self::$yyReduceMap)) {
-            // call the action
-            $this->_retvalue = null;
-            $this->{'yy_r' . self::$yyReduceMap[$yyruleno]}();
-            $yy_lefthand_side = $this->_retvalue;
-        }
-        $yygoto = self::$yyRuleInfo[$yyruleno]['lhs'];
-        $yysize = self::$yyRuleInfo[$yyruleno]['rhs'];
-        $this->yyidx -= $yysize;
-        for($i = $yysize; $i; $i--) {
-            // pop all of the right-hand side parameters
-            array_pop($this->yystack);
-        }
-        $yyact = $this->yy_find_reduce_action($this->yystack[$this->yyidx]->stateno, $yygoto);
-        if ($yyact < self::YYNSTATE) {
-            if (!self::$yyTraceFILE && $yysize) {
-                $this->yyidx++;
-                $x = new TP_yyStackEntry;
-                $x->stateno = $yyact;
-                $x->major = $yygoto;
-                $x->minor = $yy_lefthand_side;
-                $this->yystack[$this->yyidx] = $x;
-            } else {
-                $this->yy_shift($yyact, $yygoto, $yy_lefthand_side);
-            }
-        } elseif ($yyact == self::YYNSTATE + self::YYNRULE + 1) {
-            $this->yy_accept();
-        }
-    }
-
-    function yy_parse_failed()
-    {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sFail!\n", self::$yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $this->yy_pop_parser_stack();
-        }
-    }
-
-    function yy_syntax_error($yymajor, $TOKEN)
-    {
-#line 77 "smarty_internal_templateparser.y"
-
-    $this->internalError = true;
-    $this->yymajor = $yymajor;
-    $this->compiler->trigger_template_error();
-#line 3152 "smarty_internal_templateparser.php"
-    }
-
-    function yy_accept()
-    {
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sAccept!\n", self::$yyTracePrompt);
-        }
-        while ($this->yyidx >= 0) {
-            $stack = $this->yy_pop_parser_stack();
-        }
-#line 69 "smarty_internal_templateparser.y"
-
-    $this->successful = !$this->internalError;
-    $this->internalError = false;
-    $this->retvalue = $this->_retvalue;
-    //echo $this->retvalue."\n\n";
-#line 3170 "smarty_internal_templateparser.php"
-    }
-
-    function doParse($yymajor, $yytokenvalue)
-    {
-        $yyerrorhit = 0;   /* True if yymajor has invoked an error */
-
-        if ($this->yyidx === null || $this->yyidx < 0) {
-            $this->yyidx = 0;
-            $this->yyerrcnt = -1;
-            $x = new TP_yyStackEntry;
-            $x->stateno = 0;
-            $x->major = 0;
-            $this->yystack = array();
-            array_push($this->yystack, $x);
-        }
-        $yyendofinput = ($yymajor==0);
-
-        if (self::$yyTraceFILE) {
-            fprintf(self::$yyTraceFILE, "%sInput %s\n",
-                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
-        }
-
-        do {
-            $yyact = $this->yy_find_shift_action($yymajor);
-            if ($yymajor < self::YYERRORSYMBOL &&
-                  !$this->yy_is_expected_token($yymajor)) {
-                // force a syntax error
-                $yyact = self::YY_ERROR_ACTION;
-            }
-            if ($yyact < self::YYNSTATE) {
-                $this->yy_shift($yyact, $yymajor, $yytokenvalue);
-                $this->yyerrcnt--;
-                if ($yyendofinput && $this->yyidx >= 0) {
-                    $yymajor = 0;
-                } else {
-                    $yymajor = self::YYNOCODE;
-                }
-            } elseif ($yyact < self::YYNSTATE + self::YYNRULE) {
-                $this->yy_reduce($yyact - self::YYNSTATE);
-            } elseif ($yyact == self::YY_ERROR_ACTION) {
-                if (self::$yyTraceFILE) {
-                    fprintf(self::$yyTraceFILE, "%sSyntax Error!\n",
-                        self::$yyTracePrompt);
-                }
-                if (self::YYERRORSYMBOL) {
-                    if ($this->yyerrcnt < 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $yymx = $this->yystack[$this->yyidx]->major;
-                    if ($yymx == self::YYERRORSYMBOL || $yyerrorhit ){
-                        if (self::$yyTraceFILE) {
-                            fprintf(self::$yyTraceFILE, "%sDiscard input token %s\n",
-                                self::$yyTracePrompt, $this->yyTokenName[$yymajor]);
-                        }
-                        $this->yy_destructor($yymajor, $yytokenvalue);
-                        $yymajor = self::YYNOCODE;
-                    } else {
-                        while ($this->yyidx >= 0 &&
-                                 $yymx != self::YYERRORSYMBOL &&
-        ($yyact = $this->yy_find_shift_action(self::YYERRORSYMBOL)) >= self::YYNSTATE
-                              ){
-                            $this->yy_pop_parser_stack();
-                        }
-                        if ($this->yyidx < 0 || $yymajor==0) {
-                            $this->yy_destructor($yymajor, $yytokenvalue);
-                            $this->yy_parse_failed();
-                            $yymajor = self::YYNOCODE;
-                        } elseif ($yymx != self::YYERRORSYMBOL) {
-                            $u2 = 0;
-                            $this->yy_shift($yyact, self::YYERRORSYMBOL, $u2);
-                        }
-                    }
-                    $this->yyerrcnt = 3;
-                    $yyerrorhit = 1;
-                } else {
-                    if ($this->yyerrcnt <= 0) {
-                        $this->yy_syntax_error($yymajor, $yytokenvalue);
-                    }
-                    $this->yyerrcnt = 3;
-                    $this->yy_destructor($yymajor, $yytokenvalue);
-                    if ($yyendofinput) {
-                        $this->yy_parse_failed();
-                    }
-                    $yymajor = self::YYNOCODE;
-                }
-            } else {
-                $this->yy_accept();
-                $yymajor = self::YYNOCODE;
-            }
-        } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
-    }
-}
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_utility.php b/resources/libs/smarty/sysplugins/smarty_internal_utility.php
deleted file mode 100644
index c8c2b6dce..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_utility.php
+++ /dev/null
@@ -1,828 +0,0 @@
-<?php
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        smarty_internal_utility.php
- * SVN:         $Id: $
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com
- *
- * @link http://www.smarty.net/
- * @copyright 2008 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Uwe Tews
- * @package Smarty
- * @subpackage PluginsInternal
- * @version 3-SVN$Rev: 3286 $
- */
-
-
-/**
- * Utility class
- *
- * @package Smarty
- * @subpackage Security
- */
-class Smarty_Internal_Utility {
-
-    /**
-     * private constructor to prevent calls creation of new instances
-     */
-    private final function __construct()
-    {
-        // intentionally left blank
-    }
-
-    /**
-     * Compile all template files
-     *
-     * @param string $extension     template file name extension
-     * @param bool   $force_compile force all to recompile
-     * @param int    $time_limit    set maximum execution time
-     * @param int    $max_errors    set maximum allowed errors
-     * @param Smarty $smarty        Smarty instance
-     * @return integer number of template files compiled
-     */
-    public static function compileAllTemplates($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-    {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0;
-        // loop over array of template directories
-        foreach($smarty->getTemplateDir() as $_dir) {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                if (substr($_fileinfo->getBasename(),0,1) == '.' || strpos($_fileinfo, '.svn') !== false) continue;
-                $_file = $_fileinfo->getFilename();
-                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
-                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
-                   $_template_file = $_file;
-                } else {
-                   $_template_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo '<br>', $_dir, '---', $_template_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_tpl = $smarty->createTemplate($_template_file,null,null,null,false);
-                    if ($_tpl->mustCompile()) {
-                        $_tpl->compileTemplateSource();
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count++;
-                }
-                // free memory
-                $smarty->template_objects = array();
-                $_tpl->smarty->template_objects = array();
-                $_tpl = null;
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                }
-            }
-        }
-        return $_count;
-    }
-
-    /**
-     * Compile all config files
-     *
-     * @param string $extension     config file name extension
-     * @param bool   $force_compile force all to recompile
-     * @param int    $time_limit    set maximum execution time
-     * @param int    $max_errors    set maximum allowed errors
-     * @param Smarty $smarty        Smarty instance
-     * @return integer number of config files compiled
-     */
-    public static function compileAllConfig($extention, $force_compile, $time_limit, $max_errors, Smarty $smarty)
-    {
-        // switch off time limit
-        if (function_exists('set_time_limit')) {
-            @set_time_limit($time_limit);
-        }
-        $smarty->force_compile = $force_compile;
-        $_count = 0;
-        $_error_count = 0;
-        // loop over array of template directories
-        foreach($smarty->getConfigDir() as $_dir) {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-            $_compile = new RecursiveIteratorIterator($_compileDirs);
-            foreach ($_compile as $_fileinfo) {
-                if (substr($_fileinfo->getBasename(),0,1) == '.' || strpos($_fileinfo, '.svn') !== false) continue;
-                $_file = $_fileinfo->getFilename();
-                if (!substr_compare($_file, $extention, - strlen($extention)) == 0) continue;
-                if ($_fileinfo->getPath() == substr($_dir, 0, -1)) {
-                    $_config_file = $_file;
-                } else {
-                    $_config_file = substr($_fileinfo->getPath(), strlen($_dir)) . DS . $_file;
-                }
-                echo '<br>', $_dir, '---', $_config_file;
-                flush();
-                $_start_time = microtime(true);
-                try {
-                    $_config = new Smarty_Internal_Config($_config_file, $smarty);
-                    if ($_config->mustCompile()) {
-                        $_config->compileConfigSource();
-                        echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
-                        flush();
-                    } else {
-                        echo ' is up to date';
-                        flush();
-                    }
-                }
-                catch (Exception $e) {
-                    echo 'Error: ', $e->getMessage(), "<br><br>";
-                    $_error_count++;
-                }
-                if ($max_errors !== null && $_error_count == $max_errors) {
-                    echo '<br><br>too many errors';
-                    exit();
-                }
-            }
-        }
-        return $_count;
-    }
-
-    /**
-     * Delete compiled template file
-     *
-     * @param string  $resource_name template name
-     * @param string  $compile_id    compile id
-     * @param integer $exp_time      expiration time
-     * @param Smarty  $smarty        Smarty instance
-     * @return integer number of template files deleted
-     */
-    public static function clearCompiledTemplate($resource_name, $compile_id, $exp_time, Smarty $smarty)
-    {
-        $_compile_dir = $smarty->getCompileDir();
-        $_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
-        $_dir_sep = $smarty->use_sub_dirs ? DS : '^';
-        if (isset($resource_name)) {
-            $_save_stat = $smarty->caching;
-            $smarty->caching = false;
-            $tpl = new $smarty->template_class($resource_name, $smarty);
-            $smarty->caching = $_save_stat;
-
-            // remove from template cache
-            $tpl->source; // have the template registered before unset()
-            if ($smarty->allow_ambiguous_resources) {
-                $_templateId = $tpl->source->unique_resource . $tpl->cache_id . $tpl->compile_id;
-            } else {
-                $_templateId = $smarty->joined_template_dir . '#' . $resource_name . $tpl->cache_id . $tpl->compile_id;
-            }
-            if (isset($_templateId[150])) {
-                $_templateId = sha1($_templateId);
-            }
-            unset($smarty->template_objects[$_templateId]);
-
-            if ($tpl->source->exists) {
-                 $_resource_part_1 = basename(str_replace('^', '/', $tpl->compiled->filepath));
-                 $_resource_part_1_length = strlen($_resource_part_1);
-            } else {
-                return 0;
-            }
-
-            $_resource_part_2 = str_replace('.php','.cache.php',$_resource_part_1);
-            $_resource_part_2_length = strlen($_resource_part_2);
-        }
-        $_dir = $_compile_dir;
-        if ($smarty->use_sub_dirs && isset($_compile_id)) {
-            $_dir .= $_compile_id . $_dir_sep;
-        }
-        if (isset($_compile_id)) {
-            $_compile_id_part = $_compile_dir . $_compile_id . $_dir_sep;
-            $_compile_id_part_length = strlen($_compile_id_part);
-        }
-        $_count = 0;
-        try {
-            $_compileDirs = new RecursiveDirectoryIterator($_dir);
-        // NOTE: UnexpectedValueException thrown for PHP >= 5.3
-        } catch (Exception $e) {
-            return 0;
-        }
-        $_compile = new RecursiveIteratorIterator($_compileDirs, RecursiveIteratorIterator::CHILD_FIRST);
-        foreach ($_compile as $_file) {
-            if (substr($_file->getBasename(), 0, 1) == '.' || strpos($_file, '.svn') !== false)
-                continue;
-
-            $_filepath = (string) $_file;
-
-            if ($_file->isDir()) {
-                if (!$_compile->isDot()) {
-                    // delete folder if empty
-                    @rmdir($_file->getPathname());
-                }
-            } else {
-                $unlink = false;
-                if ((!isset($_compile_id) || (isset($_filepath[$_compile_id_part_length]) && !strncmp($_filepath, $_compile_id_part, $_compile_id_part_length)))
-                    && (!isset($resource_name)
-                        || (isset($_filepath[$_resource_part_1_length])
-                            && substr_compare($_filepath, $_resource_part_1, -$_resource_part_1_length, $_resource_part_1_length) == 0)
-                        || (isset($_filepath[$_resource_part_2_length])
-                            && substr_compare($_filepath, $_resource_part_2, -$_resource_part_2_length, $_resource_part_2_length) == 0))) {
-                    if (isset($exp_time)) {
-                        if (time() - @filemtime($_filepath) >= $exp_time) {
-                            $unlink = true;
-                        }
-                    } else {
-                        $unlink = true;
-                    }
-                }
-
-                if ($unlink && @unlink($_filepath)) {
-                    $_count++;
-                }
-            }
-        }
-        // clear compiled cache
-        Smarty_Resource::$sources = array();
-        Smarty_Resource::$compileds = array();
-        return $_count;
-    }
-
-    /**
-     * Return array of tag/attributes of all tags used by an template
-     *
-     * @param Smarty_Internal_Template $templae template object
-     * @return array of tag/attributes
-     */
-    public static function getTags(Smarty_Internal_Template $template)
-    {
-        $template->smarty->get_used_tags = true;
-        $template->compileTemplateSource();
-        return $template->used_tags;
-    }
-
-
-    /**
-     * diagnose Smarty setup
-     *
-     * If $errors is secified, the diagnostic report will be appended to the array, rather than being output.
-     *
-     * @param Smarty $smarty  Smarty instance to test
-     * @param array  $errors array to push results into rather than outputting them
-     * @return bool status, true if everything is fine, false else
-     */
-    public static function testInstall(Smarty $smarty, &$errors=null)
-    {
-        $status = true;
-
-        if ($errors === null) {
-            echo "<PRE>\n";
-            echo "Smarty Installation test...\n";
-            echo "Testing template directory...\n";
-        }
-        
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // test if all registered template_dir are accessible
-        foreach($smarty->getTemplateDir() as $template_dir) {
-            $_template_dir = $template_dir;
-            $template_dir = realpath($template_dir);
-            // resolve include_path or fail existance
-            if (!$template_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_template_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $template_dir = stream_resolve_include_path($_template_dir);
-                    } else {
-                        $template_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_template_dir);
-                    }
-                    
-                    if ($template_dir !== false) {
-                        if ($errors === null) {
-                            echo "$template_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_template_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['template_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_template_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['template_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } elseif (!is_readable($template_dir)) {
-                $status = false;
-                $message = "FAILED: $template_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['template_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$template_dir is OK.\n";
-                }
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing compile directory...\n";
-        }
-
-        // test if registered compile_dir is accessible
-        $__compile_dir = $smarty->getCompileDir();
-        $_compile_dir = realpath($__compile_dir);
-        if (!$_compile_dir) {
-            $status = false;
-            $message = "FAILED: {$__compile_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_dir($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_readable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } elseif (!is_writable($_compile_dir)) {
-            $status = false;
-            $message = "FAILED: {$_compile_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['compile_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_compile_dir} is OK.\n";
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing plugins directory...\n";
-        }
-
-        // test if all registered plugins_dir are accessible
-        // and if core plugins directory is still registered
-        $_core_plugins_dir = realpath(dirname(__FILE__) .'/../plugins');
-        $_core_plugins_available = false;
-        foreach($smarty->getPluginsDir() as $plugin_dir) {
-            $_plugin_dir = $plugin_dir;
-            $plugin_dir = realpath($plugin_dir);
-            // resolve include_path or fail existance
-            if (!$plugin_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_plugin_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $plugin_dir = stream_resolve_include_path($_plugin_dir);
-                    } else {
-                        $plugin_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_plugin_dir);
-                    }
-                    
-                    if ($plugin_dir !== false) {
-                        if ($errors === null) {
-                            echo "$plugin_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_plugin_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['plugins_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_plugin_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['plugins_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif (!is_readable($plugin_dir)) {
-                $status = false;
-                $message = "FAILED: $plugin_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins_dir'] = $message;
-                }
-            } elseif ($_core_plugins_dir && $_core_plugins_dir == realpath($plugin_dir)) {
-                $_core_plugins_available = true;
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$plugin_dir is OK.\n";
-                }
-            }
-        }
-        if (!$_core_plugins_available) {
-            $status = false;
-            $message = "WARNING: Smarty's own libs/plugins is not available";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } elseif (!isset($errors['plugins_dir'])) {
-                $errors['plugins_dir'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing cache directory...\n";
-        }
-
-
-        // test if all registered cache_dir is accessible
-        $__cache_dir = $smarty->getCacheDir();
-        $_cache_dir = realpath($__cache_dir);
-        if (!$_cache_dir) {
-            $status = false;
-            $message = "FAILED: {$__cache_dir} does not exist";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_dir($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not a directory";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_readable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not readable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } elseif (!is_writable($_cache_dir)) {
-            $status = false;
-            $message = "FAILED: {$_cache_dir} is not writable";
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['cache_dir'] = $message;
-            }
-        } else {
-            if ($errors === null) {
-                echo "{$_cache_dir} is OK.\n";
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing configs directory...\n";
-        }
-
-        // test if all registered config_dir are accessible
-        foreach($smarty->getConfigDir() as $config_dir) {
-            $_config_dir = $config_dir;
-            $config_dir = realpath($config_dir);
-            // resolve include_path or fail existance
-            if (!$config_dir) {
-                if ($smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_config_dir)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $config_dir = stream_resolve_include_path($_config_dir);
-                    } else {
-                        $config_dir = Smarty_Internal_Get_Include_Path::getIncludePath($_config_dir);
-                    }
-                    
-                    if ($config_dir !== false) {
-                        if ($errors === null) {
-                            echo "$config_dir is OK.\n";
-                        }
-
-                        continue;
-                    } else {
-                        $status = false;
-                        $message = "FAILED: $_config_dir does not exist (and couldn't be found in include_path either)";
-                        if ($errors === null) {
-                            echo $message . ".\n";
-                        } else {
-                            $errors['config_dir'] = $message;
-                        }
-
-                        continue;
-                    }
-                } else {
-                    $status = false;
-                    $message = "FAILED: $_config_dir does not exist";
-                    if ($errors === null) {
-                        echo $message . ".\n";
-                    } else {
-                        $errors['config_dir'] = $message;
-                    }
-
-                    continue;
-                }
-            }
-
-            if (!is_dir($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not a directory";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } elseif (!is_readable($config_dir)) {
-                $status = false;
-                $message = "FAILED: $config_dir is not readable";
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['config_dir'] = $message;
-                }
-            } else {
-                if ($errors === null) {
-                    echo "$config_dir is OK.\n";
-                }
-            }
-        }
-
-
-        if ($errors === null) {
-            echo "Testing sysplugin files...\n";
-        }
-        // test if sysplugins are available
-        $source = SMARTY_SYSPLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "smarty_cacheresource.php" => true,
-                "smarty_cacheresource_custom.php" => true,
-                "smarty_cacheresource_keyvaluestore.php" => true,
-                "smarty_config_source.php" => true,
-                "smarty_internal_cacheresource_file.php" => true,
-                "smarty_internal_compile_append.php" => true,
-                "smarty_internal_compile_assign.php" => true,
-                "smarty_internal_compile_block.php" => true,
-                "smarty_internal_compile_break.php" => true,
-                "smarty_internal_compile_call.php" => true,
-                "smarty_internal_compile_capture.php" => true,
-                "smarty_internal_compile_config_load.php" => true,
-                "smarty_internal_compile_continue.php" => true,
-                "smarty_internal_compile_debug.php" => true,
-                "smarty_internal_compile_eval.php" => true,
-                "smarty_internal_compile_extends.php" => true,
-                "smarty_internal_compile_for.php" => true,
-                "smarty_internal_compile_foreach.php" => true,
-                "smarty_internal_compile_function.php" => true,
-                "smarty_internal_compile_if.php" => true,
-                "smarty_internal_compile_include.php" => true,
-                "smarty_internal_compile_include_php.php" => true,
-                "smarty_internal_compile_insert.php" => true,
-                "smarty_internal_compile_ldelim.php" => true,
-                "smarty_internal_compile_nocache.php" => true,
-                "smarty_internal_compile_private_block_plugin.php" => true,
-                "smarty_internal_compile_private_function_plugin.php" => true,
-                "smarty_internal_compile_private_modifier.php" => true,
-                "smarty_internal_compile_private_object_block_function.php" => true,
-                "smarty_internal_compile_private_object_function.php" => true,
-                "smarty_internal_compile_private_print_expression.php" => true,
-                "smarty_internal_compile_private_registered_block.php" => true,
-                "smarty_internal_compile_private_registered_function.php" => true,
-                "smarty_internal_compile_private_special_variable.php" => true,
-                "smarty_internal_compile_rdelim.php" => true,
-                "smarty_internal_compile_section.php" => true,
-                "smarty_internal_compile_setfilter.php" => true,
-                "smarty_internal_compile_while.php" => true,
-                "smarty_internal_compilebase.php" => true,
-                "smarty_internal_config.php" => true,
-                "smarty_internal_config_file_compiler.php" => true,
-                "smarty_internal_configfilelexer.php" => true,
-                "smarty_internal_configfileparser.php" => true,
-                "smarty_internal_data.php" => true,
-                "smarty_internal_debug.php" => true,
-                "smarty_internal_filter_handler.php" => true,
-                "smarty_internal_function_call_handler.php" => true,
-                "smarty_internal_get_include_path.php" => true,
-                "smarty_internal_nocache_insert.php" => true,
-                "smarty_internal_parsetree.php" => true,
-                "smarty_internal_resource_eval.php" => true,
-                "smarty_internal_resource_extends.php" => true,
-                "smarty_internal_resource_file.php" => true,
-                "smarty_internal_resource_registered.php" => true,
-                "smarty_internal_resource_stream.php" => true,
-                "smarty_internal_resource_string.php" => true,
-                "smarty_internal_smartytemplatecompiler.php" => true,
-                "smarty_internal_template.php" => true,
-                "smarty_internal_templatebase.php" => true,
-                "smarty_internal_templatecompilerbase.php" => true,
-                "smarty_internal_templatelexer.php" => true,
-                "smarty_internal_templateparser.php" => true,
-                "smarty_internal_utility.php" => true,
-                "smarty_internal_write_file.php" => true,
-                "smarty_resource.php" => true,
-                "smarty_resource_custom.php" => true,
-                "smarty_resource_recompiled.php" => true,
-                "smarty_resource_uncompiled.php" => true,
-                "smarty_security.php" => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/sysplugins: ". join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['sysplugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: ". SMARTY_SYSPLUGINS_DIR .' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['sysplugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Testing plugin files...\n";
-        }
-        // test if core plugins are available
-        $source = SMARTY_PLUGINS_DIR;
-        if (is_dir($source)) {
-            $expected = array(
-                "block.textformat.php" => true,
-                "function.counter.php" => true,
-                "function.cycle.php" => true,
-                "function.fetch.php" => true,
-                "function.html_checkboxes.php" => true,
-                "function.html_image.php" => true,
-                "function.html_options.php" => true,
-                "function.html_radios.php" => true,
-                "function.html_select_date.php" => true,
-                "function.html_select_time.php" => true,
-                "function.html_table.php" => true,
-                "function.mailto.php" => true,
-                "function.math.php" => true,
-                "modifier.capitalize.php" => true,
-                "modifier.date_format.php" => true,
-                "modifier.debug_print_var.php" => true,
-                "modifier.escape.php" => true,
-                "modifier.regex_replace.php" => true,
-                "modifier.replace.php" => true,
-                "modifier.spacify.php" => true,
-                "modifier.truncate.php" => true,
-                "modifiercompiler.cat.php" => true,
-                "modifiercompiler.count_characters.php" => true,
-                "modifiercompiler.count_paragraphs.php" => true,
-                "modifiercompiler.count_sentences.php" => true,
-                "modifiercompiler.count_words.php" => true,
-                "modifiercompiler.default.php" => true,
-                "modifiercompiler.escape.php" => true,
-                "modifiercompiler.from_charset.php" => true,
-                "modifiercompiler.indent.php" => true,
-                "modifiercompiler.lower.php" => true,
-                "modifiercompiler.noprint.php" => true,
-                "modifiercompiler.string_format.php" => true,
-                "modifiercompiler.strip.php" => true,
-                "modifiercompiler.strip_tags.php" => true,
-                "modifiercompiler.to_charset.php" => true,
-                "modifiercompiler.unescape.php" => true,
-                "modifiercompiler.upper.php" => true,
-                "modifiercompiler.wordwrap.php" => true,
-                "outputfilter.trimwhitespace.php" => true,
-                "shared.escape_special_chars.php" => true,
-                "shared.literal_compiler_param.php" => true,
-                "shared.make_timestamp.php" => true,
-                "shared.mb_str_replace.php" => true,
-                "shared.mb_unicode.php" => true,
-                "shared.mb_wordwrap.php" => true,
-                "variablefilter.htmlspecialchars.php" => true,
-            );
-            $iterator = new DirectoryIterator($source);
-            foreach ($iterator as $file) {
-                if (!$file->isDot()) {
-                    $filename = $file->getFilename();
-                    if (isset($expected[$filename])) {
-                        unset($expected[$filename]);
-                    }
-                }
-            }
-            if ($expected) {
-                $status = false;
-                $message = "FAILED: files missing from libs/plugins: ". join(', ', array_keys($expected));
-                if ($errors === null) {
-                    echo $message . ".\n";
-                } else {
-                    $errors['plugins'] = $message;
-                }
-            } elseif ($errors === null) {
-                echo "... OK\n";
-            }
-        } else {
-            $status = false;
-            $message = "FAILED: ". SMARTY_PLUGINS_DIR .' is not a directory';
-            if ($errors === null) {
-                echo $message . ".\n";
-            } else {
-                $errors['plugins_dir_constant'] = $message;
-            }
-        }
-
-        if ($errors === null) {
-            echo "Tests complete.\n";
-            echo "</PRE>\n";
-        }
-
-        return $status;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_internal_write_file.php b/resources/libs/smarty/sysplugins/smarty_internal_write_file.php
deleted file mode 100644
index 2dfb4757c..000000000
--- a/resources/libs/smarty/sysplugins/smarty_internal_write_file.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Smarty write file plugin
- *
- * @package Smarty
- * @subpackage PluginsInternal
- * @author Monte Ohrt
- */
-
-/**
- * Smarty Internal Write File Class
- *
- * @package Smarty
- * @subpackage PluginsInternal
- */
-class Smarty_Internal_Write_File {
-
-    /**
-     * Writes file in a safe way to disk
-     *
-     * @param string $_filepath complete filepath
-     * @param string $_contents file content
-     * @param Smarty $smarty    smarty instance
-     * @return boolean true
-     */
-    public static function writeFile($_filepath, $_contents, Smarty $smarty)
-    {
-        $_error_reporting = error_reporting();
-        error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
-        if ($smarty->_file_perms !== null) {
-            $old_umask = umask(0);
-        }
-
-        $_dirpath = dirname($_filepath);
-        // if subdirs, create dir structure
-        if ($_dirpath !== '.' && !file_exists($_dirpath)) {
-            mkdir($_dirpath, $smarty->_dir_perms === null ? 0777 : $smarty->_dir_perms, true);
-        }
-
-        // write to tmp file, then move to overt file lock race condition
-        $_tmp_file = $_dirpath . DS . uniqid('wrt', true);
-        if (!file_put_contents($_tmp_file, $_contents)) {
-            error_reporting($_error_reporting);
-            throw new SmartyException("unable to write file {$_tmp_file}");
-            return false;
-        }
-
-        // remove original file
-        @unlink($_filepath);
-
-        // rename tmp file
-        $success = rename($_tmp_file, $_filepath);
-        if (!$success) {
-            error_reporting($_error_reporting);
-            throw new SmartyException("unable to write file {$_filepath}");
-            return false;
-        }
-
-        if ($smarty->_file_perms !== null) {
-            // set file permissions
-            chmod($_filepath, $smarty->_file_perms);
-            umask($old_umask);
-        }
-        error_reporting($_error_reporting);
-        return true;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_resource.php b/resources/libs/smarty/sysplugins/smarty_resource.php
deleted file mode 100644
index 7c1cea135..000000000
--- a/resources/libs/smarty/sysplugins/smarty_resource.php
+++ /dev/null
@@ -1,830 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- *
- * Base implementation for resource plugins
- *
- * @package Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource {
-    /**
-     * cache for Smarty_Template_Source instances
-     * @var array
-     */
-    public static $sources = array();
-    /**
-     * cache for Smarty_Template_Compiled instances
-     * @var array
-     */
-    public static $compileds = array();
-    /**
-     * cache for Smarty_Resource instances
-     * @var array
-     */
-    public static $resources = array();
-    /**
-     * resource types provided by the core
-     * @var array
-     */
-    protected static $sysplugins = array(
-        'file' => true,
-        'string' => true,
-        'extends' => true,
-        'stream' => true,
-        'eval' => true,
-        'php' => true
-    );
-
-    /**
-     * Name of the Class to compile this resource's contents with
-     * @var string
-     */
-    public $compiler_class = 'Smarty_Internal_SmartyTemplateCompiler';
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     * @var string
-     */
-    public $template_lexer_class = 'Smarty_Internal_Templatelexer';
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     * @var string
-     */
-    public $template_parser_class = 'Smarty_Internal_Templateparser';
-
-    /**
-     * Load template's source into current template object
-     *
-     * {@internal The loaded source is assigned to $_template->source->content directly.}}
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
-     */
-    public abstract function getContent(Smarty_Template_Source $source);
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source source object
-     * @param Smarty_Internal_Template $_template     template object
-     */
-    public abstract function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null);
-
-    /**
-     * populate Source Object with timestamp and exists from Resource
-     *
-     * @param Smarty_Template_Source $source source object
-     */
-    public function populateTimestamp(Smarty_Template_Source $source)
-    {
-        // intentionally left blank
-    }
-
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
-     * @return string unique resource name
-     */
-    protected function buildUniqueResourceName(Smarty $smarty, $resource_name)
-    {
-        return get_class($this) . '#' . $smarty->joined_template_dir . '#' . $resource_name;
-    }
-
-    /**
-     * populate Compiled Object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $_compile_id = isset($_template->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->compile_id) : null;
-        $_filepath = $compiled->source->uid;
-        // if use_sub_dirs, break file into directories
-        if ($_template->smarty->use_sub_dirs) {
-            $_filepath = substr($_filepath, 0, 2) . DS
-             . substr($_filepath, 2, 2) . DS
-             . substr($_filepath, 4, 2) . DS
-             . $_filepath;
-        }
-        $_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
-        if (isset($_compile_id)) {
-            $_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
-        }
-        // caching token
-        if ($_template->caching) {
-            $_cache = '.cache';
-        } else {
-            $_cache = '';
-        }
-        $_compile_dir = $_template->smarty->getCompileDir();
-        // set basename if not specified
-        $_basename = $this->getBasename($compiled->source);
-        if ($_basename === null) {
-            $_basename = basename( preg_replace('![^\w\/]+!', '_', $compiled->source->name) );
-        }
-        // separate (optional) basename by dot
-        if ($_basename) {
-            $_basename = '.' . $_basename;
-        }
-
-        $compiled->filepath = $_compile_dir . $_filepath . '.' . $compiled->source->type . $_basename . $_cache . '.php';
-    }
-
-    /**
-     * build template filepath by traversing the template_dir array
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     * @return string fully qualified filepath
-     * @throws SmartyException if default template handler is registered but not callable
-     */
-    protected function buildFilepath(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $file = $source->name;
-        if ($source instanceof Smarty_Config_Source) {
-            $_directories = $source->smarty->getConfigDir();
-            $_default_handler = $source->smarty->default_config_handler_func;
-        } else {
-            $_directories = $source->smarty->getTemplateDir();
-            $_default_handler = $source->smarty->default_template_handler_func;
-        }
-
-        // go relative to a given template?
-        $_file_is_dotted = $file[0] == '.' && ($file[1] == '.' || $file[1] == '/' || $file[1] == "\\");
-        if ($_template && $_template->parent instanceof Smarty_Internal_Template && $_file_is_dotted) {
-            if ($_template->parent->source->type != 'file' && $_template->parent->source->type != 'extends' && !$_template->parent->allow_relative_path) {
-                throw new SmartyException("Template '{$file}' cannot be relative to template of resource type '{$_template->parent->source->type}'");
-            }
-            $file = dirname($_template->parent->source->filepath) . DS . $file;
-            $_file_exact_match = true;
-            if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-                // the path gained from the parent template is relative to the current working directory
-                // as expansions (like include_path) have already been done
-                $file = getcwd() . DS . $file;
-            }
-        }
-
-        // resolve relative path
-        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-            $_was_relative_prefix = $file[0] == '.' ? substr($file, 0, strpos($file, '|')) : null;
-            $_path = DS . trim($file, '/\\');
-            $_was_relative = true;
-        } else {
-            $_path = $file;
-        }
-        // don't we all just love windows?
-        $_path = str_replace('\\', '/', $_path);
-        // resolve simples
-        $_path = preg_replace('#(/\./(\./)*)|/{2,}#', '/', $_path);
-        // resolve parents
-        while (true) {
-            $_parent = strpos($_path, '/../');
-            if ($_parent === false) {
-                break;
-            } else if ($_parent === 0) {
-                $_path = substr($_path, 3);
-                break;
-            }
-            $_pos = strrpos($_path, '/', $_parent - strlen($_path) - 1);
-            if ($_pos === false) {
-                // don't we all just love windows?
-                $_pos = $_parent;
-            }
-            $_path = substr_replace($_path, '', $_pos, $_parent + 3 - $_pos);
-        }
-        if (DS != '/') {
-            // don't we all just love windows?
-            $_path = str_replace('/', '\\', $_path);
-        }
-        // revert to relative
-        if (isset($_was_relative)) {
-            if (isset($_was_relative_prefix)){
-                $_path = $_was_relative_prefix . $_path;
-            } else {
-                $_path = substr($_path, 1);
-            }
-        }
-
-        // this is only required for directories
-        $file = rtrim($_path, '/\\');
-
-        // files relative to a template only get one shot
-        if (isset($_file_exact_match)) {
-            return $this->fileExists($source, $file) ? $file : false;
-        }
-
-        // template_dir index?
-        if (preg_match('#^\[(?P<key>[^\]]+)\](?P<file>.+)$#', $file, $match)) {
-            $_directory = null;
-            // try string indexes
-            if (isset($_directories[$match['key']])) {
-                $_directory = $_directories[$match['key']];
-            } else if (is_numeric($match['key'])) {
-                // try numeric index
-                $match['key'] = (int) $match['key'];
-                if (isset($_directories[$match['key']])) {
-                    $_directory = $_directories[$match['key']];
-                } else {
-                    // try at location index
-                    $keys = array_keys($_directories);
-                    $_directory = $_directories[$keys[$match['key']]];
-                }
-            }
-
-            if ($_directory) {
-                $_file = substr($file, strpos($file, ']') + 1);
-                $_filepath = $_directory . $_file;
-                if ($this->fileExists($source, $_filepath)) {
-                    return $_filepath;
-                }
-            }
-        }
-        
-        $_stream_resolve_include_path = function_exists('stream_resolve_include_path');
-
-        // relative file name?
-        if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
-            foreach ($_directories as $_directory) {
-                $_filepath = $_directory . $file;
-                if ($this->fileExists($source, $_filepath)) {
-                    return $_filepath;
-                }
-                if ($source->smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_directory)) {
-                    // try PHP include_path
-                    if ($_stream_resolve_include_path) {
-                        $_filepath = stream_resolve_include_path($_filepath);
-                    } else {
-                        $_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath);
-                    }
-                    
-                    if ($_filepath !== false) {
-                        if ($this->fileExists($source, $_filepath)) {
-                            return $_filepath;
-                        }
-                    }
-                }
-            }
-        }
-
-        // try absolute filepath
-        if ($this->fileExists($source, $file)) {
-            return $file;
-        }
-
-        // no tpl file found
-        if ($_default_handler) {
-            if (!is_callable($_default_handler)) {
-                if ($source instanceof Smarty_Config_Source) {
-                    throw new SmartyException("Default config handler not callable");
-                } else {
-                    throw new SmartyException("Default template handler not callable");
-                }
-            }
-            $_return = call_user_func_array($_default_handler,
-                array($source->type, $source->name, &$_content, &$_timestamp, $source->smarty));
-            if (is_string($_return)) {
-                $source->timestamp = @filemtime($_return);
-                $source->exists = !!$source->timestamp;
-                return $_return;
-            } elseif ($_return === true) {
-                $source->content = $_content;
-                $source->timestamp = $_timestamp;
-                $source->exists = true;
-                return $_filepath;
-            }
-        }
-
-        // give up
-        return false;
-    }
-
-    /**
-     * test is file exists and save timestamp
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param string $file file name
-     * @return bool  true if file exists
-     */
-    protected function fileExists(Smarty_Template_Source $source, $file)
-    {
-        $source->timestamp = @filemtime($file);
-        return $source->exists = !!$source->timestamp;
-
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
-     */
-    protected function getBasename(Smarty_Template_Source $source)
-    {
-        return null;
-    }
-
-    /**
-     * Load Resource Handler
-     *
-     * @param Smarty $smarty    smarty object
-     * @param string $type      name of the resource
-     * @return Smarty_Resource Resource Handler
-     */
-    public static function load(Smarty $smarty, $type)
-    {
-        // try smarty's cache
-        if (isset($smarty->_resource_handlers[$type])) {
-            return $smarty->_resource_handlers[$type];
-        }
-
-        // try registered resource
-        if (isset($smarty->registered_resources[$type])) {
-            if ($smarty->registered_resources[$type] instanceof Smarty_Resource) {
-                $smarty->_resource_handlers[$type] = $smarty->registered_resources[$type];
-                // note registered to smarty is not kept unique!
-                return $smarty->_resource_handlers[$type];
-            }
-
-            if (!isset(self::$resources['registered'])) {
-                self::$resources['registered'] = new Smarty_Internal_Resource_Registered();
-            }
-            if (!isset($smarty->_resource_handlers[$type])) {
-                $smarty->_resource_handlers[$type] = self::$resources['registered'];
-            }
-
-            return $smarty->_resource_handlers[$type];
-        }
-
-        // try sysplugins dir
-        if (isset(self::$sysplugins[$type])) {
-            if (!isset(self::$resources[$type])) {
-                $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
-                self::$resources[$type] = new $_resource_class();
-            }
-            return $smarty->_resource_handlers[$type] = self::$resources[$type];
-        }
-
-        // try plugins dir
-        $_resource_class = 'Smarty_Resource_' . ucfirst($type);
-        if ($smarty->loadPlugin($_resource_class)) {
-            if (isset(self::$resources[$type])) {
-                return $smarty->_resource_handlers[$type] = self::$resources[$type];
-            }
-
-            if (class_exists($_resource_class, false)) {
-                self::$resources[$type] = new $_resource_class();
-                return $smarty->_resource_handlers[$type] = self::$resources[$type];
-            } else {
-                $smarty->registerResource($type, array(
-                    "smarty_resource_{$type}_source",
-                    "smarty_resource_{$type}_timestamp",
-                    "smarty_resource_{$type}_secure",
-                    "smarty_resource_{$type}_trusted"
-                ));
-
-                // give it another try, now that the resource is registered properly
-                return self::load($smarty, $type);
-            }
-        }
-
-        // try streams
-        $_known_stream = stream_get_wrappers();
-        if (in_array($type, $_known_stream)) {
-            // is known stream
-            if (is_object($smarty->security_policy)) {
-                $smarty->security_policy->isTrustedStream($type);
-            }
-            if (!isset(self::$resources['stream'])) {
-                self::$resources['stream'] = new Smarty_Internal_Resource_Stream();
-            }
-            return $smarty->_resource_handlers[$type] = self::$resources['stream'];
-        }
-
-        // TODO: try default_(template|config)_handler
-
-        // give up
-        throw new SmartyException("Unkown resource type '{$type}'");
-    }
-
-    /**
-     * extract resource_type and resource_name from template_resource and config_resource
-     *
-     * @note "C:/foo.tpl" was forced to file resource up till Smarty 3.1.3 (including).
-     * @param string  $resource_name    template_resource or config_resource to parse
-     * @param string  $default_resource the default resource_type defined in $smarty
-     * @param string &$name             the parsed resource name
-     * @param string &$type             the parsed resource type
-     * @return void
-     */
-    protected static function parseResourceName($resource_name, $default_resource, &$name, &$type)
-    {
-        $parts = explode(':', $resource_name, 2);
-        if (!isset($parts[1]) || !isset($parts[0][1])) {
-            // no resource given, use default
-            // or single character before the colon is not a resource type, but part of the filepath
-            $type = $default_resource;
-            $name = $resource_name;
-        } else {
-            $type = $parts[0];
-            $name = $parts[1];
-        }
-    }
-
-
-    /**
-     * modify resource_name according to resource handlers specifications
-     *
-     * @param Smarty $smarty        Smarty instance
-     * @param string $resource_name resource_name to make unique
-     * @return string unique resource name
-     */
-
-    /**
-     * modify template_resource according to resource handlers specifications
-     *
-     * @param string $smarty            Smarty instance
-     * @param string $template_resource template_resource to extracate resource handler and name of
-     * @return string unique resource name
-     */
-    public static function getUniqueTemplateName($smarty, $template_resource)
-    {
-        self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type);
-        // TODO: optimize for Smarty's internal resource types
-        $resource = Smarty_Resource::load($smarty, $type);
-        return $resource->buildUniqueResourceName($smarty, $name);
-    }
-
-    /**
-     * initialize Source Object for given resource
-     *
-     * Either [$_template] or [$smarty, $template_resource] must be specified
-     *
-     * @param Smarty_Internal_Template $_template         template object
-     * @param Smarty                   $smarty            smarty object
-     * @param string                   $template_resource resource identifier
-     * @return Smarty_Template_Source Source Object
-     */
-    public static function source(Smarty_Internal_Template $_template=null, Smarty $smarty=null, $template_resource=null)
-    {
-        if ($_template) {
-            $smarty = $_template->smarty;
-            $template_resource = $_template->template_resource;
-        }
-
-        // parse resource_name, load resource handler, identify unique resource name
-        self::parseResourceName($template_resource, $smarty->default_resource_type, $name, $type);
-        $resource = Smarty_Resource::load($smarty, $type);
-        $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name);
-
-        // check runtime cache
-        $_cache_key = 'template|' . $unique_resource_name;
-        if (isset(self::$sources[$_cache_key])) {
-            return self::$sources[$_cache_key];
-        }
-
-        // create source
-        $source = new Smarty_Template_Source($resource, $smarty, $template_resource, $type, $name, $unique_resource_name);
-        $resource->populate($source, $_template);
-
-        // runtime cache
-        self::$sources[$_cache_key] = $source;
-        return $source;
-    }
-
-    /**
-     * initialize Config Source Object for given resource
-     *
-     * @param Smarty_Internal_Config $_config config object
-     * @return Smarty_Config_Source Source Object
-     */
-    public static function config(Smarty_Internal_Config $_config)
-    {
-        static $_incompatible_resources = array('eval' => true, 'string' => true, 'extends' => true, 'php' => true);
-        $config_resource = $_config->config_resource;
-        $smarty = $_config->smarty;
-
-        // parse resource_name
-        self::parseResourceName($config_resource, $smarty->default_config_type, $name, $type);
-
-        // make sure configs are not loaded via anything smarty can't handle
-        if (isset($_incompatible_resources[$type])) {
-            throw new SmartyException ("Unable to use resource '{$type}' for config");
-        }
-
-        // load resource handler, identify unique resource name
-        $resource = Smarty_Resource::load($smarty, $type);
-        $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name);
-
-        // check runtime cache
-        $_cache_key = 'config|' . $unique_resource_name;
-        if (isset(self::$sources[$_cache_key])) {
-            return self::$sources[$_cache_key];
-        }
-
-        // create source
-        $source = new Smarty_Config_Source($resource, $smarty, $config_resource, $type, $name, $unique_resource_name);
-        $resource->populate($source, null);
-
-        // runtime cache
-        self::$sources[$_cache_key] = $source;
-        return $source;
-    }
-
-}
-
-/**
- * Smarty Resource Data Object
- *
- * Meta Data Container for Template Files
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- *
- * @property integer $timestamp Source Timestamp
- * @property boolean $exists    Source Existance
- * @property boolean $template  Extended Template reference
- * @property string  $content   Source Content
- */
-class Smarty_Template_Source {
-
-    /**
-     * Name of the Class to compile this resource's contents with
-     * @var string
-     */
-    public $compiler_class = null;
-
-    /**
-     * Name of the Class to tokenize this resource's contents with
-     * @var string
-     */
-    public $template_lexer_class = null;
-
-    /**
-     * Name of the Class to parse this resource's contents with
-     * @var string
-     */
-    public $template_parser_class = null;
-
-    /**
-     * Unique Template ID
-     * @var string
-     */
-    public $uid = null;
-
-    /**
-     * Template Resource (Smarty_Internal_Template::$template_resource)
-     * @var string
-     */
-    public $resource = null;
-
-    /**
-     * Resource Type
-     * @var string
-     */
-    public $type = null;
-
-    /**
-     * Resource Name
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * Unique Resource Name
-     * @var string
-     */
-    public $unique_resource = null;
-
-    /**
-     * Source Filepath
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Source is bypassing compiler
-     * @var boolean
-     */
-    public $uncompiled = null;
-
-    /**
-     * Source must be recompiled on every occasion
-     * @var boolean
-     */
-    public $recompiled = null;
-
-    /**
-     * The Components an extended template is made of
-     * @var array
-     */
-    public $components = null;
-
-    /**
-     * Resource Handler
-     * @var Smarty_Resource
-     */
-    public $handler = null;
-
-    /**
-     * Smarty instance
-     * @var Smarty
-     */
-    public $smarty = null;
-
-    /**
-     * create Source Object container
-     *
-     * @param Smarty_Resource $handler          Resource Handler this source object communicates with
-     * @param Smarty          $smarty           Smarty instance this source object belongs to
-     * @param string          $resource         full template_resource
-     * @param string          $type             type of resource
-     * @param string          $name             resource name
-     * @param string          $unique_resource  unqiue resource name
-     */
-    public function __construct(Smarty_Resource $handler, Smarty $smarty, $resource, $type, $name, $unique_resource)
-    {
-        $this->handler = $handler; // Note: prone to circular references
-
-        $this->compiler_class = $handler->compiler_class;
-        $this->template_lexer_class = $handler->template_lexer_class;
-        $this->template_parser_class = $handler->template_parser_class;
-        $this->uncompiled = $this->handler instanceof Smarty_Resource_Uncompiled;
-        $this->recompiled = $this->handler instanceof Smarty_Resource_Recompiled;
-
-        $this->smarty = $smarty;
-        $this->resource = $resource;
-        $this->type = $type;
-        $this->name = $name;
-        $this->unique_resource = $unique_resource;
-    }
-
-    /**
-     * get a Compiled Object of this source
-     *
-     * @param Smarty_Internal_Template $_template template objet
-     * @return Smarty_Template_Compiled compiled object
-     */
-    public function getCompiled(Smarty_Internal_Template $_template)
-    {
-        // check runtime cache
-        $_cache_key = $this->unique_resource . '#' . $_template->compile_id;
-        if (isset(Smarty_Resource::$compileds[$_cache_key])) {
-            return Smarty_Resource::$compileds[$_cache_key];
-        }
-
-        $compiled = new Smarty_Template_Compiled($this);
-        $this->handler->populateCompiledFilepath($compiled, $_template);
-        $compiled->timestamp = @filemtime($compiled->filepath);
-        $compiled->exists = !!$compiled->timestamp;
-
-        // runtime cache
-        Smarty_Resource::$compileds[$_cache_key] = $compiled;
-
-        return $compiled;
-    }
-
-    /**
-     * render the uncompiled source
-     *
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function renderUncompiled(Smarty_Internal_Template $_template)
-    {
-        return $this->handler->renderUncompiled($this, $_template);
-    }
-
-    /**
-     * <<magic>> Generic Setter.
-     *
-     * @param string $property_name valid: timestamp, exists, content, template
-     * @param mixed  $value        new value (is not checked)
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __set($property_name, $value)
-    {
-        switch ($property_name) {
-            // regular attributes
-            case 'timestamp':
-            case 'exists':
-            case 'content':
-            // required for extends: only
-            case 'template':
-                $this->$property_name = $value;
-                break;
-
-            default:
-                throw new SmartyException("invalid source property '$property_name'.");
-        }
-    }
-
-    /**
-     * <<magic>> Generic getter.
-     *
-     * @param string $property_name valid: timestamp, exists, content
-     * @return mixed
-     * @throws SmartyException if $property_name is not valid
-     */
-    public function __get($property_name)
-    {
-        switch ($property_name) {
-            case 'timestamp':
-            case 'exists':
-                $this->handler->populateTimestamp($this);
-                return $this->$property_name;
-
-            case 'content':
-                return $this->content = $this->handler->getContent($this);
-
-            default:
-                throw new SmartyException("source property '$property_name' does not exist.");
-        }
-    }
-
-}
-
-/**
- * Smarty Resource Data Object
- *
- * Meta Data Container for Template Files
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- *
- * @property string $content compiled content
- */
-class Smarty_Template_Compiled {
-
-    /**
-     * Compiled Filepath
-     * @var string
-     */
-    public $filepath = null;
-
-    /**
-     * Compiled Timestamp
-     * @var integer
-     */
-    public $timestamp = null;
-
-    /**
-     * Compiled Existance
-     * @var boolean
-     */
-    public $exists = false;
-
-    /**
-     * Compiled Content Loaded
-     * @var boolean
-     */
-    public $loaded = false;
-
-    /**
-     * Template was compiled
-     * @var boolean
-     */
-    public $isCompiled = false;
-
-    /**
-     * Source Object
-     * @var Smarty_Template_Source
-     */
-    public $source = null;
-
-    /**
-     * Metadata properties
-     *
-     * populated by Smarty_Internal_Template::decodeProperties()
-     * @var array
-     */
-    public $_properties = null;
-
-    /**
-     * create Compiled Object container
-     *
-     * @param Smarty_Template_Source $source source object this compiled object belongs to
-     */
-    public function __construct(Smarty_Template_Source $source)
-    {
-        $this->source = $source;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_resource_custom.php b/resources/libs/smarty/sysplugins/smarty_resource_custom.php
deleted file mode 100644
index 9ec1f356b..000000000
--- a/resources/libs/smarty/sysplugins/smarty_resource_custom.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- *
- * Wrapper Implementation for custom resource plugins
- *
- * @package Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Custom extends Smarty_Resource {
-
-    /**
-     * fetch template and its modification time from data source
-     *
-     * @param string  $name    template name
-     * @param string  &$source template source
-     * @param integer &$mtime  template modification timestamp (epoch)
-     */
-    protected abstract function fetch($name, &$source, &$mtime);
-
-    /**
-     * Fetch template's modification timestamp from data source
-     *
-     * {@internal implementing this method is optional.
-     *  Only implement it if modification times can be accessed faster than loading the complete template source.}}
-     *
-     * @param string $name template name
-     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-     */
-    protected function fetchTimestamp($name)
-    {
-        return null;
-    }
-
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null)
-    {
-        $source->filepath = strtolower($source->type . ':' . $source->name);
-        $source->uid = sha1($source->type . ':' . $source->name);
-
-        $mtime = $this->fetchTimestamp($source->name);
-        if ($mtime !== null) {
-            $source->timestamp = $mtime;
-        } else {
-            $this->fetch($source->name, $content, $timestamp);
-            $source->timestamp = isset($timestamp) ? $timestamp : false;
-            if( isset($content) )
-                $source->content = $content;
-        }
-        $source->exists = !!$source->timestamp;
-    }
-
-    /**
-     * Load template's source into current template object
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string template source
-     * @throws SmartyException if source cannot be loaded
-     */
-    public function getContent(Smarty_Template_Source $source)
-    {
-        $this->fetch($source->name, $content, $timestamp);
-        if (isset($content)) {
-            return $content;
-        }
-
-        throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
-    }
-
-    /**
-     * Determine basename for compiled filename
-     *
-     * @param Smarty_Template_Source $source source object
-     * @return string resource's basename
-     */
-    protected function getBasename(Smarty_Template_Source $source)
-    {
-        return basename($source->name);
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_resource_recompiled.php b/resources/libs/smarty/sysplugins/smarty_resource_recompiled.php
deleted file mode 100644
index ab55b93a6..000000000
--- a/resources/libs/smarty/sysplugins/smarty_resource_recompiled.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- *
- * Base implementation for resource plugins that don't compile cache
- *
- * @package Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Recompiled extends Smarty_Resource {
-
-    /**
-     * populate Compiled Object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled compiled object
-     * @param Smarty_Internal_Template $_template template object
-     * @return void
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $compiled->filepath = false;
-        $compiled->timestamp = false;
-        $compiled->exists = false;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_resource_uncompiled.php b/resources/libs/smarty/sysplugins/smarty_resource_uncompiled.php
deleted file mode 100644
index ea8023507..000000000
--- a/resources/libs/smarty/sysplugins/smarty_resource_uncompiled.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Smarty Resource Plugin
- *
- * @package Smarty
- * @subpackage TemplateResources
- * @author Rodney Rehm
- */
-
-/**
- * Smarty Resource Plugin
- *
- * Base implementation for resource plugins that don't use the compiler
- *
- * @package Smarty
- * @subpackage TemplateResources
- */
-abstract class Smarty_Resource_Uncompiled extends Smarty_Resource {
-
-    /**
-     * Render and output the template (without using the compiler)
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     * @throws SmartyException on failure
-     */
-    public abstract function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template);
-
-    /**
-     * populate compiled object with compiled filepath
-     *
-     * @param Smarty_Template_Compiled $compiled  compiled object
-     * @param Smarty_Internal_Template $_template template object (is ignored)
-     */
-    public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template)
-    {
-        $compiled->filepath = false;
-        $compiled->timestamp = false;
-        $compiled->exists = false;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/libs/smarty/sysplugins/smarty_security.php b/resources/libs/smarty/sysplugins/smarty_security.php
deleted file mode 100644
index f8b31d963..000000000
--- a/resources/libs/smarty/sysplugins/smarty_security.php
+++ /dev/null
@@ -1,459 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package Smarty
- * @subpackage Security
- * @author Uwe Tews
- */
- 
-/*
- * FIXME: Smarty_Security API
- *      - getter and setter instead of public properties would allow cultivating an internal cache properly
- *      - current implementation of isTrustedResourceDir() assumes that Smarty::$template_dir and Smarty::$config_dir are immutable
- *        the cache is killed every time either of the variables change. That means that two distinct Smarty objects with differing
- *        $template_dir or $config_dir should NOT share the same Smarty_Security instance, 
- *        as this would lead to (severe) performance penalty! how should this be handled? 
- */
-
-/**
- * This class does contain the security settings
- */
-class Smarty_Security {
-
-    /**
-     * This determines how Smarty handles "<?php ... ?>" tags in templates.
-     * possible values:
-     * <ul>
-     *   <li>Smarty::PHP_PASSTHRU -> echo PHP tags as they are</li>
-     *   <li>Smarty::PHP_QUOTE    -> escape tags as entities</li>
-     *   <li>Smarty::PHP_REMOVE   -> remove php tags</li>
-     *   <li>Smarty::PHP_ALLOW    -> execute php tags</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    public $php_handling = Smarty::PHP_PASSTHRU;
-    /**
-     * This is the list of template directories that are considered secure.
-     * $template_dir is in this list implicitly.
-     *
-     * @var array
-     */
-    public $secure_dir = array();
-    /**
-     * This is an array of directories where trusted php scripts reside.
-     * {@link $security} is disabled during their inclusion/execution.
-     *
-     * @var array
-     */
-    public $trusted_dir = array();
-    /**
-     * List of regular expressions (PCRE) that include trusted URIs
-     *
-     * @var array
-     */
-    public $trusted_uri = array();
-    /**
-     * This is an array of trusted static classes.
-     *
-     * If empty access to all static classes is allowed.
-     * If set to 'none' none is allowed.
-     * @var array
-     */
-    public $static_classes = array();
-    /**
-     * This is an array of trusted PHP functions.
-     *
-     * If empty all functions are allowed.
-     * To disable all PHP functions set $php_functions = null.
-     * @var array
-     */
-    public $php_functions = array(
-        'isset', 'empty',
-        'count', 'sizeof',
-        'in_array', 'is_array',
-        'time',
-        'nl2br',
-    );
-    /**
-     * This is an array of trusted PHP modifers.
-     *
-     * If empty all modifiers are allowed.
-     * To disable all modifier set $modifiers = null.
-     * @var array
-     */
-    public $php_modifiers = array(
-        'escape',
-        'count'
-    );
-    /**
-     * This is an array of allowed tags.
-     *
-     * If empty no restriction by allowed_tags.
-     * @var array
-     */
-    public $allowed_tags = array();
-    /**
-     * This is an array of disabled tags.
-     *
-     * If empty no restriction by disabled_tags.
-     * @var array
-     */
-    public $disabled_tags = array();
-    /**
-     * This is an array of allowed modifier plugins.
-     *
-     * If empty no restriction by allowed_modifiers.
-     * @var array
-     */
-    public $allowed_modifiers = array();
-    /**
-     * This is an array of disabled modifier plugins.
-     *
-     * If empty no restriction by disabled_modifiers.
-     * @var array
-     */
-    public $disabled_modifiers = array();
-    /**
-     * This is an array of trusted streams.
-     *
-     * If empty all streams are allowed.
-     * To disable all streams set $streams = null.
-     * @var array
-     */
-    public $streams = array('file');
-    /**
-     * + flag if constants can be accessed from template
-     * @var boolean
-     */
-    public $allow_constants = true;
-    /**
-     * + flag if super globals can be accessed from template
-     * @var boolean
-     */
-    public $allow_super_globals = true;
-
-    /**
-     * Cache for $resource_dir lookups
-     * @var array
-     */
-    protected $_resource_dir = null;
-    /**
-     * Cache for $template_dir lookups
-     * @var array
-     */
-    protected $_template_dir = null;
-    /**
-     * Cache for $config_dir lookups
-     * @var array
-     */
-    protected $_config_dir = null;
-    /**
-     * Cache for $secure_dir lookups
-     * @var array
-     */
-    protected $_secure_dir = null;
-    /**
-     * Cache for $php_resource_dir lookups
-     * @var array
-     */
-    protected $_php_resource_dir = null;
-    /**
-     * Cache for $trusted_dir lookups
-     * @var array
-     */
-    protected $_trusted_dir = null;
-    
-    
-    /**
-     * @param Smarty $smarty
-     */
-    public function __construct($smarty)
-    {
-        $this->smarty = $smarty;
-    }
-    
-    /**
-     * Check if PHP function is trusted.
-     *
-     * @param string $function_name
-     * @param object $compiler compiler object
-     * @return boolean true if function is trusted
-     * @throws SmartyCompilerException if php function is not trusted
-     */
-    public function isTrustedPhpFunction($function_name, $compiler)
-    {
-        if (isset($this->php_functions) && (empty($this->php_functions) || in_array($function_name, $this->php_functions))) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("PHP function '{$function_name}' not allowed by security setting");
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if static class is trusted.
-     *
-     * @param string $class_name
-     * @param object $compiler compiler object
-     * @return boolean true if class is trusted
-     * @throws SmartyCompilerException if static class is not trusted
-     */
-    public function isTrustedStaticClass($class_name, $compiler)
-    {
-        if (isset($this->static_classes) && (empty($this->static_classes) || in_array($class_name, $this->static_classes))) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("access to static class '{$class_name}' not allowed by security setting");
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if PHP modifier is trusted.
-     *
-     * @param string $modifier_name
-     * @param object $compiler compiler object
-     * @return boolean true if modifier is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedPhpModifier($modifier_name, $compiler)
-    {
-        if (isset($this->php_modifiers) && (empty($this->php_modifiers) || in_array($modifier_name, $this->php_modifiers))) {
-            return true;
-        }
-
-        $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting");
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if tag is trusted.
-     *
-     * @param string $tag_name
-     * @param object $compiler compiler object
-     * @return boolean true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedTag($tag_name, $compiler)
-    {
-        // check for internal always required tags
-        if (in_array($tag_name, array('assign', 'call', 'private_filter', 'private_block_plugin', 'private_function_plugin', 'private_object_block_function',
-                    'private_object_function', 'private_registered_function', 'private_registered_block', 'private_special_variable', 'private_print_expression', 'private_modifier'))) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_tags)) {
-            if (empty($this->disabled_tags) || !in_array($tag_name, $this->disabled_tags)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error("tag '{$tag_name}' disabled by security setting", $compiler->lex->taglineno);
-            }
-        } else if (in_array($tag_name, $this->allowed_tags) && !in_array($tag_name, $this->disabled_tags)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("tag '{$tag_name}' not allowed by security setting", $compiler->lex->taglineno);
-        }
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if modifier plugin is trusted.
-     *
-     * @param string $modifier_name
-     * @param object $compiler compiler object
-     * @return boolean true if tag is trusted
-     * @throws SmartyCompilerException if modifier is not trusted
-     */
-    public function isTrustedModifier($modifier_name, $compiler)
-    {
-        // check for internal always allowed modifier
-        if (in_array($modifier_name, array('default'))) {
-            return true;
-        }
-        // check security settings
-        if (empty($this->allowed_modifiers)) {
-            if (empty($this->disabled_modifiers) || !in_array($modifier_name, $this->disabled_modifiers)) {
-                return true;
-            } else {
-                $compiler->trigger_template_error("modifier '{$modifier_name}' disabled by security setting", $compiler->lex->taglineno);
-            }
-        } else if (in_array($modifier_name, $this->allowed_modifiers) && !in_array($modifier_name, $this->disabled_modifiers)) {
-            return true;
-        } else {
-            $compiler->trigger_template_error("modifier '{$modifier_name}' not allowed by security setting", $compiler->lex->taglineno);
-        }
-        return false; // should not, but who knows what happens to the compiler in the future?
-    }
-
-    /**
-     * Check if stream is trusted.
-     *
-     * @param string $stream_name
-     * @return boolean true if stream is trusted
-     * @throws SmartyException if stream is not trusted
-     */
-    public function isTrustedStream($stream_name)
-    {
-        if (isset($this->streams) && (empty($this->streams) || in_array($stream_name, $this->streams))) {
-            return true;
-        }
-
-        throw new SmartyException("stream '{$stream_name}' not allowed by security setting");
-    }
-
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param string $filepath
-     * @return boolean true if directory is trusted
-     * @throws SmartyException if directory is not trusted
-     */
-    public function isTrustedResourceDir($filepath)
-    {
-        $_template = false;
-        $_config = false;
-        $_secure = false;
-
-        $_template_dir = $this->smarty->getTemplateDir();
-        $_config_dir = $this->smarty->getConfigDir();
-
-        // check if index is outdated
-        if ((!$this->_template_dir || $this->_template_dir !== $_template_dir)
-                || (!$this->_config_dir || $this->_config_dir !== $_config_dir)
-                || (!empty($this->secure_dir) && (!$this->_secure_dir || $this->_secure_dir !== $this->secure_dir))
-        ) {
-            $this->_resource_dir = array();
-            $_template = true;
-            $_config = true;
-            $_secure = !empty($this->secure_dir);
-        }
-
-        // rebuild template dir index
-        if ($_template) {
-            $this->_template_dir = $_template_dir;
-            foreach ($_template_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
-            }
-        }
-
-        // rebuild config dir index
-        if ($_config) {
-            $this->_config_dir = $_config_dir;
-            foreach ($_config_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
-            }
-        }
-
-        // rebuild secure dir index
-        if ($_secure) {
-            $this->_secure_dir = $this->secure_dir;
-            foreach ((array) $this->secure_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_resource_dir[$directory] = true;
-            }
-        }
-
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
-        $_directory = array();
-        while (true) {
-            // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[$directory] = true;
-            // test if the directory is trusted
-            if (isset($this->_resource_dir[$directory])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups
-                $this->_resource_dir = array_merge($this->_resource_dir, $_directory);
-                return true;
-            }
-            // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[1])) {
-                break;
-            }
-            // bubble up one level
-            $directory = substr($directory, 0, $pos);
-        }
-
-        // give up
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
-    }
-    
-    /**
-     * Check if URI (e.g. {fetch} or {html_image}) is trusted
-     *
-     * To simplify things, isTrustedUri() resolves all input to "{$PROTOCOL}://{$HOSTNAME}".
-     * So "http://username:password@hello.world.example.org:8080/some-path?some=query-string"
-     * is reduced to "http://hello.world.example.org" prior to applying the patters from {@link $trusted_uri}.
-     * @param string $uri 
-     * @return boolean true if URI is trusted
-     * @throws SmartyException if URI is not trusted
-     * @uses $trusted_uri for list of patterns to match against $uri
-     */
-    public function isTrustedUri($uri)
-    {
-        $_uri = parse_url($uri);
-        if (!empty($_uri['scheme']) && !empty($_uri['host'])) {
-            $_uri = $_uri['scheme'] . '://' . $_uri['host'];
-            foreach ($this->trusted_uri as $pattern) {
-                if (preg_match($pattern, $_uri)) {
-                    return true;
-                }
-            }
-        }
-        
-        throw new SmartyException("URI '{$uri}' not allowed by security setting");
-    }
-    
-    /**
-     * Check if directory of file resource is trusted.
-     *
-     * @param string $filepath
-     * @return boolean true if directory is trusted
-     * @throws SmartyException if PHP directory is not trusted
-     */
-    public function isTrustedPHPDir($filepath)
-    {
-        if (empty($this->trusted_dir)) {
-            throw new SmartyException("directory '{$filepath}' not allowed by security setting (no trusted_dir specified)");
-        }
-
-        // check if index is outdated
-        if (!$this->_trusted_dir || $this->_trusted_dir !== $this->trusted_dir) {
-            $this->_php_resource_dir = array();
-
-            $this->_trusted_dir = $this->trusted_dir;
-            foreach ((array) $this->trusted_dir as $directory) {
-                $directory = realpath($directory);
-                $this->_php_resource_dir[$directory] = true;
-            }
-        }
-
-        $_filepath = realpath($filepath);
-        $directory = dirname($_filepath);
-        $_directory = array();
-        while (true) {
-            // remember the directory to add it to _resource_dir in case we're successful
-            $_directory[] = $directory;
-            // test if the directory is trusted
-            if (isset($this->_php_resource_dir[$directory])) {
-                // merge sub directories of current $directory into _resource_dir to speed up subsequent lookups
-                $this->_php_resource_dir = array_merge($this->_php_resource_dir, $_directory);
-                return true;
-            }
-            // abort if we've reached root
-            if (($pos = strrpos($directory, DS)) === false || !isset($directory[2])) {
-                break;
-            }
-            // bubble up one level
-            $directory = substr($directory, 0, $pos);
-        }
-
-        throw new SmartyException("directory '{$_filepath}' not allowed by security setting");
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/resources/scripts/accountManager.js b/resources/scripts/accountManager.js
deleted file mode 100644
index 6ead05fcc..000000000
--- a/resources/scripts/accountManager.js
+++ /dev/null
@@ -1,376 +0,0 @@
-/*jslint browser:true*/
-/*global $:false,console:false,define:false*/
-define([
-	"manager",
-	"utils",
-	"constants",
-	"lang",
-	"moment",
-	"tablesorter"
-], function(manager, utils, C, L, moment) {
-
-	"use strict";
-
-	/**
-	 * @name AccountManager
-	 * @see Core
-	 * @description This contains all functionality for the administrator when in multiple accounts mode:
-	 *   adding, deleting and editing user accounts.
-	 * @author Ben Keen
-	 * @return {Object}
-	 * @namespace
-	 */
-
-	var MODULE_ID = "core-accountManager";
-	var _accountList;
-	var _manageAccountModalID = "gdManageAccountDialog";
-	var _deleteAccountModalID = "gdDeleteAccountDialog";
-	var _userTableCreated = false;
-
-
-	var _run = function() {
-		var isLoggedIn = $("body").data("loggedIn");
-		var userAccountSetup = $("body").data("userAccountSetup");
-		if (!isLoggedIn || userAccountSetup !== "multiple") {
-			return;
-		}
-
-		$("#gdCreateAccount").on("click", _openCreateAccountDialog);
-		$("#gdRefreshPassword").on("click", _regeneratePassword);
-
-		// event delegate the Edit and Delete clicks
-		var accountList = $("#gdAccountList");
-		accountList.on("click", ".gdEditAccount", _openEditAccountDialog);
-		accountList.on("click", ".gdDeleteAccount", _openDeleteAccountDialog);
-
-		_getAccountsList();
-
-		var subscriptions = {};
-		subscriptions[C.EVENT.TAB.CHANGE] = _onChangeTab;
-		manager.subscribe(MODULE_ID, subscriptions);
-	};
-
-	var _onClickCreateAccount = function() {
-		// check all fields have been entered
-		var firstNameField    = $("#gdManageAccount_firstName");
-		var firstNameFieldVal = $.trim(firstNameField.val());
-		var lastNameField    = $("#gdManageAccount_lastName");
-		var lastNameFieldVal = $.trim(lastNameField.val());
-		var emailField    = $("#gdManageAccount_email");
-		var emailFieldVal = $.trim(emailField.val());
-		var passwordField    = $("#gdManageAccount_password");
-		var passwordFieldVal = $.trim(passwordField.val());
-
-		var hasErrors = false;
-		if (firstNameFieldVal === "") {
-			firstNameField.addClass("gdProblemField");
-			hasErrors = true;
-		} else {
-			firstNameField.removeClass("gdProblemField");
-		}
-
-		if (lastNameFieldVal === "") {
-			lastNameField.addClass("gdProblemField");
-			hasErrors = true;
-		} else {
-			lastNameField.removeClass("gdProblemField");
-		}
-
-		if (emailFieldVal === "") {
-			emailField.addClass("gdProblemField");
-			hasErrors = true;
-		} else {
-			emailField.removeClass("gdProblemField");
-		}
-
-		if (passwordFieldVal === "") {
-			passwordField.addClass("gdProblemField");
-			hasErrors = true;
-		} else {
-			passwordField.removeClass("gdProblemField");
-		}
-
-		if (!hasErrors) {
-			utils.playModalSpinner(_manageAccountModalID);
-			var data = {
-				action: "createAccount",
-				firstName: firstNameFieldVal,
-				lastName:  lastNameFieldVal,
-				email: emailFieldVal,
-				password: passwordFieldVal,
-				autoEmail: $("#gdAutoEmailAccountDetails").attr("checked") ? "yes" : "no"
-			};
-
-			$.ajax({
-				url: "ajax.php",
-				type: "POST",
-				data: data,
-				dataType: "json"
-			}).then(
-				function(response) {
-					if (response.success) {
-						// get a fresh list of accounts from the server, and add a callback so that
-						// we close the modal when it's complete
-						_getAccountsList({
-							onComplete: function() {
-								utils.clearValidationErrors($("#gdManageAccountDialogMessage"));
-								$("#" + _manageAccountModalID).dialog("close");
-								utils.pauseModalSpinner(_manageAccountModalID);
-								_updateAccountsTable();
-							}
-						});
-					} else {
-						var errorCode = response.errorCode;
-						switch (errorCode) {
-							case C.ERROR_CODES.ACCOUNT_ALREADY_EXISTS:
-								utils.addValidationErrors({ els: [$("#gdManageAccount_email")], error: L.validation_account_already_exists });
-								break;
-							case C.ERROR_CODES.NOT_LOGGED_IN:
-								utils.addValidationErrors({ els: [], error: L.validation_not_logged_in });
-								break;
-							case C.ERROR_CODES.NON_ADMIN:
-								utils.addValidationErrors({ els: [], error: L.validation_invalid_permissions });
-								break;
-						}
-						utils.displayValidationErrors("#gdManageAccountDialogMessage");
-						utils.pauseModalSpinner(_manageAccountModalID);
-					}
-				},
-
-				function(response) {
-					utils.pauseModalSpinner(_manageAccountModalID);
-					console.log("error response: ", response);
-				}
-			);
-
-		}
-	};
-
-	var _onConfirmDeleteAccount = function(accountID) {
-		utils.playModalSpinner(_deleteAccountModalID);
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			data: {
-				action: "deleteAccount",
-				accountID: accountID
-			},
-			dataType: "json"
-		}).then(
-			function(response) {
-				if (response.success) {
-					// get a fresh list of accounts from the server, and add a callback so that
-					// we close the modal when it's complete`
-					_getAccountsList({
-						onComplete: function() {
-							$("#" + _deleteAccountModalID).dialog("close");
-							utils.pauseModalSpinner(_deleteAccountModalID);
-							_updateAccountsTable();
-						}
-					});
-				} else {
-					// TODO
-				}
-			},
-			function(response) {
-				utils.pauseModalSpinner(_deleteAccountModalID);
-				console.log("error response: ", response);
-			}
-		);
-	};
-
-	var _openEditAccountDialog = function(e) {
-		e.preventDefault();
-		var accountID = $(e.target).closest("tr").data("account-id");
-		$("#gdManageAccount_pwdCreate,#gdManageAccountDialogEmailRow").addClass("hidden");
-		$("#gdManageAccount_pwdEdit").removeClass("hidden");
-
-		// now pre-fill the fields in the dialog
-		var accountInfo = _getAccountByID(accountID);
-		if (accountInfo === null) {
-			console.log("This shouldn't have happened. Couldn't find an account ID.");
-			return;
-		} else {
-			$("#gdManageAccount_firstName").val(accountInfo.first_name);
-			$("#gdManageAccount_lastName").val(accountInfo.last_name);
-			$("#gdManageAccount_email").val(accountInfo.email);
-		}
-
-		$("#" + _manageAccountModalID).dialog({
-			title: L.update_account,
-			modal: true,
-			width: 600,
-			open: function() { utils.insertModalSpinner({ modalID: _manageAccountModalID }); },
-			buttons: [
-				{
-					text: L.update,
-					click: _onClickCreateAccount
-				},
-				{
-					text: L.close,
-					click: function() { $(this).dialog("close"); }
-				}
-			]
-		});
-	};
-
-	var _openDeleteAccountDialog = function(e) {
-		e.preventDefault();
-		var accountID = $(e.target).closest("tr").data("account-id");
-
-		// now pre-fill the text in the dialog to make it totally transparent what the admin
-		// is about to delete
-		var accountInfo = _getAccountByID(accountID);
-		if (accountInfo === null) {
-			console.log("This shouldn't have happened. Couldn't find an account ID.");
-			return;
-		} else {
-			$("#gdDeleteAccount_firstName").html(accountInfo.first_name);
-			$("#gdDeleteAccount_lastName").html(accountInfo.last_name);
-			$("#gdDeleteAccount_email").html(accountInfo.email);
-		}
-
-		$("#" + _deleteAccountModalID).dialog({
-			title: L.delete_account,
-			modal: true,
-			width: 480,
-			open: function() { utils.insertModalSpinner({ modalID: _deleteAccountModalID }); },
-			buttons: [
-				{
-					text: L.yes,
-					click: function() { _onConfirmDeleteAccount(accountID); }
-				},
-				{
-					text: L.no,
-					click: function() { $(this).dialog("close"); }
-				}
-			]
-		});
-	};
-
-	var _getAccountByID = function(accountID) {
-		var accountInfo = null;
-		for (var i=0; i<_accountList.length; i++) {
-			if (_accountList[i].account_id == accountID) {
-				accountInfo = _accountList[i];
-				break;
-			}
-		}
-		return accountInfo;
-	};
-
-	var _getAccountsList = function(options) {
-		var opts = $.extend({
-			onComplete: null
-		}, options);
-
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			data: { action: "getUsers" },
-			dataType: "json"
-		}).then(
-			function(response) {
-				if (response.success) {
-					_accountList = response.content;
-					_updateAccountsTable();
-				}
-				if (opts.onComplete !== null) {
-					opts.onComplete();
-				}
-			},
-			function(response) {
-				console.log("error response: ", response);
-				if (opts.onComplete !== null) {
-					opts.onComplete();
-				}
-			}
-		);
-	};
-
-
-	var _updateAccountsTable = function() {
-		var html = '';
-		for (var i=0; i<_accountList.length; i++) {
-			var lastLoggedIn = (_accountList[i].last_logged_in !== '') ? moment.unix(_accountList[i].last_logged_in).format("MMM D, YYYY h:mm A") : '&#8212;';
-			var dateCreated  = moment.unix(_accountList[i].date_created).format("MMM D, YYYY");
-			html += '<tr data-account-id="' + _accountList[i].account_id + '">' +
-					'<td>' + _accountList[i].account_id + '</td>' +
-					'<td>' + _accountList[i].first_name + '</td>' +
-					'<td>' + _accountList[i].last_name + '</td>' +
-					'<td><a href="mailto:' + _accountList[i].email + '">' + _accountList[i].email + '</a></td>' +
-					'<td align="center">' + _accountList[i].num_rows_generated + '</td>' +
-					'<td>' + lastLoggedIn  + '</td>' +
-					'<td>' + dateCreated + '</td>' +
-					'<td class="gdEditAccount"><a href="#"></a></td>' +
-					'<td class="gdDeleteAccount"><a href="#"></a></td>' +
-				'</tr>';
-		}
-
-		$("#gdAccountList tbody").html(html);
-		$("#gdAccountList").removeClass("hidden");
-
-		if (_accountList.length === 0) {
-			$("#gdAccountListEmpty").removeClass("hidden");
-			$("#gdAccountListNonEmpty").addClass("hidden");
-		} else {
-			$("#gdAccountListEmpty").addClass("hidden");
-			$("#gdAccountListNonEmpty").removeClass("hidden");
-		}
-
-		$("#gdNumUserAccounts").html("<b>(" + _accountList.length + ")</b>");
-
-		if (!_userTableCreated) {
-			$(".tablesorter").tablesorter({
-				widgets: ["zebra", "columns"],
-				theme:   "default"
-			});
-			_userTableCreated = true;
-		} else {
-			$(".tablesorter").trigger("update");
-		}
-	};
-
-	var _openCreateAccountDialog = function() {
-		$("#gdManageAccount_pwdCreate,#gdManageAccountDialogEmailRow").removeClass("hidden");
-		$("#gdManageAccount_pwdEdit").addClass("hidden");
-		_regeneratePassword();
-
-		$("#gdManageAccount_firstName,#gdManageAccount_lastName,#gdManageAccount_email").val("");
-		$("#" + _manageAccountModalID).dialog({
-			title: L.create_account,
-			modal: true,
-			width: 600,
-			open: function() { utils.insertModalSpinner({ modalID: _manageAccountModalID }); },
-			buttons: [
-				{
-					text: L.create_account,
-					click: _onClickCreateAccount
-				},
-				{
-					text: L.close,
-					click: function() { $(this).dialog("close"); }
-				}
-			]
-		});
-	};
-
-	var _regeneratePassword = function() {
-		$("#gdManageAccount_password").val(utils.generateRandomAlphaNumericStr(8));
-	};
-
-	var _onChangeTab = function(message) {
-		if (message.newTab == 2) {
-			$(".tablesorter").trigger("update");
-		}
-	};
-
-	// register our module
-	manager.registerCoreModule(MODULE_ID, {
-		run: _run
-	});
-
-	return {
-		run: _run
-	};
-});
diff --git a/resources/scripts/constants.php b/resources/scripts/constants.php
deleted file mode 100644
index 9e269ba23..000000000
--- a/resources/scripts/constants.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-require_once(realpath(dirname(__FILE__) . "/../../library.php"));
-Core::init();
-
-header("Cache-control: private");
-header("Cache-Control: no-cache, must-revalidate");
-header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
-header("Content-type: application/x-javascript");
-?>
-/**
- * Constants used by the client-side code.
- */
-define([], function() {
-
-	var CONSTANTS = {
-
-		/**
-		 * Contains various options for debugging.
-		 */
-		DEBUGGING: {
-			CONSOLE_WARN: <?php Settings::safeDisplaySetting("consoleWarnings"); ?>,
-			LIST_PUBLISH_EVENTS: <?php Settings::safeDisplaySetting("consoleEventsPublish"); ?>,
-			LIST_SUBSCRIBE_EVENTS: <?php Settings::safeDisplaySetting("consoleEventsSubscribe"); ?>,
-			LIST_CORE_EVENTS: <?php Settings::safeDisplaySetting("consoleCoreEvents"); ?>,
-			LIMIT_DATA_TYPE_EVENTS: "<?php Settings::safeDisplaySetting("consoleEventsDataTypePlugins") ?>",
-			LIMIT_EXPORT_TYPE_EVENTS: "<?php Settings::safeDisplaySetting("consoleEventsExportTypePlugins") ?>"
-		},
-
-		SETTINGS: {
-			ANON_USER_PERMISSION_DENIED_MSG: "<?php Settings::safeDisplaySetting("anonymousUserPermissionDeniedMsg"); ?>"
-		},
-
-		/**
-		 * List of component types.
-		 */
-		COMPONENT: {
-			DATA_TYPE: 'data-type',
-			EXPORT_TYPE: 'export-type',
-			CORE: 'core'
-		},
-
-		EXPORT_TYPE_SETTINGS_BLIND_SPEED: 500,
-
-		GENERATE_IN_PAGE_BATCH_SIZE: 100,
-
-		MAX_GENERATED_ROWS: <?php echo Core::getMaxGeneratedRows(); ?>,
-
-		DEMO_MODE: <?php echo Core::checkDemoMode(); ?>,
-
-		THEME: "<?php Settings::safeDisplaySetting("theme") ?>",
-
-		/**
-		 * Contains all Core events.
-		 */
-		EVENT: {
-            APP_START: 'app-start',
-			RESULT_TYPE: {
-				CHANGE: "event-result-type-change"
-			},
-			COUNTRIES: {
-				CHANGE: "event-countries-change"
-			},
-			DATA_TYPE: {
-				CHANGE: "event-data-type-change"
-			},
-			DATA_TABLE: {
-				ONLOAD_READY: "event-data-table-onload-ready",
-				ROW: {
-					CHECK_TO_DELETE: "event-data-table-check-row-to-delete",
-					UNCHECK_TO_DELETE: "event-data-table-uncheck-row-to-delete",
-					TYPE_CHANGE: 'event-data-table-row-type-change',
-					EXAMPLE_CHANGE: 'event-data-table-row-example-change',
-					DELETE: "event-data-table-row-delete",
-					ADD: "event-data-table-row-add",
-					RE_SORT: "event-data-table-row-sort",
-					HELP_DIALOG_OPEN: "event-data-table-help-dialog-open",
-					HELP_DIALOG_CLOSE: "event-data-table-help-dialog-close"
-				},
-				CLEAR: "event-data-table-clear"
-			},
-			GENERATE: "event-generate",
-			IO: {
-				SAVE: "event-io-save",
-				LOAD: "event-io-load"
-			},
-			TAB: {
-				CHANGE: "event-tab-change"
-			},
-			MODULE: {
-				REGISTER: "event-module-register",
-				UNREGISTER: "event-module-unregister"
-			},
-			ACCOUNT: {
-				LOGGED_IN: "event-account-logged-in",
-				AVAILABLE: "event-account-available"
-			}
-		},
-
-		ERROR_CODES: {
-			ACCOUNT_ALREADY_EXISTS: <?php echo ErrorCodes::ACCOUNT_ALREADY_EXISTS; ?>,
-			NOT_LOGGED_IN: <?php echo ErrorCodes::NOT_LOGGED_IN ?>,
-			NON_ADMIN: <?php echo ErrorCodes::NON_ADMIN ?>
-		}
-	}
-
-	return CONSTANTS;
-});
diff --git a/resources/scripts/generator.js b/resources/scripts/generator.js
deleted file mode 100755
index f1eb53bf8..000000000
--- a/resources/scripts/generator.js
+++ /dev/null
@@ -1,2119 +0,0 @@
-/*global $:false,CodeMirror:false,console:false,define:false,require:false*/
-define([
-	"manager",
-	"pluginManager",
-	"utils",
-	"queue",
-	"constants",
-	"lang",
-	"moment"
-], function(manager, pluginManager, utils, Queue, C, L, moment) {
-
-	"use strict";
-
-	/**
-	 * @name Generator
-	 * @see Core
-	 * @description This file contains the core client-side code for the Data Generator. It initializes the default
-	 * functionality of the generator page, subscribes to and publishes all the appropriate Core events and
-	 * offers a few public functions for use by any plugins running custom JS code.
-	 * @author Ben Keen
-	 * @return {Object}
-	 * @namespace
-	 */
-
-	var MODULE_ID = "core-generator";
-
-	var _numRows = 0;
-	var _numRowsToShowOnStart = 4;
-	var _countries = [];
-	var _currExportType = null; // populated onload
-	var _showExportTypeSettings = true;
-	var _codeMirror = null;
-	var _lastSelectedDataType = null;
-	var _isHighlightingDeleteRow;
-
-	// the number of results being generated
-	var _numRowsToGenerate;
-
-	// for storing data during in-page data generation
-	var _generateInPageRunningCount;
-	var _generateInPageBatchNum;
-	var _generateInPageData;
-	var _generateInPageContent = "";
-	var _isGenerating = false;
-	var _generationCancelled = false;
-	var _currHelpDialogTab = 1;
-	var _currLoginDialogTab = 1;
-	var _currDataTypeHelp = null;
-
-	// accounts
-	var _isLoggedIn = null;
-	var _isLoaded = false;
-	var _accountInfo = null;
-	var _dataSets = [];
-	var _currConfigurationID = null;
-	var _loginModalID = "gdLoginDialog";
-
-
-	/**
-	 * Called when everything is loaded. This binds the appropriate event handlers and sets up the
-	 * page.
-	 */
-	var _run = function() {
-
-		// retrieve the data sets for the current user
-		if ($("body").data("loggedIn")) {
-			utils.startProcessing();
-			_isLoggedIn = true;
-			_getAccount();
-		} else {
-			_isLoggedIn = false;
-			$("#gdMainDialogTabs ul").hide();
-			$("#gdDataSetStatusLine,#gdProcessingIcon").hide();
-		}
-
-		$("#gdDataSetName").focus();
-		$("#gdCountries").chosen().change(_updateCountryChoice);
-		$("#gdRegenerateButton").on("click", _generateData);
-		$("#gdBackButton").on("click", _onClickBackButton);
-
-		$("#gdShowSettingsLink").bind("click", function() {
-			if (_showExportTypeSettings) {
-				_hideExportTypeSettingsSection();
-			} else {
-				_showExportTypeSettingsSection(_currExportType);
-			}
-			return false;
-		});
-
-		// each event is handled separately to ensure that the Change Data Type event isn't unnecessarily
-		// republished. Only really an issue on Firefox, which publishes keyup and change events when
-		// changing the selected option via the keyboard (up and down). It also allows us to tab off the field
-		// into whatever field is displayed next.
-        var $tableRows = $("#gdTableRows");
-        $tableRows.on("change keyup", ".gdDataType", _onChangeDataType);
-        $tableRows.on("focus", ".gdDataType", _onFocusDataType);
-        $tableRows.on("change", ".gdDeleteRows", _markRowToDelete);
-        $tableRows.on("change", ".gdColExamples select", _publishExampleChange);
-
-        $tableRows.sortable({
-			handle: ".gdColOrder",
-			axis: "y",
-			update: function(event, ui) {
-				_updateVisibleRowNums();
-				manager.publish({
-					sender: MODULE_ID,
-					type: C.EVENT.DATA_TABLE.ROW.RE_SORT,
-					row: ui.item
-				});
-			}
-		});
-
-		$(document).on("click", ".gdMessageClose", function(e) {
-			$(e.target).closest(".gdMessage").hide("blind", null, 500);
-			return false;
-		});
-
-		$("#gdData").bind("submit", _generateData);
-		$("#gdExportTypeTabs>ul>li").bind("click", function(e) {
-			_selectExportTypeTab($(e.target).data("exportType"));
-		});
-
-		$(".gdAddRowsBtn").bind("click", function() { _addRows($("#gdNumRowsToAdd").val()); });
-		$(".gdDeleteRowsBtn").bind("click", _deleteRows);
-		$("#gdResetPluginsBtn").bind("click", _resetPluginsDialog);
-		$("#gdTextSize").on("click", "li", _changeTextSize);
-		$("#gdGenerationPanelCancel").on("click", _cancelGeneration);
-		$("#gdDataSetPublic").on("click", _toggleDataSetVisibilityStatus);
-		$("#gdSettingsForm").on("submit", _submitSettingsForm);
-		$("#gdNumRowsToGenerate").on("click", _onClickNumRowsField);
-		$("input[name=gdExportTarget]").on("change", _onChangeExportTarget);
-
-		// icon actions
-		$("#gdSaveBtn").on("click", _onClickSaveButton);
-		$("#gdSaveDataSet").on("click", _saveDataSet);
-		$("#gdEmptyForm").on("click", _emptyForm);
-		$("#gdDataSetLink").on("click", _openDataSetLinkDialog);
-
-		// main dialog
-		$("#gdLogout").on("click", function() { return _logout(); });
-		$("#gdUserAccount").on("click", _onClickUserAccountLink);
-		$("#gdLogin").on("click", _onClickLoginLink);
-		$("#gdLoadLink").on("click", _onClickLoadDataSetIcon);
-
-        var $accountDataSets = $("#gdAccountDataSets");
-        $accountDataSets.on("click", "a", _onClickLoadDataSet);
-        $accountDataSets.on("change", ".gdSelectDataSets", _onChangeCheckDataSet);
-        $accountDataSets.on("click", _onClickToggleDeleteRow);
-		$(".gdDeleteDataSetsBtn").bind("click", _confirmDeleteDataSets);
-		$("#gdDataSetHelpNav").on("click", "a", _onclickDataTypeHelpNav);
-        $tableRows.on("click", ".ui-icon-help", _onClickDataSetRowHelp);
-		$("#gdSelectAllDataSets").on("click", _onToggleSelectAllDataSets);
-		$("#gdDataSetStatusLine").html(L.not_saved);
-		$("#gdMainDialog").on("click", ".gdDataSetStatus", _onToggleSaveDataSetVisibilityStatus);
-		$("#gdUpdateAccountInfo").on("click", _updateAccountInfo);
-
-		_initMainDialog();
-		_initLoginDialog();
-		_initExportTypeTab();
-		_updateCountryChoice();
-		_addRows(_numRowsToShowOnStart);
-		_initInPageCodeMirror();
-		_initTooltips();
-
-		// finally, if the URL contains a Data Set ID, request it from the server
-		var loadDataSetID = utils.getParamByName("load");
-		if (loadDataSetID !== null && /^\d+$/.test(loadDataSetID)) {
-			_getPublicDataSet(loadDataSetID);
-		}
-	};
-
-
-	var _onClickNumRowsField = function() {
-		if (!_isLoggedIn) {
-			_showPermissionDeniedDialog(L.cannot_change_num_rows);
-		}
-	};
-
-	var _getPublicDataSet = function(dataSetID) {
-		utils.startProcessing();
-		$.ajax({
-			url:  "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: "getPublicDataSet",
-				dataSetID: dataSetID
-			}
-		}).then(
-			function(response) {
-				if (response.success) {
-					_loadDataSet(response.content);
-				} else {
-					// TODO
-				}
-			},
-
-			function() {
-				utils.stopProcessing();
-			}
-		);
-	};
-
-	/**
-	 * Called when the user clicks the "LOAD" link for a particular data set. This queries the account Manager
-	 * to retrieve the data set, and then displays the information in the page.
-	 */
-	var _onClickLoadDataSet = function(e) {
-		e.preventDefault();
-		var configurationID = $(e.target).closest("tr").data("id");
-		var dataSet = _getConfiguration(configurationID);
-		_loadDataSet(dataSet);
-	};
-
-	var _onClickLoadDataSetIcon = function(e) {
-		e.preventDefault();
-		if (_isLoggedIn) {
-			_openMainDialog({ tab: 2 });
-		} else {
-			_showPermissionDeniedDialog();
-		}
-	};
-
-	var _onChangeExportTarget = function(e) {
-		_handleZipOption();
-	};
-
-	var _onClickUserAccountLink = function(e) {
-		e.preventDefault();
-		_openMainDialog({ tab: 1 });
-	};
-
-	var _onClickLoginLink = function(e) {
-		e.preventDefault();
-		_openLoginDialog();
-	};
-
-	var _loadDataSet = function(configuration) {
-		utils.startProcessing();
-
-		var json = $.evalJSON(configuration.content);
-		var numRows = json.hasOwnProperty("dataTypes") ? json.dataTypes.length : _numRowsToShowOnStart;
-
-		// clear the form
-		_clearForm(numRows);
-
-		// now the form's been cleared, store the new configuration ID. We stash it in the page so that it's
-		// sent along for the
-		_currConfigurationID = configuration.configuration_id;
-		$("#configurationID").val(_currConfigurationID);
-
-		// now start populating the page
-		$("#gdDataSetName").val(configuration.configuration_name);
-		$("#gdNumRowsToGenerate").val(json.numResults);
-		$("input[name=gdExportTarget]").each(function() {
-			if (this.value === json.exportTarget) {
-				this.checked = true;
-			}
-		});
-
-		_updateCountries(json.countries);
-
-		// update the Export Types section
-		_selectExportTypeTab(json.selectedExportType, true);
-		manager.loadExportType(json.selectedExportType, json.exportTypes);
-
-
-		// now populate the rows. Do everything that we can: create the rows, populate the titles & select
-		// the data type. The remaining fields are custom to the data type, so we leave them to their
-		// .loadData function (if defined)
-		if (json.hasOwnProperty("dataTypes")) {
-			var numDataTypeRows = json.dataTypes.length;
-			var orderedRowIDs = _getRowOrder();
-
-			var data = [];
-			for (var i=0; i<numDataTypeRows; i++) {
-				var currDataType = json.dataTypes[i];
-				var currRowID = orderedRowIDs[i];
-				$("#gdTitle_" + currRowID).val(currDataType.title);
-				$("#gdDataType_" + currRowID).val(currDataType.dataType);
-				_publishDataTypeChange($("#gdDataType_" + currRowID)[0]);
-
-				currDataType.rowID = currRowID;
-				data.push(currDataType);
-			}
-
-			manager.loadDataTypeRows(data);
-		}
-
-		// update the status line
-		var lastUpdated = moment.unix(configuration.last_updated_unix).format("h:mm A, MMM Do YYYY");
-		$("#gdDataSetStatusLine").html(L.last_edited + " " + lastUpdated);
-
-		utils.stopProcessing();
-		_closeMainDialog();
-
-		_handleZipOption();
-
-		// publish the IO LOAD event
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.IO.LOAD
-		});
-	};
-
-
-	var _updateCountries = function(countries) {
-		$("#gdCountries option").each(function() {
-			if ($.inArray(this.value, countries) != -1) {
-				this.selected = true;
-			} else {
-				this.selected = false;
-			}
-		});
-		$("#gdCountries").trigger("liszt:updated");
-		_updateCountryChoice();
-	};
-
-
-	var _showSubtab = function(tab) {
-		if (tab == 1) {
-			$("#gdGenerateSubtab1").show();
-			$("#gdGenerateSubtab2").hide();
-			$("#gdEmptyForm,#gdLoadLink").show();
-		} else {
-			$("#gdGenerateSubtab1").hide();
-			$("#gdGenerateSubtab2").show();
-			$("#gdEmptyForm,#gdLoadLink").hide();
-		}
-		return false;
-	};
-
-
-	/**
-	 * Called when the user clicks the save icon. This intelligently decides how to save the information,
-	 * based on whether it's a totally new data set, or if the user had loaded one already.
-	 */
-	var _onClickSaveButton = function() {
-		if (!_isLoggedIn) {
-			_showPermissionDeniedDialog();
-		} else if (C.DEMO_MODE) {
-			_showDemoOnlyDialog();
-		} else {
-			if (_currConfigurationID === null) {
-				_saveDataSet();
-			} else {
-				// confirmation...?
-				_saveDataSet();
-			}
-		}
-
-		return false;
-	};
-
-
-	/**
-	 * Serializes the current data set and passes it over to the Account Manager to actually save.
-	 */
-	var _saveDataSet = function() {
-		var newDataSetName = $("#gdDataSetName").val();
-
-		// if there's no Data Set name provided, briefly highlight the field to draw attention to it
-		// and halt the process
-		if (!newDataSetName) {
-			$("#gdDataSetName").css({
-				backgroundColor: "#770000",
-				borderTopColor: "#550000",
-				borderLeftColor: "#550000",
-				borderBottomColor: "#550000"
-			}).animate({
-				backgroundColor: "#ffffff",
-				borderTopColor: "#cccccc",
-				borderLeftColor: "#cccccc",
-				borderBottomColor: "#cccccc"
-			}, 1500);
-			return false;
-		}
-
-		var rowData = [];
-		var orderedRowIDs = _getRowOrder();
-		for (var i=0; i<orderedRowIDs.length; i++) {
-			var rowNum  = orderedRowIDs[i];
-			var rowDataType = $("#gdDataType_" + rowNum).val();
-			if (rowDataType === "") {
-				continue;
-			}
-
-			rowData.push({
-				title: $("#gdTitle_" + rowNum).val(),
-				dataType: rowDataType,
-				data: manager.serializeDataTypeRow(rowDataType, rowNum)
-			});
-		}
-
-		var configuration = {
-			action: "saveConfiguration",
-			dataSetName: newDataSetName,
-			exportTarget: _getExportTarget(),
-			numResults: _getNumRowsToGenerate(),
-			countries: _countries,
-			dataTypes: rowData,
-			exportTypes: manager.serializeExportTypes(),
-			selectedExportType: _currExportType
-		};
-
-		if (_currConfigurationID !== null) {
-			configuration.configurationID = _currConfigurationID;
-		}
-
-		utils.startProcessing();
-		$.ajax({
-			url:  "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: configuration
-		}).then(
-			function(response) {
-				if (response.success) {
-					_currConfigurationID = response.content;
-					var lastUpdated = moment.unix(response.lastUpdated).format("h:mm A, MMM Do YYYY");
-					$("#gdDataSetStatusLine").html(L.last_saved + " " + lastUpdated).css("color", "#7fbcf8").animate({ color: "#666666" }, 1400);
-					_getAccount();
-				} else {
-					// TODO
-				}
-			},
-			function() {
-				// alert(L.fatal_error);
-				// gd.stopProcessing();
-			}
-		);
-	};
-
-	var _addRows = function(rows) {
-		rows = rows.toString();
-		if (rows.match(/\D/) || rows === 0 || rows === "") {
-			utils.clearValidationErrors($("#gdMainTab1Content"));
-			utils.addValidationErrors({ els: [$("#gdNumRowsToAdd")], error: L.no_num_rows });
-			utils.displayValidationErrors("#gdMessages");
-			return false;
-		}
-
-		var rowIDs = [];
-		var numRowsToAdd = parseInt(rows, 10);
-		for (var i=1; i<=numRowsToAdd; i++) {
-			var currRow = ++_numRows;
-			rowIDs.push(currRow);
-			var newRowHTML = $("#gdTableRowTemplate").html().replace(/%ROW%/g, currRow);
-			$("#gdTableRows").append('<li class="gdTableRow" id="row_' + currRow + '">' + newRowHTML + '</li>');
-		}
-
-		_updateVisibleRowNums();
-
-		// curious! This is done to force Chrome to do a redraw/repaint after adding rows
-		$("body").addClass("forceRedraw").removeClass("forceRedraw");
-
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.DATA_TABLE.ROW.ADD,
-			numRows: rows,
-			rowIDs: rowIDs
-		});
-	};
-
-
-	/**
-	 * This is called when the user actually clicks one of the DEL buttons, deleting those rows marked
-	 * as deleted.
-	 *
-	 * @function
-	 * @private
-	 */
-	var _deleteRows = function() {
-		var rowIDs = [];
-		$(".gdDeleteRows:checked").each(function() {
-			var row = $(this).closest(".gdTableRow");
-			var parentRowID = row.attr("id");
-			if (parentRowID !== null) {
-				var rowID = parseInt(parentRowID.replace(/row_/g, ""), 10);
-				row.remove();
-				rowIDs.push(rowID);
-			}
-		});
-
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.DATA_TABLE.ROW.DELETE,
-			rowIDs: rowIDs
-		});
-
-		_updateVisibleRowNums();
-	};
-
-	var _updateVisibleRowNums = function() {
-		$("#gdTableRows>li .gdColOrder").each(function(i) { $(this).html(i+1); });
-	};
-
-	var _markRowToDelete = function(e) {
-		var el = e.target;
-		var event = null;
-		var tr = $(el).closest(".gdTableRow");
-
-		if (el.checked) {
-			_isHighlightingDeleteRow = true;
-			tr.addClass("gdDeletedRow").effect("highlight", { color: "#cc0000" }, 1000);
-			event = C.EVENT.DATA_TABLE.ROW.CHECK_TO_DELETE;
-		} else {
-			if (_isHighlightingDeleteRow) {
-				tr.stop(true, true);
-			}
-			tr.removeClass("gdDeletedRow");
-			event = C.EVENT.DATA_TABLE.ROW.UNCHECK_TO_DELETE;
-			_isHighlightingDeleteRow = false;
-		}
-		manager.publish({
-			sender: MODULE_ID,
-			type: event,
-			row: el
-		});
-	};
-
-	/**
-	 * Resets the entire page back to its defaults: default countries, a blank table and the default data
-	 * format. The optional object param lets you optionally display a confirmation modal and reset the
-	 * the table to the default num of rows.
-	 * @function
-	 * @private
-	 * @name#Generator
-	 */
-	var _emptyForm = function(settings) {
-		var opts = $.extend({
-			requireConfirmation: true,
-			numRows: _numRowsToShowOnStart
-		}, settings);
-
-		if (opts.requireConfirmation) {
-			$("#gdEmptyFormDialog").html("<p>" + L.confirm_empty_form + "</p>").dialog({
-				title: L.please_confirm,
-				modal: true,
-				width: 400,
-				buttons: [
-					{
-						text: L.yes,
-						click: function() {
-							_clearForm(opts.numRows);
-							$(this).dialog("close");
-						}
-					},
-					{
-						text: L.no,
-						click: function() {
-							$(this).dialog("close");
-						}
-					}
-				]
-			});
-		} else {
-			_clearForm(opts.numRows);
-		}
-
-	};
-
-	var _clearForm = function(numDefaultRows) {
-		$("#gdDataSetName").val("");
-
-		// reset the countries
-		_updateCountries([]);
-
-		// remove the rows
-		$("#gdTableRows .gdDeleteRows").attr("checked", "checked");
-		_deleteRows();
-		_addRows(numDefaultRows);
-
-		_currConfigurationID = null;
-
-		// set the default Export Type
-		_selectExportTypeTab($(".gdDefaultExportType").data("exportType"), true);
-		manager.resetExportTypes();
-
-		$("#gdDataSetStatusLine").html(L.not_saved);
-
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.DATA_TABLE.CLEAR
-		});
-	};
-
-	/**
-	 * Called whenever the user selects or deselects a Country. If any modules need to do
-	 * anything special, they can subscribe to the appropriate event.
-	 */
-	var _updateCountryChoice = function() {
-		_countries.length = 0;
-		$("#gdCountries option").each(function() {
-			if (this.selected) {
-				_countries.push(this.value);
-			}
-		});
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.COUNTRIES.CHANGE,
-			countries: _countries
-		});
-	};
-
-	var _initExportTypeTab = function() {
-		var newExportType = $("#gdExportTypeTabs li.gdSelected").data("exportType");
-		_selectExportTypeTab(newExportType);
-	};
-
-
-	/**
-	 * Called whenever the user changes the result type (XML, HTML, CSV etc). This function publishes
-	 * the appropriate event in case a plugin needs to be aware of the event, but it handles the
-	 * hiding/showing and changing of the title column label "out-the-box" rather than force
-	 * the Export Type modules to have to do the work.
-	 */
-	var _selectExportTypeTab = function(newExportType, showImmediately) {
-		if (newExportType === _currExportType) {
-			return;
-		}
-
-		if (_currExportType !== null) {
-			$("#gdExportTypeTabs>ul>li").removeClass("gdSelected");
-			$("#gdExportType_" + newExportType).addClass("gdSelected");
-		}
-
-		// always reset the column heading to the default "Column Title". Export Types have the option
-		// to overwrite it through the publish event below
-		$("#gdColTitleTop,#gdColTitleBottom").html(L.row_label);
-
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.RESULT_TYPE.CHANGE,
-			newExportType: newExportType,
-			oldExportType: _currExportType
-		});
-
-		// hide and show the appropriate Export Type additional settings section (if the + showdata format options link
-		// has been clicked)
-		if (_showExportTypeSettings) {
-			_showExportTypeSettingsSection(newExportType, showImmediately);
-		}
-
-		// now enable/disable the available export targets
-		var exportTargets = $("#gdExportType_" + newExportType).data("compatibleExportTargets").split(",");
-		$("input[name=gdExportTarget]").attr("disabled", "disabled");
-		$("#gdGenerateSection label").addClass("gdDisabled");
-		var firstNonDisabledExportTarget = null;
-		for (var i=0; i<exportTargets.length; i++) {
-			$("#gdExportTarget_" + exportTargets[i]).removeAttr("disabled");
-			$("#gdExportTarget_" + exportTargets[i] + "_label").removeClass("gdDisabled");
-			if (firstNonDisabledExportTarget === null) {
-				firstNonDisabledExportTarget = exportTargets[i];
-			}
-		}
-
-		// now, if the current selected export target is disabled, reset it to the first available non-disabled option
-		var sel = $("input[name=gdExportTarget]:checked:disabled");
-		if (sel.length) {
-			$("#gdExportTarget_" + firstNonDisabledExportTarget).attr("checked", "checked");
-		}
-		_handleZipOption();
-
-		_currExportType = newExportType;
-	};
-
-	// only enable the Zip checkbox if the Prompt to Download export target is selected
-	var _handleZipOption = function() {
-		var selectedTarget = $("input[name=gdExportTarget]:checked").val();
-		if (selectedTarget === "promptDownload") {
-			$("#gdExportTarget_promptDownload_zip").removeAttr("disabled");
-			$("#gdExportTarget_promptDownload_zip_label").removeClass("gdDisabled");
-		} else {
-			$("#gdExportTarget_promptDownload_zip").attr("disabled", "disabled");
-			$("#gdExportTarget_promptDownload_zip_label").addClass("gdDisabled");
-		}
-	};
-
-	var _showExportTypeSettingsSection = function(newExportType, showImmediately) {
-		if ($("#gdExportTypeAdditionalSettings_" + _currExportType).length > 0 && _showExportTypeSettings) {
-			if (showImmediately === true) {
-				$("#gdExportTypeAdditionalSettings_" + _currExportType).hide();
-			} else {
-				$("#gdExportTypeAdditionalSettings_" + _currExportType).hide("blind", C.EXPORT_TYPE_SETTINGS_BLIND_SPEED);
-			}
-		}
-		if (_currExportType === null || showImmediately === true) {
-			$("#gdExportTypeAdditionalSettings_" + newExportType).show();
-		} else {
-			$("#gdExportTypeAdditionalSettings_" + newExportType).show(
-				"blind",
-				C.EXPORT_TYPE_SETTINGS_BLIND_SPEED,
-				function() {
-					_showExportTypeSettings = true;
-					$("#gdShowSettingsLink span").html("-");
-					$("#gdShowSettingsLink a").html(L.hide_data_format_options);
-				}
-			);
-		}
-	};
-
-	var _hideExportTypeSettingsSection = function() {
-		$("#gdExportTypeAdditionalSettings_" + _currExportType).hide(
-			"blind",
-			C.EXPORT_TYPE_SETTINGS_BLIND_SPEED,
-			function() {
-				_showExportTypeSettings = false;
-				$("#gdShowSettingsLink span").html("+");
-				$("#gdShowSettingsLink a").html(L.show_data_format_options);
-			}
-		);
-	};
-
-	var _publishExampleChange = function(e) {
-		var select = e.target;
-		var rowElement = $(select).closest(".gdTableRow");
-		var rowID = parseInt($(rowElement).attr("id").replace(/^row_/, ""), 10);
-		var dataTypeFolder = $(rowElement).find(".gdDataType").val();
-
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.DATA_TABLE.ROW.EXAMPLE_CHANGE + "__" + dataTypeFolder,
-			rowID: rowID,
-			value: select.value
-		});
-	};
-
-	/**
-	 * Called whenever the user focuses on a Row Type. This makes a note of the last selected
-	 * Data Type, to prevent unnecessary re-publishing of (non-)changed data types.
-	 */
-	var _onFocusDataType = function(e) {
-		_lastSelectedDataType = e.target.value;
-	};
-
-	/**
-	 * Called when the user changes the Data Type for a particular row.
-	 */
-	var _onChangeDataType = function(e) {
-		if (e.target.value != _lastSelectedDataType) {
-			_publishDataTypeChange(e.target);
-		}
-	};
-
-	var _publishDataTypeChange = function(el) {
-		var rowID = parseInt($(el).attr("id").replace(/^gdDataType_/, ""), 10);
-		var dataTypeModuleID = el.value;
-
-		// make a note of the last value
-		_lastSelectedDataType = dataTypeModuleID;
-
-		// if the user just selected the empty value ("Please Select"), clear everything
-		if (dataTypeModuleID === "") {
-			$('#gdColExamples_' + rowID + ',#gdColOptions_' + rowID + ',#gdColHelp_' + rowID).html("");
-			return;
-		}
-
-		// update the example + options divs
-		var exampleHTML = null;
-		var optionsHTML = null;
-		var dataTypeExampleHTML = $("#gdDataTypeExamples_" + dataTypeModuleID).html();
-		if (dataTypeExampleHTML !== "") {
-			exampleHTML = dataTypeExampleHTML.replace(/%ROW%/g, rowID);
-		} else {
-			exampleHTML = "&nbsp;" + L.no_examples_available;
-		}
-		$("#gdColExamples_" + rowID).html(exampleHTML);
-
-		var dataTypeOptionHTML = $("#gdDataTypeOptions_" + dataTypeModuleID).html();
-		if (dataTypeOptionHTML !== "") {
-			optionsHTML = dataTypeOptionHTML.replace(/%ROW%/g, rowID);
-		} else {
-			optionsHTML = L.no_options_available;
-		}
-		$("#gdColOptions_" + rowID).html(optionsHTML);
-
-		if ($("#gdDataTypeHelp_" + dataTypeModuleID).html() !== "") {
-			$('#gdColHelp_' + rowID).html($("#gdHelpIcon").html().replace(/%ROW%/g, rowID));
-		} else {
-			$('#gdColHelp_' + rowID).html(" ");
-		}
-
-		// now publish the row change
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.DATA_TABLE.ROW.TYPE_CHANGE,
-			rowID: rowID,
-			dataTypeModuleID: dataTypeModuleID
-		});
-	};
-
-
-	var _getRowOrder = function() {
-		var orderedRowIDs = $("#gdTableRows").sortable("toArray");
-		var sortedOrder = [];
-		for (var i=0; i<orderedRowIDs.length; i++) {
-			var row = orderedRowIDs[i].replace(/row_/g, "");
-			sortedOrder.push(row);
-		}
-		return sortedOrder;
-	};
-
-
-	/**
-	 * Called when the user submits the main Generate tab. It performs all necessary validation
-	 * and starts the data generation process.
-	 */
-	var _generateData = function(e) {
-
-        // TODO pretty poor. Validation should be performed on this var prior to setting it in the private var
-        _numRowsToGenerate = _getNumRowsToGenerate()
-        utils.clearValidationErrors($("#gdMainTab1Content"));
-
-		// check the users specified a numeric value for the number of results
-		if (_numRowsToGenerate.match(/\D/) || _numRowsToGenerate === 0 || _numRowsToGenerate === "") {
-			utils.addValidationErrors({ els: $("#gdNumRowsToGenerate"), error: L.invalid_num_results });
-		}
-
-		var orderedRowIDs = _getRowOrder();
-		var validRowIDs = [];
-
-		// look through the form and construct an object of data-type-folder => [row IDs] to
-		// pass to the manager. The manager uses that to farm out the actual validation work
-		// to the appropriate module
-		var rowValidationNeededGroupByDataType = {};
-		for (var i=0; i<orderedRowIDs.length; i++) {
-			var rowID = orderedRowIDs[i];
-			var currRowType = $("#gdDataType_" + rowID).val();
-
-			// ignore empty rows, they don't need validating
-			if (currRowType === "") {
-				continue;
-			}
-			if (!rowValidationNeededGroupByDataType.hasOwnProperty(currRowType)) {
-				rowValidationNeededGroupByDataType[currRowType] = [];
-			}
-			rowValidationNeededGroupByDataType[currRowType].push(rowID);
-			validRowIDs.push(rowID);
-		}
-
-		// if none of the data columns had a selected data type, display an error about that, too
-		if (!validRowIDs.length) {
-			utils.addValidationErrors({ els: null, error: L.no_data });
-		} else {
-			// check all filled-in rows contained something in the first column
-			var rowsMissingTitleEls = [];
-			for (var j=0; j<validRowIDs.length; j++) {
-				var currRowID = validRowIDs[j];
-				var currTitle = $("#gdTitle_" + currRowID);
-				if ($.trim(currTitle.val()) === "") {
-					rowsMissingTitleEls.push(currTitle[0]);
-				}
-			}
-
-			if (rowsMissingTitleEls.length) {
-				var label = L.row_label_plural;
-				if (L.exportTypePlugins[_currExportType].hasOwnProperty("row_label_plural")) {
-					label = L.exportTypePlugins[_currExportType].row_label_plural;
-				}
-				var message = L.please_enter_all + " " + label + ".";
-				utils.addValidationErrors({ els: rowsMissingTitleEls, error: message });
-			}
-		}
-
-		utils.addValidationErrors(manager.validateDataTypes(rowValidationNeededGroupByDataType));
-
-		var exportTypeValidationErrors = manager.validateExportType({ exportType: _currExportType, rows: validRowIDs });
-		if (!$.isArray(exportTypeValidationErrors)) {
-			utils.addValidationErrors({ els: null, error: L.export_type_validate_error });
-		} else {
-			utils.addValidationErrors(exportTypeValidationErrors);
-		}
-
-        // ensure the number of rows is an acceptable number
-        _numRowsToGenerate = parseInt(_numRowsToGenerate, 10);
-        if (_numRowsToGenerate > C.MAX_GENERATED_ROWS) {
-            var msg = L.num_rows_too_large.replace(/%1/, C.MAX_GENERATED_ROWS);
-            utils.addValidationErrors({ els: null, error: msg });
-            $("#gdNumRowsToGenerate").val(C.MAX_GENERATED_ROWS);
-        }
-
-		var errors = utils.getValidationErrors();
-		if (errors.length) {
-			utils.displayValidationErrors("#gdMessages");
-			return false;
-		}
-
-		var exportTarget = _getExportTarget();
-		var rowOrder = _getRowOrder().toString();
-		$("#gdRowOrder").val(rowOrder);
-		$("#gdExportType").val(_currExportType);
-		$("#gdNumCols").val(_numRows);
-
-		// reset CodeMirror (scrollTo not working ...)
-		_codeMirror.setOption("lineWrapping", false);
-		_codeMirror.scrollTo(0, 0);
-		_codeMirror.setValue("");
-
-		// now pass off the work to the appropriate generation function. Each works slightly differently.
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.GENERATE,
-			exportTarget: exportTarget,
-			exportType: _currExportType,
-			editor: _codeMirror
-		});
-
-		// if the messages section is displayed, hide it - whatever old errors are no longer pertinent
-		if ($("#gdMessages").css("display") == "block") {
-			$("#gdMessages .gdMessageClose").trigger("click");
-		}
-
-		// only the inPage choice prevents the default form submit event
-		if (exportTarget == "inPage") {
-			_generateInPage();
-			e.preventDefault();
-		} else if (exportTarget == "newTab") {
-			_generateNewWindow();
-		} else if (exportTarget == "promptDownload") {
-			_generatePromptDownload();
-		}
-	};
-
-
-	/**
-	 * Generate the results in-page. This option hides the generator table and displays the results in a large,
-	 * CodeMirror-enhanced textarea. This is the only generation format that makes use of *batches*: since generation
-	 * can take a long time, this passes off work to the server in batches of (say) 100, so the user can see the
-	 * generation process take place.
-	 */
-	var _generateInPage = function() {
-		var formData = $("#gdData").serialize();
-
-		// "action" added for AjaxRequest only
-		var data = formData + "&action=generateInPage&gdBatchSize=" + C.GENERATE_IN_PAGE_BATCH_SIZE;
-		if (_currConfigurationID !== null) {
-			data += "&configurationID=" + _currConfigurationID;
-		}
-		_showSubtab(2);
-		utils.startProcessing();
-
-		_generateInPageRunningCount = 0;
-		_isGenerating = true;
-		_generationCancelled = false;
-
-		$("#gdGenerateCount").html(utils.formatNumWithCommas(_generateInPageRunningCount));
-		$("#gdGenerateTotal").html(utils.formatNumWithCommas(_numRowsToGenerate));
-		$("#gdProgressMeter").attr("max", _numRowsToGenerate);
-		$("#gdProgressMeter").attr("value", 0);
-
-		_codeMirror.setValue("");
-
-		_generateInPageBatchNum = 1;
-		_generateInPageData = data;
-		_generateInPageContent = "";
-		_generateInPageBatch();
-	};
-
-	var _generateInPageBatch = function() {
-		$("#gdGenerationPanelCancel").removeClass("gdDisabledLink");
-		var data = _generateInPageData + "&gdCurrentBatchNum=" + _generateInPageBatchNum;
-		if (_currConfigurationID !== null) {
-			data += "&configurationID=" + _currConfigurationID;
-		}
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			data: data,
-			dataType: "json",
-			contentType: "application/x-www-form-urlencoded;charset=utf-8",
-			success: _generateInPageBatchResponse,
-			error: function() {
-				_isGenerating = false;
-				utils.stopProcessing();
-			}
-		});
-	};
-
-	var _generateInPageBatchResponse = function(response) {
-		if (response.success) {
-			// 1. Update the running count ("Generated X of Y rows")
-			_generateInPageRunningCount = (_generateInPageRunningCount + C.GENERATE_IN_PAGE_BATCH_SIZE) > _numRowsToGenerate ?
-				_numRowsToGenerate : _generateInPageRunningCount + C.GENERATE_IN_PAGE_BATCH_SIZE;
-			$("#gdGenerateCount").html(utils.formatNumWithCommas(_generateInPageRunningCount));
-			$("#gdProgressMeter").attr("value", _generateInPageRunningCount);
-
-			// 2. Update the actual content
-			_generateInPageContent += response.content;
-			_codeMirror.setValue(_generateInPageContent);
-
-			// check the process hasn't been interrupted
-			if (_generationCancelled) {
-				_isGenerating = false;
-				utils.stopProcessing();
-				$("#gdGenerationPanelCancel").addClass("gdDisabledLink");
-				$("#gdProgressMeter").attr("value", _numRowsToGenerate);
-				return;
-			}
-
-			// now either continue processing, or indicate we're done
-			if (response.isComplete) {
-				_isGenerating = false;
-				utils.stopProcessing();
-				$("#gdGenerationPanelCancel").addClass("gdDisabledLink");
-
-				// update the data in _dataSets
-				if (_currConfigurationID !== null) {
-					_incrementConfigurationRowGenerationCount(_currConfigurationID, _numRowsToGenerate);
-				}
-			} else {
-				_generateInPageBatchNum++;
-				_generateInPageBatch();
-			}
-		} else {
-			_isGenerating = false;
-			utils.stopProcessing();
-			console.warn("response.success fail");
-		}
-	};
-
-	var _incrementConfigurationRowGenerationCount = function(configurationID, numRows) {
-
-		// first, update the actual data set
-		var newNum = "";
-		for (var i=0; i<_dataSets.length; i++) {
-			if (_dataSets[i].configuration_id == configurationID) {
-				var currCount = parseInt(_dataSets[i].num_rows_generated, 10);
-				newNum = currCount + numRows;
-				_dataSets[i].num_rows_generated = newNum;
-			}
-		}
-
-		// second, update the displayed data. This does surgery on the Data Sets tab to just update the one DOM
-		// element rather than redraw everything
-		var rows = $("#gdAccountDataSets tbody tr");
-		for (var j=0; j<rows.length; j++) {
-			if ($(rows[j]).data("id") == configurationID) {
-				$(rows[j]).find(".gdDataSetNumRowsGenerated").html(utils.formatNumWithCommas(newNum));
-			}
-		}
-
-		// this updates the account info tab "total" count
-		_updateAccountInfoTab();
-	};
-
-	var _generateNewWindow = function() {
-		$("#gdData").attr({
-			"target": "blank",
-			"action": "generate.php"
-		});
-		_updateConfigurationRowGenerationCount();
-	};
-
-	var _generatePromptDownload = function() {
-		$("#gdData").attr({
-			"target": "blank",
-			"action": "generate.php"
-		});
-		_updateConfigurationRowGenerationCount();
-	};
-
-	var _updateConfigurationRowGenerationCount = function() {
-		var numRows = parseInt(_getNumRowsToGenerate(), 10);
-		if (_currConfigurationID !== null) {
-			_incrementConfigurationRowGenerationCount(_currConfigurationID, numRows);
-		}
-	};
-
-	var _resetPluginsDialog = function() {
-		$("#gdPluginInstallation").dialog({
-			modal:     true,
-			resizable: true,
-			title:     "Reset Plugins",
-			width:     800,
-			height:    400,
-			open: function() {
-				utils.insertModalSpinner({ modalID: "gdPluginInstallation" });
-				utils.playModalSpinner("gdPluginInstallation");
-				pluginManager.installPlugins({
-					errorHandler: null,
-					onCompleteHandler: function() {
-						utils.pauseModalSpinner("gdPluginInstallation");
-						$("#gdPluginInstallation").dialog("option", "buttons", [
-							{
-								text: L.refresh_page,
-								click: function() {
-									window.location.reload(true); // window.location.replace("index.php?message=plugins_reset#t3");
-								}
-							}
-						]);
-					}
-				});
-			},
-			buttons: [
-				{
-					text: L.close,
-					click: function() {
-						$(this).dialog("close");
-					}
-				}
-			]
-		});
-		return false;
-	};
-
-
-	var _changeTextSize = function(e) {
-		$("#gdTextSize li").removeClass("gdSelected");
-		var size = $(e.target).attr("class");
-		$(e.target).addClass("gdSelected");
-		$("#gdGenerateSubtab2 .CodeMirror").removeClass("CodeMirror_small CodeMirror_medium CodeMirror_large").addClass("CodeMirror_" + size);
-		_codeMirror.refresh();
-	};
-
-	/**
-	 * Called on page load. We always instantiate the codemirror object on the generate in-page. This object is
-	 * passed in the C.EVENT.GENERATE message for export types to mess with (i.e. change the mode).
-	 */
-	var _initInPageCodeMirror = function() {
-		_codeMirror = CodeMirror.fromTextArea($("#gdGeneratedData")[0], {
-			mode: "xml",
-			readOnly: true,
-			lineNumbers: true
-		});
-		$(".CodeMirror").addClass("CodeMirror_medium");
-	};
-
-	var _getExportTarget = function() {
-		return $("input[name=gdExportTarget]:checked").val();
-	};
-
-	var _getNumRowsToGenerate = function() {
-		return $("#gdNumRowsToGenerate").val();
-	};
-
-	var _getVisibleRowOrderByRowNum = function(rowNum) {
-		var rowOrder = _getRowOrder();
-		var visibleRowNum = 1;
-		for (var i=0; i<rowOrder.length; i++) {
-			if (rowOrder[i] == rowNum) {
-				return visibleRowNum;
-			}
-			visibleRowNum++;
-		}
-		return false;
-	};
-
-
-	// main dialog
-
-	var _initMainDialog = function() {
-		$("#gdMainDialogTabs ul li").each(function() {
-			var newTab = parseInt($(this).attr("id").replace(/^gdMainDialogTab/, ""), 10);
-			$(this).bind("click", function() {
-				utils.selectTab({ tabGroup: "dialogTabs", tabIDPrefix: "gdMainDialogTab", newTab: newTab, oldTab: _currHelpDialogTab } );
-				_currHelpDialogTab = newTab;
-
-				if ($("#gdMainDialog").css("display") == "block") {
-					switch (newTab) {
-						case 1:
-							$("#gdMainDialog").dialog("option", "buttons", [{ text: L.close, click: function() { $(this).dialog("close"); } }]);
-							break;
-						case 2:
-							_updateMainDialogDataSetButtons();
-							break;
-						case 3:
-							$("#gdMainDialog").dialog("option", "buttons", [{ text: L.close, click: function() { $(this).dialog("close"); } }]);
-							if (_currDataTypeHelp === null) {
-								var dataTypeItems = $("#gdDataSetHelpNav li").not(".gdDataTypeHeader");
-								_showDataTypeHelp(dataTypeItems[0]);
-							}
-							break;
-					}
-				}
-			});
-		});
-	};
-
-	var _onclickDataTypeHelpNav = function(e) {
-		e.preventDefault();
-		var dataTypeNavItem = $(e.target).closest("li");
-		_showDataTypeHelp(dataTypeNavItem);
-	};
-
-	var _showDataTypeHelp = function(el) {
-		var dataType = $(el).data("module");
-		var link = $(el).find("a");
-
-		$("#gdDataSetHelpNav a").removeClass("gdSelected");
-		$(link).addClass("gdSelected").focus();
-
-		var linkPosition = $(link).position().top;
-		var dialogHeight = $("#gdMainDialogTab3Content").height();
-
-		// if the selected Data Type > the total dialog height, scroll to that point; otherwise
-		// scroll the top
-		var scrollPosition = 0;
-		if (linkPosition + 50 > dialogHeight) { // 50 is to handle the extra space by the tabs
-			scrollPosition = linkPosition;
-		}
-		$("#gdDataSetHelpNav").scrollTop(scrollPosition);
-
-		// set the header to the name of the Data Type
-		$("#gdFocusedDataTypeHeader").html($(link).html());
-
-		if (_currDataTypeHelp !== null) {
-			$("#gdDataTypeHelp_" + _currDataTypeHelp).addClass("hidden");
-		}
-		$("#gdDataTypeHelp_" + dataType).removeClass("hidden");
-		_currDataTypeHelp = dataType;
-	};
-
-
-	var _onClickDataSetRowHelp = function(e) {
-		var row = $(e.target).closest(".gdTableRow");
-		var dataTypeDropdown = row.find(".gdDataType");
-		var choice = dataTypeDropdown.val();
-
-		_openMainDialog({ tab: 3, dataType: choice });
-
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.DATA_TABLE.ROW.HELP_DIALOG_OPEN,
-			rowElement: row
-		});
-	};
-
-
-	var _openMainDialog = function(settings) {
-		var opts = $.extend({
-			tab: 1,
-			dataType: null
-		}, settings);
-
-		// hide/show the appropriate tab
-		$("#gdMainDialogTab" + opts.tab).trigger("click");
-
-		// remove any custom styles
-		$(".gdHelpSection").removeAttr("style");
-
-		// close any messages that are open
-		$("#gdMainDialogTab1Message").hide();
-
-		// open the dialog
-		$("#gdMainDialog").dialog({
-			title: 'generate<span style="color:#48b34d">data</span>.com',
-			dialogClass: "gdMainDialog",
-			width: 800,
-			minHeight: 400,
-			modal: true,
-			resizable: false,
-			buttons: [
-				{
-					text: L.close,
-					click: function() { $(this).dialog("close"); }
-				}
-			]
-		});
-
-		// if required, ensure the appropriate Data Type item is selected. This is done after
-		// the dialog is opened because it needs to set the appropriate offset height of the 
-		// left sidebar to focus on the appropriate Data Type's help link. This can only be computed
-		// after it's been opened
-		if (opts.dataType !== null) {
-			var helpNavEl = ($("#gdDataSetHelpNav li[data-module='" + opts.dataType + "']"))[0];
-			_showDataTypeHelp(helpNavEl);
-		}
-
-		utils.insertModalSpinner({ modalID: "gdMainDialog" });
-
-		if (opts.tab == 2) {
-			_updateMainDialogDataSetButtons();
-		}
-
-		return false;
-	};
-
-	var _closeMainDialog = function() {
-		$("#gdMainDialog").dialog("close");
-	};
-
-	var _onChangeCheckDataSet = function(e) {
-		var el = e.target;
-		_markDataSetRowToDelete(el);
-	};
-
-	var _onClickToggleDeleteRow = function(e) {
-		if ($.inArray(e.target.nodeName.toUpperCase(), ["INPUT", "A"]) !== -1) {
-			return;
-		}
-
-		// reverse the checked-ness of the row
-		var el = $(e.target).closest("tr").find(".gdSelectDataSets");
-		var isChecked = $(e.target).closest("tr").find(".gdSelectDataSets").attr("checked");
-		if (isChecked) {
-			$(el).removeAttr("checked");
-		} else {
-			$(e.target).closest("tr").find(".gdSelectDataSets").attr("checked", "checked");
-		}
-
-		_markDataSetRowToDelete(el[0]);
-	};
-
-	var _markDataSetRowToDelete = function(el) {
-		if (!el) {
-			return;
-		}
-
-		if (el.checked) {
-			$(el).closest("tr").addClass("gdSelectedDataSetRow");
-		} else {
-			$(el).closest("tr").removeClass("gdSelectedDataSetRow");
-		}
-		_updateMainDialogDataSetButtons();
-	};
-
-	var _onToggleSelectAllDataSets = function(e) {
-		var isChecked = e.target.checked;
-		var cbs = $(".gdSelectDataSets");
-		for (var i=0; i<cbs.length; i++) {
-			cbs[i].checked = isChecked;
-			_markDataSetRowToDelete(cbs[i]);
-		}
-		_updateMainDialogDataSetButtons();
-	};
-
-	var _confirmDeleteDataSets = function() {
-	};
-
-	/**
-	 * Called whenever one or more rows is selected / unselected. This checks to see how
-	 * many rows are selected, and hides/shows the delete/copy buttons.
-	 */
-	var _updateMainDialogDataSetButtons = function() {
-		var cbs = $(".gdSelectDataSets:checked");
-		if (cbs.length) {
-
-			var buttons = [];
-
-			// if there's only one row selected, show the Copy Data Set button
-			if (cbs.length === 1) {
-				buttons.push({
-					text: "Copy Data Set",
-					click: function() {
-						var existingDataSet = $(cbs[0]).closest("tr");
-						var existingDataSetId = parseInt(existingDataSet.data("id"), 10);
-						var existingDataSetName = existingDataSet.find(".dataSetName")[0].innerHTML;
-
-						var result = window.prompt(L.please_enter_data_set_name, existingDataSetName);
-						if (result !== null) {
-							_copyDataSet(existingDataSetId, result);
-						}
-					}
-				});
-			}
-
-			var deleteButtonLabel = L.delete_1_data_set;
-			if (cbs.length > 1) {
-				deleteButtonLabel = L.delete_N_data_sets.replace(/%1/, cbs.length);
-			}
-
-			buttons.push({
-				text: deleteButtonLabel,
-				"class": "gdDeleteDataSetsBtn",
-				click: function() {
-					_onClickDeleteDataSets();
-				}
-			});
-
-			buttons.push({
-				text: L.close,
-				click: function() { $(this).dialog("close"); }
-			});
-
-			$("#gdMainDialog").dialog("option", "buttons", buttons);
-		} else {
-			$("#gdMainDialog").dialog("option", "buttons", [{
-				text: L.close,
-				click: function() { $(this).dialog("close"); }
-			}]);
-		}
-	};
-
-	/**
-	 * Makes a copy of an existing Data Set.
-	 * @param dataSetId
-	 * @param newDataSetName
-	 * @private
-	 */
-	var _copyDataSet = function(dataSetId, newDataSetName) {
-		utils.startProcessing();
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "JSON",
-			data: {
-				action: "copyDataSet",
-				dataSetId: dataSetId,
-				newDataSetName: newDataSetName
-			},
-			success: function(response) {
-				_getAccount();
-			},
-			error: _onError
-		});
-	};
-
-
-	var _onClickDeleteDataSets = function() {
-		if (C.DEMO_MODE) {
-			_closeMainDialog();
-			_showDemoOnlyDialog();
-			return false;
-		}
-
-		// get the configuration IDs of the selected rows
-		var configurationIDs = [];
-		var cbs = $("#gdAccountDataSets tbody input:checked");
-		for (var i=0; i<cbs.length; i++) {
-			configurationIDs.push($(cbs[i]).closest("tr").data("id"));
-		}
-
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "JSON",
-			data: {
-				action: "deleteDataSets",
-				configurationIDs: configurationIDs
-			},
-			success: _onSuccessDeleteDataSets,
-			error: _onError
-		});
-	};
-
-
-	var _onSuccessDeleteDataSets = function(response) {
-		if (response.success) {
-			var remainingDataSets = [];
-			for (var i=0; i<_dataSets.length; i++) {
-				if ($.inArray(_dataSets[i].configuration_id, response.content) == -1) {
-					remainingDataSets.push(_dataSets[i]);
-				}
-			}
-			_dataSets = remainingDataSets;
-			$("#gdAccount_NumSavedDataSets").html(_dataSets.length);
-
-			_displayDataSets();
-			_updateMainDialogDataSetButtons();
-		} else {
-			// TODO
-		}
-	};
-
-
-	// account-related
-
-	var _getAccount = function(params) {
-		var settings = $.extend({
-			onComplete: function() { }
-		}, params);
-
-		utils.startProcessing();
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "JSON",
-			data: {
-				action: "getAccount"
-			},
-			success: function(data, textStatus, jqXHR) {
-				var params = {
-					data: data,
-					textStatus: textStatus,
-					jqXHR: jqXHR,
-					settings: settings
-				};
-				_onRetrievingAccountInfo(params);
-			},
-			error: _onError
-		});
-	};
-
-	var _onRetrievingAccountInfo = function(params) {
-		var response = params.data;
-		utils.stopProcessing();
-
-		// enable the save, load and link icons
-		$("#gdActionIcons .loading").removeClass("loading");
-
-		_isLoaded = true;
-		_dataSets = response.content.configurations;
-		_accountInfo = response.content;
-
-		// remove configurations from the account Info object. This is just to prevent someone (like me) accidentally using
-		// that data in that object, and not in _dataSets.
-		delete _accountInfo.configurations;
-
-		_updateAccountInfoTab();
-		_displayDataSets();
-
-		params.settings.onComplete();
-
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.ACCOUNT.AVAILABLE,
-			accountInfo: _accountInfo
-		});
-	};
-
-
-	/**
-	 * Called when the user clicks the Update Account button on the first tab of the main dialog.
-	 */
-	var _updateAccountInfo = function(e) {
-		e.preventDefault();
-
-		if (C.DEMO_MODE) {
-			_showDemoOnlyDialog();
-			return;
-		}
-
-		// check all fields have been entered
-		var firstNameField    = $("#gdUserAccount_firstName");
-		var firstNameFieldVal = $.trim(firstNameField.val());
-		var lastNameField    = $("#gdUserAccount_lastName");
-		var lastNameFieldVal = $.trim(lastNameField.val());
-		var emailField    = $("#gdUserAccount_email");
-		var emailFieldVal = $.trim(emailField.val());
-		var passwordField    = $("#gdUserAccount_password");
-		var passwordFieldVal = $.trim(passwordField.val());
-		var passwordField2    = $("#gdUserAccount_password2");
-		var passwordField2Val = $.trim(passwordField2.val());
-
-		var hasErrors = false;
-		if (firstNameFieldVal === "") {
-			firstNameField.addClass("gdProblemField");
-			hasErrors = true;
-		} else {
-			firstNameField.removeClass("gdProblemField");
-		}
-
-		if (lastNameFieldVal === "") {
-			lastNameField.addClass("gdProblemField");
-			hasErrors = true;
-		} else {
-			lastNameField.removeClass("gdProblemField");
-		}
-
-		if (emailFieldVal === "") {
-			emailField.addClass("gdProblemField");
-			hasErrors = true;
-		} else {
-			emailField.removeClass("gdProblemField");
-		}
-
-		// if the users's entered a password, validate them too
-		if (passwordFieldVal !== "" || passwordField2Val !== "") {
-			if (passwordFieldVal === "") {
-				passwordField.addClass("gdProblemField");
-				hasErrors = true;
-			} else {
-				passwordField.removeClass("gdProblemField");
-			}
-			if (passwordField2Val === "") {
-				passwordField2.addClass("gdProblemField");
-				hasErrors = true;
-			} else {
-				passwordField2.removeClass("gdProblemField");
-			}
-			if (passwordFieldVal !== passwordField2Val) {
-				passwordField.addClass("gdProblemField");
-				passwordField2.addClass("gdProblemField");
-				hasErrors = true;
-			} else {
-				passwordField.removeClass("gdProblemField");
-				passwordField2.removeClass("gdProblemField");
-			}
-		}
-
-		if (!hasErrors) {
-			utils.playModalSpinner("gdMainDialog");
-			var data = {
-				action: "updateAccount",
-				accountID: _accountInfo.accountID,
-				firstName: firstNameFieldVal,
-				lastName:  lastNameFieldVal,
-				email: emailFieldVal
-			};
-			if (passwordFieldVal !== "") {
-				data.password = passwordFieldVal;
-			}
-
-			$.ajax({
-				url: "ajax.php",
-				type: "POST",
-				data: data,
-				dataType: "json",
-				success: function(response) {
-					utils.pauseModalSpinner("gdMainDialog");
-					if (response.success) {
-						$("#gdMainDialogTab1Message").show("blind");
-						$(passwordField).val("");
-						$(passwordField2).val("");
-					} else {
-						// TODO
-					}
-				},
-				error: function(response) {
-					utils.pauseModalSpinner("gdMainDialog");
-					console.log("error response: ", response);
-				}
-			});
-		}
-	};
-
-	var _updateAccountInfoTab = function() {
-		if (_accountInfo.isAnonymous) {
-			$("#gdAccount_AccountType").html(L.anonymous_admin_account);
-		} else {
-			var accountTypeStr = "";
-			if (_accountInfo.accountType == "admin") {
-				accountTypeStr = L.admin;
-			} else {
-				accountTypeStr = L.user;
-			}
-			$("#gdAccount_AccountType").html(accountTypeStr);
-		}
-
-		$("#gdUserAccount_firstName").val(_accountInfo.firstName);
-		$("#gdUserAccount_lastName").val(_accountInfo.lastName);
-		$("#gdUserAccount_email").val(_accountInfo.email);
-		$("#gdAccount_NumSavedDataSets").html(_dataSets.length);
-		$("#gdAccount_DateAccountCreated").html(moment.unix(_accountInfo.dateCreated).format("MMM Do, YYYY"));
-
-		var totalRowsGenerated = 0;
-		for (var i=0; i<_dataSets.length; i++) {
-			totalRowsGenerated += parseInt(_dataSets[i].num_rows_generated, 10);
-		}
-		$("#gdAccount_TotalRowsGenerated").html(utils.formatNumWithCommas(totalRowsGenerated));
-	};
-
-	var _displayDataSets = function() {
-		if (_dataSets.length) {
-			$("#gdNoAccountDataSets").addClass("hidden");
-			var html = "";
-			var row = "";
-			var currDataSet;
-			for (var i=0; i<_dataSets.length; i++) {
-				currDataSet = _dataSets[i];
-				var dateCreated = moment.unix(currDataSet.date_created_unix).format("MMM Do, YYYY");
-				var lastUpdated = moment.unix(currDataSet.last_updated_unix).format("MMM Do, YYYY");
-				var isPublic    = (currDataSet.status === "public") ? 'checked="checked"' : "";
-
-				row = '<tr data-id="' + currDataSet.configuration_id + '">' +
-					'<td class="dataSetName leftAligned">' + currDataSet.configuration_name + '</td>' +
-					'<td class="leftAligned">' + dateCreated + '</td>' +
-					'<td class="leftAligned">' + lastUpdated + '</td>' +
-					'<td align="center"><input type="checkbox" class="gdDataSetStatus" id="gdDataSetStatus_' + currDataSet.configuration_id + '" ' + isPublic + ' /></td>' +
-					'<td class="gdDataSetNumRowsGenerated" align="center">' + utils.formatNumWithCommas(currDataSet.num_rows_generated) + '</td>' +
-					'<td align="center"><a href="#">load</a></td>' +
-					'<td align="center" class="gdDataSetCheckRowCell"><input type="checkbox" class="gdSelectDataSets" value="' + currDataSet.configuration_id + '"/></td>' +
-					'</tr>';
-				html += row;
-			}
-			$("#gdAccountDataSets tbody").html(html);
-			$("#gdAccountDataSets").removeClass("hidden");
-		} else {
-			$("#gdAccountDataSets tbody").html("");
-			$("#gdNoAccountDataSets").removeClass("hidden");
-			$("#gdAccountDataSets").addClass("hidden");
-		}
-	};
-
-	var _onError = function(response) {
-		console.log("on error");
-		console.log(response);
-	};
-
-	var _getConfiguration = function(configurationID) {
-		var dataSet = {};
-		for (var i=0; i<_dataSets.length; i++) {
-			if (_dataSets[i].configuration_id != configurationID) {
-				continue;
-			}
-			dataSet = _dataSets[i];
-		}
-		return dataSet;
-	};
-
-
-	var _initTooltips = function() {
-		$(document).tooltip({
-            position: {
-                my: "center bottom-6",
-                at: "center top"
-            }
-        });
-	};
-
-	var _cancelGeneration = function(e) {
-		e.preventDefault();
-		if ($(e.target).hasClass("gdDisabledLink")) {
-			return;
-		}
-		if (!_isGenerating) {
-			return;
-		}
-		_generationCancelled = true;
-	};
-
-	var _onClickBackButton = function(e) {
-		e.preventDefault();
-		_showSubtab(1);
-
-		// if the user was in the process of generating a data set, cancel it
-		if (_isGenerating) {
-			_generationCancelled = true;
-		}
-	};
-
-	var _openDataSetLinkDialog = function(e) {
-		if (_currConfigurationID === null) {
-			$("#gdLinkToDataSet_incomplete").removeClass("hidden");
-			$("#gdLinkToDataSet_complete").addClass("hidden");
-		} else {
-			$("#gdLinkToDataSet_incomplete").addClass("hidden");
-			$("#gdLinkToDataSet_complete").removeClass("hidden");
-		}
-
-		$("#gdLinkToDataSetDialog").dialog({
-			title: L.link_to_data_set,
-			dialogClass: "gdMainDialog",
-			width: 500,
-			modal: true,
-			resizable: false,
-			open: function() {
-				if (_currConfigurationID !== null) {
-					var url = window.location.href.replace(/(#.*)/, "");
-					url = url.replace(/(\?.*)/, "");
-					$("#gdLinkURL").data("url", url + "?load=" + _currConfigurationID);
-
-					var config = _getConfiguration(_currConfigurationID);
-					if (config.status == "public") {
-						$("#gdDataSetPublic").attr("checked", "checked");
-						$("#gdLinkURL").val(url).removeClass("gdDisabled").removeAttr("disabled").select();
-					} else {
-						$("#gdDataSetPublic").removeAttr("checked");
-						$("#gdLinkURL").val("-").attr("disabled", "disabled").addClass("gdDisabled");
-					}
-				}
-			},
-			buttons: [
-				{
-					text: L.close,
-					click: function() { $(this).dialog("close"); }
-				}
-			]
-		});
-
-		return false;
-	};
-
-
-	var _toggleDataSetVisibilityStatus = function(e) {
-		var status = null;
-		if (e.target.checked) {
-			status = "public";
-			var url = $("#gdLinkURL").data("url");
-			$("#gdLinkURL").removeClass("gdDisabled").removeAttr("disabled").val(url).select();
-		} else {
-			status = "private";
-			$("#gdLinkURL").addClass("gdDisabled").attr("disabled", "disabled").val("");
-		}
-
-		_saveVisibilityStatus(_currConfigurationID, status);
-	};
-
-	/**
-	 * Called when the user checks/unchecks the "Public?" checkbox for a Data Set. This sends an Ajax request
-	 * to the server to store the value.
-	 */
-	var _onToggleSaveDataSetVisibilityStatus = function(e) {
-		utils.startProcessing();
-		var configurationID = $(e.target).closest("tr").data("id");
-		var status = (e.target.checked) ? "public" : "private";
-		_saveVisibilityStatus(configurationID, status);
-	};
-
-	var _saveVisibilityStatus = function(configurationID, status) {
-		var data = {
-			action: "saveDataSetVisibilityStatus",
-			configurationID: configurationID,
-			status: status,
-			time: Date.now()
-		};
-
-		$.ajax({
-			url:  "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: data,
-			success: function(response) {
-				if (response.success) {
-					// update the status in memory for the appropriate Data Set
-					var configurationID = parseInt(response.content, 10);
-					var newStatus       = response.newStatus;
-					for (var i=0; i<_dataSets.length; i++) {
-						if (_dataSets[i].configuration_id != configurationID) {
-							continue;
-						}
-						_dataSets[i].status = newStatus;
-						break;
-					}
-
-					// ensure the Data Set table reflects this value
-					if ($("#gdDataSetStatus_" + configurationID).length) {
-						if (newStatus === "public") {
-							$("#gdDataSetStatus_" + configurationID).attr("checked", "checked");
-						} else {
-							$("#gdDataSetStatus_" + configurationID).removeAttr("checked");
-						}
-					}
-				}
-				utils.stopProcessing();
-			},
-			error: function() {
-				utils.stopProcessing();
-			}
-		});
-	};
-
-	var _showDemoOnlyDialog = function() {
-		var content = '<p>This is a demo only. Please download the script to save your Data Sets.<br />' +
-			'<a href="https://github.com/benkeen/generatedata" target="_blank">https://github.com/benkeen/generatedata</a></p>';
-		$('<div>' + content + '</div>').dialog({
-			title: "Sorry!",
-			width: 500,
-			modal: true,
-			buttons: [{
-				text: L.close,
-				click: function() { $(this).dialog("close"); }
-			}]
-		});
-	};
-
-	var _showPermissionDeniedDialog = function(extraMsg) {
-		var content = C.SETTINGS.ANON_USER_PERMISSION_DENIED_MSG;
-		if (extraMsg) {
-			content = extraMsg + " " + content;
-		}
-		$('<div>' + content + '</div>').dialog({
-			title: "Sorry!",
-			width: 500,
-			modal: true,
-			buttons: [{
-				text: L.close,
-				click: function() { $(this).dialog("close"); }
-			}]
-		});
-	};
-
-	var _initLoginDialog = function() {
-		$("#gdLoginDialogTabs>ul>li").each(function() {
-			var newTab = parseInt($(this).attr("id").replace(/^gdLoginDialogTab/, ""), 10);
-			$(this).bind("click", function() {
-				utils.selectTab({ tabGroup: "dialogTabs", tabIDPrefix: "gdLoginDialogTab", newTab: newTab, oldTab: _currLoginDialogTab } );
-				_currLoginDialogTab = newTab;
-
-				if (newTab === 1) {
-					$("#" + _loginModalID).dialog("option", "buttons", [{ text: L.login, click: _login }]);
-					$("#gdLogin_email").focus();
-				} else {
-					$("#" + _loginModalID).dialog("option", "buttons", [{ text: L.email, click: _resetPassword }]);
-					$("#gdEmailReminder").focus();
-				}
-			});
-		});
-		$("#" + _loginModalID).on("keyup", "#gdLogin_password", function(e) {
-			if (e.keyCode === $.ui.keyCode.ENTER) {
-				_login();
-			}
-		});
-	};
-
-	var _openLoginDialog = function() {
-		var buttons = [];
-		if (_currLoginDialogTab === 1) {
-			buttons = [{ text: L.login, click: _login }];
-		} else {
-			buttons = [{ text: L.email, click: _resetPassword }];
-		}
-
-		$("#" + _loginModalID).dialog({
-			title: L.please_login,
-			width: 500,
-			modal: true,
-			open: function() { utils.insertModalSpinner({ modalID: _loginModalID }); },
-			buttons: buttons
-		});
-		$("#gdLoginError").hide();
-		$("#gdLoginDialogContent .gdProblemField").removeClass("gdProblemField");
-	};
-
-	var _submitSettingsForm = function(e) {
-		if (C.DEMO_MODE) {
-			_showDemoOnlyDialog();
-			e.preventDefault();
-		}
-	};
-
-
-	var _login = function() {
-		var email    = $.trim($("#gdLogin_email").val());
-		var password = $.trim($("#gdLogin_password").val());
-
-		// validate
-		utils.clearValidationErrors($("#gdLoginDialog"));
-		if (email === "") {
-			utils.addValidationErrors({ els: [$("#gdLogin_email")], error: L.validation_no_email });
-		}
-		if (password === "") {
-			utils.addValidationErrors({ els: [$("#gdLogin_password")], error: L.validation_no_password });
-		}
-
-		var errors = utils.getValidationErrors();
-		if (errors.length) {
-			utils.displayValidationErrors("#gdLoginError");
-			return false;
-		}
-
-		utils.playModalSpinner(_loginModalID);
-		$.ajax({
-			url:  "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: "login",
-				email: email,
-				password: password
-			},
-			success: function(response) {
-				if (response.success) {
-					_getAccount({
-						onComplete: _onLoginComplete
-					});
-				} else {
-					utils.clearValidationErrors($("#" + _loginModalID));
-					utils.addValidationErrors({ els: [], error: response.content });
-					utils.displayValidationErrors("#gdLoginError");
-					utils.pauseModalSpinner(_loginModalID);
-				}
-			},
-			error: function() {
-				utils.pauseModalSpinner(_loginModalID);
-			}
-		});
-	};
-
-	var _onLoginComplete = function() {
-		if (_accountInfo.accountType === "admin") {
-			$("#gdMainTab2,#gdMainTab3").show();
-			require(["accountManager"], function(am) {
-				am.run();
-			});
-		}
-		$("#gdMainDialogTabs ul").show();
-
-		_isLoggedIn = true;
-		$("#gdNumRowsToGenerate").removeAttr("readonly");
-		$("#gdDataSetStatusLine,#gdProcessingIcon").show();
-
-		// now show the links in the header
-		$("#gdUserAccount,#gdLogout").show();
-		$("#gdLogin").hide();
-
-		utils.pauseModalSpinner(_loginModalID);
-
-		$("#" + _loginModalID).dialog("close");
-
-		manager.publish({
-			sender: MODULE_ID,
-			type: C.EVENT.ACCOUNT.LOGGED_IN,
-			accountInfo: _accountInfo
-		});
-	};
-
-	var _logout = function() {
-		$.ajax({
-			url:  "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: "logout"
-			},
-			success: function(response) {
-				if (response.success) {
-					// always redirect to login.php. If the system is set up to allow anonymous 
-					// logins for multi-users it'll automatically redirect
-					window.location = "login.php";
-				}
-			},
-			error: function() {
-			}
-		});
-	};
-
-	var _resetPassword = function() {
-		var email = $.trim($("#gdEmailReminder").val());
-
-		utils.clearValidationErrors($("#" + _loginModalID));
-		if (email === "") {
-			utils.addValidationErrors({ els: [$("#gdEmailReminder")], error: L.validation_no_email });
-		} else if (!utils.isValidEmail(email)) {
-			utils.addValidationErrors({ els: [$("#gdEmailReminder")], error: L.validation_invalid_email });
-		}
-
-		var errors = utils.getValidationErrors();
-		if (errors.length) {
-			utils.displayValidationErrors("#gdResetPasswordMessage");
-			return false;
-		}
-
-		utils.startProcessing();
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: "resetPassword",
-				email: email
-			},
-			success: function(json) {
-				var resetPasswordMessage = $("#gdResetPasswordMessage");
-				if (json.success) {
-					resetPasswordMessage.removeClass("gdErrors").addClass("gdNotify").find("div").html("<p>" + json.content + "</p>");
-				} else {
-					resetPasswordMessage.removeClass("gdNotify").addClass("gdErrors").find("div").html("<ul><li>" + json.content + "</li></ul>");
-				}
-
-				if (resetPasswordMessage.css("display") !== "block") {
-					resetPasswordMessage.show("blind", null, 500);
-				} else {
-					resetPasswordMessage.effect("highlight", { color: "#ffc9c9" }, 1500);
-				}
-
-				utils.stopProcessing();
-			},
-			error: function(json) {
-				utils.stopProcessing();
-			}
-		});
-	};
-
-	// register our module
-	manager.registerCoreModule(MODULE_ID, {
-		run: _run
-	});
-
-
-	/*
-	 * The public API for this module. These are the only revealed functions for use by other modules
-	 * that choose to include generator.js as a dependency. Even though the bulk of the functions are private,
-	 * it still contains a couple of handy methods.
-	 */
-	return {
-
-		/**
-		 * Returns an ordered array of row IDs. Row IDs are unique and may be in any order with possible gaps. Each
-		 * row is added dynamically, and may be sorted or deleted.
-         * @function
-         * @name Generator#getRowOrder
-         */
-		getRowOrder: _getRowOrder,
-
-		/**
-		 * When a user re-orders or deletes some rows, the table gives the appearance of being numbered
-		 * numerically 1-N, however the actual markup retains the original number scheme according to how it
-		 * was first generated. This function returns the visible number of the row number, used for generating
-		 * helpful error messages.
-         * @function
-         * @param {Number} rowNum a row number. Returns false if there's no corresponding visible row number.
-         * @name Generator#getVisibleRowOrderByRowNum
-		 */
-		getVisibleRowOrderByRowNum: _getVisibleRowOrderByRowNum,
-
-		/**
-		 * Returns an array of selected countries.
-		 * @function
-		 * @name Generator#getCountries
-		 */
-		getCountries: function() {
-			return _countries;
-		},
-
-		/**
-		 * Returns the current export target (new window, prompt, in-page).
-		 * @function
-		 * @name Generator#getExportTarget
-		 */
-		getExportTarget: _getExportTarget,
-
-		/**
-		 * Returns the number of rows to generate currently entered. Note: this returns a STRING.
-		 * @function
-		 * @name Generator#getNumRowsToGenerate
-		 */
-		getNumRowsToGenerate: _getNumRowsToGenerate,
-
-		/**
-		 * Returns the account information for the current logged in user (or null if they're not logged in).
-		 * @returns {null}
-		 */
-		getAccount: function() {
-			return _accountInfo;
-		}
-	};
-});
diff --git a/resources/scripts/index.html b/resources/scripts/index.html
deleted file mode 100644
index aa7b9c934..000000000
--- a/resources/scripts/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-</body>
-</html>
\ No newline at end of file
diff --git a/resources/scripts/install.js b/resources/scripts/install.js
deleted file mode 100644
index 745f0fdef..000000000
--- a/resources/scripts/install.js
+++ /dev/null
@@ -1,361 +0,0 @@
-/*global $:false,browser:true,require:false*/
-require([
-	"manager",
-	"pluginManager",
-	"utils",
-	"pageInit"
-], function(manager, pluginManager, utils) {
-
-	"use strict";
-
-	// everything in this module is private, but we use the _ notation here just to signify scope
-	var _dbSettings = {};
-	var _pluginsInstalled = false;
-	var _currStep = null;
-	var _L = null;
-	var _defaultLanguage = "en";
-	var _settingsFileCreationFailed = false;
-
-
-	// a nuisance, but since the DB isn't set up for the installation script, we need to explicitly pass
-	// the language to the lang.php file to return the appropriate language JS strings
-	var currLang = $("body").data("lang");
-	require([
-		'resources/scripts/lang.php?lang=' + currLang
-	], function(L) {
-		_L = L;
-
-		$(function() {
-			manager.start();
-
-			$("#dbHostname").select();
-			$("form").bind("submit", submit);
-			$("input[name=userAccountSetup]").on("click", _toggleAccountSection);
-			$("#allowAnonymousAccess").on("click", _toggleAnonymousAccess);
-			$("#pluginInstallationResults").on("click", ".gdError", _displayPluginInstallationError);
-			$("#gdRefreshPassword").on("click", _regeneratePassword);
-
-			// figure out what page we're on. In 99% of cases, it'll be page 1 - but in case the user didn't finish
-			// installing the script last time 'round, it will return them to the appropriate step.
-			var selectedNavPage = $("#gdInstallNav li.gdSelected");
-			if (selectedNavPage.length) {
-				_currStep = parseInt(selectedNavPage.attr("id").replace(/^nav/, ""), 10);
-			}
-
-			// this prevents the browser from accidentally remembering a previously select radio, if the user 
-			// aborted the login process and started again
-			$("#acs1").attr("checked", "checked");
-		});
-	});
-
-	function _toggleAccountSection(e) {
-		var value = $("input[name=userAccountSetup]:checked").val();
-		switch (value) {
-			case "anonymousAdmin":
-				$("#gdInstallAccountDetails").hide("fade");
-				$("#gdInstallAnonymousUserSettings").hide("fade");
-				break;
-			case "single":
-				$("#gdInstallAccountDetails").show("fade");
-				$("#gdInstallAnonymousUserSettings").hide("fade");
-				$("#gdInstallAccountDetailsMessage").html(_L.enter_user_account_details);
-				break;
-			case "multiple":
-				$("#gdInstallAccountDetails").show("fade");
-				$("#gdInstallAnonymousUserSettings").show("fade");
-				$("#gdInstallAccountDetailsMessage").html(_L.admin_account);
-				break;
-		}
-	}
-
-	function _toggleAnonymousAccess(e) {
-		if (e.target.checked) {
-			$("#anonymousUserPermissionDeniedMsg").removeClass("gdDisabled").removeAttr("disabled");
-		} else {
-			$("#anonymousUserPermissionDeniedMsg").addClass("gdDisabled").attr("disabled", "disabled");
-		}
-	}
-
-	function _displayPluginInstallationError(e) {
-		$("<div>" + $(e.target).data("error") + "</div>").dialog({
-			autoOpen:  true,
-			modal:     true,
-			resizable: false,
-			title:     _L.installation_error,
-			width:     300
-		});
-	}
-
-	function _regeneratePassword() {
-		$("#password").val(utils.generateRandomAlphaNumericStr(8));
-	}
-
-	/**
-	 * Called for every step in the installation script. This figures out what page the user's on and calls the
-	 * appropriate code.
-	 */
-	function submit(e) {
-		var currentStep = parseInt($(e.target).closest(".gdInstallSection").attr("id").replace(/page/, ""), 10);
-		$(".gdError").hide();
-		var errors = [];
-
-		if (currentStep === 1) {
-			_checkDatabaseInfo();
-		} else if (currentStep === 2) {
-			if (_settingsFileCreationFailed) {
-				_testSettingsFileExists();
-			} else {
-				_createSettingsFile();
-			}
-		} else if (currentStep === 3) {
-			_setupUserAccounts();
-		} else if (currentStep === 4) {
-			_installPlugins();
-		} else if (currentStep === 5) {
-			window.location = "./";
-		}
-
-		return false;
-	}
-
-
-	function _checkDatabaseInfo() {
-		var errors = [];
-		var validChars = /[^a-zA-Z0-9_]/;
-		var dbHostname = $("#dbHostname").val();
-		if ($.trim(dbHostname) === "") {
-			errors.push({ fieldId: "dbHostname", error: _L.validation_no_db_hostname });
-		}
-
-		var dbName = $.trim($("#dbName").val());
-		if (dbName === "") {
-			errors.push({ fieldId: "dbName", error: _L.validation_no_db_name });
-		} else if (validChars.test(dbName)) {
-			errors.push({ fieldId: "dbName", error: _L.validation_invalid_chars });
-		}
-
-		var dbUsername = $.trim($("#dbUsername").val());
-		if (dbUsername === "") {
-			errors.push({ fieldId: "dbUsername", error: _L.validation_no_mysql_username });
-		} else if (validChars.test(dbUsername)) {
-			errors.push({ fieldId: "dbUsername", error: _L.validation_invalid_chars });
-		}
-
-		// the password is optional (e.g. for local environments)
-		var dbPassword = $.trim($("#dbPassword").val());
-
-		var dbTablePrefix = $.trim($("#dbTablePrefix").val());
-		if (validChars.test(dbTablePrefix)) {
-			errors.push({ fieldId: "dbTablePrefix", error: _L.validation_invalid_chars });
-		}
-
-		if (errors.length) {
-			$("#" + errors[0].fieldId).select();
-			for (var i=0; i<errors.length; i++) {
-				$("#" + errors[i].fieldId + "_error").html(errors[i].error).fadeIn(300);
-			}
-			return false;
-		}
-
-		// all looks good! Keep track of the inputted vars for later use
-		_dbSettings = {
-			dbHostname: dbHostname,
-			dbName: dbName,
-			dbUsername: dbUsername,
-			dbPassword: dbPassword,
-			dbTablePrefix: dbTablePrefix
-		};
-
-		// make a note of the default language they selected. We'll store this later
-		_defaultLanguage = $("#gdDefaultLanguage").val();
-
-		utils.startProcessing();
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: "installationTestDbSettings",
-				dbHostname: dbHostname,
-				dbName: dbName,
-				dbUsername: dbUsername,
-				dbPassword: dbPassword
-			},
-			success: function(json) {
-				utils.stopProcessing();
-				if (!json.success) {
-					_displayError(json.content);
-				} else {
-					gotoNextStep();
-				}
-			},
-			error: installError
-		});
-	}
-
-	function _createSettingsFile() {
-		utils.startProcessing();
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: "installationCreateSettingsFile",
-				dbHostname: _dbSettings.dbHostname,
-				dbName: _dbSettings.dbName,
-				dbUsername: _dbSettings.dbUsername,
-				dbPassword: _dbSettings.dbPassword,
-				dbTablePrefix: _dbSettings.dbTablePrefix
-			},
-			success: function(json) {
-				utils.stopProcessing();
-				if (json.success === 0) {
-					$("#gdInstallCreateSettingsFile").addClass("hidden");
-					$("#gdInstallCreateSettingsFileErrorScenario").removeClass("hidden");
-					_displayError(_L.installation_failed_create_settings_file);
-					$("#gdSettingsFileContents").html(json.content);
-					_settingsFileCreationFailed = true;
-				} else {
-					gotoNextStep();
-				}
-			},
-			error: installError
-		});
-	}
-
-	function _testSettingsFileExists() {
-		utils.startProcessing();
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: "confirmSettingsFileExists"
-			},
-			success: function(json) {
-				utils.stopProcessing();
-				if (json.success === 0) {
-					_displayError("Sorry, the <b>settings.php</b> file still doesn't exist in the Data Generator root folder.");
-				} else {
-					gotoNextStep();
-				}
-			},
-			error: installError
-		});
-
-	}
-
-	function _setupUserAccounts() {
-		var errors = [];
-		var userAccountSetup = $("input[name=userAccountSetup]:checked").val();
-		var firstName = "";
-		var lastName = "";
-		var email = "";
-		var password = "";
-		var allowAnonymousAccess = "";
-		var anonymousUserPermissionDeniedMsg = "";
-
-		if (userAccountSetup === "single" || userAccountSetup === "multiple") {
-			firstName = $.trim($("#firstName").val());
-			if (firstName === "") {
-				errors.push({ fieldId: "firstName", error: _L.validation_no_first_name });
-			}
-			lastName = $.trim($("#lastName").val());
-			if (lastName === "") {
-				errors.push({ fieldId: "lastName", error: _L.validation_no_last_name });
-			}
-			email = $.trim($("#email").val());
-			if (email === "") {
-				errors.push({ fieldId: "email", error: _L.validation_no_email });
-			}
-			password = $.trim($("#password").val());
-			if (password === "") {
-				errors.push({ fieldId: "password", error: _L.validation_no_password });
-			}
-
-			if (userAccountSetup === "multiple") {
-				allowAnonymousAccess = $("#allowAnonymousAccess").attr("checked") ? "yes" : "no";
-				anonymousUserPermissionDeniedMsg = $("#anonymousUserPermissionDeniedMsg").val();
-			}
-		}
-
-		if (errors.length) {
-			$("#" + errors[0].fieldId).select();
-			for (var j=0; j<errors.length; j++) {
-				$("#" + errors[j].fieldId + "_error").html(errors[j].error).fadeIn(300);
-			}
-			return false;
-		}
-
-		utils.startProcessing();
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: "installationCreateDatabase",
-				userAccountSetup: userAccountSetup,
-				firstName: firstName,
-				lastName: lastName,
-				email: email,
-				password: password,
-				allowAnonymousAccess: allowAnonymousAccess,
-				anonymousUserPermissionDeniedMsg: anonymousUserPermissionDeniedMsg,
-
-				// weird, because the field was on the first page
-				defaultLanguage: _defaultLanguage
-			},
-			success: function(json) {
-				utils.stopProcessing();
-				if (json.success === 0) {
-					_displayError(json.content);
-				} else {
-					gotoNextStep();
-				}
-			},
-			error: installError
-		});
-	}
-
-	function _installPlugins() {
-		if (!_pluginsInstalled) {
-			utils.startProcessing();
-			$("#gdInstallPluginsBtn").hide();
-			pluginManager.installPlugins({
-				errorHandler: installError,
-				onCompleteHandler: function() {
-					$("#gdInstallPluginsBtn").html(_L.continue_rightarrow).fadeIn();
-					_pluginsInstalled = true;
-					utils.stopProcessing();
-				}
-			});
-		} else {
-			gotoNextStep();
-		}
-	}
-
-	function _displayError(message) {
-		$("#page" + _currStep + " .gdInstallTabMessage .gdResponse").html(message);
-		$("#page" + _currStep + " .gdInstallTabMessage").addClass("gdInstallError").show();
-	}
-
-	function gotoNextStep() {
-		$("#nav" + _currStep).removeClass("gdSelected").addClass("gdComplete");
-		$("#page" + _currStep).addClass("hidden");
-
-		var nextStep = _currStep + 1;
-		$("#nav" + nextStep).addClass("gdSelected");
-		$("#page" +  nextStep).removeClass("hidden");
-
-		_currStep = nextStep;
-	}
-
-	/**
-	 * In case of any Ajax error.
-	 */
-	function installError(json) {
-		utils.stopProcessing();
-		_displayError(json.content);
-	}
-
-});
diff --git a/resources/scripts/lang.php b/resources/scripts/lang.php
deleted file mode 100755
index ea5699687..000000000
--- a/resources/scripts/lang.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require_once(realpath(dirname(__FILE__) . "/../../library.php"));
-Core::init();
-
-header("Cache-control: private");
-header("Cache-Control: no-cache, must-revalidate");
-header("Content-Type: text/javascript; charset=utf-8");
-header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
-header("Content-type: application/x-javascript");
-
-$js = Core::$language->getLanguageStringsJS();
-?>
-define([
-], function() {
-
-	<?php echo $js?>
-
-	return L;
-});
\ No newline at end of file
diff --git a/resources/scripts/libs/chosen.jquery.min.js b/resources/scripts/libs/chosen.jquery.min.js
deleted file mode 100644
index 81c691627..000000000
--- a/resources/scripts/libs/chosen.jquery.min.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Chosen, a Select Box Enhancer for jQuery and Protoype
-// by Patrick Filler for Harvest, http://getharvest.com
-// 
-// Version 0.9.8
-// Full source at https://github.com/harvesthq/chosen
-// Copyright (c) 2011 Harvest http://getharvest.com
-
-// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
-// This file is generated by `cake build`, do not edit it by hand.
-(function(){var SelectParser;SelectParser=function(){function SelectParser(){this.options_index=0,this.parsed=[]}return SelectParser.prototype.add_node=function(child){return child.nodeName.toUpperCase()==="OPTGROUP"?this.add_group(child):this.add_option(child)},SelectParser.prototype.add_group=function(group){var group_position,option,_i,_len,_ref,_results;group_position=this.parsed.length,this.parsed.push({array_index:group_position,group:!0,label:group.label,children:0,disabled:group.disabled}),_ref=group.childNodes,_results=[];for(_i=0,_len=_ref.length;_i<_len;_i++)option=_ref[_i],_results.push(this.add_option(option,group_position,group.disabled));return _results},SelectParser.prototype.add_option=function(option,group_position,group_disabled){if(option.nodeName.toUpperCase()==="OPTION")return option.text!==""?(group_position!=null&&(this.parsed[group_position].children+=1),this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:option.value,text:option.text,html:option.innerHTML,selected:option.selected,disabled:group_disabled===!0?group_disabled:option.disabled,group_array_index:group_position,classes:option.className,style:option.style.cssText})):this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:!0}),this.options_index+=1},SelectParser}(),SelectParser.select_to_array=function(select){var child,parser,_i,_len,_ref;parser=new SelectParser,_ref=select.childNodes;for(_i=0,_len=_ref.length;_i<_len;_i++)child=_ref[_i],parser.add_node(child);return parser.parsed},this.SelectParser=SelectParser}).call(this),function(){var AbstractChosen,root;root=this,AbstractChosen=function(){function AbstractChosen(form_field,options){this.form_field=form_field,this.options=options!=null?options:{},this.set_default_values(),this.is_multiple=this.form_field.multiple,this.set_default_text(),this.setup(),this.set_up_html(),this.register_observers(),this.finish_setup()}return AbstractChosen.prototype.set_default_values=function(){var _this=this;return this.click_test_action=function(evt){return _this.test_active_click(evt)},this.activate_action=function(evt){return _this.activate_field(evt)},this.active_field=!1,this.mouse_on_container=!1,this.results_showing=!1,this.result_highlighted=null,this.result_single_selected=null,this.allow_single_deselect=this.options.allow_single_deselect!=null&&this.form_field.options[0]!=null&&this.form_field.options[0].text===""?this.options.allow_single_deselect:!1,this.disable_search_threshold=this.options.disable_search_threshold||0,this.disable_search=this.options.disable_search||!1,this.search_contains=this.options.search_contains||!1,this.choices=0,this.single_backstroke_delete=this.options.single_backstroke_delete||!1,this.max_selected_options=this.options.max_selected_options||Infinity},AbstractChosen.prototype.set_default_text=function(){return this.form_field.getAttribute("data-placeholder")?this.default_text=this.form_field.getAttribute("data-placeholder"):this.is_multiple?this.default_text=this.options.placeholder_text_multiple||this.options.placeholder_text||"Select Some Options":this.default_text=this.options.placeholder_text_single||this.options.placeholder_text||"Select an Option",this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||"No results match"},AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=!0},AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=!1},AbstractChosen.prototype.input_focus=function(evt){var _this=this;if(!this.active_field)return setTimeout(function(){return _this.container_mousedown()},50)},AbstractChosen.prototype.input_blur=function(evt){var _this=this;if(!this.mouse_on_container)return this.active_field=!1,setTimeout(function(){return _this.blur_test()},100)},AbstractChosen.prototype.result_add_option=function(option){var classes,style;return option.disabled?"":(option.dom_id=this.container_id+"_o_"+option.array_index,classes=option.selected&&this.is_multiple?[]:["active-result"],option.selected&&classes.push("result-selected"),option.group_array_index!=null&&classes.push("group-option"),option.classes!==""&&classes.push(option.classes),style=option.style.cssText!==""?' style="'+option.style+'"':"",'<li id="'+option.dom_id+'" class="'+classes.join(" ")+'"'+style+">"+option.html+"</li>")},AbstractChosen.prototype.results_update_field=function(){return this.is_multiple||this.results_reset_cleanup(),this.result_clear_highlight(),this.result_single_selected=null,this.results_build()},AbstractChosen.prototype.results_toggle=function(){return this.results_showing?this.results_hide():this.results_show()},AbstractChosen.prototype.results_search=function(evt){return this.results_showing?this.winnow_results():this.results_show()},AbstractChosen.prototype.keyup_checker=function(evt){var stroke,_ref;stroke=(_ref=evt.which)!=null?_ref:evt.keyCode,this.search_field_scale();switch(stroke){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices>0)return this.keydown_backstroke();if(!this.pending_backstroke)return this.result_clear_highlight(),this.results_search();break;case 13:evt.preventDefault();if(this.results_showing)return this.result_select(evt);break;case 27:return this.results_showing&&this.results_hide(),!0;case 9:case 38:case 40:case 16:case 91:case 17:break;default:return this.results_search()}},AbstractChosen.prototype.generate_field_id=function(){var new_id;return new_id=this.generate_random_id(),this.form_field.id=new_id,new_id},AbstractChosen.prototype.generate_random_char=function(){var chars,newchar,rand;return chars="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",rand=Math.floor(Math.random()*chars.length),newchar=chars.substring(rand,rand+1)},AbstractChosen}(),root.AbstractChosen=AbstractChosen}.call(this),function(){var $,Chosen,get_side_border_padding,root,__hasProp=Object.prototype.hasOwnProperty,__extends=function(child,parent){function ctor(){this.constructor=child}for(var key in parent)__hasProp.call(parent,key)&&(child[key]=parent[key]);return ctor.prototype=parent.prototype,child.prototype=new ctor,child.__super__=parent.prototype,child};root=this,$=jQuery,$.fn.extend({chosen:function(options){return $.browser.msie&&($.browser.version==="6.0"||$.browser.version==="7.0"&&document.documentMode===7)?this:this.each(function(input_field){var $this;$this=$(this);if(!$this.hasClass("chzn-done"))return $this.data("chosen",new Chosen(this,options))})}}),Chosen=function(_super){function Chosen(){Chosen.__super__.constructor.apply(this,arguments)}return __extends(Chosen,_super),Chosen.prototype.setup=function(){return this.form_field_jq=$(this.form_field),this.current_value=this.form_field_jq.val(),this.is_rtl=this.form_field_jq.hasClass("chzn-rtl")},Chosen.prototype.finish_setup=function(){return this.form_field_jq.addClass("chzn-done")},Chosen.prototype.set_up_html=function(){var container_div,dd_top,dd_width,sf_width;return this.container_id=this.form_field.id.length?this.form_field.id.replace(/[^\w]/g,"_"):this.generate_field_id(),this.container_id+="_chzn",this.f_width=this.form_field_jq.outerWidth(),container_div=$("<div />",{id:this.container_id,"class":"chzn-container"+(this.is_rtl?" chzn-rtl":""),style:"width: "+this.f_width+"px;"}),this.is_multiple?container_div.html('<ul class="chzn-choices"><li class="search-field"><input type="text" value="'+this.default_text+'" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop" style="left:-9000px;"><ul class="chzn-results"></ul></div>'):container_div.html('<a href="javascript:void(0)" class="chzn-single chzn-default"><span>'+this.default_text+'</span><div><b></b></div></a><div class="chzn-drop" style="left:-9000px;"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>'),this.form_field_jq.hide().after(container_div),this.container=$("#"+this.container_id),this.container.addClass("chzn-container-"+(this.is_multiple?"multi":"single")),this.dropdown=this.container.find("div.chzn-drop").first(),dd_top=this.container.height(),dd_width=this.f_width-get_side_border_padding(this.dropdown),this.dropdown.css({width:dd_width+"px",top:dd_top+"px"}),this.search_field=this.container.find("input").first(),this.search_results=this.container.find("ul.chzn-results").first(),this.search_field_scale(),this.search_no_results=this.container.find("li.no-results").first(),this.is_multiple?(this.search_choices=this.container.find("ul.chzn-choices").first(),this.search_container=this.container.find("li.search-field").first()):(this.search_container=this.container.find("div.chzn-search").first(),this.selected_item=this.container.find(".chzn-single").first(),sf_width=dd_width-get_side_border_padding(this.search_container)-get_side_border_padding(this.search_field),this.search_field.css({width:sf_width+"px"})),this.results_build(),this.set_tab_index(),this.form_field_jq.trigger("liszt:ready",{chosen:this})},Chosen.prototype.register_observers=function(){var _this=this;return this.container.mousedown(function(evt){return _this.container_mousedown(evt)}),this.container.mouseup(function(evt){return _this.container_mouseup(evt)}),this.container.mouseenter(function(evt){return _this.mouse_enter(evt)}),this.container.mouseleave(function(evt){return _this.mouse_leave(evt)}),this.search_results.mouseup(function(evt){return _this.search_results_mouseup(evt)}),this.search_results.mouseover(function(evt){return _this.search_results_mouseover(evt)}),this.search_results.mouseout(function(evt){return _this.search_results_mouseout(evt)}),this.form_field_jq.bind("liszt:updated",function(evt){return _this.results_update_field(evt)}),this.form_field_jq.bind("liszt:activate",function(evt){return _this.activate_field(evt)}),this.form_field_jq.bind("liszt:open",function(evt){return _this.container_mousedown(evt)}),this.search_field.blur(function(evt){return _this.input_blur(evt)}),this.search_field.keyup(function(evt){return _this.keyup_checker(evt)}),this.search_field.keydown(function(evt){return _this.keydown_checker(evt)}),this.is_multiple?(this.search_choices.click(function(evt){return _this.choices_click(evt)}),this.search_field.focus(function(evt){return _this.input_focus(evt)})):this.container.click(function(evt){return evt.preventDefault()})},Chosen.prototype.search_field_disabled=function(){this.is_disabled=this.form_field_jq[0].disabled;if(this.is_disabled)return this.container.addClass("chzn-disabled"),this.search_field[0].disabled=!0,this.is_multiple||this.selected_item.unbind("focus",this.activate_action),this.close_field();this.container.removeClass("chzn-disabled"),this.search_field[0].disabled=!1;if(!this.is_multiple)return this.selected_item.bind("focus",this.activate_action)},Chosen.prototype.container_mousedown=function(evt){var target_closelink;if(!this.is_disabled)return target_closelink=evt!=null?$(evt.target).hasClass("search-choice-close"):!1,evt&&evt.type==="mousedown"&&!this.results_showing&&evt.stopPropagation(),!this.pending_destroy_click&&!target_closelink?(this.active_field?!this.is_multiple&&evt&&($(evt.target)[0]===this.selected_item[0]||$(evt.target).parents("a.chzn-single").length)&&(evt.preventDefault(),this.results_toggle()):(this.is_multiple&&this.search_field.val(""),$(document).click(this.click_test_action),this.results_show()),this.activate_field()):this.pending_destroy_click=!1},Chosen.prototype.container_mouseup=function(evt){if(evt.target.nodeName==="ABBR"&&!this.is_disabled)return this.results_reset(evt)},Chosen.prototype.blur_test=function(evt){if(!this.active_field&&this.container.hasClass("chzn-container-active"))return this.close_field()},Chosen.prototype.close_field=function(){return $(document).unbind("click",this.click_test_action),this.is_multiple||(this.selected_item.attr("tabindex",this.search_field.attr("tabindex")),this.search_field.attr("tabindex",-1)),this.active_field=!1,this.results_hide(),this.container.removeClass("chzn-container-active"),this.winnow_results_clear(),this.clear_backstroke(),this.show_search_field_default(),this.search_field_scale()},Chosen.prototype.activate_field=function(){return!this.is_multiple&&!this.active_field&&(this.search_field.attr("tabindex",this.selected_item.attr("tabindex")),this.selected_item.attr("tabindex",-1)),this.container.addClass("chzn-container-active"),this.active_field=!0,this.search_field.val(this.search_field.val()),this.search_field.focus()},Chosen.prototype.test_active_click=function(evt){return $(evt.target).parents("#"+this.container_id).length?this.active_field=!0:this.close_field()},Chosen.prototype.results_build=function(){var content,data,_i,_len,_ref;this.parsing=!0,this.results_data=root.SelectParser.select_to_array(this.form_field),this.is_multiple&&this.choices>0?(this.search_choices.find("li.search-choice").remove(),this.choices=0):this.is_multiple||(this.selected_item.addClass("chzn-default").find("span").text(this.default_text),this.disable_search||this.form_field.options.length<=this.disable_search_threshold?this.container.addClass("chzn-container-single-nosearch"):this.container.removeClass("chzn-container-single-nosearch")),content="",_ref=this.results_data;for(_i=0,_len=_ref.length;_i<_len;_i++)data=_ref[_i],data.group?content+=this.result_add_group(data):data.empty||(content+=this.result_add_option(data),data.selected&&this.is_multiple?this.choice_build(data):data.selected&&!this.is_multiple&&(this.selected_item.removeClass("chzn-default").find("span").text(data.text),this.allow_single_deselect&&this.single_deselect_control_build()));return this.search_field_disabled(),this.show_search_field_default(),this.search_field_scale(),this.search_results.html(content),this.parsing=!1},Chosen.prototype.result_add_group=function(group){return group.disabled?"":(group.dom_id=this.container_id+"_g_"+group.array_index,'<li id="'+group.dom_id+'" class="group-result">'+$("<div />").text(group.label).html()+"</li>")},Chosen.prototype.result_do_highlight=function(el){var high_bottom,high_top,maxHeight,visible_bottom,visible_top;if(el.length){this.result_clear_highlight(),this.result_highlight=el,this.result_highlight.addClass("highlighted"),maxHeight=parseInt(this.search_results.css("maxHeight"),10),visible_top=this.search_results.scrollTop(),visible_bottom=maxHeight+visible_top,high_top=this.result_highlight.position().top+this.search_results.scrollTop(),high_bottom=high_top+this.result_highlight.outerHeight();if(high_bottom>=visible_bottom)return this.search_results.scrollTop(high_bottom-maxHeight>0?high_bottom-maxHeight:0);if(high_top<visible_top)return this.search_results.scrollTop(high_top)}},Chosen.prototype.result_clear_highlight=function(){return this.result_highlight&&this.result_highlight.removeClass("highlighted"),this.result_highlight=null},Chosen.prototype.results_show=function(){var dd_top;if(!this.is_multiple)this.selected_item.addClass("chzn-single-with-drop"),this.result_single_selected&&this.result_do_highlight(this.result_single_selected);else if(this.max_selected_options<=this.choices)return this.form_field_jq.trigger("liszt:maxselected",{chosen:this}),!1;return dd_top=this.is_multiple?this.container.height():this.container.height()-1,this.form_field_jq.trigger("liszt:showing_dropdown",{chosen:this}),this.dropdown.css({top:dd_top+"px",left:0}),this.results_showing=!0,this.search_field.focus(),this.search_field.val(this.search_field.val()),this.winnow_results()},Chosen.prototype.results_hide=function(){return this.is_multiple||this.selected_item.removeClass("chzn-single-with-drop"),this.result_clear_highlight(),this.form_field_jq.trigger("liszt:hiding_dropdown",{chosen:this}),this.dropdown.css({left:"-9000px"}),this.results_showing=!1},Chosen.prototype.set_tab_index=function(el){var ti;if(this.form_field_jq.attr("tabindex"))return ti=this.form_field_jq.attr("tabindex"),this.form_field_jq.attr("tabindex",-1),this.is_multiple?this.search_field.attr("tabindex",ti):(this.selected_item.attr("tabindex",ti),this.search_field.attr("tabindex",-1))},Chosen.prototype.show_search_field_default=function(){return this.is_multiple&&this.choices<1&&!this.active_field?(this.search_field.val(this.default_text),this.search_field.addClass("default")):(this.search_field.val(""),this.search_field.removeClass("default"))},Chosen.prototype.search_results_mouseup=function(evt){var target;target=$(evt.target).hasClass("active-result")?$(evt.target):$(evt.target).parents(".active-result").first();if(target.length)return this.result_highlight=target,this.result_select(evt)},Chosen.prototype.search_results_mouseover=function(evt){var target;target=$(evt.target).hasClass("active-result")?$(evt.target):$(evt.target).parents(".active-result").first();if(target)return this.result_do_highlight(target)},Chosen.prototype.search_results_mouseout=function(evt){if($(evt.target).hasClass("active-result"))return this.result_clear_highlight()},Chosen.prototype.choices_click=function(evt){evt.preventDefault();if(this.active_field&&!$(evt.target).hasClass("search-choice")&&!this.results_showing)return this.results_show()},Chosen.prototype.choice_build=function(item){var choice_id,html,link,_this=this;return this.is_multiple&&this.max_selected_options<=this.choices?(this.form_field_jq.trigger("liszt:maxselected",{chosen:this}),!1):(choice_id=this.container_id+"_c_"+item.array_index,this.choices+=1,item.disabled?html='<li class="search-choice search-choice-disabled" id="'+choice_id+'"><span>'+item.html+"</span></li>":html='<li class="search-choice" id="'+choice_id+'"><span>'+item.html+'</span><a href="javascript:void(0)" class="search-choice-close" rel="'+item.array_index+'"></a></li>',this.search_container.before(html),link=$("#"+choice_id).find("a").first(),link.click(function(evt){return _this.choice_destroy_link_click(evt)}))},Chosen.prototype.choice_destroy_link_click=function(evt){return evt.preventDefault(),this.is_disabled?evt.stopPropagation:(this.pending_destroy_click=!0,this.choice_destroy($(evt.target)))},Chosen.prototype.choice_destroy=function(link){if(this.result_deselect(link.attr("rel")))return this.choices-=1,this.show_search_field_default(),this.is_multiple&&this.choices>0&&this.search_field.val().length<1&&this.results_hide(),link.parents("li").first().remove()},Chosen.prototype.results_reset=function(){this.form_field.options[0].selected=!0,this.selected_item.find("span").text(this.default_text),this.is_multiple||this.selected_item.addClass("chzn-default"),this.show_search_field_default(),this.results_reset_cleanup(),this.form_field_jq.trigger("change");if(this.active_field)return this.results_hide()},Chosen.prototype.results_reset_cleanup=function(){return this.current_value=this.form_field_jq.val(),this.selected_item.find("abbr").remove()},Chosen.prototype.result_select=function(evt){var high,high_id,item,position;if(this.result_highlight)return high=this.result_highlight,high_id=high.attr("id"),this.result_clear_highlight(),this.is_multiple?this.result_deactivate(high):(this.search_results.find(".result-selected").removeClass("result-selected"),this.result_single_selected=high,this.selected_item.removeClass("chzn-default")),high.addClass("result-selected"),position=high_id.substr(high_id.lastIndexOf("_")+1),item=this.results_data[position],item.selected=!0,this.form_field.options[item.options_index].selected=!0,this.is_multiple?this.choice_build(item):(this.selected_item.find("span").first().text(item.text),this.allow_single_deselect&&this.single_deselect_control_build()),(!evt.metaKey||!this.is_multiple)&&this.results_hide(),this.search_field.val(""),(this.is_multiple||this.form_field_jq.val()!==this.current_value)&&this.form_field_jq.trigger("change",{selected:this.form_field.options[item.options_index].value}),this.current_value=this.form_field_jq.val(),this.search_field_scale()},Chosen.prototype.result_activate=function(el){return el.addClass("active-result")},Chosen.prototype.result_deactivate=function(el){return el.removeClass("active-result")},Chosen.prototype.result_deselect=function(pos){var result,result_data;return result_data=this.results_data[pos],this.form_field.options[result_data.options_index].disabled?!1:(result_data.selected=!1,this.form_field.options[result_data.options_index].selected=!1,result=$("#"+this.container_id+"_o_"+pos),result.removeClass("result-selected").addClass("active-result").show(),this.result_clear_highlight(),this.winnow_results(),this.form_field_jq.trigger("change",{deselected:this.form_field.options[result_data.options_index].value}),this.search_field_scale(),!0)},Chosen.prototype.single_deselect_control_build=function(){if(this.allow_single_deselect&&this.selected_item.find("abbr").length<1)return this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>')},Chosen.prototype.winnow_results=function(){var found,option,part,parts,regex,regexAnchor,result,result_id,results,searchText,startpos,text,zregex,_i,_j,_len,_len2,_ref;this.no_results_clear(),results=0,searchText=this.search_field.val()===this.default_text?"":$("<div/>").text($.trim(this.search_field.val())).html(),regexAnchor=this.search_contains?"":"^",regex=new RegExp(regexAnchor+searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),zregex=new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),"i"),_ref=this.results_data;for(_i=0,_len=_ref.length;_i<_len;_i++){option=_ref[_i];if(!option.disabled&&!option.empty)if(option.group)$("#"+option.dom_id).css("display","none");else if(!this.is_multiple||!option.selected){found=!1,result_id=option.dom_id,result=$("#"+result_id);if(regex.test(option.html))found=!0,results+=1;else if(option.html.indexOf(" ")>=0||option.html.indexOf("[")===0){parts=option.html.replace(/\[|\]/g,"").split(" ");if(parts.length)for(_j=0,_len2=parts.length;_j<_len2;_j++)part=parts[_j],regex.test(part)&&(found=!0,results+=1)}found?(searchText.length?(startpos=option.html.search(zregex),text=option.html.substr(0,startpos+searchText.length)+"</em>"+option.html.substr(startpos+searchText.length),text=text.substr(0,startpos)+"<em>"+text.substr(startpos)):text=option.html,result.html(text),this.result_activate(result),option.group_array_index!=null&&$("#"+this.results_data[option.group_array_index].dom_id).css("display","list-item")):(this.result_highlight&&result_id===this.result_highlight.attr("id")&&this.result_clear_highlight(),this.result_deactivate(result))}}return results<1&&searchText.length?this.no_results(searchText):this.winnow_results_set_highlight()},Chosen.prototype.winnow_results_clear=function(){var li,lis,_i,_len,_results;this.search_field.val(""),lis=this.search_results.find("li"),_results=[];for(_i=0,_len=lis.length;_i<_len;_i++)li=lis[_i],li=$(li),li.hasClass("group-result")?_results.push(li.css("display","auto")):!this.is_multiple||!li.hasClass("result-selected")?_results.push(this.result_activate(li)):_results.push(void 0);return _results},Chosen.prototype.winnow_results_set_highlight=function(){var do_high,selected_results;if(!this.result_highlight){selected_results=this.is_multiple?[]:this.search_results.find(".result-selected.active-result"),do_high=selected_results.length?selected_results.first():this.search_results.find(".active-result").first();if(do_high!=null)return this.result_do_highlight(do_high)}},Chosen.prototype.no_results=function(terms){var no_results_html;return no_results_html=$('<li class="no-results">'+this.results_none_found+' "<span></span>"</li>'),no_results_html.find("span").first().html(terms),this.search_results.append(no_results_html)},Chosen.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()},Chosen.prototype.keydown_arrow=function(){var first_active,next_sib;this.result_highlight?this.results_showing&&(next_sib=this.result_highlight.nextAll("li.active-result").first(),next_sib&&this.result_do_highlight(next_sib)):(first_active=this.search_results.find("li.active-result").first(),first_active&&this.result_do_highlight($(first_active)));if(!this.results_showing)return this.results_show()},Chosen.prototype.keyup_arrow=function(){var prev_sibs;if(!this.results_showing&&!this.is_multiple)return this.results_show();if(this.result_highlight)return prev_sibs=this.result_highlight.prevAll("li.active-result"),prev_sibs.length?this.result_do_highlight(prev_sibs.first()):(this.choices>0&&this.results_hide(),this.result_clear_highlight())},Chosen.prototype.keydown_backstroke=function(){var next_available_destroy;if(this.pending_backstroke)return this.choice_destroy(this.pending_backstroke.find("a").first()),this.clear_backstroke();next_available_destroy=this.search_container.siblings("li.search-choice").last();if(next_available_destroy.length&&!next_available_destroy.hasClass("search-choice-disabled"))return this.pending_backstroke=next_available_destroy,this.single_backstroke_delete?this.keydown_backstroke():this.pending_backstroke.addClass("search-choice-focus")},Chosen.prototype.clear_backstroke=function(){return this.pending_backstroke&&this.pending_backstroke.removeClass("search-choice-focus"),this.pending_backstroke=null},Chosen.prototype.keydown_checker=function(evt){var stroke,_ref;stroke=(_ref=evt.which)!=null?_ref:evt.keyCode,this.search_field_scale(),stroke!==8&&this.pending_backstroke&&this.clear_backstroke();switch(stroke){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:this.results_showing&&!this.is_multiple&&this.result_select(evt),this.mouse_on_container=!1;break;case 13:evt.preventDefault();break;case 38:evt.preventDefault(),this.keyup_arrow();break;case 40:this.keydown_arrow()}},Chosen.prototype.search_field_scale=function(){var dd_top,div,h,style,style_block,styles,w,_i,_len;if(this.is_multiple){h=0,w=0,style_block="position:absolute; left: -1000px; top: -1000px; display:none;",styles=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(_i=0,_len=styles.length;_i<_len;_i++)style=styles[_i],style_block+=style+":"+this.search_field.css(style)+";";return div=$("<div />",{style:style_block}),div.text(this.search_field.val()),$("body").append(div),w=div.width()+25,div.remove(),w>this.f_width-10&&(w=this.f_width-10),this.search_field.css({width:w+"px"}),dd_top=this.container.height(),this.dropdown.css({top:dd_top+"px"})}},Chosen.prototype.generate_random_id=function(){var string;string="sel"+this.generate_random_char()+this.generate_random_char()+this.generate_random_char();while($("#"+string).length>0)string+=this.generate_random_char();return string},Chosen}(AbstractChosen),get_side_border_padding=function(elmt){var side_border_padding;return side_border_padding=elmt.outerWidth()-elmt.width()},root.get_side_border_padding=get_side_border_padding}.call(this);
\ No newline at end of file
diff --git a/resources/scripts/libs/excanvas.js b/resources/scripts/libs/excanvas.js
deleted file mode 100644
index c30ea239d..000000000
--- a/resources/scripts/libs/excanvas.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2006 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-document.createElement("canvas").getContext||function(){function C(){}function B(a){this.type_=a,this.r1_=this.y1_=this.x1_=this.r0_=this.y0_=this.x0_=0,this.colors_=[]}function A(a,b,c){!z(b)||(a.m_=b,c&&(a.lineScale_=f(e(b[0][0]*b[1][1]-b[0][1]*b[1][0]))))}function z(a){var b=0;for(;b<3;b++){var c=0;for(;c<2;c++)if(!isFinite(a[b][c])||isNaN(a[b][c]))return!1}return!0}function y(a,b,c,d){a.currentPath_.push({type:"bezierCurveTo",cp1x:b.x,cp1y:b.y,cp2x:c.x,cp2y:c.y,x:d.x,y:d.y}),a.currentX_=d.x,a.currentY_=d.y}function w(a){this.m_=r(),this.mStack_=[],this.aStack_=[],this.currentPath_=[],this.fillStyle=this.strokeStyle="#000",this.lineWidth=1,this.lineJoin="miter",this.lineCap="butt",this.miterLimit=g*1,this.globalAlpha=1,this.canvas=a;var b=a.ownerDocument.createElement("div");b.style.width=a.clientWidth+"px",b.style.height=a.clientHeight+"px",b.style.overflow="hidden",b.style.position="absolute",a.appendChild(b),this.element_=b,this.lineScale_=this.arcScaleY_=this.arcScaleX_=1}function v(a){switch(a){case"butt":return"flat";case"round":return"round";case"square":default:return"square"}}function u(a){var b,c=1;a=String(a);if(a.substring(0,3)=="rgb"){var d=a.indexOf("(",3),e=a.indexOf(")",d+1),f=a.substring(d+1,e).split(",");b="#";var g=0;for(;g<3;g++)b+=o[Number(f[g])];f.length==4&&a.substr(3,1)=="a"&&(c=f[3])}else b=a;return{color:b,alpha:c}}function t(a,b){b.fillStyle=a.fillStyle,b.lineCap=a.lineCap,b.lineJoin=a.lineJoin,b.lineWidth=a.lineWidth,b.miterLimit=a.miterLimit,b.shadowBlur=a.shadowBlur,b.shadowColor=a.shadowColor,b.shadowOffsetX=a.shadowOffsetX,b.shadowOffsetY=a.shadowOffsetY,b.strokeStyle=a.strokeStyle,b.globalAlpha=a.globalAlpha,b.arcScaleX_=a.arcScaleX_,b.arcScaleY_=a.arcScaleY_,b.lineScale_=a.lineScale_}function s(a,b){var c=r(),d=0;for(;d<3;d++){var e=0;for(;e<3;e++){var f=0,g=0;for(;g<3;g++)f+=a[d][g]*b[g][e];c[d][e]=f}}return c}function r(){return[[1,0,0],[0,1,0],[0,0,1]]}function n(a){var b=a.srcElement;b.firstChild&&(b.firstChild.style.width=b.clientWidth+"px",b.firstChild.style.height=b.clientHeight+"px")}function m(a){var b=a.srcElement;switch(a.propertyName){case"width":b.style.width=b.attributes.width.nodeValue+"px",b.getContext().clearRect();break;case"height":b.style.height=b.attributes.height.nodeValue+"px",b.getContext().clearRect()}}function k(a,b){var c=j.call(arguments,2);return function(){return a.apply(b,c.concat(j.call(arguments)))}}function i(){return this.context_||(this.context_=new w(this))}var a=Math,b=a.round,c=a.sin,d=a.cos,e=a.abs,f=a.sqrt,g=10,h=g/2,j=Array.prototype.slice,l={init:function(a){if(/MSIE/.test(navigator.userAgent)&&!window.opera){var b=a||document;b.createElement("canvas"),b.attachEvent("onreadystatechange",k(this.init_,this,b))}},init_:function(a){a.namespaces.g_vml_||a.namespaces.add("g_vml_","urn:schemas-microsoft-com:vml","#default#VML"),a.namespaces.g_o_||a.namespaces.add("g_o_","urn:schemas-microsoft-com:office:office","#default#VML");if(!a.styleSheets.ex_canvas_){var b=a.createStyleSheet();b.owningElement.id="ex_canvas_",b.cssText="canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}g_vml_\\:*{behavior:url(#default#VML)}g_o_\\:*{behavior:url(#default#VML)}"}var c=a.getElementsByTagName("canvas"),d=0;for(;d<c.length;d++)this.initElement(c[d])},initElement:function(a){if(!a.getContext){a.getContext=i,a.innerHTML="",a.attachEvent("onpropertychange",m),a.attachEvent("onresize",n);var b=a.attributes;b.width&&b.width.specified?a.style.width=b.width.nodeValue+"px":a.width=a.clientWidth,b.height&&b.height.specified?a.style.height=b.height.nodeValue+"px":a.height=a.clientHeight}return a}};l.init();var o=[],p=0;for(;p<16;p++){var q=0;for(;q<16;q++)o[p*16+q]=p.toString(16)+q.toString(16)}var x=w.prototype;x.clearRect=function(){this.element_.innerHTML=""},x.beginPath=function(){this.currentPath_=[]},x.moveTo=function(a,b){var c=this.getCoords_(a,b);this.currentPath_.push({type:"moveTo",x:c.x,y:c.y}),this.currentX_=c.x,this.currentY_=c.y},x.lineTo=function(a,b){var c=this.getCoords_(a,b);this.currentPath_.push({type:"lineTo",x:c.x,y:c.y}),this.currentX_=c.x,this.currentY_=c.y},x.bezierCurveTo=function(a,b,c,d,e,f){var g=this.getCoords_(e,f),h=this.getCoords_(a,b),i=this.getCoords_(c,d);y(this,h,i,g)},x.quadraticCurveTo=function(a,b,c,d){var e=this.getCoords_(a,b),f=this.getCoords_(c,d),g={x:this.currentX_+.6666666666666666*(e.x-this.currentX_),y:this.currentY_+.6666666666666666*(e.y-this.currentY_)};y(this,g,{x:g.x+(f.x-this.currentX_)/3,y:g.y+(f.y-this.currentY_)/3},f)},x.arc=function(a,b,e,f,i,j){e*=g;var k=j?"at":"wa",l=a+d(f)*e-h,m=b+c(f)*e-h,n=a+d(i)*e-h,o=b+c(i)*e-h;l==n&&!j&&(l+=.125);var p=this.getCoords_(a,b),q=this.getCoords_(l,m),r=this.getCoords_(n,o);this.currentPath_.push({type:k,x:p.x,y:p.y,radius:e,xStart:q.x,yStart:q.y,xEnd:r.x,yEnd:r.y})},x.rect=function(a,b,c,d){this.moveTo(a,b),this.lineTo(a+c,b),this.lineTo(a+c,b+d),this.lineTo(a,b+d),this.closePath()},x.strokeRect=function(a,b,c,d){var e=this.currentPath_;this.beginPath(),this.moveTo(a,b),this.lineTo(a+c,b),this.lineTo(a+c,b+d),this.lineTo(a,b+d),this.closePath(),this.stroke(),this.currentPath_=e},x.fillRect=function(a,b,c,d){var e=this.currentPath_;this.beginPath(),this.moveTo(a,b),this.lineTo(a+c,b),this.lineTo(a+c,b+d),this.lineTo(a,b+d),this.closePath(),this.fill(),this.currentPath_=e},x.createLinearGradient=function(a,b,c,d){var e=new B("gradient");e.x0_=a,e.y0_=b,e.x1_=c,e.y1_=d;return e},x.createRadialGradient=function(a,b,c,d,e,f){var g=new B("gradientradial");g.x0_=a,g.y0_=b,g.r0_=c,g.x1_=d,g.y1_=e,g.r1_=f;return g},x.drawImage=function(c){var d,e,f,h,i,j,k,l,m=c.runtimeStyle.width,n=c.runtimeStyle.height;c.runtimeStyle.width="auto",c.runtimeStyle.height="auto";var o=c.width,p=c.height;c.runtimeStyle.width=m,c.runtimeStyle.height=n;if(arguments.length==3)d=arguments[1],e=arguments[2],i=j=0,k=f=o,l=h=p;else if(arguments.length==5)d=arguments[1],e=arguments[2],f=arguments[3],h=arguments[4],i=j=0,k=o,l=p;else if(arguments.length==9)i=arguments[1],j=arguments[2],k=arguments[3],l=arguments[4],d=arguments[5],e=arguments[6],f=arguments[7],h=arguments[8];else throw Error("Invalid number of arguments");var q=this.getCoords_(d,e),r=[];r.push(" <g_vml_:group",' coordsize="',g*10,",",g*10,'"',' coordorigin="0,0"',' style="width:',10,"px;height:",10,"px;position:absolute;");if(this.m_[0][0]!=1||this.m_[0][1]){var s=[];s.push("M11=",this.m_[0][0],",","M12=",this.m_[1][0],",","M21=",this.m_[0][1],",","M22=",this.m_[1][1],",","Dx=",b(q.x/g),",","Dy=",b(q.y/g),"");var t=q,u=this.getCoords_(d+f,e),v=this.getCoords_(d,e+h),w=this.getCoords_(d+f,e+h);t.x=a.max(t.x,u.x,v.x,w.x),t.y=a.max(t.y,u.y,v.y,w.y),r.push("padding:0 ",b(t.x/g),"px ",b(t.y/g),"px 0;filter:progid:DXImageTransform.Microsoft.Matrix(",s.join(""),", sizingmethod='clip');")}else r.push("top:",b(q.y/g),"px;left:",b(q.x/g),"px;");r.push(' ">','<g_vml_:image src="',c.src,'"',' style="width:',g*f,"px;"," height:",g*h,'px;"',' cropleft="',i/o,'"',' croptop="',j/p,'"',' cropright="',(o-i-k)/o,'"',' cropbottom="',(p-j-l)/p,'"'," />","</g_vml_:group>"),this.element_.insertAdjacentHTML("BeforeEnd",r.join(""))},x.stroke=function(c){var d=[],e=u(c?this.fillStyle:this.strokeStyle),f=e.color,h=e.alpha*this.globalAlpha;d.push("<g_vml_:shape",' filled="',!!c,'"',' style="position:absolute;width:',10,"px;height:",10,'px;"',' coordorigin="0 0" coordsize="',g*10," ",g*10,'"',' stroked="',!c,'"',' path="');var i={x:null,y:null},j={x:null,y:null},k=0;for(;k<this.currentPath_.length;k++){var l=this.currentPath_[k];switch(l.type){case"moveTo":d.push(" m ",b(l.x),",",b(l.y));break;case"lineTo":d.push(" l ",b(l.x),",",b(l.y));break;case"close":d.push(" x "),l=null;break;case"bezierCurveTo":d.push(" c ",b(l.cp1x),",",b(l.cp1y),",",b(l.cp2x),",",b(l.cp2y),",",b(l.x),",",b(l.y));break;case"at":case"wa":d.push(" ",l.type," ",b(l.x-this.arcScaleX_*l.radius),",",b(l.y-this.arcScaleY_*l.radius)," ",b(l.x+this.arcScaleX_*l.radius),",",b(l.y+this.arcScaleY_*l.radius)," ",b(l.xStart),",",b(l.yStart)," ",b(l.xEnd),",",b(l.yEnd))}if(l){if(i.x==null||l.x<i.x)i.x=l.x;if(j.x==null||l.x>j.x)j.x=l.x;if(i.y==null||l.y<i.y)i.y=l.y;if(j.y==null||l.y>j.y)j.y=l.y}}d.push(' ">');if(c)if(typeof this.fillStyle=="object"){var m=this.fillStyle,n=0,o={x:0,y:0},p=0,q=1;if(m.type_=="gradient"){var r=m.x1_/this.arcScaleX_,s=m.y1_/this.arcScaleY_,t=this.getCoords_(m.x0_/this.arcScaleX_,m.y0_/this.arcScaleY_),w=this.getCoords_(r,s);n=Math.atan2(w.x-t.x,w.y-t.y)*180/Math.PI,n<0&&(n+=360),n<1e-6&&(n=0)}else{var t=this.getCoords_(m.x0_,m.y0_),x=j.x-i.x,y=j.y-i.y;o={x:(t.x-i.x)/x,y:(t.y-i.y)/y},x/=this.arcScaleX_*g,y/=this.arcScaleY_*g;var z=a.max(x,y);p=2*m.r0_/z,q=2*m.r1_/z-p}var A=m.colors_;A.sort(function(a,b){return a.offset-b.offset});var B=A.length,C=A[0].color,D=A[B-1].color,E=A[0].alpha*this.globalAlpha,F=A[B-1].alpha*this.globalAlpha,G=[],k=0;for(;k<B;k++){var H=A[k];G.push(H.offset*q+p+" "+H.color)}d.push('<g_vml_:fill type="',m.type_,'"',' method="none" focus="100%"',' color="',C,'"',' color2="',D,'"',' colors="',G.join(","),'"',' opacity="',F,'"',' g_o_:opacity2="',E,'"',' angle="',n,'"',' focusposition="',o.x,",",o.y,'" />')}else d.push('<g_vml_:fill color="',f,'" opacity="',h,'" />');else{var I=this.lineScale_*this.lineWidth;I<1&&(h*=I),d.push("<g_vml_:stroke",' opacity="',h,'"',' joinstyle="',this.lineJoin,'"',' miterlimit="',this.miterLimit,'"',' endcap="',v(this.lineCap),'"',' weight="',I,'px"',' color="',f,'" />')}d.push("</g_vml_:shape>"),this.element_.insertAdjacentHTML("beforeEnd",d.join(""))},x.fill=function(){this.stroke(!0)},x.closePath=function(){this.currentPath_.push({type:"close"})},x.getCoords_=function(a,b){var c=this.m_;return{x:g*(a*c[0][0]+b*c[1][0]+c[2][0])-h,y:g*(a*c[0][1]+b*c[1][1]+c[2][1])-h}},x.save=function(){var a={};t(this,a),this.aStack_.push(a),this.mStack_.push(this.m_),this.m_=s(r(),this.m_)},x.restore=function(){t(this.aStack_.pop(),this),this.m_=this.mStack_.pop()},x.translate=function(a,b){A(this,s([[1,0,0],[0,1,0],[a,b,1]],this.m_),!1)},x.rotate=function(a){var b=d(a),e=c(a);A(this,s([[b,e,0],[-e,b,0],[0,0,1]],this.m_),!1)},x.scale=function(a,b){this.arcScaleX_*=a,this.arcScaleY_*=b,A(this,s([[a,0,0],[0,b,0],[0,0,1]],this.m_),!0)},x.transform=function(a,b,c,d,e,f){A(this,s([[a,b,0],[c,d,0],[e,f,1]],this.m_),!0)},x.setTransform=function(a,b,c,d,e,f){A(this,[[a,b,0],[c,d,0],[e,f,1]],!0)},x.clip=function(){},x.arcTo=function(){},x.createPattern=function(){return new C},B.prototype.addColorStop=function(a,b){b=u(b),this.colors_.push({offset:a,color:b.color,alpha:b.alpha})},G_vmlCanvasManager=l,CanvasRenderingContext2D=w,CanvasGradient=B,CanvasPattern=C}();
diff --git a/resources/scripts/libs/html5shiv.js b/resources/scripts/libs/html5shiv.js
deleted file mode 100644
index 784f221ca..000000000
--- a/resources/scripts/libs/html5shiv.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- HTML5 Shiv v3.6.2pre | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
-a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}</style>";
-c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
-"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",version:"3.6.2pre",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment();
-for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
diff --git a/resources/scripts/libs/jquery-ui.min.js b/resources/scripts/libs/jquery-ui.min.js
deleted file mode 100644
index ed359fcde..000000000
--- a/resources/scripts/libs/jquery-ui.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*! jQuery UI - v1.9.2 - 2012-12-26
-* http://jqueryui.com
-* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js
-* Copyright (c) 2012 jQuery Foundation and other contributors Licensed MIT */
-
-(function(e,t){function i(t,n){var r,i,o,u=t.nodeName.toLowerCase();return"area"===u?(r=t.parentNode,i=r.name,!t.href||!i||r.nodeName.toLowerCase()!=="map"?!1:(o=e("img[usemap=#"+i+"]")[0],!!o&&s(o))):(/input|select|textarea|button|object/.test(u)?!t.disabled:"a"===u?t.href||n:n)&&s(t)}function s(t){return e.expr.filters.visible(t)&&!e(t).parents().andSelf().filter(function(){return e.css(this,"visibility")==="hidden"}).length}var n=0,r=/^ui-id-\d+$/;e.ui=e.ui||{};if(e.ui.version)return;e.extend(e.ui,{version:"1.9.2",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({_focus:e.fn.focus,focus:function(t,n){return typeof t=="number"?this.each(function(){var r=this;setTimeout(function(){e(r).focus(),n&&n.call(r)},t)}):this._focus.apply(this,arguments)},scrollParent:function(){var t;return e.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?t=this.parents().filter(function(){return/(relative|absolute|fixed)/.test(e.css(this,"position"))&&/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0):t=this.parents().filter(function(){return/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!t.length?e(document):t},zIndex:function(n){if(n!==t)return this.css("zIndex",n);if(this.length){var r=e(this[0]),i,s;while(r.length&&r[0]!==document){i=r.css("position");if(i==="absolute"||i==="relative"||i==="fixed"){s=parseInt(r.css("zIndex"),10);if(!isNaN(s)&&s!==0)return s}r=r.parent()}}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++n)})},removeUniqueId:function(){return this.each(function(){r.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(n){return!!e.data(n,t)}}):function(t,n,r){return!!e.data(t,r[3])},focusable:function(t){return i(t,!isNaN(e.attr(t,"tabindex")))},tabbable:function(t){var n=e.attr(t,"tabindex"),r=isNaN(n);return(r||n>=0)&&i(t,!r)}}),e(function(){var t=document.body,n=t.appendChild(n=document.createElement("div"));n.offsetHeight,e.extend(n.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0}),e.support.minHeight=n.offsetHeight===100,e.support.selectstart="onselectstart"in n,t.removeChild(n).style.display="none"}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(n,r){function u(t,n,r,s){return e.each(i,function(){n-=parseFloat(e.css(t,"padding"+this))||0,r&&(n-=parseFloat(e.css(t,"border"+this+"Width"))||0),s&&(n-=parseFloat(e.css(t,"margin"+this))||0)}),n}var i=r==="Width"?["Left","Right"]:["Top","Bottom"],s=r.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+r]=function(n){return n===t?o["inner"+r].call(this):this.each(function(){e(this).css(s,u(this,n)+"px")})},e.fn["outer"+r]=function(t,n){return typeof t!="number"?o["outer"+r].call(this,t):this.each(function(){e(this).css(s,u(this,t,!0,n)+"px")})}}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(n){return arguments.length?t.call(this,e.camelCase(n)):t.call(this)}}(e.fn.removeData)),function(){var t=/msie ([\w.]+)/.exec(navigator.userAgent.toLowerCase())||[];e.ui.ie=t.length?!0:!1,e.ui.ie6=parseFloat(t[1],10)===6}(),e.fn.extend({disableSelection:function(){return this.bind((e.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(e){e.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),e.extend(e.ui,{plugin:{add:function(t,n,r){var i,s=e.ui[t].prototype;for(i in r)s.plugins[i]=s.plugins[i]||[],s.plugins[i].push([n,r[i]])},call:function(e,t,n){var r,i=e.plugins[t];if(!i||!e.element[0].parentNode||e.element[0].parentNode.nodeType===11)return;for(r=0;r<i.length;r++)e.options[i[r][0]]&&i[r][1].apply(e.element,n)}},contains:e.contains,hasScroll:function(t,n){if(e(t).css("overflow")==="hidden")return!1;var r=n&&n==="left"?"scrollLeft":"scrollTop",i=!1;return t[r]>0?!0:(t[r]=1,i=t[r]>0,t[r]=0,i)},isOverAxis:function(e,t,n){return e>t&&e<t+n},isOver:function(t,n,r,i,s,o){return e.ui.isOverAxis(t,r,s)&&e.ui.isOverAxis(n,i,o)}})})(jQuery);(function(e,t){var n=0,r=Array.prototype.slice,i=e.cleanData;e.cleanData=function(t){for(var n=0,r;(r=t[n])!=null;n++)try{e(r).triggerHandler("remove")}catch(s){}i(t)},e.widget=function(t,n,r){var i,s,o,u,a=t.split(".")[0];t=t.split(".")[1],i=a+"-"+t,r||(r=n,n=e.Widget),e.expr[":"][i.toLowerCase()]=function(t){return!!e.data(t,i)},e[a]=e[a]||{},s=e[a][t],o=e[a][t]=function(e,t){if(!this._createWidget)return new o(e,t);arguments.length&&this._createWidget(e,t)},e.extend(o,s,{version:r.version,_proto:e.extend({},r),_childConstructors:[]}),u=new n,u.options=e.widget.extend({},u.options),e.each(r,function(t,i){e.isFunction(i)&&(r[t]=function(){var e=function(){return n.prototype[t].apply(this,arguments)},r=function(e){return n.prototype[t].apply(this,e)};return function(){var t=this._super,n=this._superApply,s;return this._super=e,this._superApply=r,s=i.apply(this,arguments),this._super=t,this._superApply=n,s}}())}),o.prototype=e.widget.extend(u,{widgetEventPrefix:s?u.widgetEventPrefix:t},r,{constructor:o,namespace:a,widgetName:t,widgetBaseClass:i,widgetFullName:i}),s?(e.each(s._childConstructors,function(t,n){var r=n.prototype;e.widget(r.namespace+"."+r.widgetName,o,n._proto)}),delete s._childConstructors):n._childConstructors.push(o),e.widget.bridge(t,o)},e.widget.extend=function(n){var i=r.call(arguments,1),s=0,o=i.length,u,a;for(;s<o;s++)for(u in i[s])a=i[s][u],i[s].hasOwnProperty(u)&&a!==t&&(e.isPlainObject(a)?n[u]=e.isPlainObject(n[u])?e.widget.extend({},n[u],a):e.widget.extend({},a):n[u]=a);return n},e.widget.bridge=function(n,i){var s=i.prototype.widgetFullName||n;e.fn[n]=function(o){var u=typeof o=="string",a=r.call(arguments,1),f=this;return o=!u&&a.length?e.widget.extend.apply(null,[o].concat(a)):o,u?this.each(function(){var r,i=e.data(this,s);if(!i)return e.error("cannot call methods on "+n+" prior to initialization; "+"attempted to call method '"+o+"'");if(!e.isFunction(i[o])||o.charAt(0)==="_")return e.error("no such method '"+o+"' for "+n+" widget instance");r=i[o].apply(i,a);if(r!==i&&r!==t)return f=r&&r.jquery?f.pushStack(r.get()):r,!1}):this.each(function(){var t=e.data(this,s);t?t.option(o||{})._init():e.data(this,s,new i(o,this))}),f}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,r){r=e(r||this.defaultElement||this)[0],this.element=e(r),this.uuid=n++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this.bindings=e(),this.hoverable=e(),this.focusable=e(),r!==this&&(e.data(r,this.widgetName,this),e.data(r,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===r&&this.destroy()}}),this.document=e(r.style?r.ownerDocument:r.document||r),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(n,r){var i=n,s,o,u;if(arguments.length===0)return e.widget.extend({},this.options);if(typeof n=="string"){i={},s=n.split("."),n=s.shift();if(s.length){o=i[n]=e.widget.extend({},this.options[n]);for(u=0;u<s.length-1;u++)o[s[u]]=o[s[u]]||{},o=o[s[u]];n=s.pop();if(r===t)return o[n]===t?null:o[n];o[n]=r}else{if(r===t)return this.options[n]===t?null:this.options[n];i[n]=r}}return this._setOptions(i),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,e==="disabled"&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!t).attr("aria-disabled",t),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(t,n,r){var i,s=this;typeof t!="boolean"&&(r=n,n=t,t=!1),r?(n=i=e(n),this.bindings=this.bindings.add(n)):(r=n,n=this.element,i=this.widget()),e.each(r,function(r,o){function u(){if(!t&&(s.options.disabled===!0||e(this).hasClass("ui-state-disabled")))return;return(typeof o=="string"?s[o]:o).apply(s,arguments)}typeof o!="string"&&(u.guid=o.guid=o.guid||u.guid||e.guid++);var a=r.match(/^(\w+)\s*(.*)$/),f=a[1]+s.eventNamespace,l=a[2];l?i.delegate(l,f,u):n.bind(f,u)})},_off:function(e,t){t=(t||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.unbind(t).undelegate(t)},_delay:function(e,t){function n(){return(typeof e=="string"?r[e]:e).apply(r,arguments)}var r=this;return setTimeout(n,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,n,r){var i,s,o=this.options[t];r=r||{},n=e.Event(n),n.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),n.target=this.element[0],s=n.originalEvent;if(s)for(i in s)i in n||(n[i]=s[i]);return this.element.trigger(n,r),!(e.isFunction(o)&&o.apply(this.element[0],[n].concat(r))===!1||n.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,n){e.Widget.prototype["_"+t]=function(r,i,s){typeof i=="string"&&(i={effect:i});var o,u=i?i===!0||typeof i=="number"?n:i.effect||n:t;i=i||{},typeof i=="number"&&(i={duration:i}),o=!e.isEmptyObject(i),i.complete=s,i.delay&&r.delay(i.delay),o&&e.effects&&(e.effects.effect[u]||e.uiBackCompat!==!1&&e.effects[u])?r[t](i):u!==t&&r[u]?r[u](i.duration,i.easing,s):r.queue(function(n){e(this)[t](),s&&s.call(r[0]),n()})}}),e.uiBackCompat!==!1&&(e.Widget.prototype._getCreateOptions=function(){return e.metadata&&e.metadata.get(this.element[0])[this.widgetName]})})(jQuery);(function(e,t){var n=!1;e(document).mouseup(function(e){n=!1}),e.widget("ui.mouse",{version:"1.9.2",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(n){if(!0===e.data(n.target,t.widgetName+".preventClickEvent"))return e.removeData(n.target,t.widgetName+".preventClickEvent"),n.stopImmediatePropagation(),!1}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(n)return;this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var r=this,i=t.which===1,s=typeof this.options.cancel=="string"&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;if(!i||s||!this._mouseCapture(t))return!0;this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){r.mouseDelayMet=!0},this.options.delay));if(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)){this._mouseStarted=this._mouseStart(t)!==!1;if(!this._mouseStarted)return t.preventDefault(),!0}return!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return r._mouseMove(e)},this._mouseUpDelegate=function(e){return r._mouseUp(e)},e(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),n=!0,!0},_mouseMove:function(t){return!e.ui.ie||document.documentMode>=9||!!t.button?this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted):this._mouseUp(t)},_mouseUp:function(t){return e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(e){return this.mouseDelayMet},_mouseStart:function(e){},_mouseDrag:function(e){},_mouseStop:function(e){},_mouseCapture:function(e){return!0}})})(jQuery);(function(e,t){function h(e,t,n){return[parseInt(e[0],10)*(l.test(e[0])?t/100:1),parseInt(e[1],10)*(l.test(e[1])?n/100:1)]}function p(t,n){return parseInt(e.css(t,n),10)||0}e.ui=e.ui||{};var n,r=Math.max,i=Math.abs,s=Math.round,o=/left|center|right/,u=/top|center|bottom/,a=/[\+\-]\d+%?/,f=/^\w+/,l=/%$/,c=e.fn.position;e.position={scrollbarWidth:function(){if(n!==t)return n;var r,i,s=e("<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return e("body").append(s),r=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,r===i&&(i=s[0].clientWidth),s.remove(),n=r-i},getScrollInfo:function(t){var n=t.isWindow?"":t.element.css("overflow-x"),r=t.isWindow?"":t.element.css("overflow-y"),i=n==="scroll"||n==="auto"&&t.width<t.element[0].scrollWidth,s=r==="scroll"||r==="auto"&&t.height<t.element[0].scrollHeight;return{width:i?e.position.scrollbarWidth():0,height:s?e.position.scrollbarWidth():0}},getWithinInfo:function(t){var n=e(t||window),r=e.isWindow(n[0]);return{element:n,isWindow:r,offset:n.offset()||{left:0,top:0},scrollLeft:n.scrollLeft(),scrollTop:n.scrollTop(),width:r?n.width():n.outerWidth(),height:r?n.height():n.outerHeight()}}},e.fn.position=function(t){if(!t||!t.of)return c.apply(this,arguments);t=e.extend({},t);var n,l,d,v,m,g=e(t.of),y=e.position.getWithinInfo(t.within),b=e.position.getScrollInfo(y),w=g[0],E=(t.collision||"flip").split(" "),S={};return w.nodeType===9?(l=g.width(),d=g.height(),v={top:0,left:0}):e.isWindow(w)?(l=g.width(),d=g.height(),v={top:g.scrollTop(),left:g.scrollLeft()}):w.preventDefault?(t.at="left top",l=d=0,v={top:w.pageY,left:w.pageX}):(l=g.outerWidth(),d=g.outerHeight(),v=g.offset()),m=e.extend({},v),e.each(["my","at"],function(){var e=(t[this]||"").split(" "),n,r;e.length===1&&(e=o.test(e[0])?e.concat(["center"]):u.test(e[0])?["center"].concat(e):["center","center"]),e[0]=o.test(e[0])?e[0]:"center",e[1]=u.test(e[1])?e[1]:"center",n=a.exec(e[0]),r=a.exec(e[1]),S[this]=[n?n[0]:0,r?r[0]:0],t[this]=[f.exec(e[0])[0],f.exec(e[1])[0]]}),E.length===1&&(E[1]=E[0]),t.at[0]==="right"?m.left+=l:t.at[0]==="center"&&(m.left+=l/2),t.at[1]==="bottom"?m.top+=d:t.at[1]==="center"&&(m.top+=d/2),n=h(S.at,l,d),m.left+=n[0],m.top+=n[1],this.each(function(){var o,u,a=e(this),f=a.outerWidth(),c=a.outerHeight(),w=p(this,"marginLeft"),x=p(this,"marginTop"),T=f+w+p(this,"marginRight")+b.width,N=c+x+p(this,"marginBottom")+b.height,C=e.extend({},m),k=h(S.my,a.outerWidth(),a.outerHeight());t.my[0]==="right"?C.left-=f:t.my[0]==="center"&&(C.left-=f/2),t.my[1]==="bottom"?C.top-=c:t.my[1]==="center"&&(C.top-=c/2),C.left+=k[0],C.top+=k[1],e.support.offsetFractions||(C.left=s(C.left),C.top=s(C.top)),o={marginLeft:w,marginTop:x},e.each(["left","top"],function(r,i){e.ui.position[E[r]]&&e.ui.position[E[r]][i](C,{targetWidth:l,targetHeight:d,elemWidth:f,elemHeight:c,collisionPosition:o,collisionWidth:T,collisionHeight:N,offset:[n[0]+k[0],n[1]+k[1]],my:t.my,at:t.at,within:y,elem:a})}),e.fn.bgiframe&&a.bgiframe(),t.using&&(u=function(e){var n=v.left-C.left,s=n+l-f,o=v.top-C.top,u=o+d-c,h={target:{element:g,left:v.left,top:v.top,width:l,height:d},element:{element:a,left:C.left,top:C.top,width:f,height:c},horizontal:s<0?"left":n>0?"right":"center",vertical:u<0?"top":o>0?"bottom":"middle"};l<f&&i(n+s)<l&&(h.horizontal="center"),d<c&&i(o+u)<d&&(h.vertical="middle"),r(i(n),i(s))>r(i(o),i(u))?h.important="horizontal":h.important="vertical",t.using.call(this,e,h)}),a.offset(e.extend(C,{using:u}))})},e.ui.position={fit:{left:function(e,t){var n=t.within,i=n.isWindow?n.scrollLeft:n.offset.left,s=n.width,o=e.left-t.collisionPosition.marginLeft,u=i-o,a=o+t.collisionWidth-s-i,f;t.collisionWidth>s?u>0&&a<=0?(f=e.left+u+t.collisionWidth-s-i,e.left+=u-f):a>0&&u<=0?e.left=i:u>a?e.left=i+s-t.collisionWidth:e.left=i:u>0?e.left+=u:a>0?e.left-=a:e.left=r(e.left-o,e.left)},top:function(e,t){var n=t.within,i=n.isWindow?n.scrollTop:n.offset.top,s=t.within.height,o=e.top-t.collisionPosition.marginTop,u=i-o,a=o+t.collisionHeight-s-i,f;t.collisionHeight>s?u>0&&a<=0?(f=e.top+u+t.collisionHeight-s-i,e.top+=u-f):a>0&&u<=0?e.top=i:u>a?e.top=i+s-t.collisionHeight:e.top=i:u>0?e.top+=u:a>0?e.top-=a:e.top=r(e.top-o,e.top)}},flip:{left:function(e,t){var n=t.within,r=n.offset.left+n.scrollLeft,s=n.width,o=n.isWindow?n.scrollLeft:n.offset.left,u=e.left-t.collisionPosition.marginLeft,a=u-o,f=u+t.collisionWidth-s-o,l=t.my[0]==="left"?-t.elemWidth:t.my[0]==="right"?t.elemWidth:0,c=t.at[0]==="left"?t.targetWidth:t.at[0]==="right"?-t.targetWidth:0,h=-2*t.offset[0],p,d;if(a<0){p=e.left+l+c+h+t.collisionWidth-s-r;if(p<0||p<i(a))e.left+=l+c+h}else if(f>0){d=e.left-t.collisionPosition.marginLeft+l+c+h-o;if(d>0||i(d)<f)e.left+=l+c+h}},top:function(e,t){var n=t.within,r=n.offset.top+n.scrollTop,s=n.height,o=n.isWindow?n.scrollTop:n.offset.top,u=e.top-t.collisionPosition.marginTop,a=u-o,f=u+t.collisionHeight-s-o,l=t.my[1]==="top",c=l?-t.elemHeight:t.my[1]==="bottom"?t.elemHeight:0,h=t.at[1]==="top"?t.targetHeight:t.at[1]==="bottom"?-t.targetHeight:0,p=-2*t.offset[1],d,v;a<0?(v=e.top+c+h+p+t.collisionHeight-s-r,e.top+c+h+p>a&&(v<0||v<i(a))&&(e.top+=c+h+p)):f>0&&(d=e.top-t.collisionPosition.marginTop+c+h+p-o,e.top+c+h+p>f&&(d>0||i(d)<f)&&(e.top+=c+h+p))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,n,r,i,s,o=document.getElementsByTagName("body")[0],u=document.createElement("div");t=document.createElement(o?"div":"body"),r={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},o&&e.extend(r,{position:"absolute",left:"-1000px",top:"-1000px"});for(s in r)t.style[s]=r[s];t.appendChild(u),n=o||document.documentElement,n.insertBefore(t,n.firstChild),u.style.cssText="position: absolute; left: 10.7432222px;",i=e(u).offset().left,e.support.offsetFractions=i>10&&i<11,t.innerHTML="",n.removeChild(t)}(),e.uiBackCompat!==!1&&function(e){var n=e.fn.position;e.fn.position=function(r){if(!r||!r.offset)return n.call(this,r);var i=r.offset.split(" "),s=r.at.split(" ");return i.length===1&&(i[1]=i[0]),/^\d/.test(i[0])&&(i[0]="+"+i[0]),/^\d/.test(i[1])&&(i[1]="+"+i[1]),s.length===1&&(/left|center|right/.test(s[0])?s[1]="center":(s[1]=s[0],s[0]="center")),n.call(this,e.extend(r,{at:s[0]+i[0]+" "+s[1]+i[1],offset:t}))}}(jQuery)})(jQuery);(function(e,t){e.widget("ui.draggable",e.ui.mouse,{version:"1.9.2",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1},_create:function(){this.options.helper=="original"&&!/^(?:r|a|f)/.test(this.element.css("position"))&&(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},_destroy:function(){this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy()},_mouseCapture:function(t){var n=this.options;return this.helper||n.disabled||e(t.target).is(".ui-resizable-handle")?!1:(this.handle=this._getHandle(t),this.handle?(e(n.iframeFix===!0?"iframe":n.iframeFix).each(function(){e('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(e(this).offset()).appendTo("body")}),!0):!1)},_mouseStart:function(t){var n=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,n.cursorAt&&this._adjustOffsetFromHelper(n.cursorAt),n.containment&&this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_mouseDrag:function(t,n){this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute");if(!n){var r=this._uiHash();if(this._trigger("drag",t,r)===!1)return this._mouseUp({}),!1;this.position=r.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";return e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var n=!1;e.ui.ddmanager&&!this.options.dropBehaviour&&(n=e.ui.ddmanager.drop(this,t)),this.dropped&&(n=this.dropped,this.dropped=!1);var r=this.element[0],i=!1;while(r&&(r=r.parentNode))r==document&&(i=!0);if(!i&&this.options.helper==="original")return!1;if(this.options.revert=="invalid"&&!n||this.options.revert=="valid"&&n||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,n)){var s=this;e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){s._trigger("stop",t)!==!1&&s._clear()})}else this._trigger("stop",t)!==!1&&this._clear();return!1},_mouseUp:function(t){return e("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){var n=!this.options.handle||!e(this.options.handle,this.element).length?!0:!1;return e(this.options.handle,this.element).find("*").andSelf().each(function(){this==t.target&&(n=!0)}),n},_createHelper:function(t){var n=this.options,r=e.isFunction(n.helper)?e(n.helper.apply(this.element[0],[t])):n.helper=="clone"?this.element.clone().removeAttr("id"):this.element;return r.parents("body").length||r.appendTo(n.appendTo=="parent"?this.element[0].parentNode:n.appendTo),r[0]!=this.element[0]&&!/(fixed|absolute)/.test(r.css("position"))&&r.css("position","absolute"),r},_adjustOffsetFromHelper:function(t){typeof t=="string"&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&e.ui.ie)t={top:0,left:0};return{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var e=this.element.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t=this.options;t.containment=="parent"&&(t.containment=this.helper[0].parentNode);if(t.containment=="document"||t.containment=="window")this.containment=[t.containment=="document"?0:e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t.containment=="document"?0:e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,(t.containment=="document"?0:e(window).scrollLeft())+e(t.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(t.containment=="document"?0:e(window).scrollTop())+(e(t.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(t.containment)&&t.containment.constructor!=Array){var n=e(t.containment),r=n[0];if(!r)return;var i=n.offset(),s=e(r).css("overflow")!="hidden";this.containment=[(parseInt(e(r).css("borderLeftWidth"),10)||0)+(parseInt(e(r).css("paddingLeft"),10)||0),(parseInt(e(r).css("borderTopWidth"),10)||0)+(parseInt(e(r).css("paddingTop"),10)||0),(s?Math.max(r.scrollWidth,r.offsetWidth):r.offsetWidth)-(parseInt(e(r).css("borderLeftWidth"),10)||0)-(parseInt(e(r).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(s?Math.max(r.scrollHeight,r.offsetHeight):r.offsetHeight)-(parseInt(e(r).css("borderTopWidth"),10)||0)-(parseInt(e(r).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=n}else t.containment.constructor==Array&&(this.containment=t.containment)},_convertPositionTo:function(t,n){n||(n=this.position);var r=t=="absolute"?1:-1,i=this.options,s=this.cssPosition!="absolute"||this.scrollParent[0]!=document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(s[0].tagName);return{top:n.top+this.offset.relative.top*r+this.offset.parent.top*r-(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():o?0:s.scrollTop())*r,left:n.left+this.offset.relative.left*r+this.offset.parent.left*r-(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():o?0:s.scrollLeft())*r}},_generatePosition:function(t){var n=this.options,r=this.cssPosition!="absolute"||this.scrollParent[0]!=document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,i=/(html|body)/i.test(r[0].tagName),s=t.pageX,o=t.pageY;if(this.originalPosition){var u;if(this.containment){if(this.relative_container){var a=this.relative_container.offset();u=[this.containment[0]+a.left,this.containment[1]+a.top,this.containment[2]+a.left,this.containment[3]+a.top]}else u=this.containment;t.pageX-this.offset.click.left<u[0]&&(s=u[0]+this.offset.click.left),t.pageY-this.offset.click.top<u[1]&&(o=u[1]+this.offset.click.top),t.pageX-this.offset.click.left>u[2]&&(s=u[2]+this.offset.click.left),t.pageY-this.offset.click.top>u[3]&&(o=u[3]+this.offset.click.top)}if(n.grid){var f=n.grid[1]?this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1]:this.originalPageY;o=u?f-this.offset.click.top<u[1]||f-this.offset.click.top>u[3]?f-this.offset.click.top<u[1]?f+n.grid[1]:f-n.grid[1]:f:f;var l=n.grid[0]?this.originalPageX+Math.round((s-this.originalPageX)/n.grid[0])*n.grid[0]:this.originalPageX;s=u?l-this.offset.click.left<u[0]||l-this.offset.click.left>u[2]?l-this.offset.click.left<u[0]?l+n.grid[0]:l-n.grid[0]:l:l}}return{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():i?0:r.scrollTop()),left:s-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:r.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(t,n,r){return r=r||this._uiHash(),e.ui.plugin.call(this,t,[n,r]),t=="drag"&&(this.positionAbs=this._convertPositionTo("absolute")),e.Widget.prototype._trigger.call(this,t,n,r)},plugins:{},_uiHash:function(e){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,n){var r=e(this).data("draggable"),i=r.options,s=e.extend({},n,{item:r.element});r.sortables=[],e(i.connectToSortable).each(function(){var n=e.data(this,"sortable");n&&!n.options.disabled&&(r.sortables.push({instance:n,shouldRevert:n.options.revert}),n.refreshPositions(),n._trigger("activate",t,s))})},stop:function(t,n){var r=e(this).data("draggable"),i=e.extend({},n,{item:r.element});e.each(r.sortables,function(){this.instance.isOver?(this.instance.isOver=0,r.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=!0),this.instance._mouseStop(t),this.instance.options.helper=this.instance.options._helper,r.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",t,i))})},drag:function(t,n){var r=e(this).data("draggable"),i=this,s=function(t){var n=this.offset.click.top,r=this.offset.click.left,i=this.positionAbs.top,s=this.positionAbs.left,o=t.height,u=t.width,a=t.top,f=t.left;return e.ui.isOver(i+n,s+r,a,f,o,u)};e.each(r.sortables,function(s){var o=!1,u=this;this.instance.positionAbs=r.positionAbs,this.instance.helperProportions=r.helperProportions,this.instance.offset.click=r.offset.click,this.instance._intersectsWith(this.instance.containerCache)&&(o=!0,e.each(r.sortables,function(){return this.instance.positionAbs=r.positionAbs,this.instance.helperProportions=r.helperProportions,this.instance.offset.click=r.offset.click,this!=u&&this.instance._intersectsWith(this.instance.containerCache)&&e.ui.contains(u.instance.element[0],this.instance.element[0])&&(o=!1),o})),o?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=e(i).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return n.helper[0]},t.target=this.instance.currentItem[0],this.instance._mouseCapture(t,!0),this.instance._mouseStart(t,!0,!0),this.instance.offset.click.top=r.offset.click.top,this.instance.offset.click.left=r.offset.click.left,this.instance.offset.parent.left-=r.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=r.offset.parent.top-this.instance.offset.parent.top,r._trigger("toSortable",t),r.dropped=this.instance.element,r.currentItem=r.element,this.instance.fromOutside=r),this.instance.currentItem&&this.instance._mouseDrag(t)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",t,this.instance._uiHash(this.instance)),this.instance._mouseStop(t,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),r._trigger("fromSortable",t),r.dropped=!1)})}}),e.ui.plugin.add("draggable","cursor",{start:function(t,n){var r=e("body"),i=e(this).data("draggable").options;r.css("cursor")&&(i._cursor=r.css("cursor")),r.css("cursor",i.cursor)},stop:function(t,n){var r=e(this).data("draggable").options;r._cursor&&e("body").css("cursor",r._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,n){var r=e(n.helper),i=e(this).data("draggable").options;r.css("opacity")&&(i._opacity=r.css("opacity")),r.css("opacity",i.opacity)},stop:function(t,n){var r=e(this).data("draggable").options;r._opacity&&e(n.helper).css("opacity",r._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(t,n){var r=e(this).data("draggable");r.scrollParent[0]!=document&&r.scrollParent[0].tagName!="HTML"&&(r.overflowOffset=r.scrollParent.offset())},drag:function(t,n){var r=e(this).data("draggable"),i=r.options,s=!1;if(r.scrollParent[0]!=document&&r.scrollParent[0].tagName!="HTML"){if(!i.axis||i.axis!="x")r.overflowOffset.top+r.scrollParent[0].offsetHeight-t.pageY<i.scrollSensitivity?r.scrollParent[0].scrollTop=s=r.scrollParent[0].scrollTop+i.scrollSpeed:t.pageY-r.overflowOffset.top<i.scrollSensitivity&&(r.scrollParent[0].scrollTop=s=r.scrollParent[0].scrollTop-i.scrollSpeed);if(!i.axis||i.axis!="y")r.overflowOffset.left+r.scrollParent[0].offsetWidth-t.pageX<i.scrollSensitivity?r.scrollParent[0].scrollLeft=s=r.scrollParent[0].scrollLeft+i.scrollSpeed:t.pageX-r.overflowOffset.left<i.scrollSensitivity&&(r.scrollParent[0].scrollLeft=s=r.scrollParent[0].scrollLeft-i.scrollSpeed)}else{if(!i.axis||i.axis!="x")t.pageY-e(document).scrollTop()<i.scrollSensitivity?s=e(document).scrollTop(e(document).scrollTop()-i.scrollSpeed):e(window).height()-(t.pageY-e(document).scrollTop())<i.scrollSensitivity&&(s=e(document).scrollTop(e(document).scrollTop()+i.scrollSpeed));if(!i.axis||i.axis!="y")t.pageX-e(document).scrollLeft()<i.scrollSensitivity?s=e(document).scrollLeft(e(document).scrollLeft()-i.scrollSpeed):e(window).width()-(t.pageX-e(document).scrollLeft())<i.scrollSensitivity&&(s=e(document).scrollLeft(e(document).scrollLeft()+i.scrollSpeed))}s!==!1&&e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(r,t)}}),e.ui.plugin.add("draggable","snap",{start:function(t,n){var r=e(this).data("draggable"),i=r.options;r.snapElements=[],e(i.snap.constructor!=String?i.snap.items||":data(draggable)":i.snap).each(function(){var t=e(this),n=t.offset();this!=r.element[0]&&r.snapElements.push({item:this,width:t.outerWidth(),height:t.outerHeight(),top:n.top,left:n.left})})},drag:function(t,n){var r=e(this).data("draggable"),i=r.options,s=i.snapTolerance,o=n.offset.left,u=o+r.helperProportions.width,a=n.offset.top,f=a+r.helperProportions.height;for(var l=r.snapElements.length-1;l>=0;l--){var c=r.snapElements[l].left,h=c+r.snapElements[l].width,p=r.snapElements[l].top,d=p+r.snapElements[l].height;if(!(c-s<o&&o<h+s&&p-s<a&&a<d+s||c-s<o&&o<h+s&&p-s<f&&f<d+s||c-s<u&&u<h+s&&p-s<a&&a<d+s||c-s<u&&u<h+s&&p-s<f&&f<d+s)){r.snapElements[l].snapping&&r.options.snap.release&&r.options.snap.release.call(r.element,t,e.extend(r._uiHash(),{snapItem:r.snapElements[l].item})),r.snapElements[l].snapping=!1;continue}if(i.snapMode!="inner"){var v=Math.abs(p-f)<=s,m=Math.abs(d-a)<=s,g=Math.abs(c-u)<=s,y=Math.abs(h-o)<=s;v&&(n.position.top=r._convertPositionTo("relative",{top:p-r.helperProportions.height,left:0}).top-r.margins.top),m&&(n.position.top=r._convertPositionTo("relative",{top:d,left:0}).top-r.margins.top),g&&(n.position.left=r._convertPositionTo("relative",{top:0,left:c-r.helperProportions.width}).left-r.margins.left),y&&(n.position.left=r._convertPositionTo("relative",{top:0,left:h}).left-r.margins.left)}var b=v||m||g||y;if(i.snapMode!="outer"){var v=Math.abs(p-a)<=s,m=Math.abs(d-f)<=s,g=Math.abs(c-o)<=s,y=Math.abs(h-u)<=s;v&&(n.position.top=r._convertPositionTo("relative",{top:p,left:0}).top-r.margins.top),m&&(n.position.top=r._convertPositionTo("relative",{top:d-r.helperProportions.height,left:0}).top-r.margins.top),g&&(n.position.left=r._convertPositionTo("relative",{top:0,left:c}).left-r.margins.left),y&&(n.position.left=r._convertPositionTo("relative",{top:0,left:h-r.helperProportions.width}).left-r.margins.left)}!r.snapElements[l].snapping&&(v||m||g||y||b)&&r.options.snap.snap&&r.options.snap.snap.call(r.element,t,e.extend(r._uiHash(),{snapItem:r.snapElements[l].item})),r.snapElements[l].snapping=v||m||g||y||b}}}),e.ui.plugin.add("draggable","stack",{start:function(t,n){var r=e(this).data("draggable").options,i=e.makeArray(e(r.stack)).sort(function(t,n){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(n).css("zIndex"),10)||0)});if(!i.length)return;var s=parseInt(i[0].style.zIndex)||0;e(i).each(function(e){this.style.zIndex=s+e}),this[0].style.zIndex=s+i.length}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,n){var r=e(n.helper),i=e(this).data("draggable").options;r.css("zIndex")&&(i._zIndex=r.css("zIndex")),r.css("zIndex",i.zIndex)},stop:function(t,n){var r=e(this).data("draggable").options;r._zIndex&&e(n.helper).css("zIndex",r._zIndex)}})})(jQuery);(function(e,t){e.widget("ui.droppable",{version:"1.9.2",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect"},_create:function(){var t=this.options,n=t.accept;this.isover=0,this.isout=1,this.accept=e.isFunction(n)?n:function(e){return e.is(n)},this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight},e.ui.ddmanager.droppables[t.scope]=e.ui.ddmanager.droppables[t.scope]||[],e.ui.ddmanager.droppables[t.scope].push(this),t.addClasses&&this.element.addClass("ui-droppable")},_destroy:function(){var t=e.ui.ddmanager.droppables[this.options.scope];for(var n=0;n<t.length;n++)t[n]==this&&t.splice(n,1);this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,n){t=="accept"&&(this.accept=e.isFunction(n)?n:function(e){return e.is(n)}),e.Widget.prototype._setOption.apply(this,arguments)},_activate:function(t){var n=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),n&&this._trigger("activate",t,this.ui(n))},_deactivate:function(t){var n=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),n&&this._trigger("deactivate",t,this.ui(n))},_over:function(t){var n=e.ui.ddmanager.current;if(!n||(n.currentItem||n.element)[0]==this.element[0])return;this.accept.call(this.element[0],n.currentItem||n.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(n)))},_out:function(t){var n=e.ui.ddmanager.current;if(!n||(n.currentItem||n.element)[0]==this.element[0])return;this.accept.call(this.element[0],n.currentItem||n.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(n)))},_drop:function(t,n){var r=n||e.ui.ddmanager.current;if(!r||(r.currentItem||r.element)[0]==this.element[0])return!1;var i=!1;return this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var t=e.data(this,"droppable");if(t.options.greedy&&!t.options.disabled&&t.options.scope==r.options.scope&&t.accept.call(t.element[0],r.currentItem||r.element)&&e.ui.intersect(r,e.extend(t,{offset:t.element.offset()}),t.options.tolerance))return i=!0,!1}),i?!1:this.accept.call(this.element[0],r.currentItem||r.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(r)),this.element):!1},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(t,n,r){if(!n.offset)return!1;var i=(t.positionAbs||t.position.absolute).left,s=i+t.helperProportions.width,o=(t.positionAbs||t.position.absolute).top,u=o+t.helperProportions.height,a=n.offset.left,f=a+n.proportions.width,l=n.offset.top,c=l+n.proportions.height;switch(r){case"fit":return a<=i&&s<=f&&l<=o&&u<=c;case"intersect":return a<i+t.helperProportions.width/2&&s-t.helperProportions.width/2<f&&l<o+t.helperProportions.height/2&&u-t.helperProportions.height/2<c;case"pointer":var h=(t.positionAbs||t.position.absolute).left+(t.clickOffset||t.offset.click).left,p=(t.positionAbs||t.position.absolute).top+(t.clickOffset||t.offset.click).top,d=e.ui.isOver(p,h,l,a,n.proportions.height,n.proportions.width);return d;case"touch":return(o>=l&&o<=c||u>=l&&u<=c||o<l&&u>c)&&(i>=a&&i<=f||s>=a&&s<=f||i<a&&s>f);default:return!1}},e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,n){var r=e.ui.ddmanager.droppables[t.options.scope]||[],i=n?n.type:null,s=(t.currentItem||t.element).find(":data(droppable)").andSelf();e:for(var o=0;o<r.length;o++){if(r[o].options.disabled||t&&!r[o].accept.call(r[o].element[0],t.currentItem||t.element))continue;for(var u=0;u<s.length;u++)if(s[u]==r[o].element[0]){r[o].proportions.height=0;continue e}r[o].visible=r[o].element.css("display")!="none";if(!r[o].visible)continue;i=="mousedown"&&r[o]._activate.call(r[o],n),r[o].offset=r[o].element.offset(),r[o].proportions={width:r[o].element[0].offsetWidth,height:r[o].element[0].offsetHeight}}},drop:function(t,n){var r=!1;return e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options)return;!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance)&&(r=this._drop.call(this,n)||r),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=1,this.isover=0,this._deactivate.call(this,n))}),r},dragStart:function(t,n){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,n)})},drag:function(t,n){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,n),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(this.options.disabled||this.greedyChild||!this.visible)return;var r=e.ui.intersect(t,this,this.options.tolerance),i=!r&&this.isover==1?"isout":r&&this.isover==0?"isover":null;if(!i)return;var s;if(this.options.greedy){var o=this.options.scope,u=this.element.parents(":data(droppable)").filter(function(){return e.data(this,"droppable").options.scope===o});u.length&&(s=e.data(u[0],"droppable"),s.greedyChild=i=="isover"?1:0)}s&&i=="isover"&&(s.isover=0,s.isout=1,s._out.call(s,n)),this[i]=1,this[i=="isout"?"isover":"isout"]=0,this[i=="isover"?"_over":"_out"].call(this,n),s&&i=="isout"&&(s.isout=0,s.isover=1,s._over.call(s,n))})},dragStop:function(t,n){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,n)}}})(jQuery);(function(e,t){e.widget("ui.resizable",e.ui.mouse,{version:"1.9.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1e3},_create:function(){var t=this,n=this.options;this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!n.aspectRatio,aspectRatio:n.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:n.helper||n.ghost||n.animate?n.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("resizable",this.element.data("resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=n.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se");if(this.handles.constructor==String){this.handles=="all"&&(this.handles="n,e,s,w,se,sw,ne,nw");var r=this.handles.split(",");this.handles={};for(var i=0;i<r.length;i++){var s=e.trim(r[i]),o="ui-resizable-"+s,u=e('<div class="ui-resizable-handle '+o+'"></div>');u.css({zIndex:n.zIndex}),"se"==s&&u.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(u)}}this._renderAxis=function(t){t=t||this.element;for(var n in this.handles){this.handles[n].constructor==String&&(this.handles[n]=e(this.handles[n],this.element).show());if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var r=e(this.handles[n],this.element),i=0;i=/sw|ne|nw|se|n|s/.test(n)?r.outerHeight():r.outerWidth();var s=["padding",/ne|nw|n/.test(n)?"Top":/se|sw|s/.test(n)?"Bottom":/^e$/.test(n)?"Right":"Left"].join("");t.css(s,i),this._proportionallyResize()}if(!e(this.handles[n]).length)continue}},this._renderAxis(this.element),this._handles=e(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){if(!t.resizing){if(this.className)var e=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);t.axis=e&&e[1]?e[1]:"se"}}),n.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){if(n.disabled)return;e(this).removeClass("ui-resizable-autohide"),t._handles.show()}).mouseleave(function(){if(n.disabled)return;t.resizing||(e(this).addClass("ui-resizable-autohide"),t._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){t(this.element);var n=this.element;this.originalElement.css({position:n.css("position"),width:n.outerWidth(),height:n.outerHeight(),top:n.css("top"),left:n.css("left")}).insertAfter(n),n.remove()}return this.originalElement.css("resize",this.originalResizeStyle),t(this.originalElement),this},_mouseCapture:function(t){var n=!1;for(var r in this.handles)e(this.handles[r])[0]==t.target&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(t){var r=this.options,i=this.element.position(),s=this.element;this.resizing=!0,this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()},(s.is(".ui-draggable")||/absolute/.test(s.css("position")))&&s.css({position:"absolute",top:i.top,left:i.left}),this._renderProxy();var o=n(this.helper.css("left")),u=n(this.helper.css("top"));r.containment&&(o+=e(r.containment).scrollLeft()||0,u+=e(r.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:o,top:u},this.size=this._helper?{width:s.outerWidth(),height:s.outerHeight()}:{width:s.width(),height:s.height()},this.originalSize=this._helper?{width:s.outerWidth(),height:s.outerHeight()}:{width:s.width(),height:s.height()},this.originalPosition={left:o,top:u},this.sizeDiff={width:s.outerWidth()-s.width(),height:s.outerHeight()-s.height()},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio=typeof r.aspectRatio=="number"?r.aspectRatio:this.originalSize.width/this.originalSize.height||1;var a=e(".ui-resizable-"+this.axis).css("cursor");return e("body").css("cursor",a=="auto"?this.axis+"-resize":a),s.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(e){var t=this.helper,n=this.options,r={},i=this,s=this.originalMousePosition,o=this.axis,u=e.pageX-s.left||0,a=e.pageY-s.top||0,f=this._change[o];if(!f)return!1;var l=f.apply(this,[e,u,a]);this._updateVirtualBoundaries(e.shiftKey);if(this._aspectRatio||e.shiftKey)l=this._updateRatio(l,e);return l=this._respectSize(l,e),this._propagate("resize",e),t.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"}),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),this._updateCache(l),this._trigger("resize",e,this.ui()),!1},_mouseStop:function(t){this.resizing=!1;var n=this.options,r=this;if(this._helper){var i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),o=s&&e.ui.hasScroll(i[0],"left")?0:r.sizeDiff.height,u=s?0:r.sizeDiff.width,a={width:r.helper.width()-u,height:r.helper.height()-o},f=parseInt(r.element.css("left"),10)+(r.position.left-r.originalPosition.left)||null,l=parseInt(r.element.css("top"),10)+(r.position.top-r.originalPosition.top)||null;n.animate||this.element.css(e.extend(a,{top:l,left:f})),r.helper.height(r.size.height),r.helper.width(r.size.width),this._helper&&!n.animate&&this._proportionallyResize()}return e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(e){var t=this.options,n,i,s,o,u;u={minWidth:r(t.minWidth)?t.minWidth:0,maxWidth:r(t.maxWidth)?t.maxWidth:Infinity,minHeight:r(t.minHeight)?t.minHeight:0,maxHeight:r(t.maxHeight)?t.maxHeight:Infinity};if(this._aspectRatio||e)n=u.minHeight*this.aspectRatio,s=u.minWidth/this.aspectRatio,i=u.maxHeight*this.aspectRatio,o=u.maxWidth/this.aspectRatio,n>u.minWidth&&(u.minWidth=n),s>u.minHeight&&(u.minHeight=s),i<u.maxWidth&&(u.maxWidth=i),o<u.maxHeight&&(u.maxHeight=o);this._vBoundaries=u},_updateCache:function(e){var t=this.options;this.offset=this.helper.offset(),r(e.left)&&(this.position.left=e.left),r(e.top)&&(this.position.top=e.top),r(e.height)&&(this.size.height=e.height),r(e.width)&&(this.size.width=e.width)},_updateRatio:function(e,t){var n=this.options,i=this.position,s=this.size,o=this.axis;return r(e.height)?e.width=e.height*this.aspectRatio:r(e.width)&&(e.height=e.width/this.aspectRatio),o=="sw"&&(e.left=i.left+(s.width-e.width),e.top=null),o=="nw"&&(e.top=i.top+(s.height-e.height),e.left=i.left+(s.width-e.width)),e},_respectSize:function(e,t){var n=this.helper,i=this._vBoundaries,s=this._aspectRatio||t.shiftKey,o=this.axis,u=r(e.width)&&i.maxWidth&&i.maxWidth<e.width,a=r(e.height)&&i.maxHeight&&i.maxHeight<e.height,f=r(e.width)&&i.minWidth&&i.minWidth>e.width,l=r(e.height)&&i.minHeight&&i.minHeight>e.height;f&&(e.width=i.minWidth),l&&(e.height=i.minHeight),u&&(e.width=i.maxWidth),a&&(e.height=i.maxHeight);var c=this.originalPosition.left+this.originalSize.width,h=this.position.top+this.size.height,p=/sw|nw|w/.test(o),d=/nw|ne|n/.test(o);f&&p&&(e.left=c-i.minWidth),u&&p&&(e.left=c-i.maxWidth),l&&d&&(e.top=h-i.minHeight),a&&d&&(e.top=h-i.maxHeight);var v=!e.width&&!e.height;return v&&!e.left&&e.top?e.top=null:v&&!e.top&&e.left&&(e.left=null),e},_proportionallyResize:function(){var t=this.options;if(!this._proportionallyResizeElements.length)return;var n=this.helper||this.element;for(var r=0;r<this._proportionallyResizeElements.length;r++){var i=this._proportionallyResizeElements[r];if(!this.borderDif){var s=[i.css("borderTopWidth"),i.css("borderRightWidth"),i.css("borderBottomWidth"),i.css("borderLeftWidth")],o=[i.css("paddingTop"),i.css("paddingRight"),i.css("paddingBottom"),i.css("paddingLeft")];this.borderDif=e.map(s,function(e,t){var n=parseInt(e,10)||0,r=parseInt(o[t],10)||0;return n+r})}i.css({height:n.height()-this.borderDif[0]-this.borderDif[2]||0,width:n.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var t=this.element,n=this.options;this.elementOffset=t.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var r=e.ui.ie6?1:0,i=e.ui.ie6?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+i,height:this.element.outerHeight()+i,position:"absolute",left:this.elementOffset.left-r+"px",top:this.elementOffset.top-r+"px",zIndex:++n.zIndex}),this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(e,t,n){return{width:this.originalSize.width+t}},w:function(e,t,n){var r=this.options,i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,n){var r=this.options,i=this.originalSize,s=this.originalPosition;return{top:s.top+n,height:i.height-n}},s:function(e,t,n){return{height:this.originalSize.height+n}},se:function(t,n,r){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,n,r]))},sw:function(t,n,r){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,n,r]))},ne:function(t,n,r){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,n,r]))},nw:function(t,n,r){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,n,r]))}},_propagate:function(t,n){e.ui.plugin.call(this,t,[n,this.ui()]),t!="resize"&&this._trigger(t,n,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","alsoResize",{start:function(t,n){var r=e(this).data("resizable"),i=r.options,s=function(t){e(t).each(function(){var t=e(this);t.data("resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})};typeof i.alsoResize=="object"&&!i.alsoResize.parentNode?i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):e.each(i.alsoResize,function(e){s(e)}):s(i.alsoResize)},resize:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r.originalSize,o=r.originalPosition,u={height:r.size.height-s.height||0,width:r.size.width-s.width||0,top:r.position.top-o.top||0,left:r.position.left-o.left||0},a=function(t,r){e(t).each(function(){var t=e(this),i=e(this).data("resizable-alsoresize"),s={},o=r&&r.length?r:t.parents(n.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(o,function(e,t){var n=(i[t]||0)+(u[t]||0);n&&n>=0&&(s[t]=n||null)}),t.css(s)})};typeof i.alsoResize=="object"&&!i.alsoResize.nodeType?e.each(i.alsoResize,function(e,t){a(e,t)}):a(i.alsoResize)},stop:function(t,n){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","animate",{stop:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r._proportionallyResizeElements,o=s.length&&/textarea/i.test(s[0].nodeName),u=o&&e.ui.hasScroll(s[0],"left")?0:r.sizeDiff.height,a=o?0:r.sizeDiff.width,f={width:r.size.width-a,height:r.size.height-u},l=parseInt(r.element.css("left"),10)+(r.position.left-r.originalPosition.left)||null,c=parseInt(r.element.css("top"),10)+(r.position.top-r.originalPosition.top)||null;r.element.animate(e.extend(f,c&&l?{top:c,left:l}:{}),{duration:i.animateDuration,easing:i.animateEasing,step:function(){var n={width:parseInt(r.element.css("width"),10),height:parseInt(r.element.css("height"),10),top:parseInt(r.element.css("top"),10),left:parseInt(r.element.css("left"),10)};s&&s.length&&e(s[0]).css({width:n.width,height:n.height}),r._updateCache(n),r._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(t,r){var i=e(this).data("resizable"),s=i.options,o=i.element,u=s.containment,a=u instanceof e?u.get(0):/parent/.test(u)?o.parent().get(0):u;if(!a)return;i.containerElement=e(a);if(/document/.test(u)||u==document)i.containerOffset={left:0,top:0},i.containerPosition={left:0,top:0},i.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight};else{var f=e(a),l=[];e(["Top","Right","Left","Bottom"]).each(function(e,t){l[e]=n(f.css("padding"+t))}),i.containerOffset=f.offset(),i.containerPosition=f.position(),i.containerSize={height:f.innerHeight()-l[3],width:f.innerWidth()-l[1]};var c=i.containerOffset,h=i.containerSize.height,p=i.containerSize.width,d=e.ui.hasScroll(a,"left")?a.scrollWidth:p,v=e.ui.hasScroll(a)?a.scrollHeight:h;i.parentData={element:a,left:c.left,top:c.top,width:d,height:v}}},resize:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r.containerSize,o=r.containerOffset,u=r.size,a=r.position,f=r._aspectRatio||t.shiftKey,l={top:0,left:0},c=r.containerElement;c[0]!=document&&/static/.test(c.css("position"))&&(l=o),a.left<(r._helper?o.left:0)&&(r.size.width=r.size.width+(r._helper?r.position.left-o.left:r.position.left-l.left),f&&(r.size.height=r.size.width/r.aspectRatio),r.position.left=i.helper?o.left:0),a.top<(r._helper?o.top:0)&&(r.size.height=r.size.height+(r._helper?r.position.top-o.top:r.position.top),f&&(r.size.width=r.size.height*r.aspectRatio),r.position.top=r._helper?o.top:0),r.offset.left=r.parentData.left+r.position.left,r.offset.top=r.parentData.top+r.position.top;var h=Math.abs((r._helper?r.offset.left-l.left:r.offset.left-l.left)+r.sizeDiff.width),p=Math.abs((r._helper?r.offset.top-l.top:r.offset.top-o.top)+r.sizeDiff.height),d=r.containerElement.get(0)==r.element.parent().get(0),v=/relative|absolute/.test(r.containerElement.css("position"));d&&v&&(h-=r.parentData.left),h+r.size.width>=r.parentData.width&&(r.size.width=r.parentData.width-h,f&&(r.size.height=r.size.width/r.aspectRatio)),p+r.size.height>=r.parentData.height&&(r.size.height=r.parentData.height-p,f&&(r.size.width=r.size.height*r.aspectRatio))},stop:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r.position,o=r.containerOffset,u=r.containerPosition,a=r.containerElement,f=e(r.helper),l=f.offset(),c=f.outerWidth()-r.sizeDiff.width,h=f.outerHeight()-r.sizeDiff.height;r._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:l.left-u.left-o.left,width:c,height:h}),r._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:l.left-u.left-o.left,width:c,height:h})}}),e.ui.plugin.add("resizable","ghost",{start:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r.size;r.ghost=r.originalElement.clone(),r.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof i.ghost=="string"?i.ghost:""),r.ghost.appendTo(r.helper)},resize:function(t,n){var r=e(this).data("resizable"),i=r.options;r.ghost&&r.ghost.css({position:"relative",height:r.size.height,width:r.size.width})},stop:function(t,n){var r=e(this).data("resizable"),i=r.options;r.ghost&&r.helper&&r.helper.get(0).removeChild(r.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r.size,o=r.originalSize,u=r.originalPosition,a=r.axis,f=i._aspectRatio||t.shiftKey;i.grid=typeof i.grid=="number"?[i.grid,i.grid]:i.grid;var l=Math.round((s.width-o.width)/(i.grid[0]||1))*(i.grid[0]||1),c=Math.round((s.height-o.height)/(i.grid[1]||1))*(i.grid[1]||1);/^(se|s|e)$/.test(a)?(r.size.width=o.width+l,r.size.height=o.height+c):/^(ne)$/.test(a)?(r.size.width=o.width+l,r.size.height=o.height+c,r.position.top=u.top-c):/^(sw)$/.test(a)?(r.size.width=o.width+l,r.size.height=o.height+c,r.position.left=u.left-l):(r.size.width=o.width+l,r.size.height=o.height+c,r.position.top=u.top-c,r.position.left=u.left-l)}});var n=function(e){return parseInt(e,10)||0},r=function(e){return!isNaN(parseInt(e,10))}})(jQuery);(function(e,t){e.widget("ui.selectable",e.ui.mouse,{version:"1.9.2",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch"},_create:function(){var t=this;this.element.addClass("ui-selectable"),this.dragged=!1;var n;this.refresh=function(){n=e(t.options.filter,t.element[0]),n.addClass("ui-selectee"),n.each(function(){var t=e(this),n=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:n.left,top:n.top,right:n.left+t.outerWidth(),bottom:n.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=n.addClass("ui-selectee"),this._mouseInit(),this.helper=e("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var n=this;this.opos=[t.pageX,t.pageY];if(this.options.disabled)return;var r=this.options;this.selectees=e(r.filter,this.element[0]),this._trigger("start",t),e(r.appendTo).append(this.helper),this.helper.css({left:t.clientX,top:t.clientY,width:0,height:0}),r.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var r=e.data(this,"selectable-item");r.startselected=!0,!t.metaKey&&!t.ctrlKey&&(r.$element.removeClass("ui-selected"),r.selected=!1,r.$element.addClass("ui-unselecting"),r.unselecting=!0,n._trigger("unselecting",t,{unselecting:r.element}))}),e(t.target).parents().andSelf().each(function(){var r=e.data(this,"selectable-item");if(r){var i=!t.metaKey&&!t.ctrlKey||!r.$element.hasClass("ui-selected");return r.$element.removeClass(i?"ui-unselecting":"ui-selected").addClass(i?"ui-selecting":"ui-unselecting"),r.unselecting=!i,r.selecting=i,r.selected=i,i?n._trigger("selecting",t,{selecting:r.element}):n._trigger("unselecting",t,{unselecting:r.element}),!1}})},_mouseDrag:function(t){var n=this;this.dragged=!0;if(this.options.disabled)return;var r=this.options,i=this.opos[0],s=this.opos[1],o=t.pageX,u=t.pageY;if(i>o){var a=o;o=i,i=a}if(s>u){var a=u;u=s,s=a}return this.helper.css({left:i,top:s,width:o-i,height:u-s}),this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!a||a.element==n.element[0])return;var f=!1;r.tolerance=="touch"?f=!(a.left>o||a.right<i||a.top>u||a.bottom<s):r.tolerance=="fit"&&(f=a.left>i&&a.right<o&&a.top>s&&a.bottom<u),f?(a.selected&&(a.$element.removeClass("ui-selected"),a.selected=!1),a.unselecting&&(a.$element.removeClass("ui-unselecting"),a.unselecting=!1),a.selecting||(a.$element.addClass("ui-selecting"),a.selecting=!0,n._trigger("selecting",t,{selecting:a.element}))):(a.selecting&&((t.metaKey||t.ctrlKey)&&a.startselected?(a.$element.removeClass("ui-selecting"),a.selecting=!1,a.$element.addClass("ui-selected"),a.selected=!0):(a.$element.removeClass("ui-selecting"),a.selecting=!1,a.startselected&&(a.$element.addClass("ui-unselecting"),a.unselecting=!0),n._trigger("unselecting",t,{unselecting:a.element}))),a.selected&&!t.metaKey&&!t.ctrlKey&&!a.startselected&&(a.$element.removeClass("ui-selected"),a.selected=!1,a.$element.addClass("ui-unselecting"),a.unselecting=!0,n._trigger("unselecting",t,{unselecting:a.element})))}),!1},_mouseStop:function(t){var n=this;this.dragged=!1;var r=this.options;return e(".ui-unselecting",this.element[0]).each(function(){var r=e.data(this,"selectable-item");r.$element.removeClass("ui-unselecting"),r.unselecting=!1,r.startselected=!1,n._trigger("unselected",t,{unselected:r.element})}),e(".ui-selecting",this.element[0]).each(function(){var r=e.data(this,"selectable-item");r.$element.removeClass("ui-selecting").addClass("ui-selected"),r.selecting=!1,r.selected=!0,r.startselected=!0,n._trigger("selected",t,{selected:r.element})}),this._trigger("stop",t),this.helper.remove(),!1}})})(jQuery);(function(e,t){e.widget("ui.sortable",e.ui.mouse,{version:"1.9.2",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3},_create:function(){var e=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?e.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var e=this.items.length-1;e>=0;e--)this.items[e].item.removeData(this.widgetName+"-item");return this},_setOption:function(t,n){t==="disabled"?(this.options[t]=n,this.widget().toggleClass("ui-sortable-disabled",!!n)):e.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(t,n){var r=this;if(this.reverting)return!1;if(this.options.disabled||this.options.type=="static")return!1;this._refreshItems(t);var i=null,s=e(t.target).parents().each(function(){if(e.data(this,r.widgetName+"-item")==r)return i=e(this),!1});e.data(t.target,r.widgetName+"-item")==r&&(i=e(t.target));if(!i)return!1;if(this.options.handle&&!n){var o=!1;e(this.options.handle,i).find("*").andSelf().each(function(){this==t.target&&(o=!0)});if(!o)return!1}return this.currentItem=i,this._removeCurrentsFromItems(),!0},_mouseStart:function(t,n,r){var i=this.options;this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!=this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),i.containment&&this._setContainment(),i.cursor&&(e("body").css("cursor")&&(this._storedCursor=e("body").css("cursor")),e("body").css("cursor",i.cursor)),i.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",i.opacity)),i.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",i.zIndex)),this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions();if(!r)for(var s=this.containers.length-1;s>=0;s--)this.containers[s]._trigger("activate",t,this._uiHash(this));return e.ui.ddmanager&&(e.ui.ddmanager.current=this),e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(t),!0},_mouseDrag:function(t){this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs);if(this.options.scroll){var n=this.options,r=!1;this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY<n.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+n.scrollSpeed:t.pageY-this.overflowOffset.top<n.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-n.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-t.pageX<n.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+n.scrollSpeed:t.pageX-this.overflowOffset.left<n.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-n.scrollSpeed)):(t.pageY-e(document).scrollTop()<n.scrollSensitivity?r=e(document).scrollTop(e(document).scrollTop()-n.scrollSpeed):e(window).height()-(t.pageY-e(document).scrollTop())<n.scrollSensitivity&&(r=e(document).scrollTop(e(document).scrollTop()+n.scrollSpeed)),t.pageX-e(document).scrollLeft()<n.scrollSensitivity?r=e(document).scrollLeft(e(document).scrollLeft()-n.scrollSpeed):e(window).width()-(t.pageX-e(document).scrollLeft())<n.scrollSensitivity&&(r=e(document).scrollLeft(e(document).scrollLeft()+n.scrollSpeed))),r!==!1&&e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(var i=this.items.length-1;i>=0;i--){var s=this.items[i],o=s.item[0],u=this._intersectsWithPointer(s);if(!u)continue;if(s.instance!==this.currentContainer)continue;if(o!=this.currentItem[0]&&this.placeholder[u==1?"next":"prev"]()[0]!=o&&!e.contains(this.placeholder[0],o)&&(this.options.type=="semi-dynamic"?!e.contains(this.element[0],o):!0)){this.direction=u==1?"down":"up";if(this.options.tolerance!="pointer"&&!this._intersectsWithSides(s))break;this._rearrange(t,s),this._trigger("change",t,this._uiHash());break}}return this._contactContainers(t),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,n){if(!t)return;e.ui.ddmanager&&!this.options.dropBehaviour&&e.ui.ddmanager.drop(this,t);if(this.options.revert){var r=this,i=this.placeholder.offset();this.reverting=!0,e(this.helper).animate({left:i.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:i.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){r._clear(t)})}else this._clear(t,n);return!1},cancel:function(){if(this.dragging){this._mouseUp({target:null}),this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var t=this.containers.length-1;t>=0;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),e.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?e(this.domPosition.prev).after(this.currentItem):e(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(t){var n=this._getItemsAsjQuery(t&&t.connected),r=[];return t=t||{},e(n).each(function(){var n=(e(t.item||this).attr(t.attribute||"id")||"").match(t.expression||/(.+)[-=_](.+)/);n&&r.push((t.key||n[1]+"[]")+"="+(t.key&&t.expression?n[1]:n[2]))}),!r.length&&t.key&&r.push(t.key+"="),r.join("&")},toArray:function(t){var n=this._getItemsAsjQuery(t&&t.connected),r=[];return t=t||{},n.each(function(){r.push(e(t.item||this).attr(t.attribute||"id")||"")}),r},_intersectsWith:function(e){var t=this.positionAbs.left,n=t+this.helperProportions.width,r=this.positionAbs.top,i=r+this.helperProportions.height,s=e.left,o=s+e.width,u=e.top,a=u+e.height,f=this.offset.click.top,l=this.offset.click.left,c=r+f>u&&r+f<a&&t+l>s&&t+l<o;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>e[this.floating?"width":"height"]?c:s<t+this.helperProportions.width/2&&n-this.helperProportions.width/2<o&&u<r+this.helperProportions.height/2&&i-this.helperProportions.height/2<a},_intersectsWithPointer:function(t){var n=this.options.axis==="x"||e.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),r=this.options.axis==="y"||e.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),i=n&&r,s=this._getDragVerticalDirection(),o=this._getDragHorizontalDirection();return i?this.floating?o&&o=="right"||s=="down"?2:1:s&&(s=="down"?2:1):!1},_intersectsWithSides:function(t){var n=e.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),r=e.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),i=this._getDragVerticalDirection(),s=this._getDragHorizontalDirection();return this.floating&&s?s=="right"&&r||s=="left"&&!r:i&&(i=="down"&&n||i=="up"&&!n)},_getDragVerticalDirection:function(){var e=this.positionAbs.top-this.lastPositionAbs.top;return e!=0&&(e>0?"down":"up")},_getDragHorizontalDirection:function(){var e=this.positionAbs.left-this.lastPositionAbs.left;return e!=0&&(e>0?"right":"left")},refresh:function(e){return this._refreshItems(e),this.refreshPositions(),this},_connectWith:function(){var e=this.options;return e.connectWith.constructor==String?[e.connectWith]:e.connectWith},_getItemsAsjQuery:function(t){var n=[],r=[],i=this._connectWith();if(i&&t)for(var s=i.length-1;s>=0;s--){var o=e(i[s]);for(var u=o.length-1;u>=0;u--){var a=e.data(o[u],this.widgetName);a&&a!=this&&!a.options.disabled&&r.push([e.isFunction(a.options.items)?a.options.items.call(a.element):e(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a])}}r.push([e.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):e(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(var s=r.length-1;s>=0;s--)r[s][0].each(function(){n.push(this)});return e(n)},_removeCurrentsFromItems:function(){var t=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=e.grep(this.items,function(e){for(var n=0;n<t.length;n++)if(t[n]==e.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var n=this.items,r=[[e.isFunction(this.options.items)?this.options.items.call(this.element[0],t,{item:this.currentItem}):e(this.options.items,this.element),this]],i=this._connectWith();if(i&&this.ready)for(var s=i.length-1;s>=0;s--){var o=e(i[s]);for(var u=o.length-1;u>=0;u--){var a=e.data(o[u],this.widgetName);a&&a!=this&&!a.options.disabled&&(r.push([e.isFunction(a.options.items)?a.options.items.call(a.element[0],t,{item:this.currentItem}):e(a.options.items,a.element),a]),this.containers.push(a))}}for(var s=r.length-1;s>=0;s--){var f=r[s][1],l=r[s][0];for(var u=0,c=l.length;u<c;u++){var h=e(l[u]);h.data(this.widgetName+"-item",f),n.push({item:h,instance:f,width:0,height:0,left:0,top:0})}}},refreshPositions:function(t){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());for(var n=this.items.length-1;n>=0;n--){var r=this.items[n];if(r.instance!=this.currentContainer&&this.currentContainer&&r.item[0]!=this.currentItem[0])continue;var i=this.options.toleranceElement?e(this.options.toleranceElement,r.item):r.item;t||(r.width=i.outerWidth(),r.height=i.outerHeight());var s=i.offset();r.left=s.left,r.top=s.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(var n=this.containers.length-1;n>=0;n--){var s=this.containers[n].element.offset();this.containers[n].containerCache.left=s.left,this.containers[n].containerCache.top=s.top,this.containers[n].containerCache.width=this.containers[n].element.outerWidth(),this.containers[n].containerCache.height=this.containers[n].element.outerHeight()}return this},_createPlaceholder:function(t){t=t||this;var n=t.options;if(!n.placeholder||n.placeholder.constructor==String){var r=n.placeholder;n.placeholder={element:function(){var n=e(document.createElement(t.currentItem[0].nodeName)).addClass(r||t.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];return r||(n.style.visibility="hidden"),n},update:function(e,i){if(r&&!n.forcePlaceholderSize)return;i.height()||i.height(t.currentItem.innerHeight()-parseInt(t.currentItem.css("paddingTop")||0,10)-parseInt(t.currentItem.css("paddingBottom")||0,10)),i.width()||i.width(t.currentItem.innerWidth()-parseInt(t.currentItem.css("paddingLeft")||0,10)-parseInt(t.currentItem.css("paddingRight")||0,10))}}}t.placeholder=e(n.placeholder.element.call(t.element,t.currentItem)),t.currentItem.after(t.placeholder),n.placeholder.update(t,t.placeholder)},_contactContainers:function(t){var n=null,r=null;for(var i=this.containers.length-1;i>=0;i--){if(e.contains(this.currentItem[0],this.containers[i].element[0]))continue;if(this._intersectsWith(this.containers[i].containerCache)){if(n&&e.contains(this.containers[i].element[0],n.element[0]))continue;n=this.containers[i],r=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",t,this._uiHash(this)),this.containers[i].containerCache.over=0)}if(!n)return;if(this.containers.length===1)this.containers[r]._trigger("over",t,this._uiHash(this)),this.containers[r].containerCache.over=1;else{var s=1e4,o=null,u=this.containers[r].floating?"left":"top",a=this.containers[r].floating?"width":"height",f=this.positionAbs[u]+this.offset.click[u];for(var l=this.items.length-1;l>=0;l--){if(!e.contains(this.containers[r].element[0],this.items[l].item[0]))continue;if(this.items[l].item[0]==this.currentItem[0])continue;var c=this.items[l].item.offset()[u],h=!1;Math.abs(c-f)>Math.abs(c+this.items[l][a]-f)&&(h=!0,c+=this.items[l][a]),Math.abs(c-f)<s&&(s=Math.abs(c-f),o=this.items[l],this.direction=h?"up":"down")}if(!o&&!this.options.dropOnEmpty)return;this.currentContainer=this.containers[r],o?this._rearrange(t,o,null,!0):this._rearrange(t,null,this.containers[r].element,!0),this._trigger("change",t,this._uiHash()),this.containers[r]._trigger("change",t,this._uiHash(this)),this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[r]._trigger("over",t,this._uiHash(this)),this.containers[r].containerCache.over=1}},_createHelper:function(t){var n=this.options,r=e.isFunction(n.helper)?e(n.helper.apply(this.element[0],[t,this.currentItem])):n.helper=="clone"?this.currentItem.clone():this.currentItem;return r.parents("body").length||e(n.appendTo!="parent"?n.appendTo:this.currentItem[0].parentNode)[0].appendChild(r[0]),r[0]==this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(r[0].style.width==""||n.forceHelperSize)&&r.width(this.currentItem.width()),(r[0].style.height==""||n.forceHelperSize)&&r.height(this.currentItem.height()),r},_adjustOffsetFromHelper:function(t){typeof t=="string"&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&e.ui.ie)t={top:0,left:0};return{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var e=this.currentItem.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t=this.options;t.containment=="parent"&&(t.containment=this.helper[0].parentNode);if(t.containment=="document"||t.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,e(t.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(e(t.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(t.containment)){var n=e(t.containment)[0],r=e(t.containment).offset(),i=e(n).css("overflow")!="hidden";this.containment=[r.left+(parseInt(e(n).css("borderLeftWidth"),10)||0)+(parseInt(e(n).css("paddingLeft"),10)||0)-this.margins.left,r.top+(parseInt(e(n).css("borderTopWidth"),10)||0)+(parseInt(e(n).css("paddingTop"),10)||0)-this.margins.top,r.left+(i?Math.max(n.scrollWidth,n.offsetWidth):n.offsetWidth)-(parseInt(e(n).css("borderLeftWidth"),10)||0)-(parseInt(e(n).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,r.top+(i?Math.max(n.scrollHeight,n.offsetHeight):n.offsetHeight)-(parseInt(e(n).css("borderTopWidth"),10)||0)-(parseInt(e(n).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(t,n){n||(n=this.position);var r=t=="absolute"?1:-1,i=this.options,s=this.cssPosition!="absolute"||this.scrollParent[0]!=document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(s[0].tagName);return{top:n.top+this.offset.relative.top*r+this.offset.parent.top*r-(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():o?0:s.scrollTop())*r,left:n.left+this.offset.relative.left*r+this.offset.parent.left*r-(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():o?0:s.scrollLeft())*r}},_generatePosition:function(t){var n=this.options,r=this.cssPosition!="absolute"||this.scrollParent[0]!=document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,i=/(html|body)/i.test(r[0].tagName);this.cssPosition=="relative"&&(this.scrollParent[0]==document||this.scrollParent[0]==this.offsetParent[0])&&(this.offset.relative=this._getRelativeOffset());var s=t.pageX,o=t.pageY;if(this.originalPosition){this.containment&&(t.pageX-this.offset.click.left<this.containment[0]&&(s=this.containment[0]+this.offset.click.left),t.pageY-this.offset.click.top<this.containment[1]&&(o=this.containment[1]+this.offset.click.top),t.pageX-this.offset.click.left>this.containment[2]&&(s=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top));if(n.grid){var u=this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1];o=this.containment?u-this.offset.click.top<this.containment[1]||u-this.offset.click.top>this.containment[3]?u-this.offset.click.top<this.containment[1]?u+n.grid[1]:u-n.grid[1]:u:u;var a=this.originalPageX+Math.round((s-this.originalPageX)/n.grid[0])*n.grid[0];s=this.containment?a-this.offset.click.left<this.containment[0]||a-this.offset.click.left>this.containment[2]?a-this.offset.click.left<this.containment[0]?a+n.grid[0]:a-n.grid[0]:a:a}}return{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():i?0:r.scrollTop()),left:s-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:r.scrollLeft())}},_rearrange:function(e,t,n,r){n?n[0].appendChild(this.placeholder[0]):t.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?t.item[0]:t.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var i=this.counter;this._delay(function(){i==this.counter&&this.refreshPositions(!r)})},_clear:function(t,n){this.reverting=!1;var r=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var i in this._storedCSS)if(this._storedCSS[i]=="auto"||this._storedCSS[i]=="static")this._storedCSS[i]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!n&&r.push(function(e){this._trigger("receive",e,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!n&&r.push(function(e){this._trigger("update",e,this._uiHash())}),this!==this.currentContainer&&(n||(r.push(function(e){this._trigger("remove",e,this._uiHash())}),r.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),r.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer))));for(var i=this.containers.length-1;i>=0;i--)n||r.push(function(e){return function(t){e._trigger("deactivate",t,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over&&(r.push(function(e){return function(t){e._trigger("out",t,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over=0);this._storedCursor&&e("body").css("cursor",this._storedCursor),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex),this.dragging=!1;if(this.cancelHelperRemoval){if(!n){this._trigger("beforeStop",t,this._uiHash());for(var i=0;i<r.length;i++)r[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!1}n||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!=this.currentItem[0]&&this.helper.remove(),this.helper=null;if(!n){for(var i=0;i<r.length;i++)r[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){e.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(t){var n=t||this;return{helper:n.helper,placeholder:n.placeholder||e([]),position:n.position,originalPosition:n.originalPosition,offset:n.positionAbs,item:n.currentItem,sender:t?t.element:null}}})})(jQuery);(function(e,t){var n=0,r={},i={};r.height=r.paddingTop=r.paddingBottom=r.borderTopWidth=r.borderBottomWidth="hide",i.height=i.paddingTop=i.paddingBottom=i.borderTopWidth=i.borderBottomWidth="show",e.widget("ui.accordion",{version:"1.9.2",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},_create:function(){var t=this.accordionId="ui-accordion-"+(this.element.attr("id")||++n),r=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset"),this.headers=this.element.find(r.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all"),this._hoverable(this.headers),this._focusable(this.headers),this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").hide(),!r.collapsible&&(r.active===!1||r.active==null)&&(r.active=0),r.active<0&&(r.active+=this.headers.length),this.active=this._findActive(r.active).addClass("ui-accordion-header-active ui-state-active").toggleClass("ui-corner-all ui-corner-top"),this.active.next().addClass("ui-accordion-content-active").show(),this._createIcons(),this.refresh(),this.element.attr("role","tablist"),this.headers.attr("role","tab").each(function(n){var r=e(this),i=r.attr("id"),s=r.next(),o=s.attr("id");i||(i=t+"-header-"+n,r.attr("id",i)),o||(o=t+"-panel-"+n,s.attr("id",o)),r.attr("aria-controls",o),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false",tabIndex:-1}).next().attr({"aria-expanded":"false","aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true",tabIndex:0}).next().attr({"aria-expanded":"true","aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._on(this.headers,{keydown:"_keydown"}),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._setupEvents(r.event)},_getCreateEventData:function(){return{header:this.active,content:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("<span>").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this._destroyIcons(),e=this.headers.next().css("display","").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this.options.heightStyle!=="content"&&e.css("height","")},_setOption:function(e,t){if(e==="active"){this._activate(t);return}e==="event"&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),e==="collapsible"&&!t&&this.options.active===!1&&this._activate(0),e==="icons"&&(this._destroyIcons(),t&&this._createIcons()),e==="disabled"&&this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)},_keydown:function(t){if(t.altKey||t.ctrlKey)return;var n=e.ui.keyCode,r=this.headers.length,i=this.headers.index(t.target),s=!1;switch(t.keyCode){case n.RIGHT:case n.DOWN:s=this.headers[(i+1)%r];break;case n.LEFT:case n.UP:s=this.headers[(i-1+r)%r];break;case n.SPACE:case n.ENTER:this._eventHandler(t);break;case n.HOME:s=this.headers[0];break;case n.END:s=this.headers[r-1]}s&&(e(t.target).attr("tabIndex",-1),e(s).attr("tabIndex",0),s.focus(),t.preventDefault())},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t,n,r=this.options.heightStyle,i=this.element.parent();r==="fill"?(e.support.minHeight||(n=i.css("overflow"),i.css("overflow","hidden")),t=i.height(),this.element.siblings(":visible").each(function(){var n=e(this),r=n.css("position");if(r==="absolute"||r==="fixed")return;t-=n.outerHeight(!0)}),n&&i.css("overflow",n),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):r==="auto"&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var n=this._findActive(t)[0];if(n===this.active[0])return;n=n||this.active[0],this._eventHandler({target:n,currentTarget:n,preventDefault:e.noop})},_findActive:function(t){return typeof t=="number"?this.headers.eq(t):e()},_setupEvents:function(t){var n={};if(!t)return;e.each(t.split(" "),function(e,t){n[t]="_eventHandler"}),this._on(this.headers,n)},_eventHandler:function(t){var n=this.options,r=this.active,i=e(t.currentTarget),s=i[0]===r[0],o=s&&n.collapsible,u=o?e():i.next(),a=r.next(),f={oldHeader:r,oldPanel:a,newHeader:o?e():i,newPanel:u};t.preventDefault();if(s&&!n.collapsible||this._trigger("beforeActivate",t,f)===!1)return;n.active=o?!1:this.headers.index(i),this.active=s?e():i,this._toggle(f),r.removeClass("ui-accordion-header-active ui-state-active"),n.icons&&r.children(".ui-accordion-header-icon").removeClass(n.icons.activeHeader).addClass(n.icons.header),s||(i.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),n.icons&&i.children(".ui-accordion-header-icon").removeClass(n.icons.header).addClass(n.icons.activeHeader),i.next().addClass("ui-accordion-content-active"))},_toggle:function(t){var n=t.newPanel,r=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=n,this.prevHide=r,this.options.animate?this._animate(n,r,t):(r.hide(),n.show(),this._toggleComplete(t)),r.attr({"aria-expanded":"false","aria-hidden":"true"}),r.prev().attr("aria-selected","false"),n.length&&r.length?r.prev().attr("tabIndex",-1):n.length&&this.headers.filter(function(){return e(this).attr("tabIndex")===0}).attr("tabIndex",-1),n.attr({"aria-expanded":"true","aria-hidden":"false"}).prev().attr({"aria-selected":"true",tabIndex:0})},_animate:function(e,t,n){var s,o,u,a=this,f=0,l=e.length&&(!t.length||e.index()<t.index()),c=this.options.animate||{},h=l&&c.down||c,p=function(){a._toggleComplete(n)};typeof h=="number"&&(u=h),typeof h=="string"&&(o=h),o=o||h.easing||c.easing,u=u||h.duration||c.duration;if(!t.length)return e.animate(i,u,o,p);if(!e.length)return t.animate(r,u,o,p);s=e.show().outerHeight(),t.animate(r,{duration:u,easing:o,step:function(e,t){t.now=Math.round(e)}}),e.hide().animate(i,{duration:u,easing:o,complete:p,step:function(e,n){n.now=Math.round(e),n.prop!=="height"?f+=n.now:a.options.heightStyle!=="content"&&(n.now=Math.round(s-t.outerHeight()-f),f=0)}})},_toggleComplete:function(e){var t=e.oldPanel;t.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),t.length&&(t.parent()[0].className=t.parent()[0].className),this._trigger("activate",null,e)}}),e.uiBackCompat!==!1&&(function(e,t){e.extend(t.options,{navigation:!1,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}});var n=t._create;t._create=function(){if(this.options.navigation){var t=this,r=this.element.find(this.options.header),i=r.next(),s=r.add(i).find("a").filter(this.options.navigationFilter)[0];s&&r.add(i).each(function(n){if(e.contains(this,s))return t.options.active=Math.floor(n/2),!1})}n.call(this)}}(jQuery,jQuery.ui.accordion.prototype),function(e,t){e.extend(t.options,{heightStyle:null,autoHeight:!0,clearStyle:!1,fillSpace:!1});var n=t._create,r=t._setOption;e.extend(t,{_create:function(){this.options.heightStyle=this.options.heightStyle||this._mergeHeightStyle(),n.call(this)},_setOption:function(e){if(e==="autoHeight"||e==="clearStyle"||e==="fillSpace")this.options.heightStyle=this._mergeHeightStyle();r.apply(this,arguments)},_mergeHeightStyle:function(){var e=this.options;if(e.fillSpace)return"fill";if(e.clearStyle)return"content";if(e.autoHeight)return"auto"}})}(jQuery,jQuery.ui.accordion.prototype),function(e,t){e.extend(t.options.icons,{activeHeader:null,headerSelected:"ui-icon-triangle-1-s"});var n=t._createIcons;t._createIcons=function(){this.options.icons&&(this.options.icons.activeHeader=this.options.icons.activeHeader||this.options.icons.headerSelected),n.call(this)}}(jQuery,jQuery.ui.accordion.prototype),function(e,t){t.activate=t._activate;var n=t._findActive;t._findActive=function(e){return e===-1&&(e=!1),e&&typeof e!="number"&&(e=this.headers.index(this.headers.filter(e)),e===-1&&(e=!1)),n.call(this,e)}}(jQuery,jQuery.ui.accordion.prototype),jQuery.ui.accordion.prototype.resize=jQuery.ui.accordion.prototype.refresh,function(e,t){e.extend(t.options,{change:null,changestart:null});var n=t._trigger;t._trigger=function(e,t,r){var i=n.apply(this,arguments);return i?(e==="beforeActivate"?i=n.call(this,"changestart",t,{oldHeader:r.oldHeader,oldContent:r.oldPanel,newHeader:r.newHeader,newContent:r.newPanel}):e==="activate"&&(i=n.call(this,"change",t,{oldHeader:r.oldHeader,oldContent:r.oldPanel,newHeader:r.newHeader,newContent:r.newPanel})),i):!1}}(jQuery,jQuery.ui.accordion.prototype),function(e,t){e.extend(t.options,{animate:null,animated:"slide"});var n=t._create;t._create=function(){var e=this.options;e.animate===null&&(e.animated?e.animated==="slide"?e.animate=300:e.animated==="bounceslide"?e.animate={duration:200,down:{easing:"easeOutBounce",duration:1e3}}:e.animate=e.animated:e.animate=!1),n.call(this)}}(jQuery,jQuery.ui.accordion.prototype))})(jQuery);(function(e,t){var n=0;e.widget("ui.autocomplete",{version:"1.9.2",defaultElement:"<input>",options:{appendTo:"body",autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},pending:0,_create:function(){var t,n,r;this.isMultiLine=this._isMultiLine(),this.valueMethod=this.element[this.element.is("input,textarea")?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(i){if(this.element.prop("readOnly")){t=!0,r=!0,n=!0;return}t=!1,r=!1,n=!1;var s=e.ui.keyCode;switch(i.keyCode){case s.PAGE_UP:t=!0,this._move("previousPage",i);break;case s.PAGE_DOWN:t=!0,this._move("nextPage",i);break;case s.UP:t=!0,this._keyEvent("previous",i);break;case s.DOWN:t=!0,this._keyEvent("next",i);break;case s.ENTER:case s.NUMPAD_ENTER:this.menu.active&&(t=!0,i.preventDefault(),this.menu.select(i));break;case s.TAB:this.menu.active&&this.menu.select(i);break;case s.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(i),i.preventDefault());break;default:n=!0,this._searchTimeout(i)}},keypress:function(r){if(t){t=!1,r.preventDefault();return}if(n)return;var i=e.ui.keyCode;switch(r.keyCode){case i.PAGE_UP:this._move("previousPage",r);break;case i.PAGE_DOWN:this._move("nextPage",r);break;case i.UP:this._keyEvent("previous",r);break;case i.DOWN:this._keyEvent("next",r)}},input:function(e){if(r){r=!1,e.preventDefault();return}this._searchTimeout(e)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){if(this.cancelBlur){delete this.cancelBlur;return}clearTimeout(this.searching),this.close(e),this._change(e)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete").appendTo(this.document.find(this.options.appendTo||"body")[0]).menu({input:e(),role:null}).zIndex(this.element.zIndex()+1).hide().data("menu"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var n=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(r){r.target!==t.element[0]&&r.target!==n&&!e.contains(n,r.target)&&t.close()})})},menufocus:function(t,n){if(this.isNewMenu){this.isNewMenu=!1;if(t.originalEvent&&/^mouse/.test(t.originalEvent.type)){this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)});return}}var r=n.item.data("ui-autocomplete-item")||n.item.data("item.autocomplete");!1!==this._trigger("focus",t,{item:r})?t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(r.value):this.liveRegion.text(r.value)},menuselect:function(e,t){var n=t.item.data("ui-autocomplete-item")||t.item.data("item.autocomplete"),r=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=r,this._delay(function(){this.previous=r,this.selectedItem=n})),!1!==this._trigger("select",e,{item:n})&&this._value(n.value),this.term=this._value(),this.close(e),this.selectedItem=n}}),this.liveRegion=e("<span>",{role:"status","aria-live":"polite"}).addClass("ui-helper-hidden-accessible").insertAfter(this.element),e.fn.bgiframe&&this.menu.element.bgiframe(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),e==="source"&&this._initSource(),e==="appendTo"&&this.menu.element.appendTo(this.document.find(t||"body")[0]),e==="disabled"&&t&&this.xhr&&this.xhr.abort()},_isMultiLine:function(){return this.element.is("textarea")?!0:this.element.is("input")?!1:this.element.prop("isContentEditable")},_initSource:function(){var t,n,r=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(n,r){r(e.ui.autocomplete.filter(t,n.term))}):typeof this.options.source=="string"?(n=this.options.source,this.source=function(t,i){r.xhr&&r.xhr.abort(),r.xhr=e.ajax({url:n,data:t,dataType:"json",success:function(e){i(e)},error:function(){i([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){this.term!==this._value()&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){e=e!=null?e:this._value(),this.term=this._value();if(e.length<this.options.minLength)return this.close(t);if(this._trigger("search",t)===!1)return;return this._search(e)},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var e=this,t=++n;return function(r){t===n&&e.__response(r),e.pending--,e.pending||e.element.removeClass("ui-autocomplete-loading")}},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return typeof t=="string"?{label:t,value:t}:e.extend({label:t.label||t.value,value:t.value||t.label},t)})},_suggest:function(t){var n=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(n,t),this.menu.refresh(),n.show(),this._resizeMenu(),n.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,n){var r=this;e.each(n,function(e,n){r._renderItemData(t,n)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,n){return e("<li>").append(e("<a>").text(n.label)).appendTo(t)},_move:function(e,t){if(!this.menu.element.is(":visible")){this.search(null,t);return}if(this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)){this._value(this.term),this.menu.blur();return}this.menu[e](t)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){if(!this.isMultiLine||this.menu.element.is(":visible"))this._move(e,t),t.preventDefault()}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,n){var r=new RegExp(e.ui.autocomplete.escapeRegex(n),"i");return e.grep(t,function(e){return r.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var t;this._superApply(arguments);if(this.options.disabled||this.cancelSearch)return;e&&e.length?t=this.options.messages.results(e.length):t=this.options.messages.noResults,this.liveRegion.text(t)}})})(jQuery);(function(e,t){var n,r,i,s,o="ui-button ui-widget ui-state-default ui-corner-all",u="ui-state-hover ui-state-active ",a="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",f=function(){var t=e(this).find(":ui-button");setTimeout(function(){t.button("refresh")},1)},l=function(t){var n=t.name,r=t.form,i=e([]);return n&&(r?i=e(r).find("[name='"+n+"']"):i=e("[name='"+n+"']",t.ownerDocument).filter(function(){return!this.form})),i};e.widget("ui.button",{version:"1.9.2",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,f),typeof this.options.disabled!="boolean"?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var t=this,u=this.options,a=this.type==="checkbox"||this.type==="radio",c=a?"":"ui-state-active",h="ui-state-focus";u.label===null&&(u.label=this.type==="input"?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(o).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){if(u.disabled)return;this===n&&e(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){if(u.disabled)return;e(this).removeClass(c)}).bind("click"+this.eventNamespace,function(e){u.disabled&&(e.preventDefault(),e.stopImmediatePropagation())}),this.element.bind("focus"+this.eventNamespace,function(){t.buttonElement.addClass(h)}).bind("blur"+this.eventNamespace,function(){t.buttonElement.removeClass(h)}),a&&(this.element.bind("change"+this.eventNamespace,function(){if(s)return;t.refresh()}),this.buttonElement.bind("mousedown"+this.eventNamespace,function(e){if(u.disabled)return;s=!1,r=e.pageX,i=e.pageY}).bind("mouseup"+this.eventNamespace,function(e){if(u.disabled)return;if(r!==e.pageX||i!==e.pageY)s=!0})),this.type==="checkbox"?this.buttonElement.bind("click"+this.eventNamespace,function(){if(u.disabled||s)return!1;e(this).toggleClass("ui-state-active"),t.buttonElement.attr("aria-pressed",t.element[0].checked)}):this.type==="radio"?this.buttonElement.bind("click"+this.eventNamespace,function(){if(u.disabled||s)return!1;e(this).addClass("ui-state-active"),t.buttonElement.attr("aria-pressed","true");var n=t.element[0];l(n).not(n).map(function(){return e(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){if(u.disabled)return!1;e(this).addClass("ui-state-active"),n=this,t.document.one("mouseup",function(){n=null})}).bind("mouseup"+this.eventNamespace,function(){if(u.disabled)return!1;e(this).removeClass("ui-state-active")}).bind("keydown"+this.eventNamespace,function(t){if(u.disabled)return!1;(t.keyCode===e.ui.keyCode.SPACE||t.keyCode===e.ui.keyCode.ENTER)&&e(this).addClass("ui-state-active")}).bind("keyup"+this.eventNamespace,function(){e(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(t){t.keyCode===e.ui.keyCode.SPACE&&e(this).click()})),this._setOption("disabled",u.disabled),this._resetButton()},_determineButtonType:function(){var e,t,n;this.element.is("[type=checkbox]")?this.type="checkbox":this.element.is("[type=radio]")?this.type="radio":this.element.is("input")?this.type="input":this.type="button",this.type==="checkbox"||this.type==="radio"?(e=this.element.parents().last(),t="label[for='"+this.element.attr("id")+"']",this.buttonElement=e.find(t),this.buttonElement.length||(e=e.length?e.siblings():this.element.siblings(),this.buttonElement=e.filter(t),this.buttonElement.length||(this.buttonElement=e.find(t))),this.element.addClass("ui-helper-hidden-accessible"),n=this.element.is(":checked"),n&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",n)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(o+" "+u+" "+a).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(e,t){this._super(e,t);if(e==="disabled"){t?this.element.prop("disabled",!0):this.element.prop("disabled",!1);return}this._resetButton()},refresh:function(){var t=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOption("disabled",t),this.type==="radio"?l(this.element[0]).each(function(){e(this).is(":checked")?e(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):e(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):this.type==="checkbox"&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if(this.type==="input"){this.options.label&&this.element.val(this.options.label);return}var t=this.buttonElement.removeClass(a),n=e("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(t.empty()).text(),r=this.options.icons,i=r.primary&&r.secondary,s=[];r.primary||r.secondary?(this.options.text&&s.push("ui-button-text-icon"+(i?"s":r.primary?"-primary":"-secondary")),r.primary&&t.prepend("<span class='ui-button-icon-primary ui-icon "+r.primary+"'></span>"),r.secondary&&t.append("<span class='ui-button-icon-secondary ui-icon "+r.secondary+"'></span>"),this.options.text||(s.push(i?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||t.attr("title",e.trim(n)))):s.push("ui-button-text-only"),t.addClass(s.join(" "))}}),e.widget("ui.buttonset",{version:"1.9.2",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(e,t){e==="disabled"&&this.buttons.button("option",e,t),this._super(e,t)},refresh:function(){var t=this.element.css("direction")==="rtl";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(t?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(t?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}})})(jQuery);(function($,undefined){function Datepicker(){this.debug=!1,this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},$.extend(this._defaults,this.regional[""]),this.dpDiv=bindHover($('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function bindHover(e){var t="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.delegate(t,"mouseout",function(){$(this).removeClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!=-1&&$(this).removeClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!=-1&&$(this).removeClass("ui-datepicker-next-hover")}).delegate(t,"mouseover",function(){$.datepicker._isDisabledDatepicker(instActive.inline?e.parent()[0]:instActive.input[0])||($(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),$(this).addClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!=-1&&$(this).addClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!=-1&&$(this).addClass("ui-datepicker-next-hover"))})}function extendRemove(e,t){$.extend(e,t);for(var n in t)if(t[n]==null||t[n]==undefined)e[n]=t[n];return e}$.extend($.ui,{datepicker:{version:"1.9.2"}});var PROP_NAME="datepicker",dpuuid=(new Date).getTime(),instActive;$.extend(Datepicker.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(e){return extendRemove(this._defaults,e||{}),this},_attachDatepicker:function(target,settings){var inlineSettings=null;for(var attrName in this._defaults){var attrValue=target.getAttribute("date:"+attrName);if(attrValue){inlineSettings=inlineSettings||{};try{inlineSettings[attrName]=eval(attrValue)}catch(err){inlineSettings[attrName]=attrValue}}}var nodeName=target.nodeName.toLowerCase(),inline=nodeName=="div"||nodeName=="span";target.id||(this.uuid+=1,target.id="dp"+this.uuid);var inst=this._newInst($(target),inline);inst.settings=$.extend({},settings||{},inlineSettings||{}),nodeName=="input"?this._connectDatepicker(target,inst):inline&&this._inlineDatepicker(target,inst)},_newInst:function(e,t){var n=e[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1");return{id:n,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:t,dpDiv:t?bindHover($('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')):this.dpDiv}},_connectDatepicker:function(e,t){var n=$(e);t.append=$([]),t.trigger=$([]);if(n.hasClass(this.markerClassName))return;this._attachments(n,t),n.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,n,r){t.settings[n]=r}).bind("getData.datepicker",function(e,n){return this._get(t,n)}),this._autoSize(t),$.data(e,PROP_NAME,t),t.settings.disabled&&this._disableDatepicker(e)},_attachments:function(e,t){var n=this._get(t,"appendText"),r=this._get(t,"isRTL");t.append&&t.append.remove(),n&&(t.append=$('<span class="'+this._appendClass+'">'+n+"</span>"),e[r?"before":"after"](t.append)),e.unbind("focus",this._showDatepicker),t.trigger&&t.trigger.remove();var i=this._get(t,"showOn");(i=="focus"||i=="both")&&e.focus(this._showDatepicker);if(i=="button"||i=="both"){var s=this._get(t,"buttonText"),o=this._get(t,"buttonImage");t.trigger=$(this._get(t,"buttonImageOnly")?$("<img/>").addClass(this._triggerClass).attr({src:o,alt:s,title:s}):$('<button type="button"></button>').addClass(this._triggerClass).html(o==""?s:$("<img/>").attr({src:o,alt:s,title:s}))),e[r?"before":"after"](t.trigger),t.trigger.click(function(){return $.datepicker._datepickerShowing&&$.datepicker._lastInput==e[0]?$.datepicker._hideDatepicker():$.datepicker._datepickerShowing&&$.datepicker._lastInput!=e[0]?($.datepicker._hideDatepicker(),$.datepicker._showDatepicker(e[0])):$.datepicker._showDatepicker(e[0]),!1})}},_autoSize:function(e){if(this._get(e,"autoSize")&&!e.inline){var t=new Date(2009,11,20),n=this._get(e,"dateFormat");if(n.match(/[DM]/)){var r=function(e){var t=0,n=0;for(var r=0;r<e.length;r++)e[r].length>t&&(t=e[r].length,n=r);return n};t.setMonth(r(this._get(e,n.match(/MM/)?"monthNames":"monthNamesShort"))),t.setDate(r(this._get(e,n.match(/DD/)?"dayNames":"dayNamesShort"))+20-t.getDay())}e.input.attr("size",this._formatDate(e,t).length)}},_inlineDatepicker:function(e,t){var n=$(e);if(n.hasClass(this.markerClassName))return;n.addClass(this.markerClassName).append(t.dpDiv).bind("setData.datepicker",function(e,n,r){t.settings[n]=r}).bind("getData.datepicker",function(e,n){return this._get(t,n)}),$.data(e,PROP_NAME,t),this._setDate(t,this._getDefaultDate(t),!0),this._updateDatepicker(t),this._updateAlternate(t),t.settings.disabled&&this._disableDatepicker(e),t.dpDiv.css("display","block")},_dialogDatepicker:function(e,t,n,r,i){var s=this._dialogInst;if(!s){this.uuid+=1;var o="dp"+this.uuid;this._dialogInput=$('<input type="text" id="'+o+'" style="position: absolute; top: -100px; width: 0px;"/>'),this._dialogInput.keydown(this._doKeyDown),$("body").append(this._dialogInput),s=this._dialogInst=this._newInst(this._dialogInput,!1),s.settings={},$.data(this._dialogInput[0],PROP_NAME,s)}extendRemove(s.settings,r||{}),t=t&&t.constructor==Date?this._formatDate(s,t):t,this._dialogInput.val(t),this._pos=i?i.length?i:[i.pageX,i.pageY]:null;if(!this._pos){var u=document.documentElement.clientWidth,a=document.documentElement.clientHeight,f=document.documentElement.scrollLeft||document.body.scrollLeft,l=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[u/2-100+f,a/2-150+l]}return this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),s.settings.onSelect=n,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),$.blockUI&&$.blockUI(this.dpDiv),$.data(this._dialogInput[0],PROP_NAME,s),this},_destroyDatepicker:function(e){var t=$(e),n=$.data(e,PROP_NAME);if(!t.hasClass(this.markerClassName))return;var r=e.nodeName.toLowerCase();$.removeData(e,PROP_NAME),r=="input"?(n.append.remove(),n.trigger.remove(),t.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):(r=="div"||r=="span")&&t.removeClass(this.markerClassName).empty()},_enableDatepicker:function(e){var t=$(e),n=$.data(e,PROP_NAME);if(!t.hasClass(this.markerClassName))return;var r=e.nodeName.toLowerCase();if(r=="input")e.disabled=!1,n.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""});else if(r=="div"||r=="span"){var i=t.children("."+this._inlineClass);i.children().removeClass("ui-state-disabled"),i.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)}this._disabledInputs=$.map(this._disabledInputs,function(t){return t==e?null:t})},_disableDatepicker:function(e){var t=$(e),n=$.data(e,PROP_NAME);if(!t.hasClass(this.markerClassName))return;var r=e.nodeName.toLowerCase();if(r=="input")e.disabled=!0,n.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"});else if(r=="div"||r=="span"){var i=t.children("."+this._inlineClass);i.children().addClass("ui-state-disabled"),i.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)}this._disabledInputs=$.map(this._disabledInputs,function(t){return t==e?null:t}),this._disabledInputs[this._disabledInputs.length]=e},_isDisabledDatepicker:function(e){if(!e)return!1;for(var t=0;t<this._disabledInputs.length;t++)if(this._disabledInputs[t]==e)return!0;return!1},_getInst:function(e){try{return $.data(e,PROP_NAME)}catch(t){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(e,t,n){var r=this._getInst(e);if(arguments.length==2&&typeof t=="string")return t=="defaults"?$.extend({},$.datepicker._defaults):r?t=="all"?$.extend({},r.settings):this._get(r,t):null;var i=t||{};typeof t=="string"&&(i={},i[t]=n);if(r){this._curInst==r&&this._hideDatepicker();var s=this._getDateDatepicker(e,!0),o=this._getMinMaxDate(r,"min"),u=this._getMinMaxDate(r,"max");extendRemove(r.settings,i),o!==null&&i.dateFormat!==undefined&&i.minDate===undefined&&(r.settings.minDate=this._formatDate(r,o)),u!==null&&i.dateFormat!==undefined&&i.maxDate===undefined&&(r.settings.maxDate=this._formatDate(r,u)),this._attachments($(e),r),this._autoSize(r),this._setDate(r,s),this._updateAlternate(r),this._updateDatepicker(r)}},_changeDatepicker:function(e,t,n){this._optionDatepicker(e,t,n)},_refreshDatepicker:function(e){var t=this._getInst(e);t&&this._updateDatepicker(t)},_setDateDatepicker:function(e,t){var n=this._getInst(e);n&&(this._setDate(n,t),this._updateDatepicker(n),this._updateAlternate(n))},_getDateDatepicker:function(e,t){var n=this._getInst(e);return n&&!n.inline&&this._setDateFromField(n,t),n?this._getDate(n):null},_doKeyDown:function(e){var t=$.datepicker._getInst(e.target),n=!0,r=t.dpDiv.is(".ui-datepicker-rtl");t._keyEvent=!0;if($.datepicker._datepickerShowing)switch(e.keyCode){case 9:$.datepicker._hideDatepicker(),n=!1;break;case 13:var i=$("td."+$.datepicker._dayOverClass+":not(."+$.datepicker._currentClass+")",t.dpDiv);i[0]&&$.datepicker._selectDay(e.target,t.selectedMonth,t.selectedYear,i[0]);var s=$.datepicker._get(t,"onSelect");if(s){var o=$.datepicker._formatDate(t);s.apply(t.input?t.input[0]:null,[o,t])}else $.datepicker._hideDatepicker();return!1;case 27:$.datepicker._hideDatepicker();break;case 33:$.datepicker._adjustDate(e.target,e.ctrlKey?-$.datepicker._get(t,"stepBigMonths"):-$.datepicker._get(t,"stepMonths"),"M");break;case 34:$.datepicker._adjustDate(e.target,e.ctrlKey?+$.datepicker._get(t,"stepBigMonths"):+$.datepicker._get(t,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&$.datepicker._clearDate(e.target),n=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&$.datepicker._gotoToday(e.target),n=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&$.datepicker._adjustDate(e.target,r?1:-1,"D"),n=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&$.datepicker._adjustDate(e.target,e.ctrlKey?-$.datepicker._get(t,"stepBigMonths"):-$.datepicker._get(t,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&$.datepicker._adjustDate(e.target,-7,"D"),n=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&$.datepicker._adjustDate(e.target,r?-1:1,"D"),n=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&$.datepicker._adjustDate(e.target,e.ctrlKey?+$.datepicker._get(t,"stepBigMonths"):+$.datepicker._get(t,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&$.datepicker._adjustDate(e.target,7,"D"),n=e.ctrlKey||e.metaKey;break;default:n=!1}else e.keyCode==36&&e.ctrlKey?$.datepicker._showDatepicker(this):n=!1;n&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(e){var t=$.datepicker._getInst(e.target);if($.datepicker._get(t,"constrainInput")){var n=$.datepicker._possibleChars($.datepicker._get(t,"dateFormat")),r=String.fromCharCode(e.charCode==undefined?e.keyCode:e.charCode);return e.ctrlKey||e.metaKey||r<" "||!n||n.indexOf(r)>-1}},_doKeyUp:function(e){var t=$.datepicker._getInst(e.target);if(t.input.val()!=t.lastVal)try{var n=$.datepicker.parseDate($.datepicker._get(t,"dateFormat"),t.input?t.input.val():null,$.datepicker._getFormatConfig(t));n&&($.datepicker._setDateFromField(t),$.datepicker._updateAlternate(t),$.datepicker._updateDatepicker(t))}catch(r){$.datepicker.log(r)}return!0},_showDatepicker:function(e){e=e.target||e,e.nodeName.toLowerCase()!="input"&&(e=$("input",e.parentNode)[0]);if($.datepicker._isDisabledDatepicker(e)||$.datepicker._lastInput==e)return;var t=$.datepicker._getInst(e);$.datepicker._curInst&&$.datepicker._curInst!=t&&($.datepicker._curInst.dpDiv.stop(!0,!0),t&&$.datepicker._datepickerShowing&&$.datepicker._hideDatepicker($.datepicker._curInst.input[0]));var n=$.datepicker._get(t,"beforeShow"),r=n?n.apply(e,[e,t]):{};if(r===!1)return;extendRemove(t.settings,r),t.lastVal=null,$.datepicker._lastInput=e,$.datepicker._setDateFromField(t),$.datepicker._inDialog&&(e.value=""),$.datepicker._pos||($.datepicker._pos=$.datepicker._findPos(e),$.datepicker._pos[1]+=e.offsetHeight);var i=!1;$(e).parents().each(function(){return i|=$(this).css("position")=="fixed",!i});var s={left:$.datepicker._pos[0],top:$.datepicker._pos[1]};$.datepicker._pos=null,t.dpDiv.empty(),t.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),$.datepicker._updateDatepicker(t),s=$.datepicker._checkOffset(t,s,i),t.dpDiv.css({position:$.datepicker._inDialog&&$.blockUI?"static":i?"fixed":"absolute",display:"none",left:s.left+"px",top:s.top+"px"});if(!t.inline){var o=$.datepicker._get(t,"showAnim"),u=$.datepicker._get(t,"duration"),a=function(){var e=t.dpDiv.find("iframe.ui-datepicker-cover");if(!!e.length){var n=$.datepicker._getBorders(t.dpDiv);e.css({left:-n[0],top:-n[1],width:t.dpDiv.outerWidth(),height:t.dpDiv.outerHeight()})}};t.dpDiv.zIndex($(e).zIndex()+1),$.datepicker._datepickerShowing=!0,$.effects&&($.effects.effect[o]||$.effects[o])?t.dpDiv.show(o,$.datepicker._get(t,"showOptions"),u,a):t.dpDiv[o||"show"](o?u:null,a),(!o||!u)&&a(),t.input.is(":visible")&&!t.input.is(":disabled")&&t.input.focus(),$.datepicker._curInst=t}},_updateDatepicker:function(e){this.maxRows=4;var t=$.datepicker._getBorders(e.dpDiv);instActive=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e);var n=e.dpDiv.find("iframe.ui-datepicker-cover");!n.length||n.css({left:-t[0],top:-t[1],width:e.dpDiv.outerWidth(),height:e.dpDiv.outerHeight()}),e.dpDiv.find("."+this._dayOverClass+" a").mouseover();var r=this._getNumberOfMonths(e),i=r[1],s=17;e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),i>1&&e.dpDiv.addClass("ui-datepicker-multi-"+i).css("width",s*i+"em"),e.dpDiv[(r[0]!=1||r[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e==$.datepicker._curInst&&$.datepicker._datepickerShowing&&e.input&&e.input.is(":visible")&&!e.input.is(":disabled")&&e.input[0]!=document.activeElement&&e.input.focus();if(e.yearshtml){var o=e.yearshtml;setTimeout(function(){o===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),o=e.yearshtml=null},0)}},_getBorders:function(e){var t=function(e){return{thin:1,medium:2,thick:3}[e]||e};return[parseFloat(t(e.css("border-left-width"))),parseFloat(t(e.css("border-top-width")))]},_checkOffset:function(e,t,n){var r=e.dpDiv.outerWidth(),i=e.dpDiv.outerHeight(),s=e.input?e.input.outerWidth():0,o=e.input?e.input.outerHeight():0,u=document.documentElement.clientWidth+(n?0:$(document).scrollLeft()),a=document.documentElement.clientHeight+(n?0:$(document).scrollTop());return t.left-=this._get(e,"isRTL")?r-s:0,t.left-=n&&t.left==e.input.offset().left?$(document).scrollLeft():0,t.top-=n&&t.top==e.input.offset().top+o?$(document).scrollTop():0,t.left-=Math.min(t.left,t.left+r>u&&u>r?Math.abs(t.left+r-u):0),t.top-=Math.min(t.top,t.top+i>a&&a>i?Math.abs(i+o):0),t},_findPos:function(e){var t=this._getInst(e),n=this._get(t,"isRTL");while(e&&(e.type=="hidden"||e.nodeType!=1||$.expr.filters.hidden(e)))e=e[n?"previousSibling":"nextSibling"];var r=$(e).offset();return[r.left,r.top]},_hideDatepicker:function(e){var t=this._curInst;if(!t||e&&t!=$.data(e,PROP_NAME))return;if(this._datepickerShowing){var n=this._get(t,"showAnim"),r=this._get(t,"duration"),i=function(){$.datepicker._tidyDialog(t)};$.effects&&($.effects.effect[n]||$.effects[n])?t.dpDiv.hide(n,$.datepicker._get(t,"showOptions"),r,i):t.dpDiv[n=="slideDown"?"slideUp":n=="fadeIn"?"fadeOut":"hide"](n?r:null,i),n||i(),this._datepickerShowing=!1;var s=this._get(t,"onClose");s&&s.apply(t.input?t.input[0]:null,[t.input?t.input.val():"",t]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),$.blockUI&&($.unblockUI(),$("body").append(this.dpDiv))),this._inDialog=!1}},_tidyDialog:function(e){e.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(!$.datepicker._curInst)return;var t=$(e.target),n=$.datepicker._getInst(t[0]);(t[0].id!=$.datepicker._mainDivId&&t.parents("#"+$.datepicker._mainDivId).length==0&&!t.hasClass($.datepicker.markerClassName)&&!t.closest("."+$.datepicker._triggerClass).length&&$.datepicker._datepickerShowing&&(!$.datepicker._inDialog||!$.blockUI)||t.hasClass($.datepicker.markerClassName)&&$.datepicker._curInst!=n)&&$.datepicker._hideDatepicker()},_adjustDate:function(e,t,n){var r=$(e),i=this._getInst(r[0]);if(this._isDisabledDatepicker(r[0]))return;this._adjustInstDate(i,t+(n=="M"?this._get(i,"showCurrentAtPos"):0),n),this._updateDatepicker(i)},_gotoToday:function(e){var t=$(e),n=this._getInst(t[0]);if(this._get(n,"gotoCurrent")&&n.currentDay)n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear;else{var r=new Date;n.selectedDay=r.getDate(),n.drawMonth=n.selectedMonth=r.getMonth(),n.drawYear=n.selectedYear=r.getFullYear()}this._notifyChange(n),this._adjustDate(t)},_selectMonthYear:function(e,t,n){var r=$(e),i=this._getInst(r[0]);i["selected"+(n=="M"?"Month":"Year")]=i["draw"+(n=="M"?"Month":"Year")]=parseInt(t.options[t.selectedIndex].value,10),this._notifyChange(i),this._adjustDate(r)},_selectDay:function(e,t,n,r){var i=$(e);if($(r).hasClass(this._unselectableClass)||this._isDisabledDatepicker(i[0]))return;var s=this._getInst(i[0]);s.selectedDay=s.currentDay=$("a",r).html(),s.selectedMonth=s.currentMonth=t,s.selectedYear=s.currentYear=n,this._selectDate(e,this._formatDate(s,s.currentDay,s.currentMonth,s.currentYear))},_clearDate:function(e){var t=$(e),n=this._getInst(t[0]);this._selectDate(t,"")},_selectDate:function(e,t){var n=$(e),r=this._getInst(n[0]);t=t!=null?t:this._formatDate(r),r.input&&r.input.val(t),this._updateAlternate(r);var i=this._get(r,"onSelect");i?i.apply(r.input?r.input[0]:null,[t,r]):r.input&&r.input.trigger("change"),r.inline?this._updateDatepicker(r):(this._hideDatepicker(),this._lastInput=r.input[0],typeof r.input[0]!="object"&&r.input.focus(),this._lastInput=null)},_updateAlternate:function(e){var t=this._get(e,"altField");if(t){var n=this._get(e,"altFormat")||this._get(e,"dateFormat"),r=this._getDate(e),i=this.formatDate(n,r,this._getFormatConfig(e));$(t).each(function(){$(this).val(i)})}},noWeekends:function(e){var t=e.getDay();return[t>0&&t<6,""]},iso8601Week:function(e){var t=new Date(e.getTime());t.setDate(t.getDate()+4-(t.getDay()||7));var n=t.getTime();return t.setMonth(0),t.setDate(1),Math.floor(Math.round((n-t)/864e5)/7)+1},parseDate:function(e,t,n){if(e==null||t==null)throw"Invalid arguments";t=typeof t=="object"?t.toString():t+"";if(t=="")return null;var r=(n?n.shortYearCutoff:null)||this._defaults.shortYearCutoff;r=typeof r!="string"?r:(new Date).getFullYear()%100+parseInt(r,10);var i=(n?n.dayNamesShort:null)||this._defaults.dayNamesShort,s=(n?n.dayNames:null)||this._defaults.dayNames,o=(n?n.monthNamesShort:null)||this._defaults.monthNamesShort,u=(n?n.monthNames:null)||this._defaults.monthNames,a=-1,f=-1,l=-1,c=-1,h=!1,p=function(t){var n=y+1<e.length&&e.charAt(y+1)==t;return n&&y++,n},d=function(e){var n=p(e),r=e=="@"?14:e=="!"?20:e=="y"&&n?4:e=="o"?3:2,i=new RegExp("^\\d{1,"+r+"}"),s=t.substring(g).match(i);if(!s)throw"Missing number at position "+g;return g+=s[0].length,parseInt(s[0],10)},v=function(e,n,r){var i=$.map(p(e)?r:n,function(e,t){return[[t,e]]}).sort(function(e,t){return-(e[1].length-t[1].length)}),s=-1;$.each(i,function(e,n){var r=n[1];if(t.substr(g,r.length).toLowerCase()==r.toLowerCase())return s=n[0],g+=r.length,!1});if(s!=-1)return s+1;throw"Unknown name at position "+g},m=function(){if(t.charAt(g)!=e.charAt(y))throw"Unexpected literal at position "+g;g++},g=0;for(var y=0;y<e.length;y++)if(h)e.charAt(y)=="'"&&!p("'")?h=!1:m();else switch(e.charAt(y)){case"d":l=d("d");break;case"D":v("D",i,s);break;case"o":c=d("o");break;case"m":f=d("m");break;case"M":f=v("M",o,u);break;case"y":a=d("y");break;case"@":var b=new Date(d("@"));a=b.getFullYear(),f=b.getMonth()+1,l=b.getDate();break;case"!":var b=new Date((d("!")-this._ticksTo1970)/1e4);a=b.getFullYear(),f=b.getMonth()+1,l=b.getDate();break;case"'":p("'")?m():h=!0;break;default:m()}if(g<t.length){var w=t.substr(g);if(!/^\s+/.test(w))throw"Extra/unparsed characters found in date: "+w}a==-1?a=(new Date).getFullYear():a<100&&(a+=(new Date).getFullYear()-(new Date).getFullYear()%100+(a<=r?0:-100));if(c>-1){f=1,l=c;do{var E=this._getDaysInMonth(a,f-1);if(l<=E)break;f++,l-=E}while(!0)}var b=this._daylightSavingAdjust(new Date(a,f-1,l));if(b.getFullYear()!=a||b.getMonth()+1!=f||b.getDate()!=l)throw"Invalid date";return b},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1e7,formatDate:function(e,t,n){if(!t)return"";var r=(n?n.dayNamesShort:null)||this._defaults.dayNamesShort,i=(n?n.dayNames:null)||this._defaults.dayNames,s=(n?n.monthNamesShort:null)||this._defaults.monthNamesShort,o=(n?n.monthNames:null)||this._defaults.monthNames,u=function(t){var n=h+1<e.length&&e.charAt(h+1)==t;return n&&h++,n},a=function(e,t,n){var r=""+t;if(u(e))while(r.length<n)r="0"+r;return r},f=function(e,t,n,r){return u(e)?r[t]:n[t]},l="",c=!1;if(t)for(var h=0;h<e.length;h++)if(c)e.charAt(h)=="'"&&!u("'")?c=!1:l+=e.charAt(h);else switch(e.charAt(h)){case"d":l+=a("d",t.getDate(),2);break;case"D":l+=f("D",t.getDay(),r,i);break;case"o":l+=a("o",Math.round(((new Date(t.getFullYear(),t.getMonth(),t.getDate())).getTime()-(new Date(t.getFullYear(),0,0)).getTime())/864e5),3);break;case"m":l+=a("m",t.getMonth()+1,2);break;case"M":l+=f("M",t.getMonth(),s,o);break;case"y":l+=u("y")?t.getFullYear():(t.getYear()%100<10?"0":"")+t.getYear()%100;break;case"@":l+=t.getTime();break;case"!":l+=t.getTime()*1e4+this._ticksTo1970;break;case"'":u("'")?l+="'":c=!0;break;default:l+=e.charAt(h)}return l},_possibleChars:function(e){var t="",n=!1,r=function(t){var n=i+1<e.length&&e.charAt(i+1)==t;return n&&i++,n};for(var i=0;i<e.length;i++)if(n)e.charAt(i)=="'"&&!r("'")?n=!1:t+=e.charAt(i);else switch(e.charAt(i)){case"d":case"m":case"y":case"@":t+="0123456789";break;case"D":case"M":return null;case"'":r("'")?t+="'":n=!0;break;default:t+=e.charAt(i)}return t},_get:function(e,t){return e.settings[t]!==undefined?e.settings[t]:this._defaults[t]},_setDateFromField:function(e,t){if(e.input.val()==e.lastVal)return;var n=this._get(e,"dateFormat"),r=e.lastVal=e.input?e.input.val():null,i,s;i=s=this._getDefaultDate(e);var o=this._getFormatConfig(e);try{i=this.parseDate(n,r,o)||s}catch(u){this.log(u),r=t?"":r}e.selectedDay=i.getDate(),e.drawMonth=e.selectedMonth=i.getMonth(),e.drawYear=e.selectedYear=i.getFullYear(),e.currentDay=r?i.getDate():0,e.currentMonth=r?i.getMonth():0,e.currentYear=r?i.getFullYear():0,this._adjustInstDate(e)},_getDefaultDate:function(e){return this._restrictMinMax(e,this._determineDate(e,this._get(e,"defaultDate"),new Date))},_determineDate:function(e,t,n){var r=function(e){var t=new Date;return t.setDate(t.getDate()+e),t},i=function(t){try{return $.datepicker.parseDate($.datepicker._get(e,"dateFormat"),t,$.datepicker._getFormatConfig(e))}catch(n){}var r=(t.toLowerCase().match(/^c/)?$.datepicker._getDate(e):null)||new Date,i=r.getFullYear(),s=r.getMonth(),o=r.getDate(),u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,a=u.exec(t);while(a){switch(a[2]||"d"){case"d":case"D":o+=parseInt(a[1],10);break;case"w":case"W":o+=parseInt(a[1],10)*7;break;case"m":case"M":s+=parseInt(a[1],10),o=Math.min(o,$.datepicker._getDaysInMonth(i,s));break;case"y":case"Y":i+=parseInt(a[1],10),o=Math.min(o,$.datepicker._getDaysInMonth(i,s))}a=u.exec(t)}return new Date(i,s,o)},s=t==null||t===""?n:typeof t=="string"?i(t):typeof t=="number"?isNaN(t)?n:r(t):new Date(t.getTime());return s=s&&s.toString()=="Invalid Date"?n:s,s&&(s.setHours(0),s.setMinutes(0),s.setSeconds(0),s.setMilliseconds(0)),this._daylightSavingAdjust(s)},_daylightSavingAdjust:function(e){return e?(e.setHours(e.getHours()>12?e.getHours()+2:0),e):null},_setDate:function(e,t,n){var r=!t,i=e.selectedMonth,s=e.selectedYear,o=this._restrictMinMax(e,this._determineDate(e,t,new Date));e.selectedDay=e.currentDay=o.getDate(),e.drawMonth=e.selectedMonth=e.currentMonth=o.getMonth(),e.drawYear=e.selectedYear=e.currentYear=o.getFullYear(),(i!=e.selectedMonth||s!=e.selectedYear)&&!n&&this._notifyChange(e),this._adjustInstDate(e),e.input&&e.input.val(r?"":this._formatDate(e))},_getDate:function(e){var t=!e.currentYear||e.input&&e.input.val()==""?null:this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return t},_attachHandlers:function(e){var t=this._get(e,"stepMonths"),n="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){window["DP_jQuery_"+dpuuid].datepicker._adjustDate(n,-t,"M")},next:function(){window["DP_jQuery_"+dpuuid].datepicker._adjustDate(n,+t,"M")},hide:function(){window["DP_jQuery_"+dpuuid].datepicker._hideDatepicker()},today:function(){window["DP_jQuery_"+dpuuid].datepicker._gotoToday(n)},selectDay:function(){return window["DP_jQuery_"+dpuuid].datepicker._selectDay(n,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return window["DP_jQuery_"+dpuuid].datepicker._selectMonthYear(n,this,"M"),!1},selectYear:function(){return window["DP_jQuery_"+dpuuid].datepicker._selectMonthYear(n,this,"Y"),!1}};$(this).bind(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(e){var t=new Date;t=this._daylightSavingAdjust(new Date(t.getFullYear(),t.getMonth(),t.getDate()));var n=this._get(e,"isRTL"),r=this._get(e,"showButtonPanel"),i=this._get(e,"hideIfNoPrevNext"),s=this._get(e,"navigationAsDateFormat"),o=this._getNumberOfMonths(e),u=this._get(e,"showCurrentAtPos"),a=this._get(e,"stepMonths"),f=o[0]!=1||o[1]!=1,l=this._daylightSavingAdjust(e.currentDay?new Date(e.currentYear,e.currentMonth,e.currentDay):new Date(9999,9,9)),c=this._getMinMaxDate(e,"min"),h=this._getMinMaxDate(e,"max"),p=e.drawMonth-u,d=e.drawYear;p<0&&(p+=12,d--);if(h){var v=this._daylightSavingAdjust(new Date(h.getFullYear(),h.getMonth()-o[0]*o[1]+1,h.getDate()));v=c&&v<c?c:v;while(this._daylightSavingAdjust(new Date(d,p,1))>v)p--,p<0&&(p=11,d--)}e.drawMonth=p,e.drawYear=d;var m=this._get(e,"prevText");m=s?this.formatDate(m,this._daylightSavingAdjust(new Date(d,p-a,1)),this._getFormatConfig(e)):m;var g=this._canAdjustMonth(e,-1,d,p)?'<a class="ui-datepicker-prev ui-corner-all" data-handler="prev" data-event="click" title="'+m+'"><span class="ui-icon ui-icon-circle-triangle-'+(n?"e":"w")+'">'+m+"</span></a>":i?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+m+'"><span class="ui-icon ui-icon-circle-triangle-'+(n?"e":"w")+'">'+m+"</span></a>",y=this._get(e,"nextText");y=s?this.formatDate(y,this._daylightSavingAdjust(new Date(d,p+a,1)),this._getFormatConfig(e)):y;var b=this._canAdjustMonth(e,1,d,p)?'<a class="ui-datepicker-next ui-corner-all" data-handler="next" data-event="click" title="'+y+'"><span class="ui-icon ui-icon-circle-triangle-'+(n?"w":"e")+'">'+y+"</span></a>":i?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+y+'"><span class="ui-icon ui-icon-circle-triangle-'+(n?"w":"e")+'">'+y+"</span></a>",w=this._get(e,"currentText"),E=this._get(e,"gotoCurrent")&&e.currentDay?l:t;w=s?this.formatDate(w,E,this._getFormatConfig(e)):w;var S=e.inline?"":'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" data-handler="hide" data-event="click">'+this._get(e,"closeText")+"</button>",x=r?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(n?S:"")+(this._isInRange(e,E)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" data-handler="today" data-event="click">'+w+"</button>":"")+(n?"":S)+"</div>":"",T=parseInt(this._get(e,"firstDay"),10);T=isNaN(T)?0:T;var N=this._get(e,"showWeek"),C=this._get(e,"dayNames"),k=this._get(e,"dayNamesShort"),L=this._get(e,"dayNamesMin"),A=this._get(e,"monthNames"),O=this._get(e,"monthNamesShort"),M=this._get(e,"beforeShowDay"),_=this._get(e,"showOtherMonths"),D=this._get(e,"selectOtherMonths"),P=this._get(e,"calculateWeek")||this.iso8601Week,H=this._getDefaultDate(e),B="";for(var j=0;j<o[0];j++){var F="";this.maxRows=4;for(var I=0;I<o[1];I++){var q=this._daylightSavingAdjust(new Date(d,p,e.selectedDay)),R=" ui-corner-all",U="";if(f){U+='<div class="ui-datepicker-group';if(o[1]>1)switch(I){case 0:U+=" ui-datepicker-group-first",R=" ui-corner-"+(n?"right":"left");break;case o[1]-1:U+=" ui-datepicker-group-last",R=" ui-corner-"+(n?"left":"right");break;default:U+=" ui-datepicker-group-middle",R=""}U+='">'}U+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+R+'">'+(/all|left/.test(R)&&j==0?n?b:g:"")+(/all|right/.test(R)&&j==0?n?g:b:"")+this._generateMonthYearHeader(e,p,d,c,h,j>0||I>0,A,O)+'</div><table class="ui-datepicker-calendar"><thead>'+"<tr>";var z=N?'<th class="ui-datepicker-week-col">'+this._get(e,"weekHeader")+"</th>":"";for(var W=0;W<7;W++){var X=(W+T)%7;z+="<th"+((W+T+6)%7>=5?' class="ui-datepicker-week-end"':"")+">"+'<span title="'+C[X]+'">'+L[X]+"</span></th>"}U+=z+"</tr></thead><tbody>";var V=this._getDaysInMonth(d,p);d==e.selectedYear&&p==e.selectedMonth&&(e.selectedDay=Math.min(e.selectedDay,V));var J=(this._getFirstDayOfMonth(d,p)-T+7)%7,K=Math.ceil((J+V)/7),Q=f?this.maxRows>K?this.maxRows:K:K;this.maxRows=Q;var G=this._daylightSavingAdjust(new Date(d,p,1-J));for(var Y=0;Y<Q;Y++){U+="<tr>";var Z=N?'<td class="ui-datepicker-week-col">'+this._get(e,"calculateWeek")(G)+"</td>":"";for(var W=0;W<7;W++){var et=M?M.apply(e.input?e.input[0]:null,[G]):[!0,""],tt=G.getMonth()!=p,nt=tt&&!D||!et[0]||c&&G<c||h&&G>h;Z+='<td class="'+((W+T+6)%7>=5?" ui-datepicker-week-end":"")+(tt?" ui-datepicker-other-month":"")+(G.getTime()==q.getTime()&&p==e.selectedMonth&&e._keyEvent||H.getTime()==G.getTime()&&H.getTime()==q.getTime()?" "+this._dayOverClass:"")+(nt?" "+this._unselectableClass+" ui-state-disabled":"")+(tt&&!_?"":" "+et[1]+(G.getTime()==l.getTime()?" "+this._currentClass:"")+(G.getTime()==t.getTime()?" ui-datepicker-today":""))+'"'+((!tt||_)&&et[2]?' title="'+et[2]+'"':"")+(nt?"":' data-handler="selectDay" data-event="click" data-month="'+G.getMonth()+'" data-year="'+G.getFullYear()+'"')+">"+(tt&&!_?"&#xa0;":nt?'<span class="ui-state-default">'+G.getDate()+"</span>":'<a class="ui-state-default'+(G.getTime()==t.getTime()?" ui-state-highlight":"")+(G.getTime()==l.getTime()?" ui-state-active":"")+(tt?" ui-priority-secondary":"")+'" href="#">'+G.getDate()+"</a>")+"</td>",G.setDate(G.getDate()+1),G=this._daylightSavingAdjust(G)}U+=Z+"</tr>"}p++,p>11&&(p=0,d++),U+="</tbody></table>"+(f?"</div>"+(o[0]>0&&I==o[1]-1?'<div class="ui-datepicker-row-break"></div>':""):""),F+=U}B+=F}return B+=x+($.ui.ie6&&!e.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':""),e._keyEvent=!1,B},_generateMonthYearHeader:function(e,t,n,r,i,s,o,u){var a=this._get(e,"changeMonth"),f=this._get(e,"changeYear"),l=this._get(e,"showMonthAfterYear"),c='<div class="ui-datepicker-title">',h="";if(s||!a)h+='<span class="ui-datepicker-month">'+o[t]+"</span>";else{var p=r&&r.getFullYear()==n,d=i&&i.getFullYear()==n;h+='<select class="ui-datepicker-month" data-handler="selectMonth" data-event="change">';for(var v=0;v<12;v++)(!p||v>=r.getMonth())&&(!d||v<=i.getMonth())&&(h+='<option value="'+v+'"'+(v==t?' selected="selected"':"")+">"+u[v]+"</option>");h+="</select>"}l||(c+=h+(s||!a||!f?"&#xa0;":""));if(!e.yearshtml){e.yearshtml="";if(s||!f)c+='<span class="ui-datepicker-year">'+n+"</span>";else{var m=this._get(e,"yearRange").split(":"),g=(new Date).getFullYear(),y=function(e){var t=e.match(/c[+-].*/)?n+parseInt(e.substring(1),10):e.match(/[+-].*/)?g+parseInt(e,10):parseInt(e,10);return isNaN(t)?g:t},b=y(m[0]),w=Math.max(b,y(m[1]||""));b=r?Math.max(b,r.getFullYear()):b,w=i?Math.min(w,i.getFullYear()):w,e.yearshtml+='<select class="ui-datepicker-year" data-handler="selectYear" data-event="change">';for(;b<=w;b++)e.yearshtml+='<option value="'+b+'"'+(b==n?' selected="selected"':"")+">"+b+"</option>";e.yearshtml+="</select>",c+=e.yearshtml,e.yearshtml=null}}return c+=this._get(e,"yearSuffix"),l&&(c+=(s||!a||!f?"&#xa0;":"")+h),c+="</div>",c},_adjustInstDate:function(e,t,n){var r=e.drawYear+(n=="Y"?t:0),i=e.drawMonth+(n=="M"?t:0),s=Math.min(e.selectedDay,this._getDaysInMonth(r,i))+(n=="D"?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(r,i,s)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),(n=="M"||n=="Y")&&this._notifyChange(e)},_restrictMinMax:function(e,t){var n=this._getMinMaxDate(e,"min"),r=this._getMinMaxDate(e,"max"),i=n&&t<n?n:t;return i=r&&i>r?r:i,i},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return t==null?[1,1]:typeof t=="number"?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return(new Date(e,t,1)).getDay()},_canAdjustMonth:function(e,t,n,r){var i=this._getNumberOfMonths(e),s=this._daylightSavingAdjust(new Date(n,r+(t<0?t:i[0]*i[1]),1));return t<0&&s.setDate(this._getDaysInMonth(s.getFullYear(),s.getMonth())),this._isInRange(e,s)},_isInRange:function(e,t){var n=this._getMinMaxDate(e,"min"),r=this._getMinMaxDate(e,"max");return(!n||t.getTime()>=n.getTime())&&(!r||t.getTime()<=r.getTime())},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t=typeof t!="string"?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,n,r){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var i=t?typeof t=="object"?t:this._daylightSavingAdjust(new Date(r,n,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),i,this._getFormatConfig(e))}}),$.fn.datepicker=function(e){if(!this.length)return this;$.datepicker.initialized||($(document).mousedown($.datepicker._checkExternalClick).find(document.body).append($.datepicker.dpDiv),$.datepicker.initialized=!0);var t=Array.prototype.slice.call(arguments,1);return typeof e!="string"||e!="isDisabled"&&e!="getDate"&&e!="widget"?e=="option"&&arguments.length==2&&typeof arguments[1]=="string"?$.datepicker["_"+e+"Datepicker"].apply($.datepicker,[this[0]].concat(t)):this.each(function(){typeof e=="string"?$.datepicker["_"+e+"Datepicker"].apply($.datepicker,[this].concat(t)):$.datepicker._attachDatepicker(this,e)}):$.datepicker["_"+e+"Datepicker"].apply($.datepicker,[this[0]].concat(t))},$.datepicker=new Datepicker,$.datepicker.initialized=!1,$.datepicker.uuid=(new Date).getTime(),$.datepicker.version="1.9.2",window["DP_jQuery_"+dpuuid]=$})(jQuery);(function(e,t){var n="ui-dialog ui-widget ui-widget-content ui-corner-all ",r={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},i={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0};e.widget("ui.dialog",{version:"1.9.2",options:{autoOpen:!0,buttons:{},closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:!1,maxWidth:!1,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var n=e(this).css(t).offset().top;n<0&&e(this).css("top",t.top-n)}},resizable:!0,show:null,stack:!0,title:"",width:300,zIndex:1e3},_create:function(){this.originalTitle=this.element.attr("title"),typeof this.originalTitle!="string"&&(this.originalTitle=""),this.oldPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.options.title=this.options.title||this.originalTitle;var t=this,r=this.options,i=r.title||"&#160;",s,o,u,a,f;s=(this.uiDialog=e("<div>")).addClass(n+r.dialogClass).css({display:"none",outline:0,zIndex:r.zIndex}).attr("tabIndex",-1).keydown(function(n){r.closeOnEscape&&!n.isDefaultPrevented()&&n.keyCode&&n.keyCode===e.ui.keyCode.ESCAPE&&(t.close(n),n.preventDefault())}).mousedown(function(e){t.moveToTop(!1,e)}).appendTo("body"),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(s),o=(this.uiDialogTitlebar=e("<div>")).addClass("ui-dialog-titlebar  ui-widget-header  ui-corner-all  ui-helper-clearfix").bind("mousedown",function(){s.focus()}).prependTo(s),u=e("<a href='#'></a>").addClass("ui-dialog-titlebar-close  ui-corner-all").attr("role","button").click(function(e){e.preventDefault(),t.close(e)}).appendTo(o),(this.uiDialogTitlebarCloseText=e("<span>")).addClass("ui-icon ui-icon-closethick").text(r.closeText).appendTo(u),a=e("<span>").uniqueId().addClass("ui-dialog-title").html(i).prependTo(o),f=(this.uiDialogButtonPane=e("<div>")).addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),(this.uiButtonSet=e("<div>")).addClass("ui-dialog-buttonset").appendTo(f),s.attr({role:"dialog","aria-labelledby":a.attr("id")}),o.find("*").add(o).disableSelection(),this._hoverable(u),this._focusable(u),r.draggable&&e.fn.draggable&&this._makeDraggable(),r.resizable&&e.fn.resizable&&this._makeResizable(),this._createButtons(r.buttons),this._isOpen=!1,e.fn.bgiframe&&s.bgiframe(),this._on(s,{keydown:function(t){if(!r.modal||t.keyCode!==e.ui.keyCode.TAB)return;var n=e(":tabbable",s),i=n.filter(":first"),o=n.filter(":last");if(t.target===o[0]&&!t.shiftKey)return i.focus(1),!1;if(t.target===i[0]&&t.shiftKey)return o.focus(1),!1}})},_init:function(){this.options.autoOpen&&this.open()},_destroy:function(){var e,t=this.oldPosition;this.overlay&&this.overlay.destroy(),this.uiDialog.hide(),this.element.removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body"),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},close:function(t){var n=this,r,i;if(!this._isOpen)return;if(!1===this._trigger("beforeClose",t))return;return this._isOpen=!1,this.overlay&&this.overlay.destroy(),this.options.hide?this._hide(this.uiDialog,this.options.hide,function(){n._trigger("close",t)}):(this.uiDialog.hide(),this._trigger("close",t)),e.ui.dialog.overlay.resize(),this.options.modal&&(r=0,e(".ui-dialog").each(function(){this!==n.uiDialog[0]&&(i=e(this).css("z-index"),isNaN(i)||(r=Math.max(r,i)))}),e.ui.dialog.maxZ=r),this},isOpen:function(){return this._isOpen},moveToTop:function(t,n){var r=this.options,i;return r.modal&&!t||!r.stack&&!r.modal?this._trigger("focus",n):(r.zIndex>e.ui.dialog.maxZ&&(e.ui.dialog.maxZ=r.zIndex),this.overlay&&(e.ui.dialog.maxZ+=1,e.ui.dialog.overlay.maxZ=e.ui.dialog.maxZ,this.overlay.$el.css("z-index",e.ui.dialog.overlay.maxZ)),i={scrollTop:this.element.scrollTop(),scrollLeft:this.element.scrollLeft()},e.ui.dialog.maxZ+=1,this.uiDialog.css("z-index",e.ui.dialog.maxZ),this.element.attr(i),this._trigger("focus",n),this)},open:function(){if(this._isOpen)return;var t,n=this.options,r=this.uiDialog;return this._size(),this._position(n.position),r.show(n.show),this.overlay=n.modal?new e.ui.dialog.overlay(this):null,this.moveToTop(!0),t=this.element.find(":tabbable"),t.length||(t=this.uiDialogButtonPane.find(":tabbable"),t.length||(t=r)),t.eq(0).focus(),this._isOpen=!0,this._trigger("open"),this},_createButtons:function(t){var n=this,r=!1;this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),typeof t=="object"&&t!==null&&e.each(t,function(){return!(r=!0)}),r?(e.each(t,function(t,r){var i,s;r=e.isFunction(r)?{click:r,text:t}:r,r=e.extend({type:"button"},r),s=r.click,r.click=function(){s.apply(n.element[0],arguments)},i=e("<button></button>",r).appendTo(n.uiButtonSet),e.fn.button&&i.button()}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog)):this.uiDialog.removeClass("ui-dialog-buttons")},_makeDraggable:function(){function r(e){return{position:e.position,offset:e.offset}}var t=this,n=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(n,i){e(this).addClass("ui-dialog-dragging"),t._trigger("dragStart",n,r(i))},drag:function(e,n){t._trigger("drag",e,r(n))},stop:function(i,s){n.position=[s.position.left-t.document.scrollLeft(),s.position.top-t.document.scrollTop()],e(this).removeClass("ui-dialog-dragging"),t._trigger("dragStop",i,r(s)),e.ui.dialog.overlay.resize()}})},_makeResizable:function(n){function u(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}n=n===t?this.options.resizable:n;var r=this,i=this.options,s=this.uiDialog.css("position"),o=typeof n=="string"?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:i.maxWidth,maxHeight:i.maxHeight,minWidth:i.minWidth,minHeight:this._minHeight(),handles:o,start:function(t,n){e(this).addClass("ui-dialog-resizing"),r._trigger("resizeStart",t,u(n))},resize:function(e,t){r._trigger("resize",e,u(t))},stop:function(t,n){e(this).removeClass("ui-dialog-resizing"),i.height=e(this).height(),i.width=e(this).width(),r._trigger("resizeStop",t,u(n)),e.ui.dialog.overlay.resize()}}).css("position",s).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var e=this.options;return e.height==="auto"?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(t){var n=[],r=[0,0],i;if(t){if(typeof t=="string"||typeof t=="object"&&"0"in t)n=t.split?t.split(" "):[t[0],t[1]],n.length===1&&(n[1]=n[0]),e.each(["left","top"],function(e,t){+n[e]===n[e]&&(r[e]=n[e],n[e]=t)}),t={my:n[0]+(r[0]<0?r[0]:"+"+r[0])+" "+n[1]+(r[1]<0?r[1]:"+"+r[1]),at:n.join(" ")};t=e.extend({},e.ui.dialog.prototype.options.position,t)}else t=e.ui.dialog.prototype.options.position;i=this.uiDialog.is(":visible"),i||this.uiDialog.show(),this.uiDialog.position(t),i||this.uiDialog.hide()},_setOptions:function(t){var n=this,s={},o=!1;e.each(t,function(e,t){n._setOption(e,t),e in r&&(o=!0),e in i&&(s[e]=t)}),o&&this._size(),this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",s)},_setOption:function(t,r){var i,s,o=this.uiDialog;switch(t){case"buttons":this._createButtons(r);break;case"closeText":this.uiDialogTitlebarCloseText.text(""+r);break;case"dialogClass":o.removeClass(this.options.dialogClass).addClass(n+r);break;case"disabled":r?o.addClass("ui-dialog-disabled"):o.removeClass("ui-dialog-disabled");break;case"draggable":i=o.is(":data(draggable)"),i&&!r&&o.draggable("destroy"),!i&&r&&this._makeDraggable();break;case"position":this._position(r);break;case"resizable":s=o.is(":data(resizable)"),s&&!r&&o.resizable("destroy"),s&&typeof r=="string"&&o.resizable("option","handles",r),!s&&r!==!1&&this._makeResizable(r);break;case"title":e(".ui-dialog-title",this.uiDialogTitlebar).html(""+(r||"&#160;"))}this._super(t,r)},_size:function(){var t,n,r,i=this.options,s=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0}),i.minWidth>i.width&&(i.width=i.minWidth),t=this.uiDialog.css({height:"auto",width:i.width}).outerHeight(),n=Math.max(0,i.minHeight-t),i.height==="auto"?e.support.minHeight?this.element.css({minHeight:n,height:"auto"}):(this.uiDialog.show(),r=this.element.css("height","auto").height(),s||this.uiDialog.hide(),this.element.height(Math.max(r,n))):this.element.height(Math.max(i.height-t,0)),this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}}),e.extend(e.ui.dialog,{uuid:0,maxZ:0,getTitleId:function(e){var t=e.attr("id");return t||(this.uuid+=1,t=this.uuid),"ui-dialog-title-"+t},overlay:function(t){this.$el=e.ui.dialog.overlay.create(t)}}),e.extend(e.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:e.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(e){return e+".dialog-overlay"}).join(" "),create:function(t){this.instances.length===0&&(setTimeout(function(){e.ui.dialog.overlay.instances.length&&e(document).bind(e.ui.dialog.overlay.events,function(t){if(e(t.target).zIndex()<e.ui.dialog.overlay.maxZ)return!1})},1),e(window).bind("resize.dialog-overlay",e.ui.dialog.overlay.resize));var n=this.oldInstances.pop()||e("<div>").addClass("ui-widget-overlay");return e(document).bind("keydown.dialog-overlay",function(r){var i=e.ui.dialog.overlay.instances;i.length!==0&&i[i.length-1]===n&&t.options.closeOnEscape&&!r.isDefaultPrevented()&&r.keyCode&&r.keyCode===e.ui.keyCode.ESCAPE&&(t.close(r),r.preventDefault())}),n.appendTo(document.body).css({width:this.width(),height:this.height()}),e.fn.bgiframe&&n.bgiframe(),this.instances.push(n),n},destroy:function(t){var n=e.inArray(t,this.instances),r=0;n!==-1&&this.oldInstances.push(this.instances.splice(n,1)[0]),this.instances.length===0&&e([document,window]).unbind(".dialog-overlay"),t.height(0).width(0).remove(),e.each(this.instances,function(){r=Math.max(r,this.css("z-index"))}),this.maxZ=r},height:function(){var t,n;return e.ui.ie?(t=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight),n=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight),t<n?e(window).height()+"px":t+"px"):e(document).height()+"px"},width:function(){var t,n;return e.ui.ie?(t=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth),n=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth),t<n?e(window).width()+"px":t+"px"):e(document).width()+"px"},resize:function(){var t=e([]);e.each(e.ui.dialog.overlay.instances,function(){t=t.add(this)}),t.css({width:0,height:0}).css({width:e.ui.dialog.overlay.width(),height:e.ui.dialog.overlay.height()})}}),e.extend(e.ui.dialog.overlay.prototype,{destroy:function(){e.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);(function(e,t){var n=!1;e.widget("ui.menu",{version:"1.9.2",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content ui-corner-all").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,e.proxy(function(e){this.options.disabled&&e.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item > a":function(e){e.preventDefault()},"click .ui-state-disabled > a":function(e){e.preventDefault()},"click .ui-menu-item:has(a)":function(t){var r=e(t.target).closest(".ui-menu-item");!n&&r.not(".ui-state-disabled").length&&(n=!0,this.select(t),r.has(".ui-menu").length?this.expand(t):this.element.is(":focus")||(this.element.trigger("focus",[!0]),this.active&&this.active.parents(".ui-menu").length===1&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){var n=e(t.currentTarget);n.siblings().children(".ui-state-active").removeClass("ui-state-active"),this.focus(t,n)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var n=this.active||this.element.children(".ui-menu-item").eq(0);t||this.focus(e,n)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){e(t.target).closest(".ui-menu").length||this.collapseAll(t),n=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").andSelf().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){function a(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var n,r,i,s,o,u=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:u=!1,r=this.previousFilter||"",i=String.fromCharCode(t.keyCode),s=!1,clearTimeout(this.filterTimer),i===r?s=!0:i=r+i,o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())}),n=s&&n.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):n,n.length||(i=String.fromCharCode(t.keyCode),o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())})),n.length?(this.focus(t,n),n.length>1?(this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}u&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(e):this.select(e))},refresh:function(){var t,n=this.options.icons.submenu,r=this.element.find(this.options.menus);r.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-corner-all").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),r=t.prev("a"),i=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);r.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",r.attr("id"))}),t=r.add(this.element),t.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),t.children(":not(.ui-menu-item)").each(function(){var t=e(this);/[^\-—–\s]/.test(t.text())||t.addClass("ui-widget-content ui-menu-divider")}),t.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},focus:function(e,t){var n,r;this.blur(e,e&&e.type==="focus"),this._scrollIntoView(t),this.active=t.first(),r=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",r.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),e&&e.type==="keydown"?this._close():this.timer=this._delay(function(){this._close()},this.delay),n=t.children(".ui-menu"),n.length&&/^mouse/.test(e.type)&&this._startOpening(n),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var n,r,i,s,o,u;this._hasScroll()&&(n=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,r=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,i=t.offset().top-this.activeMenu.offset().top-n-r,s=this.activeMenu.scrollTop(),o=this.activeMenu.height(),u=t.height(),i<0?this.activeMenu.scrollTop(s+i):i+u>o&&this.activeMenu.scrollTop(s+i-o+u))},blur:function(e,t){t||clearTimeout(this.timer);if(!this.active)return;this.active.children("a").removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active})},_startOpening:function(e){clearTimeout(this.timer);if(e.attr("aria-hidden")!=="true")return;this.timer=this._delay(function(){this._close(),this._open(e)},this.delay)},_open:function(t){var n=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(n)},collapseAll:function(t,n){clearTimeout(this.timer),this.timer=this._delay(function(){var r=n?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));r.length||(r=this.element),this._close(r),this.blur(t),this.activeMenu=r},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find("a.ui-state-active").removeClass("ui-state-active")},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,n){var r;this.active&&(e==="first"||e==="last"?r=this.active[e==="first"?"prevAll":"nextAll"](".ui-menu-item").eq(-1):r=this.active[e+"All"](".ui-menu-item").eq(0));if(!r||!r.length||!this.active)r=this.activeMenu.children(".ui-menu-item")[t]();this.focus(n,r)},nextPage:function(t){var n,r,i;if(!this.active){this.next(t);return}if(this.isLastItem())return;this._hasScroll()?(r=this.active.offset().top,i=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return n=e(this),n.offset().top-r-i<0}),this.focus(t,n)):this.focus(t,this.activeMenu.children(".ui-menu-item")[this.active?"last":"first"]())},previousPage:function(t){var n,r,i;if(!this.active){this.next(t);return}if(this.isFirstItem())return;this._hasScroll()?(r=this.active.offset().top,i=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return n=e(this),n.offset().top-r+i>0}),this.focus(t,n)):this.focus(t,this.activeMenu.children(".ui-menu-item").first())},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||e(t.target).closest(".ui-menu-item");var n={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,n)}})})(jQuery);(function(e,t){e.widget("ui.progressbar",{version:"1.9.2",options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()}),this.valueDiv=e("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this.oldValue=this._value(),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(e){return e===t?this._value():(this._setOption("value",e),this)},_setOption:function(e,t){e==="value"&&(this.options.value=t,this._refreshValue(),this._value()===this.options.max&&this._trigger("complete")),this._super(e,t)},_value:function(){var e=this.options.value;return typeof e!="number"&&(e=0),Math.min(this.options.max,Math.max(this.min,e))},_percentage:function(){return 100*this._value()/this.options.max},_refreshValue:function(){var e=this.value(),t=this._percentage();this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),this.valueDiv.toggle(e>this.min).toggleClass("ui-corner-right",e===this.options.max).width(t.toFixed(0)+"%"),this.element.attr("aria-valuenow",e)}})})(jQuery);(function(e,t){var n=5;e.widget("ui.slider",e.ui.mouse,{version:"1.9.2",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null},_create:function(){var t,r,i=this.options,s=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),o="<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",u=[];this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"+(i.disabled?" ui-slider-disabled ui-disabled":"")),this.range=e([]),i.range&&(i.range===!0&&(i.values||(i.values=[this._valueMin(),this._valueMin()]),i.values.length&&i.values.length!==2&&(i.values=[i.values[0],i.values[0]])),this.range=e("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(i.range==="min"||i.range==="max"?" ui-slider-range-"+i.range:""))),r=i.values&&i.values.length||1;for(t=s.length;t<r;t++)u.push(o);this.handles=s.add(e(u.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.add(this.range).filter("a").click(function(e){e.preventDefault()}).mouseenter(function(){i.disabled||e(this).addClass("ui-state-hover")}).mouseleave(function(){e(this).removeClass("ui-state-hover")}).focus(function(){i.disabled?e(this).blur():(e(".ui-slider .ui-state-focus").removeClass("ui-state-focus"),e(this).addClass("ui-state-focus"))}).blur(function(){e(this).removeClass("ui-state-focus")}),this.handles.each(function(t){e(this).data("ui-slider-handle-index",t)}),this._on(this.handles,{keydown:function(t){var r,i,s,o,u=e(t.target).data("ui-slider-handle-index");switch(t.keyCode){case e.ui.keyCode.HOME:case e.ui.keyCode.END:case e.ui.keyCode.PAGE_UP:case e.ui.keyCode.PAGE_DOWN:case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:t.preventDefault();if(!this._keySliding){this._keySliding=!0,e(t.target).addClass("ui-state-active"),r=this._start(t,u);if(r===!1)return}}o=this.options.step,this.options.values&&this.options.values.length?i=s=this.values(u):i=s=this.value();switch(t.keyCode){case e.ui.keyCode.HOME:s=this._valueMin();break;case e.ui.keyCode.END:s=this._valueMax();break;case e.ui.keyCode.PAGE_UP:s=this._trimAlignValue(i+(this._valueMax()-this._valueMin())/n);break;case e.ui.keyCode.PAGE_DOWN:s=this._trimAlignValue(i-(this._valueMax()-this._valueMin())/n);break;case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:if(i===this._valueMax())return;s=this._trimAlignValue(i+o);break;case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(i===this._valueMin())return;s=this._trimAlignValue(i-o)}this._slide(t,u,s)},keyup:function(t){var n=e(t.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(t,n),this._change(t,n),e(t.target).removeClass("ui-state-active"))}}),this._refreshValue(),this._animateOff=!1},_destroy:function(){this.handles.remove(),this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(t){var n,r,i,s,o,u,a,f,l=this,c=this.options;return c.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),n={x:t.pageX,y:t.pageY},r=this._normValueFromMouse(n),i=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var n=Math.abs(r-l.values(t));i>n&&(i=n,s=e(this),o=t)}),c.range===!0&&this.values(1)===c.min&&(o+=1,s=e(this.handles[o])),u=this._start(t,o),u===!1?!1:(this._mouseSliding=!0,this._handleIndex=o,s.addClass("ui-state-active").focus(),a=s.offset(),f=!e(t.target).parents().andSelf().is(".ui-slider-handle"),this._clickOffset=f?{left:0,top:0}:{left:t.pageX-a.left-s.width()/2,top:t.pageY-a.top-s.height()/2-(parseInt(s.css("borderTopWidth"),10)||0)-(parseInt(s.css("borderBottomWidth"),10)||0)+(parseInt(s.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,r),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(e){var t={x:e.pageX,y:e.pageY},n=this._normValueFromMouse(t);return this._slide(e,this._handleIndex,n),!1},_mouseStop:function(e){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(e,this._handleIndex),this._change(e,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(e){var t,n,r,i,s;return this.orientation==="horizontal"?(t=this.elementSize.width,n=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(t=this.elementSize.height,n=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),r=n/t,r>1&&(r=1),r<0&&(r=0),this.orientation==="vertical"&&(r=1-r),i=this._valueMax()-this._valueMin(),s=this._valueMin()+r*i,this._trimAlignValue(s)},_start:function(e,t){var n={handle:this.handles[t],value:this.value()};return this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._trigger("start",e,n)},_slide:function(e,t,n){var r,i,s;this.options.values&&this.options.values.length?(r=this.values(t?0:1),this.options.values.length===2&&this.options.range===!0&&(t===0&&n>r||t===1&&n<r)&&(n=r),n!==this.values(t)&&(i=this.values(),i[t]=n,s=this._trigger("slide",e,{handle:this.handles[t],value:n,values:i}),r=this.values(t?0:1),s!==!1&&this.values(t,n,!0))):n!==this.value()&&(s=this._trigger("slide",e,{handle:this.handles[t],value:n}),s!==!1&&this.value(n))},_stop:function(e,t){var n={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._trigger("stop",e,n)},_change:function(e,t){if(!this._keySliding&&!this._mouseSliding){var n={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._trigger("change",e,n)}},value:function(e){if(arguments.length){this.options.value=this._trimAlignValue(e),this._refreshValue(),this._change(null,0);return}return this._value()},values:function(t,n){var r,i,s;if(arguments.length>1){this.options.values[t]=this._trimAlignValue(n),this._refreshValue(),this._change(null,t);return}if(!arguments.length)return this._values();if(!e.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(t):this.value();r=this.options.values,i=arguments[0];for(s=0;s<r.length;s+=1)r[s]=this._trimAlignValue(i[s]),this._change(null,s);this._refreshValue()},_setOption:function(t,n){var r,i=0;e.isArray(this.options.values)&&(i=this.options.values.length),e.Widget.prototype._setOption.apply(this,arguments);switch(t){case"disabled":n?(this.handles.filter(".ui-state-focus").blur(),this.handles.removeClass("ui-state-hover"),this.handles.prop("disabled",!0),this.element.addClass("ui-disabled")):(this.handles.prop("disabled",!1),this.element.removeClass("ui-disabled"));break;case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":this._animateOff=!0,this._refreshValue();for(r=0;r<i;r+=1)this._change(null,r);this._animateOff=!1;break;case"min":case"max":this._animateOff=!0,this._refreshValue(),this._animateOff=!1}},_value:function(){var e=this.options.value;return e=this._trimAlignValue(e),e},_values:function(e){var t,n,r;if(arguments.length)return t=this.options.values[e],t=this._trimAlignValue(t),t;n=this.options.values.slice();for(r=0;r<n.length;r+=1)n[r]=this._trimAlignValue(n[r]);return n},_trimAlignValue:function(e){if(e<=this._valueMin())return this._valueMin();if(e>=this._valueMax())return this._valueMax();var t=this.options.step>0?this.options.step:1,n=(e-this._valueMin())%t,r=e-n;return Math.abs(n)*2>=t&&(r+=n>0?t:-t),parseFloat(r.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var t,n,r,i,s,o=this.options.range,u=this.options,a=this,f=this._animateOff?!1:u.animate,l={};this.options.values&&this.options.values.length?this.handles.each(function(r){n=(a.values(r)-a._valueMin())/(a._valueMax()-a._valueMin())*100,l[a.orientation==="horizontal"?"left":"bottom"]=n+"%",e(this).stop(1,1)[f?"animate":"css"](l,u.animate),a.options.range===!0&&(a.orientation==="horizontal"?(r===0&&a.range.stop(1,1)[f?"animate":"css"]({left:n+"%"},u.animate),r===1&&a.range[f?"animate":"css"]({width:n-t+"%"},{queue:!1,duration:u.animate})):(r===0&&a.range.stop(1,1)[f?"animate":"css"]({bottom:n+"%"},u.animate),r===1&&a.range[f?"animate":"css"]({height:n-t+"%"},{queue:!1,duration:u.animate}))),t=n}):(r=this.value(),i=this._valueMin(),s=this._valueMax(),n=s!==i?(r-i)/(s-i)*100:0,l[this.orientation==="horizontal"?"left":"bottom"]=n+"%",this.handle.stop(1,1)[f?"animate":"css"](l,u.animate),o==="min"&&this.orientation==="horizontal"&&this.range.stop(1,1)[f?"animate":"css"]({width:n+"%"},u.animate),o==="max"&&this.orientation==="horizontal"&&this.range[f?"animate":"css"]({width:100-n+"%"},{queue:!1,duration:u.animate}),o==="min"&&this.orientation==="vertical"&&this.range.stop(1,1)[f?"animate":"css"]({height:n+"%"},u.animate),o==="max"&&this.orientation==="vertical"&&this.range[f?"animate":"css"]({height:100-n+"%"},{queue:!1,duration:u.animate}))}})})(jQuery);(function(e){function t(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.widget("ui.spinner",{version:"1.9.2",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var t={},n=this.element;return e.each(["min","max","step"],function(e,r){var i=n.attr(r);i!==undefined&&i.length&&(t[r]=i)}),t},_events:{keydown:function(e){this._start(e)&&this._keydown(e)&&e.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(e){if(this.cancelBlur){delete this.cancelBlur;return}this._refresh(),this.previous!==this.element.val()&&this._trigger("change",e)},mousewheel:function(e,t){if(!t)return;if(!this.spinning&&!this._start(e))return!1;this._spin((t>0?1:-1)*this.options.step,e),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(e)},100),e.preventDefault()},"mousedown .ui-spinner-button":function(t){function r(){var e=this.element[0]===this.document[0].activeElement;e||(this.element.focus(),this.previous=n,this._delay(function(){this.previous=n}))}var n;n=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),t.preventDefault(),r.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,r.call(this)});if(this._start(t)===!1)return;this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){if(!e(t.currentTarget).hasClass("ui-state-active"))return;if(this._start(t)===!1)return!1;this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var e=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=e.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(e.height()*.5)&&e.height()>0&&e.height(e.height()),this.options.disabled&&this.disable()},_keydown:function(t){var n=this.options,r=e.ui.keyCode;switch(t.keyCode){case r.UP:return this._repeat(null,1,t),!0;case r.DOWN:return this._repeat(null,-1,t),!0;case r.PAGE_UP:return this._repeat(null,n.page,t),!0;case r.PAGE_DOWN:return this._repeat(null,-n.page,t),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(e){return!this.spinning&&this._trigger("start",e)===!1?!1:(this.counter||(this.counter=1),this.spinning=!0,!0)},_repeat:function(e,t,n){e=e||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,t,n)},e),this._spin(t*this.options.step,n)},_spin:function(e,t){var n=this.value()||0;this.counter||(this.counter=1),n=this._adjustValue(n+e*this._increment(this.counter));if(!this.spinning||this._trigger("spin",t,{value:n})!==!1)this._value(n),this.counter++},_increment:function(t){var n=this.options.incremental;return n?e.isFunction(n)?n(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var e=this._precisionOf(this.options.step);return this.options.min!==null&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=e.toString(),n=t.indexOf(".");return n===-1?0:t.length-n-1},_adjustValue:function(e){var t,n,r=this.options;return t=r.min!==null?r.min:0,n=e-t,n=Math.round(n/r.step)*r.step,e=t+n,e=parseFloat(e.toFixed(this._precision())),r.max!==null&&e>r.max?r.max:r.min!==null&&e<r.min?r.min:e},_stop:function(e){if(!this.spinning)return;clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",e)},_setOption:function(e,t){if(e==="culture"||e==="numberFormat"){var n=this._parse(this.element.val());this.options[e]=t,this.element.val(this._format(n));return}(e==="max"||e==="min"||e==="step")&&typeof t=="string"&&(t=this._parse(t)),this._super(e,t),e==="disabled"&&(t?(this.element.prop("disabled",!0),this.buttons.button("disable")):(this.element.prop("disabled",!1),this.buttons.button("enable")))},_setOptions:t(function(e){this._super(e),this._value(this.element.val())}),_parse:function(e){return typeof e=="string"&&e!==""&&(e=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(e,10,this.options.culture):+e),e===""||isNaN(e)?null:e},_format:function(e){return e===""?"":window.Globalize&&this.options.numberFormat?Globalize.format(e,this.options.numberFormat,this.options.culture):e},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},_value:function(e,t){var n;e!==""&&(n=this._parse(e),n!==null&&(t||(n=this._adjustValue(n)),e=this._format(n))),this.element.val(e),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:t(function(e){this._stepUp(e)}),_stepUp:function(e){this._spin((e||1)*this.options.step)},stepDown:t(function(e){this._stepDown(e)}),_stepDown:function(e){this._spin((e||1)*-this.options.step)},pageUp:t(function(e){this._stepUp((e||1)*this.options.page)}),pageDown:t(function(e){this._stepDown((e||1)*this.options.page)}),value:function(e){if(!arguments.length)return this._parse(this.element.val());t(this._value).call(this,e)},widget:function(){return this.uiSpinner}})})(jQuery);(function(e,t){function i(){return++n}function s(e){return e.hash.length>1&&e.href.replace(r,"")===location.href.replace(r,"").replace(/\s/g,"%20")}var n=0,r=/#.*$/;e.widget("ui.tabs",{version:"1.9.2",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_create:function(){var t=this,n=this.options,r=n.active,i=location.hash.substring(1);this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",n.collapsible).delegate(".ui-tabs-nav > li","mousedown"+this.eventNamespace,function(t){e(this).is(".ui-state-disabled")&&t.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){e(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this._processTabs();if(r===null){i&&this.tabs.each(function(t,n){if(e(n).attr("aria-controls")===i)return r=t,!1}),r===null&&(r=this.tabs.index(this.tabs.filter(".ui-tabs-active")));if(r===null||r===-1)r=this.tabs.length?0:!1}r!==!1&&(r=this.tabs.index(this.tabs.eq(r)),r===-1&&(r=n.collapsible?!1:0)),n.active=r,!n.collapsible&&n.active===!1&&this.anchors.length&&(n.active=0),e.isArray(n.disabled)&&(n.disabled=e.unique(n.disabled.concat(e.map(this.tabs.filter(".ui-state-disabled"),function(e){return t.tabs.index(e)}))).sort()),this.options.active!==!1&&this.anchors.length?this.active=this._findActive(this.options.active):this.active=e(),this._refresh(),this.active.length&&this.load(n.active)},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):e()}},_tabKeydown:function(t){var n=e(this.document[0].activeElement).closest("li"),r=this.tabs.index(n),i=!0;if(this._handlePageNav(t))return;switch(t.keyCode){case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:r++;break;case e.ui.keyCode.UP:case e.ui.keyCode.LEFT:i=!1,r--;break;case e.ui.keyCode.END:r=this.anchors.length-1;break;case e.ui.keyCode.HOME:r=0;break;case e.ui.keyCode.SPACE:t.preventDefault(),clearTimeout(this.activating),this._activate(r);return;case e.ui.keyCode.ENTER:t.preventDefault(),clearTimeout(this.activating),this._activate(r===this.options.active?!1:r);return;default:return}t.preventDefault(),clearTimeout(this.activating),r=this._focusNextTab(r,i),t.ctrlKey||(n.attr("aria-selected","false"),this.tabs.eq(r).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",r)},this.delay))},_panelKeydown:function(t){if(this._handlePageNav(t))return;t.ctrlKey&&t.keyCode===e.ui.keyCode.UP&&(t.preventDefault(),this.active.focus())},_handlePageNav:function(t){if(t.altKey&&t.keyCode===e.ui.keyCode.PAGE_UP)return this._activate(this._focusNextTab(this.options.active-1,!1)),!0;if(t.altKey&&t.keyCode===e.ui.keyCode.PAGE_DOWN)return this._activate(this._focusNextTab(this.options.active+1,!0)),!0},_findNextTab:function(t,n){function i(){return t>r&&(t=0),t<0&&(t=r),t}var r=this.tabs.length-1;while(e.inArray(i(),this.options.disabled)!==-1)t=n?t+1:t-1;return t},_focusNextTab:function(e,t){return e=this._findNextTab(e,t),this.tabs.eq(e).focus(),e},_setOption:function(e,t){if(e==="active"){this._activate(t);return}if(e==="disabled"){this._setupDisabled(t);return}this._super(e,t),e==="collapsible"&&(this.element.toggleClass("ui-tabs-collapsible",t),!t&&this.options.active===!1&&this._activate(0)),e==="event"&&this._setupEvents(t),e==="heightStyle"&&this._setupHeightStyle(t)},_tabId:function(e){return e.attr("aria-controls")||"ui-tabs-"+i()},_sanitizeSelector:function(e){return e?e.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,n=this.tablist.children(":has(a[href])");t.disabled=e.map(n.filter(".ui-state-disabled"),function(e){return n.index(e)}),this._processTabs(),t.active===!1||!this.anchors.length?(t.active=!1,this.active=e()):this.active.length&&!e.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=e()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-expanded":"false","aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-expanded":"true","aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var t=this;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist"),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return e("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=e(),this.anchors.each(function(n,r){var i,o,u,a=e(r).uniqueId().attr("id"),f=e(r).closest("li"),l=f.attr("aria-controls");s(r)?(i=r.hash,o=t.element.find(t._sanitizeSelector(i))):(u=t._tabId(f),i="#"+u,o=t.element.find(i),o.length||(o=t._createPanel(u),o.insertAfter(t.panels[n-1]||t.tablist)),o.attr("aria-live","polite")),o.length&&(t.panels=t.panels.add(o)),l&&f.data("ui-tabs-aria-controls",l),f.attr({"aria-controls":i.substring(1),"aria-labelledby":a}),o.attr("aria-labelledby",a)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel")},_getList:function(){return this.element.find("ol,ul").eq(0)},_createPanel:function(t){return e("<div>").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var n=0,r;r=this.tabs[n];n++)t===!0||e.inArray(n,t)!==-1?e(r).addClass("ui-state-disabled").attr("aria-disabled","true"):e(r).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var n={click:function(e){e.preventDefault()}};t&&e.each(t.split(" "),function(e,t){n[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(this.anchors,n),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var n,r,i=this.element.parent();t==="fill"?(e.support.minHeight||(r=i.css("overflow"),i.css("overflow","hidden")),n=i.height(),this.element.siblings(":visible").each(function(){var t=e(this),r=t.css("position");if(r==="absolute"||r==="fixed")return;n-=t.outerHeight(!0)}),r&&i.css("overflow",r),this.element.children().not(this.panels).each(function(){n-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,n-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):t==="auto"&&(n=0,this.panels.each(function(){n=Math.max(n,e(this).height("").height())}).height(n))},_eventHandler:function(t){var n=this.options,r=this.active,i=e(t.currentTarget),s=i.closest("li"),o=s[0]===r[0],u=o&&n.collapsible,a=u?e():this._getPanelForTab(s),f=r.length?this._getPanelForTab(r):e(),l={oldTab:r,oldPanel:f,newTab:u?e():s,newPanel:a};t.preventDefault();if(s.hasClass("ui-state-disabled")||s.hasClass("ui-tabs-loading")||this.running||o&&!n.collapsible||this._trigger("beforeActivate",t,l)===!1)return;n.active=u?!1:this.tabs.index(s),this.active=o?e():s,this.xhr&&this.xhr.abort(),!f.length&&!a.length&&e.error("jQuery UI Tabs: Mismatching fragment identifier."),a.length&&this.load(this.tabs.index(s),t),this._toggle(t,l)},_toggle:function(t,n){function o(){r.running=!1,r._trigger("activate",t,n)}function u(){n.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),i.length&&r.options.show?r._show(i,r.options.show,o):(i.show(),o())}var r=this,i=n.newPanel,s=n.oldPanel;this.running=!0,s.length&&this.options.hide?this._hide(s,this.options.hide,function(){n.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),u()}):(n.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),s.hide(),u()),s.attr({"aria-expanded":"false","aria-hidden":"true"}),n.oldTab.attr("aria-selected","false"),i.length&&s.length?n.oldTab.attr("tabIndex",-1):i.length&&this.tabs.filter(function(){return e(this).attr("tabIndex")===0}).attr("tabIndex",-1),i.attr({"aria-expanded":"true","aria-hidden":"false"}),n.newTab.attr({"aria-selected":"true",tabIndex:0})},_activate:function(t){var n,r=this._findActive(t);if(r[0]===this.active[0])return;r.length||(r=this.active),n=r.find(".ui-tabs-anchor")[0],this._eventHandler({target:n,currentTarget:n,preventDefault:e.noop})},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return typeof e=="string"&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeData("href.tabs").removeData("load.tabs").removeUniqueId(),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),n=t.data("ui-tabs-aria-controls");n?t.attr("aria-controls",n):t.removeAttr("aria-controls")}),this.panels.show(),this.options.heightStyle!=="content"&&this.panels.css("height","")},enable:function(n){var r=this.options.disabled;if(r===!1)return;n===t?r=!1:(n=this._getIndex(n),e.isArray(r)?r=e.map(r,function(e){return e!==n?e:null}):r=e.map(this.tabs,function(e,t){return t!==n?t:null})),this._setupDisabled(r)},disable:function(n){var r=this.options.disabled;if(r===!0)return;if(n===t)r=!0;else{n=this._getIndex(n);if(e.inArray(n,r)!==-1)return;e.isArray(r)?r=e.merge([n],r).sort():r=[n]}this._setupDisabled(r)},load:function(t,n){t=this._getIndex(t);var r=this,i=this.tabs.eq(t),o=i.find(".ui-tabs-anchor"),u=this._getPanelForTab(i),a={tab:i,panel:u};if(s(o[0]))return;this.xhr=e.ajax(this._ajaxSettings(o,n,a)),this.xhr&&this.xhr.statusText!=="canceled"&&(i.addClass("ui-tabs-loading"),u.attr("aria-busy","true"),this.xhr.success(function(e){setTimeout(function(){u.html(e),r._trigger("load",n,a)},1)}).complete(function(e,t){setTimeout(function(){t==="abort"&&r.panels.stop(!1,!0),i.removeClass("ui-tabs-loading"),u.removeAttr("aria-busy"),e===r.xhr&&delete r.xhr},1)}))},_ajaxSettings:function(t,n,r){var i=this;return{url:t.attr("href"),beforeSend:function(t,s){return i._trigger("beforeLoad",n,e.extend({jqXHR:t,ajaxSettings:s},r))}}},_getPanelForTab:function(t){var n=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+n))}}),e.uiBackCompat!==!1&&(e.ui.tabs.prototype._ui=function(e,t){return{tab:e,panel:t,index:this.anchors.index(e)}},e.widget("ui.tabs",e.ui.tabs,{url:function(e,t){this.anchors.eq(e).attr("href",t)}}),e.widget("ui.tabs",e.ui.tabs,{options:{ajaxOptions:null,cache:!1},_create:function(){this._super();var t=this;this._on({tabsbeforeload:function(n,r){if(e.data(r.tab[0],"cache.tabs")){n.preventDefault();return}r.jqXHR.success(function(){t.options.cache&&e.data(r.tab[0],"cache.tabs",!0)})}})},_ajaxSettings:function(t,n,r){var i=this.options.ajaxOptions;return e.extend({},i,{error:function(e,t){try{i.error(e,t,r.tab.closest("li").index(),r.tab[0])}catch(n){}}},this._superApply(arguments))},_setOption:function(e,t){e==="cache"&&t===!1&&this.anchors.removeData("cache.tabs"),this._super(e,t)},_destroy:function(){this.anchors.removeData("cache.tabs"),this._super()},url:function(e){this.anchors.eq(e).removeData("cache.tabs"),this._superApply(arguments)}}),e.widget("ui.tabs",e.ui.tabs,{abort:function(){this.xhr&&this.xhr.abort()}}),e.widget("ui.tabs",e.ui.tabs,{options:{spinner:"<em>Loading&#8230;</em>"},_create:function(){this._super(),this._on({tabsbeforeload:function(e,t){if(e.target!==this.element[0]||!this.options.spinner)return;var n=t.tab.find("span"),r=n.html();n.html(this.options.spinner),t.jqXHR.complete(function(){n.html(r)})}})}}),e.widget("ui.tabs",e.ui.tabs,{options:{enable:null,disable:null},enable:function(t){var n=this.options,r;if(t&&n.disabled===!0||e.isArray(n.disabled)&&e.inArray(t,n.disabled)!==-1)r=!0;this._superApply(arguments),r&&this._trigger("enable",null,this._ui(this.anchors[t],this.panels[t]))},disable:function(t){var n=this.options,r;if(t&&n.disabled===!1||e.isArray(n.disabled)&&e.inArray(t,n.disabled)===-1)r=!0;this._superApply(arguments),r&&this._trigger("disable",null,this._ui(this.anchors[t],this.panels[t]))}}),e.widget("ui.tabs",e.ui.tabs,{options:{add:null,remove:null,tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},add:function(n,r,i){i===t&&(i=this.anchors.length);var s,o,u=this.options,a=e(u.tabTemplate.replace(/#\{href\}/g,n).replace(/#\{label\}/g,r)),f=n.indexOf("#")?this._tabId(a):n.replace("#","");return a.addClass("ui-state-default ui-corner-top").data("ui-tabs-destroy",!0),a.attr("aria-controls",f),s=i>=this.tabs.length,o=this.element.find("#"+f),o.length||(o=this._createPanel(f),s?i>0?o.insertAfter(this.panels.eq(-1)):o.appendTo(this.element):o.insertBefore(this.panels[i])),o.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").hide(),s?a.appendTo(this.tablist):a.insertBefore(this.tabs[i]),u.disabled=e.map(u.disabled,function(e){return e>=i?++e:e}),this.refresh(),this.tabs.length===1&&u.active===!1&&this.option("active",0),this._trigger("add",null,this._ui(this.anchors[i],this.panels[i])),this},remove:function(t){t=this._getIndex(t);var n=this.options,r=this.tabs.eq(t).remove(),i=this._getPanelForTab(r).remove();return r.hasClass("ui-tabs-active")&&this.anchors.length>2&&this._activate(t+(t+1<this.anchors.length?1:-1)),n.disabled=e.map(e.grep(n.disabled,function(e){return e!==t}),function(e){return e>=t?--e:e}),this.refresh(),this._trigger("remove",null,this._ui(r.find("a")[0],i[0])),this}}),e.widget("ui.tabs",e.ui.tabs,{length:function(){return this.anchors.length}}),e.widget("ui.tabs",e.ui.tabs,{options:{idPrefix:"ui-tabs-"},_tabId:function(t){var n=t.is("li")?t.find("a[href]"):t;return n=n[0],e(n).closest("li").attr("aria-controls")||n.title&&n.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF\-]/g,"")||this.options.idPrefix+i()}}),e.widget("ui.tabs",e.ui.tabs,{options:{panelTemplate:"<div></div>"},_createPanel:function(t){return e(this.options.panelTemplate).attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)}}),e.widget("ui.tabs",e.ui.tabs,{_create:function(){var e=this.options;e.active===null&&e.selected!==t&&(e.active=e.selected===-1?!1:e.selected),this._super(),e.selected=e.active,e.selected===!1&&(e.selected=-1)},_setOption:function(e,t){if(e!=="selected")return this._super(e,t);var n=this.options;this._super("active",t===-1?!1:t),n.selected=n.active,n.selected===!1&&(n.selected=-1)},_eventHandler:function(){this._superApply(arguments),this.options.selected=this.options.active,this.options.selected===!1&&(this.options.selected=-1)}}),e.widget("ui.tabs",e.ui.tabs,{options:{show:null,select:null},_create:function(){this._super(),this.options.active!==!1&&this._trigger("show",null,this._ui(this.active.find(".ui-tabs-anchor")[0],this._getPanelForTab(this.active)[0]))},_trigger:function(e,t,n){var r,i,s=this._superApply(arguments);return s?(e==="beforeActivate"?(r=n.newTab.length?n.newTab:n.oldTab,i=n.newPanel.length?n.newPanel:n.oldPanel,s=this._super("select",t,{tab:r.find(".ui-tabs-anchor")[0],panel:i[0],index:r.closest("li").index()})):e==="activate"&&n.newTab.length&&(s=this._super("show",t,{tab:n.newTab.find(".ui-tabs-anchor")[0],panel:n.newPanel[0],index:n.newTab.closest("li").index()})),s):!1}}),e.widget("ui.tabs",e.ui.tabs,{select:function(e){e=this._getIndex(e);if(e===-1){if(!this.options.collapsible||this.options.selected===-1)return;e=this.options.selected}this.anchors.eq(e).trigger(this.options.event+this.eventNamespace)}}),function(){var t=0;e.widget("ui.tabs",e.ui.tabs,{options:{cookie:null},_create:function(){var e=this.options,t;e.active==null&&e.cookie&&(t=parseInt(this._cookie(),10),t===-1&&(t=!1),e.active=t),this._super()},_cookie:function(n){var r=[this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+ ++t)];return arguments.length&&(r.push(n===!1?-1:n),r.push(this.options.cookie)),e.cookie.apply(null,r)},_refresh:function(){this._super(),this.options.cookie&&this._cookie(this.options.active,this.options.cookie)},_eventHandler:function(){this._superApply(arguments),this.options.cookie&&this._cookie(this.options.active,this.options.cookie)},_destroy:function(){this._super(),this.options.cookie&&this._cookie(null,this.options.cookie)}})}(),e.widget("ui.tabs",e.ui.tabs,{_trigger:function(t,n,r){var i=e.extend({},r);return t==="load"&&(i.panel=i.panel[0],i.tab=i.tab.find(".ui-tabs-anchor")[0]),this._super(t,n,i)}}),e.widget("ui.tabs",e.ui.tabs,{options:{fx:null},_getFx:function(){var t,n,r=this.options.fx;return r&&(e.isArray(r)?(t=r[0],n=r[1]):t=n=r),r?{show:n,hide:t}:null},_toggle:function(e,t){function o(){n.running=!1,n._trigger("activate",e,t)}function u(){t.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),r.length&&s.show?r.animate(s.show,s.show.duration,function(){o()}):(r.show(),o())}var n=this,r=t.newPanel,i=t.oldPanel,s=this._getFx();if(!s)return this._super(e,t);n.running=!0,i.length&&s.hide?i.animate(s.hide,s.hide.duration,function(){t.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),u()}):(t.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),i.hide(),u())}}))})(jQuery);(function(e){function n(t,n){var r=(t.attr("aria-describedby")||"").split(/\s+/);r.push(n),t.data("ui-tooltip-id",n).attr("aria-describedby",e.trim(r.join(" ")))}function r(t){var n=t.data("ui-tooltip-id"),r=(t.attr("aria-describedby")||"").split(/\s+/),i=e.inArray(n,r);i!==-1&&r.splice(i,1),t.removeData("ui-tooltip-id"),r=e.trim(r.join(" ")),r?t.attr("aria-describedby",r):t.removeAttr("aria-describedby")}var t=0;e.widget("ui.tooltip",{version:"1.9.2",options:{content:function(){return e(this).attr("title")},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable()},_setOption:function(t,n){var r=this;if(t==="disabled"){this[n?"_disable":"_enable"](),this.options[t]=n;return}this._super(t,n),t==="content"&&e.each(this.tooltips,function(e,t){r._updateContent(t)})},_disable:function(){var t=this;e.each(this.tooltips,function(n,r){var i=e.Event("blur");i.target=i.currentTarget=r[0],t.close(i,!0)}),this.element.find(this.options.items).andSelf().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).attr("title","")})},_enable:function(){this.element.find(this.options.items).andSelf().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var n=this,r=e(t?t.target:this.element).closest(this.options.items);if(!r.length||r.data("ui-tooltip-id"))return;r.attr("title")&&r.data("ui-tooltip-title",r.attr("title")),r.data("ui-tooltip-open",!0),t&&t.type==="mouseover"&&r.parents().each(function(){var t=e(this),r;t.data("ui-tooltip-open")&&(r=e.Event("blur"),r.target=r.currentTarget=this,n.close(r,!0)),t.attr("title")&&(t.uniqueId(),n.parents[this.id]={element:this,title:t.attr("title")},t.attr("title",""))}),this._updateContent(r,t)},_updateContent:function(e,t){var n,r=this.options.content,i=this,s=t?t.type:null;if(typeof r=="string")return this._open(t,e,r);n=r.call(e[0],function(n){if(!e.data("ui-tooltip-open"))return;i._delay(function(){t&&(t.type=s),this._open(t,e,n)})}),n&&this._open(t,e,n)},_open:function(t,r,i){function f(e){a.of=e;if(s.is(":hidden"))return;s.position(a)}var s,o,u,a=e.extend({},this.options.position);if(!i)return;s=this._find(r);if(s.length){s.find(".ui-tooltip-content").html(i);return}r.is("[title]")&&(t&&t.type==="mouseover"?r.attr("title",""):r.removeAttr("title")),s=this._tooltip(r),n(r,s.attr("id")),s.find(".ui-tooltip-content").html(i),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:f}),f(t)):s.position(e.extend({of:r},this.options.position)),s.hide(),this._show(s,this.options.show),this.options.show&&this.options.show.delay&&(u=setInterval(function(){s.is(":visible")&&(f(a.of),clearInterval(u))},e.fx.interval)),this._trigger("open",t,{tooltip:s}),o={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var n=e.Event(t);n.currentTarget=r[0],this.close(n,!0)}},remove:function(){this._removeTooltip(s)}};if(!t||t.type==="mouseover")o.mouseleave="close";if(!t||t.type==="focusin")o.focusout="close";this._on(!0,r,o)},close:function(t){var n=this,i=e(t?t.currentTarget:this.element),s=this._find(i);if(this.closing)return;i.data("ui-tooltip-title")&&i.attr("title",i.data("ui-tooltip-title")),r(i),s.stop(!0),this._hide(s,this.options.hide,function(){n._removeTooltip(e(this))}),i.removeData("ui-tooltip-open"),this._off(i,"mouseleave focusout keyup"),i[0]!==this.element[0]&&this._off(i,"remove"),this._off(this.document,"mousemove"),t&&t.type==="mouseleave"&&e.each(this.parents,function(t,r){e(r.element).attr("title",r.title),delete n.parents[t]}),this.closing=!0,this._trigger("close",t,{tooltip:s}),this.closing=!1},_tooltip:function(n){var r="ui-tooltip-"+t++,i=e("<div>").attr({id:r,role:"tooltip"}).addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||""));return e("<div>").addClass("ui-tooltip-content").appendTo(i),i.appendTo(this.document[0].body),e.fn.bgiframe&&i.bgiframe(),this.tooltips[r]=n,i},_find:function(t){var n=t.data("ui-tooltip-id");return n?e("#"+n):e()},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(n,r){var i=e.Event("blur");i.target=i.currentTarget=r[0],t.close(i,!0),e("#"+n).remove(),r.data("ui-tooltip-title")&&(r.attr("title",r.data("ui-tooltip-title")),r.removeData("ui-tooltip-title"))})}})})(jQuery);jQuery.effects||function(e,t){var n=e.uiBackCompat!==!1,r="ui-effects-";e.effects={effect:{}},function(t,n){function p(e,t,n){var r=a[t.type]||{};return e==null?n||!t.def?null:t.def:(e=r.floor?~~e:parseFloat(e),isNaN(e)?t.def:r.mod?(e+r.mod)%r.mod:0>e?0:r.max<e?r.max:e)}function d(e){var n=o(),r=n._rgba=[];return e=e.toLowerCase(),h(s,function(t,i){var s,o=i.re.exec(e),a=o&&i.parse(o),f=i.space||"rgba";if(a)return s=n[f](a),n[u[f].cache]=s[u[f].cache],r=n._rgba=s._rgba,!1}),r.length?(r.join()==="0,0,0,0"&&t.extend(r,c.transparent),n):c[e]}function v(e,t,n){return n=(n+1)%1,n*6<1?e+(t-e)*n*6:n*2<1?t:n*3<2?e+(t-e)*(2/3-n)*6:e}var r="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor".split(" "),i=/^([\-+])=\s*(\d+\.?\d*)/,s=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1],e[2],e[3],e[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1]*2.55,e[2]*2.55,e[3]*2.55,e[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(e){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(e){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(e){return[e[1],e[2]/100,e[3]/100,e[4]]}}],o=t.Color=function(e,n,r,i){return new t.Color.fn.parse(e,n,r,i)},u={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},a={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},f=o.support={},l=t("<p>")[0],c,h=t.each;l.style.cssText="background-color:rgba(1,1,1,.5)",f.rgba=l.style.backgroundColor.indexOf("rgba")>-1,h(u,function(e,t){t.cache="_"+e,t.props.alpha={idx:3,type:"percent",def:1}}),o.fn=t.extend(o.prototype,{parse:function(r,i,s,a){if(r===n)return this._rgba=[null,null,null,null],this;if(r.jquery||r.nodeType)r=t(r).css(i),i=n;var f=this,l=t.type(r),v=this._rgba=[];i!==n&&(r=[r,i,s,a],l="array");if(l==="string")return this.parse(d(r)||c._default);if(l==="array")return h(u.rgba.props,function(e,t){v[t.idx]=p(r[t.idx],t)}),this;if(l==="object")return r instanceof o?h(u,function(e,t){r[t.cache]&&(f[t.cache]=r[t.cache].slice())}):h(u,function(t,n){var i=n.cache;h(n.props,function(e,t){if(!f[i]&&n.to){if(e==="alpha"||r[e]==null)return;f[i]=n.to(f._rgba)}f[i][t.idx]=p(r[e],t,!0)}),f[i]&&e.inArray(null,f[i].slice(0,3))<0&&(f[i][3]=1,n.from&&(f._rgba=n.from(f[i])))}),this},is:function(e){var t=o(e),n=!0,r=this;return h(u,function(e,i){var s,o=t[i.cache];return o&&(s=r[i.cache]||i.to&&i.to(r._rgba)||[],h(i.props,function(e,t){if(o[t.idx]!=null)return n=o[t.idx]===s[t.idx],n})),n}),n},_space:function(){var e=[],t=this;return h(u,function(n,r){t[r.cache]&&e.push(n)}),e.pop()},transition:function(e,t){var n=o(e),r=n._space(),i=u[r],s=this.alpha()===0?o("transparent"):this,f=s[i.cache]||i.to(s._rgba),l=f.slice();return n=n[i.cache],h(i.props,function(e,r){var i=r.idx,s=f[i],o=n[i],u=a[r.type]||{};if(o===null)return;s===null?l[i]=o:(u.mod&&(o-s>u.mod/2?s+=u.mod:s-o>u.mod/2&&(s-=u.mod)),l[i]=p((o-s)*t+s,r))}),this[r](l)},blend:function(e){if(this._rgba[3]===1)return this;var n=this._rgba.slice(),r=n.pop(),i=o(e)._rgba;return o(t.map(n,function(e,t){return(1-r)*i[t]+r*e}))},toRgbaString:function(){var e="rgba(",n=t.map(this._rgba,function(e,t){return e==null?t>2?1:0:e});return n[3]===1&&(n.pop(),e="rgb("),e+n.join()+")"},toHslaString:function(){var e="hsla(",n=t.map(this.hsla(),function(e,t){return e==null&&(e=t>2?1:0),t&&t<3&&(e=Math.round(e*100)+"%"),e});return n[3]===1&&(n.pop(),e="hsl("),e+n.join()+")"},toHexString:function(e){var n=this._rgba.slice(),r=n.pop();return e&&n.push(~~(r*255)),"#"+t.map(n,function(e){return e=(e||0).toString(16),e.length===1?"0"+e:e}).join("")},toString:function(){return this._rgba[3]===0?"transparent":this.toRgbaString()}}),o.fn.parse.prototype=o.fn,u.hsla.to=function(e){if(e[0]==null||e[1]==null||e[2]==null)return[null,null,null,e[3]];var t=e[0]/255,n=e[1]/255,r=e[2]/255,i=e[3],s=Math.max(t,n,r),o=Math.min(t,n,r),u=s-o,a=s+o,f=a*.5,l,c;return o===s?l=0:t===s?l=60*(n-r)/u+360:n===s?l=60*(r-t)/u+120:l=60*(t-n)/u+240,f===0||f===1?c=f:f<=.5?c=u/a:c=u/(2-a),[Math.round(l)%360,c,f,i==null?1:i]},u.hsla.from=function(e){if(e[0]==null||e[1]==null||e[2]==null)return[null,null,null,e[3]];var t=e[0]/360,n=e[1],r=e[2],i=e[3],s=r<=.5?r*(1+n):r+n-r*n,o=2*r-s;return[Math.round(v(o,s,t+1/3)*255),Math.round(v(o,s,t)*255),Math.round(v(o,s,t-1/3)*255),i]},h(u,function(e,r){var s=r.props,u=r.cache,a=r.to,f=r.from;o.fn[e]=function(e){a&&!this[u]&&(this[u]=a(this._rgba));if(e===n)return this[u].slice();var r,i=t.type(e),l=i==="array"||i==="object"?e:arguments,c=this[u].slice();return h(s,function(e,t){var n=l[i==="object"?e:t.idx];n==null&&(n=c[t.idx]),c[t.idx]=p(n,t)}),f?(r=o(f(c)),r[u]=c,r):o(c)},h(s,function(n,r){if(o.fn[n])return;o.fn[n]=function(s){var o=t.type(s),u=n==="alpha"?this._hsla?"hsla":"rgba":e,a=this[u](),f=a[r.idx],l;return o==="undefined"?f:(o==="function"&&(s=s.call(this,f),o=t.type(s)),s==null&&r.empty?this:(o==="string"&&(l=i.exec(s),l&&(s=f+parseFloat(l[2])*(l[1]==="+"?1:-1))),a[r.idx]=s,this[u](a)))}})}),h(r,function(e,n){t.cssHooks[n]={set:function(e,r){var i,s,u="";if(t.type(r)!=="string"||(i=d(r))){r=o(i||r);if(!f.rgba&&r._rgba[3]!==1){s=n==="backgroundColor"?e.parentNode:e;while((u===""||u==="transparent")&&s&&s.style)try{u=t.css(s,"backgroundColor"),s=s.parentNode}catch(a){}r=r.blend(u&&u!=="transparent"?u:"_default")}r=r.toRgbaString()}try{e.style[n]=r}catch(l){}}},t.fx.step[n]=function(e){e.colorInit||(e.start=o(e.elem,n),e.end=o(e.end),e.colorInit=!0),t.cssHooks[n].set(e.elem,e.start.transition(e.end,e.pos))}}),t.cssHooks.borderColor={expand:function(e){var t={};return h(["Top","Right","Bottom","Left"],function(n,r){t["border"+r+"Color"]=e}),t}},c=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(jQuery),function(){function i(){var t=this.ownerDocument.defaultView?this.ownerDocument.defaultView.getComputedStyle(this,null):this.currentStyle,n={},r,i;if(t&&t.length&&t[0]&&t[t[0]]){i=t.length;while(i--)r=t[i],typeof t[r]=="string"&&(n[e.camelCase(r)]=t[r])}else for(r in t)typeof t[r]=="string"&&(n[r]=t[r]);return n}function s(t,n){var i={},s,o;for(s in n)o=n[s],t[s]!==o&&!r[s]&&(e.fx.step[s]||!isNaN(parseFloat(o)))&&(i[s]=o);return i}var n=["add","remove","toggle"],r={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};e.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,n){e.fx.step[n]=function(e){if(e.end!=="none"&&!e.setAttr||e.pos===1&&!e.setAttr)jQuery.style(e.elem,n,e.end),e.setAttr=!0}}),e.effects.animateClass=function(t,r,o,u){var a=e.speed(r,o,u);return this.queue(function(){var r=e(this),o=r.attr("class")||"",u,f=a.children?r.find("*").andSelf():r;f=f.map(function(){var t=e(this);return{el:t,start:i.call(this)}}),u=function(){e.each(n,function(e,n){t[n]&&r[n+"Class"](t[n])})},u(),f=f.map(function(){return this.end=i.call(this.el[0]),this.diff=s(this.start,this.end),this}),r.attr("class",o),f=f.map(function(){var t=this,n=e.Deferred(),r=jQuery.extend({},a,{queue:!1,complete:function(){n.resolve(t)}});return this.el.animate(this.diff,r),n.promise()}),e.when.apply(e,f.get()).done(function(){u(),e.each(arguments,function(){var t=this.el;e.each(this.diff,function(e){t.css(e,"")})}),a.complete.call(r[0])})})},e.fn.extend({_addClass:e.fn.addClass,addClass:function(t,n,r,i){return n?e.effects.animateClass.call(this,{add:t},n,r,i):this._addClass(t)},_removeClass:e.fn.removeClass,removeClass:function(t,n,r,i){return n?e.effects.animateClass.call(this,{remove:t},n,r,i):this._removeClass(t)},_toggleClass:e.fn.toggleClass,toggleClass:function(n,r,i,s,o){return typeof r=="boolean"||r===t?i?e.effects.animateClass.call(this,r?{add:n}:{remove:n},i,s,o):this._toggleClass(n,r):e.effects.animateClass.call(this,{toggle:n},r,i,s)},switchClass:function(t,n,r,i,s){return e.effects.animateClass.call(this,{add:n,remove:t},r,i,s)}})}(),function(){function i(t,n,r,i){e.isPlainObject(t)&&(n=t,t=t.effect),t={effect:t},n==null&&(n={}),e.isFunction(n)&&(i=n,r=null,n={});if(typeof n=="number"||e.fx.speeds[n])i=r,r=n,n={};return e.isFunction(r)&&(i=r,r=null),n&&e.extend(t,n),r=r||n.duration,t.duration=e.fx.off?0:typeof r=="number"?r:r in e.fx.speeds?e.fx.speeds[r]:e.fx.speeds._default,t.complete=i||n.complete,t}function s(t){return!t||typeof t=="number"||e.fx.speeds[t]?!0:typeof t=="string"&&!e.effects.effect[t]?n&&e.effects[t]?!1:!0:!1}e.extend(e.effects,{version:"1.9.2",save:function(e,t){for(var n=0;n<t.length;n++)t[n]!==null&&e.data(r+t[n],e[0].style[t[n]])},restore:function(e,n){var i,s;for(s=0;s<n.length;s++)n[s]!==null&&(i=e.data(r+n[s]),i===t&&(i=""),e.css(n[s],i))},setMode:function(e,t){return t==="toggle"&&(t=e.is(":hidden")?"show":"hide"),t},getBaseline:function(e,t){var n,r;switch(e[0]){case"top":n=0;break;case"middle":n=.5;break;case"bottom":n=1;break;default:n=e[0]/t.height}switch(e[1]){case"left":r=0;break;case"center":r=.5;break;case"right":r=1;break;default:r=e[1]/t.width}return{x:r,y:n}},createWrapper:function(t){if(t.parent().is(".ui-effects-wrapper"))return t.parent();var n={width:t.outerWidth(!0),height:t.outerHeight(!0),"float":t.css("float")},r=e("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),i={width:t.width(),height:t.height()},s=document.activeElement;try{s.id}catch(o){s=document.body}return t.wrap(r),(t[0]===s||e.contains(t[0],s))&&e(s).focus(),r=t.parent(),t.css("position")==="static"?(r.css({position:"relative"}),t.css({position:"relative"})):(e.extend(n,{position:t.css("position"),zIndex:t.css("z-index")}),e.each(["top","left","bottom","right"],function(e,r){n[r]=t.css(r),isNaN(parseInt(n[r],10))&&(n[r]="auto")}),t.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),t.css(i),r.css(n).show()},removeWrapper:function(t){var n=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),(t[0]===n||e.contains(t[0],n))&&e(n).focus()),t},setTransition:function(t,n,r,i){return i=i||{},e.each(n,function(e,n){var s=t.cssUnit(n);s[0]>0&&(i[n]=s[0]*r+s[1])}),i}}),e.fn.extend({effect:function(){function a(n){function u(){e.isFunction(i)&&i.call(r[0]),e.isFunction(n)&&n()}var r=e(this),i=t.complete,s=t.mode;(r.is(":hidden")?s==="hide":s==="show")?u():o.call(r[0],t,u)}var t=i.apply(this,arguments),r=t.mode,s=t.queue,o=e.effects.effect[t.effect],u=!o&&n&&e.effects[t.effect];return e.fx.off||!o&&!u?r?this[r](t.duration,t.complete):this.each(function(){t.complete&&t.complete.call(this)}):o?s===!1?this.each(a):this.queue(s||"fx",a):u.call(this,{options:t,duration:t.duration,callback:t.complete,mode:t.mode})},_show:e.fn.show,show:function(e){if(s(e))return this._show.apply(this,arguments);var t=i.apply(this,arguments);return t.mode="show",this.effect.call(this,t)},_hide:e.fn.hide,hide:function(e){if(s(e))return this._hide.apply(this,arguments);var t=i.apply(this,arguments);return t.mode="hide",this.effect.call(this,t)},__toggle:e.fn.toggle,toggle:function(t){if(s(t)||typeof t=="boolean"||e.isFunction(t))return this.__toggle.apply(this,arguments);var n=i.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)},cssUnit:function(t){var n=this.css(t),r=[];return e.each(["em","px","%","pt"],function(e,t){n.indexOf(t)>0&&(r=[parseFloat(n),t])}),r}})}(),function(){var t={};e.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,n){t[n]=function(t){return Math.pow(t,e+2)}}),e.extend(t,{Sine:function(e){return 1-Math.cos(e*Math.PI/2)},Circ:function(e){return 1-Math.sqrt(1-e*e)},Elastic:function(e){return e===0||e===1?e:-Math.pow(2,8*(e-1))*Math.sin(((e-1)*80-7.5)*Math.PI/15)},Back:function(e){return e*e*(3*e-2)},Bounce:function(e){var t,n=4;while(e<((t=Math.pow(2,--n))-1)/11);return 1/Math.pow(4,3-n)-7.5625*Math.pow((t*3-2)/22-e,2)}}),e.each(t,function(t,n){e.easing["easeIn"+t]=n,e.easing["easeOut"+t]=function(e){return 1-n(1-e)},e.easing["easeInOut"+t]=function(e){return e<.5?n(e*2)/2:1-n(e*-2+2)/2}})}()}(jQuery);(function(e,t){var n=/up|down|vertical/,r=/up|left|vertical|horizontal/;e.effects.effect.blind=function(t,i){var s=e(this),o=["position","top","bottom","left","right","height","width"],u=e.effects.setMode(s,t.mode||"hide"),a=t.direction||"up",f=n.test(a),l=f?"height":"width",c=f?"top":"left",h=r.test(a),p={},d=u==="show",v,m,g;s.parent().is(".ui-effects-wrapper")?e.effects.save(s.parent(),o):e.effects.save(s,o),s.show(),v=e.effects.createWrapper(s).css({overflow:"hidden"}),m=v[l](),g=parseFloat(v.css(c))||0,p[l]=d?m:0,h||(s.css(f?"bottom":"right",0).css(f?"top":"left","auto").css({position:"absolute"}),p[c]=d?g:m+g),d&&(v.css(l,0),h||v.css(c,g+m)),v.animate(p,{duration:t.duration,easing:t.easing,queue:!1,complete:function(){u==="hide"&&s.hide(),e.effects.restore(s,o),e.effects.removeWrapper(s),i()}})}})(jQuery);(function(e,t){e.effects.effect.bounce=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"effect"),o=s==="hide",u=s==="show",a=t.direction||"up",f=t.distance,l=t.times||5,c=l*2+(u||o?1:0),h=t.duration/c,p=t.easing,d=a==="up"||a==="down"?"top":"left",v=a==="up"||a==="left",m,g,y,b=r.queue(),w=b.length;(u||o)&&i.push("opacity"),e.effects.save(r,i),r.show(),e.effects.createWrapper(r),f||(f=r[d==="top"?"outerHeight":"outerWidth"]()/3),u&&(y={opacity:1},y[d]=0,r.css("opacity",0).css(d,v?-f*2:f*2).animate(y,h,p)),o&&(f/=Math.pow(2,l-1)),y={},y[d]=0;for(m=0;m<l;m++)g={},g[d]=(v?"-=":"+=")+f,r.animate(g,h,p).animate(y,h,p),f=o?f*2:f/2;o&&(g={opacity:0},g[d]=(v?"-=":"+=")+f,r.animate(g,h,p)),r.queue(function(){o&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}),w>1&&b.splice.apply(b,[1,0].concat(b.splice(w,c+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.clip=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=t.direction||"vertical",a=u==="vertical",f=a?"height":"width",l=a?"top":"left",c={},h,p,d;e.effects.save(r,i),r.show(),h=e.effects.createWrapper(r).css({overflow:"hidden"}),p=r[0].tagName==="IMG"?h:r,d=p[f](),o&&(p.css(f,0),p.css(l,d/2)),c[f]=o?d:0,c[l]=o?0:d/2,p.animate(c,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){o||r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.drop=function(t,n){var r=e(this),i=["position","top","bottom","left","right","opacity","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=t.direction||"left",a=u==="up"||u==="down"?"top":"left",f=u==="up"||u==="left"?"pos":"neg",l={opacity:o?1:0},c;e.effects.save(r,i),r.show(),e.effects.createWrapper(r),c=t.distance||r[a==="top"?"outerHeight":"outerWidth"](!0)/2,o&&r.css("opacity",0).css(a,f==="pos"?-c:c),l[a]=(o?f==="pos"?"+=":"-=":f==="pos"?"-=":"+=")+c,r.animate(l,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.explode=function(t,n){function y(){c.push(this),c.length===r*i&&b()}function b(){s.css({visibility:"visible"}),e(c).remove(),u||s.hide(),n()}var r=t.pieces?Math.round(Math.sqrt(t.pieces)):3,i=r,s=e(this),o=e.effects.setMode(s,t.mode||"hide"),u=o==="show",a=s.show().css("visibility","hidden").offset(),f=Math.ceil(s.outerWidth()/i),l=Math.ceil(s.outerHeight()/r),c=[],h,p,d,v,m,g;for(h=0;h<r;h++){v=a.top+h*l,g=h-(r-1)/2;for(p=0;p<i;p++)d=a.left+p*f,m=p-(i-1)/2,s.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-p*f,top:-h*l}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:f,height:l,left:d+(u?m*f:0),top:v+(u?g*l:0),opacity:u?0:1}).animate({left:d+(u?0:m*f),top:v+(u?0:g*l),opacity:u?1:0},t.duration||500,t.easing,y)}}})(jQuery);(function(e,t){e.effects.effect.fade=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"toggle");r.animate({opacity:i},{queue:!1,duration:t.duration,easing:t.easing,complete:n})}})(jQuery);(function(e,t){e.effects.effect.fold=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=s==="hide",a=t.size||15,f=/([0-9]+)%/.exec(a),l=!!t.horizFirst,c=o!==l,h=c?["width","height"]:["height","width"],p=t.duration/2,d,v,m={},g={};e.effects.save(r,i),r.show(),d=e.effects.createWrapper(r).css({overflow:"hidden"}),v=c?[d.width(),d.height()]:[d.height(),d.width()],f&&(a=parseInt(f[1],10)/100*v[u?0:1]),o&&d.css(l?{height:0,width:a}:{height:a,width:0}),m[h[0]]=o?v[0]:a,g[h[1]]=o?v[1]:0,d.animate(m,p,t.easing).animate(g,p,t.easing,function(){u&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()})}})(jQuery);(function(e,t){e.effects.effect.highlight=function(t,n){var r=e(this),i=["backgroundImage","backgroundColor","opacity"],s=e.effects.setMode(r,t.mode||"show"),o={backgroundColor:r.css("backgroundColor")};s==="hide"&&(o.opacity=0),e.effects.save(r,i),r.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),n()}})}})(jQuery);(function(e,t){e.effects.effect.pulsate=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"show"),s=i==="show",o=i==="hide",u=s||i==="hide",a=(t.times||5)*2+(u?1:0),f=t.duration/a,l=0,c=r.queue(),h=c.length,p;if(s||!r.is(":visible"))r.css("opacity",0).show(),l=1;for(p=1;p<a;p++)r.animate({opacity:l},f,t.easing),l=1-l;r.animate({opacity:l},f,t.easing),r.queue(function(){o&&r.hide(),n()}),h>1&&c.splice.apply(c,[1,0].concat(c.splice(h,a+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.puff=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"hide"),s=i==="hide",o=parseInt(t.percent,10)||150,u=o/100,a={height:r.height(),width:r.width(),outerHeight:r.outerHeight(),outerWidth:r.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:i,complete:n,percent:s?o:100,from:s?a:{height:a.height*u,width:a.width*u,outerHeight:a.outerHeight*u,outerWidth:a.outerWidth*u}}),r.effect(t)},e.effects.effect.scale=function(t,n){var r=e(this),i=e.extend(!0,{},t),s=e.effects.setMode(r,t.mode||"effect"),o=parseInt(t.percent,10)||(parseInt(t.percent,10)===0?0:s==="hide"?0:100),u=t.direction||"both",a=t.origin,f={height:r.height(),width:r.width(),outerHeight:r.outerHeight(),outerWidth:r.outerWidth()},l={y:u!=="horizontal"?o/100:1,x:u!=="vertical"?o/100:1};i.effect="size",i.queue=!1,i.complete=n,s!=="effect"&&(i.origin=a||["middle","center"],i.restore=!0),i.from=t.from||(s==="show"?{height:0,width:0,outerHeight:0,outerWidth:0}:f),i.to={height:f.height*l.y,width:f.width*l.x,outerHeight:f.outerHeight*l.y,outerWidth:f.outerWidth*l.x},i.fade&&(s==="show"&&(i.from.opacity=0,i.to.opacity=1),s==="hide"&&(i.from.opacity=1,i.to.opacity=0)),r.effect(i)},e.effects.effect.size=function(t,n){var r,i,s,o=e(this),u=["position","top","bottom","left","right","width","height","overflow","opacity"],a=["position","top","bottom","left","right","overflow","opacity"],f=["width","height","overflow"],l=["fontSize"],c=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],h=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),d=t.restore||p!=="effect",v=t.scale||"both",m=t.origin||["middle","center"],g=o.css("position"),y=d?u:a,b={height:0,width:0,outerHeight:0,outerWidth:0};p==="show"&&o.show(),r={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},t.mode==="toggle"&&p==="show"?(o.from=t.to||b,o.to=t.from||r):(o.from=t.from||(p==="show"?b:r),o.to=t.to||(p==="hide"?b:r)),s={from:{y:o.from.height/r.height,x:o.from.width/r.width},to:{y:o.to.height/r.height,x:o.to.width/r.width}};if(v==="box"||v==="both")s.from.y!==s.to.y&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,s.from.y,o.from),o.to=e.effects.setTransition(o,c,s.to.y,o.to)),s.from.x!==s.to.x&&(y=y.concat(h),o.from=e.effects.setTransition(o,h,s.from.x,o.from),o.to=e.effects.setTransition(o,h,s.to.x,o.to));(v==="content"||v==="both")&&s.from.y!==s.to.y&&(y=y.concat(l).concat(f),o.from=e.effects.setTransition(o,l,s.from.y,o.from),o.to=e.effects.setTransition(o,l,s.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),m&&(i=e.effects.getBaseline(m,r),o.from.top=(r.outerHeight-o.outerHeight())*i.y,o.from.left=(r.outerWidth-o.outerWidth())*i.x,o.to.top=(r.outerHeight-o.to.outerHeight)*i.y,o.to.left=(r.outerWidth-o.to.outerWidth)*i.x),o.css(o.from);if(v==="content"||v==="both")c=c.concat(["marginTop","marginBottom"]).concat(l),h=h.concat(["marginLeft","marginRight"]),f=u.concat(c).concat(h),o.find("*[width]").each(function(){var n=e(this),r={height:n.height(),width:n.width(),outerHeight:n.outerHeight(),outerWidth:n.outerWidth()};d&&e.effects.save(n,f),n.from={height:r.height*s.from.y,width:r.width*s.from.x,outerHeight:r.outerHeight*s.from.y,outerWidth:r.outerWidth*s.from.x},n.to={height:r.height*s.to.y,width:r.width*s.to.x,outerHeight:r.height*s.to.y,outerWidth:r.width*s.to.x},s.from.y!==s.to.y&&(n.from=e.effects.setTransition(n,c,s.from.y,n.from),n.to=e.effects.setTransition(n,c,s.to.y,n.to)),s.from.x!==s.to.x&&(n.from=e.effects.setTransition(n,h,s.from.x,n.from),n.to=e.effects.setTransition(n,h,s.to.x,n.to)),n.css(n.from),n.animate(n.to,t.duration,t.easing,function(){d&&e.effects.restore(n,f)})});o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){o.to.opacity===0&&o.css("opacity",o.from.opacity),p==="hide"&&o.hide(),e.effects.restore(o,y),d||(g==="static"?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,n){var r=parseInt(n,10),i=e?o.to.left:o.to.top;return n==="auto"?i+"px":r+i+"px"})})),e.effects.removeWrapper(o),n()}})}})(jQuery);(function(e,t){e.effects.effect.shake=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"effect"),o=t.direction||"left",u=t.distance||20,a=t.times||3,f=a*2+1,l=Math.round(t.duration/f),c=o==="up"||o==="down"?"top":"left",h=o==="up"||o==="left",p={},d={},v={},m,g=r.queue(),y=g.length;e.effects.save(r,i),r.show(),e.effects.createWrapper(r),p[c]=(h?"-=":"+=")+u,d[c]=(h?"+=":"-=")+u*2,v[c]=(h?"-=":"+=")+u*2,r.animate(p,l,t.easing);for(m=1;m<a;m++)r.animate(d,l,t.easing).animate(v,l,t.easing);r.animate(d,l,t.easing).animate(p,l/2,t.easing).queue(function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}),y>1&&g.splice.apply(g,[1,0].concat(g.splice(y,f+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.slide=function(t,n){var r=e(this),i=["position","top","bottom","left","right","width","height"],s=e.effects.setMode(r,t.mode||"show"),o=s==="show",u=t.direction||"left",a=u==="up"||u==="down"?"top":"left",f=u==="up"||u==="left",l,c={};e.effects.save(r,i),r.show(),l=t.distance||r[a==="top"?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(r).css({overflow:"hidden"}),o&&r.css(a,f?isNaN(l)?"-"+l:-l:l),c[a]=(o?f?"+=":"-=":f?"-=":"+=")+l,r.animate(c,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.transfer=function(t,n){var r=e(this),i=e(t.to),s=i.css("position")==="fixed",o=e("body"),u=s?o.scrollTop():0,a=s?o.scrollLeft():0,f=i.offset(),l={top:f.top-u,left:f.left-a,height:i.innerHeight(),width:i.innerWidth()},c=r.offset(),h=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(t.className).css({top:c.top-u,left:c.left-a,height:r.innerHeight(),width:r.innerWidth(),position:s?"fixed":"absolute"}).animate(l,t.duration,t.easing,function(){h.remove(),n()})}})(jQuery);
\ No newline at end of file
diff --git a/resources/scripts/libs/jquery.json-2.2.min.js b/resources/scripts/libs/jquery.json-2.2.min.js
deleted file mode 100755
index bad4a0afa..000000000
--- a/resources/scripts/libs/jquery.json-2.2.min.js
+++ /dev/null
@@ -1,31 +0,0 @@
-
-(function($){$.toJSON=function(o)
-{if(typeof(JSON)=='object'&&JSON.stringify)
-return JSON.stringify(o);var type=typeof(o);if(o===null)
-return"null";if(type=="undefined")
-return undefined;if(type=="number"||type=="boolean")
-return o+"";if(type=="string")
-return $.quoteString(o);if(type=='object')
-{if(typeof o.toJSON=="function")
-return $.toJSON(o.toJSON());if(o.constructor===Date)
-{var month=o.getUTCMonth()+1;if(month<10)month='0'+month;var day=o.getUTCDate();if(day<10)day='0'+day;var year=o.getUTCFullYear();var hours=o.getUTCHours();if(hours<10)hours='0'+hours;var minutes=o.getUTCMinutes();if(minutes<10)minutes='0'+minutes;var seconds=o.getUTCSeconds();if(seconds<10)seconds='0'+seconds;var milli=o.getUTCMilliseconds();if(milli<100)milli='0'+milli;if(milli<10)milli='0'+milli;return'"'+year+'-'+month+'-'+day+'T'+
-hours+':'+minutes+':'+seconds+'.'+milli+'Z"';}
-if(o.constructor===Array)
-{var ret=[];for(var i=0;i<o.length;i++)
-ret.push($.toJSON(o[i])||"null");return"["+ret.join(",")+"]";}
-var pairs=[];for(var k in o){var name;var type=typeof k;if(type=="number")
-name='"'+k+'"';else if(type=="string")
-name=$.quoteString(k);else
-continue;if(typeof o[k]=="function")
-continue;var val=$.toJSON(o[k]);pairs.push(name+":"+val);}
-return"{"+pairs.join(", ")+"}";}};$.evalJSON=function(src)
-{if(typeof(JSON)=='object'&&JSON.parse)
-return JSON.parse(src);return eval("("+src+")");};$.secureEvalJSON=function(src)
-{if(typeof(JSON)=='object'&&JSON.parse)
-return JSON.parse(src);var filtered=src;filtered=filtered.replace(/\\["\\\/bfnrtu]/g,'@');filtered=filtered.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']');filtered=filtered.replace(/(?:^|:|,)(?:\s*\[)+/g,'');if(/^[\],:{}\s]*$/.test(filtered))
-return eval("("+src+")");else
-throw new SyntaxError("Error parsing JSON, source is not valid.");};$.quoteString=function(string)
-{if(string.match(_escapeable))
-{return'"'+string.replace(_escapeable,function(a)
-{var c=_meta[a];if(typeof c==='string')return c;c=a.charCodeAt();return'\\u00'+Math.floor(c/16).toString(16)+(c%16).toString(16);})+'"';}
-return'"'+string+'"';};var _escapeable=/["\\\x00-\x1f\x7f-\x9f]/g;var _meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};})(jQuery);
\ No newline at end of file
diff --git a/resources/scripts/libs/jquery.min.js b/resources/scripts/libs/jquery.min.js
deleted file mode 100644
index 388377952..000000000
--- a/resources/scripts/libs/jquery.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v1.8.3 jquery.com | jquery.org/license */
-(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r<i;r++)v.event.add(t,n,u[n][r])}o.data&&(o.data=v.extend({},o.data))}function Ot(e,t){var n;if(t.nodeType!==1)return;t.clearAttributes&&t.clearAttributes(),t.mergeAttributes&&t.mergeAttributes(e),n=t.nodeName.toLowerCase(),n==="object"?(t.parentNode&&(t.outerHTML=e.outerHTML),v.support.html5Clone&&e.innerHTML&&!v.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):n==="input"&&Et.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):n==="option"?t.selected=e.defaultSelected:n==="input"||n==="textarea"?t.defaultValue=e.defaultValue:n==="script"&&t.text!==e.text&&(t.text=e.text),t.removeAttribute(v.expando)}function Mt(e){return typeof e.getElementsByTagName!="undefined"?e.getElementsByTagName("*"):typeof e.querySelectorAll!="undefined"?e.querySelectorAll("*"):[]}function _t(e){Et.test(e.type)&&(e.defaultChecked=e.checked)}function Qt(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Jt.length;while(i--){t=Jt[i]+n;if(t in e)return t}return r}function Gt(e,t){return e=t||e,v.css(e,"display")==="none"||!v.contains(e.ownerDocument,e)}function Yt(e,t){var n,r,i=[],s=0,o=e.length;for(;s<o;s++){n=e[s];if(!n.style)continue;i[s]=v._data(n,"olddisplay"),t?(!i[s]&&n.style.display==="none"&&(n.style.display=""),n.style.display===""&&Gt(n)&&(i[s]=v._data(n,"olddisplay",nn(n.nodeName)))):(r=Dt(n,"display"),!i[s]&&r!=="none"&&v._data(n,"olddisplay",r))}for(s=0;s<o;s++){n=e[s];if(!n.style)continue;if(!t||n.style.display==="none"||n.style.display==="")n.style.display=t?i[s]||"":"none"}return e}function Zt(e,t,n){var r=Rt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function en(e,t,n,r){var i=n===(r?"border":"content")?4:t==="width"?1:0,s=0;for(;i<4;i+=2)n==="margin"&&(s+=v.css(e,n+$t[i],!0)),r?(n==="content"&&(s-=parseFloat(Dt(e,"padding"+$t[i]))||0),n!=="margin"&&(s-=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0)):(s+=parseFloat(Dt(e,"padding"+$t[i]))||0,n!=="padding"&&(s+=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0));return s}function tn(e,t,n){var r=t==="width"?e.offsetWidth:e.offsetHeight,i=!0,s=v.support.boxSizing&&v.css(e,"boxSizing")==="border-box";if(r<=0||r==null){r=Dt(e,t);if(r<0||r==null)r=e.style[t];if(Ut.test(r))return r;i=s&&(v.support.boxSizingReliable||r===e.style[t]),r=parseFloat(r)||0}return r+en(e,t,n||(s?"border":"content"),i)+"px"}function nn(e){if(Wt[e])return Wt[e];var t=v("<"+e+">").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write("<!doctype html><html><body>"),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u<a;u++)r=o[u],s=/^\+/.test(r),s&&(r=r.substr(1)||"*"),i=e[r]=e[r]||[],i[s?"unshift":"push"](n)}}function kn(e,n,r,i,s,o){s=s||n.dataTypes[0],o=o||{},o[s]=!0;var u,a=e[s],f=0,l=a?a.length:0,c=e===Sn;for(;f<l&&(c||!u);f++)u=a[f](n,r,i),typeof u=="string"&&(!c||o[u]?u=t:(n.dataTypes.unshift(u),u=kn(e,n,r,i,u,o)));return(c||!u)&&!o["*"]&&(u=kn(e,n,r,i,"*",o)),u}function Ln(e,n){var r,i,s=v.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((s[r]?e:i||(i={}))[r]=n[r]);i&&v.extend(!0,e,i)}function An(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes,l=e.responseFields;for(s in l)s in r&&(n[l[s]]=r[s]);while(f[0]==="*")f.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("content-type"));if(i)for(s in a)if(a[s]&&a[s].test(i)){f.unshift(s);break}if(f[0]in r)o=f[0];else{for(s in r){if(!f[0]||e.converters[s+" "+f[0]]){o=s;break}u||(u=s)}o=o||u}if(o)return o!==f[0]&&f.unshift(o),r[o]}function On(e,t){var n,r,i,s,o=e.dataTypes.slice(),u=o[0],a={},f=0;e.dataFilter&&(t=e.dataFilter(t,e.dataType));if(o[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=o[++f];)if(i!=="*"){if(u!=="*"&&u!==i){n=a[u+" "+i]||a["* "+i];if(!n)for(r in a){s=r.split(" ");if(s[1]===i){n=a[u+" "+s[0]]||a["* "+s[0]];if(n){n===!0?n=a[r]:a[r]!==!0&&(i=s[0],o.splice(f--,0,i));break}}}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(l){return{state:"parsererror",error:n?l:"No conversion from "+u+" to "+i}}}u=i}return{state:"success",data:t}}function Fn(){try{return new e.XMLHttpRequest}catch(t){}}function In(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function $n(){return setTimeout(function(){qn=t},0),qn=v.now()}function Jn(e,t){v.each(t,function(t,n){var r=(Vn[t]||[]).concat(Vn["*"]),i=0,s=r.length;for(;i<s;i++)if(r[i].call(e,t,n))return})}function Kn(e,t,n){var r,i=0,s=0,o=Xn.length,u=v.Deferred().always(function(){delete a.elem}),a=function(){var t=qn||$n(),n=Math.max(0,f.startTime+f.duration-t),r=n/f.duration||0,i=1-r,s=0,o=f.tweens.length;for(;s<o;s++)f.tweens[s].run(i);return u.notifyWith(e,[f,i,n]),i<1&&o?n:(u.resolveWith(e,[f]),!1)},f=u.promise({elem:e,props:v.extend({},t),opts:v.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:qn||$n(),duration:n.duration,tweens:[],createTween:function(t,n,r){var i=v.Tween(e,f.opts,t,n,f.opts.specialEasing[t]||f.opts.easing);return f.tweens.push(i),i},stop:function(t){var n=0,r=t?f.tweens.length:0;for(;n<r;n++)f.tweens[n].run(1);return t?u.resolveWith(e,[f,t]):u.rejectWith(e,[f,t]),this}}),l=f.props;Qn(l,f.opts.specialEasing);for(;i<o;i++){r=Xn[i].call(f,e,l,f.opts);if(r)return r}return Jn(f,l),v.isFunction(f.opts.start)&&f.opts.start.call(e,f),v.fx.timer(v.extend(a,{anim:f,queue:f.opts.queue,elem:e})),f.progress(f.opts.progress).done(f.opts.done,f.opts.complete).fail(f.opts.fail).always(f.opts.always)}function Qn(e,t){var n,r,i,s,o;for(n in e){r=v.camelCase(n),i=t[r],s=e[n],v.isArray(s)&&(i=s[1],s=e[n]=s[0]),n!==r&&(e[r]=s,delete e[n]),o=v.cssHooks[r];if(o&&"expand"in o){s=o.expand(s),delete e[r];for(n in s)n in e||(e[n]=s[n],t[n]=i)}else t[r]=i}}function Gn(e,t,n){var r,i,s,o,u,a,f,l,c,h=this,p=e.style,d={},m=[],g=e.nodeType&&Gt(e);n.queue||(l=v._queueHooks(e,"fx"),l.unqueued==null&&(l.unqueued=0,c=l.empty.fire,l.empty.fire=function(){l.unqueued||c()}),l.unqueued++,h.always(function(){h.always(function(){l.unqueued--,v.queue(e,"fx").length||l.empty.fire()})})),e.nodeType===1&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],v.css(e,"display")==="inline"&&v.css(e,"float")==="none"&&(!v.support.inlineBlockNeedsLayout||nn(e.nodeName)==="inline"?p.display="inline-block":p.zoom=1)),n.overflow&&(p.overflow="hidden",v.support.shrinkWrapBlocks||h.done(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t){s=t[r];if(Un.exec(s)){delete t[r],a=a||s==="toggle";if(s===(g?"hide":"show"))continue;m.push(r)}}o=m.length;if(o){u=v._data(e,"fxshow")||v._data(e,"fxshow",{}),"hidden"in u&&(g=u.hidden),a&&(u.hidden=!g),g?v(e).show():h.done(function(){v(e).hide()}),h.done(function(){var t;v.removeData(e,"fxshow",!0);for(t in d)v.style(e,t,d[t])});for(r=0;r<o;r++)i=m[r],f=h.createTween(i,g?u[i]:0),d[i]=u[i]||v.style(e,i),i in u||(u[i]=f.start,g&&(f.end=f.start,f.start=i==="width"||i==="height"?1:0))}}function Yn(e,t,n,r,i){return new Yn.prototype.init(e,t,n,r,i)}function Zn(e,t){var n,r={height:e},i=0;t=t?1:0;for(;i<4;i+=2-t)n=$t[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function tr(e){return v.isWindow(e)?e:e.nodeType===9?e.defaultView||e.parentWindow:!1}var n,r,i=e.document,s=e.location,o=e.navigator,u=e.jQuery,a=e.$,f=Array.prototype.push,l=Array.prototype.slice,c=Array.prototype.indexOf,h=Object.prototype.toString,p=Object.prototype.hasOwnProperty,d=String.prototype.trim,v=function(e,t){return new v.fn.init(e,t,n)},m=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,g=/\S/,y=/\s+/,b=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,w=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a<f;a++)if((e=arguments[a])!=null)for(n in e){r=u[n],i=e[n];if(u===i)continue;l&&i&&(v.isPlainObject(i)||(s=v.isArray(i)))?(s?(s=!1,o=r&&v.isArray(r)?r:[]):o=r&&v.isPlainObject(r)?r:{},u[n]=v.extend(l,o,i)):i!==t&&(u[n]=i)}return u},v.extend({noConflict:function(t){return e.$===v&&(e.$=a),t&&e.jQuery===v&&(e.jQuery=u),v},isReady:!1,readyWait:1,holdReady:function(e){e?v.readyWait++:v.ready(!0)},ready:function(e){if(e===!0?--v.readyWait:v.isReady)return;if(!i.body)return setTimeout(v.ready,1);v.isReady=!0;if(e!==!0&&--v.readyWait>0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s<o;)if(n.apply(e[s++],r)===!1)break}else if(u){for(i in e)if(n.call(e[i],i,e[i])===!1)break}else for(;s<o;)if(n.call(e[s],s,e[s++])===!1)break;return e},trim:d&&!d.call("\ufeff\u00a0")?function(e){return e==null?"":d.call(e)}:function(e){return e==null?"":(e+"").replace(b,"")},makeArray:function(e,t){var n,r=t||[];return e!=null&&(n=v.type(e),e.length==null||n==="string"||n==="function"||n==="regexp"||v.isWindow(e)?f.call(r,e):v.merge(r,e)),r},inArray:function(e,t,n){var r;if(t){if(c)return c.call(t,e,n);r=t.length,n=n?n<0?Math.max(0,r+n):n:0;for(;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,s=0;if(typeof r=="number")for(;s<r;s++)e[i++]=n[s];else while(n[s]!==t)e[i++]=n[s++];return e.length=i,e},grep:function(e,t,n){var r,i=[],s=0,o=e.length;n=!!n;for(;s<o;s++)r=!!t(e[s],s),n!==r&&i.push(e[s]);return i},map:function(e,n,r){var i,s,o=[],u=0,a=e.length,f=e instanceof v||a!==t&&typeof a=="number"&&(a>0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u<a;u++)i=n(e[u],u,r),i!=null&&(o[o.length]=i);else for(s in e)i=n(e[s],s,r),i!=null&&(o[o.length]=i);return o.concat.apply([],o)},guid:1,proxy:function(e,n){var r,i,s;return typeof n=="string"&&(r=e[n],n=e,e=r),v.isFunction(e)?(i=l.call(arguments,2),s=function(){return e.apply(n,i.concat(l.call(arguments)))},s.guid=e.guid=e.guid||v.guid++,s):t},access:function(e,n,r,i,s,o,u){var a,f=r==null,l=0,c=e.length;if(r&&typeof r=="object"){for(l in r)v.access(e,n,l,r[l],1,o,i);s=1}else if(i!==t){a=u===t&&v.isFunction(i),f&&(a?(a=n,n=function(e,t,n){return a.call(v(e),n)}):(n.call(e,i),n=null));if(n)for(;l<c;l++)n(e[l],r,a?i.call(e[l],l,n(e[l],r)):i,u);s=1}return s?e:f?n.call(e):c?n(e[0],r):o},now:function(){return(new Date).getTime()}}),v.ready.promise=function(t){if(!r){r=v.Deferred();if(i.readyState==="complete")setTimeout(v.ready,1);else if(i.addEventListener)i.addEventListener("DOMContentLoaded",A,!1),e.addEventListener("load",v.ready,!1);else{i.attachEvent("onreadystatechange",A),e.attachEvent("onload",v.ready);var n=!1;try{n=e.frameElement==null&&i.documentElement}catch(s){}n&&n.doScroll&&function o(){if(!v.isReady){try{n.doScroll("left")}catch(e){return setTimeout(o,50)}v.ready()}}()}}return r.promise(t)},v.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(e,t){O["[object "+t+"]"]=t.toLowerCase()}),n=v(i);var M={};v.Callbacks=function(e){e=typeof e=="string"?M[e]||_(e):v.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){n=e.memory&&t,r=!0,u=s||0,s=0,o=a.length,i=!0;for(;a&&u<o;u++)if(a[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}i=!1,a&&(f?f.length&&l(f.shift()):n?a=[]:c.disable())},c={add:function(){if(a){var t=a.length;(function r(t){v.each(t,function(t,n){var i=v.type(n);i==="function"?(!e.unique||!c.has(n))&&a.push(n):n&&n.length&&i!=="string"&&r(n)})})(arguments),i?o=a.length:n&&(s=t,l(n))}return this},remove:function(){return a&&v.each(arguments,function(e,t){var n;while((n=v.inArray(t,a,n))>-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t<r;t++)n[t]&&v.isFunction(n[t].promise)?n[t].promise().done(o(t,f,n)).fail(s.reject).progress(o(t,a,u)):--i}return i||s.resolveWith(f,n),s.promise()}}),v.support=function(){var t,n,r,s,o,u,a,f,l,c,h,p=i.createElement("div");p.setAttribute("className","t"),p.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="<table><tr><td></td><td>t</td></tr></table>",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="<div></div>",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i<s;i++)delete r[t[i]];if(!(n?B:v.isEmptyObject)(r))return}}if(!n){delete u[a].data;if(!B(u[a]))return}o?v.cleanData([e],!0):v.support.deleteExpando||u!=u.window?delete u[a]:u[a]=null},_data:function(e,t,n){return v.data(e,t,n,!0)},acceptData:function(e){var t=e.nodeName&&v.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),v.fn.extend({data:function(e,n){var r,i,s,o,u,a=this[0],f=0,l=null;if(e===t){if(this.length){l=v.data(a);if(a.nodeType===1&&!v._data(a,"parsedAttrs")){s=a.attributes;for(u=s.length;f<u;f++)o=s[f].name,o.indexOf("data-")||(o=v.camelCase(o.substring(5)),H(a,o,l[o]));v._data(a,"parsedAttrs",!0)}}return l}return typeof e=="object"?this.each(function(){v.data(this,e)}):(r=e.split(".",2),r[1]=r[1]?"."+r[1]:"",i=r[1]+"!",v.access(this,function(n){if(n===t)return l=this.triggerHandler("getData"+i,[r[0]]),l===t&&a&&(l=v.data(a,e),l=H(a,e,l)),l===t&&r[1]?this.data(r[0]):l;r[1]=n,this.each(function(){var t=v(this);t.triggerHandler("setData"+i,r),v.data(this,e,n),t.triggerHandler("changeData"+i,r)})},null,n,arguments.length>1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length<r?v.queue(this[0],e):n===t?this:this.each(function(){var t=v.queue(this,e,n);v._queueHooks(this,e),e==="fx"&&t[0]!=="inprogress"&&v.dequeue(this,e)})},dequeue:function(e){return this.each(function(){v.dequeue(this,e)})},delay:function(e,t){return e=v.fx?v.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,s=v.Deferred(),o=this,u=this.length,a=function(){--i||s.resolveWith(o,[o])};typeof e!="string"&&(n=e,e=t),e=e||"fx";while(u--)r=v._data(o[u],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(a));return a(),s.promise(n)}});var j,F,I,q=/[\t\r\n]/g,R=/\r/g,U=/^(?:button|input)$/i,z=/^(?:button|input|object|select|textarea)$/i,W=/^a(?:rea|)$/i,X=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,V=v.support.getSetAttribute;v.fn.extend({attr:function(e,t){return v.access(this,v.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n<r;n++){i=this[n];if(i.nodeType===1)if(!i.className&&t.length===1)i.className=e;else{s=" "+i.className+" ";for(o=0,u=t.length;o<u;o++)s.indexOf(" "+t[o]+" ")<0&&(s+=t[o]+" ");i.className=v.trim(s)}}}return this},removeClass:function(e){var n,r,i,s,o,u,a;if(v.isFunction(e))return this.each(function(t){v(this).removeClass(e.call(this,t,this.className))});if(e&&typeof e=="string"||e===t){n=(e||"").split(y);for(u=0,a=this.length;u<a;u++){i=this[u];if(i.nodeType===1&&i.className){r=(" "+i.className+" ").replace(q," ");for(s=0,o=n.length;s<o;s++)while(r.indexOf(" "+n[s]+" ")>=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n<r;n++)if(this[n].nodeType===1&&(" "+this[n].className+" ").replace(q," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a<u;a++){n=r[a];if((n.selected||a===i)&&(v.support.optDisabled?!n.disabled:n.getAttribute("disabled")===null)&&(!n.parentNode.disabled||!v.nodeName(n.parentNode,"optgroup"))){t=v(n).val();if(s)return t;o.push(t)}}return o},set:function(e,t){var n=v.makeArray(t);return v(e).find("option").each(function(){this.selected=v.inArray(v(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o<r.length;o++)i=r[o],i&&(n=v.propFix[i]||i,s=X.test(i),s||v.attr(e,i,""),e.removeAttribute(V?i:n),s&&n in e&&(e[n]=!1))}},attrHooks:{type:{set:function(e,t){if(U.test(e.nodeName)&&e.parentNode)v.error("type property can't be changed");else if(!v.support.radioValue&&t==="radio"&&v.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}},value:{get:function(e,t){return j&&v.nodeName(e,"button")?j.get(e,t):t in e?e.value:null},set:function(e,t,n){if(j&&v.nodeName(e,"button"))return j.set(e,t,n);e.value=t}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2)return;return o=u!==1||!v.isXMLDoc(e),o&&(n=v.propFix[n]||n,s=v.propHooks[n]),r!==t?s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r:s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):z.test(e.nodeName)||W.test(e.nodeName)&&e.href?0:t}}}}),F={get:function(e,n){var r,i=v.prop(e,n);return i===!0||typeof i!="boolean"&&(r=e.getAttributeNode(n))&&r.nodeValue!==!1?n.toLowerCase():t},set:function(e,t,n){var r;return t===!1?v.removeAttr(e,n):(r=v.propFix[n]||n,r in e&&(e[r]=!0),e.setAttribute(n,n.toLowerCase())),n}},V||(I={name:!0,id:!0,coords:!0},j=v.valHooks.button={get:function(e,n){var r;return r=e.getAttributeNode(n),r&&(I[n]?r.value!=="":r.specified)?r.value:t},set:function(e,t,n){var r=e.getAttributeNode(n);return r||(r=i.createAttribute(n),e.setAttributeNode(r)),r.value=t+""}},v.each(["width","height"],function(e,t){v.attrHooks[t]=v.extend(v.attrHooks[t],{set:function(e,n){if(n==="")return e.setAttribute(t,"auto"),n}})}),v.attrHooks.contenteditable={get:j.get,set:function(e,t,n){t===""&&(t="false"),j.set(e,t,n)}}),v.support.hrefNormalized||v.each(["href","src","width","height"],function(e,n){v.attrHooks[n]=v.extend(v.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return r===null?t:r}})}),v.support.style||(v.attrHooks.style={get:function(e){return e.style.cssText.toLowerCase()||t},set:function(e,t){return e.style.cssText=t+""}}),v.support.optSelected||(v.propHooks.selected=v.extend(v.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),v.support.enctype||(v.propFix.enctype="encoding"),v.support.checkOn||v.each(["radio","checkbox"],function(){v.valHooks[this]={get:function(e){return e.getAttribute("value")===null?"on":e.value}}}),v.each(["radio","checkbox"],function(){v.valHooks[this]=v.extend(v.valHooks[this],{set:function(e,t){if(v.isArray(t))return e.checked=v.inArray(v(e).val(),t)>=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f<n.length;f++){l=J.exec(n[f])||[],c=l[1],h=(l[2]||"").split(".").sort(),g=v.event.special[c]||{},c=(s?g.delegateType:g.bindType)||c,g=v.event.special[c]||{},p=v.extend({type:c,origType:l[1],data:i,handler:r,guid:r.guid,selector:s,needsContext:s&&v.expr.match.needsContext.test(s),namespace:h.join(".")},d),m=a[c];if(!m){m=a[c]=[],m.delegateCount=0;if(!g.setup||g.setup.call(e,i,h,u)===!1)e.addEventListener?e.addEventListener(c,u,!1):e.attachEvent&&e.attachEvent("on"+c,u)}g.add&&(g.add.call(e,p),p.handler.guid||(p.handler.guid=r.guid)),s?m.splice(m.delegateCount++,0,p):m.push(p),v.event.global[c]=!0}e=null},global:{},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,m,g=v.hasData(e)&&v._data(e);if(!g||!(h=g.events))return;t=v.trim(Z(t||"")).split(" ");for(s=0;s<t.length;s++){o=J.exec(t[s])||[],u=a=o[1],f=o[2];if(!u){for(u in h)v.event.remove(e,u+t[s],n,r,!0);continue}p=v.event.special[u]||{},u=(r?p.delegateType:p.bindType)||u,d=h[u]||[],l=d.length,f=f?new RegExp("(^|\\.)"+f.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(c=0;c<d.length;c++)m=d[c],(i||a===m.origType)&&(!n||n.guid===m.guid)&&(!f||f.test(m.namespace))&&(!r||r===m.selector||r==="**"&&m.selector)&&(d.splice(c--,1),m.selector&&d.delegateCount--,p.remove&&p.remove.call(e,m));d.length===0&&l!==d.length&&((!p.teardown||p.teardown.call(e,f,g.handle)===!1)&&v.removeEvent(e,u,g.handle),delete h[u])}v.isEmptyObject(h)&&(delete g.handle,v.removeData(e,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(n,r,s,o){if(!s||s.nodeType!==3&&s.nodeType!==8){var u,a,f,l,c,h,p,d,m,g,y=n.type||n,b=[];if(Y.test(y+v.event.triggered))return;y.indexOf("!")>=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f<m.length&&!n.isPropagationStopped();f++)l=m[f][0],n.type=m[f][1],d=(v._data(l,"events")||{})[n.type]&&v._data(l,"handle"),d&&d.apply(l,r),d=h&&l[h],d&&v.acceptData(l)&&d.apply&&d.apply(l,r)===!1&&n.preventDefault();return n.type=y,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(s.ownerDocument,r)===!1)&&(y!=="click"||!v.nodeName(s,"a"))&&v.acceptData(s)&&h&&s[y]&&(y!=="focus"&&y!=="blur"||n.target.offsetWidth!==0)&&!v.isWindow(s)&&(c=s[h],c&&(s[h]=null),v.event.triggered=y,s[y](),v.event.triggered=t,c&&(s[h]=c)),n.result}return},dispatch:function(n){n=v.event.fix(n||e.event);var r,i,s,o,u,a,f,c,h,p,d=(v._data(this,"events")||{})[n.type]||[],m=d.delegateCount,g=l.call(arguments),y=!n.exclusive&&!n.namespace,b=v.event.special[n.type]||{},w=[];g[0]=n,n.delegateTarget=this;if(b.preDispatch&&b.preDispatch.call(this,n)===!1)return;if(m&&(!n.button||n.type!=="click"))for(s=n.target;s!=this;s=s.parentNode||this)if(s.disabled!==!0||n.type!=="click"){u={},f=[];for(r=0;r<m;r++)c=d[r],h=c.selector,u[h]===t&&(u[h]=c.needsContext?v(h,this).index(s)>=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r<w.length&&!n.isPropagationStopped();r++){a=w[r],n.currentTarget=a.elem;for(i=0;i<a.matches.length&&!n.isImmediatePropagationStopped();i++){c=a.matches[i];if(y||!n.namespace&&!c.namespace||n.namespace_re&&n.namespace_re.test(c.namespace))n.data=c.data,n.handleObj=c,o=((v.event.special[c.origType]||{}).handle||c.handler).apply(a.elem,g),o!==t&&(n.result=o,o===!1&&(n.preventDefault(),n.stopPropagation()))}}return b.postDispatch&&b.postDispatch.call(this,n),n.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return e.which==null&&(e.which=t.charCode!=null?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,s,o,u=n.button,a=n.fromElement;return e.pageX==null&&n.clientX!=null&&(r=e.target.ownerDocument||i,s=r.documentElement,o=r.body,e.pageX=n.clientX+(s&&s.scrollLeft||o&&o.scrollLeft||0)-(s&&s.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(s&&s.scrollTop||o&&o.scrollTop||0)-(s&&s.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?n.toElement:a),!e.which&&u!==t&&(e.which=u&1?1:u&2?3:u&4?2:0),e}},fix:function(e){if(e[v.expando])return e;var t,n,r=e,s=v.event.fixHooks[e.type]||{},o=s.props?this.props.concat(s.props):this.props;e=v.Event(r);for(t=o.length;t;)n=o[--t],e[n]=r[n];return e.target||(e.target=r.srcElement||i),e.target.nodeType===3&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,r):e},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(e,t,n){v.isWindow(this)&&(this.onbeforeunload=n)},teardown:function(e,t){this.onbeforeunload===t&&(this.onbeforeunload=null)}}},simulate:function(e,t,n,r){var i=v.extend(new v.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?v.event.trigger(i,null,t):v.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},v.event.handle=v.event.dispatch,v.removeEvent=i.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]=="undefined"&&(e[r]=null),e.detachEvent(r,n))},v.Event=function(e,t){if(!(this instanceof v.Event))return new v.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?tt:et):this.type=e,t&&v.extend(this,t),this.timeStamp=e&&e.timeStamp||v.now(),this[v.expando]=!0},v.Event.prototype={preventDefault:function(){this.isDefaultPrevented=tt;var e=this.originalEvent;if(!e)return;e.preventDefault?e.preventDefault():e.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=tt;var e=this.originalEvent;if(!e)return;e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=tt,this.stopPropagation()},isDefaultPrevented:et,isPropagationStopped:et,isImmediatePropagationStopped:et},v.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){v.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,s=e.handleObj,o=s.selector;if(!i||i!==r&&!v.contains(r,i))e.type=s.origType,n=s.handler.apply(this,arguments),e.type=t;return n}}}),v.support.submitBubbles||(v.event.special.submit={setup:function(){if(v.nodeName(this,"form"))return!1;v.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=v.nodeName(n,"input")||v.nodeName(n,"button")?n.form:t;r&&!v._data(r,"_submit_attached")&&(v.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),v._data(r,"_submit_attached",!0))})},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&v.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){if(v.nodeName(this,"form"))return!1;v.event.remove(this,"._submit")}}),v.support.changeBubbles||(v.event.special.change={setup:function(){if($.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")v.event.add(this,"propertychange._change",function(e){e.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),v.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),v.event.simulate("change",this,e,!0)});return!1}v.event.add(this,"beforeactivate._change",function(e){var t=e.target;$.test(t.nodeName)&&!v._data(t,"_change_attached")&&(v.event.add(t,"change._change",function(e){this.parentNode&&!e.isSimulated&&!e.isTrigger&&v.event.simulate("change",this.parentNode,e,!0)}),v._data(t,"_change_attached",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||t.type!=="radio"&&t.type!=="checkbox")return e.handleObj.handler.apply(this,arguments)},teardown:function(){return v.event.remove(this,"._change"),!$.test(this.nodeName)}}),v.support.focusinBubbles||v.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){v.event.simulate(t,e.target,v.event.fix(e),!0)};v.event.special[t]={setup:function(){n++===0&&i.addEventListener(e,r,!0)},teardown:function(){--n===0&&i.removeEventListener(e,r,!0)}}}),v.fn.extend({on:function(e,n,r,i,s){var o,u;if(typeof e=="object"){typeof n!="string"&&(r=r||n,n=t);for(u in e)this.on(u,n,r,e[u],s);return this}r==null&&i==null?(i=n,r=n=t):i==null&&(typeof n=="string"?(i=r,r=t):(i=r,r=n,n=t));if(i===!1)i=et;else if(!i)return this;return s===1&&(o=i,i=function(e){return v().off(e),o.apply(this,arguments)},i.guid=o.guid||(o.guid=v.guid++)),this.each(function(){v.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,s;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,v(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if(typeof e=="object"){for(s in e)this.off(s,n,e[s]);return this}if(n===!1||typeof n=="function")r=n,n=t;return r===!1&&(r=et),this.each(function(){v.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},live:function(e,t,n){return v(this.context).on(e,this.selector,t,n),this},die:function(e,t){return v(this.context).off(e,this.selector||"**",t),this},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){v.event.trigger(e,t,this)})},triggerHandler:function(e,t){if(this[0])return v.event.trigger(e,t,this[0],!0)},toggle:function(e){var t=arguments,n=e.guid||v.guid++,r=0,i=function(n){var i=(v._data(this,"lastToggle"+e.guid)||0)%r;return v._data(this,"lastToggle"+e.guid,i+1),n.preventDefault(),t[i].apply(this,arguments)||!1};i.guid=n;while(r<t.length)t[r++].guid=n;return this.click(i)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),v.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){v.fn[t]=function(e,n){return n==null&&(n=e,e=null),arguments.length>0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u<a;u++)if(s=e[u])if(!n||n(s,r,i))o.push(s),f&&t.push(u);return o}function ct(e,t,n,r,i,s){return r&&!r[d]&&(r=ct(r)),i&&!i[d]&&(i=ct(i,s)),N(function(s,o,u,a){var f,l,c,h=[],p=[],d=o.length,v=s||dt(t||"*",u.nodeType?[u]:u,[]),m=e&&(s||!t)?lt(v,h,e,u,a):v,g=n?i||(s?e:d||r)?[]:o:m;n&&n(m,g,u,a);if(r){f=lt(g,p),r(f,[],u,a),l=f.length;while(l--)if(c=f[l])g[p[l]]=!(m[p[l]]=c)}if(s){if(i||e){if(i){f=[],l=g.length;while(l--)(c=g[l])&&f.push(m[l]=c);i(null,g=[],f,a)}l=g.length;while(l--)(c=g[l])&&(f=i?T.call(s,c):h[l])>-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a<s;a++)if(n=i.relative[e[a].type])h=[at(ft(h),n)];else{n=i.filter[e[a].type].apply(null,e[a].matches);if(n[d]){r=++a;for(;r<s;r++)if(i.relative[e[r].type])break;return ct(a>1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a<r&&ht(e.slice(a,r)),r<s&&ht(e=e.slice(r)),r<s&&e.join(""))}h.push(n)}return ft(h)}function pt(e,t){var r=t.length>0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r<i;r++)nt(e,t[r],n);return n}function vt(e,t,n,r,s){var o,u,f,l,c,h=ut(e),p=h.length;if(!r&&h.length===1){u=h[0]=h[0].slice(0);if(u.length>2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;t<n;t++)if(this[t]===e)return t;return-1},N=function(e,t){return e[d]=t==null||t,e},C=function(){var e={},t=[];return N(function(n,r){return t.push(n)>i.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="<a name='"+d+"'></a><div name='"+d+"'></div>",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:st(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:st(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},f=y.compareDocumentPosition?function(e,t){return e===t?(l=!0,0):(!e.compareDocumentPosition||!t.compareDocumentPosition?e.compareDocumentPosition:e.compareDocumentPosition(t)&4)?-1:1}:function(e,t){if(e===t)return l=!0,0;if(e.sourceIndex&&t.sourceIndex)return e.sourceIndex-t.sourceIndex;var n,r,i=[],s=[],o=e.parentNode,u=t.parentNode,a=o;if(o===u)return ot(e,t);if(!o)return-1;if(!u)return 1;while(a)i.unshift(a),a=a.parentNode;a=u;while(a)s.unshift(a),a=a.parentNode;n=i.length,r=s.length;for(var f=0;f<n&&f<r;f++)if(i[f]!==s[f])return ot(i[f],s[f]);return f===n?ot(e,s[f],-1):ot(i[f],t,1)},[0,0].sort(f),h=!l,nt.uniqueSort=function(e){var t,n=[],r=1,i=0;l=h,e.sort(f);if(l){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e},nt.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},a=nt.compile=function(e,t){var n,r=[],i=[],s=A[d][e+" "];if(!s){t||(t=ut(e)),n=t.length;while(n--)s=ht(t[n]),s[d]?r.push(s):i.push(s);s=A(e,pt(i,r))}return s},g.querySelectorAll&&function(){var e,t=vt,n=/'|\\/g,r=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,i=[":focus"],s=[":active"],u=y.matchesSelector||y.mozMatchesSelector||y.webkitMatchesSelector||y.oMatchesSelector||y.msMatchesSelector;K(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||i.push("\\["+O+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),K(function(e){e.innerHTML="<p test=''></p>",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="<input type='hidden'/>",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=new RegExp(i.join("|")),vt=function(e,r,s,o,u){if(!o&&!u&&!i.test(e)){var a,f,l=!0,c=d,h=r,p=r.nodeType===9&&e;if(r.nodeType===1&&r.nodeName.toLowerCase()!=="object"){a=ut(e),(l=r.getAttribute("id"))?c=l.replace(n,"\\$&"):r.setAttribute("id",c),c="[id='"+c+"'] ",f=a.length;while(f--)a[f]=c+a[f].join("");h=z.test(e)&&r.parentNode||r,p=a.join(",")}if(p)try{return S.apply(s,x.call(h.querySelectorAll(p),0)),s}catch(v){}finally{l||r.removeAttribute("id")}}return t(e,r,s,o,u)},u&&(K(function(t){e=u.call(t,"div");try{u.call(t,"[test!='']:sizzle"),s.push("!=",H)}catch(n){}}),s=new RegExp(s.join("|")),nt.matchesSelector=function(t,n){n=n.replace(r,"='$1']");if(!o(t)&&!s.test(n)&&!i.test(n))try{var a=u.call(t,n);if(a||e||t.document&&t.document.nodeType!==11)return a}catch(f){}return nt(n,null,null,[t]).length>0})}(),i.pseudos.nth=i.pseudos.eq,i.filters=mt.prototype=i.pseudos,i.setFilters=new mt,nt.attr=v.attr,v.find=nt,v.expr=nt.selectors,v.expr[":"]=v.expr.pseudos,v.unique=nt.uniqueSort,v.text=nt.getText,v.isXMLDoc=nt.isXML,v.contains=nt.contains}(e);var nt=/Until$/,rt=/^(?:parents|prev(?:Until|All))/,it=/^.[^:#\[\.,]*$/,st=v.expr.match.needsContext,ot={children:!0,contents:!0,next:!0,prev:!0};v.fn.extend({find:function(e){var t,n,r,i,s,o,u=this;if(typeof e!="string")return v(e).filter(function(){for(t=0,n=u.length;t<n;t++)if(v.contains(u[t],this))return!0});o=this.pushStack("","find",e);for(t=0,n=this.length;t<n;t++){r=o.length,v.find(e,this[t],o);if(t>0)for(i=r;i<o.length;i++)for(s=0;s<r;s++)if(o[s]===o[i]){o.splice(i--,1);break}}return o},has:function(e){var t,n=v(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(v.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1),"not",e)},filter:function(e){return this.pushStack(ft(this,e,!0),"filter",e)},is:function(e){return!!e&&(typeof e=="string"?st.test(e)?v(e,this.context).index(this[0])>=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r<i;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&n.nodeType!==11){if(o?o.index(n)>-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/<tbody/i,gt=/<|&#?\w+;/,yt=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,wt=new RegExp("<(?:"+ct+")[\\s/>]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,Nt={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X<div>","</div>"]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1></$2>");try{for(;r<i;r++)n=this[r]||{},n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),n.innerHTML=e);n=0}catch(s){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){return ut(this[0])?this.length?this.pushStack(v(v.isFunction(e)?e():e),"replaceWith",e):this:v.isFunction(e)?this.each(function(t){var n=v(this),r=n.html();n.replaceWith(e.call(this,t,r))}):(typeof e!="string"&&(e=v(e).detach()),this.each(function(){var t=this.nextSibling,n=this.parentNode;v(this).remove(),t?v(t).before(e):v(n).append(e)}))},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=[].concat.apply([],e);var i,s,o,u,a=0,f=e[0],l=[],c=this.length;if(!v.support.checkClone&&c>1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a<c;a++)r.call(n&&v.nodeName(this[a],"table")?Lt(this[a],"tbody"):this[a],a===u?o:v.clone(o,!0,!0))}o=s=null,l.length&&v.each(l,function(e,t){t.src?v.ajax?v.ajax({url:t.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):v.error("no ajax"):v.globalEval((t.text||t.textContent||t.innerHTML||"").replace(Tt,"")),t.parentNode&&t.parentNode.removeChild(t)})}return this}}),v.buildFragment=function(e,n,r){var s,o,u,a=e[0];return n=n||i,n=!n.nodeType&&n[0]||n,n=n.ownerDocument||n,e.length===1&&typeof a=="string"&&a.length<512&&n===i&&a.charAt(0)==="<"&&!bt.test(a)&&(v.support.checkClone||!St.test(a))&&(v.support.html5Clone||!wt.test(a))&&(o=!0,s=v.fragments[a],u=s!==t),s||(s=n.createDocumentFragment(),v.clean(e,n,s,r),o&&(v.fragments[a]=u&&s)),{fragment:s,cacheable:o}},v.fragments={},v.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){v.fn[e]=function(n){var r,i=0,s=[],o=v(n),u=o.length,a=this.length===1&&this[0].parentNode;if((a==null||a&&a.nodeType===11&&a.childNodes.length===1)&&u===1)return o[t](this[0]),this;for(;i<u;i++)r=(i>0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1></$2>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]==="<table>"&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("<div>").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r<i;r++)n=e[r],Vn[n]=Vn[n]||[],Vn[n].unshift(t)},prefilter:function(e,t){t?Xn.unshift(e):Xn.push(e)}}),v.Tween=Yn,Yn.prototype={constructor:Yn,init:function(e,t,n,r,i,s){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=s||(v.cssNumber[n]?"":"px")},cur:function(){var e=Yn.propHooks[this.prop];return e&&e.get?e.get(this):Yn.propHooks._default.get(this)},run:function(e){var t,n=Yn.propHooks[this.prop];return this.options.duration?this.pos=t=v.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Yn.propHooks._default.set(this),this}},Yn.prototype.init.prototype=Yn.prototype,Yn.propHooks={_default:{get:function(e){var t;return e.elem[e.prop]==null||!!e.elem.style&&e.elem.style[e.prop]!=null?(t=v.css(e.elem,e.prop,!1,""),!t||t==="auto"?0:t):e.elem[e.prop]},set:function(e){v.fx.step[e.prop]?v.fx.step[e.prop](e):e.elem.style&&(e.elem.style[v.cssProps[e.prop]]!=null||v.cssHooks[e.prop])?v.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},Yn.propHooks.scrollTop=Yn.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},v.each(["toggle","show","hide"],function(e,t){var n=v.fn[t];v.fn[t]=function(r,i,s){return r==null||typeof r=="boolean"||!e&&v.isFunction(r)&&v.isFunction(i)?n.apply(this,arguments):this.animate(Zn(t,!0),r,i,s)}}),v.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Gt).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=v.isEmptyObject(e),s=v.speed(t,n,r),o=function(){var t=Kn(this,v.extend({},e),s);i&&t.stop(!0)};return i||s.queue===!1?this.each(o):this.queue(s.queue,o)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return typeof e!="string"&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=e!=null&&e+"queueHooks",s=v.timers,o=v._data(this);if(n)o[n]&&o[n].stop&&i(o[n]);else for(n in o)o[n]&&o[n].stop&&Wn.test(n)&&i(o[n]);for(n=s.length;n--;)s[n].elem===this&&(e==null||s[n].queue===e)&&(s[n].anim.stop(r),t=!1,s.splice(n,1));(t||!r)&&v.dequeue(this,e)})}}),v.each({slideDown:Zn("show"),slideUp:Zn("hide"),slideToggle:Zn("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){v.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),v.speed=function(e,t,n){var r=e&&typeof e=="object"?v.extend({},e):{complete:n||!n&&t||v.isFunction(e)&&e,duration:e,easing:n&&t||t&&!v.isFunction(t)&&t};r.duration=v.fx.off?0:typeof r.duration=="number"?r.duration:r.duration in v.fx.speeds?v.fx.speeds[r.duration]:v.fx.speeds._default;if(r.queue==null||r.queue===!0)r.queue="fx";return r.old=r.complete,r.complete=function(){v.isFunction(r.old)&&r.old.call(this),r.queue&&v.dequeue(this,r.queue)},r},v.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},v.timers=[],v.fx=Yn.prototype.init,v.fx.tick=function(){var e,n=v.timers,r=0;qn=v.now();for(;r<n.length;r++)e=n[r],!e()&&n[r]===e&&n.splice(r--,1);n.length||v.fx.stop(),qn=t},v.fx.timer=function(e){e()&&v.timers.push(e)&&!Rn&&(Rn=setInterval(v.fx.tick,v.fx.interval))},v.fx.interval=13,v.fx.stop=function(){clearInterval(Rn),Rn=null},v.fx.speeds={slow:600,fast:200,_default:400},v.fx.step={},v.expr&&v.expr.filters&&(v.expr.filters.animated=function(e){return v.grep(v.timers,function(t){return e===t.elem}).length});var er=/^(?:body|html)$/i;v.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){v.offset.setOffset(this,e,t)});var n,r,i,s,o,u,a,f={top:0,left:0},l=this[0],c=l&&l.ownerDocument;if(!c)return;return(r=c.body)===l?v.offset.bodyOffset(l):(n=c.documentElement,v.contains(n,l)?(typeof l.getBoundingClientRect!="undefined"&&(f=l.getBoundingClientRect()),i=tr(c),s=n.clientTop||r.clientTop||0,o=n.clientLeft||r.clientLeft||0,u=i.pageYOffset||n.scrollTop,a=i.pageXOffset||n.scrollLeft,{top:f.top+u-s,left:f.left+a-o}):f)},v.offset={bodyOffset:function(e){var t=e.offsetTop,n=e.offsetLeft;return v.support.doesNotIncludeMarginInBodyOffset&&(t+=parseFloat(v.css(e,"marginTop"))||0,n+=parseFloat(v.css(e,"marginLeft"))||0),{top:t,left:n}},setOffset:function(e,t,n){var r=v.css(e,"position");r==="static"&&(e.style.position="relative");var i=v(e),s=i.offset(),o=v.css(e,"top"),u=v.css(e,"left"),a=(r==="absolute"||r==="fixed")&&v.inArray("auto",[o,u])>-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window);
\ No newline at end of file
diff --git a/resources/scripts/libs/jquery.tablesorter.min.js b/resources/scripts/libs/jquery.tablesorter.min.js
deleted file mode 100644
index 730df634e..000000000
--- a/resources/scripts/libs/jquery.tablesorter.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
-* TableSorter 2.9.1 min - Client-side table sorting with ease!
-* Copyright (c) 2007 Christian Bach
-*/
-!function(f){f.extend({tablesorter:new function(){function d(c){"undefined"!==typeof console&&"undefined"!==typeof console.log?console.log(c):alert(c)}function w(c,b){d(c+" ("+((new Date).getTime()-b.getTime())+"ms)")}function r(c,b,a){if(!b)return"";var e=c.config,d=e.textExtraction,m="",m="simple"===d?e.supportsTextContent?b.textContent:f(b).text():"function"===typeof d?d(b,c,a):"object"===typeof d&&d.hasOwnProperty(a)?d[a](b,c,a):e.supportsTextContent?b.textContent:f(b).text();return f.trim(m)} function j(c){var b=c.config,a=b.$tbodies=b.$table.children("tbody:not(."+b.cssInfoBlock+")"),e,t,m,p,k,n,h="";if(0===a.length)return b.debug?d("*Empty table!* Not building a parser cache"):"";a=a[0].rows;if(a[0]){e=[];t=a[0].cells.length;for(m=0;m<t;m++){p=b.$headers.filter(":not([colspan])");p=p.add(b.$headers.filter('[colspan="1"]')).filter('[data-column="'+m+'"]:last');k=b.headers[m];n=g.getParserById(g.getData(p,k,"sorter"));b.empties[m]=g.getData(p,k,"empty")||b.emptyTo||(b.emptyToBottom?"bottom": "top");b.strings[m]=g.getData(p,k,"string")||b.stringTo||"max";if(!n)a:{p=c;k=a;n=-1;for(var f=m,l=void 0,w=g.parsers.length,F=!1,C="",l=!0;""===C&&l;)n++,k[n]?(F=k[n].cells[f],C=r(p,F,f),p.config.debug&&d("Checking if value was empty on row "+n+", column: "+f+': "'+C+'"')):l=!1;for(;0<=--w;)if((l=g.parsers[w])&&"text"!==l.id&&l.is&&l.is(C,p,F)){n=l;break a}n=g.getParserById("text")}b.debug&&(h+="column:"+m+"; parser:"+n.id+"; string:"+b.strings[m]+"; empty: "+b.empties[m]+"\n");e.push(n)}}b.debug&& d(h);b.parsers=e}function s(c){var b=c.tBodies,a=c.config,e,t,m=a.parsers,p,k,n,h,q,l,G,j=[];a.cache={};if(!m)return a.debug?d("*Empty table!* Not building a cache"):"";a.debug&&(G=new Date);a.showProcessing&&g.isProcessing(c,!0);for(h=0;h<b.length;h++)if(a.cache[h]={row:[],normalized:[]},!f(b[h]).hasClass(a.cssInfoBlock)){e=b[h]&&b[h].rows.length||0;t=b[h].rows[0]&&b[h].rows[0].cells.length||0;for(k=0;k<e;++k)if(q=f(b[h].rows[k]),l=[],q.hasClass(a.cssChildRow))a.cache[h].row[a.cache[h].row.length- 1]=a.cache[h].row[a.cache[h].row.length-1].add(q);else{a.cache[h].row.push(q);for(n=0;n<t;++n)if(p=r(c,q[0].cells[n],n),p=m[n].format(p,c,q[0].cells[n],n),l.push(p),"numeric"===(m[n].type||"").toLowerCase())j[n]=Math.max(Math.abs(p),j[n]||0);l.push(a.cache[h].normalized.length);a.cache[h].normalized.push(l)}a.cache[h].colMax=j}a.showProcessing&&g.isProcessing(c);a.debug&&w("Building cache for "+e+" rows",G)}function v(c,b){var a=c.config,e=c.tBodies,d=[],m=a.cache,p,k,n,h,q,l,j,r,C,s,v;if(m[0]){a.debug&& (v=new Date);for(r=0;r<e.length;r++)if(p=f(e[r]),p.length&&!p.hasClass(a.cssInfoBlock)){q=g.processTbody(c,p,!0);p=m[r].row;k=m[r].normalized;h=(n=k.length)?k[0].length-1:0;for(l=0;l<n;l++)if(s=k[l][h],d.push(p[s]),!a.appender||!a.removeRows){C=p[s].length;for(j=0;j<C;j++)q.append(p[s][j])}g.processTbody(c,q,!1)}a.appender&&a.appender(c,d);a.debug&&w("Rebuilt table",v);b||g.applyWidget(c);f(c).trigger("sortEnd",c)}}function z(c){var b=[],a={},e=0,t=f(c).find("thead:eq(0), tfoot").children("tr"),m, p,k,n,h,q,l,j,r,s;for(m=0;m<t.length;m++){h=t[m].cells;for(p=0;p<h.length;p++){n=h[p];q=n.parentNode.rowIndex;l=q+"-"+n.cellIndex;j=n.rowSpan||1;r=n.colSpan||1;"undefined"===typeof b[q]&&(b[q]=[]);for(k=0;k<b[q].length+1;k++)if("undefined"===typeof b[q][k]){s=k;break}a[l]=s;e=Math.max(s,e);f(n).attr({"data-column":s});for(k=q;k<q+j;k++){"undefined"===typeof b[k]&&(b[k]=[]);l=b[k];for(n=s;n<s+r;n++)l[n]="x"}}}c.config.columns=e;var v,u,z,B,A,y,D,x=c.config;x.headerList=[];x.headerContent=[];x.debug&& (D=new Date);B=x.cssIcon?'<i class="'+x.cssIcon+'"></i>':"";x.$headers=f(c).find(x.selectorHeaders).each(function(c){u=f(this);v=x.headers[c];x.headerContent[c]=this.innerHTML;A=x.headerTemplate.replace(/\{content\}/g,this.innerHTML).replace(/\{icon\}/g,B);x.onRenderTemplate&&(z=x.onRenderTemplate.apply(u,[c,A]))&&"string"===typeof z&&(A=z);this.innerHTML='<div class="tablesorter-header-inner">'+A+"</div>";x.onRenderHeader&&x.onRenderHeader.apply(u,[c]);this.column=a[this.parentNode.rowIndex+"-"+ this.cellIndex];var b=g.getData(u,v,"sortInitialOrder")||x.sortInitialOrder;this.order=/^d/i.test(b)||1===b?[1,0,2]:[0,1,2];this.count=-1;this.lockedOrder=!1;y=g.getData(u,v,"lockedOrder")||!1;"undefined"!==typeof y&&!1!==y&&(this.order=this.lockedOrder=/^d/i.test(y)||1===y?[1,1,1]:[0,0,0]);u.addClass(x.cssHeader);x.headerList[c]=this;u.parent().addClass(x.cssHeaderRow)});E(c);x.debug&&(w("Built headers:",D),d(x.$headers))}function A(c,b,a){var e=f(c);e.find(c.config.selectorRemove).remove();j(c); s(c);D(e,b,a)}function E(c){var b,a=c.config;a.$headers.each(function(c,d){b="false"===g.getData(d,a.headers[c],"sorter");d.sortDisabled=b;f(d)[b?"addClass":"removeClass"]("sorter-false")})}function y(c){var b,a,e,d=c.config,m=d.sortList,p=[d.cssAsc,d.cssDesc],k=f(c).find("tfoot tr").children().removeClass(p.join(" "));d.$headers.removeClass(p.join(" "));e=m.length;for(b=0;b<e;b++)if(2!==m[b][1]&&(c=d.$headers.not(".sorter-false").filter('[data-column="'+m[b][0]+'"]'+(1===e?":last":"")),c.length))for(a= 0;a<c.length;a++)c[a].sortDisabled||(c.eq(a).addClass(p[m[b][1]]),k.length&&k.filter('[data-column="'+m[b][0]+'"]').eq(a).addClass(p[m[b][1]]))}function B(c){var b=0,a=c.config,e=a.sortList,d=e.length,m=c.tBodies.length,p,k,g,h,q,l,j,r,s;if(!a.serverSideSorting&&a.cache[0]){a.debug&&(p=new Date);for(g=0;g<m;g++)q=a.cache[g].colMax,s=(l=a.cache[g].normalized)&&l[0]?l[0].length-1:0,l.sort(function(m,p){for(k=0;k<d;k++){h=e[k][0];r=e[k][1];j=/n/i.test(a.parsers&&a.parsers[h]?a.parsers[h].type||"":"")? "Numeric":"Text";j+=0===r?"":"Desc";/Numeric/.test(j)&&a.strings[h]&&(b="boolean"===typeof a.string[a.strings[h]]?(0===r?1:-1)*(a.string[a.strings[h]]?-1:1):a.strings[h]?a.string[a.strings[h]]||0:0);var g=f.tablesorter["sort"+j](c,m[h],p[h],h,q[h],b);if(g)return g}return m[s]-p[s]});a.debug&&w("Sorting on "+e.toString()+" and dir "+r+" time",p)}}function H(c,b){c.trigger("updateComplete");"function"===typeof b&&b(c[0])}function D(c,b,a){!1!==b&&!c[0].isProcessing?c.trigger("sorton",[c[0].config.sortList, function(){H(c,a)}]):H(c,a)}function I(c){var b=c.config,a=f(c),e,d;b.$headers.find(b.selectorSort).add(b.$headers.filter(b.selectorSort)).unbind("mousedown.tablesorter mouseup.tablesorter sort.tablesorter").bind("mousedown.tablesorter mouseup.tablesorter sort.tablesorter",function(a,e){var k=(this.tagName.match("TH|TD")?f(this):f(this).parents("th, td").filter(":last"))[0];if(1!==(a.which||a.button)&&"sort"!==a.type)return!1;if("mousedown"===a.type)return d=(new Date).getTime(),"INPUT"===a.target.tagName? "":!b.cancelSelection;if(!0!==e&&250<(new Date).getTime()-d)return!1;b.delayInit&&!b.cache&&s(c);if(!k.sortDisabled){var n,h,q,l=c.config,j=!a[l.sortMultiSortKey],r=f(c);r.trigger("sortStart",c);k.count=a[l.sortResetKey]?2:(k.count+1)%(l.sortReset?3:2);l.sortRestart&&(h=k,l.$headers.each(function(){if(this!==h&&(j||!f(this).is("."+l.cssDesc+",."+l.cssAsc)))this.count=-1}));h=k.column;if(j){l.sortList=[];if(null!==l.sortForce){n=l.sortForce;for(q=0;q<n.length;q++)n[q][0]!==h&&l.sortList.push(n[q])}n= k.order[k.count];if(2>n&&(l.sortList.push([h,n]),1<k.colSpan))for(q=1;q<k.colSpan;q++)l.sortList.push([h+q,n])}else if(l.sortAppend&&1<l.sortList.length&&g.isValueInArray(l.sortAppend[0][0],l.sortList)&&l.sortList.pop(),g.isValueInArray(h,l.sortList))for(q=0;q<l.sortList.length;q++)k=l.sortList[q],n=l.headerList[k[0]],k[0]===h&&(k[1]=n.order[n.count],2===k[1]&&(l.sortList.splice(q,1),n.count=-1));else if(n=k.order[k.count],2>n&&(l.sortList.push([h,n]),1<k.colSpan))for(q=1;q<k.colSpan;q++)l.sortList.push([h+ q,n]);if(null!==l.sortAppend){n=l.sortAppend;for(q=0;q<n.length;q++)n[q][0]!==h&&l.sortList.push(n[q])}r.trigger("sortBegin",c);setTimeout(function(){y(c);B(c);v(c)},1)}});b.cancelSelection&&b.$headers.each(function(){this.onselectstart=function(){return!1}});a.unbind("sortReset update updateRows updateCell updateAll addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ".split(" ").join(".tablesorter ")).bind("sortReset.tablesorter",function(a){a.stopPropagation(); b.sortList=[];y(c);B(c);v(c)}).bind("updateAll.tablesorter",function(a,b,e){a.stopPropagation();g.restoreHeaders(c);z(c);I(c);A(c,b,e)}).bind("update.tablesorter updateRows.tablesorter",function(a,b,e){a.stopPropagation();E(c);A(c,b,e)}).bind("updateCell.tablesorter",function(e,d,g,n){e.stopPropagation();a.find(b.selectorRemove).remove();var h,q,l;h=a.find("tbody");e=h.index(f(d).parents("tbody").filter(":last"));var t=f(d).parents("tr").filter(":last");d=f(d)[0];h.length&&0<=e&&(q=h.eq(e).find("tr").index(t), l=d.cellIndex,h=b.cache[e].normalized[q].length-1,b.cache[e].row[c.config.cache[e].normalized[q][h]]=t,b.cache[e].normalized[q][l]=b.parsers[l].format(r(c,d,l),c,d,l),D(a,g,n))}).bind("addRows.tablesorter",function(d,g,k,f){d.stopPropagation();var h=g.filter("tr").length,t=[],l=g[0].cells.length,w=a.find("tbody").index(g.closest("tbody"));b.parsers||j(c);for(d=0;d<h;d++){for(e=0;e<l;e++)t[e]=b.parsers[e].format(r(c,g[d].cells[e],e),c,g[d].cells[e],e);t.push(b.cache[w].row.length);b.cache[w].row.push([g[d]]); b.cache[w].normalized.push(t);t=[]}D(a,k,f)}).bind("sorton.tablesorter",function(b,e,d,g){b.stopPropagation();a.trigger("sortStart",this);var h,t,l,j=c.config;b=e||j.sortList;j.sortList=[];f.each(b,function(a,c){h=[parseInt(c[0],10),parseInt(c[1],10)];if(l=j.headerList[h[0]])j.sortList.push(h),t=f.inArray(h[1],l.order),l.count=0<=t?t:h[1]%(j.sortReset?3:2)});y(c);B(c);v(c,g);"function"===typeof d&&d(c)}).bind("appendCache.tablesorter",function(a,b,e){a.stopPropagation();v(c,e);"function"===typeof b&& b(c)}).bind("applyWidgetId.tablesorter",function(a,e){a.stopPropagation();g.getWidgetById(e).format(c,b,b.widgetOptions)}).bind("applyWidgets.tablesorter",function(a,b){a.stopPropagation();g.applyWidget(c,b)}).bind("refreshWidgets.tablesorter",function(a,b,e){a.stopPropagation();g.refreshWidgets(c,b,e)}).bind("destroy.tablesorter",function(a,b,e){a.stopPropagation();g.destroy(c,b,e)})}var g=this;g.version="2.9.1";g.parsers=[];g.widgets=[];g.defaults={theme:"default",widthFixed:!1,showProcessing:!1, headerTemplate:"{content}",onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey",usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,headers:{},ignoreCase:!0,sortForce:null,sortList:[],sortAppend:null,sortInitialOrder:"asc",sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",textExtraction:"simple",textSorter:null,widgets:[],widgetOptions:{zebra:["even","odd"]},initWidgets:!0,initialized:null, tableClass:"tablesorter",cssAsc:"tablesorter-headerAsc",cssChildRow:"tablesorter-childRow",cssDesc:"tablesorter-headerDesc",cssHeader:"tablesorter-header",cssHeaderRow:"tablesorter-headerRow",cssIcon:"tablesorter-icon",cssInfoBlock:"tablesorter-infoOnly",cssProcessing:"tablesorter-processing",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[],empties:{},strings:{},parsers:[]};g.benchmark=w;g.construct=function(c){return this.each(function(){if(!this.tHead|| 0===this.tBodies.length||!0===this.hasInitialized)return this.config&&this.config.debug?d("stopping initialization! No thead, tbody or tablesorter has already been initialized"):"";var b=f(this),a=this,e,t="",m=f.metadata;a.hasInitialized=!1;a.isProcessing=!0;a.config={};e=f.extend(!0,a.config,g.defaults,c);f.data(a,"tablesorter",e);e.debug&&f.data(a,"startoveralltimer",new Date);e.supportsTextContent="x"===f("<span>x</span>")[0].textContent;e.supportsDataObject=1.4<=parseFloat(f.fn.jquery);e.string= {max:1,min:-1,"max+":1,"max-":-1,zero:0,none:0,"null":0,top:!0,bottom:!1};/tablesorter\-/.test(b.attr("class"))||(t=""!==e.theme?" tablesorter-"+e.theme:"");e.$table=b.addClass(e.tableClass+t);e.$tbodies=b.children("tbody:not(."+e.cssInfoBlock+")");z(a);if(a.config.widthFixed&&0===f(a).find("colgroup").length){var p=f("<colgroup>"),k=f(a).width();f(a.tBodies[0]).find("tr:first").children("td").each(function(){p.append(f("<col>").css("width",parseInt(1E3*(f(this).width()/k),10)/10+"%"))});f(a).prepend(p)}j(a); e.delayInit||s(a);I(a);e.supportsDataObject&&"undefined"!==typeof b.data().sortlist?e.sortList=b.data().sortlist:m&&(b.metadata()&&b.metadata().sortlist)&&(e.sortList=b.metadata().sortlist);g.applyWidget(a,!0);0<e.sortList.length?b.trigger("sorton",[e.sortList,{},!e.initWidgets]):e.initWidgets&&g.applyWidget(a);e.showProcessing&&b.unbind("sortBegin.tablesorter sortEnd.tablesorter").bind("sortBegin.tablesorter sortEnd.tablesorter",function(b){g.isProcessing(a,"sortBegin"===b.type)});a.hasInitialized= !0;a.isProcessing=!1;e.debug&&g.benchmark("Overall initialization time",f.data(a,"startoveralltimer"));b.trigger("tablesorter-initialized",a);"function"===typeof e.initialized&&e.initialized(a)})};g.isProcessing=function(c,b,a){c=f(c);var e=c[0].config;c=a||c.find("."+e.cssHeader);b?(0<e.sortList.length&&(c=c.filter(function(){return this.sortDisabled?!1:g.isValueInArray(parseFloat(f(this).attr("data-column")),e.sortList)})),c.addClass(e.cssProcessing)):c.removeClass(e.cssProcessing)};g.processTbody= function(c,b,a){if(a)return c.isProcessing=!0,b.before('<span class="tablesorter-savemyplace"/>'),a=f.fn.detach?b.detach():b.remove();a=f(c).find("span.tablesorter-savemyplace");b.insertAfter(a);a.remove();c.isProcessing=!1};g.clearTableBody=function(c){f(c)[0].config.$tbodies.empty()};g.restoreHeaders=function(c){var b=c.config;b.$headers.each(function(a){f(this).find(".tablesorter-header-inner").length&&f(this).html(b.headerContent[a])})};g.destroy=function(c,b,a){c=f(c)[0];if(c.hasInitialized){g.refreshWidgets(c, !0,!0);var e=f(c),d=c.config,m=e.find("thead:first"),p=m.find("tr."+d.cssHeaderRow).removeClass(d.cssHeaderRow),k=e.find("tfoot:first > tr").children("th, td");m.find("tr").not(p).remove();e.removeData("tablesorter").unbind("sortReset update updateAll updateRows updateCell addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave sortBegin sortEnd ".split(" ").join(".tablesorter "));d.$headers.add(k).removeClass(d.cssHeader+" "+d.cssAsc+" "+d.cssDesc).removeAttr("data-column"); p.find(d.selectorSort).unbind("mousedown.tablesorter mouseup.tablesorter");g.restoreHeaders(c);!1!==b&&e.removeClass(d.tableClass+" tablesorter-"+d.theme);c.hasInitialized=!1;"function"===typeof a&&a(c)}};g.regex=[/(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi,/(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[\/\-]\d{1,4}[\/\-]\d{1,4}|^\w+, \w+ \d+, \d{4})/,/^0x[0-9a-f]+$/i];g.sortText=function(c,b,a,e){if(b===a)return 0;var d=c.config,m=d.string[d.empties[e]|| d.emptyTo],f=g.regex;if(""===b&&0!==m)return"boolean"===typeof m?m?-1:1:-m||-1;if(""===a&&0!==m)return"boolean"===typeof m?m?1:-1:m||1;if("function"===typeof d.textSorter)return d.textSorter(b,a,c,e);c=b.replace(f[0],"\\0$1\\0").replace(/\\0$/,"").replace(/^\\0/,"").split("\\0");e=a.replace(f[0],"\\0$1\\0").replace(/\\0$/,"").replace(/^\\0/,"").split("\\0");b=parseInt(b.match(f[2]),16)||1!==c.length&&b.match(f[1])&&Date.parse(b);if(a=parseInt(a.match(f[2]),16)||b&&a.match(f[1])&&Date.parse(a)||null){if(b< a)return-1;if(b>a)return 1}d=Math.max(c.length,e.length);for(b=0;b<d;b++){a=isNaN(c[b])?c[b]||0:parseFloat(c[b])||0;f=isNaN(e[b])?e[b]||0:parseFloat(e[b])||0;if(isNaN(a)!==isNaN(f))return isNaN(a)?1:-1;typeof a!==typeof f&&(a+="",f+="");if(a<f)return-1;if(a>f)return 1}return 0};g.sortTextDesc=function(c,b,a,e){if(b===a)return 0;var d=c.config,f=d.string[d.empties[e]||d.emptyTo];return""===b&&0!==f?"boolean"===typeof f?f?-1:1:f||1:""===a&&0!==f?"boolean"===typeof f?f?1:-1:-f||-1:"function"===typeof d.textSorter? d.textSorter(a,b,c,e):g.sortText(c,a,b)};g.getTextValue=function(c,b,a){if(b){var e=c?c.length:0,d=b+a;for(b=0;b<e;b++)d+=c.charCodeAt(b);return a*d}return 0};g.sortNumeric=function(c,b,a,e,d,f){if(b===a)return 0;c=c.config;e=c.string[c.empties[e]||c.emptyTo];if(""===b&&0!==e)return"boolean"===typeof e?e?-1:1:-e||-1;if(""===a&&0!==e)return"boolean"===typeof e?e?1:-1:e||1;isNaN(b)&&(b=g.getTextValue(b,d,f));isNaN(a)&&(a=g.getTextValue(a,d,f));return b-a};g.sortNumericDesc=function(c,b,a,d,f,m){if(b=== a)return 0;c=c.config;d=c.string[c.empties[d]||c.emptyTo];if(""===b&&0!==d)return"boolean"===typeof d?d?-1:1:d||1;if(""===a&&0!==d)return"boolean"===typeof d?d?1:-1:-d||-1;isNaN(b)&&(b=g.getTextValue(b,f,m));isNaN(a)&&(a=g.getTextValue(a,f,m));return a-b};g.characterEquivalents={a:"\u00e1\u00e0\u00e2\u00e3\u00e4\u0105\u00e5",A:"\u00c1\u00c0\u00c2\u00c3\u00c4\u0104\u00c5",c:"\u00e7\u0107\u010d",C:"\u00c7\u0106\u010c",e:"\u00e9\u00e8\u00ea\u00eb\u011b\u0119",E:"\u00c9\u00c8\u00ca\u00cb\u011a\u0118", i:"\u00ed\u00ec\u0130\u00ee\u00ef\u0131",I:"\u00cd\u00cc\u0130\u00ce\u00cf",o:"\u00f3\u00f2\u00f4\u00f5\u00f6",O:"\u00d3\u00d2\u00d4\u00d5\u00d6",ss:"\u00df",SS:"\u1e9e",u:"\u00fa\u00f9\u00fb\u00fc\u016f",U:"\u00da\u00d9\u00db\u00dc\u016e"};g.replaceAccents=function(c){var b,a="[",d=g.characterEquivalents;if(!g.characterRegex){g.characterRegexArray={};for(b in d)"string"===typeof b&&(a+=d[b],g.characterRegexArray[b]=RegExp("["+d[b]+"]","g"));g.characterRegex=RegExp(a+"]")}if(g.characterRegex.test(c))for(b in d)"string"=== typeof b&&(c=c.replace(g.characterRegexArray[b],b));return c};g.isValueInArray=function(c,b){var a,d=b.length;for(a=0;a<d;a++)if(b[a][0]===c)return!0;return!1};g.addParser=function(c){var b,a=g.parsers.length,d=!0;for(b=0;b<a;b++)g.parsers[b].id.toLowerCase()===c.id.toLowerCase()&&(d=!1);d&&g.parsers.push(c)};g.getParserById=function(c){var b,a=g.parsers.length;for(b=0;b<a;b++)if(g.parsers[b].id.toLowerCase()===c.toString().toLowerCase())return g.parsers[b];return!1};g.addWidget=function(c){g.widgets.push(c)}; g.getWidgetById=function(c){var b,a,d=g.widgets.length;for(b=0;b<d;b++)if((a=g.widgets[b])&&a.hasOwnProperty("id")&&a.id.toLowerCase()===c.toLowerCase())return a};g.applyWidget=function(c,b){c=f(c)[0];var a=c.config,d=a.widgetOptions,j=[],m,p,k;a.debug&&(m=new Date);a.widgets.length&&(a.widgets=f.grep(a.widgets,function(b,c){return f.inArray(b,a.widgets)===c}),f.each(a.widgets||[],function(a,b){if((k=g.getWidgetById(b))&&k.id)k.priority||(k.priority=10),j[a]=k}),j.sort(function(a,b){return a.priority< b.priority?-1:a.priority===b.priority?0:1}),f.each(j,function(g,h){h&&(b?(h.hasOwnProperty("options")&&(d=c.config.widgetOptions=f.extend(!0,{},h.options,d)),h.hasOwnProperty("init")&&h.init(c,h,a,d)):!b&&h.hasOwnProperty("format")&&h.format(c,a,d,!1))}));a.debug&&(p=a.widgets.length,w("Completed "+(!0===b?"initializing ":"applying ")+p+" widget"+(1!==p?"s":""),m))};g.refreshWidgets=function(c,b,a){c=f(c)[0];var e,j=c.config,m=j.widgets,p=g.widgets,k=p.length;for(e=0;e<k;e++)if(p[e]&&p[e].id&&(b|| 0>f.inArray(p[e].id,m)))j.debug&&d("Refeshing widgets: Removing "+p[e].id),p[e].hasOwnProperty("remove")&&p[e].remove(c,j,j.widgetOptions);!0!==a&&g.applyWidget(c,b)};g.getData=function(c,b,a){var d="";c=f(c);var g,m;if(!c.length)return"";g=f.metadata?c.metadata():!1;m=" "+(c.attr("class")||"");"undefined"!==typeof c.data(a)||"undefined"!==typeof c.data(a.toLowerCase())?d+=c.data(a)||c.data(a.toLowerCase()):g&&"undefined"!==typeof g[a]?d+=g[a]:b&&"undefined"!==typeof b[a]?d+=b[a]:" "!==m&&m.match(" "+ a+"-")&&(d=m.match(RegExp("\\s"+a+"-([\\w-]+)"))[1]||"");return f.trim(d)};g.formatFloat=function(c,b){if("string"!==typeof c||""===c)return c;var a;c=(b&&b.config?!1!==b.config.usNumberFormat:"undefined"!==typeof b?b:1)?c.replace(/,/g,""):c.replace(/[\s|\.]/g,"").replace(/,/g,".");/^\s*\([.\d]+\)/.test(c)&&(c=c.replace(/^\s*\(/,"-").replace(/\)/,""));a=parseFloat(c);return isNaN(a)?f.trim(c):a};g.isDigit=function(c){return isNaN(c)?/^[\-+(]?\d+[)]?$/.test(c.toString().replace(/[,.'"\s]/g,"")):!0}}}); var j=f.tablesorter;f.fn.extend({tablesorter:j.construct});j.addParser({id:"text",is:function(){return!0},format:function(d,w){var r=w.config;d&&(d=f.trim(r.ignoreCase?d.toLocaleLowerCase():d),d=r.sortLocaleCompare?j.replaceAccents(d):d);return d},type:"text"});j.addParser({id:"digit",is:function(d){return j.isDigit(d)},format:function(d,f){return d?j.formatFloat(d.replace(/[^\w,. \-()]/g,""),f):d},type:"numeric"});j.addParser({id:"currency",is:function(d){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test((d|| "").replace(/[,. ]/g,""))},format:function(d,f){return d?j.formatFloat(d.replace(/[^\w,. \-()]/g,""),f):d},type:"numeric"});j.addParser({id:"ipAddress",is:function(d){return/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/.test(d)},format:function(d,f){var r,u=d?d.split("."):"",s="",v=u.length;for(r=0;r<v;r++)s+=("00"+u[r]).slice(-3);return d?j.formatFloat(s,f):d},type:"numeric"});j.addParser({id:"url",is:function(d){return/^(https?|ftp|file):\/\//.test(d)},format:function(d){return d?f.trim(d.replace(/(https?|ftp|file):\/\//, "")):d},type:"text"});j.addParser({id:"isoDate",is:function(d){return/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/.test(d)},format:function(d,f){return d?j.formatFloat(""!==d?(new Date(d.replace(/-/g,"/"))).getTime()||"":"",f):d},type:"numeric"});j.addParser({id:"percent",is:function(d){return/(\d\s?%|%\s?\d)/.test(d)},format:function(d,f){return d?j.formatFloat(d.replace(/%/g,""),f):d},type:"numeric"});j.addParser({id:"usLongDate",is:function(d){return/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i.test(d)|| /^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i.test(d)},format:function(d,f){return d?j.formatFloat((new Date(d.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||"",f):d},type:"numeric"});j.addParser({id:"shortDate",is:function(d){return/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/.test((d||"").replace(/\s+/g," ").replace(/[\-.,]/g,"/"))},format:function(d,f,r,u){if(d){r=f.config;var s=r.headerList[u],v=s.shortDateFormat;"undefined"===typeof v&&(v=s.shortDateFormat=j.getData(s,r.headers[u], "dateFormat")||r.dateFormat);d=d.replace(/\s+/g," ").replace(/[\-.,]/g,"/");"mmddyyyy"===v?d=d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$1/$2"):"ddmmyyyy"===v?d=d.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$2/$1"):"yyyymmdd"===v&&(d=d.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/,"$1/$2/$3"))}return d?j.formatFloat((new Date(d)).getTime()||"",f):d},type:"numeric"});j.addParser({id:"time",is:function(d){return/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(d)},format:function(d, f){return d?j.formatFloat((new Date("2000/01/01 "+d.replace(/(\S)([AP]M)$/i,"$1 $2"))).getTime()||"",f):d},type:"numeric"});j.addParser({id:"metadata",is:function(){return!1},format:function(d,j,r){d=j.config;d=!d.parserMetadataName?"sortValue":d.parserMetadataName;return f(r).metadata()[d]},type:"numeric"});j.addWidget({id:"zebra",priority:90,format:function(d,w,r){var u,s,v,z,A,E,y=RegExp(w.cssChildRow,"i"),B=w.$tbodies;w.debug&&(A=new Date);for(d=0;d<B.length;d++)u=B.eq(d),E=u.children("tr").length, 1<E&&(v=0,u=u.children("tr:visible"),u.each(function(){s=f(this);y.test(this.className)||v++;z=0===v%2;s.removeClass(r.zebra[z?1:0]).addClass(r.zebra[z?0:1])}));w.debug&&j.benchmark("Applying Zebra widget",A)},remove:function(d,j,r){var u;j=j.$tbodies;var s=(r.zebra||["even","odd"]).join(" ");for(r=0;r<j.length;r++)u=f.tablesorter.processTbody(d,j.eq(r),!0),u.children().removeClass(s),f.tablesorter.processTbody(d,u,!1)}})}(jQuery);
diff --git a/resources/scripts/libs/jquery.tablesorter.widgets.min.js b/resources/scripts/libs/jquery.tablesorter.widgets.min.js
deleted file mode 100644
index 3bd215225..000000000
--- a/resources/scripts/libs/jquery.tablesorter.widgets.min.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*! tableSorter 2.8+ widgets - updated 4/13/2013 */
-;(function(h){
-var g=h.tablesorter=h.tablesorter||{};
-g.themes={bootstrap:{table:"table table-bordered table-striped",header:"bootstrap-header",footerRow:"",footerCells:"",icons:"",sortNone:"bootstrap-icon-unsorted",sortAsc:"icon-chevron-up",sortDesc:"icon-chevron-down",active:"",hover:"",filterRow:"",even:"",odd:""},jui:{table:"ui-widget ui-widget-content ui-corner-all",header:"ui-widget-header ui-corner-all ui-state-default",footerRow:"",footerCells:"",icons:"ui-icon",sortNone:"ui-icon-carat-2-n-s", sortAsc:"ui-icon-carat-1-n",sortDesc:"ui-icon-carat-1-s",active:"ui-state-active",hover:"ui-state-hover",filterRow:"",even:"ui-widget-content",odd:"ui-state-default"}};
-g.storage=function(d,c,b){var a,f=!1;a={};var k=d.id||h(".tablesorter").index(h(d)),g=window.location.pathname;try{f=!!localStorage.getItem}catch(j){}h.parseJSON&&(f?a=h.parseJSON(localStorage[c]||"{}"):(a=document.cookie.split(/[;\s|=]/),d=h.inArray(c,a)+1,a=0!==d?h.parseJSON(a[d]||"{}"):{}));if((b||""===b)&&window.JSON&&JSON.hasOwnProperty("stringify"))a[g]|| (a[g]={}),a[g][k]=b,f?localStorage[c]=JSON.stringify(a):(d=new Date,d.setTime(d.getTime()+31536E6),document.cookie=c+"="+JSON.stringify(a).replace(/\"/g,'"')+"; expires="+d.toGMTString()+"; path=/");else return a&&a[g]?a[g][k]:{}};
-g.addWidget({id:"uitheme",priority:10,options:{uitheme:"jui"},format:function(d,c,b){var a,f,k,l,j=g.themes,n=c.$table,r="default"!==c.theme?c.theme:b.uitheme||"jui",e=j[j[r]?r:j[b.uitheme]?b.uitheme:"jui"],u=c.$headers,s="tr."+(b.stickyHeaders||"tablesorter-stickyHeader"), t=e.sortNone+" "+e.sortDesc+" "+e.sortAsc;c.debug&&(a=new Date);if(!n.hasClass("tablesorter-"+r)||c.theme===r||!d.hasInitialized)""!==e.even&&(b.zebra[0]+=" "+e.even),""!==e.odd&&(b.zebra[1]+=" "+e.odd),j=n.removeClass(""===c.theme?"":"tablesorter-"+c.theme).addClass("tablesorter-"+r+" "+e.table).find("tfoot"),j.length&&j.find("tr").addClass(e.footerRow).children("th, td").addClass(e.footerCells),u.addClass(e.header).filter(":not(.sorter-false)").bind("mouseenter.tsuitheme mouseleave.tsuitheme",function(b){h(this)["mouseenter"=== b.type?"addClass":"removeClass"](e.hover)}),u.find(".tablesorter-wrapper").length||u.wrapInner('<div class="tablesorter-wrapper" style="position:relative;height:100%;width:100%"></div>'),c.cssIcon&&u.find("."+c.cssIcon).addClass(e.icons),n.hasClass("hasFilters")&&u.find(".tablesorter-filter-row").addClass(e.filterRow);h.each(u,function(b){k=h(this);l=c.cssIcon?k.find("."+c.cssIcon):k;this.sortDisabled?(k.removeClass(t),l.removeClass(t+" tablesorter-icon "+e.icons)):(j=n.hasClass("hasStickyHeaders")? n.find(s).find("th").eq(b).add(k):k,f=k.hasClass(c.cssAsc)?e.sortAsc:k.hasClass(c.cssDesc)?e.sortDesc:k.hasClass(c.cssHeader)?e.sortNone:"",k[f===e.sortNone?"removeClass":"addClass"](e.active),l.removeClass(t).addClass(f))});c.debug&&g.benchmark("Applying "+r+" theme",a)},remove:function(d,c,b){d=c.$table;var a="object"===typeof b.uitheme?"jui":b.uitheme||"jui";b="object"===typeof b.uitheme?b.uitheme:g.themes[g.themes.hasOwnProperty(a)?a:"jui"];var f=d.children("thead").children(),h=b.sortNone+" "+ b.sortDesc+" "+b.sortAsc;d.removeClass("tablesorter-"+a+" "+b.table).find(c.cssHeader).removeClass(b.header);f.unbind("mouseenter.tsuitheme mouseleave.tsuitheme").removeClass(b.hover+" "+h+" "+b.active).find(".tablesorter-filter-row").removeClass(b.filterRow);f.find(".tablesorter-icon").removeClass(b.icons)}});
-g.addWidget({id:"columns",priority:30,options:{columns:["primary","secondary","tertiary"]},format:function(d,c,b){var a,f,k,l,j,n,r,e,u,s=c.$table,t=c.$tbodies,m=c.sortList,p=m.length,v=c.widgetColumns&& c.widgetColumns.hasOwnProperty("css")?c.widgetColumns.css||v:b&&b.hasOwnProperty("columns")?b.columns||v:v;n=v.length-1;r=v.join(" ");c.debug&&(j=new Date);for(u=0;u<t.length;u++)a=g.processTbody(d,t.eq(u),!0),f=a.children("tr"),f.each(function(){l=h(this);if("none"!==this.style.display&&(k=l.children().removeClass(r),m&&m[0]&&(k.eq(m[0][0]).addClass(v[0]),1<p)))for(e=1;e<p;e++)k.eq(m[e][0]).addClass(v[e]||v[n])}),g.processTbody(d,a,!1);f=!1!==b.columns_thead?"thead tr":"";!1!==b.columns_tfoot&&(f+= (""===f?"":",")+"tfoot tr");if(f.length&&(l=s.find(f).children().removeClass(r),m&&m[0]&&(l.filter('[data-column="'+m[0][0]+'"]').addClass(v[0]),1<p)))for(e=1;e<p;e++)l.filter('[data-column="'+m[e][0]+'"]').addClass(v[e]||v[n]);c.debug&&g.benchmark("Applying Columns widget",j)},remove:function(d,c,b){var a=c.$tbodies,f=(b.columns||["primary","secondary","tertiary"]).join(" ");c.$headers.removeClass(f);c.$table.children("tfoot").children("tr").children("th, td").removeClass(f);for(c=0;c<a.length;c++)b= g.processTbody(d,a.eq(c),!0),b.children("tr").each(function(){h(this).children().removeClass(f)}),g.processTbody(d,b,!1)}});
-g.addWidget({id:"filter",priority:50,options:{filter_childRows:!1,filter_columnFilters:!0,filter_cssFilter:"tablesorter-filter",filter_formatter:null,filter_functions:null,filter_hideFilters:!1,filter_ignoreCase:!0,filter_liveSearch:!0,filter_reset:null,filter_searchDelay:300,filter_startsWith:!1,filter_useParsedData:!1,filter_serversideFiltering:!1,filter_regex:{regex:/^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/, child:/tablesorter-childRow/,type:/undefined|number/,exact:/(^[\"|\'|=])|([\"|\'|=]$)/g,nondigit:/[^\w,. \-()]/g,operators:/[<>=]/g}},format:function(d,c,b){if(c.parsers&&!c.$table.hasClass("hasFilters")){var a,f,k,l,j,n,r,e,u,s,t,m,p,v,y,q,I,z,D=g.formatFloat,J="",B=c.$headers,C=b.filter_cssFilter,w=c.$table.addClass("hasFilters"),G=w.find("tbody"),H=c.parsers.length,K,L,M,E=function(a){var f=h.isArray(a),e=f?a:g.getFilters(d),k=(e||[]).join("");f&&c.$filters.each(function(b,c){h(c).val(a[b]||"")}); b.filter_hideFilters&&w.find(".tablesorter-filter-row").trigger(""===k?"mouseleave":"mouseenter");if(!(J===k&&!1!==a))if(w.trigger("filterStart",[e]),c.showProcessing)setTimeout(function(){N(a,e,k);return!1},30);else return N(a,e,k),!1},N=function(p,l,n){var m,u,t,s,z,x,C,A,F;c.debug&&(C=new Date);for(k=0;k<G.length;k++)if(!G.eq(k).hasClass(c.cssInfoBlock)){p=g.processTbody(d,G.eq(k),!0);m=p.children("tr");z=m.length;if(""===n||b.filter_serversideFiltering)m.show().removeClass("filtered");else for(f= 0;f<z;f++)if(!b.filter_regex.child.test(m[f].className)){s=!0;t=m.eq(f).nextUntil("tr:not(."+c.cssChildRow+")");q=t.length&&b.filter_childRows?t.text():"";q=b.filter_ignoreCase?q.toLocaleLowerCase():q;u=m.eq(f).children("td");for(a=0;a<H;a++)if(l[a]){r=b.filter_useParsedData||K[a]?c.cache[k].normalized[f][a]:h.trim(u.eq(a).text());e=!b.filter_regex.type.test(typeof r)&&b.filter_ignoreCase?r.toLocaleLowerCase():r;x=s;j=b.filter_ignoreCase?l[a].toLocaleLowerCase():l[a];if(b.filter_functions&&b.filter_functions[a])!0=== b.filter_functions[a]?x=B.filter('[data-column="'+a+'"]:last').hasClass("filter-match")?0<=e.search(j):l[a]===r:"function"===typeof b.filter_functions[a]?x=b.filter_functions[a](r,c.cache[k].normalized[f][a],l[a],a):"function"===typeof b.filter_functions[a][l[a]]&&(x=b.filter_functions[a][l[a]](r,c.cache[k].normalized[f][a],l[a],a));else if(b.filter_regex.regex.test(j)){v=b.filter_regex.regex.exec(j);try{x=RegExp(v[1],v[2]).test(e)}catch(E){x=!1}}else if(j.replace(b.filter_regex.exact,"")==e)x=!0; else if(/^\!/.test(j))j=j.replace("!",""),y=e.search(h.trim(j)),x=""===j?!0:!(b.filter_startsWith?0===y:0<=y);else if(/^[<>]=?/.test(j))v=isNaN(e)?D(e.replace(b.filter_regex.nondigit,""),d):D(e,d),y=D(j.replace(b.filter_regex.nondigit,"").replace(b.filter_regex.operators,""),d),/>/.test(j)&&(x=/>=/.test(j)?v>=y:v>y),/</.test(j)&&(x=/<=/.test(j)?v<=y:v<y),""===y&&(x=!0);else if(/\s+(AND|&&)\s+/g.test(l[a])){y=j.split(/(?:\s+(?:and|&&)\s+)/g);x=0<=e.search(h.trim(y[0]));for(A=y.length-1;x&&A;)x=x&& 0<=e.search(h.trim(y[A])),A--}else/\s+(-|to)\s+/.test(j)?(v=isNaN(e)?D(e.replace(b.filter_regex.nondigit,""),d):D(e,d),y=j.split(/(?: - | to )/),A=D(y[0].replace(b.filter_regex.nondigit,""),d),F=D(y[1].replace(b.filter_regex.nondigit,""),d),A>F&&(x=A,A=F,F=x),x=v>=A&&v<=F||""===A||""===F?!0:!1):/[\?|\*]/.test(j)||/\s+OR\s+/.test(l[a])?x=RegExp(j.replace(/\s+or\s+/gi,"|").replace(/\?/g,"\\S{1}").replace(/\*/g,"\\S*")).test(e):(r=(e+q).indexOf(j),x=!b.filter_startsWith&&0<=r||b.filter_startsWith&&0=== r);s=x?s?!0:!1:!1}m[f].style.display=s?"":"none";m.eq(f)[s?"removeClass":"addClass"]("filtered");if(t.length)t[s?"show":"hide"]()}g.processTbody(d,p,!1)}J=n;w.data("lastSearch",l);c.debug&&g.benchmark("Completed filter widget search",C);w.trigger("applyWidgets");w.trigger("filterEnd")},O=function(a,e){var j,p=[];a=parseInt(a,10);j='<option value="">'+(B.filter('[data-column="'+a+'"]:last').attr("data-placeholder")||"")+"</option>";for(k=0;k<G.length;k++){l=c.cache[k].row.length;for(f=0;f<l;f++)b.filter_useParsedData? p.push(""+c.cache[k].normalized[f][a]):(q=c.cache[k].row[f][0].cells[a])&&p.push(h.trim(c.supportsTextContent?q.textContent:h(q).text()))}p=h.grep(p,function(a,b){return h.inArray(a,p)===b});p=g.sortText?p.sort(function(b,c){return g.sortText(d,b,c,a)}):p.sort(!0);for(k=0;k<p.length;k++)j+=""!==p[k]?'<option value="'+p[k].replace(/\"/g,"&quot;")+'">'+p[k]+"</option>":"";w.find("thead").find("select."+C+'[data-column="'+a+'"]')[e?"html":"append"](j)},P=function(c){for(a=0;a<H;a++)if(q=B.filter('[data-column="'+ a+'"]:last'),(q.hasClass("filter-select")||b.filter_functions&&!0===b.filter_functions[a])&&!q.hasClass("filter-false"))b.filter_functions||(b.filter_functions={}),b.filter_functions[a]=!0,O(a,c)};c.debug&&(L=new Date);b.filter_regex.child=RegExp(c.cssChildRow);if(!1!==b.filter_columnFilters&&B.filter(".filter-false").length!==B.length){q='<tr class="tablesorter-filter-row">';for(a=0;a<H;a++)q+="<td></td>";c.$filters=h(q+="</tr>").appendTo(w.find("thead").eq(0)).find("td");for(a=0;a<H;a++)I=!1,p= B.filter('[data-column="'+a+'"]:last'),n=b.filter_functions&&b.filter_functions[a]&&"function"!==typeof b.filter_functions[a]||p.hasClass("filter-select"),I=g.getData?"false"===g.getData(p[0],c.headers[a],"filter"):c.headers[a]&&c.headers[a].hasOwnProperty("filter")&&!1===c.headers[a].filter||p.hasClass("filter-false"),n?q=h("<select>").appendTo(c.$filters.eq(a)):(b.filter_formatter&&h.isFunction(b.filter_formatter[a])?((q=b.filter_formatter[a](c.$filters.eq(a),a))&&0===q.length&&(q=c.$filters.eq(a).children("input")), q&&(0===q.parent().length||q.parent().length&&q.parent()[0]!==c.$filters[a])&&c.$filters.eq(a).append(q)):q=h('<input type="search">').appendTo(c.$filters.eq(a)),q&&q.attr("placeholder",p.attr("data-placeholder")||"")),q&&(q.addClass(C).attr("data-column",a),I&&(q.addClass("disabled")[0].disabled=!0))}w.bind("addRows updateCell update updateRows updateComplete appendCache filterReset search ".split(" ").join(".tsfilter "),function(a,b){/(search|filterReset)/.test(a.type)||(a.stopPropagation(),P(!0)); "filterReset"===a.type&&w.find("."+C).val("");b="search"===a.type?b:"updateComplete"===a.type?w.data("lastSearch"):"";E(b);return!1}).find("input."+C).bind("keyup search",function(a,c){if(!("keyup"===a.type&&(32>a.which&&8!==a.which||37<=a.which&&40>=a.which||13!==a.which&&!b.filter_liveSearch)))if("undefined"===typeof c||!1===c)E();else return clearTimeout(M),M=setTimeout(function(){E(c)},b.filter_searchDelay),!1});K=B.map(function(a){return g.getData?"parsed"===g.getData(B.filter('[data-column="'+ a+'"]:last'),c.headers[a],"filter"):h(this).hasClass("filter-parsed")}).get();b.filter_reset&&h(b.filter_reset).length&&h(b.filter_reset).bind("click.tsfilter",function(){w.trigger("filterReset")});if(b.filter_functions)for(z in b.filter_functions)if(b.filter_functions.hasOwnProperty(z)&&"string"===typeof z)if(q=B.filter('[data-column="'+z+'"]:last'),n="",!0===b.filter_functions[z]&&!q.hasClass("filter-false"))O(z);else if("string"===typeof z&&!q.hasClass("filter-false")){for(s in b.filter_functions[z])"string"=== typeof s&&(n+=""===n?'<option value="">'+(q.attr("data-placeholder")||"")+"</option>":"",n+='<option value="'+s+'">'+s+"</option>");w.find("thead").find("select."+C+'[data-column="'+z+'"]').append(n)}P(!0);w.find("select."+C).bind("change search",function(a,b){E(b)});b.filter_hideFilters&&w.find(".tablesorter-filter-row").addClass("hideme").bind("mouseenter mouseleave",function(a){var c;t=h(this);clearTimeout(u);u=setTimeout(function(){/enter|over/.test(a.type)?t.removeClass("hideme"):h(document.activeElement).closest("tr")[0]!== t[0]&&(c=w.find("."+b.filter_cssFilter).map(function(){return h(this).val()||""}).get().join(""),""===c&&t.addClass("hideme"))},200)}).find("input, select").bind("focus blur",function(a){m=h(this).closest("tr");clearTimeout(u);u=setTimeout(function(){if(""===w.find("."+b.filter_cssFilter).map(function(){return h(this).val()||""}).get().join(""))m["focus"===a.type?"removeClass":"addClass"]("hideme")},200)});c.showProcessing&&w.bind("filterStart.tsfilter filterEnd.tsfilter",function(a,b){var d=b?w.find("."+ c.cssHeader).filter("[data-column]").filter(function(){return""!==b[h(this).data("column")]}):"";g.isProcessing(w[0],"filterStart"===a.type,b?d:"")});c.debug&&g.benchmark("Applying Filter widget",L);w.trigger("filterInit");E()}},remove:function(d,c,b){var a,f=c.$tbodies;c.$table.removeClass("hasFilters").unbind("addRows updateCell update updateComplete appendCache search filterStart filterEnd ".split(" ").join(".tsfilter ")).find(".tablesorter-filter-row").remove();for(c=0;c<f.length;c++)a=g.processTbody(d, f.eq(c),!0),a.children().removeClass("filtered").show(),g.processTbody(d,a,!1);b.filterreset&&h(b.filter_reset).unbind("click.tsfilter")}});
-g.getFilters=function(d){return(d=d?h(d)[0].config:{})&&d.$filters?d.$filters.find("."+d.widgetOptions.filter_cssFilter).map(function(c,b){return h(b).val()}).get()||[]:!1};
-g.setFilters=function(d,c,b){d=h(d);var a=d.length?d[0].config:{};(a=a&&a.$filters?a.$filters.find("."+a.widgetOptions.filter_cssFilter).each(function(a,b){h(b).val(c[a]||"")})||!1:!1)&&b&& d.trigger("search");return!!a};
-g.addWidget({id:"stickyHeaders",priority:60,options:{stickyHeaders:"tablesorter-stickyHeader",stickyHeaders_cloneId:"-sticky"},format:function(d,c,b){if(!c.$table.hasClass("hasStickyHeaders")){var a=c.$table,f=h(window),g=a.children("thead:first"),l=g.children("tr:not(.sticky-false)").children(),j=a.find("tfoot"),n=b.$sticky=a.clone().addClass("containsStickyHeaders").css({position:"fixed",margin:0,top:0,visibility:"hidden",zIndex:1}),r=n.children("thead:first").addClass(b.stickyHeaders), e,u="",s=0,t=!1,m=function(){var b=navigator.userAgent;s=0;"collapse"!==a.css("border-collapse")&&!/(webkit|msie)/i.test(b)&&(s=2*parseInt(l.eq(0).css("border-left-width"),10));n.css({left:g.offset().left-f.scrollLeft()-s,width:a.width()});e.filter(":visible").each(function(a){a=l.filter(":visible").eq(a);h(this).css({width:a.width()-s,height:a.height()}).find(".tablesorter-header-inner").width(a.find(".tablesorter-header-inner").width())})};n.attr("id")&&(n[0].id+=b.stickyHeaders_cloneId);n.find("thead:gt(0), tr.sticky-false, tbody, tfoot").remove(); e=r.children().children();n.css({height:0,width:0,padding:0,margin:0,border:0});e.find(".tablesorter-resizer").remove();a.addClass("hasStickyHeaders").bind("sortEnd.tsSticky",function(){l.filter(":visible").each(function(a){a=e.filter(":visible").eq(a);a.attr("class",h(this).attr("class")).removeClass(c.cssProcessing);c.cssIcon&&a.find("."+c.cssIcon).attr("class",h(this).find("."+c.cssIcon).attr("class"))})}).bind("pagerComplete.tsSticky",function(){m()});l.find(c.selectorSort).add(c.$headers.filter(c.selectorSort)).each(function(a){var b= h(this);r.children("tr.tablesorter-headerRow").children().eq(a).bind("mouseup",function(a){b.trigger(a,!0)}).bind("mousedown",function(){this.onselectstart=function(){return!1};return!1})});a.after(n);f.bind("scroll.tsSticky resize.tsSticky",function(b){if(a.is(":visible")){var c=a.offset(),d=f.scrollTop(),e=a.height()-(n.height()+(j.height()||0)),c=d>c.top&&d<c.top+e?"visible":"hidden";n.removeClass("tablesorter-sticky-visible tablesorter-sticky-hidden").addClass("tablesorter-sticky-"+c).css({left:g.offset().left- f.scrollLeft()-s,visibility:c});if(c!==u||"resize"===b.type)m(),u=c}});a.bind("filterEnd",function(){t||r.find(".tablesorter-filter-row").children().each(function(a){h(this).find("input, select").val(c.$filters.find("input, select").eq(a).val())})});e.find("input, select").bind("keyup search",function(a){if(!(32>a.which&&8!==a.which||37<=a.which&&40>=a.which)){t=!0;a=h(this);var d=a.attr("data-column");c.$filters.find("input, select").eq(d).val(a.val()).trigger("search");setTimeout(function(){t=!1}, b.filter_searchDelay)}})}},remove:function(d,c,b){c.$table.removeClass("hasStickyHeaders").unbind("sortEnd.tsSticky pagerComplete.tsSticky").find("."+b.stickyHeaders).remove();b.$sticky&&b.$sticky.remove();h(window).unbind("scroll.tsSticky resize.tsSticky")}});
-g.addWidget({id:"resizable",priority:40,options:{resizable:!0,resizable_addLastColumn:!1},format:function(d,c,b){if(!c.$table.hasClass("hasResizable")){c.$table.addClass("hasResizable");var a,f,k,l,j={},n,r,e,u,s=c.$table,t=0,m=null,p=null, v=20>Math.abs(s.parent().width()-s.width()),y=function(){g.storage&&m&&(j[m.index()]=m.width(),j[p.index()]=p.width(),m.width(j[m.index()]),p.width(j[p.index()]),!1!==b.resizable&&g.storage(d,"tablesorter-resizable",j));t=0;m=p=null;h(window).trigger("resize")};if(j=g.storage&&!1!==b.resizable?g.storage(d,"tablesorter-resizable"):{})for(l in j)!isNaN(l)&&l<c.$headers.length&&c.$headers.eq(l).width(j[l]);a=s.children("thead:first").children("tr");a.children().each(function(){f=h(this);k=f.attr("data-column"); l="false"===g.getData(f,c.headers[k],"resizable");a.children().filter('[data-column="'+k+'"]').toggleClass("resizable-false",l)});a.each(function(){n=h(this).children(":not(.resizable-false)");h(this).find(".tablesorter-wrapper").length||n.wrapInner('<div class="tablesorter-wrapper" style="position:relative;height:100%;width:100%"></div>');b.resizable_addLastColumn||(n=n.slice(0,-1));r=r?r.add(n):n});r.each(function(){a=h(this);l=parseInt(a.css("padding-right"),10)+10;f='<div class="tablesorter-resizer" style="cursor:w-resize;position:absolute;z-index:1;right:-'+ l+'px;top:0;height:100%;width:20px;"></div>';a.find(".tablesorter-wrapper").append(f)}).bind("mousemove.tsresize",function(a){0!==t&&m&&(e=a.pageX-t,u=m.width(),m.width(u+e),m.width()!==u&&v&&p.width(p.width()-e),t=a.pageX)}).bind("mouseup.tsresize",function(){y()}).find(".tablesorter-resizer,.tablesorter-resizer-grip").bind("mousedown",function(a){m=h(a.target).closest("th");f=c.$headers.filter('[data-column="'+m.attr("data-column")+'"]');1<f.length&&(m=m.add(f));p=a.shiftKey?m.parent().find("th:not(.resizable-false)").filter(":last"): m.nextAll(":not(.resizable-false)").eq(0);t=a.pageX});s.find("thead:first").bind("mouseup.tsresize mouseleave.tsresize",function(){y()}).bind("contextmenu.tsresize",function(){g.resizableReset(d);var a=h.isEmptyObject?h.isEmptyObject(j):j==={};j={};return a})}},remove:function(d,c){c.$table.removeClass("hasResizable").find("thead").unbind("mouseup.tsresize mouseleave.tsresize contextmenu.tsresize").find("tr").children().unbind("mousemove.tsresize mouseup.tsresize").find(".tablesorter-resizer,.tablesorter-resizer-grip").remove();
-g.resizableReset(d)}});g.resizableReset=function(d){d.config.$headers.filter(":not(.resizable-false)").css("width","");g.storage&&g.storage(d,"tablesorter-resizable",{})};
-g.addWidget({id:"saveSort",priority:20,options:{saveSort:!0},init:function(d,c,b,a){c.format(d,b,a,!0)},format:function(d,c,b,a){var f,k=c.$table;b=!1!==b.saveSort;var l={sortList:c.sortList};c.debug&&(f=new Date);k.hasClass("hasSaveSort")?b&&(d.hasInitialized&&g.storage)&&(g.storage(d,"tablesorter-savesort",l),c.debug&&g.benchmark("saveSort widget: Saving last sort: "+ c.sortList,f)):(k.addClass("hasSaveSort"),l="",g.storage&&(l=(b=g.storage(d,"tablesorter-savesort"))&&b.hasOwnProperty("sortList")&&h.isArray(b.sortList)?b.sortList:"",c.debug&&g.benchmark('saveSort: Last sort loaded: "'+l+'"',f),k.bind("saveSortReset",function(a){a.stopPropagation();g.storage(d,"tablesorter-savesort","")})),a&&l&&0<l.length?c.sortList=l:d.hasInitialized&&(l&&0<l.length)&&k.trigger("sorton",[l]))},remove:function(d){g.storage&&g.storage(d,"tablesorter-savesort","")}})
-})(jQuery);
diff --git a/resources/scripts/libs/moment.min.js b/resources/scripts/libs/moment.min.js
deleted file mode 100644
index 3d70be957..000000000
--- a/resources/scripts/libs/moment.min.js
+++ /dev/null
@@ -1,11 +0,0 @@
-define([], function() {
-
-	// moment.js
-	// version : 1.7.2
-	// author : Tim Wood
-	// license : MIT
-	// momentjs.com
-	(function(a){function E(a,b,c,d){var e=c.lang();return e[a].call?e[a](c,d):e[a][b]}function F(a,b){return function(c){return K(a.call(this,c),b)}}function G(a){return function(b){var c=a.call(this,b);return c+this.lang().ordinal(c)}}function H(a,b,c){this._d=a,this._isUTC=!!b,this._a=a._a||null,this._lang=c||!1}function I(a){var b=this._data={},c=a.years||a.y||0,d=a.months||a.M||0,e=a.weeks||a.w||0,f=a.days||a.d||0,g=a.hours||a.h||0,h=a.minutes||a.m||0,i=a.seconds||a.s||0,j=a.milliseconds||a.ms||0;this._milliseconds=j+i*1e3+h*6e4+g*36e5,this._days=f+e*7,this._months=d+c*12,b.milliseconds=j%1e3,i+=J(j/1e3),b.seconds=i%60,h+=J(i/60),b.minutes=h%60,g+=J(h/60),b.hours=g%24,f+=J(g/24),f+=e*7,b.days=f%30,d+=J(f/30),b.months=d%12,c+=J(d/12),b.years=c,this._lang=!1}function J(a){return a<0?Math.ceil(a):Math.floor(a)}function K(a,b){var c=a+"";while(c.length<b)c="0"+c;return c}function L(a,b,c){var d=b._milliseconds,e=b._days,f=b._months,g;d&&a._d.setTime(+a+d*c),e&&a.date(a.date()+e*c),f&&(g=a.date(),a.date(1).month(a.month()+f*c).date(Math.min(g,a.daysInMonth())))}function M(a){return Object.prototype.toString.call(a)==="[object Array]"}function N(a,b){var c=Math.min(a.length,b.length),d=Math.abs(a.length-b.length),e=0,f;for(f=0;f<c;f++)~~a[f]!==~~b[f]&&e++;return e+d}function O(a,b,c,d){var e,f,g=[];for(e=0;e<7;e++)g[e]=a[e]=a[e]==null?e===2?1:0:a[e];return a[7]=g[7]=b,a[8]!=null&&(g[8]=a[8]),a[3]+=c||0,a[4]+=d||0,f=new Date(0),b?(f.setUTCFullYear(a[0],a[1],a[2]),f.setUTCHours(a[3],a[4],a[5],a[6])):(f.setFullYear(a[0],a[1],a[2]),f.setHours(a[3],a[4],a[5],a[6])),f._a=g,f}function P(a,c){var d,e,g=[];!c&&h&&(c=require("./lang/"+a));for(d=0;d<i.length;d++)c[i[d]]=c[i[d]]||f.en[i[d]];for(d=0;d<12;d++)e=b([2e3,d]),g[d]=new RegExp("^"+(c.months[d]||c.months(e,""))+"|^"+(c.monthsShort[d]||c.monthsShort(e,"")).replace(".",""),"i");return c.monthsParse=c.monthsParse||g,f[a]=c,c}function Q(a){var c=typeof a=="string"&&a||a&&a._lang||null;return c?f[c]||P(c):b}function R(a){return a.match(/\[.*\]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function S(a){var b=a.match(k),c,d;for(c=0,d=b.length;c<d;c++)D[b[c]]?b[c]=D[b[c]]:b[c]=R(b[c]);return function(e){var f="";for(c=0;c<d;c++)f+=typeof b[c].call=="function"?b[c].call(e,a):b[c];return f}}function T(a,b){function d(b){return a.lang().longDateFormat[b]||b}var c=5;while(c--&&l.test(b))b=b.replace(l,d);return A[b]||(A[b]=S(b)),A[b](a)}function U(a){switch(a){case"DDDD":return p;case"YYYY":return q;case"S":case"SS":case"SSS":case"DDD":return o;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":case"a":case"A":return r;case"Z":case"ZZ":return s;case"T":return t;case"MM":case"DD":case"YY":case"HH":case"hh":case"mm":case"ss":case"M":case"D":case"d":case"H":case"h":case"m":case"s":return n;default:return new RegExp(a.replace("\\",""))}}function V(a,b,c,d){var e,f;switch(a){case"M":case"MM":c[1]=b==null?0:~~b-1;break;case"MMM":case"MMMM":for(e=0;e<12;e++)if(Q().monthsParse[e].test(b)){c[1]=e,f=!0;break}f||(c[8]=!1);break;case"D":case"DD":case"DDD":case"DDDD":b!=null&&(c[2]=~~b);break;case"YY":c[0]=~~b+(~~b>70?1900:2e3);break;case"YYYY":c[0]=~~Math.abs(b);break;case"a":case"A":d.isPm=(b+"").toLowerCase()==="pm";break;case"H":case"HH":case"h":case"hh":c[3]=~~b;break;case"m":case"mm":c[4]=~~b;break;case"s":case"ss":c[5]=~~b;break;case"S":case"SS":case"SSS":c[6]=~~(("0."+b)*1e3);break;case"Z":case"ZZ":d.isUTC=!0,e=(b+"").match(x),e&&e[1]&&(d.tzh=~~e[1]),e&&e[2]&&(d.tzm=~~e[2]),e&&e[0]==="+"&&(d.tzh=-d.tzh,d.tzm=-d.tzm)}b==null&&(c[8]=!1)}function W(a,b){var c=[0,0,1,0,0,0,0],d={tzh:0,tzm:0},e=b.match(k),f,g;for(f=0;f<e.length;f++)g=(U(e[f]).exec(a)||[])[0],g&&(a=a.slice(a.indexOf(g)+g.length)),D[e[f]]&&V(e[f],g,c,d);return d.isPm&&c[3]<12&&(c[3]+=12),d.isPm===!1&&c[3]===12&&(c[3]=0),O(c,d.isUTC,d.tzh,d.tzm)}function X(a,b){var c,d=a.match(m)||[],e,f=99,g,h,i;for(g=0;g<b.length;g++)h=W(a,b[g]),e=T(new H(h),b[g]).match(m)||[],i=N(d,e),i<f&&(f=i,c=h);return c}function Y(a){var b="YYYY-MM-DDT",c;if(u.exec(a)){for(c=0;c<4;c++)if(w[c][1].exec(a)){b+=w[c][0];break}return s.exec(a)?W(a,b+" Z"):W(a,b)}return new Date(a)}function Z(a,b,c,d,e){var f=e.relativeTime[a];return typeof f=="function"?f(b||1,!!c,a,d):f.replace(/%d/i,b||1)}function $(a,b,c){var e=d(Math.abs(a)/1e3),f=d(e/60),g=d(f/60),h=d(g/24),i=d(h/365),j=e<45&&["s",e]||f===1&&["m"]||f<45&&["mm",f]||g===1&&["h"]||g<22&&["hh",g]||h===1&&["d"]||h<=25&&["dd",h]||h<=45&&["M"]||h<345&&["MM",d(h/30)]||i===1&&["y"]||["yy",i];return j[2]=b,j[3]=a>0,j[4]=c,Z.apply({},j)}function _(a,c){b.fn[a]=function(a){var b=this._isUTC?"UTC":"";return a!=null?(this._d["set"+b+c](a),this):this._d["get"+b+c]()}}function ab(a){b.duration.fn[a]=function(){return this._data[a]}}function bb(a,c){b.duration.fn["as"+a]=function(){return+this/c}}var b,c="1.7.2",d=Math.round,e,f={},g="en",h=typeof module!="undefined"&&module.exports,i="months|monthsShort|weekdays|weekdaysShort|weekdaysMin|longDateFormat|calendar|relativeTime|ordinal|meridiem".split("|"),j=/^\/?Date\((\-?\d+)/i,k=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|zz?|ZZ?|.)/g,l=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?)/g,m=/([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi,n=/\d\d?/,o=/\d{1,3}/,p=/\d{3}/,q=/\d{1,4}/,r=/[0-9a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+/i,s=/Z|[\+\-]\d\d:?\d\d/i,t=/T/i,u=/^\s*\d{4}-\d\d-\d\d(T(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/,v="YYYY-MM-DDTHH:mm:ssZ",w=[["HH:mm:ss.S",/T\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/T\d\d:\d\d:\d\d/],["HH:mm",/T\d\d:\d\d/],["HH",/T\d\d/]],x=/([\+\-]|\d\d)/gi,y="Month|Date|Hours|Minutes|Seconds|Milliseconds".split("|"),z={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6},A={},B="DDD w M D d".split(" "),C="M D H h m s w".split(" "),D={M:function(){return this.month()+1},MMM:function(a){return E("monthsShort",this.month(),this,a)},MMMM:function(a){return E("months",this.month(),this,a)},D:function(){return this.date()},DDD:function(){var a=new Date(this.year(),this.month(),this.date()),b=new Date(this.year(),0,1);return~~((a-b)/864e5+1.5)},d:function(){return this.day()},dd:function(a){return E("weekdaysMin",this.day(),this,a)},ddd:function(a){return E("weekdaysShort",this.day(),this,a)},dddd:function(a){return E("weekdays",this.day(),this,a)},w:function(){var a=new Date(this.year(),this.month(),this.date()-this.day()+5),b=new Date(a.getFullYear(),0,4);return~~((a-b)/864e5/7+1.5)},YY:function(){return K(this.year()%100,2)},YYYY:function(){return K(this.year(),4)},a:function(){return this.lang().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.lang().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours()%12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return~~(this.milliseconds()/100)},SS:function(){return K(~~(this.milliseconds()/10),2)},SSS:function(){return K(this.milliseconds(),3)},Z:function(){var a=-this.zone(),b="+";return a<0&&(a=-a,b="-"),b+K(~~(a/60),2)+":"+K(~~a%60,2)},ZZ:function(){var a=-this.zone(),b="+";return a<0&&(a=-a,b="-"),b+K(~~(10*a/6),4)}};while(B.length)e=B.pop(),D[e+"o"]=G(D[e]);while(C.length)e=C.pop(),D[e+e]=F(D[e],2);D.DDDD=F(D.DDD,3),b=function(c,d){if(c===null||c==="")return null;var e,f;return b.isMoment(c)?new H(new Date(+c._d),c._isUTC,c._lang):(d?M(d)?e=X(c,d):e=W(c,d):(f=j.exec(c),e=c===a?new Date:f?new Date(+f[1]):c instanceof Date?c:M(c)?O(c):typeof c=="string"?Y(c):new Date(c)),new H(e))},b.utc=function(a,c){return M(a)?new H(O(a,!0),!0):(typeof a=="string"&&!s.exec(a)&&(a+=" +0000",c&&(c+=" Z")),b(a,c).utc())},b.unix=function(a){return b(a*1e3)},b.duration=function(a,c){var d=b.isDuration(a),e=typeof a=="number",f=d?a._data:e?{}:a,g;return e&&(c?f[c]=a:f.milliseconds=a),g=new I(f),d&&(g._lang=a._lang),g},b.humanizeDuration=function(a,c,d){return b.duration(a,c===!0?null:c).humanize(c===!0?!0:d)},b.version=c,b.defaultFormat=v,b.lang=function(a,c){var d;if(!a)return g;(c||!f[a])&&P(a,c);if(f[a]){for(d=0;d<i.length;d++)b[i[d]]=f[a][i[d]];b.monthsParse=f[a].monthsParse,g=a}},b.langData=Q,b.isMoment=function(a){return a instanceof H},b.isDuration=function(a){return a instanceof I},b.lang("en",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D YYYY",LLL:"MMMM D YYYY LT",LLLL:"dddd, MMMM D YYYY LT"},meridiem:function(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinal:function(a){var b=a%10;return~~(a%100/10)===1?"th":b===1?"st":b===2?"nd":b===3?"rd":"th"}}),b.fn=H.prototype={clone:function(){return b(this)},valueOf:function(){return+this._d},unix:function(){return Math.floor(+this._d/1e3)},toString:function(){return this._d.toString()},toDate:function(){return this._d},toArray:function(){var a=this;return[a.year(),a.month(),a.date(),a.hours(),a.minutes(),a.seconds(),a.milliseconds(),!!this._isUTC]},isValid:function(){return this._a?this._a[8]!=null?!!this._a[8]:!N(this._a,(this._a[7]?b.utc(this._a):b(this._a)).toArray()):!isNaN(this._d.getTime())},utc:function(){return this._isUTC=!0,this},local:function(){return this._isUTC=!1,this},format:function(a){return T(this,a?a:b.defaultFormat)},add:function(a,c){var d=c?b.duration(+c,a):b.duration(a);return L(this,d,1),this},subtract:function(a,c){var d=c?b.duration(+c,a):b.duration(a);return L(this,d,-1),this},diff:function(a,c,e){var f=this._isUTC?b(a).utc():b(a).local(),g=(this.zone()-f.zone())*6e4,h=this._d-f._d-g,i=this.year()-f.year(),j=this.month()-f.month(),k=this.date()-f.date(),l;return c==="months"?l=i*12+j+k/30:c==="years"?l=i+(j+k/30)/12:l=c==="seconds"?h/1e3:c==="minutes"?h/6e4:c==="hours"?h/36e5:c==="days"?h/864e5:c==="weeks"?h/6048e5:h,e?l:d(l)},from:function(a,c){return b.duration(this.diff(a)).lang(this._lang).humanize(!c)},fromNow:function(a){return this.from(b(),a)},calendar:function(){var a=this.diff(b().sod(),"days",!0),c=this.lang().calendar,d=c.sameElse,e=a<-6?d:a<-1?c.lastWeek:a<0?c.lastDay:a<1?c.sameDay:a<2?c.nextDay:a<7?c.nextWeek:d;return this.format(typeof e=="function"?e.apply(this):e)},isLeapYear:function(){var a=this.year();return a%4===0&&a%100!==0||a%400===0},isDST:function(){return this.zone()<b([this.year()]).zone()||this.zone()<b([this.year(),5]).zone()},day:function(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return a==null?b:this.add({d:a-b})},startOf:function(a){switch(a.replace(/s$/,"")){case"year":this.month(0);case"month":this.date(1);case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return this},endOf:function(a){return this.startOf(a).add(a.replace(/s?$/,"s"),1).subtract("ms",1)},sod:function(){return this.clone().startOf("day")},eod:function(){return this.clone().endOf("day")},zone:function(){return this._isUTC?0:this._d.getTimezoneOffset()},daysInMonth:function(){return b.utc([this.year(),this.month()+1,0]).date()},lang:function(b){return b===a?Q(this):(this._lang=b,this)}};for(e=0;e<y.length;e++)_(y[e].toLowerCase(),y[e]);_("year","FullYear"),b.duration.fn=I.prototype={weeks:function(){return J(this.days()/7)},valueOf:function(){return this._milliseconds+this._days*864e5+this._months*2592e6},humanize:function(a){var b=+this,c=this.lang().relativeTime,d=$(b,!a,this.lang()),e=b<=0?c.past:c.future;return a&&(typeof e=="function"?d=e(d):d=e.replace(/%s/i,d)),d},lang:b.fn.lang};for(e in z)z.hasOwnProperty(e)&&(bb(e,z[e]),ab(e.toLowerCase()));bb("Weeks",6048e5),h&&(module.exports=b),typeof ender=="undefined"&&(this.moment=b),typeof define=="function"&&define.amd&&define("moment",[],function(){return b})}).call(this);
-
-	return moment;
-});
\ No newline at end of file
diff --git a/resources/scripts/libs/require.js b/resources/scripts/libs/require.js
deleted file mode 100644
index 2db0138e2..000000000
--- a/resources/scripts/libs/require.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- RequireJS 2.0.2 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
- Available via the MIT or new BSD license.
- see: http://github.com/jrburke/requirejs for details
-*/
-var requirejs,require,define;
-(function(Z){function w(b){return J.call(b)==="[object Function]"}function G(b){return J.call(b)==="[object Array]"}function q(b,d){if(b){var f;for(f=0;f<b.length;f+=1)if(b[f]&&d(b[f],f,b))break}}function N(b,d){if(b){var f;for(f=b.length-1;f>-1;f-=1)if(b[f]&&d(b[f],f,b))break}}function x(b,d){for(var f in b)if(b.hasOwnProperty(f)&&d(b[f],f))break}function K(b,d,f,g){d&&x(d,function(d,k){if(f||!b.hasOwnProperty(k))g&&typeof d!=="string"?(b[k]||(b[k]={}),K(b[k],d,f,g)):b[k]=d});return b}function s(b,
-d){return function(){return d.apply(b,arguments)}}function $(b){if(!b)return b;var d=Z;q(b.split("."),function(b){d=d[b]});return d}function aa(b,d,f){return function(){var g=ga.call(arguments,0),e;if(f&&w(e=g[g.length-1]))e.__requireJsBuild=!0;g.push(d);return b.apply(null,g)}}function ba(b,d,f){q([["toUrl"],["undef"],["defined","requireDefined"],["specified","requireSpecified"]],function(g){var e=g[1]||g[0];b[g[0]]=d?aa(d[e],f):function(){var b=t[O];return b[e].apply(b,arguments)}})}function H(b,
-d,f,g){d=Error(d+"\nhttp://requirejs.org/docs/errors.html#"+b);d.requireType=b;d.requireModules=g;if(f)d.originalError=f;return d}function ha(){if(I&&I.readyState==="interactive")return I;N(document.getElementsByTagName("script"),function(b){if(b.readyState==="interactive")return I=b});return I}var ia=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,ja=/require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,ca=/\.js$/,ka=/^\.\//,J=Object.prototype.toString,y=Array.prototype,ga=y.slice,la=y.splice,u=!!(typeof window!==
-"undefined"&&navigator&&document),da=!u&&typeof importScripts!=="undefined",ma=u&&navigator.platform==="PLAYSTATION 3"?/^complete$/:/^(complete|loaded)$/,O="_",S=typeof opera!=="undefined"&&opera.toString()==="[object Opera]",t={},p={},P=[],L=!1,k,v,C,z,D,I,E,ea,fa;if(typeof define==="undefined"){if(typeof requirejs!=="undefined"){if(w(requirejs))return;p=requirejs;requirejs=void 0}typeof require!=="undefined"&&!w(require)&&(p=require,require=void 0);k=requirejs=function(b,d,f,g){var e=O,r;!G(b)&&
-typeof b!=="string"&&(r=b,G(d)?(b=d,d=f,f=g):b=[]);if(r&&r.context)e=r.context;(g=t[e])||(g=t[e]=k.s.newContext(e));r&&g.configure(r);return g.require(b,d,f)};k.config=function(b){return k(b)};require||(require=k);k.version="2.0.2";k.jsExtRegExp=/^\/|:|\?|\.js$/;k.isBrowser=u;y=k.s={contexts:t,newContext:function(b){function d(a,c,l){var A=c&&c.split("/"),b=m.map,i=b&&b["*"],h,d,f,e;if(a&&a.charAt(0)===".")if(c){A=m.pkgs[c]?[c]:A.slice(0,A.length-1);c=a=A.concat(a.split("/"));for(h=0;c[h];h+=1)if(d=
-c[h],d===".")c.splice(h,1),h-=1;else if(d==="..")if(h===1&&(c[2]===".."||c[0]===".."))break;else h>0&&(c.splice(h-1,2),h-=2);h=m.pkgs[c=a[0]];a=a.join("/");h&&a===c+"/"+h.main&&(a=c)}else a.indexOf("./")===0&&(a=a.substring(2));if(l&&(A||i)&&b){c=a.split("/");for(h=c.length;h>0;h-=1){f=c.slice(0,h).join("/");if(A)for(d=A.length;d>0;d-=1)if(l=b[A.slice(0,d).join("/")])if(l=l[f]){e=l;break}!e&&i&&i[f]&&(e=i[f]);if(e){c.splice(0,h,e);a=c.join("/");break}}}return a}function f(a){u&&q(document.getElementsByTagName("script"),
-function(c){if(c.getAttribute("data-requiremodule")===a&&c.getAttribute("data-requirecontext")===j.contextName)return c.parentNode.removeChild(c),!0})}function g(a){var c=m.paths[a];if(c&&G(c)&&c.length>1)return f(a),c.shift(),j.undef(a),j.require([a]),!0}function e(a,c,l,b){var T=a?a.indexOf("!"):-1,i=null,h=c?c.name:null,f=a,e=!0,g="",k,m;a||(e=!1,a="_@r"+(N+=1));T!==-1&&(i=a.substring(0,T),a=a.substring(T+1,a.length));i&&(i=d(i,h,b),m=o[i]);a&&(i?g=m&&m.normalize?m.normalize(a,function(a){return d(a,
-h,b)}):d(a,h,b):(g=d(a,h,b),k=j.nameToUrl(a,null,c)));a=i&&!m&&!l?"_unnormalized"+(O+=1):"";return{prefix:i,name:g,parentMap:c,unnormalized:!!a,url:k,originalName:f,isDefine:e,id:(i?i+"!"+g:g)+a}}function r(a){var c=a.id,l=n[c];l||(l=n[c]=new j.Module(a));return l}function p(a,c,l){var b=a.id,d=n[b];if(o.hasOwnProperty(b)&&(!d||d.defineEmitComplete))c==="defined"&&l(o[b]);else r(a).on(c,l)}function B(a,c){var l=a.requireModules,b=!1;if(c)c(a);else if(q(l,function(c){if(c=n[c])c.error=a,c.events.error&&
-(b=!0,c.emit("error",a))}),!b)k.onError(a)}function v(){P.length&&(la.apply(F,[F.length-1,0].concat(P)),P=[])}function t(a,c,l){a=a&&a.map;c=aa(l||j.require,a,c);ba(c,j,a);c.isBrowser=u;return c}function y(a){delete n[a];q(M,function(c,l){if(c.map.id===a)return M.splice(l,1),c.defined||(j.waitCount-=1),!0})}function z(a,c){var l=a.map.id,b=a.depMaps,d;if(a.inited){if(c[l])return a;c[l]=!0;q(b,function(a){if(a=n[a.id])return!a.inited||!a.enabled?(d=null,delete c[l],!0):d=z(a,K({},c))});return d}}function C(a,
-c,b){var d=a.map.id,e=a.depMaps;if(a.inited&&a.map.isDefine){if(c[d])return o[d];c[d]=a;q(e,function(i){var i=i.id,h=n[i];!Q[i]&&h&&(!h.inited||!h.enabled?b[d]=!0:(h=C(h,c,b),b[i]||a.defineDepById(i,h)))});a.check(!0);return o[d]}}function D(a){a.check()}function E(){var a=m.waitSeconds*1E3,c=a&&j.startTime+a<(new Date).getTime(),b=[],d=!1,e=!0,i,h,k;if(!U){U=!0;x(n,function(a){i=a.map;h=i.id;if(a.enabled&&!a.error)if(!a.inited&&c)g(h)?d=k=!0:(b.push(h),f(h));else if(!a.inited&&a.fetched&&i.isDefine&&
-(d=!0,!i.prefix))return e=!1});if(c&&b.length)return a=H("timeout","Load timeout for modules: "+b,null,b),a.contextName=j.contextName,B(a);e&&(q(M,function(a){if(!a.defined){var a=z(a,{}),c={};a&&(C(a,c,{}),x(c,D))}}),x(n,D));if((!c||k)&&d)if((u||da)&&!V)V=setTimeout(function(){V=0;E()},50);U=!1}}function W(a){r(e(a[0],null,!0)).init(a[1],a[2])}function J(a){var a=a.currentTarget||a.srcElement,c=j.onScriptLoad;a.detachEvent&&!S?a.detachEvent("onreadystatechange",c):a.removeEventListener("load",c,
-!1);c=j.onScriptError;a.detachEvent&&!S||a.removeEventListener("error",c,!1);return{node:a,id:a&&a.getAttribute("data-requiremodule")}}var m={waitSeconds:7,baseUrl:"./",paths:{},pkgs:{},shim:{}},n={},X={},F=[],o={},R={},N=1,O=1,M=[],U,Y,j,Q,V;Q={require:function(a){return t(a)},exports:function(a){a.usingExports=!0;if(a.map.isDefine)return a.exports=o[a.map.id]={}},module:function(a){return a.module={id:a.map.id,uri:a.map.url,config:function(){return m.config&&m.config[a.map.id]||{}},exports:o[a.map.id]}}};
-Y=function(a){this.events=X[a.id]||{};this.map=a;this.shim=m.shim[a.id];this.depExports=[];this.depMaps=[];this.depMatched=[];this.pluginMaps={};this.depCount=0};Y.prototype={init:function(a,c,b,d){d=d||{};if(!this.inited){this.factory=c;if(b)this.on("error",b);else this.events.error&&(b=s(this,function(a){this.emit("error",a)}));this.depMaps=a&&a.slice(0);this.depMaps.rjsSkipMap=a.rjsSkipMap;this.errback=b;this.inited=!0;this.ignore=d.ignore;d.enabled||this.enabled?this.enable():this.check()}},defineDepById:function(a,
-c){var b;q(this.depMaps,function(c,d){if(c.id===a)return b=d,!0});return this.defineDep(b,c)},defineDep:function(a,c){this.depMatched[a]||(this.depMatched[a]=!0,this.depCount-=1,this.depExports[a]=c)},fetch:function(){if(!this.fetched){this.fetched=!0;j.startTime=(new Date).getTime();var a=this.map;if(this.shim)t(this,!0)(this.shim.deps||[],s(this,function(){return a.prefix?this.callPlugin():this.load()}));else return a.prefix?this.callPlugin():this.load()}},load:function(){var a=this.map.url;R[a]||
-(R[a]=!0,j.load(this.map.id,a))},check:function(a){if(this.enabled&&!this.enabling){var c=this.map.id,b=this.depExports,d=this.exports,e=this.factory,i;if(this.inited)if(this.error)this.emit("error",this.error);else{if(!this.defining){this.defining=!0;if(this.depCount<1&&!this.defined){if(w(e)){if(this.events.error)try{d=j.execCb(c,e,b,d)}catch(h){i=h}else d=j.execCb(c,e,b,d);if(this.map.isDefine)if((b=this.module)&&b.exports!==void 0&&b.exports!==this.exports)d=b.exports;else if(d===void 0&&this.usingExports)d=
-this.exports;if(i)return i.requireMap=this.map,i.requireModules=[this.map.id],i.requireType="define",B(this.error=i)}else d=e;this.exports=d;if(this.map.isDefine&&!this.ignore&&(o[c]=d,k.onResourceLoad))k.onResourceLoad(j,this.map,this.depMaps);delete n[c];this.defined=!0;j.waitCount-=1;j.waitCount===0&&(M=[])}this.defining=!1;if(!a&&this.defined&&!this.defineEmitted)this.defineEmitted=!0,this.emit("defined",this.exports),this.defineEmitComplete=!0}}else this.fetch()}},callPlugin:function(){var a=
-this.map,c=a.id,b=e(a.prefix,null,!1,!0);p(b,"defined",s(this,function(b){var l=this.map.name,i=this.map.parentMap?this.map.parentMap.name:null;if(this.map.unnormalized){if(b.normalize&&(l=b.normalize(l,function(a){return d(a,i,!0)})||""),b=e(a.prefix+"!"+l,this.map.parentMap,!1,!0),p(b,"defined",s(this,function(a){this.init([],function(){return a},null,{enabled:!0,ignore:!0})})),b=n[b.id]){if(this.events.error)b.on("error",s(this,function(a){this.emit("error",a)}));b.enable()}}else l=s(this,function(a){this.init([],
-function(){return a},null,{enabled:!0})}),l.error=s(this,function(a){this.inited=!0;this.error=a;a.requireModules=[c];x(n,function(a){a.map.id.indexOf(c+"_unnormalized")===0&&y(a.map.id)});B(a)}),l.fromText=function(a,c){var b=L;b&&(L=!1);r(e(a));k.exec(c);b&&(L=!0);j.completeLoad(a)},b.load(a.name,t(a.parentMap,!0,function(a,c){a.rjsSkipMap=!0;return j.require(a,c)}),l,m)}));j.enable(b,this);this.pluginMaps[b.id]=b},enable:function(){this.enabled=!0;if(!this.waitPushed)M.push(this),j.waitCount+=
-1,this.waitPushed=!0;this.enabling=!0;q(this.depMaps,s(this,function(a,c){var b,d;if(typeof a==="string"){a=e(a,this.map.isDefine?this.map:this.map.parentMap,!1,!this.depMaps.rjsSkipMap);this.depMaps[c]=a;if(b=Q[a.id]){this.depExports[c]=b(this);return}this.depCount+=1;p(a,"defined",s(this,function(a){this.defineDep(c,a);this.check()}));this.errback&&p(a,"error",this.errback)}b=a.id;d=n[b];!Q[b]&&d&&!d.enabled&&j.enable(a,this)}));x(this.pluginMaps,s(this,function(a){var c=n[a.id];c&&!c.enabled&&
-j.enable(a,this)}));this.enabling=!1;this.check()},on:function(a,c){var b=this.events[a];b||(b=this.events[a]=[]);b.push(c)},emit:function(a,c){q(this.events[a],function(a){a(c)});a==="error"&&delete this.events[a]}};return j={config:m,contextName:b,registry:n,defined:o,urlFetched:R,waitCount:0,defQueue:F,Module:Y,makeModuleMap:e,configure:function(a){a.baseUrl&&a.baseUrl.charAt(a.baseUrl.length-1)!=="/"&&(a.baseUrl+="/");var c=m.pkgs,b=m.shim,d=m.paths,f=m.map;K(m,a,!0);m.paths=K(d,a.paths,!0);if(a.map)m.map=
-K(f||{},a.map,!0,!0);if(a.shim)x(a.shim,function(a,c){G(a)&&(a={deps:a});if(a.exports&&!a.exports.__buildReady)a.exports=j.makeShimExports(a.exports);b[c]=a}),m.shim=b;if(a.packages)q(a.packages,function(a){a=typeof a==="string"?{name:a}:a;c[a.name]={name:a.name,location:a.location||a.name,main:(a.main||"main").replace(ka,"").replace(ca,"")}}),m.pkgs=c;x(n,function(a,c){a.map=e(c)});if(a.deps||a.callback)j.require(a.deps||[],a.callback)},makeShimExports:function(a){var c;return typeof a==="string"?
-(c=function(){return $(a)},c.exports=a,c):function(){return a.apply(Z,arguments)}},requireDefined:function(a,c){var b=e(a,c,!1,!0).id;return o.hasOwnProperty(b)},requireSpecified:function(a,c){a=e(a,c,!1,!0).id;return o.hasOwnProperty(a)||n.hasOwnProperty(a)},require:function(a,c,d,f){var g;if(typeof a==="string"){if(w(c))return B(H("requireargs","Invalid require call"),d);if(k.get)return k.get(j,a,c);a=e(a,c,!1,!0);a=a.id;return!o.hasOwnProperty(a)?B(H("notloaded",'Module name "'+a+'" has not been loaded yet for context: '+
-b)):o[a]}d&&!w(d)&&(f=d,d=void 0);c&&!w(c)&&(f=c,c=void 0);for(v();F.length;)if(g=F.shift(),g[0]===null)return B(H("mismatch","Mismatched anonymous define() module: "+g[g.length-1]));else W(g);r(e(null,f)).init(a,c,d,{enabled:!0});E();return j.require},undef:function(a){var c=e(a,null,!0),b=n[a];delete o[a];delete R[c.url];delete X[a];if(b){if(b.events.defined)X[a]=b.events;y(a)}},enable:function(a){n[a.id]&&r(a).enable()},completeLoad:function(a){var c=m.shim[a]||{},b=c.exports&&c.exports.exports,
-d,e;for(v();F.length;){e=F.shift();if(e[0]===null){e[0]=a;if(d)break;d=!0}else e[0]===a&&(d=!0);W(e)}e=n[a];if(!d&&!o[a]&&e&&!e.inited)if(m.enforceDefine&&(!b||!$(b)))if(g(a))return;else return B(H("nodefine","No define call for "+a,null,[a]));else W([a,c.deps||[],c.exports]);E()},toUrl:function(a,b){var d=a.lastIndexOf("."),e=null;d!==-1&&(e=a.substring(d,a.length),a=a.substring(0,d));return j.nameToUrl(a,e,b)},nameToUrl:function(a,b,e){var f,g,i,h,j,a=d(a,e&&e.id,!0);if(k.jsExtRegExp.test(a))b=
-a+(b||"");else{f=m.paths;g=m.pkgs;e=a.split("/");for(h=e.length;h>0;h-=1)if(j=e.slice(0,h).join("/"),i=g[j],j=f[j]){G(j)&&(j=j[0]);e.splice(0,h,j);break}else if(i){a=a===i.name?i.location+"/"+i.main:i.location;e.splice(0,h,a);break}b=e.join("/")+(b||".js");b=(b.charAt(0)==="/"||b.match(/^[\w\+\.\-]+:/)?"":m.baseUrl)+b}return m.urlArgs?b+((b.indexOf("?")===-1?"?":"&")+m.urlArgs):b},load:function(a,b){k.load(j,a,b)},execCb:function(a,b,d,e){return b.apply(e,d)},onScriptLoad:function(a){if(a.type===
-"load"||ma.test((a.currentTarget||a.srcElement).readyState))I=null,a=J(a),j.completeLoad(a.id)},onScriptError:function(a){var b=J(a);if(!g(b.id))return B(H("scripterror","Script error",a,[b.id]))}}}};k({});ba(k);if(u&&(v=y.head=document.getElementsByTagName("head")[0],C=document.getElementsByTagName("base")[0]))v=y.head=C.parentNode;k.onError=function(b){throw b;};k.load=function(b,d,f){var g=b&&b.config||{},e;if(u)return e=g.xhtml?document.createElementNS("http://www.w3.org/1999/xhtml","html:script"):
-document.createElement("script"),e.type=g.scriptType||"text/javascript",e.charset="utf-8",e.setAttribute("data-requirecontext",b.contextName),e.setAttribute("data-requiremodule",d),e.attachEvent&&!(e.attachEvent.toString&&e.attachEvent.toString().indexOf("[native code")<0)&&!S?(L=!0,e.attachEvent("onreadystatechange",b.onScriptLoad)):(e.addEventListener("load",b.onScriptLoad,!1),e.addEventListener("error",b.onScriptError,!1)),e.src=f,E=e,C?v.insertBefore(e,C):v.appendChild(e),E=null,e;else da&&(importScripts(f),
-b.completeLoad(d))};u&&N(document.getElementsByTagName("script"),function(b){if(!v)v=b.parentNode;if(z=b.getAttribute("data-main")){D=z.split("/");ea=D.pop();fa=D.length?D.join("/")+"/":"./";if(!p.baseUrl)p.baseUrl=fa;z=ea.replace(ca,"");p.deps=p.deps?p.deps.concat(z):[z];return!0}});define=function(b,d,f){var g,e;typeof b!=="string"&&(f=d,d=b,b=null);G(d)||(f=d,d=[]);!d.length&&w(f)&&f.length&&(f.toString().replace(ia,"").replace(ja,function(b,e){d.push(e)}),d=(f.length===1?["require"]:["require",
-"exports","module"]).concat(d));if(L&&(g=E||ha()))b||(b=g.getAttribute("data-requiremodule")),e=t[g.getAttribute("data-requirecontext")];(e?e.defQueue:P).push([b,d,f])};define.amd={jQuery:!0};k.exec=function(b){return eval(b)};k(p)}})(this);
diff --git a/resources/scripts/libs/rsv.js b/resources/scripts/libs/rsv.js
deleted file mode 100644
index e9a54dd4d..000000000
--- a/resources/scripts/libs/rsv.js
+++ /dev/null
@@ -1,243 +0,0 @@
-/**
- * rsv.js - Really Simple Validation
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * v2.5.2, Jan 30 2010 - http://www.benjaminkeen.com/software/rsv
- */
-
-if(typeof rsv=='undefined') rsv={};
-
-// SETTINGS
-rsv.displayType="alert-all";
-rsv.errorFieldClass=null;
-rsv.errorTextIntro="Please fix the following error(s) and resubmit:";
-rsv.errorJSItemBullet="* ";
-rsv.errorHTMLItemBullet="&bull; ";
-rsv.errorTargetElementId="rsvErrors";
-rsv.customErrorHandler=null;
-rsv.onCompleteHandler=null;
-
-// ~~~~~~~~~~~~~~~~~~~~~~~
-
-rsv.validate=function(form,rules)
-{rsv.returnHash=[];for(var i=0;i<rules.length;i++)
-{var row=rules[i].replace(/\\,/ig,"%%C%%");row=row.split(",");var satisfiesIfConditions=true;while(row[0].match("^if:"))
-{var cond=row[0];cond=cond.replace("if:","");var comparison="equal";var parts=[];if(cond.search("!=")!=-1)
-{parts=cond.split("!=");comparison="not_equal";}
-else
-parts=cond.split("=");var fieldToCheck=parts[0];var valueToCheck=parts[1];var fieldnameValue="";if(form[fieldToCheck].type==undefined)
-{for(var j=0;j<form[fieldToCheck].length;j++)
-{if(form[fieldToCheck][j].checked)
-fieldnameValue=form[fieldToCheck][j].value;}}
-else if(form[fieldToCheck].type=="checkbox")
-{if(form[fieldToCheck].checked)
-fieldnameValue=form[parts[0]].value;}
-else
-fieldnameValue=form[parts[0]].value;if(comparison=="equal"&&fieldnameValue!=valueToCheck)
-{satisfiesIfConditions=false;break;}
-else if(comparison=="not_equal"&&fieldnameValue==valueToCheck)
-{satisfiesIfConditions=false;break;}
-else
-row.shift();}
-if(!satisfiesIfConditions)
-continue;var requirement=row[0];var fieldName=row[1];var fieldName2,fieldName3,errorMessage,lengthRequirements,date_flag;if(requirement!="function"&&form[fieldName]==undefined)
-{alert("RSV Error: the field \""+fieldName+"\" doesn't exist! Please check your form and settings.");return false;}
-if(requirement!="function"&&rsv.errorFieldClass)
-{if(form[fieldName].type==undefined)
-{for(var j=0;j<form[fieldName].length;j++)
-rsv.removeClassName(form[fieldName][j],rsv.errorFieldClass,true);}
-else
-rsv.removeClassName(form[fieldName],rsv.errorFieldClass);}
-if(row.length==6)
-{fieldName2=row[2];fieldName3=row[3];date_flag=row[4];errorMessage=row[5];}
-else if(row.length==5)
-{fieldName2=row[2];fieldName3=row[3];errorMessage=row[4];}
-else if(row.length==4)
-{fieldName2=row[2];errorMessage=row[3];}
-else
-errorMessage=row[2];if(requirement.match("^length"))
-{lengthRequirements=requirement;requirement="length";}
-if(requirement.match("^range"))
-{rangeRequirements=requirement;requirement="range";}
-switch(requirement)
-{case"required":if(form[fieldName].type==undefined)
-{var oneIsChecked=false;for(var j=0;j<form[fieldName].length;j++)
-{if(form[fieldName][j].checked)
-oneIsChecked=true;}
-if(!oneIsChecked)
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}}
-else if(form[fieldName].type=="select-multiple")
-{var oneIsSelected=false;for(var k=0;k<form[fieldName].length;k++)
-{if(form[fieldName][k].selected)
-oneIsSelected=true;}
-if(!oneIsSelected||form[fieldName].length==0)
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}}
-else if(form[fieldName].type=="checkbox")
-{if(!form[fieldName].checked)
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}}
-else if(!form[fieldName].value)
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"digits_only":if(form[fieldName].value&&form[fieldName].value.match(/\D/))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"letters_only":if(form[fieldName].value&&form[fieldName].value.match(/[^a-zA-Z]/))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"is_alpha":if(form[fieldName].value&&form[fieldName].value.match(/\W/))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"custom_alpha":var conversion={"L":"[A-Z]","V":"[AEIOU]","l":"[a-z]","v":"[aeiou]","D":"[a-zA-Z]","F":"[aeiouAEIOU]","C":"[BCDFGHJKLMNPQRSTVWXYZ]","x":"[0-9]","c":"[bcdfghjklmnpqrstvwxyz]","X":"[1-9]","E":"[bcdfghjklmnpqrstvwxyzBCDFGHJKLMNPQRSTVWXYZ]"};var reg_exp_str="";for(var j=0;j<fieldName2.length;j++)
-{if(conversion[fieldName2.charAt(j)])
-reg_exp_str+=conversion[fieldName2.charAt(j)];else
-reg_exp_str+=fieldName2.charAt(j);}
-var reg_exp=new RegExp(reg_exp_str);if(form[fieldName].value&&reg_exp.exec(form[fieldName].value)==null)
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"reg_exp":var reg_exp_str=fieldName2.replace(/%%C%%/ig, ",");if(row.length==5)
-var reg_exp=new RegExp(reg_exp_str,fieldName3);else
-var reg_exp=new RegExp(reg_exp_str);if(form[fieldName].value&&reg_exp.exec(form[fieldName].value)==null)
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"length":comparison_rule="";rule_string="";if(lengthRequirements.match(/length=/))
-{comparison_rule="equal";rule_string=lengthRequirements.replace("length=","");}
-else if(lengthRequirements.match(/length>=/))
-{comparison_rule="greater_than_or_equal";rule_string=lengthRequirements.replace("length>=","");}
-else if(lengthRequirements.match(/length>/))
-{comparison_rule="greater_than";rule_string=lengthRequirements.replace("length>","");}
-else if(lengthRequirements.match(/length<=/))
-{comparison_rule="less_than_or_equal";rule_string=lengthRequirements.replace("length<=","");}
-else if(lengthRequirements.match(/length</))
-{comparison_rule="less_than";rule_string=lengthRequirements.replace("length<","");}
-switch(comparison_rule)
-{case"greater_than_or_equal":if(!(form[fieldName].value.length>=parseInt(rule_string)))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"greater_than":if(!(form[fieldName].value.length>parseInt(rule_string)))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"less_than_or_equal":if(!(form[fieldName].value.length<=parseInt(rule_string)))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"less_than":if(!(form[fieldName].value.length<parseInt(rule_string)))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"equal":var range_or_exact_number=rule_string.match(/[^_]+/);var fieldCount=range_or_exact_number[0].split("-");if(fieldCount.length==2)
-{if(form[fieldName].value.length<fieldCount[0]||form[fieldName].value.length>fieldCount[1])
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}}
-else
-{if(form[fieldName].value.length!=fieldCount[0])
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}}
-break;}
-break;case"valid_email":if(form[fieldName].value&&!rsv.isValidEmail(form[fieldName].value))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"valid_date":var isLaterDate=false;if(date_flag=="later_date")
-isLaterDate=true;else if(date_flag=="any_date")
-isLaterDate=false;if(!rsv.isValidDate(form[fieldName].value,form[fieldName2].value,form[fieldName3].value,isLaterDate))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"same_as":if(form[fieldName].value!=form[fieldName2].value)
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"range":comparison_rule="";rule_string="";if(rangeRequirements.match(/range=/))
-{comparison_rule="equal";rule_string=rangeRequirements.replace("range=","");}
-else if(rangeRequirements.match(/range>=/))
-{comparison_rule="greater_than_or_equal";rule_string=rangeRequirements.replace("range>=","");}
-else if(rangeRequirements.match(/range>/))
-{comparison_rule="greater_than";rule_string=rangeRequirements.replace("range>","");}
-else if(rangeRequirements.match(/range<=/))
-{comparison_rule="less_than_or_equal";rule_string=rangeRequirements.replace("range<=","");}
-else if(rangeRequirements.match(/range</))
-{comparison_rule="less_than";rule_string=rangeRequirements.replace("range<","");}
-switch(comparison_rule)
-{case"greater_than_or_equal":if(!(form[fieldName].value>=Number(rule_string)))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"greater_than":if(!(form[fieldName].value>Number(rule_string)))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"less_than_or_equal":if(!(form[fieldName].value<=Number(rule_string)))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"less_than":if(!(form[fieldName].value<Number(rule_string)))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;case"equal":var rangeValues=rule_string.split("-");if((form[fieldName].value<Number(rangeValues[0]))||(form[fieldName].value>Number(rangeValues[1])))
-{if(!rsv.processError(form[fieldName],errorMessage))
-return false;}
-break;}
-break;case"function":custom_function=fieldName;eval("var result = "+custom_function+"()");if(result.constructor.toString().indexOf("Array")!=-1)
-{for(var j=0;j<result.length;j++)
-{if(!rsv.processError(result[j][0],result[j][1]))
-return false;}}
-break;default:alert("Unknown requirement flag in validateFields(): "+requirement);return false;}}
-if(typeof rsv.customErrorHandler=='function')
-return rsv.customErrorHandler(form,rsv.returnHash);else if(rsv.displayType=="alert-all")
-{var errorStr=rsv.errorTextIntro+"\n\n";for(var i=0;i<rsv.returnHash.length;i++)
-{errorStr+=rsv.errorJSItemBullet+rsv.returnHash[i][1]+"\n";rsv.styleField(rsv.returnHash[i][0],i==0);}
-if(rsv.returnHash.length>0)
-{alert(errorStr);return false;}}
-else if(rsv.displayType=="display-html")
-{var success=rsv.displayHTMLErrors(form,rsv.returnHash);if(!success)
-return false;}
-if(typeof rsv.onCompleteHandler=='function')
-return rsv.onCompleteHandler();else
-return true;}
-rsv.processError=function(obj,message)
-{message=message.replace(/%%C%%/ig,",");var continueProcessing=true;switch(rsv.displayType)
-{case"alert-one":alert(message);rsv.styleField(obj,true);continueProcessing=false;break;case"alert-all":case"display-html":rsv.returnHash.push([obj,message]);break;}
-return continueProcessing;}
-rsv.displayHTMLErrors=function(f,errorInfo)
-{var errorHTML=rsv.errorTextIntro+"<br /><br />";for(var i=0;i<errorInfo.length;i++)
-{errorHTML+=rsv.errorHTMLItemBullet+errorInfo[i][1]+"<br />";rsv.styleField(errorInfo[i][0],i==0);}
-if(errorInfo.length>0)
-{document.getElementById(rsv.errorTargetElementId).style.display="block";document.getElementById(rsv.errorTargetElementId).innerHTML=errorHTML;return false;}
-return true;}
-rsv.styleField=function(field,focus)
-{if(!rsv.errorFieldClass){return;}
-if(field.type==undefined)
-{if(focus)
-field[0].focus();for(var i=0;i<field.length;i++)
-rsv.addClassName(field[i],rsv.errorFieldClass,true);}
-else
-{if(rsv.errorFieldClass)
-rsv.addClassName(field,rsv.errorFieldClass,true);if(focus)
-field.focus();}}
-rsv.isValidEmail=function(str)
-{var str2=str.replace(/^\s*/,"");var s=str2.replace(/\s*$/,"");var at="@";var dot=".";var lat=s.indexOf(at);var lstr=s.length;var ldot=s.indexOf(dot);if(s.indexOf(at)==-1||(s.indexOf(at)==-1||s.indexOf(at)==0||s.indexOf(at)==lstr)||(s.indexOf(dot)==-1||s.indexOf(dot)==0||s.indexOf(dot)==lstr)||(s.indexOf(at,(lat+1))!=-1)||(s.substring(lat-1,lat)==dot||s.substring(lat+1,lat+2)==dot)||(s.indexOf(dot,(lat+2))==-1)||(s.indexOf(" ")!=-1))
-{return false;}
-return true;}
-rsv.isWhitespace=function(s)
-{var whitespaceChars=" \t\n\r\f";if((s==null)||(s.length==0))
-return true;for(var i=0;i<s.length;i++)
-{var c=s.charAt(i);if(whitespaceChars.indexOf(c)==-1)
-return false;}
-return true;}
-rsv.isValidDate=function(month,day,year,isLaterDate)
-{var daysInMonth;if((year%4==0)&&((year%100!=0)||(year%400==0)))
-daysInMonth=[31,29,31,30,31,30,31,31,30,31,30,31];else
-daysInMonth=[31,28,31,30,31,30,31,31,30,31,30,31];if(!month||!day||!year)return false;if(1>month||month>12)return false;if(year<0)return false;if(1>day||day>daysInMonth[month-1])return false;if(isLaterDate)
-{var today=new Date();var currMonth=today.getMonth()+1;var currDay=today.getDate();var currYear=today.getFullYear();if(String(currMonth).length==1)currMonth="0"+currMonth;if(String(currDay).length==1)currDay="0"+currDay;var currDate=String(currYear)+String(currMonth)+String(currDay);if(String(month).length==1)month="0"+month;if(String(day).length==1)day="0"+day;incomingDate=String(year)+String(month)+String(day);if(Number(currDate)>Number(incomingDate))
-return false;}
-return true;}
-rsv.addClassName=function(objElement,strClass,mayAlreadyExist)
-{if(objElement.className)
-{var arrList=objElement.className.split(' ');if(mayAlreadyExist)
-{var strClassUpper=strClass.toUpperCase();for(var i=0;i<arrList.length;i++)
-{if(arrList[i].toUpperCase()==strClassUpper)
-{arrList.splice(i,1);i--;}}}
-arrList[arrList.length]=strClass;objElement.className=arrList.join(' ');}
-else
-objElement.className=strClass;}
-rsv.removeClassName=function(objElement,strClass)
-{if(objElement.className)
-{var arrList=objElement.className.split(' ');var strClassUpper=strClass.toUpperCase();for(var i=0;i<arrList.length;i++)
-{if(arrList[i].toUpperCase()==strClassUpper)
-{arrList.splice(i,1);i--;}}
-objElement.className=arrList.join(' ');}}
\ No newline at end of file
diff --git a/resources/scripts/libs/spinners.js b/resources/scripts/libs/spinners.js
deleted file mode 100644
index 6ed4019a6..000000000
--- a/resources/scripts/libs/spinners.js
+++ /dev/null
@@ -1,655 +0,0 @@
-/*!
- * Spinners 3.0.0
- * (c) 2010-2012 Nick Stakenburg - http://www.nickstakenburg.com
- *
- * Spinners is freely distributable under the terms of an MIT-style license.
- *
- * GitHub: http://github.com/staaky/spinners
- */
-
-// TODO: Add background option that creates a ring, disabled by default:
-//       background: { color: '#fff', opacity: .5, padding: 3 }
-// TODO: Only draw at 60fps for a more accurate rotation time, in some 
-//       cases frames should be skipped.
-// TODO: Add support for simple and complex gradients to the color option:
-//       color: ['#ff000', '#00ff00', '#0000ff']
-//       color: [
-//         { position: .0,  color: '#ff0000', opacity: 1 },
-//         { position: .75, color: '#00ff00', opacity: .5 },
-//         { position: 1,   color: '#0000ff', opacity: 0 }
-//       ]
-
-;var Spinners = {
-  version: '3.0.0'
-};
-
-(function($) {
-// Helpers
-var _ = {
-  scroll: function(array, distance) {
-    if (!distance) return array;
-    var first = array.slice(0, distance),
-        last  = array.slice(distance, array.length);
-    return last.concat(first);
-  },
-  
-  isElement: function(object) {
-    return object && object.nodeType == 1;
-  },
-
-  element: {
-    isAttached: (function() {
-      function findTopAncestor(element) {
-        var ancestor = element;
-        while(ancestor && ancestor.parentNode) {
-          ancestor = ancestor.parentNode;
-        }
-        return ancestor;
-      }
-      
-      return function(element) {
-        var topAncestor = findTopAncestor(element);
-        return !!(topAncestor && topAncestor.body);
-      };
-    })()
-  }
-};
-
-function getOpacityArray(dashes, fadeOutSpeed) {
-  var step = 1 / dashes, array = [];
-  for (var i = 0; i<dashes;i++) {
-    array.push((i + fadeOutSpeed) * step);
-  }
-  return array;
-}
-
-/*
- * Math
- */
-function pyth(a,b) { return Math.sqrt(a*a + b*b); }
-function degrees(radian) { return (radian*180) / Math.PI; }
-function radian(degrees) { return (degrees*Math.PI) / 180; }
-
-/*
- * Canvas
- */
-var Canvas = {
-  drawRoundedRectangle: function(ctx) {
-    var options = $.extend({
-      top:    0,
-      left:   0,
-      width:  0,
-      height: 0,
-      radius: 0
-    }, arguments[1] || {});
-
-    var o      = options,
-        left   = o.left,
-        top    = o.top,
-        width  = o.width,
-        height = o.height,
-        radius = o.radius;
-
-    ctx.beginPath();
-
-    ctx.moveTo(left + radius, top);
-    ctx.arc(left + width - radius, top + radius, radius, radian(-90), radian(0), false);
-    ctx.arc(left + width - radius, top + height - radius, radius, radian(0), radian(90), false);
-    ctx.arc(left + radius, top + height - radius, radius, radian(90), radian(180), false);
-    ctx.arc(left + radius, top + radius, radius, radian(-180), radian(-90), false);
-
-    ctx.closePath();
-
-    ctx.fill();
-  }
-};
-
-/*
- * Color
- */
-var Color = (function() {
-  var hexNumber = '0123456789abcdef',
-      hexRegExp = new RegExp('[' + hexNumber + ']', 'g');
-
-  function returnRGB(rgb) {
-    var result = rgb;
-    result.red = rgb[0];
-    result.green = rgb[1];
-    result.blue = rgb[2];
-    return result;
-  }
-
-  function h2d(h) { return parseInt(h,16); }
-
-  function hex2rgb(hex) {
-    var rgb = [];
-
-    if (hex.indexOf('#') == 0) hex = hex.substring(1);
-    hex = hex.toLowerCase();
-
-    if (hex.replace(hexRegExp, '') != '')
-    return null;
-
-    if (hex.length == 3) {
-      rgb[0] = hex.charAt(0) + hex.charAt(0);
-      rgb[1] = hex.charAt(1) + hex.charAt(1);
-      rgb[2] = hex.charAt(2) + hex.charAt(2);
-    } else {
-      rgb[0] = hex.substring(0, 2);
-      rgb[1] = hex.substring(2, 4);
-      rgb[2] = hex.substring(4);
-    }
-    for(var i = 0; i < rgb.length; i++)
-      rgb[i] = h2d(rgb[i]);
-
-    return returnRGB(rgb);
-  }
-
-  function hex2rgba(hex, opacity) {
-    var rgba = hex2rgb(hex);
-    rgba[3] = opacity;
-    rgba.opacity = opacity;
-    return rgba;
-  }
-
-  function hex2fill(hex, opacity) {
-    if (typeof opacity == 'undefined') opacity = 1;
-    return "rgba(" + hex2rgba(hex, opacity).join() + ")";
-  }
-
-  var rgb2hex = (function() {
-    function toPaddedString(string, length, radix) {
-      string = (string).toString(radix || 10);
-      return (new Array(length - string.length).join('0')) + string;
-    }
-
-    return function(red, green, blue) {
-      return '#' + toPaddedString(red, 2, 16) +
-                   toPaddedString(green, 2, 16) +
-                   toPaddedString(blue, 2, 16);
-    };
-  })();
-
-  return {
-    hex2rgb:  hex2rgb,
-    hex2fill: hex2fill,
-    rgb2hex:  rgb2hex
-  };
-})();
-
-
-/*
- * Spinners
- */
-$.extend(Spinners, {
-  enabled: false,
-
-  support: {
-    canvas: (function() {
-      var canvas = $('<canvas>')[0];
-      return !!(canvas.getContext && canvas.getContext('2d'));
-    })()
-  },
-
-  init: function() {
-    // require (ex)canvas
-    if (!(this.support.canvas ||
-          (!!window.G_vmlCanvasManager && 
-           !!(window.attachEvent && navigator.userAgent.indexOf('Opera') === -1)))) {
-      return;
-    }
-
-    // make sure excanvas is initialized
-    (window.G_vmlCanvasManager && window.G_vmlCanvasManager.init_(document));
-
-    this.enabled = true;
-  },
-
-  create: function(element, options) {
-    Collection.create(element, options);
-    return this.get(element);
-  },
-
-  get: function(element) { return new Collection(element); },
-
-  play: function(element)   { this.get(element).play(); return this; },
-  pause: function(element)  { this.get(element).pause(); return this; },
-  toggle: function(element) { this.get(element).toggle(); return this; },
-  stop: function(element)   { this.get(element).stop(); return this; },
-
-  remove: function(element) { this.get(element).remove(); return this; },
-
-  removeDetached: function(element) {
-    All.removeDetached();
-    return this;
-  },
-
-  center: function(element) { this.get(element).center(); return this; },
-
-  setOptions: function(element, options) {
-    this.get(element).setOptions(options);
-    return this;
-  },
-  
-  getDimensions: function(element) {
-    var spinner   = All.get(element)[0],
-        diameter  = spinner.getLayout().workspace.radius * 2;
-
-    return { width: diameter, height: diameter };
-  }
-});
-
-
-// We keep track spinners so things can be cleanup up when elements leave the DOM
-var All = {
-  spinners: [],
-
-  get: function(element) {
-    if (!element) return;
-    var matched = [];
-    $.each(this.spinners, function(i, spinner) {
-      if (spinner &&
-        (_.isElement(element) ? spinner.element == element : // element
-        $(spinner.element).is(element) // selector
-      )) {
-        matched.push(spinner);
-      }
-    });
-    return matched;
-  },
-
-  add: function(spinner) { this.spinners.push(spinner); },
-
-  remove: function(element) {
-    $($.map(this.spinners, function(spinner, i) {
-      if (_.isElement(element) ? spinner.element == element :
-        $(spinner.element).is(element))
-        return spinner.element;
-    })).each($.proxy(function(i, e) {
-      this.removeByElement(e);
-    }, this));
-  },
-
-  removeByElement: function(element) {
-    var spinner = this.get(element)[0];
-    if (spinner) {
-      spinner.remove();
-      this.spinners = $.grep(this.spinners, function(s) {
-        return s.element != element;
-      });
-    }
-  },
-
-  //remove all spinners that are not attached to the DOM
-  removeDetached: function() {
-    $.each(this.spinners, $.proxy(function(i, spinner) {
-      if (spinner && spinner.element && !_.element.isAttached(spinner.element))
-        this.remove(spinner.element);
-    }, this));
-  }
-};
-
-
-/*
- * Collection
- */
-function Collection(element) { this.element = element; };
-
-$.extend(Collection, {
-  create: function(element) {
-    if (!element) return;
-    var options = arguments[1] || {},
-        spinners = [];
-  
-    if (_.isElement(element)) {
-      spinners.push(new Spinner(element, options));
-    }
-    else {
-      // if it's not an element, assume selector
-      $(element).each(function(i, el) {
-        spinners.push(new Spinner(el, options));
-      });
-    }
-
-    return spinners;
-  }
-});
-
-$.extend(Collection.prototype, {
-  items: function() {
-    return All.get(this.element);
-  },
-
-  play: function() {
-    $.each(this.items(), function(i, s) { s.play(); });
-    return this;
-  },
-
-  stop: function() {
-    $.each(this.items(), function(i, s) { s.stop(); });
-    return this;
-  },
-
-  pause: function() {
-    $.each(this.items(), function(i, s) { s.pause(); });
-    return this;
-  },
-  
-  toggle: function() {
-    $.each(this.items(), function(i, s) { s.toggle(); });
-    return this;
-  },
-  
-  center: function() {
-    $.each(this.items(), function(i, s) { s.center(); });
-    return this;
-  },
-  
-  setOptions: function(options) {
-    $.each(this.items(), function(i, s) { s.setOptions(options); });
-    return this;
-  },
-
-  remove: function() {
-    All.remove(this.element);
-    return this;
-  }
-});
-
-
-/*
- * Spinner
- */
-function Spinner(element) {
-  if (!element) return;
-
-  this.element = element;
-
-  All.remove(element);
-  All.removeDetached();
-
-  this._position = 0;
-  this._state = 'stopped';
-
-  this.setOptions($.extend({
-    color: '#000',
-    dashes:  12,
-    radius: 5,
-    height: 5,
-    width: 1.8,
-    opacity: 1,
-    padding: 3,
-    fadeOutSpeed: 0,
-    pauseColor: '#000',
-    pauseOpacity: 0.3,
-    rotation: 700
-  }, arguments[1] || {}));
-
-  this.drawPosition(0);
-
-  All.add(this);
-}
-
-$.extend(Spinner.prototype, {
-  setOptions: function(options) {
-    this.options = $.extend({}, this.options, options || {});
-
-    // backwards compatibility with 2.0
-    if (this.options.radii) {
-      var radii = this.options.radii;
-      this.options.radius = Math.min(radii[0], radii[1]);
-      this.options.height = Math.max(radii[0], radii[1]) - this.options.radius;
-    }
-    if (this.options.dashWidth) {
-      this.options.width = this.options.dashWidth;
-    }
-    if (this.options.speed) {
-      this.options.duration = this.options.speed * 1000;
-    }
-
-    // make it safe to change options during play
-    var state = this._state,
-        position = this._position;
-
-    // clear layout cache
-    this._layout = null;
-
-    // rebuild
-    this.build();
-
-    if (position && position >= this.options.dashes -1) {
-      this._position = this.options.dashes - 1;
-    }
-
-    switch (state) {
-      case 'playing':
-        this.play();
-        break;
-      case 'paused':
-      case 'stopped':
-        this.drawPosition(this._position);
-        break;
-    }
-
-    if (this._centered) this.center();
-    if (this._state == "paused") this._renderPause();
-  },
-
-  remove: function() {
-    if (!this.canvas) return;
-
-    this.pause(); // doesn't destroy position
-
-    $(this.canvas).remove();
-
-    this.canvas = null;
-    this.ctx = null;
-  },
-
-  build: function() {
-    this.remove();
-
-    var radius = this.getLayout().workspace.radius;
-
-    // IE bug: append canvas to the body before getting context
-    $(document.body).append(this.canvas = $('<canvas>')
-      .attr({ width: radius * 2, height: radius * 2 })
-      .css({ zoom: 1 })
-    );
-
-    // init canvas
-    if (window.G_vmlCanvasManager)
-      G_vmlCanvasManager.initElement(this.canvas[0]);
-
-    this.ctx = this.canvas[0].getContext('2d');
-    this.ctx.globalAlpha = this.options.opacity;
-
-    // IE: append to element after getting context
-    $(this.element).append(this.canvas);
-
-    this.ctx.translate(radius, radius);
-    return this;
-  },
-
-  /*
-   * Draw
-   */
-  drawPosition: function(position) {
-    var workspace = this.getLayout().workspace,
-        opacities = _.scroll(workspace.opacities, position * -1),
-        radius    = workspace.radius,
-        dashes    = this.options.dashes,
-        rotation  = radian(360 / dashes);
-
-    this.ctx.clearRect(radius * -1, radius * -1, radius * 2, radius * 2);
-
-    for (var i = 0, len = dashes; i < len; i++) {
-      this.drawDash(opacities[i], this.options.color);
-      this.ctx.rotate(rotation);
-    }
-  },
-
-  drawDash: function(opacity, color) {
-    this.ctx.fillStyle = Color.hex2fill(color, opacity);
-
-    var layout          = this.getLayout(),
-        workspaceRadius = layout.workspace.radius,
-        dashPosition    = layout.dash.position,
-        dashDimensions  = layout.dash.dimensions;
-
-    Canvas.drawRoundedRectangle(this.ctx, {
-      top:    dashPosition.top - workspaceRadius,
-      left:   dashPosition.left - workspaceRadius,
-      width:  dashDimensions.width,
-      height: dashDimensions.height,
-      radius: Math.min(dashDimensions.height, dashDimensions.width) / 2
-    });
-  },
-  
-  _nextPosition: function() {
-    var ms = this.options.rotation / this.options.dashes;
-    this.nextPosition();
-    this._playTimer = window.setTimeout($.proxy(this._nextPosition, this), ms);
-  },
-
-  nextPosition: function() {
-    if (this._position == this.options.dashes - 1)
-      this._position = -1;
-    this._position++;
-    this.drawPosition(this._position);
-  },
-
-  /*
-   * Controls
-   */
-  play: function() {
-    if (this._state == 'playing') return;
-
-    this._state = 'playing';
-
-    var ms = this.options.rotation / this.options.dashes;
-    this._playTimer = window.setTimeout($.proxy(this._nextPosition, this), ms);
-    return this;
-  },
-
-  pause: function() {
-    if (this._state == 'paused') return;
-    this._pause();
-
-    if (this._layout !== null) this._renderPause();
-
-    this._state = 'paused';
-    return this;
-  },
-
-  _pause: function() {
-    if (!this._playTimer) return;
-    window.clearTimeout(this._playTimer);
-    this._playTimer = null;
-  },
-
-  stop: function() {
-    if (this._state == 'stopped') return;
-
-    this._pause();
-
-    this._position = 0;
-    this.drawPosition(0);
-
-    this._state = 'stopped';
-    return this;
-  },
-
-  toggle: function() {
-    this[this._state == 'playing' ? 'pause' : 'play']();
-    return this;
-  },
-
-
-  /*
-   * Layout
-   */
-  getLayout: function() {
-    if (this._layout) return this._layout;
-
-    var options   = this.options,
-        dashes    = options.dashes,
-        width     = options.width,
-        minRadius = options.radius,
-        maxRadius = options.radius + options.height,
-
-        maxWorkspaceRadius = Math.max(width, maxRadius),
-        radius = Math.ceil(Math.max(
-          maxWorkspaceRadius,
-          // the angle created by width could give a bigger radius
-          pyth(maxRadius, width/2)
-        ));
-
-    radius += options.padding;
-
-    var layout = {
-      workspace: {
-        radius: radius,
-        opacities: getOpacityArray(dashes, this.options.fadeOutSpeed)
-      },
-      dash: {
-        position: {
-          top:  radius - maxRadius,
-          left: radius - width / 2
-        },
-        dimensions: {
-          width: width,
-          height: maxRadius - minRadius
-        }
-      }
-    };
-
-    // cache
-    this._layout = layout;
-
-    return layout;
-  },
-  
-  // center the element using absolute positioning and negative margins
-  center: function() {
-    var diameter = this.getLayout().workspace.radius * 2;
-
-    // the parent needs relative positioning for this to work
-    // TODO: store original css so it can be restored on remove()
-    $(this.element.parentNode).css({ position: 'relative' });
-
-    $(this.element).css({
-      position: 'absolute',
-      height: diameter + 'px',
-      width: diameter + 'px',
-      top: '50%',
-      left: '50%',
-      marginLeft: -.5 * diameter + 'px',
-      marginTop: -.5 * diameter + 'px'
-    });
-
-    this._centered = true;
-  },
-
-  _renderPause: function() {
-    var radius    = this.getLayout().workspace.radius,
-        dashes    = this.options.dashes,
-        rotation  = radian(360 / dashes);
-
-    this.ctx.clearRect(radius * -1, radius * -1, radius * 2, radius * 2);
-
-    for (var i = 0, len = dashes; i < len; i++) {
-      this.drawDash(this.options.pauseOpacity, this.options.pauseColor);
-      this.ctx.rotate(rotation);
-    }
-  }
-});
-
-// start
-Spinners.init();
-
-// if there's no support for Canvas/VML, make sure everything dies silently
-if (!Spinners.enabled) {
-  Collection.create = function() { return []; };
-}
-})(jQuery);
\ No newline at end of file
diff --git a/resources/scripts/login.js b/resources/scripts/login.js
deleted file mode 100644
index b29729d11..000000000
--- a/resources/scripts/login.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/*global $:false,browser:true,require:false*/
-require([
-	"manager",
-	"lang",
-	"utils",
-	"pageInit"
-], function(manager, L, utils) {
-
-	"use strict";
-
-	$(function() {
-		manager.start();
-
-		if (window.location.href.match(/#/)) {
-			var tab = window.location.href.split("#")[1].replace(/^t/, "");
-			if (tab !== "1" && tab !== "2") {
-				utils.selectTab({ tabGroup: "gdMainTabs", tabIDPrefix: "gdMainTab", newTab: 1 });
-			}
-		}
-
-		$("#email").focus();
-		$("#gdMainTab1Content button").on("click", _onSubmitLoginForm);
-		$("#gdMainTab2Content button").on("click", _onSubmitPasswordReminderForm);
-
-		$(document).on("click", ".gdMessageClose", function(e) {
-			$(e.target).closest(".gdMessage").hide("blind", null, 500);
-			return false;
-		});
-	});
-
-
-	function _onSubmitLoginForm(e) {
-		e.preventDefault();
-
-		var errors = [];
-		var email = $.trim($("#email").val());
-		$(".gdError").hide();
-
-		if (email === "") {
-			errors.push({ fieldId: "email", error: L.validation_no_email });
-		} else if (!utils.isValidEmail(email)) {
-			errors.push({ fieldId: "email", error: L.validation_invalid_email });
-		}
-
-		// the password is optional (e.g. for local environments)
-		var password = $.trim($("#password").val());
-		if (password === "") {
-			errors.push({ fieldId: "password", error: L.validation_no_password });
-		}
-
-		if (errors.length) {
-			$("#" + errors[0].fieldId).select();
-			for (var i=0; i<errors.length; i++) {
-				$("#" + errors[i].fieldId + "_error").html(errors[i].error).fadeIn(300);
-			}
-			return false;
-		}
-
-		// all looks good. Try logging in the user.
-		utils.startProcessing();
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: "login",
-				email: email,
-				password: password
-			},
-			success: function(json) {
-				if (json.success) {
-					window.location = "./";
-				} else {
-					$("#gdMessages").addClass("gdErrors").find("div").html("<ul><li>" + json.content + "</li></ul>");
-					updateMessageBlock("#gdMessages");
-				}
-				utils.stopProcessing();
-			},
-			error: function(json) {
-				utils.stopProcessing();
-			}
-		});
-	}
-
-	function _onSubmitPasswordReminderForm(e) {
-		e.preventDefault();
-
-		var errors = [];
-		var email = $.trim($("#emailReminder").val());
-		$(".gdError").hide();
-
-		if (email === "") {
-			errors.push({ fieldId: "emailReminder", error: L.validation_no_email });
-		} else if (!utils.isValidEmail(email)) {
-			errors.push({ fieldId: "emailReminder", error: L.validation_invalid_email });
-		}
-
-		if (errors.length) {
-			$("#" + errors[0].fieldId).select();
-			for (var i=0; i<errors.length; i++) {
-				$("#" + errors[i].fieldId + "_error").html(errors[i].error).fadeIn(300);
-			}
-			return false;
-		}
-
-		// all looks good. Try logging in the user.
-		utils.startProcessing();
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: "resetPassword",
-				email: email
-			},
-			success: function(json) {
-				if (json.success) {
-					$("#gdMessagesReminder").removeClass("gdErrors").addClass("gdNotify").find("div").html("<p>" + json.content + "</p>");
-				} else {
-					$("#gdMessagesReminder").removeClass("gdNotify").addClass("gdErrors").find("div").html("<ul><li>" + json.content + "</li></ul>");
-				}
-				updateMessageBlock("#gdMessagesReminder");
-				utils.stopProcessing();
-			},
-			error: function(json) {
-				utils.stopProcessing();
-			}
-		});
-	}
-
-	/**
-	 * Helper function to actually show / highlight a message block consistently. This assumes the message / error
-	 * is already in the element. It either blinds it quickly in, or does a highlight effect to draw attention to it.
-	 */
-	function updateMessageBlock(el) {
-		if ($(el).css("display") !== "block") {
-			$(el).show("blind", null, 500);
-		} else {
-			$(el).effect("highlight", { color: "#ffc9c9" }, 1500);
-		}
-	}
-});
\ No newline at end of file
diff --git a/resources/scripts/manager.js b/resources/scripts/manager.js
deleted file mode 100644
index 9b418a605..000000000
--- a/resources/scripts/manager.js
+++ /dev/null
@@ -1,624 +0,0 @@
-/*jslint browser:true*/
-/*global $:false,console:false,define:false*/
-define([
-	"constants",
-	"queue"
-], function(C, Queue) {
-
-	"use strict";
-
-	/**
-	 * @name Manager
-	 * @see Core
-	 * @description The manager handles all the pub/sub functionality for the Core. Most modules interact
-	 * with one another indirectly through this module by publishing and subscribing to messages.
-	 * @return {Object}
-	 * @namespace
-	 */
-
-    var MODULE_ID = "core-manager";
-    var _isStarted = false;
-
-	// stores all modules: Core, Data Types and Export Types. It's a hash of Module ID -> module info
-	var _modules = {};
-	var _filterDataTypeMessages = (C.DEBUGGING.LIMIT_DATA_TYPE_EVENTS === "") ? false : true;
-	var _filterExportTypeMessages = (C.DEBUGGING.LIMIT_EXPORT_TYPE_EVENTS === "") ? false : true;
-	var _permittedDataTypes = C.DEBUGGING.LIMIT_DATA_TYPE_EVENTS.split(",");
-	var _permittedExportTypes = C.DEBUGGING.LIMIT_EXPORT_TYPE_EVENTS.split(",");
-
-
-	var _registerDataType = function(moduleID, module) {
-		if (_modules.hasOwnProperty(moduleID)) {
-			if (C.DEBUGGING.CONSOLE_WARN) {
-				console.warn("Sorry, a module with that ID has already been registered.");
-			}
-			return;
-		}
-
-		// do a little safety-checking on the module functions
-		var optionalFuncs = ["init", "run", "validate", "saveRow", "loadRow"];
-		for (var j=0; j<optionalFuncs.length; j++) {
-			if (module.hasOwnProperty(optionalFuncs[j]) && typeof module[optionalFuncs[j]] != "function") {
-				if (C.DEBUGGING.CONSOLE_WARN) {
-					console.warn(moduleID + " module has an invalid " + optionalFuncs[j] + "() function. Should be a function!");
-				}
-				return;
-			}
-		}
-
-		var settings = $.extend({
-			init: function() { },
-			run: function() { },
-			validate: function() { return []; },
-			saveRow: function() { return {}; },
-			loadRow: null,
-			skipDomReady: false,
-			subscriptions: {}
-		}, module);
-
-		// include the type
-		settings.type = C.COMPONENT.DATA_TYPE;
-
-		// store the module
-		_modules[moduleID] = settings;
-
-		// announce it's been registered
-		_publish({
-			sender: moduleID,
-			type: C.EVENT.MODULE.REGISTER
-		});
-	};
-
-
-	var _registerExportType = function(moduleID, module) {
-		if (_modules.hasOwnProperty(moduleID)) {
-			if (C.DEBUGGING.CONSOLE_WARN) {
-				console.warn("Sorry, a module with that ID has already been registered.");
-			}
-			return;
-		}
-
-		var optionalFuncs = ["init", "run", "validate", "saveSettings", "loadSettings", "resetSettings"];
-		for (var i=0; i<optionalFuncs.length; i++) {
-			if (module.hasOwnProperty(optionalFuncs[i]) && typeof module[optionalFuncs[i]] != "function") {
-				if (C.DEBUGGING.CONSOLE_WARN) {
-					console.warn(moduleID + " module has an invalid " + optionalFuncs[i] + "() function. Should be a function!");
-				}
-				return;
-			}
-		}
-
-		var settings = $.extend({
-			init: function() { },
-			run: function() { },
-			validate: function() { return []; },
-			saveSettings: function() { return {}; },
-			loadSettings: null,
-			resetSettings: function() { },
-			subscriptions: {}
-		}, module);
-
-		// include the type
-		settings.type = C.COMPONENT.EXPORT_TYPE;
-
-		// store the module
-		_modules[moduleID] = settings;
-
-		// announce it's been registered
-		_publish({
-			sender: moduleID,
-			type: C.EVENT.MODULE.REGISTER
-		});
-	};
-
-
-	var _registerCoreModule = function(moduleID, module) {
-		if (_modules.hasOwnProperty(moduleID)) {
-			if (C.DEBUGGING.CONSOLE_WARN) {
-				console.warn("Sorry, a module with that ID has already been registered.");
-			}
-			return;
-		}
-
-		var settings = $.extend({
-			init: function() { },
-			run: function() { },
-			skipDomReady: false,
-			subscriptions: {}
-		}, module);
-
-		// include the type
-		settings.type = C.COMPONENT.CORE;
-
-		// store the module
-		_modules[moduleID] = settings;
-
-		// announce it's been registered
-		_publish({
-			sender: moduleID,
-			type: C.EVENT.MODULE.REGISTER
-		});
-	};
-
-
-	var _unregister = function(moduleID) {
-		if (_modules.hasOwnProperty(moduleID)) {
-			delete _modules[moduleID];
-			if (C.DEBUGGING.CONSOLE_LOG_CORE) {
-				console.warn("module unregistered: " + moduleID);
-			}
-		}
-	};
-
-
-	var _publish = function(messages) {
-		if (!$.isArray(messages)) {
-			messages = [messages];
-		}
-
-		for (var i=0; i<messages.length; i++) {
-			var pluginType = _getPluginType(messages[i].sender);
-
-			if (C.DEBUGGING.LIST_PUBLISH_EVENTS) {
-				var log = false;
-				if (pluginType == "data-type") {
-					if (_filterDataTypeMessages) {
-						if ($.inArray(messages[i].sender, _permittedDataTypes) != -1) {
-							log = true;
-						}
-					} else {
-						log = true;
-					}
-				} else if (pluginType == "export-type") {
-					if (_filterExportTypeMessages) {
-						if ($.inArray(messages[i].sender, _permittedExportTypes) != -1) {
-							log = true;
-						}
-					} else {
-						log = true;
-					}
-				} else {
-					log = true;
-				}
-
-				if (log) {
-					console.log("manager.publish(): ", messages[i]);
-				}
-			}
-
-			var currMessage = messages[i].type;
-			for (var moduleID in _modules) {
-                if (_modules[moduleID].subscriptions.hasOwnProperty(currMessage)) {
-					_modules[moduleID].subscriptions[currMessage](messages[i]);
-                }
-			}
-		}
-	};
-
-	var _subscribe = function(moduleID, subscriptions) {
-		if (arguments.length != 2) {
-			if (C.DEBUGGING.CONSOLE_WARN) {
-				console.warn("Invalid params for manager.subscribe()");
-			}
-			return;
-		}
-
-        var cleanSubscriptions = {};
-        for (var event in subscriptions) {
-            var eventHandler = subscriptions[event];
-            if (typeof eventHandler == 'function') {
-                cleanSubscriptions[event] = eventHandler;
-            }
-        }
-
-        if (_modules.hasOwnProperty(moduleID)) {
-            var existingSubscriptions = _modules[moduleID].subscriptions;
-            var pluginType = _getPluginType(moduleID);
-
-            // blithely add and overwrite any existing subscriptions for the events defined
-            for (var event in cleanSubscriptions) {
-                existingSubscriptions[event] = cleanSubscriptions[event];
-            }
-            _modules[moduleID].subscriptions = existingSubscriptions;
-
-			if (C.DEBUGGING.LIST_SUBSCRIBE_EVENTS) {
-				var log = false;
-				if (pluginType == "data-type") {
-					if (_filterDataTypeMessages) {
-						if ($.inArray(moduleID, _permittedDataTypes) != -1) {
-							log = true;
-						}
-					} else {
-						log = true;
-					}
-				} else if (pluginType == "export-type") {
-					if (_filterExportTypeMessages) {
-						if ($.inArray(moduleID, _permittedExportTypes) != -1) {
-							log = true;
-						}
-					} else {
-						log = true;
-					}
-				} else {
-					log = true;
-				}
-
-				if (log) {
-					console.log("manager.subscribe(): ", moduleID, cleanSubscriptions);
-				}
-			}
-        }
-	};
-
-	var _unsubscribe = function(moduleID, subscriptions) {
-
-	};
-
-	var _validateDataTypes = function(rowValidationNeededGroupedByDataType) {
-		var errors = [];
-		for (var moduleID in _modules) {
-			if (_modules[moduleID].type !== C.COMPONENT.DATA_TYPE) {
-				continue;
-			}
-
-			// check to see if there are any rows in the form of this data type that need validating
-			if (!rowValidationNeededGroupedByDataType.hasOwnProperty(moduleID)) {
-				continue;
-			}
-
-			var currErrors = _modules[moduleID].validate(rowValidationNeededGroupedByDataType[moduleID]);
-			if (!$.isArray(currErrors)) {
-				continue;
-			} else if (currErrors.length) {
-				errors = errors.concat(currErrors);
-			}
-		}
-		return errors;
-	};
-
-	/**
-	 * Passes off work to the current Export Type to do whatever validation it requires. If any of the
-	 * Export Type validation function throw an error or don't return an array, the process is halted and
-	 * we return null. The generator does the job of informing the user.
-	 */
-	var _validateExportType = function(info) {
-		var exportTypeModuleID = "export-type-" + info.exportType;
-		var rows = info.rows;
-		var errors = [];
-
-		try {
-			errors = _modules[exportTypeModuleID].validate(rows);
-		} catch (e) {
-			if (C.DEBUGGING.CONSOLE_WARN) {
-				console.error("Error in validate() function for " + info.exportType + " Export Type. Error: ", e);
-			}
-			return null;
-		}
-
-		if (!$.isArray(errors)) {
-			if (C.DEBUGGING.CONSOLE_WARN) {
-				console.error("Error! The validate() function for " + info.exportType + " didn't return an array.");
-			}
-			return null;
-		}
-
-		return errors;
-	};
-
-	/**
-	 * Runs the initialization method of a single module.
-	 */
-	var _init = function(moduleID) {
-		if (_modules[moduleID].init !== null) {
-			try {
-				_modules[moduleID].init();
-			} catch(e) {
-				if (C.DEBUGGING.CONSOLE_WARN) {
-					console.warn("init() method failed for " + moduleID + ":", e);
-					_unregister(moduleID);
-				}
-			}
-		}
-	};
-
-	/**
-	 * Calls the initialization methods of all registered modules.
-	 */
-	var _initAll = function() {
-		for (var moduleID in _modules) {
-			if (_modules.hasOwnProperty(moduleID)) {
-				_init(moduleID);
-			}
-		}
-	};
-
-	var _run = function(moduleID) {
-		try {
-			_modules[moduleID].run();
-		} catch(e) {
-			console.warn(e);
-		}
-	};
-
-	var _runAll = function() {
-		for (var moduleID in _modules) {
-			_run(moduleID);
-		}
-	};
-
-	var _getModules = function() {
-		return _modules;
-	};
-
-	var _start = function() {
-		if (_isStarted) {
-			return;
-		}
-        _initAll();
-        _runAll();
-        _isStarted = true;
-
-        _publish({
-            sender: MODULE_ID,
-            type: C.EVENT.APP_START
-        });
-    };
-
-	var _getPluginType = function(moduleID) {
-		var isDataType   = new RegExp("^data-type-");
-		var isExportType = new RegExp("^export-type-");
-		var isCore       = new RegExp("^core-");
-
-		var type = null;
-		if (isDataType.test(moduleID)) {
-			type = "data-type";
-		} else if (isExportType.test(moduleID)) {
-			type = "export-type";
-		} else if (isCore.test(moduleID)) {
-			type = "core";
-		}
-
-		return type;
-	};
-
-	var _serializeDataTypeRow = function(rowDataType, rowNum) {
-		if (!_modules.hasOwnProperty(rowDataType)) {
-			if (C.DEBUGGING.CONSOLE_WARN) {
-				console.warn("Unknown data type for manager.serializeDataTypeRow(): " + rowDataType);
-			}
-			return;
-		}
-		return _modules[rowDataType].saveRow(rowNum);
-	};
-
-	var _serializeExportTypes = function() {
-		var isExportType = new RegExp("^export-type-");
-		var exportTypeData = {};
-		for (var moduleID in _modules) {
-			if (isExportType.test(moduleID)) {
-				try {
-					exportTypeData[moduleID] = _modules[moduleID].saveSettings();
-				} catch (e) {
-					if (C.DEBUGGING.CONSOLE_WARN) {
-						console.warn("Error in Export Type's saveSettings(): ", moduleID, e);
-					}
-				}
-			}
-		}
-		return exportTypeData;
-	};
-
-	var _resetExportTypes = function() {
-		var exportTypes = _getModulesByPluginType("export-type");
-		for (var i=0; i<exportTypes.length; i++) {
-			try {
-				exportTypes[i].resetSettings();
-			} catch (e) {
-				if (C.DEBUGGING.CONSOLE_WARN) {
-					console.warn("Error resetting export type: ", exportTypes[i], e);
-				}
-			}
-		}
-	};
-
-	var _loadExportType = function(exportType, allSavedExportTypeData) {
-		var exportTypeModuleID = "export-type-" + exportType;
-		if (!_modules.hasOwnProperty(exportTypeModuleID) || !allSavedExportTypeData.hasOwnProperty(exportTypeModuleID)) {
-			return;
-		}
-
-		try {
-			_modules[exportTypeModuleID].loadSettings(allSavedExportTypeData[exportTypeModuleID]);
-		} catch (e) {
-			if (C.DEBUGGING.CONSOLE_WARN) {
-				console.warn("Error in Export Type's loadSettings(): ", exportTypeModuleID, e);
-			}
-		}
-	};
-
-	var _loadDataTypeRows = function(rowData) {
-		for (var i=0; i<rowData.length; i++) {
-			var currDataType = rowData[i].dataType;
-			if (!_modules.hasOwnProperty(currDataType)) {
-				continue;
-			}
-			var loadRowFunc = _modules[currDataType].loadRow(rowData[i].rowID, rowData[i].data);
-			if (loadRowFunc !== null) {
-				Queue.add(loadRowFunc);
-			}
-		}
-		Queue.process({ onSuccess: _onDataTypesLoaded });
-	};
-
-
-	var _onDataTypesLoaded = function() {
-		// for debugging
-	};
-
-	/**
-	 * Helper function to return an array of plugins, by plugin type.
-	 * @function
-	 * @private
-	 * @param {String} the type of plugin: "data-type", "core", "export-type"
-	 */
-	var _getModulesByPluginType = function(pluginType) {
-		var plugins = [];
-		for (var module in _modules) {
-			if (_modules[module].type == pluginType) {
-				plugins.push(_modules[module]);
-			}
-		}
-		return plugins;
-	};
-
-
-	// our public API
-	return {
-
-		/**
-		 * Our registration function for Data Types plugins.
-		 *
-		 * @function
-		 * @param {String} moduleID the unique module ID. Module IDs should be of the following format:
-		 *   data-type-[Data Type folder name]
-		 * @param {Object} module an object with the following required properties:<br />
-		 * - saveRow() - <br />
-		 * - loadRow() - <br />
-		 * Optional properties:
-		 * - run()<br />
-		 * - init() - where subscriptions are generally set up. All init()'s are run prior to anything being run().<br />
-		 * - skipDomReady (boolean)<br />
-		 * @name Manager#registerDataType
-		 */
-		registerDataType: _registerDataType,
-
-		/**
-		 * Our registration function for Export Types plugins.
-		 *
-		 * @function
-		 * @param {String} moduleID the unique module ID. Module IDs should be of the following format:
-		 *   data-type-[Data Type folder name]
-		 * @param {Object} module an object with the following required properties:<br />
-		 * - run() - a function<br />
-		 * - init() - where subscriptions are generally set up. All init()'s are run prior to anything being run().
-		 * - saveRow() - <br />
-		 * - loadRow() - <br />
-		 * - skipDomReady (boolean)<br />
-		 * @name Manager#registerExportType
-		 */
-		registerExportType: _registerExportType,
-
-		/**
-		 * Our registration function for Core plugins.
-		 *
-		 * @function
-		 * @param {String} moduleID the unique module ID. Module IDs should be of the following format:
-		 *   data-type-[Data Type folder name]
-		 * @param {Object} module an object with the following required properties:<br />
-		 * - run() - a function<br />
-		 * - init() - where subscriptions are generally set up. All init()'s are run prior to anything being run().
-		 * - saveRow() - <br />
-		 * - loadRow() - <br />
-		 * - skipDomReady (boolean)<br />
-		 * @name Manager#registerCoreModule
-		 */
-		registerCoreModule: _registerCoreModule,
-
-		/**
-		 * Publishes a message, which any other module that's been registered can subscribe to.
-		 * @function
-		 * @param {Object|Array} messages either a single object (single message) or an array of messages.
-		 * Each message is an object of the following form:
-		 *   { sender: MODULE_ID, type: "event-name-here" }<br />
-		 * The sender is the unique module ID of the module sending the message (i.e. the same module ID you
-		 * passed into the manager.register() function). The type is the string name of the message that's taking
-		 * place. It can be anything, but make it make sense. The Core events are found in scripts/constants.php.
-		 * You can add as many other object properties as you want - they will all be passed along to anyone
-		 * subscribing to the event.
-		 * @name Manager#publish
-		 */
-		publish: _publish,
-
-		/**
-		 * Our main subscribe() function. This is called by any module, regardless of type,
-		 * to allow it to subscribe to one or more specific notifications.
-		 * @function
-		 * @param string moduleID
-		 * @param array
-		 * @name Manager#subscribe
-		 */
-		subscribe: _subscribe,
-
-		/**
-		 * @function
-		 * @name Manager#unsubscribe
-		 */
-		unsubscribe: _unsubscribe,
-
-		/**
-		 * Return an object containing all registered modules.
-		 * @function
-		 * @name Manager#getModules
-		 */
-		getModules: _getModules,
-
-		/**
-		 * Called by the generator when a saved data set is loaded. This passes the saved data sets to the individual
-		 * Data Types so they load their own data as they see fit.
-		 * @function
-		 * @name Manager#loadDataTypeRows
-		 */
-		loadDataTypeRows: _loadDataTypeRows,
-
-		/**
-		 * This performs the necessary validation on whatever data types are in the table. It farms out
-		 * the work to the appropriate module and returns an array of objects containing the (localized) error
-		 * strings and offending form fields. The generator does the job of the styling and error display.
-		 * @function
-		 * @param {Object} rowValidationNeededGroupedByDataType
-		 * @name Manager#validateDataTypes
-		 */
-		validateDataTypes: _validateDataTypes,
-
-		/**
-		 * @function
-		 * @name Manager#validateExportType
-		 */
-		validateExportType: _validateExportType,
-
-		/**
-		 * @function
-		 * @name Manager#serializeDataTypeRow
-		 */
-		serializeDataTypeRow: _serializeDataTypeRow,
-
-		/**
-		 * @function
-		 * @name Manager#serializeExportTypes
-		 */
-		serializeExportTypes: _serializeExportTypes,
-
-		/**
-		 * @function
-		 * @name Manager#loadExportType
-		 */
-		loadExportType: _loadExportType,
-
-		/**
-		 * This is used whenever a user loads a new Data Set or clears the current form. It calls all
-		 * Export Type's resetSettings() function, to ensure the Export Types section returns to its
-		 * factory defaults.
-		 * @function
-		 * @name Manager#resetExportTypes
-		 */
-		resetExportTypes: _resetExportTypes,
-
-		/**
-		 * Activates the entire client-side code. This may only be executed once, and is done by the
-		 * Core code.
-		 * @function
-		 * @name Manager#start
-		 */
-		start: _start
-	};
-});
diff --git a/resources/scripts/pageInit.js b/resources/scripts/pageInit.js
deleted file mode 100644
index 633a8a700..000000000
--- a/resources/scripts/pageInit.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/*jslint browser:true*/
-/*global $:false,define:false*/
-define([
-	"manager",
-	"utils",
-	"lang"
-], function(manager, utils, L) {
-
-	"use strict";
-
-	/**
-	 * @name PageInit
-	 * @see Core
-	 * @description This runs on page load to initialize various general functionality needed: main tab
-	 * events, language dropdown events etc.
-	 * @return {Object}
-	 * @namespace
-	 */
-
-	var MODULE_ID = "core-pageInit";
-	var _currMainTab = 1;
-
-	var _init = function() {
-        utils.initMainSpinner();
-
-		// show all those elements in the page that were marked as being hidden if no JS
-		$(".gdHideNoJS").show("fade");
-		$("#gdPageLoad").hide();
-		_initStartTab();
-		_initMainTabs();
-		$("#gdSelectLanguage").bind("change", _changeLanguage);
-
-		// for the Settings tab
-		if ($("#consoleEventsDataTypePlugins").length > 0) {
-			$("#consoleEventsDataTypePlugins").chosen({ no_results_text: L.no_data_types_found });
-		}
-		if ($("#consoleEventsExportTypePlugins").length > 0) {
-			$("#consoleEventsExportTypePlugins").chosen({ no_results_text: L.no_export_types_found });
-		}
-	};
-
-	var _changeLanguage = function() {
-		var langFile = $("#gdSelectLanguage").val();
-		if (langFile !== "") {
-			window.location = "?lang=" + langFile + "#t" + _currMainTab;
-		}
-	};
-
-	// if the page was just reloaded, see if we need to display a particular tab
-	var _initStartTab = function() {
-		if (window.location.href.match(/#/)) {
-			var tab = window.location.href.split("#")[1].replace(/^t/, "");
-
-			if (utils.isNumber(tab)) {
-				tab = parseInt(tab, 10);
-				if (tab >= 1) {
-					utils.selectTab({ tabGroup: "mainTabs", tabIDPrefix: "gdMainTab", newTab: tab, oldTab: 1 });
-					_currMainTab = tab;
-				}
-			}
-		}
-	};
-
-	var _initMainTabs = function() {
-		$("#gdMainTabs ul li").each(function() {
-			var newTab = parseInt($(this).attr("id").replace(/^gdMainTab/, ""), 10);
-			$(this).bind("click", function() {
-				utils.selectTab({ tabGroup: "mainTabs", tabIDPrefix: "gdMainTab", newTab: newTab, oldTab: _currMainTab } );
-
-				window.location = window.location.href.split("#")[0] + "#t" + newTab;
-				_currMainTab = newTab;
-
-				// workaround for Chosen bug
-				if (newTab === 1) {
-					$("#gdCountries_chzn, #gdCountries_chzn .chzn-drop").css({ width: "100%" });
-				}
-
-				// hide any messages already open on the old tab
-				var message = $("#gdMainTab" + _currMainTab + "Content" + " .gdMessage");
-				if (!message.hasClass("gdStickyMessage")) {
-					message.hide();
-				}
-			});
-		});
-	};
-
-
-	// register our module
-	manager.registerCoreModule(MODULE_ID, {
-		init: _init
-	});
-
-});
diff --git a/resources/scripts/pluginManager.js b/resources/scripts/pluginManager.js
deleted file mode 100644
index 44ecb6c4c..000000000
--- a/resources/scripts/pluginManager.js
+++ /dev/null
@@ -1,217 +0,0 @@
-/*global $:false,define:false*/
-define([
-	"lang"
-], function(L) {
-
-	"use strict";
-
-	/**
-	 * Used in the installation and Setting tab. This contains the code to install all plugins and
-	 * display the success / error response.
-	 *
-	 * It requires the page to contain the following markup, where it will be inserting the result of the
-	 * installation.
-	 *
-	 *		<div id="pluginInstallationResults" class="hidden">
-	 *			<div>
-	 *				<h4>1. Data Types</h4>
-	 *				<div id="gdDataTypeResponse" class="gdResponse"></div>
-	 *			</div>
-	 *			<div>
-	 *				<h4>2. Export Types</h4>
-	 *				<div id="gdExportTypeResponse" class="gdResponse"></div>
-	 *			</div>
-	 *			<div>
-	 *				<h4>3. Countries</h4>
-	 *				<div id="gdCountriesResponse" class="gdResponse"></div>
-	 *			</div>
-	 *		</div>
-	 *		<div class="gdClear"></div>
-	 */
-
-	// used as an iterator to install the plugins one by one
-	var _currIndex = 0;
-	var _context = "reset"; // reset / installation
-	var _errorHandler = null;
-	var _onCompleteHandler = null;
-	var _successfullyInstalledDataTypes = [];
-	var _successfullyInstalledExportTypes = [];
-	var _successfullyInstalledCountries = [];
-
-
-	var _installPlugins = function(params) {
-		_context = ($("body").hasClass("gdInstallPage")) ? "installation" : "reset";
-		_errorHandler      = params.errorHandler;
-		_onCompleteHandler = params.onCompleteHandler;
-		$("#gdPluginInstallationResults").removeClass("hidden").css("display", "none").show("fade");
-		$("#gdPluginInstallationResults .gdResponse").html("");
-		_installDataTypes();
-	};
-
-	var _installDataTypes = function() {
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: _context + "DataTypes",
-				index: _currIndex
-			},
-			success: _installDataTypeResponse,
-			error: _errorHandler
-		});
-	};
-
-	var _installDataTypeResponse = function(json) {
-		// once all data types are installed, send the list of successful installations to the server
-		if (json.isComplete) {
-			$.ajax({
-				url: "ajax.php",
-				type: "POST",
-				dataType: "json",
-				data: {
-					action: _context + "SaveDataTypes",
-					folders: _successfullyInstalledDataTypes.toString()
-				},
-				success: function() {
-					// now proceed to the Export Types!
-					_currIndex = 0;
-					_installExportTypes();
-				},
-				error: _errorHandler
-			});
-		} else {
-			var str = "";
-			if (json.success) {
-				str = json.dataTypeName + " <span class=\"gdSuccess\">" + L.success + "</span>";
-				_successfullyInstalledDataTypes.push(json.dataTypeFolder);
-			} else {
-				str = json.dataTypeName + " <span class=\"gdError\" data-error=\"" + json.content + "\">" + L["error"] + "</span>";
-			}
-			$("#gdDataTypeResponse").append("<div>" + str + "</div>");
-
-			_currIndex++;
-			_installDataTypes();
-		}
-	};
-
-	var _installExportTypes = function() {
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: _context + "ExportTypes",
-				index: _currIndex
-			},
-			success: _installExportTypesResponse,
-			error: _errorHandler
-		});
-	};
-
-	var _installExportTypesResponse = function(json) {
-		if (json.isComplete) {
-			$.ajax({
-				url: "ajax.php",
-				type: "POST",
-				dataType: "json",
-				data: {
-					action: _context + "SaveExportTypes",
-					folders: _successfullyInstalledExportTypes.toString()
-				},
-				success: function() {
-
-					// next, onto the Country plugins
-					_currIndex = 0;
-					_installCountries();
-				},
-				error: _errorHandler
-			});
-		} else {
-			var str = "";
-			if (json.success) {
-				str = json.exportTypeName + " <span class=\"gdSuccess\">success</span>";
-				_successfullyInstalledExportTypes.push(json.exportTypeFolder);
-			} else {
-				str = json.exportTypeName + " <span class=\"gdError\" data-error=\"" + json.content + "\">error</span>";
-			}
-			$("#gdExportTypeResponse").append("<div>" + str + "</div>");
-
-			_currIndex++;
-			_installExportTypes();
-		}
-	};
-
-	var _installCountries = function() {
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: _context + "Countries",
-				index: _currIndex
-			},
-			success: _installCountriesResponse,
-			error: _errorHandler
-		});
-	};
-
-	var _installCountriesResponse = function(json) {
-		if (json.isComplete) {
-			$.ajax({
-				url: "ajax.php",
-				type: "POST",
-				dataType: "json",
-				data: {
-					action: _context + "SaveCountries",
-					folders: _successfullyInstalledCountries.toString()
-				},
-				success: _runPostProcesses,
-				error: _errorHandler
-			});
-		} else {
-			var str = "";
-			if (json.success) {
-				str = json.countryName + " <span class=\"gdSuccess\">" + L.success + "</span>";
-				_successfullyInstalledCountries.push(json.countryFolder);
-			} else {
-				str = json.countryName + " <span class=\"gdError\" data-error=\"" + json.content + "\">" + L["error"] + "</span>";
-			}
-			$("#gdCountriesResponse").append("<div>" + str + "</div>");
-
-			_currIndex++;
-			_installCountries();
-		}
-	};
-
-	/**
-	 * After all plugin information has been sent to the server, run whatever post-processes are needed.
-	 * @private
-	 */
-	var _runPostProcesses = function() {
-		$.ajax({
-			url: "ajax.php",
-			type: "POST",
-			dataType: "json",
-			data: {
-				action: "updatedPluginsPostProcess"
-			},
-			success: function() {
-				_currIndex = 0;
-				if ($.isFunction(_onCompleteHandler)) {
-					_onCompleteHandler();
-				}
-			},
-			error: _errorHandler
-		});
-	};
-
-
-	/**
-	 * Our public API.
-	 */
-	return {
-		installPlugins: _installPlugins
-	};
-
-});
diff --git a/resources/scripts/queue.js b/resources/scripts/queue.js
deleted file mode 100644
index 096f610dc..000000000
--- a/resources/scripts/queue.js
+++ /dev/null
@@ -1,165 +0,0 @@
-/*global console:false,setTimeout:false,setInterval:false,clearInterval:false,define:false*/
-define([], function() {
-
-	"use strict";
-
-	/**
-	 * @name Queue
-	 * @description A requireJS module for simplifying intensive DOM-insertion code. It lets you add a list of actions
-	 *     to perform on the DOM, each with a test to confirm when the DOM insertion is complete. The code then sequentially
-	 *     executes each action one by one, only performing the next action when the previous is compete. This ensures that
-	 *     the DOM will reliably contain the content you expect and you're not trying to read something the browser's HTML
-	 *     rendering engine has yet to finish inserting. For more info on the problem, see:  http://www.benjaminkeen.com/?p=136
-	 * @author Ben Keen <ben.keen@gmail.com>
-	 * @see Core
-	 * @example To use this in your own requireJS modules, there are two steps:
-	 *	(1) Add things to the queue.
-	 *     Queue.add({
-	 *			"execute": function() {
-	 *				// some sort of DOM insertion code here
-	 *			},
-	 *			"isComplete": function() {
-	 *				// return a boolean here, e.g. do a document.getElementID() on an element that you just inserted
-	 *				// in the function before. That's enough to confirm the HTML rendering engine has inserted it & is accessible
-	 *			}
-	 *     });
-	 *	(2) Process the queue.
-	 *		Queue.process({ onSuccess: function() { // our onSuccess callback function here }});
-	 *
-	 * @return {Object}
-	 * @namespace
-	 */
-
-	// if this is enabled, the module will output errors and information to the console
-	var _debugMode = false;
-
-
-	var _queue = {
-		isProcessing: false,
-		domChanges: [],
-		onSuccess: [],
-		onError: [],
-
-		// the milliseconds between trying to see if the last performed DOM insertion is now deemed to be complete
-		reTestItemSpeed: null,
-
-		// the number of milliseconds (defaults to 10 seconds)
-		incompleteActionDuration: null,
-
-
-		add: function(obj) {
-			if (!obj.hasOwnProperty("execute")) {
-				if (_debugMode) {
-					console.log("Queue.add(): object passed is missing execute property (function)", obj);
-				}
-				return;
-			}
-			if (!obj.hasOwnProperty("isComplete")) {
-				if (_debugMode) {
-					console.log("Queue.add(): object passed is missing isComplete property (function)", obj);
-				}
-				return;
-			}
-			_queue.domChanges.push(obj);
-		},
-
-		process: function(settings) {
-			var onSuccess = null;
-			var onError = null;
-			var reTestItemSpeed = 25;
-			var incompleteActionDuration = 5000;
-			if (typeof settings === 'object') {
-				if (settings.hasOwnProperty("onSuccess")) { onSuccess = settings.onSuccess; }
-				if (settings.hasOwnProperty("onError")) { onError = settings.onError; }
-				if (settings.hasOwnProperty("reTestItemSpeed")) { reTestItemSpeed = settings.reTestItemSpeed; }
-				if (settings.hasOwnProperty("incompleteActionDuration")) { incompleteActionDuration = settings.incompleteActionDuration; }
-			}
-
-			if (onSuccess) { _queue.onSuccess.push(onSuccess); }
-			if (onError) { _queue.onError.push(onError); }
-
-			// if the queue processing is already started, we ignore any new settings for the processing
-			// other than the onSuccess and onError handlers
-			if (!_queue.isProcessing) {
-				if (_debugMode) {
-					console.log("---------- Queue processing started ----------");
-				}
-
-				_queue.reTestItemSpeed = reTestItemSpeed;
-				_queue.incompleteActionDuration = incompleteActionDuration;
-				_queue.isProcessing = true;
-				_queue.next();
-			} else {
-				if (_debugMode) {
-					console.log("Received request to start processing, but processing already started. ", settings);
-				}
-			}
-		},
-
-		next: function() {
-			if (!_queue.domChanges.length) {
-				_queue.isProcessing = false;
-				_queue.callOnCompleteHandlers();
-				return;
-			}
-
-			// if this code hasn't begun being executed, start 'er up
-			if (!_queue.domChanges[0].interval) {
-				var currObj = this;
-				setTimeout(function() { currObj.domChanges[0].execute(); }, 10);
-				_queue.domChanges[0].interval = setInterval(function() { _queue.examineQueue(); }, _queue.reTestItemSpeed);
-				_queue.domChanges[0].timeStarted = Date.now();
-			}
-		},
-
-		examineQueue: function() {
-			if (_queue.domChanges[0].isComplete()) {
-				clearInterval(_queue.domChanges[0].interval);
-				_queue.domChanges.shift();
-				_queue.next();
-			} else {
-				if (_debugMode) {
-					console.log("Not complete: ", _queue.domChanges[0]);
-				}
-
-				// if too much time has elapsed, end the queue and call the onError callbacks
-				var now = Date.now();
-				if (_queue.domChanges[0].timeStarted + _queue.incompleteActionDuration < now) {
-					if (_debugMode) {
-						console.log("Error! Queue item took longer than " + _queue.incompleteActionDuration + "ms to perform.");
-						console.log("Item with problem: ", _queue.domChanges[0]);
-						console.log("Firing onError handlers:", _queue.onError);
-						console.log("---------- Queue processing ended ----------");
-					}
-					for (var i=0; i<_queue.onError.length; i++) {
-						try {
-							_queue.onError[i]();
-						} catch (e) { }
-					}
-
-					clearInterval(_queue.domChanges[0].interval);
-					_queue.isProcessing = false;
-					_queue.domChanges = [];
-					_queue.onSuccess = [];
-					_queue.onError = [];
-				}
-			}
-		},
-
-		callOnCompleteHandlers: function() {
-			if (_debugMode) {
-				console.log("Done! Queue is now empty: firing onSuccess handlers:", _queue.onSuccess);
-				console.log("---------- Queue processing ended ----------");
-			}
-			for (var i=0; i<_queue.onSuccess.length; i++) {
-				try {
-					_queue.onSuccess[i]();
-				} catch (e) { }
-			}
-			_queue.onSuccess = [];
-			_queue.onError = [];
-		}
-	};
-
-	return _queue;
-});
diff --git a/resources/scripts/requireConfig.js b/resources/scripts/requireConfig.js
deleted file mode 100644
index bcc344b76..000000000
--- a/resources/scripts/requireConfig.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*global require:false*/
-require.config({
-	baseUrl: "",
-	paths: {
-		manager:           "resources/scripts/manager",
-		appStartGenerated: "cache/appStartGenerated",
-		pluginManager:     "resources/scripts/pluginManager",
-		accountManager:    "resources/scripts/accountManager",
-		constants:         "resources/scripts/constants.php?",
-		generator:         "resources/scripts/generator",
-		io:                "resources/scripts/io",
-		utils:             "resources/scripts/utils",
-		moment:            "resources/scripts/libs/moment.min",
-		lang:              "resources/scripts/lang.php?",
-		queue:             "resources/scripts/queue",
-		pageInit:          "resources/scripts/pageInit",
-		tablesorter:       "resources/scripts/libs/jquery.tablesorter.widgets.min"
-	},
-	shim: {
-		"tablesorter": {
-			deps: ['resources/scripts/libs/jquery.tablesorter.min']
-		}
-	},
-	waitSeconds: 60
-});
diff --git a/resources/scripts/utils.js b/resources/scripts/utils.js
deleted file mode 100644
index 62bf55dc9..000000000
--- a/resources/scripts/utils.js
+++ /dev/null
@@ -1,302 +0,0 @@
-/*jslint browser:true*/
-/*global $:false,Spinners:false,define:false,console:false*/
-define([
-	"manager",
-	"constants",
-	"lang"
-], function(manager, C, L) {
-
-	"use strict";
-
-	/**
-	 * @name Utils
-	 * @see Core
-	 * @description This file contains various helper functions for anyone that wants it.
-	 * @return {Object}
-	 * @namespace
-	 */
-
-	var MODULE_ID = "core-utils";
-	var _errors   = [];
-	var _spinner  = null;
-	var _modalSpinners = {}; // a hash of modal ID => Spinner element
-
-	var _queue = {
-		domChanges: [],
-
-		add: function(arr) {
-			_queue.domChanges.push(arr);
-		},
-
-		process: function() {
-			if (!_queue.domChanges.length) {
-				return;
-			}
-
-			// if this code hasn't begun being executed, start 'er up
-			if (!_queue.domChanges[0][2]) {
-				var currObj = this;
-				setTimeout(function() { currObj.domChanges[0][0](); }, 10);
-				_queue.domChanges[0][2] = setInterval(function() { _queue.examineQueue(); }, 25);
-			}
-		},
-
-		examineQueue: function() {
-			if (_queue.domChanges[0][1]()) {
-				clearInterval(_queue.domChanges[0][2]);
-				_queue.domChanges.shift();
-				_queue.process();
-			}
-		}
-	};
-
-
-	var _getParamByName = function(name) {
-		name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
-		var regexS = "[\\?&]" + name + "=([^&#]*)";
-		var regex = new RegExp(regexS);
-		var results = regex.exec(window.location.search);
-		if (results === null) {
-			return "";
-		} else {
-			return decodeURIComponent(results[1].replace(/\+/g, " "));
-		}
-	};
-
-	var _generateRandomAlphaNumericStr = function(len) {
-		var chars = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ";
-		var result = '';
-		for (var i=len; i>0; --i) {
-			result += chars[Math.round(Math.random() * (chars.length - 1))];
-		}
-		return result;
-	};
-
-	return {
-
-		/**
-		 * @description This is a general tab-changer helper function for use by any tabbed group. It
-		 * needs to be passed the old tab number, new tab number, the CSS prefix used for to ID the tabs
-		 * and the name of the tab group (to be used in the publish message). For an example, see the
-		 * pageInit.js file, which initializes the main tabs.
-		 * @function
-		 * @public
-		 * @param {Object}
-		 * @name Utils#selectTab
-		 */
-		selectTab: function(settings) {
-			var opts = $.extend({
-				tabGroup: "",
-				oldTab: null,
-				newTab: null,
-				tabIDPrefix: ""
-			}, settings);
-
-			if (opts.oldTab === opts.newTab) {
-				return false;
-			}
-
-			if (opts.oldTab !== null) {
-				$("#" + opts.tabIDPrefix + opts.oldTab).removeClass("gdSelected");
-				$("#" + opts.tabIDPrefix + opts.oldTab + "Content").hide();
-			}
-			if (opts.newTab !== null) {
-				var newTabEl = $("#" + opts.tabIDPrefix + opts.newTab);
-				if (newTabEl.length === 0) {
-					$("#" + opts.tabIDPrefix + "1").addClass("gdSelected");
-					$("#" + opts.tabIDPrefix + "1Content").show();
-				} else {
-					newTabEl.addClass("gdSelected");
-					$("#" + opts.tabIDPrefix + opts.newTab + "Content").show();
-				}
-			}
-
-			manager.publish({
-				sender: MODULE_ID,
-				type: C.EVENT.TAB.CHANGE,
-				tabGroup: opts.tabGroup,
-				oldTab: opts.oldTab,
-				newTab: opts.newTab
-			});
-
-			return false;
-		},
-
-		/**
-		 * Called on page load, this initializes the main spinner canvas icon that appears
-		 * at the top right of the tabset.
-		 */
-		initMainSpinner: function() {
-			if (_spinner !== null) {
-				return;
-			}
-			_spinner = Spinners.create('#gdProcessingIcon', {
-				radius: 4,
-				height: 5,
-				width: 1.5,
-				dashes: 14,
-				opacity: 1,
-				padding: 0,
-				rotation: 1400,
-				fadeOutSpeed: 0,
-				color: '#006600',
-				pauseColor: '#aaaaaa',
-				pauseOpacity: 1
-			}).pause();
-		},
-
-		startProcessing: function() {
-			_spinner.play();
-		},
-
-		stopProcessing: function() {
-			_spinner.pause();
-		},
-
-		insertModalSpinner: function(paramSettings) {
-			var settings = $.extend({
-				modalID: null
-			}, paramSettings);
-
-			if (settings.modalID === null) {
-				console.log("_insertModalSpinner needs to be passed the modal ID.");
-				return;
-			}
-
-			// if this modal's spinner has already been created, do nothing - we don't need to recreate it
-			if (_modalSpinners.hasOwnProperty(settings.modalID)) {
-				return;
-			}
-
-			var dialogBottomRow = $('#' + settings.modalID).closest(".ui-dialog").find(".ui-dialog-buttonpane");
-			dialogBottomRow.prepend('<span class="modalSpinner"></span>');
-			var spinnerSpan = dialogBottomRow.children("span")[0];
-			_modalSpinners[settings.modalID] = Spinners.create(spinnerSpan, {
-				radius: 7,
-				height: 9,
-				width: 2,
-				dashes: 20,
-				opacity: 1,
-				padding: 0,
-				rotation: 1400,
-				fadeOutSpeed: 0,
-				color: '#333333',
-				pauseColor: '#000000',
-				pauseOpacity: 0.14
-			}).pause();
-		},
-
-		playModalSpinner: function(modalID) {
-			_modalSpinners[modalID].play();
-		},
-
-		pauseModalSpinner: function(modalID) {
-			_modalSpinners[modalID].pause();
-		},
-
-		/**
-		 * This adds an array of error objects, or just a single one.
-		 */
-		addValidationErrors: function(newErrors) {
-			if ($.isArray(newErrors)) {
-				if (newErrors.length) {
-					_errors = _errors.concat(newErrors);
-				}
-			} else {
-				_errors.push(newErrors);
-			}
-		},
-
-		clearValidationErrors: function(topLevelEl) {
-			_errors = [];
-			$(topLevelEl).find(".gdProblemField").removeClass("gdProblemField");
-		},
-
-		hideValidationErrors: function(el, unhighlightProblemFields) {
-			if (el.css("display") != "block") {
-				return;
-			}
-			if (unhighlightProblemFields) {
-				$(el).find(".gdProblemField").removeClass("gdProblemField");
-			}
-			$(el).closest(".gdMessage").hide("blind", null, 500);
-			_errors = [];
-			return false;
-		},
-
-		/**
-		 * Helper function to return the errors currently that have been logged.
-		 */
-		getValidationErrors: function() {
-			return _errors;
-		},
-
-		/**
-		 * Displays the errors
-		 */
-		displayValidationErrors: function(el) {
-			var html = "<ul>";
-			var hasFocus = false;
-
-			for (var i=0; i<_errors.length; i++) {
-				if (typeof _errors[i] != "object" || !_errors[i].hasOwnProperty("error")) {
-					continue;
-				}
-
-				// style all offending fields and focus on the first one with a problem
-				if (_errors[i].els !== null) {
-					for (var j=0; j<_errors[i].els.length; j++) {
-						if (!hasFocus) {
-							$(_errors[i].els[j]).focus();
-							hasFocus = true;
-						}
-						$(_errors[i].els[j]).addClass("gdProblemField");
-					}
-				}
-
-				html += "<li>" + _errors[i].error + "</li>";
-			}
-			$(el).removeClass("gdNotify").addClass("gdErrors gdMarginTop");
-			$(el).find("div").html(html);
-
-			// display the message
-			this.updateMessageBlock(el, "error");
-		},
-
-		displayMessage: function(el, message) {
-			$(el).removeClass("gdErrors").addClass("gdNotify gdMarginTop");
-			$(el).find("div").html(message);
-			this.updateMessageBlock(el, "notify");
-		},
-
-		/**
-		 * Helper function to actually show / highlight a message block consistently. This assumes the message / error
-		 * is already in the element. It either blinds it quickly in, or does a highlight effect to draw attention to it.
-		 */
-		updateMessageBlock: function(el, messageType) {
-			var color = (messageType == "error") ? "#ffc9c9" : "#a4c2ff";
-			if ($(el).css("display") != "block") {
-				$(el).show("blind", null, 500);
-			} else {
-				$(el).effect("highlight", { color: color }, 1500);
-			}
-		},
-
-		isNumber: function(n) {
-			return !isNaN(parseFloat(n)) && isFinite(n);
-		},
-
-		isValidEmail: function(str) {
-			var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-			return re.test(str);
-		},
-
-		formatNumWithCommas: function(num) {
-			return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-		},
-
-		getParamByName: _getParamByName,
-
-		generateRandomAlphaNumericStr: _generateRandomAlphaNumericStr
-	};
-});
diff --git a/resources/templates/dialogs.tpl b/resources/templates/dialogs.tpl
deleted file mode 100644
index ff0edf68f..000000000
--- a/resources/templates/dialogs.tpl
+++ /dev/null
@@ -1,237 +0,0 @@
-<div id="gdEmptyFormDialog"></div>
-
-<div id="gdMainDialog" class="hidden">
-	<div id="gdMainDialogTabs" class="gdModalTabs gdThreeCols">
-		<ul>
-			<li id="gdMainDialogTab1" class="gdSelected">{$L.your_account}</li>
-			<li id="gdMainDialogTab2">{$L.your_data_sets}</li>
-			<li id="gdMainDialogTab3">{$L.data_types}</li>
-		</ul>
-	</div>
-
-	<div id="gdMainDialogContent">
-		<div id="gdMainDialogTab1Content">
-			<div style="display:none" class="gdMessage gdNotify gdMarginTop" id="gdMainDialogTab1Message">
-				<a class="gdMessageClose" href="#">X</a>
-				<p>{$L.account_updated}</p>
-			</div>
-
-			<div style="float:left; width: 400px">
-				<h2>{$L.account_info}</h2>
-				<form>
-					<table cellpadding="0" cellspacing="1">
-					<tr>
-						<td width="160"><label for="gdUserAccount_firstName">{$L.first_name}</label></td>
-						<td><input type="text" id="gdUserAccount_firstName" class="medium" /></td>
-					</tr>
-					<tr>
-						<td><label for="gdUserAccount_lastName">{$L.last_name}</label></td>
-						<td><input type="text" id="gdUserAccount_lastName" class="medium" /></td>
-					</tr>
-					<tr>
-						<td><label for="gdUserAccount_email">{$L.email}</label></td>
-						<td><input type="text" id="gdUserAccount_email" class="medium" /></td>
-					</tr>
-					<tr>
-						<td colspan="2" class="mediumGrey">
-							<br />
-							<i>{$L.password_change_note}</i>
-						</td>
-					</tr>
-					<tr>
-						<td><label for="gdUserAccount_password">{$L.password}</label></td>
-						<td>
-							<input type="password" id="gdUserAccount_password" value="" />
-						</td>
-					</tr>
-					<tr>
-						<td><label for="gdUserAccount_password2">{$L.reenter_password}</label></td>
-						<td>
-							<input type="password" id="gdUserAccount_password2" value="" />
-						</td>
-					</tr>
-					</table>
-					<p>
-						<button class="gdPrimaryButton" id="gdUpdateAccountInfo">{$L.update_account}</button>
-					</p>
-				</form>
-			</div>
-
-			<div style="float:left; width: 300px">
-				<h2>{$L.info_and_stats}</h2>
-
-				<table cellpadding="0" cellspacing="0">
-				<tr>
-					<td valign="top" width="180">{$L.account_type}</td>
-					<td id="gdAccount_AccountType"></td>
-				</tr>
-				<tr>
-					<td>{$L.num_saved_data_sets}</td>
-					<td id="gdAccount_NumSavedDataSets"></td>
-				</tr>
-				<tr>
-					<td>{$L.total_rows_generated}</td>
-					<td id="gdAccount_TotalRowsGenerated"></td>
-				</tr>
-				<tr>
-					<td>{$L.date_account_created}</td>
-					<td id="gdAccount_DateAccountCreated"></td>
-				</tr>
-				</table>
-			</div>
-		</div>
-
-		<div id="gdMainDialogTab2Content" class="hidden">
-			<p id="gdNoAccountDataSets" class="hidden">{$L.no_saved_data_sets}</p>
-			<table width="100%" cellpadding="0" cellspacing="1" id="gdAccountDataSets" class="highlightTableRows">
-				<thead>
-					<tr>
-						<th class="leftAligned">{$L.data_set_name}</th>
-						<th class="leftAligned">{$L.data_created}</th>
-						<th class="leftAligned">{$L.last_modified}</th>
-						<th align="center">{$L.public_q}</th>
-						<th align="center">{$L.rows_generated}</th>
-						<th width="60" align="center">{$L.load}</th>
-						<th width="24" align="center" class="gdDataSetCheckRowCell"><input type="checkbox" id="gdSelectAllDataSets" /></th>
-					</tr>
-				</thead>
-				<tbody></tbody>
-			</table> 
-		</div>
-		<div id="gdMainDialogTab3Content" class="hidden">
-			<div id="gdDataSetHelpNav">
-				{data_types_list}
-			</div>
-			<div id="gdDataSetHelpContent">
-				<h3 id="gdFocusedDataTypeHeader"></h3>
-				{data_type_help}
-			</div>
-		</div>
-	</div>
-</div>
-
-<div id="gdLinkToDataSetDialog" class="hidden">
-	<div id="gdLinkToDataSet_incomplete">
-		<p>
-			{$L.save_data_set_to_link}
-		</p>
-	</div>
-	<div id="gdLinkToDataSet_complete">
-		<p>
-			<input type="checkbox" id="gdDataSetPublic" /> 
-			<label for="gdDataSetPublic">{$L.make_data_set_public_agreement}</label>
-		</p>
-		<input type="input" id="gdLinkURL" readonly="true" />
-	</div>
-</div>
-
-
-<div id="gdManageAccountDialog" class="hidden">
-	<div style="display:none" class="gdMessage gdNotify gdMarginTop gdMarginBottom" id="gdManageAccountDialogMessage">
-		<a class="gdMessageClose" href="#">X</a>
-		<div></div>
-	</div>
-
-	<table>
-	<tr>
-		<td width="160">{$L.first_name}</td>
-		<td><input type="text" id="gdManageAccount_firstName" class="medium" /></td>
-	</tr>
-	<tr>
-		<td>{$L.last_name}</td>
-		<td><input type="text" id="gdManageAccount_lastName" class="medium" /></td>
-	</tr>
-	<tr>
-		<td>{$L.email}</td>
-		<td><input type="text" id="gdManageAccount_email" class="medium" /></td>
-	</tr>
-	<tr>
-		<td>{$L.password}</td>
-		<td>
-			<div id="gdManageAccount_pwdCreate">
-				<input type="text" id="gdManageAccount_password" value="" />
-				<span id="gdRefreshPassword"></span>
-			</div>
-			<div id="gdManageAccount_pwdEdit">********</div>
-		</td>
-	</tr>
-	</table>
-
-	<p id="gdManageAccountDialogEmailRow">
-		<input type="checkbox" id="gdAutoEmailAccountDetails" checked="checked" />
-			<label for="gdAutoEmailAccountDetails">{$L.email_user_login_info}</label>
-	</p>
-</div>
-
-<div id="gdDeleteAccountDialog" class="hidden">
-	<div class="gdIconWarning"></div>
-	<div>
-		<p>
-			{$L.confirm_delete_user_account}
-		</p>
-		<table>
-		<tr>
-			<th width="120">{$L.first_name}</th>
-			<td id="gdDeleteAccount_firstName"></td>
-		</tr>
-		<tr>
-			<th>{$L.last_name}</th>
-			<td id="gdDeleteAccount_lastName"></td>
-		</tr>
-		<tr>
-			<th>{$L.email}</th>
-			<td id="gdDeleteAccount_email"></td>
-		</tr>
-		</table>
-	</div>
-</div>
-
-<div id="gdLoginDialog" class="hidden">
-	<div id="gdLoginDialogTabs" class="gdModalTabs gdTwoCols">
-		<ul>
-			<li id="gdLoginDialogTab1" class="gdSelected">{$L.login}</li>
-			<li id="gdLoginDialogTab2">{$L.forgotten_your_password_q}</li>
-		</ul>
-	</div>
-	<div id="gdLoginDialogContent">
-		<div id="gdLoginDialogTab1Content">
-			<div class="gdMessage gdErrors" id="gdLoginError">
-				<a class="gdMessageClose" href="#">X</a>
-				<div></div>
-			</div>
-			<div style="padding: 6px 10px;">
-				<form>
-					<table>
-						<tr>
-							<th width="120">{$L.email}</th>
-							<td><input type="text" name="gdLogin_email" id="gdLogin_email" /></td>
-						</tr>
-						<tr>
-							<th>{$L.password}</th>
-							<td><input type="password" name="gdLogin_password" id="gdLogin_password" /></td>
-						</tr>
-					</table>
-				</form>
-			</div>
-		</div>
-		<div id="gdLoginDialogTab2Content" class="hidden">
-			<div class="gdMessage gdErrors" id="gdResetPasswordMessage">
-				<a class="gdMessageClose" href="#">X</a>
-				<div></div>
-			</div>
-			<div style="padding: 6px 10px;">
-				<div style="padding-bottom: 2px">
-					{$L.enter_email_address_to_reset_password}
-				</div>
-				<form>
-					<table>
-						<tr>
-							<th width="120">{$L.email}</th>
-							<td><input type="text" name="gdEmailReminder" id="gdEmailReminder" style="width: 200px" /></td>
-						</tr>
-					</table>
-				</form>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/resources/templates/footer.tpl b/resources/templates/footer.tpl
deleted file mode 100644
index 271789ac5..000000000
--- a/resources/templates/footer.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-	<footer class="gdHideNoJS">
-		<ul>
-			<li><span>{$version}</span></li>
-			<li><span><a href="http://benkeen.github.io/generatedata/" target="_blank">{$L.documentation}</a></span></li>
-			<li><span><a href="http://www.generatedata.com" target="_blank">{$L.website}</a></span></li>
-			<li><span><a href="https://github.com/benkeen/generatedata/issues" id="gdReportBug" target="_blank">{$L.report_bug}</a></span></li>
-		</ul>
-	</footer>
\ No newline at end of file
diff --git a/resources/templates/generate.tab1.tpl b/resources/templates/generate.tab1.tpl
deleted file mode 100644
index 24ba5c25a..000000000
--- a/resources/templates/generate.tab1.tpl
+++ /dev/null
@@ -1,144 +0,0 @@
-<ul id="gdActionIcons">
-	<li id="gdLoadLink" class="loading"><img src="resources/themes/{$theme}/images/load.png" title="{$L.your_data_sets}" /></li>
-	<li id="gdEmptyForm"><img src="resources/themes/{$theme}/images/trash.png" title="{$L.clear_the_page}" /></li>
-	<li id="gdDataSetLink" class="loading"><img src="resources/themes/{$theme}/images/link.png" title="{$L.link_to_this_data_set}" /></li>
-</ul>
-
-<form id="gdData" method="post">
-	{* here because the new window/tab export format option uses a simple POST. This standardizes it all
-	   so that for all export formats we can just serialize the form *}
-	<input type="hidden" name="gdRowOrder" id="gdRowOrder" />
-	<input type="hidden" name="gdExportType" id="gdExportType" />
-	<input type="hidden" name="gdNumCols" id="gdNumCols" />
-	<input type="hidden" name="gdExportFormat" id="gdExportFormat" />
-	<input type="hidden" name="configurationID" id="configurationID" /> {* TODO should have gd prefix! *}
-
-	<div id="gdGenerateSubtab1">
-		<input type="text" id="gdDataSetName" placeholder="{$L.your_data_set_name_here}" /><button type="button" id="gdSaveBtn">{$L.save|upper}</button>
-		<div class="gdClear" style="padding-bottom: 20px"></div>		
-
-		<h2>
-			{$L.country_specific_data|upper}
-			<span data-help-section="countryData" class="gdSectionHelp" title="{$L.tip_country_data}"></span>
-		</h2>
-
-		{country_plugins}
-
-		<div id="gdMessages" class="gdMessage">
-			<a class="gdMessageClose" href="#">X</a>
-			<div></div>
-		</div>
-
-		<div class="gdClear" style="padding-bottom: 20px"></div>
-
-		<h2>
-			{$L.data_set|upper}
-			<span data-help-section="dataTypes" class="gdSectionHelp" title="{$L.data_set_help}"></span>
-		</h2>
-
-		<ul class="gdTableHeadings">
-			<li class="gdColOrder">{$L.order}</li>
-			<li class="gdColTitle" id="gdColTitleTop">{$L.row_label}</li>
-			<li class="gdColDataType">{$L.data_type}</li>
-			<li class="gdColExamples">{$L.examples}</li>
-			<li class="gdColOptions">{$L.options}</li>
-			<li class="gdColHelp">{$L.help}</li>
-			<li class="gdColDelete"><input type="button" class="gdDeleteRowsBtn" value="{$L.del}" /></li>
-		</ul>
-		<ul id="gdTableRows"></ul>
-		<ul class="gdTableHeadings">
-			<li class="gdColOrder">{$L.order}</li>
-			<li class="gdColTitle" id="gdColTitleBottom">{$L.row_label}</li>
-			<li class="gdColDataType">{$L.data_type}</li>
-			<li class="gdColExamples">{$L.examples}</li>
-			<li class="gdColOptions">{$L.options}</li>
-			<li class="gdColHelp">{$L.help}</li>
-			<li class="gdColDelete"><input type="button" class="gdDeleteRowsBtn" value="{$L.del}" /></li>
-		</ul>
-		<div class="gdClear gdVerticalPad"></div>
-
-		<div id="gdAddDataSetRowsSection">
-			{$L.add} <input type="text" name="gdNumRowsToAdd" id="gdNumRowsToAdd" value="1" size="2" />
-			<input type="button" value="{$L.row_sp}" class="gdAddRowsBtn" />
-		</div>
-		<div class="gdClear" style="padding-bottom: 30px"></div>
-
-		<h2>
-			{$L.export_types|upper}
-			<span data-help-section="exportTypes" class="gdSectionHelp" title="{$L.export_types_help}"></span>
-		</h2>
-
-		<div id="gdExportTypeTabs" class="gdSmallTabs">
-			<span id="gdShowSettingsLink">
-				<span>+</span>
-				<a href="#">{$L.hide_data_format_options}</a>
-			</span>
-			{export_type_tabs}
-			{foreach from=$exportTypeAdditionalSettings key=k item=i}
-				<div id="gdExportTypeAdditionalSettings_{$k}" class="gdExportTypeTabSettings"
-					{if $defaultExportType == $k}style="display:block"{/if}>{$i}</div>
-			{/foreach}
-		</div>
-		<div class="gdClear"></div>
-
-		<div id="gdGenerateSection">
-			<button style="float: right" class="gdPrimaryButton" id="gdGenerateButton">{$L.generate}</button>
-			{$L.generate} <input type="text" name="gdNumRowsToGenerate" id="gdNumRowsToGenerate" value="{$defaultNumRows}" 
-				{if $inDemoMode == "true" || !$isLoggedIn}readonly="readonly"{/if} /> {$L.rows}
-			<span>
-				<input type="radio" name="gdExportTarget" id="gdExportTarget_inPage" value="inPage" checked="checked" />
-					<label for="gdExportTarget_inPage" id="gdExportTarget_inPage_label">{$L.generate_in_page}</label>
-				<input type="radio" name="gdExportTarget" id="gdExportTarget_newTab" value="newTab" />
-					<label for="gdExportTarget_newTab" id="gdExportTarget_newTab_label">{$L.new_window_or_tab}</label>
-				<input type="radio" name="gdExportTarget" id="gdExportTarget_promptDownload" value="promptDownload" />
-					<label for="gdExportTarget_promptDownload" id="gdExportTarget_promptDownload_label">{$L.prompt_to_download}</label>
-				<input type="checkbox" name="gdExportTarget_promptDownload_zip" id="gdExportTarget_promptDownload_zip" value="doZip" disabled="disabled" />
-					<label for="gdExportTarget_promptDownload_zip" id="gdExportTarget_promptDownload_zip_label" class="gdDisabled">{$L.zip_q}</label>
-			</span>
-		</div>
-	</div>
-
-	<div id="gdGenerateSubtab2" class="hidden">
-		<div id="gdGenerationPanel">
-			<div>
-				{$L.generated_X_of_Y_results}
-			</div>
-			<progress id="gdProgressMeter" max="" value=""></progress>
-			<a href="" id="gdGenerationPanelCancel">{$L.cancel}</a>
-		</div>
-		<textarea id="gdGeneratedData" style="height: 600px"></textarea>
-		<ul id="gdTextSize">
-			<li class="small">A</li>
-			<li class="medium gdSelected">A</li>
-			<li class="large">A</li>
-		</ul>
-		<button class="gdPrimaryButton" id="gdBackButton" title="{$L.back}">&laquo;</button>
-		<button class="gdPrimaryButton" id="gdRegenerateButton">{$L.regenerate}</button>
-		<div class="gdClear"></div>
-	</div>
-</form>
-
-<div class="hidden">
-	<div id="gdTableRowTemplate">
-		<ul>
-			<li class="gdColOrder">%ROW%</li>
-			<li class="gdColTitle"><input type="text" name="gdTitle_%ROW%" id="gdTitle_%ROW%" /></li>
-			<li class="gdColDataType">{data_types_dropdown}</li>
-			<li class="gdColExamples" id="gdColExamples_%ROW%"></li>
-			<li class="gdColOptions" id="gdColOptions_%ROW%"></li>
-			<li class="gdColHelp" id="gdColHelp_%ROW%"></li>
-			<li class="gdColDelete"><input type="checkbox" class="gdDeleteRows" name="gdDeleteRows_%ROW%" /></li>
-		</ul>
-	</div>
-	<div id="gdHelpIcon">
-		<ul class="ui-widget ui-helper-clearfix">
-			<li class="ui-state-default ui-corner-all" onmouseover="$(this).addClass('ui-state-hover')"
-				onmouseout="$(this).removeClass('ui-state-hover')"><span class="ui-icon ui-icon-help"></span></li>
-		</ul>
-	</div>
-	{data_type_examples}
-	{data_type_options}
-</div>
-
-
-{include file="dialogs.tpl"}
diff --git a/resources/templates/generate.tab2.tpl b/resources/templates/generate.tab2.tpl
deleted file mode 100644
index e9874c0e5..000000000
--- a/resources/templates/generate.tab2.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<h3>{$L.user_accounts} <span id="gdNumUserAccounts"></span></h3>
-
-<p>
-	{$L.user_account_section_intro}
-</p>
-
-<div id="gdAccountList" class="hidden">
-	<div id="gdAccountListEmpty">
-		<div class="gdMessage gdNotify gdStickyMessage" style="display:block">
-			<p>{$L.no_user_accounts_defined}</p>
-		</div>
-	</div>
-	<div id="gdAccountListNonEmpty">
-		<table cellpadding="0" cellspacing="0" class="tablesorter tablesorter-default">
-		<thead>
-			<tr>
-				<th width="40">ID</th>
-				<th>{$L.first_name}</th>
-				<th>{$L.last_name}</th>
-				<th>{$L.email}</th>
-				<th align="center">{$L.num_records_generated}</th>
-				<th>{$L.last_logged_in}</th>
-				<th>{$L.date_created}</th>
-				<th data-sorter="false" width="18"></th>
-				<th data-sorter="false" width="18"></th>
-			</tr>
-		</thead>
-		<tbody></tbody>
-		</table>
-	</div>
-</div>
-
-<button class="gdPrimaryButton" id="gdCreateAccount">{$L.create_account_rightarrow}</button>
\ No newline at end of file
diff --git a/resources/templates/generate.tab3.tpl b/resources/templates/generate.tab3.tpl
deleted file mode 100644
index 28edf50e5..000000000
--- a/resources/templates/generate.tab3.tpl
+++ /dev/null
@@ -1,116 +0,0 @@
-<div id="settingsTabMessage" class="gdMessage {if $success}gdNotify{elseif !$success}gdError{/if} gdMarginTop" {if $message}style="display:block"{/if}>
-	<a href="#" class="gdMessageClose">X</a>
-	<p>{$message}</p>
-</div>
-
-<form action="./#t3" method="post" id="gdSettingsForm">
-	<input type="hidden" name="updateSettings" value="1" />
-
-	{if $settings.userAccountSetup != "anonymousAdmin"}
-		<h3>{$L.account_settings}</h3>
-
-		<div>
-			<div>
-				<input type="radio" name="userAccountSetup" id="acs2" value="single" {if $settings.userAccountSetup == "single"}checked="checked"{/if} />
-				<label for="acs2">{$L.single_user_account_requires_login}</label>
-			</div>
-			<div style="margin-bottom: 20px">
-				<input type="radio" name="userAccountSetup" id="acs3" value="multiple" {if $settings.userAccountSetup == "multiple"}checked="checked"{/if} />
-				<label for="acs3">{$L.multiple_accounts}</label>
-			</div>
-		</div>
-	{/if}
-
-	<h3>{$L.plugins}</h3>
-
-	<p>
-		{$L.plugins_intro}
-	</p>
-
-	{if $useMinifiedResources}
-		<div class="gdNotify gdMarginTop" style="display:block">
-			<p>
-				{$L.reset_plugins_with_bundling}
-				<button id="gdResetPluginsBtn" class="gdSecondaryButton">{$L.reset_plugins}</button>
-			</p>
-		</div>
-	{else}
-		<button id="gdResetPluginsBtn" class="gdSecondaryButton">{$L.reset_plugins}</button>
-	{/if}
-
-	<div id="gdPluginInstallation">
-		<div id="gdPluginInstallationResults" class="hidden">
-			<div>
-				<h4>1. {$L.data_types}</h4>
-				<div id="gdDataTypeResponse" class="gdResponse"></div>
-			</div>
-			<div>
-				<h4>2. {$L.export_types}</h4>
-				<div id="gdExportTypeResponse" class="gdResponse"></div>
-			</div>
-			<div>
-				<h4>3. {$L.countries}</h4>
-				<div id="gdCountriesResponse" class="gdResponse"></div>
-			</div>
-		</div>
-		<div class="gdClear"></div>
-	</div>
-
-	<h3>{$L.misc}</h3>
-
-	<div>
-		{$L.theme}
-		<input type="radio" name="theme" value="default" id="gdTheme1" {if $settings.theme == "default"}checked="checked"{/if} {if !$allowThemes}disabled="disabled"{/if} />
-		<label for="gdTheme1">Default</label>
-		<input type="radio" name="theme" value="classic" id="gdTheme2" {if $settings.theme == "classic"}checked="checked"{/if} />
-		<label for="gdTheme2">Classic</label>
-	</div>
-
-	<h3>{$L.developer}</h3>
-
-	<p>
-		{$L.developer_intro}
-	</p>
-
-	<div class="cols2">
-		<div class="col">
-			<div>
-				<input type="checkbox" name="consoleWarnings" id="gdSettingsConsoleWarnings"
-					   value="enabled" {if $settings.consoleWarnings == "enabled"}checked="checked"{/if} />
-				<label for="gdSettingsConsoleWarnings">{$L.list_console_warn_events}</label>
-			</div>
-			<div>
-				<input type="checkbox" name="consoleEventsPublish" id="gdSettingsConsoleEventsPublish"
-					   value="enabled" {if $settings.consoleEventsPublish == "enabled"}checked="checked"{/if} />
-				<label for="gdSettingsConsoleEventsPublish">{$L.list_module_publish_events}</label>
-			</div>
-			<div>
-				<input type="checkbox" name="consoleEventsSubscribe" id="gdSettingsConsoleEventsSubscribe"
-					   value="enabled" {if $settings.consoleEventsSubscribe == "enabled"}checked="checked"{/if} />
-				<label for="gdSettingsConsoleEventsSubscribe">{$L.list_module_subscribe_events}</label>
-			</div>
-			<div>
-				<input type="checkbox" name="consoleCoreEvents" id="gdSettingsConsoleCoreEvents"
-					   value="enabled" {if $settings.consoleCoreEvents == "enabled"}checked="checked"{/if} />
-				<label for="gdSettingsConsoleCoreEvents">{$L.list_core_events}</label>
-			</div>
-		</div>
-		<div class="col">
-			<label for="consoleEventsModuleList">{$L.limit_pub_sub_console_messages}</label>
-			{assign var=label1 value="data-placeholder=\"`$L.all_data_type_plugins`\""}
-			{data_types_dropdown name="consoleEventsDataTypePlugins" id="consoleEventsDataTypePlugins"
-			style="width:500px" multiple=true extras=$label1
-			includeDefaultOption=false selected=$settings.consoleEventsDataTypePlugins}
-
-			{assign var=label2 value="data-placeholder=\"`$L.all_export_type_plugins`\""}
-			{export_types_dropdown name="consoleEventsExportTypePlugins" id="consoleEventsExportTypePlugins"
-			style="width:500px" multiple=true extras=$label2
-			includeDefaultOption=false selected=$settings.consoleEventsExportTypePlugins}
-		</div>
-	</div>
-
-	<div class="gdClear"></div>
-	<p>
-		<button class="gdPrimaryButton" id="updateSettingsBtn">{$L.update_settings}</button>
-	</p>
-</form>
diff --git a/resources/templates/generate.tab4.tpl b/resources/templates/generate.tab4.tpl
deleted file mode 100644
index e4dce2224..000000000
--- a/resources/templates/generate.tab4.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<a href="https://github.com/benkeen/generatedata" target="_blank"><img src="resources/themes/{$theme}/images/githubRibbon.png" id="githubRibbon" border="0" /></a>
-
-<h3>{$L.about_title}</h3>
-<p>
-	{$L.about_para1}
-</p>
-<p>
-	{$L.about_para2}
-</p>
-
-<h3>{$L.extend_it}</h3>
-<p>
-	{$L.about_para3}
-</p>
-<p>
-	{$L.about_para4}
-</p>
-<p>
-	{$L.about_para5}
-</p>
-
-<h3>{$L.a_few_links}</h3>
-<ul>
-	<li><a href="https://github.com/benkeen/generatedata">{$L.fork_on_github}</a></li>
-	<li><a href="docs/">{$L.read_developer_doc}</a></li>
-	<li><a href="http://www.generatedata.com" target="_blank">{$L.goto_website}</a></li>
-	<li><a href="http://www.benjaminkeen.com/category/projects/data-generator/" target="_blank">{$L.latest_project_news}</a></li>
-</ul>
\ No newline at end of file
diff --git a/resources/templates/index.html b/resources/templates/index.html
deleted file mode 100644
index e046b087b..000000000
--- a/resources/templates/index.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html>
-<head></head>
-<body></body>
-</html>
\ No newline at end of file
diff --git a/resources/templates/index.tpl b/resources/templates/index.tpl
deleted file mode 100644
index 6f7ffe776..000000000
--- a/resources/templates/index.tpl
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>{$L.title}</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="description" content="{$L.meta_description}" />
-	<meta name="keywords" content="{$L.meta_keywords}" />
-
-	{if $useMinifiedResources && $minifiedResourcePaths != false}
-		<link rel="stylesheet" type="text/css" href="{$minifiedResourcePaths.coreCSS}" />
-		<link rel="stylesheet" type="text/css" href="resources/css/smoothness/jquery-ui.min.css" />
-		<link rel="stylesheet" type="text/css" href="resources/css/chosen/chosen.css" />
-		<link rel="stylesheet" type="text/css" href="resources/themes/{$theme}/compiled/styles.css" />
-		<script src="{$minifiedResourcePaths.coreJS}"></script>
-	{else}
-
-		<link rel="stylesheet" type="text/css" href="resources/css/smoothness/jquery-ui.min.css" />
-		<link rel="stylesheet" type="text/css" href="resources/css/chosen/chosen.css" />
-		<link rel="stylesheet" type="text/css" href="resources/css/tablesorter.theme.css" />
-		<link rel="stylesheet" type="text/css" href="resources/libs/codemirror/lib/codemirror.css" />
-		<link rel="stylesheet" type="text/css" href="resources/themes/{$theme}/compiled/styles.css" />
-
-		<script src="resources/libs/codemirror/lib/codemirror.min.js"></script>
-		<script src="resources/scripts/libs/jquery.min.js"></script>
-		<script src="resources/scripts/libs/jquery-ui.min.js"></script>
-		<script src="resources/scripts/libs/jquery.json-2.2.min.js"></script>
-		<script src="resources/scripts/libs/chosen.jquery.min.js"></script>
-		<script src="resources/scripts/libs/require.js"></script>
-		<script src="resources/scripts/requireConfig.js"></script>
-		<script src="resources/scripts/libs/spinners.js"></script>
-
-		<!--[if lt IE 9]>
-		<script src="resources/scripts/libs/html5shiv.js"></script>
-		<script src="resources/scripts/libs/excanvas.js"></script>
-		<![endif]-->
-	{/if}
-
-	{$cssIncludes}
-	{$codeMirrorIncludes}
-</head>
-<body data-lang="{$currLang}" data-logged-in="{$isLoggedIn}" data-user-account-setup="{$settings.userAccountSetup}">
-	<header>
-		<nav class="gdHideNoJS">
-			<ul>
-				<li id="gdUserAccount"{if !$isLoggedIn || $settings.userAccountSetup == "anonymousAdmin"} style="display:none"{/if}>
-					<a href="#">{$L.your_account}</a> |
-				</li>
-				<li id="gdLogin"{if $isLoggedIn || $settings.userAccountSetup == "anonymousAdmin"} style="display:none"{/if}>
-					<a href="#">{$L.login}</a> |
-				</li>
-				<li id="gdLogout"{if !$isLoggedIn || $settings.userAccountSetup == "anonymousAdmin"} style="display:none"{/if}>
-					<a href="#">{$L.logout}</a> |
-				</li>
-			</ul>
-			{language_dropdown nameId="gdSelectLanguage"}
-		</nav>
-	</header>
-	<nav id="gdMainTabs" class="gdHideNoJS">
-		<span id="gdDataSetStatusLine"></span>
-		<span id="gdProcessingIcon"></span>
-		<ul>
-			<li id="gdMainTab1" class="gdSelected">{$L.generate}</li>
-			<li id="gdMainTab2" {if $settings.userAccountSetup != "multiple" || $accountType != "admin"}style="display:none"{/if}>{$L.accounts}</li>
-			<li id="gdMainTab3" {if $settings.userAccountSetup != "anonymousAdmin" && $accountType != "admin"}style="display:none"{/if}>{$L.settings}</li>
-			<li id="gdMainTab4">{$L.about}</li>
-		</ul>
-	</nav>
-	<noscript><p>{$L.no_js}</p></noscript>
-	<section class="gdHideNoJS">
-		<div id="gdContent">
-			<ul class="gdMainTabContent">
-				<li id="gdMainTab1Content">{include file="generate.tab1.tpl"}</li>
-				<li id="gdMainTab2Content" style="display:none">{include file="generate.tab2.tpl"}</li>
-				<li id="gdMainTab3Content" style="display:none">{include file="generate.tab3.tpl"}</li>
-				<li id="gdMainTab4Content" style="display:none">{include file="generate.tab4.tpl"}</li>
-			</ul>
-		</div>
-	</section>
-
-	<div id="gdPageLoad">{$L.loading}</div>
-
-	{include file="footer.tpl"}
-
-	{if $useMinifiedResources && $minifiedResourcePaths != false}
-		<script src="resources/scripts/libs/require.js"></script>
-		<script src="resources/scripts/requireConfig.js"></script>
-		<script>require(["{$minifiedResourcePaths.appStart}"], function() {});</script>
-	{else}
-		<script>
-		require([
-			"manager",
-			"generator",
-			"accountManager",
-			{$exportTypeJSModules},
-			{$dataTypeJSModules},
-			"pageInit"
-		], function(manager) {
-			manager.start();
-		});
-		</script>
-	{/if}
-
-
-</body>
-</html>
diff --git a/resources/templates/install.tab1.tpl b/resources/templates/install.tab1.tpl
deleted file mode 100644
index 428de317b..000000000
--- a/resources/templates/install.tab1.tpl
+++ /dev/null
@@ -1,207 +0,0 @@
-	<h1>{$L.installation}</h1>
-
-	<nav id="gdInstallNav">
-		<ol>
-			<li id="nav1" class="{if $currentPage == 1}gdSelected{else}gdComplete{/if}">{$L.check_database_info}</li>
-			<li id="nav2" class="{if $currentPage == 2}gdSelected{elseif $currentPage > 2}gdComplete{/if}">{$L.create_settings_file}</li>
-			<li id="nav3" class="{if $currentPage == 3}gdSelected{elseif $currentPage > 3}gdComplete{/if}">{$L.user_accounts}</li>
-			<li id="nav4" class="{if $currentPage == 4}gdSelected{elseif $currentPage > 4}gdComplete{/if}">{$L.plugins}</li>
-			<li id="nav5" class="{if $currentPage == 5}gdSelected{/if}">{$L.complete_excl}</li>
-		</ol>
-	</nav>
-
-	<div class="gdInstallSection{if $currentPage != 1} hidden{/if}" id="page1">
-		<div class="gdInstallTabMessage">
-			<div class="gdIcon"></div>
-			<h3>Uh-oh.</h3>
-			<div class="gdResponse"></div>
-		</div>
-
-		<p>
-			{$L.installation_intro}
-		</p>
-
-		<form>
-			<div class="gdFields">
-				<div class="gdField">
-					<label for="dbHostname">{$L.host_name}</label>
-					<input type="text" id="dbHostname" value="localhost" />
-				</div>
-				<div class="gdError" id="dbHostname_error"></div>
-				<div class="gdField">
-					<label for="dbName">{$L.database_name}</label>
-					<input type="text" id="dbName" value="" />
-				</div>
-				<div class="gdError" id="dbName_error"></div>
-				<div class="gdField">
-					<label for="dbUsername">{$L.mysql_username}</label>
-					<input type="text" id="dbUsername" value="" />
-				</div>
-				<div class="gdError" id="dbUsername_error"></div>
-				<div class="gdField">
-					<label for="dbPassword">{$L.mysql_password}</label>
-					<input type="text" id="dbPassword" value="" class="pwdField" size="12" autocomplete="off" />
-				</div>
-				<div class="gdError" id="dbPassword_error"></div>
-				<div class="gdField">
-					<label for="dbTablePrefix">{$L.table_prefix}</label>
-					<input type="text" id="dbTablePrefix" value="{$tablePrefix}" maxlength="10" />
-				</div>
-				<div class="gdError" id="dbTablePrefix_error"></div>
-				<div class="gdField">
-					<label for="defaultLanguage">{$L.default_language}</label>
-					{language_dropdown nameId="gdDefaultLanguage" default="en"}
-				</div>
-				<div class="gdError" id="defaultLanguage_error"></div>
-			</div>
-
-			<div class="gdClear"></div>
-
-			<button class="gdPrimaryButton">{$L.continue_rightarrow}</button>
-		</form>
-	</div>
-
-	<div class="gdInstallSection{if $currentPage != 2} hidden{/if}" id="page2">
-
-		<div class="gdInstallTabMessage">
-			<div class="gdIcon"></div>
-			<h3>Uh-oh.</h3>
-			<div class="gdResponse"></div>
-		</div>
-
-		<div id="gdInstallCreateSettingsFile">
-			<p>
-				{$L.installation_step2_intro}
-			</p>
-
-			<form>
-				<button class="gdPrimaryButton">{$L.create_file_rightarrow}</button>
-			</form>
-		</div>
-
-		<div id="gdInstallCreateSettingsFileErrorScenario" class="hidden">
-			<p>
-				{$L.installation_failed_create_settings_file_msg}
-			</p>
-
-			<textarea id="gdSettingsFileContents"></textarea>
-
-			<form>
-				<button class="gdPrimaryButton">{$L.confirm_file_exists}</button>
-			</form>
-		</div>
-
-	</div>
-
-	<div class="gdInstallSection{if $currentPage != 3} hidden{/if}" id="page3">
-
-		<div class="gdInstallTabMessage">
-			<div class="gdIcon"></div>
-			<h3>Uh-oh.</h3>
-			<div class="gdResponse"></div>
-		</div>
-
-		<p>
-			{$L.installation_step3_intro}
-		</p>
-
-		<form>
-			<div>
-				<input type="radio" name="userAccountSetup" id="acs1" value="anonymousAdmin" checked="checked" />
-					<label for="acs1">{$L.single_anonymous_user_account}</label>
-			</div>
-			<div>
-				<input type="radio" name="userAccountSetup" id="acs2" value="single" />
-					<label for="acs2">{$L.single_user_account_requires_login}</label>
-			</div>
-			<div style="margin-bottom: 20px">
-				<input type="radio" name="userAccountSetup" id="acs3" value="multiple" />
-					<label for="acs3">{$L.multiple_accounts}</label>
-			</div>
-
-			<div class="gdFields">
-				<div class="gdCol" id="gdInstallAccountDetails" style="display:none">
-					<h3 id="gdInstallAccountDetailsMessage"></h3>
-
-					<div class="gdError" id="firstName_error"></div>
-					<div class="gdError" id="lastName_error"></div>
-					<div class="gdError" id="email_error"></div>
-					<div class="gdError" id="password_error"></div>
-
-					<div class="gdField gdFirstNameRow">
-						<label for="firstName">{$L.first_name}</label>
-						<input type="text" id="firstName" value="" />
-					</div>
-
-					<div class="gdField gdLastNameRow">
-						<label for="lastName">{$L.last_name}</label>
-						<input type="text" id="lastName" value="" />
-					</div>
-
-					<div class="gdField gdEmailRow">
-						<label for="email">{$L.email}</label>
-						<input type="text" id="email" value="" />
-					</div>
-
-					<div class="gdField gdPasswordRow">
-						<label for="password">{$L.password}</label>
-						<input type="text" id="password" value="{$randomPassword}" class="pwdField" autocomplete="off" />
-						<span id="gdRefreshPassword"></span>
-					</div>
-				</div>
-
-				<div class="gdCol" id="gdInstallAnonymousUserSettings" style="display:none">
-					<span class="rightBox">
-						<input type="checkbox" id="allowAnonymousAccess" /><label for="allowAnonymousAccess">{$L.feature_enabled}</label>
-					</span>
-					<h3>{$L.anonymous_access}</h3>
-					<div>{$L.anonymous_user_desc}</div>
-					<div><i>{$L.anonymous_user_message}</i></div>
-					<textarea id="anonymousUserPermissionDeniedMsg" name="anonymousUserPermissionDeniedMsg" class="gdDisabled"
-						disabled="disabled">{$L.anonymous_user_default_message}</textarea>
-				</div>
-			</div>
-
-			<div class="gdClear"></div>
-
-			<button class="gdPrimaryButton">{$L.continue_rightarrow}</button>
-		</form>
-	</div>
-
-	<div class="gdInstallSection{if $currentPage != 4} hidden{/if}" id="page4">
-		<p>
-			{$L.installation_plugin_intro}
-		</p>
-
-		<div id="gdPluginInstallationResults" class="hidden">
-			<div>
-				<h4>1. {$L.data_types}</h4>
-				<div id="gdDataTypeResponse" class="gdResponse"></div>
-			</div>
-			<div>
-				<h4>2. {$L.export_types}</h4>
-				<div id="gdExportTypeResponse" class="gdResponse"></div>
-			</div>
-			<div>
-				<h4>3. {$L.countries}</h4>
-				<div id="gdCountriesResponse" class="gdResponse"></div>
-			</div>
-		</div>
-		<div class="gdClear"></div>
-
-		<form>
-			<button class="gdPrimaryButton" id="gdInstallPluginsBtn">{$L.install_plugins_rightarrow}</button>
-		</form>
-	</div>
-
-	<div class="gdInstallSection{if $currentPage != 5} hidden{/if}" id="page5">
-		<p>
-			{$L.installation_complete_text}
-		</p>
-
-		<form action="./">
-			<button class="gdPrimaryButton">{$L.goto_script_rightarrow}</button>
-		</form>
-	</div>
-
-	<div class="gdClear"></div>
diff --git a/resources/templates/install.tab2.tpl b/resources/templates/install.tab2.tpl
deleted file mode 100644
index cdec2038a..000000000
--- a/resources/templates/install.tab2.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<h1>{$L.help}</h1>
-<p>
-	{$L.help_intro}
-</p>
-
-<h2>{$L.help_prerequisites}</h2>
-<p>
-	{$L.help_prereq_info}
-</p>
-
-<h2>{$L.still_stuck}</h2>
-<p>
-	{$L.install_user_doc_link}
-</p>
\ No newline at end of file
diff --git a/resources/templates/install.tpl b/resources/templates/install.tpl
deleted file mode 100644
index f2c11dd4e..000000000
--- a/resources/templates/install.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>{$L.title}</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="description" content="{$L.meta_description}" />
-	<meta name="keywords" content="{$L.meta_keywords}" />
-	<link rel="stylesheet" type="text/css" href="resources/themes/{$theme}/compiled/styles.css" />
-	<link rel="stylesheet" type="text/css" href="resources/css/smoothness/jquery-ui.min.css" />
-	<script src="resources/scripts/libs/jquery.min.js"></script>
-	<script src="resources/scripts/libs/jquery-ui.min.js"></script>
-	<script src="resources/scripts/libs/jquery.json-2.2.min.js"></script>
-	<script src="resources/scripts/libs/chosen.jquery.min.js"></script>
-	<script src="resources/scripts/libs/require.js" data-main="resources/scripts/install"></script>
-	<script src="resources/scripts/requireConfig.js"></script>
-	<!--[if lt IE 9]>
-	<script src="resources/scripts/libs/html5shiv.js"></script>
-	<script src="resources/scripts/libs/excanvas.js"></script>
-	<![endif]-->
-	<script src="resources/scripts/libs/spinners.js"></script>
-</head>
-<body class="gdInstallPage" data-lang="{$currLang}">
-	<header>
-		<nav>
-			{language_dropdown nameId="gdSelectLanguage"}
-		</nav>
-	</header>
-	<nav id="gdMainTabs" class="gdHideNoJS">
-		<span id="gdProcessingIcon"></span>
-		<ul>
-			<li id="gdMainTab1" class="gdSelected">{$L.install}</li>
-			<li id="gdMainTab2" class="gdHideNoJS">{$L.help}</li>
-		</ul>
-	</nav>
-	<noscript><p>{$L.no_js}</p></noscript>
-	<section class="gdHideNoJS">
-		<div id="gdContent">
-			<ul class="gdMainTabContent">
-				<li id="gdMainTab1Content">{include file="install.tab1.tpl"}</li>
-				<li id="gdMainTab2Content" style="display:none">{include file="install.tab2.tpl"}</li>
-			</ul>
-		</div>
-	</section>
-	{include file="footer.tpl"}
-</body>
-</html>
\ No newline at end of file
diff --git a/resources/templates/login.tpl b/resources/templates/login.tpl
deleted file mode 100644
index b00fc841d..000000000
--- a/resources/templates/login.tpl
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>{$L.title}</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="description" content="{$L.meta_description}" />
-	<meta name="keywords" content="{$L.meta_keywords}" />
-	<link rel="stylesheet" type="text/css" href="resources/themes/{$theme}/compiled/styles.css" />
-	<link rel="stylesheet" type="text/css" href="resources/css/smoothness/jquery-ui.min.css" />
-	<script src="resources/scripts/libs/jquery.min.js"></script>
-	<script src="resources/scripts/libs/jquery-ui.min.js"></script>
-	<script src="resources/scripts/libs/jquery.json-2.2.min.js"></script>
-	<script src="resources/scripts/libs/require.js" data-main="resources/scripts/login"></script>
-	<script src="resources/scripts/requireConfig.js"></script>
-	<script src="resources/scripts/libs/spinners.js"></script>
-
-	<!--[if lt IE 9 ]>
-	<script src="resources/scripts/libs/html5shiv.js"></script>
-	<script src="resources/scripts/libs/excanvas.js"></script>
-	<![endif]-->
-</head>
-<body class="gdLoginPage">
-	<header>
-		<nav>
-			{language_dropdown nameId="gdSelectLanguage"}
-		</nav>
-	</header>
-	<nav id="gdMainTabs" class="gdHideNoJS">
-		<span id="gdProcessingIcon"></span>
-		<ul>
-			<li id="gdMainTab1" class="gdSelected">{$L.login}</li>
-			<li id="gdMainTab2">{$L.forgot_password}</li>
-		</ul>
-	</nav>
-	<noscript><div><p>{$L.no_js}</p></div></noscript>
-
-	<section class="gdHideNoJS">
-		<div id="gdContent">
-			<ul class="gdMainTabContent">
-				<li id="gdMainTab1Content">
-					<form>
-						<h1>{$L.please_login}</h1>
-						<div id="gdMessages" class="gdMessage" style="margin-bottom: 12px">
-							<a class="gdMessageClose" href="#">X</a>
-							<div></div>
-						</div>
-						<div class="gdFields">
-							<div class="gdField">
-								<label for="email">{$L.email}</label>
-								<input type="text" id="email" value="" />
-							</div>
-							<div class="gdError" id="email_error"></div>
-							<div class="gdField">
-								<label for="password">{$L.password}</label>
-								<input type="password" id="password" value="" />
-							</div>
-							<div class="gdError" id="password_error"></div>
-						</div>
-						<div class="gdClear"></div>
-						<button class="gdPrimaryButton">{$L.continue_rightarrow}</button>
-					</form>
-				</li>
-				<li id="gdMainTab2Content" class="hidden">
-					<form>
-						<h1>{$L.forgotten_your_password_q}</h1>
-						<div id="gdMessagesReminder" class="gdMessage" style="margin-bottom: 12px">
-							<a class="gdMessageClose" href="#">X</a>
-							<div></div>
-						</div>
-						<p>
-							{$L.enter_email_address_to_reset_password}
-						</p>
-						<div class="gdFields">
-							<div class="gdField">
-								<label for="emailReminder">{$L.email}</label>
-								<input type="text" id="emailReminder" value="" />
-							</div>
-							<div class="gdError" id="emailReminder_error"></div>
-						</div>
-						<div class="gdClear"></div>
-						<button class="gdPrimaryButton">{$L.continue_rightarrow}</button>
-					</form>
-				</li>
-			</ul>
-		</div>
-	</section>
-
-	{include file="footer.tpl"}
-</body>
-</html>
\ No newline at end of file
diff --git a/resources/themes/classic/compiled/buttons.css b/resources/themes/classic/compiled/buttons.css
deleted file mode 100644
index fb32d96fb..000000000
--- a/resources/themes/classic/compiled/buttons.css
+++ /dev/null
@@ -1,143 +0,0 @@
-/* buttons */
-.gdButton {
-  border: 0px;
-  margin: 1px;
-  padding: 2px 6px;
-  font-family: verdana;
-  text-shadow: rgba(64, 64, 64, 0.2) 3px 3px 8px;
-  cursor: pointer; }
-
-.gdButtonType1 {
-  color: white;
-  background-color: #58BB44;
-  font-size: 9pt;
-  font-weight: bold;
-  box-shadow: 2px 3px 3px #666666; }
-
-.gdButtonType2 {
-  color: #666666;
-  background-color: #e9e9e9;
-  font-size: 7pt;
-  border: 1px solid #cccccc; }
-
-.gdButtonType3 {
-  color: #660000;
-  background-color: #e9e9e9;
-  font-size: 7pt;
-  border: 1px solid #cccccc; }
-
-/* from: http://hellohappy.org/css3-buttons/ */
-.gdPrimaryButton {
-  display: block;
-  background-color: #7fbf4d;
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-  background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: linear-gradient(top, #7fbf4d, #63a62f);
-  border: 1px solid #63a62f;
-  border-bottom: 1px solid #5b992b;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 0 0 #96ca6d;
-  -moz-box-shadow: inset 0 1px 0 0 #96ca6d;
-  box-shadow: inset 0 1px 0 0 #96ca6d;
-  color: #fff;
-  font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-  line-height: 1;
-  padding: 4px 15px 4px;
-  margin: 15px 0px 0px;
-  text-align: center;
-  text-shadow: 0 -1px 0 #4c9021; }
-  .gdPrimaryButton:hover {
-    background-color: #76b347;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #76b347), color-stop(100%, #5e9e2e));
-    background-image: -webkit-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -moz-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -ms-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -o-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: linear-gradient(top, #76b347, #5e9e2e);
-    box-shadow: inset 0 1px 0 0 #8dbf67;
-    cursor: pointer; }
-  .gdPrimaryButton:active {
-    border: 1px solid #5b992b;
-    border-bottom: 1px solid #538c27;
-    box-shadow: inset 0 0 8px 4px #548c29, 0 1px 0 0 #eeeeee; }
-
-.gdSecondaryButton {
-  display: block;
-  background-color: #eeeeee;
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #cccccc));
-  background-image: -webkit-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -moz-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -ms-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -o-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: linear-gradient(top, #eeeeee, #cccccc);
-  border: 1px solid #ccc;
-  border-bottom: 1px solid #bbb;
-  border-radius: 3px;
-  color: #333;
-  font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-  line-height: 7pt;
-  padding: 2px 10px 2px;
-  margin: 15px 0px 0px;
-  text-align: center;
-  text-shadow: 0 1px 0 #eee; }
-  .gdSecondaryButton:hover {
-    background-color: #dddddd;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dddddd), color-stop(100%, #bbbbbb));
-    background-image: -webkit-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -moz-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -ms-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -o-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: linear-gradient(top, #dddddd, #bbbbbb);
-    border: 1px solid #bbb;
-    border-bottom: 1px solid #999;
-    cursor: pointer;
-    text-shadow: 0 1px 0 #ddd;
-    cursor: pointer; }
-  .gdSecondaryButton:active {
-    border: 1px solid #aaa;
-    border-bottom: 1px solid #888;
-    -webkit-box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee;
-    box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee; }
-
-#gdGenerateButton {
-  display: inline;
-  font-size: 11pt;
-  margin: -2px 0px 0px 0px;
-  line-height: 15px; }
-
-#gdBackButton {
-  float: left;
-  margin-right: 4px;
-  padding: 4px 6px; }
-
-#gdSaveBtn {
-  background: -webkit-gradient(linear, left top, left bottom, from(#dfdfdf), to(#efefef), color-stop(0.5, #efefef), color-stop(0.5, #efefef));
-  background: -moz-linear-gradient(bottom, #dfdfdf, #efefef);
-  padding: 4px;
-  border: 1px solid #cccccc;
-  padding: 5px 17px;
-  border-top-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-  line-height: 22px;
-  font-size: 11px;
-  color: #666666;
-  display: inline-block;
-  text-transform: 1px 1px #F2F2F2;
-  cursor: pointer;
-  height: 36px;
-  margin-left: 0px;
-  width: 68px;
-  outline: none; }
-  #gdSaveBtn:hover {
-    background-color: #7fbf4d;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-    background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: linear-gradient(top, #7fbf4d, #63a62f);
-    border: 1px solid #6ca341;
-    color: white; }
diff --git a/resources/themes/classic/compiled/dialogs.css b/resources/themes/classic/compiled/dialogs.css
deleted file mode 100644
index aad5e58dc..000000000
--- a/resources/themes/classic/compiled/dialogs.css
+++ /dev/null
@@ -1,186 +0,0 @@
-/* the dialog CSS is a mess. TOTALLY in need of a refactor. */
-#gdMainDialog {
-  border: 1px solid #cccccc;
-  padding: 0px;
-  margin: 3px 2px;
-  max-height: 420px; }
-  #gdMainDialog div, #gdMainDialog p {
-    line-height: 16pt; }
-  #gdMainDialog h3 {
-    margin: 2px 0px 0px; }
-  #gdMainDialog .ui-widget button {
-    font-family: "lucida grande", verdana; }
-  #gdMainDialog .gdSelectedDataSetRow {
-    background-color: #efefef; }
-  #gdMainDialog h4 {
-    margin: 0px; }
-
-#gdLoginDialog {
-  border: 1px solid #cccccc;
-  padding: 0px;
-  margin: 3px 2px; }
-  #gdLoginDialog div, #gdLoginDialog p {
-    line-height: 16pt; }
-
-#gdMainDialogContent {
-  clear: both; }
-  #gdMainDialogContent > div {
-    padding: 6px 10px;
-    height: 300px;
-    overflow-y: auto; }
-  #gdMainDialogContent #gdMainDialogTab3Content {
-    padding: 0px 0px 0px 6px;
-    overflow: hidden; }
-    #gdMainDialogContent #gdMainDialogTab3Content h3 {
-      padding-top: 10px; }
-
-#gdLoginDialogContent {
-  clear: both; }
-
-#gdLoginDialogTab1Content, #gdLoginDialogTab2Content {
-  padding: 2px; }
-
-#gdLoginError, #gdResetPasswordMessage {
-  margin: 6px; }
-
-#gdAccountDataSets .leftAligned {
-  padding-left: 3px; }
-#gdAccountDataSets td a {
-  display: block;
-  color: #189C1C; }
-  #gdAccountDataSets td a:hover {
-    background-color: #7fbf4d;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-    background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: linear-gradient(top, #7fbf4d, #63a62f);
-    border-radius: 2px;
-    color: white;
-    text-decoration: none; }
-
-.highlightTableRows tbody tr:hover {
-  background-color: #f2f2f2; }
-
-.gdModalTabs.gdThreeCols li {
-  width: 33.3%; }
-.gdModalTabs.gdTwoCols li {
-  width: 50%; }
-.gdModalTabs ul {
-  margin: 0px;
-  padding: 0px;
-  list-style: none;
-  background-color: #efefef; }
-  .gdModalTabs ul li {
-    float: left;
-    margin: 0px;
-    background-color: #efefef;
-    text-align: center;
-    cursor: pointer; }
-    .gdModalTabs ul li.gdSelected {
-      background-color: white; }
-
-#gdDataSetHelpNav {
-  width: 200px;
-  margin-right: 20px;
-  padding-right: 10px;
-  border-right: 1px solid #efefef;
-  float: left;
-  height: 300px;
-  overflow-x: hidden; }
-  #gdDataSetHelpNav ul {
-    list-style: none;
-    margin: 0px;
-    padding: 0px; }
-    #gdDataSetHelpNav ul li {
-      padding: 0px;
-      margin: 0px; }
-      #gdDataSetHelpNav ul li.gdDataTypeHeader {
-        font-weight: bold;
-        margin: 7px 0px 0px 7px; }
-      #gdDataSetHelpNav ul li a {
-        color: #189c1c;
-        display: block;
-        border-radius: 3px;
-        padding: 1px 7px;
-        margin-bottom: 2px; }
-        #gdDataSetHelpNav ul li a:hover, #gdDataSetHelpNav ul li a.gdSelected {
-          background-color: #7fbf4d;
-          background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-          background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-          background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-          background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-          background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-          background-image: linear-gradient(top, #7fbf4d, #63a62f);
-          -webkit-transition: background-image .2s;
-          -moz-transition: background-image .2s;
-          transition: background-image .2s;
-          color: white;
-          border-radius: 3px;
-          text-decoration: none; }
-
-#gdDataSetHelpContent {
-  height: 300px;
-  float: left;
-  width: 551px;
-  padding-right: 6px;
-  overflow-y: auto; }
-  #gdDataSetHelpContent a:link, #gdDataSetHelpContent a:hover {
-    color: #3366CC; }
-
-body .ui-widget-content .gdDeleteDataSetsBtn span {
-  color: #bb0000; }
-
-body .gdMainDialog .ui-dialog-titlebar {
-  padding: 2px; }
-
-body .gdMainDialog .ui-dialog-title span {
-  font-size: 14px; }
-
-.gdMainDialog .ui-dialog-title {
-  background: transparent url(../images/logoSmall.png) center left no-repeat;
-  padding: 4px 0px 3px 52px; }
-
-.gdDataSetCheckRowCell input {
-  margin: 0px; }
-
-#gdLinkURL {
-  font-size: 16pt;
-  width: 100%; }
-
-#gdAccountListNonEmpty td.gdEditAccount {
-  background-image: url(../images/edit.png);
-  background-repeat: no-repeat;
-  background-position: center center; }
-  #gdAccountListNonEmpty td.gdEditAccount a {
-    display: block;
-    width: 18px;
-    height: 18px; }
-#gdAccountListNonEmpty td.gdDeleteAccount {
-  background-image: url(../images/delete.png);
-  background-repeat: no-repeat;
-  background-position: 2px center; }
-  #gdAccountListNonEmpty td.gdDeleteAccount a {
-    display: block;
-    width: 18px;
-    height: 18px; }
-
-.modalSpinner {
-  float: left;
-  margin-top: 2px;
-  height: 34px; }
-
-#gdDeleteAccountDialog th {
-  text-align: left; }
-#gdDeleteAccountDialog .gdIconWarning {
-  margin-right: 15px;
-  float: left;
-  height: 100px; }
-
-.gdIconInfo {
-  margin-right: 15px;
-  float: left;
-  background: url(../images/info.png) no-repeat scroll left top transparent;
-  width: 32px;
-  height: 32px; }
diff --git a/resources/themes/classic/compiled/errorPage.css b/resources/themes/classic/compiled/errorPage.css
deleted file mode 100644
index cb0c8f0b1..000000000
--- a/resources/themes/classic/compiled/errorPage.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/* used for the "serious error" page */
-body.gdErrorPage h1 {
-  margin: 0px 0px 12px 0px;
-  font-weight: bold; }
-body.gdErrorPage #gdBox {
-  font-family: verdana;
-  font-size: 11pt;
-  line-height: 22px;
-  position: relative;
-  width: 60%;
-  background: #ffffff;
-  border-radius: 6px;
-  padding: 25px;
-  color: rgba(0, 0, 0, 0.8);
-  line-height: 1.5;
-  margin: 60px auto;
-  text-align: left; }
-  body.gdErrorPage #gdBox:before, body.gdErrorPage #gdBox:after {
-    z-index: -1;
-    position: absolute;
-    content: "";
-    bottom: 15px;
-    left: 10px;
-    width: 50%;
-    top: 80%;
-    max-width: 300px;
-    background: rgba(0, 0, 0, 0.7);
-    box-shadow: 0 15px 10px rgba(0, 0, 0, 0.7);
-    -webkit-transform: rotate(-3deg);
-    -moz-transform: rotate(-3deg);
-    -o-transform: rotate(-3deg);
-    -ms-transform: rotate(-3deg);
-    transform: rotate(-3deg); }
-  body.gdErrorPage #gdBox:after {
-    -webkit-transform: rotate(3deg);
-    -moz-transform: rotate(3deg);
-    -o-transform: rotate(3deg);
-    -ms-transform: rotate(3deg);
-    transform: rotate(3deg);
-    right: 10px;
-    left: auto; }
-  body.gdErrorPage #gdBox p {
-    font-size: 11pt;
-    line-height: 22px;
-    margin-bottom: 12px; }
-body.gdErrorPage #gdNotFixed {
-  color: #990000;
-  margin-bottom: 8px;
-  font-style: italic; }
-body.gdErrorPage #gdSeriousError {
-  font-size: 8pt;
-  max-height: 160px;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  padding: 8px;
-  border: 1px solid #cccccc;
-  background-color: #fbfbfb; }
diff --git a/resources/themes/classic/compiled/general.css b/resources/themes/classic/compiled/general.css
deleted file mode 100644
index 4ec94ed1f..000000000
--- a/resources/themes/classic/compiled/general.css
+++ /dev/null
@@ -1,123 +0,0 @@
-/* general styles */
-html {
-  overflow: -moz-scrollbars-vertical;
-  height: 100%; }
-
-body {
-  height: 100%;
-  margin: 0px;
-  background: #dedede url(../images/topBackground.jpg) repeat-x;
-  text-align: center; }
-
-body, table, td, div, span, div, p {
-  font: 11px "lucida grande", verdana, sans-serif;
-  /* 0.94em */
-  line-height: 20px;
-  color: #555555; }
-
-table, td, p, div, input, select, optgroup, noscript {
-  line-height: 17pt; }
-
-input, select, textarea, option {
-  font: 8pt "lucida grande", verdana, sans-serif;
-  color: #222222; }
-
-input[disabled='disabled'] {
-  color: #bbbbbb; }
-
-h1 {
-  font-size: 1.6em;
-  font-weight: normal;
-  font-family: inherit; }
-
-h2 {
-  font-size: 1.2em;
-  color: green;
-  font-weight: normal;
-  font-family: inherit; }
-
-h3 {
-  margin: 10px 0px 7px; }
-
-h3.gdSubtitle {
-  font-size: 12px; }
-
-p {
-  margin: 6px 0px; }
-
-hr {
-  color: #efefef;
-  background-color: #efefef;
-  height: 1px;
-  border: 0px; }
-
-form {
-  margin: 0px; }
-
-select, optgroup, option {
-  font-size: 8pt;
-  font-family: "lucida grande", verdana; }
-
-optgroup {
-  font-weight: bold; }
-
-a:link, a:visited, nav a:link, nav a:visited {
-  color: #638fe6;
-  text-decoration: none; }
-
-a:hover {
-  text-decoration: underline; }
-
-.gdDisabledText, .gdDisabledText label {
-  color: #cccccc; }
-
-ul {
-  padding-left: 16px;
-  margin-left: 0px; }
-
-#gdReportBug {
-  background: transparent url(../images/bug.png) center right no-repeat;
-  padding: 5px 22px 5px 0px; }
-
-.gdFields .gdField {
-  float: left;
-  width: 376px;
-  border-bottom: 1px solid #efefef;
-  clear: left; }
-.gdFields .gdDisabledRow label, .gdFields .gdDisabledRow input {
-  color: #cccccc; }
-.gdFields label {
-  float: left;
-  width: 160px;
-  color: #777777;
-  margin-top: 2px; }
-.gdFields input {
-  float: left;
-  width: 210px;
-  margin-top: 2px; }
-.gdFields div {
-  margin-top: 2px; }
-.gdFields .gdCol {
-  float: left;
-  width: 350px; }
-  .gdFields .gdCol h3 {
-    margin-top: 0px; }
-  .gdFields .gdCol .rightBox {
-    float: right; }
-    .gdFields .gdCol .rightBox input {
-      width: auto;
-      float: none; }
-    .gdFields .gdCol .rightBox label {
-      width: auto;
-      float: none; }
-  .gdFields .gdCol:first-child {
-    margin-right: 20px; }
-  .gdFields .gdCol .gdField {
-    width: 329px; }
-  .gdFields .gdCol input {
-    width: 160px; }
-  .gdFields .gdCol textarea {
-    width: 100%;
-    height: 80px;
-    padding: 3px;
-    color: #555555; }
diff --git a/resources/themes/classic/compiled/generator.css b/resources/themes/classic/compiled/generator.css
deleted file mode 100644
index 691aaef2c..000000000
--- a/resources/themes/classic/compiled/generator.css
+++ /dev/null
@@ -1,303 +0,0 @@
-/* contains styles for the generator table */
-hr.divider {
-  color: #efefef;
-  margin: 16px 0px 0px; }
-
-#gdTableRows li.gdDeletedRow {
-  color: #ffffcc; }
-  #gdTableRows li.gdDeletedRow label, #gdTableRows li.gdDeletedRow div {
-    color: #ffffcc; }
-#gdTableRows > li:nth-child(even) {
-  background-color: #eaffe6; }
-#gdTableRows > li:nth-child(odd) {
-  background-color: #f1f1f1; }
-
-/* needed to override the nth-child style above */
-body #gdTableRows li.gdDeletedRow {
-  background-color: #660000; }
-
-.gdTableHeadings {
-  line-height: 18.6px; }
-  .gdTableHeadings li {
-    background: -webkit-gradient(linear, left top, left bottom, from(#dddddd), to(#dfdfdf), color-stop(0.5, #dfdfdf), color-stop(0.5, #dfdfdf));
-    background: -moz-linear-gradient(bottom, #dddddd, #dfdfdf);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#dfdfdf');
-    float: left;
-    text-align: center;
-    height: 20px;
-    margin: 0px 0px 0px 1px;
-    padding: 0px;
-    color: #444444;
-    text-shadow: 1px 1px #f2f2f2;
-    font-weight: normal; }
-    .gdTableHeadings li.gdColDelete {
-      width: 39px; }
-  .gdTableHeadings thead tr {
-    background: -webkit-gradient(linear, left top, left bottom, from(#dddddd), to(#dfdfdf), color-stop(0.5, #dfdfdf), color-stop(0.5, #dfdfdf));
-    background: -moz-linear-gradient(bottom, #dddddd, #dfdfdf);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#dfdfdf');
-    color: #444444;
-    text-shadow: 1px 1px #f2f2f2; }
-    .gdTableHeadings thead tr th {
-      line-height: 18.6px;
-      text-align: center;
-      font-weight: normal;
-      height: 20px; }
-  .gdTableHeadings tbody tr > li:nth-child(even) {
-    background-color: #ebfeeb; }
-  .gdTableHeadings tbody tr > li:nth-child(odd) {
-    background-color: #f1f1f1; }
-
-.gdTableHeadings, #gdTableRows, #gdTableRows ul {
-  font-family: "lucida grande", verdana;
-  clear: both;
-  margin: 0px;
-  padding: 0px;
-  list-style: none;
-  font-weight: bold; }
-
-#gdTableRows {
-  margin-bottom: 8px; }
-  #gdTableRows li {
-    float: left;
-    margin: 0px 0px 1px 1px;
-    padding: 0px;
-    font-weight: normal;
-    font-family: verdana;
-    line-height: 16pt; }
-
-.gdColOrder {
-  cursor: move;
-  width: 40px;
-  text-align: center; }
-
-.gdColTitle {
-  width: 136px; }
-  .gdColTitle input {
-    width: 130px; }
-
-.gdColDataType {
-  width: 198px; }
-  .gdColDataType select {
-    width: 198px; }
-
-.gdColExamples {
-  width: 198px; }
-
-.gdColOptions {
-  width: 274px; }
-
-.gdColHelp {
-  width: 38px;
-  text-align: center; }
-
-li.gdColDelete {
-  width: 38px;
-  text-align: center;
-  display: block; }
-
-#gdHelpPopup {
-  padding-left: 54px;
-  background: transparent url(../images/info.png) 10px 10px no-repeat; }
-  #gdHelpPopup p {
-    margin: 5px 0px 12px; }
-  #gdHelpPopup h4 {
-    margin: 0px; }
-
-#gdEmptyFormDialog {
-  padding-left: 54px;
-  background: transparent url(../images/help.png) 10px 10px no-repeat; }
-  #gdEmptyFormDialog p {
-    margin: 5px 0px 12px; }
-  #gdEmptyFormDialog h4 {
-    margin: 0px; }
-
-#gdTextSize {
-  float: right;
-  list-style: none; }
-  #gdTextSize li {
-    float: left;
-    width: 18px;
-    vertical-align: top;
-    margin: 3px 0px 0px 3px;
-    background-color: #F2F2F2;
-    padding: 1px 3px;
-    text-align: center;
-    border-radius: 3px;
-    cursor: pointer; }
-    #gdTextSize li.gdSelected {
-      background-color: #3366cc;
-      color: white; }
-    #gdTextSize li.small {
-      font-size: 8pt; }
-    #gdTextSize li.medium {
-      font-size: 12pt; }
-    #gdTextSize li.large {
-      font-size: 16pt; }
-
-#gdGeneratedData {
-  height: 400px;
-  width: 100%; }
-
-#gdProcessingIcon {
-  position: absolute;
-  right: -1px;
-  top: 5px; }
-
-#gdDataSetStatusLine {
-  position: absolute;
-  right: 30px;
-  top: 5px;
-  font-style: italic;
-  color: #666666;
-  font-size: 7pt; }
-
-.gdSmallTabs {
-  margin-bottom: 20px; }
-  .gdSmallTabs ul {
-    list-style: none;
-    margin: 0px;
-    padding: 0px;
-    height: 20px;
-    border-bottom: 1px solid #e1e1e1; }
-    .gdSmallTabs ul li {
-      line-height: 20px;
-      height: 20px;
-      float: left;
-      margin-right: 1px;
-      padding: 0px 16px;
-      border-top-left-radius: 6px;
-      border-top-right-radius: 6px;
-      background: #f2f2f2;
-      background: -moz-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-      background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f2f2f2), color-stop(100%, #e1e1e1));
-      background: -webkit-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-      background: -o-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-      background: -ms-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-      background: linear-gradient(to bottom, #f2f2f2 0%, #e1e1e1 100%);
-      filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e1e1e1',GradientType=0 );
-      cursor: pointer;
-      text-shadow: 1px 1px #f2f2f2; }
-      .gdSmallTabs ul li.gdSelected {
-        background: white;
-        background-color: white;
-        border: 1px solid #cccccc;
-        border-bottom: 0px;
-        line-height: 18px;
-        padding: 0px 15px; }
-  .gdSmallTabs .gdExportTypeTabSettings {
-    clear: both;
-    border-top: 0px;
-    padding: 6px;
-    margin: 0px;
-    display: none; }
-  .gdSmallTabs #gdShowSettingsLink {
-    float: right; }
-    .gdSmallTabs #gdShowSettingsLink span {
-      font-size: 7pt; }
-    .gdSmallTabs #gdShowSettingsLink a {
-      font-size: 7pt;
-      color: #3366CC; }
-
-#gdExportTypeTabs {
-  border-bottom: 1px solid #e1e1e1; }
-
-#gdGenerateSection {
-  background-color: #dcffd8;
-  border-radius: 6px;
-  padding: 20px;
-  border: 1px solid #b8e2b3; }
-  #gdGenerateSection span {
-    margin-left: 55px; }
-    #gdGenerateSection span label {
-      margin-right: 8px; }
-  #gdGenerateSection .gdDisabled {
-    background-color: transparent; }
-
-#gdGenerateCount, #gdGenerateTotal {
-  font-weight: bold; }
-
-#gdNumRowsToGenerate {
-  width: 45px;
-  margin: 0px 5px; }
-
-#gdGenerationPanel {
-  line-height: 10px;
-  margin-bottom: 8px; }
-
-#gdProgressMeter {
-  width: 260px;
-  margin-right: 3px; }
-
-#gdActionIcons {
-  float: right;
-  list-style: none;
-  margin-top: 0px;
-  padding: 0px; }
-  #gdActionIcons li {
-    padding: 2px;
-    display: inline-block;
-    width: 32px;
-    height: 32px;
-    background-color: #e1e1e1;
-    -webkit-transition: background-color .2s;
-    -moz-transition: background-color .2s;
-    transition: background-color .2s;
-    border-radius: 3px;
-    cursor: pointer;
-    display: inline-block; }
-    #gdActionIcons li:hover {
-      background-color: #cccccc; }
-    #gdActionIcons li.loading:hover {
-      background-color: #e1e1e1; }
-    #gdActionIcons li.loading img {
-      filter: url(../../../css/filters.svg#grayscale);
-      filter: gray;
-      -webkit-filter: grayscale(1);
-      /* Webkit Nightlies & Chrome Canary */
-      opacity: .5; }
-
-#gdDataSetName {
-  font-size: 1.6em;
-  border: 1px solid #cccccc;
-  border-right: 0px;
-  padding: 6px;
-  width: 730px;
-  color: #555555;
-  float: left;
-  height: 22px; }
-  #gdDataSetName::-webkit-input-placeholder {
-    color: #aaaaaa; }
-  #gdDataSetName:-moz-placeholder {
-    color: #aaaaaa; }
-
-a.gdDisabledLink {
-  color: #cccccc; }
-
-#gdSelectLanguage {
-  width: 150px; }
-
-#gdAccountList thead td {
-  border-bottom: 1px solid #cccccc;
-  font-weight: bold; }
-#gdAccountList table {
-  width: 100%; }
-
-#gdUserAccount {
-  background: transparent url(../images/user.png) top left no-repeat;
-  padding-left: 20px; }
-
-.gdIconWarning {
-  background: transparent url(../images/warning.png) top left no-repeat;
-  width: 48px;
-  height: 48px; }
-
-#gdAddDataSetRowsSection {
-  background-color: #f2f2f2;
-  border-radius: 3px;
-  padding: 4px 4px 4px 8px;
-  display: inline-block; }
-
-/* Fix for https://github.com/benkeen/generatedata/issues/171 */
-.search-field input {
-  min-width: 150px; }
diff --git a/resources/themes/classic/compiled/install.css b/resources/themes/classic/compiled/install.css
deleted file mode 100644
index b966aec03..000000000
--- a/resources/themes/classic/compiled/install.css
+++ /dev/null
@@ -1,73 +0,0 @@
-/* custom styles for the installation page */
-.gdInstallPage h1 {
-  border-bottom: 1px solid #efefef;
-  padding-bottom: 8px;
-  margin-bottom: 8px;
-  float: none; }
-.gdInstallPage #dbTablePrefix {
-  width: 60px; }
-.gdInstallPage input.pwdField {
-  width: 100px; }
-.gdInstallPage .doc label {
-  float: left;
-  width: 160px;
-  color: #777777;
-  margin-top: 2px;
-  clear: right; }
-.gdInstallPage .doc > div {
-  clear: both; }
-.gdInstallPage .doc div > div {
-  float: right;
-  width: 770px; }
-.gdInstallPage #gdInstallNav {
-  float: left;
-  width: 200px;
-  padding-top: 6px; }
-  .gdInstallPage #gdInstallNav ol {
-    margin: 0px;
-    padding: 0px 0px 0px 20px; }
-  .gdInstallPage #gdInstallNav ol li {
-    padding-left: 0px;
-    color: #cccccc; }
-  .gdInstallPage #gdInstallNav ol li.gdSelected {
-    font-weight: bold;
-    color: green; }
-  .gdInstallPage #gdInstallNav ol li.gdComplete {
-    color: #999999; }
-.gdInstallPage .gdInstallSection {
-  float: right;
-  width: 725px; }
-  .gdInstallPage .gdInstallSection p {
-    margin-bottom: 12px; }
-  .gdInstallPage .gdInstallSection button {
-    margin-bottom: 10px; }
-.gdInstallPage .gdAdminAccountHeading {
-  font-weight: bold; }
-.gdInstallPage .gdInstallTabMessage {
-  border-radius: 5px;
-  padding: 3px 10px 3px 54px;
-  margin-bottom: 10px;
-  text-shadow: 0 1px 0 #fff;
-  display: none;
-  min-height: 36px;
-  position: relative; }
-  .gdInstallPage .gdInstallTabMessage .gdIcon {
-    width: 32px;
-    height: 32px;
-    position: absolute;
-    left: 12px;
-    top: 10px; }
-  .gdInstallPage .gdInstallTabMessage h3 {
-    font-weight: bold;
-    display: inline;
-    font-size: 8pt; }
-  .gdInstallPage .gdInstallTabMessage .gdResponse {
-    color: #000000; }
-.gdInstallPage .gdInstallError {
-  background-color: #ffe1e1; }
-  .gdInstallPage .gdInstallError h3 {
-    color: #cc0000; }
-  .gdInstallPage .gdInstallError .gdIcon {
-    background-image: url(../images/stop.png); }
-.gdInstallPage .gdInstallSuccess .gdIcon {
-  background-image: url(../images/info.png); }
diff --git a/resources/themes/classic/compiled/layout.css b/resources/themes/classic/compiled/layout.css
deleted file mode 100644
index b0d7d1ce3..000000000
--- a/resources/themes/classic/compiled/layout.css
+++ /dev/null
@@ -1,194 +0,0 @@
-header {
-  background-image: url(../images/siteHeader.jpg);
-  background-repeat: no-repeat;
-  position: relative;
-  width: 980px;
-  height: 77px;
-  margin: 0 auto;
-  text-align: center;
-  margin-bottom: 8px;
-  display: block; }
-  header nav {
-    position: absolute;
-    right: 0px;
-    top: 32px; }
-    header nav ul {
-      margin: 0px;
-      padding: 0px;
-      display: inline;
-      list-style: none; }
-      header nav ul li {
-        display: inline; }
-    header nav a:link, header nav a:visited {
-      text-decoration: none; }
-    header nav a:hover {
-      color: #990000;
-      border-bottom: 1px solid #990000; }
-
-section {
-  width: 500px;
-  border-top: none;
-  border-bottom: none;
-  background-color: white;
-  width: 930px;
-  margin: 0 auto;
-  text-align: left;
-  padding: 10px 25px 20px;
-  clear: left;
-  display: block; }
-
-nav {
-  display: block; }
-  nav a:link, nav a:visited {
-    color: #3366cc;
-    outline: none;
-    text-shadow: 0 1px 0 #fff; }
-
-footer {
-  width: 980px;
-  margin: 0 auto 15px;
-  padding: 5px 0px;
-  height: 20px;
-  font-size: 7pt;
-  background-color: #f5f5f5;
-  border-top: none;
-  border-bottom-left-radius: 8px;
-  border-bottom-right-radius: 8px;
-  border-radius-bottomleft: 8px;
-  border-radius-bottomright: 8px;
-  display: block; }
-  footer a:link, footer a:visited {
-    color: #555555;
-    text-decoration: none;
-    color: #3366cc;
-    outline: none; }
-    footer a:link:hover, footer a:visited:hover {
-      text-decoration: underline; }
-  footer ul {
-    list-style: none;
-    padding: 0px;
-    margin: 0px; }
-    footer ul li {
-      margin: 0px;
-      padding: 0px;
-      display: inline; }
-      footer ul li:before {
-        content: " | ";
-        color: #cccccc; }
-      footer ul li:first-child:before {
-        content: ""; }
-      footer ul li span {
-        margin: 0px 6px;
-        font-size: inherit; }
-
-#gdMainTabs {
-  width: 980px;
-  margin: 0 auto;
-  position: relative; }
-  #gdMainTabs ul {
-    list-style: none;
-    margin: 0px;
-    padding: 0px; }
-    #gdMainTabs ul li {
-      color: #222222;
-      font-size: 9pt;
-      cursor: pointer;
-      margin: 2px 1px 0 0;
-      padding: 3px 0 0 0;
-      float: left;
-      width: 120px;
-      border-top-left-radius: 8px;
-      border-top-right-radius: 8px;
-      border-radius-topleft: 8px;
-      border-radius-topright: 8px;
-      background-color: #efefef;
-      height: 22px;
-      color: #666666; }
-      #gdMainTabs ul li a:link, #gdMainTabs ul li a:visited {
-        display: block;
-        font-size: 9pt;
-        color: green;
-        text-decoration: none; }
-      #gdMainTabs ul li:hover {
-        background-color: #f5faf6; }
-    #gdMainTabs ul li.gdSelected {
-      color: green;
-      cursor: inherit;
-      border-bottom: 0px;
-      height: 22px;
-      background-color: white; }
-      #gdMainTabs ul li.gdSelected:hover {
-        background-color: white; }
-
-.gdMainTabContent {
-  padding: 0px;
-  margin: 0px; }
-  .gdMainTabContent > li {
-    padding: 0px;
-    margin: 0px;
-    list-style: none; }
-  .gdMainTabContent h1 {
-    float: left; }
-  .gdMainTabContent .gdSectionHelpTip {
-    float: left;
-    list-style: none;
-    padding-left: 10px;
-    padding-top: 17px; }
-
-#gdMainTab1Content {
-  display: block;
-  margin-top: 20px; }
-  #gdMainTab1Content h2 {
-    margin: 0px 0px 4px;
-    font-size: 12px;
-    color: #777777;
-    padding: 1px 20px 0px 1px; }
-    #gdMainTab1Content h2 span.gdSectionHelp {
-      background: transparent url("../images/helpSmall.png") right center no-repeat;
-      cursor: pointer;
-      width: 14px;
-      height: 14px;
-      display: inline-block;
-      margin: 0px 0px -2px 3px; }
-  #gdMainTab1Content .gdFields {
-    float: left; }
-
-#gdContent {
-  text-align: left;
-  position: relative; }
-
-.cols2 {
-  clear: both;
-  position: relative; }
-
-.cols2 .col {
-  float: left;
-  width: 410px; }
-
-.gdSetting {
-  position: relative;
-  clear: left;
-  line-height: 18pt;
-  width: 500px; }
-  .gdSetting > label {
-    float: left;
-    width: 160px; }
-  .gdSetting > div {
-    float: left; }
-
-.gdFields {
-  line-height: 21px;
-  width: 725px; }
-  .gdFields .gdError {
-    margin-left: 6px;
-    background: transparent url(../images/error.gif) left center no-repeat;
-    float: left;
-    width: 315px;
-    padding-left: 24px;
-    color: #e22222;
-    display: none; }
-  .gdFields input.pwdField {
-    width: 100px; }
-
-#consoleEventsModuleList {
-  width: 400px; }
diff --git a/resources/themes/classic/compiled/login.css b/resources/themes/classic/compiled/login.css
deleted file mode 100644
index 86a4478a6..000000000
--- a/resources/themes/classic/compiled/login.css
+++ /dev/null
@@ -1,11 +0,0 @@
-.gdLoginPage h1 {
-  float: none; }
-
-.gdLoginPage #password {
-  width: 120px; }
-
-#gdLogin_password {
-  margin: 0px; }
-
-#gdLogin_email {
-  width: 200px; }
diff --git a/resources/themes/classic/compiled/misc.css b/resources/themes/classic/compiled/misc.css
deleted file mode 100644
index cb312ba0d..000000000
--- a/resources/themes/classic/compiled/misc.css
+++ /dev/null
@@ -1,189 +0,0 @@
-/* misc stuff */
-div.gdClear {
-  clear: both; }
-
-.joiner {
-  color: #cccccc; }
-
-.gdVerticalPad {
-  padding-bottom: 10px; }
-
-.gdMarginTop {
-  margin-top: 10px; }
-
-.hidden {
-  display: none; }
-
-.gdTip {
-  color: #777777; }
-
-.red {
-  color: red; }
-
-.bold {
-  font-weight: bold; }
-
-.gdDisabled {
-  color: #cccccc;
-  background-color: #efefef; }
-
-.gdHideNoJS {
-  display: none; }
-
-noscript div {
-  background-color: #ffffcc;
-  padding: 10px;
-  font-size: 10pt;
-  border-radius: 5px;
-  margin: 0px auto;
-  text-shadow: 0 1px 0 #fff;
-  box-shadow: 2px 4px 5px #666666;
-  display: block;
-  width: 950px; }
-  noscript div p {
-    font-size: 12pt;
-    color: #6d6d41; }
-
-/* jQuery UI style overrides */
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {
-  cursor: pointer; }
-
-.ui-dialog {
-  text-align: left; }
-
-.ui-dialog-title {
-  font-size: 14px; }
-
-.gdColOptions .ui-datepicker-trigger {
-  margin: 0px 0px -3px 1px;
-  cursor: pointer; }
-
-#gdTableRows .gdColHelp .ui-helper-clearfix {
-  margin-left: 8px;
-  margin-top: 2px; }
-
-body .ui-widget-content {
-  color: #555555; }
-
-body .ui-widget-overlay {
-  background: #333333 url(../../../css/smoothness/images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-  opacity: .30;
-  filter: Alpha(Opacity=30); }
-
-body .ui-widget-shadow {
-  margin: -8px 0 0 -8px;
-  padding: 8px;
-  background: #333333 url(../../../css/smoothness/images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-  opacity: .30;
-  filter: Alpha(Opacity=30);
-  -moz-border-radius: 8px;
-  -khtml-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  border-radius: 8px; }
-
-/* overridden Chosen styles */
-body .chzn-container-multi .chzn-choices .search-choice {
-  margin-left: 3px;
-  padding: 0px 20px 2px 5px;
-  margin-bottom: 1px; }
-
-body .chzn-container-multi .chzn-choices .search-field .default {
-  font: 11px Verdana, sans-serif; }
-
-body .chzn-container-multi .chzn-choices {
-  background-image: none;
-  padding-bottom: 2px;
-  border: 1px solid #cccccc;
-  background-color: #fafafa; }
-
-body .ui-tooltip {
-  text-align: left; }
-
-/* plugin installation */
-#gdPluginInstallationResults > div {
-  padding: 4px 8px 8px;
-  background-color: #f2f2f2;
-  border-radius: 8px;
-  float: left;
-  width: 30%;
-  margin-right: 10px; }
-  #gdPluginInstallationResults > div:last-child {
-    margin-right: 0px; }
-#gdPluginInstallationResults h4 {
-  margin: 0px;
-  padding: 0px;
-  font-weight: normal;
-  color: #222222;
-  font-style: italic; }
-#gdPluginInstallationResults .gdResponse div {
-  font-size: 7pt;
-  line-height: 16px;
-  border-bottom: 1px solid #dddddd;
-  clear: both; }
-  #gdPluginInstallationResults .gdResponse div:first-child {
-    margin-top: 4px; }
-  #gdPluginInstallationResults .gdResponse div:last-child {
-    border-bottom: 0px; }
-#gdPluginInstallationResults .gdResponse .gdSuccess {
-  background-color: green;
-  color: white;
-  border-radius: 3px;
-  padding: 0px 4px;
-  float: right;
-  line-height: 16px;
-  font-size: 6.5pt; }
-#gdPluginInstallationResults .gdResponse .gdError {
-  background-color: #cc0000;
-  color: white;
-  border-radius: 3px;
-  padding: 0px 4px;
-  float: right;
-  line-height: 16px;
-  font-size: 6.5pt;
-  cursor: pointer; }
-
-/* overridden CodeMirror styles */
-body .CodeMirror {
-  border: 1px solid #cccccc;
-  /*line-height: 16px;*/ }
-  body .CodeMirror pre, body .CodeMirror span {
-    font-family: monospace; }
-
-body .CodeMirror-lines div pre {
-  /*line-height: 14px;*/ }
-
-body .CodeMirror-scroll {
-  height: 500px; }
-
-body .CodeMirror_small table, body .CodeMirror_small td, body .CodeMirror_small p, body .CodeMirror_small div, body .CodeMirror_small span {
-  line-height: 10px;
-  font-size: 7pt; }
-
-body .CodeMirror_medium table, body .CodeMirror_medium td, body .CodeMirror_medium p, body .CodeMirror_medium div, body .CodeMirror_medium span {
-  line-height: 16px;
-  font-size: 9pt; }
-
-body .CodeMirror_large table, body .CodeMirror_large td, body .CodeMirror_large p, body .CodeMirror_large div, body .CodeMirror_large span {
-  line-height: 22px;
-  font-size: 12pt; }
-
-#gdRefreshPassword {
-  width: 16px;
-  height: 16px;
-  margin-bottom: -5px;
-  margin-left: 2px;
-  display: inline-block;
-  background-image: url(../images/refresh.png);
-  cursor: pointer; }
-
-input.medium {
-  width: 200px; }
-
-#gdManageAccount_password {
-  width: 100px; }
-
-#githubRibbon {
-  float: right;
-  top: 0px;
-  right: 0px;
-  margin: -20px -25px 0px 0px; }
diff --git a/resources/themes/classic/compiled/notifications.css b/resources/themes/classic/compiled/notifications.css
deleted file mode 100644
index 914a6d51c..000000000
--- a/resources/themes/classic/compiled/notifications.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.gdMessage {
-  position: relative;
-  display: none; }
-  .gdMessage a.gdMessageClose:link, .gdMessage a.gdMessageClose:visited {
-    position: absolute;
-    top: 10px;
-    right: 12px;
-    text-decoration: none;
-    color: black;
-    background-color: white;
-    width: 20px;
-    border-radius: 6px;
-    font-size: 7pt;
-    line-height: 16px;
-    border-radius: 6px;
-    text-align: center; }
-  .gdMessage ul {
-    margin: 0px;
-    padding: 0px 20px; }
-
-.gdNotify {
-  background-color: #F2F8FF;
-  border: 1px solid #0058DB; }
-  .gdNotify p {
-    padding: 8px;
-    color: #0058DB;
-    margin: 0px; }
-  .gdNotify a.gdMessageClose:hover {
-    background-color: #3b82cb;
-    color: white; }
-
-.gdErrors {
-  background-color: #FFEDED;
-  border: 1px solid #CC0000; }
-  .gdErrors a.gdMessageClose:hover {
-    background-color: #AA0000;
-    color: white; }
-  .gdErrors div {
-    padding: 8px;
-    color: #aa0000 ul;
-      color-margin: 0px;
-      color-padding-left: 16px; }
-
-.gdProblemField {
-  background-color: #990000;
-  color: #ffffcc; }
diff --git a/resources/themes/classic/compiled/settings.css b/resources/themes/classic/compiled/settings.css
deleted file mode 100644
index 6a166e6e8..000000000
--- a/resources/themes/classic/compiled/settings.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.gdDefaultModules {
-  list-style-type: none; }
diff --git a/resources/themes/classic/compiled/styles.css b/resources/themes/classic/compiled/styles.css
deleted file mode 100644
index d889df416..000000000
--- a/resources/themes/classic/compiled/styles.css
+++ /dev/null
@@ -1,1374 +0,0 @@
-/* general styles */
-html {
-  overflow: -moz-scrollbars-vertical;
-  height: 100%; }
-
-body {
-  height: 100%;
-  margin: 0px;
-  background: #dedede url(../images/topBackground.jpg) repeat-x;
-  text-align: center; }
-
-body, table, td, div, span, div, p {
-  font: 11px "lucida grande", verdana, sans-serif;
-  /* 0.94em */
-  line-height: 20px;
-  color: #555555; }
-
-table, td, p, div, input, select, optgroup, noscript {
-  line-height: 17pt; }
-
-input, select, textarea, option {
-  font: 8pt "lucida grande", verdana, sans-serif;
-  color: #222222; }
-
-input[disabled='disabled'] {
-  color: #bbbbbb; }
-
-h1 {
-  font-size: 1.6em;
-  font-weight: normal;
-  font-family: inherit; }
-
-h2 {
-  font-size: 1.2em;
-  color: green;
-  font-weight: normal;
-  font-family: inherit; }
-
-h3 {
-  margin: 10px 0px 7px; }
-
-h3.gdSubtitle {
-  font-size: 12px; }
-
-p {
-  margin: 6px 0px; }
-
-hr {
-  color: #efefef;
-  background-color: #efefef;
-  height: 1px;
-  border: 0px; }
-
-form {
-  margin: 0px; }
-
-select, optgroup, option {
-  font-size: 8pt;
-  font-family: "lucida grande", verdana; }
-
-optgroup {
-  font-weight: bold; }
-
-a:link, a:visited, nav a:link, nav a:visited {
-  color: #638fe6;
-  text-decoration: none; }
-
-a:hover {
-  text-decoration: underline; }
-
-.gdDisabledText, .gdDisabledText label {
-  color: #cccccc; }
-
-ul {
-  padding-left: 16px;
-  margin-left: 0px; }
-
-#gdReportBug {
-  background: transparent url(../images/bug.png) center right no-repeat;
-  padding: 5px 22px 5px 0px; }
-
-.gdFields .gdField {
-  float: left;
-  width: 376px;
-  border-bottom: 1px solid #efefef;
-  clear: left; }
-.gdFields .gdDisabledRow label, .gdFields .gdDisabledRow input {
-  color: #cccccc; }
-.gdFields label {
-  float: left;
-  width: 160px;
-  color: #777777;
-  margin-top: 2px; }
-.gdFields input {
-  float: left;
-  width: 210px;
-  margin-top: 2px; }
-.gdFields div {
-  margin-top: 2px; }
-.gdFields .gdCol {
-  float: left;
-  width: 350px; }
-  .gdFields .gdCol h3 {
-    margin-top: 0px; }
-  .gdFields .gdCol .rightBox {
-    float: right; }
-    .gdFields .gdCol .rightBox input {
-      width: auto;
-      float: none; }
-    .gdFields .gdCol .rightBox label {
-      width: auto;
-      float: none; }
-  .gdFields .gdCol:first-child {
-    margin-right: 20px; }
-  .gdFields .gdCol .gdField {
-    width: 329px; }
-  .gdFields .gdCol input {
-    width: 160px; }
-  .gdFields .gdCol textarea {
-    width: 100%;
-    height: 80px;
-    padding: 3px;
-    color: #555555; }
-
-header {
-  background-image: url(../images/siteHeader.jpg);
-  background-repeat: no-repeat;
-  position: relative;
-  width: 980px;
-  height: 77px;
-  margin: 0 auto;
-  text-align: center;
-  margin-bottom: 8px;
-  display: block; }
-  header nav {
-    position: absolute;
-    right: 0px;
-    top: 32px; }
-    header nav ul {
-      margin: 0px;
-      padding: 0px;
-      display: inline;
-      list-style: none; }
-      header nav ul li {
-        display: inline; }
-    header nav a:link, header nav a:visited {
-      text-decoration: none; }
-    header nav a:hover {
-      color: #990000;
-      border-bottom: 1px solid #990000; }
-
-section {
-  width: 500px;
-  border-top: none;
-  border-bottom: none;
-  background-color: white;
-  width: 930px;
-  margin: 0 auto;
-  text-align: left;
-  padding: 10px 25px 20px;
-  clear: left;
-  display: block; }
-
-nav {
-  display: block; }
-  nav a:link, nav a:visited {
-    color: #3366cc;
-    outline: none;
-    text-shadow: 0 1px 0 #fff; }
-
-footer {
-  width: 980px;
-  margin: 0 auto 15px;
-  padding: 5px 0px;
-  height: 20px;
-  font-size: 7pt;
-  background-color: #f5f5f5;
-  border-top: none;
-  border-bottom-left-radius: 8px;
-  border-bottom-right-radius: 8px;
-  border-radius-bottomleft: 8px;
-  border-radius-bottomright: 8px;
-  display: block; }
-  footer a:link, footer a:visited {
-    color: #555555;
-    text-decoration: none;
-    color: #3366cc;
-    outline: none; }
-    footer a:link:hover, footer a:visited:hover {
-      text-decoration: underline; }
-  footer ul {
-    list-style: none;
-    padding: 0px;
-    margin: 0px; }
-    footer ul li {
-      margin: 0px;
-      padding: 0px;
-      display: inline; }
-      footer ul li:before {
-        content: " | ";
-        color: #cccccc; }
-      footer ul li:first-child:before {
-        content: ""; }
-      footer ul li span {
-        margin: 0px 6px;
-        font-size: inherit; }
-
-#gdMainTabs {
-  width: 980px;
-  margin: 0 auto;
-  position: relative; }
-  #gdMainTabs ul {
-    list-style: none;
-    margin: 0px;
-    padding: 0px; }
-    #gdMainTabs ul li {
-      color: #222222;
-      font-size: 9pt;
-      cursor: pointer;
-      margin: 2px 1px 0 0;
-      padding: 3px 0 0 0;
-      float: left;
-      width: 120px;
-      border-top-left-radius: 8px;
-      border-top-right-radius: 8px;
-      border-radius-topleft: 8px;
-      border-radius-topright: 8px;
-      background-color: #efefef;
-      height: 22px;
-      color: #666666; }
-      #gdMainTabs ul li a:link, #gdMainTabs ul li a:visited {
-        display: block;
-        font-size: 9pt;
-        color: green;
-        text-decoration: none; }
-      #gdMainTabs ul li:hover {
-        background-color: #f5faf6;
-        -moz-transition: background-color 150ms linear;
-        -webkit-transition: background-color 150ms linear;
-        -o-transition: background-color 150ms linear; }
-    #gdMainTabs ul li.gdSelected {
-      color: green;
-      cursor: inherit;
-      border-bottom: 0px;
-      height: 22px;
-      background-color: white; }
-      #gdMainTabs ul li.gdSelected:hover {
-        background-color: white; }
-
-.gdMainTabContent {
-  padding: 0px;
-  margin: 0px; }
-  .gdMainTabContent > li {
-    padding: 0px;
-    margin: 0px;
-    list-style: none; }
-  .gdMainTabContent h1 {
-    float: left; }
-  .gdMainTabContent .gdSectionHelpTip {
-    float: left;
-    list-style: none;
-    padding-left: 10px;
-    padding-top: 17px; }
-
-#gdMainTab1Content {
-  display: block;
-  margin-top: 20px; }
-  #gdMainTab1Content h2 {
-    margin: 0px 0px 4px;
-    font-size: 12px;
-    color: #777777;
-    padding: 1px 20px 0px 1px; }
-    #gdMainTab1Content h2 span.gdSectionHelp {
-      background: transparent url("../images/helpSmall.png") right center no-repeat;
-      cursor: pointer;
-      width: 14px;
-      height: 14px;
-      display: inline-block;
-      margin: 0px 0px -2px 3px; }
-  #gdMainTab1Content .gdFields {
-    float: left; }
-
-#gdContent {
-  text-align: left;
-  position: relative; }
-
-.cols2 {
-  clear: both;
-  position: relative; }
-
-.cols2 .col {
-  float: left;
-  width: 410px; }
-
-.gdSetting {
-  position: relative;
-  clear: left;
-  line-height: 18pt;
-  width: 500px; }
-  .gdSetting > label {
-    float: left;
-    width: 160px; }
-  .gdSetting > div {
-    float: left; }
-
-.gdFields {
-  line-height: 21px;
-  width: 725px; }
-  .gdFields .gdError {
-    margin-left: 6px;
-    background: transparent url(../images/error.gif) left center no-repeat;
-    float: left;
-    width: 315px;
-    padding-left: 24px;
-    color: #e22222;
-    display: none; }
-  .gdFields input.pwdField {
-    width: 100px; }
-
-#consoleEventsModuleList {
-  width: 400px; }
-
-/* contains styles for the generator table */
-hr.divider {
-  color: #efefef;
-  margin: 16px 0px 0px; }
-
-#gdTableRows li.gdDeletedRow {
-  color: #ffffcc; }
-  #gdTableRows li.gdDeletedRow label, #gdTableRows li.gdDeletedRow div {
-    color: #ffffcc; }
-#gdTableRows > li:nth-child(even) {
-  background-color: #eaffe6; }
-#gdTableRows > li:nth-child(odd) {
-  background-color: #f1f1f1; }
-
-/* needed to override the nth-child style above */
-body #gdTableRows li.gdDeletedRow {
-  background-color: #660000; }
-
-.gdTableHeadings {
-  line-height: 18.6px; }
-  .gdTableHeadings li {
-    background: -webkit-gradient(linear, left top, left bottom, from(#dddddd), to(#dfdfdf), color-stop(0.5, #dfdfdf), color-stop(0.5, #dfdfdf));
-    background: -moz-linear-gradient(bottom, #dddddd, #dfdfdf);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#dfdfdf');
-    float: left;
-    text-align: center;
-    height: 20px;
-    margin: 0px 0px 0px 1px;
-    padding: 0px;
-    color: #444444;
-    text-shadow: 1px 1px #f2f2f2;
-    font-weight: normal; }
-    .gdTableHeadings li.gdColDelete {
-      width: 39px; }
-  .gdTableHeadings thead tr {
-    background: -webkit-gradient(linear, left top, left bottom, from(#dddddd), to(#dfdfdf), color-stop(0.5, #dfdfdf), color-stop(0.5, #dfdfdf));
-    background: -moz-linear-gradient(bottom, #dddddd, #dfdfdf);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#dfdfdf');
-    color: #444444;
-    text-shadow: 1px 1px #f2f2f2; }
-    .gdTableHeadings thead tr th {
-      line-height: 18.6px;
-      text-align: center;
-      font-weight: normal;
-      height: 20px; }
-  .gdTableHeadings tbody tr > li:nth-child(even) {
-    background-color: #ebfeeb; }
-  .gdTableHeadings tbody tr > li:nth-child(odd) {
-    background-color: #f1f1f1; }
-
-.gdTableHeadings, #gdTableRows, #gdTableRows ul {
-  font-family: "lucida grande", verdana;
-  clear: both;
-  margin: 0px;
-  padding: 0px;
-  list-style: none;
-  font-weight: bold; }
-
-#gdTableRows {
-  margin-bottom: 8px; }
-  #gdTableRows li {
-    float: left;
-    margin: 0px 0px 1px 1px;
-    padding: 0px;
-    font-weight: normal;
-    font-family: verdana;
-    line-height: 16pt; }
-
-.gdColOrder {
-  cursor: move;
-  width: 40px;
-  text-align: center; }
-
-.gdColTitle {
-  width: 136px; }
-  .gdColTitle input {
-    width: 130px; }
-
-.gdColDataType {
-  width: 198px; }
-  .gdColDataType select {
-    width: 198px; }
-
-.gdColExamples {
-  width: 198px; }
-
-.gdColOptions {
-  width: 274px; }
-
-.gdColHelp {
-  width: 38px;
-  text-align: center; }
-
-li.gdColDelete {
-  width: 38px;
-  text-align: center;
-  display: block; }
-
-#gdHelpPopup {
-  padding-left: 54px;
-  background: transparent url(../images/info.png) 10px 10px no-repeat; }
-  #gdHelpPopup p {
-    margin: 5px 0px 12px; }
-  #gdHelpPopup h4 {
-    margin: 0px; }
-
-#gdEmptyFormDialog {
-  padding-left: 54px;
-  background: transparent url(../images/help.png) 10px 10px no-repeat; }
-  #gdEmptyFormDialog p {
-    margin: 5px 0px 12px; }
-  #gdEmptyFormDialog h4 {
-    margin: 0px; }
-
-#gdTextSize {
-  float: right;
-  list-style: none; }
-  #gdTextSize li {
-    float: left;
-    width: 18px;
-    vertical-align: top;
-    margin: 3px 0px 0px 3px;
-    background-color: #F2F2F2;
-    padding: 1px 3px;
-    text-align: center;
-    border-radius: 3px;
-    cursor: pointer; }
-    #gdTextSize li.gdSelected {
-      background-color: #3366cc;
-      color: white; }
-    #gdTextSize li.small {
-      font-size: 8pt; }
-    #gdTextSize li.medium {
-      font-size: 12pt; }
-    #gdTextSize li.large {
-      font-size: 16pt; }
-
-#gdGeneratedData {
-  height: 400px;
-  width: 100%; }
-
-#gdProcessingIcon {
-  position: absolute;
-  right: -1px;
-  top: 5px; }
-
-#gdDataSetStatusLine {
-  position: absolute;
-  right: 30px;
-  top: 5px;
-  font-style: italic;
-  color: #666666;
-  font-size: 7pt; }
-
-.gdSmallTabs {
-  margin-bottom: 20px; }
-  .gdSmallTabs ul {
-    list-style: none;
-    margin: 0px;
-    padding: 0px;
-    height: 20px;
-    border-bottom: 1px solid #e1e1e1; }
-    .gdSmallTabs ul li {
-      line-height: 20px;
-      height: 20px;
-      float: left;
-      margin-right: 1px;
-      padding: 0px 16px;
-      border-top-left-radius: 6px;
-      border-top-right-radius: 6px;
-      background: #f2f2f2;
-      background: -moz-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-      background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f2f2f2), color-stop(100%, #e1e1e1));
-      background: -webkit-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-      background: -o-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-      background: -ms-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-      background: linear-gradient(to bottom, #f2f2f2 0%, #e1e1e1 100%);
-      filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e1e1e1',GradientType=0 );
-      cursor: pointer;
-      text-shadow: 1px 1px #f2f2f2; }
-      .gdSmallTabs ul li.gdSelected {
-        background: white;
-        background-color: white;
-        border: 1px solid #cccccc;
-        border-bottom: 0px;
-        line-height: 18px;
-        padding: 0px 15px; }
-  .gdSmallTabs .gdExportTypeTabSettings {
-    clear: both;
-    border-top: 0px;
-    padding: 6px;
-    margin: 0px;
-    display: none; }
-  .gdSmallTabs #gdShowSettingsLink {
-    float: right; }
-    .gdSmallTabs #gdShowSettingsLink span {
-      font-size: 7pt; }
-    .gdSmallTabs #gdShowSettingsLink a {
-      font-size: 7pt;
-      color: #3366CC; }
-
-#gdExportTypeTabs {
-  border-bottom: 1px solid #e1e1e1; }
-
-#gdGenerateSection {
-  background-color: #dcffd8;
-  border-radius: 6px;
-  padding: 20px;
-  border: 1px solid #b8e2b3; }
-  #gdGenerateSection span {
-    margin-left: 55px; }
-    #gdGenerateSection span label {
-      margin-right: 8px; }
-  #gdGenerateSection .gdDisabled {
-    background-color: transparent; }
-
-#gdGenerateCount, #gdGenerateTotal {
-  font-weight: bold; }
-
-#gdNumRowsToGenerate {
-  width: 45px;
-  margin: 0px 5px; }
-
-#gdGenerationPanel {
-  line-height: 10px;
-  margin-bottom: 8px; }
-
-#gdProgressMeter {
-  width: 260px;
-  margin-right: 3px; }
-
-#gdActionIcons {
-  float: right;
-  list-style: none;
-  margin-top: 0px;
-  padding: 0px; }
-  #gdActionIcons li {
-    padding: 2px;
-    display: inline-block;
-    width: 32px;
-    height: 32px;
-    background-color: #e1e1e1;
-    -webkit-transition: background-color .2s;
-    -moz-transition: background-color .2s;
-    transition: background-color .2s;
-    border-radius: 3px;
-    cursor: pointer;
-    display: inline-block; }
-    #gdActionIcons li:hover {
-      background-color: #cccccc; }
-    #gdActionIcons li.loading:hover {
-      background-color: #e1e1e1; }
-    #gdActionIcons li.loading img {
-      filter: url(../../../css/filters.svg#grayscale);
-      filter: gray;
-      -webkit-filter: grayscale(1);
-      /* Webkit Nightlies & Chrome Canary */
-      opacity: .5; }
-
-#gdDataSetName {
-  font-size: 1.6em;
-  border: 1px solid #cccccc;
-  border-right: 0px;
-  padding: 6px;
-  width: 730px;
-  color: #555555;
-  float: left;
-  height: 22px; }
-  #gdDataSetName::-webkit-input-placeholder {
-    color: #aaaaaa; }
-  #gdDataSetName:-moz-placeholder {
-    color: #aaaaaa; }
-
-a.gdDisabledLink {
-  color: #cccccc; }
-
-#gdSelectLanguage {
-  width: 150px; }
-
-#gdAccountList thead td {
-  border-bottom: 1px solid #cccccc;
-  font-weight: bold; }
-#gdAccountList table {
-  width: 100%; }
-
-#gdUserAccount {
-  background: transparent url(../images/user.png) top left no-repeat;
-  padding-left: 20px; }
-
-.gdIconWarning {
-  background: transparent url(../images/warning.png) top left no-repeat;
-  width: 48px;
-  height: 48px; }
-
-#gdAddDataSetRowsSection {
-  background-color: #f2f2f2;
-  border-radius: 3px;
-  padding: 4px 4px 4px 8px;
-  display: inline-block; }
-
-/* Fix for https://github.com/benkeen/generatedata/issues/171 */
-.search-field input {
-  min-width: 150px; }
-
-/* buttons */
-.gdButton {
-  border: 0px;
-  margin: 1px;
-  padding: 2px 6px;
-  font-family: verdana;
-  text-shadow: rgba(64, 64, 64, 0.2) 3px 3px 8px;
-  cursor: pointer; }
-
-.gdButtonType1 {
-  color: white;
-  background-color: #58BB44;
-  font-size: 9pt;
-  font-weight: bold;
-  box-shadow: 2px 3px 3px #666666; }
-
-.gdButtonType2 {
-  color: #666666;
-  background-color: #e9e9e9;
-  font-size: 7pt;
-  border: 1px solid #cccccc; }
-
-.gdButtonType3 {
-  color: #660000;
-  background-color: #e9e9e9;
-  font-size: 7pt;
-  border: 1px solid #cccccc; }
-
-/* from: http://hellohappy.org/css3-buttons/ */
-.gdPrimaryButton {
-  display: block;
-  background-color: #7fbf4d;
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-  background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: linear-gradient(top, #7fbf4d, #63a62f);
-  border: 1px solid #63a62f;
-  border-bottom: 1px solid #5b992b;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 0 0 #96ca6d;
-  -moz-box-shadow: inset 0 1px 0 0 #96ca6d;
-  box-shadow: inset 0 1px 0 0 #96ca6d;
-  color: #fff;
-  font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-  line-height: 1;
-  padding: 4px 15px 4px;
-  margin: 15px 0px 0px;
-  text-align: center;
-  text-shadow: 0 -1px 0 #4c9021; }
-  .gdPrimaryButton:hover {
-    background-color: #76b347;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #76b347), color-stop(100%, #5e9e2e));
-    background-image: -webkit-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -moz-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -ms-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -o-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: linear-gradient(top, #76b347, #5e9e2e);
-    box-shadow: inset 0 1px 0 0 #8dbf67;
-    cursor: pointer; }
-  .gdPrimaryButton:active {
-    border: 1px solid #5b992b;
-    border-bottom: 1px solid #538c27;
-    box-shadow: inset 0 0 8px 4px #548c29, 0 1px 0 0 #eeeeee; }
-
-.gdSecondaryButton {
-  display: block;
-  background-color: #eeeeee;
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #cccccc));
-  background-image: -webkit-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -moz-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -ms-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -o-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: linear-gradient(top, #eeeeee, #cccccc);
-  border: 1px solid #ccc;
-  border-bottom: 1px solid #bbb;
-  border-radius: 3px;
-  color: #333;
-  font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-  line-height: 7pt;
-  padding: 2px 10px 2px;
-  margin: 15px 0px 0px;
-  text-align: center;
-  text-shadow: 0 1px 0 #eee; }
-  .gdSecondaryButton:hover {
-    background-color: #dddddd;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dddddd), color-stop(100%, #bbbbbb));
-    background-image: -webkit-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -moz-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -ms-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -o-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: linear-gradient(top, #dddddd, #bbbbbb);
-    border: 1px solid #bbb;
-    border-bottom: 1px solid #999;
-    cursor: pointer;
-    text-shadow: 0 1px 0 #ddd;
-    cursor: pointer; }
-  .gdSecondaryButton:active {
-    border: 1px solid #aaa;
-    border-bottom: 1px solid #888;
-    -webkit-box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee;
-    box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee; }
-
-#gdGenerateButton {
-  display: inline;
-  font-size: 11pt;
-  margin: -2px 0px 0px 0px;
-  line-height: 15px; }
-
-#gdBackButton {
-  float: left;
-  margin-right: 4px;
-  padding: 4px 6px; }
-
-#gdSaveBtn {
-  background: -webkit-gradient(linear, left top, left bottom, from(#dfdfdf), to(#efefef), color-stop(0.5, #efefef), color-stop(0.5, #efefef));
-  background: -moz-linear-gradient(bottom, #dfdfdf, #efefef);
-  padding: 4px;
-  border: 1px solid #cccccc;
-  padding: 5px 17px;
-  border-top-right-radius: 6px;
-  border-bottom-right-radius: 6px;
-  line-height: 22px;
-  font-size: 11px;
-  color: #666666;
-  display: inline-block;
-  text-transform: 1px 1px #F2F2F2;
-  cursor: pointer;
-  height: 36px;
-  margin-left: 0px;
-  width: 68px;
-  outline: none; }
-  #gdSaveBtn:hover {
-    background-color: #7fbf4d;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-    background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: linear-gradient(top, #7fbf4d, #63a62f);
-    border: 1px solid #6ca341;
-    color: white; }
-
-/* misc stuff */
-div.gdClear {
-  clear: both; }
-
-.joiner {
-  color: #cccccc; }
-
-.gdVerticalPad {
-  padding-bottom: 10px; }
-
-.gdMarginTop {
-  margin-top: 10px; }
-
-.gdMarginBottom {
-  margin-bottom: 10px; }
-
-.hidden {
-  display: none; }
-
-.gdTip {
-  color: #777777; }
-
-.red {
-  color: red; }
-
-.bold {
-  font-weight: bold; }
-
-.gdDisabled {
-  color: #cccccc;
-  background-color: #efefef; }
-
-.gdHideNoJS {
-  display: none; }
-
-noscript div {
-  background-color: #ffffcc;
-  padding: 10px;
-  font-size: 10pt;
-  border-radius: 5px;
-  margin: 0px auto;
-  text-shadow: 0 1px 0 #fff;
-  box-shadow: 2px 4px 5px #666666;
-  display: block;
-  width: 950px; }
-  noscript div p {
-    font-size: 12pt;
-    color: #6d6d41; }
-
-/* jQuery UI style overrides */
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {
-  cursor: pointer; }
-
-.ui-dialog {
-  text-align: left; }
-
-.ui-dialog-title {
-  font-size: 14px; }
-
-.gdColOptions .ui-datepicker-trigger {
-  margin: 0px 0px -3px 1px;
-  cursor: pointer; }
-
-#gdTableRows .gdColHelp .ui-helper-clearfix {
-  margin-left: 8px;
-  margin-top: 2px; }
-
-body .ui-widget-content {
-  color: #555555; }
-
-body .ui-widget-overlay {
-  background: #333333 url(../../../css/smoothness/images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-  opacity: .30;
-  filter: Alpha(Opacity=30); }
-
-body .ui-widget-shadow {
-  margin: -8px 0 0 -8px;
-  padding: 8px;
-  background: #333333 url(../../../css/smoothness/images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-  opacity: .30;
-  filter: Alpha(Opacity=30);
-  -moz-border-radius: 8px;
-  -khtml-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  border-radius: 8px; }
-
-/* overridden Chosen styles */
-body .chzn-container-multi .chzn-choices .search-choice {
-  margin-left: 3px;
-  padding: 0px 20px 2px 5px;
-  margin-bottom: 1px; }
-
-body .chzn-container-multi .chzn-choices .search-field .default {
-  font: 11px Verdana, sans-serif; }
-
-body .chzn-container-multi .chzn-choices {
-  background-image: none;
-  padding-bottom: 2px;
-  border: 1px solid #cccccc;
-  background-color: #fafafa; }
-
-body .ui-tooltip {
-  text-align: left; }
-
-/* plugin installation */
-#gdPluginInstallationResults > div {
-  padding: 4px 8px 8px;
-  background-color: #f2f2f2;
-  border-radius: 8px;
-  float: left;
-  width: 30%;
-  margin-right: 10px; }
-  #gdPluginInstallationResults > div:last-child {
-    margin-right: 0px; }
-#gdPluginInstallationResults h4 {
-  margin: 0px;
-  padding: 0px;
-  font-weight: normal;
-  color: #222222;
-  font-style: italic; }
-#gdPluginInstallationResults .gdResponse div {
-  font-size: 7pt;
-  line-height: 16px;
-  border-bottom: 1px solid #dddddd;
-  clear: both; }
-  #gdPluginInstallationResults .gdResponse div:first-child {
-    margin-top: 4px; }
-  #gdPluginInstallationResults .gdResponse div:last-child {
-    border-bottom: 0px; }
-#gdPluginInstallationResults .gdResponse .gdSuccess {
-  background-color: green;
-  color: white;
-  border-radius: 3px;
-  padding: 0px 4px;
-  float: right;
-  line-height: 16px;
-  font-size: 6.5pt; }
-#gdPluginInstallationResults .gdResponse .gdError {
-  background-color: #cc0000;
-  color: white;
-  border-radius: 3px;
-  padding: 0px 4px;
-  float: right;
-  line-height: 16px;
-  font-size: 6.5pt;
-  cursor: pointer; }
-
-/* overridden CodeMirror styles */
-body .CodeMirror {
-  border: 1px solid #cccccc;
-  /*line-height: 16px;*/ }
-  body .CodeMirror pre, body .CodeMirror span {
-    font-family: monospace; }
-
-body .CodeMirror-lines div pre {
-  /*line-height: 14px;*/ }
-
-body .CodeMirror-scroll {
-  height: 500px; }
-
-body .CodeMirror_small table, body .CodeMirror_small td, body .CodeMirror_small p, body .CodeMirror_small div, body .CodeMirror_small span {
-  line-height: 10px;
-  font-size: 7pt; }
-
-body .CodeMirror_medium table, body .CodeMirror_medium td, body .CodeMirror_medium p, body .CodeMirror_medium div, body .CodeMirror_medium span {
-  line-height: 16px;
-  font-size: 9pt; }
-
-body .CodeMirror_large table, body .CodeMirror_large td, body .CodeMirror_large p, body .CodeMirror_large div, body .CodeMirror_large span {
-  line-height: 22px;
-  font-size: 12pt; }
-
-#gdRefreshPassword {
-  width: 16px;
-  height: 16px;
-  margin-bottom: -5px;
-  margin-left: 2px;
-  display: inline-block;
-  background-image: url(../images/refresh.png);
-  cursor: pointer; }
-
-input.medium {
-  width: 200px; }
-
-#gdManageAccount_password {
-  width: 100px; }
-
-#githubRibbon {
-  float: right;
-  top: 0px;
-  right: 0px;
-  margin: -20px -25px 0px 0px; }
-
-#gdPageLoad {
-  background-color: #cccccc;
-  border-radius: 5px 5px 5px 5px;
-  color: white;
-  margin: 100px auto;
-  width: 305px;
-  font-size: 27pt;
-  height: 75px;
-  text-align: center;
-  vertical-align: center;
-  line-height: 72px; }
-
-.gdMessage {
-  position: relative;
-  display: none; }
-  .gdMessage a.gdMessageClose:link, .gdMessage a.gdMessageClose:visited {
-    position: absolute;
-    top: 10px;
-    right: 12px;
-    text-decoration: none;
-    color: black;
-    background-color: white;
-    width: 20px;
-    border-radius: 6px;
-    font-size: 7pt;
-    line-height: 16px;
-    border-radius: 6px;
-    text-align: center; }
-  .gdMessage ul {
-    margin: 0px;
-    padding: 0px 20px; }
-
-.gdNotify {
-  background-color: #F2F8FF;
-  border: 1px solid #0058DB; }
-  .gdNotify p {
-    padding: 8px;
-    color: #0058DB;
-    margin: 0px; }
-  .gdNotify a.gdMessageClose:hover {
-    background-color: #3b82cb;
-    color: white; }
-
-.gdErrors {
-  background-color: #FFEDED;
-  border: 1px solid #CC0000; }
-  .gdErrors a.gdMessageClose:hover {
-    background-color: #AA0000;
-    color: white; }
-  .gdErrors div {
-    padding: 8px;
-    color: #aa0000 ul;
-      color-margin: 0px;
-      color-padding-left: 16px; }
-
-.gdProblemField {
-  background-color: #990000;
-  color: #ffffcc; }
-
-/* used for the "serious error" page */
-body.gdErrorPage h1 {
-  margin: 0px 0px 12px 0px;
-  font-weight: bold; }
-body.gdErrorPage #gdBox {
-  font-family: verdana;
-  font-size: 11pt;
-  line-height: 22px;
-  position: relative;
-  width: 60%;
-  background: #ffffff;
-  border-radius: 6px;
-  padding: 25px;
-  color: rgba(0, 0, 0, 0.8);
-  line-height: 1.5;
-  margin: 60px auto;
-  text-align: left; }
-  body.gdErrorPage #gdBox:before, body.gdErrorPage #gdBox:after {
-    z-index: -1;
-    position: absolute;
-    content: "";
-    bottom: 15px;
-    left: 10px;
-    width: 50%;
-    top: 80%;
-    max-width: 300px;
-    background: rgba(0, 0, 0, 0.7);
-    box-shadow: 0 15px 10px rgba(0, 0, 0, 0.7);
-    -webkit-transform: rotate(-3deg);
-    -moz-transform: rotate(-3deg);
-    -o-transform: rotate(-3deg);
-    -ms-transform: rotate(-3deg);
-    transform: rotate(-3deg); }
-  body.gdErrorPage #gdBox:after {
-    -webkit-transform: rotate(3deg);
-    -moz-transform: rotate(3deg);
-    -o-transform: rotate(3deg);
-    -ms-transform: rotate(3deg);
-    transform: rotate(3deg);
-    right: 10px;
-    left: auto; }
-  body.gdErrorPage #gdBox p {
-    font-size: 11pt;
-    line-height: 22px;
-    margin-bottom: 12px; }
-body.gdErrorPage #gdNotFixed {
-  color: #990000;
-  margin-bottom: 8px;
-  font-style: italic; }
-body.gdErrorPage #gdSeriousError {
-  font-size: 8pt;
-  max-height: 160px;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  padding: 8px;
-  border: 1px solid #cccccc;
-  background-color: #fbfbfb; }
-
-/* custom styles for the installation page */
-.gdInstallPage h1 {
-  border-bottom: 1px solid #efefef;
-  padding-bottom: 8px;
-  margin-bottom: 8px;
-  float: none; }
-.gdInstallPage #dbTablePrefix {
-  width: 60px; }
-.gdInstallPage input.pwdField {
-  width: 100px; }
-.gdInstallPage .doc label {
-  float: left;
-  width: 160px;
-  color: #777777;
-  margin-top: 2px;
-  clear: right; }
-.gdInstallPage .doc > div {
-  clear: both; }
-.gdInstallPage .doc div > div {
-  float: right;
-  width: 770px; }
-.gdInstallPage #gdInstallNav {
-  float: left;
-  width: 200px;
-  padding-top: 6px; }
-  .gdInstallPage #gdInstallNav ol {
-    margin: 0px;
-    padding: 0px 0px 0px 20px; }
-  .gdInstallPage #gdInstallNav ol li {
-    padding-left: 0px;
-    color: #cccccc; }
-  .gdInstallPage #gdInstallNav ol li.gdSelected {
-    font-weight: bold;
-    color: green; }
-  .gdInstallPage #gdInstallNav ol li.gdComplete {
-    color: #999999; }
-.gdInstallPage .gdInstallSection {
-  float: right;
-  width: 725px; }
-  .gdInstallPage .gdInstallSection p {
-    margin-bottom: 12px; }
-  .gdInstallPage .gdInstallSection button {
-    margin-bottom: 10px; }
-.gdInstallPage .gdAdminAccountHeading {
-  font-weight: bold; }
-.gdInstallPage .gdInstallTabMessage {
-  border-radius: 5px;
-  padding: 3px 10px 3px 54px;
-  margin-bottom: 10px;
-  text-shadow: 0 1px 0 #fff;
-  display: none;
-  min-height: 36px;
-  position: relative; }
-  .gdInstallPage .gdInstallTabMessage .gdIcon {
-    width: 32px;
-    height: 32px;
-    position: absolute;
-    left: 12px;
-    top: 10px; }
-  .gdInstallPage .gdInstallTabMessage h3 {
-    font-weight: bold;
-    display: inline;
-    font-size: 8pt; }
-  .gdInstallPage .gdInstallTabMessage .gdResponse {
-    color: #000000; }
-.gdInstallPage .gdInstallError {
-  background-color: #ffe1e1; }
-  .gdInstallPage .gdInstallError h3 {
-    color: #cc0000; }
-  .gdInstallPage .gdInstallError .gdIcon {
-    background-image: url(../images/stop.png); }
-.gdInstallPage .gdInstallSuccess .gdIcon {
-  background-image: url(../images/info.png); }
-.gdInstallPage #gdSettingsFileContents {
-  width: 100%;
-  height: 120px;
-  padding: 4px;
-  color: #999999; }
-
-.gdLoginPage h1 {
-  float: none; }
-
-.gdLoginPage #password {
-  width: 120px; }
-
-#gdLogin_password {
-  margin: 0px; }
-
-#gdLogin_email {
-  width: 200px; }
-
-/* the dialog CSS is a mess. TOTALLY in need of a refactor. */
-#gdMainDialog {
-  border: 1px solid #cccccc;
-  padding: 0px;
-  margin: 3px 2px;
-  max-height: 420px; }
-  #gdMainDialog div, #gdMainDialog p {
-    line-height: 16pt; }
-  #gdMainDialog h3 {
-    margin: 2px 0px 0px; }
-  #gdMainDialog .ui-widget button {
-    font-family: "lucida grande", verdana; }
-  #gdMainDialog .gdSelectedDataSetRow {
-    background-color: #efefef; }
-  #gdMainDialog h4 {
-    margin: 0px; }
-
-#gdLoginDialog {
-  border: 1px solid #cccccc;
-  padding: 0px;
-  margin: 3px 2px; }
-  #gdLoginDialog div, #gdLoginDialog p {
-    line-height: 16pt; }
-
-#gdMainDialogContent {
-  clear: both; }
-  #gdMainDialogContent > div {
-    padding: 6px 10px;
-    height: 300px;
-    overflow-y: auto; }
-  #gdMainDialogContent #gdMainDialogTab3Content {
-    padding: 0px 0px 0px 6px;
-    overflow: hidden; }
-    #gdMainDialogContent #gdMainDialogTab3Content h3 {
-      padding-top: 10px; }
-
-#gdLoginDialogContent {
-  clear: both; }
-
-#gdLoginDialogTab1Content, #gdLoginDialogTab2Content {
-  padding: 2px; }
-
-#gdLoginError, #gdResetPasswordMessage {
-  margin: 6px; }
-
-#gdAccountDataSets .leftAligned {
-  padding-left: 3px; }
-#gdAccountDataSets td a {
-  display: block;
-  color: #189C1C; }
-  #gdAccountDataSets td a:hover {
-    background-color: #7fbf4d;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-    background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-    background-image: linear-gradient(top, #7fbf4d, #63a62f);
-    border-radius: 2px;
-    color: white;
-    text-decoration: none; }
-
-.highlightTableRows tbody tr:hover {
-  background-color: #f2f2f2; }
-
-.gdModalTabs.gdThreeCols li {
-  width: 33.3%; }
-.gdModalTabs.gdTwoCols li {
-  width: 50%; }
-.gdModalTabs ul {
-  margin: 0px;
-  padding: 0px;
-  list-style: none;
-  background-color: #efefef; }
-  .gdModalTabs ul li {
-    float: left;
-    margin: 0px;
-    background-color: #efefef;
-    text-align: center;
-    cursor: pointer; }
-    .gdModalTabs ul li.gdSelected {
-      background-color: white; }
-
-#gdDataSetHelpNav {
-  width: 200px;
-  margin-right: 20px;
-  padding-right: 10px;
-  border-right: 1px solid #efefef;
-  float: left;
-  height: 300px;
-  overflow-x: hidden; }
-  #gdDataSetHelpNav ul {
-    list-style: none;
-    margin: 0px;
-    padding: 0px; }
-    #gdDataSetHelpNav ul li {
-      padding: 0px;
-      margin: 0px; }
-      #gdDataSetHelpNav ul li.gdDataTypeHeader {
-        font-weight: bold;
-        margin: 7px 0px 0px 7px; }
-      #gdDataSetHelpNav ul li a {
-        color: #189c1c;
-        display: block;
-        border-radius: 3px;
-        padding: 1px 7px;
-        margin-bottom: 2px; }
-        #gdDataSetHelpNav ul li a:hover, #gdDataSetHelpNav ul li a.gdSelected {
-          background-color: #7fbf4d;
-          background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-          background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-          background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-          background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-          background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-          background-image: linear-gradient(top, #7fbf4d, #63a62f);
-          -webkit-transition: background-image .2s;
-          -moz-transition: background-image .2s;
-          transition: background-image .2s;
-          color: white;
-          border-radius: 3px;
-          text-decoration: none; }
-
-#gdDataSetHelpContent {
-  height: 300px;
-  float: left;
-  width: 551px;
-  padding-right: 6px;
-  overflow-y: auto; }
-  #gdDataSetHelpContent a:link, #gdDataSetHelpContent a:hover {
-    color: #3366CC; }
-
-body .ui-widget-content .gdDeleteDataSetsBtn span {
-  color: #bb0000; }
-
-body .gdMainDialog .ui-dialog-titlebar {
-  padding: 2px; }
-
-body .gdMainDialog .ui-dialog-title span {
-  font-size: 14px; }
-
-.gdMainDialog .ui-dialog-title {
-  background: transparent url(../images/logoSmall.png) center left no-repeat;
-  padding: 4px 0px 3px 52px; }
-
-.gdDataSetCheckRowCell input {
-  margin: 0px; }
-
-#gdLinkURL {
-  font-size: 16pt;
-  width: 100%; }
-
-#gdAccountListNonEmpty td.gdEditAccount {
-  background-image: url(../images/edit.png);
-  background-repeat: no-repeat;
-  background-position: center center; }
-  #gdAccountListNonEmpty td.gdEditAccount a {
-    display: block;
-    width: 18px;
-    height: 18px; }
-#gdAccountListNonEmpty td.gdDeleteAccount {
-  background-image: url(../images/delete.png);
-  background-repeat: no-repeat;
-  background-position: 2px center; }
-  #gdAccountListNonEmpty td.gdDeleteAccount a {
-    display: block;
-    width: 18px;
-    height: 18px; }
-
-.modalSpinner {
-  float: left;
-  margin-top: 2px;
-  height: 34px; }
-
-#gdDeleteAccountDialog th {
-  text-align: left; }
-#gdDeleteAccountDialog .gdIconWarning {
-  margin-right: 15px;
-  float: left;
-  height: 100px; }
-
-.gdIconInfo {
-  margin-right: 15px;
-  float: left;
-  background: url(../images/info.png) no-repeat scroll left top transparent;
-  width: 32px;
-  height: 32px; }
-
-.gdDefaultModules {
-  list-style-type: none;
-  margin: 0px;
-  padding: 0px; }
-  .gdDefaultModules li {
-    margin: 0px;
-    padding: 0px;
-    float: left;
-    width: 25%; }
-    .gdDefaultModules li h4 {
-      background-color: #efefef;
-      margin: 0px; }
-    .gdDefaultModules li > div {
-      height: 200px;
-      width: 98%;
-      border: 1px solid #efefef; }
diff --git a/resources/themes/classic/images/bug.png b/resources/themes/classic/images/bug.png
deleted file mode 100644
index 97e348cc9..000000000
Binary files a/resources/themes/classic/images/bug.png and /dev/null differ
diff --git a/resources/themes/classic/images/calendarIcon.gif b/resources/themes/classic/images/calendarIcon.gif
deleted file mode 100755
index eab12f3cb..000000000
Binary files a/resources/themes/classic/images/calendarIcon.gif and /dev/null differ
diff --git a/resources/themes/classic/images/delete.png b/resources/themes/classic/images/delete.png
deleted file mode 100644
index c8dae8f9e..000000000
Binary files a/resources/themes/classic/images/delete.png and /dev/null differ
diff --git a/resources/themes/classic/images/edit.png b/resources/themes/classic/images/edit.png
deleted file mode 100644
index 6690f8216..000000000
Binary files a/resources/themes/classic/images/edit.png and /dev/null differ
diff --git a/resources/themes/classic/images/error.gif b/resources/themes/classic/images/error.gif
deleted file mode 100644
index 77ea718bc..000000000
Binary files a/resources/themes/classic/images/error.gif and /dev/null differ
diff --git a/resources/themes/classic/images/githubRibbon.png b/resources/themes/classic/images/githubRibbon.png
deleted file mode 100644
index 6e0c3a788..000000000
Binary files a/resources/themes/classic/images/githubRibbon.png and /dev/null differ
diff --git a/resources/themes/classic/images/help.png b/resources/themes/classic/images/help.png
deleted file mode 100644
index d60425f7e..000000000
Binary files a/resources/themes/classic/images/help.png and /dev/null differ
diff --git a/resources/themes/classic/images/helpSmall.png b/resources/themes/classic/images/helpSmall.png
deleted file mode 100644
index fdfa1f777..000000000
Binary files a/resources/themes/classic/images/helpSmall.png and /dev/null differ
diff --git a/resources/themes/classic/images/index.html b/resources/themes/classic/images/index.html
deleted file mode 100644
index 170718246..000000000
--- a/resources/themes/classic/images/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head></head><body></body></html>
\ No newline at end of file
diff --git a/resources/themes/classic/images/info.png b/resources/themes/classic/images/info.png
deleted file mode 100644
index 91bd218e0..000000000
Binary files a/resources/themes/classic/images/info.png and /dev/null differ
diff --git a/resources/themes/classic/images/link.png b/resources/themes/classic/images/link.png
deleted file mode 100644
index b0c35b59a..000000000
Binary files a/resources/themes/classic/images/link.png and /dev/null differ
diff --git a/resources/themes/classic/images/load.png b/resources/themes/classic/images/load.png
deleted file mode 100644
index 02bb9d2e3..000000000
Binary files a/resources/themes/classic/images/load.png and /dev/null differ
diff --git a/resources/themes/classic/images/logo.png b/resources/themes/classic/images/logo.png
deleted file mode 100644
index 7d094c25e..000000000
Binary files a/resources/themes/classic/images/logo.png and /dev/null differ
diff --git a/resources/themes/classic/images/logoSmall.png b/resources/themes/classic/images/logoSmall.png
deleted file mode 100644
index ffa618f87..000000000
Binary files a/resources/themes/classic/images/logoSmall.png and /dev/null differ
diff --git a/resources/themes/classic/images/refresh.png b/resources/themes/classic/images/refresh.png
deleted file mode 100644
index 776f475cb..000000000
Binary files a/resources/themes/classic/images/refresh.png and /dev/null differ
diff --git a/resources/themes/classic/images/save.png b/resources/themes/classic/images/save.png
deleted file mode 100644
index 7fa489c0f..000000000
Binary files a/resources/themes/classic/images/save.png and /dev/null differ
diff --git a/resources/themes/classic/images/siteHeader.jpg b/resources/themes/classic/images/siteHeader.jpg
deleted file mode 100644
index 7ad32a82e..000000000
Binary files a/resources/themes/classic/images/siteHeader.jpg and /dev/null differ
diff --git a/resources/themes/classic/images/stop.png b/resources/themes/classic/images/stop.png
deleted file mode 100644
index e096513ec..000000000
Binary files a/resources/themes/classic/images/stop.png and /dev/null differ
diff --git a/resources/themes/classic/images/topBackground.jpg b/resources/themes/classic/images/topBackground.jpg
deleted file mode 100644
index 6d49d3401..000000000
Binary files a/resources/themes/classic/images/topBackground.jpg and /dev/null differ
diff --git a/resources/themes/classic/images/trash.png b/resources/themes/classic/images/trash.png
deleted file mode 100644
index 8b15a9f25..000000000
Binary files a/resources/themes/classic/images/trash.png and /dev/null differ
diff --git a/resources/themes/classic/images/trash2.png b/resources/themes/classic/images/trash2.png
deleted file mode 100644
index 418d62910..000000000
Binary files a/resources/themes/classic/images/trash2.png and /dev/null differ
diff --git a/resources/themes/classic/images/upDown.png b/resources/themes/classic/images/upDown.png
deleted file mode 100644
index eef723489..000000000
Binary files a/resources/themes/classic/images/upDown.png and /dev/null differ
diff --git a/resources/themes/classic/images/user.png b/resources/themes/classic/images/user.png
deleted file mode 100644
index 997b0a937..000000000
Binary files a/resources/themes/classic/images/user.png and /dev/null differ
diff --git a/resources/themes/classic/images/warning.png b/resources/themes/classic/images/warning.png
deleted file mode 100644
index f8e9d6ba6..000000000
Binary files a/resources/themes/classic/images/warning.png and /dev/null differ
diff --git a/resources/themes/classic/sass/buttons.scss b/resources/themes/classic/sass/buttons.scss
deleted file mode 100644
index f860b022f..000000000
--- a/resources/themes/classic/sass/buttons.scss
+++ /dev/null
@@ -1,151 +0,0 @@
-/* buttons */
-.gdButton {
-	border: 0px;
-	margin: 1px;
-	padding: 2px 6px;
-	font-family: verdana;
-	text-shadow: rgba(64, 64, 64, 0.2) 3px 3px 8px;
-	cursor: pointer;
-}
-.gdButtonType1 {
-	color: white;
-	background-color: #58BB44;
-	font-size: 9pt;
-	font-weight: bold;
-	box-shadow: 2px 3px 3px #666666;
-}
-.gdButtonType2 {
-	color: #666666;
-	background-color: #e9e9e9;
-	font-size: 7pt;
-	border: 1px solid #cccccc;
-}
-.gdButtonType3 {
-	color: #660000;
-	background-color: #e9e9e9;
-	font-size: 7pt;
-	border: 1px solid #cccccc;
-}
-
-/* from: http://hellohappy.org/css3-buttons/ */
-.gdPrimaryButton {
-	display: block;
-	background-color: #7fbf4d;
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-	background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-	background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-	background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-	background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-	background-image: linear-gradient(top, #7fbf4d, #63a62f);
-	border: 1px solid #63a62f;
-	border-bottom: 1px solid #5b992b;
-	border-radius: 3px;
-	-webkit-box-shadow: inset 0 1px 0 0 #96ca6d;
-	-moz-box-shadow: inset 0 1px 0 0 #96ca6d;
-	box-shadow: inset 0 1px 0 0 #96ca6d;
-	color: #fff;
-	font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-	line-height: 1;
-	padding: 4px 15px 4px;
-	margin: 15px 0px 0px;
-	text-align: center;
-	text-shadow: 0 -1px 0 #4c9021;
-	&:hover {
-		background-color: #76b347;
-		background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #76b347), color-stop(100%, #5e9e2e));
-		background-image: -webkit-linear-gradient(top, #76b347, #5e9e2e);
-		background-image: -moz-linear-gradient(top, #76b347, #5e9e2e);
-		background-image: -ms-linear-gradient(top, #76b347, #5e9e2e);
-		background-image: -o-linear-gradient(top, #76b347, #5e9e2e);
-		background-image: linear-gradient(top, #76b347, #5e9e2e);
-		box-shadow: inset 0 1px 0 0 #8dbf67;
-		cursor: pointer;
-	}
-	&:active {
-		border: 1px solid #5b992b;
-		border-bottom: 1px solid #538c27;
-		box-shadow: inset 0 0 8px 4px #548c29, 0 1px 0 0 #eeeeee;
-	}
-}
-.gdSecondaryButton {
-	display: block;
-	background-color: #eeeeee;
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #cccccc));
-	background-image: -webkit-linear-gradient(top, #eeeeee, #cccccc);
-	background-image: -moz-linear-gradient(top, #eeeeee, #cccccc);
-	background-image: -ms-linear-gradient(top, #eeeeee, #cccccc);
-	background-image: -o-linear-gradient(top, #eeeeee, #cccccc);
-	background-image: linear-gradient(top, #eeeeee, #cccccc);
-	border: 1px solid #ccc;
-	border-bottom: 1px solid #bbb;
-	border-radius: 3px;
-	color: #333;
-	font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-	line-height: 7pt;
-	padding: 2px 10px 2px;
-	margin: 15px 0px 0px;
-	text-align: center;
-	text-shadow: 0 1px 0 #eee;
-
-	&:hover {
-		background-color: #dddddd;
-		background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dddddd), color-stop(100%, #bbbbbb));
-		background-image: -webkit-linear-gradient(top, #dddddd, #bbbbbb);
-		background-image: -moz-linear-gradient(top, #dddddd, #bbbbbb);
-		background-image: -ms-linear-gradient(top, #dddddd, #bbbbbb);
-		background-image: -o-linear-gradient(top, #dddddd, #bbbbbb);
-		background-image: linear-gradient(top, #dddddd, #bbbbbb);
-		border: 1px solid #bbb;
-		border-bottom: 1px solid #999;
-		cursor: pointer;
-		text-shadow: 0 1px 0 #ddd;
-		cursor: pointer;
-	}
-	&:active {
-		border: 1px solid #aaa;
-		border-bottom: 1px solid #888;
-		-webkit-box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee;
-		box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee;
-	}
-}
-#gdGenerateButton {
-	display: inline;
-	font-size: 11pt;
-	margin: -2px 0px 0px 0px;
-	line-height: 15px;
-}
-#gdBackButton {
-	float: left;
-	margin-right: 4px;
-	padding: 4px 6px;
-}
-#gdSaveBtn {
-	background: -webkit-gradient(linear, left top, left bottom, from(#dfdfdf), to(#efefef), color-stop(0.5, #efefef), color-stop(0.5, #efefef));
-	background: -moz-linear-gradient(bottom, #dfdfdf, #efefef);
-	padding: 4px;
-	border: 1px solid #cccccc;
-	padding: 5px 17px;
-	border-top-right-radius: 6px;
-	border-bottom-right-radius: 6px;
-	line-height: 22px;
-	font-size: 11px;
-	color: #666666;
-	display: inline-block;
-	text-transform: 1px 1px #F2F2F2;
-	cursor: pointer;
-	height: 36px;
-	margin-left: 0px;
-	width: 68px;
-	outline: none;
-	&:hover {
-		background-color: #7fbf4d;
-		background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-		background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-		background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-		background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-		background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-		background-image: linear-gradient(top, #7fbf4d, #63a62f);
-		border: 1px solid #6ca341;
-		color: white;
-	}
-}
diff --git a/resources/themes/classic/sass/dialogs.scss b/resources/themes/classic/sass/dialogs.scss
deleted file mode 100644
index 7e16c4870..000000000
--- a/resources/themes/classic/sass/dialogs.scss
+++ /dev/null
@@ -1,251 +0,0 @@
-/* the dialog CSS is a mess. TOTALLY in need of a refactor. */
-#gdMainDialog {
-	border: 1px solid #cccccc;
-	padding: 0px;
-	margin: 3px 2px;
-	div, p {
-		line-height: 16pt;
-	}
-	h3 {
-		margin: 2px 0px 0px;
-	}
-	.ui-widget button {
-		font-family: "lucida grande", verdana;
-	}
-	.gdSelectedDataSetRow {
-		background-color: #efefef;
-	}
-	h4 {
-		margin: 0px;
-	}
-	max-height: 420px;
-}
-
-#gdLoginDialog {
-	border: 1px solid #cccccc;
-	padding: 0px;
-	margin: 3px 2px;
-	div, p {
-		line-height: 16pt;
-	}
-}
-
-#gdMainDialogContent {
-	clear: both;
-	&>div {
-		padding: 6px 10px;
-		height: 300px;
-		overflow-y: auto;
-	}
-
-	#gdMainDialogTab3Content {
-		padding: 0px 0px 0px 6px;
-		overflow: hidden;
-		h3 {
-			padding-top: 10px;
-		}
-	}
-}
-
-#gdLoginDialogContent {
-	clear: both;
-}
-
-#gdLoginDialogTab1Content, #gdLoginDialogTab2Content {
-	padding: 2px;
-}
-#gdLoginError, #gdResetPasswordMessage {
-	margin: 6px;
-}
-
-#gdAccountDataSets {
-	.leftAligned {
-		padding-left: 3px;
-	}
-	td a {
-		display: block;
-		color: #189C1C;
-		&:hover {
-			background-color: #7fbf4d;
-			background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-			background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-			background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-			background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-			background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-			background-image: linear-gradient(top, #7fbf4d, #63a62f);
-			border-radius: 2px;
-			color: white;
-			text-decoration: none;
-		}
-	}
-}
-.highlightTableRows {
-	tbody tr {
-		&:hover {
-			background-color: #f2f2f2;
-		}
-	}
-}
-
-.gdModalTabs {
-	&.gdThreeCols li {
-		width: 33.3%;
-	}
-	&.gdTwoCols li {
-		width: 50%;
-	}
-	ul {
-		margin: 0px;
-		padding: 0px;
-		list-style: none;
-		background-color: #efefef;
-
-		li {
-			float: left;
-			margin: 0px;
-			background-color: #efefef;
-			text-align: center;
-			cursor: pointer;
-
-			&.gdSelected {
-				background-color: white;
-			}
-		}
-	}
-}
-
-#gdDataSetHelpNav {
-	width: 200px;
-	margin-right: 20px;
-	padding-right: 10px;
-	border-right: 1px solid #efefef;
-	float: left;
-	height: 300px;
-	overflow-x: hidden;
-
-	ul {
-		list-style: none;
-		margin: 0px;
-		padding: 0px;
-
-		li {
-			padding: 0px;
-			margin: 0px;
-
-			&.gdDataTypeHeader {
-				font-weight: bold;
-				margin: 7px 0px 0px 7px;
-			}
-			a {
-				color: #189c1c;
-				display: block;
-				border-radius: 3px;
-				padding: 1px 7px;
-				margin-bottom: 2px;
-
-				&:hover, &.gdSelected {
-					background-color: #7fbf4d;
-					background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-					background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-					background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-					background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-					background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-					background-image: linear-gradient(top, #7fbf4d, #63a62f);
-
-					-webkit-transition: background-image .2s;
-					-moz-transition: background-image .2s;
-					transition: background-image .2s;
-
-					color: white;
-					border-radius: 3px;
-					text-decoration: none;
-				}
-			}
-		}
-	}
-}
-
-#gdDataSetHelpContent {
-	height: 300px;
-	float: left;
-	width: 551px;
-	padding-right: 6px;
-	overflow-y: auto;
-	a:link, a:hover {
-		color: #3366CC;
-	}
-}
-
-body .ui-widget-content .gdDeleteDataSetsBtn span {
-	color: #bb0000;
-}
-
-body .gdMainDialog .ui-dialog-titlebar {
-	padding: 2px;
-}
-body .gdMainDialog .ui-dialog-title span {
-	font-size: 14px;
-}
-.gdMainDialog .ui-dialog-title {
-	background: transparent url(../images/logoSmall.png) center left no-repeat;
-	padding: 4px 0px 3px 52px;
-}
-
-.gdDataSetCheckRowCell {
-	input {
-		margin: 0px;
-	}
-}
-
-#gdLinkURL {
-	font-size: 16pt;
-	width: 100%;
-}
-
-#gdAccountListNonEmpty {
-	td {
-		&.gdEditAccount {
-			background-image: url(../images/edit.png);
-			background-repeat: no-repeat;
-			background-position: center center;
-			a {
-				display: block;
-				width: 18px;
-				height: 18px;
-			}
-		}
-		&.gdDeleteAccount {
-			background-image: url(../images/delete.png);
-			background-repeat: no-repeat;
-			background-position: 2px center;
-			a {
-				display: block;
-				width: 18px;
-				height: 18px;
-			}
-		}
-	}
-}
-
-.modalSpinner {
-	float: left;
-	margin-top:2px;
-	height: 34px;
-}
-#gdDeleteAccountDialog {
-	th {
-		text-align: left;
-	}
-	.gdIconWarning {
-		margin-right: 15px;
-		float: left;
-		height: 100px;
-	}
-}
-.gdIconInfo {
-	margin-right: 15px;
-	float: left;
-	background: url(../images/info.png) no-repeat scroll left top transparent;
-	width: 32px;
-	height: 32px;
-}
diff --git a/resources/themes/classic/sass/errorPage.scss b/resources/themes/classic/sass/errorPage.scss
deleted file mode 100644
index b5af5b19d..000000000
--- a/resources/themes/classic/sass/errorPage.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-/* used for the "serious error" page */
-body.gdErrorPage {
-	h1 {
-		margin: 0px 0px 12px 0px;
-		font-weight: bold;
-	}
-	#gdBox {
-		font-family: verdana;
-		font-size: 11pt;
-		line-height: 22px;
-		position: relative;
-		width: 60%;
-		background: #ffffff;
-		border-radius: 6px;
-		padding: 25px;
-		color: rgba(0,0,0,.8);
-		line-height: 1.5;
-		margin: 60px auto;
-		text-align: left;
-		&:before, &:after {
-			z-index: -1;
-			position: absolute;
-			content: "";
-			bottom: 15px;
-			left: 10px;
-			width: 50%;
-			top: 80%;
-			max-width:300px;
-			background: rgba(0, 0, 0, 0.7);
-			box-shadow: 0 15px 10px rgba(0, 0, 0, 0.7);
-			-webkit-transform: rotate(-3deg);
-			-moz-transform: rotate(-3deg);
-			-o-transform: rotate(-3deg);
-			-ms-transform: rotate(-3deg);
-			transform: rotate(-3deg);
-		}
-		&:after {
-			-webkit-transform: rotate(3deg);
-			-moz-transform: rotate(3deg);
-			-o-transform: rotate(3deg);
-			-ms-transform: rotate(3deg);
-			transform: rotate(3deg);
-			right: 10px;
-			left: auto;
-		}
-		p {
-			font-size: 11pt;
-			line-height: 22px;
-			margin-bottom: 12px;
-		}
-	}
-
-	#gdNotFixed {
-		color: #990000;
-		margin-bottom: 8px;
-		font-style: italic;
-	}
-
-	#gdSeriousError {
-		font-size: 8pt;
-		max-height: 160px;
-		overflow-y: scroll;
-		overflow-x: hidden;
-		padding: 8px;
-		border: 1px solid #cccccc;
-		background-color: #fbfbfb;
-	}
-}
\ No newline at end of file
diff --git a/resources/themes/classic/sass/general.scss b/resources/themes/classic/sass/general.scss
deleted file mode 100644
index fdb35f0c0..000000000
--- a/resources/themes/classic/sass/general.scss
+++ /dev/null
@@ -1,142 +0,0 @@
-/* general styles */
-html {
-	overflow: -moz-scrollbars-vertical;
-	height: 100%;
-}
-body {
-	height: 100%;
-	margin: 0px;
-	background: #dedede url(../images/topBackground.jpg) repeat-x;
-	text-align: center;
-}
-body, table, td, div, span, div, p {
-	font: 11px "lucida grande", verdana, sans-serif; /* 0.94em */
-	line-height: 20px;
-	color: #555555;
-}
-table, td, p, div, input, select, optgroup, noscript {
-	line-height: 17pt;
-}
-input, select, textarea, option {
-	font: 8pt "lucida grande", verdana, sans-serif;
-	color: #222222;
-}
-input[disabled='disabled'] {
-	color: #bbbbbb;
-}
-h1 {
-	font-size: 1.6em;
-	font-weight: normal;
-	font-family: inherit;
-}
-h2 {
-	font-size: 1.2em;
-	color: green;
-	font-weight: normal;
-	font-family: inherit;
-}
-h3 {
-	margin: 10px 0px 7px;
-}
-h3.gdSubtitle {
-	font-size: 12px;
-}
-p {
-	margin: 6px 0px;
-}
-hr {
-	color: #efefef;
-	background-color: #efefef;
-	height: 1px;
-	border: 0px;
-}
-form {
-	margin: 0px;
-}
-select, optgroup, option {
-	font-size: 8pt;
-	font-family: "lucida grande", verdana;
-}
-optgroup {
-	font-weight: bold;
-}
-a:link, a:visited, nav a:link, nav a:visited {
-	color: #638fe6;
-	text-decoration: none;
-}
-a:hover {
-	text-decoration: underline;
-}
-.gdDisabledText, .gdDisabledText label {
-	color: #cccccc;
-}
-ul  {
-	padding-left: 16px;
-	margin-left: 0px;
-}
-#gdReportBug {
-	background: transparent url(../images/bug.png) center right no-repeat;
-	padding: 5px 22px 5px 0px;
-}
-
-.gdFields {
-	.gdField {
-		float: left;
-		width: 376px;
-		border-bottom: 1px solid #efefef;
-		clear: left;
-	}
-	.gdDisabledRow {
-		label, input {
-			color: #cccccc;
-		}
-	}
-	label {
-		float: left;
-		width: 160px;
-		color: #777777;
-		margin-top: 2px;
-	}
-	input {
-		float: left;
-		width: 210px;
-		margin-top: 2px;
-	}
-	div {
-		margin-top: 2px;
-	}
-
-	.gdCol {
-		float: left;
-		width: 350px;
-		h3 {
-			margin-top: 0px;
-		}
-		.rightBox {
-			float: right;
-			input {
-				width: auto;
-				float: none;
-			}
-			label {
-				width: auto;
-				float: none;
-			}
-		}
-		&:first-child {
-			margin-right: 20px;
-		}
-		.gdField {
-			width: 329px;
-		}
-		input { 
-			width: 160px;
-		}
-		textarea {
-			width: 100%;
-			height: 80px;
-			padding: 3px;
-			color: #555555;
-		}
-	}
-}
\ No newline at end of file
diff --git a/resources/themes/classic/sass/generator.scss b/resources/themes/classic/sass/generator.scss
deleted file mode 100644
index 5a3bfdd05..000000000
--- a/resources/themes/classic/sass/generator.scss
+++ /dev/null
@@ -1,356 +0,0 @@
-/* contains styles for the generator table */
-hr.divider {
-	color: #efefef;
-	margin: 16px 0px 0px;
-}
-#gdTableRows {
-	li.gdDeletedRow {
-		color: #ffffcc;
-		label, div {
-			color: #ffffcc;
-		}
-	}
-	&>li:nth-child(even) {
-		background-color: #eaffe6;
-	}
-	&>li:nth-child(odd) {
-		background-color: #f1f1f1;
-	}
-}
-/* needed to override the nth-child style above */
-body #gdTableRows li.gdDeletedRow {
-	background-color: #660000;
-}
-.gdTableHeadings {
-	line-height: 18.6px;
-	li {
-		background: -webkit-gradient(linear, left top, left bottom, from(#dddddd), to(#dfdfdf), color-stop(0.5, #dfdfdf), color-stop(0.5, #dfdfdf));
-		background: -moz-linear-gradient(bottom, #dddddd, #dfdfdf);
-		filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#dfdfdf');
-		float: left;
-		text-align: center;
-		height: 20px;
-		margin: 0px 0px 0px 1px;
-		padding: 0px;
-		color: #444444;
-		text-shadow: 1px 1px #f2f2f2;
-		font-weight: normal;
-
-		&.gdColDelete {
-			width: 39px;
-		}
-	}
-	thead {
-		tr {
-			background: -webkit-gradient(linear, left top, left bottom, from(#dddddd), to(#dfdfdf), color-stop(0.5, #dfdfdf), color-stop(0.5, #dfdfdf));
-			background: -moz-linear-gradient(bottom, #dddddd, #dfdfdf);
-			filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#dfdfdf');
-			color: #444444;
-			text-shadow: 1px 1px #f2f2f2;
-			th {
-				line-height: 18.6px;
-				text-align: center;
-				font-weight: normal;
-				height: 20px;
-			}
-		}
-	}
-	tbody tr {
-		&>li:nth-child(even) {
-			background-color: #ebfeeb;
-		}
-		&>li:nth-child(odd) {
-			background-color: #f1f1f1;
-		}
-	}
-}
-.gdTableHeadings, #gdTableRows, #gdTableRows ul {
-	font-family: "lucida grande", verdana;
-	clear: both;
-	margin: 0px;
-	padding: 0px;
-	list-style: none;
-	font-weight: bold;
-}
-#gdTableRows {
-	margin-bottom: 8px;
-	li {
-		float: left;
-		margin: 0px 0px 1px 1px;
-		padding: 0px;
-		font-weight: normal;
-		font-family: verdana;
-		line-height: 16pt;
-	}
-}
-.gdColOrder {
-	cursor: move;
-	width: 40px;
-	text-align: center;
-}
-.gdColTitle {
-	width: 136px;
-	input {
-		width: 130px;
-	}
-}
-.gdColDataType {
-	width: 198px;
-	select {
-		width: 198px;
-	}
-}
-.gdColExamples {
-	width: 198px;
-}
-.gdColOptions {
-	width: 274px;
-}
-.gdColHelp {
-	width: 38px;
-	text-align: center;
-}
-li.gdColDelete {
-	width: 38px;
-	text-align: center;
-	display: block;
-}
-#gdHelpPopup {
-	p {
-		margin: 5px 0px 12px;
-	}
-	h4 {
-		margin: 0px;
-	}
-	padding-left: 54px;
-	background: transparent url(../images/info.png) 10px 10px no-repeat;
-}
-#gdEmptyFormDialog {
-	p {
-		margin: 5px 0px 12px;
-	}
-	h4 {
-		margin: 0px;
-	}
-	padding-left: 54px;
-	background: transparent url(../images/help.png) 10px 10px no-repeat;
-}
-#gdTextSize {
-	float: right;
-	list-style: none;
-	li {
-		float: left;
-		width: 18px;
-		vertical-align: top;
-		margin: 3px 0px 0px 3px;
-		background-color: #F2F2F2;
-		padding: 1px 3px;
-		text-align: center;
-		border-radius: 3px;
-		cursor: pointer;
-		&.gdSelected {
-			background-color: #3366cc;
-			color: white;
-		}
-		&.small {
-			font-size: 8pt;
-		}
-		&.medium {
-			font-size: 12pt;
-		}
-		&.large {
-			font-size: 16pt;
-		}
-	}
-}
-#gdGeneratedData {
-	height: 400px;
-	width: 100%;
-}
-
-#gdProcessingIcon {
-	position: absolute;
-	right: -1px;
-	top: 5px;
-}
-#gdDataSetStatusLine {
-	position: absolute;
-	right: 30px;
-	top: 5px;
-	font-style: italic;
-	color: #666666;
-	font-size: 7pt;
-}
-
-.gdSmallTabs {
-	margin-bottom: 20px;
-	ul {
-		list-style: none;
-		margin: 0px;
-		padding: 0px;
-		height: 20px;
-		border-bottom: 1px solid #e1e1e1;
-		li {
-			line-height: 20px;
-			height: 20px;
-			float: left;
-			margin-right: 1px;
-			padding: 0px 16px;
-			border-top-left-radius: 6px;
-			border-top-right-radius: 6px;
-			background: #f2f2f2;
-			background: -moz-linear-gradient(top,  #f2f2f2 0%, #e1e1e1 100%);
-			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f2f2f2), color-stop(100%,#e1e1e1));
-			background: -webkit-linear-gradient(top,  #f2f2f2 0%,#e1e1e1 100%);
-			background: -o-linear-gradient(top,  #f2f2f2 0%,#e1e1e1 100%);
-			background: -ms-linear-gradient(top,  #f2f2f2 0%,#e1e1e1 100%);
-			background: linear-gradient(to bottom,  #f2f2f2 0%,#e1e1e1 100%);
-			filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f2f2f2', endColorstr='#e1e1e1',GradientType=0 );
-			cursor: pointer;
-			text-shadow: 1px 1px #f2f2f2;
-			&.gdSelected {
-				background: white;
-				background-color: white;
-				border: 1px solid #cccccc;
-				border-bottom: 0px;
-				line-height: 18px;
-				padding: 0px 15px;
-			}
-		}
-	}
-	.gdExportTypeTabSettings {
-		clear: both;
-		border-top: 0px;
-		padding: 6px;
-		margin: 0px;
-		display: none;
-	}
-	#gdShowSettingsLink {
-		float: right;
-		span {
-			font-size: 7pt;
-		}
-		a {
-			font-size: 7pt;
-			color: #3366CC;
-		}
-	}
-}
-#gdExportTypeTabs {
-	border-bottom: 1px solid #e1e1e1;
-}
-#gdGenerateSection {
-	background-color: #dcffd8;
-	border-radius: 6px;
-	padding: 20px;
-	border: 1px solid #b8e2b3;
-	span {
-		margin-left: 55px;
-		label {
-			margin-right: 8px;
-		}
-	}
-	.gdDisabled {
-		background-color: transparent;
-	}
-}
-#gdGenerateCount, #gdGenerateTotal {
-	font-weight: bold;
-}
-#gdNumRowsToGenerate {
-	width: 45px;
-	margin: 0px 5px;
-}
-#gdGenerationPanel {
-	line-height:10px;
-	margin-bottom:8px;
-}
-#gdProgressMeter {
-	width: 260px;
-	margin-right: 3px;
-}
-#gdActionIcons {
-	float: right;
-	list-style: none; 
-	margin-top: 0px;
-	padding: 0px;
-	li {
-		padding: 2px;
-		display: inline-block;
-		width: 32px;
-		height: 32px;
-		background-color: #e1e1e1;
-		-webkit-transition: background-color .2s;
-		-moz-transition: background-color .2s;
-		transition: background-color .2s;
-		border-radius: 3px;
-		cursor: pointer;
-		display: inline-block;
-		&:hover {
-			background-color: #cccccc;
-		}
-		&.loading {
-			&:hover {
-				background-color: #e1e1e1;
-			}
-			img {
-				filter: url(../../../css/filters.svg#grayscale);
-				filter: gray;
-				-webkit-filter: grayscale(1); /* Webkit Nightlies & Chrome Canary */
-				opacity: .5;
-			}
-		}
-	}
-}
-#gdDataSetName {
-	font-size: 1.6em;
-	border: 1px solid #cccccc; 
-	border-right: 0px;
-	padding: 6px; 
-	width: 730px;
-	color: #555555;
-	float: left;
-	height: 22px;
-
-	&::-webkit-input-placeholder  { 
-		color: #aaaaaa;
-	}
-	&:-moz-placeholder {
-		color: #aaaaaa;
-	}
-}
-a.gdDisabledLink {
-	color: #cccccc;	
-}
-#gdSelectLanguage {
-	width: 150px;
-}
-#gdAccountList {
-	thead td {
-		border-bottom: 1px solid #cccccc;
-		font-weight: bold;
-	}
-	table {
-		width: 100%;
-	}
-}
-#gdUserAccount {
-	background: transparent url(../images/user.png) top left no-repeat;
-	padding-left: 20px;
-}
-.gdIconWarning {
-	background: transparent url(../images/warning.png) top left no-repeat;
-	width: 48px;
-	height: 48px;
-}
-#gdAddDataSetRowsSection {
-	background-color: #f2f2f2;
-	border-radius: 3px;
-	padding: 4px 4px 4px 8px; 
-	display: inline-block;
-}
-
-/* Fix for https://github.com/benkeen/generatedata/issues/171 */
-.search-field input {
-	min-width: 150px;
-}
diff --git a/resources/themes/classic/sass/install.scss b/resources/themes/classic/sass/install.scss
deleted file mode 100644
index c594a74be..000000000
--- a/resources/themes/classic/sass/install.scss
+++ /dev/null
@@ -1,108 +0,0 @@
-/* custom styles for the installation page */
-.gdInstallPage {
-	h1 {
-		border-bottom: 1px solid #efefef;
-		padding-bottom: 8px;
-		margin-bottom: 8px;
-		float: none;
-	}
-	#dbTablePrefix {
-		width: 60px;
-	}
-	input.pwdField {
-		width: 100px;
-	}
-	.doc label {
-		float: left;
-		width: 160px;
-		color: #777777;
-		margin-top: 2px;
-		clear: right;
-	}
-	.doc>div {
-		clear: both;
-	}
-	.doc div>div {
-		float: right;
-		width: 770px;
-	}
-	#gdInstallNav {
-		float: left;
-		width: 200px;
-		padding-top: 6px;
-
-		ol {
-			margin: 0px;
-			padding: 0px 0px 0px 20px;
-		}
-		ol li {
-			padding-left: 0px;
-			color: #cccccc;
-		}
-		ol li.gdSelected {
-			font-weight: bold;
-			color: green;
-		}
-		ol li.gdComplete {
-			color: #999999;
-		}
-	}
-	.gdInstallSection {
-		float: right;
-		width: 725px;
-		p {
-			margin-bottom: 12px;
-		}
-		button {
-			margin-bottom: 10px;
-		}
-	}
-	.gdAdminAccountHeading {
-		font-weight: bold;
-	}
-	.gdInstallTabMessage {
-		border-radius: 5px;
-		padding: 3px 10px 3px 54px;
-		margin-bottom: 10px;
-		text-shadow: 0 1px 0 #fff;
-		display: none;
-		min-height: 36px;
-		position: relative;
-
-		.gdIcon {
-			width: 32px;
-			height: 32px;
-			position: absolute;
-			left: 12px;
-			top: 10px;
-		}
-		h3 {
-			font-weight: bold;
-			display: inline;
-			font-size: 8pt;
-		}
-		.gdResponse {
-			color: #000000;
-		}
-	}
-
-	.gdInstallError {
-		background-color: #ffe1e1;
-		h3 {
-			color: #cc0000;
-		}
-		.gdIcon {
-			background-image: url(../images/stop.png);
-		}
-	}
-	.gdInstallSuccess .gdIcon {
-		background-image: url(../images/info.png);
-	}
-
-	#gdSettingsFileContents {
-		width: 100%;
-		height: 120px;
-		padding: 4px;
-		color: #999999;
-	}
-}
diff --git a/resources/themes/classic/sass/layout.scss b/resources/themes/classic/sass/layout.scss
deleted file mode 100644
index 270fbd826..000000000
--- a/resources/themes/classic/sass/layout.scss
+++ /dev/null
@@ -1,232 +0,0 @@
-header {
-	background-image: url(../images/siteHeader.jpg);
-	background-repeat: no-repeat;
-	position: relative;
-	width: 980px;
-	height: 77px;
-	margin: 0 auto;
-	text-align: center;
-	margin-bottom: 8px;
-	display: block;
-
-	nav {
-		ul {
-			margin: 0px;
-			padding: 0px;
-			display: inline;
-			list-style: none;
-			li {
-				display: inline;
-			}
-		}
-		position: absolute;
-		right: 0px;
-		top: 32px;
-		a:link, a:visited {
-			text-decoration: none;
-		}
-		a:hover {
-			color: #990000;
-			border-bottom: 1px solid #990000;
-		}
-	}
-}
-section {
-	width: 500px;
-	border-top: none;
-	border-bottom: none;
-	background-color: white;
-	width: 930px;
-	margin: 0 auto;
-	text-align: left;
-	padding: 10px 25px 20px;
-	clear: left;
-	display: block;
-}
-nav {
-	display: block;
-	a:link, a:visited {
-		color: #3366cc;
-		outline: none;
-		text-shadow: 0 1px 0 #fff;
-	}
-}
-footer {
-	width: 980px;
-	margin: 0 auto 15px;
-	padding: 5px 0px;
-	height: 20px;
-	font-size: 7pt;
-	background-color: #f5f5f5;
-	border-top: none;
-	border-bottom-left-radius: 8px;
-	border-bottom-right-radius: 8px;
-	border-radius-bottomleft: 8px;
-	border-radius-bottomright: 8px;
-	display: block;
-
-	a:link, a:visited {
-		color: #555555;
-		text-decoration: none;
-		color: #3366cc;
-		outline: none;
-		&:hover {
-			text-decoration: underline;
-		}
-	}
-
-	ul {
-		list-style: none;
-		padding: 0px;
-		margin: 0px;
-		li {
-			margin: 0px;
-			padding: 0px;
-			display: inline;
-			&:before {
-				content: " | ";
-				color: #cccccc;
-			}
-			&:first-child:before {
-				content: "";
-			}
-			span {
-				margin: 0px 6px;
-				font-size: inherit;
-			}
-		}
-	}
-}
-
-#gdMainTabs {
-	width: 980px;
-	margin: 0 auto;
-	position: relative;
-	ul {
-		list-style: none;
-		margin: 0px;
-		padding: 0px;
-		li {
-			color: #222222;
-			font-size: 9pt;
-			cursor: pointer;
-			margin: 2px 1px 0 0;
-			padding: 3px 0 0 0;
-			float: left;
-			width: 120px;
-			border-top-left-radius: 8px;
-			border-top-right-radius: 8px;
-			border-radius-topleft: 8px;
-			border-radius-topright: 8px;
-			background-color: #efefef;
-			height: 22px;
-			color: #666666;
-			a:link, a:visited {
-				display:block;
-				font-size: 9pt;
-				color: green;
-				text-decoration: none;
-			}
-			&:hover {
-				background-color: #f5faf6;
-				-moz-transition: background-color 150ms linear;
-				-webkit-transition: background-color 150ms linear;
-				-o-transition: background-color 150ms linear;
-			}
-		}
-		li.gdSelected {
-			color: green;
-			cursor: inherit;
-			border-bottom: 0px;
-			height: 22px;
-			background-color: white;
-			&:hover {
-				background-color: white;
-			}
-		}
-	}
-}
-.gdMainTabContent {
-	padding: 0px;
-	margin: 0px;
-	&>li {
-		padding: 0px;
-		margin: 0px;
-		list-style: none;
-	}
-	h1 {
-		float: left;
-	}
-	.gdSectionHelpTip {
-		float:left;
-		list-style: none;
-		padding-left: 10px;
-		padding-top: 17px;
-	}
-}
-#gdMainTab1Content {
-	display: block;
-	margin-top: 20px;
-	h2 {
-		margin: 0px 0px 4px;
-		font-size: 12px;
-		color: #777777;
-		padding: 1px 20px 0px 1px;
-		span.gdSectionHelp {
-			background: transparent url("../images/helpSmall.png") right center no-repeat;			
-			cursor: pointer;
-			width: 14px;
-			height: 14px;
-			display: inline-block;
-			margin: 0px 0px -2px 3px;
-		}
-	}
-	.gdFields {
-		float: left;
-	}
-}
-#gdContent {
-	text-align: left;
-	position: relative;
-}
-.cols2 {
-	clear:both;
-	position:relative;
-}
-.cols2 .col {
-	float: left;
-	width: 410px;
-}
-.gdSetting {
-	position: relative;
-	clear: left;
-	line-height: 18pt;
-	width: 500px;
-
-	&>label {
-		float: left;
-		width: 160px;
-	}
-	&>div {
-		float: left;
-	}
-}
-.gdFields {
-	line-height: 21px;
-	width: 725px;
-	.gdError {
-		margin-left: 6px;
-		background: transparent url(../images/error.gif) left center no-repeat;
-		float: left;
-		width: 315px;
-		padding-left: 24px;
-		color: #e22222;
-		display: none;
-	}
-	input.pwdField {
-		width: 100px;
-	}
-}
-#consoleEventsModuleList {
-	width: 400px;
-}
diff --git a/resources/themes/classic/sass/login.scss b/resources/themes/classic/sass/login.scss
deleted file mode 100644
index 3e59d7c4d..000000000
--- a/resources/themes/classic/sass/login.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-.gdLoginPage h1 {
-	float: none;
-}
-.gdLoginPage #password {
-	width: 120px;
-}
-
-#gdLogin_password {
-	margin: 0px;
-}
-#gdLogin_email {
-	width: 200px;
-}
diff --git a/resources/themes/classic/sass/misc.scss b/resources/themes/classic/sass/misc.scss
deleted file mode 100644
index 6debcee5f..000000000
--- a/resources/themes/classic/sass/misc.scss
+++ /dev/null
@@ -1,228 +0,0 @@
-/* misc stuff */
-div.gdClear {
-	clear: both;
-}
-.joiner {
-	color: #cccccc;
-}
-.gdVerticalPad {
-	padding-bottom: 10px;
-}
-.gdMarginTop {
-	margin-top: 10px;
-}
-.gdMarginBottom {
-	margin-bottom: 10px;
-}
-.hidden {
-	display: none;
-}
-.gdTip {
-	color: #777777;
-}
-.red {
-	color: red;
-}
-.bold {
-	font-weight: bold;
-}
-.gdDisabled {
-	color: #cccccc;
-	background-color: #efefef;
-}
-.gdHideNoJS {
-	display: none;
-}
-noscript div {
-	background-color: #ffffcc;
-	padding: 10px;
-	font-size: 10pt;
-	border-radius: 5px;
-	margin: 0px auto;
-	text-shadow: 0 1px 0 #fff;
-	box-shadow: 2px 4px 5px #666666;
-	display: block;
-	width: 950px;
-	p {
-		font-size: 12pt;
-		color: #6d6d41;
-	}
-}
-
-/* jQuery UI style overrides */
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {
-	cursor: pointer;
-}
-.ui-dialog {
-	text-align: left;
-}
-.ui-dialog-title {
-	font-size: 14px;
-}
-.gdColOptions .ui-datepicker-trigger {
-	margin: 0px 0px -3px 1px;
-	cursor: pointer;
-}
-#gdTableRows .gdColHelp .ui-helper-clearfix {
-	margin-left: 8px;
-	margin-top: 2px;
-}
-body .ui-widget-content {
-	color: #555555;
-}
-body .ui-widget-overlay {
-	background: #333333 url(../../../css/smoothness/images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-	opacity: .30;
-	filter:Alpha(Opacity=30);
-}
-body .ui-widget-shadow {
-	margin: -8px 0 0 -8px; padding: 8px; background: #333333 url(../../../css/smoothness/images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-	opacity: .30;filter:Alpha(Opacity=30);
-	-moz-border-radius: 8px;
-	-khtml-border-radius: 8px;
-	-webkit-border-radius: 8px;
-	border-radius: 8px;
-}
-
-/* overridden Chosen styles */
-body .chzn-container-multi .chzn-choices .search-choice {
-	margin-left: 3px;
-	padding: 0px 20px 2px 5px;
-	margin-bottom: 1px;
-}
-body .chzn-container-multi .chzn-choices .search-field .default {
-	font: 11px Verdana, sans-serif;
-}
-body .chzn-container-multi .chzn-choices {
-	background-image: none;
-	padding-bottom: 2px;
-	border: 1px solid #cccccc;
-	background-color: #fafafa;
-}
-
-body .ui-tooltip {
-	text-align: left;
-}
-
-/* plugin installation */
-#gdPluginInstallationResults {
-	&>div {
-		padding: 4px 8px 8px;
-		background-color: #f2f2f2;
-		border-radius: 8px;
-		float: left;
-		width: 30%;
-		margin-right: 10px;
-		&:last-child {
-			margin-right: 0px;
-		}
-	}
-	h4 {
-		margin: 0px;
-		padding: 0px;
-		font-weight: normal;
-		color: #222222;
-		font-style: italic;
-	}
-	.gdResponse {
-		div {
-			font-size: 7pt;
-			line-height: 16px;
-			border-bottom: 1px solid #dddddd;
-			clear: both;
-
-			&:first-child {
-				margin-top: 4px;
-			}
-			&:last-child {
-				border-bottom: 0px;
-			}
-		}
-		.gdSuccess {
-			background-color: green;
-			color: white;
-			border-radius: 3px;
-			padding: 0px 4px;
-			float: right;
-			line-height: 16px;
-			font-size: 6.5pt;
-		}
-		.gdError {
-			background-color: #cc0000;
-			color: white;
-			border-radius: 3px;
-			padding: 0px 4px;
-			float: right;
-			line-height: 16px;
-			font-size: 6.5pt;
-			cursor: pointer;
-		}
-	}
-}
-
-/* overridden CodeMirror styles */
-body .CodeMirror {
-	border: 1px solid #cccccc;
-	/*line-height: 16px;*/
-	pre, span {
-		font-family: monospace;
-	}
-}
-body .CodeMirror-lines div pre {
-	/*line-height: 14px;*/
-}
-body .CodeMirror-scroll {
-	height: 500px;
-}
-body .CodeMirror_small {
-	table, td, p, div, span {
-		line-height: 10px;
-		font-size: 7pt;
-	}
-}
-body .CodeMirror_medium {
-	table, td, p, div, span {
-		line-height: 16px;
-		font-size: 9pt;
-	}
-}
-body .CodeMirror_large {
-	table, td, p, div, span {
-		line-height: 22px;
-		font-size: 12pt;
-	}
-}
-
-#gdRefreshPassword {
-	width: 16px;
-	height: 16px;
-	margin-bottom: -5px;
-	margin-left: 2px;
-	display: inline-block;
-	background-image: url(../images/refresh.png);
-	cursor: pointer;
-}
-input.medium {
-	width: 200px;
-}
-#gdManageAccount_password {
-	width: 100px;
-}
-#githubRibbon {
-	float: right;
-	top: 0px;
-	right: 0px;
-	margin: -20px -25px 0px 0px;
-}
-#gdPageLoad {
-	background-color: #cccccc;
-	border-radius: 5px 5px 5px 5px;
-	color: white;
-	margin: 100px auto;
-	width: 305px;
-	font-size: 27pt;
-	height: 75px;
-	text-align: center;
-	vertical-align: center;
-	line-height: 72px;
-}
diff --git a/resources/themes/classic/sass/notifications.scss b/resources/themes/classic/sass/notifications.scss
deleted file mode 100644
index 318facb3d..000000000
--- a/resources/themes/classic/sass/notifications.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-.gdMessage {
-	position: relative;
-	display: none;
-	a.gdMessageClose {
-		&:link, &:visited {
-			position: absolute;
-			top: 10px;
-			right: 12px;
-			text-decoration: none;
-			color: black;
-			background-color: white;
-			width: 20px;
-			border-radius: 6px;
-			font-size: 7pt;
-			line-height: 16px;
-			border-radius: 6px;
-			text-align: center;
-		}
-	}
-	ul {
-		margin: 0px;
-		padding: 0px 20px;
-	}
-}
-.gdNotify {
-	background-color: #F2F8FF;
-	border: 1px solid #0058DB;
-	p {
-		padding: 8px;
-		color: #0058DB;
-		margin: 0px;
-	}
-	a.gdMessageClose:hover {
-		background-color: #3b82cb;
-		color: white;
-	}
-}
-.gdErrors {
-	background-color: #FFEDED;
-	border: 1px solid #CC0000;
-	a.gdMessageClose:hover {
-		background-color: #AA0000;
-		color: white;
-	}
-	div {
-		padding: 8px;
-		color: #AA0000
-		ul {
-			margin: 0px;
-			padding-left: 16px;
-		}
-	}
-}
-.gdProblemField {
-	background-color: #990000;
-	color: #ffffcc;
-}
\ No newline at end of file
diff --git a/resources/themes/classic/sass/settings.scss b/resources/themes/classic/sass/settings.scss
deleted file mode 100644
index bda1d6e34..000000000
--- a/resources/themes/classic/sass/settings.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-.gdDefaultModules {
-	list-style-type: none;
-	margin: 0px;
-	padding: 0px;
-
-	li {
-		margin: 0px;
-		padding: 0px;
-		float: left;
-		width: 25%;
-
-		h4 {
-			background-color: #efefef;
-			margin: 0px;
-		}
-
-		&>div {
-			height: 200px;
-			width: 98%;
-			border: 1px solid #efefef;
-		}
-	}
-}
\ No newline at end of file
diff --git a/resources/themes/classic/sass/styles.scss b/resources/themes/classic/sass/styles.scss
deleted file mode 100755
index 23a0aaa83..000000000
--- a/resources/themes/classic/sass/styles.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "general", "layout", "generator", "buttons", "misc", "notifications", "errorPage", "install", "login", "dialogs", "settings";
\ No newline at end of file
diff --git a/resources/themes/default/compiled/buttons.css b/resources/themes/default/compiled/buttons.css
deleted file mode 100644
index 75f0d94bb..000000000
--- a/resources/themes/default/compiled/buttons.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/* buttons */
-.gdButton {
-  border: 0px;
-  margin: 1px;
-  padding: 2px 6px;
-  font-family: verdana;
-  text-shadow: rgba(64, 64, 64, 0.2) 3px 3px 8px;
-  cursor: pointer; }
-
-.gdButtonType1 {
-  color: white;
-  background-color: #58BB44;
-  font-size: 9pt;
-  font-weight: bold;
-  box-shadow: 2px 3px 3px #666666; }
-
-.gdButtonType2 {
-  color: #666666;
-  background-color: #e9e9e9;
-  font-size: 7pt;
-  border: 1px solid #cccccc; }
-
-.gdButtonType3 {
-  color: #660000;
-  background-color: #e9e9e9;
-  font-size: 7pt;
-  border: 1px solid #cccccc; }
-
-/* from: http://hellohappy.org/css3-buttons/ */
-.gdPrimaryButton {
-  display: block;
-  background-color: #7fbf4d;
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-  background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: linear-gradient(top, #7fbf4d, #63a62f);
-  border: 1px solid #63a62f;
-  border-bottom: 1px solid #5b992b;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 0 0 #96ca6d;
-  -moz-box-shadow: inset 0 1px 0 0 #96ca6d;
-  box-shadow: inset 0 1px 0 0 #96ca6d;
-  color: #fff;
-  font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-  line-height: 1;
-  padding: 4px 15px 4px;
-  margin: 15px 0px 0px;
-  text-align: center;
-  text-shadow: 0 -1px 0 #4c9021; }
-  .gdPrimaryButton:hover {
-    background-color: #76b347;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #76b347), color-stop(100%, #5e9e2e));
-    background-image: -webkit-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -moz-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -ms-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -o-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: linear-gradient(top, #76b347, #5e9e2e);
-    box-shadow: inset 0 1px 0 0 #8dbf67;
-    cursor: pointer; }
-  .gdPrimaryButton:active {
-    border: 1px solid #5b992b;
-    border-bottom: 1px solid #538c27;
-    box-shadow: inset 0 0 8px 4px #548c29, 0 1px 0 0 #eeeeee; }
-
-.gdSecondaryButton {
-  display: block;
-  background-color: #eeeeee;
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #cccccc));
-  background-image: -webkit-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -moz-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -ms-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -o-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: linear-gradient(top, #eeeeee, #cccccc);
-  border: 1px solid #ccc;
-  border-bottom: 1px solid #bbb;
-  border-radius: 3px;
-  color: #333;
-  font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-  line-height: 1;
-  padding: 2px 10px 2px;
-  margin: 15px 0px 0px;
-  text-align: center;
-  text-shadow: 0 1px 0 #eee; }
-  .gdSecondaryButton:hover {
-    background-color: #dddddd;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dddddd), color-stop(100%, #bbbbbb));
-    background-image: -webkit-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -moz-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -ms-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -o-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: linear-gradient(top, #dddddd, #bbbbbb);
-    border: 1px solid #bbb;
-    border-bottom: 1px solid #999;
-    cursor: pointer;
-    text-shadow: 0 1px 0 #ddd;
-    cursor: pointer; }
-  .gdSecondaryButton:active {
-    border: 1px solid #aaa;
-    border-bottom: 1px solid #888;
-    -webkit-box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee;
-    box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee; }
-
-#gdGenerateButton {
-  display: inline;
-  font-size: 11pt;
-  margin: 0px; }
-
-#gdBackButton {
-  float: left;
-  margin-right: 4px; }
diff --git a/resources/themes/default/compiled/errorPage.css b/resources/themes/default/compiled/errorPage.css
deleted file mode 100644
index cb0c8f0b1..000000000
--- a/resources/themes/default/compiled/errorPage.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/* used for the "serious error" page */
-body.gdErrorPage h1 {
-  margin: 0px 0px 12px 0px;
-  font-weight: bold; }
-body.gdErrorPage #gdBox {
-  font-family: verdana;
-  font-size: 11pt;
-  line-height: 22px;
-  position: relative;
-  width: 60%;
-  background: #ffffff;
-  border-radius: 6px;
-  padding: 25px;
-  color: rgba(0, 0, 0, 0.8);
-  line-height: 1.5;
-  margin: 60px auto;
-  text-align: left; }
-  body.gdErrorPage #gdBox:before, body.gdErrorPage #gdBox:after {
-    z-index: -1;
-    position: absolute;
-    content: "";
-    bottom: 15px;
-    left: 10px;
-    width: 50%;
-    top: 80%;
-    max-width: 300px;
-    background: rgba(0, 0, 0, 0.7);
-    box-shadow: 0 15px 10px rgba(0, 0, 0, 0.7);
-    -webkit-transform: rotate(-3deg);
-    -moz-transform: rotate(-3deg);
-    -o-transform: rotate(-3deg);
-    -ms-transform: rotate(-3deg);
-    transform: rotate(-3deg); }
-  body.gdErrorPage #gdBox:after {
-    -webkit-transform: rotate(3deg);
-    -moz-transform: rotate(3deg);
-    -o-transform: rotate(3deg);
-    -ms-transform: rotate(3deg);
-    transform: rotate(3deg);
-    right: 10px;
-    left: auto; }
-  body.gdErrorPage #gdBox p {
-    font-size: 11pt;
-    line-height: 22px;
-    margin-bottom: 12px; }
-body.gdErrorPage #gdNotFixed {
-  color: #990000;
-  margin-bottom: 8px;
-  font-style: italic; }
-body.gdErrorPage #gdSeriousError {
-  font-size: 8pt;
-  max-height: 160px;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  padding: 8px;
-  border: 1px solid #cccccc;
-  background-color: #fbfbfb; }
diff --git a/resources/themes/default/compiled/general.css b/resources/themes/default/compiled/general.css
deleted file mode 100644
index 82fbd6f97..000000000
--- a/resources/themes/default/compiled/general.css
+++ /dev/null
@@ -1,72 +0,0 @@
-/* general styles */
-html {
-  overflow: -moz-scrollbars-vertical;
-  height: 100%; }
-
-body {
-  height: 100%;
-  margin: 0px;
-  text-align: center;
-  /*background-color: #F6F8FA;*/
-  border-top: 5px solid #4B5C66; }
-
-body, table, td, div, span, div, p {
-  font: 12px/1.35 "lucida grande", tahoma, verdana, arial, sans-serif;
-  color: #4B5C66; }
-
-table, td, p, div, input, select, optgroup, noscript {
-  line-height: 15px; }
-
-input, select, textarea, option {
-  font: 12px/1.35 "lucida grande", tahoma, verdana, arial, sans-serif;
-  color: #222222; }
-
-h1 {
-  color: #4B5C66;
-  -webkit-font-smoothing: antialiased;
-  text-shadow: 0 1px rgba(255, 255, 255, 0.5);
-  font: normal normal 20px/26px "lucida grande", tahoma, verdana, arial, sans-serif; }
-
-h2 {
-  font-size: 0.81em;
-  color: green;
-  font-weight: normal;
-  font-family: inherit; }
-
-h3 {
-  margin: 2em 0px 1em;
-  font-family: sans-serif;
-  font-variant: normal;
-  text-transform: uppercase;
-  font-size: 12px; }
-
-p {
-  margin: 6px 0px; }
-
-hr {
-  color: #efefef;
-  background-color: #E1E6E9;
-  height: 1px;
-  border: 0px; }
-
-form {
-  margin: 0px; }
-
-select, optgroup, option {
-  font: 12px 'lucida grande', tahoma, verdana, arial, sans-serif; }
-
-optgroup {
-  font-weight: bold; }
-
-a:link, nav a:visited {
-  color: #2d99f5;
-  text-decoration: none; }
-
-a:hover {
-  text-decoration: underline; }
-
-#gdLogin_password {
-  margin: 0px; }
-
-#gdLogin_email {
-  width: 200px; }
diff --git a/resources/themes/default/compiled/generator.css b/resources/themes/default/compiled/generator.css
deleted file mode 100644
index 229f6ede5..000000000
--- a/resources/themes/default/compiled/generator.css
+++ /dev/null
@@ -1,164 +0,0 @@
-/* contains styles for the generator table */
-hr.divider {
-  color: #efefef;
-  margin: 16px 0px 0px; }
-
-#gdTableRows li.gdDeletedRow {
-  color: #ffffcc; }
-  #gdTableRows li.gdDeletedRow label, #gdTableRows li.gdDeletedRow div {
-    color: #ffffcc; }
-#gdTableRows > li:nth-child(even) {
-  background-color: #edf3fe; }
-#gdTableRows > li:nth-child(odd) {
-  background-color: #efefef; }
-
-/* needed to override the nth-child style above */
-body #gdTableRows li.gdDeletedRow {
-  background-color: #660000; }
-
-.gdTableHeadings {
-  line-height: 18.6px; }
-  .gdTableHeadings li {
-    background: -webkit-gradient(linear, left top, left bottom, from(#dddddd), to(#cccccc), color-stop(0.5, #cccccc), color-stop(0.5, #cccccc));
-    background: -moz-linear-gradient(bottom, #dddddd, #cccccc);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#cccccc');
-    float: left;
-    text-align: center;
-    height: 20px;
-    margin: 0px 0px 0px 1px;
-    padding: 0px; }
-
-.gdTableHeadings, #gdTableRows, #gdTableRows ul {
-  font-family: tahoma, arial;
-  clear: both;
-  margin: 0px;
-  padding: 0px;
-  list-style: none;
-  font-weight: bold; }
-
-#gdTableRows {
-  margin-bottom: 8px; }
-  #gdTableRows li {
-    float: left;
-    margin: 0px 0px 1px 1px;
-    padding: 0px;
-    font-weight: normal;
-    font-family: verdana;
-    line-height: 16pt; }
-
-.gdColOrder {
-  cursor: move;
-  width: 40px;
-  text-align: center; }
-
-.gdColTitle {
-  width: 136px; }
-  .gdColTitle input {
-    width: 130px; }
-
-.gdColDataType {
-  width: 198px; }
-  .gdColDataType select {
-    width: 198px; }
-
-.gdColExamples {
-  width: 198px; }
-
-.gdColOptions {
-  width: 274px; }
-
-.gdColHelp {
-  width: 38px;
-  text-align: center; }
-
-li.gdColDelete {
-  width: 38px;
-  text-align: center;
-  display: block; }
-
-#gdHelpPopup {
-  padding-left: 54px;
-  background: transparent url(../../images/info.png) 10px 10px no-repeat; }
-  #gdHelpPopup p {
-    margin: 5px 0px 12px; }
-  #gdHelpPopup h4 {
-    margin: 0px; }
-
-#gdEmptyForm {
-  float: right; }
-
-#gdTextSize {
-  float: right;
-  list-style: none; }
-  #gdTextSize li {
-    float: left;
-    width: 18px;
-    vertical-align: top; }
-  #gdTextSize .small {
-    font-size: 8pt; }
-  #gdTextSize .medium {
-    font-size: 12pt; }
-  #gdTextSize .large {
-    font-size: 16pt; }
-
-#gdGeneratedData {
-  height: 400px;
-  width: 100%; }
-
-#gdProcessingIcon {
-  display: none;
-  position: absolute;
-  top: 6px;
-  right: 0px;
-  background-image: url(../../images/loading.gif);
-  width: 16px;
-  height: 16px; }
-
-#gdExportTypeTabs ul {
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-  height: 20px;
-  border-bottom: 1px solid #e1e1e1; }
-  #gdExportTypeTabs ul li {
-    line-height: 19px;
-    height: 20px;
-    float: left;
-    margin-right: 2px;
-    padding: 0px 16px;
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
-    background: #f2f2f2;
-    background: -moz-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f2f2f2), color-stop(100%, #e1e1e1));
-    background: -webkit-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-    background: -o-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-    background: -ms-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-    background: linear-gradient(to bottom, #f2f2f2 0%, #e1e1e1 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e1e1e1',GradientType=0 );
-    cursor: pointer; }
-    #gdExportTypeTabs ul li.selected {
-      background: white;
-      background-color: white;
-      border: 1px solid #cccccc;
-      border-bottom: 0px; }
-#gdExportTypeTabs .gdExportTypeTabSettings {
-  clear: both;
-  border-bottom: 1px solid #cccccc;
-  border-top: 0px;
-  padding: 6px;
-  margin: 0px;
-  display: none; }
-#gdExportTypeTabs #gdShowSettingsLink {
-  float: right; }
-  #gdExportTypeTabs #gdShowSettingsLink span {
-    font-size: 7pt; }
-  #gdExportTypeTabs #gdShowSettingsLink a {
-    font-size: 7pt;
-    color: #3366CC; }
-
-#gdGenerateSection {
-  background-color: #f2f2f2;
-  border-radius: 3px;
-  padding: 20px;
-  border: 1px solid #bbbbbb; }
diff --git a/resources/themes/default/compiled/install.css b/resources/themes/default/compiled/install.css
deleted file mode 100644
index e1657def3..000000000
--- a/resources/themes/default/compiled/install.css
+++ /dev/null
@@ -1,97 +0,0 @@
-/* custom styles for the installation page */
-.gdInstallPage h1 {
-  border-bottom: 1px solid #efefef;
-  padding-bottom: 8px;
-  margin-bottom: 8px;
-  float: none; }
-.gdInstallPage .gdFields .gdField {
-  float: left;
-  width: 376px;
-  border-bottom: 1px solid #efefef;
-  clear: left; }
-.gdInstallPage .gdFields .gdRadioGroup input {
-  width: 20px;
-  float: left; }
-.gdInstallPage .gdFields .gdRadioGroup label {
-  width: inherit;
-  float: left; }
-.gdInstallPage .gdFields .gdDisabledRow label, .gdInstallPage .gdFields .gdDisabledRow input {
-  color: #cccccc; }
-.gdInstallPage .gdFields label {
-  float: left;
-  width: 160px;
-  color: #777777;
-  margin-top: 2px; }
-.gdInstallPage .gdFields input {
-  float: left;
-  width: 210px;
-  margin-top: 2px; }
-.gdInstallPage .gdFields div {
-  margin-top: 2px; }
-.gdInstallPage #dbTablePrefix {
-  width: 60px; }
-.gdInstallPage input.pwdField {
-  width: 100px; }
-.gdInstallPage .doc label {
-  float: left;
-  width: 160px;
-  color: #777777;
-  margin-top: 2px;
-  clear: right; }
-.gdInstallPage .doc > div {
-  clear: both; }
-.gdInstallPage .doc div > div {
-  float: right;
-  width: 770px; }
-.gdInstallPage #gdInstallNav {
-  float: left;
-  width: 200px;
-  padding-top: 6px; }
-  .gdInstallPage #gdInstallNav ol {
-    margin: 0px;
-    padding: 0px 0px 0px 20px; }
-  .gdInstallPage #gdInstallNav ol li {
-    padding-left: 0px;
-    color: #cccccc; }
-  .gdInstallPage #gdInstallNav ol li.selected {
-    font-weight: bold;
-    color: green; }
-  .gdInstallPage #gdInstallNav ol li.complete {
-    color: #999999; }
-.gdInstallPage .gdInstallSection {
-  float: right;
-  width: 725px; }
-  .gdInstallPage .gdInstallSection p {
-    margin-bottom: 12px; }
-  .gdInstallPage .gdInstallSection button {
-    margin-bottom: 10px; }
-.gdInstallPage .gdAdminAccountHeading {
-  font-weight: bold; }
-.gdInstallPage .gdInstallTabMessage {
-  border-radius: 5px;
-  padding: 3px 10px 3px 54px;
-  margin-bottom: 10px;
-  text-shadow: 0 1px 0 #fff;
-  display: none;
-  min-height: 36px;
-  position: relative; }
-  .gdInstallPage .gdInstallTabMessage .gdIcon {
-    width: 32px;
-    height: 32px;
-    position: absolute;
-    left: 12px;
-    top: 10px; }
-  .gdInstallPage .gdInstallTabMessage h3 {
-    font-weight: bold;
-    display: inline;
-    font-size: 8pt; }
-  .gdInstallPage .gdInstallTabMessage .gdResponse {
-    color: #000000; }
-.gdInstallPage .gdInstallError {
-  background-color: #ffe1e1; }
-  .gdInstallPage .gdInstallError h3 {
-    color: #cc0000; }
-  .gdInstallPage .gdInstallError .gdIcon {
-    background-image: url(../images/stop.png); }
-.gdInstallPage .gdInstallSuccess .gdIcon {
-  background-image: url(../images/info.png); }
diff --git a/resources/themes/default/compiled/layout.css b/resources/themes/default/compiled/layout.css
deleted file mode 100644
index 3dfd973d1..000000000
--- a/resources/themes/default/compiled/layout.css
+++ /dev/null
@@ -1,181 +0,0 @@
-header {
-  position: relative;
-  width: 930px;
-  height: 93px;
-  margin: 0 auto;
-  text-align: center;
-  margin-bottom: 8px;
-  padding: 1em;
-  display: block;
-  /*border-top: 5px solid #4B5C66;*/ }
-
-section {
-  /*width: 500px;*/
-  border-top: 2px solid #70B32D;
-  border-bottom: none;
-  background-color: white;
-  width: 930px;
-  margin: 0 auto;
-  text-align: left;
-  padding: 10px 0px;
-  clear: left;
-  display: block; }
-
-nav {
-  display: block; }
-  nav a:link, nav a:visited {
-    color: #3366cc;
-    outline: none;
-    text-shadow: 0 1px 0 #fff; }
-
-footer {
-  width: 930px;
-  margin: 0 auto 10px;
-  height: 20px;
-  font-size: 7pt;
-  /*background-color: #eeeeee;*/
-  /*border-top: none;
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-  border-radius-bottomleft: 3px;
-  border-radius-bottomright: 3px;*/
-  display: block; }
-  footer a:link, footer a:visited {
-    color: #555555;
-    text-decoration: none;
-    color: #3366cc;
-    outline: none; }
-    footer a:link:hover, footer a:visited:hover {
-      text-decoration: underline; }
-
-header nav {
-  position: absolute;
-  right: 1em;
-  top: 1em; }
-  header nav a:link, header nav a:visited {
-    text-decoration: none;
-    color: #CDD0D5;
-    text-decoration: none;
-    -webkit-transition: color .2s;
-    -moz-transition: color .2s;
-    -o-transition: color .2s;
-    transition: color .2s; }
-  header nav a:hover {
-    color: #70B32D;
-    -webkit-transition: color .2s;
-    -moz-transition: color .2s;
-    -o-transition: color .2s;
-    transition: color .2s; }
-
-#gdTabs {
-  width: 930px;
-  margin: 0 auto;
-  position: relative; }
-  #gdTabs ul {
-    list-style: none;
-    margin: 0px;
-    padding: 0px;
-    font-size: 15px;
-    line-height: 15px; }
-    #gdTabs ul li {
-      color: #CDD0D5;
-      /*text-shadow: 3px 3px 8px rgba(64, 64, 64, 0.2);*/
-      cursor: pointer;
-      margin: 0;
-      padding: 0;
-      float: left;
-      width: 8em;
-      background: linear-gradient(to bottom, #efefef 0%, #e1e1e1 100%) repeat scroll 0 0 transparent;
-      height: 22px;
-      text-align: left; }
-      #gdTabs ul li a:link, #gdTabs ul li a:visited {
-        display: block;
-        /*text-shadow: rgba(64, 64, 64, 0.2) 3px 3px 8px;*/
-        color: #CDD0D5;
-        text-decoration: none;
-        -webkit-transition: color .2s;
-        -moz-transition: color .2s;
-        -o-transition: color .2s;
-        transition: color .2s; }
-      #gdTabs ul li:hover {
-        color: #70B32D;
-        -webkit-transition: color .2s;
-        -moz-transition: color .2s;
-        -o-transition: color .2s;
-        transition: color .2s; }
-    #gdTabs ul li.gdSelected {
-      color: #70B32D;
-      cursor: inherit;
-      border-bottom: 0px;
-      height: 22px;
-      background-color: white;
-      background: white;
-      /*border: 1px solid #ffffff;*/
-      border-bottom: 0px;
-      line-height: 15px; }
-      #gdTabs ul li.gdSelected:hover {
-        background-color: white; }
-
-.gdTabContent {
-  padding: 0px;
-  margin: 0px; }
-  .gdTabContent > li {
-    padding: 0px;
-    margin: 0px;
-    list-style: none; }
-  .gdTabContent h1 {
-    float: left; }
-  .gdTabContent .gdSectionHelpTip {
-    float: left;
-    list-style: none;
-    padding-left: 10px;
-    padding-top: 17px; }
-
-#gdTab1Content {
-  display: block; }
-  #gdTab1Content h2 {
-    float: left;
-    width: 160px;
-    margin: 4px 0px; }
-  #gdTab1Content .gdFields {
-    float: left; }
-
-#gdContent {
-  text-align: left;
-  position: relative; }
-
-.cols2 {
-  clear: both;
-  position: relative; }
-
-.cols2 .col {
-  float: left;
-  width: 410px; }
-
-.gdSetting {
-  position: relative;
-  clear: left;
-  line-height: 18pt;
-  width: 500px; }
-  .gdSetting > label {
-    float: left;
-    width: 160px; }
-  .gdSetting > div {
-    float: left; }
-
-.gdFields {
-  line-height: 21px;
-  width: 725px; }
-  .gdFields .gdError {
-    margin-left: 6px;
-    background: transparent url(../../images/error.gif) left center no-repeat;
-    float: left;
-    width: 315px;
-    padding-left: 24px;
-    color: #e22222;
-    display: none; }
-  .gdFields input.pwdField {
-    width: 100px; }
-
-#consoleEventsModuleList {
-  width: 400px; }
diff --git a/resources/themes/default/compiled/misc.css b/resources/themes/default/compiled/misc.css
deleted file mode 100644
index c96264e3c..000000000
--- a/resources/themes/default/compiled/misc.css
+++ /dev/null
@@ -1,151 +0,0 @@
-/* misc stuff */
-div.gdClear {
-  clear: both; }
-
-.joiner {
-  color: #cccccc; }
-
-.gdVerticalPad {
-  padding-bottom: 10px; }
-
-.gdMarginTop {
-  margin-top: 10px; }
-
-.hidden {
-  display: none; }
-
-.gdTip {
-  color: #777777; }
-
-.red {
-  color: red; }
-
-.bold {
-  font-weight: bold; }
-
-.gdDisabled {
-  color: #cccccc;
-  background-color: #efefef; }
-
-.gdHideNoJS {
-  display: none; }
-
-.gdNoJS {
-  background-color: #ffffcc;
-  padding: 15px;
-  font-size: 10pt;
-  border-radius: 3px;
-  margin: 10px 0px;
-  text-shadow: 0 1px 0 #fff;
-  box-shadow: 2px 4px 5px #666666; }
-
-/* jQuery UI style overrides */
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {
-  cursor: pointer; }
-
-.ui-dialog {
-  text-align: left; }
-
-.ui-dialog-title {
-  font-weight: bold; }
-
-.gdColOptions .ui-datepicker-trigger {
-  margin: 0px 0px -3px 1px;
-  cursor: pointer; }
-
-#gdTableRows .gdColHelp .ui-helper-clearfix {
-  margin-left: 8px;
-  margin-top: 2px; }
-
-body .ui-widget-content {
-  color: #555555; }
-
-body .ui-widget-overlay {
-  background: #333333 url(images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-  opacity: .30;
-  filter: Alpha(Opacity=30); }
-
-body .ui-widget-shadow {
-  margin: -8px 0 0 -8px;
-  padding: 8px;
-  background: #333333 url(images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-  opacity: .30;
-  filter: Alpha(Opacity=30);
-  -moz-border-radius: 3px;
-  -khtml-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px; }
-
-/* overridden Chosen styles */
-body .chzn-container-multi .chzn-choices .search-choice {
-  margin-left: 3px;
-  padding: 0px 20px 2px 5px;
-  margin-bottom: 1px; }
-
-body .chzn-container-multi .chzn-choices .search-field .default {
-  font: 11px Verdana, sans-serif; }
-
-body .chzn-container-multi .chzn-choices {
-  background-image: none;
-  padding-bottom: 2px;
-  border: 1px solid #E1E6E9;
-  background-color: #F0F2F4; }
-
-/* plugin installation */
-#gdPluginInstallationResults > div {
-  padding: 4px 8px 8px;
-  background-color: #f2f2f2;
-  border-radius: 3px;
-  float: left;
-  width: 30%;
-  margin-right: 10px; }
-  #gdPluginInstallationResults > div:last-child {
-    margin-right: 0px; }
-#gdPluginInstallationResults h4 {
-  margin: 0px;
-  padding: 0px;
-  font-weight: normal;
-  color: #222222;
-  font-style: italic; }
-#gdPluginInstallationResults .gdResponse div {
-  font-size: 7pt;
-  line-height: 16px;
-  border-bottom: 1px solid #dddddd;
-  clear: both; }
-  #gdPluginInstallationResults .gdResponse div:first-child {
-    margin-top: 4px; }
-  #gdPluginInstallationResults .gdResponse div:last-child {
-    border-bottom: 0px; }
-#gdPluginInstallationResults .gdResponse .gdSuccess {
-  background-color: green;
-  color: white;
-  border-radius: 3px;
-  padding: 0px 4px;
-  float: right;
-  line-height: 16px;
-  font-size: 6.5pt; }
-#gdPluginInstallationResults .gdResponse .gdError {
-  background-color: #cc0000;
-  color: white;
-  border-radius: 3px;
-  padding: 0px 4px;
-  float: right;
-  line-height: 16px;
-  font-size: 6.5pt;
-  cursor: pointer; }
-
-/* overridden CodeMirror styles */
-body .CodeMirror pre {
-  font-family: monospace; }
-
-body .CodeMirror {
-  border: 1px solid #cccccc; }
-
-body .CodeMirror-lines div pre {
-  line-height: 14px; }
-
-body .cm-s-default pre span {
-  line-height: 10px; }
-
-body .CodeMirror-scroll {
-  height: 500px; }
diff --git a/resources/themes/default/compiled/notifications.css b/resources/themes/default/compiled/notifications.css
deleted file mode 100644
index cdf89ca83..000000000
--- a/resources/themes/default/compiled/notifications.css
+++ /dev/null
@@ -1,43 +0,0 @@
-.gdMessage {
-  position: relative;
-  display: none; }
-  .gdMessage a.gdMessageClose:link, .gdMessage a.gdMessageClose:visited {
-    position: absolute;
-    top: 10px;
-    right: 12px;
-    text-decoration: none;
-    color: black;
-    background-color: white;
-    width: 20px;
-    border-radius: 6px;
-    font-size: 7pt;
-    line-height: 16px;
-    border-radius: 3px;
-    text-align: center; }
-
-.gdNotify {
-  background-color: #F2F8FF;
-  border: 1px solid #0058DB; }
-  .gdNotify p {
-    padding: 8px;
-    color: #0058DB;
-    margin: 0px; }
-  .gdNotify a.gdMessageClose:hover {
-    background-color: #3b82cb;
-    color: white; }
-
-.gdErrors {
-  background-color: #FFEDED;
-  border: 1px solid #CC0000; }
-  .gdErrors a.gdMessageClose:hover {
-    background-color: #AA0000;
-    color: white; }
-  .gdErrors div {
-    padding: 8px;
-    color: #aa0000 ul;
-      color-margin: 0px;
-      color-padding-left: 16px; }
-
-.gdProblemField {
-  background-color: #990000;
-  color: #ffffcc; }
diff --git a/resources/themes/default/compiled/styles.css b/resources/themes/default/compiled/styles.css
deleted file mode 100644
index 9c2868cda..000000000
--- a/resources/themes/default/compiled/styles.css
+++ /dev/null
@@ -1,895 +0,0 @@
-/* general styles */
-html {
-  overflow: -moz-scrollbars-vertical;
-  height: 100%; }
-
-body {
-  height: 100%;
-  margin: 0px;
-  text-align: center;
-  /*background-color: #F6F8FA;*/
-  border-top: 5px solid #4B5C66; }
-
-body, table, td, div, span, div, p {
-  font: 12px/1.35 "lucida grande", tahoma, verdana, arial, sans-serif;
-  color: #4B5C66; }
-
-table, td, p, div, input, select, optgroup, noscript {
-  line-height: 15px; }
-
-input, select, textarea, option {
-  font: 12px/1.35 "lucida grande", tahoma, verdana, arial, sans-serif;
-  color: #222222; }
-
-h1 {
-  color: #4B5C66;
-  -webkit-font-smoothing: antialiased;
-  text-shadow: 0 1px rgba(255, 255, 255, 0.5);
-  font: normal normal 20px/26px "lucida grande", tahoma, verdana, arial, sans-serif; }
-
-h2 {
-  font-size: 0.81em;
-  color: green;
-  font-weight: normal;
-  font-family: inherit; }
-
-h3 {
-  margin: 2em 0px 1em;
-  font-family: sans-serif;
-  font-variant: normal;
-  text-transform: uppercase;
-  font-size: 12px; }
-
-p {
-  margin: 6px 0px; }
-
-hr {
-  color: #efefef;
-  background-color: #E1E6E9;
-  height: 1px;
-  border: 0px; }
-
-form {
-  margin: 0px; }
-
-select, optgroup, option {
-  font: 12px 'lucida grande', tahoma, verdana, arial, sans-serif; }
-
-optgroup {
-  font-weight: bold; }
-
-a:link, nav a:visited {
-  color: #2d99f5;
-  text-decoration: none; }
-
-a:hover {
-  text-decoration: underline; }
-
-#gdLogin_password {
-  margin: 0px; }
-
-#gdLogin_email {
-  width: 200px; }
-
-header {
-  position: relative;
-  width: 930px;
-  height: 93px;
-  margin: 0 auto;
-  text-align: center;
-  margin-bottom: 8px;
-  padding: 1em;
-  display: block;
-  /*border-top: 5px solid #4B5C66;*/ }
-
-section {
-  /*width: 500px;*/
-  border-top: 2px solid #70B32D;
-  border-bottom: none;
-  background-color: white;
-  width: 930px;
-  margin: 0 auto;
-  text-align: left;
-  padding: 10px 0px;
-  clear: left;
-  display: block; }
-
-nav {
-  display: block; }
-  nav a:link, nav a:visited {
-    color: #3366cc;
-    outline: none;
-    text-shadow: 0 1px 0 #fff; }
-
-footer {
-  width: 930px;
-  margin: 0 auto 10px;
-  height: 20px;
-  font-size: 7pt;
-  /*background-color: #eeeeee;*/
-  /*border-top: none;
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-  border-radius-bottomleft: 3px;
-  border-radius-bottomright: 3px;*/
-  display: block; }
-  footer a:link, footer a:visited {
-    color: #555555;
-    text-decoration: none;
-    color: #3366cc;
-    outline: none; }
-    footer a:link:hover, footer a:visited:hover {
-      text-decoration: underline; }
-
-header nav {
-  position: absolute;
-  right: 1em;
-  top: 1em; }
-  header nav a:link, header nav a:visited {
-    text-decoration: none;
-    color: #CDD0D5;
-    text-decoration: none;
-    -webkit-transition: color .2s;
-    -moz-transition: color .2s;
-    -o-transition: color .2s;
-    transition: color .2s; }
-  header nav a:hover {
-    color: #70B32D;
-    -webkit-transition: color .2s;
-    -moz-transition: color .2s;
-    -o-transition: color .2s;
-    transition: color .2s; }
-
-#gdMainTabs {
-  width: 930px;
-  margin: 0 auto;
-  position: relative; }
-  #gdMainTabs ul {
-    list-style: none;
-    margin: 0px;
-    padding: 0px;
-    font-size: 15px;
-    line-height: 15px; }
-    #gdMainTabs ul li {
-      color: #CDD0D5;
-      /*text-shadow: 3px 3px 8px rgba(64, 64, 64, 0.2);*/
-      cursor: pointer;
-      margin: 0;
-      padding: 0;
-      float: left;
-      width: 8em;
-      background: linear-gradient(to bottom, #efefef 0%, #e1e1e1 100%) repeat scroll 0 0 transparent;
-      height: 22px;
-      text-align: left; }
-      #gdMainTabs ul li a:link, #gdMainTabs ul li a:visited {
-        display: block;
-        /*text-shadow: rgba(64, 64, 64, 0.2) 3px 3px 8px;*/
-        color: #CDD0D5;
-        text-decoration: none;
-        -webkit-transition: color .2s;
-        -moz-transition: color .2s;
-        -o-transition: color .2s;
-        transition: color .2s; }
-      #gdMainTabs ul li:hover {
-        color: #70B32D;
-        -webkit-transition: color .2s;
-        -moz-transition: color .2s;
-        -o-transition: color .2s;
-        transition: color .2s; }
-    #gdMainTabs ul li.gdSelected {
-      color: #70B32D;
-      cursor: inherit;
-      border-bottom: 0px;
-      height: 22px;
-      background-color: white;
-      background: white;
-      /*border: 1px solid #ffffff;*/
-      border-bottom: 0px;
-      line-height: 15px; }
-      #gdMainTabs ul li.gdSelected:hover {
-        background-color: white; }
-
-.gdMainTabContent {
-  padding: 0px;
-  margin: 0px; }
-  .gdMainTabContent > li {
-    padding: 0px;
-    margin: 0px;
-    list-style: none; }
-  .gdMainTabContent h1 {
-    float: left; }
-  .gdMainTabContent .gdSectionHelpTip {
-    float: left;
-    list-style: none;
-    padding-left: 10px;
-    padding-top: 17px; }
-
-#gdMainTab1Content {
-  display: block; }
-  #gdMainTab1Content h2 {
-    margin: 4px 0px;
-    font-size: 9px;
-    color: #999999; }
-  #gdMainTab1Content .gdFields {
-    float: left; }
-
-#gdContent {
-  text-align: left;
-  position: relative; }
-
-.cols2 {
-  clear: both;
-  position: relative; }
-
-.cols2 .col {
-  float: left;
-  width: 410px; }
-
-.gdSetting {
-  position: relative;
-  clear: left;
-  line-height: 18pt;
-  width: 500px; }
-  .gdSetting > label {
-    float: left;
-    width: 160px; }
-  .gdSetting > div {
-    float: left; }
-
-.gdFields {
-  line-height: 21px;
-  width: 725px; }
-  .gdFields .gdError {
-    margin-left: 6px;
-    background: transparent url(../images/error.gif) left center no-repeat;
-    float: left;
-    width: 315px;
-    padding-left: 24px;
-    color: #e22222;
-    display: none; }
-  .gdFields input.pwdField {
-    width: 100px; }
-
-#consoleEventsModuleList {
-  width: 400px; }
-
-/* contains styles for the generator table */
-hr.divider {
-  color: #efefef;
-  margin: 16px 0px 0px; }
-
-#gdTableRows li.gdDeletedRow {
-  color: #ffffcc; }
-  #gdTableRows li.gdDeletedRow label, #gdTableRows li.gdDeletedRow div {
-    color: #ffffcc; }
-#gdTableRows > li:nth-child(even) {
-  background-color: #edf3fe; }
-#gdTableRows > li:nth-child(odd) {
-  background-color: #efefef; }
-
-/* needed to override the nth-child style above */
-body #gdTableRows li.gdDeletedRow {
-  background-color: #660000; }
-
-.gdTableHeadings {
-  line-height: 18.6px; }
-  .gdTableHeadings li {
-    background: -webkit-gradient(linear, left top, left bottom, from(#dddddd), to(#cccccc), color-stop(0.5, #cccccc), color-stop(0.5, #cccccc));
-    background: -moz-linear-gradient(bottom, #dddddd, #cccccc);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#cccccc');
-    float: left;
-    text-align: center;
-    height: 20px;
-    margin: 0px 0px 0px 1px;
-    padding: 0px; }
-
-.gdTableHeadings, #gdTableRows, #gdTableRows ul {
-  font-family: tahoma, arial;
-  clear: both;
-  margin: 0px;
-  padding: 0px;
-  list-style: none;
-  font-weight: bold; }
-
-#gdTableRows {
-  margin-bottom: 8px; }
-  #gdTableRows li {
-    float: left;
-    margin: 0px 0px 1px 1px;
-    padding: 0px;
-    font-weight: normal;
-    font-family: verdana;
-    line-height: 16pt; }
-
-.gdColOrder {
-  cursor: move;
-  width: 40px;
-  text-align: center; }
-
-.gdColTitle {
-  width: 136px; }
-  .gdColTitle input {
-    width: 130px; }
-
-.gdColDataType {
-  width: 198px; }
-  .gdColDataType select {
-    width: 198px; }
-
-.gdColExamples {
-  width: 198px; }
-
-.gdColOptions {
-  width: 274px; }
-
-.gdColHelp {
-  width: 38px;
-  text-align: center; }
-
-li.gdColDelete {
-  width: 38px;
-  text-align: center;
-  display: block; }
-
-#gdHelpPopup {
-  padding-left: 54px;
-  background: transparent url(../../images/info.png) 10px 10px no-repeat; }
-  #gdHelpPopup p {
-    margin: 5px 0px 12px; }
-  #gdHelpPopup h4 {
-    margin: 0px; }
-
-#gdEmptyForm {
-  float: right; }
-
-#gdTextSize {
-  float: right;
-  list-style: none; }
-  #gdTextSize li {
-    float: left;
-    width: 18px;
-    vertical-align: top; }
-  #gdTextSize .small {
-    font-size: 8pt; }
-  #gdTextSize .medium {
-    font-size: 12pt; }
-  #gdTextSize .large {
-    font-size: 16pt; }
-
-#gdGeneratedData {
-  height: 400px;
-  width: 100%; }
-
-#gdProcessingIcon {
-  position: absolute;
-  top: 6px;
-  right: 0px;
-  width: 16px;
-  height: 16px; }
-
-.gdSmallTabs ul {
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-  height: 20px;
-  border-bottom: 1px solid #e1e1e1; }
-  .gdSmallTabs ul li {
-    line-height: 19px;
-    height: 20px;
-    float: left;
-    margin-right: 2px;
-    padding: 0px 16px;
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
-    background: #f2f2f2;
-    background: -moz-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f2f2f2), color-stop(100%, #e1e1e1));
-    background: -webkit-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-    background: -o-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-    background: -ms-linear-gradient(top, #f2f2f2 0%, #e1e1e1 100%);
-    background: linear-gradient(to bottom, #f2f2f2 0%, #e1e1e1 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f2f2f2', endColorstr='#e1e1e1',GradientType=0 );
-    cursor: pointer; }
-    .gdSmallTabs ul li .gdSelected {
-      background: white;
-      background-color: white;
-      border: 1px solid #cccccc;
-      border-bottom: 0px; }
-.gdSmallTabs .gdExportTypeTabSettings {
-  clear: both;
-  border-top: 0px;
-  padding: 6px;
-  margin: 0px;
-  display: none; }
-.gdSmallTabs #gdShowSettingsLink {
-  float: right; }
-  .gdSmallTabs #gdShowSettingsLink span {
-    font-size: 7pt; }
-  .gdSmallTabs #gdShowSettingsLink a {
-    font-size: 7pt;
-    color: #3366CC; }
-
-#gdGenerateSection {
-  background-color: #f2f2f2;
-  border-radius: 3px;
-  padding: 20px;
-  border: 1px solid #bbbbbb; }
-
-a.gdDisabledLink {
-  color: #cccccc; }
-
-/* buttons */
-.gdButton {
-  border: 0px;
-  margin: 1px;
-  padding: 2px 6px;
-  font-family: verdana;
-  text-shadow: rgba(64, 64, 64, 0.2) 3px 3px 8px;
-  cursor: pointer; }
-
-.gdButtonType1 {
-  color: white;
-  background-color: #58BB44;
-  font-size: 9pt;
-  font-weight: bold;
-  box-shadow: 2px 3px 3px #666666; }
-
-.gdButtonType2 {
-  color: #666666;
-  background-color: #e9e9e9;
-  font-size: 7pt;
-  border: 1px solid #cccccc; }
-
-.gdButtonType3 {
-  color: #660000;
-  background-color: #e9e9e9;
-  font-size: 7pt;
-  border: 1px solid #cccccc; }
-
-/* from: http://hellohappy.org/css3-buttons/ */
-.gdPrimaryButton {
-  display: block;
-  background-color: #7fbf4d;
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-  background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-  background-image: linear-gradient(top, #7fbf4d, #63a62f);
-  border: 1px solid #63a62f;
-  border-bottom: 1px solid #5b992b;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 0 0 #96ca6d;
-  -moz-box-shadow: inset 0 1px 0 0 #96ca6d;
-  box-shadow: inset 0 1px 0 0 #96ca6d;
-  color: #fff;
-  font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-  line-height: 1;
-  padding: 4px 15px 4px;
-  margin: 15px 0px 0px;
-  text-align: center;
-  text-shadow: 0 -1px 0 #4c9021; }
-  .gdPrimaryButton:hover {
-    background-color: #76b347;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #76b347), color-stop(100%, #5e9e2e));
-    background-image: -webkit-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -moz-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -ms-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: -o-linear-gradient(top, #76b347, #5e9e2e);
-    background-image: linear-gradient(top, #76b347, #5e9e2e);
-    box-shadow: inset 0 1px 0 0 #8dbf67;
-    cursor: pointer; }
-  .gdPrimaryButton:active {
-    border: 1px solid #5b992b;
-    border-bottom: 1px solid #538c27;
-    box-shadow: inset 0 0 8px 4px #548c29, 0 1px 0 0 #eeeeee; }
-
-.gdSecondaryButton {
-  display: block;
-  background-color: #eeeeee;
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #cccccc));
-  background-image: -webkit-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -moz-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -ms-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: -o-linear-gradient(top, #eeeeee, #cccccc);
-  background-image: linear-gradient(top, #eeeeee, #cccccc);
-  border: 1px solid #ccc;
-  border-bottom: 1px solid #bbb;
-  border-radius: 3px;
-  color: #333;
-  font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-  line-height: 1;
-  padding: 2px 10px 2px;
-  margin: 15px 0px 0px;
-  text-align: center;
-  text-shadow: 0 1px 0 #eee; }
-  .gdSecondaryButton:hover {
-    background-color: #dddddd;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dddddd), color-stop(100%, #bbbbbb));
-    background-image: -webkit-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -moz-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -ms-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: -o-linear-gradient(top, #dddddd, #bbbbbb);
-    background-image: linear-gradient(top, #dddddd, #bbbbbb);
-    border: 1px solid #bbb;
-    border-bottom: 1px solid #999;
-    cursor: pointer;
-    text-shadow: 0 1px 0 #ddd;
-    cursor: pointer; }
-  .gdSecondaryButton:active {
-    border: 1px solid #aaa;
-    border-bottom: 1px solid #888;
-    -webkit-box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee;
-    box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee; }
-
-#gdGenerateButton {
-  display: inline;
-  font-size: 11pt;
-  margin: -2px 0px 0px 0px; }
-
-#gdBackButton {
-  float: left;
-  margin-right: 4px; }
-
-/* misc stuff */
-div.gdClear {
-  clear: both; }
-
-.joiner {
-  color: #cccccc; }
-
-.gdVerticalPad {
-  padding-bottom: 10px; }
-
-.gdMarginTop {
-  margin-top: 10px; }
-
-.hidden {
-  display: none; }
-
-.gdTip {
-  color: #777777; }
-
-.red {
-  color: red; }
-
-.bold {
-  font-weight: bold; }
-
-.gdDisabled {
-  color: #cccccc;
-  background-color: #efefef; }
-
-.gdHideNoJS {
-  display: none; }
-
-noscript {
-  background-color: #ffffcc;
-  padding: 15px;
-  font-size: 10pt;
-  border-radius: 3px;
-  margin: 10px 0px;
-  text-shadow: 0 1px 0 #fff;
-  box-shadow: 2px 4px 5px #666666; }
-
-/* jQuery UI style overrides */
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {
-  cursor: pointer; }
-
-.ui-dialog {
-  text-align: left; }
-
-.ui-dialog-title {
-  font-weight: bold; }
-
-.gdColOptions .ui-datepicker-trigger {
-  margin: 0px 0px -3px 1px;
-  cursor: pointer; }
-
-#gdTableRows .gdColHelp .ui-helper-clearfix {
-  margin-left: 8px;
-  margin-top: 2px; }
-
-body .ui-widget-content {
-  color: #555555; }
-
-body .ui-widget-overlay {
-  background: #333333 url(images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-  opacity: .30;
-  filter: Alpha(Opacity=30); }
-
-body .ui-widget-shadow {
-  margin: -8px 0 0 -8px;
-  padding: 8px;
-  background: #333333 url(images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-  opacity: .30;
-  filter: Alpha(Opacity=30);
-  -moz-border-radius: 3px;
-  -khtml-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px; }
-
-/* overridden Chosen styles */
-.chzn-container-multi .chzn-choices .search-choice {
-  margin-left: 3px;
-  padding: 0px 20px 2px 5px;
-  margin-bottom: 1px; }
-
-.chzn-container-multi .chzn-choices .search-field .default {
-  font: 11px Verdana, sans-serif; }
-
-.chzn-container-multi .chzn-choices {
-  background-image: none;
-  padding-bottom: 2px;
-  border: 1px solid #E1E6E9;
-  background-color: #F0F2F4; }
-
-#gdTableRows .chzn-container-multi .chzn-choices ul li {
-  padding: 0 20px 2px 5px; 
-  margin: 0 0 1px 3px;
-  float: none;
-  line-height: 13pt;}
-
-/* plugin installation */
-#gdPluginInstallationResults > div {
-  padding: 4px 8px 8px;
-  background-color: #f2f2f2;
-  border-radius: 3px;
-  float: left;
-  width: 30%;
-  margin-right: 10px; }
-  #gdPluginInstallationResults > div:last-child {
-    margin-right: 0px; }
-#gdPluginInstallationResults h4 {
-  margin: 0px;
-  padding: 0px;
-  font-weight: normal;
-  color: #222222;
-  font-style: italic; }
-#gdPluginInstallationResults .gdResponse div {
-  font-size: 7pt;
-  line-height: 16px;
-  border-bottom: 1px solid #dddddd;
-  clear: both; }
-  #gdPluginInstallationResults .gdResponse div:first-child {
-    margin-top: 4px; }
-  #gdPluginInstallationResults .gdResponse div:last-child {
-    border-bottom: 0px; }
-#gdPluginInstallationResults .gdResponse .gdSuccess {
-  background-color: green;
-  color: white;
-  border-radius: 3px;
-  padding: 0px 4px;
-  float: right;
-  line-height: 16px;
-  font-size: 6.5pt; }
-#gdPluginInstallationResults .gdResponse .gdError {
-  background-color: #cc0000;
-  color: white;
-  border-radius: 3px;
-  padding: 0px 4px;
-  float: right;
-  line-height: 16px;
-  font-size: 6.5pt;
-  cursor: pointer; }
-
-/* overridden CodeMirror styles */
-body .CodeMirror pre {
-  font-family: monospace; }
-
-body .CodeMirror {
-  border: 1px solid #cccccc; }
-
-body .CodeMirror-lines div pre {
-  line-height: 14px; }
-
-body .cm-s-default pre span {
-  line-height: 10px; }
-
-body .CodeMirror-scroll {
-  height: 500px; }
-
-.gdMessage {
-  position: relative;
-  display: none; }
-  .gdMessage a.gdMessageClose:link, .gdMessage a.gdMessageClose:visited {
-    position: absolute;
-    top: 10px;
-    right: 12px;
-    text-decoration: none;
-    color: black;
-    background-color: white;
-    width: 20px;
-    border-radius: 6px;
-    font-size: 7pt;
-    line-height: 16px;
-    border-radius: 3px;
-    text-align: center; }
-
-.gdNotify {
-  background-color: #F2F8FF;
-  border: 1px solid #0058DB; }
-  .gdNotify p {
-    padding: 8px;
-    color: #0058DB;
-    margin: 0px; }
-  .gdNotify a.gdMessageClose:hover {
-    background-color: #3b82cb;
-    color: white; }
-  .gdNotify div {
-    padding: 8px;
-    color: #cc0000 ul;
-      color-margin: 0px;
-      color-padding-left: 16px; }
-
-.gdErrors {
-  background-color: #FFEDED;
-  border: 1px solid #CC0000; }
-  .gdErrors a.gdMessageClose:hover {
-    background-color: #AA0000;
-    color: white; }
-  .gdErrors div {
-    padding: 8px;
-    color: #aa0000 ul;
-      color-margin: 0px;
-      color-padding-left: 16px; }
-
-.gdProblemField {
-  background-color: #990000;
-  color: #ffffcc; }
-
-/* used for the "serious error" page */
-body.gdErrorPage h1 {
-  margin: 0px 0px 12px 0px;
-  font-weight: bold; }
-body.gdErrorPage #gdBox {
-  font-family: verdana;
-  font-size: 11pt;
-  line-height: 22px;
-  position: relative;
-  width: 60%;
-  background: #ffffff;
-  border-radius: 6px;
-  padding: 25px;
-  color: rgba(0, 0, 0, 0.8);
-  line-height: 1.5;
-  margin: 60px auto;
-  text-align: left; }
-  body.gdErrorPage #gdBox:before, body.gdErrorPage #gdBox:after {
-    z-index: -1;
-    position: absolute;
-    content: "";
-    bottom: 15px;
-    left: 10px;
-    width: 50%;
-    top: 80%;
-    max-width: 300px;
-    background: rgba(0, 0, 0, 0.7);
-    box-shadow: 0 15px 10px rgba(0, 0, 0, 0.7);
-    -webkit-transform: rotate(-3deg);
-    -moz-transform: rotate(-3deg);
-    -o-transform: rotate(-3deg);
-    -ms-transform: rotate(-3deg);
-    transform: rotate(-3deg); }
-  body.gdErrorPage #gdBox:after {
-    -webkit-transform: rotate(3deg);
-    -moz-transform: rotate(3deg);
-    -o-transform: rotate(3deg);
-    -ms-transform: rotate(3deg);
-    transform: rotate(3deg);
-    right: 10px;
-    left: auto; }
-  body.gdErrorPage #gdBox p {
-    font-size: 11pt;
-    line-height: 22px;
-    margin-bottom: 12px; }
-body.gdErrorPage #gdNotFixed {
-  color: #990000;
-  margin-bottom: 8px;
-  font-style: italic; }
-body.gdErrorPage #gdSeriousError {
-  font-size: 8pt;
-  max-height: 160px;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  padding: 8px;
-  border: 1px solid #cccccc;
-  background-color: #fbfbfb; }
-
-/* custom styles for the installation page */
-.gdInstallPage h1 {
-  border-bottom: 1px solid #efefef;
-  padding-bottom: 8px;
-  margin-bottom: 8px;
-  float: none; }
-.gdInstallPage .gdFields .gdField {
-  float: left;
-  width: 376px;
-  border-bottom: 1px solid #efefef;
-  clear: left; }
-.gdInstallPage .gdFields .gdRadioGroup input {
-  width: 20px;
-  float: left; }
-.gdInstallPage .gdFields .gdRadioGroup label {
-  width: inherit;
-  float: left; }
-.gdInstallPage .gdFields .gdDisabledRow label, .gdInstallPage .gdFields .gdDisabledRow input {
-  color: #cccccc; }
-.gdInstallPage .gdFields label {
-  float: left;
-  width: 160px;
-  color: #777777;
-  margin-top: 2px; }
-.gdInstallPage .gdFields input {
-  float: left;
-  width: 210px;
-  margin-top: 2px; }
-.gdInstallPage .gdFields div {
-  margin-top: 2px; }
-.gdInstallPage #dbTablePrefix {
-  width: 60px; }
-.gdInstallPage input.pwdField {
-  width: 100px; }
-.gdInstallPage .doc label {
-  float: left;
-  width: 160px;
-  color: #777777;
-  margin-top: 2px;
-  clear: right; }
-.gdInstallPage .doc > div {
-  clear: both; }
-.gdInstallPage .doc div > div {
-  float: right;
-  width: 770px; }
-.gdInstallPage #gdInstallNav {
-  float: left;
-  width: 200px;
-  padding-top: 6px; }
-  .gdInstallPage #gdInstallNav ol {
-    margin: 0px;
-    padding: 0px 0px 0px 20px; }
-  .gdInstallPage #gdInstallNav ol li {
-    padding-left: 0px;
-    color: #cccccc; }
-  .gdInstallPage #gdInstallNav ol li.selected {
-    font-weight: bold;
-    color: green; }
-  .gdInstallPage #gdInstallNav ol li.complete {
-    color: #999999; }
-.gdInstallPage .gdInstallSection {
-  float: right;
-  width: 725px; }
-  .gdInstallPage .gdInstallSection p {
-    margin-bottom: 12px; }
-  .gdInstallPage .gdInstallSection button {
-    margin-bottom: 10px; }
-.gdInstallPage .gdAdminAccountHeading {
-  font-weight: bold; }
-.gdInstallPage .gdInstallTabMessage {
-  border-radius: 5px;
-  padding: 3px 10px 3px 54px;
-  margin-bottom: 10px;
-  text-shadow: 0 1px 0 #fff;
-  display: none;
-  min-height: 36px;
-  position: relative; }
-  .gdInstallPage .gdInstallTabMessage .gdIcon {
-    width: 32px;
-    height: 32px;
-    position: absolute;
-    left: 12px;
-    top: 10px; }
-  .gdInstallPage .gdInstallTabMessage h3 {
-    font-weight: bold;
-    display: inline;
-    font-size: 8pt; }
-  .gdInstallPage .gdInstallTabMessage .gdResponse {
-    color: #000000; }
-.gdInstallPage .gdInstallError {
-  background-color: #ffe1e1; }
-  .gdInstallPage .gdInstallError h3 {
-    color: #cc0000; }
-  .gdInstallPage .gdInstallError .gdIcon {
-    background-image: url(../images/stop.png); }
-.gdInstallPage .gdInstallSuccess .gdIcon {
-  background-image: url(../images/info.png); }
diff --git a/resources/themes/default/images/alert.jpg b/resources/themes/default/images/alert.jpg
deleted file mode 100644
index 0d140b225..000000000
Binary files a/resources/themes/default/images/alert.jpg and /dev/null differ
diff --git a/resources/themes/default/images/calendar_icon.gif b/resources/themes/default/images/calendar_icon.gif
deleted file mode 100755
index eab12f3cb..000000000
Binary files a/resources/themes/default/images/calendar_icon.gif and /dev/null differ
diff --git a/resources/themes/default/images/document_save.png b/resources/themes/default/images/document_save.png
deleted file mode 100644
index cc6e9fdcc..000000000
Binary files a/resources/themes/default/images/document_save.png and /dev/null differ
diff --git a/resources/themes/default/images/error.gif b/resources/themes/default/images/error.gif
deleted file mode 100644
index 77ea718bc..000000000
Binary files a/resources/themes/default/images/error.gif and /dev/null differ
diff --git a/resources/themes/default/images/index.html b/resources/themes/default/images/index.html
deleted file mode 100644
index 170718246..000000000
--- a/resources/themes/default/images/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head></head><body></body></html>
\ No newline at end of file
diff --git a/resources/themes/default/images/info.png b/resources/themes/default/images/info.png
deleted file mode 100644
index 91bd218e0..000000000
Binary files a/resources/themes/default/images/info.png and /dev/null differ
diff --git a/resources/themes/default/images/loading.gif b/resources/themes/default/images/loading.gif
deleted file mode 100755
index 7288e3099..000000000
Binary files a/resources/themes/default/images/loading.gif and /dev/null differ
diff --git a/resources/themes/default/images/siteHeader.jpg b/resources/themes/default/images/siteHeader.jpg
deleted file mode 100644
index 52ab1bc28..000000000
Binary files a/resources/themes/default/images/siteHeader.jpg and /dev/null differ
diff --git a/resources/themes/default/images/stop.png b/resources/themes/default/images/stop.png
deleted file mode 100644
index e096513ec..000000000
Binary files a/resources/themes/default/images/stop.png and /dev/null differ
diff --git a/resources/themes/default/images/topBackground.jpg b/resources/themes/default/images/topBackground.jpg
deleted file mode 100644
index 6d49d3401..000000000
Binary files a/resources/themes/default/images/topBackground.jpg and /dev/null differ
diff --git a/resources/themes/default/images/upDown.png b/resources/themes/default/images/upDown.png
deleted file mode 100644
index eef723489..000000000
Binary files a/resources/themes/default/images/upDown.png and /dev/null differ
diff --git a/resources/themes/default/sass/buttons.scss b/resources/themes/default/sass/buttons.scss
deleted file mode 100644
index 54860bb58..000000000
--- a/resources/themes/default/sass/buttons.scss
+++ /dev/null
@@ -1,120 +0,0 @@
-/* buttons */
-.gdButton {
-	border: 0px;
-	margin: 1px;
-	padding: 2px 6px;
-	font-family: verdana;
-	text-shadow: rgba(64, 64, 64, 0.2) 3px 3px 8px;
-	cursor: pointer;
-}
-.gdButtonType1 {
-	color: white;
-	background-color: #58BB44;
-	font-size: 9pt;
-	font-weight: bold;
-	box-shadow: 2px 3px 3px #666666;
-}
-.gdButtonType2 {
-	color: #666666;
-	background-color: #e9e9e9;
-	font-size: 7pt;
-	border: 1px solid #cccccc;
-}
-.gdButtonType3 {
-	color: #660000;
-	background-color: #e9e9e9;
-	font-size: 7pt;
-	border: 1px solid #cccccc;
-}
-
-/* from: http://hellohappy.org/css3-buttons/ */
-.gdPrimaryButton {
-	display: block;
-	background-color: #7fbf4d;
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #7fbf4d), color-stop(100%, #63a62f));
-	background-image: -webkit-linear-gradient(top, #7fbf4d, #63a62f);
-	background-image: -moz-linear-gradient(top, #7fbf4d, #63a62f);
-	background-image: -ms-linear-gradient(top, #7fbf4d, #63a62f);
-	background-image: -o-linear-gradient(top, #7fbf4d, #63a62f);
-	background-image: linear-gradient(top, #7fbf4d, #63a62f);
-	border: 1px solid #63a62f;
-	border-bottom: 1px solid #5b992b;
-	border-radius: 3px;
-	-webkit-box-shadow: inset 0 1px 0 0 #96ca6d;
-	-moz-box-shadow: inset 0 1px 0 0 #96ca6d;
-	box-shadow: inset 0 1px 0 0 #96ca6d;
-	color: #fff;
-	font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-	line-height: 1;
-	padding: 4px 15px 4px;
-	margin: 15px 0px 0px;
-	text-align: center;
-	text-shadow: 0 -1px 0 #4c9021;
-
-	&:hover {
-		background-color: #76b347;
-		background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #76b347), color-stop(100%, #5e9e2e));
-		background-image: -webkit-linear-gradient(top, #76b347, #5e9e2e);
-		background-image: -moz-linear-gradient(top, #76b347, #5e9e2e);
-		background-image: -ms-linear-gradient(top, #76b347, #5e9e2e);
-		background-image: -o-linear-gradient(top, #76b347, #5e9e2e);
-		background-image: linear-gradient(top, #76b347, #5e9e2e);
-		box-shadow: inset 0 1px 0 0 #8dbf67;
-		cursor: pointer;
-	}
-	&:active {
-		border: 1px solid #5b992b;
-		border-bottom: 1px solid #538c27;
-		box-shadow: inset 0 0 8px 4px #548c29, 0 1px 0 0 #eeeeee;
-	}
-}
-.gdSecondaryButton {
-	display: block;
-	background-color: #eeeeee;
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #cccccc));
-	background-image: -webkit-linear-gradient(top, #eeeeee, #cccccc);
-	background-image: -moz-linear-gradient(top, #eeeeee, #cccccc);
-	background-image: -ms-linear-gradient(top, #eeeeee, #cccccc);
-	background-image: -o-linear-gradient(top, #eeeeee, #cccccc);
-	background-image: linear-gradient(top, #eeeeee, #cccccc);
-	border: 1px solid #ccc;
-	border-bottom: 1px solid #bbb;
-	border-radius: 3px;
-	color: #333;
-	font: bold 11px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-	line-height: 1;
-	padding: 2px 10px 2px;
-	margin: 15px 0px 0px;
-	text-align: center;
-	text-shadow: 0 1px 0 #eee;
-
-	&:hover {
-		background-color: #dddddd;
-		background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dddddd), color-stop(100%, #bbbbbb));
-		background-image: -webkit-linear-gradient(top, #dddddd, #bbbbbb);
-		background-image: -moz-linear-gradient(top, #dddddd, #bbbbbb);
-		background-image: -ms-linear-gradient(top, #dddddd, #bbbbbb);
-		background-image: -o-linear-gradient(top, #dddddd, #bbbbbb);
-		background-image: linear-gradient(top, #dddddd, #bbbbbb);
-		border: 1px solid #bbb;
-		border-bottom: 1px solid #999;
-		cursor: pointer;
-		text-shadow: 0 1px 0 #ddd;
-		cursor: pointer;
-	}
-	&:active {
-		border: 1px solid #aaa;
-		border-bottom: 1px solid #888;
-		-webkit-box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee;
-		box-shadow: inset 0 0 5px 2px #aaaaaa, 0 1px 0 0 #eeeeee;
-	}
-}
-#gdGenerateButton {
-	display: inline;
-	font-size: 11pt;
-	margin: -2px 0px 0px 0px;
-}
-#gdBackButton {
-	float: left;
-	margin-right: 4px;
-}
\ No newline at end of file
diff --git a/resources/themes/default/sass/errorPage.scss b/resources/themes/default/sass/errorPage.scss
deleted file mode 100644
index b5af5b19d..000000000
--- a/resources/themes/default/sass/errorPage.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-/* used for the "serious error" page */
-body.gdErrorPage {
-	h1 {
-		margin: 0px 0px 12px 0px;
-		font-weight: bold;
-	}
-	#gdBox {
-		font-family: verdana;
-		font-size: 11pt;
-		line-height: 22px;
-		position: relative;
-		width: 60%;
-		background: #ffffff;
-		border-radius: 6px;
-		padding: 25px;
-		color: rgba(0,0,0,.8);
-		line-height: 1.5;
-		margin: 60px auto;
-		text-align: left;
-		&:before, &:after {
-			z-index: -1;
-			position: absolute;
-			content: "";
-			bottom: 15px;
-			left: 10px;
-			width: 50%;
-			top: 80%;
-			max-width:300px;
-			background: rgba(0, 0, 0, 0.7);
-			box-shadow: 0 15px 10px rgba(0, 0, 0, 0.7);
-			-webkit-transform: rotate(-3deg);
-			-moz-transform: rotate(-3deg);
-			-o-transform: rotate(-3deg);
-			-ms-transform: rotate(-3deg);
-			transform: rotate(-3deg);
-		}
-		&:after {
-			-webkit-transform: rotate(3deg);
-			-moz-transform: rotate(3deg);
-			-o-transform: rotate(3deg);
-			-ms-transform: rotate(3deg);
-			transform: rotate(3deg);
-			right: 10px;
-			left: auto;
-		}
-		p {
-			font-size: 11pt;
-			line-height: 22px;
-			margin-bottom: 12px;
-		}
-	}
-
-	#gdNotFixed {
-		color: #990000;
-		margin-bottom: 8px;
-		font-style: italic;
-	}
-
-	#gdSeriousError {
-		font-size: 8pt;
-		max-height: 160px;
-		overflow-y: scroll;
-		overflow-x: hidden;
-		padding: 8px;
-		border: 1px solid #cccccc;
-		background-color: #fbfbfb;
-	}
-}
\ No newline at end of file
diff --git a/resources/themes/default/sass/general.scss b/resources/themes/default/sass/general.scss
deleted file mode 100644
index cbdf5cadf..000000000
--- a/resources/themes/default/sass/general.scss
+++ /dev/null
@@ -1,76 +0,0 @@
-/* general styles */
-html {
-	overflow: -moz-scrollbars-vertical;
-	height: 100%;
-}
-body {
-	height: 100%;
-	margin: 0px;
-	text-align: center;
-	/*background-color: #F6F8FA;*/
-	border-top: 5px solid #4B5C66;
-}
-body, table, td, div, span, div, p {
-	font: 12px/1.35 'lucida grande', tahoma, verdana, arial, sans-serif;
-	color: #4B5C66;
-}
-table, td, p, div, input, select, optgroup, noscript {
-	line-height: 15px;
-}
-input, select, textarea, option {
-	font: 12px/1.35 'lucida grande', tahoma, verdana, arial, sans-serif;
-	color: #222222;
-}
-h1 {
-color: #4B5C66;
--webkit-font-smoothing: antialiased;
-text-shadow: 0 1px rgba(255, 255, 255, 0.5);
-font: normal normal 20px/26px  'lucida grande', tahoma, verdana, arial, sans-serif;
-}
-h2 {
-	font-size: 0.81em;
-	
-	color: green;
-	font-weight: normal;
-	font-family: inherit;
-}
-h3 {
-	margin: 2em 0px 1em;
-	font-family: sans-serif;
-	font-variant: normal;
-	text-transform: uppercase;
-	font-size: 12px;
-}
-p {
-	margin: 6px 0px;
-}
-hr {
-	color: #efefef;
-	background-color: #E1E6E9;
-	height: 1px;
-	border: 0px;
-}
-
-form {
-	margin: 0px;
-}
-select, optgroup, option {
-	font: 12px 'lucida grande', tahoma, verdana, arial, sans-serif;
-}
-optgroup {
-	font-weight: bold;
-}
-
-a:link, nav a:visited {
-	color: #2d99f5;
-	text-decoration: none;
-}
-a:hover {
-	text-decoration: underline;
-}
-#gdLogin_password {
-	margin: 0px;
-}
-#gdLogin_email {
-	width: 200px;
-}
\ No newline at end of file
diff --git a/resources/themes/default/sass/generator.scss b/resources/themes/default/sass/generator.scss
deleted file mode 100644
index df62fcd3d..000000000
--- a/resources/themes/default/sass/generator.scss
+++ /dev/null
@@ -1,191 +0,0 @@
-/* contains styles for the generator table */
-hr.divider {
-	color: #efefef;
-	margin: 16px 0px 0px;
-}
-#gdTableRows {
-	li.gdDeletedRow {
-		color: #ffffcc;
-		label, div {
-			color: #ffffcc;
-		}
-	}
-	&>li:nth-child(even) {
-		background-color: #edf3fe;
-	}
-	&>li:nth-child(odd) {
-		background-color: #efefef;
-	}
-}
-/* needed to override the nth-child style above */
-body #gdTableRows li.gdDeletedRow {
-	background-color: #660000;
-}
-.gdTableHeadings {
-	line-height: 18.6px;
-	li {
-		background: -webkit-gradient(linear, left top, left bottom, from(#dddddd), to(#cccccc), color-stop(0.5, #cccccc), color-stop(0.5, #cccccc));
-		background: -moz-linear-gradient(bottom, #dddddd, #cccccc);
-		filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#cccccc');
-		float: left;
-		text-align: center;
-		height: 20px;
-		margin: 0px 0px 0px 1px;
-		padding: 0px;
-	}
-}
-.gdTableHeadings, #gdTableRows, #gdTableRows ul {
-	font-family: tahoma, arial;
-	clear: both;
-	margin: 0px;
-	padding: 0px;
-	list-style: none;
-	font-weight: bold;
-}
-#gdTableRows {
-	margin-bottom: 8px;
-
-	li {
-		float: left;
-		margin: 0px 0px 1px 1px;
-		padding: 0px;
-		font-weight: normal;
-		font-family: verdana;
-		line-height: 16pt;
-	}
-}
-.gdColOrder {
-	cursor: move;
-	width: 40px;
-	text-align: center;
-}
-.gdColTitle {
-	width: 136px;
-	input {
-		width: 130px;
-	}
-}
-.gdColDataType {
-	width: 198px;
-	select {
-		width: 198px;
-	}
-}
-.gdColExamples {
-	width: 198px;
-}
-.gdColOptions {
-	width: 274px;
-}
-.gdColHelp {
-	width: 38px;
-	text-align: center;
-}
-li.gdColDelete {
-	width: 38px;
-	text-align: center;
-	display: block;
-}
-#gdHelpPopup {
-	p {
-		margin: 5px 0px 12px;
-	}
-	h4 {
-		margin: 0px;
-	}
-	padding-left: 54px;
-	background: transparent url(../../images/info.png) 10px 10px no-repeat;
-}
-#gdEmptyForm {
-	float: right;
-}
-#gdTextSize {
-	float: right;
-	list-style: none;
-	li {
-		float: left;
-		width: 18px;
-		vertical-align: top;
-	}
-	.small {
-		font-size: 8pt;
-	}
-	.medium {
-		font-size: 12pt;
-	}
-	.large {
-		font-size: 16pt;
-	}
-}
-#gdGeneratedData {
-	height: 400px;
-	width: 100%;
-}
-#gdProcessingIcon {
-	position: absolute;
-	top: 6px;
-	right: 0px;
-	width: 16px;
-	height: 16px;
-}
-.gdSmallTabs {
-	ul {
-		list-style: none;
-		margin: 0px;
-		padding: 0px;
-		height: 20px;
-		border-bottom: 1px solid #e1e1e1;
-
-		li {
-			line-height: 19px;
-			height: 20px;
-			float: left;
-			margin-right: 2px;
-			padding: 0px 16px;
-			border-top-left-radius: 6px;
-			border-top-right-radius: 6px;
-			background: #f2f2f2;
-			background: -moz-linear-gradient(top,  #f2f2f2 0%, #e1e1e1 100%);
-			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f2f2f2), color-stop(100%,#e1e1e1));
-			background: -webkit-linear-gradient(top,  #f2f2f2 0%,#e1e1e1 100%);
-			background: -o-linear-gradient(top,  #f2f2f2 0%,#e1e1e1 100%);
-			background: -ms-linear-gradient(top,  #f2f2f2 0%,#e1e1e1 100%);
-			background: linear-gradient(to bottom,  #f2f2f2 0%,#e1e1e1 100%);
-			filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f2f2f2', endColorstr='#e1e1e1',GradientType=0 );
-			cursor: pointer;			
-
-			.gdSelected { 
-				background: white;
-				background-color: white;
-				border: 1px solid #cccccc;
-				border-bottom: 0px;
-			}
-		}
-	}
-	.gdExportTypeTabSettings {
-		clear: both;
-		border-top: 0px;
-		padding: 6px;
-		margin: 0px;
-		display: none;
-	}
-	#gdShowSettingsLink {
-		float: right;
-		span {
-			font-size: 7pt;
-		}
-		a {
-			font-size: 7pt;
-			color: #3366CC;
-		}
-	}
-}
-#gdGenerateSection {
-	background-color: #f2f2f2;
-	border-radius: 3px;
-	padding: 20px;
-	border: 1px solid #bbbbbb;
-}
-a.gdDisabledLink {
-	color: #cccccc;	
-}
\ No newline at end of file
diff --git a/resources/themes/default/sass/install.scss b/resources/themes/default/sass/install.scss
deleted file mode 100644
index db0076873..000000000
--- a/resources/themes/default/sass/install.scss
+++ /dev/null
@@ -1,141 +0,0 @@
-/* custom styles for the installation page */
-.gdInstallPage {
-	h1 {
-		border-bottom: 1px solid #efefef;
-		padding-bottom: 8px;
-		margin-bottom: 8px;
-		float: none;
-	}
-	.gdFields {
-		.gdField {
-			float: left;
-			width: 376px;
-			border-bottom: 1px solid #efefef;
-			clear: left;
-		}
-		.gdRadioGroup {
-			input {
-				width: 20px;
-				float: left;
-			}
-			label {
-				width: inherit;
-				float: left;
-			}
-		}
-
-		.gdDisabledRow {
-			label, input {
-				color: #cccccc;
-			}
-		}
-		label {
-			float: left;
-			width: 160px;
-			color: #777777;
-			margin-top: 2px;
-		}
-		input {
-			float: left;
-			width: 210px;
-			margin-top: 2px;
-		}
-		div {
-			margin-top: 2px;
-		}
-	}
-	#dbTablePrefix {
-		width: 60px;
-	}
-	input.pwdField {
-		width: 100px;
-	}
-	.doc label {
-		float: left;
-		width: 160px;
-		color: #777777;
-		margin-top: 2px;
-		clear: right;
-	}
-	.doc>div {
-		clear: both;
-	}
-	.doc div>div {
-		float: right;
-		width: 770px;
-	}
-	#gdInstallNav {
-		float: left;
-		width: 200px;
-		padding-top: 6px;
-
-		ol {
-			margin: 0px;
-			padding: 0px 0px 0px 20px;
-		}
-		ol li {
-			padding-left: 0px;
-			color: #cccccc;
-		}
-		ol li.selected {
-			font-weight: bold;
-			color: green;
-		}
-		ol li.complete {
-			color: #999999;
-		}
-	}
-	.gdInstallSection {
-		float: right;
-		width: 725px;
-		p {
-			margin-bottom: 12px;
-		}
-		button {
-			margin-bottom: 10px;
-		}
-	}
-	.gdAdminAccountHeading {
-		font-weight: bold;
-	}
-	.gdInstallTabMessage {
-		border-radius: 5px;
-		padding: 3px 10px 3px 54px;
-		margin-bottom: 10px;
-		text-shadow: 0 1px 0 #fff;
-		display: none;
-		min-height: 36px;
-		position: relative;
-
-		.gdIcon {
-			width: 32px;
-			height: 32px;
-			position: absolute;
-			left: 12px;
-			top: 10px;
-		}
-		h3 {
-			font-weight: bold;
-			display: inline;
-			font-size: 8pt;
-		}
-		.gdResponse {
-			color: #000000;
-		}
-	}
-
-	.gdInstallError {
-		background-color: #ffe1e1;
-		h3 {
-			color: #cc0000;
-		}
-		.gdIcon {
-			background-image: url(../images/stop.png);
-		}
-	}
-
-	.gdInstallSuccess .gdIcon {
-		background-image: url(../images/info.png);
-	}
-
-}
diff --git a/resources/themes/default/sass/layout.scss b/resources/themes/default/sass/layout.scss
deleted file mode 100644
index 375432d43..000000000
--- a/resources/themes/default/sass/layout.scss
+++ /dev/null
@@ -1,212 +0,0 @@
-header {
-	position: relative;
-	width: 930px;
-	height: 93px;
-	margin: 0 auto;
-	text-align: center;
-	margin-bottom: 8px;
-	padding: 1em;
-	display: block;
-	/*border-top: 5px solid #4B5C66;*/
-}
-section {
-	/*width: 500px;*/
-	border-top: 2px solid #70B32D;
-	border-bottom: none;
-	background-color: white;
-	width: 930px;
-	margin: 0 auto;
-	text-align: left;
-	padding: 10px 0px;
-	clear: left;
-	display: block;
-}
-nav {
-	display: block;
-	a:link, a:visited {
-		color: #3366cc;
-		outline: none;
-		text-shadow: 0 1px 0 #fff;
-	}
-}
-footer {
-	width: 930px;
-	margin: 0 auto 10px;
-	height: 20px;
-	font-size: 7pt;
-	/*background-color: #eeeeee;*/
-	/*border-top: none;
-	border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
-	border-radius-bottomleft: 3px;
-	border-radius-bottomright: 3px;*/
-	display: block;
-
-	a:link, a:visited {
-		color: #555555;
-		text-decoration: none;
-		color: #3366cc;
-		outline: none;
-		&:hover {
-			text-decoration: underline;
-		}
-	}
-}
-
-header nav {
-	position: absolute;
-	right: 1em;
-	top: 1em;
-	
-	a:link, a:visited {
-		text-decoration: none;
-		color: #CDD0D5;
-		text-decoration: none;
-		-webkit-transition: color .2s;
-		-moz-transition: color .2s;
-		-o-transition: color .2s;
-		transition: color .2s;
-		
-	}
-	a:hover {
-		color: #70B32D;
-		-webkit-transition: color .2s;
-		-moz-transition: color .2s;
-		-o-transition: color .2s;
-		transition: color .2s;
-	}
-}
-
-#gdMainTabs {
-	width: 930px;
-	margin: 0 auto;
-	position: relative;
-	
-	ul {
-		list-style: none;
-		margin: 0px;
-		padding: 0px;
-		font-size: 15px;
-		line-height: 15px;
-		li {
-			color: #CDD0D5;
-			/*text-shadow: 3px 3px 8px rgba(64, 64, 64, 0.2);*/
-			cursor: pointer;
-			margin: 0;
-			padding: 0;
-			float: left;
-			width: 8em;
-			background: linear-gradient(to bottom, #EFEFEF 0%, #E1E1E1 100%) repeat scroll 0 0 transparent;
-			height: 22px;
-			text-align: left;
-			
-			a:link, a:visited {
-				display:block;
-				
-				/*text-shadow: rgba(64, 64, 64, 0.2) 3px 3px 8px;*/
-				color: #CDD0D5;
-				text-decoration: none;
-				-webkit-transition: color .2s;
-				-moz-transition: color .2s;
-				-o-transition: color .2s;
-				transition: color .2s;
-			}
-			&:hover {
-				color: #70B32D;
-				-webkit-transition: color .2s;
-				-moz-transition: color .2s;
-				-o-transition: color .2s;
-				transition: color .2s;
-			}
-		}
-		li.gdSelected {
-			color: #70B32D;
-			cursor: inherit;
-			border-bottom: 0px;
-			height: 22px;
-			background-color: white;
-			background: white;
-			/*border: 1px solid #ffffff;*/
-			border-bottom: 0px;
-			line-height: 15px;
-			&:hover {
-				background-color: white;
-			}
-		}
-	}
-}
-.gdMainTabContent {
-	padding: 0px;
-	margin: 0px;
-	&>li {
-		padding: 0px;
-		margin: 0px;
-		list-style: none;
-	}
-	h1 {
-		float: left;
-	}
-	.gdSectionHelpTip {
-		float:left;
-		list-style: none;
-		padding-left: 10px;
-		padding-top: 17px;
-	}
-}
-#gdMainTab1Content {
-	display: block;
-	h2 {
-		margin: 4px 0px;
-		font-size: 9px;
-		color: #999999;
-	}
-	.gdFields {
-		float: left;
-	}
-}
-#gdContent {
-	text-align: left;
-	position: relative;
-}
-.cols2 {
-	clear:both;
-	position:relative;
-}
-.cols2 .col {
-	float: left;
-	width: 410px;
-}
-.gdSetting {
-	position: relative;
-	clear: left;
-	line-height: 18pt;
-	width: 500px;
-
-	&>label {
-		float: left;
-		width: 160px;
-	}
-	&>div {
-		float: left;
-	}
-}
-.gdFields {
-	line-height: 21px;
-	width: 725px;
-
-	.gdError {
-		margin-left: 6px;
-		background: transparent url(../images/error.gif) left center no-repeat;
-		float: left;
-		width: 315px;
-		padding-left: 24px;
-		color: #e22222;
-		display: none;
-	}
-	input.pwdField {
-		width: 100px;
-	}
-}
-#consoleEventsModuleList {
-	width: 400px;
-}
diff --git a/resources/themes/default/sass/misc.scss b/resources/themes/default/sass/misc.scss
deleted file mode 100644
index 22bb282e2..000000000
--- a/resources/themes/default/sass/misc.scss
+++ /dev/null
@@ -1,165 +0,0 @@
-/* misc stuff */
-div.gdClear {
-	clear: both;
-}
-.joiner {
-	color: #cccccc;
-}
-.gdVerticalPad {
-	padding-bottom: 10px;
-}
-.gdMarginTop {
-	margin-top: 10px;
-}
-.hidden {
-	display: none;
-}
-.gdTip {
-	color: #777777;
-}
-.red {
-	color: red;
-}
-.bold {
-	font-weight: bold;
-}
-.gdDisabled {
-	color: #cccccc;
-	background-color: #efefef;
-}
-.gdHideNoJS {
-	display: none;
-}
-noscript {
-	background-color: #ffffcc;
-	padding:15px;
-	font-size: 10pt;
-	border-radius: 3px;
-	margin: 10px 0px;
-	text-shadow: 0 1px 0 #fff;
-	box-shadow: 2px 4px 5px #666666;
-}
-/* jQuery UI style overrides */
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {
-	cursor: pointer;
-}
-.ui-dialog {
-	text-align: left;
-}
-.ui-dialog-title {
-	font-weight: bold;
-}
-.gdColOptions .ui-datepicker-trigger {
-	margin: 0px 0px -3px 1px;
-	cursor: pointer;
-}
-#gdTableRows .gdColHelp .ui-helper-clearfix {
-	margin-left: 8px;
-	margin-top: 2px;
-}
-body .ui-widget-content {
-	color: #555555;
-}
-body .ui-widget-overlay {
-	background: #333333 url(images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-	opacity: .30;
-	filter:Alpha(Opacity=30);
-}
-body .ui-widget-shadow {
-	margin: -8px 0 0 -8px; padding: 8px; background: #333333 url(images/ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x;
-	opacity: .30;filter:Alpha(Opacity=30);
-	-moz-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-
-/* overridden Chosen styles */
-body .chzn-container-multi .chzn-choices .search-choice {
-	margin-left: 3px;
-	padding: 0px 20px 2px 5px;
-	margin-bottom: 1px;
-}
-body .chzn-container-multi .chzn-choices .search-field .default {
-	font: 11px Verdana, sans-serif;
-}
-body .chzn-container-multi .chzn-choices {
-	background-image: none;
-	padding-bottom: 2px;
-	border: 1px solid #E1E6E9;
-	background-color: #F0F2F4;
-}
-
-/* plugin installation */
-#gdPluginInstallationResults {
-	&>div {
-		padding: 4px 8px 8px;
-		background-color: #f2f2f2;
-		border-radius: 3px;
-		float: left;
-		width: 30%;
-		margin-right: 10px;
-		&:last-child {
-			margin-right: 0px;
-		}
-	}
-	h4 {
-		margin: 0px;
-		padding: 0px;
-		font-weight: normal;
-		color: #222222;
-		font-style: italic;
-	}
-	.gdResponse {
-		div {
-			font-size: 7pt;
-			line-height: 16px;
-			border-bottom: 1px solid #dddddd;
-			clear: both;
-
-			&:first-child {
-				margin-top: 4px;
-			}
-			&:last-child {
-				border-bottom: 0px;
-			}
-		}
-		.gdSuccess {
-			background-color: green;
-			color: white;
-			border-radius: 3px;
-			padding: 0px 4px;
-			float: right;
-			line-height: 16px;
-			font-size: 6.5pt;
-		}
-		.gdError {
-			background-color: #cc0000;
-			color: white;
-			border-radius: 3px;
-			padding: 0px 4px;
-			float: right;
-			line-height: 16px;
-			font-size: 6.5pt;
-			cursor: pointer;
-		}
-	}
-}
-
-/* overridden CodeMirror styles */
-body .CodeMirror pre {
-	font-family: monospace;
-}
-body .CodeMirror {
-	border: 1px solid #cccccc;
-}
-body .CodeMirror-lines div pre {
-	line-height: 14px;
-}
-body .cm-s-default pre span {
-	line-height: 10px;
-}
-body .CodeMirror-scroll {
-	height: 500px;
-}
diff --git a/resources/themes/default/sass/notifications.scss b/resources/themes/default/sass/notifications.scss
deleted file mode 100644
index 8ef0561c8..000000000
--- a/resources/themes/default/sass/notifications.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-.gdMessage {
-	position: relative;
-	display: none;
-	a.gdMessageClose {
-		&:link, &:visited {
-			position: absolute;
-			top: 10px;
-			right: 12px;
-			text-decoration: none;
-			color: black;
-			background-color: white;
-			width: 20px;
-			border-radius: 6px;
-			font-size: 7pt;
-			line-height: 16px;
-			border-radius: 3px;
-			text-align: center;
-		}
-	}
-}
-.gdNotify {
-	background-color: #F2F8FF;
-	border: 1px solid #0058DB;
-	p {
-		padding: 8px;
-		color: #0058DB;
-		margin: 0px;
-	}
-	a.gdMessageClose:hover {
-		background-color: #3b82cb;
-		color: white;
-	}
-	div {
-		padding: 8px;
-		color: #cc0000
-		ul {
-			margin: 0px;
-			padding-left: 16px;
-		}
-	}
-}
-.gdErrors {
-	background-color: #FFEDED;
-	border: 1px solid #CC0000;
-	a.gdMessageClose:hover {
-		background-color: #AA0000;
-		color: white;
-	}
-	div {
-		padding: 8px;
-		color: #AA0000
-		ul {
-			margin: 0px;
-			padding-left: 16px;
-		}
-	}
-}
-.gdProblemField {
-	background-color: #990000;
-	color: #ffffcc;
-}
\ No newline at end of file
diff --git a/resources/themes/default/sass/styles.scss b/resources/themes/default/sass/styles.scss
deleted file mode 100755
index 30f7621c0..000000000
--- a/resources/themes/default/sass/styles.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import "general";
-@import "layout";
-@import "generator";
-@import "buttons";
-@import "misc";
-@import "notifications";
-@import "errorPage";
-@import "install";
\ No newline at end of file
diff --git a/settings.example.php b/settings.example.php
deleted file mode 100644
index 1bc37ad03..000000000
--- a/settings.example.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * This file contains an example of what your settings.php file should contain. The installation script will -
- * in most cases - automatically create this file, but worst-case scenario (no permissions, for example) it will
- * at least generate the file content so you can create it yourself.
- */
-$dbHostname    = '';
-$dbName        = '';
-$dbUsername    = '';
-$dbPassword    = '';
-$dbTablePrefix = '';
-$encryptionSalt = 'ABC'; // any 3 A-Z chars
\ No newline at end of file
diff --git a/tests/UtilsTest.class.php b/tests/UtilsTest.class.php
deleted file mode 100644
index 909a3077c..000000000
--- a/tests/UtilsTest.class.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-require_once(realpath(dirname(__FILE__) . "/../library.php"));
-
-
-class UtilsTest extends PHPUnit_Framework_TestCase
-{
-	public function test_returnRandomSubset()
-	{
-		$arr1 = Utils::returnRandomSubset(array(1,2,3), 2);
-		$this->assertEquals(count($arr1), 2);
-
-		$arr2 = Utils::returnRandomSubset(array(1,2,3), 1);
-		$this->assertEquals(count($arr2), 1);
-
-		$arr3 = Utils::returnRandomSubset(array(1,2,3), 0);
-		$this->assertEquals(count($arr3), 0);
-
-		$arr4 = Utils::returnRandomSubset(array(), 4);
-		$this->assertEquals(count($arr4), 0);
-	}
-
-	public function test_returnRandomSubsetInvalidParams1() {
-		try {
-			$arr = Utils::returnRandomSubset("string", 1);
-		} catch(Exception $e) {
-			return;
-		}
-
-		$this->fail("Invalid parameters passed to Utils::returnRandomSubset()");
-	}
-
-	public function test_returnRandomSubsetInvalidParams2() {
-		try {
-			$arr = Utils::returnRandomSubset(array(1,2,3), "str");
-		} catch(Exception $e) {
-			return;
-		}
-
-		$this->fail("Invalid parameters passed to Utils::returnRandomSubset()");
-	}
-
-}
-
diff --git a/tests/phpunit_config.xml b/tests/phpunit_config.xml
deleted file mode 100644
index 5b433d2ce..000000000
--- a/tests/phpunit_config.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit colors="true">
-    <php>
-        <var name="db_dsn" value="mysql:dbname=hello_world_test;host=localhost"/>
-        <var name="db_username" value="root"/>
-        <var name="db_password" value=""/>
-    </php>
-
-    <testsuites>
-        <testsuite name="Helpers">
-            <file>UtilsTest.class.php</file>
-        </testsuite>
-    </testsuites>
-</phpunit>
diff --git a/turbo.json b/turbo.json
new file mode 100644
index 000000000..185add005
--- /dev/null
+++ b/turbo.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "ui": "tui",
+  "tasks": {
+    "start": {
+      "dependsOn": ["^start"]
+    },
+    "build": {
+      "dependsOn": ["^build"],
+      "inputs": ["$TURBO_DEFAULT$"],
+      "outputs": ["./dist"]
+    },
+    "test": {
+      "dependsOn": ["^build"]
+    },
+    "dev": {
+      "cache": false,
+      "persistent": true
+    }
+  }
+}